diff --git a/.gitignore b/.gitignore
index 68977ad07753ddd9870ad5a0c05e0ce3d8ef1d68..43f33783e3979f99a7eed0a278ab0eea7afaa89c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,24 +1,24 @@
 # the default generated dir + db file
-data
-owncloud
-config/config.php
-config/mount.php
-apps/inc.php
+/data
+/owncloud
+/config/config.php
+/config/mount.php
+/apps/inc.php
 
 # ignore all apps except core ones
-apps*
-!apps/files
-!apps/files_encryption
-!apps/files_external
-!apps/files_sharing
-!apps/files_trashbin
-!apps/files_versions
-!apps/user_ldap
-!apps/user_webdavauth
+/apps*
+!/apps/files
+!/apps/files_encryption
+!/apps/files_external
+!/apps/files_sharing
+!/apps/files_trashbin
+!/apps/files_versions
+!/apps/user_ldap
+!/apps/user_webdavauth
 
 # ignore themes except the README
-themes/*
-!themes/README
+/themes/*
+!/themes/README
 
 # just sane ignores
 .*.sw[po]
@@ -72,8 +72,11 @@ nbproject
 .well-known
 /.buildpath
 
-#tests - autogenerated filed
-data-autotest
+# Tests
+/tests/phpunit.xml
+
+# Tests - auto-generated files
+/data-autotest
 /tests/coverage*
 /tests/autoconfig*
 /tests/autotest*
diff --git a/3rdparty b/3rdparty
index 0a8f54ed446d9c0d56f8abff3bdb18fcaa6f561b..217626723957161191572ea50172a3943c30696d 160000
--- a/3rdparty
+++ b/3rdparty
@@ -1 +1 @@
-Subproject commit 0a8f54ed446d9c0d56f8abff3bdb18fcaa6f561b
+Subproject commit 217626723957161191572ea50172a3943c30696d
diff --git a/apps/files/ajax/scan.php b/apps/files/ajax/scan.php
index 391b98608bdbbffa9a67c9ba3c6e0b79f88435eb..0706d4e78296b0afdd677e8072cd61266bdcdfce 100644
--- a/apps/files/ajax/scan.php
+++ b/apps/files/ajax/scan.php
@@ -4,6 +4,16 @@ session_write_close();
 
 $force = (isset($_GET['force']) and ($_GET['force'] === 'true'));
 $dir = isset($_GET['dir']) ? $_GET['dir'] : '';
+if (isset($_GET['users'])) {
+	OC_JSON::checkAdminUser();
+	if ($_GET['users'] === 'all') {
+		$users = OC_User::getUsers();
+	} else {
+		$users = json_decode($_GET['users']);
+	}
+} else {
+	$users = array(OC_User::getUser());
+}
 
 $eventSource = new OC_EventSource();
 ScanListener::$eventSource = $eventSource;
@@ -12,21 +22,27 @@ ScanListener::$view = \OC\Files\Filesystem::getView();
 OC_Hook::connect('\OC\Files\Cache\Scanner', 'scan_folder', 'ScanListener', 'folder');
 OC_Hook::connect('\OC\Files\Cache\Scanner', 'scan_file', 'ScanListener', 'file');
 
-$absolutePath = \OC\Files\Filesystem::getView()->getAbsolutePath($dir);
+foreach ($users as $user) {
+	$eventSource->send('user', $user);
+	OC_Util::tearDownFS();
+	OC_Util::setupFS($user);
+
+	$absolutePath = \OC\Files\Filesystem::getView()->getAbsolutePath($dir);
 
-$mountPoints = \OC\Files\Filesystem::getMountPoints($absolutePath);
-$mountPoints[] = \OC\Files\Filesystem::getMountPoint($absolutePath);
-$mountPoints = array_reverse($mountPoints); //start with the mount point of $dir
+	$mountPoints = \OC\Files\Filesystem::getMountPoints($absolutePath);
+	$mountPoints[] = \OC\Files\Filesystem::getMountPoint($absolutePath);
+	$mountPoints = array_reverse($mountPoints); //start with the mount point of $dir
 
-foreach ($mountPoints as $mountPoint) {
-	$storage = \OC\Files\Filesystem::getStorage($mountPoint);
-	if ($storage) {
-		ScanListener::$mountPoints[$storage->getId()] = $mountPoint;
-		$scanner = $storage->getScanner();
-		if ($force) {
-			$scanner->scan('');
-		} else {
-			$scanner->backgroundScan();
+	foreach ($mountPoints as $mountPoint) {
+		$storage = \OC\Files\Filesystem::getStorage($mountPoint);
+		if ($storage) {
+			ScanListener::$mountPoints[$storage->getId()] = $mountPoint;
+			$scanner = $storage->getScanner();
+			if ($force) {
+				$scanner->scan('', \OC\Files\Cache\Scanner::SCAN_RECURSIVE, \OC\Files\Cache\Scanner::REUSE_ETAG);
+			} else {
+				$scanner->backgroundScan();
+			}
 		}
 	}
 }
diff --git a/apps/files/ajax/upload.php b/apps/files/ajax/upload.php
index e1263744e1b454680347ab672f201c247701487e..dde5d3c50af32e032567a812ce1be2465e96b13b 100644
--- a/apps/files/ajax/upload.php
+++ b/apps/files/ajax/upload.php
@@ -1,17 +1,57 @@
 <?php
 
-// Init owncloud
-
-
 // Firefox and Konqueror tries to download application/json for me.  --Arthur
 OCP\JSON::setContentTypeHeader('text/plain');
 
-OCP\JSON::checkLoggedIn();
-OCP\JSON::callCheck();
+// If a directory token is sent along check if public upload is permitted.
+// If not, check the login.
+// If no token is sent along, rely on login only
+
 $l = OC_L10N::get('files');
+if (empty($_POST['dirToken'])) {
+	// The standard case, files are uploaded through logged in users :)
+	OCP\JSON::checkLoggedIn();
+	$dir = isset($_POST['dir']) ? $_POST['dir'] : "";
+	if (!$dir || empty($dir) || $dir === false) {
+		OCP\JSON::error(array('data' => array_merge(array('message' => $l->t('Unable to set upload directory.')))));
+		die();
+	}
+} else {
+	$linkItem = OCP\Share::getShareByToken($_POST['dirToken']);
+	if ($linkItem === false) {
+		OCP\JSON::error(array('data' => array_merge(array('message' => $l->t('Invalid Token')))));
+		die();
+	}
+
+	if (!($linkItem['permissions'] & OCP\PERMISSION_CREATE)) {
+		OCP\JSON::checkLoggedIn();
+	} else {
+		// resolve reshares
+		$rootLinkItem = OCP\Share::resolveReShare($linkItem);
+
+		// Setup FS with owner
+		OC_Util::tearDownFS();
+		OC_Util::setupFS($rootLinkItem['uid_owner']);
+
+		// The token defines the target directory (security reasons)
+		$path = \OC\Files\Filesystem::getPath($linkItem['file_source']);
+		$dir = sprintf(
+			"/%s/%s",
+			$path,
+			isset($_POST['subdir']) ? $_POST['subdir'] : ''
+		);
+
+		if (!$dir || empty($dir) || $dir === false) {
+			OCP\JSON::error(array('data' => array_merge(array('message' => $l->t('Unable to set upload directory.')))));
+			die();
+		}
+	}
+}
+
+
+OCP\JSON::callCheck();
 
 
-$dir = $_POST['dir'];
 // get array with current storage stats (e.g. max file size)
 $storageStats = \OCA\files\lib\Helper::buildFileStorageStatistics($dir);
 
@@ -25,7 +65,7 @@ foreach ($_FILES['files']['error'] as $error) {
 		$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'),
+			. 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'),
@@ -40,17 +80,17 @@ $files = $_FILES['files'];
 
 $error = '';
 
-$maxUploadFilesize = OCP\Util::maxUploadFilesize($dir);
-$maxHumanFilesize = OCP\Util::humanFileSize($maxUploadFilesize);
+$maxUploadFileSize = $storageStats['uploadMaxFilesize'];
+$maxHumanFileSize = OCP\Util::humanFileSize($maxUploadFileSize);
 
 $totalSize = 0;
 foreach ($files['size'] as $size) {
 	$totalSize += $size;
 }
-if ($maxUploadFilesize >= 0 and $totalSize > $maxUploadFilesize) {
+if ($maxUploadFileSize >= 0 and $totalSize > $maxUploadFileSize) {
 	OCP\JSON::error(array('data' => array('message' => $l->t('Not enough storage available'),
-		'uploadMaxFilesize' => $maxUploadFilesize,
-		'maxHumanFilesize' => $maxHumanFilesize)));
+		'uploadMaxFilesize' => $maxUploadFileSize,
+		'maxHumanFilesize' => $maxHumanFileSize)));
 	exit();
 }
 
@@ -71,9 +111,9 @@ if (strpos($dir, '..') === false) {
 				'size' => $meta['size'],
 				'id' => $meta['fileid'],
 				'name' => basename($target),
-				'originalname'=>$files['name'][$i],
-				'uploadMaxFilesize' => $maxUploadFilesize,
-				'maxHumanFilesize' => $maxHumanFilesize
+				'originalname' => $files['name'][$i],
+				'uploadMaxFilesize' => $maxUploadFileSize,
+				'maxHumanFilesize' => $maxHumanFileSize
 			);
 		}
 	}
diff --git a/apps/files/css/files.css b/apps/files/css/files.css
index d7843ab35356400eb783668554727fec0bf4be7f..7e0c3718f1188a9fc5bd280aa88398e17172d416 100644
--- a/apps/files/css/files.css
+++ b/apps/files/css/files.css
@@ -197,6 +197,14 @@ a.action>img { max-height:16px; max-width:16px; vertical-align:text-bottom; }
 	display:inline;
 }
 
+.summary {
+	opacity: .5;
+}
+
+.summary .info {
+	margin-left: 3em;
+}
+
 #scanning-message{ top:40%; left:40%; position:absolute; display:none; }
 
 div.crumb a{ padding:0.9em 0 0.7em 0; color:#555; }
diff --git a/apps/files/index.php b/apps/files/index.php
index 20fbf7f93be9a1232f271188c10c5f28da047976..2338cf439e4c625ce2f4d655b832bf0a6fef4827 100644
--- a/apps/files/index.php
+++ b/apps/files/index.php
@@ -26,6 +26,7 @@ OCP\User::checkLoggedIn();
 
 // Load the files we need
 OCP\Util::addStyle('files', 'files');
+OCP\Util::addscript('files', 'file-upload');
 OCP\Util::addscript('files', 'jquery.iframe-transport');
 OCP\Util::addscript('files', 'jquery.fileupload');
 OCP\Util::addscript('files', 'jquery-visibility');
@@ -136,5 +137,6 @@ if ($needUpgrade) {
 	$tmpl->assign('uploadMaxHumanFilesize', OCP\Util::humanFileSize($maxUploadFilesize));
 	$tmpl->assign('allowZipDownload', intval(OCP\Config::getSystemValue('allowZipDownload', true)));
 	$tmpl->assign('usedSpacePercent', (int)$storageInfo['relative']);
+	$tmpl->assign('isPublic', false);
 	$tmpl->printPage();
-}
\ No newline at end of file
+}
diff --git a/apps/files/js/file-upload.js b/apps/files/js/file-upload.js
new file mode 100644
index 0000000000000000000000000000000000000000..942a07dfcccd1ebac562a724fb7539972edd763b
--- /dev/null
+++ b/apps/files/js/file-upload.js
@@ -0,0 +1,343 @@
+$(document).ready(function() {
+
+  file_upload_param = {
+	dropZone: $('#content'), // restrict dropZone to content div
+	//singleFileUploads is on by default, so the data.files array will always have length 1
+	add: function(e, data) {
+
+	  if(data.files[0].type === '' && data.files[0].size == 4096)
+	  {
+		data.textStatus = 'dirorzero';
+		data.errorThrown = t('files','Unable to upload your file as it is a directory or has 0 bytes');
+		var fu = $(this).data('blueimp-fileupload') || $(this).data('fileupload');
+		fu._trigger('fail', e, data);
+		return true; //don't upload this file but go on with next in queue
+	  }
+
+	  var totalSize=0;
+	  $.each(data.originalFiles, function(i,file){
+		totalSize+=file.size;
+	  });
+
+	  if(totalSize>$('#max_upload').val()){
+		data.textStatus = 'notenoughspace';
+		data.errorThrown = t('files','Not enough space available');
+		var fu = $(this).data('blueimp-fileupload') || $(this).data('fileupload');
+		fu._trigger('fail', e, data);
+		return false; //don't upload anything
+	  }
+
+	  // start the actual file upload
+	  var jqXHR = data.submit();
+
+	  // remember jqXHR to show warning to user when he navigates away but an upload is still in progress
+	  if (typeof data.context !== 'undefined' && data.context.data('type') === 'dir') {
+		var dirName = data.context.data('file');
+		if(typeof uploadingFiles[dirName] === 'undefined') {
+	  uploadingFiles[dirName] = {};
+		}
+		uploadingFiles[dirName][data.files[0].name] = jqXHR;
+	  } else {
+		uploadingFiles[data.files[0].name] = jqXHR;
+	  }
+
+	  //show cancel button
+	  if($('html.lte9').length === 0 && data.dataType !== 'iframe') {
+		$('#uploadprogresswrapper input.stop').show();
+	  }
+	},
+	/**
+	 * called after the first add, does NOT have the data param
+	 * @param e
+	 */
+	start: function(e) {
+	  //IE < 10 does not fire the necessary events for the progress bar.
+	  if($('html.lte9').length > 0) {
+		return;
+	  }
+	  $('#uploadprogressbar').progressbar({value:0});
+	  $('#uploadprogressbar').fadeIn();
+	},
+	fail: function(e, data) {
+	  if (typeof data.textStatus !== 'undefined' && data.textStatus !== 'success' ) {
+		if (data.textStatus === 'abort') {
+	  $('#notification').text(t('files', 'Upload cancelled.'));
+		} else {
+	  // HTTP connection problem
+	  $('#notification').text(data.errorThrown);
+		}
+		$('#notification').fadeIn();
+		//hide notification after 5 sec
+		setTimeout(function() {
+	  $('#notification').fadeOut();
+		}, 5000);
+	  }
+	  delete uploadingFiles[data.files[0].name];
+	},
+	progress: function(e, data) {
+	  // TODO: show nice progress bar in file row
+	},
+	progressall: function(e, data) {
+	  //IE < 10 does not fire the necessary events for the progress bar.
+	  if($('html.lte9').length > 0) {
+		return;
+	  }
+	  var progress = (data.loaded/data.total)*100;
+	  $('#uploadprogressbar').progressbar('value',progress);
+	},
+	/**
+	 * called for every successful upload
+	 * @param e
+	 * @param data
+	 */
+	done:function(e, data) {
+	  // handle different responses (json or body from iframe for ie)
+	  var response;
+	  if (typeof data.result === 'string') {
+		response = data.result;
+	  } else {
+		//fetch response from iframe
+		response = data.result[0].body.innerText;
+	  }
+	  var result=$.parseJSON(response);
+
+	  if(typeof result[0] !== 'undefined' && result[0].status === 'success') {
+		var file = result[0];
+	  } else {
+		data.textStatus = 'servererror';
+		data.errorThrown = t('files', result.data.message);
+		var fu = $(this).data('blueimp-fileupload') || $(this).data('fileupload');
+		fu._trigger('fail', e, data);
+	  }
+
+	  var filename = result[0].originalname;
+
+	  // delete jqXHR reference
+	  if (typeof data.context !== 'undefined' && data.context.data('type') === 'dir') {
+		var dirName = data.context.data('file');
+		delete uploadingFiles[dirName][filename];
+		if ($.assocArraySize(uploadingFiles[dirName]) == 0) {
+	  delete uploadingFiles[dirName];
+		}
+	  } else {
+		delete uploadingFiles[filename];
+	  }
+
+	},
+	/**
+	 * called after last upload
+	 * @param e
+	 * @param data
+	 */
+	stop: function(e, data) {
+	  if(data.dataType !== 'iframe') {
+		$('#uploadprogresswrapper input.stop').hide();
+	  }
+
+	  //IE < 10 does not fire the necessary events for the progress bar.
+	  if($('html.lte9').length > 0) {
+		return;
+	  }
+
+	  $('#uploadprogressbar').progressbar('value',100);
+	  $('#uploadprogressbar').fadeOut();
+	}
+  }
+  var file_upload_handler = function() {
+	$('#file_upload_start').fileupload(file_upload_param);
+  };
+
+
+
+  if ( document.getElementById('data-upload-form') ) {
+	$(file_upload_handler);
+  }
+  $.assocArraySize = function(obj) {
+	// http://stackoverflow.com/a/6700/11236
+	var size = 0, key;
+	for (key in obj) {
+	  if (obj.hasOwnProperty(key)) size++;
+	}
+	return size;
+  };
+
+  // warn user not to leave the page while upload is in progress
+  $(window).bind('beforeunload', function(e) {
+	if ($.assocArraySize(uploadingFiles) > 0)
+	  return t('files','File upload is in progress. Leaving the page now will cancel the upload.');
+  });
+
+  //add multiply file upload attribute to all browsers except konqueror (which crashes when it's used)
+  if(navigator.userAgent.search(/konqueror/i)==-1){
+	$('#file_upload_start').attr('multiple','multiple')
+  }
+
+  //if the breadcrumb is to long, start by replacing foldernames with '...' except for the current folder
+  var crumb=$('div.crumb').first();
+  while($('div.controls').height()>40 && crumb.next('div.crumb').length>0){
+	crumb.children('a').text('...');
+	crumb=crumb.next('div.crumb');
+  }
+  //if that isn't enough, start removing items from the breacrumb except for the current folder and it's parent
+  var crumb=$('div.crumb').first();
+  var next=crumb.next('div.crumb');
+  while($('div.controls').height()>40 && next.next('div.crumb').length>0){
+	crumb.remove();
+	crumb=next;
+	next=crumb.next('div.crumb');
+  }
+  //still not enough, start shorting down the current folder name
+  var crumb=$('div.crumb>a').last();
+  while($('div.controls').height()>40 && crumb.text().length>6){
+	var text=crumb.text()
+	text=text.substr(0,text.length-6)+'...';
+	crumb.text(text);
+  }
+
+  $(document).click(function(){
+	$('#new>ul').hide();
+	$('#new').removeClass('active');
+	$('#new li').each(function(i,element){
+	  if($(element).children('p').length==0){
+		$(element).children('form').remove();
+		$(element).append('<p>'+$(element).data('text')+'</p>');
+	  }
+	});
+  });
+  $('#new li').click(function(){
+	if($(this).children('p').length==0){
+	  return;
+	}
+
+	$('#new li').each(function(i,element){
+	  if($(element).children('p').length==0){
+		$(element).children('form').remove();
+		$(element).append('<p>'+$(element).data('text')+'</p>');
+	  }
+	});
+
+	var type=$(this).data('type');
+	var text=$(this).children('p').text();
+	$(this).data('text',text);
+	$(this).children('p').remove();
+	var form=$('<form></form>');
+	var input=$('<input>');
+	form.append(input);
+	$(this).append(form);
+	input.focus();
+	form.submit(function(event){
+	  event.stopPropagation();
+	  event.preventDefault();
+	  var newname=input.val();
+	  if(type == 'web' && newname.length == 0) {
+		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') {
+		OC.Notification.show(t('files','Invalid folder name. Usage of \'Shared\' is reserved by ownCloud'));
+		return false;
+	  }
+	  if (FileList.lastAction) {
+		FileList.lastAction();
+	  }
+	  var name = getUniqueName(newname);
+	  if (newname != name) {
+		FileList.checkName(name, newname, true);
+		var hidden = true;
+	  } else {
+		var hidden = false;
+	  }
+	  switch(type){
+	  case 'file':
+		$.post(
+		  OC.filePath('files','ajax','newfile.php'),
+		  {dir:$('#dir').val(),filename:name},
+		  function(result){
+			if (result.status == 'success') {
+			  var date=new Date();
+			  FileList.addFile(name,0,date,false,hidden);
+			  var tr=$('tr').filterAttr('data-file',name);
+			  tr.attr('data-mime',result.data.mime);
+			  tr.attr('data-id', result.data.id);
+			  getMimeIcon(result.data.mime,function(path){
+			tr.find('td.filename').attr('style','background-image:url('+path+')');
+			  });
+			} else {
+			  OC.dialogs.alert(result.data.message, t('core', 'Error'));
+			}
+		  }
+		);
+		break;
+	  case 'folder':
+		$.post(
+		  OC.filePath('files','ajax','newfolder.php'),
+		  {dir:$('#dir').val(),foldername:name},
+		  function(result){
+			if (result.status == 'success') {
+			  var date=new Date();
+			  FileList.addDir(name,0,date,hidden);
+			  var tr=$('tr').filterAttr('data-file',name);
+			  tr.attr('data-id', result.data.id);
+			} else {
+			  OC.dialogs.alert(result.data.message, t('core', 'Error'));
+			}
+		  }
+		);
+		break;
+	  case 'web':
+		if(name.substr(0,8)!='https://' && name.substr(0,7)!='http://'){
+		  name='http://'+name;
+		}
+		var localName=name;
+		if(localName.substr(localName.length-1,1)=='/'){//strip /
+		  localName=localName.substr(0,localName.length-1)
+		}
+		if(localName.indexOf('/')){//use last part of url
+		  localName=localName.split('/').pop();
+		} else { //or the domain
+		  localName=(localName.match(/:\/\/(.[^\/]+)/)[1]).replace('www.','');
+		}
+		localName = getUniqueName(localName);
+		//IE < 10 does not fire the necessary events for the progress bar.
+		if($('html.lte9').length > 0) {
+		} else {
+		  $('#uploadprogressbar').progressbar({value:0});
+		  $('#uploadprogressbar').fadeIn();
+		}
+
+		var eventSource=new OC.EventSource(OC.filePath('files','ajax','newfile.php'),{dir:$('#dir').val(),source:name,filename:localName});
+		eventSource.listen('progress',function(progress){
+		  //IE < 10 does not fire the necessary events for the progress bar.
+		  if($('html.lte9').length > 0) {
+		  } else {
+			$('#uploadprogressbar').progressbar('value',progress);
+		  }
+		});
+		eventSource.listen('success',function(data){
+		  var mime=data.mime;
+		  var size=data.size;
+		  var id=data.id;
+		  $('#uploadprogressbar').fadeOut();
+		  var date=new Date();
+		  FileList.addFile(localName,size,date,false,hidden);
+		  var tr=$('tr').filterAttr('data-file',localName);
+		  tr.data('mime',mime).data('id',id);
+		  tr.attr('data-id', id);
+		  getMimeIcon(mime,function(path){
+			tr.find('td.filename').attr('style','background-image:url('+path+')');
+		  });
+		});
+		eventSource.listen('error',function(error){
+		  $('#uploadprogressbar').fadeOut();
+		  alert(error);
+		});
+		break;
+	  }
+	  var li=form.parent();
+	  form.remove();
+	  li.append('<p>'+li.data('text')+'</p>');
+	  $('#new>a').click();
+	});
+  });
+});
diff --git a/apps/files/js/fileactions.js b/apps/files/js/fileactions.js
index 14fca6f14829cfab7344d06af04115e22634a481..aa66a57a7b5e994eb0d04041761eb1a62c770306 100644
--- a/apps/files/js/fileactions.js
+++ b/apps/files/js/fileactions.js
@@ -200,7 +200,11 @@ FileActions.register('all', 'Rename', OC.PERMISSION_UPDATE, function () {
 
 
 FileActions.register('dir', 'Open', OC.PERMISSION_READ, '', function (filename) {
-	window.location = OC.linkTo('files', 'index.php') + '?dir=' + encodeURIComponent($('#dir').val()).replace(/%2F/g, '/') + '/' + encodeURIComponent(filename);
+	var dir = $('#dir').val()
+	if (dir !== '/') {
+		dir = dir + '/';
+	}
+	window.location = OC.linkTo('files', 'index.php') + '?dir=' + encodeURIComponent(dir + filename);
 });
 
 FileActions.setDefault('dir', 'Open');
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index 11bf028d93af529c6188769adb3760b0f3e7cb43..036d4bd6f079b9979e39993296f418b4419d7662 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -71,8 +71,20 @@ var FileList={
 		tr.append(td);
 		return tr;
 	},
-	addFile:function(name,size,lastModified,loading,hidden){
+	addFile:function(name,size,lastModified,loading,hidden,param){
 		var imgurl;
+
+		if (!param) {
+			param = {};
+		}
+
+		var download_url = null;
+		if (!param.download_url) {
+			download_url = OC.Router.generate('download', { file: $('#dir').val()+'/'+name });
+		} else {
+			download_url = param.download_url;
+		}
+
 		if (loading) {
 			imgurl = OC.imagePath('core', 'loading.gif');
 		} else {
@@ -82,7 +94,7 @@ var FileList={
 			'file',
 			name,
 			imgurl,
-			OC.Router.generate('download', { file: $('#dir').val()+'/'+name }),
+			download_url,
 			size,
 			lastModified,
 			$('#permissions').val()
@@ -198,7 +210,7 @@ var FileList={
 			len = input.val().length;
 		}
 		input.selectRange(0,len);
-		
+
 		form.submit(function(event){
 			event.stopPropagation();
 			event.preventDefault();
@@ -209,13 +221,44 @@ var FileList={
 				if (FileList.checkName(name, newname, false)) {
 					newname = name;
 				} else {
-					$.get(OC.filePath('files','ajax','rename.php'), { dir : $('#dir').val(), newname: newname, file: name },function(result) {
-						if (!result || result.status == 'error') {
-							OC.dialogs.alert(result.data.message, 'Error moving file');
-							newname = name;
+					// save background image, because it's replaced by a spinner while async request
+					var oldBackgroundImage = td.css('background-image');
+					// mark as loading
+					td.css('background-image', 'url('+ OC.imagePath('core', 'loading.gif') + ')');
+					$.ajax({
+						url: OC.filePath('files','ajax','rename.php'),
+						data: {
+							dir : $('#dir').val(),
+							newname: newname,
+							file: name
+						},
+						success: function(result) {
+							if (!result || result.status === 'error') {
+								OC.Notification.show(result.data.message);
+								newname = name;
+								// revert changes
+								tr.attr('data-file', newname);
+								var path = td.children('a.name').attr('href');
+								td.children('a.name').attr('href', path.replace(encodeURIComponent(name), encodeURIComponent(newname)));
+								if (newname.indexOf('.') > 0 && tr.data('type') !== 'dir') {
+									var basename=newname.substr(0,newname.lastIndexOf('.'));
+								} else {
+									var basename=newname;
+								}
+								td.find('a.name span.nametext').text(basename);
+								if (newname.indexOf('.') > 0 && tr.data('type') !== 'dir') {
+									if (td.find('a.name span.extension').length === 0 ) {
+										td.find('a.name span.nametext').append('<span class="extension"></span>');
+									}
+									td.find('a.name span.extension').text(newname.substr(newname.lastIndexOf('.')));
+								}
+								tr.find('.fileactions').effect('highlight', {}, 5000);
+								tr.effect('highlight', {}, 5000);
+							}
+							// remove loading mark and recover old image
+							td.css('background-image', oldBackgroundImage);
 						}
 					});
-
 				}
 			}
 			tr.data('renaming',false);
@@ -424,8 +467,12 @@ $(document).ready(function(){
 					size=data.files[0].size;
 				}
 				var date=new Date();
+				var param = {};
+				if ($('#publicUploadRequestToken').length) {
+					param.download_url = document.location.href + '&download&path=/' + $('#dir').val() + '/' + uniqueName;
+				}
 				// create new file context
-				data.context = FileList.addFile(uniqueName,size,date,true,false);
+				data.context = FileList.addFile(uniqueName,size,date,true,false,param);
 
 			}
 		}
diff --git a/apps/files/js/files.js b/apps/files/js/files.js
index 06d193bf8f387b187056541f65b95019f4fd9aca..6eb3a7b1e7220b50eccbaab01d704ef3cba15887 100644
--- a/apps/files/js/files.js
+++ b/apps/files/js/files.js
@@ -251,153 +251,6 @@ $(document).ready(function() {
 			e.preventDefault(); // prevent browser from doing anything, if file isn't dropped in dropZone
 	});
 
-	if ( document.getElementById('data-upload-form') ) {
-		$(function() {
-			$('#file_upload_start').fileupload({
-				dropZone: $('#content'), // restrict dropZone to content div
-				//singleFileUploads is on by default, so the data.files array will always have length 1
-				add: function(e, data) {
-
-					if(data.files[0].type === '' && data.files[0].size == 4096)
-					{
-						data.textStatus = 'dirorzero';
-						data.errorThrown = t('files','Unable to upload your file as it is a directory or has 0 bytes');
-						var fu = $(this).data('blueimp-fileupload') || $(this).data('fileupload');
-						fu._trigger('fail', e, data);
-						return true; //don't upload this file but go on with next in queue
-					}
-
-					var totalSize=0;
-					$.each(data.originalFiles, function(i,file){
-						totalSize+=file.size;
-					});
-
-					if(totalSize>$('#max_upload').val()){
-						data.textStatus = 'notenoughspace';
-						data.errorThrown = t('files','Not enough space available');
-						var fu = $(this).data('blueimp-fileupload') || $(this).data('fileupload');
-						fu._trigger('fail', e, data);
-						return false; //don't upload anything
-					}
-
-					// start the actual file upload
-					var jqXHR = data.submit();
-
-					// remember jqXHR to show warning to user when he navigates away but an upload is still in progress
-					if (typeof data.context !== 'undefined' && data.context.data('type') === 'dir') {
-						var dirName = data.context.data('file');
-						if(typeof uploadingFiles[dirName] === 'undefined') {
-							uploadingFiles[dirName] = {};
-						}
-						uploadingFiles[dirName][data.files[0].name] = jqXHR;
-					} else {
-						uploadingFiles[data.files[0].name] = jqXHR;
-					}
-
-					//show cancel button
-					if($('html.lte9').length === 0 && data.dataType !== 'iframe') {
-						$('#uploadprogresswrapper input.stop').show();
-					}
-				},
-				/**
-				 * called after the first add, does NOT have the data param
-				 * @param e
-				 */
-				start: function(e) {
-					//IE < 10 does not fire the necessary events for the progress bar.
-					if($('html.lte9').length > 0) {
-						return;
-					}
-					$('#uploadprogressbar').progressbar({value:0});
-					$('#uploadprogressbar').fadeIn();
-				},
-				fail: function(e, data) {
-					if (typeof data.textStatus !== 'undefined' && data.textStatus !== 'success' ) {
-						if (data.textStatus === 'abort') {
-							$('#notification').text(t('files', 'Upload cancelled.'));
-						} else {
-							// HTTP connection problem
-							$('#notification').text(data.errorThrown);
-						}
-						$('#notification').fadeIn();
-						//hide notification after 5 sec
-						setTimeout(function() {
-							$('#notification').fadeOut();
-						}, 5000);
-					}
-					delete uploadingFiles[data.files[0].name];
-				},
-				progress: function(e, data) {
-					// TODO: show nice progress bar in file row
-				},
-				progressall: function(e, data) {
-					//IE < 10 does not fire the necessary events for the progress bar.
-					if($('html.lte9').length > 0) {
-						return;
-					}
-					var progress = (data.loaded/data.total)*100;
-					$('#uploadprogressbar').progressbar('value',progress);
-				},
-				/**
-				 * called for every successful upload
-				 * @param e
-				 * @param data
-				 */
-				done:function(e, data) {
-					// handle different responses (json or body from iframe for ie)
-					var response;
-					if (typeof data.result === 'string') {
-						response = data.result;
-					} else {
-						//fetch response from iframe
-						response = data.result[0].body.innerText;
-					}
-					var result=$.parseJSON(response);
-
-					if(typeof result[0] !== 'undefined' && result[0].status === 'success') {
-						var file = result[0];
-					} else {
-						data.textStatus = 'servererror';
-						data.errorThrown = t('files', result.data.message);
-						var fu = $(this).data('blueimp-fileupload') || $(this).data('fileupload');
-						fu._trigger('fail', e, data);
-					}
-
-					var filename = result[0].originalname;
-
-					// delete jqXHR reference
-					if (typeof data.context !== 'undefined' && data.context.data('type') === 'dir') {
-						var dirName = data.context.data('file');
-						delete uploadingFiles[dirName][filename];
-						if ($.assocArraySize(uploadingFiles[dirName]) == 0) {
-							delete uploadingFiles[dirName];
-						}
-					} else {
-						delete uploadingFiles[filename];
-					}
-
-				},
-				/**
-				 * called after last upload
-				 * @param e
-				 * @param data
-				 */
-				stop: function(e, data) {
-					if(data.dataType !== 'iframe') {
-						$('#uploadprogresswrapper input.stop').hide();
-					}
-
-					//IE < 10 does not fire the necessary events for the progress bar.
-					if($('html.lte9').length > 0) {
-						return;
-					}
-
-					$('#uploadprogressbar').progressbar('value',100);
-					$('#uploadprogressbar').fadeOut();
-				}
-			})
-		});
-	}
 	$.assocArraySize = function(obj) {
 		// http://stackoverflow.com/a/6700/11236
 		var size = 0, key;
@@ -697,7 +550,7 @@ $(document).ready(function() {
 	}
 });
 
-function scanFiles(force, dir){
+function scanFiles(force, dir, users){
 	if (!OC.currentUser) {
 		return;
 	}
@@ -707,7 +560,18 @@ function scanFiles(force, dir){
 	}
 	force = !!force; //cast to bool
 	scanFiles.scanning = true;
-	var scannerEventSource = new OC.EventSource(OC.filePath('files','ajax','scan.php'),{force:force,dir:dir});
+	var scannerEventSource;
+	if (users) {
+		var usersString;
+		if (users === 'all') {
+			usersString = users;
+		} else {
+			usersString = JSON.stringify(users);
+		}
+		scannerEventSource = new OC.EventSource(OC.filePath('files','ajax','scan.php'),{force: force,dir: dir, users: usersString});
+	} else {
+		scannerEventSource = new OC.EventSource(OC.filePath('files','ajax','scan.php'),{force: force,dir: dir});
+	}
 	scanFiles.cancel = scannerEventSource.close.bind(scannerEventSource);
 	scannerEventSource.listen('count',function(count){
 		console.log(count + ' files scanned')
@@ -719,6 +583,9 @@ function scanFiles(force, dir){
 		scanFiles.scanning=false;
 		console.log('done after ' + count + ' files');
 	});
+	scannerEventSource.listen('user',function(user){
+		console.log('scanning files for ' + user);
+	});
 }
 scanFiles.scanning=false;
 
@@ -793,7 +660,7 @@ var dragOptions={
 // sane browsers support using the distance option
 if ( $('html.ie').length === 0) {
 	dragOptions['distance'] = 20;
-} 
+}
 
 var folderDropOptions={
 	drop: function( event, ui ) {
diff --git a/apps/files/l10n/ar.php b/apps/files/l10n/ar.php
index ca198b7efe95a31501f411f6f7d644addd3c0b54..e000bc966c150b5c4168ec4f50a39d61e3671568 100644
--- a/apps/files/l10n/ar.php
+++ b/apps/files/l10n/ar.php
@@ -12,6 +12,11 @@
 "Not enough storage available" => "لا يوجد مساحة تخزينية كافية",
 "Invalid directory." => "مسار غير صحيح.",
 "Files" => "الملفات",
+"Unable to upload your file as it is a directory or has 0 bytes" => "فشل في رفع ملفاتك , إما أنها مجلد أو حجمها 0 بايت",
+"Upload cancelled." => "تم إلغاء عملية رفع الملفات .",
+"File upload is in progress. Leaving the page now will cancel the upload." => "عملية رفع الملفات قيد التنفيذ. اغلاق الصفحة سوف يلغي عملية رفع الملفات.",
+"URL cannot be empty." => "عنوان ال URL  لا يجوز أن يكون فارغا.",
+"Error" => "خطأ",
 "Share" => "شارك",
 "Delete permanently" => "حذف بشكل دائم",
 "Delete" => "إلغاء",
@@ -31,12 +36,7 @@
 "Your storage is full, files can not be updated or synced anymore!" => "مساحتك التخزينية ممتلئة, لا يمكم تحديث ملفاتك أو مزامنتها بعد الآن !",
 "Your storage is almost full ({usedSpacePercent}%)" => "مساحتك التخزينية امتلأت تقريبا ",
 "Your download is being prepared. This might take some time if the files are big." => "جاري تجهيز عملية التحميل. قد تستغرق بعض الوقت اذا كان حجم الملفات كبير.",
-"Unable to upload your file as it is a directory or has 0 bytes" => "فشل في رفع ملفاتك , إما أنها مجلد أو حجمها 0 بايت",
-"Upload cancelled." => "تم إلغاء عملية رفع الملفات .",
-"File upload is in progress. Leaving the page now will cancel the upload." => "عملية رفع الملفات قيد التنفيذ. اغلاق الصفحة سوف يلغي عملية رفع الملفات.",
-"URL cannot be empty." => "عنوان ال URL  لا يجوز أن يكون فارغا.",
 "Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "إسم مجلد غير صحيح. استخدام مصطلح \"Shared\" محجوز للنظام",
-"Error" => "خطأ",
 "Name" => "اسم",
 "Size" => "حجم",
 "Modified" => "معدل",
@@ -44,7 +44,6 @@
 "{count} folders" => "{count} مجلدات",
 "1 file" => "ملف واحد",
 "{count} files" => "{count} ملفات",
-"Unable to rename file" => "فشل في اعادة تسمية الملف",
 "Upload" => "رفع",
 "File handling" => "التعامل مع الملف",
 "Maximum upload size" => "الحد الأقصى لحجم الملفات التي يمكن رفعها",
diff --git a/apps/files/l10n/bg_BG.php b/apps/files/l10n/bg_BG.php
index 661bb5718aea16680b2b61b4c9efa8aaafb42dd0..f4424f925774b5c8d5ca9381c14e0b94a119249d 100644
--- a/apps/files/l10n/bg_BG.php
+++ b/apps/files/l10n/bg_BG.php
@@ -7,6 +7,8 @@
 "Failed to write to disk" => "Възникна проблем при запис в диска",
 "Invalid directory." => "Невалидна директория.",
 "Files" => "Файлове",
+"Upload cancelled." => "Качването е спряно.",
+"Error" => "Грешка",
 "Share" => "Споделяне",
 "Delete permanently" => "Изтриване завинаги",
 "Delete" => "Изтриване",
@@ -15,8 +17,6 @@
 "replace" => "препокриване",
 "cancel" => "отказ",
 "undo" => "възтановяване",
-"Upload cancelled." => "Качването е спряно.",
-"Error" => "Грешка",
 "Name" => "Име",
 "Size" => "Размер",
 "Modified" => "Променено",
@@ -36,5 +36,6 @@
 "Download" => "Изтегляне",
 "Upload too large" => "Файлът който сте избрали за качване е прекалено голям",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Файловете които се опитвате да качите са по-големи от позволеното за сървъра.",
-"Files are being scanned, please wait." => "Файловете се претърсват, изчакайте."
+"Files are being scanned, please wait." => "Файловете се претърсват, изчакайте.",
+"file" => "файл"
 );
diff --git a/apps/files/l10n/bn_BD.php b/apps/files/l10n/bn_BD.php
index 83dd4dc36dc2a73e84bb1aad4a0013953e4a6e34..6d755bccc8af45e3305e6bf20f1173ac9e2861db 100644
--- a/apps/files/l10n/bn_BD.php
+++ b/apps/files/l10n/bn_BD.php
@@ -11,6 +11,12 @@
 "Failed to write to disk" => "ডিস্কে লিখতে ব্যর্থ",
 "Invalid directory." => "ভুল ডিরেক্টরি",
 "Files" => "ফাইল",
+"Unable to upload your file as it is a directory or has 0 bytes" => "আপনার ফাইলটি আপলোড করা সম্ভব হলো না, কেননা এটি হয় একটি ফোল্ডার কিংবা এর আকার ০ বাইট",
+"Not enough space available" => "যথেষ্ঠ পরিমাণ স্থান নেই",
+"Upload cancelled." => "আপলোড বাতিল করা হয়েছে।",
+"File upload is in progress. Leaving the page now will cancel the upload." => "ফাইল আপলোড চলমান। এই পৃষ্ঠা পরিত্যাগ করলে আপলোড বাতিল করা হবে।",
+"URL cannot be empty." => "URL ফাঁকা রাখা যাবে না।",
+"Error" => "সমস্যা",
 "Share" => "ভাগাভাগি কর",
 "Delete" => "মুছে",
 "Rename" => "পূনঃনামকরণ",
@@ -25,13 +31,7 @@
 "'.' is an invalid file name." => "টি একটি অননুমোদিত নাম।",
 "File name cannot be empty." => "ফাইলের নামটি ফাঁকা রাখা যাবে না।",
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "নামটি সঠিক নয়,  '\\', '/', '<', '>', ':', '\"', '|', '?' এবং  '*'  অনুমোদিত নয়।",
-"Unable to upload your file as it is a directory or has 0 bytes" => "আপনার ফাইলটি আপলোড করা সম্ভব হলো না, কেননা এটি হয় একটি ফোল্ডার কিংবা এর আকার ০ বাইট",
-"Not enough space available" => "যথেষ্ঠ পরিমাণ স্থান নেই",
-"Upload cancelled." => "আপলোড বাতিল করা হয়েছে।",
-"File upload is in progress. Leaving the page now will cancel the upload." => "ফাইল আপলোড চলমান। এই পৃষ্ঠা পরিত্যাগ করলে আপলোড বাতিল করা হবে।",
-"URL cannot be empty." => "URL ফাঁকা রাখা যাবে না।",
 "Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "ফোল্ডারের নামটি সঠিক নয়। 'ভাগাভাগি করা' শুধুমাত্র Owncloud  এর জন্য সংরক্ষিত।",
-"Error" => "সমস্যা",
 "Name" => "রাম",
 "Size" => "আকার",
 "Modified" => "পরিবর্তিত",
@@ -39,7 +39,6 @@
 "{count} folders" => "{count} টি ফোল্ডার",
 "1 file" => "১টি ফাইল",
 "{count} files" => "{count} টি ফাইল",
-"Unable to rename file" => "ফাইলের নাম পরিবর্তন করা সম্ভব হলো না",
 "Upload" => "আপলোড",
 "File handling" => "ফাইল হ্যার্ডলিং",
 "Maximum upload size" => "আপলোডের সর্বোচ্চ আকার",
diff --git a/apps/files/l10n/ca.php b/apps/files/l10n/ca.php
index c1c94b99003f6d52dbf5bbb3736af9ed7bbf5c26..8d5f69f33184da19368df9b830fa157c77882ce5 100644
--- a/apps/files/l10n/ca.php
+++ b/apps/files/l10n/ca.php
@@ -1,6 +1,8 @@
 <?php $TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "No s'ha pogut moure %s - Ja hi ha un fitxer amb aquest nom",
 "Could not move %s" => " No s'ha pogut moure %s",
+"Unable to set upload directory." => "No es pot establir la carpeta de pujada.",
+"Invalid Token" => "Testimoni no vàlid",
 "No file was uploaded. Unknown error" => "No s'ha carregat cap fitxer. Error desconegut",
 "There is no error, the file uploaded with success" => "No hi ha errors, el fitxer s'ha carregat correctament",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "L’arxiu que voleu carregar supera el màxim definit en la directiva upload_max_filesize del php.ini:",
@@ -12,6 +14,13 @@
 "Not enough storage available" => "No hi ha prou espai disponible",
 "Invalid directory." => "Directori no vàlid.",
 "Files" => "Fitxers",
+"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",
+"Not enough space available" => "No hi ha prou espai disponible",
+"Upload cancelled." => "La pujada s'ha cancel·lat.",
+"File upload is in progress. Leaving the page now will cancel the upload." => "Hi ha una pujada en curs. Si abandoneu la pàgina la pujada es cancel·larà.",
+"URL cannot be empty." => "La URL no pot ser buida",
+"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Nom de carpeta no vàlid. L'ús de 'Shared' està reservat per Owncloud",
+"Error" => "Error",
 "Share" => "Comparteix",
 "Delete permanently" => "Esborra permanentment",
 "Delete" => "Esborra",
@@ -32,13 +41,7 @@
 "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",
-"Not enough space available" => "No hi ha prou espai disponible",
-"Upload cancelled." => "La pujada s'ha cancel·lat.",
-"File upload is in progress. Leaving the page now will cancel the upload." => "Hi ha una pujada en curs. Si abandoneu la pàgina la pujada es cancel·larà.",
-"URL cannot be empty." => "La URL no pot ser buida",
 "Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Nom de carpeta no vàlid. L'ús de 'Shared' està reservat per Owncloud",
-"Error" => "Error",
 "Name" => "Nom",
 "Size" => "Mida",
 "Modified" => "Modificat",
@@ -46,8 +49,7 @@
 "{count} folders" => "{count} carpetes",
 "1 file" => "1 fitxer",
 "{count} files" => "{count} fitxers",
-"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Nom de carpeta no vàlid. L'ús de 'Shared' està reservat per Owncloud",
-"Unable to rename file" => "No es pot canviar el nom del fitxer",
+"%s could not be renamed" => "%s no es pot canviar el nom",
 "Upload" => "Puja",
 "File handling" => "Gestió de fitxers",
 "Maximum upload size" => "Mida màxima de pujada",
@@ -71,5 +73,9 @@
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Els fitxers que esteu intentant pujar excedeixen la mida màxima de pujada del servidor",
 "Files are being scanned, please wait." => "S'estan escanejant els fitxers, espereu",
 "Current scanning" => "Actualment escanejant",
+"directory" => "directori",
+"directories" => "directoris",
+"file" => "fitxer",
+"files" => "fitxers",
 "Upgrading filesystem cache..." => "Actualitzant la memòria de cau del sistema de fitxers..."
 );
diff --git a/apps/files/l10n/cs_CZ.php b/apps/files/l10n/cs_CZ.php
index 8c6b6372655a99d639d43d965e5bdf4ef3c68602..c16d32e9c28e81e505f755b5ef8400b4141ede43 100644
--- a/apps/files/l10n/cs_CZ.php
+++ b/apps/files/l10n/cs_CZ.php
@@ -1,6 +1,8 @@
 <?php $TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "Nelze přesunout %s - existuje soubor se stejným názvem",
 "Could not move %s" => "Nelze přesunout %s",
+"Unable to set upload directory." => "Nelze nastavit adresář pro nahrané soubory.",
+"Invalid Token" => "Neplatný token",
 "No file was uploaded. Unknown error" => "Soubor nebyl odeslán. Neznámá chyba",
 "There is no error, the file uploaded with success" => "Soubor byl odeslán úspěšně",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Odesílaný soubor přesahuje velikost upload_max_filesize povolenou v php.ini:",
@@ -12,6 +14,13 @@
 "Not enough storage available" => "Nedostatek dostupného úložného prostoru",
 "Invalid directory." => "Neplatný adresář",
 "Files" => "Soubory",
+"Unable to upload your file as it is a directory or has 0 bytes" => "Nelze odeslat Váš soubor, protože je to adresář, nebo je jeho velikost 0 bajtů",
+"Not enough space available" => "Nedostatek dostupného místa",
+"Upload cancelled." => "Odesílání zrušeno.",
+"File upload is in progress. Leaving the page now will cancel the upload." => "Probíhá odesílání souboru. Opuštění stránky vyústí ve zrušení nahrávání.",
+"URL cannot be empty." => "URL nemůže být prázdná",
+"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Název složky nelze použít. Použití názvu 'Shared' je ownCloudem rezervováno",
+"Error" => "Chyba",
 "Share" => "Sdílet",
 "Delete permanently" => "Trvale odstranit",
 "Delete" => "Smazat",
@@ -32,13 +41,7 @@
 "Your storage is full, files can not be updated or synced anymore!" => "Vaše úložiště je plné, nelze aktualizovat ani synchronizovat soubory.",
 "Your storage is almost full ({usedSpacePercent}%)" => "Vaše úložiště je téměř plné ({usedSpacePercent}%)",
 "Your download is being prepared. This might take some time if the files are big." => "Vaše soubory ke stažení se připravují. Pokud jsou velké může to chvíli trvat.",
-"Unable to upload your file as it is a directory or has 0 bytes" => "Nelze odeslat Váš soubor, protože je to adresář, nebo je jeho velikost 0 bajtů",
-"Not enough space available" => "Nedostatek dostupného místa",
-"Upload cancelled." => "Odesílání zrušeno.",
-"File upload is in progress. Leaving the page now will cancel the upload." => "Probíhá odesílání souboru. Opuštění stránky vyústí ve zrušení nahrávání.",
-"URL cannot be empty." => "URL nemůže být prázdná",
 "Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Neplatný název složky. Použití 'Shared' je rezervováno pro vnitřní potřeby Owncloud",
-"Error" => "Chyba",
 "Name" => "Název",
 "Size" => "Velikost",
 "Modified" => "Upraveno",
@@ -46,8 +49,6 @@
 "{count} folders" => "{count} složky",
 "1 file" => "1 soubor",
 "{count} files" => "{count} soubory",
-"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Název složky nelze použít. Použití názvu 'Shared' je ownCloudem rezervováno",
-"Unable to rename file" => "Nelze přejmenovat soubor",
 "Upload" => "Odeslat",
 "File handling" => "Zacházení se soubory",
 "Maximum upload size" => "Maximální velikost pro odesílání",
@@ -71,5 +72,7 @@
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Soubory, které se snažíte odeslat, překračují limit velikosti odesílání na tomto serveru.",
 "Files are being scanned, please wait." => "Soubory se prohledávají, prosím čekejte.",
 "Current scanning" => "Aktuální prohledávání",
+"file" => "soubor",
+"files" => "soubory",
 "Upgrading filesystem cache..." => "Aktualizuji mezipaměť souborového systému..."
 );
diff --git a/apps/files/l10n/cy_GB.php b/apps/files/l10n/cy_GB.php
index ae3394889109c7c433750946b7d7c856e793ec89..0aab1a18bc5da97120d00d1b941973a82f77871d 100644
--- a/apps/files/l10n/cy_GB.php
+++ b/apps/files/l10n/cy_GB.php
@@ -12,6 +12,12 @@
 "Not enough storage available" => "Dim digon o le storio ar gael",
 "Invalid directory." => "Cyfeiriadur annilys.",
 "Files" => "Ffeiliau",
+"Unable to upload your file as it is a directory or has 0 bytes" => "Methu llwytho'ch ffeil i fyny gan ei fod yn gyferiadur neu'n cynnwys 0 beit",
+"Not enough space available" => "Dim digon o le ar gael",
+"Upload cancelled." => "Diddymwyd llwytho i fyny.",
+"File upload is in progress. Leaving the page now will cancel the upload." => "Mae ffeiliau'n cael eu llwytho i fyny. Bydd gadael y dudalen hon nawr yn diddymu'r broses.",
+"URL cannot be empty." => "Does dim hawl cael URL gwag.",
+"Error" => "Gwall",
 "Share" => "Rhannu",
 "Delete permanently" => "Dileu'n barhaol",
 "Delete" => "Dileu",
@@ -32,13 +38,7 @@
 "Your storage is full, files can not be updated or synced anymore!" => "Mae eich storfa'n llawn, ni ellir diweddaru a chydweddu ffeiliau mwyach!",
 "Your storage is almost full ({usedSpacePercent}%)" => "Mae eich storfa bron a bod yn llawn ({usedSpacePercent}%)",
 "Your download is being prepared. This might take some time if the files are big." => "Wrthi'n paratoi i lwytho i lawr. Gall gymryd peth amser os yw'r ffeiliau'n fawr.",
-"Unable to upload your file as it is a directory or has 0 bytes" => "Methu llwytho'ch ffeil i fyny gan ei fod yn gyferiadur neu'n cynnwys 0 beit",
-"Not enough space available" => "Dim digon o le ar gael",
-"Upload cancelled." => "Diddymwyd llwytho i fyny.",
-"File upload is in progress. Leaving the page now will cancel the upload." => "Mae ffeiliau'n cael eu llwytho i fyny. Bydd gadael y dudalen hon nawr yn diddymu'r broses.",
-"URL cannot be empty." => "Does dim hawl cael URL gwag.",
 "Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Enw plygell annilys. Mae'r defnydd o 'Shared' yn cael ei gadw gan Owncloud",
-"Error" => "Gwall",
 "Name" => "Enw",
 "Size" => "Maint",
 "Modified" => "Addaswyd",
@@ -46,7 +46,6 @@
 "{count} folders" => "{count} plygell",
 "1 file" => "1 ffeil",
 "{count} files" => "{count} ffeil",
-"Unable to rename file" => "Methu ailenwi ffeil",
 "Upload" => "Llwytho i fyny",
 "File handling" => "Trafod ffeiliau",
 "Maximum upload size" => "Maint mwyaf llwytho i fyny",
diff --git a/apps/files/l10n/da.php b/apps/files/l10n/da.php
index 542e0d05d6004efb140997ac6f5058aaa8998c8b..c2f200e476fe956b2b9247b966b2a982840d4a6a 100644
--- a/apps/files/l10n/da.php
+++ b/apps/files/l10n/da.php
@@ -12,6 +12,13 @@
 "Not enough storage available" => "Der er ikke nok plads til rådlighed",
 "Invalid directory." => "Ugyldig mappe.",
 "Files" => "Filer",
+"Unable to upload your file as it is a directory or has 0 bytes" => "Kan ikke uploade din fil - det er enten en mappe eller en fil med et indhold på 0 bytes.",
+"Not enough space available" => "ikke nok tilgængelig ledig plads ",
+"Upload cancelled." => "Upload afbrudt.",
+"File upload is in progress. Leaving the page now will cancel the upload." => "Fil upload kører. Hvis du forlader siden nu, vil uploadet blive annuleret.",
+"URL cannot be empty." => "URLen kan ikke være tom.",
+"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Ugyldigt mappenavn. Brug af 'Shared' er forbeholdt af ownCloud",
+"Error" => "Fejl",
 "Share" => "Del",
 "Delete permanently" => "Slet permanent",
 "Delete" => "Slet",
@@ -32,13 +39,7 @@
 "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" => "Kan ikke uploade din fil - det er enten en mappe eller en fil med et indhold på 0 bytes.",
-"Not enough space available" => "ikke nok tilgængelig ledig plads ",
-"Upload cancelled." => "Upload afbrudt.",
-"File upload is in progress. Leaving the page now will cancel the upload." => "Fil upload kører. Hvis du forlader siden nu, vil uploadet blive annuleret.",
-"URL cannot be empty." => "URLen kan ikke være tom.",
 "Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Ugyldigt mappenavn. Brug af \"Shared\" er forbeholdt Owncloud",
-"Error" => "Fejl",
 "Name" => "Navn",
 "Size" => "Størrelse",
 "Modified" => "Ændret",
@@ -46,8 +47,6 @@
 "{count} folders" => "{count} mapper",
 "1 file" => "1 fil",
 "{count} files" => "{count} filer",
-"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Ugyldigt mappenavn. Brug af 'Shared' er forbeholdt af ownCloud",
-"Unable to rename file" => "Kunne ikke omdøbe fil",
 "Upload" => "Upload",
 "File handling" => "Filhåndtering",
 "Maximum upload size" => "Maksimal upload-størrelse",
@@ -71,5 +70,7 @@
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Filerne, du prøver at uploade, er større end den maksimale størrelse for fil-upload på denne server.",
 "Files are being scanned, please wait." => "Filerne bliver indlæst, vent venligst.",
 "Current scanning" => "Indlæser",
+"file" => "fil",
+"files" => "filer",
 "Upgrading filesystem cache..." => "Opgraderer filsystems cachen..."
 );
diff --git a/apps/files/l10n/de.php b/apps/files/l10n/de.php
index e9a6ad6bdef97996d8f5c846eb4a6052528148ac..98214d6a1b23a9872b2238ff8b8ccb9d71c5dfdf 100644
--- a/apps/files/l10n/de.php
+++ b/apps/files/l10n/de.php
@@ -12,6 +12,13 @@
 "Not enough storage available" => "Nicht genug Speicher vorhanden.",
 "Invalid directory." => "Ungültiges Verzeichnis.",
 "Files" => "Dateien",
+"Unable to upload your file as it is a directory or has 0 bytes" => "Deine Datei kann nicht hochgeladen werden, weil es sich um einen Ordner handelt oder 0 Bytes groß ist.",
+"Not enough space available" => "Nicht genug Speicherplatz verfügbar",
+"Upload cancelled." => "Upload abgebrochen.",
+"File upload is in progress. Leaving the page now will cancel the upload." => "Dateiupload läuft. Wenn Du die Seite jetzt verlässt, wird der Upload abgebrochen.",
+"URL cannot be empty." => "Die URL darf nicht leer sein.",
+"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Der Ordnername ist ungültig. Nur ownCloud kann den Ordner \"Shared\" anlegen",
+"Error" => "Fehler",
 "Share" => "Teilen",
 "Delete permanently" => "Endgültig löschen",
 "Delete" => "Löschen",
@@ -32,13 +39,7 @@
 "Your storage is full, files can not be updated or synced anymore!" => "Dein Speicher ist voll, daher können keine Dateien mehr aktualisiert oder synchronisiert werden!",
 "Your storage is almost full ({usedSpacePercent}%)" => "Dein Speicher ist fast voll ({usedSpacePercent}%)",
 "Your download is being prepared. This might take some time if the files are big." => "Dein Download wird vorbereitet. Dies kann bei größeren Dateien etwas dauern.",
-"Unable to upload your file as it is a directory or has 0 bytes" => "Deine Datei kann nicht hochgeladen werden, weil es sich um einen Ordner handelt oder 0 Bytes groß ist.",
-"Not enough space available" => "Nicht genug Speicherplatz verfügbar",
-"Upload cancelled." => "Upload abgebrochen.",
-"File upload is in progress. Leaving the page now will cancel the upload." => "Dateiupload läuft. Wenn Du die Seite jetzt verlässt, wird der Upload abgebrochen.",
-"URL cannot be empty." => "Die URL darf nicht leer sein.",
 "Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Ungültiger Verzeichnisname. Die Nutzung von \"Shared\" ist ownCloud vorbehalten.",
-"Error" => "Fehler",
 "Name" => "Name",
 "Size" => "Größe",
 "Modified" => "Geändert",
@@ -46,8 +47,6 @@
 "{count} folders" => "{count} Ordner",
 "1 file" => "1 Datei",
 "{count} files" => "{count} Dateien",
-"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Der Ordnername ist ungültig. Nur ownCloud kann den Ordner \"Shared\" anlegen",
-"Unable to rename file" => "Konnte Datei nicht umbenennen",
 "Upload" => "Hochladen",
 "File handling" => "Dateibehandlung",
 "Maximum upload size" => "Maximale Upload-Größe",
@@ -71,5 +70,7 @@
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Die Datei überschreitet die Maximalgröße für Uploads auf diesem Server.",
 "Files are being scanned, please wait." => "Dateien werden gescannt, bitte warten.",
 "Current scanning" => "Scanne",
+"file" => "Datei",
+"files" => "Dateien",
 "Upgrading filesystem cache..." => "Dateisystem-Cache wird aktualisiert ..."
 );
diff --git a/apps/files/l10n/de_DE.php b/apps/files/l10n/de_DE.php
index 3c06c1ac83de1c42c3b3bf7be0dff05761723656..f9c347b45da4d3aca74810336a8b2fcb1ea4f455 100644
--- a/apps/files/l10n/de_DE.php
+++ b/apps/files/l10n/de_DE.php
@@ -1,6 +1,8 @@
 <?php $TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "Konnte %s nicht verschieben. Eine Datei mit diesem Namen existiert bereits",
 "Could not move %s" => "Konnte %s nicht verschieben",
+"Unable to set upload directory." => "Das Upload-Verzeichnis konnte nicht gesetzt werden.",
+"Invalid Token" => "Ungültiges Merkmal",
 "No file was uploaded. Unknown error" => "Keine Datei hochgeladen. Unbekannter Fehler",
 "There is no error, the file uploaded with success" => "Es ist kein Fehler aufgetreten. Die Datei wurde erfolgreich hochgeladen.",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Die hochgeladene Datei überschreitet die upload_max_filesize Vorgabe in php.ini",
@@ -12,6 +14,13 @@
 "Not enough storage available" => "Nicht genug Speicher vorhanden.",
 "Invalid directory." => "Ungültiges Verzeichnis.",
 "Files" => "Dateien",
+"Unable to upload your file as it is a directory or has 0 bytes" => "Ihre Datei kann nicht hochgeladen werden, weil es sich um einen Ordner handelt oder 0 Bytes groß ist.",
+"Not enough space available" => "Nicht genügend Speicherplatz verfügbar",
+"Upload cancelled." => "Upload abgebrochen.",
+"File upload is in progress. Leaving the page now will cancel the upload." => "Dateiupload läuft. Wenn Sie die Seite jetzt verlassen, wird der Upload abgebrochen.",
+"URL cannot be empty." => "Die URL darf nicht leer sein.",
+"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Ungültiger Ordnername. Die Verwendung von \"Shared\" ist ownCloud vorbehalten.",
+"Error" => "Fehler",
 "Share" => "Teilen",
 "Delete permanently" => "Endgültig löschen",
 "Delete" => "Löschen",
@@ -32,13 +41,7 @@
 "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 etwas dauern.",
-"Unable to upload your file as it is a directory or has 0 bytes" => "Ihre Datei kann nicht hochgeladen werden, weil es sich um einen Ordner handelt oder 0 Bytes groß ist.",
-"Not enough space available" => "Nicht genügend Speicherplatz verfügbar",
-"Upload cancelled." => "Upload abgebrochen.",
-"File upload is in progress. Leaving the page now will cancel the upload." => "Dateiupload läuft. Wenn Sie die Seite jetzt verlassen, wird der Upload abgebrochen.",
-"URL cannot be empty." => "Die URL darf nicht leer sein.",
 "Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Ungültiger Verzeichnisname. Die Nutzung von \"Shared\" ist ownCloud vorbehalten",
-"Error" => "Fehler",
 "Name" => "Name",
 "Size" => "Größe",
 "Modified" => "Geändert",
@@ -46,8 +49,7 @@
 "{count} folders" => "{count} Ordner",
 "1 file" => "1 Datei",
 "{count} files" => "{count} Dateien",
-"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Ungültiger Ordnername. Die Verwendung von \"Shared\" ist ownCloud vorbehalten.",
-"Unable to rename file" => "Konnte Datei nicht umbenennen",
+"%s could not be renamed" => "%s konnte nicht umbenannt werden",
 "Upload" => "Hochladen",
 "File handling" => "Dateibehandlung",
 "Maximum upload size" => "Maximale Upload-Größe",
@@ -71,5 +73,9 @@
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Die Datei überschreitet die Maximalgröße für Uploads auf diesem Server.",
 "Files are being scanned, please wait." => "Dateien werden gescannt, bitte warten.",
 "Current scanning" => "Scanne",
+"directory" => "Verzeichnis",
+"directories" => "Verzeichnisse",
+"file" => "Datei",
+"files" => "Dateien",
 "Upgrading filesystem cache..." => "Dateisystem-Cache wird aktualisiert ..."
 );
diff --git a/apps/files/l10n/el.php b/apps/files/l10n/el.php
index b273f6b522dde74280b8fdf35be2ba7bb094b7da..7291dbbf1569a183b7aa3fc410beaa828ec887a4 100644
--- a/apps/files/l10n/el.php
+++ b/apps/files/l10n/el.php
@@ -12,6 +12,13 @@
 "Not enough storage available" => "Μη επαρκής διαθέσιμος αποθηκευτικός χώρος",
 "Invalid directory." => "Μη έγκυρος φάκελος.",
 "Files" => "Αρχεία",
+"Unable to upload your file as it is a directory or has 0 bytes" => "Αδυναμία στην αποστολή του αρχείου σας αφού είναι φάκελος ή έχει 0 bytes",
+"Not enough space available" => "Δεν υπάρχει αρκετός διαθέσιμος χώρος",
+"Upload cancelled." => "Η αποστολή ακυρώθηκε.",
+"File upload is in progress. Leaving the page now will cancel the upload." => "Η αποστολή του αρχείου βρίσκεται σε εξέλιξη. Το κλείσιμο της σελίδας θα ακυρώσει την αποστολή.",
+"URL cannot be empty." => "Η URL δεν μπορεί να είναι κενή.",
+"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Μη έγκυρο όνομα φακέλου. Η χρήση του 'Κοινόχρηστος' χρησιμοποιείται από το ownCloud",
+"Error" => "Σφάλμα",
 "Share" => "Διαμοιρασμός",
 "Delete permanently" => "Μόνιμη διαγραφή",
 "Delete" => "Διαγραφή",
@@ -32,13 +39,7 @@
 "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",
-"Not enough space available" => "Δεν υπάρχει αρκετός διαθέσιμος χώρος",
-"Upload cancelled." => "Η αποστολή ακυρώθηκε.",
-"File upload is in progress. Leaving the page now will cancel the upload." => "Η αποστολή του αρχείου βρίσκεται σε εξέλιξη. Το κλείσιμο της σελίδας θα ακυρώσει την αποστολή.",
-"URL cannot be empty." => "Η URL δεν μπορεί να είναι κενή.",
 "Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Μη έγκυρο όνομα φακέλου. Η χρήση του 'Κοινόχρηστος' χρησιμοποιείται από ο Owncloud",
-"Error" => "Σφάλμα",
 "Name" => "Όνομα",
 "Size" => "Μέγεθος",
 "Modified" => "Τροποποιήθηκε",
@@ -46,8 +47,6 @@
 "{count} folders" => "{count} φάκελοι",
 "1 file" => "1 αρχείο",
 "{count} files" => "{count} αρχεία",
-"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Μη έγκυρο όνομα φακέλου. Η χρήση του 'Κοινόχρηστος' χρησιμοποιείται από το ownCloud",
-"Unable to rename file" => "Αδυναμία μετονομασίας αρχείου",
 "Upload" => "Μεταφόρτωση",
 "File handling" => "Διαχείριση αρχείων",
 "Maximum upload size" => "Μέγιστο μέγεθος αποστολής",
@@ -71,5 +70,9 @@
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Τα αρχεία που προσπαθείτε να ανεβάσετε υπερβαίνουν το μέγιστο μέγεθος αποστολής αρχείων σε αυτόν τον διακομιστή.",
 "Files are being scanned, please wait." => "Τα αρχεία σαρώνονται, παρακαλώ περιμένετε.",
 "Current scanning" => "Τρέχουσα ανίχνευση",
+"directory" => "κατάλογος",
+"directories" => "κατάλογοι",
+"file" => "αρχείο",
+"files" => "αρχεία",
 "Upgrading filesystem cache..." => "Ενημέρωση της μνήμης cache του συστήματος αρχείων..."
 );
diff --git a/apps/files/l10n/eo.php b/apps/files/l10n/eo.php
index 3eeb88754c75fdde2d0082fa205e8d2038210059..561545ec6aeef5d7a6a1d33922fcf94229eb34bf 100644
--- a/apps/files/l10n/eo.php
+++ b/apps/files/l10n/eo.php
@@ -9,9 +9,18 @@
 "No file was uploaded" => "Neniu dosiero alŝutiĝis.",
 "Missing a temporary folder" => "Mankas provizora dosierujo.",
 "Failed to write to disk" => "Malsukcesis skribo al disko",
+"Not enough storage available" => "Ne haveblas sufiĉa memoro",
 "Invalid directory." => "Nevalida dosierujo.",
 "Files" => "Dosieroj",
+"Unable to upload your file as it is a directory or has 0 bytes" => "Ne eblis alŝuti vian dosieron ĉar ĝi estas dosierujo aŭ havas 0 duumokojn",
+"Not enough space available" => "Ne haveblas sufiĉa spaco",
+"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. La uzo de “Shared” estas rezervita de ownCloud.",
+"Error" => "Eraro",
 "Share" => "Kunhavigi",
+"Delete permanently" => "Forigi por ĉiam",
 "Delete" => "Forigi",
 "Rename" => "Alinomigi",
 "Pending" => "Traktotaj",
@@ -21,19 +30,16 @@
 "cancel" => "nuligi",
 "replaced {new_name} with {old_name}" => "anstataŭiĝis {new_name} per {old_name}",
 "undo" => "malfari",
+"perform delete operation" => "plenumi forigan operacion",
 "1 file uploading" => "1 dosiero estas alŝutata",
 "files uploading" => "dosieroj estas alŝutataj",
 "'.' is an invalid file name." => "'.' ne estas valida dosiernomo.",
 "File name cannot be empty." => "Dosiernomo devas ne malpleni.",
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nevalida nomo: “\\”, “/”, “<”, “>”, “:”, “\"”, “|”, “?” kaj “*” ne permesatas.",
+"Your storage is full, files can not be updated or synced anymore!" => "Via memoro plenas, ne plu eblas ĝisdatigi aŭ sinkronigi dosierojn!",
+"Your storage is almost full ({usedSpacePercent}%)" => "Via memoro preskaÅ­ plenas ({usedSpacePercent}%)",
 "Your download is being prepared. This might take some time if the files are big." => "Via elŝuto pretiĝatas. Ĉi tio povas daŭri iom da tempo se la dosieroj grandas.",
-"Unable to upload your file as it is a directory or has 0 bytes" => "Ne eblis alŝuti vian dosieron ĉar ĝi estas dosierujo aŭ havas 0 duumokojn",
-"Not enough space available" => "Ne haveblas sufiĉa spaco",
-"Upload cancelled." => "La alŝuto nuliĝis.",
-"File upload is in progress. Leaving the page now will cancel the upload." => "Dosieralŝuto plenumiĝas. Lasi la paĝon nun nuligus la alŝuton.",
-"URL cannot be empty." => "URL ne povas esti malplena.",
 "Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Nevalida dosierujnomo. Uzo de “Shared” rezervatas de Owncloud.",
-"Error" => "Eraro",
 "Name" => "Nomo",
 "Size" => "Grando",
 "Modified" => "Modifita",
@@ -41,7 +47,6 @@
 "{count} folders" => "{count} dosierujoj",
 "1 file" => "1 dosiero",
 "{count} files" => "{count} dosierujoj",
-"Unable to rename file" => "Ne eblis alinomigi dosieron",
 "Upload" => "Alŝuti",
 "File handling" => "Dosieradministro",
 "Maximum upload size" => "Maksimuma alŝutogrando",
@@ -55,12 +60,17 @@
 "Text file" => "Tekstodosiero",
 "Folder" => "Dosierujo",
 "From link" => "El ligilo",
+"Deleted files" => "Forigitaj dosieroj",
 "Cancel upload" => "Nuligi alŝuton",
+"You don’t have write permissions here." => "Vi ne havas permeson skribi ĉi tie.",
 "Nothing in here. Upload something!" => "Nenio estas ĉi tie. Alŝutu ion!",
 "Download" => "Elŝuti",
 "Unshare" => "Malkunhavigi",
 "Upload too large" => "Alŝuto tro larĝa",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "La dosieroj, kiujn vi provas alŝuti, transpasas la maksimuman grandon por dosieralŝutoj en ĉi tiu servilo.",
 "Files are being scanned, please wait." => "Dosieroj estas skanataj, bonvolu atendi.",
-"Current scanning" => "Nuna skano"
+"Current scanning" => "Nuna skano",
+"file" => "dosiero",
+"files" => "dosieroj",
+"Upgrading filesystem cache..." => "Ĝisdatiĝas dosiersistema kaŝmemoro..."
 );
diff --git a/apps/files/l10n/es.php b/apps/files/l10n/es.php
index b11adfabeb3e0b67204d02f38ac274bd54f2adf0..78740d5150726cad47c6d324c35e1b07aa75546c 100644
--- a/apps/files/l10n/es.php
+++ b/apps/files/l10n/es.php
@@ -1,44 +1,47 @@
 <?php $TRANSLATIONS = array(
-"Could not move %s - File with this name already exists" => "No se puede mover %s - Ya existe un archivo con ese nombre",
-"Could not move %s" => "No se puede mover %s",
+"Could not move %s - File with this name already exists" => "No se pudo mover %s - Un archivo con ese nombre ya existe.",
+"Could not move %s" => "No se pudo mover %s",
+"Unable to set upload directory." => "Incapaz de crear directorio de subida.",
+"Invalid Token" => "Token Inválido",
 "No file was uploaded. Unknown error" => "No se subió ningún archivo. Error desconocido",
 "There is no error, the file uploaded with success" => "No hay ningún error, el archivo se ha subido con éxito",
-"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "El archivo que intentas subir sobrepasa el tamaño definido por la variable upload_max_filesize en php.ini",
+"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "El archivo subido sobrepasa la directiva upload_max_filesize en php.ini",
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "El archivo subido sobrepasa la directiva MAX_FILE_SIZE especificada en el formulario HTML",
-"The uploaded file was only partially uploaded" => "El archivo se ha subido parcialmente",
-"No file was uploaded" => "No se ha subido ningún archivo",
+"The uploaded file was only partially uploaded" => "El archivo subido fue sólo subido parcialmente",
+"No file was uploaded" => "No se subió ningún archivo",
 "Missing a temporary folder" => "Falta la carpeta temporal",
-"Failed to write to disk" => "La escritura en disco ha fallado",
+"Failed to write to disk" => "Falló al escribir al disco",
 "Not enough storage available" => "No hay suficiente espacio disponible",
-"Invalid directory." => "Directorio invalido.",
+"Invalid directory." => "Directorio inválido.",
 "Files" => "Archivos",
+"Unable to upload your file as it is a directory or has 0 bytes" => "Incapaz de subir su archivo, es un directorio o tiene 0 bytes",
+"Not enough space available" => "No hay suficiente espacio disponible",
+"Upload cancelled." => "Subida cancelada.",
+"File upload is in progress. Leaving the page now will cancel the upload." => "La subida del archivo está en proceso. Si sale 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\" está reservado por ownCloud",
+"Error" => "Error",
 "Share" => "Compartir",
 "Delete permanently" => "Eliminar permanentemente",
 "Delete" => "Eliminar",
 "Rename" => "Renombrar",
-"Pending" => "Pendientes",
+"Pending" => "Pendiente",
 "{new_name} already exists" => "{new_name} ya existe",
 "replace" => "reemplazar",
 "suggest name" => "sugerir nombre",
 "cancel" => "cancelar",
 "replaced {new_name} with {old_name}" => "reemplazado {new_name} con {old_name}",
 "undo" => "deshacer",
-"perform delete operation" => "Eliminar",
+"perform delete operation" => "Realizar operación de borrado",
 "1 file uploading" => "subiendo 1 archivo",
 "files uploading" => "subiendo archivos",
 "'.' is an invalid file name." => "'.' no es un nombre de archivo válido.",
 "File name cannot be empty." => "El nombre de archivo no puede estar vacío.",
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nombre Invalido, \"\\\", \"/\", \"<\", \">\", \":\", \"\", \"|\" \"?\" y \"*\" no están permitidos ",
-"Your storage is full, files can not be updated or synced anymore!" => "Su almacenamiento está lleno, ¡no se pueden actualizar ni sincronizar archivos!",
+"Your storage is full, files can not be updated or synced anymore!" => "Su almacenamiento está lleno, ¡no se pueden actualizar o sincronizar más!",
 "Your storage is almost full ({usedSpacePercent}%)" => "Su almacenamiento está casi lleno ({usedSpacePercent}%)",
-"Your download is being prepared. This might take some time if the files are big." => "Su descarga está siendo preparada. Esto puede tardar algún tiempo si los archivos son muy grandes.",
-"Unable to upload your file as it is a directory or has 0 bytes" => "Imposible subir su archivo, es un directorio o tiene 0 bytes",
-"Not enough space available" => "No hay suficiente espacio disponible",
-"Upload cancelled." => "Subida cancelada.",
-"File upload is in progress. Leaving the page now will cancel the upload." => "La subida del archivo está en proceso. Si sale de la página ahora, se cancelará la subida.",
-"URL cannot be empty." => "La URL no puede estar vacía.",
-"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "El nombre de carpeta no es válido. El uso de \"Shared\" está reservado para Owncloud",
-"Error" => "Error",
+"Your download is being prepared. This might take some time if the files are big." => "Su descarga está siendo preparada. Esto puede tardar algún tiempo si los archivos son grandes.",
+"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Nombre de carpeta no es válido. El uso de \"Shared\" está reservado por Owncloud",
 "Name" => "Nombre",
 "Size" => "Tamaño",
 "Modified" => "Modificado",
@@ -46,13 +49,12 @@
 "{count} folders" => "{count} carpetas",
 "1 file" => "1 archivo",
 "{count} files" => "{count} archivos",
-"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Nombre de carpeta invalido. El uso de \"Shared\" esta reservado para ownCloud",
-"Unable to rename file" => "No se puede renombrar el archivo",
+"%s could not be renamed" => "%s no se pudo renombrar",
 "Upload" => "Subir",
-"File handling" => "Tratamiento de archivos",
+"File handling" => "Manejo de archivos",
 "Maximum upload size" => "Tamaño máximo de subida",
 "max. possible: " => "máx. posible:",
-"Needed for multi-file and folder downloads." => "Se necesita para descargas multi-archivo y de carpetas",
+"Needed for multi-file and folder downloads." => "Necesario para multi-archivo y descarga de carpetas",
 "Enable ZIP-download" => "Habilitar descarga en ZIP",
 "0 is unlimited" => "0 es ilimitado",
 "Maximum input size for ZIP files" => "Tamaño máximo para archivos ZIP de entrada",
@@ -60,16 +62,20 @@
 "New" => "Nuevo",
 "Text file" => "Archivo de texto",
 "Folder" => "Carpeta",
-"From link" => "Desde el enlace",
+"From link" => "Desde enlace",
 "Deleted files" => "Archivos eliminados",
 "Cancel upload" => "Cancelar subida",
-"You don’t have write permissions here." => "No tienes permisos para escribir aquí.",
-"Nothing in here. Upload something!" => "Aquí no hay nada. ¡Sube algo!",
+"You don’t have write permissions here." => "No tiene permisos de escritura aquí.",
+"Nothing in here. Upload something!" => "No hay nada aquí. ¡Suba algo!",
 "Download" => "Descargar",
 "Unshare" => "Dejar de compartir",
 "Upload too large" => "Subida demasido grande",
-"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Los archivos que estás intentando subir sobrepasan el tamaño máximo permitido por este servidor.",
-"Files are being scanned, please wait." => "Se están escaneando los archivos, por favor espere.",
+"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Los archivos que estás intentando subir sobrepasan el tamaño máximo permitido en este servidor.",
+"Files are being scanned, please wait." => "Los archivos están siendo escaneados,  por favor espere.",
 "Current scanning" => "Escaneo actual",
+"directory" => "carpeta",
+"directories" => "carpetas",
+"file" => "archivo",
+"files" => "archivos",
 "Upgrading filesystem cache..." => "Actualizando caché del sistema de archivos"
 );
diff --git a/apps/files/l10n/es_AR.php b/apps/files/l10n/es_AR.php
index 0ae47302edf7f020ab8e603e88178b5ff7bf602d..d5ae7ae53d28c8065f20d935a2ab54d205166e6d 100644
--- a/apps/files/l10n/es_AR.php
+++ b/apps/files/l10n/es_AR.php
@@ -12,6 +12,13 @@
 "Not enough storage available" => "No hay suficiente capacidad de almacenamiento",
 "Invalid directory." => "Directorio invalido.",
 "Files" => "Archivos",
+"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",
+"Not enough space available" => "No hay suficiente espacio disponible",
+"Upload cancelled." => "La subida fue cancelada",
+"File upload is in progress. Leaving the page now will cancel the upload." => "La subida del archivo está en proceso. Si salís de la página ahora, la subida se cancelará.",
+"URL cannot be empty." => "La URL no puede estar vacía",
+"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Nombre de carpeta inválido. El uso de \"Shared\" está reservado por ownCloud",
+"Error" => "Error",
 "Share" => "Compartir",
 "Delete permanently" => "Borrar de manera permanente",
 "Delete" => "Borrar",
@@ -32,13 +39,7 @@
 "Your storage is full, files can not be updated or synced anymore!" => "El almacenamiento está lleno, los archivos no se pueden seguir actualizando ni sincronizando",
 "Your storage is almost full ({usedSpacePercent}%)" => "El almacenamiento está casi lleno ({usedSpacePercent}%)",
 "Your download is being prepared. This might take some time if the files are big." => "Tu descarga esta siendo preparada. Esto puede tardar algun tiempo si los archivos son muy grandes.",
-"Unable to upload your file as it is a directory or has 0 bytes" => "No fue posible subir el archivo porque es un directorio o porque su tamaño es 0 bytes",
-"Not enough space available" => "No hay suficiente espacio disponible",
-"Upload cancelled." => "La subida fue cancelada",
-"File upload is in progress. Leaving the page now will cancel the upload." => "La subida del archivo está en proceso. Si salís de la página ahora, la subida se cancelará.",
-"URL cannot be empty." => "La URL no puede estar vacía",
 "Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Nombre de carpeta inválido. El uso de 'Shared' está reservado por ownCloud",
-"Error" => "Error",
 "Name" => "Nombre",
 "Size" => "Tamaño",
 "Modified" => "Modificado",
@@ -46,8 +47,6 @@
 "{count} folders" => "{count} directorios",
 "1 file" => "1 archivo",
 "{count} files" => "{count} archivos",
-"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Nombre de carpeta inválido. El uso de \"Shared\" está reservado por ownCloud",
-"Unable to rename file" => "No fue posible cambiar el nombre al archivo",
 "Upload" => "Subir",
 "File handling" => "Tratamiento de archivos",
 "Maximum upload size" => "Tamaño máximo de subida",
@@ -71,5 +70,7 @@
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Los archivos que intentás subir sobrepasan el tamaño máximo ",
 "Files are being scanned, please wait." => "Se están escaneando los archivos, por favor esperá.",
 "Current scanning" => "Escaneo actual",
+"file" => "archivo",
+"files" => "archivos",
 "Upgrading filesystem cache..." => "Actualizando el cache del sistema de archivos"
 );
diff --git a/apps/files/l10n/et_EE.php b/apps/files/l10n/et_EE.php
index d3fab4b0bd167e59a03f3f9e0f1f620a155b850c..c58b066e28719c9fe934f15cd83834971e251fae 100644
--- a/apps/files/l10n/et_EE.php
+++ b/apps/files/l10n/et_EE.php
@@ -1,6 +1,8 @@
 <?php $TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "Ei saa liigutada faili %s - samanimeline fail on juba olemas",
 "Could not move %s" => "%s liigutamine ebaõnnestus",
+"Unable to set upload directory." => "Üleslaadimiste kausta määramine ebaõnnestus.",
+"Invalid Token" => "Vigane kontrollkood",
 "No file was uploaded. Unknown error" => "Ühtegi faili ei laetud üles. Tundmatu viga",
 "There is no error, the file uploaded with success" => "Ühtegi tõrget polnud, fail on üles laetud",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Üleslaetava faili suurus ületab php.ini poolt määratud upload_max_filesize suuruse:",
@@ -12,6 +14,13 @@
 "Not enough storage available" => "Saadaval pole piisavalt ruumi",
 "Invalid directory." => "Vigane kaust.",
 "Files" => "Failid",
+"Unable to upload your file as it is a directory or has 0 bytes" => "Faili ei saa üles laadida, kuna see on kaust või selle suurus on 0 baiti",
+"Not enough space available" => "Pole piisavalt ruumi",
+"Upload cancelled." => "Üleslaadimine tühistati.",
+"File upload is in progress. Leaving the page now will cancel the upload." => "Faili üleslaadimine on töös. Lehelt lahkumine katkestab selle üleslaadimise.",
+"URL cannot be empty." => "URL ei saa olla tühi.",
+"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Vigane kausta nimi. 'Shared' kasutamine on reserveeritud ownCloud poolt.",
+"Error" => "Viga",
 "Share" => "Jaga",
 "Delete permanently" => "Kustuta jäädavalt",
 "Delete" => "Kustuta",
@@ -32,13 +41,7 @@
 "Your storage is full, files can not be updated or synced anymore!" => "Sinu andmemaht on täis! Faile ei uuendata ega sünkroniseerita!",
 "Your storage is almost full ({usedSpacePercent}%)" => "Su andmemaht on peaaegu täis ({usedSpacePercent}%)",
 "Your download is being prepared. This might take some time if the files are big." => "Valmistatakse allalaadimist. See võib võtta veidi aega, kui on tegu suurte failidega. ",
-"Unable to upload your file as it is a directory or has 0 bytes" => "Faili ei saa üles laadida, kuna see on kaust või selle suurus on 0 baiti",
-"Not enough space available" => "Pole piisavalt ruumi",
-"Upload cancelled." => "Üleslaadimine tühistati.",
-"File upload is in progress. Leaving the page now will cancel the upload." => "Faili üleslaadimine on töös. Lehelt lahkumine katkestab selle üleslaadimise.",
-"URL cannot be empty." => "URL ei saa olla tühi.",
 "Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Vigane kataloogi nimi. 'Shared' kasutamine on reserveeritud ownCloud poolt.",
-"Error" => "Viga",
 "Name" => "Nimi",
 "Size" => "Suurus",
 "Modified" => "Muudetud",
@@ -46,8 +49,7 @@
 "{count} folders" => "{count} kausta",
 "1 file" => "1 fail",
 "{count} files" => "{count} faili",
-"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Vigane kausta nimi. 'Shared' kasutamine on reserveeritud ownCloud poolt.",
-"Unable to rename file" => "Faili ümbernimetamine ebaõnnestus",
+"%s could not be renamed" => "%s ümbernimetamine ebaõnnestus",
 "Upload" => "Lae üles",
 "File handling" => "Failide käsitlemine",
 "Maximum upload size" => "Maksimaalne üleslaadimise suurus",
@@ -71,5 +73,9 @@
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Failid, mida sa proovid üles laadida, ületab serveri poolt üleslaetavatele failidele määratud maksimaalse suuruse.",
 "Files are being scanned, please wait." => "Faile skannitakse, palun oota.",
 "Current scanning" => "Praegune skannimine",
+"directory" => "kaust",
+"directories" => "kaustad",
+"file" => "fail",
+"files" => "faili",
 "Upgrading filesystem cache..." => "Failisüsteemi puhvri uuendamine..."
 );
diff --git a/apps/files/l10n/eu.php b/apps/files/l10n/eu.php
index a4afc2e8ca801c335c9f7970a0ea0b9ffdf22db3..c87e20b1ff66e4e322f97aeb1ac6e11d633f632e 100644
--- a/apps/files/l10n/eu.php
+++ b/apps/files/l10n/eu.php
@@ -12,6 +12,12 @@
 "Not enough storage available" => "Ez dago behar aina leku erabilgarri,",
 "Invalid directory." => "Baliogabeko karpeta.",
 "Files" => "Fitxategiak",
+"Unable to upload your file as it is a directory or has 0 bytes" => "Ezin izan da zure fitxategia igo karpeta bat delako edo 0 byte dituelako",
+"Not enough space available" => "Ez dago leku nahikorik.",
+"Upload cancelled." => "Igoera ezeztatuta",
+"File upload is in progress. Leaving the page now will cancel the upload." => "Fitxategien igoera martxan da. Orria orain uzteak igoera ezeztatutko du.",
+"URL cannot be empty." => "URLa ezin da hutsik egon.",
+"Error" => "Errorea",
 "Share" => "Elkarbanatu",
 "Delete permanently" => "Ezabatu betirako",
 "Delete" => "Ezabatu",
@@ -32,13 +38,7 @@
 "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 izan da zure fitxategia igo karpeta bat delako edo 0 byte dituelako",
-"Not enough space available" => "Ez dago leku nahikorik.",
-"Upload cancelled." => "Igoera ezeztatuta",
-"File upload is in progress. Leaving the page now will cancel the upload." => "Fitxategien igoera martxan da. Orria orain uzteak igoera ezeztatutko du.",
-"URL cannot be empty." => "URLa ezin da hutsik egon.",
 "Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Baliogabeako karpeta izena. 'Shared' izena Owncloudek erreserbatzen du",
-"Error" => "Errorea",
 "Name" => "Izena",
 "Size" => "Tamaina",
 "Modified" => "Aldatuta",
@@ -46,7 +46,6 @@
 "{count} folders" => "{count} karpeta",
 "1 file" => "fitxategi bat",
 "{count} files" => "{count} fitxategi",
-"Unable to rename file" => "Ezin izan da fitxategia berrizendatu",
 "Upload" => "Igo",
 "File handling" => "Fitxategien kudeaketa",
 "Maximum upload size" => "Igo daitekeen gehienezko tamaina",
@@ -70,5 +69,7 @@
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Igotzen saiatzen ari zaren fitxategiak zerbitzari honek igotzeko onartzen duena baino handiagoak dira.",
 "Files are being scanned, please wait." => "Fitxategiak eskaneatzen ari da, itxoin mezedez.",
 "Current scanning" => "Orain eskaneatzen ari da",
+"file" => "fitxategia",
+"files" => "fitxategiak",
 "Upgrading filesystem cache..." => "Fitxategi sistemaren katxea eguneratzen..."
 );
diff --git a/apps/files/l10n/fa.php b/apps/files/l10n/fa.php
index b97067ac19314eb9fc3d694ff8f638faffc48b22..73f4b493b4d88b3d02edf3fe8819169444a2d6ba 100644
--- a/apps/files/l10n/fa.php
+++ b/apps/files/l10n/fa.php
@@ -1,6 +1,8 @@
 <?php $TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "%s نمی تواند حرکت کند - در حال حاضر پرونده با این نام وجود دارد. ",
 "Could not move %s" => "%s نمی تواند حرکت کند ",
+"Unable to set upload directory." => "قادر به تنظیم پوشه آپلود نمی باشد.",
+"Invalid Token" => "رمز نامعتبر",
 "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 استفاده کرده است.",
@@ -12,6 +14,13 @@
 "Not enough storage available" => "فضای کافی در دسترس نیست",
 "Invalid directory." => "فهرست راهنما نامعتبر می باشد.",
 "Files" => "پرونده‌ها",
+"Unable to upload your file as it is a directory or has 0 bytes" => "ناتوان در بارگذاری یا فایل یک پوشه است یا 0بایت دارد",
+"Not enough space available" => "فضای کافی در دسترس نیست",
+"Upload cancelled." => "بار گذاری لغو شد",
+"File upload is in progress. Leaving the page now will cancel the upload." => "آپلودکردن پرونده در حال پیشرفت است. در صورت خروج از صفحه آپلود لغو میگردد. ",
+"URL cannot be empty." => "URL  نمی تواند خالی باشد.",
+"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "نام پوشه نامعتبر است. استفاده از 'به اشتراک گذاشته شده' متعلق به ownCloud میباشد.",
+"Error" => "خطا",
 "Share" => "اشتراک‌گذاری",
 "Delete permanently" => "حذف قطعی",
 "Delete" => "حذف",
@@ -32,13 +41,7 @@
 "Your storage is full, files can not be updated or synced anymore!" => "فضای ذخیره ی شما کاملا پر است، بیش از این فایلها بهنگام یا همگام سازی نمی توانند بشوند!",
 "Your storage is almost full ({usedSpacePercent}%)" => "فضای ذخیره ی شما تقریبا پر است ({usedSpacePercent}%)",
 "Your download is being prepared. This might take some time if the files are big." => "دانلود شما در حال آماده شدن است. در صورتیکه پرونده ها بزرگ باشند ممکن است مدتی طول بکشد.",
-"Unable to upload your file as it is a directory or has 0 bytes" => "ناتوان در بارگذاری یا فایل یک پوشه است یا 0بایت دارد",
-"Not enough space available" => "فضای کافی در دسترس نیست",
-"Upload cancelled." => "بار گذاری لغو شد",
-"File upload is in progress. Leaving the page now will cancel the upload." => "آپلودکردن پرونده در حال پیشرفت است. در صورت خروج از صفحه آپلود لغو میگردد. ",
-"URL cannot be empty." => "URL  نمی تواند خالی باشد.",
 "Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "نام پوشه نامعتبر است. استفاده از \" به اشتراک گذاشته شده \" متعلق به سایت Owncloud است.",
-"Error" => "خطا",
 "Name" => "نام",
 "Size" => "اندازه",
 "Modified" => "تاریخ",
@@ -46,7 +49,7 @@
 "{count} folders" => "{ شمار} پوشه ها",
 "1 file" => "1 پرونده",
 "{count} files" => "{ شمار } فایل ها",
-"Unable to rename file" => "قادر به تغییر نام پرونده نیست.",
+"%s could not be renamed" => "%s نمیتواند تغییر نام دهد.",
 "Upload" => "بارگزاری",
 "File handling" => "اداره پرونده ها",
 "Maximum upload size" => "حداکثر اندازه بارگزاری",
@@ -70,5 +73,9 @@
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "فایلها بیش از حد تعیین شده در این سرور هستند\nمترجم:با تغییر فایل php,ini میتوان این محدودیت را برطرف کرد",
 "Files are being scanned, please wait." => "پرونده ها در حال بازرسی هستند لطفا صبر کنید",
 "Current scanning" => "بازرسی کنونی",
+"directory" => "پوشه",
+"directories" => "پوشه ها",
+"file" => "پرونده",
+"files" => "پرونده ها",
 "Upgrading filesystem cache..." => "بهبود فایل سیستمی ذخیره گاه..."
 );
diff --git a/apps/files/l10n/fi_FI.php b/apps/files/l10n/fi_FI.php
index 3d0d724578144d9776db2c9d8d7752a27138aa54..22e448c01db5b2452bec6dcaa7e853e67ac520b4 100644
--- a/apps/files/l10n/fi_FI.php
+++ b/apps/files/l10n/fi_FI.php
@@ -12,6 +12,12 @@
 "Not enough storage available" => "Tallennustilaa ei ole riittävästi käytettävissä",
 "Invalid directory." => "Virheellinen kansio.",
 "Files" => "Tiedostot",
+"Unable to upload your file as it is a directory or has 0 bytes" => "Tiedoston lähetys epäonnistui, koska sen koko on 0 tavua tai kyseessä on kansio.",
+"Not enough space available" => "Tilaa ei ole riittävästi",
+"Upload cancelled." => "Lähetys peruttu.",
+"File upload is in progress. Leaving the page now will cancel the upload." => "Tiedoston lähetys on meneillään. Sivulta poistuminen nyt peruu tiedoston lähetyksen.",
+"URL cannot be empty." => "Verkko-osoite ei voi olla tyhjä",
+"Error" => "Virhe",
 "Share" => "Jaa",
 "Delete permanently" => "Poista pysyvästi",
 "Delete" => "Poista",
@@ -29,12 +35,6 @@
 "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.",
-"Not enough space available" => "Tilaa ei ole riittävästi",
-"Upload cancelled." => "Lähetys peruttu.",
-"File upload is in progress. Leaving the page now will cancel the upload." => "Tiedoston lähetys on meneillään. Sivulta poistuminen nyt peruu tiedoston lähetyksen.",
-"URL cannot be empty." => "Verkko-osoite ei voi olla tyhjä",
-"Error" => "Virhe",
 "Name" => "Nimi",
 "Size" => "Koko",
 "Modified" => "Muokattu",
@@ -42,7 +42,6 @@
 "{count} folders" => "{count} kansiota",
 "1 file" => "1 tiedosto",
 "{count} files" => "{count} tiedostoa",
-"Unable to rename file" => "Tiedoston nimeäminen uudelleen ei onnistunut",
 "Upload" => "Lähetä",
 "File handling" => "Tiedostonhallinta",
 "Maximum upload size" => "Lähetettävän tiedoston suurin sallittu koko",
@@ -66,5 +65,7 @@
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Lähetettäväksi valitsemasi tiedostot ylittävät palvelimen salliman tiedostokoon rajan.",
 "Files are being scanned, please wait." => "Tiedostoja tarkistetaan, odota hetki.",
 "Current scanning" => "Tämänhetkinen tutkinta",
+"file" => "tiedosto",
+"files" => "tiedostoa",
 "Upgrading filesystem cache..." => "Päivitetään tiedostojärjestelmän välimuistia..."
 );
diff --git a/apps/files/l10n/fr.php b/apps/files/l10n/fr.php
index 39c697396c919c69a6349ae94f44b2f47c8f2882..646373d4aae33309b9eb96270c51fb4a06e8dc85 100644
--- a/apps/files/l10n/fr.php
+++ b/apps/files/l10n/fr.php
@@ -1,6 +1,8 @@
 <?php $TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "Impossible de déplacer %s - Un fichier possédant ce nom existe déjà",
 "Could not move %s" => "Impossible de déplacer %s",
+"Unable to set upload directory." => "Impossible de définir le dossier pour l'upload, charger.",
+"Invalid Token" => "Jeton non valide",
 "No file was uploaded. Unknown error" => "Aucun fichier n'a été envoyé. Erreur inconnue",
 "There is no error, the file uploaded with success" => "Aucune erreur, le fichier a été envoyé avec succès.",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Le fichier envoyé dépasse la valeur upload_max_filesize située dans le fichier php.ini:",
@@ -12,6 +14,13 @@
 "Not enough storage available" => "Plus assez d'espace de stockage disponible",
 "Invalid directory." => "Dossier invalide.",
 "Files" => "Fichiers",
+"Unable to upload your file as it is a directory or has 0 bytes" => "Impossible d'envoyer votre fichier dans la mesure où il s'agit d'un répertoire ou d'un fichier de taille nulle",
+"Not enough space available" => "Espace disponible insuffisant",
+"Upload cancelled." => "Envoi annulé.",
+"File upload is in progress. Leaving the page now will cancel the upload." => "L'envoi du fichier est en cours. Quitter cette page maintenant annulera l'envoi du fichier.",
+"URL cannot be empty." => "L'URL ne peut-être vide",
+"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Nom de dossier invalide. L'utilisation du mot 'Shared' est réservée à Owncloud",
+"Error" => "Erreur",
 "Share" => "Partager",
 "Delete permanently" => "Supprimer de façon définitive",
 "Delete" => "Supprimer",
@@ -32,13 +41,7 @@
 "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 d'envoyer votre fichier dans la mesure où il s'agit d'un répertoire ou d'un fichier de taille nulle",
-"Not enough space available" => "Espace disponible insuffisant",
-"Upload cancelled." => "Envoi annulé.",
-"File upload is in progress. Leaving the page now will cancel the upload." => "L'envoi du fichier est en cours. Quitter cette page maintenant annulera l'envoi du fichier.",
-"URL cannot be empty." => "L'URL ne peut-être vide",
 "Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Nom de dossier invalide. L'utilisation du mot 'Shared' est réservée à Owncloud",
-"Error" => "Erreur",
 "Name" => "Nom",
 "Size" => "Taille",
 "Modified" => "Modifié",
@@ -46,8 +49,7 @@
 "{count} folders" => "{count} dossiers",
 "1 file" => "1 fichier",
 "{count} files" => "{count} fichiers",
-"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Nom de dossier invalide. L'utilisation du mot 'Shared' est réservée à Owncloud",
-"Unable to rename file" => "Impossible de renommer le fichier",
+"%s could not be renamed" => "%s ne peut être renommé",
 "Upload" => "Envoyer",
 "File handling" => "Gestion des fichiers",
 "Maximum upload size" => "Taille max. d'envoi",
@@ -71,5 +73,7 @@
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Les fichiers que vous essayez d'envoyer dépassent la taille maximale permise par ce serveur.",
 "Files are being scanned, please wait." => "Les fichiers sont en cours d'analyse, veuillez patienter.",
 "Current scanning" => "Analyse en cours",
+"file" => "fichier",
+"files" => "fichiers",
 "Upgrading filesystem cache..." => "Mise à niveau du cache du système de fichier"
 );
diff --git a/apps/files/l10n/gl.php b/apps/files/l10n/gl.php
index d22ed4b87215d156509866f3a81ac712d2c9b02f..bba6335ae053d9c617b1fdd21020422b54a09164 100644
--- a/apps/files/l10n/gl.php
+++ b/apps/files/l10n/gl.php
@@ -1,6 +1,8 @@
 <?php $TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "Non se moveu %s - Xa existe un ficheiro con ese nome.",
 "Could not move %s" => "Non foi posíbel mover %s",
+"Unable to set upload directory." => "Non é posíbel configurar o directorio de envíos.",
+"Invalid Token" => "Marca incorrecta",
 "No file was uploaded. Unknown error" => "Non se enviou ningún ficheiro. Produciuse un erro descoñecido.",
 "There is no error, the file uploaded with success" => "Non houbo erros, o ficheiro enviouse correctamente",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "O ficheiro enviado excede a directiva indicada por upload_max_filesize de php.ini:",
@@ -12,6 +14,13 @@
 "Not enough storage available" => "Non hai espazo de almacenamento abondo",
 "Invalid directory." => "O directorio é incorrecto.",
 "Files" => "Ficheiros",
+"Unable to upload your file as it is a directory or has 0 bytes" => "Non foi posíbel enviar o ficheiro pois ou é un directorio ou ten 0 bytes",
+"Not enough space available" => "O espazo dispoñíbel é insuficiente",
+"Upload cancelled." => "Envío cancelado.",
+"File upload is in progress. Leaving the page now will cancel the upload." => "O envío do ficheiro está en proceso. Saír agora da páxina cancelará o envío.",
+"URL cannot be empty." => "O URL non pode quedar baleiro.",
+"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Nome de cartafol incorrecto. O uso de «Compartido» e «Shared» está reservado para o ownClod",
+"Error" => "Erro",
 "Share" => "Compartir",
 "Delete permanently" => "Eliminar permanentemente",
 "Delete" => "Eliminar",
@@ -32,13 +41,7 @@
 "Your storage is full, files can not be updated or synced anymore!" => "O seu espazo de almacenamento está cheo, non é posíbel actualizar ou sincronizar máis os ficheiros!",
 "Your storage is almost full ({usedSpacePercent}%)" => "O seu espazo de almacenamento está case cheo ({usedSpacePercent}%)",
 "Your download is being prepared. This might take some time if the files are big." => "Está a prepararse a súa descarga. Isto pode levar bastante tempo se os ficheiros son grandes.",
-"Unable to upload your file as it is a directory or has 0 bytes" => "Non foi posíbel enviar o ficheiro pois ou é un directorio ou ten 0 bytes",
-"Not enough space available" => "O espazo dispoñíbel é insuficiente",
-"Upload cancelled." => "Envío cancelado.",
-"File upload is in progress. Leaving the page now will cancel the upload." => "O envío do ficheiro está en proceso. Saír agora da páxina cancelará o envío.",
-"URL cannot be empty." => "O URL non pode quedar baleiro.",
 "Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Nome de cartafol incorrecto. O uso de «Shared» está reservado por Owncloud",
-"Error" => "Erro",
 "Name" => "Nome",
 "Size" => "Tamaño",
 "Modified" => "Modificado",
@@ -46,8 +49,7 @@
 "{count} folders" => "{count} cartafoles",
 "1 file" => "1 ficheiro",
 "{count} files" => "{count} ficheiros",
-"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Nome de cartafol incorrecto. O uso de «Compartido» e «Shared» está reservado para o ownClod",
-"Unable to rename file" => "Non é posíbel renomear o ficheiro",
+"%s could not be renamed" => "%s non pode cambiar de nome",
 "Upload" => "Enviar",
 "File handling" => "Manexo de ficheiro",
 "Maximum upload size" => "Tamaño máximo do envío",
@@ -71,5 +73,9 @@
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Os ficheiros que tenta enviar exceden do tamaño máximo permitido neste servidor",
 "Files are being scanned, please wait." => "Estanse analizando os ficheiros. Agarde.",
 "Current scanning" => "Análise actual",
+"directory" => "directorio",
+"directories" => "directorios",
+"file" => "ficheiro",
+"files" => "ficheiros",
 "Upgrading filesystem cache..." => "Anovando a caché do sistema de ficheiros..."
 );
diff --git a/apps/files/l10n/he.php b/apps/files/l10n/he.php
index b15c7a564997ce73cf8f34f125a70ae828beb6cf..52946bc6d0b9cfa39d806c3218964f5b7a94493c 100644
--- a/apps/files/l10n/he.php
+++ b/apps/files/l10n/he.php
@@ -12,6 +12,11 @@
 "Not enough storage available" => "אין די שטח פנוי באחסון",
 "Invalid directory." => "תיקייה שגויה.",
 "Files" => "קבצים",
+"Unable to upload your file as it is a directory or has 0 bytes" => "לא יכול להעלות את הקובץ מכיוון שזו תקיה או שמשקל הקובץ 0 בתים",
+"Upload cancelled." => "ההעלאה בוטלה.",
+"File upload is in progress. Leaving the page now will cancel the upload." => "מתבצעת כעת העלאת קבצים. עזיבה של העמוד תבטל את ההעלאה.",
+"URL cannot be empty." => "קישור אינו יכול להיות ריק.",
+"Error" => "שגיאה",
 "Share" => "שתף",
 "Delete permanently" => "מחק לצמיתות",
 "Delete" => "מחיקה",
@@ -27,11 +32,6 @@
 "1 file uploading" => "קובץ אחד נשלח",
 "files uploading" => "קבצים בהעלאה",
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "השם שגוי, אסור להשתמש בתווים '\\', '/', '<', '>', ':', '\"', '|', '?' ו־'*'.",
-"Unable to upload your file as it is a directory or has 0 bytes" => "לא יכול להעלות את הקובץ מכיוון שזו תקיה או שמשקל הקובץ 0 בתים",
-"Upload cancelled." => "ההעלאה בוטלה.",
-"File upload is in progress. Leaving the page now will cancel the upload." => "מתבצעת כעת העלאת קבצים. עזיבה של העמוד תבטל את ההעלאה.",
-"URL cannot be empty." => "קישור אינו יכול להיות ריק.",
-"Error" => "שגיאה",
 "Name" => "שם",
 "Size" => "גודל",
 "Modified" => "זמן שינוי",
@@ -39,7 +39,6 @@
 "{count} folders" => "{count} תיקיות",
 "1 file" => "קובץ אחד",
 "{count} files" => "{count} קבצים",
-"Unable to rename file" => "לא ניתן לשנות את שם הקובץ",
 "Upload" => "העלאה",
 "File handling" => "טיפול בקבצים",
 "Maximum upload size" => "גודל העלאה מקסימלי",
@@ -60,5 +59,7 @@
 "Upload too large" => "העלאה גדולה מידי",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "הקבצים שניסית להעלות חרגו מהגודל המקסימלי להעלאת קבצים על שרת זה.",
 "Files are being scanned, please wait." => "הקבצים נסרקים, נא להמתין.",
-"Current scanning" => "הסריקה הנוכחית"
+"Current scanning" => "הסריקה הנוכחית",
+"file" => "קובץ",
+"files" => "קבצים"
 );
diff --git a/apps/files/l10n/hi.php b/apps/files/l10n/hi.php
index df57abe28b64d5ae5ac05b2a8b2d7e06f6df04a7..151d1f497c7963a9d9d6690e27e08cc6d3dd5dab 100644
--- a/apps/files/l10n/hi.php
+++ b/apps/files/l10n/hi.php
@@ -1,4 +1,5 @@
 <?php $TRANSLATIONS = array(
+"Error" => "त्रुटि",
 "Share" => "साझा करें",
 "Save" => "सहेजें"
 );
diff --git a/apps/files/l10n/hr.php b/apps/files/l10n/hr.php
index d634faee7537ca22813eb4b21ff54c969fb838b3..abe8c40bd53fda2abf018eeb061919968385d39f 100644
--- a/apps/files/l10n/hr.php
+++ b/apps/files/l10n/hr.php
@@ -6,6 +6,10 @@
 "Missing a temporary folder" => "Nedostaje privremeni direktorij",
 "Failed to write to disk" => "Neuspjelo pisanje na disk",
 "Files" => "Datoteke",
+"Unable to upload your file as it is a directory or has 0 bytes" => "Nemoguće poslati datoteku jer je prazna ili je direktorij",
+"Upload cancelled." => "Slanje poništeno.",
+"File upload is in progress. Leaving the page now will cancel the upload." => "Učitavanje datoteke. Napuštanjem stranice će prekinuti učitavanje.",
+"Error" => "Greška",
 "Share" => "Podijeli",
 "Delete" => "Obriši",
 "Rename" => "Promjeni ime",
@@ -16,10 +20,6 @@
 "undo" => "vrati",
 "1 file uploading" => "1 datoteka se učitava",
 "files uploading" => "datoteke se učitavaju",
-"Unable to upload your file as it is a directory or has 0 bytes" => "Nemoguće poslati datoteku jer je prazna ili je direktorij",
-"Upload cancelled." => "Slanje poništeno.",
-"File upload is in progress. Leaving the page now will cancel the upload." => "Učitavanje datoteke. Napuštanjem stranice će prekinuti učitavanje.",
-"Error" => "Greška",
 "Name" => "Ime",
 "Size" => "Veličina",
 "Modified" => "Zadnja promjena",
@@ -42,5 +42,7 @@
 "Upload too large" => "Prijenos je preobiman",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Datoteke koje pokušavate prenijeti prelaze maksimalnu veličinu za prijenos datoteka na ovom poslužitelju.",
 "Files are being scanned, please wait." => "Datoteke se skeniraju, molimo pričekajte.",
-"Current scanning" => "Trenutno skeniranje"
+"Current scanning" => "Trenutno skeniranje",
+"file" => "datoteka",
+"files" => "datoteke"
 );
diff --git a/apps/files/l10n/hu_HU.php b/apps/files/l10n/hu_HU.php
index 76b8bd420da8d84bb4813da057b27f7da3c7bcd1..f0e5b1befc544d5e6a8a6b6d25aaede73674a749 100644
--- a/apps/files/l10n/hu_HU.php
+++ b/apps/files/l10n/hu_HU.php
@@ -12,6 +12,13 @@
 "Not enough storage available" => "Nincs elég szabad hely.",
 "Invalid directory." => "Érvénytelen mappa.",
 "Files" => "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ű",
+"Not enough space available" => "Nincs elég szabad hely",
+"Upload cancelled." => "A feltöltést megszakítottuk.",
+"File upload is in progress. Leaving the page now will cancel the upload." => "Fájlfeltöltés van folyamatban. Az oldal elhagyása megszakítja a feltöltést.",
+"URL cannot be empty." => "Az URL nem lehet semmi.",
+"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Érvénytelen mappanév. A 'Shared' az ownCloud számára fenntartott elnevezés",
+"Error" => "Hiba",
 "Share" => "Megosztás",
 "Delete permanently" => "Végleges törlés",
 "Delete" => "Törlés",
@@ -32,13 +39,7 @@
 "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ű",
-"Not enough space available" => "Nincs elég szabad hely",
-"Upload cancelled." => "A feltöltést megszakítottuk.",
-"File upload is in progress. Leaving the page now will cancel the upload." => "Fájlfeltöltés van folyamatban. Az oldal elhagyása megszakítja a feltöltést.",
-"URL cannot be empty." => "Az URL nem lehet semmi.",
 "Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Érvénytelen mappanév. A név használata csak a Owncloud számára lehetséges.",
-"Error" => "Hiba",
 "Name" => "Név",
 "Size" => "Méret",
 "Modified" => "Módosítva",
@@ -46,8 +47,6 @@
 "{count} folders" => "{count} mappa",
 "1 file" => "1 fájl",
 "{count} files" => "{count} fájl",
-"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Érvénytelen mappanév. A 'Shared' az ownCloud számára fenntartott elnevezés",
-"Unable to rename file" => "Nem lehet átnevezni a fájlt",
 "Upload" => "Feltöltés",
 "File handling" => "Fájlkezelés",
 "Maximum upload size" => "Maximális feltölthető fájlméret",
@@ -71,5 +70,7 @@
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "A feltöltendő állományok mérete meghaladja a kiszolgálón megengedett maximális méretet.",
 "Files are being scanned, please wait." => "A fájllista ellenőrzése zajlik, kis türelmet!",
 "Current scanning" => "Ellenőrzés alatt",
+"file" => "fájl",
+"files" => "fájlok",
 "Upgrading filesystem cache..." => "A fájlrendszer gyorsítótárának frissítése zajlik..."
 );
diff --git a/apps/files/l10n/ia.php b/apps/files/l10n/ia.php
index 886922d954687866367c1e806a5f7d50a62430c2..5970a4cd55a182975b80791a367c1b2b7069f756 100644
--- a/apps/files/l10n/ia.php
+++ b/apps/files/l10n/ia.php
@@ -3,9 +3,9 @@
 "No file was uploaded" => "Nulle file esseva incargate.",
 "Missing a temporary folder" => "Manca un dossier temporari",
 "Files" => "Files",
+"Error" => "Error",
 "Share" => "Compartir",
 "Delete" => "Deler",
-"Error" => "Error",
 "Name" => "Nomine",
 "Size" => "Dimension",
 "Modified" => "Modificate",
diff --git a/apps/files/l10n/id.php b/apps/files/l10n/id.php
index 58cc0ea7fd953e2c086f45a3983d593012151b19..bacdcc8f496e997739d4a927a924b8fb63019f0e 100644
--- a/apps/files/l10n/id.php
+++ b/apps/files/l10n/id.php
@@ -12,6 +12,12 @@
 "Not enough storage available" => "Ruang penyimpanan tidak mencukupi",
 "Invalid directory." => "Direktori tidak valid.",
 "Files" => "Berkas",
+"Unable to upload your file as it is a directory or has 0 bytes" => "Gagal mengunggah berkas Anda karena berupa direktori atau mempunyai ukuran 0 byte",
+"Not enough space available" => "Ruang penyimpanan tidak mencukupi",
+"Upload cancelled." => "Pengunggahan dibatalkan.",
+"File upload is in progress. Leaving the page now will cancel the upload." => "Berkas sedang diunggah. Meninggalkan halaman ini akan membatalkan proses.",
+"URL cannot be empty." => "URL tidak boleh kosong",
+"Error" => "Galat",
 "Share" => "Bagikan",
 "Delete permanently" => "Hapus secara permanen",
 "Delete" => "Hapus",
@@ -32,13 +38,7 @@
 "Your storage is full, files can not be updated or synced anymore!" => "Ruang penyimpanan Anda penuh, berkas tidak dapat diperbarui atau disinkronkan lagi!",
 "Your storage is almost full ({usedSpacePercent}%)" => "Ruang penyimpanan hampir penuh ({usedSpacePercent}%)",
 "Your download is being prepared. This might take some time if the files are big." => "Unduhan Anda sedang disiapkan. Prosesnya dapat berlangsung agak lama jika ukuran berkasnya besar.",
-"Unable to upload your file as it is a directory or has 0 bytes" => "Gagal mengunggah berkas Anda karena berupa direktori atau mempunyai ukuran 0 byte",
-"Not enough space available" => "Ruang penyimpanan tidak mencukupi",
-"Upload cancelled." => "Pengunggahan dibatalkan.",
-"File upload is in progress. Leaving the page now will cancel the upload." => "Berkas sedang diunggah. Meninggalkan halaman ini akan membatalkan proses.",
-"URL cannot be empty." => "URL tidak boleh kosong",
 "Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Nama folder salah. Nama 'Shared' telah digunakan oleh Owncloud.",
-"Error" => "Galat",
 "Name" => "Nama",
 "Size" => "Ukuran",
 "Modified" => "Dimodifikasi",
@@ -46,7 +46,6 @@
 "{count} folders" => "{count} folder",
 "1 file" => "1 berkas",
 "{count} files" => "{count} berkas",
-"Unable to rename file" => "Tidak dapat mengubah nama berkas",
 "Upload" => "Unggah",
 "File handling" => "Penanganan berkas",
 "Maximum upload size" => "Ukuran pengunggahan maksimum",
@@ -70,5 +69,7 @@
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Berkas yang dicoba untuk diunggah melebihi ukuran maksimum pengunggahan berkas di server ini.",
 "Files are being scanned, please wait." => "Berkas sedang dipindai, silakan tunggu.",
 "Current scanning" => "Yang sedang dipindai",
+"file" => "berkas",
+"files" => "berkas-berkas",
 "Upgrading filesystem cache..." => "Meningkatkan tembolok sistem berkas..."
 );
diff --git a/apps/files/l10n/is.php b/apps/files/l10n/is.php
index aa10c838c1d71a945c8b8e9cc5358085fdc71213..97b19ae93794a4e6c76be0f4cc491b56cd644f27 100644
--- a/apps/files/l10n/is.php
+++ b/apps/files/l10n/is.php
@@ -11,6 +11,12 @@
 "Failed to write to disk" => "Tókst ekki að skrifa á disk",
 "Invalid directory." => "Ógild mappa.",
 "Files" => "Skrár",
+"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.",
+"Not enough space available" => "Ekki nægt pláss tiltækt",
+"Upload cancelled." => "Hætt við innsendingu.",
+"File upload is in progress. Leaving the page now will cancel the upload." => "Innsending í gangi. Ef þú ferð af þessari síðu mun innsending misheppnast.",
+"URL cannot be empty." => "Vefslóð má ekki vera tóm.",
+"Error" => "Villa",
 "Share" => "Deila",
 "Delete" => "Eyða",
 "Rename" => "Endurskýra",
@@ -25,13 +31,7 @@
 "'.' is an invalid file name." => "'.' er ekki leyfilegt nafn.",
 "File name cannot be empty." => "Nafn skráar má ekki vera tómt",
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Ógilt nafn, táknin '\\', '/', '<', '>', ':', '\"', '|', '?' og '*' eru ekki leyfð.",
-"Unable to upload your file as it is a directory or has 0 bytes" => "Innsending á skrá mistókst, hugsanlega sendir þú möppu eða skráin er 0 bæti.",
-"Not enough space available" => "Ekki nægt pláss tiltækt",
-"Upload cancelled." => "Hætt við innsendingu.",
-"File upload is in progress. Leaving the page now will cancel the upload." => "Innsending í gangi. Ef þú ferð af þessari síðu mun innsending misheppnast.",
-"URL cannot be empty." => "Vefslóð má ekki vera tóm.",
 "Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Óleyfilegt nafn á möppu. Nafnið 'Shared' er frátekið fyrir Owncloud",
-"Error" => "Villa",
 "Name" => "Nafn",
 "Size" => "Stærð",
 "Modified" => "Breytt",
@@ -39,7 +39,6 @@
 "{count} folders" => "{count} möppur",
 "1 file" => "1 skrá",
 "{count} files" => "{count} skrár",
-"Unable to rename file" => "Gat ekki endurskýrt skrá",
 "Upload" => "Senda inn",
 "File handling" => "Meðhöndlun skrár",
 "Maximum upload size" => "Hámarks stærð innsendingar",
diff --git a/apps/files/l10n/it.php b/apps/files/l10n/it.php
index c588285aacabab0d61dc185d882b4017fd224af2..28b33795aeba64200dcb4b34c7b4e28840d222d5 100644
--- a/apps/files/l10n/it.php
+++ b/apps/files/l10n/it.php
@@ -1,6 +1,8 @@
 <?php $TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "Impossibile spostare %s - un file con questo nome esiste già",
 "Could not move %s" => "Impossibile spostare %s",
+"Unable to set upload directory." => "Impossibile impostare una cartella di caricamento.",
+"Invalid Token" => "Token non valido",
 "No file was uploaded. Unknown error" => "Nessun file è stato inviato. Errore sconosciuto",
 "There is no error, the file uploaded with success" => "Non ci sono errori, il file è stato caricato correttamente",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Il file caricato supera la direttiva upload_max_filesize in php.ini:",
@@ -12,6 +14,13 @@
 "Not enough storage available" => "Spazio di archiviazione insufficiente",
 "Invalid directory." => "Cartella non valida.",
 "Files" => "File",
+"Unable to upload your file as it is a directory or has 0 bytes" => "Impossibile caricare il file poiché è una cartella o ha una dimensione di 0 byte",
+"Not enough space available" => "Spazio disponibile insufficiente",
+"Upload cancelled." => "Invio annullato",
+"File upload is in progress. Leaving the page now will cancel the upload." => "Caricamento del file in corso. La chiusura della pagina annullerà il caricamento.",
+"URL cannot be empty." => "L'URL non può essere vuoto.",
+"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Nome della cartella non valido. L'uso di 'Shared' è riservato a ownCloud",
+"Error" => "Errore",
 "Share" => "Condividi",
 "Delete permanently" => "Elimina definitivamente",
 "Delete" => "Elimina",
@@ -32,13 +41,7 @@
 "Your storage is full, files can not be updated or synced anymore!" => "Lo spazio di archiviazione è pieno, i file non possono essere più aggiornati o sincronizzati!",
 "Your storage is almost full ({usedSpacePercent}%)" => "Lo spazio di archiviazione è quasi pieno ({usedSpacePercent}%)",
 "Your download is being prepared. This might take some time if the files are big." => "Il tuo scaricamento è in fase di preparazione. Ciò potrebbe richiedere del tempo se i file sono grandi.",
-"Unable to upload your file as it is a directory or has 0 bytes" => "Impossibile caricare il file poiché è una cartella o ha una dimensione di 0 byte",
-"Not enough space available" => "Spazio disponibile insufficiente",
-"Upload cancelled." => "Invio annullato",
-"File upload is in progress. Leaving the page now will cancel the upload." => "Caricamento del file in corso. La chiusura della pagina annullerà il caricamento.",
-"URL cannot be empty." => "L'URL non può essere vuoto.",
 "Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Nome della cartella non valido. L'uso di 'Shared' è riservato da ownCloud",
-"Error" => "Errore",
 "Name" => "Nome",
 "Size" => "Dimensione",
 "Modified" => "Modificato",
@@ -46,8 +49,7 @@
 "{count} folders" => "{count} cartelle",
 "1 file" => "1 file",
 "{count} files" => "{count} file",
-"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Nome della cartella non valido. L'uso di 'Shared' è riservato a ownCloud",
-"Unable to rename file" => "Impossibile rinominare il file",
+"%s could not be renamed" => "%s non può essere rinominato",
 "Upload" => "Carica",
 "File handling" => "Gestione file",
 "Maximum upload size" => "Dimensione massima upload",
@@ -71,5 +73,9 @@
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "I file che stai provando a caricare superano la dimensione massima consentita su questo server.",
 "Files are being scanned, please wait." => "Scansione dei file in corso, attendi",
 "Current scanning" => "Scansione corrente",
+"directory" => "cartella",
+"directories" => "cartelle",
+"file" => "file",
+"files" => "file",
 "Upgrading filesystem cache..." => "Aggiornamento della cache del filesystem in corso..."
 );
diff --git a/apps/files/l10n/ja_JP.php b/apps/files/l10n/ja_JP.php
index 55dcf3640e7746d8d23a7cd00873474604fa32e9..e4be3133fb0bcd72d53e33477a58d617bd84d4af 100644
--- a/apps/files/l10n/ja_JP.php
+++ b/apps/files/l10n/ja_JP.php
@@ -1,6 +1,8 @@
 <?php $TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "%s を移動できませんでした ― この名前のファイルはすでに存在します",
 "Could not move %s" => "%s を移動できませんでした",
+"Unable to set upload directory." => "アップロードディレクトリを設定出来ません。",
+"Invalid Token" => "無効なトークン",
 "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 に設定されたサイズを超えています:",
@@ -12,6 +14,13 @@
 "Not enough storage available" => "ストレージに十分な空き容量がありません",
 "Invalid directory." => "無効なディレクトリです。",
 "Files" => "ファイル",
+"Unable to upload your file as it is a directory or has 0 bytes" => "ディレクトリもしくは0バイトのファイルはアップロードできません",
+"Not enough space available" => "利用可能なスペースが十分にありません",
+"Upload cancelled." => "アップロードはキャンセルされました。",
+"File upload is in progress. Leaving the page now will cancel the upload." => "ファイル転送を実行中です。今このページから移動するとアップロードが中止されます。",
+"URL cannot be empty." => "URLは空にできません。",
+"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "無効なフォルダ名です。'Shared' の利用はownCloudで予約済みです",
+"Error" => "エラー",
 "Share" => "共有",
 "Delete permanently" => "完全に削除する",
 "Delete" => "削除",
@@ -32,13 +41,7 @@
 "Your storage is full, files can not be updated or synced anymore!" => "あなたのストレージは一杯です。ファイルの更新と同期はもうできません！",
 "Your storage is almost full ({usedSpacePercent}%)" => "あなたのストレージはほぼ一杯です（{usedSpacePercent}%）",
 "Your download is being prepared. This might take some time if the files are big." => "ダウンロードの準備中です。ファイルサイズが大きい場合は少し時間がかかるかもしれません。",
-"Unable to upload your file as it is a directory or has 0 bytes" => "ディレクトリもしくは0バイトのファイルはアップロードできません",
-"Not enough space available" => "利用可能なスペースが十分にありません",
-"Upload cancelled." => "アップロードはキャンセルされました。",
-"File upload is in progress. Leaving the page now will cancel the upload." => "ファイル転送を実行中です。今このページから移動するとアップロードが中止されます。",
-"URL cannot be empty." => "URLは空にできません。",
 "Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "無効なフォルダ名です。'Shared' の利用は ownCloud が予約済みです。",
-"Error" => "エラー",
 "Name" => "名前",
 "Size" => "サイズ",
 "Modified" => "変更",
@@ -46,8 +49,7 @@
 "{count} folders" => "{count} フォルダ",
 "1 file" => "1 ファイル",
 "{count} files" => "{count} ファイル",
-"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "無効なフォルダ名です。'Shared' の利用はownCloudで予約済みです",
-"Unable to rename file" => "ファイル名の変更ができません",
+"%s could not be renamed" => "%sの名前を変更できませんでした",
 "Upload" => "アップロード",
 "File handling" => "ファイル操作",
 "Maximum upload size" => "最大アップロードサイズ",
@@ -71,5 +73,9 @@
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "アップロードしようとしているファイルは、サーバで規定された最大サイズを超えています。",
 "Files are being scanned, please wait." => "ファイルをスキャンしています、しばらくお待ちください。",
 "Current scanning" => "スキャン中",
+"directory" => "ディレクトリ",
+"directories" => "ディレクトリ",
+"file" => "ファイル",
+"files" => "ファイル",
 "Upgrading filesystem cache..." => "ファイルシステムキャッシュを更新中..."
 );
diff --git a/apps/files/l10n/ka_GE.php b/apps/files/l10n/ka_GE.php
index c50ca2594b6db137143b18a48ba7cd8077544176..b04e1b4536d9773a4965cd1073fb6f657391129a 100644
--- a/apps/files/l10n/ka_GE.php
+++ b/apps/files/l10n/ka_GE.php
@@ -12,6 +12,12 @@
 "Not enough storage available" => "საცავში საკმარისი ადგილი არ არის",
 "Invalid directory." => "დაუშვებელი დირექტორია.",
 "Files" => "ფაილები",
+"Unable to upload your file as it is a directory or has 0 bytes" => "თქვენი ფაილის ატვირთვა ვერ მოხერხდა. ის არის საქაღალდე და შეიცავს 0 ბაიტს",
+"Not enough space available" => "საკმარისი ადგილი არ არის",
+"Upload cancelled." => "ატვირთვა შეჩერებულ იქნა.",
+"File upload is in progress. Leaving the page now will cancel the upload." => "მიმდინარეობს ფაილის ატვირთვა. სხვა გვერდზე გადასვლა გამოიწვევს ატვირთვის შეჩერებას",
+"URL cannot be empty." => "URL არ შეიძლება იყოს ცარიელი.",
+"Error" => "შეცდომა",
 "Share" => "გაზიარება",
 "Delete permanently" => "სრულად წაშლა",
 "Delete" => "წაშლა",
@@ -32,13 +38,7 @@
 "Your storage is full, files can not be updated or synced anymore!" => "თქვენი საცავი გადაივსო. ფაილების განახლება და სინქრონიზირება ვერ მოხერხდება!",
 "Your storage is almost full ({usedSpacePercent}%)" => "თქვენი საცავი თითქმის გადაივსო ({usedSpacePercent}%)",
 "Your download is being prepared. This might take some time if the files are big." => "გადმოწერის მოთხოვნა მუშავდება. ის მოითხოვს გარკვეულ დროს რაგდან ფაილები არის დიდი ზომის.",
-"Unable to upload your file as it is a directory or has 0 bytes" => "თქვენი ფაილის ატვირთვა ვერ მოხერხდა. ის არის საქაღალდე და შეიცავს 0 ბაიტს",
-"Not enough space available" => "საკმარისი ადგილი არ არის",
-"Upload cancelled." => "ატვირთვა შეჩერებულ იქნა.",
-"File upload is in progress. Leaving the page now will cancel the upload." => "მიმდინარეობს ფაილის ატვირთვა. სხვა გვერდზე გადასვლა გამოიწვევს ატვირთვის შეჩერებას",
-"URL cannot be empty." => "URL არ შეიძლება იყოს ცარიელი.",
 "Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "დაუშვებელი ფოლდერის სახელი.  'Shared'–ის გამოყენება რეზერვირებულია Owncloud–ის მიერ",
-"Error" => "შეცდომა",
 "Name" => "სახელი",
 "Size" => "ზომა",
 "Modified" => "შეცვლილია",
@@ -46,7 +46,6 @@
 "{count} folders" => "{count} საქაღალდე",
 "1 file" => "1 ფაილი",
 "{count} files" => "{count} ფაილი",
-"Unable to rename file" => "ფაილის სახელის გადარქმევა ვერ მოხერხდა",
 "Upload" => "ატვირთვა",
 "File handling" => "ფაილის დამუშავება",
 "Maximum upload size" => "მაქსიმუმ ატვირთის ზომა",
diff --git a/apps/files/l10n/ko.php b/apps/files/l10n/ko.php
index c78f58542e460d27b5b9cab6acb249a4e2b15580..069c209ee58caf9e23b4b037598068aa9c1492d1 100644
--- a/apps/files/l10n/ko.php
+++ b/apps/files/l10n/ko.php
@@ -12,6 +12,12 @@
 "Not enough storage available" => "저장소가 용량이 충분하지 않습니다.",
 "Invalid directory." => "올바르지 않은 디렉터리입니다.",
 "Files" => "파일",
+"Unable to upload your file as it is a directory or has 0 bytes" => "디렉터리 및 빈 파일은 업로드할 수 없습니다",
+"Not enough space available" => "여유 공간이 부족합니다",
+"Upload cancelled." => "업로드가 취소되었습니다.",
+"File upload is in progress. Leaving the page now will cancel the upload." => "파일 업로드가 진행 중입니다. 이 페이지를 벗어나면 업로드가 취소됩니다.",
+"URL cannot be empty." => "URL을 입력해야 합니다.",
+"Error" => "오류",
 "Share" => "공유",
 "Delete permanently" => "영원히 삭제",
 "Delete" => "삭제",
@@ -32,13 +38,7 @@
 "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" => "디렉터리 및 빈 파일은 업로드할 수 없습니다",
-"Not enough space available" => "여유 공간이 부족합니다",
-"Upload cancelled." => "업로드가 취소되었습니다.",
-"File upload is in progress. Leaving the page now will cancel the upload." => "파일 업로드가 진행 중입니다. 이 페이지를 벗어나면 업로드가 취소됩니다.",
-"URL cannot be empty." => "URL을 입력해야 합니다.",
 "Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "폴더 이름이 유효하지 않습니다. ",
-"Error" => "오류",
 "Name" => "이름",
 "Size" => "크기",
 "Modified" => "수정됨",
@@ -46,7 +46,6 @@
 "{count} folders" => "폴더 {count}개",
 "1 file" => "파일 1개",
 "{count} files" => "파일 {count}개",
-"Unable to rename file" => "파일 이름바꾸기 할 수 없음",
 "Upload" => "업로드",
 "File handling" => "파일 처리",
 "Maximum upload size" => "최대 업로드 크기",
@@ -70,5 +69,7 @@
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "이 파일이 서버에서 허용하는 최대 업로드 가능 용량보다 큽니다.",
 "Files are being scanned, please wait." => "파일을 검색하고 있습니다. 기다려 주십시오.",
 "Current scanning" => "현재 검색",
+"file" => "파일",
+"files" => "파일",
 "Upgrading filesystem cache..." => "파일 시스템 캐시 업그레이드 중..."
 );
diff --git a/apps/files/l10n/lb.php b/apps/files/l10n/lb.php
index 4a60295c5cb3680a3759f857c16579c7b06ef721..9b209a4d5cc010f70f5d4d915f7a127e6c930e01 100644
--- a/apps/files/l10n/lb.php
+++ b/apps/files/l10n/lb.php
@@ -6,15 +6,15 @@
 "Missing a temporary folder" => "Et feelt en temporären Dossier",
 "Failed to write to disk" => "Konnt net op den Disk schreiwen",
 "Files" => "Dateien",
+"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 cancelled." => "Upload ofgebrach.",
+"File upload is in progress. Leaving the page now will cancel the upload." => "File Upload am gaang. Wann's de des Säit verléiss gëtt den Upload ofgebrach.",
+"Error" => "Fehler",
 "Share" => "Deelen",
 "Delete" => "Läschen",
 "replace" => "ersetzen",
 "cancel" => "ofbriechen",
 "undo" => "réckgängeg man",
-"Unable to upload your file as it is a directory or has 0 bytes" => "Kann deng Datei net eroplueden well et en Dossier ass oder 0 byte grouss ass.",
-"Upload cancelled." => "Upload ofgebrach.",
-"File upload is in progress. Leaving the page now will cancel the upload." => "File Upload am gaang. Wann's de des Säit verléiss gëtt den Upload ofgebrach.",
-"Error" => "Fehler",
 "Name" => "Numm",
 "Size" => "Gréisst",
 "Modified" => "Geännert",
@@ -37,5 +37,7 @@
 "Upload too large" => "Upload ze grouss",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Déi Dateien déi Dir probéiert erop ze lueden sinn méi grouss wei déi Maximal Gréisst déi op dësem Server erlaabt ass.",
 "Files are being scanned, please wait." => "Fichieren gi gescannt, war weg.",
-"Current scanning" => "Momentane Scan"
+"Current scanning" => "Momentane Scan",
+"file" => "Datei",
+"files" => "Dateien"
 );
diff --git a/apps/files/l10n/lt_LT.php b/apps/files/l10n/lt_LT.php
index 5938521beaba2fb160ce57c76be6c5ca28f9ebc3..43fb4657dbb0239a9c1e74e7fe8d9a21b569db9b 100644
--- a/apps/files/l10n/lt_LT.php
+++ b/apps/files/l10n/lt_LT.php
@@ -12,6 +12,13 @@
 "Not enough storage available" => "Nepakanka vietos serveryje",
 "Invalid directory." => "Neteisingas aplankas",
 "Files" => "Failai",
+"Unable to upload your file as it is a directory or has 0 bytes" => "Neįmanoma įkelti failo - jo dydis gali būti 0 bitų arba tai katalogas",
+"Not enough space available" => "Nepakanka vietos",
+"Upload cancelled." => "Įkėlimas atšauktas.",
+"File upload is in progress. Leaving the page now will cancel the upload." => "Failo įkėlimas pradėtas. Jei paliksite šį puslapį, įkėlimas nutrūks.",
+"URL cannot be empty." => "URL negali būti tuščias.",
+"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Negalimas aplanko pavadinimas. 'Shared' pavadinimas yra rezervuotas ownCloud",
+"Error" => "Klaida",
 "Share" => "Dalintis",
 "Delete permanently" => "Ištrinti negrįžtamai",
 "Delete" => "IÅ¡trinti",
@@ -32,13 +39,7 @@
 "Your storage is full, files can not be updated or synced anymore!" => "Jūsų visa vieta serveryje užimta",
 "Your storage is almost full ({usedSpacePercent}%)" => "Jūsų vieta serveryje beveik visa užimta ({usedSpacePercent}%)",
 "Your download is being prepared. This might take some time if the files are big." => "Jūsų atsisiuntimas yra paruošiamas. tai gali užtrukti jei atsisiunčiamas didelis failas.",
-"Unable to upload your file as it is a directory or has 0 bytes" => "Neįmanoma įkelti failo - jo dydis gali būti 0 bitų arba tai katalogas",
-"Not enough space available" => "Nepakanka vietos",
-"Upload cancelled." => "Įkėlimas atšauktas.",
-"File upload is in progress. Leaving the page now will cancel the upload." => "Failo įkėlimas pradėtas. Jei paliksite šį puslapį, įkėlimas nutrūks.",
-"URL cannot be empty." => "URL negali būti tuščias.",
 "Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Negalimas aplanko pavadinimas. 'Shared' pavadinimas yra rezervuotas ownCloud",
-"Error" => "Klaida",
 "Name" => "Pavadinimas",
 "Size" => "Dydis",
 "Modified" => "Pakeista",
@@ -46,8 +47,6 @@
 "{count} folders" => "{count} aplankalai",
 "1 file" => "1 failas",
 "{count} files" => "{count} failai",
-"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Negalimas aplanko pavadinimas. 'Shared' pavadinimas yra rezervuotas ownCloud",
-"Unable to rename file" => "Nepavyko pervadinti failo",
 "Upload" => "Įkelti",
 "File handling" => "Failų tvarkymas",
 "Maximum upload size" => "Maksimalus įkeliamo failo dydis",
@@ -71,5 +70,7 @@
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Bandomų įkelti failų dydis viršija maksimalų, kuris leidžiamas šiame serveryje",
 "Files are being scanned, please wait." => "Skenuojami failai, prašome palaukti.",
 "Current scanning" => "Å iuo metu skenuojama",
+"file" => "failas",
+"files" => "failai",
 "Upgrading filesystem cache..." => "Atnaujinamas sistemos kešavimas..."
 );
diff --git a/apps/files/l10n/lv.php b/apps/files/l10n/lv.php
index f62bdd2d49226306ebaaa5870d6f532fe6f688d5..b0def1e707d7d5164b1d888c267f1e1d46c96f84 100644
--- a/apps/files/l10n/lv.php
+++ b/apps/files/l10n/lv.php
@@ -12,6 +12,12 @@
 "Not enough storage available" => "Nav pietiekami daudz vietas",
 "Invalid directory." => "Nederīga direktorija.",
 "Files" => "Datnes",
+"Unable to upload your file as it is a directory or has 0 bytes" => "Nevar augšupielādēt jūsu datni, jo tā ir direktorija vai arī tā ir 0 baitu liela",
+"Not enough space available" => "Nepietiek brīvas vietas",
+"Upload cancelled." => "Augšupielāde ir atcelta.",
+"File upload is in progress. Leaving the page now will cancel the upload." => "Notiek augšupielāde. Pametot lapu tagad, tiks atcelta augšupielāde.",
+"URL cannot be empty." => "URL nevar būt tukšs.",
+"Error" => "Kļūda",
 "Share" => "Dalīties",
 "Delete permanently" => "Dzēst pavisam",
 "Delete" => "Dzēst",
@@ -31,13 +37,7 @@
 "Your storage is full, files can not be updated or synced anymore!" => "Jūsu krātuve ir pilna, datnes vairs nevar augšupielādēt vai sinhronizēt!",
 "Your storage is almost full ({usedSpacePercent}%)" => "Jūsu krātuve ir gandrīz pilna ({usedSpacePercent}%)",
 "Your download is being prepared. This might take some time if the files are big." => "Tiek sagatavota lejupielāde. Tas var aizņemt kādu laiciņu, ja datnes ir lielas.",
-"Unable to upload your file as it is a directory or has 0 bytes" => "Nevar augšupielādēt jūsu datni, jo tā ir direktorija vai arī tā ir 0 baitu liela",
-"Not enough space available" => "Nepietiek brīvas vietas",
-"Upload cancelled." => "Augšupielāde ir atcelta.",
-"File upload is in progress. Leaving the page now will cancel the upload." => "Notiek augšupielāde. Pametot lapu tagad, tiks atcelta augšupielāde.",
-"URL cannot be empty." => "URL nevar būt tukšs.",
 "Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Nederīgs mapes nosaukums. “Koplietots” izmantojums ir rezervēts ownCloud servisam.",
-"Error" => "Kļūda",
 "Name" => "Nosaukums",
 "Size" => "Izmērs",
 "Modified" => "Mainīts",
@@ -45,7 +45,6 @@
 "{count} folders" => "{count} mapes",
 "1 file" => "1 datne",
 "{count} files" => "{count} datnes",
-"Unable to rename file" => "Nevarēja pārsaukt datni",
 "Upload" => "Augšupielādēt",
 "File handling" => "Datņu pārvaldība",
 "Maximum upload size" => "Maksimālais datņu augšupielādes apjoms",
@@ -69,5 +68,7 @@
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Augšupielādējamās datnes pārsniedz servera pieļaujamo datņu augšupielādes apjomu",
 "Files are being scanned, please wait." => "Datnes šobrīd tiek caurskatītas, lūdzu, uzgaidiet.",
 "Current scanning" => "Šobrīd tiek caurskatīts",
+"file" => "fails",
+"files" => "faili",
 "Upgrading filesystem cache..." => "Uzlabo datņu sistēmas kešatmiņu..."
 );
diff --git a/apps/files/l10n/mk.php b/apps/files/l10n/mk.php
index 992618f06bfc044c4181be525a9b54f34346140e..2dd75f14338a92407d386d3ff6d3f786624817a9 100644
--- a/apps/files/l10n/mk.php
+++ b/apps/files/l10n/mk.php
@@ -8,6 +8,11 @@
 "Missing a temporary folder" => "Недостасува привремена папка",
 "Failed to write to disk" => "Неуспеав да запишам на диск",
 "Files" => "Датотеки",
+"Unable to upload your file as it is a directory or has 0 bytes" => "Не може да се преземе вашата датотека бидејќи фолдерот во кој се наоѓа фајлот има големина од 0 бајти",
+"Upload cancelled." => "Преземањето е прекинато.",
+"File upload is in progress. Leaving the page now will cancel the upload." => "Подигање на датотека е во тек. Напуштење на страницата ќе го прекине.",
+"URL cannot be empty." => "Адресата неможе да биде празна.",
+"Error" => "Грешка",
 "Share" => "Сподели",
 "Delete" => "Избриши",
 "Rename" => "Преименувај",
@@ -20,11 +25,6 @@
 "undo" => "врати",
 "1 file uploading" => "1 датотека се подига",
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Неправилно име. , '\\', '/', '<', '>', ':', '\"', '|', '?' и '*' не се дозволени.",
-"Unable to upload your file as it is a directory or has 0 bytes" => "Не може да се преземе вашата датотека бидејќи фолдерот во кој се наоѓа фајлот има големина од 0 бајти",
-"Upload cancelled." => "Преземањето е прекинато.",
-"File upload is in progress. Leaving the page now will cancel the upload." => "Подигање на датотека е во тек. Напуштење на страницата ќе го прекине.",
-"URL cannot be empty." => "Адресата неможе да биде празна.",
-"Error" => "Грешка",
 "Name" => "Име",
 "Size" => "Големина",
 "Modified" => "Променето",
@@ -52,5 +52,7 @@
 "Upload too large" => "Фајлот кој се вчитува е преголем",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Датотеките кои се обидувате да ги подигнете ја надминуваат максималната големина за подигнување датотеки на овој сервер.",
 "Files are being scanned, please wait." => "Се скенираат датотеки, ве молам почекајте.",
-"Current scanning" => "Моментално скенирам"
+"Current scanning" => "Моментално скенирам",
+"file" => "датотека",
+"files" => "датотеки"
 );
diff --git a/apps/files/l10n/ms_MY.php b/apps/files/l10n/ms_MY.php
index 2ce4f1633284f2efb84b9d42cb080536a7a0c509..f96d4d48014eee9d67a5e8979a78d43215c51d52 100644
--- a/apps/files/l10n/ms_MY.php
+++ b/apps/files/l10n/ms_MY.php
@@ -7,14 +7,14 @@
 "Missing a temporary folder" => "Direktori sementara hilang",
 "Failed to write to disk" => "Gagal untuk disimpan",
 "Files" => "Fail-fail",
+"Unable to upload your file as it is a directory or has 0 bytes" => "Tidak boleh memuatnaik fail anda kerana mungkin ianya direktori atau saiz fail 0 bytes",
+"Upload cancelled." => "Muatnaik dibatalkan.",
+"Error" => "Ralat",
 "Share" => "Kongsi",
 "Delete" => "Padam",
 "Pending" => "Dalam proses",
 "replace" => "ganti",
 "cancel" => "Batal",
-"Unable to upload your file as it is a directory or has 0 bytes" => "Tidak boleh memuatnaik fail anda kerana mungkin ianya direktori atau saiz fail 0 bytes",
-"Upload cancelled." => "Muatnaik dibatalkan.",
-"Error" => "Ralat",
 "Name" => "Nama",
 "Size" => "Saiz",
 "Modified" => "Dimodifikasi",
@@ -36,5 +36,7 @@
 "Upload too large" => "Muatnaik terlalu besar",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Fail yang cuba dimuat naik melebihi saiz maksimum fail upload server",
 "Files are being scanned, please wait." => "Fail sedang diimbas, harap bersabar.",
-"Current scanning" => "Imbasan semasa"
+"Current scanning" => "Imbasan semasa",
+"file" => "fail",
+"files" => "fail"
 );
diff --git a/apps/files/l10n/nb_NO.php b/apps/files/l10n/nb_NO.php
index d5710a4927a07f438afa6531298606fdbd8a3593..769dfe33ffe3e35416de4e31b49f68749eab74b6 100644
--- a/apps/files/l10n/nb_NO.php
+++ b/apps/files/l10n/nb_NO.php
@@ -12,6 +12,13 @@
 "Not enough storage available" => "Ikke nok lagringsplass",
 "Invalid directory." => "Ugyldig katalog.",
 "Files" => "Filer",
+"Unable to upload your file as it is a directory or has 0 bytes" => "Kan ikke laste opp filen din siden det er en mappe eller den har 0 bytes",
+"Not enough space available" => "Ikke nok lagringsplass",
+"Upload cancelled." => "Opplasting avbrutt.",
+"File upload is in progress. Leaving the page now will cancel the upload." => "Filopplasting pågår. Forlater du siden nå avbrytes opplastingen.",
+"URL cannot be empty." => "URL-en kan ikke være tom.",
+"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Ugyldig mappenavn. Bruk av \"Shared\" er reservert av ownCloud.",
+"Error" => "Feil",
 "Share" => "Del",
 "Delete permanently" => "Slett permanent",
 "Delete" => "Slett",
@@ -32,13 +39,7 @@
 "Your storage is full, files can not be updated or synced anymore!" => "Lagringsplass er oppbrukt, filer kan ikke lenger oppdateres eller synkroniseres!",
 "Your storage is almost full ({usedSpacePercent}%)" => "Lagringsplass er nesten oppbruker ([usedSpacePercent}%)",
 "Your download is being prepared. This might take some time if the files are big." => "Nedlastingen din klargjøres. Hvis filene er store kan dette ta litt tid.",
-"Unable to upload your file as it is a directory or has 0 bytes" => "Kan ikke laste opp filen din siden det er en mappe eller den har 0 bytes",
-"Not enough space available" => "Ikke nok lagringsplass",
-"Upload cancelled." => "Opplasting avbrutt.",
-"File upload is in progress. Leaving the page now will cancel the upload." => "Filopplasting pågår. Forlater du siden nå avbrytes opplastingen.",
-"URL cannot be empty." => "URL-en kan ikke være tom.",
 "Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Ugyldig mappenavn. Bruk av \"Shared\" er reservert av ownCloud.",
-"Error" => "Feil",
 "Name" => "Navn",
 "Size" => "Størrelse",
 "Modified" => "Endret",
@@ -46,8 +47,6 @@
 "{count} folders" => "{count} mapper",
 "1 file" => "1 fil",
 "{count} files" => "{count} filer",
-"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Ugyldig mappenavn. Bruk av \"Shared\" er reservert av ownCloud.",
-"Unable to rename file" => "Kan ikke gi nytt navn",
 "Upload" => "Last opp",
 "File handling" => "Filhåndtering",
 "Maximum upload size" => "Maksimum opplastingsstørrelse",
@@ -71,5 +70,7 @@
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Filene du prøver å laste opp er for store for å laste opp til denne serveren.",
 "Files are being scanned, please wait." => "Skanner etter filer, vennligst vent.",
 "Current scanning" => "Pågående skanning",
+"file" => "fil",
+"files" => "filer",
 "Upgrading filesystem cache..." => "Oppgraderer filsystemets  mellomlager..."
 );
diff --git a/apps/files/l10n/nl.php b/apps/files/l10n/nl.php
index bc4158df3b3928befe482bbd8d5692f677d7de0a..914d5087af10a3253f02487b1b08de453dd6fd87 100644
--- a/apps/files/l10n/nl.php
+++ b/apps/files/l10n/nl.php
@@ -1,6 +1,8 @@
 <?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 set upload directory." => "Kan upload map niet instellen.",
+"Invalid Token" => "Ongeldig Token",
 "No file was uploaded. Unknown error" => "Er was geen bestand geladen.  Onbekende fout",
 "There is no error, the file uploaded with success" => "De upload van het bestand is goedgegaan.",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Het geüploade bestand overscheidt de upload_max_filesize optie in php.ini:",
@@ -12,6 +14,13 @@
 "Not enough storage available" => "Niet genoeg opslagruimte beschikbaar",
 "Invalid directory." => "Ongeldige directory.",
 "Files" => "Bestanden",
+"Unable to upload your file as it is a directory or has 0 bytes" => "Het lukt niet om uw bestand te uploaded, omdat het een folder of 0 bytes is",
+"Not enough space available" => "Niet genoeg ruimte beschikbaar",
+"Upload cancelled." => "Uploaden geannuleerd.",
+"File upload is in progress. Leaving the page now will cancel the upload." => "Bestandsupload is bezig. Wanneer de pagina nu verlaten wordt, stopt de upload.",
+"URL cannot be empty." => "URL kan niet leeg zijn.",
+"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Ongeldige mapnaam. Gebruik van 'Gedeeld' is voorbehouden aan Owncloud zelf",
+"Error" => "Fout",
 "Share" => "Delen",
 "Delete permanently" => "Verwijder definitief",
 "Delete" => "Verwijder",
@@ -32,13 +41,7 @@
 "Your storage is full, files can not be updated or synced anymore!" => "Uw opslagruimte zit vol, Bestanden kunnen niet meer worden ge-upload of gesynchroniseerd!",
 "Your storage is almost full ({usedSpacePercent}%)" => "Uw opslagruimte zit bijna vol ({usedSpacePercent}%)",
 "Your download is being prepared. This might take some time if the files are big." => "Uw download wordt voorbereid. Dit kan enige tijd duren bij grote bestanden.",
-"Unable to upload your file as it is a directory or has 0 bytes" => "Het lukt niet om uw bestand te uploaded, omdat het een folder of 0 bytes is",
-"Not enough space available" => "Niet genoeg ruimte beschikbaar",
-"Upload cancelled." => "Uploaden geannuleerd.",
-"File upload is in progress. Leaving the page now will cancel the upload." => "Bestandsupload is bezig. Wanneer de pagina nu verlaten wordt, stopt de upload.",
-"URL cannot be empty." => "URL kan niet leeg zijn.",
 "Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Ongeldige mapnaam. Gebruik van'Gedeeld' is voorbehouden aan Owncloud",
-"Error" => "Fout",
 "Name" => "Naam",
 "Size" => "Grootte",
 "Modified" => "Aangepast",
@@ -46,8 +49,6 @@
 "{count} folders" => "{count} mappen",
 "1 file" => "1 bestand",
 "{count} files" => "{count} bestanden",
-"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Ongeldige mapnaam. Gebruik van 'Gedeeld' is voorbehouden aan Owncloud zelf",
-"Unable to rename file" => "Kan bestand niet hernoemen",
 "Upload" => "Uploaden",
 "File handling" => "Bestand",
 "Maximum upload size" => "Maximale bestandsgrootte voor uploads",
@@ -71,5 +72,7 @@
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "De bestanden die u probeert te uploaden zijn groter dan de maximaal toegestane  bestandsgrootte voor deze server.",
 "Files are being scanned, please wait." => "Bestanden worden gescand, even wachten.",
 "Current scanning" => "Er wordt gescand",
+"file" => "bestand",
+"files" => "bestanden",
 "Upgrading filesystem cache..." => "Upgraden bestandssysteem cache..."
 );
diff --git a/apps/files/l10n/nn_NO.php b/apps/files/l10n/nn_NO.php
index 29593b6f2def50a7d86a473355100ec45ba099ad..dcc3373bea0510bf7d019c2e4135430566f98418 100644
--- a/apps/files/l10n/nn_NO.php
+++ b/apps/files/l10n/nn_NO.php
@@ -12,6 +12,13 @@
 "Not enough storage available" => "Ikkje nok lagringsplass tilgjengeleg",
 "Invalid directory." => "Ugyldig mappe.",
 "Files" => "Filer",
+"Unable to upload your file as it is a directory or has 0 bytes" => "Klarte ikkje lasta opp fila sidan ho er ei mappe eller er på 0 byte",
+"Not enough space available" => "Ikkje nok lagringsplass tilgjengeleg",
+"Upload cancelled." => "Opplasting avbroten.",
+"File upload is in progress. Leaving the page now will cancel the upload." => "Fila lastar no opp. Viss du forlèt sida no vil opplastinga verta avbroten.",
+"URL cannot be empty." => "Nettadressa kan ikkje vera tom.",
+"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Ugyldig mappenamn. Mappa «Shared» er reservert av ownCloud",
+"Error" => "Feil",
 "Share" => "Del",
 "Delete permanently" => "Slett for godt",
 "Delete" => "Slett",
@@ -32,13 +39,7 @@
 "Your storage is full, files can not be updated or synced anymore!" => "Lagringa di er full, kan ikkje lenger oppdatera eller synkronisera!",
 "Your storage is almost full ({usedSpacePercent}%)" => "Lagringa di er nesten full ({usedSpacePercent} %)",
 "Your download is being prepared. This might take some time if the files are big." => "Gjer klar nedlastinga di. Dette kan ta ei stund viss filene er store.",
-"Unable to upload your file as it is a directory or has 0 bytes" => "Klarte ikkje lasta opp fila sidan ho er ei mappe eller er på 0 byte",
-"Not enough space available" => "Ikkje nok lagringsplass tilgjengeleg",
-"Upload cancelled." => "Opplasting avbroten.",
-"File upload is in progress. Leaving the page now will cancel the upload." => "Fila lastar no opp. Viss du forlèt sida no vil opplastinga verta avbroten.",
-"URL cannot be empty." => "Nettadressa kan ikkje vera tom.",
 "Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Ugyldig mappenamn. Mappa «Shared» er reservert av ownCloud",
-"Error" => "Feil",
 "Name" => "Namn",
 "Size" => "Storleik",
 "Modified" => "Endra",
@@ -46,8 +47,6 @@
 "{count} folders" => "{count} mapper",
 "1 file" => "1 fil",
 "{count} files" => "{count} filer",
-"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Ugyldig mappenamn. Mappa «Shared» er reservert av ownCloud",
-"Unable to rename file" => "Klarte ikkje endra filnamnet",
 "Upload" => "Last opp",
 "File handling" => "Filhandtering",
 "Maximum upload size" => "Maksimal opplastingsstorleik",
diff --git a/apps/files/l10n/oc.php b/apps/files/l10n/oc.php
index fa31ddf9f43ea9a21720305209f30fd588a063f9..703aeb3fbad97037fe3ff6ef68494b6638a899d9 100644
--- a/apps/files/l10n/oc.php
+++ b/apps/files/l10n/oc.php
@@ -6,6 +6,10 @@
 "Missing a temporary folder" => "Un dorsièr temporari manca",
 "Failed to write to disk" => "L'escriptura sul disc a fracassat",
 "Files" => "Fichièrs",
+"Unable to upload your file as it is a directory or has 0 bytes" => "Impossible d'amontcargar lo teu fichièr qu'es un repertòri o que ten pas que 0 octet.",
+"Upload cancelled." => "Amontcargar anullat.",
+"File upload is in progress. Leaving the page now will cancel the upload." => "Un amontcargar es a se far. Daissar aquesta pagina ara tamparà lo cargament. ",
+"Error" => "Error",
 "Share" => "Parteja",
 "Delete" => "Escafa",
 "Rename" => "Torna nomenar",
@@ -16,10 +20,6 @@
 "undo" => "defar",
 "1 file uploading" => "1 fichièr al amontcargar",
 "files uploading" => "fichièrs al amontcargar",
-"Unable to upload your file as it is a directory or has 0 bytes" => "Impossible d'amontcargar lo teu fichièr qu'es un repertòri o que ten pas que 0 octet.",
-"Upload cancelled." => "Amontcargar anullat.",
-"File upload is in progress. Leaving the page now will cancel the upload." => "Un amontcargar es a se far. Daissar aquesta pagina ara tamparà lo cargament. ",
-"Error" => "Error",
 "Name" => "Nom",
 "Size" => "Talha",
 "Modified" => "Modificat",
@@ -42,5 +42,7 @@
 "Upload too large" => "Amontcargament tròp gròs",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Los fichièrs que sias a amontcargar son tròp pesucs per la talha maxi pel servidor.",
 "Files are being scanned, please wait." => "Los fiichièrs son a èsser explorats, ",
-"Current scanning" => "Exploracion en cors"
+"Current scanning" => "Exploracion en cors",
+"file" => "fichièr",
+"files" => "fichièrs"
 );
diff --git a/apps/files/l10n/pl.php b/apps/files/l10n/pl.php
index 4bdac05578189551de8da55cd84b5631ed25256c..a3acfea6618b65e48c6382fa8a86dc59eb506a50 100644
--- a/apps/files/l10n/pl.php
+++ b/apps/files/l10n/pl.php
@@ -1,6 +1,8 @@
 <?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 set upload directory." => "Nie można ustawić katalog wczytywania.",
+"Invalid Token" => "Nieprawidłowy Token",
 "No file was uploaded. Unknown error" => "Żaden plik nie został załadowany. Nieznany błąd",
 "There is no error, the file uploaded with success" => "Nie było błędów, plik wysłano poprawnie.",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Wgrany plik przekracza wartość upload_max_filesize zdefiniowaną w php.ini: ",
@@ -12,6 +14,13 @@
 "Not enough storage available" => "Za mało dostępnego miejsca",
 "Invalid directory." => "Zła ścieżka.",
 "Files" => "Pliki",
+"Unable to upload your file as it is a directory or has 0 bytes" => "Nie można wczytać pliku, ponieważ jest on katalogiem lub ma 0 bajtów",
+"Not enough space available" => "Za mało miejsca",
+"Upload cancelled." => "Wczytywanie anulowane.",
+"File upload is in progress. Leaving the page now will cancel the upload." => "Wysyłanie pliku jest w toku. Jeśli opuścisz tę stronę, wysyłanie zostanie przerwane.",
+"URL cannot be empty." => "URL nie może być pusty.",
+"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Nieprawidłowa nazwa folderu. Wykorzystanie 'Shared' jest zarezerwowane przez ownCloud",
+"Error" => "BÅ‚Ä…d",
 "Share" => "Udostępnij",
 "Delete permanently" => "Trwale usuń",
 "Delete" => "Usuń",
@@ -32,13 +41,7 @@
 "Your storage is full, files can not be updated or synced anymore!" => "Magazyn jest pełny. Pliki nie mogą zostać zaktualizowane lub zsynchronizowane!",
 "Your storage is almost full ({usedSpacePercent}%)" => "Twój magazyn jest prawie pełny ({usedSpacePercent}%)",
 "Your download is being prepared. This might take some time if the files are big." => "Pobieranie jest przygotowywane. Może to zająć trochę czasu jeśli pliki są duże.",
-"Unable to upload your file as it is a directory or has 0 bytes" => "Nie można wczytać pliku, ponieważ jest on katalogiem lub ma 0 bajtów",
-"Not enough space available" => "Za mało miejsca",
-"Upload cancelled." => "Wczytywanie anulowane.",
-"File upload is in progress. Leaving the page now will cancel the upload." => "Wysyłanie pliku jest w toku. Jeśli opuścisz tę stronę, wysyłanie zostanie przerwane.",
-"URL cannot be empty." => "URL nie może być pusty.",
 "Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Nieprawidłowa nazwa folderu. Korzystanie z nazwy „Shared” jest zarezerwowane dla ownCloud",
-"Error" => "BÅ‚Ä…d",
 "Name" => "Nazwa",
 "Size" => "Rozmiar",
 "Modified" => "Modyfikacja",
@@ -46,8 +49,7 @@
 "{count} folders" => "Ilość folderów: {count}",
 "1 file" => "1 plik",
 "{count} files" => "Ilość plików: {count}",
-"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Nieprawidłowa nazwa folderu. Wykorzystanie 'Shared' jest zarezerwowane przez ownCloud",
-"Unable to rename file" => "Nie można zmienić nazwy pliku",
+"%s could not be renamed" => "%s nie można zmienić nazwy",
 "Upload" => "Wyślij",
 "File handling" => "ZarzÄ…dzanie plikami",
 "Maximum upload size" => "Maksymalny rozmiar wysyłanego pliku",
@@ -71,5 +73,9 @@
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Pliki, które próbujesz przesłać, przekraczają maksymalną dopuszczalną wielkość.",
 "Files are being scanned, please wait." => "Skanowanie plików, proszę czekać.",
 "Current scanning" => "Aktualnie skanowane",
+"directory" => "Katalog",
+"directories" => "Katalogi",
+"file" => "plik",
+"files" => "pliki",
 "Upgrading filesystem cache..." => "Uaktualnianie plików pamięci podręcznej..."
 );
diff --git a/apps/files/l10n/pt_BR.php b/apps/files/l10n/pt_BR.php
index 0f349b694812830acc2dec8a4a813cccfc419443..3ad679f87646cc426cccfbf00ffad669ee138f12 100644
--- a/apps/files/l10n/pt_BR.php
+++ b/apps/files/l10n/pt_BR.php
@@ -1,6 +1,8 @@
 <?php $TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "Impossível mover %s - Um arquivo com este nome já existe",
 "Could not move %s" => "Impossível mover %s",
+"Unable to set upload directory." => "Impossível configurar o diretório de upload",
+"Invalid Token" => "Token inválido",
 "No file was uploaded. Unknown error" => "Nenhum arquivo foi enviado. Erro desconhecido",
 "There is no error, the file uploaded with success" => "Sem erros, o arquivo foi enviado com sucesso",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "O arquivo enviado excede a diretiva upload_max_filesize no php.ini: ",
@@ -12,6 +14,13 @@
 "Not enough storage available" => "Espaço de armazenamento insuficiente",
 "Invalid directory." => "Diretório inválido.",
 "Files" => "Arquivos",
+"Unable to upload your file as it is a directory or has 0 bytes" => "Impossível enviar seus arquivo por ele ser um diretório ou ter 0 bytes.",
+"Not enough space available" => "Espaço de armazenamento insuficiente",
+"Upload cancelled." => "Envio cancelado.",
+"File upload is in progress. Leaving the page now will cancel the upload." => "Upload em andamento. Sair da página agora resultará no cancelamento do envio.",
+"URL cannot be empty." => "URL não pode ficar em branco",
+"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Nome de pasta inválido. O uso do nome 'Compartilhado' é reservado ao ownCloud",
+"Error" => "Erro",
 "Share" => "Compartilhar",
 "Delete permanently" => "Excluir permanentemente",
 "Delete" => "Excluir",
@@ -32,13 +41,7 @@
 "Your storage is full, files can not be updated or synced anymore!" => "Seu armazenamento está cheio, arquivos não podem mais ser atualizados ou sincronizados!",
 "Your storage is almost full ({usedSpacePercent}%)" => "Seu armazenamento está quase cheio ({usedSpacePercent}%)",
 "Your download is being prepared. This might take some time if the files are big." => "Seu download está sendo preparado. Isto pode levar algum tempo se os arquivos forem grandes.",
-"Unable to upload your file as it is a directory or has 0 bytes" => "Impossível enviar seus arquivo por ele ser um diretório ou ter 0 bytes.",
-"Not enough space available" => "Espaço de armazenamento insuficiente",
-"Upload cancelled." => "Envio cancelado.",
-"File upload is in progress. Leaving the page now will cancel the upload." => "Upload em andamento. Sair da página agora resultará no cancelamento do envio.",
-"URL cannot be empty." => "URL não pode ficar em branco",
 "Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Nome de pasta inválido. O uso de 'Shared' é reservado para o Owncloud",
-"Error" => "Erro",
 "Name" => "Nome",
 "Size" => "Tamanho",
 "Modified" => "Modificado",
@@ -46,8 +49,7 @@
 "{count} folders" => "{count} pastas",
 "1 file" => "1 arquivo",
 "{count} files" => "{count} arquivos",
-"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Nome de pasta inválido. O uso do nome 'Compartilhado' é reservado ao ownCloud",
-"Unable to rename file" => "Impossível renomear arquivo",
+"%s could not be renamed" => "%s não pode ser renomeado",
 "Upload" => "Upload",
 "File handling" => "Tratamento de Arquivo",
 "Maximum upload size" => "Tamanho máximo para carregar",
@@ -71,5 +73,9 @@
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Os arquivos que você está tentando carregar excedeu o tamanho máximo para arquivos no servidor.",
 "Files are being scanned, please wait." => "Arquivos sendo escaneados, por favor aguarde.",
 "Current scanning" => "Scanning atual",
+"directory" => "diretório",
+"directories" => "diretórios",
+"file" => "arquivo",
+"files" => "arquivos",
 "Upgrading filesystem cache..." => "Atualizando cache do sistema de arquivos..."
 );
diff --git a/apps/files/l10n/pt_PT.php b/apps/files/l10n/pt_PT.php
index d90e29997020968bf8a4333c62072af2258bd3ba..4273de9c47841f374dc61ee79cbdd48b6f5dcde6 100644
--- a/apps/files/l10n/pt_PT.php
+++ b/apps/files/l10n/pt_PT.php
@@ -12,6 +12,13 @@
 "Not enough storage available" => "Não há espaço suficiente em disco",
 "Invalid directory." => "Directório Inválido",
 "Files" => "Ficheiros",
+"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",
+"Not enough space available" => "Espaço em disco insuficiente!",
+"Upload cancelled." => "Envio cancelado.",
+"File upload is in progress. Leaving the page now will cancel the upload." => "Envio de ficheiro em progresso. Irá cancelar o envio se sair da página agora.",
+"URL cannot be empty." => "O URL não pode estar vazio.",
+"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Nome da pasta inválido. Palavra 'Shared' é reservado pela ownCloud",
+"Error" => "Erro",
 "Share" => "Partilhar",
 "Delete permanently" => "Eliminar permanentemente",
 "Delete" => "Eliminar",
@@ -32,13 +39,7 @@
 "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",
-"Not enough space available" => "Espaço em disco insuficiente!",
-"Upload cancelled." => "Envio cancelado.",
-"File upload is in progress. Leaving the page now will cancel the upload." => "Envio de ficheiro em progresso. Irá cancelar o envio se sair da página agora.",
-"URL cannot be empty." => "O URL não pode estar vazio.",
 "Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Nome de pasta inválido. O Uso de 'shared' é reservado para o ownCloud",
-"Error" => "Erro",
 "Name" => "Nome",
 "Size" => "Tamanho",
 "Modified" => "Modificado",
@@ -46,8 +47,6 @@
 "{count} folders" => "{count} pastas",
 "1 file" => "1 ficheiro",
 "{count} files" => "{count} ficheiros",
-"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Nome da pasta inválido. Palavra 'Shared' é reservado pela ownCloud",
-"Unable to rename file" => "Não foi possível renomear o ficheiro",
 "Upload" => "Carregar",
 "File handling" => "Manuseamento de ficheiros",
 "Maximum upload size" => "Tamanho máximo de envio",
@@ -71,5 +70,7 @@
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Os ficheiro que está a tentar enviar excedem o tamanho máximo de envio neste servidor.",
 "Files are being scanned, please wait." => "Os ficheiros estão a ser analisados, por favor aguarde.",
 "Current scanning" => "Análise actual",
+"file" => "ficheiro",
+"files" => "ficheiros",
 "Upgrading filesystem cache..." => "Atualizar cache do sistema de ficheiros..."
 );
diff --git a/apps/files/l10n/ro.php b/apps/files/l10n/ro.php
index 8fdf62aeb32b1aab7004642d0287eb0c0142c930..b0cca7d7a8289cc10d0dd2368398c5977fc479b0 100644
--- a/apps/files/l10n/ro.php
+++ b/apps/files/l10n/ro.php
@@ -1,6 +1,8 @@
 <?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 - File with this name already exists" => "%s nu se poate muta - Fișierul cu acest nume există deja ",
 "Could not move %s" => "Nu s-a putut muta %s",
+"Unable to set upload directory." => "Imposibil de a seta directorul pentru incărcare.",
+"Invalid Token" => "Jeton Invalid",
 "No file was uploaded. Unknown error" => "Nici un fișier nu a fost încărcat. Eroare necunoscută",
 "There is no error, the file uploaded with success" => "Nu a apărut nici o eroare, fișierul a fost încărcat cu succes",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Fisierul incarcat depaseste upload_max_filesize permisi in php.ini: ",
@@ -12,6 +14,13 @@
 "Not enough storage available" => "Nu este suficient spațiu disponibil",
 "Invalid directory." => "Director invalid.",
 "Files" => "Fișiere",
+"Unable to upload your file as it is a directory or has 0 bytes" => "Nu s-a putut încărca fișierul tău deoarece pare să fie un director sau are 0 bytes.",
+"Not enough space available" => "Nu este suficient spațiu disponibil",
+"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" => "Nume de dosar invalid. Utilizarea 'Shared' e rezervată de ownCloud",
+"Error" => "Eroare",
 "Share" => "Partajează",
 "Delete permanently" => "Stergere permanenta",
 "Delete" => "Șterge",
@@ -32,13 +41,7 @@
 "Your storage is full, files can not be updated or synced anymore!" => "Spatiul de stocare este plin, nu mai puteti incarca s-au sincroniza alte fisiere.",
 "Your storage is almost full ({usedSpacePercent}%)" => "Spatiul de stocare este aproape plin ({usedSpacePercent}%)",
 "Your download is being prepared. This might take some time if the files are big." => "Se pregătește descărcarea. Aceasta poate să dureze ceva timp dacă fișierele sunt mari.",
-"Unable to upload your file as it is a directory or has 0 bytes" => "Nu s-a putut încărca fișierul tău deoarece pare să fie un director sau are 0 bytes.",
-"Not enough space available" => "Nu este suficient spațiu disponibil",
-"Upload cancelled." => "Încărcare anulată.",
-"File upload is in progress. Leaving the page now will cancel the upload." => "Fișierul este în curs de încărcare. Părăsirea paginii va întrerupe încărcarea.",
-"URL cannot be empty." => "Adresa URL nu poate fi goală.",
 "Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Invalid folder name. Usage of 'Shared' is reserved by Ownclou",
-"Error" => "Eroare",
 "Name" => "Nume",
 "Size" => "Dimensiune",
 "Modified" => "Modificat",
@@ -46,7 +49,7 @@
 "{count} folders" => "{count} foldare",
 "1 file" => "1 fisier",
 "{count} files" => "{count} fisiere",
-"Unable to rename file" => "Nu s-a putut redenumi fișierul",
+"%s could not be renamed" => "%s nu a putut fi redenumit",
 "Upload" => "Încărcare",
 "File handling" => "Manipulare fișiere",
 "Maximum upload size" => "Dimensiune maximă admisă la încărcare",
@@ -70,5 +73,9 @@
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Fișierul care l-ai încărcat a depășită limita maximă admisă la încărcare pe acest server.",
 "Files are being scanned, please wait." => "Fișierele sunt scanate, te rog așteptă.",
 "Current scanning" => "ÃŽn curs de scanare",
+"directory" => "catalog",
+"directories" => "cataloage",
+"file" => "fișier",
+"files" => "fișiere",
 "Upgrading filesystem cache..." => "Modernizare fisiere de sistem cache.."
 );
diff --git a/apps/files/l10n/ru.php b/apps/files/l10n/ru.php
index 43a8dc70080df7e29ff936e00aba65e8fecde4b6..34eca54f493d77529d06164ceea901f35afdd5ef 100644
--- a/apps/files/l10n/ru.php
+++ b/apps/files/l10n/ru.php
@@ -1,6 +1,8 @@
 <?php $TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "Невозможно переместить %s - файл с таким именем уже существует",
 "Could not move %s" => "Невозможно переместить %s",
+"Unable to set upload directory." => "Не удалось установить каталог загрузки.",
+"Invalid Token" => "Недопустимый маркер",
 "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:",
@@ -12,6 +14,13 @@
 "Not enough storage available" => "Недостаточно доступного места в хранилище",
 "Invalid directory." => "Неправильный каталог.",
 "Files" => "Файлы",
+"Unable to upload your file as it is a directory or has 0 bytes" => "Файл не был загружен: его размер 0 байт либо это не файл, а директория.",
+"Not enough space available" => "Недостаточно свободного места",
+"Upload cancelled." => "Загрузка отменена.",
+"File upload is in progress. Leaving the page now will cancel the upload." => "Файл в процессе загрузки. Покинув страницу вы прервёте загрузку.",
+"URL cannot be empty." => "Ссылка не может быть пустой.",
+"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Неправильное имя каталога. Имя 'Shared' зарезервировано.",
+"Error" => "Ошибка",
 "Share" => "Открыть доступ",
 "Delete permanently" => "Удалено навсегда",
 "Delete" => "Удалить",
@@ -32,13 +41,7 @@
 "Your storage is full, files can not be updated or synced anymore!" => "Ваше дисковое пространство полностью заполнено, произведите очистку перед загрузкой новых файлов.",
 "Your storage is almost full ({usedSpacePercent}%)" => "Ваше хранилище почти заполнено ({usedSpacePercent}%)",
 "Your download is being prepared. This might take some time if the files are big." => "Загрузка началась. Это может потребовать много времени, если файл большого размера.",
-"Unable to upload your file as it is a directory or has 0 bytes" => "Файл не был загружен: его размер 0 байт либо это не файл, а директория.",
-"Not enough space available" => "Недостаточно свободного места",
-"Upload cancelled." => "Загрузка отменена.",
-"File upload is in progress. Leaving the page now will cancel the upload." => "Файл в процессе загрузки. Покинув страницу вы прервёте загрузку.",
-"URL cannot be empty." => "Ссылка не может быть пустой.",
 "Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Неправильное имя каталога. Имя 'Shared' зарезервировано.",
-"Error" => "Ошибка",
 "Name" => "Имя",
 "Size" => "Размер",
 "Modified" => "Изменён",
@@ -46,8 +49,7 @@
 "{count} folders" => "{count} папок",
 "1 file" => "1 файл",
 "{count} files" => "{count} файлов",
-"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Неправильное имя каталога. Имя 'Shared' зарезервировано.",
-"Unable to rename file" => "Невозможно переименовать файл",
+"%s could not be renamed" => "%s не может быть переименован",
 "Upload" => "Загрузка",
 "File handling" => "Управление файлами",
 "Maximum upload size" => "Максимальный размер загружаемого файла",
@@ -68,8 +70,12 @@
 "Download" => "Скачать",
 "Unshare" => "Закрыть общий доступ",
 "Upload too large" => "Файл слишком велик",
-"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Файлы, которые Вы пытаетесь загрузить, превышают лимит для файлов на этом сервере.",
+"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Файлы, которые вы пытаетесь загрузить, превышают лимит для файлов на этом сервере.",
 "Files are being scanned, please wait." => "Подождите, файлы сканируются.",
 "Current scanning" => "Текущее сканирование",
-"Upgrading filesystem cache..." => "Обновление кеша файловой системы..."
+"directory" => "директория",
+"directories" => "директории",
+"file" => "файл",
+"files" => "файлы",
+"Upgrading filesystem cache..." => "Обновление кэша файловой системы..."
 );
diff --git a/apps/files/l10n/si_LK.php b/apps/files/l10n/si_LK.php
index 351021a9f8bf1ad3df0a7eac44c692418d1af737..82fca4bc75d6e720b0749b4869054daca096e79f 100644
--- a/apps/files/l10n/si_LK.php
+++ b/apps/files/l10n/si_LK.php
@@ -7,6 +7,10 @@
 "Missing a temporary folder" => "තාවකාලික ෆොල්ඩරයක් අතුරුදහන්",
 "Failed to write to disk" => "තැටිගත කිරීම අසාර්ථකයි",
 "Files" => "ගොනු",
+"Upload cancelled." => "උඩුගත කිරීම අත් හරින්න ලදී",
+"File upload is in progress. Leaving the page now will cancel the upload." => "උඩුගතකිරීමක් සිදුවේ. පිටුව හැර යාමෙන් එය නැවතෙනු ඇත",
+"URL cannot be empty." => "යොමුව හිස් විය නොහැක",
+"Error" => "දෝෂයක්",
 "Share" => "බෙදා හදා ගන්න",
 "Delete" => "මකා දමන්න",
 "Rename" => "නැවත නම් කරන්න",
@@ -15,10 +19,6 @@
 "cancel" => "අත් හරින්න",
 "undo" => "නිෂ්ප්‍රභ කරන්න",
 "1 file uploading" => "1 ගොනුවක් උඩගත කෙරේ",
-"Upload cancelled." => "උඩුගත කිරීම අත් හරින්න ලදී",
-"File upload is in progress. Leaving the page now will cancel the upload." => "උඩුගතකිරීමක් සිදුවේ. පිටුව හැර යාමෙන් එය නැවතෙනු ඇත",
-"URL cannot be empty." => "යොමුව හිස් විය නොහැක",
-"Error" => "දෝෂයක්",
 "Name" => "නම",
 "Size" => "ප්‍රමාණය",
 "Modified" => "වෙනස් කළ",
@@ -44,5 +44,7 @@
 "Upload too large" => "උඩුගත කිරීම විශාල වැඩිය",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "ඔබ උඩුගත කිරීමට තැත් කරන ගොනු මෙම සේවාදායකයා උඩුගත කිරීමට ඉඩදී ඇති උපරිම ගොනු විශාලත්වයට වඩා වැඩිය",
 "Files are being scanned, please wait." => "ගොනු පරික්ෂා කෙරේ. මඳක් රැඳී සිටින්න",
-"Current scanning" => "වර්තමාන පරික්ෂාව"
+"Current scanning" => "වර්තමාන පරික්ෂාව",
+"file" => "ගොනුව",
+"files" => "ගොනු"
 );
diff --git a/apps/files/l10n/sk_SK.php b/apps/files/l10n/sk_SK.php
index ad33c9b4eeedcbda5a008fbe6d6ea498bf882878..ac71f30e9078d51c55693ac46ab10069b0b2cf6b 100644
--- a/apps/files/l10n/sk_SK.php
+++ b/apps/files/l10n/sk_SK.php
@@ -1,6 +1,8 @@
 <?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 set upload directory." => "Nemožno nastaviť priečinok pre nahrané súbory.",
+"Invalid Token" => "Neplatný token",
 "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:",
@@ -10,8 +12,15 @@
 "Missing a temporary folder" => "Chýba dočasný priečinok",
 "Failed to write to disk" => "Zápis na disk sa nepodaril",
 "Not enough storage available" => "Nedostatok dostupného úložného priestoru",
-"Invalid directory." => "Neplatný priečinok",
+"Invalid directory." => "Neplatný priečinok.",
 "Files" => "Súbory",
+"Unable to upload your file as it is a directory or has 0 bytes" => "Nedá sa odoslať Váš súbor, pretože je to priečinok, alebo je jeho veľkosť 0 bajtov",
+"Not enough space available" => "Nie je k dispozícii dostatok miesta",
+"Upload cancelled." => "Odosielanie zrušené.",
+"File upload is in progress. Leaving the page now will cancel the upload." => "Opustenie stránky zruší práve prebiehajúce odosielanie súboru.",
+"URL cannot be empty." => "URL nemôže byť prázdne.",
+"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Neplatný názov priečinka. Názov \"Shared\" je rezervovaný pre ownCloud",
+"Error" => "Chyba",
 "Share" => "Zdieľať",
 "Delete permanently" => "Zmazať  trvalo",
 "Delete" => "Zmazať",
@@ -32,13 +41,7 @@
 "Your storage is full, files can not be updated or synced anymore!" => "Vaše úložisko je plné. Súbory nemožno aktualizovať ani synchronizovať!",
 "Your storage is almost full ({usedSpacePercent}%)" => "Vaše úložisko je takmer plné ({usedSpacePercent}%)",
 "Your download is being prepared. This might take some time if the files are big." => "Vaše sťahovanie sa pripravuje. Ak sú sťahované súbory veľké, môže to chvíľu trvať.",
-"Unable to upload your file as it is a directory or has 0 bytes" => "Nedá sa odoslať Váš súbor, pretože je to priečinok, alebo je jeho veľkosť 0 bajtov",
-"Not enough space available" => "Nie je k dispozícii dostatok miesta",
-"Upload cancelled." => "Odosielanie zrušené",
-"File upload is in progress. Leaving the page now will cancel the upload." => "Opustenie stránky zruší práve prebiehajúce odosielanie súboru.",
-"URL cannot be empty." => "URL nemôže byť prázdne",
 "Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Neplatné meno priečinka. Používanie mena 'Shared' je vyhradené len pre Owncloud",
-"Error" => "Chyba",
 "Name" => "Názov",
 "Size" => "Veľkosť",
 "Modified" => "Upravené",
@@ -46,8 +49,7 @@
 "{count} folders" => "{count} priečinkov",
 "1 file" => "1 súbor",
 "{count} files" => "{count} súborov",
-"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Neplatný názov priečinka. Názov \"Shared\" je rezervovaný pre ownCloud",
-"Unable to rename file" => "Nemožno premenovať súbor",
+"%s could not be renamed" => "%s nemohol byť premenovaný",
 "Upload" => "Odoslať",
 "File handling" => "Nastavenie správania sa k súborom",
 "Maximum upload size" => "Maximálna veľkosť odosielaného súboru",
@@ -71,5 +73,9 @@
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Súbory, ktoré sa snažíte nahrať, presahujú maximálnu veľkosť pre nahratie súborov na tento server.",
 "Files are being scanned, please wait." => "Čakajte, súbory sú prehľadávané.",
 "Current scanning" => "Práve prezerané",
+"directory" => "priečinok",
+"directories" => "priečinky",
+"file" => "súbor",
+"files" => "súbory",
 "Upgrading filesystem cache..." => "Aktualizujem medzipamäť súborového systému..."
 );
diff --git a/apps/files/l10n/sl.php b/apps/files/l10n/sl.php
index 6902d311ab76327b93b19abe746e635283e7df21..bb01e5475d50541d702939d5de5e961685cb5f55 100644
--- a/apps/files/l10n/sl.php
+++ b/apps/files/l10n/sl.php
@@ -1,6 +1,8 @@
 <?php $TRANSLATIONS = array(
-"Could not move %s - File with this name already exists" => "Ni mogoče premakniti %s - datoteka s tem imenom že obstaja",
+"Could not move %s - File with this name already exists" => "%s ni mogoče premakniti  - datoteka s tem imenom že obstaja",
 "Could not move %s" => "Ni mogoče premakniti %s",
+"Unable to set upload directory." => "Mapo, v katero boste prenašali dokumente, ni mogoče določiti",
+"Invalid Token" => "Neveljaven žeton",
 "No file was uploaded. Unknown error" => "Ni poslane datoteke. Neznana napaka.",
 "There is no error, the file uploaded with success" => "Datoteka je uspešno naložena.",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Poslana datoteka presega dovoljeno velikost, ki je določena z možnostjo upload_max_filesize v datoteki php.ini:",
@@ -12,6 +14,13 @@
 "Not enough storage available" => "Na voljo ni dovolj prostora",
 "Invalid directory." => "Neveljavna mapa.",
 "Files" => "Datoteke",
+"Unable to upload your file as it is a directory or has 0 bytes" => "Pošiljanja ni mogoče izvesti, saj gre za mapo oziroma datoteko velikosti 0 bajtov.",
+"Not enough space available" => "Na voljo ni dovolj prostora.",
+"Upload cancelled." => "Pošiljanje je preklicano.",
+"File upload is in progress. Leaving the page now will cancel the upload." => "V teku je pošiljanje datoteke. Če zapustite to stran zdaj, bo pošiljanje preklicano.",
+"URL cannot be empty." => "Naslov URL ne sme biti prazna vrednost.",
+"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Ime mape je neveljavno. Uporaba oznake \"Souporaba\" je rezervirana za ownCloud",
+"Error" => "Napaka",
 "Share" => "Souporaba",
 "Delete permanently" => "Izbriši dokončno",
 "Delete" => "Izbriši",
@@ -32,13 +41,7 @@
 "Your storage is full, files can not be updated or synced anymore!" => "Shramba je povsem napolnjena. Datotek ni več mogoče posodabljati in usklajevati!",
 "Your storage is almost full ({usedSpacePercent}%)" => "Mesto za shranjevanje je skoraj polno ({usedSpacePercent}%)",
 "Your download is being prepared. This might take some time if the files are big." => "Postopek priprave datoteke za prejem je lahko dolgotrajen, če je datoteka zelo velika.",
-"Unable to upload your file as it is a directory or has 0 bytes" => "Pošiljanja ni mogoče izvesti, saj gre za mapo oziroma datoteko velikosti 0 bajtov.",
-"Not enough space available" => "Na voljo ni dovolj prostora.",
-"Upload cancelled." => "Pošiljanje je preklicano.",
-"File upload is in progress. Leaving the page now will cancel the upload." => "V teku je pošiljanje datoteke. Če zapustite to stran zdaj, bo pošiljanje preklicano.",
-"URL cannot be empty." => "Naslov URL ne sme biti prazna vrednost.",
 "Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Neveljavno ime mape. Uporaba oznake \"Souporaba\" je zadržan za sistem ownCloud.",
-"Error" => "Napaka",
 "Name" => "Ime",
 "Size" => "Velikost",
 "Modified" => "Spremenjeno",
@@ -46,7 +49,7 @@
 "{count} folders" => "{count} map",
 "1 file" => "1 datoteka",
 "{count} files" => "{count} datotek",
-"Unable to rename file" => "Ni mogoče preimenovati datoteke",
+"%s could not be renamed" => "%s ni bilo mogoče preimenovati",
 "Upload" => "Pošlji",
 "File handling" => "Upravljanje z datotekami",
 "Maximum upload size" => "Največja velikost za pošiljanja",
@@ -70,5 +73,9 @@
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Datoteke, ki jih želite poslati, presegajo največjo dovoljeno velikost na strežniku.",
 "Files are being scanned, please wait." => "Poteka preučevanje datotek, počakajte ...",
 "Current scanning" => "Trenutno poteka preučevanje",
+"directory" => "direktorij",
+"directories" => "direktoriji",
+"file" => "datoteka",
+"files" => "datoteke",
 "Upgrading filesystem cache..." => "Nadgrajevanje predpomnilnika datotečnega sistema ..."
 );
diff --git a/apps/files/l10n/sq.php b/apps/files/l10n/sq.php
index 63c95f692e26842b4b33785d8b02e002a81a2ac5..2daca10a416cf8b426b019e3952d9d8210c47ef0 100644
--- a/apps/files/l10n/sq.php
+++ b/apps/files/l10n/sq.php
@@ -12,6 +12,12 @@
 "Not enough storage available" => "Nuk ka mbetur hapësirë memorizimi e mjaftueshme",
 "Invalid directory." => "Dosje e pavlefshme.",
 "Files" => "Skedarët",
+"Unable to upload your file as it is a directory or has 0 bytes" => "Nuk është i mundur ngarkimi i skedarit tuaj sepse është dosje ose ka dimension 0 byte",
+"Not enough space available" => "Nuk ka hapësirë memorizimi e mjaftueshme",
+"Upload cancelled." => "Ngarkimi u anulua.",
+"File upload is in progress. Leaving the page now will cancel the upload." => "Ngarkimi i skedarit është në vazhdim. Nqse ndërroni faqen tani ngarkimi do të anulohet.",
+"URL cannot be empty." => "URL-i nuk mund të jetë bosh.",
+"Error" => "Veprim i gabuar",
 "Share" => "Nda",
 "Delete permanently" => "Elimino përfundimisht",
 "Delete" => "Elimino",
@@ -32,13 +38,7 @@
 "Your storage is full, files can not be updated or synced anymore!" => "Hapësira juaj e memorizimit është plot, nuk mund të ngarkoni apo sinkronizoni më skedarët.",
 "Your storage is almost full ({usedSpacePercent}%)" => "Hapësira juaj e memorizimit është gati plot ({usedSpacePercent}%)",
 "Your download is being prepared. This might take some time if the files are big." => "Shkarkimi juaj po përgatitet. Mund të duhet pak kohë nqse skedarët janë të mëdhenj.",
-"Unable to upload your file as it is a directory or has 0 bytes" => "Nuk është i mundur ngarkimi i skedarit tuaj sepse është dosje ose ka dimension 0 byte",
-"Not enough space available" => "Nuk ka hapësirë memorizimi e mjaftueshme",
-"Upload cancelled." => "Ngarkimi u anulua.",
-"File upload is in progress. Leaving the page now will cancel the upload." => "Ngarkimi i skedarit është në vazhdim. Nqse ndërroni faqen tani ngarkimi do të anulohet.",
-"URL cannot be empty." => "URL-i nuk mund të jetë bosh.",
 "Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Emri i dosjes është i pavlefshëm. Përdorimi i \"Shared\" është i rezervuar nga Owncloud-i.",
-"Error" => "Veprim i gabuar",
 "Name" => "Emri",
 "Size" => "Dimensioni",
 "Modified" => "Modifikuar",
@@ -46,7 +46,6 @@
 "{count} folders" => "{count} dosje",
 "1 file" => "1 skedar",
 "{count} files" => "{count} skedarë",
-"Unable to rename file" => "Nuk është i mundur riemërtimi i skedarit",
 "Upload" => "Ngarko",
 "File handling" => "Trajtimi i skedarit",
 "Maximum upload size" => "Dimensioni maksimal i ngarkimit",
diff --git a/apps/files/l10n/sr.php b/apps/files/l10n/sr.php
index 3be6dde91a7ed6c1256187bbacca416aee34c1ee..68f2f5a93b67df5d097877c1924ce966d2417e94 100644
--- a/apps/files/l10n/sr.php
+++ b/apps/files/l10n/sr.php
@@ -12,6 +12,12 @@
 "Not enough storage available" => "Нема довољно простора",
 "Invalid directory." => "неисправна фасцикла.",
 "Files" => "Датотеке",
+"Unable to upload your file as it is a directory or has 0 bytes" => "Не могу да отпремим датотеку као фасциклу или она има 0 бајтова",
+"Not enough space available" => "Нема довољно простора",
+"Upload cancelled." => "Отпремање је прекинуто.",
+"File upload is in progress. Leaving the page now will cancel the upload." => "Отпремање датотеке је у току. Ако сада напустите страницу, прекинућете отпремање.",
+"URL cannot be empty." => "Адреса не може бити празна.",
+"Error" => "Грешка",
 "Share" => "Дели",
 "Delete permanently" => "Обриши за стално",
 "Delete" => "Обриши",
@@ -32,13 +38,7 @@
 "Your storage is full, files can not be updated or synced anymore!" => "Ваше складиште је пуно. Датотеке више не могу бити ажуриране ни синхронизоване.",
 "Your storage is almost full ({usedSpacePercent}%)" => "Ваше складиште је скоро па пуно ({usedSpacePercent}%)",
 "Your download is being prepared. This might take some time if the files are big." => "Припремам преузимање. Ово може да потраје ако су датотеке велике.",
-"Unable to upload your file as it is a directory or has 0 bytes" => "Не могу да отпремим датотеку као фасциклу или она има 0 бајтова",
-"Not enough space available" => "Нема довољно простора",
-"Upload cancelled." => "Отпремање је прекинуто.",
-"File upload is in progress. Leaving the page now will cancel the upload." => "Отпремање датотеке је у току. Ако сада напустите страницу, прекинућете отпремање.",
-"URL cannot be empty." => "Адреса не може бити празна.",
 "Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Неисправно име фасцикле. Фасцикла „Shared“ је резервисана за ownCloud.",
-"Error" => "Грешка",
 "Name" => "Име",
 "Size" => "Величина",
 "Modified" => "Измењено",
@@ -46,7 +46,6 @@
 "{count} folders" => "{count} фасцикле/и",
 "1 file" => "1 датотека",
 "{count} files" => "{count} датотеке/а",
-"Unable to rename file" => "Не могу да преименујем датотеку",
 "Upload" => "Отпреми",
 "File handling" => "Управљање датотекама",
 "Maximum upload size" => "Највећа величина датотеке",
diff --git a/apps/files/l10n/sv.php b/apps/files/l10n/sv.php
index f433176159245c08135fc6fe48dbc5379386bb2c..70f3121a20c78a94e20714d51ab34d16ed44a4ce 100644
--- a/apps/files/l10n/sv.php
+++ b/apps/files/l10n/sv.php
@@ -1,6 +1,8 @@
 <?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 set upload directory." => "Kan inte sätta mapp för uppladdning.",
+"Invalid Token" => "Ogiltig token",
 "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:",
@@ -12,6 +14,13 @@
 "Not enough storage available" => "Inte tillräckligt med lagringsutrymme tillgängligt",
 "Invalid directory." => "Felaktig mapp.",
 "Files" => "Filer",
+"Unable to upload your file as it is a directory or has 0 bytes" => "Kan inte ladda upp din fil eftersom det är en katalog eller har 0 bytes",
+"Not enough space available" => "Inte tillräckligt med utrymme tillgängligt",
+"Upload cancelled." => "Uppladdning avbruten.",
+"File upload is in progress. Leaving the page now will cancel the upload." => "Filuppladdning pågår. Lämnar du sidan så avbryts uppladdningen.",
+"URL cannot be empty." => "URL kan inte vara tom.",
+"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Ogiltigt mappnamn. Användning av 'Shared' är reserverad av ownCloud",
+"Error" => "Fel",
 "Share" => "Dela",
 "Delete permanently" => "Radera permanent",
 "Delete" => "Radera",
@@ -32,13 +41,7 @@
 "Your storage is full, files can not be updated or synced anymore!" => "Ditt lagringsutrymme är fullt, filer kan inte längre uppdateras eller synkroniseras!",
 "Your storage is almost full ({usedSpacePercent}%)" => "Ditt lagringsutrymme är nästan fullt ({usedSpacePercent}%)",
 "Your download is being prepared. This might take some time if the files are big." => "Din nedladdning förbereds. Det kan ta tid om det är stora filer.",
-"Unable to upload your file as it is a directory or has 0 bytes" => "Kan inte ladda upp din fil eftersom det är en katalog eller har 0 bytes",
-"Not enough space available" => "Inte tillräckligt med utrymme tillgängligt",
-"Upload cancelled." => "Uppladdning avbruten.",
-"File upload is in progress. Leaving the page now will cancel the upload." => "Filuppladdning pågår. Lämnar du sidan så avbryts uppladdningen.",
-"URL cannot be empty." => "URL kan inte vara tom.",
 "Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Ogiltigt mappnamn. Användande av 'Shared' är reserverat av ownCloud",
-"Error" => "Fel",
 "Name" => "Namn",
 "Size" => "Storlek",
 "Modified" => "Ändrad",
@@ -46,8 +49,7 @@
 "{count} folders" => "{count} mappar",
 "1 file" => "1 fil",
 "{count} files" => "{count} filer",
-"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Ogiltigt mappnamn. Användning av 'Shared' är reserverad av ownCloud",
-"Unable to rename file" => "Kan inte byta namn på filen",
+"%s could not be renamed" => "%s kunde inte namnändras",
 "Upload" => "Ladda upp",
 "File handling" => "Filhantering",
 "Maximum upload size" => "Maximal storlek att ladda upp",
@@ -71,5 +73,9 @@
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Filerna du försöker ladda upp överstiger den maximala storleken för filöverföringar på servern.",
 "Files are being scanned, please wait." => "Filer skannas, var god vänta",
 "Current scanning" => "Aktuell skanning",
+"directory" => "mapp",
+"directories" => "mappar",
+"file" => "fil",
+"files" => "filer",
 "Upgrading filesystem cache..." => "Uppgraderar filsystemets cache..."
 );
diff --git a/apps/files/l10n/ta_LK.php b/apps/files/l10n/ta_LK.php
index e5f7bbdf9bb667ebb623df18bc8901706cfaf59e..e03b88569b76d903b393a1ec1f3a7eae54c8ed4f 100644
--- a/apps/files/l10n/ta_LK.php
+++ b/apps/files/l10n/ta_LK.php
@@ -7,6 +7,11 @@
 "Missing a temporary folder" => "ஒரு தற்காலிகமான கோப்புறையை காணவில்லை",
 "Failed to write to disk" => "வட்டில் எழுத முடியவில்லை",
 "Files" => "கோப்புகள்",
+"Unable to upload your file as it is a directory or has 0 bytes" => "அடைவு அல்லது 0 bytes ஐ கொண்டுள்ளதால் உங்களுடைய கோப்பை பதிவேற்ற முடியவில்லை",
+"Upload cancelled." => "பதிவேற்றல் இரத்து செய்யப்பட்டுள்ளது",
+"File upload is in progress. Leaving the page now will cancel the upload." => "கோப்பு பதிவேற்றம் செயல்பாட்டில் உள்ளது. இந்தப் பக்கத்திலிருந்து வெறியேறுவதானது பதிவேற்றலை இரத்து செய்யும்.",
+"URL cannot be empty." => "URL  வெறுமையாக இருக்கமுடியாது.",
+"Error" => "வழு",
 "Share" => "பகிர்வு",
 "Delete" => "நீக்குக",
 "Rename" => "பெயர்மாற்றம்",
@@ -19,11 +24,6 @@
 "undo" => "முன் செயல் நீக்கம் ",
 "1 file uploading" => "1 கோப்பு பதிவேற்றப்படுகிறது",
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "செல்லுபடியற்ற பெயர்,'\\', '/', '<', '>', ':', '\"', '|', '?' மற்றும் '*' ஆகியன அனுமதிக்கப்படமாட்டாது.",
-"Unable to upload your file as it is a directory or has 0 bytes" => "அடைவு அல்லது 0 bytes ஐ கொண்டுள்ளதால் உங்களுடைய கோப்பை பதிவேற்ற முடியவில்லை",
-"Upload cancelled." => "பதிவேற்றல் இரத்து செய்யப்பட்டுள்ளது",
-"File upload is in progress. Leaving the page now will cancel the upload." => "கோப்பு பதிவேற்றம் செயல்பாட்டில் உள்ளது. இந்தப் பக்கத்திலிருந்து வெறியேறுவதானது பதிவேற்றலை இரத்து செய்யும்.",
-"URL cannot be empty." => "URL  வெறுமையாக இருக்கமுடியாது.",
-"Error" => "வழு",
 "Name" => "பெயர்",
 "Size" => "அளவு",
 "Modified" => "மாற்றப்பட்டது",
diff --git a/apps/files/l10n/te.php b/apps/files/l10n/te.php
index b280200d30a37f9eb1fb3b3f37689962dc46880e..710034de12e114d5e1cb0a802d2fcb2097239f57 100644
--- a/apps/files/l10n/te.php
+++ b/apps/files/l10n/te.php
@@ -1,9 +1,10 @@
 <?php $TRANSLATIONS = array(
+"Error" => "పొరపాటు",
 "Delete permanently" => "శాశ్వతంగా తొలగించు",
 "Delete" => "తొలగించు",
 "cancel" => "రద్దుచేయి",
-"Error" => "పొరపాటు",
 "Name" => "పేరు",
 "Size" => "పరిమాణం",
-"Save" => "భద్రపరచు"
+"Save" => "భద్రపరచు",
+"Folder" => "సంచయం"
 );
diff --git a/apps/files/l10n/th_TH.php b/apps/files/l10n/th_TH.php
index 06d26edfec8ea21f483427c4de13b8a062fe38da..5b2eab6b3a1256cab59425a1bfcf3ead2bd0819f 100644
--- a/apps/files/l10n/th_TH.php
+++ b/apps/files/l10n/th_TH.php
@@ -12,6 +12,12 @@
 "Not enough storage available" => "เหลือพื้นที่ไม่เพียงสำหรับใช้งาน",
 "Invalid directory." => "ไดเร็กทอรี่ไม่ถูกต้อง",
 "Files" => "ไฟล์",
+"Unable to upload your file as it is a directory or has 0 bytes" => "ไม่สามารถอัพโหลดไฟล์ของคุณได้ เนื่องจากไฟล์ดังกล่าวเป็นไดเร็กทอรี่ หรือ มีขนาดไฟล์ 0 ไบต์",
+"Not enough space available" => "มีพื้นที่เหลือไม่เพียงพอ",
+"Upload cancelled." => "การอัพโหลดถูกยกเลิก",
+"File upload is in progress. Leaving the page now will cancel the upload." => "การอัพโหลดไฟล์กำลังอยู่ในระหว่างดำเนินการ การออกจากหน้าเว็บนี้จะทำให้การอัพโหลดถูกยกเลิก",
+"URL cannot be empty." => "URL ไม่สามารถเว้นว่างได้",
+"Error" => "ข้อผิดพลาด",
 "Share" => "แชร์",
 "Delete" => "ลบ",
 "Rename" => "เปลี่ยนชื่อ",
@@ -31,13 +37,7 @@
 "Your storage is full, files can not be updated or synced anymore!" => "พื้นที่จัดเก็บข้อมูลของคุณเต็มแล้ว ไม่สามารถอัพเดทหรือผสานไฟล์ต่างๆได้อีกต่อไป",
 "Your storage is almost full ({usedSpacePercent}%)" => "พื้นที่จัดเก็บข้อมูลของคุณใกล้เต็มแล้ว ({usedSpacePercent}%)",
 "Your download is being prepared. This might take some time if the files are big." => "กำลังเตรียมดาวน์โหลดข้อมูล หากไฟล์มีขนาดใหญ่ อาจใช้เวลาสักครู่",
-"Unable to upload your file as it is a directory or has 0 bytes" => "ไม่สามารถอัพโหลดไฟล์ของคุณได้ เนื่องจากไฟล์ดังกล่าวเป็นไดเร็กทอรี่ หรือ มีขนาดไฟล์ 0 ไบต์",
-"Not enough space available" => "มีพื้นที่เหลือไม่เพียงพอ",
-"Upload cancelled." => "การอัพโหลดถูกยกเลิก",
-"File upload is in progress. Leaving the page now will cancel the upload." => "การอัพโหลดไฟล์กำลังอยู่ในระหว่างดำเนินการ การออกจากหน้าเว็บนี้จะทำให้การอัพโหลดถูกยกเลิก",
-"URL cannot be empty." => "URL ไม่สามารถเว้นว่างได้",
 "Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "ชื่อโฟลเดอร์ไม่ถูกต้อง การใช้งาน 'แชร์' สงวนไว้สำหรับ Owncloud เท่านั้น",
-"Error" => "ข้อผิดพลาด",
 "Name" => "ชื่อ",
 "Size" => "ขนาด",
 "Modified" => "แก้ไขแล้ว",
@@ -45,7 +45,6 @@
 "{count} folders" => "{count} โฟลเดอร์",
 "1 file" => "1 ไฟล์",
 "{count} files" => "{count} ไฟล์",
-"Unable to rename file" => "ไม่สามารถเปลี่ยนชื่อไฟล์ได้",
 "Upload" => "อัพโหลด",
 "File handling" => "การจัดกาไฟล์",
 "Maximum upload size" => "ขนาดไฟล์สูงสุดที่อัพโหลดได้",
@@ -67,5 +66,7 @@
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "ไฟล์ที่คุณพยายามที่จะอัพโหลดมีขนาดเกินกว่าขนาดสูงสุดที่กำหนดไว้ให้อัพโหลดได้สำหรับเซิร์ฟเวอร์นี้",
 "Files are being scanned, please wait." => "ไฟล์กำลังอยู่ระหว่างการสแกน, กรุณารอสักครู่.",
 "Current scanning" => "ไฟล์ที่กำลังสแกนอยู่ขณะนี้",
+"file" => "ไฟล์",
+"files" => "ไฟล์",
 "Upgrading filesystem cache..." => "กำลังอัพเกรดหน่วยความจำแคชของระบบไฟล์..."
 );
diff --git a/apps/files/l10n/tr.php b/apps/files/l10n/tr.php
index 6a096d270391fb5947399848f0d6b8c5b81a33e8..0b2dbb12dd9fc496b422dde6515f50dd7f08b9a7 100644
--- a/apps/files/l10n/tr.php
+++ b/apps/files/l10n/tr.php
@@ -12,6 +12,13 @@
 "Not enough storage available" => "Yeterli disk alanı yok",
 "Invalid directory." => "Geçersiz dizin.",
 "Files" => "Dosyalar",
+"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",
+"Not enough space available" => "Yeterli disk alanı yok",
+"Upload cancelled." => "Yükleme iptal edildi.",
+"File upload is in progress. Leaving the page now will cancel the upload." => "Dosya yükleme işlemi sürüyor. Şimdi sayfadan ayrılırsanız işleminiz iptal olur.",
+"URL cannot be empty." => "URL boÅŸ olamaz.",
+"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Geçersiz dizin adı. 'Shared' dizin ismi kullanımı ownCloud tarafından rezerve edilmiştir.",
+"Error" => "Hata",
 "Share" => "PaylaÅŸ",
 "Delete permanently" => "Kalıcı olarak sil",
 "Delete" => "Sil",
@@ -32,13 +39,7 @@
 "Your storage is full, files can not be updated or synced anymore!" => "Depolama alanınız dolu, artık dosyalar güncellenmeyecek yada senkronizasyon edilmeyecek.",
 "Your storage is almost full ({usedSpacePercent}%)" => "Depolama alanınız neredeyse dolu ({usedSpacePercent}%)",
 "Your download is being prepared. This might take some time if the files are big." => "İndirmeniz hazırlanıyor. Dosya büyük ise biraz zaman alabilir.",
-"Unable to upload your file as it is a directory or has 0 bytes" => "Dosyanızın boyutu 0 byte olduğundan veya bir dizin olduğundan yüklenemedi",
-"Not enough space available" => "Yeterli disk alanı yok",
-"Upload cancelled." => "Yükleme iptal edildi.",
-"File upload is in progress. Leaving the page now will cancel the upload." => "Dosya yükleme işlemi sürüyor. Şimdi sayfadan ayrılırsanız işleminiz iptal olur.",
-"URL cannot be empty." => "URL boÅŸ olamaz.",
 "Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Geçersiz dizin adı. Shared isminin kullanımı Owncloud tarafından rezerver edilmiştir.",
-"Error" => "Hata",
 "Name" => "Ä°sim",
 "Size" => "Boyut",
 "Modified" => "DeÄŸiÅŸtirilme",
@@ -46,8 +47,6 @@
 "{count} folders" => "{count} dizin",
 "1 file" => "1 dosya",
 "{count} files" => "{count} dosya",
-"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Geçersiz dizin adı. 'Shared' dizin ismi kullanımı ownCloud tarafından rezerve edilmiştir.",
-"Unable to rename file" => "Dosya adı değiştirilemedi",
 "Upload" => "Yükle",
 "File handling" => "Dosya taşıma",
 "Maximum upload size" => "Maksimum yükleme boyutu",
@@ -71,5 +70,7 @@
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Yüklemeye çalıştığınız dosyalar bu sunucudaki maksimum yükleme boyutunu aşıyor.",
 "Files are being scanned, please wait." => "Dosyalar taranıyor, lütfen bekleyin.",
 "Current scanning" => "Güncel tarama",
+"file" => "dosya",
+"files" => "dosyalar",
 "Upgrading filesystem cache..." => "Sistem dosyası önbelleği güncelleniyor"
 );
diff --git a/apps/files/l10n/ug.php b/apps/files/l10n/ug.php
index fb8f187adef2623055b1ffaa168aac115cb419eb..c11ffe7b9bf850471ac1c847ff52f3fbab319d53 100644
--- a/apps/files/l10n/ug.php
+++ b/apps/files/l10n/ug.php
@@ -6,6 +6,10 @@
 "Failed to write to disk" => "دىسكىغا يازالمىدى",
 "Not enough storage available" => "يېتەرلىك ساقلاش بوشلۇقى يوق",
 "Files" => "ھۆججەتلەر",
+"Not enough space available" => "يېتەرلىك بوشلۇق يوق",
+"Upload cancelled." => "يۈكلەشتىن ۋاز كەچتى.",
+"File upload is in progress. Leaving the page now will cancel the upload." => "ھۆججەت يۈكلەش مەشغۇلاتى ئېلىپ بېرىلىۋاتىدۇ. Leaving the page now will cancel the upload.",
+"Error" => "خاتالىق",
 "Share" => "ھەمبەھىر",
 "Delete permanently" => "مەڭگۈلۈك ئۆچۈر",
 "Delete" => "ئۆچۈر",
@@ -18,17 +22,12 @@
 "undo" => "يېنىۋال",
 "1 file uploading" => "1 ھۆججەت يۈكلىنىۋاتىدۇ",
 "files uploading" => "ھۆججەت يۈكلىنىۋاتىدۇ",
-"Not enough space available" => "يېتەرلىك بوشلۇق يوق",
-"Upload cancelled." => "يۈكلەشتىن ۋاز كەچتى.",
-"File upload is in progress. Leaving the page now will cancel the upload." => "ھۆججەت يۈكلەش مەشغۇلاتى ئېلىپ بېرىلىۋاتىدۇ. Leaving the page now will cancel the upload.",
-"Error" => "خاتالىق",
 "Name" => "ئاتى",
 "Size" => "چوڭلۇقى",
 "Modified" => "ئۆزگەرتكەن",
 "1 folder" => "1 قىسقۇچ",
 "1 file" => "1 ھۆججەت",
 "{count} files" => "{count} ھۆججەت",
-"Unable to rename file" => "ھۆججەت ئاتىنى ئۆزگەرتكىلى بولمايدۇ",
 "Upload" => "يۈكلە",
 "Save" => "ساقلا",
 "New" => "يېڭى",
diff --git a/apps/files/l10n/uk.php b/apps/files/l10n/uk.php
index 324b28936e75c5f3e2f8d9ddc29d5c8a0f18ee27..261853ef202a15c702f0dfbfb1ea9e6a85d642bd 100644
--- a/apps/files/l10n/uk.php
+++ b/apps/files/l10n/uk.php
@@ -12,6 +12,12 @@
 "Not enough storage available" => "Місця більше немає",
 "Invalid directory." => "Невірний каталог.",
 "Files" => "Файли",
+"Unable to upload your file as it is a directory or has 0 bytes" => "Неможливо завантажити ваш файл тому, що він тека або файл розміром 0 байт",
+"Not enough space available" => "Місця більше немає",
+"Upload cancelled." => "Завантаження перервано.",
+"File upload is in progress. Leaving the page now will cancel the upload." => "Виконується завантаження файлу. Закриття цієї сторінки приведе до відміни завантаження.",
+"URL cannot be empty." => "URL не може бути пустим.",
+"Error" => "Помилка",
 "Share" => "Поділитися",
 "Delete permanently" => "Видалити назавжди",
 "Delete" => "Видалити",
@@ -32,13 +38,7 @@
 "Your storage is full, files can not be updated or synced anymore!" => "Ваше сховище переповнене, файли більше не можуть бути оновлені або синхронізовані !",
 "Your storage is almost full ({usedSpacePercent}%)" => "Ваше сховище майже повне ({usedSpacePercent}%)",
 "Your download is being prepared. This might take some time if the files are big." => "Ваше завантаження готується. Це може зайняти деякий час, якщо файли завеликі.",
-"Unable to upload your file as it is a directory or has 0 bytes" => "Неможливо завантажити ваш файл тому, що він тека або файл розміром 0 байт",
-"Not enough space available" => "Місця більше немає",
-"Upload cancelled." => "Завантаження перервано.",
-"File upload is in progress. Leaving the page now will cancel the upload." => "Виконується завантаження файлу. Закриття цієї сторінки приведе до відміни завантаження.",
-"URL cannot be empty." => "URL не може бути пустим.",
 "Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Невірне ім'я теки. Використання \"Shared\" зарезервовано Owncloud",
-"Error" => "Помилка",
 "Name" => "Ім'я",
 "Size" => "Розмір",
 "Modified" => "Змінено",
@@ -46,7 +46,6 @@
 "{count} folders" => "{count} папок",
 "1 file" => "1 файл",
 "{count} files" => "{count} файлів",
-"Unable to rename file" => "Не вдалося перейменувати файл",
 "Upload" => "Вивантажити",
 "File handling" => "Робота з файлами",
 "Maximum upload size" => "Максимальний розмір відвантажень",
@@ -70,5 +69,7 @@
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Файли,що ви намагаєтесь відвантажити перевищують максимальний дозволений розмір файлів на цьому сервері.",
 "Files are being scanned, please wait." => "Файли скануються, зачекайте, будь-ласка.",
 "Current scanning" => "Поточне сканування",
+"file" => "файл",
+"files" => "файли",
 "Upgrading filesystem cache..." => "Оновлення кеша файлової системи..."
 );
diff --git a/apps/files/l10n/vi.php b/apps/files/l10n/vi.php
index c8aa11295c89a53b250178fec387a46db8af0b38..e3c9fd5488a4c84664ab87bfc7837b5c9c0cf831 100644
--- a/apps/files/l10n/vi.php
+++ b/apps/files/l10n/vi.php
@@ -12,6 +12,12 @@
 "Not enough storage available" => "Không đủ không gian lưu trữ",
 "Invalid directory." => "Thư mục không hợp lệ",
 "Files" => "Tập tin",
+"Unable to upload your file as it is a directory or has 0 bytes" => "Không thể tải lên tập tin của bạn ,nó như là một thư mục hoặc có 0 byte",
+"Not enough space available" => "Không đủ chỗ trống cần thiết",
+"Upload cancelled." => "Hủy tải lên",
+"File upload is in progress. Leaving the page now will cancel the upload." => "Tập tin tải lên đang được xử lý. Nếu bạn rời khỏi trang bây giờ sẽ hủy quá trình này.",
+"URL cannot be empty." => "URL không được để trống.",
+"Error" => "Lá»—i",
 "Share" => "Chia sẻ",
 "Delete permanently" => "Xóa vĩnh vễn",
 "Delete" => "Xóa",
@@ -32,13 +38,7 @@
 "Your storage is full, files can not be updated or synced anymore!" => "Your storage is full, files can not be updated or synced anymore!",
 "Your storage is almost full ({usedSpacePercent}%)" => "Your storage is almost full ({usedSpacePercent}%)",
 "Your download is being prepared. This might take some time if the files are big." => "Your download is being prepared. This might take some time if the files are big.",
-"Unable to upload your file as it is a directory or has 0 bytes" => "Không thể tải lên tập tin của bạn ,nó như là một thư mục hoặc có 0 byte",
-"Not enough space available" => "Không đủ chỗ trống cần thiết",
-"Upload cancelled." => "Hủy tải lên",
-"File upload is in progress. Leaving the page now will cancel the upload." => "Tập tin tải lên đang được xử lý. Nếu bạn rời khỏi trang bây giờ sẽ hủy quá trình này.",
-"URL cannot be empty." => "URL không được để trống.",
 "Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Invalid folder name. Usage of 'Shared' is reserved by Owncloud",
-"Error" => "Lá»—i",
 "Name" => "Tên",
 "Size" => "Kích cỡ",
 "Modified" => "Thay đổi",
@@ -46,7 +46,6 @@
 "{count} folders" => "{count} thư mục",
 "1 file" => "1 tập tin",
 "{count} files" => "{count} tập tin",
-"Unable to rename file" => "Không thể đổi tên file",
 "Upload" => "Tải lên",
 "File handling" => "Xử lý tập tin",
 "Maximum upload size" => "Kích thước tối đa ",
@@ -70,5 +69,7 @@
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Các tập tin bạn đang tải lên vượt quá kích thước tối đa cho phép trên máy chủ .",
 "Files are being scanned, please wait." => "Tập tin đang được quét ,vui lòng chờ.",
 "Current scanning" => "Hiện tại đang quét",
+"file" => "file",
+"files" => "files",
 "Upgrading filesystem cache..." => "Đang nâng cấp bộ nhớ đệm cho tập tin hệ thống..."
 );
diff --git a/apps/files/l10n/zh_CN.GB2312.php b/apps/files/l10n/zh_CN.GB2312.php
index 0d87975918e4a0705a5871c94b61a79f3dec4246..4108516cda1ce5003f34e154dbc5f54e5de0a770 100644
--- a/apps/files/l10n/zh_CN.GB2312.php
+++ b/apps/files/l10n/zh_CN.GB2312.php
@@ -7,6 +7,11 @@
 "Missing a temporary folder" => "缺失临时文件夹",
 "Failed to write to disk" => "写磁盘失败",
 "Files" => "文件",
+"Unable to upload your file as it is a directory or has 0 bytes" => "不能上传您的文件，由于它是文件夹或者为空文件",
+"Upload cancelled." => "上传取消了",
+"File upload is in progress. Leaving the page now will cancel the upload." => "文件正在上传。关闭页面会取消上传。",
+"URL cannot be empty." => "网址不能为空。",
+"Error" => "出错",
 "Share" => "分享",
 "Delete" => "删除",
 "Rename" => "重命名",
@@ -19,11 +24,6 @@
 "undo" => "撤销",
 "1 file uploading" => "1 个文件正在上传",
 "files uploading" => "个文件正在上传",
-"Unable to upload your file as it is a directory or has 0 bytes" => "不能上传您的文件，由于它是文件夹或者为空文件",
-"Upload cancelled." => "上传取消了",
-"File upload is in progress. Leaving the page now will cancel the upload." => "文件正在上传。关闭页面会取消上传。",
-"URL cannot be empty." => "网址不能为空。",
-"Error" => "出错",
 "Name" => "名称",
 "Size" => "大小",
 "Modified" => "修改日期",
@@ -51,5 +51,7 @@
 "Upload too large" => "上传过大",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "你正在试图上传的文件超过了此服务器支持的最大的文件大小.",
 "Files are being scanned, please wait." => "正在扫描文件,请稍候.",
-"Current scanning" => "正在扫描"
+"Current scanning" => "正在扫描",
+"file" => "文件",
+"files" => "文件"
 );
diff --git a/apps/files/l10n/zh_CN.php b/apps/files/l10n/zh_CN.php
index c883670e8485f22440438ae3580e36512d4b231c..68680676a1953356a6017f6921e1d9ad3b2cd54e 100644
--- a/apps/files/l10n/zh_CN.php
+++ b/apps/files/l10n/zh_CN.php
@@ -1,6 +1,8 @@
 <?php $TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "无法移动 %s - 同名文件已存在",
 "Could not move %s" => "无法移动 %s",
+"Unable to set upload directory." => "无法设置上传文件夹。",
+"Invalid Token" => "无效密匙",
 "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所规定的值",
@@ -12,6 +14,13 @@
 "Not enough storage available" => "没有足够的存储空间",
 "Invalid directory." => "无效文件夹。",
 "Files" => "文件",
+"Unable to upload your file as it is a directory or has 0 bytes" => "无法上传您的文件，文件夹或者空文件",
+"Not enough space available" => "没有足够可用空间",
+"Upload cancelled." => "上传已取消",
+"File upload is in progress. Leaving the page now will cancel the upload." => "文件正在上传中。现在离开此页会导致上传动作被取消。",
+"URL cannot be empty." => "URL不能为空",
+"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "无效的文件夹名。”Shared“ 是 Owncloud 预留的文件夹",
+"Error" => "错误",
 "Share" => "分享",
 "Delete permanently" => "永久删除",
 "Delete" => "删除",
@@ -32,13 +41,7 @@
 "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" => "无法上传您的文件，文件夹或者空文件",
-"Not enough space available" => "没有足够可用空间",
-"Upload cancelled." => "上传已取消",
-"File upload is in progress. Leaving the page now will cancel the upload." => "文件正在上传中。现在离开此页会导致上传动作被取消。",
-"URL cannot be empty." => "URL不能为空",
 "Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "无效文件夹名。'共享' 是 Owncloud 预留的文件夹名。",
-"Error" => "错误",
 "Name" => "名称",
 "Size" => "大小",
 "Modified" => "修改日期",
@@ -46,8 +49,7 @@
 "{count} folders" => "{count} 个文件夹",
 "1 file" => "1 个文件",
 "{count} files" => "{count} 个文件",
-"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "无效的文件夹名。”Shared“ 是 Owncloud 预留的文件夹",
-"Unable to rename file" => "无法重命名文件",
+"%s could not be renamed" => "%s 不能被重命名",
 "Upload" => "上传",
 "File handling" => "文件处理",
 "Maximum upload size" => "最大上传大小",
@@ -61,7 +63,7 @@
 "Text file" => "文本文件",
 "Folder" => "文件夹",
 "From link" => "来自链接",
-"Deleted files" => "删除文件",
+"Deleted files" => "已删除文件",
 "Cancel upload" => "取消上传",
 "You don’t have write permissions here." => "您没有写权限",
 "Nothing in here. Upload something!" => "这里还什么都没有。上传些东西吧！",
@@ -71,5 +73,7 @@
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "您正尝试上传的文件超过了此服务器可以上传的最大容量限制",
 "Files are being scanned, please wait." => "文件正在被扫描，请稍候。",
 "Current scanning" => "当前扫描",
+"file" => "文件",
+"files" => "文件",
 "Upgrading filesystem cache..." => "正在更新文件系统缓存..."
 );
diff --git a/apps/files/l10n/zh_HK.php b/apps/files/l10n/zh_HK.php
index caafc74b859dadf611c3e2f7781d9eefa424742b..4402812f2b69ad10b71f4243c17620ea729ef7fd 100644
--- a/apps/files/l10n/zh_HK.php
+++ b/apps/files/l10n/zh_HK.php
@@ -1,8 +1,8 @@
 <?php $TRANSLATIONS = array(
 "Files" => "文件",
+"Error" => "錯誤",
 "Share" => "分享",
 "Delete" => "刪除",
-"Error" => "錯誤",
 "Name" => "名稱",
 "{count} folders" => "{}文件夾",
 "Upload" => "上傳",
diff --git a/apps/files/l10n/zh_TW.php b/apps/files/l10n/zh_TW.php
index 0bd207888dc9420479098f7e982e407ef7c96543..59a332f628fa11a60731a1d3b85b039ee45f5f2e 100644
--- a/apps/files/l10n/zh_TW.php
+++ b/apps/files/l10n/zh_TW.php
@@ -12,6 +12,13 @@
 "Not enough storage available" => "儲存空間不足",
 "Invalid directory." => "無效的資料夾。",
 "Files" => "檔案",
+"Unable to upload your file as it is a directory or has 0 bytes" => "無法上傳您的檔案因為它可能是一個目錄或檔案大小為0",
+"Not enough space available" => "沒有足夠的可用空間",
+"Upload cancelled." => "上傳已取消",
+"File upload is in progress. Leaving the page now will cancel the upload." => "檔案上傳中。離開此頁面將會取消上傳。",
+"URL cannot be empty." => "URL 不能為空白。",
+"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "無效的資料夾名稱，'Shared' 的使用被 ownCloud 保留",
+"Error" => "錯誤",
 "Share" => "分享",
 "Delete permanently" => "永久刪除",
 "Delete" => "刪除",
@@ -32,13 +39,7 @@
 "Your storage is full, files can not be updated or synced anymore!" => "您的儲存空間已滿，沒有辦法再更新或是同步檔案！",
 "Your storage is almost full ({usedSpacePercent}%)" => "您的儲存空間快要滿了 ({usedSpacePercent}%)",
 "Your download is being prepared. This might take some time if the files are big." => "正在準備您的下載，若您的檔案較大，將會需要更多時間。",
-"Unable to upload your file as it is a directory or has 0 bytes" => "無法上傳您的檔案因為它可能是一個目錄或檔案大小為0",
-"Not enough space available" => "沒有足夠的可用空間",
-"Upload cancelled." => "上傳已取消",
-"File upload is in progress. Leaving the page now will cancel the upload." => "檔案上傳中。離開此頁面將會取消上傳。",
-"URL cannot be empty." => "URL 不能為空白。",
 "Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "無效的資料夾名稱，'Shared' 的使用被 ownCloud 保留",
-"Error" => "錯誤",
 "Name" => "名稱",
 "Size" => "大小",
 "Modified" => "修改",
@@ -46,8 +47,6 @@
 "{count} folders" => "{count} 個資料夾",
 "1 file" => "1 個檔案",
 "{count} files" => "{count} 個檔案",
-"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "無效的資料夾名稱，'Shared' 的使用被 ownCloud 保留",
-"Unable to rename file" => "無法重新命名檔案",
 "Upload" => "上傳",
 "File handling" => "檔案處理",
 "Maximum upload size" => "最大上傳檔案大小",
diff --git a/apps/files/lib/app.php b/apps/files/lib/app.php
index c2a4b9c2675dcc3bfe2f510916b7abb322ad5b72..f7052ef80b0eadccb22c20c5b4c6a1d971cd6ba1 100644
--- a/apps/files/lib/app.php
+++ b/apps/files/lib/app.php
@@ -70,7 +70,7 @@ class App {
 		} else {
 			// rename failed
 			$result['data'] = array(
-				'message'	=> $this->l10n->t('Unable to rename file')
+				'message'	=> $this->l10n->t('%s could not be renamed', array($oldname))
 			);
 		}
 		return $result;
diff --git a/apps/files/templates/index.php b/apps/files/templates/index.php
index 89e270fd14625dd5f9470d49a90ac2d80048d7ab..c6a4ad58e43f00901dd07f619f8ecda3264134f9 100644
--- a/apps/files/templates/index.php
+++ b/apps/files/templates/index.php
@@ -50,7 +50,7 @@
 			</div>
 		</div>
 		<div id="file_action_panel"></div>
-	<?php else:?>
+	<?php elseif( !$_['isPublic'] ):?>
 		<div class="actions"><input type="button" disabled value="<?php p($l->t('You don’t have write permissions here.'))?>"></div>
 		<input type="hidden" name="dir" value="<?php p($_['dir']) ?>" id="dir">
 	<?php endif;?>
diff --git a/apps/files/templates/part.breadcrumb.php b/apps/files/templates/part.breadcrumb.php
index 9886b42e42463f5b34057ebb9677831bbdcceb50..9db27eb9b2935a8282b87efbb75a4f7c6f25cc90 100644
--- a/apps/files/templates/part.breadcrumb.php
+++ b/apps/files/templates/part.breadcrumb.php
@@ -7,8 +7,7 @@
 <?php endif;?>
 <?php for($i=0; $i<count($_["breadcrumb"]); $i++):
 	$crumb = $_["breadcrumb"][$i];
-	$dir = str_replace('+', '%20', urlencode($crumb["dir"]));
-	$dir = str_replace('%2F', '/', $dir); ?>
+	$dir = \OCP\Util::encodePath($crumb["dir"]); ?>
 	<div class="crumb <?php if($i == count($_["breadcrumb"])-1) p('last');?> svg"
 		 data-dir='<?php p($dir);?>'>
 	<a href="<?php p($_['baseURL'].$dir); ?>"><?php p($crumb["name"]); ?></a>
diff --git a/apps/files/templates/part.list.php b/apps/files/templates/part.list.php
index 6dabd7d697095678bf481c6e870d80a5e52ffa2e..38d1314392b5ecab84a26bb1ee77675f874cb798 100644
--- a/apps/files/templates/part.list.php
+++ b/apps/files/templates/part.list.php
@@ -1,7 +1,15 @@
 <input type="hidden" id="disableSharing" data-status="<?php p($_['disableSharing']); ?>">
-
+<?php $totalfiles = 0;
+$totaldirs = 0;
+$totalsize = 0; ?>
 <?php foreach($_['files'] as $file):
 	$relativePath = substr($file['path'], 6);
+	$totalsize += $file['size'];
+	if ($file['type'] === 'dir') {
+		$totaldirs++;
+	} else {
+		$totalfiles++;
+	}
 	$simple_file_size = OCP\simple_file_size($file['size']);
 	// the bigger the file, the darker the shade of grey; megabytes*2
 	$simple_size_color = intval(160-$file['size']/(1024*1024)*2);
@@ -10,10 +18,8 @@
 	// the older the file, the brighter the shade of grey; days*14
 	$relative_date_color = round((time()-$file['mtime'])/60/60/24*14);
 	if($relative_date_color>160) $relative_date_color = 160;
-	$name = rawurlencode($file['name']);
-	$name = str_replace('%2F', '/', $name);
-	$directory = rawurlencode($file['directory']);
-	$directory = str_replace('%2F', '/', $directory); ?>
+	$name = \OCP\Util::encodePath($file['name']);
+	$directory = \OCP\Util::encodePath($file['directory']); ?>
 	<tr data-id="<?php p($file['fileid']); ?>"
 		data-file="<?php p($name);?>"
 		data-type="<?php ($file['type'] == 'dir')?p('dir'):p('file')?>"
@@ -61,4 +67,33 @@
 			</span>
 		</td>
 	</tr>
-<?php endforeach;
+<?php endforeach; ?>
+	<?php if ($totaldirs !== 0 || $totalfiles !== 0): ?>
+	<tr class="summary">
+		<td><span class="info">
+			<?php if ($totaldirs !== 0) {
+				p($totaldirs.' ');
+				if ($totaldirs === 1) {
+					p($l->t('directory'));
+				} else {
+					p($l->t('directories'));
+				}
+			}
+			if ($totaldirs !== 0 && $totalfiles !== 0) {
+				p(' & ');
+			}
+			if ($totalfiles !== 0) {
+				p($totalfiles.' ');
+				if ($totalfiles === 1) {
+					p($l->t('file'));
+				} else {
+					p($l->t('files'));
+				}
+			} ?>
+		</span></td>
+		<td class="filesize">
+		<?php print_unescaped(OCP\simple_file_size($totalsize)); ?>
+		</td>
+		<td></td>
+	</tr>
+	<?php endif;
diff --git a/apps/files/tests/ajax_rename.php b/apps/files/tests/ajax_rename.php
index 23e5761ddda44869855bc22a7f13b59caa29ab95..2b90a11743d164053d17770a463fddde561a2f88 100644
--- a/apps/files/tests/ajax_rename.php
+++ b/apps/files/tests/ajax_rename.php
@@ -50,7 +50,7 @@ class Test_OC_Files_App_Rename extends \PHPUnit_Framework_TestCase {
 		$result = $this->files->rename($dir, $oldname, $newname);
 		$expected = array(
 			'success'	=> false,
-			'data'		=> array('message' => 'Unable to rename file')
+			'data'		=> array('message' => '%s could not be renamed')
 		);
 
 		$this->assertEquals($expected, $result);
diff --git a/apps/files/triggerupdate.php b/apps/files/triggerupdate.php
new file mode 100644
index 0000000000000000000000000000000000000000..0e29edbba35ef32f821d9782ba5ebe95e4e21cbd
--- /dev/null
+++ b/apps/files/triggerupdate.php
@@ -0,0 +1,22 @@
+<?php
+
+require_once __DIR__ . '/../../lib/base.php';
+
+if (OC::$CLI) {
+	if (count($argv) === 2) {
+		$file = $argv[1];
+		list(, $user) = explode('/', $file);
+		OC_Util::setupFS($user);
+		$view = new \OC\Files\View('');
+		/**
+		 * @var \OC\Files\Storage\Storage $storage
+		 */
+		list($storage, $internalPath) = $view->resolvePath($file);
+		$watcher = $storage->getWatcher($internalPath);
+		$watcher->checkUpdate($internalPath);
+	} else {
+		echo "Usage: php triggerupdate.php /path/to/file\n";
+	}
+} else {
+	echo "This script can be run from the command line only\n";
+}
diff --git a/apps/files_encryption/appinfo/app.php b/apps/files_encryption/appinfo/app.php
index 419bef1edef09183b09e92a68cbc366bbfcfd8df..90a9984e27f17ea1b1922b09279ac8c2124ea41c 100644
--- a/apps/files_encryption/appinfo/app.php
+++ b/apps/files_encryption/appinfo/app.php
@@ -22,6 +22,9 @@ if (!OC_Config::getValue('maintenance', false)) {
 	// Filesystem related hooks
 	OCA\Encryption\Helper::registerFilesystemHooks();
 
+	// App manager related hooks
+	OCA\Encryption\Helper::registerAppHooks();
+
 	stream_wrapper_register('crypt', 'OCA\Encryption\Stream');
 
 	// check if we are logged in
@@ -33,13 +36,17 @@ if (!OC_Config::getValue('maintenance', false)) {
 		}
 
 		$view = new OC_FilesystemView('/');
-		$session = new \OCA\Encryption\Session($view);
+
+		$sessionReady = OCA\Encryption\Helper::checkRequirements();
+		if($sessionReady) {
+			$session = new \OCA\Encryption\Session($view);
+		}
 
 		$user = \OCP\USER::getUser();
 		// check if user has a private key
-		if (
-			!$view->file_exists('/' . $user . '/files_encryption/' . $user . '.private.key')
-			&& OCA\Encryption\Crypt::mode() === 'server'
+		if ($sessionReady === false
+			|| (!$view->file_exists('/' . $user . '/files_encryption/' . $user . '.private.key')
+				&& OCA\Encryption\Crypt::mode() === 'server')
 		) {
 
 			// Force the user to log-in again if the encryption key isn't unlocked
diff --git a/apps/files_encryption/appinfo/info.xml b/apps/files_encryption/appinfo/info.xml
index ea8f6cf6f310373685427f40ed18481c49c9d3c8..1e97b1b2217fd8042a5d93b5e8c2345d1bb957d6 100644
--- a/apps/files_encryption/appinfo/info.xml
+++ b/apps/files_encryption/appinfo/info.xml
@@ -2,7 +2,7 @@
 <info>
 	<id>files_encryption</id>
 	<name>Encryption</name>
-	<description>WARNING: This is a preview release of the new ownCloud 5 encryption system. Testing and feedback is very welcome but don't use this in production yet. Encryption is not yet compatible with LDAP.</description>
+	<description>WARNING: This is a preview release of the new ownCloud 5 encryption system. Testing and feedback is very welcome but don't use this in production yet. After the app was enabled you need to re-login to initialize your encryption keys</description>
 	<licence>AGPL</licence>
 	<author>Sam Tuke, Bjoern Schiessle, Florin Peter</author>
 	<require>4</require>
diff --git a/apps/files_encryption/files/error.php b/apps/files_encryption/files/error.php
index 63c74e4e797de99a5569b735b27ec3becec65f98..f93c67d920a427f486b4e6adc452ee1547454428 100644
--- a/apps/files_encryption/files/error.php
+++ b/apps/files_encryption/files/error.php
@@ -4,7 +4,7 @@ if (!isset($_)) { //also provide standalone error page
 
 	$l = OC_L10N::get('files_encryption');
 
-	$errorMsg = $l->t('Your private key is not valid! Maybe your password was changed from outside. You can update your private key password in your personal settings to regain access to your files');
+	$errorMsg = $l->t('Your private key is not valid! Likely your password was changed outside the ownCloud system (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files.');
 
 	if(isset($_GET['p']) && $_GET['p'] === '1') {
 		header('HTTP/1.0 404 ' . $errorMsg);
@@ -21,4 +21,3 @@ if (!isset($_)) { //also provide standalone error page
 
 	exit;
 }
-?>
diff --git a/apps/files_encryption/hooks/hooks.php b/apps/files_encryption/hooks/hooks.php
index 7698b95cfd36b9c897722df0d37c6fb7d1b544b4..b2a17f6bca5e344646a76a8e42354d765f439ed4 100644
--- a/apps/files_encryption/hooks/hooks.php
+++ b/apps/files_encryption/hooks/hooks.php
@@ -38,11 +38,15 @@ class Hooks {
 	 * @note This method should never be called for users using client side encryption
 	 */
 	public static function login($params) {
-
-		// Manually initialise Filesystem{} singleton with correct 
-		// fake root path, in order to avoid fatal webdav errors
-		// NOTE: disabled because this give errors on webdav!
-		//\OC\Files\Filesystem::init( $params['uid'], '/' . 'files' . '/' );
+		$l = new \OC_L10N('files_encryption');
+		//check if all requirements are met
+		if(!Helper::checkRequirements() ) {
+			$error_msg = $l->t("Missing requirements.");
+			$hint = $l->t('Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL PHP extension is enabled and configured properly. For now, the encryption app has been disabled.');
+			\OC_App::disable('files_encryption');
+			\OCP\Util::writeLog('Encryption library', $error_msg . ' ' . $hint, \OCP\Util::ERROR);
+			\OCP\Template::printErrorPage($error_msg, $hint);
+		}
 
 		$view = new \OC_FilesystemView('/');
 
@@ -472,10 +476,19 @@ class Hooks {
 		$util = new Util($view, $userId);
 
 		// Format paths to be relative to user files dir
-		$oldKeyfilePath = \OC\Files\Filesystem::normalizePath(
-			$userId . '/' . 'files_encryption' . '/' . 'keyfiles' . '/' . $params['oldpath']);
-		$newKeyfilePath = \OC\Files\Filesystem::normalizePath(
-			$userId . '/' . 'files_encryption' . '/' . 'keyfiles' . '/' . $params['newpath']);
+		if ($util->isSystemWideMountPoint($params['oldpath'])) {
+			$baseDir = 'files_encryption/';
+			$oldKeyfilePath = $baseDir . 'keyfiles/' . $params['oldpath'];
+		} else {
+			$baseDir = $userId . '/' . 'files_encryption/';
+			$oldKeyfilePath = $baseDir . 'keyfiles/' . $params['oldpath'];
+		}
+
+		if ($util->isSystemWideMountPoint($params['newpath'])) {
+			$newKeyfilePath =  $baseDir . 'keyfiles/' . $params['newpath'];
+		} else {
+			$newKeyfilePath = $baseDir . 'keyfiles/' . $params['newpath'];
+		}
 
 		// add key ext if this is not an folder
 		if (!$view->is_dir($oldKeyfilePath)) {
@@ -483,8 +496,9 @@ class Hooks {
 			$newKeyfilePath .= '.key';
 
 			// handle share-keys
-			$localKeyPath = $view->getLocalFile($userId . '/files_encryption/share-keys/' . $params['oldpath']);
-			$matches = glob(preg_quote($localKeyPath) . '*.shareKey');
+			$localKeyPath = $view->getLocalFile($baseDir . 'share-keys/' . $params['oldpath']);
+			$escapedPath = Helper::escapeGlobPattern($localKeyPath);
+			$matches = glob($escapedPath . '*.shareKey');
 			foreach ($matches as $src) {
 				$dst = \OC\Files\Filesystem::normalizePath(str_replace($params['oldpath'], $params['newpath'], $src));
 
@@ -498,10 +512,8 @@ class Hooks {
 
 		} else {
 			// handle share-keys folders
-			$oldShareKeyfilePath = \OC\Files\Filesystem::normalizePath(
-				$userId . '/' . 'files_encryption' . '/' . 'share-keys' . '/' . $params['oldpath']);
-			$newShareKeyfilePath = \OC\Files\Filesystem::normalizePath(
-				$userId . '/' . 'files_encryption' . '/' . 'share-keys' . '/' . $params['newpath']);
+			$oldShareKeyfilePath = $baseDir . 'share-keys/' . $params['oldpath'];
+			$newShareKeyfilePath = $baseDir . 'share-keys/' . $params['newpath'];
 
 			// create destination folder if not exists
 			if (!$view->file_exists(dirname($newShareKeyfilePath))) {
@@ -539,4 +551,17 @@ class Hooks {
 
 		\OC_FileProxy::$enabled = $proxyStatus;
 	}
+
+	/**
+	 * set migration status back to '0' so that all new files get encrypted
+	 * if the app gets enabled again
+	 * @param array $params contains the app ID
+	 */
+	public static function preDisable($params) {
+		if ($params['app'] === 'files_encryption') {
+			$query = \OC_DB::prepare('UPDATE `*PREFIX*encryption` SET `migration_status`=0');
+			$query->execute();
+		}
+	}
+
 }
diff --git a/apps/files_encryption/l10n/ca.php b/apps/files_encryption/l10n/ca.php
index 17a073c1c69b7d05403f7273edb18e73e2b4f6d6..d9d3d7b4fa58f9b006dfc8aadea185ca61ec54fb 100644
--- a/apps/files_encryption/l10n/ca.php
+++ b/apps/files_encryption/l10n/ca.php
@@ -7,19 +7,21 @@
 "Could not change the password. Maybe the old password was not correct." => "No s'ha pogut canviar la contrasenya. Potser la contrasenya anterior no era correcta.",
 "Private key password successfully updated." => "La contrasenya de la clau privada s'ha actualitzat.",
 "Could not update the private key password. Maybe the old password was not correct." => "No s'ha pogut actualitzar la contrasenya de la clau privada. Potser la contrasenya anterior no era correcta.",
-"Your private key is not valid! Maybe your password was changed from outside. You can update your private key password in your personal settings to regain access to your files" => "La clau privada no és vàlida! Potser la contrasenya ha canviat des de fora. Podeu actualitzar la contrasenya de la clau privada a l'arranjament personal per obtenir de nou accés als vostres fitxers",
+"Your private key is not valid! Likely your password was changed outside the ownCloud system (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "La clau privada no és vàlida! Probablement la contrasenya va ser canviada des de fora del sistema ownCloud (per exemple, en el directori de l'empresa). Vostè pot actualitzar la contrasenya de clau privada en la seva configuració personal per poder recuperar l'accés en els arxius xifrats.",
+"Missing requirements." => "Manca de requisits.",
+"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Assegureu-vos que teniu instal·lada la versió de PHP 5.3.3 o posterior, i que teniu l'extensió OpenSSL PHP activada i configurada correctament. Per ara, l'aplicació de xifrat esta desactivada.",
 "Saving..." => "Desant...",
 "Your private key is not valid! Maybe the your password was changed from outside." => "La vostra clau privada no és vàlida! Potser la vostra contrasenya ha canviat des de fora.",
 "You can unlock your private key in your " => "Podeu desbloquejar la clau privada en el vostre",
 "personal settings" => "arranjament personal",
 "Encryption" => "Xifrat",
-"Enable encryption passwords recovery key (allow sharing to recovery key):" => "Activa la clau de recuperació de contrasenya (permet compartir la clau de recuperació):",
-"Recovery account password" => "Contrasenya de recuperació del compte",
+"Enable recovery key (allow to recover users files in case of password loss):" => "Activa la clau de recuperació (permet recuperar fitxers d'usuaris en cas de pèrdua de contrasenya):",
+"Recovery key password" => "Clau de recuperació de la contrasenya",
 "Enabled" => "Activat",
 "Disabled" => "Desactivat",
-"Change encryption passwords recovery key:" => "Canvia la clau de recuperació de la contrasenya:",
-"Old Recovery account password" => "Contrasenya de recuperació anterior",
-"New Recovery account password" => "Nova contrasenya de recuperació de compte",
+"Change recovery key password:" => "Canvia la clau de recuperació de contrasenya:",
+"Old Recovery key password" => "Antiga clau de recuperació de contrasenya",
+"New Recovery key password" => "Nova clau de recuperació de contrasenya",
 "Change Password" => "Canvia la contrasenya",
 "Your private key password no longer match your log-in password:" => "La clau privada ja no es correspon amb la contrasenya d'accés:",
 "Set your old private key password to your current log-in password." => "Establiu la vostra contrasenya clau en funció de la contrasenya actual d'accés.",
diff --git a/apps/files_encryption/l10n/cs_CZ.php b/apps/files_encryption/l10n/cs_CZ.php
index a005141ce0c6632d73e3c8113a79a7310547b01b..a402b96a51b584d8dec30fb8c6c0886089a2ebcc 100644
--- a/apps/files_encryption/l10n/cs_CZ.php
+++ b/apps/files_encryption/l10n/cs_CZ.php
@@ -7,16 +7,10 @@
 "Could not change the password. Maybe the old password was not correct." => "Nelze změnit heslo. Pravděpodobně nebylo stávající heslo zadáno správně.",
 "Private key password successfully updated." => "Heslo soukromého klíče úspěšně aktualizováno.",
 "Could not update the private key password. Maybe the old password was not correct." => "Nelze aktualizovat heslo soukromého klíče. Možná nebylo staré heslo správně.",
-"Your private key is not valid! Maybe your password was changed from outside. You can update your private key password in your personal settings to regain access to your files" => "Váš soukromý klíč není platný. Možná bylo vaše heslo změněno z venku. Můžete aktualizovat heslo soukromého klíče v osobním nastavení pro opětovné získání přístupu k souborům",
 "Saving..." => "Ukládám...",
 "Encryption" => "Šifrování",
-"Enable encryption passwords recovery key (allow sharing to recovery key):" => "Povolit záchranný klíč šifrovacích hesel (povolí sdílený záchranný klíč):",
-"Recovery account password" => "Heslo pro obnovu účtu",
 "Enabled" => "Povoleno",
 "Disabled" => "Zakázáno",
-"Change encryption passwords recovery key:" => "Změnit záchranný klíč šifrovacích hesel:",
-"Old Recovery account password" => "Stávající heslo pro obnovu účtu",
-"New Recovery account password" => "Nové heslo pro obnovu účtu",
 "Change Password" => "Změnit heslo",
 "Enable password recovery:" => "Povolit obnovu hesla:",
 "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Povolení vám umožní znovu získat přístup k vašim zašifrovaným souborům pokud ztratíte heslo",
diff --git a/apps/files_encryption/l10n/de.php b/apps/files_encryption/l10n/de.php
index f5dd0dc1e24a7b60c66b3bfc84dbe80673053e20..ed9b8d6c16e3f7e1bbed1c56bd21f6f32094b5ee 100644
--- a/apps/files_encryption/l10n/de.php
+++ b/apps/files_encryption/l10n/de.php
@@ -5,12 +5,14 @@
 "Could not disable recovery key. Please check your recovery key password!" => "Der Wiederherstellungsschlüssel konnte nicht deaktiviert werden. Überprüfen Sie Ihr Wiederherstellungspasswort!",
 "Password successfully changed." => "Dein Passwort wurde geändert.",
 "Could not change the password. Maybe the old password was not correct." => "Das Passwort konnte nicht geändert werden. Vielleicht war das alte Passwort falsch.",
+"Private key password successfully updated." => "Passwort des privaten Schlüssels erfolgreich aktualisiert",
 "Saving..." => "Speichern...",
+"personal settings" => "Private Einstellungen",
 "Encryption" => "Verschlüsselung",
-"Recovery account password" => "Password zurücksetzen",
 "Enabled" => "Aktiviert",
 "Disabled" => "Deaktiviert",
-"Change encryption passwords recovery key:" => "Wiederherstellungsschlüssel für Passwörter ändern:",
 "Change Password" => "Passwort ändern",
+"Old log-in password" => "Altes login Passwort",
+"Current log-in password" => "Aktuelles Passwort",
 "File recovery settings updated" => "Einstellungen zur Wiederherstellung von Dateien wurden aktualisiert"
 );
diff --git a/apps/files_encryption/l10n/de_DE.php b/apps/files_encryption/l10n/de_DE.php
index b12bda42f84fe10c9c4b0493c8ba6f127929ca10..2d7512354d582403395d2e0be10b13dd9cda6f73 100644
--- a/apps/files_encryption/l10n/de_DE.php
+++ b/apps/files_encryption/l10n/de_DE.php
@@ -5,14 +5,32 @@
 "Could not disable recovery key. Please check your recovery key password!" => "Der Wiederherstellungsschlüssel konnte nicht deaktiviert werden. Bitte überprüfen Sie das Passwort für den Wiederherstellungsschlüssel!",
 "Password successfully changed." => "Das Passwort wurde erfolgreich geändert.",
 "Could not change the password. Maybe the old password was not correct." => "Das Passwort konnte nicht geändert werden. Vielleicht war das alte Passwort nicht richtig.",
+"Private key password successfully updated." => "Das Passwort des privaten Schlüssels wurde erfolgreich aktualisiert.",
+"Could not update the private key password. Maybe the old password was not correct." => "Das Passwort des privaten Schlüssels konnte nicht aktualisiert werden. Vielleicht war das alte Passwort nicht richtig.",
+"Your private key is not valid! Likely your password was changed outside the ownCloud system (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Ihr privater Schlüssel ist ungültig. Möglicher Weise wurde von außerhalb Ihr Passwort geändert (z.B. in Ihrem gemeinsamen Verzeichnis). Sie können das Passwort Ihres privaten Schlüssels in den persönlichen Einstellungen aktualisieren, um wieder an Ihre Dateien zu gelangen.",
+"Missing requirements." => "Fehlende Voraussetzungen",
+"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Bitte stellen Sie sicher, dass PHP 5.3.3 oder neuer installiert und die PHP-Erweiterung OpenSSL aktiviert und richtig konfiguriert ist. Zur Zeit ist die Verschlüsselungs-App deaktiviert.",
 "Saving..." => "Speichern...",
+"Your private key is not valid! Maybe the your password was changed from outside." => "Ihr privater Schlüssel ist ungültig! Vielleicht wurde Ihr Passwort von außerhalb geändert.",
+"You can unlock your private key in your " => "Sie können den privaten Schlüssel ändern und zwar in Ihrem",
+"personal settings" => "Persönliche Einstellungen",
 "Encryption" => "Verschlüsselung",
-"Recovery account password" => "Account-Passwort wiederherstellen",
+"Enable recovery key (allow to recover users files in case of password loss):" => "Aktivieren Sie den Wiederherstellungsschlüssel (erlaubt die Wiederherstellung des Zugangs zu den Benutzerdateien, wenn das Passwort verloren geht).",
+"Recovery key password" => "Wiederherstellungschlüsselpasswort",
 "Enabled" => "Aktiviert",
 "Disabled" => "Deaktiviert",
-"Old Recovery account password" => "Altes Passwort für die Account-Wiederherstellung",
-"New Recovery account password" => "Neues Passwort für die Account-Wiederherstellung",
+"Change recovery key password:" => "Wiederherstellungsschlüsselpasswort ändern",
+"Old Recovery key password" => "Altes Wiederherstellungsschlüsselpasswort",
+"New Recovery key password" => "Neues Wiederherstellungsschlüsselpasswort ",
 "Change Password" => "Passwort ändern",
+"Your private key password no longer match your log-in password:" => "Das Privatschlüsselpasswort darf nicht länger mit den Login-Passwort übereinstimmen.",
+"Set your old private key password to your current log-in password." => "Setzen Sie Ihr altes Privatschlüsselpasswort auf Ihr aktuelles LogIn-Passwort.",
+" If you don't remember your old password you can ask your administrator to recover your files." => "Falls Sie sich nicht an Ihr altes Passwort erinnern können, fragen Sie bitte Ihren Administrator, um Ihre Dateien wiederherzustellen.",
+"Old log-in password" => "Altes Login-Passwort",
+"Current log-in password" => "Momentanes Login-Passwort",
+"Update Private Key Password" => "Das Passwort des privaten Schlüssels aktualisieren",
+"Enable password recovery:" => "Passwort-Wiederherstellung aktivieren:",
+"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Durch die Aktivierung dieser Option haben Sie die Möglichkeit, wieder auf Ihre verschlüsselten Dateien zugreifen zu können, wenn Sie Ihr Passwort verloren haben.",
 "File recovery settings updated" => "Die Einstellungen für die Dateiwiederherstellung wurden aktualisiert.",
 "Could not update file recovery" => "Die Dateiwiederherstellung konnte nicht aktualisiert werden."
 );
diff --git a/apps/files_encryption/l10n/el.php b/apps/files_encryption/l10n/el.php
index 7bf9be11a0102c7e98d3dd250c58d6d9e43472ab..990f464bc1a17b4b116e6a72c12a18d13ca7e2bf 100644
--- a/apps/files_encryption/l10n/el.php
+++ b/apps/files_encryption/l10n/el.php
@@ -2,8 +2,8 @@
 "Password successfully changed." => "Ο κωδικός αλλάχτηκε επιτυχώς.",
 "Could not change the password. Maybe the old password was not correct." => "Αποτυχία αλλαγής κωδικού ίσως ο παλιός κωδικός να μην ήταν σωστός.",
 "Saving..." => "Γίνεται αποθήκευση...",
+"personal settings" => "προσωπικές ρυθμίσεις",
 "Encryption" => "Κρυπτογράφηση",
-"Recovery account password" => "Επαναφορά κωδικού πρόσβασης λογαριασμού",
 "Enabled" => "Ενεργοποιημένο",
 "Disabled" => "Απενεργοποιημένο",
 "Change Password" => "Αλλαγή Κωδικού Πρόσβασης",
diff --git a/apps/files_encryption/l10n/eo.php b/apps/files_encryption/l10n/eo.php
index ea405fda1ab7e1e219f53183c3d34977714f7b62..997b60f8ac3c2d126f37dd46398db5606b79f437 100644
--- a/apps/files_encryption/l10n/eo.php
+++ b/apps/files_encryption/l10n/eo.php
@@ -1,4 +1,15 @@
 <?php $TRANSLATIONS = array(
+"Password successfully changed." => "La pasvorto sukcese ŝanĝiĝis.",
+"Could not change the password. Maybe the old password was not correct." => "Ne eblis ŝanĝi la pasvorton. Eble la malnova pasvorto malĝustis.",
+"Private key password successfully updated." => "La pasvorto de la malpublika klavo sukcese ĝisdatiĝis.",
 "Saving..." => "Konservante...",
-"Encryption" => "Ĉifrado"
+"personal settings" => "persona agordo",
+"Encryption" => "Ĉifrado",
+"Enabled" => "Kapabligita",
+"Disabled" => "Malkapabligita",
+"Change Password" => "Ŝarĝi pasvorton",
+"Your private key password no longer match your log-in password:" => "La pasvorto de via malpublika klavo ne plu kongruas kun via ensaluta pasvorto:",
+"Old log-in password" => "Malnova ensaluta pasvorto",
+"Current log-in password" => "Nuna ensaluta pasvorto",
+"Update Private Key Password" => "Äœisdatigi la pasvorton de la malpublika klavo"
 );
diff --git a/apps/files_encryption/l10n/es.php b/apps/files_encryption/l10n/es.php
index 5ba3e36b1ac08945f32a84a05b0ddd4165d9b95a..0b49edbd2af62ca9cdfce5abd710a6834af4ebcd 100644
--- a/apps/files_encryption/l10n/es.php
+++ b/apps/files_encryption/l10n/es.php
@@ -6,16 +6,31 @@
 "Password successfully changed." => "Su contraseña ha sido cambiada",
 "Could not change the password. Maybe the old password was not correct." => "No se pudo cambiar la contraseña. Compruebe que la contraseña actual sea correcta.",
 "Private key password successfully updated." => "Contraseña de clave privada actualizada con éxito.",
+"Could not update the private key password. Maybe the old password was not correct." => "No se pudo cambiar la contraseña. Puede que la contraseña antigua no sea correcta.",
+"Your private key is not valid! Likely your password was changed outside the ownCloud system (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "¡Su clave privada no es válida! Tal vez su contraseña ha sido cambiada desde fuera. Puede actualizar su clave privada en sus opciones personales para recuperar el acceso a sus ficheros.",
+"Missing requirements." => "Requisitos incompletos.",
+"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Por favor, asegúrese de que PHP 5.3.3 o posterior está instalado y que la extensión OpenSSL de PHP está habilitada y configurada correctamente. Por el momento, la aplicación de cifrado ha sido deshabilitada.",
 "Saving..." => "Guardando...",
+"Your private key is not valid! Maybe the your password was changed from outside." => "¡Su clave privada no es válida! Tal vez su contraseña ha sido cambiada desde fuera.",
+"You can unlock your private key in your " => "Puede desbloquear su clave privada en su",
+"personal settings" => "opciones personales",
 "Encryption" => "Cifrado",
-"Enable encryption passwords recovery key (allow sharing to recovery key):" => "Habilitar clave de recuperación de contraseñas ():",
-"Recovery account password" => "Recuperar contraseña",
+"Enable recovery key (allow to recover users files in case of password loss):" => "Habilitar la clave de recuperación (permite recuperar los ficheros del usuario en caso de pérdida de la contraseña);",
+"Recovery key password" => "Contraseña de clave de recuperación",
 "Enabled" => "Habilitar",
 "Disabled" => "Deshabilitado",
-"Change encryption passwords recovery key:" => "Cambiar clave de cifrado de contraseñas:",
-"Old Recovery account password" => "Contraseña de recuperación actual",
-"New Recovery account password" => "Contraseña de recuperación nueva",
+"Change recovery key password:" => "Cambiar la contraseña de la clave de recuperación",
+"Old Recovery key password" => "Antigua clave de recuperación",
+"New Recovery key password" => "Nueva clave de recuperación",
 "Change Password" => "Cambiar contraseña",
+"Your private key password no longer match your log-in password:" => "Su contraseña de clave privada ya no coincide con su contraseña de acceso:",
+"Set your old private key password to your current log-in password." => "Establecer la contraseña de su antigua clave privada a su contraseña actual de acceso.",
+" If you don't remember your old password you can ask your administrator to recover your files." => "Si no recuerda su antigua contraseña puede pedir a su administrador que le recupere sus ficheros.",
+"Old log-in password" => "Contraseña de acceso antigua",
+"Current log-in password" => "Contraseña de acceso actual",
+"Update Private Key Password" => "Actualizar Contraseña de Clave Privada",
+"Enable password recovery:" => "Habilitar la recuperación de contraseña:",
+"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Habilitar esta opción le permitirá volver a tener acceso a sus ficheros cifrados en caso de pérdida de contraseña",
 "File recovery settings updated" => "Opciones de recuperación de archivos actualizada",
 "Could not update file recovery" => "No se pudo actualizar la recuperación de archivos"
 );
diff --git a/apps/files_encryption/l10n/es_AR.php b/apps/files_encryption/l10n/es_AR.php
index 9d003a37515e5bf8ddfe30c4bf02808bd3b70346..b6f3fed8a6a3456fff72d4dfc47634117e4d1746 100644
--- a/apps/files_encryption/l10n/es_AR.php
+++ b/apps/files_encryption/l10n/es_AR.php
@@ -1,8 +1,33 @@
 <?php $TRANSLATIONS = array(
+"Recovery key successfully enabled" => "Se habilitó la recuperación de archivos",
+"Could not enable recovery key. Please check your recovery key password!" => "No se pudo habilitar la clave de recuperación. Por favor, comprobá tu contraseña.",
+"Recovery key successfully disabled" => "Clave de recuperación deshabilitada",
+"Could not disable recovery key. Please check your recovery key password!" => "No fue posible deshabilitar la clave de recuperación.  Por favor, comprobá tu contraseña.",
 "Password successfully changed." => "Tu contraseña fue cambiada",
 "Could not change the password. Maybe the old password was not correct." => "No se pudo cambiar la contraseña. Comprobá que la contraseña actual sea correcta.",
+"Private key password successfully updated." => "Contraseña de clave privada actualizada con éxito.",
+"Could not update the private key password. Maybe the old password was not correct." => "No fue posible actualizar la contraseña de la clave privada. Tal vez la contraseña antigua no es correcta.",
 "Saving..." => "Guardando...",
+"Your private key is not valid! Maybe the your password was changed from outside." => "¡Tu clave privada no es válida! Tal vez tu contraseña fue cambiada desde afuera.",
+"You can unlock your private key in your " => "Podés desbloquear tu clave privada en tu",
+"personal settings" => "Configuración personal",
 "Encryption" => "Encriptación",
-"Enable encryption passwords recovery key (allow sharing to recovery key):" => "Habilitar clave de recuperación de contraseñas (permite compartir clave de contraseñas):",
-"Recovery account password" => "Recuperar contraseña"
+"Enable recovery key (allow to recover users files in case of password loss):" => "Habilitar clave de recuperación (te permite recuperar los archivos de usuario en el caso en que pierdas la contraseña):",
+"Recovery key password" => "Contraseña de recuperación de clave",
+"Enabled" => "Habilitado",
+"Disabled" => "Deshabilitado",
+"Change recovery key password:" => "Cambiar contraseña para recuperar la clave:",
+"Old Recovery key password" => "Contraseña antigua de recuperación de clave",
+"New Recovery key password" => "Nueva contraseña de recuperación de clave",
+"Change Password" => "Cambiar contraseña",
+"Your private key password no longer match your log-in password:" => "Tu contraseña de recuperación de clave ya no coincide con la contraseña de ingreso:",
+"Set your old private key password to your current log-in password." => "Usá tu contraseña de recuperación de clave antigua para tu contraseña de ingreso actual.",
+" If you don't remember your old password you can ask your administrator to recover your files." => "Si no te acordás de tu contraseña antigua, pedile al administrador que recupere tus archivos",
+"Old log-in password" => "Contraseña anterior",
+"Current log-in password" => "Contraseña actual",
+"Update Private Key Password" => "Actualizar contraseña de la clave privada",
+"Enable password recovery:" => "Habilitar contraseña de recuperación:",
+"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Habilitando esta opción te va a permitir tener acceso a tus archivos encriptados incluso si perdés la contraseña",
+"File recovery settings updated" => "Las opciones de recuperación de archivos fueron actualizadas",
+"Could not update file recovery" => "No fue posible actualizar la recuperación de archivos"
 );
diff --git a/apps/files_encryption/l10n/et_EE.php b/apps/files_encryption/l10n/et_EE.php
index e24da6ac678221eb11efbcff8cfc33f149d770d1..c1c8164b8104238810937d41b1f2eef5720b034a 100644
--- a/apps/files_encryption/l10n/et_EE.php
+++ b/apps/files_encryption/l10n/et_EE.php
@@ -5,16 +5,32 @@
 "Could not disable recovery key. Please check your recovery key password!" => "Ei suuda keelata taastevõtit. Palun kontrolli oma taastevõtme parooli!",
 "Password successfully changed." => "Parool edukalt vahetatud.",
 "Could not change the password. Maybe the old password was not correct." => "Ei suutnud vahetada parooli. Võib-olla on vana parool valesti sisestatud.",
+"Private key password successfully updated." => "Privaatse võtme parool edukalt uuendatud.",
+"Could not update the private key password. Maybe the old password was not correct." => "Ei suutnud uuendada privaatse võtme parooli. Võib-olla polnud vana parool õige.",
+"Your private key is not valid! Likely your password was changed outside the ownCloud system (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Sinu privaatne võti pole toimiv! Tõenäoliselt on sinu parool muutunud väljaspool ownCloud süsteemi (näiteks ettevõtte keskhaldus). Sa saad uuendada oma privaatse võtme parooli seadete all taastamaks ligipääsu oma krüpteeritud failidele.",
+"Missing requirements." => "Nõutavad on puudu.",
+"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Veendu, et kasutusel oleks PHP 5.3.3 või uuem versioon ning kasutusel oleks OpenSSL PHP laiendus ja see on korrektselt seadistatud. Hetkel on krüpteerimise rakenduse kasutamine peatatud.",
 "Saving..." => "Salvestamine...",
+"Your private key is not valid! Maybe the your password was changed from outside." => "Sinu privaatne võti ei ole õige. Võib-olla on parool vahetatud süsteemi väliselt.",
+"You can unlock your private key in your " => "Saad avada oma privaatse võtme oma",
+"personal settings" => "isiklikes seadetes",
 "Encryption" => "Krüpteerimine",
-"Enable encryption passwords recovery key (allow sharing to recovery key):" => "Luba krüpteerimise paroolide taastevõti (võimalda parooli jagamine taastevõtmesse):",
-"Recovery account password" => "Konto taasteparool",
+"Enable recovery key (allow to recover users files in case of password loss):" => "Luba taastevõti (võimada kasutaja failide taastamine parooli kaotuse puhul):",
+"Recovery key password" => "Taastevõtme parool",
 "Enabled" => "Sisse lülitatud",
 "Disabled" => "Väljalülitatud",
-"Change encryption passwords recovery key:" => "Muuda taaste võtme krüpteerimise paroole:",
-"Old Recovery account password" => "Konto vana taaste parool",
-"New Recovery account password" => "Konto uus taasteparool",
+"Change recovery key password:" => "Muuda taastevõtme parooli:",
+"Old Recovery key password" => "Vana taastevõtme parool",
+"New Recovery key password" => "Uus taastevõtme parool",
 "Change Password" => "Muuda parooli",
+"Your private key password no longer match your log-in password:" => "Sinu privaatse võtme parool ei ühti enam sinu sisselogimise parooliga:",
+"Set your old private key password to your current log-in password." => "Pane oma vana privaatvõtme parooliks oma praegune sisselogimise parool.",
+" If you don't remember your old password you can ask your administrator to recover your files." => "Kui sa ei mäleta oma vana parooli, siis palu oma süsteemihalduril taastada ligipääs failidele.",
+"Old log-in password" => "Vana sisselogimise parool",
+"Current log-in password" => "Praegune sisselogimise parool",
+"Update Private Key Password" => "Uuenda privaatse võtme parooli",
+"Enable password recovery:" => "Luba parooli taaste:",
+"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Valiku lubamine võimaldab taastada ligipääsu krüpteeritud failidele kui parooli kaotuse puhul",
 "File recovery settings updated" => "Faili taaste seaded uuendatud",
 "Could not update file recovery" => "Ei suuda uuendada taastefaili"
 );
diff --git a/apps/files_encryption/l10n/eu.php b/apps/files_encryption/l10n/eu.php
index 253953e5c52fa215457afe828ac6147825412dea..22fe7932688894b779294b14687088f4a3c14a75 100644
--- a/apps/files_encryption/l10n/eu.php
+++ b/apps/files_encryption/l10n/eu.php
@@ -1,4 +1,24 @@
 <?php $TRANSLATIONS = array(
+"Recovery key successfully enabled" => "Berreskuratze gakoa behar bezala gaitua",
+"Could not enable recovery key. Please check your recovery key password!" => "Ezin da berreskuratze gako gaitu. Egiaztatu berreskuratze gako pasahitza!",
+"Recovery key successfully disabled" => "Berreskuratze gakoa behar bezala desgaitu da",
+"Could not disable recovery key. Please check your recovery key password!" => "Ezin da berreskuratze gako desgaitu. Egiaztatu berreskuratze gako pasahitza!",
+"Password successfully changed." => "Pasahitza behar bezala aldatu da.",
+"Could not change the password. Maybe the old password was not correct." => "Ezin izan da pasahitza aldatu. Agian pasahitz zaharra okerrekoa da.",
+"Private key password successfully updated." => "Gako pasahitz pribatu behar bezala eguneratu da.",
+"Could not update the private key password. Maybe the old password was not correct." => "Ezin izan da gako pribatu pasahitza eguneratu. Agian pasahitz zaharra okerrekoa da.",
 "Saving..." => "Gordetzen...",
-"Encryption" => "Enkriptazioa"
+"personal settings" => "ezarpen pertsonalak",
+"Encryption" => "Enkriptazioa",
+"Recovery key password" => "Berreskuratze gako pasahitza",
+"Enabled" => "Gaitua",
+"Disabled" => "Ez-gaitua",
+"Change recovery key password:" => "Aldatu berreskuratze gako pasahitza:",
+"Old Recovery key password" => "Berreskuratze gako pasahitz zaharra",
+"New Recovery key password" => "Berreskuratze gako pasahitz berria",
+"Change Password" => "Aldatu Pasahitza",
+"Update Private Key Password" => "Eguneratu gako pribatu pasahitza",
+"Enable password recovery:" => "Gaitu pasahitz berreskuratzea:",
+"File recovery settings updated" => "Fitxategi berreskuratze ezarpenak eguneratuak",
+"Could not update file recovery" => "Ezin da fitxategi berreskuratzea eguneratu"
 );
diff --git a/apps/files_encryption/l10n/fr.php b/apps/files_encryption/l10n/fr.php
index 24bb81e8cfbdc25a6f3d206badfc5b5b1be896b9..44f65436722ebea9f32940e7d2e475f1498b2d64 100644
--- a/apps/files_encryption/l10n/fr.php
+++ b/apps/files_encryption/l10n/fr.php
@@ -1,28 +1,34 @@
 <?php $TRANSLATIONS = array(
 "Recovery key successfully enabled" => "Clé de récupération activée avec succès",
-"Could not enable recovery key. Please check your recovery key password!" => "Ne peut pas activer la clé de récupération. s'il vous plait vérifiez votre mot de passe de clé de récupération!",
-"Recovery key successfully disabled" => "Clé de récupération désactivée avc succès",
-"Could not disable recovery key. Please check your recovery key password!" => "Ne peut pas désactiver la clé de récupération. S'il vous plait vérifiez votre mot de passe de clé de récupération!",
+"Could not enable recovery key. Please check your recovery key password!" => "Impossible d'activer la clé de récupération. Veuillez vérifier votre mot de passe de clé de récupération !",
+"Recovery key successfully disabled" => "Clé de récupération désactivée avec succès",
+"Could not disable recovery key. Please check your recovery key password!" => "Impossible de désactiver la clé de récupération. Veuillez vérifier votre mot de passe de clé de récupération !",
 "Password successfully changed." => "Mot de passe changé avec succès ",
 "Could not change the password. Maybe the old password was not correct." => "Ne peut pas changer le mot de passe. L'ancien mot de passe est peut-être incorrect.",
 "Private key password successfully updated." => "Mot de passe de la clé privé mis à jour avec succès.",
 "Could not update the private key password. Maybe the old password was not correct." => "Impossible de mettre à jour le mot de passe de la clé privé. Peut-être que l'ancien mot de passe n'était pas correcte.",
+"Your private key is not valid! Likely your password was changed outside the ownCloud system (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Votre clé de sécurité privée n'est pas valide! Il est probable que votre mot de passe ait été changé sans passer par le système ownCloud (par éxemple: le serveur de votre entreprise). Ain d'avoir à nouveau accès à vos fichiers cryptés, vous pouvez mettre à jour votre clé de sécurité privée dans les paramètres personnels de votre compte.",
 "Saving..." => "Enregistrement...",
+"Your private key is not valid! Maybe the your password was changed from outside." => "Votre clef privée est invalide ! Votre mot de passe a peut-être été modifié depuis l'extérieur.",
 "You can unlock your private key in your " => "Vous pouvez déverrouiller votre clé privée dans votre",
 "personal settings" => "paramètres personnel",
 "Encryption" => "Chiffrement",
-"Enable encryption passwords recovery key (allow sharing to recovery key):" => "Activer la clé de récupération par mots de passe de cryptage (autoriser le partage de la clé de récupération) ",
-"Recovery account password" => "Rétablissement du compte mot de passe ",
+"Enable recovery key (allow to recover users files in case of password loss):" => "Activer la clef de récupération (permet de récupérer les fichiers des utilisateurs en cas de perte de mot de passe).",
+"Recovery key password" => "Mot de passe de la clef de récupération",
 "Enabled" => "Activer",
 "Disabled" => "Désactiver",
-"Change encryption passwords recovery key:" => "Changer les mots de passe de cryptage par la clé de récupération",
-"Old Recovery account password" => "Ancien compte de récupération de mots de passe",
-"New Recovery account password" => "Nouveau compte de récupération de mots de passe",
+"Change recovery key password:" => "Modifier le mot de passe de la clef de récupération :",
+"Old Recovery key password" => "Ancien mot de passe de la clef de récupération",
+"New Recovery key password" => "Nouveau mot de passe de la clef de récupération",
 "Change Password" => "Changer de mot de passe",
+"Your private key password no longer match your log-in password:" => "Le mot de passe de votre clef privée ne correspond plus à votre mot de passe de connexion :",
+"Set your old private key password to your current log-in password." => "Configurez le mot de passe de votre ancienne clef privée avec votre mot de passe courant de connexion. ",
+" If you don't remember your old password you can ask your administrator to recover your files." => "Si vous ne vous souvenez plus de votre ancien mot de passe, vous pouvez demander à votre administrateur de récupérer vos fichiers.",
 "Old log-in password" => "Ancien mot de passe de connexion",
 "Current log-in password" => "Actuel mot de passe de connexion",
 "Update Private Key Password" => "Mettre à jour le mot de passe de votre clé privée",
-"Enable password recovery:" => "Activer la récupération du mot de passe:",
-"File recovery settings updated" => "Mise à jour des paramètres de récupération de fichiers ",
+"Enable password recovery:" => "Activer la récupération du mot de passe :",
+"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Activer cette option vous permettra d'obtenir à nouveau l'accès à vos fichiers chiffrés en cas de perte de mot de passe",
+"File recovery settings updated" => "Paramètres de récupération de fichiers mis à jour",
 "Could not update file recovery" => "Ne peut pas remettre à jour les fichiers de récupération"
 );
diff --git a/apps/files_encryption/l10n/gl.php b/apps/files_encryption/l10n/gl.php
index 6fc6abccefebcd6595bc5d587574ea17fbfec724..db6f57bb36d1650e83bfe86616d8fd2447e86983 100644
--- a/apps/files_encryption/l10n/gl.php
+++ b/apps/files_encryption/l10n/gl.php
@@ -7,19 +7,21 @@
 "Could not change the password. Maybe the old password was not correct." => "Non foi posíbel cambiar o contrasinal. Probabelmente o contrasinal antigo non é o  correcto.",
 "Private key password successfully updated." => "A chave privada foi actualizada correctamente.",
 "Could not update the private key password. Maybe the old password was not correct." => "Non foi posíbel actualizar o contrasinal da chave privada. É probábel que o contrasinal antigo non sexa correcto.",
-"Your private key is not valid! Maybe your password was changed from outside. You can update your private key password in your personal settings to regain access to your files" => "A chave privada non é correcta! É probábel que o seu contrasinal teña sido cambiado desde o exterior. Vostede pode actualizar o contrasinal da súa chave privada nos seus axustes persoais para recuperar o acceso aos seus ficheiros",
+"Your private key is not valid! Likely your password was changed outside the ownCloud system (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "A chave privada non é correcta! É probábel que o seu contrasinal teña sido cambiado desde o exterior (p.ex. o seu directorio corporativo). Vostede pode actualizar o contrasinal da súa chave privada nos seus axustes persoais para recuperar o acceso aos seus ficheiros",
+"Missing requirements." => "Non se cumpren os requisitos.",
+"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Asegúrese de que está instalado o  PHP 5.3.3 ou posterior e de que a extensión OpenSSL PHP estea activada e configurada correctamente. Polo de agora foi desactivado o aplicativo de cifrado.",
 "Saving..." => "Gardando...",
 "Your private key is not valid! Maybe the your password was changed from outside." => "A chave privada non é correcta! É probábel que o seu contrasinal teña sido cambiado desde o exterior. ",
 "You can unlock your private key in your " => "Pode desbloquear a chave privada nos seus",
 "personal settings" => "axustes persoais",
 "Encryption" => "Cifrado",
-"Enable encryption passwords recovery key (allow sharing to recovery key):" => "Activar a chave  de recuperación do cifrado de contrasinais (permite compartir a chave de recuperación):",
-"Recovery account password" => "Recuperación do contrasinal da conta",
+"Enable recovery key (allow to recover users files in case of password loss):" => "Activar a chave de recuperación (permitirá recuperar os ficheiros dos usuarios no caso de perda do contrasinal):",
+"Recovery key password" => "Contrasinal da chave de recuperación",
 "Enabled" => "Activado",
 "Disabled" => "Desactivado",
-"Change encryption passwords recovery key:" => "Cambiar a chave de la recuperación do cifrado de contrasinais:",
-"Old Recovery account password" => "Antigo contrasinal de recuperación da conta",
-"New Recovery account password" => "Novo contrasinal de recuperación da conta",
+"Change recovery key password:" => "Cambiar o contrasinal da chave de la recuperación:",
+"Old Recovery key password" => "Antigo contrasinal da chave de recuperación",
+"New Recovery key password" => "Novo contrasinal da chave de recuperación",
 "Change Password" => "Cambiar o contrasinal",
 "Your private key password no longer match your log-in password:" => "O seu contrasinal da chave privada non coincide co seu contrasinal de acceso.",
 "Set your old private key password to your current log-in password." => "Estabeleza o seu contrasinal antigo da chave de recuperación ao seu contrasinal de acceso actual",
diff --git a/apps/files_encryption/l10n/it.php b/apps/files_encryption/l10n/it.php
index 3226a17ee994ac2278e97089ad2f7bec66c7d4ed..8d15d1ced363fd7fef203d78cd3dd23cb5731f89 100644
--- a/apps/files_encryption/l10n/it.php
+++ b/apps/files_encryption/l10n/it.php
@@ -7,28 +7,30 @@
 "Could not change the password. Maybe the old password was not correct." => "Impossibile cambiare la password. Forse la vecchia password non era corretta.",
 "Private key password successfully updated." => "Password della chiave privata aggiornata correttamente.",
 "Could not update the private key password. Maybe the old password was not correct." => "Impossibile aggiornare la password della chiave privata. Forse la vecchia password non era corretta.",
-"Your private key is not valid! Maybe your password was changed from outside. You can update your private key password in your personal settings to regain access to your files" => "La chiave privata non è valida! Forse la password è stata cambiata dall'esterno. Puoi aggiornare la password della chiave privata nelle impostazioni personali per riottenere l'accesso ai file.",
+"Your private key is not valid! Likely your password was changed outside the ownCloud system (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "La chiave privata non è valida! Forse la password è stata cambiata esternamente al sistema di ownCloud (ad es. la directory aziendale). Puoi aggiornare la password della chiave privata nelle impostazioni personali per ottenere nuovamente l'accesso ai file.",
+"Missing requirements." => "Requisiti mancanti.",
+"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Assicurati che sia installato PHP 5.3.3 o versioni successive e che l'estensione OpenSSL di PHP sia abilitata e configurata correttamente. Per ora, l'applicazione di cifratura è disabilitata.",
 "Saving..." => "Salvataggio in corso...",
 "Your private key is not valid! Maybe the your password was changed from outside." => "La tua chiave privata non è valida! Forse è stata modifica dall'esterno.",
-"You can unlock your private key in your " => "Puoi sbloccare la chiave privata nel tuo",
-"personal settings" => "Impostazioni personali",
+"You can unlock your private key in your " => "Puoi sbloccare la chiave privata nelle tue",
+"personal settings" => "impostazioni personali",
 "Encryption" => "Cifratura",
-"Enable encryption passwords recovery key (allow sharing to recovery key):" => "Abilita la chiave di ripristino delle password di cifratura (consente di condividere la chiave di ripristino):",
-"Recovery account password" => "Password di ripristino dell'account",
+"Enable recovery key (allow to recover users files in case of password loss):" => "Abilita la chiave di recupero (permette di recuperare i file utenti in caso di perdita della password):",
+"Recovery key password" => "Password della chiave di recupero",
 "Enabled" => "Abilitata",
 "Disabled" => "Disabilitata",
-"Change encryption passwords recovery key:" => "Cambia la chiave di ripristino delle password di cifratura:",
-"Old Recovery account password" => "Vecchia password di ripristino dell'account",
-"New Recovery account password" => "Nuova password di ripristino dell'account",
+"Change recovery key password:" => "Cambia la password della chiave di recupero:",
+"Old Recovery key password" => "Vecchia password della chiave di recupero",
+"New Recovery key password" => "Nuova password della chiave di recupero",
 "Change Password" => "Modifica password",
-"Your private key password no longer match your log-in password:" => "La password della chiave privata non corrisponde più alla password di login:",
-"Set your old private key password to your current log-in password." => "Imposta la vecchia password della chiave privata sull'attuale password di login",
-" If you don't remember your old password you can ask your administrator to recover your files." => "Se non ricordi la vecchia password puoi chiedere al tuo amministratore di recuperare i file",
-"Old log-in password" => "Password di login vecchia",
-"Current log-in password" => "Password di login corrente",
-"Update Private Key Password" => "Aggiorna la Password della Chiave Privata",
-"Enable password recovery:" => "Abilita il recupero della password:",
-"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Abilitando questa opzione potrai riaccedere ai file cifrati nel caso in cui la password venga perduta",
+"Your private key password no longer match your log-in password:" => "La password della chiave privata non corrisponde più alla password di accesso:",
+"Set your old private key password to your current log-in password." => "Imposta la vecchia password della chiave privata sull'attuale password di accesso.",
+" If you don't remember your old password you can ask your administrator to recover your files." => "Se non ricordi la vecchia password puoi chiedere al tuo amministratore di recuperare i file.",
+"Old log-in password" => "Vecchia password di accesso",
+"Current log-in password" => "Password di accesso attuale",
+"Update Private Key Password" => "Aggiorna la password della chiave privata",
+"Enable password recovery:" => "Abilita il ripristino della password:",
+"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "L'abilitazione di questa opzione ti consentirà di accedere nuovamente ai file cifrati in caso di perdita della password",
 "File recovery settings updated" => "Impostazioni di ripristino dei file aggiornate",
 "Could not update file recovery" => "Impossibile aggiornare il ripristino dei file"
 );
diff --git a/apps/files_encryption/l10n/ja_JP.php b/apps/files_encryption/l10n/ja_JP.php
index 29c2a97cdbd40f0a78e36ad8dec0b550ba773b7f..a1fcbd5c5443604f035cbc9216273b32c21c9279 100644
--- a/apps/files_encryption/l10n/ja_JP.php
+++ b/apps/files_encryption/l10n/ja_JP.php
@@ -7,19 +7,21 @@
 "Could not change the password. Maybe the old password was not correct." => "パスワードを変更できませんでした。古いパスワードが間違っているかもしれません。",
 "Private key password successfully updated." => "秘密鍵のパスワードが正常に更新されました。",
 "Could not update the private key password. Maybe the old password was not correct." => "秘密鍵のパスワードを更新できませんでした。古いパスワードが正確でない場合があります。",
-"Your private key is not valid! Maybe your password was changed from outside. You can update your private key password in your personal settings to regain access to your files" => "秘密鍵が有効ではありません。パスワードが外部から変更された恐れがあります。。個人設定で秘密鍵のパスワードを更新して、ファイルへのアクセス権を奪還できます。",
+"Your private key is not valid! Likely your password was changed outside the ownCloud system (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "秘密鍵が有効ではありません。パスワードがownCloudシステムの外部(例えば、企業ディレクトリ)から変更された恐れがあります。個人設定で秘密鍵のパスワードを更新して、暗号化されたファイルを回復出来ます。",
+"Missing requirements." => "必要要件が満たされていません。",
+"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "必ず、PHP 5.3.3以上をインストールし、OpenSSLのPHP拡張を有効にして適切に設定してください。現時点では暗号化アプリは無効になっています。",
 "Saving..." => "保存中...",
 "Your private key is not valid! Maybe the your password was changed from outside." => "秘密鍵が有効ではありません。パスワードが外部から変更された恐れがあります。",
 "You can unlock your private key in your " => "個人設定で",
 "personal settings" => "秘密鍵をアンロックできます",
 "Encryption" => "暗号化",
-"Enable encryption passwords recovery key (allow sharing to recovery key):" => "暗号化パスワードの復旧キーを有効にする(復旧キーを共有することを許可):",
-"Recovery account password" => "復旧アカウントのパスワード",
+"Enable recovery key (allow to recover users files in case of password loss):" => "復旧キーを有効化 (万一パスワードを亡くした場合もユーザーのファイルを回復できる):",
+"Recovery key password" => "復旧キーのパスワード",
 "Enabled" => "有効",
 "Disabled" => "無効",
-"Change encryption passwords recovery key:" => "復旧キーの暗号化パスワードを変更:",
-"Old Recovery account password" => "古い復旧アカウントのパスワード",
-"New Recovery account password" => "新しい復旧アカウントのパスワード",
+"Change recovery key password:" => "復旧キーのパスワードを変更:",
+"Old Recovery key password" => "古い復旧キーのパスワード",
+"New Recovery key password" => "新しい復旧キーのパスワード",
 "Change Password" => "パスワードを変更",
 "Your private key password no longer match your log-in password:" => "もはや秘密鍵はログインパスワードと一致しません:",
 "Set your old private key password to your current log-in password." => "古い秘密鍵のパスワードを現在のログインパスワードに設定する。",
diff --git a/apps/files_encryption/l10n/lt_LT.php b/apps/files_encryption/l10n/lt_LT.php
index 16c6cdb40f07d9a2d7d17e369e2e0ff1bcbcb470..84fa902dc655369c802cdef1b6aeafd0da6f36af 100644
--- a/apps/files_encryption/l10n/lt_LT.php
+++ b/apps/files_encryption/l10n/lt_LT.php
@@ -7,13 +7,8 @@
 "Could not change the password. Maybe the old password was not correct." => "Slaptažodis nebuvo pakeistas. Gali būti, kad buvo neteisingai suvestas senasis.",
 "Saving..." => "Saugoma...",
 "Encryption" => "Å ifravimas",
-"Enable encryption passwords recovery key (allow sharing to recovery key):" => "Įjungti šifravimo slaptažodžio atstatymo raktą (leidžia dalintis su atstatymo raktu):",
-"Recovery account password" => "Atstatymo vartotojo slaptažodis",
 "Enabled" => "Įjungta",
 "Disabled" => "IÅ¡jungta",
-"Change encryption passwords recovery key:" => "Pakeisti šifravimo slaptažodžio atstatymo raktą:",
-"Old Recovery account password" => "Seno atstatymo vartotojo slaptažodis",
-"New Recovery account password" => "naujo atstatymo vartotojo slaptažodis",
 "Change Password" => "Pakeisti slaptažodį",
 "File recovery settings updated" => "Failų atstatymo nustatymai pakeisti",
 "Could not update file recovery" => "Neišėjo atnaujinti failų atkūrimo"
diff --git a/apps/files_encryption/l10n/nl.php b/apps/files_encryption/l10n/nl.php
index 93900c7102930693884373b7ea4fb8a5be1b1782..093ed2c29c8d29ad5ba1dfb778e3587f372bc477 100644
--- a/apps/files_encryption/l10n/nl.php
+++ b/apps/files_encryption/l10n/nl.php
@@ -5,19 +5,23 @@
 "Could not disable recovery key. Please check your recovery key password!" => "Kon herstelsleutel niet deactiveren. Controleer het wachtwoord van uw herstelsleutel!",
 "Password successfully changed." => "Wachtwoord succesvol gewijzigd.",
 "Could not change the password. Maybe the old password was not correct." => "Kon wachtwoord niet wijzigen. Wellicht oude wachtwoord niet juist ingevoerd.",
+"Private key password successfully updated." => "Privésleutel succesvol bijgewerkt.",
+"Could not update the private key password. Maybe the old password was not correct." => "Kon het wachtwoord van de privésleutel niet wijzigen. Misschien was het oude wachtwoord onjuist.",
 "Saving..." => "Opslaan",
 "Your private key is not valid! Maybe the your password was changed from outside." => "Uw privésleutel is niet geldig. Misschien was uw wachtwoord van buitenaf gewijzigd.",
 "You can unlock your private key in your " => "U kunt uw privésleutel deblokkeren in uw",
 "personal settings" => "persoonlijke instellingen",
 "Encryption" => "Versleuteling",
-"Enable encryption passwords recovery key (allow sharing to recovery key):" => "Activeer versleuteling van wachtwoorden herstelsleutel (maak delen met herstel sleutel mogelijk):",
-"Recovery account password" => "Herstel account wachtwoord",
+"Enable recovery key (allow to recover users files in case of password loss):" => "Activeren herstelsleutel (maakt het mogelijk om gebruikersbestanden terug te halen in geval van verlies van het wachtwoord):",
+"Recovery key password" => "Wachtwoord herstelsleulel",
 "Enabled" => "Geactiveerd",
 "Disabled" => "Gedeactiveerd",
-"Change encryption passwords recovery key:" => "Wijzig versleuteling wachtwoord herstelsleutel",
-"Old Recovery account password" => "Oude herstel account wachtwoord",
-"New Recovery account password" => "Nieuwe herstel account wachtwoord",
+"Change recovery key password:" => "Wijzig wachtwoord herstelsleutel:",
+"Old Recovery key password" => "Oude wachtwoord herstelsleutel",
+"New Recovery key password" => "Nieuwe wachtwoord herstelsleutel",
 "Change Password" => "Wijzigen wachtwoord",
+"Your private key password no longer match your log-in password:" => "Het wachtwoord van uw privésleutel komt niet meer overeen met uw inlogwachtwoord:",
+"Set your old private key password to your current log-in password." => "Stel het wachtwoord van uw oude privésleutel in op uw huidige inlogwachtwoord.",
 " If you don't remember your old password you can ask your administrator to recover your files." => "Als u uw oude wachtwoord niet meer weet, kunt u uw beheerder vragen uw bestanden terug te halen.",
 "Old log-in password" => "Oude wachtwoord",
 "Current log-in password" => "Huidige wachtwoord",
diff --git a/apps/files_encryption/l10n/pl.php b/apps/files_encryption/l10n/pl.php
index f840aa7ddac228c329158268af9e2bde3bad4ce7..3928afb1d5c65be919b2d6cb91de3b0668ef52bb 100644
--- a/apps/files_encryption/l10n/pl.php
+++ b/apps/files_encryption/l10n/pl.php
@@ -1,16 +1,33 @@
 <?php $TRANSLATIONS = array(
+"Recovery key successfully enabled" => "Klucz odzyskiwania włączony",
+"Could not enable recovery key. Please check your recovery key password!" => "Nie można włączyć klucza odzyskiwania. Proszę sprawdzić swoje hasło odzyskiwania!",
+"Recovery key successfully disabled" => "Klucz odzyskiwania wyłączony",
+"Could not disable recovery key. Please check your recovery key password!" => "Nie można wyłączyć klucza odzyskiwania. Proszę sprawdzić swoje hasło odzyskiwania!",
 "Password successfully changed." => "Zmiana hasła udana.",
 "Could not change the password. Maybe the old password was not correct." => "Nie można zmienić hasła. Może stare hasło nie było poprawne.",
+"Private key password successfully updated." => "Pomyślnie zaktualizowano hasło klucza prywatnego.",
+"Could not update the private key password. Maybe the old password was not correct." => "Nie można zmienić prywatnego hasła. Może stare hasło nie było poprawne.",
 "Saving..." => "Zapisywanie...",
+"Your private key is not valid! Maybe the your password was changed from outside." => "Klucz prywatny nie jest poprawny! Może Twoje hasło zostało zmienione z zewnątrz.",
+"You can unlock your private key in your " => "Możesz odblokować swój klucz prywatny w swojej",
+"personal settings" => "Ustawienia osobiste",
 "Encryption" => "Szyfrowanie",
-"Enable encryption passwords recovery key (allow sharing to recovery key):" => "Włącz szyfrowanie odzyskiwanych haseł klucza (zezwalaj na odzyskiwanie klucza):",
-"Recovery account password" => "Odzyskiwanie hasła konta",
+"Enable recovery key (allow to recover users files in case of password loss):" => "Włączhasło klucza odzyskiwania (pozwala odzyskać pliki użytkowników w przypadku utraty hasła):",
+"Recovery key password" => "Hasło klucza odzyskiwania",
 "Enabled" => "WÅ‚Ä…czone",
 "Disabled" => "Wyłączone",
-"Change encryption passwords recovery key:" => "Zmiana klucza szyfrowania haseł odzyskiwania:",
-"Old Recovery account password" => "Stare hasło odzyskiwania",
-"New Recovery account password" => "Nowe hasło odzyskiwania",
+"Change recovery key password:" => "Zmień hasło klucza odzyskiwania",
+"Old Recovery key password" => "Stare hasło klucza odzyskiwania",
+"New Recovery key password" => "Nowe hasło klucza odzyskiwania",
 "Change Password" => "Zmień hasło",
+"Your private key password no longer match your log-in password:" => "Hasło klucza prywatnego nie pasuje do  hasła logowania:",
+"Set your old private key password to your current log-in password." => "Podaj swoje stare prywatne hasło aby ustawić nowe",
+" If you don't remember your old password you can ask your administrator to recover your files." => "Jeśli nie pamiętasz swojego starego hasła, poproś swojego administratora, aby odzyskać pliki.",
+"Old log-in password" => "Stare hasło logowania",
+"Current log-in password" => "Bieżące hasło logowania",
+"Update Private Key Password" => "Aktualizacja hasła klucza prywatnego",
+"Enable password recovery:" => "Włącz hasło odzyskiwania:",
+"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Włączenie tej opcji umożliwia otrzymać dostęp do zaszyfrowanych plików w przypadku utraty hasła",
 "File recovery settings updated" => "Ustawienia odzyskiwania plików zmienione",
 "Could not update file recovery" => "Nie można zmienić pliku odzyskiwania"
 );
diff --git a/apps/files_encryption/l10n/pt_BR.php b/apps/files_encryption/l10n/pt_BR.php
index 868dfc4453c1e2632f70ab43b7ea07cf30a4b7ff..1563243c9931185b2a742e2672fc327435ef1300 100644
--- a/apps/files_encryption/l10n/pt_BR.php
+++ b/apps/files_encryption/l10n/pt_BR.php
@@ -5,16 +5,32 @@
 "Could not disable recovery key. Please check your recovery key password!" => "Impossível desabilitar recuperação de chave. Por favor verifique sua senha para recuperação de chave!",
 "Password successfully changed." => "Senha alterada com sucesso.",
 "Could not change the password. Maybe the old password was not correct." => "Não foi possível alterar a senha. Talvez a senha antiga não estava correta.",
+"Private key password successfully updated." => "Senha de chave privada atualizada com sucesso.",
+"Could not update the private key password. Maybe the old password was not correct." => "Não foi possível atualizar a senha de chave privada. Talvez a senha antiga esteja incorreta.",
+"Your private key is not valid! Likely your password was changed outside the ownCloud system (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Sua chave privada não é válida! Provavelmente sua senha foi alterada fora do sistema ownCloud (por exemplo, seu diretório corporativo). Você pode atualizar sua senha de chave privada em suas configurações pessoais para recuperar o acesso a seus arquivos criptografados.",
+"Missing requirements." => "Requisitos em falta.",
+"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Por favor, certifique-se que o PHP 5.3.3 ou mais recente está instalado e que a extensão PHP OpenSSL está habilitado e configurado corretamente. Por enquanto, o aplicativo de criptografia foi desativado.",
 "Saving..." => "Salvando...",
+"Your private key is not valid! Maybe the your password was changed from outside." => "Sua chave privada não é válida! Talvez sua senha tenha sido mudada.",
+"You can unlock your private key in your " => "Você pode desbloquear sua chave privada nas suas",
+"personal settings" => "configurações pessoais.",
 "Encryption" => "Criptografia",
-"Enable encryption passwords recovery key (allow sharing to recovery key):" => "Ativar a criptografia de chave de recuperação de senhas (permitir compartilhar a chave de recuperação):",
-"Recovery account password" => "Recuperar a senha da conta",
+"Enable recovery key (allow to recover users files in case of password loss):" => "Habilitar chave de recuperação (permite recuperar arquivos de usuários em caso de perda de senha):",
+"Recovery key password" => "Senha da chave de recuperação",
 "Enabled" => "Habilidado",
 "Disabled" => "Desabilitado",
-"Change encryption passwords recovery key:" => "Mudar a criptografia de chave de recuperação de senhas:",
-"Old Recovery account password" => "Recuperação de senha de conta antiga",
-"New Recovery account password" => "Senha Nova  da conta de Recuperação",
+"Change recovery key password:" => "Mudar a senha da chave de recuperação:",
+"Old Recovery key password" => "Senha antiga da chave de recuperação",
+"New Recovery key password" => "Nova senha da chave de recuperação",
 "Change Password" => "Trocar Senha",
+"Your private key password no longer match your log-in password:" => "Sua senha de chave privada não coincide mais com sua senha de login:",
+"Set your old private key password to your current log-in password." => "Configure sua antiga senha de chave privada para sua atual senha de login.",
+" If you don't remember your old password you can ask your administrator to recover your files." => "Se você não se lembra de sua antiga senha você pode pedir ao administrador que recupere seus arquivos.",
+"Old log-in password" => "Senha antiga de login",
+"Current log-in password" => "Atual senha de login",
+"Update Private Key Password" => "Atualizar senha de chave privada",
+"Enable password recovery:" => "Habilitar recuperação de senha:",
+"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Habilitar essa opção vai permitir que você obtenha novamente acesso aos seus arquivos encriptados em caso de perda de senha",
 "File recovery settings updated" => "Configurações de recuperação de arquivo atualizado",
 "Could not update file recovery" => "Não foi possível atualizar a recuperação de arquivos"
 );
diff --git a/apps/files_encryption/l10n/pt_PT.php b/apps/files_encryption/l10n/pt_PT.php
index 8993cb63699080f0cc5d431c383d98159e964f2b..f485f373a5346850da99dd461c5419859549cdb2 100644
--- a/apps/files_encryption/l10n/pt_PT.php
+++ b/apps/files_encryption/l10n/pt_PT.php
@@ -7,13 +7,8 @@
 "Could not change the password. Maybe the old password was not correct." => "Não foi possivel alterar a password. Possivelmente a password antiga não está correcta.",
 "Saving..." => "A guardar...",
 "Encryption" => "Encriptação",
-"Enable encryption passwords recovery key (allow sharing to recovery key):" => "Activar a chave de recuperação das passwords de encriptação (permitir partilha da chave de recuperação):",
-"Recovery account password" => "Password de recuperação de conta",
 "Enabled" => "Activado",
 "Disabled" => "Desactivado",
-"Change encryption passwords recovery key:" => "Alterar a chave de recuperação da password de encriptação:",
-"Old Recovery account password" => "Password de recuperação de conta antiga:",
-"New Recovery account password" => "Nova password de recuperação de conta",
 "Change Password" => "Mudar a Password",
 "File recovery settings updated" => "Actualizadas as definições de recuperação de ficheiros",
 "Could not update file recovery" => "Não foi possível actualizar a recuperação de ficheiros"
diff --git a/apps/files_encryption/l10n/ru.php b/apps/files_encryption/l10n/ru.php
index d10bfa7e783a51dc703e27b7c8d5ad6ecf541cea..5bb803de2d0a8f14746aca00444dda2f5768cc57 100644
--- a/apps/files_encryption/l10n/ru.php
+++ b/apps/files_encryption/l10n/ru.php
@@ -1,16 +1,36 @@
 <?php $TRANSLATIONS = array(
+"Recovery key successfully enabled" => "Ключ восстановления успешно установлен",
+"Could not enable recovery key. Please check your recovery key password!" => "Невозможно включить ключ восстановления. Проверьте правильность пароля от ключа!",
+"Recovery key successfully disabled" => "Ключ восстановления успешно отключен",
+"Could not disable recovery key. Please check your recovery key password!" => "Невозможно выключить ключ восстановления. Проверьте правильность пароля от ключа!",
 "Password successfully changed." => "Пароль изменен удачно.",
 "Could not change the password. Maybe the old password was not correct." => "Невозможно изменить пароль. Возможно старый пароль не был верен.",
+"Private key password successfully updated." => "Пароль секретного ключа успешно обновлён.",
+"Could not update the private key password. Maybe the old password was not correct." => "Невозможно обновить пароль от секретного ключа. Возможно, старый пароль указан неверно.",
+"Your private key is not valid! Likely your password was changed outside the ownCloud system (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Ваш секретный ключ не действителен! Вероятно, ваш пароль был изменен вне системы OwnCloud (например, корпоративный каталог). Вы можете обновить секретный ключ в личных настройках на странице восстановления доступа к зашифрованным файлам. ",
+"Missing requirements." => "Требования отсутствуют.",
+"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Пожалуйста, убедитесь, что PHP 5.3.3 или новее установлен и что расширение OpenSSL PHP включен и настроен. В настоящее время, шифрование для приложения было отключено.",
 "Saving..." => "Сохранение...",
+"Your private key is not valid! Maybe the your password was changed from outside." => "Секретный ключ недействителен! Возможно, Ваш пароль был изменён в другой программе.",
+"You can unlock your private key in your " => "Вы можете разблокировать закрытый ключ в своём ",
+"personal settings" => "персональные настройки",
 "Encryption" => "Шифрование",
-"Enable encryption passwords recovery key (allow sharing to recovery key):" => "Включить шифрование пароля ключа восстановления (понадобится разрешение для восстановления ключа)",
-"Recovery account password" => "Восстановление пароля учетной записи",
+"Enable recovery key (allow to recover users files in case of password loss):" => "Включить ключ восстановления (позволяет пользователям восстановить файлы при потере пароля):",
+"Recovery key password" => "Пароль для ключа восстановления",
 "Enabled" => "Включено",
 "Disabled" => "Отключено",
-"Change encryption passwords recovery key:" => "Изменить шифрование пароля ключа восстановления:",
-"Old Recovery account password" => "Старое Восстановление пароля учетной записи",
-"New Recovery account password" => "Новое Восстановление пароля учетной записи",
+"Change recovery key password:" => "Сменить пароль для ключа восстановления:",
+"Old Recovery key password" => "Старый пароль для ключа восстановления",
+"New Recovery key password" => "Новый пароль для ключа восстановления",
 "Change Password" => "Изменить пароль",
+"Your private key password no longer match your log-in password:" => "Пароль от секретного ключа больше не соответствует паролю входа:",
+"Set your old private key password to your current log-in password." => "Замените старый пароль от секретного ключа на новый пароль входа.",
+" If you don't remember your old password you can ask your administrator to recover your files." => "Если вы не помните свой старый пароль, вы можете попросить своего администратора восстановить ваши файлы",
+"Old log-in password" => "Старый пароль для входа",
+"Current log-in password" => "Текущйи пароль для входа",
+"Update Private Key Password" => "Обновить пароль от секретного ключа",
+"Enable password recovery:" => "Включить восстановление пароля:",
+"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Включение этой опции позволит вам получить доступ к своим зашифрованным файлам в случае утери пароля",
 "File recovery settings updated" => "Настройки файла восстановления обновлены",
 "Could not update file recovery" => "Невозможно обновить файл восстановления"
 );
diff --git a/apps/files_encryption/l10n/sk_SK.php b/apps/files_encryption/l10n/sk_SK.php
index 279481fbd4f364a889e6339cdf0c13d47072687b..d8894e537061533dceeb8a21743df3f2a47d759f 100644
--- a/apps/files_encryption/l10n/sk_SK.php
+++ b/apps/files_encryption/l10n/sk_SK.php
@@ -1,11 +1,27 @@
 <?php $TRANSLATIONS = array(
+"Recovery key successfully enabled" => "Záchranný kľúč bol úspešne povolený",
+"Could not enable recovery key. Please check your recovery key password!" => "Nepodarilo sa povoliť záchranný kľúč. Skontrolujte prosím Vaše heslo záchranného kľúča!",
+"Recovery key successfully disabled" => "Záchranný kľúč bol úspešne zakázaný",
+"Could not disable recovery key. Please check your recovery key password!" => "Nepodarilo sa zakázať záchranný kľúč. Skontrolujte prosím Vaše heslo záchranného kľúča!",
 "Password successfully changed." => "Heslo úspešne zmenené.",
+"Could not change the password. Maybe the old password was not correct." => "Nemožno zmeniť heslo. Pravdepodobne nebolo staré heslo zadané správne.",
+"Private key password successfully updated." => "Heslo súkromného kľúča je úspešne aktualizované.",
+"Could not update the private key password. Maybe the old password was not correct." => "Nemožno aktualizovať heslo súkromného kľúča. Možno nebolo staré heslo správne.",
 "Saving..." => "Ukladám...",
+"Your private key is not valid! Maybe the your password was changed from outside." => "Váš súkromný kľúč je neplatný. Možno bolo Vaše heslo zmenené z vonku.",
+"personal settings" => "osobné nastavenia",
 "Encryption" => "Å ifrovanie",
 "Enabled" => "Povolené",
 "Disabled" => "Zakázané",
-"Change encryption passwords recovery key:" => "Zmeniť šifrovacie heslo obnovovacieho kľúča:",
 "Change Password" => "Zmeniť heslo",
+"Your private key password no longer match your log-in password:" => "Vaše heslo súkromného kľúča je rovnaké ako Vaše prihlasovacie heslo:",
+"Set your old private key password to your current log-in password." => "Nastavte si staré heslo súkromného kľúča k Vášmu súčasnému prihlasovaciemu heslu.",
+" If you don't remember your old password you can ask your administrator to recover your files." => "Ak si nepamätáte svoje staré heslo, môžete požiadať správcu o obnovenie svojich súborov.",
+"Old log-in password" => "Staré prihlasovacie heslo",
+"Current log-in password" => "Súčasné prihlasovacie heslo",
+"Update Private Key Password" => "Aktualizovať heslo súkromného kľúča",
+"Enable password recovery:" => "Povoliť obnovu hesla:",
+"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Povolenie Vám umožní znovu získať prístup k Vašim zašifrovaným súborom, ak stratíte heslo",
 "File recovery settings updated" => "Nastavenie obnovy súborov aktualizované",
 "Could not update file recovery" => "Nemožno aktualizovať obnovenie súborov"
 );
diff --git a/apps/files_encryption/l10n/sl.php b/apps/files_encryption/l10n/sl.php
index a420fe161df70546ca28d4c307553d039bccca39..8b28ba011558afb74eae6f4af23926550322336f 100644
--- a/apps/files_encryption/l10n/sl.php
+++ b/apps/files_encryption/l10n/sl.php
@@ -1,4 +1,34 @@
 <?php $TRANSLATIONS = array(
+"Recovery key successfully enabled" => "Ključ za obnovitev gesla je bil uspešno nastavljen",
+"Could not enable recovery key. Please check your recovery key password!" => "Ključa za obnovitev gesla ni bilo mogoče nastaviti. Preverite ključ!",
+"Recovery key successfully disabled" => "Ključ za obnovitev gesla je bil uspešno onemogočen",
+"Could not disable recovery key. Please check your recovery key password!" => "Ključa za obnovitev gesla ni bilo mogoče onemogočiti. Preverite ključ!",
+"Password successfully changed." => "Geslo je bilo uspešno spremenjeno.",
+"Could not change the password. Maybe the old password was not correct." => "Gesla ni bilo mogoče spremeniti. Morda vnos starega gesla ni bil pravilen.",
+"Private key password successfully updated." => "Zasebni ključ za geslo je bil uspešno posodobljen.",
+"Could not update the private key password. Maybe the old password was not correct." => "Zasebnega ključa za geslo ni bilo mogoče posodobiti. Morda vnos starega gesla ni bil pravilen.",
+"Your private key is not valid! Likely your password was changed outside the ownCloud system (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Vaš zasebni ključ ni veljaven. Morda je bilo vaše geslo spremenjeno zunaj sistema ownCloud (npr. v skupnem imeniku). Svoj zasebni ključ, ki vam bo omogočil dostop do šifriranih dokumentov, lahko posodobite v osebnih nastavitvah.",
 "Saving..." => "Poteka shranjevanje ...",
-"Encryption" => "Å ifriranje"
+"Your private key is not valid! Maybe the your password was changed from outside." => "Vaš zasebni ključ ni veljaven. Morda je bilo vaše geslo spremenjeno.",
+"You can unlock your private key in your " => "Svoj zasebni ključ lahko odklenite v",
+"personal settings" => "osebne nastavitve",
+"Encryption" => "Å ifriranje",
+"Enable recovery key (allow to recover users files in case of password loss):" => "Omogoči ključ za obnovitev datotek (v primeru izgube gesla)",
+"Recovery key password" => "Ključ za obnovitev gesla",
+"Enabled" => "Omogočeno",
+"Disabled" => "Onemogočeno",
+"Change recovery key password:" => "Spremeni ključ za obnovitev gesla:",
+"Old Recovery key password" => "Stari ključ za obnovitev gesla",
+"New Recovery key password" => "Nov ključ za obnovitev gesla",
+"Change Password" => "Spremeni geslo",
+"Your private key password no longer match your log-in password:" => "Vaš zasebni ključ za geslo se ne ujema z vnešenim geslom ob prijavi:",
+"Set your old private key password to your current log-in password." => "Nastavite svoj star zasebni ključ v geslo, vnešeno ob prijavi.",
+" If you don't remember your old password you can ask your administrator to recover your files." => "Če ste svoje geslo pozabili, lahko vaše datoteke obnovi skrbnik sistema.",
+"Old log-in password" => "Staro geslo",
+"Current log-in password" => "Trenutno geslo",
+"Update Private Key Password" => "Posodobi zasebni ključ",
+"Enable password recovery:" => "Omogoči obnovitev gesla:",
+"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Nastavitev te možnosti omogoča ponovno pridobitev dostopa do šifriranih datotek, v primeru da boste geslo pozabili.",
+"File recovery settings updated" => "Nastavitve obnavljanja dokumentov so bile posodobljene",
+"Could not update file recovery" => "Nastavitev za obnavljanje dokumentov ni bilo mogoče posodobiti"
 );
diff --git a/apps/files_encryption/l10n/sv.php b/apps/files_encryption/l10n/sv.php
index 7d17a0adc60b1d0f6308ab1ce8a6e0176cb770ce..3659e22bb4ea133940492a327947885338908573 100644
--- a/apps/files_encryption/l10n/sv.php
+++ b/apps/files_encryption/l10n/sv.php
@@ -7,19 +7,19 @@
 "Could not change the password. Maybe the old password was not correct." => "Kunde inte ändra lösenordet. Kanske det gamla lösenordet inte var rätt.",
 "Private key password successfully updated." => "Den privata lösenordsnyckeln uppdaterades utan problem.",
 "Could not update the private key password. Maybe the old password was not correct." => "Kunde inte uppdatera den privata lösenordsnyckeln. Kanske var det gamla lösenordet fel.",
-"Your private key is not valid! Maybe your password was changed from outside. You can update your private key password in your personal settings to regain access to your files" => "Din privata lösenordsnyckel är inte giltig! Kanske byttes ditt lösenord från utsidan. Du kan uppdatera din privata lösenordsnyckel under dina personliga inställningar för att återfå tillgång till dina filer",
+"Your private key is not valid! Likely your password was changed outside the ownCloud system (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Din privata lösenordsnyckel är inte giltig! Troligen har ditt lösenord ändrats utanför ownCloud (t.ex. i företagets katalogtjänst). Du kan uppdatera den privata lösenordsnyckeln under dina personliga inställningar för att återfå tillgång till dina filer.",
 "Saving..." => "Sparar...",
 "Your private key is not valid! Maybe the your password was changed from outside." => "Din privata lösenordsnyckel är inte giltig! Kanske byttes ditt lösenord från utsidan.",
 "You can unlock your private key in your " => "Du kan låsa upp din privata nyckel i dina",
 "personal settings" => "personliga inställningar",
 "Encryption" => "Kryptering",
-"Enable encryption passwords recovery key (allow sharing to recovery key):" => "Aktivera återställningsnyckel för krypterade lösenord. (tillåt delning till återställningsnyckeln):",
-"Recovery account password" => "Återställning av kontolösenord",
+"Enable recovery key (allow to recover users files in case of password loss):" => "Aktivera lösenordsnyckel (för att kunna återfå användarens filer vid glömt eller förlorat lösenord):",
+"Recovery key password" => "Lösenordsnyckel",
 "Enabled" => "Aktiverad",
 "Disabled" => "Inaktiverad",
-"Change encryption passwords recovery key:" => "Ändra återställningsnyckeln för krypterade lösenord:",
-"Old Recovery account password" => "Gamla lösenordet för återställningskontot",
-"New Recovery account password" => "Nytt återställningslösenord för kontot",
+"Change recovery key password:" => "Ändra lösenordsnyckel:",
+"Old Recovery key password" => "Gammal lösenordsnyckel",
+"New Recovery key password" => "Ny lösenordsnyckel",
 "Change Password" => "Byt lösenord",
 "Your private key password no longer match your log-in password:" => "Din privata lösenordsnyckel stämmer inte längre överrens med ditt inloggningslösenord:",
 "Set your old private key password to your current log-in password." => "Ställ in din gamla privata lösenordsnyckel till ditt aktuella inloggningslösenord.",
@@ -28,6 +28,7 @@
 "Current log-in password" => "Nuvarande inloggningslösenord",
 "Update Private Key Password" => "Uppdatera den privata lösenordsnyckeln",
 "Enable password recovery:" => "Aktivera lösenordsåterställning",
+"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Genom att aktivera detta alternativ kommer du kunna återfå tillgång till dina krypterade filer om du skulle förlora/glömma ditt lösenord",
 "File recovery settings updated" => "Inställningarna för filåterställning har uppdaterats",
 "Could not update file recovery" => "Kunde inte uppdatera filåterställning"
 );
diff --git a/apps/files_encryption/l10n/tr.php b/apps/files_encryption/l10n/tr.php
index 59b91de928a721ef22cba2fb3a1fd1494cff1231..24c6fa472782376a2373f1709b05038253cb9cdc 100644
--- a/apps/files_encryption/l10n/tr.php
+++ b/apps/files_encryption/l10n/tr.php
@@ -7,13 +7,8 @@
 "Could not change the password. Maybe the old password was not correct." => "Parola değiştirilemedi. Eski parolanız doğru olmayabilir",
 "Saving..." => "Kaydediliyor...",
 "Encryption" => "Åžifreleme",
-"Enable encryption passwords recovery key (allow sharing to recovery key):" => "Şifreli parola kurtarma anahtarını etkinleştir(kurtarma anahtarı paylaşımına izin ver)",
-"Recovery account password" => "Kurtarma hesabı parolası",
 "Enabled" => "EtkinleÅŸtirildi",
 "Disabled" => "Devre dışı",
-"Change encryption passwords recovery key:" => "Şifreli parolalar kurtarma anahtarını değiştir:",
-"Old Recovery account password" => "Eski kurtarma hesabı parolası",
-"New Recovery account password" => "Yeni kurtarma hesabı parolası",
 "Change Password" => "Parola deÄŸiÅŸtir",
 "File recovery settings updated" => "Dosya kurtarma ayarları güncellendi",
 "Could not update file recovery" => "Dosya kurtarma güncellenemedi"
diff --git a/apps/files_encryption/l10n/vi.php b/apps/files_encryption/l10n/vi.php
index 3e76060b1deaf4706db968ad8466e6a57462fa4b..d11569bb94c443a971dc08716f9467a2571cdad8 100644
--- a/apps/files_encryption/l10n/vi.php
+++ b/apps/files_encryption/l10n/vi.php
@@ -3,7 +3,6 @@
 "Could not change the password. Maybe the old password was not correct." => "Không thể đổi mật khẩu. Có lẽ do mật khẩu cũ không đúng.",
 "Saving..." => "Đang lưu...",
 "Encryption" => "Mã hóa",
-"Recovery account password" => "Mật khẩu cho tài khoản cứu hộ",
 "Enabled" => "Bật",
 "Disabled" => "Tắt",
 "Change Password" => "Đổi Mật khẩu"
diff --git a/apps/files_encryption/l10n/zh_CN.php b/apps/files_encryption/l10n/zh_CN.php
index c64ae9dcd4821bf8b17ceb8b82dcc04a0dda1889..a3939165c7a74d247a61ddf9f3d16f5caf6a44fa 100644
--- a/apps/files_encryption/l10n/zh_CN.php
+++ b/apps/files_encryption/l10n/zh_CN.php
@@ -5,16 +5,30 @@
 "Could not disable recovery key. Please check your recovery key password!" => "不能禁用恢复密钥。请检查恢复密钥密码！",
 "Password successfully changed." => "密码修改成功。",
 "Could not change the password. Maybe the old password was not correct." => "不能修改密码。旧密码可能不正确。",
+"Private key password successfully updated." => "私钥密码成功更新。",
+"Could not update the private key password. Maybe the old password was not correct." => "无法更新私钥密码。可能旧密码不正确。",
+"Your private key is not valid! Likely your password was changed outside the ownCloud system (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "您的私有密钥无效！也许是您在 ownCloud 系统外更改了密码 (比如，在您的公司目录)。您可以在个人设置里更新您的私钥密码来恢复访问你的加密文件。",
 "Saving..." => "保存中",
+"Your private key is not valid! Maybe the your password was changed from outside." => "您的私钥不正确！可能您在别处更改了密码。",
+"You can unlock your private key in your " => "您可以在这里解锁您的私钥：",
+"personal settings" => "个人设置",
 "Encryption" => "加密",
-"Enable encryption passwords recovery key (allow sharing to recovery key):" => "启用加密密码恢复密钥（允许共享恢复密钥）：",
-"Recovery account password" => "恢复账户密码",
+"Enable recovery key (allow to recover users files in case of password loss):" => "启用恢复密钥（允许你在密码丢失后恢复文件）：",
+"Recovery key password" => "恢复密钥密码",
 "Enabled" => "开启",
 "Disabled" => "禁用",
-"Change encryption passwords recovery key:" => "变更加密密码恢复密钥：",
-"Old Recovery account password" => "旧恢复账号密码",
-"New Recovery account password" => "新恢复账号密码",
+"Change recovery key password:" => "更改恢复密钥密码",
+"Old Recovery key password" => "旧的恢复密钥密码",
+"New Recovery key password" => "新的恢复密钥密码",
 "Change Password" => "修改密码",
+"Your private key password no longer match your log-in password:" => "您的私钥密码不再匹配您的登录密码：",
+"Set your old private key password to your current log-in password." => "讲您旧的私钥密码改为当前登录密码。",
+" If you don't remember your old password you can ask your administrator to recover your files." => "如果您记不住旧的密码，您可以请求管理员恢复您的文件。",
+"Old log-in password" => "旧登录密码",
+"Current log-in password" => "当前登录密码",
+"Update Private Key Password" => "更新私钥密码",
+"Enable password recovery:" => "启用密码恢复：",
+"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "启用该项将允许你在密码丢失后取回您的加密文件",
 "File recovery settings updated" => "文件恢复设置已更新",
 "Could not update file recovery" => "不能更新文件恢复"
 );
diff --git a/apps/files_encryption/l10n/zh_TW.php b/apps/files_encryption/l10n/zh_TW.php
index 77efdb3e566cc47ded80945b44cfec9cbb76a5aa..d34f51c4870bb6ad4f4217c49b8c68e70bbe63fe 100644
--- a/apps/files_encryption/l10n/zh_TW.php
+++ b/apps/files_encryption/l10n/zh_TW.php
@@ -5,7 +5,6 @@
 "Encryption" => "加密",
 "Enabled" => "已啓用",
 "Disabled" => "已停用",
-"Change encryption passwords recovery key:" => "變更加密密碼還原金鑰：",
 "Change Password" => "變更密碼",
 "File recovery settings updated" => "檔案還原設定已更新",
 "Could not update file recovery" => "無法更新檔案還原設定"
diff --git a/apps/files_encryption/lib/crypt.php b/apps/files_encryption/lib/crypt.php
index 945b342a3163b36a7194b60938150e2f7aebfad4..6543a0de5f3b94b8a059e0bf01f1b1a32260041d 100755
--- a/apps/files_encryption/lib/crypt.php
+++ b/apps/files_encryption/lib/crypt.php
@@ -51,21 +51,28 @@ class Crypt {
 	 */
 	public static function createKeypair() {
 
-		$res = openssl_pkey_new(array('private_key_bits' => 4096));
-
-		// Get private key
-		openssl_pkey_export($res, $privateKey);
-
-		// Get public key
-		$publicKey = openssl_pkey_get_details($res);
+		$return = false;
 
-		$publicKey = $publicKey['key'];
+		$res = openssl_pkey_new(array('private_key_bits' => 4096));
 
-		return (array(
-			'publicKey' => $publicKey,
-			'privateKey' => $privateKey
-		));
+		if ($res === false) {
+			\OCP\Util::writeLog('Encryption library', 'couldn\'t generate users key-pair for ' . \OCP\User::getUser(), \OCP\Util::ERROR);
+			\OCP\Util::writeLog('Encryption library', openssl_error_string(), \OCP\Util::ERROR);
+		} elseif (openssl_pkey_export($res, $privateKey)) {
+			// Get public key
+			$keyDetails = openssl_pkey_get_details($res);
+			$publicKey = $keyDetails['key'];
+
+			$return = array(
+				'publicKey' => $publicKey,
+				'privateKey' => $privateKey
+			);
+		} else {
+			\OCP\Util::writeLog('Encryption library', 'couldn\'t export users private key, please check your servers openSSL configuration.' . \OCP\User::getUser(), \OCP\Util::ERROR);
+			\OCP\Util::writeLog('Encryption library', openssl_error_string(), \OCP\Util::ERROR);
+		}
 
+		return $return;
 	}
 
 	/**
@@ -201,13 +208,10 @@ class Crypt {
 	public static function encrypt($plainContent, $iv, $passphrase = '') {
 
 		if ($encryptedContent = openssl_encrypt($plainContent, 'AES-128-CFB', $passphrase, false, $iv)) {
-
 			return $encryptedContent;
-
 		} else {
-
 			\OCP\Util::writeLog('Encryption library', 'Encryption (symmetric) of content failed', \OCP\Util::ERROR);
-
+			\OCP\Util::writeLog('Encryption library', openssl_error_string(), \OCP\Util::ERROR);
 			return false;
 
 		}
@@ -287,28 +291,22 @@ class Crypt {
 	public static function symmetricEncryptFileContent($plainContent, $passphrase = '') {
 
 		if (!$plainContent) {
-
+			\OCP\Util::writeLog('Encryption library', 'symmetrically encryption failed, no content given.', \OCP\Util::ERROR);
 			return false;
-
 		}
 
 		$iv = self::generateIv();
 
 		if ($encryptedContent = self::encrypt($plainContent, $iv, $passphrase)) {
-
 			// Combine content to encrypt with IV identifier and actual IV
 			$catfile = self::concatIv($encryptedContent, $iv);
-
 			$padded = self::addPadding($catfile);
 
 			return $padded;
 
 		} else {
-
 			\OCP\Util::writeLog('Encryption library', 'Encryption (symmetric) of keyfile content failed', \OCP\Util::ERROR);
-
 			return false;
-
 		}
 
 	}
diff --git a/apps/files_encryption/lib/helper.php b/apps/files_encryption/lib/helper.php
index a22c139c503cb694f859e5efec633f3f9d8423c5..6eee8fed6a63932b01071dc0b173ee8041dc6f1a 100755
--- a/apps/files_encryption/lib/helper.php
+++ b/apps/files_encryption/lib/helper.php
@@ -62,6 +62,15 @@ class Helper {
 		\OCP\Util::connectHook('OC_Filesystem', 'post_rename', 'OCA\Encryption\Hooks', 'postRename');
 	}
 
+	/**
+	 * @brief register app management related hooks
+	 *
+	 */
+	public static function registerAppHooks() {
+
+		\OCP\Util::connectHook('OC_App', 'pre_disable', 'OCA\Encryption\Hooks', 'preDisable');
+	}
+
 	/**
 	 * @brief setup user for files_encryption
 	 *
@@ -123,7 +132,7 @@ class Helper {
 
 			$view->file_put_contents('/public-keys/' . $recoveryKeyId . '.public.key', $keypair['publicKey']);
 
-			// Encrypt private key empthy passphrase
+			// Encrypt private key empty passphrase
 			$encryptedPrivateKey = \OCA\Encryption\Crypt::symmetricEncryptFileContent($keypair['privateKey'], $recoveryPassword);
 
 			// Save private key
@@ -208,4 +217,29 @@ class Helper {
 		header('Location: ' . $location . '?p=' . $post);
 		exit();
 	}
-}
\ No newline at end of file
+
+	/**
+	 * check requirements for encryption app.
+	 * @return bool true if requirements are met
+	 */
+	public static function checkRequirements() {
+		$result = true;
+
+		//openssl extension needs to be loaded
+		$result &= extension_loaded("openssl");
+		// we need php >= 5.3.3
+		$result &= version_compare(phpversion(), '5.3.3', '>=');
+
+		return (bool) $result;
+	}
+
+	/**
+	 * @brief glob uses different pattern than regular expressions, escape glob pattern only
+	 * @param unescaped path
+	 * @return escaped path
+	 */
+	public static function escapeGlobPattern($path) {
+		return preg_replace('/(\*|\?|\[)/', '[$1]', $path);
+	}
+}
+
diff --git a/apps/files_encryption/lib/keymanager.php b/apps/files_encryption/lib/keymanager.php
index e911c1785df5f74c89eecc8abd679b4e8b5f0bcb..b2fd650f18df497064db867f92048bef39bcddbe 100755
--- a/apps/files_encryption/lib/keymanager.php
+++ b/apps/files_encryption/lib/keymanager.php
@@ -126,7 +126,12 @@ class Keymanager {
 		$util = new Util($view, \OCP\User::getUser());
 		list($owner, $filename) = $util->getUidAndFilename($path);
 
-		$basePath = '/' . $owner . '/files_encryption/keyfiles';
+		// in case of system wide mount points the keys are stored directly in the data directory
+		if ($util->isSystemWideMountPoint($filename)) {
+			$basePath = '/files_encryption/keyfiles';
+		} else {
+			$basePath = '/' . $owner . '/files_encryption/keyfiles';
+		}
 
 		$targetPath = self::keySetPreparation($view, $filename, $basePath, $owner);
 
@@ -233,7 +238,12 @@ class Keymanager {
 		list($owner, $filename) = $util->getUidAndFilename($filePath);
 		$filePath_f = ltrim($filename, '/');
 
-		$keyfilePath = '/' . $owner . '/files_encryption/keyfiles/' . $filePath_f . '.key';
+		// in case of system wide mount points the keys are stored directly in the data directory
+		if ($util->isSystemWideMountPoint($filename)) {
+			$keyfilePath = '/files_encryption/keyfiles/' . $filePath_f . '.key';
+		} else {
+			$keyfilePath = '/' . $owner . '/files_encryption/keyfiles/' . $filePath_f . '.key';
+		}
 
 		$proxyStatus = \OC_FileProxy::$enabled;
 		\OC_FileProxy::$enabled = false;
@@ -267,7 +277,14 @@ class Keymanager {
 	public static function deleteFileKey(\OC_FilesystemView $view, $userId, $path) {
 
 		$trimmed = ltrim($path, '/');
-		$keyPath = '/' . $userId . '/files_encryption/keyfiles/' . $trimmed;
+
+		$util = new Util($view, \OCP\User::getUser());
+
+		if($util->isSystemWideMountPoint($path)) {
+			$keyPath = '/files_encryption/keyfiles/' . $trimmed;
+		} else {
+			$keyPath = '/' . $userId . '/files_encryption/keyfiles/' . $trimmed;
+		}
 
 		$result = false;
 
@@ -325,57 +342,26 @@ class Keymanager {
 	 * @brief store share key
 	 *
 	 * @param \OC_FilesystemView $view
-	 * @param string $path relative path of the file, including filename
-	 * @param $userId
+	 * @param string $path where the share key is stored
 	 * @param $shareKey
-	 * @internal param string $key
-	 * @internal param string $dbClassName
 	 * @return bool true/false
 	 * @note The keyfile is not encrypted here. Client code must
 	 * asymmetrically encrypt the keyfile before passing it to this method
 	 */
-	public static function setShareKey(\OC_FilesystemView $view, $path, $userId, $shareKey) {
-
-		// Here we need the currently logged in user, while userId can be a different user
-		$util = new Util($view, \OCP\User::getUser());
-
-		list($owner, $filename) = $util->getUidAndFilename($path);
-
-		$basePath = '/' . $owner . '/files_encryption/share-keys';
-
-		$shareKeyPath = self::keySetPreparation($view, $filename, $basePath, $owner);
-
-		// try reusing key file if part file
-		if (self::isPartialFilePath($shareKeyPath)) {
-
-			$writePath = $basePath . '/' . self::fixPartialFilePath($shareKeyPath) . '.' . $userId . '.shareKey';
-
-		} else {
-
-			$writePath = $basePath . '/' . $shareKeyPath . '.' . $userId . '.shareKey';
-
-		}
+	private static function setShareKey(\OC_FilesystemView $view, $path, $shareKey) {
 
 		$proxyStatus = \OC_FileProxy::$enabled;
 		\OC_FileProxy::$enabled = false;
 
-		$result = $view->file_put_contents($writePath, $shareKey);
+		$result = $view->file_put_contents($path, $shareKey);
 
 		\OC_FileProxy::$enabled = $proxyStatus;
 
-		if (
-			is_int($result)
-			&& $result > 0
-		) {
-
+		if (is_int($result) && $result > 0) {
 			return true;
-
 		} else {
-
 			return false;
-
 		}
-
 	}
 
 	/**
@@ -389,23 +375,40 @@ class Keymanager {
 
 		// $shareKeys must be  an array with the following format:
 		// [userId] => [encrypted key]
+		// Here we need the currently logged in user, while userId can be a different user
+		$util = new Util($view, \OCP\User::getUser());
+
+		list($owner, $filename) = $util->getUidAndFilename($path);
+
+		// in case of system wide mount points the keys are stored directly in the data directory
+		if ($util->isSystemWideMountPoint($filename)) {
+			$basePath = '/files_encryption/share-keys';
+		} else {
+			$basePath = '/' . $owner . '/files_encryption/share-keys';
+		}
+
+		$shareKeyPath = self::keySetPreparation($view, $filename, $basePath, $owner);
 
 		$result = true;
 
 		foreach ($shareKeys as $userId => $shareKey) {
 
-			if (!self::setShareKey($view, $path, $userId, $shareKey)) {
+			// try reusing key file if part file
+			if (self::isPartialFilePath($shareKeyPath)) {
+				$writePath = $basePath . '/' . self::fixPartialFilePath($shareKeyPath) . '.' . $userId . '.shareKey';
+			} else {
+				$writePath = $basePath . '/' . $shareKeyPath . '.' . $userId . '.shareKey';
+			}
+
+			if (!self::setShareKey($view, $writePath, $shareKey)) {
 
 				// If any of the keys are not set, flag false
 				$result = false;
-
 			}
-
 		}
 
 		// Returns false if any of the keys weren't set
 		return $result;
-
 	}
 
 	/**
@@ -440,8 +443,13 @@ class Keymanager {
 		$util = new Util($view, \OCP\User::getUser());
 
 		list($owner, $filename) = $util->getUidAndFilename($filePath);
-		$shareKeyPath = \OC\Files\Filesystem::normalizePath(
-			'/' . $owner . '/files_encryption/share-keys/' . $filename . '.' . $userId . '.shareKey');
+
+		// in case of system wide mount points the keys are stored directly in the data directory
+		if ($util->isSystemWideMountPoint($filename)) {
+			$shareKeyPath = '/files_encryption/share-keys/' . $filename . '.' . $userId . '.shareKey';
+		} else {
+			$shareKeyPath = '/' . $owner . '/files_encryption/share-keys/' . $filename . '.' . $userId . '.shareKey';
+		}
 
 		if ($view->file_exists($shareKeyPath)) {
 
@@ -467,11 +475,21 @@ class Keymanager {
 	 */
 	public static function delAllShareKeys(\OC_FilesystemView $view, $userId, $filePath) {
 
+		$util = new util($view, $userId);
+
+		if ($util->isSystemWideMountPoint($filePath)) {
+			$baseDir = '/files_encryption/share-keys/';
+		} else {
+			$baseDir = $userId . '/files_encryption/share-keys/';
+		}
+
+
 		if ($view->is_dir($userId . '/files/' . $filePath)) {
-			$view->unlink($userId . '/files_encryption/share-keys/' . $filePath);
+			$view->unlink($baseDir . $filePath);
 		} else {
-			$localKeyPath = $view->getLocalFile($userId . '/files_encryption/share-keys/' . $filePath);
-			$matches = glob(preg_quote($localKeyPath) . '*.shareKey');
+			$localKeyPath = $view->getLocalFile($baseDir . $filePath);
+			$escapedPath = Helper::escapeGlobPattern($localKeyPath);
+			$matches = glob($escapedPath . '*.shareKey');
 			foreach ($matches as $ma) {
 				$result = unlink($ma);
 				if (!$result) {
@@ -495,7 +513,11 @@ class Keymanager {
 
 		list($owner, $filename) = $util->getUidAndFilename($filePath);
 
-		$shareKeyPath = \OC\Files\Filesystem::normalizePath('/' . $owner . '/files_encryption/share-keys/' . $filename);
+		if ($util->isSystemWideMountPoint($filename)) {
+			$shareKeyPath = \OC\Files\Filesystem::normalizePath('/files_encryption/share-keys/' . $filename);
+		} else {
+			$shareKeyPath = \OC\Files\Filesystem::normalizePath('/' . $owner . '/files_encryption/share-keys/' . $filename);
+		}
 
 		if ($view->is_dir($shareKeyPath)) {
 
@@ -526,7 +548,10 @@ class Keymanager {
 	 */
 	private static function recursiveDelShareKeys($dir, $userIds) {
 		foreach ($userIds as $userId) {
-			$matches = glob(preg_quote($dir) . '/*' . preg_quote('.' . $userId . '.shareKey'));
+			$extension = '.' . $userId . '.shareKey';
+			$escapedDir = Helper::escapeGlobPattern($dir);
+			$escapedExtension = Helper::escapeGlobPattern($extension);
+			$matches = glob($escapedDir . '/*' . $escapedExtension);
 		}
 		/** @var $matches array */
 		foreach ($matches as $ma) {
@@ -535,7 +560,7 @@ class Keymanager {
 					'Could not delete shareKey; does not exist: "' . $ma . '"', \OCP\Util::ERROR);
 			}
 		}
-		$subdirs = $directories = glob(preg_quote($dir) . '/*', GLOB_ONLYDIR);
+		$subdirs = $directories = glob($escapedDir . '/*', GLOB_ONLYDIR);
 		foreach ($subdirs as $subdir) {
 			self::recursiveDelShareKeys($subdir, $userIds);
 		}
diff --git a/apps/files_encryption/lib/util.php b/apps/files_encryption/lib/util.php
index b4b3923a799ef95250a5a330bc5caaf19939f53c..50e823585d76aa5d7ba3d42cc207ddea9912dd01 100644
--- a/apps/files_encryption/lib/util.php
+++ b/apps/files_encryption/lib/util.php
@@ -228,18 +228,21 @@ class Util {
 			// Generate keypair
 			$keypair = Crypt::createKeypair();
 
-			\OC_FileProxy::$enabled = false;
+			if ($keypair) {
 
-			// Save public key
-			$this->view->file_put_contents($this->publicKeyPath, $keypair['publicKey']);
+				\OC_FileProxy::$enabled = false;
 
-			// Encrypt private key with user pwd as passphrase
-			$encryptedPrivateKey = Crypt::symmetricEncryptFileContent($keypair['privateKey'], $passphrase);
+				// Encrypt private key with user pwd as passphrase
+				$encryptedPrivateKey = Crypt::symmetricEncryptFileContent($keypair['privateKey'], $passphrase);
 
-			// Save private key
-			$this->view->file_put_contents($this->privateKeyPath, $encryptedPrivateKey);
+				// Save key-pair
+				if ($encryptedPrivateKey) {
+					$this->view->file_put_contents($this->privateKeyPath, $encryptedPrivateKey);
+					$this->view->file_put_contents($this->publicKeyPath, $keypair['publicKey']);
+				}
 
-			\OC_FileProxy::$enabled = true;
+				\OC_FileProxy::$enabled = true;
+			}
 
 		} else {
 			// check if public-key exists but private-key is missing
@@ -359,17 +362,7 @@ class Util {
 
 		}
 
-		$query = \OCP\DB::prepare($sql);
-
-		if ($query->execute($args)) {
-
-			return true;
-
-		} else {
-
-			return false;
-
-		}
+		return is_numeric(\OC_DB::executeAudited($sql, $args));
 
 	}
 
@@ -999,13 +992,9 @@ class Util {
 			\OC_Appconfig::getValue('files_encryption', 'recoveryAdminEnabled')
 			&& $this->recoveryEnabledForUser()
 		) {
-
 			$recoveryEnabled = true;
-
 		} else {
-
 			$recoveryEnabled = false;
-
 		}
 
 		// Make sure that a share key is generated for the owner too
@@ -1026,20 +1015,25 @@ class Util {
 		// If recovery is enabled, add the 
 		// Admin UID to list of users to share to
 		if ($recoveryEnabled) {
-
 			// Find recoveryAdmin user ID
 			$recoveryKeyId = \OC_Appconfig::getValue('files_encryption', 'recoveryKeyId');
-
 			// Add recoveryAdmin to list of users sharing
 			$userIds[] = $recoveryKeyId;
-
 		}
 
 		// add current user if given
 		if ($currentUserId !== false) {
-
 			$userIds[] = $currentUserId;
+		}
 
+		// check if it is a group mount
+		if (\OCP\App::isEnabled("files_external")) {
+			$mount = \OC_Mount_Config::getSystemMountPoints();
+			foreach ($mount as $mountPoint => $data) {
+				if ($mountPoint == substr($ownerPath, 1, strlen($mountPoint))) {
+					$userIds = array_merge($userIds, $this->getUserWithAccessToMountPoint($data['applicable']['users'], $data['applicable']['groups']));
+				}
+			}
 		}
 
 		// Remove duplicate UIDs
@@ -1049,6 +1043,20 @@ class Util {
 
 	}
 
+	private function getUserWithAccessToMountPoint($users, $groups) {
+		$result = array();
+		if (in_array('all', $users)) {
+			$result = \OCP\User::getUsers();
+		} else {
+			$result = array_merge($result, $users);
+			foreach ($groups as $group) {
+				$result = array_merge($result, \OC_Group::usersInGroup($group));
+			}
+		}
+
+		return $result;
+	}
+
 	/**
 	 * @brief start migration mode to initially encrypt users data
 	 * @return boolean
@@ -1060,8 +1068,7 @@ class Util {
 		$sql = 'UPDATE `*PREFIX*encryption` SET `migration_status` = ? WHERE `uid` = ? and `migration_status` = ?';
 		$args = array(self::MIGRATION_IN_PROGRESS, $this->userId, self::MIGRATION_OPEN);
 		$query = \OCP\DB::prepare($sql);
-		$result = $query->execute($args);
-		$manipulatedRows = $result->numRows();
+		$manipulatedRows = $query->execute($args);
 
 		if ($manipulatedRows === 1) {
 			$return = true;
@@ -1084,8 +1091,7 @@ class Util {
 		$sql = 'UPDATE `*PREFIX*encryption` SET `migration_status` = ? WHERE `uid` = ? and `migration_status` = ?';
 		$args = array(self::MIGRATION_COMPLETED, $this->userId, self::MIGRATION_IN_PROGRESS);
 		$query = \OCP\DB::prepare($sql);
-		$result = $query->execute($args);
-		$manipulatedRows = $result->numRows();
+		$manipulatedRows = $query->execute($args);
 
 		if ($manipulatedRows === 1) {
 			$return = true;
@@ -1188,7 +1194,7 @@ class Util {
 
 			return array(
 				$fileOwnerUid,
-				$filename
+				\OC_Filesystem::normalizePath($filename)
 			);
 		}
 
@@ -1556,4 +1562,21 @@ class Util {
 		return $relativePath;
 	}
 
+	/**
+	 * @brief check if the file is stored on a system wide mount point
+	 * @param $path relative to /data/user with leading '/'
+	 * @return boolean
+	 */
+	public function isSystemWideMountPoint($path) {
+		if (\OCP\App::isEnabled("files_external")) {
+			$mount = \OC_Mount_Config::getSystemMountPoints();
+			foreach ($mount as $mountPoint => $data) {
+				if ($mountPoint == substr($path, 1, strlen($mountPoint))) {
+					return true;
+				}
+			}
+		}
+		return false;
+	}
+
 }
diff --git a/apps/files_encryption/templates/settings-admin.php b/apps/files_encryption/templates/settings-admin.php
index c420b006c4572132b9a58ac87dd7f4129e8a6c56..f5f7582c2a69d141e49232f76e49e9fc14c708ac 100644
--- a/apps/files_encryption/templates/settings-admin.php
+++ b/apps/files_encryption/templates/settings-admin.php
@@ -7,11 +7,11 @@
 		</p>
 
 		<p>
-			<?php p($l->t("Enable encryption passwords recovery key (allow sharing to recovery key):")); ?>
+			<?php p($l->t("Enable recovery key (allow to recover users files in case of password loss):")); ?>
 			<br/>
 			<br/>
 			<input type="password" name="recoveryPassword" id="recoveryPassword"/>
-			<label for="recoveryPassword"><?php p($l->t("Recovery account password")); ?></label>
+			<label for="recoveryPassword"><?php p($l->t("Recovery key password")); ?></label>
 			<br/>
 			<input
 				type='radio'
@@ -31,21 +31,21 @@
 		<br/><br/>
 
 		<p>
-			<strong><?php p($l->t("Change encryption passwords recovery key:")); ?></strong>
+			<strong><?php p($l->t("Change recovery key password:")); ?></strong>
 			<br/><br/>
 			<input
 				type="password"
 				name="changeRecoveryPassword"
 				id="oldRecoveryPassword"
 				<?php echo($_["recoveryEnabled"] == 0 ? 'disabled' : ''); ?> />
-			<label for="oldRecoveryPassword"><?php p($l->t("Old Recovery account password")); ?></label>
+			<label for="oldRecoveryPassword"><?php p($l->t("Old Recovery key password")); ?></label>
 			<br/>
 			<input
 				type="password"
 				name="changeRecoveryPassword"
 				id="newRecoveryPassword"
 				<?php echo($_["recoveryEnabled"] == 0 ? 'disabled' : ''); ?> />
-			<label for="newRecoveryPassword"><?php p($l->t("New Recovery account password")); ?></label>
+			<label for="newRecoveryPassword"><?php p($l->t("New Recovery key password")); ?></label>
 			<br/>
 			<button
 				type="button"
diff --git a/apps/files_encryption/tests/util.php b/apps/files_encryption/tests/util.php
index cb10befc8e479b3de0692f363d397de761d4da43..368b7b3dc3f2a02427fc07d42db7955104463ee4 100755
--- a/apps/files_encryption/tests/util.php
+++ b/apps/files_encryption/tests/util.php
@@ -219,7 +219,7 @@ class Test_Encryption_Util extends \PHPUnit_Framework_TestCase {
 
 		\OC_User::setUserId(\Test_Encryption_Util::TEST_ENCRYPTION_UTIL_USER1);
 
-		$filename = 'tmp-' . time() . '.test';
+		$filename = '/tmp-' . time() . '.test';
 
 		// Disable encryption proxy to prevent recursive calls
 		$proxyStatus = \OC_FileProxy::$enabled;
diff --git a/apps/files_external/l10n/es.php b/apps/files_external/l10n/es.php
index f83562dd643e2b491c219639689e8650da4b7f28..d145a176f7191e13985e8d0f95a26fe91db096c3 100644
--- a/apps/files_external/l10n/es.php
+++ b/apps/files_external/l10n/es.php
@@ -1,12 +1,12 @@
 <?php $TRANSLATIONS = array(
-"Access granted" => "Acceso garantizado",
+"Access granted" => "Acceso concedido",
 "Error configuring Dropbox storage" => "Error configurando el almacenamiento de Dropbox",
-"Grant access" => "Garantizar acceso",
-"Please provide a valid Dropbox app key and secret." => "Por favor , proporcione un secreto y una contraseña válida de la app Dropbox.",
+"Grant access" => "Conceder acceso",
+"Please provide a valid Dropbox app key and secret." => "Por favor, proporcione un una clave válida de la app Dropbox y una clave secreta.",
 "Error configuring Google Drive storage" => "Error configurando el almacenamiento de Google Drive",
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "<b>Advertencia:</b> El cliente smb (smbclient) no se encuentra instalado. El montado de archivos o ficheros CIFS/SMB no es posible. Por favor pida al administrador de su sistema que lo instale.",
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting of FTP shares is not possible. Please ask your system administrator to install it." => "<b>Advertencia:</b> El soporte de FTP en PHP no se encuentra instalado. El montado de archivos o ficheros FTP no es posible. Por favor pida al administrador de su sistema que lo instale.",
-"<b>Warning:</b> The Curl support in PHP is not enabled or installed. Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask your system administrator to install it." => "<b>Advertencia:</b> El soporte de Curl en PHP no está activado ni instalado. El montado de  ownCloud, WebDAV o GoogleDrive no es posible. Pida al administrador de su sistema que lo instale.",
+"<b>Warning:</b> The Curl support in PHP is not enabled or installed. Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask your system administrator to install it." => "<b>Advertencia:</b> El soporte de Curl en PHP no está activado ni instalado. El montado de ownCloud, WebDAV o GoogleDrive no es posible. Pida al administrador de su sistema que lo instale.",
 "External Storage" => "Almacenamiento externo",
 "Folder name" => "Nombre de la carpeta",
 "External storage" => "Almacenamiento externo",
@@ -19,8 +19,8 @@
 "Groups" => "Grupos",
 "Users" => "Usuarios",
 "Delete" => "Eliminar",
-"Enable User External Storage" => "Habilitar almacenamiento de usuario externo",
+"Enable User External Storage" => "Habilitar almacenamiento externo de usuario",
 "Allow users to mount their own external storage" => "Permitir a los usuarios montar su propio almacenamiento externo",
-"SSL root certificates" => "Raíz de certificados SSL  ",
+"SSL root certificates" => "Certificados raíz SSL",
 "Import Root Certificate" => "Importar certificado raíz"
 );
diff --git a/apps/files_external/l10n/eu.php b/apps/files_external/l10n/eu.php
index 83be50deb00e2cbdffcc7b460c62222dd82bdb43..9dc1f3e9c033a63d70988cc672be544ee2812f14 100644
--- a/apps/files_external/l10n/eu.php
+++ b/apps/files_external/l10n/eu.php
@@ -6,6 +6,7 @@
 "Error configuring Google Drive storage" => "Errore bat egon da Google Drive biltegiratzea konfiguratzean",
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "<b>Abisua:</b> \"smbclient\" ez dago instalatuta. CIFS/SMB partekatutako karpetak montatzea ez da posible. Mesedez eskatu zure sistema kudeatzaileari instalatzea.",
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting of FTP shares is not possible. Please ask your system administrator to install it." => "<b>Abisua:</b> PHPren FTP modulua ez dago instalatuta edo gaitua. FTP partekatutako karpetak montatzea ez da posible. Mesedez eskatu zure sistema kudeatzaileari instalatzea.",
+"<b>Warning:</b> The Curl support in PHP is not enabled or installed. Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask your system administrator to install it." => "<b>Abisua:</b> Curl euskarri PHP modulua ez dago instalatuta edo gaitua. Ezinezko da ownCloud /WebDAV GoogleDrive-n muntatzea. Mesedez eskatu sistema kudeatzaileari instala dezan. ",
 "External Storage" => "Kanpoko Biltegiratzea",
 "Folder name" => "Karpetaren izena",
 "External storage" => "Kanpoko biltegiratzea",
diff --git a/apps/files_external/l10n/fa.php b/apps/files_external/l10n/fa.php
index 1921ba9f2aebc217c287ab8204ddba0dbe40a376..91f463ba230f6051a692080bed3e55922e4d3435 100644
--- a/apps/files_external/l10n/fa.php
+++ b/apps/files_external/l10n/fa.php
@@ -1,5 +1,6 @@
 <?php $TRANSLATIONS = array(
 "External Storage" => "حافظه خارجی",
+"Folder name" => "نام پوشه",
 "Configuration" => "پیکربندی",
 "Options" => "تنظیمات",
 "Applicable" => "قابل اجرا",
diff --git a/apps/files_external/l10n/ko.php b/apps/files_external/l10n/ko.php
index 47de9aad5e0ff566e4812e0f00be6136605133d6..803b489c218313cae5ce99d463eebee15e753d59 100644
--- a/apps/files_external/l10n/ko.php
+++ b/apps/files_external/l10n/ko.php
@@ -6,11 +6,14 @@
 "Error configuring Google Drive storage" => "Google 드라이브 저장소 설정 오류",
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "<b>경고:</b> \"smbclient\"가 설치되지 않았습니다. CIFS/SMB 공유 자원에 연결할 수 없습니다. 시스템 관리자에게 설치를 요청하십시오.",
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting of FTP shares is not possible. Please ask your system administrator to install it." => "<b>경고:</b> PHP FTP 지원이 비활성화되어 있거나 설치되지 않았습니다. FTP 공유를 마운트할 수 없습니다. 시스템 관리자에게 설치를 요청하십시오.",
+"<b>Warning:</b> The Curl support in PHP is not enabled or installed. Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask your system administrator to install it." => "<b>경고:</b> PHP Curl 지원이 비활성화되어 있거나 설치되지 않았습니다. 다른 ownCloud, WebDAV, Google 드라이브 공유를 마운트할 수 없습니다. 시스템 관리자에게 설치를 요청하십시오.",
 "External Storage" => "외부 저장소",
 "Folder name" => "폴더 이름",
+"External storage" => "외부 저장소",
 "Configuration" => "설정",
 "Options" => "옵션",
 "Applicable" => "적용 가능",
+"Add storage" => "저장소 추가",
 "None set" => "설정되지 않음",
 "All Users" => "모든 사용자",
 "Groups" => "그룹",
diff --git a/apps/files_external/l10n/te.php b/apps/files_external/l10n/te.php
index f557dda5592acf4333c58d020240b7d33c75b100..3d31f6438f586ab936a37a0dca4cf1cc7ccc8e40 100644
--- a/apps/files_external/l10n/te.php
+++ b/apps/files_external/l10n/te.php
@@ -1,4 +1,5 @@
 <?php $TRANSLATIONS = array(
+"Folder name" => "సంచయం పేరు",
 "Users" => "వాడుకరులు",
 "Delete" => "తొలగించు"
 );
diff --git a/apps/files_sharing/css/public.css b/apps/files_sharing/css/public.css
index 13298f113f8f767f707374bffe612f37aa455624..b6511cb57cca2791f5d5eda73a5d01d2004fcdd4 100644
--- a/apps/files_sharing/css/public.css
+++ b/apps/files_sharing/css/public.css
@@ -17,14 +17,29 @@ body {
 
 #details {
 	color:#fff;
+	float: left;
 }
 
-#header #download {
+#public_upload,
+#download {
 	font-weight:700;
-	margin-left:2em;
+	margin: 0 0.4em 0 0;
+	padding: 0 5px;
+	height: 27px;
+	float: left;
+
+}
+
+.header-right #details {
+	margin-right: 2em;
+}
+
+#public_upload {
+	margin-left: 0.3em;
 }
 
-#header #download img {
+#public_upload img,
+#download img {
 	padding-left:.1em;
 	padding-right:.3em;
 	vertical-align:text-bottom;
@@ -73,3 +88,49 @@ thead{
 	background-color: white;
 	padding-left:0 !important; /* fixes multiselect bar offset on shared page */
 }
+
+#data-upload-form {
+	position: relative;
+	right: 0;
+	height: 27px;
+	overflow: hidden;
+	padding: 0;
+	float: right;
+	display: inline;
+	margin: 0;
+}
+
+#file_upload_start {
+	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=0)";
+	filter: alpha(opacity=0);
+	opacity: 0;
+	z-index: 20;
+	position: absolute !important;
+	top: 0;
+	left: 0;
+	width: 100% !important;
+}
+
+#download span {
+	position: relative;
+	bottom: 3px;
+}
+
+#publicUploadButtonMock {
+	position:relative;
+	display:block;
+	width:100%;
+	height:27px;
+	cursor:pointer;
+	z-index:10;
+	background-image:url('%webroot%/core/img/actions/upload.svg');
+	background-repeat:no-repeat;
+	background-position:7px 6px;
+}
+
+#publicUploadButtonMock span {
+	margin: 0 5px 0 28px;
+	position: relative;
+	top: -2px;
+	color: #555;
+}
diff --git a/apps/files_sharing/js/public.js b/apps/files_sharing/js/public.js
index 916e35419c1b4aec563d8ba070d3fde7f3408cf7..294223aa094844640debf983731e83820dfae26f 100644
--- a/apps/files_sharing/js/public.js
+++ b/apps/files_sharing/js/public.js
@@ -7,8 +7,12 @@ function fileDownloadPath(dir, file) {
 	return url;
 }
 
+var form_data;
+
 $(document).ready(function() {
 
+	$('#data-upload-form').tipsy({gravity:'ne', fade:true});
+
 	if (typeof FileActions !== 'undefined') {
 		var mimetype = $('#mimetype').val();
 		// Show file preview if previewer is available, images are already handled by the template
@@ -46,4 +50,19 @@ $(document).ready(function() {
 		});
 	}
 
-});
\ No newline at end of file
+  // Add some form data to the upload handler
+  file_upload_param.formData = {
+    MAX_FILE_SIZE: $('#uploadMaxFilesize').val(),
+    requesttoken: $('#publicUploadRequestToken').val(),
+    dirToken: $('#dirToken').val(),
+    appname: 'files_sharing',
+    subdir: $('input#dir').val()
+  };
+
+  // Add Uploadprogress Wrapper to controls bar
+  $('#controls').append($('#additional_controls div#uploadprogresswrapper'));
+
+  // Cancel upload trigger
+  $('#cancel_upload_button').click(Files.cancelUploads);
+
+});
diff --git a/apps/files_sharing/l10n/ar.php b/apps/files_sharing/l10n/ar.php
index 768df3d16ca9c31df97bf24a87cea85beabb700c..043c7ee1b27781ea5ceb5be6fa4eec1430a0cd3b 100644
--- a/apps/files_sharing/l10n/ar.php
+++ b/apps/files_sharing/l10n/ar.php
@@ -4,5 +4,7 @@
 "%s shared the folder %s with you" => "%s شارك المجلد %s معك",
 "%s shared the file %s with you" => "%s شارك الملف %s معك",
 "Download" => "تحميل",
+"Upload" => "رفع",
+"Cancel upload" => "إلغاء رفع الملفات",
 "No preview available for" => "لا يوجد عرض مسبق لـ"
 );
diff --git a/apps/files_sharing/l10n/bg_BG.php b/apps/files_sharing/l10n/bg_BG.php
index 9fb9f78340b1e261e749e0a88c84f1c6069bf8d2..8e719ba23562924b2b957067e2416d615b9e1d0f 100644
--- a/apps/files_sharing/l10n/bg_BG.php
+++ b/apps/files_sharing/l10n/bg_BG.php
@@ -4,5 +4,7 @@
 "%s shared the folder %s with you" => "%s сподели папката %s с Вас",
 "%s shared the file %s with you" => "%s сподели файла %s с Вас",
 "Download" => "Изтегляне",
+"Upload" => "Качване",
+"Cancel upload" => "Спри качването",
 "No preview available for" => "Няма наличен преглед за"
 );
diff --git a/apps/files_sharing/l10n/bn_BD.php b/apps/files_sharing/l10n/bn_BD.php
index 9fdfee6dfbac7b691a21f36523bb8551888b44bd..baa0c5c707c8af76dc77ab4de89a2cbcc53093f5 100644
--- a/apps/files_sharing/l10n/bn_BD.php
+++ b/apps/files_sharing/l10n/bn_BD.php
@@ -4,5 +4,7 @@
 "%s shared the folder %s with you" => "%s আপনার সাথে %s ফোল্ডারটি ভাগাভাগি করেছেন",
 "%s shared the file %s with you" => "%s আপনার সাথে %s ফাইলটি ভাগাভাগি করেছেন",
 "Download" => "ডাউনলোড",
+"Upload" => "আপলোড",
+"Cancel upload" => "আপলোড বাতিল কর",
 "No preview available for" => "এর জন্য কোন প্রাকবীক্ষণ সুলভ নয়"
 );
diff --git a/apps/files_sharing/l10n/ca.php b/apps/files_sharing/l10n/ca.php
index af924e60dd145a6152b794f7c315b4f0b774cbc3..9d2ab5031c13825586b84f108a69cc2b01812ce7 100644
--- a/apps/files_sharing/l10n/ca.php
+++ b/apps/files_sharing/l10n/ca.php
@@ -1,8 +1,11 @@
 <?php $TRANSLATIONS = array(
+"The password is wrong. Try again." => "la contrasenya és incorrecta. Intenteu-ho de nou.",
 "Password" => "Contrasenya",
 "Submit" => "Envia",
 "%s shared the folder %s with you" => "%s ha compartit la carpeta %s amb vós",
 "%s shared the file %s with you" => "%s ha compartit el fitxer %s amb vós",
 "Download" => "Baixa",
+"Upload" => "Puja",
+"Cancel upload" => "Cancel·la la pujada",
 "No preview available for" => "No hi ha vista prèvia disponible per a"
 );
diff --git a/apps/files_sharing/l10n/cs_CZ.php b/apps/files_sharing/l10n/cs_CZ.php
index 507955d4bd82ca80ca236a8de8844eb1c86030bf..a57764a18bc49a646370a74e12197b5486914a15 100644
--- a/apps/files_sharing/l10n/cs_CZ.php
+++ b/apps/files_sharing/l10n/cs_CZ.php
@@ -4,5 +4,7 @@
 "%s shared the folder %s with you" => "%s s Vámi sdílí složku %s",
 "%s shared the file %s with you" => "%s s Vámi sdílí soubor %s",
 "Download" => "Stáhnout",
+"Upload" => "Odeslat",
+"Cancel upload" => "Zrušit odesílání",
 "No preview available for" => "Náhled není dostupný pro"
 );
diff --git a/apps/files_sharing/l10n/cy_GB.php b/apps/files_sharing/l10n/cy_GB.php
index 292f87a41effb4806bd0b02878b328825bab6fd2..6ff3e274c39af1ceaaf70d0ea43178bcb3ac90c5 100644
--- a/apps/files_sharing/l10n/cy_GB.php
+++ b/apps/files_sharing/l10n/cy_GB.php
@@ -4,5 +4,7 @@
 "%s shared the folder %s with you" => "Rhannodd %s blygell %s â chi",
 "%s shared the file %s with you" => "Rhannodd %s ffeil %s â chi",
 "Download" => "Llwytho i lawr",
+"Upload" => "Llwytho i fyny",
+"Cancel upload" => "Diddymu llwytho i fyny",
 "No preview available for" => "Does dim rhagolwg ar gael ar gyfer"
 );
diff --git a/apps/files_sharing/l10n/da.php b/apps/files_sharing/l10n/da.php
index 55d70fec0521c88b9699f9158c0df3ad9878328d..e3e469a4e51bce6edd12fc221806345b09873091 100644
--- a/apps/files_sharing/l10n/da.php
+++ b/apps/files_sharing/l10n/da.php
@@ -4,5 +4,7 @@
 "%s shared the folder %s with you" => "%s delte mappen %s med dig",
 "%s shared the file %s with you" => "%s delte filen %s med dig",
 "Download" => "Download",
+"Upload" => "Upload",
+"Cancel upload" => "Fortryd upload",
 "No preview available for" => "Forhåndsvisning ikke tilgængelig for"
 );
diff --git a/apps/files_sharing/l10n/de.php b/apps/files_sharing/l10n/de.php
index 90fcdcf0f1bf347edc8f1caaa0348f32250fb8af..0854152907df7c6827b239bed4104c7368f4f2ef 100644
--- a/apps/files_sharing/l10n/de.php
+++ b/apps/files_sharing/l10n/de.php
@@ -4,5 +4,7 @@
 "%s shared the folder %s with you" => "%s hat den Ordner %s mit Dir geteilt",
 "%s shared the file %s with you" => "%s hat die Datei %s mit Dir geteilt",
 "Download" => "Download",
+"Upload" => "Hochladen",
+"Cancel upload" => "Upload abbrechen",
 "No preview available for" => "Es ist keine Vorschau verfügbar für"
 );
diff --git a/apps/files_sharing/l10n/de_DE.php b/apps/files_sharing/l10n/de_DE.php
index 4594c7c248d1d1990141f3d26c0c3adb4499a2a4..cac7b7591d66f560cca368112db490c8c812310d 100644
--- a/apps/files_sharing/l10n/de_DE.php
+++ b/apps/files_sharing/l10n/de_DE.php
@@ -1,8 +1,11 @@
 <?php $TRANSLATIONS = array(
+"The password is wrong. Try again." => "Das Passwort ist falsch. Bitte versuchen Sie es erneut.",
 "Password" => "Passwort",
 "Submit" => "Bestätigen",
 "%s shared the folder %s with you" => "%s hat den Ordner %s mit Ihnen geteilt",
 "%s shared the file %s with you" => "%s hat die Datei %s mit Ihnen geteilt",
 "Download" => "Herunterladen",
+"Upload" => "Hochladen",
+"Cancel upload" => "Upload abbrechen",
 "No preview available for" => "Es ist keine Vorschau verfügbar für"
 );
diff --git a/apps/files_sharing/l10n/el.php b/apps/files_sharing/l10n/el.php
index 28360d03b4edf10bea12e1b689b49723fa0969b0..b7b893537186f831731d6491ee43e00c1a9b17bd 100644
--- a/apps/files_sharing/l10n/el.php
+++ b/apps/files_sharing/l10n/el.php
@@ -4,5 +4,7 @@
 "%s shared the folder %s with you" => "%s μοιράστηκε τον φάκελο %s μαζί σας",
 "%s shared the file %s with you" => "%s μοιράστηκε το αρχείο %s μαζί σας",
 "Download" => "Λήψη",
+"Upload" => "Μεταφόρτωση",
+"Cancel upload" => "Ακύρωση αποστολής",
 "No preview available for" => "Δεν υπάρχει διαθέσιμη προεπισκόπηση για"
 );
diff --git a/apps/files_sharing/l10n/eo.php b/apps/files_sharing/l10n/eo.php
index 5a216f1f1a1dc26166b962baefc796b0f9cc7801..d3ca5370a2c7947efa339341143c66b2d8ecbcf6 100644
--- a/apps/files_sharing/l10n/eo.php
+++ b/apps/files_sharing/l10n/eo.php
@@ -4,5 +4,7 @@
 "%s shared the folder %s with you" => "%s kunhavigis la dosierujon %s kun vi",
 "%s shared the file %s with you" => "%s kunhavigis la dosieron %s kun vi",
 "Download" => "Elŝuti",
+"Upload" => "Alŝuti",
+"Cancel upload" => "Nuligi alŝuton",
 "No preview available for" => "Ne haveblas antaÅ­vido por"
 );
diff --git a/apps/files_sharing/l10n/es.php b/apps/files_sharing/l10n/es.php
index 61794d9c5533449fb3bb497e2bf9dd39acd770da..1b65cf0c1903b13b8df0c056805fc1c55ff51207 100644
--- a/apps/files_sharing/l10n/es.php
+++ b/apps/files_sharing/l10n/es.php
@@ -1,8 +1,11 @@
 <?php $TRANSLATIONS = array(
+"The password is wrong. Try again." => "La contraseña introducida es errónea. Inténtelo de nuevo.",
 "Password" => "Contraseña",
 "Submit" => "Enviar",
 "%s shared the folder %s with you" => "%s compartió la carpeta %s contigo",
 "%s shared the file %s with you" => "%s compartió el fichero %s contigo",
 "Download" => "Descargar",
+"Upload" => "Subir",
+"Cancel upload" => "Cancelar subida",
 "No preview available for" => "No hay vista previa disponible para"
 );
diff --git a/apps/files_sharing/l10n/es_AR.php b/apps/files_sharing/l10n/es_AR.php
index b079d05e52c04c0e80407a529fdae48e84abc353..defbaa7ff92e11964c42213e2803d97460cdb08b 100644
--- a/apps/files_sharing/l10n/es_AR.php
+++ b/apps/files_sharing/l10n/es_AR.php
@@ -4,5 +4,7 @@
 "%s shared the folder %s with you" => "%s compartió la carpeta %s con vos",
 "%s shared the file %s with you" => "%s compartió el archivo %s con vos",
 "Download" => "Descargar",
+"Upload" => "Subir",
+"Cancel upload" => "Cancelar subida",
 "No preview available for" => "La vista preliminar no está disponible para"
 );
diff --git a/apps/files_sharing/l10n/et_EE.php b/apps/files_sharing/l10n/et_EE.php
index b8f6b5ab067ad620f693931ead031ff529e75b9e..78fe436398c7d652a5b07c69a85eaaee173ca1a7 100644
--- a/apps/files_sharing/l10n/et_EE.php
+++ b/apps/files_sharing/l10n/et_EE.php
@@ -1,8 +1,11 @@
 <?php $TRANSLATIONS = array(
+"The password is wrong. Try again." => "Parool on vale. Proovi uuesti.",
 "Password" => "Parool",
 "Submit" => "Saada",
 "%s shared the folder %s with you" => "%s jagas sinuga kausta %s",
 "%s shared the file %s with you" => "%s jagas sinuga faili %s",
 "Download" => "Lae alla",
+"Upload" => "Lae üles",
+"Cancel upload" => "Tühista üleslaadimine",
 "No preview available for" => "Eelvaadet pole saadaval"
 );
diff --git a/apps/files_sharing/l10n/eu.php b/apps/files_sharing/l10n/eu.php
index 614cdc1717def2aeb36a88922f73e1c0da109e16..7a4559cb6556582498caa6127dda0e24fa5b6fb2 100644
--- a/apps/files_sharing/l10n/eu.php
+++ b/apps/files_sharing/l10n/eu.php
@@ -4,5 +4,7 @@
 "%s shared the folder %s with you" => "%sk zurekin %s karpeta elkarbanatu du",
 "%s shared the file %s with you" => "%sk zurekin %s fitxategia elkarbanatu du",
 "Download" => "Deskargatu",
+"Upload" => "Igo",
+"Cancel upload" => "Ezeztatu igoera",
 "No preview available for" => "Ez dago aurrebista eskuragarririk hauentzat "
 );
diff --git a/apps/files_sharing/l10n/fa.php b/apps/files_sharing/l10n/fa.php
index d91daa90ebcc03e46c52e40c2307f54330715bbf..7a744c8463d5cfd44fc1f9b553ad12f46699102f 100644
--- a/apps/files_sharing/l10n/fa.php
+++ b/apps/files_sharing/l10n/fa.php
@@ -1,8 +1,11 @@
 <?php $TRANSLATIONS = array(
+"The password is wrong. Try again." => "رمزعبور اشتباه می باشد. دوباره امتحان کنید.",
 "Password" => "گذرواژه",
 "Submit" => "ثبت",
 "%s shared the folder %s with you" => "%sپوشه %s را با شما به اشتراک گذاشت",
 "%s shared the file %s with you" => "%sفایل %s را با شما به اشتراک گذاشت",
 "Download" => "دانلود",
+"Upload" => "بارگزاری",
+"Cancel upload" => "متوقف کردن بار گذاری",
 "No preview available for" => "هیچگونه پیش نمایشی موجود نیست"
 );
diff --git a/apps/files_sharing/l10n/fi_FI.php b/apps/files_sharing/l10n/fi_FI.php
index 7e9b67de2ca2e0f6ecf7c6fd98e27f66d0d8f381..03931bf29868ed13bd8f95c2998fce8c4e609bca 100644
--- a/apps/files_sharing/l10n/fi_FI.php
+++ b/apps/files_sharing/l10n/fi_FI.php
@@ -4,5 +4,7 @@
 "%s shared the folder %s with you" => "%s jakoi kansion %s kanssasi",
 "%s shared the file %s with you" => "%s jakoi tiedoston %s kanssasi",
 "Download" => "Lataa",
+"Upload" => "Lähetä",
+"Cancel upload" => "Peru lähetys",
 "No preview available for" => "Ei esikatselua kohteelle"
 );
diff --git a/apps/files_sharing/l10n/fr.php b/apps/files_sharing/l10n/fr.php
index b4657978f790c2538bf40d0098903875f8700bde..145880b7e59614df8df99b29c377b9ab9eccb222 100644
--- a/apps/files_sharing/l10n/fr.php
+++ b/apps/files_sharing/l10n/fr.php
@@ -4,5 +4,7 @@
 "%s shared the folder %s with you" => "%s a partagé le répertoire %s avec vous",
 "%s shared the file %s with you" => "%s a partagé le fichier %s avec vous",
 "Download" => "Télécharger",
+"Upload" => "Envoyer",
+"Cancel upload" => "Annuler l'envoi",
 "No preview available for" => "Pas d'aperçu disponible pour"
 );
diff --git a/apps/files_sharing/l10n/gl.php b/apps/files_sharing/l10n/gl.php
index 90f7a22127476048dd6a06e21b0eab0b8b3a75b6..2d8de8e101972f8928909d8be11db12962e2da47 100644
--- a/apps/files_sharing/l10n/gl.php
+++ b/apps/files_sharing/l10n/gl.php
@@ -1,8 +1,11 @@
 <?php $TRANSLATIONS = array(
+"The password is wrong. Try again." => "O contrasinal é incorrecto. Ténteo de novo.",
 "Password" => "Contrasinal",
 "Submit" => "Enviar",
 "%s shared the folder %s with you" => "%s compartiu o cartafol %s con vostede",
 "%s shared the file %s with you" => "%s compartiu o ficheiro %s con vostede",
 "Download" => "Descargar",
+"Upload" => "Enviar",
+"Cancel upload" => "Cancelar o envío",
 "No preview available for" => "Sen vista previa dispoñíbel para"
 );
diff --git a/apps/files_sharing/l10n/he.php b/apps/files_sharing/l10n/he.php
index d0c75e6ba5427160dc096f8c9c6bf278b3f69a65..41fc314f3c2c07bd266f116cc773b812dd7c26ab 100644
--- a/apps/files_sharing/l10n/he.php
+++ b/apps/files_sharing/l10n/he.php
@@ -4,5 +4,7 @@
 "%s shared the folder %s with you" => "%s שיתף עמך את התיקייה %s",
 "%s shared the file %s with you" => "%s שיתף עמך את הקובץ %s",
 "Download" => "הורדה",
+"Upload" => "העלאה",
+"Cancel upload" => "ביטול ההעלאה",
 "No preview available for" => "אין תצוגה מקדימה זמינה עבור"
 );
diff --git a/apps/files_sharing/l10n/hr.php b/apps/files_sharing/l10n/hr.php
index 1d09d09bf5cc8c11d07482896cdbf763ccaddc15..d5763a8ddb8f9ef48be2a8cac0016a7f484c9987 100644
--- a/apps/files_sharing/l10n/hr.php
+++ b/apps/files_sharing/l10n/hr.php
@@ -1,5 +1,7 @@
 <?php $TRANSLATIONS = array(
 "Password" => "Lozinka",
 "Submit" => "Pošalji",
-"Download" => "Preuzimanje"
+"Download" => "Preuzimanje",
+"Upload" => "Učitaj",
+"Cancel upload" => "Prekini upload"
 );
diff --git a/apps/files_sharing/l10n/hu_HU.php b/apps/files_sharing/l10n/hu_HU.php
index 7184cfa4b3791c57c9b7e7c556adba9a83e9c0eb..0b964379bb972b6da8dbe4839d70ee66b6294997 100644
--- a/apps/files_sharing/l10n/hu_HU.php
+++ b/apps/files_sharing/l10n/hu_HU.php
@@ -4,5 +4,7 @@
 "%s shared the folder %s with you" => "%s megosztotta Önnel ezt a mappát: %s",
 "%s shared the file %s with you" => "%s megosztotta Önnel ezt az állományt: %s",
 "Download" => "Letöltés",
+"Upload" => "Feltöltés",
+"Cancel upload" => "A feltöltés megszakítása",
 "No preview available for" => "Nem áll rendelkezésre előnézet ehhez: "
 );
diff --git a/apps/files_sharing/l10n/ia.php b/apps/files_sharing/l10n/ia.php
index 7db49518a4b5b0a5de875e6732fa10a1e6b003ec..01acba5108a1826f84e46f9b971c566bec173b33 100644
--- a/apps/files_sharing/l10n/ia.php
+++ b/apps/files_sharing/l10n/ia.php
@@ -1,5 +1,6 @@
 <?php $TRANSLATIONS = array(
 "Password" => "Contrasigno",
 "Submit" => "Submitter",
-"Download" => "Discargar"
+"Download" => "Discargar",
+"Upload" => "Incargar"
 );
diff --git a/apps/files_sharing/l10n/id.php b/apps/files_sharing/l10n/id.php
index e27e78b5f6c42e35223431fca8db99d5c44d8350..cc6e591834ca19ec3db0aafa8ca420422d73bd4e 100644
--- a/apps/files_sharing/l10n/id.php
+++ b/apps/files_sharing/l10n/id.php
@@ -4,5 +4,7 @@
 "%s shared the folder %s with you" => "%s membagikan folder %s dengan Anda",
 "%s shared the file %s with you" => "%s membagikan file %s dengan Anda",
 "Download" => "Unduh",
+"Upload" => "Unggah",
+"Cancel upload" => "Batal pengunggahan",
 "No preview available for" => "Tidak ada pratinjau tersedia untuk"
 );
diff --git a/apps/files_sharing/l10n/is.php b/apps/files_sharing/l10n/is.php
index b76d737e6d0bafed22cf183914a099b48ddd8a06..222459f7a00aa366f407b6de219db6cf52f2cfd4 100644
--- a/apps/files_sharing/l10n/is.php
+++ b/apps/files_sharing/l10n/is.php
@@ -4,5 +4,7 @@
 "%s shared the folder %s with you" => "%s deildi möppunni %s með þér",
 "%s shared the file %s with you" => "%s deildi skránni %s með þér",
 "Download" => "Niðurhal",
+"Upload" => "Senda inn",
+"Cancel upload" => "Hætta við innsendingu",
 "No preview available for" => "Yfirlit ekki í boði fyrir"
 );
diff --git a/apps/files_sharing/l10n/it.php b/apps/files_sharing/l10n/it.php
index 60a1e588e82e0ddcfaaaccf1acdbbfc191dcd041..cf25c53ca388923aedaa8fa4d1e37c6f5cbf7613 100644
--- a/apps/files_sharing/l10n/it.php
+++ b/apps/files_sharing/l10n/it.php
@@ -1,8 +1,11 @@
 <?php $TRANSLATIONS = array(
+"The password is wrong. Try again." => "La password è errata. Prova ancora.",
 "Password" => "Password",
 "Submit" => "Invia",
 "%s shared the folder %s with you" => "%s ha condiviso la cartella %s con te",
 "%s shared the file %s with you" => "%s ha condiviso il file %s con te",
 "Download" => "Scarica",
+"Upload" => "Carica",
+"Cancel upload" => "Annulla il caricamento",
 "No preview available for" => "Nessuna anteprima disponibile per"
 );
diff --git a/apps/files_sharing/l10n/ja_JP.php b/apps/files_sharing/l10n/ja_JP.php
index 8f208da10c95e028c2814488f04f6a6dcb7b05f0..d2bc2d11245a5c17f1f0470efd9a42db7ee9180f 100644
--- a/apps/files_sharing/l10n/ja_JP.php
+++ b/apps/files_sharing/l10n/ja_JP.php
@@ -1,8 +1,11 @@
 <?php $TRANSLATIONS = array(
+"The password is wrong. Try again." => "パスワードが間違っています。再試行してください。",
 "Password" => "パスワード",
 "Submit" => "送信",
 "%s shared the folder %s with you" => "%s はフォルダー %s をあなたと共有中です",
 "%s shared the file %s with you" => "%s はファイル %s をあなたと共有中です",
 "Download" => "ダウンロード",
+"Upload" => "アップロード",
+"Cancel upload" => "アップロードをキャンセル",
 "No preview available for" => "プレビューはありません"
 );
diff --git a/apps/files_sharing/l10n/ka_GE.php b/apps/files_sharing/l10n/ka_GE.php
index 4577148d7df63ec0e3113761a60536cec0a24e63..c88cc59cf8dc88127a32640577f206814af037d3 100644
--- a/apps/files_sharing/l10n/ka_GE.php
+++ b/apps/files_sharing/l10n/ka_GE.php
@@ -4,5 +4,7 @@
 "%s shared the folder %s with you" => "%s–მა გაგიზიარათ ფოლდერი %s",
 "%s shared the file %s with you" => "%s–მა გაგიზიარათ ფაილი %s",
 "Download" => "ჩამოტვირთვა",
+"Upload" => "ატვირთვა",
+"Cancel upload" => "ატვირთვის გაუქმება",
 "No preview available for" => "წინასწარი დათვალიერება შეუძლებელია"
 );
diff --git a/apps/files_sharing/l10n/ko.php b/apps/files_sharing/l10n/ko.php
index 394c8d12b21398d2069c68b3ce4054b8bd7469dd..d2cf52447f17cdd8f0fc02fa32c02e66cb65ebcb 100644
--- a/apps/files_sharing/l10n/ko.php
+++ b/apps/files_sharing/l10n/ko.php
@@ -4,5 +4,7 @@
 "%s shared the folder %s with you" => "%s 님이 폴더 %s을(를) 공유하였습니다",
 "%s shared the file %s with you" => "%s 님이 파일 %s을(를) 공유하였습니다",
 "Download" => "다운로드",
+"Upload" => "업로드",
+"Cancel upload" => "업로드 취소",
 "No preview available for" => "다음 항목을 미리 볼 수 없음:"
 );
diff --git a/apps/files_sharing/l10n/ku_IQ.php b/apps/files_sharing/l10n/ku_IQ.php
index 4a0b53f6c8391ff5474aa0a856cbd2ffd7b1cdb3..576671aaa754d8749db5f7ffdab06fdf49f0d660 100644
--- a/apps/files_sharing/l10n/ku_IQ.php
+++ b/apps/files_sharing/l10n/ku_IQ.php
@@ -4,5 +4,6 @@
 "%s shared the folder %s with you" => "%s دابه‌شی کردووه‌ بوخچه‌ی %s له‌گه‌ڵ تۆ",
 "%s shared the file %s with you" => "%s دابه‌شی کردووه‌ په‌ڕگه‌یی %s له‌گه‌ڵ تۆ",
 "Download" => "داگرتن",
+"Upload" => "بارکردن",
 "No preview available for" => "هیچ پێشبینیه‌ك ئاماده‌ نیه بۆ"
 );
diff --git a/apps/files_sharing/l10n/lb.php b/apps/files_sharing/l10n/lb.php
index 502f934cad0ac80c996010a86b529074afe81e8c..a604affee64501a4c0ee7a60c36534e2e80a9eb9 100644
--- a/apps/files_sharing/l10n/lb.php
+++ b/apps/files_sharing/l10n/lb.php
@@ -1,5 +1,11 @@
 <?php $TRANSLATIONS = array(
+"The password is wrong. Try again." => "Den Passwuert ass incorrect. Probeier ed nach eng keier.",
 "Password" => "Passwuert",
 "Submit" => "Fortschécken",
-"Download" => "Download"
+"%s shared the folder %s with you" => "%s huet den Dossier %s mad der gedeelt",
+"%s shared the file %s with you" => "%s deelt den Fichier %s mad dir",
+"Download" => "Download",
+"Upload" => "Eroplueden",
+"Cancel upload" => "Upload ofbriechen",
+"No preview available for" => "Keeng Preview do fir"
 );
diff --git a/apps/files_sharing/l10n/lt_LT.php b/apps/files_sharing/l10n/lt_LT.php
index 2e09aa206d120f1bf22feeb8a52d74cd942c17ca..0f9347377c9176dc60fc5a4ae288481ee6151a15 100644
--- a/apps/files_sharing/l10n/lt_LT.php
+++ b/apps/files_sharing/l10n/lt_LT.php
@@ -4,5 +4,7 @@
 "%s shared the folder %s with you" => "%s pasidalino su jumis %s aplanku",
 "%s shared the file %s with you" => "%s pasidalino su jumis %s failu",
 "Download" => "Atsisiųsti",
+"Upload" => "Įkelti",
+"Cancel upload" => "Atšaukti siuntimą",
 "No preview available for" => "Peržiūra nėra galima"
 );
diff --git a/apps/files_sharing/l10n/lv.php b/apps/files_sharing/l10n/lv.php
index 8430f99e6cf9ec3f5551847cdb99cb7744bc551c..be021b8e7a04720373b1f22d676136194cb45bb3 100644
--- a/apps/files_sharing/l10n/lv.php
+++ b/apps/files_sharing/l10n/lv.php
@@ -4,5 +4,7 @@
 "%s shared the folder %s with you" => "%s ar jums dalījās ar mapi %s",
 "%s shared the file %s with you" => "%s ar jums dalījās ar datni %s",
 "Download" => "Lejupielādēt",
+"Upload" => "Augšupielādēt",
+"Cancel upload" => "Atcelt augšupielādi",
 "No preview available for" => "Nav pieejams priekšskatījums priekš"
 );
diff --git a/apps/files_sharing/l10n/mk.php b/apps/files_sharing/l10n/mk.php
index 3d6e54f52b2656dced287eac073424e7a6afd215..ed04035ea5da9d6610efc80f1dd962c6d9cd0b96 100644
--- a/apps/files_sharing/l10n/mk.php
+++ b/apps/files_sharing/l10n/mk.php
@@ -4,5 +4,7 @@
 "%s shared the folder %s with you" => "%s ја сподели папката %s со Вас",
 "%s shared the file %s with you" => "%s ја сподели датотеката %s со Вас",
 "Download" => "Преземи",
+"Upload" => "Подигни",
+"Cancel upload" => "Откажи прикачување",
 "No preview available for" => "Нема достапно преглед за"
 );
diff --git a/apps/files_sharing/l10n/ms_MY.php b/apps/files_sharing/l10n/ms_MY.php
index 5a1cb1018cc9cb9e0daf7154562f7917f15f8110..0a6a05b77815f008a1d80f28248182829b7fec5d 100644
--- a/apps/files_sharing/l10n/ms_MY.php
+++ b/apps/files_sharing/l10n/ms_MY.php
@@ -1,5 +1,7 @@
 <?php $TRANSLATIONS = array(
 "Password" => "Kata laluan",
 "Submit" => "Hantar",
-"Download" => "Muat turun"
+"Download" => "Muat turun",
+"Upload" => "Muat naik",
+"Cancel upload" => "Batal muat naik"
 );
diff --git a/apps/files_sharing/l10n/nb_NO.php b/apps/files_sharing/l10n/nb_NO.php
index 027a07babe310734b348c6f06817640d5d4d1892..9c736f97d788bcac5d2e8811145596e631c2a010 100644
--- a/apps/files_sharing/l10n/nb_NO.php
+++ b/apps/files_sharing/l10n/nb_NO.php
@@ -4,5 +4,7 @@
 "%s shared the folder %s with you" => "%s delte mappen %s med deg",
 "%s shared the file %s with you" => "%s delte filen %s med deg",
 "Download" => "Last ned",
+"Upload" => "Last opp",
+"Cancel upload" => "Avbryt opplasting",
 "No preview available for" => "Forhåndsvisning ikke tilgjengelig for"
 );
diff --git a/apps/files_sharing/l10n/nl.php b/apps/files_sharing/l10n/nl.php
index 837547e16b1e9be0d7d5844ce0fc6474bbd5fea2..6c1bf7a53f3682888d3bc4028d9050a3ba4b6c5a 100644
--- a/apps/files_sharing/l10n/nl.php
+++ b/apps/files_sharing/l10n/nl.php
@@ -4,5 +4,7 @@
 "%s shared the folder %s with you" => "%s deelt de map %s met u",
 "%s shared the file %s with you" => "%s deelt het bestand %s met u",
 "Download" => "Downloaden",
+"Upload" => "Uploaden",
+"Cancel upload" => "Upload afbreken",
 "No preview available for" => "Geen voorbeeldweergave beschikbaar voor"
 );
diff --git a/apps/files_sharing/l10n/nn_NO.php b/apps/files_sharing/l10n/nn_NO.php
index 328fb038b88e6ad39d5f64fbca5e16eeb3261762..afa3eabe8cf3dafc4af74a89cf6063d533bfc5a8 100644
--- a/apps/files_sharing/l10n/nn_NO.php
+++ b/apps/files_sharing/l10n/nn_NO.php
@@ -4,5 +4,7 @@
 "%s shared the folder %s with you" => "%s delte mappa %s med deg",
 "%s shared the file %s with you" => "%s delte fila %s med deg",
 "Download" => "Last ned",
+"Upload" => "Last opp",
+"Cancel upload" => "Avbryt opplasting",
 "No preview available for" => "Inga førehandsvising tilgjengeleg for"
 );
diff --git a/apps/files_sharing/l10n/oc.php b/apps/files_sharing/l10n/oc.php
index 2fe0c95aa7604844023af46c4ee6d0f2bbd8df24..4ec48b151a83a8809c00edb4e4dbbd712f485d18 100644
--- a/apps/files_sharing/l10n/oc.php
+++ b/apps/files_sharing/l10n/oc.php
@@ -1,5 +1,7 @@
 <?php $TRANSLATIONS = array(
 "Password" => "Senhal",
 "Submit" => "Sosmetre",
-"Download" => "Avalcarga"
+"Download" => "Avalcarga",
+"Upload" => "Amontcarga",
+"Cancel upload" => " Anulla l'amontcargar"
 );
diff --git a/apps/files_sharing/l10n/pl.php b/apps/files_sharing/l10n/pl.php
index c85a11863bd9971ce667c8ad2195a7ccfb70f8f0..39039da77b6d73f8165c466b4f3b61b0b1dfde45 100644
--- a/apps/files_sharing/l10n/pl.php
+++ b/apps/files_sharing/l10n/pl.php
@@ -4,5 +4,7 @@
 "%s shared the folder %s with you" => "%s współdzieli folder z tobą %s",
 "%s shared the file %s with you" => "%s współdzieli z tobą plik %s",
 "Download" => "Pobierz",
+"Upload" => "Wyślij",
+"Cancel upload" => "Anuluj wysyłanie",
 "No preview available for" => "Podgląd nie jest dostępny dla"
 );
diff --git a/apps/files_sharing/l10n/pt_BR.php b/apps/files_sharing/l10n/pt_BR.php
index a5dad793c4e67a2e7814284680e2ddc8c051c20b..c82989857a9965b2958fc8672e54c88e3bcb2924 100644
--- a/apps/files_sharing/l10n/pt_BR.php
+++ b/apps/files_sharing/l10n/pt_BR.php
@@ -1,8 +1,11 @@
 <?php $TRANSLATIONS = array(
+"The password is wrong. Try again." => "Senha incorreta. Tente novamente.",
 "Password" => "Senha",
 "Submit" => "Submeter",
 "%s shared the folder %s with you" => "%s compartilhou a pasta %s com você",
 "%s shared the file %s with you" => "%s compartilhou o arquivo %s com você",
 "Download" => "Baixar",
+"Upload" => "Upload",
+"Cancel upload" => "Cancelar upload",
 "No preview available for" => "Nenhuma visualização disponível para"
 );
diff --git a/apps/files_sharing/l10n/pt_PT.php b/apps/files_sharing/l10n/pt_PT.php
index de8fcbf02d9a6a67c12100ee544fb0a4c310f339..2f41abca1f5fcc648097a27946ab18b70cd24c7d 100644
--- a/apps/files_sharing/l10n/pt_PT.php
+++ b/apps/files_sharing/l10n/pt_PT.php
@@ -4,5 +4,7 @@
 "%s shared the folder %s with you" => "%s partilhou a pasta %s consigo",
 "%s shared the file %s with you" => "%s partilhou o ficheiro %s consigo",
 "Download" => "Transferir",
+"Upload" => "Carregar",
+"Cancel upload" => "Cancelar envio",
 "No preview available for" => "Não há pré-visualização para"
 );
diff --git a/apps/files_sharing/l10n/ro.php b/apps/files_sharing/l10n/ro.php
index 8b8eab13541fe97d740f121a70ffc9cd1026bd54..3197068cdd131f6ce16903f717915e1bb6e21572 100644
--- a/apps/files_sharing/l10n/ro.php
+++ b/apps/files_sharing/l10n/ro.php
@@ -1,8 +1,11 @@
 <?php $TRANSLATIONS = array(
+"The password is wrong. Try again." => "Parola este incorectă. Încercaţi din nou.",
 "Password" => "Parolă",
 "Submit" => "Trimite",
 "%s shared the folder %s with you" => "%s a partajat directorul %s cu tine",
 "%s shared the file %s with you" => "%s a partajat fișierul %s cu tine",
 "Download" => "Descarcă",
+"Upload" => "Încărcare",
+"Cancel upload" => "Anulează încărcarea",
 "No preview available for" => "Nici o previzualizare disponibilă pentru "
 );
diff --git a/apps/files_sharing/l10n/ru.php b/apps/files_sharing/l10n/ru.php
index 066096f5b5a77f986959e30941fdcaeba3e0984d..77332c183f64a75bbf3de9151c7c3cb6f8b9788d 100644
--- a/apps/files_sharing/l10n/ru.php
+++ b/apps/files_sharing/l10n/ru.php
@@ -1,8 +1,11 @@
 <?php $TRANSLATIONS = array(
+"The password is wrong. Try again." => "Неверный пароль. Попробуйте еще раз.",
 "Password" => "Пароль",
 "Submit" => "Отправить",
 "%s shared the folder %s with you" => "%s открыл доступ к папке %s для Вас",
 "%s shared the file %s with you" => "%s открыл доступ к файлу %s для Вас",
 "Download" => "Скачать",
+"Upload" => "Загрузка",
+"Cancel upload" => "Отмена загрузки",
 "No preview available for" => "Предпросмотр недоступен для"
 );
diff --git a/apps/files_sharing/l10n/si_LK.php b/apps/files_sharing/l10n/si_LK.php
index b9bcab28c959ec6e788caac063bce9ffabf4d964..27b9d649a0af5bccde4812ff61a83ce4b353d43a 100644
--- a/apps/files_sharing/l10n/si_LK.php
+++ b/apps/files_sharing/l10n/si_LK.php
@@ -4,5 +4,7 @@
 "%s shared the folder %s with you" => "%s ඔබව %s ෆෝල්ඩරයට හවුල් කරගත්තේය",
 "%s shared the file %s with you" => "%s ඔබ සමඟ %s ගොනුව බෙදාහදාගත්තේය",
 "Download" => "බාන්න",
+"Upload" => "උඩුගත කරන්න",
+"Cancel upload" => "උඩුගත කිරීම අත් හරින්න",
 "No preview available for" => "පූර්වදර්ශනයක් නොමැත"
 );
diff --git a/apps/files_sharing/l10n/sk_SK.php b/apps/files_sharing/l10n/sk_SK.php
index 0907e3b451c15a05de66200cfb9ffe840c3c490e..77173b44345c5f3d6def6067d7a45e146f25e879 100644
--- a/apps/files_sharing/l10n/sk_SK.php
+++ b/apps/files_sharing/l10n/sk_SK.php
@@ -4,5 +4,7 @@
 "%s shared the folder %s with you" => "%s zdieľa s vami priečinok %s",
 "%s shared the file %s with you" => "%s zdieľa s vami súbor %s",
 "Download" => "SÅ¥ahovanie",
+"Upload" => "Odoslať",
+"Cancel upload" => "Zrušiť odosielanie",
 "No preview available for" => "Žiaden náhľad k dispozícii pre"
 );
diff --git a/apps/files_sharing/l10n/sl.php b/apps/files_sharing/l10n/sl.php
index ae84c4728920f1f50b8af5bce07e55eb9e9dc133..39d2fca81cb25ca3fcb6aa55b5065edecccaf21f 100644
--- a/apps/files_sharing/l10n/sl.php
+++ b/apps/files_sharing/l10n/sl.php
@@ -4,5 +4,7 @@
 "%s shared the folder %s with you" => "Oseba %s je določila mapo %s za souporabo",
 "%s shared the file %s with you" => "Oseba %s je določila datoteko %s za souporabo",
 "Download" => "Prejmi",
+"Upload" => "Pošlji",
+"Cancel upload" => "Prekliči pošiljanje",
 "No preview available for" => "Predogled ni na voljo za"
 );
diff --git a/apps/files_sharing/l10n/sq.php b/apps/files_sharing/l10n/sq.php
index 7be5f560faadd3006acbe15d37a5267a4e1c358f..1c0e0aa2bd138347c466a4aa7b026201dce73744 100644
--- a/apps/files_sharing/l10n/sq.php
+++ b/apps/files_sharing/l10n/sq.php
@@ -4,5 +4,7 @@
 "%s shared the folder %s with you" => "%s ndau me ju dosjen %s",
 "%s shared the file %s with you" => "%s ndau me ju skedarin %s",
 "Download" => "Shkarko",
+"Upload" => "Ngarko",
+"Cancel upload" => "Anulo ngarkimin",
 "No preview available for" => "Shikimi paraprak nuk është i mundur për"
 );
diff --git a/apps/files_sharing/l10n/sr.php b/apps/files_sharing/l10n/sr.php
index 6e277f677119ce3b1f1373b57267142b73463d4c..f893ec0ab422f3139a249a2630a69577481dc8ea 100644
--- a/apps/files_sharing/l10n/sr.php
+++ b/apps/files_sharing/l10n/sr.php
@@ -1,5 +1,7 @@
 <?php $TRANSLATIONS = array(
 "Password" => "Лозинка",
 "Submit" => "Пошаљи",
-"Download" => "Преузми"
+"Download" => "Преузми",
+"Upload" => "Отпреми",
+"Cancel upload" => "Прекини отпремање"
 );
diff --git a/apps/files_sharing/l10n/sr@latin.php b/apps/files_sharing/l10n/sr@latin.php
index cce6bd1f77154802b284a078142dbcdaf2d6864b..c45f711e15f559c362bcfe68c2dd093695a067b7 100644
--- a/apps/files_sharing/l10n/sr@latin.php
+++ b/apps/files_sharing/l10n/sr@latin.php
@@ -1,5 +1,6 @@
 <?php $TRANSLATIONS = array(
 "Password" => "Lozinka",
 "Submit" => "Pošalji",
-"Download" => "Preuzmi"
+"Download" => "Preuzmi",
+"Upload" => "Pošalji"
 );
diff --git a/apps/files_sharing/l10n/sv.php b/apps/files_sharing/l10n/sv.php
index af21d869adc0abfc5000375a2644d9cb5a55ef83..21e4e542d8e4066690321c83949f84b94d3f148c 100644
--- a/apps/files_sharing/l10n/sv.php
+++ b/apps/files_sharing/l10n/sv.php
@@ -4,5 +4,7 @@
 "%s shared the folder %s with you" => "%s delade mappen %s med dig",
 "%s shared the file %s with you" => "%s delade filen %s med dig",
 "Download" => "Ladda ner",
+"Upload" => "Ladda upp",
+"Cancel upload" => "Avbryt uppladdning",
 "No preview available for" => "Ingen förhandsgranskning tillgänglig för"
 );
diff --git a/apps/files_sharing/l10n/ta_LK.php b/apps/files_sharing/l10n/ta_LK.php
index 6b2ac30bcd4caf75f916744cd6f1ec8e84094758..6e69855be11d34e8d84940ee5c410e4458bda74c 100644
--- a/apps/files_sharing/l10n/ta_LK.php
+++ b/apps/files_sharing/l10n/ta_LK.php
@@ -4,5 +4,7 @@
 "%s shared the folder %s with you" => "%s கோப்புறையானது %s உடன் பகிரப்பட்டது",
 "%s shared the file %s with you" => "%s கோப்பானது %s உடன் பகிரப்பட்டது",
 "Download" => "பதிவிறக்குக",
+"Upload" => "பதிவேற்றுக",
+"Cancel upload" => "பதிவேற்றலை இரத்து செய்க",
 "No preview available for" => "அதற்கு முன்னோக்கு ஒன்றும் இல்லை"
 );
diff --git a/apps/files_sharing/l10n/th_TH.php b/apps/files_sharing/l10n/th_TH.php
index e16ecea96eff141d603cf3100c80f331ab8ab2bf..608c86d586a872640075786bb72dfc601a870ed4 100644
--- a/apps/files_sharing/l10n/th_TH.php
+++ b/apps/files_sharing/l10n/th_TH.php
@@ -4,5 +4,7 @@
 "%s shared the folder %s with you" => "%s ได้แชร์โฟลเดอร์ %s ให้กับคุณ",
 "%s shared the file %s with you" => "%s ได้แชร์ไฟล์ %s ให้กับคุณ",
 "Download" => "ดาวน์โหลด",
+"Upload" => "อัพโหลด",
+"Cancel upload" => "ยกเลิกการอัพโหลด",
 "No preview available for" => "ไม่สามารถดูตัวอย่างได้สำหรับ"
 );
diff --git a/apps/files_sharing/l10n/tr.php b/apps/files_sharing/l10n/tr.php
index 4de33557382cdd7fbdcf1423cb58e721c561fba7..4da9c17c7e8b72783b842cf9ddc2bafc92d55d5d 100644
--- a/apps/files_sharing/l10n/tr.php
+++ b/apps/files_sharing/l10n/tr.php
@@ -4,5 +4,7 @@
 "%s shared the folder %s with you" => "%s sizinle paylaşılan  %s klasör",
 "%s shared the file %s with you" => "%s sizinle paylaşılan  %s klasör",
 "Download" => "Ä°ndir",
+"Upload" => "Yükle",
+"Cancel upload" => "Yüklemeyi iptal et",
 "No preview available for" => "Kullanılabilir önizleme yok"
 );
diff --git a/apps/files_sharing/l10n/ug.php b/apps/files_sharing/l10n/ug.php
index 348acc4a898fda96c9ccde1479343933d95c37a6..9f9c7beb4105911ac014b4588e7a1c49421e0008 100644
--- a/apps/files_sharing/l10n/ug.php
+++ b/apps/files_sharing/l10n/ug.php
@@ -1,5 +1,7 @@
 <?php $TRANSLATIONS = array(
 "Password" => "ئىم",
 "Submit" => "تاپشۇر",
-"Download" => "چۈشۈر"
+"Download" => "چۈشۈر",
+"Upload" => "يۈكلە",
+"Cancel upload" => "يۈكلەشتىن ۋاز كەچ"
 );
diff --git a/apps/files_sharing/l10n/uk.php b/apps/files_sharing/l10n/uk.php
index 207988ef73224003399a733a3e10bf0fbc6c023d..8ef7f1bd8adb32a0dd10bae742eac0d6722bdfba 100644
--- a/apps/files_sharing/l10n/uk.php
+++ b/apps/files_sharing/l10n/uk.php
@@ -4,5 +4,7 @@
 "%s shared the folder %s with you" => "%s опублікував каталог %s для Вас",
 "%s shared the file %s with you" => "%s опублікував файл %s для Вас",
 "Download" => "Завантажити",
+"Upload" => "Вивантажити",
+"Cancel upload" => "Перервати завантаження",
 "No preview available for" => "Попередній перегляд недоступний для"
 );
diff --git a/apps/files_sharing/l10n/vi.php b/apps/files_sharing/l10n/vi.php
index 2a5a2ff17f15531dd974fddb3aa3c3d2fd42ecf7..d75fb1dc53f0e5223899b3c1ff4324ceaf9703e9 100644
--- a/apps/files_sharing/l10n/vi.php
+++ b/apps/files_sharing/l10n/vi.php
@@ -4,5 +4,7 @@
 "%s shared the folder %s with you" => "%s đã chia sẻ thư mục %s với bạn",
 "%s shared the file %s with you" => "%s đã chia sẻ tập tin %s với bạn",
 "Download" => "Tải về",
+"Upload" => "Tải lên",
+"Cancel upload" => "Hủy upload",
 "No preview available for" => "Không có xem trước cho"
 );
diff --git a/apps/files_sharing/l10n/zh_CN.GB2312.php b/apps/files_sharing/l10n/zh_CN.GB2312.php
index 7df3ee8f9b1fcd23d24ad388ff53bb1036dd1c6e..2dd79ec38d4fb8a3cf3255f36c286eceb9076d2d 100644
--- a/apps/files_sharing/l10n/zh_CN.GB2312.php
+++ b/apps/files_sharing/l10n/zh_CN.GB2312.php
@@ -4,5 +4,7 @@
 "%s shared the folder %s with you" => "%s 与您分享了文件夹 %s",
 "%s shared the file %s with you" => "%s 与您分享了文件 %s",
 "Download" => "下载",
+"Upload" => "上传",
+"Cancel upload" => "取消上传",
 "No preview available for" => "没有预览可用于"
 );
diff --git a/apps/files_sharing/l10n/zh_CN.php b/apps/files_sharing/l10n/zh_CN.php
index 15c1bb54873093a5b6c0c6845757afea749abadb..c7fa08b81f03277826543f42b244743c931087e9 100644
--- a/apps/files_sharing/l10n/zh_CN.php
+++ b/apps/files_sharing/l10n/zh_CN.php
@@ -4,5 +4,7 @@
 "%s shared the folder %s with you" => "%s与您共享了%s文件夹",
 "%s shared the file %s with you" => "%s与您共享了%s文件",
 "Download" => "下载",
+"Upload" => "上传",
+"Cancel upload" => "取消上传",
 "No preview available for" => "没有预览"
 );
diff --git a/apps/files_sharing/l10n/zh_HK.php b/apps/files_sharing/l10n/zh_HK.php
index 7ef0f19ca435e0ae17be1f4112bb4fdef1133c0c..8f9b7900c2ccf2f839d665ec778b14d67121370c 100644
--- a/apps/files_sharing/l10n/zh_HK.php
+++ b/apps/files_sharing/l10n/zh_HK.php
@@ -1,4 +1,5 @@
 <?php $TRANSLATIONS = array(
 "Password" => "密碼",
-"Download" => "下載"
+"Download" => "下載",
+"Upload" => "上傳"
 );
diff --git a/apps/files_sharing/l10n/zh_TW.php b/apps/files_sharing/l10n/zh_TW.php
index 23b27789943b2669e70fe0bbdafec94e7073612a..b172879469fe1dffd90f686829d2a38b79d2782d 100644
--- a/apps/files_sharing/l10n/zh_TW.php
+++ b/apps/files_sharing/l10n/zh_TW.php
@@ -4,5 +4,7 @@
 "%s shared the folder %s with you" => "%s 和您分享了資料夾 %s ",
 "%s shared the file %s with you" => "%s 和您分享了檔案 %s",
 "Download" => "下載",
+"Upload" => "上傳",
+"Cancel upload" => "取消上傳",
 "No preview available for" => "無法預覽"
 );
diff --git a/apps/files_sharing/public.php b/apps/files_sharing/public.php
index 98d2a84fb6658183b5e1263ff73e8f6087e8285c..9462844a82b7be7db8a54876744fc6fd57059f2c 100644
--- a/apps/files_sharing/public.php
+++ b/apps/files_sharing/public.php
@@ -27,23 +27,9 @@ if (isset($_GET['t'])) {
 		$type = $linkItem['item_type'];
 		$fileSource = $linkItem['file_source'];
 		$shareOwner = $linkItem['uid_owner'];
-		$fileOwner = null;
 		$path = null;
-		if (isset($linkItem['parent'])) {
-			$parent = $linkItem['parent'];
-			while (isset($parent)) {
-				$query = \OC_DB::prepare('SELECT `parent`, `uid_owner` FROM `*PREFIX*share` WHERE `id` = ?', 1);
-				$item = $query->execute(array($parent))->fetchRow();
-				if (isset($item['parent'])) {
-					$parent = $item['parent'];
-				} else {
-					$fileOwner = $item['uid_owner'];
-					break;
-				}
-			}
-		} else {
-			$fileOwner = $shareOwner;
-		}
+		$rootLinkItem = OCP\Share::resolveReShare($linkItem);
+		$fileOwner = $rootLinkItem['uid_owner'];
 		if (isset($fileOwner)) {
 			OC_Util::tearDownFS();
 			OC_Util::setupFS($fileOwner);
@@ -79,7 +65,7 @@ if (isset($path)) {
 											 $linkItem['share_with']))) {
 					$tmpl = new OCP\Template('files_sharing', 'authenticate', 'guest');
 					$tmpl->assign('URL', $url);
-					$tmpl->assign('error', true);
+					$tmpl->assign('wrongpw', true);
 					$tmpl->printPage();
 					exit();
 				} else {
@@ -132,15 +118,32 @@ if (isset($path)) {
 		}
 		exit();
 	} else {
+		OCP\Util::addScript('files', 'file-upload');
 		OCP\Util::addStyle('files_sharing', 'public');
 		OCP\Util::addScript('files_sharing', 'public');
 		OCP\Util::addScript('files', 'fileactions');
+		OCP\Util::addScript('files', 'jquery.iframe-transport');
+		OCP\Util::addScript('files', 'jquery.fileupload');
+		$maxUploadFilesize=OCP\Util::maxUploadFilesize($path);
 		$tmpl = new OCP\Template('files_sharing', 'public', 'base');
 		$tmpl->assign('uidOwner', $shareOwner);
 		$tmpl->assign('displayName', \OCP\User::getDisplayName($shareOwner));
 		$tmpl->assign('filename', $file);
+		$tmpl->assign('directory_path', $linkItem['file_target']);
 		$tmpl->assign('mimetype', \OC\Files\Filesystem::getMimeType($path));
 		$tmpl->assign('fileTarget', basename($linkItem['file_target']));
+		$tmpl->assign('dirToken', $linkItem['token']);
+		$allowPublicUploadEnabled = (($linkItem['permissions'] & OCP\PERMISSION_CREATE) ? true : false );
+		if (\OCP\App::isEnabled('files_encryption')) {
+			$allowPublicUploadEnabled = false;
+		}
+		if ($linkItem['item_type'] !== 'folder') {
+			$allowPublicUploadEnabled = false;
+		}
+		$tmpl->assign('allowPublicUploadEnabled', $allowPublicUploadEnabled);
+		$tmpl->assign('uploadMaxFilesize', $maxUploadFilesize);
+		$tmpl->assign('uploadMaxHumanFilesize', OCP\Util::humanFileSize($maxUploadFilesize));
+
 		$urlLinkIdentifiers= (isset($token)?'&t='.$token:'')
 							.(isset($_GET['dir'])?'&dir='.$_GET['dir']:'')
 							.(isset($_GET['file'])?'&file='.$_GET['file']:'');
@@ -191,15 +194,17 @@ if (isset($path)) {
 			$breadcrumbNav = new OCP\Template('files', 'part.breadcrumb', '');
 			$breadcrumbNav->assign('breadcrumb', $breadcrumb);
 			$breadcrumbNav->assign('baseURL', OCP\Util::linkToPublic('files') . $urlLinkIdentifiers . '&path=');
+			$maxUploadFilesize=OCP\Util::maxUploadFilesize($path);
 			$folder = new OCP\Template('files', 'index', '');
 			$folder->assign('fileList', $list->fetchPage());
 			$folder->assign('breadcrumb', $breadcrumbNav->fetchPage());
 			$folder->assign('dir', $getPath);
 			$folder->assign('isCreatable', false);
-			$folder->assign('permissions', 0);
+			$folder->assign('permissions', OCP\PERMISSION_READ);
+			$folder->assign('isPublic',true);
 			$folder->assign('files', $files);
-			$folder->assign('uploadMaxFilesize', 0);
-			$folder->assign('uploadMaxHumanFilesize', 0);
+			$folder->assign('uploadMaxFilesize', $maxUploadFilesize);
+			$folder->assign('uploadMaxHumanFilesize', OCP\Util::humanFileSize($maxUploadFilesize));
 			$folder->assign('allowZipDownload', intval(OCP\Config::getSystemValue('allowZipDownload', true)));
 			$folder->assign('usedSpacePercent', 0);
 			$tmpl->assign('folder', $folder->fetchPage());
diff --git a/apps/files_sharing/templates/authenticate.php b/apps/files_sharing/templates/authenticate.php
index 7a67b6e550343e0762bf8a5539883391e01d2c3b..fa03f41913060540c4da710336436b4f2adefa9b 100644
--- a/apps/files_sharing/templates/authenticate.php
+++ b/apps/files_sharing/templates/authenticate.php
@@ -1,5 +1,8 @@
 <form action="<?php p($_['URL']); ?>" method="post">
 	<fieldset>
+		<?php if ($_['wrongpw']): ?>
+		<div class="warning"><?php p($l->t('The password is wrong. Try again.')); ?></div>
+		<?php endif; ?>
 		<p class="infield">
 			<label for="password" class="infield"><?php p($l->t('Password')); ?></label>
 			<input type="password" name="password" id="password" placeholder="" value="" autofocus />
diff --git a/apps/files_sharing/templates/public.php b/apps/files_sharing/templates/public.php
index adf3c3e9cc823459d6e12e61390e85372587cc04..e8bf80b8720b08fa224d136d8bb4fc1bc9fb069b 100644
--- a/apps/files_sharing/templates/public.php
+++ b/apps/files_sharing/templates/public.php
@@ -1,54 +1,100 @@
+<div id="notification-container">
+	<div id="notification" style="display: none;"></div>
+</div>
+
+<?php $defaults = new OCP\Defaults(); // initialize themable default strings and urls ?>
+
 <input type="hidden" name="dir" value="<?php p($_['dir']) ?>" id="dir">
 <input type="hidden" name="downloadURL" value="<?php p($_['downloadURL']) ?>" id="downloadURL">
 <input type="hidden" name="filename" value="<?php p($_['filename']) ?>" id="filename">
 <input type="hidden" name="mimetype" value="<?php p($_['mimetype']) ?>" id="mimetype">
 <header><div id="header">
-	<a href="<?php print_unescaped(link_to('', 'index.php')); ?>" title="" id="owncloud"><img class="svg"
-		src="<?php print_unescaped(image_path('', 'logo-wide.svg')); ?>" alt="ownCloud" /></a>
-	<div class="header-right">
-	<?php if (isset($_['folder'])): ?>
-		<span id="details"><?php p($l->t('%s shared the folder %s with you',
-			array($_['displayName'], $_['fileTarget']))) ?></span>
-	<?php else: ?>
-		<span id="details"><?php p($l->t('%s shared the file %s with you',
-			array($_['displayName'], $_['fileTarget']))) ?></span>
-	<?php endif; ?>
-		<?php if (!isset($_['folder']) || $_['allowZipDownload']): ?>
-			<a href="<?php p($_['downloadURL']); ?>" class="button" id="download"><img
-				class="svg" alt="Download" src="<?php print_unescaped(OCP\image_path("core", "actions/download.svg")); ?>"
-				/><?php p($l->t('Download'))?></a>
-		<?php endif; ?>
-	</div>
-</div></header>
-<div id="preview">
-	<?php if (isset($_['folder'])): ?>
-		<?php print_unescaped($_['folder']); ?>
-	<?php else: ?>
-		<?php if (substr($_['mimetype'], 0, strpos($_['mimetype'], '/')) == 'image'): ?>
-			<div id="imgframe">
-				<img src="<?php p($_['downloadURL']); ?>" />
+		<a href="<?php print_unescaped(link_to('', 'index.php')); ?>" title="" id="owncloud"><img class="svg"
+		                                                                                          src="<?php print_unescaped(image_path('', 'logo-wide.svg')); ?>" alt="ownCloud" /></a>
+		<div id="logo-claim" style="display:none;"><?php p($defaults->getLogoClaim()); ?></div>
+		<div class="header-right">
+			<?php if (isset($_['folder'])): ?>
+				<span id="details"><?php p($l->t('%s shared the folder %s with you',
+						array($_['displayName'], $_['fileTarget']))) ?></span>
+			<?php else: ?>
+				<span id="details"><?php p($l->t('%s shared the file %s with you',
+						array($_['displayName'], $_['fileTarget']))) ?></span>
+			<?php endif; ?>
+
+
+			<?php if (!isset($_['folder']) || $_['allowZipDownload']): ?>
+				<a href="<?php p($_['downloadURL']); ?>" class="button" id="download"><img
+						class="svg" alt="Download" src="<?php print_unescaped(OCP\image_path("core", "actions/download.svg")); ?>"
+						/><span><?php p($l->t('Download'))?></span></a>
+			<?php endif; ?>
+
+			<?php if ($_['allowPublicUploadEnabled']):?>
+
+
+			<input type="hidden" id="publicUploadRequestToken" name="requesttoken" value="<?php p($_['requesttoken']) ?>" />
+			<input type="hidden" id="dirToken" name="dirToken" value="<?php p($_['dirToken']) ?>" />
+			<input type="hidden" id="uploadMaxFilesize" name="uploadMaxFilesize" value="<?php p($_['uploadMaxFilesize']) ?>" />
+			<input type="hidden" id="uploadMaxHumanFilesize" name="uploadMaxHumanFilesize" value="<?php p($_['uploadMaxHumanFilesize']) ?>" />
+			<input type="hidden" id="directory_path" name="directory_path" value="<?php p($_['directory_path']) ?>" />
+			<?php if($_['uploadMaxFilesize'] >= 0):?>
+				<input type="hidden" name="MAX_FILE_SIZE" id="max_upload"
+				       value="<?php p($_['uploadMaxFilesize']) ?>">
+			<?php endif;?>
+
+
+			<div id="data-upload-form" class="button" title="<?php p($l->t('Upload') . ' max. '.$_['uploadMaxHumanFilesize']) ?>">
+				<input id="file_upload_start" type="file" name="files[]" data-url="<?php print_unescaped(OCP\Util::linkTo('files', 'ajax/upload.php')); ?>" multiple>
+				<a href="#" id="publicUploadButtonMock" class="svg">
+					<span><?php p($l->t('Upload'))?></span>
+				</a>
 			</div>
-		<?php elseif (substr($_['mimetype'], 0, strpos($_['mimetype'], '/')) == 'video'): ?>
-			<div id="imgframe">
-				<video tabindex="0" controls="" autoplay="">
-				<source src="<?php p($_['downloadURL']); ?>" type="<?php p($_['mimetype']); ?>" />
-				</video>
+
+		</div>
+
+		<div id="additional_controls" style="display:none">
+			<div id="uploadprogresswrapper">
+				<div id="uploadprogressbar"></div>
+				<input id="cancel_upload_button" type="button" class="stop" style="display:none"
+				       value="<?php p($l->t('Cancel upload'));?>"
+					/>
 			</div>
+
+
+
+
+			<?php endif; ?>
+
+		</div>
+	</div></header>
+<div id="content">
+	<div id="preview">
+		<?php if (isset($_['folder'])): ?>
+			<?php print_unescaped($_['folder']); ?>
 		<?php else: ?>
-		<ul id="noPreview">
-			<li class="error">
-				<?php p($l->t('No preview available for').' '.$_['fileTarget']); ?><br />
-				<a href="<?php p($_['downloadURL']); ?>" id="download"><img class="svg" alt="Download"
-					src="<?php print_unescaped(OCP\image_path("core", "actions/download.svg")); ?>"
-					/><?php p($l->t('Download'))?></a>
-			</li>
-		</ul>
+			<?php if (substr($_['mimetype'], 0, strpos($_['mimetype'], '/')) == 'image'): ?>
+				<div id="imgframe">
+					<img src="<?php p($_['downloadURL']); ?>" />
+				</div>
+			<?php elseif (substr($_['mimetype'], 0, strpos($_['mimetype'], '/')) == 'video'): ?>
+				<div id="imgframe">
+					<video tabindex="0" controls="" autoplay="">
+						<source src="<?php p($_['downloadURL']); ?>" type="<?php p($_['mimetype']); ?>" />
+					</video>
+				</div>
+			<?php else: ?>
+				<ul id="noPreview">
+					<li class="error">
+						<?php p($l->t('No preview available for').' '.$_['fileTarget']); ?><br />
+						<a href="<?php p($_['downloadURL']); ?>" id="download"><img class="svg" alt="Download"
+						                                                            src="<?php print_unescaped(OCP\image_path("core", "actions/download.svg")); ?>"
+								/><?php p($l->t('Download'))?></a>
+					</li>
+				</ul>
+			<?php endif; ?>
 		<?php endif; ?>
-	<?php endif; ?>
-</div>
-<footer>
-	<p class="info"><a href="<?php p(OC_Defaults::getBaseUrl()); ?>"><?php p(OC_Defaults::getEntity()) ?></a>
-		<?php OC_Util::getEditionString() === '' ? print_unescaped(' &ndash; ') : print_unescaped('<br/>'); ?>
-		<?php p(OC_Defaults::getSlogan()); ?>
-	</p>
-</footer>
+	</div>
+	<footer>
+		<p class="info">
+			<?php print_unescaped($defaults->getLongFooter()); ?>
+		</p>
+	</footer>
diff --git a/apps/files_trashbin/index.php b/apps/files_trashbin/index.php
index a32b7414ac6a1b5a9a14c56d9753853ce38fb270..6f1c364737e1939ba462bc7cfa9ace10ca3c68e7 100644
--- a/apps/files_trashbin/index.php
+++ b/apps/files_trashbin/index.php
@@ -101,12 +101,15 @@ $breadcrumbNav->assign('home', OCP\Util::linkTo('files', 'index.php'));
 
 $list = new OCP\Template('files_trashbin', 'part.list', '');
 $list->assign('files', $files);
-$list->assign('baseURL', OCP\Util::linkTo('files_trashbin', 'index.php'). '?dir='.$dir);
-$list->assign('downloadURL', OCP\Util::linkTo('files_trashbin', 'download.php') . '?file='.$dir);
+
+$encodedDir = \OCP\Util::encodePath($dir);
+$list->assign('baseURL', OCP\Util::linkTo('files_trashbin', 'index.php'). '?dir='.$encodedDir);
+$list->assign('downloadURL', OCP\Util::linkTo('files_trashbin', 'download.php') . '?file='.$encodedDir);
 $list->assign('disableSharing', true);
 $list->assign('dirlisting', $dirlisting);
-$tmpl->assign('dirlisting', $dirlisting);
 $list->assign('disableDownloadActions', true);
+
+$tmpl->assign('dirlisting', $dirlisting);
 $tmpl->assign('breadcrumb', $breadcrumbNav->fetchPage());
 $tmpl->assign('fileList', $list->fetchPage());
 $tmpl->assign('files', $files);
diff --git a/apps/files_trashbin/js/trash.js b/apps/files_trashbin/js/trash.js
index 691642811b74f35ba46912065e6839e71becc4d0..87dfea491e76afd917c9ba0bcad616be57612b9f 100644
--- a/apps/files_trashbin/js/trash.js
+++ b/apps/files_trashbin/js/trash.js
@@ -2,9 +2,9 @@
 $(document).ready(function() {
 
 	if (typeof FileActions !== 'undefined') {
-		FileActions.register('all', 'Restore', OC.PERMISSION_READ,  OC.imagePath('core', 'actions/undelete.png'), function(filename) {
+		FileActions.register('all', 'Restore', OC.PERMISSION_READ, OC.imagePath('core', 'actions/history'), function(filename) {
 			var tr=$('tr').filterAttr('data-file', filename);
-			var spinner = '<img class="move2trash" title="'+t('files_trashbin', 'perform restore operation')+'" src="'+ OC.imagePath('core', 'loader.gif') +'"></a>';
+			var spinner = '<img class="move2trash" title="'+t('files_trashbin', 'perform restore operation')+'" src="'+ OC.imagePath('core', 'loading.gif') +'"></a>';
 			var undeleteAction = $('tr').filterAttr('data-file',filename).children("td.date");
 			var files = tr.attr('data-file');
 			undeleteAction[0].innerHTML = undeleteAction[0].innerHTML+spinner;
@@ -94,7 +94,7 @@ $(document).ready(function() {
 
 		$('.undelete').click('click',function(event) {
 			event.preventDefault();
-			var spinner = '<img class="move2trash" title="'+t('files_trashbin', 'perform restore operation')+'" src="'+ OC.imagePath('core', 'loader.gif') +'"></a>';
+			var spinner = '<img class="move2trash" title="'+t('files_trashbin', 'perform restore operation')+'" src="'+ OC.imagePath('core', 'loading.gif') +'"></a>';
 			var files=getSelectedFiles('file');
 			var fileslist = JSON.stringify(files);
 			var dirlisting=getSelectedFiles('dirlisting')[0];
diff --git a/apps/files_trashbin/l10n/eo.php b/apps/files_trashbin/l10n/eo.php
index 3288c4fcdc56187e88df52df3e501e71e3cb3848..161e9c3e88ac110eac7d7d2ec79938ed755a3506 100644
--- a/apps/files_trashbin/l10n/eo.php
+++ b/apps/files_trashbin/l10n/eo.php
@@ -1,5 +1,6 @@
 <?php $TRANSLATIONS = array(
 "Error" => "Eraro",
+"Delete permanently" => "Forigi por ĉiam",
 "Name" => "Nomo",
 "1 folder" => "1 dosierujo",
 "{count} folders" => "{count} dosierujoj",
diff --git a/apps/files_trashbin/l10n/es.php b/apps/files_trashbin/l10n/es.php
index c267db7358af01e7f2996fa6f5495affe2938d2d..b2d5a2aed268320da0c79911173aeb4f2fce69b5 100644
--- a/apps/files_trashbin/l10n/es.php
+++ b/apps/files_trashbin/l10n/es.php
@@ -1,9 +1,9 @@
 <?php $TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "No se puede eliminar %s permanentemente",
 "Couldn't restore %s" => "No se puede restaurar %s",
-"perform restore operation" => "Restaurar",
+"perform restore operation" => "restaurar",
 "Error" => "Error",
-"delete file permanently" => "Eliminar archivo permanentemente",
+"delete file permanently" => "eliminar archivo permanentemente",
 "Delete permanently" => "Eliminar permanentemente",
 "Name" => "Nombre",
 "Deleted" => "Eliminado",
diff --git a/apps/files_trashbin/lib/trash.php b/apps/files_trashbin/lib/trash.php
index fb99fca5b3fdaf24c0c94f1ff5182277cf22efad..4174ef0d185342bb30166ed2df82eb329954de7f 100644
--- a/apps/files_trashbin/lib/trash.php
+++ b/apps/files_trashbin/lib/trash.php
@@ -24,17 +24,18 @@ namespace OCA\Files_Trashbin;
 
 class Trashbin {
 	// how long do we keep files in the trash bin if no other value is defined in the config file (unit: days)
-	const DEFAULT_RETENTION_OBLIGATION=180;
+
+	const DEFAULT_RETENTION_OBLIGATION = 180;
 
 	// unit: percentage; 50% of available disk space/quota
-	const DEFAULTMAXSIZE=50;
+	const DEFAULTMAXSIZE = 50;
 
 	public static function getUidAndFilename($filename) {
 		$uid = \OC\Files\Filesystem::getOwner($filename);
 		\OC\Files\Filesystem::initMountPoints($uid);
-		if ( $uid != \OCP\User::getUser() ) {
+		if ($uid != \OCP\User::getUser()) {
 			$info = \OC\Files\Filesystem::getFileInfo($filename);
-			$ownerView = new \OC\Files\View('/'.$uid.'/files');
+			$ownerView = new \OC\Files\View('/' . $uid . '/files');
 			$filename = $ownerView->getPath($info['fileid']);
 		}
 		return array($uid, $filename);
@@ -47,7 +48,7 @@ class Trashbin {
 	 */
 	public static function move2trash($file_path) {
 		$user = \OCP\User::getUser();
-		$view = new \OC\Files\View('/'. $user);
+		$view = new \OC\Files\View('/' . $user);
 		if (!$view->is_dir('files_trashbin')) {
 			$view->mkdir('files_trashbin');
 		}
@@ -68,101 +69,98 @@ class Trashbin {
 		$filename = $path_parts['basename'];
 		$location = $path_parts['dirname'];
 		$timestamp = time();
-		$mime = $view->getMimeType('files'.$file_path);
+		$mime = $view->getMimeType('files' . $file_path);
 
-		if ( $view->is_dir('files'.$file_path) ) {
+		if ($view->is_dir('files' . $file_path)) {
 			$type = 'dir';
 		} else {
 			$type = 'file';
 		}
-		
+
 		$trashbinSize = self::getTrashbinSize($user);
-		if ( $trashbinSize === false || $trashbinSize < 0 ) {
-			$trashbinSize = self::calculateSize(new \OC\Files\View('/'. $user.'/files_trashbin'));
+		if ($trashbinSize === false || $trashbinSize < 0) {
+			$trashbinSize = self::calculateSize(new \OC\Files\View('/' . $user . '/files_trashbin'));
 		}
 
 		// disable proxy to prevent recursive calls
 		$proxyStatus = \OC_FileProxy::$enabled;
 		\OC_FileProxy::$enabled = false;
-		$sizeOfAddedFiles = self::copy_recursive($file_path, 'files_trashbin/files/'.$filename.'.d'.$timestamp, $view);
+		$sizeOfAddedFiles = self::copy_recursive($file_path, 'files_trashbin/files/' . $filename . '.d' . $timestamp, $view);
 		\OC_FileProxy::$enabled = $proxyStatus;
 
-		if ( $view->file_exists('files_trashbin/files/'.$filename.'.d'.$timestamp) ) {
+		if ($view->file_exists('files_trashbin/files/' . $filename . '.d' . $timestamp)) {
 			$trashbinSize += $sizeOfAddedFiles;
 			$query = \OC_DB::prepare("INSERT INTO `*PREFIX*files_trash` (`id`,`timestamp`,`location`,`type`,`mime`,`user`) VALUES (?,?,?,?,?,?)");
 			$result = $query->execute(array($filename, $timestamp, $location, $type, $mime, $user));
-			if ( !$result ) { // if file couldn't be added to the database than also don't store it in the trash bin.
-				$view->deleteAll('files_trashbin/files/'.$filename.'.d'.$timestamp);
+			if (!$result) { // if file couldn't be added to the database than also don't store it in the trash bin.
+				$view->deleteAll('files_trashbin/files/' . $filename . '.d' . $timestamp);
 				\OC_Log::write('files_trashbin', 'trash bin database couldn\'t be updated', \OC_log::ERROR);
 				return;
 			}
-			\OCP\Util::emitHook('\OCA\Files_Trashbin\Trashbin', 'post_moveToTrash',
-					array('filePath' => \OC\Files\Filesystem::normalizePath($file_path),
-							'trashPath' => \OC\Files\Filesystem::normalizePath($filename.'.d'.$timestamp)));
+			\OCP\Util::emitHook('\OCA\Files_Trashbin\Trashbin', 'post_moveToTrash', array('filePath' => \OC\Files\Filesystem::normalizePath($file_path),
+				'trashPath' => \OC\Files\Filesystem::normalizePath($filename . '.d' . $timestamp)));
 
 			$trashbinSize += self::retainVersions($view, $file_path, $filename, $timestamp);
 			$trashbinSize += self::retainEncryptionKeys($view, $file_path, $filename, $timestamp);
-
 		} else {
-			\OC_Log::write('files_trashbin', 'Couldn\'t move '.$file_path.' to the trash bin', \OC_log::ERROR);
+			\OC_Log::write('files_trashbin', 'Couldn\'t move ' . $file_path . ' to the trash bin', \OC_log::ERROR);
 		}
 
 		$trashbinSize -= self::expire($trashbinSize);
-		
-		self::setTrashbinSize($user, $trashbinSize);
 
+		self::setTrashbinSize($user, $trashbinSize);
 	}
 
-    /**
-     * Move file versions to trash so that they can be restored later
-     *
-     * @param \OC\Files\View $view
-     * @param $file_path path to original file
-     * @param $filename of deleted file
-     * @param $timestamp when the file was deleted
-     *
-     * @return size of stored versions
-     */
+	/**
+	 * Move file versions to trash so that they can be restored later
+	 *
+	 * @param \OC\Files\View $view
+	 * @param $file_path path to original file
+	 * @param $filename of deleted file
+	 * @param $timestamp when the file was deleted
+	 *
+	 * @return size of stored versions
+	 */
 	private static function retainVersions($view, $file_path, $filename, $timestamp) {
 		$size = 0;
-        if (\OCP\App::isEnabled('files_versions')) {
+		if (\OCP\App::isEnabled('files_versions')) {
 
-            // disable proxy to prevent recursive calls
-            $proxyStatus = \OC_FileProxy::$enabled;
-            \OC_FileProxy::$enabled = false;
+			// disable proxy to prevent recursive calls
+			$proxyStatus = \OC_FileProxy::$enabled;
+			\OC_FileProxy::$enabled = false;
 
-            $user = \OCP\User::getUser();
+			$user = \OCP\User::getUser();
 			$rootView = new \OC\Files\View('/');
 
 			list($owner, $ownerPath) = self::getUidAndFilename($file_path);
 
-			if ($rootView->is_dir($owner.'/files_versions/' . $ownerPath)) {
-                $size += self::calculateSize(new \OC\Files\View('/' . $owner . '/files_versions/' . $ownerPath));
-                $rootView->rename($owner.'/files_versions/' . $ownerPath, $user.'/files_trashbin/versions/' . $filename . '.d' . $timestamp);
+			if ($rootView->is_dir($owner . '/files_versions/' . $ownerPath)) {
+				$size += self::calculateSize(new \OC\Files\View('/' . $owner . '/files_versions/' . $ownerPath));
+				$rootView->rename($owner . '/files_versions/' . $ownerPath, $user . '/files_trashbin/versions/' . $filename . '.d' . $timestamp);
 			} else if ($versions = \OCA\Files_Versions\Storage::getVersions($owner, $ownerPath)) {
-                foreach ($versions as $v) {
-					$size += $rootView->filesize($owner.'/files_versions' . $v['path'] . '.v' . $v['version']);
-                	$rootView->rename($owner.'/files_versions' . $v['path'] . '.v' . $v['version'], $user.'/files_trashbin/versions/' . $filename . '.v' . $v['version'] . '.d' . $timestamp);
+				foreach ($versions as $v) {
+					$size += $rootView->filesize($owner . '/files_versions' . $v['path'] . '.v' . $v['version']);
+					$rootView->rename($owner . '/files_versions' . $v['path'] . '.v' . $v['version'], $user . '/files_trashbin/versions/' . $filename . '.v' . $v['version'] . '.d' . $timestamp);
 				}
 			}
 
-            // enable proxy
-            \OC_FileProxy::$enabled = $proxyStatus;
+			// enable proxy
+			\OC_FileProxy::$enabled = $proxyStatus;
 		}
 
 		return $size;
 	}
 
-    /**
-     * Move encryption keys to trash so that they can be restored later
-     *
-     * @param \OC\Files\View $view
-     * @param $file_path path to original file
-     * @param $filename of deleted file
-     * @param $timestamp when the file was deleted
-     *
-     * @return size of encryption keys
-     */
+	/**
+	 * Move encryption keys to trash so that they can be restored later
+	 *
+	 * @param \OC\Files\View $view
+	 * @param $file_path path to original file
+	 * @param $filename of deleted file
+	 * @param $timestamp when the file was deleted
+	 *
+	 * @return size of encryption keys
+	 */
 	private static function retainEncryptionKeys($view, $file_path, $filename, $timestamp) {
 		$size = 0;
 
@@ -173,66 +171,72 @@ class Trashbin {
 
 			list($owner, $ownerPath) = self::getUidAndFilename($file_path);
 
+			$util = new \OCA\Encryption\Util(new \OC_FilesystemView('/'), $user);
 
-            // disable proxy to prevent recursive calls
-            $proxyStatus = \OC_FileProxy::$enabled;
-            \OC_FileProxy::$enabled = false;
+			// disable proxy to prevent recursive calls
+			$proxyStatus = \OC_FileProxy::$enabled;
+			\OC_FileProxy::$enabled = false;
 
-            // retain key files
-			$keyfile = \OC\Files\Filesystem::normalizePath($owner.'/files_encryption/keyfiles/' . $ownerPath);
+			if ($util->isSystemWideMountPoint($ownerPath)) {
+				$baseDir = '/files_encryption/';
+			} else {
+				$baseDir = $owner . '/files_encryption/';
+			}
+
+			$keyfile = \OC\Files\Filesystem::normalizePath($baseDir . '/keyfiles/' . $ownerPath);
 
-            if ($rootView->is_dir($keyfile) || $rootView->file_exists($keyfile . '.key')) {
-                // move keyfiles
-			    if ($rootView->is_dir($keyfile)) {
-                    $size += self::calculateSize(new \OC\Files\View($keyfile));
-					$rootView->rename($keyfile, $user.'/files_trashbin/keyfiles/' . $filename . '.d' . $timestamp);
+			if ($rootView->is_dir($keyfile) || $rootView->file_exists($keyfile . '.key')) {
+				// move keyfiles
+				if ($rootView->is_dir($keyfile)) {
+					$size += self::calculateSize(new \OC\Files\View($keyfile));
+					$rootView->rename($keyfile, $user . '/files_trashbin/keyfiles/' . $filename . '.d' . $timestamp);
 				} else {
 					$size += $rootView->filesize($keyfile . '.key');
-            		$rootView->rename($keyfile . '.key', $user.'/files_trashbin/keyfiles/' . $filename . '.key.d' . $timestamp);
+					$rootView->rename($keyfile . '.key', $user . '/files_trashbin/keyfiles/' . $filename . '.key.d' . $timestamp);
 				}
 			}
 
-            // retain share keys
-			$sharekeys = \OC\Files\Filesystem::normalizePath($owner.'/files_encryption/share-keys/' . $ownerPath);
+			// retain share keys
+			$sharekeys = \OC\Files\Filesystem::normalizePath($baseDir . '/share-keys/' . $ownerPath);
 
 			if ($rootView->is_dir($sharekeys)) {
 				$size += self::calculateSize(new \OC\Files\View($sharekeys));
-				$rootView->rename($sharekeys, $user.'/files_trashbin/share-keys/' . $filename . '.d' . $timestamp);
+				$rootView->rename($sharekeys, $user . '/files_trashbin/share-keys/' . $filename . '.d' . $timestamp);
 			} else {
-                // get local path to share-keys
-                $localShareKeysPath = $rootView->getLocalFile($sharekeys);
+				// get local path to share-keys
+				$localShareKeysPath = $rootView->getLocalFile($sharekeys);
+				$escapedLocalShareKeysPath = preg_replace('/(\*|\?|\[)/', '[$1]', $localShareKeysPath);
 
-                // handle share-keys
-                $matches = glob(preg_quote($localShareKeysPath).'*.shareKey');
-                foreach ($matches as $src) {
-                    // get source file parts
-                    $pathinfo = pathinfo($src);
+				// handle share-keys
+				$matches = glob($escapedLocalShareKeysPath . '*.shareKey');
+				foreach ($matches as $src) {
+					// get source file parts
+					$pathinfo = pathinfo($src);
 
-                    // we only want to keep the owners key so we can access the private key
-                    $ownerShareKey = $filename . '.' . $user. '.shareKey';
+					// we only want to keep the owners key so we can access the private key
+					$ownerShareKey = $filename . '.' . $user . '.shareKey';
 
-                    // if we found the share-key for the owner, we need to move it to files_trashbin
-                    if($pathinfo['basename'] == $ownerShareKey) {
+					// if we found the share-key for the owner, we need to move it to files_trashbin
+					if ($pathinfo['basename'] == $ownerShareKey) {
 
-                        // calculate size
-                        $size += $rootView->filesize($sharekeys. '.' . $user. '.shareKey');
+						// calculate size
+						$size += $rootView->filesize($sharekeys . '.' . $user . '.shareKey');
 
-                        // move file
-                        $rootView->rename($sharekeys. '.' . $user. '.shareKey', $user.'/files_trashbin/share-keys/' . $ownerShareKey . '.d' . $timestamp);
-                    } else {
+						// move file
+						$rootView->rename($sharekeys . '.' . $user . '.shareKey', $user . '/files_trashbin/share-keys/' . $ownerShareKey . '.d' . $timestamp);
+					} else {
 
-                        // calculate size
-                        $size += filesize($src);
-                        
-                        // don't keep other share-keys
-                        unlink($src);
-                    }
-                }
+						// calculate size
+						$size += filesize($src);
 
-            }
+						// don't keep other share-keys
+						unlink($src);
+					}
+				}
+			}
 
-            // enable proxy
-            \OC_FileProxy::$enabled = $proxyStatus;
+			// enable proxy
+			\OC_FileProxy::$enabled = $proxyStatus;
 		}
 		return $size;
 	}
@@ -242,95 +246,94 @@ class Trashbin {
 	 * @param $file path to the deleted file
 	 * @param $filename name of the file
 	 * @param $timestamp time when the file was deleted
-     *
-     * @return bool
-     */
+	 *
+	 * @return bool
+	 */
 	public static function restore($file, $filename, $timestamp) {
 
-        $user = \OCP\User::getUser();
-		$view = new \OC\Files\View('/'.$user);
-		
+		$user = \OCP\User::getUser();
+		$view = new \OC\Files\View('/' . $user);
+
 		$trashbinSize = self::getTrashbinSize($user);
-		if ( $trashbinSize === false || $trashbinSize < 0 ) {
-			$trashbinSize = self::calculateSize(new \OC\Files\View('/'. $user.'/files_trashbin'));
+		if ($trashbinSize === false || $trashbinSize < 0) {
+			$trashbinSize = self::calculateSize(new \OC\Files\View('/' . $user . '/files_trashbin'));
 		}
-		if ( $timestamp ) {
+		if ($timestamp) {
 			$query = \OC_DB::prepare('SELECT `location`,`type` FROM `*PREFIX*files_trash`'
-				.' WHERE `user`=? AND `id`=? AND `timestamp`=?');
-			$result = $query->execute(array($user,$filename,$timestamp))->fetchAll();
-			if ( count($result) != 1 ) {
+					. ' WHERE `user`=? AND `id`=? AND `timestamp`=?');
+			$result = $query->execute(array($user, $filename, $timestamp))->fetchAll();
+			if (count($result) != 1) {
 				\OC_Log::write('files_trashbin', 'trash bin database inconsistent!', \OC_Log::ERROR);
 				return false;
 			}
 
 			// if location no longer exists, restore file in the root directory
 			$location = $result[0]['location'];
-			if ( $result[0]['location'] != '/' &&
-				(!$view->is_dir('files'.$result[0]['location']) ||
-				 !$view->isUpdatable('files'.$result[0]['location'])) ) {
+			if ($result[0]['location'] != '/' &&
+				(!$view->is_dir('files' . $result[0]['location']) ||
+				!$view->isUpdatable('files' . $result[0]['location']))) {
 				$location = '';
 			}
 		} else {
 			$path_parts = pathinfo($file);
 			$result[] = array(
-					'location' => $path_parts['dirname'],
-					'type' => $view->is_dir('/files_trashbin/files/'.$file) ? 'dir' : 'files',
-					);
+				'location' => $path_parts['dirname'],
+				'type' => $view->is_dir('/files_trashbin/files/' . $file) ? 'dir' : 'files',
+			);
 			$location = '';
 		}
-		
-		$source = \OC\Files\Filesystem::normalizePath('files_trashbin/files/'.$file);
-		$target = \OC\Files\Filesystem::normalizePath('files/'.$location.'/'.$filename);
+
+		$source = \OC\Files\Filesystem::normalizePath('files_trashbin/files/' . $file);
+		$target = \OC\Files\Filesystem::normalizePath('files/' . $location . '/' . $filename);
 
 		// we need a  extension in case a file/dir with the same name already exists
 		$ext = self::getUniqueExtension($location, $filename, $view);
 		$mtime = $view->filemtime($source);
 
-        // disable proxy to prevent recursive calls
-        $proxyStatus = \OC_FileProxy::$enabled;
-        \OC_FileProxy::$enabled = false;
+		// disable proxy to prevent recursive calls
+		$proxyStatus = \OC_FileProxy::$enabled;
+		\OC_FileProxy::$enabled = false;
 
-        // restore file
-        $restoreResult = $view->rename($source, $target.$ext);
+		// restore file
+		$restoreResult = $view->rename($source, $target . $ext);
 
-        // handle the restore result
-        if( $restoreResult ) {
+		// handle the restore result
+		if ($restoreResult) {
 			$fakeRoot = $view->getRoot();
-			$view->chroot('/'.$user.'/files');
-			$view->touch('/'.$location.'/'.$filename.$ext, $mtime);
+			$view->chroot('/' . $user . '/files');
+			$view->touch('/' . $location . '/' . $filename . $ext, $mtime);
 			$view->chroot($fakeRoot);
-			\OCP\Util::emitHook('\OCA\Files_Trashbin\Trashbin', 'post_restore', 
-					array('filePath' => \OC\Files\Filesystem::normalizePath('/'.$location.'/'.$filename.$ext),
-							'trashPath' => \OC\Files\Filesystem::normalizePath($file)));
-			if ($view->is_dir($target.$ext)) {
-				$trashbinSize -= self::calculateSize(new \OC\Files\View('/'.$user.'/'.$target.$ext));
+			\OCP\Util::emitHook('\OCA\Files_Trashbin\Trashbin', 'post_restore', array('filePath' => \OC\Files\Filesystem::normalizePath('/' . $location . '/' . $filename . $ext),
+				'trashPath' => \OC\Files\Filesystem::normalizePath($file)));
+			if ($view->is_dir($target . $ext)) {
+				$trashbinSize -= self::calculateSize(new \OC\Files\View('/' . $user . '/' . $target . $ext));
 			} else {
-				$trashbinSize -= $view->filesize($target.$ext);
+				$trashbinSize -= $view->filesize($target . $ext);
 			}
 
-            $trashbinSize -= self::restoreVersions($view, $file, $filename, $ext, $location, $timestamp);
+			$trashbinSize -= self::restoreVersions($view, $file, $filename, $ext, $location, $timestamp);
 			$trashbinSize -= self::restoreEncryptionKeys($view, $file, $filename, $ext, $location, $timestamp);
 
-			if ( $timestamp ) {
+			if ($timestamp) {
 				$query = \OC_DB::prepare('DELETE FROM `*PREFIX*files_trash` WHERE `user`=? AND `id`=? AND `timestamp`=?');
-				$query->execute(array($user,$filename,$timestamp));
+				$query->execute(array($user, $filename, $timestamp));
 			}
 
 			self::setTrashbinSize($user, $trashbinSize);
 
-            // enable proxy
-            \OC_FileProxy::$enabled = $proxyStatus;
+			// enable proxy
+			\OC_FileProxy::$enabled = $proxyStatus;
 
 			return true;
 		}
 
-        // enable proxy
-        \OC_FileProxy::$enabled = $proxyStatus;
+		// enable proxy
+		\OC_FileProxy::$enabled = $proxyStatus;
 
 		return false;
 	}
 
-    /**
+	/**
 	 * @brief restore versions from trash bin
 	 *
 	 * @param \OC\Files\View $view file view
@@ -339,20 +342,20 @@ class Trashbin {
 	 * @param $ext file extension in case a file with the same $filename already exists
 	 * @param $location location if file
 	 * @param $timestamp deleteion time
-     *
+	 *
 	 * @return size of restored versions
 	 */
 	private static function restoreVersions($view, $file, $filename, $ext, $location, $timestamp) {
 		$size = 0;
 		if (\OCP\App::isEnabled('files_versions')) {
-            // disable proxy to prevent recursive calls
-            $proxyStatus = \OC_FileProxy::$enabled;
-            \OC_FileProxy::$enabled = false;
+			// disable proxy to prevent recursive calls
+			$proxyStatus = \OC_FileProxy::$enabled;
+			\OC_FileProxy::$enabled = false;
 
-            $user = \OCP\User::getUser();
+			$user = \OCP\User::getUser();
 			$rootView = new \OC\Files\View('/');
 
-			$target = \OC\Files\Filesystem::normalizePath('/'.$location.'/'.$filename.$ext);
+			$target = \OC\Files\Filesystem::normalizePath('/' . $location . '/' . $filename . $ext);
 
 			list($owner, $ownerPath) = self::getUidAndFilename($target);
 
@@ -362,190 +365,196 @@ class Trashbin {
 				$versionedFile = $file;
 			}
 
-            if ($view->is_dir('/files_trashbin/versions/'.$file)) {
+			if ($view->is_dir('/files_trashbin/versions/' . $file)) {
 				$size += self::calculateSize(new \OC\Files\View('/' . $user . '/' . 'files_trashbin/versions/' . $file));
-            	$rootView->rename(\OC\Files\Filesystem::normalizePath($user.'/files_trashbin/versions/' . $file), \OC\Files\Filesystem::normalizePath($owner.'/files_versions/' . $ownerPath));
+				$rootView->rename(\OC\Files\Filesystem::normalizePath($user . '/files_trashbin/versions/' . $file), \OC\Files\Filesystem::normalizePath($owner . '/files_versions/' . $ownerPath));
 			} else if ($versions = self::getVersionsFromTrash($versionedFile, $timestamp)) {
-                foreach ($versions as $v) {
-            		if ($timestamp) {
-            			$size += $view->filesize('files_trashbin/versions/' . $versionedFile . '.v' . $v . '.d' . $timestamp);
-                        $rootView->rename($user.'/files_trashbin/versions/' . $versionedFile . '.v' . $v . '.d' . $timestamp, $owner.'/files_versions/' . $ownerPath . '.v' . $v);
+				foreach ($versions as $v) {
+					if ($timestamp) {
+						$size += $view->filesize('files_trashbin/versions/' . $versionedFile . '.v' . $v . '.d' . $timestamp);
+						$rootView->rename($user . '/files_trashbin/versions/' . $versionedFile . '.v' . $v . '.d' . $timestamp, $owner . '/files_versions/' . $ownerPath . '.v' . $v);
 					} else {
-            			$size += $view->filesize('files_trashbin/versions/' . $versionedFile . '.v' . $v);
-						$rootView->rename($user.'/files_trashbin/versions/' . $versionedFile . '.v' . $v, $owner.'/files_versions/' . $ownerPath . '.v' . $v);
+						$size += $view->filesize('files_trashbin/versions/' . $versionedFile . '.v' . $v);
+						$rootView->rename($user . '/files_trashbin/versions/' . $versionedFile . '.v' . $v, $owner . '/files_versions/' . $ownerPath . '.v' . $v);
 					}
 				}
 			}
 
-            // enable proxy
-            \OC_FileProxy::$enabled = $proxyStatus;
+			// enable proxy
+			\OC_FileProxy::$enabled = $proxyStatus;
 		}
 		return $size;
 	}
 
-
-    /**
-     * @brief restore encryption keys from trash bin
-     *
-     * @param \OC\Files\View $view
-     * @param $file complete path to file
-     * @param $filename name of file
-     * @param $ext file extension in case a file with the same $filename already exists
-     * @param $location location of file
-     * @param $timestamp deleteion time
-     *
-     * @return size of restored encrypted file
-     */
-    private static function restoreEncryptionKeys($view, $file, $filename, $ext, $location, $timestamp) {
+	/**
+	 * @brief restore encryption keys from trash bin
+	 *
+	 * @param \OC\Files\View $view
+	 * @param $file complete path to file
+	 * @param $filename name of file
+	 * @param $ext file extension in case a file with the same $filename already exists
+	 * @param $location location of file
+	 * @param $timestamp deleteion time
+	 *
+	 * @return size of restored encrypted file
+	 */
+	private static function restoreEncryptionKeys($view, $file, $filename, $ext, $location, $timestamp) {
 		// Take care of encryption keys TODO! Get '.key' in file between file name and delete date (also for permanent delete!)
 		$size = 0;
 		if (\OCP\App::isEnabled('files_encryption')) {
 			$user = \OCP\User::getUser();
 			$rootView = new \OC\Files\View('/');
 
-			$target = \OC\Files\Filesystem::normalizePath('/'.$location.'/'.$filename.$ext);
+			$target = \OC\Files\Filesystem::normalizePath('/' . $location . '/' . $filename . $ext);
 
 			list($owner, $ownerPath) = self::getUidAndFilename($target);
 
-            $path_parts = pathinfo($file);
-            $source_location = $path_parts['dirname'];
-
-            if ($view->is_dir('/files_trashbin/keyfiles/'.$file)) {
-                if($source_location != '.') {
-                    $keyfile = \OC\Files\Filesystem::normalizePath($user.'/files_trashbin/keyfiles/' . $source_location . '/' . $filename);
-                    $sharekey = \OC\Files\Filesystem::normalizePath($user.'/files_trashbin/share-keys/' . $source_location . '/' . $filename);
-                } else {
-                    $keyfile = \OC\Files\Filesystem::normalizePath($user.'/files_trashbin/keyfiles/' . $filename);
-                    $sharekey = \OC\Files\Filesystem::normalizePath($user.'/files_trashbin/share-keys/' . $filename);
-                }
-            } else {
-                $keyfile = \OC\Files\Filesystem::normalizePath($user.'/files_trashbin/keyfiles/' . $source_location . '/' . $filename . '.key');
-            }
-
-            if ($timestamp) {
-                $keyfile .= '.d' . $timestamp;
-            }
-
-            // disable proxy to prevent recursive calls
-            $proxyStatus = \OC_FileProxy::$enabled;
-            \OC_FileProxy::$enabled = false;
-
-            if ($rootView->file_exists($keyfile)) {
-                // handle directory
-            	if ($rootView->is_dir($keyfile)) {
-
-                    // handle keyfiles
-                    $size += self::calculateSize(new \OC\Files\View($keyfile));
-            		$rootView->rename($keyfile, $owner.'/files_encryption/keyfiles/' . $ownerPath);
-
-                    // handle share-keys
-                    if ($timestamp) {
-                        $sharekey .= '.d' . $timestamp;
-                    }
-					$size += self::calculateSize(new \OC\Files\View($sharekey));
-                    $rootView->rename($sharekey, $owner.'/files_encryption/share-keys/' . $ownerPath);
+			$util = new \OCA\Encryption\Util(new \OC_FilesystemView('/'), $user);
+
+			if ($util->isSystemWideMountPoint($ownerPath)) {
+				$baseDir = '/files_encryption/';
+			} else {
+				$baseDir = $owner . '/files_encryption/';
+			}
+
+			$path_parts = pathinfo($file);
+			$source_location = $path_parts['dirname'];
+
+			if ($view->is_dir('/files_trashbin/keyfiles/' . $file)) {
+				if ($source_location != '.') {
+					$keyfile = \OC\Files\Filesystem::normalizePath($user . '/files_trashbin/keyfiles/' . $source_location . '/' . $filename);
+					$sharekey = \OC\Files\Filesystem::normalizePath($user . '/files_trashbin/share-keys/' . $source_location . '/' . $filename);
+				} else {
+					$keyfile = \OC\Files\Filesystem::normalizePath($user . '/files_trashbin/keyfiles/' . $filename);
+					$sharekey = \OC\Files\Filesystem::normalizePath($user . '/files_trashbin/share-keys/' . $filename);
+				}
+			} else {
+				$keyfile = \OC\Files\Filesystem::normalizePath($user . '/files_trashbin/keyfiles/' . $source_location . '/' . $filename . '.key');
+			}
+
+			if ($timestamp) {
+				$keyfile .= '.d' . $timestamp;
+			}
+
+			// disable proxy to prevent recursive calls
+			$proxyStatus = \OC_FileProxy::$enabled;
+			\OC_FileProxy::$enabled = false;
+
+			if ($rootView->file_exists($keyfile)) {
+				// handle directory
+				if ($rootView->is_dir($keyfile)) {
 
+					// handle keyfiles
+					$size += self::calculateSize(new \OC\Files\View($keyfile));
+					$rootView->rename($keyfile, $baseDir . '/keyfiles/' . $ownerPath);
+
+					// handle share-keys
+					if ($timestamp) {
+						$sharekey .= '.d' . $timestamp;
+					}
+					$size += self::calculateSize(new \OC\Files\View($sharekey));
+					$rootView->rename($sharekey, $baseDir . '/share-keys/' . $ownerPath);
 				} else {
-                    // handle keyfiles
+					// handle keyfiles
 					$size += $rootView->filesize($keyfile);
-            		$rootView->rename($keyfile, $owner.'/files_encryption/keyfiles/' . $ownerPath . '.key');
+					$rootView->rename($keyfile, $baseDir . '/keyfiles/' . $ownerPath . '.key');
 
-                    // handle share-keys
-                    $ownerShareKey = \OC\Files\Filesystem::normalizePath($user.'/files_trashbin/share-keys/' . $source_location . '/' . $filename . '.' . $user. '.shareKey');
-                    if ($timestamp) {
-                        $ownerShareKey .= '.d' . $timestamp;
-                    }
+					// handle share-keys
+					$ownerShareKey = \OC\Files\Filesystem::normalizePath($user . '/files_trashbin/share-keys/' . $source_location . '/' . $filename . '.' . $user . '.shareKey');
+					if ($timestamp) {
+						$ownerShareKey .= '.d' . $timestamp;
+					}
 
-                    $size += $rootView->filesize($ownerShareKey);
+					$size += $rootView->filesize($ownerShareKey);
 
-                    // move only owners key
-                    $rootView->rename($ownerShareKey, $owner.'/files_encryption/share-keys/' . $ownerPath . '.' . $user. '.shareKey');
+					// move only owners key
+					$rootView->rename($ownerShareKey, $baseDir . '/share-keys/' . $ownerPath . '.' . $user . '.shareKey');
 
-                    // try to re-share if file is shared
-                    $filesystemView = new \OC_FilesystemView('/');
-                    $session = new \OCA\Encryption\Session($filesystemView);
-                    $util = new \OCA\Encryption\Util($filesystemView, $user);
+					// try to re-share if file is shared
+					$filesystemView = new \OC_FilesystemView('/');
+					$session = new \OCA\Encryption\Session($filesystemView);
+					$util = new \OCA\Encryption\Util($filesystemView, $user);
 
-                    // fix the file size
-                    $absolutePath = \OC\Files\Filesystem::normalizePath('/' . $owner . '/files/'. $ownerPath);
-                    $util->fixFileSize($absolutePath);
+					// fix the file size
+					$absolutePath = \OC\Files\Filesystem::normalizePath('/' . $owner . '/files/' . $ownerPath);
+					$util->fixFileSize($absolutePath);
 
-                    // get current sharing state
-                    $sharingEnabled = \OCP\Share::isEnabled();
+					// get current sharing state
+					$sharingEnabled = \OCP\Share::isEnabled();
 
-                    // get the final filename
-                    $target = \OC\Files\Filesystem::normalizePath($location.'/'.$filename);
+					// get the final filename
+					$target = \OC\Files\Filesystem::normalizePath($location . '/' . $filename);
 
-                    // get users sharing this file
-                    $usersSharing = $util->getSharingUsersArray($sharingEnabled, $target.$ext, $user);
+					// get users sharing this file
+					$usersSharing = $util->getSharingUsersArray($sharingEnabled, $target . $ext, $user);
 
-                    // Attempt to set shareKey
-                    $util->setSharedFileKeyfiles($session, $usersSharing, $target.$ext);
+					// Attempt to set shareKey
+					$util->setSharedFileKeyfiles($session, $usersSharing, $target . $ext);
 				}
 			}
 
-            // enable proxy
-            \OC_FileProxy::$enabled = $proxyStatus;
+			// enable proxy
+			\OC_FileProxy::$enabled = $proxyStatus;
 		}
 		return $size;
 	}
 
 	/**
 	 * @brief delete file from trash bin permanently
-     *
+	 *
 	 * @param $filename path to the file
 	 * @param $timestamp of deletion time
-     *
+	 *
 	 * @return size of deleted files
 	 */
-	public static function delete($filename, $timestamp=null) {
+	public static function delete($filename, $timestamp = null) {
 		$user = \OCP\User::getUser();
-		$view = new \OC\Files\View('/'.$user);
+		$view = new \OC\Files\View('/' . $user);
 		$size = 0;
-	
+
 		$trashbinSize = self::getTrashbinSize($user);
-		if ( $trashbinSize === false || $trashbinSize < 0 ) {
-			$trashbinSize = self::calculateSize(new \OC\Files\View('/'. $user.'/files_trashbin'));
+		if ($trashbinSize === false || $trashbinSize < 0) {
+			$trashbinSize = self::calculateSize(new \OC\Files\View('/' . $user . '/files_trashbin'));
 		}
 
-		if ( $timestamp ) {
+		if ($timestamp) {
 			$query = \OC_DB::prepare('DELETE FROM `*PREFIX*files_trash` WHERE `user`=? AND `id`=? AND `timestamp`=?');
-			$query->execute(array($user,$filename,$timestamp));
-			$file = $filename.'.d'.$timestamp;
+			$query->execute(array($user, $filename, $timestamp));
+			$file = $filename . '.d' . $timestamp;
 		} else {
 			$file = $filename;
 		}
 
 		$size += self::deleteVersions($view, $file, $filename, $timestamp);
 		$size += self::deleteEncryptionKeys($view, $file, $filename, $timestamp);
-	
-		if ($view->is_dir('/files_trashbin/files/'.$file)) {
-			$size += self::calculateSize(new \OC\Files\View('/'.$user.'/files_trashbin/files/'.$file));
+
+		if ($view->is_dir('/files_trashbin/files/' . $file)) {
+			$size += self::calculateSize(new \OC\Files\View('/' . $user . '/files_trashbin/files/' . $file));
 		} else {
-			$size += $view->filesize('/files_trashbin/files/'.$file);
+			$size += $view->filesize('/files_trashbin/files/' . $file);
 		}
-		$view->unlink('/files_trashbin/files/'.$file);
+		$view->unlink('/files_trashbin/files/' . $file);
 		$trashbinSize -= $size;
 		self::setTrashbinSize($user, $trashbinSize);
-		
+
 		return $size;
 	}
 
 	private static function deleteVersions($view, $file, $filename, $timestamp) {
 		$size = 0;
-		if ( \OCP\App::isEnabled('files_versions') ) {
+		if (\OCP\App::isEnabled('files_versions')) {
 			$user = \OCP\User::getUser();
-			if ($view->is_dir('files_trashbin/versions/'.$file)) {
-				$size += self::calculateSize(new \OC\Files\view('/'.$user.'/files_trashbin/versions/'.$file));
-				$view->unlink('files_trashbin/versions/'.$file);
-			} else if ( $versions = self::getVersionsFromTrash($filename, $timestamp) ) {
+			if ($view->is_dir('files_trashbin/versions/' . $file)) {
+				$size += self::calculateSize(new \OC\Files\view('/' . $user . '/files_trashbin/versions/' . $file));
+				$view->unlink('files_trashbin/versions/' . $file);
+			} else if ($versions = self::getVersionsFromTrash($filename, $timestamp)) {
 				foreach ($versions as $v) {
-					if ($timestamp ) {
-						$size += $view->filesize('/files_trashbin/versions/'.$filename.'.v'.$v.'.d'.$timestamp);
-						$view->unlink('/files_trashbin/versions/'.$filename.'.v'.$v.'.d'.$timestamp);
+					if ($timestamp) {
+						$size += $view->filesize('/files_trashbin/versions/' . $filename . '.v' . $v . '.d' . $timestamp);
+						$view->unlink('/files_trashbin/versions/' . $filename . '.v' . $v . '.d' . $timestamp);
 					} else {
-						$size += $view->filesize('/files_trashbin/versions/'.$filename.'.v'.$v);
-						$view->unlink('/files_trashbin/versions/'.$filename.'.v'.$v);
+						$size += $view->filesize('/files_trashbin/versions/' . $filename . '.v' . $v);
+						$view->unlink('/files_trashbin/versions/' . $filename . '.v' . $v);
 					}
 				}
 			}
@@ -560,10 +569,10 @@ class Trashbin {
 
 			if ($view->is_dir('/files_trashbin/files/' . $file)) {
 				$keyfile = \OC\Files\Filesystem::normalizePath('files_trashbin/keyfiles/' . $filename);
-				$sharekeys =  \OC\Files\Filesystem::normalizePath('files_trashbin/share-keys/' . $filename);
+				$sharekeys = \OC\Files\Filesystem::normalizePath('files_trashbin/share-keys/' . $filename);
 			} else {
 				$keyfile = \OC\Files\Filesystem::normalizePath('files_trashbin/keyfiles/' . $filename . '.key');
-				$sharekeys =  \OC\Files\Filesystem::normalizePath('files_trashbin/share-keys/' . $filename . '.' . $user . '.shareKey');
+				$sharekeys = \OC\Files\Filesystem::normalizePath('files_trashbin/share-keys/' . $filename . '.' . $user . '.shareKey');
 			}
 			if ($timestamp) {
 				$keyfile .= '.d' . $timestamp;
@@ -590,17 +599,17 @@ class Trashbin {
 	 * @param $timestamp of deletion time
 	 * @return true if file exists, otherwise false
 	 */
-	public static function file_exists($filename, $timestamp=null) {
+	public static function file_exists($filename, $timestamp = null) {
 		$user = \OCP\User::getUser();
-		$view = new \OC\Files\View('/'.$user);
+		$view = new \OC\Files\View('/' . $user);
 
 		if ($timestamp) {
-			$filename = $filename.'.d'.$timestamp;
+			$filename = $filename . '.d' . $timestamp;
 		} else {
 			$filename = $filename;
 		}
 
-		$target = \OC\Files\Filesystem::normalizePath('files_trashbin/files/'.$filename);
+		$target = \OC\Files\Filesystem::normalizePath('files_trashbin/files/' . $filename);
 		return $view->file_exists($target);
 	}
 
@@ -630,11 +639,11 @@ class Trashbin {
 		$softQuota = true;
 		$user = \OCP\User::getUser();
 		$quota = \OC_Preferences::getValue($user, 'files', 'quota');
-		$view = new \OC\Files\View('/'.$user);
-		if ( $quota === null || $quota === 'default') {
+		$view = new \OC\Files\View('/' . $user);
+		if ($quota === null || $quota === 'default') {
 			$quota = \OC_Appconfig::getValue('files', 'default_quota');
 		}
-		if ( $quota === null || $quota === 'none' ) {
+		if ($quota === null || $quota === 'none') {
 			$quota = \OC\Files\Filesystem::free_space('/');
 			$softQuota = false;
 		} else {
@@ -645,11 +654,11 @@ class Trashbin {
 		// subtract size of files and current trash bin size from quota
 		if ($softQuota) {
 			$rootInfo = $view->getFileInfo('/files/');
-			$free = $quota-$rootInfo['size']; // remaining free space for user
-			if ( $free > 0 ) {
+			$free = $quota - $rootInfo['size']; // remaining free space for user
+			if ($free > 0) {
 				$availableSpace = ($free * self::DEFAULTMAXSIZE / 100) - $trashbinSize; // how much space can be used for versions
 			} else {
-				$availableSpace = $free-$trashbinSize;
+				$availableSpace = $free - $trashbinSize;
 			}
 		} else {
 			$availableSpace = $quota;
@@ -665,43 +674,40 @@ class Trashbin {
 	private static function expire($trashbinSize) {
 
 		$user = \OCP\User::getUser();
-		$view = new \OC\Files\View('/'.$user);
+		$view = new \OC\Files\View('/' . $user);
 		$availableSpace = self::calculateFreeSpace($trashbinSize);
 		$size = 0;
 
 		$query = \OC_DB::prepare('SELECT `location`,`type`,`id`,`timestamp` FROM `*PREFIX*files_trash` WHERE `user`=?');
 		$result = $query->execute(array($user))->fetchAll();
 
-		$retention_obligation = \OC_Config::getValue('trashbin_retention_obligation',
-			self::DEFAULT_RETENTION_OBLIGATION);
+		$retention_obligation = \OC_Config::getValue('trashbin_retention_obligation', self::DEFAULT_RETENTION_OBLIGATION);
 
 		$limit = time() - ($retention_obligation * 86400);
 
-		foreach ( $result as $r ) {
+		foreach ($result as $r) {
 			$timestamp = $r['timestamp'];
 			$filename = $r['id'];
-			if ( $r['timestamp'] < $limit ) {
+			if ($r['timestamp'] < $limit) {
 				$size += self::delete($filename, $timestamp);
-				\OC_Log::write('files_trashbin', 'remove "'.$filename.'" fom trash bin because it is older than '.$retention_obligation, \OC_log::INFO);
+				\OC_Log::write('files_trashbin', 'remove "' . $filename . '" fom trash bin because it is older than ' . $retention_obligation, \OC_log::INFO);
 			}
 		}
 		$availableSpace = $availableSpace + $size;
 		// if size limit for trash bin reached, delete oldest files in trash bin
 		if ($availableSpace < 0) {
 			$query = \OC_DB::prepare('SELECT `location`,`type`,`id`,`timestamp` FROM `*PREFIX*files_trash`'
-				.' WHERE `user`=? ORDER BY `timestamp` ASC');
+					. ' WHERE `user`=? ORDER BY `timestamp` ASC');
 			$result = $query->execute(array($user))->fetchAll();
 			$length = count($result);
 			$i = 0;
-			while ( $i < $length &&   $availableSpace < 0 ) {
+			while ($i < $length && $availableSpace < 0) {
 				$tmp = self::delete($result[$i]['id'], $result[$i]['timestamp']);
-				\OC_Log::write('files_trashbin', 'remove "'.$result[$i]['id'].'" ('.$tmp.'B) to meet the limit of trash bin size (50% of available quota)', \OC_log::INFO);
+				\OC_Log::write('files_trashbin', 'remove "' . $result[$i]['id'] . '" (' . $tmp . 'B) to meet the limit of trash bin size (50% of available quota)', \OC_log::INFO);
 				$availableSpace += $tmp;
 				$size += $tmp;
 				$i++;
 			}
-
-
 		}
 
 		return $size;
@@ -714,25 +720,25 @@ class Trashbin {
 	 * @param $destination destination path relative to the users root directoy
 	 * @param $view file view for the users root directory
 	 */
-	private static function copy_recursive( $source, $destination, $view ) {
+	private static function copy_recursive($source, $destination, $view) {
 		$size = 0;
-		if ( $view->is_dir( 'files'.$source ) ) {
-			$view->mkdir( $destination );
-			$view->touch($destination,  $view->filemtime('files'.$source));
-			foreach ( \OC_Files::getDirectoryContent($source) as $i ) {
-				$pathDir = $source.'/'.$i['name'];
-				if ( $view->is_dir('files'.$pathDir) ) {
-					$size += self::copy_recursive($pathDir, $destination.'/'.$i['name'], $view);
+		if ($view->is_dir('files' . $source)) {
+			$view->mkdir($destination);
+			$view->touch($destination, $view->filemtime('files' . $source));
+			foreach (\OC_Files::getDirectoryContent($source) as $i) {
+				$pathDir = $source . '/' . $i['name'];
+				if ($view->is_dir('files' . $pathDir)) {
+					$size += self::copy_recursive($pathDir, $destination . '/' . $i['name'], $view);
 				} else {
-					$size += $view->filesize('files'.$pathDir);
-					$view->copy( 'files'.$pathDir, $destination . '/' . $i['name'] );
-					$view->touch($destination . '/' . $i['name'], $view->filemtime('files'.$pathDir));
+					$size += $view->filesize('files' . $pathDir);
+					$view->copy('files' . $pathDir, $destination . '/' . $i['name']);
+					$view->touch($destination . '/' . $i['name'], $view->filemtime('files' . $pathDir));
 				}
 			}
 		} else {
-			$size += $view->filesize('files'.$source);
-			$view->copy( 'files'.$source, $destination );
-			$view->touch($destination, $view->filemtime('files'.$source));
+			$size += $view->filesize('files' . $source);
+			$view->copy('files' . $source, $destination);
+			$view->touch($destination, $view->filemtime('files' . $source));
 		}
 		return $size;
 	}
@@ -743,24 +749,25 @@ class Trashbin {
 	 * @param $timestamp timestamp when the file was deleted
 	 */
 	private static function getVersionsFromTrash($filename, $timestamp) {
-		$view = new \OC\Files\View('/'.\OCP\User::getUser().'/files_trashbin/versions');
-		$versionsName = $view->getLocalFile($filename);
+		$view = new \OC\Files\View('/' . \OCP\User::getUser() . '/files_trashbin/versions');
+		$versionsName = $view->getLocalFile($filename) . '.v';
+		$escapedVersionsName = preg_replace('/(\*|\?|\[)/', '[$1]', $versionsName);
 		$versions = array();
-		if ($timestamp ) {
+		if ($timestamp) {
 			// fetch for old versions
-			$matches = glob( $versionsName.'.v*.d'.$timestamp );
-			$offset = -strlen($timestamp)-2;
+			$matches = glob($escapedVersionsName . '*.d' . $timestamp);
+			$offset = -strlen($timestamp) - 2;
 		} else {
-			$matches = glob( $versionsName.'.v*' );
+			$matches = glob($escapedVersionsName . '*');
 		}
 
-		foreach( $matches as $ma ) {
-			if ( $timestamp ) {
-				$parts = explode( '.v', substr($ma, 0, $offset) );
-				$versions[] = ( end( $parts ) );
+		foreach ($matches as $ma) {
+			if ($timestamp) {
+				$parts = explode('.v', substr($ma, 0, $offset));
+				$versions[] = ( end($parts) );
 			} else {
-				$parts = explode( '.v', $ma );
-				$versions[] = ( end( $parts ) );
+				$parts = explode('.v', $ma);
+				$versions[] = ( end($parts) );
 			}
 		}
 		return $versions;
@@ -775,12 +782,12 @@ class Trashbin {
 	 */
 	private static function getUniqueExtension($location, $filename, $view) {
 		$ext = '';
-		if ( $view->file_exists('files'.$location.'/'.$filename) ) {
+		if ($view->file_exists('files' . $location . '/' . $filename)) {
 			$tmpext = '.restored';
 			$ext = $tmpext;
 			$i = 1;
-			while ( $view->file_exists('files'.$location.'/'.$filename.$ext) ) {
-				$ext = $tmpext.$i;
+			while ($view->file_exists('files' . $location . '/' . $filename . $ext)) {
+				$ext = $tmpext . $i;
 				$i++;
 			}
 		}
@@ -793,17 +800,16 @@ class Trashbin {
 	 * @return size of the folder
 	 */
 	private static function calculateSize($view) {
-		$root = \OCP\Config::getSystemValue('datadirectory').$view->getAbsolutePath('');
+		$root = \OCP\Config::getSystemValue('datadirectory') . $view->getAbsolutePath('');
 		if (!file_exists($root)) {
 			return 0;
 		}
-		$iterator = new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($root),
-			\RecursiveIteratorIterator::CHILD_FIRST);
+		$iterator = new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($root), \RecursiveIteratorIterator::CHILD_FIRST);
 		$size = 0;
 
 		foreach ($iterator as $path) {
-			$relpath = substr($path, strlen($root)-1);
-			if ( !$view->is_dir($relpath) ) {
+			$relpath = substr($path, strlen($root) - 1);
+			if (!$view->is_dir($relpath)) {
 				$size += $view->filesize($relpath);
 			}
 		}
@@ -825,7 +831,7 @@ class Trashbin {
 		}
 		return false;
 	}
-	
+
 	/**
 	 * write to the database how much space is in use for the trash bin
 	 *
@@ -833,9 +839,9 @@ class Trashbin {
 	 * @param $size size of the trash bin
 	 */
 	private static function setTrashbinSize($user, $size) {
-		if ( self::getTrashbinSize($user) === false) {
+		if (self::getTrashbinSize($user) === false) {
 			$query = \OC_DB::prepare('INSERT INTO `*PREFIX*files_trashsize` (`size`, `user`) VALUES (?, ?)');
-		}else {
+		} else {
 			$query = \OC_DB::prepare('UPDATE `*PREFIX*files_trashsize` SET `size`=? WHERE `user`=?');
 		}
 		$query->execute(array($size, $user));
diff --git a/apps/files_trashbin/templates/index.php b/apps/files_trashbin/templates/index.php
index cb5edaa2c91e4718dbb678f3d8943ab9b0575ba9..66ec36df867093975df8de6193669c5e5e7f3a77 100644
--- a/apps/files_trashbin/templates/index.php
+++ b/apps/files_trashbin/templates/index.php
@@ -18,7 +18,7 @@
 				<span class='selectedActions'>
 						<a href="" class="undelete">
 							<img class="svg" alt="<?php p($l->t( 'Restore' )); ?>"
-								 src="<?php print_unescaped(OCP\image_path("core", "actions/undelete.png")); ?>" />
+								 src="<?php print_unescaped(OCP\image_path("core", "actions/history.svg")); ?>" />
 							<?php p($l->t('Restore'))?>
 						</a>
 				</span>
diff --git a/apps/files_trashbin/templates/part.breadcrumb.php b/apps/files_trashbin/templates/part.breadcrumb.php
index 2801e04e9ad9d5fc1ad15d77cbe4f1fbf62064d7..85bb16ffa2d2822a90d3d9e315e45256ce9680f0 100644
--- a/apps/files_trashbin/templates/part.breadcrumb.php
+++ b/apps/files_trashbin/templates/part.breadcrumb.php
@@ -11,8 +11,7 @@
 <?php endif;?>
 <?php for($i=0; $i<count($_["breadcrumb"]); $i++):
 	$crumb = $_["breadcrumb"][$i];
-	$dir = str_replace('+', '%20', urlencode($crumb["dir"]));
-	$dir = str_replace('%2F', '/', $dir); ?>
+	$dir = \OCP\Util::encodePath($crumb["dir"]); ?>
 	<div class="crumb <?php if($i == count($_["breadcrumb"])-1) p('last');?> svg"
 		 data-dir='<?php p($dir);?>'>
 	<a href="<?php p($_['baseURL'].$dir); ?>"><?php p($crumb["name"]); ?></a>
diff --git a/apps/files_trashbin/templates/part.list.php b/apps/files_trashbin/templates/part.list.php
index 3f260867582463ec54963f8d3f0436affcd247de..44e2fc7293b065933645e84dac1421a3a41b903a 100644
--- a/apps/files_trashbin/templates/part.list.php
+++ b/apps/files_trashbin/templates/part.list.php
@@ -4,10 +4,8 @@
 	// the older the file, the brighter the shade of grey; days*14
 	$relative_date_color = round((time()-$file['date'])/60/60/24*14);
 	if($relative_date_color>200) $relative_date_color = 200;
-	$name = str_replace('+', '%20', urlencode($file['name']));
-	$name = str_replace('%2F', '/', $name);
-	$directory = str_replace('+', '%20', urlencode($file['directory']));
-	$directory = str_replace('%2F', '/', $directory); ?>
+	$name = \OCP\Util::encodePath($file['name']);
+	$directory = \OCP\Util::encodePath($file['directory']); ?>
 	<tr data-filename="<?php p($file['name']);?>"
 		data-type="<?php ($file['type'] == 'dir')?p('dir'):p('file')?>"
 		data-mime="<?php p($file['mimetype'])?>"
diff --git a/apps/files_versions/l10n/fa.php b/apps/files_versions/l10n/fa.php
index 4ec6aa1bbb434d1a2f4aa95e8b7c3fc2fc6ce0fb..98af636f59081291544e32657fe007d067f35d50 100644
--- a/apps/files_versions/l10n/fa.php
+++ b/apps/files_versions/l10n/fa.php
@@ -1,8 +1,11 @@
 <?php $TRANSLATIONS = array(
 "Could not revert: %s" => "بازگردانی امکان ناپذیر است: %s",
 "success" => "موفقیت",
+"File %s was reverted to version %s" => "فایل %s  به نسخه %s بازگردانده شده است.",
 "failure" => "شکست",
+"File %s could not be reverted to version %s" => "فایل %s نمی تواند به نسخه %s بازگردانده شود.",
 "No old versions available" => "هیچ نسخه قدیمی در دسترس نیست",
 "No path specified" => "هیچ مسیری مشخص نشده است",
+"Versions" => "نسخه ها",
 "Revert a file to a previous version by clicking on its revert button" => "بازگردانی یک پرورنده به نسخه قدیمی اش از  طریق دکمه بازگردانی امکان پذیر است"
 );
diff --git a/apps/files_versions/l10n/ko.php b/apps/files_versions/l10n/ko.php
index 994144f39e1830aa47b4b00c7b5851fb39f7d53d..df34e4681b421549ec75181338cbcacd2e69bbe1 100644
--- a/apps/files_versions/l10n/ko.php
+++ b/apps/files_versions/l10n/ko.php
@@ -1,11 +1,11 @@
 <?php $TRANSLATIONS = array(
 "Could not revert: %s" => "되돌릴 수 없습니다: %s",
-"success" => "완료",
-"File %s was reverted to version %s" => "파일 %s를 버전 %s로 변경하였습니다.",
+"success" => "성공",
+"File %s was reverted to version %s" => "파일 %s을(를) 버전 %s(으)로 되돌림",
 "failure" => "실패",
-"File %s could not be reverted to version %s" => "파일 %s를 버전 %s로 되돌리지 못했습니다.",
-"No old versions available" => "오래된 버전을 사용할 수 없습니다",
-"No path specified" => "경로를 알수 없습니다.",
-"Versions" => "버젼",
-"Revert a file to a previous version by clicking on its revert button" => "변경 버튼을 클릭하여 이전 버전의 파일로 변경할 수 있습니다."
+"File %s could not be reverted to version %s" => "파일 %s을(를) 버전 %s(으)로 되돌리지 못했음",
+"No old versions available" => "오래된 버전을 사용할 수 없음",
+"No path specified" => "경로가 지정되지 않았음",
+"Versions" => "버전",
+"Revert a file to a previous version by clicking on its revert button" => "변경 단추를 눌러 이전 버전의 파일로 되돌릴 수 있습니다"
 );
diff --git a/apps/files_versions/lib/versions.php b/apps/files_versions/lib/versions.php
index 4beb9e0fe5cc18929f4255871836c3de4d009ab8..2f8262475b44e6f774b88863df60168c2600c390 100644
--- a/apps/files_versions/lib/versions.php
+++ b/apps/files_versions/lib/versions.php
@@ -241,11 +241,12 @@ class Storage {
 	public static function getVersions($uid, $filename, $count = 0 ) {
 		if( \OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true' ) {
 			$versions_fileview = new \OC\Files\View('/' . $uid . '/files_versions');
-			$versionsName = $versions_fileview->getLocalFile($filename);
-			
+			$versionsName = $versions_fileview->getLocalFile($filename).'.v';
+			$escapedVersionName = preg_replace('/(\*|\?|\[)/', '[$1]', $versionsName);
+
 			$versions = array();
 			// fetch for old versions
-			$matches = glob(preg_quote($versionsName).'.v*' );
+			$matches = glob($escapedVersionName.'*');
 
 			if ( !$matches ) {
 				return $versions;
diff --git a/apps/user_ldap/l10n/de_DE.php b/apps/user_ldap/l10n/de_DE.php
index 8aa64477e41bcf2cc13d05d7394a09b243f38d07..605c75f288aca16ac4d06d78ed28f107a99d0117 100644
--- a/apps/user_ldap/l10n/de_DE.php
+++ b/apps/user_ldap/l10n/de_DE.php
@@ -1,4 +1,5 @@
 <?php $TRANSLATIONS = array(
+"Failed to clear the mappings." => "Löschen der Zuordnung fehlgeschlagen.",
 "Failed to delete the server configuration" => "Löschen der Serverkonfiguration fehlgeschlagen",
 "The configuration is valid and the connection could be established!" => "Die Konfiguration ist gültig und die Verbindung konnte hergestellt werden!",
 "The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "Die Konfiguration ist gültig aber die Verbindung ist fehlgeschlagen. Bitte überprüfen Sie die Servereinstellungen und die Anmeldeinformationen.",
@@ -7,6 +8,7 @@
 "Take over settings from recent server configuration?" => "Einstellungen von letzter Konfiguration übernehmen?",
 "Keep settings?" => "Einstellungen beibehalten?",
 "Cannot add server configuration" => "Das Hinzufügen der Serverkonfiguration schlug fehl",
+"mappings cleared" => "Zuordnungen gelöscht",
 "Success" => "Erfolg",
 "Error" => "Fehler",
 "Connection test succeeded" => "Verbindungstest erfolgreich",
@@ -74,8 +76,13 @@
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Ohne Eingabe wird der Benutzername (Standard) verwendet. Anderenfalls tragen Sie bitte ein LDAP/AD-Attribut ein.",
 "Internal Username" => "Interner Benutzername",
 "By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder in ownCloud. It is also a port of remote URLs, for instance for all *DAV services. With this setting, the default behaviour can be overriden. To achieve a similar behaviour as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behaviour. Changes will have effect only on newly mapped (added) LDAP users." => "Standardmäßig wird der interne Benutzername mittels des UUID-Attributes erzeugt. Dies stellt sicher, dass der Benutzername einzigartig ist und keinerlei Zeichen konvertiert werden müssen. Der interne Benutzername unterliegt Beschränkungen, die nur die nachfolgenden Zeichen erlauben: [ a-zA-Z0-9_.@- ]. Andere Zeichenwerden mittels ihrer korrespondierenden Zeichen ersetzt oder einfach ausgelassen. Bei Übereinstimmungen wird ein Zähler hinzugefügt bzw. der Zähler um einen Wert erhöht. Der interne Benutzername wird benutzt, um einen Benutzer intern zu identifizieren. Es ist ebenso der standardmäßig vorausgewählte Namen des Heimatverzeichnisses in ownCloud. Es dient weiterhin als Port für Remote-URLs - zum Beispiel für alle *DAV-Dienste Mit dieser Einstellung kann das Standardverhalten überschrieben werden. Um ein ähnliches Verhalten wie vor ownCloud 5 zu erzielen, fügen Sie das anzuzeigende Attribut des Benutzernamens in das nachfolgende Feld ein. Lassen Sie dies hingegen für das Standardverhalten leer. Die Änderungen werden sich einzig und allein nur auf neu gemappte (hinzugefügte) LDAP-Benutzer auswirken.",
+"Internal Username Attribute:" => "Interne Eigenschaften des Benutzers:",
 "Override UUID detection" => "UUID-Erkennung überschreiben",
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is used to doubtlessly identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behaviour. Changes will have effect only on newly mapped (added) LDAP users and groups." => "Standardmäßig erkennt OwnCloud die UUID-Eigenschaften des Benutzers selbstständig. Die UUID-Eigenschaften werden genutzt, um einen LDAP-Benutzer und Gruppen einwandfrei zu identifizieren. Außerdem wird ein interner Benutzername erzeugt, der auf Eigenschaften der UUID basiert, wenn es oben nicht anders angegeben wurde. Sie können diese Eigenschaften überschreiben und selbst Eigenschaften nach Wahl vorgeben. Sie müssen allerdings sicherstellen, dass die Eigenschaften zur Identifikation für Benutzer und Gruppen eindeutig sind. Lassen Sie es frei, um es beim Standardverhalten zu belassen. Änderungen wirken sich nur auf neu zugeordnete (neu erstellte) LDAP-Benutzer und -Gruppen aus.",
 "UUID Attribute:" => "UUID-Attribut:",
+"Username-LDAP User Mapping" => "LDAP-Benutzernamenzuordnung",
+"Clear Username-LDAP User Mapping" => "Lösche LDAP-Benutzernamenzuordnung",
+"Clear Groupname-LDAP Group Mapping" => "Lösche LDAP-Gruppennamenzuordnung",
 "Test Configuration" => "Testkonfiguration",
 "Help" => "Hilfe"
 );
diff --git a/apps/user_ldap/l10n/es_AR.php b/apps/user_ldap/l10n/es_AR.php
index 011ff3e12ff653c018f442e6410f8ce390e435c2..6925ea89a0cafbd02a2a7acdc2af438cfff7f799 100644
--- a/apps/user_ldap/l10n/es_AR.php
+++ b/apps/user_ldap/l10n/es_AR.php
@@ -1,4 +1,5 @@
 <?php $TRANSLATIONS = array(
+"Failed to clear the mappings." => "Hubo un error al borrar las asignaciones.",
 "Failed to delete the server configuration" => "Fallo al borrar la configuración del servidor",
 "The configuration is valid and the connection could be established!" => "La configuración es válida y la conexión pudo ser establecida.",
 "The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "La configuración es válida, pero el enlace falló. Por favor, comprobá la configuración del servidor y las credenciales.",
@@ -7,6 +8,7 @@
 "Take over settings from recent server configuration?" => "Tomar los valores de la anterior configuración de servidor?",
 "Keep settings?" => "¿Mantener preferencias?",
 "Cannot add server configuration" => "No se pudo añadir la configuración del servidor",
+"mappings cleared" => "Asignaciones borradas",
 "Success" => "Éxito",
 "Error" => "Error",
 "Connection test succeeded" => "El este de conexión ha sido completado satisfactoriamente",
@@ -72,6 +74,16 @@
 "Email Field" => "Campo de e-mail",
 "User Home Folder Naming Rule" => "Regla de nombre de los directorios de usuario",
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Vacío para el nombre de usuario (por defecto). En otro caso, especificá un atributo LDAP/AD.",
+"Internal Username" => "Nombre interno de usuario",
+"By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder in ownCloud. It is also a port of remote URLs, for instance for all *DAV services. With this setting, the default behaviour can be overriden. To achieve a similar behaviour as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behaviour. Changes will have effect only on newly mapped (added) LDAP users." => "Por defecto, el nombre interno de usuario va a ser creado a partir del atributo UUID. Esto asegura que el nombre de usuario es único y los caracteres no necesitan ser convertidos. Para el nombre de usuario interno sólo se pueden usar estos caracteres: [a-zA-Z0-9_.@-]. Otros caracteres son sustituidos por su correspondiente en ASCII o simplemente omitidos. Si ocurrieran colisiones, un número será añadido o incrementado. El nombre interno de usuario se usa para identificar un usuario internamente. Es también el nombre por defecto para el directorio personal del usuario in ownCloud. También es un puerto de URLs remotas, por ejemplo, para todos los servicios *DAV. Con esta configuración el comportamiento por defecto puede ser cambiado. Para conseguir un comportamiento similar al anterior a ownCloud 5, ingresá el atributo del nombre en pantalla del usuario en el siguiente campo. Dejalo vacío para el comportamiento por defecto. Los cambios solo tendrán efecto para los nuevos usuarios LDAP.",
+"Internal Username Attribute:" => "Atributo Nombre Interno de usuario:",
+"Override UUID detection" => "Sobrescribir la detección UUID",
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is used to doubtlessly identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behaviour. Changes will have effect only on newly mapped (added) LDAP users and groups." => "Por defecto, ownCloud detecta automáticamente el atributo UUID. El atributo UUID se usa para identificar indudablemente usuarios y grupos LDAP. Además, el nombre de usuario interno va a ser creado en base al UUID, si no ha sido especificado otro comportamiento arriba. Podés sobrescribir la configuración y pasar un atributo de tu elección. Tenés que asegurarte de que el atributo de tu elección sea accesible por los usuarios y grupos y ser único. Dejalo en blanco para usar el comportamiento por defecto. Los cambios tendrán efecto sólo en los nuevos usuarios y grupos de LDAP.",
+"UUID Attribute:" => "Atributo UUID:",
+"Username-LDAP User Mapping" => "Asignación del Nombre de usuario de un usuario LDAP",
+"ownCloud uses usernames to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have a internal username. This requires a mapping from ownCloud username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found by ownCloud. The internal ownCloud name is used all over in ownCloud. Clearing the Mappings will have leftovers everywhere. Clearing the Mappings is not configuration sensitive, it affects all LDAP configurations! Do never clear the mappings in a production environment. Only clear mappings in a testing or experimental stage." => "ownCloud usa nombres de usuario para almacenar y asignar (meta) datos. Con el fin de identificar con precisión y reconocer usuarios, cada usuario LDAP tendrá un nombre de usuario interno. Esto requiere una asignación de nombre de usuario de ownCloud a usuario LDAP. El nombre de usuario creado se asigna al UUID del usuario LDAP. Además el DN se almacena en caché principalmente para reducir la interacción de LDAP, pero no se utiliza para la identificación. Si la DN cambia, los cambios serán encontrados por ownCloud. El nombre interno de ownCloud se utiliza para todo en ownCloud. Borrar las asignaciones dejará restos en distintos lugares. Borrar las asignaciones no depende de la configuración, ¡afecta a todas las configuraciones de LDAP! No borrar nunca las asignaciones en un entorno de producción. Sólo borrar asignaciones en una situación de prueba o experimental.",
+"Clear Username-LDAP User Mapping" => "Borrar la asignación de los Nombres de usuario de los usuarios LDAP",
+"Clear Groupname-LDAP Group Mapping" => "Borrar la asignación de los Nombres de grupo de los grupos de LDAP",
 "Test Configuration" => "Probar configuración",
 "Help" => "Ayuda"
 );
diff --git a/apps/user_ldap/l10n/hi.php b/apps/user_ldap/l10n/hi.php
index 45166eb0e3e893844d3a3ad02fd4d7537230ad4e..8e8e4e8ff69d23faefc27d0d66033b1a6c7f1c29 100644
--- a/apps/user_ldap/l10n/hi.php
+++ b/apps/user_ldap/l10n/hi.php
@@ -1,4 +1,5 @@
 <?php $TRANSLATIONS = array(
+"Error" => "त्रुटि",
 "Password" => "पासवर्ड",
 "Help" => "सहयोग"
 );
diff --git a/apps/user_ldap/l10n/ru.php b/apps/user_ldap/l10n/ru.php
index 0573be3993f2226d929e9fb09de071a213949c33..d88b20dc46912ff228c30c8485211d3e2974f90e 100644
--- a/apps/user_ldap/l10n/ru.php
+++ b/apps/user_ldap/l10n/ru.php
@@ -75,10 +75,13 @@
 "User Home Folder Naming Rule" => "Правило именования Домашней Папки Пользователя",
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Оставьте имя пользователя пустым (по умолчанию). Иначе укажите атрибут LDAP/AD.",
 "Internal Username" => "Внутреннее имя пользователя",
+"By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder in ownCloud. It is also a port of remote URLs, for instance for all *DAV services. With this setting, the default behaviour can be overriden. To achieve a similar behaviour as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behaviour. Changes will have effect only on newly mapped (added) LDAP users." => "По-умолчанию внутреннее имя пользователя будет создано из атрибута UUID. Это необходимо для того, чтобы имя пользователя было уникальным и не содержало в себе запрещенных символов. Внутреннее имя пользователя может состоять только из следующих символов: [ a-zA-Z0-9_.@- ]. Остальные символы замещаются соответствиями из таблицы ASCII или же просто пропускаются. При совпадении к имени будет добавлено число. Внутреннее имя пользователя используется для внутренней идентификации пользователя. Также оно является именем по-умолчанию для папки пользователя в ownCloud. Оно также портом для удаленных ссылок, к примеру, для всех сервисов *DAV. С помощию данной настройки можно изменить поведение по-умолчанию. Чтобы достичь поведения, как было настроено до изменения, ownCloud 5 выводит атрибут имени пользователя в этом поле. Оставьте его пустым для режима по-умолчанию. Изменения будут иметь эффект только для новых подключенных (добавленных) пользователей LDAP.",
 "Internal Username Attribute:" => "Аттрибут для внутреннего имени:",
 "Override UUID detection" => "Переопределить нахождение UUID",
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is used to doubtlessly identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behaviour. Changes will have effect only on newly mapped (added) LDAP users and groups." => "По-умолчанию, ownCloud определяет атрибут UUID автоматически. Этот атрибут используется для того, чтобы достоверно индентифицировать пользователей и группы LDAP. Также, на основании атрибута UUID создается внутреннее имя пользователя, если выше не указано иначе. Вы можете переопределить эту настройку и указать свой атрибут по выбору. Вы должны удостовериться, что выбранный вами атрибут может быть выбран для пользователей и групп, а также то, что он уникальный. Оставьте поле пустым для поведения по-умолчанию. Изменения вступят в силу только для новых подключенных (добавленных) пользователей и групп LDAP.",
 "UUID Attribute:" => "Аттрибут для UUID:",
 "Username-LDAP User Mapping" => "Соответствия Имя-Пользователь LDAP",
+"ownCloud uses usernames to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have a internal username. This requires a mapping from ownCloud username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found by ownCloud. The internal ownCloud name is used all over in ownCloud. Clearing the Mappings will have leftovers everywhere. Clearing the Mappings is not configuration sensitive, it affects all LDAP configurations! Do never clear the mappings in a production environment. Only clear mappings in a testing or experimental stage." => "ownCloud использует имена пользователей для хранения и назначения метаданных. Для точной идентификации и распознавания пользователей, каждый пользователь LDAP будет иметь свое внутреннее имя пользователя. Это требует наличия соответствия имени пользователя ownCloud к пользователю LDAP. При создании имя пользователя назначается идентификатору UUID пользователя LDAP. Помимо этого кэшируется доменное имя (DN) для снижения взаимодействия LDAP, однако оно не используется для идентификации. Если доменное имя было изменено, об этом станет известно ownCloud. Внутреннее имя ownCloud используется повсеместно в ownCloud. При очистке соответствий повсюду будут оставаться \"хвосты\". Очистка соответствий не привязана к конкретной конфигурации, она влияет на все конфигурации LDAP! Никогда не очищайте соответствия в рабочем окружении. Очищайте соответствия только во время тестов или в экспериментальных конфигурациях.",
 "Clear Username-LDAP User Mapping" => "Очистить соответствия Имя-Пользователь LDAP",
 "Clear Groupname-LDAP Group Mapping" => "Очистить соответствия Группа-Группа LDAP",
 "Test Configuration" => "Тестовая конфигурация",
diff --git a/apps/user_ldap/l10n/sk_SK.php b/apps/user_ldap/l10n/sk_SK.php
index e36a1589367219db8f8038a1fd50dbf786dceae1..fe1e14ea6fd80de1eb33be91a4992d7aa5e608d5 100644
--- a/apps/user_ldap/l10n/sk_SK.php
+++ b/apps/user_ldap/l10n/sk_SK.php
@@ -79,6 +79,9 @@
 "Internal Username Attribute:" => "Atribút interného používateľského mena:",
 "Override UUID detection" => "Prepísať UUID detekciu",
 "UUID Attribute:" => "UUID atribút:",
+"Username-LDAP User Mapping" => "Mapovanie názvov LDAP používateľských mien",
+"Clear Username-LDAP User Mapping" => "Zrušiť mapovanie LDAP používateľských mien",
+"Clear Groupname-LDAP Group Mapping" => "Zrušiť mapovanie názvov LDAP skupín",
 "Test Configuration" => "Test nastavenia",
 "Help" => "Pomoc"
 );
diff --git a/apps/user_ldap/l10n/sl.php b/apps/user_ldap/l10n/sl.php
index 1ade5d9b733f3ef7e8dcc11e4d9d8e2d2e6b4a92..aeca97038e8d455ab5759ae55728d32be4caaf74 100644
--- a/apps/user_ldap/l10n/sl.php
+++ b/apps/user_ldap/l10n/sl.php
@@ -1,4 +1,5 @@
 <?php $TRANSLATIONS = array(
+"Failed to clear the mappings." => "Preslikav ni bilo mogoče izbrisati",
 "Failed to delete the server configuration" => "Brisanje nastavitev strežnika je spodletelo.",
 "The configuration is valid and the connection could be established!" => "Nastavitev je veljavna, zato je povezavo mogoče vzpostaviti!",
 "The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "Nastavitev je veljavna, vendar pa je vez Bind spodletela. Preveriti je treba nastavitve strežnika in ustreznost poveril.",
@@ -7,6 +8,7 @@
 "Take over settings from recent server configuration?" => "Ali naj se prevzame nastavitve nedavne nastavitve strežnika?",
 "Keep settings?" => "Ali nas se nastavitve ohranijo?",
 "Cannot add server configuration" => "Ni mogoče dodati nastavitev strežnika",
+"mappings cleared" => "Preslikave so izbrisane",
 "Success" => "Uspešno končano.",
 "Error" => "Napaka",
 "Connection test succeeded" => "Preizkus povezave je uspešno končan.",
@@ -72,6 +74,16 @@
 "Email Field" => "Polje elektronske pošte",
 "User Home Folder Naming Rule" => "Pravila poimenovanja uporabniške osebne mape",
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Pustite prazno za uporabniško ime (privzeto), sicer navedite atribut LDAP/AD.",
+"Internal Username" => "Interno uporabniško ime",
+"By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder in ownCloud. It is also a port of remote URLs, for instance for all *DAV services. With this setting, the default behaviour can be overriden. To achieve a similar behaviour as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behaviour. Changes will have effect only on newly mapped (added) LDAP users." => "Po privzetih nastavitvah bo uporabniško ime nastavljeno na podlagi atributa UUID. Ta zagotovi, da je uporabniško ime unikatno in, da znakov ni potrebno pretvarjati. Interno uporabniško ime ima omejitev v uporabi znakov, in sicer so dovoljeni le znaki [ a-zA-Z0-9_.@- ]. Ostali znaki so nadomeščeni z njihovimi ustreznicami v ASCII ali so enostavno prezrti. Pri prekrivanju znakov bo dodana številka. Interno uporabniško ime je v uporabi za interno identifikacijo uporabnika. Je tudi privzeto ime za uporabnikovo domačo mapo v ownCloudu.  Predstavlja tudi vrata za oddaljene internetne naslove, na primer za vse storitve *DAV. S to nastavitvijo se privzete nastavitve ne bodo upoštevale. Če boste želeli doseči isto obnašanje kot pri različicah ownClouda 5, vnesite atribut za Ime za prikaz v spodnje polje. Če boste polje pustili prazno, bo uporabljena privzeta vrednost. Spremembe bodo vplivale samo na novo dodane LDAP-uporabnike.",
+"Internal Username Attribute:" => "Atribut Interno uporabniško ime",
+"Override UUID detection" => "Prezri zaznavo UUID",
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is used to doubtlessly identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behaviour. Changes will have effect only on newly mapped (added) LDAP users and groups." => "Po privzetih nastavitvah ownCloud sam zazna atribute UUID. Atribut UUID je uporabljen za identifikacijo LDAP-uporabnikov in skupin. Na podlagi atributa UUID se ustvari tudi interno uporabniško ime, če ne navedete drugačnih nastavitev sami. Nastavitev lahko povozite in izberete nastavitev po vaši izbiri. Potrebno je zagotoviti, da je izbran atribut lahko uporabljen tako za kreiranje uporabnikov kot skupin in je unikaten. Pustite praznega, če želite, da sistem uporabi privzete nastavitve. Spremembe bodo uporabljene šele pri novo preslikanih ali dodanih LDAP-uporabnikih in skupinah.",
+"UUID Attribute:" => "Atribut UUID",
+"Username-LDAP User Mapping" => "Preslikava uporabniško ime - LDAP-uporabnik",
+"ownCloud uses usernames to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have a internal username. This requires a mapping from ownCloud username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found by ownCloud. The internal ownCloud name is used all over in ownCloud. Clearing the Mappings will have leftovers everywhere. Clearing the Mappings is not configuration sensitive, it affects all LDAP configurations! Do never clear the mappings in a production environment. Only clear mappings in a testing or experimental stage." => "ownCloud uporablja uporabniška imena za shranjevanje in določanje metapodatkov. Za natančno identifikacijo in prepoznavo uporabnikov, ima vsak LDAP-uporabnik svoje interno uporabniško ime. To zahteva preslikavo iz uporabniškega imena v ownCloudu v LDAP-uporabnika.  Ustvarjeno uporabniško ime je preslikano v UUID LDAP-uporabnika. Hkrati je v predpomnilnik shranjen DN uporabnika, zato da se zmanjšajo povezave z LDAP-om, ni pa uporabljen za identifikacijo uporabnikov. Če se DN spremeni, bo ownCloud sam našel te spremembe. Interno ime v ownCloudu je uporabljeno v celotnem sistemu. Brisanje preslikav bo pustilo posledice povsod. Brisanje preslikav je zato problematično za konfiguracijo, vpliva na celotno LDAP-konfiguracijo. Nikoli ne brišite preslikav na produkcijskem okolju. Preslikave brišite samo v fazi preizkušanja storitve.",
+"Clear Username-LDAP User Mapping" => "Izbriši preslikavo Uporabniškega imena in LDAP-uporabnika",
+"Clear Groupname-LDAP Group Mapping" => "Izbriši preslikavo Skupine in LDAP-skupine",
 "Test Configuration" => "Preizkusne nastavitve",
 "Help" => "Pomoč"
 );
diff --git a/apps/user_ldap/l10n/zh_TW.php b/apps/user_ldap/l10n/zh_TW.php
index d01e75356c05efb2de994564d50f465664499367..cde743f003378571879c378e972e271e7477b594 100644
--- a/apps/user_ldap/l10n/zh_TW.php
+++ b/apps/user_ldap/l10n/zh_TW.php
@@ -1,11 +1,76 @@
 <?php $TRANSLATIONS = array(
+"Failed to clear the mappings." => "清除映射失敗",
+"Failed to delete the server configuration" => "刪除伺服器設定時失敗",
+"The configuration is valid and the connection could be established!" => "設定有效且連線可建立",
+"The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "設定有效但連線無法建立。請檢查伺服器的設定與認證資料。",
+"The configuration is invalid. Please look in the ownCloud log for further details." => "設定無效。更多細節請參閱ownCloud的記錄檔。",
 "Deletion failed" => "移除失敗",
+"Take over settings from recent server configuration?" => "要使用最近一次的伺服器設定嗎?",
+"Keep settings?" => "維持設定嗎?",
+"Cannot add server configuration" => "無法新增伺服器設定",
+"mappings cleared" => "映射已清除",
 "Success" => "成功",
 "Error" => "錯誤",
+"Connection test succeeded" => "連線測試成功",
+"Connection test failed" => "連線測試失敗",
+"Do you really want to delete the current Server Configuration?" => "您真的確定要刪除現在的伺服器設定嗎?",
+"Confirm Deletion" => "確認已刪除",
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them." => "<b>警告:</b> 應用程式user_ldap和user_webdavauth互不相容。可能會造成無法預期的結果。請要求您的系統管理員將兩者其中之一停用。",
+"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>警告:</b>沒有安裝 PHP LDAP 模組，後端系統將無法運作。請要求您的系統管理員安裝模組。",
+"Server configuration" => "伺服器設定",
+"Add Server Configuration" => "新增伺服器設定",
 "Host" => "主機",
+"You can omit the protocol, except you require SSL. Then start with ldaps://" => "若您不需要SSL加密傳輸則可忽略通訊協定。若非如此請從ldaps://開始",
+"One Base DN per line" => "一行一個Base DN",
+"You can specify Base DN for users and groups in the Advanced tab" => "您可以在進階標籤頁裡面指定使用者及群組的Base DN",
+"The DN of the client user with which the bind shall be done, e.g. uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password empty." => "客戶端使用者的DN與特定字詞的連結需要完善，例如:uid=agent,dc=example,dc=com。若是匿名連接，則將DN與密碼欄位留白。",
 "Password" => "密碼",
+"For anonymous access, leave DN and Password empty." => "匿名連接時請將DN與密碼欄位留白",
+"User Login Filter" => "使用者登入過濾器",
+"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "試圖登入時會定義要套用的篩選器。登入過程中%%uid會取代使用者名稱。",
+"use %%uid placeholder, e.g. \"uid=%%uid\"" => "請使用 %%uid placeholder，例如:\"uid=%%uid\"",
+"User List Filter" => "使用者名單篩選器",
+"Defines the filter to apply, when retrieving users." => "檢索使用者時定義要套用的篩選器",
+"without any placeholder, e.g. \"objectClass=person\"." => "請勿使用任何placeholder，例如:\"objectClass=person\"。",
+"Group Filter" => "群組篩選器",
+"Defines the filter to apply, when retrieving groups." => "檢索群組時，定義要套用的篩選器",
+"without any placeholder, e.g. \"objectClass=posixGroup\"." => "請勿使用任何placeholder，例如:\"objectClass=posixGroup\"。",
+"Connection Settings" => "連線設定",
+"Configuration Active" => "設定為主動模式",
+"When unchecked, this configuration will be skipped." => "沒有被勾選時，此設定會被略過。",
 "Port" => "連接阜",
+"Backup (Replica) Host" => "備用主機",
+"Give an optional backup host. It must be a replica of the main LDAP/AD server." => "請給定一個可選的備用主機。必須是LDAP/AD中央伺服器的複本。",
+"Backup (Replica) Port" => "備用(複本)連接阜",
+"Disable Main Server" => "停用主伺服器",
+"When switched on, ownCloud will only connect to the replica server." => "當開關打開時，ownCloud將只會連接複本伺服器。",
 "Use TLS" => "使用TLS",
+"Case insensitve LDAP server (Windows)" => "不區分大小寫的LDAP伺服器(Windows)",
 "Turn off SSL certificate validation." => "關閉 SSL 憑證驗證",
+"If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "若連線只有在此選項開啟時運作，請匯入LDAP伺服器的SSL認證到您的ownCloud伺服器。",
+"Not recommended, use for testing only." => "不推薦使用，僅供測試用途。",
+"Cache Time-To-Live" => "快取的存活時間",
+"in seconds. A change empties the cache." => "以秒為單位。更變後會清空快取。",
+"Directory Settings" => "目錄選項",
+"User Display Name Field" => "使用者名稱欄位",
+"The LDAP attribute to use to generate the user`s ownCloud name." => "用於產生ownCloud名稱",
+"Base User Tree" => "Base使用者數",
+"One User Base DN per line" => "一行一個使用者Base DN",
+"User Search Attributes" => "使用者搜索屬性",
+"Optional; one attribute per line" => "可選的; 一行一項屬性",
+"Group Display Name Field" => "群組顯示名稱欄位",
+"Base Group Tree" => "Base群組樹",
+"One Group Base DN per line" => "一行一個群組Base DN",
+"Group Search Attributes" => "群組搜索屬性",
+"Group-Member association" => "群組成員的關係",
+"Special Attributes" => "特殊屬性",
+"Quota Field" => "配額欄位",
+"Quota Default" => "預設配額",
+"in bytes" => "以位元組為單位",
+"Email Field" => "電郵欄位",
+"User Home Folder Naming Rule" => "使用者家目錄的命名規則",
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "使用者名稱請留白(預設)。若不留白請指定一個LDAP/AD屬性。",
+"Internal Username" => "內部使用者名稱",
+"Test Configuration" => "測試此設定",
 "Help" => "說明"
 );
diff --git a/apps/user_ldap/lib/access.php b/apps/user_ldap/lib/access.php
index 04f73cf01fe96b25895e12bb74b7287e15362c17..6f6b8d0f016f03c7559b21179827f229db27bff4 100644
--- a/apps/user_ldap/lib/access.php
+++ b/apps/user_ldap/lib/access.php
@@ -578,14 +578,12 @@ abstract class Access {
 		');
 
 		//feed the DB
-		$res = $insert->execute(array($dn, $ocname, $this->getUUID($dn), $dn, $ocname));
+		$insRows = $insert->execute(array($dn, $ocname, $this->getUUID($dn), $dn, $ocname));
 
-		if(\OCP\DB::isError($res)) {
+		if(\OCP\DB::isError($insRows)) {
 			return false;
 		}
 
-		$insRows = $res->numRows();
-
 		if($insRows === 0) {
 			return false;
 		}
diff --git a/apps/user_ldap/lib/connection.php b/apps/user_ldap/lib/connection.php
index 31150a5bec57d2c9575e4f3e7af68d82213a6f24..36c8e648b1a71872e91c1d8a2f2851c904dd58f0 100644
--- a/apps/user_ldap/lib/connection.php
+++ b/apps/user_ldap/lib/connection.php
@@ -209,6 +209,22 @@ class Connection {
 									$value);
 	}
 
+	/**
+	 * Special handling for reading Base Configuration
+	 *
+	 * @param $base the internal name of the config key
+	 * @param $value the value stored for the base
+	 */
+	private function readBase($base, $value) {
+		if(empty($value)) {
+			$value = '';
+		} else {
+			$value = preg_split('/\r\n|\r|\n/', $value);
+		}
+
+		$this->config[$base] = $value;
+	}
+
 	/**
 	 * Caches the general LDAP configuration.
 	 */
@@ -224,14 +240,9 @@ class Connection {
 			$this->config['ldapAgentName']  = $this->$v('ldap_dn');
 			$this->config['ldapAgentPassword']
 				= base64_decode($this->$v('ldap_agent_password'));
-			$rawLdapBase                    = $this->$v('ldap_base');
-			$this->config['ldapBase']
-				= preg_split('/\r\n|\r|\n/', $rawLdapBase);
-			$this->config['ldapBaseUsers']
-				= preg_split('/\r\n|\r|\n/', ($this->$v('ldap_base_users')));
-			$this->config['ldapBaseGroups']
-				= preg_split('/\r\n|\r|\n/', $this->$v('ldap_base_groups'));
-			unset($rawLdapBase);
+			$this->readBase('ldapBase',       $this->$v('ldap_base'));
+			$this->readBase('ldapBaseUsers',  $this->$v('ldap_base_users'));
+			$this->readBase('ldapBaseGroups', $this->$v('ldap_base_groups'));
 			$this->config['ldapTLS']        = $this->$v('ldap_tls');
 			$this->config['ldapNoCase']     = $this->$v('ldap_nocase');
 			$this->config['turnOffCertCheck']
diff --git a/apps/user_ldap/lib/helper.php b/apps/user_ldap/lib/helper.php
index 10ed40ebd6a0ae9b618a7b17636c2b86b3d46c67..f65f466789f880099e0755875f38939c16e75ecf 100644
--- a/apps/user_ldap/lib/helper.php
+++ b/apps/user_ldap/lib/helper.php
@@ -90,13 +90,13 @@ class Helper {
 				AND `appid` = \'user_ldap\'
 				AND `configkey` NOT IN (\'enabled\', \'installed_version\', \'types\', \'bgjUpdateGroupsLastRun\')
 		');
-		$res = $query->execute(array($prefix.'%'));
+		$delRows = $query->execute(array($prefix.'%'));
 
-		if(\OCP\DB::isError($res)) {
+		if(\OCP\DB::isError($delRows)) {
 			return false;
 		}
 
-		if($res->numRows() === 0) {
+		if($delRows === 0) {
 			return false;
 		}
 
diff --git a/apps/user_webdavauth/l10n/cs_CZ.php b/apps/user_webdavauth/l10n/cs_CZ.php
index 17308ef4226ea67ac88aa975ae9ebda4664a1411..e1f8d76e166777e522c0a694c5ca383069a3f7da 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: " => "URL: ",
 "ownCloud will send the user credentials to this URL. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "ownCloud odešle uživatelské údaje na zadanou URL. Plugin zkontroluje odpověď a považuje návratovou hodnotu HTTP 401 a 403 za neplatné údaje a všechny ostatní hodnoty jako platné přihlašovací údaje."
 );
diff --git a/apps/user_webdavauth/l10n/de_DE.php b/apps/user_webdavauth/l10n/de_DE.php
index 4ca749e898da609fbfda62ff6956d585f5ef5645..21a886343f049303a4de5c7eb41cb878f8085b9e 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: " => "URL:",
 "ownCloud will send the user credentials to this URL. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "ownCloud sendet die Benutzerdaten an diese URL. Dieses Plugin prüft die Antwort und wird die Statuscodes 401 und 403 als ungültige Daten und alle anderen Antworten als gültige Daten interpretieren."
 );
diff --git a/apps/user_webdavauth/l10n/el.php b/apps/user_webdavauth/l10n/el.php
index 1943b98a75080112058f6c3d6df19b18af4dde2e..79bb1d13bf7a20958ad7a3de8dfbefe93913bf03 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: " => "URL:",
 "ownCloud will send the user credentials to this URL. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "Το ownCloud θα στείλει τα διαπιστευτήρια  χρήστη σε αυτό το URL. Αυτό το plugin ελέγχει την απάντηση και την μετατρέπει σε HTTP κωδικό κατάστασης 401 και 403 για μη έγκυρα, όλες οι υπόλοιπες απαντήσεις είναι έγκυρες."
 );
diff --git a/apps/user_webdavauth/l10n/es_AR.php b/apps/user_webdavauth/l10n/es_AR.php
index efb822882877df3325c9092e1f668a41db00daf9..cda5d7eab0562e65128a84276865804d5afc676c 100644
--- a/apps/user_webdavauth/l10n/es_AR.php
+++ b/apps/user_webdavauth/l10n/es_AR.php
@@ -1,4 +1,5 @@
 <?php $TRANSLATIONS = array(
 "WebDAV Authentication" => "Autenticación de WevDAV",
+"URL: " => "URL: ",
 "ownCloud will send the user credentials to this URL. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "onwCloud enviará las credenciales de usuario a esta URL. Este complemento verifica la respuesta e interpretará los códigos de respuesta HTTP 401 y 403 como credenciales inválidas y todas las otras respuestas como credenciales válidas."
 );
diff --git a/apps/user_webdavauth/l10n/et_EE.php b/apps/user_webdavauth/l10n/et_EE.php
index 470cb2b0f103e7cbe22757dae48e5fcb47abd66e..f95b5214130f6afc457dda1e1249d327d1a45f8d 100644
--- a/apps/user_webdavauth/l10n/et_EE.php
+++ b/apps/user_webdavauth/l10n/et_EE.php
@@ -1,4 +1,5 @@
 <?php $TRANSLATIONS = array(
 "WebDAV Authentication" => "WebDAV autentimine",
+"URL: " => "URL: ",
 "ownCloud will send the user credentials to this URL. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "ownCloud saadab kasutajatunnused sellel aadressil. See vidin kontrollib vastust ning tuvastab HTTP vastuskoodid 401 ja 403 kui vigased, ning kõik teised vastused kui korrektsed kasutajatunnused."
 );
diff --git a/apps/user_webdavauth/l10n/pl.php b/apps/user_webdavauth/l10n/pl.php
index e18b4787d57f2cf515276c2c3b441d91871af622..8c8116e5234dd21533b1c46e77bfbcbe598af64e 100644
--- a/apps/user_webdavauth/l10n/pl.php
+++ b/apps/user_webdavauth/l10n/pl.php
@@ -1,4 +1,5 @@
 <?php $TRANSLATIONS = array(
 "WebDAV Authentication" => "Uwierzytelnienie WebDAV",
+"URL: " => "URL: ",
 "ownCloud will send the user credentials to this URL. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "ownCloud wyśle dane uwierzytelniające do tego URL. Ten plugin sprawdza odpowiedź i zinterpretuje kody HTTP 401 oraz 403 jako nieprawidłowe dane uwierzytelniające, a każdy inny kod odpowiedzi jako poprawne dane."
 );
diff --git a/apps/user_webdavauth/l10n/pt_BR.php b/apps/user_webdavauth/l10n/pt_BR.php
index 1f96b75462a8bc402dce238dcee98e9848e5ea00..6727219db427c573286460e1eb6202dc3109b709 100644
--- a/apps/user_webdavauth/l10n/pt_BR.php
+++ b/apps/user_webdavauth/l10n/pt_BR.php
@@ -1,4 +1,5 @@
 <?php $TRANSLATIONS = array(
 "WebDAV Authentication" => "Autenticação WebDAV",
+"URL: " => "URL:",
 "ownCloud will send the user credentials to this URL. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "O ownCloud enviará as credenciais do usuário para esta URL. Este plugin verifica a resposta e interpreta o os códigos de status do HTTP 401 e 403 como credenciais inválidas, e todas as outras respostas como credenciais válidas."
 );
diff --git a/apps/user_webdavauth/l10n/ru.php b/apps/user_webdavauth/l10n/ru.php
index ad3dfd2e67f29c8ddc7d735a242a332c1e587cdb..20acc6e59a9bd40af89752ec0a945f6675c6ac7d 100644
--- a/apps/user_webdavauth/l10n/ru.php
+++ b/apps/user_webdavauth/l10n/ru.php
@@ -1,4 +1,5 @@
 <?php $TRANSLATIONS = array(
 "WebDAV Authentication" => "Идентификация WebDAV",
-"ownCloud will send the user credentials to this URL. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "ownCloud отправит пользовательские данные на этот URL. Затем плагин проверит ответ, в случае HTTP ответа 401 или 403 данные будут считаться неверными, при любых других ответах - верными."
+"URL: " => "URL:",
+"ownCloud will send the user credentials to this URL. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "ownCloud отправит учётные данные пользователя на этот адрес. Затем плагин проверит ответ, в случае HTTP ответа 401 или 403 данные будут считаться неверными, при любых других ответах - верными."
 );
diff --git a/apps/user_webdavauth/l10n/sk_SK.php b/apps/user_webdavauth/l10n/sk_SK.php
index 589a82dc6f589b1321c269fb57e25c10ec708e4a..fa63b18569a5457fd101c9f3d7a36677cccb8846 100644
--- a/apps/user_webdavauth/l10n/sk_SK.php
+++ b/apps/user_webdavauth/l10n/sk_SK.php
@@ -1,4 +1,5 @@
 <?php $TRANSLATIONS = array(
 "WebDAV Authentication" => "WebDAV overenie",
+"URL: " => "URL: ",
 "ownCloud will send the user credentials to this URL. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "ownCloud odošle používateľské údaje na zadanú URL. Plugin skontroluje odpoveď a považuje návratovú hodnotu HTTP 401 a 403 za neplatné údaje a všetky ostatné hodnoty ako platné prihlasovacie údaje."
 );
diff --git a/apps/user_webdavauth/l10n/sl.php b/apps/user_webdavauth/l10n/sl.php
index 6bae847dc3485f2a11a8014945133517157d7fd0..105fda48652c2e1f773e2f57e1c82d2fb60be700 100644
--- a/apps/user_webdavauth/l10n/sl.php
+++ b/apps/user_webdavauth/l10n/sl.php
@@ -1,4 +1,5 @@
 <?php $TRANSLATIONS = array(
 "WebDAV Authentication" => "Overitev WebDAV",
+"URL: " => "URL:",
 "ownCloud will send the user credentials to this URL. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "Sistem ownCloud bo poslal uporabniška poverila na navedeni naslov URL. Ta vstavek preveri odziv in tolmači kode stanja HTTP 401 in HTTP 403 kot spodletel odgovor in vse ostale odzive kot veljavna poverila."
 );
diff --git a/apps/user_webdavauth/l10n/zh_CN.php b/apps/user_webdavauth/l10n/zh_CN.php
index 5a935f17125e4dcef84cf0cbd206efb43ae85fa7..ee4b88c6b49509dd21d03cb34f26966d7c3ad1db 100644
--- a/apps/user_webdavauth/l10n/zh_CN.php
+++ b/apps/user_webdavauth/l10n/zh_CN.php
@@ -1,4 +1,5 @@
 <?php $TRANSLATIONS = array(
 "WebDAV Authentication" => "WebDAV 认证",
+"URL: " => "地址：",
 "ownCloud will send the user credentials to this URL. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "ownCloud 将会发送用户的身份到此 URL。这个插件检查返回值并且将 HTTP 状态编码 401 和 403 解释为非法身份，其他所有返回值为合法身份。"
 );
diff --git a/apps/user_webdavauth/user_webdavauth.php b/apps/user_webdavauth/user_webdavauth.php
index 146034a5d43c496d4bdd483ea4203a2f5ef673f7..86e5b916f3d26fa91872cd7247a8c7870d16bbf7 100755
--- a/apps/user_webdavauth/user_webdavauth.php
+++ b/apps/user_webdavauth/user_webdavauth.php
@@ -56,10 +56,10 @@ class OC_USER_WEBDAVAUTH extends OC_User_Backend {
 		}
 		$returncode= substr($headers[0], 9, 3);
 
-		if(($returncode=='401') or ($returncode=='403')) {
-			return(false);
-		}else{
-			return($uid);
+		if(substr($returncode, 0, 1) === '2') {
+			return $uid;
+		} else {
+			return false;
 		}
 
 	}
diff --git a/autotest.sh b/autotest.sh
index 4562b3ed08a553cea5671ccf6e9ef266a89f2afe..141b4333f9725a69c5ca9adfba4d281fec3bc893 100755
--- a/autotest.sh
+++ b/autotest.sh
@@ -132,9 +132,9 @@ EOF
 	php -f enable_all.php
 	if [ "$1" == "sqlite" ] ; then
 		# coverage only with sqlite - causes segfault on ci.tmit.eu - reason unknown
-		phpunit --configuration phpunit-autotest.xml --log-junit autotest-results-$1.xml --coverage-clover autotest-clover-$1.xml --coverage-html coverage-html-$1
+		phpunit --configuration phpunit-autotest.xml --log-junit autotest-results-$1.xml --coverage-clover autotest-clover-$1.xml --coverage-html coverage-html-$1 $2 $3
 	else
-		phpunit --configuration phpunit-autotest.xml --log-junit autotest-results-$1.xml
+		phpunit --configuration phpunit-autotest.xml --log-junit autotest-results-$1.xml $2 $3
 	fi
 }
 
@@ -143,13 +143,12 @@ EOF
 #
 if [ -z "$1" ]
   then
-	execute_tests "sqlite"
+	execute_tests 'sqlite'
 	execute_tests 'mysql'
 	execute_tests 'pgsql'
-	# we will add oci as soon as it's stable
-	#execute_tests 'oci'
+	execute_tests 'oci'
 else
-	execute_tests $1
+	execute_tests $1 $2 $3
 fi
 
 #
diff --git a/config/config.sample.php b/config/config.sample.php
index 2812d848133fa286f2f441e34265a0166225500f..cacca78e9706d3b2cd6c515e71e8c105da3015b6 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -145,6 +145,9 @@ $CONFIG = array(
 /* Lifetime of the remember login cookie, default is 15 days */
 "remember_login_cookie_lifetime" => 60*60*24*15,
 
+/* Life time of a session after inactivity */
+"session_lifetime" => 60 * 60 * 24,
+
 /* Custom CSP policy, changing this will overwrite the standard policy */
 "custom_csp_policy" => "default-src 'self'; script-src 'self' 'unsafe-eval'; style-src 'self' 'unsafe-inline'; frame-src *; img-src *; font-src 'self' data:; media-src *",
 
diff --git a/core/ajax/update.php b/core/ajax/update.php
index db00da022397445b38b87903ec0ec8048a3f88d7..43ed75b07f1d0aa4d2e29aedbac3887d6f47ddaa 100644
--- a/core/ajax/update.php
+++ b/core/ajax/update.php
@@ -4,113 +4,34 @@ $RUNTIME_NOAPPS = true;
 require_once '../../lib/base.php';
 
 if (OC::checkUpgrade(false)) {
-	\OC_DB::enableCaching(false);
-	OC_Config::setValue('maintenance', true);
-	$installedVersion = OC_Config::getValue('version', '0.0.0');
-	$currentVersion = implode('.', OC_Util::getVersion());
-	OC_Log::write('core', 'starting upgrade from ' . $installedVersion . ' to ' . $currentVersion, OC_Log::WARN);
-	$updateEventSource = new OC_EventSource();
-	$watcher = new UpdateWatcher($updateEventSource);
-	OC_Hook::connect('update', 'success', $watcher, 'success');
-	OC_Hook::connect('update', 'error', $watcher, 'error');
-	OC_Hook::connect('update', 'failure', $watcher, 'failure');
-	$watcher->success('Turned on maintenance mode');
-	try {
-		$result = OC_DB::updateDbFromStructure(OC::$SERVERROOT.'/db_structure.xml');
-		$watcher->success('Updated database');
-
-		// do a file cache upgrade for users with files
-		// this can take loooooooooooooooooooooooong
-		__doFileCacheUpgrade($watcher);
-	} catch (Exception $exception) {
-		$watcher->failure($exception->getMessage());
-	}
-	OC_Config::setValue('version', implode('.', OC_Util::getVersion()));
-	OC_App::checkAppsRequirements();
-	// load all apps to also upgrade enabled apps
-	OC_App::loadApps();
-	OC_Config::setValue('maintenance', false);
-	$watcher->success('Turned off maintenance mode');
-	$watcher->done();
-}
-
-/**
- * The FileCache Upgrade routine
- *
- * @param UpdateWatcher $watcher
- */
-function __doFileCacheUpgrade($watcher) {
-	try {
-		$query = \OC_DB::prepare('
-		SELECT DISTINCT `user`
-		FROM `*PREFIX*fscache`
-		');
-		$result = $query->execute();
-	} catch (\Exception $e) {
-		return;
-	}
-	$users = $result->fetchAll();
-	if(count($users) == 0) {
-		return;
-	}
-	$step = 100 / count($users);
-	$percentCompleted = 0;
-	$lastPercentCompletedOutput = 0;
-	$startInfoShown = false;
-	foreach($users as $userRow) {
-		$user = $userRow['user'];
-		\OC\Files\Filesystem::initMountPoints($user);
-		\OC\Files\Cache\Upgrade::doSilentUpgrade($user);
-		if(!$startInfoShown) {
-			//We show it only now, because otherwise Info about upgraded apps
-			//will appear between this and progress info
-			$watcher->success('Updating filecache, this may take really long...');
-			$startInfoShown = true;
-		}
-		$percentCompleted += $step;
-		$out = floor($percentCompleted);
-		if($out != $lastPercentCompletedOutput) {
-			$watcher->success('... '. $out.'% done ...');
-			$lastPercentCompletedOutput = $out;
-		}
-	}
-	$watcher->success('Updated filecache');
-}
-
-class UpdateWatcher {
-	/**
-	 * @var \OC_EventSource $eventSource;
-	 */
-	private $eventSource;
-
-	public function __construct($eventSource) {
-		$this->eventSource = $eventSource;
-	}
-
-	public function success($message) {
-		OC_Util::obEnd();
-		$this->eventSource->send('success', $message);
-		ob_start();
-	}
-
-	public function error($message) {
-		OC_Util::obEnd();
-		$this->eventSource->send('error', $message);
-		ob_start();
-	}
-
-	public function failure($message) {
-		OC_Util::obEnd();
-		$this->eventSource->send('failure', $message);
-		$this->eventSource->close();
+	$eventSource = new OC_EventSource();
+	$updater = new \OC\Updater(\OC_Log::$object);
+	$updater->listen('\OC\Updater', 'maintenanceStart', function () use ($eventSource) {
+		$eventSource->send('success', 'Turned on maintenance mode');
+	});
+	$updater->listen('\OC\Updater', 'maintenanceEnd', function () use ($eventSource) {
+		$eventSource->send('success', 'Turned off maintenance mode');
+	});
+	$updater->listen('\OC\Updater', 'dbUpgrade', function () use ($eventSource) {
+		$eventSource->send('success', 'Updated database');
+	});
+	$updater->listen('\OC\Updater', 'filecacheStart', function () use ($eventSource) {
+		$eventSource->send('success', 'Updating filecache, this may take really long...');
+	});
+	$updater->listen('\OC\Updater', 'filecacheDone', function () use ($eventSource) {
+		$eventSource->send('success', 'Updated filecache');
+	});
+	$updater->listen('\OC\Updater', 'filecacheProgress', function ($out) use ($eventSource) {
+		$eventSource->send('success', '... ' . $out . '% done ...');
+	});
+	$updater->listen('\OC\Updater', 'failure', function ($message) use ($eventSource) {
+		$eventSource->send('failure', $message);
+		$eventSource->close();
 		OC_Config::setValue('maintenance', false);
-		die();
-	}
+	});
 
-	public function done() {
-		OC_Util::obEnd();
-		$this->eventSource->send('done', '');
-		$this->eventSource->close();
-	}
+	$updater->upgrade();
 
-}
\ No newline at end of file
+	$eventSource->send('done', '');
+	$eventSource->close();
+}
diff --git a/core/css/jquery.multiselect.css b/core/css/jquery.multiselect.css
index 156799f086957657f4406c0ba0dd74ff80f8b6c8..898786a6157bd6795ce6608e8d6b10a1c1ef1139 100644
--- a/core/css/jquery.multiselect.css
+++ b/core/css/jquery.multiselect.css
@@ -11,7 +11,7 @@
 .ui-multiselect-header span.ui-icon { float:left }
 .ui-multiselect-header li.ui-multiselect-close { float:right; text-align:right; padding-right:0 }
 
-.ui-multiselect-menu { display:none; padding:3px; position:absolute; z-index:10000 }
+.ui-multiselect-menu { display:none; padding:3px; position:absolute; z-index:10000; text-align: left }
 .ui-multiselect-checkboxes { position:relative /* fixes bug in IE6/7 */; overflow-y:scroll }
 .ui-multiselect-checkboxes label { cursor:default; display:block; border:1px solid transparent; padding:3px 1px }
 .ui-multiselect-checkboxes label input { position:relative; top:1px }
diff --git a/core/css/styles.css b/core/css/styles.css
index 40a17a42876c3b939f0cda97eafdcc83705f2688..6c9d00114a0eeb5248711e78229e0df384689476 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -416,7 +416,13 @@ a.bookmarklet { background-color:#ddd; border:1px solid #ccc; padding:5px;paddin
 #oc-dialog-filepicker-content .filepicker_element_selected { background-color:lightblue;}
 .ui-dialog {position:fixed !important;}
 span.ui-icon {float: left; margin: 3px 7px 30px 0;}
+
 .loading { background: url('../img/loading.gif') no-repeat center; cursor: wait; }
+.move2trash { /* decrease spinner size */
+	width: 16px;
+	height: 16px;
+}
+
 
 /* ---- CATEGORIES ---- */
 #categoryform .scrollarea { position:absolute; left:10px; top:10px; right:10px; bottom:50px; overflow:auto; border:1px solid #ddd; background:#f8f8f8; }
@@ -655,13 +661,13 @@ div.crumb:active {
 /* icons */
 .folder-icon { background-image: url('../img/places/folder.svg'); }
 .delete-icon { background-image: url('../img/actions/delete.svg'); }
-.delete-icon:hover { background-image: url('../img/actions/delete-hover.svg'); }
 .edit-icon { background-image: url('../img/actions/rename.svg'); }
 
 /* buttons */
 button.loading {
 	background-image: url('../img/loading.gif');
 	background-position: right 10px center; background-repeat: no-repeat;
+	background-size: 16px;
 	padding-right: 30px;
 }
 
diff --git a/core/img/actions/add.png b/core/img/actions/add.png
index 25d472b2dc41bd4412507d422b579ff36abad887..1aac02b84544ac0e8436d7c8e3b14176cd35fb88 100644
Binary files a/core/img/actions/add.png and b/core/img/actions/add.png differ
diff --git a/core/img/actions/add.svg b/core/img/actions/add.svg
index 136d6c4b3118fbab65b3a38d21730db713005958..250746e1660b64662fe0654a67fd5de75b4f8136 100644
--- a/core/img/actions/add.svg
+++ b/core/img/actions/add.svg
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="22" width="22" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <defs>
-  <linearGradient id="a" y2="45.69" gradientUnits="userSpaceOnUse" x2="24.139" gradientTransform="matrix(.53994 0 0 .53668 -1.7557 -1.7859)" y1="6.5317" x1="24.139">
-   <stop stop-color="#fff" offset="0"/>
-   <stop stop-color="#fff" stop-opacity="0" offset="1"/>
-  </linearGradient>
- </defs>
- <path opacity=".4" d="m8.5932 8.2152v-5.9948h5v5.9948h6v5.0052h-6v6h-5v-6h-6v-5.0052h6z" fill-rule="evenodd" stroke="url(#a)"/>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <g transform="matrix(-.70711 -.70711 .70711 -.70711 -724.85 752.16)">
+  <path d="m1.6361 1040.9 2.8284-2.8284 3.5355 3.5355 3.5355-3.5355 2.8284 2.8284-3.5355 3.5355 3.5356 3.5356-2.8284 2.8284-3.5356-3.5356-3.5357 3.5354-2.8281-2.8281 3.5354-3.5357z"/>
+ </g>
 </svg>
diff --git a/core/img/actions/delete-hover.png b/core/img/actions/delete-hover.png
deleted file mode 100644
index 048d91cee5143ce826ef9ef3d7619d835bce0877..0000000000000000000000000000000000000000
Binary files a/core/img/actions/delete-hover.png and /dev/null differ
diff --git a/core/img/actions/delete-hover.svg b/core/img/actions/delete-hover.svg
deleted file mode 100644
index 3e8d26c9786d16addcd5df03219d712356c1e09b..0000000000000000000000000000000000000000
--- a/core/img/actions/delete-hover.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <g transform="translate(0 -1036.4)">
-  <path d="m3 1040.4 1-1 4 3 4-3 1 1-3 4 3 4-1 1-4-3-4 3-1-1 3-4z" fill="#d40000"/>
- </g>
-</svg>
diff --git a/core/img/actions/delete.png b/core/img/actions/delete.png
index fa8e18183ed3d126ab5706d093f7e64d944c835a..99f549faf9b70be5d0917d601485170bfae526d8 100644
Binary files a/core/img/actions/delete.png and b/core/img/actions/delete.png differ
diff --git a/core/img/actions/delete.svg b/core/img/actions/delete.svg
index ef564bfd482292f589ad750827209a6b1580fd99..568185c5c70b07ee4a2e8f5c75f8970b31e4280c 100644
--- a/core/img/actions/delete.svg
+++ b/core/img/actions/delete.svg
@@ -1,6 +1,12 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <g transform="translate(0 -1036.4)">
-  <path d="m3 1040.4 1-1 4 3 4-3 1 1-3 4 3 4-1 1-4-3-4 3-1-1 3-4z"/>
- </g>
+ <metadata>
+  <rdf:RDF>
+   <cc:Work rdf:about="">
+    <dc:format>image/svg+xml</dc:format>
+    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+    <dc:title/>
+   </cc:Work>
+  </rdf:RDF>
+ </metadata>
+ <path fill="#d40000" d="M8,1c-3.866,0-7,3.134-7,7s3.134,7,7,7,7-3.134,7-7-3.134-7-7-7zm-2.8438,2.75l2.8438,2.8438,2.844-2.8438,1.406,1.4062-2.8438,2.8438,2.8438,2.844-1.406,1.406-2.844-2.8438-2.8438,2.8438-1.4062-1.406,2.8438-2.844-2.8438-2.8438,1.4062-1.4062z"/>
 </svg>
diff --git a/core/img/actions/lock.png b/core/img/actions/lock.png
index dbcffa3990f7dace24aaae6836977a142d57fe47..f3121811ea69565b897e2806f7d9aa66ac90bd68 100644
Binary files a/core/img/actions/lock.png and b/core/img/actions/lock.png differ
diff --git a/core/img/actions/mail.png b/core/img/actions/mail.png
index 8e884fbc0ea87ee8549053f603bbf9bf55c29817..be6142444ae8052e6f96c4b8afc3d267704d1507 100644
Binary files a/core/img/actions/mail.png and b/core/img/actions/mail.png differ
diff --git a/core/img/actions/mail.svg b/core/img/actions/mail.svg
index 2c63daac03440c9003f7ac8fc7b5b60ff46e826c..c01f2c113e707feae3133a79367b03debe91fa3a 100644
--- a/core/img/actions/mail.svg
+++ b/core/img/actions/mail.svg
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <g>
-  <rect stroke-linejoin="round" height="10.244" width="15.244" stroke="#000" stroke-linecap="square" y="2.6281" x=".37806" stroke-width=".75613"/>
-  <path d="m-0.6 11 8.6-5l8.6 5" stroke="#fff" stroke-width="1px" fill="none"/>
-  <path d="m0 2.5 8 6.5 8-6.5" stroke="#fff" stroke-linecap="round" stroke-width="1px"/>
- </g>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <path d="m0.88889 3c-0.49245 0-0.88889 0.3968-0.88889 0.8892v8.2228c0 0.492 0.39644 0.888 0.88889 0.888h14.222c0.493 0 0.889-0.396 0.889-0.888v-8.2228c0-0.4924-0.396-0.8892-0.889-0.8892zm0.75 1.0281 6.0833 6.0833h0.52778l6.1111-6.0833 0.61111 0.61111-3.6389 3.6944 2.75 2.8056-0.61111 0.61111-2.8056-2.8056-2.0278 2.0556h-1.2778l-2.0271-2.0552-2.8055 2.8332-0.6111-0.639 2.7777-2.8054-3.6666-3.6944z"/>
 </svg>
diff --git a/core/img/actions/undelete.png b/core/img/actions/undelete.png
deleted file mode 100644
index d712527ef617dca921bcf75b917a1f728bc2102c..0000000000000000000000000000000000000000
Binary files a/core/img/actions/undelete.png and /dev/null differ
diff --git a/core/img/loader.gif b/core/img/loader.gif
deleted file mode 100644
index e192ca895cd00d6b752ec84619b787188f30ee41..0000000000000000000000000000000000000000
Binary files a/core/img/loader.gif and /dev/null differ
diff --git a/core/img/loading-dark.gif b/core/img/loading-dark.gif
index 5fe86acabc41f3cd97b09eb626e5e9020d5ea28e..13f0f64eab152fa4949476ed83ea24d6fd45a9bc 100644
Binary files a/core/img/loading-dark.gif and b/core/img/loading-dark.gif differ
diff --git a/core/img/loading.gif b/core/img/loading.gif
index 5b33f7e54f4e55b6b8774d86d96895db9af044b4..f8f3dff6fb955ebc02453352e59c845461723292 100644
Binary files a/core/img/loading.gif and b/core/img/loading.gif differ
diff --git a/core/img/remoteStorage-big.png b/core/img/remoteStorage-big.png
deleted file mode 100644
index 7e76e21209e539354805d12d8f92c5a8176c0861..0000000000000000000000000000000000000000
Binary files a/core/img/remoteStorage-big.png and /dev/null differ
diff --git a/core/img/weather-clear.png b/core/img/weather-clear.png
deleted file mode 100644
index 0acf7a9b2afd4ba9b8492f51d5204721f9e4559a..0000000000000000000000000000000000000000
Binary files a/core/img/weather-clear.png and /dev/null differ
diff --git a/core/js/config.php b/core/js/config.php
index 53a8fb96388601b1f8e57e387fbee1076892ae91..dd46f7889d155ab80ff00fef7fcc892da516070e 100644
--- a/core/js/config.php
+++ b/core/js/config.php
@@ -26,8 +26,6 @@ $array = array(
 	"oc_debug" => (defined('DEBUG') && DEBUG) ? 'true' : 'false',
 	"oc_webroot" => "\"".OC::$WEBROOT."\"",
 	"oc_appswebroots" =>  str_replace('\\/', '/', json_encode($apps_paths)), // Ugly unescape slashes waiting for better solution
-	"oc_current_user" => "document.getElementsByTagName('head')[0].getAttribute('data-user')",
-	"oc_requesttoken" => "document.getElementsByTagName('head')[0].getAttribute('data-requesttoken')",
 	"datepickerFormatDate" => json_encode($l->l('jsdate', 'jsdate')),
 	"dayNames" =>  json_encode(
 		array(
diff --git a/core/js/jquery.multiselect.js b/core/js/jquery.multiselect.js
index 46aab7ebf0156b02441c8b3aef720e6e1fb87cd8..16ae4264177011f48da5f75e24c17f0042aa71ff 100644
--- a/core/js/jquery.multiselect.js
+++ b/core/js/jquery.multiselect.js
@@ -1,6 +1,7 @@
+/* jshint forin:true, noarg:true, noempty:true, eqeqeq:true, boss:true, undef:true, curly:true, browser:true, jquery:true */
 /*
- * jQuery MultiSelect UI Widget 1.11
- * Copyright (c) 2011 Eric Hynds
+ * jQuery MultiSelect UI Widget 1.13
+ * Copyright (c) 2012 Eric Hynds
  *
  * http://www.erichynds.com/jquery/jquery-ui-multiselect-widget/
  *
@@ -34,8 +35,8 @@ $.widget("ech.multiselect", {
 		noneSelectedText: 'Select options',
 		selectedText: '# selected',
 		selectedList: 0,
-		show: '',
-		hide: '',
+		show: null,
+		hide: null,
 		autoOpen: false,
 		multiple: true,
 		position: {}
@@ -62,7 +63,7 @@ $.widget("ech.multiselect", {
 			menu = (this.menu = $('<div />'))
 				.addClass('ui-multiselect-menu ui-widget ui-widget-content ui-corner-all')
 				.addClass( o.classes )
-				.insertAfter( button ),
+				.appendTo( document.body ),
 
 			header = (this.header = $('<div />'))
 				.addClass('ui-widget-header ui-corner-all ui-multiselect-header ui-helper-clearfix')
@@ -119,70 +120,72 @@ $.widget("ech.multiselect", {
 			menu = this.menu,
 			checkboxContainer = this.checkboxContainer,
 			optgroups = [],
-			html = [],
+			html = "",
 			id = el.attr('id') || multiselectID++; // unique ID for the label & option tags
 
 		// build items
-		this.element.find('option').each(function( i ){
+		el.find('option').each(function( i ){
 			var $this = $(this),
 				parent = this.parentNode,
 				title = this.innerHTML,
 				description = this.title,
 				value = this.value,
-				inputID = this.id || 'ui-multiselect-'+id+'-option-'+i,
+				inputID = 'ui-multiselect-' + (this.id || id + '-option-' + i),
 				isDisabled = this.disabled,
 				isSelected = this.selected,
-				labelClasses = ['ui-corner-all'],
+				labelClasses = [ 'ui-corner-all' ],
+				liClasses = (isDisabled ? 'ui-multiselect-disabled ' : ' ') + this.className,
 				optLabel;
 
 			// is this an optgroup?
-			if( parent.tagName.toLowerCase() === 'optgroup' ){
-				optLabel = parent.getAttribute('label');
+			if( parent.tagName === 'OPTGROUP' ){
+				optLabel = parent.getAttribute( 'label' );
 
 				// has this optgroup been added already?
 				if( $.inArray(optLabel, optgroups) === -1 ){
-					html.push('<li class="ui-multiselect-optgroup-label"><a href="#">' + optLabel + '</a></li>');
+					html += '<li class="ui-multiselect-optgroup-label ' + parent.className + '"><a href="#">' + optLabel + '</a></li>';
 					optgroups.push( optLabel );
 				}
 			}
 
 			if( isDisabled ){
-				labelClasses.push('ui-state-disabled');
+				labelClasses.push( 'ui-state-disabled' );
 			}
 
 			// browsers automatically select the first option
 			// by default with single selects
 			if( isSelected && !o.multiple ){
-				labelClasses.push('ui-state-active');
+				labelClasses.push( 'ui-state-active' );
 			}
 
-			html.push('<li class="' + (isDisabled ? 'ui-multiselect-disabled' : '') + '">');
+			html += '<li class="' + liClasses + '">';
 
 			// create the label
-			html.push('<label for="'+inputID+'" title="'+description+'" class="'+labelClasses.join(' ')+ '">');
-			html.push('<input id="'+inputID+'" name="multiselect_'+id+'" type="'+(o.multiple ? "checkbox" : "radio")+'" value="'+value+'" title="'+title+'"');
+			html += '<label for="' + inputID + '" title="' + description + '" class="' + labelClasses.join(' ') + '">';
+			html += '<input id="' + inputID + '" name="multiselect_' + id + '" type="' + (o.multiple ? "checkbox" : "radio") + '" value="' + value + '" title="' + title + '"';
 
 			// pre-selected?
 			if( isSelected ){
-				html.push(' checked="checked"');
-				html.push(' aria-selected="true"');
+				html += ' checked="checked"';
+				html += ' aria-selected="true"';
 			}
 
 			// disabled?
 			if( isDisabled ){
-				html.push(' disabled="disabled"');
-				html.push(' aria-disabled="true"');
+				html += ' disabled="disabled"';
+				html += ' aria-disabled="true"';
 			}
 
 			// add the title and close everything off
-			html.push(' /><span>' + title + '</span></label></li>');
+			html += ' /><span>' + title + '</span></label></li>';
 		});
 
 		// insert into the DOM
-		checkboxContainer.html( html.join('') );
+		checkboxContainer.html( html );
 
 		// cache some moar useful elements
 		this.labels = menu.find('label');
+		this.inputs = this.labels.children('input');
 
 		// set widths
 		this._setButtonWidth();
@@ -197,10 +200,10 @@ $.widget("ech.multiselect", {
 		}
 	},
 
-	// updates the button text.  call refresh() to rebuild
+	// updates the button text. call refresh() to rebuild
 	update: function(){
 		var o = this.options,
-			$inputs = this.labels.find('input'),
+			$inputs = this.inputs,
 			$checked = $inputs.filter(':checked'),
 			numChecked = $checked.length,
 			value;
@@ -211,7 +214,7 @@ $.widget("ech.multiselect", {
 			if($.isFunction( o.selectedText )){
 				value = o.selectedText.call(this, numChecked, $inputs.length, $checked.get());
 			} else if( /\d/.test(o.selectedList) && o.selectedList > 0 && numChecked <= o.selectedList){
-				value = $checked.map(function(){ return this.title; }).get().join(', ');
+				value = $checked.map(function(){ return $(this).next().html(); }).get().join(', ');
 			} else {
 				value = o.selectedText.replace('#', numChecked).replace('#', $inputs.length);
 			}
@@ -291,8 +294,8 @@ $.widget("ech.multiselect", {
 
 				var $this = $(this),
 					$inputs = $this.parent().nextUntil('li.ui-multiselect-optgroup-label').find('input:visible:not(:disabled)'),
-				    nodes = $inputs.get(),
-				    label = $this.parent().text();
+					nodes = $inputs.get(),
+					label = $this.parent().text();
 
 				// trigger event and bail if the return is false
 				if( self._trigger('beforeoptgrouptoggle', e, { inputs:nodes, label:label }) === false ){
@@ -343,11 +346,15 @@ $.widget("ech.multiselect", {
 					tags = self.element.find('option');
 
 				// bail if this input is disabled or the event is cancelled
-				if( this.disabled || self._trigger('click', e, { value:val, text:this.title, checked:checked }) === false ){
+				if( this.disabled || self._trigger('click', e, { value: val, text: this.title, checked: checked }) === false ){
 					e.preventDefault();
 					return;
 				}
 
+				// make sure the input has focus. otherwise, the esc key
+				// won't close the menu after clicking an item.
+				$this.focus();
+
 				// toggle aria state
 				$this.attr('aria-selected', checked);
 
@@ -389,7 +396,7 @@ $.widget("ech.multiselect", {
 		// handler fires before the form is actually reset.  delaying it a bit
 		// gives the form inputs time to clear.
 		$(this.element[0].form).bind('reset.multiselect', function(){
-			setTimeout(function(){ self.update(); }, 10);
+			setTimeout($.proxy(self.refresh, self), 10);
 		});
 	},
 
@@ -428,7 +435,7 @@ $.widget("ech.multiselect", {
 
 		// if at the first/last element
 		if( !$next.length ){
-			var $container = this.menu.find('ul:last');
+			var $container = this.menu.find('ul').last();
 
 			// move to the first/last
 			this.menu.find('label')[ moveToLast ? 'last' : 'first' ]().trigger('mouseover');
@@ -445,27 +452,29 @@ $.widget("ech.multiselect", {
 	// other related attributes of a checkbox.
 	//
 	// The context of this function should be a checkbox; do not proxy it.
-	_toggleCheckbox: function( prop, flag ){
+	_toggleState: function( prop, flag ){
 		return function(){
-			!this.disabled && (this[ prop ] = flag);
+			if( !this.disabled ) {
+				this[ prop ] = flag;
+			}
 
 			if( flag ){
 				this.setAttribute('aria-selected', true);
 			} else {
 				this.removeAttribute('aria-selected');
 			}
-		}
+		};
 	},
 
 	_toggleChecked: function( flag, group ){
-		var $inputs = (group && group.length) ?
-			group :
-			this.labels.find('input'),
-
+		var $inputs = (group && group.length) ?  group : this.inputs,
 			self = this;
 
 		// toggle state on inputs
-		$inputs.each(this._toggleCheckbox('checked', flag));
+		$inputs.each(this._toggleState('checked', flag));
+
+		// give the first input focus
+		$inputs.eq(0).focus();
 
 		// update button text
 		this.update();
@@ -480,7 +489,7 @@ $.widget("ech.multiselect", {
 			.find('option')
 			.each(function(){
 				if( !this.disabled && $.inArray(this.value, values) > -1 ){
-					self._toggleCheckbox('selected', flag).call( this );
+					self._toggleState('selected', flag).call( this );
 				}
 			});
 
@@ -494,9 +503,22 @@ $.widget("ech.multiselect", {
 		this.button
 			.attr({ 'disabled':flag, 'aria-disabled':flag })[ flag ? 'addClass' : 'removeClass' ]('ui-state-disabled');
 
-		this.menu
-			.find('input')
-			.attr({ 'disabled':flag, 'aria-disabled':flag })
+		var inputs = this.menu.find('input');
+		var key = "ech-multiselect-disabled";
+
+		if(flag) {
+			// remember which elements this widget disabled (not pre-disabled)
+			// elements, so that they can be restored if the widget is re-enabled.
+			inputs = inputs.filter(':enabled')
+				.data(key, true)
+		} else {
+			inputs = inputs.filter(function() {
+				return $.data(this, key) === true;
+			}).removeData(key);
+		}
+
+		inputs
+			.attr({ 'disabled':flag, 'arial-disabled':flag })
 			.parent()[ flag ? 'addClass' : 'removeClass' ]('ui-state-disabled');
 
 		this.element
@@ -509,16 +531,17 @@ $.widget("ech.multiselect", {
 			button = this.button,
 			menu = this.menu,
 			speed = this.speed,
-			o = this.options;
+			o = this.options,
+			args = [];
 
 		// bail if the multiselectopen event returns false, this widget is disabled, or is already open
 		if( this._trigger('beforeopen') === false || button.hasClass('ui-state-disabled') || this._isOpen ){
 			return;
 		}
 
-		var $container = menu.find('ul:last'),
+		var $container = menu.find('ul').last(),
 			effect = o.show,
-			pos = button.position();
+			pos = button.offset();
 
 		// figure out opening effects/speeds
 		if( $.isArray(o.show) ){
@@ -526,6 +549,12 @@ $.widget("ech.multiselect", {
 			speed = o.show[1] || self.speed;
 		}
 
+		// if there's an effect, assume jQuery UI is in use
+		// build the arguments to pass to show()
+		if( effect ) {
+      args = [ effect, speed ];
+		}
+
 		// set the scroll of the checkbox container
 		$container.scrollTop(0).height(o.height);
 
@@ -536,17 +565,19 @@ $.widget("ech.multiselect", {
 			menu
 				.show()
 				.position( o.position )
-				.hide()
-				.show( effect, speed );
+				.hide();
 
 		// if position utility is not available...
 		} else {
 			menu.css({
-				top: pos.top+button.outerHeight(),
+				top: pos.top + button.outerHeight(),
 				left: pos.left
-			}).show( effect, speed );
+			});
 		}
 
+		// show the menu, maybe with a speed/effect combo
+		$.fn.show.apply(menu, args);
+
 		// select the first option
 		// triggering both mouseover and mouseover because 1.4.2+ has a bug where triggering mouseover
 		// will actually trigger mouseenter.  the mouseenter trigger is there for when it's eventually fixed
@@ -563,7 +594,10 @@ $.widget("ech.multiselect", {
 			return;
 		}
 
-		var o = this.options, effect = o.hide, speed = this.speed;
+		var o = this.options,
+		    effect = o.hide,
+		    speed = this.speed,
+		    args = [];
 
 		// figure out opening effects/speeds
 		if( $.isArray(o.hide) ){
@@ -571,7 +605,11 @@ $.widget("ech.multiselect", {
 			speed = o.hide[1] || this.speed;
 		}
 
-		this.menu.hide(effect, speed);
+    if( effect ) {
+      args = [ effect, speed ];
+    }
+
+    $.fn.hide.apply(this.menu, args);
 		this.button.removeClass('ui-state-active').trigger('blur').trigger('mouseleave');
 		this._isOpen = false;
 		this._trigger('close');
@@ -618,6 +656,10 @@ $.widget("ech.multiselect", {
 		return this.menu;
 	},
 
+	getButton: function(){
+	  return this.button;
+  },
+
 	// react to option changes after initialization
 	_setOption: function( key, value ){
 		var menu = this.menu;
@@ -633,7 +675,7 @@ $.widget("ech.multiselect", {
 				menu.find('a.ui-multiselect-none span').eq(-1).text(value);
 				break;
 			case 'height':
-				menu.find('ul:last').height( parseInt(value,10) );
+				menu.find('ul').last().height( parseInt(value,10) );
 				break;
 			case 'minWidth':
 				this.options[ key ] = parseInt(value,10);
@@ -649,6 +691,11 @@ $.widget("ech.multiselect", {
 			case 'classes':
 				menu.add(this.button).removeClass(this.options.classes).addClass(value);
 				break;
+			case 'multiple':
+				menu.toggleClass('ui-multiselect-single', !value);
+				this.options.multiple = value;
+				this.element[0].multiple = value;
+				this.refresh();
 		}
 
 		$.Widget.prototype._setOption.apply( this, arguments );
diff --git a/core/js/js.js b/core/js/js.js
index 3cb4d3dd151582915626c2363dc106b4a7de1fc3..5158b66d73a7ab849b31083d4a3a8fbba3d2bfd1 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -7,7 +7,10 @@
  */
 var oc_debug;
 var oc_webroot;
-var oc_requesttoken;
+
+var oc_current_user = document.getElementsByTagName('head')[0].getAttribute('data-user');
+var oc_requesttoken = document.getElementsByTagName('head')[0].getAttribute('data-requesttoken');
+
 if (typeof oc_webroot === "undefined") {
 	oc_webroot = location.pathname.substr(0, location.pathname.lastIndexOf('/'));
 }
@@ -223,8 +226,12 @@ var OC={
 		var path=OC.filePath(app,'css',style+'.css');
 		if(OC.addStyle.loaded.indexOf(path)===-1){
 			OC.addStyle.loaded.push(path);
-			style=$('<link rel="stylesheet" type="text/css" href="'+path+'"/>');
-			$('head').append(style);
+			if (document.createStyleSheet) {
+				document.createStyleSheet(path);
+			} else {
+				style=$('<link rel="stylesheet" type="text/css" href="'+path+'"/>');
+				$('head').append(style);
+			}
 		}
 	},
 	basename: function(path) {
@@ -349,10 +356,10 @@ OC.Notification={
 	},
 	show: function(text) {
 		if(($('#notification').filter('span.undo').length == 1) || OC.Notification.isHidden()){
-			$('#notification').html(text);
+			$('#notification').text(text);
 			$('#notification').fadeIn().css("display","inline");
 		}else{
-			OC.Notification.queuedNotifications.push($(text).html());
+			OC.Notification.queuedNotifications.push($('<div/>').text(text).html());
 		}
 	},
 	isHidden: function() {
diff --git a/core/js/share.js b/core/js/share.js
index 36e4babedf9d98a16839018bf9d0231abbbd1814..21e352ee1c656bc94eb165eab4f221a38fc3ea31 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -149,13 +149,26 @@ 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.displayname_owner})+'</span>';
+				html += '<span class="reshare">'+t('core', 'Shared with you and the group {group} by {owner}', {group: escapeHTML(data.reshare.share_with), owner: escapeHTML(data.reshare.displayname_owner)})+'</span>';
 			} else {
-				html += '<span class="reshare">'+t('core', 'Shared with you by {owner}', {owner: data.reshare.displayname_owner})+'</span>';
+				html += '<span class="reshare">'+t('core', 'Shared with you by {owner}', {owner: escapeHTML(data.reshare.displayname_owner)})+'</span>';
 			}
 			html += '<br />';
 		}
 		if (possiblePermissions & OC.PERMISSION_SHARE) {
+			// Determine the Allow Public Upload status.
+			// Used later on to determine if the
+			// respective checkbox should be checked or
+			// not.
+
+			var allowPublicUploadStatus = false;
+			$.each(data.shares, function(key, value) {
+				if (allowPublicUploadStatus) {
+					return true;
+				}
+				allowPublicUploadStatus = (value.permissions & OC.PERMISSION_CREATE) ? true : false;
+			});
+
 			html += '<input id="shareWith" type="text" placeholder="'+t('core', 'Share with')+'" />';
 			html += '<ul id="shareWithList">';
 			html += '</ul>';
@@ -168,12 +181,18 @@ OC.Share={
 				html += '<div id="linkPass">';
 				html += '<input id="linkPassText" type="password" placeholder="'+t('core', 'Password')+'" />';
 				html += '</div>';
-				html += '</div>';
-				html += '<form id="emailPrivateLink" >';
+				if (itemType === 'folder' && (possiblePermissions & OC.PERMISSION_CREATE)) {
+					html += '<div id="allowPublicUploadWrapper" style="display:none;">';
+					html += '<input type="checkbox" value="1" name="allowPublicUpload" id="sharingDialogAllowPublicUpload"' + ((allowPublicUploadStatus) ? 'checked="checked"' : '') + ' />';
+					html += '<label for="sharingDialogAllowPublicUpload">' + t('core', 'Allow Public Upload') + '</label>';
+					html += '</div>';
+				}
+				html += '</div><form id="emailPrivateLink" >';
 				html += '<input id="email" style="display:none; width:62%;" value="" placeholder="'+t('core', 'Email link to person')+'" type="text" />';
 				html += '<input id="emailButton" style="display:none;" type="submit" value="'+t('core', 'Send')+'" />';
 				html += '</form>';
 			}
+
 			html += '<div id="expiration">';
 			html += '<input type="checkbox" name="expirationCheckbox" id="expirationCheckbox" value="1" /><label for="expirationCheckbox">'+t('core', 'Set expiration date')+'</label>';
 			html += '<input id="expirationDate" type="text" placeholder="'+t('core', 'Expiration date')+'" style="display:none; width:90%;" />';
@@ -370,6 +389,7 @@ OC.Share={
 		$('#expiration').show();
 		$('#emailPrivateLink #email').show();
 		$('#emailPrivateLink #emailButton').show();
+		$('#allowPublicUploadWrapper').show();
 	},
 	hideLink:function() {
 		$('#linkText').hide('blind');
@@ -378,6 +398,7 @@ OC.Share={
 		$('#linkPass').hide();
 		$('#emailPrivateLink #email').hide();
 		$('#emailPrivateLink #emailButton').hide();
+		$('#allowPublicUploadWrapper').hide();
 	},
 	dirname:function(path) {
 		return path.replace(/\\/g,'/').replace(/\/[^\/]*$/, '');
@@ -543,6 +564,28 @@ $(document).ready(function() {
 		$(this).select();
 	});
 
+	// Handle the Allow Public Upload Checkbox
+	$(document).on('click', '#sharingDialogAllowPublicUpload', function() {
+
+		// Gather data
+		var allowPublicUpload = $(this).is(':checked');
+		var itemType = $('#dropdown').data('item-type');
+		var itemSource = $('#dropdown').data('item-source');
+		var permissions = 0;
+
+		// Calculate permissions
+		if (allowPublicUpload) {
+			permissions = OC.PERMISSION_UPDATE + OC.PERMISSION_CREATE + OC.PERMISSION_READ;
+		} else {
+			permissions = OC.PERMISSION_READ;
+		}
+
+		// Update the share information
+		OC.Share.share(itemType, itemSource,	OC.Share.SHARE_TYPE_LINK, '', permissions, function(data) {
+			return;
+		});
+	});
+
 	$(document).on('click', '#dropdown #showPassword', function() {
 		$('#linkPass').toggle('blind');
 		if (!$('#showPassword').is(':checked') ) {
diff --git a/core/l10n/af_ZA.php b/core/l10n/af_ZA.php
index 4878c75eddeac38525afc02e568ddabbff154f8e..dc78e44c8d7140fcc643ff182b306ceacb774c8c 100644
--- a/core/l10n/af_ZA.php
+++ b/core/l10n/af_ZA.php
@@ -15,7 +15,6 @@
 "Admin" => "Admin",
 "Help" => "Hulp",
 "Cloud not found" => "Wolk nie gevind",
-"web services under your control" => "webdienste onder jou beheer",
 "Create an <strong>admin account</strong>" => "Skep `n <strong>admin-rekening</strong>",
 "Advanced" => "Gevorderd",
 "Configure the database" => "Stel databasis op",
diff --git a/core/l10n/ar.php b/core/l10n/ar.php
index 7ac7a564c35ac1fe58ed81846a5ac7ed12b48b3f..b18ee712cfa206148bfac61f29e173e01adb6d8a 100644
--- a/core/l10n/ar.php
+++ b/core/l10n/ar.php
@@ -98,7 +98,6 @@
 "Help" => "المساعدة",
 "Access forbidden" => "التوصّل محظور",
 "Cloud not found" => "لم يتم إيجاد",
-"web services under your control" => "خدمات الشبكة تحت سيطرتك",
 "Edit categories" => "عدل الفئات",
 "Add" => "اضف",
 "Security Warning" => "تحذير أمان",
diff --git a/core/l10n/bg_BG.php b/core/l10n/bg_BG.php
index 490bea9b1707f8f1ed0355cc797fbd71b522a86d..608f26bc861d6f0442b9443b63d81681356c51e6 100644
--- a/core/l10n/bg_BG.php
+++ b/core/l10n/bg_BG.php
@@ -50,7 +50,6 @@
 "Help" => "Помощ",
 "Access forbidden" => "Достъпът е забранен",
 "Cloud not found" => "облакът не намерен",
-"web services under your control" => "уеб услуги под Ваш контрол",
 "Edit categories" => "Редактиране на категориите",
 "Add" => "Добавяне",
 "Create an <strong>admin account</strong>" => "Създаване на <strong>админ профил</strong>",
diff --git a/core/l10n/bn_BD.php b/core/l10n/bn_BD.php
index c775d2fb6af952c190a7ea31b252fb044b990931..5c171af567c10363f2c650678fe8fef5ab181f8c 100644
--- a/core/l10n/bn_BD.php
+++ b/core/l10n/bn_BD.php
@@ -95,7 +95,6 @@
 "Help" => "সহায়িকা",
 "Access forbidden" => "অধিগমনের অনুমতি নেই",
 "Cloud not found" => "ক্লাউড খুঁজে পাওয়া গেল না",
-"web services under your control" => "ওয়েব সার্ভিস আপনার হাতের মুঠোয়",
 "Edit categories" => "ক্যাটেগরি সম্পাদনা",
 "Add" => "যোগ কর",
 "Security Warning" => "নিরাপত্তাজনিত সতর্কতা",
diff --git a/core/l10n/ca.php b/core/l10n/ca.php
index 67cf0aca9d6a02489112bb94d36645119ac4a31a..80f0e558a67a3f702c5f6390b5ebc96250b9e0d9 100644
--- a/core/l10n/ca.php
+++ b/core/l10n/ca.php
@@ -62,6 +62,7 @@
 "Share with link" => "Comparteix amb enllaç",
 "Password protect" => "Protegir amb contrasenya",
 "Password" => "Contrasenya",
+"Allow Public Upload" => "Permet pujada pública",
 "Email link to person" => "Enllaç per correu electrónic amb la persona",
 "Send" => "Envia",
 "Set expiration date" => "Estableix la data de venciment",
@@ -90,7 +91,7 @@
 "Request failed!<br>Did you make sure your email/username was right?" => "La petició ha fallat!<br>Esteu segur que el correu/nom d'usuari és correcte?",
 "You will receive a link to reset your password via Email." => "Rebreu un enllaç al correu electrònic per reiniciar la contrasenya.",
 "Username" => "Nom d'usuari",
-"Your files seems to be encrypted. If you didn't have enabled the recovery key there will be no way to get your data back once the password was resetted. If you are not sure what to do, please contact your administrator first before continue. Do you really want to continue?" => "Els vostres fitxers sembla que estan encriptats. Si no tenieu habilitada la clau de recuperació no hi haurà manera de recuperar les dades quan reestabliu la contrasenya. Si no sabeu què fer, contacteu amb l'administrador abans de continuar. Voleu continuar?",
+"Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "Els vostres fitxers estan encriptats. Si no heu habilitat la clau de recuperació no hi haurà manera de recuperar les dades després que reestabliu la contrasenya. Si sabeu què fer, contacteu amb l'administrador abans de continuar. Voleu continuar?",
 "Yes, I really want to reset my password now" => "Sí, vull restablir ara la contrasenya",
 "Request reset" => "Sol·licita reinicialització",
 "Your password was reset" => "La vostra contrasenya s'ha reinicialitzat",
@@ -105,7 +106,6 @@
 "Access forbidden" => "Accés prohibit",
 "Cloud not found" => "No s'ha trobat el núvol",
 "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Ei,\n\nnomés fer-te saber que %s ha compartit %s amb tu.\nMira-ho: %s\n\nSalut!",
-"web services under your control" => "controleu els vostres serveis web",
 "Edit categories" => "Edita les categories",
 "Add" => "Afegeix",
 "Security Warning" => "Avís de seguretat",
diff --git a/core/l10n/cs_CZ.php b/core/l10n/cs_CZ.php
index f3b4cd49bfe165cc99d61bb9b6e508fcac439ea9..b0e70938d4a5875740f314e7e4c419194c3171d5 100644
--- a/core/l10n/cs_CZ.php
+++ b/core/l10n/cs_CZ.php
@@ -62,6 +62,7 @@
 "Share with link" => "Sdílet s odkazem",
 "Password protect" => "Chránit heslem",
 "Password" => "Heslo",
+"Allow Public Upload" => "Povolit veřejné nahrávání",
 "Email link to person" => "Odeslat osobÄ› odkaz e-mailem",
 "Send" => "Odeslat",
 "Set expiration date" => "Nastavit datum vypršení platnosti",
@@ -90,7 +91,7 @@
 "Request failed!<br>Did you make sure your email/username was right?" => "Požadavek selhal.<br>Ujistili jste se, že vaše uživatelské jméno a e-mail jsou správně?",
 "You will receive a link to reset your password via Email." => "Bude Vám e-mailem zaslán odkaz pro obnovu hesla.",
 "Username" => "Uživatelské jméno",
-"Your files seems to be encrypted. If you didn't have enabled the recovery key there will be no way to get your data back once the password was resetted. If you are not sure what to do, please contact your administrator first before continue. Do you really want to continue?" => "Vaše soubory jsou šifrovány. Pokud nemáte povolen klíč obnovy, neexistuje způsob jak získat po obnově hesla vaše data. Pokud si nejste jisti co dělat, kontaktujte nejprve svého správce. Opravdu si přejete pokračovat?",
+"Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "Vaše soubory jsou šifrovány. Pokud nemáte povolen klíč obnovy, neexistuje způsob jak získat po obnově hesla vaše data. Pokud si nejste jisti co dělat, kontaktujte nejprve svého správce. Opravdu si přejete pokračovat?",
 "Yes, I really want to reset my password now" => "Ano, opravdu si nyní přeji obnovit své heslo",
 "Request reset" => "Vyžádat obnovu",
 "Your password was reset" => "Vaše heslo bylo obnoveno",
@@ -105,7 +106,6 @@
 "Access forbidden" => "Přístup zakázán",
 "Cloud not found" => "Cloud nebyl nalezen",
 "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Ahoj,\n\njenom vám chci oznámit že %s s vámi sdílí %s.\nPodívat se můžete zde: %s\n\nDíky",
-"web services under your control" => "služby webu pod Vaší kontrolou",
 "Edit categories" => "Upravit kategorie",
 "Add" => "Přidat",
 "Security Warning" => "Bezpečnostní upozornění",
diff --git a/core/l10n/cy_GB.php b/core/l10n/cy_GB.php
index 6158a356dc7015de00b1afa34cabde1ebd7d3ee5..aeb2995e6bdeb8cb608f9469b7db0c913d318b76 100644
--- a/core/l10n/cy_GB.php
+++ b/core/l10n/cy_GB.php
@@ -100,7 +100,6 @@
 "Help" => "Cymorth",
 "Access forbidden" => "Mynediad wedi'i wahardd",
 "Cloud not found" => "Methwyd canfod cwmwl",
-"web services under your control" => "gwasanaethau gwe a reolir gennych",
 "Edit categories" => "Golygu categorïau",
 "Add" => "Ychwanegu",
 "Security Warning" => "Rhybudd Diogelwch",
diff --git a/core/l10n/da.php b/core/l10n/da.php
index b3da17ba79887cd063b689eb9de845e9f24f5735..2e84c3ff511d78b76997da02b6c0de76598b24cf 100644
--- a/core/l10n/da.php
+++ b/core/l10n/da.php
@@ -101,7 +101,6 @@
 "Help" => "Hjælp",
 "Access forbidden" => "Adgang forbudt",
 "Cloud not found" => "Sky ikke fundet",
-"web services under your control" => "Webtjenester under din kontrol",
 "Edit categories" => "Rediger kategorier",
 "Add" => "Tilføj",
 "Security Warning" => "Sikkerhedsadvarsel",
diff --git a/core/l10n/de.php b/core/l10n/de.php
index bf301b117908ae6bb17180c12d9ec6c8fe67daf2..c33045eb7b6746e3baad2652f9e480de62356692 100644
--- a/core/l10n/de.php
+++ b/core/l10n/de.php
@@ -1,4 +1,5 @@
 <?php $TRANSLATIONS = array(
+"%s shared »%s« with you" => "%s teilte »%s« mit Ihnen",
 "Category type not provided." => "Kategorie nicht angegeben.",
 "No category to add?" => "Keine Kategorie hinzuzufügen?",
 "This category already exists: %s" => "Die Kategorie '%s' existiert bereits.",
@@ -89,6 +90,8 @@
 "Request failed!<br>Did you make sure your email/username was right?" => "Anfrage fehlgeschlagen!<br>Hast Du darauf geachtet, dass Deine E-Mail/Dein Benutzername korrekt war?",
 "You will receive a link to reset your password via Email." => "Du erhältst einen Link per E-Mail, um Dein Passwort zurückzusetzen.",
 "Username" => "Benutzername",
+"Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "Ihre Dateien sind verschlüsselt. Sollten Sie keinen Wiederherstellungschlüssel aktiviert haben, gibt es keine Möglichkeit an Ihre Daten zu kommen, wenn das Passwort zurückgesetzt wird. Falls Sie sich nicht sicher sind, was Sie tun sollen, kontaktieren Sie bitte Ihren Administrator, bevor Sie fortfahren. Wollen Sie wirklich fortfahren?",
+"Yes, I really want to reset my password now" => "Ja, ich will mein Passwort jetzt wirklich zurücksetzen",
 "Request reset" => "Beantrage Zurücksetzung",
 "Your password was reset" => "Dein Passwort wurde zurückgesetzt.",
 "To login page" => "Zur Login-Seite",
@@ -101,7 +104,7 @@
 "Help" => "Hilfe",
 "Access forbidden" => "Zugriff verboten",
 "Cloud not found" => "Cloud nicht gefunden",
-"web services under your control" => "Web-Services unter Deiner Kontrolle",
+"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Hallo,\n\nwollte dich nur kurz informieren, dass %s gerade %s mit dir geteilt hat.\nSchau es dir an: %s\n\nGruß!",
 "Edit categories" => "Kategorien bearbeiten",
 "Add" => "Hinzufügen",
 "Security Warning" => "Sicherheitswarnung",
@@ -131,6 +134,7 @@
 "remember" => "merken",
 "Log in" => "Einloggen",
 "Alternative Logins" => "Alternative Logins",
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "Hallo,<br/><br/>wollte dich nur kurz informieren, dass %s gerade %s mit dir geteilt hat.<br/><a href=\"%s\">Schau es dir an.</a><br/><br/>Gruß!",
 "prev" => "Zurück",
 "next" => "Weiter",
 "Updating ownCloud to version %s, this may take a while." => "Aktualisiere ownCloud auf Version %s. Dies könnte eine Weile dauern."
diff --git a/core/l10n/de_DE.php b/core/l10n/de_DE.php
index fb7835eba2692ae3a988f9af731d5bb0ec6393c3..9d5a7298e19d775982205df8226861ef60bd9ef5 100644
--- a/core/l10n/de_DE.php
+++ b/core/l10n/de_DE.php
@@ -1,4 +1,5 @@
 <?php $TRANSLATIONS = array(
+"%s shared »%s« with you" => "%s geteilt »%s« mit Ihnen",
 "Category type not provided." => "Kategorie nicht angegeben.",
 "No category to add?" => "Keine Kategorie hinzuzufügen?",
 "This category already exists: %s" => "Die nachfolgende Kategorie existiert bereits: %s",
@@ -61,6 +62,7 @@
 "Share with link" => "Ãœber einen Link teilen",
 "Password protect" => "Passwortschutz",
 "Password" => "Passwort",
+"Allow Public Upload" => "Erlaube öffentliches hochladen",
 "Email link to person" => "Link per E-Mail verschicken",
 "Send" => "Senden",
 "Set expiration date" => "Ein Ablaufdatum setzen",
@@ -89,6 +91,8 @@
 "Request failed!<br>Did you make sure your email/username was right?" => "Anfrage fehlgeschlagen!<br>Haben Sie darauf geachtet, dass E-Mail-Adresse/Nutzername korrekt waren?",
 "You will receive a link to reset your password via Email." => "Sie erhalten einen Link per E-Mail, um Ihr Passwort zurückzusetzen.",
 "Username" => "Benutzername",
+"Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "Ihre Dateien sind verschlüsselt. Wenn Sie den Wiederherstellungsschlüssel nicht aktiviert haben, wird es keinen Weg geben, um Ihre Daten wieder zu bekommen, nachdem Ihr Passwort zurückgesetzt wurde. Wenn Sie sich nicht sicher sind, was Sie tun sollen, wenden Sie sich bitte an Ihren Administrator, bevor Sie fortfahren. Wollen Sie wirklich fortfahren?",
+"Yes, I really want to reset my password now" => "Ja, ich möchte jetzt mein Passwort wirklich zurücksetzen.",
 "Request reset" => "Zurücksetzung anfordern",
 "Your password was reset" => "Ihr Passwort wurde zurückgesetzt.",
 "To login page" => "Zur Login-Seite",
@@ -101,7 +105,7 @@
 "Help" => "Hilfe",
 "Access forbidden" => "Zugriff verboten",
 "Cloud not found" => "Cloud wurde nicht gefunden",
-"web services under your control" => "Web-Services unter Ihrer Kontrolle",
+"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Hallo,\n\nich wollte Sie nur wissen lassen, dass %s %s mit Ihnen teilt.\nSchauen Sie es sich an: %s\n\nViele Grüße!",
 "Edit categories" => "Kategorien ändern",
 "Add" => "Hinzufügen",
 "Security Warning" => "Sicherheitshinweis",
@@ -131,6 +135,7 @@
 "remember" => "merken",
 "Log in" => "Einloggen",
 "Alternative Logins" => "Alternative Logins",
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "Hallo,<br><br>ich wollte Sie nur wissen lassen, dass %s %s mit Ihnen teilt.<br><a href=\"%s\">Schauen Sie es sich an!</a><br><br>Viele Grüße!",
 "prev" => "Zurück",
 "next" => "Weiter",
 "Updating ownCloud to version %s, this may take a while." => "Aktualisiere ownCloud auf Version %s. Dies könnte eine Weile dauern."
diff --git a/core/l10n/el.php b/core/l10n/el.php
index 6b1239fe45c01964f57f6124c20d835f8e405f16..2dcfa1bb69860073dccea0bc7c2b09f6f52700c8 100644
--- a/core/l10n/el.php
+++ b/core/l10n/el.php
@@ -1,4 +1,5 @@
 <?php $TRANSLATIONS = array(
+"%s shared »%s« with you" => "Ο %s διαμοιράστηκε μαζί σας το »%s«",
 "Category type not provided." => "Δεν δώθηκε τύπος κατηγορίας.",
 "No category to add?" => "Δεν έχετε κατηγορία να προσθέσετε;",
 "This category already exists: %s" => "Αυτή η κατηγορία υπάρχει ήδη: %s",
@@ -88,6 +89,8 @@
 "Request failed!<br>Did you make sure your email/username was right?" => "Η αίτηση απέτυχε! Βεβαιωθηκατε ότι το email σας / username ειναι σωστο? ",
 "You will receive a link to reset your password via Email." => "Θα λάβετε ένα σύνδεσμο για να επαναφέρετε τον κωδικό πρόσβασής σας μέσω ηλεκτρονικού ταχυδρομείου.",
 "Username" => "Όνομα χρήστη",
+"Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "Τα αρχεία σας είναι κρυπτογραφημένα. Εάν δεν έχετε ενεργοποιήσει το κλειδί ανάκτησης, δεν υπάρχει περίπτωση να έχετε πρόσβαση στα δεδομένα σας μετά την επαναφορά του συνθηματικού. Εάν δεν είστε σίγουροι τι να κάνετε, παρακαλώ επικοινωνήστε με τον διαχειριστή πριν συνεχίσετε. Θέλετε να συνεχίσετε;",
+"Yes, I really want to reset my password now" => "Ναι, θέλω να επαναφέρω το συνθηματικό μου τώρα.",
 "Request reset" => "Επαναφορά αίτησης",
 "Your password was reset" => "Ο κωδικός πρόσβασής σας επαναφέρθηκε",
 "To login page" => "Σελίδα εισόδου",
@@ -100,7 +103,7 @@
 "Help" => "Βοήθεια",
 "Access forbidden" => "Δεν επιτρέπεται η πρόσβαση",
 "Cloud not found" => "Δεν βρέθηκε νέφος",
-"web services under your control" => "υπηρεσίες δικτύου υπό τον έλεγχό σας",
+"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Γεια σας,\n\nσας ενημερώνουμε ότι ο %s διαμοιράστηκε μαζί σας το %s.\nΔείτε το: %s\n\nΓεια χαρά!",
 "Edit categories" => "Επεξεργασία κατηγοριών",
 "Add" => "Προσθήκη",
 "Security Warning" => "Προειδοποίηση Ασφαλείας",
@@ -130,6 +133,7 @@
 "remember" => "απομνημόνευση",
 "Log in" => "Είσοδος",
 "Alternative Logins" => "Εναλλακτικές Συνδέσεις",
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "Γεια σας,<br><br>σας ενημερώνουμε ότι ο %s διαμοιράστηκε μαζί σας το »%s«.<br><a href=\"%s\">Δείτε το!</a><br><br>Γεια χαρά!",
 "prev" => "προηγούμενο",
 "next" => "επόμενο",
 "Updating ownCloud to version %s, this may take a while." => "Ενημερώνοντας το ownCloud στην έκδοση %s,μπορεί να πάρει λίγο χρόνο."
diff --git a/core/l10n/en@pirate.php b/core/l10n/en@pirate.php
index 0c590d0b7587ceea92d7e3dcb08b83ce31535356..482632f3fdab19ae3bd7efb9a1ed366c0f00ac9c 100644
--- a/core/l10n/en@pirate.php
+++ b/core/l10n/en@pirate.php
@@ -1,4 +1,3 @@
 <?php $TRANSLATIONS = array(
-"Password" => "Passcode",
-"web services under your control" => "web services under your control"
+"Password" => "Passcode"
 );
diff --git a/core/l10n/eo.php b/core/l10n/eo.php
index c647850d0cba521989d9761cddf25a88e88c6dd0..00f925e5274419d0b47ed089afab6b8ce2c03c09 100644
--- a/core/l10n/eo.php
+++ b/core/l10n/eo.php
@@ -1,4 +1,5 @@
 <?php $TRANSLATIONS = array(
+"%s shared »%s« with you" => "%s kunhavigis “%s” kun vi",
 "Category type not provided." => "Ne proviziĝis tipon de kategorio.",
 "No category to add?" => "Ĉu neniu kategorio estas aldonota?",
 "This category already exists: %s" => "Tiu kategorio jam ekzistas: %s",
@@ -84,8 +85,10 @@
 "The update was successful. Redirecting you to ownCloud now." => "La ĝisdatigo estis sukcesa. Alidirektante nun al ownCloud.",
 "ownCloud password reset" => "La pasvorto de ownCloud restariĝis.",
 "Use the following link to reset your password: {link}" => "Uzu la jenan ligilon por restarigi vian pasvorton: {link}",
+"Request failed!<br>Did you make sure your email/username was right?" => "La peto malsukcesis!<br />Ĉu vi certiĝis, ke via retpoŝto/uzantonomo ĝustas?",
 "You will receive a link to reset your password via Email." => "Vi ricevos ligilon retpoŝte por rekomencigi vian pasvorton.",
 "Username" => "Uzantonomo",
+"Yes, I really want to reset my password now" => "Jes, mi vere volas restarigi mian pasvorton nun",
 "Request reset" => "Peti rekomencigon",
 "Your password was reset" => "Via pasvorto rekomencis",
 "To login page" => "Al la ensaluta paĝo",
@@ -98,11 +101,12 @@
 "Help" => "Helpo",
 "Access forbidden" => "Aliro estas malpermesata",
 "Cloud not found" => "La nubo ne estas trovita",
-"web services under your control" => "TTT-servoj regataj de vi",
+"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Saluton:\n\nNi nur sciigas vin, ke %s kunhavigis %s kun vi.\nVidu ĝin: %s\n\nĜis!",
 "Edit categories" => "Redakti kategoriojn",
 "Add" => "Aldoni",
 "Security Warning" => "Sekureca averto",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Via PHP versio estas sendefenda je la NULL bajto atako (CVE-2006-7243)",
+"Please update your PHP installation to use ownCloud securely." => "Bonvolu ĝisdatigi vian instalon de PHP por uzi ownCloud-on sekure.",
 "No secure random number generator is available, please enable the PHP OpenSSL extension." => "Ne disponeblas sekura generilo de hazardaj numeroj; bonvolu kapabligi la OpenSSL-kromaĵon por PHP.",
 "Create an <strong>admin account</strong>" => "Krei <strong>administran konton</strong>",
 "Advanced" => "Progresinta",
@@ -115,12 +119,17 @@
 "Database tablespace" => "Datumbaza tabelospaco",
 "Database host" => "Datumbaza gastigo",
 "Finish setup" => "Fini la instalon",
+"%s is available. Get more information on how to update." => "%s haveblas. Ekhavi pli da informo pri kiel ĝisdatigi.",
 "Log out" => "Elsaluti",
+"Automatic logon rejected!" => "La aŭtomata ensaluto malakceptiĝis!",
 "If you did not change your password recently, your account may be compromised!" => "Se vi ne ŝanĝis vian pasvorton lastatempe, via konto eble kompromitas!",
 "Please change your password to secure your account again." => "Bonvolu ŝanĝi vian pasvorton por sekurigi vian konton ree.",
 "Lost your password?" => "Ĉu vi perdis vian pasvorton?",
 "remember" => "memori",
 "Log in" => "Ensaluti",
+"Alternative Logins" => "Alternativaj ensalutoj",
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "Saluton:<br /><br />Ni nur sciigas vin, ke %s kunhavigis “%s” kun vi.<br /><a href=\"%s\">Vidu ĝin</a><br /><br />Ĝis!",
 "prev" => "maljena",
-"next" => "jena"
+"next" => "jena",
+"Updating ownCloud to version %s, this may take a while." => "ownCloud ĝisdatiĝas al eldono %s, tio ĉi povas daŭri je iom da tempo."
 );
diff --git a/core/l10n/es.php b/core/l10n/es.php
index 93d644c01edfc7babe46e9687ed056108b8e4d84..ae98a019db1994cb33b9b081a1b02ddc472af299 100644
--- a/core/l10n/es.php
+++ b/core/l10n/es.php
@@ -53,20 +53,21 @@
 "The required file {file} is not installed!" => "¡El fichero requerido {file} no está instalado!",
 "Shared" => "Compartido",
 "Share" => "Compartir",
-"Error while sharing" => "Error compartiendo",
-"Error while unsharing" => "Error descompartiendo",
-"Error while changing permissions" => "Error cambiando permisos",
+"Error while sharing" => "Error mientras comparte",
+"Error while unsharing" => "Error mientras se deja de compartir",
+"Error while changing permissions" => "Error mientras se cambia permisos",
 "Shared with you and the group {group} by {owner}" => "Compartido contigo y el grupo {group} por {owner}",
 "Shared with you by {owner}" => "Compartido contigo por {owner}",
 "Share with" => "Compartir con",
 "Share with link" => "Compartir con enlace",
-"Password protect" => "Protegido por contraseña",
+"Password protect" => "Protección con contraseña",
 "Password" => "Contraseña",
-"Email link to person" => "Enviar un enlace por correo electrónico a una persona",
+"Allow Public Upload" => "Permitir Subida Pública",
+"Email link to person" => "Enviar enlace por correo electrónico a una persona",
 "Send" => "Enviar",
 "Set expiration date" => "Establecer fecha de caducidad",
 "Expiration date" => "Fecha de caducidad",
-"Share via email:" => "Compartido por correo electrónico:",
+"Share via email:" => "Compartir por correo electrónico:",
 "No people found" => "No se encontró gente",
 "Resharing is not allowed" => "No se permite compartir de nuevo",
 "Shared in {item} with {user}" => "Compartido en {item} con {user}",
@@ -77,23 +78,23 @@
 "update" => "actualizar",
 "delete" => "eliminar",
 "share" => "compartir",
-"Password protected" => "Protegido por contraseña",
-"Error unsetting expiration date" => "Error al eliminar la fecha de caducidad",
+"Password protected" => "Protegido con contraseña",
+"Error unsetting expiration date" => "Error eliminando fecha de caducidad",
 "Error setting expiration date" => "Error estableciendo fecha de caducidad",
 "Sending ..." => "Enviando...",
 "Email sent" => "Correo electrónico enviado",
 "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "La actualización ha fracasado. Por favor, informe de este problema a la <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">Comunidad de ownCloud</ a>.",
 "The update was successful. Redirecting you to ownCloud now." => "La actualización se ha realizado con éxito. Redireccionando a ownCloud ahora.",
 "ownCloud password reset" => "Reseteo contraseña de ownCloud",
-"Use the following link to reset your password: {link}" => "Utilice el siguiente enlace para restablecer tu contraseña: {link}",
+"Use the following link to reset your password: {link}" => "Utilice el siguiente enlace para restablecer su contraseña: {link}",
 "The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "El enlace para restablecer la contraseña ha sido enviada a su correo electrónico. <br> Si no lo recibe en un plazo razonable de tiempo, revise su carpeta de spam / correo no deseado. <br> Si no está allí, pregunte a su administrador local.",
 "Request failed!<br>Did you make sure your email/username was right?" => "La petición ha fallado! <br> ¿Está seguro de que su dirección de correo electrónico o nombre de usuario era correcto?",
 "You will receive a link to reset your password via Email." => "Recibirá un enlace por correo electrónico para restablecer su contraseña",
 "Username" => "Nombre de usuario",
-"Your files seems to be encrypted. If you didn't have enabled the recovery key there will be no way to get your data back once the password was resetted. If you are not sure what to do, please contact your administrator first before continue. Do you really want to continue?" => "Sus archivos parecen estar encriptados. Si no ha habilitado la clave de recurperación, no habrá ninguna manera de recuperar sus datos hasta que la contraseña sea reseteada. Si no está seguro de qué hacer, por favor contacte con su administrador antes de continuar. ¿Desea realmente continuar?",
+"Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "Sus archivos están cifrados. Si no ha habilitado la clave de recurperación, no habrá forma de recuperar sus datos luego de que la contraseña sea reseteada. Si no está seguro de qué hacer, contacte a su administrador antes de continuar. ¿Realmente desea continuar?",
 "Yes, I really want to reset my password now" => "Sí. Realmente deseo resetear mi contraseña ahora",
 "Request reset" => "Solicitar restablecimiento",
-"Your password was reset" => "Su contraseña ha sido establecida",
+"Your password was reset" => "Su contraseña fue restablecida",
 "To login page" => "A la página de inicio de sesión",
 "New password" => "Nueva contraseña",
 "Reset password" => "Restablecer contraseña",
@@ -103,9 +104,8 @@
 "Admin" => "Administración",
 "Help" => "Ayuda",
 "Access forbidden" => "Acceso prohibido",
-"Cloud not found" => "No se ha encuentra la nube",
+"Cloud not found" => "No se encuentra la nube",
 "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Oye,⏎ sólo te hago saber que %s compartido %s contigo.⏎ Míralo: %s ⏎Disfrutalo!",
-"web services under your control" => "Servicios web bajo su control",
 "Edit categories" => "Editar categorías",
 "Add" => "Agregar",
 "Security Warning" => "Advertencia de seguridad",
diff --git a/core/l10n/es_AR.php b/core/l10n/es_AR.php
index 24e5a41fd0d429d378e1e447a25debf498ab93a7..1fac1c88dad7a92c424560f6a09a0549567deffd 100644
--- a/core/l10n/es_AR.php
+++ b/core/l10n/es_AR.php
@@ -1,4 +1,5 @@
 <?php $TRANSLATIONS = array(
+"%s shared »%s« with you" => "%s compartió \"%s\" con vos",
 "Category type not provided." => "Tipo de categoría no provisto. ",
 "No category to add?" => "¿Ninguna categoría para añadir?",
 "This category already exists: %s" => "Esta categoría ya existe: %s",
@@ -6,7 +7,7 @@
 "%s ID not provided." => "%s ID no provista. ",
 "Error adding %s to favorites." => "Error al agregar %s a favoritos. ",
 "No categories selected for deletion." => "No se seleccionaron categorías para borrar.",
-"Error removing %s from favorites." => "Error al remover %s de favoritos. ",
+"Error removing %s from favorites." => "Error al borrar %s de favoritos. ",
 "Sunday" => "Domingo",
 "Monday" => "Lunes",
 "Tuesday" => "Martes",
@@ -31,7 +32,7 @@
 "1 minute ago" => "hace 1 minuto",
 "{minutes} minutes ago" => "hace {minutes} minutos",
 "1 hour ago" => "1 hora atrás",
-"{hours} hours ago" => "{hours} horas atrás",
+"{hours} hours ago" => "hace {hours} horas",
 "today" => "hoy",
 "yesterday" => "ayer",
 "{days} days ago" => "hace {days} días",
@@ -46,49 +47,51 @@
 "Yes" => "Sí",
 "No" => "No",
 "Ok" => "Aceptar",
-"The object type is not specified." => "El tipo de objeto no esta especificado. ",
+"The object type is not specified." => "El tipo de objeto no está especificado. ",
 "Error" => "Error",
-"The app name is not specified." => "El nombre de la aplicación no esta especificado.",
+"The app name is not specified." => "El nombre de la App no está especificado.",
 "The required file {file} is not installed!" => "¡El archivo requerido {file} no está instalado!",
 "Shared" => "Compartido",
 "Share" => "Compartir",
 "Error while sharing" => "Error al compartir",
-"Error while unsharing" => "Error en el procedimiento de ",
+"Error while unsharing" => "Error en al dejar de compartir",
 "Error while changing permissions" => "Error al cambiar permisos",
 "Shared with you and the group {group} by {owner}" => "Compartido con vos y el grupo {group} por {owner}",
 "Shared with you by {owner}" => "Compartido con vos por {owner}",
 "Share with" => "Compartir con",
-"Share with link" => "Compartir con link",
+"Share with link" => "Compartir con enlace",
 "Password protect" => "Proteger con contraseña ",
 "Password" => "Contraseña",
-"Email link to person" => "Enviar el link por e-mail.",
-"Send" => "Enviar",
+"Email link to person" => "Enviar el enlace por e-mail.",
+"Send" => "Mandar",
 "Set expiration date" => "Asignar fecha de vencimiento",
 "Expiration date" => "Fecha de vencimiento",
-"Share via email:" => "compartido a través de e-mail:",
+"Share via email:" => "Compartir a través de e-mail:",
 "No people found" => "No se encontraron usuarios",
 "Resharing is not allowed" => "No se permite volver a compartir",
 "Shared in {item} with {user}" => "Compartido en {item} con {user}",
 "Unshare" => "Dejar de compartir",
-"can edit" => "puede editar",
+"can edit" => "podés editar",
 "access control" => "control de acceso",
 "create" => "crear",
 "update" => "actualizar",
 "delete" => "borrar",
 "share" => "compartir",
 "Password protected" => "Protegido por contraseña",
-"Error unsetting expiration date" => "Error al remover la fecha de caducidad",
+"Error unsetting expiration date" => "Error al remover la fecha de vencimiento",
 "Error setting expiration date" => "Error al asignar fecha de vencimiento",
-"Sending ..." => "Enviando...",
-"Email sent" => "Email enviado",
+"Sending ..." => "Mandando...",
+"Email sent" => "e-mail mandado",
 "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "La actualización no pudo ser completada. Por favor, reportá el inconveniente a la comunidad <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "La actualización fue exitosa. Estás siendo redirigido a ownCloud.",
 "ownCloud password reset" => "Restablecer contraseña de ownCloud",
 "Use the following link to reset your password: {link}" => "Usá este enlace para restablecer tu contraseña: {link}",
-"The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "El enlace para restablecer la contraseña fue enviada a tu correo electrónico. <br> Si no lo recibís en un plazo de tiempo razonable,  revisá tu carpeta de spam / correo no deseado. <br> Si no está ahí, preguntale a tu administrador.",
+"The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "El enlace para restablecer la contraseña fue enviada a tu e-mail. <br> Si no lo recibís en un plazo de tiempo razonable,  revisá tu carpeta de spam / correo no deseado. <br> Si no está ahí, preguntale a tu administrador.",
 "Request failed!<br>Did you make sure your email/username was right?" => "¡Error en el pedido! <br> ¿Estás seguro de que tu dirección de correo electrónico o nombre de usuario son correcto?",
-"You will receive a link to reset your password via Email." => "Vas a recibir un enlace por e-mail para restablecer tu contraseña",
+"You will receive a link to reset your password via Email." => "Vas a recibir un enlace por e-mail para restablecer tu contraseña.",
 "Username" => "Nombre de usuario",
+"Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "Tus archivos están encriptados. Si no habilitaste la clave de recuperación, no vas a tener manera de obtener nuevamente tus datos después que se restablezca tu contraseña. Si no estás seguro sobre qué hacer, ponete en contacto con el administrador antes de seguir. ¿Estás seguro/a que querés continuar?",
+"Yes, I really want to reset my password now" => "Sí, definitivamente quiero restablecer mi contraseña ahora",
 "Request reset" => "Solicitar restablecimiento",
 "Your password was reset" => "Tu contraseña fue restablecida",
 "To login page" => "A la página de inicio de sesión",
@@ -96,42 +99,43 @@
 "Reset password" => "Restablecer contraseña",
 "Personal" => "Personal",
 "Users" => "Usuarios",
-"Apps" => "Aplicaciones",
+"Apps" => "Apps",
 "Admin" => "Administración",
 "Help" => "Ayuda",
-"Access forbidden" => "Acceso denegado",
+"Access forbidden" => "Acceso prohibido",
 "Cloud not found" => "No se encontró ownCloud",
-"web services under your control" => "servicios web controlados por vos",
+"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Hola,\n\nSimplemente te informo que %s compartió %s con vos.\nMiralo acá: %s\n\n¡Chau!",
 "Edit categories" => "Editar categorías",
 "Add" => "Agregar",
 "Security Warning" => "Advertencia de seguridad",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "La versión de PHP que tenés, es vulnerable al ataque de byte NULL (CVE-2006-7243)",
 "Please update your PHP installation to use ownCloud securely." => "Actualizá tu instalación de PHP para usar ownCloud de manera segura.",
-"No secure random number generator is available, please enable the PHP OpenSSL extension." => "No hay disponible ningún generador de números aleatorios seguro. Por favor habilitá la extensión OpenSSL de PHP.",
-"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Sin un generador de números aleatorios seguro un atacante podría predecir los tokens de reinicio de tu contraseña y tomar control de tu cuenta.",
+"No secure random number generator is available, please enable the PHP OpenSSL extension." => "No hay disponible ningún generador de números aleatorios seguro. Por favor, habilitá la extensión OpenSSL de PHP.",
+"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Sin un generador de números aleatorios seguro un atacante podría predecir las pruebas de reinicio de tu contraseña y tomar control de tu cuenta.",
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Tu directorio de datos y tus archivos probablemente son accesibles a través de internet, ya que el archivo .htaccess no está funcionando.",
 "For information how to properly configure your server, please see the <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentation</a>." => "Para información sobre cómo configurar adecuadamente tu servidor, por favor mirá la <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentación</a>.",
 "Create an <strong>admin account</strong>" => "Crear una <strong>cuenta de administrador</strong>",
 "Advanced" => "Avanzado",
 "Data folder" => "Directorio de almacenamiento",
 "Configure the database" => "Configurar la base de datos",
-"will be used" => "se utilizarán",
+"will be used" => "se usarán",
 "Database user" => "Usuario de la base de datos",
 "Database password" => "Contraseña de la base de datos",
 "Database name" => "Nombre de la base de datos",
 "Database tablespace" => "Espacio de tablas de la base de datos",
-"Database host" => "Host de la base de datos",
+"Database host" => "Huésped de la base de datos",
 "Finish setup" => "Completar la instalación",
 "%s is available. Get more information on how to update." => "%s está disponible. Obtené más información sobre cómo actualizar.",
 "Log out" => "Cerrar la sesión",
 "Automatic logon rejected!" => "¡El inicio de sesión automático fue rechazado!",
 "If you did not change your password recently, your account may be compromised!" => "¡Si no cambiaste tu contraseña recientemente, puede ser que tu cuenta esté comprometida!",
-"Please change your password to secure your account again." => "Por favor, cambiá tu contraseña para fortalecer nuevamente la seguridad de tu cuenta.",
+"Please change your password to secure your account again." => "Por favor, cambiá tu contraseña para incrementar la seguridad de tu cuenta.",
 "Lost your password?" => "¿Perdiste tu contraseña?",
 "remember" => "recordame",
-"Log in" => "Entrar",
+"Log in" => "Iniciar sesión",
 "Alternative Logins" => "Nombre alternativos de usuarios",
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "Hola,<br><br>Simplemente te informo que %s compartió %s con vos.<br><a href=\"%s\">Miralo acá:</a><br><br>¡Chau!",
 "prev" => "anterior",
 "next" => "siguiente",
-"Updating ownCloud to version %s, this may take a while." => "Actualizando ownCloud a la versión %s, puede domorar un rato."
+"Updating ownCloud to version %s, this may take a while." => "Actualizando ownCloud a la versión %s, puede demorar un rato."
 );
diff --git a/core/l10n/et_EE.php b/core/l10n/et_EE.php
index 4c0a41c5087f095c3012c1995fe362830e080c37..ec850491b79066003934106c6706e5d8d366462d 100644
--- a/core/l10n/et_EE.php
+++ b/core/l10n/et_EE.php
@@ -1,4 +1,5 @@
 <?php $TRANSLATIONS = array(
+"%s shared »%s« with you" => "%s jagas sinuga »%s«",
 "Category type not provided." => "Kategooria tüüp puudub.",
 "No category to add?" => "Pole kategooriat, mida lisada?",
 "This category already exists: %s" => "See kategooria on juba olemas: %s",
@@ -61,6 +62,7 @@
 "Share with link" => "Jaga lingiga",
 "Password protect" => "Parooliga kaitstud",
 "Password" => "Parool",
+"Allow Public Upload" => "Luba avalik üleslaadimine",
 "Email link to person" => "Saada link isikule e-postiga",
 "Send" => "Saada",
 "Set expiration date" => "Määra aegumise kuupäev",
@@ -89,6 +91,8 @@
 "Request failed!<br>Did you make sure your email/username was right?" => "Päring ebaõnnestus!<br>Oled sa veendunud, et e-post/kasutajanimi on õiged?",
 "You will receive a link to reset your password via Email." => "Sinu parooli taastamise link saadetakse sulle e-postile.",
 "Username" => "Kasutajanimi",
+"Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "Sinu failid on krüpteeritud. Kui sa pole taastamise võtit veel määranud, siis pole präast parooli taastamist mingit võimalust sinu andmeid tagasi saada. Kui sa pole kindel, mida teha, siis palun väta enne jätkamist ühendust oma administaatoriga. Oled sa kindel, et sa soovid jätkata?",
+"Yes, I really want to reset my password now" => "Jah, ma tõesti soovin oma parooli praegu nullida",
 "Request reset" => "Päringu taastamine",
 "Your password was reset" => "Sinu parool on taastatud",
 "To login page" => "Sisselogimise lehele",
@@ -101,7 +105,7 @@
 "Help" => "Abiinfo",
 "Access forbidden" => "Ligipääs on keelatud",
 "Cloud not found" => "Pilve ei leitud",
-"web services under your control" => "veebitenused sinu kontrolli all",
+"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Hei,\n\nlihtsalt annan sulle teada, et %s jagas sinuga %s.\nVaata seda siin: %s\n\nTervitused!",
 "Edit categories" => "Muuda kategooriaid",
 "Add" => "Lisa",
 "Security Warning" => "Turvahoiatus",
@@ -131,6 +135,7 @@
 "remember" => "pea meeles",
 "Log in" => "Logi sisse",
 "Alternative Logins" => "Alternatiivsed sisselogimisviisid",
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "Hei,<br><br>lihtsalt annan sulle teada, et %s jagas sinuga »%s«.<br><a href=\"%s\">Vaata seda!</a><br><br>Tervitades!",
 "prev" => "eelm",
 "next" => "järgm",
 "Updating ownCloud to version %s, this may take a while." => "ownCloudi uuendamine versioonile %s. See võib veidi aega võtta."
diff --git a/core/l10n/eu.php b/core/l10n/eu.php
index 117c0105756bca682e59bb3453e1dc78a7268cdd..4242d975f3b6b0236a1a8dd02227554f6bf1d004 100644
--- a/core/l10n/eu.php
+++ b/core/l10n/eu.php
@@ -98,7 +98,6 @@
 "Help" => "Laguntza",
 "Access forbidden" => "Sarrera debekatuta",
 "Cloud not found" => "Ez da hodeia aurkitu",
-"web services under your control" => "web zerbitzuak zure kontrolpean",
 "Edit categories" => "Editatu kategoriak",
 "Add" => "Gehitu",
 "Security Warning" => "Segurtasun abisua",
diff --git a/core/l10n/fa.php b/core/l10n/fa.php
index 338b3ad4b217a7b09f51b1c7080727fd95815a8d..02fe2ce1148900df4e10b338408b3262d37049a0 100644
--- a/core/l10n/fa.php
+++ b/core/l10n/fa.php
@@ -1,4 +1,5 @@
 <?php $TRANSLATIONS = array(
+"%s shared »%s« with you" => "%s به اشتراک گذاشته شده است »%s« توسط شما",
 "Category type not provided." => "نوع دسته بندی ارائه نشده است.",
 "No category to add?" => "آیا گروه دیگری برای افزودن ندارید",
 "This category already exists: %s" => "این دسته هم اکنون وجود دارد: %s",
@@ -42,6 +43,7 @@
 "years ago" => "سال‌های قبل",
 "Choose" => "انتخاب کردن",
 "Cancel" => "منصرف شدن",
+"Error loading file picker template" => "خطا در بارگذاری قالب انتخاب کننده فایل",
 "Yes" => "بله",
 "No" => "نه",
 "Ok" => "قبول",
@@ -60,6 +62,7 @@
 "Share with link" => "به اشتراک گذاشتن با پیوند",
 "Password protect" => "نگهداری کردن رمز عبور",
 "Password" => "گذرواژه",
+"Allow Public Upload" => "اجازه آپلود عمومی",
 "Email link to person" => "پیوند ایمیل برای شخص.",
 "Send" => "ارسال",
 "Set expiration date" => "تنظیم تاریخ انقضا",
@@ -84,8 +87,12 @@
 "The update was successful. Redirecting you to ownCloud now." => "به روزرسانی موفقیت آمیز بود. در حال انتقال شما به OwnCloud.",
 "ownCloud password reset" => "پسورد ابرهای شما تغییرکرد",
 "Use the following link to reset your password: {link}" => "از لینک زیر جهت دوباره سازی پسورد استفاده کنید :\n{link}",
+"The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "لینک تنظیم مجدد رمز عبور به ایمیل شما ارسال شده است.<br>اگر آن رادر یک زمان مشخصی دریافت نکرده اید، لطفا هرزنامه/ پوشه های ناخواسته را بررسی کنید.<br>در صورت نبودن از مدیر خود بپرسید.",
+"Request failed!<br>Did you make sure your email/username was right?" => "درخواست رد شده است !<br> آیا مطمئن هستید که ایمیل/ نام کاربری شما صحیح میباشد ؟",
 "You will receive a link to reset your password via Email." => "شما یک نامه الکترونیکی حاوی یک لینک جهت بازسازی گذرواژه دریافت خواهید کرد.",
 "Username" => "نام کاربری",
+"Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "فایل های شما رمزگذاری شده اند. اگر شما کلید بازیابی را فعال نکرده اید، پس از راه اندازی مجدد رمزعبور هیچ راهی برای بازگشت اطلاعاتتان وجود نخواهد داشت.در صورت عدم اطمینان به انجام کار، لطفا ابتدا با مدیر خود تماس بگیرید. آیا واقعا میخواهید ادامه دهید ؟",
+"Yes, I really want to reset my password now" => "بله، من اکنون میخواهم رمز عبور خود را مجددا راه اندازی کنم.",
 "Request reset" => "درخواست دوباره سازی",
 "Your password was reset" => "گذرواژه شما تغییرکرد",
 "To login page" => "به صفحه ورود",
@@ -98,7 +105,7 @@
 "Help" => "راه‌نما",
 "Access forbidden" => "اجازه دسترسی به مناطق ممنوعه را ندارید",
 "Cloud not found" => "پیدا نشد",
-"web services under your control" => "سرویس های تحت وب در کنترل شما",
+"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "اینجا,⏎\n فقط به شما اجازه میدهد که بدانید %s به اشتراک گذاشته شده %s توسط شما.⏎\nمشاهده آن :  %s⏎\n⏎\nبه سلامتی!",
 "Edit categories" => "ویرایش گروه",
 "Add" => "افزودن",
 "Security Warning" => "اخطار امنیتی",
@@ -119,6 +126,7 @@
 "Database tablespace" => "جدول پایگاه داده",
 "Database host" => "هاست پایگاه داده",
 "Finish setup" => "اتمام نصب",
+"%s is available. Get more information on how to update." => "%s در دسترس است. برای چگونگی به روز رسانی اطلاعات بیشتر را دریافت نمایید.",
 "Log out" => "خروج",
 "Automatic logon rejected!" => "ورود به سیستم اتوماتیک ردشد!",
 "If you did not change your password recently, your account may be compromised!" => "اگر شما اخیرا رمزعبور را تغییر نداده اید، حساب شما در معرض خطر می باشد !",
@@ -127,6 +135,7 @@
 "remember" => "بیاد آوری",
 "Log in" => "ورود",
 "Alternative Logins" => "ورود متناوب",
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "اینجا<br><br> فقط به شما اجازه میدهد که بدانید %s به اشتراک گذاشته شده»%s« توسط شما.<br><a href=\"%s\"> مشاهده آن!</a><br><br> به سلامتی!",
 "prev" => "بازگشت",
 "next" => "بعدی",
 "Updating ownCloud to version %s, this may take a while." => "به روز رسانی OwnCloud به نسخه ی %s، این عملیات ممکن است زمان بر باشد."
diff --git a/core/l10n/fi_FI.php b/core/l10n/fi_FI.php
index 15349fb15ab872ee1e7ad1d9d4f85e0dd21f10e8..23b697a25c3bb1dc28de05ec8efffba38e76270f 100644
--- a/core/l10n/fi_FI.php
+++ b/core/l10n/fi_FI.php
@@ -1,4 +1,5 @@
 <?php $TRANSLATIONS = array(
+"%s shared »%s« with you" => "%s jakoi kohteen »%s« kanssasi",
 "Category type not provided." => "Luokan tyyppiä ei määritelty.",
 "No category to add?" => "Ei lisättävää luokkaa?",
 "This category already exists: %s" => "Luokka on jo olemassa: %s",
@@ -83,6 +84,7 @@
 "Request failed!<br>Did you make sure your email/username was right?" => "Pyyntö epäonnistui!<br>Olihan sähköpostiosoitteesi/käyttäjätunnuksesi oikein?",
 "You will receive a link to reset your password via Email." => "Saat sähköpostitse linkin nollataksesi salasanan.",
 "Username" => "Käyttäjätunnus",
+"Yes, I really want to reset my password now" => "Kyllä, haluan nollata salasanani nyt",
 "Request reset" => "Tilaus lähetetty",
 "Your password was reset" => "Salasanasi nollattiin",
 "To login page" => "Kirjautumissivulle",
@@ -95,7 +97,7 @@
 "Help" => "Ohje",
 "Access forbidden" => "Pääsy estetty",
 "Cloud not found" => "Pilveä ei löydy",
-"web services under your control" => "verkkopalvelut hallinnassasi",
+"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Hei!\n\n%s jakoi kohteen %s kanssasi.\nKatso se tästä: %s\n\nNäkemiin!",
 "Edit categories" => "Muokkaa luokkia",
 "Add" => "Lisää",
 "Security Warning" => "Turvallisuusvaroitus",
@@ -124,6 +126,7 @@
 "remember" => "muista",
 "Log in" => "Kirjaudu sisään",
 "Alternative Logins" => "Vaihtoehtoiset kirjautumiset",
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "Hei!<br><br>%s jakoi kohteen »%s« kanssasi.<br><a href=\"%s\">Katso se tästä!</a><br><br>Näkemiin!",
 "prev" => "edellinen",
 "next" => "seuraava",
 "Updating ownCloud to version %s, this may take a while." => "Päivitetään ownCloud versioon %s, tämä saattaa kestää hetken."
diff --git a/core/l10n/fr.php b/core/l10n/fr.php
index bc5d9e8cddec302530fb4cf84a07b08917610274..bc8a0d281534f60480dd4b050ee76df03ea0ffd9 100644
--- a/core/l10n/fr.php
+++ b/core/l10n/fr.php
@@ -62,6 +62,7 @@
 "Share with link" => "Partager via lien",
 "Password protect" => "Protéger par un mot de passe",
 "Password" => "Mot de passe",
+"Allow Public Upload" => "Autoriser l'upload par les utilisateurs non enregistrés",
 "Email link to person" => "Envoyez le lien par email",
 "Send" => "Envoyer",
 "Set expiration date" => "Spécifier la date d'expiration",
@@ -90,7 +91,7 @@
 "Request failed!<br>Did you make sure your email/username was right?" => "Requête en échec!<br>Avez-vous vérifié vos courriel/nom d'utilisateur?",
 "You will receive a link to reset your password via Email." => "Vous allez recevoir un e-mail contenant un lien pour réinitialiser votre mot de passe.",
 "Username" => "Nom d'utilisateur",
-"Your files seems to be encrypted. If you didn't have enabled the recovery key there will be no way to get your data back once the password was resetted. If you are not sure what to do, please contact your administrator first before continue. Do you really want to continue?" => "Vos fichiers semblent être cryptés. Si vous n'aviez pas activé la clé de récupération il n'y aura aucun moyen de récupérer vos données une fois que le mot de passe aura été réinitialisé. Si vous n'êtes pas certain de ce que vous faites, veuillez d'abord contacter votre administrateur avant de continuer. Êtes-vous sûr de vouloir continuer?",
+"Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "Vos fichiers sont chiffrés. Si vous n'avez pas activé la clef de récupération, il n'y aura plus aucun moyen de récupérer vos données une fois le mot de passe réinitialisé. Si vous n'êtes pas sûr de ce que vous faites, veuillez contacter votre administrateur avant de continuer. Voulez-vous vraiment continuer ?",
 "Yes, I really want to reset my password now" => "Oui, je veux vraiment réinitialiser mon mot de passe maintenant",
 "Request reset" => "Demander la réinitialisation",
 "Your password was reset" => "Votre mot de passe a été réinitialisé",
@@ -105,7 +106,6 @@
 "Access forbidden" => "Accès interdit",
 "Cloud not found" => "Introuvable",
 "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Salut,\n\nje veux juste vous signaler %s partagé %s avec vous.\nVoyez-le: %s\n\nBonne continuation!",
-"web services under your control" => "services web sous votre contrôle",
 "Edit categories" => "Editer les catégories",
 "Add" => "Ajouter",
 "Security Warning" => "Avertissement de sécurité",
diff --git a/core/l10n/gl.php b/core/l10n/gl.php
index 583fb73e57f09c3516497493e0aa3f081dcb23da..b55daf27c2197bce57bb1c919390bea9f017032b 100644
--- a/core/l10n/gl.php
+++ b/core/l10n/gl.php
@@ -62,6 +62,7 @@
 "Share with link" => "Compartir coa ligazón",
 "Password protect" => "Protexido con contrasinais",
 "Password" => "Contrasinal",
+"Allow Public Upload" => "Permitir o envío público",
 "Email link to person" => "Enviar ligazón por correo",
 "Send" => "Enviar",
 "Set expiration date" => "Definir a data de caducidade",
@@ -90,7 +91,7 @@
 "Request failed!<br>Did you make sure your email/username was right?" => "Non foi posíbel facer a petición!<br>Asegúrese de que o seu enderezo de correo ou nome de usuario é correcto.",
 "You will receive a link to reset your password via Email." => "Recibirá unha ligazón por correo para restabelecer o contrasinal",
 "Username" => "Nome de usuario",
-"Your files seems to be encrypted. If you didn't have enabled the recovery key there will be no way to get your data back once the password was resetted. If you are not sure what to do, please contact your administrator first before continue. Do you really want to continue?" => "Semella que os ficheiros están cifrados. Se aínda non activou a chave de recuperación non haberá xeito de recuperar os datos unha vez que se teña restabelecido o contrasinal. Se non ten certeza do que ten que facer, póñase en contacto co administrador antes de continuar. Confirma que quere continuar?",
+"Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "Os ficheiros están cifrados. Se aínda non activou a chave de recuperación non haberá xeito de recuperar os datos unha vez que se teña restabelecido o contrasinal. Se non ten certeza do que ten que facer, póñase en contacto co administrador antes de continuar. Confirma que quere continuar?",
 "Yes, I really want to reset my password now" => "Si, confirmo que quero restabelecer agora o meu contrasinal",
 "Request reset" => "Petición de restabelecemento",
 "Your password was reset" => "O contrasinal foi restabelecido",
@@ -105,7 +106,6 @@
 "Access forbidden" => "Acceso denegado",
 "Cloud not found" => "Nube non atopada",
 "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Ola,\n\nsó facerlle saber que %s compartiu %s con vostede.\nVéxao en: %s\n\nSaúdos!",
-"web services under your control" => "servizos web baixo o seu control",
 "Edit categories" => "Editar as categorías",
 "Add" => "Engadir",
 "Security Warning" => "Aviso de seguranza",
diff --git a/core/l10n/he.php b/core/l10n/he.php
index 1095507673b931cb188846a6c403977c8e5ee1ea..ab002ab64e8ab940a9078426fddb22a25cda14f5 100644
--- a/core/l10n/he.php
+++ b/core/l10n/he.php
@@ -101,7 +101,6 @@
 "Help" => "עזרה",
 "Access forbidden" => "הגישה נחסמה",
 "Cloud not found" => "ענן לא נמצא",
-"web services under your control" => "שירותי רשת תחת השליטה שלך",
 "Edit categories" => "ערוך קטגוריות",
 "Add" => "הוספה",
 "Security Warning" => "אזהרת אבטחה",
diff --git a/core/l10n/hi.php b/core/l10n/hi.php
index afdd91d5f83072d263e3fc33539d5adc97db6973..4285f8ce57746180c10ade8007a3fa77014b386b 100644
--- a/core/l10n/hi.php
+++ b/core/l10n/hi.php
@@ -12,6 +12,7 @@
 "November" => "नवंबर",
 "December" => "दिसम्बर",
 "Settings" => "सेटिंग्स",
+"Error" => "त्रुटि",
 "Share" => "साझा करें",
 "Share with" => "के साथ साझा",
 "Password" => "पासवर्ड",
diff --git a/core/l10n/hr.php b/core/l10n/hr.php
index 80a34094b2705745a3abca24400192dd06343d85..3eb556e9f63eeefc97588442b1ed9b88ef74c61b 100644
--- a/core/l10n/hr.php
+++ b/core/l10n/hr.php
@@ -73,7 +73,6 @@
 "Help" => "Pomoć",
 "Access forbidden" => "Pristup zabranjen",
 "Cloud not found" => "Cloud nije pronađen",
-"web services under your control" => "web usluge pod vašom kontrolom",
 "Edit categories" => "Uredi kategorije",
 "Add" => "Dodaj",
 "Create an <strong>admin account</strong>" => "Stvori <strong>administratorski račun</strong>",
diff --git a/core/l10n/hu_HU.php b/core/l10n/hu_HU.php
index 1e74fa7e062a30345aff844f063348a937b3be82..25abd07890138dd458846208101cad400a4366fb 100644
--- a/core/l10n/hu_HU.php
+++ b/core/l10n/hu_HU.php
@@ -1,4 +1,5 @@
 <?php $TRANSLATIONS = array(
+"%s shared »%s« with you" => "%s megosztotta Önnel ezt:  »%s«",
 "Category type not provided." => "Nincs megadva a kategória típusa.",
 "No category to add?" => "Nincs hozzáadandó kategória?",
 "This category already exists: %s" => "Ez a kategória már létezik: %s",
@@ -89,6 +90,7 @@
 "Request failed!<br>Did you make sure your email/username was right?" => "A kérést nem sikerült teljesíteni! <br>Biztos, hogy jó emailcímet/felhasználónevet adott meg?",
 "You will receive a link to reset your password via Email." => "Egy emailben fog értesítést kapni a jelszóbeállítás módjáról.",
 "Username" => "Felhasználónév",
+"Yes, I really want to reset my password now" => "Igen, tényleg meg akarom változtatni a jelszavam",
 "Request reset" => "Visszaállítás igénylése",
 "Your password was reset" => "Jelszó megváltoztatva",
 "To login page" => "A bejelentkező ablakhoz",
@@ -101,7 +103,7 @@
 "Help" => "Súgó",
 "Access forbidden" => "A hozzáférés nem engedélyezett",
 "Cloud not found" => "A felhő nem található",
-"web services under your control" => "webszolgáltatások saját kézben",
+"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Üdv!\n\nÚj hír: %s megosztotta Önnel ezt: %s.\nItt nézhető meg: %s\n\nMinden jót!",
 "Edit categories" => "Kategóriák szerkesztése",
 "Add" => "Hozzáadás",
 "Security Warning" => "Biztonsági figyelmeztetés",
@@ -131,6 +133,7 @@
 "remember" => "emlékezzen",
 "Log in" => "Bejelentkezés",
 "Alternative Logins" => "Alternatív bejelentkezés",
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "Üdv!<br><br>Új hír: %s megosztotta Önnel ezt:  »%s«.<br><a href=\"%s\">Itt nézhető meg!</a><br><br>Minden jót!",
 "prev" => "előző",
 "next" => "következő",
 "Updating ownCloud to version %s, this may take a while." => "Owncloud frissítés a %s verzióra folyamatban. Kis türelmet."
diff --git a/core/l10n/ia.php b/core/l10n/ia.php
index 9df7eda1dad523f5f4c5671732dd42c7e9b48639..8c9b6b88ef3a252c92f5fc42eacf758c5ef651e7 100644
--- a/core/l10n/ia.php
+++ b/core/l10n/ia.php
@@ -38,7 +38,6 @@
 "Help" => "Adjuta",
 "Access forbidden" => "Accesso prohibite",
 "Cloud not found" => "Nube non trovate",
-"web services under your control" => "servicios web sub tu controlo",
 "Edit categories" => "Modificar categorias",
 "Add" => "Adder",
 "Create an <strong>admin account</strong>" => "Crear un <strong>conto de administration</strong>",
diff --git a/core/l10n/id.php b/core/l10n/id.php
index 5fe8b542223ff871bd366254ade9b81bc17ea405..2ee9c37ec2d555320145202acc6362d6fb616e03 100644
--- a/core/l10n/id.php
+++ b/core/l10n/id.php
@@ -98,7 +98,6 @@
 "Help" => "Bantuan",
 "Access forbidden" => "Akses ditolak",
 "Cloud not found" => "Cloud tidak ditemukan",
-"web services under your control" => "layanan web dalam kontrol Anda",
 "Edit categories" => "Edit kategori",
 "Add" => "Tambah",
 "Security Warning" => "Peringatan Keamanan",
diff --git a/core/l10n/is.php b/core/l10n/is.php
index b8573b3624a869149b58ddbb1c93ea7a077edc4e..3d3ce41b27ad5b608735eb7610c9591f53b6ee4d 100644
--- a/core/l10n/is.php
+++ b/core/l10n/is.php
@@ -96,7 +96,6 @@
 "Help" => "Hjálp",
 "Access forbidden" => "Aðgangur bannaður",
 "Cloud not found" => "Ský finnst ekki",
-"web services under your control" => "vefþjónusta undir þinni stjórn",
 "Edit categories" => "Breyta flokkum",
 "Add" => "Bæta við",
 "Security Warning" => "Öryggis aðvörun",
diff --git a/core/l10n/it.php b/core/l10n/it.php
index a06283cf411ebdecd8af5147e87897c20390b68b..c1c27cdf54ceb362e11e9da024be3b9dae562c79 100644
--- a/core/l10n/it.php
+++ b/core/l10n/it.php
@@ -1,5 +1,5 @@
 <?php $TRANSLATIONS = array(
-"%s shared »%s« with you" => "%s condiviso »%s« con te",
+"%s shared »%s« with you" => "%s ha condiviso »%s« con te",
 "Category type not provided." => "Tipo di categoria non fornito.",
 "No category to add?" => "Nessuna categoria da aggiungere?",
 "This category already exists: %s" => "Questa categoria esiste già: %s",
@@ -62,6 +62,7 @@
 "Share with link" => "Condividi con collegamento",
 "Password protect" => "Proteggi con password",
 "Password" => "Password",
+"Allow Public Upload" => "Consenti caricamento pubblico",
 "Email link to person" => "Invia collegamento via email",
 "Send" => "Invia",
 "Set expiration date" => "Imposta data di scadenza",
@@ -90,8 +91,8 @@
 "Request failed!<br>Did you make sure your email/username was right?" => "Richiesta non riuscita!<br>Sei sicuro che l'indirizzo di posta/nome utente fosse corretto?",
 "You will receive a link to reset your password via Email." => "Riceverai un collegamento per ripristinare la tua password via email",
 "Username" => "Nome utente",
-"Your files seems to be encrypted. If you didn't have enabled the recovery key there will be no way to get your data back once the password was resetted. If you are not sure what to do, please contact your administrator first before continue. Do you really want to continue?" => "I file non sembrano essere cifrati. Se non hai precedentemente abilitato la chiave di recupero, non sarà più possibile ritrovare i tuoi dati una volta che la password sarà resettata. Se non sei sicuro, per favore contatta l'amministratore prima di proseguire. Vuoi veramente continuare?",
-"Yes, I really want to reset my password now" => "Sì, voglio davvero resettare la mia password adesso",
+"Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "I file sono cifrati. Se non hai precedentemente abilitato la chiave di recupero, non sarà più possibile ritrovare i tuoi dati una volta che la password sarà ripristinata. Se non sei sicuro, per favore contatta l'amministratore prima di proseguire. Vuoi davvero continuare?",
+"Yes, I really want to reset my password now" => "Sì, voglio davvero ripristinare la mia password adesso",
 "Request reset" => "Richiesta di ripristino",
 "Your password was reset" => "La password è stata ripristinata",
 "To login page" => "Alla pagina di accesso",
@@ -104,8 +105,7 @@
 "Help" => "Aiuto",
 "Access forbidden" => "Accesso negato",
 "Cloud not found" => "Nuvola non trovata",
-"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Ehilà,\n\nvolevo solamente farti sapere che %s ha condiviso %s con te.\nGuarda: %s\n\nGrazie!",
-"web services under your control" => "servizi web nelle tue mani",
+"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Ehilà,\n\nvolevo solamente farti sapere che %s ha condiviso %s con te.\nGuarda: %s\n\nSaluti!",
 "Edit categories" => "Modifica categorie",
 "Add" => "Aggiungi",
 "Security Warning" => "Avviso di sicurezza",
@@ -135,7 +135,7 @@
 "remember" => "ricorda",
 "Log in" => "Accedi",
 "Alternative Logins" => "Accessi alternativi",
-"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "Ehilà,<br><br>volevo solamente farti sapere che %s ha condiviso »%s« con te.<br><a href=\"%s\">Guarda!</a><br><br>Grazie!",
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "Ehilà,<br><br>volevo solamente farti sapere che %s ha condiviso »%s« con te.<br><a href=\"%s\">Guarda!</a><br><br>Saluti!",
 "prev" => "precedente",
 "next" => "successivo",
 "Updating ownCloud to version %s, this may take a while." => "Aggiornamento di ownCloud alla versione %s in corso, ciò potrebbe richiedere del tempo."
diff --git a/core/l10n/ja_JP.php b/core/l10n/ja_JP.php
index 5119330264fb91a2a5023052ab714f07e9438122..0f445e7d85eb693c0f9efd431799c2fe80bd1f76 100644
--- a/core/l10n/ja_JP.php
+++ b/core/l10n/ja_JP.php
@@ -62,6 +62,7 @@
 "Share with link" => "URLリンクで共有",
 "Password protect" => "パスワード保護",
 "Password" => "パスワード",
+"Allow Public Upload" => "アップロードを許可",
 "Email link to person" => "メールリンク",
 "Send" => "送信",
 "Set expiration date" => "有効期限を設定",
@@ -90,7 +91,7 @@
 "Request failed!<br>Did you make sure your email/username was right?" => "リクエストに失敗しました！<br>あなたのメール／ユーザ名が正しいことを確認しましたか？",
 "You will receive a link to reset your password via Email." => "メールでパスワードをリセットするリンクが届きます。",
 "Username" => "ユーザー名",
-"Your files seems to be encrypted. If you didn't have enabled the recovery key there will be no way to get your data back once the password was resetted. If you are not sure what to do, please contact your administrator first before continue. Do you really want to continue?" => "ファイルが暗号化されているようです。復旧キーを有効にしていなかった場合、パスワードをリセットしてからデータを復旧する方法はありません。何をすべきかわからないなら、続ける前にまず管理者に連絡しましょう。本当に続けますか？",
+"Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "ファイルが暗号化されています。復旧キーを有効にしていなかった場合、パスワードをリセットしてからデータを復旧する方法はありません。何をすべきかよくわからないなら、続ける前にまず管理者に連絡しましょう。本当に続けますか？",
 "Yes, I really want to reset my password now" => "はい、今すぐパスワードをリセットします。",
 "Request reset" => "リセットを要求します。",
 "Your password was reset" => "あなたのパスワードはリセットされました。",
@@ -105,7 +106,6 @@
 "Access forbidden" => "アクセスが禁止されています",
 "Cloud not found" => "見つかりません",
 "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "こんにちは、\n\n%s があなたと %s を共有したことをお知らせします。\nそれを表示: %s\n\nそれでは。",
-"web services under your control" => "管理下のウェブサービス",
 "Edit categories" => "カテゴリを編集",
 "Add" => "追加",
 "Security Warning" => "セキュリティ警告",
diff --git a/core/l10n/ka_GE.php b/core/l10n/ka_GE.php
index 6674106f1d7aa55974cf2133b211aac3063be95a..877d66a0db315fa4b4ecec8ab3c74b3116ef1485 100644
--- a/core/l10n/ka_GE.php
+++ b/core/l10n/ka_GE.php
@@ -98,7 +98,6 @@
 "Help" => "დახმარება",
 "Access forbidden" => "წვდომა აკრძალულია",
 "Cloud not found" => "ღრუბელი არ არსებობს",
-"web services under your control" => "web services under your control",
 "Edit categories" => "კატეგორიების რედაქტირება",
 "Add" => "დამატება",
 "Security Warning" => "უსაფრთხოების გაფრთხილება",
diff --git a/core/l10n/ko.php b/core/l10n/ko.php
index d95daaa3a739614d1f751b9b7b0dc27333079eb2..2ce4f0fd377b9838188e4758aa1eb74f54079695 100644
--- a/core/l10n/ko.php
+++ b/core/l10n/ko.php
@@ -98,7 +98,6 @@
 "Help" => "도움말",
 "Access forbidden" => "접근 금지됨",
 "Cloud not found" => "클라우드를 찾을 수 없습니다",
-"web services under your control" => "내가 관리하는 웹 서비스",
 "Edit categories" => "분류 수정",
 "Add" => "추가",
 "Security Warning" => "보안 경고",
diff --git a/core/l10n/ku_IQ.php b/core/l10n/ku_IQ.php
index ab46b13a50067a0025643199581d69ca04e7943d..1902e45061372fb84a7b332d67c99b87669221d1 100644
--- a/core/l10n/ku_IQ.php
+++ b/core/l10n/ku_IQ.php
@@ -10,7 +10,6 @@
 "Admin" => "به‌ڕێوه‌به‌ری سه‌ره‌كی",
 "Help" => "یارمەتی",
 "Cloud not found" => "هیچ نه‌دۆزرایه‌وه‌",
-"web services under your control" => "ڕاژه‌ی وێب له‌ژێر چاودێریت دایه",
 "Add" => "زیادکردن",
 "Advanced" => "هه‌ڵبژاردنی پیشكه‌وتوو",
 "Data folder" => "زانیاری فۆڵده‌ر",
diff --git a/core/l10n/lb.php b/core/l10n/lb.php
index dbe7a34de3433835da889142bd2c745236d92209..96a3222093f059f0527dba829619ff8ae207e70f 100644
--- a/core/l10n/lb.php
+++ b/core/l10n/lb.php
@@ -1,13 +1,20 @@
 <?php $TRANSLATIONS = array(
+"%s shared »%s« with you" => "Den/D' %s huet »%s« mat dir gedeelt",
+"Category type not provided." => "Typ vun der Kategorie net uginn.",
 "No category to add?" => "Keng Kategorie fir bäizesetzen?",
+"This category already exists: %s" => "Dës Kategorie existéiert schon: %s",
+"Object type not provided." => "Typ vum Objet net uginn.",
+"%s ID not provided." => "%s ID net uginn.",
+"Error adding %s to favorites." => "Feeler beim dobäisetze vun %s bei d'Favoritten.",
 "No categories selected for deletion." => "Keng Kategorien ausgewielt fir ze läschen.",
-"Sunday" => "Sonndes",
-"Monday" => "Méindes",
-"Tuesday" => "Dënschdes",
+"Error removing %s from favorites." => "Feeler beim läsche vun %s aus de Favoritten.",
+"Sunday" => "Sonndeg",
+"Monday" => "Méindeg",
+"Tuesday" => "Dënschdeg",
 "Wednesday" => "Mëttwoch",
-"Thursday" => "Donneschdes",
-"Friday" => "Freides",
-"Saturday" => "Samschdes",
+"Thursday" => "Donneschdeg",
+"Friday" => "Freideg",
+"Saturday" => "Samschdeg",
 "January" => "Januar",
 "February" => "Februar",
 "March" => "Mäerz",
@@ -21,60 +28,115 @@
 "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",
+"seconds ago" => "Sekonnen hir",
+"1 minute ago" => "1 Minutt hir",
+"{minutes} minutes ago" => "virun {minutes} Minutten",
+"1 hour ago" => "virun 1 Stonn",
+"{hours} hours ago" => "virun {hours} Stonnen",
+"today" => "haut",
+"yesterday" => "gëschter",
+"{days} days ago" => "virun {days} Deeg",
+"last month" => "leschte Mount",
+"{months} months ago" => "virun {months} Méint",
+"months ago" => "Méint hir",
+"last year" => "Lescht Joer",
+"years ago" => "Joren hir",
 "Choose" => "Auswielen",
 "Cancel" => "Ofbriechen",
+"Error loading file picker template" => "Feeler beim Luede vun der Virlag fir d'Fichiers-Selektioun",
 "Yes" => "Jo",
 "No" => "Nee",
 "Ok" => "OK",
-"Error" => "Fehler",
+"The object type is not specified." => "Den Typ vum Object ass net uginn.",
+"Error" => "Feeler",
+"The app name is not specified." => "Den Numm vun der App ass net uginn.",
+"The required file {file} is not installed!" => "De benéidegte Fichier {file} ass net installéiert!",
+"Shared" => "Gedeelt",
 "Share" => "Deelen",
+"Error while sharing" => "Feeler beim Deelen",
+"Error while unsharing" => "Feeler beim Annuléiere vum Deelen",
+"Error while changing permissions" => "Feeler beim Ännere vun de Rechter",
+"Shared with you and the group {group} by {owner}" => "Gedeelt mat dir an der Grupp {group} vum {owner}",
+"Shared with you by {owner}" => "Gedeelt mat dir vum {owner}",
+"Share with" => "Deele mat",
+"Share with link" => "Mat Link deelen",
+"Password protect" => "Passwuertgeschützt",
 "Password" => "Passwuert",
+"Allow Public Upload" => "Ëffentlechen Upload erlaaben",
+"Email link to person" => "Link enger Persoun mailen",
+"Send" => "Schécken",
+"Set expiration date" => "Verfallsdatum setzen",
+"Expiration date" => "Verfallsdatum",
+"Share via email:" => "Via E-Mail deelen:",
+"No people found" => "Keng Persoune fonnt",
+"Resharing is not allowed" => "Weiderdeelen ass net erlaabt",
+"Shared in {item} with {user}" => "Gedeelt an {item} mat {user}",
 "Unshare" => "Net méi deelen",
+"can edit" => "kann änneren",
+"access control" => "Zougrëffskontroll",
 "create" => "erstellen",
+"update" => "aktualiséieren",
 "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.",
+"Password protected" => "Passwuertgeschützt",
+"Error unsetting expiration date" => "Feeler beim Läsche vum Verfallsdatum",
+"Error setting expiration date" => "Feeler beim Setze vum Verfallsdatum",
+"Sending ..." => "Gëtt geschéckt...",
+"Email sent" => "Email geschéckt",
+"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Den Update war net erfollegräich. Mell dëse Problem w.e.gl der<a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud-Community</a>.",
+"The update was successful. Redirecting you to ownCloud now." => "Den Update war erfollegräich.  Du gëss elo bei d'ownCloud ëmgeleet.",
+"ownCloud password reset" => "Passwuert-Zrécksetzung vun der ownCloud",
+"Use the following link to reset your password: {link}" => "Benotz folgende Link fir däi Passwuert zréckzesetzen: {link}",
+"The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "De Link fir d'Passwuert zréckzesetzen gouf un deng E-Mail-Adress geschéckt.<br>Falls du d'Mail net an den nächste Minutte kriss, kuck w.e.gl. an dengem Spam-Dossier.<br>Wann do och keng Mail ass, fro w.e.gl. däin Adminstrateur.",
+"Request failed!<br>Did you make sure your email/username was right?" => "Ufro feelfeschloen!<br>Hues du séchergestallt dass deng Email respektiv däi Benotzernumm korrekt sinn?",
+"You will receive a link to reset your password via Email." => "Du kriss e Link fir däi Passwuert zréckzesetze via Email geschéckt.",
 "Username" => "Benotzernumm",
-"Request reset" => "Reset ufroen",
-"Your password was reset" => "Dän Passwuert ass zeréck gesat gin",
-"To login page" => "Op d'Login Säit",
+"Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "Deng Fichiere si verschlësselt. Falls du de Recuperatiouns-Schlëssel net aktivéiert hues, gëtt et keng Méiglechkeet nees un deng Daten ze komme wann däi Passwuert muss zréckgesat ginn. Falls du net sécher bass wat s de maache soll, kontaktéier w.e.gl däin Administrateur bevir s de weidermëss. Wëlls de wierklech weidermaachen?",
+"Yes, I really want to reset my password now" => "Jo, ech wëll mäi Passwuert elo zrécksetzen",
+"Request reset" => "Zrécksetzung ufroen",
+"Your password was reset" => "Däi Passwuert ass zréck gesat ginn",
+"To login page" => "Bei d'Login-Säit",
 "New password" => "Neit Passwuert",
-"Reset password" => "Passwuert zeréck setzen",
+"Reset password" => "Passwuert zréck setzen",
 "Personal" => "Perséinlech",
 "Users" => "Benotzer",
-"Apps" => "Applicatiounen",
+"Apps" => "Applikatiounen",
 "Admin" => "Admin",
 "Help" => "Hëllef",
-"Access forbidden" => "Access net erlaabt",
+"Access forbidden" => "Zougrëff net erlaabt",
 "Cloud not found" => "Cloud net fonnt",
-"web services under your control" => "Web Servicer ënnert denger Kontroll",
+"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Hallo,\n\nech wëll just Bescheed soen dass den/d' %s,  »%s« mat dir gedeelt huet.\nKucken: %s\n\nE schéine Bonjour!",
 "Edit categories" => "Kategorien editéieren",
 "Add" => "Dobäisetzen",
-"Security Warning" => "Sécherheets Warnung",
-"Create an <strong>admin account</strong>" => "En <strong>Admin Account</strong> uleeën",
+"Security Warning" => "Sécherheets-Warnung",
+"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Deng PHP-Versioun ass verwonnbar duerch d'NULL-Byte-Attack (CVE-2006-7243)",
+"Please update your PHP installation to use ownCloud securely." => "Aktualiséier w.e.gl deng PHP-Installatioun fir ownCloud sécher benotzen ze kënnen.",
+"No secure random number generator is available, please enable the PHP OpenSSL extension." => "Et ass kee sécheren Zoufallsgenerator verfügbar. Aktivéier w.e.gl d'OpenSSL-Erweiderung vu PHP.",
+"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Ouni e sécheren Zoufallsgenerator kann en Ugräifer d'Passwuert-Zrécksetzungs-Schlësselen viraussoen an en Account iwwerhuelen.",
+"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Däin Daten-Dossier an deng Fichieren si wahrscheinlech iwwert den Internet accessibel well den .htaccess-Fichier net funktionnéiert.",
+"For information how to properly configure your server, please see the <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentation</a>." => "Kuck w.e.gl. an der <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">Dokumentatioun</a> fir Informatiounen iwwert eng uerdentlech Konfiguratioun vum Server.",
+"Create an <strong>admin account</strong>" => "En <strong>Admin-Account</strong> uleeën",
 "Advanced" => "Avancéiert",
-"Data folder" => "Daten Dossier",
-"Configure the database" => "Datebank konfiguréieren",
+"Data folder" => "Daten-Dossier",
+"Configure the database" => "D'Datebank konfiguréieren",
 "will be used" => "wärt benotzt ginn",
-"Database user" => "Datebank Benotzer",
-"Database password" => "Datebank Passwuert",
+"Database user" => "Datebank-Benotzer",
+"Database password" => "Datebank-Passwuert",
 "Database name" => "Datebank Numm",
-"Database tablespace" => "Datebank Tabelle-Gréisst",
-"Database host" => "Datebank Server",
+"Database tablespace" => "Tabelle-Plaz vun der Datebank",
+"Database host" => "Datebank-Server",
 "Finish setup" => "Installatioun ofschléissen",
-"Log out" => "Ausloggen",
+"%s is available. Get more information on how to update." => "%s ass verfügbar. Kréi méi Informatiounen doriwwer wéi d'Aktualiséierung ofleeft.",
+"Log out" => "Ofmellen",
+"Automatic logon rejected!" => "Automatesch Umeldung ofgeleent!",
+"If you did not change your password recently, your account may be compromised!" => "Falls du däi Passwuert net viru kuerzem geännert hues, kéint däin Account kompromittéiert sinn!",
+"Please change your password to secure your account again." => "Änner w.e.gl däi Passwuert fir däin Account nees ofzesécheren.",
 "Lost your password?" => "Passwuert vergiess?",
 "remember" => "verhalen",
-"Log in" => "Log dech an",
+"Log in" => "Umellen",
+"Alternative Logins" => "Alternativ Umeldungen",
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "Hallo,<br><br>ech wëll just Bescheed soen dass den/d' %s,  »%s« mat dir gedeelt huet.<br><a href=\"%s\">Kucken!</a><br><br>E schéine Bonjour!",
 "prev" => "zeréck",
-"next" => "weider"
+"next" => "weider",
+"Updating ownCloud to version %s, this may take a while." => "ownCloud gëtt op d'Versioun %s aktualiséiert, dat kéint e Moment daueren."
 );
diff --git a/core/l10n/lt_LT.php b/core/l10n/lt_LT.php
index 673ee83dca018f938610c31a601ca97c0fffc6c3..4faf7388b23b876c5e1b93c78c4089a8a641d7b3 100644
--- a/core/l10n/lt_LT.php
+++ b/core/l10n/lt_LT.php
@@ -101,7 +101,6 @@
 "Help" => "Pagalba",
 "Access forbidden" => "Priėjimas draudžiamas",
 "Cloud not found" => "Negalima rasti",
-"web services under your control" => "jūsų valdomos web paslaugos",
 "Edit categories" => "Redaguoti kategorijas",
 "Add" => "PridÄ—ti",
 "Security Warning" => "Saugumo pranešimas",
diff --git a/core/l10n/lv.php b/core/l10n/lv.php
index b8bfe74c3777fdc676b1f5daa6cd97a5166df454..9552891d7d540ef75f8a93c1bd2f69a6d380e880 100644
--- a/core/l10n/lv.php
+++ b/core/l10n/lv.php
@@ -98,7 +98,6 @@
 "Help" => "Palīdzība",
 "Access forbidden" => "Pieeja ir liegta",
 "Cloud not found" => "Mākonis netika atrasts",
-"web services under your control" => "tīmekļa servisi tavā varā",
 "Edit categories" => "Rediģēt kategoriju",
 "Add" => "Pievienot",
 "Security Warning" => "Brīdinājums par drošību",
diff --git a/core/l10n/mk.php b/core/l10n/mk.php
index de89403ee3ca53a8313a68c73388eba51a1bb188..c2b7907aa32e92d231b9863ec658824b38f05297 100644
--- a/core/l10n/mk.php
+++ b/core/l10n/mk.php
@@ -94,7 +94,6 @@
 "Help" => "Помош",
 "Access forbidden" => "Забранет пристап",
 "Cloud not found" => "Облакот не е најден",
-"web services under your control" => "веб сервиси под Ваша контрола",
 "Edit categories" => "Уреди категории",
 "Add" => "Додади",
 "Security Warning" => "Безбедносно предупредување",
diff --git a/core/l10n/ms_MY.php b/core/l10n/ms_MY.php
index 7a18acea7ccfe1f442d739fe19f5f0285a046806..4227a31758280ca9f37661a4ff7166a603756d51 100644
--- a/core/l10n/ms_MY.php
+++ b/core/l10n/ms_MY.php
@@ -44,7 +44,6 @@
 "Help" => "Bantuan",
 "Access forbidden" => "Larangan akses",
 "Cloud not found" => "Awan tidak dijumpai",
-"web services under your control" => "Perkhidmatan web di bawah kawalan anda",
 "Edit categories" => "Ubah kategori",
 "Add" => "Tambah",
 "Security Warning" => "Amaran keselamatan",
diff --git a/core/l10n/my_MM.php b/core/l10n/my_MM.php
index 614c353929da7c34239c5d738ecd71269e1636ad..bfdff351849c3a4f526acad0ea9bcf6377a526dd 100644
--- a/core/l10n/my_MM.php
+++ b/core/l10n/my_MM.php
@@ -46,7 +46,6 @@
 "Admin" => "အက်ဒမင်",
 "Help" => "အကူအညီ",
 "Cloud not found" => "မတွေ့ရှိမိပါ",
-"web services under your control" => "သင်၏ထိန်းချုပ်မှု့အောက်တွင်ရှိသော Web services",
 "Add" => "ပေါင်းထည့်",
 "Security Warning" => "လုံခြုံရေးသတိပေးချက်",
 "Create an <strong>admin account</strong>" => "<strong>အက်ဒမင်အကောင့်</strong>တစ်ခုဖန်တီးမည်",
diff --git a/core/l10n/nb_NO.php b/core/l10n/nb_NO.php
index d6d9675d32863ba4686e2f944aa19351b9691a1b..dfe0cbaeb81e74cd8e6fe92fd568f17b247206e7 100644
--- a/core/l10n/nb_NO.php
+++ b/core/l10n/nb_NO.php
@@ -78,7 +78,6 @@
 "Help" => "Hjelp",
 "Access forbidden" => "Tilgang nektet",
 "Cloud not found" => "Sky ikke funnet",
-"web services under your control" => "web tjenester du kontrollerer",
 "Edit categories" => "Rediger kategorier",
 "Add" => "Legg til",
 "Security Warning" => "Sikkerhetsadvarsel",
diff --git a/core/l10n/nl.php b/core/l10n/nl.php
index c28dead76dd0d57619fd0afdb50fedf16c6247f3..9352f595e76d029f2bdebb3b99fcc165ef4adb4e 100644
--- a/core/l10n/nl.php
+++ b/core/l10n/nl.php
@@ -1,20 +1,20 @@
 <?php $TRANSLATIONS = array(
-"%s shared »%s« with you" => "%s deelde »%s« met u",
+"%s shared »%s« with you" => "%s deelde »%s« met jou",
 "Category type not provided." => "Categorie type niet opgegeven.",
-"No category to add?" => "Geen categorie toevoegen?",
+"No category to add?" => "Geen categorie om toe te voegen?",
 "This category already exists: %s" => "Deze categorie bestaat al: %s",
 "Object type not provided." => "Object type niet opgegeven.",
 "%s ID not provided." => "%s ID niet opgegeven.",
 "Error adding %s to favorites." => "Toevoegen van %s aan favorieten is mislukt.",
 "No categories selected for deletion." => "Geen categorie geselecteerd voor verwijdering.",
 "Error removing %s from favorites." => "Verwijderen %s van favorieten is mislukt.",
-"Sunday" => "Zondag",
-"Monday" => "Maandag",
-"Tuesday" => "Dinsdag",
-"Wednesday" => "Woensdag",
-"Thursday" => "Donderdag",
-"Friday" => "Vrijdag",
-"Saturday" => "Zaterdag",
+"Sunday" => "zondag",
+"Monday" => "maandag",
+"Tuesday" => "dinsdag",
+"Wednesday" => "woensdag",
+"Thursday" => "donderdag",
+"Friday" => "vrijdag",
+"Saturday" => "zaterdag",
 "January" => "januari",
 "February" => "februari",
 "March" => "maart",
@@ -60,13 +60,14 @@
 "Shared with you by {owner}" => "Gedeeld met u door {owner}",
 "Share with" => "Deel met",
 "Share with link" => "Deel met link",
-"Password protect" => "Wachtwoord beveiliging",
+"Password protect" => "Wachtwoord beveiligd",
 "Password" => "Wachtwoord",
+"Allow Public Upload" => "Sta publieke uploads toe",
 "Email link to person" => "E-mail link naar persoon",
 "Send" => "Versturen",
 "Set expiration date" => "Stel vervaldatum in",
 "Expiration date" => "Vervaldatum",
-"Share via email:" => "Deel via email:",
+"Share via email:" => "Deel via e-mail:",
 "No people found" => "Geen mensen gevonden",
 "Resharing is not allowed" => "Verder delen is niet toegestaan",
 "Shared in {item} with {user}" => "Gedeeld in {item} met {user}",
@@ -83,18 +84,19 @@
 "Sending ..." => "Versturen ...",
 "Email sent" => "E-mail verzonden",
 "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "De update is niet geslaagd. Meld dit probleem aan bij de <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>.",
-"The update was successful. Redirecting you to ownCloud now." => "De update is geslaagd. U wordt teruggeleid naar uw eigen ownCloud.",
-"ownCloud password reset" => "ownCloud wachtwoord herstellen",
+"The update was successful. Redirecting you to ownCloud now." => "De update is geslaagd. Je wordt teruggeleid naar je eigen ownCloud.",
+"ownCloud password reset" => "ownCloud-wachtwoord herstellen",
 "Use the following link to reset your password: {link}" => "Gebruik de volgende link om je wachtwoord te resetten: {link}",
-"The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "De link voor het resetten van uw wachtwoord is verzonden naar uw e-mailadres.<br>Als u dat bericht niet snel ontvangen hebt, controleer dan uw spambakje.<br>Als het daar ook niet is, vraag dan uw beheerder om te helpen.",
-"Request failed!<br>Did you make sure your email/username was right?" => "Aanvraag mislukt!<br>Weet u zeker dat uw gebruikersnaam en/of wachtwoord goed waren?",
-"You will receive a link to reset your password via Email." => "U ontvangt een link om uw wachtwoord opnieuw in te stellen via e-mail.",
+"The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "De link voor het resetten van je wachtwoord is verzonden naar je e-mailadres.<br>Als je dat bericht niet snel ontvangen hebt, controleer dan uw spambakje.<br>Als het daar ook niet is, vraag dan je beheerder om te helpen.",
+"Request failed!<br>Did you make sure your email/username was right?" => "Aanvraag mislukt!<br>Weet je zeker dat je gebruikersnaam en/of wachtwoord goed waren?",
+"You will receive a link to reset your password via Email." => "Je ontvangt een link om je wachtwoord opnieuw in te stellen via e-mail.",
 "Username" => "Gebruikersnaam",
+"Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "Je bestanden zijn versleuteld. Als je geen recoverykey hebt ingeschakeld is er geen manier om je data terug te krijgen indien je je wachtwoord reset!\nAls je niet weet wat te doen, neem dan alsjeblieft contact op met je administrator eer je doorgaat.\nWil je echt doorgaan?",
 "Yes, I really want to reset my password now" => "Ja, ik wil mijn wachtwoord nu echt resetten",
 "Request reset" => "Resetaanvraag",
 "Your password was reset" => "Je wachtwoord is gewijzigd",
 "To login page" => "Naar de login-pagina",
-"New password" => "Nieuw",
+"New password" => "Nieuw wachtwoord",
 "Reset password" => "Reset wachtwoord",
 "Personal" => "Persoonlijk",
 "Users" => "Gebruikers",
@@ -103,17 +105,16 @@
 "Help" => "Help",
 "Access forbidden" => "Toegang verboden",
 "Cloud not found" => "Cloud niet gevonden",
-"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Hallo daar,\n\n%s deelde %s met u.\nBekijk: %s\n\nVeel plezier!",
-"web services under your control" => "Webdiensten in eigen beheer",
+"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Hallo daar,\n\n%s deelde %s met jou.\nBekijk: %s\n\nVeel plezier!",
 "Edit categories" => "Wijzig categorieën",
 "Add" => "Toevoegen",
 "Security Warning" => "Beveiligingswaarschuwing",
-"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Uw PHP versie is kwetsbaar voor de NULL byte aanval (CVE-2006-7243)",
-"Please update your PHP installation to use ownCloud securely." => "Werk uw PHP installatie bij om ownCloud veilig te kunnen gebruiken.",
-"No secure random number generator is available, please enable the PHP OpenSSL extension." => "Er kon geen willekeurig nummer worden gegenereerd. Zet de PHP OpenSSL extentie aan.",
-"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Zonder random nummer generator is het mogelijk voor een aanvaller om de reset tokens van wachtwoorden te voorspellen. Dit kan leiden tot het inbreken op uw account.",
-"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Uw gegevensdirectory en bestanden zijn vermoedelijk bereikbaar vanaf het internet omdat het .htaccess bestand niet werkt.",
-"For information how to properly configure your server, please see the <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentation</a>." => "Informatie over het configureren van uw server is hier te vinden <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentatie</a>.",
+"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Je PHP-versie is kwetsbaar voor de NULL byte aanval (CVE-2006-7243)",
+"Please update your PHP installation to use ownCloud securely." => "Werk je PHP-installatie bij om ownCloud veilig te kunnen gebruiken.",
+"No secure random number generator is available, please enable the PHP OpenSSL extension." => "Er kon geen willekeurig nummer worden gegenereerd. Zet de PHP OpenSSL-extentie aan.",
+"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Zonder random nummer generator is het mogelijk voor een aanvaller om de resettokens van wachtwoorden te voorspellen. Dit kan leiden tot het inbreken op uw account.",
+"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Je gegevensdirectory en bestanden zijn vermoedelijk bereikbaar vanaf het internet omdat het .htaccess-bestand niet werkt.",
+"For information how to properly configure your server, please see the <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentation</a>." => "Informatie over het configureren van uw server is <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">hier</a> te vinden.",
 "Create an <strong>admin account</strong>" => "Maak een <strong>beheerdersaccount</strong> aan",
 "Advanced" => "Geavanceerd",
 "Data folder" => "Gegevensmap",
@@ -123,19 +124,19 @@
 "Database password" => "Wachtwoord database",
 "Database name" => "Naam database",
 "Database tablespace" => "Database tablespace",
-"Database host" => "Database server",
+"Database host" => "Databaseserver",
 "Finish setup" => "Installatie afronden",
 "%s is available. Get more information on how to update." => "%s is beschikbaar. Verkrijg meer informatie over het bijwerken.",
 "Log out" => "Afmelden",
 "Automatic logon rejected!" => "Automatische aanmelding geweigerd!",
-"If you did not change your password recently, your account may be compromised!" => "Als u uw wachtwoord niet onlangs heeft aangepast, kan uw account overgenomen zijn!",
-"Please change your password to secure your account again." => "Wijzig uw wachtwoord zodat uw account weer beveiligd is.",
-"Lost your password?" => "Uw wachtwoord vergeten?",
+"If you did not change your password recently, your account may be compromised!" => "Als je je wachtwoord niet onlangs heeft aangepast, kan je account overgenomen zijn!",
+"Please change your password to secure your account again." => "Wijzig je wachtwoord zodat je account weer beveiligd is.",
+"Lost your password?" => "Wachtwoord vergeten?",
 "remember" => "onthoud gegevens",
 "Log in" => "Meld je aan",
 "Alternative Logins" => "Alternatieve inlogs",
-"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "Hallo daar,<br><br> %s deelde »%s« met u.<br><a href=\"%s\">Bekijk!</a><br><br>Veel plezier!",
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "Hallo daar,<br><br> %s deelde »%s« met jou.<br><a href=\"%s\">Bekijk!</a><br><br>Veel plezier!",
 "prev" => "vorige",
 "next" => "volgende",
-"Updating ownCloud to version %s, this may take a while." => "Updaten ownCloud naar versie %s, dit kan even duren."
+"Updating ownCloud to version %s, this may take a while." => "Updaten ownCloud naar versie %s, dit kan even duren..."
 );
diff --git a/core/l10n/nn_NO.php b/core/l10n/nn_NO.php
index 67dbe32ff6104793dd2f60cce242d3c3074b9453..2a4902962bd121c89df5e5d94688f4aa0f43ffd0 100644
--- a/core/l10n/nn_NO.php
+++ b/core/l10n/nn_NO.php
@@ -100,7 +100,6 @@
 "Help" => "Hjelp",
 "Access forbidden" => "Tilgang forbudt",
 "Cloud not found" => "Fann ikkje skyen",
-"web services under your control" => "Vev tjenester under din kontroll",
 "Edit categories" => "Endra kategoriar",
 "Add" => "Legg til",
 "Security Warning" => "Tryggleiksåtvaring",
diff --git a/core/l10n/oc.php b/core/l10n/oc.php
index 4440444885d8e84c25f6e27d6bd8f8a5b0e46890..ad400aa650a422e125e77b77df6304a4866547f0 100644
--- a/core/l10n/oc.php
+++ b/core/l10n/oc.php
@@ -74,7 +74,6 @@
 "Help" => "Ajuda",
 "Access forbidden" => "Acces enebit",
 "Cloud not found" => "Nívol pas trobada",
-"web services under your control" => "Services web jos ton contraròtle",
 "Edit categories" => "Edita categorias",
 "Add" => "Ajusta",
 "Security Warning" => "Avertiment de securitat",
diff --git a/core/l10n/pl.php b/core/l10n/pl.php
index 9e1f76e4c0ebcf9994afacb45e243a615c960541..0d7c9eb21c6e09897d56c76b0d36b00f316ee081 100644
--- a/core/l10n/pl.php
+++ b/core/l10n/pl.php
@@ -1,4 +1,5 @@
 <?php $TRANSLATIONS = array(
+"%s shared »%s« with you" => "%s Współdzielone »%s« z tobą",
 "Category type not provided." => "Nie podano typu kategorii.",
 "No category to add?" => "Brak kategorii do dodania?",
 "This category already exists: %s" => "Ta kategoria już istnieje: %s",
@@ -61,6 +62,7 @@
 "Share with link" => "Współdziel wraz z odnośnikiem",
 "Password protect" => "Zabezpiecz hasłem",
 "Password" => "Hasło",
+"Allow Public Upload" => "Pozwól na  publiczne wczytywanie",
 "Email link to person" => "Wyślij osobie odnośnik poprzez e-mail",
 "Send" => "Wyślij",
 "Set expiration date" => "Ustaw datę wygaśnięcia",
@@ -89,6 +91,7 @@
 "Request failed!<br>Did you make sure your email/username was right?" => "Żądanie niepowiodło się!<br>Czy Twój email/nazwa użytkownika są poprawne?",
 "You will receive a link to reset your password via Email." => "Odnośnik służący do resetowania hasła zostanie wysłany na adres e-mail.",
 "Username" => "Nazwa użytkownika",
+"Yes, I really want to reset my password now" => "Tak, naprawdę chcę zresetować hasło teraz",
 "Request reset" => "Żądanie resetowania",
 "Your password was reset" => "Zresetowano hasło",
 "To login page" => "Do strony logowania",
@@ -101,7 +104,6 @@
 "Help" => "Pomoc",
 "Access forbidden" => "Dostęp zabroniony",
 "Cloud not found" => "Nie odnaleziono chmury",
-"web services under your control" => "Kontrolowane serwisy",
 "Edit categories" => "Edytuj kategorie",
 "Add" => "Dodaj",
 "Security Warning" => "Ostrzeżenie o zabezpieczeniach",
diff --git a/core/l10n/pt_BR.php b/core/l10n/pt_BR.php
index 028f5f3e561da4ca80d57c9c6e9ec7ca835b595e..b36511da60038f435622222bd1f2832891e46c9c 100644
--- a/core/l10n/pt_BR.php
+++ b/core/l10n/pt_BR.php
@@ -1,4 +1,5 @@
 <?php $TRANSLATIONS = array(
+"%s shared »%s« with you" => "%s compartilhou »%s« com você",
 "Category type not provided." => "Tipo de categoria não fornecido.",
 "No category to add?" => "Nenhuma categoria a adicionar?",
 "This category already exists: %s" => "Esta categoria já existe: %s",
@@ -61,6 +62,7 @@
 "Share with link" => "Compartilhar com link",
 "Password protect" => "Proteger com senha",
 "Password" => "Senha",
+"Allow Public Upload" => "Permitir upload público",
 "Email link to person" => "Enviar link por e-mail",
 "Send" => "Enviar",
 "Set expiration date" => "Definir data de expiração",
@@ -89,6 +91,8 @@
 "Request failed!<br>Did you make sure your email/username was right?" => "O pedido falhou! <br>Certifique-se que seu e-mail/username estavam corretos?",
 "You will receive a link to reset your password via Email." => "Você receberá um link para redefinir sua senha por e-mail.",
 "Username" => "Nome de usuário",
+"Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "Seus arquivos estão encriptados. Se você não habilitou a chave de recuperação, não haverá maneira de recuperar seus dados após criar uma nova senha. Se você não tem certeza do que fazer,  por favor entre em contato com o administrador antes de continuar. Tem certeza que realmente quer continuar?",
+"Yes, I really want to reset my password now" => "Sim, realmente quero criar uma nova senha.",
 "Request reset" => "Pedir redefinição",
 "Your password was reset" => "Sua senha foi redefinida",
 "To login page" => "Para a página de login",
@@ -101,7 +105,7 @@
 "Help" => "Ajuda",
 "Access forbidden" => "Acesso proibido",
 "Cloud not found" => "Cloud não encontrado",
-"web services under your control" => "serviços web sob seu controle",
+"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Olá,\n\napenas para você saber que %s compartilhou %s com você.\nVeja: %s\n\nAbraços!",
 "Edit categories" => "Editar categorias",
 "Add" => "Adicionar",
 "Security Warning" => "Aviso de Segurança",
@@ -131,6 +135,7 @@
 "remember" => "lembrar",
 "Log in" => "Fazer login",
 "Alternative Logins" => "Logins alternativos",
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "Olá,<br><br>apenas para você saber que %s compartilhou %s com você.<br><a href=\"%s\">Veja: </a><br><br>Abraços!",
 "prev" => "anterior",
 "next" => "próximo",
 "Updating ownCloud to version %s, this may take a while." => "Atualizando ownCloud para a versão %s, isto pode levar algum tempo."
diff --git a/core/l10n/pt_PT.php b/core/l10n/pt_PT.php
index 77c27b641d132ce8856894cc75640a0e063f335c..b0afff1ad24bf0159fed82fcdb08cb3648db919e 100644
--- a/core/l10n/pt_PT.php
+++ b/core/l10n/pt_PT.php
@@ -101,7 +101,6 @@
 "Help" => "Ajuda",
 "Access forbidden" => "Acesso interdito",
 "Cloud not found" => "Cloud nao encontrada",
-"web services under your control" => "serviços web sob o seu controlo",
 "Edit categories" => "Editar categorias",
 "Add" => "Adicionar",
 "Security Warning" => "Aviso de Segurança",
diff --git a/core/l10n/ro.php b/core/l10n/ro.php
index 4a430fb7d2ffe5cf797ebbf5326b974681d7007c..6f23cea1c2645733620d17fe0fdcb7225df51c35 100644
--- a/core/l10n/ro.php
+++ b/core/l10n/ro.php
@@ -1,5 +1,6 @@
 <?php $TRANSLATIONS = array(
-"Category type not provided." => "Tipul de categorie nu este prevazut",
+"%s shared »%s« with you" => "%s Partajat »%s« cu tine de",
+"Category type not provided." => "Tipul de categorie nu a fost specificat.",
 "No category to add?" => "Nici o categorie de adăugat?",
 "This category already exists: %s" => "Această categorie deja există: %s",
 "Object type not provided." => "Tipul obiectului nu este prevazut",
@@ -42,6 +43,7 @@
 "years ago" => "ani în urmă",
 "Choose" => "Alege",
 "Cancel" => "Anulare",
+"Error loading file picker template" => "Eroare la încărcarea șablonului selectorului de fișiere",
 "Yes" => "Da",
 "No" => "Nu",
 "Ok" => "Ok",
@@ -60,6 +62,7 @@
 "Share with link" => "Partajare cu legătură",
 "Password protect" => "Protejare cu parolă",
 "Password" => "Parolă",
+"Allow Public Upload" => "Permiteţi încărcarea publică.",
 "Email link to person" => "Expediază legătura prin poșta electronică",
 "Send" => "Expediază",
 "Set expiration date" => "Specifică data expirării",
@@ -88,6 +91,8 @@
 "Request failed!<br>Did you make sure your email/username was right?" => "Cerere esuata!<br>Esti sigur ca email-ul/numele de utilizator sunt corecte?",
 "You will receive a link to reset your password via Email." => "Vei primi un mesaj prin care vei putea reseta parola via email",
 "Username" => "Nume utilizator",
+"Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "Fișierele tale sunt criptate. Dacă nu ai activat o cheie de recuperare, nu va mai exista nici o metodă prin care să îți recuperezi datele după resetarea parole. Dacă nu ești sigur în privința la ce ai de făcut, contactează un administrator înainte să continuii. Chiar vrei să continui?",
+"Yes, I really want to reset my password now" => "Da, eu chiar doresc să îmi resetez parola acum",
 "Request reset" => "Cerere trimisă",
 "Your password was reset" => "Parola a fost resetată",
 "To login page" => "Spre pagina de autentificare",
@@ -100,7 +105,7 @@
 "Help" => "Ajutor",
 "Access forbidden" => "Acces interzis",
 "Cloud not found" => "Nu s-a găsit",
-"web services under your control" => "servicii web controlate de tine",
+"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Salutare,\n\nVă aduc la cunoștință că %s a partajat %s cu tine.\nAccesează la: %s\n\nNumai bine!",
 "Edit categories" => "Editează categorii",
 "Add" => "Adaugă",
 "Security Warning" => "Avertisment de securitate",
@@ -121,6 +126,7 @@
 "Database tablespace" => "Tabela de spațiu a bazei de date",
 "Database host" => "Bază date",
 "Finish setup" => "Finalizează instalarea",
+"%s is available. Get more information on how to update." => "%s este disponibil. Vezi mai multe informații despre procesul de actualizare.",
 "Log out" => "Ieșire",
 "Automatic logon rejected!" => "Logare automata respinsa",
 "If you did not change your password recently, your account may be compromised!" => "Daca nu schimbi parola cand de curand , contul tau poate fi conpromis",
@@ -129,6 +135,7 @@
 "remember" => "amintește",
 "Log in" => "Autentificare",
 "Alternative Logins" => "Conectări alternative",
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "Salutare, <br><br>Vă aduc la cunoștință că %s a partajat %s cu tine.<br><a href=\"%s\">Accesează-l!</a><br><br>Numai bine!",
 "prev" => "precedentul",
 "next" => "următorul",
 "Updating ownCloud to version %s, this may take a while." => "Actualizăm ownCloud la versiunea %s, aceasta poate dura câteva momente."
diff --git a/core/l10n/ru.php b/core/l10n/ru.php
index 293ac9ec119db008d51a322347f4769e801898f6..3369072ba87a415e62febc9cf1fb5d3cf86ccfa0 100644
--- a/core/l10n/ru.php
+++ b/core/l10n/ru.php
@@ -1,4 +1,5 @@
 <?php $TRANSLATIONS = array(
+"%s shared »%s« with you" => "%s поделился »%s« с вами",
 "Category type not provided." => "Тип категории не предоставлен",
 "No category to add?" => "Нет категорий для добавления?",
 "This category already exists: %s" => "Эта категория уже существует: %s",
@@ -42,7 +43,7 @@
 "years ago" => "несколько лет назад",
 "Choose" => "Выбрать",
 "Cancel" => "Отменить",
-"Error loading file picker template" => "Ошибка при загрузке файла выбора  шаблона",
+"Error loading file picker template" => "Ошибка при загрузке файла выбора шаблона",
 "Yes" => "Да",
 "No" => "Нет",
 "Ok" => "Ок",
@@ -61,6 +62,7 @@
 "Share with link" => "Поделиться с ссылкой",
 "Password protect" => "Защитить паролем",
 "Password" => "Пароль",
+"Allow Public Upload" => "Разрешить открытую загрузку",
 "Email link to person" => "Почтовая ссылка на персону",
 "Send" => "Отправить",
 "Set expiration date" => "Установить срок доступа",
@@ -85,10 +87,12 @@
 "The update was successful. Redirecting you to ownCloud now." => "Обновление прошло успешно. Перенаправляемся в Ваш ownCloud...",
 "ownCloud password reset" => "Сброс пароля ",
 "Use the following link to reset your password: {link}" => "Используйте следующую ссылку чтобы сбросить пароль: {link}",
-"The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "Ссылка для сброса пароля была отправлена ​​по электронной почте. <br> Если вы не получите его в пределах одной двух минут, проверьте папку спам. <br> Если это не возможно, обратитесь к Вашему администратору.",
-"Request failed!<br>Did you make sure your email/username was right?" => "Что-то не так. Вы уверены что Email / Имя пользователя указаны верно?",
+"The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "Ссылка для сброса пароля отправлена вам ​​по электронной почте.<br>Если вы не получите письмо в пределах одной-двух минут, проверьте папку Спам. <br>Если письма там нет, обратитесь к своему администратору.",
+"Request failed!<br>Did you make sure your email/username was right?" => "Запрос не удался. Вы уверены, что email или имя пользователя указаны верно?",
 "You will receive a link to reset your password via Email." => "На ваш адрес Email выслана ссылка для сброса пароля.",
 "Username" => "Имя пользователя",
+"Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "Ваши файлы зашифрованы. Если вы не активировали ключ восстановления, то после сброса пароля все ваши данные будут потеряны навсегда. Если вы не знаете что делать, свяжитесь со своим администратором до того как продолжить. Вы действительно хотите продолжить?",
+"Yes, I really want to reset my password now" => "Да, я действительно хочу сбросить свой пароль",
 "Request reset" => "Запросить сброс",
 "Your password was reset" => "Ваш пароль был сброшен",
 "To login page" => "На страницу авторизации",
@@ -101,13 +105,13 @@
 "Help" => "Помощь",
 "Access forbidden" => "Доступ запрещён",
 "Cloud not found" => "Облако не найдено",
-"web services under your control" => "веб-сервисы под вашим управлением",
+"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Приветствую,⏎\n⏎\nпросто даю знать, что %s поделился %s с вами.⏎\nПосмотреть: %s⏎\n⏎\nУдачи!",
 "Edit categories" => "Редактировать категрии",
 "Add" => "Добавить",
 "Security Warning" => "Предупреждение безопасности",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Ваша версия PHP уязвима к атаке NULL Byte (CVE-2006-7243)",
 "Please update your PHP installation to use ownCloud securely." => "Пожалуйста обновите Ваш PHP чтобы использовать ownCloud безопасно.",
-"No secure random number generator is available, please enable the PHP OpenSSL extension." => "Нет доступного защищенного генератора случайных чисел, пожалуйста, включите расширение PHP OpenSSL.",
+"No secure random number generator is available, please enable the PHP OpenSSL extension." => "Отсутствует защищенный генератор случайных чисел, пожалуйста, включите расширение PHP OpenSSL.",
 "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Без защищенного генератора случайных чисел злоумышленник может предугадать токены сброса пароля и завладеть Вашей учетной записью.",
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Ваша папка с данными и файлы возможно доступны из интернета потому что файл .htaccess не работает.",
 "For information how to properly configure your server, please see the <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentation</a>." => "Для информации как правильно настроить Ваш сервер, пожалйста загляните в <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">документацию</a>.",
@@ -131,7 +135,8 @@
 "remember" => "запомнить",
 "Log in" => "Войти",
 "Alternative Logins" => "Альтернативные имена пользователя",
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "Приветствую,<br><br>просто даю знать, что %s поделился »%s« с вами.<br><a href=\"%s\">Посмотреть!</a><br><br>Удачи!",
 "prev" => "пред",
 "next" => "след",
-"Updating ownCloud to version %s, this may take a while." => "Производится обновление ownCloud до версии %s. Это может занять некоторое время."
+"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 b27f1c6c985fb221269f8688b3dfc9c64820ee17..21038a93e88b9b7bff30bcd131dbf5dbb219601a 100644
--- a/core/l10n/si_LK.php
+++ b/core/l10n/si_LK.php
@@ -66,7 +66,6 @@
 "Help" => "උදව්",
 "Access forbidden" => "ඇතුල් වීම තහනම්",
 "Cloud not found" => "සොයා ගත නොහැක",
-"web services under your control" => "ඔබට පාලනය කළ හැකි වෙබ් සේවාවන්",
 "Edit categories" => "ප්‍රභේදයන් සංස්කරණය",
 "Add" => "එකතු කරන්න",
 "Security Warning" => "ආරක්ෂක නිවේදනයක්",
diff --git a/core/l10n/sk_SK.php b/core/l10n/sk_SK.php
index 29febc283b7f5710ab854bda6c0e6e440f760f5f..582296139ecbcbfadf61c13af1d4f06f6239d394 100644
--- a/core/l10n/sk_SK.php
+++ b/core/l10n/sk_SK.php
@@ -1,4 +1,5 @@
 <?php $TRANSLATIONS = array(
+"%s shared »%s« with you" => "%s s Vami zdieľa »%s«",
 "Category type not provided." => "Neposkytnutý typ kategórie.",
 "No category to add?" => "Žiadna kategória pre pridanie?",
 "This category already exists: %s" => "Kategória: %s už existuje.",
@@ -42,6 +43,7 @@
 "years ago" => "pred rokmi",
 "Choose" => "Výber",
 "Cancel" => "Zrušiť",
+"Error loading file picker template" => "Chyba pri načítaní šablóny výberu súborov",
 "Yes" => "Áno",
 "No" => "Nie",
 "Ok" => "Ok",
@@ -60,6 +62,7 @@
 "Share with link" => "Zdieľať cez odkaz",
 "Password protect" => "Chrániť heslom",
 "Password" => "Heslo",
+"Allow Public Upload" => "Povoliť verejné nahrávanie",
 "Email link to person" => "Odoslať odkaz emailom",
 "Send" => "Odoslať",
 "Set expiration date" => "Nastaviť dátum expirácie",
@@ -88,6 +91,8 @@
 "Request failed!<br>Did you make sure your email/username was right?" => "Požiadavka zlyhala.<br>Uistili ste sa, že Vaše používateľské meno a email sú správne?",
 "You will receive a link to reset your password via Email." => "Odkaz pre obnovenie hesla obdržíte e-mailom.",
 "Username" => "Meno používateľa",
+"Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "Vaše súbory sú šifrované. Ak nemáte povolený kľúč obnovy, nie je spôsob, ako získať po obnove hesla Vaše dáta. Ak nie ste si isí tým, čo robíte, obráťte sa najskôr na administrátora. Naozaj chcete pokračovať?",
+"Yes, I really want to reset my password now" => "Áno, želám si teraz obnoviť svoje heslo",
 "Request reset" => "Požiadať o obnovenie",
 "Your password was reset" => "Vaše heslo bolo obnovené",
 "To login page" => "Na prihlasovaciu stránku",
@@ -100,7 +105,7 @@
 "Help" => "Pomoc",
 "Access forbidden" => "Prístup odmietnutý",
 "Cloud not found" => "Nenájdené",
-"web services under your control" => "webové služby pod Vašou kontrolou",
+"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Ahoj,\n\nChcem Vám oznámiť, že %s s Vami zdieľa %s.\nPozrieť si to môžete tu: %s\n\nVďaka",
 "Edit categories" => "Upraviť kategórie",
 "Add" => "Pridať",
 "Security Warning" => "Bezpečnostné varovanie",
@@ -130,6 +135,7 @@
 "remember" => "zapamätať",
 "Log in" => "Prihlásiť sa",
 "Alternative Logins" => "Alternatívne prihlasovanie",
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "Ahoj,<br><br>chcem Vám oznámiť, že %s s Vami zdieľa %s.\nPozrieť si to môžete tu: <br><a href=\"%s\">zde</a>.<br><br>Vďaka",
 "prev" => "späť",
 "next" => "ďalej",
 "Updating ownCloud to version %s, this may take a while." => "Aktualizujem ownCloud na verziu %s, môže to chvíľu trvať."
diff --git a/core/l10n/sl.php b/core/l10n/sl.php
index 3b539f7fe22a5b294812b3957066443a2427c7ff..548a5a3f5157be182d79f6a12acf7337af9d5ede 100644
--- a/core/l10n/sl.php
+++ b/core/l10n/sl.php
@@ -1,4 +1,5 @@
 <?php $TRANSLATIONS = array(
+"%s shared »%s« with you" => "%s je delil »%s« z vami",
 "Category type not provided." => "Vrsta kategorije ni podana.",
 "No category to add?" => "Ali ni kategorije za dodajanje?",
 "This category already exists: %s" => "Kategorija že obstaja: %s",
@@ -42,6 +43,7 @@
 "years ago" => "let nazaj",
 "Choose" => "Izbor",
 "Cancel" => "Prekliči",
+"Error loading file picker template" => "Napaka pri nalaganju predloge za izbor dokumenta",
 "Yes" => "Da",
 "No" => "Ne",
 "Ok" => "V redu",
@@ -60,6 +62,7 @@
 "Share with link" => "Omogoči souporabo preko povezave",
 "Password protect" => "Zaščiti z geslom",
 "Password" => "Geslo",
+"Allow Public Upload" => "Dovoli javne prenose na strežnik",
 "Email link to person" => "Posreduj povezavo po elektronski pošti",
 "Send" => "Pošlji",
 "Set expiration date" => "Nastavi datum preteka",
@@ -88,6 +91,8 @@
 "Request failed!<br>Did you make sure your email/username was right?" => "Zahteva je spodletela!<br>Ali sta elektronski naslov oziroma uporabniško ime navedena pravilno?",
 "You will receive a link to reset your password via Email." => "Na elektronski naslov boste prejeli povezavo za ponovno nastavitev gesla.",
 "Username" => "Uporabniško ime",
+"Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "Datoteke so šifrirane. Če niste omogočili ključa za obnovitev, žal podatkov ne bo mogoče pridobiti nazaj, ko boste geslo enkrat spremenili. Če niste prepričani, kaj storiti, se obrnite na skrbnika storitve. Ste prepričani, da želite nadaljevati?",
+"Yes, I really want to reset my password now" => "Da, potrjujem ponastavitev gesla",
 "Request reset" => "Zahtevaj ponovno nastavitev",
 "Your password was reset" => "Geslo je ponovno nastavljeno",
 "To login page" => "Na prijavno stran",
@@ -100,7 +105,7 @@
 "Help" => "Pomoč",
 "Access forbidden" => "Dostop je prepovedan",
 "Cloud not found" => "Oblaka ni mogoče najti",
-"web services under your control" => "spletne storitve pod vašim nadzorom",
+"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Pozdravljen/a,⏎\n⏎\nsporočam, da je %s delil %s s teboj.⏎\nPoglej na: %s⏎\n⏎\nLep pozdrav!",
 "Edit categories" => "Uredi kategorije",
 "Add" => "Dodaj",
 "Security Warning" => "Varnostno opozorilo",
@@ -130,6 +135,7 @@
 "remember" => "zapomni si",
 "Log in" => "Prijava",
 "Alternative Logins" => "Druge prijavne možnosti",
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "Pozdravljen/a,<br><br>sporočam, da je %s delil »%s« s teboj.<br><a href=\"%s\">Poglej vsebine!</a><br><br>Lep pozdrav!",
 "prev" => "nazaj",
 "next" => "naprej",
 "Updating ownCloud to version %s, this may take a while." => "Posodabljanje sistema ownCloud na različico %s je lahko dolgotrajno."
diff --git a/core/l10n/sq.php b/core/l10n/sq.php
index f5d7d9337682a7b06d125cc8b26286ccfa5e32d9..4e6c458f4df4675064f32738840de0781952646c 100644
--- a/core/l10n/sq.php
+++ b/core/l10n/sq.php
@@ -100,7 +100,6 @@
 "Help" => "Ndihmë",
 "Access forbidden" => "Ndalohet hyrja",
 "Cloud not found" => "Cloud-i nuk u gjet",
-"web services under your control" => "shërbime web nën kontrollin tënd",
 "Edit categories" => "Ndrysho kategoritë",
 "Add" => "Shto",
 "Security Warning" => "Paralajmërim sigurie",
diff --git a/core/l10n/sr.php b/core/l10n/sr.php
index a85e1bfb7e1104ff4bf449e9dbe4f8cd123fd149..d68012c505f593aa0a8781811be1999d8b8a328e 100644
--- a/core/l10n/sr.php
+++ b/core/l10n/sr.php
@@ -93,7 +93,6 @@
 "Help" => "Помоћ",
 "Access forbidden" => "Забрањен приступ",
 "Cloud not found" => "Облак није нађен",
-"web services under your control" => "веб сервиси под контролом",
 "Edit categories" => "Измени категорије",
 "Add" => "Додај",
 "Security Warning" => "Сигурносно упозорење",
diff --git a/core/l10n/sv.php b/core/l10n/sv.php
index 68abe9bd154b611267e1245cf1d2192b152a17ef..d6d4b0ff323ac1e337afed98e8d99f28e0a2c056 100644
--- a/core/l10n/sv.php
+++ b/core/l10n/sv.php
@@ -62,6 +62,7 @@
 "Share with link" => "Delad med länk",
 "Password protect" => "Lösenordsskydda",
 "Password" => "Lösenord",
+"Allow Public Upload" => "Tillåt publik uppladdning",
 "Email link to person" => "E-posta länk till person",
 "Send" => "Skicka",
 "Set expiration date" => "Sätt utgångsdatum",
@@ -90,7 +91,7 @@
 "Request failed!<br>Did you make sure your email/username was right?" => "Begäran misslyckades!<br>Är du helt säker på att din e-postadress/användarnamn är korrekt?",
 "You will receive a link to reset your password via Email." => "Du får en länk att återställa ditt lösenord via e-post.",
 "Username" => "Användarnamn",
-"Your files seems to be encrypted. If you didn't have enabled the recovery key there will be no way to get your data back once the password was resetted. If you are not sure what to do, please contact your administrator first before continue. Do you really want to continue?" => "Dina filer ser ut att vara krypterade. Om du inte har aktiverat återställningsnyckeln så finns finns det inget sätt att få tillbaka dina filer när du väl har återställt lösenordet. Om du inte är säker på vad du ska göra, vänligen kontakta din administratör innan du fortsätter. Vill du verkligen fortsätta?",
+"Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "Dina filer är krypterade. Om du inte har aktiverat återställningsnyckeln kommer det inte att finnas någon möjlighet att få tillbaka dina filer efter att ditt lösenord har återställts. Om du är osäker, kontakta din systemadministratör innan du fortsätter. Är du verkligen säker på att fortsätta?",
 "Yes, I really want to reset my password now" => "Ja, jag vill verkligen återställa mitt lösenord nu",
 "Request reset" => "Begär återställning",
 "Your password was reset" => "Ditt lösenord har återställts",
@@ -105,7 +106,6 @@
 "Access forbidden" => "Åtkomst förbjuden",
 "Cloud not found" => "Hittade inget moln",
 "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Hej där,⏎\n⏎\nville bara meddela dig att %s delade %s med dig.⏎\nTitta på den: %s⏎\n⏎\nVi hörs!",
-"web services under your control" => "webbtjänster under din kontroll",
 "Edit categories" => "Editera kategorier",
 "Add" => "Lägg till",
 "Security Warning" => "Säkerhetsvarning",
diff --git a/core/l10n/ta_LK.php b/core/l10n/ta_LK.php
index 0770805ddf55a5e2671002cc51299319baf1b57a..e593018aaadd5845793bc1139611d974c629b3fb 100644
--- a/core/l10n/ta_LK.php
+++ b/core/l10n/ta_LK.php
@@ -90,7 +90,6 @@
 "Help" => "உதவி",
 "Access forbidden" => "அணுக தடை",
 "Cloud not found" => "Cloud காணப்படவில்லை",
-"web services under your control" => "வலைய சேவைகள் உங்களுடைய கட்டுப்பாட்டின் கீழ் உள்ளது",
 "Edit categories" => "வகைகளை தொகுக்க",
 "Add" => "சேர்க்க",
 "Security Warning" => "பாதுகாப்பு எச்சரிக்கை",
diff --git a/core/l10n/th_TH.php b/core/l10n/th_TH.php
index 83642ed89cbc5fb1176d2d3fa71e537a0b7d1221..392da561bf81b8511304d39737d5c60a749463d9 100644
--- a/core/l10n/th_TH.php
+++ b/core/l10n/th_TH.php
@@ -97,7 +97,6 @@
 "Help" => "ช่วยเหลือ",
 "Access forbidden" => "การเข้าถึงถูกหวงห้าม",
 "Cloud not found" => "ไม่พบ Cloud",
-"web services under your control" => "เว็บเซอร์วิสที่คุณควบคุมการใช้งานได้",
 "Edit categories" => "แก้ไขหมวดหมู่",
 "Add" => "เพิ่ม",
 "Security Warning" => "คำเตือนเกี่ยวกับความปลอดภัย",
diff --git a/core/l10n/tr.php b/core/l10n/tr.php
index f6112040c50f175d5884d9aae1198822515799e0..0a56af94182476fb68e15b1c69ba6e675b5df11f 100644
--- a/core/l10n/tr.php
+++ b/core/l10n/tr.php
@@ -101,7 +101,6 @@
 "Help" => "Yardım",
 "Access forbidden" => "Erişim yasaklı",
 "Cloud not found" => "Bulut bulunamadı",
-"web services under your control" => "Bilgileriniz güvenli ve şifreli",
 "Edit categories" => "Kategorileri düzenle",
 "Add" => "Ekle",
 "Security Warning" => "Güvenlik Uyarisi",
diff --git a/core/l10n/uk.php b/core/l10n/uk.php
index 11ebda3af899423b6b099233f5e7d9a2b3bd51bc..8e67a470956505dba87f0fdd846c5eaa9a54609d 100644
--- a/core/l10n/uk.php
+++ b/core/l10n/uk.php
@@ -98,7 +98,6 @@
 "Help" => "Допомога",
 "Access forbidden" => "Доступ заборонено",
 "Cloud not found" => "Cloud не знайдено",
-"web services under your control" => "підконтрольні Вам веб-сервіси",
 "Edit categories" => "Редагувати категорії",
 "Add" => "Додати",
 "Security Warning" => "Попередження про небезпеку",
diff --git a/core/l10n/ur_PK.php b/core/l10n/ur_PK.php
index 0e0489bf33d6c918638bb3a9fb427f6bc9c00698..b27033b80e808e5ea30580620da65e37d2e6937a 100644
--- a/core/l10n/ur_PK.php
+++ b/core/l10n/ur_PK.php
@@ -55,7 +55,6 @@
 "Help" => "مدد",
 "Access forbidden" => "پہنچ کی اجازت نہیں",
 "Cloud not found" => "نہیں مل سکا",
-"web services under your control" => "آپ کے اختیار میں ویب سروسیز",
 "Edit categories" => "زمرہ جات کی تدوین کریں",
 "Add" => "شامل کریں",
 "Create an <strong>admin account</strong>" => "ایک<strong> ایڈمن اکاؤنٹ</strong> بنائیں",
diff --git a/core/l10n/vi.php b/core/l10n/vi.php
index ebe6c7006ffded76762a4dc47409de7b3ed1ab4d..37ed47de765a8b3609725b3a02ed50aa421aef69 100644
--- a/core/l10n/vi.php
+++ b/core/l10n/vi.php
@@ -100,7 +100,6 @@
 "Help" => "Giúp đỡ",
 "Access forbidden" => "Truy cập bị cấm",
 "Cloud not found" => "Không tìm thấy Clound",
-"web services under your control" => "dịch vụ web dưới sự kiểm soát của bạn",
 "Edit categories" => "Sửa chuyên mục",
 "Add" => "Thêm",
 "Security Warning" => "Cảnh bảo bảo mật",
diff --git a/core/l10n/zh_CN.GB2312.php b/core/l10n/zh_CN.GB2312.php
index b4cc129964bcf4f9e10085672232d83721345e78..237f0bb14bbc58ea396a760c2035cdaae5b6e2a9 100644
--- a/core/l10n/zh_CN.GB2312.php
+++ b/core/l10n/zh_CN.GB2312.php
@@ -97,7 +97,6 @@
 "Help" => "帮助",
 "Access forbidden" => "禁止访问",
 "Cloud not found" => "云 没有被找到",
-"web services under your control" => "您控制的网络服务",
 "Edit categories" => "编辑分类",
 "Add" => "添加",
 "Security Warning" => "安全警告",
diff --git a/core/l10n/zh_CN.php b/core/l10n/zh_CN.php
index 29fef5ff220ec306f9a3edee439ad56d4528439b..0c73fe31b3f8a9d223000314087487c8baa4c574 100644
--- a/core/l10n/zh_CN.php
+++ b/core/l10n/zh_CN.php
@@ -1,4 +1,5 @@
 <?php $TRANSLATIONS = array(
+"%s shared »%s« with you" => "%s 向您分享了 »%s«",
 "Category type not provided." => "未提供分类类型。",
 "No category to add?" => "没有可添加分类？",
 "This category already exists: %s" => "此分类已存在：%s",
@@ -55,12 +56,13 @@
 "Error while sharing" => "共享时出错",
 "Error while unsharing" => "取消共享时出错",
 "Error while changing permissions" => "修改权限时出错",
-"Shared with you and the group {group} by {owner}" => "{owner}共享给您及{group}组",
-"Shared with you by {owner}" => " {owner}与您共享",
+"Shared with you and the group {group} by {owner}" => "{owner} 共享给您及 {group} 组",
+"Shared with you by {owner}" => "{owner} 与您共享",
 "Share with" => "分享之",
 "Share with link" => "共享链接",
 "Password protect" => "密码保护",
 "Password" => "密码",
+"Allow Public Upload" => "允许公开上传",
 "Email link to person" => "发送链接到个人",
 "Send" => "发送",
 "Set expiration date" => "设置过期日期",
@@ -68,7 +70,7 @@
 "Share via email:" => "通过Email共享",
 "No people found" => "未找到此人",
 "Resharing is not allowed" => "不允许二次共享",
-"Shared in {item} with {user}" => "在{item} 与 {user}共享。",
+"Shared in {item} with {user}" => "在 {item} 与 {user} 共享。",
 "Unshare" => "取消共享",
 "can edit" => "可以修改",
 "access control" => "访问控制",
@@ -89,6 +91,8 @@
 "Request failed!<br>Did you make sure your email/username was right?" => "请求失败<br>您确定您的邮箱/用户名是正确的？",
 "You will receive a link to reset your password via Email." => "您将会收到包含可以重置密码链接的邮件。",
 "Username" => "用户名",
+"Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "您的文件已加密。如果您不启用恢复密钥，您将无法在重设密码后取回文件。如果您不太确定，请在继续前联系您的管理员。您真的要继续吗？",
+"Yes, I really want to reset my password now" => "使得，我真的要现在重设密码",
 "Request reset" => "请求重置",
 "Your password was reset" => "您的密码已重置",
 "To login page" => "到登录页面",
@@ -101,7 +105,7 @@
 "Help" => "帮助",
 "Access forbidden" => "访问禁止",
 "Cloud not found" => "未找到云",
-"web services under your control" => "您控制的web服务",
+"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "您好，\n\n%s 向您分享了 %s。\n查看： %s",
 "Edit categories" => "编辑分类",
 "Add" => "增加",
 "Security Warning" => "安全警告",
@@ -131,6 +135,7 @@
 "remember" => "记住",
 "Log in" => "登录",
 "Alternative Logins" => "其他登录方式",
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "您好，<br><br>%s 向您分享了 »%s«。<br><a href=\"%s\">查看</a>",
 "prev" => "上一页",
 "next" => "下一页",
 "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 0270e921e34e22fb5ad5975685ce327fd6b12aca..4afa6ea116fb05fd558a6bcdfa8e794eb4e72321 100644
--- a/core/l10n/zh_TW.php
+++ b/core/l10n/zh_TW.php
@@ -89,6 +89,7 @@
 "Request failed!<br>Did you make sure your email/username was right?" => "請求失敗！<br>您確定填入的電子郵件地址或是帳號名稱是正確的嗎？",
 "You will receive a link to reset your password via Email." => "重設密碼的連結將會寄到你的電子郵件信箱。",
 "Username" => "使用者名稱",
+"Yes, I really want to reset my password now" => "對，我現在想要重設我的密碼。",
 "Request reset" => "請求重設",
 "Your password was reset" => "您的密碼已重設",
 "To login page" => "至登入頁面",
@@ -101,7 +102,6 @@
 "Help" => "說明",
 "Access forbidden" => "存取被拒",
 "Cloud not found" => "未發現雲端",
-"web services under your control" => "由您控制的網路服務",
 "Edit categories" => "編輯分類",
 "Add" => "增加",
 "Security Warning" => "安全性警告",
diff --git a/core/lostpassword/controller.php b/core/lostpassword/controller.php
index 9377de5d39abc33d9df18ef5b2cb5266047db28b..2f9963652190b2f457f912a85c65c017b2b7d5cf 100644
--- a/core/lostpassword/controller.php
+++ b/core/lostpassword/controller.php
@@ -8,11 +8,11 @@
 
 class OC_Core_LostPassword_Controller {
 	protected static function displayLostPasswordPage($error, $requested) {
-		$encrypted = OC_App::isEnabled('files_encryption');
+		$isEncrypted = OC_App::isEnabled('files_encryption');
 		OC_Template::printGuestPage('core/lostpassword', 'lostpassword',
 			array('error' => $error,
 				'requested' => $requested,
-				'encrypted' => $encrypted));
+				'isEncrypted' => $isEncrypted));
 	}
 	
 	protected static function displayResetPasswordPage($success, $args) {
@@ -33,7 +33,9 @@ class OC_Core_LostPassword_Controller {
 
 	public static function sendEmail($args) {
 
-		if(isset($_POST['noEncryption']) || isset($_POST['continue'])) {
+		$isEncrypted = OC_App::isEnabled('files_encryption');
+
+		if(!$isEncrypted || isset($_POST['continue'])) {
 			$continue = true;
 		} else {
 			$continue = false;
diff --git a/core/lostpassword/templates/lostpassword.php b/core/lostpassword/templates/lostpassword.php
index c082ee977da03f708e1dba7ac2fc5a643e641193..f5fdb1fb2b3919fe88943ee8c0fcf40eeeb3d285 100644
--- a/core/lostpassword/templates/lostpassword.php
+++ b/core/lostpassword/templates/lostpassword.php
@@ -17,13 +17,11 @@
 				<input type="text" name="user" id="user" placeholder="" value="" autocomplete="off" required autofocus />
 				<label for="user" class="infield"><?php print_unescaped($l->t( 'Username' )); ?></label>
 				<img class="svg" src="<?php print_unescaped(image_path('', 'actions/user.svg')); ?>" alt=""/>
-				<?php if ($_['encrypted']): ?>
+				<?php if ($_['isEncrypted']): ?>
 				<br /><br />
-				<?php print_unescaped($l->t('Your files seems to be encrypted. If you didn\'t have enabled the recovery key there will be no way to get your data back once the password was resetted. If you are not sure what to do, please contact your administrator first before continue. Do you really want to continue?')); ?><br />
+				<?php print_unescaped($l->t("Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?")); ?><br />
 				<input type="checkbox" name="continue" value="Yes" />
 					<?php print_unescaped($l->t('Yes, I really want to reset my password now')); ?><br/><br/>
-				<?php else: ?>
-				<input type="checkbox" name="noEncryption" value="Yes" checked />
 				<?php endif; ?>
 			</p>
 			<input type="submit" id="submit" value="<?php print_unescaped($l->t('Request reset')); ?>" />
diff --git a/core/templates/altmail.php b/core/templates/altmail.php
index 37dc8eee94266bd99c178161484b7056a9c525d8..a7df29a2446d244cc27371d81d0cfdd649424b46 100644
--- a/core/templates/altmail.php
+++ b/core/templates/altmail.php
@@ -1,9 +1,9 @@
 <?php
+$defaults = new OC_Defaults();
+
 print_unescaped($l->t("Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!", array($_['user_displayname'], $_['filename'], $_['link'])));
 ?>
 
 --
-ownCloud - <?php
-print_unescaped($l->t("web services under your control"));
-?>
-http://ownCloud.org
+<?php p($defaults->getName() . ' - ' . $defaults->getSlogan()); ?>
+<?php print_unescaped("\n".$defaults->getBaseUrl());
diff --git a/core/templates/installation.php b/core/templates/installation.php
index de7ff8c168cfbafd4e1c1dbb1656671fd5ed6055..7f2796a4b319e8e4fe3ac20da509bb16b9e7d177 100644
--- a/core/templates/installation.php
+++ b/core/templates/installation.php
@@ -165,7 +165,7 @@
 		<p class="infield groupbottom">
 			<label for="dbhost" class="infield" id="dbhostlabel"><?php p($l->t( 'Database host' )); ?></label>
 			<input type="text" name="dbhost" id="dbhost" placeholder=""
-				value="<?php p(OC_Helper::init_var('dbhost', 'localhost')); ?>" />
+				value="<?php p(OC_Helper::init_var('dbhost')); ?>" />
 		</p>
 	</fieldset>
 
diff --git a/core/templates/layout.base.php b/core/templates/layout.base.php
index 163e8e3ae7e6aedcd268aba5a0aebad15394aba0..09e1006d507bf06b95e32e4e5c6a5dc6a29192cc 100644
--- a/core/templates/layout.base.php
+++ b/core/templates/layout.base.php
@@ -5,9 +5,12 @@
 <!--[if IE 9]><html class="ng-csp ie ie9 lte9"><![endif]-->
 <!--[if gt IE 9]><html class="ng-csp ie"><![endif]-->
 <!--[if !IE]><!--><html class="ng-csp"><!--<![endif]-->
+
+	<?php $defaults = new OC_Defaults(); // initialize themable default strings and urls ?>
+
 	<head>
 		<title>
-		<?php p(OC_Defaults::getName()); ?>
+		<?php p($defaults->getName()); ?>
 		</title>
 		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 		<link rel="shortcut icon" href="<?php print_unescaped(image_path('', 'favicon.png')); ?>" />
diff --git a/core/templates/layout.guest.php b/core/templates/layout.guest.php
index ba0147e6733e9abd2396a8f6d54652a888b3ab8c..329744e3824eb93093b3b13c173d22bbba0aff5e 100644
--- a/core/templates/layout.guest.php
+++ b/core/templates/layout.guest.php
@@ -5,9 +5,12 @@
 <!--[if IE 9]><html class="ng-csp ie ie9 lte9"><![endif]-->
 <!--[if gt IE 9]><html class="ng-csp ie"><![endif]-->
 <!--[if !IE]><!--><html class="ng-csp"><!--<![endif]-->
+
+	<?php $defaults = new OC_Defaults(); // initialize themable default strings and urls ?>
+
 	<head data-requesttoken="<?php p($_['requesttoken']); ?>">
 		<title>
-		<?php p(OC_Defaults::getName()); ?>
+		<?php p($defaults->getName()); ?>
 		</title>
 		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 		<meta name="apple-itunes-app" content="app-id=543672169">
@@ -35,18 +38,13 @@
 		<div id="login">
 			<header><div id="header">
 				<img src="<?php print_unescaped(image_path('', 'logo.svg')); ?>" class="svg" alt="ownCloud" />
-				<?php if (OC_Util::getEditionString() !== ''): ?>
-				<div id="logo-claim">Enterprise Edition</div>
-				<?php endif; ?>
+				<div id="logo-claim" style="display:none;"><?php p($defaults->getLogoClaim()); ?></div>
 			</div></header>
 			<?php print_unescaped($_['content']); ?>
 		</div>
 		<footer>
 			<p class="info">
-				<?php OC_Util::getEditionString() === '' ? '' : p('© 2013 '); ?>
-				<a href="<?php p(OC_Defaults::getBaseUrl())?>">
-					<?php  p(OC_Defaults::getEntity()); ?></a>
-				<?php OC_Util::getEditionString() === '' ? print_unescaped(' &ndash; ') : print_unescaped('<br/>'); ?>
-			<?php p(OC_Defaults::getSlogan()); ?></p></footer>
+				<?php print_unescaped($defaults->getLongFooter()); ?>
+			</p></footer>
 	</body>
 </html>
diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index 44ae4c6ca3553c15d25a958ccd83c1ccecf18077..dacbe79bd342ee0303ddda2cebcfa0f1b5026da2 100644
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@ -5,10 +5,13 @@
 <!--[if IE 9]><html class="ng-csp ie ie9 lte9"><![endif]-->
 <!--[if gt IE 9]><html class="ng-csp ie"><![endif]-->
 <!--[if !IE]><!--><html class="ng-csp"><!--<![endif]-->
+
+	<?php $defaults = new OC_Defaults(); // initialize themable default strings and urls ?>
+	
 	<head data-user="<?php p($_['user_uid']); ?>" data-requesttoken="<?php p($_['requesttoken']); ?>">
 		<title>
 			<?php p(!empty($_['application'])?$_['application'].' | ':'');
-			p(OC_Defaults::getName());
+			p($defaults->getName());
 			p(trim($_['user_displayname']) != '' ?' ('.$_['user_displayname'].') ':'') ?>
 		</title>
 		<meta charset="utf-8">
@@ -43,9 +46,7 @@
 	<header><div id="header">
 			<a href="<?php print_unescaped(link_to('', 'index.php')); ?>" title="" id="owncloud"><img class="svg"
 				src="<?php print_unescaped(image_path('', 'logo-wide.svg')); ?>" alt="ownCloud" /></a>
-			<?php if (OC_Util::getEditionString() !== ''): ?>
-			<div id="logo-claim">Enterprise Edition</div>
-			<?php endif; ?>
+			<div id="logo-claim" style="display:none;"><?php p($defaults->getLogoClaim()); ?></div>
 			<ul id="settings" class="svg">
 				<span id="expand" tabindex="0" role="link">
 					<span id="expandDisplayName"><?php  p(trim($_['user_displayname']) != '' ? $_['user_displayname'] : $_['user_uid']) ?></span>
diff --git a/core/templates/mail.php b/core/templates/mail.php
index ebeefd5c7e82d4538cb6cc05c8f826e056157a94..562ad82e953ad7ce38ea4aa476fbeefa085fc721 100644
--- a/core/templates/mail.php
+++ b/core/templates/mail.php
@@ -1,3 +1,4 @@
+<?php $defaults = new OC_Defaults() // initialize themable default strings and urls ?>
 <table cellspacing="0" cellpadding="0" border="0" width="100%">
 <tr><td>
 <table cellspacing="0" cellpadding="0" border="0" width="600px">
@@ -20,10 +21,9 @@ print_unescaped($l->t('Hey there,<br><br>just letting you know that %s shared »
 <tr>
 <td bgcolor="#f8f8f8" width="20px">&nbsp;</td>
 <td bgcolor="#f8f8f8" style="font-weight:normal; font-size:0.8em; line-height:1.2em; font-family:verdana,'arial',sans;">--<br>
-ownCloud - <?php
-print_unescaped($l->t('web services under your control'));
-?>
-<br><a href="http://owncloud.org">http://ownCloud.org</a></td>
+<?php p($defaults->getName()); ?> -
+<?php p($defaults->getSlogan()); ?>
+<br><a href="<?php print_unescaped($defaults->getBaseUrl()); ?>"><?php print_unescaped($defaults->getBaseUrl());?></a></td>
 </tr>
 <tr>
 <td bgcolor="#f8f8f8" colspan="2">&nbsp;</td>
diff --git a/index.php b/index.php
index a064aa5c76f21a9ddc29c581f01372eec5f4939d..90fd3efcc96e060e5f31875e6b7f12e03791e3f6 100755
--- a/index.php
+++ b/index.php
@@ -32,6 +32,6 @@ try {
 } catch (Exception $ex) {
 	//show the user a detailed error page
 	OC_Response::setStatus(OC_Response::STATUS_INTERNAL_SERVER_ERROR);
-	\OCP\Util::writeLog('remote', $ex->getMessage(), \OCP\Util::FATAL);
+	\OCP\Util::writeLog('index', $ex->getMessage(), \OCP\Util::FATAL);
 	OC_Template::printExceptionErrorPage($ex);
-}
\ No newline at end of file
+}
diff --git a/l10n/af_ZA/core.po b/l10n/af_ZA/core.po
index 103e03a9ca100cccf01e2944109ca5867e93aedb..126054f6f327ad6c5447e8963f33ea63c93de98f 100644
--- a/l10n/af_ZA/core.po
+++ b/l10n/af_ZA/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 00:04+0000\n"
+"POT-Creation-Date: 2013-07-09 02:03+0200\n"
+"PO-Revision-Date: 2013-07-09 00:02+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n"
 "MIME-Version: 1.0\n"
@@ -61,135 +61,135 @@ msgstr ""
 msgid "Error removing %s from favorites."
 msgstr ""
 
-#: js/config.php:34
+#: js/config.php:32
 msgid "Sunday"
 msgstr ""
 
-#: js/config.php:35
+#: js/config.php:33
 msgid "Monday"
 msgstr ""
 
-#: js/config.php:36
+#: js/config.php:34
 msgid "Tuesday"
 msgstr ""
 
-#: js/config.php:37
+#: js/config.php:35
 msgid "Wednesday"
 msgstr ""
 
-#: js/config.php:38
+#: js/config.php:36
 msgid "Thursday"
 msgstr ""
 
-#: js/config.php:39
+#: js/config.php:37
 msgid "Friday"
 msgstr ""
 
-#: js/config.php:40
+#: js/config.php:38
 msgid "Saturday"
 msgstr ""
 
-#: js/config.php:45
+#: js/config.php:43
 msgid "January"
 msgstr ""
 
-#: js/config.php:46
+#: js/config.php:44
 msgid "February"
 msgstr ""
 
-#: js/config.php:47
+#: js/config.php:45
 msgid "March"
 msgstr ""
 
-#: js/config.php:48
+#: js/config.php:46
 msgid "April"
 msgstr ""
 
-#: js/config.php:49
+#: js/config.php:47
 msgid "May"
 msgstr ""
 
-#: js/config.php:50
+#: js/config.php:48
 msgid "June"
 msgstr ""
 
-#: js/config.php:51
+#: js/config.php:49
 msgid "July"
 msgstr ""
 
-#: js/config.php:52
+#: js/config.php:50
 msgid "August"
 msgstr ""
 
-#: js/config.php:53
+#: js/config.php:51
 msgid "September"
 msgstr ""
 
-#: js/config.php:54
+#: js/config.php:52
 msgid "October"
 msgstr ""
 
-#: js/config.php:55
+#: js/config.php:53
 msgid "November"
 msgstr ""
 
-#: js/config.php:56
+#: js/config.php:54
 msgid "December"
 msgstr ""
 
-#: js/js.js:286
+#: js/js.js:289
 msgid "Settings"
 msgstr "Instellings"
 
-#: js/js.js:718
+#: js/js.js:721
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:719
+#: js/js.js:722
 msgid "1 minute ago"
 msgstr ""
 
-#: js/js.js:720
+#: js/js.js:723
 msgid "{minutes} minutes ago"
 msgstr ""
 
-#: js/js.js:721
+#: js/js.js:724
 msgid "1 hour ago"
 msgstr ""
 
-#: js/js.js:722
+#: js/js.js:725
 msgid "{hours} hours ago"
 msgstr ""
 
-#: js/js.js:723
+#: js/js.js:726
 msgid "today"
 msgstr ""
 
-#: js/js.js:724
+#: js/js.js:727
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:725
+#: js/js.js:728
 msgid "{days} days ago"
 msgstr ""
 
-#: js/js.js:726
+#: js/js.js:729
 msgid "last month"
 msgstr ""
 
-#: js/js.js:727
+#: js/js.js:730
 msgid "{months} months ago"
 msgstr ""
 
-#: js/js.js:728
+#: js/js.js:731
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:729
+#: js/js.js:732
 msgid "last year"
 msgstr ""
 
-#: js/js.js:730
+#: js/js.js:733
 msgid "years ago"
 msgstr ""
 
@@ -225,8 +225,8 @@ msgstr ""
 #: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
 #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:577
-#: js/share.js:589
+#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:620
+#: js/share.js:632
 msgid "Error"
 msgstr ""
 
@@ -246,7 +246,7 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: js/share.js:125 js/share.js:617
+#: js/share.js:125 js/share.js:660
 msgid "Error while sharing"
 msgstr ""
 
@@ -266,99 +266,103 @@ msgstr ""
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:159
+#: js/share.js:172
 msgid "Share with"
 msgstr ""
 
-#: js/share.js:164
+#: js/share.js:177
 msgid "Share with link"
 msgstr ""
 
-#: js/share.js:167
+#: js/share.js:180
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:169 templates/installation.php:54 templates/login.php:26
+#: js/share.js:182 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "Wagwoord"
 
-#: js/share.js:173
+#: js/share.js:187
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:191
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:174
+#: js/share.js:192
 msgid "Send"
 msgstr ""
 
-#: js/share.js:178
+#: js/share.js:197
 msgid "Set expiration date"
 msgstr ""
 
-#: js/share.js:179
+#: js/share.js:198
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:211
+#: js/share.js:230
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:213
+#: js/share.js:232
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:251
+#: js/share.js:270
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:287
+#: js/share.js:306
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:308
+#: js/share.js:327
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:320
+#: js/share.js:339
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:322
+#: js/share.js:341
 msgid "access control"
 msgstr ""
 
-#: js/share.js:325
+#: js/share.js:344
 msgid "create"
 msgstr ""
 
-#: js/share.js:328
+#: js/share.js:347
 msgid "update"
 msgstr ""
 
-#: js/share.js:331
+#: js/share.js:350
 msgid "delete"
 msgstr ""
 
-#: js/share.js:334
+#: js/share.js:353
 msgid "share"
 msgstr ""
 
-#: js/share.js:368 js/share.js:564
+#: js/share.js:387 js/share.js:607
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:577
+#: js/share.js:620
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:589
+#: js/share.js:632
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:604
+#: js/share.js:647
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:615
+#: js/share.js:658
 msgid "Email sent"
 msgstr ""
 
@@ -373,7 +377,7 @@ msgstr ""
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
-#: lostpassword/controller.php:58
+#: lostpassword/controller.php:60
 msgid "ownCloud password reset"
 msgstr ""
 
@@ -403,17 +407,17 @@ msgstr "Gebruikersnaam"
 
 #: lostpassword/templates/lostpassword.php:22
 msgid ""
-"Your files seems to be encrypted. If you didn't have enabled the recovery "
-"key there will be no way to get your data back once the password was "
-"resetted. If you are not sure what to do, please contact your administrator "
-"first before continue. Do you really want to continue?"
+"Your files are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
 msgstr ""
 
 #: lostpassword/templates/lostpassword.php:24
 msgid "Yes, I really want to reset my password now"
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:29
+#: lostpassword/templates/lostpassword.php:27
 msgid "Request reset"
 msgstr "Herstel-versoek"
 
@@ -461,7 +465,7 @@ msgstr ""
 msgid "Cloud not found"
 msgstr "Wolk nie gevind"
 
-#: templates/altmail.php:2
+#: templates/altmail.php:4
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -472,10 +476,6 @@ msgid ""
 "Cheers!"
 msgstr ""
 
-#: templates/altmail.php:7 templates/mail.php:24
-msgid "web services under your control"
-msgstr "webdienste onder jou beheer"
-
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
 msgstr ""
@@ -568,12 +568,12 @@ msgstr ""
 msgid "Finish setup"
 msgstr "Maak opstelling klaar"
 
-#: templates/layout.user.php:40
+#: templates/layout.user.php:43
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:67
+#: templates/layout.user.php:68
 msgid "Log out"
 msgstr "Teken uit"
 
@@ -607,7 +607,7 @@ msgstr "Teken aan"
 msgid "Alternative Logins"
 msgstr ""
 
-#: templates/mail.php:15
+#: templates/mail.php:16
 #, php-format
 msgid ""
 "Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
diff --git a/l10n/af_ZA/files.po b/l10n/af_ZA/files.po
index 159278587dc0c76462a8aa7acb347498203adade..b44ec5ede5bf57ba2c4f48290b195809bfd99c62 100644
--- a/l10n/af_ZA/files.po
+++ b/l10n/af_ZA/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-25 02:01+0200\n"
-"PO-Revision-Date: 2013-05-24 13:26+0000\n"
+"POT-Creation-Date: 2013-07-04 09:30+0200\n"
+"PO-Revision-Date: 2013-07-04 07:31+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n"
 "MIME-Version: 1.0\n"
@@ -27,46 +27,54 @@ msgstr ""
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/upload.php:19
+#: ajax/upload.php:16 ajax/upload.php:39
+msgid "Unable to set upload directory."
+msgstr ""
+
+#: ajax/upload.php:23
+msgid "Invalid Token"
+msgstr ""
+
+#: ajax/upload.php:55
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: ajax/upload.php:26
+#: ajax/upload.php:62
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/upload.php:27
+#: ajax/upload.php:63
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:29
+#: ajax/upload.php:65
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/upload.php:30
+#: ajax/upload.php:66
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/upload.php:31
+#: ajax/upload.php:67
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/upload.php:32
+#: ajax/upload.php:68
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/upload.php:33
+#: ajax/upload.php:69
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:51
+#: ajax/upload.php:87
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:83
+#: ajax/upload.php:119
 msgid "Invalid directory."
 msgstr ""
 
@@ -74,6 +82,36 @@ msgstr ""
 msgid "Files"
 msgstr ""
 
+#: js/file-upload.js:11
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/file-upload.js:24
+msgid "Not enough space available"
+msgstr ""
+
+#: js/file-upload.js:64
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/file-upload.js:167 js/files.js:266
+msgid ""
+"File upload is in progress. Leaving the page now will cancel the upload."
+msgstr ""
+
+#: js/file-upload.js:233 js/files.js:339
+msgid "URL cannot be empty."
+msgstr ""
+
+#: js/file-upload.js:238 lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr ""
+
+#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
+#: js/files.js:693 js/files.js:731
+msgid "Error"
+msgstr ""
+
 #: js/fileactions.js:116
 msgid "Share"
 msgstr ""
@@ -90,43 +128,43 @@ msgstr ""
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:464
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:259
+#: js/filelist.js:302
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:306
+#: js/filelist.js:349
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:306
+#: js/filelist.js:349
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:331
+#: js/filelist.js:374
 msgid "perform delete operation"
 msgstr ""
 
-#: js/filelist.js:413
+#: js/filelist.js:456
 msgid "1 file uploading"
 msgstr ""
 
-#: js/filelist.js:416 js/filelist.js:470
+#: js/filelist.js:459 js/filelist.js:517
 msgid "files uploading"
 msgstr ""
 
@@ -158,69 +196,41 @@ msgid ""
 "big."
 msgstr ""
 
-#: js/files.js:264
-msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr ""
-
-#: js/files.js:277
-msgid "Not enough space available"
-msgstr ""
-
-#: js/files.js:317
-msgid "Upload cancelled."
-msgstr ""
-
-#: js/files.js:413
-msgid ""
-"File upload is in progress. Leaving the page now will cancel the upload."
-msgstr ""
-
-#: js/files.js:486
-msgid "URL cannot be empty."
-msgstr ""
-
-#: js/files.js:491
+#: js/files.js:344
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
-msgid "Error"
-msgstr ""
-
-#: js/files.js:877 templates/index.php:69
+#: js/files.js:744 templates/index.php:69
 msgid "Name"
 msgstr ""
 
-#: js/files.js:878 templates/index.php:80
+#: js/files.js:745 templates/index.php:80
 msgid "Size"
 msgstr ""
 
-#: js/files.js:879 templates/index.php:82
+#: js/files.js:746 templates/index.php:82
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:898
+#: js/files.js:765
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:900
+#: js/files.js:767
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:908
+#: js/files.js:775
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:910
+#: js/files.js:777
 msgid "{count} files"
 msgstr ""
 
-#: lib/app.php:53
-msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
-msgstr ""
-
 #: lib/app.php:73
-msgid "Unable to rename file"
+#, php-format
+msgid "%s could not be renamed"
 msgstr ""
 
 #: lib/helper.php:11 templates/index.php:18
@@ -317,6 +327,22 @@ msgstr ""
 msgid "Current scanning"
 msgstr ""
 
+#: templates/part.list.php:78
+msgid "directory"
+msgstr ""
+
+#: templates/part.list.php:80
+msgid "directories"
+msgstr ""
+
+#: templates/part.list.php:89
+msgid "file"
+msgstr ""
+
+#: templates/part.list.php:91
+msgid "files"
+msgstr ""
+
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
 msgstr ""
diff --git a/l10n/af_ZA/files_encryption.po b/l10n/af_ZA/files_encryption.po
index d70263425950425c86b705d84e8ea6c21d91c160..920cb218987ebd3cc97ebd7f5423f89855282e9c 100644
--- a/l10n/af_ZA/files_encryption.po
+++ b/l10n/af_ZA/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-14 02:46+0200\n"
-"PO-Revision-Date: 2013-06-14 00:47+0000\n"
+"POT-Creation-Date: 2013-07-05 02:12+0200\n"
+"PO-Revision-Date: 2013-07-05 00:13+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n"
 "MIME-Version: 1.0\n"
@@ -55,9 +55,21 @@ msgstr ""
 
 #: files/error.php:7
 msgid ""
-"Your private key is not valid! Maybe your password was changed from outside."
-" You can update your private key password in your personal settings to "
-"regain access to your files"
+"Your private key is not valid! Likely your password was changed outside the "
+"ownCloud system (e.g. your corporate directory). You can update your private"
+" key password in your personal settings to recover access to your encrypted "
+"files."
+msgstr ""
+
+#: hooks/hooks.php:44
+msgid "Missing requirements."
+msgstr ""
+
+#: hooks/hooks.php:45
+msgid ""
+"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL "
+"PHP extension is enabled and configured properly. For now, the encryption "
+"app has been disabled."
 msgstr ""
 
 #: js/settings-admin.js:11
@@ -84,11 +96,11 @@ msgstr ""
 
 #: templates/settings-admin.php:10
 msgid ""
-"Enable encryption passwords recovery key (allow sharing to recovery key):"
+"Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
 #: templates/settings-admin.php:14
-msgid "Recovery account password"
+msgid "Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:21 templates/settings-personal.php:54
@@ -100,15 +112,15 @@ msgid "Disabled"
 msgstr ""
 
 #: templates/settings-admin.php:34
-msgid "Change encryption passwords recovery key:"
+msgid "Change recovery key password:"
 msgstr ""
 
 #: templates/settings-admin.php:41
-msgid "Old Recovery account password"
+msgid "Old Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:48
-msgid "New Recovery account password"
+msgid "New Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:53
diff --git a/l10n/af_ZA/files_sharing.po b/l10n/af_ZA/files_sharing.po
index 5d42f3168453672f79a0fe0dab755a12b6097c54..ff1a3d94c283c205a98c6626107315eeb03628df 100644
--- a/l10n/af_ZA/files_sharing.po
+++ b/l10n/af_ZA/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-14 02:47+0200\n"
-"PO-Revision-Date: 2013-06-14 00:47+0000\n"
+"POT-Creation-Date: 2013-07-05 02:13+0200\n"
+"PO-Revision-Date: 2013-07-05 00:13+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n"
 "MIME-Version: 1.0\n"
@@ -18,27 +18,39 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: templates/authenticate.php:4
+msgid "The password is wrong. Try again."
+msgstr ""
+
+#: templates/authenticate.php:7
 msgid "Password"
 msgstr "Wagwoord"
 
-#: templates/authenticate.php:6
+#: templates/authenticate.php:9
 msgid "Submit"
 msgstr ""
 
-#: templates/public.php:10
+#: templates/public.php:17
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr ""
 
-#: templates/public.php:13
+#: templates/public.php:20
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr ""
 
-#: templates/public.php:19 templates/public.php:43
+#: templates/public.php:28 templates/public.php:86
 msgid "Download"
 msgstr ""
 
-#: templates/public.php:40
+#: templates/public.php:44
+msgid "Upload"
+msgstr ""
+
+#: templates/public.php:54
+msgid "Cancel upload"
+msgstr ""
+
+#: templates/public.php:83
 msgid "No preview available for"
 msgstr ""
diff --git a/l10n/af_ZA/lib.po b/l10n/af_ZA/lib.po
index 216f769e9fd2ca20f585ea1849abde45fea012db..1d31fcf99084d7193a06ef1ae6bc756cdda1c327 100644
--- a/l10n/af_ZA/lib.po
+++ b/l10n/af_ZA/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 00:04+0000\n"
+"POT-Creation-Date: 2013-07-09 02:04+0200\n"
+"PO-Revision-Date: 2013-07-09 00:02+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n"
 "MIME-Version: 1.0\n"
@@ -17,30 +17,34 @@ msgstr ""
 "Language: af_ZA\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:359
+#: app.php:360
 msgid "Help"
 msgstr "Hulp"
 
-#: app.php:372
+#: app.php:373
 msgid "Personal"
 msgstr "Persoonlik"
 
-#: app.php:383
+#: app.php:384
 msgid "Settings"
 msgstr "Instellings"
 
-#: app.php:395
+#: app.php:396
 msgid "Users"
 msgstr "Gebruikers"
 
-#: app.php:408
+#: app.php:409
 msgid "Apps"
 msgstr "Toepassings"
 
-#: app.php:416
+#: app.php:417
 msgid "Admin"
 msgstr "Admin"
 
+#: defaults.php:33
+msgid "web services under your control"
+msgstr "webdienste onder jou beheer"
+
 #: files.php:210
 msgid "ZIP download is turned off."
 msgstr ""
@@ -85,104 +89,102 @@ msgstr ""
 msgid "Images"
 msgstr ""
 
-#: setup.php:34
-msgid "Set an admin username."
-msgstr ""
-
-#: setup.php:37
-msgid "Set an admin password."
-msgstr ""
-
-#: setup.php:55
+#: setup/abstractdatabase.php:22
 #, php-format
 msgid "%s enter the database username."
 msgstr ""
 
-#: setup.php:58
+#: setup/abstractdatabase.php:25
 #, php-format
 msgid "%s enter the database name."
 msgstr ""
 
-#: setup.php:61
+#: setup/abstractdatabase.php:28
 #, php-format
 msgid "%s you may not use dots in the database name"
 msgstr ""
 
-#: setup.php:64
+#: setup/mssql.php:20
 #, php-format
-msgid "%s set the database host."
-msgstr ""
-
-#: setup.php:126 setup.php:332 setup.php:377
-msgid "PostgreSQL username and/or password not valid"
+msgid "MS SQL username and/or password not valid: %s"
 msgstr ""
 
-#: setup.php:127 setup.php:235
+#: setup/mssql.php:21 setup/mysql.php:13 setup/oci.php:114
+#: setup/postgresql.php:24 setup/postgresql.php:70
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:152
-msgid "Oracle connection could not be established"
-msgstr ""
-
-#: setup.php:234
+#: setup/mysql.php:12
 msgid "MySQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:288 setup.php:398 setup.php:407 setup.php:425 setup.php:435
-#: setup.php:444 setup.php:477 setup.php:543 setup.php:569 setup.php:576
-#: setup.php:587 setup.php:594 setup.php:603 setup.php:611 setup.php:620
-#: setup.php:626
+#: setup/mysql.php:67 setup/oci.php:54 setup/oci.php:121 setup/oci.php:147
+#: setup/oci.php:154 setup/oci.php:165 setup/oci.php:172 setup/oci.php:181
+#: setup/oci.php:189 setup/oci.php:198 setup/oci.php:204
+#: setup/postgresql.php:89 setup/postgresql.php:98 setup/postgresql.php:115
+#: setup/postgresql.php:125 setup/postgresql.php:134
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr ""
 
-#: setup.php:289 setup.php:399 setup.php:408 setup.php:426 setup.php:436
-#: setup.php:445 setup.php:478 setup.php:544 setup.php:570 setup.php:577
-#: setup.php:588 setup.php:604 setup.php:612 setup.php:621
+#: setup/mysql.php:68 setup/oci.php:55 setup/oci.php:122 setup/oci.php:148
+#: setup/oci.php:155 setup/oci.php:166 setup/oci.php:182 setup/oci.php:190
+#: setup/oci.php:199 setup/postgresql.php:90 setup/postgresql.php:99
+#: setup/postgresql.php:116 setup/postgresql.php:126 setup/postgresql.php:135
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:305
+#: setup/mysql.php:85
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:306
+#: setup/mysql.php:86
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:311
+#: setup/mysql.php:91
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:312
+#: setup/mysql.php:92
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:469 setup.php:536
+#: setup/oci.php:34
+msgid "Oracle connection could not be established"
+msgstr ""
+
+#: setup/oci.php:41 setup/oci.php:113
 msgid "Oracle username and/or password not valid"
 msgstr ""
 
-#: setup.php:595 setup.php:627
+#: setup/oci.php:173 setup/oci.php:205
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:647
-#, php-format
-msgid "MS SQL username and/or password not valid: %s"
+#: setup/postgresql.php:23 setup/postgresql.php:69
+msgid "PostgreSQL username and/or password not valid"
+msgstr ""
+
+#: setup.php:42
+msgid "Set an admin username."
+msgstr ""
+
+#: setup.php:45
+msgid "Set an admin password."
 msgstr ""
 
-#: setup.php:870
+#: setup.php:198
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:871
+#: setup.php:199
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
diff --git a/l10n/af_ZA/settings.po b/l10n/af_ZA/settings.po
index abaa44679024d57116f86456bc9e7a3d18afed8a..5daaa64d26b99985bbef21638b36ec7a326c22f8 100644
--- a/l10n/af_ZA/settings.po
+++ b/l10n/af_ZA/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-11 01:57+0200\n"
-"PO-Revision-Date: 2013-06-10 23:57+0000\n"
+"POT-Creation-Date: 2013-07-09 02:04+0200\n"
+"PO-Revision-Date: 2013-07-09 00:04+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n"
 "MIME-Version: 1.0\n"
@@ -58,7 +58,7 @@ msgstr ""
 msgid "Unable to delete group"
 msgstr ""
 
-#: ajax/removeuser.php:24
+#: ajax/removeuser.php:25
 msgid "Unable to delete user"
 msgstr ""
 
@@ -88,35 +88,35 @@ msgstr ""
 msgid "Couldn't update app."
 msgstr ""
 
-#: js/apps.js:30
+#: js/apps.js:35
 msgid "Update to {appversion}"
 msgstr ""
 
-#: js/apps.js:36 js/apps.js:76
+#: js/apps.js:41 js/apps.js:81
 msgid "Disable"
 msgstr ""
 
-#: js/apps.js:36 js/apps.js:64 js/apps.js:83
+#: js/apps.js:41 js/apps.js:69 js/apps.js:88
 msgid "Enable"
 msgstr ""
 
-#: js/apps.js:55
+#: js/apps.js:60
 msgid "Please wait...."
 msgstr ""
 
-#: js/apps.js:59 js/apps.js:71 js/apps.js:80 js/apps.js:93
+#: js/apps.js:64 js/apps.js:76 js/apps.js:85 js/apps.js:98
 msgid "Error"
 msgstr ""
 
-#: js/apps.js:90
+#: js/apps.js:95
 msgid "Updating...."
 msgstr ""
 
-#: js/apps.js:93
+#: js/apps.js:98
 msgid "Error while updating app"
 msgstr ""
 
-#: js/apps.js:96
+#: js/apps.js:101
 msgid "Updated"
 msgstr ""
 
@@ -165,15 +165,15 @@ msgstr ""
 msgid "A valid password must be provided"
 msgstr ""
 
-#: personal.php:35 personal.php:36
+#: personal.php:37 personal.php:38
 msgid "__language_name__"
 msgstr ""
 
-#: templates/admin.php:15
+#: templates/admin.php:17
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:18
+#: templates/admin.php:20
 msgid ""
 "Your data directory and your files are probably accessible from the "
 "internet. The .htaccess file that ownCloud provides is not working. We "
@@ -182,36 +182,36 @@ msgid ""
 " webserver document root."
 msgstr ""
 
-#: templates/admin.php:29
+#: templates/admin.php:31
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:32
+#: templates/admin.php:34
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: templates/admin.php:33
+#: templates/admin.php:35
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:44
+#: templates/admin.php:46
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:47
+#: templates/admin.php:49
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr ""
 
-#: templates/admin.php:58
+#: templates/admin.php:60
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:63
+#: templates/admin.php:65
 #, php-format
 msgid ""
 "This ownCloud server can't set system locale to %s. This means that there "
@@ -219,11 +219,11 @@ msgid ""
 " to install the required packages on your system to support %s."
 msgstr ""
 
-#: templates/admin.php:75
+#: templates/admin.php:77
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:78
+#: templates/admin.php:80
 msgid ""
 "This ownCloud server has no working internet connection. This means that "
 "some of the features like mounting of external storage, notifications about "
@@ -233,102 +233,102 @@ msgid ""
 " of ownCloud."
 msgstr ""
 
-#: templates/admin.php:92
+#: templates/admin.php:94
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:101
+#: templates/admin.php:103
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:111
+#: templates/admin.php:113
 msgid ""
 "cron.php is registered at a webcron service. Call the cron.php page in the "
 "owncloud root once a minute over http."
 msgstr ""
 
-#: templates/admin.php:121
+#: templates/admin.php:123
 msgid ""
 "Use systems cron service. Call the cron.php file in the owncloud folder via "
 "a system cronjob once a minute."
 msgstr ""
 
-#: templates/admin.php:128
+#: templates/admin.php:130
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:134
+#: templates/admin.php:136
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:135
+#: templates/admin.php:137
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:142
+#: templates/admin.php:144
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:143
+#: templates/admin.php:145
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:150
+#: templates/admin.php:152
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:151
+#: templates/admin.php:153
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:158
+#: templates/admin.php:160
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:161
+#: templates/admin.php:163
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:168
+#: templates/admin.php:170
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:181
+#: templates/admin.php:183
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:182
+#: templates/admin.php:184
 msgid ""
 "Enforces the clients to connect to ownCloud via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:185
+#: templates/admin.php:187
 msgid ""
 "Please connect to this ownCloud instance via HTTPS to enable or disable the "
 "SSL enforcement."
 msgstr ""
 
-#: templates/admin.php:195
+#: templates/admin.php:197
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:196
+#: templates/admin.php:198
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:227
+#: templates/admin.php:229
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:228
+#: templates/admin.php:230
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:235 templates/personal.php:111
+#: templates/admin.php:236 templates/personal.php:116
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:237 templates/personal.php:114
+#: templates/admin.php:240 templates/personal.php:119
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -338,27 +338,27 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr ""
 
-#: templates/apps.php:11
+#: templates/apps.php:13
 msgid "Add your App"
 msgstr ""
 
-#: templates/apps.php:12
+#: templates/apps.php:28
 msgid "More Apps"
 msgstr ""
 
-#: templates/apps.php:28
+#: templates/apps.php:33
 msgid "Select an App"
 msgstr ""
 
-#: templates/apps.php:34
+#: templates/apps.php:39
 msgid "See application page at apps.owncloud.com"
 msgstr ""
 
-#: templates/apps.php:36
+#: templates/apps.php:41
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr ""
 
-#: templates/apps.php:38
+#: templates/apps.php:43
 msgid "Update"
 msgstr ""
 
@@ -386,76 +386,79 @@ msgstr ""
 msgid "Commercial Support"
 msgstr ""
 
-#: templates/personal.php:8
-#, php-format
-msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
-msgstr ""
-
-#: templates/personal.php:15
+#: templates/personal.php:10
 msgid "Get the apps to sync your files"
 msgstr ""
 
-#: templates/personal.php:26
+#: templates/personal.php:21
 msgid "Show First Run Wizard again"
 msgstr ""
 
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:29
+#, php-format
+msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
+msgstr ""
+
+#: templates/personal.php:41 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "Wagwoord"
 
-#: templates/personal.php:38
+#: templates/personal.php:42
 msgid "Your password was changed"
 msgstr ""
 
-#: templates/personal.php:39
+#: templates/personal.php:43
 msgid "Unable to change your password"
 msgstr ""
 
-#: templates/personal.php:40
+#: templates/personal.php:44
 msgid "Current password"
 msgstr ""
 
-#: templates/personal.php:42
+#: templates/personal.php:46
 msgid "New password"
 msgstr "Nuwe wagwoord"
 
-#: templates/personal.php:44
+#: templates/personal.php:48
 msgid "Change password"
 msgstr ""
 
-#: templates/personal.php:56 templates/users.php:85
+#: templates/personal.php:60 templates/users.php:85
 msgid "Display Name"
 msgstr ""
 
-#: templates/personal.php:71
+#: templates/personal.php:75
 msgid "Email"
 msgstr ""
 
-#: templates/personal.php:73
+#: templates/personal.php:77
 msgid "Your email address"
 msgstr ""
 
-#: templates/personal.php:74
+#: templates/personal.php:78
 msgid "Fill in an email address to enable password recovery"
 msgstr ""
 
-#: templates/personal.php:83 templates/personal.php:84
+#: templates/personal.php:87 templates/personal.php:88
 msgid "Language"
 msgstr ""
 
-#: templates/personal.php:95
+#: templates/personal.php:100
 msgid "Help translate"
 msgstr ""
 
-#: templates/personal.php:100
+#: templates/personal.php:106
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:102
-msgid "Use this address to connect to your ownCloud in your file manager"
+#: templates/personal.php:108
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
+"target=\"_blank\">access your Files via WebDAV</a>"
 msgstr ""
 
-#: templates/users.php:21 templates/users.php:84
+#: templates/users.php:21
 msgid "Login Name"
 msgstr ""
 
@@ -485,6 +488,10 @@ msgstr ""
 msgid "Other"
 msgstr ""
 
+#: templates/users.php:84
+msgid "Username"
+msgstr "Gebruikersnaam"
+
 #: templates/users.php:91
 msgid "Storage"
 msgstr ""
diff --git a/l10n/af_ZA/user_ldap.po b/l10n/af_ZA/user_ldap.po
index 71d8cea474a0e5de65cc918209db4610f81acfdb..4856d0902bf6cd2ba627d55e0621b176690e5229 100644
--- a/l10n/af_ZA/user_ldap.po
+++ b/l10n/af_ZA/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-25 02:01+0200\n"
-"PO-Revision-Date: 2013-05-24 13:28+0000\n"
+"POT-Creation-Date: 2013-06-23 01:59+0200\n"
+"PO-Revision-Date: 2013-06-22 10:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/ar/core.po b/l10n/ar/core.po
index b7556553c2f69bcf69fe05a3b40873be5b29b9c3..678c385d57daab7606b606a9b41a3bf1121f0673 100644
--- a/l10n/ar/core.po
+++ b/l10n/ar/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:22+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -61,135 +61,135 @@ msgstr "لم يتم اختيار فئة للحذف"
 msgid "Error removing %s from favorites."
 msgstr "خطأ في حذف %s من المفضلة"
 
-#: js/config.php:34
+#: js/config.php:32
 msgid "Sunday"
 msgstr "الاحد"
 
-#: js/config.php:35
+#: js/config.php:33
 msgid "Monday"
 msgstr "الأثنين"
 
-#: js/config.php:36
+#: js/config.php:34
 msgid "Tuesday"
 msgstr "الثلاثاء"
 
-#: js/config.php:37
+#: js/config.php:35
 msgid "Wednesday"
 msgstr "الاربعاء"
 
-#: js/config.php:38
+#: js/config.php:36
 msgid "Thursday"
 msgstr "الخميس"
 
-#: js/config.php:39
+#: js/config.php:37
 msgid "Friday"
 msgstr "الجمعه"
 
-#: js/config.php:40
+#: js/config.php:38
 msgid "Saturday"
 msgstr "السبت"
 
-#: js/config.php:45
+#: js/config.php:43
 msgid "January"
 msgstr "كانون الثاني"
 
-#: js/config.php:46
+#: js/config.php:44
 msgid "February"
 msgstr "شباط"
 
-#: js/config.php:47
+#: js/config.php:45
 msgid "March"
 msgstr "آذار"
 
-#: js/config.php:48
+#: js/config.php:46
 msgid "April"
 msgstr "نيسان"
 
-#: js/config.php:49
+#: js/config.php:47
 msgid "May"
 msgstr "أيار"
 
-#: js/config.php:50
+#: js/config.php:48
 msgid "June"
 msgstr "حزيران"
 
-#: js/config.php:51
+#: js/config.php:49
 msgid "July"
 msgstr "تموز"
 
-#: js/config.php:52
+#: js/config.php:50
 msgid "August"
 msgstr "آب"
 
-#: js/config.php:53
+#: js/config.php:51
 msgid "September"
 msgstr "أيلول"
 
-#: js/config.php:54
+#: js/config.php:52
 msgid "October"
 msgstr "تشرين الاول"
 
-#: js/config.php:55
+#: js/config.php:53
 msgid "November"
 msgstr "تشرين الثاني"
 
-#: js/config.php:56
+#: js/config.php:54
 msgid "December"
 msgstr "كانون الاول"
 
-#: js/js.js:286
+#: js/js.js:293
 msgid "Settings"
 msgstr "إعدادات"
 
-#: js/js.js:718
+#: js/js.js:725
 msgid "seconds ago"
 msgstr "منذ ثواني"
 
-#: js/js.js:719
+#: js/js.js:726
 msgid "1 minute ago"
 msgstr "منذ دقيقة"
 
-#: js/js.js:720
+#: js/js.js:727
 msgid "{minutes} minutes ago"
 msgstr "{minutes} منذ دقائق"
 
-#: js/js.js:721
+#: js/js.js:728
 msgid "1 hour ago"
 msgstr "قبل ساعة مضت"
 
-#: js/js.js:722
+#: js/js.js:729
 msgid "{hours} hours ago"
 msgstr "{hours} ساعة مضت"
 
-#: js/js.js:723
+#: js/js.js:730
 msgid "today"
 msgstr "اليوم"
 
-#: js/js.js:724
+#: js/js.js:731
 msgid "yesterday"
 msgstr "يوم أمس"
 
-#: js/js.js:725
+#: js/js.js:732
 msgid "{days} days ago"
 msgstr "{days} يوم سابق"
 
-#: js/js.js:726
+#: js/js.js:733
 msgid "last month"
 msgstr "الشهر الماضي"
 
-#: js/js.js:727
+#: js/js.js:734
 msgid "{months} months ago"
 msgstr "{months} شهر مضت"
 
-#: js/js.js:728
+#: js/js.js:735
 msgid "months ago"
 msgstr "شهر مضى"
 
-#: js/js.js:729
+#: js/js.js:736
 msgid "last year"
 msgstr "السنةالماضية"
 
-#: js/js.js:730
+#: js/js.js:737
 msgid "years ago"
 msgstr "سنة مضت"
 
@@ -225,8 +225,8 @@ msgstr "نوع العنصر غير محدد."
 #: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
 #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:577
-#: js/share.js:589
+#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:620
+#: js/share.js:632
 msgid "Error"
 msgstr "خطأ"
 
@@ -246,7 +246,7 @@ msgstr "مشارك"
 msgid "Share"
 msgstr "شارك"
 
-#: js/share.js:125 js/share.js:617
+#: js/share.js:125 js/share.js:660
 msgid "Error while sharing"
 msgstr "حصل خطأ عند عملية المشاركة"
 
@@ -266,99 +266,103 @@ msgstr "شورك معك ومع المجموعة {group} من قبل {owner}"
 msgid "Shared with you by {owner}"
 msgstr "شورك معك من قبل {owner}"
 
-#: js/share.js:159
+#: js/share.js:172
 msgid "Share with"
 msgstr "شارك مع"
 
-#: js/share.js:164
+#: js/share.js:177
 msgid "Share with link"
 msgstr "شارك مع رابط"
 
-#: js/share.js:167
+#: js/share.js:180
 msgid "Password protect"
 msgstr "حماية كلمة السر"
 
-#: js/share.js:169 templates/installation.php:54 templates/login.php:26
+#: js/share.js:182 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "كلمة المرور"
 
-#: js/share.js:173
+#: js/share.js:187
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:191
 msgid "Email link to person"
 msgstr "ارسل الرابط بالبريد الى صديق"
 
-#: js/share.js:174
+#: js/share.js:192
 msgid "Send"
 msgstr "أرسل"
 
-#: js/share.js:178
+#: js/share.js:197
 msgid "Set expiration date"
 msgstr "تعيين تاريخ إنتهاء الصلاحية"
 
-#: js/share.js:179
+#: js/share.js:198
 msgid "Expiration date"
 msgstr "تاريخ إنتهاء الصلاحية"
 
-#: js/share.js:211
+#: js/share.js:230
 msgid "Share via email:"
 msgstr "مشاركة عبر البريد الإلكتروني:"
 
-#: js/share.js:213
+#: js/share.js:232
 msgid "No people found"
 msgstr "لم يتم العثور على أي شخص"
 
-#: js/share.js:251
+#: js/share.js:270
 msgid "Resharing is not allowed"
 msgstr "لا يسمح بعملية إعادة المشاركة"
 
-#: js/share.js:287
+#: js/share.js:306
 msgid "Shared in {item} with {user}"
 msgstr "شورك في {item} مع {user}"
 
-#: js/share.js:308
+#: js/share.js:327
 msgid "Unshare"
 msgstr "إلغاء مشاركة"
 
-#: js/share.js:320
+#: js/share.js:339
 msgid "can edit"
 msgstr "التحرير مسموح"
 
-#: js/share.js:322
+#: js/share.js:341
 msgid "access control"
 msgstr "ضبط الوصول"
 
-#: js/share.js:325
+#: js/share.js:344
 msgid "create"
 msgstr "إنشاء"
 
-#: js/share.js:328
+#: js/share.js:347
 msgid "update"
 msgstr "تحديث"
 
-#: js/share.js:331
+#: js/share.js:350
 msgid "delete"
 msgstr "حذف"
 
-#: js/share.js:334
+#: js/share.js:353
 msgid "share"
 msgstr "مشاركة"
 
-#: js/share.js:368 js/share.js:564
+#: js/share.js:387 js/share.js:607
 msgid "Password protected"
 msgstr "محمي بكلمة السر"
 
-#: js/share.js:577
+#: js/share.js:620
 msgid "Error unsetting expiration date"
 msgstr "حصل خطأ عند عملية إزالة تاريخ إنتهاء الصلاحية"
 
-#: js/share.js:589
+#: js/share.js:632
 msgid "Error setting expiration date"
 msgstr "حصل خطأ عند عملية تعيين تاريخ إنتهاء الصلاحية"
 
-#: js/share.js:604
+#: js/share.js:647
 msgid "Sending ..."
 msgstr "جاري الارسال ..."
 
-#: js/share.js:615
+#: js/share.js:658
 msgid "Email sent"
 msgstr "تم ارسال البريد الالكتروني"
 
@@ -373,7 +377,7 @@ msgstr "حصل خطأ في عملية التحديث, يرجى ارسال تقر
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "تم التحديث بنجاح , يتم اعادة توجيهك الان الى Owncloud"
 
-#: lostpassword/controller.php:58
+#: lostpassword/controller.php:60
 msgid "ownCloud password reset"
 msgstr "إعادة تعيين كلمة سر ownCloud"
 
@@ -403,17 +407,17 @@ msgstr "إسم المستخدم"
 
 #: lostpassword/templates/lostpassword.php:22
 msgid ""
-"Your files seems to be encrypted. If you didn't have enabled the recovery "
-"key there will be no way to get your data back once the password was "
-"resetted. If you are not sure what to do, please contact your administrator "
-"first before continue. Do you really want to continue?"
+"Your files are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
 msgstr ""
 
 #: lostpassword/templates/lostpassword.php:24
 msgid "Yes, I really want to reset my password now"
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:29
+#: lostpassword/templates/lostpassword.php:27
 msgid "Request reset"
 msgstr "طلب تعديل"
 
@@ -461,7 +465,7 @@ msgstr "التوصّل محظور"
 msgid "Cloud not found"
 msgstr "لم يتم إيجاد"
 
-#: templates/altmail.php:2
+#: templates/altmail.php:4
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -472,10 +476,6 @@ msgid ""
 "Cheers!"
 msgstr ""
 
-#: templates/altmail.php:7 templates/mail.php:24
-msgid "web services under your control"
-msgstr "خدمات الشبكة تحت سيطرتك"
-
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
 msgstr "عدل الفئات"
@@ -568,12 +568,12 @@ msgstr "خادم قاعدة البيانات"
 msgid "Finish setup"
 msgstr "انهاء التعديلات"
 
-#: templates/layout.user.php:40
+#: templates/layout.user.php:43
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:67
+#: templates/layout.user.php:68
 msgid "Log out"
 msgstr "الخروج"
 
@@ -607,7 +607,7 @@ msgstr "أدخل"
 msgid "Alternative Logins"
 msgstr "اسماء دخول بديلة"
 
-#: templates/mail.php:15
+#: templates/mail.php:16
 #, php-format
 msgid ""
 "Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
diff --git a/l10n/ar/files.po b/l10n/ar/files.po
index b434ce6ef68bf07bf3758fb6f0a6938181dd7732..aa7fc27ae8828391265ecc3f6e8c262086f2faf8 100644
--- a/l10n/ar/files.po
+++ b/l10n/ar/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:01+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -27,46 +27,54 @@ msgstr "فشل في نقل الملف %s - يوجد ملف بنفس هذا ال
 msgid "Could not move %s"
 msgstr "فشل في نقل %s"
 
-#: ajax/upload.php:19
+#: ajax/upload.php:16 ajax/upload.php:45
+msgid "Unable to set upload directory."
+msgstr ""
+
+#: ajax/upload.php:22
+msgid "Invalid Token"
+msgstr ""
+
+#: ajax/upload.php:59
 msgid "No file was uploaded. Unknown error"
 msgstr "لم يتم رفع أي ملف , خطأ غير معروف"
 
-#: ajax/upload.php:26
+#: ajax/upload.php:66
 msgid "There is no error, the file uploaded with success"
 msgstr "تم ترفيع الملفات بنجاح."
 
-#: ajax/upload.php:27
+#: ajax/upload.php:67
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr "حجم الملف المرفوع تجاوز قيمة  upload_max_filesize الموجودة في ملف php.ini "
 
-#: ajax/upload.php:29
+#: ajax/upload.php:69
 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:30
+#: ajax/upload.php:70
 msgid "The uploaded file was only partially uploaded"
 msgstr "تم ترفيع جزء من الملفات الذي تريد ترفيعها فقط"
 
-#: ajax/upload.php:31
+#: ajax/upload.php:71
 msgid "No file was uploaded"
 msgstr "لم يتم ترفيع أي من الملفات"
 
-#: ajax/upload.php:32
+#: ajax/upload.php:72
 msgid "Missing a temporary folder"
 msgstr "المجلد المؤقت غير موجود"
 
-#: ajax/upload.php:33
+#: ajax/upload.php:73
 msgid "Failed to write to disk"
 msgstr "خطأ في الكتابة على القرص الصلب"
 
-#: ajax/upload.php:51
+#: ajax/upload.php:91
 msgid "Not enough storage available"
 msgstr "لا يوجد مساحة تخزينية كافية"
 
-#: ajax/upload.php:83
+#: ajax/upload.php:123
 msgid "Invalid directory."
 msgstr "مسار غير صحيح."
 
@@ -74,6 +82,36 @@ msgstr "مسار غير صحيح."
 msgid "Files"
 msgstr "الملفات"
 
+#: js/file-upload.js:11
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr "فشل في رفع ملفاتك , إما أنها مجلد أو حجمها 0 بايت"
+
+#: js/file-upload.js:24
+msgid "Not enough space available"
+msgstr ""
+
+#: js/file-upload.js:64
+msgid "Upload cancelled."
+msgstr "تم إلغاء عملية رفع الملفات ."
+
+#: js/file-upload.js:167 js/files.js:266
+msgid ""
+"File upload is in progress. Leaving the page now will cancel the upload."
+msgstr "عملية رفع الملفات قيد التنفيذ. اغلاق الصفحة سوف يلغي عملية رفع الملفات."
+
+#: js/file-upload.js:233 js/files.js:339
+msgid "URL cannot be empty."
+msgstr "عنوان ال URL  لا يجوز أن يكون فارغا."
+
+#: js/file-upload.js:238 lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr ""
+
+#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
+#: js/files.js:693 js/files.js:731
+msgid "Error"
+msgstr "خطأ"
+
 #: js/fileactions.js:116
 msgid "Share"
 msgstr "شارك"
@@ -90,43 +128,43 @@ msgstr "إلغاء"
 msgid "Rename"
 msgstr "إعادة تسميه"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:464
 msgid "Pending"
 msgstr "قيد الانتظار"
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "{new_name} already exists"
 msgstr "{new_name} موجود مسبقا"
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "replace"
 msgstr "استبدال"
 
-#: js/filelist.js:259
+#: js/filelist.js:302
 msgid "suggest name"
 msgstr "اقترح إسم"
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "cancel"
 msgstr "إلغاء"
 
-#: js/filelist.js:306
+#: js/filelist.js:349
 msgid "replaced {new_name} with {old_name}"
 msgstr "استبدل {new_name}  بـ  {old_name}"
 
-#: js/filelist.js:306
+#: js/filelist.js:349
 msgid "undo"
 msgstr "تراجع"
 
-#: js/filelist.js:331
+#: js/filelist.js:374
 msgid "perform delete operation"
 msgstr "جاري تنفيذ عملية الحذف"
 
-#: js/filelist.js:413
+#: js/filelist.js:456
 msgid "1 file uploading"
 msgstr "جاري رفع 1 ملف"
 
-#: js/filelist.js:416 js/filelist.js:470
+#: js/filelist.js:459 js/filelist.js:517
 msgid "files uploading"
 msgstr ""
 
@@ -158,70 +196,42 @@ msgid ""
 "big."
 msgstr "جاري تجهيز عملية التحميل. قد تستغرق بعض الوقت اذا كان حجم الملفات كبير."
 
-#: js/files.js:264
-msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "فشل في رفع ملفاتك , إما أنها مجلد أو حجمها 0 بايت"
-
-#: js/files.js:277
-msgid "Not enough space available"
-msgstr ""
-
-#: js/files.js:317
-msgid "Upload cancelled."
-msgstr "تم إلغاء عملية رفع الملفات ."
-
-#: js/files.js:413
-msgid ""
-"File upload is in progress. Leaving the page now will cancel the upload."
-msgstr "عملية رفع الملفات قيد التنفيذ. اغلاق الصفحة سوف يلغي عملية رفع الملفات."
-
-#: js/files.js:486
-msgid "URL cannot be empty."
-msgstr "عنوان ال URL  لا يجوز أن يكون فارغا."
-
-#: js/files.js:491
+#: js/files.js:344
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "إسم مجلد غير صحيح. استخدام مصطلح \"Shared\" محجوز للنظام"
 
-#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
-msgid "Error"
-msgstr "خطأ"
-
-#: js/files.js:877 templates/index.php:69
+#: js/files.js:744 templates/index.php:69
 msgid "Name"
 msgstr "اسم"
 
-#: js/files.js:878 templates/index.php:80
+#: js/files.js:745 templates/index.php:80
 msgid "Size"
 msgstr "حجم"
 
-#: js/files.js:879 templates/index.php:82
+#: js/files.js:746 templates/index.php:82
 msgid "Modified"
 msgstr "معدل"
 
-#: js/files.js:898
+#: js/files.js:765
 msgid "1 folder"
 msgstr "مجلد عدد 1"
 
-#: js/files.js:900
+#: js/files.js:767
 msgid "{count} folders"
 msgstr "{count} مجلدات"
 
-#: js/files.js:908
+#: js/files.js:775
 msgid "1 file"
 msgstr "ملف واحد"
 
-#: js/files.js:910
+#: js/files.js:777
 msgid "{count} files"
 msgstr "{count} ملفات"
 
-#: lib/app.php:53
-msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
-msgstr ""
-
 #: lib/app.php:73
-msgid "Unable to rename file"
-msgstr "فشل في اعادة تسمية الملف"
+#, php-format
+msgid "%s could not be renamed"
+msgstr ""
 
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
@@ -317,6 +327,22 @@ msgstr "يرجى الانتظار , جاري فحص الملفات ."
 msgid "Current scanning"
 msgstr "الفحص الحالي"
 
+#: templates/part.list.php:76
+msgid "directory"
+msgstr ""
+
+#: templates/part.list.php:78
+msgid "directories"
+msgstr ""
+
+#: templates/part.list.php:87
+msgid "file"
+msgstr ""
+
+#: templates/part.list.php:89
+msgid "files"
+msgstr ""
+
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
 msgstr "تحديث ذاكرة التخزين المؤقت(الكاش)  الخاصة بملفات النظام ..."
diff --git a/l10n/ar/files_encryption.po b/l10n/ar/files_encryption.po
index 9c991385fd66bcf6c4e0f177d3a9c70265a5a2a4..b364ef0b1af6be2a3f2bd625ae80265976f3351b 100644
--- a/l10n/ar/files_encryption.po
+++ b/l10n/ar/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-14 02:46+0200\n"
-"PO-Revision-Date: 2013-06-14 00:47+0000\n"
+"POT-Creation-Date: 2013-07-05 02:12+0200\n"
+"PO-Revision-Date: 2013-07-05 00:13+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"
@@ -55,9 +55,21 @@ msgstr ""
 
 #: files/error.php:7
 msgid ""
-"Your private key is not valid! Maybe your password was changed from outside."
-" You can update your private key password in your personal settings to "
-"regain access to your files"
+"Your private key is not valid! Likely your password was changed outside the "
+"ownCloud system (e.g. your corporate directory). You can update your private"
+" key password in your personal settings to recover access to your encrypted "
+"files."
+msgstr ""
+
+#: hooks/hooks.php:44
+msgid "Missing requirements."
+msgstr ""
+
+#: hooks/hooks.php:45
+msgid ""
+"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL "
+"PHP extension is enabled and configured properly. For now, the encryption "
+"app has been disabled."
 msgstr ""
 
 #: js/settings-admin.js:11
@@ -84,11 +96,11 @@ msgstr "التشفير"
 
 #: templates/settings-admin.php:10
 msgid ""
-"Enable encryption passwords recovery key (allow sharing to recovery key):"
+"Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
 #: templates/settings-admin.php:14
-msgid "Recovery account password"
+msgid "Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:21 templates/settings-personal.php:54
@@ -100,15 +112,15 @@ msgid "Disabled"
 msgstr ""
 
 #: templates/settings-admin.php:34
-msgid "Change encryption passwords recovery key:"
+msgid "Change recovery key password:"
 msgstr ""
 
 #: templates/settings-admin.php:41
-msgid "Old Recovery account password"
+msgid "Old Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:48
-msgid "New Recovery account password"
+msgid "New Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:53
diff --git a/l10n/ar/files_external.po b/l10n/ar/files_external.po
index 0ad52f5d75546996d0e40271e78edd01bf90d1d1..1764c7b41038fb5b2cc76b6fe223f72ec5248d81 100644
--- a/l10n/ar/files_external.po
+++ b/l10n/ar/files_external.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/ar/files_sharing.po b/l10n/ar/files_sharing.po
index c11f2cdbdaf6a0b0d8da00b8fa27d4f505069d7b..b4282a98af427facd9e9de71e22cbf11ac0840b5 100644
--- a/l10n/ar/files_sharing.po
+++ b/l10n/ar/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -18,27 +18,39 @@ msgstr ""
 "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/authenticate.php:4
+msgid "The password is wrong. Try again."
+msgstr ""
+
+#: templates/authenticate.php:7
 msgid "Password"
 msgstr "كلمة المرور"
 
-#: templates/authenticate.php:6
+#: templates/authenticate.php:9
 msgid "Submit"
 msgstr "تطبيق"
 
-#: templates/public.php:10
+#: templates/public.php:17
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s شارك المجلد %s معك"
 
-#: templates/public.php:13
+#: templates/public.php:20
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s شارك الملف %s معك"
 
-#: templates/public.php:19 templates/public.php:43
+#: templates/public.php:28 templates/public.php:90
 msgid "Download"
 msgstr "تحميل"
 
-#: templates/public.php:40
+#: templates/public.php:45 templates/public.php:48
+msgid "Upload"
+msgstr "رفع"
+
+#: templates/public.php:58
+msgid "Cancel upload"
+msgstr "إلغاء رفع الملفات"
+
+#: templates/public.php:87
 msgid "No preview available for"
 msgstr "لا يوجد عرض مسبق لـ"
diff --git a/l10n/ar/files_trashbin.po b/l10n/ar/files_trashbin.po
index beefc4ec294b49da410a0527cb5444dcf5c9b5e0..b77937bbf52ebb04bf9bf2a14f1db0591be5b1bd 100644
--- a/l10n/ar/files_trashbin.po
+++ b/l10n/ar/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:16+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/ar/lib.po b/l10n/ar/lib.po
index c1d27d48e2a9028225f3ff2c4c27ca29a62ea963..1d14d8daec3a8339a85d236d5d35756f261a6a97 100644
--- a/l10n/ar/lib.po
+++ b/l10n/ar/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -17,43 +17,47 @@ msgstr ""
 "Language: ar\n"
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
 
-#: app.php:359
+#: app.php:360
 msgid "Help"
 msgstr "المساعدة"
 
-#: app.php:372
+#: app.php:373
 msgid "Personal"
 msgstr "شخصي"
 
-#: app.php:383
+#: app.php:384
 msgid "Settings"
 msgstr "إعدادات"
 
-#: app.php:395
+#: app.php:396
 msgid "Users"
 msgstr "المستخدمين"
 
-#: app.php:408
+#: app.php:409
 msgid "Apps"
 msgstr "التطبيقات"
 
-#: app.php:416
+#: app.php:417
 msgid "Admin"
 msgstr "المدير"
 
-#: files.php:210
+#: defaults.php:33
+msgid "web services under your control"
+msgstr "خدمات الشبكة تحت سيطرتك"
+
+#: files.php:226
 msgid "ZIP download is turned off."
 msgstr "تحميل ملفات ZIP متوقف"
 
-#: files.php:211
+#: files.php:227
 msgid "Files need to be downloaded one by one."
 msgstr "الملفات بحاجة الى ان يتم تحميلها واحد تلو الاخر"
 
-#: files.php:212 files.php:245
+#: files.php:228 files.php:261
 msgid "Back to Files"
 msgstr "العودة الى الملفات"
 
-#: files.php:242
+#: files.php:258
 msgid "Selected files too large to generate zip file."
 msgstr "الملفات المحددة كبيرة جدا ليتم ضغطها في ملف zip"
 
@@ -85,104 +89,102 @@ msgstr "معلومات إضافية"
 msgid "Images"
 msgstr "صور"
 
-#: setup.php:34
-msgid "Set an admin username."
-msgstr "اعداد اسم مستخدم للمدير"
-
-#: setup.php:37
-msgid "Set an admin password."
-msgstr "اعداد كلمة مرور للمدير"
-
-#: setup.php:55
+#: setup/abstractdatabase.php:22
 #, php-format
 msgid "%s enter the database username."
 msgstr "%s ادخل اسم المستخدم الخاص بقاعدة البيانات."
 
-#: setup.php:58
+#: setup/abstractdatabase.php:25
 #, php-format
 msgid "%s enter the database name."
 msgstr "%s ادخل اسم فاعدة البيانات"
 
-#: setup.php:61
+#: setup/abstractdatabase.php:28
 #, php-format
 msgid "%s you may not use dots in the database name"
 msgstr "%s لا يسمح لك باستخدام نقطه (.) في اسم قاعدة البيانات"
 
-#: setup.php:64
+#: setup/mssql.php:20
 #, php-format
-msgid "%s set the database host."
-msgstr "%s ادخل اسم خادم قاعدة البيانات"
-
-#: setup.php:126 setup.php:332 setup.php:377
-msgid "PostgreSQL username and/or password not valid"
-msgstr "اسم المستخدم / أو كلمة المرور الخاصة بـPostgreSQL غير صحيحة"
+msgid "MS SQL username and/or password not valid: %s"
+msgstr "اسم المستخدم  و/أو  كلمة المرور لنظام MS SQL غير صحيح : %s"
 
-#: setup.php:127 setup.php:235
+#: setup/mssql.php:21 setup/mysql.php:13 setup/oci.php:114
+#: setup/postgresql.php:24 setup/postgresql.php:70
 msgid "You need to enter either an existing account or the administrator."
 msgstr "انت بحاجة لكتابة اسم مستخدم موجود أو حساب المدير."
 
-#: setup.php:152
-msgid "Oracle connection could not be established"
-msgstr ""
-
-#: setup.php:234
+#: setup/mysql.php:12
 msgid "MySQL username and/or password not valid"
 msgstr "اسم المستخدم  و/أو  كلمة المرور لنظام MySQL غير صحيح"
 
-#: setup.php:288 setup.php:398 setup.php:407 setup.php:425 setup.php:435
-#: setup.php:444 setup.php:477 setup.php:543 setup.php:569 setup.php:576
-#: setup.php:587 setup.php:594 setup.php:603 setup.php:611 setup.php:620
-#: setup.php:626
+#: setup/mysql.php:67 setup/oci.php:54 setup/oci.php:121 setup/oci.php:147
+#: setup/oci.php:154 setup/oci.php:165 setup/oci.php:172 setup/oci.php:181
+#: setup/oci.php:189 setup/oci.php:198 setup/oci.php:204
+#: setup/postgresql.php:89 setup/postgresql.php:98 setup/postgresql.php:115
+#: setup/postgresql.php:125 setup/postgresql.php:134
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr "خطأ في قواعد البيانات : \"%s\""
 
-#: setup.php:289 setup.php:399 setup.php:408 setup.php:426 setup.php:436
-#: setup.php:445 setup.php:478 setup.php:544 setup.php:570 setup.php:577
-#: setup.php:588 setup.php:604 setup.php:612 setup.php:621
+#: setup/mysql.php:68 setup/oci.php:55 setup/oci.php:122 setup/oci.php:148
+#: setup/oci.php:155 setup/oci.php:166 setup/oci.php:182 setup/oci.php:190
+#: setup/oci.php:199 setup/postgresql.php:90 setup/postgresql.php:99
+#: setup/postgresql.php:116 setup/postgresql.php:126 setup/postgresql.php:135
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr "الأمر المخالف كان : \"%s\""
 
-#: setup.php:305
+#: setup/mysql.php:85
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr "أسم المستخدم  '%s'@'localhost' الخاص بـ MySQL موجود مسبقا"
 
-#: setup.php:306
+#: setup/mysql.php:86
 msgid "Drop this user from MySQL"
 msgstr "احذف اسم المستخدم هذا من الـ MySQL"
 
-#: setup.php:311
+#: setup/mysql.php:91
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr "أسم المستخدم  '%s'@'%%' الخاص بـ MySQL موجود مسبقا"
 
-#: setup.php:312
+#: setup/mysql.php:92
 msgid "Drop this user from MySQL."
 msgstr "احذف اسم المستخدم هذا من الـ MySQL."
 
-#: setup.php:469 setup.php:536
+#: setup/oci.php:34
+msgid "Oracle connection could not be established"
+msgstr ""
+
+#: setup/oci.php:41 setup/oci.php:113
 msgid "Oracle username and/or password not valid"
 msgstr "اسم المستخدم  و/أو  كلمة المرور لنظام Oracle غير صحيح"
 
-#: setup.php:595 setup.php:627
+#: setup/oci.php:173 setup/oci.php:205
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr "الأمر المخالف كان : \"%s\", اسم المستخدم : %s, كلمة المرور: %s"
 
-#: setup.php:647
-#, php-format
-msgid "MS SQL username and/or password not valid: %s"
-msgstr "اسم المستخدم  و/أو  كلمة المرور لنظام MS SQL غير صحيح : %s"
+#: setup/postgresql.php:23 setup/postgresql.php:69
+msgid "PostgreSQL username and/or password not valid"
+msgstr "اسم المستخدم / أو كلمة المرور الخاصة بـPostgreSQL غير صحيحة"
+
+#: setup.php:42
+msgid "Set an admin username."
+msgstr "اعداد اسم مستخدم للمدير"
+
+#: setup.php:45
+msgid "Set an admin password."
+msgstr "اعداد كلمة مرور للمدير"
 
-#: setup.php:870
+#: setup.php:198
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "اعدادات خادمك غير صحيحة بشكل تسمح لك بمزامنة ملفاتك وذلك بسبب أن واجهة WebDAV تبدو معطلة"
 
-#: setup.php:871
+#: setup.php:199
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "الرجاء التحقق من <a href='%s'>دليل التنصيب</a>."
diff --git a/l10n/ar/settings.po b/l10n/ar/settings.po
index 2cdbc4493aa9f858ca11f3d2b20e25ed967f2d03..ea138edc2cf2b6d8752a4a2adadaf86875ca19a3 100644
--- a/l10n/ar/settings.po
+++ b/l10n/ar/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -88,35 +88,35 @@ msgstr "فشل إزالة المستخدم من المجموعة %s"
 msgid "Couldn't update app."
 msgstr "تعذر تحديث التطبيق."
 
-#: js/apps.js:30
+#: js/apps.js:35
 msgid "Update to {appversion}"
 msgstr "تم التحديث الى "
 
-#: js/apps.js:36 js/apps.js:76
+#: js/apps.js:41 js/apps.js:81
 msgid "Disable"
 msgstr "إيقاف"
 
-#: js/apps.js:36 js/apps.js:64 js/apps.js:83
+#: js/apps.js:41 js/apps.js:69 js/apps.js:88
 msgid "Enable"
 msgstr "تفعيل"
 
-#: js/apps.js:55
+#: js/apps.js:60
 msgid "Please wait...."
 msgstr "الرجاء الانتظار ..."
 
-#: js/apps.js:59 js/apps.js:71 js/apps.js:80 js/apps.js:93
+#: js/apps.js:64 js/apps.js:76 js/apps.js:85 js/apps.js:98
 msgid "Error"
 msgstr "خطأ"
 
-#: js/apps.js:90
+#: js/apps.js:95
 msgid "Updating...."
 msgstr "جاري التحديث ..."
 
-#: js/apps.js:93
+#: js/apps.js:98
 msgid "Error while updating app"
 msgstr "حصل خطأ أثناء تحديث التطبيق"
 
-#: js/apps.js:96
+#: js/apps.js:101
 msgid "Updated"
 msgstr "تم التحديث بنجاح"
 
@@ -165,15 +165,15 @@ msgstr "حصل خطأ اثناء انشاء مستخدم"
 msgid "A valid password must be provided"
 msgstr "يجب ادخال كلمة مرور صحيحة"
 
-#: personal.php:35 personal.php:36
+#: personal.php:37 personal.php:38
 msgid "__language_name__"
 msgstr "__language_name__"
 
-#: templates/admin.php:15
+#: templates/admin.php:17
 msgid "Security Warning"
 msgstr "تحذير أمان"
 
-#: templates/admin.php:18
+#: templates/admin.php:20
 msgid ""
 "Your data directory and your files are probably accessible from the "
 "internet. The .htaccess file that ownCloud provides is not working. We "
@@ -182,36 +182,36 @@ msgid ""
 " webserver document root."
 msgstr "مجلدات data  وملفاتك قد تكون قابلة للوصول اليها عن طريق شبكة الانترنت. ملف .htaccess الذي وفرته Owncloud لا يعمل . نقترح أن تقوم باعداد خادمك بطريقة تجعل مجلد data غير قابل للوصول اليه عن طريق الانترنت أو أن تقوم بتغيير مساره الى خارج مسار مجلد الصفحات الافتراضي document root الخاص بخادم الويب ."
 
-#: templates/admin.php:29
+#: templates/admin.php:31
 msgid "Setup Warning"
 msgstr "تحذير في التنصيب"
 
-#: templates/admin.php:32
+#: templates/admin.php:34
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "اعدادات خادمك غير صحيحة بشكل تسمح لك بمزامنة ملفاتك وذلك بسبب أن واجهة WebDAV تبدو معطلة"
 
-#: templates/admin.php:33
+#: templates/admin.php:35
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "الرجاء التحقق من <a href='%s'>دليل التنصيب</a>."
 
-#: templates/admin.php:44
+#: templates/admin.php:46
 msgid "Module 'fileinfo' missing"
 msgstr "الموديل 'fileinfo' مفقود"
 
-#: templates/admin.php:47
+#: templates/admin.php:49
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr "موديل  'fileinfo' الخاص بالـPHP  مفقود . نوصي بتفعيل هذا الموديل للحصول على أفضل النتائج مع خاصية التحقق "
 
-#: templates/admin.php:58
+#: templates/admin.php:60
 msgid "Locale not working"
 msgstr "اللغه لا تعمل"
 
-#: templates/admin.php:63
+#: templates/admin.php:65
 #, php-format
 msgid ""
 "This ownCloud server can't set system locale to %s. This means that there "
@@ -219,11 +219,11 @@ msgid ""
 " to install the required packages on your system to support %s."
 msgstr "لم يتمكن خادم ownCloud هذا كم ضبط لغة النظام الى %s . هذا يعني انه قد يكون هناك أخطاء في اسماء الملفات. نحن نوصي ان تقوم بتركيب الحزم اللازمة لدعم %s على نظامك . "
 
-#: templates/admin.php:75
+#: templates/admin.php:77
 msgid "Internet connection not working"
 msgstr "الاتصال بالانترنت لا يعمل"
 
-#: templates/admin.php:78
+#: templates/admin.php:80
 msgid ""
 "This ownCloud server has no working internet connection. This means that "
 "some of the features like mounting of external storage, notifications about "
@@ -233,102 +233,102 @@ msgid ""
 " of ownCloud."
 msgstr "خادم الـ Owncloud  هذا غير متصل بالانترنت. هذا يعني أن بعض الميزات مثل الربط بوحدة تخزينية خارجيه, التنبيهات الخاصة بالتحديثات أو تركيب تطبيقات من مصادر خارجية لن يعمل . كما ان الوصول الى الملفات من خارج الخادم وارسال رسائل البريد التنبيهية لن تعمل أيضا . نقترح أن تفعل خدمة الانترنت في هذا الخادم اذا أردت ان تستفيد من كافة ميزات Owncloud"
 
-#: templates/admin.php:92
+#: templates/admin.php:94
 msgid "Cron"
 msgstr "مجدول"
 
-#: templates/admin.php:101
+#: templates/admin.php:103
 msgid "Execute one task with each page loaded"
 msgstr "قم بتنفيذ مهمة واحدة مع كل صفحة تم تحميلها"
 
-#: templates/admin.php:111
+#: templates/admin.php:113
 msgid ""
 "cron.php is registered at a webcron service. Call the cron.php page in the "
 "owncloud root once a minute over http."
 msgstr "cron.php مسجلة في خدمة webcron . قم باستدعاء صفحة cron.php الموجودة في owncloud root مره كل دقيقة عن طريق بروتوكول http"
 
-#: templates/admin.php:121
+#: templates/admin.php:123
 msgid ""
 "Use systems cron service. Call the cron.php file in the owncloud folder via "
 "a system cronjob once a minute."
 msgstr "قم باستخدام خدمة cron . قم باستدعاء ملف cron.php الموجود في مجلد Owncloud  عن طريق system cronjob مره كل دقيقة"
 
-#: templates/admin.php:128
+#: templates/admin.php:130
 msgid "Sharing"
 msgstr "مشاركة"
 
-#: templates/admin.php:134
+#: templates/admin.php:136
 msgid "Enable Share API"
 msgstr "السماح بالمشاركة عن طريق الAPI "
 
-#: templates/admin.php:135
+#: templates/admin.php:137
 msgid "Allow apps to use the Share API"
 msgstr "السماح للتطبيقات بالمشاركة عن طريق الAPI"
 
-#: templates/admin.php:142
+#: templates/admin.php:144
 msgid "Allow links"
 msgstr "السماح بالعناوين"
 
-#: templates/admin.php:143
+#: templates/admin.php:145
 msgid "Allow users to share items to the public with links"
 msgstr "السماح للمستعملين بمشاركة البنود للعموم عن طريق الروابط "
 
-#: templates/admin.php:150
+#: templates/admin.php:152
 msgid "Allow resharing"
 msgstr "السماح بإعادة المشاركة "
 
-#: templates/admin.php:151
+#: templates/admin.php:153
 msgid "Allow users to share items shared with them again"
 msgstr "السماح للمستخدمين باعادة مشاركة الملفات التي تم مشاركتها معهم"
 
-#: templates/admin.php:158
+#: templates/admin.php:160
 msgid "Allow users to share with anyone"
 msgstr "السماح للمستعملين بإعادة المشاركة مع أي أحد  "
 
-#: templates/admin.php:161
+#: templates/admin.php:163
 msgid "Allow users to only share with users in their groups"
 msgstr "السماح للمستعمينٍ لإعادة المشاركة فقط مع المستعملين في مجموعاتهم"
 
-#: templates/admin.php:168
+#: templates/admin.php:170
 msgid "Security"
 msgstr "حماية"
 
-#: templates/admin.php:181
+#: templates/admin.php:183
 msgid "Enforce HTTPS"
 msgstr "فرض HTTPS"
 
-#: templates/admin.php:182
+#: templates/admin.php:184
 msgid ""
 "Enforces the clients to connect to ownCloud via an encrypted connection."
 msgstr "اجبار المستخدم بالاتصال مع Owncloud  عن طريق اتصال مشفر"
 
-#: templates/admin.php:185
+#: templates/admin.php:187
 msgid ""
 "Please connect to this ownCloud instance via HTTPS to enable or disable the "
 "SSL enforcement."
 msgstr "الرجاء الاتصال مع خادم Owncloud  هذا عن طريق HTTPS لتفعيل أو تعطيل اجبار الدخول باستخدام "
 
-#: templates/admin.php:195
+#: templates/admin.php:197
 msgid "Log"
 msgstr "سجل"
 
-#: templates/admin.php:196
+#: templates/admin.php:198
 msgid "Log level"
 msgstr "مستوى السجل"
 
-#: templates/admin.php:227
+#: templates/admin.php:229
 msgid "More"
 msgstr "المزيد"
 
-#: templates/admin.php:228
+#: templates/admin.php:230
 msgid "Less"
 msgstr "أقل"
 
-#: templates/admin.php:235 templates/personal.php:116
+#: templates/admin.php:236 templates/personal.php:116
 msgid "Version"
 msgstr "إصدار"
 
-#: templates/admin.php:237 templates/personal.php:119
+#: templates/admin.php:240 templates/personal.php:119
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -386,76 +386,79 @@ msgstr "تعقب علة"
 msgid "Commercial Support"
 msgstr "دعم تجاري"
 
-#: templates/personal.php:9
+#: templates/personal.php:10
 msgid "Get the apps to sync your files"
 msgstr "احصل على التطبيقات لمزامنة ملفاتك"
 
-#: templates/personal.php:20
+#: templates/personal.php:21
 msgid "Show First Run Wizard again"
 msgstr "ابدأ خطوات بداية التشغيل من جديد"
 
-#: templates/personal.php:28
+#: templates/personal.php:29
 #, php-format
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "تم إستهلاك <strong>%s</strong> من المتوفر <strong>%s</strong>"
 
-#: templates/personal.php:40 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:41 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "كلمة المرور"
 
-#: templates/personal.php:41
+#: templates/personal.php:42
 msgid "Your password was changed"
 msgstr "لقد تم تغيير كلمة السر"
 
-#: templates/personal.php:42
+#: templates/personal.php:43
 msgid "Unable to change your password"
 msgstr "لم يتم تعديل كلمة السر بنجاح"
 
-#: templates/personal.php:43
+#: templates/personal.php:44
 msgid "Current password"
 msgstr "كلمات السر الحالية"
 
-#: templates/personal.php:45
+#: templates/personal.php:46
 msgid "New password"
 msgstr "كلمات سر جديدة"
 
-#: templates/personal.php:47
+#: templates/personal.php:48
 msgid "Change password"
 msgstr "عدل كلمة السر"
 
-#: templates/personal.php:59 templates/users.php:85
+#: templates/personal.php:60 templates/users.php:85
 msgid "Display Name"
 msgstr "اسم الحساب"
 
-#: templates/personal.php:74
+#: templates/personal.php:75
 msgid "Email"
 msgstr "البريد الإلكترونى"
 
-#: templates/personal.php:76
+#: templates/personal.php:77
 msgid "Your email address"
 msgstr "عنوانك البريدي"
 
-#: templates/personal.php:77
+#: templates/personal.php:78
 msgid "Fill in an email address to enable password recovery"
 msgstr "أدخل عنوانك البريدي لتفعيل استرجاع كلمة المرور"
 
-#: templates/personal.php:86 templates/personal.php:87
+#: templates/personal.php:87 templates/personal.php:88
 msgid "Language"
 msgstr "اللغة"
 
-#: templates/personal.php:99
+#: templates/personal.php:100
 msgid "Help translate"
 msgstr "ساعد في الترجمه"
 
-#: templates/personal.php:105
+#: templates/personal.php:106
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:107
-msgid "Use this address to connect to your ownCloud in your file manager"
-msgstr "إستخدم هذا العنوان للإتصال بـ ownCloud في مدير الملفات"
+#: templates/personal.php:108
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
+"target=\"_blank\">access your Files via WebDAV</a>"
+msgstr ""
 
-#: templates/users.php:21 templates/users.php:84
+#: templates/users.php:21
 msgid "Login Name"
 msgstr "اسم الدخول"
 
@@ -485,6 +488,10 @@ msgstr "غير محدود"
 msgid "Other"
 msgstr "شيء آخر"
 
+#: templates/users.php:84
+msgid "Username"
+msgstr "إسم المستخدم"
+
 #: templates/users.php:91
 msgid "Storage"
 msgstr "وحدة التخزين"
diff --git a/l10n/ar/user_ldap.po b/l10n/ar/user_ldap.po
index 3ae7b1ec2f6bf20f87cdc6c221ef992370d3476f..f030ff580db3cecebc1c2a5245225d6b1300f4f4 100644
--- a/l10n/ar/user_ldap.po
+++ b/l10n/ar/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:25+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:16+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/be/core.po b/l10n/be/core.po
index 5917b8f8bb759dd78286436988c5d52b66de1ba3..c829cb46e4639538767a4cb57d57a656adfcecd6 100644
--- a/l10n/be/core.po
+++ b/l10n/be/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-15 01:59+0200\n"
-"PO-Revision-Date: 2013-06-14 23:59+0000\n"
+"POT-Creation-Date: 2013-07-06 02:02+0200\n"
+"PO-Revision-Date: 2013-07-06 00:02+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Belarusian (http://www.transifex.com/projects/p/owncloud/language/be/)\n"
 "MIME-Version: 1.0\n"
@@ -61,135 +61,135 @@ msgstr ""
 msgid "Error removing %s from favorites."
 msgstr ""
 
-#: js/config.php:34
+#: js/config.php:32
 msgid "Sunday"
 msgstr ""
 
-#: js/config.php:35
+#: js/config.php:33
 msgid "Monday"
 msgstr ""
 
-#: js/config.php:36
+#: js/config.php:34
 msgid "Tuesday"
 msgstr ""
 
-#: js/config.php:37
+#: js/config.php:35
 msgid "Wednesday"
 msgstr ""
 
-#: js/config.php:38
+#: js/config.php:36
 msgid "Thursday"
 msgstr ""
 
-#: js/config.php:39
+#: js/config.php:37
 msgid "Friday"
 msgstr ""
 
-#: js/config.php:40
+#: js/config.php:38
 msgid "Saturday"
 msgstr ""
 
-#: js/config.php:45
+#: js/config.php:43
 msgid "January"
 msgstr ""
 
-#: js/config.php:46
+#: js/config.php:44
 msgid "February"
 msgstr ""
 
-#: js/config.php:47
+#: js/config.php:45
 msgid "March"
 msgstr ""
 
-#: js/config.php:48
+#: js/config.php:46
 msgid "April"
 msgstr ""
 
-#: js/config.php:49
+#: js/config.php:47
 msgid "May"
 msgstr ""
 
-#: js/config.php:50
+#: js/config.php:48
 msgid "June"
 msgstr ""
 
-#: js/config.php:51
+#: js/config.php:49
 msgid "July"
 msgstr ""
 
-#: js/config.php:52
+#: js/config.php:50
 msgid "August"
 msgstr ""
 
-#: js/config.php:53
+#: js/config.php:51
 msgid "September"
 msgstr ""
 
-#: js/config.php:54
+#: js/config.php:52
 msgid "October"
 msgstr ""
 
-#: js/config.php:55
+#: js/config.php:53
 msgid "November"
 msgstr ""
 
-#: js/config.php:56
+#: js/config.php:54
 msgid "December"
 msgstr ""
 
-#: js/js.js:286
+#: js/js.js:289
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:718
+#: js/js.js:721
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:719
+#: js/js.js:722
 msgid "1 minute ago"
 msgstr ""
 
-#: js/js.js:720
+#: js/js.js:723
 msgid "{minutes} minutes ago"
 msgstr ""
 
-#: js/js.js:721
+#: js/js.js:724
 msgid "1 hour ago"
 msgstr ""
 
-#: js/js.js:722
+#: js/js.js:725
 msgid "{hours} hours ago"
 msgstr ""
 
-#: js/js.js:723
+#: js/js.js:726
 msgid "today"
 msgstr ""
 
-#: js/js.js:724
+#: js/js.js:727
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:725
+#: js/js.js:728
 msgid "{days} days ago"
 msgstr ""
 
-#: js/js.js:726
+#: js/js.js:729
 msgid "last month"
 msgstr ""
 
-#: js/js.js:727
+#: js/js.js:730
 msgid "{months} months ago"
 msgstr ""
 
-#: js/js.js:728
+#: js/js.js:731
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:729
+#: js/js.js:732
 msgid "last year"
 msgstr ""
 
-#: js/js.js:730
+#: js/js.js:733
 msgid "years ago"
 msgstr ""
 
@@ -225,8 +225,8 @@ msgstr ""
 #: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
 #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:577
-#: js/share.js:589
+#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:620
+#: js/share.js:632
 msgid "Error"
 msgstr ""
 
@@ -246,7 +246,7 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: js/share.js:125 js/share.js:617
+#: js/share.js:125 js/share.js:660
 msgid "Error while sharing"
 msgstr ""
 
@@ -266,99 +266,103 @@ msgstr ""
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:159
+#: js/share.js:172
 msgid "Share with"
 msgstr ""
 
-#: js/share.js:164
+#: js/share.js:177
 msgid "Share with link"
 msgstr ""
 
-#: js/share.js:167
+#: js/share.js:180
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:169 templates/installation.php:54 templates/login.php:26
+#: js/share.js:182 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr ""
 
-#: js/share.js:173
+#: js/share.js:187
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:191
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:174
+#: js/share.js:192
 msgid "Send"
 msgstr ""
 
-#: js/share.js:178
+#: js/share.js:197
 msgid "Set expiration date"
 msgstr ""
 
-#: js/share.js:179
+#: js/share.js:198
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:211
+#: js/share.js:230
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:213
+#: js/share.js:232
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:251
+#: js/share.js:270
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:287
+#: js/share.js:306
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:308
+#: js/share.js:327
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:320
+#: js/share.js:339
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:322
+#: js/share.js:341
 msgid "access control"
 msgstr ""
 
-#: js/share.js:325
+#: js/share.js:344
 msgid "create"
 msgstr ""
 
-#: js/share.js:328
+#: js/share.js:347
 msgid "update"
 msgstr ""
 
-#: js/share.js:331
+#: js/share.js:350
 msgid "delete"
 msgstr ""
 
-#: js/share.js:334
+#: js/share.js:353
 msgid "share"
 msgstr ""
 
-#: js/share.js:368 js/share.js:564
+#: js/share.js:387 js/share.js:607
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:577
+#: js/share.js:620
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:589
+#: js/share.js:632
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:604
+#: js/share.js:647
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:615
+#: js/share.js:658
 msgid "Email sent"
 msgstr ""
 
@@ -373,7 +377,7 @@ msgstr ""
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
-#: lostpassword/controller.php:58
+#: lostpassword/controller.php:60
 msgid "ownCloud password reset"
 msgstr ""
 
@@ -403,17 +407,17 @@ msgstr ""
 
 #: lostpassword/templates/lostpassword.php:22
 msgid ""
-"Your files seems to be encrypted. If you didn't have enabled the recovery "
-"key there will be no way to get your data back once the password was "
-"resetted. If you are not sure what to do, please contact your administrator "
-"first before continue. Do you really want to continue?"
+"Your files are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
 msgstr ""
 
 #: lostpassword/templates/lostpassword.php:24
 msgid "Yes, I really want to reset my password now"
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:29
+#: lostpassword/templates/lostpassword.php:27
 msgid "Request reset"
 msgstr ""
 
@@ -461,7 +465,7 @@ msgstr ""
 msgid "Cloud not found"
 msgstr ""
 
-#: templates/altmail.php:2
+#: templates/altmail.php:4
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -472,10 +476,6 @@ msgid ""
 "Cheers!"
 msgstr ""
 
-#: templates/altmail.php:7 templates/mail.php:24
-msgid "web services under your control"
-msgstr ""
-
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
 msgstr ""
@@ -568,12 +568,12 @@ msgstr ""
 msgid "Finish setup"
 msgstr "Завяршыць ўстаноўку."
 
-#: templates/layout.user.php:40
+#: templates/layout.user.php:43
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:67
+#: templates/layout.user.php:68
 msgid "Log out"
 msgstr ""
 
@@ -607,7 +607,7 @@ msgstr ""
 msgid "Alternative Logins"
 msgstr ""
 
-#: templates/mail.php:15
+#: templates/mail.php:16
 #, php-format
 msgid ""
 "Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
diff --git a/l10n/be/files.po b/l10n/be/files.po
index ac51487cf2343b528d7c9a1ede8d17ca25cc18e5..206fa61fc4eceb2c2d6fa3088e8f0e543c0900ee 100644
--- a/l10n/be/files.po
+++ b/l10n/be/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-25 02:01+0200\n"
-"PO-Revision-Date: 2013-05-24 13:26+0000\n"
+"POT-Creation-Date: 2013-07-04 09:30+0200\n"
+"PO-Revision-Date: 2013-07-04 07:31+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Belarusian (http://www.transifex.com/projects/p/owncloud/language/be/)\n"
 "MIME-Version: 1.0\n"
@@ -27,46 +27,54 @@ msgstr ""
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/upload.php:19
+#: ajax/upload.php:16 ajax/upload.php:39
+msgid "Unable to set upload directory."
+msgstr ""
+
+#: ajax/upload.php:23
+msgid "Invalid Token"
+msgstr ""
+
+#: ajax/upload.php:55
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: ajax/upload.php:26
+#: ajax/upload.php:62
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/upload.php:27
+#: ajax/upload.php:63
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:29
+#: ajax/upload.php:65
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/upload.php:30
+#: ajax/upload.php:66
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/upload.php:31
+#: ajax/upload.php:67
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/upload.php:32
+#: ajax/upload.php:68
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/upload.php:33
+#: ajax/upload.php:69
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:51
+#: ajax/upload.php:87
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:83
+#: ajax/upload.php:119
 msgid "Invalid directory."
 msgstr ""
 
@@ -74,6 +82,36 @@ msgstr ""
 msgid "Files"
 msgstr ""
 
+#: js/file-upload.js:11
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/file-upload.js:24
+msgid "Not enough space available"
+msgstr ""
+
+#: js/file-upload.js:64
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/file-upload.js:167 js/files.js:266
+msgid ""
+"File upload is in progress. Leaving the page now will cancel the upload."
+msgstr ""
+
+#: js/file-upload.js:233 js/files.js:339
+msgid "URL cannot be empty."
+msgstr ""
+
+#: js/file-upload.js:238 lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr ""
+
+#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
+#: js/files.js:693 js/files.js:731
+msgid "Error"
+msgstr ""
+
 #: js/fileactions.js:116
 msgid "Share"
 msgstr ""
@@ -90,43 +128,43 @@ msgstr ""
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:464
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:259
+#: js/filelist.js:302
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:306
+#: js/filelist.js:349
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:306
+#: js/filelist.js:349
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:331
+#: js/filelist.js:374
 msgid "perform delete operation"
 msgstr ""
 
-#: js/filelist.js:413
+#: js/filelist.js:456
 msgid "1 file uploading"
 msgstr ""
 
-#: js/filelist.js:416 js/filelist.js:470
+#: js/filelist.js:459 js/filelist.js:517
 msgid "files uploading"
 msgstr ""
 
@@ -158,69 +196,41 @@ msgid ""
 "big."
 msgstr ""
 
-#: js/files.js:264
-msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr ""
-
-#: js/files.js:277
-msgid "Not enough space available"
-msgstr ""
-
-#: js/files.js:317
-msgid "Upload cancelled."
-msgstr ""
-
-#: js/files.js:413
-msgid ""
-"File upload is in progress. Leaving the page now will cancel the upload."
-msgstr ""
-
-#: js/files.js:486
-msgid "URL cannot be empty."
-msgstr ""
-
-#: js/files.js:491
+#: js/files.js:344
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
-msgid "Error"
-msgstr ""
-
-#: js/files.js:877 templates/index.php:69
+#: js/files.js:744 templates/index.php:69
 msgid "Name"
 msgstr ""
 
-#: js/files.js:878 templates/index.php:80
+#: js/files.js:745 templates/index.php:80
 msgid "Size"
 msgstr ""
 
-#: js/files.js:879 templates/index.php:82
+#: js/files.js:746 templates/index.php:82
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:898
+#: js/files.js:765
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:900
+#: js/files.js:767
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:908
+#: js/files.js:775
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:910
+#: js/files.js:777
 msgid "{count} files"
 msgstr ""
 
-#: lib/app.php:53
-msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
-msgstr ""
-
 #: lib/app.php:73
-msgid "Unable to rename file"
+#, php-format
+msgid "%s could not be renamed"
 msgstr ""
 
 #: lib/helper.php:11 templates/index.php:18
@@ -317,6 +327,22 @@ msgstr ""
 msgid "Current scanning"
 msgstr ""
 
+#: templates/part.list.php:78
+msgid "directory"
+msgstr ""
+
+#: templates/part.list.php:80
+msgid "directories"
+msgstr ""
+
+#: templates/part.list.php:89
+msgid "file"
+msgstr ""
+
+#: templates/part.list.php:91
+msgid "files"
+msgstr ""
+
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
 msgstr ""
diff --git a/l10n/be/files_encryption.po b/l10n/be/files_encryption.po
index d541fea8c42f2c88797b5a51fd776d2286bfa49d..3fc7cf19381221f0b70f934e4421786d207217bd 100644
--- a/l10n/be/files_encryption.po
+++ b/l10n/be/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-14 02:46+0200\n"
-"PO-Revision-Date: 2013-06-14 00:47+0000\n"
+"POT-Creation-Date: 2013-07-05 02:12+0200\n"
+"PO-Revision-Date: 2013-07-05 00:13+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Belarusian (http://www.transifex.com/projects/p/owncloud/language/be/)\n"
 "MIME-Version: 1.0\n"
@@ -55,9 +55,21 @@ msgstr ""
 
 #: files/error.php:7
 msgid ""
-"Your private key is not valid! Maybe your password was changed from outside."
-" You can update your private key password in your personal settings to "
-"regain access to your files"
+"Your private key is not valid! Likely your password was changed outside the "
+"ownCloud system (e.g. your corporate directory). You can update your private"
+" key password in your personal settings to recover access to your encrypted "
+"files."
+msgstr ""
+
+#: hooks/hooks.php:44
+msgid "Missing requirements."
+msgstr ""
+
+#: hooks/hooks.php:45
+msgid ""
+"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL "
+"PHP extension is enabled and configured properly. For now, the encryption "
+"app has been disabled."
 msgstr ""
 
 #: js/settings-admin.js:11
@@ -84,11 +96,11 @@ msgstr ""
 
 #: templates/settings-admin.php:10
 msgid ""
-"Enable encryption passwords recovery key (allow sharing to recovery key):"
+"Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
 #: templates/settings-admin.php:14
-msgid "Recovery account password"
+msgid "Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:21 templates/settings-personal.php:54
@@ -100,15 +112,15 @@ msgid "Disabled"
 msgstr ""
 
 #: templates/settings-admin.php:34
-msgid "Change encryption passwords recovery key:"
+msgid "Change recovery key password:"
 msgstr ""
 
 #: templates/settings-admin.php:41
-msgid "Old Recovery account password"
+msgid "Old Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:48
-msgid "New Recovery account password"
+msgid "New Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:53
diff --git a/l10n/be/files_sharing.po b/l10n/be/files_sharing.po
index ffe52589b393cd3996506722519335f48a673dd3..43b93d5cffeddf956df984c3ebb1f496fa5fabc0 100644
--- a/l10n/be/files_sharing.po
+++ b/l10n/be/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-14 02:47+0200\n"
-"PO-Revision-Date: 2013-06-14 00:47+0000\n"
+"POT-Creation-Date: 2013-07-05 02:13+0200\n"
+"PO-Revision-Date: 2013-07-05 00:13+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Belarusian (http://www.transifex.com/projects/p/owncloud/language/be/)\n"
 "MIME-Version: 1.0\n"
@@ -18,27 +18,39 @@ msgstr ""
 "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: templates/authenticate.php:4
+msgid "The password is wrong. Try again."
+msgstr ""
+
+#: templates/authenticate.php:7
 msgid "Password"
 msgstr ""
 
-#: templates/authenticate.php:6
+#: templates/authenticate.php:9
 msgid "Submit"
 msgstr ""
 
-#: templates/public.php:10
+#: templates/public.php:17
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr ""
 
-#: templates/public.php:13
+#: templates/public.php:20
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr ""
 
-#: templates/public.php:19 templates/public.php:43
+#: templates/public.php:28 templates/public.php:86
 msgid "Download"
 msgstr ""
 
-#: templates/public.php:40
+#: templates/public.php:44
+msgid "Upload"
+msgstr ""
+
+#: templates/public.php:54
+msgid "Cancel upload"
+msgstr ""
+
+#: templates/public.php:83
 msgid "No preview available for"
 msgstr ""
diff --git a/l10n/be/lib.po b/l10n/be/lib.po
index 7fe412203cfb19325b84a3e31e9ebf1461921db1..4d50e77416a9faff675788fe493e9c1d5cae6740 100644
--- a/l10n/be/lib.po
+++ b/l10n/be/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-25 02:02+0200\n"
-"PO-Revision-Date: 2013-05-24 13:27+0000\n"
+"POT-Creation-Date: 2013-07-05 02:13+0200\n"
+"PO-Revision-Date: 2013-07-05 00:13+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Belarusian (http://www.transifex.com/projects/p/owncloud/language/be/)\n"
 "MIME-Version: 1.0\n"
@@ -17,47 +17,51 @@ msgstr ""
 "Language: be\n"
 "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: app.php:357
+#: app.php:360
 msgid "Help"
 msgstr ""
 
-#: app.php:370
+#: app.php:373
 msgid "Personal"
 msgstr ""
 
-#: app.php:381
+#: app.php:384
 msgid "Settings"
 msgstr ""
 
-#: app.php:393
+#: app.php:396
 msgid "Users"
 msgstr ""
 
-#: app.php:406
+#: app.php:409
 msgid "Apps"
 msgstr ""
 
-#: app.php:414
+#: app.php:417
 msgid "Admin"
 msgstr ""
 
-#: files.php:207
+#: defaults.php:33
+msgid "web services under your control"
+msgstr ""
+
+#: files.php:210
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: files.php:208
+#: files.php:211
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:209 files.php:242
+#: files.php:212 files.php:245
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:239
+#: files.php:242
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
-#: helper.php:228
+#: helper.php:236
 msgid "couldn't be determined"
 msgstr ""
 
@@ -85,104 +89,102 @@ msgstr ""
 msgid "Images"
 msgstr ""
 
-#: setup.php:34
-msgid "Set an admin username."
-msgstr ""
-
-#: setup.php:37
-msgid "Set an admin password."
-msgstr ""
-
-#: setup.php:55
+#: setup/abstractdatabase.php:22
 #, php-format
 msgid "%s enter the database username."
 msgstr ""
 
-#: setup.php:58
+#: setup/abstractdatabase.php:25
 #, php-format
 msgid "%s enter the database name."
 msgstr ""
 
-#: setup.php:61
+#: setup/abstractdatabase.php:28
 #, php-format
 msgid "%s you may not use dots in the database name"
 msgstr ""
 
-#: setup.php:64
+#: setup/mssql.php:20
 #, php-format
-msgid "%s set the database host."
-msgstr ""
-
-#: setup.php:132 setup.php:329 setup.php:374
-msgid "PostgreSQL username and/or password not valid"
+msgid "MS SQL username and/or password not valid: %s"
 msgstr ""
 
-#: setup.php:133 setup.php:238
+#: setup/mssql.php:21 setup/mysql.php:13 setup/oci.php:114
+#: setup/postgresql.php:24 setup/postgresql.php:70
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:155
-msgid "Oracle connection could not be established"
-msgstr ""
-
-#: setup.php:237
+#: setup/mysql.php:12
 msgid "MySQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
-#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
-#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
-#: setup.php:623
+#: setup/mysql.php:67 setup/oci.php:54 setup/oci.php:121 setup/oci.php:147
+#: setup/oci.php:154 setup/oci.php:165 setup/oci.php:172 setup/oci.php:181
+#: setup/oci.php:189 setup/oci.php:198 setup/oci.php:204
+#: setup/postgresql.php:89 setup/postgresql.php:98 setup/postgresql.php:115
+#: setup/postgresql.php:125 setup/postgresql.php:134
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr ""
 
-#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
-#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
-#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
+#: setup/mysql.php:68 setup/oci.php:55 setup/oci.php:122 setup/oci.php:148
+#: setup/oci.php:155 setup/oci.php:166 setup/oci.php:182 setup/oci.php:190
+#: setup/oci.php:199 setup/postgresql.php:90 setup/postgresql.php:99
+#: setup/postgresql.php:116 setup/postgresql.php:126 setup/postgresql.php:135
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:308
+#: setup/mysql.php:85
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:309
+#: setup/mysql.php:86
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:314
+#: setup/mysql.php:91
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:315
+#: setup/mysql.php:92
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:466 setup.php:533
+#: setup/oci.php:34
+msgid "Oracle connection could not be established"
+msgstr ""
+
+#: setup/oci.php:41 setup/oci.php:113
 msgid "Oracle username and/or password not valid"
 msgstr ""
 
-#: setup.php:592 setup.php:624
+#: setup/oci.php:173 setup/oci.php:205
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:644
-#, php-format
-msgid "MS SQL username and/or password not valid: %s"
+#: setup/postgresql.php:23 setup/postgresql.php:69
+msgid "PostgreSQL username and/or password not valid"
+msgstr ""
+
+#: setup.php:42
+msgid "Set an admin username."
+msgstr ""
+
+#: setup.php:45
+msgid "Set an admin password."
 msgstr ""
 
-#: setup.php:867
+#: setup.php:198
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:868
+#: setup.php:199
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
diff --git a/l10n/be/settings.po b/l10n/be/settings.po
index 3efffd109da35ee959d0f7ae0823c35a40844d8e..542805e0dc911cb088c572c52e991a853ee39dea 100644
--- a/l10n/be/settings.po
+++ b/l10n/be/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-11 01:57+0200\n"
-"PO-Revision-Date: 2013-06-10 23:57+0000\n"
+"POT-Creation-Date: 2013-07-09 02:04+0200\n"
+"PO-Revision-Date: 2013-07-09 00:04+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Belarusian (http://www.transifex.com/projects/p/owncloud/language/be/)\n"
 "MIME-Version: 1.0\n"
@@ -58,7 +58,7 @@ msgstr ""
 msgid "Unable to delete group"
 msgstr ""
 
-#: ajax/removeuser.php:24
+#: ajax/removeuser.php:25
 msgid "Unable to delete user"
 msgstr ""
 
@@ -88,35 +88,35 @@ msgstr ""
 msgid "Couldn't update app."
 msgstr ""
 
-#: js/apps.js:30
+#: js/apps.js:35
 msgid "Update to {appversion}"
 msgstr ""
 
-#: js/apps.js:36 js/apps.js:76
+#: js/apps.js:41 js/apps.js:81
 msgid "Disable"
 msgstr ""
 
-#: js/apps.js:36 js/apps.js:64 js/apps.js:83
+#: js/apps.js:41 js/apps.js:69 js/apps.js:88
 msgid "Enable"
 msgstr ""
 
-#: js/apps.js:55
+#: js/apps.js:60
 msgid "Please wait...."
 msgstr ""
 
-#: js/apps.js:59 js/apps.js:71 js/apps.js:80 js/apps.js:93
+#: js/apps.js:64 js/apps.js:76 js/apps.js:85 js/apps.js:98
 msgid "Error"
 msgstr ""
 
-#: js/apps.js:90
+#: js/apps.js:95
 msgid "Updating...."
 msgstr ""
 
-#: js/apps.js:93
+#: js/apps.js:98
 msgid "Error while updating app"
 msgstr ""
 
-#: js/apps.js:96
+#: js/apps.js:101
 msgid "Updated"
 msgstr ""
 
@@ -165,15 +165,15 @@ msgstr ""
 msgid "A valid password must be provided"
 msgstr ""
 
-#: personal.php:35 personal.php:36
+#: personal.php:37 personal.php:38
 msgid "__language_name__"
 msgstr ""
 
-#: templates/admin.php:15
+#: templates/admin.php:17
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:18
+#: templates/admin.php:20
 msgid ""
 "Your data directory and your files are probably accessible from the "
 "internet. The .htaccess file that ownCloud provides is not working. We "
@@ -182,36 +182,36 @@ msgid ""
 " webserver document root."
 msgstr ""
 
-#: templates/admin.php:29
+#: templates/admin.php:31
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:32
+#: templates/admin.php:34
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: templates/admin.php:33
+#: templates/admin.php:35
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:44
+#: templates/admin.php:46
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:47
+#: templates/admin.php:49
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr ""
 
-#: templates/admin.php:58
+#: templates/admin.php:60
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:63
+#: templates/admin.php:65
 #, php-format
 msgid ""
 "This ownCloud server can't set system locale to %s. This means that there "
@@ -219,11 +219,11 @@ msgid ""
 " to install the required packages on your system to support %s."
 msgstr ""
 
-#: templates/admin.php:75
+#: templates/admin.php:77
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:78
+#: templates/admin.php:80
 msgid ""
 "This ownCloud server has no working internet connection. This means that "
 "some of the features like mounting of external storage, notifications about "
@@ -233,102 +233,102 @@ msgid ""
 " of ownCloud."
 msgstr ""
 
-#: templates/admin.php:92
+#: templates/admin.php:94
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:101
+#: templates/admin.php:103
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:111
+#: templates/admin.php:113
 msgid ""
 "cron.php is registered at a webcron service. Call the cron.php page in the "
 "owncloud root once a minute over http."
 msgstr ""
 
-#: templates/admin.php:121
+#: templates/admin.php:123
 msgid ""
 "Use systems cron service. Call the cron.php file in the owncloud folder via "
 "a system cronjob once a minute."
 msgstr ""
 
-#: templates/admin.php:128
+#: templates/admin.php:130
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:134
+#: templates/admin.php:136
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:135
+#: templates/admin.php:137
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:142
+#: templates/admin.php:144
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:143
+#: templates/admin.php:145
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:150
+#: templates/admin.php:152
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:151
+#: templates/admin.php:153
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:158
+#: templates/admin.php:160
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:161
+#: templates/admin.php:163
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:168
+#: templates/admin.php:170
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:181
+#: templates/admin.php:183
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:182
+#: templates/admin.php:184
 msgid ""
 "Enforces the clients to connect to ownCloud via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:185
+#: templates/admin.php:187
 msgid ""
 "Please connect to this ownCloud instance via HTTPS to enable or disable the "
 "SSL enforcement."
 msgstr ""
 
-#: templates/admin.php:195
+#: templates/admin.php:197
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:196
+#: templates/admin.php:198
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:227
+#: templates/admin.php:229
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:228
+#: templates/admin.php:230
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:235 templates/personal.php:111
+#: templates/admin.php:236 templates/personal.php:116
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:237 templates/personal.php:114
+#: templates/admin.php:240 templates/personal.php:119
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -338,27 +338,27 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr ""
 
-#: templates/apps.php:11
+#: templates/apps.php:13
 msgid "Add your App"
 msgstr ""
 
-#: templates/apps.php:12
+#: templates/apps.php:28
 msgid "More Apps"
 msgstr ""
 
-#: templates/apps.php:28
+#: templates/apps.php:33
 msgid "Select an App"
 msgstr ""
 
-#: templates/apps.php:34
+#: templates/apps.php:39
 msgid "See application page at apps.owncloud.com"
 msgstr ""
 
-#: templates/apps.php:36
+#: templates/apps.php:41
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr ""
 
-#: templates/apps.php:38
+#: templates/apps.php:43
 msgid "Update"
 msgstr ""
 
@@ -386,76 +386,79 @@ msgstr ""
 msgid "Commercial Support"
 msgstr ""
 
-#: templates/personal.php:8
-#, php-format
-msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
-msgstr ""
-
-#: templates/personal.php:15
+#: templates/personal.php:10
 msgid "Get the apps to sync your files"
 msgstr ""
 
-#: templates/personal.php:26
+#: templates/personal.php:21
 msgid "Show First Run Wizard again"
 msgstr ""
 
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:29
+#, php-format
+msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
+msgstr ""
+
+#: templates/personal.php:41 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr ""
 
-#: templates/personal.php:38
+#: templates/personal.php:42
 msgid "Your password was changed"
 msgstr ""
 
-#: templates/personal.php:39
+#: templates/personal.php:43
 msgid "Unable to change your password"
 msgstr ""
 
-#: templates/personal.php:40
+#: templates/personal.php:44
 msgid "Current password"
 msgstr ""
 
-#: templates/personal.php:42
+#: templates/personal.php:46
 msgid "New password"
 msgstr ""
 
-#: templates/personal.php:44
+#: templates/personal.php:48
 msgid "Change password"
 msgstr ""
 
-#: templates/personal.php:56 templates/users.php:85
+#: templates/personal.php:60 templates/users.php:85
 msgid "Display Name"
 msgstr ""
 
-#: templates/personal.php:71
+#: templates/personal.php:75
 msgid "Email"
 msgstr ""
 
-#: templates/personal.php:73
+#: templates/personal.php:77
 msgid "Your email address"
 msgstr ""
 
-#: templates/personal.php:74
+#: templates/personal.php:78
 msgid "Fill in an email address to enable password recovery"
 msgstr ""
 
-#: templates/personal.php:83 templates/personal.php:84
+#: templates/personal.php:87 templates/personal.php:88
 msgid "Language"
 msgstr ""
 
-#: templates/personal.php:95
+#: templates/personal.php:100
 msgid "Help translate"
 msgstr ""
 
-#: templates/personal.php:100
+#: templates/personal.php:106
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:102
-msgid "Use this address to connect to your ownCloud in your file manager"
+#: templates/personal.php:108
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
+"target=\"_blank\">access your Files via WebDAV</a>"
 msgstr ""
 
-#: templates/users.php:21 templates/users.php:84
+#: templates/users.php:21
 msgid "Login Name"
 msgstr ""
 
@@ -485,6 +488,10 @@ msgstr ""
 msgid "Other"
 msgstr ""
 
+#: templates/users.php:84
+msgid "Username"
+msgstr ""
+
 #: templates/users.php:91
 msgid "Storage"
 msgstr ""
diff --git a/l10n/bg_BG/core.po b/l10n/bg_BG/core.po
index e8157d68d02391e64c4fc8531c04a0e126c6ee6f..7bc6a81b7f6a4a04aab118eafec128acf5088a33 100644
--- a/l10n/bg_BG/core.po
+++ b/l10n/bg_BG/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:22+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:14+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
 "MIME-Version: 1.0\n"
@@ -61,135 +61,135 @@ msgstr "Няма избрани категории за изтриване"
 msgid "Error removing %s from favorites."
 msgstr ""
 
-#: js/config.php:34
+#: js/config.php:32
 msgid "Sunday"
 msgstr "Неделя"
 
-#: js/config.php:35
+#: js/config.php:33
 msgid "Monday"
 msgstr "Понеделник"
 
-#: js/config.php:36
+#: js/config.php:34
 msgid "Tuesday"
 msgstr "Вторник"
 
-#: js/config.php:37
+#: js/config.php:35
 msgid "Wednesday"
 msgstr "Сряда"
 
-#: js/config.php:38
+#: js/config.php:36
 msgid "Thursday"
 msgstr "Четвъртък"
 
-#: js/config.php:39
+#: js/config.php:37
 msgid "Friday"
 msgstr "Петък"
 
-#: js/config.php:40
+#: js/config.php:38
 msgid "Saturday"
 msgstr "Събота"
 
-#: js/config.php:45
+#: js/config.php:43
 msgid "January"
 msgstr "Януари"
 
-#: js/config.php:46
+#: js/config.php:44
 msgid "February"
 msgstr "Февруари"
 
-#: js/config.php:47
+#: js/config.php:45
 msgid "March"
 msgstr "Март"
 
-#: js/config.php:48
+#: js/config.php:46
 msgid "April"
 msgstr "Април"
 
-#: js/config.php:49
+#: js/config.php:47
 msgid "May"
 msgstr "Май"
 
-#: js/config.php:50
+#: js/config.php:48
 msgid "June"
 msgstr "Юни"
 
-#: js/config.php:51
+#: js/config.php:49
 msgid "July"
 msgstr "Юли"
 
-#: js/config.php:52
+#: js/config.php:50
 msgid "August"
 msgstr "Август"
 
-#: js/config.php:53
+#: js/config.php:51
 msgid "September"
 msgstr "Септември"
 
-#: js/config.php:54
+#: js/config.php:52
 msgid "October"
 msgstr "Октомври"
 
-#: js/config.php:55
+#: js/config.php:53
 msgid "November"
 msgstr "Ноември"
 
-#: js/config.php:56
+#: js/config.php:54
 msgid "December"
 msgstr "Декември"
 
-#: js/js.js:286
+#: js/js.js:293
 msgid "Settings"
 msgstr "Настройки"
 
-#: js/js.js:718
+#: js/js.js:725
 msgid "seconds ago"
 msgstr "преди секунди"
 
-#: js/js.js:719
+#: js/js.js:726
 msgid "1 minute ago"
 msgstr "преди 1 минута"
 
-#: js/js.js:720
+#: js/js.js:727
 msgid "{minutes} minutes ago"
 msgstr ""
 
-#: js/js.js:721
+#: js/js.js:728
 msgid "1 hour ago"
 msgstr "преди 1 час"
 
-#: js/js.js:722
+#: js/js.js:729
 msgid "{hours} hours ago"
 msgstr ""
 
-#: js/js.js:723
+#: js/js.js:730
 msgid "today"
 msgstr "днес"
 
-#: js/js.js:724
+#: js/js.js:731
 msgid "yesterday"
 msgstr "вчера"
 
-#: js/js.js:725
+#: js/js.js:732
 msgid "{days} days ago"
 msgstr ""
 
-#: js/js.js:726
+#: js/js.js:733
 msgid "last month"
 msgstr "последният месец"
 
-#: js/js.js:727
+#: js/js.js:734
 msgid "{months} months ago"
 msgstr ""
 
-#: js/js.js:728
+#: js/js.js:735
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:729
+#: js/js.js:736
 msgid "last year"
 msgstr "последната година"
 
-#: js/js.js:730
+#: js/js.js:737
 msgid "years ago"
 msgstr "последните години"
 
@@ -225,8 +225,8 @@ msgstr ""
 #: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
 #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:577
-#: js/share.js:589
+#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:620
+#: js/share.js:632
 msgid "Error"
 msgstr "Грешка"
 
@@ -246,7 +246,7 @@ msgstr ""
 msgid "Share"
 msgstr "Споделяне"
 
-#: js/share.js:125 js/share.js:617
+#: js/share.js:125 js/share.js:660
 msgid "Error while sharing"
 msgstr ""
 
@@ -266,99 +266,103 @@ msgstr ""
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:159
+#: js/share.js:172
 msgid "Share with"
 msgstr "Споделено с"
 
-#: js/share.js:164
+#: js/share.js:177
 msgid "Share with link"
 msgstr ""
 
-#: js/share.js:167
+#: js/share.js:180
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:169 templates/installation.php:54 templates/login.php:26
+#: js/share.js:182 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "Парола"
 
-#: js/share.js:173
+#: js/share.js:187
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:191
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:174
+#: js/share.js:192
 msgid "Send"
 msgstr ""
 
-#: js/share.js:178
+#: js/share.js:197
 msgid "Set expiration date"
 msgstr ""
 
-#: js/share.js:179
+#: js/share.js:198
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:211
+#: js/share.js:230
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:213
+#: js/share.js:232
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:251
+#: js/share.js:270
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:287
+#: js/share.js:306
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:308
+#: js/share.js:327
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:320
+#: js/share.js:339
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:322
+#: js/share.js:341
 msgid "access control"
 msgstr ""
 
-#: js/share.js:325
+#: js/share.js:344
 msgid "create"
 msgstr "създаване"
 
-#: js/share.js:328
+#: js/share.js:347
 msgid "update"
 msgstr ""
 
-#: js/share.js:331
+#: js/share.js:350
 msgid "delete"
 msgstr ""
 
-#: js/share.js:334
+#: js/share.js:353
 msgid "share"
 msgstr ""
 
-#: js/share.js:368 js/share.js:564
+#: js/share.js:387 js/share.js:607
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:577
+#: js/share.js:620
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:589
+#: js/share.js:632
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:604
+#: js/share.js:647
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:615
+#: js/share.js:658
 msgid "Email sent"
 msgstr ""
 
@@ -373,7 +377,7 @@ msgstr ""
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
-#: lostpassword/controller.php:58
+#: lostpassword/controller.php:60
 msgid "ownCloud password reset"
 msgstr ""
 
@@ -403,17 +407,17 @@ msgstr "Потребител"
 
 #: lostpassword/templates/lostpassword.php:22
 msgid ""
-"Your files seems to be encrypted. If you didn't have enabled the recovery "
-"key there will be no way to get your data back once the password was "
-"resetted. If you are not sure what to do, please contact your administrator "
-"first before continue. Do you really want to continue?"
+"Your files are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
 msgstr ""
 
 #: lostpassword/templates/lostpassword.php:24
 msgid "Yes, I really want to reset my password now"
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:29
+#: lostpassword/templates/lostpassword.php:27
 msgid "Request reset"
 msgstr "Нулиране на заявка"
 
@@ -461,7 +465,7 @@ msgstr "Достъпът е забранен"
 msgid "Cloud not found"
 msgstr "облакът не намерен"
 
-#: templates/altmail.php:2
+#: templates/altmail.php:4
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -472,10 +476,6 @@ msgid ""
 "Cheers!"
 msgstr ""
 
-#: templates/altmail.php:7 templates/mail.php:24
-msgid "web services under your control"
-msgstr "уеб услуги под Ваш контрол"
-
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
 msgstr "Редактиране на категориите"
@@ -568,12 +568,12 @@ msgstr "Хост за базата"
 msgid "Finish setup"
 msgstr "Завършване на настройките"
 
-#: templates/layout.user.php:40
+#: templates/layout.user.php:43
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:67
+#: templates/layout.user.php:68
 msgid "Log out"
 msgstr "Изход"
 
@@ -607,7 +607,7 @@ msgstr "Вход"
 msgid "Alternative Logins"
 msgstr ""
 
-#: templates/mail.php:15
+#: templates/mail.php:16
 #, php-format
 msgid ""
 "Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
diff --git a/l10n/bg_BG/files.po b/l10n/bg_BG/files.po
index 77588b9856dc565517f93a4e2b45612d13e896a7..c9cbcab6a693cb9e5cc2c19bcd1c207eb7d0bdd1 100644
--- a/l10n/bg_BG/files.po
+++ b/l10n/bg_BG/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:01+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
 "MIME-Version: 1.0\n"
@@ -27,46 +27,54 @@ msgstr ""
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/upload.php:19
+#: ajax/upload.php:16 ajax/upload.php:45
+msgid "Unable to set upload directory."
+msgstr ""
+
+#: ajax/upload.php:22
+msgid "Invalid Token"
+msgstr ""
+
+#: ajax/upload.php:59
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: ajax/upload.php:26
+#: ajax/upload.php:66
 msgid "There is no error, the file uploaded with success"
 msgstr "Файлът е качен успешно"
 
-#: ajax/upload.php:27
+#: ajax/upload.php:67
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:29
+#: ajax/upload.php:69
 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:30
+#: ajax/upload.php:70
 msgid "The uploaded file was only partially uploaded"
 msgstr "Файлът е качен частично"
 
-#: ajax/upload.php:31
+#: ajax/upload.php:71
 msgid "No file was uploaded"
 msgstr "Фахлът не бе качен"
 
-#: ajax/upload.php:32
+#: ajax/upload.php:72
 msgid "Missing a temporary folder"
 msgstr "Липсва временна папка"
 
-#: ajax/upload.php:33
+#: ajax/upload.php:73
 msgid "Failed to write to disk"
 msgstr "Възникна проблем при запис в диска"
 
-#: ajax/upload.php:51
+#: ajax/upload.php:91
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:83
+#: ajax/upload.php:123
 msgid "Invalid directory."
 msgstr "Невалидна директория."
 
@@ -74,6 +82,36 @@ msgstr "Невалидна директория."
 msgid "Files"
 msgstr "Файлове"
 
+#: js/file-upload.js:11
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/file-upload.js:24
+msgid "Not enough space available"
+msgstr ""
+
+#: js/file-upload.js:64
+msgid "Upload cancelled."
+msgstr "Качването е спряно."
+
+#: js/file-upload.js:167 js/files.js:266
+msgid ""
+"File upload is in progress. Leaving the page now will cancel the upload."
+msgstr ""
+
+#: js/file-upload.js:233 js/files.js:339
+msgid "URL cannot be empty."
+msgstr ""
+
+#: js/file-upload.js:238 lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr ""
+
+#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
+#: js/files.js:693 js/files.js:731
+msgid "Error"
+msgstr "Грешка"
+
 #: js/fileactions.js:116
 msgid "Share"
 msgstr "Споделяне"
@@ -90,43 +128,43 @@ msgstr "Изтриване"
 msgid "Rename"
 msgstr "Преименуване"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:464
 msgid "Pending"
 msgstr "Чакащо"
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "replace"
 msgstr "препокриване"
 
-#: js/filelist.js:259
+#: js/filelist.js:302
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "cancel"
 msgstr "отказ"
 
-#: js/filelist.js:306
+#: js/filelist.js:349
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:306
+#: js/filelist.js:349
 msgid "undo"
 msgstr "възтановяване"
 
-#: js/filelist.js:331
+#: js/filelist.js:374
 msgid "perform delete operation"
 msgstr ""
 
-#: js/filelist.js:413
+#: js/filelist.js:456
 msgid "1 file uploading"
 msgstr ""
 
-#: js/filelist.js:416 js/filelist.js:470
+#: js/filelist.js:459 js/filelist.js:517
 msgid "files uploading"
 msgstr ""
 
@@ -158,69 +196,41 @@ msgid ""
 "big."
 msgstr ""
 
-#: js/files.js:264
-msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr ""
-
-#: js/files.js:277
-msgid "Not enough space available"
-msgstr ""
-
-#: js/files.js:317
-msgid "Upload cancelled."
-msgstr "Качването е спряно."
-
-#: js/files.js:413
-msgid ""
-"File upload is in progress. Leaving the page now will cancel the upload."
-msgstr ""
-
-#: js/files.js:486
-msgid "URL cannot be empty."
-msgstr ""
-
-#: js/files.js:491
+#: js/files.js:344
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
-msgid "Error"
-msgstr "Грешка"
-
-#: js/files.js:877 templates/index.php:69
+#: js/files.js:744 templates/index.php:69
 msgid "Name"
 msgstr "Име"
 
-#: js/files.js:878 templates/index.php:80
+#: js/files.js:745 templates/index.php:80
 msgid "Size"
 msgstr "Размер"
 
-#: js/files.js:879 templates/index.php:82
+#: js/files.js:746 templates/index.php:82
 msgid "Modified"
 msgstr "Променено"
 
-#: js/files.js:898
+#: js/files.js:765
 msgid "1 folder"
 msgstr "1 папка"
 
-#: js/files.js:900
+#: js/files.js:767
 msgid "{count} folders"
 msgstr "{count} папки"
 
-#: js/files.js:908
+#: js/files.js:775
 msgid "1 file"
 msgstr "1 файл"
 
-#: js/files.js:910
+#: js/files.js:777
 msgid "{count} files"
 msgstr "{count} файла"
 
-#: lib/app.php:53
-msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
-msgstr ""
-
 #: lib/app.php:73
-msgid "Unable to rename file"
+#, php-format
+msgid "%s could not be renamed"
 msgstr ""
 
 #: lib/helper.php:11 templates/index.php:18
@@ -317,6 +327,22 @@ msgstr "Файловете се претърсват, изчакайте."
 msgid "Current scanning"
 msgstr ""
 
+#: templates/part.list.php:76
+msgid "directory"
+msgstr ""
+
+#: templates/part.list.php:78
+msgid "directories"
+msgstr ""
+
+#: templates/part.list.php:87
+msgid "file"
+msgstr "файл"
+
+#: templates/part.list.php:89
+msgid "files"
+msgstr ""
+
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
 msgstr ""
diff --git a/l10n/bg_BG/files_encryption.po b/l10n/bg_BG/files_encryption.po
index 4eef028826359d9b0c74cd8a562bfaacade8526a..6fda53b831ba4e7bf984c1e1b6ffe38f0ce02f0e 100644
--- a/l10n/bg_BG/files_encryption.po
+++ b/l10n/bg_BG/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-14 02:46+0200\n"
-"PO-Revision-Date: 2013-06-14 00:47+0000\n"
+"POT-Creation-Date: 2013-07-05 02:12+0200\n"
+"PO-Revision-Date: 2013-07-05 00:13+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"
@@ -55,9 +55,21 @@ msgstr ""
 
 #: files/error.php:7
 msgid ""
-"Your private key is not valid! Maybe your password was changed from outside."
-" You can update your private key password in your personal settings to "
-"regain access to your files"
+"Your private key is not valid! Likely your password was changed outside the "
+"ownCloud system (e.g. your corporate directory). You can update your private"
+" key password in your personal settings to recover access to your encrypted "
+"files."
+msgstr ""
+
+#: hooks/hooks.php:44
+msgid "Missing requirements."
+msgstr ""
+
+#: hooks/hooks.php:45
+msgid ""
+"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL "
+"PHP extension is enabled and configured properly. For now, the encryption "
+"app has been disabled."
 msgstr ""
 
 #: js/settings-admin.js:11
@@ -84,11 +96,11 @@ msgstr "Криптиране"
 
 #: templates/settings-admin.php:10
 msgid ""
-"Enable encryption passwords recovery key (allow sharing to recovery key):"
+"Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
 #: templates/settings-admin.php:14
-msgid "Recovery account password"
+msgid "Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:21 templates/settings-personal.php:54
@@ -100,15 +112,15 @@ msgid "Disabled"
 msgstr ""
 
 #: templates/settings-admin.php:34
-msgid "Change encryption passwords recovery key:"
+msgid "Change recovery key password:"
 msgstr ""
 
 #: templates/settings-admin.php:41
-msgid "Old Recovery account password"
+msgid "Old Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:48
-msgid "New Recovery account password"
+msgid "New Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:53
diff --git a/l10n/bg_BG/files_external.po b/l10n/bg_BG/files_external.po
index c2f7261ee6b1a29b60b139e12fab76e2bf332c61..cb9a256b80514b6345ee21353f20e3d631d41630 100644
--- a/l10n/bg_BG/files_external.po
+++ b/l10n/bg_BG/files_external.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/bg_BG/files_sharing.po b/l10n/bg_BG/files_sharing.po
index bc8c52dbefd07bca7da2c4a8c8add352b8508dbf..5ac6498baec1d23faf516efdec7075ab78a249ad 100644
--- a/l10n/bg_BG/files_sharing.po
+++ b/l10n/bg_BG/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
 "MIME-Version: 1.0\n"
@@ -18,27 +18,39 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: templates/authenticate.php:4
+msgid "The password is wrong. Try again."
+msgstr ""
+
+#: templates/authenticate.php:7
 msgid "Password"
 msgstr "Парола"
 
-#: templates/authenticate.php:6
+#: templates/authenticate.php:9
 msgid "Submit"
 msgstr "Потвърждение"
 
-#: templates/public.php:10
+#: templates/public.php:17
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s сподели папката %s с Вас"
 
-#: templates/public.php:13
+#: templates/public.php:20
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s сподели файла %s с Вас"
 
-#: templates/public.php:19 templates/public.php:43
+#: templates/public.php:28 templates/public.php:90
 msgid "Download"
 msgstr "Изтегляне"
 
-#: templates/public.php:40
+#: templates/public.php:45 templates/public.php:48
+msgid "Upload"
+msgstr "Качване"
+
+#: templates/public.php:58
+msgid "Cancel upload"
+msgstr "Спри качването"
+
+#: templates/public.php:87
 msgid "No preview available for"
 msgstr "Няма наличен преглед за"
diff --git a/l10n/bg_BG/files_trashbin.po b/l10n/bg_BG/files_trashbin.po
index 5e0d5e9430493fcb9e6fc4e7a21110b42eb484ea..cbe705067bdfbae305185fd13dfa3dd23f33bd1d 100644
--- a/l10n/bg_BG/files_trashbin.po
+++ b/l10n/bg_BG/files_trashbin.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:16+0000\n"
 "Last-Translator: Димитър Кръстев <dimitar.t.krastev@gmail.com>\n"
 "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/bg_BG/lib.po b/l10n/bg_BG/lib.po
index d2410451f83ee3b8a3c58bd485c78bccc7e6058c..de277a327770faa815cf2fd9b9518537e0446edd 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-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
-"Last-Translator: Димитър Кръстев <dimitar.t.krastev@gmail.com>\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,43 +18,47 @@ msgstr ""
 "Language: bg_BG\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:359
+#: app.php:360
 msgid "Help"
 msgstr "Помощ"
 
-#: app.php:372
+#: app.php:373
 msgid "Personal"
 msgstr "Лични"
 
-#: app.php:383
+#: app.php:384
 msgid "Settings"
 msgstr "Настройки"
 
-#: app.php:395
+#: app.php:396
 msgid "Users"
 msgstr "Потребители"
 
-#: app.php:408
+#: app.php:409
 msgid "Apps"
 msgstr "Приложения"
 
-#: app.php:416
+#: app.php:417
 msgid "Admin"
 msgstr "Админ"
 
-#: files.php:210
+#: defaults.php:33
+msgid "web services under your control"
+msgstr "уеб услуги под Ваш контрол"
+
+#: files.php:226
 msgid "ZIP download is turned off."
 msgstr "Изтеглянето като ZIP е изключено."
 
-#: files.php:211
+#: files.php:227
 msgid "Files need to be downloaded one by one."
 msgstr "Файловете трябва да се изтеглят един по един."
 
-#: files.php:212 files.php:245
+#: files.php:228 files.php:261
 msgid "Back to Files"
 msgstr "Назад към файловете"
 
-#: files.php:242
+#: files.php:258
 msgid "Selected files too large to generate zip file."
 msgstr "Избраните файлове са прекалено големи за генерирането на ZIP архив."
 
@@ -86,104 +90,102 @@ msgstr "Текст"
 msgid "Images"
 msgstr "Снимки"
 
-#: setup.php:34
-msgid "Set an admin username."
-msgstr "Въведете потребителско име за администратор."
-
-#: setup.php:37
-msgid "Set an admin password."
-msgstr "Въведете парола за администратор."
-
-#: setup.php:55
+#: setup/abstractdatabase.php:22
 #, php-format
 msgid "%s enter the database username."
 msgstr "%s въведете потребителско име за базата с данни."
 
-#: setup.php:58
+#: setup/abstractdatabase.php:25
 #, php-format
 msgid "%s enter the database name."
 msgstr "%s въведете име на базата с данни."
 
-#: setup.php:61
+#: setup/abstractdatabase.php:28
 #, php-format
 msgid "%s you may not use dots in the database name"
 msgstr "%s, не можете да ползвате точки в името на базата от данни"
 
-#: setup.php:64
+#: setup/mssql.php:20
 #, php-format
-msgid "%s set the database host."
-msgstr "%s задай хост на базата данни."
-
-#: setup.php:126 setup.php:332 setup.php:377
-msgid "PostgreSQL username and/or password not valid"
-msgstr "Невалидно PostgreSQL потребителско име и/или парола"
+msgid "MS SQL username and/or password not valid: %s"
+msgstr "Невалидно MS SQL потребителско име и/или парола: %s"
 
-#: setup.php:127 setup.php:235
+#: setup/mssql.php:21 setup/mysql.php:13 setup/oci.php:114
+#: setup/postgresql.php:24 setup/postgresql.php:70
 msgid "You need to enter either an existing account or the administrator."
 msgstr "Необходимо е да влезете в всъществуващ акаунт или като администратора"
 
-#: setup.php:152
-msgid "Oracle connection could not be established"
-msgstr "Oracle връзка не можа да се осъществи"
-
-#: setup.php:234
+#: setup/mysql.php:12
 msgid "MySQL username and/or password not valid"
 msgstr "Невалидно MySQL потребителско име и/или парола"
 
-#: setup.php:288 setup.php:398 setup.php:407 setup.php:425 setup.php:435
-#: setup.php:444 setup.php:477 setup.php:543 setup.php:569 setup.php:576
-#: setup.php:587 setup.php:594 setup.php:603 setup.php:611 setup.php:620
-#: setup.php:626
+#: setup/mysql.php:67 setup/oci.php:54 setup/oci.php:121 setup/oci.php:147
+#: setup/oci.php:154 setup/oci.php:165 setup/oci.php:172 setup/oci.php:181
+#: setup/oci.php:189 setup/oci.php:198 setup/oci.php:204
+#: setup/postgresql.php:89 setup/postgresql.php:98 setup/postgresql.php:115
+#: setup/postgresql.php:125 setup/postgresql.php:134
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr "Грешка в базата от данни: \"%s\""
 
-#: setup.php:289 setup.php:399 setup.php:408 setup.php:426 setup.php:436
-#: setup.php:445 setup.php:478 setup.php:544 setup.php:570 setup.php:577
-#: setup.php:588 setup.php:604 setup.php:612 setup.php:621
+#: setup/mysql.php:68 setup/oci.php:55 setup/oci.php:122 setup/oci.php:148
+#: setup/oci.php:155 setup/oci.php:166 setup/oci.php:182 setup/oci.php:190
+#: setup/oci.php:199 setup/postgresql.php:90 setup/postgresql.php:99
+#: setup/postgresql.php:116 setup/postgresql.php:126 setup/postgresql.php:135
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr "Проблемната команда беше: \"%s\""
 
-#: setup.php:305
+#: setup/mysql.php:85
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr "MySQL потребителят '%s'@'localhost' вече съществува"
 
-#: setup.php:306
+#: setup/mysql.php:86
 msgid "Drop this user from MySQL"
 msgstr "Изтриване на потребителя от MySQL"
 
-#: setup.php:311
+#: setup/mysql.php:91
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr "MySQL потребителят  '%s'@'%%' вече съществува."
 
-#: setup.php:312
+#: setup/mysql.php:92
 msgid "Drop this user from MySQL."
 msgstr "Изтриване на потребителя от MySQL."
 
-#: setup.php:469 setup.php:536
+#: setup/oci.php:34
+msgid "Oracle connection could not be established"
+msgstr "Oracle връзка не можа да се осъществи"
+
+#: setup/oci.php:41 setup/oci.php:113
 msgid "Oracle username and/or password not valid"
 msgstr "Невалидно Oracle потребителско име и/или парола"
 
-#: setup.php:595 setup.php:627
+#: setup/oci.php:173 setup/oci.php:205
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr "Проблемната команда беше: \"%s\", име: %s, парола: %s"
 
-#: setup.php:647
-#, php-format
-msgid "MS SQL username and/or password not valid: %s"
-msgstr "Невалидно MS SQL потребителско име и/или парола: %s"
+#: setup/postgresql.php:23 setup/postgresql.php:69
+msgid "PostgreSQL username and/or password not valid"
+msgstr "Невалидно PostgreSQL потребителско име и/или парола"
+
+#: setup.php:42
+msgid "Set an admin username."
+msgstr "Въведете потребителско име за администратор."
+
+#: setup.php:45
+msgid "Set an admin password."
+msgstr "Въведете парола за администратор."
 
-#: setup.php:870
+#: setup.php:198
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Вашият web сървър все още не е удачно настроен да позволява синхронизация на файлове, защото WebDAV интерфейсът изглежда не работи."
 
-#: setup.php:871
+#: setup.php:199
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Моля направете повторна справка с <a href='%s'>ръководството за инсталиране</a>."
diff --git a/l10n/bg_BG/settings.po b/l10n/bg_BG/settings.po
index ea1915953a55e1e69caa55c1777a796fb39de0aa..d1f563a7a6879b01f386eb4e278f12d8e8dc35ad 100644
--- a/l10n/bg_BG/settings.po
+++ b/l10n/bg_BG/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
 "MIME-Version: 1.0\n"
@@ -88,35 +88,35 @@ msgstr ""
 msgid "Couldn't update app."
 msgstr ""
 
-#: js/apps.js:30
+#: js/apps.js:35
 msgid "Update to {appversion}"
 msgstr "Обновяване до {appversion}"
 
-#: js/apps.js:36 js/apps.js:76
+#: js/apps.js:41 js/apps.js:81
 msgid "Disable"
 msgstr "Изключено"
 
-#: js/apps.js:36 js/apps.js:64 js/apps.js:83
+#: js/apps.js:41 js/apps.js:69 js/apps.js:88
 msgid "Enable"
 msgstr "Включено"
 
-#: js/apps.js:55
+#: js/apps.js:60
 msgid "Please wait...."
 msgstr "Моля почакайте...."
 
-#: js/apps.js:59 js/apps.js:71 js/apps.js:80 js/apps.js:93
+#: js/apps.js:64 js/apps.js:76 js/apps.js:85 js/apps.js:98
 msgid "Error"
 msgstr "Грешка"
 
-#: js/apps.js:90
+#: js/apps.js:95
 msgid "Updating...."
 msgstr "Обновява се..."
 
-#: js/apps.js:93
+#: js/apps.js:98
 msgid "Error while updating app"
 msgstr ""
 
-#: js/apps.js:96
+#: js/apps.js:101
 msgid "Updated"
 msgstr "Обновено"
 
@@ -165,15 +165,15 @@ msgstr ""
 msgid "A valid password must be provided"
 msgstr ""
 
-#: personal.php:35 personal.php:36
+#: personal.php:37 personal.php:38
 msgid "__language_name__"
 msgstr "__language_name__"
 
-#: templates/admin.php:15
+#: templates/admin.php:17
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:18
+#: templates/admin.php:20
 msgid ""
 "Your data directory and your files are probably accessible from the "
 "internet. The .htaccess file that ownCloud provides is not working. We "
@@ -182,36 +182,36 @@ msgid ""
 " webserver document root."
 msgstr ""
 
-#: templates/admin.php:29
+#: templates/admin.php:31
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:32
+#: templates/admin.php:34
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Вашият web сървър все още не е удачно настроен да позволява синхронизация на файлове, защото WebDAV интерфейсът изглежда не работи."
 
-#: templates/admin.php:33
+#: templates/admin.php:35
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Моля направете повторна справка с <a href='%s'>ръководството за инсталиране</a>."
 
-#: templates/admin.php:44
+#: templates/admin.php:46
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:47
+#: templates/admin.php:49
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr ""
 
-#: templates/admin.php:58
+#: templates/admin.php:60
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:63
+#: templates/admin.php:65
 #, php-format
 msgid ""
 "This ownCloud server can't set system locale to %s. This means that there "
@@ -219,11 +219,11 @@ msgid ""
 " to install the required packages on your system to support %s."
 msgstr ""
 
-#: templates/admin.php:75
+#: templates/admin.php:77
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:78
+#: templates/admin.php:80
 msgid ""
 "This ownCloud server has no working internet connection. This means that "
 "some of the features like mounting of external storage, notifications about "
@@ -233,102 +233,102 @@ msgid ""
 " of ownCloud."
 msgstr ""
 
-#: templates/admin.php:92
+#: templates/admin.php:94
 msgid "Cron"
 msgstr "Крон"
 
-#: templates/admin.php:101
+#: templates/admin.php:103
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:111
+#: templates/admin.php:113
 msgid ""
 "cron.php is registered at a webcron service. Call the cron.php page in the "
 "owncloud root once a minute over http."
 msgstr ""
 
-#: templates/admin.php:121
+#: templates/admin.php:123
 msgid ""
 "Use systems cron service. Call the cron.php file in the owncloud folder via "
 "a system cronjob once a minute."
 msgstr ""
 
-#: templates/admin.php:128
+#: templates/admin.php:130
 msgid "Sharing"
 msgstr "Споделяне"
 
-#: templates/admin.php:134
+#: templates/admin.php:136
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:135
+#: templates/admin.php:137
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:142
+#: templates/admin.php:144
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:143
+#: templates/admin.php:145
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:150
+#: templates/admin.php:152
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:151
+#: templates/admin.php:153
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:158
+#: templates/admin.php:160
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:161
+#: templates/admin.php:163
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:168
+#: templates/admin.php:170
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:181
+#: templates/admin.php:183
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:182
+#: templates/admin.php:184
 msgid ""
 "Enforces the clients to connect to ownCloud via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:185
+#: templates/admin.php:187
 msgid ""
 "Please connect to this ownCloud instance via HTTPS to enable or disable the "
 "SSL enforcement."
 msgstr ""
 
-#: templates/admin.php:195
+#: templates/admin.php:197
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:196
+#: templates/admin.php:198
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:227
+#: templates/admin.php:229
 msgid "More"
 msgstr "Още"
 
-#: templates/admin.php:228
+#: templates/admin.php:230
 msgid "Less"
 msgstr "По-малко"
 
-#: templates/admin.php:235 templates/personal.php:116
+#: templates/admin.php:236 templates/personal.php:116
 msgid "Version"
 msgstr "Версия"
 
-#: templates/admin.php:237 templates/personal.php:119
+#: templates/admin.php:240 templates/personal.php:119
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -386,76 +386,79 @@ msgstr "Докладвани грешки"
 msgid "Commercial Support"
 msgstr "Платена поддръжка"
 
-#: templates/personal.php:9
+#: templates/personal.php:10
 msgid "Get the apps to sync your files"
 msgstr ""
 
-#: templates/personal.php:20
+#: templates/personal.php:21
 msgid "Show First Run Wizard again"
 msgstr "Покажи настройките за първоначално зареждане отново"
 
-#: templates/personal.php:28
+#: templates/personal.php:29
 #, php-format
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr ""
 
-#: templates/personal.php:40 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:41 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "Парола"
 
-#: templates/personal.php:41
+#: templates/personal.php:42
 msgid "Your password was changed"
 msgstr ""
 
-#: templates/personal.php:42
+#: templates/personal.php:43
 msgid "Unable to change your password"
 msgstr "Промяната на паролата не беше извършена"
 
-#: templates/personal.php:43
+#: templates/personal.php:44
 msgid "Current password"
 msgstr "Текуща парола"
 
-#: templates/personal.php:45
+#: templates/personal.php:46
 msgid "New password"
 msgstr "Нова парола"
 
-#: templates/personal.php:47
+#: templates/personal.php:48
 msgid "Change password"
 msgstr "Промяна на паролата"
 
-#: templates/personal.php:59 templates/users.php:85
+#: templates/personal.php:60 templates/users.php:85
 msgid "Display Name"
 msgstr "Екранно име"
 
-#: templates/personal.php:74
+#: templates/personal.php:75
 msgid "Email"
 msgstr "E-mail"
 
-#: templates/personal.php:76
+#: templates/personal.php:77
 msgid "Your email address"
 msgstr "Вашия email адрес"
 
-#: templates/personal.php:77
+#: templates/personal.php:78
 msgid "Fill in an email address to enable password recovery"
 msgstr "Въведете е-поща за възстановяване на паролата"
 
-#: templates/personal.php:86 templates/personal.php:87
+#: templates/personal.php:87 templates/personal.php:88
 msgid "Language"
 msgstr "Език"
 
-#: templates/personal.php:99
+#: templates/personal.php:100
 msgid "Help translate"
 msgstr "Помогнете с превода"
 
-#: templates/personal.php:105
+#: templates/personal.php:106
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:107
-msgid "Use this address to connect to your ownCloud in your file manager"
+#: templates/personal.php:108
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
+"target=\"_blank\">access your Files via WebDAV</a>"
 msgstr ""
 
-#: templates/users.php:21 templates/users.php:84
+#: templates/users.php:21
 msgid "Login Name"
 msgstr "Потребител"
 
@@ -485,6 +488,10 @@ msgstr "Неограничено"
 msgid "Other"
 msgstr "Други"
 
+#: templates/users.php:84
+msgid "Username"
+msgstr "Потребител"
+
 #: templates/users.php:91
 msgid "Storage"
 msgstr "Хранилище"
diff --git a/l10n/bg_BG/user_ldap.po b/l10n/bg_BG/user_ldap.po
index d75efc118fbe67291095784ff52c3bdadb536ff9..0c19ae76c7aa4c083616cceea015e27f90e9cfff 100644
--- a/l10n/bg_BG/user_ldap.po
+++ b/l10n/bg_BG/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:16+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/bn_BD/core.po b/l10n/bn_BD/core.po
index 3e32d3a390bfe20dd3e97e9e05c3f11ea984f412..2ffda30e7dcf7e7e6ae526b4f4d15fe086b0a220 100644
--- a/l10n/bn_BD/core.po
+++ b/l10n/bn_BD/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:22+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:14+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
 "MIME-Version: 1.0\n"
@@ -61,135 +61,135 @@ msgstr "মুছে ফেলার জন্য কনো ক্যাটে
 msgid "Error removing %s from favorites."
 msgstr "প্রিয় থেকে %s সরিয়ে ফেলতে সমস্যা দেখা দিয়েছে।"
 
-#: js/config.php:34
+#: js/config.php:32
 msgid "Sunday"
 msgstr "রবিবার"
 
-#: js/config.php:35
+#: js/config.php:33
 msgid "Monday"
 msgstr "সোমবার"
 
-#: js/config.php:36
+#: js/config.php:34
 msgid "Tuesday"
 msgstr "মঙ্গলবার"
 
-#: js/config.php:37
+#: js/config.php:35
 msgid "Wednesday"
 msgstr "বুধবার"
 
-#: js/config.php:38
+#: js/config.php:36
 msgid "Thursday"
 msgstr "বৃহস্পতিবার"
 
-#: js/config.php:39
+#: js/config.php:37
 msgid "Friday"
 msgstr "শুক্রবার"
 
-#: js/config.php:40
+#: js/config.php:38
 msgid "Saturday"
 msgstr "শনিবার"
 
-#: js/config.php:45
+#: js/config.php:43
 msgid "January"
 msgstr "জানুয়ারি"
 
-#: js/config.php:46
+#: js/config.php:44
 msgid "February"
 msgstr "ফেব্রুয়ারি"
 
-#: js/config.php:47
+#: js/config.php:45
 msgid "March"
 msgstr "মার্চ"
 
-#: js/config.php:48
+#: js/config.php:46
 msgid "April"
 msgstr "এপ্রিল"
 
-#: js/config.php:49
+#: js/config.php:47
 msgid "May"
 msgstr "মে"
 
-#: js/config.php:50
+#: js/config.php:48
 msgid "June"
 msgstr "জুন"
 
-#: js/config.php:51
+#: js/config.php:49
 msgid "July"
 msgstr "জুলাই"
 
-#: js/config.php:52
+#: js/config.php:50
 msgid "August"
 msgstr "অগাষ্ট"
 
-#: js/config.php:53
+#: js/config.php:51
 msgid "September"
 msgstr "সেপ্টেম্বর"
 
-#: js/config.php:54
+#: js/config.php:52
 msgid "October"
 msgstr "অক্টোবর"
 
-#: js/config.php:55
+#: js/config.php:53
 msgid "November"
 msgstr "নভেম্বর"
 
-#: js/config.php:56
+#: js/config.php:54
 msgid "December"
 msgstr "ডিসেম্বর"
 
-#: js/js.js:286
+#: js/js.js:293
 msgid "Settings"
 msgstr "নিয়ামকসমূহ"
 
-#: js/js.js:718
+#: js/js.js:725
 msgid "seconds ago"
 msgstr "সেকেন্ড পূর্বে"
 
-#: js/js.js:719
+#: js/js.js:726
 msgid "1 minute ago"
 msgstr "১ মিনিট পূর্বে"
 
-#: js/js.js:720
+#: js/js.js:727
 msgid "{minutes} minutes ago"
 msgstr "{minutes} মিনিট পূর্বে"
 
-#: js/js.js:721
+#: js/js.js:728
 msgid "1 hour ago"
 msgstr "1 ঘন্টা পূর্বে"
 
-#: js/js.js:722
+#: js/js.js:729
 msgid "{hours} hours ago"
 msgstr "{hours} ঘন্টা পূর্বে"
 
-#: js/js.js:723
+#: js/js.js:730
 msgid "today"
 msgstr "আজ"
 
-#: js/js.js:724
+#: js/js.js:731
 msgid "yesterday"
 msgstr "গতকাল"
 
-#: js/js.js:725
+#: js/js.js:732
 msgid "{days} days ago"
 msgstr "{days} দিন পূর্বে"
 
-#: js/js.js:726
+#: js/js.js:733
 msgid "last month"
 msgstr "গত মাস"
 
-#: js/js.js:727
+#: js/js.js:734
 msgid "{months} months ago"
 msgstr "{months} মাস পূর্বে"
 
-#: js/js.js:728
+#: js/js.js:735
 msgid "months ago"
 msgstr "মাস পূর্বে"
 
-#: js/js.js:729
+#: js/js.js:736
 msgid "last year"
 msgstr "গত বছর"
 
-#: js/js.js:730
+#: js/js.js:737
 msgid "years ago"
 msgstr "বছর পূর্বে"
 
@@ -225,8 +225,8 @@ msgstr "অবজেক্টের ধরণটি সুনির্দিষ
 #: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
 #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:577
-#: js/share.js:589
+#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:620
+#: js/share.js:632
 msgid "Error"
 msgstr "সমস্যা"
 
@@ -246,7 +246,7 @@ msgstr "ভাগাভাগিকৃত"
 msgid "Share"
 msgstr "ভাগাভাগি কর"
 
-#: js/share.js:125 js/share.js:617
+#: js/share.js:125 js/share.js:660
 msgid "Error while sharing"
 msgstr "ভাগাভাগি করতে সমস্যা দেখা দিয়েছে  "
 
@@ -266,99 +266,103 @@ msgstr "{owner} আপনার এবং {group} গোষ্ঠীর সা
 msgid "Shared with you by {owner}"
 msgstr "{owner} আপনার সাথে ভাগাভাগি করেছেন"
 
-#: js/share.js:159
+#: js/share.js:172
 msgid "Share with"
 msgstr "যাদের সাথে ভাগাভাগি করা হয়েছে"
 
-#: js/share.js:164
+#: js/share.js:177
 msgid "Share with link"
 msgstr "লিংকের সাথে ভাগাভাগি কর"
 
-#: js/share.js:167
+#: js/share.js:180
 msgid "Password protect"
 msgstr "কূটশব্দ সুরক্ষিত"
 
-#: js/share.js:169 templates/installation.php:54 templates/login.php:26
+#: js/share.js:182 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "কূটশব্দ"
 
-#: js/share.js:173
+#: js/share.js:187
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:191
 msgid "Email link to person"
 msgstr "ব্যক্তির সাথে ই-মেইল যুক্ত কর"
 
-#: js/share.js:174
+#: js/share.js:192
 msgid "Send"
 msgstr "পাঠাও"
 
-#: js/share.js:178
+#: js/share.js:197
 msgid "Set expiration date"
 msgstr "মেয়াদোত্তীর্ণ হওয়ার তারিখ নির্ধারণ করুন"
 
-#: js/share.js:179
+#: js/share.js:198
 msgid "Expiration date"
 msgstr "মেয়াদোত্তীর্ণ হওয়ার তারিখ"
 
-#: js/share.js:211
+#: js/share.js:230
 msgid "Share via email:"
 msgstr "ই-মেইলের মাধ্যমে ভাগাভাগি করুনঃ"
 
-#: js/share.js:213
+#: js/share.js:232
 msgid "No people found"
 msgstr "কোন ব্যক্তি খুঁজে পাওয়া গেল না"
 
-#: js/share.js:251
+#: js/share.js:270
 msgid "Resharing is not allowed"
 msgstr "পূনঃরায় ভাগাভাগি অনুমোদিত নয়"
 
-#: js/share.js:287
+#: js/share.js:306
 msgid "Shared in {item} with {user}"
 msgstr "{user} এর সাথে {item} ভাগাভাগি করা হয়েছে"
 
-#: js/share.js:308
+#: js/share.js:327
 msgid "Unshare"
 msgstr "ভাগাভাগি বাতিল "
 
-#: js/share.js:320
+#: js/share.js:339
 msgid "can edit"
 msgstr "সম্পাদনা করতে পারবেন"
 
-#: js/share.js:322
+#: js/share.js:341
 msgid "access control"
 msgstr "অধিগম্যতা নিয়ন্ত্রণ"
 
-#: js/share.js:325
+#: js/share.js:344
 msgid "create"
 msgstr "তৈরী করুন"
 
-#: js/share.js:328
+#: js/share.js:347
 msgid "update"
 msgstr "পরিবর্ধন কর"
 
-#: js/share.js:331
+#: js/share.js:350
 msgid "delete"
 msgstr "মুছে ফেল"
 
-#: js/share.js:334
+#: js/share.js:353
 msgid "share"
 msgstr "ভাগাভাগি কর"
 
-#: js/share.js:368 js/share.js:564
+#: js/share.js:387 js/share.js:607
 msgid "Password protected"
 msgstr "কূটশব্দদ্বারা সুরক্ষিত"
 
-#: js/share.js:577
+#: js/share.js:620
 msgid "Error unsetting expiration date"
 msgstr "মেয়াদোত্তীর্ণ হওয়ার তারিখ নির্ধারণ বাতিল করতে সমস্যা দেখা দিয়েছে"
 
-#: js/share.js:589
+#: js/share.js:632
 msgid "Error setting expiration date"
 msgstr "মেয়াদোত্তীর্ণ হওয়ার তারিখ নির্ধারণ করতে সমস্যা দেখা দিয়েছে"
 
-#: js/share.js:604
+#: js/share.js:647
 msgid "Sending ..."
 msgstr "পাঠানো হচ্ছে......"
 
-#: js/share.js:615
+#: js/share.js:658
 msgid "Email sent"
 msgstr "ই-মেইল পাঠানো হয়েছে"
 
@@ -373,7 +377,7 @@ msgstr ""
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
-#: lostpassword/controller.php:58
+#: lostpassword/controller.php:60
 msgid "ownCloud password reset"
 msgstr "ownCloud কূটশব্দ পূনঃনির্ধারণ"
 
@@ -403,17 +407,17 @@ msgstr "ব্যবহারকারী"
 
 #: lostpassword/templates/lostpassword.php:22
 msgid ""
-"Your files seems to be encrypted. If you didn't have enabled the recovery "
-"key there will be no way to get your data back once the password was "
-"resetted. If you are not sure what to do, please contact your administrator "
-"first before continue. Do you really want to continue?"
+"Your files are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
 msgstr ""
 
 #: lostpassword/templates/lostpassword.php:24
 msgid "Yes, I really want to reset my password now"
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:29
+#: lostpassword/templates/lostpassword.php:27
 msgid "Request reset"
 msgstr "অনুরোধ পূনঃনির্ধারণ"
 
@@ -461,7 +465,7 @@ msgstr "অধিগমনের অনুমতি নেই"
 msgid "Cloud not found"
 msgstr "ক্লাউড খুঁজে পাওয়া গেল না"
 
-#: templates/altmail.php:2
+#: templates/altmail.php:4
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -472,10 +476,6 @@ msgid ""
 "Cheers!"
 msgstr ""
 
-#: templates/altmail.php:7 templates/mail.php:24
-msgid "web services under your control"
-msgstr "ওয়েব সার্ভিস আপনার হাতের মুঠোয়"
-
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
 msgstr "ক্যাটেগরি সম্পাদনা"
@@ -568,12 +568,12 @@ msgstr "ডাটাবেজ হোস্ট"
 msgid "Finish setup"
 msgstr "সেটআপ সুসম্পন্ন কর"
 
-#: templates/layout.user.php:40
+#: templates/layout.user.php:43
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:67
+#: templates/layout.user.php:68
 msgid "Log out"
 msgstr "প্রস্থান"
 
@@ -607,7 +607,7 @@ msgstr "প্রবেশ"
 msgid "Alternative Logins"
 msgstr ""
 
-#: templates/mail.php:15
+#: templates/mail.php:16
 #, php-format
 msgid ""
 "Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
diff --git a/l10n/bn_BD/files.po b/l10n/bn_BD/files.po
index 7e855372cc84fc8b332f79fc174d4df6198936c2..e4cdff7ba2e218a3b4b4ceaaaa694998654ee6a7 100644
--- a/l10n/bn_BD/files.po
+++ b/l10n/bn_BD/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:01+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
 "MIME-Version: 1.0\n"
@@ -27,46 +27,54 @@ msgstr "%s কে স্থানান্তর করা সম্ভব হ
 msgid "Could not move %s"
 msgstr "%s  কে স্থানান্তর করা সম্ভব হলো না"
 
-#: ajax/upload.php:19
+#: ajax/upload.php:16 ajax/upload.php:45
+msgid "Unable to set upload directory."
+msgstr ""
+
+#: ajax/upload.php:22
+msgid "Invalid Token"
+msgstr ""
+
+#: ajax/upload.php:59
 msgid "No file was uploaded. Unknown error"
 msgstr "কোন ফাইল আপলোড করা হয় নি। সমস্যার কারণটি অজ্ঞাত।"
 
-#: ajax/upload.php:26
+#: ajax/upload.php:66
 msgid "There is no error, the file uploaded with success"
 msgstr "কোন সমস্যা হয় নি, ফাইল আপলোড সুসম্পন্ন হয়েছে।"
 
-#: ajax/upload.php:27
+#: ajax/upload.php:67
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr "আপলোড করা  ফাইলটি php.ini তে বর্ণিত  upload_max_filesize নির্দেশিত আয়তন অতিক্রম করছেঃ"
 
-#: ajax/upload.php:29
+#: ajax/upload.php:69
 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:30
+#: ajax/upload.php:70
 msgid "The uploaded file was only partially uploaded"
 msgstr "আপলোড করা ফাইলটি আংশিক আপলোড করা হয়েছে"
 
-#: ajax/upload.php:31
+#: ajax/upload.php:71
 msgid "No file was uploaded"
 msgstr "কোন ফাইল আপলোড করা হয় নি"
 
-#: ajax/upload.php:32
+#: ajax/upload.php:72
 msgid "Missing a temporary folder"
 msgstr "অস্থায়ী ফোল্ডারটি হারানো গিয়েছে"
 
-#: ajax/upload.php:33
+#: ajax/upload.php:73
 msgid "Failed to write to disk"
 msgstr "ডিস্কে লিখতে ব্যর্থ"
 
-#: ajax/upload.php:51
+#: ajax/upload.php:91
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:83
+#: ajax/upload.php:123
 msgid "Invalid directory."
 msgstr "ভুল ডিরেক্টরি"
 
@@ -74,6 +82,36 @@ msgstr "ভুল ডিরেক্টরি"
 msgid "Files"
 msgstr "ফাইল"
 
+#: js/file-upload.js:11
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr "আপনার ফাইলটি আপলোড করা সম্ভব হলো না, কেননা এটি হয় একটি ফোল্ডার কিংবা এর আকার ০ বাইট"
+
+#: js/file-upload.js:24
+msgid "Not enough space available"
+msgstr "যথেষ্ঠ পরিমাণ স্থান নেই"
+
+#: js/file-upload.js:64
+msgid "Upload cancelled."
+msgstr "আপলোড বাতিল করা হয়েছে।"
+
+#: js/file-upload.js:167 js/files.js:266
+msgid ""
+"File upload is in progress. Leaving the page now will cancel the upload."
+msgstr "ফাইল আপলোড চলমান। এই পৃষ্ঠা পরিত্যাগ করলে আপলোড বাতিল করা হবে।"
+
+#: js/file-upload.js:233 js/files.js:339
+msgid "URL cannot be empty."
+msgstr "URL ফাঁকা রাখা যাবে না।"
+
+#: js/file-upload.js:238 lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr ""
+
+#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
+#: js/files.js:693 js/files.js:731
+msgid "Error"
+msgstr "সমস্যা"
+
 #: js/fileactions.js:116
 msgid "Share"
 msgstr "ভাগাভাগি কর"
@@ -90,43 +128,43 @@ msgstr "মুছে"
 msgid "Rename"
 msgstr "পূনঃনামকরণ"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:464
 msgid "Pending"
 msgstr "মুলতুবি"
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "{new_name} already exists"
 msgstr "{new_name} টি বিদ্যমান"
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "replace"
 msgstr "প্রতিস্থাপন"
 
-#: js/filelist.js:259
+#: js/filelist.js:302
 msgid "suggest name"
 msgstr "নাম সুপারিশ করুন"
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "cancel"
 msgstr "বাতিল"
 
-#: js/filelist.js:306
+#: js/filelist.js:349
 msgid "replaced {new_name} with {old_name}"
 msgstr "{new_name} কে {old_name} নামে প্রতিস্থাপন করা হয়েছে"
 
-#: js/filelist.js:306
+#: js/filelist.js:349
 msgid "undo"
 msgstr "ক্রিয়া প্রত্যাহার"
 
-#: js/filelist.js:331
+#: js/filelist.js:374
 msgid "perform delete operation"
 msgstr ""
 
-#: js/filelist.js:413
+#: js/filelist.js:456
 msgid "1 file uploading"
 msgstr "১টি ফাইল আপলোড করা হচ্ছে"
 
-#: js/filelist.js:416 js/filelist.js:470
+#: js/filelist.js:459 js/filelist.js:517
 msgid "files uploading"
 msgstr ""
 
@@ -158,70 +196,42 @@ msgid ""
 "big."
 msgstr ""
 
-#: js/files.js:264
-msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "আপনার ফাইলটি আপলোড করা সম্ভব হলো না, কেননা এটি হয় একটি ফোল্ডার কিংবা এর আকার ০ বাইট"
-
-#: js/files.js:277
-msgid "Not enough space available"
-msgstr "যথেষ্ঠ পরিমাণ স্থান নেই"
-
-#: js/files.js:317
-msgid "Upload cancelled."
-msgstr "আপলোড বাতিল করা হয়েছে।"
-
-#: js/files.js:413
-msgid ""
-"File upload is in progress. Leaving the page now will cancel the upload."
-msgstr "ফাইল আপলোড চলমান। এই পৃষ্ঠা পরিত্যাগ করলে আপলোড বাতিল করা হবে।"
-
-#: js/files.js:486
-msgid "URL cannot be empty."
-msgstr "URL ফাঁকা রাখা যাবে না।"
-
-#: js/files.js:491
+#: js/files.js:344
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "ফোল্ডারের নামটি সঠিক নয়। 'ভাগাভাগি করা' শুধুমাত্র Owncloud  এর জন্য সংরক্ষিত।"
 
-#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
-msgid "Error"
-msgstr "সমস্যা"
-
-#: js/files.js:877 templates/index.php:69
+#: js/files.js:744 templates/index.php:69
 msgid "Name"
 msgstr "রাম"
 
-#: js/files.js:878 templates/index.php:80
+#: js/files.js:745 templates/index.php:80
 msgid "Size"
 msgstr "আকার"
 
-#: js/files.js:879 templates/index.php:82
+#: js/files.js:746 templates/index.php:82
 msgid "Modified"
 msgstr "পরিবর্তিত"
 
-#: js/files.js:898
+#: js/files.js:765
 msgid "1 folder"
 msgstr "১টি ফোল্ডার"
 
-#: js/files.js:900
+#: js/files.js:767
 msgid "{count} folders"
 msgstr "{count} টি ফোল্ডার"
 
-#: js/files.js:908
+#: js/files.js:775
 msgid "1 file"
 msgstr "১টি ফাইল"
 
-#: js/files.js:910
+#: js/files.js:777
 msgid "{count} files"
 msgstr "{count} টি ফাইল"
 
-#: lib/app.php:53
-msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
-msgstr ""
-
 #: lib/app.php:73
-msgid "Unable to rename file"
-msgstr "ফাইলের নাম পরিবর্তন করা সম্ভব হলো না"
+#, php-format
+msgid "%s could not be renamed"
+msgstr ""
 
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
@@ -317,6 +327,22 @@ msgstr "ফাইলগুলো স্ক্যান করা হচ্ছে
 msgid "Current scanning"
 msgstr "বর্তমান স্ক্যানিং"
 
+#: templates/part.list.php:76
+msgid "directory"
+msgstr ""
+
+#: templates/part.list.php:78
+msgid "directories"
+msgstr ""
+
+#: templates/part.list.php:87
+msgid "file"
+msgstr ""
+
+#: templates/part.list.php:89
+msgid "files"
+msgstr ""
+
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
 msgstr ""
diff --git a/l10n/bn_BD/files_encryption.po b/l10n/bn_BD/files_encryption.po
index f91cdf211a28d1a6f1d8e1887156575f746bebf0..6b42829178e714620fc093a4d2de270d3ab0674f 100644
--- a/l10n/bn_BD/files_encryption.po
+++ b/l10n/bn_BD/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-14 02:46+0200\n"
-"PO-Revision-Date: 2013-06-14 00:47+0000\n"
+"POT-Creation-Date: 2013-07-05 02:12+0200\n"
+"PO-Revision-Date: 2013-07-05 00:13+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"
@@ -55,9 +55,21 @@ msgstr ""
 
 #: files/error.php:7
 msgid ""
-"Your private key is not valid! Maybe your password was changed from outside."
-" You can update your private key password in your personal settings to "
-"regain access to your files"
+"Your private key is not valid! Likely your password was changed outside the "
+"ownCloud system (e.g. your corporate directory). You can update your private"
+" key password in your personal settings to recover access to your encrypted "
+"files."
+msgstr ""
+
+#: hooks/hooks.php:44
+msgid "Missing requirements."
+msgstr ""
+
+#: hooks/hooks.php:45
+msgid ""
+"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL "
+"PHP extension is enabled and configured properly. For now, the encryption "
+"app has been disabled."
 msgstr ""
 
 #: js/settings-admin.js:11
@@ -84,11 +96,11 @@ msgstr "সংকেতায়ন"
 
 #: templates/settings-admin.php:10
 msgid ""
-"Enable encryption passwords recovery key (allow sharing to recovery key):"
+"Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
 #: templates/settings-admin.php:14
-msgid "Recovery account password"
+msgid "Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:21 templates/settings-personal.php:54
@@ -100,15 +112,15 @@ msgid "Disabled"
 msgstr ""
 
 #: templates/settings-admin.php:34
-msgid "Change encryption passwords recovery key:"
+msgid "Change recovery key password:"
 msgstr ""
 
 #: templates/settings-admin.php:41
-msgid "Old Recovery account password"
+msgid "Old Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:48
-msgid "New Recovery account password"
+msgid "New Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:53
diff --git a/l10n/bn_BD/files_external.po b/l10n/bn_BD/files_external.po
index 0f351b2fe588d7fcfa1aacc259f867cf41e71344..188ffd6dfbb03ff17d5829ecfbf88c56415876ee 100644
--- a/l10n/bn_BD/files_external.po
+++ b/l10n/bn_BD/files_external.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/bn_BD/files_sharing.po b/l10n/bn_BD/files_sharing.po
index 942936ca66c18e6f27a8b6f6ef7c32b95b6677b5..8db1e7bc973267d5988be2de636db49ee4341455 100644
--- a/l10n/bn_BD/files_sharing.po
+++ b/l10n/bn_BD/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
 "MIME-Version: 1.0\n"
@@ -18,27 +18,39 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: templates/authenticate.php:4
+msgid "The password is wrong. Try again."
+msgstr ""
+
+#: templates/authenticate.php:7
 msgid "Password"
 msgstr "কূটশব্দ"
 
-#: templates/authenticate.php:6
+#: templates/authenticate.php:9
 msgid "Submit"
 msgstr "জমা দিন"
 
-#: templates/public.php:10
+#: templates/public.php:17
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s আপনার সাথে %s ফোল্ডারটি ভাগাভাগি করেছেন"
 
-#: templates/public.php:13
+#: templates/public.php:20
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s আপনার সাথে %s ফাইলটি ভাগাভাগি করেছেন"
 
-#: templates/public.php:19 templates/public.php:43
+#: templates/public.php:28 templates/public.php:90
 msgid "Download"
 msgstr "ডাউনলোড"
 
-#: templates/public.php:40
+#: templates/public.php:45 templates/public.php:48
+msgid "Upload"
+msgstr "আপলোড"
+
+#: templates/public.php:58
+msgid "Cancel upload"
+msgstr "আপলোড বাতিল কর"
+
+#: templates/public.php:87
 msgid "No preview available for"
 msgstr "এর জন্য কোন প্রাকবীক্ষণ সুলভ নয়"
diff --git a/l10n/bn_BD/files_trashbin.po b/l10n/bn_BD/files_trashbin.po
index 80abfc9e6615bd96aec56064157c12b6969a8531..c9ae56595c083913c4020380e820ec2a75693878 100644
--- a/l10n/bn_BD/files_trashbin.po
+++ b/l10n/bn_BD/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:16+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/bn_BD/lib.po b/l10n/bn_BD/lib.po
index bed4b8da61a8cfbcb4398789e2bbfc52c12fbfac..6c5210fdb3976194be89bc5bdb5e90ef151e58c0 100644
--- a/l10n/bn_BD/lib.po
+++ b/l10n/bn_BD/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
 "MIME-Version: 1.0\n"
@@ -17,43 +17,47 @@ msgstr ""
 "Language: bn_BD\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:359
+#: app.php:360
 msgid "Help"
 msgstr "সহায়িকা"
 
-#: app.php:372
+#: app.php:373
 msgid "Personal"
 msgstr "ব্যক্তিগত"
 
-#: app.php:383
+#: app.php:384
 msgid "Settings"
 msgstr "নিয়ামকসমূহ"
 
-#: app.php:395
+#: app.php:396
 msgid "Users"
 msgstr "ব্যবহারকারী"
 
-#: app.php:408
+#: app.php:409
 msgid "Apps"
 msgstr "অ্যাপ"
 
-#: app.php:416
+#: app.php:417
 msgid "Admin"
 msgstr "প্রশাসন"
 
-#: files.php:210
+#: defaults.php:33
+msgid "web services under your control"
+msgstr "ওয়েব সার্ভিস আপনার হাতের মুঠোয়"
+
+#: files.php:226
 msgid "ZIP download is turned off."
 msgstr "ZIP ডাউনলোড বন্ধ করা আছে।"
 
-#: files.php:211
+#: files.php:227
 msgid "Files need to be downloaded one by one."
 msgstr "ফাইলগুলো একে একে ডাউনলোড করা আবশ্যক।"
 
-#: files.php:212 files.php:245
+#: files.php:228 files.php:261
 msgid "Back to Files"
 msgstr "ফাইলে ফিরে চল"
 
-#: files.php:242
+#: files.php:258
 msgid "Selected files too large to generate zip file."
 msgstr "নির্বাচিত ফাইলগুলো এতই বৃহৎ যে জিপ ফাইল তৈরী করা সম্ভব নয়।"
 
@@ -85,104 +89,102 @@ msgstr "টেক্সট"
 msgid "Images"
 msgstr ""
 
-#: setup.php:34
-msgid "Set an admin username."
-msgstr ""
-
-#: setup.php:37
-msgid "Set an admin password."
-msgstr ""
-
-#: setup.php:55
+#: setup/abstractdatabase.php:22
 #, php-format
 msgid "%s enter the database username."
 msgstr ""
 
-#: setup.php:58
+#: setup/abstractdatabase.php:25
 #, php-format
 msgid "%s enter the database name."
 msgstr ""
 
-#: setup.php:61
+#: setup/abstractdatabase.php:28
 #, php-format
 msgid "%s you may not use dots in the database name"
 msgstr ""
 
-#: setup.php:64
+#: setup/mssql.php:20
 #, php-format
-msgid "%s set the database host."
-msgstr ""
-
-#: setup.php:126 setup.php:332 setup.php:377
-msgid "PostgreSQL username and/or password not valid"
+msgid "MS SQL username and/or password not valid: %s"
 msgstr ""
 
-#: setup.php:127 setup.php:235
+#: setup/mssql.php:21 setup/mysql.php:13 setup/oci.php:114
+#: setup/postgresql.php:24 setup/postgresql.php:70
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:152
-msgid "Oracle connection could not be established"
-msgstr ""
-
-#: setup.php:234
+#: setup/mysql.php:12
 msgid "MySQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:288 setup.php:398 setup.php:407 setup.php:425 setup.php:435
-#: setup.php:444 setup.php:477 setup.php:543 setup.php:569 setup.php:576
-#: setup.php:587 setup.php:594 setup.php:603 setup.php:611 setup.php:620
-#: setup.php:626
+#: setup/mysql.php:67 setup/oci.php:54 setup/oci.php:121 setup/oci.php:147
+#: setup/oci.php:154 setup/oci.php:165 setup/oci.php:172 setup/oci.php:181
+#: setup/oci.php:189 setup/oci.php:198 setup/oci.php:204
+#: setup/postgresql.php:89 setup/postgresql.php:98 setup/postgresql.php:115
+#: setup/postgresql.php:125 setup/postgresql.php:134
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr ""
 
-#: setup.php:289 setup.php:399 setup.php:408 setup.php:426 setup.php:436
-#: setup.php:445 setup.php:478 setup.php:544 setup.php:570 setup.php:577
-#: setup.php:588 setup.php:604 setup.php:612 setup.php:621
+#: setup/mysql.php:68 setup/oci.php:55 setup/oci.php:122 setup/oci.php:148
+#: setup/oci.php:155 setup/oci.php:166 setup/oci.php:182 setup/oci.php:190
+#: setup/oci.php:199 setup/postgresql.php:90 setup/postgresql.php:99
+#: setup/postgresql.php:116 setup/postgresql.php:126 setup/postgresql.php:135
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:305
+#: setup/mysql.php:85
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:306
+#: setup/mysql.php:86
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:311
+#: setup/mysql.php:91
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:312
+#: setup/mysql.php:92
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:469 setup.php:536
+#: setup/oci.php:34
+msgid "Oracle connection could not be established"
+msgstr ""
+
+#: setup/oci.php:41 setup/oci.php:113
 msgid "Oracle username and/or password not valid"
 msgstr ""
 
-#: setup.php:595 setup.php:627
+#: setup/oci.php:173 setup/oci.php:205
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:647
-#, php-format
-msgid "MS SQL username and/or password not valid: %s"
+#: setup/postgresql.php:23 setup/postgresql.php:69
+msgid "PostgreSQL username and/or password not valid"
+msgstr ""
+
+#: setup.php:42
+msgid "Set an admin username."
+msgstr ""
+
+#: setup.php:45
+msgid "Set an admin password."
 msgstr ""
 
-#: setup.php:870
+#: setup.php:198
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:871
+#: setup.php:199
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
diff --git a/l10n/bn_BD/settings.po b/l10n/bn_BD/settings.po
index 1734f313ffb96aad7560eaffc32465ac3e25e944..58ea63ef7a2ec74406c787f93071adec814f05b4 100644
--- a/l10n/bn_BD/settings.po
+++ b/l10n/bn_BD/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
 "MIME-Version: 1.0\n"
@@ -88,35 +88,35 @@ msgstr "%s গোষ্ঠী থেকে ব্যবহারকারীক
 msgid "Couldn't update app."
 msgstr ""
 
-#: js/apps.js:30
+#: js/apps.js:35
 msgid "Update to {appversion}"
 msgstr ""
 
-#: js/apps.js:36 js/apps.js:76
+#: js/apps.js:41 js/apps.js:81
 msgid "Disable"
 msgstr "নিষ্ক্রিয়"
 
-#: js/apps.js:36 js/apps.js:64 js/apps.js:83
+#: js/apps.js:41 js/apps.js:69 js/apps.js:88
 msgid "Enable"
 msgstr "সক্রিয় "
 
-#: js/apps.js:55
+#: js/apps.js:60
 msgid "Please wait...."
 msgstr ""
 
-#: js/apps.js:59 js/apps.js:71 js/apps.js:80 js/apps.js:93
+#: js/apps.js:64 js/apps.js:76 js/apps.js:85 js/apps.js:98
 msgid "Error"
 msgstr "সমস্যা"
 
-#: js/apps.js:90
+#: js/apps.js:95
 msgid "Updating...."
 msgstr ""
 
-#: js/apps.js:93
+#: js/apps.js:98
 msgid "Error while updating app"
 msgstr ""
 
-#: js/apps.js:96
+#: js/apps.js:101
 msgid "Updated"
 msgstr ""
 
@@ -165,15 +165,15 @@ msgstr ""
 msgid "A valid password must be provided"
 msgstr ""
 
-#: personal.php:35 personal.php:36
+#: personal.php:37 personal.php:38
 msgid "__language_name__"
 msgstr "__language_name__"
 
-#: templates/admin.php:15
+#: templates/admin.php:17
 msgid "Security Warning"
 msgstr "নিরাপত্তাজনিত সতর্কতা"
 
-#: templates/admin.php:18
+#: templates/admin.php:20
 msgid ""
 "Your data directory and your files are probably accessible from the "
 "internet. The .htaccess file that ownCloud provides is not working. We "
@@ -182,36 +182,36 @@ msgid ""
 " webserver document root."
 msgstr ""
 
-#: templates/admin.php:29
+#: templates/admin.php:31
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:32
+#: templates/admin.php:34
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: templates/admin.php:33
+#: templates/admin.php:35
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:44
+#: templates/admin.php:46
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:47
+#: templates/admin.php:49
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr ""
 
-#: templates/admin.php:58
+#: templates/admin.php:60
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:63
+#: templates/admin.php:65
 #, php-format
 msgid ""
 "This ownCloud server can't set system locale to %s. This means that there "
@@ -219,11 +219,11 @@ msgid ""
 " to install the required packages on your system to support %s."
 msgstr ""
 
-#: templates/admin.php:75
+#: templates/admin.php:77
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:78
+#: templates/admin.php:80
 msgid ""
 "This ownCloud server has no working internet connection. This means that "
 "some of the features like mounting of external storage, notifications about "
@@ -233,102 +233,102 @@ msgid ""
 " of ownCloud."
 msgstr ""
 
-#: templates/admin.php:92
+#: templates/admin.php:94
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:101
+#: templates/admin.php:103
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:111
+#: templates/admin.php:113
 msgid ""
 "cron.php is registered at a webcron service. Call the cron.php page in the "
 "owncloud root once a minute over http."
 msgstr ""
 
-#: templates/admin.php:121
+#: templates/admin.php:123
 msgid ""
 "Use systems cron service. Call the cron.php file in the owncloud folder via "
 "a system cronjob once a minute."
 msgstr ""
 
-#: templates/admin.php:128
+#: templates/admin.php:130
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:134
+#: templates/admin.php:136
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:135
+#: templates/admin.php:137
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:142
+#: templates/admin.php:144
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:143
+#: templates/admin.php:145
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:150
+#: templates/admin.php:152
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:151
+#: templates/admin.php:153
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:158
+#: templates/admin.php:160
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:161
+#: templates/admin.php:163
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:168
+#: templates/admin.php:170
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:181
+#: templates/admin.php:183
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:182
+#: templates/admin.php:184
 msgid ""
 "Enforces the clients to connect to ownCloud via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:185
+#: templates/admin.php:187
 msgid ""
 "Please connect to this ownCloud instance via HTTPS to enable or disable the "
 "SSL enforcement."
 msgstr ""
 
-#: templates/admin.php:195
+#: templates/admin.php:197
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:196
+#: templates/admin.php:198
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:227
+#: templates/admin.php:229
 msgid "More"
 msgstr "বেশী"
 
-#: templates/admin.php:228
+#: templates/admin.php:230
 msgid "Less"
 msgstr "কম"
 
-#: templates/admin.php:235 templates/personal.php:116
+#: templates/admin.php:236 templates/personal.php:116
 msgid "Version"
 msgstr "ভার্সন"
 
-#: templates/admin.php:237 templates/personal.php:119
+#: templates/admin.php:240 templates/personal.php:119
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -386,76 +386,79 @@ msgstr "বাগট্র্যাকার"
 msgid "Commercial Support"
 msgstr "বাণিজ্যিক সাপোর্ট"
 
-#: templates/personal.php:9
+#: templates/personal.php:10
 msgid "Get the apps to sync your files"
 msgstr ""
 
-#: templates/personal.php:20
+#: templates/personal.php:21
 msgid "Show First Run Wizard again"
 msgstr "প্রথমবার চালানোর যাদুকর পূনরায় প্রদর্শন কর"
 
-#: templates/personal.php:28
+#: templates/personal.php:29
 #, php-format
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "আপনি ব্যবহার করছেন  <strong>%s</strong>, সুলভ  <strong>%s</strong> এর মধ্যে।"
 
-#: templates/personal.php:40 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:41 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "কূটশব্দ"
 
-#: templates/personal.php:41
+#: templates/personal.php:42
 msgid "Your password was changed"
 msgstr "আপনার কূটশব্দটি পরিবর্তন করা হয়েছে "
 
-#: templates/personal.php:42
+#: templates/personal.php:43
 msgid "Unable to change your password"
 msgstr "আপনার কূটশব্দটি পরিবর্তন করতে সক্ষম নয়"
 
-#: templates/personal.php:43
+#: templates/personal.php:44
 msgid "Current password"
 msgstr "বর্তমান কূটশব্দ"
 
-#: templates/personal.php:45
+#: templates/personal.php:46
 msgid "New password"
 msgstr "নতুন কূটশব্দ"
 
-#: templates/personal.php:47
+#: templates/personal.php:48
 msgid "Change password"
 msgstr "কূটশব্দ পরিবর্তন করুন"
 
-#: templates/personal.php:59 templates/users.php:85
+#: templates/personal.php:60 templates/users.php:85
 msgid "Display Name"
 msgstr ""
 
-#: templates/personal.php:74
+#: templates/personal.php:75
 msgid "Email"
 msgstr "ইমেইল"
 
-#: templates/personal.php:76
+#: templates/personal.php:77
 msgid "Your email address"
 msgstr "আপনার ই-মেইল ঠিকানা"
 
-#: templates/personal.php:77
+#: templates/personal.php:78
 msgid "Fill in an email address to enable password recovery"
 msgstr "কূটশব্দ পূনরূদ্ধার সক্রিয় করার জন্য ই-মেইল ঠিকানাটি পূরণ করুন"
 
-#: templates/personal.php:86 templates/personal.php:87
+#: templates/personal.php:87 templates/personal.php:88
 msgid "Language"
 msgstr "ভাষা"
 
-#: templates/personal.php:99
+#: templates/personal.php:100
 msgid "Help translate"
 msgstr "অনুবাদ করতে সহায়তা করুন"
 
-#: templates/personal.php:105
+#: templates/personal.php:106
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:107
-msgid "Use this address to connect to your ownCloud in your file manager"
-msgstr "আপনার ownCloud এ সংযুক্ত হতে এই ঠিকানাটি আপনার ফাইল ব্যবস্থাপকে ব্যবহার করুন"
+#: templates/personal.php:108
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
+"target=\"_blank\">access your Files via WebDAV</a>"
+msgstr ""
 
-#: templates/users.php:21 templates/users.php:84
+#: templates/users.php:21
 msgid "Login Name"
 msgstr ""
 
@@ -485,6 +488,10 @@ msgstr "অসীম"
 msgid "Other"
 msgstr "অন্যান্য"
 
+#: templates/users.php:84
+msgid "Username"
+msgstr "ব্যবহারকারী"
+
 #: templates/users.php:91
 msgid "Storage"
 msgstr "সংরক্ষণাগার"
diff --git a/l10n/bn_BD/user_ldap.po b/l10n/bn_BD/user_ldap.po
index 0ddbb185396dcb530a17c274ee8a7812ce5d1d7a..c45503231bfcec70b1c68fba99071abb5159fa01 100644
--- a/l10n/bn_BD/user_ldap.po
+++ b/l10n/bn_BD/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:16+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/bs/core.po b/l10n/bs/core.po
index 22c808424a8feb77e302a8126546b7cad440dd1f..5cbff0eb5e1262b49e1b82b74e8366245a8a44ea 100644
--- a/l10n/bs/core.po
+++ b/l10n/bs/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:22+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Bosnian (http://www.transifex.com/projects/p/owncloud/language/bs/)\n"
 "MIME-Version: 1.0\n"
@@ -61,135 +61,135 @@ msgstr ""
 msgid "Error removing %s from favorites."
 msgstr ""
 
-#: js/config.php:34
+#: js/config.php:32
 msgid "Sunday"
 msgstr ""
 
-#: js/config.php:35
+#: js/config.php:33
 msgid "Monday"
 msgstr ""
 
-#: js/config.php:36
+#: js/config.php:34
 msgid "Tuesday"
 msgstr ""
 
-#: js/config.php:37
+#: js/config.php:35
 msgid "Wednesday"
 msgstr ""
 
-#: js/config.php:38
+#: js/config.php:36
 msgid "Thursday"
 msgstr ""
 
-#: js/config.php:39
+#: js/config.php:37
 msgid "Friday"
 msgstr ""
 
-#: js/config.php:40
+#: js/config.php:38
 msgid "Saturday"
 msgstr ""
 
-#: js/config.php:45
+#: js/config.php:43
 msgid "January"
 msgstr ""
 
-#: js/config.php:46
+#: js/config.php:44
 msgid "February"
 msgstr ""
 
-#: js/config.php:47
+#: js/config.php:45
 msgid "March"
 msgstr ""
 
-#: js/config.php:48
+#: js/config.php:46
 msgid "April"
 msgstr ""
 
-#: js/config.php:49
+#: js/config.php:47
 msgid "May"
 msgstr ""
 
-#: js/config.php:50
+#: js/config.php:48
 msgid "June"
 msgstr ""
 
-#: js/config.php:51
+#: js/config.php:49
 msgid "July"
 msgstr ""
 
-#: js/config.php:52
+#: js/config.php:50
 msgid "August"
 msgstr ""
 
-#: js/config.php:53
+#: js/config.php:51
 msgid "September"
 msgstr ""
 
-#: js/config.php:54
+#: js/config.php:52
 msgid "October"
 msgstr ""
 
-#: js/config.php:55
+#: js/config.php:53
 msgid "November"
 msgstr ""
 
-#: js/config.php:56
+#: js/config.php:54
 msgid "December"
 msgstr ""
 
-#: js/js.js:286
+#: js/js.js:293
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:718
+#: js/js.js:725
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:719
+#: js/js.js:726
 msgid "1 minute ago"
 msgstr ""
 
-#: js/js.js:720
+#: js/js.js:727
 msgid "{minutes} minutes ago"
 msgstr ""
 
-#: js/js.js:721
+#: js/js.js:728
 msgid "1 hour ago"
 msgstr ""
 
-#: js/js.js:722
+#: js/js.js:729
 msgid "{hours} hours ago"
 msgstr ""
 
-#: js/js.js:723
+#: js/js.js:730
 msgid "today"
 msgstr ""
 
-#: js/js.js:724
+#: js/js.js:731
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:725
+#: js/js.js:732
 msgid "{days} days ago"
 msgstr ""
 
-#: js/js.js:726
+#: js/js.js:733
 msgid "last month"
 msgstr ""
 
-#: js/js.js:727
+#: js/js.js:734
 msgid "{months} months ago"
 msgstr ""
 
-#: js/js.js:728
+#: js/js.js:735
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:729
+#: js/js.js:736
 msgid "last year"
 msgstr ""
 
-#: js/js.js:730
+#: js/js.js:737
 msgid "years ago"
 msgstr ""
 
@@ -225,8 +225,8 @@ msgstr ""
 #: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
 #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:577
-#: js/share.js:589
+#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:620
+#: js/share.js:632
 msgid "Error"
 msgstr ""
 
@@ -246,7 +246,7 @@ msgstr ""
 msgid "Share"
 msgstr "Podijeli"
 
-#: js/share.js:125 js/share.js:617
+#: js/share.js:125 js/share.js:660
 msgid "Error while sharing"
 msgstr ""
 
@@ -266,99 +266,103 @@ msgstr ""
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:159
+#: js/share.js:172
 msgid "Share with"
 msgstr ""
 
-#: js/share.js:164
+#: js/share.js:177
 msgid "Share with link"
 msgstr ""
 
-#: js/share.js:167
+#: js/share.js:180
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:169 templates/installation.php:54 templates/login.php:26
+#: js/share.js:182 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr ""
 
-#: js/share.js:173
+#: js/share.js:187
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:191
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:174
+#: js/share.js:192
 msgid "Send"
 msgstr ""
 
-#: js/share.js:178
+#: js/share.js:197
 msgid "Set expiration date"
 msgstr ""
 
-#: js/share.js:179
+#: js/share.js:198
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:211
+#: js/share.js:230
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:213
+#: js/share.js:232
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:251
+#: js/share.js:270
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:287
+#: js/share.js:306
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:308
+#: js/share.js:327
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:320
+#: js/share.js:339
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:322
+#: js/share.js:341
 msgid "access control"
 msgstr ""
 
-#: js/share.js:325
+#: js/share.js:344
 msgid "create"
 msgstr ""
 
-#: js/share.js:328
+#: js/share.js:347
 msgid "update"
 msgstr ""
 
-#: js/share.js:331
+#: js/share.js:350
 msgid "delete"
 msgstr ""
 
-#: js/share.js:334
+#: js/share.js:353
 msgid "share"
 msgstr ""
 
-#: js/share.js:368 js/share.js:564
+#: js/share.js:387 js/share.js:607
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:577
+#: js/share.js:620
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:589
+#: js/share.js:632
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:604
+#: js/share.js:647
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:615
+#: js/share.js:658
 msgid "Email sent"
 msgstr ""
 
@@ -373,7 +377,7 @@ msgstr ""
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
-#: lostpassword/controller.php:58
+#: lostpassword/controller.php:60
 msgid "ownCloud password reset"
 msgstr ""
 
@@ -403,17 +407,17 @@ msgstr ""
 
 #: lostpassword/templates/lostpassword.php:22
 msgid ""
-"Your files seems to be encrypted. If you didn't have enabled the recovery "
-"key there will be no way to get your data back once the password was "
-"resetted. If you are not sure what to do, please contact your administrator "
-"first before continue. Do you really want to continue?"
+"Your files are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
 msgstr ""
 
 #: lostpassword/templates/lostpassword.php:24
 msgid "Yes, I really want to reset my password now"
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:29
+#: lostpassword/templates/lostpassword.php:27
 msgid "Request reset"
 msgstr ""
 
@@ -461,7 +465,7 @@ msgstr ""
 msgid "Cloud not found"
 msgstr ""
 
-#: templates/altmail.php:2
+#: templates/altmail.php:4
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -472,10 +476,6 @@ msgid ""
 "Cheers!"
 msgstr ""
 
-#: templates/altmail.php:7 templates/mail.php:24
-msgid "web services under your control"
-msgstr ""
-
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
 msgstr ""
@@ -568,12 +568,12 @@ msgstr ""
 msgid "Finish setup"
 msgstr ""
 
-#: templates/layout.user.php:40
+#: templates/layout.user.php:43
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:67
+#: templates/layout.user.php:68
 msgid "Log out"
 msgstr ""
 
@@ -607,7 +607,7 @@ msgstr ""
 msgid "Alternative Logins"
 msgstr ""
 
-#: templates/mail.php:15
+#: templates/mail.php:16
 #, php-format
 msgid ""
 "Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
diff --git a/l10n/bs/files.po b/l10n/bs/files.po
index e13d674a9c2630a3ae15f445e6141b87d62365c6..e74654d2432ead550f752139027c3bcd10a81a7d 100644
--- a/l10n/bs/files.po
+++ b/l10n/bs/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:01+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Bosnian (http://www.transifex.com/projects/p/owncloud/language/bs/)\n"
 "MIME-Version: 1.0\n"
@@ -27,46 +27,54 @@ msgstr ""
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/upload.php:19
+#: ajax/upload.php:16 ajax/upload.php:45
+msgid "Unable to set upload directory."
+msgstr ""
+
+#: ajax/upload.php:22
+msgid "Invalid Token"
+msgstr ""
+
+#: ajax/upload.php:59
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: ajax/upload.php:26
+#: ajax/upload.php:66
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/upload.php:27
+#: ajax/upload.php:67
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:29
+#: ajax/upload.php:69
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/upload.php:30
+#: ajax/upload.php:70
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/upload.php:31
+#: ajax/upload.php:71
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/upload.php:32
+#: ajax/upload.php:72
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/upload.php:33
+#: ajax/upload.php:73
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:51
+#: ajax/upload.php:91
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:83
+#: ajax/upload.php:123
 msgid "Invalid directory."
 msgstr ""
 
@@ -74,6 +82,36 @@ msgstr ""
 msgid "Files"
 msgstr ""
 
+#: js/file-upload.js:11
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/file-upload.js:24
+msgid "Not enough space available"
+msgstr ""
+
+#: js/file-upload.js:64
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/file-upload.js:167 js/files.js:266
+msgid ""
+"File upload is in progress. Leaving the page now will cancel the upload."
+msgstr ""
+
+#: js/file-upload.js:233 js/files.js:339
+msgid "URL cannot be empty."
+msgstr ""
+
+#: js/file-upload.js:238 lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr ""
+
+#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
+#: js/files.js:693 js/files.js:731
+msgid "Error"
+msgstr ""
+
 #: js/fileactions.js:116
 msgid "Share"
 msgstr "Podijeli"
@@ -90,43 +128,43 @@ msgstr ""
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:464
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:259
+#: js/filelist.js:302
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:306
+#: js/filelist.js:349
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:306
+#: js/filelist.js:349
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:331
+#: js/filelist.js:374
 msgid "perform delete operation"
 msgstr ""
 
-#: js/filelist.js:413
+#: js/filelist.js:456
 msgid "1 file uploading"
 msgstr ""
 
-#: js/filelist.js:416 js/filelist.js:470
+#: js/filelist.js:459 js/filelist.js:517
 msgid "files uploading"
 msgstr ""
 
@@ -158,69 +196,41 @@ msgid ""
 "big."
 msgstr ""
 
-#: js/files.js:264
-msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr ""
-
-#: js/files.js:277
-msgid "Not enough space available"
-msgstr ""
-
-#: js/files.js:317
-msgid "Upload cancelled."
-msgstr ""
-
-#: js/files.js:413
-msgid ""
-"File upload is in progress. Leaving the page now will cancel the upload."
-msgstr ""
-
-#: js/files.js:486
-msgid "URL cannot be empty."
-msgstr ""
-
-#: js/files.js:491
+#: js/files.js:344
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
-msgid "Error"
-msgstr ""
-
-#: js/files.js:877 templates/index.php:69
+#: js/files.js:744 templates/index.php:69
 msgid "Name"
 msgstr "Ime"
 
-#: js/files.js:878 templates/index.php:80
+#: js/files.js:745 templates/index.php:80
 msgid "Size"
 msgstr "Veličina"
 
-#: js/files.js:879 templates/index.php:82
+#: js/files.js:746 templates/index.php:82
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:898
+#: js/files.js:765
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:900
+#: js/files.js:767
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:908
+#: js/files.js:775
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:910
+#: js/files.js:777
 msgid "{count} files"
 msgstr ""
 
-#: lib/app.php:53
-msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
-msgstr ""
-
 #: lib/app.php:73
-msgid "Unable to rename file"
+#, php-format
+msgid "%s could not be renamed"
 msgstr ""
 
 #: lib/helper.php:11 templates/index.php:18
@@ -317,6 +327,22 @@ msgstr ""
 msgid "Current scanning"
 msgstr ""
 
+#: templates/part.list.php:76
+msgid "directory"
+msgstr ""
+
+#: templates/part.list.php:78
+msgid "directories"
+msgstr ""
+
+#: templates/part.list.php:87
+msgid "file"
+msgstr ""
+
+#: templates/part.list.php:89
+msgid "files"
+msgstr ""
+
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
 msgstr ""
diff --git a/l10n/bs/files_encryption.po b/l10n/bs/files_encryption.po
index a93b63ecb966c2f2562b17dae16ada8ff288e6d0..15de964f5c6e9c322a13a734de2248425adb206f 100644
--- a/l10n/bs/files_encryption.po
+++ b/l10n/bs/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-15 01:58+0200\n"
-"PO-Revision-Date: 2013-06-14 19:40+0000\n"
+"POT-Creation-Date: 2013-07-05 02:12+0200\n"
+"PO-Revision-Date: 2013-07-05 00:13+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Bosnian (http://www.transifex.com/projects/p/owncloud/language/bs/)\n"
 "MIME-Version: 1.0\n"
@@ -55,9 +55,21 @@ msgstr ""
 
 #: files/error.php:7
 msgid ""
-"Your private key is not valid! Maybe your password was changed from outside."
-" You can update your private key password in your personal settings to "
-"regain access to your files"
+"Your private key is not valid! Likely your password was changed outside the "
+"ownCloud system (e.g. your corporate directory). You can update your private"
+" key password in your personal settings to recover access to your encrypted "
+"files."
+msgstr ""
+
+#: hooks/hooks.php:44
+msgid "Missing requirements."
+msgstr ""
+
+#: hooks/hooks.php:45
+msgid ""
+"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL "
+"PHP extension is enabled and configured properly. For now, the encryption "
+"app has been disabled."
 msgstr ""
 
 #: js/settings-admin.js:11
@@ -84,11 +96,11 @@ msgstr ""
 
 #: templates/settings-admin.php:10
 msgid ""
-"Enable encryption passwords recovery key (allow sharing to recovery key):"
+"Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
 #: templates/settings-admin.php:14
-msgid "Recovery account password"
+msgid "Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:21 templates/settings-personal.php:54
@@ -100,15 +112,15 @@ msgid "Disabled"
 msgstr ""
 
 #: templates/settings-admin.php:34
-msgid "Change encryption passwords recovery key:"
+msgid "Change recovery key password:"
 msgstr ""
 
 #: templates/settings-admin.php:41
-msgid "Old Recovery account password"
+msgid "Old Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:48
-msgid "New Recovery account password"
+msgid "New Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:53
diff --git a/l10n/bs/files_sharing.po b/l10n/bs/files_sharing.po
index 97a30ec7e14eb26d356da1bc077b99236095bd81..6893cf5162b3b13592e593b33c10ae8dde9d8ffa 100644
--- a/l10n/bs/files_sharing.po
+++ b/l10n/bs/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-14 02:47+0200\n"
-"PO-Revision-Date: 2013-06-14 00:48+0000\n"
+"POT-Creation-Date: 2013-07-05 02:13+0200\n"
+"PO-Revision-Date: 2013-07-05 00:13+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Bosnian (http://www.transifex.com/projects/p/owncloud/language/bs/)\n"
 "MIME-Version: 1.0\n"
@@ -18,27 +18,39 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: templates/authenticate.php:4
+msgid "The password is wrong. Try again."
+msgstr ""
+
+#: templates/authenticate.php:7
 msgid "Password"
 msgstr ""
 
-#: templates/authenticate.php:6
+#: templates/authenticate.php:9
 msgid "Submit"
 msgstr ""
 
-#: templates/public.php:10
+#: templates/public.php:17
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr ""
 
-#: templates/public.php:13
+#: templates/public.php:20
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr ""
 
-#: templates/public.php:19 templates/public.php:43
+#: templates/public.php:28 templates/public.php:86
 msgid "Download"
 msgstr ""
 
-#: templates/public.php:40
+#: templates/public.php:44
+msgid "Upload"
+msgstr ""
+
+#: templates/public.php:54
+msgid "Cancel upload"
+msgstr ""
+
+#: templates/public.php:83
 msgid "No preview available for"
 msgstr ""
diff --git a/l10n/bs/files_trashbin.po b/l10n/bs/files_trashbin.po
index 1136da204993222b55bad5608d8f10a53f75789d..3b21b7aa2df14f6f3bf35aaeec660588ae368d9f 100644
--- a/l10n/bs/files_trashbin.po
+++ b/l10n/bs/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:16+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Bosnian (http://www.transifex.com/projects/p/owncloud/language/bs/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/bs/lib.po b/l10n/bs/lib.po
index 91bc2323395d5af397df28623d7f8c9f1ad8b441..815a68397d76344764eb4358f9ff4791785c40ec 100644
--- a/l10n/bs/lib.po
+++ b/l10n/bs/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-13 02:16+0200\n"
-"PO-Revision-Date: 2013-06-12 21:41+0000\n"
+"POT-Creation-Date: 2013-07-05 02:13+0200\n"
+"PO-Revision-Date: 2013-07-05 00:13+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Bosnian (http://www.transifex.com/projects/p/owncloud/language/bs/)\n"
 "MIME-Version: 1.0\n"
@@ -17,30 +17,34 @@ msgstr ""
 "Language: bs\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: app.php:358
+#: app.php:360
 msgid "Help"
 msgstr ""
 
-#: app.php:371
+#: app.php:373
 msgid "Personal"
 msgstr ""
 
-#: app.php:382
+#: app.php:384
 msgid "Settings"
 msgstr ""
 
-#: app.php:394
+#: app.php:396
 msgid "Users"
 msgstr ""
 
-#: app.php:407
+#: app.php:409
 msgid "Apps"
 msgstr ""
 
-#: app.php:415
+#: app.php:417
 msgid "Admin"
 msgstr ""
 
+#: defaults.php:33
+msgid "web services under your control"
+msgstr ""
+
 #: files.php:210
 msgid "ZIP download is turned off."
 msgstr ""
@@ -85,104 +89,102 @@ msgstr ""
 msgid "Images"
 msgstr ""
 
-#: setup.php:34
-msgid "Set an admin username."
-msgstr ""
-
-#: setup.php:37
-msgid "Set an admin password."
-msgstr ""
-
-#: setup.php:55
+#: setup/abstractdatabase.php:22
 #, php-format
 msgid "%s enter the database username."
 msgstr ""
 
-#: setup.php:58
+#: setup/abstractdatabase.php:25
 #, php-format
 msgid "%s enter the database name."
 msgstr ""
 
-#: setup.php:61
+#: setup/abstractdatabase.php:28
 #, php-format
 msgid "%s you may not use dots in the database name"
 msgstr ""
 
-#: setup.php:64
+#: setup/mssql.php:20
 #, php-format
-msgid "%s set the database host."
-msgstr ""
-
-#: setup.php:126 setup.php:323 setup.php:368
-msgid "PostgreSQL username and/or password not valid"
+msgid "MS SQL username and/or password not valid: %s"
 msgstr ""
 
-#: setup.php:127 setup.php:232
+#: setup/mssql.php:21 setup/mysql.php:13 setup/oci.php:114
+#: setup/postgresql.php:24 setup/postgresql.php:70
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:149
-msgid "Oracle connection could not be established"
-msgstr ""
-
-#: setup.php:231
+#: setup/mysql.php:12
 msgid "MySQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:285 setup.php:389 setup.php:398 setup.php:416 setup.php:426
-#: setup.php:435 setup.php:468 setup.php:534 setup.php:560 setup.php:567
-#: setup.php:578 setup.php:585 setup.php:594 setup.php:602 setup.php:611
-#: setup.php:617
+#: setup/mysql.php:67 setup/oci.php:54 setup/oci.php:121 setup/oci.php:147
+#: setup/oci.php:154 setup/oci.php:165 setup/oci.php:172 setup/oci.php:181
+#: setup/oci.php:189 setup/oci.php:198 setup/oci.php:204
+#: setup/postgresql.php:89 setup/postgresql.php:98 setup/postgresql.php:115
+#: setup/postgresql.php:125 setup/postgresql.php:134
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr ""
 
-#: setup.php:286 setup.php:390 setup.php:399 setup.php:417 setup.php:427
-#: setup.php:436 setup.php:469 setup.php:535 setup.php:561 setup.php:568
-#: setup.php:579 setup.php:595 setup.php:603 setup.php:612
+#: setup/mysql.php:68 setup/oci.php:55 setup/oci.php:122 setup/oci.php:148
+#: setup/oci.php:155 setup/oci.php:166 setup/oci.php:182 setup/oci.php:190
+#: setup/oci.php:199 setup/postgresql.php:90 setup/postgresql.php:99
+#: setup/postgresql.php:116 setup/postgresql.php:126 setup/postgresql.php:135
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:302
+#: setup/mysql.php:85
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:303
+#: setup/mysql.php:86
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:308
+#: setup/mysql.php:91
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:309
+#: setup/mysql.php:92
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:460 setup.php:527
+#: setup/oci.php:34
+msgid "Oracle connection could not be established"
+msgstr ""
+
+#: setup/oci.php:41 setup/oci.php:113
 msgid "Oracle username and/or password not valid"
 msgstr ""
 
-#: setup.php:586 setup.php:618
+#: setup/oci.php:173 setup/oci.php:205
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:638
-#, php-format
-msgid "MS SQL username and/or password not valid: %s"
+#: setup/postgresql.php:23 setup/postgresql.php:69
+msgid "PostgreSQL username and/or password not valid"
+msgstr ""
+
+#: setup.php:42
+msgid "Set an admin username."
+msgstr ""
+
+#: setup.php:45
+msgid "Set an admin password."
 msgstr ""
 
-#: setup.php:861
+#: setup.php:198
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:862
+#: setup.php:199
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
diff --git a/l10n/bs/settings.po b/l10n/bs/settings.po
index 28ed4328d562f315030f9e3230232db957922d7a..49240912ef2f094ff0ec897b829540a82e237d77 100644
--- a/l10n/bs/settings.po
+++ b/l10n/bs/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-15 01:59+0200\n"
-"PO-Revision-Date: 2013-06-14 19:40+0000\n"
+"POT-Creation-Date: 2013-07-09 02:04+0200\n"
+"PO-Revision-Date: 2013-07-09 00:04+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Bosnian (http://www.transifex.com/projects/p/owncloud/language/bs/)\n"
 "MIME-Version: 1.0\n"
@@ -88,35 +88,35 @@ msgstr ""
 msgid "Couldn't update app."
 msgstr ""
 
-#: js/apps.js:30
+#: js/apps.js:35
 msgid "Update to {appversion}"
 msgstr ""
 
-#: js/apps.js:36 js/apps.js:76
+#: js/apps.js:41 js/apps.js:81
 msgid "Disable"
 msgstr ""
 
-#: js/apps.js:36 js/apps.js:64 js/apps.js:83
+#: js/apps.js:41 js/apps.js:69 js/apps.js:88
 msgid "Enable"
 msgstr ""
 
-#: js/apps.js:55
+#: js/apps.js:60
 msgid "Please wait...."
 msgstr ""
 
-#: js/apps.js:59 js/apps.js:71 js/apps.js:80 js/apps.js:93
+#: js/apps.js:64 js/apps.js:76 js/apps.js:85 js/apps.js:98
 msgid "Error"
 msgstr ""
 
-#: js/apps.js:90
+#: js/apps.js:95
 msgid "Updating...."
 msgstr ""
 
-#: js/apps.js:93
+#: js/apps.js:98
 msgid "Error while updating app"
 msgstr ""
 
-#: js/apps.js:96
+#: js/apps.js:101
 msgid "Updated"
 msgstr ""
 
@@ -165,15 +165,15 @@ msgstr ""
 msgid "A valid password must be provided"
 msgstr ""
 
-#: personal.php:35 personal.php:36
+#: personal.php:37 personal.php:38
 msgid "__language_name__"
 msgstr ""
 
-#: templates/admin.php:15
+#: templates/admin.php:17
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:18
+#: templates/admin.php:20
 msgid ""
 "Your data directory and your files are probably accessible from the "
 "internet. The .htaccess file that ownCloud provides is not working. We "
@@ -182,36 +182,36 @@ msgid ""
 " webserver document root."
 msgstr ""
 
-#: templates/admin.php:29
+#: templates/admin.php:31
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:32
+#: templates/admin.php:34
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: templates/admin.php:33
+#: templates/admin.php:35
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:44
+#: templates/admin.php:46
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:47
+#: templates/admin.php:49
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr ""
 
-#: templates/admin.php:58
+#: templates/admin.php:60
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:63
+#: templates/admin.php:65
 #, php-format
 msgid ""
 "This ownCloud server can't set system locale to %s. This means that there "
@@ -219,11 +219,11 @@ msgid ""
 " to install the required packages on your system to support %s."
 msgstr ""
 
-#: templates/admin.php:75
+#: templates/admin.php:77
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:78
+#: templates/admin.php:80
 msgid ""
 "This ownCloud server has no working internet connection. This means that "
 "some of the features like mounting of external storage, notifications about "
@@ -233,102 +233,102 @@ msgid ""
 " of ownCloud."
 msgstr ""
 
-#: templates/admin.php:92
+#: templates/admin.php:94
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:101
+#: templates/admin.php:103
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:111
+#: templates/admin.php:113
 msgid ""
 "cron.php is registered at a webcron service. Call the cron.php page in the "
 "owncloud root once a minute over http."
 msgstr ""
 
-#: templates/admin.php:121
+#: templates/admin.php:123
 msgid ""
 "Use systems cron service. Call the cron.php file in the owncloud folder via "
 "a system cronjob once a minute."
 msgstr ""
 
-#: templates/admin.php:128
+#: templates/admin.php:130
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:134
+#: templates/admin.php:136
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:135
+#: templates/admin.php:137
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:142
+#: templates/admin.php:144
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:143
+#: templates/admin.php:145
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:150
+#: templates/admin.php:152
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:151
+#: templates/admin.php:153
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:158
+#: templates/admin.php:160
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:161
+#: templates/admin.php:163
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:168
+#: templates/admin.php:170
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:181
+#: templates/admin.php:183
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:182
+#: templates/admin.php:184
 msgid ""
 "Enforces the clients to connect to ownCloud via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:185
+#: templates/admin.php:187
 msgid ""
 "Please connect to this ownCloud instance via HTTPS to enable or disable the "
 "SSL enforcement."
 msgstr ""
 
-#: templates/admin.php:195
+#: templates/admin.php:197
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:196
+#: templates/admin.php:198
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:227
+#: templates/admin.php:229
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:228
+#: templates/admin.php:230
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:235 templates/personal.php:116
+#: templates/admin.php:236 templates/personal.php:116
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:237 templates/personal.php:119
+#: templates/admin.php:240 templates/personal.php:119
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -386,76 +386,79 @@ msgstr ""
 msgid "Commercial Support"
 msgstr ""
 
-#: templates/personal.php:9
+#: templates/personal.php:10
 msgid "Get the apps to sync your files"
 msgstr ""
 
-#: templates/personal.php:20
+#: templates/personal.php:21
 msgid "Show First Run Wizard again"
 msgstr ""
 
-#: templates/personal.php:28
+#: templates/personal.php:29
 #, php-format
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr ""
 
-#: templates/personal.php:40 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:41 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr ""
 
-#: templates/personal.php:41
+#: templates/personal.php:42
 msgid "Your password was changed"
 msgstr ""
 
-#: templates/personal.php:42
+#: templates/personal.php:43
 msgid "Unable to change your password"
 msgstr ""
 
-#: templates/personal.php:43
+#: templates/personal.php:44
 msgid "Current password"
 msgstr ""
 
-#: templates/personal.php:45
+#: templates/personal.php:46
 msgid "New password"
 msgstr ""
 
-#: templates/personal.php:47
+#: templates/personal.php:48
 msgid "Change password"
 msgstr ""
 
-#: templates/personal.php:59 templates/users.php:85
+#: templates/personal.php:60 templates/users.php:85
 msgid "Display Name"
 msgstr ""
 
-#: templates/personal.php:74
+#: templates/personal.php:75
 msgid "Email"
 msgstr ""
 
-#: templates/personal.php:76
+#: templates/personal.php:77
 msgid "Your email address"
 msgstr ""
 
-#: templates/personal.php:77
+#: templates/personal.php:78
 msgid "Fill in an email address to enable password recovery"
 msgstr ""
 
-#: templates/personal.php:86 templates/personal.php:87
+#: templates/personal.php:87 templates/personal.php:88
 msgid "Language"
 msgstr ""
 
-#: templates/personal.php:99
+#: templates/personal.php:100
 msgid "Help translate"
 msgstr ""
 
-#: templates/personal.php:105
+#: templates/personal.php:106
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:107
-msgid "Use this address to connect to your ownCloud in your file manager"
+#: templates/personal.php:108
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
+"target=\"_blank\">access your Files via WebDAV</a>"
 msgstr ""
 
-#: templates/users.php:21 templates/users.php:84
+#: templates/users.php:21
 msgid "Login Name"
 msgstr ""
 
@@ -485,6 +488,10 @@ msgstr ""
 msgid "Other"
 msgstr ""
 
+#: templates/users.php:84
+msgid "Username"
+msgstr ""
+
 #: templates/users.php:91
 msgid "Storage"
 msgstr ""
diff --git a/l10n/ca/core.po b/l10n/ca/core.po
index 596fa81c739b44734bc904d24a034d62bbbc22b4..dac002f2fdf175a1095440d19953e0140ff58f3c 100644
--- a/l10n/ca/core.po
+++ b/l10n/ca/core.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:22+0000\n"
-"Last-Translator: rogerc\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:14+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"
@@ -63,135 +63,135 @@ msgstr "No hi ha categories per eliminar."
 msgid "Error removing %s from favorites."
 msgstr "Error en eliminar %s dels preferits."
 
-#: js/config.php:34
+#: js/config.php:32
 msgid "Sunday"
 msgstr "Diumenge"
 
-#: js/config.php:35
+#: js/config.php:33
 msgid "Monday"
 msgstr "Dilluns"
 
-#: js/config.php:36
+#: js/config.php:34
 msgid "Tuesday"
 msgstr "Dimarts"
 
-#: js/config.php:37
+#: js/config.php:35
 msgid "Wednesday"
 msgstr "Dimecres"
 
-#: js/config.php:38
+#: js/config.php:36
 msgid "Thursday"
 msgstr "Dijous"
 
-#: js/config.php:39
+#: js/config.php:37
 msgid "Friday"
 msgstr "Divendres"
 
-#: js/config.php:40
+#: js/config.php:38
 msgid "Saturday"
 msgstr "Dissabte"
 
-#: js/config.php:45
+#: js/config.php:43
 msgid "January"
 msgstr "Gener"
 
-#: js/config.php:46
+#: js/config.php:44
 msgid "February"
 msgstr "Febrer"
 
-#: js/config.php:47
+#: js/config.php:45
 msgid "March"
 msgstr "Març"
 
-#: js/config.php:48
+#: js/config.php:46
 msgid "April"
 msgstr "Abril"
 
-#: js/config.php:49
+#: js/config.php:47
 msgid "May"
 msgstr "Maig"
 
-#: js/config.php:50
+#: js/config.php:48
 msgid "June"
 msgstr "Juny"
 
-#: js/config.php:51
+#: js/config.php:49
 msgid "July"
 msgstr "Juliol"
 
-#: js/config.php:52
+#: js/config.php:50
 msgid "August"
 msgstr "Agost"
 
-#: js/config.php:53
+#: js/config.php:51
 msgid "September"
 msgstr "Setembre"
 
-#: js/config.php:54
+#: js/config.php:52
 msgid "October"
 msgstr "Octubre"
 
-#: js/config.php:55
+#: js/config.php:53
 msgid "November"
 msgstr "Novembre"
 
-#: js/config.php:56
+#: js/config.php:54
 msgid "December"
 msgstr "Desembre"
 
-#: js/js.js:286
+#: js/js.js:293
 msgid "Settings"
 msgstr "Configuració"
 
-#: js/js.js:718
+#: js/js.js:725
 msgid "seconds ago"
 msgstr "segons enrere"
 
-#: js/js.js:719
+#: js/js.js:726
 msgid "1 minute ago"
 msgstr "fa 1 minut"
 
-#: js/js.js:720
+#: js/js.js:727
 msgid "{minutes} minutes ago"
 msgstr "fa {minutes} minuts"
 
-#: js/js.js:721
+#: js/js.js:728
 msgid "1 hour ago"
 msgstr "fa 1 hora"
 
-#: js/js.js:722
+#: js/js.js:729
 msgid "{hours} hours ago"
 msgstr "fa {hours} hores"
 
-#: js/js.js:723
+#: js/js.js:730
 msgid "today"
 msgstr "avui"
 
-#: js/js.js:724
+#: js/js.js:731
 msgid "yesterday"
 msgstr "ahir"
 
-#: js/js.js:725
+#: js/js.js:732
 msgid "{days} days ago"
 msgstr "fa {days} dies"
 
-#: js/js.js:726
+#: js/js.js:733
 msgid "last month"
 msgstr "el mes passat"
 
-#: js/js.js:727
+#: js/js.js:734
 msgid "{months} months ago"
 msgstr "fa {months} mesos"
 
-#: js/js.js:728
+#: js/js.js:735
 msgid "months ago"
 msgstr "mesos enrere"
 
-#: js/js.js:729
+#: js/js.js:736
 msgid "last year"
 msgstr "l'any passat"
 
-#: js/js.js:730
+#: js/js.js:737
 msgid "years ago"
 msgstr "anys enrere"
 
@@ -227,8 +227,8 @@ msgstr "No s'ha especificat el tipus d'objecte."
 #: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
 #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:577
-#: js/share.js:589
+#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:620
+#: js/share.js:632
 msgid "Error"
 msgstr "Error"
 
@@ -248,7 +248,7 @@ msgstr "Compartit"
 msgid "Share"
 msgstr "Comparteix"
 
-#: js/share.js:125 js/share.js:617
+#: js/share.js:125 js/share.js:660
 msgid "Error while sharing"
 msgstr "Error en compartir"
 
@@ -268,99 +268,103 @@ msgstr "Compartit amb vos i amb el grup {group} per {owner}"
 msgid "Shared with you by {owner}"
 msgstr "Compartit amb vos per {owner}"
 
-#: js/share.js:159
+#: js/share.js:172
 msgid "Share with"
 msgstr "Comparteix amb"
 
-#: js/share.js:164
+#: js/share.js:177
 msgid "Share with link"
 msgstr "Comparteix amb enllaç"
 
-#: js/share.js:167
+#: js/share.js:180
 msgid "Password protect"
 msgstr "Protegir amb contrasenya"
 
-#: js/share.js:169 templates/installation.php:54 templates/login.php:26
+#: js/share.js:182 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "Contrasenya"
 
-#: js/share.js:173
+#: js/share.js:187
+msgid "Allow Public Upload"
+msgstr "Permet pujada pública"
+
+#: js/share.js:191
 msgid "Email link to person"
 msgstr "Enllaç per correu electrónic amb la persona"
 
-#: js/share.js:174
+#: js/share.js:192
 msgid "Send"
 msgstr "Envia"
 
-#: js/share.js:178
+#: js/share.js:197
 msgid "Set expiration date"
 msgstr "Estableix la data de venciment"
 
-#: js/share.js:179
+#: js/share.js:198
 msgid "Expiration date"
 msgstr "Data de venciment"
 
-#: js/share.js:211
+#: js/share.js:230
 msgid "Share via email:"
 msgstr "Comparteix per correu electrònic"
 
-#: js/share.js:213
+#: js/share.js:232
 msgid "No people found"
 msgstr "No s'ha trobat ningú"
 
-#: js/share.js:251
+#: js/share.js:270
 msgid "Resharing is not allowed"
 msgstr "No es permet compartir de nou"
 
-#: js/share.js:287
+#: js/share.js:306
 msgid "Shared in {item} with {user}"
 msgstr "Compartit en {item} amb {user}"
 
-#: js/share.js:308
+#: js/share.js:327
 msgid "Unshare"
 msgstr "Deixa de compartir"
 
-#: js/share.js:320
+#: js/share.js:339
 msgid "can edit"
 msgstr "pot editar"
 
-#: js/share.js:322
+#: js/share.js:341
 msgid "access control"
 msgstr "control d'accés"
 
-#: js/share.js:325
+#: js/share.js:344
 msgid "create"
 msgstr "crea"
 
-#: js/share.js:328
+#: js/share.js:347
 msgid "update"
 msgstr "actualitza"
 
-#: js/share.js:331
+#: js/share.js:350
 msgid "delete"
 msgstr "elimina"
 
-#: js/share.js:334
+#: js/share.js:353
 msgid "share"
 msgstr "comparteix"
 
-#: js/share.js:368 js/share.js:564
+#: js/share.js:387 js/share.js:607
 msgid "Password protected"
 msgstr "Protegeix amb contrasenya"
 
-#: js/share.js:577
+#: js/share.js:620
 msgid "Error unsetting expiration date"
 msgstr "Error en eliminar la data de venciment"
 
-#: js/share.js:589
+#: js/share.js:632
 msgid "Error setting expiration date"
 msgstr "Error en establir la data de venciment"
 
-#: js/share.js:604
+#: js/share.js:647
 msgid "Sending ..."
 msgstr "Enviant..."
 
-#: js/share.js:615
+#: js/share.js:658
 msgid "Email sent"
 msgstr "El correu electrónic s'ha enviat"
 
@@ -375,7 +379,7 @@ msgstr "L'actualització ha estat incorrecte. Comuniqueu aquest error a <a href=
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "L'actualització ha estat correcte. Ara us redirigim a ownCloud."
 
-#: lostpassword/controller.php:58
+#: lostpassword/controller.php:60
 msgid "ownCloud password reset"
 msgstr "estableix de nou la contrasenya Owncloud"
 
@@ -405,17 +409,17 @@ msgstr "Nom d'usuari"
 
 #: lostpassword/templates/lostpassword.php:22
 msgid ""
-"Your files seems to be encrypted. If you didn't have enabled the recovery "
-"key there will be no way to get your data back once the password was "
-"resetted. If you are not sure what to do, please contact your administrator "
-"first before continue. Do you really want to continue?"
-msgstr "Els vostres fitxers sembla que estan encriptats. Si no tenieu habilitada la clau de recuperació no hi haurà manera de recuperar les dades quan reestabliu la contrasenya. Si no sabeu què fer, contacteu amb l'administrador abans de continuar. Voleu continuar?"
+"Your files are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
+msgstr "Els vostres fitxers estan encriptats. Si no heu habilitat la clau de recuperació no hi haurà manera de recuperar les dades després que reestabliu la contrasenya. Si sabeu què fer, contacteu amb l'administrador abans de continuar. Voleu continuar?"
 
 #: lostpassword/templates/lostpassword.php:24
 msgid "Yes, I really want to reset my password now"
 msgstr "Sí, vull restablir ara la contrasenya"
 
-#: lostpassword/templates/lostpassword.php:29
+#: lostpassword/templates/lostpassword.php:27
 msgid "Request reset"
 msgstr "Sol·licita reinicialització"
 
@@ -463,7 +467,7 @@ msgstr "Accés prohibit"
 msgid "Cloud not found"
 msgstr "No s'ha trobat el núvol"
 
-#: templates/altmail.php:2
+#: templates/altmail.php:4
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -474,10 +478,6 @@ msgid ""
 "Cheers!"
 msgstr "Ei,\n\nnomés fer-te saber que %s ha compartit %s amb tu.\nMira-ho: %s\n\nSalut!"
 
-#: templates/altmail.php:7 templates/mail.php:24
-msgid "web services under your control"
-msgstr "controleu els vostres serveis web"
-
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
 msgstr "Edita les categories"
@@ -570,12 +570,12 @@ msgstr "Ordinador central de la base de dades"
 msgid "Finish setup"
 msgstr "Acaba la configuració"
 
-#: templates/layout.user.php:40
+#: templates/layout.user.php:43
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr "%s està disponible. Obtingueu més informació de com actualitzar."
 
-#: templates/layout.user.php:67
+#: templates/layout.user.php:68
 msgid "Log out"
 msgstr "Surt"
 
@@ -609,7 +609,7 @@ msgstr "Inici de sessió"
 msgid "Alternative Logins"
 msgstr "Acreditacions alternatives"
 
-#: templates/mail.php:15
+#: templates/mail.php:16
 #, php-format
 msgid ""
 "Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
diff --git a/l10n/ca/files.po b/l10n/ca/files.po
index 2627e21034cc37ed3b3acf4a1d00e62b05a32c4e..c0ab8d1e69a0a630903dc179efddb976a50fd6d4 100644
--- a/l10n/ca/files.po
+++ b/l10n/ca/files.po
@@ -4,13 +4,14 @@
 # 
 # Translators:
 # rogerc, 2013
+# Josep Tomàs <jtomas.binsoft@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:01+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
-"Last-Translator: rogerc\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
+"Last-Translator: Josep Tomàs <jtomas.binsoft@gmail.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"
@@ -28,46 +29,54 @@ msgstr "No s'ha pogut moure %s - Ja hi ha un fitxer amb aquest nom"
 msgid "Could not move %s"
 msgstr " No s'ha pogut moure %s"
 
-#: ajax/upload.php:19
+#: ajax/upload.php:16 ajax/upload.php:45
+msgid "Unable to set upload directory."
+msgstr "No es pot establir la carpeta de pujada."
+
+#: ajax/upload.php:22
+msgid "Invalid Token"
+msgstr "Testimoni no vàlid"
+
+#: ajax/upload.php:59
 msgid "No file was uploaded. Unknown error"
 msgstr "No s'ha carregat cap fitxer. Error desconegut"
 
-#: ajax/upload.php:26
+#: ajax/upload.php:66
 msgid "There is no error, the file uploaded with success"
 msgstr "No hi ha errors, el fitxer s'ha carregat correctament"
 
-#: ajax/upload.php:27
+#: ajax/upload.php:67
 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:29
+#: ajax/upload.php:69
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "El fitxer carregat supera la directiva MAX_FILE_SIZE especificada al formulari HTML"
 
-#: ajax/upload.php:30
+#: ajax/upload.php:70
 msgid "The uploaded file was only partially uploaded"
 msgstr "El fitxer només s'ha carregat parcialment"
 
-#: ajax/upload.php:31
+#: ajax/upload.php:71
 msgid "No file was uploaded"
 msgstr "No s'ha carregat cap fitxer"
 
-#: ajax/upload.php:32
+#: ajax/upload.php:72
 msgid "Missing a temporary folder"
 msgstr "Falta un fitxer temporal"
 
-#: ajax/upload.php:33
+#: ajax/upload.php:73
 msgid "Failed to write to disk"
 msgstr "Ha fallat en escriure al disc"
 
-#: ajax/upload.php:51
+#: ajax/upload.php:91
 msgid "Not enough storage available"
 msgstr "No hi ha prou espai disponible"
 
-#: ajax/upload.php:83
+#: ajax/upload.php:123
 msgid "Invalid directory."
 msgstr "Directori no vàlid."
 
@@ -75,6 +84,36 @@ msgstr "Directori no vàlid."
 msgid "Files"
 msgstr "Fitxers"
 
+#: js/file-upload.js:11
+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/file-upload.js:24
+msgid "Not enough space available"
+msgstr "No hi ha prou espai disponible"
+
+#: js/file-upload.js:64
+msgid "Upload cancelled."
+msgstr "La pujada s'ha cancel·lat."
+
+#: js/file-upload.js:167 js/files.js:266
+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/file-upload.js:233 js/files.js:339
+msgid "URL cannot be empty."
+msgstr "La URL no pot ser buida"
+
+#: js/file-upload.js:238 lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr "Nom de carpeta no vàlid. L'ús de 'Shared' està reservat per Owncloud"
+
+#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
+#: js/files.js:693 js/files.js:731
+msgid "Error"
+msgstr "Error"
+
 #: js/fileactions.js:116
 msgid "Share"
 msgstr "Comparteix"
@@ -91,43 +130,43 @@ msgstr "Esborra"
 msgid "Rename"
 msgstr "Reanomena"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:464
 msgid "Pending"
 msgstr "Pendent"
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "{new_name} already exists"
 msgstr "{new_name} ja existeix"
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "replace"
 msgstr "substitueix"
 
-#: js/filelist.js:259
+#: js/filelist.js:302
 msgid "suggest name"
 msgstr "sugereix un nom"
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "cancel"
 msgstr "cancel·la"
 
-#: js/filelist.js:306
+#: js/filelist.js:349
 msgid "replaced {new_name} with {old_name}"
 msgstr "s'ha substituït {old_name} per {new_name}"
 
-#: js/filelist.js:306
+#: js/filelist.js:349
 msgid "undo"
 msgstr "desfés"
 
-#: js/filelist.js:331
+#: js/filelist.js:374
 msgid "perform delete operation"
 msgstr "executa d'operació d'esborrar"
 
-#: js/filelist.js:413
+#: js/filelist.js:456
 msgid "1 file uploading"
 msgstr "1 fitxer pujant"
 
-#: js/filelist.js:416 js/filelist.js:470
+#: js/filelist.js:459 js/filelist.js:517
 msgid "files uploading"
 msgstr "fitxers pujant"
 
@@ -159,70 +198,42 @@ msgid ""
 "big."
 msgstr "S'està preparant la baixada. Pot trigar una estona si els fitxers són grans."
 
-#: js/files.js:264
-msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "No es pot pujar el fitxer perquè és una carpeta o té 0 bytes"
-
-#: js/files.js:277
-msgid "Not enough space available"
-msgstr "No hi ha prou espai disponible"
-
-#: js/files.js:317
-msgid "Upload cancelled."
-msgstr "La pujada s'ha cancel·lat."
-
-#: js/files.js:413
-msgid ""
-"File upload is in progress. Leaving the page now will cancel the upload."
-msgstr "Hi ha una pujada en curs. Si abandoneu la pàgina la pujada es cancel·larà."
-
-#: js/files.js:486
-msgid "URL cannot be empty."
-msgstr "La URL no pot ser buida"
-
-#: js/files.js:491
+#: js/files.js:344
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Nom de carpeta no vàlid. L'ús de 'Shared' està reservat per Owncloud"
 
-#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
-msgid "Error"
-msgstr "Error"
-
-#: js/files.js:877 templates/index.php:69
+#: js/files.js:744 templates/index.php:69
 msgid "Name"
 msgstr "Nom"
 
-#: js/files.js:878 templates/index.php:80
+#: js/files.js:745 templates/index.php:80
 msgid "Size"
 msgstr "Mida"
 
-#: js/files.js:879 templates/index.php:82
+#: js/files.js:746 templates/index.php:82
 msgid "Modified"
 msgstr "Modificat"
 
-#: js/files.js:898
+#: js/files.js:765
 msgid "1 folder"
 msgstr "1 carpeta"
 
-#: js/files.js:900
+#: js/files.js:767
 msgid "{count} folders"
 msgstr "{count} carpetes"
 
-#: js/files.js:908
+#: js/files.js:775
 msgid "1 file"
 msgstr "1 fitxer"
 
-#: js/files.js:910
+#: js/files.js:777
 msgid "{count} files"
 msgstr "{count} fitxers"
 
-#: lib/app.php:53
-msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
-msgstr "Nom de carpeta no vàlid. L'ús de 'Shared' està reservat per Owncloud"
-
 #: lib/app.php:73
-msgid "Unable to rename file"
-msgstr "No es pot canviar el nom del fitxer"
+#, php-format
+msgid "%s could not be renamed"
+msgstr "%s no es pot canviar el nom"
 
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
@@ -318,6 +329,22 @@ msgstr "S'estan escanejant els fitxers, espereu"
 msgid "Current scanning"
 msgstr "Actualment escanejant"
 
+#: templates/part.list.php:76
+msgid "directory"
+msgstr "directori"
+
+#: templates/part.list.php:78
+msgid "directories"
+msgstr "directoris"
+
+#: templates/part.list.php:87
+msgid "file"
+msgstr "fitxer"
+
+#: templates/part.list.php:89
+msgid "files"
+msgstr "fitxers"
+
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
 msgstr "Actualitzant la memòria de cau del sistema de fitxers..."
diff --git a/l10n/ca/files_encryption.po b/l10n/ca/files_encryption.po
index 6634d4057e5ea0f5b3f3263b64f4ece2dc387a55..7e7d5f535ea4383662480a988a78cb36dae321a3 100644
--- a/l10n/ca/files_encryption.po
+++ b/l10n/ca/files_encryption.po
@@ -5,13 +5,14 @@
 # Translators:
 # rogerc, 2013
 # Jordi Vilalta Prat <jvprat@jvprat.com>, 2013
+# Josep Tomàs <jtomas.binsoft@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-16 01:58+0200\n"
-"PO-Revision-Date: 2013-06-15 21:10+0000\n"
-"Last-Translator: rogerc\n"
+"POT-Creation-Date: 2013-07-06 02:01+0200\n"
+"PO-Revision-Date: 2013-07-05 15:50+0000\n"
+"Last-Translator: Josep Tomàs <jtomas.binsoft@gmail.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"
@@ -57,10 +58,22 @@ msgstr "No s'ha pogut actualitzar la contrasenya de la clau privada. Potser la c
 
 #: files/error.php:7
 msgid ""
-"Your private key is not valid! Maybe your password was changed from outside."
-" You can update your private key password in your personal settings to "
-"regain access to your files"
-msgstr "La clau privada no és vàlida! Potser la contrasenya ha canviat des de fora. Podeu actualitzar la contrasenya de la clau privada a l'arranjament personal per obtenir de nou accés als vostres fitxers"
+"Your private key is not valid! Likely your password was changed outside the "
+"ownCloud system (e.g. your corporate directory). You can update your private"
+" key password in your personal settings to recover access to your encrypted "
+"files."
+msgstr "La clau privada no és vàlida! Probablement la contrasenya va ser canviada des de fora del sistema ownCloud (per exemple, en el directori de l'empresa). Vostè pot actualitzar la contrasenya de clau privada en la seva configuració personal per poder recuperar l'accés en els arxius xifrats."
+
+#: hooks/hooks.php:44
+msgid "Missing requirements."
+msgstr "Manca de requisits."
+
+#: hooks/hooks.php:45
+msgid ""
+"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL "
+"PHP extension is enabled and configured properly. For now, the encryption "
+"app has been disabled."
+msgstr "Assegureu-vos que teniu instal·lada la versió de PHP 5.3.3 o posterior, i que teniu l'extensió OpenSSL PHP activada i configurada correctament. Per ara, l'aplicació de xifrat esta desactivada."
 
 #: js/settings-admin.js:11
 msgid "Saving..."
@@ -86,12 +99,12 @@ msgstr "Xifrat"
 
 #: templates/settings-admin.php:10
 msgid ""
-"Enable encryption passwords recovery key (allow sharing to recovery key):"
-msgstr "Activa la clau de recuperació de contrasenya (permet compartir la clau de recuperació):"
+"Enable recovery key (allow to recover users files in case of password loss):"
+msgstr "Activa la clau de recuperació (permet recuperar fitxers d'usuaris en cas de pèrdua de contrasenya):"
 
 #: templates/settings-admin.php:14
-msgid "Recovery account password"
-msgstr "Contrasenya de recuperació del compte"
+msgid "Recovery key password"
+msgstr "Clau de recuperació de la contrasenya"
 
 #: templates/settings-admin.php:21 templates/settings-personal.php:54
 msgid "Enabled"
@@ -102,16 +115,16 @@ msgid "Disabled"
 msgstr "Desactivat"
 
 #: templates/settings-admin.php:34
-msgid "Change encryption passwords recovery key:"
-msgstr "Canvia la clau de recuperació de la contrasenya:"
+msgid "Change recovery key password:"
+msgstr "Canvia la clau de recuperació de contrasenya:"
 
 #: templates/settings-admin.php:41
-msgid "Old Recovery account password"
-msgstr "Contrasenya de recuperació anterior"
+msgid "Old Recovery key password"
+msgstr "Antiga clau de recuperació de contrasenya"
 
 #: templates/settings-admin.php:48
-msgid "New Recovery account password"
-msgstr "Nova contrasenya de recuperació de compte"
+msgid "New Recovery key password"
+msgstr "Nova clau de recuperació de contrasenya"
 
 #: templates/settings-admin.php:53
 msgid "Change Password"
diff --git a/l10n/ca/files_external.po b/l10n/ca/files_external.po
index 8e2160226e0c21ff4b68929a2a0771774603af54..a2966f0523f7851df9d03287c56db38dcb86935a 100644
--- a/l10n/ca/files_external.po
+++ b/l10n/ca/files_external.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: rogerc\n"
 "Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/ca/files_sharing.po b/l10n/ca/files_sharing.po
index 6f80f22c2044a99d6cc6beec4b47e7259b654886..3ac78e6079fbca4512769fd2c9a622fbbfdecf39 100644
--- a/l10n/ca/files_sharing.po
+++ b/l10n/ca/files_sharing.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# rogerc, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
+"Last-Translator: rogerc\n"
 "Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,27 +19,39 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: templates/authenticate.php:4
+msgid "The password is wrong. Try again."
+msgstr "la contrasenya és incorrecta. Intenteu-ho de nou."
+
+#: templates/authenticate.php:7
 msgid "Password"
 msgstr "Contrasenya"
 
-#: templates/authenticate.php:6
+#: templates/authenticate.php:9
 msgid "Submit"
 msgstr "Envia"
 
-#: templates/public.php:10
+#: templates/public.php:17
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s ha compartit la carpeta %s amb vós"
 
-#: templates/public.php:13
+#: templates/public.php:20
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s ha compartit el fitxer %s amb vós"
 
-#: templates/public.php:19 templates/public.php:43
+#: templates/public.php:28 templates/public.php:90
 msgid "Download"
 msgstr "Baixa"
 
-#: templates/public.php:40
+#: templates/public.php:45 templates/public.php:48
+msgid "Upload"
+msgstr "Puja"
+
+#: templates/public.php:58
+msgid "Cancel upload"
+msgstr "Cancel·la la pujada"
+
+#: templates/public.php:87
 msgid "No preview available for"
 msgstr "No hi ha vista prèvia disponible per a"
diff --git a/l10n/ca/files_trashbin.po b/l10n/ca/files_trashbin.po
index 4b4a9918961ef273161d0050f9b08522b71ec988..bd09bf9de874c673ae79923fd1a0c12ed0913bc8 100644
--- a/l10n/ca/files_trashbin.po
+++ b/l10n/ca/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:16+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/ca/lib.po b/l10n/ca/lib.po
index 177bf8715727f7bb2d91ef25e9f37268c844ece9..6b7660f77a1f3fe82e5b5fba2ab82a01df872299 100644
--- a/l10n/ca/lib.po
+++ b/l10n/ca/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-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
-"Last-Translator: rogerc\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,43 +18,47 @@ msgstr ""
 "Language: ca\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:359
+#: app.php:360
 msgid "Help"
 msgstr "Ajuda"
 
-#: app.php:372
+#: app.php:373
 msgid "Personal"
 msgstr "Personal"
 
-#: app.php:383
+#: app.php:384
 msgid "Settings"
 msgstr "Configuració"
 
-#: app.php:395
+#: app.php:396
 msgid "Users"
 msgstr "Usuaris"
 
-#: app.php:408
+#: app.php:409
 msgid "Apps"
 msgstr "Aplicacions"
 
-#: app.php:416
+#: app.php:417
 msgid "Admin"
 msgstr "Administració"
 
-#: files.php:210
+#: defaults.php:33
+msgid "web services under your control"
+msgstr "controleu els vostres serveis web"
+
+#: files.php:226
 msgid "ZIP download is turned off."
 msgstr "La baixada en ZIP està desactivada."
 
-#: files.php:211
+#: files.php:227
 msgid "Files need to be downloaded one by one."
 msgstr "Els fitxers s'han de baixar d'un en un."
 
-#: files.php:212 files.php:245
+#: files.php:228 files.php:261
 msgid "Back to Files"
 msgstr "Torna a Fitxers"
 
-#: files.php:242
+#: files.php:258
 msgid "Selected files too large to generate zip file."
 msgstr "Els fitxers seleccionats son massa grans per generar un fitxer zip."
 
@@ -86,104 +90,102 @@ msgstr "Text"
 msgid "Images"
 msgstr "Imatges"
 
-#: setup.php:34
-msgid "Set an admin username."
-msgstr "Establiu un nom d'usuari per l'administrador."
-
-#: setup.php:37
-msgid "Set an admin password."
-msgstr "Establiu una contrasenya per l'administrador."
-
-#: setup.php:55
+#: setup/abstractdatabase.php:22
 #, php-format
 msgid "%s enter the database username."
 msgstr "%s escriviu el nom d'usuari de la base de dades."
 
-#: setup.php:58
+#: setup/abstractdatabase.php:25
 #, php-format
 msgid "%s enter the database name."
 msgstr "%s escriviu el nom de la base de dades."
 
-#: setup.php:61
+#: setup/abstractdatabase.php:28
 #, php-format
 msgid "%s you may not use dots in the database name"
 msgstr "%s no podeu usar punts en el nom de la base de dades"
 
-#: setup.php:64
+#: setup/mssql.php:20
 #, php-format
-msgid "%s set the database host."
-msgstr "%s establiu l'ordinador central de la base de dades."
-
-#: setup.php:126 setup.php:332 setup.php:377
-msgid "PostgreSQL username and/or password not valid"
-msgstr "Nom d'usuari i/o contrasenya PostgreSQL no vàlids"
+msgid "MS SQL username and/or password not valid: %s"
+msgstr "Nom d'usuari i/o contrasenya MS SQL no vàlids: %s"
 
-#: setup.php:127 setup.php:235
+#: setup/mssql.php:21 setup/mysql.php:13 setup/oci.php:114
+#: setup/postgresql.php:24 setup/postgresql.php:70
 msgid "You need to enter either an existing account or the administrator."
 msgstr "Heu d'escriure un compte existent o el d'administrador."
 
-#: setup.php:152
-msgid "Oracle connection could not be established"
-msgstr "No s'ha pogut establir la connexió Oracle"
-
-#: setup.php:234
+#: setup/mysql.php:12
 msgid "MySQL username and/or password not valid"
 msgstr "Nom d'usuari i/o contrasenya MySQL no vàlids"
 
-#: setup.php:288 setup.php:398 setup.php:407 setup.php:425 setup.php:435
-#: setup.php:444 setup.php:477 setup.php:543 setup.php:569 setup.php:576
-#: setup.php:587 setup.php:594 setup.php:603 setup.php:611 setup.php:620
-#: setup.php:626
+#: setup/mysql.php:67 setup/oci.php:54 setup/oci.php:121 setup/oci.php:147
+#: setup/oci.php:154 setup/oci.php:165 setup/oci.php:172 setup/oci.php:181
+#: setup/oci.php:189 setup/oci.php:198 setup/oci.php:204
+#: setup/postgresql.php:89 setup/postgresql.php:98 setup/postgresql.php:115
+#: setup/postgresql.php:125 setup/postgresql.php:134
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr "Error DB: \"%s\""
 
-#: setup.php:289 setup.php:399 setup.php:408 setup.php:426 setup.php:436
-#: setup.php:445 setup.php:478 setup.php:544 setup.php:570 setup.php:577
-#: setup.php:588 setup.php:604 setup.php:612 setup.php:621
+#: setup/mysql.php:68 setup/oci.php:55 setup/oci.php:122 setup/oci.php:148
+#: setup/oci.php:155 setup/oci.php:166 setup/oci.php:182 setup/oci.php:190
+#: setup/oci.php:199 setup/postgresql.php:90 setup/postgresql.php:99
+#: setup/postgresql.php:116 setup/postgresql.php:126 setup/postgresql.php:135
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr "L'ordre en conflicte és: \"%s\""
 
-#: setup.php:305
+#: setup/mysql.php:85
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr "L'usuari MySQL '%s'@'localhost' ja existeix."
 
-#: setup.php:306
+#: setup/mysql.php:86
 msgid "Drop this user from MySQL"
 msgstr "Elimina aquest usuari de MySQL"
 
-#: setup.php:311
+#: setup/mysql.php:91
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr "L'usuari MySQL '%s'@'%%' ja existeix"
 
-#: setup.php:312
+#: setup/mysql.php:92
 msgid "Drop this user from MySQL."
 msgstr "Elimina aquest usuari de MySQL."
 
-#: setup.php:469 setup.php:536
+#: setup/oci.php:34
+msgid "Oracle connection could not be established"
+msgstr "No s'ha pogut establir la connexió Oracle"
+
+#: setup/oci.php:41 setup/oci.php:113
 msgid "Oracle username and/or password not valid"
 msgstr "Nom d'usuari i/o contrasenya Oracle no vàlids"
 
-#: setup.php:595 setup.php:627
+#: setup/oci.php:173 setup/oci.php:205
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr "L'ordre en conflicte és: \"%s\", nom: %s, contrasenya: %s"
 
-#: setup.php:647
-#, php-format
-msgid "MS SQL username and/or password not valid: %s"
-msgstr "Nom d'usuari i/o contrasenya MS SQL no vàlids: %s"
+#: setup/postgresql.php:23 setup/postgresql.php:69
+msgid "PostgreSQL username and/or password not valid"
+msgstr "Nom d'usuari i/o contrasenya PostgreSQL no vàlids"
+
+#: setup.php:42
+msgid "Set an admin username."
+msgstr "Establiu un nom d'usuari per l'administrador."
+
+#: setup.php:45
+msgid "Set an admin password."
+msgstr "Establiu una contrasenya per l'administrador."
 
-#: setup.php:870
+#: setup.php:198
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "El servidor web no està configurat correctament per permetre la sincronització de fitxers perquè la interfície WebDAV sembla no funcionar correctament."
 
-#: setup.php:871
+#: setup.php:199
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Comproveu les <a href='%s'>guies d'instal·lació</a>."
diff --git a/l10n/ca/settings.po b/l10n/ca/settings.po
index 638442adba3939f7015a11db2b5c4ab4691e5e90..aa5416edc4bd4e0df79a25c7c41feb2c8678b84e 100644
--- a/l10n/ca/settings.po
+++ b/l10n/ca/settings.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
-"Last-Translator: rogerc\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -90,35 +90,35 @@ msgstr "No es pot eliminar l'usuari del grup %s"
 msgid "Couldn't update app."
 msgstr "No s'ha pogut actualitzar l'aplicació."
 
-#: js/apps.js:30
+#: js/apps.js:35
 msgid "Update to {appversion}"
 msgstr "Actualitza a {appversion}"
 
-#: js/apps.js:36 js/apps.js:76
+#: js/apps.js:41 js/apps.js:81
 msgid "Disable"
 msgstr "Desactiva"
 
-#: js/apps.js:36 js/apps.js:64 js/apps.js:83
+#: js/apps.js:41 js/apps.js:69 js/apps.js:88
 msgid "Enable"
 msgstr "Habilita"
 
-#: js/apps.js:55
+#: js/apps.js:60
 msgid "Please wait...."
 msgstr "Espereu..."
 
-#: js/apps.js:59 js/apps.js:71 js/apps.js:80 js/apps.js:93
+#: js/apps.js:64 js/apps.js:76 js/apps.js:85 js/apps.js:98
 msgid "Error"
 msgstr "Error"
 
-#: js/apps.js:90
+#: js/apps.js:95
 msgid "Updating...."
 msgstr "Actualitzant..."
 
-#: js/apps.js:93
+#: js/apps.js:98
 msgid "Error while updating app"
 msgstr "Error en actualitzar l'aplicació"
 
-#: js/apps.js:96
+#: js/apps.js:101
 msgid "Updated"
 msgstr "Actualitzada"
 
@@ -167,15 +167,15 @@ msgstr "Error en crear l'usuari"
 msgid "A valid password must be provided"
 msgstr "Heu de facilitar una contrasenya vàlida"
 
-#: personal.php:35 personal.php:36
+#: personal.php:37 personal.php:38
 msgid "__language_name__"
 msgstr "Català"
 
-#: templates/admin.php:15
+#: templates/admin.php:17
 msgid "Security Warning"
 msgstr "Avís de seguretat"
 
-#: templates/admin.php:18
+#: templates/admin.php:20
 msgid ""
 "Your data directory and your files are probably accessible from the "
 "internet. The .htaccess file that ownCloud provides is not working. We "
@@ -184,36 +184,36 @@ msgid ""
 " webserver document root."
 msgstr "La carpeta de dades i els fitxers provablement són accessibles des d'internet. El fitxer .htaccess que proporciona ownCloud no funciona. Us recomanem que configureu el vostre servidor web de manera que la carpeta de dades no sigui accessible o que moveu la carpeta de dades fora de la carpeta arrel del servidor web."
 
-#: templates/admin.php:29
+#: templates/admin.php:31
 msgid "Setup Warning"
 msgstr "Avís de configuració"
 
-#: templates/admin.php:32
+#: templates/admin.php:34
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "El servidor web no està configurat correctament per permetre la sincronització de fitxers perquè la interfície WebDAV sembla no funcionar correctament."
 
-#: templates/admin.php:33
+#: templates/admin.php:35
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Comproveu les <a href='%s'>guies d'instal·lació</a>."
 
-#: templates/admin.php:44
+#: templates/admin.php:46
 msgid "Module 'fileinfo' missing"
 msgstr "No s'ha trobat el mòdul 'fileinfo'"
 
-#: templates/admin.php:47
+#: templates/admin.php:49
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr "El mòdul de PHP 'fileinfo' no s'ha trobat. Us recomanem que habiliteu aquest mòdul per obtenir millors resultats amb la detecció mime-type."
 
-#: templates/admin.php:58
+#: templates/admin.php:60
 msgid "Locale not working"
 msgstr "Locale no funciona"
 
-#: templates/admin.php:63
+#: templates/admin.php:65
 #, php-format
 msgid ""
 "This ownCloud server can't set system locale to %s. This means that there "
@@ -221,11 +221,11 @@ msgid ""
 " to install the required packages on your system to support %s."
 msgstr "Aquest servidor ownCloud no pot establir el locale del sistema a %s. Això significa que hi poden haver problemes amb alguns caràcters en el nom dels fitxers. Us recomanem instal·lar els paquets necessaris al sistema per donar suport a %s."
 
-#: templates/admin.php:75
+#: templates/admin.php:77
 msgid "Internet connection not working"
 msgstr "La connexió a internet no funciona"
 
-#: templates/admin.php:78
+#: templates/admin.php:80
 msgid ""
 "This ownCloud server has no working internet connection. This means that "
 "some of the features like mounting of external storage, notifications about "
@@ -235,102 +235,102 @@ msgid ""
 " of ownCloud."
 msgstr "Aquest servidor ownCloud no té cap connexió a internet que funcioni. Això significa que algunes de les característiques com el muntatge d'emmagatzemament externs, les notificacions quant a actualitzacions o la instal·lació d'aplicacions de tercers no funcionarà. L'accés remot a fitxers i l'enviament de correus electrònics podria tampoc no funcionar. Us suggerim que habiliteu la connexió a internet per aquest servidor si voleu gaudir de totes les possibilitats d'ownCloud."
 
-#: templates/admin.php:92
+#: templates/admin.php:94
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:101
+#: templates/admin.php:103
 msgid "Execute one task with each page loaded"
 msgstr "Executa una tasca per cada paquet carregat"
 
-#: templates/admin.php:111
+#: templates/admin.php:113
 msgid ""
 "cron.php is registered at a webcron service. Call the cron.php page in the "
 "owncloud root once a minute over http."
 msgstr "cron.php està registrat en un servei webcron. Feu la crida a cron.php a l'arrel d'ownCloud cada minut a través de http."
 
-#: templates/admin.php:121
+#: templates/admin.php:123
 msgid ""
 "Use systems cron service. Call the cron.php file in the owncloud folder via "
 "a system cronjob once a minute."
 msgstr "Usa un servei cron del sistema. Feu la crida al fitxer cron.php a través d'un cronjob del sistema cada minut."
 
-#: templates/admin.php:128
+#: templates/admin.php:130
 msgid "Sharing"
 msgstr "Compartir"
 
-#: templates/admin.php:134
+#: templates/admin.php:136
 msgid "Enable Share API"
 msgstr "Habilita l'API de compartir"
 
-#: templates/admin.php:135
+#: templates/admin.php:137
 msgid "Allow apps to use the Share API"
 msgstr "Permet que les aplicacions utilitzin l'API de compartir"
 
-#: templates/admin.php:142
+#: templates/admin.php:144
 msgid "Allow links"
 msgstr "Permet enllaços"
 
-#: templates/admin.php:143
+#: templates/admin.php:145
 msgid "Allow users to share items to the public with links"
 msgstr "Permet als usuaris compartir elements amb el públic amb enllaços"
 
-#: templates/admin.php:150
+#: templates/admin.php:152
 msgid "Allow resharing"
 msgstr "Permet compartir de nou"
 
-#: templates/admin.php:151
+#: templates/admin.php:153
 msgid "Allow users to share items shared with them again"
 msgstr "Permet als usuaris compartir de nou elements ja compartits amb ells"
 
-#: templates/admin.php:158
+#: templates/admin.php:160
 msgid "Allow users to share with anyone"
 msgstr "Permet compartir amb qualsevol"
 
-#: templates/admin.php:161
+#: templates/admin.php:163
 msgid "Allow users to only share with users in their groups"
 msgstr "Permet als usuaris compartir només amb els usuaris del seu grup"
 
-#: templates/admin.php:168
+#: templates/admin.php:170
 msgid "Security"
 msgstr "Seguretat"
 
-#: templates/admin.php:181
+#: templates/admin.php:183
 msgid "Enforce HTTPS"
 msgstr "Força HTTPS"
 
-#: templates/admin.php:182
+#: templates/admin.php:184
 msgid ""
 "Enforces the clients to connect to ownCloud via an encrypted connection."
 msgstr "Força als clients la connexió amb ownCloud via una connexió encriptada."
 
-#: templates/admin.php:185
+#: templates/admin.php:187
 msgid ""
 "Please connect to this ownCloud instance via HTTPS to enable or disable the "
 "SSL enforcement."
 msgstr "Connecteu aquesta instància onwCloud via HTTPS per habilitar o deshabilitar el forçament SSL."
 
-#: templates/admin.php:195
+#: templates/admin.php:197
 msgid "Log"
 msgstr "Registre"
 
-#: templates/admin.php:196
+#: templates/admin.php:198
 msgid "Log level"
 msgstr "Nivell de registre"
 
-#: templates/admin.php:227
+#: templates/admin.php:229
 msgid "More"
 msgstr "Més"
 
-#: templates/admin.php:228
+#: templates/admin.php:230
 msgid "Less"
 msgstr "Menys"
 
-#: templates/admin.php:235 templates/personal.php:116
+#: templates/admin.php:236 templates/personal.php:116
 msgid "Version"
 msgstr "Versió"
 
-#: templates/admin.php:237 templates/personal.php:119
+#: templates/admin.php:240 templates/personal.php:119
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -388,76 +388,79 @@ msgstr "Seguiment d'errors"
 msgid "Commercial Support"
 msgstr "Suport comercial"
 
-#: templates/personal.php:9
+#: templates/personal.php:10
 msgid "Get the apps to sync your files"
 msgstr "Obtén les aplicacions per sincronitzar fitxers"
 
-#: templates/personal.php:20
+#: templates/personal.php:21
 msgid "Show First Run Wizard again"
 msgstr "Torna a mostrar l'assistent de primera execució"
 
-#: templates/personal.php:28
+#: templates/personal.php:29
 #, php-format
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "Heu utilitzat <strong>%s</strong> d'un total disponible de <strong>%s</strong>"
 
-#: templates/personal.php:40 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:41 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "Contrasenya"
 
-#: templates/personal.php:41
+#: templates/personal.php:42
 msgid "Your password was changed"
 msgstr "La seva contrasenya s'ha canviat"
 
-#: templates/personal.php:42
+#: templates/personal.php:43
 msgid "Unable to change your password"
 msgstr "No s'ha pogut canviar la contrasenya"
 
-#: templates/personal.php:43
+#: templates/personal.php:44
 msgid "Current password"
 msgstr "Contrasenya actual"
 
-#: templates/personal.php:45
+#: templates/personal.php:46
 msgid "New password"
 msgstr "Contrasenya nova"
 
-#: templates/personal.php:47
+#: templates/personal.php:48
 msgid "Change password"
 msgstr "Canvia la contrasenya"
 
-#: templates/personal.php:59 templates/users.php:85
+#: templates/personal.php:60 templates/users.php:85
 msgid "Display Name"
 msgstr "Nom a mostrar"
 
-#: templates/personal.php:74
+#: templates/personal.php:75
 msgid "Email"
 msgstr "Correu electrònic"
 
-#: templates/personal.php:76
+#: templates/personal.php:77
 msgid "Your email address"
 msgstr "Correu electrònic"
 
-#: templates/personal.php:77
+#: templates/personal.php:78
 msgid "Fill in an email address to enable password recovery"
 msgstr "Ompliu el correu electrònic per activar la recuperació de contrasenya"
 
-#: templates/personal.php:86 templates/personal.php:87
+#: templates/personal.php:87 templates/personal.php:88
 msgid "Language"
 msgstr "Idioma"
 
-#: templates/personal.php:99
+#: templates/personal.php:100
 msgid "Help translate"
 msgstr "Ajudeu-nos amb la traducció"
 
-#: templates/personal.php:105
+#: templates/personal.php:106
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:107
-msgid "Use this address to connect to your ownCloud in your file manager"
-msgstr "Useu aquesta adreça per connectar amb ownCloud des del gestor de fitxers"
+#: templates/personal.php:108
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
+"target=\"_blank\">access your Files via WebDAV</a>"
+msgstr ""
 
-#: templates/users.php:21 templates/users.php:84
+#: templates/users.php:21
 msgid "Login Name"
 msgstr "Nom d'accés"
 
@@ -487,6 +490,10 @@ msgstr "Il·limitat"
 msgid "Other"
 msgstr "Un altre"
 
+#: templates/users.php:84
+msgid "Username"
+msgstr "Nom d'usuari"
+
 #: templates/users.php:91
 msgid "Storage"
 msgstr "Emmagatzemament"
diff --git a/l10n/ca/user_ldap.po b/l10n/ca/user_ldap.po
index a9bf9278b7816fdb022be35964ac9181d0e70201..0ac215795a7f567299037bb776f367879c93be08 100644
--- a/l10n/ca/user_ldap.po
+++ b/l10n/ca/user_ldap.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:25+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:16+0000\n"
 "Last-Translator: rogerc\n"
 "Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/cs_CZ/core.po b/l10n/cs_CZ/core.po
index 6d77cbcb0a79dccc8e24d50df73703f3deca59aa..056fa90bb4857399a2e929ff1f53f54f64789163 100644
--- a/l10n/cs_CZ/core.po
+++ b/l10n/cs_CZ/core.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:22+0000\n"
-"Last-Translator: Tomáš Chvátal <tomas.chvatal@gmail.com>\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:14+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -63,135 +63,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/config.php:34
+#: js/config.php:32
 msgid "Sunday"
 msgstr "Neděle"
 
-#: js/config.php:35
+#: js/config.php:33
 msgid "Monday"
 msgstr "Pondělí"
 
-#: js/config.php:36
+#: js/config.php:34
 msgid "Tuesday"
 msgstr "Úterý"
 
-#: js/config.php:37
+#: js/config.php:35
 msgid "Wednesday"
 msgstr "Středa"
 
-#: js/config.php:38
+#: js/config.php:36
 msgid "Thursday"
 msgstr "ÄŒtvrtek"
 
-#: js/config.php:39
+#: js/config.php:37
 msgid "Friday"
 msgstr "Pátek"
 
-#: js/config.php:40
+#: js/config.php:38
 msgid "Saturday"
 msgstr "Sobota"
 
-#: js/config.php:45
+#: js/config.php:43
 msgid "January"
 msgstr "Leden"
 
-#: js/config.php:46
+#: js/config.php:44
 msgid "February"
 msgstr "Únor"
 
-#: js/config.php:47
+#: js/config.php:45
 msgid "March"
 msgstr "Březen"
 
-#: js/config.php:48
+#: js/config.php:46
 msgid "April"
 msgstr "Duben"
 
-#: js/config.php:49
+#: js/config.php:47
 msgid "May"
 msgstr "Květen"
 
-#: js/config.php:50
+#: js/config.php:48
 msgid "June"
 msgstr "ÄŒerven"
 
-#: js/config.php:51
+#: js/config.php:49
 msgid "July"
 msgstr "ÄŒervenec"
 
-#: js/config.php:52
+#: js/config.php:50
 msgid "August"
 msgstr "Srpen"
 
-#: js/config.php:53
+#: js/config.php:51
 msgid "September"
 msgstr "Září"
 
-#: js/config.php:54
+#: js/config.php:52
 msgid "October"
 msgstr "Říjen"
 
-#: js/config.php:55
+#: js/config.php:53
 msgid "November"
 msgstr "Listopad"
 
-#: js/config.php:56
+#: js/config.php:54
 msgid "December"
 msgstr "Prosinec"
 
-#: js/js.js:286
+#: js/js.js:293
 msgid "Settings"
 msgstr "Nastavení"
 
-#: js/js.js:718
+#: js/js.js:725
 msgid "seconds ago"
 msgstr "před pár vteřinami"
 
-#: js/js.js:719
+#: js/js.js:726
 msgid "1 minute ago"
 msgstr "před minutou"
 
-#: js/js.js:720
+#: js/js.js:727
 msgid "{minutes} minutes ago"
 msgstr "před {minutes} minutami"
 
-#: js/js.js:721
+#: js/js.js:728
 msgid "1 hour ago"
 msgstr "před hodinou"
 
-#: js/js.js:722
+#: js/js.js:729
 msgid "{hours} hours ago"
 msgstr "před {hours} hodinami"
 
-#: js/js.js:723
+#: js/js.js:730
 msgid "today"
 msgstr "dnes"
 
-#: js/js.js:724
+#: js/js.js:731
 msgid "yesterday"
 msgstr "včera"
 
-#: js/js.js:725
+#: js/js.js:732
 msgid "{days} days ago"
 msgstr "před {days} dny"
 
-#: js/js.js:726
+#: js/js.js:733
 msgid "last month"
 msgstr "minulý měsíc"
 
-#: js/js.js:727
+#: js/js.js:734
 msgid "{months} months ago"
 msgstr "před {months} měsíci"
 
-#: js/js.js:728
+#: js/js.js:735
 msgid "months ago"
 msgstr "před měsíci"
 
-#: js/js.js:729
+#: js/js.js:736
 msgid "last year"
 msgstr "minulý rok"
 
-#: js/js.js:730
+#: js/js.js:737
 msgid "years ago"
 msgstr "před lety"
 
@@ -227,8 +227,8 @@ msgstr "Není určen typ objektu."
 #: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
 #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:577
-#: js/share.js:589
+#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:620
+#: js/share.js:632
 msgid "Error"
 msgstr "Chyba"
 
@@ -248,7 +248,7 @@ msgstr "Sdílené"
 msgid "Share"
 msgstr "Sdílet"
 
-#: js/share.js:125 js/share.js:617
+#: js/share.js:125 js/share.js:660
 msgid "Error while sharing"
 msgstr "Chyba při sdílení"
 
@@ -268,99 +268,103 @@ msgstr "S Vámi a skupinou {group} sdílí {owner}"
 msgid "Shared with you by {owner}"
 msgstr "S Vámi sdílí {owner}"
 
-#: js/share.js:159
+#: js/share.js:172
 msgid "Share with"
 msgstr "Sdílet s"
 
-#: js/share.js:164
+#: js/share.js:177
 msgid "Share with link"
 msgstr "Sdílet s odkazem"
 
-#: js/share.js:167
+#: js/share.js:180
 msgid "Password protect"
 msgstr "Chránit heslem"
 
-#: js/share.js:169 templates/installation.php:54 templates/login.php:26
+#: js/share.js:182 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "Heslo"
 
-#: js/share.js:173
+#: js/share.js:187
+msgid "Allow Public Upload"
+msgstr "Povolit veřejné nahrávání"
+
+#: js/share.js:191
 msgid "Email link to person"
 msgstr "Odeslat osobÄ› odkaz e-mailem"
 
-#: js/share.js:174
+#: js/share.js:192
 msgid "Send"
 msgstr "Odeslat"
 
-#: js/share.js:178
+#: js/share.js:197
 msgid "Set expiration date"
 msgstr "Nastavit datum vypršení platnosti"
 
-#: js/share.js:179
+#: js/share.js:198
 msgid "Expiration date"
 msgstr "Datum vypršení platnosti"
 
-#: js/share.js:211
+#: js/share.js:230
 msgid "Share via email:"
 msgstr "Sdílet e-mailem:"
 
-#: js/share.js:213
+#: js/share.js:232
 msgid "No people found"
 msgstr "Žádní lidé nenalezeni"
 
-#: js/share.js:251
+#: js/share.js:270
 msgid "Resharing is not allowed"
 msgstr "Sdílení již sdílené položky není povoleno"
 
-#: js/share.js:287
+#: js/share.js:306
 msgid "Shared in {item} with {user}"
 msgstr "Sdíleno v {item} s {user}"
 
-#: js/share.js:308
+#: js/share.js:327
 msgid "Unshare"
 msgstr "Zrušit sdílení"
 
-#: js/share.js:320
+#: js/share.js:339
 msgid "can edit"
 msgstr "lze upravovat"
 
-#: js/share.js:322
+#: js/share.js:341
 msgid "access control"
 msgstr "řízení přístupu"
 
-#: js/share.js:325
+#: js/share.js:344
 msgid "create"
 msgstr "vytvořit"
 
-#: js/share.js:328
+#: js/share.js:347
 msgid "update"
 msgstr "aktualizovat"
 
-#: js/share.js:331
+#: js/share.js:350
 msgid "delete"
 msgstr "smazat"
 
-#: js/share.js:334
+#: js/share.js:353
 msgid "share"
 msgstr "sdílet"
 
-#: js/share.js:368 js/share.js:564
+#: js/share.js:387 js/share.js:607
 msgid "Password protected"
 msgstr "Chráněno heslem"
 
-#: js/share.js:577
+#: js/share.js:620
 msgid "Error unsetting expiration date"
 msgstr "Chyba při odstraňování data vypršení platnosti"
 
-#: js/share.js:589
+#: js/share.js:632
 msgid "Error setting expiration date"
 msgstr "Chyba při nastavení data vypršení platnosti"
 
-#: js/share.js:604
+#: js/share.js:647
 msgid "Sending ..."
 msgstr "Odesílám ..."
 
-#: js/share.js:615
+#: js/share.js:658
 msgid "Email sent"
 msgstr "E-mail odeslán"
 
@@ -375,7 +379,7 @@ msgstr "Aktualizace neproběhla úspěšně. Nahlaste prosím problém do <a hre
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "Aktualizace byla úspěšná. Přesměrovávám na ownCloud."
 
-#: lostpassword/controller.php:58
+#: lostpassword/controller.php:60
 msgid "ownCloud password reset"
 msgstr "Obnovení hesla pro ownCloud"
 
@@ -405,17 +409,17 @@ msgstr "Uživatelské jméno"
 
 #: lostpassword/templates/lostpassword.php:22
 msgid ""
-"Your files seems to be encrypted. If you didn't have enabled the recovery "
-"key there will be no way to get your data back once the password was "
-"resetted. If you are not sure what to do, please contact your administrator "
-"first before continue. Do you really want to continue?"
+"Your files are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
 msgstr "Vaše soubory jsou šifrovány. Pokud nemáte povolen klíč obnovy, neexistuje způsob jak získat po obnově hesla vaše data. Pokud si nejste jisti co dělat, kontaktujte nejprve svého správce. Opravdu si přejete pokračovat?"
 
 #: lostpassword/templates/lostpassword.php:24
 msgid "Yes, I really want to reset my password now"
 msgstr "Ano, opravdu si nyní přeji obnovit své heslo"
 
-#: lostpassword/templates/lostpassword.php:29
+#: lostpassword/templates/lostpassword.php:27
 msgid "Request reset"
 msgstr "Vyžádat obnovu"
 
@@ -463,7 +467,7 @@ msgstr "Přístup zakázán"
 msgid "Cloud not found"
 msgstr "Cloud nebyl nalezen"
 
-#: templates/altmail.php:2
+#: templates/altmail.php:4
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -474,10 +478,6 @@ msgid ""
 "Cheers!"
 msgstr "Ahoj,\n\njenom vám chci oznámit že %s s vámi sdílí %s.\nPodívat se můžete zde: %s\n\nDíky"
 
-#: templates/altmail.php:7 templates/mail.php:24
-msgid "web services under your control"
-msgstr "služby webu pod Vaší kontrolou"
-
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
 msgstr "Upravit kategorie"
@@ -570,12 +570,12 @@ msgstr "Hostitel databáze"
 msgid "Finish setup"
 msgstr "Dokončit nastavení"
 
-#: templates/layout.user.php:40
+#: templates/layout.user.php:43
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr "%s je dostupná. Získejte více informací k postupu aktualizace."
 
-#: templates/layout.user.php:67
+#: templates/layout.user.php:68
 msgid "Log out"
 msgstr "Odhlásit se"
 
@@ -609,7 +609,7 @@ msgstr "Přihlásit"
 msgid "Alternative Logins"
 msgstr "Alternativní přihlášení"
 
-#: templates/mail.php:15
+#: templates/mail.php:16
 #, php-format
 msgid ""
 "Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
diff --git a/l10n/cs_CZ/files.po b/l10n/cs_CZ/files.po
index 7d4c0a8d62eb4833c87deb393d7173c29af981d3..dffc2edc9f5f650183188a80a9fb5d922fbe107d 100644
--- a/l10n/cs_CZ/files.po
+++ b/l10n/cs_CZ/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-06-17 02:01+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
-"Last-Translator: Tomáš Chvátal <tomas.chvatal@gmail.com>\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -29,46 +29,54 @@ msgstr "Nelze přesunout %s - existuje soubor se stejným názvem"
 msgid "Could not move %s"
 msgstr "Nelze přesunout %s"
 
-#: ajax/upload.php:19
+#: ajax/upload.php:16 ajax/upload.php:45
+msgid "Unable to set upload directory."
+msgstr "Nelze nastavit adresář pro nahrané soubory."
+
+#: ajax/upload.php:22
+msgid "Invalid Token"
+msgstr "Neplatný token"
+
+#: ajax/upload.php:59
 msgid "No file was uploaded. Unknown error"
 msgstr "Soubor nebyl odeslán. Neznámá chyba"
 
-#: ajax/upload.php:26
+#: ajax/upload.php:66
 msgid "There is no error, the file uploaded with success"
 msgstr "Soubor byl odeslán úspěšně"
 
-#: ajax/upload.php:27
+#: ajax/upload.php:67
 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:29
+#: ajax/upload.php:69
 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:30
+#: ajax/upload.php:70
 msgid "The uploaded file was only partially uploaded"
 msgstr "Soubor byl odeslán pouze částečně"
 
-#: ajax/upload.php:31
+#: ajax/upload.php:71
 msgid "No file was uploaded"
 msgstr "Žádný soubor nebyl odeslán"
 
-#: ajax/upload.php:32
+#: ajax/upload.php:72
 msgid "Missing a temporary folder"
 msgstr "Chybí adresář pro dočasné soubory"
 
-#: ajax/upload.php:33
+#: ajax/upload.php:73
 msgid "Failed to write to disk"
 msgstr "Zápis na disk selhal"
 
-#: ajax/upload.php:51
+#: ajax/upload.php:91
 msgid "Not enough storage available"
 msgstr "Nedostatek dostupného úložného prostoru"
 
-#: ajax/upload.php:83
+#: ajax/upload.php:123
 msgid "Invalid directory."
 msgstr "Neplatný adresář"
 
@@ -76,6 +84,36 @@ msgstr "Neplatný adresář"
 msgid "Files"
 msgstr "Soubory"
 
+#: js/file-upload.js:11
+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 je jeho velikost 0 bajtů"
+
+#: js/file-upload.js:24
+msgid "Not enough space available"
+msgstr "Nedostatek dostupného místa"
+
+#: js/file-upload.js:64
+msgid "Upload cancelled."
+msgstr "Odesílání zrušeno."
+
+#: js/file-upload.js:167 js/files.js:266
+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/file-upload.js:233 js/files.js:339
+msgid "URL cannot be empty."
+msgstr "URL nemůže být prázdná"
+
+#: js/file-upload.js:238 lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr "Název složky nelze použít. Použití názvu 'Shared' je ownCloudem rezervováno"
+
+#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
+#: js/files.js:693 js/files.js:731
+msgid "Error"
+msgstr "Chyba"
+
 #: js/fileactions.js:116
 msgid "Share"
 msgstr "Sdílet"
@@ -92,43 +130,43 @@ msgstr "Smazat"
 msgid "Rename"
 msgstr "Přejmenovat"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:464
 msgid "Pending"
 msgstr "Nevyřízené"
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "{new_name} already exists"
 msgstr "{new_name} již existuje"
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "replace"
 msgstr "nahradit"
 
-#: js/filelist.js:259
+#: js/filelist.js:302
 msgid "suggest name"
 msgstr "navrhnout název"
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "cancel"
 msgstr "zrušit"
 
-#: js/filelist.js:306
+#: js/filelist.js:349
 msgid "replaced {new_name} with {old_name}"
 msgstr "nahrazeno {new_name} s {old_name}"
 
-#: js/filelist.js:306
+#: js/filelist.js:349
 msgid "undo"
 msgstr "zpět"
 
-#: js/filelist.js:331
+#: js/filelist.js:374
 msgid "perform delete operation"
 msgstr "provést smazání"
 
-#: js/filelist.js:413
+#: js/filelist.js:456
 msgid "1 file uploading"
 msgstr "odesílá se 1 soubor"
 
-#: js/filelist.js:416 js/filelist.js:470
+#: js/filelist.js:459 js/filelist.js:517
 msgid "files uploading"
 msgstr "soubory se odesílají"
 
@@ -160,70 +198,42 @@ msgid ""
 "big."
 msgstr "Vaše soubory ke stažení se připravují. Pokud jsou velké může to chvíli trvat."
 
-#: js/files.js:264
-msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "Nelze odeslat Váš soubor, protože je to adresář, nebo je jeho velikost 0 bajtů"
-
-#: js/files.js:277
-msgid "Not enough space available"
-msgstr "Nedostatek dostupného místa"
-
-#: js/files.js:317
-msgid "Upload cancelled."
-msgstr "Odesílání zrušeno."
-
-#: js/files.js:413
-msgid ""
-"File upload is in progress. Leaving the page now will cancel the upload."
-msgstr "Probíhá odesílání souboru. Opuštění stránky vyústí ve zrušení nahrávání."
-
-#: js/files.js:486
-msgid "URL cannot be empty."
-msgstr "URL nemůže být prázdná"
-
-#: js/files.js:491
+#: js/files.js:344
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Neplatný název složky. Použití 'Shared' je rezervováno pro vnitřní potřeby Owncloud"
 
-#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
-msgid "Error"
-msgstr "Chyba"
-
-#: js/files.js:877 templates/index.php:69
+#: js/files.js:744 templates/index.php:69
 msgid "Name"
 msgstr "Název"
 
-#: js/files.js:878 templates/index.php:80
+#: js/files.js:745 templates/index.php:80
 msgid "Size"
 msgstr "Velikost"
 
-#: js/files.js:879 templates/index.php:82
+#: js/files.js:746 templates/index.php:82
 msgid "Modified"
 msgstr "Upraveno"
 
-#: js/files.js:898
+#: js/files.js:765
 msgid "1 folder"
 msgstr "1 složka"
 
-#: js/files.js:900
+#: js/files.js:767
 msgid "{count} folders"
 msgstr "{count} složky"
 
-#: js/files.js:908
+#: js/files.js:775
 msgid "1 file"
 msgstr "1 soubor"
 
-#: js/files.js:910
+#: js/files.js:777
 msgid "{count} files"
 msgstr "{count} soubory"
 
-#: lib/app.php:53
-msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
-msgstr "Název složky nelze použít. Použití názvu 'Shared' je ownCloudem rezervováno"
-
 #: lib/app.php:73
-msgid "Unable to rename file"
-msgstr "Nelze přejmenovat soubor"
+#, php-format
+msgid "%s could not be renamed"
+msgstr ""
 
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
@@ -319,6 +329,22 @@ msgstr "Soubory se prohledávají, prosím čekejte."
 msgid "Current scanning"
 msgstr "Aktuální prohledávání"
 
+#: templates/part.list.php:76
+msgid "directory"
+msgstr ""
+
+#: templates/part.list.php:78
+msgid "directories"
+msgstr ""
+
+#: templates/part.list.php:87
+msgid "file"
+msgstr "soubor"
+
+#: templates/part.list.php:89
+msgid "files"
+msgstr "soubory"
+
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
 msgstr "Aktualizuji mezipaměť souborového systému..."
diff --git a/l10n/cs_CZ/files_encryption.po b/l10n/cs_CZ/files_encryption.po
index 47c4307b1b783754d901ade5299b97a1ee4b08e8..1d95d95e25f32cd5d60180c19f2117c98968b5d3 100644
--- a/l10n/cs_CZ/files_encryption.po
+++ b/l10n/cs_CZ/files_encryption.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-15 01:58+0200\n"
-"PO-Revision-Date: 2013-06-14 19:40+0000\n"
-"Last-Translator: Tomáš Chvátal <tomas.chvatal@gmail.com>\n"
+"POT-Creation-Date: 2013-07-05 02:12+0200\n"
+"PO-Revision-Date: 2013-07-05 00:13+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"
@@ -57,10 +57,22 @@ msgstr "Nelze aktualizovat heslo soukromého klíče. Možná nebylo staré hesl
 
 #: files/error.php:7
 msgid ""
-"Your private key is not valid! Maybe your password was changed from outside."
-" You can update your private key password in your personal settings to "
-"regain access to your files"
-msgstr "Váš soukromý klíč není platný. Možná bylo vaše heslo změněno z venku. Můžete aktualizovat heslo soukromého klíče v osobním nastavení pro opětovné získání přístupu k souborům"
+"Your private key is not valid! Likely your password was changed outside the "
+"ownCloud system (e.g. your corporate directory). You can update your private"
+" key password in your personal settings to recover access to your encrypted "
+"files."
+msgstr ""
+
+#: hooks/hooks.php:44
+msgid "Missing requirements."
+msgstr ""
+
+#: hooks/hooks.php:45
+msgid ""
+"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL "
+"PHP extension is enabled and configured properly. For now, the encryption "
+"app has been disabled."
+msgstr ""
 
 #: js/settings-admin.js:11
 msgid "Saving..."
@@ -86,12 +98,12 @@ msgstr "Šifrování"
 
 #: templates/settings-admin.php:10
 msgid ""
-"Enable encryption passwords recovery key (allow sharing to recovery key):"
-msgstr "Povolit záchranný klíč šifrovacích hesel (povolí sdílený záchranný klíč):"
+"Enable recovery key (allow to recover users files in case of password loss):"
+msgstr ""
 
 #: templates/settings-admin.php:14
-msgid "Recovery account password"
-msgstr "Heslo pro obnovu účtu"
+msgid "Recovery key password"
+msgstr ""
 
 #: templates/settings-admin.php:21 templates/settings-personal.php:54
 msgid "Enabled"
@@ -102,16 +114,16 @@ msgid "Disabled"
 msgstr "Zakázáno"
 
 #: templates/settings-admin.php:34
-msgid "Change encryption passwords recovery key:"
-msgstr "Změnit záchranný klíč šifrovacích hesel:"
+msgid "Change recovery key password:"
+msgstr ""
 
 #: templates/settings-admin.php:41
-msgid "Old Recovery account password"
-msgstr "Stávající heslo pro obnovu účtu"
+msgid "Old Recovery key password"
+msgstr ""
 
 #: templates/settings-admin.php:48
-msgid "New Recovery account password"
-msgstr "Nové heslo pro obnovu účtu"
+msgid "New Recovery key password"
+msgstr ""
 
 #: templates/settings-admin.php:53
 msgid "Change Password"
diff --git a/l10n/cs_CZ/files_external.po b/l10n/cs_CZ/files_external.po
index de30f1170d63d8e73052a814b7874d1551b890e4..ba05aa388a6fbaaca36e4b3a916ad3ae380c25a7 100644
--- a/l10n/cs_CZ/files_external.po
+++ b/l10n/cs_CZ/files_external.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/cs_CZ/files_sharing.po b/l10n/cs_CZ/files_sharing.po
index 0df7ac3b901fc8c2b03e3eadee0ea067efd90e3a..42cefbae0c9bc897cb69fec72e54d3293acb34ec 100644
--- a/l10n/cs_CZ/files_sharing.po
+++ b/l10n/cs_CZ/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
@@ -18,27 +18,39 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
 #: templates/authenticate.php:4
+msgid "The password is wrong. Try again."
+msgstr ""
+
+#: templates/authenticate.php:7
 msgid "Password"
 msgstr "Heslo"
 
-#: templates/authenticate.php:6
+#: templates/authenticate.php:9
 msgid "Submit"
 msgstr "Odeslat"
 
-#: templates/public.php:10
+#: templates/public.php:17
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s s Vámi sdílí složku %s"
 
-#: templates/public.php:13
+#: templates/public.php:20
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s s Vámi sdílí soubor %s"
 
-#: templates/public.php:19 templates/public.php:43
+#: templates/public.php:28 templates/public.php:90
 msgid "Download"
 msgstr "Stáhnout"
 
-#: templates/public.php:40
+#: templates/public.php:45 templates/public.php:48
+msgid "Upload"
+msgstr "Odeslat"
+
+#: templates/public.php:58
+msgid "Cancel upload"
+msgstr "Zrušit odesílání"
+
+#: templates/public.php:87
 msgid "No preview available for"
 msgstr "Náhled není dostupný pro"
diff --git a/l10n/cs_CZ/files_trashbin.po b/l10n/cs_CZ/files_trashbin.po
index dbb756daba13ca13f6eb44699926603f35673338..e2fda95de8384c4aac5cbac5a68fb4103622a633 100644
--- a/l10n/cs_CZ/files_trashbin.po
+++ b/l10n/cs_CZ/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:16+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/cs_CZ/lib.po b/l10n/cs_CZ/lib.po
index 8d4ae5ea7c0383fbc879582f5d244282b83876e6..74740588e9368da18707eee423628c02e521795e 100644
--- a/l10n/cs_CZ/lib.po
+++ b/l10n/cs_CZ/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-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
-"Last-Translator: Tomáš Chvátal <tomas.chvatal@gmail.com>\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,43 +18,47 @@ msgstr ""
 "Language: cs_CZ\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: app.php:359
+#: app.php:360
 msgid "Help"
 msgstr "Nápověda"
 
-#: app.php:372
+#: app.php:373
 msgid "Personal"
 msgstr "Osobní"
 
-#: app.php:383
+#: app.php:384
 msgid "Settings"
 msgstr "Nastavení"
 
-#: app.php:395
+#: app.php:396
 msgid "Users"
 msgstr "Uživatelé"
 
-#: app.php:408
+#: app.php:409
 msgid "Apps"
 msgstr "Aplikace"
 
-#: app.php:416
+#: app.php:417
 msgid "Admin"
 msgstr "Administrace"
 
-#: files.php:210
+#: defaults.php:33
+msgid "web services under your control"
+msgstr "služby webu pod Vaší kontrolou"
+
+#: files.php:226
 msgid "ZIP download is turned off."
 msgstr "Stahování ZIPu je vypnuto."
 
-#: files.php:211
+#: files.php:227
 msgid "Files need to be downloaded one by one."
 msgstr "Soubory musí být stahovány jednotlivě."
 
-#: files.php:212 files.php:245
+#: files.php:228 files.php:261
 msgid "Back to Files"
 msgstr "Zpět k souborům"
 
-#: files.php:242
+#: files.php:258
 msgid "Selected files too large to generate zip file."
 msgstr "Vybrané soubory jsou příliš velké pro vytvoření zip souboru."
 
@@ -86,104 +90,102 @@ msgstr "Text"
 msgid "Images"
 msgstr "Obrázky"
 
-#: setup.php:34
-msgid "Set an admin username."
-msgstr "Zadejte uživatelské jméno správce."
-
-#: setup.php:37
-msgid "Set an admin password."
-msgstr "Zadejte heslo správce."
-
-#: setup.php:55
+#: setup/abstractdatabase.php:22
 #, php-format
 msgid "%s enter the database username."
 msgstr "Zadejte uživatelské jméno %s databáze."
 
-#: setup.php:58
+#: setup/abstractdatabase.php:25
 #, php-format
 msgid "%s enter the database name."
 msgstr "Zadejte název databáze pro %s databáze."
 
-#: setup.php:61
+#: setup/abstractdatabase.php:28
 #, php-format
 msgid "%s you may not use dots in the database name"
 msgstr "V názvu databáze %s nesmíte používat tečky."
 
-#: setup.php:64
+#: setup/mssql.php:20
 #, php-format
-msgid "%s set the database host."
-msgstr "Zadejte název počítače s databází %s."
-
-#: setup.php:126 setup.php:332 setup.php:377
-msgid "PostgreSQL username and/or password not valid"
-msgstr "Uživatelské jméno, či heslo PostgreSQL není platné"
+msgid "MS SQL username and/or password not valid: %s"
+msgstr "Uživatelské jméno, či heslo MSSQL není platné: %s"
 
-#: setup.php:127 setup.php:235
+#: setup/mssql.php:21 setup/mysql.php:13 setup/oci.php:114
+#: setup/postgresql.php:24 setup/postgresql.php:70
 msgid "You need to enter either an existing account or the administrator."
 msgstr "Musíte zadat existující účet, či správce."
 
-#: setup.php:152
-msgid "Oracle connection could not be established"
-msgstr "Spojení s Oracle nemohlo být navázáno"
-
-#: setup.php:234
+#: setup/mysql.php:12
 msgid "MySQL username and/or password not valid"
 msgstr "Uživatelské jméno, či heslo MySQL není platné"
 
-#: setup.php:288 setup.php:398 setup.php:407 setup.php:425 setup.php:435
-#: setup.php:444 setup.php:477 setup.php:543 setup.php:569 setup.php:576
-#: setup.php:587 setup.php:594 setup.php:603 setup.php:611 setup.php:620
-#: setup.php:626
+#: setup/mysql.php:67 setup/oci.php:54 setup/oci.php:121 setup/oci.php:147
+#: setup/oci.php:154 setup/oci.php:165 setup/oci.php:172 setup/oci.php:181
+#: setup/oci.php:189 setup/oci.php:198 setup/oci.php:204
+#: setup/postgresql.php:89 setup/postgresql.php:98 setup/postgresql.php:115
+#: setup/postgresql.php:125 setup/postgresql.php:134
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr "Chyba DB: \"%s\""
 
-#: setup.php:289 setup.php:399 setup.php:408 setup.php:426 setup.php:436
-#: setup.php:445 setup.php:478 setup.php:544 setup.php:570 setup.php:577
-#: setup.php:588 setup.php:604 setup.php:612 setup.php:621
+#: setup/mysql.php:68 setup/oci.php:55 setup/oci.php:122 setup/oci.php:148
+#: setup/oci.php:155 setup/oci.php:166 setup/oci.php:182 setup/oci.php:190
+#: setup/oci.php:199 setup/postgresql.php:90 setup/postgresql.php:99
+#: setup/postgresql.php:116 setup/postgresql.php:126 setup/postgresql.php:135
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr "Podezřelý příkaz byl: \"%s\""
 
-#: setup.php:305
+#: setup/mysql.php:85
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr "Uživatel '%s'@'localhost' již v MySQL existuje."
 
-#: setup.php:306
+#: setup/mysql.php:86
 msgid "Drop this user from MySQL"
 msgstr "Zahodit uživatele z MySQL"
 
-#: setup.php:311
+#: setup/mysql.php:91
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr "Uživatel '%s'@'%%' již v MySQL existuje"
 
-#: setup.php:312
+#: setup/mysql.php:92
 msgid "Drop this user from MySQL."
 msgstr "Zahodit uživatele z MySQL."
 
-#: setup.php:469 setup.php:536
+#: setup/oci.php:34
+msgid "Oracle connection could not be established"
+msgstr "Spojení s Oracle nemohlo být navázáno"
+
+#: setup/oci.php:41 setup/oci.php:113
 msgid "Oracle username and/or password not valid"
 msgstr "Uživatelské jméno, či heslo Oracle není platné"
 
-#: setup.php:595 setup.php:627
+#: setup/oci.php:173 setup/oci.php:205
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr "Podezřelý příkaz byl: \"%s\", jméno: %s, heslo: %s"
 
-#: setup.php:647
-#, php-format
-msgid "MS SQL username and/or password not valid: %s"
-msgstr "Uživatelské jméno, či heslo MSSQL není platné: %s"
+#: setup/postgresql.php:23 setup/postgresql.php:69
+msgid "PostgreSQL username and/or password not valid"
+msgstr "Uživatelské jméno, či heslo PostgreSQL není platné"
+
+#: setup.php:42
+msgid "Set an admin username."
+msgstr "Zadejte uživatelské jméno správce."
+
+#: setup.php:45
+msgid "Set an admin password."
+msgstr "Zadejte heslo správce."
 
-#: setup.php:870
+#: setup.php:198
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Váš webový server není správně nastaven pro umožnění synchronizace, protože rozhraní WebDAV je rozbité."
 
-#: setup.php:871
+#: setup.php:199
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Zkonzultujte, prosím, <a href='%s'>průvodce instalací</a>."
diff --git a/l10n/cs_CZ/settings.po b/l10n/cs_CZ/settings.po
index 8108e7abb849b437a935ecf2b52c24a751fcafad..cb527f18ece7e381afb673557899e48f083298a6 100644
--- a/l10n/cs_CZ/settings.po
+++ b/l10n/cs_CZ/settings.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
-"Last-Translator: Tomáš Chvátal <tomas.chvatal@gmail.com>\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -89,35 +89,35 @@ msgstr "Nelze odstranit uživatele ze skupiny %s"
 msgid "Couldn't update app."
 msgstr "Nelze aktualizovat aplikaci."
 
-#: js/apps.js:30
+#: js/apps.js:35
 msgid "Update to {appversion}"
 msgstr "Aktualizovat na {appversion}"
 
-#: js/apps.js:36 js/apps.js:76
+#: js/apps.js:41 js/apps.js:81
 msgid "Disable"
 msgstr "Zakázat"
 
-#: js/apps.js:36 js/apps.js:64 js/apps.js:83
+#: js/apps.js:41 js/apps.js:69 js/apps.js:88
 msgid "Enable"
 msgstr "Povolit"
 
-#: js/apps.js:55
+#: js/apps.js:60
 msgid "Please wait...."
 msgstr "Čekejte prosím..."
 
-#: js/apps.js:59 js/apps.js:71 js/apps.js:80 js/apps.js:93
+#: js/apps.js:64 js/apps.js:76 js/apps.js:85 js/apps.js:98
 msgid "Error"
 msgstr "Chyba"
 
-#: js/apps.js:90
+#: js/apps.js:95
 msgid "Updating...."
 msgstr "Aktualizuji..."
 
-#: js/apps.js:93
+#: js/apps.js:98
 msgid "Error while updating app"
 msgstr "Chyba při aktualizaci aplikace"
 
-#: js/apps.js:96
+#: js/apps.js:101
 msgid "Updated"
 msgstr "Aktualizováno"
 
@@ -166,15 +166,15 @@ msgstr "Chyba při vytváření užiatele"
 msgid "A valid password must be provided"
 msgstr "Musíte zadat platné heslo"
 
-#: personal.php:35 personal.php:36
+#: personal.php:37 personal.php:38
 msgid "__language_name__"
 msgstr "ÄŒesky"
 
-#: templates/admin.php:15
+#: templates/admin.php:17
 msgid "Security Warning"
 msgstr "Bezpečnostní upozornění"
 
-#: templates/admin.php:18
+#: templates/admin.php:20
 msgid ""
 "Your data directory and your files are probably accessible from the "
 "internet. The .htaccess file that ownCloud provides is not working. We "
@@ -183,36 +183,36 @@ msgid ""
 " webserver document root."
 msgstr "Váš adresář dat a všechny Vaše soubory jsou pravděpodobně přístupné z internetu. Soubor .htaccess, který je poskytován ownCloud, nefunguje. Důrazně Vám doporučujeme nastavit váš webový server tak, aby nebyl adresář dat přístupný, nebo přesunout adresář dat mimo kořenovou složku dokumentů webového serveru."
 
-#: templates/admin.php:29
+#: templates/admin.php:31
 msgid "Setup Warning"
 msgstr "Upozornění nastavení"
 
-#: templates/admin.php:32
+#: templates/admin.php:34
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Váš webový server není správně nastaven pro umožnění synchronizace, protože rozhraní WebDAV je rozbité."
 
-#: templates/admin.php:33
+#: templates/admin.php:35
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Zkonzultujte, prosím, <a href='%s'>průvodce instalací</a>."
 
-#: templates/admin.php:44
+#: templates/admin.php:46
 msgid "Module 'fileinfo' missing"
 msgstr "Schází modul 'fileinfo'"
 
-#: templates/admin.php:47
+#: templates/admin.php:49
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr "Schází modul PHP 'fileinfo'. Doporučujeme jej povolit pro nejlepší výsledky detekce typů MIME."
 
-#: templates/admin.php:58
+#: templates/admin.php:60
 msgid "Locale not working"
 msgstr "Locale nefunguje"
 
-#: templates/admin.php:63
+#: templates/admin.php:65
 #, php-format
 msgid ""
 "This ownCloud server can't set system locale to %s. This means that there "
@@ -220,11 +220,11 @@ msgid ""
 " to install the required packages on your system to support %s."
 msgstr "Server ownCloud nemůže nastavit locale systému na %s. Můžete tedy mít problémy s některými znaky v názvech souborů. Důrazně doporučujeme nainstalovat potřebné balíčky pro podporu %s."
 
-#: templates/admin.php:75
+#: templates/admin.php:77
 msgid "Internet connection not working"
 msgstr "Spojení s internetem nefujguje"
 
-#: templates/admin.php:78
+#: templates/admin.php:80
 msgid ""
 "This ownCloud server has no working internet connection. This means that "
 "some of the features like mounting of external storage, notifications about "
@@ -234,102 +234,102 @@ msgid ""
 " of ownCloud."
 msgstr "Server ownCloud nemá funkční spojení s internetem. Některé moduly jako externí úložiště, oznámení o dostupných aktualizacích, nebo instalace aplikací třetích stran nefungují. Přístup k souborům z jiných míst a odesílání oznamovacích e-mailů také nemusí fungovat. Pokud si přejete využívat všech vlastností ownCloud, doporučujeme povolit internetové spojení pro tento server."
 
-#: templates/admin.php:92
+#: templates/admin.php:94
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:101
+#: templates/admin.php:103
 msgid "Execute one task with each page loaded"
 msgstr "Spustit jednu úlohu s každou načtenou stránkou"
 
-#: templates/admin.php:111
+#: templates/admin.php:113
 msgid ""
 "cron.php is registered at a webcron service. Call the cron.php page in the "
 "owncloud root once a minute over http."
 msgstr "cron.php je registrován u služby webcron. Zavolá stránku cron.php v kořenovém adresáři owncloud každou minutu skrze http."
 
-#: templates/admin.php:121
+#: templates/admin.php:123
 msgid ""
 "Use systems cron service. Call the cron.php file in the owncloud folder via "
 "a system cronjob once a minute."
 msgstr "Použít systémovou službu cron. Zavolat soubor cron.php ze složky owncloud pomocí systémové úlohy cron každou minutu."
 
-#: templates/admin.php:128
+#: templates/admin.php:130
 msgid "Sharing"
 msgstr "Sdílení"
 
-#: templates/admin.php:134
+#: templates/admin.php:136
 msgid "Enable Share API"
 msgstr "Povolit API sdílení"
 
-#: templates/admin.php:135
+#: templates/admin.php:137
 msgid "Allow apps to use the Share API"
 msgstr "Povolit aplikacím používat API sdílení"
 
-#: templates/admin.php:142
+#: templates/admin.php:144
 msgid "Allow links"
 msgstr "Povolit odkazy"
 
-#: templates/admin.php:143
+#: templates/admin.php:145
 msgid "Allow users to share items to the public with links"
 msgstr "Povolit uživatelům sdílet položky s veřejností pomocí odkazů"
 
-#: templates/admin.php:150
+#: templates/admin.php:152
 msgid "Allow resharing"
 msgstr "Povolit znovu-sdílení"
 
-#: templates/admin.php:151
+#: templates/admin.php:153
 msgid "Allow users to share items shared with them again"
 msgstr "Povolit uživatelům znovu sdílet položky, které jsou pro ně sdíleny"
 
-#: templates/admin.php:158
+#: templates/admin.php:160
 msgid "Allow users to share with anyone"
 msgstr "Povolit uživatelům sdílet s kýmkoliv"
 
-#: templates/admin.php:161
+#: templates/admin.php:163
 msgid "Allow users to only share with users in their groups"
 msgstr "Povolit uživatelům sdílet pouze s uživateli v jejich skupinách"
 
-#: templates/admin.php:168
+#: templates/admin.php:170
 msgid "Security"
 msgstr "Zabezpečení"
 
-#: templates/admin.php:181
+#: templates/admin.php:183
 msgid "Enforce HTTPS"
 msgstr "Vynutit HTTPS"
 
-#: templates/admin.php:182
+#: templates/admin.php:184
 msgid ""
 "Enforces the clients to connect to ownCloud via an encrypted connection."
 msgstr "Vynutí připojování klientů ownCloud skrze šifrované spojení."
 
-#: templates/admin.php:185
+#: templates/admin.php:187
 msgid ""
 "Please connect to this ownCloud instance via HTTPS to enable or disable the "
 "SSL enforcement."
 msgstr "Připojte se, prosím, k této instanci ownCloud skrze HTTPS pro povolení, nebo zakažte vynucení SSL."
 
-#: templates/admin.php:195
+#: templates/admin.php:197
 msgid "Log"
 msgstr "Záznam"
 
-#: templates/admin.php:196
+#: templates/admin.php:198
 msgid "Log level"
 msgstr "Úroveň záznamu"
 
-#: templates/admin.php:227
+#: templates/admin.php:229
 msgid "More"
 msgstr "Více"
 
-#: templates/admin.php:228
+#: templates/admin.php:230
 msgid "Less"
 msgstr "Méně"
 
-#: templates/admin.php:235 templates/personal.php:116
+#: templates/admin.php:236 templates/personal.php:116
 msgid "Version"
 msgstr "Verze"
 
-#: templates/admin.php:237 templates/personal.php:119
+#: templates/admin.php:240 templates/personal.php:119
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -387,76 +387,79 @@ msgstr "Bugtracker"
 msgid "Commercial Support"
 msgstr "Placená podpora"
 
-#: templates/personal.php:9
+#: templates/personal.php:10
 msgid "Get the apps to sync your files"
 msgstr "Získat aplikace pro synchronizaci vašich souborů"
 
-#: templates/personal.php:20
+#: templates/personal.php:21
 msgid "Show First Run Wizard again"
 msgstr "Znovu zobrazit průvodce prvním spuštěním"
 
-#: templates/personal.php:28
+#: templates/personal.php:29
 #, php-format
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "Používáte <strong>%s</strong> z <strong>%s</strong> dostupných"
 
-#: templates/personal.php:40 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:41 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "Heslo"
 
-#: templates/personal.php:41
+#: templates/personal.php:42
 msgid "Your password was changed"
 msgstr "Vaše heslo bylo změněno"
 
-#: templates/personal.php:42
+#: templates/personal.php:43
 msgid "Unable to change your password"
 msgstr "Vaše heslo nelze změnit"
 
-#: templates/personal.php:43
+#: templates/personal.php:44
 msgid "Current password"
 msgstr "Současné heslo"
 
-#: templates/personal.php:45
+#: templates/personal.php:46
 msgid "New password"
 msgstr "Nové heslo"
 
-#: templates/personal.php:47
+#: templates/personal.php:48
 msgid "Change password"
 msgstr "Změnit heslo"
 
-#: templates/personal.php:59 templates/users.php:85
+#: templates/personal.php:60 templates/users.php:85
 msgid "Display Name"
 msgstr "Zobrazované jméno"
 
-#: templates/personal.php:74
+#: templates/personal.php:75
 msgid "Email"
 msgstr "E-mail"
 
-#: templates/personal.php:76
+#: templates/personal.php:77
 msgid "Your email address"
 msgstr "Vaše e-mailová adresa"
 
-#: templates/personal.php:77
+#: templates/personal.php:78
 msgid "Fill in an email address to enable password recovery"
 msgstr "Pro povolení změny hesla vyplňte adresu e-mailu"
 
-#: templates/personal.php:86 templates/personal.php:87
+#: templates/personal.php:87 templates/personal.php:88
 msgid "Language"
 msgstr "Jazyk"
 
-#: templates/personal.php:99
+#: templates/personal.php:100
 msgid "Help translate"
 msgstr "Pomoci s překladem"
 
-#: templates/personal.php:105
+#: templates/personal.php:106
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:107
-msgid "Use this address to connect to your ownCloud in your file manager"
-msgstr "Použijte tuto adresu pro připojení k vašemu ownCloud skrze správce souborů"
+#: templates/personal.php:108
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
+"target=\"_blank\">access your Files via WebDAV</a>"
+msgstr ""
 
-#: templates/users.php:21 templates/users.php:84
+#: templates/users.php:21
 msgid "Login Name"
 msgstr "Přihlašovací jméno"
 
@@ -486,6 +489,10 @@ msgstr "NeomezenÄ›"
 msgid "Other"
 msgstr "Jiný"
 
+#: templates/users.php:84
+msgid "Username"
+msgstr "Uživatelské jméno"
+
 #: templates/users.php:91
 msgid "Storage"
 msgstr "Úložiště"
diff --git a/l10n/cs_CZ/user_ldap.po b/l10n/cs_CZ/user_ldap.po
index a040da8991efa75d4d980b5ab4588577abc34128..6696ae66dc1e75eaa8f89006467a2020939b5d91 100644
--- a/l10n/cs_CZ/user_ldap.po
+++ b/l10n/cs_CZ/user_ldap.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:25+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:16+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"
diff --git a/l10n/cs_CZ/user_webdavauth.po b/l10n/cs_CZ/user_webdavauth.po
index 8e151213057f9518734cc1f153e2b8814523b16d..6cbaabde3fc067a7ea9a414897e68c37919b5a80 100644
--- a/l10n/cs_CZ/user_webdavauth.po
+++ b/l10n/cs_CZ/user_webdavauth.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-15 01:59+0200\n"
-"PO-Revision-Date: 2013-06-15 00:00+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-06-18 02:04+0200\n"
+"PO-Revision-Date: 2013-06-17 17:20+0000\n"
+"Last-Translator: Tomáš Chvátal <tomas.chvatal@gmail.com>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -24,7 +24,7 @@ msgstr "Ověření WebDAV"
 
 #: templates/settings.php:4
 msgid "URL: "
-msgstr ""
+msgstr "URL: "
 
 #: templates/settings.php:7
 msgid ""
diff --git a/l10n/cy_GB/core.po b/l10n/cy_GB/core.po
index f325280db0caf4d103510a0d28953e7a60ad3aa0..62c810730162eef4a497ec5b2fcdf700d97c7ceb 100644
--- a/l10n/cy_GB/core.po
+++ b/l10n/cy_GB/core.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:22+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n"
 "MIME-Version: 1.0\n"
@@ -62,135 +62,135 @@ msgstr "Ni ddewiswyd categorïau i'w dileu."
 msgid "Error removing %s from favorites."
 msgstr "Gwall wrth dynnu %s o ffefrynnau."
 
-#: js/config.php:34
+#: js/config.php:32
 msgid "Sunday"
 msgstr "Sul"
 
-#: js/config.php:35
+#: js/config.php:33
 msgid "Monday"
 msgstr "Llun"
 
-#: js/config.php:36
+#: js/config.php:34
 msgid "Tuesday"
 msgstr "Mawrth"
 
-#: js/config.php:37
+#: js/config.php:35
 msgid "Wednesday"
 msgstr "Mercher"
 
-#: js/config.php:38
+#: js/config.php:36
 msgid "Thursday"
 msgstr "Iau"
 
-#: js/config.php:39
+#: js/config.php:37
 msgid "Friday"
 msgstr "Gwener"
 
-#: js/config.php:40
+#: js/config.php:38
 msgid "Saturday"
 msgstr "Sadwrn"
 
-#: js/config.php:45
+#: js/config.php:43
 msgid "January"
 msgstr "Ionawr"
 
-#: js/config.php:46
+#: js/config.php:44
 msgid "February"
 msgstr "Chwefror"
 
-#: js/config.php:47
+#: js/config.php:45
 msgid "March"
 msgstr "Mawrth"
 
-#: js/config.php:48
+#: js/config.php:46
 msgid "April"
 msgstr "Ebrill"
 
-#: js/config.php:49
+#: js/config.php:47
 msgid "May"
 msgstr "Mai"
 
-#: js/config.php:50
+#: js/config.php:48
 msgid "June"
 msgstr "Mehefin"
 
-#: js/config.php:51
+#: js/config.php:49
 msgid "July"
 msgstr "Gorffennaf"
 
-#: js/config.php:52
+#: js/config.php:50
 msgid "August"
 msgstr "Awst"
 
-#: js/config.php:53
+#: js/config.php:51
 msgid "September"
 msgstr "Medi"
 
-#: js/config.php:54
+#: js/config.php:52
 msgid "October"
 msgstr "Hydref"
 
-#: js/config.php:55
+#: js/config.php:53
 msgid "November"
 msgstr "Tachwedd"
 
-#: js/config.php:56
+#: js/config.php:54
 msgid "December"
 msgstr "Rhagfyr"
 
-#: js/js.js:286
+#: js/js.js:293
 msgid "Settings"
 msgstr "Gosodiadau"
 
-#: js/js.js:718
+#: js/js.js:725
 msgid "seconds ago"
 msgstr "eiliad yn ôl"
 
-#: js/js.js:719
+#: js/js.js:726
 msgid "1 minute ago"
 msgstr "1 munud yn ôl"
 
-#: js/js.js:720
+#: js/js.js:727
 msgid "{minutes} minutes ago"
 msgstr "{minutes} munud yn ôl"
 
-#: js/js.js:721
+#: js/js.js:728
 msgid "1 hour ago"
 msgstr "1 awr yn ôl"
 
-#: js/js.js:722
+#: js/js.js:729
 msgid "{hours} hours ago"
 msgstr "{hours} awr yn ôl"
 
-#: js/js.js:723
+#: js/js.js:730
 msgid "today"
 msgstr "heddiw"
 
-#: js/js.js:724
+#: js/js.js:731
 msgid "yesterday"
 msgstr "ddoe"
 
-#: js/js.js:725
+#: js/js.js:732
 msgid "{days} days ago"
 msgstr "{days} diwrnod yn ôl"
 
-#: js/js.js:726
+#: js/js.js:733
 msgid "last month"
 msgstr "mis diwethaf"
 
-#: js/js.js:727
+#: js/js.js:734
 msgid "{months} months ago"
 msgstr "{months} mis yn ôl"
 
-#: js/js.js:728
+#: js/js.js:735
 msgid "months ago"
 msgstr "misoedd yn ôl"
 
-#: js/js.js:729
+#: js/js.js:736
 msgid "last year"
 msgstr "y llynedd"
 
-#: js/js.js:730
+#: js/js.js:737
 msgid "years ago"
 msgstr "blwyddyn yn ôl"
 
@@ -226,8 +226,8 @@ msgstr "Nid yw'r math o wrthrych wedi cael ei nodi."
 #: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
 #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:577
-#: js/share.js:589
+#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:620
+#: js/share.js:632
 msgid "Error"
 msgstr "Gwall"
 
@@ -247,7 +247,7 @@ msgstr "Rhannwyd"
 msgid "Share"
 msgstr "Rhannu"
 
-#: js/share.js:125 js/share.js:617
+#: js/share.js:125 js/share.js:660
 msgid "Error while sharing"
 msgstr "Gwall wrth rannu"
 
@@ -267,99 +267,103 @@ msgstr "Rhannwyd â chi a'r grŵp {group} gan {owner}"
 msgid "Shared with you by {owner}"
 msgstr "Rhannwyd â chi gan {owner}"
 
-#: js/share.js:159
+#: js/share.js:172
 msgid "Share with"
 msgstr "Rhannu gyda"
 
-#: js/share.js:164
+#: js/share.js:177
 msgid "Share with link"
 msgstr "Dolen ar gyfer rhannu"
 
-#: js/share.js:167
+#: js/share.js:180
 msgid "Password protect"
 msgstr "Diogelu cyfrinair"
 
-#: js/share.js:169 templates/installation.php:54 templates/login.php:26
+#: js/share.js:182 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "Cyfrinair"
 
-#: js/share.js:173
+#: js/share.js:187
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:191
 msgid "Email link to person"
 msgstr "E-bostio dolen at berson"
 
-#: js/share.js:174
+#: js/share.js:192
 msgid "Send"
 msgstr "Anfon"
 
-#: js/share.js:178
+#: js/share.js:197
 msgid "Set expiration date"
 msgstr "Gosod dyddiad dod i ben"
 
-#: js/share.js:179
+#: js/share.js:198
 msgid "Expiration date"
 msgstr "Dyddiad dod i ben"
 
-#: js/share.js:211
+#: js/share.js:230
 msgid "Share via email:"
 msgstr "Rhannu drwy e-bost:"
 
-#: js/share.js:213
+#: js/share.js:232
 msgid "No people found"
 msgstr "Heb ganfod pobl"
 
-#: js/share.js:251
+#: js/share.js:270
 msgid "Resharing is not allowed"
 msgstr "Does dim hawl ail-rannu"
 
-#: js/share.js:287
+#: js/share.js:306
 msgid "Shared in {item} with {user}"
 msgstr "Rhannwyd yn {item} â {user}"
 
-#: js/share.js:308
+#: js/share.js:327
 msgid "Unshare"
 msgstr "Dad-rannu"
 
-#: js/share.js:320
+#: js/share.js:339
 msgid "can edit"
 msgstr "yn gallu golygu"
 
-#: js/share.js:322
+#: js/share.js:341
 msgid "access control"
 msgstr "rheolaeth mynediad"
 
-#: js/share.js:325
+#: js/share.js:344
 msgid "create"
 msgstr "creu"
 
-#: js/share.js:328
+#: js/share.js:347
 msgid "update"
 msgstr "diweddaru"
 
-#: js/share.js:331
+#: js/share.js:350
 msgid "delete"
 msgstr "dileu"
 
-#: js/share.js:334
+#: js/share.js:353
 msgid "share"
 msgstr "rhannu"
 
-#: js/share.js:368 js/share.js:564
+#: js/share.js:387 js/share.js:607
 msgid "Password protected"
 msgstr "Diogelwyd â chyfrinair"
 
-#: js/share.js:577
+#: js/share.js:620
 msgid "Error unsetting expiration date"
 msgstr "Gwall wrth ddad-osod dyddiad dod i ben"
 
-#: js/share.js:589
+#: js/share.js:632
 msgid "Error setting expiration date"
 msgstr "Gwall wrth osod dyddiad dod i ben"
 
-#: js/share.js:604
+#: js/share.js:647
 msgid "Sending ..."
 msgstr "Yn anfon ..."
 
-#: js/share.js:615
+#: js/share.js:658
 msgid "Email sent"
 msgstr "Anfonwyd yr e-bost"
 
@@ -374,7 +378,7 @@ msgstr "Methodd y diweddariad. Adroddwch y mater hwn i <a href=\"https://github.
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "Roedd y diweddariad yn llwyddiannus. Cewch eich ailgyfeirio i ownCloud nawr."
 
-#: lostpassword/controller.php:58
+#: lostpassword/controller.php:60
 msgid "ownCloud password reset"
 msgstr "ailosod cyfrinair ownCloud"
 
@@ -404,17 +408,17 @@ msgstr "Enw defnyddiwr"
 
 #: lostpassword/templates/lostpassword.php:22
 msgid ""
-"Your files seems to be encrypted. If you didn't have enabled the recovery "
-"key there will be no way to get your data back once the password was "
-"resetted. If you are not sure what to do, please contact your administrator "
-"first before continue. Do you really want to continue?"
+"Your files are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
 msgstr ""
 
 #: lostpassword/templates/lostpassword.php:24
 msgid "Yes, I really want to reset my password now"
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:29
+#: lostpassword/templates/lostpassword.php:27
 msgid "Request reset"
 msgstr "Gwneud cais i ailosod"
 
@@ -462,7 +466,7 @@ msgstr "Mynediad wedi'i wahardd"
 msgid "Cloud not found"
 msgstr "Methwyd canfod cwmwl"
 
-#: templates/altmail.php:2
+#: templates/altmail.php:4
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -473,10 +477,6 @@ msgid ""
 "Cheers!"
 msgstr ""
 
-#: templates/altmail.php:7 templates/mail.php:24
-msgid "web services under your control"
-msgstr "gwasanaethau gwe a reolir gennych"
-
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
 msgstr "Golygu categorïau"
@@ -569,12 +569,12 @@ msgstr "Gwesteiwr cronfa ddata"
 msgid "Finish setup"
 msgstr "Gorffen sefydlu"
 
-#: templates/layout.user.php:40
+#: templates/layout.user.php:43
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr "%s ar gael. Mwy o wybodaeth am sut i ddiweddaru."
 
-#: templates/layout.user.php:67
+#: templates/layout.user.php:68
 msgid "Log out"
 msgstr "Allgofnodi"
 
@@ -608,7 +608,7 @@ msgstr "Mewngofnodi"
 msgid "Alternative Logins"
 msgstr "Mewngofnodiadau Amgen"
 
-#: templates/mail.php:15
+#: templates/mail.php:16
 #, php-format
 msgid ""
 "Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
diff --git a/l10n/cy_GB/files.po b/l10n/cy_GB/files.po
index 2b4ed6bc2e27db1c1740c8a950fc07e1c2a3917b..a0eb58b4bbc2cdf11442fd814016a2bb134ee076 100644
--- a/l10n/cy_GB/files.po
+++ b/l10n/cy_GB/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:01+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n"
 "MIME-Version: 1.0\n"
@@ -27,46 +27,54 @@ msgstr "Methwyd symud %s - Mae ffeil gyda'r enw hwn eisoes yn bodoli"
 msgid "Could not move %s"
 msgstr "Methwyd symud %s"
 
-#: ajax/upload.php:19
+#: ajax/upload.php:16 ajax/upload.php:45
+msgid "Unable to set upload directory."
+msgstr ""
+
+#: ajax/upload.php:22
+msgid "Invalid Token"
+msgstr ""
+
+#: ajax/upload.php:59
 msgid "No file was uploaded. Unknown error"
 msgstr "Ni lwythwyd ffeil i fyny. Gwall anhysbys."
 
-#: ajax/upload.php:26
+#: ajax/upload.php:66
 msgid "There is no error, the file uploaded with success"
 msgstr "Does dim gwall, llwythodd y ffeil i fyny'n llwyddiannus"
 
-#: ajax/upload.php:27
+#: ajax/upload.php:67
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr "Mae'r ffeil lwythwyd i fyny'n fwy na chyfarwyddeb upload_max_filesize yn php.ini:"
 
-#: ajax/upload.php:29
+#: ajax/upload.php:69
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Mae'r ffeil lwythwyd i fyny'n fwy na chyfarwyddeb MAX_FILE_SIZE bennwyd yn y ffurflen HTML"
 
-#: ajax/upload.php:30
+#: ajax/upload.php:70
 msgid "The uploaded file was only partially uploaded"
 msgstr "Dim ond yn rhannol y llwythwyd y ffeil i fyny"
 
-#: ajax/upload.php:31
+#: ajax/upload.php:71
 msgid "No file was uploaded"
 msgstr "Ni lwythwyd ffeil i fyny"
 
-#: ajax/upload.php:32
+#: ajax/upload.php:72
 msgid "Missing a temporary folder"
 msgstr "Plygell dros dro yn eisiau"
 
-#: ajax/upload.php:33
+#: ajax/upload.php:73
 msgid "Failed to write to disk"
 msgstr "Methwyd ysgrifennu i'r ddisg"
 
-#: ajax/upload.php:51
+#: ajax/upload.php:91
 msgid "Not enough storage available"
 msgstr "Dim digon o le storio ar gael"
 
-#: ajax/upload.php:83
+#: ajax/upload.php:123
 msgid "Invalid directory."
 msgstr "Cyfeiriadur annilys."
 
@@ -74,6 +82,36 @@ msgstr "Cyfeiriadur annilys."
 msgid "Files"
 msgstr "Ffeiliau"
 
+#: js/file-upload.js:11
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr "Methu llwytho'ch ffeil i fyny gan ei fod yn gyferiadur neu'n cynnwys 0 beit"
+
+#: js/file-upload.js:24
+msgid "Not enough space available"
+msgstr "Dim digon o le ar gael"
+
+#: js/file-upload.js:64
+msgid "Upload cancelled."
+msgstr "Diddymwyd llwytho i fyny."
+
+#: js/file-upload.js:167 js/files.js:266
+msgid ""
+"File upload is in progress. Leaving the page now will cancel the upload."
+msgstr "Mae ffeiliau'n cael eu llwytho i fyny. Bydd gadael y dudalen hon nawr yn diddymu'r broses."
+
+#: js/file-upload.js:233 js/files.js:339
+msgid "URL cannot be empty."
+msgstr "Does dim hawl cael URL gwag."
+
+#: js/file-upload.js:238 lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr ""
+
+#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
+#: js/files.js:693 js/files.js:731
+msgid "Error"
+msgstr "Gwall"
+
 #: js/fileactions.js:116
 msgid "Share"
 msgstr "Rhannu"
@@ -90,43 +128,43 @@ msgstr "Dileu"
 msgid "Rename"
 msgstr "Ailenwi"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:464
 msgid "Pending"
 msgstr "I ddod"
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "{new_name} already exists"
 msgstr "{new_name} yn bodoli'n barod"
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "replace"
 msgstr "amnewid"
 
-#: js/filelist.js:259
+#: js/filelist.js:302
 msgid "suggest name"
 msgstr "awgrymu enw"
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "cancel"
 msgstr "diddymu"
 
-#: js/filelist.js:306
+#: js/filelist.js:349
 msgid "replaced {new_name} with {old_name}"
 msgstr "newidiwyd {new_name} yn lle {old_name}"
 
-#: js/filelist.js:306
+#: js/filelist.js:349
 msgid "undo"
 msgstr "dadwneud"
 
-#: js/filelist.js:331
+#: js/filelist.js:374
 msgid "perform delete operation"
 msgstr "cyflawni gweithred dileu"
 
-#: js/filelist.js:413
+#: js/filelist.js:456
 msgid "1 file uploading"
 msgstr "1 ffeil yn llwytho i fyny"
 
-#: js/filelist.js:416 js/filelist.js:470
+#: js/filelist.js:459 js/filelist.js:517
 msgid "files uploading"
 msgstr "ffeiliau'n llwytho i fyny"
 
@@ -158,70 +196,42 @@ msgid ""
 "big."
 msgstr "Wrthi'n paratoi i lwytho i lawr. Gall gymryd peth amser os yw'r ffeiliau'n fawr."
 
-#: js/files.js:264
-msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "Methu llwytho'ch ffeil i fyny gan ei fod yn gyferiadur neu'n cynnwys 0 beit"
-
-#: js/files.js:277
-msgid "Not enough space available"
-msgstr "Dim digon o le ar gael"
-
-#: js/files.js:317
-msgid "Upload cancelled."
-msgstr "Diddymwyd llwytho i fyny."
-
-#: js/files.js:413
-msgid ""
-"File upload is in progress. Leaving the page now will cancel the upload."
-msgstr "Mae ffeiliau'n cael eu llwytho i fyny. Bydd gadael y dudalen hon nawr yn diddymu'r broses."
-
-#: js/files.js:486
-msgid "URL cannot be empty."
-msgstr "Does dim hawl cael URL gwag."
-
-#: js/files.js:491
+#: js/files.js:344
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Enw plygell annilys. Mae'r defnydd o 'Shared' yn cael ei gadw gan Owncloud"
 
-#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
-msgid "Error"
-msgstr "Gwall"
-
-#: js/files.js:877 templates/index.php:69
+#: js/files.js:744 templates/index.php:69
 msgid "Name"
 msgstr "Enw"
 
-#: js/files.js:878 templates/index.php:80
+#: js/files.js:745 templates/index.php:80
 msgid "Size"
 msgstr "Maint"
 
-#: js/files.js:879 templates/index.php:82
+#: js/files.js:746 templates/index.php:82
 msgid "Modified"
 msgstr "Addaswyd"
 
-#: js/files.js:898
+#: js/files.js:765
 msgid "1 folder"
 msgstr "1 blygell"
 
-#: js/files.js:900
+#: js/files.js:767
 msgid "{count} folders"
 msgstr "{count} plygell"
 
-#: js/files.js:908
+#: js/files.js:775
 msgid "1 file"
 msgstr "1 ffeil"
 
-#: js/files.js:910
+#: js/files.js:777
 msgid "{count} files"
 msgstr "{count} ffeil"
 
-#: lib/app.php:53
-msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
-msgstr ""
-
 #: lib/app.php:73
-msgid "Unable to rename file"
-msgstr "Methu ailenwi ffeil"
+#, php-format
+msgid "%s could not be renamed"
+msgstr ""
 
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
@@ -317,6 +327,22 @@ msgstr "Arhoswch, mae ffeiliau'n cael eu sganio."
 msgid "Current scanning"
 msgstr "Sganio cyfredol"
 
+#: templates/part.list.php:76
+msgid "directory"
+msgstr ""
+
+#: templates/part.list.php:78
+msgid "directories"
+msgstr ""
+
+#: templates/part.list.php:87
+msgid "file"
+msgstr ""
+
+#: templates/part.list.php:89
+msgid "files"
+msgstr ""
+
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
 msgstr "Uwchraddio storfa system ffeiliau..."
diff --git a/l10n/cy_GB/files_encryption.po b/l10n/cy_GB/files_encryption.po
index 961b47b4105b79bd293f6c82ce91310772f1ff05..580563b10a4555796ce48dffe6e496d0c61d6dca 100644
--- a/l10n/cy_GB/files_encryption.po
+++ b/l10n/cy_GB/files_encryption.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-14 02:46+0200\n"
-"PO-Revision-Date: 2013-06-14 00:47+0000\n"
+"POT-Creation-Date: 2013-07-05 02:12+0200\n"
+"PO-Revision-Date: 2013-07-05 00:13+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n"
 "MIME-Version: 1.0\n"
@@ -56,9 +56,21 @@ msgstr ""
 
 #: files/error.php:7
 msgid ""
-"Your private key is not valid! Maybe your password was changed from outside."
-" You can update your private key password in your personal settings to "
-"regain access to your files"
+"Your private key is not valid! Likely your password was changed outside the "
+"ownCloud system (e.g. your corporate directory). You can update your private"
+" key password in your personal settings to recover access to your encrypted "
+"files."
+msgstr ""
+
+#: hooks/hooks.php:44
+msgid "Missing requirements."
+msgstr ""
+
+#: hooks/hooks.php:45
+msgid ""
+"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL "
+"PHP extension is enabled and configured properly. For now, the encryption "
+"app has been disabled."
 msgstr ""
 
 #: js/settings-admin.js:11
@@ -85,11 +97,11 @@ msgstr "Amgryptiad"
 
 #: templates/settings-admin.php:10
 msgid ""
-"Enable encryption passwords recovery key (allow sharing to recovery key):"
+"Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
 #: templates/settings-admin.php:14
-msgid "Recovery account password"
+msgid "Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:21 templates/settings-personal.php:54
@@ -101,15 +113,15 @@ msgid "Disabled"
 msgstr ""
 
 #: templates/settings-admin.php:34
-msgid "Change encryption passwords recovery key:"
+msgid "Change recovery key password:"
 msgstr ""
 
 #: templates/settings-admin.php:41
-msgid "Old Recovery account password"
+msgid "Old Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:48
-msgid "New Recovery account password"
+msgid "New Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:53
diff --git a/l10n/cy_GB/files_external.po b/l10n/cy_GB/files_external.po
index bbd6b29c6b436482b773d6272fe7374034e21ca3..f4629f2d2efa1a8f043d6e1d407f2adde3ade7b4 100644
--- a/l10n/cy_GB/files_external.po
+++ b/l10n/cy_GB/files_external.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/cy_GB/files_sharing.po b/l10n/cy_GB/files_sharing.po
index cf65ee9c3ac2e3a7c52b018b99efc532c00ab860..9063199ceb2f192ce2716d1bf54d22c5c887a800 100644
--- a/l10n/cy_GB/files_sharing.po
+++ b/l10n/cy_GB/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n"
 "MIME-Version: 1.0\n"
@@ -18,27 +18,39 @@ msgstr ""
 "Plural-Forms: nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;\n"
 
 #: templates/authenticate.php:4
+msgid "The password is wrong. Try again."
+msgstr ""
+
+#: templates/authenticate.php:7
 msgid "Password"
 msgstr "Cyfrinair"
 
-#: templates/authenticate.php:6
+#: templates/authenticate.php:9
 msgid "Submit"
 msgstr "Cyflwyno"
 
-#: templates/public.php:10
+#: templates/public.php:17
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "Rhannodd %s blygell %s â chi"
 
-#: templates/public.php:13
+#: templates/public.php:20
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "Rhannodd %s ffeil %s â chi"
 
-#: templates/public.php:19 templates/public.php:43
+#: templates/public.php:28 templates/public.php:90
 msgid "Download"
 msgstr "Llwytho i lawr"
 
-#: templates/public.php:40
+#: templates/public.php:45 templates/public.php:48
+msgid "Upload"
+msgstr "Llwytho i fyny"
+
+#: templates/public.php:58
+msgid "Cancel upload"
+msgstr "Diddymu llwytho i fyny"
+
+#: templates/public.php:87
 msgid "No preview available for"
 msgstr "Does dim rhagolwg ar gael ar gyfer"
diff --git a/l10n/cy_GB/files_trashbin.po b/l10n/cy_GB/files_trashbin.po
index 9ab1d6dd21d2bc2ff2ff1a6c11a2764ee2ca05e8..a8285e54c46923df7aa938119cd090e634153568 100644
--- a/l10n/cy_GB/files_trashbin.po
+++ b/l10n/cy_GB/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:16+0000\n"
 "Last-Translator: ubuntucymraeg <owen.llywelyn@gmail.com>\n"
 "Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/cy_GB/lib.po b/l10n/cy_GB/lib.po
index 0b3e1bda1c58aafb2cf675ad11007b9c5e5ab817..84f59aca83b9f6141476f60dff2af5d5fc465265 100644
--- a/l10n/cy_GB/lib.po
+++ b/l10n/cy_GB/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-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
-"Last-Translator: ubuntucymraeg <owen.llywelyn@gmail.com>\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,43 +17,47 @@ msgstr ""
 "Language: cy_GB\n"
 "Plural-Forms: nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;\n"
 
-#: app.php:359
+#: app.php:360
 msgid "Help"
 msgstr "Cymorth"
 
-#: app.php:372
+#: app.php:373
 msgid "Personal"
 msgstr "Personol"
 
-#: app.php:383
+#: app.php:384
 msgid "Settings"
 msgstr "Gosodiadau"
 
-#: app.php:395
+#: app.php:396
 msgid "Users"
 msgstr "Defnyddwyr"
 
-#: app.php:408
+#: app.php:409
 msgid "Apps"
 msgstr "Pecynnau"
 
-#: app.php:416
+#: app.php:417
 msgid "Admin"
 msgstr "Gweinyddu"
 
-#: files.php:210
+#: defaults.php:33
+msgid "web services under your control"
+msgstr "gwasanaethau gwe a reolir gennych"
+
+#: files.php:226
 msgid "ZIP download is turned off."
 msgstr "Mae llwytho ZIP wedi ei ddiffodd."
 
-#: files.php:211
+#: files.php:227
 msgid "Files need to be downloaded one by one."
 msgstr "Mae angen llwytho ffeiliau i lawr fesul un."
 
-#: files.php:212 files.php:245
+#: files.php:228 files.php:261
 msgid "Back to Files"
 msgstr "Nôl i Ffeiliau"
 
-#: files.php:242
+#: files.php:258
 msgid "Selected files too large to generate zip file."
 msgstr "Mae'r ffeiliau ddewiswyd yn rhy fawr i gynhyrchu ffeil zip."
 
@@ -85,104 +89,102 @@ msgstr "Testun"
 msgid "Images"
 msgstr "Delweddau"
 
-#: setup.php:34
-msgid "Set an admin username."
-msgstr "Creu enw defnyddiwr i'r gweinyddwr."
-
-#: setup.php:37
-msgid "Set an admin password."
-msgstr "Gosod cyfrinair y gweinyddwr."
-
-#: setup.php:55
+#: setup/abstractdatabase.php:22
 #, php-format
 msgid "%s enter the database username."
 msgstr "%s rhowch enw defnyddiwr y gronfa ddata."
 
-#: setup.php:58
+#: setup/abstractdatabase.php:25
 #, php-format
 msgid "%s enter the database name."
 msgstr "%s rhowch enw'r gronfa ddata."
 
-#: setup.php:61
+#: setup/abstractdatabase.php:28
 #, php-format
 msgid "%s you may not use dots in the database name"
 msgstr "%s does dim hawl defnyddio dot yn enw'r gronfa ddata"
 
-#: setup.php:64
+#: setup/mssql.php:20
 #, php-format
-msgid "%s set the database host."
-msgstr "%s gosod gwesteiwr y gronfa ddata."
-
-#: setup.php:126 setup.php:332 setup.php:377
-msgid "PostgreSQL username and/or password not valid"
-msgstr "Enw a/neu gyfrinair PostgreSQL annilys"
+msgid "MS SQL username and/or password not valid: %s"
+msgstr "Enw a/neu gyfrinair MS SQL annilys: %s"
 
-#: setup.php:127 setup.php:235
+#: setup/mssql.php:21 setup/mysql.php:13 setup/oci.php:114
+#: setup/postgresql.php:24 setup/postgresql.php:70
 msgid "You need to enter either an existing account or the administrator."
 msgstr "Rhaid i chi naill ai gyflwyno cyfrif presennol neu'r gweinyddwr."
 
-#: setup.php:152
-msgid "Oracle connection could not be established"
-msgstr ""
-
-#: setup.php:234
+#: setup/mysql.php:12
 msgid "MySQL username and/or password not valid"
 msgstr "Enw a/neu gyfrinair MySQL annilys"
 
-#: setup.php:288 setup.php:398 setup.php:407 setup.php:425 setup.php:435
-#: setup.php:444 setup.php:477 setup.php:543 setup.php:569 setup.php:576
-#: setup.php:587 setup.php:594 setup.php:603 setup.php:611 setup.php:620
-#: setup.php:626
+#: setup/mysql.php:67 setup/oci.php:54 setup/oci.php:121 setup/oci.php:147
+#: setup/oci.php:154 setup/oci.php:165 setup/oci.php:172 setup/oci.php:181
+#: setup/oci.php:189 setup/oci.php:198 setup/oci.php:204
+#: setup/postgresql.php:89 setup/postgresql.php:98 setup/postgresql.php:115
+#: setup/postgresql.php:125 setup/postgresql.php:134
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr "Gwall DB: \"%s\""
 
-#: setup.php:289 setup.php:399 setup.php:408 setup.php:426 setup.php:436
-#: setup.php:445 setup.php:478 setup.php:544 setup.php:570 setup.php:577
-#: setup.php:588 setup.php:604 setup.php:612 setup.php:621
+#: setup/mysql.php:68 setup/oci.php:55 setup/oci.php:122 setup/oci.php:148
+#: setup/oci.php:155 setup/oci.php:166 setup/oci.php:182 setup/oci.php:190
+#: setup/oci.php:199 setup/postgresql.php:90 setup/postgresql.php:99
+#: setup/postgresql.php:116 setup/postgresql.php:126 setup/postgresql.php:135
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr "Y gorchymyn wnaeth beri tramgwydd oedd: \"%s\""
 
-#: setup.php:305
+#: setup/mysql.php:85
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr "Defnyddiwr MySQL '%s'@'localhost' yn bodoli eisoes."
 
-#: setup.php:306
+#: setup/mysql.php:86
 msgid "Drop this user from MySQL"
 msgstr "Gollwng y defnyddiwr hwn o MySQL"
 
-#: setup.php:311
+#: setup/mysql.php:91
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr "Defnyddiwr MySQL '%s'@'%%' eisoes yn bodoli"
 
-#: setup.php:312
+#: setup/mysql.php:92
 msgid "Drop this user from MySQL."
 msgstr "Gollwng y defnyddiwr hwn o MySQL."
 
-#: setup.php:469 setup.php:536
+#: setup/oci.php:34
+msgid "Oracle connection could not be established"
+msgstr ""
+
+#: setup/oci.php:41 setup/oci.php:113
 msgid "Oracle username and/or password not valid"
 msgstr "Enw a/neu gyfrinair Oracle annilys"
 
-#: setup.php:595 setup.php:627
+#: setup/oci.php:173 setup/oci.php:205
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr "Y gorchymyn wnaeth beri tramgwydd oedd: \"%s\", enw: %s, cyfrinair: %s"
 
-#: setup.php:647
-#, php-format
-msgid "MS SQL username and/or password not valid: %s"
-msgstr "Enw a/neu gyfrinair MS SQL annilys: %s"
+#: setup/postgresql.php:23 setup/postgresql.php:69
+msgid "PostgreSQL username and/or password not valid"
+msgstr "Enw a/neu gyfrinair PostgreSQL annilys"
+
+#: setup.php:42
+msgid "Set an admin username."
+msgstr "Creu enw defnyddiwr i'r gweinyddwr."
+
+#: setup.php:45
+msgid "Set an admin password."
+msgstr "Gosod cyfrinair y gweinyddwr."
 
-#: setup.php:870
+#: setup.php:198
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Nid yw eich gweinydd wedi'i gyflunio eto i ganiatáu cydweddu ffeiliau oherwydd bod y rhyngwyneb WebDAV wedi torri."
 
-#: setup.php:871
+#: setup.php:199
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Gwiriwch y <a href='%s'>canllawiau gosod</a> eto."
diff --git a/l10n/cy_GB/settings.po b/l10n/cy_GB/settings.po
index 696ba1f5a848db74bcaef2242a9cd06d834465f9..61756515a4016b846489dc541474f7121cf54653 100644
--- a/l10n/cy_GB/settings.po
+++ b/l10n/cy_GB/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n"
 "MIME-Version: 1.0\n"
@@ -88,35 +88,35 @@ msgstr ""
 msgid "Couldn't update app."
 msgstr ""
 
-#: js/apps.js:30
+#: js/apps.js:35
 msgid "Update to {appversion}"
 msgstr ""
 
-#: js/apps.js:36 js/apps.js:76
+#: js/apps.js:41 js/apps.js:81
 msgid "Disable"
 msgstr ""
 
-#: js/apps.js:36 js/apps.js:64 js/apps.js:83
+#: js/apps.js:41 js/apps.js:69 js/apps.js:88
 msgid "Enable"
 msgstr ""
 
-#: js/apps.js:55
+#: js/apps.js:60
 msgid "Please wait...."
 msgstr ""
 
-#: js/apps.js:59 js/apps.js:71 js/apps.js:80 js/apps.js:93
+#: js/apps.js:64 js/apps.js:76 js/apps.js:85 js/apps.js:98
 msgid "Error"
 msgstr "Gwall"
 
-#: js/apps.js:90
+#: js/apps.js:95
 msgid "Updating...."
 msgstr ""
 
-#: js/apps.js:93
+#: js/apps.js:98
 msgid "Error while updating app"
 msgstr ""
 
-#: js/apps.js:96
+#: js/apps.js:101
 msgid "Updated"
 msgstr ""
 
@@ -165,15 +165,15 @@ msgstr ""
 msgid "A valid password must be provided"
 msgstr ""
 
-#: personal.php:35 personal.php:36
+#: personal.php:37 personal.php:38
 msgid "__language_name__"
 msgstr ""
 
-#: templates/admin.php:15
+#: templates/admin.php:17
 msgid "Security Warning"
 msgstr "Rhybudd Diogelwch"
 
-#: templates/admin.php:18
+#: templates/admin.php:20
 msgid ""
 "Your data directory and your files are probably accessible from the "
 "internet. The .htaccess file that ownCloud provides is not working. We "
@@ -182,36 +182,36 @@ msgid ""
 " webserver document root."
 msgstr ""
 
-#: templates/admin.php:29
+#: templates/admin.php:31
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:32
+#: templates/admin.php:34
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Nid yw eich gweinydd wedi'i gyflunio eto i ganiatáu cydweddu ffeiliau oherwydd bod y rhyngwyneb WebDAV wedi torri."
 
-#: templates/admin.php:33
+#: templates/admin.php:35
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Gwiriwch y <a href='%s'>canllawiau gosod</a> eto."
 
-#: templates/admin.php:44
+#: templates/admin.php:46
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:47
+#: templates/admin.php:49
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr ""
 
-#: templates/admin.php:58
+#: templates/admin.php:60
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:63
+#: templates/admin.php:65
 #, php-format
 msgid ""
 "This ownCloud server can't set system locale to %s. This means that there "
@@ -219,11 +219,11 @@ msgid ""
 " to install the required packages on your system to support %s."
 msgstr ""
 
-#: templates/admin.php:75
+#: templates/admin.php:77
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:78
+#: templates/admin.php:80
 msgid ""
 "This ownCloud server has no working internet connection. This means that "
 "some of the features like mounting of external storage, notifications about "
@@ -233,102 +233,102 @@ msgid ""
 " of ownCloud."
 msgstr ""
 
-#: templates/admin.php:92
+#: templates/admin.php:94
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:101
+#: templates/admin.php:103
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:111
+#: templates/admin.php:113
 msgid ""
 "cron.php is registered at a webcron service. Call the cron.php page in the "
 "owncloud root once a minute over http."
 msgstr ""
 
-#: templates/admin.php:121
+#: templates/admin.php:123
 msgid ""
 "Use systems cron service. Call the cron.php file in the owncloud folder via "
 "a system cronjob once a minute."
 msgstr ""
 
-#: templates/admin.php:128
+#: templates/admin.php:130
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:134
+#: templates/admin.php:136
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:135
+#: templates/admin.php:137
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:142
+#: templates/admin.php:144
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:143
+#: templates/admin.php:145
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:150
+#: templates/admin.php:152
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:151
+#: templates/admin.php:153
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:158
+#: templates/admin.php:160
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:161
+#: templates/admin.php:163
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:168
+#: templates/admin.php:170
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:181
+#: templates/admin.php:183
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:182
+#: templates/admin.php:184
 msgid ""
 "Enforces the clients to connect to ownCloud via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:185
+#: templates/admin.php:187
 msgid ""
 "Please connect to this ownCloud instance via HTTPS to enable or disable the "
 "SSL enforcement."
 msgstr ""
 
-#: templates/admin.php:195
+#: templates/admin.php:197
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:196
+#: templates/admin.php:198
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:227
+#: templates/admin.php:229
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:228
+#: templates/admin.php:230
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:235 templates/personal.php:116
+#: templates/admin.php:236 templates/personal.php:116
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:237 templates/personal.php:119
+#: templates/admin.php:240 templates/personal.php:119
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -386,76 +386,79 @@ msgstr ""
 msgid "Commercial Support"
 msgstr ""
 
-#: templates/personal.php:9
+#: templates/personal.php:10
 msgid "Get the apps to sync your files"
 msgstr ""
 
-#: templates/personal.php:20
+#: templates/personal.php:21
 msgid "Show First Run Wizard again"
 msgstr ""
 
-#: templates/personal.php:28
+#: templates/personal.php:29
 #, php-format
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr ""
 
-#: templates/personal.php:40 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:41 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "Cyfrinair"
 
-#: templates/personal.php:41
+#: templates/personal.php:42
 msgid "Your password was changed"
 msgstr ""
 
-#: templates/personal.php:42
+#: templates/personal.php:43
 msgid "Unable to change your password"
 msgstr ""
 
-#: templates/personal.php:43
+#: templates/personal.php:44
 msgid "Current password"
 msgstr ""
 
-#: templates/personal.php:45
+#: templates/personal.php:46
 msgid "New password"
 msgstr "Cyfrinair newydd"
 
-#: templates/personal.php:47
+#: templates/personal.php:48
 msgid "Change password"
 msgstr ""
 
-#: templates/personal.php:59 templates/users.php:85
+#: templates/personal.php:60 templates/users.php:85
 msgid "Display Name"
 msgstr ""
 
-#: templates/personal.php:74
+#: templates/personal.php:75
 msgid "Email"
 msgstr "E-bost"
 
-#: templates/personal.php:76
+#: templates/personal.php:77
 msgid "Your email address"
 msgstr ""
 
-#: templates/personal.php:77
+#: templates/personal.php:78
 msgid "Fill in an email address to enable password recovery"
 msgstr ""
 
-#: templates/personal.php:86 templates/personal.php:87
+#: templates/personal.php:87 templates/personal.php:88
 msgid "Language"
 msgstr ""
 
-#: templates/personal.php:99
+#: templates/personal.php:100
 msgid "Help translate"
 msgstr ""
 
-#: templates/personal.php:105
+#: templates/personal.php:106
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:107
-msgid "Use this address to connect to your ownCloud in your file manager"
+#: templates/personal.php:108
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
+"target=\"_blank\">access your Files via WebDAV</a>"
 msgstr ""
 
-#: templates/users.php:21 templates/users.php:84
+#: templates/users.php:21
 msgid "Login Name"
 msgstr ""
 
@@ -485,6 +488,10 @@ msgstr ""
 msgid "Other"
 msgstr "Arall"
 
+#: templates/users.php:84
+msgid "Username"
+msgstr "Enw defnyddiwr"
+
 #: templates/users.php:91
 msgid "Storage"
 msgstr ""
diff --git a/l10n/cy_GB/user_ldap.po b/l10n/cy_GB/user_ldap.po
index 31a18c2cc70dc8dfb788ffd7181a37fb5c08f701..44a27a48722a85c108cf8f45066e6cf7af0ca2ce 100644
--- a/l10n/cy_GB/user_ldap.po
+++ b/l10n/cy_GB/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:25+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:16+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/da/core.po b/l10n/da/core.po
index 89b1611e620c256caf2c76679e20ee4973c71ba2..e935b4e302c3b83ed2acfe6739719518f7551acf 100644
--- a/l10n/da/core.po
+++ b/l10n/da/core.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
 "MIME-Version: 1.0\n"
@@ -63,135 +63,135 @@ msgstr "Ingen kategorier valgt"
 msgid "Error removing %s from favorites."
 msgstr "Fejl ved fjernelse af %s fra favoritter."
 
-#: js/config.php:34
+#: js/config.php:32
 msgid "Sunday"
 msgstr "Søndag"
 
-#: js/config.php:35
+#: js/config.php:33
 msgid "Monday"
 msgstr "Mandag"
 
-#: js/config.php:36
+#: js/config.php:34
 msgid "Tuesday"
 msgstr "Tirsdag"
 
-#: js/config.php:37
+#: js/config.php:35
 msgid "Wednesday"
 msgstr "Onsdag"
 
-#: js/config.php:38
+#: js/config.php:36
 msgid "Thursday"
 msgstr "Torsdag"
 
-#: js/config.php:39
+#: js/config.php:37
 msgid "Friday"
 msgstr "Fredag"
 
-#: js/config.php:40
+#: js/config.php:38
 msgid "Saturday"
 msgstr "Lørdag"
 
-#: js/config.php:45
+#: js/config.php:43
 msgid "January"
 msgstr "Januar"
 
-#: js/config.php:46
+#: js/config.php:44
 msgid "February"
 msgstr "Februar"
 
-#: js/config.php:47
+#: js/config.php:45
 msgid "March"
 msgstr "Marts"
 
-#: js/config.php:48
+#: js/config.php:46
 msgid "April"
 msgstr "April"
 
-#: js/config.php:49
+#: js/config.php:47
 msgid "May"
 msgstr "Maj"
 
-#: js/config.php:50
+#: js/config.php:48
 msgid "June"
 msgstr "Juni"
 
-#: js/config.php:51
+#: js/config.php:49
 msgid "July"
 msgstr "Juli"
 
-#: js/config.php:52
+#: js/config.php:50
 msgid "August"
 msgstr "August"
 
-#: js/config.php:53
+#: js/config.php:51
 msgid "September"
 msgstr "September"
 
-#: js/config.php:54
+#: js/config.php:52
 msgid "October"
 msgstr "Oktober"
 
-#: js/config.php:55
+#: js/config.php:53
 msgid "November"
 msgstr "November"
 
-#: js/config.php:56
+#: js/config.php:54
 msgid "December"
 msgstr "December"
 
-#: js/js.js:286
+#: js/js.js:293
 msgid "Settings"
 msgstr "Indstillinger"
 
-#: js/js.js:718
+#: js/js.js:725
 msgid "seconds ago"
 msgstr "sekunder siden"
 
-#: js/js.js:719
+#: js/js.js:726
 msgid "1 minute ago"
 msgstr "1 minut siden"
 
-#: js/js.js:720
+#: js/js.js:727
 msgid "{minutes} minutes ago"
 msgstr "{minutes} minutter siden"
 
-#: js/js.js:721
+#: js/js.js:728
 msgid "1 hour ago"
 msgstr "1 time siden"
 
-#: js/js.js:722
+#: js/js.js:729
 msgid "{hours} hours ago"
 msgstr "{hours} timer siden"
 
-#: js/js.js:723
+#: js/js.js:730
 msgid "today"
 msgstr "i dag"
 
-#: js/js.js:724
+#: js/js.js:731
 msgid "yesterday"
 msgstr "i går"
 
-#: js/js.js:725
+#: js/js.js:732
 msgid "{days} days ago"
 msgstr "{days} dage siden"
 
-#: js/js.js:726
+#: js/js.js:733
 msgid "last month"
 msgstr "sidste måned"
 
-#: js/js.js:727
+#: js/js.js:734
 msgid "{months} months ago"
 msgstr "{months} måneder siden"
 
-#: js/js.js:728
+#: js/js.js:735
 msgid "months ago"
 msgstr "måneder siden"
 
-#: js/js.js:729
+#: js/js.js:736
 msgid "last year"
 msgstr "sidste år"
 
-#: js/js.js:730
+#: js/js.js:737
 msgid "years ago"
 msgstr "Ã¥r siden"
 
@@ -227,8 +227,8 @@ msgstr "Objekttypen er ikke angivet."
 #: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
 #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:577
-#: js/share.js:589
+#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:620
+#: js/share.js:632
 msgid "Error"
 msgstr "Fejl"
 
@@ -248,7 +248,7 @@ msgstr "Delt"
 msgid "Share"
 msgstr "Del"
 
-#: js/share.js:125 js/share.js:617
+#: js/share.js:125 js/share.js:660
 msgid "Error while sharing"
 msgstr "Fejl under deling"
 
@@ -268,99 +268,103 @@ msgstr "Delt med dig og gruppen {group} af {owner}"
 msgid "Shared with you by {owner}"
 msgstr "Delt med dig af {owner}"
 
-#: js/share.js:159
+#: js/share.js:172
 msgid "Share with"
 msgstr "Del med"
 
-#: js/share.js:164
+#: js/share.js:177
 msgid "Share with link"
 msgstr "Del med link"
 
-#: js/share.js:167
+#: js/share.js:180
 msgid "Password protect"
 msgstr "Beskyt med adgangskode"
 
-#: js/share.js:169 templates/installation.php:54 templates/login.php:26
+#: js/share.js:182 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "Kodeord"
 
-#: js/share.js:173
+#: js/share.js:187
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:191
 msgid "Email link to person"
 msgstr "E-mail link til person"
 
-#: js/share.js:174
+#: js/share.js:192
 msgid "Send"
 msgstr "Send"
 
-#: js/share.js:178
+#: js/share.js:197
 msgid "Set expiration date"
 msgstr "Vælg udløbsdato"
 
-#: js/share.js:179
+#: js/share.js:198
 msgid "Expiration date"
 msgstr "Udløbsdato"
 
-#: js/share.js:211
+#: js/share.js:230
 msgid "Share via email:"
 msgstr "Del via email:"
 
-#: js/share.js:213
+#: js/share.js:232
 msgid "No people found"
 msgstr "Ingen personer fundet"
 
-#: js/share.js:251
+#: js/share.js:270
 msgid "Resharing is not allowed"
 msgstr "Videredeling ikke tilladt"
 
-#: js/share.js:287
+#: js/share.js:306
 msgid "Shared in {item} with {user}"
 msgstr "Delt i {item} med {user}"
 
-#: js/share.js:308
+#: js/share.js:327
 msgid "Unshare"
 msgstr "Fjern deling"
 
-#: js/share.js:320
+#: js/share.js:339
 msgid "can edit"
 msgstr "kan redigere"
 
-#: js/share.js:322
+#: js/share.js:341
 msgid "access control"
 msgstr "Adgangskontrol"
 
-#: js/share.js:325
+#: js/share.js:344
 msgid "create"
 msgstr "opret"
 
-#: js/share.js:328
+#: js/share.js:347
 msgid "update"
 msgstr "opdater"
 
-#: js/share.js:331
+#: js/share.js:350
 msgid "delete"
 msgstr "slet"
 
-#: js/share.js:334
+#: js/share.js:353
 msgid "share"
 msgstr "del"
 
-#: js/share.js:368 js/share.js:564
+#: js/share.js:387 js/share.js:607
 msgid "Password protected"
 msgstr "Beskyttet med adgangskode"
 
-#: js/share.js:577
+#: js/share.js:620
 msgid "Error unsetting expiration date"
 msgstr "Fejl ved fjernelse af udløbsdato"
 
-#: js/share.js:589
+#: js/share.js:632
 msgid "Error setting expiration date"
 msgstr "Fejl under sætning af udløbsdato"
 
-#: js/share.js:604
+#: js/share.js:647
 msgid "Sending ..."
 msgstr "Sender ..."
 
-#: js/share.js:615
+#: js/share.js:658
 msgid "Email sent"
 msgstr "E-mail afsendt"
 
@@ -375,7 +379,7 @@ msgstr "Opdateringen blev ikke udført korrekt. Rapporter venligst problemet til
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "Opdateringen blev udført korrekt. Du bliver nu viderestillet til ownCloud."
 
-#: lostpassword/controller.php:58
+#: lostpassword/controller.php:60
 msgid "ownCloud password reset"
 msgstr "Nulstil ownCloud kodeord"
 
@@ -405,17 +409,17 @@ msgstr "Brugernavn"
 
 #: lostpassword/templates/lostpassword.php:22
 msgid ""
-"Your files seems to be encrypted. If you didn't have enabled the recovery "
-"key there will be no way to get your data back once the password was "
-"resetted. If you are not sure what to do, please contact your administrator "
-"first before continue. Do you really want to continue?"
+"Your files are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
 msgstr ""
 
 #: lostpassword/templates/lostpassword.php:24
 msgid "Yes, I really want to reset my password now"
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:29
+#: lostpassword/templates/lostpassword.php:27
 msgid "Request reset"
 msgstr "Anmod om nulstilling"
 
@@ -463,7 +467,7 @@ msgstr "Adgang forbudt"
 msgid "Cloud not found"
 msgstr "Sky ikke fundet"
 
-#: templates/altmail.php:2
+#: templates/altmail.php:4
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -474,10 +478,6 @@ msgid ""
 "Cheers!"
 msgstr ""
 
-#: templates/altmail.php:7 templates/mail.php:24
-msgid "web services under your control"
-msgstr "Webtjenester under din kontrol"
-
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
 msgstr "Rediger kategorier"
@@ -570,12 +570,12 @@ msgstr "Databasehost"
 msgid "Finish setup"
 msgstr "Afslut opsætning"
 
-#: templates/layout.user.php:40
+#: templates/layout.user.php:43
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr "%s er tilgængelig. Få mere information om, hvordan du opdaterer."
 
-#: templates/layout.user.php:67
+#: templates/layout.user.php:68
 msgid "Log out"
 msgstr "Log ud"
 
@@ -609,7 +609,7 @@ msgstr "Log ind"
 msgid "Alternative Logins"
 msgstr "Alternative logins"
 
-#: templates/mail.php:15
+#: templates/mail.php:16
 #, php-format
 msgid ""
 "Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
diff --git a/l10n/da/files.po b/l10n/da/files.po
index 6e6d862f45628a99037f78dc8430cdafe6b225d6..63666db1080d67a976e985040730a458b5ec40e0 100644
--- a/l10n/da/files.po
+++ b/l10n/da/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-06-17 02:01+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
-"Last-Translator: Ole Holm Frandsen <froksen@gmail.com>\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -28,46 +28,54 @@ msgstr "Kunne ikke flytte %s - der findes allerede en fil med dette navn"
 msgid "Could not move %s"
 msgstr "Kunne ikke flytte %s"
 
-#: ajax/upload.php:19
+#: ajax/upload.php:16 ajax/upload.php:45
+msgid "Unable to set upload directory."
+msgstr ""
+
+#: ajax/upload.php:22
+msgid "Invalid Token"
+msgstr ""
+
+#: ajax/upload.php:59
 msgid "No file was uploaded. Unknown error"
 msgstr "Ingen fil blev uploadet. Ukendt fejl."
 
-#: ajax/upload.php:26
+#: ajax/upload.php:66
 msgid "There is no error, the file uploaded with success"
 msgstr "Der skete ingen fejl, filen blev succesfuldt uploadet"
 
-#: ajax/upload.php:27
+#: ajax/upload.php:67
 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:29
+#: ajax/upload.php:69
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Den uploadede fil overstiger MAX_FILE_SIZE indstilingen, som specificeret i HTML formularen"
 
-#: ajax/upload.php:30
+#: ajax/upload.php:70
 msgid "The uploaded file was only partially uploaded"
 msgstr "Filen blev kun delvist uploadet."
 
-#: ajax/upload.php:31
+#: ajax/upload.php:71
 msgid "No file was uploaded"
 msgstr "Ingen fil uploadet"
 
-#: ajax/upload.php:32
+#: ajax/upload.php:72
 msgid "Missing a temporary folder"
 msgstr "Manglende midlertidig mappe."
 
-#: ajax/upload.php:33
+#: ajax/upload.php:73
 msgid "Failed to write to disk"
 msgstr "Fejl ved skrivning til disk."
 
-#: ajax/upload.php:51
+#: ajax/upload.php:91
 msgid "Not enough storage available"
 msgstr "Der er ikke nok plads til rådlighed"
 
-#: ajax/upload.php:83
+#: ajax/upload.php:123
 msgid "Invalid directory."
 msgstr "Ugyldig mappe."
 
@@ -75,6 +83,36 @@ msgstr "Ugyldig mappe."
 msgid "Files"
 msgstr "Filer"
 
+#: js/file-upload.js:11
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr "Kan ikke uploade din fil - det er enten en mappe eller en fil med et indhold på 0 bytes."
+
+#: js/file-upload.js:24
+msgid "Not enough space available"
+msgstr "ikke nok tilgængelig ledig plads "
+
+#: js/file-upload.js:64
+msgid "Upload cancelled."
+msgstr "Upload afbrudt."
+
+#: js/file-upload.js:167 js/files.js:266
+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/file-upload.js:233 js/files.js:339
+msgid "URL cannot be empty."
+msgstr "URLen kan ikke være tom."
+
+#: js/file-upload.js:238 lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr "Ugyldigt mappenavn. Brug af 'Shared' er forbeholdt af ownCloud"
+
+#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
+#: js/files.js:693 js/files.js:731
+msgid "Error"
+msgstr "Fejl"
+
 #: js/fileactions.js:116
 msgid "Share"
 msgstr "Del"
@@ -91,43 +129,43 @@ msgstr "Slet"
 msgid "Rename"
 msgstr "Omdøb"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:464
 msgid "Pending"
 msgstr "Afventer"
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "{new_name} already exists"
 msgstr "{new_name} eksisterer allerede"
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "replace"
 msgstr "erstat"
 
-#: js/filelist.js:259
+#: js/filelist.js:302
 msgid "suggest name"
 msgstr "foreslå navn"
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "cancel"
 msgstr "fortryd"
 
-#: js/filelist.js:306
+#: js/filelist.js:349
 msgid "replaced {new_name} with {old_name}"
 msgstr "erstattede {new_name} med {old_name}"
 
-#: js/filelist.js:306
+#: js/filelist.js:349
 msgid "undo"
 msgstr "fortryd"
 
-#: js/filelist.js:331
+#: js/filelist.js:374
 msgid "perform delete operation"
 msgstr "udfør slet operation"
 
-#: js/filelist.js:413
+#: js/filelist.js:456
 msgid "1 file uploading"
 msgstr "1 fil uploades"
 
-#: js/filelist.js:416 js/filelist.js:470
+#: js/filelist.js:459 js/filelist.js:517
 msgid "files uploading"
 msgstr "uploader filer"
 
@@ -159,70 +197,42 @@ msgid ""
 "big."
 msgstr "Dit download forberedes. Dette kan tage lidt tid ved større filer."
 
-#: js/files.js:264
-msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "Kan ikke uploade din fil - det er enten en mappe eller en fil med et indhold på 0 bytes."
-
-#: js/files.js:277
-msgid "Not enough space available"
-msgstr "ikke nok tilgængelig ledig plads "
-
-#: js/files.js:317
-msgid "Upload cancelled."
-msgstr "Upload afbrudt."
-
-#: js/files.js:413
-msgid ""
-"File upload is in progress. Leaving the page now will cancel the upload."
-msgstr "Fil upload kører. Hvis du forlader siden nu, vil uploadet blive annuleret."
-
-#: js/files.js:486
-msgid "URL cannot be empty."
-msgstr "URLen kan ikke være tom."
-
-#: js/files.js:491
+#: js/files.js:344
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Ugyldigt mappenavn. Brug af \"Shared\" er forbeholdt Owncloud"
 
-#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
-msgid "Error"
-msgstr "Fejl"
-
-#: js/files.js:877 templates/index.php:69
+#: js/files.js:744 templates/index.php:69
 msgid "Name"
 msgstr "Navn"
 
-#: js/files.js:878 templates/index.php:80
+#: js/files.js:745 templates/index.php:80
 msgid "Size"
 msgstr "Størrelse"
 
-#: js/files.js:879 templates/index.php:82
+#: js/files.js:746 templates/index.php:82
 msgid "Modified"
 msgstr "Ændret"
 
-#: js/files.js:898
+#: js/files.js:765
 msgid "1 folder"
 msgstr "1 mappe"
 
-#: js/files.js:900
+#: js/files.js:767
 msgid "{count} folders"
 msgstr "{count} mapper"
 
-#: js/files.js:908
+#: js/files.js:775
 msgid "1 file"
 msgstr "1 fil"
 
-#: js/files.js:910
+#: js/files.js:777
 msgid "{count} files"
 msgstr "{count} filer"
 
-#: lib/app.php:53
-msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
-msgstr "Ugyldigt mappenavn. Brug af 'Shared' er forbeholdt af ownCloud"
-
 #: lib/app.php:73
-msgid "Unable to rename file"
-msgstr "Kunne ikke omdøbe fil"
+#, php-format
+msgid "%s could not be renamed"
+msgstr ""
 
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
@@ -318,6 +328,22 @@ msgstr "Filerne bliver indlæst, vent venligst."
 msgid "Current scanning"
 msgstr "Indlæser"
 
+#: templates/part.list.php:76
+msgid "directory"
+msgstr ""
+
+#: templates/part.list.php:78
+msgid "directories"
+msgstr ""
+
+#: templates/part.list.php:87
+msgid "file"
+msgstr "fil"
+
+#: templates/part.list.php:89
+msgid "files"
+msgstr "filer"
+
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
 msgstr "Opgraderer filsystems cachen..."
diff --git a/l10n/da/files_encryption.po b/l10n/da/files_encryption.po
index 9a0323a6c102451f7d311838b859adfc07863caa..9df3c49abd129994dca82422a4407faf4bf66e57 100644
--- a/l10n/da/files_encryption.po
+++ b/l10n/da/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-14 02:46+0200\n"
-"PO-Revision-Date: 2013-06-14 00:47+0000\n"
+"POT-Creation-Date: 2013-07-05 02:12+0200\n"
+"PO-Revision-Date: 2013-07-05 00:13+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"
@@ -55,9 +55,21 @@ msgstr ""
 
 #: files/error.php:7
 msgid ""
-"Your private key is not valid! Maybe your password was changed from outside."
-" You can update your private key password in your personal settings to "
-"regain access to your files"
+"Your private key is not valid! Likely your password was changed outside the "
+"ownCloud system (e.g. your corporate directory). You can update your private"
+" key password in your personal settings to recover access to your encrypted "
+"files."
+msgstr ""
+
+#: hooks/hooks.php:44
+msgid "Missing requirements."
+msgstr ""
+
+#: hooks/hooks.php:45
+msgid ""
+"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL "
+"PHP extension is enabled and configured properly. For now, the encryption "
+"app has been disabled."
 msgstr ""
 
 #: js/settings-admin.js:11
@@ -84,11 +96,11 @@ msgstr "Kryptering"
 
 #: templates/settings-admin.php:10
 msgid ""
-"Enable encryption passwords recovery key (allow sharing to recovery key):"
+"Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
 #: templates/settings-admin.php:14
-msgid "Recovery account password"
+msgid "Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:21 templates/settings-personal.php:54
@@ -100,15 +112,15 @@ msgid "Disabled"
 msgstr ""
 
 #: templates/settings-admin.php:34
-msgid "Change encryption passwords recovery key:"
+msgid "Change recovery key password:"
 msgstr ""
 
 #: templates/settings-admin.php:41
-msgid "Old Recovery account password"
+msgid "Old Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:48
-msgid "New Recovery account password"
+msgid "New Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:53
diff --git a/l10n/da/files_external.po b/l10n/da/files_external.po
index 8b03cf6826f39125cccec48a56e6dc4824a0d6f1..81bfb22e6aaab14b710f2d59aab44a3bb7fa0129 100644
--- a/l10n/da/files_external.po
+++ b/l10n/da/files_external.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/da/files_sharing.po b/l10n/da/files_sharing.po
index 56efb3314698ee4a969afe3528625c676f2b6fea..63796e43bf06c3ea0daab9c9f8409e5cb6a9b554 100644
--- a/l10n/da/files_sharing.po
+++ b/l10n/da/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
 "MIME-Version: 1.0\n"
@@ -18,27 +18,39 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: templates/authenticate.php:4
+msgid "The password is wrong. Try again."
+msgstr ""
+
+#: templates/authenticate.php:7
 msgid "Password"
 msgstr "Kodeord"
 
-#: templates/authenticate.php:6
+#: templates/authenticate.php:9
 msgid "Submit"
 msgstr "Send"
 
-#: templates/public.php:10
+#: templates/public.php:17
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s delte mappen %s med dig"
 
-#: templates/public.php:13
+#: templates/public.php:20
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s delte filen %s med dig"
 
-#: templates/public.php:19 templates/public.php:43
+#: templates/public.php:28 templates/public.php:90
 msgid "Download"
 msgstr "Download"
 
-#: templates/public.php:40
+#: templates/public.php:45 templates/public.php:48
+msgid "Upload"
+msgstr "Upload"
+
+#: templates/public.php:58
+msgid "Cancel upload"
+msgstr "Fortryd upload"
+
+#: templates/public.php:87
 msgid "No preview available for"
 msgstr "Forhåndsvisning ikke tilgængelig for"
diff --git a/l10n/da/files_trashbin.po b/l10n/da/files_trashbin.po
index 0f0890fcc991ba1860f37bb30465b1a43b4b5027..f92a96f3c3d781be9a4e56d2f7284d192b8a81e9 100644
--- a/l10n/da/files_trashbin.po
+++ b/l10n/da/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:16+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/da/lib.po b/l10n/da/lib.po
index 780b49f9adeb08535bd26d9af34a6fccb3c2c26b..bd31165131359325db3667579e558c219c5dcf37 100644
--- a/l10n/da/lib.po
+++ b/l10n/da/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-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
-"Last-Translator: Ole Holm Frandsen <froksen@gmail.com>\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,43 +18,47 @@ msgstr ""
 "Language: da\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:359
+#: app.php:360
 msgid "Help"
 msgstr "Hjælp"
 
-#: app.php:372
+#: app.php:373
 msgid "Personal"
 msgstr "Personligt"
 
-#: app.php:383
+#: app.php:384
 msgid "Settings"
 msgstr "Indstillinger"
 
-#: app.php:395
+#: app.php:396
 msgid "Users"
 msgstr "Brugere"
 
-#: app.php:408
+#: app.php:409
 msgid "Apps"
 msgstr "Apps"
 
-#: app.php:416
+#: app.php:417
 msgid "Admin"
 msgstr "Admin"
 
-#: files.php:210
+#: defaults.php:33
+msgid "web services under your control"
+msgstr "Webtjenester under din kontrol"
+
+#: files.php:226
 msgid "ZIP download is turned off."
 msgstr "ZIP-download er slået fra."
 
-#: files.php:211
+#: files.php:227
 msgid "Files need to be downloaded one by one."
 msgstr "Filer skal downloades en for en."
 
-#: files.php:212 files.php:245
+#: files.php:228 files.php:261
 msgid "Back to Files"
 msgstr "Tilbage til Filer"
 
-#: files.php:242
+#: files.php:258
 msgid "Selected files too large to generate zip file."
 msgstr "De markerede filer er for store til at generere en ZIP-fil."
 
@@ -86,104 +90,102 @@ msgstr "SMS"
 msgid "Images"
 msgstr "Billeder"
 
-#: setup.php:34
-msgid "Set an admin username."
-msgstr "Angiv et admin brugernavn."
-
-#: setup.php:37
-msgid "Set an admin password."
-msgstr "Angiv et admin kodeord."
-
-#: setup.php:55
+#: setup/abstractdatabase.php:22
 #, php-format
 msgid "%s enter the database username."
 msgstr "%s indtast database brugernavnet."
 
-#: setup.php:58
+#: setup/abstractdatabase.php:25
 #, php-format
 msgid "%s enter the database name."
 msgstr "%s indtast database navnet."
 
-#: setup.php:61
+#: setup/abstractdatabase.php:28
 #, php-format
 msgid "%s you may not use dots in the database name"
 msgstr "%s du må ikke bruge punktummer i databasenavnet."
 
-#: setup.php:64
+#: setup/mssql.php:20
 #, php-format
-msgid "%s set the database host."
-msgstr "%s sæt database værten."
-
-#: setup.php:126 setup.php:332 setup.php:377
-msgid "PostgreSQL username and/or password not valid"
-msgstr "PostgreSQL brugernavn og/eller kodeord er ikke gyldigt."
+msgid "MS SQL username and/or password not valid: %s"
+msgstr "MS SQL brugernavn og/eller adgangskode ikke er gyldigt: %s"
 
-#: setup.php:127 setup.php:235
+#: setup/mssql.php:21 setup/mysql.php:13 setup/oci.php:114
+#: setup/postgresql.php:24 setup/postgresql.php:70
 msgid "You need to enter either an existing account or the administrator."
 msgstr "Du bliver nødt til at indtaste en eksisterende bruger eller en administrator."
 
-#: setup.php:152
-msgid "Oracle connection could not be established"
-msgstr "Oracle forbindelsen kunne ikke etableres"
-
-#: setup.php:234
+#: setup/mysql.php:12
 msgid "MySQL username and/or password not valid"
 msgstr "MySQL brugernavn og/eller kodeord er ikke gyldigt."
 
-#: setup.php:288 setup.php:398 setup.php:407 setup.php:425 setup.php:435
-#: setup.php:444 setup.php:477 setup.php:543 setup.php:569 setup.php:576
-#: setup.php:587 setup.php:594 setup.php:603 setup.php:611 setup.php:620
-#: setup.php:626
+#: setup/mysql.php:67 setup/oci.php:54 setup/oci.php:121 setup/oci.php:147
+#: setup/oci.php:154 setup/oci.php:165 setup/oci.php:172 setup/oci.php:181
+#: setup/oci.php:189 setup/oci.php:198 setup/oci.php:204
+#: setup/postgresql.php:89 setup/postgresql.php:98 setup/postgresql.php:115
+#: setup/postgresql.php:125 setup/postgresql.php:134
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr "Databasefejl: \"%s\""
 
-#: setup.php:289 setup.php:399 setup.php:408 setup.php:426 setup.php:436
-#: setup.php:445 setup.php:478 setup.php:544 setup.php:570 setup.php:577
-#: setup.php:588 setup.php:604 setup.php:612 setup.php:621
+#: setup/mysql.php:68 setup/oci.php:55 setup/oci.php:122 setup/oci.php:148
+#: setup/oci.php:155 setup/oci.php:166 setup/oci.php:182 setup/oci.php:190
+#: setup/oci.php:199 setup/postgresql.php:90 setup/postgresql.php:99
+#: setup/postgresql.php:116 setup/postgresql.php:126 setup/postgresql.php:135
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr "Fejlende kommando var: \"%s\""
 
-#: setup.php:305
+#: setup/mysql.php:85
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr "MySQL brugeren '%s'@'localhost' eksisterer allerede."
 
-#: setup.php:306
+#: setup/mysql.php:86
 msgid "Drop this user from MySQL"
 msgstr "Slet denne bruger fra MySQL"
 
-#: setup.php:311
+#: setup/mysql.php:91
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr "MySQL brugeren '%s'@'%%' eksisterer allerede."
 
-#: setup.php:312
+#: setup/mysql.php:92
 msgid "Drop this user from MySQL."
 msgstr "Slet denne bruger fra MySQL"
 
-#: setup.php:469 setup.php:536
+#: setup/oci.php:34
+msgid "Oracle connection could not be established"
+msgstr "Oracle forbindelsen kunne ikke etableres"
+
+#: setup/oci.php:41 setup/oci.php:113
 msgid "Oracle username and/or password not valid"
 msgstr "Oracle brugernavn og/eller kodeord er ikke gyldigt."
 
-#: setup.php:595 setup.php:627
+#: setup/oci.php:173 setup/oci.php:205
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr "Fejlende kommando var: \"%s\", navn: %s, password: %s"
 
-#: setup.php:647
-#, php-format
-msgid "MS SQL username and/or password not valid: %s"
-msgstr "MS SQL brugernavn og/eller adgangskode ikke er gyldigt: %s"
+#: setup/postgresql.php:23 setup/postgresql.php:69
+msgid "PostgreSQL username and/or password not valid"
+msgstr "PostgreSQL brugernavn og/eller kodeord er ikke gyldigt."
+
+#: setup.php:42
+msgid "Set an admin username."
+msgstr "Angiv et admin brugernavn."
+
+#: setup.php:45
+msgid "Set an admin password."
+msgstr "Angiv et admin kodeord."
 
-#: setup.php:870
+#: setup.php:198
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Din webserver er endnu ikke sat op til at tillade fil synkronisering fordi WebDAV grænsefladen virker ødelagt."
 
-#: setup.php:871
+#: setup.php:199
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Dobbelttjek venligst <a href='%s'>installations vejledningerne</a>."
diff --git a/l10n/da/settings.po b/l10n/da/settings.po
index 78247c20d08fa12036ea3eff249e10a9d7152f54..830bf6c939c5300a40dcd805f976a7eb2100ca79 100644
--- a/l10n/da/settings.po
+++ b/l10n/da/settings.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
-"Last-Translator: Ole Holm Frandsen <froksen@gmail.com>\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -89,35 +89,35 @@ msgstr "Brugeren kan ikke fjernes fra gruppen %s"
 msgid "Couldn't update app."
 msgstr "Kunne ikke opdatere app'en."
 
-#: js/apps.js:30
+#: js/apps.js:35
 msgid "Update to {appversion}"
 msgstr "Opdatér til {appversion}"
 
-#: js/apps.js:36 js/apps.js:76
+#: js/apps.js:41 js/apps.js:81
 msgid "Disable"
 msgstr "Deaktiver"
 
-#: js/apps.js:36 js/apps.js:64 js/apps.js:83
+#: js/apps.js:41 js/apps.js:69 js/apps.js:88
 msgid "Enable"
 msgstr "Aktiver"
 
-#: js/apps.js:55
+#: js/apps.js:60
 msgid "Please wait...."
 msgstr "Vent venligst..."
 
-#: js/apps.js:59 js/apps.js:71 js/apps.js:80 js/apps.js:93
+#: js/apps.js:64 js/apps.js:76 js/apps.js:85 js/apps.js:98
 msgid "Error"
 msgstr "Fejl"
 
-#: js/apps.js:90
+#: js/apps.js:95
 msgid "Updating...."
 msgstr "Opdaterer...."
 
-#: js/apps.js:93
+#: js/apps.js:98
 msgid "Error while updating app"
 msgstr "Der opstod en fejl under app opgraderingen"
 
-#: js/apps.js:96
+#: js/apps.js:101
 msgid "Updated"
 msgstr "Opdateret"
 
@@ -166,15 +166,15 @@ msgstr "Fejl ved oprettelse af bruger"
 msgid "A valid password must be provided"
 msgstr "En gyldig adgangskode skal angives"
 
-#: personal.php:35 personal.php:36
+#: personal.php:37 personal.php:38
 msgid "__language_name__"
 msgstr "Dansk"
 
-#: templates/admin.php:15
+#: templates/admin.php:17
 msgid "Security Warning"
 msgstr "Sikkerhedsadvarsel"
 
-#: templates/admin.php:18
+#: templates/admin.php:20
 msgid ""
 "Your data directory and your files are probably accessible from the "
 "internet. The .htaccess file that ownCloud provides is not working. We "
@@ -183,36 +183,36 @@ msgid ""
 " webserver document root."
 msgstr "Din data mappe og dine filer er muligvis tilgængelige fra internettet. .htaccess filen som ownCloud leverer virker ikke. Vi anbefaler på det kraftigste at du konfigurerer din webserver på en måske så data mappen ikke  længere er tilgængelig eller at du flytter data mappen uden for webserverens dokument rod.  "
 
-#: templates/admin.php:29
+#: templates/admin.php:31
 msgid "Setup Warning"
 msgstr "Opsætnings Advarsel"
 
-#: templates/admin.php:32
+#: templates/admin.php:34
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Din webserver er endnu ikke sat op til at tillade fil synkronisering fordi WebDAV grænsefladen virker ødelagt."
 
-#: templates/admin.php:33
+#: templates/admin.php:35
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Dobbelttjek venligst <a href='%s'>installations vejledningerne</a>."
 
-#: templates/admin.php:44
+#: templates/admin.php:46
 msgid "Module 'fileinfo' missing"
 msgstr "Module 'fileinfo' mangler"
 
-#: templates/admin.php:47
+#: templates/admin.php:49
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr "PHP modulet 'fileinfo' mangler. Vi anbefaler stærkt at aktivere dette modul til at få de bedste resultater med mime-type detektion."
 
-#: templates/admin.php:58
+#: templates/admin.php:60
 msgid "Locale not working"
 msgstr "Landestandard fungerer ikke"
 
-#: templates/admin.php:63
+#: templates/admin.php:65
 #, php-format
 msgid ""
 "This ownCloud server can't set system locale to %s. This means that there "
@@ -220,11 +220,11 @@ msgid ""
 " to install the required packages on your system to support %s."
 msgstr "Denne ownCloud server kan ikke indstille systemets landestandard for %s. Det betyder, at der kan være problemer med visse tegn i filnavne. Vi anbefaler kraftigt, at installere de nødvendige pakker på dit system til at understøtte %s."
 
-#: templates/admin.php:75
+#: templates/admin.php:77
 msgid "Internet connection not working"
 msgstr "Internetforbindelse fungerer ikke"
 
-#: templates/admin.php:78
+#: templates/admin.php:80
 msgid ""
 "This ownCloud server has no working internet connection. This means that "
 "some of the features like mounting of external storage, notifications about "
@@ -234,102 +234,102 @@ msgid ""
 " of ownCloud."
 msgstr "Denne ownCloud-server har ikke en fungerende forbindelse til internettet. Det betyder, at visse funktioner som montering af eksterne drev, oplysninger om opdatering eller installation af eksterne applikationer ikke fungerer. Det vil sandsynligvis heller ikke fungere at tilgå filer fra eksterne drev eller informationsemails. Vi opfordrer til at etablere forbindelse til internettet for denne server, såfremt du ønsker alle ownClouds funktioner."
 
-#: templates/admin.php:92
+#: templates/admin.php:94
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:101
+#: templates/admin.php:103
 msgid "Execute one task with each page loaded"
 msgstr "Udføre en opgave med hver side indlæst"
 
-#: templates/admin.php:111
+#: templates/admin.php:113
 msgid ""
 "cron.php is registered at a webcron service. Call the cron.php page in the "
 "owncloud root once a minute over http."
 msgstr "cron.php er registreret hos en webcron service. Kald cron.php side i owncloud rod en gang i minuttet over HTTP."
 
-#: templates/admin.php:121
+#: templates/admin.php:123
 msgid ""
 "Use systems cron service. Call the cron.php file in the owncloud folder via "
 "a system cronjob once a minute."
 msgstr "Brug system cron service. Kald cron.php filen i owncloud mappe via et system cronjob en gang i minuttet."
 
-#: templates/admin.php:128
+#: templates/admin.php:130
 msgid "Sharing"
 msgstr "Deling"
 
-#: templates/admin.php:134
+#: templates/admin.php:136
 msgid "Enable Share API"
 msgstr "Aktiver Share API"
 
-#: templates/admin.php:135
+#: templates/admin.php:137
 msgid "Allow apps to use the Share API"
 msgstr "Tillad apps til at bruge Share API"
 
-#: templates/admin.php:142
+#: templates/admin.php:144
 msgid "Allow links"
 msgstr "Tillad links"
 
-#: templates/admin.php:143
+#: templates/admin.php:145
 msgid "Allow users to share items to the public with links"
 msgstr "Tillad brugere at dele elementer til offentligheden med links"
 
-#: templates/admin.php:150
+#: templates/admin.php:152
 msgid "Allow resharing"
 msgstr "Tillad videredeling"
 
-#: templates/admin.php:151
+#: templates/admin.php:153
 msgid "Allow users to share items shared with them again"
 msgstr "Tillad brugere at dele elementer delt med dem igen"
 
-#: templates/admin.php:158
+#: templates/admin.php:160
 msgid "Allow users to share with anyone"
 msgstr "Tillad brugere at dele med alle"
 
-#: templates/admin.php:161
+#: templates/admin.php:163
 msgid "Allow users to only share with users in their groups"
 msgstr "Tillad brugere at kun dele med brugerne i deres grupper"
 
-#: templates/admin.php:168
+#: templates/admin.php:170
 msgid "Security"
 msgstr "Sikkerhed"
 
-#: templates/admin.php:181
+#: templates/admin.php:183
 msgid "Enforce HTTPS"
 msgstr "Gennemtving HTTPS"
 
-#: templates/admin.php:182
+#: templates/admin.php:184
 msgid ""
 "Enforces the clients to connect to ownCloud via an encrypted connection."
 msgstr "Håndhæver klienter at oprette forbindelse til ownCloud via en krypteret forbindelse."
 
-#: templates/admin.php:185
+#: templates/admin.php:187
 msgid ""
 "Please connect to this ownCloud instance via HTTPS to enable or disable the "
 "SSL enforcement."
 msgstr "Opret forbindelse til denne ownCloud enhed via HTTPS for at aktivere eller deaktivere SSL håndhævelse."
 
-#: templates/admin.php:195
+#: templates/admin.php:197
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:196
+#: templates/admin.php:198
 msgid "Log level"
 msgstr "Log niveau"
 
-#: templates/admin.php:227
+#: templates/admin.php:229
 msgid "More"
 msgstr "Mere"
 
-#: templates/admin.php:228
+#: templates/admin.php:230
 msgid "Less"
 msgstr "Mindre"
 
-#: templates/admin.php:235 templates/personal.php:116
+#: templates/admin.php:236 templates/personal.php:116
 msgid "Version"
 msgstr "Version"
 
-#: templates/admin.php:237 templates/personal.php:119
+#: templates/admin.php:240 templates/personal.php:119
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -387,76 +387,79 @@ msgstr "Bugtracker"
 msgid "Commercial Support"
 msgstr "Kommerciel support"
 
-#: templates/personal.php:9
+#: templates/personal.php:10
 msgid "Get the apps to sync your files"
 msgstr "Hent applikationerne for at synkronisere dine filer"
 
-#: templates/personal.php:20
+#: templates/personal.php:21
 msgid "Show First Run Wizard again"
 msgstr "Vis Første Kørsels Guiden igen."
 
-#: templates/personal.php:28
+#: templates/personal.php:29
 #, php-format
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "Du har brugt <strong>%s</strong> af den tilgængelige <strong>%s</strong>"
 
-#: templates/personal.php:40 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:41 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "Kodeord"
 
-#: templates/personal.php:41
+#: templates/personal.php:42
 msgid "Your password was changed"
 msgstr "Din adgangskode blev ændret"
 
-#: templates/personal.php:42
+#: templates/personal.php:43
 msgid "Unable to change your password"
 msgstr "Ude af stand til at ændre dit kodeord"
 
-#: templates/personal.php:43
+#: templates/personal.php:44
 msgid "Current password"
 msgstr "Nuværende adgangskode"
 
-#: templates/personal.php:45
+#: templates/personal.php:46
 msgid "New password"
 msgstr "Nyt kodeord"
 
-#: templates/personal.php:47
+#: templates/personal.php:48
 msgid "Change password"
 msgstr "Skift kodeord"
 
-#: templates/personal.php:59 templates/users.php:85
+#: templates/personal.php:60 templates/users.php:85
 msgid "Display Name"
 msgstr "Skærmnavn"
 
-#: templates/personal.php:74
+#: templates/personal.php:75
 msgid "Email"
 msgstr "E-mail"
 
-#: templates/personal.php:76
+#: templates/personal.php:77
 msgid "Your email address"
 msgstr "Din emailadresse"
 
-#: templates/personal.php:77
+#: templates/personal.php:78
 msgid "Fill in an email address to enable password recovery"
 msgstr "Indtast en emailadresse for at kunne få påmindelse om adgangskode"
 
-#: templates/personal.php:86 templates/personal.php:87
+#: templates/personal.php:87 templates/personal.php:88
 msgid "Language"
 msgstr "Sprog"
 
-#: templates/personal.php:99
+#: templates/personal.php:100
 msgid "Help translate"
 msgstr "Hjælp med oversættelsen"
 
-#: templates/personal.php:105
+#: templates/personal.php:106
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:107
-msgid "Use this address to connect to your ownCloud in your file manager"
-msgstr "Brug denne adresse til at oprette forbindelse til din ownCloud i din filstyring"
+#: templates/personal.php:108
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
+"target=\"_blank\">access your Files via WebDAV</a>"
+msgstr ""
 
-#: templates/users.php:21 templates/users.php:84
+#: templates/users.php:21
 msgid "Login Name"
 msgstr "Loginnavn"
 
@@ -486,6 +489,10 @@ msgstr "Ubegrænset"
 msgid "Other"
 msgstr "Andet"
 
+#: templates/users.php:84
+msgid "Username"
+msgstr "Brugernavn"
+
 #: templates/users.php:91
 msgid "Storage"
 msgstr "Opbevaring"
diff --git a/l10n/da/user_ldap.po b/l10n/da/user_ldap.po
index 6cbcfa142ee101c9c11c0a763e9df68bfc0a95ff..7bb33d4f9905ed20bcfaf5fc971df837206c6fd8 100644
--- a/l10n/da/user_ldap.po
+++ b/l10n/da/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:25+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:16+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/de/core.po b/l10n/de/core.po
index 2dce2331274ddfbc66788ce8eb69851d2f085876..fdf38b878711ce72aa464a8bb91bf7491bb032c5 100644
--- a/l10n/de/core.po
+++ b/l10n/de/core.po
@@ -5,14 +5,15 @@
 # Translators:
 # arkascha <foss@christian-reiner.info>, 2013
 # Marcel Kühlhorn <susefan93@gmx.de>, 2013
+# JamFX <niko@nik-o-mat.de>, 2013
 # ninov <ninovdl@ymail.com>, 2013
 # Mirodin <blobbyjj@ymail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:22+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:14+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: German <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
@@ -24,7 +25,7 @@ msgstr ""
 #: ajax/share.php:97
 #, php-format
 msgid "%s shared »%s« with you"
-msgstr ""
+msgstr "%s teilte »%s« mit Ihnen"
 
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
@@ -65,135 +66,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/config.php:34
+#: js/config.php:32
 msgid "Sunday"
 msgstr "Sonntag"
 
-#: js/config.php:35
+#: js/config.php:33
 msgid "Monday"
 msgstr "Montag"
 
-#: js/config.php:36
+#: js/config.php:34
 msgid "Tuesday"
 msgstr "Dienstag"
 
-#: js/config.php:37
+#: js/config.php:35
 msgid "Wednesday"
 msgstr "Mittwoch"
 
-#: js/config.php:38
+#: js/config.php:36
 msgid "Thursday"
 msgstr "Donnerstag"
 
-#: js/config.php:39
+#: js/config.php:37
 msgid "Friday"
 msgstr "Freitag"
 
-#: js/config.php:40
+#: js/config.php:38
 msgid "Saturday"
 msgstr "Samstag"
 
-#: js/config.php:45
+#: js/config.php:43
 msgid "January"
 msgstr "Januar"
 
-#: js/config.php:46
+#: js/config.php:44
 msgid "February"
 msgstr "Februar"
 
-#: js/config.php:47
+#: js/config.php:45
 msgid "March"
 msgstr "März"
 
-#: js/config.php:48
+#: js/config.php:46
 msgid "April"
 msgstr "April"
 
-#: js/config.php:49
+#: js/config.php:47
 msgid "May"
 msgstr "Mai"
 
-#: js/config.php:50
+#: js/config.php:48
 msgid "June"
 msgstr "Juni"
 
-#: js/config.php:51
+#: js/config.php:49
 msgid "July"
 msgstr "Juli"
 
-#: js/config.php:52
+#: js/config.php:50
 msgid "August"
 msgstr "August"
 
-#: js/config.php:53
+#: js/config.php:51
 msgid "September"
 msgstr "September"
 
-#: js/config.php:54
+#: js/config.php:52
 msgid "October"
 msgstr "Oktober"
 
-#: js/config.php:55
+#: js/config.php:53
 msgid "November"
 msgstr "November"
 
-#: js/config.php:56
+#: js/config.php:54
 msgid "December"
 msgstr "Dezember"
 
-#: js/js.js:286
+#: js/js.js:293
 msgid "Settings"
 msgstr "Einstellungen"
 
-#: js/js.js:718
+#: js/js.js:725
 msgid "seconds ago"
 msgstr "Gerade eben"
 
-#: js/js.js:719
+#: js/js.js:726
 msgid "1 minute ago"
 msgstr "vor einer Minute"
 
-#: js/js.js:720
+#: js/js.js:727
 msgid "{minutes} minutes ago"
 msgstr "Vor {minutes} Minuten"
 
-#: js/js.js:721
+#: js/js.js:728
 msgid "1 hour ago"
 msgstr "Vor einer Stunde"
 
-#: js/js.js:722
+#: js/js.js:729
 msgid "{hours} hours ago"
 msgstr "Vor {hours} Stunden"
 
-#: js/js.js:723
+#: js/js.js:730
 msgid "today"
 msgstr "Heute"
 
-#: js/js.js:724
+#: js/js.js:731
 msgid "yesterday"
 msgstr "Gestern"
 
-#: js/js.js:725
+#: js/js.js:732
 msgid "{days} days ago"
 msgstr "Vor {days} Tag(en)"
 
-#: js/js.js:726
+#: js/js.js:733
 msgid "last month"
 msgstr "Letzten Monat"
 
-#: js/js.js:727
+#: js/js.js:734
 msgid "{months} months ago"
 msgstr "Vor {months} Monaten"
 
-#: js/js.js:728
+#: js/js.js:735
 msgid "months ago"
 msgstr "Vor Monaten"
 
-#: js/js.js:729
+#: js/js.js:736
 msgid "last year"
 msgstr "Letztes Jahr"
 
-#: js/js.js:730
+#: js/js.js:737
 msgid "years ago"
 msgstr "Vor Jahren"
 
@@ -229,8 +230,8 @@ msgstr "Der Objekttyp ist nicht angegeben."
 #: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
 #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:577
-#: js/share.js:589
+#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:620
+#: js/share.js:632
 msgid "Error"
 msgstr "Fehler"
 
@@ -250,7 +251,7 @@ msgstr "Geteilt"
 msgid "Share"
 msgstr "Teilen"
 
-#: js/share.js:125 js/share.js:617
+#: js/share.js:125 js/share.js:660
 msgid "Error while sharing"
 msgstr "Fehler beim Teilen"
 
@@ -270,99 +271,103 @@ msgstr "{owner} hat dies mit Dir und der Gruppe {group} geteilt"
 msgid "Shared with you by {owner}"
 msgstr "{owner} hat dies mit Dir geteilt"
 
-#: js/share.js:159
+#: js/share.js:172
 msgid "Share with"
 msgstr "Teilen mit"
 
-#: js/share.js:164
+#: js/share.js:177
 msgid "Share with link"
 msgstr "Ãœber einen Link freigegeben"
 
-#: js/share.js:167
+#: js/share.js:180
 msgid "Password protect"
 msgstr "Passwortschutz"
 
-#: js/share.js:169 templates/installation.php:54 templates/login.php:26
+#: js/share.js:182 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "Passwort"
 
-#: js/share.js:173
+#: js/share.js:187
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:191
 msgid "Email link to person"
 msgstr "Link per E-Mail verschicken"
 
-#: js/share.js:174
+#: js/share.js:192
 msgid "Send"
 msgstr "Senden"
 
-#: js/share.js:178
+#: js/share.js:197
 msgid "Set expiration date"
 msgstr "Setze ein Ablaufdatum"
 
-#: js/share.js:179
+#: js/share.js:198
 msgid "Expiration date"
 msgstr "Ablaufdatum"
 
-#: js/share.js:211
+#: js/share.js:230
 msgid "Share via email:"
 msgstr "Ãœber eine E-Mail teilen:"
 
-#: js/share.js:213
+#: js/share.js:232
 msgid "No people found"
 msgstr "Niemand gefunden"
 
-#: js/share.js:251
+#: js/share.js:270
 msgid "Resharing is not allowed"
 msgstr "Weiterverteilen ist nicht erlaubt"
 
-#: js/share.js:287
+#: js/share.js:306
 msgid "Shared in {item} with {user}"
 msgstr "Für {user} in {item} freigegeben"
 
-#: js/share.js:308
+#: js/share.js:327
 msgid "Unshare"
 msgstr "Freigabe aufheben"
 
-#: js/share.js:320
+#: js/share.js:339
 msgid "can edit"
 msgstr "kann bearbeiten"
 
-#: js/share.js:322
+#: js/share.js:341
 msgid "access control"
 msgstr "Zugriffskontrolle"
 
-#: js/share.js:325
+#: js/share.js:344
 msgid "create"
 msgstr "erstellen"
 
-#: js/share.js:328
+#: js/share.js:347
 msgid "update"
 msgstr "aktualisieren"
 
-#: js/share.js:331
+#: js/share.js:350
 msgid "delete"
 msgstr "löschen"
 
-#: js/share.js:334
+#: js/share.js:353
 msgid "share"
 msgstr "teilen"
 
-#: js/share.js:368 js/share.js:564
+#: js/share.js:387 js/share.js:607
 msgid "Password protected"
 msgstr "Durch ein Passwort geschützt"
 
-#: js/share.js:577
+#: js/share.js:620
 msgid "Error unsetting expiration date"
 msgstr "Fehler beim Entfernen des Ablaufdatums"
 
-#: js/share.js:589
+#: js/share.js:632
 msgid "Error setting expiration date"
 msgstr "Fehler beim Setzen des Ablaufdatums"
 
-#: js/share.js:604
+#: js/share.js:647
 msgid "Sending ..."
 msgstr "Sende ..."
 
-#: js/share.js:615
+#: js/share.js:658
 msgid "Email sent"
 msgstr "E-Mail wurde verschickt"
 
@@ -377,7 +382,7 @@ msgstr "Das Update ist fehlgeschlagen. Bitte melde dieses Problem an die <a href
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "Das Update war erfolgreich. Du wirst nun zu ownCloud weitergeleitet."
 
-#: lostpassword/controller.php:58
+#: lostpassword/controller.php:60
 msgid "ownCloud password reset"
 msgstr "ownCloud-Passwort zurücksetzen"
 
@@ -407,17 +412,17 @@ msgstr "Benutzername"
 
 #: lostpassword/templates/lostpassword.php:22
 msgid ""
-"Your files seems to be encrypted. If you didn't have enabled the recovery "
-"key there will be no way to get your data back once the password was "
-"resetted. If you are not sure what to do, please contact your administrator "
-"first before continue. Do you really want to continue?"
-msgstr ""
+"Your files are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
+msgstr "Ihre Dateien sind verschlüsselt. Sollten Sie keinen Wiederherstellungschlüssel aktiviert haben, gibt es keine Möglichkeit an Ihre Daten zu kommen, wenn das Passwort zurückgesetzt wird. Falls Sie sich nicht sicher sind, was Sie tun sollen, kontaktieren Sie bitte Ihren Administrator, bevor Sie fortfahren. Wollen Sie wirklich fortfahren?"
 
 #: lostpassword/templates/lostpassword.php:24
 msgid "Yes, I really want to reset my password now"
-msgstr ""
+msgstr "Ja, ich will mein Passwort jetzt wirklich zurücksetzen"
 
-#: lostpassword/templates/lostpassword.php:29
+#: lostpassword/templates/lostpassword.php:27
 msgid "Request reset"
 msgstr "Beantrage Zurücksetzung"
 
@@ -465,7 +470,7 @@ msgstr "Zugriff verboten"
 msgid "Cloud not found"
 msgstr "Cloud nicht gefunden"
 
-#: templates/altmail.php:2
+#: templates/altmail.php:4
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -474,11 +479,7 @@ msgid ""
 "View it: %s\n"
 "\n"
 "Cheers!"
-msgstr ""
-
-#: templates/altmail.php:7 templates/mail.php:24
-msgid "web services under your control"
-msgstr "Web-Services unter Deiner Kontrolle"
+msgstr "Hallo,\n\nwollte dich nur kurz informieren, dass %s gerade %s mit dir geteilt hat.\nSchau es dir an: %s\n\nGruß!"
 
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
@@ -572,12 +573,12 @@ msgstr "Datenbank-Host"
 msgid "Finish setup"
 msgstr "Installation abschließen"
 
-#: templates/layout.user.php:40
+#: templates/layout.user.php:43
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr "%s ist verfügbar. Holen Sie weitere Informationen zu Aktualisierungen ein."
 
-#: templates/layout.user.php:67
+#: templates/layout.user.php:68
 msgid "Log out"
 msgstr "Abmelden"
 
@@ -611,12 +612,12 @@ msgstr "Einloggen"
 msgid "Alternative Logins"
 msgstr "Alternative Logins"
 
-#: templates/mail.php:15
+#: templates/mail.php:16
 #, php-format
 msgid ""
 "Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
 "href=\"%s\">View it!</a><br><br>Cheers!"
-msgstr ""
+msgstr "Hallo,<br/><br/>wollte dich nur kurz informieren, dass %s gerade %s mit dir geteilt hat.<br/><a href=\"%s\">Schau es dir an.</a><br/><br/>Gruß!"
 
 #: templates/part.pagenavi.php:3
 msgid "prev"
diff --git a/l10n/de/files.po b/l10n/de/files.po
index 2f836f144ac024ce14e997b59a69bf5d1d9aad59..a238f01cdd1c9f84cf01c1c0e5f8f0f360b93e52 100644
--- a/l10n/de/files.po
+++ b/l10n/de/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-06-17 02:01+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
-"Last-Translator: ninov <ninovdl@ymail.com>\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: German <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -29,46 +29,54 @@ msgstr "Konnte %s nicht verschieben. Eine Datei mit diesem Namen existiert berei
 msgid "Could not move %s"
 msgstr "Konnte %s nicht verschieben"
 
-#: ajax/upload.php:19
+#: ajax/upload.php:16 ajax/upload.php:45
+msgid "Unable to set upload directory."
+msgstr ""
+
+#: ajax/upload.php:22
+msgid "Invalid Token"
+msgstr ""
+
+#: ajax/upload.php:59
 msgid "No file was uploaded. Unknown error"
 msgstr "Keine Datei hochgeladen. Unbekannter Fehler"
 
-#: ajax/upload.php:26
+#: ajax/upload.php:66
 msgid "There is no error, the file uploaded with success"
 msgstr "Es ist kein Fehler aufgetreten. Die Datei wurde erfolgreich hochgeladen."
 
-#: ajax/upload.php:27
+#: ajax/upload.php:67
 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:29
+#: ajax/upload.php:69
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Die Datei ist größer, als die MAX_FILE_SIZE Direktive erlaubt, die im HTML-Formular spezifiziert ist"
 
-#: ajax/upload.php:30
+#: ajax/upload.php:70
 msgid "The uploaded file was only partially uploaded"
 msgstr "Die Datei konnte nur teilweise übertragen werden"
 
-#: ajax/upload.php:31
+#: ajax/upload.php:71
 msgid "No file was uploaded"
 msgstr "Keine Datei konnte übertragen werden."
 
-#: ajax/upload.php:32
+#: ajax/upload.php:72
 msgid "Missing a temporary folder"
 msgstr "Kein temporärer Ordner vorhanden"
 
-#: ajax/upload.php:33
+#: ajax/upload.php:73
 msgid "Failed to write to disk"
 msgstr "Fehler beim Schreiben auf die Festplatte"
 
-#: ajax/upload.php:51
+#: ajax/upload.php:91
 msgid "Not enough storage available"
 msgstr "Nicht genug Speicher vorhanden."
 
-#: ajax/upload.php:83
+#: ajax/upload.php:123
 msgid "Invalid directory."
 msgstr "Ungültiges Verzeichnis."
 
@@ -76,6 +84,36 @@ msgstr "Ungültiges Verzeichnis."
 msgid "Files"
 msgstr "Dateien"
 
+#: js/file-upload.js:11
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr "Deine Datei kann nicht hochgeladen werden, weil es sich um einen Ordner handelt oder 0 Bytes groß ist."
+
+#: js/file-upload.js:24
+msgid "Not enough space available"
+msgstr "Nicht genug Speicherplatz verfügbar"
+
+#: js/file-upload.js:64
+msgid "Upload cancelled."
+msgstr "Upload abgebrochen."
+
+#: js/file-upload.js:167 js/files.js:266
+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/file-upload.js:233 js/files.js:339
+msgid "URL cannot be empty."
+msgstr "Die URL darf nicht leer sein."
+
+#: js/file-upload.js:238 lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr "Der Ordnername ist ungültig. Nur ownCloud kann den Ordner \"Shared\" anlegen"
+
+#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
+#: js/files.js:693 js/files.js:731
+msgid "Error"
+msgstr "Fehler"
+
 #: js/fileactions.js:116
 msgid "Share"
 msgstr "Teilen"
@@ -92,43 +130,43 @@ msgstr "Löschen"
 msgid "Rename"
 msgstr "Umbenennen"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:464
 msgid "Pending"
 msgstr "Ausstehend"
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "{new_name} already exists"
 msgstr "{new_name} existiert bereits"
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "replace"
 msgstr "ersetzen"
 
-#: js/filelist.js:259
+#: js/filelist.js:302
 msgid "suggest name"
 msgstr "Namen vorschlagen"
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "cancel"
 msgstr "abbrechen"
 
-#: js/filelist.js:306
+#: js/filelist.js:349
 msgid "replaced {new_name} with {old_name}"
 msgstr "{old_name} ersetzt durch {new_name}"
 
-#: js/filelist.js:306
+#: js/filelist.js:349
 msgid "undo"
 msgstr "rückgängig machen"
 
-#: js/filelist.js:331
+#: js/filelist.js:374
 msgid "perform delete operation"
 msgstr "Löschvorgang ausführen"
 
-#: js/filelist.js:413
+#: js/filelist.js:456
 msgid "1 file uploading"
 msgstr "1 Datei wird hochgeladen"
 
-#: js/filelist.js:416 js/filelist.js:470
+#: js/filelist.js:459 js/filelist.js:517
 msgid "files uploading"
 msgstr "Dateien werden hoch geladen"
 
@@ -160,70 +198,42 @@ msgid ""
 "big."
 msgstr "Dein Download wird vorbereitet. Dies kann bei größeren Dateien etwas dauern."
 
-#: js/files.js:264
-msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "Deine Datei kann nicht hochgeladen werden, weil es sich um einen Ordner handelt oder 0 Bytes groß ist."
-
-#: js/files.js:277
-msgid "Not enough space available"
-msgstr "Nicht genug Speicherplatz verfügbar"
-
-#: js/files.js:317
-msgid "Upload cancelled."
-msgstr "Upload abgebrochen."
-
-#: js/files.js:413
-msgid ""
-"File upload is in progress. Leaving the page now will cancel the upload."
-msgstr "Dateiupload läuft. Wenn Du die Seite jetzt verlässt, wird der Upload abgebrochen."
-
-#: js/files.js:486
-msgid "URL cannot be empty."
-msgstr "Die URL darf nicht leer sein."
-
-#: js/files.js:491
+#: js/files.js:344
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Ungültiger Verzeichnisname. Die Nutzung von \"Shared\" ist ownCloud vorbehalten."
 
-#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
-msgid "Error"
-msgstr "Fehler"
-
-#: js/files.js:877 templates/index.php:69
+#: js/files.js:744 templates/index.php:69
 msgid "Name"
 msgstr "Name"
 
-#: js/files.js:878 templates/index.php:80
+#: js/files.js:745 templates/index.php:80
 msgid "Size"
 msgstr "Größe"
 
-#: js/files.js:879 templates/index.php:82
+#: js/files.js:746 templates/index.php:82
 msgid "Modified"
 msgstr "Geändert"
 
-#: js/files.js:898
+#: js/files.js:765
 msgid "1 folder"
 msgstr "1 Ordner"
 
-#: js/files.js:900
+#: js/files.js:767
 msgid "{count} folders"
 msgstr "{count} Ordner"
 
-#: js/files.js:908
+#: js/files.js:775
 msgid "1 file"
 msgstr "1 Datei"
 
-#: js/files.js:910
+#: js/files.js:777
 msgid "{count} files"
 msgstr "{count} Dateien"
 
-#: lib/app.php:53
-msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
-msgstr "Der Ordnername ist ungültig. Nur ownCloud kann den Ordner \"Shared\" anlegen"
-
 #: lib/app.php:73
-msgid "Unable to rename file"
-msgstr "Konnte Datei nicht umbenennen"
+#, php-format
+msgid "%s could not be renamed"
+msgstr ""
 
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
@@ -319,6 +329,22 @@ msgstr "Dateien werden gescannt, bitte warten."
 msgid "Current scanning"
 msgstr "Scanne"
 
+#: templates/part.list.php:76
+msgid "directory"
+msgstr ""
+
+#: templates/part.list.php:78
+msgid "directories"
+msgstr ""
+
+#: templates/part.list.php:87
+msgid "file"
+msgstr "Datei"
+
+#: templates/part.list.php:89
+msgid "files"
+msgstr "Dateien"
+
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
 msgstr "Dateisystem-Cache wird aktualisiert ..."
diff --git a/l10n/de/files_encryption.po b/l10n/de/files_encryption.po
index 359fa3145d564ef1c329b4e6f36b78f59c008ed5..a1ca99ba2672a8188cbd718a15259a0a07bdcd69 100644
--- a/l10n/de/files_encryption.po
+++ b/l10n/de/files_encryption.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-14 02:46+0200\n"
-"PO-Revision-Date: 2013-06-14 00:47+0000\n"
+"POT-Creation-Date: 2013-07-05 02:12+0200\n"
+"PO-Revision-Date: 2013-07-05 00:13+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: German <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
@@ -48,7 +48,7 @@ msgstr "Das Passwort konnte nicht geändert werden. Vielleicht war das alte Pass
 
 #: ajax/updatePrivateKeyPassword.php:51
 msgid "Private key password successfully updated."
-msgstr ""
+msgstr "Passwort des privaten Schlüssels erfolgreich aktualisiert"
 
 #: ajax/updatePrivateKeyPassword.php:53
 msgid ""
@@ -58,9 +58,21 @@ msgstr ""
 
 #: files/error.php:7
 msgid ""
-"Your private key is not valid! Maybe your password was changed from outside."
-" You can update your private key password in your personal settings to "
-"regain access to your files"
+"Your private key is not valid! Likely your password was changed outside the "
+"ownCloud system (e.g. your corporate directory). You can update your private"
+" key password in your personal settings to recover access to your encrypted "
+"files."
+msgstr ""
+
+#: hooks/hooks.php:44
+msgid "Missing requirements."
+msgstr ""
+
+#: hooks/hooks.php:45
+msgid ""
+"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL "
+"PHP extension is enabled and configured properly. For now, the encryption "
+"app has been disabled."
 msgstr ""
 
 #: js/settings-admin.js:11
@@ -79,7 +91,7 @@ msgstr ""
 
 #: templates/invalid_private_key.php:7
 msgid "personal settings"
-msgstr ""
+msgstr "Private Einstellungen"
 
 #: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
@@ -87,12 +99,12 @@ msgstr "Verschlüsselung"
 
 #: templates/settings-admin.php:10
 msgid ""
-"Enable encryption passwords recovery key (allow sharing to recovery key):"
+"Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
 #: templates/settings-admin.php:14
-msgid "Recovery account password"
-msgstr "Password zurücksetzen"
+msgid "Recovery key password"
+msgstr ""
 
 #: templates/settings-admin.php:21 templates/settings-personal.php:54
 msgid "Enabled"
@@ -103,15 +115,15 @@ msgid "Disabled"
 msgstr "Deaktiviert"
 
 #: templates/settings-admin.php:34
-msgid "Change encryption passwords recovery key:"
-msgstr "Wiederherstellungsschlüssel für Passwörter ändern:"
+msgid "Change recovery key password:"
+msgstr ""
 
 #: templates/settings-admin.php:41
-msgid "Old Recovery account password"
+msgid "Old Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:48
-msgid "New Recovery account password"
+msgid "New Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:53
@@ -134,11 +146,11 @@ msgstr ""
 
 #: templates/settings-personal.php:24
 msgid "Old log-in password"
-msgstr ""
+msgstr "Altes login Passwort"
 
 #: templates/settings-personal.php:30
 msgid "Current log-in password"
-msgstr ""
+msgstr "Aktuelles Passwort"
 
 #: templates/settings-personal.php:35
 msgid "Update Private Key Password"
diff --git a/l10n/de/files_external.po b/l10n/de/files_external.po
index f7357b958b1f53bf0d60b2abf7424af7bfa1b2a8..f9d626951b040ed0a08c3607e58b57effe1a91b9 100644
--- a/l10n/de/files_external.po
+++ b/l10n/de/files_external.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: Mirodin <blobbyjj@ymail.com>\n"
 "Language-Team: German <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/de/files_sharing.po b/l10n/de/files_sharing.po
index edc1560704abd2f8d490dce4d46b1423666c2647..f00c2a6de1baf117555e7c22a672ead75aa79ae6 100644
--- a/l10n/de/files_sharing.po
+++ b/l10n/de/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: German <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
@@ -18,27 +18,39 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: templates/authenticate.php:4
+msgid "The password is wrong. Try again."
+msgstr ""
+
+#: templates/authenticate.php:7
 msgid "Password"
 msgstr "Passwort"
 
-#: templates/authenticate.php:6
+#: templates/authenticate.php:9
 msgid "Submit"
 msgstr "Absenden"
 
-#: templates/public.php:10
+#: templates/public.php:17
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s hat den Ordner %s mit Dir geteilt"
 
-#: templates/public.php:13
+#: templates/public.php:20
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s hat die Datei %s mit Dir geteilt"
 
-#: templates/public.php:19 templates/public.php:43
+#: templates/public.php:28 templates/public.php:90
 msgid "Download"
 msgstr "Download"
 
-#: templates/public.php:40
+#: templates/public.php:45 templates/public.php:48
+msgid "Upload"
+msgstr "Hochladen"
+
+#: templates/public.php:58
+msgid "Cancel upload"
+msgstr "Upload abbrechen"
+
+#: templates/public.php:87
 msgid "No preview available for"
 msgstr "Es ist keine Vorschau verfügbar für"
diff --git a/l10n/de/files_trashbin.po b/l10n/de/files_trashbin.po
index 140e3ebea4ed1d09431bdf24a8b6518664ef0f34..39773d1b38c7d5dc33efc09f353a4d04771bc500 100644
--- a/l10n/de/files_trashbin.po
+++ b/l10n/de/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: Mirodin <blobbyjj@ymail.com>\n"
 "Language-Team: German <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/de/lib.po b/l10n/de/lib.po
index 71e452b07487f45beb2e5d3e6bc4e8a91a5b73c4..911765332686ef9251fafcf2e8ec22a5e7a3602f 100644
--- a/l10n/de/lib.po
+++ b/l10n/de/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-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
-"Last-Translator: ninov <ninovdl@ymail.com>\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: German <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,43 +19,47 @@ msgstr ""
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:359
+#: app.php:360
 msgid "Help"
 msgstr "Hilfe"
 
-#: app.php:372
+#: app.php:373
 msgid "Personal"
 msgstr "Persönlich"
 
-#: app.php:383
+#: app.php:384
 msgid "Settings"
 msgstr "Einstellungen"
 
-#: app.php:395
+#: app.php:396
 msgid "Users"
 msgstr "Benutzer"
 
-#: app.php:408
+#: app.php:409
 msgid "Apps"
 msgstr "Apps"
 
-#: app.php:416
+#: app.php:417
 msgid "Admin"
 msgstr "Administration"
 
-#: files.php:210
+#: defaults.php:33
+msgid "web services under your control"
+msgstr "Web-Services unter Deiner Kontrolle"
+
+#: files.php:226
 msgid "ZIP download is turned off."
 msgstr "Der ZIP-Download ist deaktiviert."
 
-#: files.php:211
+#: files.php:227
 msgid "Files need to be downloaded one by one."
 msgstr "Die Dateien müssen einzeln heruntergeladen werden."
 
-#: files.php:212 files.php:245
+#: files.php:228 files.php:261
 msgid "Back to Files"
 msgstr "Zurück zu \"Dateien\""
 
-#: files.php:242
+#: files.php:258
 msgid "Selected files too large to generate zip file."
 msgstr "Die gewählten Dateien sind zu groß, um eine ZIP-Datei zu erstellen."
 
@@ -87,104 +91,102 @@ msgstr "Text"
 msgid "Images"
 msgstr "Bilder"
 
-#: setup.php:34
-msgid "Set an admin username."
-msgstr "Setze Administrator Benutzername."
-
-#: setup.php:37
-msgid "Set an admin password."
-msgstr "Setze Administrator Passwort"
-
-#: setup.php:55
+#: setup/abstractdatabase.php:22
 #, php-format
 msgid "%s enter the database username."
 msgstr "%s gib den Datenbank-Benutzernamen an."
 
-#: setup.php:58
+#: setup/abstractdatabase.php:25
 #, php-format
 msgid "%s enter the database name."
 msgstr "%s gib den Datenbank-Namen an."
 
-#: setup.php:61
+#: setup/abstractdatabase.php:28
 #, php-format
 msgid "%s you may not use dots in the database name"
 msgstr "%s Der Datenbank-Name darf keine Punkte enthalten"
 
-#: setup.php:64
+#: setup/mssql.php:20
 #, php-format
-msgid "%s set the database host."
-msgstr "%s setze den Datenbank-Host"
-
-#: setup.php:126 setup.php:332 setup.php:377
-msgid "PostgreSQL username and/or password not valid"
-msgstr "PostgreSQL Benutzername und/oder Passwort ungültig"
+msgid "MS SQL username and/or password not valid: %s"
+msgstr "MS SQL Benutzername und/oder Password ungültig: %s"
 
-#: setup.php:127 setup.php:235
+#: setup/mssql.php:21 setup/mysql.php:13 setup/oci.php:114
+#: setup/postgresql.php:24 setup/postgresql.php:70
 msgid "You need to enter either an existing account or the administrator."
 msgstr "Du musst entweder ein existierendes Benutzerkonto oder das Administratoren-Konto angeben."
 
-#: setup.php:152
-msgid "Oracle connection could not be established"
-msgstr "Es konnte keine Verbindung zur Oracle-Datenbank hergestellt werden"
-
-#: setup.php:234
+#: setup/mysql.php:12
 msgid "MySQL username and/or password not valid"
 msgstr "MySQL Benutzername und/oder Passwort ungültig"
 
-#: setup.php:288 setup.php:398 setup.php:407 setup.php:425 setup.php:435
-#: setup.php:444 setup.php:477 setup.php:543 setup.php:569 setup.php:576
-#: setup.php:587 setup.php:594 setup.php:603 setup.php:611 setup.php:620
-#: setup.php:626
+#: setup/mysql.php:67 setup/oci.php:54 setup/oci.php:121 setup/oci.php:147
+#: setup/oci.php:154 setup/oci.php:165 setup/oci.php:172 setup/oci.php:181
+#: setup/oci.php:189 setup/oci.php:198 setup/oci.php:204
+#: setup/postgresql.php:89 setup/postgresql.php:98 setup/postgresql.php:115
+#: setup/postgresql.php:125 setup/postgresql.php:134
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr "DB Fehler: \"%s\""
 
-#: setup.php:289 setup.php:399 setup.php:408 setup.php:426 setup.php:436
-#: setup.php:445 setup.php:478 setup.php:544 setup.php:570 setup.php:577
-#: setup.php:588 setup.php:604 setup.php:612 setup.php:621
+#: setup/mysql.php:68 setup/oci.php:55 setup/oci.php:122 setup/oci.php:148
+#: setup/oci.php:155 setup/oci.php:166 setup/oci.php:182 setup/oci.php:190
+#: setup/oci.php:199 setup/postgresql.php:90 setup/postgresql.php:99
+#: setup/postgresql.php:116 setup/postgresql.php:126 setup/postgresql.php:135
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr "Fehlerhafter Befehl war: \"%s\""
 
-#: setup.php:305
+#: setup/mysql.php:85
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr "MySQL Benutzer '%s'@'localhost' existiert bereits."
 
-#: setup.php:306
+#: setup/mysql.php:86
 msgid "Drop this user from MySQL"
 msgstr "Lösche diesen Benutzer von MySQL"
 
-#: setup.php:311
+#: setup/mysql.php:91
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr "MySQL Benutzer '%s'@'%%' existiert bereits"
 
-#: setup.php:312
+#: setup/mysql.php:92
 msgid "Drop this user from MySQL."
 msgstr "Lösche diesen Benutzer aus MySQL."
 
-#: setup.php:469 setup.php:536
+#: setup/oci.php:34
+msgid "Oracle connection could not be established"
+msgstr "Es konnte keine Verbindung zur Oracle-Datenbank hergestellt werden"
+
+#: setup/oci.php:41 setup/oci.php:113
 msgid "Oracle username and/or password not valid"
 msgstr "Oracle Benutzername und/oder Passwort ungültig"
 
-#: setup.php:595 setup.php:627
+#: setup/oci.php:173 setup/oci.php:205
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr "Fehlerhafter Befehl war: \"%s\", Name: %s, Passwort: %s"
 
-#: setup.php:647
-#, php-format
-msgid "MS SQL username and/or password not valid: %s"
-msgstr "MS SQL Benutzername und/oder Password ungültig: %s"
+#: setup/postgresql.php:23 setup/postgresql.php:69
+msgid "PostgreSQL username and/or password not valid"
+msgstr "PostgreSQL Benutzername und/oder Passwort ungültig"
+
+#: setup.php:42
+msgid "Set an admin username."
+msgstr "Setze Administrator Benutzername."
+
+#: setup.php:45
+msgid "Set an admin password."
+msgstr "Setze Administrator Passwort"
 
-#: setup.php:870
+#: setup.php:198
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Dein Web-Server ist noch nicht für Datei-Synchronisation bereit, weil die WebDAV-Schnittstelle vermutlich defekt ist."
 
-#: setup.php:871
+#: setup.php:199
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Bitte prüfe die <a href='%s'>Installationsanleitungen</a>."
diff --git a/l10n/de/settings.po b/l10n/de/settings.po
index 05048e2a0aa796b3218715105acee68bc63d0ff3..bc63ce0b006c11b9358910693588aa2cd9e3233b 100644
--- a/l10n/de/settings.po
+++ b/l10n/de/settings.po
@@ -4,14 +4,15 @@
 # 
 # Translators:
 # arkascha <foss@christian-reiner.info>, 2013
+# Mario Siegmann <mario_siegmann@web.de>, 2013
 # ninov <ninovdl@ymail.com>, 2013
 # Mirodin <blobbyjj@ymail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: German <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
@@ -91,35 +92,35 @@ msgstr "Der Benutzer konnte nicht aus der Gruppe %s entfernt werden"
 msgid "Couldn't update app."
 msgstr "Die App konnte nicht aktualisiert werden."
 
-#: js/apps.js:30
+#: js/apps.js:35
 msgid "Update to {appversion}"
 msgstr "Aktualisiere zu {appversion}"
 
-#: js/apps.js:36 js/apps.js:76
+#: js/apps.js:41 js/apps.js:81
 msgid "Disable"
 msgstr "Deaktivieren"
 
-#: js/apps.js:36 js/apps.js:64 js/apps.js:83
+#: js/apps.js:41 js/apps.js:69 js/apps.js:88
 msgid "Enable"
 msgstr "Aktivieren"
 
-#: js/apps.js:55
+#: js/apps.js:60
 msgid "Please wait...."
 msgstr "Bitte warten..."
 
-#: js/apps.js:59 js/apps.js:71 js/apps.js:80 js/apps.js:93
+#: js/apps.js:64 js/apps.js:76 js/apps.js:85 js/apps.js:98
 msgid "Error"
 msgstr "Fehler"
 
-#: js/apps.js:90
+#: js/apps.js:95
 msgid "Updating...."
 msgstr "Aktualisierung..."
 
-#: js/apps.js:93
+#: js/apps.js:98
 msgid "Error while updating app"
 msgstr "Fehler beim Aktualisieren der App"
 
-#: js/apps.js:96
+#: js/apps.js:101
 msgid "Updated"
 msgstr "Aktualisiert"
 
@@ -168,15 +169,15 @@ msgstr "Beim Anlegen des Benutzers ist ein Fehler aufgetreten"
 msgid "A valid password must be provided"
 msgstr "Es muss ein gültiges Passwort angegeben werden"
 
-#: personal.php:35 personal.php:36
+#: personal.php:37 personal.php:38
 msgid "__language_name__"
 msgstr "Deutsch (Persönlich)"
 
-#: templates/admin.php:15
+#: templates/admin.php:17
 msgid "Security Warning"
 msgstr "Sicherheitswarnung"
 
-#: templates/admin.php:18
+#: templates/admin.php:20
 msgid ""
 "Your data directory and your files are probably accessible from the "
 "internet. The .htaccess file that ownCloud provides is not working. We "
@@ -185,36 +186,36 @@ msgid ""
 " webserver document root."
 msgstr "Dein Datenverzeichnis und Deine Datein sind vielleicht vom Internet aus erreichbar. Die .htaccess Datei, die ownCloud verwendet, arbeitet nicht richtig. Wir schlagen Dir dringend vor, dass Du Deinen Webserver so konfigurierst, dass das Datenverzeichnis nicht länger erreichbar ist oder, dass Du Dein Datenverzeichnis aus dem Dokumenten-root des Webservers bewegst."
 
-#: templates/admin.php:29
+#: templates/admin.php:31
 msgid "Setup Warning"
 msgstr "Einrichtungswarnung"
 
-#: templates/admin.php:32
+#: templates/admin.php:34
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Dein Web-Server ist noch nicht für Datei-Synchronisation bereit, weil die WebDAV-Schnittstelle vermutlich defekt ist."
 
-#: templates/admin.php:33
+#: templates/admin.php:35
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Bitte prüfen Sie die <a href='%s'>Installationsanleitungen</a>."
 
-#: templates/admin.php:44
+#: templates/admin.php:46
 msgid "Module 'fileinfo' missing"
 msgstr "Modul 'fileinfo' fehlt "
 
-#: templates/admin.php:47
+#: templates/admin.php:49
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr "Das PHP-Modul 'fileinfo' fehlt. Wir empfehlen dieses Modul zu aktivieren um die besten Resultate bei der Erkennung der Dateitypen zu erreichen."
 
-#: templates/admin.php:58
+#: templates/admin.php:60
 msgid "Locale not working"
 msgstr "Ländereinstellung funktioniert nicht"
 
-#: templates/admin.php:63
+#: templates/admin.php:65
 #, php-format
 msgid ""
 "This ownCloud server can't set system locale to %s. This means that there "
@@ -222,11 +223,11 @@ msgid ""
 " to install the required packages on your system to support %s."
 msgstr "Dieser ownCloud Server kann die Ländereinstellung nicht auf %s ändern. Dies bedeutet, dass es Probleme mit bestimmten Zeichen in Dateinamen geben könnte. Wir empfehlen die für %s benötigten Pakete auf Deinem System zu installieren."
 
-#: templates/admin.php:75
+#: templates/admin.php:77
 msgid "Internet connection not working"
 msgstr "Keine Netzwerkverbindung"
 
-#: templates/admin.php:78
+#: templates/admin.php:80
 msgid ""
 "This ownCloud server has no working internet connection. This means that "
 "some of the features like mounting of external storage, notifications about "
@@ -236,102 +237,102 @@ msgid ""
 " of ownCloud."
 msgstr "Dieser ownCloud Server hat keine funktionierende Netzwerkverbindung. Dies bedeutet das einige Funktionen wie das Einbinden von externen Speichern, Update-Benachrichtigungen oder die Installation von Drittanbieter-Apps nicht funktionieren. Der Fernzugriff auf Dateien und das Senden von Benachrichtigungsmails funktioniert eventuell ebenfalls nicht. Wir empfehlen die Netzwerkverbindung für diesen Server zu aktivieren, wenn Du alle Funktionen von ownCloud nutzen möchtest."
 
-#: templates/admin.php:92
+#: templates/admin.php:94
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:101
+#: templates/admin.php:103
 msgid "Execute one task with each page loaded"
 msgstr "Führe eine Aufgabe mit jeder geladenen Seite aus"
 
-#: templates/admin.php:111
+#: templates/admin.php:113
 msgid ""
 "cron.php is registered at a webcron service. Call the cron.php page in the "
 "owncloud root once a minute over http."
 msgstr "cron.php ist an einem Webcron-Service registriert. Die cron.php Seite wird einmal pro Minute über http abgerufen."
 
-#: templates/admin.php:121
+#: templates/admin.php:123
 msgid ""
 "Use systems cron service. Call the cron.php file in the owncloud folder via "
 "a system cronjob once a minute."
 msgstr "Nutze den Cron Systemdienst. Rufe die Datei cron.php im owncloud Ordner einmal pro Minute über einen Cronjob auf."
 
-#: templates/admin.php:128
+#: templates/admin.php:130
 msgid "Sharing"
 msgstr "Teilen"
 
-#: templates/admin.php:134
+#: templates/admin.php:136
 msgid "Enable Share API"
 msgstr "Aktiviere Sharing-API"
 
-#: templates/admin.php:135
+#: templates/admin.php:137
 msgid "Allow apps to use the Share API"
 msgstr "Erlaubt Apps die Nutzung der Share-API"
 
-#: templates/admin.php:142
+#: templates/admin.php:144
 msgid "Allow links"
 msgstr "Erlaubt Links"
 
-#: templates/admin.php:143
+#: templates/admin.php:145
 msgid "Allow users to share items to the public with links"
 msgstr "Erlaubt Benutzern, Inhalte über öffentliche Links zu teilen"
 
-#: templates/admin.php:150
+#: templates/admin.php:152
 msgid "Allow resharing"
 msgstr "Erlaubt erneutes Teilen"
 
-#: templates/admin.php:151
+#: templates/admin.php:153
 msgid "Allow users to share items shared with them again"
 msgstr "Erlaubt Benutzern, mit ihnen geteilte Inhalte erneut zu teilen"
 
-#: templates/admin.php:158
+#: templates/admin.php:160
 msgid "Allow users to share with anyone"
 msgstr "Erlaubt Benutzern, mit jedem zu teilen"
 
-#: templates/admin.php:161
+#: templates/admin.php:163
 msgid "Allow users to only share with users in their groups"
 msgstr "Erlaubt Benutzern, nur mit Benutzern ihrer Gruppe zu teilen"
 
-#: templates/admin.php:168
+#: templates/admin.php:170
 msgid "Security"
 msgstr "Sicherheit"
 
-#: templates/admin.php:181
+#: templates/admin.php:183
 msgid "Enforce HTTPS"
 msgstr "Erzwinge HTTPS"
 
-#: templates/admin.php:182
+#: templates/admin.php:184
 msgid ""
 "Enforces the clients to connect to ownCloud via an encrypted connection."
 msgstr "Erzwingt die Verwendung einer verschlüsselten Verbindung"
 
-#: templates/admin.php:185
+#: templates/admin.php:187
 msgid ""
 "Please connect to this ownCloud instance via HTTPS to enable or disable the "
 "SSL enforcement."
 msgstr "Bitte verbinde Dich über eine HTTPS Verbindung mit diesem ownCloud Server um diese Einstellung zu ändern"
 
-#: templates/admin.php:195
+#: templates/admin.php:197
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:196
+#: templates/admin.php:198
 msgid "Log level"
 msgstr "Loglevel"
 
-#: templates/admin.php:227
+#: templates/admin.php:229
 msgid "More"
 msgstr "Mehr"
 
-#: templates/admin.php:228
+#: templates/admin.php:230
 msgid "Less"
 msgstr "Weniger"
 
-#: templates/admin.php:235 templates/personal.php:116
+#: templates/admin.php:236 templates/personal.php:116
 msgid "Version"
 msgstr "Version"
 
-#: templates/admin.php:237 templates/personal.php:119
+#: templates/admin.php:240 templates/personal.php:119
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -389,76 +390,79 @@ msgstr "Bugtracker"
 msgid "Commercial Support"
 msgstr "Kommerzieller Support"
 
-#: templates/personal.php:9
+#: templates/personal.php:10
 msgid "Get the apps to sync your files"
 msgstr "Lade die Apps zur Synchronisierung Deiner Daten herunter"
 
-#: templates/personal.php:20
+#: templates/personal.php:21
 msgid "Show First Run Wizard again"
 msgstr "Erstinstallation erneut durchführen"
 
-#: templates/personal.php:28
+#: templates/personal.php:29
 #, php-format
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "Du verwendest <strong>%s</strong> der verfügbaren <strong>%s<strong>"
 
-#: templates/personal.php:40 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:41 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "Passwort"
 
-#: templates/personal.php:41
+#: templates/personal.php:42
 msgid "Your password was changed"
 msgstr "Dein Passwort wurde geändert."
 
-#: templates/personal.php:42
+#: templates/personal.php:43
 msgid "Unable to change your password"
 msgstr "Passwort konnte nicht geändert werden"
 
-#: templates/personal.php:43
+#: templates/personal.php:44
 msgid "Current password"
 msgstr "Aktuelles Passwort"
 
-#: templates/personal.php:45
+#: templates/personal.php:46
 msgid "New password"
 msgstr "Neues Passwort"
 
-#: templates/personal.php:47
+#: templates/personal.php:48
 msgid "Change password"
 msgstr "Passwort ändern"
 
-#: templates/personal.php:59 templates/users.php:85
+#: templates/personal.php:60 templates/users.php:85
 msgid "Display Name"
 msgstr "Anzeigename"
 
-#: templates/personal.php:74
+#: templates/personal.php:75
 msgid "Email"
 msgstr "E-Mail"
 
-#: templates/personal.php:76
+#: templates/personal.php:77
 msgid "Your email address"
 msgstr "Deine E-Mail-Adresse"
 
-#: templates/personal.php:77
+#: templates/personal.php:78
 msgid "Fill in an email address to enable password recovery"
 msgstr "Trage eine E-Mail-Adresse ein, um die Passwort-Wiederherstellung zu aktivieren."
 
-#: templates/personal.php:86 templates/personal.php:87
+#: templates/personal.php:87 templates/personal.php:88
 msgid "Language"
 msgstr "Sprache"
 
-#: templates/personal.php:99
+#: templates/personal.php:100
 msgid "Help translate"
 msgstr "Hilf bei der Ãœbersetzung"
 
-#: templates/personal.php:105
+#: templates/personal.php:106
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:107
-msgid "Use this address to connect to your ownCloud in your file manager"
-msgstr "Verwende diese Adresse, um Deinen Dateimanager mit Deiner ownCloud zu verbinden"
+#: templates/personal.php:108
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
+"target=\"_blank\">access your Files via WebDAV</a>"
+msgstr ""
 
-#: templates/users.php:21 templates/users.php:84
+#: templates/users.php:21
 msgid "Login Name"
 msgstr "Loginname"
 
@@ -474,7 +478,7 @@ msgstr "Admin-Wiederherstellungspasswort"
 msgid ""
 "Enter the recovery password in order to recover the users files during "
 "password change"
-msgstr ""
+msgstr "Geben Sie das Wiederherstellungspasswort ein, um die Benutzerdateien während Passwortänderung wiederherzustellen"
 
 #: templates/users.php:42
 msgid "Default Storage"
@@ -488,6 +492,10 @@ msgstr "Unbegrenzt"
 msgid "Other"
 msgstr "Andere"
 
+#: templates/users.php:84
+msgid "Username"
+msgstr "Benutzername"
+
 #: templates/users.php:91
 msgid "Storage"
 msgstr "Speicher"
diff --git a/l10n/de/user_ldap.po b/l10n/de/user_ldap.po
index 92ec6d522eb73aeb9e837173babeeb9c8a01d364..d546f93d9474448dcecc2c5d689f4bb173a6cf29 100644
--- a/l10n/de/user_ldap.po
+++ b/l10n/de/user_ldap.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:16+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: German <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/de_DE/core.po b/l10n/de_DE/core.po
index 3e248ad6de25dac89ff300e6d2d97606b97205df..630e94cf960bac58d564671fe590eb227e1886cd 100644
--- a/l10n/de_DE/core.po
+++ b/l10n/de_DE/core.po
@@ -4,15 +4,17 @@
 # 
 # Translators:
 # arkascha <foss@christian-reiner.info>, 2013
+# SteinQuadrat, 2013
 # Marcel Kühlhorn <susefan93@gmx.de>, 2013
+# Mario Siegmann <mario_siegmann@web.de>, 2013
 # traductor <transifex-2.7.mensaje@spamgourmet.com>, 2013
 # Mirodin <blobbyjj@ymail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:22+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:14+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: German (Germany) <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
@@ -24,7 +26,7 @@ msgstr ""
 #: ajax/share.php:97
 #, php-format
 msgid "%s shared »%s« with you"
-msgstr ""
+msgstr "%s geteilt »%s« mit Ihnen"
 
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
@@ -65,135 +67,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/config.php:34
+#: js/config.php:32
 msgid "Sunday"
 msgstr "Sonntag"
 
-#: js/config.php:35
+#: js/config.php:33
 msgid "Monday"
 msgstr "Montag"
 
-#: js/config.php:36
+#: js/config.php:34
 msgid "Tuesday"
 msgstr "Dienstag"
 
-#: js/config.php:37
+#: js/config.php:35
 msgid "Wednesday"
 msgstr "Mittwoch"
 
-#: js/config.php:38
+#: js/config.php:36
 msgid "Thursday"
 msgstr "Donnerstag"
 
-#: js/config.php:39
+#: js/config.php:37
 msgid "Friday"
 msgstr "Freitag"
 
-#: js/config.php:40
+#: js/config.php:38
 msgid "Saturday"
 msgstr "Samstag"
 
-#: js/config.php:45
+#: js/config.php:43
 msgid "January"
 msgstr "Januar"
 
-#: js/config.php:46
+#: js/config.php:44
 msgid "February"
 msgstr "Februar"
 
-#: js/config.php:47
+#: js/config.php:45
 msgid "March"
 msgstr "März"
 
-#: js/config.php:48
+#: js/config.php:46
 msgid "April"
 msgstr "April"
 
-#: js/config.php:49
+#: js/config.php:47
 msgid "May"
 msgstr "Mai"
 
-#: js/config.php:50
+#: js/config.php:48
 msgid "June"
 msgstr "Juni"
 
-#: js/config.php:51
+#: js/config.php:49
 msgid "July"
 msgstr "Juli"
 
-#: js/config.php:52
+#: js/config.php:50
 msgid "August"
 msgstr "August"
 
-#: js/config.php:53
+#: js/config.php:51
 msgid "September"
 msgstr "September"
 
-#: js/config.php:54
+#: js/config.php:52
 msgid "October"
 msgstr "Oktober"
 
-#: js/config.php:55
+#: js/config.php:53
 msgid "November"
 msgstr "November"
 
-#: js/config.php:56
+#: js/config.php:54
 msgid "December"
 msgstr "Dezember"
 
-#: js/js.js:286
+#: js/js.js:293
 msgid "Settings"
 msgstr "Einstellungen"
 
-#: js/js.js:718
+#: js/js.js:725
 msgid "seconds ago"
 msgstr "Gerade eben"
 
-#: js/js.js:719
+#: js/js.js:726
 msgid "1 minute ago"
 msgstr "Vor 1 Minute"
 
-#: js/js.js:720
+#: js/js.js:727
 msgid "{minutes} minutes ago"
 msgstr "Vor {minutes} Minuten"
 
-#: js/js.js:721
+#: js/js.js:728
 msgid "1 hour ago"
 msgstr "Vor einer Stunde"
 
-#: js/js.js:722
+#: js/js.js:729
 msgid "{hours} hours ago"
 msgstr "Vor {hours} Stunden"
 
-#: js/js.js:723
+#: js/js.js:730
 msgid "today"
 msgstr "Heute"
 
-#: js/js.js:724
+#: js/js.js:731
 msgid "yesterday"
 msgstr "Gestern"
 
-#: js/js.js:725
+#: js/js.js:732
 msgid "{days} days ago"
 msgstr "Vor {days} Tag(en)"
 
-#: js/js.js:726
+#: js/js.js:733
 msgid "last month"
 msgstr "Letzten Monat"
 
-#: js/js.js:727
+#: js/js.js:734
 msgid "{months} months ago"
 msgstr "Vor {months} Monaten"
 
-#: js/js.js:728
+#: js/js.js:735
 msgid "months ago"
 msgstr "Vor Monaten"
 
-#: js/js.js:729
+#: js/js.js:736
 msgid "last year"
 msgstr "Letztes Jahr"
 
-#: js/js.js:730
+#: js/js.js:737
 msgid "years ago"
 msgstr "Vor Jahren"
 
@@ -229,8 +231,8 @@ msgstr "Der Objekttyp ist nicht angegeben."
 #: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
 #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:577
-#: js/share.js:589
+#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:620
+#: js/share.js:632
 msgid "Error"
 msgstr "Fehler"
 
@@ -250,7 +252,7 @@ msgstr "Geteilt"
 msgid "Share"
 msgstr "Teilen"
 
-#: js/share.js:125 js/share.js:617
+#: js/share.js:125 js/share.js:660
 msgid "Error while sharing"
 msgstr "Fehler beim Teilen"
 
@@ -270,99 +272,103 @@ msgstr "Von {owner} mit Ihnen und der Gruppe {group} geteilt."
 msgid "Shared with you by {owner}"
 msgstr "Von {owner} mit Ihnen geteilt."
 
-#: js/share.js:159
+#: js/share.js:172
 msgid "Share with"
 msgstr "Teilen mit"
 
-#: js/share.js:164
+#: js/share.js:177
 msgid "Share with link"
 msgstr "Ãœber einen Link teilen"
 
-#: js/share.js:167
+#: js/share.js:180
 msgid "Password protect"
 msgstr "Passwortschutz"
 
-#: js/share.js:169 templates/installation.php:54 templates/login.php:26
+#: js/share.js:182 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "Passwort"
 
-#: js/share.js:173
+#: js/share.js:187
+msgid "Allow Public Upload"
+msgstr "Erlaube öffentliches hochladen"
+
+#: js/share.js:191
 msgid "Email link to person"
 msgstr "Link per E-Mail verschicken"
 
-#: js/share.js:174
+#: js/share.js:192
 msgid "Send"
 msgstr "Senden"
 
-#: js/share.js:178
+#: js/share.js:197
 msgid "Set expiration date"
 msgstr "Ein Ablaufdatum setzen"
 
-#: js/share.js:179
+#: js/share.js:198
 msgid "Expiration date"
 msgstr "Ablaufdatum"
 
-#: js/share.js:211
+#: js/share.js:230
 msgid "Share via email:"
 msgstr "Mittels einer E-Mail teilen:"
 
-#: js/share.js:213
+#: js/share.js:232
 msgid "No people found"
 msgstr "Niemand gefunden"
 
-#: js/share.js:251
+#: js/share.js:270
 msgid "Resharing is not allowed"
 msgstr "Das Weiterverteilen ist nicht erlaubt"
 
-#: js/share.js:287
+#: js/share.js:306
 msgid "Shared in {item} with {user}"
 msgstr "Freigegeben in {item} von {user}"
 
-#: js/share.js:308
+#: js/share.js:327
 msgid "Unshare"
 msgstr "Freigabe aufheben"
 
-#: js/share.js:320
+#: js/share.js:339
 msgid "can edit"
 msgstr "kann bearbeiten"
 
-#: js/share.js:322
+#: js/share.js:341
 msgid "access control"
 msgstr "Zugriffskontrolle"
 
-#: js/share.js:325
+#: js/share.js:344
 msgid "create"
 msgstr "erstellen"
 
-#: js/share.js:328
+#: js/share.js:347
 msgid "update"
 msgstr "aktualisieren"
 
-#: js/share.js:331
+#: js/share.js:350
 msgid "delete"
 msgstr "löschen"
 
-#: js/share.js:334
+#: js/share.js:353
 msgid "share"
 msgstr "teilen"
 
-#: js/share.js:368 js/share.js:564
+#: js/share.js:387 js/share.js:607
 msgid "Password protected"
 msgstr "Passwortgeschützt"
 
-#: js/share.js:577
+#: js/share.js:620
 msgid "Error unsetting expiration date"
 msgstr "Fehler beim Entfernen des Ablaufdatums"
 
-#: js/share.js:589
+#: js/share.js:632
 msgid "Error setting expiration date"
 msgstr "Fehler beim Setzen des Ablaufdatums"
 
-#: js/share.js:604
+#: js/share.js:647
 msgid "Sending ..."
 msgstr "Sende ..."
 
-#: js/share.js:615
+#: js/share.js:658
 msgid "Email sent"
 msgstr "Email gesendet"
 
@@ -377,7 +383,7 @@ msgstr "Das Update ist fehlgeschlagen. Bitte melden Sie dieses Problem an die <a
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "Das Update war erfolgreich. Sie werden nun zu ownCloud weitergeleitet."
 
-#: lostpassword/controller.php:58
+#: lostpassword/controller.php:60
 msgid "ownCloud password reset"
 msgstr "ownCloud-Passwort zurücksetzen"
 
@@ -407,17 +413,17 @@ msgstr "Benutzername"
 
 #: lostpassword/templates/lostpassword.php:22
 msgid ""
-"Your files seems to be encrypted. If you didn't have enabled the recovery "
-"key there will be no way to get your data back once the password was "
-"resetted. If you are not sure what to do, please contact your administrator "
-"first before continue. Do you really want to continue?"
-msgstr ""
+"Your files are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
+msgstr "Ihre Dateien sind verschlüsselt. Wenn Sie den Wiederherstellungsschlüssel nicht aktiviert haben, wird es keinen Weg geben, um Ihre Daten wieder zu bekommen, nachdem Ihr Passwort zurückgesetzt wurde. Wenn Sie sich nicht sicher sind, was Sie tun sollen, wenden Sie sich bitte an Ihren Administrator, bevor Sie fortfahren. Wollen Sie wirklich fortfahren?"
 
 #: lostpassword/templates/lostpassword.php:24
 msgid "Yes, I really want to reset my password now"
-msgstr ""
+msgstr "Ja, ich möchte jetzt mein Passwort wirklich zurücksetzen."
 
-#: lostpassword/templates/lostpassword.php:29
+#: lostpassword/templates/lostpassword.php:27
 msgid "Request reset"
 msgstr "Zurücksetzung anfordern"
 
@@ -465,7 +471,7 @@ msgstr "Zugriff verboten"
 msgid "Cloud not found"
 msgstr "Cloud wurde nicht gefunden"
 
-#: templates/altmail.php:2
+#: templates/altmail.php:4
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -474,11 +480,7 @@ msgid ""
 "View it: %s\n"
 "\n"
 "Cheers!"
-msgstr ""
-
-#: templates/altmail.php:7 templates/mail.php:24
-msgid "web services under your control"
-msgstr "Web-Services unter Ihrer Kontrolle"
+msgstr "Hallo,\n\nich wollte Sie nur wissen lassen, dass %s %s mit Ihnen teilt.\nSchauen Sie es sich an: %s\n\nViele Grüße!"
 
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
@@ -572,12 +574,12 @@ msgstr "Datenbank-Host"
 msgid "Finish setup"
 msgstr "Installation abschließen"
 
-#: templates/layout.user.php:40
+#: templates/layout.user.php:43
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr "%s ist verfügbar. Holen Sie weitere Informationen zu Aktualisierungen ein."
 
-#: templates/layout.user.php:67
+#: templates/layout.user.php:68
 msgid "Log out"
 msgstr "Abmelden"
 
@@ -611,12 +613,12 @@ msgstr "Einloggen"
 msgid "Alternative Logins"
 msgstr "Alternative Logins"
 
-#: templates/mail.php:15
+#: templates/mail.php:16
 #, php-format
 msgid ""
 "Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
 "href=\"%s\">View it!</a><br><br>Cheers!"
-msgstr ""
+msgstr "Hallo,<br><br>ich wollte Sie nur wissen lassen, dass %s %s mit Ihnen teilt.<br><a href=\"%s\">Schauen Sie es sich an!</a><br><br>Viele Grüße!"
 
 #: templates/part.pagenavi.php:3
 msgid "prev"
diff --git a/l10n/de_DE/files.po b/l10n/de_DE/files.po
index 683daa1864c12f14795c50bf2724e3afa9a96dc5..f33d658fc33502f654eeab3bbcd8bbb56b2d0cf6 100644
--- a/l10n/de_DE/files.po
+++ b/l10n/de_DE/files.po
@@ -4,15 +4,17 @@
 # 
 # Translators:
 # a.tangemann <a.tangemann@web.de>, 2013
+# SteinQuadrat, 2013
+# I Robot <owncloud-bot@tmit.eu>, 2013
 # Marcel Kühlhorn <susefan93@gmx.de>, 2013
 # Mirodin <blobbyjj@ymail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:01+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
-"Last-Translator: a.tangemann <a.tangemann@web.de>\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: German (Germany) <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -30,46 +32,54 @@ msgstr "Konnte %s nicht verschieben. Eine Datei mit diesem Namen existiert berei
 msgid "Could not move %s"
 msgstr "Konnte %s nicht verschieben"
 
-#: ajax/upload.php:19
+#: ajax/upload.php:16 ajax/upload.php:45
+msgid "Unable to set upload directory."
+msgstr "Das Upload-Verzeichnis konnte nicht gesetzt werden."
+
+#: ajax/upload.php:22
+msgid "Invalid Token"
+msgstr "Ungültiges Merkmal"
+
+#: ajax/upload.php:59
 msgid "No file was uploaded. Unknown error"
 msgstr "Keine Datei hochgeladen. Unbekannter Fehler"
 
-#: ajax/upload.php:26
+#: ajax/upload.php:66
 msgid "There is no error, the file uploaded with success"
 msgstr "Es ist kein Fehler aufgetreten. Die Datei wurde erfolgreich hochgeladen."
 
-#: ajax/upload.php:27
+#: ajax/upload.php:67
 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:29
+#: ajax/upload.php:69
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Die Datei ist größer, als die MAX_FILE_SIZE Vorgabe erlaubt, die im HTML-Formular spezifiziert ist"
 
-#: ajax/upload.php:30
+#: ajax/upload.php:70
 msgid "The uploaded file was only partially uploaded"
 msgstr "Die Datei konnte nur teilweise übertragen werden"
 
-#: ajax/upload.php:31
+#: ajax/upload.php:71
 msgid "No file was uploaded"
 msgstr "Keine Datei konnte übertragen werden."
 
-#: ajax/upload.php:32
+#: ajax/upload.php:72
 msgid "Missing a temporary folder"
 msgstr "Kein temporärer Ordner vorhanden"
 
-#: ajax/upload.php:33
+#: ajax/upload.php:73
 msgid "Failed to write to disk"
 msgstr "Fehler beim Schreiben auf die Festplatte"
 
-#: ajax/upload.php:51
+#: ajax/upload.php:91
 msgid "Not enough storage available"
 msgstr "Nicht genug Speicher vorhanden."
 
-#: ajax/upload.php:83
+#: ajax/upload.php:123
 msgid "Invalid directory."
 msgstr "Ungültiges Verzeichnis."
 
@@ -77,6 +87,36 @@ msgstr "Ungültiges Verzeichnis."
 msgid "Files"
 msgstr "Dateien"
 
+#: js/file-upload.js:11
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr "Ihre Datei kann nicht hochgeladen werden, weil es sich um einen Ordner handelt oder 0 Bytes groß ist."
+
+#: js/file-upload.js:24
+msgid "Not enough space available"
+msgstr "Nicht genügend Speicherplatz verfügbar"
+
+#: js/file-upload.js:64
+msgid "Upload cancelled."
+msgstr "Upload abgebrochen."
+
+#: js/file-upload.js:167 js/files.js:266
+msgid ""
+"File upload is in progress. Leaving the page now will cancel the upload."
+msgstr "Dateiupload läuft. Wenn Sie die Seite jetzt verlassen, wird der Upload abgebrochen."
+
+#: js/file-upload.js:233 js/files.js:339
+msgid "URL cannot be empty."
+msgstr "Die URL darf nicht leer sein."
+
+#: js/file-upload.js:238 lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr "Ungültiger Ordnername. Die Verwendung von \"Shared\" ist ownCloud vorbehalten."
+
+#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
+#: js/files.js:693 js/files.js:731
+msgid "Error"
+msgstr "Fehler"
+
 #: js/fileactions.js:116
 msgid "Share"
 msgstr "Teilen"
@@ -93,43 +133,43 @@ msgstr "Löschen"
 msgid "Rename"
 msgstr "Umbenennen"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:464
 msgid "Pending"
 msgstr "Ausstehend"
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "{new_name} already exists"
 msgstr "{new_name} existiert bereits"
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "replace"
 msgstr "ersetzen"
 
-#: js/filelist.js:259
+#: js/filelist.js:302
 msgid "suggest name"
 msgstr "Namen vorschlagen"
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "cancel"
 msgstr "abbrechen"
 
-#: js/filelist.js:306
+#: js/filelist.js:349
 msgid "replaced {new_name} with {old_name}"
 msgstr "{old_name} wurde ersetzt durch {new_name}"
 
-#: js/filelist.js:306
+#: js/filelist.js:349
 msgid "undo"
 msgstr "rückgängig machen"
 
-#: js/filelist.js:331
+#: js/filelist.js:374
 msgid "perform delete operation"
 msgstr "Löschvorgang ausführen"
 
-#: js/filelist.js:413
+#: js/filelist.js:456
 msgid "1 file uploading"
 msgstr "1 Datei wird hochgeladen"
 
-#: js/filelist.js:416 js/filelist.js:470
+#: js/filelist.js:459 js/filelist.js:517
 msgid "files uploading"
 msgstr "Dateien werden hoch geladen"
 
@@ -161,70 +201,42 @@ msgid ""
 "big."
 msgstr "Ihr Download wird vorbereitet. Dies kann bei größeren Dateien etwas dauern."
 
-#: js/files.js:264
-msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "Ihre Datei kann nicht hochgeladen werden, weil es sich um einen Ordner handelt oder 0 Bytes groß ist."
-
-#: js/files.js:277
-msgid "Not enough space available"
-msgstr "Nicht genügend Speicherplatz verfügbar"
-
-#: js/files.js:317
-msgid "Upload cancelled."
-msgstr "Upload abgebrochen."
-
-#: js/files.js:413
-msgid ""
-"File upload is in progress. Leaving the page now will cancel the upload."
-msgstr "Dateiupload läuft. Wenn Sie die Seite jetzt verlassen, wird der Upload abgebrochen."
-
-#: js/files.js:486
-msgid "URL cannot be empty."
-msgstr "Die URL darf nicht leer sein."
-
-#: js/files.js:491
+#: js/files.js:344
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Ungültiger Verzeichnisname. Die Nutzung von \"Shared\" ist ownCloud vorbehalten"
 
-#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
-msgid "Error"
-msgstr "Fehler"
-
-#: js/files.js:877 templates/index.php:69
+#: js/files.js:744 templates/index.php:69
 msgid "Name"
 msgstr "Name"
 
-#: js/files.js:878 templates/index.php:80
+#: js/files.js:745 templates/index.php:80
 msgid "Size"
 msgstr "Größe"
 
-#: js/files.js:879 templates/index.php:82
+#: js/files.js:746 templates/index.php:82
 msgid "Modified"
 msgstr "Geändert"
 
-#: js/files.js:898
+#: js/files.js:765
 msgid "1 folder"
 msgstr "1 Ordner"
 
-#: js/files.js:900
+#: js/files.js:767
 msgid "{count} folders"
 msgstr "{count} Ordner"
 
-#: js/files.js:908
+#: js/files.js:775
 msgid "1 file"
 msgstr "1 Datei"
 
-#: js/files.js:910
+#: js/files.js:777
 msgid "{count} files"
 msgstr "{count} Dateien"
 
-#: lib/app.php:53
-msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
-msgstr "Ungültiger Ordnername. Die Verwendung von \"Shared\" ist ownCloud vorbehalten."
-
 #: lib/app.php:73
-msgid "Unable to rename file"
-msgstr "Konnte Datei nicht umbenennen"
+#, php-format
+msgid "%s could not be renamed"
+msgstr "%s konnte nicht umbenannt werden"
 
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
@@ -320,6 +332,22 @@ msgstr "Dateien werden gescannt, bitte warten."
 msgid "Current scanning"
 msgstr "Scanne"
 
+#: templates/part.list.php:76
+msgid "directory"
+msgstr "Verzeichnis"
+
+#: templates/part.list.php:78
+msgid "directories"
+msgstr "Verzeichnisse"
+
+#: templates/part.list.php:87
+msgid "file"
+msgstr "Datei"
+
+#: templates/part.list.php:89
+msgid "files"
+msgstr "Dateien"
+
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
 msgstr "Dateisystem-Cache wird aktualisiert ..."
diff --git a/l10n/de_DE/files_encryption.po b/l10n/de_DE/files_encryption.po
index b7d0b1cd73b4923268e769b17ac59add7a37a04c..752ceee589922855f3419c5ddf18e091237ef126 100644
--- a/l10n/de_DE/files_encryption.po
+++ b/l10n/de_DE/files_encryption.po
@@ -4,14 +4,15 @@
 # 
 # Translators:
 # ako84 <a0306265@unet.univie.ac.at>, 2013
+# JamFX <niko@nik-o-mat.de>, 2013
 # traductor <transifex-2.7.mensaje@spamgourmet.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-14 02:46+0200\n"
-"PO-Revision-Date: 2013-06-14 00:47+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-07-08 02:02+0200\n"
+"PO-Revision-Date: 2013-07-07 05:50+0000\n"
+"Last-Translator: JamFX <niko@nik-o-mat.de>\n"
 "Language-Team: German (Germany) <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -47,20 +48,32 @@ msgstr "Das Passwort konnte nicht geändert werden. Vielleicht war das alte Pass
 
 #: ajax/updatePrivateKeyPassword.php:51
 msgid "Private key password successfully updated."
-msgstr ""
+msgstr "Das Passwort des privaten Schlüssels wurde erfolgreich aktualisiert."
 
 #: ajax/updatePrivateKeyPassword.php:53
 msgid ""
 "Could not update the private key password. Maybe the old password was not "
 "correct."
-msgstr ""
+msgstr "Das Passwort des privaten Schlüssels konnte nicht aktualisiert werden. Vielleicht war das alte Passwort nicht richtig."
 
 #: files/error.php:7
 msgid ""
-"Your private key is not valid! Maybe your password was changed from outside."
-" You can update your private key password in your personal settings to "
-"regain access to your files"
-msgstr ""
+"Your private key is not valid! Likely your password was changed outside the "
+"ownCloud system (e.g. your corporate directory). You can update your private"
+" key password in your personal settings to recover access to your encrypted "
+"files."
+msgstr "Ihr privater Schlüssel ist ungültig. Möglicher Weise wurde von außerhalb Ihr Passwort geändert (z.B. in Ihrem gemeinsamen Verzeichnis). Sie können das Passwort Ihres privaten Schlüssels in den persönlichen Einstellungen aktualisieren, um wieder an Ihre Dateien zu gelangen."
+
+#: hooks/hooks.php:44
+msgid "Missing requirements."
+msgstr "Fehlende Voraussetzungen"
+
+#: hooks/hooks.php:45
+msgid ""
+"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL "
+"PHP extension is enabled and configured properly. For now, the encryption "
+"app has been disabled."
+msgstr "Bitte stellen Sie sicher, dass PHP 5.3.3 oder neuer installiert und die PHP-Erweiterung OpenSSL aktiviert und richtig konfiguriert ist. Zur Zeit ist die Verschlüsselungs-App deaktiviert."
 
 #: js/settings-admin.js:11
 msgid "Saving..."
@@ -70,15 +83,15 @@ msgstr "Speichern..."
 msgid ""
 "Your private key is not valid! Maybe the your password was changed from "
 "outside."
-msgstr ""
+msgstr "Ihr privater Schlüssel ist ungültig! Vielleicht wurde Ihr Passwort von außerhalb geändert."
 
 #: templates/invalid_private_key.php:7
 msgid "You can unlock your private key in your "
-msgstr ""
+msgstr "Sie können den privaten Schlüssel ändern und zwar in Ihrem"
 
 #: templates/invalid_private_key.php:7
 msgid "personal settings"
-msgstr ""
+msgstr "Persönliche Einstellungen"
 
 #: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
@@ -86,12 +99,12 @@ msgstr "Verschlüsselung"
 
 #: templates/settings-admin.php:10
 msgid ""
-"Enable encryption passwords recovery key (allow sharing to recovery key):"
-msgstr ""
+"Enable recovery key (allow to recover users files in case of password loss):"
+msgstr "Aktivieren Sie den Wiederherstellungsschlüssel (erlaubt die Wiederherstellung des Zugangs zu den Benutzerdateien, wenn das Passwort verloren geht)."
 
 #: templates/settings-admin.php:14
-msgid "Recovery account password"
-msgstr "Account-Passwort wiederherstellen"
+msgid "Recovery key password"
+msgstr "Wiederherstellungschlüsselpasswort"
 
 #: templates/settings-admin.php:21 templates/settings-personal.php:54
 msgid "Enabled"
@@ -102,16 +115,16 @@ msgid "Disabled"
 msgstr "Deaktiviert"
 
 #: templates/settings-admin.php:34
-msgid "Change encryption passwords recovery key:"
-msgstr ""
+msgid "Change recovery key password:"
+msgstr "Wiederherstellungsschlüsselpasswort ändern"
 
 #: templates/settings-admin.php:41
-msgid "Old Recovery account password"
-msgstr "Altes Passwort für die Account-Wiederherstellung"
+msgid "Old Recovery key password"
+msgstr "Altes Wiederherstellungsschlüsselpasswort"
 
 #: templates/settings-admin.php:48
-msgid "New Recovery account password"
-msgstr "Neues Passwort für die Account-Wiederherstellung"
+msgid "New Recovery key password"
+msgstr "Neues Wiederherstellungsschlüsselpasswort "
 
 #: templates/settings-admin.php:53
 msgid "Change Password"
@@ -119,39 +132,39 @@ msgstr "Passwort ändern"
 
 #: templates/settings-personal.php:11
 msgid "Your private key password no longer match your log-in password:"
-msgstr ""
+msgstr "Das Privatschlüsselpasswort darf nicht länger mit den Login-Passwort übereinstimmen."
 
 #: templates/settings-personal.php:14
 msgid "Set your old private key password to your current log-in password."
-msgstr ""
+msgstr "Setzen Sie Ihr altes Privatschlüsselpasswort auf Ihr aktuelles LogIn-Passwort."
 
 #: templates/settings-personal.php:16
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
-msgstr ""
+msgstr "Falls Sie sich nicht an Ihr altes Passwort erinnern können, fragen Sie bitte Ihren Administrator, um Ihre Dateien wiederherzustellen."
 
 #: templates/settings-personal.php:24
 msgid "Old log-in password"
-msgstr ""
+msgstr "Altes Login-Passwort"
 
 #: templates/settings-personal.php:30
 msgid "Current log-in password"
-msgstr ""
+msgstr "Momentanes Login-Passwort"
 
 #: templates/settings-personal.php:35
 msgid "Update Private Key Password"
-msgstr ""
+msgstr "Das Passwort des privaten Schlüssels aktualisieren"
 
 #: templates/settings-personal.php:45
 msgid "Enable password recovery:"
-msgstr ""
+msgstr "Passwort-Wiederherstellung aktivieren:"
 
 #: templates/settings-personal.php:47
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
-msgstr ""
+msgstr "Durch die Aktivierung dieser Option haben Sie die Möglichkeit, wieder auf Ihre verschlüsselten Dateien zugreifen zu können, wenn Sie Ihr Passwort verloren haben."
 
 #: templates/settings-personal.php:63
 msgid "File recovery settings updated"
diff --git a/l10n/de_DE/files_external.po b/l10n/de_DE/files_external.po
index 664bd0ff884b62ba38eb492eb8ef0fbcc2f8a927..3c25613abf735a967114a1b918ed0fc9d3d556ba 100644
--- a/l10n/de_DE/files_external.po
+++ b/l10n/de_DE/files_external.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: Mirodin <blobbyjj@ymail.com>\n"
 "Language-Team: German (Germany) <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/de_DE/files_sharing.po b/l10n/de_DE/files_sharing.po
index 0d635d2140d542550f0bfbef0e88356b75ada7d2..7feb277810899372c645d16eda123460e23399ab 100644
--- a/l10n/de_DE/files_sharing.po
+++ b/l10n/de_DE/files_sharing.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# JamFX <niko@nik-o-mat.de>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
+"Last-Translator: JamFX <niko@nik-o-mat.de>\n"
 "Language-Team: German (Germany) <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,27 +19,39 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: templates/authenticate.php:4
+msgid "The password is wrong. Try again."
+msgstr "Das Passwort ist falsch. Bitte versuchen Sie es erneut."
+
+#: templates/authenticate.php:7
 msgid "Password"
 msgstr "Passwort"
 
-#: templates/authenticate.php:6
+#: templates/authenticate.php:9
 msgid "Submit"
 msgstr "Bestätigen"
 
-#: templates/public.php:10
+#: templates/public.php:17
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s hat den Ordner %s mit Ihnen geteilt"
 
-#: templates/public.php:13
+#: templates/public.php:20
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s hat die Datei %s mit Ihnen geteilt"
 
-#: templates/public.php:19 templates/public.php:43
+#: templates/public.php:28 templates/public.php:90
 msgid "Download"
 msgstr "Herunterladen"
 
-#: templates/public.php:40
+#: templates/public.php:45 templates/public.php:48
+msgid "Upload"
+msgstr "Hochladen"
+
+#: templates/public.php:58
+msgid "Cancel upload"
+msgstr "Upload abbrechen"
+
+#: templates/public.php:87
 msgid "No preview available for"
 msgstr "Es ist keine Vorschau verfügbar für"
diff --git a/l10n/de_DE/files_trashbin.po b/l10n/de_DE/files_trashbin.po
index 85ef60ecf806b05561b8add6e7052bab20cad74d..1e97d29ed1bc88e3eecdc74afb4f1c60bb62e6ad 100644
--- a/l10n/de_DE/files_trashbin.po
+++ b/l10n/de_DE/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: Mirodin <blobbyjj@ymail.com>\n"
 "Language-Team: German (Germany) <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/de_DE/lib.po b/l10n/de_DE/lib.po
index 14c39095d0bf02a3c471d56dc10476d222f815cb..a9e0a266e03bad66c2178a8bdff896371eb509b3 100644
--- a/l10n/de_DE/lib.po
+++ b/l10n/de_DE/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-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
-"Last-Translator: traductor <transifex-2.7.mensaje@spamgourmet.com>\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: German (Germany) <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,43 +18,47 @@ msgstr ""
 "Language: de_DE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:359
+#: app.php:360
 msgid "Help"
 msgstr "Hilfe"
 
-#: app.php:372
+#: app.php:373
 msgid "Personal"
 msgstr "Persönlich"
 
-#: app.php:383
+#: app.php:384
 msgid "Settings"
 msgstr "Einstellungen"
 
-#: app.php:395
+#: app.php:396
 msgid "Users"
 msgstr "Benutzer"
 
-#: app.php:408
+#: app.php:409
 msgid "Apps"
 msgstr "Apps"
 
-#: app.php:416
+#: app.php:417
 msgid "Admin"
 msgstr "Administrator"
 
-#: files.php:210
+#: defaults.php:33
+msgid "web services under your control"
+msgstr "Web-Services unter Ihrer Kontrolle"
+
+#: files.php:226
 msgid "ZIP download is turned off."
 msgstr "Der ZIP-Download ist deaktiviert."
 
-#: files.php:211
+#: files.php:227
 msgid "Files need to be downloaded one by one."
 msgstr "Die Dateien müssen einzeln heruntergeladen werden."
 
-#: files.php:212 files.php:245
+#: files.php:228 files.php:261
 msgid "Back to Files"
 msgstr "Zurück zu \"Dateien\""
 
-#: files.php:242
+#: files.php:258
 msgid "Selected files too large to generate zip file."
 msgstr "Die gewählten Dateien sind zu groß, um eine ZIP-Datei zu erstellen."
 
@@ -86,104 +90,102 @@ msgstr "Text"
 msgid "Images"
 msgstr "Bilder"
 
-#: setup.php:34
-msgid "Set an admin username."
-msgstr "Setze Administrator Benutzername."
-
-#: setup.php:37
-msgid "Set an admin password."
-msgstr "Setze Administrator Passwort"
-
-#: setup.php:55
+#: setup/abstractdatabase.php:22
 #, php-format
 msgid "%s enter the database username."
 msgstr "%s geben Sie den Datenbank-Benutzernamen an."
 
-#: setup.php:58
+#: setup/abstractdatabase.php:25
 #, php-format
 msgid "%s enter the database name."
 msgstr "%s geben Sie den Datenbank-Namen an."
 
-#: setup.php:61
+#: setup/abstractdatabase.php:28
 #, php-format
 msgid "%s you may not use dots in the database name"
 msgstr "%s Der Datenbank-Name darf keine Punkte enthalten"
 
-#: setup.php:64
+#: setup/mssql.php:20
 #, php-format
-msgid "%s set the database host."
-msgstr "%s setze den Datenbank-Host"
-
-#: setup.php:126 setup.php:332 setup.php:377
-msgid "PostgreSQL username and/or password not valid"
-msgstr "PostgreSQL Benutzername und/oder Passwort ungültig"
+msgid "MS SQL username and/or password not valid: %s"
+msgstr "MS SQL Benutzername und/oder Passwort ungültig: %s"
 
-#: setup.php:127 setup.php:235
+#: setup/mssql.php:21 setup/mysql.php:13 setup/oci.php:114
+#: setup/postgresql.php:24 setup/postgresql.php:70
 msgid "You need to enter either an existing account or the administrator."
 msgstr "Sie müssen entweder ein existierendes Benutzerkonto oder das Administratoren-Konto angeben."
 
-#: setup.php:152
-msgid "Oracle connection could not be established"
-msgstr "Die Oracle-Verbindung konnte nicht aufgebaut werden."
-
-#: setup.php:234
+#: setup/mysql.php:12
 msgid "MySQL username and/or password not valid"
 msgstr "MySQL Benutzername und/oder Passwort ungültig"
 
-#: setup.php:288 setup.php:398 setup.php:407 setup.php:425 setup.php:435
-#: setup.php:444 setup.php:477 setup.php:543 setup.php:569 setup.php:576
-#: setup.php:587 setup.php:594 setup.php:603 setup.php:611 setup.php:620
-#: setup.php:626
+#: setup/mysql.php:67 setup/oci.php:54 setup/oci.php:121 setup/oci.php:147
+#: setup/oci.php:154 setup/oci.php:165 setup/oci.php:172 setup/oci.php:181
+#: setup/oci.php:189 setup/oci.php:198 setup/oci.php:204
+#: setup/postgresql.php:89 setup/postgresql.php:98 setup/postgresql.php:115
+#: setup/postgresql.php:125 setup/postgresql.php:134
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr "DB Fehler: \"%s\""
 
-#: setup.php:289 setup.php:399 setup.php:408 setup.php:426 setup.php:436
-#: setup.php:445 setup.php:478 setup.php:544 setup.php:570 setup.php:577
-#: setup.php:588 setup.php:604 setup.php:612 setup.php:621
+#: setup/mysql.php:68 setup/oci.php:55 setup/oci.php:122 setup/oci.php:148
+#: setup/oci.php:155 setup/oci.php:166 setup/oci.php:182 setup/oci.php:190
+#: setup/oci.php:199 setup/postgresql.php:90 setup/postgresql.php:99
+#: setup/postgresql.php:116 setup/postgresql.php:126 setup/postgresql.php:135
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr "Fehlerhafter Befehl war: \"%s\""
 
-#: setup.php:305
+#: setup/mysql.php:85
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr "MySQL Benutzer '%s'@'localhost' existiert bereits."
 
-#: setup.php:306
+#: setup/mysql.php:86
 msgid "Drop this user from MySQL"
 msgstr "Lösche diesen Benutzer aus MySQL"
 
-#: setup.php:311
+#: setup/mysql.php:91
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr "MySQL Benutzer '%s'@'%%' existiert bereits"
 
-#: setup.php:312
+#: setup/mysql.php:92
 msgid "Drop this user from MySQL."
 msgstr "Lösche diesen Benutzer aus MySQL."
 
-#: setup.php:469 setup.php:536
+#: setup/oci.php:34
+msgid "Oracle connection could not be established"
+msgstr "Die Oracle-Verbindung konnte nicht aufgebaut werden."
+
+#: setup/oci.php:41 setup/oci.php:113
 msgid "Oracle username and/or password not valid"
 msgstr "Oracle Benutzername und/oder Passwort ungültig"
 
-#: setup.php:595 setup.php:627
+#: setup/oci.php:173 setup/oci.php:205
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr "Fehlerhafter Befehl war: \"%s\", Name: %s, Passwort: %s"
 
-#: setup.php:647
-#, php-format
-msgid "MS SQL username and/or password not valid: %s"
-msgstr "MS SQL Benutzername und/oder Passwort ungültig: %s"
+#: setup/postgresql.php:23 setup/postgresql.php:69
+msgid "PostgreSQL username and/or password not valid"
+msgstr "PostgreSQL Benutzername und/oder Passwort ungültig"
+
+#: setup.php:42
+msgid "Set an admin username."
+msgstr "Setze Administrator Benutzername."
+
+#: setup.php:45
+msgid "Set an admin password."
+msgstr "Setze Administrator Passwort"
 
-#: setup.php:870
+#: setup.php:198
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Ihr Web-Server ist noch nicht für eine Datei-Synchronisation konfiguriert, weil die WebDAV-Schnittstelle vermutlich defekt ist."
 
-#: setup.php:871
+#: setup.php:199
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Bitte prüfen Sie die <a href='%s'>Installationsanleitungen</a>."
diff --git a/l10n/de_DE/settings.po b/l10n/de_DE/settings.po
index 68bc158d31f5f5238c5deb172aff5a60c98dae8d..78e2252522f0250c20ca2e08f778891e1bd6fe30 100644
--- a/l10n/de_DE/settings.po
+++ b/l10n/de_DE/settings.po
@@ -5,14 +5,15 @@
 # Translators:
 # a.tangemann <a.tangemann@web.de>, 2013
 # arkascha <foss@christian-reiner.info>, 2013
+# Mario Siegmann <mario_siegmann@web.de>, 2013
 # traductor <transifex-2.7.mensaje@spamgourmet.com>, 2013
 # Mirodin <blobbyjj@ymail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: German (Germany) <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
@@ -92,35 +93,35 @@ msgstr "Der Benutzer konnte nicht aus der Gruppe %s entfernt werden"
 msgid "Couldn't update app."
 msgstr "Die App konnte nicht aktualisiert werden."
 
-#: js/apps.js:30
+#: js/apps.js:35
 msgid "Update to {appversion}"
 msgstr "Update zu {appversion}"
 
-#: js/apps.js:36 js/apps.js:76
+#: js/apps.js:41 js/apps.js:81
 msgid "Disable"
 msgstr "Deaktivieren"
 
-#: js/apps.js:36 js/apps.js:64 js/apps.js:83
+#: js/apps.js:41 js/apps.js:69 js/apps.js:88
 msgid "Enable"
 msgstr "Aktivieren"
 
-#: js/apps.js:55
+#: js/apps.js:60
 msgid "Please wait...."
 msgstr "Bitte warten...."
 
-#: js/apps.js:59 js/apps.js:71 js/apps.js:80 js/apps.js:93
+#: js/apps.js:64 js/apps.js:76 js/apps.js:85 js/apps.js:98
 msgid "Error"
 msgstr "Fehler"
 
-#: js/apps.js:90
+#: js/apps.js:95
 msgid "Updating...."
 msgstr "Update..."
 
-#: js/apps.js:93
+#: js/apps.js:98
 msgid "Error while updating app"
 msgstr "Es ist ein Fehler während des Updates aufgetreten"
 
-#: js/apps.js:96
+#: js/apps.js:101
 msgid "Updated"
 msgstr "Aktualisiert"
 
@@ -169,15 +170,15 @@ msgstr "Beim Erstellen des Benutzers ist ein Fehler aufgetreten"
 msgid "A valid password must be provided"
 msgstr "Es muss ein gültiges Passwort angegeben werden"
 
-#: personal.php:35 personal.php:36
+#: personal.php:37 personal.php:38
 msgid "__language_name__"
 msgstr "Deutsch (Förmlich: Sie)"
 
-#: templates/admin.php:15
+#: templates/admin.php:17
 msgid "Security Warning"
 msgstr "Sicherheitshinweis"
 
-#: templates/admin.php:18
+#: templates/admin.php:20
 msgid ""
 "Your data directory and your files are probably accessible from the "
 "internet. The .htaccess file that ownCloud provides is not working. We "
@@ -186,36 +187,36 @@ msgid ""
 " webserver document root."
 msgstr "Ihr Datenverzeichnis und Ihre Dateien sind wahrscheinlich über das Internet erreichbar. Die von ownCloud bereitgestellte .htaccess Datei funktioniert nicht. Wir empfehlen Ihnen dringend, Ihren Webserver so zu konfigurieren, dass das Datenverzeichnis nicht mehr über das Internet erreichbar ist. Alternativ können Sie auch das Datenverzeichnis aus dem Dokumentenverzeichnis des Webservers verschieben."
 
-#: templates/admin.php:29
+#: templates/admin.php:31
 msgid "Setup Warning"
 msgstr "Einrichtungswarnung"
 
-#: templates/admin.php:32
+#: templates/admin.php:34
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Ihr Web-Server ist noch nicht für eine Datei-Synchronisation konfiguriert, weil die WebDAV-Schnittstelle vermutlich defekt ist."
 
-#: templates/admin.php:33
+#: templates/admin.php:35
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Bitte prüfen Sie die <a href='%s'>Installationsanleitungen</a>."
 
-#: templates/admin.php:44
+#: templates/admin.php:46
 msgid "Module 'fileinfo' missing"
 msgstr "Das Modul 'fileinfo' fehlt"
 
-#: templates/admin.php:47
+#: templates/admin.php:49
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr "Das PHP-Modul 'fileinfo' fehlt. Wir empfehlen Ihnen dieses Modul zu aktivieren, um die besten Resultate bei der Bestimmung der Dateitypen zu erzielen."
 
-#: templates/admin.php:58
+#: templates/admin.php:60
 msgid "Locale not working"
 msgstr "Die Lokalisierung funktioniert nicht"
 
-#: templates/admin.php:63
+#: templates/admin.php:65
 #, php-format
 msgid ""
 "This ownCloud server can't set system locale to %s. This means that there "
@@ -223,11 +224,11 @@ msgid ""
 " to install the required packages on your system to support %s."
 msgstr "Dieser ownCloud-Server kann die Ländereinstellung nicht auf %s ändern. Dies bedeutet, dass es Probleme mit bestimmten Zeichen in Dateinamen geben könnte. Wir empfehlen, die für %s benötigten Pakete auf ihrem System zu installieren."
 
-#: templates/admin.php:75
+#: templates/admin.php:77
 msgid "Internet connection not working"
 msgstr "Keine Internetverbindung"
 
-#: templates/admin.php:78
+#: templates/admin.php:80
 msgid ""
 "This ownCloud server has no working internet connection. This means that "
 "some of the features like mounting of external storage, notifications about "
@@ -237,102 +238,102 @@ msgid ""
 " of ownCloud."
 msgstr "Dieser ownCloud-Server hat keine funktionierende Internetverbindung. Dies bedeutet, dass einige Funktionen wie das Einbinden von externen Speichern, Update-Benachrichtigungen oder die Installation von Drittanbieter-Apps nicht funktionieren. Der Fernzugriff auf Dateien und das Senden von Benachrichtigungs-E-Mails funktioniert eventuell ebenfalls nicht. Wir empfehlen die Internetverbindung für diesen Server zu aktivieren, wenn Sie alle Funktionen von ownCloud nutzen wollen."
 
-#: templates/admin.php:92
+#: templates/admin.php:94
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:101
+#: templates/admin.php:103
 msgid "Execute one task with each page loaded"
 msgstr "Eine Aufgabe bei jedem Laden der Seite ausführen"
 
-#: templates/admin.php:111
+#: templates/admin.php:113
 msgid ""
 "cron.php is registered at a webcron service. Call the cron.php page in the "
 "owncloud root once a minute over http."
 msgstr "cron.php ist bei einem Webcron-Service registriert. Die cron.php Seite im ownCloud-Wurzelverzeichniss wird einmal pro Minute über http abgerufen."
 
-#: templates/admin.php:121
+#: templates/admin.php:123
 msgid ""
 "Use systems cron service. Call the cron.php file in the owncloud folder via "
 "a system cronjob once a minute."
 msgstr "Nutzen Sie den Cron-Systemdienst. Rufen Sie die Datei cron.php im ownCloud-Ordner einmal pro Minute über einen Cronjob auf."
 
-#: templates/admin.php:128
+#: templates/admin.php:130
 msgid "Sharing"
 msgstr "Teilen"
 
-#: templates/admin.php:134
+#: templates/admin.php:136
 msgid "Enable Share API"
 msgstr "Share-API aktivieren"
 
-#: templates/admin.php:135
+#: templates/admin.php:137
 msgid "Allow apps to use the Share API"
 msgstr "Anwendungen erlauben, die Share-API zu benutzen"
 
-#: templates/admin.php:142
+#: templates/admin.php:144
 msgid "Allow links"
 msgstr "Links erlauben"
 
-#: templates/admin.php:143
+#: templates/admin.php:145
 msgid "Allow users to share items to the public with links"
 msgstr "Benutzern erlauben, Inhalte per öffentlichem Link zu teilen"
 
-#: templates/admin.php:150
+#: templates/admin.php:152
 msgid "Allow resharing"
 msgstr "Erlaube Weiterverteilen"
 
-#: templates/admin.php:151
+#: templates/admin.php:153
 msgid "Allow users to share items shared with them again"
 msgstr "Erlaubt Benutzern, mit ihnen geteilte Inhalte erneut zu teilen"
 
-#: templates/admin.php:158
+#: templates/admin.php:160
 msgid "Allow users to share with anyone"
 msgstr "Erlaubt Benutzern, mit jedem zu teilen"
 
-#: templates/admin.php:161
+#: templates/admin.php:163
 msgid "Allow users to only share with users in their groups"
 msgstr "Erlaubt Benutzern, nur mit Nutzern in ihrer Gruppe zu teilen"
 
-#: templates/admin.php:168
+#: templates/admin.php:170
 msgid "Security"
 msgstr "Sicherheit"
 
-#: templates/admin.php:181
+#: templates/admin.php:183
 msgid "Enforce HTTPS"
 msgstr "HTTPS erzwingen"
 
-#: templates/admin.php:182
+#: templates/admin.php:184
 msgid ""
 "Enforces the clients to connect to ownCloud via an encrypted connection."
 msgstr "Zwingt die Clients, sich über eine verschlüsselte Verbindung mit ownCloud zu verbinden."
 
-#: templates/admin.php:185
+#: templates/admin.php:187
 msgid ""
 "Please connect to this ownCloud instance via HTTPS to enable or disable the "
 "SSL enforcement."
 msgstr "Bitte verbinden Sie sich mit dieser ownCloud-Instanz per HTTPS, um SSL-Erzwingung zu aktivieren oder deaktivieren."
 
-#: templates/admin.php:195
+#: templates/admin.php:197
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:196
+#: templates/admin.php:198
 msgid "Log level"
 msgstr "Log-Level"
 
-#: templates/admin.php:227
+#: templates/admin.php:229
 msgid "More"
 msgstr "Mehr"
 
-#: templates/admin.php:228
+#: templates/admin.php:230
 msgid "Less"
 msgstr "Weniger"
 
-#: templates/admin.php:235 templates/personal.php:116
+#: templates/admin.php:236 templates/personal.php:116
 msgid "Version"
 msgstr "Version"
 
-#: templates/admin.php:237 templates/personal.php:119
+#: templates/admin.php:240 templates/personal.php:119
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -390,76 +391,79 @@ msgstr "Bugtracker"
 msgid "Commercial Support"
 msgstr "Kommerzieller Support"
 
-#: templates/personal.php:9
+#: templates/personal.php:10
 msgid "Get the apps to sync your files"
 msgstr "Installieren Sie die Anwendungen, um Ihre Dateien zu synchronisieren"
 
-#: templates/personal.php:20
+#: templates/personal.php:21
 msgid "Show First Run Wizard again"
 msgstr "Den Einrichtungsassistenten erneut anzeigen"
 
-#: templates/personal.php:28
+#: templates/personal.php:29
 #, php-format
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "Sie verwenden <strong>%s</strong> der verfügbaren <strong>%s</strong>"
 
-#: templates/personal.php:40 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:41 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "Passwort"
 
-#: templates/personal.php:41
+#: templates/personal.php:42
 msgid "Your password was changed"
 msgstr "Ihr Passwort wurde geändert."
 
-#: templates/personal.php:42
+#: templates/personal.php:43
 msgid "Unable to change your password"
 msgstr "Das Passwort konnte nicht geändert werden"
 
-#: templates/personal.php:43
+#: templates/personal.php:44
 msgid "Current password"
 msgstr "Aktuelles Passwort"
 
-#: templates/personal.php:45
+#: templates/personal.php:46
 msgid "New password"
 msgstr "Neues Passwort"
 
-#: templates/personal.php:47
+#: templates/personal.php:48
 msgid "Change password"
 msgstr "Passwort ändern"
 
-#: templates/personal.php:59 templates/users.php:85
+#: templates/personal.php:60 templates/users.php:85
 msgid "Display Name"
 msgstr "Anzeigename"
 
-#: templates/personal.php:74
+#: templates/personal.php:75
 msgid "Email"
 msgstr "E-Mail"
 
-#: templates/personal.php:76
+#: templates/personal.php:77
 msgid "Your email address"
 msgstr "Ihre E-Mail-Adresse"
 
-#: templates/personal.php:77
+#: templates/personal.php:78
 msgid "Fill in an email address to enable password recovery"
 msgstr "Bitte tragen Sie eine E-Mail-Adresse ein, um die Passwort-Wiederherstellung zu aktivieren."
 
-#: templates/personal.php:86 templates/personal.php:87
+#: templates/personal.php:87 templates/personal.php:88
 msgid "Language"
 msgstr "Sprache"
 
-#: templates/personal.php:99
+#: templates/personal.php:100
 msgid "Help translate"
 msgstr "Helfen Sie bei der Ãœbersetzung"
 
-#: templates/personal.php:105
+#: templates/personal.php:106
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:107
-msgid "Use this address to connect to your ownCloud in your file manager"
-msgstr "Verwenden Sie diese Adresse, um Ihren Dateimanager mit Ihrer ownCloud zu verbinden"
+#: templates/personal.php:108
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
+"target=\"_blank\">access your Files via WebDAV</a>"
+msgstr ""
 
-#: templates/users.php:21 templates/users.php:84
+#: templates/users.php:21
 msgid "Login Name"
 msgstr "Loginname"
 
@@ -475,7 +479,7 @@ msgstr "Admin-Paswort-Wiederherstellung"
 msgid ""
 "Enter the recovery password in order to recover the users files during "
 "password change"
-msgstr ""
+msgstr "Geben Sie das Wiederherstellungspasswort ein, um die Benutzerdateien während Passwortänderung wiederherzustellen"
 
 #: templates/users.php:42
 msgid "Default Storage"
@@ -489,6 +493,10 @@ msgstr "Unbegrenzt"
 msgid "Other"
 msgstr "Andere"
 
+#: templates/users.php:84
+msgid "Username"
+msgstr "Benutzername"
+
 #: templates/users.php:91
 msgid "Storage"
 msgstr "Speicher"
diff --git a/l10n/de_DE/user_ldap.po b/l10n/de_DE/user_ldap.po
index df74745ea34ef0837f23c4646369cc4209a6d2ae..26d503eba896e2c79ba9122a265ead7f98465a0c 100644
--- a/l10n/de_DE/user_ldap.po
+++ b/l10n/de_DE/user_ldap.po
@@ -5,14 +5,15 @@
 # Translators:
 # a.tangemann <a.tangemann@web.de>, 2013
 # Marcel Kühlhorn <susefan93@gmx.de>, 2013
+# JamFX <niko@nik-o-mat.de>, 2013
 # traductor <transifex-2.7.mensaje@spamgourmet.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
-"Last-Translator: traductor <transifex-2.7.mensaje@spamgourmet.com>\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:16+0000\n"
+"Last-Translator: JamFX <niko@nik-o-mat.de>\n"
 "Language-Team: German (Germany) <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,7 +23,7 @@ msgstr ""
 
 #: ajax/clearMappings.php:34
 msgid "Failed to clear the mappings."
-msgstr ""
+msgstr "Löschen der Zuordnung fehlgeschlagen."
 
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
@@ -62,7 +63,7 @@ msgstr "Das Hinzufügen der Serverkonfiguration schlug fehl"
 
 #: js/settings.js:111
 msgid "mappings cleared"
-msgstr ""
+msgstr "Zuordnungen gelöscht"
 
 #: js/settings.js:112
 msgid "Success"
@@ -365,7 +366,7 @@ msgstr "Standardmäßig wird der interne Benutzername mittels des UUID-Attribute
 
 #: templates/settings.php:103
 msgid "Internal Username Attribute:"
-msgstr ""
+msgstr "Interne Eigenschaften des Benutzers:"
 
 #: templates/settings.php:104
 msgid "Override UUID detection"
@@ -380,7 +381,7 @@ msgid ""
 "You must make sure that the attribute of your choice can be fetched for both"
 " users and groups and it is unique. Leave it empty for default behaviour. "
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
-msgstr ""
+msgstr "Standardmäßig erkennt OwnCloud die UUID-Eigenschaften des Benutzers selbstständig. Die UUID-Eigenschaften werden genutzt, um einen LDAP-Benutzer und Gruppen einwandfrei zu identifizieren. Außerdem wird ein interner Benutzername erzeugt, der auf Eigenschaften der UUID basiert, wenn es oben nicht anders angegeben wurde. Sie können diese Eigenschaften überschreiben und selbst Eigenschaften nach Wahl vorgeben. Sie müssen allerdings sicherstellen, dass die Eigenschaften zur Identifikation für Benutzer und Gruppen eindeutig sind. Lassen Sie es frei, um es beim Standardverhalten zu belassen. Änderungen wirken sich nur auf neu zugeordnete (neu erstellte) LDAP-Benutzer und -Gruppen aus."
 
 #: templates/settings.php:106
 msgid "UUID Attribute:"
@@ -388,7 +389,7 @@ msgstr "UUID-Attribut:"
 
 #: templates/settings.php:107
 msgid "Username-LDAP User Mapping"
-msgstr ""
+msgstr "LDAP-Benutzernamenzuordnung"
 
 #: templates/settings.php:108
 msgid ""
@@ -407,11 +408,11 @@ msgstr ""
 
 #: templates/settings.php:109
 msgid "Clear Username-LDAP User Mapping"
-msgstr ""
+msgstr "Lösche LDAP-Benutzernamenzuordnung"
 
 #: templates/settings.php:109
 msgid "Clear Groupname-LDAP Group Mapping"
-msgstr ""
+msgstr "Lösche LDAP-Gruppennamenzuordnung"
 
 #: templates/settings.php:111
 msgid "Test Configuration"
diff --git a/l10n/de_DE/user_webdavauth.po b/l10n/de_DE/user_webdavauth.po
index 31277b46286b928796e7e50f9e28857901eb9778..c47c7321512f3e4b8ff3c78f13085993982692fd 100644
--- a/l10n/de_DE/user_webdavauth.po
+++ b/l10n/de_DE/user_webdavauth.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-06-15 01:59+0200\n"
-"PO-Revision-Date: 2013-06-15 00:00+0000\n"
+"POT-Creation-Date: 2013-07-05 02:13+0200\n"
+"PO-Revision-Date: 2013-07-04 10:31+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: German (Germany) <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
@@ -28,7 +28,7 @@ msgstr "WebDAV-Authentifizierung"
 
 #: templates/settings.php:4
 msgid "URL: "
-msgstr ""
+msgstr "URL:"
 
 #: templates/settings.php:7
 msgid ""
diff --git a/l10n/el/core.po b/l10n/el/core.po
index 2c9a72956edde31ed474a71f6af34daf4cbfd366..a9f02634faa23a07337405866c5d34f93c4bf9bd 100644
--- a/l10n/el/core.po
+++ b/l10n/el/core.po
@@ -3,15 +3,19 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Efstathios Iosifidis <iosifidis@opensuse.org>, 2013
+# KAT.RAT12 <spanish.katerina@gmail.com>, 2013
+# Teogramm <theodorewii121@hotmail.com>, 2013
 # Teogramm <theodorewii121@hotmail.com>, 2013
 # Wasilis <inactive+Wasilis@transifex.com>, 2013
+# Wasilis <inactive+Wasilis@transifex.com>, 2013
 # KAT.RAT12 <spanish.katerina@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
 "MIME-Version: 1.0\n"
@@ -23,7 +27,7 @@ msgstr ""
 #: ajax/share.php:97
 #, php-format
 msgid "%s shared »%s« with you"
-msgstr ""
+msgstr "Ο %s διαμοιράστηκε μαζί σας το »%s«"
 
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
@@ -64,135 +68,135 @@ msgstr "Δεν επιλέχτηκαν κατηγορίες για διαγραφ
 msgid "Error removing %s from favorites."
 msgstr "Σφάλμα αφαίρεσης %s από τα αγαπημένα."
 
-#: js/config.php:34
+#: js/config.php:32
 msgid "Sunday"
 msgstr "Κυριακή"
 
-#: js/config.php:35
+#: js/config.php:33
 msgid "Monday"
 msgstr "Δευτέρα"
 
-#: js/config.php:36
+#: js/config.php:34
 msgid "Tuesday"
 msgstr "Τρίτη"
 
-#: js/config.php:37
+#: js/config.php:35
 msgid "Wednesday"
 msgstr "Τετάρτη"
 
-#: js/config.php:38
+#: js/config.php:36
 msgid "Thursday"
 msgstr "Πέμπτη"
 
-#: js/config.php:39
+#: js/config.php:37
 msgid "Friday"
 msgstr "Παρασκευή"
 
-#: js/config.php:40
+#: js/config.php:38
 msgid "Saturday"
 msgstr "Σάββατο"
 
-#: js/config.php:45
+#: js/config.php:43
 msgid "January"
 msgstr "Ιανουάριος"
 
-#: js/config.php:46
+#: js/config.php:44
 msgid "February"
 msgstr "Φεβρουάριος"
 
-#: js/config.php:47
+#: js/config.php:45
 msgid "March"
 msgstr "Μάρτιος"
 
-#: js/config.php:48
+#: js/config.php:46
 msgid "April"
 msgstr "Απρίλιος"
 
-#: js/config.php:49
+#: js/config.php:47
 msgid "May"
 msgstr "Μάϊος"
 
-#: js/config.php:50
+#: js/config.php:48
 msgid "June"
 msgstr "Ιούνιος"
 
-#: js/config.php:51
+#: js/config.php:49
 msgid "July"
 msgstr "Ιούλιος"
 
-#: js/config.php:52
+#: js/config.php:50
 msgid "August"
 msgstr "Αύγουστος"
 
-#: js/config.php:53
+#: js/config.php:51
 msgid "September"
 msgstr "Σεπτέμβριος"
 
-#: js/config.php:54
+#: js/config.php:52
 msgid "October"
 msgstr "Οκτώβριος"
 
-#: js/config.php:55
+#: js/config.php:53
 msgid "November"
 msgstr "Νοέμβριος"
 
-#: js/config.php:56
+#: js/config.php:54
 msgid "December"
 msgstr "Δεκέμβριος"
 
-#: js/js.js:286
+#: js/js.js:293
 msgid "Settings"
 msgstr "Ρυθμίσεις"
 
-#: js/js.js:718
+#: js/js.js:725
 msgid "seconds ago"
 msgstr "δευτερόλεπτα πριν"
 
-#: js/js.js:719
+#: js/js.js:726
 msgid "1 minute ago"
 msgstr "1 λεπτό πριν"
 
-#: js/js.js:720
+#: js/js.js:727
 msgid "{minutes} minutes ago"
 msgstr "{minutes} λεπτά πριν"
 
-#: js/js.js:721
+#: js/js.js:728
 msgid "1 hour ago"
 msgstr "1 ώρα πριν"
 
-#: js/js.js:722
+#: js/js.js:729
 msgid "{hours} hours ago"
 msgstr "{hours} ώρες πριν"
 
-#: js/js.js:723
+#: js/js.js:730
 msgid "today"
 msgstr "σήμερα"
 
-#: js/js.js:724
+#: js/js.js:731
 msgid "yesterday"
 msgstr "χτες"
 
-#: js/js.js:725
+#: js/js.js:732
 msgid "{days} days ago"
 msgstr "{days} ημέρες πριν"
 
-#: js/js.js:726
+#: js/js.js:733
 msgid "last month"
 msgstr "τελευταίο μήνα"
 
-#: js/js.js:727
+#: js/js.js:734
 msgid "{months} months ago"
 msgstr "{months} μήνες πριν"
 
-#: js/js.js:728
+#: js/js.js:735
 msgid "months ago"
 msgstr "μήνες πριν"
 
-#: js/js.js:729
+#: js/js.js:736
 msgid "last year"
 msgstr "τελευταίο χρόνο"
 
-#: js/js.js:730
+#: js/js.js:737
 msgid "years ago"
 msgstr "χρόνια πριν"
 
@@ -228,8 +232,8 @@ msgstr "Δεν καθορίστηκε ο τύπος του αντικειμέν
 #: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
 #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:577
-#: js/share.js:589
+#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:620
+#: js/share.js:632
 msgid "Error"
 msgstr "Σφάλμα"
 
@@ -249,7 +253,7 @@ msgstr "Κοινόχρηστα"
 msgid "Share"
 msgstr "Διαμοιρασμός"
 
-#: js/share.js:125 js/share.js:617
+#: js/share.js:125 js/share.js:660
 msgid "Error while sharing"
 msgstr "Σφάλμα κατά τον διαμοιρασμό"
 
@@ -269,99 +273,103 @@ msgstr "Διαμοιράστηκε με σας και με την ομάδα {gr
 msgid "Shared with you by {owner}"
 msgstr "Διαμοιράστηκε με σας από τον {owner}"
 
-#: js/share.js:159
+#: js/share.js:172
 msgid "Share with"
 msgstr "Διαμοιρασμός με"
 
-#: js/share.js:164
+#: js/share.js:177
 msgid "Share with link"
 msgstr "Διαμοιρασμός με σύνδεσμο"
 
-#: js/share.js:167
+#: js/share.js:180
 msgid "Password protect"
 msgstr "Προστασία συνθηματικού"
 
-#: js/share.js:169 templates/installation.php:54 templates/login.php:26
+#: js/share.js:182 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "Συνθηματικό"
 
-#: js/share.js:173
+#: js/share.js:187
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:191
 msgid "Email link to person"
 msgstr "Αποστολή συνδέσμου με email "
 
-#: js/share.js:174
+#: js/share.js:192
 msgid "Send"
 msgstr "Αποστολή"
 
-#: js/share.js:178
+#: js/share.js:197
 msgid "Set expiration date"
 msgstr "Ορισμός ημ. λήξης"
 
-#: js/share.js:179
+#: js/share.js:198
 msgid "Expiration date"
 msgstr "Ημερομηνία λήξης"
 
-#: js/share.js:211
+#: js/share.js:230
 msgid "Share via email:"
 msgstr "Διαμοιρασμός μέσω email:"
 
-#: js/share.js:213
+#: js/share.js:232
 msgid "No people found"
 msgstr "Δεν βρέθηκε άνθρωπος"
 
-#: js/share.js:251
+#: js/share.js:270
 msgid "Resharing is not allowed"
 msgstr "Ξαναμοιρασμός δεν επιτρέπεται"
 
-#: js/share.js:287
+#: js/share.js:306
 msgid "Shared in {item} with {user}"
 msgstr "Διαμοιρασμός του {item} με τον {user}"
 
-#: js/share.js:308
+#: js/share.js:327
 msgid "Unshare"
 msgstr "Σταμάτημα διαμοιρασμού"
 
-#: js/share.js:320
+#: js/share.js:339
 msgid "can edit"
 msgstr "δυνατότητα αλλαγής"
 
-#: js/share.js:322
+#: js/share.js:341
 msgid "access control"
 msgstr "έλεγχος πρόσβασης"
 
-#: js/share.js:325
+#: js/share.js:344
 msgid "create"
 msgstr "δημιουργία"
 
-#: js/share.js:328
+#: js/share.js:347
 msgid "update"
 msgstr "ενημέρωση"
 
-#: js/share.js:331
+#: js/share.js:350
 msgid "delete"
 msgstr "διαγραφή"
 
-#: js/share.js:334
+#: js/share.js:353
 msgid "share"
 msgstr "διαμοιρασμός"
 
-#: js/share.js:368 js/share.js:564
+#: js/share.js:387 js/share.js:607
 msgid "Password protected"
 msgstr "Προστασία με συνθηματικό"
 
-#: js/share.js:577
+#: js/share.js:620
 msgid "Error unsetting expiration date"
 msgstr "Σφάλμα κατά την διαγραφή της ημ. λήξης"
 
-#: js/share.js:589
+#: js/share.js:632
 msgid "Error setting expiration date"
 msgstr "Σφάλμα κατά τον ορισμό ημ. λήξης"
 
-#: js/share.js:604
+#: js/share.js:647
 msgid "Sending ..."
 msgstr "Αποστολή..."
 
-#: js/share.js:615
+#: js/share.js:658
 msgid "Email sent"
 msgstr "Το Email απεστάλη "
 
@@ -376,7 +384,7 @@ msgstr "Η ενημέρωση ήταν ανεπιτυχής. Παρακαλώ σ
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "Η ενημέρωση ήταν επιτυχής. Μετάβαση στο ownCloud."
 
-#: lostpassword/controller.php:58
+#: lostpassword/controller.php:60
 msgid "ownCloud password reset"
 msgstr "Επαναφορά συνθηματικού ownCloud"
 
@@ -406,17 +414,17 @@ msgstr "Όνομα χρήστη"
 
 #: lostpassword/templates/lostpassword.php:22
 msgid ""
-"Your files seems to be encrypted. If you didn't have enabled the recovery "
-"key there will be no way to get your data back once the password was "
-"resetted. If you are not sure what to do, please contact your administrator "
-"first before continue. Do you really want to continue?"
-msgstr ""
+"Your files are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
+msgstr "Τα αρχεία σας είναι κρυπτογραφημένα. Εάν δεν έχετε ενεργοποιήσει το κλειδί ανάκτησης, δεν υπάρχει περίπτωση να έχετε πρόσβαση στα δεδομένα σας μετά την επαναφορά του συνθηματικού. Εάν δεν είστε σίγουροι τι να κάνετε, παρακαλώ επικοινωνήστε με τον διαχειριστή πριν συνεχίσετε. Θέλετε να συνεχίσετε;"
 
 #: lostpassword/templates/lostpassword.php:24
 msgid "Yes, I really want to reset my password now"
-msgstr ""
+msgstr "Ναι, θέλω να επαναφέρω το συνθηματικό μου τώρα."
 
-#: lostpassword/templates/lostpassword.php:29
+#: lostpassword/templates/lostpassword.php:27
 msgid "Request reset"
 msgstr "Επαναφορά αίτησης"
 
@@ -464,7 +472,7 @@ msgstr "Δεν επιτρέπεται η πρόσβαση"
 msgid "Cloud not found"
 msgstr "Δεν βρέθηκε νέφος"
 
-#: templates/altmail.php:2
+#: templates/altmail.php:4
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -473,11 +481,7 @@ msgid ""
 "View it: %s\n"
 "\n"
 "Cheers!"
-msgstr ""
-
-#: templates/altmail.php:7 templates/mail.php:24
-msgid "web services under your control"
-msgstr "υπηρεσίες δικτύου υπό τον έλεγχό σας"
+msgstr "Γεια σας,\n\nσας ενημερώνουμε ότι ο %s διαμοιράστηκε μαζί σας το %s.\nΔείτε το: %s\n\nΓεια χαρά!"
 
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
@@ -571,12 +575,12 @@ msgstr "Διακομιστής βάσης δεδομένων"
 msgid "Finish setup"
 msgstr "Ολοκλήρωση εγκατάστασης"
 
-#: templates/layout.user.php:40
+#: templates/layout.user.php:43
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr "%s είναι διαθέσιμη. Δείτε περισσότερες πληροφορίες στο πώς να αναβαθμίσετε."
 
-#: templates/layout.user.php:67
+#: templates/layout.user.php:68
 msgid "Log out"
 msgstr "Αποσύνδεση"
 
@@ -610,12 +614,12 @@ msgstr "Είσοδος"
 msgid "Alternative Logins"
 msgstr "Εναλλακτικές Συνδέσεις"
 
-#: templates/mail.php:15
+#: templates/mail.php:16
 #, php-format
 msgid ""
 "Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
 "href=\"%s\">View it!</a><br><br>Cheers!"
-msgstr ""
+msgstr "Γεια σας,<br><br>σας ενημερώνουμε ότι ο %s διαμοιράστηκε μαζί σας το »%s«.<br><a href=\"%s\">Δείτε το!</a><br><br>Γεια χαρά!"
 
 #: templates/part.pagenavi.php:3
 msgid "prev"
diff --git a/l10n/el/files.po b/l10n/el/files.po
index 2efedb6c2350da6a0a65e648b47a98f0fe4cea14..d932a69300eb70bc9cd824e735fedc17eef053fa 100644
--- a/l10n/el/files.po
+++ b/l10n/el/files.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:01+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: Efstathios Iosifidis <iefstathios@gmail.com>\n"
 "Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
 "MIME-Version: 1.0\n"
@@ -28,46 +28,54 @@ msgstr "Αδυναμία μετακίνησης του %s - υπάρχει ήδ
 msgid "Could not move %s"
 msgstr "Αδυναμία μετακίνησης του %s"
 
-#: ajax/upload.php:19
+#: ajax/upload.php:16 ajax/upload.php:45
+msgid "Unable to set upload directory."
+msgstr ""
+
+#: ajax/upload.php:22
+msgid "Invalid Token"
+msgstr ""
+
+#: ajax/upload.php:59
 msgid "No file was uploaded. Unknown error"
 msgstr "Δεν ανέβηκε κάποιο αρχείο. Άγνωστο σφάλμα"
 
-#: ajax/upload.php:26
+#: ajax/upload.php:66
 msgid "There is no error, the file uploaded with success"
 msgstr "Δεν υπάρχει σφάλμα, το αρχείο εστάλει επιτυχώς"
 
-#: ajax/upload.php:27
+#: ajax/upload.php:67
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr "Το αρχείο που εστάλει υπερβαίνει την οδηγία μέγιστου επιτρεπτού μεγέθους \"upload_max_filesize\" του php.ini"
 
-#: ajax/upload.php:29
+#: ajax/upload.php:69
 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:30
+#: ajax/upload.php:70
 msgid "The uploaded file was only partially uploaded"
 msgstr "Το αρχείο εστάλει μόνο εν μέρει"
 
-#: ajax/upload.php:31
+#: ajax/upload.php:71
 msgid "No file was uploaded"
 msgstr "Κανένα αρχείο δεν στάλθηκε"
 
-#: ajax/upload.php:32
+#: ajax/upload.php:72
 msgid "Missing a temporary folder"
 msgstr "Λείπει ο προσωρινός φάκελος"
 
-#: ajax/upload.php:33
+#: ajax/upload.php:73
 msgid "Failed to write to disk"
 msgstr "Αποτυχία εγγραφής στο δίσκο"
 
-#: ajax/upload.php:51
+#: ajax/upload.php:91
 msgid "Not enough storage available"
 msgstr "Μη επαρκής διαθέσιμος αποθηκευτικός χώρος"
 
-#: ajax/upload.php:83
+#: ajax/upload.php:123
 msgid "Invalid directory."
 msgstr "Μη έγκυρος φάκελος."
 
@@ -75,6 +83,36 @@ msgstr "Μη έγκυρος φάκελος."
 msgid "Files"
 msgstr "Αρχεία"
 
+#: js/file-upload.js:11
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr "Αδυναμία στην αποστολή του αρχείου σας αφού είναι φάκελος ή έχει 0 bytes"
+
+#: js/file-upload.js:24
+msgid "Not enough space available"
+msgstr "Δεν υπάρχει αρκετός διαθέσιμος χώρος"
+
+#: js/file-upload.js:64
+msgid "Upload cancelled."
+msgstr "Η αποστολή ακυρώθηκε."
+
+#: js/file-upload.js:167 js/files.js:266
+msgid ""
+"File upload is in progress. Leaving the page now will cancel the upload."
+msgstr "Η αποστολή του αρχείου βρίσκεται σε εξέλιξη. Το κλείσιμο της σελίδας θα ακυρώσει την αποστολή."
+
+#: js/file-upload.js:233 js/files.js:339
+msgid "URL cannot be empty."
+msgstr "Η URL δεν μπορεί να είναι κενή."
+
+#: js/file-upload.js:238 lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr "Μη έγκυρο όνομα φακέλου. Η χρήση του 'Κοινόχρηστος' χρησιμοποιείται από το ownCloud"
+
+#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
+#: js/files.js:693 js/files.js:731
+msgid "Error"
+msgstr "Σφάλμα"
+
 #: js/fileactions.js:116
 msgid "Share"
 msgstr "Διαμοιρασμός"
@@ -91,43 +129,43 @@ msgstr "Διαγραφή"
 msgid "Rename"
 msgstr "Μετονομασία"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:464
 msgid "Pending"
 msgstr "Εκκρεμεί"
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "{new_name} already exists"
 msgstr "{new_name} υπάρχει ήδη"
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "replace"
 msgstr "αντικατέστησε"
 
-#: js/filelist.js:259
+#: js/filelist.js:302
 msgid "suggest name"
 msgstr "συνιστώμενο όνομα"
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "cancel"
 msgstr "ακύρωση"
 
-#: js/filelist.js:306
+#: js/filelist.js:349
 msgid "replaced {new_name} with {old_name}"
 msgstr "αντικαταστάθηκε το {new_name} με {old_name}"
 
-#: js/filelist.js:306
+#: js/filelist.js:349
 msgid "undo"
 msgstr "αναίρεση"
 
-#: js/filelist.js:331
+#: js/filelist.js:374
 msgid "perform delete operation"
 msgstr "εκτέλεση της διαδικασίας διαγραφής"
 
-#: js/filelist.js:413
+#: js/filelist.js:456
 msgid "1 file uploading"
 msgstr "1 αρχείο ανεβαίνει"
 
-#: js/filelist.js:416 js/filelist.js:470
+#: js/filelist.js:459 js/filelist.js:517
 msgid "files uploading"
 msgstr "αρχεία ανεβαίνουν"
 
@@ -159,70 +197,42 @@ msgid ""
 "big."
 msgstr "Η λήψη προετοιμάζεται. Αυτό μπορεί να πάρει ώρα εάν τα αρχεία έχουν μεγάλο μέγεθος."
 
-#: js/files.js:264
-msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "Αδυναμία στην αποστολή του αρχείου σας αφού είναι φάκελος ή έχει 0 bytes"
-
-#: js/files.js:277
-msgid "Not enough space available"
-msgstr "Δεν υπάρχει αρκετός διαθέσιμος χώρος"
-
-#: js/files.js:317
-msgid "Upload cancelled."
-msgstr "Η αποστολή ακυρώθηκε."
-
-#: js/files.js:413
-msgid ""
-"File upload is in progress. Leaving the page now will cancel the upload."
-msgstr "Η αποστολή του αρχείου βρίσκεται σε εξέλιξη. Το κλείσιμο της σελίδας θα ακυρώσει την αποστολή."
-
-#: js/files.js:486
-msgid "URL cannot be empty."
-msgstr "Η URL δεν μπορεί να είναι κενή."
-
-#: js/files.js:491
+#: js/files.js:344
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Μη έγκυρο όνομα φακέλου. Η χρήση του 'Κοινόχρηστος' χρησιμοποιείται από ο Owncloud"
 
-#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
-msgid "Error"
-msgstr "Σφάλμα"
-
-#: js/files.js:877 templates/index.php:69
+#: js/files.js:744 templates/index.php:69
 msgid "Name"
 msgstr "Όνομα"
 
-#: js/files.js:878 templates/index.php:80
+#: js/files.js:745 templates/index.php:80
 msgid "Size"
 msgstr "Μέγεθος"
 
-#: js/files.js:879 templates/index.php:82
+#: js/files.js:746 templates/index.php:82
 msgid "Modified"
 msgstr "Τροποποιήθηκε"
 
-#: js/files.js:898
+#: js/files.js:765
 msgid "1 folder"
 msgstr "1 φάκελος"
 
-#: js/files.js:900
+#: js/files.js:767
 msgid "{count} folders"
 msgstr "{count} φάκελοι"
 
-#: js/files.js:908
+#: js/files.js:775
 msgid "1 file"
 msgstr "1 αρχείο"
 
-#: js/files.js:910
+#: js/files.js:777
 msgid "{count} files"
 msgstr "{count} αρχεία"
 
-#: lib/app.php:53
-msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
-msgstr "Μη έγκυρο όνομα φακέλου. Η χρήση του 'Κοινόχρηστος' χρησιμοποιείται από το ownCloud"
-
 #: lib/app.php:73
-msgid "Unable to rename file"
-msgstr "Αδυναμία μετονομασίας αρχείου"
+#, php-format
+msgid "%s could not be renamed"
+msgstr ""
 
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
@@ -318,6 +328,22 @@ msgstr "Τα αρχεία σαρώνονται, παρακαλώ περιμέν
 msgid "Current scanning"
 msgstr "Τρέχουσα ανίχνευση"
 
+#: templates/part.list.php:76
+msgid "directory"
+msgstr "κατάλογος"
+
+#: templates/part.list.php:78
+msgid "directories"
+msgstr "κατάλογοι"
+
+#: templates/part.list.php:87
+msgid "file"
+msgstr "αρχείο"
+
+#: templates/part.list.php:89
+msgid "files"
+msgstr "αρχεία"
+
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
 msgstr "Ενημέρωση της μνήμης cache του συστήματος αρχείων..."
diff --git a/l10n/el/files_encryption.po b/l10n/el/files_encryption.po
index 4de97f5d2e3d8b674d2ba23768285bebb8085b2c..684d9d810ea5b58ac3f9ccf68bb6b253854836cf 100644
--- a/l10n/el/files_encryption.po
+++ b/l10n/el/files_encryption.po
@@ -3,13 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Efstathios Iosifidis <iosifidis@opensuse.org>, 2013
+# Teogramm <theodorewii121@hotmail.com>, 2013
 # Teogramm <theodorewii121@hotmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-14 02:46+0200\n"
-"PO-Revision-Date: 2013-06-14 00:47+0000\n"
+"POT-Creation-Date: 2013-07-05 02:12+0200\n"
+"PO-Revision-Date: 2013-07-05 00:13+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"
@@ -56,9 +58,21 @@ msgstr ""
 
 #: files/error.php:7
 msgid ""
-"Your private key is not valid! Maybe your password was changed from outside."
-" You can update your private key password in your personal settings to "
-"regain access to your files"
+"Your private key is not valid! Likely your password was changed outside the "
+"ownCloud system (e.g. your corporate directory). You can update your private"
+" key password in your personal settings to recover access to your encrypted "
+"files."
+msgstr ""
+
+#: hooks/hooks.php:44
+msgid "Missing requirements."
+msgstr ""
+
+#: hooks/hooks.php:45
+msgid ""
+"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL "
+"PHP extension is enabled and configured properly. For now, the encryption "
+"app has been disabled."
 msgstr ""
 
 #: js/settings-admin.js:11
@@ -77,7 +91,7 @@ msgstr ""
 
 #: templates/invalid_private_key.php:7
 msgid "personal settings"
-msgstr ""
+msgstr "προσωπικές ρυθμίσεις"
 
 #: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
@@ -85,12 +99,12 @@ msgstr "Κρυπτογράφηση"
 
 #: templates/settings-admin.php:10
 msgid ""
-"Enable encryption passwords recovery key (allow sharing to recovery key):"
+"Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
 #: templates/settings-admin.php:14
-msgid "Recovery account password"
-msgstr "Επαναφορά κωδικού πρόσβασης λογαριασμού"
+msgid "Recovery key password"
+msgstr ""
 
 #: templates/settings-admin.php:21 templates/settings-personal.php:54
 msgid "Enabled"
@@ -101,15 +115,15 @@ msgid "Disabled"
 msgstr "Απενεργοποιημένο"
 
 #: templates/settings-admin.php:34
-msgid "Change encryption passwords recovery key:"
+msgid "Change recovery key password:"
 msgstr ""
 
 #: templates/settings-admin.php:41
-msgid "Old Recovery account password"
+msgid "Old Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:48
-msgid "New Recovery account password"
+msgid "New Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:53
diff --git a/l10n/el/files_external.po b/l10n/el/files_external.po
index 644c52dd9d5e0804db49c7171ba4f0183ac78caf..a41a280a660f99a43e318a796e8691eddf5f0538 100644
--- a/l10n/el/files_external.po
+++ b/l10n/el/files_external.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: KAT.RAT12 <spanish.katerina@gmail.com>\n"
 "Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/el/files_sharing.po b/l10n/el/files_sharing.po
index 1338d825a5f85f868da8c9fb9cf2da16a6db95eb..4b99676ed1ab665845cbf83f3c9fbd8d65be8458 100644
--- a/l10n/el/files_sharing.po
+++ b/l10n/el/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
 "MIME-Version: 1.0\n"
@@ -18,27 +18,39 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: templates/authenticate.php:4
+msgid "The password is wrong. Try again."
+msgstr ""
+
+#: templates/authenticate.php:7
 msgid "Password"
 msgstr "Συνθηματικό"
 
-#: templates/authenticate.php:6
+#: templates/authenticate.php:9
 msgid "Submit"
 msgstr "Καταχώρηση"
 
-#: templates/public.php:10
+#: templates/public.php:17
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s μοιράστηκε τον φάκελο %s μαζί σας"
 
-#: templates/public.php:13
+#: templates/public.php:20
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s μοιράστηκε το αρχείο %s μαζί σας"
 
-#: templates/public.php:19 templates/public.php:43
+#: templates/public.php:28 templates/public.php:90
 msgid "Download"
 msgstr "Λήψη"
 
-#: templates/public.php:40
+#: templates/public.php:45 templates/public.php:48
+msgid "Upload"
+msgstr "Μεταφόρτωση"
+
+#: templates/public.php:58
+msgid "Cancel upload"
+msgstr "Ακύρωση αποστολής"
+
+#: templates/public.php:87
 msgid "No preview available for"
 msgstr "Δεν υπάρχει διαθέσιμη προεπισκόπηση για"
diff --git a/l10n/el/files_trashbin.po b/l10n/el/files_trashbin.po
index df58dd7e688bcb9994bcfeedd914b7d24eb544ff..87d262dad094b18edd014b12242345b560c6b20f 100644
--- a/l10n/el/files_trashbin.po
+++ b/l10n/el/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:16+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/el/lib.po b/l10n/el/lib.po
index de110b11224fca947739d3b4e6fdc1a39f780fdb..88ec8aa920d3caafdaeb902d4cbc54825b6eaa2a 100644
--- a/l10n/el/lib.po
+++ b/l10n/el/lib.po
@@ -3,12 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Efstathios Iosifidis <iosifidis@opensuse.org>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
 "MIME-Version: 1.0\n"
@@ -17,43 +18,47 @@ msgstr ""
 "Language: el\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:359
+#: app.php:360
 msgid "Help"
 msgstr "Βοήθεια"
 
-#: app.php:372
+#: app.php:373
 msgid "Personal"
 msgstr "Προσωπικά"
 
-#: app.php:383
+#: app.php:384
 msgid "Settings"
 msgstr "Ρυθμίσεις"
 
-#: app.php:395
+#: app.php:396
 msgid "Users"
 msgstr "Χρήστες"
 
-#: app.php:408
+#: app.php:409
 msgid "Apps"
 msgstr "Εφαρμογές"
 
-#: app.php:416
+#: app.php:417
 msgid "Admin"
 msgstr "Διαχειριστής"
 
-#: files.php:210
+#: defaults.php:33
+msgid "web services under your control"
+msgstr "υπηρεσίες δικτύου υπό τον έλεγχό σας"
+
+#: files.php:226
 msgid "ZIP download is turned off."
 msgstr "Η λήψη ZIP απενεργοποιήθηκε."
 
-#: files.php:211
+#: files.php:227
 msgid "Files need to be downloaded one by one."
 msgstr "Τα αρχεία πρέπει να ληφθούν ένα-ένα."
 
-#: files.php:212 files.php:245
+#: files.php:228 files.php:261
 msgid "Back to Files"
 msgstr "Πίσω στα Αρχεία"
 
-#: files.php:242
+#: files.php:258
 msgid "Selected files too large to generate zip file."
 msgstr "Τα επιλεγμένα αρχεία είναι μεγάλα ώστε να δημιουργηθεί αρχείο zip."
 
@@ -85,104 +90,102 @@ msgstr "Κείμενο"
 msgid "Images"
 msgstr "Εικόνες"
 
-#: setup.php:34
-msgid "Set an admin username."
-msgstr "Εισάγετε όνομα χρήστη διαχειριστή."
-
-#: setup.php:37
-msgid "Set an admin password."
-msgstr "Εισάγετε συνθηματικό διαχειριστή."
-
-#: setup.php:55
+#: setup/abstractdatabase.php:22
 #, php-format
 msgid "%s enter the database username."
 msgstr "%s εισάγετε το όνομα χρήστη της βάσης δεδομένων."
 
-#: setup.php:58
+#: setup/abstractdatabase.php:25
 #, php-format
 msgid "%s enter the database name."
 msgstr "%s εισάγετε το όνομα της βάσης δεδομένων."
 
-#: setup.php:61
+#: setup/abstractdatabase.php:28
 #, php-format
 msgid "%s you may not use dots in the database name"
 msgstr "%s μάλλον δεν χρησιμοποιείτε τελείες στο όνομα της βάσης δεδομένων"
 
-#: setup.php:64
+#: setup/mssql.php:20
 #, php-format
-msgid "%s set the database host."
-msgstr "%s ρυθμίση του κεντρικόυ υπολογιστή βάσης δεδομένων. "
-
-#: setup.php:126 setup.php:332 setup.php:377
-msgid "PostgreSQL username and/or password not valid"
-msgstr "Μη έγκυρος χρήστης και/ή συνθηματικό της PostgreSQL"
+msgid "MS SQL username and/or password not valid: %s"
+msgstr "Το όνομα χρήστη και/ή ο κωδικός της MS SQL δεν είναι έγκυρα: %s"
 
-#: setup.php:127 setup.php:235
+#: setup/mssql.php:21 setup/mysql.php:13 setup/oci.php:114
+#: setup/postgresql.php:24 setup/postgresql.php:70
 msgid "You need to enter either an existing account or the administrator."
 msgstr "Χρειάζεται να εισάγετε είτε έναν υπάρχον λογαριασμό ή του διαχειριστή."
 
-#: setup.php:152
-msgid "Oracle connection could not be established"
-msgstr ""
-
-#: setup.php:234
+#: setup/mysql.php:12
 msgid "MySQL username and/or password not valid"
 msgstr "Μη έγκυρος χρήστης και/ή συνθηματικό της MySQL"
 
-#: setup.php:288 setup.php:398 setup.php:407 setup.php:425 setup.php:435
-#: setup.php:444 setup.php:477 setup.php:543 setup.php:569 setup.php:576
-#: setup.php:587 setup.php:594 setup.php:603 setup.php:611 setup.php:620
-#: setup.php:626
+#: setup/mysql.php:67 setup/oci.php:54 setup/oci.php:121 setup/oci.php:147
+#: setup/oci.php:154 setup/oci.php:165 setup/oci.php:172 setup/oci.php:181
+#: setup/oci.php:189 setup/oci.php:198 setup/oci.php:204
+#: setup/postgresql.php:89 setup/postgresql.php:98 setup/postgresql.php:115
+#: setup/postgresql.php:125 setup/postgresql.php:134
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr "Σφάλμα Βάσης Δεδομένων: \"%s\""
 
-#: setup.php:289 setup.php:399 setup.php:408 setup.php:426 setup.php:436
-#: setup.php:445 setup.php:478 setup.php:544 setup.php:570 setup.php:577
-#: setup.php:588 setup.php:604 setup.php:612 setup.php:621
+#: setup/mysql.php:68 setup/oci.php:55 setup/oci.php:122 setup/oci.php:148
+#: setup/oci.php:155 setup/oci.php:166 setup/oci.php:182 setup/oci.php:190
+#: setup/oci.php:199 setup/postgresql.php:90 setup/postgresql.php:99
+#: setup/postgresql.php:116 setup/postgresql.php:126 setup/postgresql.php:135
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr "Η εντολη παραβατικοτητας ηταν: \"%s\""
 
-#: setup.php:305
+#: setup/mysql.php:85
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr "Υπάρχει ήδη ο χρήστης '%s'@'localhost' της MySQL."
 
-#: setup.php:306
+#: setup/mysql.php:86
 msgid "Drop this user from MySQL"
 msgstr "Απόρριψη αυτού του χρήστη από την MySQL"
 
-#: setup.php:311
+#: setup/mysql.php:91
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr "Ο χρήστης '%s'@'%%' της MySQL υπάρχει ήδη"
 
-#: setup.php:312
+#: setup/mysql.php:92
 msgid "Drop this user from MySQL."
 msgstr "Απόρριψη αυτού του χρήστη από την MySQL"
 
-#: setup.php:469 setup.php:536
+#: setup/oci.php:34
+msgid "Oracle connection could not be established"
+msgstr "Αδυναμία σύνδεσης Oracle"
+
+#: setup/oci.php:41 setup/oci.php:113
 msgid "Oracle username and/or password not valid"
 msgstr "Μη έγκυρος χρήστης και/ή συνθηματικό της Oracle"
 
-#: setup.php:595 setup.php:627
+#: setup/oci.php:173 setup/oci.php:205
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr "Η εντολη παραβατικοτητας ηταν: \"%s\", ονομα: %s, κωδικος: %s"
 
-#: setup.php:647
-#, php-format
-msgid "MS SQL username and/or password not valid: %s"
-msgstr "Το όνομα χρήστη και/ή ο κωδικός της MS SQL δεν είναι έγκυρα: %s"
+#: setup/postgresql.php:23 setup/postgresql.php:69
+msgid "PostgreSQL username and/or password not valid"
+msgstr "Μη έγκυρος χρήστης και/ή συνθηματικό της PostgreSQL"
+
+#: setup.php:42
+msgid "Set an admin username."
+msgstr "Εισάγετε όνομα χρήστη διαχειριστή."
+
+#: setup.php:45
+msgid "Set an admin password."
+msgstr "Εισάγετε συνθηματικό διαχειριστή."
 
-#: setup.php:870
+#: setup.php:198
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Ο διακομιστής σας δεν έχει ρυθμιστεί κατάλληλα ώστε να επιτρέπει τον συγχρονισμό αρχείων γιατί η διεπαφή WebDAV πιθανόν να είναι κατεστραμμένη."
 
-#: setup.php:871
+#: setup.php:199
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Ελέγξτε ξανά τις <a href='%s'>οδηγίες εγκατάστασης</a>."
diff --git a/l10n/el/settings.po b/l10n/el/settings.po
index b6ec1e3f17a2b1da613acf26f017ae5949aaf88e..3e7bc37a824b7ee901c998f8dcf087ad0f87c9bd 100644
--- a/l10n/el/settings.po
+++ b/l10n/el/settings.po
@@ -3,14 +3,17 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Efstathios Iosifidis <iosifidis@opensuse.org>, 2013
+# KAT.RAT12 <spanish.katerina@gmail.com>, 2013
+# Teogramm <theodorewii121@hotmail.com>, 2013
 # Teogramm <theodorewii121@hotmail.com>, 2013
 # KAT.RAT12 <spanish.katerina@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
 "MIME-Version: 1.0\n"
@@ -90,35 +93,35 @@ msgstr "Αδυναμία αφαίρεσης χρήστη από την ομάδ
 msgid "Couldn't update app."
 msgstr "Αδυναμία ενημέρωσης εφαρμογής"
 
-#: js/apps.js:30
+#: js/apps.js:35
 msgid "Update to {appversion}"
 msgstr "Ενημέρωση σε {appversion}"
 
-#: js/apps.js:36 js/apps.js:76
+#: js/apps.js:41 js/apps.js:81
 msgid "Disable"
 msgstr "Απενεργοποίηση"
 
-#: js/apps.js:36 js/apps.js:64 js/apps.js:83
+#: js/apps.js:41 js/apps.js:69 js/apps.js:88
 msgid "Enable"
 msgstr "Ενεργοποίηση"
 
-#: js/apps.js:55
+#: js/apps.js:60
 msgid "Please wait...."
 msgstr "Παρακαλώ περιμένετε..."
 
-#: js/apps.js:59 js/apps.js:71 js/apps.js:80 js/apps.js:93
+#: js/apps.js:64 js/apps.js:76 js/apps.js:85 js/apps.js:98
 msgid "Error"
 msgstr "Σφάλμα"
 
-#: js/apps.js:90
+#: js/apps.js:95
 msgid "Updating...."
 msgstr "Ενημέρωση..."
 
-#: js/apps.js:93
+#: js/apps.js:98
 msgid "Error while updating app"
 msgstr "Σφάλμα κατά την ενημέρωση της εφαρμογής"
 
-#: js/apps.js:96
+#: js/apps.js:101
 msgid "Updated"
 msgstr "Ενημερώθηκε"
 
@@ -167,15 +170,15 @@ msgstr "Σφάλμα δημιουργίας χρήστη"
 msgid "A valid password must be provided"
 msgstr "Πρέπει να δοθεί έγκυρο συνθηματικό"
 
-#: personal.php:35 personal.php:36
+#: personal.php:37 personal.php:38
 msgid "__language_name__"
 msgstr "__όνομα_γλώσσας__"
 
-#: templates/admin.php:15
+#: templates/admin.php:17
 msgid "Security Warning"
 msgstr "Προειδοποίηση Ασφαλείας"
 
-#: templates/admin.php:18
+#: templates/admin.php:20
 msgid ""
 "Your data directory and your files are probably accessible from the "
 "internet. The .htaccess file that ownCloud provides is not working. We "
@@ -184,36 +187,36 @@ msgid ""
 " webserver document root."
 msgstr "Ο κατάλογος data και τα αρχεία σας πιθανόν να είναι διαθέσιμα στο διαδίκτυο. Το αρχείο .htaccess που παρέχει το ownCloud δεν δουλεύει. Σας προτείνουμε ανεπιφύλακτα να ρυθμίσετε το διακομιστή σας με τέτοιο τρόπο ώστε ο κατάλογος data να μην είναι πλέον προσβάσιμος ή να μετακινήσετε τον κατάλογο data έξω από τον κατάλογο του διακομιστή."
 
-#: templates/admin.php:29
+#: templates/admin.php:31
 msgid "Setup Warning"
 msgstr "Ρύθμιση Προειδοποίησης"
 
-#: templates/admin.php:32
+#: templates/admin.php:34
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Ο διακομιστής σας δεν έχει ρυθμιστεί κατάλληλα ώστε να επιτρέπει τον συγχρονισμό αρχείων γιατί η διεπαφή WebDAV πιθανόν να είναι κατεστραμμένη."
 
-#: templates/admin.php:33
+#: templates/admin.php:35
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Ελέγξτε ξανά τις <a href='%s'>οδηγίες εγκατάστασης</a>."
 
-#: templates/admin.php:44
+#: templates/admin.php:46
 msgid "Module 'fileinfo' missing"
 msgstr "Η ενοτητα 'fileinfo' λειπει"
 
-#: templates/admin.php:47
+#: templates/admin.php:49
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr "Η PHP ενοτητα 'fileinfo' λειπει. Σας συνιστούμε να ενεργοποιήσετε αυτή την ενότητα για να έχετε καλύτερα αποτελέσματα με τον εντοπισμό τύπου MIME. "
 
-#: templates/admin.php:58
+#: templates/admin.php:60
 msgid "Locale not working"
 msgstr "Η μετάφραση δεν δουλεύει"
 
-#: templates/admin.php:63
+#: templates/admin.php:65
 #, php-format
 msgid ""
 "This ownCloud server can't set system locale to %s. This means that there "
@@ -221,11 +224,11 @@ msgid ""
 " to install the required packages on your system to support %s."
 msgstr "Αυτός ο ownCloud διακομιστης δεν μπορείτε να εφαρμοσει το σύνολο τοπικής προσαρμογής συστημάτων στο %s. Αυτό σημαίνει ότι μπορεί να υπάρξουν προβλήματα με ορισμένους χαρακτήρες σε ονόματα αρχείων. Σας συνιστούμε να εγκαταστήσετε τις απαραίτητες συσκευασίες στο σύστημά σας για να υποστηρίχθει το %s. "
 
-#: templates/admin.php:75
+#: templates/admin.php:77
 msgid "Internet connection not working"
 msgstr "Η σύνδεση στο διαδίκτυο δεν δουλεύει"
 
-#: templates/admin.php:78
+#: templates/admin.php:80
 msgid ""
 "This ownCloud server has no working internet connection. This means that "
 "some of the features like mounting of external storage, notifications about "
@@ -235,102 +238,102 @@ msgid ""
 " of ownCloud."
 msgstr "Αυτός ο διακομιστής ownCloud δεν έχει σύνδεση στο Διαδίκτυο. Αυτό σημαίνει ότι ορισμένα από τα χαρακτηριστικά γνωρίσματα όπως η τοποθέτηση εξωτερικής αποθήκευσης, οι κοινοποιήσεις σχετικά με ανανεωσεις, ή εγκατάσταση 3ων εφαρμογές δεν λειτουργούν.  Η πρόσβαση σε αρχεία και η αποστολή μηνυμάτων ηλεκτρονικού ταχυδρομείου μπορεί επίσης να μην λειτουργεί. Σας προτείνουμε να σύνδεθειτε στο διαδικτυο αυτό τον διακομιστή, εάν θέλετε να έχετε όλα τα χαρακτηριστικά του ownCloud."
 
-#: templates/admin.php:92
+#: templates/admin.php:94
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:101
+#: templates/admin.php:103
 msgid "Execute one task with each page loaded"
 msgstr "Εκτέλεση μιας διεργασίας με κάθε σελίδα που φορτώνεται"
 
-#: templates/admin.php:111
+#: templates/admin.php:113
 msgid ""
 "cron.php is registered at a webcron service. Call the cron.php page in the "
 "owncloud root once a minute over http."
 msgstr "Το cron.php είναι καταχωρημένο στην υπηρεσία webcron. Να καλείται μια φορά το λεπτό η σελίδα cron.php από τον root του owncloud μέσω http"
 
-#: templates/admin.php:121
+#: templates/admin.php:123
 msgid ""
 "Use systems cron service. Call the cron.php file in the owncloud folder via "
 "a system cronjob once a minute."
 msgstr "Χρήση υπηρεσίας συστήματος cron. Να καλείται μια φορά το λεπτό, το αρχείο cron.php από τον φάκελο του owncloud μέσω του cronjob του συστήματος."
 
-#: templates/admin.php:128
+#: templates/admin.php:130
 msgid "Sharing"
 msgstr "Διαμοιρασμός"
 
-#: templates/admin.php:134
+#: templates/admin.php:136
 msgid "Enable Share API"
 msgstr "Ενεργοποίηση API Διαμοιρασμού"
 
-#: templates/admin.php:135
+#: templates/admin.php:137
 msgid "Allow apps to use the Share API"
 msgstr "Να επιτρέπεται στις εφαρμογές να χρησιμοποιούν το API Διαμοιρασμού"
 
-#: templates/admin.php:142
+#: templates/admin.php:144
 msgid "Allow links"
 msgstr "Να επιτρέπονται σύνδεσμοι"
 
-#: templates/admin.php:143
+#: templates/admin.php:145
 msgid "Allow users to share items to the public with links"
 msgstr "Να επιτρέπεται στους χρήστες να διαμοιράζουν δημόσια με συνδέσμους"
 
-#: templates/admin.php:150
+#: templates/admin.php:152
 msgid "Allow resharing"
 msgstr "Να επιτρέπεται ο επαναδιαμοιρασμός"
 
-#: templates/admin.php:151
+#: templates/admin.php:153
 msgid "Allow users to share items shared with them again"
 msgstr "Να επιτρέπεται στους χρήστες να διαμοιράζουν ότι τους έχει διαμοιραστεί"
 
-#: templates/admin.php:158
+#: templates/admin.php:160
 msgid "Allow users to share with anyone"
 msgstr "Να επιτρέπεται ο διαμοιρασμός με οποιονδήποτε"
 
-#: templates/admin.php:161
+#: templates/admin.php:163
 msgid "Allow users to only share with users in their groups"
 msgstr "Να επιτρέπεται στους χρήστες ο διαμοιρασμός μόνο με χρήστες της ίδιας ομάδας"
 
-#: templates/admin.php:168
+#: templates/admin.php:170
 msgid "Security"
 msgstr "Ασφάλεια"
 
-#: templates/admin.php:181
+#: templates/admin.php:183
 msgid "Enforce HTTPS"
 msgstr "Επιβολή χρήσης HTTPS"
 
-#: templates/admin.php:182
+#: templates/admin.php:184
 msgid ""
 "Enforces the clients to connect to ownCloud via an encrypted connection."
 msgstr "Επιβολή στους πελάτες να συνδεθούν στο ownCloud μέσω μιας κρυπτογραφημένης σύνδεσης."
 
-#: templates/admin.php:185
+#: templates/admin.php:187
 msgid ""
 "Please connect to this ownCloud instance via HTTPS to enable or disable the "
 "SSL enforcement."
 msgstr "Παρακαλώ συνδεθείτε με το ownCloud μέσω HTTPS για να ενεργοποιήσετε ή να απενεργοποιήσετε την επιβολή SSL. "
 
-#: templates/admin.php:195
+#: templates/admin.php:197
 msgid "Log"
 msgstr "Καταγραφές"
 
-#: templates/admin.php:196
+#: templates/admin.php:198
 msgid "Log level"
 msgstr "Επίπεδο καταγραφής"
 
-#: templates/admin.php:227
+#: templates/admin.php:229
 msgid "More"
 msgstr "Περισσότερα"
 
-#: templates/admin.php:228
+#: templates/admin.php:230
 msgid "Less"
 msgstr "Λιγότερα"
 
-#: templates/admin.php:235 templates/personal.php:116
+#: templates/admin.php:236 templates/personal.php:116
 msgid "Version"
 msgstr "Έκδοση"
 
-#: templates/admin.php:237 templates/personal.php:119
+#: templates/admin.php:240 templates/personal.php:119
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -388,76 +391,79 @@ msgstr "Bugtracker"
 msgid "Commercial Support"
 msgstr "Εμπορική Υποστήριξη"
 
-#: templates/personal.php:9
+#: templates/personal.php:10
 msgid "Get the apps to sync your files"
 msgstr "Λήψη της εφαρμογής για συγχρονισμό των αρχείων σας"
 
-#: templates/personal.php:20
+#: templates/personal.php:21
 msgid "Show First Run Wizard again"
 msgstr "Προβολή Πρώτης Εκτέλεσης Οδηγού πάλι"
 
-#: templates/personal.php:28
+#: templates/personal.php:29
 #, php-format
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "Χρησιμοποιήσατε <strong>%s</strong> από διαθέσιμα <strong>%s</strong>"
 
-#: templates/personal.php:40 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:41 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "Συνθηματικό"
 
-#: templates/personal.php:41
+#: templates/personal.php:42
 msgid "Your password was changed"
 msgstr "Το συνθηματικό σας έχει αλλάξει"
 
-#: templates/personal.php:42
+#: templates/personal.php:43
 msgid "Unable to change your password"
 msgstr "Δεν ήταν δυνατή η αλλαγή του κωδικού πρόσβασης"
 
-#: templates/personal.php:43
+#: templates/personal.php:44
 msgid "Current password"
 msgstr "Τρέχων συνθηματικό"
 
-#: templates/personal.php:45
+#: templates/personal.php:46
 msgid "New password"
 msgstr "Νέο συνθηματικό"
 
-#: templates/personal.php:47
+#: templates/personal.php:48
 msgid "Change password"
 msgstr "Αλλαγή συνθηματικού"
 
-#: templates/personal.php:59 templates/users.php:85
+#: templates/personal.php:60 templates/users.php:85
 msgid "Display Name"
 msgstr "Όνομα εμφάνισης"
 
-#: templates/personal.php:74
+#: templates/personal.php:75
 msgid "Email"
 msgstr "Ηλ. ταχυδρομείο"
 
-#: templates/personal.php:76
+#: templates/personal.php:77
 msgid "Your email address"
 msgstr "Η διεύθυνση ηλεκτρονικού ταχυδρομείου σας"
 
-#: templates/personal.php:77
+#: templates/personal.php:78
 msgid "Fill in an email address to enable password recovery"
 msgstr "Συμπληρώστε μια διεύθυνση ηλεκτρονικού ταχυδρομείου για να ενεργοποιηθεί η ανάκτηση συνθηματικού"
 
-#: templates/personal.php:86 templates/personal.php:87
+#: templates/personal.php:87 templates/personal.php:88
 msgid "Language"
 msgstr "Γλώσσα"
 
-#: templates/personal.php:99
+#: templates/personal.php:100
 msgid "Help translate"
 msgstr "Βοηθήστε στη μετάφραση"
 
-#: templates/personal.php:105
+#: templates/personal.php:106
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:107
-msgid "Use this address to connect to your ownCloud in your file manager"
-msgstr "Χρήση αυτής της διεύθυνσης για σύνδεση στο ownCloud με τον διαχειριστή αρχείων σας"
+#: templates/personal.php:108
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
+"target=\"_blank\">access your Files via WebDAV</a>"
+msgstr ""
 
-#: templates/users.php:21 templates/users.php:84
+#: templates/users.php:21
 msgid "Login Name"
 msgstr "Όνομα Σύνδεσης"
 
@@ -473,7 +479,7 @@ msgstr "Κωδικός Επαναφοράς Διαχειριστή "
 msgid ""
 "Enter the recovery password in order to recover the users files during "
 "password change"
-msgstr ""
+msgstr "Εισάγετε το συνθηματικό ανάκτησης ώστε να ανακτήσετε τα αρχεία χρηστών κατά την αλλαγή συνθηματικού"
 
 #: templates/users.php:42
 msgid "Default Storage"
@@ -487,6 +493,10 @@ msgstr "Απεριόριστο"
 msgid "Other"
 msgstr "Άλλο"
 
+#: templates/users.php:84
+msgid "Username"
+msgstr "Όνομα χρήστη"
+
 #: templates/users.php:91
 msgid "Storage"
 msgstr "Αποθήκευση"
diff --git a/l10n/el/user_ldap.po b/l10n/el/user_ldap.po
index 4fb01982b7a88b66c6ebaccbdf503a985728ecdd..ae72fcf6b7e5a0065b51d9b60a9e0d6b1e98e4a6 100644
--- a/l10n/el/user_ldap.po
+++ b/l10n/el/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:25+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:16+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/el/user_webdavauth.po b/l10n/el/user_webdavauth.po
index 607641006557d8c1ac8ee4a46ff23e37f03d70e9..cd7f6d89f48834216d75d57f631c49770db2f1a3 100644
--- a/l10n/el/user_webdavauth.po
+++ b/l10n/el/user_webdavauth.po
@@ -5,15 +5,16 @@
 # Translators:
 # Dimitris M. <monopatis@gmail.com>, 2012
 # Efstathios Iosifidis <iefstathios@gmail.com>, 2012
+# Efstathios Iosifidis <iefstathios@gmail.com>, 2013
 # Konstantinos Tzanidis <tzanidis@gmail.com>, 2012
 # Marios Bekatoros <>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-15 01:59+0200\n"
-"PO-Revision-Date: 2013-06-15 00:00+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-06-25 02:04+0200\n"
+"PO-Revision-Date: 2013-06-24 20:30+0000\n"
+"Last-Translator: Efstathios Iosifidis <iefstathios@gmail.com>\n"
 "Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -27,7 +28,7 @@ msgstr "Αυθεντικοποίηση μέσω WebDAV "
 
 #: templates/settings.php:4
 msgid "URL: "
-msgstr ""
+msgstr "URL:"
 
 #: templates/settings.php:7
 msgid ""
diff --git a/l10n/en@pirate/core.po b/l10n/en@pirate/core.po
index 9ac94509680477914b088aed7520a6b29604c800..80b5bdf950a2b8a5330c1b7ce44c2c797decf4c3 100644
--- a/l10n/en@pirate/core.po
+++ b/l10n/en@pirate/core.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-16 01:59+0200\n"
-"PO-Revision-Date: 2013-06-15 00:14+0000\n"
+"POT-Creation-Date: 2013-07-06 02:02+0200\n"
+"PO-Revision-Date: 2013-07-06 00:02+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Pirate English (http://www.transifex.com/projects/p/owncloud/language/en@pirate/)\n"
 "MIME-Version: 1.0\n"
@@ -62,135 +62,135 @@ msgstr ""
 msgid "Error removing %s from favorites."
 msgstr ""
 
-#: js/config.php:34
+#: js/config.php:32
 msgid "Sunday"
 msgstr ""
 
-#: js/config.php:35
+#: js/config.php:33
 msgid "Monday"
 msgstr ""
 
-#: js/config.php:36
+#: js/config.php:34
 msgid "Tuesday"
 msgstr ""
 
-#: js/config.php:37
+#: js/config.php:35
 msgid "Wednesday"
 msgstr ""
 
-#: js/config.php:38
+#: js/config.php:36
 msgid "Thursday"
 msgstr ""
 
-#: js/config.php:39
+#: js/config.php:37
 msgid "Friday"
 msgstr ""
 
-#: js/config.php:40
+#: js/config.php:38
 msgid "Saturday"
 msgstr ""
 
-#: js/config.php:45
+#: js/config.php:43
 msgid "January"
 msgstr ""
 
-#: js/config.php:46
+#: js/config.php:44
 msgid "February"
 msgstr ""
 
-#: js/config.php:47
+#: js/config.php:45
 msgid "March"
 msgstr ""
 
-#: js/config.php:48
+#: js/config.php:46
 msgid "April"
 msgstr ""
 
-#: js/config.php:49
+#: js/config.php:47
 msgid "May"
 msgstr ""
 
-#: js/config.php:50
+#: js/config.php:48
 msgid "June"
 msgstr ""
 
-#: js/config.php:51
+#: js/config.php:49
 msgid "July"
 msgstr ""
 
-#: js/config.php:52
+#: js/config.php:50
 msgid "August"
 msgstr ""
 
-#: js/config.php:53
+#: js/config.php:51
 msgid "September"
 msgstr ""
 
-#: js/config.php:54
+#: js/config.php:52
 msgid "October"
 msgstr ""
 
-#: js/config.php:55
+#: js/config.php:53
 msgid "November"
 msgstr ""
 
-#: js/config.php:56
+#: js/config.php:54
 msgid "December"
 msgstr ""
 
-#: js/js.js:286
+#: js/js.js:289
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:718
+#: js/js.js:721
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:719
+#: js/js.js:722
 msgid "1 minute ago"
 msgstr ""
 
-#: js/js.js:720
+#: js/js.js:723
 msgid "{minutes} minutes ago"
 msgstr ""
 
-#: js/js.js:721
+#: js/js.js:724
 msgid "1 hour ago"
 msgstr ""
 
-#: js/js.js:722
+#: js/js.js:725
 msgid "{hours} hours ago"
 msgstr ""
 
-#: js/js.js:723
+#: js/js.js:726
 msgid "today"
 msgstr ""
 
-#: js/js.js:724
+#: js/js.js:727
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:725
+#: js/js.js:728
 msgid "{days} days ago"
 msgstr ""
 
-#: js/js.js:726
+#: js/js.js:729
 msgid "last month"
 msgstr ""
 
-#: js/js.js:727
+#: js/js.js:730
 msgid "{months} months ago"
 msgstr ""
 
-#: js/js.js:728
+#: js/js.js:731
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:729
+#: js/js.js:732
 msgid "last year"
 msgstr ""
 
-#: js/js.js:730
+#: js/js.js:733
 msgid "years ago"
 msgstr ""
 
@@ -226,8 +226,8 @@ msgstr ""
 #: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
 #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:577
-#: js/share.js:589
+#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:620
+#: js/share.js:632
 msgid "Error"
 msgstr ""
 
@@ -247,7 +247,7 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: js/share.js:125 js/share.js:617
+#: js/share.js:125 js/share.js:660
 msgid "Error while sharing"
 msgstr ""
 
@@ -267,99 +267,103 @@ msgstr ""
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:159
+#: js/share.js:172
 msgid "Share with"
 msgstr ""
 
-#: js/share.js:164
+#: js/share.js:177
 msgid "Share with link"
 msgstr ""
 
-#: js/share.js:167
+#: js/share.js:180
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:169 templates/installation.php:54 templates/login.php:26
+#: js/share.js:182 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "Passcode"
 
-#: js/share.js:173
+#: js/share.js:187
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:191
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:174
+#: js/share.js:192
 msgid "Send"
 msgstr ""
 
-#: js/share.js:178
+#: js/share.js:197
 msgid "Set expiration date"
 msgstr ""
 
-#: js/share.js:179
+#: js/share.js:198
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:211
+#: js/share.js:230
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:213
+#: js/share.js:232
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:251
+#: js/share.js:270
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:287
+#: js/share.js:306
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:308
+#: js/share.js:327
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:320
+#: js/share.js:339
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:322
+#: js/share.js:341
 msgid "access control"
 msgstr ""
 
-#: js/share.js:325
+#: js/share.js:344
 msgid "create"
 msgstr ""
 
-#: js/share.js:328
+#: js/share.js:347
 msgid "update"
 msgstr ""
 
-#: js/share.js:331
+#: js/share.js:350
 msgid "delete"
 msgstr ""
 
-#: js/share.js:334
+#: js/share.js:353
 msgid "share"
 msgstr ""
 
-#: js/share.js:368 js/share.js:564
+#: js/share.js:387 js/share.js:607
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:577
+#: js/share.js:620
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:589
+#: js/share.js:632
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:604
+#: js/share.js:647
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:615
+#: js/share.js:658
 msgid "Email sent"
 msgstr ""
 
@@ -374,7 +378,7 @@ msgstr ""
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
-#: lostpassword/controller.php:58
+#: lostpassword/controller.php:60
 msgid "ownCloud password reset"
 msgstr ""
 
@@ -404,17 +408,17 @@ msgstr ""
 
 #: lostpassword/templates/lostpassword.php:22
 msgid ""
-"Your files seems to be encrypted. If you didn't have enabled the recovery "
-"key there will be no way to get your data back once the password was "
-"resetted. If you are not sure what to do, please contact your administrator "
-"first before continue. Do you really want to continue?"
+"Your files are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
 msgstr ""
 
 #: lostpassword/templates/lostpassword.php:24
 msgid "Yes, I really want to reset my password now"
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:29
+#: lostpassword/templates/lostpassword.php:27
 msgid "Request reset"
 msgstr ""
 
@@ -462,7 +466,7 @@ msgstr ""
 msgid "Cloud not found"
 msgstr ""
 
-#: templates/altmail.php:2
+#: templates/altmail.php:4
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -473,10 +477,6 @@ msgid ""
 "Cheers!"
 msgstr ""
 
-#: templates/altmail.php:7 templates/mail.php:24
-msgid "web services under your control"
-msgstr "web services under your control"
-
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
 msgstr ""
@@ -569,12 +569,12 @@ msgstr ""
 msgid "Finish setup"
 msgstr ""
 
-#: templates/layout.user.php:40
+#: templates/layout.user.php:43
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:67
+#: templates/layout.user.php:68
 msgid "Log out"
 msgstr ""
 
@@ -608,7 +608,7 @@ msgstr ""
 msgid "Alternative Logins"
 msgstr ""
 
-#: templates/mail.php:15
+#: templates/mail.php:16
 #, php-format
 msgid ""
 "Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
diff --git a/l10n/en@pirate/files.po b/l10n/en@pirate/files.po
index 0862aa87c47c13d6721305e6f4d6c7218045eb41..749d48f683df3c048f9ff7df7989c09f2082fd45 100644
--- a/l10n/en@pirate/files.po
+++ b/l10n/en@pirate/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:01+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Pirate English (http://www.transifex.com/projects/p/owncloud/language/en@pirate/)\n"
 "MIME-Version: 1.0\n"
@@ -27,46 +27,54 @@ msgstr ""
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/upload.php:19
+#: ajax/upload.php:16 ajax/upload.php:45
+msgid "Unable to set upload directory."
+msgstr ""
+
+#: ajax/upload.php:22
+msgid "Invalid Token"
+msgstr ""
+
+#: ajax/upload.php:59
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: ajax/upload.php:26
+#: ajax/upload.php:66
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/upload.php:27
+#: ajax/upload.php:67
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:29
+#: ajax/upload.php:69
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/upload.php:30
+#: ajax/upload.php:70
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/upload.php:31
+#: ajax/upload.php:71
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/upload.php:32
+#: ajax/upload.php:72
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/upload.php:33
+#: ajax/upload.php:73
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:51
+#: ajax/upload.php:91
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:83
+#: ajax/upload.php:123
 msgid "Invalid directory."
 msgstr ""
 
@@ -74,6 +82,36 @@ msgstr ""
 msgid "Files"
 msgstr ""
 
+#: js/file-upload.js:11
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/file-upload.js:24
+msgid "Not enough space available"
+msgstr ""
+
+#: js/file-upload.js:64
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/file-upload.js:167 js/files.js:266
+msgid ""
+"File upload is in progress. Leaving the page now will cancel the upload."
+msgstr ""
+
+#: js/file-upload.js:233 js/files.js:339
+msgid "URL cannot be empty."
+msgstr ""
+
+#: js/file-upload.js:238 lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr ""
+
+#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
+#: js/files.js:693 js/files.js:731
+msgid "Error"
+msgstr ""
+
 #: js/fileactions.js:116
 msgid "Share"
 msgstr ""
@@ -90,43 +128,43 @@ msgstr ""
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:464
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:259
+#: js/filelist.js:302
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:306
+#: js/filelist.js:349
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:306
+#: js/filelist.js:349
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:331
+#: js/filelist.js:374
 msgid "perform delete operation"
 msgstr ""
 
-#: js/filelist.js:413
+#: js/filelist.js:456
 msgid "1 file uploading"
 msgstr ""
 
-#: js/filelist.js:416 js/filelist.js:470
+#: js/filelist.js:459 js/filelist.js:517
 msgid "files uploading"
 msgstr ""
 
@@ -158,69 +196,41 @@ msgid ""
 "big."
 msgstr ""
 
-#: js/files.js:264
-msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr ""
-
-#: js/files.js:277
-msgid "Not enough space available"
-msgstr ""
-
-#: js/files.js:317
-msgid "Upload cancelled."
-msgstr ""
-
-#: js/files.js:413
-msgid ""
-"File upload is in progress. Leaving the page now will cancel the upload."
-msgstr ""
-
-#: js/files.js:486
-msgid "URL cannot be empty."
-msgstr ""
-
-#: js/files.js:491
+#: js/files.js:344
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
-msgid "Error"
-msgstr ""
-
-#: js/files.js:877 templates/index.php:69
+#: js/files.js:744 templates/index.php:69
 msgid "Name"
 msgstr ""
 
-#: js/files.js:878 templates/index.php:80
+#: js/files.js:745 templates/index.php:80
 msgid "Size"
 msgstr ""
 
-#: js/files.js:879 templates/index.php:82
+#: js/files.js:746 templates/index.php:82
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:898
+#: js/files.js:765
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:900
+#: js/files.js:767
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:908
+#: js/files.js:775
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:910
+#: js/files.js:777
 msgid "{count} files"
 msgstr ""
 
-#: lib/app.php:53
-msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
-msgstr ""
-
 #: lib/app.php:73
-msgid "Unable to rename file"
+#, php-format
+msgid "%s could not be renamed"
 msgstr ""
 
 #: lib/helper.php:11 templates/index.php:18
@@ -317,6 +327,22 @@ msgstr ""
 msgid "Current scanning"
 msgstr ""
 
+#: templates/part.list.php:76
+msgid "directory"
+msgstr ""
+
+#: templates/part.list.php:78
+msgid "directories"
+msgstr ""
+
+#: templates/part.list.php:87
+msgid "file"
+msgstr ""
+
+#: templates/part.list.php:89
+msgid "files"
+msgstr ""
+
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
 msgstr ""
diff --git a/l10n/en@pirate/files_encryption.po b/l10n/en@pirate/files_encryption.po
index 66a55c8294f6cfed00722bdb8d08b525ef6a23ca..c0cec032f05b5f8bf1ba649fccd4aad4d049b39e 100644
--- a/l10n/en@pirate/files_encryption.po
+++ b/l10n/en@pirate/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-14 02:46+0200\n"
-"PO-Revision-Date: 2013-06-14 00:47+0000\n"
+"POT-Creation-Date: 2013-07-05 02:12+0200\n"
+"PO-Revision-Date: 2013-07-05 00:13+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Pirate English (http://www.transifex.com/projects/p/owncloud/language/en@pirate/)\n"
 "MIME-Version: 1.0\n"
@@ -55,9 +55,21 @@ msgstr ""
 
 #: files/error.php:7
 msgid ""
-"Your private key is not valid! Maybe your password was changed from outside."
-" You can update your private key password in your personal settings to "
-"regain access to your files"
+"Your private key is not valid! Likely your password was changed outside the "
+"ownCloud system (e.g. your corporate directory). You can update your private"
+" key password in your personal settings to recover access to your encrypted "
+"files."
+msgstr ""
+
+#: hooks/hooks.php:44
+msgid "Missing requirements."
+msgstr ""
+
+#: hooks/hooks.php:45
+msgid ""
+"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL "
+"PHP extension is enabled and configured properly. For now, the encryption "
+"app has been disabled."
 msgstr ""
 
 #: js/settings-admin.js:11
@@ -84,11 +96,11 @@ msgstr ""
 
 #: templates/settings-admin.php:10
 msgid ""
-"Enable encryption passwords recovery key (allow sharing to recovery key):"
+"Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
 #: templates/settings-admin.php:14
-msgid "Recovery account password"
+msgid "Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:21 templates/settings-personal.php:54
@@ -100,15 +112,15 @@ msgid "Disabled"
 msgstr ""
 
 #: templates/settings-admin.php:34
-msgid "Change encryption passwords recovery key:"
+msgid "Change recovery key password:"
 msgstr ""
 
 #: templates/settings-admin.php:41
-msgid "Old Recovery account password"
+msgid "Old Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:48
-msgid "New Recovery account password"
+msgid "New Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:53
diff --git a/l10n/en@pirate/files_sharing.po b/l10n/en@pirate/files_sharing.po
index b908463f98ad6508d241303a26bc3612598fd6f2..cedcbdb2d0806da953b05df795942110d8ebf343 100644
--- a/l10n/en@pirate/files_sharing.po
+++ b/l10n/en@pirate/files_sharing.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Pirate English (http://www.transifex.com/projects/p/owncloud/language/en@pirate/)\n"
 "MIME-Version: 1.0\n"
@@ -19,27 +19,39 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: templates/authenticate.php:4
+msgid "The password is wrong. Try again."
+msgstr ""
+
+#: templates/authenticate.php:7
 msgid "Password"
 msgstr "Secret Code"
 
-#: templates/authenticate.php:6
+#: templates/authenticate.php:9
 msgid "Submit"
 msgstr "Submit"
 
-#: templates/public.php:10
+#: templates/public.php:17
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s shared the folder %s with you"
 
-#: templates/public.php:13
+#: templates/public.php:20
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s shared the file %s with you"
 
-#: templates/public.php:19 templates/public.php:43
+#: templates/public.php:28 templates/public.php:90
 msgid "Download"
 msgstr "Download"
 
-#: templates/public.php:40
+#: templates/public.php:45 templates/public.php:48
+msgid "Upload"
+msgstr ""
+
+#: templates/public.php:58
+msgid "Cancel upload"
+msgstr ""
+
+#: templates/public.php:87
 msgid "No preview available for"
 msgstr "No preview available for"
diff --git a/l10n/en@pirate/lib.po b/l10n/en@pirate/lib.po
index be031f5ebd53adb8c5285c6071b60ba6711e81c0..c41a936390908ca9e7a3476e42e4382ca24e5930 100644
--- a/l10n/en@pirate/lib.po
+++ b/l10n/en@pirate/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-05-25 02:02+0200\n"
-"PO-Revision-Date: 2013-04-26 08:01+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-07-06 02:02+0200\n"
+"PO-Revision-Date: 2013-07-05 00:30+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Pirate English (http://www.transifex.com/projects/p/owncloud/language/en@pirate/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,47 +17,51 @@ msgstr ""
 "Language: en@pirate\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:357
+#: app.php:360
 msgid "Help"
 msgstr ""
 
-#: app.php:370
+#: app.php:373
 msgid "Personal"
 msgstr ""
 
-#: app.php:381
+#: app.php:384
 msgid "Settings"
 msgstr ""
 
-#: app.php:393
+#: app.php:396
 msgid "Users"
 msgstr ""
 
-#: app.php:406
+#: app.php:409
 msgid "Apps"
 msgstr ""
 
-#: app.php:414
+#: app.php:417
 msgid "Admin"
 msgstr ""
 
-#: files.php:207
+#: defaults.php:33
+msgid "web services under your control"
+msgstr "web services under your control"
+
+#: files.php:210
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: files.php:208
+#: files.php:211
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:209 files.php:242
+#: files.php:212 files.php:245
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:239
+#: files.php:242
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
-#: helper.php:228
+#: helper.php:236
 msgid "couldn't be determined"
 msgstr ""
 
@@ -85,104 +89,102 @@ msgstr ""
 msgid "Images"
 msgstr ""
 
-#: setup.php:34
-msgid "Set an admin username."
-msgstr ""
-
-#: setup.php:37
-msgid "Set an admin password."
-msgstr ""
-
-#: setup.php:55
+#: setup/abstractdatabase.php:22
 #, php-format
 msgid "%s enter the database username."
 msgstr ""
 
-#: setup.php:58
+#: setup/abstractdatabase.php:25
 #, php-format
 msgid "%s enter the database name."
 msgstr ""
 
-#: setup.php:61
+#: setup/abstractdatabase.php:28
 #, php-format
 msgid "%s you may not use dots in the database name"
 msgstr ""
 
-#: setup.php:64
+#: setup/mssql.php:20
 #, php-format
-msgid "%s set the database host."
-msgstr ""
-
-#: setup.php:132 setup.php:329 setup.php:374
-msgid "PostgreSQL username and/or password not valid"
+msgid "MS SQL username and/or password not valid: %s"
 msgstr ""
 
-#: setup.php:133 setup.php:238
+#: setup/mssql.php:21 setup/mysql.php:13 setup/oci.php:114
+#: setup/postgresql.php:24 setup/postgresql.php:70
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:155
-msgid "Oracle connection could not be established"
-msgstr ""
-
-#: setup.php:237
+#: setup/mysql.php:12
 msgid "MySQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
-#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
-#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
-#: setup.php:623
+#: setup/mysql.php:67 setup/oci.php:54 setup/oci.php:121 setup/oci.php:147
+#: setup/oci.php:154 setup/oci.php:165 setup/oci.php:172 setup/oci.php:181
+#: setup/oci.php:189 setup/oci.php:198 setup/oci.php:204
+#: setup/postgresql.php:89 setup/postgresql.php:98 setup/postgresql.php:115
+#: setup/postgresql.php:125 setup/postgresql.php:134
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr ""
 
-#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
-#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
-#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
+#: setup/mysql.php:68 setup/oci.php:55 setup/oci.php:122 setup/oci.php:148
+#: setup/oci.php:155 setup/oci.php:166 setup/oci.php:182 setup/oci.php:190
+#: setup/oci.php:199 setup/postgresql.php:90 setup/postgresql.php:99
+#: setup/postgresql.php:116 setup/postgresql.php:126 setup/postgresql.php:135
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:308
+#: setup/mysql.php:85
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:309
+#: setup/mysql.php:86
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:314
+#: setup/mysql.php:91
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:315
+#: setup/mysql.php:92
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:466 setup.php:533
+#: setup/oci.php:34
+msgid "Oracle connection could not be established"
+msgstr ""
+
+#: setup/oci.php:41 setup/oci.php:113
 msgid "Oracle username and/or password not valid"
 msgstr ""
 
-#: setup.php:592 setup.php:624
+#: setup/oci.php:173 setup/oci.php:205
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:644
-#, php-format
-msgid "MS SQL username and/or password not valid: %s"
+#: setup/postgresql.php:23 setup/postgresql.php:69
+msgid "PostgreSQL username and/or password not valid"
+msgstr ""
+
+#: setup.php:42
+msgid "Set an admin username."
+msgstr ""
+
+#: setup.php:45
+msgid "Set an admin password."
 msgstr ""
 
-#: setup.php:867
+#: setup.php:198
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:868
+#: setup.php:199
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
diff --git a/l10n/en@pirate/settings.po b/l10n/en@pirate/settings.po
index 4459d6d106248d18abc7ab0dd08325a1be578207..1b6740bec83bff6d7e69b1758a5ccb52139d5631 100644
--- a/l10n/en@pirate/settings.po
+++ b/l10n/en@pirate/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-11 01:57+0200\n"
-"PO-Revision-Date: 2013-06-10 23:57+0000\n"
+"POT-Creation-Date: 2013-07-09 02:04+0200\n"
+"PO-Revision-Date: 2013-07-09 00:04+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Pirate English (http://www.transifex.com/projects/p/owncloud/language/en@pirate/)\n"
 "MIME-Version: 1.0\n"
@@ -58,7 +58,7 @@ msgstr ""
 msgid "Unable to delete group"
 msgstr ""
 
-#: ajax/removeuser.php:24
+#: ajax/removeuser.php:25
 msgid "Unable to delete user"
 msgstr ""
 
@@ -88,35 +88,35 @@ msgstr ""
 msgid "Couldn't update app."
 msgstr ""
 
-#: js/apps.js:30
+#: js/apps.js:35
 msgid "Update to {appversion}"
 msgstr ""
 
-#: js/apps.js:36 js/apps.js:76
+#: js/apps.js:41 js/apps.js:81
 msgid "Disable"
 msgstr ""
 
-#: js/apps.js:36 js/apps.js:64 js/apps.js:83
+#: js/apps.js:41 js/apps.js:69 js/apps.js:88
 msgid "Enable"
 msgstr ""
 
-#: js/apps.js:55
+#: js/apps.js:60
 msgid "Please wait...."
 msgstr ""
 
-#: js/apps.js:59 js/apps.js:71 js/apps.js:80 js/apps.js:93
+#: js/apps.js:64 js/apps.js:76 js/apps.js:85 js/apps.js:98
 msgid "Error"
 msgstr ""
 
-#: js/apps.js:90
+#: js/apps.js:95
 msgid "Updating...."
 msgstr ""
 
-#: js/apps.js:93
+#: js/apps.js:98
 msgid "Error while updating app"
 msgstr ""
 
-#: js/apps.js:96
+#: js/apps.js:101
 msgid "Updated"
 msgstr ""
 
@@ -165,15 +165,15 @@ msgstr ""
 msgid "A valid password must be provided"
 msgstr ""
 
-#: personal.php:35 personal.php:36
+#: personal.php:37 personal.php:38
 msgid "__language_name__"
 msgstr ""
 
-#: templates/admin.php:15
+#: templates/admin.php:17
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:18
+#: templates/admin.php:20
 msgid ""
 "Your data directory and your files are probably accessible from the "
 "internet. The .htaccess file that ownCloud provides is not working. We "
@@ -182,36 +182,36 @@ msgid ""
 " webserver document root."
 msgstr ""
 
-#: templates/admin.php:29
+#: templates/admin.php:31
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:32
+#: templates/admin.php:34
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: templates/admin.php:33
+#: templates/admin.php:35
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:44
+#: templates/admin.php:46
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:47
+#: templates/admin.php:49
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr ""
 
-#: templates/admin.php:58
+#: templates/admin.php:60
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:63
+#: templates/admin.php:65
 #, php-format
 msgid ""
 "This ownCloud server can't set system locale to %s. This means that there "
@@ -219,11 +219,11 @@ msgid ""
 " to install the required packages on your system to support %s."
 msgstr ""
 
-#: templates/admin.php:75
+#: templates/admin.php:77
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:78
+#: templates/admin.php:80
 msgid ""
 "This ownCloud server has no working internet connection. This means that "
 "some of the features like mounting of external storage, notifications about "
@@ -233,102 +233,102 @@ msgid ""
 " of ownCloud."
 msgstr ""
 
-#: templates/admin.php:92
+#: templates/admin.php:94
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:101
+#: templates/admin.php:103
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:111
+#: templates/admin.php:113
 msgid ""
 "cron.php is registered at a webcron service. Call the cron.php page in the "
 "owncloud root once a minute over http."
 msgstr ""
 
-#: templates/admin.php:121
+#: templates/admin.php:123
 msgid ""
 "Use systems cron service. Call the cron.php file in the owncloud folder via "
 "a system cronjob once a minute."
 msgstr ""
 
-#: templates/admin.php:128
+#: templates/admin.php:130
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:134
+#: templates/admin.php:136
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:135
+#: templates/admin.php:137
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:142
+#: templates/admin.php:144
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:143
+#: templates/admin.php:145
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:150
+#: templates/admin.php:152
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:151
+#: templates/admin.php:153
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:158
+#: templates/admin.php:160
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:161
+#: templates/admin.php:163
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:168
+#: templates/admin.php:170
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:181
+#: templates/admin.php:183
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:182
+#: templates/admin.php:184
 msgid ""
 "Enforces the clients to connect to ownCloud via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:185
+#: templates/admin.php:187
 msgid ""
 "Please connect to this ownCloud instance via HTTPS to enable or disable the "
 "SSL enforcement."
 msgstr ""
 
-#: templates/admin.php:195
+#: templates/admin.php:197
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:196
+#: templates/admin.php:198
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:227
+#: templates/admin.php:229
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:228
+#: templates/admin.php:230
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:235 templates/personal.php:111
+#: templates/admin.php:236 templates/personal.php:116
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:237 templates/personal.php:114
+#: templates/admin.php:240 templates/personal.php:119
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -338,27 +338,27 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr ""
 
-#: templates/apps.php:11
+#: templates/apps.php:13
 msgid "Add your App"
 msgstr ""
 
-#: templates/apps.php:12
+#: templates/apps.php:28
 msgid "More Apps"
 msgstr ""
 
-#: templates/apps.php:28
+#: templates/apps.php:33
 msgid "Select an App"
 msgstr ""
 
-#: templates/apps.php:34
+#: templates/apps.php:39
 msgid "See application page at apps.owncloud.com"
 msgstr ""
 
-#: templates/apps.php:36
+#: templates/apps.php:41
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr ""
 
-#: templates/apps.php:38
+#: templates/apps.php:43
 msgid "Update"
 msgstr ""
 
@@ -386,76 +386,79 @@ msgstr ""
 msgid "Commercial Support"
 msgstr ""
 
-#: templates/personal.php:8
-#, php-format
-msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
-msgstr ""
-
-#: templates/personal.php:15
+#: templates/personal.php:10
 msgid "Get the apps to sync your files"
 msgstr ""
 
-#: templates/personal.php:26
+#: templates/personal.php:21
 msgid "Show First Run Wizard again"
 msgstr ""
 
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:29
+#, php-format
+msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
+msgstr ""
+
+#: templates/personal.php:41 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "Passcode"
 
-#: templates/personal.php:38
+#: templates/personal.php:42
 msgid "Your password was changed"
 msgstr ""
 
-#: templates/personal.php:39
+#: templates/personal.php:43
 msgid "Unable to change your password"
 msgstr ""
 
-#: templates/personal.php:40
+#: templates/personal.php:44
 msgid "Current password"
 msgstr ""
 
-#: templates/personal.php:42
+#: templates/personal.php:46
 msgid "New password"
 msgstr ""
 
-#: templates/personal.php:44
+#: templates/personal.php:48
 msgid "Change password"
 msgstr ""
 
-#: templates/personal.php:56 templates/users.php:85
+#: templates/personal.php:60 templates/users.php:85
 msgid "Display Name"
 msgstr ""
 
-#: templates/personal.php:71
+#: templates/personal.php:75
 msgid "Email"
 msgstr ""
 
-#: templates/personal.php:73
+#: templates/personal.php:77
 msgid "Your email address"
 msgstr ""
 
-#: templates/personal.php:74
+#: templates/personal.php:78
 msgid "Fill in an email address to enable password recovery"
 msgstr ""
 
-#: templates/personal.php:83 templates/personal.php:84
+#: templates/personal.php:87 templates/personal.php:88
 msgid "Language"
 msgstr ""
 
-#: templates/personal.php:95
+#: templates/personal.php:100
 msgid "Help translate"
 msgstr ""
 
-#: templates/personal.php:100
+#: templates/personal.php:106
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:102
-msgid "Use this address to connect to your ownCloud in your file manager"
+#: templates/personal.php:108
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
+"target=\"_blank\">access your Files via WebDAV</a>"
 msgstr ""
 
-#: templates/users.php:21 templates/users.php:84
+#: templates/users.php:21
 msgid "Login Name"
 msgstr ""
 
@@ -485,6 +488,10 @@ msgstr ""
 msgid "Other"
 msgstr ""
 
+#: templates/users.php:84
+msgid "Username"
+msgstr ""
+
 #: templates/users.php:91
 msgid "Storage"
 msgstr ""
diff --git a/l10n/en@pirate/user_ldap.po b/l10n/en@pirate/user_ldap.po
index ffa7973ace000da2b7ead4454ea1dc12ff90b9ef..ac3ae9d2a52f2b264f404cd61d6d23655bdb82f0 100644
--- a/l10n/en@pirate/user_ldap.po
+++ b/l10n/en@pirate/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-25 02:01+0200\n"
-"PO-Revision-Date: 2013-05-24 13:28+0000\n"
+"POT-Creation-Date: 2013-06-23 01:59+0200\n"
+"PO-Revision-Date: 2013-06-22 10:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Pirate English (http://www.transifex.com/projects/p/owncloud/language/en@pirate/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/eo/core.po b/l10n/eo/core.po
index fd6a695a682e5a4356f869bcadddc9d290944752..6c6187c35500adaac78d575a075ea7db9e2c5824 100644
--- a/l10n/eo/core.po
+++ b/l10n/eo/core.po
@@ -4,12 +4,13 @@
 # 
 # Translators:
 # Baptiste <baptiste+transifex@darthenay.fr>, 2013
+# Mariano <mstreet@kde.org.ar>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:22+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:14+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
 "MIME-Version: 1.0\n"
@@ -21,7 +22,7 @@ msgstr ""
 #: ajax/share.php:97
 #, php-format
 msgid "%s shared »%s« with you"
-msgstr ""
+msgstr "%s kunhavigis “%s” kun vi"
 
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
@@ -62,135 +63,135 @@ msgstr "Neniu kategorio elektiĝis por forigo."
 msgid "Error removing %s from favorites."
 msgstr "Eraro dum forigo de %s el favoratoj."
 
-#: js/config.php:34
+#: js/config.php:32
 msgid "Sunday"
 msgstr "dimanĉo"
 
-#: js/config.php:35
+#: js/config.php:33
 msgid "Monday"
 msgstr "lundo"
 
-#: js/config.php:36
+#: js/config.php:34
 msgid "Tuesday"
 msgstr "mardo"
 
-#: js/config.php:37
+#: js/config.php:35
 msgid "Wednesday"
 msgstr "merkredo"
 
-#: js/config.php:38
+#: js/config.php:36
 msgid "Thursday"
 msgstr "ĵaŭdo"
 
-#: js/config.php:39
+#: js/config.php:37
 msgid "Friday"
 msgstr "vendredo"
 
-#: js/config.php:40
+#: js/config.php:38
 msgid "Saturday"
 msgstr "sabato"
 
-#: js/config.php:45
+#: js/config.php:43
 msgid "January"
 msgstr "Januaro"
 
-#: js/config.php:46
+#: js/config.php:44
 msgid "February"
 msgstr "Februaro"
 
-#: js/config.php:47
+#: js/config.php:45
 msgid "March"
 msgstr "Marto"
 
-#: js/config.php:48
+#: js/config.php:46
 msgid "April"
 msgstr "Aprilo"
 
-#: js/config.php:49
+#: js/config.php:47
 msgid "May"
 msgstr "Majo"
 
-#: js/config.php:50
+#: js/config.php:48
 msgid "June"
 msgstr "Junio"
 
-#: js/config.php:51
+#: js/config.php:49
 msgid "July"
 msgstr "Julio"
 
-#: js/config.php:52
+#: js/config.php:50
 msgid "August"
 msgstr "AÅ­gusto"
 
-#: js/config.php:53
+#: js/config.php:51
 msgid "September"
 msgstr "Septembro"
 
-#: js/config.php:54
+#: js/config.php:52
 msgid "October"
 msgstr "Oktobro"
 
-#: js/config.php:55
+#: js/config.php:53
 msgid "November"
 msgstr "Novembro"
 
-#: js/config.php:56
+#: js/config.php:54
 msgid "December"
 msgstr "Decembro"
 
-#: js/js.js:286
+#: js/js.js:293
 msgid "Settings"
 msgstr "Agordo"
 
-#: js/js.js:718
+#: js/js.js:725
 msgid "seconds ago"
 msgstr "sekundoj antaÅ­e"
 
-#: js/js.js:719
+#: js/js.js:726
 msgid "1 minute ago"
 msgstr "antaÅ­ 1 minuto"
 
-#: js/js.js:720
+#: js/js.js:727
 msgid "{minutes} minutes ago"
 msgstr "antaÅ­ {minutes} minutoj"
 
-#: js/js.js:721
+#: js/js.js:728
 msgid "1 hour ago"
 msgstr "antaÅ­ 1 horo"
 
-#: js/js.js:722
+#: js/js.js:729
 msgid "{hours} hours ago"
 msgstr "antaÅ­ {hours} horoj"
 
-#: js/js.js:723
+#: js/js.js:730
 msgid "today"
 msgstr "hodiaÅ­"
 
-#: js/js.js:724
+#: js/js.js:731
 msgid "yesterday"
 msgstr "hieraÅ­"
 
-#: js/js.js:725
+#: js/js.js:732
 msgid "{days} days ago"
 msgstr "antaÅ­ {days} tagoj"
 
-#: js/js.js:726
+#: js/js.js:733
 msgid "last month"
 msgstr "lastamonate"
 
-#: js/js.js:727
+#: js/js.js:734
 msgid "{months} months ago"
 msgstr "antaÅ­ {months} monatoj"
 
-#: js/js.js:728
+#: js/js.js:735
 msgid "months ago"
 msgstr "monatoj antaÅ­e"
 
-#: js/js.js:729
+#: js/js.js:736
 msgid "last year"
 msgstr "lastajare"
 
-#: js/js.js:730
+#: js/js.js:737
 msgid "years ago"
 msgstr "jaroj antaÅ­e"
 
@@ -226,8 +227,8 @@ msgstr "Ne indikiĝis tipo de la objekto."
 #: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
 #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:577
-#: js/share.js:589
+#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:620
+#: js/share.js:632
 msgid "Error"
 msgstr "Eraro"
 
@@ -247,7 +248,7 @@ msgstr "Dividita"
 msgid "Share"
 msgstr "Kunhavigi"
 
-#: js/share.js:125 js/share.js:617
+#: js/share.js:125 js/share.js:660
 msgid "Error while sharing"
 msgstr "Eraro dum kunhavigo"
 
@@ -267,99 +268,103 @@ msgstr "Kunhavigita kun vi kaj la grupo {group} de {owner}"
 msgid "Shared with you by {owner}"
 msgstr "Kunhavigita kun vi de {owner}"
 
-#: js/share.js:159
+#: js/share.js:172
 msgid "Share with"
 msgstr "Kunhavigi kun"
 
-#: js/share.js:164
+#: js/share.js:177
 msgid "Share with link"
 msgstr "Kunhavigi per ligilo"
 
-#: js/share.js:167
+#: js/share.js:180
 msgid "Password protect"
 msgstr "Protekti per pasvorto"
 
-#: js/share.js:169 templates/installation.php:54 templates/login.php:26
+#: js/share.js:182 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "Pasvorto"
 
-#: js/share.js:173
+#: js/share.js:187
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:191
 msgid "Email link to person"
 msgstr "Retpoŝti la ligilon al ulo"
 
-#: js/share.js:174
+#: js/share.js:192
 msgid "Send"
 msgstr "Sendi"
 
-#: js/share.js:178
+#: js/share.js:197
 msgid "Set expiration date"
 msgstr "Agordi limdaton"
 
-#: js/share.js:179
+#: js/share.js:198
 msgid "Expiration date"
 msgstr "Limdato"
 
-#: js/share.js:211
+#: js/share.js:230
 msgid "Share via email:"
 msgstr "Kunhavigi per retpoŝto:"
 
-#: js/share.js:213
+#: js/share.js:232
 msgid "No people found"
 msgstr "Ne troviĝis gento"
 
-#: js/share.js:251
+#: js/share.js:270
 msgid "Resharing is not allowed"
 msgstr "Rekunhavigo ne permesatas"
 
-#: js/share.js:287
+#: js/share.js:306
 msgid "Shared in {item} with {user}"
 msgstr "Kunhavigita en {item} kun {user}"
 
-#: js/share.js:308
+#: js/share.js:327
 msgid "Unshare"
 msgstr "Malkunhavigi"
 
-#: js/share.js:320
+#: js/share.js:339
 msgid "can edit"
 msgstr "povas redakti"
 
-#: js/share.js:322
+#: js/share.js:341
 msgid "access control"
 msgstr "alirkontrolo"
 
-#: js/share.js:325
+#: js/share.js:344
 msgid "create"
 msgstr "krei"
 
-#: js/share.js:328
+#: js/share.js:347
 msgid "update"
 msgstr "ĝisdatigi"
 
-#: js/share.js:331
+#: js/share.js:350
 msgid "delete"
 msgstr "forigi"
 
-#: js/share.js:334
+#: js/share.js:353
 msgid "share"
 msgstr "kunhavigi"
 
-#: js/share.js:368 js/share.js:564
+#: js/share.js:387 js/share.js:607
 msgid "Password protected"
 msgstr "Protektita per pasvorto"
 
-#: js/share.js:577
+#: js/share.js:620
 msgid "Error unsetting expiration date"
 msgstr "Eraro dum malagordado de limdato"
 
-#: js/share.js:589
+#: js/share.js:632
 msgid "Error setting expiration date"
 msgstr "Eraro dum agordado de limdato"
 
-#: js/share.js:604
+#: js/share.js:647
 msgid "Sending ..."
 msgstr "Sendante..."
 
-#: js/share.js:615
+#: js/share.js:658
 msgid "Email sent"
 msgstr "La retpoŝtaĵo sendiĝis"
 
@@ -374,7 +379,7 @@ msgstr "La ĝisdatigo estis malsukcese. Bonvolu raporti tiun problemon al la <a
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "La ĝisdatigo estis sukcesa. Alidirektante nun al ownCloud."
 
-#: lostpassword/controller.php:58
+#: lostpassword/controller.php:60
 msgid "ownCloud password reset"
 msgstr "La pasvorto de ownCloud restariĝis."
 
@@ -391,7 +396,7 @@ msgstr ""
 
 #: lostpassword/templates/lostpassword.php:12
 msgid "Request failed!<br>Did you make sure your email/username was right?"
-msgstr ""
+msgstr "La peto malsukcesis!<br />Ĉu vi certiĝis, ke via retpoŝto/uzantonomo ĝustas?"
 
 #: lostpassword/templates/lostpassword.php:15
 msgid "You will receive a link to reset your password via Email."
@@ -404,17 +409,17 @@ msgstr "Uzantonomo"
 
 #: lostpassword/templates/lostpassword.php:22
 msgid ""
-"Your files seems to be encrypted. If you didn't have enabled the recovery "
-"key there will be no way to get your data back once the password was "
-"resetted. If you are not sure what to do, please contact your administrator "
-"first before continue. Do you really want to continue?"
+"Your files are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
 msgstr ""
 
 #: lostpassword/templates/lostpassword.php:24
 msgid "Yes, I really want to reset my password now"
-msgstr ""
+msgstr "Jes, mi vere volas restarigi mian pasvorton nun"
 
-#: lostpassword/templates/lostpassword.php:29
+#: lostpassword/templates/lostpassword.php:27
 msgid "Request reset"
 msgstr "Peti rekomencigon"
 
@@ -462,7 +467,7 @@ msgstr "Aliro estas malpermesata"
 msgid "Cloud not found"
 msgstr "La nubo ne estas trovita"
 
-#: templates/altmail.php:2
+#: templates/altmail.php:4
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -471,11 +476,7 @@ msgid ""
 "View it: %s\n"
 "\n"
 "Cheers!"
-msgstr ""
-
-#: templates/altmail.php:7 templates/mail.php:24
-msgid "web services under your control"
-msgstr "TTT-servoj regataj de vi"
+msgstr "Saluton:\n\nNi nur sciigas vin, ke %s kunhavigis %s kun vi.\nVidu ĝin: %s\n\nĜis!"
 
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
@@ -496,7 +497,7 @@ msgstr "Via PHP versio estas sendefenda je la NULL bajto atako (CVE-2006-7243)"
 
 #: templates/installation.php:26
 msgid "Please update your PHP installation to use ownCloud securely."
-msgstr ""
+msgstr "Bonvolu ĝisdatigi vian instalon de PHP por uzi ownCloud-on sekure."
 
 #: templates/installation.php:32
 msgid ""
@@ -569,18 +570,18 @@ msgstr "Datumbaza gastigo"
 msgid "Finish setup"
 msgstr "Fini la instalon"
 
-#: templates/layout.user.php:40
+#: templates/layout.user.php:43
 #, php-format
 msgid "%s is available. Get more information on how to update."
-msgstr ""
+msgstr "%s haveblas. Ekhavi pli da informo pri kiel ĝisdatigi."
 
-#: templates/layout.user.php:67
+#: templates/layout.user.php:68
 msgid "Log out"
 msgstr "Elsaluti"
 
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
-msgstr ""
+msgstr "La aŭtomata ensaluto malakceptiĝis!"
 
 #: templates/login.php:10
 msgid ""
@@ -606,14 +607,14 @@ msgstr "Ensaluti"
 
 #: templates/login.php:47
 msgid "Alternative Logins"
-msgstr ""
+msgstr "Alternativaj ensalutoj"
 
-#: templates/mail.php:15
+#: templates/mail.php:16
 #, php-format
 msgid ""
 "Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
 "href=\"%s\">View it!</a><br><br>Cheers!"
-msgstr ""
+msgstr "Saluton:<br /><br />Ni nur sciigas vin, ke %s kunhavigis “%s” kun vi.<br /><a href=\"%s\">Vidu ĝin</a><br /><br />Ĝis!"
 
 #: templates/part.pagenavi.php:3
 msgid "prev"
@@ -626,4 +627,4 @@ msgstr "jena"
 #: templates/update.php:3
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
-msgstr ""
+msgstr "ownCloud ĝisdatiĝas al eldono %s, tio ĉi povas daŭri je iom da tempo."
diff --git a/l10n/eo/files.po b/l10n/eo/files.po
index 4690f2a4c4c57d3cddc90c77220273097c02df37..430e14fb46cb07c15cbb2b3dcf8f42340b4d0a6c 100644
--- a/l10n/eo/files.po
+++ b/l10n/eo/files.po
@@ -3,12 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Mariano <mstreet@kde.org.ar>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:01+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
 "MIME-Version: 1.0\n"
@@ -27,46 +28,54 @@ msgstr "Ne eblis movi %s: dosiero kun ĉi tiu nomo jam ekzistas"
 msgid "Could not move %s"
 msgstr "Ne eblis movi %s"
 
-#: ajax/upload.php:19
+#: ajax/upload.php:16 ajax/upload.php:45
+msgid "Unable to set upload directory."
+msgstr ""
+
+#: ajax/upload.php:22
+msgid "Invalid Token"
+msgstr ""
+
+#: ajax/upload.php:59
 msgid "No file was uploaded. Unknown error"
 msgstr "Neniu dosiero alŝutiĝis. Nekonata eraro."
 
-#: ajax/upload.php:26
+#: ajax/upload.php:66
 msgid "There is no error, the file uploaded with success"
 msgstr "Ne estas eraro, la dosiero alŝutiĝis sukcese."
 
-#: ajax/upload.php:27
+#: ajax/upload.php:67
 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:29
+#: ajax/upload.php:69
 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:30
+#: ajax/upload.php:70
 msgid "The uploaded file was only partially uploaded"
 msgstr "la alŝutita dosiero nur parte alŝutiĝis"
 
-#: ajax/upload.php:31
+#: ajax/upload.php:71
 msgid "No file was uploaded"
 msgstr "Neniu dosiero alŝutiĝis."
 
-#: ajax/upload.php:32
+#: ajax/upload.php:72
 msgid "Missing a temporary folder"
 msgstr "Mankas provizora dosierujo."
 
-#: ajax/upload.php:33
+#: ajax/upload.php:73
 msgid "Failed to write to disk"
 msgstr "Malsukcesis skribo al disko"
 
-#: ajax/upload.php:51
+#: ajax/upload.php:91
 msgid "Not enough storage available"
-msgstr ""
+msgstr "Ne haveblas sufiĉa memoro"
 
-#: ajax/upload.php:83
+#: ajax/upload.php:123
 msgid "Invalid directory."
 msgstr "Nevalida dosierujo."
 
@@ -74,13 +83,43 @@ msgstr "Nevalida dosierujo."
 msgid "Files"
 msgstr "Dosieroj"
 
+#: js/file-upload.js:11
+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/file-upload.js:24
+msgid "Not enough space available"
+msgstr "Ne haveblas sufiĉa spaco"
+
+#: js/file-upload.js:64
+msgid "Upload cancelled."
+msgstr "La alŝuto nuliĝis."
+
+#: js/file-upload.js:167 js/files.js:266
+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/file-upload.js:233 js/files.js:339
+msgid "URL cannot be empty."
+msgstr "URL ne povas esti malplena."
+
+#: js/file-upload.js:238 lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr "Nevalida dosierujnomo. La uzo de “Shared” estas rezervita de ownCloud."
+
+#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
+#: js/files.js:693 js/files.js:731
+msgid "Error"
+msgstr "Eraro"
+
 #: js/fileactions.js:116
 msgid "Share"
 msgstr "Kunhavigi"
 
 #: js/fileactions.js:126
 msgid "Delete permanently"
-msgstr ""
+msgstr "Forigi por ĉiam"
 
 #: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
 msgid "Delete"
@@ -90,43 +129,43 @@ msgstr "Forigi"
 msgid "Rename"
 msgstr "Alinomigi"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:464
 msgid "Pending"
 msgstr "Traktotaj"
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "{new_name} already exists"
 msgstr "{new_name} jam ekzistas"
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "replace"
 msgstr "anstataÅ­igi"
 
-#: js/filelist.js:259
+#: js/filelist.js:302
 msgid "suggest name"
 msgstr "sugesti nomon"
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "cancel"
 msgstr "nuligi"
 
-#: js/filelist.js:306
+#: js/filelist.js:349
 msgid "replaced {new_name} with {old_name}"
 msgstr "anstataŭiĝis {new_name} per {old_name}"
 
-#: js/filelist.js:306
+#: js/filelist.js:349
 msgid "undo"
 msgstr "malfari"
 
-#: js/filelist.js:331
+#: js/filelist.js:374
 msgid "perform delete operation"
-msgstr ""
+msgstr "plenumi forigan operacion"
 
-#: js/filelist.js:413
+#: js/filelist.js:456
 msgid "1 file uploading"
 msgstr "1 dosiero estas alŝutata"
 
-#: js/filelist.js:416 js/filelist.js:470
+#: js/filelist.js:459 js/filelist.js:517
 msgid "files uploading"
 msgstr "dosieroj estas alŝutataj"
 
@@ -146,11 +185,11 @@ msgstr "Nevalida nomo: “\\”, “/”, “<”, “>”, “:”, “\"”, 
 
 #: js/files.js:78
 msgid "Your storage is full, files can not be updated or synced anymore!"
-msgstr ""
+msgstr "Via memoro plenas, ne plu eblas ĝisdatigi aŭ sinkronigi dosierojn!"
 
 #: js/files.js:82
 msgid "Your storage is almost full ({usedSpacePercent}%)"
-msgstr ""
+msgstr "Via memoro preskaÅ­ plenas ({usedSpacePercent}%)"
 
 #: js/files.js:231
 msgid ""
@@ -158,70 +197,42 @@ msgid ""
 "big."
 msgstr "Via elŝuto pretiĝatas. Ĉi tio povas daŭri iom da tempo se la dosieroj grandas."
 
-#: js/files.js:264
-msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "Ne eblis alŝuti vian dosieron ĉar ĝi estas dosierujo aŭ havas 0 duumokojn"
-
-#: js/files.js:277
-msgid "Not enough space available"
-msgstr "Ne haveblas sufiĉa spaco"
-
-#: js/files.js:317
-msgid "Upload cancelled."
-msgstr "La alŝuto nuliĝis."
-
-#: js/files.js:413
-msgid ""
-"File upload is in progress. Leaving the page now will cancel the upload."
-msgstr "Dosieralŝuto plenumiĝas. Lasi la paĝon nun nuligus la alŝuton."
-
-#: js/files.js:486
-msgid "URL cannot be empty."
-msgstr "URL ne povas esti malplena."
-
-#: js/files.js:491
+#: js/files.js:344
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Nevalida dosierujnomo. Uzo de “Shared” rezervatas de Owncloud."
 
-#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
-msgid "Error"
-msgstr "Eraro"
-
-#: js/files.js:877 templates/index.php:69
+#: js/files.js:744 templates/index.php:69
 msgid "Name"
 msgstr "Nomo"
 
-#: js/files.js:878 templates/index.php:80
+#: js/files.js:745 templates/index.php:80
 msgid "Size"
 msgstr "Grando"
 
-#: js/files.js:879 templates/index.php:82
+#: js/files.js:746 templates/index.php:82
 msgid "Modified"
 msgstr "Modifita"
 
-#: js/files.js:898
+#: js/files.js:765
 msgid "1 folder"
 msgstr "1 dosierujo"
 
-#: js/files.js:900
+#: js/files.js:767
 msgid "{count} folders"
 msgstr "{count} dosierujoj"
 
-#: js/files.js:908
+#: js/files.js:775
 msgid "1 file"
 msgstr "1 dosiero"
 
-#: js/files.js:910
+#: js/files.js:777
 msgid "{count} files"
 msgstr "{count} dosierujoj"
 
-#: lib/app.php:53
-msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
-msgstr ""
-
 #: lib/app.php:73
-msgid "Unable to rename file"
-msgstr "Ne eblis alinomigi dosieron"
+#, php-format
+msgid "%s could not be renamed"
+msgstr ""
 
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
@@ -277,7 +288,7 @@ msgstr "El ligilo"
 
 #: templates/index.php:42
 msgid "Deleted files"
-msgstr ""
+msgstr "Forigitaj dosieroj"
 
 #: templates/index.php:48
 msgid "Cancel upload"
@@ -285,7 +296,7 @@ msgstr "Nuligi alŝuton"
 
 #: templates/index.php:54
 msgid "You don’t have write permissions here."
-msgstr ""
+msgstr "Vi ne havas permeson skribi ĉi tie."
 
 #: templates/index.php:61
 msgid "Nothing in here. Upload something!"
@@ -317,6 +328,22 @@ msgstr "Dosieroj estas skanataj, bonvolu atendi."
 msgid "Current scanning"
 msgstr "Nuna skano"
 
+#: templates/part.list.php:76
+msgid "directory"
+msgstr ""
+
+#: templates/part.list.php:78
+msgid "directories"
+msgstr ""
+
+#: templates/part.list.php:87
+msgid "file"
+msgstr "dosiero"
+
+#: templates/part.list.php:89
+msgid "files"
+msgstr "dosieroj"
+
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
-msgstr ""
+msgstr "Ĝisdatiĝas dosiersistema kaŝmemoro..."
diff --git a/l10n/eo/files_encryption.po b/l10n/eo/files_encryption.po
index ee93c610b6eb92846756edc15b01d3c0796c1774..c5864c36b149be2a84db74bc7ea4721a727b66c2 100644
--- a/l10n/eo/files_encryption.po
+++ b/l10n/eo/files_encryption.po
@@ -3,12 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Mariano <mstreet@kde.org.ar>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-14 02:46+0200\n"
-"PO-Revision-Date: 2013-06-14 00:47+0000\n"
+"POT-Creation-Date: 2013-07-05 02:12+0200\n"
+"PO-Revision-Date: 2013-07-05 00:13+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"
@@ -37,15 +38,15 @@ msgstr ""
 
 #: ajax/changeRecoveryPassword.php:49
 msgid "Password successfully changed."
-msgstr ""
+msgstr "La pasvorto sukcese ŝanĝiĝis."
 
 #: ajax/changeRecoveryPassword.php:51
 msgid "Could not change the password. Maybe the old password was not correct."
-msgstr ""
+msgstr "Ne eblis ŝanĝi la pasvorton. Eble la malnova pasvorto malĝustis."
 
 #: ajax/updatePrivateKeyPassword.php:51
 msgid "Private key password successfully updated."
-msgstr ""
+msgstr "La pasvorto de la malpublika klavo sukcese ĝisdatiĝis."
 
 #: ajax/updatePrivateKeyPassword.php:53
 msgid ""
@@ -55,9 +56,21 @@ msgstr ""
 
 #: files/error.php:7
 msgid ""
-"Your private key is not valid! Maybe your password was changed from outside."
-" You can update your private key password in your personal settings to "
-"regain access to your files"
+"Your private key is not valid! Likely your password was changed outside the "
+"ownCloud system (e.g. your corporate directory). You can update your private"
+" key password in your personal settings to recover access to your encrypted "
+"files."
+msgstr ""
+
+#: hooks/hooks.php:44
+msgid "Missing requirements."
+msgstr ""
+
+#: hooks/hooks.php:45
+msgid ""
+"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL "
+"PHP extension is enabled and configured properly. For now, the encryption "
+"app has been disabled."
 msgstr ""
 
 #: js/settings-admin.js:11
@@ -76,7 +89,7 @@ msgstr ""
 
 #: templates/invalid_private_key.php:7
 msgid "personal settings"
-msgstr ""
+msgstr "persona agordo"
 
 #: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
@@ -84,40 +97,40 @@ msgstr "Ĉifrado"
 
 #: templates/settings-admin.php:10
 msgid ""
-"Enable encryption passwords recovery key (allow sharing to recovery key):"
+"Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
 #: templates/settings-admin.php:14
-msgid "Recovery account password"
+msgid "Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:21 templates/settings-personal.php:54
 msgid "Enabled"
-msgstr ""
+msgstr "Kapabligita"
 
 #: templates/settings-admin.php:29 templates/settings-personal.php:62
 msgid "Disabled"
-msgstr ""
+msgstr "Malkapabligita"
 
 #: templates/settings-admin.php:34
-msgid "Change encryption passwords recovery key:"
+msgid "Change recovery key password:"
 msgstr ""
 
 #: templates/settings-admin.php:41
-msgid "Old Recovery account password"
+msgid "Old Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:48
-msgid "New Recovery account password"
+msgid "New Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:53
 msgid "Change Password"
-msgstr ""
+msgstr "Ŝarĝi pasvorton"
 
 #: templates/settings-personal.php:11
 msgid "Your private key password no longer match your log-in password:"
-msgstr ""
+msgstr "La pasvorto de via malpublika klavo ne plu kongruas kun via ensaluta pasvorto:"
 
 #: templates/settings-personal.php:14
 msgid "Set your old private key password to your current log-in password."
@@ -131,15 +144,15 @@ msgstr ""
 
 #: templates/settings-personal.php:24
 msgid "Old log-in password"
-msgstr ""
+msgstr "Malnova ensaluta pasvorto"
 
 #: templates/settings-personal.php:30
 msgid "Current log-in password"
-msgstr ""
+msgstr "Nuna ensaluta pasvorto"
 
 #: templates/settings-personal.php:35
 msgid "Update Private Key Password"
-msgstr ""
+msgstr "Äœisdatigi la pasvorton de la malpublika klavo"
 
 #: templates/settings-personal.php:45
 msgid "Enable password recovery:"
diff --git a/l10n/eo/files_external.po b/l10n/eo/files_external.po
index 464418613c1d1c84e4c215b05ee93388dd724c14..a8c6188b1b19ce54b43d21a1ab76796b8638486f 100644
--- a/l10n/eo/files_external.po
+++ b/l10n/eo/files_external.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/eo/files_sharing.po b/l10n/eo/files_sharing.po
index f3b0f2cc43ee74832390bd4d223be5bcd54da4ca..76dba249d27c8d228329ed6b75a32f97fddfe412 100644
--- a/l10n/eo/files_sharing.po
+++ b/l10n/eo/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
 "MIME-Version: 1.0\n"
@@ -18,27 +18,39 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: templates/authenticate.php:4
+msgid "The password is wrong. Try again."
+msgstr ""
+
+#: templates/authenticate.php:7
 msgid "Password"
 msgstr "Pasvorto"
 
-#: templates/authenticate.php:6
+#: templates/authenticate.php:9
 msgid "Submit"
 msgstr "Sendi"
 
-#: templates/public.php:10
+#: templates/public.php:17
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s kunhavigis la dosierujon %s kun vi"
 
-#: templates/public.php:13
+#: templates/public.php:20
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s kunhavigis la dosieron %s kun vi"
 
-#: templates/public.php:19 templates/public.php:43
+#: templates/public.php:28 templates/public.php:90
 msgid "Download"
 msgstr "Elŝuti"
 
-#: templates/public.php:40
+#: templates/public.php:45 templates/public.php:48
+msgid "Upload"
+msgstr "Alŝuti"
+
+#: templates/public.php:58
+msgid "Cancel upload"
+msgstr "Nuligi alŝuton"
+
+#: templates/public.php:87
 msgid "No preview available for"
 msgstr "Ne haveblas antaÅ­vido por"
diff --git a/l10n/eo/files_trashbin.po b/l10n/eo/files_trashbin.po
index 1290cd4fea1902a7262c7fd81ea0c4d65a461543..44451a299bbe2a5a87ab878ca95932711bb521ce 100644
--- a/l10n/eo/files_trashbin.po
+++ b/l10n/eo/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:16+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
 "MIME-Version: 1.0\n"
@@ -41,7 +41,7 @@ msgstr ""
 
 #: js/trash.js:123
 msgid "Delete permanently"
-msgstr ""
+msgstr "Forigi por ĉiam"
 
 #: js/trash.js:176 templates/index.php:17
 msgid "Name"
diff --git a/l10n/eo/lib.po b/l10n/eo/lib.po
index baa3b35bec5b88ede04a5d61041a9c035d9151c3..7ac554eb39a6d836f21221a1b7d254a7598a1d05 100644
--- a/l10n/eo/lib.po
+++ b/l10n/eo/lib.po
@@ -3,12 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Mariano <mstreet@kde.org.ar>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
 "MIME-Version: 1.0\n"
@@ -17,43 +18,47 @@ msgstr ""
 "Language: eo\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:359
+#: app.php:360
 msgid "Help"
 msgstr "Helpo"
 
-#: app.php:372
+#: app.php:373
 msgid "Personal"
 msgstr "Persona"
 
-#: app.php:383
+#: app.php:384
 msgid "Settings"
 msgstr "Agordo"
 
-#: app.php:395
+#: app.php:396
 msgid "Users"
 msgstr "Uzantoj"
 
-#: app.php:408
+#: app.php:409
 msgid "Apps"
 msgstr "Aplikaĵoj"
 
-#: app.php:416
+#: app.php:417
 msgid "Admin"
 msgstr "Administranto"
 
-#: files.php:210
+#: defaults.php:33
+msgid "web services under your control"
+msgstr "TTT-servoj regataj de vi"
+
+#: files.php:226
 msgid "ZIP download is turned off."
 msgstr "ZIP-elŝuto estas malkapabligita."
 
-#: files.php:211
+#: files.php:227
 msgid "Files need to be downloaded one by one."
 msgstr "Dosieroj devas elŝutiĝi unuope."
 
-#: files.php:212 files.php:245
+#: files.php:228 files.php:261
 msgid "Back to Files"
 msgstr "Reen al la dosieroj"
 
-#: files.php:242
+#: files.php:258
 msgid "Selected files too large to generate zip file."
 msgstr "La elektitaj dosieroj tro grandas por genero de ZIP-dosiero."
 
@@ -85,107 +90,105 @@ msgstr "Teksto"
 msgid "Images"
 msgstr "Bildoj"
 
-#: setup.php:34
-msgid "Set an admin username."
-msgstr ""
-
-#: setup.php:37
-msgid "Set an admin password."
-msgstr ""
-
-#: setup.php:55
+#: setup/abstractdatabase.php:22
 #, php-format
 msgid "%s enter the database username."
-msgstr ""
+msgstr "%s enigu la uzantonomon de la datumbazo."
 
-#: setup.php:58
+#: setup/abstractdatabase.php:25
 #, php-format
 msgid "%s enter the database name."
-msgstr ""
+msgstr "%s enigu la nomon de la datumbazo."
 
-#: setup.php:61
+#: setup/abstractdatabase.php:28
 #, php-format
 msgid "%s you may not use dots in the database name"
-msgstr ""
+msgstr "%s vi ne povas uzi punktojn en la nomo de la datumbazo"
 
-#: setup.php:64
+#: setup/mssql.php:20
 #, php-format
-msgid "%s set the database host."
-msgstr ""
-
-#: setup.php:126 setup.php:332 setup.php:377
-msgid "PostgreSQL username and/or password not valid"
-msgstr ""
+msgid "MS SQL username and/or password not valid: %s"
+msgstr "La uzantonomo de MS SQL aÅ­ la pasvorto ne validas: %s"
 
-#: setup.php:127 setup.php:235
+#: setup/mssql.php:21 setup/mysql.php:13 setup/oci.php:114
+#: setup/postgresql.php:24 setup/postgresql.php:70
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:152
-msgid "Oracle connection could not be established"
-msgstr ""
-
-#: setup.php:234
+#: setup/mysql.php:12
 msgid "MySQL username and/or password not valid"
-msgstr ""
+msgstr "La uzantonomo de MySQL aÅ­ la pasvorto ne validas"
 
-#: setup.php:288 setup.php:398 setup.php:407 setup.php:425 setup.php:435
-#: setup.php:444 setup.php:477 setup.php:543 setup.php:569 setup.php:576
-#: setup.php:587 setup.php:594 setup.php:603 setup.php:611 setup.php:620
-#: setup.php:626
+#: setup/mysql.php:67 setup/oci.php:54 setup/oci.php:121 setup/oci.php:147
+#: setup/oci.php:154 setup/oci.php:165 setup/oci.php:172 setup/oci.php:181
+#: setup/oci.php:189 setup/oci.php:198 setup/oci.php:204
+#: setup/postgresql.php:89 setup/postgresql.php:98 setup/postgresql.php:115
+#: setup/postgresql.php:125 setup/postgresql.php:134
 #, php-format
 msgid "DB Error: \"%s\""
-msgstr ""
+msgstr "Datumbaza eraro: “%s”"
 
-#: setup.php:289 setup.php:399 setup.php:408 setup.php:426 setup.php:436
-#: setup.php:445 setup.php:478 setup.php:544 setup.php:570 setup.php:577
-#: setup.php:588 setup.php:604 setup.php:612 setup.php:621
+#: setup/mysql.php:68 setup/oci.php:55 setup/oci.php:122 setup/oci.php:148
+#: setup/oci.php:155 setup/oci.php:166 setup/oci.php:182 setup/oci.php:190
+#: setup/oci.php:199 setup/postgresql.php:90 setup/postgresql.php:99
+#: setup/postgresql.php:116 setup/postgresql.php:126 setup/postgresql.php:135
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:305
+#: setup/mysql.php:85
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
-msgstr ""
+msgstr "La uzanto de MySQL “%s”@“localhost” jam ekzistas."
 
-#: setup.php:306
+#: setup/mysql.php:86
 msgid "Drop this user from MySQL"
-msgstr ""
+msgstr "Forigi ĉi tiun uzanton el MySQL"
 
-#: setup.php:311
+#: setup/mysql.php:91
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
-msgstr ""
+msgstr "La uzanto de MySQL “%s”@“%%” jam ekzistas"
 
-#: setup.php:312
+#: setup/mysql.php:92
 msgid "Drop this user from MySQL."
-msgstr ""
+msgstr "Forigi ĉi tiun uzanton el MySQL."
 
-#: setup.php:469 setup.php:536
+#: setup/oci.php:34
+msgid "Oracle connection could not be established"
+msgstr "Konekto al Oracle ne povas stariĝi"
+
+#: setup/oci.php:41 setup/oci.php:113
 msgid "Oracle username and/or password not valid"
-msgstr ""
+msgstr "La uzantonomo de Oracle aÅ­ la pasvorto ne validas"
 
-#: setup.php:595 setup.php:627
+#: setup/oci.php:173 setup/oci.php:205
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:647
-#, php-format
-msgid "MS SQL username and/or password not valid: %s"
-msgstr ""
+#: setup/postgresql.php:23 setup/postgresql.php:69
+msgid "PostgreSQL username and/or password not valid"
+msgstr "La uzantonomo de PostgreSQL aÅ­ la pasvorto ne validas"
+
+#: setup.php:42
+msgid "Set an admin username."
+msgstr "Starigi administran uzantonomon."
 
-#: setup.php:870
+#: setup.php:45
+msgid "Set an admin password."
+msgstr "Starigi administran pasvorton."
+
+#: setup.php:198
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
-msgstr ""
+msgstr "Via TTT-servilo ankoraŭ ne ĝuste agordiĝis por permesi sinkronigi dosierojn ĉar la WebDAV-interfaco ŝajnas rompita."
 
-#: setup.php:871
+#: setup.php:199
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
-msgstr ""
+msgstr "Bonvolu duoble kontroli la <a href='%s'>gvidilon por instalo</a>."
 
 #: template.php:113
 msgid "seconds ago"
diff --git a/l10n/eo/settings.po b/l10n/eo/settings.po
index 7573c48327c862525d06d96378a675be6f80f9b6..2a55c744e03e9627b9826e15c0192040d3c86c5a 100644
--- a/l10n/eo/settings.po
+++ b/l10n/eo/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
 "MIME-Version: 1.0\n"
@@ -88,35 +88,35 @@ msgstr "Ne eblis forigi la uzantan el la grupo %s"
 msgid "Couldn't update app."
 msgstr ""
 
-#: js/apps.js:30
+#: js/apps.js:35
 msgid "Update to {appversion}"
 msgstr ""
 
-#: js/apps.js:36 js/apps.js:76
+#: js/apps.js:41 js/apps.js:81
 msgid "Disable"
 msgstr "Malkapabligi"
 
-#: js/apps.js:36 js/apps.js:64 js/apps.js:83
+#: js/apps.js:41 js/apps.js:69 js/apps.js:88
 msgid "Enable"
 msgstr "Kapabligi"
 
-#: js/apps.js:55
+#: js/apps.js:60
 msgid "Please wait...."
 msgstr ""
 
-#: js/apps.js:59 js/apps.js:71 js/apps.js:80 js/apps.js:93
+#: js/apps.js:64 js/apps.js:76 js/apps.js:85 js/apps.js:98
 msgid "Error"
 msgstr "Eraro"
 
-#: js/apps.js:90
+#: js/apps.js:95
 msgid "Updating...."
 msgstr ""
 
-#: js/apps.js:93
+#: js/apps.js:98
 msgid "Error while updating app"
 msgstr ""
 
-#: js/apps.js:96
+#: js/apps.js:101
 msgid "Updated"
 msgstr ""
 
@@ -165,15 +165,15 @@ msgstr ""
 msgid "A valid password must be provided"
 msgstr ""
 
-#: personal.php:35 personal.php:36
+#: personal.php:37 personal.php:38
 msgid "__language_name__"
 msgstr "Esperanto"
 
-#: templates/admin.php:15
+#: templates/admin.php:17
 msgid "Security Warning"
 msgstr "Sekureca averto"
 
-#: templates/admin.php:18
+#: templates/admin.php:20
 msgid ""
 "Your data directory and your files are probably accessible from the "
 "internet. The .htaccess file that ownCloud provides is not working. We "
@@ -182,36 +182,36 @@ msgid ""
 " webserver document root."
 msgstr ""
 
-#: templates/admin.php:29
+#: templates/admin.php:31
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:32
+#: templates/admin.php:34
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
-msgstr ""
+msgstr "Via TTT-servilo ankoraŭ ne ĝuste agordiĝis por permesi sinkronigi dosierojn ĉar la WebDAV-interfaco ŝajnas rompita."
 
-#: templates/admin.php:33
+#: templates/admin.php:35
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
-msgstr ""
+msgstr "Bonvolu duoble kontroli la <a href='%s'>gvidilon por instalo</a>."
 
-#: templates/admin.php:44
+#: templates/admin.php:46
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:47
+#: templates/admin.php:49
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr ""
 
-#: templates/admin.php:58
+#: templates/admin.php:60
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:63
+#: templates/admin.php:65
 #, php-format
 msgid ""
 "This ownCloud server can't set system locale to %s. This means that there "
@@ -219,11 +219,11 @@ msgid ""
 " to install the required packages on your system to support %s."
 msgstr ""
 
-#: templates/admin.php:75
+#: templates/admin.php:77
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:78
+#: templates/admin.php:80
 msgid ""
 "This ownCloud server has no working internet connection. This means that "
 "some of the features like mounting of external storage, notifications about "
@@ -233,102 +233,102 @@ msgid ""
 " of ownCloud."
 msgstr ""
 
-#: templates/admin.php:92
+#: templates/admin.php:94
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:101
+#: templates/admin.php:103
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:111
+#: templates/admin.php:113
 msgid ""
 "cron.php is registered at a webcron service. Call the cron.php page in the "
 "owncloud root once a minute over http."
 msgstr ""
 
-#: templates/admin.php:121
+#: templates/admin.php:123
 msgid ""
 "Use systems cron service. Call the cron.php file in the owncloud folder via "
 "a system cronjob once a minute."
 msgstr ""
 
-#: templates/admin.php:128
+#: templates/admin.php:130
 msgid "Sharing"
 msgstr "Kunhavigo"
 
-#: templates/admin.php:134
+#: templates/admin.php:136
 msgid "Enable Share API"
 msgstr "Kapabligi API-on por Kunhavigo"
 
-#: templates/admin.php:135
+#: templates/admin.php:137
 msgid "Allow apps to use the Share API"
 msgstr "Kapabligi aplikaĵojn uzi la API-on pri Kunhavigo"
 
-#: templates/admin.php:142
+#: templates/admin.php:144
 msgid "Allow links"
 msgstr "Kapabligi ligilojn"
 
-#: templates/admin.php:143
+#: templates/admin.php:145
 msgid "Allow users to share items to the public with links"
 msgstr "Kapabligi uzantojn kunhavigi erojn kun la publiko perligile"
 
-#: templates/admin.php:150
+#: templates/admin.php:152
 msgid "Allow resharing"
 msgstr "Kapabligi rekunhavigon"
 
-#: templates/admin.php:151
+#: templates/admin.php:153
 msgid "Allow users to share items shared with them again"
 msgstr "Kapabligi uzantojn rekunhavigi erojn kunhavigitajn kun ili"
 
-#: templates/admin.php:158
+#: templates/admin.php:160
 msgid "Allow users to share with anyone"
 msgstr "Kapabligi uzantojn kunhavigi kun ĉiu ajn"
 
-#: templates/admin.php:161
+#: templates/admin.php:163
 msgid "Allow users to only share with users in their groups"
 msgstr "Kapabligi uzantojn nur kunhavigi kun uzantoj el siaj grupoj"
 
-#: templates/admin.php:168
+#: templates/admin.php:170
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:181
+#: templates/admin.php:183
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:182
+#: templates/admin.php:184
 msgid ""
 "Enforces the clients to connect to ownCloud via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:185
+#: templates/admin.php:187
 msgid ""
 "Please connect to this ownCloud instance via HTTPS to enable or disable the "
 "SSL enforcement."
 msgstr ""
 
-#: templates/admin.php:195
+#: templates/admin.php:197
 msgid "Log"
 msgstr "Protokolo"
 
-#: templates/admin.php:196
+#: templates/admin.php:198
 msgid "Log level"
 msgstr "Registronivelo"
 
-#: templates/admin.php:227
+#: templates/admin.php:229
 msgid "More"
 msgstr "Pli"
 
-#: templates/admin.php:228
+#: templates/admin.php:230
 msgid "Less"
 msgstr "Malpli"
 
-#: templates/admin.php:235 templates/personal.php:116
+#: templates/admin.php:236 templates/personal.php:116
 msgid "Version"
 msgstr "Eldono"
 
-#: templates/admin.php:237 templates/personal.php:119
+#: templates/admin.php:240 templates/personal.php:119
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -386,76 +386,79 @@ msgstr "Cimoraportejo"
 msgid "Commercial Support"
 msgstr "Komerca subteno"
 
-#: templates/personal.php:9
+#: templates/personal.php:10
 msgid "Get the apps to sync your files"
-msgstr ""
+msgstr "Ekhavu la aplikaĵojn por sinkronigi viajn dosierojn"
 
-#: templates/personal.php:20
+#: templates/personal.php:21
 msgid "Show First Run Wizard again"
 msgstr ""
 
-#: templates/personal.php:28
+#: templates/personal.php:29
 #, php-format
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "Vi uzas <strong>%s</strong> el la haveblaj <strong>%s</strong>"
 
-#: templates/personal.php:40 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:41 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "Pasvorto"
 
-#: templates/personal.php:41
+#: templates/personal.php:42
 msgid "Your password was changed"
 msgstr "Via pasvorto ŝanĝiĝis"
 
-#: templates/personal.php:42
+#: templates/personal.php:43
 msgid "Unable to change your password"
 msgstr "Ne eblis ŝanĝi vian pasvorton"
 
-#: templates/personal.php:43
+#: templates/personal.php:44
 msgid "Current password"
 msgstr "Nuna pasvorto"
 
-#: templates/personal.php:45
+#: templates/personal.php:46
 msgid "New password"
 msgstr "Nova pasvorto"
 
-#: templates/personal.php:47
+#: templates/personal.php:48
 msgid "Change password"
 msgstr "Ŝanĝi la pasvorton"
 
-#: templates/personal.php:59 templates/users.php:85
+#: templates/personal.php:60 templates/users.php:85
 msgid "Display Name"
 msgstr ""
 
-#: templates/personal.php:74
+#: templates/personal.php:75
 msgid "Email"
 msgstr "Retpoŝto"
 
-#: templates/personal.php:76
+#: templates/personal.php:77
 msgid "Your email address"
 msgstr "Via retpoŝta adreso"
 
-#: templates/personal.php:77
+#: templates/personal.php:78
 msgid "Fill in an email address to enable password recovery"
 msgstr "Enigu retpoŝtadreson por kapabligi pasvortan restaŭron"
 
-#: templates/personal.php:86 templates/personal.php:87
+#: templates/personal.php:87 templates/personal.php:88
 msgid "Language"
 msgstr "Lingvo"
 
-#: templates/personal.php:99
+#: templates/personal.php:100
 msgid "Help translate"
 msgstr "Helpu traduki"
 
-#: templates/personal.php:105
+#: templates/personal.php:106
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:107
-msgid "Use this address to connect to your ownCloud in your file manager"
-msgstr "Uzu ĉi tiun adreson por konekti al via ownCloud vian dosieradministrilon"
+#: templates/personal.php:108
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
+"target=\"_blank\">access your Files via WebDAV</a>"
+msgstr ""
 
-#: templates/users.php:21 templates/users.php:84
+#: templates/users.php:21
 msgid "Login Name"
 msgstr ""
 
@@ -485,6 +488,10 @@ msgstr "Senlima"
 msgid "Other"
 msgstr "Alia"
 
+#: templates/users.php:84
+msgid "Username"
+msgstr "Uzantonomo"
+
 #: templates/users.php:91
 msgid "Storage"
 msgstr "Konservejo"
diff --git a/l10n/eo/user_ldap.po b/l10n/eo/user_ldap.po
index a6a3bea93f2fb6c6942e26b00675c78da93ae64f..4488159bc1b21a53df31c510953d9d2344e8a5f9 100644
--- a/l10n/eo/user_ldap.po
+++ b/l10n/eo/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:16+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/es/core.po b/l10n/es/core.po
index d00c3ea8ff6014c8bff29aa5fc960d0558d9e462..b83e0fc365914eadbc0d32784b0aeedfeec97fc6 100644
--- a/l10n/es/core.po
+++ b/l10n/es/core.po
@@ -3,18 +3,20 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Art O. Pal <artopal@fastmail.fm>, 2013
 # ggam <ggam@brainleakage.com>, 2013
 # msoko <sokolovitch@yahoo.com>, 2013
-# saskarip, 2013
+# saskarip <saskarip@gmail.com>, 2013
+# saskarip <saskarip@gmail.com>, 2013
 # iGerli <stefano@aerosoles.net>, 2013
 # xhiena <xhiena@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:22+0000\n"
-"Last-Translator: saskarip\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -66,135 +68,135 @@ msgstr "No hay categorías seleccionadas para borrar."
 msgid "Error removing %s from favorites."
 msgstr "Error eliminando %s de los favoritos."
 
-#: js/config.php:34
+#: js/config.php:32
 msgid "Sunday"
 msgstr "Domingo"
 
-#: js/config.php:35
+#: js/config.php:33
 msgid "Monday"
 msgstr "Lunes"
 
-#: js/config.php:36
+#: js/config.php:34
 msgid "Tuesday"
 msgstr "Martes"
 
-#: js/config.php:37
+#: js/config.php:35
 msgid "Wednesday"
 msgstr "Miércoles"
 
-#: js/config.php:38
+#: js/config.php:36
 msgid "Thursday"
 msgstr "Jueves"
 
-#: js/config.php:39
+#: js/config.php:37
 msgid "Friday"
 msgstr "Viernes"
 
-#: js/config.php:40
+#: js/config.php:38
 msgid "Saturday"
 msgstr "Sábado"
 
-#: js/config.php:45
+#: js/config.php:43
 msgid "January"
 msgstr "Enero"
 
-#: js/config.php:46
+#: js/config.php:44
 msgid "February"
 msgstr "Febrero"
 
-#: js/config.php:47
+#: js/config.php:45
 msgid "March"
 msgstr "Marzo"
 
-#: js/config.php:48
+#: js/config.php:46
 msgid "April"
 msgstr "Abril"
 
-#: js/config.php:49
+#: js/config.php:47
 msgid "May"
 msgstr "Mayo"
 
-#: js/config.php:50
+#: js/config.php:48
 msgid "June"
 msgstr "Junio"
 
-#: js/config.php:51
+#: js/config.php:49
 msgid "July"
 msgstr "Julio"
 
-#: js/config.php:52
+#: js/config.php:50
 msgid "August"
 msgstr "Agosto"
 
-#: js/config.php:53
+#: js/config.php:51
 msgid "September"
 msgstr "Septiembre"
 
-#: js/config.php:54
+#: js/config.php:52
 msgid "October"
 msgstr "Octubre"
 
-#: js/config.php:55
+#: js/config.php:53
 msgid "November"
 msgstr "Noviembre"
 
-#: js/config.php:56
+#: js/config.php:54
 msgid "December"
 msgstr "Diciembre"
 
-#: js/js.js:286
+#: js/js.js:293
 msgid "Settings"
 msgstr "Ajustes"
 
-#: js/js.js:718
+#: js/js.js:725
 msgid "seconds ago"
 msgstr "hace segundos"
 
-#: js/js.js:719
+#: js/js.js:726
 msgid "1 minute ago"
 msgstr "hace 1 minuto"
 
-#: js/js.js:720
+#: js/js.js:727
 msgid "{minutes} minutes ago"
 msgstr "hace {minutes} minutos"
 
-#: js/js.js:721
+#: js/js.js:728
 msgid "1 hour ago"
 msgstr "Hace 1 hora"
 
-#: js/js.js:722
+#: js/js.js:729
 msgid "{hours} hours ago"
 msgstr "Hace {hours} horas"
 
-#: js/js.js:723
+#: js/js.js:730
 msgid "today"
 msgstr "hoy"
 
-#: js/js.js:724
+#: js/js.js:731
 msgid "yesterday"
 msgstr "ayer"
 
-#: js/js.js:725
+#: js/js.js:732
 msgid "{days} days ago"
 msgstr "hace {days} días"
 
-#: js/js.js:726
+#: js/js.js:733
 msgid "last month"
 msgstr "el mes pasado"
 
-#: js/js.js:727
+#: js/js.js:734
 msgid "{months} months ago"
 msgstr "Hace {months} meses"
 
-#: js/js.js:728
+#: js/js.js:735
 msgid "months ago"
 msgstr "hace meses"
 
-#: js/js.js:729
+#: js/js.js:736
 msgid "last year"
 msgstr "el año pasado"
 
-#: js/js.js:730
+#: js/js.js:737
 msgid "years ago"
 msgstr "hace años"
 
@@ -230,8 +232,8 @@ msgstr "El tipo de objeto no está especificado."
 #: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
 #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:577
-#: js/share.js:589
+#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:620
+#: js/share.js:632
 msgid "Error"
 msgstr "Error"
 
@@ -251,17 +253,17 @@ msgstr "Compartido"
 msgid "Share"
 msgstr "Compartir"
 
-#: js/share.js:125 js/share.js:617
+#: js/share.js:125 js/share.js:660
 msgid "Error while sharing"
-msgstr "Error compartiendo"
+msgstr "Error mientras comparte"
 
 #: js/share.js:136
 msgid "Error while unsharing"
-msgstr "Error descompartiendo"
+msgstr "Error mientras se deja de compartir"
 
 #: js/share.js:143
 msgid "Error while changing permissions"
-msgstr "Error cambiando permisos"
+msgstr "Error mientras se cambia permisos"
 
 #: js/share.js:152
 msgid "Shared with you and the group {group} by {owner}"
@@ -271,99 +273,103 @@ msgstr "Compartido contigo y el grupo {group} por {owner}"
 msgid "Shared with you by {owner}"
 msgstr "Compartido contigo por {owner}"
 
-#: js/share.js:159
+#: js/share.js:172
 msgid "Share with"
 msgstr "Compartir con"
 
-#: js/share.js:164
+#: js/share.js:177
 msgid "Share with link"
 msgstr "Compartir con enlace"
 
-#: js/share.js:167
+#: js/share.js:180
 msgid "Password protect"
-msgstr "Protegido por contraseña"
+msgstr "Protección con contraseña"
 
-#: js/share.js:169 templates/installation.php:54 templates/login.php:26
+#: js/share.js:182 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "Contraseña"
 
-#: js/share.js:173
+#: js/share.js:187
+msgid "Allow Public Upload"
+msgstr "Permitir Subida Pública"
+
+#: js/share.js:191
 msgid "Email link to person"
-msgstr "Enviar un enlace por correo electrónico a una persona"
+msgstr "Enviar enlace por correo electrónico a una persona"
 
-#: js/share.js:174
+#: js/share.js:192
 msgid "Send"
 msgstr "Enviar"
 
-#: js/share.js:178
+#: js/share.js:197
 msgid "Set expiration date"
 msgstr "Establecer fecha de caducidad"
 
-#: js/share.js:179
+#: js/share.js:198
 msgid "Expiration date"
 msgstr "Fecha de caducidad"
 
-#: js/share.js:211
+#: js/share.js:230
 msgid "Share via email:"
-msgstr "Compartido por correo electrónico:"
+msgstr "Compartir por correo electrónico:"
 
-#: js/share.js:213
+#: js/share.js:232
 msgid "No people found"
 msgstr "No se encontró gente"
 
-#: js/share.js:251
+#: js/share.js:270
 msgid "Resharing is not allowed"
 msgstr "No se permite compartir de nuevo"
 
-#: js/share.js:287
+#: js/share.js:306
 msgid "Shared in {item} with {user}"
 msgstr "Compartido en {item} con {user}"
 
-#: js/share.js:308
+#: js/share.js:327
 msgid "Unshare"
 msgstr "Dejar de compartir"
 
-#: js/share.js:320
+#: js/share.js:339
 msgid "can edit"
 msgstr "puede editar"
 
-#: js/share.js:322
+#: js/share.js:341
 msgid "access control"
 msgstr "control de acceso"
 
-#: js/share.js:325
+#: js/share.js:344
 msgid "create"
 msgstr "crear"
 
-#: js/share.js:328
+#: js/share.js:347
 msgid "update"
 msgstr "actualizar"
 
-#: js/share.js:331
+#: js/share.js:350
 msgid "delete"
 msgstr "eliminar"
 
-#: js/share.js:334
+#: js/share.js:353
 msgid "share"
 msgstr "compartir"
 
-#: js/share.js:368 js/share.js:564
+#: js/share.js:387 js/share.js:607
 msgid "Password protected"
-msgstr "Protegido por contraseña"
+msgstr "Protegido con contraseña"
 
-#: js/share.js:577
+#: js/share.js:620
 msgid "Error unsetting expiration date"
-msgstr "Error al eliminar la fecha de caducidad"
+msgstr "Error eliminando fecha de caducidad"
 
-#: js/share.js:589
+#: js/share.js:632
 msgid "Error setting expiration date"
 msgstr "Error estableciendo fecha de caducidad"
 
-#: js/share.js:604
+#: js/share.js:647
 msgid "Sending ..."
 msgstr "Enviando..."
 
-#: js/share.js:615
+#: js/share.js:658
 msgid "Email sent"
 msgstr "Correo electrónico enviado"
 
@@ -378,13 +384,13 @@ msgstr "La actualización ha fracasado. Por favor, informe de este problema a la
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "La actualización se ha realizado con éxito. Redireccionando a ownCloud ahora."
 
-#: lostpassword/controller.php:58
+#: lostpassword/controller.php:60
 msgid "ownCloud password reset"
 msgstr "Reseteo contraseña de ownCloud"
 
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
-msgstr "Utilice el siguiente enlace para restablecer tu contraseña: {link}"
+msgstr "Utilice el siguiente enlace para restablecer su contraseña: {link}"
 
 #: lostpassword/templates/lostpassword.php:4
 msgid ""
@@ -408,23 +414,23 @@ msgstr "Nombre de usuario"
 
 #: lostpassword/templates/lostpassword.php:22
 msgid ""
-"Your files seems to be encrypted. If you didn't have enabled the recovery "
-"key there will be no way to get your data back once the password was "
-"resetted. If you are not sure what to do, please contact your administrator "
-"first before continue. Do you really want to continue?"
-msgstr "Sus archivos parecen estar encriptados. Si no ha habilitado la clave de recurperación, no habrá ninguna manera de recuperar sus datos hasta que la contraseña sea reseteada. Si no está seguro de qué hacer, por favor contacte con su administrador antes de continuar. ¿Desea realmente continuar?"
+"Your files are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
+msgstr "Sus archivos están cifrados. Si no ha habilitado la clave de recurperación, no habrá forma de recuperar sus datos luego de que la contraseña sea reseteada. Si no está seguro de qué hacer, contacte a su administrador antes de continuar. ¿Realmente desea continuar?"
 
 #: lostpassword/templates/lostpassword.php:24
 msgid "Yes, I really want to reset my password now"
 msgstr "Sí. Realmente deseo resetear mi contraseña ahora"
 
-#: lostpassword/templates/lostpassword.php:29
+#: lostpassword/templates/lostpassword.php:27
 msgid "Request reset"
 msgstr "Solicitar restablecimiento"
 
 #: lostpassword/templates/resetpassword.php:4
 msgid "Your password was reset"
-msgstr "Su contraseña ha sido establecida"
+msgstr "Su contraseña fue restablecida"
 
 #: lostpassword/templates/resetpassword.php:5
 msgid "To login page"
@@ -464,9 +470,9 @@ msgstr "Acceso prohibido"
 
 #: templates/404.php:12
 msgid "Cloud not found"
-msgstr "No se ha encuentra la nube"
+msgstr "No se encuentra la nube"
 
-#: templates/altmail.php:2
+#: templates/altmail.php:4
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -477,10 +483,6 @@ msgid ""
 "Cheers!"
 msgstr "Oye,⏎ sólo te hago saber que %s compartido %s contigo.⏎ Míralo: %s ⏎Disfrutalo!"
 
-#: templates/altmail.php:7 templates/mail.php:24
-msgid "web services under your control"
-msgstr "Servicios web bajo su control"
-
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
 msgstr "Editar categorías"
@@ -573,12 +575,12 @@ msgstr "Host de la base de datos"
 msgid "Finish setup"
 msgstr "Completar la instalación"
 
-#: templates/layout.user.php:40
+#: templates/layout.user.php:43
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr "%s esta disponible. Obtener mas información de como actualizar."
 
-#: templates/layout.user.php:67
+#: templates/layout.user.php:68
 msgid "Log out"
 msgstr "Salir"
 
@@ -612,7 +614,7 @@ msgstr "Entrar"
 msgid "Alternative Logins"
 msgstr "Inicios de sesión alternativos"
 
-#: templates/mail.php:15
+#: templates/mail.php:16
 #, php-format
 msgid ""
 "Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
diff --git a/l10n/es/files.po b/l10n/es/files.po
index 6c27b6b67f39a9ea202342e74171e7c8bb0eaabf..c56a43ad270f633fa35e661e0e8c82f7e6d31054 100644
--- a/l10n/es/files.po
+++ b/l10n/es/files.po
@@ -5,13 +5,15 @@
 # Translators:
 # Art O. Pal <artopal@fastmail.fm>, 2013
 # ggam <ggam@brainleakage.com>, 2013
+# mikelanabitarte <mikelanabitarte@gmail.com>, 2013
+# saskarip <saskarip@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:01+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
-"Last-Translator: Art O. Pal <artopal@fastmail.fm>\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
+"Last-Translator: mikelanabitarte <mikelanabitarte@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"
@@ -22,60 +24,98 @@ msgstr ""
 #: ajax/move.php:17
 #, php-format
 msgid "Could not move %s - File with this name already exists"
-msgstr "No se puede mover %s - Ya existe un archivo con ese nombre"
+msgstr "No se pudo mover %s - Un archivo con ese nombre ya existe."
 
 #: ajax/move.php:27 ajax/move.php:30
 #, php-format
 msgid "Could not move %s"
-msgstr "No se puede mover %s"
+msgstr "No se pudo mover %s"
 
-#: ajax/upload.php:19
+#: ajax/upload.php:16 ajax/upload.php:45
+msgid "Unable to set upload directory."
+msgstr "Incapaz de crear directorio de subida."
+
+#: ajax/upload.php:22
+msgid "Invalid Token"
+msgstr "Token Inválido"
+
+#: ajax/upload.php:59
 msgid "No file was uploaded. Unknown error"
 msgstr "No se subió ningún archivo. Error desconocido"
 
-#: ajax/upload.php:26
+#: ajax/upload.php:66
 msgid "There is no error, the file uploaded with success"
 msgstr "No hay ningún error, el archivo se ha subido con éxito"
 
-#: ajax/upload.php:27
+#: ajax/upload.php:67
 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"
+msgstr "El archivo subido sobrepasa la directiva upload_max_filesize en php.ini"
 
-#: ajax/upload.php:29
+#: ajax/upload.php:69
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "El archivo subido sobrepasa la directiva MAX_FILE_SIZE especificada en el formulario HTML"
 
-#: ajax/upload.php:30
+#: ajax/upload.php:70
 msgid "The uploaded file was only partially uploaded"
-msgstr "El archivo se ha subido parcialmente"
+msgstr "El archivo subido fue sólo subido parcialmente"
 
-#: ajax/upload.php:31
+#: ajax/upload.php:71
 msgid "No file was uploaded"
-msgstr "No se ha subido ningún archivo"
+msgstr "No se subió ningún archivo"
 
-#: ajax/upload.php:32
+#: ajax/upload.php:72
 msgid "Missing a temporary folder"
 msgstr "Falta la carpeta temporal"
 
-#: ajax/upload.php:33
+#: ajax/upload.php:73
 msgid "Failed to write to disk"
-msgstr "La escritura en disco ha fallado"
+msgstr "Falló al escribir al disco"
 
-#: ajax/upload.php:51
+#: ajax/upload.php:91
 msgid "Not enough storage available"
 msgstr "No hay suficiente espacio disponible"
 
-#: ajax/upload.php:83
+#: ajax/upload.php:123
 msgid "Invalid directory."
-msgstr "Directorio invalido."
+msgstr "Directorio inválido."
 
 #: appinfo/app.php:12
 msgid "Files"
 msgstr "Archivos"
 
+#: js/file-upload.js:11
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr "Incapaz de subir su archivo, es un directorio o tiene 0 bytes"
+
+#: js/file-upload.js:24
+msgid "Not enough space available"
+msgstr "No hay suficiente espacio disponible"
+
+#: js/file-upload.js:64
+msgid "Upload cancelled."
+msgstr "Subida cancelada."
+
+#: js/file-upload.js:167 js/files.js:266
+msgid ""
+"File upload is in progress. Leaving the page now will cancel the upload."
+msgstr "La subida del archivo está en proceso. Si sale de la página ahora cancelará la subida."
+
+#: js/file-upload.js:233 js/files.js:339
+msgid "URL cannot be empty."
+msgstr "La URL no puede estar vacía."
+
+#: js/file-upload.js:238 lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr "Nombre de carpeta invalido. El uso de \"Shared\" está reservado por ownCloud"
+
+#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
+#: js/files.js:693 js/files.js:731
+msgid "Error"
+msgstr "Error"
+
 #: js/fileactions.js:116
 msgid "Share"
 msgstr "Compartir"
@@ -92,43 +132,43 @@ msgstr "Eliminar"
 msgid "Rename"
 msgstr "Renombrar"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:464
 msgid "Pending"
-msgstr "Pendientes"
+msgstr "Pendiente"
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "{new_name} already exists"
 msgstr "{new_name} ya existe"
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "replace"
 msgstr "reemplazar"
 
-#: js/filelist.js:259
+#: js/filelist.js:302
 msgid "suggest name"
 msgstr "sugerir nombre"
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "cancel"
 msgstr "cancelar"
 
-#: js/filelist.js:306
+#: js/filelist.js:349
 msgid "replaced {new_name} with {old_name}"
 msgstr "reemplazado {new_name} con {old_name}"
 
-#: js/filelist.js:306
+#: js/filelist.js:349
 msgid "undo"
 msgstr "deshacer"
 
-#: js/filelist.js:331
+#: js/filelist.js:374
 msgid "perform delete operation"
-msgstr "Eliminar"
+msgstr "Realizar operación de borrado"
 
-#: js/filelist.js:413
+#: js/filelist.js:456
 msgid "1 file uploading"
 msgstr "subiendo 1 archivo"
 
-#: js/filelist.js:416 js/filelist.js:470
+#: js/filelist.js:459 js/filelist.js:517
 msgid "files uploading"
 msgstr "subiendo archivos"
 
@@ -148,7 +188,7 @@ msgstr "Nombre Invalido, \"\\\", \"/\", \"<\", \">\", \":\", \"\", \"|\" \"?\" y
 
 #: js/files.js:78
 msgid "Your storage is full, files can not be updated or synced anymore!"
-msgstr "Su almacenamiento está lleno, ¡no se pueden actualizar ni sincronizar archivos!"
+msgstr "Su almacenamiento está lleno, ¡no se pueden actualizar o sincronizar más!"
 
 #: js/files.js:82
 msgid "Your storage is almost full ({usedSpacePercent}%)"
@@ -158,72 +198,44 @@ msgstr "Su almacenamiento está casi lleno ({usedSpacePercent}%)"
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
-msgstr "Su descarga está siendo preparada. Esto puede tardar algún tiempo si los archivos son muy grandes."
-
-#: js/files.js:264
-msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "Imposible subir su archivo, es un directorio o tiene 0 bytes"
-
-#: js/files.js:277
-msgid "Not enough space available"
-msgstr "No hay suficiente espacio disponible"
-
-#: js/files.js:317
-msgid "Upload cancelled."
-msgstr "Subida cancelada."
-
-#: js/files.js:413
-msgid ""
-"File upload is in progress. Leaving the page now will cancel the upload."
-msgstr "La subida del archivo está en proceso. Si sale de la página ahora, se cancelará la subida."
+msgstr "Su descarga está siendo preparada. Esto puede tardar algún tiempo si los archivos son grandes."
 
-#: js/files.js:486
-msgid "URL cannot be empty."
-msgstr "La URL no puede estar vacía."
-
-#: js/files.js:491
+#: js/files.js:344
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
-msgstr "El nombre de carpeta no es válido. El uso de \"Shared\" está reservado para Owncloud"
-
-#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
-msgid "Error"
-msgstr "Error"
+msgstr "Nombre de carpeta no es válido. El uso de \"Shared\" está reservado por Owncloud"
 
-#: js/files.js:877 templates/index.php:69
+#: js/files.js:744 templates/index.php:69
 msgid "Name"
 msgstr "Nombre"
 
-#: js/files.js:878 templates/index.php:80
+#: js/files.js:745 templates/index.php:80
 msgid "Size"
 msgstr "Tamaño"
 
-#: js/files.js:879 templates/index.php:82
+#: js/files.js:746 templates/index.php:82
 msgid "Modified"
 msgstr "Modificado"
 
-#: js/files.js:898
+#: js/files.js:765
 msgid "1 folder"
 msgstr "1 carpeta"
 
-#: js/files.js:900
+#: js/files.js:767
 msgid "{count} folders"
 msgstr "{count} carpetas"
 
-#: js/files.js:908
+#: js/files.js:775
 msgid "1 file"
 msgstr "1 archivo"
 
-#: js/files.js:910
+#: js/files.js:777
 msgid "{count} files"
 msgstr "{count} archivos"
 
-#: lib/app.php:53
-msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
-msgstr "Nombre de carpeta invalido. El uso de \"Shared\" esta reservado para ownCloud"
-
 #: lib/app.php:73
-msgid "Unable to rename file"
-msgstr "No se puede renombrar el archivo"
+#, php-format
+msgid "%s could not be renamed"
+msgstr "%s no se pudo renombrar"
 
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
@@ -231,7 +243,7 @@ msgstr "Subir"
 
 #: templates/admin.php:5
 msgid "File handling"
-msgstr "Tratamiento de archivos"
+msgstr "Manejo de archivos"
 
 #: templates/admin.php:7
 msgid "Maximum upload size"
@@ -243,7 +255,7 @@ msgstr "máx. posible:"
 
 #: templates/admin.php:15
 msgid "Needed for multi-file and folder downloads."
-msgstr "Se necesita para descargas multi-archivo y de carpetas"
+msgstr "Necesario para multi-archivo y descarga de carpetas"
 
 #: templates/admin.php:17
 msgid "Enable ZIP-download"
@@ -275,7 +287,7 @@ msgstr "Carpeta"
 
 #: templates/index.php:14
 msgid "From link"
-msgstr "Desde el enlace"
+msgstr "Desde enlace"
 
 #: templates/index.php:42
 msgid "Deleted files"
@@ -287,11 +299,11 @@ msgstr "Cancelar subida"
 
 #: templates/index.php:54
 msgid "You don’t have write permissions here."
-msgstr "No tienes permisos para escribir aquí."
+msgstr "No tiene permisos de escritura aquí."
 
 #: templates/index.php:61
 msgid "Nothing in here. Upload something!"
-msgstr "Aquí no hay nada. ¡Sube algo!"
+msgstr "No hay nada aquí. ¡Suba algo!"
 
 #: templates/index.php:75
 msgid "Download"
@@ -309,16 +321,32 @@ msgstr "Subida demasido grande"
 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."
+msgstr "Los archivos que estás intentando subir sobrepasan el tamaño máximo permitido en este servidor."
 
 #: templates/index.php:114
 msgid "Files are being scanned, please wait."
-msgstr "Se están escaneando los archivos, por favor espere."
+msgstr "Los archivos están siendo escaneados,  por favor espere."
 
 #: templates/index.php:117
 msgid "Current scanning"
 msgstr "Escaneo actual"
 
+#: templates/part.list.php:76
+msgid "directory"
+msgstr "carpeta"
+
+#: templates/part.list.php:78
+msgid "directories"
+msgstr "carpetas"
+
+#: templates/part.list.php:87
+msgid "file"
+msgstr "archivo"
+
+#: templates/part.list.php:89
+msgid "files"
+msgstr "archivos"
+
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
 msgstr "Actualizando caché del sistema de archivos"
diff --git a/l10n/es/files_encryption.po b/l10n/es/files_encryption.po
index 22d85a2f2c6bf801c7e8ea9e770f4a8a26959001..fbcbc4e2fe14e1fdd3331de0a4b13389c02375e4 100644
--- a/l10n/es/files_encryption.po
+++ b/l10n/es/files_encryption.po
@@ -3,15 +3,20 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# asaez <asaez@asaez.eu>, 2013
 # gmoriello <gmoriello@gmail.com>, 2013
-# saskarip, 2013
+# mikelanabitarte <mikelanabitarte@gmail.com>, 2013
+# Korrosivo <yo@rubendelcampo.es>, 2013
+# saskarip <saskarip@gmail.com>, 2013
+# William Díaz <wdiazux@gmail.com>, 2013
+# xhiena <xhiena@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 08:20+0000\n"
-"Last-Translator: saskarip\n"
+"POT-Creation-Date: 2013-07-08 02:02+0200\n"
+"PO-Revision-Date: 2013-07-07 07:50+0000\n"
+"Last-Translator: Korrosivo <yo@rubendelcampo.es>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -53,14 +58,26 @@ msgstr "Contraseña de clave privada actualizada con éxito."
 msgid ""
 "Could not update the private key password. Maybe the old password was not "
 "correct."
-msgstr ""
+msgstr "No se pudo cambiar la contraseña. Puede que la contraseña antigua no sea correcta."
 
 #: files/error.php:7
 msgid ""
-"Your private key is not valid! Maybe your password was changed from outside."
-" You can update your private key password in your personal settings to "
-"regain access to your files"
-msgstr ""
+"Your private key is not valid! Likely your password was changed outside the "
+"ownCloud system (e.g. your corporate directory). You can update your private"
+" key password in your personal settings to recover access to your encrypted "
+"files."
+msgstr "¡Su clave privada no es válida! Tal vez su contraseña ha sido cambiada desde fuera. Puede actualizar su clave privada en sus opciones personales para recuperar el acceso a sus ficheros."
+
+#: hooks/hooks.php:44
+msgid "Missing requirements."
+msgstr "Requisitos incompletos."
+
+#: hooks/hooks.php:45
+msgid ""
+"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL "
+"PHP extension is enabled and configured properly. For now, the encryption "
+"app has been disabled."
+msgstr "Por favor, asegúrese de que PHP 5.3.3 o posterior está instalado y que la extensión OpenSSL de PHP está habilitada y configurada correctamente. Por el momento, la aplicación de cifrado ha sido deshabilitada."
 
 #: js/settings-admin.js:11
 msgid "Saving..."
@@ -70,15 +87,15 @@ msgstr "Guardando..."
 msgid ""
 "Your private key is not valid! Maybe the your password was changed from "
 "outside."
-msgstr ""
+msgstr "¡Su clave privada no es válida! Tal vez su contraseña ha sido cambiada desde fuera."
 
 #: templates/invalid_private_key.php:7
 msgid "You can unlock your private key in your "
-msgstr ""
+msgstr "Puede desbloquear su clave privada en su"
 
 #: templates/invalid_private_key.php:7
 msgid "personal settings"
-msgstr ""
+msgstr "opciones personales"
 
 #: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
@@ -86,12 +103,12 @@ msgstr "Cifrado"
 
 #: templates/settings-admin.php:10
 msgid ""
-"Enable encryption passwords recovery key (allow sharing to recovery key):"
-msgstr "Habilitar clave de recuperación de contraseñas ():"
+"Enable recovery key (allow to recover users files in case of password loss):"
+msgstr "Habilitar la clave de recuperación (permite recuperar los ficheros del usuario en caso de pérdida de la contraseña);"
 
 #: templates/settings-admin.php:14
-msgid "Recovery account password"
-msgstr "Recuperar contraseña"
+msgid "Recovery key password"
+msgstr "Contraseña de clave de recuperación"
 
 #: templates/settings-admin.php:21 templates/settings-personal.php:54
 msgid "Enabled"
@@ -102,16 +119,16 @@ msgid "Disabled"
 msgstr "Deshabilitado"
 
 #: templates/settings-admin.php:34
-msgid "Change encryption passwords recovery key:"
-msgstr "Cambiar clave de cifrado de contraseñas:"
+msgid "Change recovery key password:"
+msgstr "Cambiar la contraseña de la clave de recuperación"
 
 #: templates/settings-admin.php:41
-msgid "Old Recovery account password"
-msgstr "Contraseña de recuperación actual"
+msgid "Old Recovery key password"
+msgstr "Antigua clave de recuperación"
 
 #: templates/settings-admin.php:48
-msgid "New Recovery account password"
-msgstr "Contraseña de recuperación nueva"
+msgid "New Recovery key password"
+msgstr "Nueva clave de recuperación"
 
 #: templates/settings-admin.php:53
 msgid "Change Password"
@@ -119,39 +136,39 @@ msgstr "Cambiar contraseña"
 
 #: templates/settings-personal.php:11
 msgid "Your private key password no longer match your log-in password:"
-msgstr ""
+msgstr "Su contraseña de clave privada ya no coincide con su contraseña de acceso:"
 
 #: templates/settings-personal.php:14
 msgid "Set your old private key password to your current log-in password."
-msgstr ""
+msgstr "Establecer la contraseña de su antigua clave privada a su contraseña actual de acceso."
 
 #: templates/settings-personal.php:16
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
-msgstr ""
+msgstr "Si no recuerda su antigua contraseña puede pedir a su administrador que le recupere sus ficheros."
 
 #: templates/settings-personal.php:24
 msgid "Old log-in password"
-msgstr ""
+msgstr "Contraseña de acceso antigua"
 
 #: templates/settings-personal.php:30
 msgid "Current log-in password"
-msgstr ""
+msgstr "Contraseña de acceso actual"
 
 #: templates/settings-personal.php:35
 msgid "Update Private Key Password"
-msgstr ""
+msgstr "Actualizar Contraseña de Clave Privada"
 
 #: templates/settings-personal.php:45
 msgid "Enable password recovery:"
-msgstr ""
+msgstr "Habilitar la recuperación de contraseña:"
 
 #: templates/settings-personal.php:47
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
-msgstr ""
+msgstr "Habilitar esta opción le permitirá volver a tener acceso a sus ficheros cifrados en caso de pérdida de contraseña"
 
 #: templates/settings-personal.php:63
 msgid "File recovery settings updated"
diff --git a/l10n/es/files_external.po b/l10n/es/files_external.po
index 5f962c9b753cc2d451409b90c86f911ce91b9493..4033a5083acd0343fd3c7f1009ad093785529e78 100644
--- a/l10n/es/files_external.po
+++ b/l10n/es/files_external.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Korrosivo <yo@rubendelcampo.es>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
+"Last-Translator: Korrosivo <yo@rubendelcampo.es>\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,7 +20,7 @@ msgstr ""
 
 #: js/dropbox.js:7 js/dropbox.js:28 js/google.js:16 js/google.js:34
 msgid "Access granted"
-msgstr "Acceso garantizado"
+msgstr "Acceso concedido"
 
 #: js/dropbox.js:30 js/dropbox.js:96 js/dropbox.js:102
 msgid "Error configuring Dropbox storage"
@@ -27,11 +28,11 @@ msgstr "Error configurando el almacenamiento de Dropbox"
 
 #: js/dropbox.js:65 js/google.js:66
 msgid "Grant access"
-msgstr "Garantizar acceso"
+msgstr "Conceder acceso"
 
 #: js/dropbox.js:101
 msgid "Please provide a valid Dropbox app key and secret."
-msgstr "Por favor , proporcione un secreto y una contraseña válida de la app Dropbox."
+msgstr "Por favor, proporcione un una clave válida de la app Dropbox y una clave secreta."
 
 #: js/google.js:36 js/google.js:93
 msgid "Error configuring Google Drive storage"
@@ -55,7 +56,7 @@ msgid ""
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
 "Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
 "your system administrator to install it."
-msgstr "<b>Advertencia:</b> El soporte de Curl en PHP no está activado ni instalado. El montado de  ownCloud, WebDAV o GoogleDrive no es posible. Pida al administrador de su sistema que lo instale."
+msgstr "<b>Advertencia:</b> El soporte de Curl en PHP no está activado ni instalado. El montado de ownCloud, WebDAV o GoogleDrive no es posible. Pida al administrador de su sistema que lo instale."
 
 #: templates/settings.php:3
 msgid "External Storage"
@@ -108,7 +109,7 @@ msgstr "Eliminar"
 
 #: templates/settings.php:129
 msgid "Enable User External Storage"
-msgstr "Habilitar almacenamiento de usuario externo"
+msgstr "Habilitar almacenamiento externo de usuario"
 
 #: templates/settings.php:130
 msgid "Allow users to mount their own external storage"
@@ -116,7 +117,7 @@ msgstr "Permitir a los usuarios montar su propio almacenamiento externo"
 
 #: templates/settings.php:141
 msgid "SSL root certificates"
-msgstr "Raíz de certificados SSL  "
+msgstr "Certificados raíz SSL"
 
 #: templates/settings.php:159
 msgid "Import Root Certificate"
diff --git a/l10n/es/files_sharing.po b/l10n/es/files_sharing.po
index 59524a67af78452301bf7c6182be7affd5de27d2..c1268a68a03df34203fd6787e251fac9f43aedee 100644
--- a/l10n/es/files_sharing.po
+++ b/l10n/es/files_sharing.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Korrosivo <yo@rubendelcampo.es>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
+"Last-Translator: Korrosivo <yo@rubendelcampo.es>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,27 +19,39 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: templates/authenticate.php:4
+msgid "The password is wrong. Try again."
+msgstr "La contraseña introducida es errónea. Inténtelo de nuevo."
+
+#: templates/authenticate.php:7
 msgid "Password"
 msgstr "Contraseña"
 
-#: templates/authenticate.php:6
+#: templates/authenticate.php:9
 msgid "Submit"
 msgstr "Enviar"
 
-#: templates/public.php:10
+#: templates/public.php:17
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s compartió la carpeta %s contigo"
 
-#: templates/public.php:13
+#: templates/public.php:20
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s compartió el fichero %s contigo"
 
-#: templates/public.php:19 templates/public.php:43
+#: templates/public.php:28 templates/public.php:90
 msgid "Download"
 msgstr "Descargar"
 
-#: templates/public.php:40
+#: templates/public.php:45 templates/public.php:48
+msgid "Upload"
+msgstr "Subir"
+
+#: templates/public.php:58
+msgid "Cancel upload"
+msgstr "Cancelar subida"
+
+#: templates/public.php:87
 msgid "No preview available for"
 msgstr "No hay vista previa disponible para"
diff --git a/l10n/es/files_trashbin.po b/l10n/es/files_trashbin.po
index 33587c79aea57f3fec86732d6e2347f794495828..25a2b01fe8f63c2f3c28c6f3e3c7f629cbebbf78 100644
--- a/l10n/es/files_trashbin.po
+++ b/l10n/es/files_trashbin.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Korrosivo <yo@rubendelcampo.es>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:16+0000\n"
+"Last-Translator: Korrosivo <yo@rubendelcampo.es>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -29,7 +30,7 @@ msgstr "No se puede restaurar %s"
 
 #: js/trash.js:7 js/trash.js:97
 msgid "perform restore operation"
-msgstr "Restaurar"
+msgstr "restaurar"
 
 #: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
 msgid "Error"
@@ -37,7 +38,7 @@ msgstr "Error"
 
 #: js/trash.js:34
 msgid "delete file permanently"
-msgstr "Eliminar archivo permanentemente"
+msgstr "eliminar archivo permanentemente"
 
 #: js/trash.js:123
 msgid "Delete permanently"
diff --git a/l10n/es/files_versions.po b/l10n/es/files_versions.po
index 89307a3c01eecd6eaf8b1b15156d7808d7674e57..1277356dd138de1ba45ed92e6f65a831f09e61fd 100644
--- a/l10n/es/files_versions.po
+++ b/l10n/es/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-05-25 02:01+0200\n"
-"PO-Revision-Date: 2013-05-24 13:28+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-07-08 02:02+0200\n"
+"PO-Revision-Date: 2013-07-07 07:42+0000\n"
+"Last-Translator: Korrosivo <yo@rubendelcampo.es>\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"
diff --git a/l10n/es/lib.po b/l10n/es/lib.po
index 28174f0132f26448353435e311bf27ee50f1bea3..a2d9229597cd670fa5437edfbf8fa2f8fe04f8d6 100644
--- a/l10n/es/lib.po
+++ b/l10n/es/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-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
-"Last-Translator: xhiena <xhiena@gmail.com>\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,43 +18,47 @@ msgstr ""
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:359
+#: app.php:360
 msgid "Help"
 msgstr "Ayuda"
 
-#: app.php:372
+#: app.php:373
 msgid "Personal"
 msgstr "Personal"
 
-#: app.php:383
+#: app.php:384
 msgid "Settings"
 msgstr "Ajustes"
 
-#: app.php:395
+#: app.php:396
 msgid "Users"
 msgstr "Usuarios"
 
-#: app.php:408
+#: app.php:409
 msgid "Apps"
 msgstr "Aplicaciones"
 
-#: app.php:416
+#: app.php:417
 msgid "Admin"
 msgstr "Administración"
 
-#: files.php:210
+#: defaults.php:33
+msgid "web services under your control"
+msgstr "Servicios web bajo su control"
+
+#: files.php:226
 msgid "ZIP download is turned off."
 msgstr "La descarga en ZIP está desactivada."
 
-#: files.php:211
+#: files.php:227
 msgid "Files need to be downloaded one by one."
 msgstr "Los archivos deben ser descargados uno por uno."
 
-#: files.php:212 files.php:245
+#: files.php:228 files.php:261
 msgid "Back to Files"
 msgstr "Volver a Archivos"
 
-#: files.php:242
+#: files.php:258
 msgid "Selected files too large to generate zip file."
 msgstr "Los archivos seleccionados son demasiado grandes para generar el archivo zip."
 
@@ -86,104 +90,102 @@ msgstr "Texto"
 msgid "Images"
 msgstr "Imágenes"
 
-#: setup.php:34
-msgid "Set an admin username."
-msgstr "Configurar un nombre de usuario del administrador"
-
-#: setup.php:37
-msgid "Set an admin password."
-msgstr "Configurar la contraseña del administrador."
-
-#: setup.php:55
+#: setup/abstractdatabase.php:22
 #, php-format
 msgid "%s enter the database username."
 msgstr "%s ingresar el usuario de la base de datos."
 
-#: setup.php:58
+#: setup/abstractdatabase.php:25
 #, php-format
 msgid "%s enter the database name."
 msgstr "%s ingresar el nombre de la base de datos"
 
-#: setup.php:61
+#: setup/abstractdatabase.php:28
 #, php-format
 msgid "%s you may not use dots in the database name"
 msgstr "%s no se puede utilizar puntos en el nombre de la base de datos"
 
-#: setup.php:64
+#: setup/mssql.php:20
 #, php-format
-msgid "%s set the database host."
-msgstr "%s ingresar el host de la base de datos."
-
-#: setup.php:126 setup.php:332 setup.php:377
-msgid "PostgreSQL username and/or password not valid"
-msgstr "Usuario y/o contraseña de PostgreSQL no válidos"
+msgid "MS SQL username and/or password not valid: %s"
+msgstr "Usuario y/o contraseña de MS SQL no válidos: %s"
 
-#: setup.php:127 setup.php:235
+#: setup/mssql.php:21 setup/mysql.php:13 setup/oci.php:114
+#: setup/postgresql.php:24 setup/postgresql.php:70
 msgid "You need to enter either an existing account or the administrator."
 msgstr "Tiene que ingresar una cuenta existente o la del administrador."
 
-#: setup.php:152
-msgid "Oracle connection could not be established"
-msgstr "No se pudo establecer la conexión a Oracle"
-
-#: setup.php:234
+#: setup/mysql.php:12
 msgid "MySQL username and/or password not valid"
 msgstr "Usuario y/o contraseña de MySQL no válidos"
 
-#: setup.php:288 setup.php:398 setup.php:407 setup.php:425 setup.php:435
-#: setup.php:444 setup.php:477 setup.php:543 setup.php:569 setup.php:576
-#: setup.php:587 setup.php:594 setup.php:603 setup.php:611 setup.php:620
-#: setup.php:626
+#: setup/mysql.php:67 setup/oci.php:54 setup/oci.php:121 setup/oci.php:147
+#: setup/oci.php:154 setup/oci.php:165 setup/oci.php:172 setup/oci.php:181
+#: setup/oci.php:189 setup/oci.php:198 setup/oci.php:204
+#: setup/postgresql.php:89 setup/postgresql.php:98 setup/postgresql.php:115
+#: setup/postgresql.php:125 setup/postgresql.php:134
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr "Error BD: \"%s\""
 
-#: setup.php:289 setup.php:399 setup.php:408 setup.php:426 setup.php:436
-#: setup.php:445 setup.php:478 setup.php:544 setup.php:570 setup.php:577
-#: setup.php:588 setup.php:604 setup.php:612 setup.php:621
+#: setup/mysql.php:68 setup/oci.php:55 setup/oci.php:122 setup/oci.php:148
+#: setup/oci.php:155 setup/oci.php:166 setup/oci.php:182 setup/oci.php:190
+#: setup/oci.php:199 setup/postgresql.php:90 setup/postgresql.php:99
+#: setup/postgresql.php:116 setup/postgresql.php:126 setup/postgresql.php:135
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr "Comando infractor: \"%s\""
 
-#: setup.php:305
+#: setup/mysql.php:85
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr "Usuario MySQL '%s'@'localhost' ya existe."
 
-#: setup.php:306
+#: setup/mysql.php:86
 msgid "Drop this user from MySQL"
 msgstr "Eliminar este usuario de MySQL"
 
-#: setup.php:311
+#: setup/mysql.php:91
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr "Usuario MySQL '%s'@'%%' ya existe"
 
-#: setup.php:312
+#: setup/mysql.php:92
 msgid "Drop this user from MySQL."
 msgstr "Eliminar este usuario de MySQL."
 
-#: setup.php:469 setup.php:536
+#: setup/oci.php:34
+msgid "Oracle connection could not be established"
+msgstr "No se pudo establecer la conexión a Oracle"
+
+#: setup/oci.php:41 setup/oci.php:113
 msgid "Oracle username and/or password not valid"
 msgstr "Usuario y/o contraseña de Oracle no válidos"
 
-#: setup.php:595 setup.php:627
+#: setup/oci.php:173 setup/oci.php:205
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr "Comando infractor: \"%s\", nombre: %s, contraseña: %s"
 
-#: setup.php:647
-#, php-format
-msgid "MS SQL username and/or password not valid: %s"
-msgstr "Usuario y/o contraseña de MS SQL no válidos: %s"
+#: setup/postgresql.php:23 setup/postgresql.php:69
+msgid "PostgreSQL username and/or password not valid"
+msgstr "Usuario y/o contraseña de PostgreSQL no válidos"
+
+#: setup.php:42
+msgid "Set an admin username."
+msgstr "Configurar un nombre de usuario del administrador"
+
+#: setup.php:45
+msgid "Set an admin password."
+msgstr "Configurar la contraseña del administrador."
 
-#: setup.php:870
+#: setup.php:198
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Su servidor web aún no está configurado adecuadamente para permitir sincronización de archivos ya que la interfaz WebDAV parece no estar funcionando."
 
-#: setup.php:871
+#: setup.php:199
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Por favor, vuelva a comprobar las <a href='%s'>guías de instalación</a>."
diff --git a/l10n/es/settings.po b/l10n/es/settings.po
index e2db2aa83f506f76d2e6cf5cf0e8b1668f4ec948..95920b37d48cba1a30b5d2c87770d9a3d0608891 100644
--- a/l10n/es/settings.po
+++ b/l10n/es/settings.po
@@ -5,15 +5,15 @@
 # Translators:
 # Art O. Pal <artopal@fastmail.fm>, 2013
 # ggam <ggam@brainleakage.com>, 2013
-# saskarip, 2013
+# saskarip <saskarip@gmail.com>, 2013
 # scambra <sergio@programatica.es>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
-"Last-Translator: saskarip\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -92,35 +92,35 @@ msgstr "No se pudo eliminar al usuario del grupo %s"
 msgid "Couldn't update app."
 msgstr "No se pudo actualizar la aplicacion."
 
-#: js/apps.js:30
+#: js/apps.js:35
 msgid "Update to {appversion}"
 msgstr "Actualizado a {appversion}"
 
-#: js/apps.js:36 js/apps.js:76
+#: js/apps.js:41 js/apps.js:81
 msgid "Disable"
 msgstr "Desactivar"
 
-#: js/apps.js:36 js/apps.js:64 js/apps.js:83
+#: js/apps.js:41 js/apps.js:69 js/apps.js:88
 msgid "Enable"
 msgstr "Activar"
 
-#: js/apps.js:55
+#: js/apps.js:60
 msgid "Please wait...."
 msgstr "Espere, por favor...."
 
-#: js/apps.js:59 js/apps.js:71 js/apps.js:80 js/apps.js:93
+#: js/apps.js:64 js/apps.js:76 js/apps.js:85 js/apps.js:98
 msgid "Error"
 msgstr "Error"
 
-#: js/apps.js:90
+#: js/apps.js:95
 msgid "Updating...."
 msgstr "Actualizando...."
 
-#: js/apps.js:93
+#: js/apps.js:98
 msgid "Error while updating app"
 msgstr "Error mientras se actualizaba la aplicación"
 
-#: js/apps.js:96
+#: js/apps.js:101
 msgid "Updated"
 msgstr "Actualizado"
 
@@ -169,15 +169,15 @@ msgstr "Error al crear usuario"
 msgid "A valid password must be provided"
 msgstr "Se debe usar una contraseña valida"
 
-#: personal.php:35 personal.php:36
+#: personal.php:37 personal.php:38
 msgid "__language_name__"
 msgstr "Castellano"
 
-#: templates/admin.php:15
+#: templates/admin.php:17
 msgid "Security Warning"
 msgstr "Advertencia de seguridad"
 
-#: templates/admin.php:18
+#: templates/admin.php:20
 msgid ""
 "Your data directory and your files are probably accessible from the "
 "internet. The .htaccess file that ownCloud provides is not working. We "
@@ -186,36 +186,36 @@ msgid ""
 " webserver document root."
 msgstr "Su directorio de datos y sus archivos son probablemente accesibles desde internet. El archivo .htaccess que ownCloud provee no está funcionando. Le recomendamos encarecidamente que configure su servidor web de manera que el directorio de datos no esté accesible, o mueva el directorio de datos fuera del documento raíz de su servidor web."
 
-#: templates/admin.php:29
+#: templates/admin.php:31
 msgid "Setup Warning"
 msgstr "Advertencia de configuración"
 
-#: templates/admin.php:32
+#: templates/admin.php:34
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Su servidor web aún no está configurado adecuadamente para permitir sincronización de archivos ya que la interfaz WebDAV parece no estar funcionando."
 
-#: templates/admin.php:33
+#: templates/admin.php:35
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Por favor, vuelva a comprobar las <a href='%s'>guías de instalación</a>."
 
-#: templates/admin.php:44
+#: templates/admin.php:46
 msgid "Module 'fileinfo' missing"
 msgstr "Modulo 'fileinfo' perdido"
 
-#: templates/admin.php:47
+#: templates/admin.php:49
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr "El modulo PHP 'fileinfo' no se encuentra. Le recomendamos encarecidamente que habilite este módulo para obtener mejores resultados con la detección del mime-type"
 
-#: templates/admin.php:58
+#: templates/admin.php:60
 msgid "Locale not working"
 msgstr "La configuración regional no está funcionando"
 
-#: templates/admin.php:63
+#: templates/admin.php:65
 #, php-format
 msgid ""
 "This ownCloud server can't set system locale to %s. This means that there "
@@ -223,11 +223,11 @@ msgid ""
 " to install the required packages on your system to support %s."
 msgstr "Este servidor ownCloud no puede establecer la configuración regional a %s. Esto significa que puede haber problemas con ciertos caracteres en los nombres de archivos. Le recomendamos que instale los paquetes requeridos en su sistema para soportar el %s."
 
-#: templates/admin.php:75
+#: templates/admin.php:77
 msgid "Internet connection not working"
 msgstr "La conexion a internet no esta funcionando"
 
-#: templates/admin.php:78
+#: templates/admin.php:80
 msgid ""
 "This ownCloud server has no working internet connection. This means that "
 "some of the features like mounting of external storage, notifications about "
@@ -237,102 +237,102 @@ msgid ""
 " of ownCloud."
 msgstr "Este servidor ownCloud no tiene conexion de internet. Esto quiere decir que algunas caracteristicas como el montaje de almacenamiento externo, las notificaciones sobre actualizaciones o la instalacion de apps de terceros no funcionarán. Es posible que no pueda acceder remotamente a los archivos ni enviar notificaciones por correo. Sugerimos habilitar la conexión a Internet para este servidor si quiere disfrutar de todas las características de ownCloud."
 
-#: templates/admin.php:92
+#: templates/admin.php:94
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:101
+#: templates/admin.php:103
 msgid "Execute one task with each page loaded"
 msgstr "Ejecutar una tarea con cada página cargada"
 
-#: templates/admin.php:111
+#: templates/admin.php:113
 msgid ""
 "cron.php is registered at a webcron service. Call the cron.php page in the "
 "owncloud root once a minute over http."
 msgstr "cron.php es un sistema webcron registrado. Llama a la página cron.php en la raíz de owncloud una vez por minuto sobre http."
 
-#: templates/admin.php:121
+#: templates/admin.php:123
 msgid ""
 "Use systems cron service. Call the cron.php file in the owncloud folder via "
 "a system cronjob once a minute."
 msgstr "Utilizar el servicio cron del sistema. Llama al archivo cron.php en la carpeta de owncloud a través de un cronjob del sistema una vez por minuto."
 
-#: templates/admin.php:128
+#: templates/admin.php:130
 msgid "Sharing"
 msgstr "Compartiendo"
 
-#: templates/admin.php:134
+#: templates/admin.php:136
 msgid "Enable Share API"
 msgstr "Activar API de Compartición"
 
-#: templates/admin.php:135
+#: templates/admin.php:137
 msgid "Allow apps to use the Share API"
 msgstr "Permitir a las aplicaciones utilizar la API de Compartición"
 
-#: templates/admin.php:142
+#: templates/admin.php:144
 msgid "Allow links"
 msgstr "Permitir enlaces"
 
-#: templates/admin.php:143
+#: templates/admin.php:145
 msgid "Allow users to share items to the public with links"
 msgstr "Permitir a los usuarios compartir elementos al público con enlaces"
 
-#: templates/admin.php:150
+#: templates/admin.php:152
 msgid "Allow resharing"
 msgstr "Permitir re-compartición"
 
-#: templates/admin.php:151
+#: templates/admin.php:153
 msgid "Allow users to share items shared with them again"
 msgstr "Permitir a los usuarios compartir elementos ya compartidos con ellos mismos"
 
-#: templates/admin.php:158
+#: templates/admin.php:160
 msgid "Allow users to share with anyone"
 msgstr "Permitir a los usuarios compartir con todo el mundo"
 
-#: templates/admin.php:161
+#: templates/admin.php:163
 msgid "Allow users to only share with users in their groups"
 msgstr "Permitir a los usuarios compartir sólo con los usuarios en sus grupos"
 
-#: templates/admin.php:168
+#: templates/admin.php:170
 msgid "Security"
 msgstr "Seguridad"
 
-#: templates/admin.php:181
+#: templates/admin.php:183
 msgid "Enforce HTTPS"
 msgstr "Forzar HTTPS"
 
-#: templates/admin.php:182
+#: templates/admin.php:184
 msgid ""
 "Enforces the clients to connect to ownCloud via an encrypted connection."
 msgstr "Fuerza la conexión de los clientes a ownCloud con una conexión cifrada."
 
-#: templates/admin.php:185
+#: templates/admin.php:187
 msgid ""
 "Please connect to this ownCloud instance via HTTPS to enable or disable the "
 "SSL enforcement."
 msgstr "Por favor, conecte esta instancia de ownCloud vía HTTPS para activar o desactivar la aplicación de SSL."
 
-#: templates/admin.php:195
+#: templates/admin.php:197
 msgid "Log"
 msgstr "Registro"
 
-#: templates/admin.php:196
+#: templates/admin.php:198
 msgid "Log level"
 msgstr "Nivel de registro"
 
-#: templates/admin.php:227
+#: templates/admin.php:229
 msgid "More"
 msgstr "Más"
 
-#: templates/admin.php:228
+#: templates/admin.php:230
 msgid "Less"
 msgstr "Menos"
 
-#: templates/admin.php:235 templates/personal.php:116
+#: templates/admin.php:236 templates/personal.php:116
 msgid "Version"
 msgstr "Versión"
 
-#: templates/admin.php:237 templates/personal.php:119
+#: templates/admin.php:240 templates/personal.php:119
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -390,76 +390,79 @@ msgstr "Rastreador de fallos"
 msgid "Commercial Support"
 msgstr "Soporte comercial"
 
-#: templates/personal.php:9
+#: templates/personal.php:10
 msgid "Get the apps to sync your files"
 msgstr "Obtener las aplicaciones para sincronizar sus archivos"
 
-#: templates/personal.php:20
+#: templates/personal.php:21
 msgid "Show First Run Wizard again"
 msgstr "Mostrar asistente para iniciar otra vez"
 
-#: templates/personal.php:28
+#: templates/personal.php:29
 #, php-format
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "Ha usado <strong>%s</strong> de los <strong>%s</strong> disponibles"
 
-#: templates/personal.php:40 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:41 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "Contraseña"
 
-#: templates/personal.php:41
+#: templates/personal.php:42
 msgid "Your password was changed"
 msgstr "Su contraseña ha sido cambiada"
 
-#: templates/personal.php:42
+#: templates/personal.php:43
 msgid "Unable to change your password"
 msgstr "No se ha podido cambiar su contraseña"
 
-#: templates/personal.php:43
+#: templates/personal.php:44
 msgid "Current password"
 msgstr "Contraseña actual"
 
-#: templates/personal.php:45
+#: templates/personal.php:46
 msgid "New password"
 msgstr "Nueva contraseña"
 
-#: templates/personal.php:47
+#: templates/personal.php:48
 msgid "Change password"
 msgstr "Cambiar contraseña"
 
-#: templates/personal.php:59 templates/users.php:85
+#: templates/personal.php:60 templates/users.php:85
 msgid "Display Name"
 msgstr "Nombre a mostrar"
 
-#: templates/personal.php:74
+#: templates/personal.php:75
 msgid "Email"
 msgstr "E-mail"
 
-#: templates/personal.php:76
+#: templates/personal.php:77
 msgid "Your email address"
 msgstr "Su dirección de correo"
 
-#: templates/personal.php:77
+#: templates/personal.php:78
 msgid "Fill in an email address to enable password recovery"
 msgstr "Escriba una dirección de correo electrónico para restablecer la contraseña"
 
-#: templates/personal.php:86 templates/personal.php:87
+#: templates/personal.php:87 templates/personal.php:88
 msgid "Language"
 msgstr "Idioma"
 
-#: templates/personal.php:99
+#: templates/personal.php:100
 msgid "Help translate"
 msgstr "Ayúdnos a traducir"
 
-#: templates/personal.php:105
+#: templates/personal.php:106
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:107
-msgid "Use this address to connect to your ownCloud in your file manager"
-msgstr "Use esta dirección para conectarse a su cuenta de ownCloud en el administrador de archivos"
+#: templates/personal.php:108
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
+"target=\"_blank\">access your Files via WebDAV</a>"
+msgstr ""
 
-#: templates/users.php:21 templates/users.php:84
+#: templates/users.php:21
 msgid "Login Name"
 msgstr "Nombre de usuario"
 
@@ -489,6 +492,10 @@ msgstr "Ilimitado"
 msgid "Other"
 msgstr "Otro"
 
+#: templates/users.php:84
+msgid "Username"
+msgstr "Nombre de usuario"
+
 #: templates/users.php:91
 msgid "Storage"
 msgstr "Almacenamiento"
diff --git a/l10n/es/user_ldap.po b/l10n/es/user_ldap.po
index b8c4a7c4a0d05bea69d5f489ff42198f0019f1b4..f03ecf01ff84844efc67f96109c1e63b1c8d300a 100644
--- a/l10n/es/user_ldap.po
+++ b/l10n/es/user_ldap.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:25+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:16+0000\n"
 "Last-Translator: xhiena <xhiena@gmail.com>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/es/user_webdavauth.po b/l10n/es/user_webdavauth.po
index 5d60f41af1b29227ca017cd7739e51f281952f2a..38bc6e5bb761497d9769d8b6a8fb20add4b719db 100644
--- a/l10n/es/user_webdavauth.po
+++ b/l10n/es/user_webdavauth.po
@@ -6,14 +6,14 @@
 # Agustin Ferrario <agustin.ferrario@hotmail.com.ar>, 2013
 # Art O. Pal <artopal@fastmail.fm>, 2012
 # pggx999 <pggx999@gmail.com>, 2012
-# saskarip, 2013
+# saskarip <saskarip@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 07:50+0000\n"
-"Last-Translator: saskarip\n"
+"POT-Creation-Date: 2013-07-08 02:02+0200\n"
+"PO-Revision-Date: 2013-07-07 08:08+0000\n"
+"Last-Translator: Korrosivo <yo@rubendelcampo.es>\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"
diff --git a/l10n/es_AR/core.po b/l10n/es_AR/core.po
index f280c8cad8d38caf652239da4578ed4543568548..84dcb38c837695265a7c2ac9ea7081b50509f0d5 100644
--- a/l10n/es_AR/core.po
+++ b/l10n/es_AR/core.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:22+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
 "MIME-Version: 1.0\n"
@@ -21,7 +21,7 @@ msgstr ""
 #: ajax/share.php:97
 #, php-format
 msgid "%s shared »%s« with you"
-msgstr ""
+msgstr "%s compartió \"%s\" con vos"
 
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
@@ -60,137 +60,137 @@ msgstr "No se seleccionaron categorías para borrar."
 #: ajax/vcategories/removeFromFavorites.php:35
 #, php-format
 msgid "Error removing %s from favorites."
-msgstr "Error al remover %s de favoritos. "
+msgstr "Error al borrar %s de favoritos. "
 
-#: js/config.php:34
+#: js/config.php:32
 msgid "Sunday"
 msgstr "Domingo"
 
-#: js/config.php:35
+#: js/config.php:33
 msgid "Monday"
 msgstr "Lunes"
 
-#: js/config.php:36
+#: js/config.php:34
 msgid "Tuesday"
 msgstr "Martes"
 
-#: js/config.php:37
+#: js/config.php:35
 msgid "Wednesday"
 msgstr "Miércoles"
 
-#: js/config.php:38
+#: js/config.php:36
 msgid "Thursday"
 msgstr "Jueves"
 
-#: js/config.php:39
+#: js/config.php:37
 msgid "Friday"
 msgstr "Viernes"
 
-#: js/config.php:40
+#: js/config.php:38
 msgid "Saturday"
 msgstr "Sábado"
 
-#: js/config.php:45
+#: js/config.php:43
 msgid "January"
 msgstr "enero"
 
-#: js/config.php:46
+#: js/config.php:44
 msgid "February"
 msgstr "febrero"
 
-#: js/config.php:47
+#: js/config.php:45
 msgid "March"
 msgstr "marzo"
 
-#: js/config.php:48
+#: js/config.php:46
 msgid "April"
 msgstr "abril"
 
-#: js/config.php:49
+#: js/config.php:47
 msgid "May"
 msgstr "mayo"
 
-#: js/config.php:50
+#: js/config.php:48
 msgid "June"
 msgstr "junio"
 
-#: js/config.php:51
+#: js/config.php:49
 msgid "July"
 msgstr "julio"
 
-#: js/config.php:52
+#: js/config.php:50
 msgid "August"
 msgstr "agosto"
 
-#: js/config.php:53
+#: js/config.php:51
 msgid "September"
 msgstr "septiembre"
 
-#: js/config.php:54
+#: js/config.php:52
 msgid "October"
 msgstr "octubre"
 
-#: js/config.php:55
+#: js/config.php:53
 msgid "November"
 msgstr "noviembre"
 
-#: js/config.php:56
+#: js/config.php:54
 msgid "December"
 msgstr "diciembre"
 
-#: js/js.js:286
+#: js/js.js:293
 msgid "Settings"
 msgstr "Configuración"
 
-#: js/js.js:718
+#: js/js.js:725
 msgid "seconds ago"
 msgstr "segundos atrás"
 
-#: js/js.js:719
+#: js/js.js:726
 msgid "1 minute ago"
 msgstr "hace 1 minuto"
 
-#: js/js.js:720
+#: js/js.js:727
 msgid "{minutes} minutes ago"
 msgstr "hace {minutes} minutos"
 
-#: js/js.js:721
+#: js/js.js:728
 msgid "1 hour ago"
 msgstr "1 hora atrás"
 
-#: js/js.js:722
+#: js/js.js:729
 msgid "{hours} hours ago"
-msgstr "{hours} horas atrás"
+msgstr "hace {hours} horas"
 
-#: js/js.js:723
+#: js/js.js:730
 msgid "today"
 msgstr "hoy"
 
-#: js/js.js:724
+#: js/js.js:731
 msgid "yesterday"
 msgstr "ayer"
 
-#: js/js.js:725
+#: js/js.js:732
 msgid "{days} days ago"
 msgstr "hace {days} días"
 
-#: js/js.js:726
+#: js/js.js:733
 msgid "last month"
 msgstr "el mes pasado"
 
-#: js/js.js:727
+#: js/js.js:734
 msgid "{months} months ago"
 msgstr "{months} meses atrás"
 
-#: js/js.js:728
+#: js/js.js:735
 msgid "months ago"
 msgstr "meses atrás"
 
-#: js/js.js:729
+#: js/js.js:736
 msgid "last year"
 msgstr "el año pasado"
 
-#: js/js.js:730
+#: js/js.js:737
 msgid "years ago"
 msgstr "años atrás"
 
@@ -221,19 +221,19 @@ msgstr "Aceptar"
 #: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
 #: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
 msgid "The object type is not specified."
-msgstr "El tipo de objeto no esta especificado. "
+msgstr "El tipo de objeto no está especificado. "
 
 #: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
 #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:577
-#: js/share.js:589
+#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:620
+#: js/share.js:632
 msgid "Error"
 msgstr "Error"
 
 #: js/oc-vcategories.js:179
 msgid "The app name is not specified."
-msgstr "El nombre de la aplicación no esta especificado."
+msgstr "El nombre de la App no está especificado."
 
 #: js/oc-vcategories.js:194
 msgid "The required file {file} is not installed!"
@@ -247,13 +247,13 @@ msgstr "Compartido"
 msgid "Share"
 msgstr "Compartir"
 
-#: js/share.js:125 js/share.js:617
+#: js/share.js:125 js/share.js:660
 msgid "Error while sharing"
 msgstr "Error al compartir"
 
 #: js/share.js:136
 msgid "Error while unsharing"
-msgstr "Error en el procedimiento de "
+msgstr "Error en al dejar de compartir"
 
 #: js/share.js:143
 msgid "Error while changing permissions"
@@ -267,101 +267,105 @@ msgstr "Compartido con vos y el grupo {group} por {owner}"
 msgid "Shared with you by {owner}"
 msgstr "Compartido con vos por {owner}"
 
-#: js/share.js:159
+#: js/share.js:172
 msgid "Share with"
 msgstr "Compartir con"
 
-#: js/share.js:164
+#: js/share.js:177
 msgid "Share with link"
-msgstr "Compartir con link"
+msgstr "Compartir con enlace"
 
-#: js/share.js:167
+#: js/share.js:180
 msgid "Password protect"
 msgstr "Proteger con contraseña "
 
-#: js/share.js:169 templates/installation.php:54 templates/login.php:26
+#: js/share.js:182 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "Contraseña"
 
-#: js/share.js:173
+#: js/share.js:187
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:191
 msgid "Email link to person"
-msgstr "Enviar el link por e-mail."
+msgstr "Enviar el enlace por e-mail."
 
-#: js/share.js:174
+#: js/share.js:192
 msgid "Send"
-msgstr "Enviar"
+msgstr "Mandar"
 
-#: js/share.js:178
+#: js/share.js:197
 msgid "Set expiration date"
 msgstr "Asignar fecha de vencimiento"
 
-#: js/share.js:179
+#: js/share.js:198
 msgid "Expiration date"
 msgstr "Fecha de vencimiento"
 
-#: js/share.js:211
+#: js/share.js:230
 msgid "Share via email:"
-msgstr "compartido a través de e-mail:"
+msgstr "Compartir a través de e-mail:"
 
-#: js/share.js:213
+#: js/share.js:232
 msgid "No people found"
 msgstr "No se encontraron usuarios"
 
-#: js/share.js:251
+#: js/share.js:270
 msgid "Resharing is not allowed"
 msgstr "No se permite volver a compartir"
 
-#: js/share.js:287
+#: js/share.js:306
 msgid "Shared in {item} with {user}"
 msgstr "Compartido en {item} con {user}"
 
-#: js/share.js:308
+#: js/share.js:327
 msgid "Unshare"
 msgstr "Dejar de compartir"
 
-#: js/share.js:320
+#: js/share.js:339
 msgid "can edit"
-msgstr "puede editar"
+msgstr "podés editar"
 
-#: js/share.js:322
+#: js/share.js:341
 msgid "access control"
 msgstr "control de acceso"
 
-#: js/share.js:325
+#: js/share.js:344
 msgid "create"
 msgstr "crear"
 
-#: js/share.js:328
+#: js/share.js:347
 msgid "update"
 msgstr "actualizar"
 
-#: js/share.js:331
+#: js/share.js:350
 msgid "delete"
 msgstr "borrar"
 
-#: js/share.js:334
+#: js/share.js:353
 msgid "share"
 msgstr "compartir"
 
-#: js/share.js:368 js/share.js:564
+#: js/share.js:387 js/share.js:607
 msgid "Password protected"
 msgstr "Protegido por contraseña"
 
-#: js/share.js:577
+#: js/share.js:620
 msgid "Error unsetting expiration date"
-msgstr "Error al remover la fecha de caducidad"
+msgstr "Error al remover la fecha de vencimiento"
 
-#: js/share.js:589
+#: js/share.js:632
 msgid "Error setting expiration date"
 msgstr "Error al asignar fecha de vencimiento"
 
-#: js/share.js:604
+#: js/share.js:647
 msgid "Sending ..."
-msgstr "Enviando..."
+msgstr "Mandando..."
 
-#: js/share.js:615
+#: js/share.js:658
 msgid "Email sent"
-msgstr "Email enviado"
+msgstr "e-mail mandado"
 
 #: js/update.js:14
 msgid ""
@@ -374,7 +378,7 @@ msgstr "La actualización no pudo ser completada. Por favor, reportá el inconve
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "La actualización fue exitosa. Estás siendo redirigido a ownCloud."
 
-#: lostpassword/controller.php:58
+#: lostpassword/controller.php:60
 msgid "ownCloud password reset"
 msgstr "Restablecer contraseña de ownCloud"
 
@@ -387,7 +391,7 @@ msgid ""
 "The link to reset your password has been sent to your email.<br>If you do "
 "not receive it within a reasonable amount of time, check your spam/junk "
 "folders.<br>If it is not there ask your local administrator ."
-msgstr "El enlace para restablecer la contraseña fue enviada a tu correo electrónico. <br> Si no lo recibís en un plazo de tiempo razonable,  revisá tu carpeta de spam / correo no deseado. <br> Si no está ahí, preguntale a tu administrador."
+msgstr "El enlace para restablecer la contraseña fue enviada a tu e-mail. <br> Si no lo recibís en un plazo de tiempo razonable,  revisá tu carpeta de spam / correo no deseado. <br> Si no está ahí, preguntale a tu administrador."
 
 #: lostpassword/templates/lostpassword.php:12
 msgid "Request failed!<br>Did you make sure your email/username was right?"
@@ -395,7 +399,7 @@ msgstr "¡Error en el pedido! <br> ¿Estás seguro de que tu dirección de corre
 
 #: lostpassword/templates/lostpassword.php:15
 msgid "You will receive a link to reset your password via Email."
-msgstr "Vas a recibir un enlace por e-mail para restablecer tu contraseña"
+msgstr "Vas a recibir un enlace por e-mail para restablecer tu contraseña."
 
 #: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
 #: templates/login.php:19
@@ -404,17 +408,17 @@ msgstr "Nombre de usuario"
 
 #: lostpassword/templates/lostpassword.php:22
 msgid ""
-"Your files seems to be encrypted. If you didn't have enabled the recovery "
-"key there will be no way to get your data back once the password was "
-"resetted. If you are not sure what to do, please contact your administrator "
-"first before continue. Do you really want to continue?"
-msgstr ""
+"Your files are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
+msgstr "Tus archivos están encriptados. Si no habilitaste la clave de recuperación, no vas a tener manera de obtener nuevamente tus datos después que se restablezca tu contraseña. Si no estás seguro sobre qué hacer, ponete en contacto con el administrador antes de seguir. ¿Estás seguro/a que querés continuar?"
 
 #: lostpassword/templates/lostpassword.php:24
 msgid "Yes, I really want to reset my password now"
-msgstr ""
+msgstr "Sí, definitivamente quiero restablecer mi contraseña ahora"
 
-#: lostpassword/templates/lostpassword.php:29
+#: lostpassword/templates/lostpassword.php:27
 msgid "Request reset"
 msgstr "Solicitar restablecimiento"
 
@@ -444,7 +448,7 @@ msgstr "Usuarios"
 
 #: strings.php:7
 msgid "Apps"
-msgstr "Aplicaciones"
+msgstr "Apps"
 
 #: strings.php:8
 msgid "Admin"
@@ -456,13 +460,13 @@ msgstr "Ayuda"
 
 #: templates/403.php:12
 msgid "Access forbidden"
-msgstr "Acceso denegado"
+msgstr "Acceso prohibido"
 
 #: templates/404.php:12
 msgid "Cloud not found"
 msgstr "No se encontró ownCloud"
 
-#: templates/altmail.php:2
+#: templates/altmail.php:4
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -471,11 +475,7 @@ msgid ""
 "View it: %s\n"
 "\n"
 "Cheers!"
-msgstr ""
-
-#: templates/altmail.php:7 templates/mail.php:24
-msgid "web services under your control"
-msgstr "servicios web controlados por vos"
+msgstr "Hola,\n\nSimplemente te informo que %s compartió %s con vos.\nMiralo acá: %s\n\n¡Chau!"
 
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
@@ -502,13 +502,13 @@ msgstr "Actualizá tu instalación de PHP para usar ownCloud de manera segura."
 msgid ""
 "No secure random number generator is available, please enable the PHP "
 "OpenSSL extension."
-msgstr "No hay disponible ningún generador de números aleatorios seguro. Por favor habilitá la extensión OpenSSL de PHP."
+msgstr "No hay disponible ningún generador de números aleatorios seguro. Por favor, habilitá la extensión OpenSSL de PHP."
 
 #: templates/installation.php:33
 msgid ""
 "Without a secure random number generator an attacker may be able to predict "
 "password reset tokens and take over your account."
-msgstr "Sin un generador de números aleatorios seguro un atacante podría predecir los tokens de reinicio de tu contraseña y tomar control de tu cuenta."
+msgstr "Sin un generador de números aleatorios seguro un atacante podría predecir las pruebas de reinicio de tu contraseña y tomar control de tu cuenta."
 
 #: templates/installation.php:39
 msgid ""
@@ -543,7 +543,7 @@ msgstr "Configurar la base de datos"
 #: templates/installation.php:102 templates/installation.php:113
 #: templates/installation.php:125
 msgid "will be used"
-msgstr "se utilizarán"
+msgstr "se usarán"
 
 #: templates/installation.php:137
 msgid "Database user"
@@ -563,18 +563,18 @@ msgstr "Espacio de tablas de la base de datos"
 
 #: templates/installation.php:166
 msgid "Database host"
-msgstr "Host de la base de datos"
+msgstr "Huésped de la base de datos"
 
 #: templates/installation.php:172
 msgid "Finish setup"
 msgstr "Completar la instalación"
 
-#: templates/layout.user.php:40
+#: templates/layout.user.php:43
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr "%s está disponible. Obtené más información sobre cómo actualizar."
 
-#: templates/layout.user.php:67
+#: templates/layout.user.php:68
 msgid "Log out"
 msgstr "Cerrar la sesión"
 
@@ -590,7 +590,7 @@ msgstr "¡Si no cambiaste tu contraseña recientemente, puede ser que tu cuenta
 
 #: templates/login.php:12
 msgid "Please change your password to secure your account again."
-msgstr "Por favor, cambiá tu contraseña para fortalecer nuevamente la seguridad de tu cuenta."
+msgstr "Por favor, cambiá tu contraseña para incrementar la seguridad de tu cuenta."
 
 #: templates/login.php:34
 msgid "Lost your password?"
@@ -602,18 +602,18 @@ msgstr "recordame"
 
 #: templates/login.php:41
 msgid "Log in"
-msgstr "Entrar"
+msgstr "Iniciar sesión"
 
 #: templates/login.php:47
 msgid "Alternative Logins"
 msgstr "Nombre alternativos de usuarios"
 
-#: templates/mail.php:15
+#: templates/mail.php:16
 #, php-format
 msgid ""
 "Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
 "href=\"%s\">View it!</a><br><br>Cheers!"
-msgstr ""
+msgstr "Hola,<br><br>Simplemente te informo que %s compartió %s con vos.<br><a href=\"%s\">Miralo acá:</a><br><br>¡Chau!"
 
 #: templates/part.pagenavi.php:3
 msgid "prev"
@@ -626,4 +626,4 @@ msgstr "siguiente"
 #: templates/update.php:3
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
-msgstr "Actualizando ownCloud a la versión %s, puede domorar un rato."
+msgstr "Actualizando ownCloud a la versión %s, puede demorar un rato."
diff --git a/l10n/es_AR/files.po b/l10n/es_AR/files.po
index 5fcac0ee39bd0302b2ec8bc1e1bcfc87b1f544d7..a6830a80bdf02776c00ae7b804904cda7d2a4d22 100644
--- a/l10n/es_AR/files.po
+++ b/l10n/es_AR/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-06-17 02:01+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
-"Last-Translator: Agustin Ferrario <agustin.ferrario@hotmail.com.ar>\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -28,46 +28,54 @@ msgstr "No se pudo mover %s - Un archivo con este nombre ya existe"
 msgid "Could not move %s"
 msgstr "No se pudo mover %s "
 
-#: ajax/upload.php:19
+#: ajax/upload.php:16 ajax/upload.php:45
+msgid "Unable to set upload directory."
+msgstr ""
+
+#: ajax/upload.php:22
+msgid "Invalid Token"
+msgstr ""
+
+#: ajax/upload.php:59
 msgid "No file was uploaded. Unknown error"
 msgstr "El archivo no fue subido. Error desconocido"
 
-#: ajax/upload.php:26
+#: ajax/upload.php:66
 msgid "There is no error, the file uploaded with success"
 msgstr "No hay errores, el archivo fue subido con éxito"
 
-#: ajax/upload.php:27
+#: ajax/upload.php:67
 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:29
+#: ajax/upload.php:69
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "El archivo subido sobrepasa el valor MAX_FILE_SIZE especificada en el formulario HTML"
 
-#: ajax/upload.php:30
+#: ajax/upload.php:70
 msgid "The uploaded file was only partially uploaded"
 msgstr "El archivo fue subido parcialmente"
 
-#: ajax/upload.php:31
+#: ajax/upload.php:71
 msgid "No file was uploaded"
 msgstr "No se subió ningún archivo "
 
-#: ajax/upload.php:32
+#: ajax/upload.php:72
 msgid "Missing a temporary folder"
 msgstr "Error en la carpera temporal"
 
-#: ajax/upload.php:33
+#: ajax/upload.php:73
 msgid "Failed to write to disk"
 msgstr "Error al escribir en el disco"
 
-#: ajax/upload.php:51
+#: ajax/upload.php:91
 msgid "Not enough storage available"
 msgstr "No hay suficiente capacidad de almacenamiento"
 
-#: ajax/upload.php:83
+#: ajax/upload.php:123
 msgid "Invalid directory."
 msgstr "Directorio invalido."
 
@@ -75,6 +83,36 @@ msgstr "Directorio invalido."
 msgid "Files"
 msgstr "Archivos"
 
+#: js/file-upload.js:11
+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/file-upload.js:24
+msgid "Not enough space available"
+msgstr "No hay suficiente espacio disponible"
+
+#: js/file-upload.js:64
+msgid "Upload cancelled."
+msgstr "La subida fue cancelada"
+
+#: js/file-upload.js:167 js/files.js:266
+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/file-upload.js:233 js/files.js:339
+msgid "URL cannot be empty."
+msgstr "La URL no puede estar vacía"
+
+#: js/file-upload.js:238 lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr "Nombre de carpeta inválido. El uso de \"Shared\" está reservado por ownCloud"
+
+#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
+#: js/files.js:693 js/files.js:731
+msgid "Error"
+msgstr "Error"
+
 #: js/fileactions.js:116
 msgid "Share"
 msgstr "Compartir"
@@ -91,43 +129,43 @@ msgstr "Borrar"
 msgid "Rename"
 msgstr "Cambiar nombre"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:464
 msgid "Pending"
 msgstr "Pendientes"
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "{new_name} already exists"
 msgstr "{new_name} ya existe"
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "replace"
 msgstr "reemplazar"
 
-#: js/filelist.js:259
+#: js/filelist.js:302
 msgid "suggest name"
 msgstr "sugerir nombre"
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "cancel"
 msgstr "cancelar"
 
-#: js/filelist.js:306
+#: js/filelist.js:349
 msgid "replaced {new_name} with {old_name}"
 msgstr "reemplazado {new_name} con {old_name}"
 
-#: js/filelist.js:306
+#: js/filelist.js:349
 msgid "undo"
 msgstr "deshacer"
 
-#: js/filelist.js:331
+#: js/filelist.js:374
 msgid "perform delete operation"
 msgstr "Eliminar"
 
-#: js/filelist.js:413
+#: js/filelist.js:456
 msgid "1 file uploading"
 msgstr "Subiendo 1 archivo"
 
-#: js/filelist.js:416 js/filelist.js:470
+#: js/filelist.js:459 js/filelist.js:517
 msgid "files uploading"
 msgstr "Subiendo archivos"
 
@@ -159,70 +197,42 @@ msgid ""
 "big."
 msgstr "Tu descarga esta siendo preparada. Esto puede tardar algun tiempo si los archivos son muy grandes."
 
-#: js/files.js:264
-msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "No fue posible subir el archivo porque es un directorio o porque su tamaño es 0 bytes"
-
-#: js/files.js:277
-msgid "Not enough space available"
-msgstr "No hay suficiente espacio disponible"
-
-#: js/files.js:317
-msgid "Upload cancelled."
-msgstr "La subida fue cancelada"
-
-#: js/files.js:413
-msgid ""
-"File upload is in progress. Leaving the page now will cancel the upload."
-msgstr "La subida del archivo está en proceso. Si salís de la página ahora, la subida se cancelará."
-
-#: js/files.js:486
-msgid "URL cannot be empty."
-msgstr "La URL no puede estar vacía"
-
-#: js/files.js:491
+#: js/files.js:344
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Nombre de carpeta inválido. El uso de 'Shared' está reservado por ownCloud"
 
-#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
-msgid "Error"
-msgstr "Error"
-
-#: js/files.js:877 templates/index.php:69
+#: js/files.js:744 templates/index.php:69
 msgid "Name"
 msgstr "Nombre"
 
-#: js/files.js:878 templates/index.php:80
+#: js/files.js:745 templates/index.php:80
 msgid "Size"
 msgstr "Tamaño"
 
-#: js/files.js:879 templates/index.php:82
+#: js/files.js:746 templates/index.php:82
 msgid "Modified"
 msgstr "Modificado"
 
-#: js/files.js:898
+#: js/files.js:765
 msgid "1 folder"
 msgstr "1 directorio"
 
-#: js/files.js:900
+#: js/files.js:767
 msgid "{count} folders"
 msgstr "{count} directorios"
 
-#: js/files.js:908
+#: js/files.js:775
 msgid "1 file"
 msgstr "1 archivo"
 
-#: js/files.js:910
+#: js/files.js:777
 msgid "{count} files"
 msgstr "{count} archivos"
 
-#: lib/app.php:53
-msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
-msgstr "Nombre de carpeta inválido. El uso de \"Shared\" está reservado por ownCloud"
-
 #: lib/app.php:73
-msgid "Unable to rename file"
-msgstr "No fue posible cambiar el nombre al archivo"
+#, php-format
+msgid "%s could not be renamed"
+msgstr ""
 
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
@@ -318,6 +328,22 @@ msgstr "Se están escaneando los archivos, por favor esperá."
 msgid "Current scanning"
 msgstr "Escaneo actual"
 
+#: templates/part.list.php:76
+msgid "directory"
+msgstr ""
+
+#: templates/part.list.php:78
+msgid "directories"
+msgstr ""
+
+#: templates/part.list.php:87
+msgid "file"
+msgstr "archivo"
+
+#: templates/part.list.php:89
+msgid "files"
+msgstr "archivos"
+
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
 msgstr "Actualizando el cache del sistema de archivos"
diff --git a/l10n/es_AR/files_encryption.po b/l10n/es_AR/files_encryption.po
index a7dfbddca4630745625c7dc099b1a782339a8ddd..f52bef53bf0edc3cc18d57cd7dbbdab4d6980ead 100644
--- a/l10n/es_AR/files_encryption.po
+++ b/l10n/es_AR/files_encryption.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-15 01:58+0200\n"
-"PO-Revision-Date: 2013-06-14 11:54+0000\n"
+"POT-Creation-Date: 2013-07-05 02:12+0200\n"
+"PO-Revision-Date: 2013-07-05 00:13+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
 "MIME-Version: 1.0\n"
@@ -20,21 +20,21 @@ msgstr ""
 
 #: ajax/adminrecovery.php:29
 msgid "Recovery key successfully enabled"
-msgstr ""
+msgstr "Se habilitó la recuperación de archivos"
 
 #: ajax/adminrecovery.php:34
 msgid ""
 "Could not enable recovery key. Please check your recovery key password!"
-msgstr ""
+msgstr "No se pudo habilitar la clave de recuperación. Por favor, comprobá tu contraseña."
 
 #: ajax/adminrecovery.php:48
 msgid "Recovery key successfully disabled"
-msgstr ""
+msgstr "Clave de recuperación deshabilitada"
 
 #: ajax/adminrecovery.php:53
 msgid ""
 "Could not disable recovery key. Please check your recovery key password!"
-msgstr ""
+msgstr "No fue posible deshabilitar la clave de recuperación.  Por favor, comprobá tu contraseña."
 
 #: ajax/changeRecoveryPassword.php:49
 msgid "Password successfully changed."
@@ -46,19 +46,31 @@ msgstr "No se pudo cambiar la contraseña. Comprobá que la contraseña actual s
 
 #: ajax/updatePrivateKeyPassword.php:51
 msgid "Private key password successfully updated."
-msgstr ""
+msgstr "Contraseña de clave privada actualizada con éxito."
 
 #: ajax/updatePrivateKeyPassword.php:53
 msgid ""
 "Could not update the private key password. Maybe the old password was not "
 "correct."
-msgstr ""
+msgstr "No fue posible actualizar la contraseña de la clave privada. Tal vez la contraseña antigua no es correcta."
 
 #: files/error.php:7
 msgid ""
-"Your private key is not valid! Maybe your password was changed from outside."
-" You can update your private key password in your personal settings to "
-"regain access to your files"
+"Your private key is not valid! Likely your password was changed outside the "
+"ownCloud system (e.g. your corporate directory). You can update your private"
+" key password in your personal settings to recover access to your encrypted "
+"files."
+msgstr ""
+
+#: hooks/hooks.php:44
+msgid "Missing requirements."
+msgstr ""
+
+#: hooks/hooks.php:45
+msgid ""
+"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL "
+"PHP extension is enabled and configured properly. For now, the encryption "
+"app has been disabled."
 msgstr ""
 
 #: js/settings-admin.js:11
@@ -69,15 +81,15 @@ msgstr "Guardando..."
 msgid ""
 "Your private key is not valid! Maybe the your password was changed from "
 "outside."
-msgstr ""
+msgstr "¡Tu clave privada no es válida! Tal vez tu contraseña fue cambiada desde afuera."
 
 #: templates/invalid_private_key.php:7
 msgid "You can unlock your private key in your "
-msgstr ""
+msgstr "Podés desbloquear tu clave privada en tu"
 
 #: templates/invalid_private_key.php:7
 msgid "personal settings"
-msgstr ""
+msgstr "Configuración personal"
 
 #: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
@@ -85,77 +97,77 @@ msgstr "Encriptación"
 
 #: templates/settings-admin.php:10
 msgid ""
-"Enable encryption passwords recovery key (allow sharing to recovery key):"
-msgstr "Habilitar clave de recuperación de contraseñas (permite compartir clave de contraseñas):"
+"Enable recovery key (allow to recover users files in case of password loss):"
+msgstr "Habilitar clave de recuperación (te permite recuperar los archivos de usuario en el caso en que pierdas la contraseña):"
 
 #: templates/settings-admin.php:14
-msgid "Recovery account password"
-msgstr "Recuperar contraseña"
+msgid "Recovery key password"
+msgstr "Contraseña de recuperación de clave"
 
 #: templates/settings-admin.php:21 templates/settings-personal.php:54
 msgid "Enabled"
-msgstr ""
+msgstr "Habilitado"
 
 #: templates/settings-admin.php:29 templates/settings-personal.php:62
 msgid "Disabled"
-msgstr ""
+msgstr "Deshabilitado"
 
 #: templates/settings-admin.php:34
-msgid "Change encryption passwords recovery key:"
-msgstr ""
+msgid "Change recovery key password:"
+msgstr "Cambiar contraseña para recuperar la clave:"
 
 #: templates/settings-admin.php:41
-msgid "Old Recovery account password"
-msgstr ""
+msgid "Old Recovery key password"
+msgstr "Contraseña antigua de recuperación de clave"
 
 #: templates/settings-admin.php:48
-msgid "New Recovery account password"
-msgstr ""
+msgid "New Recovery key password"
+msgstr "Nueva contraseña de recuperación de clave"
 
 #: templates/settings-admin.php:53
 msgid "Change Password"
-msgstr ""
+msgstr "Cambiar contraseña"
 
 #: templates/settings-personal.php:11
 msgid "Your private key password no longer match your log-in password:"
-msgstr ""
+msgstr "Tu contraseña de recuperación de clave ya no coincide con la contraseña de ingreso:"
 
 #: templates/settings-personal.php:14
 msgid "Set your old private key password to your current log-in password."
-msgstr ""
+msgstr "Usá tu contraseña de recuperación de clave antigua para tu contraseña de ingreso actual."
 
 #: templates/settings-personal.php:16
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
-msgstr ""
+msgstr "Si no te acordás de tu contraseña antigua, pedile al administrador que recupere tus archivos"
 
 #: templates/settings-personal.php:24
 msgid "Old log-in password"
-msgstr ""
+msgstr "Contraseña anterior"
 
 #: templates/settings-personal.php:30
 msgid "Current log-in password"
-msgstr ""
+msgstr "Contraseña actual"
 
 #: templates/settings-personal.php:35
 msgid "Update Private Key Password"
-msgstr ""
+msgstr "Actualizar contraseña de la clave privada"
 
 #: templates/settings-personal.php:45
 msgid "Enable password recovery:"
-msgstr ""
+msgstr "Habilitar contraseña de recuperación:"
 
 #: templates/settings-personal.php:47
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
-msgstr ""
+msgstr "Habilitando esta opción te va a permitir tener acceso a tus archivos encriptados incluso si perdés la contraseña"
 
 #: templates/settings-personal.php:63
 msgid "File recovery settings updated"
-msgstr ""
+msgstr "Las opciones de recuperación de archivos fueron actualizadas"
 
 #: templates/settings-personal.php:64
 msgid "Could not update file recovery"
-msgstr ""
+msgstr "No fue posible actualizar la recuperación de archivos"
diff --git a/l10n/es_AR/files_external.po b/l10n/es_AR/files_external.po
index 22d72d0ce5d61b91de6b3b096948fcfae959717b..dcbe165d806715b248673f6a26878dab642d8e0c 100644
--- a/l10n/es_AR/files_external.po
+++ b/l10n/es_AR/files_external.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: cjtess <claudio.tessone@gmail.com>\n"
 "Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/es_AR/files_sharing.po b/l10n/es_AR/files_sharing.po
index 795ee41eee29883ca17977dfc50042adc4ef87fc..29c21b632fa0063e520e33e5c20404fc8c279f3b 100644
--- a/l10n/es_AR/files_sharing.po
+++ b/l10n/es_AR/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
 "MIME-Version: 1.0\n"
@@ -18,27 +18,39 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: templates/authenticate.php:4
+msgid "The password is wrong. Try again."
+msgstr ""
+
+#: templates/authenticate.php:7
 msgid "Password"
 msgstr "Contraseña"
 
-#: templates/authenticate.php:6
+#: templates/authenticate.php:9
 msgid "Submit"
 msgstr "Enviar"
 
-#: templates/public.php:10
+#: templates/public.php:17
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s compartió la carpeta %s con vos"
 
-#: templates/public.php:13
+#: templates/public.php:20
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s compartió el archivo %s con vos"
 
-#: templates/public.php:19 templates/public.php:43
+#: templates/public.php:28 templates/public.php:90
 msgid "Download"
 msgstr "Descargar"
 
-#: templates/public.php:40
+#: templates/public.php:45 templates/public.php:48
+msgid "Upload"
+msgstr "Subir"
+
+#: templates/public.php:58
+msgid "Cancel upload"
+msgstr "Cancelar subida"
+
+#: templates/public.php:87
 msgid "No preview available for"
 msgstr "La vista preliminar no está disponible para"
diff --git a/l10n/es_AR/files_trashbin.po b/l10n/es_AR/files_trashbin.po
index 77ce2e0f6a94d29351490f8f797ca009a51d47b0..355a09e8f84b2c44a2af99613ff318b03bb15318 100644
--- a/l10n/es_AR/files_trashbin.po
+++ b/l10n/es_AR/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:16+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/es_AR/lib.po b/l10n/es_AR/lib.po
index d564d6a908d696f59481764a0a0e56e2706e0e92..5b7226adcbf3d12558436789f105ee806aaf94be 100644
--- a/l10n/es_AR/lib.po
+++ b/l10n/es_AR/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-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
-"Last-Translator: cjtess <claudio.tessone@gmail.com>\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,43 +18,47 @@ msgstr ""
 "Language: es_AR\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:359
+#: app.php:360
 msgid "Help"
 msgstr "Ayuda"
 
-#: app.php:372
+#: app.php:373
 msgid "Personal"
 msgstr "Personal"
 
-#: app.php:383
+#: app.php:384
 msgid "Settings"
 msgstr "Configuración"
 
-#: app.php:395
+#: app.php:396
 msgid "Users"
 msgstr "Usuarios"
 
-#: app.php:408
+#: app.php:409
 msgid "Apps"
 msgstr "Aplicaciones"
 
-#: app.php:416
+#: app.php:417
 msgid "Admin"
 msgstr "Administración"
 
-#: files.php:210
+#: defaults.php:33
+msgid "web services under your control"
+msgstr "servicios web que controlás"
+
+#: files.php:226
 msgid "ZIP download is turned off."
 msgstr "La descarga en ZIP está desactivada."
 
-#: files.php:211
+#: files.php:227
 msgid "Files need to be downloaded one by one."
 msgstr "Los archivos deben ser descargados de a uno."
 
-#: files.php:212 files.php:245
+#: files.php:228 files.php:261
 msgid "Back to Files"
 msgstr "Volver a archivos"
 
-#: files.php:242
+#: files.php:258
 msgid "Selected files too large to generate zip file."
 msgstr "Los archivos seleccionados son demasiado grandes para generar el archivo zip."
 
@@ -86,104 +90,102 @@ msgstr "Texto"
 msgid "Images"
 msgstr "Imágenes"
 
-#: setup.php:34
-msgid "Set an admin username."
-msgstr "Configurar un nombre de administrador"
-
-#: setup.php:37
-msgid "Set an admin password."
-msgstr "Configurar una palabra clave de administrador"
-
-#: setup.php:55
+#: setup/abstractdatabase.php:22
 #, php-format
 msgid "%s enter the database username."
 msgstr "%s Entre el Usuario de la Base de Datos"
 
-#: setup.php:58
+#: setup/abstractdatabase.php:25
 #, php-format
 msgid "%s enter the database name."
 msgstr "%s Entre el Nombre de la Base de Datos"
 
-#: setup.php:61
+#: setup/abstractdatabase.php:28
 #, php-format
 msgid "%s you may not use dots in the database name"
 msgstr "%s no puede usar puntos en el nombre de la Base de Datos"
 
-#: setup.php:64
+#: setup/mssql.php:20
 #, php-format
-msgid "%s set the database host."
-msgstr "%s Especifique la dirección de la Base de Datos"
-
-#: setup.php:126 setup.php:332 setup.php:377
-msgid "PostgreSQL username and/or password not valid"
-msgstr "Nombre de usuario o contraseña de PostgradeSQL no válido."
+msgid "MS SQL username and/or password not valid: %s"
+msgstr "Nombre de usuario y contraseña de MS SQL no son válidas: %s"
 
-#: setup.php:127 setup.php:235
+#: setup/mssql.php:21 setup/mysql.php:13 setup/oci.php:114
+#: setup/postgresql.php:24 setup/postgresql.php:70
 msgid "You need to enter either an existing account or the administrator."
 msgstr "Debe ingresar una cuenta existente o el administrador"
 
-#: setup.php:152
-msgid "Oracle connection could not be established"
-msgstr "No fue posible establecer la conexión a Oracle"
-
-#: setup.php:234
+#: setup/mysql.php:12
 msgid "MySQL username and/or password not valid"
 msgstr "Usuario y/o contraseña MySQL no válido"
 
-#: setup.php:288 setup.php:398 setup.php:407 setup.php:425 setup.php:435
-#: setup.php:444 setup.php:477 setup.php:543 setup.php:569 setup.php:576
-#: setup.php:587 setup.php:594 setup.php:603 setup.php:611 setup.php:620
-#: setup.php:626
+#: setup/mysql.php:67 setup/oci.php:54 setup/oci.php:121 setup/oci.php:147
+#: setup/oci.php:154 setup/oci.php:165 setup/oci.php:172 setup/oci.php:181
+#: setup/oci.php:189 setup/oci.php:198 setup/oci.php:204
+#: setup/postgresql.php:89 setup/postgresql.php:98 setup/postgresql.php:115
+#: setup/postgresql.php:125 setup/postgresql.php:134
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr "Error DB: \"%s\""
 
-#: setup.php:289 setup.php:399 setup.php:408 setup.php:426 setup.php:436
-#: setup.php:445 setup.php:478 setup.php:544 setup.php:570 setup.php:577
-#: setup.php:588 setup.php:604 setup.php:612 setup.php:621
+#: setup/mysql.php:68 setup/oci.php:55 setup/oci.php:122 setup/oci.php:148
+#: setup/oci.php:155 setup/oci.php:166 setup/oci.php:182 setup/oci.php:190
+#: setup/oci.php:199 setup/postgresql.php:90 setup/postgresql.php:99
+#: setup/postgresql.php:116 setup/postgresql.php:126 setup/postgresql.php:135
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr "El comando no comprendido es: \"%s\""
 
-#: setup.php:305
+#: setup/mysql.php:85
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr "Usuario MySQL '%s'@'localhost' ya existente"
 
-#: setup.php:306
+#: setup/mysql.php:86
 msgid "Drop this user from MySQL"
 msgstr "Borrar este usuario de MySQL"
 
-#: setup.php:311
+#: setup/mysql.php:91
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr "Usuario MySQL '%s'@'%%' ya existente"
 
-#: setup.php:312
+#: setup/mysql.php:92
 msgid "Drop this user from MySQL."
 msgstr "Borrar este usuario de MySQL"
 
-#: setup.php:469 setup.php:536
+#: setup/oci.php:34
+msgid "Oracle connection could not be established"
+msgstr "No fue posible establecer la conexión a Oracle"
+
+#: setup/oci.php:41 setup/oci.php:113
 msgid "Oracle username and/or password not valid"
 msgstr "El nombre de usuario y contraseña no son válidos"
 
-#: setup.php:595 setup.php:627
+#: setup/oci.php:173 setup/oci.php:205
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr "El comando no comprendido es: \"%s\", nombre: \"%s\", contraseña: \"%s\""
 
-#: setup.php:647
-#, php-format
-msgid "MS SQL username and/or password not valid: %s"
-msgstr "Nombre de usuario y contraseña de MS SQL no son válidas: %s"
+#: setup/postgresql.php:23 setup/postgresql.php:69
+msgid "PostgreSQL username and/or password not valid"
+msgstr "Nombre de usuario o contraseña de PostgradeSQL no válido."
+
+#: setup.php:42
+msgid "Set an admin username."
+msgstr "Configurar un nombre de administrador"
+
+#: setup.php:45
+msgid "Set an admin password."
+msgstr "Configurar una palabra clave de administrador"
 
-#: setup.php:870
+#: setup.php:198
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Tu servidor web no está configurado todavía para permitir sincronización de archivos porque la interfaz WebDAV parece no funcionar."
 
-#: setup.php:871
+#: setup.php:199
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Por favor, comprobá nuevamente la <a href='%s'>guía de instalación</a>."
diff --git a/l10n/es_AR/settings.po b/l10n/es_AR/settings.po
index c83eac5a4d65d366dd1d69819e5e48d25c9a23e2..7e34405cec249b4732d101147cb65671a1d7872f 100644
--- a/l10n/es_AR/settings.po
+++ b/l10n/es_AR/settings.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
-"Last-Translator: cjtess <claudio.tessone@gmail.com>\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -30,7 +30,7 @@ msgstr "Error al autenticar"
 
 #: ajax/changedisplayname.php:31
 msgid "Your display name has been changed."
-msgstr "El nombre mostrado fue cambiado"
+msgstr "El nombre mostrado que usás fue cambiado."
 
 #: ajax/changedisplayname.php:34
 msgid "Unable to change display name"
@@ -46,7 +46,7 @@ msgstr "No fue posible añadir el grupo"
 
 #: ajax/enableapp.php:11
 msgid "Could not enable app. "
-msgstr "No se puede  habilitar la aplicación."
+msgstr "No se pudo habilitar la App."
 
 #: ajax/lostpassword.php:12
 msgid "Email saved"
@@ -54,15 +54,15 @@ msgstr "e-mail guardado"
 
 #: ajax/lostpassword.php:14
 msgid "Invalid email"
-msgstr "el e-mail no es válido "
+msgstr "El e-mail no es válido "
 
 #: ajax/removegroup.php:13
 msgid "Unable to delete group"
-msgstr "No fue posible eliminar el grupo"
+msgstr "No fue posible borrar el grupo"
 
 #: ajax/removeuser.php:25
 msgid "Unable to delete user"
-msgstr "No fue posible eliminar el usuario"
+msgstr "No fue posible borrar el usuario"
 
 #: ajax/setlanguage.php:15
 msgid "Language changed"
@@ -70,55 +70,55 @@ msgstr "Idioma cambiado"
 
 #: ajax/setlanguage.php:17 ajax/setlanguage.php:20
 msgid "Invalid request"
-msgstr "Pedido no válido"
+msgstr "Pedido inválido"
 
 #: ajax/togglegroups.php:12
 msgid "Admins can't remove themself from the admin group"
-msgstr "Los administradores no se pueden quitar a ellos mismos del grupo administrador. "
+msgstr "Los administradores no se pueden quitar a si mismos del grupo administrador. "
 
 #: ajax/togglegroups.php:30
 #, php-format
 msgid "Unable to add user to group %s"
-msgstr "No fue posible añadir el usuario al grupo %s"
+msgstr "No fue posible agregar el usuario al grupo %s"
 
 #: ajax/togglegroups.php:36
 #, php-format
 msgid "Unable to remove user from group %s"
-msgstr "No es posible eliminar al usuario del grupo %s"
+msgstr "No es posible borrar al usuario del grupo %s"
 
 #: ajax/updateapp.php:14
 msgid "Couldn't update app."
-msgstr "No se pudo actualizar la aplicación."
+msgstr "No se pudo actualizar la App."
 
-#: js/apps.js:30
+#: js/apps.js:35
 msgid "Update to {appversion}"
-msgstr "Actualizado a {appversion}"
+msgstr "Actualizar a {appversion}"
 
-#: js/apps.js:36 js/apps.js:76
+#: js/apps.js:41 js/apps.js:81
 msgid "Disable"
 msgstr "Desactivar"
 
-#: js/apps.js:36 js/apps.js:64 js/apps.js:83
+#: js/apps.js:41 js/apps.js:69 js/apps.js:88
 msgid "Enable"
 msgstr "Activar"
 
-#: js/apps.js:55
+#: js/apps.js:60
 msgid "Please wait...."
 msgstr "Por favor, esperá...."
 
-#: js/apps.js:59 js/apps.js:71 js/apps.js:80 js/apps.js:93
+#: js/apps.js:64 js/apps.js:76 js/apps.js:85 js/apps.js:98
 msgid "Error"
 msgstr "Error"
 
-#: js/apps.js:90
+#: js/apps.js:95
 msgid "Updating...."
 msgstr "Actualizando...."
 
-#: js/apps.js:93
+#: js/apps.js:98
 msgid "Error while updating app"
-msgstr "Error al actualizar"
+msgstr "Error al actualizar App"
 
-#: js/apps.js:96
+#: js/apps.js:101
 msgid "Updated"
 msgstr "Actualizado"
 
@@ -136,7 +136,7 @@ msgstr "deshacer"
 
 #: js/users.js:79
 msgid "Unable to remove user"
-msgstr "Imposible remover usuario"
+msgstr "Imposible borrar usuario"
 
 #: js/users.js:92 templates/users.php:26 templates/users.php:87
 #: templates/users.php:112
@@ -153,7 +153,7 @@ msgstr "Borrar"
 
 #: js/users.js:269
 msgid "add group"
-msgstr "Agregar grupo"
+msgstr "agregar grupo"
 
 #: js/users.js:428
 msgid "A valid username must be provided"
@@ -167,15 +167,15 @@ msgstr "Error creando usuario"
 msgid "A valid password must be provided"
 msgstr "Debe ingresar una contraseña válida"
 
-#: personal.php:35 personal.php:36
+#: personal.php:37 personal.php:38
 msgid "__language_name__"
 msgstr "Castellano (Argentina)"
 
-#: templates/admin.php:15
+#: templates/admin.php:17
 msgid "Security Warning"
 msgstr "Advertencia de seguridad"
 
-#: templates/admin.php:18
+#: templates/admin.php:20
 msgid ""
 "Your data directory and your files are probably accessible from the "
 "internet. The .htaccess file that ownCloud provides is not working. We "
@@ -184,48 +184,48 @@ msgid ""
 " webserver document root."
 msgstr "Tu directorio de datos y tus archivos son probablemente accesibles desde internet. El archivo .htaccess provisto por ownCloud no está funcionando. Te sugerimos que configures tu servidor web de manera que el directorio de datos ya no esté accesible, o que muevas el directorio de datos afuera del directorio raíz de tu servidor web."
 
-#: templates/admin.php:29
+#: templates/admin.php:31
 msgid "Setup Warning"
 msgstr "Alerta de Configuración"
 
-#: templates/admin.php:32
+#: templates/admin.php:34
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Tu servidor web no está configurado todavía para permitir sincronización de archivos porque la interfaz WebDAV parece no funcionar."
 
-#: templates/admin.php:33
+#: templates/admin.php:35
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Por favor, comprobá nuevamente la <a href='%s'>guía de instalación</a>."
 
-#: templates/admin.php:44
+#: templates/admin.php:46
 msgid "Module 'fileinfo' missing"
-msgstr "Modulo 'fileinfo' no existe"
+msgstr "El módulo 'fileinfo' no existe"
 
-#: templates/admin.php:47
+#: templates/admin.php:49
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
-msgstr "El modulo PHP 'fileinfo' no existe. Es muy recomendable que active este modulo para obtener mejores resultados con la detección mime-type"
+msgstr "El módulo PHP 'fileinfo' no existe. Es recomendable que actives este módulo para obtener mejores resultados con la detección mime-type"
 
-#: templates/admin.php:58
+#: templates/admin.php:60
 msgid "Locale not working"
 msgstr "\"Locale\" no está funcionando"
 
-#: templates/admin.php:63
+#: templates/admin.php:65
 #, php-format
 msgid ""
 "This ownCloud server can't set system locale to %s. This means that there "
 "might be problems with certain characters in file names. We strongly suggest"
 " to install the required packages on your system to support %s."
-msgstr "El servidor ownCloud no pude asignar la localización de sistema a %s. Esto puede hacer que hayan problemas con algunos caracteres en los nombres de los archivos. Te sugerimos que instales los paquetes necesarios en tu sistema para dar soporte a %s."
+msgstr "El servidor ownCloud no puede asignar la localización de sistema a %s. Esto puede provocar que existan problemas con algunos caracteres en los nombres de los archivos. Te sugerimos que instales los paquetes necesarios en tu sistema para dar soporte a %s."
 
-#: templates/admin.php:75
+#: templates/admin.php:77
 msgid "Internet connection not working"
 msgstr "La conexión a Internet no esta funcionando. "
 
-#: templates/admin.php:78
+#: templates/admin.php:80
 msgid ""
 "This ownCloud server has no working internet connection. This means that "
 "some of the features like mounting of external storage, notifications about "
@@ -233,104 +233,104 @@ msgid ""
 "remote and sending of notification emails might also not work. We suggest to"
 " enable internet connection for this server if you want to have all features"
 " of ownCloud."
-msgstr "Este servidor ownCloud no tiene una conexión a internet que funcione. Esto significa que alguno de sus servicios como montar dispositivos externos, notificaciones de actualizaciones o instalar aplicaciones de otros desarrolladores no funcionan. Acceder a archivos remotos y mandar e-mails puede ser que tampoco funcione. Te sugerimos que actives una conexión a internet si querés estas características  de ownCloud."
+msgstr "Este servidor ownCloud no tiene una conexión a internet que funcione. Esto significa que alguno de sus servicios, tales  como montar dispositivos externos, notificación de actualizaciones o instalar Apps de otros desarrolladores no funcionan. Puede ser que tampoco puedas acceder a archivos remotos y mandar e-mails. Te sugerimos que actives una conexión a internet si querés estas características en ownCloud."
 
-#: templates/admin.php:92
+#: templates/admin.php:94
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:101
+#: templates/admin.php:103
 msgid "Execute one task with each page loaded"
-msgstr "Ejecute una tarea con cada pagina cargada."
+msgstr "Ejecutá una tarea con cada pagina cargada."
 
-#: templates/admin.php:111
+#: templates/admin.php:113
 msgid ""
 "cron.php is registered at a webcron service. Call the cron.php page in the "
 "owncloud root once a minute over http."
 msgstr "cron.php está registrado como un servicio webcron. Llamar la página cron.php en la raíz de ownCloud una vez al minuto sobre http."
 
-#: templates/admin.php:121
+#: templates/admin.php:123
 msgid ""
 "Use systems cron service. Call the cron.php file in the owncloud folder via "
 "a system cronjob once a minute."
-msgstr "Usa el servicio de sistema cron. Llama al archivo cron.php en la carpeta de ownCloud a través del sistema cronjob cada un minuto."
+msgstr "Usar el servicio de sistema cron. Llama al archivo cron.php en la carpeta de ownCloud a través del sistema cronjob cada un minuto."
 
-#: templates/admin.php:128
+#: templates/admin.php:130
 msgid "Sharing"
 msgstr "Compartiendo"
 
-#: templates/admin.php:134
+#: templates/admin.php:136
 msgid "Enable Share API"
 msgstr "Habilitar Share API"
 
-#: templates/admin.php:135
+#: templates/admin.php:137
 msgid "Allow apps to use the Share API"
 msgstr "Permitir a las aplicaciones usar la Share API"
 
-#: templates/admin.php:142
+#: templates/admin.php:144
 msgid "Allow links"
 msgstr "Permitir enlaces"
 
-#: templates/admin.php:143
+#: templates/admin.php:145
 msgid "Allow users to share items to the public with links"
 msgstr "Permitir a los usuarios compartir enlaces públicos"
 
-#: templates/admin.php:150
+#: templates/admin.php:152
 msgid "Allow resharing"
 msgstr "Permitir Re-Compartir"
 
-#: templates/admin.php:151
+#: templates/admin.php:153
 msgid "Allow users to share items shared with them again"
-msgstr "Permite a los usuarios volver a compartir items que le han compartido"
+msgstr "Permite a los usuarios volver a compartir items que les fueron compartidos"
 
-#: templates/admin.php:158
+#: templates/admin.php:160
 msgid "Allow users to share with anyone"
-msgstr "Permitir a los usuarios compartir con todos."
+msgstr "Permitir a los usuarios compartir con cualquiera."
 
-#: templates/admin.php:161
+#: templates/admin.php:163
 msgid "Allow users to only share with users in their groups"
-msgstr "Permitir a los usuarios compartir solo con los de su propio grupo"
+msgstr "Permitir a los usuarios compartir sólo con los de sus mismos grupos"
 
-#: templates/admin.php:168
+#: templates/admin.php:170
 msgid "Security"
 msgstr "Seguridad"
 
-#: templates/admin.php:181
+#: templates/admin.php:183
 msgid "Enforce HTTPS"
 msgstr "Forzar HTTPS"
 
-#: templates/admin.php:182
+#: templates/admin.php:184
 msgid ""
 "Enforces the clients to connect to ownCloud via an encrypted connection."
-msgstr "Forzar a los clientes conectar a ownCloud vía conexión encriptada"
+msgstr "Forzar a los clientes conectar a ownCloud vía conexión encriptada."
 
-#: templates/admin.php:185
+#: templates/admin.php:187
 msgid ""
 "Please connect to this ownCloud instance via HTTPS to enable or disable the "
 "SSL enforcement."
-msgstr "Por favor conectese a este ownCloud vía HTTPS para habilitar o des-habilitar el forzado de SSL"
+msgstr "Por favor conectate a este ownCloud vía HTTPS para habilitar o deshabilitar el SSL."
 
-#: templates/admin.php:195
+#: templates/admin.php:197
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:196
+#: templates/admin.php:198
 msgid "Log level"
 msgstr "Nivel de Log"
 
-#: templates/admin.php:227
+#: templates/admin.php:229
 msgid "More"
 msgstr "Más"
 
-#: templates/admin.php:228
+#: templates/admin.php:230
 msgid "Less"
 msgstr "Menos"
 
-#: templates/admin.php:235 templates/personal.php:116
+#: templates/admin.php:236 templates/personal.php:116
 msgid "Version"
 msgstr "Versión"
 
-#: templates/admin.php:237 templates/personal.php:119
+#: templates/admin.php:240 templates/personal.php:119
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -342,15 +342,15 @@ msgstr "Desarrollado por la <a href=\"http://ownCloud.org/contact\" target=\"_bl
 
 #: templates/apps.php:13
 msgid "Add your App"
-msgstr "Añadí tu aplicación"
+msgstr "Añadí tu App"
 
 #: templates/apps.php:28
 msgid "More Apps"
-msgstr "Más aplicaciones"
+msgstr "Más Apps"
 
 #: templates/apps.php:33
 msgid "Select an App"
-msgstr "Seleccionar una aplicación"
+msgstr "Elegí una App"
 
 #: templates/apps.php:39
 msgid "See application page at apps.owncloud.com"
@@ -388,78 +388,81 @@ msgstr "Informar errores"
 msgid "Commercial Support"
 msgstr "Soporte comercial"
 
-#: templates/personal.php:9
+#: templates/personal.php:10
 msgid "Get the apps to sync your files"
-msgstr "Obtené aplicaciones para sincronizar tus archivos"
+msgstr "Obtené Apps para sincronizar tus archivos"
 
-#: templates/personal.php:20
+#: templates/personal.php:21
 msgid "Show First Run Wizard again"
 msgstr "Mostrar de nuevo el asistente de primera ejecución"
 
-#: templates/personal.php:28
+#: templates/personal.php:29
 #, php-format
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
-msgstr "Usaste  <strong>%s</strong>  de los  <strong>%s</strong>  disponibles"
+msgstr "Usás <strong>%s</strong>  de los <strong>%s</strong> disponibles"
 
-#: templates/personal.php:40 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:41 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "Contraseña"
 
-#: templates/personal.php:41
+#: templates/personal.php:42
 msgid "Your password was changed"
 msgstr "Tu contraseña fue cambiada"
 
-#: templates/personal.php:42
+#: templates/personal.php:43
 msgid "Unable to change your password"
 msgstr "No fue posible cambiar tu contraseña"
 
-#: templates/personal.php:43
+#: templates/personal.php:44
 msgid "Current password"
 msgstr "Contraseña actual"
 
-#: templates/personal.php:45
+#: templates/personal.php:46
 msgid "New password"
 msgstr "Nueva contraseña:"
 
-#: templates/personal.php:47
+#: templates/personal.php:48
 msgid "Change password"
 msgstr "Cambiar contraseña"
 
-#: templates/personal.php:59 templates/users.php:85
+#: templates/personal.php:60 templates/users.php:85
 msgid "Display Name"
 msgstr "Nombre a mostrar"
 
-#: templates/personal.php:74
+#: templates/personal.php:75
 msgid "Email"
-msgstr "Correo Electrónico"
+msgstr "e-mail"
 
-#: templates/personal.php:76
+#: templates/personal.php:77
 msgid "Your email address"
 msgstr "Tu dirección de e-mail"
 
-#: templates/personal.php:77
+#: templates/personal.php:78
 msgid "Fill in an email address to enable password recovery"
-msgstr "Escribí una dirección de correo electrónico para restablecer la contraseña"
+msgstr "Escribí una dirección de e-mail para restablecer la contraseña"
 
-#: templates/personal.php:86 templates/personal.php:87
+#: templates/personal.php:87 templates/personal.php:88
 msgid "Language"
 msgstr "Idioma"
 
-#: templates/personal.php:99
+#: templates/personal.php:100
 msgid "Help translate"
 msgstr "Ayudanos a traducir"
 
-#: templates/personal.php:105
+#: templates/personal.php:106
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:107
-msgid "Use this address to connect to your ownCloud in your file manager"
-msgstr "Utiliza esta dirección para conectarte con ownCloud en tu Administrador de Archivos"
+#: templates/personal.php:108
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
+"target=\"_blank\">access your Files via WebDAV</a>"
+msgstr ""
 
-#: templates/users.php:21 templates/users.php:84
+#: templates/users.php:21
 msgid "Login Name"
-msgstr "Nombre de "
+msgstr "Nombre de Usuario"
 
 #: templates/users.php:30
 msgid "Create"
@@ -487,13 +490,17 @@ msgstr "Ilimitado"
 msgid "Other"
 msgstr "Otros"
 
+#: templates/users.php:84
+msgid "Username"
+msgstr "Nombre de usuario"
+
 #: templates/users.php:91
 msgid "Storage"
 msgstr "Almacenamiento"
 
 #: templates/users.php:102
 msgid "change display name"
-msgstr "Cambiar el nombre que se muestra"
+msgstr "Cambiar el nombre mostrado"
 
 #: templates/users.php:106
 msgid "set new password"
diff --git a/l10n/es_AR/user_ldap.po b/l10n/es_AR/user_ldap.po
index 9d3126e455de97473d6daa63ddd7bf00898f40df..64edc728f2e6fef1dd9ab65ce6c42bd4b7c81ac1 100644
--- a/l10n/es_AR/user_ldap.po
+++ b/l10n/es_AR/user_ldap.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:25+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:16+0000\n"
 "Last-Translator: cjtess <claudio.tessone@gmail.com>\n"
 "Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
 "MIME-Version: 1.0\n"
@@ -20,7 +20,7 @@ msgstr ""
 
 #: ajax/clearMappings.php:34
 msgid "Failed to clear the mappings."
-msgstr ""
+msgstr "Hubo un error al borrar las asignaciones."
 
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
@@ -60,7 +60,7 @@ msgstr "No se pudo añadir la configuración del servidor"
 
 #: js/settings.js:111
 msgid "mappings cleared"
-msgstr ""
+msgstr "Asignaciones borradas"
 
 #: js/settings.js:112
 msgid "Success"
@@ -343,7 +343,7 @@ msgstr "Vacío para el nombre de usuario (por defecto). En otro caso, especific
 
 #: templates/settings.php:101
 msgid "Internal Username"
-msgstr ""
+msgstr "Nombre interno de usuario"
 
 #: templates/settings.php:102
 msgid ""
@@ -359,15 +359,15 @@ msgid ""
 "achieve a similar behaviour as before ownCloud 5 enter the user display name"
 " attribute in the following field. Leave it empty for default behaviour. "
 "Changes will have effect only on newly mapped (added) LDAP users."
-msgstr ""
+msgstr "Por defecto, el nombre interno de usuario va a ser creado a partir del atributo UUID. Esto asegura que el nombre de usuario es único y los caracteres no necesitan ser convertidos. Para el nombre de usuario interno sólo se pueden usar estos caracteres: [a-zA-Z0-9_.@-]. Otros caracteres son sustituidos por su correspondiente en ASCII o simplemente omitidos. Si ocurrieran colisiones, un número será añadido o incrementado. El nombre interno de usuario se usa para identificar un usuario internamente. Es también el nombre por defecto para el directorio personal del usuario in ownCloud. También es un puerto de URLs remotas, por ejemplo, para todos los servicios *DAV. Con esta configuración el comportamiento por defecto puede ser cambiado. Para conseguir un comportamiento similar al anterior a ownCloud 5, ingresá el atributo del nombre en pantalla del usuario en el siguiente campo. Dejalo vacío para el comportamiento por defecto. Los cambios solo tendrán efecto para los nuevos usuarios LDAP."
 
 #: templates/settings.php:103
 msgid "Internal Username Attribute:"
-msgstr ""
+msgstr "Atributo Nombre Interno de usuario:"
 
 #: templates/settings.php:104
 msgid "Override UUID detection"
-msgstr ""
+msgstr "Sobrescribir la detección UUID"
 
 #: templates/settings.php:105
 msgid ""
@@ -378,15 +378,15 @@ msgid ""
 "You must make sure that the attribute of your choice can be fetched for both"
 " users and groups and it is unique. Leave it empty for default behaviour. "
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
-msgstr ""
+msgstr "Por defecto, ownCloud detecta automáticamente el atributo UUID. El atributo UUID se usa para identificar indudablemente usuarios y grupos LDAP. Además, el nombre de usuario interno va a ser creado en base al UUID, si no ha sido especificado otro comportamiento arriba. Podés sobrescribir la configuración y pasar un atributo de tu elección. Tenés que asegurarte de que el atributo de tu elección sea accesible por los usuarios y grupos y ser único. Dejalo en blanco para usar el comportamiento por defecto. Los cambios tendrán efecto sólo en los nuevos usuarios y grupos de LDAP."
 
 #: templates/settings.php:106
 msgid "UUID Attribute:"
-msgstr ""
+msgstr "Atributo UUID:"
 
 #: templates/settings.php:107
 msgid "Username-LDAP User Mapping"
-msgstr ""
+msgstr "Asignación del Nombre de usuario de un usuario LDAP"
 
 #: templates/settings.php:108
 msgid ""
@@ -401,15 +401,15 @@ msgid ""
 "configuration sensitive, it affects all LDAP configurations! Do never clear "
 "the mappings in a production environment. Only clear mappings in a testing "
 "or experimental stage."
-msgstr ""
+msgstr "ownCloud usa nombres de usuario para almacenar y asignar (meta) datos. Con el fin de identificar con precisión y reconocer usuarios, cada usuario LDAP tendrá un nombre de usuario interno. Esto requiere una asignación de nombre de usuario de ownCloud a usuario LDAP. El nombre de usuario creado se asigna al UUID del usuario LDAP. Además el DN se almacena en caché principalmente para reducir la interacción de LDAP, pero no se utiliza para la identificación. Si la DN cambia, los cambios serán encontrados por ownCloud. El nombre interno de ownCloud se utiliza para todo en ownCloud. Borrar las asignaciones dejará restos en distintos lugares. Borrar las asignaciones no depende de la configuración, ¡afecta a todas las configuraciones de LDAP! No borrar nunca las asignaciones en un entorno de producción. Sólo borrar asignaciones en una situación de prueba o experimental."
 
 #: templates/settings.php:109
 msgid "Clear Username-LDAP User Mapping"
-msgstr ""
+msgstr "Borrar la asignación de los Nombres de usuario de los usuarios LDAP"
 
 #: templates/settings.php:109
 msgid "Clear Groupname-LDAP Group Mapping"
-msgstr ""
+msgstr "Borrar la asignación de los Nombres de grupo de los grupos de LDAP"
 
 #: templates/settings.php:111
 msgid "Test Configuration"
diff --git a/l10n/es_AR/user_webdavauth.po b/l10n/es_AR/user_webdavauth.po
index 331ef231ba7afff468d11637178a488c852753b6..aaa1cdcdb30f263af5b4339c3af9759d06ab271c 100644
--- a/l10n/es_AR/user_webdavauth.po
+++ b/l10n/es_AR/user_webdavauth.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-15 01:59+0200\n"
-"PO-Revision-Date: 2013-06-15 00:00+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-06-25 02:04+0200\n"
+"PO-Revision-Date: 2013-06-24 13:50+0000\n"
+"Last-Translator: cjtess <claudio.tessone@gmail.com>\n"
 "Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -26,7 +26,7 @@ msgstr "Autenticación de WevDAV"
 
 #: templates/settings.php:4
 msgid "URL: "
-msgstr ""
+msgstr "URL: "
 
 #: templates/settings.php:7
 msgid ""
diff --git a/l10n/et_EE/core.po b/l10n/et_EE/core.po
index 2883d8d0513a6a07525c8816f639df591edc49ec..c11095516f257ef3e62341ddddbfdc19419f0f62 100644
--- a/l10n/et_EE/core.po
+++ b/l10n/et_EE/core.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
 "MIME-Version: 1.0\n"
@@ -22,7 +22,7 @@ msgstr ""
 #: ajax/share.php:97
 #, php-format
 msgid "%s shared »%s« with you"
-msgstr ""
+msgstr "%s jagas sinuga »%s«"
 
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
@@ -63,135 +63,135 @@ msgstr "Kustutamiseks pole kategooriat valitud."
 msgid "Error removing %s from favorites."
 msgstr "Viga %s eemaldamisel lemmikutest."
 
-#: js/config.php:34
+#: js/config.php:32
 msgid "Sunday"
 msgstr "Pühapäev"
 
-#: js/config.php:35
+#: js/config.php:33
 msgid "Monday"
 msgstr "Esmaspäev"
 
-#: js/config.php:36
+#: js/config.php:34
 msgid "Tuesday"
 msgstr "Teisipäev"
 
-#: js/config.php:37
+#: js/config.php:35
 msgid "Wednesday"
 msgstr "Kolmapäev"
 
-#: js/config.php:38
+#: js/config.php:36
 msgid "Thursday"
 msgstr "Neljapäev"
 
-#: js/config.php:39
+#: js/config.php:37
 msgid "Friday"
 msgstr "Reede"
 
-#: js/config.php:40
+#: js/config.php:38
 msgid "Saturday"
 msgstr "Laupäev"
 
-#: js/config.php:45
+#: js/config.php:43
 msgid "January"
 msgstr "Jaanuar"
 
-#: js/config.php:46
+#: js/config.php:44
 msgid "February"
 msgstr "Veebruar"
 
-#: js/config.php:47
+#: js/config.php:45
 msgid "March"
 msgstr "Märts"
 
-#: js/config.php:48
+#: js/config.php:46
 msgid "April"
 msgstr "Aprill"
 
-#: js/config.php:49
+#: js/config.php:47
 msgid "May"
 msgstr "Mai"
 
-#: js/config.php:50
+#: js/config.php:48
 msgid "June"
 msgstr "Juuni"
 
-#: js/config.php:51
+#: js/config.php:49
 msgid "July"
 msgstr "Juuli"
 
-#: js/config.php:52
+#: js/config.php:50
 msgid "August"
 msgstr "August"
 
-#: js/config.php:53
+#: js/config.php:51
 msgid "September"
 msgstr "September"
 
-#: js/config.php:54
+#: js/config.php:52
 msgid "October"
 msgstr "Oktoober"
 
-#: js/config.php:55
+#: js/config.php:53
 msgid "November"
 msgstr "November"
 
-#: js/config.php:56
+#: js/config.php:54
 msgid "December"
 msgstr "Detsember"
 
-#: js/js.js:286
+#: js/js.js:293
 msgid "Settings"
 msgstr "Seaded"
 
-#: js/js.js:718
+#: js/js.js:725
 msgid "seconds ago"
 msgstr "sekundit tagasi"
 
-#: js/js.js:719
+#: js/js.js:726
 msgid "1 minute ago"
 msgstr "1 minut tagasi"
 
-#: js/js.js:720
+#: js/js.js:727
 msgid "{minutes} minutes ago"
 msgstr "{minutes} minutit tagasi"
 
-#: js/js.js:721
+#: js/js.js:728
 msgid "1 hour ago"
 msgstr "1 tund tagasi"
 
-#: js/js.js:722
+#: js/js.js:729
 msgid "{hours} hours ago"
 msgstr "{hours} tundi tagasi"
 
-#: js/js.js:723
+#: js/js.js:730
 msgid "today"
 msgstr "täna"
 
-#: js/js.js:724
+#: js/js.js:731
 msgid "yesterday"
 msgstr "eile"
 
-#: js/js.js:725
+#: js/js.js:732
 msgid "{days} days ago"
 msgstr "{days} päeva tagasi"
 
-#: js/js.js:726
+#: js/js.js:733
 msgid "last month"
 msgstr "viimasel kuul"
 
-#: js/js.js:727
+#: js/js.js:734
 msgid "{months} months ago"
 msgstr "{months} kuud tagasi"
 
-#: js/js.js:728
+#: js/js.js:735
 msgid "months ago"
 msgstr "kuu tagasi"
 
-#: js/js.js:729
+#: js/js.js:736
 msgid "last year"
 msgstr "viimasel aastal"
 
-#: js/js.js:730
+#: js/js.js:737
 msgid "years ago"
 msgstr "aastat tagasi"
 
@@ -227,8 +227,8 @@ msgstr "Objekti tüüp pole määratletud."
 #: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
 #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:577
-#: js/share.js:589
+#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:620
+#: js/share.js:632
 msgid "Error"
 msgstr "Viga"
 
@@ -248,7 +248,7 @@ msgstr "Jagatud"
 msgid "Share"
 msgstr "Jaga"
 
-#: js/share.js:125 js/share.js:617
+#: js/share.js:125 js/share.js:660
 msgid "Error while sharing"
 msgstr "Viga jagamisel"
 
@@ -268,99 +268,103 @@ msgstr "Jagatud sinu ja {group} grupiga {owner} poolt"
 msgid "Shared with you by {owner}"
 msgstr "Sinuga jagas {owner}"
 
-#: js/share.js:159
+#: js/share.js:172
 msgid "Share with"
 msgstr "Jaga"
 
-#: js/share.js:164
+#: js/share.js:177
 msgid "Share with link"
 msgstr "Jaga lingiga"
 
-#: js/share.js:167
+#: js/share.js:180
 msgid "Password protect"
 msgstr "Parooliga kaitstud"
 
-#: js/share.js:169 templates/installation.php:54 templates/login.php:26
+#: js/share.js:182 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "Parool"
 
-#: js/share.js:173
+#: js/share.js:187
+msgid "Allow Public Upload"
+msgstr "Luba avalik üleslaadimine"
+
+#: js/share.js:191
 msgid "Email link to person"
 msgstr "Saada link isikule e-postiga"
 
-#: js/share.js:174
+#: js/share.js:192
 msgid "Send"
 msgstr "Saada"
 
-#: js/share.js:178
+#: js/share.js:197
 msgid "Set expiration date"
 msgstr "Määra aegumise kuupäev"
 
-#: js/share.js:179
+#: js/share.js:198
 msgid "Expiration date"
 msgstr "Aegumise kuupäev"
 
-#: js/share.js:211
+#: js/share.js:230
 msgid "Share via email:"
 msgstr "Jaga e-postiga:"
 
-#: js/share.js:213
+#: js/share.js:232
 msgid "No people found"
 msgstr "Ãœhtegi inimest ei leitud"
 
-#: js/share.js:251
+#: js/share.js:270
 msgid "Resharing is not allowed"
 msgstr "Edasijagamine pole lubatud"
 
-#: js/share.js:287
+#: js/share.js:306
 msgid "Shared in {item} with {user}"
 msgstr "Jagatud {item} kasutajaga {user}"
 
-#: js/share.js:308
+#: js/share.js:327
 msgid "Unshare"
 msgstr "Lõpeta jagamine"
 
-#: js/share.js:320
+#: js/share.js:339
 msgid "can edit"
 msgstr "saab muuta"
 
-#: js/share.js:322
+#: js/share.js:341
 msgid "access control"
 msgstr "ligipääsukontroll"
 
-#: js/share.js:325
+#: js/share.js:344
 msgid "create"
 msgstr "loo"
 
-#: js/share.js:328
+#: js/share.js:347
 msgid "update"
 msgstr "uuenda"
 
-#: js/share.js:331
+#: js/share.js:350
 msgid "delete"
 msgstr "kustuta"
 
-#: js/share.js:334
+#: js/share.js:353
 msgid "share"
 msgstr "jaga"
 
-#: js/share.js:368 js/share.js:564
+#: js/share.js:387 js/share.js:607
 msgid "Password protected"
 msgstr "Parooliga kaitstud"
 
-#: js/share.js:577
+#: js/share.js:620
 msgid "Error unsetting expiration date"
 msgstr "Viga aegumise kuupäeva eemaldamisel"
 
-#: js/share.js:589
+#: js/share.js:632
 msgid "Error setting expiration date"
 msgstr "Viga aegumise kuupäeva määramisel"
 
-#: js/share.js:604
+#: js/share.js:647
 msgid "Sending ..."
 msgstr "Saatmine ..."
 
-#: js/share.js:615
+#: js/share.js:658
 msgid "Email sent"
 msgstr "E-kiri on saadetud"
 
@@ -375,7 +379,7 @@ msgstr "Uuendus ebaõnnestus. Palun teavita probleemidest  <a href=\"https://git
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "Uuendus oli edukas. Kohe suunatakse Sind ownCloudi."
 
-#: lostpassword/controller.php:58
+#: lostpassword/controller.php:60
 msgid "ownCloud password reset"
 msgstr "ownCloud parooli taastamine"
 
@@ -405,17 +409,17 @@ msgstr "Kasutajanimi"
 
 #: lostpassword/templates/lostpassword.php:22
 msgid ""
-"Your files seems to be encrypted. If you didn't have enabled the recovery "
-"key there will be no way to get your data back once the password was "
-"resetted. If you are not sure what to do, please contact your administrator "
-"first before continue. Do you really want to continue?"
-msgstr ""
+"Your files are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
+msgstr "Sinu failid on krüpteeritud. Kui sa pole taastamise võtit veel määranud, siis pole präast parooli taastamist mingit võimalust sinu andmeid tagasi saada. Kui sa pole kindel, mida teha, siis palun väta enne jätkamist ühendust oma administaatoriga. Oled sa kindel, et sa soovid jätkata?"
 
 #: lostpassword/templates/lostpassword.php:24
 msgid "Yes, I really want to reset my password now"
-msgstr ""
+msgstr "Jah, ma tõesti soovin oma parooli praegu nullida"
 
-#: lostpassword/templates/lostpassword.php:29
+#: lostpassword/templates/lostpassword.php:27
 msgid "Request reset"
 msgstr "Päringu taastamine"
 
@@ -463,7 +467,7 @@ msgstr "Ligipääs on keelatud"
 msgid "Cloud not found"
 msgstr "Pilve ei leitud"
 
-#: templates/altmail.php:2
+#: templates/altmail.php:4
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -472,11 +476,7 @@ msgid ""
 "View it: %s\n"
 "\n"
 "Cheers!"
-msgstr ""
-
-#: templates/altmail.php:7 templates/mail.php:24
-msgid "web services under your control"
-msgstr "veebitenused sinu kontrolli all"
+msgstr "Hei,\n\nlihtsalt annan sulle teada, et %s jagas sinuga %s.\nVaata seda siin: %s\n\nTervitused!"
 
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
@@ -570,12 +570,12 @@ msgstr "Andmebaasi host"
 msgid "Finish setup"
 msgstr "Lõpeta seadistamine"
 
-#: templates/layout.user.php:40
+#: templates/layout.user.php:43
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr "%s on saadaval. Vaata lähemalt kuidas uuendada."
 
-#: templates/layout.user.php:67
+#: templates/layout.user.php:68
 msgid "Log out"
 msgstr "Logi välja"
 
@@ -609,12 +609,12 @@ msgstr "Logi sisse"
 msgid "Alternative Logins"
 msgstr "Alternatiivsed sisselogimisviisid"
 
-#: templates/mail.php:15
+#: templates/mail.php:16
 #, php-format
 msgid ""
 "Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
 "href=\"%s\">View it!</a><br><br>Cheers!"
-msgstr ""
+msgstr "Hei,<br><br>lihtsalt annan sulle teada, et %s jagas sinuga »%s«.<br><a href=\"%s\">Vaata seda!</a><br><br>Tervitades!"
 
 #: templates/part.pagenavi.php:3
 msgid "prev"
diff --git a/l10n/et_EE/files.po b/l10n/et_EE/files.po
index 8fcd0d407288a2a7f9deda725151d92adc5c660c..33a7143faf3b4c5f0fc12f7b78c90f2056052556 100644
--- a/l10n/et_EE/files.po
+++ b/l10n/et_EE/files.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:01+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: Rivo Zängov <eraser@eraser.ee>\n"
 "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
 "MIME-Version: 1.0\n"
@@ -29,46 +29,54 @@ msgstr "Ei saa liigutada faili %s - samanimeline fail on juba olemas"
 msgid "Could not move %s"
 msgstr "%s liigutamine ebaõnnestus"
 
-#: ajax/upload.php:19
+#: ajax/upload.php:16 ajax/upload.php:45
+msgid "Unable to set upload directory."
+msgstr "Üleslaadimiste kausta määramine ebaõnnestus."
+
+#: ajax/upload.php:22
+msgid "Invalid Token"
+msgstr "Vigane kontrollkood"
+
+#: ajax/upload.php:59
 msgid "No file was uploaded. Unknown error"
 msgstr "Ühtegi faili ei laetud üles. Tundmatu viga"
 
-#: ajax/upload.php:26
+#: ajax/upload.php:66
 msgid "There is no error, the file uploaded with success"
 msgstr "Ühtegi tõrget polnud, fail on üles laetud"
 
-#: ajax/upload.php:27
+#: ajax/upload.php:67
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr "Üleslaetava faili suurus ületab php.ini poolt määratud upload_max_filesize suuruse:"
 
-#: ajax/upload.php:29
+#: ajax/upload.php:69
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Üleslaetud fail ületab MAX_FILE_SIZE suuruse, mis on HTML vormi jaoks määratud"
 
-#: ajax/upload.php:30
+#: ajax/upload.php:70
 msgid "The uploaded file was only partially uploaded"
 msgstr "Fail laeti üles ainult osaliselt"
 
-#: ajax/upload.php:31
+#: ajax/upload.php:71
 msgid "No file was uploaded"
 msgstr "Ühtegi faili ei laetud üles"
 
-#: ajax/upload.php:32
+#: ajax/upload.php:72
 msgid "Missing a temporary folder"
 msgstr "Ajutiste failide kaust puudub"
 
-#: ajax/upload.php:33
+#: ajax/upload.php:73
 msgid "Failed to write to disk"
 msgstr "Kettale kirjutamine ebaõnnestus"
 
-#: ajax/upload.php:51
+#: ajax/upload.php:91
 msgid "Not enough storage available"
 msgstr "Saadaval pole piisavalt ruumi"
 
-#: ajax/upload.php:83
+#: ajax/upload.php:123
 msgid "Invalid directory."
 msgstr "Vigane kaust."
 
@@ -76,6 +84,36 @@ msgstr "Vigane kaust."
 msgid "Files"
 msgstr "Failid"
 
+#: js/file-upload.js:11
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr "Faili ei saa üles laadida, kuna see on kaust või selle suurus on 0 baiti"
+
+#: js/file-upload.js:24
+msgid "Not enough space available"
+msgstr "Pole piisavalt ruumi"
+
+#: js/file-upload.js:64
+msgid "Upload cancelled."
+msgstr "Üleslaadimine tühistati."
+
+#: js/file-upload.js:167 js/files.js:266
+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/file-upload.js:233 js/files.js:339
+msgid "URL cannot be empty."
+msgstr "URL ei saa olla tühi."
+
+#: js/file-upload.js:238 lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr "Vigane kausta nimi. 'Shared' kasutamine on reserveeritud ownCloud poolt."
+
+#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
+#: js/files.js:693 js/files.js:731
+msgid "Error"
+msgstr "Viga"
+
 #: js/fileactions.js:116
 msgid "Share"
 msgstr "Jaga"
@@ -92,43 +130,43 @@ msgstr "Kustuta"
 msgid "Rename"
 msgstr "Nimeta ümber"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:464
 msgid "Pending"
 msgstr "Ootel"
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "{new_name} already exists"
 msgstr "{new_name} on juba olemas"
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "replace"
 msgstr "asenda"
 
-#: js/filelist.js:259
+#: js/filelist.js:302
 msgid "suggest name"
 msgstr "soovita nime"
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "cancel"
 msgstr "loobu"
 
-#: js/filelist.js:306
+#: js/filelist.js:349
 msgid "replaced {new_name} with {old_name}"
 msgstr "asendas nime {old_name} nimega {new_name}"
 
-#: js/filelist.js:306
+#: js/filelist.js:349
 msgid "undo"
 msgstr "tagasi"
 
-#: js/filelist.js:331
+#: js/filelist.js:374
 msgid "perform delete operation"
 msgstr "teosta kustutamine"
 
-#: js/filelist.js:413
+#: js/filelist.js:456
 msgid "1 file uploading"
 msgstr "1 fail üleslaadimisel"
 
-#: js/filelist.js:416 js/filelist.js:470
+#: js/filelist.js:459 js/filelist.js:517
 msgid "files uploading"
 msgstr "faili üleslaadimisel"
 
@@ -160,70 +198,42 @@ msgid ""
 "big."
 msgstr "Valmistatakse allalaadimist. See võib võtta veidi aega, kui on tegu suurte failidega. "
 
-#: js/files.js:264
-msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "Faili ei saa üles laadida, kuna see on kaust või selle suurus on 0 baiti"
-
-#: js/files.js:277
-msgid "Not enough space available"
-msgstr "Pole piisavalt ruumi"
-
-#: js/files.js:317
-msgid "Upload cancelled."
-msgstr "Üleslaadimine tühistati."
-
-#: js/files.js:413
-msgid ""
-"File upload is in progress. Leaving the page now will cancel the upload."
-msgstr "Faili üleslaadimine on töös. Lehelt lahkumine katkestab selle üleslaadimise."
-
-#: js/files.js:486
-msgid "URL cannot be empty."
-msgstr "URL ei saa olla tühi."
-
-#: js/files.js:491
+#: js/files.js:344
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Vigane kataloogi nimi. 'Shared' kasutamine on reserveeritud ownCloud poolt."
 
-#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
-msgid "Error"
-msgstr "Viga"
-
-#: js/files.js:877 templates/index.php:69
+#: js/files.js:744 templates/index.php:69
 msgid "Name"
 msgstr "Nimi"
 
-#: js/files.js:878 templates/index.php:80
+#: js/files.js:745 templates/index.php:80
 msgid "Size"
 msgstr "Suurus"
 
-#: js/files.js:879 templates/index.php:82
+#: js/files.js:746 templates/index.php:82
 msgid "Modified"
 msgstr "Muudetud"
 
-#: js/files.js:898
+#: js/files.js:765
 msgid "1 folder"
 msgstr "1 kaust"
 
-#: js/files.js:900
+#: js/files.js:767
 msgid "{count} folders"
 msgstr "{count} kausta"
 
-#: js/files.js:908
+#: js/files.js:775
 msgid "1 file"
 msgstr "1 fail"
 
-#: js/files.js:910
+#: js/files.js:777
 msgid "{count} files"
 msgstr "{count} faili"
 
-#: lib/app.php:53
-msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
-msgstr "Vigane kausta nimi. 'Shared' kasutamine on reserveeritud ownCloud poolt."
-
 #: lib/app.php:73
-msgid "Unable to rename file"
-msgstr "Faili ümbernimetamine ebaõnnestus"
+#, php-format
+msgid "%s could not be renamed"
+msgstr "%s ümbernimetamine ebaõnnestus"
 
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
@@ -319,6 +329,22 @@ msgstr "Faile skannitakse, palun oota."
 msgid "Current scanning"
 msgstr "Praegune skannimine"
 
+#: templates/part.list.php:76
+msgid "directory"
+msgstr "kaust"
+
+#: templates/part.list.php:78
+msgid "directories"
+msgstr "kaustad"
+
+#: templates/part.list.php:87
+msgid "file"
+msgstr "fail"
+
+#: templates/part.list.php:89
+msgid "files"
+msgstr "faili"
+
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
 msgstr "Failisüsteemi puhvri uuendamine..."
diff --git a/l10n/et_EE/files_encryption.po b/l10n/et_EE/files_encryption.po
index 4804e9375ea5343d0f3f8ae1357c440fd0228be4..b5851a1bb9d40cccf03de172dc2cc054dfd66f1c 100644
--- a/l10n/et_EE/files_encryption.po
+++ b/l10n/et_EE/files_encryption.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-14 02:46+0200\n"
-"PO-Revision-Date: 2013-06-14 00:47+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-07-06 02:01+0200\n"
+"PO-Revision-Date: 2013-07-05 09:30+0000\n"
+"Last-Translator: pisike.sipelgas <pisike.sipelgas@gmail.com>\n"
 "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -47,20 +47,32 @@ msgstr "Ei suutnud vahetada parooli. Võib-olla on vana parool valesti sisestatu
 
 #: ajax/updatePrivateKeyPassword.php:51
 msgid "Private key password successfully updated."
-msgstr ""
+msgstr "Privaatse võtme parool edukalt uuendatud."
 
 #: ajax/updatePrivateKeyPassword.php:53
 msgid ""
 "Could not update the private key password. Maybe the old password was not "
 "correct."
-msgstr ""
+msgstr "Ei suutnud uuendada privaatse võtme parooli. Võib-olla polnud vana parool õige."
 
 #: files/error.php:7
 msgid ""
-"Your private key is not valid! Maybe your password was changed from outside."
-" You can update your private key password in your personal settings to "
-"regain access to your files"
-msgstr ""
+"Your private key is not valid! Likely your password was changed outside the "
+"ownCloud system (e.g. your corporate directory). You can update your private"
+" key password in your personal settings to recover access to your encrypted "
+"files."
+msgstr "Sinu privaatne võti pole toimiv! Tõenäoliselt on sinu parool muutunud väljaspool ownCloud süsteemi (näiteks ettevõtte keskhaldus). Sa saad uuendada oma privaatse võtme parooli seadete all taastamaks ligipääsu oma krüpteeritud failidele."
+
+#: hooks/hooks.php:44
+msgid "Missing requirements."
+msgstr "Nõutavad on puudu."
+
+#: hooks/hooks.php:45
+msgid ""
+"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL "
+"PHP extension is enabled and configured properly. For now, the encryption "
+"app has been disabled."
+msgstr "Veendu, et kasutusel oleks PHP 5.3.3 või uuem versioon ning kasutusel oleks OpenSSL PHP laiendus ja see on korrektselt seadistatud. Hetkel on krüpteerimise rakenduse kasutamine peatatud."
 
 #: js/settings-admin.js:11
 msgid "Saving..."
@@ -70,15 +82,15 @@ msgstr "Salvestamine..."
 msgid ""
 "Your private key is not valid! Maybe the your password was changed from "
 "outside."
-msgstr ""
+msgstr "Sinu privaatne võti ei ole õige. Võib-olla on parool vahetatud süsteemi väliselt."
 
 #: templates/invalid_private_key.php:7
 msgid "You can unlock your private key in your "
-msgstr ""
+msgstr "Saad avada oma privaatse võtme oma"
 
 #: templates/invalid_private_key.php:7
 msgid "personal settings"
-msgstr ""
+msgstr "isiklikes seadetes"
 
 #: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
@@ -86,12 +98,12 @@ msgstr "Krüpteerimine"
 
 #: templates/settings-admin.php:10
 msgid ""
-"Enable encryption passwords recovery key (allow sharing to recovery key):"
-msgstr "Luba krüpteerimise paroolide taastevõti (võimalda parooli jagamine taastevõtmesse):"
+"Enable recovery key (allow to recover users files in case of password loss):"
+msgstr "Luba taastevõti (võimada kasutaja failide taastamine parooli kaotuse puhul):"
 
 #: templates/settings-admin.php:14
-msgid "Recovery account password"
-msgstr "Konto taasteparool"
+msgid "Recovery key password"
+msgstr "Taastevõtme parool"
 
 #: templates/settings-admin.php:21 templates/settings-personal.php:54
 msgid "Enabled"
@@ -102,16 +114,16 @@ msgid "Disabled"
 msgstr "Väljalülitatud"
 
 #: templates/settings-admin.php:34
-msgid "Change encryption passwords recovery key:"
-msgstr "Muuda taaste võtme krüpteerimise paroole:"
+msgid "Change recovery key password:"
+msgstr "Muuda taastevõtme parooli:"
 
 #: templates/settings-admin.php:41
-msgid "Old Recovery account password"
-msgstr "Konto vana taaste parool"
+msgid "Old Recovery key password"
+msgstr "Vana taastevõtme parool"
 
 #: templates/settings-admin.php:48
-msgid "New Recovery account password"
-msgstr "Konto uus taasteparool"
+msgid "New Recovery key password"
+msgstr "Uus taastevõtme parool"
 
 #: templates/settings-admin.php:53
 msgid "Change Password"
@@ -119,39 +131,39 @@ msgstr "Muuda parooli"
 
 #: templates/settings-personal.php:11
 msgid "Your private key password no longer match your log-in password:"
-msgstr ""
+msgstr "Sinu privaatse võtme parool ei ühti enam sinu sisselogimise parooliga:"
 
 #: templates/settings-personal.php:14
 msgid "Set your old private key password to your current log-in password."
-msgstr ""
+msgstr "Pane oma vana privaatvõtme parooliks oma praegune sisselogimise parool."
 
 #: templates/settings-personal.php:16
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
-msgstr ""
+msgstr "Kui sa ei mäleta oma vana parooli, siis palu oma süsteemihalduril taastada ligipääs failidele."
 
 #: templates/settings-personal.php:24
 msgid "Old log-in password"
-msgstr ""
+msgstr "Vana sisselogimise parool"
 
 #: templates/settings-personal.php:30
 msgid "Current log-in password"
-msgstr ""
+msgstr "Praegune sisselogimise parool"
 
 #: templates/settings-personal.php:35
 msgid "Update Private Key Password"
-msgstr ""
+msgstr "Uuenda privaatse võtme parooli"
 
 #: templates/settings-personal.php:45
 msgid "Enable password recovery:"
-msgstr ""
+msgstr "Luba parooli taaste:"
 
 #: templates/settings-personal.php:47
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
-msgstr ""
+msgstr "Valiku lubamine võimaldab taastada ligipääsu krüpteeritud failidele kui parooli kaotuse puhul"
 
 #: templates/settings-personal.php:63
 msgid "File recovery settings updated"
diff --git a/l10n/et_EE/files_external.po b/l10n/et_EE/files_external.po
index 45901994a0da7f308dbf20f89deb06724e6ffcd4..c33df8bb738f8cbbeb5ffebdefb62f50aad8efea 100644
--- a/l10n/et_EE/files_external.po
+++ b/l10n/et_EE/files_external.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: Rivo Zängov <eraser@eraser.ee>\n"
 "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/et_EE/files_sharing.po b/l10n/et_EE/files_sharing.po
index f62aa3e162c01a8d538234211bbbce6bb4e13d11..034a3de5ea4efa97337c0c7157534e4a5a31f952 100644
--- a/l10n/et_EE/files_sharing.po
+++ b/l10n/et_EE/files_sharing.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Rivo Zängov <eraser@eraser.ee>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
+"Last-Translator: Rivo Zängov <eraser@eraser.ee>\n"
 "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,27 +19,39 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: templates/authenticate.php:4
+msgid "The password is wrong. Try again."
+msgstr "Parool on vale. Proovi uuesti."
+
+#: templates/authenticate.php:7
 msgid "Password"
 msgstr "Parool"
 
-#: templates/authenticate.php:6
+#: templates/authenticate.php:9
 msgid "Submit"
 msgstr "Saada"
 
-#: templates/public.php:10
+#: templates/public.php:17
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s jagas sinuga kausta %s"
 
-#: templates/public.php:13
+#: templates/public.php:20
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s jagas sinuga faili %s"
 
-#: templates/public.php:19 templates/public.php:43
+#: templates/public.php:28 templates/public.php:90
 msgid "Download"
 msgstr "Lae alla"
 
-#: templates/public.php:40
+#: templates/public.php:45 templates/public.php:48
+msgid "Upload"
+msgstr "Lae üles"
+
+#: templates/public.php:58
+msgid "Cancel upload"
+msgstr "Tühista üleslaadimine"
+
+#: templates/public.php:87
 msgid "No preview available for"
 msgstr "Eelvaadet pole saadaval"
diff --git a/l10n/et_EE/files_trashbin.po b/l10n/et_EE/files_trashbin.po
index d1f969bba0bf01282dccd2bd2efc9be567f0c948..7660dc7a82d48b6a832cbaa980439e1dd3c13a55 100644
--- a/l10n/et_EE/files_trashbin.po
+++ b/l10n/et_EE/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:16+0000\n"
 "Last-Translator: Rivo Zängov <eraser@eraser.ee>\n"
 "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/et_EE/lib.po b/l10n/et_EE/lib.po
index e8fa7e426fd670569f2f55f8e4fa1dd6d4629175..e1b6600f08c3d890ad082c7870736b365d607681 100644
--- a/l10n/et_EE/lib.po
+++ b/l10n/et_EE/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-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
-"Last-Translator: pisike.sipelgas <pisike.sipelgas@gmail.com>\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,43 +19,47 @@ msgstr ""
 "Language: et_EE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:359
+#: app.php:360
 msgid "Help"
 msgstr "Abiinfo"
 
-#: app.php:372
+#: app.php:373
 msgid "Personal"
 msgstr "Isiklik"
 
-#: app.php:383
+#: app.php:384
 msgid "Settings"
 msgstr "Seaded"
 
-#: app.php:395
+#: app.php:396
 msgid "Users"
 msgstr "Kasutajad"
 
-#: app.php:408
+#: app.php:409
 msgid "Apps"
 msgstr "Rakendused"
 
-#: app.php:416
+#: app.php:417
 msgid "Admin"
 msgstr "Admin"
 
-#: files.php:210
+#: defaults.php:33
+msgid "web services under your control"
+msgstr "veebitenused sinu kontrolli all"
+
+#: files.php:226
 msgid "ZIP download is turned off."
 msgstr "ZIP-ina allalaadimine on välja lülitatud."
 
-#: files.php:211
+#: files.php:227
 msgid "Files need to be downloaded one by one."
 msgstr "Failid tuleb alla laadida ükshaaval."
 
-#: files.php:212 files.php:245
+#: files.php:228 files.php:261
 msgid "Back to Files"
 msgstr "Tagasi failide juurde"
 
-#: files.php:242
+#: files.php:258
 msgid "Selected files too large to generate zip file."
 msgstr "Valitud failid on ZIP-faili loomiseks liiga suured."
 
@@ -87,104 +91,102 @@ msgstr "Tekst"
 msgid "Images"
 msgstr "Pildid"
 
-#: setup.php:34
-msgid "Set an admin username."
-msgstr "Määra admin kasutajanimi."
-
-#: setup.php:37
-msgid "Set an admin password."
-msgstr "Määra admini parool."
-
-#: setup.php:55
+#: setup/abstractdatabase.php:22
 #, php-format
 msgid "%s enter the database username."
 msgstr "%s sisesta andmebaasi kasutajatunnus."
 
-#: setup.php:58
+#: setup/abstractdatabase.php:25
 #, php-format
 msgid "%s enter the database name."
 msgstr "%s sisesta andmebaasi nimi."
 
-#: setup.php:61
+#: setup/abstractdatabase.php:28
 #, php-format
 msgid "%s you may not use dots in the database name"
 msgstr "%s punktide kasutamine andmebaasi nimes pole lubatud"
 
-#: setup.php:64
+#: setup/mssql.php:20
 #, php-format
-msgid "%s set the database host."
-msgstr "%s määra andmebaasi server."
-
-#: setup.php:126 setup.php:332 setup.php:377
-msgid "PostgreSQL username and/or password not valid"
-msgstr "PostgreSQL kasutajatunnus ja/või parool pole õiged"
+msgid "MS SQL username and/or password not valid: %s"
+msgstr "MS SQL kasutajatunnus ja/või parool pole õiged: %s"
 
-#: setup.php:127 setup.php:235
+#: setup/mssql.php:21 setup/mysql.php:13 setup/oci.php:114
+#: setup/postgresql.php:24 setup/postgresql.php:70
 msgid "You need to enter either an existing account or the administrator."
 msgstr "Sisesta kas juba olemasolev konto või administrator."
 
-#: setup.php:152
-msgid "Oracle connection could not be established"
-msgstr "Ei suuda luua ühendust Oracle baasiga"
-
-#: setup.php:234
+#: setup/mysql.php:12
 msgid "MySQL username and/or password not valid"
 msgstr "MySQL kasutajatunnus ja/või parool pole õiged"
 
-#: setup.php:288 setup.php:398 setup.php:407 setup.php:425 setup.php:435
-#: setup.php:444 setup.php:477 setup.php:543 setup.php:569 setup.php:576
-#: setup.php:587 setup.php:594 setup.php:603 setup.php:611 setup.php:620
-#: setup.php:626
+#: setup/mysql.php:67 setup/oci.php:54 setup/oci.php:121 setup/oci.php:147
+#: setup/oci.php:154 setup/oci.php:165 setup/oci.php:172 setup/oci.php:181
+#: setup/oci.php:189 setup/oci.php:198 setup/oci.php:204
+#: setup/postgresql.php:89 setup/postgresql.php:98 setup/postgresql.php:115
+#: setup/postgresql.php:125 setup/postgresql.php:134
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr "Andmebaasi viga: \"%s\""
 
-#: setup.php:289 setup.php:399 setup.php:408 setup.php:426 setup.php:436
-#: setup.php:445 setup.php:478 setup.php:544 setup.php:570 setup.php:577
-#: setup.php:588 setup.php:604 setup.php:612 setup.php:621
+#: setup/mysql.php:68 setup/oci.php:55 setup/oci.php:122 setup/oci.php:148
+#: setup/oci.php:155 setup/oci.php:166 setup/oci.php:182 setup/oci.php:190
+#: setup/oci.php:199 setup/postgresql.php:90 setup/postgresql.php:99
+#: setup/postgresql.php:116 setup/postgresql.php:126 setup/postgresql.php:135
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr "Tõrkuv käsk oli: \"%s\""
 
-#: setup.php:305
+#: setup/mysql.php:85
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr "MySQL kasutaja '%s'@'localhost' on juba olemas."
 
-#: setup.php:306
+#: setup/mysql.php:86
 msgid "Drop this user from MySQL"
 msgstr "Kustuta see kasutaja MySQL-ist"
 
-#: setup.php:311
+#: setup/mysql.php:91
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr "MySQL kasutaja '%s'@'%%' on juba olemas"
 
-#: setup.php:312
+#: setup/mysql.php:92
 msgid "Drop this user from MySQL."
 msgstr "Kustuta see kasutaja MySQL-ist."
 
-#: setup.php:469 setup.php:536
+#: setup/oci.php:34
+msgid "Oracle connection could not be established"
+msgstr "Ei suuda luua ühendust Oracle baasiga"
+
+#: setup/oci.php:41 setup/oci.php:113
 msgid "Oracle username and/or password not valid"
 msgstr "Oracle kasutajatunnus ja/või parool pole õiged"
 
-#: setup.php:595 setup.php:627
+#: setup/oci.php:173 setup/oci.php:205
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr "Tõrkuv käsk oli: \"%s\", nimi: %s, parool: %s"
 
-#: setup.php:647
-#, php-format
-msgid "MS SQL username and/or password not valid: %s"
-msgstr "MS SQL kasutajatunnus ja/või parool pole õiged: %s"
+#: setup/postgresql.php:23 setup/postgresql.php:69
+msgid "PostgreSQL username and/or password not valid"
+msgstr "PostgreSQL kasutajatunnus ja/või parool pole õiged"
+
+#: setup.php:42
+msgid "Set an admin username."
+msgstr "Määra admin kasutajanimi."
+
+#: setup.php:45
+msgid "Set an admin password."
+msgstr "Määra admini parool."
 
-#: setup.php:870
+#: setup.php:198
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Veebiserveri ei ole veel korralikult seadistatud võimaldamaks failide sünkroniseerimist, kuna WebDAV liides näib olevat mittetoimiv."
 
-#: setup.php:871
+#: setup.php:199
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Palun tutvu veelkord <a href='%s'>paigalduse juhenditega</a>."
diff --git a/l10n/et_EE/settings.po b/l10n/et_EE/settings.po
index a45a8eec0d6ede977319bc7b9d0dba10c46f1b31..d059338c0a8880ba8417dc64de1e0b6b6c2f3b9b 100644
--- a/l10n/et_EE/settings.po
+++ b/l10n/et_EE/settings.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
-"Last-Translator: pisike.sipelgas <pisike.sipelgas@gmail.com>\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -90,35 +90,35 @@ msgstr "Kasutajat ei saa eemaldada grupist %s"
 msgid "Couldn't update app."
 msgstr "Rakenduse uuendamine ebaõnnestus."
 
-#: js/apps.js:30
+#: js/apps.js:35
 msgid "Update to {appversion}"
 msgstr "Uuenda versioonile {appversion}"
 
-#: js/apps.js:36 js/apps.js:76
+#: js/apps.js:41 js/apps.js:81
 msgid "Disable"
 msgstr "Lülita välja"
 
-#: js/apps.js:36 js/apps.js:64 js/apps.js:83
+#: js/apps.js:41 js/apps.js:69 js/apps.js:88
 msgid "Enable"
 msgstr "Lülita sisse"
 
-#: js/apps.js:55
+#: js/apps.js:60
 msgid "Please wait...."
 msgstr "Palun oota..."
 
-#: js/apps.js:59 js/apps.js:71 js/apps.js:80 js/apps.js:93
+#: js/apps.js:64 js/apps.js:76 js/apps.js:85 js/apps.js:98
 msgid "Error"
 msgstr "Viga"
 
-#: js/apps.js:90
+#: js/apps.js:95
 msgid "Updating...."
 msgstr "Uuendamine..."
 
-#: js/apps.js:93
+#: js/apps.js:98
 msgid "Error while updating app"
 msgstr "Viga rakenduse uuendamisel"
 
-#: js/apps.js:96
+#: js/apps.js:101
 msgid "Updated"
 msgstr "Uuendatud"
 
@@ -167,15 +167,15 @@ msgstr "Viga kasutaja loomisel"
 msgid "A valid password must be provided"
 msgstr "Sisesta nõuetele vastav parool"
 
-#: personal.php:35 personal.php:36
+#: personal.php:37 personal.php:38
 msgid "__language_name__"
 msgstr "Eesti"
 
-#: templates/admin.php:15
+#: templates/admin.php:17
 msgid "Security Warning"
 msgstr "Turvahoiatus"
 
-#: templates/admin.php:18
+#: templates/admin.php:20
 msgid ""
 "Your data directory and your files are probably accessible from the "
 "internet. The .htaccess file that ownCloud provides is not working. We "
@@ -184,36 +184,36 @@ msgid ""
 " webserver document root."
 msgstr "Andmete kataloog ja failid on tõenäoliselt internetis avalikult saadaval. .htaccess fail, mida pakub ownCloud, ei toimi. Soovitame tungivalt veebiserveri seadistust selliselt, et andmete kataloog ei oleks enam vabalt saadaval või tõstaksid andmete kataloogi oma veebiserveri veebi-juurkataloogist mujale."
 
-#: templates/admin.php:29
+#: templates/admin.php:31
 msgid "Setup Warning"
 msgstr "Paigalduse hoiatus"
 
-#: templates/admin.php:32
+#: templates/admin.php:34
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Veebiserveri ei ole veel korralikult seadistatud võimaldamaks failide sünkroniseerimist, kuna WebDAV liides näib olevat mittetoimiv."
 
-#: templates/admin.php:33
+#: templates/admin.php:35
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Palun tutvu veelkord <a href='%s'>paigalduse juhenditega</a>."
 
-#: templates/admin.php:44
+#: templates/admin.php:46
 msgid "Module 'fileinfo' missing"
 msgstr "Moodul 'fileinfo' puudub"
 
-#: templates/admin.php:47
+#: templates/admin.php:49
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr "PHP moodul 'fileinfo' puudub. Soovitame tungivalt see lisada saavutamaks parimaid tulemusi failitüüpide tuvastamisel."
 
-#: templates/admin.php:58
+#: templates/admin.php:60
 msgid "Locale not working"
 msgstr "Lokalisatsioon ei toimi"
 
-#: templates/admin.php:63
+#: templates/admin.php:65
 #, php-format
 msgid ""
 "This ownCloud server can't set system locale to %s. This means that there "
@@ -221,11 +221,11 @@ msgid ""
 " to install the required packages on your system to support %s."
 msgstr "ownCloud server ei suuda seadistada süsteemi lokalisatsiooni %s. See tähendab, et võib esineda probleeme teatud tähemärkidega failide nimedes. Soovitame tungivalt paigaldada süsteemi vajalikud pakid toetamaks %s."
 
-#: templates/admin.php:75
+#: templates/admin.php:77
 msgid "Internet connection not working"
 msgstr "Internetiühendus ei toimi"
 
-#: templates/admin.php:78
+#: templates/admin.php:80
 msgid ""
 "This ownCloud server has no working internet connection. This means that "
 "some of the features like mounting of external storage, notifications about "
@@ -235,102 +235,102 @@ msgid ""
 " of ownCloud."
 msgstr "ownCloud serveril puudub toimiv internetiühendus. See tähendab, et mõned funktsionaalsused, nagu näiteks väliste andmehoidlate ühendamine, teavitused uuendustest või kolmandate osapoolte rakenduste paigaldamine ei tööta. Eemalt failidele ligipääs ning teadete saatmine emailiga ei pruugi samuti toimida. Kui soovid täielikku funktsionaalsust, siis soovitame serverile tagada ligipääs internetti."
 
-#: templates/admin.php:92
+#: templates/admin.php:94
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:101
+#: templates/admin.php:103
 msgid "Execute one task with each page loaded"
 msgstr "Käivita toiming lehe laadimisel"
 
-#: templates/admin.php:111
+#: templates/admin.php:113
 msgid ""
 "cron.php is registered at a webcron service. Call the cron.php page in the "
 "owncloud root once a minute over http."
 msgstr "cron.php on registreeritud webcron teenusena. Lae cron.php lehte owncloud veebikataloogist iga minut üle http."
 
-#: templates/admin.php:121
+#: templates/admin.php:123
 msgid ""
 "Use systems cron service. Call the cron.php file in the owncloud folder via "
 "a system cronjob once a minute."
 msgstr "Kasuta süsteemi cron teenust. Käivita cron.php fail owncloud veebikataloogist kasutades süsteemi crontab toimingut iga minut."
 
-#: templates/admin.php:128
+#: templates/admin.php:130
 msgid "Sharing"
 msgstr "Jagamine"
 
-#: templates/admin.php:134
+#: templates/admin.php:136
 msgid "Enable Share API"
 msgstr "Luba Share API"
 
-#: templates/admin.php:135
+#: templates/admin.php:137
 msgid "Allow apps to use the Share API"
 msgstr "Luba rakendustel kasutada Share API-t"
 
-#: templates/admin.php:142
+#: templates/admin.php:144
 msgid "Allow links"
 msgstr "Luba lingid"
 
-#: templates/admin.php:143
+#: templates/admin.php:145
 msgid "Allow users to share items to the public with links"
 msgstr "Luba kasutajatel jagada kirjeid avalike linkidega"
 
-#: templates/admin.php:150
+#: templates/admin.php:152
 msgid "Allow resharing"
 msgstr "Luba edasijagamine"
 
-#: templates/admin.php:151
+#: templates/admin.php:153
 msgid "Allow users to share items shared with them again"
 msgstr "Luba kasutajatel jagada edasi kirjeid, mida on neile jagatud"
 
-#: templates/admin.php:158
+#: templates/admin.php:160
 msgid "Allow users to share with anyone"
 msgstr "Luba kasutajatel kõigiga jagada"
 
-#: templates/admin.php:161
+#: templates/admin.php:163
 msgid "Allow users to only share with users in their groups"
 msgstr "Luba kasutajatel jagada kirjeid ainult nende grupi liikmetele, millesse nad ise kuuluvad"
 
-#: templates/admin.php:168
+#: templates/admin.php:170
 msgid "Security"
 msgstr "Turvalisus"
 
-#: templates/admin.php:181
+#: templates/admin.php:183
 msgid "Enforce HTTPS"
 msgstr "Sunni peale HTTPS-i kasutamine"
 
-#: templates/admin.php:182
+#: templates/admin.php:184
 msgid ""
 "Enforces the clients to connect to ownCloud via an encrypted connection."
 msgstr "Sunnib kliente ownCloudiga ühenduma krüpteeritult."
 
-#: templates/admin.php:185
+#: templates/admin.php:187
 msgid ""
 "Please connect to this ownCloud instance via HTTPS to enable or disable the "
 "SSL enforcement."
 msgstr "Palun ühendu selle ownCloud instantsiga üle HTTPS või keela SSL kasutamine."
 
-#: templates/admin.php:195
+#: templates/admin.php:197
 msgid "Log"
 msgstr "Logi"
 
-#: templates/admin.php:196
+#: templates/admin.php:198
 msgid "Log level"
 msgstr "Logi tase"
 
-#: templates/admin.php:227
+#: templates/admin.php:229
 msgid "More"
 msgstr "Rohkem"
 
-#: templates/admin.php:228
+#: templates/admin.php:230
 msgid "Less"
 msgstr "Vähem"
 
-#: templates/admin.php:235 templates/personal.php:116
+#: templates/admin.php:236 templates/personal.php:116
 msgid "Version"
 msgstr "Versioon"
 
-#: templates/admin.php:237 templates/personal.php:119
+#: templates/admin.php:240 templates/personal.php:119
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -388,76 +388,79 @@ msgstr "Vigade nimekiri"
 msgid "Commercial Support"
 msgstr "Tasuline kasutajatugi"
 
-#: templates/personal.php:9
+#: templates/personal.php:10
 msgid "Get the apps to sync your files"
 msgstr "Hangi rakendusi failide sünkroniseerimiseks"
 
-#: templates/personal.php:20
+#: templates/personal.php:21
 msgid "Show First Run Wizard again"
 msgstr "Näita veelkord Esmase Käivituse Juhendajat"
 
-#: templates/personal.php:28
+#: templates/personal.php:29
 #, php-format
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "Kasutad <strong>%s</strong> saadavalolevast <strong>%s</strong>"
 
-#: templates/personal.php:40 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:41 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "Parool"
 
-#: templates/personal.php:41
+#: templates/personal.php:42
 msgid "Your password was changed"
 msgstr "Sinu parooli on muudetud"
 
-#: templates/personal.php:42
+#: templates/personal.php:43
 msgid "Unable to change your password"
 msgstr "Sa ei saa oma parooli muuta"
 
-#: templates/personal.php:43
+#: templates/personal.php:44
 msgid "Current password"
 msgstr "Praegune parool"
 
-#: templates/personal.php:45
+#: templates/personal.php:46
 msgid "New password"
 msgstr "Uus parool"
 
-#: templates/personal.php:47
+#: templates/personal.php:48
 msgid "Change password"
 msgstr "Muuda parooli"
 
-#: templates/personal.php:59 templates/users.php:85
+#: templates/personal.php:60 templates/users.php:85
 msgid "Display Name"
 msgstr "Näidatav nimi"
 
-#: templates/personal.php:74
+#: templates/personal.php:75
 msgid "Email"
 msgstr "E-post"
 
-#: templates/personal.php:76
+#: templates/personal.php:77
 msgid "Your email address"
 msgstr "Sinu e-posti aadress"
 
-#: templates/personal.php:77
+#: templates/personal.php:78
 msgid "Fill in an email address to enable password recovery"
 msgstr "Parooli taastamise sisse lülitamiseks sisesta e-posti aadress"
 
-#: templates/personal.php:86 templates/personal.php:87
+#: templates/personal.php:87 templates/personal.php:88
 msgid "Language"
 msgstr "Keel"
 
-#: templates/personal.php:99
+#: templates/personal.php:100
 msgid "Help translate"
 msgstr "Aita tõlkida"
 
-#: templates/personal.php:105
+#: templates/personal.php:106
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:107
-msgid "Use this address to connect to your ownCloud in your file manager"
-msgstr "Kasuta seda aadressi ühendamaks oma ownCloudi failihalduriga"
+#: templates/personal.php:108
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
+"target=\"_blank\">access your Files via WebDAV</a>"
+msgstr ""
 
-#: templates/users.php:21 templates/users.php:84
+#: templates/users.php:21
 msgid "Login Name"
 msgstr "Kasutajanimi"
 
@@ -487,6 +490,10 @@ msgstr "Piiramatult"
 msgid "Other"
 msgstr "Muu"
 
+#: templates/users.php:84
+msgid "Username"
+msgstr "Kasutajanimi"
+
 #: templates/users.php:91
 msgid "Storage"
 msgstr "Maht"
diff --git a/l10n/et_EE/user_ldap.po b/l10n/et_EE/user_ldap.po
index 26fc9649f5b7793289a27cf7f84a8a1a617ed7f8..620ed0e3dde3053f8dbf26e52c61279bcf4d2b8a 100644
--- a/l10n/et_EE/user_ldap.po
+++ b/l10n/et_EE/user_ldap.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:25+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:16+0000\n"
 "Last-Translator: pisike.sipelgas <pisike.sipelgas@gmail.com>\n"
 "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/et_EE/user_webdavauth.po b/l10n/et_EE/user_webdavauth.po
index 21fbf41a04ff5b12811bd9b61593304f686eebdd..3c9471a2734cea9cf2e414118206019bf1faa628 100644
--- a/l10n/et_EE/user_webdavauth.po
+++ b/l10n/et_EE/user_webdavauth.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-15 01:59+0200\n"
-"PO-Revision-Date: 2013-06-15 00:00+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-07-06 02:01+0200\n"
+"PO-Revision-Date: 2013-07-05 09:20+0000\n"
+"Last-Translator: pisike.sipelgas <pisike.sipelgas@gmail.com>\n"
 "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -25,7 +25,7 @@ msgstr "WebDAV autentimine"
 
 #: templates/settings.php:4
 msgid "URL: "
-msgstr ""
+msgstr "URL: "
 
 #: templates/settings.php:7
 msgid ""
diff --git a/l10n/eu/core.po b/l10n/eu/core.po
index 0f198f82cd98ae00c572b1b8a1e9a920a859c1f6..ff6de323af9a8e2bc6049e242d1d7bf4de7704ba 100644
--- a/l10n/eu/core.po
+++ b/l10n/eu/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
 "MIME-Version: 1.0\n"
@@ -61,135 +61,135 @@ msgstr "Ez da ezabatzeko kategoriarik hautatu."
 msgid "Error removing %s from favorites."
 msgstr "Errorea gertatu da %s gogokoetatik ezabatzean."
 
-#: js/config.php:34
+#: js/config.php:32
 msgid "Sunday"
 msgstr "Igandea"
 
-#: js/config.php:35
+#: js/config.php:33
 msgid "Monday"
 msgstr "Astelehena"
 
-#: js/config.php:36
+#: js/config.php:34
 msgid "Tuesday"
 msgstr "Asteartea"
 
-#: js/config.php:37
+#: js/config.php:35
 msgid "Wednesday"
 msgstr "Asteazkena"
 
-#: js/config.php:38
+#: js/config.php:36
 msgid "Thursday"
 msgstr "Osteguna"
 
-#: js/config.php:39
+#: js/config.php:37
 msgid "Friday"
 msgstr "Ostirala"
 
-#: js/config.php:40
+#: js/config.php:38
 msgid "Saturday"
 msgstr "Larunbata"
 
-#: js/config.php:45
+#: js/config.php:43
 msgid "January"
 msgstr "Urtarrila"
 
-#: js/config.php:46
+#: js/config.php:44
 msgid "February"
 msgstr "Otsaila"
 
-#: js/config.php:47
+#: js/config.php:45
 msgid "March"
 msgstr "Martxoa"
 
-#: js/config.php:48
+#: js/config.php:46
 msgid "April"
 msgstr "Apirila"
 
-#: js/config.php:49
+#: js/config.php:47
 msgid "May"
 msgstr "Maiatza"
 
-#: js/config.php:50
+#: js/config.php:48
 msgid "June"
 msgstr "Ekaina"
 
-#: js/config.php:51
+#: js/config.php:49
 msgid "July"
 msgstr "Uztaila"
 
-#: js/config.php:52
+#: js/config.php:50
 msgid "August"
 msgstr "Abuztua"
 
-#: js/config.php:53
+#: js/config.php:51
 msgid "September"
 msgstr "Iraila"
 
-#: js/config.php:54
+#: js/config.php:52
 msgid "October"
 msgstr "Urria"
 
-#: js/config.php:55
+#: js/config.php:53
 msgid "November"
 msgstr "Azaroa"
 
-#: js/config.php:56
+#: js/config.php:54
 msgid "December"
 msgstr "Abendua"
 
-#: js/js.js:286
+#: js/js.js:293
 msgid "Settings"
 msgstr "Ezarpenak"
 
-#: js/js.js:718
+#: js/js.js:725
 msgid "seconds ago"
 msgstr "segundu"
 
-#: js/js.js:719
+#: js/js.js:726
 msgid "1 minute ago"
 msgstr "orain dela minutu 1"
 
-#: js/js.js:720
+#: js/js.js:727
 msgid "{minutes} minutes ago"
 msgstr "orain dela {minutes} minutu"
 
-#: js/js.js:721
+#: js/js.js:728
 msgid "1 hour ago"
 msgstr "orain dela ordu bat"
 
-#: js/js.js:722
+#: js/js.js:729
 msgid "{hours} hours ago"
 msgstr "orain dela {hours} ordu"
 
-#: js/js.js:723
+#: js/js.js:730
 msgid "today"
 msgstr "gaur"
 
-#: js/js.js:724
+#: js/js.js:731
 msgid "yesterday"
 msgstr "atzo"
 
-#: js/js.js:725
+#: js/js.js:732
 msgid "{days} days ago"
 msgstr "orain dela {days} egun"
 
-#: js/js.js:726
+#: js/js.js:733
 msgid "last month"
 msgstr "joan den hilabetean"
 
-#: js/js.js:727
+#: js/js.js:734
 msgid "{months} months ago"
 msgstr "orain dela {months} hilabete"
 
-#: js/js.js:728
+#: js/js.js:735
 msgid "months ago"
 msgstr "hilabete"
 
-#: js/js.js:729
+#: js/js.js:736
 msgid "last year"
 msgstr "joan den urtean"
 
-#: js/js.js:730
+#: js/js.js:737
 msgid "years ago"
 msgstr "urte"
 
@@ -225,8 +225,8 @@ msgstr "Objetu mota ez dago zehaztuta."
 #: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
 #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:577
-#: js/share.js:589
+#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:620
+#: js/share.js:632
 msgid "Error"
 msgstr "Errorea"
 
@@ -246,7 +246,7 @@ msgstr "Elkarbanatuta"
 msgid "Share"
 msgstr "Elkarbanatu"
 
-#: js/share.js:125 js/share.js:617
+#: js/share.js:125 js/share.js:660
 msgid "Error while sharing"
 msgstr "Errore bat egon da elkarbanatzean"
 
@@ -266,99 +266,103 @@ msgstr "{owner}-k zu eta {group} taldearekin elkarbanatuta"
 msgid "Shared with you by {owner}"
 msgstr "{owner}-k zurekin elkarbanatuta"
 
-#: js/share.js:159
+#: js/share.js:172
 msgid "Share with"
 msgstr "Elkarbanatu honekin"
 
-#: js/share.js:164
+#: js/share.js:177
 msgid "Share with link"
 msgstr "Elkarbanatu lotura batekin"
 
-#: js/share.js:167
+#: js/share.js:180
 msgid "Password protect"
 msgstr "Babestu pasahitzarekin"
 
-#: js/share.js:169 templates/installation.php:54 templates/login.php:26
+#: js/share.js:182 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "Pasahitza"
 
-#: js/share.js:173
+#: js/share.js:187
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:191
 msgid "Email link to person"
 msgstr "Postaz bidali lotura "
 
-#: js/share.js:174
+#: js/share.js:192
 msgid "Send"
 msgstr "Bidali"
 
-#: js/share.js:178
+#: js/share.js:197
 msgid "Set expiration date"
 msgstr "Ezarri muga data"
 
-#: js/share.js:179
+#: js/share.js:198
 msgid "Expiration date"
 msgstr "Muga data"
 
-#: js/share.js:211
+#: js/share.js:230
 msgid "Share via email:"
 msgstr "Elkarbanatu eposta bidez:"
 
-#: js/share.js:213
+#: js/share.js:232
 msgid "No people found"
 msgstr "Ez da inor aurkitu"
 
-#: js/share.js:251
+#: js/share.js:270
 msgid "Resharing is not allowed"
 msgstr "Berriz elkarbanatzea ez dago baimendua"
 
-#: js/share.js:287
+#: js/share.js:306
 msgid "Shared in {item} with {user}"
 msgstr "{user}ekin {item}-n elkarbanatuta"
 
-#: js/share.js:308
+#: js/share.js:327
 msgid "Unshare"
 msgstr "Ez elkarbanatu"
 
-#: js/share.js:320
+#: js/share.js:339
 msgid "can edit"
 msgstr "editatu dezake"
 
-#: js/share.js:322
+#: js/share.js:341
 msgid "access control"
 msgstr "sarrera kontrola"
 
-#: js/share.js:325
+#: js/share.js:344
 msgid "create"
 msgstr "sortu"
 
-#: js/share.js:328
+#: js/share.js:347
 msgid "update"
 msgstr "eguneratu"
 
-#: js/share.js:331
+#: js/share.js:350
 msgid "delete"
 msgstr "ezabatu"
 
-#: js/share.js:334
+#: js/share.js:353
 msgid "share"
 msgstr "elkarbanatu"
 
-#: js/share.js:368 js/share.js:564
+#: js/share.js:387 js/share.js:607
 msgid "Password protected"
 msgstr "Pasahitzarekin babestuta"
 
-#: js/share.js:577
+#: js/share.js:620
 msgid "Error unsetting expiration date"
 msgstr "Errorea izan da muga data kentzean"
 
-#: js/share.js:589
+#: js/share.js:632
 msgid "Error setting expiration date"
 msgstr "Errore bat egon da muga data ezartzean"
 
-#: js/share.js:604
+#: js/share.js:647
 msgid "Sending ..."
 msgstr "Bidaltzen ..."
 
-#: js/share.js:615
+#: js/share.js:658
 msgid "Email sent"
 msgstr "Eposta bidalia"
 
@@ -373,7 +377,7 @@ msgstr "Eguneraketa ez da ongi egin. Mesedez egin arazoaren txosten bat <a href=
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "Eguneraketa ongi egin da. Orain zure ownClouderea berbideratua izango zara."
 
-#: lostpassword/controller.php:58
+#: lostpassword/controller.php:60
 msgid "ownCloud password reset"
 msgstr "ownCloud-en pasahitza berrezarri"
 
@@ -403,17 +407,17 @@ msgstr "Erabiltzaile izena"
 
 #: lostpassword/templates/lostpassword.php:22
 msgid ""
-"Your files seems to be encrypted. If you didn't have enabled the recovery "
-"key there will be no way to get your data back once the password was "
-"resetted. If you are not sure what to do, please contact your administrator "
-"first before continue. Do you really want to continue?"
+"Your files are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
 msgstr ""
 
 #: lostpassword/templates/lostpassword.php:24
 msgid "Yes, I really want to reset my password now"
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:29
+#: lostpassword/templates/lostpassword.php:27
 msgid "Request reset"
 msgstr "Eskaera berrezarri da"
 
@@ -461,7 +465,7 @@ msgstr "Sarrera debekatuta"
 msgid "Cloud not found"
 msgstr "Ez da hodeia aurkitu"
 
-#: templates/altmail.php:2
+#: templates/altmail.php:4
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -472,10 +476,6 @@ msgid ""
 "Cheers!"
 msgstr ""
 
-#: templates/altmail.php:7 templates/mail.php:24
-msgid "web services under your control"
-msgstr "web zerbitzuak zure kontrolpean"
-
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
 msgstr "Editatu kategoriak"
@@ -568,12 +568,12 @@ msgstr "Datubasearen hostalaria"
 msgid "Finish setup"
 msgstr "Bukatu konfigurazioa"
 
-#: templates/layout.user.php:40
+#: templates/layout.user.php:43
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:67
+#: templates/layout.user.php:68
 msgid "Log out"
 msgstr "Saioa bukatu"
 
@@ -607,7 +607,7 @@ msgstr "Hasi saioa"
 msgid "Alternative Logins"
 msgstr "Beste erabiltzaile izenak"
 
-#: templates/mail.php:15
+#: templates/mail.php:16
 #, php-format
 msgid ""
 "Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
diff --git a/l10n/eu/files.po b/l10n/eu/files.po
index de510d55f480a3ab95d50bae8f4a78aa8c0acb7c..e921be7d5129cb4759aa8ec509bbc2e387abc6c2 100644
--- a/l10n/eu/files.po
+++ b/l10n/eu/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:01+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
 "MIME-Version: 1.0\n"
@@ -27,46 +27,54 @@ msgstr "Ezin da %s mugitu - Izen hau duen fitxategia dagoeneko existitzen da"
 msgid "Could not move %s"
 msgstr "Ezin dira fitxategiak mugitu %s"
 
-#: ajax/upload.php:19
+#: ajax/upload.php:16 ajax/upload.php:45
+msgid "Unable to set upload directory."
+msgstr ""
+
+#: ajax/upload.php:22
+msgid "Invalid Token"
+msgstr ""
+
+#: ajax/upload.php:59
 msgid "No file was uploaded. Unknown error"
 msgstr "Ez da fitxategirik igo. Errore ezezaguna"
 
-#: ajax/upload.php:26
+#: ajax/upload.php:66
 msgid "There is no error, the file uploaded with success"
 msgstr "Ez da errorerik egon, fitxategia ongi igo da"
 
-#: ajax/upload.php:27
+#: ajax/upload.php:67
 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:29
+#: ajax/upload.php:69
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Igotako fitxategia HTML formularioan zehaztutako MAX_FILE_SIZE direktiba baino handidagoa da."
 
-#: ajax/upload.php:30
+#: ajax/upload.php:70
 msgid "The uploaded file was only partially uploaded"
 msgstr "Igotako fitxategiaren zati bat bakarrik igo da"
 
-#: ajax/upload.php:31
+#: ajax/upload.php:71
 msgid "No file was uploaded"
 msgstr "Ez da fitxategirik igo"
 
-#: ajax/upload.php:32
+#: ajax/upload.php:72
 msgid "Missing a temporary folder"
 msgstr "Aldi bateko karpeta falta da"
 
-#: ajax/upload.php:33
+#: ajax/upload.php:73
 msgid "Failed to write to disk"
 msgstr "Errore bat izan da diskoan idazterakoan"
 
-#: ajax/upload.php:51
+#: ajax/upload.php:91
 msgid "Not enough storage available"
 msgstr "Ez dago behar aina leku erabilgarri,"
 
-#: ajax/upload.php:83
+#: ajax/upload.php:123
 msgid "Invalid directory."
 msgstr "Baliogabeko karpeta."
 
@@ -74,6 +82,36 @@ msgstr "Baliogabeko karpeta."
 msgid "Files"
 msgstr "Fitxategiak"
 
+#: js/file-upload.js:11
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr "Ezin izan da zure fitxategia igo karpeta bat delako edo 0 byte dituelako"
+
+#: js/file-upload.js:24
+msgid "Not enough space available"
+msgstr "Ez dago leku nahikorik."
+
+#: js/file-upload.js:64
+msgid "Upload cancelled."
+msgstr "Igoera ezeztatuta"
+
+#: js/file-upload.js:167 js/files.js:266
+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/file-upload.js:233 js/files.js:339
+msgid "URL cannot be empty."
+msgstr "URLa ezin da hutsik egon."
+
+#: js/file-upload.js:238 lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr ""
+
+#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
+#: js/files.js:693 js/files.js:731
+msgid "Error"
+msgstr "Errorea"
+
 #: js/fileactions.js:116
 msgid "Share"
 msgstr "Elkarbanatu"
@@ -90,43 +128,43 @@ msgstr "Ezabatu"
 msgid "Rename"
 msgstr "Berrizendatu"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:464
 msgid "Pending"
 msgstr "Zain"
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "{new_name} already exists"
 msgstr "{new_name} dagoeneko existitzen da"
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "replace"
 msgstr "ordeztu"
 
-#: js/filelist.js:259
+#: js/filelist.js:302
 msgid "suggest name"
 msgstr "aholkatu izena"
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "cancel"
 msgstr "ezeztatu"
 
-#: js/filelist.js:306
+#: js/filelist.js:349
 msgid "replaced {new_name} with {old_name}"
 msgstr " {new_name}-k {old_name} ordezkatu du"
 
-#: js/filelist.js:306
+#: js/filelist.js:349
 msgid "undo"
 msgstr "desegin"
 
-#: js/filelist.js:331
+#: js/filelist.js:374
 msgid "perform delete operation"
 msgstr "Ezabatu"
 
-#: js/filelist.js:413
+#: js/filelist.js:456
 msgid "1 file uploading"
 msgstr "fitxategi 1 igotzen"
 
-#: js/filelist.js:416 js/filelist.js:470
+#: js/filelist.js:459 js/filelist.js:517
 msgid "files uploading"
 msgstr "fitxategiak igotzen"
 
@@ -158,70 +196,42 @@ msgid ""
 "big."
 msgstr "Zure deskarga prestatu egin behar da. Denbora bat har lezake fitxategiak handiak badira. "
 
-#: js/files.js:264
-msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "Ezin izan da zure fitxategia igo karpeta bat delako edo 0 byte dituelako"
-
-#: js/files.js:277
-msgid "Not enough space available"
-msgstr "Ez dago leku nahikorik."
-
-#: js/files.js:317
-msgid "Upload cancelled."
-msgstr "Igoera ezeztatuta"
-
-#: js/files.js:413
-msgid ""
-"File upload is in progress. Leaving the page now will cancel the upload."
-msgstr "Fitxategien igoera martxan da. Orria orain uzteak igoera ezeztatutko du."
-
-#: js/files.js:486
-msgid "URL cannot be empty."
-msgstr "URLa ezin da hutsik egon."
-
-#: js/files.js:491
+#: js/files.js:344
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Baliogabeako karpeta izena. 'Shared' izena Owncloudek erreserbatzen du"
 
-#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
-msgid "Error"
-msgstr "Errorea"
-
-#: js/files.js:877 templates/index.php:69
+#: js/files.js:744 templates/index.php:69
 msgid "Name"
 msgstr "Izena"
 
-#: js/files.js:878 templates/index.php:80
+#: js/files.js:745 templates/index.php:80
 msgid "Size"
 msgstr "Tamaina"
 
-#: js/files.js:879 templates/index.php:82
+#: js/files.js:746 templates/index.php:82
 msgid "Modified"
 msgstr "Aldatuta"
 
-#: js/files.js:898
+#: js/files.js:765
 msgid "1 folder"
 msgstr "karpeta bat"
 
-#: js/files.js:900
+#: js/files.js:767
 msgid "{count} folders"
 msgstr "{count} karpeta"
 
-#: js/files.js:908
+#: js/files.js:775
 msgid "1 file"
 msgstr "fitxategi bat"
 
-#: js/files.js:910
+#: js/files.js:777
 msgid "{count} files"
 msgstr "{count} fitxategi"
 
-#: lib/app.php:53
-msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
-msgstr ""
-
 #: lib/app.php:73
-msgid "Unable to rename file"
-msgstr "Ezin izan da fitxategia berrizendatu"
+#, php-format
+msgid "%s could not be renamed"
+msgstr ""
 
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
@@ -317,6 +327,22 @@ msgstr "Fitxategiak eskaneatzen ari da, itxoin mezedez."
 msgid "Current scanning"
 msgstr "Orain eskaneatzen ari da"
 
+#: templates/part.list.php:76
+msgid "directory"
+msgstr ""
+
+#: templates/part.list.php:78
+msgid "directories"
+msgstr ""
+
+#: templates/part.list.php:87
+msgid "file"
+msgstr "fitxategia"
+
+#: templates/part.list.php:89
+msgid "files"
+msgstr "fitxategiak"
+
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
 msgstr "Fitxategi sistemaren katxea eguneratzen..."
diff --git a/l10n/eu/files_encryption.po b/l10n/eu/files_encryption.po
index e3af65c88a3aef4ca72f5c3b32b7b3976ac6ce4f..cc5d993d62c10aebc4fd5505245a33876df4b086 100644
--- a/l10n/eu/files_encryption.po
+++ b/l10n/eu/files_encryption.po
@@ -3,12 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# asaez <asaez@asaez.eu>, 2013
+# Piarres Beobide <pi@beobide.net>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-14 02:46+0200\n"
-"PO-Revision-Date: 2013-06-14 00:47+0000\n"
+"POT-Creation-Date: 2013-07-05 02:12+0200\n"
+"PO-Revision-Date: 2013-07-05 00:13+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
 "MIME-Version: 1.0\n"
@@ -19,45 +21,57 @@ msgstr ""
 
 #: ajax/adminrecovery.php:29
 msgid "Recovery key successfully enabled"
-msgstr ""
+msgstr "Berreskuratze gakoa behar bezala gaitua"
 
 #: ajax/adminrecovery.php:34
 msgid ""
 "Could not enable recovery key. Please check your recovery key password!"
-msgstr ""
+msgstr "Ezin da berreskuratze gako gaitu. Egiaztatu berreskuratze gako pasahitza!"
 
 #: ajax/adminrecovery.php:48
 msgid "Recovery key successfully disabled"
-msgstr ""
+msgstr "Berreskuratze gakoa behar bezala desgaitu da"
 
 #: ajax/adminrecovery.php:53
 msgid ""
 "Could not disable recovery key. Please check your recovery key password!"
-msgstr ""
+msgstr "Ezin da berreskuratze gako desgaitu. Egiaztatu berreskuratze gako pasahitza!"
 
 #: ajax/changeRecoveryPassword.php:49
 msgid "Password successfully changed."
-msgstr ""
+msgstr "Pasahitza behar bezala aldatu da."
 
 #: ajax/changeRecoveryPassword.php:51
 msgid "Could not change the password. Maybe the old password was not correct."
-msgstr ""
+msgstr "Ezin izan da pasahitza aldatu. Agian pasahitz zaharra okerrekoa da."
 
 #: ajax/updatePrivateKeyPassword.php:51
 msgid "Private key password successfully updated."
-msgstr ""
+msgstr "Gako pasahitz pribatu behar bezala eguneratu da."
 
 #: ajax/updatePrivateKeyPassword.php:53
 msgid ""
 "Could not update the private key password. Maybe the old password was not "
 "correct."
-msgstr ""
+msgstr "Ezin izan da gako pribatu pasahitza eguneratu. Agian pasahitz zaharra okerrekoa da."
 
 #: files/error.php:7
 msgid ""
-"Your private key is not valid! Maybe your password was changed from outside."
-" You can update your private key password in your personal settings to "
-"regain access to your files"
+"Your private key is not valid! Likely your password was changed outside the "
+"ownCloud system (e.g. your corporate directory). You can update your private"
+" key password in your personal settings to recover access to your encrypted "
+"files."
+msgstr ""
+
+#: hooks/hooks.php:44
+msgid "Missing requirements."
+msgstr ""
+
+#: hooks/hooks.php:45
+msgid ""
+"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL "
+"PHP extension is enabled and configured properly. For now, the encryption "
+"app has been disabled."
 msgstr ""
 
 #: js/settings-admin.js:11
@@ -76,7 +90,7 @@ msgstr ""
 
 #: templates/invalid_private_key.php:7
 msgid "personal settings"
-msgstr ""
+msgstr "ezarpen pertsonalak"
 
 #: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
@@ -84,36 +98,36 @@ msgstr "Enkriptazioa"
 
 #: templates/settings-admin.php:10
 msgid ""
-"Enable encryption passwords recovery key (allow sharing to recovery key):"
+"Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
 #: templates/settings-admin.php:14
-msgid "Recovery account password"
-msgstr ""
+msgid "Recovery key password"
+msgstr "Berreskuratze gako pasahitza"
 
 #: templates/settings-admin.php:21 templates/settings-personal.php:54
 msgid "Enabled"
-msgstr ""
+msgstr "Gaitua"
 
 #: templates/settings-admin.php:29 templates/settings-personal.php:62
 msgid "Disabled"
-msgstr ""
+msgstr "Ez-gaitua"
 
 #: templates/settings-admin.php:34
-msgid "Change encryption passwords recovery key:"
-msgstr ""
+msgid "Change recovery key password:"
+msgstr "Aldatu berreskuratze gako pasahitza:"
 
 #: templates/settings-admin.php:41
-msgid "Old Recovery account password"
-msgstr ""
+msgid "Old Recovery key password"
+msgstr "Berreskuratze gako pasahitz zaharra"
 
 #: templates/settings-admin.php:48
-msgid "New Recovery account password"
-msgstr ""
+msgid "New Recovery key password"
+msgstr "Berreskuratze gako pasahitz berria"
 
 #: templates/settings-admin.php:53
 msgid "Change Password"
-msgstr ""
+msgstr "Aldatu Pasahitza"
 
 #: templates/settings-personal.php:11
 msgid "Your private key password no longer match your log-in password:"
@@ -139,11 +153,11 @@ msgstr ""
 
 #: templates/settings-personal.php:35
 msgid "Update Private Key Password"
-msgstr ""
+msgstr "Eguneratu gako pribatu pasahitza"
 
 #: templates/settings-personal.php:45
 msgid "Enable password recovery:"
-msgstr ""
+msgstr "Gaitu pasahitz berreskuratzea:"
 
 #: templates/settings-personal.php:47
 msgid ""
@@ -153,8 +167,8 @@ msgstr ""
 
 #: templates/settings-personal.php:63
 msgid "File recovery settings updated"
-msgstr ""
+msgstr "Fitxategi berreskuratze ezarpenak eguneratuak"
 
 #: templates/settings-personal.php:64
 msgid "Could not update file recovery"
-msgstr ""
+msgstr "Ezin da fitxategi berreskuratzea eguneratu"
diff --git a/l10n/eu/files_external.po b/l10n/eu/files_external.po
index f9f3072e7d88787932dddc281c799293d07f4b8e..5da1bc8541385fdcc47f2b2fc7ee3f715be1651e 100644
--- a/l10n/eu/files_external.po
+++ b/l10n/eu/files_external.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Piarres Beobide <pi@beobide.net>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+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"
@@ -55,7 +56,7 @@ msgid ""
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
 "Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
 "your system administrator to install it."
-msgstr ""
+msgstr "<b>Abisua:</b> Curl euskarri PHP modulua ez dago instalatuta edo gaitua. Ezinezko da ownCloud /WebDAV GoogleDrive-n muntatzea. Mesedez eskatu sistema kudeatzaileari instala dezan. "
 
 #: templates/settings.php:3
 msgid "External Storage"
diff --git a/l10n/eu/files_sharing.po b/l10n/eu/files_sharing.po
index f18c28fcabfcf0a0fbcb32ec165f3247925e5e1f..ce8cf4d5bbed4bea93a1c9fc0fbdaffd9befcc50 100644
--- a/l10n/eu/files_sharing.po
+++ b/l10n/eu/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
 "MIME-Version: 1.0\n"
@@ -18,27 +18,39 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: templates/authenticate.php:4
+msgid "The password is wrong. Try again."
+msgstr ""
+
+#: templates/authenticate.php:7
 msgid "Password"
 msgstr "Pasahitza"
 
-#: templates/authenticate.php:6
+#: templates/authenticate.php:9
 msgid "Submit"
 msgstr "Bidali"
 
-#: templates/public.php:10
+#: templates/public.php:17
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%sk zurekin %s karpeta elkarbanatu du"
 
-#: templates/public.php:13
+#: templates/public.php:20
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%sk zurekin %s fitxategia elkarbanatu du"
 
-#: templates/public.php:19 templates/public.php:43
+#: templates/public.php:28 templates/public.php:90
 msgid "Download"
 msgstr "Deskargatu"
 
-#: templates/public.php:40
+#: templates/public.php:45 templates/public.php:48
+msgid "Upload"
+msgstr "Igo"
+
+#: templates/public.php:58
+msgid "Cancel upload"
+msgstr "Ezeztatu igoera"
+
+#: templates/public.php:87
 msgid "No preview available for"
 msgstr "Ez dago aurrebista eskuragarririk hauentzat "
diff --git a/l10n/eu/files_trashbin.po b/l10n/eu/files_trashbin.po
index 4326abaa03401a02ef0dcb8abfbd068a38a58dfc..92b88e1808940f3fc20ce769f0756c8ecad0e8c9 100644
--- a/l10n/eu/files_trashbin.po
+++ b/l10n/eu/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:16+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/eu/lib.po b/l10n/eu/lib.po
index d235762943b3a4f24f3a53f2b6b47216f4bd96de..c0cef98cac03f807e602f22372a7a1757b533eab 100644
--- a/l10n/eu/lib.po
+++ b/l10n/eu/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
 "MIME-Version: 1.0\n"
@@ -17,43 +17,47 @@ msgstr ""
 "Language: eu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:359
+#: app.php:360
 msgid "Help"
 msgstr "Laguntza"
 
-#: app.php:372
+#: app.php:373
 msgid "Personal"
 msgstr "Pertsonala"
 
-#: app.php:383
+#: app.php:384
 msgid "Settings"
 msgstr "Ezarpenak"
 
-#: app.php:395
+#: app.php:396
 msgid "Users"
 msgstr "Erabiltzaileak"
 
-#: app.php:408
+#: app.php:409
 msgid "Apps"
 msgstr "Aplikazioak"
 
-#: app.php:416
+#: app.php:417
 msgid "Admin"
 msgstr "Admin"
 
-#: files.php:210
+#: defaults.php:33
+msgid "web services under your control"
+msgstr "web zerbitzuak zure kontrolpean"
+
+#: files.php:226
 msgid "ZIP download is turned off."
 msgstr "ZIP deskarga ez dago gaituta."
 
-#: files.php:211
+#: files.php:227
 msgid "Files need to be downloaded one by one."
 msgstr "Fitxategiak banan-banan deskargatu behar dira."
 
-#: files.php:212 files.php:245
+#: files.php:228 files.php:261
 msgid "Back to Files"
 msgstr "Itzuli fitxategietara"
 
-#: files.php:242
+#: files.php:258
 msgid "Selected files too large to generate zip file."
 msgstr "Hautatuko fitxategiak oso handiak dira zip fitxategia sortzeko."
 
@@ -85,104 +89,102 @@ msgstr "Testua"
 msgid "Images"
 msgstr "Irudiak"
 
-#: setup.php:34
-msgid "Set an admin username."
-msgstr "Ezarri administraziorako erabiltzaile izena."
-
-#: setup.php:37
-msgid "Set an admin password."
-msgstr "Ezarri administraziorako pasahitza."
-
-#: setup.php:55
+#: setup/abstractdatabase.php:22
 #, php-format
 msgid "%s enter the database username."
 msgstr "%s sartu datu basearen erabiltzaile izena."
 
-#: setup.php:58
+#: setup/abstractdatabase.php:25
 #, php-format
 msgid "%s enter the database name."
 msgstr "%s sartu datu basearen izena."
 
-#: setup.php:61
+#: setup/abstractdatabase.php:28
 #, php-format
 msgid "%s you may not use dots in the database name"
 msgstr "%s ezin duzu punturik erabili datu basearen izenean."
 
-#: setup.php:64
+#: setup/mssql.php:20
 #, php-format
-msgid "%s set the database host."
-msgstr "%s sartu datu basearen hostalaria."
-
-#: setup.php:126 setup.php:332 setup.php:377
-msgid "PostgreSQL username and/or password not valid"
-msgstr "PostgreSQL erabiltzaile edota pasahitza ez dira egokiak."
+msgid "MS SQL username and/or password not valid: %s"
+msgstr "MS SQL erabiltzaile izena edota pasahitza ez dira egokiak: %s"
 
-#: setup.php:127 setup.php:235
+#: setup/mssql.php:21 setup/mysql.php:13 setup/oci.php:114
+#: setup/postgresql.php:24 setup/postgresql.php:70
 msgid "You need to enter either an existing account or the administrator."
 msgstr "Existitzen den kontu bat edo administradorearena jarri behar duzu."
 
-#: setup.php:152
-msgid "Oracle connection could not be established"
-msgstr ""
-
-#: setup.php:234
+#: setup/mysql.php:12
 msgid "MySQL username and/or password not valid"
 msgstr "MySQL erabiltzaile edota pasahitza ez dira egokiak."
 
-#: setup.php:288 setup.php:398 setup.php:407 setup.php:425 setup.php:435
-#: setup.php:444 setup.php:477 setup.php:543 setup.php:569 setup.php:576
-#: setup.php:587 setup.php:594 setup.php:603 setup.php:611 setup.php:620
-#: setup.php:626
+#: setup/mysql.php:67 setup/oci.php:54 setup/oci.php:121 setup/oci.php:147
+#: setup/oci.php:154 setup/oci.php:165 setup/oci.php:172 setup/oci.php:181
+#: setup/oci.php:189 setup/oci.php:198 setup/oci.php:204
+#: setup/postgresql.php:89 setup/postgresql.php:98 setup/postgresql.php:115
+#: setup/postgresql.php:125 setup/postgresql.php:134
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr "DB errorea: \"%s\""
 
-#: setup.php:289 setup.php:399 setup.php:408 setup.php:426 setup.php:436
-#: setup.php:445 setup.php:478 setup.php:544 setup.php:570 setup.php:577
-#: setup.php:588 setup.php:604 setup.php:612 setup.php:621
+#: setup/mysql.php:68 setup/oci.php:55 setup/oci.php:122 setup/oci.php:148
+#: setup/oci.php:155 setup/oci.php:166 setup/oci.php:182 setup/oci.php:190
+#: setup/oci.php:199 setup/postgresql.php:90 setup/postgresql.php:99
+#: setup/postgresql.php:116 setup/postgresql.php:126 setup/postgresql.php:135
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr "Errorea komando honek sortu du: \"%s\""
 
-#: setup.php:305
+#: setup/mysql.php:85
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr "MySQL '%s'@'localhost' erabiltzailea dagoeneko existitzen da."
 
-#: setup.php:306
+#: setup/mysql.php:86
 msgid "Drop this user from MySQL"
 msgstr "Ezabatu erabiltzaile hau MySQLtik"
 
-#: setup.php:311
+#: setup/mysql.php:91
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr "MySQL '%s'@'%%' erabiltzailea dagoeneko existitzen da"
 
-#: setup.php:312
+#: setup/mysql.php:92
 msgid "Drop this user from MySQL."
 msgstr "Ezabatu erabiltzaile hau MySQLtik."
 
-#: setup.php:469 setup.php:536
+#: setup/oci.php:34
+msgid "Oracle connection could not be established"
+msgstr ""
+
+#: setup/oci.php:41 setup/oci.php:113
 msgid "Oracle username and/or password not valid"
 msgstr "Oracle erabiltzaile edota pasahitza ez dira egokiak."
 
-#: setup.php:595 setup.php:627
+#: setup/oci.php:173 setup/oci.php:205
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr "Errorea komando honek sortu du: \"%s\", izena: %s, pasahitza: %s"
 
-#: setup.php:647
-#, php-format
-msgid "MS SQL username and/or password not valid: %s"
-msgstr "MS SQL erabiltzaile izena edota pasahitza ez dira egokiak: %s"
+#: setup/postgresql.php:23 setup/postgresql.php:69
+msgid "PostgreSQL username and/or password not valid"
+msgstr "PostgreSQL erabiltzaile edota pasahitza ez dira egokiak."
+
+#: setup.php:42
+msgid "Set an admin username."
+msgstr "Ezarri administraziorako erabiltzaile izena."
+
+#: setup.php:45
+msgid "Set an admin password."
+msgstr "Ezarri administraziorako pasahitza."
 
-#: setup.php:870
+#: setup.php:198
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Zure web zerbitzaria ez dago oraindik ongi konfiguratuta fitxategien sinkronizazioa egiteko, WebDAV interfazea ongi ez dagoela dirudi."
 
-#: setup.php:871
+#: setup.php:199
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Mesedez begiratu <a href='%s'>instalazio gidak</a>."
diff --git a/l10n/eu/settings.po b/l10n/eu/settings.po
index cda52d17776958b50e9e494705cf21efa7dfb04f..fbf4cd3bdbb06c17f42f6b828d1f9f4435920797 100644
--- a/l10n/eu/settings.po
+++ b/l10n/eu/settings.po
@@ -3,12 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Piarres Beobide <pi@beobide.net>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
 "MIME-Version: 1.0\n"
@@ -28,7 +29,7 @@ msgstr "Autentifikazio errorea"
 
 #: ajax/changedisplayname.php:31
 msgid "Your display name has been changed."
-msgstr ""
+msgstr "Zure bistaratze izena aldatu egin da."
 
 #: ajax/changedisplayname.php:34
 msgid "Unable to change display name"
@@ -88,35 +89,35 @@ msgstr "Ezin izan da erabiltzailea %s taldetik ezabatu"
 msgid "Couldn't update app."
 msgstr "Ezin izan da aplikazioa eguneratu."
 
-#: js/apps.js:30
+#: js/apps.js:35
 msgid "Update to {appversion}"
 msgstr "Eguneratu {appversion}-ra"
 
-#: js/apps.js:36 js/apps.js:76
+#: js/apps.js:41 js/apps.js:81
 msgid "Disable"
 msgstr "Ez-gaitu"
 
-#: js/apps.js:36 js/apps.js:64 js/apps.js:83
+#: js/apps.js:41 js/apps.js:69 js/apps.js:88
 msgid "Enable"
 msgstr "Gaitu"
 
-#: js/apps.js:55
+#: js/apps.js:60
 msgid "Please wait...."
 msgstr "Itxoin mesedez..."
 
-#: js/apps.js:59 js/apps.js:71 js/apps.js:80 js/apps.js:93
+#: js/apps.js:64 js/apps.js:76 js/apps.js:85 js/apps.js:98
 msgid "Error"
 msgstr "Errorea"
 
-#: js/apps.js:90
+#: js/apps.js:95
 msgid "Updating...."
 msgstr "Eguneratzen..."
 
-#: js/apps.js:93
+#: js/apps.js:98
 msgid "Error while updating app"
 msgstr "Errorea aplikazioa eguneratzen zen bitartean"
 
-#: js/apps.js:96
+#: js/apps.js:101
 msgid "Updated"
 msgstr "Eguneratuta"
 
@@ -165,15 +166,15 @@ msgstr "Errore bat egon da erabiltzailea sortzean"
 msgid "A valid password must be provided"
 msgstr "Baliozko pasahitza eman behar da"
 
-#: personal.php:35 personal.php:36
+#: personal.php:37 personal.php:38
 msgid "__language_name__"
 msgstr "Euskera"
 
-#: templates/admin.php:15
+#: templates/admin.php:17
 msgid "Security Warning"
 msgstr "Segurtasun abisua"
 
-#: templates/admin.php:18
+#: templates/admin.php:20
 msgid ""
 "Your data directory and your files are probably accessible from the "
 "internet. The .htaccess file that ownCloud provides is not working. We "
@@ -182,36 +183,36 @@ msgid ""
 " webserver document root."
 msgstr "Zure data karpeta eta zure fitxategiak internetetik zuzenean eskuragarri egon daitezke. ownCloudek emandako .htaccess fitxategia ez du bere lana egiten. Aholkatzen dizugu zure web zerbitzaria ongi konfiguratzea data karpeta eskuragarri ez izateko edo data karpeta web zerbitzariaren dokumentu errotik mugitzea."
 
-#: templates/admin.php:29
+#: templates/admin.php:31
 msgid "Setup Warning"
 msgstr "Konfiguratu Abisuak"
 
-#: templates/admin.php:32
+#: templates/admin.php:34
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Zure web zerbitzaria ez dago oraindik ongi konfiguratuta fitxategien sinkronizazioa egiteko, WebDAV interfazea ongi ez dagoela dirudi."
 
-#: templates/admin.php:33
+#: templates/admin.php:35
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Mesedez begiratu <a href='%s'>instalazio gidak</a>."
 
-#: templates/admin.php:44
+#: templates/admin.php:46
 msgid "Module 'fileinfo' missing"
 msgstr "'fileinfo' Modulua falta da"
 
-#: templates/admin.php:47
+#: templates/admin.php:49
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr "PHP 'fileinfo' modulua falta da. Modulu hau gaitzea aholkatzen dizugu mime-type ezberdinak hobe detektatzeko."
 
-#: templates/admin.php:58
+#: templates/admin.php:60
 msgid "Locale not working"
 msgstr "Lokala ez dabil"
 
-#: templates/admin.php:63
+#: templates/admin.php:65
 #, php-format
 msgid ""
 "This ownCloud server can't set system locale to %s. This means that there "
@@ -219,11 +220,11 @@ msgid ""
 " to install the required packages on your system to support %s."
 msgstr "OwnClud zerbitzari honek ezin du sistemaren lokala %s-ra ezarri. Honek fitxategien izenetan karaktere batzuekin arazoak egon daitekeela esan nahi du. Aholkatzen dizugu zure sistema %s lokalea onartzeko beharrezkoak diren paketeak instalatzea."
 
-#: templates/admin.php:75
+#: templates/admin.php:77
 msgid "Internet connection not working"
 msgstr "Interneteko konexioak ez du funtzionatzen"
 
-#: templates/admin.php:78
+#: templates/admin.php:80
 msgid ""
 "This ownCloud server has no working internet connection. This means that "
 "some of the features like mounting of external storage, notifications about "
@@ -233,102 +234,102 @@ msgid ""
 " of ownCloud."
 msgstr "ownCloud zerbitzari honen interneteko konexioa ez dabil. Honek esan nahi du kanpoko biltegiratze zerbitzuak, eguneraketen informazioa edo bestelako aplikazioen instalazioa bezalako programek ez dutela funtzionatuko. Urrunetik fitxategiak eskuratzea eta e-postak bidaltzea ere ezinezkoa izan daiteke. onwCloud-en aukera guztiak erabili ahal izateko zerbitzari honetan interneteko konexioa gaitzea aholkatzen dizugu."
 
-#: templates/admin.php:92
+#: templates/admin.php:94
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:101
+#: templates/admin.php:103
 msgid "Execute one task with each page loaded"
 msgstr "Exekutatu zeregin bat orri karga bakoitzean"
 
-#: templates/admin.php:111
+#: templates/admin.php:113
 msgid ""
 "cron.php is registered at a webcron service. Call the cron.php page in the "
 "owncloud root once a minute over http."
 msgstr "cron.php webcron zerbitzu batean erregistratua dago. Deitu cron.php orria ownclouden erroan minuturo http bidez."
 
-#: templates/admin.php:121
+#: templates/admin.php:123
 msgid ""
 "Use systems cron service. Call the cron.php file in the owncloud folder via "
 "a system cronjob once a minute."
 msgstr "Erabili sistemaren cron zerbitzua. Deitu cron.php fitxategia owncloud karpetan minuturo sistemaren cron lan baten bidez."
 
-#: templates/admin.php:128
+#: templates/admin.php:130
 msgid "Sharing"
 msgstr "Partekatzea"
 
-#: templates/admin.php:134
+#: templates/admin.php:136
 msgid "Enable Share API"
 msgstr "Gaitu Elkarbanatze APIa"
 
-#: templates/admin.php:135
+#: templates/admin.php:137
 msgid "Allow apps to use the Share API"
 msgstr "Baimendu aplikazioak Elkarbanatze APIa erabiltzeko"
 
-#: templates/admin.php:142
+#: templates/admin.php:144
 msgid "Allow links"
 msgstr "Baimendu loturak"
 
-#: templates/admin.php:143
+#: templates/admin.php:145
 msgid "Allow users to share items to the public with links"
 msgstr "Baimendu erabiltzaileak loturen bidez fitxategiak publikoki elkarbanatzen"
 
-#: templates/admin.php:150
+#: templates/admin.php:152
 msgid "Allow resharing"
 msgstr "Baimendu birpartekatzea"
 
-#: templates/admin.php:151
+#: templates/admin.php:153
 msgid "Allow users to share items shared with them again"
 msgstr "Baimendu erabiltzaileak haiekin elkarbanatutako fitxategiak berriz ere elkarbanatzen"
 
-#: templates/admin.php:158
+#: templates/admin.php:160
 msgid "Allow users to share with anyone"
 msgstr "Baimendu erabiltzaileak edonorekin elkarbanatzen"
 
-#: templates/admin.php:161
+#: templates/admin.php:163
 msgid "Allow users to only share with users in their groups"
 msgstr "Baimendu erabiltzaileak bakarrik bere taldeko erabiltzaileekin elkarbanatzen"
 
-#: templates/admin.php:168
+#: templates/admin.php:170
 msgid "Security"
 msgstr "Segurtasuna"
 
-#: templates/admin.php:181
+#: templates/admin.php:183
 msgid "Enforce HTTPS"
 msgstr "Behartu HTTPS"
 
-#: templates/admin.php:182
+#: templates/admin.php:184
 msgid ""
 "Enforces the clients to connect to ownCloud via an encrypted connection."
 msgstr "Bezeroak konexio enkriptatu baten bidez ownCloud-era konektatzera behartzen du."
 
-#: templates/admin.php:185
+#: templates/admin.php:187
 msgid ""
 "Please connect to this ownCloud instance via HTTPS to enable or disable the "
 "SSL enforcement."
 msgstr "Mesedez konektatu ownCloud honetara HTTPS bidez SSL-ren beharra gaitu edo ezgaitzeko"
 
-#: templates/admin.php:195
+#: templates/admin.php:197
 msgid "Log"
 msgstr "Egunkaria"
 
-#: templates/admin.php:196
+#: templates/admin.php:198
 msgid "Log level"
 msgstr "Erregistro maila"
 
-#: templates/admin.php:227
+#: templates/admin.php:229
 msgid "More"
 msgstr "Gehiago"
 
-#: templates/admin.php:228
+#: templates/admin.php:230
 msgid "Less"
 msgstr "Gutxiago"
 
-#: templates/admin.php:235 templates/personal.php:116
+#: templates/admin.php:236 templates/personal.php:116
 msgid "Version"
 msgstr "Bertsioa"
 
-#: templates/admin.php:237 templates/personal.php:119
+#: templates/admin.php:240 templates/personal.php:119
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -386,76 +387,79 @@ msgstr "Bugtracker"
 msgid "Commercial Support"
 msgstr "Babes komertziala"
 
-#: templates/personal.php:9
+#: templates/personal.php:10
 msgid "Get the apps to sync your files"
 msgstr "Lortu aplikazioak zure fitxategiak sinkronizatzeko"
 
-#: templates/personal.php:20
+#: templates/personal.php:21
 msgid "Show First Run Wizard again"
 msgstr "Erakutsi berriz Lehenengo Aldiko Morroia"
 
-#: templates/personal.php:28
+#: templates/personal.php:29
 #, php-format
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "Dagoeneko <strong>%s</strong> erabili duzu eskuragarri duzun <strong>%s</strong>etatik"
 
-#: templates/personal.php:40 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:41 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "Pasahitza"
 
-#: templates/personal.php:41
+#: templates/personal.php:42
 msgid "Your password was changed"
 msgstr "Zere pasahitza aldatu da"
 
-#: templates/personal.php:42
+#: templates/personal.php:43
 msgid "Unable to change your password"
 msgstr "Ezin izan da zure pasahitza aldatu"
 
-#: templates/personal.php:43
+#: templates/personal.php:44
 msgid "Current password"
 msgstr "Uneko pasahitza"
 
-#: templates/personal.php:45
+#: templates/personal.php:46
 msgid "New password"
 msgstr "Pasahitz berria"
 
-#: templates/personal.php:47
+#: templates/personal.php:48
 msgid "Change password"
 msgstr "Aldatu pasahitza"
 
-#: templates/personal.php:59 templates/users.php:85
+#: templates/personal.php:60 templates/users.php:85
 msgid "Display Name"
 msgstr "Bistaratze Izena"
 
-#: templates/personal.php:74
+#: templates/personal.php:75
 msgid "Email"
 msgstr "E-posta"
 
-#: templates/personal.php:76
+#: templates/personal.php:77
 msgid "Your email address"
 msgstr "Zure e-posta"
 
-#: templates/personal.php:77
+#: templates/personal.php:78
 msgid "Fill in an email address to enable password recovery"
 msgstr "Idatz ezazu e-posta bat pasahitza berreskuratu ahal izateko"
 
-#: templates/personal.php:86 templates/personal.php:87
+#: templates/personal.php:87 templates/personal.php:88
 msgid "Language"
 msgstr "Hizkuntza"
 
-#: templates/personal.php:99
+#: templates/personal.php:100
 msgid "Help translate"
 msgstr "Lagundu itzultzen"
 
-#: templates/personal.php:105
+#: templates/personal.php:106
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:107
-msgid "Use this address to connect to your ownCloud in your file manager"
-msgstr "Erabili helbide hau zure fitxategi kudeatzailean zure ownCloudera konektatzeko"
+#: templates/personal.php:108
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
+"target=\"_blank\">access your Files via WebDAV</a>"
+msgstr ""
 
-#: templates/users.php:21 templates/users.php:84
+#: templates/users.php:21
 msgid "Login Name"
 msgstr "Sarrera Izena"
 
@@ -465,13 +469,13 @@ msgstr "Sortu"
 
 #: templates/users.php:36
 msgid "Admin Recovery Password"
-msgstr ""
+msgstr "Kudeatzaile pasahitz berreskuratzea"
 
 #: templates/users.php:37 templates/users.php:38
 msgid ""
 "Enter the recovery password in order to recover the users files during "
 "password change"
-msgstr ""
+msgstr "berreskuratze pasahitza idatzi pasahitz aldaketan erabiltzaileen fitxategiak berreskuratzeko"
 
 #: templates/users.php:42
 msgid "Default Storage"
@@ -485,6 +489,10 @@ msgstr "Mugarik gabe"
 msgid "Other"
 msgstr "Bestelakoa"
 
+#: templates/users.php:84
+msgid "Username"
+msgstr "Erabiltzaile izena"
+
 #: templates/users.php:91
 msgid "Storage"
 msgstr "Biltegiratzea"
diff --git a/l10n/eu/user_ldap.po b/l10n/eu/user_ldap.po
index d309a16d2402d0a827d651fdfe55dd2af52e33d1..95b902b31b7a9dd79ff05043f8732c30ea0c7e84 100644
--- a/l10n/eu/user_ldap.po
+++ b/l10n/eu/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:25+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:16+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/fa/core.po b/l10n/fa/core.po
index e8d5bb2927e79cc75a55e48a52b2ced8448c6304..91b165a1c86bd2f633f5504ec9f624dd200ed049 100644
--- a/l10n/fa/core.po
+++ b/l10n/fa/core.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# miki_mika1362 <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-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
+"Last-Translator: miki_mika1362 <miki_mika1362@yahoo.com>\n"
 "Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,7 +21,7 @@ msgstr ""
 #: ajax/share.php:97
 #, php-format
 msgid "%s shared »%s« with you"
-msgstr ""
+msgstr "%s به اشتراک گذاشته شده است »%s« توسط شما"
 
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
@@ -61,135 +62,135 @@ msgstr "هیج دسته ای برای پاک شدن انتخاب نشده است
 msgid "Error removing %s from favorites."
 msgstr "خطای پاک کردن %s از علاقه مندی ها."
 
-#: js/config.php:34
+#: js/config.php:32
 msgid "Sunday"
 msgstr "یکشنبه"
 
-#: js/config.php:35
+#: js/config.php:33
 msgid "Monday"
 msgstr "دوشنبه"
 
-#: js/config.php:36
+#: js/config.php:34
 msgid "Tuesday"
 msgstr "سه شنبه"
 
-#: js/config.php:37
+#: js/config.php:35
 msgid "Wednesday"
 msgstr "چهارشنبه"
 
-#: js/config.php:38
+#: js/config.php:36
 msgid "Thursday"
 msgstr "پنجشنبه"
 
-#: js/config.php:39
+#: js/config.php:37
 msgid "Friday"
 msgstr "جمعه"
 
-#: js/config.php:40
+#: js/config.php:38
 msgid "Saturday"
 msgstr "شنبه"
 
-#: js/config.php:45
+#: js/config.php:43
 msgid "January"
 msgstr "ژانویه"
 
-#: js/config.php:46
+#: js/config.php:44
 msgid "February"
 msgstr "فبریه"
 
-#: js/config.php:47
+#: js/config.php:45
 msgid "March"
 msgstr "مارس"
 
-#: js/config.php:48
+#: js/config.php:46
 msgid "April"
 msgstr "آوریل"
 
-#: js/config.php:49
+#: js/config.php:47
 msgid "May"
 msgstr "می"
 
-#: js/config.php:50
+#: js/config.php:48
 msgid "June"
 msgstr "ژوئن"
 
-#: js/config.php:51
+#: js/config.php:49
 msgid "July"
 msgstr "جولای"
 
-#: js/config.php:52
+#: js/config.php:50
 msgid "August"
 msgstr "آگوست"
 
-#: js/config.php:53
+#: js/config.php:51
 msgid "September"
 msgstr "سپتامبر"
 
-#: js/config.php:54
+#: js/config.php:52
 msgid "October"
 msgstr "اکتبر"
 
-#: js/config.php:55
+#: js/config.php:53
 msgid "November"
 msgstr "نوامبر"
 
-#: js/config.php:56
+#: js/config.php:54
 msgid "December"
 msgstr "دسامبر"
 
-#: js/js.js:286
+#: js/js.js:293
 msgid "Settings"
 msgstr "تنظیمات"
 
-#: js/js.js:718
+#: js/js.js:725
 msgid "seconds ago"
 msgstr "ثانیه‌ها پیش"
 
-#: js/js.js:719
+#: js/js.js:726
 msgid "1 minute ago"
 msgstr "1 دقیقه پیش"
 
-#: js/js.js:720
+#: js/js.js:727
 msgid "{minutes} minutes ago"
 msgstr "{دقیقه ها} دقیقه های پیش"
 
-#: js/js.js:721
+#: js/js.js:728
 msgid "1 hour ago"
 msgstr "1 ساعت پیش"
 
-#: js/js.js:722
+#: js/js.js:729
 msgid "{hours} hours ago"
 msgstr "{ساعت ها} ساعت ها پیش"
 
-#: js/js.js:723
+#: js/js.js:730
 msgid "today"
 msgstr "امروز"
 
-#: js/js.js:724
+#: js/js.js:731
 msgid "yesterday"
 msgstr "دیروز"
 
-#: js/js.js:725
+#: js/js.js:732
 msgid "{days} days ago"
 msgstr "{روزها} روزهای پیش"
 
-#: js/js.js:726
+#: js/js.js:733
 msgid "last month"
 msgstr "ماه قبل"
 
-#: js/js.js:727
+#: js/js.js:734
 msgid "{months} months ago"
 msgstr "{ماه ها} ماه ها پیش"
 
-#: js/js.js:728
+#: js/js.js:735
 msgid "months ago"
 msgstr "ماه‌های قبل"
 
-#: js/js.js:729
+#: js/js.js:736
 msgid "last year"
 msgstr "سال قبل"
 
-#: js/js.js:730
+#: js/js.js:737
 msgid "years ago"
 msgstr "سال‌های قبل"
 
@@ -203,7 +204,7 @@ msgstr "منصرف شدن"
 
 #: js/oc-dialogs.js:141 js/oc-dialogs.js:200
 msgid "Error loading file picker template"
-msgstr ""
+msgstr "خطا در بارگذاری قالب انتخاب کننده فایل"
 
 #: js/oc-dialogs.js:164
 msgid "Yes"
@@ -225,8 +226,8 @@ msgstr "نوع شی تعیین نشده است."
 #: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
 #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:577
-#: js/share.js:589
+#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:620
+#: js/share.js:632
 msgid "Error"
 msgstr "خطا"
 
@@ -246,7 +247,7 @@ msgstr "اشتراک گذاشته شده"
 msgid "Share"
 msgstr "اشتراک‌گذاری"
 
-#: js/share.js:125 js/share.js:617
+#: js/share.js:125 js/share.js:660
 msgid "Error while sharing"
 msgstr "خطا درحال به اشتراک گذاشتن"
 
@@ -266,99 +267,103 @@ msgstr "به اشتراک گذاشته شده با شما و گروه {گروه}
 msgid "Shared with you by {owner}"
 msgstr "به اشتراک گذاشته شده با شما توسط { دارنده}"
 
-#: js/share.js:159
+#: js/share.js:172
 msgid "Share with"
 msgstr "به اشتراک گذاشتن با"
 
-#: js/share.js:164
+#: js/share.js:177
 msgid "Share with link"
 msgstr "به اشتراک گذاشتن با پیوند"
 
-#: js/share.js:167
+#: js/share.js:180
 msgid "Password protect"
 msgstr "نگهداری کردن رمز عبور"
 
-#: js/share.js:169 templates/installation.php:54 templates/login.php:26
+#: js/share.js:182 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "گذرواژه"
 
-#: js/share.js:173
+#: js/share.js:187
+msgid "Allow Public Upload"
+msgstr "اجازه آپلود عمومی"
+
+#: js/share.js:191
 msgid "Email link to person"
 msgstr "پیوند ایمیل برای شخص."
 
-#: js/share.js:174
+#: js/share.js:192
 msgid "Send"
 msgstr "ارسال"
 
-#: js/share.js:178
+#: js/share.js:197
 msgid "Set expiration date"
 msgstr "تنظیم تاریخ انقضا"
 
-#: js/share.js:179
+#: js/share.js:198
 msgid "Expiration date"
 msgstr "تاریخ انقضا"
 
-#: js/share.js:211
+#: js/share.js:230
 msgid "Share via email:"
 msgstr "از طریق ایمیل به اشتراک بگذارید :"
 
-#: js/share.js:213
+#: js/share.js:232
 msgid "No people found"
 msgstr "کسی یافت نشد"
 
-#: js/share.js:251
+#: js/share.js:270
 msgid "Resharing is not allowed"
 msgstr "اشتراک گذاری مجدد مجاز نمی باشد"
 
-#: js/share.js:287
+#: js/share.js:306
 msgid "Shared in {item} with {user}"
 msgstr "به اشتراک گذاشته شده در {بخش} با {کاربر}"
 
-#: js/share.js:308
+#: js/share.js:327
 msgid "Unshare"
 msgstr "لغو اشتراک"
 
-#: js/share.js:320
+#: js/share.js:339
 msgid "can edit"
 msgstr "می توان ویرایش کرد"
 
-#: js/share.js:322
+#: js/share.js:341
 msgid "access control"
 msgstr "کنترل دسترسی"
 
-#: js/share.js:325
+#: js/share.js:344
 msgid "create"
 msgstr "ایجاد"
 
-#: js/share.js:328
+#: js/share.js:347
 msgid "update"
 msgstr "به روز"
 
-#: js/share.js:331
+#: js/share.js:350
 msgid "delete"
 msgstr "پاک کردن"
 
-#: js/share.js:334
+#: js/share.js:353
 msgid "share"
 msgstr "به اشتراک گذاشتن"
 
-#: js/share.js:368 js/share.js:564
+#: js/share.js:387 js/share.js:607
 msgid "Password protected"
 msgstr "نگهداری از رمز عبور"
 
-#: js/share.js:577
+#: js/share.js:620
 msgid "Error unsetting expiration date"
 msgstr "خطا در تنظیم نکردن تاریخ انقضا "
 
-#: js/share.js:589
+#: js/share.js:632
 msgid "Error setting expiration date"
 msgstr "خطا در تنظیم تاریخ انقضا"
 
-#: js/share.js:604
+#: js/share.js:647
 msgid "Sending ..."
 msgstr "درحال ارسال ..."
 
-#: js/share.js:615
+#: js/share.js:658
 msgid "Email sent"
 msgstr "ایمیل ارسال شد"
 
@@ -373,7 +378,7 @@ msgstr "به روز رسانی ناموفق بود. لطفا این خطا را
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "به روزرسانی موفقیت آمیز بود. در حال انتقال شما به OwnCloud."
 
-#: lostpassword/controller.php:58
+#: lostpassword/controller.php:60
 msgid "ownCloud password reset"
 msgstr "پسورد ابرهای شما تغییرکرد"
 
@@ -386,11 +391,11 @@ msgid ""
 "The link to reset your password has been sent to your email.<br>If you do "
 "not receive it within a reasonable amount of time, check your spam/junk "
 "folders.<br>If it is not there ask your local administrator ."
-msgstr ""
+msgstr "لینک تنظیم مجدد رمز عبور به ایمیل شما ارسال شده است.<br>اگر آن رادر یک زمان مشخصی دریافت نکرده اید، لطفا هرزنامه/ پوشه های ناخواسته را بررسی کنید.<br>در صورت نبودن از مدیر خود بپرسید."
 
 #: lostpassword/templates/lostpassword.php:12
 msgid "Request failed!<br>Did you make sure your email/username was right?"
-msgstr ""
+msgstr "درخواست رد شده است !<br> آیا مطمئن هستید که ایمیل/ نام کاربری شما صحیح میباشد ؟"
 
 #: lostpassword/templates/lostpassword.php:15
 msgid "You will receive a link to reset your password via Email."
@@ -403,17 +408,17 @@ msgstr "نام کاربری"
 
 #: lostpassword/templates/lostpassword.php:22
 msgid ""
-"Your files seems to be encrypted. If you didn't have enabled the recovery "
-"key there will be no way to get your data back once the password was "
-"resetted. If you are not sure what to do, please contact your administrator "
-"first before continue. Do you really want to continue?"
-msgstr ""
+"Your files are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
+msgstr "فایل های شما رمزگذاری شده اند. اگر شما کلید بازیابی را فعال نکرده اید، پس از راه اندازی مجدد رمزعبور هیچ راهی برای بازگشت اطلاعاتتان وجود نخواهد داشت.در صورت عدم اطمینان به انجام کار، لطفا ابتدا با مدیر خود تماس بگیرید. آیا واقعا میخواهید ادامه دهید ؟"
 
 #: lostpassword/templates/lostpassword.php:24
 msgid "Yes, I really want to reset my password now"
-msgstr ""
+msgstr "بله، من اکنون میخواهم رمز عبور خود را مجددا راه اندازی کنم."
 
-#: lostpassword/templates/lostpassword.php:29
+#: lostpassword/templates/lostpassword.php:27
 msgid "Request reset"
 msgstr "درخواست دوباره سازی"
 
@@ -461,7 +466,7 @@ msgstr "اجازه دسترسی به مناطق ممنوعه را ندارید"
 msgid "Cloud not found"
 msgstr "پیدا نشد"
 
-#: templates/altmail.php:2
+#: templates/altmail.php:4
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -470,11 +475,7 @@ msgid ""
 "View it: %s\n"
 "\n"
 "Cheers!"
-msgstr ""
-
-#: templates/altmail.php:7 templates/mail.php:24
-msgid "web services under your control"
-msgstr "سرویس های تحت وب در کنترل شما"
+msgstr "اینجا,⏎\n فقط به شما اجازه میدهد که بدانید %s به اشتراک گذاشته شده %s توسط شما.⏎\nمشاهده آن :  %s⏎\n⏎\nبه سلامتی!"
 
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
@@ -568,12 +569,12 @@ msgstr "هاست پایگاه داده"
 msgid "Finish setup"
 msgstr "اتمام نصب"
 
-#: templates/layout.user.php:40
+#: templates/layout.user.php:43
 #, php-format
 msgid "%s is available. Get more information on how to update."
-msgstr ""
+msgstr "%s در دسترس است. برای چگونگی به روز رسانی اطلاعات بیشتر را دریافت نمایید."
 
-#: templates/layout.user.php:67
+#: templates/layout.user.php:68
 msgid "Log out"
 msgstr "خروج"
 
@@ -607,12 +608,12 @@ msgstr "ورود"
 msgid "Alternative Logins"
 msgstr "ورود متناوب"
 
-#: templates/mail.php:15
+#: templates/mail.php:16
 #, php-format
 msgid ""
 "Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
 "href=\"%s\">View it!</a><br><br>Cheers!"
-msgstr ""
+msgstr "اینجا<br><br> فقط به شما اجازه میدهد که بدانید %s به اشتراک گذاشته شده»%s« توسط شما.<br><a href=\"%s\"> مشاهده آن!</a><br><br> به سلامتی!"
 
 #: templates/part.pagenavi.php:3
 msgid "prev"
diff --git a/l10n/fa/files.po b/l10n/fa/files.po
index 4088d74bfa044102a1634f8a6c8d53daa20b5a6d..f3bf5149417d4f6ac86e95dfc0848c8d176bfa83 100644
--- a/l10n/fa/files.po
+++ b/l10n/fa/files.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# miki_mika1362 <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-06-17 02:01+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
+"Last-Translator: miki_mika1362 <miki_mika1362@yahoo.com>\n"
 "Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -27,46 +28,54 @@ msgstr "%s نمی تواند حرکت کند - در حال حاضر پرونده
 msgid "Could not move %s"
 msgstr "%s نمی تواند حرکت کند "
 
-#: ajax/upload.php:19
+#: ajax/upload.php:16 ajax/upload.php:45
+msgid "Unable to set upload directory."
+msgstr "قادر به تنظیم پوشه آپلود نمی باشد."
+
+#: ajax/upload.php:22
+msgid "Invalid Token"
+msgstr "رمز نامعتبر"
+
+#: ajax/upload.php:59
 msgid "No file was uploaded. Unknown error"
 msgstr "هیچ فایلی آپلود نشد.خطای ناشناس"
 
-#: ajax/upload.php:26
+#: ajax/upload.php:66
 msgid "There is no error, the file uploaded with success"
 msgstr "هیچ خطایی نیست بارگذاری پرونده موفقیت آمیز بود"
 
-#: ajax/upload.php:27
+#: ajax/upload.php:67
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr "پرونده آپلود شده بیش ازدستور  ماکزیمم_حجم فایل_برای آپلود در   php.ini استفاده کرده است."
 
-#: ajax/upload.php:29
+#: ajax/upload.php:69
 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:30
+#: ajax/upload.php:70
 msgid "The uploaded file was only partially uploaded"
 msgstr "پرونده بارگذاری شده فقط تاحدودی بارگذاری شده"
 
-#: ajax/upload.php:31
+#: ajax/upload.php:71
 msgid "No file was uploaded"
 msgstr "هیچ پروندهای بارگذاری نشده"
 
-#: ajax/upload.php:32
+#: ajax/upload.php:72
 msgid "Missing a temporary folder"
 msgstr "یک پوشه موقت گم شده"
 
-#: ajax/upload.php:33
+#: ajax/upload.php:73
 msgid "Failed to write to disk"
 msgstr "نوشتن بر روی دیسک سخت ناموفق بود"
 
-#: ajax/upload.php:51
+#: ajax/upload.php:91
 msgid "Not enough storage available"
 msgstr "فضای کافی در دسترس نیست"
 
-#: ajax/upload.php:83
+#: ajax/upload.php:123
 msgid "Invalid directory."
 msgstr "فهرست راهنما نامعتبر می باشد."
 
@@ -74,6 +83,36 @@ msgstr "فهرست راهنما نامعتبر می باشد."
 msgid "Files"
 msgstr "پرونده‌ها"
 
+#: js/file-upload.js:11
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr "ناتوان در بارگذاری یا فایل یک پوشه است یا 0بایت دارد"
+
+#: js/file-upload.js:24
+msgid "Not enough space available"
+msgstr "فضای کافی در دسترس نیست"
+
+#: js/file-upload.js:64
+msgid "Upload cancelled."
+msgstr "بار گذاری لغو شد"
+
+#: js/file-upload.js:167 js/files.js:266
+msgid ""
+"File upload is in progress. Leaving the page now will cancel the upload."
+msgstr "آپلودکردن پرونده در حال پیشرفت است. در صورت خروج از صفحه آپلود لغو میگردد. "
+
+#: js/file-upload.js:233 js/files.js:339
+msgid "URL cannot be empty."
+msgstr "URL  نمی تواند خالی باشد."
+
+#: js/file-upload.js:238 lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr "نام پوشه نامعتبر است. استفاده از 'به اشتراک گذاشته شده' متعلق به ownCloud میباشد."
+
+#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
+#: js/files.js:693 js/files.js:731
+msgid "Error"
+msgstr "خطا"
+
 #: js/fileactions.js:116
 msgid "Share"
 msgstr "اشتراک‌گذاری"
@@ -90,43 +129,43 @@ msgstr "حذف"
 msgid "Rename"
 msgstr "تغییرنام"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:464
 msgid "Pending"
 msgstr "در انتظار"
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "{new_name} already exists"
 msgstr "{نام _جدید} در حال حاضر وجود دارد."
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "replace"
 msgstr "جایگزین"
 
-#: js/filelist.js:259
+#: js/filelist.js:302
 msgid "suggest name"
 msgstr "پیشنهاد نام"
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "cancel"
 msgstr "لغو"
 
-#: js/filelist.js:306
+#: js/filelist.js:349
 msgid "replaced {new_name} with {old_name}"
 msgstr "{نام_جدید} با { نام_قدیمی} جایگزین شد."
 
-#: js/filelist.js:306
+#: js/filelist.js:349
 msgid "undo"
 msgstr "بازگشت"
 
-#: js/filelist.js:331
+#: js/filelist.js:374
 msgid "perform delete operation"
 msgstr "انجام عمل حذف"
 
-#: js/filelist.js:413
+#: js/filelist.js:456
 msgid "1 file uploading"
 msgstr "1 پرونده آپلود شد."
 
-#: js/filelist.js:416 js/filelist.js:470
+#: js/filelist.js:459 js/filelist.js:517
 msgid "files uploading"
 msgstr "بارگذاری فایل ها"
 
@@ -158,70 +197,42 @@ msgid ""
 "big."
 msgstr "دانلود شما در حال آماده شدن است. در صورتیکه پرونده ها بزرگ باشند ممکن است مدتی طول بکشد."
 
-#: js/files.js:264
-msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "ناتوان در بارگذاری یا فایل یک پوشه است یا 0بایت دارد"
-
-#: js/files.js:277
-msgid "Not enough space available"
-msgstr "فضای کافی در دسترس نیست"
-
-#: js/files.js:317
-msgid "Upload cancelled."
-msgstr "بار گذاری لغو شد"
-
-#: js/files.js:413
-msgid ""
-"File upload is in progress. Leaving the page now will cancel the upload."
-msgstr "آپلودکردن پرونده در حال پیشرفت است. در صورت خروج از صفحه آپلود لغو میگردد. "
-
-#: js/files.js:486
-msgid "URL cannot be empty."
-msgstr "URL  نمی تواند خالی باشد."
-
-#: js/files.js:491
+#: js/files.js:344
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "نام پوشه نامعتبر است. استفاده از \" به اشتراک گذاشته شده \" متعلق به سایت Owncloud است."
 
-#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
-msgid "Error"
-msgstr "خطا"
-
-#: js/files.js:877 templates/index.php:69
+#: js/files.js:744 templates/index.php:69
 msgid "Name"
 msgstr "نام"
 
-#: js/files.js:878 templates/index.php:80
+#: js/files.js:745 templates/index.php:80
 msgid "Size"
 msgstr "اندازه"
 
-#: js/files.js:879 templates/index.php:82
+#: js/files.js:746 templates/index.php:82
 msgid "Modified"
 msgstr "تاریخ"
 
-#: js/files.js:898
+#: js/files.js:765
 msgid "1 folder"
 msgstr "1 پوشه"
 
-#: js/files.js:900
+#: js/files.js:767
 msgid "{count} folders"
 msgstr "{ شمار} پوشه ها"
 
-#: js/files.js:908
+#: js/files.js:775
 msgid "1 file"
 msgstr "1 پرونده"
 
-#: js/files.js:910
+#: js/files.js:777
 msgid "{count} files"
 msgstr "{ شمار } فایل ها"
 
-#: lib/app.php:53
-msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
-msgstr ""
-
 #: lib/app.php:73
-msgid "Unable to rename file"
-msgstr "قادر به تغییر نام پرونده نیست."
+#, php-format
+msgid "%s could not be renamed"
+msgstr "%s نمیتواند تغییر نام دهد."
 
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
@@ -317,6 +328,22 @@ msgstr "پرونده ها در حال بازرسی هستند لطفا صبر ک
 msgid "Current scanning"
 msgstr "بازرسی کنونی"
 
+#: templates/part.list.php:76
+msgid "directory"
+msgstr "پوشه"
+
+#: templates/part.list.php:78
+msgid "directories"
+msgstr "پوشه ها"
+
+#: templates/part.list.php:87
+msgid "file"
+msgstr "پرونده"
+
+#: templates/part.list.php:89
+msgid "files"
+msgstr "پرونده ها"
+
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
 msgstr "بهبود فایل سیستمی ذخیره گاه..."
diff --git a/l10n/fa/files_encryption.po b/l10n/fa/files_encryption.po
index f2486e064c76e763e177e1e87e8b8a9d9b5576b9..5435dd5782bb7918ba04309259612aac24a31d22 100644
--- a/l10n/fa/files_encryption.po
+++ b/l10n/fa/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-14 02:46+0200\n"
-"PO-Revision-Date: 2013-06-14 00:47+0000\n"
+"POT-Creation-Date: 2013-07-05 02:12+0200\n"
+"PO-Revision-Date: 2013-07-05 00:13+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"
@@ -55,9 +55,21 @@ msgstr ""
 
 #: files/error.php:7
 msgid ""
-"Your private key is not valid! Maybe your password was changed from outside."
-" You can update your private key password in your personal settings to "
-"regain access to your files"
+"Your private key is not valid! Likely your password was changed outside the "
+"ownCloud system (e.g. your corporate directory). You can update your private"
+" key password in your personal settings to recover access to your encrypted "
+"files."
+msgstr ""
+
+#: hooks/hooks.php:44
+msgid "Missing requirements."
+msgstr ""
+
+#: hooks/hooks.php:45
+msgid ""
+"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL "
+"PHP extension is enabled and configured properly. For now, the encryption "
+"app has been disabled."
 msgstr ""
 
 #: js/settings-admin.js:11
@@ -84,11 +96,11 @@ msgstr "رمزگذاری"
 
 #: templates/settings-admin.php:10
 msgid ""
-"Enable encryption passwords recovery key (allow sharing to recovery key):"
+"Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
 #: templates/settings-admin.php:14
-msgid "Recovery account password"
+msgid "Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:21 templates/settings-personal.php:54
@@ -100,15 +112,15 @@ msgid "Disabled"
 msgstr ""
 
 #: templates/settings-admin.php:34
-msgid "Change encryption passwords recovery key:"
+msgid "Change recovery key password:"
 msgstr ""
 
 #: templates/settings-admin.php:41
-msgid "Old Recovery account password"
+msgid "Old Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:48
-msgid "New Recovery account password"
+msgid "New Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:53
diff --git a/l10n/fa/files_external.po b/l10n/fa/files_external.po
index 103a387cfce885e8352d2058e7da2565907f07b7..e6ee06e30355058f7ac920c2293702a8109d4043 100644
--- a/l10n/fa/files_external.po
+++ b/l10n/fa/files_external.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
 "MIME-Version: 1.0\n"
@@ -63,7 +63,7 @@ msgstr "حافظه خارجی"
 
 #: templates/settings.php:9 templates/settings.php:28
 msgid "Folder name"
-msgstr ""
+msgstr "نام پوشه"
 
 #: templates/settings.php:10
 msgid "External storage"
diff --git a/l10n/fa/files_sharing.po b/l10n/fa/files_sharing.po
index 8c0f3a52afb0f27da3666aa41bd43871a22331bb..72834bbf95a67dc8ca955cb7a0c062f8e5f1ecd8 100644
--- a/l10n/fa/files_sharing.po
+++ b/l10n/fa/files_sharing.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# miki_mika1362 <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-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
+"Last-Translator: miki_mika1362 <miki_mika1362@yahoo.com>\n"
 "Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,27 +19,39 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: templates/authenticate.php:4
+msgid "The password is wrong. Try again."
+msgstr "رمزعبور اشتباه می باشد. دوباره امتحان کنید."
+
+#: templates/authenticate.php:7
 msgid "Password"
 msgstr "گذرواژه"
 
-#: templates/authenticate.php:6
+#: templates/authenticate.php:9
 msgid "Submit"
 msgstr "ثبت"
 
-#: templates/public.php:10
+#: templates/public.php:17
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%sپوشه %s را با شما به اشتراک گذاشت"
 
-#: templates/public.php:13
+#: templates/public.php:20
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%sفایل %s را با شما به اشتراک گذاشت"
 
-#: templates/public.php:19 templates/public.php:43
+#: templates/public.php:28 templates/public.php:90
 msgid "Download"
 msgstr "دانلود"
 
-#: templates/public.php:40
+#: templates/public.php:45 templates/public.php:48
+msgid "Upload"
+msgstr "بارگزاری"
+
+#: templates/public.php:58
+msgid "Cancel upload"
+msgstr "متوقف کردن بار گذاری"
+
+#: templates/public.php:87
 msgid "No preview available for"
 msgstr "هیچگونه پیش نمایشی موجود نیست"
diff --git a/l10n/fa/files_trashbin.po b/l10n/fa/files_trashbin.po
index 76a3c90d7b5c82f30d407a4620523f8343d1443d..e3cba3652f61817aeaf8e17997c15609bee09eba 100644
--- a/l10n/fa/files_trashbin.po
+++ b/l10n/fa/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:16+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/fa/files_versions.po b/l10n/fa/files_versions.po
index 191735399243abb2995b1067316cd603ffa8d1f6..b97521439ce876c0ee24a5764861afbd8d28b2ba 100644
--- a/l10n/fa/files_versions.po
+++ b/l10n/fa/files_versions.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# miki_mika1362 <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-05-25 02:01+0200\n"
-"PO-Revision-Date: 2013-05-24 13:28+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 09:50+0000\n"
+"Last-Translator: miki_mika1362 <miki_mika1362@yahoo.com>\n"
 "Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -29,7 +30,7 @@ msgstr "موفقیت"
 #: history.php:42
 #, php-format
 msgid "File %s was reverted to version %s"
-msgstr ""
+msgstr "فایل %s  به نسخه %s بازگردانده شده است."
 
 #: history.php:49
 msgid "failure"
@@ -38,7 +39,7 @@ msgstr "شکست"
 #: history.php:51
 #, php-format
 msgid "File %s could not be reverted to version %s"
-msgstr ""
+msgstr "فایل %s نمی تواند به نسخه %s بازگردانده شود."
 
 #: history.php:69
 msgid "No old versions available"
@@ -50,7 +51,7 @@ msgstr "هیچ مسیری مشخص نشده است"
 
 #: js/versions.js:6
 msgid "Versions"
-msgstr ""
+msgstr "نسخه ها"
 
 #: templates/history.php:20
 msgid "Revert a file to a previous version by clicking on its revert button"
diff --git a/l10n/fa/lib.po b/l10n/fa/lib.po
index ebfaf2736b184821714ebcb91ec7a6a30f7a7f03..2da25c9cc47e79dce8ecf3217b91c0153bc26a32 100644
--- a/l10n/fa/lib.po
+++ b/l10n/fa/lib.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# miki_mika1362 <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-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
+"Last-Translator: miki_mika1362 <miki_mika1362@yahoo.com>\n"
 "Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,49 +18,53 @@ msgstr ""
 "Language: fa\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: app.php:359
+#: app.php:360
 msgid "Help"
 msgstr "راه‌نما"
 
-#: app.php:372
+#: app.php:373
 msgid "Personal"
 msgstr "شخصی"
 
-#: app.php:383
+#: app.php:384
 msgid "Settings"
 msgstr "تنظیمات"
 
-#: app.php:395
+#: app.php:396
 msgid "Users"
 msgstr "کاربران"
 
-#: app.php:408
+#: app.php:409
 msgid "Apps"
 msgstr "  برنامه ها"
 
-#: app.php:416
+#: app.php:417
 msgid "Admin"
 msgstr "مدیر"
 
-#: files.php:210
+#: defaults.php:33
+msgid "web services under your control"
+msgstr "سرویس های تحت وب در کنترل شما"
+
+#: files.php:226
 msgid "ZIP download is turned off."
 msgstr "دانلود به صورت فشرده غیر فعال است"
 
-#: files.php:211
+#: files.php:227
 msgid "Files need to be downloaded one by one."
 msgstr "فایل ها باید به صورت یکی یکی دانلود شوند"
 
-#: files.php:212 files.php:245
+#: files.php:228 files.php:261
 msgid "Back to Files"
 msgstr "بازگشت به فایل ها"
 
-#: files.php:242
+#: files.php:258
 msgid "Selected files too large to generate zip file."
 msgstr "فایل های انتخاب شده بزرگتر از آن هستند که بتوان یک فایل فشرده تولید کرد"
 
 #: helper.php:236
 msgid "couldn't be determined"
-msgstr ""
+msgstr "نمیتواند مشخص شود"
 
 #: json.php:28
 msgid "Application is not enabled"
@@ -71,7 +76,7 @@ msgstr "خطا در اعتبار سنجی"
 
 #: json.php:51
 msgid "Token expired. Please reload page."
-msgstr ""
+msgstr "رمز منقضی شده است. لطفا دوباره صفحه را بارگذاری نمایید."
 
 #: search/provider/file.php:17 search/provider/file.php:35
 msgid "Files"
@@ -85,104 +90,102 @@ msgstr "متن"
 msgid "Images"
 msgstr "تصاویر"
 
-#: setup.php:34
-msgid "Set an admin username."
-msgstr ""
-
-#: setup.php:37
-msgid "Set an admin password."
-msgstr ""
-
-#: setup.php:55
+#: setup/abstractdatabase.php:22
 #, php-format
 msgid "%s enter the database username."
-msgstr ""
+msgstr "%s نام کاربری پایگاه داده را وارد نمایید."
 
-#: setup.php:58
+#: setup/abstractdatabase.php:25
 #, php-format
 msgid "%s enter the database name."
-msgstr ""
+msgstr "%s نام پایگاه داده را وارد نمایید."
 
-#: setup.php:61
+#: setup/abstractdatabase.php:28
 #, php-format
 msgid "%s you may not use dots in the database name"
-msgstr ""
+msgstr "%s شما نباید از نقطه در نام پایگاه داده استفاده نمایید."
 
-#: setup.php:64
+#: setup/mssql.php:20
 #, php-format
-msgid "%s set the database host."
-msgstr ""
-
-#: setup.php:126 setup.php:332 setup.php:377
-msgid "PostgreSQL username and/or password not valid"
-msgstr ""
+msgid "MS SQL username and/or password not valid: %s"
+msgstr "نام کاربری و / یا رمزعبور MS SQL معتبر نیست:  %s"
 
-#: setup.php:127 setup.php:235
+#: setup/mssql.php:21 setup/mysql.php:13 setup/oci.php:114
+#: setup/postgresql.php:24 setup/postgresql.php:70
 msgid "You need to enter either an existing account or the administrator."
-msgstr ""
-
-#: setup.php:152
-msgid "Oracle connection could not be established"
-msgstr ""
+msgstr "شما نیاز به وارد کردن یک حساب کاربری موجود یا حساب مدیریتی دارید."
 
-#: setup.php:234
+#: setup/mysql.php:12
 msgid "MySQL username and/or password not valid"
-msgstr ""
+msgstr "نام کاربری و / یا رمزعبور MySQL  معتبر نیست."
 
-#: setup.php:288 setup.php:398 setup.php:407 setup.php:425 setup.php:435
-#: setup.php:444 setup.php:477 setup.php:543 setup.php:569 setup.php:576
-#: setup.php:587 setup.php:594 setup.php:603 setup.php:611 setup.php:620
-#: setup.php:626
+#: setup/mysql.php:67 setup/oci.php:54 setup/oci.php:121 setup/oci.php:147
+#: setup/oci.php:154 setup/oci.php:165 setup/oci.php:172 setup/oci.php:181
+#: setup/oci.php:189 setup/oci.php:198 setup/oci.php:204
+#: setup/postgresql.php:89 setup/postgresql.php:98 setup/postgresql.php:115
+#: setup/postgresql.php:125 setup/postgresql.php:134
 #, php-format
 msgid "DB Error: \"%s\""
-msgstr ""
+msgstr "خطای پایگاه داده: \"%s\""
 
-#: setup.php:289 setup.php:399 setup.php:408 setup.php:426 setup.php:436
-#: setup.php:445 setup.php:478 setup.php:544 setup.php:570 setup.php:577
-#: setup.php:588 setup.php:604 setup.php:612 setup.php:621
+#: setup/mysql.php:68 setup/oci.php:55 setup/oci.php:122 setup/oci.php:148
+#: setup/oci.php:155 setup/oci.php:166 setup/oci.php:182 setup/oci.php:190
+#: setup/oci.php:199 setup/postgresql.php:90 setup/postgresql.php:99
+#: setup/postgresql.php:116 setup/postgresql.php:126 setup/postgresql.php:135
 #, php-format
 msgid "Offending command was: \"%s\""
-msgstr ""
+msgstr "دستور متخلف عبارت است از: \"%s\""
 
-#: setup.php:305
+#: setup/mysql.php:85
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
-msgstr ""
+msgstr "کاربرMySQL '%s'@'localhost' درحال حاضر موجود است."
 
-#: setup.php:306
+#: setup/mysql.php:86
 msgid "Drop this user from MySQL"
-msgstr ""
+msgstr "این کاربر را از MySQL حذف نمایید."
 
-#: setup.php:311
+#: setup/mysql.php:91
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
-msgstr ""
+msgstr "کاربر'%s'@'%%'  MySQL  در حال حاضر موجود است."
 
-#: setup.php:312
+#: setup/mysql.php:92
 msgid "Drop this user from MySQL."
-msgstr ""
+msgstr "این کاربر را از MySQL حذف نمایید."
+
+#: setup/oci.php:34
+msgid "Oracle connection could not be established"
+msgstr "ارتباط اراکل نمیتواند برقرار باشد."
 
-#: setup.php:469 setup.php:536
+#: setup/oci.php:41 setup/oci.php:113
 msgid "Oracle username and/or password not valid"
-msgstr ""
+msgstr "نام کاربری و / یا رمزعبور اراکل معتبر نیست."
 
-#: setup.php:595 setup.php:627
+#: setup/oci.php:173 setup/oci.php:205
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
-msgstr ""
+msgstr "دستور متخلف عبارت است از: \"%s\"، نام: \"%s\"، رمزعبور:\"%s\""
 
-#: setup.php:647
-#, php-format
-msgid "MS SQL username and/or password not valid: %s"
-msgstr ""
+#: setup/postgresql.php:23 setup/postgresql.php:69
+msgid "PostgreSQL username and/or password not valid"
+msgstr "PostgreSQL نام کاربری و / یا رمزعبور معتبر نیست."
+
+#: setup.php:42
+msgid "Set an admin username."
+msgstr "یک نام کاربری برای مدیر تنظیم نمایید."
+
+#: setup.php:45
+msgid "Set an admin password."
+msgstr "یک رمزعبور برای مدیر تنظیم نمایید."
 
-#: setup.php:870
+#: setup.php:198
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "احتمالاً وب سرور شما طوری تنظیم نشده است که اجازه ی همگام سازی فایلها را بدهد زیرا به نظر میرسد رابط WebDAV از کار افتاده است."
 
-#: setup.php:871
+#: setup.php:199
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "لطفاً دوباره <a href='%s'>راهنمای نصب</a>را بررسی کنید."
diff --git a/l10n/fa/settings.po b/l10n/fa/settings.po
index e171ee0b25ce8c60cbcfccb027ab2a4806938b45..bb5cffefa6295bcabe10241442c0f99422c23bb8 100644
--- a/l10n/fa/settings.po
+++ b/l10n/fa/settings.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# miki_mika1362 <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-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
+"Last-Translator: miki_mika1362 <miki_mika1362@yahoo.com>\n"
 "Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -28,7 +29,7 @@ msgstr "خطا در اعتبار سنجی"
 
 #: ajax/changedisplayname.php:31
 msgid "Your display name has been changed."
-msgstr ""
+msgstr "نام نمایش شما تغییر یافته است."
 
 #: ajax/changedisplayname.php:34
 msgid "Unable to change display name"
@@ -88,35 +89,35 @@ msgstr "امکان حذف کاربر از گروه %s نیست"
 msgid "Couldn't update app."
 msgstr "برنامه را نمی توان به هنگام ساخت."
 
-#: js/apps.js:30
+#: js/apps.js:35
 msgid "Update to {appversion}"
 msgstr "بهنگام شده به  {appversion}"
 
-#: js/apps.js:36 js/apps.js:76
+#: js/apps.js:41 js/apps.js:81
 msgid "Disable"
 msgstr "غیرفعال"
 
-#: js/apps.js:36 js/apps.js:64 js/apps.js:83
+#: js/apps.js:41 js/apps.js:69 js/apps.js:88
 msgid "Enable"
 msgstr "فعال"
 
-#: js/apps.js:55
+#: js/apps.js:60
 msgid "Please wait...."
 msgstr "لطفا صبر کنید ..."
 
-#: js/apps.js:59 js/apps.js:71 js/apps.js:80 js/apps.js:93
+#: js/apps.js:64 js/apps.js:76 js/apps.js:85 js/apps.js:98
 msgid "Error"
 msgstr "خطا"
 
-#: js/apps.js:90
+#: js/apps.js:95
 msgid "Updating...."
 msgstr "در حال بروز رسانی..."
 
-#: js/apps.js:93
+#: js/apps.js:98
 msgid "Error while updating app"
 msgstr "خطا در هنگام بهنگام سازی برنامه"
 
-#: js/apps.js:96
+#: js/apps.js:101
 msgid "Updated"
 msgstr "بروز رسانی انجام شد"
 
@@ -165,15 +166,15 @@ msgstr "خطا در ایجاد کاربر"
 msgid "A valid password must be provided"
 msgstr "رمز عبور صحیح باید وارد شود"
 
-#: personal.php:35 personal.php:36
+#: personal.php:37 personal.php:38
 msgid "__language_name__"
 msgstr "__language_name__"
 
-#: templates/admin.php:15
+#: templates/admin.php:17
 msgid "Security Warning"
 msgstr "اخطار امنیتی"
 
-#: templates/admin.php:18
+#: templates/admin.php:20
 msgid ""
 "Your data directory and your files are probably accessible from the "
 "internet. The .htaccess file that ownCloud provides is not working. We "
@@ -182,36 +183,36 @@ msgid ""
 " webserver document root."
 msgstr "احتمالاً فهرست و فایلهای شما از طریق اینترنت قابل دسترسی هستند. فایل با فرمت .htaccess که ownCloud اراده کرده است دیگر کار نمی کند. ما قویاً توصیه می کنیم که شما وب سرور خودتان را طوری تنظیم کنید که فهرست اطلاعات شما غیر قابل دسترسی باشند یا فهرست اطلاعات را به خارج از ریشه ی اصلی وب سرور انتقال دهید."
 
-#: templates/admin.php:29
+#: templates/admin.php:31
 msgid "Setup Warning"
 msgstr "هشدار راه اندازی"
 
-#: templates/admin.php:32
+#: templates/admin.php:34
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "احتمالاً وب سرور شما طوری تنظیم نشده است که اجازه ی همگام سازی فایلها را بدهد زیرا به نظر میرسد رابط WebDAV از کار افتاده است."
 
-#: templates/admin.php:33
+#: templates/admin.php:35
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "لطفاً دوباره <a href='%s'>راهنمای نصب</a>را بررسی کنید."
 
-#: templates/admin.php:44
+#: templates/admin.php:46
 msgid "Module 'fileinfo' missing"
 msgstr "ماژول 'fileinfo' از کار افتاده"
 
-#: templates/admin.php:47
+#: templates/admin.php:49
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr "ماژول 'fileinfo' PHP از کار افتاده است.ما اکیدا توصیه می کنیم که این ماژول را فعال کنید تا نتایج بهتری به وسیله ی mime-type detection دریافت کنید."
 
-#: templates/admin.php:58
+#: templates/admin.php:60
 msgid "Locale not working"
-msgstr ""
+msgstr "زبان محلی کار نمی کند."
 
-#: templates/admin.php:63
+#: templates/admin.php:65
 #, php-format
 msgid ""
 "This ownCloud server can't set system locale to %s. This means that there "
@@ -219,11 +220,11 @@ msgid ""
 " to install the required packages on your system to support %s."
 msgstr "این سرور ownCloud نمی تواند سیستم محلی را بر روی %s تنظیم کند.این به این معنی ست که ممکن است با کاراکترهای خاصی در نام فایل ها مشکل داشته باشد.ما اکیداً نصب کردن بسته های لازم را بر روی سیستم خودتان برای پشتیبانی %s توصیه می کنیم."
 
-#: templates/admin.php:75
+#: templates/admin.php:77
 msgid "Internet connection not working"
 msgstr "اتصال اینترنت کار نمی کند"
 
-#: templates/admin.php:78
+#: templates/admin.php:80
 msgid ""
 "This ownCloud server has no working internet connection. This means that "
 "some of the features like mounting of external storage, notifications about "
@@ -233,102 +234,102 @@ msgid ""
 " of ownCloud."
 msgstr "این سرور OwnCloud ارتباط اینترنتی ندارد.این بدین معناست که بعضی از خصوصیات نظیر خارج کردن منبع ذخیره ی خارجی، اطلاعات در مورد بروزرسانی ها یا نصب برنامه های نوع 3ام کار نمی کنند.دسترسی به فایل ها از راه دور و ارسال آگاه سازی ایمیل ها ممکن است همچنان کار نکنند.اگرشما همه ی خصوصیات OwnCloud می خواهید ما پیشنهاد می کنیم تا ارتباط اینترنتی مربوط به این سرور را فعال کنید."
 
-#: templates/admin.php:92
+#: templates/admin.php:94
 msgid "Cron"
-msgstr ""
+msgstr "زمانبند"
 
-#: templates/admin.php:101
+#: templates/admin.php:103
 msgid "Execute one task with each page loaded"
 msgstr "اجرای یک وظیفه با هر بار بارگذاری صفحه"
 
-#: templates/admin.php:111
+#: templates/admin.php:113
 msgid ""
 "cron.php is registered at a webcron service. Call the cron.php page in the "
 "owncloud root once a minute over http."
-msgstr ""
+msgstr "cron.php در یک سرویس webcron ثبت شده است. تماس یک بار در دقیقه بر روی http با صفحه  cron.php در ریشه owncloud ."
 
-#: templates/admin.php:121
+#: templates/admin.php:123
 msgid ""
 "Use systems cron service. Call the cron.php file in the owncloud folder via "
 "a system cronjob once a minute."
-msgstr ""
+msgstr "استفاده از سیستم های سرویس cron . تماس یک بار در دقیقه با فایل cron.php در پوشه owncloud از طریق یک سیستم cronjob ."
 
-#: templates/admin.php:128
+#: templates/admin.php:130
 msgid "Sharing"
 msgstr "اشتراک گذاری"
 
-#: templates/admin.php:134
+#: templates/admin.php:136
 msgid "Enable Share API"
 msgstr "فعال کردن API اشتراک گذاری"
 
-#: templates/admin.php:135
+#: templates/admin.php:137
 msgid "Allow apps to use the Share API"
 msgstr "اجازه ی برنامه ها برای استفاده از API اشتراک گذاری"
 
-#: templates/admin.php:142
+#: templates/admin.php:144
 msgid "Allow links"
 msgstr "اجازه ی لینک ها"
 
-#: templates/admin.php:143
+#: templates/admin.php:145
 msgid "Allow users to share items to the public with links"
 msgstr "اجازه دادن به کاربران برای اشتراک گذاری آیتم ها با عموم از طریق پیوند ها"
 
-#: templates/admin.php:150
+#: templates/admin.php:152
 msgid "Allow resharing"
 msgstr "مجوز اشتراک گذاری مجدد"
 
-#: templates/admin.php:151
+#: templates/admin.php:153
 msgid "Allow users to share items shared with them again"
 msgstr "اجازه به کاربران برای اشتراک گذاری دوباره با آنها"
 
-#: templates/admin.php:158
+#: templates/admin.php:160
 msgid "Allow users to share with anyone"
 msgstr "اجازه به کابران برای اشتراک گذاری با همه"
 
-#: templates/admin.php:161
+#: templates/admin.php:163
 msgid "Allow users to only share with users in their groups"
 msgstr "اجازه به کاربران برای اشتراک گذاری ، تنها با دیگر کابران گروه خودشان"
 
-#: templates/admin.php:168
+#: templates/admin.php:170
 msgid "Security"
 msgstr "امنیت"
 
-#: templates/admin.php:181
+#: templates/admin.php:183
 msgid "Enforce HTTPS"
 msgstr "وادار کردن HTTPS"
 
-#: templates/admin.php:182
+#: templates/admin.php:184
 msgid ""
 "Enforces the clients to connect to ownCloud via an encrypted connection."
 msgstr "وادار کردن مشتریان برای ارتباط با ownCloud از طریق رمزگذاری ارتباط"
 
-#: templates/admin.php:185
+#: templates/admin.php:187
 msgid ""
 "Please connect to this ownCloud instance via HTTPS to enable or disable the "
 "SSL enforcement."
-msgstr ""
+msgstr "از طریق HTTPS به این نسخه از ownCloud متصل شوید تا بتوانید SSL  را فعال یا غیر فعال نمایید."
 
-#: templates/admin.php:195
+#: templates/admin.php:197
 msgid "Log"
 msgstr "کارنامه"
 
-#: templates/admin.php:196
+#: templates/admin.php:198
 msgid "Log level"
-msgstr ""
+msgstr "سطح ورود"
 
-#: templates/admin.php:227
+#: templates/admin.php:229
 msgid "More"
 msgstr "بیش‌تر"
 
-#: templates/admin.php:228
+#: templates/admin.php:230
 msgid "Less"
 msgstr "کم‌تر"
 
-#: templates/admin.php:235 templates/personal.php:116
+#: templates/admin.php:236 templates/personal.php:116
 msgid "Version"
 msgstr "نسخه"
 
-#: templates/admin.php:237 templates/personal.php:119
+#: templates/admin.php:240 templates/personal.php:119
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -386,76 +387,79 @@ msgstr "ردیاب باگ "
 msgid "Commercial Support"
 msgstr "پشتیبانی تجاری"
 
-#: templates/personal.php:9
+#: templates/personal.php:10
 msgid "Get the apps to sync your files"
 msgstr "برنامه ها را دریافت کنید تا فایل هایتان را همگام سازید"
 
-#: templates/personal.php:20
+#: templates/personal.php:21
 msgid "Show First Run Wizard again"
 msgstr "راهبری کمکی اجرای اول را دوباره نمایش بده"
 
-#: templates/personal.php:28
+#: templates/personal.php:29
 #, php-format
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "شما استفاده کردید از <strong>%s</strong> از میزان در دسترس <strong>%s</strong>"
 
-#: templates/personal.php:40 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:41 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "گذرواژه"
 
-#: templates/personal.php:41
+#: templates/personal.php:42
 msgid "Your password was changed"
 msgstr "رمز عبور شما تغییر یافت"
 
-#: templates/personal.php:42
+#: templates/personal.php:43
 msgid "Unable to change your password"
 msgstr "ناتوان در تغییر گذرواژه"
 
-#: templates/personal.php:43
+#: templates/personal.php:44
 msgid "Current password"
 msgstr "گذرواژه کنونی"
 
-#: templates/personal.php:45
+#: templates/personal.php:46
 msgid "New password"
 msgstr "گذرواژه جدید"
 
-#: templates/personal.php:47
+#: templates/personal.php:48
 msgid "Change password"
 msgstr "تغییر گذر واژه"
 
-#: templates/personal.php:59 templates/users.php:85
+#: templates/personal.php:60 templates/users.php:85
 msgid "Display Name"
 msgstr "نام نمایشی"
 
-#: templates/personal.php:74
+#: templates/personal.php:75
 msgid "Email"
 msgstr "ایمیل"
 
-#: templates/personal.php:76
+#: templates/personal.php:77
 msgid "Your email address"
 msgstr "پست الکترونیکی شما"
 
-#: templates/personal.php:77
+#: templates/personal.php:78
 msgid "Fill in an email address to enable password recovery"
 msgstr "پست الکترونیکی را پرکنید  تا بازیابی گذرواژه فعال شود"
 
-#: templates/personal.php:86 templates/personal.php:87
+#: templates/personal.php:87 templates/personal.php:88
 msgid "Language"
 msgstr "زبان"
 
-#: templates/personal.php:99
+#: templates/personal.php:100
 msgid "Help translate"
 msgstr "به ترجمه آن کمک کنید"
 
-#: templates/personal.php:105
+#: templates/personal.php:106
 msgid "WebDAV"
-msgstr ""
+msgstr "WebDAV"
 
-#: templates/personal.php:107
-msgid "Use this address to connect to your ownCloud in your file manager"
-msgstr "از این نشانی برای اتصال به ownCloud خودتان در بخش مدیریت فایل خودتان استفاده کنید"
+#: templates/personal.php:108
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
+"target=\"_blank\">access your Files via WebDAV</a>"
+msgstr "استفاده ابن آدرس <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\"> برای دسترسی فایل های شما از طریق WebDAV </a>"
 
-#: templates/users.php:21 templates/users.php:84
+#: templates/users.php:21
 msgid "Login Name"
 msgstr "نام کاربری"
 
@@ -465,13 +469,13 @@ msgstr "ایجاد کردن"
 
 #: templates/users.php:36
 msgid "Admin Recovery Password"
-msgstr ""
+msgstr "مدیریت بازیابی رمز عبور"
 
 #: templates/users.php:37 templates/users.php:38
 msgid ""
 "Enter the recovery password in order to recover the users files during "
 "password change"
-msgstr ""
+msgstr "در حین تغییر رمز عبور به منظور بازیابی فایل های کاربران، رمز عبور بازیابی را وارد کنید"
 
 #: templates/users.php:42
 msgid "Default Storage"
@@ -485,6 +489,10 @@ msgstr "نامحدود"
 msgid "Other"
 msgstr "دیگر"
 
+#: templates/users.php:84
+msgid "Username"
+msgstr "نام کاربری"
+
 #: templates/users.php:91
 msgid "Storage"
 msgstr "حافظه"
diff --git a/l10n/fa/user_ldap.po b/l10n/fa/user_ldap.po
index c40115d3cc96089b018f18c941cca601388839b7..096ebd88fdfda34765417c14373a36076b8ccfe1 100644
--- a/l10n/fa/user_ldap.po
+++ b/l10n/fa/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:25+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:16+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/fi_FI/core.po b/l10n/fi_FI/core.po
index bdfd8813cfa36acf8a050cc73687bb5cb213f1aa..4ca6f047a2e2cd1685f95a964f230985286254cc 100644
--- a/l10n/fi_FI/core.po
+++ b/l10n/fi_FI/core.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:22+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
@@ -21,7 +21,7 @@ msgstr ""
 #: ajax/share.php:97
 #, php-format
 msgid "%s shared »%s« with you"
-msgstr ""
+msgstr "%s jakoi kohteen »%s« kanssasi"
 
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
@@ -62,135 +62,135 @@ msgstr "Luokkia ei valittu poistettavaksi."
 msgid "Error removing %s from favorites."
 msgstr "Virhe poistaessa kohdetta %s suosikeista."
 
-#: js/config.php:34
+#: js/config.php:32
 msgid "Sunday"
 msgstr "sunnuntai"
 
-#: js/config.php:35
+#: js/config.php:33
 msgid "Monday"
 msgstr "maanantai"
 
-#: js/config.php:36
+#: js/config.php:34
 msgid "Tuesday"
 msgstr "tiistai"
 
-#: js/config.php:37
+#: js/config.php:35
 msgid "Wednesday"
 msgstr "keskiviikko"
 
-#: js/config.php:38
+#: js/config.php:36
 msgid "Thursday"
 msgstr "torstai"
 
-#: js/config.php:39
+#: js/config.php:37
 msgid "Friday"
 msgstr "perjantai"
 
-#: js/config.php:40
+#: js/config.php:38
 msgid "Saturday"
 msgstr "lauantai"
 
-#: js/config.php:45
+#: js/config.php:43
 msgid "January"
 msgstr "tammikuu"
 
-#: js/config.php:46
+#: js/config.php:44
 msgid "February"
 msgstr "helmikuu"
 
-#: js/config.php:47
+#: js/config.php:45
 msgid "March"
 msgstr "maaliskuu"
 
-#: js/config.php:48
+#: js/config.php:46
 msgid "April"
 msgstr "huhtikuu"
 
-#: js/config.php:49
+#: js/config.php:47
 msgid "May"
 msgstr "toukokuu"
 
-#: js/config.php:50
+#: js/config.php:48
 msgid "June"
 msgstr "kesäkuu"
 
-#: js/config.php:51
+#: js/config.php:49
 msgid "July"
 msgstr "heinäkuu"
 
-#: js/config.php:52
+#: js/config.php:50
 msgid "August"
 msgstr "elokuu"
 
-#: js/config.php:53
+#: js/config.php:51
 msgid "September"
 msgstr "syyskuu"
 
-#: js/config.php:54
+#: js/config.php:52
 msgid "October"
 msgstr "lokakuu"
 
-#: js/config.php:55
+#: js/config.php:53
 msgid "November"
 msgstr "marraskuu"
 
-#: js/config.php:56
+#: js/config.php:54
 msgid "December"
 msgstr "joulukuu"
 
-#: js/js.js:286
+#: js/js.js:293
 msgid "Settings"
 msgstr "Asetukset"
 
-#: js/js.js:718
+#: js/js.js:725
 msgid "seconds ago"
 msgstr "sekuntia sitten"
 
-#: js/js.js:719
+#: js/js.js:726
 msgid "1 minute ago"
 msgstr "1 minuutti sitten"
 
-#: js/js.js:720
+#: js/js.js:727
 msgid "{minutes} minutes ago"
 msgstr "{minutes} minuuttia sitten"
 
-#: js/js.js:721
+#: js/js.js:728
 msgid "1 hour ago"
 msgstr "1 tunti sitten"
 
-#: js/js.js:722
+#: js/js.js:729
 msgid "{hours} hours ago"
 msgstr "{hours} tuntia sitten"
 
-#: js/js.js:723
+#: js/js.js:730
 msgid "today"
 msgstr "tänään"
 
-#: js/js.js:724
+#: js/js.js:731
 msgid "yesterday"
 msgstr "eilen"
 
-#: js/js.js:725
+#: js/js.js:732
 msgid "{days} days ago"
 msgstr "{days} päivää sitten"
 
-#: js/js.js:726
+#: js/js.js:733
 msgid "last month"
 msgstr "viime kuussa"
 
-#: js/js.js:727
+#: js/js.js:734
 msgid "{months} months ago"
 msgstr "{months} kuukautta sitten"
 
-#: js/js.js:728
+#: js/js.js:735
 msgid "months ago"
 msgstr "kuukautta sitten"
 
-#: js/js.js:729
+#: js/js.js:736
 msgid "last year"
 msgstr "viime vuonna"
 
-#: js/js.js:730
+#: js/js.js:737
 msgid "years ago"
 msgstr "vuotta sitten"
 
@@ -226,8 +226,8 @@ msgstr ""
 #: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
 #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:577
-#: js/share.js:589
+#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:620
+#: js/share.js:632
 msgid "Error"
 msgstr "Virhe"
 
@@ -247,7 +247,7 @@ msgstr "Jaettu"
 msgid "Share"
 msgstr "Jaa"
 
-#: js/share.js:125 js/share.js:617
+#: js/share.js:125 js/share.js:660
 msgid "Error while sharing"
 msgstr "Virhe jaettaessa"
 
@@ -267,99 +267,103 @@ msgstr "Jaettu sinun ja ryhmän {group} kanssa käyttäjän {owner} toimesta"
 msgid "Shared with you by {owner}"
 msgstr "Jaettu kanssasi käyttäjän {owner} toimesta"
 
-#: js/share.js:159
+#: js/share.js:172
 msgid "Share with"
 msgstr "Jaa"
 
-#: js/share.js:164
+#: js/share.js:177
 msgid "Share with link"
 msgstr "Jaa linkillä"
 
-#: js/share.js:167
+#: js/share.js:180
 msgid "Password protect"
 msgstr "Suojaa salasanalla"
 
-#: js/share.js:169 templates/installation.php:54 templates/login.php:26
+#: js/share.js:182 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "Salasana"
 
-#: js/share.js:173
+#: js/share.js:187
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:191
 msgid "Email link to person"
 msgstr "Lähetä linkki sähköpostitse"
 
-#: js/share.js:174
+#: js/share.js:192
 msgid "Send"
 msgstr "Lähetä"
 
-#: js/share.js:178
+#: js/share.js:197
 msgid "Set expiration date"
 msgstr "Aseta päättymispäivä"
 
-#: js/share.js:179
+#: js/share.js:198
 msgid "Expiration date"
 msgstr "Päättymispäivä"
 
-#: js/share.js:211
+#: js/share.js:230
 msgid "Share via email:"
 msgstr "Jaa sähköpostilla:"
 
-#: js/share.js:213
+#: js/share.js:232
 msgid "No people found"
 msgstr "Henkilöitä ei löytynyt"
 
-#: js/share.js:251
+#: js/share.js:270
 msgid "Resharing is not allowed"
 msgstr "Jakaminen uudelleen ei ole salittu"
 
-#: js/share.js:287
+#: js/share.js:306
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:308
+#: js/share.js:327
 msgid "Unshare"
 msgstr "Peru jakaminen"
 
-#: js/share.js:320
+#: js/share.js:339
 msgid "can edit"
 msgstr "voi muokata"
 
-#: js/share.js:322
+#: js/share.js:341
 msgid "access control"
 msgstr "Pääsyn hallinta"
 
-#: js/share.js:325
+#: js/share.js:344
 msgid "create"
 msgstr "luo"
 
-#: js/share.js:328
+#: js/share.js:347
 msgid "update"
 msgstr "päivitä"
 
-#: js/share.js:331
+#: js/share.js:350
 msgid "delete"
 msgstr "poista"
 
-#: js/share.js:334
+#: js/share.js:353
 msgid "share"
 msgstr "jaa"
 
-#: js/share.js:368 js/share.js:564
+#: js/share.js:387 js/share.js:607
 msgid "Password protected"
 msgstr "Salasanasuojattu"
 
-#: js/share.js:577
+#: js/share.js:620
 msgid "Error unsetting expiration date"
 msgstr "Virhe purettaessa eräpäivää"
 
-#: js/share.js:589
+#: js/share.js:632
 msgid "Error setting expiration date"
 msgstr "Virhe päättymispäivää asettaessa"
 
-#: js/share.js:604
+#: js/share.js:647
 msgid "Sending ..."
 msgstr "Lähetetään..."
 
-#: js/share.js:615
+#: js/share.js:658
 msgid "Email sent"
 msgstr "Sähköposti lähetetty"
 
@@ -374,7 +378,7 @@ msgstr "Päivitys epäonnistui. Ilmoita ongelmasta <a href=\"https://github.com/
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "Päivitys onnistui. Selain ohjautuu nyt ownCloudiisi."
 
-#: lostpassword/controller.php:58
+#: lostpassword/controller.php:60
 msgid "ownCloud password reset"
 msgstr "ownCloud-salasanan nollaus"
 
@@ -404,17 +408,17 @@ msgstr "Käyttäjätunnus"
 
 #: lostpassword/templates/lostpassword.php:22
 msgid ""
-"Your files seems to be encrypted. If you didn't have enabled the recovery "
-"key there will be no way to get your data back once the password was "
-"resetted. If you are not sure what to do, please contact your administrator "
-"first before continue. Do you really want to continue?"
+"Your files are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
 msgstr ""
 
 #: lostpassword/templates/lostpassword.php:24
 msgid "Yes, I really want to reset my password now"
-msgstr ""
+msgstr "Kyllä, haluan nollata salasanani nyt"
 
-#: lostpassword/templates/lostpassword.php:29
+#: lostpassword/templates/lostpassword.php:27
 msgid "Request reset"
 msgstr "Tilaus lähetetty"
 
@@ -462,7 +466,7 @@ msgstr "Pääsy estetty"
 msgid "Cloud not found"
 msgstr "Pilveä ei löydy"
 
-#: templates/altmail.php:2
+#: templates/altmail.php:4
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -471,11 +475,7 @@ msgid ""
 "View it: %s\n"
 "\n"
 "Cheers!"
-msgstr ""
-
-#: templates/altmail.php:7 templates/mail.php:24
-msgid "web services under your control"
-msgstr "verkkopalvelut hallinnassasi"
+msgstr "Hei!\n\n%s jakoi kohteen %s kanssasi.\nKatso se tästä: %s\n\nNäkemiin!"
 
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
@@ -569,12 +569,12 @@ msgstr "Tietokantapalvelin"
 msgid "Finish setup"
 msgstr "Viimeistele asennus"
 
-#: templates/layout.user.php:40
+#: templates/layout.user.php:43
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr "%s on saatavilla. Lue lisätietoja, miten päivitys asennetaan."
 
-#: templates/layout.user.php:67
+#: templates/layout.user.php:68
 msgid "Log out"
 msgstr "Kirjaudu ulos"
 
@@ -608,12 +608,12 @@ msgstr "Kirjaudu sisään"
 msgid "Alternative Logins"
 msgstr "Vaihtoehtoiset kirjautumiset"
 
-#: templates/mail.php:15
+#: templates/mail.php:16
 #, php-format
 msgid ""
 "Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
 "href=\"%s\">View it!</a><br><br>Cheers!"
-msgstr ""
+msgstr "Hei!<br><br>%s jakoi kohteen »%s« kanssasi.<br><a href=\"%s\">Katso se tästä!</a><br><br>Näkemiin!"
 
 #: templates/part.pagenavi.php:3
 msgid "prev"
diff --git a/l10n/fi_FI/files.po b/l10n/fi_FI/files.po
index 3ceebe580332bbdbc8e0ef38fb3ed046654cba95..a3eb54531511c033d5f33edf1b1945c8c23b128b 100644
--- a/l10n/fi_FI/files.po
+++ b/l10n/fi_FI/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:01+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
@@ -27,46 +27,54 @@ msgstr "Kohteen %s siirto ei onnistunut - Tiedosto samalla nimellä on jo olemas
 msgid "Could not move %s"
 msgstr "Kohteen %s siirto ei onnistunut"
 
-#: ajax/upload.php:19
+#: ajax/upload.php:16 ajax/upload.php:45
+msgid "Unable to set upload directory."
+msgstr ""
+
+#: ajax/upload.php:22
+msgid "Invalid Token"
+msgstr ""
+
+#: ajax/upload.php:59
 msgid "No file was uploaded. Unknown error"
 msgstr "Tiedostoa ei lähetetty. Tuntematon virhe"
 
-#: ajax/upload.php:26
+#: ajax/upload.php:66
 msgid "There is no error, the file uploaded with success"
 msgstr "Ei virheitä, tiedosto lähetettiin onnistuneesti"
 
-#: ajax/upload.php:27
+#: ajax/upload.php:67
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr "Lähetetyn tiedoston koko ylittää php.ini-tiedoston upload_max_filesize-säännön:"
 
-#: ajax/upload.php:29
+#: ajax/upload.php:69
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Ladattavan tiedoston maksimikoko ylittää MAX_FILE_SIZE dirketiivin, joka on määritelty HTML-lomakkeessa"
 
-#: ajax/upload.php:30
+#: ajax/upload.php:70
 msgid "The uploaded file was only partially uploaded"
 msgstr "Tiedoston lähetys onnistui vain osittain"
 
-#: ajax/upload.php:31
+#: ajax/upload.php:71
 msgid "No file was uploaded"
 msgstr "Yhtäkään tiedostoa ei lähetetty"
 
-#: ajax/upload.php:32
+#: ajax/upload.php:72
 msgid "Missing a temporary folder"
 msgstr "Tilapäiskansio puuttuu"
 
-#: ajax/upload.php:33
+#: ajax/upload.php:73
 msgid "Failed to write to disk"
 msgstr "Levylle kirjoitus epäonnistui"
 
-#: ajax/upload.php:51
+#: ajax/upload.php:91
 msgid "Not enough storage available"
 msgstr "Tallennustilaa ei ole riittävästi käytettävissä"
 
-#: ajax/upload.php:83
+#: ajax/upload.php:123
 msgid "Invalid directory."
 msgstr "Virheellinen kansio."
 
@@ -74,6 +82,36 @@ msgstr "Virheellinen kansio."
 msgid "Files"
 msgstr "Tiedostot"
 
+#: js/file-upload.js:11
+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/file-upload.js:24
+msgid "Not enough space available"
+msgstr "Tilaa ei ole riittävästi"
+
+#: js/file-upload.js:64
+msgid "Upload cancelled."
+msgstr "Lähetys peruttu."
+
+#: js/file-upload.js:167 js/files.js:266
+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/file-upload.js:233 js/files.js:339
+msgid "URL cannot be empty."
+msgstr "Verkko-osoite ei voi olla tyhjä"
+
+#: js/file-upload.js:238 lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr ""
+
+#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
+#: js/files.js:693 js/files.js:731
+msgid "Error"
+msgstr "Virhe"
+
 #: js/fileactions.js:116
 msgid "Share"
 msgstr "Jaa"
@@ -90,43 +128,43 @@ msgstr "Poista"
 msgid "Rename"
 msgstr "Nimeä uudelleen"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:464
 msgid "Pending"
 msgstr "Odottaa"
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "{new_name} already exists"
 msgstr "{new_name} on jo olemassa"
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "replace"
 msgstr "korvaa"
 
-#: js/filelist.js:259
+#: js/filelist.js:302
 msgid "suggest name"
 msgstr "ehdota nimeä"
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "cancel"
 msgstr "peru"
 
-#: js/filelist.js:306
+#: js/filelist.js:349
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:306
+#: js/filelist.js:349
 msgid "undo"
 msgstr "kumoa"
 
-#: js/filelist.js:331
+#: js/filelist.js:374
 msgid "perform delete operation"
 msgstr "suorita poistotoiminto"
 
-#: js/filelist.js:413
+#: js/filelist.js:456
 msgid "1 file uploading"
 msgstr ""
 
-#: js/filelist.js:416 js/filelist.js:470
+#: js/filelist.js:459 js/filelist.js:517
 msgid "files uploading"
 msgstr ""
 
@@ -158,70 +196,42 @@ msgid ""
 "big."
 msgstr "Lataustasi valmistellaan. Tämä saattaa kestää hetken, jos tiedostot ovat suuria kooltaan."
 
-#: js/files.js:264
-msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "Tiedoston lähetys epäonnistui, koska sen koko on 0 tavua tai kyseessä on kansio."
-
-#: js/files.js:277
-msgid "Not enough space available"
-msgstr "Tilaa ei ole riittävästi"
-
-#: js/files.js:317
-msgid "Upload cancelled."
-msgstr "Lähetys peruttu."
-
-#: js/files.js:413
-msgid ""
-"File upload is in progress. Leaving the page now will cancel the upload."
-msgstr "Tiedoston lähetys on meneillään. Sivulta poistuminen nyt peruu tiedoston lähetyksen."
-
-#: js/files.js:486
-msgid "URL cannot be empty."
-msgstr "Verkko-osoite ei voi olla tyhjä"
-
-#: js/files.js:491
+#: js/files.js:344
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
-msgid "Error"
-msgstr "Virhe"
-
-#: js/files.js:877 templates/index.php:69
+#: js/files.js:744 templates/index.php:69
 msgid "Name"
 msgstr "Nimi"
 
-#: js/files.js:878 templates/index.php:80
+#: js/files.js:745 templates/index.php:80
 msgid "Size"
 msgstr "Koko"
 
-#: js/files.js:879 templates/index.php:82
+#: js/files.js:746 templates/index.php:82
 msgid "Modified"
 msgstr "Muokattu"
 
-#: js/files.js:898
+#: js/files.js:765
 msgid "1 folder"
 msgstr "1 kansio"
 
-#: js/files.js:900
+#: js/files.js:767
 msgid "{count} folders"
 msgstr "{count} kansiota"
 
-#: js/files.js:908
+#: js/files.js:775
 msgid "1 file"
 msgstr "1 tiedosto"
 
-#: js/files.js:910
+#: js/files.js:777
 msgid "{count} files"
 msgstr "{count} tiedostoa"
 
-#: lib/app.php:53
-msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
-msgstr ""
-
 #: lib/app.php:73
-msgid "Unable to rename file"
-msgstr "Tiedoston nimeäminen uudelleen ei onnistunut"
+#, php-format
+msgid "%s could not be renamed"
+msgstr ""
 
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
@@ -317,6 +327,22 @@ msgstr "Tiedostoja tarkistetaan, odota hetki."
 msgid "Current scanning"
 msgstr "Tämänhetkinen tutkinta"
 
+#: templates/part.list.php:76
+msgid "directory"
+msgstr ""
+
+#: templates/part.list.php:78
+msgid "directories"
+msgstr ""
+
+#: templates/part.list.php:87
+msgid "file"
+msgstr "tiedosto"
+
+#: templates/part.list.php:89
+msgid "files"
+msgstr "tiedostoa"
+
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
 msgstr "Päivitetään tiedostojärjestelmän välimuistia..."
diff --git a/l10n/fi_FI/files_encryption.po b/l10n/fi_FI/files_encryption.po
index 7a4bc5fbf9c13ec3792c17ce7a68b634b8b060f6..0f8f958a2d0ba78bf090352eaaf109988d0d5048 100644
--- a/l10n/fi_FI/files_encryption.po
+++ b/l10n/fi_FI/files_encryption.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-14 02:46+0200\n"
-"PO-Revision-Date: 2013-06-14 00:47+0000\n"
+"POT-Creation-Date: 2013-07-05 02:12+0200\n"
+"PO-Revision-Date: 2013-07-05 00:13+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"
@@ -56,9 +56,21 @@ msgstr ""
 
 #: files/error.php:7
 msgid ""
-"Your private key is not valid! Maybe your password was changed from outside."
-" You can update your private key password in your personal settings to "
-"regain access to your files"
+"Your private key is not valid! Likely your password was changed outside the "
+"ownCloud system (e.g. your corporate directory). You can update your private"
+" key password in your personal settings to recover access to your encrypted "
+"files."
+msgstr ""
+
+#: hooks/hooks.php:44
+msgid "Missing requirements."
+msgstr ""
+
+#: hooks/hooks.php:45
+msgid ""
+"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL "
+"PHP extension is enabled and configured properly. For now, the encryption "
+"app has been disabled."
 msgstr ""
 
 #: js/settings-admin.js:11
@@ -85,11 +97,11 @@ msgstr "Salaus"
 
 #: templates/settings-admin.php:10
 msgid ""
-"Enable encryption passwords recovery key (allow sharing to recovery key):"
+"Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
 #: templates/settings-admin.php:14
-msgid "Recovery account password"
+msgid "Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:21 templates/settings-personal.php:54
@@ -101,15 +113,15 @@ msgid "Disabled"
 msgstr "Ei käytössä"
 
 #: templates/settings-admin.php:34
-msgid "Change encryption passwords recovery key:"
+msgid "Change recovery key password:"
 msgstr ""
 
 #: templates/settings-admin.php:41
-msgid "Old Recovery account password"
+msgid "Old Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:48
-msgid "New Recovery account password"
+msgid "New Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:53
diff --git a/l10n/fi_FI/files_external.po b/l10n/fi_FI/files_external.po
index 1c0f407e5be9c30f0ac847961d594bb3ba3cf11f..07b2c5af7b881127df88d7220ea8bdf11204d955 100644
--- a/l10n/fi_FI/files_external.po
+++ b/l10n/fi_FI/files_external.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/fi_FI/files_sharing.po b/l10n/fi_FI/files_sharing.po
index 4c2f4e74a9542c7756a1e66e32d95a9a13544263..2d54d9ba920f7ced945427e62d974736a2b8a170 100644
--- a/l10n/fi_FI/files_sharing.po
+++ b/l10n/fi_FI/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
@@ -18,27 +18,39 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: templates/authenticate.php:4
+msgid "The password is wrong. Try again."
+msgstr ""
+
+#: templates/authenticate.php:7
 msgid "Password"
 msgstr "Salasana"
 
-#: templates/authenticate.php:6
+#: templates/authenticate.php:9
 msgid "Submit"
 msgstr "Lähetä"
 
-#: templates/public.php:10
+#: templates/public.php:17
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s jakoi kansion %s kanssasi"
 
-#: templates/public.php:13
+#: templates/public.php:20
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s jakoi tiedoston %s kanssasi"
 
-#: templates/public.php:19 templates/public.php:43
+#: templates/public.php:28 templates/public.php:90
 msgid "Download"
 msgstr "Lataa"
 
-#: templates/public.php:40
+#: templates/public.php:45 templates/public.php:48
+msgid "Upload"
+msgstr "Lähetä"
+
+#: templates/public.php:58
+msgid "Cancel upload"
+msgstr "Peru lähetys"
+
+#: templates/public.php:87
 msgid "No preview available for"
 msgstr "Ei esikatselua kohteelle"
diff --git a/l10n/fi_FI/files_trashbin.po b/l10n/fi_FI/files_trashbin.po
index 0895be2d325993b9609b9d150b60094217a4d48c..2b7ce28be3c02d6e25a1c5c74ebcafacce7ea3af 100644
--- a/l10n/fi_FI/files_trashbin.po
+++ b/l10n/fi_FI/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:16+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/fi_FI/lib.po b/l10n/fi_FI/lib.po
index 296b0e0ed6f0203add9b342dc94cd63e16ce0a50..788faa1f80b6fc4cedd348ce3938f6c56b416bc9 100644
--- a/l10n/fi_FI/lib.po
+++ b/l10n/fi_FI/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-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
-"Last-Translator: Jiri Grönroos <jiri.gronroos@iki.fi>\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,43 +18,47 @@ msgstr ""
 "Language: fi_FI\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:359
+#: app.php:360
 msgid "Help"
 msgstr "Ohje"
 
-#: app.php:372
+#: app.php:373
 msgid "Personal"
 msgstr "Henkilökohtainen"
 
-#: app.php:383
+#: app.php:384
 msgid "Settings"
 msgstr "Asetukset"
 
-#: app.php:395
+#: app.php:396
 msgid "Users"
 msgstr "Käyttäjät"
 
-#: app.php:408
+#: app.php:409
 msgid "Apps"
 msgstr "Sovellukset"
 
-#: app.php:416
+#: app.php:417
 msgid "Admin"
 msgstr "Ylläpitäjä"
 
-#: files.php:210
+#: defaults.php:33
+msgid "web services under your control"
+msgstr "verkkopalvelut hallinnassasi"
+
+#: files.php:226
 msgid "ZIP download is turned off."
 msgstr "ZIP-lataus on poistettu käytöstä."
 
-#: files.php:211
+#: files.php:227
 msgid "Files need to be downloaded one by one."
 msgstr "Tiedostot on ladattava yksittäin."
 
-#: files.php:212 files.php:245
+#: files.php:228 files.php:261
 msgid "Back to Files"
 msgstr "Takaisin tiedostoihin"
 
-#: files.php:242
+#: files.php:258
 msgid "Selected files too large to generate zip file."
 msgstr "Valitut tiedostot ovat liian suurikokoisia mahtuakseen zip-tiedostoon."
 
@@ -86,104 +90,102 @@ msgstr "Teksti"
 msgid "Images"
 msgstr "Kuvat"
 
-#: setup.php:34
-msgid "Set an admin username."
-msgstr "Aseta ylläpitäjän käyttäjätunnus."
-
-#: setup.php:37
-msgid "Set an admin password."
-msgstr "Aseta ylläpitäjän salasana."
-
-#: setup.php:55
+#: setup/abstractdatabase.php:22
 #, php-format
 msgid "%s enter the database username."
 msgstr "%s anna tietokannan käyttäjätunnus."
 
-#: setup.php:58
+#: setup/abstractdatabase.php:25
 #, php-format
 msgid "%s enter the database name."
 msgstr "%s anna tietokannan nimi."
 
-#: setup.php:61
+#: setup/abstractdatabase.php:28
 #, php-format
 msgid "%s you may not use dots in the database name"
 msgstr "%s et voi käyttää pisteitä tietokannan nimessä"
 
-#: setup.php:64
+#: setup/mssql.php:20
 #, php-format
-msgid "%s set the database host."
-msgstr ""
-
-#: setup.php:126 setup.php:332 setup.php:377
-msgid "PostgreSQL username and/or password not valid"
-msgstr "PostgreSQL:n käyttäjätunnus ja/tai salasana on väärin"
+msgid "MS SQL username and/or password not valid: %s"
+msgstr "MS SQL -käyttäjätunnus ja/tai -salasana on väärin: %s"
 
-#: setup.php:127 setup.php:235
+#: setup/mssql.php:21 setup/mysql.php:13 setup/oci.php:114
+#: setup/postgresql.php:24 setup/postgresql.php:70
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:152
-msgid "Oracle connection could not be established"
-msgstr "Oracle-yhteyttä ei voitu muodostaa"
-
-#: setup.php:234
+#: setup/mysql.php:12
 msgid "MySQL username and/or password not valid"
 msgstr "MySQL:n käyttäjätunnus ja/tai salasana on väärin"
 
-#: setup.php:288 setup.php:398 setup.php:407 setup.php:425 setup.php:435
-#: setup.php:444 setup.php:477 setup.php:543 setup.php:569 setup.php:576
-#: setup.php:587 setup.php:594 setup.php:603 setup.php:611 setup.php:620
-#: setup.php:626
+#: setup/mysql.php:67 setup/oci.php:54 setup/oci.php:121 setup/oci.php:147
+#: setup/oci.php:154 setup/oci.php:165 setup/oci.php:172 setup/oci.php:181
+#: setup/oci.php:189 setup/oci.php:198 setup/oci.php:204
+#: setup/postgresql.php:89 setup/postgresql.php:98 setup/postgresql.php:115
+#: setup/postgresql.php:125 setup/postgresql.php:134
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr "Tietokantavirhe: \"%s\""
 
-#: setup.php:289 setup.php:399 setup.php:408 setup.php:426 setup.php:436
-#: setup.php:445 setup.php:478 setup.php:544 setup.php:570 setup.php:577
-#: setup.php:588 setup.php:604 setup.php:612 setup.php:621
+#: setup/mysql.php:68 setup/oci.php:55 setup/oci.php:122 setup/oci.php:148
+#: setup/oci.php:155 setup/oci.php:166 setup/oci.php:182 setup/oci.php:190
+#: setup/oci.php:199 setup/postgresql.php:90 setup/postgresql.php:99
+#: setup/postgresql.php:116 setup/postgresql.php:126 setup/postgresql.php:135
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:305
+#: setup/mysql.php:85
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr "MySQL-käyttäjä '%s'@'localhost' on jo olemassa."
 
-#: setup.php:306
+#: setup/mysql.php:86
 msgid "Drop this user from MySQL"
 msgstr "Pudota tämä käyttäjä MySQL:stä"
 
-#: setup.php:311
+#: setup/mysql.php:91
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr "MySQL-käyttäjä '%s'@'%%' on jo olemassa"
 
-#: setup.php:312
+#: setup/mysql.php:92
 msgid "Drop this user from MySQL."
 msgstr "Pudota tämä käyttäjä MySQL:stä."
 
-#: setup.php:469 setup.php:536
+#: setup/oci.php:34
+msgid "Oracle connection could not be established"
+msgstr "Oracle-yhteyttä ei voitu muodostaa"
+
+#: setup/oci.php:41 setup/oci.php:113
 msgid "Oracle username and/or password not valid"
 msgstr "Oraclen käyttäjätunnus ja/tai salasana on väärin"
 
-#: setup.php:595 setup.php:627
+#: setup/oci.php:173 setup/oci.php:205
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:647
-#, php-format
-msgid "MS SQL username and/or password not valid: %s"
-msgstr "MS SQL -käyttäjätunnus ja/tai -salasana on väärin: %s"
+#: setup/postgresql.php:23 setup/postgresql.php:69
+msgid "PostgreSQL username and/or password not valid"
+msgstr "PostgreSQL:n käyttäjätunnus ja/tai salasana on väärin"
+
+#: setup.php:42
+msgid "Set an admin username."
+msgstr "Aseta ylläpitäjän käyttäjätunnus."
+
+#: setup.php:45
+msgid "Set an admin password."
+msgstr "Aseta ylläpitäjän salasana."
 
-#: setup.php:870
+#: setup.php:198
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:871
+#: setup.php:199
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Lue tarkasti <a href='%s'>asennusohjeet</a>."
diff --git a/l10n/fi_FI/settings.po b/l10n/fi_FI/settings.po
index 8f1623db40e199687c4ca3f72431241c1e20927d..de80483852be9578f4b9237cdfc7a842eb7ebd1e 100644
--- a/l10n/fi_FI/settings.po
+++ b/l10n/fi_FI/settings.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
+"Last-Translator: Jiri Grönroos <jiri.gronroos@iki.fi>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -89,35 +89,35 @@ msgstr "Käyttäjän poistaminen ryhmästä %s ei onnistu"
 msgid "Couldn't update app."
 msgstr "Sovelluksen päivitys epäonnistui."
 
-#: js/apps.js:30
+#: js/apps.js:35
 msgid "Update to {appversion}"
 msgstr "Päivitä versioon {appversion}"
 
-#: js/apps.js:36 js/apps.js:76
+#: js/apps.js:41 js/apps.js:81
 msgid "Disable"
 msgstr "Poista käytöstä"
 
-#: js/apps.js:36 js/apps.js:64 js/apps.js:83
+#: js/apps.js:41 js/apps.js:69 js/apps.js:88
 msgid "Enable"
 msgstr "Käytä"
 
-#: js/apps.js:55
+#: js/apps.js:60
 msgid "Please wait...."
 msgstr "Odota hetki..."
 
-#: js/apps.js:59 js/apps.js:71 js/apps.js:80 js/apps.js:93
+#: js/apps.js:64 js/apps.js:76 js/apps.js:85 js/apps.js:98
 msgid "Error"
 msgstr "Virhe"
 
-#: js/apps.js:90
+#: js/apps.js:95
 msgid "Updating...."
 msgstr "Päivitetään..."
 
-#: js/apps.js:93
+#: js/apps.js:98
 msgid "Error while updating app"
 msgstr "Virhe sovellusta päivittäessä"
 
-#: js/apps.js:96
+#: js/apps.js:101
 msgid "Updated"
 msgstr "Päivitetty"
 
@@ -156,7 +156,7 @@ msgstr "lisää ryhmä"
 
 #: js/users.js:428
 msgid "A valid username must be provided"
-msgstr ""
+msgstr "Anna kelvollinen käyttäjätunnus"
 
 #: js/users.js:429 js/users.js:435 js/users.js:450
 msgid "Error creating user"
@@ -164,17 +164,17 @@ msgstr "Virhe käyttäjää luotaessa"
 
 #: js/users.js:434
 msgid "A valid password must be provided"
-msgstr ""
+msgstr "Anna kelvollinen salasana"
 
-#: personal.php:35 personal.php:36
+#: personal.php:37 personal.php:38
 msgid "__language_name__"
 msgstr "_kielen_nimi_"
 
-#: templates/admin.php:15
+#: templates/admin.php:17
 msgid "Security Warning"
 msgstr "Turvallisuusvaroitus"
 
-#: templates/admin.php:18
+#: templates/admin.php:20
 msgid ""
 "Your data directory and your files are probably accessible from the "
 "internet. The .htaccess file that ownCloud provides is not working. We "
@@ -183,36 +183,36 @@ msgid ""
 " webserver document root."
 msgstr "Data-kansio ja tiedostot ovat ehkä saavutettavissa Internetistä. .htaccess-tiedosto, jolla kontrolloidaan pääsyä, ei toimi. Suosittelemme, että muutat web-palvelimesi asetukset niin ettei data-kansio ole enää pääsyä tai siirrät data-kansion pois web-palvelimen tiedostojen juuresta."
 
-#: templates/admin.php:29
+#: templates/admin.php:31
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:32
+#: templates/admin.php:34
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: templates/admin.php:33
+#: templates/admin.php:35
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Lue tarkasti <a href='%s'>asennusohjeet</a>."
 
-#: templates/admin.php:44
+#: templates/admin.php:46
 msgid "Module 'fileinfo' missing"
 msgstr "Moduuli 'fileinfo' puuttuu"
 
-#: templates/admin.php:47
+#: templates/admin.php:49
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr ""
 
-#: templates/admin.php:58
+#: templates/admin.php:60
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:63
+#: templates/admin.php:65
 #, php-format
 msgid ""
 "This ownCloud server can't set system locale to %s. This means that there "
@@ -220,11 +220,11 @@ msgid ""
 " to install the required packages on your system to support %s."
 msgstr ""
 
-#: templates/admin.php:75
+#: templates/admin.php:77
 msgid "Internet connection not working"
 msgstr "Internet-yhteys ei toimi"
 
-#: templates/admin.php:78
+#: templates/admin.php:80
 msgid ""
 "This ownCloud server has no working internet connection. This means that "
 "some of the features like mounting of external storage, notifications about "
@@ -234,102 +234,102 @@ msgid ""
 " of ownCloud."
 msgstr ""
 
-#: templates/admin.php:92
+#: templates/admin.php:94
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:101
+#: templates/admin.php:103
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:111
+#: templates/admin.php:113
 msgid ""
 "cron.php is registered at a webcron service. Call the cron.php page in the "
 "owncloud root once a minute over http."
 msgstr ""
 
-#: templates/admin.php:121
+#: templates/admin.php:123
 msgid ""
 "Use systems cron service. Call the cron.php file in the owncloud folder via "
 "a system cronjob once a minute."
 msgstr ""
 
-#: templates/admin.php:128
+#: templates/admin.php:130
 msgid "Sharing"
 msgstr "Jakaminen"
 
-#: templates/admin.php:134
+#: templates/admin.php:136
 msgid "Enable Share API"
 msgstr "Käytä jakamisen ohjelmointirajapintaa"
 
-#: templates/admin.php:135
+#: templates/admin.php:137
 msgid "Allow apps to use the Share API"
 msgstr "Salli sovellusten käyttää jakamisen ohjelmointirajapintaa"
 
-#: templates/admin.php:142
+#: templates/admin.php:144
 msgid "Allow links"
 msgstr "Salli linkit"
 
-#: templates/admin.php:143
+#: templates/admin.php:145
 msgid "Allow users to share items to the public with links"
 msgstr "Salli käyttäjien jakaa kohteita käyttäen linkkejä"
 
-#: templates/admin.php:150
+#: templates/admin.php:152
 msgid "Allow resharing"
 msgstr "Salli uudelleenjakaminen"
 
-#: templates/admin.php:151
+#: templates/admin.php:153
 msgid "Allow users to share items shared with them again"
 msgstr "Mahdollistaa käyttäjien jakavan uudelleen heidän kanssaan jaettuja kohteita"
 
-#: templates/admin.php:158
+#: templates/admin.php:160
 msgid "Allow users to share with anyone"
 msgstr "Salli käyttäjien jakaa kenen tahansa kanssa"
 
-#: templates/admin.php:161
+#: templates/admin.php:163
 msgid "Allow users to only share with users in their groups"
 msgstr "Salli jakaminen vain samoissa ryhmissä olevien käyttäjien kesken"
 
-#: templates/admin.php:168
+#: templates/admin.php:170
 msgid "Security"
 msgstr "Tietoturva"
 
-#: templates/admin.php:181
+#: templates/admin.php:183
 msgid "Enforce HTTPS"
 msgstr "Pakota HTTPS"
 
-#: templates/admin.php:182
+#: templates/admin.php:184
 msgid ""
 "Enforces the clients to connect to ownCloud via an encrypted connection."
 msgstr "Pakottaa salaamaan ownCloudiin kohdistuvat yhteydet."
 
-#: templates/admin.php:185
+#: templates/admin.php:187
 msgid ""
 "Please connect to this ownCloud instance via HTTPS to enable or disable the "
 "SSL enforcement."
 msgstr ""
 
-#: templates/admin.php:195
+#: templates/admin.php:197
 msgid "Log"
 msgstr "Loki"
 
-#: templates/admin.php:196
+#: templates/admin.php:198
 msgid "Log level"
 msgstr "Lokitaso"
 
-#: templates/admin.php:227
+#: templates/admin.php:229
 msgid "More"
 msgstr "Enemmän"
 
-#: templates/admin.php:228
+#: templates/admin.php:230
 msgid "Less"
 msgstr "Vähemmän"
 
-#: templates/admin.php:235 templates/personal.php:116
+#: templates/admin.php:236 templates/personal.php:116
 msgid "Version"
 msgstr "Versio"
 
-#: templates/admin.php:237 templates/personal.php:119
+#: templates/admin.php:240 templates/personal.php:119
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -387,76 +387,79 @@ msgstr "Ohjelmistovirheiden jäljitys"
 msgid "Commercial Support"
 msgstr "Kaupallinen tuki"
 
-#: templates/personal.php:9
+#: templates/personal.php:10
 msgid "Get the apps to sync your files"
 msgstr ""
 
-#: templates/personal.php:20
+#: templates/personal.php:21
 msgid "Show First Run Wizard again"
 msgstr "Näytä ensimmäisen käyttökerran avustaja uudelleen"
 
-#: templates/personal.php:28
+#: templates/personal.php:29
 #, php-format
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "Käytössäsi on <strong>%s</strong>/<strong>%s</strong>"
 
-#: templates/personal.php:40 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:41 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "Salasana"
 
-#: templates/personal.php:41
+#: templates/personal.php:42
 msgid "Your password was changed"
 msgstr "Salasanasi vaihdettiin"
 
-#: templates/personal.php:42
+#: templates/personal.php:43
 msgid "Unable to change your password"
 msgstr "Salasanaasi ei voitu vaihtaa"
 
-#: templates/personal.php:43
+#: templates/personal.php:44
 msgid "Current password"
 msgstr "Nykyinen salasana"
 
-#: templates/personal.php:45
+#: templates/personal.php:46
 msgid "New password"
 msgstr "Uusi salasana"
 
-#: templates/personal.php:47
+#: templates/personal.php:48
 msgid "Change password"
 msgstr "Vaihda salasana"
 
-#: templates/personal.php:59 templates/users.php:85
+#: templates/personal.php:60 templates/users.php:85
 msgid "Display Name"
 msgstr "Näyttönimi"
 
-#: templates/personal.php:74
+#: templates/personal.php:75
 msgid "Email"
 msgstr "Sähköpostiosoite"
 
-#: templates/personal.php:76
+#: templates/personal.php:77
 msgid "Your email address"
 msgstr "Sähköpostiosoitteesi"
 
-#: templates/personal.php:77
+#: templates/personal.php:78
 msgid "Fill in an email address to enable password recovery"
 msgstr "Anna sähköpostiosoitteesi, jotta unohdettu salasana on mahdollista palauttaa"
 
-#: templates/personal.php:86 templates/personal.php:87
+#: templates/personal.php:87 templates/personal.php:88
 msgid "Language"
 msgstr "Kieli"
 
-#: templates/personal.php:99
+#: templates/personal.php:100
 msgid "Help translate"
 msgstr "Auta kääntämisessä"
 
-#: templates/personal.php:105
+#: templates/personal.php:106
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:107
-msgid "Use this address to connect to your ownCloud in your file manager"
-msgstr "Käytä tätä osoitetta yhdistäessäsi ownCloudiisi tiedostonhallintaa käyttäen"
+#: templates/personal.php:108
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
+"target=\"_blank\">access your Files via WebDAV</a>"
+msgstr "Käytä tätä osoitetta <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">päästäksesi käsiksi tiedostoihisi WebDAVin kautta</a>"
 
-#: templates/users.php:21 templates/users.php:84
+#: templates/users.php:21
 msgid "Login Name"
 msgstr "Kirjautumisnimi"
 
@@ -486,6 +489,10 @@ msgstr "Rajoittamaton"
 msgid "Other"
 msgstr "Muu"
 
+#: templates/users.php:84
+msgid "Username"
+msgstr "Käyttäjätunnus"
+
 #: templates/users.php:91
 msgid "Storage"
 msgstr "Tallennustila"
diff --git a/l10n/fi_FI/user_ldap.po b/l10n/fi_FI/user_ldap.po
index fb3c413aec32eede76b85ff1810dfecdfc8b656f..080b75330a2c206d973ef7062b812aa93fbda811 100644
--- a/l10n/fi_FI/user_ldap.po
+++ b/l10n/fi_FI/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:25+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:16+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/fr/core.po b/l10n/fr/core.po
index 60057522f6e0ef8139f33038df8c723142627c37..ffdd8ae9fb8a28eb7e28a568d33b69a67dc4864b 100644
--- a/l10n/fr/core.po
+++ b/l10n/fr/core.po
@@ -4,6 +4,7 @@
 # 
 # Translators:
 # Adalberto Rodrigues <rodrigues_adalberto@yahoo.fr>, 2013
+# Christophe Lherieau <skimpax@gmail.com>, 2013
 # msoko <sokolovitch@yahoo.com>, 2013
 # plachance <patlachance@gmail.com>, 2013
 # red0ne <red-0ne@smarty-concept.com>, 2013
@@ -11,9 +12,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
-"Last-Translator: Adalberto Rodrigues <rodrigues_adalberto@yahoo.fr>\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -65,135 +66,135 @@ msgstr "Pas de catégorie sélectionnée pour la suppression."
 msgid "Error removing %s from favorites."
 msgstr "Erreur lors de la suppression de %s des favoris."
 
-#: js/config.php:34
+#: js/config.php:32
 msgid "Sunday"
 msgstr "Dimanche"
 
-#: js/config.php:35
+#: js/config.php:33
 msgid "Monday"
 msgstr "Lundi"
 
-#: js/config.php:36
+#: js/config.php:34
 msgid "Tuesday"
 msgstr "Mardi"
 
-#: js/config.php:37
+#: js/config.php:35
 msgid "Wednesday"
 msgstr "Mercredi"
 
-#: js/config.php:38
+#: js/config.php:36
 msgid "Thursday"
 msgstr "Jeudi"
 
-#: js/config.php:39
+#: js/config.php:37
 msgid "Friday"
 msgstr "Vendredi"
 
-#: js/config.php:40
+#: js/config.php:38
 msgid "Saturday"
 msgstr "Samedi"
 
-#: js/config.php:45
+#: js/config.php:43
 msgid "January"
 msgstr "janvier"
 
-#: js/config.php:46
+#: js/config.php:44
 msgid "February"
 msgstr "février"
 
-#: js/config.php:47
+#: js/config.php:45
 msgid "March"
 msgstr "mars"
 
-#: js/config.php:48
+#: js/config.php:46
 msgid "April"
 msgstr "avril"
 
-#: js/config.php:49
+#: js/config.php:47
 msgid "May"
 msgstr "mai"
 
-#: js/config.php:50
+#: js/config.php:48
 msgid "June"
 msgstr "juin"
 
-#: js/config.php:51
+#: js/config.php:49
 msgid "July"
 msgstr "juillet"
 
-#: js/config.php:52
+#: js/config.php:50
 msgid "August"
 msgstr "août"
 
-#: js/config.php:53
+#: js/config.php:51
 msgid "September"
 msgstr "septembre"
 
-#: js/config.php:54
+#: js/config.php:52
 msgid "October"
 msgstr "octobre"
 
-#: js/config.php:55
+#: js/config.php:53
 msgid "November"
 msgstr "novembre"
 
-#: js/config.php:56
+#: js/config.php:54
 msgid "December"
 msgstr "décembre"
 
-#: js/js.js:286
+#: js/js.js:293
 msgid "Settings"
 msgstr "Paramètres"
 
-#: js/js.js:718
+#: js/js.js:725
 msgid "seconds ago"
 msgstr "il y a quelques secondes"
 
-#: js/js.js:719
+#: js/js.js:726
 msgid "1 minute ago"
 msgstr "il y a une minute"
 
-#: js/js.js:720
+#: js/js.js:727
 msgid "{minutes} minutes ago"
 msgstr "il y a {minutes} minutes"
 
-#: js/js.js:721
+#: js/js.js:728
 msgid "1 hour ago"
 msgstr "Il y a une heure"
 
-#: js/js.js:722
+#: js/js.js:729
 msgid "{hours} hours ago"
 msgstr "Il y a {hours} heures"
 
-#: js/js.js:723
+#: js/js.js:730
 msgid "today"
 msgstr "aujourd'hui"
 
-#: js/js.js:724
+#: js/js.js:731
 msgid "yesterday"
 msgstr "hier"
 
-#: js/js.js:725
+#: js/js.js:732
 msgid "{days} days ago"
 msgstr "il y a {days} jours"
 
-#: js/js.js:726
+#: js/js.js:733
 msgid "last month"
 msgstr "le mois dernier"
 
-#: js/js.js:727
+#: js/js.js:734
 msgid "{months} months ago"
 msgstr "Il y a {months} mois"
 
-#: js/js.js:728
+#: js/js.js:735
 msgid "months ago"
 msgstr "il y a plusieurs mois"
 
-#: js/js.js:729
+#: js/js.js:736
 msgid "last year"
 msgstr "l'année dernière"
 
-#: js/js.js:730
+#: js/js.js:737
 msgid "years ago"
 msgstr "il y a plusieurs années"
 
@@ -229,8 +230,8 @@ msgstr "Le type d'objet n'est pas spécifié."
 #: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
 #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:577
-#: js/share.js:589
+#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:620
+#: js/share.js:632
 msgid "Error"
 msgstr "Erreur"
 
@@ -250,7 +251,7 @@ msgstr "Partagé"
 msgid "Share"
 msgstr "Partager"
 
-#: js/share.js:125 js/share.js:617
+#: js/share.js:125 js/share.js:660
 msgid "Error while sharing"
 msgstr "Erreur lors de la mise en partage"
 
@@ -270,99 +271,103 @@ msgstr "Partagé par {owner} avec vous et le groupe {group}"
 msgid "Shared with you by {owner}"
 msgstr "Partagé avec vous par {owner}"
 
-#: js/share.js:159
+#: js/share.js:172
 msgid "Share with"
 msgstr "Partager avec"
 
-#: js/share.js:164
+#: js/share.js:177
 msgid "Share with link"
 msgstr "Partager via lien"
 
-#: js/share.js:167
+#: js/share.js:180
 msgid "Password protect"
 msgstr "Protéger par un mot de passe"
 
-#: js/share.js:169 templates/installation.php:54 templates/login.php:26
+#: js/share.js:182 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "Mot de passe"
 
-#: js/share.js:173
+#: js/share.js:187
+msgid "Allow Public Upload"
+msgstr "Autoriser l'upload par les utilisateurs non enregistrés"
+
+#: js/share.js:191
 msgid "Email link to person"
 msgstr "Envoyez le lien par email"
 
-#: js/share.js:174
+#: js/share.js:192
 msgid "Send"
 msgstr "Envoyer"
 
-#: js/share.js:178
+#: js/share.js:197
 msgid "Set expiration date"
 msgstr "Spécifier la date d'expiration"
 
-#: js/share.js:179
+#: js/share.js:198
 msgid "Expiration date"
 msgstr "Date d'expiration"
 
-#: js/share.js:211
+#: js/share.js:230
 msgid "Share via email:"
 msgstr "Partager via e-mail :"
 
-#: js/share.js:213
+#: js/share.js:232
 msgid "No people found"
 msgstr "Aucun utilisateur trouvé"
 
-#: js/share.js:251
+#: js/share.js:270
 msgid "Resharing is not allowed"
 msgstr "Le repartage n'est pas autorisé"
 
-#: js/share.js:287
+#: js/share.js:306
 msgid "Shared in {item} with {user}"
 msgstr "Partagé dans {item} avec {user}"
 
-#: js/share.js:308
+#: js/share.js:327
 msgid "Unshare"
 msgstr "Ne plus partager"
 
-#: js/share.js:320
+#: js/share.js:339
 msgid "can edit"
 msgstr "édition autorisée"
 
-#: js/share.js:322
+#: js/share.js:341
 msgid "access control"
 msgstr "contrôle des accès"
 
-#: js/share.js:325
+#: js/share.js:344
 msgid "create"
 msgstr "créer"
 
-#: js/share.js:328
+#: js/share.js:347
 msgid "update"
 msgstr "mettre à jour"
 
-#: js/share.js:331
+#: js/share.js:350
 msgid "delete"
 msgstr "supprimer"
 
-#: js/share.js:334
+#: js/share.js:353
 msgid "share"
 msgstr "partager"
 
-#: js/share.js:368 js/share.js:564
+#: js/share.js:387 js/share.js:607
 msgid "Password protected"
 msgstr "Protégé par un mot de passe"
 
-#: js/share.js:577
+#: js/share.js:620
 msgid "Error unsetting expiration date"
 msgstr "Une erreur est survenue pendant la suppression de la date d'expiration"
 
-#: js/share.js:589
+#: js/share.js:632
 msgid "Error setting expiration date"
 msgstr "Erreur lors de la spécification de la date d'expiration"
 
-#: js/share.js:604
+#: js/share.js:647
 msgid "Sending ..."
 msgstr "En cours d'envoi ..."
 
-#: js/share.js:615
+#: js/share.js:658
 msgid "Email sent"
 msgstr "Email envoyé"
 
@@ -377,7 +382,7 @@ msgstr "La mise à jour a échoué. Veuillez signaler ce problème à la <a href
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "La mise à jour a réussi. Vous êtes redirigé maintenant vers ownCloud."
 
-#: lostpassword/controller.php:58
+#: lostpassword/controller.php:60
 msgid "ownCloud password reset"
 msgstr "Réinitialisation de votre mot de passe Owncloud"
 
@@ -407,17 +412,17 @@ msgstr "Nom d'utilisateur"
 
 #: lostpassword/templates/lostpassword.php:22
 msgid ""
-"Your files seems to be encrypted. If you didn't have enabled the recovery "
-"key there will be no way to get your data back once the password was "
-"resetted. If you are not sure what to do, please contact your administrator "
-"first before continue. Do you really want to continue?"
-msgstr "Vos fichiers semblent être cryptés. Si vous n'aviez pas activé la clé de récupération il n'y aura aucun moyen de récupérer vos données une fois que le mot de passe aura été réinitialisé. Si vous n'êtes pas certain de ce que vous faites, veuillez d'abord contacter votre administrateur avant de continuer. Êtes-vous sûr de vouloir continuer?"
+"Your files are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
+msgstr "Vos fichiers sont chiffrés. Si vous n'avez pas activé la clef de récupération, il n'y aura plus aucun moyen de récupérer vos données une fois le mot de passe réinitialisé. Si vous n'êtes pas sûr de ce que vous faites, veuillez contacter votre administrateur avant de continuer. Voulez-vous vraiment continuer ?"
 
 #: lostpassword/templates/lostpassword.php:24
 msgid "Yes, I really want to reset my password now"
 msgstr "Oui, je veux vraiment réinitialiser mon mot de passe maintenant"
 
-#: lostpassword/templates/lostpassword.php:29
+#: lostpassword/templates/lostpassword.php:27
 msgid "Request reset"
 msgstr "Demander la réinitialisation"
 
@@ -465,7 +470,7 @@ msgstr "Accès interdit"
 msgid "Cloud not found"
 msgstr "Introuvable"
 
-#: templates/altmail.php:2
+#: templates/altmail.php:4
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -476,10 +481,6 @@ msgid ""
 "Cheers!"
 msgstr "Salut,\n\nje veux juste vous signaler %s partagé %s avec vous.\nVoyez-le: %s\n\nBonne continuation!"
 
-#: templates/altmail.php:7 templates/mail.php:24
-msgid "web services under your control"
-msgstr "services web sous votre contrôle"
-
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
 msgstr "Editer les catégories"
@@ -572,12 +573,12 @@ msgstr "Serveur de la base de données"
 msgid "Finish setup"
 msgstr "Terminer l'installation"
 
-#: templates/layout.user.php:40
+#: templates/layout.user.php:43
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr "%s est disponible. Obtenez plus d'informations sur la façon de mettre à jour."
 
-#: templates/layout.user.php:67
+#: templates/layout.user.php:68
 msgid "Log out"
 msgstr "Se déconnecter"
 
@@ -611,7 +612,7 @@ msgstr "Connexion"
 msgid "Alternative Logins"
 msgstr "Logins alternatifs"
 
-#: templates/mail.php:15
+#: templates/mail.php:16
 #, php-format
 msgid ""
 "Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
diff --git a/l10n/fr/files.po b/l10n/fr/files.po
index a11e42440f4a782ad433517675f748eb0ce2f0a5..f5f63c79f203df8150c46d03905bdab791b88be1 100644
--- a/l10n/fr/files.po
+++ b/l10n/fr/files.po
@@ -3,15 +3,16 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Adalberto Rodrigues <rodrigues_adalberto@yahoo.fr>, 2013
 # Christophe Lherieau <skimpax@gmail.com>, 2013
 # MathieuP <mathieu.payrol@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:01+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
-"Last-Translator: Christophe Lherieau <skimpax@gmail.com>\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -29,46 +30,54 @@ msgstr "Impossible de déplacer %s - Un fichier possédant ce nom existe déjà"
 msgid "Could not move %s"
 msgstr "Impossible de déplacer %s"
 
-#: ajax/upload.php:19
+#: ajax/upload.php:16 ajax/upload.php:45
+msgid "Unable to set upload directory."
+msgstr "Impossible de définir le dossier pour l'upload, charger."
+
+#: ajax/upload.php:22
+msgid "Invalid Token"
+msgstr "Jeton non valide"
+
+#: ajax/upload.php:59
 msgid "No file was uploaded. Unknown error"
 msgstr "Aucun fichier n'a été envoyé. Erreur inconnue"
 
-#: ajax/upload.php:26
+#: ajax/upload.php:66
 msgid "There is no error, the file uploaded with success"
 msgstr "Aucune erreur, le fichier a été envoyé avec succès."
 
-#: ajax/upload.php:27
+#: ajax/upload.php:67
 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:29
+#: ajax/upload.php:69
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Le fichier envoyé dépasse la directive MAX_FILE_SIZE qui est spécifiée dans le formulaire HTML."
 
-#: ajax/upload.php:30
+#: ajax/upload.php:70
 msgid "The uploaded file was only partially uploaded"
 msgstr "Le fichier n'a été que partiellement envoyé."
 
-#: ajax/upload.php:31
+#: ajax/upload.php:71
 msgid "No file was uploaded"
 msgstr "Pas de fichier envoyé."
 
-#: ajax/upload.php:32
+#: ajax/upload.php:72
 msgid "Missing a temporary folder"
 msgstr "Absence de dossier temporaire."
 
-#: ajax/upload.php:33
+#: ajax/upload.php:73
 msgid "Failed to write to disk"
 msgstr "Erreur d'écriture sur le disque"
 
-#: ajax/upload.php:51
+#: ajax/upload.php:91
 msgid "Not enough storage available"
 msgstr "Plus assez d'espace de stockage disponible"
 
-#: ajax/upload.php:83
+#: ajax/upload.php:123
 msgid "Invalid directory."
 msgstr "Dossier invalide."
 
@@ -76,6 +85,36 @@ msgstr "Dossier invalide."
 msgid "Files"
 msgstr "Fichiers"
 
+#: js/file-upload.js:11
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr "Impossible d'envoyer votre fichier dans la mesure où il s'agit d'un répertoire ou d'un fichier de taille nulle"
+
+#: js/file-upload.js:24
+msgid "Not enough space available"
+msgstr "Espace disponible insuffisant"
+
+#: js/file-upload.js:64
+msgid "Upload cancelled."
+msgstr "Envoi annulé."
+
+#: js/file-upload.js:167 js/files.js:266
+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/file-upload.js:233 js/files.js:339
+msgid "URL cannot be empty."
+msgstr "L'URL ne peut-être vide"
+
+#: js/file-upload.js:238 lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr "Nom de dossier invalide. L'utilisation du mot 'Shared' est réservée à Owncloud"
+
+#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
+#: js/files.js:693 js/files.js:731
+msgid "Error"
+msgstr "Erreur"
+
 #: js/fileactions.js:116
 msgid "Share"
 msgstr "Partager"
@@ -92,43 +131,43 @@ msgstr "Supprimer"
 msgid "Rename"
 msgstr "Renommer"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:464
 msgid "Pending"
 msgstr "En attente"
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "{new_name} already exists"
 msgstr "{new_name} existe déjà"
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "replace"
 msgstr "remplacer"
 
-#: js/filelist.js:259
+#: js/filelist.js:302
 msgid "suggest name"
 msgstr "Suggérer un nom"
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "cancel"
 msgstr "annuler"
 
-#: js/filelist.js:306
+#: js/filelist.js:349
 msgid "replaced {new_name} with {old_name}"
 msgstr "{new_name} a été remplacé par {old_name}"
 
-#: js/filelist.js:306
+#: js/filelist.js:349
 msgid "undo"
 msgstr "annuler"
 
-#: js/filelist.js:331
+#: js/filelist.js:374
 msgid "perform delete operation"
 msgstr "effectuer l'opération de suppression"
 
-#: js/filelist.js:413
+#: js/filelist.js:456
 msgid "1 file uploading"
 msgstr "1 fichier en cours d'envoi"
 
-#: js/filelist.js:416 js/filelist.js:470
+#: js/filelist.js:459 js/filelist.js:517
 msgid "files uploading"
 msgstr "fichiers en cours d'envoi"
 
@@ -160,70 +199,42 @@ msgid ""
 "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:264
-msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "Impossible d'envoyer votre fichier dans la mesure où il s'agit d'un répertoire ou d'un fichier de taille nulle"
-
-#: js/files.js:277
-msgid "Not enough space available"
-msgstr "Espace disponible insuffisant"
-
-#: js/files.js:317
-msgid "Upload cancelled."
-msgstr "Envoi annulé."
-
-#: js/files.js:413
-msgid ""
-"File upload is in progress. Leaving the page now will cancel the upload."
-msgstr "L'envoi du fichier est en cours. Quitter cette page maintenant annulera l'envoi du fichier."
-
-#: js/files.js:486
-msgid "URL cannot be empty."
-msgstr "L'URL ne peut-être vide"
-
-#: js/files.js:491
+#: js/files.js:344
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Nom de dossier invalide. L'utilisation du mot 'Shared' est réservée à Owncloud"
 
-#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
-msgid "Error"
-msgstr "Erreur"
-
-#: js/files.js:877 templates/index.php:69
+#: js/files.js:744 templates/index.php:69
 msgid "Name"
 msgstr "Nom"
 
-#: js/files.js:878 templates/index.php:80
+#: js/files.js:745 templates/index.php:80
 msgid "Size"
 msgstr "Taille"
 
-#: js/files.js:879 templates/index.php:82
+#: js/files.js:746 templates/index.php:82
 msgid "Modified"
 msgstr "Modifié"
 
-#: js/files.js:898
+#: js/files.js:765
 msgid "1 folder"
 msgstr "1 dossier"
 
-#: js/files.js:900
+#: js/files.js:767
 msgid "{count} folders"
 msgstr "{count} dossiers"
 
-#: js/files.js:908
+#: js/files.js:775
 msgid "1 file"
 msgstr "1 fichier"
 
-#: js/files.js:910
+#: js/files.js:777
 msgid "{count} files"
 msgstr "{count} fichiers"
 
-#: lib/app.php:53
-msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
-msgstr "Nom de dossier invalide. L'utilisation du mot 'Shared' est réservée à Owncloud"
-
 #: lib/app.php:73
-msgid "Unable to rename file"
-msgstr "Impossible de renommer le fichier"
+#, php-format
+msgid "%s could not be renamed"
+msgstr "%s ne peut être renommé"
 
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
@@ -319,6 +330,22 @@ msgstr "Les fichiers sont en cours d'analyse, veuillez patienter."
 msgid "Current scanning"
 msgstr "Analyse en cours"
 
+#: templates/part.list.php:76
+msgid "directory"
+msgstr ""
+
+#: templates/part.list.php:78
+msgid "directories"
+msgstr ""
+
+#: templates/part.list.php:87
+msgid "file"
+msgstr "fichier"
+
+#: templates/part.list.php:89
+msgid "files"
+msgstr "fichiers"
+
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
 msgstr "Mise à niveau du cache du système de fichier"
diff --git a/l10n/fr/files_encryption.po b/l10n/fr/files_encryption.po
index cd41efece69d47383055c0c2a74c253838c16e15..a7a5e7a6fe44b134413f76eb95266d299e411f34 100644
--- a/l10n/fr/files_encryption.po
+++ b/l10n/fr/files_encryption.po
@@ -4,15 +4,16 @@
 # 
 # Translators:
 # Adalberto Rodrigues <rodrigues_adalberto@yahoo.fr>, 2013
+# Christophe Lherieau <skimpax@gmail.com>, 2013
 # froozeify <froozeify@mail.com>, 2013
 # lyly95, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 18:50+0000\n"
-"Last-Translator: Adalberto Rodrigues <rodrigues_adalberto@yahoo.fr>\n"
+"POT-Creation-Date: 2013-07-05 02:12+0200\n"
+"PO-Revision-Date: 2013-07-05 00:13+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"
@@ -27,16 +28,16 @@ msgstr "Clé de récupération activée avec succès"
 #: ajax/adminrecovery.php:34
 msgid ""
 "Could not enable recovery key. Please check your recovery key password!"
-msgstr "Ne peut pas activer la clé de récupération. s'il vous plait vérifiez votre mot de passe de clé de récupération!"
+msgstr "Impossible d'activer la clé de récupération. Veuillez vérifier votre mot de passe de clé de récupération !"
 
 #: ajax/adminrecovery.php:48
 msgid "Recovery key successfully disabled"
-msgstr "Clé de récupération désactivée avc succès"
+msgstr "Clé de récupération désactivée avec succès"
 
 #: ajax/adminrecovery.php:53
 msgid ""
 "Could not disable recovery key. Please check your recovery key password!"
-msgstr "Ne peut pas désactiver la clé de récupération. S'il vous plait vérifiez votre mot de passe de clé de récupération!"
+msgstr "Impossible de désactiver la clé de récupération. Veuillez vérifier votre mot de passe de clé de récupération !"
 
 #: ajax/changeRecoveryPassword.php:49
 msgid "Password successfully changed."
@@ -58,9 +59,21 @@ msgstr "Impossible de mettre à jour le mot de passe de la clé privé. Peut-êt
 
 #: files/error.php:7
 msgid ""
-"Your private key is not valid! Maybe your password was changed from outside."
-" You can update your private key password in your personal settings to "
-"regain access to your files"
+"Your private key is not valid! Likely your password was changed outside the "
+"ownCloud system (e.g. your corporate directory). You can update your private"
+" key password in your personal settings to recover access to your encrypted "
+"files."
+msgstr "Votre clé de sécurité privée n'est pas valide! Il est probable que votre mot de passe ait été changé sans passer par le système ownCloud (par éxemple: le serveur de votre entreprise). Ain d'avoir à nouveau accès à vos fichiers cryptés, vous pouvez mettre à jour votre clé de sécurité privée dans les paramètres personnels de votre compte."
+
+#: hooks/hooks.php:44
+msgid "Missing requirements."
+msgstr ""
+
+#: hooks/hooks.php:45
+msgid ""
+"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL "
+"PHP extension is enabled and configured properly. For now, the encryption "
+"app has been disabled."
 msgstr ""
 
 #: js/settings-admin.js:11
@@ -71,7 +84,7 @@ msgstr "Enregistrement..."
 msgid ""
 "Your private key is not valid! Maybe the your password was changed from "
 "outside."
-msgstr ""
+msgstr "Votre clef privée est invalide ! Votre mot de passe a peut-être été modifié depuis l'extérieur."
 
 #: templates/invalid_private_key.php:7
 msgid "You can unlock your private key in your "
@@ -87,12 +100,12 @@ msgstr "Chiffrement"
 
 #: templates/settings-admin.php:10
 msgid ""
-"Enable encryption passwords recovery key (allow sharing to recovery key):"
-msgstr "Activer la clé de récupération par mots de passe de cryptage (autoriser le partage de la clé de récupération) "
+"Enable recovery key (allow to recover users files in case of password loss):"
+msgstr "Activer la clef de récupération (permet de récupérer les fichiers des utilisateurs en cas de perte de mot de passe)."
 
 #: templates/settings-admin.php:14
-msgid "Recovery account password"
-msgstr "Rétablissement du compte mot de passe "
+msgid "Recovery key password"
+msgstr "Mot de passe de la clef de récupération"
 
 #: templates/settings-admin.php:21 templates/settings-personal.php:54
 msgid "Enabled"
@@ -103,16 +116,16 @@ msgid "Disabled"
 msgstr "Désactiver"
 
 #: templates/settings-admin.php:34
-msgid "Change encryption passwords recovery key:"
-msgstr "Changer les mots de passe de cryptage par la clé de récupération"
+msgid "Change recovery key password:"
+msgstr "Modifier le mot de passe de la clef de récupération :"
 
 #: templates/settings-admin.php:41
-msgid "Old Recovery account password"
-msgstr "Ancien compte de récupération de mots de passe"
+msgid "Old Recovery key password"
+msgstr "Ancien mot de passe de la clef de récupération"
 
 #: templates/settings-admin.php:48
-msgid "New Recovery account password"
-msgstr "Nouveau compte de récupération de mots de passe"
+msgid "New Recovery key password"
+msgstr "Nouveau mot de passe de la clef de récupération"
 
 #: templates/settings-admin.php:53
 msgid "Change Password"
@@ -120,17 +133,17 @@ msgstr "Changer de mot de passe"
 
 #: templates/settings-personal.php:11
 msgid "Your private key password no longer match your log-in password:"
-msgstr ""
+msgstr "Le mot de passe de votre clef privée ne correspond plus à votre mot de passe de connexion :"
 
 #: templates/settings-personal.php:14
 msgid "Set your old private key password to your current log-in password."
-msgstr ""
+msgstr "Configurez le mot de passe de votre ancienne clef privée avec votre mot de passe courant de connexion. "
 
 #: templates/settings-personal.php:16
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
-msgstr ""
+msgstr "Si vous ne vous souvenez plus de votre ancien mot de passe, vous pouvez demander à votre administrateur de récupérer vos fichiers."
 
 #: templates/settings-personal.php:24
 msgid "Old log-in password"
@@ -146,17 +159,17 @@ msgstr "Mettre à jour le mot de passe de votre clé privée"
 
 #: templates/settings-personal.php:45
 msgid "Enable password recovery:"
-msgstr "Activer la récupération du mot de passe:"
+msgstr "Activer la récupération du mot de passe :"
 
 #: templates/settings-personal.php:47
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
-msgstr ""
+msgstr "Activer cette option vous permettra d'obtenir à nouveau l'accès à vos fichiers chiffrés en cas de perte de mot de passe"
 
 #: templates/settings-personal.php:63
 msgid "File recovery settings updated"
-msgstr "Mise à jour des paramètres de récupération de fichiers "
+msgstr "Paramètres de récupération de fichiers mis à jour"
 
 #: templates/settings-personal.php:64
 msgid "Could not update file recovery"
diff --git a/l10n/fr/files_external.po b/l10n/fr/files_external.po
index 425e8caf533daa2b499b77b86e6bcba58694c61a..e0595c83f66b67db944cea4af6ff54990984d27c 100644
--- a/l10n/fr/files_external.po
+++ b/l10n/fr/files_external.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/fr/files_sharing.po b/l10n/fr/files_sharing.po
index c70b8f4a91acf1302bd5f0f2f6101af7c78bb1bc..e7d94b358ab8097398326603124aef346d6fdef7 100644
--- a/l10n/fr/files_sharing.po
+++ b/l10n/fr/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
@@ -18,27 +18,39 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: templates/authenticate.php:4
+msgid "The password is wrong. Try again."
+msgstr ""
+
+#: templates/authenticate.php:7
 msgid "Password"
 msgstr "Mot de passe"
 
-#: templates/authenticate.php:6
+#: templates/authenticate.php:9
 msgid "Submit"
 msgstr "Envoyer"
 
-#: templates/public.php:10
+#: templates/public.php:17
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s a partagé le répertoire %s avec vous"
 
-#: templates/public.php:13
+#: templates/public.php:20
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s a partagé le fichier %s avec vous"
 
-#: templates/public.php:19 templates/public.php:43
+#: templates/public.php:28 templates/public.php:90
 msgid "Download"
 msgstr "Télécharger"
 
-#: templates/public.php:40
+#: templates/public.php:45 templates/public.php:48
+msgid "Upload"
+msgstr "Envoyer"
+
+#: templates/public.php:58
+msgid "Cancel upload"
+msgstr "Annuler l'envoi"
+
+#: templates/public.php:87
 msgid "No preview available for"
 msgstr "Pas d'aperçu disponible pour"
diff --git a/l10n/fr/files_trashbin.po b/l10n/fr/files_trashbin.po
index 1a32bdc4aa41b7f56b32f5e7083fe8102a501b34..9b620bc26225990dc8accbf9007fbf149cde0899 100644
--- a/l10n/fr/files_trashbin.po
+++ b/l10n/fr/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:16+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/fr/lib.po b/l10n/fr/lib.po
index 2f14f999e7e99a546f58f8feb82b3ce344bfa28a..a63afda83d3511aa8a5b02fa7f6e5628039eed37 100644
--- a/l10n/fr/lib.po
+++ b/l10n/fr/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-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
-"Last-Translator: Cyril Glapa <kyriog@gmail.com>\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,43 +18,47 @@ msgstr ""
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: app.php:359
+#: app.php:360
 msgid "Help"
 msgstr "Aide"
 
-#: app.php:372
+#: app.php:373
 msgid "Personal"
 msgstr "Personnel"
 
-#: app.php:383
+#: app.php:384
 msgid "Settings"
 msgstr "Paramètres"
 
-#: app.php:395
+#: app.php:396
 msgid "Users"
 msgstr "Utilisateurs"
 
-#: app.php:408
+#: app.php:409
 msgid "Apps"
 msgstr "Applications"
 
-#: app.php:416
+#: app.php:417
 msgid "Admin"
 msgstr "Administration"
 
-#: files.php:210
+#: defaults.php:33
+msgid "web services under your control"
+msgstr "services web sous votre contrôle"
+
+#: files.php:226
 msgid "ZIP download is turned off."
 msgstr "Téléchargement ZIP désactivé."
 
-#: files.php:211
+#: files.php:227
 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:212 files.php:245
+#: files.php:228 files.php:261
 msgid "Back to Files"
 msgstr "Retour aux Fichiers"
 
-#: files.php:242
+#: files.php:258
 msgid "Selected files too large to generate zip file."
 msgstr "Les fichiers sélectionnés sont trop volumineux pour être compressés."
 
@@ -86,104 +90,102 @@ msgstr "Texte"
 msgid "Images"
 msgstr "Images"
 
-#: setup.php:34
-msgid "Set an admin username."
-msgstr "Spécifiez un nom d'utilisateur pour l'administrateur."
-
-#: setup.php:37
-msgid "Set an admin password."
-msgstr "Spécifiez un mot de passe administrateur."
-
-#: setup.php:55
+#: setup/abstractdatabase.php:22
 #, php-format
 msgid "%s enter the database username."
 msgstr "%s entrez le nom d'utilisateur de la base de données."
 
-#: setup.php:58
+#: setup/abstractdatabase.php:25
 #, php-format
 msgid "%s enter the database name."
 msgstr "%s entrez le nom de la base de données."
 
-#: setup.php:61
+#: setup/abstractdatabase.php:28
 #, php-format
 msgid "%s you may not use dots in the database name"
 msgstr "%s vous nez pouvez pas utiliser de points dans le nom de la base de données"
 
-#: setup.php:64
+#: setup/mssql.php:20
 #, php-format
-msgid "%s set the database host."
-msgstr "%s spécifiez l'hôte de la base de données."
-
-#: setup.php:126 setup.php:332 setup.php:377
-msgid "PostgreSQL username and/or password not valid"
-msgstr "Nom d'utilisateur et/ou mot de passe de la base PostgreSQL invalide"
+msgid "MS SQL username and/or password not valid: %s"
+msgstr "Le nom d'utilisateur et/ou le mot de passe de la base MS SQL est invalide : %s"
 
-#: setup.php:127 setup.php:235
+#: setup/mssql.php:21 setup/mysql.php:13 setup/oci.php:114
+#: setup/postgresql.php:24 setup/postgresql.php:70
 msgid "You need to enter either an existing account or the administrator."
 msgstr "Vous devez spécifier soit le nom d'un compte existant, soit celui de l'administrateur."
 
-#: setup.php:152
-msgid "Oracle connection could not be established"
-msgstr "La connexion Oracle ne peut pas être établie"
-
-#: setup.php:234
+#: setup/mysql.php:12
 msgid "MySQL username and/or password not valid"
 msgstr "Nom d'utilisateur et/ou mot de passe de la base MySQL invalide"
 
-#: setup.php:288 setup.php:398 setup.php:407 setup.php:425 setup.php:435
-#: setup.php:444 setup.php:477 setup.php:543 setup.php:569 setup.php:576
-#: setup.php:587 setup.php:594 setup.php:603 setup.php:611 setup.php:620
-#: setup.php:626
+#: setup/mysql.php:67 setup/oci.php:54 setup/oci.php:121 setup/oci.php:147
+#: setup/oci.php:154 setup/oci.php:165 setup/oci.php:172 setup/oci.php:181
+#: setup/oci.php:189 setup/oci.php:198 setup/oci.php:204
+#: setup/postgresql.php:89 setup/postgresql.php:98 setup/postgresql.php:115
+#: setup/postgresql.php:125 setup/postgresql.php:134
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr "Erreur de la base de données : \"%s\""
 
-#: setup.php:289 setup.php:399 setup.php:408 setup.php:426 setup.php:436
-#: setup.php:445 setup.php:478 setup.php:544 setup.php:570 setup.php:577
-#: setup.php:588 setup.php:604 setup.php:612 setup.php:621
+#: setup/mysql.php:68 setup/oci.php:55 setup/oci.php:122 setup/oci.php:148
+#: setup/oci.php:155 setup/oci.php:166 setup/oci.php:182 setup/oci.php:190
+#: setup/oci.php:199 setup/postgresql.php:90 setup/postgresql.php:99
+#: setup/postgresql.php:116 setup/postgresql.php:126 setup/postgresql.php:135
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr "La requête en cause est : \"%s\""
 
-#: setup.php:305
+#: setup/mysql.php:85
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr "L'utilisateur MySQL '%s'@'localhost' existe déjà."
 
-#: setup.php:306
+#: setup/mysql.php:86
 msgid "Drop this user from MySQL"
 msgstr "Retirer cet utilisateur de la base MySQL"
 
-#: setup.php:311
+#: setup/mysql.php:91
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr "L'utilisateur MySQL '%s'@'%%' existe déjà"
 
-#: setup.php:312
+#: setup/mysql.php:92
 msgid "Drop this user from MySQL."
 msgstr "Retirer cet utilisateur de la base MySQL."
 
-#: setup.php:469 setup.php:536
+#: setup/oci.php:34
+msgid "Oracle connection could not be established"
+msgstr "La connexion Oracle ne peut pas être établie"
+
+#: setup/oci.php:41 setup/oci.php:113
 msgid "Oracle username and/or password not valid"
 msgstr "Nom d'utilisateur et/ou mot de passe de la base Oracle invalide"
 
-#: setup.php:595 setup.php:627
+#: setup/oci.php:173 setup/oci.php:205
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr "La requête en cause est : \"%s\", nom : %s, mot de passe : %s"
 
-#: setup.php:647
-#, php-format
-msgid "MS SQL username and/or password not valid: %s"
-msgstr "Le nom d'utilisateur et/ou le mot de passe de la base MS SQL est invalide : %s"
+#: setup/postgresql.php:23 setup/postgresql.php:69
+msgid "PostgreSQL username and/or password not valid"
+msgstr "Nom d'utilisateur et/ou mot de passe de la base PostgreSQL invalide"
+
+#: setup.php:42
+msgid "Set an admin username."
+msgstr "Spécifiez un nom d'utilisateur pour l'administrateur."
+
+#: setup.php:45
+msgid "Set an admin password."
+msgstr "Spécifiez un mot de passe administrateur."
 
-#: setup.php:870
+#: setup.php:198
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Votre serveur web, n'est pas correctement configuré pour permettre la synchronisation des fichiers, car l'interface WebDav ne fonctionne pas comme il faut."
 
-#: setup.php:871
+#: setup.php:199
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Veuillez vous référer au <a href='%s'>guide d'installation</a>."
diff --git a/l10n/fr/settings.po b/l10n/fr/settings.po
index 5b49e6f5e02a235c908eb662687f027dd15c8c76..402d745562220d210586827f871191291437d33a 100644
--- a/l10n/fr/settings.po
+++ b/l10n/fr/settings.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
-"Last-Translator: lyly95\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -91,35 +91,35 @@ msgstr "Impossible de supprimer l'utilisateur du groupe %s"
 msgid "Couldn't update app."
 msgstr "Impossible de mettre à jour l'application"
 
-#: js/apps.js:30
+#: js/apps.js:35
 msgid "Update to {appversion}"
 msgstr "Mettre à jour vers {appversion}"
 
-#: js/apps.js:36 js/apps.js:76
+#: js/apps.js:41 js/apps.js:81
 msgid "Disable"
 msgstr "Désactiver"
 
-#: js/apps.js:36 js/apps.js:64 js/apps.js:83
+#: js/apps.js:41 js/apps.js:69 js/apps.js:88
 msgid "Enable"
 msgstr "Activer"
 
-#: js/apps.js:55
+#: js/apps.js:60
 msgid "Please wait...."
 msgstr "Veuillez patienter…"
 
-#: js/apps.js:59 js/apps.js:71 js/apps.js:80 js/apps.js:93
+#: js/apps.js:64 js/apps.js:76 js/apps.js:85 js/apps.js:98
 msgid "Error"
 msgstr "Erreur"
 
-#: js/apps.js:90
+#: js/apps.js:95
 msgid "Updating...."
 msgstr "Mise à jour..."
 
-#: js/apps.js:93
+#: js/apps.js:98
 msgid "Error while updating app"
 msgstr "Erreur lors de la mise à jour de l'application"
 
-#: js/apps.js:96
+#: js/apps.js:101
 msgid "Updated"
 msgstr "Mise à jour effectuée avec succès"
 
@@ -168,15 +168,15 @@ msgstr "Erreur lors de la création de l'utilisateur"
 msgid "A valid password must be provided"
 msgstr "Un mot de passe valide doit être saisi"
 
-#: personal.php:35 personal.php:36
+#: personal.php:37 personal.php:38
 msgid "__language_name__"
 msgstr "Français"
 
-#: templates/admin.php:15
+#: templates/admin.php:17
 msgid "Security Warning"
 msgstr "Avertissement de sécurité"
 
-#: templates/admin.php:18
+#: templates/admin.php:20
 msgid ""
 "Your data directory and your files are probably accessible from the "
 "internet. The .htaccess file that ownCloud provides is not working. We "
@@ -185,36 +185,36 @@ msgid ""
 " webserver document root."
 msgstr "Votre dossier data et vos fichiers sont probablement accessibles depuis internet. Le fichier .htaccess fourni par ownCloud ne fonctionne pas. Nous vous recommandons vivement de configurer votre serveur web de manière à ce que le dossier data ne soit plus accessible ou bien de déplacer le dossier data en dehors du dossier racine des documents du serveur web."
 
-#: templates/admin.php:29
+#: templates/admin.php:31
 msgid "Setup Warning"
 msgstr "Avertissement, problème de configuration"
 
-#: templates/admin.php:32
+#: templates/admin.php:34
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Votre serveur web, n'est pas correctement configuré pour permettre la synchronisation des fichiers, car l'interface WebDav ne fonctionne pas comme il faut."
 
-#: templates/admin.php:33
+#: templates/admin.php:35
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Veuillez vous référer au <a href='%s'>guide d'installation</a>."
 
-#: templates/admin.php:44
+#: templates/admin.php:46
 msgid "Module 'fileinfo' missing"
 msgstr "Module 'fileinfo' manquant"
 
-#: templates/admin.php:47
+#: templates/admin.php:49
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr "Le module PHP 'fileinfo' est manquant. Il est vivement recommandé de l'activer afin d'obtenir de meilleurs résultats pour la détection des types de fichiers."
 
-#: templates/admin.php:58
+#: templates/admin.php:60
 msgid "Locale not working"
 msgstr "Localisation non fonctionnelle"
 
-#: templates/admin.php:63
+#: templates/admin.php:65
 #, php-format
 msgid ""
 "This ownCloud server can't set system locale to %s. This means that there "
@@ -222,11 +222,11 @@ msgid ""
 " to install the required packages on your system to support %s."
 msgstr "Ce serveur ownCloud ne peut pas ajuster la localisation du système en %s. Cela signifie qu'il pourra y avoir des problèmes avec certains caractères dans les noms de fichiers. Il est vivement recommandé d'installer les paquets requis pour le support de %s."
 
-#: templates/admin.php:75
+#: templates/admin.php:77
 msgid "Internet connection not working"
 msgstr "La connexion internet ne fonctionne pas"
 
-#: templates/admin.php:78
+#: templates/admin.php:80
 msgid ""
 "This ownCloud server has no working internet connection. This means that "
 "some of the features like mounting of external storage, notifications about "
@@ -236,102 +236,102 @@ msgid ""
 " of ownCloud."
 msgstr "Ce serveur ownCloud ne peut pas se connecter à internet. Cela signifie que certaines fonctionnalités, telles que l'utilisation de supports de stockage distants, les notifications de mises à jour, ou l'installation d'applications tierces ne fonctionneront pas. L'accès aux fichiers à distance, ainsi que les notifications par mails ne marcheront pas non plus. Il est recommandé d'activer la connexion internet pour ce serveur si vous souhaitez utiliser toutes les fonctionnalités offertes par ownCloud."
 
-#: templates/admin.php:92
+#: templates/admin.php:94
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:101
+#: templates/admin.php:103
 msgid "Execute one task with each page loaded"
 msgstr "Exécute une tâche à chaque chargement de page"
 
-#: templates/admin.php:111
+#: templates/admin.php:113
 msgid ""
 "cron.php is registered at a webcron service. Call the cron.php page in the "
 "owncloud root once a minute over http."
 msgstr "cron.php est enregistré en tant que service webcron. Veuillez appeler la page cron.php située à la racine du serveur ownCoud via http toute les minutes."
 
-#: templates/admin.php:121
+#: templates/admin.php:123
 msgid ""
 "Use systems cron service. Call the cron.php file in the owncloud folder via "
 "a system cronjob once a minute."
 msgstr "Utilise le service cron du système. Appelle le fichier cron.php du répertoire owncloud toutes les minutes grâce à une tâche cron du système."
 
-#: templates/admin.php:128
+#: templates/admin.php:130
 msgid "Sharing"
 msgstr "Partage"
 
-#: templates/admin.php:134
+#: templates/admin.php:136
 msgid "Enable Share API"
 msgstr "Activer l'API de partage"
 
-#: templates/admin.php:135
+#: templates/admin.php:137
 msgid "Allow apps to use the Share API"
 msgstr "Autoriser les applications à utiliser l'API de partage"
 
-#: templates/admin.php:142
+#: templates/admin.php:144
 msgid "Allow links"
 msgstr "Autoriser les liens"
 
-#: templates/admin.php:143
+#: templates/admin.php:145
 msgid "Allow users to share items to the public with links"
 msgstr "Autoriser les utilisateurs à partager des éléments publiquement à l'aide de liens"
 
-#: templates/admin.php:150
+#: templates/admin.php:152
 msgid "Allow resharing"
 msgstr "Autoriser le repartage"
 
-#: templates/admin.php:151
+#: templates/admin.php:153
 msgid "Allow users to share items shared with them again"
 msgstr "Autoriser les utilisateurs à partager des éléments qui ont été partagés avec eux"
 
-#: templates/admin.php:158
+#: templates/admin.php:160
 msgid "Allow users to share with anyone"
 msgstr "Autoriser les utilisateurs à partager avec tout le monde"
 
-#: templates/admin.php:161
+#: templates/admin.php:163
 msgid "Allow users to only share with users in their groups"
 msgstr "Autoriser les utilisateurs à partager avec des utilisateurs de leur groupe uniquement"
 
-#: templates/admin.php:168
+#: templates/admin.php:170
 msgid "Security"
 msgstr "Sécurité"
 
-#: templates/admin.php:181
+#: templates/admin.php:183
 msgid "Enforce HTTPS"
 msgstr "Forcer HTTPS"
 
-#: templates/admin.php:182
+#: templates/admin.php:184
 msgid ""
 "Enforces the clients to connect to ownCloud via an encrypted connection."
 msgstr "Forcer les clients à se connecter à Owncloud via une connexion chiffrée."
 
-#: templates/admin.php:185
+#: templates/admin.php:187
 msgid ""
 "Please connect to this ownCloud instance via HTTPS to enable or disable the "
 "SSL enforcement."
 msgstr "Merci de vous connecter à cette instance Owncloud en HTTPS pour activer ou désactiver SSL."
 
-#: templates/admin.php:195
+#: templates/admin.php:197
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:196
+#: templates/admin.php:198
 msgid "Log level"
 msgstr "Niveau de log"
 
-#: templates/admin.php:227
+#: templates/admin.php:229
 msgid "More"
 msgstr "Plus"
 
-#: templates/admin.php:228
+#: templates/admin.php:230
 msgid "Less"
 msgstr "Moins"
 
-#: templates/admin.php:235 templates/personal.php:116
+#: templates/admin.php:236 templates/personal.php:116
 msgid "Version"
 msgstr "Version"
 
-#: templates/admin.php:237 templates/personal.php:119
+#: templates/admin.php:240 templates/personal.php:119
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -389,76 +389,79 @@ msgstr "Suivi de bugs"
 msgid "Commercial Support"
 msgstr "Support commercial"
 
-#: templates/personal.php:9
+#: templates/personal.php:10
 msgid "Get the apps to sync your files"
 msgstr "Obtenez les applications de synchronisation de vos fichiers"
 
-#: templates/personal.php:20
+#: templates/personal.php:21
 msgid "Show First Run Wizard again"
 msgstr "Revoir le premier lancement de l'installeur"
 
-#: templates/personal.php:28
+#: templates/personal.php:29
 #, php-format
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "Vous avez utilisé <strong>%s</strong> des <strong>%s<strong> disponibles"
 
-#: templates/personal.php:40 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:41 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "Mot de passe"
 
-#: templates/personal.php:41
+#: templates/personal.php:42
 msgid "Your password was changed"
 msgstr "Votre mot de passe a été changé"
 
-#: templates/personal.php:42
+#: templates/personal.php:43
 msgid "Unable to change your password"
 msgstr "Impossible de changer votre mot de passe"
 
-#: templates/personal.php:43
+#: templates/personal.php:44
 msgid "Current password"
 msgstr "Mot de passe actuel"
 
-#: templates/personal.php:45
+#: templates/personal.php:46
 msgid "New password"
 msgstr "Nouveau mot de passe"
 
-#: templates/personal.php:47
+#: templates/personal.php:48
 msgid "Change password"
 msgstr "Changer de mot de passe"
 
-#: templates/personal.php:59 templates/users.php:85
+#: templates/personal.php:60 templates/users.php:85
 msgid "Display Name"
 msgstr "Nom affiché"
 
-#: templates/personal.php:74
+#: templates/personal.php:75
 msgid "Email"
 msgstr "Adresse mail"
 
-#: templates/personal.php:76
+#: templates/personal.php:77
 msgid "Your email address"
 msgstr "Votre adresse e-mail"
 
-#: templates/personal.php:77
+#: templates/personal.php:78
 msgid "Fill in an email address to enable password recovery"
 msgstr "Entrez votre adresse e-mail pour permettre la réinitialisation du mot de passe"
 
-#: templates/personal.php:86 templates/personal.php:87
+#: templates/personal.php:87 templates/personal.php:88
 msgid "Language"
 msgstr "Langue"
 
-#: templates/personal.php:99
+#: templates/personal.php:100
 msgid "Help translate"
 msgstr "Aidez à traduire"
 
-#: templates/personal.php:105
+#: templates/personal.php:106
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:107
-msgid "Use this address to connect to your ownCloud in your file manager"
-msgstr "Utiliser cette adresse pour vous connecter à ownCloud dans votre gestionnaire de fichiers"
+#: templates/personal.php:108
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
+"target=\"_blank\">access your Files via WebDAV</a>"
+msgstr ""
 
-#: templates/users.php:21 templates/users.php:84
+#: templates/users.php:21
 msgid "Login Name"
 msgstr "Nom de la connexion"
 
@@ -488,6 +491,10 @@ msgstr "Illimité"
 msgid "Other"
 msgstr "Autre"
 
+#: templates/users.php:84
+msgid "Username"
+msgstr "Nom d'utilisateur"
+
 #: templates/users.php:91
 msgid "Storage"
 msgstr "Support de stockage"
diff --git a/l10n/fr/user_ldap.po b/l10n/fr/user_ldap.po
index 832c098cf5692d57e2b878a2f8e2eaa56cd620a1..0b02ee805070c9bf33e36d79562767f569315d0e 100644
--- a/l10n/fr/user_ldap.po
+++ b/l10n/fr/user_ldap.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:25+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:16+0000\n"
 "Last-Translator: plachance <patlachance@gmail.com>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/gl/core.po b/l10n/gl/core.po
index 6a3b815a9c518e0b7bb4d70853202e2051c73a4f..049b1a9a73ee14b3c61f5c764a7653235f5efaf3 100644
--- a/l10n/gl/core.po
+++ b/l10n/gl/core.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:22+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:14+0000\n"
 "Last-Translator: mbouzada <mbouzada@gmail.com>\n"
 "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
 "MIME-Version: 1.0\n"
@@ -62,135 +62,135 @@ msgstr "Non se seleccionaron categorías para eliminación."
 msgid "Error removing %s from favorites."
 msgstr "Produciuse un erro ao eliminar %s dos favoritos."
 
-#: js/config.php:34
+#: js/config.php:32
 msgid "Sunday"
 msgstr "Domingo"
 
-#: js/config.php:35
+#: js/config.php:33
 msgid "Monday"
 msgstr "Luns"
 
-#: js/config.php:36
+#: js/config.php:34
 msgid "Tuesday"
 msgstr "Martes"
 
-#: js/config.php:37
+#: js/config.php:35
 msgid "Wednesday"
 msgstr "Mércores"
 
-#: js/config.php:38
+#: js/config.php:36
 msgid "Thursday"
 msgstr "Xoves"
 
-#: js/config.php:39
+#: js/config.php:37
 msgid "Friday"
 msgstr "Venres"
 
-#: js/config.php:40
+#: js/config.php:38
 msgid "Saturday"
 msgstr "Sábado"
 
-#: js/config.php:45
+#: js/config.php:43
 msgid "January"
 msgstr "xaneiro"
 
-#: js/config.php:46
+#: js/config.php:44
 msgid "February"
 msgstr "febreiro"
 
-#: js/config.php:47
+#: js/config.php:45
 msgid "March"
 msgstr "marzo"
 
-#: js/config.php:48
+#: js/config.php:46
 msgid "April"
 msgstr "abril"
 
-#: js/config.php:49
+#: js/config.php:47
 msgid "May"
 msgstr "maio"
 
-#: js/config.php:50
+#: js/config.php:48
 msgid "June"
 msgstr "xuño"
 
-#: js/config.php:51
+#: js/config.php:49
 msgid "July"
 msgstr "xullo"
 
-#: js/config.php:52
+#: js/config.php:50
 msgid "August"
 msgstr "agosto"
 
-#: js/config.php:53
+#: js/config.php:51
 msgid "September"
 msgstr "setembro"
 
-#: js/config.php:54
+#: js/config.php:52
 msgid "October"
 msgstr "outubro"
 
-#: js/config.php:55
+#: js/config.php:53
 msgid "November"
 msgstr "novembro"
 
-#: js/config.php:56
+#: js/config.php:54
 msgid "December"
 msgstr "decembro"
 
-#: js/js.js:286
+#: js/js.js:293
 msgid "Settings"
 msgstr "Axustes"
 
-#: js/js.js:718
+#: js/js.js:725
 msgid "seconds ago"
 msgstr "segundos atrás"
 
-#: js/js.js:719
+#: js/js.js:726
 msgid "1 minute ago"
 msgstr "hai 1 minuto"
 
-#: js/js.js:720
+#: js/js.js:727
 msgid "{minutes} minutes ago"
 msgstr "hai {minutes} minutos"
 
-#: js/js.js:721
+#: js/js.js:728
 msgid "1 hour ago"
 msgstr "Vai 1 hora"
 
-#: js/js.js:722
+#: js/js.js:729
 msgid "{hours} hours ago"
 msgstr "hai {hours} horas"
 
-#: js/js.js:723
+#: js/js.js:730
 msgid "today"
 msgstr "hoxe"
 
-#: js/js.js:724
+#: js/js.js:731
 msgid "yesterday"
 msgstr "onte"
 
-#: js/js.js:725
+#: js/js.js:732
 msgid "{days} days ago"
 msgstr "hai {days} días"
 
-#: js/js.js:726
+#: js/js.js:733
 msgid "last month"
 msgstr "último mes"
 
-#: js/js.js:727
+#: js/js.js:734
 msgid "{months} months ago"
 msgstr "hai {months} meses"
 
-#: js/js.js:728
+#: js/js.js:735
 msgid "months ago"
 msgstr "meses atrás"
 
-#: js/js.js:729
+#: js/js.js:736
 msgid "last year"
 msgstr "último ano"
 
-#: js/js.js:730
+#: js/js.js:737
 msgid "years ago"
 msgstr "anos atrás"
 
@@ -226,8 +226,8 @@ msgstr "Non se especificou o tipo de obxecto."
 #: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
 #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:577
-#: js/share.js:589
+#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:620
+#: js/share.js:632
 msgid "Error"
 msgstr "Erro"
 
@@ -247,7 +247,7 @@ msgstr "Compartir"
 msgid "Share"
 msgstr "Compartir"
 
-#: js/share.js:125 js/share.js:617
+#: js/share.js:125 js/share.js:660
 msgid "Error while sharing"
 msgstr "Produciuse un erro ao compartir"
 
@@ -267,99 +267,103 @@ msgstr "Compartido con vostede e co grupo {group} por {owner}"
 msgid "Shared with you by {owner}"
 msgstr "Compartido con vostede por {owner}"
 
-#: js/share.js:159
+#: js/share.js:172
 msgid "Share with"
 msgstr "Compartir con"
 
-#: js/share.js:164
+#: js/share.js:177
 msgid "Share with link"
 msgstr "Compartir coa ligazón"
 
-#: js/share.js:167
+#: js/share.js:180
 msgid "Password protect"
 msgstr "Protexido con contrasinais"
 
-#: js/share.js:169 templates/installation.php:54 templates/login.php:26
+#: js/share.js:182 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "Contrasinal"
 
-#: js/share.js:173
+#: js/share.js:187
+msgid "Allow Public Upload"
+msgstr "Permitir o envío público"
+
+#: js/share.js:191
 msgid "Email link to person"
 msgstr "Enviar ligazón por correo"
 
-#: js/share.js:174
+#: js/share.js:192
 msgid "Send"
 msgstr "Enviar"
 
-#: js/share.js:178
+#: js/share.js:197
 msgid "Set expiration date"
 msgstr "Definir a data de caducidade"
 
-#: js/share.js:179
+#: js/share.js:198
 msgid "Expiration date"
 msgstr "Data de caducidade"
 
-#: js/share.js:211
+#: js/share.js:230
 msgid "Share via email:"
 msgstr "Compartir por correo:"
 
-#: js/share.js:213
+#: js/share.js:232
 msgid "No people found"
 msgstr "Non se atopou xente"
 
-#: js/share.js:251
+#: js/share.js:270
 msgid "Resharing is not allowed"
 msgstr "Non se permite volver a compartir"
 
-#: js/share.js:287
+#: js/share.js:306
 msgid "Shared in {item} with {user}"
 msgstr "Compartido en {item} con {user}"
 
-#: js/share.js:308
+#: js/share.js:327
 msgid "Unshare"
 msgstr "Deixar de compartir"
 
-#: js/share.js:320
+#: js/share.js:339
 msgid "can edit"
 msgstr "pode editar"
 
-#: js/share.js:322
+#: js/share.js:341
 msgid "access control"
 msgstr "control de acceso"
 
-#: js/share.js:325
+#: js/share.js:344
 msgid "create"
 msgstr "crear"
 
-#: js/share.js:328
+#: js/share.js:347
 msgid "update"
 msgstr "actualizar"
 
-#: js/share.js:331
+#: js/share.js:350
 msgid "delete"
 msgstr "eliminar"
 
-#: js/share.js:334
+#: js/share.js:353
 msgid "share"
 msgstr "compartir"
 
-#: js/share.js:368 js/share.js:564
+#: js/share.js:387 js/share.js:607
 msgid "Password protected"
 msgstr "Protexido con contrasinal"
 
-#: js/share.js:577
+#: js/share.js:620
 msgid "Error unsetting expiration date"
 msgstr "Produciuse un erro ao retirar a data de caducidade"
 
-#: js/share.js:589
+#: js/share.js:632
 msgid "Error setting expiration date"
 msgstr "Produciuse un erro ao definir a data de caducidade"
 
-#: js/share.js:604
+#: js/share.js:647
 msgid "Sending ..."
 msgstr "Enviando..."
 
-#: js/share.js:615
+#: js/share.js:658
 msgid "Email sent"
 msgstr "Correo enviado"
 
@@ -374,7 +378,7 @@ msgstr "A actualización non foi satisfactoria, informe deste problema á  <a hr
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "A actualización realizouse correctamente. Redirixíndoo agora á ownCloud."
 
-#: lostpassword/controller.php:58
+#: lostpassword/controller.php:60
 msgid "ownCloud password reset"
 msgstr "Restabelecer o contrasinal de ownCloud"
 
@@ -404,17 +408,17 @@ msgstr "Nome de usuario"
 
 #: lostpassword/templates/lostpassword.php:22
 msgid ""
-"Your files seems to be encrypted. If you didn't have enabled the recovery "
-"key there will be no way to get your data back once the password was "
-"resetted. If you are not sure what to do, please contact your administrator "
-"first before continue. Do you really want to continue?"
-msgstr "Semella que os ficheiros están cifrados. Se aínda non activou a chave de recuperación non haberá xeito de recuperar os datos unha vez que se teña restabelecido o contrasinal. Se non ten certeza do que ten que facer, póñase en contacto co administrador antes de continuar. Confirma que quere continuar?"
+"Your files are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
+msgstr "Os ficheiros están cifrados. Se aínda non activou a chave de recuperación non haberá xeito de recuperar os datos unha vez que se teña restabelecido o contrasinal. Se non ten certeza do que ten que facer, póñase en contacto co administrador antes de continuar. Confirma que quere continuar?"
 
 #: lostpassword/templates/lostpassword.php:24
 msgid "Yes, I really want to reset my password now"
 msgstr "Si, confirmo que quero restabelecer agora o meu contrasinal"
 
-#: lostpassword/templates/lostpassword.php:29
+#: lostpassword/templates/lostpassword.php:27
 msgid "Request reset"
 msgstr "Petición de restabelecemento"
 
@@ -462,7 +466,7 @@ msgstr "Acceso denegado"
 msgid "Cloud not found"
 msgstr "Nube non atopada"
 
-#: templates/altmail.php:2
+#: templates/altmail.php:4
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -473,10 +477,6 @@ msgid ""
 "Cheers!"
 msgstr "Ola,\n\nsó facerlle saber que %s compartiu %s con vostede.\nVéxao en: %s\n\nSaúdos!"
 
-#: templates/altmail.php:7 templates/mail.php:24
-msgid "web services under your control"
-msgstr "servizos web baixo o seu control"
-
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
 msgstr "Editar as categorías"
@@ -569,12 +569,12 @@ msgstr "Servidor da base de datos"
 msgid "Finish setup"
 msgstr "Rematar a configuración"
 
-#: templates/layout.user.php:40
+#: templates/layout.user.php:43
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr "%s está dispoñíbel. Obteña máis información sobre como actualizar."
 
-#: templates/layout.user.php:67
+#: templates/layout.user.php:68
 msgid "Log out"
 msgstr "Desconectar"
 
@@ -608,7 +608,7 @@ msgstr "Conectar"
 msgid "Alternative Logins"
 msgstr "Accesos alternativos"
 
-#: templates/mail.php:15
+#: templates/mail.php:16
 #, php-format
 msgid ""
 "Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
diff --git a/l10n/gl/files.po b/l10n/gl/files.po
index b4adf0248a4c9743d37824fe2750b30b331bbd1e..2ddeca2ecfde69fec83c2121a07992658a6a45e7 100644
--- a/l10n/gl/files.po
+++ b/l10n/gl/files.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:01+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: mbouzada <mbouzada@gmail.com>\n"
 "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
 "MIME-Version: 1.0\n"
@@ -28,46 +28,54 @@ msgstr "Non se moveu %s - Xa existe un ficheiro con ese nome."
 msgid "Could not move %s"
 msgstr "Non foi posíbel mover %s"
 
-#: ajax/upload.php:19
+#: ajax/upload.php:16 ajax/upload.php:45
+msgid "Unable to set upload directory."
+msgstr "Non é posíbel configurar o directorio de envíos."
+
+#: ajax/upload.php:22
+msgid "Invalid Token"
+msgstr "Marca incorrecta"
+
+#: ajax/upload.php:59
 msgid "No file was uploaded. Unknown error"
 msgstr "Non se enviou ningún ficheiro. Produciuse un erro descoñecido."
 
-#: ajax/upload.php:26
+#: ajax/upload.php:66
 msgid "There is no error, the file uploaded with success"
 msgstr "Non houbo erros, o ficheiro enviouse correctamente"
 
-#: ajax/upload.php:27
+#: ajax/upload.php:67
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr "O ficheiro enviado excede a directiva indicada por upload_max_filesize de php.ini:"
 
-#: ajax/upload.php:29
+#: ajax/upload.php:69
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "O ficheiro enviado excede da directiva MAX_FILE_SIZE especificada no formulario HTML"
 
-#: ajax/upload.php:30
+#: ajax/upload.php:70
 msgid "The uploaded file was only partially uploaded"
 msgstr "O ficheiro so foi parcialmente enviado"
 
-#: ajax/upload.php:31
+#: ajax/upload.php:71
 msgid "No file was uploaded"
 msgstr "Non se enviou ningún ficheiro"
 
-#: ajax/upload.php:32
+#: ajax/upload.php:72
 msgid "Missing a temporary folder"
 msgstr "Falta o cartafol temporal"
 
-#: ajax/upload.php:33
+#: ajax/upload.php:73
 msgid "Failed to write to disk"
 msgstr "Produciuse un erro ao escribir no disco"
 
-#: ajax/upload.php:51
+#: ajax/upload.php:91
 msgid "Not enough storage available"
 msgstr "Non hai espazo de almacenamento abondo"
 
-#: ajax/upload.php:83
+#: ajax/upload.php:123
 msgid "Invalid directory."
 msgstr "O directorio é incorrecto."
 
@@ -75,6 +83,36 @@ msgstr "O directorio é incorrecto."
 msgid "Files"
 msgstr "Ficheiros"
 
+#: js/file-upload.js:11
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr "Non foi posíbel enviar o ficheiro pois ou é un directorio ou ten 0 bytes"
+
+#: js/file-upload.js:24
+msgid "Not enough space available"
+msgstr "O espazo dispoñíbel é insuficiente"
+
+#: js/file-upload.js:64
+msgid "Upload cancelled."
+msgstr "Envío cancelado."
+
+#: js/file-upload.js:167 js/files.js:266
+msgid ""
+"File upload is in progress. Leaving the page now will cancel the upload."
+msgstr "O envío do ficheiro está en proceso. Saír agora da páxina cancelará o envío."
+
+#: js/file-upload.js:233 js/files.js:339
+msgid "URL cannot be empty."
+msgstr "O URL non pode quedar baleiro."
+
+#: js/file-upload.js:238 lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr "Nome de cartafol incorrecto. O uso de «Compartido» e «Shared» está reservado para o ownClod"
+
+#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
+#: js/files.js:693 js/files.js:731
+msgid "Error"
+msgstr "Erro"
+
 #: js/fileactions.js:116
 msgid "Share"
 msgstr "Compartir"
@@ -91,43 +129,43 @@ msgstr "Eliminar"
 msgid "Rename"
 msgstr "Renomear"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:464
 msgid "Pending"
 msgstr "Pendentes"
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "{new_name} already exists"
 msgstr "Xa existe un {new_name}"
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "replace"
 msgstr "substituír"
 
-#: js/filelist.js:259
+#: js/filelist.js:302
 msgid "suggest name"
 msgstr "suxerir nome"
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "cancel"
 msgstr "cancelar"
 
-#: js/filelist.js:306
+#: js/filelist.js:349
 msgid "replaced {new_name} with {old_name}"
 msgstr "substituír {new_name} por {old_name}"
 
-#: js/filelist.js:306
+#: js/filelist.js:349
 msgid "undo"
 msgstr "desfacer"
 
-#: js/filelist.js:331
+#: js/filelist.js:374
 msgid "perform delete operation"
 msgstr "realizar a operación de eliminación"
 
-#: js/filelist.js:413
+#: js/filelist.js:456
 msgid "1 file uploading"
 msgstr "Enviándose 1 ficheiro"
 
-#: js/filelist.js:416 js/filelist.js:470
+#: js/filelist.js:459 js/filelist.js:517
 msgid "files uploading"
 msgstr "ficheiros enviándose"
 
@@ -159,70 +197,42 @@ msgid ""
 "big."
 msgstr "Está a prepararse a súa descarga. Isto pode levar bastante tempo se os ficheiros son grandes."
 
-#: js/files.js:264
-msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "Non foi posíbel enviar o ficheiro pois ou é un directorio ou ten 0 bytes"
-
-#: js/files.js:277
-msgid "Not enough space available"
-msgstr "O espazo dispoñíbel é insuficiente"
-
-#: js/files.js:317
-msgid "Upload cancelled."
-msgstr "Envío cancelado."
-
-#: js/files.js:413
-msgid ""
-"File upload is in progress. Leaving the page now will cancel the upload."
-msgstr "O envío do ficheiro está en proceso. Saír agora da páxina cancelará o envío."
-
-#: js/files.js:486
-msgid "URL cannot be empty."
-msgstr "O URL non pode quedar baleiro."
-
-#: js/files.js:491
+#: js/files.js:344
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Nome de cartafol incorrecto. O uso de «Shared» está reservado por Owncloud"
 
-#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
-msgid "Error"
-msgstr "Erro"
-
-#: js/files.js:877 templates/index.php:69
+#: js/files.js:744 templates/index.php:69
 msgid "Name"
 msgstr "Nome"
 
-#: js/files.js:878 templates/index.php:80
+#: js/files.js:745 templates/index.php:80
 msgid "Size"
 msgstr "Tamaño"
 
-#: js/files.js:879 templates/index.php:82
+#: js/files.js:746 templates/index.php:82
 msgid "Modified"
 msgstr "Modificado"
 
-#: js/files.js:898
+#: js/files.js:765
 msgid "1 folder"
 msgstr "1 cartafol"
 
-#: js/files.js:900
+#: js/files.js:767
 msgid "{count} folders"
 msgstr "{count} cartafoles"
 
-#: js/files.js:908
+#: js/files.js:775
 msgid "1 file"
 msgstr "1 ficheiro"
 
-#: js/files.js:910
+#: js/files.js:777
 msgid "{count} files"
 msgstr "{count} ficheiros"
 
-#: lib/app.php:53
-msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
-msgstr "Nome de cartafol incorrecto. O uso de «Compartido» e «Shared» está reservado para o ownClod"
-
 #: lib/app.php:73
-msgid "Unable to rename file"
-msgstr "Non é posíbel renomear o ficheiro"
+#, php-format
+msgid "%s could not be renamed"
+msgstr "%s non pode cambiar de nome"
 
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
@@ -318,6 +328,22 @@ msgstr "Estanse analizando os ficheiros. Agarde."
 msgid "Current scanning"
 msgstr "Análise actual"
 
+#: templates/part.list.php:76
+msgid "directory"
+msgstr "directorio"
+
+#: templates/part.list.php:78
+msgid "directories"
+msgstr "directorios"
+
+#: templates/part.list.php:87
+msgid "file"
+msgstr "ficheiro"
+
+#: templates/part.list.php:89
+msgid "files"
+msgstr "ficheiros"
+
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
 msgstr "Anovando a caché do sistema de ficheiros..."
diff --git a/l10n/gl/files_encryption.po b/l10n/gl/files_encryption.po
index 3d0bba4e8250d02856101d4833f894728f95d148..a8f83b07bb48338b344bd883f7e905e3d32538a4 100644
--- a/l10n/gl/files_encryption.po
+++ b/l10n/gl/files_encryption.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-15 01:58+0200\n"
-"PO-Revision-Date: 2013-06-14 11:54+0000\n"
+"POT-Creation-Date: 2013-07-07 01:58+0200\n"
+"PO-Revision-Date: 2013-07-06 09:11+0000\n"
 "Last-Translator: mbouzada <mbouzada@gmail.com>\n"
 "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
 "MIME-Version: 1.0\n"
@@ -58,10 +58,22 @@ msgstr "Non foi posíbel actualizar o contrasinal da chave privada. É probábel
 
 #: files/error.php:7
 msgid ""
-"Your private key is not valid! Maybe your password was changed from outside."
-" You can update your private key password in your personal settings to "
-"regain access to your files"
-msgstr "A chave privada non é correcta! É probábel que o seu contrasinal teña sido cambiado desde o exterior. Vostede pode actualizar o contrasinal da súa chave privada nos seus axustes persoais para recuperar o acceso aos seus ficheiros"
+"Your private key is not valid! Likely your password was changed outside the "
+"ownCloud system (e.g. your corporate directory). You can update your private"
+" key password in your personal settings to recover access to your encrypted "
+"files."
+msgstr "A chave privada non é correcta! É probábel que o seu contrasinal teña sido cambiado desde o exterior (p.ex. o seu directorio corporativo). Vostede pode actualizar o contrasinal da súa chave privada nos seus axustes persoais para recuperar o acceso aos seus ficheiros"
+
+#: hooks/hooks.php:44
+msgid "Missing requirements."
+msgstr "Non se cumpren os requisitos."
+
+#: hooks/hooks.php:45
+msgid ""
+"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL "
+"PHP extension is enabled and configured properly. For now, the encryption "
+"app has been disabled."
+msgstr "Asegúrese de que está instalado o  PHP 5.3.3 ou posterior e de que a extensión OpenSSL PHP estea activada e configurada correctamente. Polo de agora foi desactivado o aplicativo de cifrado."
 
 #: js/settings-admin.js:11
 msgid "Saving..."
@@ -87,12 +99,12 @@ msgstr "Cifrado"
 
 #: templates/settings-admin.php:10
 msgid ""
-"Enable encryption passwords recovery key (allow sharing to recovery key):"
-msgstr "Activar a chave  de recuperación do cifrado de contrasinais (permite compartir a chave de recuperación):"
+"Enable recovery key (allow to recover users files in case of password loss):"
+msgstr "Activar a chave de recuperación (permitirá recuperar os ficheiros dos usuarios no caso de perda do contrasinal):"
 
 #: templates/settings-admin.php:14
-msgid "Recovery account password"
-msgstr "Recuperación do contrasinal da conta"
+msgid "Recovery key password"
+msgstr "Contrasinal da chave de recuperación"
 
 #: templates/settings-admin.php:21 templates/settings-personal.php:54
 msgid "Enabled"
@@ -103,16 +115,16 @@ msgid "Disabled"
 msgstr "Desactivado"
 
 #: templates/settings-admin.php:34
-msgid "Change encryption passwords recovery key:"
-msgstr "Cambiar a chave de la recuperación do cifrado de contrasinais:"
+msgid "Change recovery key password:"
+msgstr "Cambiar o contrasinal da chave de la recuperación:"
 
 #: templates/settings-admin.php:41
-msgid "Old Recovery account password"
-msgstr "Antigo contrasinal de recuperación da conta"
+msgid "Old Recovery key password"
+msgstr "Antigo contrasinal da chave de recuperación"
 
 #: templates/settings-admin.php:48
-msgid "New Recovery account password"
-msgstr "Novo contrasinal de recuperación da conta"
+msgid "New Recovery key password"
+msgstr "Novo contrasinal da chave de recuperación"
 
 #: templates/settings-admin.php:53
 msgid "Change Password"
diff --git a/l10n/gl/files_external.po b/l10n/gl/files_external.po
index bee61bded046dcbd1503075c8b15772c2b67fc72..13c61ed0aaa7af76c3eaded972bb0433ac28510f 100644
--- a/l10n/gl/files_external.po
+++ b/l10n/gl/files_external.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/gl/files_sharing.po b/l10n/gl/files_sharing.po
index b685bae61dd38704ff8750a38a55bf3b2001a477..93317acc8a471b3394a0681c0b86477a4478ced6 100644
--- a/l10n/gl/files_sharing.po
+++ b/l10n/gl/files_sharing.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# mbouzada <mbouzada@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
+"Last-Translator: mbouzada <mbouzada@gmail.com>\n"
 "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,27 +19,39 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: templates/authenticate.php:4
+msgid "The password is wrong. Try again."
+msgstr "O contrasinal é incorrecto. Ténteo de novo."
+
+#: templates/authenticate.php:7
 msgid "Password"
 msgstr "Contrasinal"
 
-#: templates/authenticate.php:6
+#: templates/authenticate.php:9
 msgid "Submit"
 msgstr "Enviar"
 
-#: templates/public.php:10
+#: templates/public.php:17
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s compartiu o cartafol %s con vostede"
 
-#: templates/public.php:13
+#: templates/public.php:20
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s compartiu o ficheiro %s con vostede"
 
-#: templates/public.php:19 templates/public.php:43
+#: templates/public.php:28 templates/public.php:90
 msgid "Download"
 msgstr "Descargar"
 
-#: templates/public.php:40
+#: templates/public.php:45 templates/public.php:48
+msgid "Upload"
+msgstr "Enviar"
+
+#: templates/public.php:58
+msgid "Cancel upload"
+msgstr "Cancelar o envío"
+
+#: templates/public.php:87
 msgid "No preview available for"
 msgstr "Sen vista previa dispoñíbel para"
diff --git a/l10n/gl/files_trashbin.po b/l10n/gl/files_trashbin.po
index a4d9a8e87e2721074bc264db3780b33c728527c7..cafe309aaca78a7e16be912ac1402511d0bfa550 100644
--- a/l10n/gl/files_trashbin.po
+++ b/l10n/gl/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/gl/lib.po b/l10n/gl/lib.po
index 243d499047fbb36c1f7eda3f037a828a980e190c..a60067154fb10b5b57affc06c60703c754faef07 100644
--- a/l10n/gl/lib.po
+++ b/l10n/gl/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-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
-"Last-Translator: mbouzada <mbouzada@gmail.com>\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,43 +18,47 @@ msgstr ""
 "Language: gl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:359
+#: app.php:360
 msgid "Help"
 msgstr "Axuda"
 
-#: app.php:372
+#: app.php:373
 msgid "Personal"
 msgstr "Persoal"
 
-#: app.php:383
+#: app.php:384
 msgid "Settings"
 msgstr "Axustes"
 
-#: app.php:395
+#: app.php:396
 msgid "Users"
 msgstr "Usuarios"
 
-#: app.php:408
+#: app.php:409
 msgid "Apps"
 msgstr "Aplicativos"
 
-#: app.php:416
+#: app.php:417
 msgid "Admin"
 msgstr "Administración"
 
-#: files.php:210
+#: defaults.php:33
+msgid "web services under your control"
+msgstr "servizos web baixo o seu control"
+
+#: files.php:226
 msgid "ZIP download is turned off."
 msgstr "As descargas ZIP están desactivadas."
 
-#: files.php:211
+#: files.php:227
 msgid "Files need to be downloaded one by one."
 msgstr "Os ficheiros necesitan seren descargados dun en un."
 
-#: files.php:212 files.php:245
+#: files.php:228 files.php:261
 msgid "Back to Files"
 msgstr "Volver aos ficheiros"
 
-#: files.php:242
+#: files.php:258
 msgid "Selected files too large to generate zip file."
 msgstr "Os ficheiros seleccionados son demasiado grandes como para xerar un ficheiro zip."
 
@@ -86,104 +90,102 @@ msgstr "Texto"
 msgid "Images"
 msgstr "Imaxes"
 
-#: setup.php:34
-msgid "Set an admin username."
-msgstr "Estabeleza un nome de usuario administrador"
-
-#: setup.php:37
-msgid "Set an admin password."
-msgstr "Estabeleza un contrasinal de administrador"
-
-#: setup.php:55
+#: setup/abstractdatabase.php:22
 #, php-format
 msgid "%s enter the database username."
 msgstr "%s introduza o nome de usuario da base de datos"
 
-#: setup.php:58
+#: setup/abstractdatabase.php:25
 #, php-format
 msgid "%s enter the database name."
 msgstr "%s introduza o nome da base de datos"
 
-#: setup.php:61
+#: setup/abstractdatabase.php:28
 #, php-format
 msgid "%s you may not use dots in the database name"
 msgstr "%s non se poden empregar puntos na base de datos"
 
-#: setup.php:64
+#: setup/mssql.php:20
 #, php-format
-msgid "%s set the database host."
-msgstr "%s estabeleza o servidor da base de datos"
-
-#: setup.php:126 setup.php:332 setup.php:377
-msgid "PostgreSQL username and/or password not valid"
-msgstr "Nome de usuario e/ou contrasinal de PostgreSQL incorrecto"
+msgid "MS SQL username and/or password not valid: %s"
+msgstr "Nome de usuario e/ou contrasinal de MS SQL incorrecto: %s"
 
-#: setup.php:127 setup.php:235
+#: setup/mssql.php:21 setup/mysql.php:13 setup/oci.php:114
+#: setup/postgresql.php:24 setup/postgresql.php:70
 msgid "You need to enter either an existing account or the administrator."
 msgstr "Deberá introducir unha conta existente ou o administrador."
 
-#: setup.php:152
-msgid "Oracle connection could not be established"
-msgstr "Non foi posíbel estabelecer a conexión con Oracle"
-
-#: setup.php:234
+#: setup/mysql.php:12
 msgid "MySQL username and/or password not valid"
 msgstr "Nome de usuario e/ou contrasinal de MySQL incorrecto"
 
-#: setup.php:288 setup.php:398 setup.php:407 setup.php:425 setup.php:435
-#: setup.php:444 setup.php:477 setup.php:543 setup.php:569 setup.php:576
-#: setup.php:587 setup.php:594 setup.php:603 setup.php:611 setup.php:620
-#: setup.php:626
+#: setup/mysql.php:67 setup/oci.php:54 setup/oci.php:121 setup/oci.php:147
+#: setup/oci.php:154 setup/oci.php:165 setup/oci.php:172 setup/oci.php:181
+#: setup/oci.php:189 setup/oci.php:198 setup/oci.php:204
+#: setup/postgresql.php:89 setup/postgresql.php:98 setup/postgresql.php:115
+#: setup/postgresql.php:125 setup/postgresql.php:134
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr "Produciuse un erro na base de datos: «%s»"
 
-#: setup.php:289 setup.php:399 setup.php:408 setup.php:426 setup.php:436
-#: setup.php:445 setup.php:478 setup.php:544 setup.php:570 setup.php:577
-#: setup.php:588 setup.php:604 setup.php:612 setup.php:621
+#: setup/mysql.php:68 setup/oci.php:55 setup/oci.php:122 setup/oci.php:148
+#: setup/oci.php:155 setup/oci.php:166 setup/oci.php:182 setup/oci.php:190
+#: setup/oci.php:199 setup/postgresql.php:90 setup/postgresql.php:99
+#: setup/postgresql.php:116 setup/postgresql.php:126 setup/postgresql.php:135
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr "A orde ofensiva foi: «%s»"
 
-#: setup.php:305
+#: setup/mysql.php:85
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr "O usuario MySQL  '%s'@'localhost' xa existe."
 
-#: setup.php:306
+#: setup/mysql.php:86
 msgid "Drop this user from MySQL"
 msgstr "Omitir este usuario de MySQL"
 
-#: setup.php:311
+#: setup/mysql.php:91
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr "O usuario MySQL «%s»@«%%» xa existe."
 
-#: setup.php:312
+#: setup/mysql.php:92
 msgid "Drop this user from MySQL."
 msgstr "Omitir este usuario de MySQL."
 
-#: setup.php:469 setup.php:536
+#: setup/oci.php:34
+msgid "Oracle connection could not be established"
+msgstr "Non foi posíbel estabelecer a conexión con Oracle"
+
+#: setup/oci.php:41 setup/oci.php:113
 msgid "Oracle username and/or password not valid"
 msgstr "Nome de usuario e/ou contrasinal de Oracle incorrecto"
 
-#: setup.php:595 setup.php:627
+#: setup/oci.php:173 setup/oci.php:205
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr "A orde ofensiva foi: «%s», nome: %s, contrasinal: %s"
 
-#: setup.php:647
-#, php-format
-msgid "MS SQL username and/or password not valid: %s"
-msgstr "Nome de usuario e/ou contrasinal de MS SQL incorrecto: %s"
+#: setup/postgresql.php:23 setup/postgresql.php:69
+msgid "PostgreSQL username and/or password not valid"
+msgstr "Nome de usuario e/ou contrasinal de PostgreSQL incorrecto"
+
+#: setup.php:42
+msgid "Set an admin username."
+msgstr "Estabeleza un nome de usuario administrador"
+
+#: setup.php:45
+msgid "Set an admin password."
+msgstr "Estabeleza un contrasinal de administrador"
 
-#: setup.php:870
+#: setup.php:198
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "O seu servidor web non está aínda configurado adecuadamente para permitir a sincronización de ficheiros xa que semella que a interface WebDAV non está a funcionar."
 
-#: setup.php:871
+#: setup.php:199
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Volva comprobar as <a href='%s'>guías de instalación</a>"
diff --git a/l10n/gl/settings.po b/l10n/gl/settings.po
index 76b1d05278e369e084cbac667074a926205a008b..05de7b83815b3b5ae0d262d5978ca56034b8357d 100644
--- a/l10n/gl/settings.po
+++ b/l10n/gl/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: mbouzada <mbouzada@gmail.com>\n"
 "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
 "MIME-Version: 1.0\n"
@@ -89,35 +89,35 @@ msgstr "Non é posíbel eliminar o usuario do grupo %s"
 msgid "Couldn't update app."
 msgstr "Non foi posíbel actualizar o aplicativo."
 
-#: js/apps.js:30
+#: js/apps.js:35
 msgid "Update to {appversion}"
 msgstr "Actualizar á {appversion}"
 
-#: js/apps.js:36 js/apps.js:76
+#: js/apps.js:41 js/apps.js:81
 msgid "Disable"
 msgstr "Desactivar"
 
-#: js/apps.js:36 js/apps.js:64 js/apps.js:83
+#: js/apps.js:41 js/apps.js:69 js/apps.js:88
 msgid "Enable"
 msgstr "Activar"
 
-#: js/apps.js:55
+#: js/apps.js:60
 msgid "Please wait...."
 msgstr "Agarde..."
 
-#: js/apps.js:59 js/apps.js:71 js/apps.js:80 js/apps.js:93
+#: js/apps.js:64 js/apps.js:76 js/apps.js:85 js/apps.js:98
 msgid "Error"
 msgstr "Erro"
 
-#: js/apps.js:90
+#: js/apps.js:95
 msgid "Updating...."
 msgstr "Actualizando..."
 
-#: js/apps.js:93
+#: js/apps.js:98
 msgid "Error while updating app"
 msgstr "Produciuse un erro mentres actualizaba o aplicativo"
 
-#: js/apps.js:96
+#: js/apps.js:101
 msgid "Updated"
 msgstr "Actualizado"
 
@@ -166,15 +166,15 @@ msgstr "Produciuse un erro ao crear o usuario"
 msgid "A valid password must be provided"
 msgstr "Debe fornecer un contrasinal"
 
-#: personal.php:35 personal.php:36
+#: personal.php:37 personal.php:38
 msgid "__language_name__"
 msgstr "Galego"
 
-#: templates/admin.php:15
+#: templates/admin.php:17
 msgid "Security Warning"
 msgstr "Aviso de seguranza"
 
-#: templates/admin.php:18
+#: templates/admin.php:20
 msgid ""
 "Your data directory and your files are probably accessible from the "
 "internet. The .htaccess file that ownCloud provides is not working. We "
@@ -183,36 +183,36 @@ msgid ""
 " webserver document root."
 msgstr "O seu cartafol de datos e os seus ficheiros probabelmente sexan accesíbeis a través da Internet. O ficheiro .htaccess que fornece ownCloud non está a empregarse. Suxerímoslle que configure o seu servidor web de tal xeito que o cartafol de datos non estea accesíbel ou mova o cartafol de datos fora do directorio raíz de datos do servidor web."
 
-#: templates/admin.php:29
+#: templates/admin.php:31
 msgid "Setup Warning"
 msgstr "Configurar os avisos"
 
-#: templates/admin.php:32
+#: templates/admin.php:34
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "O seu servidor web non está aínda configurado adecuadamente para permitir a sincronización de ficheiros xa que semella que a interface WebDAV non está a funcionar."
 
-#: templates/admin.php:33
+#: templates/admin.php:35
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Volva comprobar as <a href='%s'>guías de instalación</a>"
 
-#: templates/admin.php:44
+#: templates/admin.php:46
 msgid "Module 'fileinfo' missing"
 msgstr "Non se atopou o módulo «fileinfo»"
 
-#: templates/admin.php:47
+#: templates/admin.php:49
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr "Non se atopou o módulo de PHP «fileinfo». É recomendábel activar este módulo para obter os mellores resultados coa detección do tipo MIME."
 
-#: templates/admin.php:58
+#: templates/admin.php:60
 msgid "Locale not working"
 msgstr "A configuración rexional non funciona"
 
-#: templates/admin.php:63
+#: templates/admin.php:65
 #, php-format
 msgid ""
 "This ownCloud server can't set system locale to %s. This means that there "
@@ -220,11 +220,11 @@ msgid ""
 " to install the required packages on your system to support %s."
 msgstr "Este servidor ownCloud non pode estabelecer a configuración rexional do sistema a %s. Isto significa que pode haber problemas con certos caracteres nos nomes de ficheiro. Recomendámoslle que inste os paquetes necesarios no sistema para aceptar o %s."
 
-#: templates/admin.php:75
+#: templates/admin.php:77
 msgid "Internet connection not working"
 msgstr "A conexión á Internet non funciona"
 
-#: templates/admin.php:78
+#: templates/admin.php:80
 msgid ""
 "This ownCloud server has no working internet connection. This means that "
 "some of the features like mounting of external storage, notifications about "
@@ -234,102 +234,102 @@ msgid ""
 " of ownCloud."
 msgstr "Este servidor ownCloud non ten conexión a Internet. Isto significa que algunhas das funcionalidades como a montaxe de almacenamento externo, as notificacións sobre actualizacións ou instalación de aplicativos de terceiros non funcionan. O acceso aos ficheiros de forma remota e o envío de mensaxes de notificación poderían non funcionar. Suxerímoslle que active a conexión a Internet deste servidor se quere dispor de todas as funcionalidades de ownCloud."
 
-#: templates/admin.php:92
+#: templates/admin.php:94
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:101
+#: templates/admin.php:103
 msgid "Execute one task with each page loaded"
 msgstr "Executar unha tarefa con cada páxina cargada"
 
-#: templates/admin.php:111
+#: templates/admin.php:113
 msgid ""
 "cron.php is registered at a webcron service. Call the cron.php page in the "
 "owncloud root once a minute over http."
 msgstr "cron.php está rexistrado nun servizo de WebCron. Chame á página cron.php na raíz ownCloud unha vez por minuto a través de HTTP."
 
-#: templates/admin.php:121
+#: templates/admin.php:123
 msgid ""
 "Use systems cron service. Call the cron.php file in the owncloud folder via "
 "a system cronjob once a minute."
 msgstr "Use o servizo de sistema cron. Chame ao ficheiro cron.php no cartafol owncloud a través dun sistema de cronjob unha vez por minuto."
 
-#: templates/admin.php:128
+#: templates/admin.php:130
 msgid "Sharing"
 msgstr "Compartindo"
 
-#: templates/admin.php:134
+#: templates/admin.php:136
 msgid "Enable Share API"
 msgstr "Activar o API para compartir"
 
-#: templates/admin.php:135
+#: templates/admin.php:137
 msgid "Allow apps to use the Share API"
 msgstr "Permitir que os aplicativos empreguen o API para compartir"
 
-#: templates/admin.php:142
+#: templates/admin.php:144
 msgid "Allow links"
 msgstr "Permitir ligazóns"
 
-#: templates/admin.php:143
+#: templates/admin.php:145
 msgid "Allow users to share items to the public with links"
 msgstr "Permitir que os usuarios compartan elementos ao público con ligazóns"
 
-#: templates/admin.php:150
+#: templates/admin.php:152
 msgid "Allow resharing"
 msgstr "Permitir compartir"
 
-#: templates/admin.php:151
+#: templates/admin.php:153
 msgid "Allow users to share items shared with them again"
 msgstr "Permitir que os usuarios compartan de novo os elementos compartidos con eles"
 
-#: templates/admin.php:158
+#: templates/admin.php:160
 msgid "Allow users to share with anyone"
 msgstr "Permitir que os usuarios compartan con calquera"
 
-#: templates/admin.php:161
+#: templates/admin.php:163
 msgid "Allow users to only share with users in their groups"
 msgstr "Permitir que os usuarios compartan só cos usuarios dos seus grupos"
 
-#: templates/admin.php:168
+#: templates/admin.php:170
 msgid "Security"
 msgstr "Seguranza"
 
-#: templates/admin.php:181
+#: templates/admin.php:183
 msgid "Enforce HTTPS"
 msgstr "Forzar HTTPS"
 
-#: templates/admin.php:182
+#: templates/admin.php:184
 msgid ""
 "Enforces the clients to connect to ownCloud via an encrypted connection."
 msgstr "Forzar que os clientes se conecten a ownCloud empregando unha conexión cifrada"
 
-#: templates/admin.php:185
+#: templates/admin.php:187
 msgid ""
 "Please connect to this ownCloud instance via HTTPS to enable or disable the "
 "SSL enforcement."
 msgstr "Conectese a esta instancia ownCloud empregando HTTPS para activar ou desactivar o forzado de SSL."
 
-#: templates/admin.php:195
+#: templates/admin.php:197
 msgid "Log"
 msgstr "Rexistro"
 
-#: templates/admin.php:196
+#: templates/admin.php:198
 msgid "Log level"
 msgstr "Nivel de rexistro"
 
-#: templates/admin.php:227
+#: templates/admin.php:229
 msgid "More"
 msgstr "Máis"
 
-#: templates/admin.php:228
+#: templates/admin.php:230
 msgid "Less"
 msgstr "Menos"
 
-#: templates/admin.php:235 templates/personal.php:116
+#: templates/admin.php:236 templates/personal.php:116
 msgid "Version"
 msgstr "Versión"
 
-#: templates/admin.php:237 templates/personal.php:119
+#: templates/admin.php:240 templates/personal.php:119
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -387,76 +387,79 @@ msgstr "Seguemento de fallos"
 msgid "Commercial Support"
 msgstr "Asistencia comercial"
 
-#: templates/personal.php:9
+#: templates/personal.php:10
 msgid "Get the apps to sync your files"
 msgstr "Obteña os aplicativos para sincronizar os seus ficheiros"
 
-#: templates/personal.php:20
+#: templates/personal.php:21
 msgid "Show First Run Wizard again"
 msgstr "Amosar o axudante da primeira execución outra vez"
 
-#: templates/personal.php:28
+#: templates/personal.php:29
 #, php-format
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "Ten en uso <strong>%s</strong> do total dispoñíbel de <strong>%s</strong>"
 
-#: templates/personal.php:40 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:41 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "Contrasinal"
 
-#: templates/personal.php:41
+#: templates/personal.php:42
 msgid "Your password was changed"
 msgstr "O seu contrasinal foi cambiado"
 
-#: templates/personal.php:42
+#: templates/personal.php:43
 msgid "Unable to change your password"
 msgstr "Non é posíbel cambiar o seu contrasinal"
 
-#: templates/personal.php:43
+#: templates/personal.php:44
 msgid "Current password"
 msgstr "Contrasinal actual"
 
-#: templates/personal.php:45
+#: templates/personal.php:46
 msgid "New password"
 msgstr "Novo contrasinal"
 
-#: templates/personal.php:47
+#: templates/personal.php:48
 msgid "Change password"
 msgstr "Cambiar o contrasinal"
 
-#: templates/personal.php:59 templates/users.php:85
+#: templates/personal.php:60 templates/users.php:85
 msgid "Display Name"
 msgstr "Amosar o nome"
 
-#: templates/personal.php:74
+#: templates/personal.php:75
 msgid "Email"
 msgstr "Correo"
 
-#: templates/personal.php:76
+#: templates/personal.php:77
 msgid "Your email address"
 msgstr "O seu enderezo de correo"
 
-#: templates/personal.php:77
+#: templates/personal.php:78
 msgid "Fill in an email address to enable password recovery"
 msgstr "Escriba un enderezo de correo para activar o contrasinal de recuperación"
 
-#: templates/personal.php:86 templates/personal.php:87
+#: templates/personal.php:87 templates/personal.php:88
 msgid "Language"
 msgstr "Idioma"
 
-#: templates/personal.php:99
+#: templates/personal.php:100
 msgid "Help translate"
 msgstr "Axude na tradución"
 
-#: templates/personal.php:105
+#: templates/personal.php:106
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:107
-msgid "Use this address to connect to your ownCloud in your file manager"
-msgstr "Utilice este enderezo para conectarse ao seu ownCloud co administrador de ficheiros"
+#: templates/personal.php:108
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
+"target=\"_blank\">access your Files via WebDAV</a>"
+msgstr "Empregue esta ligazón <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">para acceder aos sus ficheiros mediante WebDAV</a>"
 
-#: templates/users.php:21 templates/users.php:84
+#: templates/users.php:21
 msgid "Login Name"
 msgstr "Nome de acceso"
 
@@ -486,6 +489,10 @@ msgstr "Sen límites"
 msgid "Other"
 msgstr "Outro"
 
+#: templates/users.php:84
+msgid "Username"
+msgstr "Nome de usuario"
+
 #: templates/users.php:91
 msgid "Storage"
 msgstr "Almacenamento"
diff --git a/l10n/gl/user_ldap.po b/l10n/gl/user_ldap.po
index 9cb0067315edb606f64d7f874edbdaced59847d8..e7dc5eb5cd735a79422691b54ed5e79b431b83a4 100644
--- a/l10n/gl/user_ldap.po
+++ b/l10n/gl/user_ldap.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:25+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:16+0000\n"
 "Last-Translator: mbouzada <mbouzada@gmail.com>\n"
 "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/he/core.po b/l10n/he/core.po
index 4da2e8d24178a1de23ee679ab668fb46cb5c5a86..a6c1178951a7eb355a5a48bc64eb62e5b121e508 100644
--- a/l10n/he/core.po
+++ b/l10n/he/core.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:22+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:14+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
 "MIME-Version: 1.0\n"
@@ -62,135 +62,135 @@ msgstr "לא נבחרו קטגוריות למחיקה"
 msgid "Error removing %s from favorites."
 msgstr "שגיאה בהסרת %s מהמועדפים."
 
-#: js/config.php:34
+#: js/config.php:32
 msgid "Sunday"
 msgstr "יום ראשון"
 
-#: js/config.php:35
+#: js/config.php:33
 msgid "Monday"
 msgstr "יום שני"
 
-#: js/config.php:36
+#: js/config.php:34
 msgid "Tuesday"
 msgstr "יום שלישי"
 
-#: js/config.php:37
+#: js/config.php:35
 msgid "Wednesday"
 msgstr "יום רביעי"
 
-#: js/config.php:38
+#: js/config.php:36
 msgid "Thursday"
 msgstr "יום חמישי"
 
-#: js/config.php:39
+#: js/config.php:37
 msgid "Friday"
 msgstr "יום שישי"
 
-#: js/config.php:40
+#: js/config.php:38
 msgid "Saturday"
 msgstr "שבת"
 
-#: js/config.php:45
+#: js/config.php:43
 msgid "January"
 msgstr "ינואר"
 
-#: js/config.php:46
+#: js/config.php:44
 msgid "February"
 msgstr "פברואר"
 
-#: js/config.php:47
+#: js/config.php:45
 msgid "March"
 msgstr "מרץ"
 
-#: js/config.php:48
+#: js/config.php:46
 msgid "April"
 msgstr "אפריל"
 
-#: js/config.php:49
+#: js/config.php:47
 msgid "May"
 msgstr "מאי"
 
-#: js/config.php:50
+#: js/config.php:48
 msgid "June"
 msgstr "יוני"
 
-#: js/config.php:51
+#: js/config.php:49
 msgid "July"
 msgstr "יולי"
 
-#: js/config.php:52
+#: js/config.php:50
 msgid "August"
 msgstr "אוגוסט"
 
-#: js/config.php:53
+#: js/config.php:51
 msgid "September"
 msgstr "ספטמבר"
 
-#: js/config.php:54
+#: js/config.php:52
 msgid "October"
 msgstr "אוקטובר"
 
-#: js/config.php:55
+#: js/config.php:53
 msgid "November"
 msgstr "נובמבר"
 
-#: js/config.php:56
+#: js/config.php:54
 msgid "December"
 msgstr "דצמבר"
 
-#: js/js.js:286
+#: js/js.js:293
 msgid "Settings"
 msgstr "הגדרות"
 
-#: js/js.js:718
+#: js/js.js:725
 msgid "seconds ago"
 msgstr "שניות"
 
-#: js/js.js:719
+#: js/js.js:726
 msgid "1 minute ago"
 msgstr "לפני דקה אחת"
 
-#: js/js.js:720
+#: js/js.js:727
 msgid "{minutes} minutes ago"
 msgstr "לפני {minutes} דקות"
 
-#: js/js.js:721
+#: js/js.js:728
 msgid "1 hour ago"
 msgstr "לפני שעה"
 
-#: js/js.js:722
+#: js/js.js:729
 msgid "{hours} hours ago"
 msgstr "לפני {hours} שעות"
 
-#: js/js.js:723
+#: js/js.js:730
 msgid "today"
 msgstr "היום"
 
-#: js/js.js:724
+#: js/js.js:731
 msgid "yesterday"
 msgstr "אתמול"
 
-#: js/js.js:725
+#: js/js.js:732
 msgid "{days} days ago"
 msgstr "לפני {days} ימים"
 
-#: js/js.js:726
+#: js/js.js:733
 msgid "last month"
 msgstr "חודש שעבר"
 
-#: js/js.js:727
+#: js/js.js:734
 msgid "{months} months ago"
 msgstr "לפני {months} חודשים"
 
-#: js/js.js:728
+#: js/js.js:735
 msgid "months ago"
 msgstr "חודשים"
 
-#: js/js.js:729
+#: js/js.js:736
 msgid "last year"
 msgstr "שנה שעברה"
 
-#: js/js.js:730
+#: js/js.js:737
 msgid "years ago"
 msgstr "שנים"
 
@@ -226,8 +226,8 @@ msgstr "סוג הפריט לא צוין."
 #: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
 #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:577
-#: js/share.js:589
+#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:620
+#: js/share.js:632
 msgid "Error"
 msgstr "שגיאה"
 
@@ -247,7 +247,7 @@ msgstr "שותף"
 msgid "Share"
 msgstr "שתף"
 
-#: js/share.js:125 js/share.js:617
+#: js/share.js:125 js/share.js:660
 msgid "Error while sharing"
 msgstr "שגיאה במהלך השיתוף"
 
@@ -267,99 +267,103 @@ msgstr "שותף אתך ועם הקבוצה {group} שבבעלות {owner}"
 msgid "Shared with you by {owner}"
 msgstr "שותף אתך על ידי {owner}"
 
-#: js/share.js:159
+#: js/share.js:172
 msgid "Share with"
 msgstr "שיתוף עם"
 
-#: js/share.js:164
+#: js/share.js:177
 msgid "Share with link"
 msgstr "שיתוף עם קישור"
 
-#: js/share.js:167
+#: js/share.js:180
 msgid "Password protect"
 msgstr "הגנה בססמה"
 
-#: js/share.js:169 templates/installation.php:54 templates/login.php:26
+#: js/share.js:182 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "סיסמא"
 
-#: js/share.js:173
+#: js/share.js:187
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:191
 msgid "Email link to person"
 msgstr "שליחת קישור בדוא״ל למשתמש"
 
-#: js/share.js:174
+#: js/share.js:192
 msgid "Send"
 msgstr "שליחה"
 
-#: js/share.js:178
+#: js/share.js:197
 msgid "Set expiration date"
 msgstr "הגדרת תאריך תפוגה"
 
-#: js/share.js:179
+#: js/share.js:198
 msgid "Expiration date"
 msgstr "תאריך התפוגה"
 
-#: js/share.js:211
+#: js/share.js:230
 msgid "Share via email:"
 msgstr "שיתוף באמצעות דוא״ל:"
 
-#: js/share.js:213
+#: js/share.js:232
 msgid "No people found"
 msgstr "לא נמצאו אנשים"
 
-#: js/share.js:251
+#: js/share.js:270
 msgid "Resharing is not allowed"
 msgstr "אסור לעשות שיתוף מחדש"
 
-#: js/share.js:287
+#: js/share.js:306
 msgid "Shared in {item} with {user}"
 msgstr "שותף תחת {item} עם {user}"
 
-#: js/share.js:308
+#: js/share.js:327
 msgid "Unshare"
 msgstr "הסר שיתוף"
 
-#: js/share.js:320
+#: js/share.js:339
 msgid "can edit"
 msgstr "ניתן לערוך"
 
-#: js/share.js:322
+#: js/share.js:341
 msgid "access control"
 msgstr "בקרת גישה"
 
-#: js/share.js:325
+#: js/share.js:344
 msgid "create"
 msgstr "יצירה"
 
-#: js/share.js:328
+#: js/share.js:347
 msgid "update"
 msgstr "עדכון"
 
-#: js/share.js:331
+#: js/share.js:350
 msgid "delete"
 msgstr "מחיקה"
 
-#: js/share.js:334
+#: js/share.js:353
 msgid "share"
 msgstr "שיתוף"
 
-#: js/share.js:368 js/share.js:564
+#: js/share.js:387 js/share.js:607
 msgid "Password protected"
 msgstr "מוגן בססמה"
 
-#: js/share.js:577
+#: js/share.js:620
 msgid "Error unsetting expiration date"
 msgstr "אירעה שגיאה בביטול תאריך התפוגה"
 
-#: js/share.js:589
+#: js/share.js:632
 msgid "Error setting expiration date"
 msgstr "אירעה שגיאה בעת הגדרת תאריך התפוגה"
 
-#: js/share.js:604
+#: js/share.js:647
 msgid "Sending ..."
 msgstr "מתבצעת שליחה ..."
 
-#: js/share.js:615
+#: js/share.js:658
 msgid "Email sent"
 msgstr "הודעת הדוא״ל נשלחה"
 
@@ -374,7 +378,7 @@ msgstr "תהליך העדכון לא הושלם בהצלחה. נא דווח את
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "תהליך העדכון הסתיים בהצלחה. עכשיו מנתב אותך אל ownCloud."
 
-#: lostpassword/controller.php:58
+#: lostpassword/controller.php:60
 msgid "ownCloud password reset"
 msgstr "איפוס הססמה של ownCloud"
 
@@ -404,17 +408,17 @@ msgstr "שם משתמש"
 
 #: lostpassword/templates/lostpassword.php:22
 msgid ""
-"Your files seems to be encrypted. If you didn't have enabled the recovery "
-"key there will be no way to get your data back once the password was "
-"resetted. If you are not sure what to do, please contact your administrator "
-"first before continue. Do you really want to continue?"
+"Your files are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
 msgstr ""
 
 #: lostpassword/templates/lostpassword.php:24
 msgid "Yes, I really want to reset my password now"
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:29
+#: lostpassword/templates/lostpassword.php:27
 msgid "Request reset"
 msgstr "בקשת איפוס"
 
@@ -462,7 +466,7 @@ msgstr "הגישה נחסמה"
 msgid "Cloud not found"
 msgstr "ענן לא נמצא"
 
-#: templates/altmail.php:2
+#: templates/altmail.php:4
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -473,10 +477,6 @@ msgid ""
 "Cheers!"
 msgstr ""
 
-#: templates/altmail.php:7 templates/mail.php:24
-msgid "web services under your control"
-msgstr "שירותי רשת תחת השליטה שלך"
-
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
 msgstr "ערוך קטגוריות"
@@ -569,12 +569,12 @@ msgstr "שרת בסיס נתונים"
 msgid "Finish setup"
 msgstr "סיום התקנה"
 
-#: templates/layout.user.php:40
+#: templates/layout.user.php:43
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr "%s זמינה להורדה. ניתן ללחוץ כדי לקבל מידע נוסף כיצד לעדכן."
 
-#: templates/layout.user.php:67
+#: templates/layout.user.php:68
 msgid "Log out"
 msgstr "התנתקות"
 
@@ -608,7 +608,7 @@ msgstr "כניסה"
 msgid "Alternative Logins"
 msgstr "כניסות אלטרנטיביות"
 
-#: templates/mail.php:15
+#: templates/mail.php:16
 #, php-format
 msgid ""
 "Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
diff --git a/l10n/he/files.po b/l10n/he/files.po
index 18cd618e1cf2c4f44a30ba59620f5d4e9b6d87d3..88a104f8df85332df26d306ad8abe69232d436f7 100644
--- a/l10n/he/files.po
+++ b/l10n/he/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-06-17 02:01+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
-"Last-Translator: Yaron Shahrabani <sh.yaron@gmail.com>\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -28,46 +28,54 @@ msgstr "לא ניתן להעביר את %s - קובץ בשם הזה כבר קי
 msgid "Could not move %s"
 msgstr "לא ניתן להעביר את %s"
 
-#: ajax/upload.php:19
+#: ajax/upload.php:16 ajax/upload.php:45
+msgid "Unable to set upload directory."
+msgstr ""
+
+#: ajax/upload.php:22
+msgid "Invalid Token"
+msgstr ""
+
+#: ajax/upload.php:59
 msgid "No file was uploaded. Unknown error"
 msgstr "לא הועלה קובץ. טעות בלתי מזוהה."
 
-#: ajax/upload.php:26
+#: ajax/upload.php:66
 msgid "There is no error, the file uploaded with success"
 msgstr "לא התרחשה שגיאה, הקובץ הועלה בהצלחה"
 
-#: ajax/upload.php:27
+#: ajax/upload.php:67
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr "הקבצים שנשלחו חורגים מהגודל שצוין בהגדרה upload_max_filesize שבקובץ php.ini:"
 
-#: ajax/upload.php:29
+#: ajax/upload.php:69
 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:30
+#: ajax/upload.php:70
 msgid "The uploaded file was only partially uploaded"
 msgstr "הקובץ הועלה באופן חלקי בלבד"
 
-#: ajax/upload.php:31
+#: ajax/upload.php:71
 msgid "No file was uploaded"
 msgstr "שום קובץ לא הועלה"
 
-#: ajax/upload.php:32
+#: ajax/upload.php:72
 msgid "Missing a temporary folder"
 msgstr "תקיה זמנית חסרה"
 
-#: ajax/upload.php:33
+#: ajax/upload.php:73
 msgid "Failed to write to disk"
 msgstr "הכתיבה לכונן נכשלה"
 
-#: ajax/upload.php:51
+#: ajax/upload.php:91
 msgid "Not enough storage available"
 msgstr "אין די שטח פנוי באחסון"
 
-#: ajax/upload.php:83
+#: ajax/upload.php:123
 msgid "Invalid directory."
 msgstr "תיקייה שגויה."
 
@@ -75,6 +83,36 @@ msgstr "תיקייה שגויה."
 msgid "Files"
 msgstr "קבצים"
 
+#: js/file-upload.js:11
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr "לא יכול להעלות את הקובץ מכיוון שזו תקיה או שמשקל הקובץ 0 בתים"
+
+#: js/file-upload.js:24
+msgid "Not enough space available"
+msgstr ""
+
+#: js/file-upload.js:64
+msgid "Upload cancelled."
+msgstr "ההעלאה בוטלה."
+
+#: js/file-upload.js:167 js/files.js:266
+msgid ""
+"File upload is in progress. Leaving the page now will cancel the upload."
+msgstr "מתבצעת כעת העלאת קבצים. עזיבה של העמוד תבטל את ההעלאה."
+
+#: js/file-upload.js:233 js/files.js:339
+msgid "URL cannot be empty."
+msgstr "קישור אינו יכול להיות ריק."
+
+#: js/file-upload.js:238 lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr ""
+
+#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
+#: js/files.js:693 js/files.js:731
+msgid "Error"
+msgstr "שגיאה"
+
 #: js/fileactions.js:116
 msgid "Share"
 msgstr "שתף"
@@ -91,43 +129,43 @@ msgstr "מחיקה"
 msgid "Rename"
 msgstr "שינוי שם"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:464
 msgid "Pending"
 msgstr "ממתין"
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "{new_name} already exists"
 msgstr "{new_name} כבר קיים"
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "replace"
 msgstr "החלפה"
 
-#: js/filelist.js:259
+#: js/filelist.js:302
 msgid "suggest name"
 msgstr "הצעת שם"
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "cancel"
 msgstr "ביטול"
 
-#: js/filelist.js:306
+#: js/filelist.js:349
 msgid "replaced {new_name} with {old_name}"
 msgstr "{new_name} הוחלף ב־{old_name}"
 
-#: js/filelist.js:306
+#: js/filelist.js:349
 msgid "undo"
 msgstr "ביטול"
 
-#: js/filelist.js:331
+#: js/filelist.js:374
 msgid "perform delete operation"
 msgstr "ביצוע פעולת מחיקה"
 
-#: js/filelist.js:413
+#: js/filelist.js:456
 msgid "1 file uploading"
 msgstr "קובץ אחד נשלח"
 
-#: js/filelist.js:416 js/filelist.js:470
+#: js/filelist.js:459 js/filelist.js:517
 msgid "files uploading"
 msgstr "קבצים בהעלאה"
 
@@ -159,70 +197,42 @@ msgid ""
 "big."
 msgstr ""
 
-#: js/files.js:264
-msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "לא יכול להעלות את הקובץ מכיוון שזו תקיה או שמשקל הקובץ 0 בתים"
-
-#: js/files.js:277
-msgid "Not enough space available"
-msgstr ""
-
-#: js/files.js:317
-msgid "Upload cancelled."
-msgstr "ההעלאה בוטלה."
-
-#: js/files.js:413
-msgid ""
-"File upload is in progress. Leaving the page now will cancel the upload."
-msgstr "מתבצעת כעת העלאת קבצים. עזיבה של העמוד תבטל את ההעלאה."
-
-#: js/files.js:486
-msgid "URL cannot be empty."
-msgstr "קישור אינו יכול להיות ריק."
-
-#: js/files.js:491
+#: js/files.js:344
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
-msgid "Error"
-msgstr "שגיאה"
-
-#: js/files.js:877 templates/index.php:69
+#: js/files.js:744 templates/index.php:69
 msgid "Name"
 msgstr "שם"
 
-#: js/files.js:878 templates/index.php:80
+#: js/files.js:745 templates/index.php:80
 msgid "Size"
 msgstr "גודל"
 
-#: js/files.js:879 templates/index.php:82
+#: js/files.js:746 templates/index.php:82
 msgid "Modified"
 msgstr "זמן שינוי"
 
-#: js/files.js:898
+#: js/files.js:765
 msgid "1 folder"
 msgstr "תיקייה אחת"
 
-#: js/files.js:900
+#: js/files.js:767
 msgid "{count} folders"
 msgstr "{count} תיקיות"
 
-#: js/files.js:908
+#: js/files.js:775
 msgid "1 file"
 msgstr "קובץ אחד"
 
-#: js/files.js:910
+#: js/files.js:777
 msgid "{count} files"
 msgstr "{count} קבצים"
 
-#: lib/app.php:53
-msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
-msgstr ""
-
 #: lib/app.php:73
-msgid "Unable to rename file"
-msgstr "לא ניתן לשנות את שם הקובץ"
+#, php-format
+msgid "%s could not be renamed"
+msgstr ""
 
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
@@ -318,6 +328,22 @@ msgstr "הקבצים נסרקים, נא להמתין."
 msgid "Current scanning"
 msgstr "הסריקה הנוכחית"
 
+#: templates/part.list.php:76
+msgid "directory"
+msgstr ""
+
+#: templates/part.list.php:78
+msgid "directories"
+msgstr ""
+
+#: templates/part.list.php:87
+msgid "file"
+msgstr "קובץ"
+
+#: templates/part.list.php:89
+msgid "files"
+msgstr "קבצים"
+
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
 msgstr ""
diff --git a/l10n/he/files_encryption.po b/l10n/he/files_encryption.po
index 6cf193359f1f3bf67aae163fa610ca8a4f93f366..8b805ef221a9969f9dbec9f6736279a3a7c9a7cf 100644
--- a/l10n/he/files_encryption.po
+++ b/l10n/he/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-14 02:46+0200\n"
-"PO-Revision-Date: 2013-06-14 00:47+0000\n"
+"POT-Creation-Date: 2013-07-05 02:12+0200\n"
+"PO-Revision-Date: 2013-07-05 00:13+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"
@@ -55,9 +55,21 @@ msgstr ""
 
 #: files/error.php:7
 msgid ""
-"Your private key is not valid! Maybe your password was changed from outside."
-" You can update your private key password in your personal settings to "
-"regain access to your files"
+"Your private key is not valid! Likely your password was changed outside the "
+"ownCloud system (e.g. your corporate directory). You can update your private"
+" key password in your personal settings to recover access to your encrypted "
+"files."
+msgstr ""
+
+#: hooks/hooks.php:44
+msgid "Missing requirements."
+msgstr ""
+
+#: hooks/hooks.php:45
+msgid ""
+"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL "
+"PHP extension is enabled and configured properly. For now, the encryption "
+"app has been disabled."
 msgstr ""
 
 #: js/settings-admin.js:11
@@ -84,11 +96,11 @@ msgstr "הצפנה"
 
 #: templates/settings-admin.php:10
 msgid ""
-"Enable encryption passwords recovery key (allow sharing to recovery key):"
+"Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
 #: templates/settings-admin.php:14
-msgid "Recovery account password"
+msgid "Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:21 templates/settings-personal.php:54
@@ -100,15 +112,15 @@ msgid "Disabled"
 msgstr ""
 
 #: templates/settings-admin.php:34
-msgid "Change encryption passwords recovery key:"
+msgid "Change recovery key password:"
 msgstr ""
 
 #: templates/settings-admin.php:41
-msgid "Old Recovery account password"
+msgid "Old Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:48
-msgid "New Recovery account password"
+msgid "New Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:53
diff --git a/l10n/he/files_external.po b/l10n/he/files_external.po
index 8e5767e3f6c00b397efffca1a16446750682f869..490dc94dbec53002554ea79304ed146a628fc64a 100644
--- a/l10n/he/files_external.po
+++ b/l10n/he/files_external.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/he/files_sharing.po b/l10n/he/files_sharing.po
index 9b6989e0afe2026c2ddcdca257843630677f4c50..dad4b9f31000b374b301a5ec5383fea8403fe5b4 100644
--- a/l10n/he/files_sharing.po
+++ b/l10n/he/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
 "MIME-Version: 1.0\n"
@@ -18,27 +18,39 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: templates/authenticate.php:4
+msgid "The password is wrong. Try again."
+msgstr ""
+
+#: templates/authenticate.php:7
 msgid "Password"
 msgstr "סיסמא"
 
-#: templates/authenticate.php:6
+#: templates/authenticate.php:9
 msgid "Submit"
 msgstr "שליחה"
 
-#: templates/public.php:10
+#: templates/public.php:17
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s שיתף עמך את התיקייה %s"
 
-#: templates/public.php:13
+#: templates/public.php:20
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s שיתף עמך את הקובץ %s"
 
-#: templates/public.php:19 templates/public.php:43
+#: templates/public.php:28 templates/public.php:90
 msgid "Download"
 msgstr "הורדה"
 
-#: templates/public.php:40
+#: templates/public.php:45 templates/public.php:48
+msgid "Upload"
+msgstr "העלאה"
+
+#: templates/public.php:58
+msgid "Cancel upload"
+msgstr "ביטול ההעלאה"
+
+#: templates/public.php:87
 msgid "No preview available for"
 msgstr "אין תצוגה מקדימה זמינה עבור"
diff --git a/l10n/he/files_trashbin.po b/l10n/he/files_trashbin.po
index 21283f342211fc5ff8a2396a72383f1f7b6756d9..7d901bf28ba17fab6a632a30c1c97ed38db95c93 100644
--- a/l10n/he/files_trashbin.po
+++ b/l10n/he/files_trashbin.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:16+0000\n"
 "Last-Translator: Yaron Shahrabani <sh.yaron@gmail.com>\n"
 "Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/he/lib.po b/l10n/he/lib.po
index e01197a81e41dc0aac1a5245b3dd1a1379fb5e51..cc98f2af55ff4767c85cde1deb4589e78329b176 100644
--- a/l10n/he/lib.po
+++ b/l10n/he/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
 "MIME-Version: 1.0\n"
@@ -17,43 +17,47 @@ msgstr ""
 "Language: he\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:359
+#: app.php:360
 msgid "Help"
 msgstr "עזרה"
 
-#: app.php:372
+#: app.php:373
 msgid "Personal"
 msgstr "אישי"
 
-#: app.php:383
+#: app.php:384
 msgid "Settings"
 msgstr "הגדרות"
 
-#: app.php:395
+#: app.php:396
 msgid "Users"
 msgstr "משתמשים"
 
-#: app.php:408
+#: app.php:409
 msgid "Apps"
 msgstr "יישומים"
 
-#: app.php:416
+#: app.php:417
 msgid "Admin"
 msgstr "מנהל"
 
-#: files.php:210
+#: defaults.php:33
+msgid "web services under your control"
+msgstr "שירותי רשת תחת השליטה שלך"
+
+#: files.php:226
 msgid "ZIP download is turned off."
 msgstr "הורדת ZIP כבויה"
 
-#: files.php:211
+#: files.php:227
 msgid "Files need to be downloaded one by one."
 msgstr "יש להוריד את הקבצים אחד אחרי השני."
 
-#: files.php:212 files.php:245
+#: files.php:228 files.php:261
 msgid "Back to Files"
 msgstr "חזרה לקבצים"
 
-#: files.php:242
+#: files.php:258
 msgid "Selected files too large to generate zip file."
 msgstr "הקבצים הנבחרים גדולים מידי ליצירת קובץ zip."
 
@@ -85,104 +89,102 @@ msgstr "טקסט"
 msgid "Images"
 msgstr "תמונות"
 
-#: setup.php:34
-msgid "Set an admin username."
-msgstr ""
-
-#: setup.php:37
-msgid "Set an admin password."
-msgstr ""
-
-#: setup.php:55
+#: setup/abstractdatabase.php:22
 #, php-format
 msgid "%s enter the database username."
 msgstr ""
 
-#: setup.php:58
+#: setup/abstractdatabase.php:25
 #, php-format
 msgid "%s enter the database name."
 msgstr ""
 
-#: setup.php:61
+#: setup/abstractdatabase.php:28
 #, php-format
 msgid "%s you may not use dots in the database name"
 msgstr ""
 
-#: setup.php:64
+#: setup/mssql.php:20
 #, php-format
-msgid "%s set the database host."
-msgstr ""
-
-#: setup.php:126 setup.php:332 setup.php:377
-msgid "PostgreSQL username and/or password not valid"
+msgid "MS SQL username and/or password not valid: %s"
 msgstr ""
 
-#: setup.php:127 setup.php:235
+#: setup/mssql.php:21 setup/mysql.php:13 setup/oci.php:114
+#: setup/postgresql.php:24 setup/postgresql.php:70
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:152
-msgid "Oracle connection could not be established"
-msgstr ""
-
-#: setup.php:234
+#: setup/mysql.php:12
 msgid "MySQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:288 setup.php:398 setup.php:407 setup.php:425 setup.php:435
-#: setup.php:444 setup.php:477 setup.php:543 setup.php:569 setup.php:576
-#: setup.php:587 setup.php:594 setup.php:603 setup.php:611 setup.php:620
-#: setup.php:626
+#: setup/mysql.php:67 setup/oci.php:54 setup/oci.php:121 setup/oci.php:147
+#: setup/oci.php:154 setup/oci.php:165 setup/oci.php:172 setup/oci.php:181
+#: setup/oci.php:189 setup/oci.php:198 setup/oci.php:204
+#: setup/postgresql.php:89 setup/postgresql.php:98 setup/postgresql.php:115
+#: setup/postgresql.php:125 setup/postgresql.php:134
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr ""
 
-#: setup.php:289 setup.php:399 setup.php:408 setup.php:426 setup.php:436
-#: setup.php:445 setup.php:478 setup.php:544 setup.php:570 setup.php:577
-#: setup.php:588 setup.php:604 setup.php:612 setup.php:621
+#: setup/mysql.php:68 setup/oci.php:55 setup/oci.php:122 setup/oci.php:148
+#: setup/oci.php:155 setup/oci.php:166 setup/oci.php:182 setup/oci.php:190
+#: setup/oci.php:199 setup/postgresql.php:90 setup/postgresql.php:99
+#: setup/postgresql.php:116 setup/postgresql.php:126 setup/postgresql.php:135
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:305
+#: setup/mysql.php:85
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:306
+#: setup/mysql.php:86
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:311
+#: setup/mysql.php:91
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:312
+#: setup/mysql.php:92
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:469 setup.php:536
+#: setup/oci.php:34
+msgid "Oracle connection could not be established"
+msgstr ""
+
+#: setup/oci.php:41 setup/oci.php:113
 msgid "Oracle username and/or password not valid"
 msgstr ""
 
-#: setup.php:595 setup.php:627
+#: setup/oci.php:173 setup/oci.php:205
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:647
-#, php-format
-msgid "MS SQL username and/or password not valid: %s"
+#: setup/postgresql.php:23 setup/postgresql.php:69
+msgid "PostgreSQL username and/or password not valid"
+msgstr ""
+
+#: setup.php:42
+msgid "Set an admin username."
+msgstr ""
+
+#: setup.php:45
+msgid "Set an admin password."
 msgstr ""
 
-#: setup.php:870
+#: setup.php:198
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "שרת האינטרנט שלך אינו מוגדר לצורכי סנכרון קבצים עדיין כיוון שמנשק ה־WebDAV כנראה אינו תקין."
 
-#: setup.php:871
+#: setup.php:199
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "נא לעיין שוב ב<a href='%s'>מדריכי ההתקנה</a>."
diff --git a/l10n/he/settings.po b/l10n/he/settings.po
index 0c4f82a99b35c8cf6676bb48d763190a19d05234..deeea7bf3de0b9a06b497de3f847279fa252f2b5 100644
--- a/l10n/he/settings.po
+++ b/l10n/he/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
 "MIME-Version: 1.0\n"
@@ -89,35 +89,35 @@ msgstr "לא ניתן להסיר משתמש מהקבוצה %s"
 msgid "Couldn't update app."
 msgstr "לא ניתן לעדכן את היישום."
 
-#: js/apps.js:30
+#: js/apps.js:35
 msgid "Update to {appversion}"
 msgstr "עדכון לגרסה {appversion}"
 
-#: js/apps.js:36 js/apps.js:76
+#: js/apps.js:41 js/apps.js:81
 msgid "Disable"
 msgstr "בטל"
 
-#: js/apps.js:36 js/apps.js:64 js/apps.js:83
+#: js/apps.js:41 js/apps.js:69 js/apps.js:88
 msgid "Enable"
 msgstr "הפעלה"
 
-#: js/apps.js:55
+#: js/apps.js:60
 msgid "Please wait...."
 msgstr "נא להמתין…"
 
-#: js/apps.js:59 js/apps.js:71 js/apps.js:80 js/apps.js:93
+#: js/apps.js:64 js/apps.js:76 js/apps.js:85 js/apps.js:98
 msgid "Error"
 msgstr "שגיאה"
 
-#: js/apps.js:90
+#: js/apps.js:95
 msgid "Updating...."
 msgstr "מתבצע עדכון…"
 
-#: js/apps.js:93
+#: js/apps.js:98
 msgid "Error while updating app"
 msgstr "אירעה שגיאה בעת עדכון היישום"
 
-#: js/apps.js:96
+#: js/apps.js:101
 msgid "Updated"
 msgstr "מעודכן"
 
@@ -166,15 +166,15 @@ msgstr "יצירת המשתמש נכשלה"
 msgid "A valid password must be provided"
 msgstr "יש לספק ססמה תקנית"
 
-#: personal.php:35 personal.php:36
+#: personal.php:37 personal.php:38
 msgid "__language_name__"
 msgstr "עברית"
 
-#: templates/admin.php:15
+#: templates/admin.php:17
 msgid "Security Warning"
 msgstr "אזהרת אבטחה"
 
-#: templates/admin.php:18
+#: templates/admin.php:20
 msgid ""
 "Your data directory and your files are probably accessible from the "
 "internet. The .htaccess file that ownCloud provides is not working. We "
@@ -183,36 +183,36 @@ msgid ""
 " webserver document root."
 msgstr "יתכן שתיקיית הנתונים והקבצים שלך נגישים דרך האינטרנט. קובץ ה־‎.htaccess שמסופק על ידי ownCloud כנראה אינו עובד. אנו ממליצים בחום להגדיר את שרת האינטרנט שלך בדרך שבה תיקיית הנתונים לא תהיה זמינה עוד או להעביר את תיקיית הנתונים מחוץ לספריית העל של שרת האינטרנט."
 
-#: templates/admin.php:29
+#: templates/admin.php:31
 msgid "Setup Warning"
 msgstr "שגיאת הגדרה"
 
-#: templates/admin.php:32
+#: templates/admin.php:34
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "שרת האינטרנט שלך אינו מוגדר לצורכי סנכרון קבצים עדיין כיוון שמנשק ה־WebDAV כנראה אינו תקין."
 
-#: templates/admin.php:33
+#: templates/admin.php:35
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "נא לעיין שוב ב<a href='%s'>מדריכי ההתקנה</a>."
 
-#: templates/admin.php:44
+#: templates/admin.php:46
 msgid "Module 'fileinfo' missing"
 msgstr "המודול „fileinfo“ חסר"
 
-#: templates/admin.php:47
+#: templates/admin.php:49
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr ""
 
-#: templates/admin.php:58
+#: templates/admin.php:60
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:63
+#: templates/admin.php:65
 #, php-format
 msgid ""
 "This ownCloud server can't set system locale to %s. This means that there "
@@ -220,11 +220,11 @@ msgid ""
 " to install the required packages on your system to support %s."
 msgstr ""
 
-#: templates/admin.php:75
+#: templates/admin.php:77
 msgid "Internet connection not working"
 msgstr "החיבור לאינטרנט אינו פעיל"
 
-#: templates/admin.php:78
+#: templates/admin.php:80
 msgid ""
 "This ownCloud server has no working internet connection. This means that "
 "some of the features like mounting of external storage, notifications about "
@@ -234,102 +234,102 @@ msgid ""
 " of ownCloud."
 msgstr ""
 
-#: templates/admin.php:92
+#: templates/admin.php:94
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:101
+#: templates/admin.php:103
 msgid "Execute one task with each page loaded"
 msgstr "יש להפעיל משימה אחת עם כל עמוד שנטען"
 
-#: templates/admin.php:111
+#: templates/admin.php:113
 msgid ""
 "cron.php is registered at a webcron service. Call the cron.php page in the "
 "owncloud root once a minute over http."
 msgstr ""
 
-#: templates/admin.php:121
+#: templates/admin.php:123
 msgid ""
 "Use systems cron service. Call the cron.php file in the owncloud folder via "
 "a system cronjob once a minute."
 msgstr ""
 
-#: templates/admin.php:128
+#: templates/admin.php:130
 msgid "Sharing"
 msgstr "שיתוף"
 
-#: templates/admin.php:134
+#: templates/admin.php:136
 msgid "Enable Share API"
 msgstr "הפעלת API השיתוף"
 
-#: templates/admin.php:135
+#: templates/admin.php:137
 msgid "Allow apps to use the Share API"
 msgstr "לאפשר ליישום להשתמש ב־API השיתוף"
 
-#: templates/admin.php:142
+#: templates/admin.php:144
 msgid "Allow links"
 msgstr "לאפשר קישורים"
 
-#: templates/admin.php:143
+#: templates/admin.php:145
 msgid "Allow users to share items to the public with links"
 msgstr "לאפשר למשתמשים לשתף פריטים "
 
-#: templates/admin.php:150
+#: templates/admin.php:152
 msgid "Allow resharing"
 msgstr "לאפשר שיתוף מחדש"
 
-#: templates/admin.php:151
+#: templates/admin.php:153
 msgid "Allow users to share items shared with them again"
 msgstr "לאפשר למשתמשים לשתף הלאה פריטים ששותפו אתם"
 
-#: templates/admin.php:158
+#: templates/admin.php:160
 msgid "Allow users to share with anyone"
 msgstr "לאפשר למשתמשים לשתף עם כל אחד"
 
-#: templates/admin.php:161
+#: templates/admin.php:163
 msgid "Allow users to only share with users in their groups"
 msgstr "לאפשר למשתמשים לשתף עם משתמשים בקבוצות שלהם בלבד"
 
-#: templates/admin.php:168
+#: templates/admin.php:170
 msgid "Security"
 msgstr "אבטחה"
 
-#: templates/admin.php:181
+#: templates/admin.php:183
 msgid "Enforce HTTPS"
 msgstr "לאלץ HTTPS"
 
-#: templates/admin.php:182
+#: templates/admin.php:184
 msgid ""
 "Enforces the clients to connect to ownCloud via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:185
+#: templates/admin.php:187
 msgid ""
 "Please connect to this ownCloud instance via HTTPS to enable or disable the "
 "SSL enforcement."
 msgstr ""
 
-#: templates/admin.php:195
+#: templates/admin.php:197
 msgid "Log"
 msgstr "יומן"
 
-#: templates/admin.php:196
+#: templates/admin.php:198
 msgid "Log level"
 msgstr "רמת הדיווח"
 
-#: templates/admin.php:227
+#: templates/admin.php:229
 msgid "More"
 msgstr "יותר"
 
-#: templates/admin.php:228
+#: templates/admin.php:230
 msgid "Less"
 msgstr "פחות"
 
-#: templates/admin.php:235 templates/personal.php:116
+#: templates/admin.php:236 templates/personal.php:116
 msgid "Version"
 msgstr "גרסא"
 
-#: templates/admin.php:237 templates/personal.php:119
+#: templates/admin.php:240 templates/personal.php:119
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -387,76 +387,79 @@ msgstr "עוקב תקלות"
 msgid "Commercial Support"
 msgstr "תמיכה בתשלום"
 
-#: templates/personal.php:9
+#: templates/personal.php:10
 msgid "Get the apps to sync your files"
 msgstr "השג את האפליקציות על מנת לסנכרן את הקבצים שלך"
 
-#: templates/personal.php:20
+#: templates/personal.php:21
 msgid "Show First Run Wizard again"
 msgstr "הצגת אשף ההפעלה הראשונית שוב"
 
-#: templates/personal.php:28
+#: templates/personal.php:29
 #, php-format
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "השתמשת ב־<strong>%s</strong> מתוך <strong>%s</strong> הזמינים לך"
 
-#: templates/personal.php:40 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:41 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "סיסמא"
 
-#: templates/personal.php:41
+#: templates/personal.php:42
 msgid "Your password was changed"
 msgstr "הססמה שלך הוחלפה"
 
-#: templates/personal.php:42
+#: templates/personal.php:43
 msgid "Unable to change your password"
 msgstr "לא ניתן לשנות את הססמה שלך"
 
-#: templates/personal.php:43
+#: templates/personal.php:44
 msgid "Current password"
 msgstr "ססמה נוכחית"
 
-#: templates/personal.php:45
+#: templates/personal.php:46
 msgid "New password"
 msgstr "ססמה חדשה"
 
-#: templates/personal.php:47
+#: templates/personal.php:48
 msgid "Change password"
 msgstr "שינוי ססמה"
 
-#: templates/personal.php:59 templates/users.php:85
+#: templates/personal.php:60 templates/users.php:85
 msgid "Display Name"
 msgstr "שם תצוגה"
 
-#: templates/personal.php:74
+#: templates/personal.php:75
 msgid "Email"
 msgstr "דואר אלקטרוני"
 
-#: templates/personal.php:76
+#: templates/personal.php:77
 msgid "Your email address"
 msgstr "כתובת הדוא״ל שלך"
 
-#: templates/personal.php:77
+#: templates/personal.php:78
 msgid "Fill in an email address to enable password recovery"
 msgstr "נא למלא את כתובת הדוא״ל שלך כדי לאפשר שחזור ססמה"
 
-#: templates/personal.php:86 templates/personal.php:87
+#: templates/personal.php:87 templates/personal.php:88
 msgid "Language"
 msgstr "פה"
 
-#: templates/personal.php:99
+#: templates/personal.php:100
 msgid "Help translate"
 msgstr "עזרה בתרגום"
 
-#: templates/personal.php:105
+#: templates/personal.php:106
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:107
-msgid "Use this address to connect to your ownCloud in your file manager"
-msgstr "השתמש בכתובת זאת על מנת להתחבר אל ownCloud דרך סייר קבצים."
+#: templates/personal.php:108
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
+"target=\"_blank\">access your Files via WebDAV</a>"
+msgstr ""
 
-#: templates/users.php:21 templates/users.php:84
+#: templates/users.php:21
 msgid "Login Name"
 msgstr "שם כניסה"
 
@@ -486,6 +489,10 @@ msgstr "ללא הגבלה"
 msgid "Other"
 msgstr "אחר"
 
+#: templates/users.php:84
+msgid "Username"
+msgstr "שם משתמש"
+
 #: templates/users.php:91
 msgid "Storage"
 msgstr "אחסון"
diff --git a/l10n/he/user_ldap.po b/l10n/he/user_ldap.po
index 97bcdfc102f8264b79bd29c7bbbea0a7a3e56ebd..f91992a70bfe25792d0f5ba744b5f9676db668ec 100644
--- a/l10n/he/user_ldap.po
+++ b/l10n/he/user_ldap.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:25+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:16+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/hi/core.po b/l10n/hi/core.po
index 73d0d4abf42136dcbb59c279c6868822d3c49c2c..7aefc75f88c337a94e480db93a8e585fa996a0db 100644
--- a/l10n/hi/core.po
+++ b/l10n/hi/core.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:22+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:14+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
 "MIME-Version: 1.0\n"
@@ -62,135 +62,135 @@ msgstr ""
 msgid "Error removing %s from favorites."
 msgstr ""
 
-#: js/config.php:34
+#: js/config.php:32
 msgid "Sunday"
 msgstr ""
 
-#: js/config.php:35
+#: js/config.php:33
 msgid "Monday"
 msgstr ""
 
-#: js/config.php:36
+#: js/config.php:34
 msgid "Tuesday"
 msgstr ""
 
-#: js/config.php:37
+#: js/config.php:35
 msgid "Wednesday"
 msgstr ""
 
-#: js/config.php:38
+#: js/config.php:36
 msgid "Thursday"
 msgstr ""
 
-#: js/config.php:39
+#: js/config.php:37
 msgid "Friday"
 msgstr ""
 
-#: js/config.php:40
+#: js/config.php:38
 msgid "Saturday"
 msgstr ""
 
-#: js/config.php:45
+#: js/config.php:43
 msgid "January"
 msgstr "जनवरी"
 
-#: js/config.php:46
+#: js/config.php:44
 msgid "February"
 msgstr "फरवरी"
 
-#: js/config.php:47
+#: js/config.php:45
 msgid "March"
 msgstr "मार्च"
 
-#: js/config.php:48
+#: js/config.php:46
 msgid "April"
 msgstr "अप्रैल"
 
-#: js/config.php:49
+#: js/config.php:47
 msgid "May"
 msgstr "मई"
 
-#: js/config.php:50
+#: js/config.php:48
 msgid "June"
 msgstr "जून"
 
-#: js/config.php:51
+#: js/config.php:49
 msgid "July"
 msgstr "जुलाई"
 
-#: js/config.php:52
+#: js/config.php:50
 msgid "August"
 msgstr "अगस्त"
 
-#: js/config.php:53
+#: js/config.php:51
 msgid "September"
 msgstr "सितम्बर"
 
-#: js/config.php:54
+#: js/config.php:52
 msgid "October"
 msgstr "अक्टूबर"
 
-#: js/config.php:55
+#: js/config.php:53
 msgid "November"
 msgstr "नवंबर"
 
-#: js/config.php:56
+#: js/config.php:54
 msgid "December"
 msgstr "दिसम्बर"
 
-#: js/js.js:286
+#: js/js.js:293
 msgid "Settings"
 msgstr "सेटिंग्स"
 
-#: js/js.js:718
+#: js/js.js:725
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:719
+#: js/js.js:726
 msgid "1 minute ago"
 msgstr ""
 
-#: js/js.js:720
+#: js/js.js:727
 msgid "{minutes} minutes ago"
 msgstr ""
 
-#: js/js.js:721
+#: js/js.js:728
 msgid "1 hour ago"
 msgstr ""
 
-#: js/js.js:722
+#: js/js.js:729
 msgid "{hours} hours ago"
 msgstr ""
 
-#: js/js.js:723
+#: js/js.js:730
 msgid "today"
 msgstr ""
 
-#: js/js.js:724
+#: js/js.js:731
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:725
+#: js/js.js:732
 msgid "{days} days ago"
 msgstr ""
 
-#: js/js.js:726
+#: js/js.js:733
 msgid "last month"
 msgstr ""
 
-#: js/js.js:727
+#: js/js.js:734
 msgid "{months} months ago"
 msgstr ""
 
-#: js/js.js:728
+#: js/js.js:735
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:729
+#: js/js.js:736
 msgid "last year"
 msgstr ""
 
-#: js/js.js:730
+#: js/js.js:737
 msgid "years ago"
 msgstr ""
 
@@ -226,10 +226,10 @@ msgstr ""
 #: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
 #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:577
-#: js/share.js:589
+#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:620
+#: js/share.js:632
 msgid "Error"
-msgstr ""
+msgstr "त्रुटि"
 
 #: js/oc-vcategories.js:179
 msgid "The app name is not specified."
@@ -247,7 +247,7 @@ msgstr ""
 msgid "Share"
 msgstr "साझा करें"
 
-#: js/share.js:125 js/share.js:617
+#: js/share.js:125 js/share.js:660
 msgid "Error while sharing"
 msgstr ""
 
@@ -267,99 +267,103 @@ msgstr ""
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:159
+#: js/share.js:172
 msgid "Share with"
 msgstr "के साथ साझा"
 
-#: js/share.js:164
+#: js/share.js:177
 msgid "Share with link"
 msgstr ""
 
-#: js/share.js:167
+#: js/share.js:180
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:169 templates/installation.php:54 templates/login.php:26
+#: js/share.js:182 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "पासवर्ड"
 
-#: js/share.js:173
+#: js/share.js:187
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:191
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:174
+#: js/share.js:192
 msgid "Send"
 msgstr ""
 
-#: js/share.js:178
+#: js/share.js:197
 msgid "Set expiration date"
 msgstr ""
 
-#: js/share.js:179
+#: js/share.js:198
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:211
+#: js/share.js:230
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:213
+#: js/share.js:232
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:251
+#: js/share.js:270
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:287
+#: js/share.js:306
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:308
+#: js/share.js:327
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:320
+#: js/share.js:339
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:322
+#: js/share.js:341
 msgid "access control"
 msgstr ""
 
-#: js/share.js:325
+#: js/share.js:344
 msgid "create"
 msgstr ""
 
-#: js/share.js:328
+#: js/share.js:347
 msgid "update"
 msgstr ""
 
-#: js/share.js:331
+#: js/share.js:350
 msgid "delete"
 msgstr ""
 
-#: js/share.js:334
+#: js/share.js:353
 msgid "share"
 msgstr ""
 
-#: js/share.js:368 js/share.js:564
+#: js/share.js:387 js/share.js:607
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:577
+#: js/share.js:620
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:589
+#: js/share.js:632
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:604
+#: js/share.js:647
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:615
+#: js/share.js:658
 msgid "Email sent"
 msgstr ""
 
@@ -374,7 +378,7 @@ msgstr ""
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
-#: lostpassword/controller.php:58
+#: lostpassword/controller.php:60
 msgid "ownCloud password reset"
 msgstr ""
 
@@ -404,17 +408,17 @@ msgstr "प्रयोक्ता का नाम"
 
 #: lostpassword/templates/lostpassword.php:22
 msgid ""
-"Your files seems to be encrypted. If you didn't have enabled the recovery "
-"key there will be no way to get your data back once the password was "
-"resetted. If you are not sure what to do, please contact your administrator "
-"first before continue. Do you really want to continue?"
+"Your files are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
 msgstr ""
 
 #: lostpassword/templates/lostpassword.php:24
 msgid "Yes, I really want to reset my password now"
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:29
+#: lostpassword/templates/lostpassword.php:27
 msgid "Request reset"
 msgstr ""
 
@@ -462,7 +466,7 @@ msgstr ""
 msgid "Cloud not found"
 msgstr "क्लौड नहीं मिला "
 
-#: templates/altmail.php:2
+#: templates/altmail.php:4
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -473,10 +477,6 @@ msgid ""
 "Cheers!"
 msgstr ""
 
-#: templates/altmail.php:7 templates/mail.php:24
-msgid "web services under your control"
-msgstr ""
-
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
 msgstr ""
@@ -569,12 +569,12 @@ msgstr ""
 msgid "Finish setup"
 msgstr "सेटअप समाप्त करे"
 
-#: templates/layout.user.php:40
+#: templates/layout.user.php:43
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:67
+#: templates/layout.user.php:68
 msgid "Log out"
 msgstr "लोग  आउट"
 
@@ -608,7 +608,7 @@ msgstr ""
 msgid "Alternative Logins"
 msgstr ""
 
-#: templates/mail.php:15
+#: templates/mail.php:16
 #, php-format
 msgid ""
 "Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
diff --git a/l10n/hi/files.po b/l10n/hi/files.po
index c350a08e026779eb3e9107943a2970ae7477cf38..3fcffdd4db0191b211e4ad456734a95bc82b9588 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-06-17 02:01+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
 "MIME-Version: 1.0\n"
@@ -27,46 +27,54 @@ msgstr ""
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/upload.php:19
+#: ajax/upload.php:16 ajax/upload.php:45
+msgid "Unable to set upload directory."
+msgstr ""
+
+#: ajax/upload.php:22
+msgid "Invalid Token"
+msgstr ""
+
+#: ajax/upload.php:59
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: ajax/upload.php:26
+#: ajax/upload.php:66
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/upload.php:27
+#: ajax/upload.php:67
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:29
+#: ajax/upload.php:69
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/upload.php:30
+#: ajax/upload.php:70
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/upload.php:31
+#: ajax/upload.php:71
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/upload.php:32
+#: ajax/upload.php:72
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/upload.php:33
+#: ajax/upload.php:73
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:51
+#: ajax/upload.php:91
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:83
+#: ajax/upload.php:123
 msgid "Invalid directory."
 msgstr ""
 
@@ -74,6 +82,36 @@ msgstr ""
 msgid "Files"
 msgstr ""
 
+#: js/file-upload.js:11
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/file-upload.js:24
+msgid "Not enough space available"
+msgstr ""
+
+#: js/file-upload.js:64
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/file-upload.js:167 js/files.js:266
+msgid ""
+"File upload is in progress. Leaving the page now will cancel the upload."
+msgstr ""
+
+#: js/file-upload.js:233 js/files.js:339
+msgid "URL cannot be empty."
+msgstr ""
+
+#: js/file-upload.js:238 lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr ""
+
+#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
+#: js/files.js:693 js/files.js:731
+msgid "Error"
+msgstr "त्रुटि"
+
 #: js/fileactions.js:116
 msgid "Share"
 msgstr "साझा करें"
@@ -90,43 +128,43 @@ msgstr ""
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:464
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:259
+#: js/filelist.js:302
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:306
+#: js/filelist.js:349
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:306
+#: js/filelist.js:349
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:331
+#: js/filelist.js:374
 msgid "perform delete operation"
 msgstr ""
 
-#: js/filelist.js:413
+#: js/filelist.js:456
 msgid "1 file uploading"
 msgstr ""
 
-#: js/filelist.js:416 js/filelist.js:470
+#: js/filelist.js:459 js/filelist.js:517
 msgid "files uploading"
 msgstr ""
 
@@ -158,69 +196,41 @@ msgid ""
 "big."
 msgstr ""
 
-#: js/files.js:264
-msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr ""
-
-#: js/files.js:277
-msgid "Not enough space available"
-msgstr ""
-
-#: js/files.js:317
-msgid "Upload cancelled."
-msgstr ""
-
-#: js/files.js:413
-msgid ""
-"File upload is in progress. Leaving the page now will cancel the upload."
-msgstr ""
-
-#: js/files.js:486
-msgid "URL cannot be empty."
-msgstr ""
-
-#: js/files.js:491
+#: js/files.js:344
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
-msgid "Error"
-msgstr ""
-
-#: js/files.js:877 templates/index.php:69
+#: js/files.js:744 templates/index.php:69
 msgid "Name"
 msgstr ""
 
-#: js/files.js:878 templates/index.php:80
+#: js/files.js:745 templates/index.php:80
 msgid "Size"
 msgstr ""
 
-#: js/files.js:879 templates/index.php:82
+#: js/files.js:746 templates/index.php:82
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:898
+#: js/files.js:765
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:900
+#: js/files.js:767
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:908
+#: js/files.js:775
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:910
+#: js/files.js:777
 msgid "{count} files"
 msgstr ""
 
-#: lib/app.php:53
-msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
-msgstr ""
-
 #: lib/app.php:73
-msgid "Unable to rename file"
+#, php-format
+msgid "%s could not be renamed"
 msgstr ""
 
 #: lib/helper.php:11 templates/index.php:18
@@ -317,6 +327,22 @@ msgstr ""
 msgid "Current scanning"
 msgstr ""
 
+#: templates/part.list.php:76
+msgid "directory"
+msgstr ""
+
+#: templates/part.list.php:78
+msgid "directories"
+msgstr ""
+
+#: templates/part.list.php:87
+msgid "file"
+msgstr ""
+
+#: templates/part.list.php:89
+msgid "files"
+msgstr ""
+
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
 msgstr ""
diff --git a/l10n/hi/files_encryption.po b/l10n/hi/files_encryption.po
index 68a91c9baf00d2da1dd87d847baada0a93e72401..94ad25dcd1a5f9069ed8784f20e33a2cb4785c80 100644
--- a/l10n/hi/files_encryption.po
+++ b/l10n/hi/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-14 02:46+0200\n"
-"PO-Revision-Date: 2013-06-14 00:47+0000\n"
+"POT-Creation-Date: 2013-07-05 02:12+0200\n"
+"PO-Revision-Date: 2013-07-05 00:13+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"
@@ -55,9 +55,21 @@ msgstr ""
 
 #: files/error.php:7
 msgid ""
-"Your private key is not valid! Maybe your password was changed from outside."
-" You can update your private key password in your personal settings to "
-"regain access to your files"
+"Your private key is not valid! Likely your password was changed outside the "
+"ownCloud system (e.g. your corporate directory). You can update your private"
+" key password in your personal settings to recover access to your encrypted "
+"files."
+msgstr ""
+
+#: hooks/hooks.php:44
+msgid "Missing requirements."
+msgstr ""
+
+#: hooks/hooks.php:45
+msgid ""
+"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL "
+"PHP extension is enabled and configured properly. For now, the encryption "
+"app has been disabled."
 msgstr ""
 
 #: js/settings-admin.js:11
@@ -84,11 +96,11 @@ msgstr ""
 
 #: templates/settings-admin.php:10
 msgid ""
-"Enable encryption passwords recovery key (allow sharing to recovery key):"
+"Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
 #: templates/settings-admin.php:14
-msgid "Recovery account password"
+msgid "Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:21 templates/settings-personal.php:54
@@ -100,15 +112,15 @@ msgid "Disabled"
 msgstr ""
 
 #: templates/settings-admin.php:34
-msgid "Change encryption passwords recovery key:"
+msgid "Change recovery key password:"
 msgstr ""
 
 #: templates/settings-admin.php:41
-msgid "Old Recovery account password"
+msgid "Old Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:48
-msgid "New Recovery account password"
+msgid "New Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:53
diff --git a/l10n/hi/files_sharing.po b/l10n/hi/files_sharing.po
index cb9b4a99392482ac4b93d87267975f04e8929e2b..374cd748474bdf1652e2d58689715adf016585ea 100644
--- a/l10n/hi/files_sharing.po
+++ b/l10n/hi/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-14 02:47+0200\n"
-"PO-Revision-Date: 2013-06-14 00:47+0000\n"
+"POT-Creation-Date: 2013-07-05 02:13+0200\n"
+"PO-Revision-Date: 2013-07-05 00:13+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"
@@ -18,27 +18,39 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: templates/authenticate.php:4
+msgid "The password is wrong. Try again."
+msgstr ""
+
+#: templates/authenticate.php:7
 msgid "Password"
 msgstr "पासवर्ड"
 
-#: templates/authenticate.php:6
+#: templates/authenticate.php:9
 msgid "Submit"
 msgstr ""
 
-#: templates/public.php:10
+#: templates/public.php:17
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr ""
 
-#: templates/public.php:13
+#: templates/public.php:20
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr ""
 
-#: templates/public.php:19 templates/public.php:43
+#: templates/public.php:28 templates/public.php:86
 msgid "Download"
 msgstr ""
 
-#: templates/public.php:40
+#: templates/public.php:44
+msgid "Upload"
+msgstr ""
+
+#: templates/public.php:54
+msgid "Cancel upload"
+msgstr ""
+
+#: templates/public.php:83
 msgid "No preview available for"
 msgstr ""
diff --git a/l10n/hi/files_trashbin.po b/l10n/hi/files_trashbin.po
index 6c057b0c2402e715a3f58e6917d2f31aae8a6a3b..bd684c4471aad2426a5001642af419b6ccfbe6ce 100644
--- a/l10n/hi/files_trashbin.po
+++ b/l10n/hi/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-25 02:01+0200\n"
-"PO-Revision-Date: 2013-05-24 13:27+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:16+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
 "MIME-Version: 1.0\n"
@@ -27,43 +27,43 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:7 js/trash.js:96
+#: js/trash.js:7 js/trash.js:97
 msgid "perform restore operation"
 msgstr ""
 
-#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
 msgid "Error"
-msgstr ""
+msgstr "त्रुटि"
 
 #: js/trash.js:34
 msgid "delete file permanently"
 msgstr ""
 
-#: js/trash.js:121
+#: js/trash.js:123
 msgid "Delete permanently"
 msgstr ""
 
-#: js/trash.js:174 templates/index.php:17
+#: js/trash.js:176 templates/index.php:17
 msgid "Name"
 msgstr ""
 
-#: js/trash.js:175 templates/index.php:27
+#: js/trash.js:177 templates/index.php:27
 msgid "Deleted"
 msgstr ""
 
-#: js/trash.js:184
+#: js/trash.js:186
 msgid "1 folder"
 msgstr ""
 
-#: js/trash.js:186
+#: js/trash.js:188
 msgid "{count} folders"
 msgstr ""
 
-#: js/trash.js:194
+#: js/trash.js:196
 msgid "1 file"
 msgstr ""
 
-#: js/trash.js:196
+#: js/trash.js:198
 msgid "{count} files"
 msgstr ""
 
diff --git a/l10n/hi/lib.po b/l10n/hi/lib.po
index 2da36dc45e04a7f07c0aa11d072c53347da2073e..723d8f82929fc8bbad81d7d716e1ed827010aa1e 100644
--- a/l10n/hi/lib.po
+++ b/l10n/hi/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 00:04+0000\n"
+"POT-Creation-Date: 2013-07-09 02:04+0200\n"
+"PO-Revision-Date: 2013-07-09 00:02+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
 "MIME-Version: 1.0\n"
@@ -17,30 +17,34 @@ msgstr ""
 "Language: hi\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:359
+#: app.php:360
 msgid "Help"
 msgstr "सहयोग"
 
-#: app.php:372
+#: app.php:373
 msgid "Personal"
 msgstr "यक्तिगत"
 
-#: app.php:383
+#: app.php:384
 msgid "Settings"
 msgstr "सेटिंग्स"
 
-#: app.php:395
+#: app.php:396
 msgid "Users"
 msgstr "उपयोगकर्ता"
 
-#: app.php:408
+#: app.php:409
 msgid "Apps"
 msgstr "Apps"
 
-#: app.php:416
+#: app.php:417
 msgid "Admin"
 msgstr ""
 
+#: defaults.php:33
+msgid "web services under your control"
+msgstr ""
+
 #: files.php:210
 msgid "ZIP download is turned off."
 msgstr ""
@@ -85,104 +89,102 @@ msgstr ""
 msgid "Images"
 msgstr ""
 
-#: setup.php:34
-msgid "Set an admin username."
-msgstr ""
-
-#: setup.php:37
-msgid "Set an admin password."
-msgstr ""
-
-#: setup.php:55
+#: setup/abstractdatabase.php:22
 #, php-format
 msgid "%s enter the database username."
 msgstr ""
 
-#: setup.php:58
+#: setup/abstractdatabase.php:25
 #, php-format
 msgid "%s enter the database name."
 msgstr ""
 
-#: setup.php:61
+#: setup/abstractdatabase.php:28
 #, php-format
 msgid "%s you may not use dots in the database name"
 msgstr ""
 
-#: setup.php:64
+#: setup/mssql.php:20
 #, php-format
-msgid "%s set the database host."
-msgstr ""
-
-#: setup.php:126 setup.php:332 setup.php:377
-msgid "PostgreSQL username and/or password not valid"
+msgid "MS SQL username and/or password not valid: %s"
 msgstr ""
 
-#: setup.php:127 setup.php:235
+#: setup/mssql.php:21 setup/mysql.php:13 setup/oci.php:114
+#: setup/postgresql.php:24 setup/postgresql.php:70
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:152
-msgid "Oracle connection could not be established"
-msgstr ""
-
-#: setup.php:234
+#: setup/mysql.php:12
 msgid "MySQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:288 setup.php:398 setup.php:407 setup.php:425 setup.php:435
-#: setup.php:444 setup.php:477 setup.php:543 setup.php:569 setup.php:576
-#: setup.php:587 setup.php:594 setup.php:603 setup.php:611 setup.php:620
-#: setup.php:626
+#: setup/mysql.php:67 setup/oci.php:54 setup/oci.php:121 setup/oci.php:147
+#: setup/oci.php:154 setup/oci.php:165 setup/oci.php:172 setup/oci.php:181
+#: setup/oci.php:189 setup/oci.php:198 setup/oci.php:204
+#: setup/postgresql.php:89 setup/postgresql.php:98 setup/postgresql.php:115
+#: setup/postgresql.php:125 setup/postgresql.php:134
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr ""
 
-#: setup.php:289 setup.php:399 setup.php:408 setup.php:426 setup.php:436
-#: setup.php:445 setup.php:478 setup.php:544 setup.php:570 setup.php:577
-#: setup.php:588 setup.php:604 setup.php:612 setup.php:621
+#: setup/mysql.php:68 setup/oci.php:55 setup/oci.php:122 setup/oci.php:148
+#: setup/oci.php:155 setup/oci.php:166 setup/oci.php:182 setup/oci.php:190
+#: setup/oci.php:199 setup/postgresql.php:90 setup/postgresql.php:99
+#: setup/postgresql.php:116 setup/postgresql.php:126 setup/postgresql.php:135
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:305
+#: setup/mysql.php:85
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:306
+#: setup/mysql.php:86
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:311
+#: setup/mysql.php:91
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:312
+#: setup/mysql.php:92
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:469 setup.php:536
+#: setup/oci.php:34
+msgid "Oracle connection could not be established"
+msgstr ""
+
+#: setup/oci.php:41 setup/oci.php:113
 msgid "Oracle username and/or password not valid"
 msgstr ""
 
-#: setup.php:595 setup.php:627
+#: setup/oci.php:173 setup/oci.php:205
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:647
-#, php-format
-msgid "MS SQL username and/or password not valid: %s"
+#: setup/postgresql.php:23 setup/postgresql.php:69
+msgid "PostgreSQL username and/or password not valid"
+msgstr ""
+
+#: setup.php:42
+msgid "Set an admin username."
+msgstr ""
+
+#: setup.php:45
+msgid "Set an admin password."
 msgstr ""
 
-#: setup.php:870
+#: setup.php:198
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:871
+#: setup.php:199
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
diff --git a/l10n/hi/settings.po b/l10n/hi/settings.po
index 3f1dc098e5ad432d37f7f30966b7d7a191f5b0a7..3c5b1c0825d71e6c8a2d27bf89f55453d2f02511 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-06-11 01:57+0200\n"
-"PO-Revision-Date: 2013-06-10 23:57+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
 "MIME-Version: 1.0\n"
@@ -58,7 +58,7 @@ msgstr ""
 msgid "Unable to delete group"
 msgstr ""
 
-#: ajax/removeuser.php:24
+#: ajax/removeuser.php:25
 msgid "Unable to delete user"
 msgstr ""
 
@@ -88,35 +88,35 @@ msgstr ""
 msgid "Couldn't update app."
 msgstr ""
 
-#: js/apps.js:30
+#: js/apps.js:35
 msgid "Update to {appversion}"
 msgstr ""
 
-#: js/apps.js:36 js/apps.js:76
+#: js/apps.js:41 js/apps.js:81
 msgid "Disable"
 msgstr ""
 
-#: js/apps.js:36 js/apps.js:64 js/apps.js:83
+#: js/apps.js:41 js/apps.js:69 js/apps.js:88
 msgid "Enable"
 msgstr ""
 
-#: js/apps.js:55
+#: js/apps.js:60
 msgid "Please wait...."
 msgstr ""
 
-#: js/apps.js:59 js/apps.js:71 js/apps.js:80 js/apps.js:93
+#: js/apps.js:64 js/apps.js:76 js/apps.js:85 js/apps.js:98
 msgid "Error"
-msgstr ""
+msgstr "त्रुटि"
 
-#: js/apps.js:90
+#: js/apps.js:95
 msgid "Updating...."
 msgstr ""
 
-#: js/apps.js:93
+#: js/apps.js:98
 msgid "Error while updating app"
 msgstr ""
 
-#: js/apps.js:96
+#: js/apps.js:101
 msgid "Updated"
 msgstr ""
 
@@ -165,15 +165,15 @@ msgstr ""
 msgid "A valid password must be provided"
 msgstr ""
 
-#: personal.php:35 personal.php:36
+#: personal.php:37 personal.php:38
 msgid "__language_name__"
 msgstr ""
 
-#: templates/admin.php:15
+#: templates/admin.php:17
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:18
+#: templates/admin.php:20
 msgid ""
 "Your data directory and your files are probably accessible from the "
 "internet. The .htaccess file that ownCloud provides is not working. We "
@@ -182,36 +182,36 @@ msgid ""
 " webserver document root."
 msgstr ""
 
-#: templates/admin.php:29
+#: templates/admin.php:31
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:32
+#: templates/admin.php:34
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: templates/admin.php:33
+#: templates/admin.php:35
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:44
+#: templates/admin.php:46
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:47
+#: templates/admin.php:49
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr ""
 
-#: templates/admin.php:58
+#: templates/admin.php:60
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:63
+#: templates/admin.php:65
 #, php-format
 msgid ""
 "This ownCloud server can't set system locale to %s. This means that there "
@@ -219,11 +219,11 @@ msgid ""
 " to install the required packages on your system to support %s."
 msgstr ""
 
-#: templates/admin.php:75
+#: templates/admin.php:77
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:78
+#: templates/admin.php:80
 msgid ""
 "This ownCloud server has no working internet connection. This means that "
 "some of the features like mounting of external storage, notifications about "
@@ -233,102 +233,102 @@ msgid ""
 " of ownCloud."
 msgstr ""
 
-#: templates/admin.php:92
+#: templates/admin.php:94
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:101
+#: templates/admin.php:103
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:111
+#: templates/admin.php:113
 msgid ""
 "cron.php is registered at a webcron service. Call the cron.php page in the "
 "owncloud root once a minute over http."
 msgstr ""
 
-#: templates/admin.php:121
+#: templates/admin.php:123
 msgid ""
 "Use systems cron service. Call the cron.php file in the owncloud folder via "
 "a system cronjob once a minute."
 msgstr ""
 
-#: templates/admin.php:128
+#: templates/admin.php:130
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:134
+#: templates/admin.php:136
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:135
+#: templates/admin.php:137
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:142
+#: templates/admin.php:144
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:143
+#: templates/admin.php:145
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:150
+#: templates/admin.php:152
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:151
+#: templates/admin.php:153
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:158
+#: templates/admin.php:160
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:161
+#: templates/admin.php:163
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:168
+#: templates/admin.php:170
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:181
+#: templates/admin.php:183
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:182
+#: templates/admin.php:184
 msgid ""
 "Enforces the clients to connect to ownCloud via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:185
+#: templates/admin.php:187
 msgid ""
 "Please connect to this ownCloud instance via HTTPS to enable or disable the "
 "SSL enforcement."
 msgstr ""
 
-#: templates/admin.php:195
+#: templates/admin.php:197
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:196
+#: templates/admin.php:198
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:227
+#: templates/admin.php:229
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:228
+#: templates/admin.php:230
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:235 templates/personal.php:111
+#: templates/admin.php:236 templates/personal.php:116
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:237 templates/personal.php:114
+#: templates/admin.php:240 templates/personal.php:119
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -338,29 +338,29 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr ""
 
-#: templates/apps.php:11
+#: templates/apps.php:13
 msgid "Add your App"
 msgstr ""
 
-#: templates/apps.php:12
+#: templates/apps.php:28
 msgid "More Apps"
 msgstr ""
 
-#: templates/apps.php:28
+#: templates/apps.php:33
 msgid "Select an App"
 msgstr ""
 
-#: templates/apps.php:34
+#: templates/apps.php:39
 msgid "See application page at apps.owncloud.com"
 msgstr ""
 
-#: templates/apps.php:36
+#: templates/apps.php:41
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr ""
 
-#: templates/apps.php:38
+#: templates/apps.php:43
 msgid "Update"
-msgstr ""
+msgstr "अद्यतन"
 
 #: templates/help.php:4
 msgid "User Documentation"
@@ -386,76 +386,79 @@ msgstr ""
 msgid "Commercial Support"
 msgstr ""
 
-#: templates/personal.php:8
-#, php-format
-msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
-msgstr ""
-
-#: templates/personal.php:15
+#: templates/personal.php:10
 msgid "Get the apps to sync your files"
 msgstr ""
 
-#: templates/personal.php:26
+#: templates/personal.php:21
 msgid "Show First Run Wizard again"
 msgstr ""
 
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:29
+#, php-format
+msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
+msgstr ""
+
+#: templates/personal.php:41 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "पासवर्ड"
 
-#: templates/personal.php:38
+#: templates/personal.php:42
 msgid "Your password was changed"
 msgstr ""
 
-#: templates/personal.php:39
+#: templates/personal.php:43
 msgid "Unable to change your password"
 msgstr ""
 
-#: templates/personal.php:40
+#: templates/personal.php:44
 msgid "Current password"
 msgstr ""
 
-#: templates/personal.php:42
+#: templates/personal.php:46
 msgid "New password"
 msgstr "नया पासवर्ड"
 
-#: templates/personal.php:44
+#: templates/personal.php:48
 msgid "Change password"
 msgstr ""
 
-#: templates/personal.php:56 templates/users.php:85
+#: templates/personal.php:60 templates/users.php:85
 msgid "Display Name"
 msgstr ""
 
-#: templates/personal.php:71
+#: templates/personal.php:75
 msgid "Email"
 msgstr ""
 
-#: templates/personal.php:73
+#: templates/personal.php:77
 msgid "Your email address"
 msgstr ""
 
-#: templates/personal.php:74
+#: templates/personal.php:78
 msgid "Fill in an email address to enable password recovery"
 msgstr ""
 
-#: templates/personal.php:83 templates/personal.php:84
+#: templates/personal.php:87 templates/personal.php:88
 msgid "Language"
 msgstr ""
 
-#: templates/personal.php:95
+#: templates/personal.php:100
 msgid "Help translate"
 msgstr ""
 
-#: templates/personal.php:100
+#: templates/personal.php:106
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:102
-msgid "Use this address to connect to your ownCloud in your file manager"
+#: templates/personal.php:108
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
+"target=\"_blank\">access your Files via WebDAV</a>"
 msgstr ""
 
-#: templates/users.php:21 templates/users.php:84
+#: templates/users.php:21
 msgid "Login Name"
 msgstr ""
 
@@ -485,6 +488,10 @@ msgstr ""
 msgid "Other"
 msgstr ""
 
+#: templates/users.php:84
+msgid "Username"
+msgstr "प्रयोक्ता का नाम"
+
 #: templates/users.php:91
 msgid "Storage"
 msgstr ""
diff --git a/l10n/hi/user_ldap.po b/l10n/hi/user_ldap.po
index 2bcde19cb2951cfe25c183b47370135a165fb515..727b1d0b3cc90feb7a796e1c385de20cffff212c 100644
--- a/l10n/hi/user_ldap.po
+++ b/l10n/hi/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-25 02:01+0200\n"
-"PO-Revision-Date: 2013-05-24 13:28+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:16+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"
@@ -67,7 +67,7 @@ msgstr ""
 
 #: js/settings.js:117
 msgid "Error"
-msgstr ""
+msgstr "त्रुटि"
 
 #: js/settings.js:141
 msgid "Connection test succeeded"
diff --git a/l10n/hr/core.po b/l10n/hr/core.po
index c32f80d8baa453d833f9f2da46e6c67117517611..1b5c577c9fa9a40055ef7cd369f5495d13fde1f0 100644
--- a/l10n/hr/core.po
+++ b/l10n/hr/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
 "MIME-Version: 1.0\n"
@@ -61,135 +61,135 @@ msgstr "Niti jedna kategorija nije odabrana za brisanje."
 msgid "Error removing %s from favorites."
 msgstr ""
 
-#: js/config.php:34
+#: js/config.php:32
 msgid "Sunday"
 msgstr "nedelja"
 
-#: js/config.php:35
+#: js/config.php:33
 msgid "Monday"
 msgstr "ponedeljak"
 
-#: js/config.php:36
+#: js/config.php:34
 msgid "Tuesday"
 msgstr "utorak"
 
-#: js/config.php:37
+#: js/config.php:35
 msgid "Wednesday"
 msgstr "srijeda"
 
-#: js/config.php:38
+#: js/config.php:36
 msgid "Thursday"
 msgstr "četvrtak"
 
-#: js/config.php:39
+#: js/config.php:37
 msgid "Friday"
 msgstr "petak"
 
-#: js/config.php:40
+#: js/config.php:38
 msgid "Saturday"
 msgstr "subota"
 
-#: js/config.php:45
+#: js/config.php:43
 msgid "January"
 msgstr "Siječanj"
 
-#: js/config.php:46
+#: js/config.php:44
 msgid "February"
 msgstr "Veljača"
 
-#: js/config.php:47
+#: js/config.php:45
 msgid "March"
 msgstr "Ožujak"
 
-#: js/config.php:48
+#: js/config.php:46
 msgid "April"
 msgstr "Travanj"
 
-#: js/config.php:49
+#: js/config.php:47
 msgid "May"
 msgstr "Svibanj"
 
-#: js/config.php:50
+#: js/config.php:48
 msgid "June"
 msgstr "Lipanj"
 
-#: js/config.php:51
+#: js/config.php:49
 msgid "July"
 msgstr "Srpanj"
 
-#: js/config.php:52
+#: js/config.php:50
 msgid "August"
 msgstr "Kolovoz"
 
-#: js/config.php:53
+#: js/config.php:51
 msgid "September"
 msgstr "Rujan"
 
-#: js/config.php:54
+#: js/config.php:52
 msgid "October"
 msgstr "Listopad"
 
-#: js/config.php:55
+#: js/config.php:53
 msgid "November"
 msgstr "Studeni"
 
-#: js/config.php:56
+#: js/config.php:54
 msgid "December"
 msgstr "Prosinac"
 
-#: js/js.js:286
+#: js/js.js:293
 msgid "Settings"
 msgstr "Postavke"
 
-#: js/js.js:718
+#: js/js.js:725
 msgid "seconds ago"
 msgstr "sekundi prije"
 
-#: js/js.js:719
+#: js/js.js:726
 msgid "1 minute ago"
 msgstr ""
 
-#: js/js.js:720
+#: js/js.js:727
 msgid "{minutes} minutes ago"
 msgstr ""
 
-#: js/js.js:721
+#: js/js.js:728
 msgid "1 hour ago"
 msgstr ""
 
-#: js/js.js:722
+#: js/js.js:729
 msgid "{hours} hours ago"
 msgstr ""
 
-#: js/js.js:723
+#: js/js.js:730
 msgid "today"
 msgstr "danas"
 
-#: js/js.js:724
+#: js/js.js:731
 msgid "yesterday"
 msgstr "jučer"
 
-#: js/js.js:725
+#: js/js.js:732
 msgid "{days} days ago"
 msgstr ""
 
-#: js/js.js:726
+#: js/js.js:733
 msgid "last month"
 msgstr "prošli mjesec"
 
-#: js/js.js:727
+#: js/js.js:734
 msgid "{months} months ago"
 msgstr ""
 
-#: js/js.js:728
+#: js/js.js:735
 msgid "months ago"
 msgstr "mjeseci"
 
-#: js/js.js:729
+#: js/js.js:736
 msgid "last year"
 msgstr "prošlu godinu"
 
-#: js/js.js:730
+#: js/js.js:737
 msgid "years ago"
 msgstr "godina"
 
@@ -225,8 +225,8 @@ msgstr ""
 #: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
 #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:577
-#: js/share.js:589
+#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:620
+#: js/share.js:632
 msgid "Error"
 msgstr "Greška"
 
@@ -246,7 +246,7 @@ msgstr ""
 msgid "Share"
 msgstr "Podijeli"
 
-#: js/share.js:125 js/share.js:617
+#: js/share.js:125 js/share.js:660
 msgid "Error while sharing"
 msgstr "Greška prilikom djeljenja"
 
@@ -266,99 +266,103 @@ msgstr ""
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:159
+#: js/share.js:172
 msgid "Share with"
 msgstr "Djeli sa"
 
-#: js/share.js:164
+#: js/share.js:177
 msgid "Share with link"
 msgstr "Djeli preko link-a"
 
-#: js/share.js:167
+#: js/share.js:180
 msgid "Password protect"
 msgstr "Zaštiti lozinkom"
 
-#: js/share.js:169 templates/installation.php:54 templates/login.php:26
+#: js/share.js:182 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "Lozinka"
 
-#: js/share.js:173
+#: js/share.js:187
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:191
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:174
+#: js/share.js:192
 msgid "Send"
 msgstr ""
 
-#: js/share.js:178
+#: js/share.js:197
 msgid "Set expiration date"
 msgstr "Postavi datum isteka"
 
-#: js/share.js:179
+#: js/share.js:198
 msgid "Expiration date"
 msgstr "Datum isteka"
 
-#: js/share.js:211
+#: js/share.js:230
 msgid "Share via email:"
 msgstr "Dijeli preko email-a:"
 
-#: js/share.js:213
+#: js/share.js:232
 msgid "No people found"
 msgstr "Osobe nisu pronađene"
 
-#: js/share.js:251
+#: js/share.js:270
 msgid "Resharing is not allowed"
 msgstr "Ponovo dijeljenje nije dopušteno"
 
-#: js/share.js:287
+#: js/share.js:306
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:308
+#: js/share.js:327
 msgid "Unshare"
 msgstr "Makni djeljenje"
 
-#: js/share.js:320
+#: js/share.js:339
 msgid "can edit"
 msgstr "može mjenjat"
 
-#: js/share.js:322
+#: js/share.js:341
 msgid "access control"
 msgstr "kontrola pristupa"
 
-#: js/share.js:325
+#: js/share.js:344
 msgid "create"
 msgstr "kreiraj"
 
-#: js/share.js:328
+#: js/share.js:347
 msgid "update"
 msgstr "ažuriraj"
 
-#: js/share.js:331
+#: js/share.js:350
 msgid "delete"
 msgstr "izbriši"
 
-#: js/share.js:334
+#: js/share.js:353
 msgid "share"
 msgstr "djeli"
 
-#: js/share.js:368 js/share.js:564
+#: js/share.js:387 js/share.js:607
 msgid "Password protected"
 msgstr "Zaštita lozinkom"
 
-#: js/share.js:577
+#: js/share.js:620
 msgid "Error unsetting expiration date"
 msgstr "Greška prilikom brisanja datuma isteka"
 
-#: js/share.js:589
+#: js/share.js:632
 msgid "Error setting expiration date"
 msgstr "Greška prilikom postavljanja datuma isteka"
 
-#: js/share.js:604
+#: js/share.js:647
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:615
+#: js/share.js:658
 msgid "Email sent"
 msgstr ""
 
@@ -373,7 +377,7 @@ msgstr ""
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
-#: lostpassword/controller.php:58
+#: lostpassword/controller.php:60
 msgid "ownCloud password reset"
 msgstr "ownCloud resetiranje lozinke"
 
@@ -403,17 +407,17 @@ msgstr "Korisničko ime"
 
 #: lostpassword/templates/lostpassword.php:22
 msgid ""
-"Your files seems to be encrypted. If you didn't have enabled the recovery "
-"key there will be no way to get your data back once the password was "
-"resetted. If you are not sure what to do, please contact your administrator "
-"first before continue. Do you really want to continue?"
+"Your files are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
 msgstr ""
 
 #: lostpassword/templates/lostpassword.php:24
 msgid "Yes, I really want to reset my password now"
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:29
+#: lostpassword/templates/lostpassword.php:27
 msgid "Request reset"
 msgstr "Zahtjev za resetiranjem"
 
@@ -461,7 +465,7 @@ msgstr "Pristup zabranjen"
 msgid "Cloud not found"
 msgstr "Cloud nije pronađen"
 
-#: templates/altmail.php:2
+#: templates/altmail.php:4
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -472,10 +476,6 @@ msgid ""
 "Cheers!"
 msgstr ""
 
-#: templates/altmail.php:7 templates/mail.php:24
-msgid "web services under your control"
-msgstr "web usluge pod vašom kontrolom"
-
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
 msgstr "Uredi kategorije"
@@ -568,12 +568,12 @@ msgstr "Poslužitelj baze podataka"
 msgid "Finish setup"
 msgstr "Završi postavljanje"
 
-#: templates/layout.user.php:40
+#: templates/layout.user.php:43
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:67
+#: templates/layout.user.php:68
 msgid "Log out"
 msgstr "Odjava"
 
@@ -607,7 +607,7 @@ msgstr "Prijava"
 msgid "Alternative Logins"
 msgstr ""
 
-#: templates/mail.php:15
+#: templates/mail.php:16
 #, php-format
 msgid ""
 "Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
diff --git a/l10n/hr/files.po b/l10n/hr/files.po
index ab952641e7989b11160d7926ae864f827b4c1c7e..249932206aae9197fe68757b7237740faecae66b 100644
--- a/l10n/hr/files.po
+++ b/l10n/hr/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:01+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
 "MIME-Version: 1.0\n"
@@ -27,46 +27,54 @@ msgstr ""
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/upload.php:19
+#: ajax/upload.php:16 ajax/upload.php:45
+msgid "Unable to set upload directory."
+msgstr ""
+
+#: ajax/upload.php:22
+msgid "Invalid Token"
+msgstr ""
+
+#: ajax/upload.php:59
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: ajax/upload.php:26
+#: ajax/upload.php:66
 msgid "There is no error, the file uploaded with success"
 msgstr "Nema pogreške, datoteka je poslana uspješno."
 
-#: ajax/upload.php:27
+#: ajax/upload.php:67
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:29
+#: ajax/upload.php:69
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Poslana datoteka prelazi veličinu prikazanu u MAX_FILE_SIZE direktivi u HTML formi"
 
-#: ajax/upload.php:30
+#: ajax/upload.php:70
 msgid "The uploaded file was only partially uploaded"
 msgstr "Poslana datoteka je parcijalno poslana"
 
-#: ajax/upload.php:31
+#: ajax/upload.php:71
 msgid "No file was uploaded"
 msgstr "Datoteka nije poslana"
 
-#: ajax/upload.php:32
+#: ajax/upload.php:72
 msgid "Missing a temporary folder"
 msgstr "Nedostaje privremeni direktorij"
 
-#: ajax/upload.php:33
+#: ajax/upload.php:73
 msgid "Failed to write to disk"
 msgstr "Neuspjelo pisanje na disk"
 
-#: ajax/upload.php:51
+#: ajax/upload.php:91
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:83
+#: ajax/upload.php:123
 msgid "Invalid directory."
 msgstr ""
 
@@ -74,6 +82,36 @@ msgstr ""
 msgid "Files"
 msgstr "Datoteke"
 
+#: js/file-upload.js:11
+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/file-upload.js:24
+msgid "Not enough space available"
+msgstr ""
+
+#: js/file-upload.js:64
+msgid "Upload cancelled."
+msgstr "Slanje poništeno."
+
+#: js/file-upload.js:167 js/files.js:266
+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/file-upload.js:233 js/files.js:339
+msgid "URL cannot be empty."
+msgstr ""
+
+#: js/file-upload.js:238 lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr ""
+
+#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
+#: js/files.js:693 js/files.js:731
+msgid "Error"
+msgstr "Greška"
+
 #: js/fileactions.js:116
 msgid "Share"
 msgstr "Podijeli"
@@ -90,43 +128,43 @@ msgstr "Obriši"
 msgid "Rename"
 msgstr "Promjeni ime"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:464
 msgid "Pending"
 msgstr "U tijeku"
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "replace"
 msgstr "zamjeni"
 
-#: js/filelist.js:259
+#: js/filelist.js:302
 msgid "suggest name"
 msgstr "predloži ime"
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "cancel"
 msgstr "odustani"
 
-#: js/filelist.js:306
+#: js/filelist.js:349
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:306
+#: js/filelist.js:349
 msgid "undo"
 msgstr "vrati"
 
-#: js/filelist.js:331
+#: js/filelist.js:374
 msgid "perform delete operation"
 msgstr ""
 
-#: js/filelist.js:413
+#: js/filelist.js:456
 msgid "1 file uploading"
 msgstr "1 datoteka se učitava"
 
-#: js/filelist.js:416 js/filelist.js:470
+#: js/filelist.js:459 js/filelist.js:517
 msgid "files uploading"
 msgstr "datoteke se učitavaju"
 
@@ -158,69 +196,41 @@ msgid ""
 "big."
 msgstr ""
 
-#: js/files.js:264
-msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "Nemoguće poslati datoteku jer je prazna ili je direktorij"
-
-#: js/files.js:277
-msgid "Not enough space available"
-msgstr ""
-
-#: js/files.js:317
-msgid "Upload cancelled."
-msgstr "Slanje poništeno."
-
-#: js/files.js:413
-msgid ""
-"File upload is in progress. Leaving the page now will cancel the upload."
-msgstr "Učitavanje datoteke. Napuštanjem stranice će prekinuti učitavanje."
-
-#: js/files.js:486
-msgid "URL cannot be empty."
-msgstr ""
-
-#: js/files.js:491
+#: js/files.js:344
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
-msgid "Error"
-msgstr "Greška"
-
-#: js/files.js:877 templates/index.php:69
+#: js/files.js:744 templates/index.php:69
 msgid "Name"
 msgstr "Ime"
 
-#: js/files.js:878 templates/index.php:80
+#: js/files.js:745 templates/index.php:80
 msgid "Size"
 msgstr "Veličina"
 
-#: js/files.js:879 templates/index.php:82
+#: js/files.js:746 templates/index.php:82
 msgid "Modified"
 msgstr "Zadnja promjena"
 
-#: js/files.js:898
+#: js/files.js:765
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:900
+#: js/files.js:767
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:908
+#: js/files.js:775
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:910
+#: js/files.js:777
 msgid "{count} files"
 msgstr ""
 
-#: lib/app.php:53
-msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
-msgstr ""
-
 #: lib/app.php:73
-msgid "Unable to rename file"
+#, php-format
+msgid "%s could not be renamed"
 msgstr ""
 
 #: lib/helper.php:11 templates/index.php:18
@@ -317,6 +327,22 @@ msgstr "Datoteke se skeniraju, molimo pričekajte."
 msgid "Current scanning"
 msgstr "Trenutno skeniranje"
 
+#: templates/part.list.php:76
+msgid "directory"
+msgstr ""
+
+#: templates/part.list.php:78
+msgid "directories"
+msgstr ""
+
+#: templates/part.list.php:87
+msgid "file"
+msgstr "datoteka"
+
+#: templates/part.list.php:89
+msgid "files"
+msgstr "datoteke"
+
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
 msgstr ""
diff --git a/l10n/hr/files_encryption.po b/l10n/hr/files_encryption.po
index 4dfef45fc0e993456eea7d74a3df53a682a55bbf..41ffd91c1b83014d5913da58275da1dda201f31b 100644
--- a/l10n/hr/files_encryption.po
+++ b/l10n/hr/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-14 02:46+0200\n"
-"PO-Revision-Date: 2013-06-14 00:47+0000\n"
+"POT-Creation-Date: 2013-07-05 02:12+0200\n"
+"PO-Revision-Date: 2013-07-05 00:13+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"
@@ -55,9 +55,21 @@ msgstr ""
 
 #: files/error.php:7
 msgid ""
-"Your private key is not valid! Maybe your password was changed from outside."
-" You can update your private key password in your personal settings to "
-"regain access to your files"
+"Your private key is not valid! Likely your password was changed outside the "
+"ownCloud system (e.g. your corporate directory). You can update your private"
+" key password in your personal settings to recover access to your encrypted "
+"files."
+msgstr ""
+
+#: hooks/hooks.php:44
+msgid "Missing requirements."
+msgstr ""
+
+#: hooks/hooks.php:45
+msgid ""
+"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL "
+"PHP extension is enabled and configured properly. For now, the encryption "
+"app has been disabled."
 msgstr ""
 
 #: js/settings-admin.js:11
@@ -84,11 +96,11 @@ msgstr ""
 
 #: templates/settings-admin.php:10
 msgid ""
-"Enable encryption passwords recovery key (allow sharing to recovery key):"
+"Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
 #: templates/settings-admin.php:14
-msgid "Recovery account password"
+msgid "Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:21 templates/settings-personal.php:54
@@ -100,15 +112,15 @@ msgid "Disabled"
 msgstr ""
 
 #: templates/settings-admin.php:34
-msgid "Change encryption passwords recovery key:"
+msgid "Change recovery key password:"
 msgstr ""
 
 #: templates/settings-admin.php:41
-msgid "Old Recovery account password"
+msgid "Old Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:48
-msgid "New Recovery account password"
+msgid "New Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:53
diff --git a/l10n/hr/files_external.po b/l10n/hr/files_external.po
index 4ac6471dfd65d65c293dc2c703fffe51b91e71a2..2063959aafad2956a46a0aaad6324f8902a13603 100644
--- a/l10n/hr/files_external.po
+++ b/l10n/hr/files_external.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/hr/files_sharing.po b/l10n/hr/files_sharing.po
index b2832d057e8371d8c57e12c70c8ccaba541eb1fe..8810eae6e99d934bff7d8dfe5231c9cf6fa6cdc9 100644
--- a/l10n/hr/files_sharing.po
+++ b/l10n/hr/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
 "MIME-Version: 1.0\n"
@@ -18,27 +18,39 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
 #: templates/authenticate.php:4
+msgid "The password is wrong. Try again."
+msgstr ""
+
+#: templates/authenticate.php:7
 msgid "Password"
 msgstr "Lozinka"
 
-#: templates/authenticate.php:6
+#: templates/authenticate.php:9
 msgid "Submit"
 msgstr "Pošalji"
 
-#: templates/public.php:10
+#: templates/public.php:17
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr ""
 
-#: templates/public.php:13
+#: templates/public.php:20
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr ""
 
-#: templates/public.php:19 templates/public.php:43
+#: templates/public.php:28 templates/public.php:90
 msgid "Download"
 msgstr "Preuzimanje"
 
-#: templates/public.php:40
+#: templates/public.php:45 templates/public.php:48
+msgid "Upload"
+msgstr "Učitaj"
+
+#: templates/public.php:58
+msgid "Cancel upload"
+msgstr "Prekini upload"
+
+#: templates/public.php:87
 msgid "No preview available for"
 msgstr ""
diff --git a/l10n/hr/files_trashbin.po b/l10n/hr/files_trashbin.po
index c30f04d69efef2e908fcabf24211ed605cdf83bb..c4e5c1bf2dd0d6692ddfaf3198f387c03d0723ea 100644
--- a/l10n/hr/files_trashbin.po
+++ b/l10n/hr/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:16+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/hr/lib.po b/l10n/hr/lib.po
index a0edfdf584606b57ee5ba77e3849a9137421d3e5..3679519d944cffbf512e6c41e01b33e28b44e1d7 100644
--- a/l10n/hr/lib.po
+++ b/l10n/hr/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
 "MIME-Version: 1.0\n"
@@ -17,43 +17,47 @@ msgstr ""
 "Language: hr\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
-#: app.php:359
+#: app.php:360
 msgid "Help"
 msgstr "Pomoć"
 
-#: app.php:372
+#: app.php:373
 msgid "Personal"
 msgstr "Osobno"
 
-#: app.php:383
+#: app.php:384
 msgid "Settings"
 msgstr "Postavke"
 
-#: app.php:395
+#: app.php:396
 msgid "Users"
 msgstr "Korisnici"
 
-#: app.php:408
+#: app.php:409
 msgid "Apps"
 msgstr "Aplikacije"
 
-#: app.php:416
+#: app.php:417
 msgid "Admin"
 msgstr "Administrator"
 
-#: files.php:210
+#: defaults.php:33
+msgid "web services under your control"
+msgstr "web usluge pod vašom kontrolom"
+
+#: files.php:226
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: files.php:211
+#: files.php:227
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:212 files.php:245
+#: files.php:228 files.php:261
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:242
+#: files.php:258
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
@@ -85,104 +89,102 @@ msgstr "Tekst"
 msgid "Images"
 msgstr ""
 
-#: setup.php:34
-msgid "Set an admin username."
-msgstr ""
-
-#: setup.php:37
-msgid "Set an admin password."
-msgstr ""
-
-#: setup.php:55
+#: setup/abstractdatabase.php:22
 #, php-format
 msgid "%s enter the database username."
 msgstr ""
 
-#: setup.php:58
+#: setup/abstractdatabase.php:25
 #, php-format
 msgid "%s enter the database name."
 msgstr ""
 
-#: setup.php:61
+#: setup/abstractdatabase.php:28
 #, php-format
 msgid "%s you may not use dots in the database name"
 msgstr ""
 
-#: setup.php:64
+#: setup/mssql.php:20
 #, php-format
-msgid "%s set the database host."
-msgstr ""
-
-#: setup.php:126 setup.php:332 setup.php:377
-msgid "PostgreSQL username and/or password not valid"
+msgid "MS SQL username and/or password not valid: %s"
 msgstr ""
 
-#: setup.php:127 setup.php:235
+#: setup/mssql.php:21 setup/mysql.php:13 setup/oci.php:114
+#: setup/postgresql.php:24 setup/postgresql.php:70
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:152
-msgid "Oracle connection could not be established"
-msgstr ""
-
-#: setup.php:234
+#: setup/mysql.php:12
 msgid "MySQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:288 setup.php:398 setup.php:407 setup.php:425 setup.php:435
-#: setup.php:444 setup.php:477 setup.php:543 setup.php:569 setup.php:576
-#: setup.php:587 setup.php:594 setup.php:603 setup.php:611 setup.php:620
-#: setup.php:626
+#: setup/mysql.php:67 setup/oci.php:54 setup/oci.php:121 setup/oci.php:147
+#: setup/oci.php:154 setup/oci.php:165 setup/oci.php:172 setup/oci.php:181
+#: setup/oci.php:189 setup/oci.php:198 setup/oci.php:204
+#: setup/postgresql.php:89 setup/postgresql.php:98 setup/postgresql.php:115
+#: setup/postgresql.php:125 setup/postgresql.php:134
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr ""
 
-#: setup.php:289 setup.php:399 setup.php:408 setup.php:426 setup.php:436
-#: setup.php:445 setup.php:478 setup.php:544 setup.php:570 setup.php:577
-#: setup.php:588 setup.php:604 setup.php:612 setup.php:621
+#: setup/mysql.php:68 setup/oci.php:55 setup/oci.php:122 setup/oci.php:148
+#: setup/oci.php:155 setup/oci.php:166 setup/oci.php:182 setup/oci.php:190
+#: setup/oci.php:199 setup/postgresql.php:90 setup/postgresql.php:99
+#: setup/postgresql.php:116 setup/postgresql.php:126 setup/postgresql.php:135
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:305
+#: setup/mysql.php:85
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:306
+#: setup/mysql.php:86
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:311
+#: setup/mysql.php:91
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:312
+#: setup/mysql.php:92
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:469 setup.php:536
+#: setup/oci.php:34
+msgid "Oracle connection could not be established"
+msgstr ""
+
+#: setup/oci.php:41 setup/oci.php:113
 msgid "Oracle username and/or password not valid"
 msgstr ""
 
-#: setup.php:595 setup.php:627
+#: setup/oci.php:173 setup/oci.php:205
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:647
-#, php-format
-msgid "MS SQL username and/or password not valid: %s"
+#: setup/postgresql.php:23 setup/postgresql.php:69
+msgid "PostgreSQL username and/or password not valid"
+msgstr ""
+
+#: setup.php:42
+msgid "Set an admin username."
+msgstr ""
+
+#: setup.php:45
+msgid "Set an admin password."
 msgstr ""
 
-#: setup.php:870
+#: setup.php:198
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:871
+#: setup.php:199
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
diff --git a/l10n/hr/settings.po b/l10n/hr/settings.po
index 70665b01e9507b2fe0f7dc151e6dd0e2c1e83f93..39b2040c1736a8f0467494967ef07a6dbff73ce2 100644
--- a/l10n/hr/settings.po
+++ b/l10n/hr/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
 "MIME-Version: 1.0\n"
@@ -88,35 +88,35 @@ msgstr ""
 msgid "Couldn't update app."
 msgstr ""
 
-#: js/apps.js:30
+#: js/apps.js:35
 msgid "Update to {appversion}"
 msgstr ""
 
-#: js/apps.js:36 js/apps.js:76
+#: js/apps.js:41 js/apps.js:81
 msgid "Disable"
 msgstr "Isključi"
 
-#: js/apps.js:36 js/apps.js:64 js/apps.js:83
+#: js/apps.js:41 js/apps.js:69 js/apps.js:88
 msgid "Enable"
 msgstr "Uključi"
 
-#: js/apps.js:55
+#: js/apps.js:60
 msgid "Please wait...."
 msgstr ""
 
-#: js/apps.js:59 js/apps.js:71 js/apps.js:80 js/apps.js:93
+#: js/apps.js:64 js/apps.js:76 js/apps.js:85 js/apps.js:98
 msgid "Error"
 msgstr "Greška"
 
-#: js/apps.js:90
+#: js/apps.js:95
 msgid "Updating...."
 msgstr ""
 
-#: js/apps.js:93
+#: js/apps.js:98
 msgid "Error while updating app"
 msgstr ""
 
-#: js/apps.js:96
+#: js/apps.js:101
 msgid "Updated"
 msgstr ""
 
@@ -165,15 +165,15 @@ msgstr ""
 msgid "A valid password must be provided"
 msgstr ""
 
-#: personal.php:35 personal.php:36
+#: personal.php:37 personal.php:38
 msgid "__language_name__"
 msgstr "__ime_jezika__"
 
-#: templates/admin.php:15
+#: templates/admin.php:17
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:18
+#: templates/admin.php:20
 msgid ""
 "Your data directory and your files are probably accessible from the "
 "internet. The .htaccess file that ownCloud provides is not working. We "
@@ -182,36 +182,36 @@ msgid ""
 " webserver document root."
 msgstr ""
 
-#: templates/admin.php:29
+#: templates/admin.php:31
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:32
+#: templates/admin.php:34
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: templates/admin.php:33
+#: templates/admin.php:35
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:44
+#: templates/admin.php:46
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:47
+#: templates/admin.php:49
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr ""
 
-#: templates/admin.php:58
+#: templates/admin.php:60
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:63
+#: templates/admin.php:65
 #, php-format
 msgid ""
 "This ownCloud server can't set system locale to %s. This means that there "
@@ -219,11 +219,11 @@ msgid ""
 " to install the required packages on your system to support %s."
 msgstr ""
 
-#: templates/admin.php:75
+#: templates/admin.php:77
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:78
+#: templates/admin.php:80
 msgid ""
 "This ownCloud server has no working internet connection. This means that "
 "some of the features like mounting of external storage, notifications about "
@@ -233,102 +233,102 @@ msgid ""
 " of ownCloud."
 msgstr ""
 
-#: templates/admin.php:92
+#: templates/admin.php:94
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:101
+#: templates/admin.php:103
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:111
+#: templates/admin.php:113
 msgid ""
 "cron.php is registered at a webcron service. Call the cron.php page in the "
 "owncloud root once a minute over http."
 msgstr ""
 
-#: templates/admin.php:121
+#: templates/admin.php:123
 msgid ""
 "Use systems cron service. Call the cron.php file in the owncloud folder via "
 "a system cronjob once a minute."
 msgstr ""
 
-#: templates/admin.php:128
+#: templates/admin.php:130
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:134
+#: templates/admin.php:136
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:135
+#: templates/admin.php:137
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:142
+#: templates/admin.php:144
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:143
+#: templates/admin.php:145
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:150
+#: templates/admin.php:152
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:151
+#: templates/admin.php:153
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:158
+#: templates/admin.php:160
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:161
+#: templates/admin.php:163
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:168
+#: templates/admin.php:170
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:181
+#: templates/admin.php:183
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:182
+#: templates/admin.php:184
 msgid ""
 "Enforces the clients to connect to ownCloud via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:185
+#: templates/admin.php:187
 msgid ""
 "Please connect to this ownCloud instance via HTTPS to enable or disable the "
 "SSL enforcement."
 msgstr ""
 
-#: templates/admin.php:195
+#: templates/admin.php:197
 msgid "Log"
 msgstr "dnevnik"
 
-#: templates/admin.php:196
+#: templates/admin.php:198
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:227
+#: templates/admin.php:229
 msgid "More"
 msgstr "više"
 
-#: templates/admin.php:228
+#: templates/admin.php:230
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:235 templates/personal.php:116
+#: templates/admin.php:236 templates/personal.php:116
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:237 templates/personal.php:119
+#: templates/admin.php:240 templates/personal.php:119
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -386,76 +386,79 @@ msgstr ""
 msgid "Commercial Support"
 msgstr ""
 
-#: templates/personal.php:9
+#: templates/personal.php:10
 msgid "Get the apps to sync your files"
 msgstr ""
 
-#: templates/personal.php:20
+#: templates/personal.php:21
 msgid "Show First Run Wizard again"
 msgstr ""
 
-#: templates/personal.php:28
+#: templates/personal.php:29
 #, php-format
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr ""
 
-#: templates/personal.php:40 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:41 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "Lozinka"
 
-#: templates/personal.php:41
+#: templates/personal.php:42
 msgid "Your password was changed"
 msgstr ""
 
-#: templates/personal.php:42
+#: templates/personal.php:43
 msgid "Unable to change your password"
 msgstr "Nemoguće promijeniti lozinku"
 
-#: templates/personal.php:43
+#: templates/personal.php:44
 msgid "Current password"
 msgstr "Trenutna lozinka"
 
-#: templates/personal.php:45
+#: templates/personal.php:46
 msgid "New password"
 msgstr "Nova lozinka"
 
-#: templates/personal.php:47
+#: templates/personal.php:48
 msgid "Change password"
 msgstr "Izmjena lozinke"
 
-#: templates/personal.php:59 templates/users.php:85
+#: templates/personal.php:60 templates/users.php:85
 msgid "Display Name"
 msgstr ""
 
-#: templates/personal.php:74
+#: templates/personal.php:75
 msgid "Email"
 msgstr "e-mail adresa"
 
-#: templates/personal.php:76
+#: templates/personal.php:77
 msgid "Your email address"
 msgstr "Vaša e-mail adresa"
 
-#: templates/personal.php:77
+#: templates/personal.php:78
 msgid "Fill in an email address to enable password recovery"
 msgstr "Ispunite vase e-mail adresa kako bi se omogućilo oporavak lozinke"
 
-#: templates/personal.php:86 templates/personal.php:87
+#: templates/personal.php:87 templates/personal.php:88
 msgid "Language"
 msgstr "Jezik"
 
-#: templates/personal.php:99
+#: templates/personal.php:100
 msgid "Help translate"
 msgstr "Pomoć prevesti"
 
-#: templates/personal.php:105
+#: templates/personal.php:106
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:107
-msgid "Use this address to connect to your ownCloud in your file manager"
+#: templates/personal.php:108
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
+"target=\"_blank\">access your Files via WebDAV</a>"
 msgstr ""
 
-#: templates/users.php:21 templates/users.php:84
+#: templates/users.php:21
 msgid "Login Name"
 msgstr ""
 
@@ -485,6 +488,10 @@ msgstr ""
 msgid "Other"
 msgstr "ostali"
 
+#: templates/users.php:84
+msgid "Username"
+msgstr "Korisničko ime"
+
 #: templates/users.php:91
 msgid "Storage"
 msgstr ""
diff --git a/l10n/hr/user_ldap.po b/l10n/hr/user_ldap.po
index bc2bca5fcd23f8b4281a7db7792cd1256ed51c32..8e302e2d62d4696529f284e02625246922865610 100644
--- a/l10n/hr/user_ldap.po
+++ b/l10n/hr/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:25+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:16+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/hu_HU/core.po b/l10n/hu_HU/core.po
index d4cffe14ed2ba381f08cfc9c6fb17ee353b712a0..c5473f83a19f40a414efcc6fb21d2c0538f0514e 100644
--- a/l10n/hu_HU/core.po
+++ b/l10n/hu_HU/core.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:22+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:14+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
 "MIME-Version: 1.0\n"
@@ -21,7 +21,7 @@ msgstr ""
 #: ajax/share.php:97
 #, php-format
 msgid "%s shared »%s« with you"
-msgstr ""
+msgstr "%s megosztotta Önnel ezt:  »%s«"
 
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
@@ -62,135 +62,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/config.php:34
+#: js/config.php:32
 msgid "Sunday"
 msgstr "vasárnap"
 
-#: js/config.php:35
+#: js/config.php:33
 msgid "Monday"
 msgstr "hétfő"
 
-#: js/config.php:36
+#: js/config.php:34
 msgid "Tuesday"
 msgstr "kedd"
 
-#: js/config.php:37
+#: js/config.php:35
 msgid "Wednesday"
 msgstr "szerda"
 
-#: js/config.php:38
+#: js/config.php:36
 msgid "Thursday"
 msgstr "csütörtök"
 
-#: js/config.php:39
+#: js/config.php:37
 msgid "Friday"
 msgstr "péntek"
 
-#: js/config.php:40
+#: js/config.php:38
 msgid "Saturday"
 msgstr "szombat"
 
-#: js/config.php:45
+#: js/config.php:43
 msgid "January"
 msgstr "január"
 
-#: js/config.php:46
+#: js/config.php:44
 msgid "February"
 msgstr "február"
 
-#: js/config.php:47
+#: js/config.php:45
 msgid "March"
 msgstr "március"
 
-#: js/config.php:48
+#: js/config.php:46
 msgid "April"
 msgstr "április"
 
-#: js/config.php:49
+#: js/config.php:47
 msgid "May"
 msgstr "május"
 
-#: js/config.php:50
+#: js/config.php:48
 msgid "June"
 msgstr "június"
 
-#: js/config.php:51
+#: js/config.php:49
 msgid "July"
 msgstr "július"
 
-#: js/config.php:52
+#: js/config.php:50
 msgid "August"
 msgstr "augusztus"
 
-#: js/config.php:53
+#: js/config.php:51
 msgid "September"
 msgstr "szeptember"
 
-#: js/config.php:54
+#: js/config.php:52
 msgid "October"
 msgstr "október"
 
-#: js/config.php:55
+#: js/config.php:53
 msgid "November"
 msgstr "november"
 
-#: js/config.php:56
+#: js/config.php:54
 msgid "December"
 msgstr "december"
 
-#: js/js.js:286
+#: js/js.js:293
 msgid "Settings"
 msgstr "Beállítások"
 
-#: js/js.js:718
+#: js/js.js:725
 msgid "seconds ago"
 msgstr "pár másodperce"
 
-#: js/js.js:719
+#: js/js.js:726
 msgid "1 minute ago"
 msgstr "1 perce"
 
-#: js/js.js:720
+#: js/js.js:727
 msgid "{minutes} minutes ago"
 msgstr "{minutes} perce"
 
-#: js/js.js:721
+#: js/js.js:728
 msgid "1 hour ago"
 msgstr "1 órája"
 
-#: js/js.js:722
+#: js/js.js:729
 msgid "{hours} hours ago"
 msgstr "{hours} órája"
 
-#: js/js.js:723
+#: js/js.js:730
 msgid "today"
 msgstr "ma"
 
-#: js/js.js:724
+#: js/js.js:731
 msgid "yesterday"
 msgstr "tegnap"
 
-#: js/js.js:725
+#: js/js.js:732
 msgid "{days} days ago"
 msgstr "{days} napja"
 
-#: js/js.js:726
+#: js/js.js:733
 msgid "last month"
 msgstr "múlt hónapban"
 
-#: js/js.js:727
+#: js/js.js:734
 msgid "{months} months ago"
 msgstr "{months} hónapja"
 
-#: js/js.js:728
+#: js/js.js:735
 msgid "months ago"
 msgstr "több hónapja"
 
-#: js/js.js:729
+#: js/js.js:736
 msgid "last year"
 msgstr "tavaly"
 
-#: js/js.js:730
+#: js/js.js:737
 msgid "years ago"
 msgstr "több éve"
 
@@ -226,8 +226,8 @@ msgstr "Az objektum típusa nincs megadva."
 #: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
 #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:577
-#: js/share.js:589
+#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:620
+#: js/share.js:632
 msgid "Error"
 msgstr "Hiba"
 
@@ -247,7 +247,7 @@ msgstr "Megosztott"
 msgid "Share"
 msgstr "Megosztás"
 
-#: js/share.js:125 js/share.js:617
+#: js/share.js:125 js/share.js:660
 msgid "Error while sharing"
 msgstr "Nem sikerült létrehozni a megosztást"
 
@@ -267,99 +267,103 @@ msgstr "Megosztotta Önnel és a(z) {group} csoporttal: {owner}"
 msgid "Shared with you by {owner}"
 msgstr "Megosztotta Önnel: {owner}"
 
-#: js/share.js:159
+#: js/share.js:172
 msgid "Share with"
 msgstr "Kivel osztom meg"
 
-#: js/share.js:164
+#: js/share.js:177
 msgid "Share with link"
 msgstr "Link megadásával osztom meg"
 
-#: js/share.js:167
+#: js/share.js:180
 msgid "Password protect"
 msgstr "Jelszóval is védem"
 
-#: js/share.js:169 templates/installation.php:54 templates/login.php:26
+#: js/share.js:182 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "Jelszó"
 
-#: js/share.js:173
+#: js/share.js:187
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:191
 msgid "Email link to person"
 msgstr "Email címre küldjük el"
 
-#: js/share.js:174
+#: js/share.js:192
 msgid "Send"
 msgstr "Küldjük el"
 
-#: js/share.js:178
+#: js/share.js:197
 msgid "Set expiration date"
 msgstr "Legyen lejárati idő"
 
-#: js/share.js:179
+#: js/share.js:198
 msgid "Expiration date"
 msgstr "A lejárati idő"
 
-#: js/share.js:211
+#: js/share.js:230
 msgid "Share via email:"
 msgstr "Megosztás emaillel:"
 
-#: js/share.js:213
+#: js/share.js:232
 msgid "No people found"
 msgstr "Nincs találat"
 
-#: js/share.js:251
+#: js/share.js:270
 msgid "Resharing is not allowed"
 msgstr "Ezt az állományt csak a tulajdonosa oszthatja meg másokkal"
 
-#: js/share.js:287
+#: js/share.js:306
 msgid "Shared in {item} with {user}"
 msgstr "Megosztva {item}-ben {user}-rel"
 
-#: js/share.js:308
+#: js/share.js:327
 msgid "Unshare"
 msgstr "A megosztás visszavonása"
 
-#: js/share.js:320
+#: js/share.js:339
 msgid "can edit"
 msgstr "módosíthat"
 
-#: js/share.js:322
+#: js/share.js:341
 msgid "access control"
 msgstr "jogosultság"
 
-#: js/share.js:325
+#: js/share.js:344
 msgid "create"
 msgstr "létrehoz"
 
-#: js/share.js:328
+#: js/share.js:347
 msgid "update"
 msgstr "szerkeszt"
 
-#: js/share.js:331
+#: js/share.js:350
 msgid "delete"
 msgstr "töröl"
 
-#: js/share.js:334
+#: js/share.js:353
 msgid "share"
 msgstr "megoszt"
 
-#: js/share.js:368 js/share.js:564
+#: js/share.js:387 js/share.js:607
 msgid "Password protected"
 msgstr "Jelszóval van védve"
 
-#: js/share.js:577
+#: js/share.js:620
 msgid "Error unsetting expiration date"
 msgstr "Nem sikerült a lejárati időt törölni"
 
-#: js/share.js:589
+#: js/share.js:632
 msgid "Error setting expiration date"
 msgstr "Nem sikerült a lejárati időt beállítani"
 
-#: js/share.js:604
+#: js/share.js:647
 msgid "Sending ..."
 msgstr "Küldés ..."
 
-#: js/share.js:615
+#: js/share.js:658
 msgid "Email sent"
 msgstr "Az emailt elküldtük"
 
@@ -374,7 +378,7 @@ msgstr "A frissítés nem sikerült. Kérem értesítse erről a problémáról
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "A frissítés sikeres volt. Visszairányítjuk az ownCloud szolgáltatáshoz."
 
-#: lostpassword/controller.php:58
+#: lostpassword/controller.php:60
 msgid "ownCloud password reset"
 msgstr "ownCloud jelszó-visszaállítás"
 
@@ -404,17 +408,17 @@ msgstr "Felhasználónév"
 
 #: lostpassword/templates/lostpassword.php:22
 msgid ""
-"Your files seems to be encrypted. If you didn't have enabled the recovery "
-"key there will be no way to get your data back once the password was "
-"resetted. If you are not sure what to do, please contact your administrator "
-"first before continue. Do you really want to continue?"
+"Your files are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
 msgstr ""
 
 #: lostpassword/templates/lostpassword.php:24
 msgid "Yes, I really want to reset my password now"
-msgstr ""
+msgstr "Igen, tényleg meg akarom változtatni a jelszavam"
 
-#: lostpassword/templates/lostpassword.php:29
+#: lostpassword/templates/lostpassword.php:27
 msgid "Request reset"
 msgstr "Visszaállítás igénylése"
 
@@ -462,7 +466,7 @@ msgstr "A hozzáférés nem engedélyezett"
 msgid "Cloud not found"
 msgstr "A felhő nem található"
 
-#: templates/altmail.php:2
+#: templates/altmail.php:4
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -471,11 +475,7 @@ msgid ""
 "View it: %s\n"
 "\n"
 "Cheers!"
-msgstr ""
-
-#: templates/altmail.php:7 templates/mail.php:24
-msgid "web services under your control"
-msgstr "webszolgáltatások saját kézben"
+msgstr "Üdv!\n\nÚj hír: %s megosztotta Önnel ezt: %s.\nItt nézhető meg: %s\n\nMinden jót!"
 
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
@@ -569,12 +569,12 @@ msgstr "Adatbázis szerver"
 msgid "Finish setup"
 msgstr "A beállítások befejezése"
 
-#: templates/layout.user.php:40
+#: templates/layout.user.php:43
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr "%s rendelkezésre áll. További információ a frissítéshez."
 
-#: templates/layout.user.php:67
+#: templates/layout.user.php:68
 msgid "Log out"
 msgstr "Kilépés"
 
@@ -608,12 +608,12 @@ msgstr "Bejelentkezés"
 msgid "Alternative Logins"
 msgstr "Alternatív bejelentkezés"
 
-#: templates/mail.php:15
+#: templates/mail.php:16
 #, php-format
 msgid ""
 "Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
 "href=\"%s\">View it!</a><br><br>Cheers!"
-msgstr ""
+msgstr "Üdv!<br><br>Új hír: %s megosztotta Önnel ezt:  »%s«.<br><a href=\"%s\">Itt nézhető meg!</a><br><br>Minden jót!"
 
 #: templates/part.pagenavi.php:3
 msgid "prev"
diff --git a/l10n/hu_HU/files.po b/l10n/hu_HU/files.po
index 16ea4a1c62e8cd4d3eb4bd7dd1fc07acaac03e96..ffb060f6215a2f8ff45b2ceae3762987ac4cdcbc 100644
--- a/l10n/hu_HU/files.po
+++ b/l10n/hu_HU/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-06-17 02:01+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
-"Last-Translator: Laszlo Tornoci <torlasz@gmail.com>\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -28,46 +28,54 @@ msgstr "%s áthelyezése nem sikerült - már létezik másik fájl ezzel a név
 msgid "Could not move %s"
 msgstr "Nem sikerült %s áthelyezése"
 
-#: ajax/upload.php:19
+#: ajax/upload.php:16 ajax/upload.php:45
+msgid "Unable to set upload directory."
+msgstr ""
+
+#: ajax/upload.php:22
+msgid "Invalid Token"
+msgstr ""
+
+#: ajax/upload.php:59
 msgid "No file was uploaded. Unknown error"
 msgstr "Nem történt feltöltés. Ismeretlen hiba"
 
-#: ajax/upload.php:26
+#: ajax/upload.php:66
 msgid "There is no error, the file uploaded with success"
 msgstr "A fájlt sikerült feltölteni"
 
-#: ajax/upload.php:27
+#: ajax/upload.php:67
 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:29
+#: ajax/upload.php:69
 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:30
+#: ajax/upload.php:70
 msgid "The uploaded file was only partially uploaded"
 msgstr "Az eredeti fájlt csak részben sikerült feltölteni."
 
-#: ajax/upload.php:31
+#: ajax/upload.php:71
 msgid "No file was uploaded"
 msgstr "Nem töltődött fel állomány"
 
-#: ajax/upload.php:32
+#: ajax/upload.php:72
 msgid "Missing a temporary folder"
 msgstr "Hiányzik egy ideiglenes mappa"
 
-#: ajax/upload.php:33
+#: ajax/upload.php:73
 msgid "Failed to write to disk"
 msgstr "Nem sikerült a lemezre történő írás"
 
-#: ajax/upload.php:51
+#: ajax/upload.php:91
 msgid "Not enough storage available"
 msgstr "Nincs elég szabad hely."
 
-#: ajax/upload.php:83
+#: ajax/upload.php:123
 msgid "Invalid directory."
 msgstr "Érvénytelen mappa."
 
@@ -75,6 +83,36 @@ msgstr "Érvénytelen mappa."
 msgid "Files"
 msgstr "Fájlok"
 
+#: js/file-upload.js:11
+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/file-upload.js:24
+msgid "Not enough space available"
+msgstr "Nincs elég szabad hely"
+
+#: js/file-upload.js:64
+msgid "Upload cancelled."
+msgstr "A feltöltést megszakítottuk."
+
+#: js/file-upload.js:167 js/files.js:266
+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/file-upload.js:233 js/files.js:339
+msgid "URL cannot be empty."
+msgstr "Az URL nem lehet semmi."
+
+#: js/file-upload.js:238 lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr "Érvénytelen mappanév. A 'Shared' az ownCloud számára fenntartott elnevezés"
+
+#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
+#: js/files.js:693 js/files.js:731
+msgid "Error"
+msgstr "Hiba"
+
 #: js/fileactions.js:116
 msgid "Share"
 msgstr "Megosztás"
@@ -91,43 +129,43 @@ msgstr "Törlés"
 msgid "Rename"
 msgstr "Átnevezés"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:464
 msgid "Pending"
 msgstr "Folyamatban"
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "{new_name} already exists"
 msgstr "{new_name} már létezik"
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "replace"
 msgstr "írjuk fölül"
 
-#: js/filelist.js:259
+#: js/filelist.js:302
 msgid "suggest name"
 msgstr "legyen más neve"
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "cancel"
 msgstr "mégse"
 
-#: js/filelist.js:306
+#: js/filelist.js:349
 msgid "replaced {new_name} with {old_name}"
 msgstr "{new_name} fájlt kicseréltük ezzel:  {old_name}"
 
-#: js/filelist.js:306
+#: js/filelist.js:349
 msgid "undo"
 msgstr "visszavonás"
 
-#: js/filelist.js:331
+#: js/filelist.js:374
 msgid "perform delete operation"
 msgstr "a törlés végrehajtása"
 
-#: js/filelist.js:413
+#: js/filelist.js:456
 msgid "1 file uploading"
 msgstr "1 fájl töltődik föl"
 
-#: js/filelist.js:416 js/filelist.js:470
+#: js/filelist.js:459 js/filelist.js:517
 msgid "files uploading"
 msgstr "fájl töltődik föl"
 
@@ -159,70 +197,42 @@ msgid ""
 "big."
 msgstr "Készül a letöltendő állomány. Ez eltarthat egy ideig, ha nagyok a fájlok."
 
-#: js/files.js:264
-msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "Nem tölthető fel, mert mappa volt, vagy 0 byte méretű"
-
-#: js/files.js:277
-msgid "Not enough space available"
-msgstr "Nincs elég szabad hely"
-
-#: js/files.js:317
-msgid "Upload cancelled."
-msgstr "A feltöltést megszakítottuk."
-
-#: js/files.js:413
-msgid ""
-"File upload is in progress. Leaving the page now will cancel the upload."
-msgstr "Fájlfeltöltés van folyamatban. Az oldal elhagyása megszakítja a feltöltést."
-
-#: js/files.js:486
-msgid "URL cannot be empty."
-msgstr "Az URL nem lehet semmi."
-
-#: js/files.js:491
+#: js/files.js:344
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Érvénytelen mappanév. A név használata csak a Owncloud számára lehetséges."
 
-#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
-msgid "Error"
-msgstr "Hiba"
-
-#: js/files.js:877 templates/index.php:69
+#: js/files.js:744 templates/index.php:69
 msgid "Name"
 msgstr "Név"
 
-#: js/files.js:878 templates/index.php:80
+#: js/files.js:745 templates/index.php:80
 msgid "Size"
 msgstr "Méret"
 
-#: js/files.js:879 templates/index.php:82
+#: js/files.js:746 templates/index.php:82
 msgid "Modified"
 msgstr "Módosítva"
 
-#: js/files.js:898
+#: js/files.js:765
 msgid "1 folder"
 msgstr "1 mappa"
 
-#: js/files.js:900
+#: js/files.js:767
 msgid "{count} folders"
 msgstr "{count} mappa"
 
-#: js/files.js:908
+#: js/files.js:775
 msgid "1 file"
 msgstr "1 fájl"
 
-#: js/files.js:910
+#: js/files.js:777
 msgid "{count} files"
 msgstr "{count} fájl"
 
-#: lib/app.php:53
-msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
-msgstr "Érvénytelen mappanév. A 'Shared' az ownCloud számára fenntartott elnevezés"
-
 #: lib/app.php:73
-msgid "Unable to rename file"
-msgstr "Nem lehet átnevezni a fájlt"
+#, php-format
+msgid "%s could not be renamed"
+msgstr ""
 
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
@@ -318,6 +328,22 @@ msgstr "A fájllista ellenőrzése zajlik, kis türelmet!"
 msgid "Current scanning"
 msgstr "Ellenőrzés alatt"
 
+#: templates/part.list.php:76
+msgid "directory"
+msgstr ""
+
+#: templates/part.list.php:78
+msgid "directories"
+msgstr ""
+
+#: templates/part.list.php:87
+msgid "file"
+msgstr "fájl"
+
+#: templates/part.list.php:89
+msgid "files"
+msgstr "fájlok"
+
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
 msgstr "A fájlrendszer gyorsítótárának frissítése zajlik..."
diff --git a/l10n/hu_HU/files_encryption.po b/l10n/hu_HU/files_encryption.po
index 2d5ccff9cf1d48254308e1cdca185c64015c7670..cac07fdabb5a5b75d8f2fe014ac4e750185001a4 100644
--- a/l10n/hu_HU/files_encryption.po
+++ b/l10n/hu_HU/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-14 02:46+0200\n"
-"PO-Revision-Date: 2013-06-14 00:47+0000\n"
+"POT-Creation-Date: 2013-07-05 02:12+0200\n"
+"PO-Revision-Date: 2013-07-05 00:13+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"
@@ -55,9 +55,21 @@ msgstr ""
 
 #: files/error.php:7
 msgid ""
-"Your private key is not valid! Maybe your password was changed from outside."
-" You can update your private key password in your personal settings to "
-"regain access to your files"
+"Your private key is not valid! Likely your password was changed outside the "
+"ownCloud system (e.g. your corporate directory). You can update your private"
+" key password in your personal settings to recover access to your encrypted "
+"files."
+msgstr ""
+
+#: hooks/hooks.php:44
+msgid "Missing requirements."
+msgstr ""
+
+#: hooks/hooks.php:45
+msgid ""
+"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL "
+"PHP extension is enabled and configured properly. For now, the encryption "
+"app has been disabled."
 msgstr ""
 
 #: js/settings-admin.js:11
@@ -84,11 +96,11 @@ msgstr "Titkosítás"
 
 #: templates/settings-admin.php:10
 msgid ""
-"Enable encryption passwords recovery key (allow sharing to recovery key):"
+"Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
 #: templates/settings-admin.php:14
-msgid "Recovery account password"
+msgid "Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:21 templates/settings-personal.php:54
@@ -100,15 +112,15 @@ msgid "Disabled"
 msgstr ""
 
 #: templates/settings-admin.php:34
-msgid "Change encryption passwords recovery key:"
+msgid "Change recovery key password:"
 msgstr ""
 
 #: templates/settings-admin.php:41
-msgid "Old Recovery account password"
+msgid "Old Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:48
-msgid "New Recovery account password"
+msgid "New Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:53
diff --git a/l10n/hu_HU/files_external.po b/l10n/hu_HU/files_external.po
index f0b2399ce5a5a66ab90f0ffce608ef3723bf9700..ba14200cf423fcd09c4a8877b8d82a80da86beb2 100644
--- a/l10n/hu_HU/files_external.po
+++ b/l10n/hu_HU/files_external.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: Laszlo Tornoci <torlasz@gmail.com>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/hu_HU/files_sharing.po b/l10n/hu_HU/files_sharing.po
index 3bac73597686959156226d94c40d08f0b28f9d1f..a126f0db6cddb59b0495279fdee7d8965fef7ee0 100644
--- a/l10n/hu_HU/files_sharing.po
+++ b/l10n/hu_HU/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
 "MIME-Version: 1.0\n"
@@ -18,27 +18,39 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: templates/authenticate.php:4
+msgid "The password is wrong. Try again."
+msgstr ""
+
+#: templates/authenticate.php:7
 msgid "Password"
 msgstr "Jelszó"
 
-#: templates/authenticate.php:6
+#: templates/authenticate.php:9
 msgid "Submit"
 msgstr "Elküld"
 
-#: templates/public.php:10
+#: templates/public.php:17
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s megosztotta Önnel ezt a mappát: %s"
 
-#: templates/public.php:13
+#: templates/public.php:20
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s megosztotta Önnel ezt az állományt: %s"
 
-#: templates/public.php:19 templates/public.php:43
+#: templates/public.php:28 templates/public.php:90
 msgid "Download"
 msgstr "Letöltés"
 
-#: templates/public.php:40
+#: templates/public.php:45 templates/public.php:48
+msgid "Upload"
+msgstr "Feltöltés"
+
+#: templates/public.php:58
+msgid "Cancel upload"
+msgstr "A feltöltés megszakítása"
+
+#: templates/public.php:87
 msgid "No preview available for"
 msgstr "Nem áll rendelkezésre előnézet ehhez: "
diff --git a/l10n/hu_HU/files_trashbin.po b/l10n/hu_HU/files_trashbin.po
index 863e29b6752cdffd3eea68face6134b9c5410c79..8758e42ca73228a16f54b096534562c0d2558fe4 100644
--- a/l10n/hu_HU/files_trashbin.po
+++ b/l10n/hu_HU/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/hu_HU/lib.po b/l10n/hu_HU/lib.po
index a8326b1bb3388934eb8865c05ada32db6ef1111e..dd69c7c7a2d58b406f4080356bcde779869abaa1 100644
--- a/l10n/hu_HU/lib.po
+++ b/l10n/hu_HU/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-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
-"Last-Translator: Laszlo Tornoci <torlasz@gmail.com>\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,43 +18,47 @@ msgstr ""
 "Language: hu_HU\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:359
+#: app.php:360
 msgid "Help"
 msgstr "Súgó"
 
-#: app.php:372
+#: app.php:373
 msgid "Personal"
 msgstr "Személyes"
 
-#: app.php:383
+#: app.php:384
 msgid "Settings"
 msgstr "Beállítások"
 
-#: app.php:395
+#: app.php:396
 msgid "Users"
 msgstr "Felhasználók"
 
-#: app.php:408
+#: app.php:409
 msgid "Apps"
 msgstr "Alkalmazások"
 
-#: app.php:416
+#: app.php:417
 msgid "Admin"
 msgstr "Adminsztráció"
 
-#: files.php:210
+#: defaults.php:33
+msgid "web services under your control"
+msgstr "webszolgáltatások saját kézben"
+
+#: files.php:226
 msgid "ZIP download is turned off."
 msgstr "A ZIP-letöltés nincs engedélyezve."
 
-#: files.php:211
+#: files.php:227
 msgid "Files need to be downloaded one by one."
 msgstr "A fájlokat egyenként kell letölteni."
 
-#: files.php:212 files.php:245
+#: files.php:228 files.php:261
 msgid "Back to Files"
 msgstr "Vissza a Fájlokhoz"
 
-#: files.php:242
+#: files.php:258
 msgid "Selected files too large to generate zip file."
 msgstr "A kiválasztott fájlok túl nagyok a zip tömörítéshez."
 
@@ -86,104 +90,102 @@ msgstr "Szöveg"
 msgid "Images"
 msgstr "Képek"
 
-#: setup.php:34
-msgid "Set an admin username."
-msgstr "Állítson be egy felhasználói nevet az adminisztrációhoz."
-
-#: setup.php:37
-msgid "Set an admin password."
-msgstr "Állítson be egy jelszót az adminisztrációhoz."
-
-#: setup.php:55
+#: setup/abstractdatabase.php:22
 #, php-format
 msgid "%s enter the database username."
 msgstr "%s adja meg az adatbázist elérő felhasználó login nevét."
 
-#: setup.php:58
+#: setup/abstractdatabase.php:25
 #, php-format
 msgid "%s enter the database name."
 msgstr "%s adja meg az adatbázis nevét."
 
-#: setup.php:61
+#: setup/abstractdatabase.php:28
 #, php-format
 msgid "%s you may not use dots in the database name"
 msgstr "%s az adatbázis neve nem tartalmazhat pontot"
 
-#: setup.php:64
+#: setup/mssql.php:20
 #, php-format
-msgid "%s set the database host."
-msgstr "%s adja meg az adatbázist szolgáltató számítógép nevét."
-
-#: setup.php:126 setup.php:332 setup.php:377
-msgid "PostgreSQL username and/or password not valid"
-msgstr "A PostgreSQL felhasználói név és/vagy jelszó érvénytelen"
+msgid "MS SQL username and/or password not valid: %s"
+msgstr "Az MS SQL felhasználónév és/vagy jelszó érvénytelen: %s"
 
-#: setup.php:127 setup.php:235
+#: setup/mssql.php:21 setup/mysql.php:13 setup/oci.php:114
+#: setup/postgresql.php:24 setup/postgresql.php:70
 msgid "You need to enter either an existing account or the administrator."
 msgstr "Vagy egy létező felhasználó vagy az adminisztrátor bejelentkezési nevét kell megadnia"
 
-#: setup.php:152
-msgid "Oracle connection could not be established"
-msgstr "Az Oracle kapcsolat nem hozható létre"
-
-#: setup.php:234
+#: setup/mysql.php:12
 msgid "MySQL username and/or password not valid"
 msgstr "A MySQL felhasználói név és/vagy jelszó érvénytelen"
 
-#: setup.php:288 setup.php:398 setup.php:407 setup.php:425 setup.php:435
-#: setup.php:444 setup.php:477 setup.php:543 setup.php:569 setup.php:576
-#: setup.php:587 setup.php:594 setup.php:603 setup.php:611 setup.php:620
-#: setup.php:626
+#: setup/mysql.php:67 setup/oci.php:54 setup/oci.php:121 setup/oci.php:147
+#: setup/oci.php:154 setup/oci.php:165 setup/oci.php:172 setup/oci.php:181
+#: setup/oci.php:189 setup/oci.php:198 setup/oci.php:204
+#: setup/postgresql.php:89 setup/postgresql.php:98 setup/postgresql.php:115
+#: setup/postgresql.php:125 setup/postgresql.php:134
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr "Adatbázis hiba: \"%s\""
 
-#: setup.php:289 setup.php:399 setup.php:408 setup.php:426 setup.php:436
-#: setup.php:445 setup.php:478 setup.php:544 setup.php:570 setup.php:577
-#: setup.php:588 setup.php:604 setup.php:612 setup.php:621
+#: setup/mysql.php:68 setup/oci.php:55 setup/oci.php:122 setup/oci.php:148
+#: setup/oci.php:155 setup/oci.php:166 setup/oci.php:182 setup/oci.php:190
+#: setup/oci.php:199 setup/postgresql.php:90 setup/postgresql.php:99
+#: setup/postgresql.php:116 setup/postgresql.php:126 setup/postgresql.php:135
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr "A hibát ez a parancs okozta: \"%s\""
 
-#: setup.php:305
+#: setup/mysql.php:85
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr "A '%s'@'localhost' MySQL felhasználó már létezik."
 
-#: setup.php:306
+#: setup/mysql.php:86
 msgid "Drop this user from MySQL"
 msgstr "Törölje ezt a felhasználót a MySQL-ből"
 
-#: setup.php:311
+#: setup/mysql.php:91
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr "A '%s'@'%%' MySQL felhasználó már létezik"
 
-#: setup.php:312
+#: setup/mysql.php:92
 msgid "Drop this user from MySQL."
 msgstr "Törölje ezt a felhasználót a MySQL-ből."
 
-#: setup.php:469 setup.php:536
+#: setup/oci.php:34
+msgid "Oracle connection could not be established"
+msgstr "Az Oracle kapcsolat nem hozható létre"
+
+#: setup/oci.php:41 setup/oci.php:113
 msgid "Oracle username and/or password not valid"
 msgstr "Az Oracle felhasználói név és/vagy jelszó érvénytelen"
 
-#: setup.php:595 setup.php:627
+#: setup/oci.php:173 setup/oci.php:205
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr "A hibát okozó parancs ez volt: \"%s\", login név: %s, jelszó: %s"
 
-#: setup.php:647
-#, php-format
-msgid "MS SQL username and/or password not valid: %s"
-msgstr "Az MS SQL felhasználónév és/vagy jelszó érvénytelen: %s"
+#: setup/postgresql.php:23 setup/postgresql.php:69
+msgid "PostgreSQL username and/or password not valid"
+msgstr "A PostgreSQL felhasználói név és/vagy jelszó érvénytelen"
+
+#: setup.php:42
+msgid "Set an admin username."
+msgstr "Állítson be egy felhasználói nevet az adminisztrációhoz."
+
+#: setup.php:45
+msgid "Set an admin password."
+msgstr "Állítson be egy jelszót az adminisztrációhoz."
 
-#: setup.php:870
+#: setup.php:198
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Az Ön webkiszolgálója nincs megfelelően beállítva az állományok szinkronizálásához, mert a WebDAV-elérés úgy tűnik, nem működik."
 
-#: setup.php:871
+#: setup.php:199
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Kérjük tüzetesen tanulmányozza át a <a href='%s'>telepítési útmutatót</a>."
diff --git a/l10n/hu_HU/settings.po b/l10n/hu_HU/settings.po
index e3392c2e67185e7ee0f8fd47d0267c406b3915c7..52587409a7b7154b5ff670ff450fa35c99c5bb12 100644
--- a/l10n/hu_HU/settings.po
+++ b/l10n/hu_HU/settings.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
 "MIME-Version: 1.0\n"
@@ -90,35 +90,35 @@ msgstr "A felhasználó nem távolítható el ebből a csoportból: %s"
 msgid "Couldn't update app."
 msgstr "A program frissítése nem sikerült."
 
-#: js/apps.js:30
+#: js/apps.js:35
 msgid "Update to {appversion}"
 msgstr "Frissítés erre a verzióra: {appversion}"
 
-#: js/apps.js:36 js/apps.js:76
+#: js/apps.js:41 js/apps.js:81
 msgid "Disable"
 msgstr "Letiltás"
 
-#: js/apps.js:36 js/apps.js:64 js/apps.js:83
+#: js/apps.js:41 js/apps.js:69 js/apps.js:88
 msgid "Enable"
 msgstr "engedélyezve"
 
-#: js/apps.js:55
+#: js/apps.js:60
 msgid "Please wait...."
 msgstr "Kérem várjon..."
 
-#: js/apps.js:59 js/apps.js:71 js/apps.js:80 js/apps.js:93
+#: js/apps.js:64 js/apps.js:76 js/apps.js:85 js/apps.js:98
 msgid "Error"
 msgstr "Hiba"
 
-#: js/apps.js:90
+#: js/apps.js:95
 msgid "Updating...."
 msgstr "Frissítés folyamatban..."
 
-#: js/apps.js:93
+#: js/apps.js:98
 msgid "Error while updating app"
 msgstr "Hiba történt a programfrissítés közben"
 
-#: js/apps.js:96
+#: js/apps.js:101
 msgid "Updated"
 msgstr "Frissítve"
 
@@ -167,15 +167,15 @@ msgstr "A felhasználó nem hozható létre"
 msgid "A valid password must be provided"
 msgstr "Érvényes jelszót kell megadnia"
 
-#: personal.php:35 personal.php:36
+#: personal.php:37 personal.php:38
 msgid "__language_name__"
 msgstr "__language_name__"
 
-#: templates/admin.php:15
+#: templates/admin.php:17
 msgid "Security Warning"
 msgstr "Biztonsági figyelmeztetés"
 
-#: templates/admin.php:18
+#: templates/admin.php:20
 msgid ""
 "Your data directory and your files are probably accessible from the "
 "internet. The .htaccess file that ownCloud provides is not working. We "
@@ -184,36 +184,36 @@ msgid ""
 " webserver document root."
 msgstr "Az adatkönytára és az itt levő fájlok valószínűleg elérhetők az internetről. Az ownCloud által beillesztett .htaccess fájl nem működik. Nagyon fontos, hogy a webszervert úgy konfigurálja, hogy az adatkönyvtár ne legyen közvetlenül kívülről elérhető, vagy az adatkönyvtárt tegye a webszerver dokumentumfáján kívülre."
 
-#: templates/admin.php:29
+#: templates/admin.php:31
 msgid "Setup Warning"
 msgstr "A beállítással kapcsolatos figyelmeztetés"
 
-#: templates/admin.php:32
+#: templates/admin.php:34
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Az Ön webkiszolgálója nincs megfelelően beállítva az állományok szinkronizálásához, mert a WebDAV-elérés úgy tűnik, nem működik."
 
-#: templates/admin.php:33
+#: templates/admin.php:35
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Kérjük tüzetesen tanulmányozza át a <a href='%s'>telepítési útmutatót</a>."
 
-#: templates/admin.php:44
+#: templates/admin.php:46
 msgid "Module 'fileinfo' missing"
 msgstr "A 'fileinfo' modul hiányzik"
 
-#: templates/admin.php:47
+#: templates/admin.php:49
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr "A 'fileinfo' PHP modul hiányzik. Erősen javasolt ennek a modulnak a telepítése a MIME-típusok felismerésének eredményessé tételéhez."
 
-#: templates/admin.php:58
+#: templates/admin.php:60
 msgid "Locale not working"
 msgstr "A nyelvi lokalizáció nem működik"
 
-#: templates/admin.php:63
+#: templates/admin.php:65
 #, php-format
 msgid ""
 "This ownCloud server can't set system locale to %s. This means that there "
@@ -221,11 +221,11 @@ msgid ""
 " to install the required packages on your system to support %s."
 msgstr "Ezen az ownCloud kiszolgálón nem használható a %s nyelvi beállítás. Ez azt jelenti, hogy a fájlnevekben gond lehet bizonyos karakterekkel. Nyomatékosan ajánlott, hogy telepítse a szükséges csomagokat annak érdekében, hogy a rendszer támogassa a %s beállítást."
 
-#: templates/admin.php:75
+#: templates/admin.php:77
 msgid "Internet connection not working"
 msgstr "Az internet kapcsolat nem működik"
 
-#: templates/admin.php:78
+#: templates/admin.php:80
 msgid ""
 "This ownCloud server has no working internet connection. This means that "
 "some of the features like mounting of external storage, notifications about "
@@ -235,102 +235,102 @@ msgid ""
 " of ownCloud."
 msgstr "Az ownCloud kiszolgálónak nincs internet kapcsolata. Ez azt jelenti, hogy bizonyos dolgok nem fognak működni, pl. külső tárolók csatolása, programfrissítésekről való értesítések, vagy külső fejlesztői modulok telepítése. Lehet, hogy az állományok távolról történő elérése, ill. az email értesítések sem fog működni. Javasoljuk, hogy engedélyezze az internet kapcsolatot a kiszolgáló számára, ha az ownCloud összes szolgáltatását szeretné használni."
 
-#: templates/admin.php:92
+#: templates/admin.php:94
 msgid "Cron"
 msgstr "Ãœtemezett feladatok"
 
-#: templates/admin.php:101
+#: templates/admin.php:103
 msgid "Execute one task with each page loaded"
 msgstr "Egy-egy feladat végrehajtása minden alkalommal, amikor egy weboldalt letöltenek"
 
-#: templates/admin.php:111
+#: templates/admin.php:113
 msgid ""
 "cron.php is registered at a webcron service. Call the cron.php page in the "
 "owncloud root once a minute over http."
 msgstr "A cron.php webcron szolgáltatásként van regisztrálva. Hívja meg az owncloud könyvtárban levő cron.php állományt http-n keresztül percenként egyszer."
 
-#: templates/admin.php:121
+#: templates/admin.php:123
 msgid ""
 "Use systems cron service. Call the cron.php file in the owncloud folder via "
 "a system cronjob once a minute."
 msgstr "A rendszer cron szolgáltatásának használata. Hívja meg az owncloud könyvtárban levő  cron.php állományt percenként egyszer a rendszer cron szolgáltatásának segítségével."
 
-#: templates/admin.php:128
+#: templates/admin.php:130
 msgid "Sharing"
 msgstr "Megosztás"
 
-#: templates/admin.php:134
+#: templates/admin.php:136
 msgid "Enable Share API"
 msgstr "A megosztás API-jának engedélyezése"
 
-#: templates/admin.php:135
+#: templates/admin.php:137
 msgid "Allow apps to use the Share API"
 msgstr "Lehetővé teszi, hogy a programmodulok is használhassák a megosztást"
 
-#: templates/admin.php:142
+#: templates/admin.php:144
 msgid "Allow links"
 msgstr "Linkek engedélyezése"
 
-#: templates/admin.php:143
+#: templates/admin.php:145
 msgid "Allow users to share items to the public with links"
 msgstr "Lehetővé teszi, hogy a felhasználók linkek segítségével külsősökkel is megoszthassák az adataikat"
 
-#: templates/admin.php:150
+#: templates/admin.php:152
 msgid "Allow resharing"
 msgstr "A továbbosztás engedélyezése"
 
-#: templates/admin.php:151
+#: templates/admin.php:153
 msgid "Allow users to share items shared with them again"
 msgstr "Lehetővé teszi, hogy a felhasználók a velük megosztott állományokat megosszák egy további, harmadik féllel"
 
-#: templates/admin.php:158
+#: templates/admin.php:160
 msgid "Allow users to share with anyone"
 msgstr "A felhasználók bárkivel megoszthatják állományaikat"
 
-#: templates/admin.php:161
+#: templates/admin.php:163
 msgid "Allow users to only share with users in their groups"
 msgstr "A felhasználók csak olyanokkal oszthatják meg állományaikat, akikkel közös csoportban vannak"
 
-#: templates/admin.php:168
+#: templates/admin.php:170
 msgid "Security"
 msgstr "Biztonság"
 
-#: templates/admin.php:181
+#: templates/admin.php:183
 msgid "Enforce HTTPS"
 msgstr "Kötelező HTTPS"
 
-#: templates/admin.php:182
+#: templates/admin.php:184
 msgid ""
 "Enforces the clients to connect to ownCloud via an encrypted connection."
 msgstr "Kötelezővé teszi, hogy a böngészőprogramok titkosított csatornán kapcsolódjanak az ownCloud szolgáltatáshoz."
 
-#: templates/admin.php:185
+#: templates/admin.php:187
 msgid ""
 "Please connect to this ownCloud instance via HTTPS to enable or disable the "
 "SSL enforcement."
 msgstr "Kérjük, hogy HTTPS protokollt használjon, ha be vagy ki  akarja kapcsolni a kötelező SSL beállítást."
 
-#: templates/admin.php:195
+#: templates/admin.php:197
 msgid "Log"
 msgstr "Naplózás"
 
-#: templates/admin.php:196
+#: templates/admin.php:198
 msgid "Log level"
 msgstr "Naplózási szint"
 
-#: templates/admin.php:227
+#: templates/admin.php:229
 msgid "More"
 msgstr "Több"
 
-#: templates/admin.php:228
+#: templates/admin.php:230
 msgid "Less"
 msgstr "Kevesebb"
 
-#: templates/admin.php:235 templates/personal.php:116
+#: templates/admin.php:236 templates/personal.php:116
 msgid "Version"
 msgstr "Verzió"
 
-#: templates/admin.php:237 templates/personal.php:119
+#: templates/admin.php:240 templates/personal.php:119
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -388,76 +388,79 @@ msgstr "Hibabejelentések"
 msgid "Commercial Support"
 msgstr "Megvásárolható támogatás"
 
-#: templates/personal.php:9
+#: templates/personal.php:10
 msgid "Get the apps to sync your files"
 msgstr "Töltse le az állományok szinkronizációjához szükséges programokat"
 
-#: templates/personal.php:20
+#: templates/personal.php:21
 msgid "Show First Run Wizard again"
 msgstr "Nézzük meg újra az első bejelentkezéskori segítséget!"
 
-#: templates/personal.php:28
+#: templates/personal.php:29
 #, php-format
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "Az Ön tárterület-felhasználása jelenleg: <strong>%s</strong>. Maximálisan ennyi áll rendelkezésére: <strong>%s</strong>"
 
-#: templates/personal.php:40 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:41 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "Jelszó"
 
-#: templates/personal.php:41
+#: templates/personal.php:42
 msgid "Your password was changed"
 msgstr "A jelszava megváltozott"
 
-#: templates/personal.php:42
+#: templates/personal.php:43
 msgid "Unable to change your password"
 msgstr "A jelszó nem változtatható meg"
 
-#: templates/personal.php:43
+#: templates/personal.php:44
 msgid "Current password"
 msgstr "A jelenlegi jelszó"
 
-#: templates/personal.php:45
+#: templates/personal.php:46
 msgid "New password"
 msgstr "Az új jelszó"
 
-#: templates/personal.php:47
+#: templates/personal.php:48
 msgid "Change password"
 msgstr "A jelszó megváltoztatása"
 
-#: templates/personal.php:59 templates/users.php:85
+#: templates/personal.php:60 templates/users.php:85
 msgid "Display Name"
 msgstr "A megjelenített név"
 
-#: templates/personal.php:74
+#: templates/personal.php:75
 msgid "Email"
 msgstr "Email"
 
-#: templates/personal.php:76
+#: templates/personal.php:77
 msgid "Your email address"
 msgstr "Az Ön email címe"
 
-#: templates/personal.php:77
+#: templates/personal.php:78
 msgid "Fill in an email address to enable password recovery"
 msgstr "Adja meg az email címét, hogy jelszó-emlékeztetőt kérhessen, ha elfelejtette a jelszavát!"
 
-#: templates/personal.php:86 templates/personal.php:87
+#: templates/personal.php:87 templates/personal.php:88
 msgid "Language"
 msgstr "Nyelv"
 
-#: templates/personal.php:99
+#: templates/personal.php:100
 msgid "Help translate"
 msgstr "Segítsen a fordításban!"
 
-#: templates/personal.php:105
+#: templates/personal.php:106
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:107
-msgid "Use this address to connect to your ownCloud in your file manager"
-msgstr "Ennek a címnek a megadásával a WebDAV-protokollon keresztül saját gépének fájlkezelőjével is is elérheti az állományait."
+#: templates/personal.php:108
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
+"target=\"_blank\">access your Files via WebDAV</a>"
+msgstr ""
 
-#: templates/users.php:21 templates/users.php:84
+#: templates/users.php:21
 msgid "Login Name"
 msgstr "Bejelentkezési név"
 
@@ -473,7 +476,7 @@ msgstr "A jelszóvisszaállítás adminisztrációja"
 msgid ""
 "Enter the recovery password in order to recover the users files during "
 "password change"
-msgstr ""
+msgstr "Adja meg az adatok visszanyeréséhez szükséges jelszót arra az esetre, ha a felhasználók megváltoztatják a jelszavukat"
 
 #: templates/users.php:42
 msgid "Default Storage"
@@ -487,6 +490,10 @@ msgstr "Korlátlan"
 msgid "Other"
 msgstr "Más"
 
+#: templates/users.php:84
+msgid "Username"
+msgstr "Felhasználónév"
+
 #: templates/users.php:91
 msgid "Storage"
 msgstr "Tárhely"
diff --git a/l10n/hu_HU/user_ldap.po b/l10n/hu_HU/user_ldap.po
index b9fa5bf281b30735dc2419fff7c2c4bbcb1fa760..091a4911615948ef435f21c3fa311f229cf7cf89 100644
--- a/l10n/hu_HU/user_ldap.po
+++ b/l10n/hu_HU/user_ldap.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:25+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:16+0000\n"
 "Last-Translator: Laszlo Tornoci <torlasz@gmail.com>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/hy/core.po b/l10n/hy/core.po
index 23d6a9c882bf2ea23dc495bd0896c8d27bf90419..2238a3574fdcb5390ad3e366aec2db3988fa05c7 100644
--- a/l10n/hy/core.po
+++ b/l10n/hy/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-15 01:59+0200\n"
-"PO-Revision-Date: 2013-06-14 23:59+0000\n"
+"POT-Creation-Date: 2013-07-06 02:02+0200\n"
+"PO-Revision-Date: 2013-07-06 00:02+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
 "MIME-Version: 1.0\n"
@@ -61,135 +61,135 @@ msgstr ""
 msgid "Error removing %s from favorites."
 msgstr ""
 
-#: js/config.php:34
+#: js/config.php:32
 msgid "Sunday"
 msgstr "Ô¿Õ«Ö€Õ¡Õ¯Õ«"
 
-#: js/config.php:35
+#: js/config.php:33
 msgid "Monday"
 msgstr "ÔµÖ€Õ¯Õ¸Ö‚Õ·Õ¡Õ¢Õ©Õ«"
 
-#: js/config.php:36
+#: js/config.php:34
 msgid "Tuesday"
 msgstr "ÔµÖ€Õ¥Ö„Õ·Õ¡Õ¢Õ©Õ«"
 
-#: js/config.php:37
+#: js/config.php:35
 msgid "Wednesday"
 msgstr "Õ‰Õ¸Ö€Õ¥Ö„Õ·Õ¡Õ¢Õ©Õ«"
 
-#: js/config.php:38
+#: js/config.php:36
 msgid "Thursday"
 msgstr "Õ€Õ«Õ¶Õ£Õ·Õ¡Õ¢Õ©Õ«"
 
-#: js/config.php:39
+#: js/config.php:37
 msgid "Friday"
 msgstr "ÕˆÖ‚Ö€Õ¢Õ¡Õ©"
 
-#: js/config.php:40
+#: js/config.php:38
 msgid "Saturday"
 msgstr "Õ‡Õ¡Õ¢Õ¡Õ©"
 
-#: js/config.php:45
+#: js/config.php:43
 msgid "January"
 msgstr "Õ€Õ¸Ö‚Õ¶Õ¾Õ¡Ö€"
 
-#: js/config.php:46
+#: js/config.php:44
 msgid "February"
 msgstr "Õ“Õ¥Õ¿Ö€Õ¾Õ¡Ö€"
 
-#: js/config.php:47
+#: js/config.php:45
 msgid "March"
 msgstr "Õ„Õ¡Ö€Õ¿"
 
-#: js/config.php:48
+#: js/config.php:46
 msgid "April"
 msgstr "Ô±ÕºÖ€Õ«Õ¬"
 
-#: js/config.php:49
+#: js/config.php:47
 msgid "May"
 msgstr "Õ„Õ¡ÕµÕ«Õ½"
 
-#: js/config.php:50
+#: js/config.php:48
 msgid "June"
 msgstr "Õ€Õ¸Ö‚Õ¶Õ«Õ½"
 
-#: js/config.php:51
+#: js/config.php:49
 msgid "July"
 msgstr "Õ€Õ¸Ö‚Õ¬Õ«Õ½"
 
-#: js/config.php:52
+#: js/config.php:50
 msgid "August"
 msgstr "Õ•Õ£Õ¸Õ½Õ¿Õ¸Õ½"
 
-#: js/config.php:53
+#: js/config.php:51
 msgid "September"
 msgstr "Սեպտեմբեր"
 
-#: js/config.php:54
+#: js/config.php:52
 msgid "October"
 msgstr "Õ€Õ¸Õ¯Õ¿Õ¥Õ´Õ¢Õ¥Ö€"
 
-#: js/config.php:55
+#: js/config.php:53
 msgid "November"
 msgstr "Õ†Õ¸ÕµÕ¥Õ´Õ¢Õ¥Ö€"
 
-#: js/config.php:56
+#: js/config.php:54
 msgid "December"
 msgstr "Ô´Õ¥Õ¯Õ¿Õ¥Õ´Õ¢Õ¥Ö€"
 
-#: js/js.js:286
+#: js/js.js:289
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:718
+#: js/js.js:721
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:719
+#: js/js.js:722
 msgid "1 minute ago"
 msgstr ""
 
-#: js/js.js:720
+#: js/js.js:723
 msgid "{minutes} minutes ago"
 msgstr ""
 
-#: js/js.js:721
+#: js/js.js:724
 msgid "1 hour ago"
 msgstr ""
 
-#: js/js.js:722
+#: js/js.js:725
 msgid "{hours} hours ago"
 msgstr ""
 
-#: js/js.js:723
+#: js/js.js:726
 msgid "today"
 msgstr ""
 
-#: js/js.js:724
+#: js/js.js:727
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:725
+#: js/js.js:728
 msgid "{days} days ago"
 msgstr ""
 
-#: js/js.js:726
+#: js/js.js:729
 msgid "last month"
 msgstr ""
 
-#: js/js.js:727
+#: js/js.js:730
 msgid "{months} months ago"
 msgstr ""
 
-#: js/js.js:728
+#: js/js.js:731
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:729
+#: js/js.js:732
 msgid "last year"
 msgstr ""
 
-#: js/js.js:730
+#: js/js.js:733
 msgid "years ago"
 msgstr ""
 
@@ -225,8 +225,8 @@ msgstr ""
 #: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
 #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:577
-#: js/share.js:589
+#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:620
+#: js/share.js:632
 msgid "Error"
 msgstr ""
 
@@ -246,7 +246,7 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: js/share.js:125 js/share.js:617
+#: js/share.js:125 js/share.js:660
 msgid "Error while sharing"
 msgstr ""
 
@@ -266,99 +266,103 @@ msgstr ""
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:159
+#: js/share.js:172
 msgid "Share with"
 msgstr ""
 
-#: js/share.js:164
+#: js/share.js:177
 msgid "Share with link"
 msgstr ""
 
-#: js/share.js:167
+#: js/share.js:180
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:169 templates/installation.php:54 templates/login.php:26
+#: js/share.js:182 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr ""
 
-#: js/share.js:173
+#: js/share.js:187
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:191
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:174
+#: js/share.js:192
 msgid "Send"
 msgstr ""
 
-#: js/share.js:178
+#: js/share.js:197
 msgid "Set expiration date"
 msgstr ""
 
-#: js/share.js:179
+#: js/share.js:198
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:211
+#: js/share.js:230
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:213
+#: js/share.js:232
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:251
+#: js/share.js:270
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:287
+#: js/share.js:306
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:308
+#: js/share.js:327
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:320
+#: js/share.js:339
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:322
+#: js/share.js:341
 msgid "access control"
 msgstr ""
 
-#: js/share.js:325
+#: js/share.js:344
 msgid "create"
 msgstr ""
 
-#: js/share.js:328
+#: js/share.js:347
 msgid "update"
 msgstr ""
 
-#: js/share.js:331
+#: js/share.js:350
 msgid "delete"
 msgstr ""
 
-#: js/share.js:334
+#: js/share.js:353
 msgid "share"
 msgstr ""
 
-#: js/share.js:368 js/share.js:564
+#: js/share.js:387 js/share.js:607
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:577
+#: js/share.js:620
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:589
+#: js/share.js:632
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:604
+#: js/share.js:647
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:615
+#: js/share.js:658
 msgid "Email sent"
 msgstr ""
 
@@ -373,7 +377,7 @@ msgstr ""
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
-#: lostpassword/controller.php:58
+#: lostpassword/controller.php:60
 msgid "ownCloud password reset"
 msgstr ""
 
@@ -403,17 +407,17 @@ msgstr ""
 
 #: lostpassword/templates/lostpassword.php:22
 msgid ""
-"Your files seems to be encrypted. If you didn't have enabled the recovery "
-"key there will be no way to get your data back once the password was "
-"resetted. If you are not sure what to do, please contact your administrator "
-"first before continue. Do you really want to continue?"
+"Your files are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
 msgstr ""
 
 #: lostpassword/templates/lostpassword.php:24
 msgid "Yes, I really want to reset my password now"
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:29
+#: lostpassword/templates/lostpassword.php:27
 msgid "Request reset"
 msgstr ""
 
@@ -461,7 +465,7 @@ msgstr ""
 msgid "Cloud not found"
 msgstr ""
 
-#: templates/altmail.php:2
+#: templates/altmail.php:4
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -472,10 +476,6 @@ msgid ""
 "Cheers!"
 msgstr ""
 
-#: templates/altmail.php:7 templates/mail.php:24
-msgid "web services under your control"
-msgstr ""
-
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
 msgstr ""
@@ -568,12 +568,12 @@ msgstr ""
 msgid "Finish setup"
 msgstr ""
 
-#: templates/layout.user.php:40
+#: templates/layout.user.php:43
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:67
+#: templates/layout.user.php:68
 msgid "Log out"
 msgstr ""
 
@@ -607,7 +607,7 @@ msgstr ""
 msgid "Alternative Logins"
 msgstr ""
 
-#: templates/mail.php:15
+#: templates/mail.php:16
 #, php-format
 msgid ""
 "Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
diff --git a/l10n/hy/files.po b/l10n/hy/files.po
index 7322202bfa7288de20d7c526a3c51c39e38dbcff..5982ecd09779f628a6bcc9591f28290be4ee6694 100644
--- a/l10n/hy/files.po
+++ b/l10n/hy/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:01+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
 "MIME-Version: 1.0\n"
@@ -27,46 +27,54 @@ msgstr ""
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/upload.php:19
+#: ajax/upload.php:16 ajax/upload.php:45
+msgid "Unable to set upload directory."
+msgstr ""
+
+#: ajax/upload.php:22
+msgid "Invalid Token"
+msgstr ""
+
+#: ajax/upload.php:59
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: ajax/upload.php:26
+#: ajax/upload.php:66
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/upload.php:27
+#: ajax/upload.php:67
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:29
+#: ajax/upload.php:69
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/upload.php:30
+#: ajax/upload.php:70
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/upload.php:31
+#: ajax/upload.php:71
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/upload.php:32
+#: ajax/upload.php:72
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/upload.php:33
+#: ajax/upload.php:73
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:51
+#: ajax/upload.php:91
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:83
+#: ajax/upload.php:123
 msgid "Invalid directory."
 msgstr ""
 
@@ -74,6 +82,36 @@ msgstr ""
 msgid "Files"
 msgstr ""
 
+#: js/file-upload.js:11
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/file-upload.js:24
+msgid "Not enough space available"
+msgstr ""
+
+#: js/file-upload.js:64
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/file-upload.js:167 js/files.js:266
+msgid ""
+"File upload is in progress. Leaving the page now will cancel the upload."
+msgstr ""
+
+#: js/file-upload.js:233 js/files.js:339
+msgid "URL cannot be empty."
+msgstr ""
+
+#: js/file-upload.js:238 lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr ""
+
+#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
+#: js/files.js:693 js/files.js:731
+msgid "Error"
+msgstr ""
+
 #: js/fileactions.js:116
 msgid "Share"
 msgstr ""
@@ -90,43 +128,43 @@ msgstr "Õ‹Õ¶Õ»Õ¥Õ¬"
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:464
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:259
+#: js/filelist.js:302
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:306
+#: js/filelist.js:349
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:306
+#: js/filelist.js:349
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:331
+#: js/filelist.js:374
 msgid "perform delete operation"
 msgstr ""
 
-#: js/filelist.js:413
+#: js/filelist.js:456
 msgid "1 file uploading"
 msgstr ""
 
-#: js/filelist.js:416 js/filelist.js:470
+#: js/filelist.js:459 js/filelist.js:517
 msgid "files uploading"
 msgstr ""
 
@@ -158,69 +196,41 @@ msgid ""
 "big."
 msgstr ""
 
-#: js/files.js:264
-msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr ""
-
-#: js/files.js:277
-msgid "Not enough space available"
-msgstr ""
-
-#: js/files.js:317
-msgid "Upload cancelled."
-msgstr ""
-
-#: js/files.js:413
-msgid ""
-"File upload is in progress. Leaving the page now will cancel the upload."
-msgstr ""
-
-#: js/files.js:486
-msgid "URL cannot be empty."
-msgstr ""
-
-#: js/files.js:491
+#: js/files.js:344
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
-msgid "Error"
-msgstr ""
-
-#: js/files.js:877 templates/index.php:69
+#: js/files.js:744 templates/index.php:69
 msgid "Name"
 msgstr ""
 
-#: js/files.js:878 templates/index.php:80
+#: js/files.js:745 templates/index.php:80
 msgid "Size"
 msgstr ""
 
-#: js/files.js:879 templates/index.php:82
+#: js/files.js:746 templates/index.php:82
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:898
+#: js/files.js:765
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:900
+#: js/files.js:767
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:908
+#: js/files.js:775
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:910
+#: js/files.js:777
 msgid "{count} files"
 msgstr ""
 
-#: lib/app.php:53
-msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
-msgstr ""
-
 #: lib/app.php:73
-msgid "Unable to rename file"
+#, php-format
+msgid "%s could not be renamed"
 msgstr ""
 
 #: lib/helper.php:11 templates/index.php:18
@@ -317,6 +327,22 @@ msgstr ""
 msgid "Current scanning"
 msgstr ""
 
+#: templates/part.list.php:76
+msgid "directory"
+msgstr ""
+
+#: templates/part.list.php:78
+msgid "directories"
+msgstr ""
+
+#: templates/part.list.php:87
+msgid "file"
+msgstr ""
+
+#: templates/part.list.php:89
+msgid "files"
+msgstr ""
+
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
 msgstr ""
diff --git a/l10n/hy/files_encryption.po b/l10n/hy/files_encryption.po
index 6502e4208c4feb8ed93ede453a4c68795c976304..aac4b4707b6b617dce68db1ba7020aea78b7c1cf 100644
--- a/l10n/hy/files_encryption.po
+++ b/l10n/hy/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-14 02:46+0200\n"
-"PO-Revision-Date: 2013-06-14 00:47+0000\n"
+"POT-Creation-Date: 2013-07-05 02:12+0200\n"
+"PO-Revision-Date: 2013-07-05 00:13+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
 "MIME-Version: 1.0\n"
@@ -55,9 +55,21 @@ msgstr ""
 
 #: files/error.php:7
 msgid ""
-"Your private key is not valid! Maybe your password was changed from outside."
-" You can update your private key password in your personal settings to "
-"regain access to your files"
+"Your private key is not valid! Likely your password was changed outside the "
+"ownCloud system (e.g. your corporate directory). You can update your private"
+" key password in your personal settings to recover access to your encrypted "
+"files."
+msgstr ""
+
+#: hooks/hooks.php:44
+msgid "Missing requirements."
+msgstr ""
+
+#: hooks/hooks.php:45
+msgid ""
+"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL "
+"PHP extension is enabled and configured properly. For now, the encryption "
+"app has been disabled."
 msgstr ""
 
 #: js/settings-admin.js:11
@@ -84,11 +96,11 @@ msgstr ""
 
 #: templates/settings-admin.php:10
 msgid ""
-"Enable encryption passwords recovery key (allow sharing to recovery key):"
+"Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
 #: templates/settings-admin.php:14
-msgid "Recovery account password"
+msgid "Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:21 templates/settings-personal.php:54
@@ -100,15 +112,15 @@ msgid "Disabled"
 msgstr ""
 
 #: templates/settings-admin.php:34
-msgid "Change encryption passwords recovery key:"
+msgid "Change recovery key password:"
 msgstr ""
 
 #: templates/settings-admin.php:41
-msgid "Old Recovery account password"
+msgid "Old Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:48
-msgid "New Recovery account password"
+msgid "New Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:53
diff --git a/l10n/hy/files_external.po b/l10n/hy/files_external.po
index 6d57f2329e2b7221a289593cf467f37b6d56c3a5..404d972d59de39898c2e3008be251c9c7b28bf1f 100644
--- a/l10n/hy/files_external.po
+++ b/l10n/hy/files_external.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
 "PO-Revision-Date: 2013-04-26 08:01+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
diff --git a/l10n/hy/files_sharing.po b/l10n/hy/files_sharing.po
index d4db75d1a7f1070addcb83982c770c800a97f0d4..2d19d65b98e400728b32df4d8d433d155f1c24c8 100644
--- a/l10n/hy/files_sharing.po
+++ b/l10n/hy/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
 "MIME-Version: 1.0\n"
@@ -18,27 +18,39 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: templates/authenticate.php:4
+msgid "The password is wrong. Try again."
+msgstr ""
+
+#: templates/authenticate.php:7
 msgid "Password"
 msgstr ""
 
-#: templates/authenticate.php:6
+#: templates/authenticate.php:9
 msgid "Submit"
 msgstr "Õ€Õ¡Õ½Õ¿Õ¡Õ¿Õ¥Õ¬"
 
-#: templates/public.php:10
+#: templates/public.php:17
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr ""
 
-#: templates/public.php:13
+#: templates/public.php:20
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr ""
 
-#: templates/public.php:19 templates/public.php:43
+#: templates/public.php:28 templates/public.php:90
 msgid "Download"
 msgstr "Ô²Õ¥Õ¼Õ¶Õ¥Õ¬"
 
-#: templates/public.php:40
+#: templates/public.php:45 templates/public.php:48
+msgid "Upload"
+msgstr ""
+
+#: templates/public.php:58
+msgid "Cancel upload"
+msgstr ""
+
+#: templates/public.php:87
 msgid "No preview available for"
 msgstr ""
diff --git a/l10n/hy/files_trashbin.po b/l10n/hy/files_trashbin.po
index da63a288599bc75b04513d964604472dca8fa136..6c2e7d94ed65f166ebac129984225e6791d3bf9a 100644
--- a/l10n/hy/files_trashbin.po
+++ b/l10n/hy/files_trashbin.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
 "PO-Revision-Date: 2013-04-26 08:01+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
diff --git a/l10n/hy/lib.po b/l10n/hy/lib.po
index a40365032ad76706041240c55d5b192dea0346b0..07d46915210e7d2f1550f9069197d373272cd36a 100644
--- a/l10n/hy/lib.po
+++ b/l10n/hy/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-05-25 02:02+0200\n"
-"PO-Revision-Date: 2013-04-26 08:01+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-07-05 02:13+0200\n"
+"PO-Revision-Date: 2013-07-05 00:13+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,47 +17,51 @@ msgstr ""
 "Language: hy\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:357
+#: app.php:360
 msgid "Help"
 msgstr ""
 
-#: app.php:370
+#: app.php:373
 msgid "Personal"
 msgstr ""
 
-#: app.php:381
+#: app.php:384
 msgid "Settings"
 msgstr ""
 
-#: app.php:393
+#: app.php:396
 msgid "Users"
 msgstr ""
 
-#: app.php:406
+#: app.php:409
 msgid "Apps"
 msgstr ""
 
-#: app.php:414
+#: app.php:417
 msgid "Admin"
 msgstr ""
 
-#: files.php:207
+#: defaults.php:33
+msgid "web services under your control"
+msgstr ""
+
+#: files.php:210
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: files.php:208
+#: files.php:211
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:209 files.php:242
+#: files.php:212 files.php:245
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:239
+#: files.php:242
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
-#: helper.php:228
+#: helper.php:236
 msgid "couldn't be determined"
 msgstr ""
 
@@ -85,104 +89,102 @@ msgstr ""
 msgid "Images"
 msgstr ""
 
-#: setup.php:34
-msgid "Set an admin username."
-msgstr ""
-
-#: setup.php:37
-msgid "Set an admin password."
-msgstr ""
-
-#: setup.php:55
+#: setup/abstractdatabase.php:22
 #, php-format
 msgid "%s enter the database username."
 msgstr ""
 
-#: setup.php:58
+#: setup/abstractdatabase.php:25
 #, php-format
 msgid "%s enter the database name."
 msgstr ""
 
-#: setup.php:61
+#: setup/abstractdatabase.php:28
 #, php-format
 msgid "%s you may not use dots in the database name"
 msgstr ""
 
-#: setup.php:64
+#: setup/mssql.php:20
 #, php-format
-msgid "%s set the database host."
-msgstr ""
-
-#: setup.php:132 setup.php:329 setup.php:374
-msgid "PostgreSQL username and/or password not valid"
+msgid "MS SQL username and/or password not valid: %s"
 msgstr ""
 
-#: setup.php:133 setup.php:238
+#: setup/mssql.php:21 setup/mysql.php:13 setup/oci.php:114
+#: setup/postgresql.php:24 setup/postgresql.php:70
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:155
-msgid "Oracle connection could not be established"
-msgstr ""
-
-#: setup.php:237
+#: setup/mysql.php:12
 msgid "MySQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
-#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
-#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
-#: setup.php:623
+#: setup/mysql.php:67 setup/oci.php:54 setup/oci.php:121 setup/oci.php:147
+#: setup/oci.php:154 setup/oci.php:165 setup/oci.php:172 setup/oci.php:181
+#: setup/oci.php:189 setup/oci.php:198 setup/oci.php:204
+#: setup/postgresql.php:89 setup/postgresql.php:98 setup/postgresql.php:115
+#: setup/postgresql.php:125 setup/postgresql.php:134
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr ""
 
-#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
-#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
-#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
+#: setup/mysql.php:68 setup/oci.php:55 setup/oci.php:122 setup/oci.php:148
+#: setup/oci.php:155 setup/oci.php:166 setup/oci.php:182 setup/oci.php:190
+#: setup/oci.php:199 setup/postgresql.php:90 setup/postgresql.php:99
+#: setup/postgresql.php:116 setup/postgresql.php:126 setup/postgresql.php:135
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:308
+#: setup/mysql.php:85
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:309
+#: setup/mysql.php:86
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:314
+#: setup/mysql.php:91
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:315
+#: setup/mysql.php:92
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:466 setup.php:533
+#: setup/oci.php:34
+msgid "Oracle connection could not be established"
+msgstr ""
+
+#: setup/oci.php:41 setup/oci.php:113
 msgid "Oracle username and/or password not valid"
 msgstr ""
 
-#: setup.php:592 setup.php:624
+#: setup/oci.php:173 setup/oci.php:205
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:644
-#, php-format
-msgid "MS SQL username and/or password not valid: %s"
+#: setup/postgresql.php:23 setup/postgresql.php:69
+msgid "PostgreSQL username and/or password not valid"
+msgstr ""
+
+#: setup.php:42
+msgid "Set an admin username."
+msgstr ""
+
+#: setup.php:45
+msgid "Set an admin password."
 msgstr ""
 
-#: setup.php:867
+#: setup.php:198
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:868
+#: setup.php:199
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
diff --git a/l10n/hy/settings.po b/l10n/hy/settings.po
index 477a941c98fd9a36fe878b39ec293b6f80e4d83c..6360e6a8300731927077ce51061a39592f93a90d 100644
--- a/l10n/hy/settings.po
+++ b/l10n/hy/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
 "MIME-Version: 1.0\n"
@@ -88,35 +88,35 @@ msgstr ""
 msgid "Couldn't update app."
 msgstr ""
 
-#: js/apps.js:30
+#: js/apps.js:35
 msgid "Update to {appversion}"
 msgstr ""
 
-#: js/apps.js:36 js/apps.js:76
+#: js/apps.js:41 js/apps.js:81
 msgid "Disable"
 msgstr ""
 
-#: js/apps.js:36 js/apps.js:64 js/apps.js:83
+#: js/apps.js:41 js/apps.js:69 js/apps.js:88
 msgid "Enable"
 msgstr ""
 
-#: js/apps.js:55
+#: js/apps.js:60
 msgid "Please wait...."
 msgstr ""
 
-#: js/apps.js:59 js/apps.js:71 js/apps.js:80 js/apps.js:93
+#: js/apps.js:64 js/apps.js:76 js/apps.js:85 js/apps.js:98
 msgid "Error"
 msgstr ""
 
-#: js/apps.js:90
+#: js/apps.js:95
 msgid "Updating...."
 msgstr ""
 
-#: js/apps.js:93
+#: js/apps.js:98
 msgid "Error while updating app"
 msgstr ""
 
-#: js/apps.js:96
+#: js/apps.js:101
 msgid "Updated"
 msgstr ""
 
@@ -165,15 +165,15 @@ msgstr ""
 msgid "A valid password must be provided"
 msgstr ""
 
-#: personal.php:35 personal.php:36
+#: personal.php:37 personal.php:38
 msgid "__language_name__"
 msgstr ""
 
-#: templates/admin.php:15
+#: templates/admin.php:17
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:18
+#: templates/admin.php:20
 msgid ""
 "Your data directory and your files are probably accessible from the "
 "internet. The .htaccess file that ownCloud provides is not working. We "
@@ -182,36 +182,36 @@ msgid ""
 " webserver document root."
 msgstr ""
 
-#: templates/admin.php:29
+#: templates/admin.php:31
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:32
+#: templates/admin.php:34
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: templates/admin.php:33
+#: templates/admin.php:35
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:44
+#: templates/admin.php:46
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:47
+#: templates/admin.php:49
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr ""
 
-#: templates/admin.php:58
+#: templates/admin.php:60
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:63
+#: templates/admin.php:65
 #, php-format
 msgid ""
 "This ownCloud server can't set system locale to %s. This means that there "
@@ -219,11 +219,11 @@ msgid ""
 " to install the required packages on your system to support %s."
 msgstr ""
 
-#: templates/admin.php:75
+#: templates/admin.php:77
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:78
+#: templates/admin.php:80
 msgid ""
 "This ownCloud server has no working internet connection. This means that "
 "some of the features like mounting of external storage, notifications about "
@@ -233,102 +233,102 @@ msgid ""
 " of ownCloud."
 msgstr ""
 
-#: templates/admin.php:92
+#: templates/admin.php:94
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:101
+#: templates/admin.php:103
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:111
+#: templates/admin.php:113
 msgid ""
 "cron.php is registered at a webcron service. Call the cron.php page in the "
 "owncloud root once a minute over http."
 msgstr ""
 
-#: templates/admin.php:121
+#: templates/admin.php:123
 msgid ""
 "Use systems cron service. Call the cron.php file in the owncloud folder via "
 "a system cronjob once a minute."
 msgstr ""
 
-#: templates/admin.php:128
+#: templates/admin.php:130
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:134
+#: templates/admin.php:136
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:135
+#: templates/admin.php:137
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:142
+#: templates/admin.php:144
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:143
+#: templates/admin.php:145
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:150
+#: templates/admin.php:152
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:151
+#: templates/admin.php:153
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:158
+#: templates/admin.php:160
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:161
+#: templates/admin.php:163
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:168
+#: templates/admin.php:170
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:181
+#: templates/admin.php:183
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:182
+#: templates/admin.php:184
 msgid ""
 "Enforces the clients to connect to ownCloud via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:185
+#: templates/admin.php:187
 msgid ""
 "Please connect to this ownCloud instance via HTTPS to enable or disable the "
 "SSL enforcement."
 msgstr ""
 
-#: templates/admin.php:195
+#: templates/admin.php:197
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:196
+#: templates/admin.php:198
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:227
+#: templates/admin.php:229
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:228
+#: templates/admin.php:230
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:235 templates/personal.php:116
+#: templates/admin.php:236 templates/personal.php:116
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:237 templates/personal.php:119
+#: templates/admin.php:240 templates/personal.php:119
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -386,76 +386,79 @@ msgstr ""
 msgid "Commercial Support"
 msgstr ""
 
-#: templates/personal.php:9
+#: templates/personal.php:10
 msgid "Get the apps to sync your files"
 msgstr ""
 
-#: templates/personal.php:20
+#: templates/personal.php:21
 msgid "Show First Run Wizard again"
 msgstr ""
 
-#: templates/personal.php:28
+#: templates/personal.php:29
 #, php-format
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr ""
 
-#: templates/personal.php:40 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:41 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr ""
 
-#: templates/personal.php:41
+#: templates/personal.php:42
 msgid "Your password was changed"
 msgstr ""
 
-#: templates/personal.php:42
+#: templates/personal.php:43
 msgid "Unable to change your password"
 msgstr ""
 
-#: templates/personal.php:43
+#: templates/personal.php:44
 msgid "Current password"
 msgstr ""
 
-#: templates/personal.php:45
+#: templates/personal.php:46
 msgid "New password"
 msgstr ""
 
-#: templates/personal.php:47
+#: templates/personal.php:48
 msgid "Change password"
 msgstr ""
 
-#: templates/personal.php:59 templates/users.php:85
+#: templates/personal.php:60 templates/users.php:85
 msgid "Display Name"
 msgstr ""
 
-#: templates/personal.php:74
+#: templates/personal.php:75
 msgid "Email"
 msgstr ""
 
-#: templates/personal.php:76
+#: templates/personal.php:77
 msgid "Your email address"
 msgstr ""
 
-#: templates/personal.php:77
+#: templates/personal.php:78
 msgid "Fill in an email address to enable password recovery"
 msgstr ""
 
-#: templates/personal.php:86 templates/personal.php:87
+#: templates/personal.php:87 templates/personal.php:88
 msgid "Language"
 msgstr ""
 
-#: templates/personal.php:99
+#: templates/personal.php:100
 msgid "Help translate"
 msgstr ""
 
-#: templates/personal.php:105
+#: templates/personal.php:106
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:107
-msgid "Use this address to connect to your ownCloud in your file manager"
+#: templates/personal.php:108
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
+"target=\"_blank\">access your Files via WebDAV</a>"
 msgstr ""
 
-#: templates/users.php:21 templates/users.php:84
+#: templates/users.php:21
 msgid "Login Name"
 msgstr ""
 
@@ -485,6 +488,10 @@ msgstr ""
 msgid "Other"
 msgstr "Ô±ÕµÕ¬"
 
+#: templates/users.php:84
+msgid "Username"
+msgstr ""
+
 #: templates/users.php:91
 msgid "Storage"
 msgstr ""
diff --git a/l10n/ia/core.po b/l10n/ia/core.po
index 6d4136c35824b8eda188a69eef7cd48a9e6f95ef..44dd39a9dff76218bfcf82c67fc259c2d93d19fe 100644
--- a/l10n/ia/core.po
+++ b/l10n/ia/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
 "MIME-Version: 1.0\n"
@@ -61,135 +61,135 @@ msgstr ""
 msgid "Error removing %s from favorites."
 msgstr ""
 
-#: js/config.php:34
+#: js/config.php:32
 msgid "Sunday"
 msgstr "Dominica"
 
-#: js/config.php:35
+#: js/config.php:33
 msgid "Monday"
 msgstr "Lunedi"
 
-#: js/config.php:36
+#: js/config.php:34
 msgid "Tuesday"
 msgstr "Martedi"
 
-#: js/config.php:37
+#: js/config.php:35
 msgid "Wednesday"
 msgstr "Mercuridi"
 
-#: js/config.php:38
+#: js/config.php:36
 msgid "Thursday"
 msgstr "Jovedi"
 
-#: js/config.php:39
+#: js/config.php:37
 msgid "Friday"
 msgstr "Venerdi"
 
-#: js/config.php:40
+#: js/config.php:38
 msgid "Saturday"
 msgstr "Sabbato"
 
-#: js/config.php:45
+#: js/config.php:43
 msgid "January"
 msgstr "januario"
 
-#: js/config.php:46
+#: js/config.php:44
 msgid "February"
 msgstr "Februario"
 
-#: js/config.php:47
+#: js/config.php:45
 msgid "March"
 msgstr "Martio"
 
-#: js/config.php:48
+#: js/config.php:46
 msgid "April"
 msgstr "April"
 
-#: js/config.php:49
+#: js/config.php:47
 msgid "May"
 msgstr "Mai"
 
-#: js/config.php:50
+#: js/config.php:48
 msgid "June"
 msgstr "Junio"
 
-#: js/config.php:51
+#: js/config.php:49
 msgid "July"
 msgstr "Julio"
 
-#: js/config.php:52
+#: js/config.php:50
 msgid "August"
 msgstr "Augusto"
 
-#: js/config.php:53
+#: js/config.php:51
 msgid "September"
 msgstr "Septembre"
 
-#: js/config.php:54
+#: js/config.php:52
 msgid "October"
 msgstr "Octobre"
 
-#: js/config.php:55
+#: js/config.php:53
 msgid "November"
 msgstr "Novembre"
 
-#: js/config.php:56
+#: js/config.php:54
 msgid "December"
 msgstr "Decembre"
 
-#: js/js.js:286
+#: js/js.js:293
 msgid "Settings"
 msgstr "Configurationes"
 
-#: js/js.js:718
+#: js/js.js:725
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:719
+#: js/js.js:726
 msgid "1 minute ago"
 msgstr ""
 
-#: js/js.js:720
+#: js/js.js:727
 msgid "{minutes} minutes ago"
 msgstr ""
 
-#: js/js.js:721
+#: js/js.js:728
 msgid "1 hour ago"
 msgstr ""
 
-#: js/js.js:722
+#: js/js.js:729
 msgid "{hours} hours ago"
 msgstr ""
 
-#: js/js.js:723
+#: js/js.js:730
 msgid "today"
 msgstr ""
 
-#: js/js.js:724
+#: js/js.js:731
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:725
+#: js/js.js:732
 msgid "{days} days ago"
 msgstr ""
 
-#: js/js.js:726
+#: js/js.js:733
 msgid "last month"
 msgstr ""
 
-#: js/js.js:727
+#: js/js.js:734
 msgid "{months} months ago"
 msgstr ""
 
-#: js/js.js:728
+#: js/js.js:735
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:729
+#: js/js.js:736
 msgid "last year"
 msgstr ""
 
-#: js/js.js:730
+#: js/js.js:737
 msgid "years ago"
 msgstr ""
 
@@ -225,8 +225,8 @@ msgstr ""
 #: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
 #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:577
-#: js/share.js:589
+#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:620
+#: js/share.js:632
 msgid "Error"
 msgstr "Error"
 
@@ -246,7 +246,7 @@ msgstr ""
 msgid "Share"
 msgstr "Compartir"
 
-#: js/share.js:125 js/share.js:617
+#: js/share.js:125 js/share.js:660
 msgid "Error while sharing"
 msgstr ""
 
@@ -266,99 +266,103 @@ msgstr ""
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:159
+#: js/share.js:172
 msgid "Share with"
 msgstr ""
 
-#: js/share.js:164
+#: js/share.js:177
 msgid "Share with link"
 msgstr ""
 
-#: js/share.js:167
+#: js/share.js:180
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:169 templates/installation.php:54 templates/login.php:26
+#: js/share.js:182 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "Contrasigno"
 
-#: js/share.js:173
+#: js/share.js:187
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:191
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:174
+#: js/share.js:192
 msgid "Send"
 msgstr "Invia"
 
-#: js/share.js:178
+#: js/share.js:197
 msgid "Set expiration date"
 msgstr ""
 
-#: js/share.js:179
+#: js/share.js:198
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:211
+#: js/share.js:230
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:213
+#: js/share.js:232
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:251
+#: js/share.js:270
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:287
+#: js/share.js:306
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:308
+#: js/share.js:327
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:320
+#: js/share.js:339
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:322
+#: js/share.js:341
 msgid "access control"
 msgstr ""
 
-#: js/share.js:325
+#: js/share.js:344
 msgid "create"
 msgstr ""
 
-#: js/share.js:328
+#: js/share.js:347
 msgid "update"
 msgstr ""
 
-#: js/share.js:331
+#: js/share.js:350
 msgid "delete"
 msgstr ""
 
-#: js/share.js:334
+#: js/share.js:353
 msgid "share"
 msgstr ""
 
-#: js/share.js:368 js/share.js:564
+#: js/share.js:387 js/share.js:607
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:577
+#: js/share.js:620
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:589
+#: js/share.js:632
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:604
+#: js/share.js:647
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:615
+#: js/share.js:658
 msgid "Email sent"
 msgstr ""
 
@@ -373,7 +377,7 @@ msgstr ""
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
-#: lostpassword/controller.php:58
+#: lostpassword/controller.php:60
 msgid "ownCloud password reset"
 msgstr "Reinitialisation del contrasigno de ownCLoud"
 
@@ -403,17 +407,17 @@ msgstr "Nomine de usator"
 
 #: lostpassword/templates/lostpassword.php:22
 msgid ""
-"Your files seems to be encrypted. If you didn't have enabled the recovery "
-"key there will be no way to get your data back once the password was "
-"resetted. If you are not sure what to do, please contact your administrator "
-"first before continue. Do you really want to continue?"
+"Your files are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
 msgstr ""
 
 #: lostpassword/templates/lostpassword.php:24
 msgid "Yes, I really want to reset my password now"
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:29
+#: lostpassword/templates/lostpassword.php:27
 msgid "Request reset"
 msgstr "Requestar reinitialisation"
 
@@ -461,7 +465,7 @@ msgstr "Accesso prohibite"
 msgid "Cloud not found"
 msgstr "Nube non trovate"
 
-#: templates/altmail.php:2
+#: templates/altmail.php:4
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -472,10 +476,6 @@ msgid ""
 "Cheers!"
 msgstr ""
 
-#: templates/altmail.php:7 templates/mail.php:24
-msgid "web services under your control"
-msgstr "servicios web sub tu controlo"
-
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
 msgstr "Modificar categorias"
@@ -568,12 +568,12 @@ msgstr "Hospite de base de datos"
 msgid "Finish setup"
 msgstr ""
 
-#: templates/layout.user.php:40
+#: templates/layout.user.php:43
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:67
+#: templates/layout.user.php:68
 msgid "Log out"
 msgstr "Clauder le session"
 
@@ -607,7 +607,7 @@ msgstr "Aperir session"
 msgid "Alternative Logins"
 msgstr ""
 
-#: templates/mail.php:15
+#: templates/mail.php:16
 #, php-format
 msgid ""
 "Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
diff --git a/l10n/ia/files.po b/l10n/ia/files.po
index a2e22c8365a8fc00fa392dfecc9412ca915de847..5284b3a00f3e12111287f62ddf500db70ac48130 100644
--- a/l10n/ia/files.po
+++ b/l10n/ia/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:01+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
 "MIME-Version: 1.0\n"
@@ -27,46 +27,54 @@ msgstr ""
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/upload.php:19
+#: ajax/upload.php:16 ajax/upload.php:45
+msgid "Unable to set upload directory."
+msgstr ""
+
+#: ajax/upload.php:22
+msgid "Invalid Token"
+msgstr ""
+
+#: ajax/upload.php:59
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: ajax/upload.php:26
+#: ajax/upload.php:66
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/upload.php:27
+#: ajax/upload.php:67
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:29
+#: ajax/upload.php:69
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/upload.php:30
+#: ajax/upload.php:70
 msgid "The uploaded file was only partially uploaded"
 msgstr "Le file incargate solmente esseva incargate partialmente"
 
-#: ajax/upload.php:31
+#: ajax/upload.php:71
 msgid "No file was uploaded"
 msgstr "Nulle file esseva incargate."
 
-#: ajax/upload.php:32
+#: ajax/upload.php:72
 msgid "Missing a temporary folder"
 msgstr "Manca un dossier temporari"
 
-#: ajax/upload.php:33
+#: ajax/upload.php:73
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:51
+#: ajax/upload.php:91
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:83
+#: ajax/upload.php:123
 msgid "Invalid directory."
 msgstr ""
 
@@ -74,6 +82,36 @@ msgstr ""
 msgid "Files"
 msgstr "Files"
 
+#: js/file-upload.js:11
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/file-upload.js:24
+msgid "Not enough space available"
+msgstr ""
+
+#: js/file-upload.js:64
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/file-upload.js:167 js/files.js:266
+msgid ""
+"File upload is in progress. Leaving the page now will cancel the upload."
+msgstr ""
+
+#: js/file-upload.js:233 js/files.js:339
+msgid "URL cannot be empty."
+msgstr ""
+
+#: js/file-upload.js:238 lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr ""
+
+#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
+#: js/files.js:693 js/files.js:731
+msgid "Error"
+msgstr "Error"
+
 #: js/fileactions.js:116
 msgid "Share"
 msgstr "Compartir"
@@ -90,43 +128,43 @@ msgstr "Deler"
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:464
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:259
+#: js/filelist.js:302
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:306
+#: js/filelist.js:349
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:306
+#: js/filelist.js:349
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:331
+#: js/filelist.js:374
 msgid "perform delete operation"
 msgstr ""
 
-#: js/filelist.js:413
+#: js/filelist.js:456
 msgid "1 file uploading"
 msgstr ""
 
-#: js/filelist.js:416 js/filelist.js:470
+#: js/filelist.js:459 js/filelist.js:517
 msgid "files uploading"
 msgstr ""
 
@@ -158,69 +196,41 @@ msgid ""
 "big."
 msgstr ""
 
-#: js/files.js:264
-msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr ""
-
-#: js/files.js:277
-msgid "Not enough space available"
-msgstr ""
-
-#: js/files.js:317
-msgid "Upload cancelled."
-msgstr ""
-
-#: js/files.js:413
-msgid ""
-"File upload is in progress. Leaving the page now will cancel the upload."
-msgstr ""
-
-#: js/files.js:486
-msgid "URL cannot be empty."
-msgstr ""
-
-#: js/files.js:491
+#: js/files.js:344
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
-msgid "Error"
-msgstr "Error"
-
-#: js/files.js:877 templates/index.php:69
+#: js/files.js:744 templates/index.php:69
 msgid "Name"
 msgstr "Nomine"
 
-#: js/files.js:878 templates/index.php:80
+#: js/files.js:745 templates/index.php:80
 msgid "Size"
 msgstr "Dimension"
 
-#: js/files.js:879 templates/index.php:82
+#: js/files.js:746 templates/index.php:82
 msgid "Modified"
 msgstr "Modificate"
 
-#: js/files.js:898
+#: js/files.js:765
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:900
+#: js/files.js:767
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:908
+#: js/files.js:775
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:910
+#: js/files.js:777
 msgid "{count} files"
 msgstr ""
 
-#: lib/app.php:53
-msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
-msgstr ""
-
 #: lib/app.php:73
-msgid "Unable to rename file"
+#, php-format
+msgid "%s could not be renamed"
 msgstr ""
 
 #: lib/helper.php:11 templates/index.php:18
@@ -317,6 +327,22 @@ msgstr ""
 msgid "Current scanning"
 msgstr ""
 
+#: templates/part.list.php:76
+msgid "directory"
+msgstr ""
+
+#: templates/part.list.php:78
+msgid "directories"
+msgstr ""
+
+#: templates/part.list.php:87
+msgid "file"
+msgstr ""
+
+#: templates/part.list.php:89
+msgid "files"
+msgstr ""
+
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
 msgstr ""
diff --git a/l10n/ia/files_encryption.po b/l10n/ia/files_encryption.po
index d9d181238e02299db22b9f0bd68edf1cfcecbf58..3dc0de995061f54eecf6c3039447655d09306e3b 100644
--- a/l10n/ia/files_encryption.po
+++ b/l10n/ia/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-14 02:46+0200\n"
-"PO-Revision-Date: 2013-06-14 00:47+0000\n"
+"POT-Creation-Date: 2013-07-05 02:12+0200\n"
+"PO-Revision-Date: 2013-07-05 00:13+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"
@@ -55,9 +55,21 @@ msgstr ""
 
 #: files/error.php:7
 msgid ""
-"Your private key is not valid! Maybe your password was changed from outside."
-" You can update your private key password in your personal settings to "
-"regain access to your files"
+"Your private key is not valid! Likely your password was changed outside the "
+"ownCloud system (e.g. your corporate directory). You can update your private"
+" key password in your personal settings to recover access to your encrypted "
+"files."
+msgstr ""
+
+#: hooks/hooks.php:44
+msgid "Missing requirements."
+msgstr ""
+
+#: hooks/hooks.php:45
+msgid ""
+"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL "
+"PHP extension is enabled and configured properly. For now, the encryption "
+"app has been disabled."
 msgstr ""
 
 #: js/settings-admin.js:11
@@ -84,11 +96,11 @@ msgstr ""
 
 #: templates/settings-admin.php:10
 msgid ""
-"Enable encryption passwords recovery key (allow sharing to recovery key):"
+"Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
 #: templates/settings-admin.php:14
-msgid "Recovery account password"
+msgid "Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:21 templates/settings-personal.php:54
@@ -100,15 +112,15 @@ msgid "Disabled"
 msgstr ""
 
 #: templates/settings-admin.php:34
-msgid "Change encryption passwords recovery key:"
+msgid "Change recovery key password:"
 msgstr ""
 
 #: templates/settings-admin.php:41
-msgid "Old Recovery account password"
+msgid "Old Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:48
-msgid "New Recovery account password"
+msgid "New Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:53
diff --git a/l10n/ia/files_external.po b/l10n/ia/files_external.po
index 05b36d8a3da5584098c298dfd8c2ae7d82de7d78..ffc4e397acd30d41b298713426a3568d4c665915 100644
--- a/l10n/ia/files_external.po
+++ b/l10n/ia/files_external.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/ia/files_sharing.po b/l10n/ia/files_sharing.po
index d2b7155a17ff5a7525dc587510bf5cd358276754..4dafc0d9f213388c510b0e406ef95fdddbc828d5 100644
--- a/l10n/ia/files_sharing.po
+++ b/l10n/ia/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
 "MIME-Version: 1.0\n"
@@ -18,27 +18,39 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: templates/authenticate.php:4
+msgid "The password is wrong. Try again."
+msgstr ""
+
+#: templates/authenticate.php:7
 msgid "Password"
 msgstr "Contrasigno"
 
-#: templates/authenticate.php:6
+#: templates/authenticate.php:9
 msgid "Submit"
 msgstr "Submitter"
 
-#: templates/public.php:10
+#: templates/public.php:17
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr ""
 
-#: templates/public.php:13
+#: templates/public.php:20
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr ""
 
-#: templates/public.php:19 templates/public.php:43
+#: templates/public.php:28 templates/public.php:90
 msgid "Download"
 msgstr "Discargar"
 
-#: templates/public.php:40
+#: templates/public.php:45 templates/public.php:48
+msgid "Upload"
+msgstr "Incargar"
+
+#: templates/public.php:58
+msgid "Cancel upload"
+msgstr ""
+
+#: templates/public.php:87
 msgid "No preview available for"
 msgstr ""
diff --git a/l10n/ia/files_trashbin.po b/l10n/ia/files_trashbin.po
index db9d5df424cd71e4d02b4ba391ed503c5f91fdcc..0c94a276a237db0a83c8df128275429eb965c4e4 100644
--- a/l10n/ia/files_trashbin.po
+++ b/l10n/ia/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:16+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/ia/lib.po b/l10n/ia/lib.po
index 9b4d5b141963d133118c5d6daf3de8c0334d0e4c..51ab9e1777873e4bb582cb7394253b288d3dad3e 100644
--- a/l10n/ia/lib.po
+++ b/l10n/ia/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
 "MIME-Version: 1.0\n"
@@ -17,43 +17,47 @@ msgstr ""
 "Language: ia\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:359
+#: app.php:360
 msgid "Help"
 msgstr "Adjuta"
 
-#: app.php:372
+#: app.php:373
 msgid "Personal"
 msgstr "Personal"
 
-#: app.php:383
+#: app.php:384
 msgid "Settings"
 msgstr "Configurationes"
 
-#: app.php:395
+#: app.php:396
 msgid "Users"
 msgstr "Usatores"
 
-#: app.php:408
+#: app.php:409
 msgid "Apps"
 msgstr "Applicationes"
 
-#: app.php:416
+#: app.php:417
 msgid "Admin"
 msgstr "Administration"
 
-#: files.php:210
+#: defaults.php:33
+msgid "web services under your control"
+msgstr "servicios web sub tu controlo"
+
+#: files.php:226
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: files.php:211
+#: files.php:227
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:212 files.php:245
+#: files.php:228 files.php:261
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:242
+#: files.php:258
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
@@ -85,104 +89,102 @@ msgstr "Texto"
 msgid "Images"
 msgstr ""
 
-#: setup.php:34
-msgid "Set an admin username."
-msgstr ""
-
-#: setup.php:37
-msgid "Set an admin password."
-msgstr ""
-
-#: setup.php:55
+#: setup/abstractdatabase.php:22
 #, php-format
 msgid "%s enter the database username."
 msgstr ""
 
-#: setup.php:58
+#: setup/abstractdatabase.php:25
 #, php-format
 msgid "%s enter the database name."
 msgstr ""
 
-#: setup.php:61
+#: setup/abstractdatabase.php:28
 #, php-format
 msgid "%s you may not use dots in the database name"
 msgstr ""
 
-#: setup.php:64
+#: setup/mssql.php:20
 #, php-format
-msgid "%s set the database host."
-msgstr ""
-
-#: setup.php:126 setup.php:332 setup.php:377
-msgid "PostgreSQL username and/or password not valid"
+msgid "MS SQL username and/or password not valid: %s"
 msgstr ""
 
-#: setup.php:127 setup.php:235
+#: setup/mssql.php:21 setup/mysql.php:13 setup/oci.php:114
+#: setup/postgresql.php:24 setup/postgresql.php:70
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:152
-msgid "Oracle connection could not be established"
-msgstr ""
-
-#: setup.php:234
+#: setup/mysql.php:12
 msgid "MySQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:288 setup.php:398 setup.php:407 setup.php:425 setup.php:435
-#: setup.php:444 setup.php:477 setup.php:543 setup.php:569 setup.php:576
-#: setup.php:587 setup.php:594 setup.php:603 setup.php:611 setup.php:620
-#: setup.php:626
+#: setup/mysql.php:67 setup/oci.php:54 setup/oci.php:121 setup/oci.php:147
+#: setup/oci.php:154 setup/oci.php:165 setup/oci.php:172 setup/oci.php:181
+#: setup/oci.php:189 setup/oci.php:198 setup/oci.php:204
+#: setup/postgresql.php:89 setup/postgresql.php:98 setup/postgresql.php:115
+#: setup/postgresql.php:125 setup/postgresql.php:134
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr ""
 
-#: setup.php:289 setup.php:399 setup.php:408 setup.php:426 setup.php:436
-#: setup.php:445 setup.php:478 setup.php:544 setup.php:570 setup.php:577
-#: setup.php:588 setup.php:604 setup.php:612 setup.php:621
+#: setup/mysql.php:68 setup/oci.php:55 setup/oci.php:122 setup/oci.php:148
+#: setup/oci.php:155 setup/oci.php:166 setup/oci.php:182 setup/oci.php:190
+#: setup/oci.php:199 setup/postgresql.php:90 setup/postgresql.php:99
+#: setup/postgresql.php:116 setup/postgresql.php:126 setup/postgresql.php:135
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:305
+#: setup/mysql.php:85
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:306
+#: setup/mysql.php:86
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:311
+#: setup/mysql.php:91
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:312
+#: setup/mysql.php:92
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:469 setup.php:536
+#: setup/oci.php:34
+msgid "Oracle connection could not be established"
+msgstr ""
+
+#: setup/oci.php:41 setup/oci.php:113
 msgid "Oracle username and/or password not valid"
 msgstr ""
 
-#: setup.php:595 setup.php:627
+#: setup/oci.php:173 setup/oci.php:205
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:647
-#, php-format
-msgid "MS SQL username and/or password not valid: %s"
+#: setup/postgresql.php:23 setup/postgresql.php:69
+msgid "PostgreSQL username and/or password not valid"
+msgstr ""
+
+#: setup.php:42
+msgid "Set an admin username."
+msgstr ""
+
+#: setup.php:45
+msgid "Set an admin password."
 msgstr ""
 
-#: setup.php:870
+#: setup.php:198
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:871
+#: setup.php:199
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
diff --git a/l10n/ia/settings.po b/l10n/ia/settings.po
index ea14e7059894d530eb70561cf4da21f9466f69dc..dcb4a731c645243c8b3c581fc8406741f8d46978 100644
--- a/l10n/ia/settings.po
+++ b/l10n/ia/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
 "MIME-Version: 1.0\n"
@@ -88,35 +88,35 @@ msgstr ""
 msgid "Couldn't update app."
 msgstr ""
 
-#: js/apps.js:30
+#: js/apps.js:35
 msgid "Update to {appversion}"
 msgstr ""
 
-#: js/apps.js:36 js/apps.js:76
+#: js/apps.js:41 js/apps.js:81
 msgid "Disable"
 msgstr ""
 
-#: js/apps.js:36 js/apps.js:64 js/apps.js:83
+#: js/apps.js:41 js/apps.js:69 js/apps.js:88
 msgid "Enable"
 msgstr ""
 
-#: js/apps.js:55
+#: js/apps.js:60
 msgid "Please wait...."
 msgstr ""
 
-#: js/apps.js:59 js/apps.js:71 js/apps.js:80 js/apps.js:93
+#: js/apps.js:64 js/apps.js:76 js/apps.js:85 js/apps.js:98
 msgid "Error"
 msgstr "Error"
 
-#: js/apps.js:90
+#: js/apps.js:95
 msgid "Updating...."
 msgstr ""
 
-#: js/apps.js:93
+#: js/apps.js:98
 msgid "Error while updating app"
 msgstr ""
 
-#: js/apps.js:96
+#: js/apps.js:101
 msgid "Updated"
 msgstr ""
 
@@ -165,15 +165,15 @@ msgstr ""
 msgid "A valid password must be provided"
 msgstr ""
 
-#: personal.php:35 personal.php:36
+#: personal.php:37 personal.php:38
 msgid "__language_name__"
 msgstr "Interlingua"
 
-#: templates/admin.php:15
+#: templates/admin.php:17
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:18
+#: templates/admin.php:20
 msgid ""
 "Your data directory and your files are probably accessible from the "
 "internet. The .htaccess file that ownCloud provides is not working. We "
@@ -182,36 +182,36 @@ msgid ""
 " webserver document root."
 msgstr ""
 
-#: templates/admin.php:29
+#: templates/admin.php:31
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:32
+#: templates/admin.php:34
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: templates/admin.php:33
+#: templates/admin.php:35
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:44
+#: templates/admin.php:46
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:47
+#: templates/admin.php:49
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr ""
 
-#: templates/admin.php:58
+#: templates/admin.php:60
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:63
+#: templates/admin.php:65
 #, php-format
 msgid ""
 "This ownCloud server can't set system locale to %s. This means that there "
@@ -219,11 +219,11 @@ msgid ""
 " to install the required packages on your system to support %s."
 msgstr ""
 
-#: templates/admin.php:75
+#: templates/admin.php:77
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:78
+#: templates/admin.php:80
 msgid ""
 "This ownCloud server has no working internet connection. This means that "
 "some of the features like mounting of external storage, notifications about "
@@ -233,102 +233,102 @@ msgid ""
 " of ownCloud."
 msgstr ""
 
-#: templates/admin.php:92
+#: templates/admin.php:94
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:101
+#: templates/admin.php:103
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:111
+#: templates/admin.php:113
 msgid ""
 "cron.php is registered at a webcron service. Call the cron.php page in the "
 "owncloud root once a minute over http."
 msgstr ""
 
-#: templates/admin.php:121
+#: templates/admin.php:123
 msgid ""
 "Use systems cron service. Call the cron.php file in the owncloud folder via "
 "a system cronjob once a minute."
 msgstr ""
 
-#: templates/admin.php:128
+#: templates/admin.php:130
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:134
+#: templates/admin.php:136
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:135
+#: templates/admin.php:137
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:142
+#: templates/admin.php:144
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:143
+#: templates/admin.php:145
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:150
+#: templates/admin.php:152
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:151
+#: templates/admin.php:153
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:158
+#: templates/admin.php:160
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:161
+#: templates/admin.php:163
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:168
+#: templates/admin.php:170
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:181
+#: templates/admin.php:183
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:182
+#: templates/admin.php:184
 msgid ""
 "Enforces the clients to connect to ownCloud via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:185
+#: templates/admin.php:187
 msgid ""
 "Please connect to this ownCloud instance via HTTPS to enable or disable the "
 "SSL enforcement."
 msgstr ""
 
-#: templates/admin.php:195
+#: templates/admin.php:197
 msgid "Log"
 msgstr "Registro"
 
-#: templates/admin.php:196
+#: templates/admin.php:198
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:227
+#: templates/admin.php:229
 msgid "More"
 msgstr "Plus"
 
-#: templates/admin.php:228
+#: templates/admin.php:230
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:235 templates/personal.php:116
+#: templates/admin.php:236 templates/personal.php:116
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:237 templates/personal.php:119
+#: templates/admin.php:240 templates/personal.php:119
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -386,76 +386,79 @@ msgstr ""
 msgid "Commercial Support"
 msgstr ""
 
-#: templates/personal.php:9
+#: templates/personal.php:10
 msgid "Get the apps to sync your files"
 msgstr "Obtene le apps (applicationes) pro synchronizar tu files"
 
-#: templates/personal.php:20
+#: templates/personal.php:21
 msgid "Show First Run Wizard again"
 msgstr ""
 
-#: templates/personal.php:28
+#: templates/personal.php:29
 #, php-format
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr ""
 
-#: templates/personal.php:40 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:41 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "Contrasigno"
 
-#: templates/personal.php:41
+#: templates/personal.php:42
 msgid "Your password was changed"
 msgstr ""
 
-#: templates/personal.php:42
+#: templates/personal.php:43
 msgid "Unable to change your password"
 msgstr "Non pote cambiar tu contrasigno"
 
-#: templates/personal.php:43
+#: templates/personal.php:44
 msgid "Current password"
 msgstr "Contrasigno currente"
 
-#: templates/personal.php:45
+#: templates/personal.php:46
 msgid "New password"
 msgstr "Nove contrasigno"
 
-#: templates/personal.php:47
+#: templates/personal.php:48
 msgid "Change password"
 msgstr "Cambiar contrasigno"
 
-#: templates/personal.php:59 templates/users.php:85
+#: templates/personal.php:60 templates/users.php:85
 msgid "Display Name"
 msgstr ""
 
-#: templates/personal.php:74
+#: templates/personal.php:75
 msgid "Email"
 msgstr "E-posta"
 
-#: templates/personal.php:76
+#: templates/personal.php:77
 msgid "Your email address"
 msgstr "Tu adresse de e-posta"
 
-#: templates/personal.php:77
+#: templates/personal.php:78
 msgid "Fill in an email address to enable password recovery"
 msgstr ""
 
-#: templates/personal.php:86 templates/personal.php:87
+#: templates/personal.php:87 templates/personal.php:88
 msgid "Language"
 msgstr "Linguage"
 
-#: templates/personal.php:99
+#: templates/personal.php:100
 msgid "Help translate"
 msgstr "Adjuta a traducer"
 
-#: templates/personal.php:105
+#: templates/personal.php:106
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:107
-msgid "Use this address to connect to your ownCloud in your file manager"
+#: templates/personal.php:108
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
+"target=\"_blank\">access your Files via WebDAV</a>"
 msgstr ""
 
-#: templates/users.php:21 templates/users.php:84
+#: templates/users.php:21
 msgid "Login Name"
 msgstr ""
 
@@ -485,6 +488,10 @@ msgstr ""
 msgid "Other"
 msgstr "Altere"
 
+#: templates/users.php:84
+msgid "Username"
+msgstr "Nomine de usator"
+
 #: templates/users.php:91
 msgid "Storage"
 msgstr ""
diff --git a/l10n/ia/user_ldap.po b/l10n/ia/user_ldap.po
index 7efd0a6b9dd657b621d842f89898b0cf2196ac5d..769ff0ac82be6ea94235550cf85aead19aa452fa 100644
--- a/l10n/ia/user_ldap.po
+++ b/l10n/ia/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:25+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:16+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/id/core.po b/l10n/id/core.po
index 52c936308b916800aabee6f9245bb4bb89dd07d4..449c4633c0cbba80fa811586d77e86cd76eadf87 100644
--- a/l10n/id/core.po
+++ b/l10n/id/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:22+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
 "MIME-Version: 1.0\n"
@@ -61,135 +61,135 @@ msgstr "Tidak ada kategori terpilih untuk dihapus."
 msgid "Error removing %s from favorites."
 msgstr "Galat ketika menghapus %s dari favorit"
 
-#: js/config.php:34
+#: js/config.php:32
 msgid "Sunday"
 msgstr "Minggu"
 
-#: js/config.php:35
+#: js/config.php:33
 msgid "Monday"
 msgstr "Senin"
 
-#: js/config.php:36
+#: js/config.php:34
 msgid "Tuesday"
 msgstr "Selasa"
 
-#: js/config.php:37
+#: js/config.php:35
 msgid "Wednesday"
 msgstr "Rabu"
 
-#: js/config.php:38
+#: js/config.php:36
 msgid "Thursday"
 msgstr "Kamis"
 
-#: js/config.php:39
+#: js/config.php:37
 msgid "Friday"
 msgstr "Jumat"
 
-#: js/config.php:40
+#: js/config.php:38
 msgid "Saturday"
 msgstr "Sabtu"
 
-#: js/config.php:45
+#: js/config.php:43
 msgid "January"
 msgstr "Januari"
 
-#: js/config.php:46
+#: js/config.php:44
 msgid "February"
 msgstr "Februari"
 
-#: js/config.php:47
+#: js/config.php:45
 msgid "March"
 msgstr "Maret"
 
-#: js/config.php:48
+#: js/config.php:46
 msgid "April"
 msgstr "April"
 
-#: js/config.php:49
+#: js/config.php:47
 msgid "May"
 msgstr "Mei"
 
-#: js/config.php:50
+#: js/config.php:48
 msgid "June"
 msgstr "Juni"
 
-#: js/config.php:51
+#: js/config.php:49
 msgid "July"
 msgstr "Juli"
 
-#: js/config.php:52
+#: js/config.php:50
 msgid "August"
 msgstr "Agustus"
 
-#: js/config.php:53
+#: js/config.php:51
 msgid "September"
 msgstr "September"
 
-#: js/config.php:54
+#: js/config.php:52
 msgid "October"
 msgstr "Oktober"
 
-#: js/config.php:55
+#: js/config.php:53
 msgid "November"
 msgstr "November"
 
-#: js/config.php:56
+#: js/config.php:54
 msgid "December"
 msgstr "Desember"
 
-#: js/js.js:286
+#: js/js.js:293
 msgid "Settings"
 msgstr "Setelan"
 
-#: js/js.js:718
+#: js/js.js:725
 msgid "seconds ago"
 msgstr "beberapa detik yang lalu"
 
-#: js/js.js:719
+#: js/js.js:726
 msgid "1 minute ago"
 msgstr "1 menit yang lalu"
 
-#: js/js.js:720
+#: js/js.js:727
 msgid "{minutes} minutes ago"
 msgstr "{minutes} menit yang lalu"
 
-#: js/js.js:721
+#: js/js.js:728
 msgid "1 hour ago"
 msgstr "1 jam yang lalu"
 
-#: js/js.js:722
+#: js/js.js:729
 msgid "{hours} hours ago"
 msgstr "{hours} jam yang lalu"
 
-#: js/js.js:723
+#: js/js.js:730
 msgid "today"
 msgstr "hari ini"
 
-#: js/js.js:724
+#: js/js.js:731
 msgid "yesterday"
 msgstr "kemarin"
 
-#: js/js.js:725
+#: js/js.js:732
 msgid "{days} days ago"
 msgstr "{days} hari yang lalu"
 
-#: js/js.js:726
+#: js/js.js:733
 msgid "last month"
 msgstr "bulan kemarin"
 
-#: js/js.js:727
+#: js/js.js:734
 msgid "{months} months ago"
 msgstr "{months} bulan yang lalu"
 
-#: js/js.js:728
+#: js/js.js:735
 msgid "months ago"
 msgstr "beberapa bulan lalu"
 
-#: js/js.js:729
+#: js/js.js:736
 msgid "last year"
 msgstr "tahun kemarin"
 
-#: js/js.js:730
+#: js/js.js:737
 msgid "years ago"
 msgstr "beberapa tahun lalu"
 
@@ -225,8 +225,8 @@ msgstr "Tipe objek tidak ditentukan."
 #: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
 #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:577
-#: js/share.js:589
+#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:620
+#: js/share.js:632
 msgid "Error"
 msgstr "Galat"
 
@@ -246,7 +246,7 @@ msgstr "Dibagikan"
 msgid "Share"
 msgstr "Bagikan"
 
-#: js/share.js:125 js/share.js:617
+#: js/share.js:125 js/share.js:660
 msgid "Error while sharing"
 msgstr "Galat ketika membagikan"
 
@@ -266,99 +266,103 @@ msgstr "Dibagikan dengan Anda dan grup {group} oleh {owner}"
 msgid "Shared with you by {owner}"
 msgstr "Dibagikan dengan Anda oleh {owner}"
 
-#: js/share.js:159
+#: js/share.js:172
 msgid "Share with"
 msgstr "Bagikan dengan"
 
-#: js/share.js:164
+#: js/share.js:177
 msgid "Share with link"
 msgstr "Bagikan lewat tautan"
 
-#: js/share.js:167
+#: js/share.js:180
 msgid "Password protect"
 msgstr "Lindungi dengan sandi"
 
-#: js/share.js:169 templates/installation.php:54 templates/login.php:26
+#: js/share.js:182 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "Sandi"
 
-#: js/share.js:173
+#: js/share.js:187
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:191
 msgid "Email link to person"
 msgstr "Emailkan tautan ini ke orang"
 
-#: js/share.js:174
+#: js/share.js:192
 msgid "Send"
 msgstr "Kirim"
 
-#: js/share.js:178
+#: js/share.js:197
 msgid "Set expiration date"
 msgstr "Setel tanggal kedaluwarsa"
 
-#: js/share.js:179
+#: js/share.js:198
 msgid "Expiration date"
 msgstr "Tanggal kedaluwarsa"
 
-#: js/share.js:211
+#: js/share.js:230
 msgid "Share via email:"
 msgstr "Bagian lewat email:"
 
-#: js/share.js:213
+#: js/share.js:232
 msgid "No people found"
 msgstr "Tidak ada orang ditemukan"
 
-#: js/share.js:251
+#: js/share.js:270
 msgid "Resharing is not allowed"
 msgstr "Berbagi ulang tidak diizinkan"
 
-#: js/share.js:287
+#: js/share.js:306
 msgid "Shared in {item} with {user}"
 msgstr "Dibagikan dalam {item} dengan {user}"
 
-#: js/share.js:308
+#: js/share.js:327
 msgid "Unshare"
 msgstr "Batalkan berbagi"
 
-#: js/share.js:320
+#: js/share.js:339
 msgid "can edit"
 msgstr "dapat mengedit"
 
-#: js/share.js:322
+#: js/share.js:341
 msgid "access control"
 msgstr "kontrol akses"
 
-#: js/share.js:325
+#: js/share.js:344
 msgid "create"
 msgstr "buat"
 
-#: js/share.js:328
+#: js/share.js:347
 msgid "update"
 msgstr "perbarui"
 
-#: js/share.js:331
+#: js/share.js:350
 msgid "delete"
 msgstr "hapus"
 
-#: js/share.js:334
+#: js/share.js:353
 msgid "share"
 msgstr "bagikan"
 
-#: js/share.js:368 js/share.js:564
+#: js/share.js:387 js/share.js:607
 msgid "Password protected"
 msgstr "Dilindungi sandi"
 
-#: js/share.js:577
+#: js/share.js:620
 msgid "Error unsetting expiration date"
 msgstr "Galat ketika menghapus tanggal kedaluwarsa"
 
-#: js/share.js:589
+#: js/share.js:632
 msgid "Error setting expiration date"
 msgstr "Galat ketika menyetel tanggal kedaluwarsa"
 
-#: js/share.js:604
+#: js/share.js:647
 msgid "Sending ..."
 msgstr "Mengirim ..."
 
-#: js/share.js:615
+#: js/share.js:658
 msgid "Email sent"
 msgstr "Email terkirim"
 
@@ -373,7 +377,7 @@ msgstr "Pembaruan gagal. Silakan laporkan masalah ini ke <a href=\"https://githu
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "Pembaruan sukses. Anda akan diarahkan ulang ke ownCloud."
 
-#: lostpassword/controller.php:58
+#: lostpassword/controller.php:60
 msgid "ownCloud password reset"
 msgstr "Setel ulang sandi ownCloud"
 
@@ -403,17 +407,17 @@ msgstr "Nama pengguna"
 
 #: lostpassword/templates/lostpassword.php:22
 msgid ""
-"Your files seems to be encrypted. If you didn't have enabled the recovery "
-"key there will be no way to get your data back once the password was "
-"resetted. If you are not sure what to do, please contact your administrator "
-"first before continue. Do you really want to continue?"
+"Your files are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
 msgstr ""
 
 #: lostpassword/templates/lostpassword.php:24
 msgid "Yes, I really want to reset my password now"
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:29
+#: lostpassword/templates/lostpassword.php:27
 msgid "Request reset"
 msgstr "Ajukan penyetelan ulang"
 
@@ -461,7 +465,7 @@ msgstr "Akses ditolak"
 msgid "Cloud not found"
 msgstr "Cloud tidak ditemukan"
 
-#: templates/altmail.php:2
+#: templates/altmail.php:4
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -472,10 +476,6 @@ msgid ""
 "Cheers!"
 msgstr ""
 
-#: templates/altmail.php:7 templates/mail.php:24
-msgid "web services under your control"
-msgstr "layanan web dalam kontrol Anda"
-
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
 msgstr "Edit kategori"
@@ -568,12 +568,12 @@ msgstr "Host basis data"
 msgid "Finish setup"
 msgstr "Selesaikan instalasi"
 
-#: templates/layout.user.php:40
+#: templates/layout.user.php:43
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:67
+#: templates/layout.user.php:68
 msgid "Log out"
 msgstr "Keluar"
 
@@ -607,7 +607,7 @@ msgstr "Masuk"
 msgid "Alternative Logins"
 msgstr "Cara Alternatif untuk Masuk"
 
-#: templates/mail.php:15
+#: templates/mail.php:16
 #, php-format
 msgid ""
 "Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
diff --git a/l10n/id/files.po b/l10n/id/files.po
index 9c620f02a4552259e4e1e7eef735e7dbd88ab43c..d49fac81f5cc9e048ffcee30cce382c4f0b87cb6 100644
--- a/l10n/id/files.po
+++ b/l10n/id/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:01+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
 "MIME-Version: 1.0\n"
@@ -27,46 +27,54 @@ msgstr "Tidak dapat memindahkan %s - Berkas dengan nama ini sudah ada"
 msgid "Could not move %s"
 msgstr "Tidak dapat memindahkan %s"
 
-#: ajax/upload.php:19
+#: ajax/upload.php:16 ajax/upload.php:45
+msgid "Unable to set upload directory."
+msgstr ""
+
+#: ajax/upload.php:22
+msgid "Invalid Token"
+msgstr ""
+
+#: ajax/upload.php:59
 msgid "No file was uploaded. Unknown error"
 msgstr "Tidak ada berkas yang diunggah. Galat tidak dikenal."
 
-#: ajax/upload.php:26
+#: ajax/upload.php:66
 msgid "There is no error, the file uploaded with success"
 msgstr "Tidak ada galat, berkas sukses diunggah"
 
-#: ajax/upload.php:27
+#: ajax/upload.php:67
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr "Berkas yang diunggah melampaui direktif upload_max_filesize pada php.ini"
 
-#: ajax/upload.php:29
+#: ajax/upload.php:69
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Berkas yang diunggah melampaui direktif MAX_FILE_SIZE yang ditentukan dalam formulir HTML."
 
-#: ajax/upload.php:30
+#: ajax/upload.php:70
 msgid "The uploaded file was only partially uploaded"
 msgstr "Berkas hanya diunggah sebagian"
 
-#: ajax/upload.php:31
+#: ajax/upload.php:71
 msgid "No file was uploaded"
 msgstr "Tidak ada berkas yang diunggah"
 
-#: ajax/upload.php:32
+#: ajax/upload.php:72
 msgid "Missing a temporary folder"
 msgstr "Folder sementara tidak ada"
 
-#: ajax/upload.php:33
+#: ajax/upload.php:73
 msgid "Failed to write to disk"
 msgstr "Gagal menulis ke disk"
 
-#: ajax/upload.php:51
+#: ajax/upload.php:91
 msgid "Not enough storage available"
 msgstr "Ruang penyimpanan tidak mencukupi"
 
-#: ajax/upload.php:83
+#: ajax/upload.php:123
 msgid "Invalid directory."
 msgstr "Direktori tidak valid."
 
@@ -74,6 +82,36 @@ msgstr "Direktori tidak valid."
 msgid "Files"
 msgstr "Berkas"
 
+#: js/file-upload.js:11
+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/file-upload.js:24
+msgid "Not enough space available"
+msgstr "Ruang penyimpanan tidak mencukupi"
+
+#: js/file-upload.js:64
+msgid "Upload cancelled."
+msgstr "Pengunggahan dibatalkan."
+
+#: js/file-upload.js:167 js/files.js:266
+msgid ""
+"File upload is in progress. Leaving the page now will cancel the upload."
+msgstr "Berkas sedang diunggah. Meninggalkan halaman ini akan membatalkan proses."
+
+#: js/file-upload.js:233 js/files.js:339
+msgid "URL cannot be empty."
+msgstr "URL tidak boleh kosong"
+
+#: js/file-upload.js:238 lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr ""
+
+#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
+#: js/files.js:693 js/files.js:731
+msgid "Error"
+msgstr "Galat"
+
 #: js/fileactions.js:116
 msgid "Share"
 msgstr "Bagikan"
@@ -90,43 +128,43 @@ msgstr "Hapus"
 msgid "Rename"
 msgstr "Ubah nama"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:464
 msgid "Pending"
 msgstr "Menunggu"
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "{new_name} already exists"
 msgstr "{new_name} sudah ada"
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "replace"
 msgstr "ganti"
 
-#: js/filelist.js:259
+#: js/filelist.js:302
 msgid "suggest name"
 msgstr "sarankan nama"
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "cancel"
 msgstr "batalkan"
 
-#: js/filelist.js:306
+#: js/filelist.js:349
 msgid "replaced {new_name} with {old_name}"
 msgstr "mengganti {new_name} dengan {old_name}"
 
-#: js/filelist.js:306
+#: js/filelist.js:349
 msgid "undo"
 msgstr "urungkan"
 
-#: js/filelist.js:331
+#: js/filelist.js:374
 msgid "perform delete operation"
 msgstr "Lakukan operasi penghapusan"
 
-#: js/filelist.js:413
+#: js/filelist.js:456
 msgid "1 file uploading"
 msgstr "1 berkas diunggah"
 
-#: js/filelist.js:416 js/filelist.js:470
+#: js/filelist.js:459 js/filelist.js:517
 msgid "files uploading"
 msgstr "berkas diunggah"
 
@@ -158,70 +196,42 @@ msgid ""
 "big."
 msgstr "Unduhan Anda sedang disiapkan. Prosesnya dapat berlangsung agak lama jika ukuran berkasnya besar."
 
-#: js/files.js:264
-msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "Gagal mengunggah berkas Anda karena berupa direktori atau mempunyai ukuran 0 byte"
-
-#: js/files.js:277
-msgid "Not enough space available"
-msgstr "Ruang penyimpanan tidak mencukupi"
-
-#: js/files.js:317
-msgid "Upload cancelled."
-msgstr "Pengunggahan dibatalkan."
-
-#: js/files.js:413
-msgid ""
-"File upload is in progress. Leaving the page now will cancel the upload."
-msgstr "Berkas sedang diunggah. Meninggalkan halaman ini akan membatalkan proses."
-
-#: js/files.js:486
-msgid "URL cannot be empty."
-msgstr "URL tidak boleh kosong"
-
-#: js/files.js:491
+#: js/files.js:344
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Nama folder salah. Nama 'Shared' telah digunakan oleh Owncloud."
 
-#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
-msgid "Error"
-msgstr "Galat"
-
-#: js/files.js:877 templates/index.php:69
+#: js/files.js:744 templates/index.php:69
 msgid "Name"
 msgstr "Nama"
 
-#: js/files.js:878 templates/index.php:80
+#: js/files.js:745 templates/index.php:80
 msgid "Size"
 msgstr "Ukuran"
 
-#: js/files.js:879 templates/index.php:82
+#: js/files.js:746 templates/index.php:82
 msgid "Modified"
 msgstr "Dimodifikasi"
 
-#: js/files.js:898
+#: js/files.js:765
 msgid "1 folder"
 msgstr "1 folder"
 
-#: js/files.js:900
+#: js/files.js:767
 msgid "{count} folders"
 msgstr "{count} folder"
 
-#: js/files.js:908
+#: js/files.js:775
 msgid "1 file"
 msgstr "1 berkas"
 
-#: js/files.js:910
+#: js/files.js:777
 msgid "{count} files"
 msgstr "{count} berkas"
 
-#: lib/app.php:53
-msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
-msgstr ""
-
 #: lib/app.php:73
-msgid "Unable to rename file"
-msgstr "Tidak dapat mengubah nama berkas"
+#, php-format
+msgid "%s could not be renamed"
+msgstr ""
 
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
@@ -317,6 +327,22 @@ msgstr "Berkas sedang dipindai, silakan tunggu."
 msgid "Current scanning"
 msgstr "Yang sedang dipindai"
 
+#: templates/part.list.php:76
+msgid "directory"
+msgstr ""
+
+#: templates/part.list.php:78
+msgid "directories"
+msgstr ""
+
+#: templates/part.list.php:87
+msgid "file"
+msgstr "berkas"
+
+#: templates/part.list.php:89
+msgid "files"
+msgstr "berkas-berkas"
+
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
 msgstr "Meningkatkan tembolok sistem berkas..."
diff --git a/l10n/id/files_encryption.po b/l10n/id/files_encryption.po
index ddf864b3340517f7103a4a0f8244fadfdb5f58e4..754fd8ebf9a5e534f74cdf0164b797292ec6bc4e 100644
--- a/l10n/id/files_encryption.po
+++ b/l10n/id/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-14 02:46+0200\n"
-"PO-Revision-Date: 2013-06-14 00:47+0000\n"
+"POT-Creation-Date: 2013-07-05 02:12+0200\n"
+"PO-Revision-Date: 2013-07-05 00:13+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"
@@ -55,9 +55,21 @@ msgstr ""
 
 #: files/error.php:7
 msgid ""
-"Your private key is not valid! Maybe your password was changed from outside."
-" You can update your private key password in your personal settings to "
-"regain access to your files"
+"Your private key is not valid! Likely your password was changed outside the "
+"ownCloud system (e.g. your corporate directory). You can update your private"
+" key password in your personal settings to recover access to your encrypted "
+"files."
+msgstr ""
+
+#: hooks/hooks.php:44
+msgid "Missing requirements."
+msgstr ""
+
+#: hooks/hooks.php:45
+msgid ""
+"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL "
+"PHP extension is enabled and configured properly. For now, the encryption "
+"app has been disabled."
 msgstr ""
 
 #: js/settings-admin.js:11
@@ -84,11 +96,11 @@ msgstr "Enkripsi"
 
 #: templates/settings-admin.php:10
 msgid ""
-"Enable encryption passwords recovery key (allow sharing to recovery key):"
+"Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
 #: templates/settings-admin.php:14
-msgid "Recovery account password"
+msgid "Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:21 templates/settings-personal.php:54
@@ -100,15 +112,15 @@ msgid "Disabled"
 msgstr ""
 
 #: templates/settings-admin.php:34
-msgid "Change encryption passwords recovery key:"
+msgid "Change recovery key password:"
 msgstr ""
 
 #: templates/settings-admin.php:41
-msgid "Old Recovery account password"
+msgid "Old Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:48
-msgid "New Recovery account password"
+msgid "New Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:53
diff --git a/l10n/id/files_external.po b/l10n/id/files_external.po
index ecc410594ec9f7d0e19a77f0b00d272a0f0e722d..2e63ba247833dd5ccb1c741176ac40f753a90f97 100644
--- a/l10n/id/files_external.po
+++ b/l10n/id/files_external.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/id/files_sharing.po b/l10n/id/files_sharing.po
index 4e6c4eb7e1f887ab9061f725667a5f244eeb6aeb..afe89b2858b7ee5375a8734fca26dfb8c3450a65 100644
--- a/l10n/id/files_sharing.po
+++ b/l10n/id/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
 "MIME-Version: 1.0\n"
@@ -18,27 +18,39 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: templates/authenticate.php:4
+msgid "The password is wrong. Try again."
+msgstr ""
+
+#: templates/authenticate.php:7
 msgid "Password"
 msgstr "Sandi"
 
-#: templates/authenticate.php:6
+#: templates/authenticate.php:9
 msgid "Submit"
 msgstr "Kirim"
 
-#: templates/public.php:10
+#: templates/public.php:17
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s membagikan folder %s dengan Anda"
 
-#: templates/public.php:13
+#: templates/public.php:20
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s membagikan file %s dengan Anda"
 
-#: templates/public.php:19 templates/public.php:43
+#: templates/public.php:28 templates/public.php:90
 msgid "Download"
 msgstr "Unduh"
 
-#: templates/public.php:40
+#: templates/public.php:45 templates/public.php:48
+msgid "Upload"
+msgstr "Unggah"
+
+#: templates/public.php:58
+msgid "Cancel upload"
+msgstr "Batal pengunggahan"
+
+#: templates/public.php:87
 msgid "No preview available for"
 msgstr "Tidak ada pratinjau tersedia untuk"
diff --git a/l10n/id/files_trashbin.po b/l10n/id/files_trashbin.po
index 961618e64daf051da57e62f63ff56b8718f702df..05ec8e217eac4b786489a4fcdebf85cc5d1dd5e1 100644
--- a/l10n/id/files_trashbin.po
+++ b/l10n/id/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:16+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/id/lib.po b/l10n/id/lib.po
index 2d94c914d40cebcf7da0fc7385e47db07d017271..4dd75a0b8e93e72750e89f5b3026d63958b1b7c0 100644
--- a/l10n/id/lib.po
+++ b/l10n/id/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
 "MIME-Version: 1.0\n"
@@ -17,43 +17,47 @@ msgstr ""
 "Language: id\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: app.php:359
+#: app.php:360
 msgid "Help"
 msgstr "Bantuan"
 
-#: app.php:372
+#: app.php:373
 msgid "Personal"
 msgstr "Pribadi"
 
-#: app.php:383
+#: app.php:384
 msgid "Settings"
 msgstr "Setelan"
 
-#: app.php:395
+#: app.php:396
 msgid "Users"
 msgstr "Pengguna"
 
-#: app.php:408
+#: app.php:409
 msgid "Apps"
 msgstr "Aplikasi"
 
-#: app.php:416
+#: app.php:417
 msgid "Admin"
 msgstr "Admin"
 
-#: files.php:210
+#: defaults.php:33
+msgid "web services under your control"
+msgstr "layanan web dalam kontrol Anda"
+
+#: files.php:226
 msgid "ZIP download is turned off."
 msgstr "Pengunduhan ZIP dimatikan."
 
-#: files.php:211
+#: files.php:227
 msgid "Files need to be downloaded one by one."
 msgstr "Berkas harus diunduh satu persatu."
 
-#: files.php:212 files.php:245
+#: files.php:228 files.php:261
 msgid "Back to Files"
 msgstr "Kembali ke Daftar Berkas"
 
-#: files.php:242
+#: files.php:258
 msgid "Selected files too large to generate zip file."
 msgstr "Berkas yang dipilih terlalu besar untuk dibuat berkas zip-nya."
 
@@ -85,104 +89,102 @@ msgstr "Teks"
 msgid "Images"
 msgstr "Gambar"
 
-#: setup.php:34
-msgid "Set an admin username."
-msgstr "Setel nama pengguna admin."
-
-#: setup.php:37
-msgid "Set an admin password."
-msgstr "Setel sandi admin."
-
-#: setup.php:55
+#: setup/abstractdatabase.php:22
 #, php-format
 msgid "%s enter the database username."
 msgstr "%s masukkan nama pengguna basis data."
 
-#: setup.php:58
+#: setup/abstractdatabase.php:25
 #, php-format
 msgid "%s enter the database name."
 msgstr "%s masukkan nama basis data."
 
-#: setup.php:61
+#: setup/abstractdatabase.php:28
 #, php-format
 msgid "%s you may not use dots in the database name"
 msgstr "%sAnda tidak boleh menggunakan karakter titik pada nama basis data"
 
-#: setup.php:64
+#: setup/mssql.php:20
 #, php-format
-msgid "%s set the database host."
-msgstr "%s setel host basis data."
-
-#: setup.php:126 setup.php:332 setup.php:377
-msgid "PostgreSQL username and/or password not valid"
-msgstr "Nama pengguna dan/atau sandi PostgreSQL tidak valid"
+msgid "MS SQL username and/or password not valid: %s"
+msgstr "Nama pengguna dan/atau sandi MySQL tidak valid: %s"
 
-#: setup.php:127 setup.php:235
+#: setup/mssql.php:21 setup/mysql.php:13 setup/oci.php:114
+#: setup/postgresql.php:24 setup/postgresql.php:70
 msgid "You need to enter either an existing account or the administrator."
 msgstr "Anda harus memasukkan akun yang sudah ada atau administrator."
 
-#: setup.php:152
-msgid "Oracle connection could not be established"
-msgstr ""
-
-#: setup.php:234
+#: setup/mysql.php:12
 msgid "MySQL username and/or password not valid"
 msgstr "Nama pengguna dan/atau sandi MySQL tidak valid"
 
-#: setup.php:288 setup.php:398 setup.php:407 setup.php:425 setup.php:435
-#: setup.php:444 setup.php:477 setup.php:543 setup.php:569 setup.php:576
-#: setup.php:587 setup.php:594 setup.php:603 setup.php:611 setup.php:620
-#: setup.php:626
+#: setup/mysql.php:67 setup/oci.php:54 setup/oci.php:121 setup/oci.php:147
+#: setup/oci.php:154 setup/oci.php:165 setup/oci.php:172 setup/oci.php:181
+#: setup/oci.php:189 setup/oci.php:198 setup/oci.php:204
+#: setup/postgresql.php:89 setup/postgresql.php:98 setup/postgresql.php:115
+#: setup/postgresql.php:125 setup/postgresql.php:134
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr "Galat Basis Data: \"%s\""
 
-#: setup.php:289 setup.php:399 setup.php:408 setup.php:426 setup.php:436
-#: setup.php:445 setup.php:478 setup.php:544 setup.php:570 setup.php:577
-#: setup.php:588 setup.php:604 setup.php:612 setup.php:621
+#: setup/mysql.php:68 setup/oci.php:55 setup/oci.php:122 setup/oci.php:148
+#: setup/oci.php:155 setup/oci.php:166 setup/oci.php:182 setup/oci.php:190
+#: setup/oci.php:199 setup/postgresql.php:90 setup/postgresql.php:99
+#: setup/postgresql.php:116 setup/postgresql.php:126 setup/postgresql.php:135
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr "Perintah yang bermasalah: \"%s\""
 
-#: setup.php:305
+#: setup/mysql.php:85
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr "Pengguna MySQL '%s'@'localhost' sudah ada."
 
-#: setup.php:306
+#: setup/mysql.php:86
 msgid "Drop this user from MySQL"
 msgstr "Hapus pengguna ini dari MySQL"
 
-#: setup.php:311
+#: setup/mysql.php:91
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr "Pengguna MySQL '%s'@'%%' sudah ada."
 
-#: setup.php:312
+#: setup/mysql.php:92
 msgid "Drop this user from MySQL."
 msgstr "Hapus pengguna ini dari MySQL."
 
-#: setup.php:469 setup.php:536
+#: setup/oci.php:34
+msgid "Oracle connection could not be established"
+msgstr ""
+
+#: setup/oci.php:41 setup/oci.php:113
 msgid "Oracle username and/or password not valid"
 msgstr "Nama pengguna dan/atau sandi Oracle tidak valid"
 
-#: setup.php:595 setup.php:627
+#: setup/oci.php:173 setup/oci.php:205
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr "Perintah yang bermasalah: \"%s\", nama pengguna: %s, sandi: %s"
 
-#: setup.php:647
-#, php-format
-msgid "MS SQL username and/or password not valid: %s"
-msgstr "Nama pengguna dan/atau sandi MySQL tidak valid: %s"
+#: setup/postgresql.php:23 setup/postgresql.php:69
+msgid "PostgreSQL username and/or password not valid"
+msgstr "Nama pengguna dan/atau sandi PostgreSQL tidak valid"
+
+#: setup.php:42
+msgid "Set an admin username."
+msgstr "Setel nama pengguna admin."
+
+#: setup.php:45
+msgid "Set an admin password."
+msgstr "Setel sandi admin."
 
-#: setup.php:870
+#: setup.php:198
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Web server Anda belum dikonfigurasikan dengan baik untuk mengizinkan sinkronisasi berkas karena tampaknya antarmuka WebDAV rusak."
 
-#: setup.php:871
+#: setup.php:199
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Silakan periksa ulang <a href='%s'>panduan instalasi</a>."
diff --git a/l10n/id/settings.po b/l10n/id/settings.po
index 47e09a2f55cd639edd6a9502600280876e9a8c44..25abaf16077a9eaeffbb3e912361fde2bf3dfde9 100644
--- a/l10n/id/settings.po
+++ b/l10n/id/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
 "MIME-Version: 1.0\n"
@@ -88,35 +88,35 @@ msgstr "Tidak dapat menghapus pengguna dari grup %s"
 msgid "Couldn't update app."
 msgstr "Tidak dapat memperbarui aplikasi."
 
-#: js/apps.js:30
+#: js/apps.js:35
 msgid "Update to {appversion}"
 msgstr "Perbarui ke {appversion}"
 
-#: js/apps.js:36 js/apps.js:76
+#: js/apps.js:41 js/apps.js:81
 msgid "Disable"
 msgstr "Nonaktifkan"
 
-#: js/apps.js:36 js/apps.js:64 js/apps.js:83
+#: js/apps.js:41 js/apps.js:69 js/apps.js:88
 msgid "Enable"
 msgstr "aktifkan"
 
-#: js/apps.js:55
+#: js/apps.js:60
 msgid "Please wait...."
 msgstr "Mohon tunggu...."
 
-#: js/apps.js:59 js/apps.js:71 js/apps.js:80 js/apps.js:93
+#: js/apps.js:64 js/apps.js:76 js/apps.js:85 js/apps.js:98
 msgid "Error"
 msgstr "Galat"
 
-#: js/apps.js:90
+#: js/apps.js:95
 msgid "Updating...."
 msgstr "Memperbarui...."
 
-#: js/apps.js:93
+#: js/apps.js:98
 msgid "Error while updating app"
 msgstr "Gagal ketika memperbarui aplikasi"
 
-#: js/apps.js:96
+#: js/apps.js:101
 msgid "Updated"
 msgstr "Diperbarui"
 
@@ -165,15 +165,15 @@ msgstr "Gagal membuat pengguna"
 msgid "A valid password must be provided"
 msgstr "Tuliskan sandi yang valid"
 
-#: personal.php:35 personal.php:36
+#: personal.php:37 personal.php:38
 msgid "__language_name__"
 msgstr "__language_name__"
 
-#: templates/admin.php:15
+#: templates/admin.php:17
 msgid "Security Warning"
 msgstr "Peringatan Keamanan"
 
-#: templates/admin.php:18
+#: templates/admin.php:20
 msgid ""
 "Your data directory and your files are probably accessible from the "
 "internet. The .htaccess file that ownCloud provides is not working. We "
@@ -182,36 +182,36 @@ msgid ""
 " webserver document root."
 msgstr "Mungkin direktori data dan berkas Anda dapat diakses dari internet. Berkas .htaccess yang disediakan oleh ownCloud tidak berfungsi. Kami sangat menyarankan Anda untuk mengonfigurasi webserver Anda agar direktori data tidak lagi dapat diakses atau pindahkan direktori data ke luar akar dokumen webserver."
 
-#: templates/admin.php:29
+#: templates/admin.php:31
 msgid "Setup Warning"
 msgstr "Peringatan Persiapan"
 
-#: templates/admin.php:32
+#: templates/admin.php:34
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Web server Anda belum dikonfigurasikan dengan baik untuk mengizinkan sinkronisasi berkas karena tampaknya antarmuka WebDAV rusak."
 
-#: templates/admin.php:33
+#: templates/admin.php:35
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Silakan periksa ulang <a href='%s'>panduan instalasi</a>."
 
-#: templates/admin.php:44
+#: templates/admin.php:46
 msgid "Module 'fileinfo' missing"
 msgstr "Module 'fileinfo' tidak ada"
 
-#: templates/admin.php:47
+#: templates/admin.php:49
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr "Module 'fileinfo' pada PHP tidak ada. Kami sangat menyarankan untuk mengaktifkan modul ini untuk mendapatkan hasil terbaik pada proses pendeteksian mime-type."
 
-#: templates/admin.php:58
+#: templates/admin.php:60
 msgid "Locale not working"
 msgstr "Kode pelokalan tidak berfungsi"
 
-#: templates/admin.php:63
+#: templates/admin.php:65
 #, php-format
 msgid ""
 "This ownCloud server can't set system locale to %s. This means that there "
@@ -219,11 +219,11 @@ msgid ""
 " to install the required packages on your system to support %s."
 msgstr "Server ownCloud ini tidak dapat menyetel kode pelokalan sistem ke nilai %s. Ini berarti mungkin akan terjadi masalah pada karakter tertentu pada nama berkas. Kami sarankan untuk menginstal paket yang dibutuhkan pada sistem Anda untuk mendukung %s."
 
-#: templates/admin.php:75
+#: templates/admin.php:77
 msgid "Internet connection not working"
 msgstr "Koneksi internet tidak berfungsi"
 
-#: templates/admin.php:78
+#: templates/admin.php:80
 msgid ""
 "This ownCloud server has no working internet connection. This means that "
 "some of the features like mounting of external storage, notifications about "
@@ -233,102 +233,102 @@ msgid ""
 " of ownCloud."
 msgstr "Server ownCloud ini tidak memiliki koneksi internet yang berfungsi. Artinya, beberapa fitur misalnya mengaitkan penyimpanan eksternal, notifikasi tentang pembaruan, atau instalasi aplikasi dari pihak ketiga tidak akan dapat berfungsi. Pengaksesan berkas secara online dan pengiriman email notifikasi mungkin juga tidak dapat berfungsi. Kami sarankan untuk mengaktifkan koneksi internet server ini agar mendapatkan semua fitur ownCloud."
 
-#: templates/admin.php:92
+#: templates/admin.php:94
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:101
+#: templates/admin.php:103
 msgid "Execute one task with each page loaded"
 msgstr "Jalankan tugas setiap kali halaman dimuat"
 
-#: templates/admin.php:111
+#: templates/admin.php:113
 msgid ""
 "cron.php is registered at a webcron service. Call the cron.php page in the "
 "owncloud root once a minute over http."
 msgstr "cron.php telah terdaftar sebagai layanan webcron. Panggil halaman cron.php pada akar direktori ownCloud tiap menit lewat http."
 
-#: templates/admin.php:121
+#: templates/admin.php:123
 msgid ""
 "Use systems cron service. Call the cron.php file in the owncloud folder via "
 "a system cronjob once a minute."
 msgstr "Gunakan layanan cron sistem. Panggil berkas cron.php pada folder ownCloud lewat cronjob sistem tiap menit."
 
-#: templates/admin.php:128
+#: templates/admin.php:130
 msgid "Sharing"
 msgstr "Berbagi"
 
-#: templates/admin.php:134
+#: templates/admin.php:136
 msgid "Enable Share API"
 msgstr "Aktifkan API Pembagian"
 
-#: templates/admin.php:135
+#: templates/admin.php:137
 msgid "Allow apps to use the Share API"
 msgstr "Izinkan aplikasi untuk menggunakan API Pembagian"
 
-#: templates/admin.php:142
+#: templates/admin.php:144
 msgid "Allow links"
 msgstr "Izinkan tautan"
 
-#: templates/admin.php:143
+#: templates/admin.php:145
 msgid "Allow users to share items to the public with links"
 msgstr "Izinkan pengguna untuk berbagi item kepada publik lewat tautan"
 
-#: templates/admin.php:150
+#: templates/admin.php:152
 msgid "Allow resharing"
 msgstr "Izinkan pembagian ulang"
 
-#: templates/admin.php:151
+#: templates/admin.php:153
 msgid "Allow users to share items shared with them again"
 msgstr "Izinkan pengguna untuk berbagi kembali item yang dibagikan kepada mereka."
 
-#: templates/admin.php:158
+#: templates/admin.php:160
 msgid "Allow users to share with anyone"
 msgstr "Izinkan pengguna untuk berbagi kepada siapa saja"
 
-#: templates/admin.php:161
+#: templates/admin.php:163
 msgid "Allow users to only share with users in their groups"
 msgstr "Hanya izinkan pengguna untuk berbagi dengan pengguna pada grup mereka sendiri"
 
-#: templates/admin.php:168
+#: templates/admin.php:170
 msgid "Security"
 msgstr "Keamanan"
 
-#: templates/admin.php:181
+#: templates/admin.php:183
 msgid "Enforce HTTPS"
 msgstr "Selalu Gunakan HTTPS"
 
-#: templates/admin.php:182
+#: templates/admin.php:184
 msgid ""
 "Enforces the clients to connect to ownCloud via an encrypted connection."
 msgstr "Paksa klien untuk tersambung ke ownCloud lewat koneksi yang dienkripsi."
 
-#: templates/admin.php:185
+#: templates/admin.php:187
 msgid ""
 "Please connect to this ownCloud instance via HTTPS to enable or disable the "
 "SSL enforcement."
 msgstr "Silakan sambungkan ke instalasi ownCloud lewat HTTPS untuk mengaktifkan atau menonaktifkan fitur SSL."
 
-#: templates/admin.php:195
+#: templates/admin.php:197
 msgid "Log"
 msgstr "Catat"
 
-#: templates/admin.php:196
+#: templates/admin.php:198
 msgid "Log level"
 msgstr "Level pencatatan"
 
-#: templates/admin.php:227
+#: templates/admin.php:229
 msgid "More"
 msgstr "Lainnya"
 
-#: templates/admin.php:228
+#: templates/admin.php:230
 msgid "Less"
 msgstr "Ciutkan"
 
-#: templates/admin.php:235 templates/personal.php:116
+#: templates/admin.php:236 templates/personal.php:116
 msgid "Version"
 msgstr "Versi"
 
-#: templates/admin.php:237 templates/personal.php:119
+#: templates/admin.php:240 templates/personal.php:119
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -386,76 +386,79 @@ msgstr "Bugtracker"
 msgid "Commercial Support"
 msgstr "Dukungan Komersial"
 
-#: templates/personal.php:9
+#: templates/personal.php:10
 msgid "Get the apps to sync your files"
 msgstr "Dapatkan aplikasi untuk sinkronisasi berkas Anda"
 
-#: templates/personal.php:20
+#: templates/personal.php:21
 msgid "Show First Run Wizard again"
 msgstr "Tampilkan Penuntun Konfigurasi Awal"
 
-#: templates/personal.php:28
+#: templates/personal.php:29
 #, php-format
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "Anda telah menggunakan <strong>%s</strong> dari total <strong>%s</strong>"
 
-#: templates/personal.php:40 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:41 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "Sandi"
 
-#: templates/personal.php:41
+#: templates/personal.php:42
 msgid "Your password was changed"
 msgstr "Sandi Anda telah diubah"
 
-#: templates/personal.php:42
+#: templates/personal.php:43
 msgid "Unable to change your password"
 msgstr "Gagal mengubah sandi Anda"
 
-#: templates/personal.php:43
+#: templates/personal.php:44
 msgid "Current password"
 msgstr "Sandi saat ini"
 
-#: templates/personal.php:45
+#: templates/personal.php:46
 msgid "New password"
 msgstr "Sandi baru"
 
-#: templates/personal.php:47
+#: templates/personal.php:48
 msgid "Change password"
 msgstr "Ubah sandi"
 
-#: templates/personal.php:59 templates/users.php:85
+#: templates/personal.php:60 templates/users.php:85
 msgid "Display Name"
 msgstr "Nama Tampilan"
 
-#: templates/personal.php:74
+#: templates/personal.php:75
 msgid "Email"
 msgstr "Email"
 
-#: templates/personal.php:76
+#: templates/personal.php:77
 msgid "Your email address"
 msgstr "Alamat email Anda"
 
-#: templates/personal.php:77
+#: templates/personal.php:78
 msgid "Fill in an email address to enable password recovery"
 msgstr "Masukkan alamat email untuk mengaktifkan pemulihan sandi"
 
-#: templates/personal.php:86 templates/personal.php:87
+#: templates/personal.php:87 templates/personal.php:88
 msgid "Language"
 msgstr "Bahasa"
 
-#: templates/personal.php:99
+#: templates/personal.php:100
 msgid "Help translate"
 msgstr "Bantu menerjemahkan"
 
-#: templates/personal.php:105
+#: templates/personal.php:106
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:107
-msgid "Use this address to connect to your ownCloud in your file manager"
-msgstr "Gunakan alamat ini untuk terhubung ke ownCloud Anda pada manajer berkas "
+#: templates/personal.php:108
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
+"target=\"_blank\">access your Files via WebDAV</a>"
+msgstr ""
 
-#: templates/users.php:21 templates/users.php:84
+#: templates/users.php:21
 msgid "Login Name"
 msgstr "Nama Masuk"
 
@@ -485,6 +488,10 @@ msgstr "Tak terbatas"
 msgid "Other"
 msgstr "Lainnya"
 
+#: templates/users.php:84
+msgid "Username"
+msgstr "Nama pengguna"
+
 #: templates/users.php:91
 msgid "Storage"
 msgstr "Penyimpanan"
diff --git a/l10n/id/user_ldap.po b/l10n/id/user_ldap.po
index d7e3f6b7a7b59662c6377b2fddea9fcc85036d17..3fad90d971e968d7987cdb5b58004be96ca6bc0b 100644
--- a/l10n/id/user_ldap.po
+++ b/l10n/id/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:25+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:16+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/is/core.po b/l10n/is/core.po
index 43976981af659e37338bf9738771ccc3fc65822f..c4a9ff671b8cef3deb4f828647d39719610d5d10 100644
--- a/l10n/is/core.po
+++ b/l10n/is/core.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:22+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:14+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
 "MIME-Version: 1.0\n"
@@ -62,135 +62,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/config.php:34
+#: js/config.php:32
 msgid "Sunday"
 msgstr "Sunnudagur"
 
-#: js/config.php:35
+#: js/config.php:33
 msgid "Monday"
 msgstr "Mánudagur"
 
-#: js/config.php:36
+#: js/config.php:34
 msgid "Tuesday"
 msgstr "Þriðjudagur"
 
-#: js/config.php:37
+#: js/config.php:35
 msgid "Wednesday"
 msgstr "Miðvikudagur"
 
-#: js/config.php:38
+#: js/config.php:36
 msgid "Thursday"
 msgstr "Fimmtudagur"
 
-#: js/config.php:39
+#: js/config.php:37
 msgid "Friday"
 msgstr "Föstudagur"
 
-#: js/config.php:40
+#: js/config.php:38
 msgid "Saturday"
 msgstr "Laugardagur"
 
-#: js/config.php:45
+#: js/config.php:43
 msgid "January"
 msgstr "Janúar"
 
-#: js/config.php:46
+#: js/config.php:44
 msgid "February"
 msgstr "Febrúar"
 
-#: js/config.php:47
+#: js/config.php:45
 msgid "March"
 msgstr "Mars"
 
-#: js/config.php:48
+#: js/config.php:46
 msgid "April"
 msgstr "Apríl"
 
-#: js/config.php:49
+#: js/config.php:47
 msgid "May"
 msgstr "Maí"
 
-#: js/config.php:50
+#: js/config.php:48
 msgid "June"
 msgstr "Júní"
 
-#: js/config.php:51
+#: js/config.php:49
 msgid "July"
 msgstr "Júlí"
 
-#: js/config.php:52
+#: js/config.php:50
 msgid "August"
 msgstr "Ágúst"
 
-#: js/config.php:53
+#: js/config.php:51
 msgid "September"
 msgstr "September"
 
-#: js/config.php:54
+#: js/config.php:52
 msgid "October"
 msgstr "Október"
 
-#: js/config.php:55
+#: js/config.php:53
 msgid "November"
 msgstr "Nóvember"
 
-#: js/config.php:56
+#: js/config.php:54
 msgid "December"
 msgstr "Desember"
 
-#: js/js.js:286
+#: js/js.js:293
 msgid "Settings"
 msgstr "Stillingar"
 
-#: js/js.js:718
+#: js/js.js:725
 msgid "seconds ago"
 msgstr "sek."
 
-#: js/js.js:719
+#: js/js.js:726
 msgid "1 minute ago"
 msgstr "Fyrir 1 mínútu"
 
-#: js/js.js:720
+#: js/js.js:727
 msgid "{minutes} minutes ago"
 msgstr "{minutes} min síðan"
 
-#: js/js.js:721
+#: js/js.js:728
 msgid "1 hour ago"
 msgstr "Fyrir 1 klst."
 
-#: js/js.js:722
+#: js/js.js:729
 msgid "{hours} hours ago"
 msgstr "fyrir {hours} klst."
 
-#: js/js.js:723
+#: js/js.js:730
 msgid "today"
 msgstr "í dag"
 
-#: js/js.js:724
+#: js/js.js:731
 msgid "yesterday"
 msgstr "í gær"
 
-#: js/js.js:725
+#: js/js.js:732
 msgid "{days} days ago"
 msgstr "{days} dagar síðan"
 
-#: js/js.js:726
+#: js/js.js:733
 msgid "last month"
 msgstr "síðasta mánuði"
 
-#: js/js.js:727
+#: js/js.js:734
 msgid "{months} months ago"
 msgstr "fyrir {months} mánuðum"
 
-#: js/js.js:728
+#: js/js.js:735
 msgid "months ago"
 msgstr "mánuðir síðan"
 
-#: js/js.js:729
+#: js/js.js:736
 msgid "last year"
 msgstr "síðasta ári"
 
-#: js/js.js:730
+#: js/js.js:737
 msgid "years ago"
 msgstr "einhverjum árum"
 
@@ -226,8 +226,8 @@ msgstr "Tegund ekki tilgreind"
 #: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
 #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:577
-#: js/share.js:589
+#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:620
+#: js/share.js:632
 msgid "Error"
 msgstr "Villa"
 
@@ -247,7 +247,7 @@ msgstr "Deilt"
 msgid "Share"
 msgstr "Deila"
 
-#: js/share.js:125 js/share.js:617
+#: js/share.js:125 js/share.js:660
 msgid "Error while sharing"
 msgstr "Villa við deilingu"
 
@@ -267,99 +267,103 @@ msgstr "Deilt með þér og hópnum {group} af {owner}"
 msgid "Shared with you by {owner}"
 msgstr "Deilt með þér af {owner}"
 
-#: js/share.js:159
+#: js/share.js:172
 msgid "Share with"
 msgstr "Deila með"
 
-#: js/share.js:164
+#: js/share.js:177
 msgid "Share with link"
 msgstr "Deila með veftengli"
 
-#: js/share.js:167
+#: js/share.js:180
 msgid "Password protect"
 msgstr "Verja með lykilorði"
 
-#: js/share.js:169 templates/installation.php:54 templates/login.php:26
+#: js/share.js:182 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "Lykilorð"
 
-#: js/share.js:173
+#: js/share.js:187
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:191
 msgid "Email link to person"
 msgstr "Senda vefhlekk í tölvupóstu til notenda"
 
-#: js/share.js:174
+#: js/share.js:192
 msgid "Send"
 msgstr "Senda"
 
-#: js/share.js:178
+#: js/share.js:197
 msgid "Set expiration date"
 msgstr "Setja gildistíma"
 
-#: js/share.js:179
+#: js/share.js:198
 msgid "Expiration date"
 msgstr "Gildir til"
 
-#: js/share.js:211
+#: js/share.js:230
 msgid "Share via email:"
 msgstr "Deila með tölvupósti:"
 
-#: js/share.js:213
+#: js/share.js:232
 msgid "No people found"
 msgstr "Engir notendur fundust"
 
-#: js/share.js:251
+#: js/share.js:270
 msgid "Resharing is not allowed"
 msgstr "Endurdeiling er ekki leyfð"
 
-#: js/share.js:287
+#: js/share.js:306
 msgid "Shared in {item} with {user}"
 msgstr "Deilt með {item} ásamt {user}"
 
-#: js/share.js:308
+#: js/share.js:327
 msgid "Unshare"
 msgstr "Hætta deilingu"
 
-#: js/share.js:320
+#: js/share.js:339
 msgid "can edit"
 msgstr "getur breytt"
 
-#: js/share.js:322
+#: js/share.js:341
 msgid "access control"
 msgstr "aðgangsstýring"
 
-#: js/share.js:325
+#: js/share.js:344
 msgid "create"
 msgstr "mynda"
 
-#: js/share.js:328
+#: js/share.js:347
 msgid "update"
 msgstr "uppfæra"
 
-#: js/share.js:331
+#: js/share.js:350
 msgid "delete"
 msgstr "eyða"
 
-#: js/share.js:334
+#: js/share.js:353
 msgid "share"
 msgstr "deila"
 
-#: js/share.js:368 js/share.js:564
+#: js/share.js:387 js/share.js:607
 msgid "Password protected"
 msgstr "Verja með lykilorði"
 
-#: js/share.js:577
+#: js/share.js:620
 msgid "Error unsetting expiration date"
 msgstr "Villa við að aftengja gildistíma"
 
-#: js/share.js:589
+#: js/share.js:632
 msgid "Error setting expiration date"
 msgstr "Villa við að setja gildistíma"
 
-#: js/share.js:604
+#: js/share.js:647
 msgid "Sending ..."
 msgstr "Sendi ..."
 
-#: js/share.js:615
+#: js/share.js:658
 msgid "Email sent"
 msgstr "Tölvupóstur sendur"
 
@@ -374,7 +378,7 @@ msgstr ""
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "Uppfærslan heppnaðist. Beini þér til ownCloud nú."
 
-#: lostpassword/controller.php:58
+#: lostpassword/controller.php:60
 msgid "ownCloud password reset"
 msgstr "endursetja ownCloud lykilorð"
 
@@ -404,17 +408,17 @@ msgstr "Notendanafn"
 
 #: lostpassword/templates/lostpassword.php:22
 msgid ""
-"Your files seems to be encrypted. If you didn't have enabled the recovery "
-"key there will be no way to get your data back once the password was "
-"resetted. If you are not sure what to do, please contact your administrator "
-"first before continue. Do you really want to continue?"
+"Your files are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
 msgstr ""
 
 #: lostpassword/templates/lostpassword.php:24
 msgid "Yes, I really want to reset my password now"
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:29
+#: lostpassword/templates/lostpassword.php:27
 msgid "Request reset"
 msgstr "Endursetja lykilorð"
 
@@ -462,7 +466,7 @@ msgstr "Aðgangur bannaður"
 msgid "Cloud not found"
 msgstr "Ský finnst ekki"
 
-#: templates/altmail.php:2
+#: templates/altmail.php:4
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -473,10 +477,6 @@ msgid ""
 "Cheers!"
 msgstr ""
 
-#: templates/altmail.php:7 templates/mail.php:24
-msgid "web services under your control"
-msgstr "vefþjónusta undir þinni stjórn"
-
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
 msgstr "Breyta flokkum"
@@ -569,12 +569,12 @@ msgstr "Netþjónn gagnagrunns"
 msgid "Finish setup"
 msgstr "Virkja uppsetningu"
 
-#: templates/layout.user.php:40
+#: templates/layout.user.php:43
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr "%s er til boða. Fáðu meiri upplýsingar um hvernig þú uppfærir."
 
-#: templates/layout.user.php:67
+#: templates/layout.user.php:68
 msgid "Log out"
 msgstr "Útskrá"
 
@@ -608,7 +608,7 @@ msgstr "<strong>Skrá inn</strong>"
 msgid "Alternative Logins"
 msgstr ""
 
-#: templates/mail.php:15
+#: templates/mail.php:16
 #, php-format
 msgid ""
 "Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
diff --git a/l10n/is/files.po b/l10n/is/files.po
index 3c549dc287d71f46ba044b4abbd5b6d697465de0..ccf3f7baa5ecfe1f627ff93beb2d3a6f50f61f2c 100644
--- a/l10n/is/files.po
+++ b/l10n/is/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:01+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
 "MIME-Version: 1.0\n"
@@ -27,46 +27,54 @@ msgstr "Gat ekki fært %s - Skrá með þessu nafni er þegar til"
 msgid "Could not move %s"
 msgstr "Gat ekki fært %s"
 
-#: ajax/upload.php:19
+#: ajax/upload.php:16 ajax/upload.php:45
+msgid "Unable to set upload directory."
+msgstr ""
+
+#: ajax/upload.php:22
+msgid "Invalid Token"
+msgstr ""
+
+#: ajax/upload.php:59
 msgid "No file was uploaded. Unknown error"
 msgstr "Engin skrá var send inn. Óþekkt villa."
 
-#: ajax/upload.php:26
+#: ajax/upload.php:66
 msgid "There is no error, the file uploaded with success"
 msgstr "Engin villa, innsending heppnaðist"
 
-#: ajax/upload.php:27
+#: ajax/upload.php:67
 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:29
+#: ajax/upload.php:69
 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:30
+#: ajax/upload.php:70
 msgid "The uploaded file was only partially uploaded"
 msgstr "Einungis hluti af innsendri skrá skilaði sér"
 
-#: ajax/upload.php:31
+#: ajax/upload.php:71
 msgid "No file was uploaded"
 msgstr "Engin skrá skilaði sér"
 
-#: ajax/upload.php:32
+#: ajax/upload.php:72
 msgid "Missing a temporary folder"
 msgstr "Vantar bráðabirgðamöppu"
 
-#: ajax/upload.php:33
+#: ajax/upload.php:73
 msgid "Failed to write to disk"
 msgstr "Tókst ekki að skrifa á disk"
 
-#: ajax/upload.php:51
+#: ajax/upload.php:91
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:83
+#: ajax/upload.php:123
 msgid "Invalid directory."
 msgstr "Ógild mappa."
 
@@ -74,6 +82,36 @@ msgstr "Ógild mappa."
 msgid "Files"
 msgstr "Skrár"
 
+#: js/file-upload.js:11
+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/file-upload.js:24
+msgid "Not enough space available"
+msgstr "Ekki nægt pláss tiltækt"
+
+#: js/file-upload.js:64
+msgid "Upload cancelled."
+msgstr "Hætt við innsendingu."
+
+#: js/file-upload.js:167 js/files.js:266
+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/file-upload.js:233 js/files.js:339
+msgid "URL cannot be empty."
+msgstr "Vefslóð má ekki vera tóm."
+
+#: js/file-upload.js:238 lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr ""
+
+#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
+#: js/files.js:693 js/files.js:731
+msgid "Error"
+msgstr "Villa"
+
 #: js/fileactions.js:116
 msgid "Share"
 msgstr "Deila"
@@ -90,43 +128,43 @@ msgstr "Eyða"
 msgid "Rename"
 msgstr "Endurskýra"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:464
 msgid "Pending"
 msgstr "Bíður"
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "{new_name} already exists"
 msgstr "{new_name} er þegar til"
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "replace"
 msgstr "yfirskrifa"
 
-#: js/filelist.js:259
+#: js/filelist.js:302
 msgid "suggest name"
 msgstr "stinga upp á nafni"
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "cancel"
 msgstr "hætta við"
 
-#: js/filelist.js:306
+#: js/filelist.js:349
 msgid "replaced {new_name} with {old_name}"
 msgstr "yfirskrifaði {new_name} með {old_name}"
 
-#: js/filelist.js:306
+#: js/filelist.js:349
 msgid "undo"
 msgstr "afturkalla"
 
-#: js/filelist.js:331
+#: js/filelist.js:374
 msgid "perform delete operation"
 msgstr ""
 
-#: js/filelist.js:413
+#: js/filelist.js:456
 msgid "1 file uploading"
 msgstr "1 skrá innsend"
 
-#: js/filelist.js:416 js/filelist.js:470
+#: js/filelist.js:459 js/filelist.js:517
 msgid "files uploading"
 msgstr ""
 
@@ -158,70 +196,42 @@ msgid ""
 "big."
 msgstr ""
 
-#: js/files.js:264
-msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "Innsending á skrá mistókst, hugsanlega sendir þú möppu eða skráin er 0 bæti."
-
-#: js/files.js:277
-msgid "Not enough space available"
-msgstr "Ekki nægt pláss tiltækt"
-
-#: js/files.js:317
-msgid "Upload cancelled."
-msgstr "Hætt við innsendingu."
-
-#: js/files.js:413
-msgid ""
-"File upload is in progress. Leaving the page now will cancel the upload."
-msgstr "Innsending í gangi. Ef þú ferð af þessari síðu mun innsending misheppnast."
-
-#: js/files.js:486
-msgid "URL cannot be empty."
-msgstr "Vefslóð má ekki vera tóm."
-
-#: js/files.js:491
+#: js/files.js:344
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Óleyfilegt nafn á möppu. Nafnið 'Shared' er frátekið fyrir Owncloud"
 
-#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
-msgid "Error"
-msgstr "Villa"
-
-#: js/files.js:877 templates/index.php:69
+#: js/files.js:744 templates/index.php:69
 msgid "Name"
 msgstr "Nafn"
 
-#: js/files.js:878 templates/index.php:80
+#: js/files.js:745 templates/index.php:80
 msgid "Size"
 msgstr "Stærð"
 
-#: js/files.js:879 templates/index.php:82
+#: js/files.js:746 templates/index.php:82
 msgid "Modified"
 msgstr "Breytt"
 
-#: js/files.js:898
+#: js/files.js:765
 msgid "1 folder"
 msgstr "1 mappa"
 
-#: js/files.js:900
+#: js/files.js:767
 msgid "{count} folders"
 msgstr "{count} möppur"
 
-#: js/files.js:908
+#: js/files.js:775
 msgid "1 file"
 msgstr "1 skrá"
 
-#: js/files.js:910
+#: js/files.js:777
 msgid "{count} files"
 msgstr "{count} skrár"
 
-#: lib/app.php:53
-msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
-msgstr ""
-
 #: lib/app.php:73
-msgid "Unable to rename file"
-msgstr "Gat ekki endurskýrt skrá"
+#, php-format
+msgid "%s could not be renamed"
+msgstr ""
 
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
@@ -317,6 +327,22 @@ msgstr "Verið er að skima skrár, vinsamlegast hinkraðu."
 msgid "Current scanning"
 msgstr "Er að skima"
 
+#: templates/part.list.php:76
+msgid "directory"
+msgstr ""
+
+#: templates/part.list.php:78
+msgid "directories"
+msgstr ""
+
+#: templates/part.list.php:87
+msgid "file"
+msgstr ""
+
+#: templates/part.list.php:89
+msgid "files"
+msgstr ""
+
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
 msgstr ""
diff --git a/l10n/is/files_encryption.po b/l10n/is/files_encryption.po
index bc701a2d416b5b487950805d25189f25f404c845..4cc867c7a62feba3930a80fedc1d00ba2982d979 100644
--- a/l10n/is/files_encryption.po
+++ b/l10n/is/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-14 02:46+0200\n"
-"PO-Revision-Date: 2013-06-14 00:47+0000\n"
+"POT-Creation-Date: 2013-07-05 02:12+0200\n"
+"PO-Revision-Date: 2013-07-05 00:13+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"
@@ -55,9 +55,21 @@ msgstr ""
 
 #: files/error.php:7
 msgid ""
-"Your private key is not valid! Maybe your password was changed from outside."
-" You can update your private key password in your personal settings to "
-"regain access to your files"
+"Your private key is not valid! Likely your password was changed outside the "
+"ownCloud system (e.g. your corporate directory). You can update your private"
+" key password in your personal settings to recover access to your encrypted "
+"files."
+msgstr ""
+
+#: hooks/hooks.php:44
+msgid "Missing requirements."
+msgstr ""
+
+#: hooks/hooks.php:45
+msgid ""
+"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL "
+"PHP extension is enabled and configured properly. For now, the encryption "
+"app has been disabled."
 msgstr ""
 
 #: js/settings-admin.js:11
@@ -84,11 +96,11 @@ msgstr "Dulkóðun"
 
 #: templates/settings-admin.php:10
 msgid ""
-"Enable encryption passwords recovery key (allow sharing to recovery key):"
+"Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
 #: templates/settings-admin.php:14
-msgid "Recovery account password"
+msgid "Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:21 templates/settings-personal.php:54
@@ -100,15 +112,15 @@ msgid "Disabled"
 msgstr ""
 
 #: templates/settings-admin.php:34
-msgid "Change encryption passwords recovery key:"
+msgid "Change recovery key password:"
 msgstr ""
 
 #: templates/settings-admin.php:41
-msgid "Old Recovery account password"
+msgid "Old Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:48
-msgid "New Recovery account password"
+msgid "New Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:53
diff --git a/l10n/is/files_external.po b/l10n/is/files_external.po
index c2b17a237ea4f66ed5e0c2f259facf553ca78533..76f1c65f044246cf69fe3fa7044d76866163bc61 100644
--- a/l10n/is/files_external.po
+++ b/l10n/is/files_external.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/is/files_sharing.po b/l10n/is/files_sharing.po
index 39f16a12a2d16ddd01eb0fb0f84e6d9cd54796f6..576125b028b74e0f4f5854b2434c457173242e26 100644
--- a/l10n/is/files_sharing.po
+++ b/l10n/is/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
 "MIME-Version: 1.0\n"
@@ -18,27 +18,39 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: templates/authenticate.php:4
+msgid "The password is wrong. Try again."
+msgstr ""
+
+#: templates/authenticate.php:7
 msgid "Password"
 msgstr "Lykilorð"
 
-#: templates/authenticate.php:6
+#: templates/authenticate.php:9
 msgid "Submit"
 msgstr "Senda"
 
-#: templates/public.php:10
+#: templates/public.php:17
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s deildi möppunni %s með þér"
 
-#: templates/public.php:13
+#: templates/public.php:20
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s deildi skránni %s með þér"
 
-#: templates/public.php:19 templates/public.php:43
+#: templates/public.php:28 templates/public.php:90
 msgid "Download"
 msgstr "Niðurhal"
 
-#: templates/public.php:40
+#: templates/public.php:45 templates/public.php:48
+msgid "Upload"
+msgstr "Senda inn"
+
+#: templates/public.php:58
+msgid "Cancel upload"
+msgstr "Hætta við innsendingu"
+
+#: templates/public.php:87
 msgid "No preview available for"
 msgstr "Yfirlit ekki í boði fyrir"
diff --git a/l10n/is/files_trashbin.po b/l10n/is/files_trashbin.po
index c262f30644151314c97138494af9d494928255e4..bfec4ac0530e2f58522c0663d5bc100eec5b16fd 100644
--- a/l10n/is/files_trashbin.po
+++ b/l10n/is/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/is/lib.po b/l10n/is/lib.po
index 7e563e2f98031856762d6e07cb4ed2c037fbc168..280cb9873fdb0340d8e70d106dbcdc55ca0f1713 100644
--- a/l10n/is/lib.po
+++ b/l10n/is/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
 "MIME-Version: 1.0\n"
@@ -17,43 +17,47 @@ msgstr ""
 "Language: is\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:359
+#: app.php:360
 msgid "Help"
 msgstr "Hjálp"
 
-#: app.php:372
+#: app.php:373
 msgid "Personal"
 msgstr "Um mig"
 
-#: app.php:383
+#: app.php:384
 msgid "Settings"
 msgstr "Stillingar"
 
-#: app.php:395
+#: app.php:396
 msgid "Users"
 msgstr "Notendur"
 
-#: app.php:408
+#: app.php:409
 msgid "Apps"
 msgstr "Forrit"
 
-#: app.php:416
+#: app.php:417
 msgid "Admin"
 msgstr "Stjórnun"
 
-#: files.php:210
+#: defaults.php:33
+msgid "web services under your control"
+msgstr "vefþjónusta undir þinni stjórn"
+
+#: files.php:226
 msgid "ZIP download is turned off."
 msgstr "Slökkt á ZIP niðurhali."
 
-#: files.php:211
+#: files.php:227
 msgid "Files need to be downloaded one by one."
 msgstr "Skrárnar verður að sækja eina og eina"
 
-#: files.php:212 files.php:245
+#: files.php:228 files.php:261
 msgid "Back to Files"
 msgstr "Aftur í skrár"
 
-#: files.php:242
+#: files.php:258
 msgid "Selected files too large to generate zip file."
 msgstr "Valdar skrár eru of stórar til að búa til ZIP skrá."
 
@@ -85,104 +89,102 @@ msgstr "Texti"
 msgid "Images"
 msgstr "Myndir"
 
-#: setup.php:34
-msgid "Set an admin username."
-msgstr ""
-
-#: setup.php:37
-msgid "Set an admin password."
-msgstr ""
-
-#: setup.php:55
+#: setup/abstractdatabase.php:22
 #, php-format
 msgid "%s enter the database username."
 msgstr ""
 
-#: setup.php:58
+#: setup/abstractdatabase.php:25
 #, php-format
 msgid "%s enter the database name."
 msgstr ""
 
-#: setup.php:61
+#: setup/abstractdatabase.php:28
 #, php-format
 msgid "%s you may not use dots in the database name"
 msgstr ""
 
-#: setup.php:64
+#: setup/mssql.php:20
 #, php-format
-msgid "%s set the database host."
-msgstr ""
-
-#: setup.php:126 setup.php:332 setup.php:377
-msgid "PostgreSQL username and/or password not valid"
+msgid "MS SQL username and/or password not valid: %s"
 msgstr ""
 
-#: setup.php:127 setup.php:235
+#: setup/mssql.php:21 setup/mysql.php:13 setup/oci.php:114
+#: setup/postgresql.php:24 setup/postgresql.php:70
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:152
-msgid "Oracle connection could not be established"
-msgstr ""
-
-#: setup.php:234
+#: setup/mysql.php:12
 msgid "MySQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:288 setup.php:398 setup.php:407 setup.php:425 setup.php:435
-#: setup.php:444 setup.php:477 setup.php:543 setup.php:569 setup.php:576
-#: setup.php:587 setup.php:594 setup.php:603 setup.php:611 setup.php:620
-#: setup.php:626
+#: setup/mysql.php:67 setup/oci.php:54 setup/oci.php:121 setup/oci.php:147
+#: setup/oci.php:154 setup/oci.php:165 setup/oci.php:172 setup/oci.php:181
+#: setup/oci.php:189 setup/oci.php:198 setup/oci.php:204
+#: setup/postgresql.php:89 setup/postgresql.php:98 setup/postgresql.php:115
+#: setup/postgresql.php:125 setup/postgresql.php:134
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr ""
 
-#: setup.php:289 setup.php:399 setup.php:408 setup.php:426 setup.php:436
-#: setup.php:445 setup.php:478 setup.php:544 setup.php:570 setup.php:577
-#: setup.php:588 setup.php:604 setup.php:612 setup.php:621
+#: setup/mysql.php:68 setup/oci.php:55 setup/oci.php:122 setup/oci.php:148
+#: setup/oci.php:155 setup/oci.php:166 setup/oci.php:182 setup/oci.php:190
+#: setup/oci.php:199 setup/postgresql.php:90 setup/postgresql.php:99
+#: setup/postgresql.php:116 setup/postgresql.php:126 setup/postgresql.php:135
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:305
+#: setup/mysql.php:85
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:306
+#: setup/mysql.php:86
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:311
+#: setup/mysql.php:91
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:312
+#: setup/mysql.php:92
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:469 setup.php:536
+#: setup/oci.php:34
+msgid "Oracle connection could not be established"
+msgstr ""
+
+#: setup/oci.php:41 setup/oci.php:113
 msgid "Oracle username and/or password not valid"
 msgstr ""
 
-#: setup.php:595 setup.php:627
+#: setup/oci.php:173 setup/oci.php:205
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:647
-#, php-format
-msgid "MS SQL username and/or password not valid: %s"
+#: setup/postgresql.php:23 setup/postgresql.php:69
+msgid "PostgreSQL username and/or password not valid"
+msgstr ""
+
+#: setup.php:42
+msgid "Set an admin username."
+msgstr ""
+
+#: setup.php:45
+msgid "Set an admin password."
 msgstr ""
 
-#: setup.php:870
+#: setup.php:198
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:871
+#: setup.php:199
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
diff --git a/l10n/is/settings.po b/l10n/is/settings.po
index 67e96ee2034de42b54744c8390ced0051153fd34..b0af6eb095c43ff168d536f62951662222e2f363 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-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
 "MIME-Version: 1.0\n"
@@ -89,35 +89,35 @@ msgstr "Ekki tókst að fjarlægja notanda úr hópnum %s"
 msgid "Couldn't update app."
 msgstr ""
 
-#: js/apps.js:30
+#: js/apps.js:35
 msgid "Update to {appversion}"
 msgstr ""
 
-#: js/apps.js:36 js/apps.js:76
+#: js/apps.js:41 js/apps.js:81
 msgid "Disable"
 msgstr "Gera óvirkt"
 
-#: js/apps.js:36 js/apps.js:64 js/apps.js:83
+#: js/apps.js:41 js/apps.js:69 js/apps.js:88
 msgid "Enable"
 msgstr "Virkja"
 
-#: js/apps.js:55
+#: js/apps.js:60
 msgid "Please wait...."
 msgstr "Andartak...."
 
-#: js/apps.js:59 js/apps.js:71 js/apps.js:80 js/apps.js:93
+#: js/apps.js:64 js/apps.js:76 js/apps.js:85 js/apps.js:98
 msgid "Error"
 msgstr "Villa"
 
-#: js/apps.js:90
+#: js/apps.js:95
 msgid "Updating...."
 msgstr "Uppfæri..."
 
-#: js/apps.js:93
+#: js/apps.js:98
 msgid "Error while updating app"
 msgstr ""
 
-#: js/apps.js:96
+#: js/apps.js:101
 msgid "Updated"
 msgstr "Uppfært"
 
@@ -166,15 +166,15 @@ msgstr ""
 msgid "A valid password must be provided"
 msgstr ""
 
-#: personal.php:35 personal.php:36
+#: personal.php:37 personal.php:38
 msgid "__language_name__"
 msgstr "__nafn_tungumáls__"
 
-#: templates/admin.php:15
+#: templates/admin.php:17
 msgid "Security Warning"
 msgstr "Öryggis aðvörun"
 
-#: templates/admin.php:18
+#: templates/admin.php:20
 msgid ""
 "Your data directory and your files are probably accessible from the "
 "internet. The .htaccess file that ownCloud provides is not working. We "
@@ -183,36 +183,36 @@ msgid ""
 " webserver document root."
 msgstr "Gagnamappan þín er að öllum líkindum aðgengileg frá internetinu. Skráin .htaccess sem fylgir með ownCloud er ekki að virka. Við mælum eindregið með því að þú stillir vefþjóninn þannig að gagnamappan verði ekki aðgengileg frá internetinu eða færir hana út fyrir vefrótina."
 
-#: templates/admin.php:29
+#: templates/admin.php:31
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:32
+#: templates/admin.php:34
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: templates/admin.php:33
+#: templates/admin.php:35
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:44
+#: templates/admin.php:46
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:47
+#: templates/admin.php:49
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr ""
 
-#: templates/admin.php:58
+#: templates/admin.php:60
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:63
+#: templates/admin.php:65
 #, php-format
 msgid ""
 "This ownCloud server can't set system locale to %s. This means that there "
@@ -220,11 +220,11 @@ msgid ""
 " to install the required packages on your system to support %s."
 msgstr ""
 
-#: templates/admin.php:75
+#: templates/admin.php:77
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:78
+#: templates/admin.php:80
 msgid ""
 "This ownCloud server has no working internet connection. This means that "
 "some of the features like mounting of external storage, notifications about "
@@ -234,102 +234,102 @@ msgid ""
 " of ownCloud."
 msgstr ""
 
-#: templates/admin.php:92
+#: templates/admin.php:94
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:101
+#: templates/admin.php:103
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:111
+#: templates/admin.php:113
 msgid ""
 "cron.php is registered at a webcron service. Call the cron.php page in the "
 "owncloud root once a minute over http."
 msgstr ""
 
-#: templates/admin.php:121
+#: templates/admin.php:123
 msgid ""
 "Use systems cron service. Call the cron.php file in the owncloud folder via "
 "a system cronjob once a minute."
 msgstr ""
 
-#: templates/admin.php:128
+#: templates/admin.php:130
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:134
+#: templates/admin.php:136
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:135
+#: templates/admin.php:137
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:142
+#: templates/admin.php:144
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:143
+#: templates/admin.php:145
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:150
+#: templates/admin.php:152
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:151
+#: templates/admin.php:153
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:158
+#: templates/admin.php:160
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:161
+#: templates/admin.php:163
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:168
+#: templates/admin.php:170
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:181
+#: templates/admin.php:183
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:182
+#: templates/admin.php:184
 msgid ""
 "Enforces the clients to connect to ownCloud via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:185
+#: templates/admin.php:187
 msgid ""
 "Please connect to this ownCloud instance via HTTPS to enable or disable the "
 "SSL enforcement."
 msgstr ""
 
-#: templates/admin.php:195
+#: templates/admin.php:197
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:196
+#: templates/admin.php:198
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:227
+#: templates/admin.php:229
 msgid "More"
 msgstr "Meira"
 
-#: templates/admin.php:228
+#: templates/admin.php:230
 msgid "Less"
 msgstr "Minna"
 
-#: templates/admin.php:235 templates/personal.php:116
+#: templates/admin.php:236 templates/personal.php:116
 msgid "Version"
 msgstr "Útgáfa"
 
-#: templates/admin.php:237 templates/personal.php:119
+#: templates/admin.php:240 templates/personal.php:119
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -387,76 +387,79 @@ msgstr "Villubókhald"
 msgid "Commercial Support"
 msgstr "Borgaður stuðningur"
 
-#: templates/personal.php:9
+#: templates/personal.php:10
 msgid "Get the apps to sync your files"
 msgstr ""
 
-#: templates/personal.php:20
+#: templates/personal.php:21
 msgid "Show First Run Wizard again"
 msgstr ""
 
-#: templates/personal.php:28
+#: templates/personal.php:29
 #, php-format
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "Þú hefur notað <strong>%s</strong> af tiltæku <strong>%s</strong>"
 
-#: templates/personal.php:40 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:41 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "Lykilorð"
 
-#: templates/personal.php:41
+#: templates/personal.php:42
 msgid "Your password was changed"
 msgstr "Lykilorði þínu hefur verið breytt"
 
-#: templates/personal.php:42
+#: templates/personal.php:43
 msgid "Unable to change your password"
 msgstr "Ekki tókst að breyta lykilorðinu þínu"
 
-#: templates/personal.php:43
+#: templates/personal.php:44
 msgid "Current password"
 msgstr "Núverandi lykilorð"
 
-#: templates/personal.php:45
+#: templates/personal.php:46
 msgid "New password"
 msgstr "Nýtt lykilorð"
 
-#: templates/personal.php:47
+#: templates/personal.php:48
 msgid "Change password"
 msgstr "Breyta lykilorði"
 
-#: templates/personal.php:59 templates/users.php:85
+#: templates/personal.php:60 templates/users.php:85
 msgid "Display Name"
 msgstr "Vísa nafn"
 
-#: templates/personal.php:74
+#: templates/personal.php:75
 msgid "Email"
 msgstr "Netfang"
 
-#: templates/personal.php:76
+#: templates/personal.php:77
 msgid "Your email address"
 msgstr "Netfangið þitt"
 
-#: templates/personal.php:77
+#: templates/personal.php:78
 msgid "Fill in an email address to enable password recovery"
 msgstr "Sláðu inn netfangið þitt til að virkja endurheimt á lykilorði"
 
-#: templates/personal.php:86 templates/personal.php:87
+#: templates/personal.php:87 templates/personal.php:88
 msgid "Language"
 msgstr "Tungumál"
 
-#: templates/personal.php:99
+#: templates/personal.php:100
 msgid "Help translate"
 msgstr "Hjálpa við þýðingu"
 
-#: templates/personal.php:105
+#: templates/personal.php:106
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:107
-msgid "Use this address to connect to your ownCloud in your file manager"
-msgstr "Notaðu þessa vefslóð til að tengjast ownCloud svæðinu þínu"
+#: templates/personal.php:108
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
+"target=\"_blank\">access your Files via WebDAV</a>"
+msgstr ""
 
-#: templates/users.php:21 templates/users.php:84
+#: templates/users.php:21
 msgid "Login Name"
 msgstr ""
 
@@ -486,6 +489,10 @@ msgstr "Ótakmarkað"
 msgid "Other"
 msgstr "Annað"
 
+#: templates/users.php:84
+msgid "Username"
+msgstr "Notendanafn"
+
 #: templates/users.php:91
 msgid "Storage"
 msgstr "gagnapláss"
diff --git a/l10n/is/user_ldap.po b/l10n/is/user_ldap.po
index ada7146a75493649dc32ca963d867886732fab1e..54bbded790a9ebaa7beeb93f6fc10d4d78c90ee1 100644
--- a/l10n/is/user_ldap.po
+++ b/l10n/is/user_ldap.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:16+0000\n"
 "Last-Translator: Magnus Magnusson <maggiymir@gmail.com>\n"
 "Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/it/core.po b/l10n/it/core.po
index 7ca5c176e2c7f6ce5db584f4ec862d176b204a2e..4ca69d404ce065b33d755050319f9ebfe256ab9d 100644
--- a/l10n/it/core.po
+++ b/l10n/it/core.po
@@ -4,14 +4,15 @@
 # 
 # Translators:
 # idetao <marcxosm@gmail.com>, 2013
+# polxmod <paolo.velati@gmail.com>, 2013
 # Vincenzo Reale <vinx.reale@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:22+0000\n"
-"Last-Translator: idetao <marcxosm@gmail.com>\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,7 +23,7 @@ msgstr ""
 #: ajax/share.php:97
 #, php-format
 msgid "%s shared »%s« with you"
-msgstr "%s condiviso »%s« con te"
+msgstr "%s ha condiviso »%s« con te"
 
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
@@ -63,135 +64,135 @@ msgstr "Nessuna categoria selezionata per l'eliminazione."
 msgid "Error removing %s from favorites."
 msgstr "Errore durante la rimozione di %s dai preferiti."
 
-#: js/config.php:34
+#: js/config.php:32
 msgid "Sunday"
 msgstr "Domenica"
 
-#: js/config.php:35
+#: js/config.php:33
 msgid "Monday"
 msgstr "Lunedì"
 
-#: js/config.php:36
+#: js/config.php:34
 msgid "Tuesday"
 msgstr "Martedì"
 
-#: js/config.php:37
+#: js/config.php:35
 msgid "Wednesday"
 msgstr "Mercoledì"
 
-#: js/config.php:38
+#: js/config.php:36
 msgid "Thursday"
 msgstr "Giovedì"
 
-#: js/config.php:39
+#: js/config.php:37
 msgid "Friday"
 msgstr "Venerdì"
 
-#: js/config.php:40
+#: js/config.php:38
 msgid "Saturday"
 msgstr "Sabato"
 
-#: js/config.php:45
+#: js/config.php:43
 msgid "January"
 msgstr "Gennaio"
 
-#: js/config.php:46
+#: js/config.php:44
 msgid "February"
 msgstr "Febbraio"
 
-#: js/config.php:47
+#: js/config.php:45
 msgid "March"
 msgstr "Marzo"
 
-#: js/config.php:48
+#: js/config.php:46
 msgid "April"
 msgstr "Aprile"
 
-#: js/config.php:49
+#: js/config.php:47
 msgid "May"
 msgstr "Maggio"
 
-#: js/config.php:50
+#: js/config.php:48
 msgid "June"
 msgstr "Giugno"
 
-#: js/config.php:51
+#: js/config.php:49
 msgid "July"
 msgstr "Luglio"
 
-#: js/config.php:52
+#: js/config.php:50
 msgid "August"
 msgstr "Agosto"
 
-#: js/config.php:53
+#: js/config.php:51
 msgid "September"
 msgstr "Settembre"
 
-#: js/config.php:54
+#: js/config.php:52
 msgid "October"
 msgstr "Ottobre"
 
-#: js/config.php:55
+#: js/config.php:53
 msgid "November"
 msgstr "Novembre"
 
-#: js/config.php:56
+#: js/config.php:54
 msgid "December"
 msgstr "Dicembre"
 
-#: js/js.js:286
+#: js/js.js:293
 msgid "Settings"
 msgstr "Impostazioni"
 
-#: js/js.js:718
+#: js/js.js:725
 msgid "seconds ago"
 msgstr "secondi fa"
 
-#: js/js.js:719
+#: js/js.js:726
 msgid "1 minute ago"
 msgstr "Un minuto fa"
 
-#: js/js.js:720
+#: js/js.js:727
 msgid "{minutes} minutes ago"
 msgstr "{minutes} minuti fa"
 
-#: js/js.js:721
+#: js/js.js:728
 msgid "1 hour ago"
 msgstr "1 ora fa"
 
-#: js/js.js:722
+#: js/js.js:729
 msgid "{hours} hours ago"
 msgstr "{hours} ore fa"
 
-#: js/js.js:723
+#: js/js.js:730
 msgid "today"
 msgstr "oggi"
 
-#: js/js.js:724
+#: js/js.js:731
 msgid "yesterday"
 msgstr "ieri"
 
-#: js/js.js:725
+#: js/js.js:732
 msgid "{days} days ago"
 msgstr "{days} giorni fa"
 
-#: js/js.js:726
+#: js/js.js:733
 msgid "last month"
 msgstr "mese scorso"
 
-#: js/js.js:727
+#: js/js.js:734
 msgid "{months} months ago"
 msgstr "{months} mesi fa"
 
-#: js/js.js:728
+#: js/js.js:735
 msgid "months ago"
 msgstr "mesi fa"
 
-#: js/js.js:729
+#: js/js.js:736
 msgid "last year"
 msgstr "anno scorso"
 
-#: js/js.js:730
+#: js/js.js:737
 msgid "years ago"
 msgstr "anni fa"
 
@@ -227,8 +228,8 @@ msgstr "Il tipo di oggetto non è specificato."
 #: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
 #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:577
-#: js/share.js:589
+#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:620
+#: js/share.js:632
 msgid "Error"
 msgstr "Errore"
 
@@ -248,7 +249,7 @@ msgstr "Condivisi"
 msgid "Share"
 msgstr "Condividi"
 
-#: js/share.js:125 js/share.js:617
+#: js/share.js:125 js/share.js:660
 msgid "Error while sharing"
 msgstr "Errore durante la condivisione"
 
@@ -268,99 +269,103 @@ msgstr "Condiviso con te e con il gruppo {group} da {owner}"
 msgid "Shared with you by {owner}"
 msgstr "Condiviso con te da {owner}"
 
-#: js/share.js:159
+#: js/share.js:172
 msgid "Share with"
 msgstr "Condividi con"
 
-#: js/share.js:164
+#: js/share.js:177
 msgid "Share with link"
 msgstr "Condividi con collegamento"
 
-#: js/share.js:167
+#: js/share.js:180
 msgid "Password protect"
 msgstr "Proteggi con password"
 
-#: js/share.js:169 templates/installation.php:54 templates/login.php:26
+#: js/share.js:182 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "Password"
 
-#: js/share.js:173
+#: js/share.js:187
+msgid "Allow Public Upload"
+msgstr "Consenti caricamento pubblico"
+
+#: js/share.js:191
 msgid "Email link to person"
 msgstr "Invia collegamento via email"
 
-#: js/share.js:174
+#: js/share.js:192
 msgid "Send"
 msgstr "Invia"
 
-#: js/share.js:178
+#: js/share.js:197
 msgid "Set expiration date"
 msgstr "Imposta data di scadenza"
 
-#: js/share.js:179
+#: js/share.js:198
 msgid "Expiration date"
 msgstr "Data di scadenza"
 
-#: js/share.js:211
+#: js/share.js:230
 msgid "Share via email:"
 msgstr "Condividi tramite email:"
 
-#: js/share.js:213
+#: js/share.js:232
 msgid "No people found"
 msgstr "Non sono state trovate altre persone"
 
-#: js/share.js:251
+#: js/share.js:270
 msgid "Resharing is not allowed"
 msgstr "La ri-condivisione non è consentita"
 
-#: js/share.js:287
+#: js/share.js:306
 msgid "Shared in {item} with {user}"
 msgstr "Condiviso in {item} con {user}"
 
-#: js/share.js:308
+#: js/share.js:327
 msgid "Unshare"
 msgstr "Rimuovi condivisione"
 
-#: js/share.js:320
+#: js/share.js:339
 msgid "can edit"
 msgstr "può modificare"
 
-#: js/share.js:322
+#: js/share.js:341
 msgid "access control"
 msgstr "controllo d'accesso"
 
-#: js/share.js:325
+#: js/share.js:344
 msgid "create"
 msgstr "creare"
 
-#: js/share.js:328
+#: js/share.js:347
 msgid "update"
 msgstr "aggiornare"
 
-#: js/share.js:331
+#: js/share.js:350
 msgid "delete"
 msgstr "elimina"
 
-#: js/share.js:334
+#: js/share.js:353
 msgid "share"
 msgstr "condividi"
 
-#: js/share.js:368 js/share.js:564
+#: js/share.js:387 js/share.js:607
 msgid "Password protected"
 msgstr "Protetta da password"
 
-#: js/share.js:577
+#: js/share.js:620
 msgid "Error unsetting expiration date"
 msgstr "Errore durante la rimozione della data di scadenza"
 
-#: js/share.js:589
+#: js/share.js:632
 msgid "Error setting expiration date"
 msgstr "Errore durante l'impostazione della data di scadenza"
 
-#: js/share.js:604
+#: js/share.js:647
 msgid "Sending ..."
 msgstr "Invio in corso..."
 
-#: js/share.js:615
+#: js/share.js:658
 msgid "Email sent"
 msgstr "Messaggio inviato"
 
@@ -375,7 +380,7 @@ msgstr "L'aggiornamento non è riuscito. Segnala il problema alla <a href=\"http
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "L'aggiornamento è stato effettuato correttamente. Stai per essere reindirizzato a ownCloud."
 
-#: lostpassword/controller.php:58
+#: lostpassword/controller.php:60
 msgid "ownCloud password reset"
 msgstr "Ripristino password di ownCloud"
 
@@ -405,17 +410,17 @@ msgstr "Nome utente"
 
 #: lostpassword/templates/lostpassword.php:22
 msgid ""
-"Your files seems to be encrypted. If you didn't have enabled the recovery "
-"key there will be no way to get your data back once the password was "
-"resetted. If you are not sure what to do, please contact your administrator "
-"first before continue. Do you really want to continue?"
-msgstr "I file non sembrano essere cifrati. Se non hai precedentemente abilitato la chiave di recupero, non sarà più possibile ritrovare i tuoi dati una volta che la password sarà resettata. Se non sei sicuro, per favore contatta l'amministratore prima di proseguire. Vuoi veramente continuare?"
+"Your files are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
+msgstr "I file sono cifrati. Se non hai precedentemente abilitato la chiave di recupero, non sarà più possibile ritrovare i tuoi dati una volta che la password sarà ripristinata. Se non sei sicuro, per favore contatta l'amministratore prima di proseguire. Vuoi davvero continuare?"
 
 #: lostpassword/templates/lostpassword.php:24
 msgid "Yes, I really want to reset my password now"
-msgstr "Sì, voglio davvero resettare la mia password adesso"
+msgstr "Sì, voglio davvero ripristinare la mia password adesso"
 
-#: lostpassword/templates/lostpassword.php:29
+#: lostpassword/templates/lostpassword.php:27
 msgid "Request reset"
 msgstr "Richiesta di ripristino"
 
@@ -463,7 +468,7 @@ msgstr "Accesso negato"
 msgid "Cloud not found"
 msgstr "Nuvola non trovata"
 
-#: templates/altmail.php:2
+#: templates/altmail.php:4
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -472,11 +477,7 @@ msgid ""
 "View it: %s\n"
 "\n"
 "Cheers!"
-msgstr "Ehilà,\n\nvolevo solamente farti sapere che %s ha condiviso %s con te.\nGuarda: %s\n\nGrazie!"
-
-#: templates/altmail.php:7 templates/mail.php:24
-msgid "web services under your control"
-msgstr "servizi web nelle tue mani"
+msgstr "Ehilà,\n\nvolevo solamente farti sapere che %s ha condiviso %s con te.\nGuarda: %s\n\nSaluti!"
 
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
@@ -570,12 +571,12 @@ msgstr "Host del database"
 msgid "Finish setup"
 msgstr "Termina la configurazione"
 
-#: templates/layout.user.php:40
+#: templates/layout.user.php:43
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr "%s è disponibile. Ottieni ulteriori informazioni sull'aggiornamento."
 
-#: templates/layout.user.php:67
+#: templates/layout.user.php:68
 msgid "Log out"
 msgstr "Esci"
 
@@ -609,12 +610,12 @@ msgstr "Accedi"
 msgid "Alternative Logins"
 msgstr "Accessi alternativi"
 
-#: templates/mail.php:15
+#: templates/mail.php:16
 #, php-format
 msgid ""
 "Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
 "href=\"%s\">View it!</a><br><br>Cheers!"
-msgstr "Ehilà,<br><br>volevo solamente farti sapere che %s ha condiviso »%s« con te.<br><a href=\"%s\">Guarda!</a><br><br>Grazie!"
+msgstr "Ehilà,<br><br>volevo solamente farti sapere che %s ha condiviso »%s« con te.<br><a href=\"%s\">Guarda!</a><br><br>Saluti!"
 
 #: templates/part.pagenavi.php:3
 msgid "prev"
diff --git a/l10n/it/files.po b/l10n/it/files.po
index 9b2572674e7e66b77e4ac338769dba56cfb36d5f..3e463d02aabc4dc8c07337edf221894ef6121926 100644
--- a/l10n/it/files.po
+++ b/l10n/it/files.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# polxmod <paolo.velati@gmail.com>, 2013
 # Vincenzo Reale <vinx.reale@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:01+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
@@ -28,46 +29,54 @@ msgstr "Impossibile spostare %s - un file con questo nome esiste già"
 msgid "Could not move %s"
 msgstr "Impossibile spostare %s"
 
-#: ajax/upload.php:19
+#: ajax/upload.php:16 ajax/upload.php:45
+msgid "Unable to set upload directory."
+msgstr "Impossibile impostare una cartella di caricamento."
+
+#: ajax/upload.php:22
+msgid "Invalid Token"
+msgstr "Token non valido"
+
+#: ajax/upload.php:59
 msgid "No file was uploaded. Unknown error"
 msgstr "Nessun file è stato inviato. Errore sconosciuto"
 
-#: ajax/upload.php:26
+#: ajax/upload.php:66
 msgid "There is no error, the file uploaded with success"
 msgstr "Non ci sono errori, il file è stato caricato correttamente"
 
-#: ajax/upload.php:27
+#: ajax/upload.php:67
 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:29
+#: ajax/upload.php:69
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Il file inviato supera la direttiva MAX_FILE_SIZE specificata nel modulo HTML"
 
-#: ajax/upload.php:30
+#: ajax/upload.php:70
 msgid "The uploaded file was only partially uploaded"
 msgstr "Il file è stato caricato solo parzialmente"
 
-#: ajax/upload.php:31
+#: ajax/upload.php:71
 msgid "No file was uploaded"
 msgstr "Nessun file è stato caricato"
 
-#: ajax/upload.php:32
+#: ajax/upload.php:72
 msgid "Missing a temporary folder"
 msgstr "Manca una cartella temporanea"
 
-#: ajax/upload.php:33
+#: ajax/upload.php:73
 msgid "Failed to write to disk"
 msgstr "Scrittura su disco non riuscita"
 
-#: ajax/upload.php:51
+#: ajax/upload.php:91
 msgid "Not enough storage available"
 msgstr "Spazio di archiviazione insufficiente"
 
-#: ajax/upload.php:83
+#: ajax/upload.php:123
 msgid "Invalid directory."
 msgstr "Cartella non valida."
 
@@ -75,6 +84,36 @@ msgstr "Cartella non valida."
 msgid "Files"
 msgstr "File"
 
+#: js/file-upload.js:11
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr "Impossibile caricare il file poiché è una cartella o ha una dimensione di 0 byte"
+
+#: js/file-upload.js:24
+msgid "Not enough space available"
+msgstr "Spazio disponibile insufficiente"
+
+#: js/file-upload.js:64
+msgid "Upload cancelled."
+msgstr "Invio annullato"
+
+#: js/file-upload.js:167 js/files.js:266
+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/file-upload.js:233 js/files.js:339
+msgid "URL cannot be empty."
+msgstr "L'URL non può essere vuoto."
+
+#: js/file-upload.js:238 lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr "Nome della cartella non valido. L'uso di 'Shared' è riservato a ownCloud"
+
+#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
+#: js/files.js:693 js/files.js:731
+msgid "Error"
+msgstr "Errore"
+
 #: js/fileactions.js:116
 msgid "Share"
 msgstr "Condividi"
@@ -91,43 +130,43 @@ msgstr "Elimina"
 msgid "Rename"
 msgstr "Rinomina"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:464
 msgid "Pending"
 msgstr "In corso"
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "{new_name} already exists"
 msgstr "{new_name} esiste già"
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "replace"
 msgstr "sostituisci"
 
-#: js/filelist.js:259
+#: js/filelist.js:302
 msgid "suggest name"
 msgstr "suggerisci nome"
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "cancel"
 msgstr "annulla"
 
-#: js/filelist.js:306
+#: js/filelist.js:349
 msgid "replaced {new_name} with {old_name}"
 msgstr "sostituito {new_name} con {old_name}"
 
-#: js/filelist.js:306
+#: js/filelist.js:349
 msgid "undo"
 msgstr "annulla"
 
-#: js/filelist.js:331
+#: js/filelist.js:374
 msgid "perform delete operation"
 msgstr "esegui l'operazione di eliminazione"
 
-#: js/filelist.js:413
+#: js/filelist.js:456
 msgid "1 file uploading"
 msgstr "1 file in fase di caricamento"
 
-#: js/filelist.js:416 js/filelist.js:470
+#: js/filelist.js:459 js/filelist.js:517
 msgid "files uploading"
 msgstr "caricamento file"
 
@@ -159,70 +198,42 @@ msgid ""
 "big."
 msgstr "Il tuo scaricamento è in fase di preparazione. Ciò potrebbe richiedere del tempo se i file sono grandi."
 
-#: js/files.js:264
-msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "Impossibile caricare il file poiché è una cartella o ha una dimensione di 0 byte"
-
-#: js/files.js:277
-msgid "Not enough space available"
-msgstr "Spazio disponibile insufficiente"
-
-#: js/files.js:317
-msgid "Upload cancelled."
-msgstr "Invio annullato"
-
-#: js/files.js:413
-msgid ""
-"File upload is in progress. Leaving the page now will cancel the upload."
-msgstr "Caricamento del file in corso. La chiusura della pagina annullerà il caricamento."
-
-#: js/files.js:486
-msgid "URL cannot be empty."
-msgstr "L'URL non può essere vuoto."
-
-#: js/files.js:491
+#: js/files.js:344
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Nome della cartella non valido. L'uso di 'Shared' è riservato da ownCloud"
 
-#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
-msgid "Error"
-msgstr "Errore"
-
-#: js/files.js:877 templates/index.php:69
+#: js/files.js:744 templates/index.php:69
 msgid "Name"
 msgstr "Nome"
 
-#: js/files.js:878 templates/index.php:80
+#: js/files.js:745 templates/index.php:80
 msgid "Size"
 msgstr "Dimensione"
 
-#: js/files.js:879 templates/index.php:82
+#: js/files.js:746 templates/index.php:82
 msgid "Modified"
 msgstr "Modificato"
 
-#: js/files.js:898
+#: js/files.js:765
 msgid "1 folder"
 msgstr "1 cartella"
 
-#: js/files.js:900
+#: js/files.js:767
 msgid "{count} folders"
 msgstr "{count} cartelle"
 
-#: js/files.js:908
+#: js/files.js:775
 msgid "1 file"
 msgstr "1 file"
 
-#: js/files.js:910
+#: js/files.js:777
 msgid "{count} files"
 msgstr "{count} file"
 
-#: lib/app.php:53
-msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
-msgstr "Nome della cartella non valido. L'uso di 'Shared' è riservato a ownCloud"
-
 #: lib/app.php:73
-msgid "Unable to rename file"
-msgstr "Impossibile rinominare il file"
+#, php-format
+msgid "%s could not be renamed"
+msgstr "%s non può essere rinominato"
 
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
@@ -318,6 +329,22 @@ msgstr "Scansione dei file in corso, attendi"
 msgid "Current scanning"
 msgstr "Scansione corrente"
 
+#: templates/part.list.php:76
+msgid "directory"
+msgstr "cartella"
+
+#: templates/part.list.php:78
+msgid "directories"
+msgstr "cartelle"
+
+#: templates/part.list.php:87
+msgid "file"
+msgstr "file"
+
+#: templates/part.list.php:89
+msgid "files"
+msgstr "file"
+
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
 msgstr "Aggiornamento della cache del filesystem in corso..."
diff --git a/l10n/it/files_encryption.po b/l10n/it/files_encryption.po
index e92fab7b94b905b5c5e201894b2dee3a9fb9cea3..9e43d8c52dd0ffb86400685dd0639ec96f080969 100644
--- a/l10n/it/files_encryption.po
+++ b/l10n/it/files_encryption.po
@@ -4,14 +4,15 @@
 # 
 # Translators:
 # idetao <marcxosm@gmail.com>, 2013
+# polxmod <paolo.velati@gmail.com>, 2013
 # Vincenzo Reale <vinx.reale@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-16 01:58+0200\n"
-"PO-Revision-Date: 2013-06-15 11:00+0000\n"
-"Last-Translator: idetao <marcxosm@gmail.com>\n"
+"POT-Creation-Date: 2013-07-09 02:03+0200\n"
+"PO-Revision-Date: 2013-07-08 13:30+0000\n"
+"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -57,10 +58,22 @@ msgstr "Impossibile aggiornare la password della chiave privata. Forse la vecchi
 
 #: files/error.php:7
 msgid ""
-"Your private key is not valid! Maybe your password was changed from outside."
-" You can update your private key password in your personal settings to "
-"regain access to your files"
-msgstr "La chiave privata non è valida! Forse la password è stata cambiata dall'esterno. Puoi aggiornare la password della chiave privata nelle impostazioni personali per riottenere l'accesso ai file."
+"Your private key is not valid! Likely your password was changed outside the "
+"ownCloud system (e.g. your corporate directory). You can update your private"
+" key password in your personal settings to recover access to your encrypted "
+"files."
+msgstr "La chiave privata non è valida! Forse la password è stata cambiata esternamente al sistema di ownCloud (ad es. la directory aziendale). Puoi aggiornare la password della chiave privata nelle impostazioni personali per ottenere nuovamente l'accesso ai file."
+
+#: hooks/hooks.php:44
+msgid "Missing requirements."
+msgstr "Requisiti mancanti."
+
+#: hooks/hooks.php:45
+msgid ""
+"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL "
+"PHP extension is enabled and configured properly. For now, the encryption "
+"app has been disabled."
+msgstr "Assicurati che sia installato PHP 5.3.3 o versioni successive e che l'estensione OpenSSL di PHP sia abilitata e configurata correttamente. Per ora, l'applicazione di cifratura è disabilitata."
 
 #: js/settings-admin.js:11
 msgid "Saving..."
@@ -74,11 +87,11 @@ msgstr "La tua chiave privata non è valida! Forse è stata modifica dall'estern
 
 #: templates/invalid_private_key.php:7
 msgid "You can unlock your private key in your "
-msgstr "Puoi sbloccare la chiave privata nel tuo"
+msgstr "Puoi sbloccare la chiave privata nelle tue"
 
 #: templates/invalid_private_key.php:7
 msgid "personal settings"
-msgstr "Impostazioni personali"
+msgstr "impostazioni personali"
 
 #: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
@@ -86,12 +99,12 @@ msgstr "Cifratura"
 
 #: templates/settings-admin.php:10
 msgid ""
-"Enable encryption passwords recovery key (allow sharing to recovery key):"
-msgstr "Abilita la chiave di ripristino delle password di cifratura (consente di condividere la chiave di ripristino):"
+"Enable recovery key (allow to recover users files in case of password loss):"
+msgstr "Abilita la chiave di recupero (permette di recuperare i file utenti in caso di perdita della password):"
 
 #: templates/settings-admin.php:14
-msgid "Recovery account password"
-msgstr "Password di ripristino dell'account"
+msgid "Recovery key password"
+msgstr "Password della chiave di recupero"
 
 #: templates/settings-admin.php:21 templates/settings-personal.php:54
 msgid "Enabled"
@@ -102,16 +115,16 @@ msgid "Disabled"
 msgstr "Disabilitata"
 
 #: templates/settings-admin.php:34
-msgid "Change encryption passwords recovery key:"
-msgstr "Cambia la chiave di ripristino delle password di cifratura:"
+msgid "Change recovery key password:"
+msgstr "Cambia la password della chiave di recupero:"
 
 #: templates/settings-admin.php:41
-msgid "Old Recovery account password"
-msgstr "Vecchia password di ripristino dell'account"
+msgid "Old Recovery key password"
+msgstr "Vecchia password della chiave di recupero"
 
 #: templates/settings-admin.php:48
-msgid "New Recovery account password"
-msgstr "Nuova password di ripristino dell'account"
+msgid "New Recovery key password"
+msgstr "Nuova password della chiave di recupero"
 
 #: templates/settings-admin.php:53
 msgid "Change Password"
@@ -119,39 +132,39 @@ msgstr "Modifica password"
 
 #: templates/settings-personal.php:11
 msgid "Your private key password no longer match your log-in password:"
-msgstr "La password della chiave privata non corrisponde più alla password di login:"
+msgstr "La password della chiave privata non corrisponde più alla password di accesso:"
 
 #: templates/settings-personal.php:14
 msgid "Set your old private key password to your current log-in password."
-msgstr "Imposta la vecchia password della chiave privata sull'attuale password di login"
+msgstr "Imposta la vecchia password della chiave privata sull'attuale password di accesso."
 
 #: templates/settings-personal.php:16
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
-msgstr "Se non ricordi la vecchia password puoi chiedere al tuo amministratore di recuperare i file"
+msgstr "Se non ricordi la vecchia password puoi chiedere al tuo amministratore di recuperare i file."
 
 #: templates/settings-personal.php:24
 msgid "Old log-in password"
-msgstr "Password di login vecchia"
+msgstr "Vecchia password di accesso"
 
 #: templates/settings-personal.php:30
 msgid "Current log-in password"
-msgstr "Password di login corrente"
+msgstr "Password di accesso attuale"
 
 #: templates/settings-personal.php:35
 msgid "Update Private Key Password"
-msgstr "Aggiorna la Password della Chiave Privata"
+msgstr "Aggiorna la password della chiave privata"
 
 #: templates/settings-personal.php:45
 msgid "Enable password recovery:"
-msgstr "Abilita il recupero della password:"
+msgstr "Abilita il ripristino della password:"
 
 #: templates/settings-personal.php:47
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
-msgstr "Abilitando questa opzione potrai riaccedere ai file cifrati nel caso in cui la password venga perduta"
+msgstr "L'abilitazione di questa opzione ti consentirà di accedere nuovamente ai file cifrati in caso di perdita della password"
 
 #: templates/settings-personal.php:63
 msgid "File recovery settings updated"
diff --git a/l10n/it/files_external.po b/l10n/it/files_external.po
index 80be59450984a5330bd04f8d5ecda2fa93d290d5..553d8ea794d4ed6cb4620c8388ea6e493fb3c9a6 100644
--- a/l10n/it/files_external.po
+++ b/l10n/it/files_external.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/it/files_sharing.po b/l10n/it/files_sharing.po
index 8ba16e3fc6fdebddcb5a8f519fbb20ca72a490fa..a7e14d1dc2fd577c19c56c5a29160e17c4b77110 100644
--- a/l10n/it/files_sharing.po
+++ b/l10n/it/files_sharing.po
@@ -3,13 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# polxmod <paolo.velati@gmail.com>, 2013
+# Vincenzo Reale <vinx.reale@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
+"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,27 +20,39 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: templates/authenticate.php:4
+msgid "The password is wrong. Try again."
+msgstr "La password è errata. Prova ancora."
+
+#: templates/authenticate.php:7
 msgid "Password"
 msgstr "Password"
 
-#: templates/authenticate.php:6
+#: templates/authenticate.php:9
 msgid "Submit"
 msgstr "Invia"
 
-#: templates/public.php:10
+#: templates/public.php:17
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s ha condiviso la cartella %s con te"
 
-#: templates/public.php:13
+#: templates/public.php:20
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s ha condiviso il file %s con te"
 
-#: templates/public.php:19 templates/public.php:43
+#: templates/public.php:28 templates/public.php:90
 msgid "Download"
 msgstr "Scarica"
 
-#: templates/public.php:40
+#: templates/public.php:45 templates/public.php:48
+msgid "Upload"
+msgstr "Carica"
+
+#: templates/public.php:58
+msgid "Cancel upload"
+msgstr "Annulla il caricamento"
+
+#: templates/public.php:87
 msgid "No preview available for"
 msgstr "Nessuna anteprima disponibile per"
diff --git a/l10n/it/files_trashbin.po b/l10n/it/files_trashbin.po
index 313cc6a7e5de70425d3361528580bf5243472fd2..a5b75d7cbcb8f59d91cb4226bd7466ae03a9d431 100644
--- a/l10n/it/files_trashbin.po
+++ b/l10n/it/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:16+0000\n"
 "Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/it/lib.po b/l10n/it/lib.po
index 1f8936fb682071ce20095f51d319e9ea50abe2c6..af9742b35a08b157de8e4701864a05f6fe943f19 100644
--- a/l10n/it/lib.po
+++ b/l10n/it/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-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
-"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,43 +18,47 @@ msgstr ""
 "Language: it\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:359
+#: app.php:360
 msgid "Help"
 msgstr "Aiuto"
 
-#: app.php:372
+#: app.php:373
 msgid "Personal"
 msgstr "Personale"
 
-#: app.php:383
+#: app.php:384
 msgid "Settings"
 msgstr "Impostazioni"
 
-#: app.php:395
+#: app.php:396
 msgid "Users"
 msgstr "Utenti"
 
-#: app.php:408
+#: app.php:409
 msgid "Apps"
 msgstr "Applicazioni"
 
-#: app.php:416
+#: app.php:417
 msgid "Admin"
 msgstr "Admin"
 
-#: files.php:210
+#: defaults.php:33
+msgid "web services under your control"
+msgstr "servizi web nelle tue mani"
+
+#: files.php:226
 msgid "ZIP download is turned off."
 msgstr "Lo scaricamento in formato ZIP è stato disabilitato."
 
-#: files.php:211
+#: files.php:227
 msgid "Files need to be downloaded one by one."
 msgstr "I file devono essere scaricati uno alla volta."
 
-#: files.php:212 files.php:245
+#: files.php:228 files.php:261
 msgid "Back to Files"
 msgstr "Torna ai file"
 
-#: files.php:242
+#: files.php:258
 msgid "Selected files too large to generate zip file."
 msgstr "I  file selezionati sono troppo grandi per generare un file zip."
 
@@ -86,104 +90,102 @@ msgstr "Testo"
 msgid "Images"
 msgstr "Immagini"
 
-#: setup.php:34
-msgid "Set an admin username."
-msgstr "Imposta un nome utente di amministrazione."
-
-#: setup.php:37
-msgid "Set an admin password."
-msgstr "Imposta una password di amministrazione."
-
-#: setup.php:55
+#: setup/abstractdatabase.php:22
 #, php-format
 msgid "%s enter the database username."
 msgstr "%s digita il nome utente del database."
 
-#: setup.php:58
+#: setup/abstractdatabase.php:25
 #, php-format
 msgid "%s enter the database name."
 msgstr "%s digita il nome del database."
 
-#: setup.php:61
+#: setup/abstractdatabase.php:28
 #, php-format
 msgid "%s you may not use dots in the database name"
 msgstr "%s non dovresti utilizzare punti nel nome del database"
 
-#: setup.php:64
+#: setup/mssql.php:20
 #, php-format
-msgid "%s set the database host."
-msgstr "%s imposta l'host del database."
-
-#: setup.php:126 setup.php:332 setup.php:377
-msgid "PostgreSQL username and/or password not valid"
-msgstr "Nome utente e/o password di PostgreSQL non validi"
+msgid "MS SQL username and/or password not valid: %s"
+msgstr "Nome utente e/o password MS SQL non validi: %s"
 
-#: setup.php:127 setup.php:235
+#: setup/mssql.php:21 setup/mysql.php:13 setup/oci.php:114
+#: setup/postgresql.php:24 setup/postgresql.php:70
 msgid "You need to enter either an existing account or the administrator."
 msgstr "È necessario inserire un account esistente o l'amministratore."
 
-#: setup.php:152
-msgid "Oracle connection could not be established"
-msgstr "La connessione a Oracle non può essere stabilita"
-
-#: setup.php:234
+#: setup/mysql.php:12
 msgid "MySQL username and/or password not valid"
 msgstr "Nome utente e/o password di MySQL non validi"
 
-#: setup.php:288 setup.php:398 setup.php:407 setup.php:425 setup.php:435
-#: setup.php:444 setup.php:477 setup.php:543 setup.php:569 setup.php:576
-#: setup.php:587 setup.php:594 setup.php:603 setup.php:611 setup.php:620
-#: setup.php:626
+#: setup/mysql.php:67 setup/oci.php:54 setup/oci.php:121 setup/oci.php:147
+#: setup/oci.php:154 setup/oci.php:165 setup/oci.php:172 setup/oci.php:181
+#: setup/oci.php:189 setup/oci.php:198 setup/oci.php:204
+#: setup/postgresql.php:89 setup/postgresql.php:98 setup/postgresql.php:115
+#: setup/postgresql.php:125 setup/postgresql.php:134
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr "Errore DB: \"%s\""
 
-#: setup.php:289 setup.php:399 setup.php:408 setup.php:426 setup.php:436
-#: setup.php:445 setup.php:478 setup.php:544 setup.php:570 setup.php:577
-#: setup.php:588 setup.php:604 setup.php:612 setup.php:621
+#: setup/mysql.php:68 setup/oci.php:55 setup/oci.php:122 setup/oci.php:148
+#: setup/oci.php:155 setup/oci.php:166 setup/oci.php:182 setup/oci.php:190
+#: setup/oci.php:199 setup/postgresql.php:90 setup/postgresql.php:99
+#: setup/postgresql.php:116 setup/postgresql.php:126 setup/postgresql.php:135
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr "Il comando non consentito era: \"%s\""
 
-#: setup.php:305
+#: setup/mysql.php:85
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr "L'utente MySQL '%s'@'localhost' esiste già."
 
-#: setup.php:306
+#: setup/mysql.php:86
 msgid "Drop this user from MySQL"
 msgstr "Elimina questo utente da MySQL"
 
-#: setup.php:311
+#: setup/mysql.php:91
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr "L'utente MySQL '%s'@'%%' esiste già"
 
-#: setup.php:312
+#: setup/mysql.php:92
 msgid "Drop this user from MySQL."
 msgstr "Elimina questo utente da MySQL."
 
-#: setup.php:469 setup.php:536
+#: setup/oci.php:34
+msgid "Oracle connection could not be established"
+msgstr "La connessione a Oracle non può essere stabilita"
+
+#: setup/oci.php:41 setup/oci.php:113
 msgid "Oracle username and/or password not valid"
 msgstr "Nome utente e/o password di Oracle non validi"
 
-#: setup.php:595 setup.php:627
+#: setup/oci.php:173 setup/oci.php:205
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr "Il comando non consentito era: \"%s\", nome: %s, password: %s"
 
-#: setup.php:647
-#, php-format
-msgid "MS SQL username and/or password not valid: %s"
-msgstr "Nome utente e/o password MS SQL non validi: %s"
+#: setup/postgresql.php:23 setup/postgresql.php:69
+msgid "PostgreSQL username and/or password not valid"
+msgstr "Nome utente e/o password di PostgreSQL non validi"
+
+#: setup.php:42
+msgid "Set an admin username."
+msgstr "Imposta un nome utente di amministrazione."
+
+#: setup.php:45
+msgid "Set an admin password."
+msgstr "Imposta una password di amministrazione."
 
-#: setup.php:870
+#: setup.php:198
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Il tuo server web non è configurato correttamente per consentire la sincronizzazione dei file poiché l'interfaccia WebDAV sembra essere danneggiata."
 
-#: setup.php:871
+#: setup.php:199
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Leggi attentamente le <a href='%s'>guide d'installazione</a>."
diff --git a/l10n/it/settings.po b/l10n/it/settings.po
index f517775f9a95a10fb20b0cc496aa2a64c853b57b..12a05faeba8c3a9000ac0c2af68a7046126374ef 100644
--- a/l10n/it/settings.po
+++ b/l10n/it/settings.po
@@ -3,14 +3,16 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Francesco Apruzzese <cescoap@gmail.com>, 2013
+# idetao <marcxosm@gmail.com>, 2013
 # Vincenzo Reale <vinx.reale@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
-"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
+"Last-Translator: idetao <marcxosm@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"
@@ -89,35 +91,35 @@ msgstr "Impossibile rimuovere l'utente dal gruppo %s"
 msgid "Couldn't update app."
 msgstr "Impossibile aggiornate l'applicazione."
 
-#: js/apps.js:30
+#: js/apps.js:35
 msgid "Update to {appversion}"
 msgstr "Aggiorna a {appversion}"
 
-#: js/apps.js:36 js/apps.js:76
+#: js/apps.js:41 js/apps.js:81
 msgid "Disable"
 msgstr "Disabilita"
 
-#: js/apps.js:36 js/apps.js:64 js/apps.js:83
+#: js/apps.js:41 js/apps.js:69 js/apps.js:88
 msgid "Enable"
 msgstr "Abilita"
 
-#: js/apps.js:55
+#: js/apps.js:60
 msgid "Please wait...."
 msgstr "Attendere..."
 
-#: js/apps.js:59 js/apps.js:71 js/apps.js:80 js/apps.js:93
+#: js/apps.js:64 js/apps.js:76 js/apps.js:85 js/apps.js:98
 msgid "Error"
 msgstr "Errore"
 
-#: js/apps.js:90
+#: js/apps.js:95
 msgid "Updating...."
 msgstr "Aggiornamento in corso..."
 
-#: js/apps.js:93
+#: js/apps.js:98
 msgid "Error while updating app"
 msgstr "Errore durante l'aggiornamento"
 
-#: js/apps.js:96
+#: js/apps.js:101
 msgid "Updated"
 msgstr "Aggiornato"
 
@@ -166,15 +168,15 @@ msgstr "Errore durante la creazione dell'utente"
 msgid "A valid password must be provided"
 msgstr "Deve essere fornita una password valida"
 
-#: personal.php:35 personal.php:36
+#: personal.php:37 personal.php:38
 msgid "__language_name__"
 msgstr "Italiano"
 
-#: templates/admin.php:15
+#: templates/admin.php:17
 msgid "Security Warning"
 msgstr "Avviso di sicurezza"
 
-#: templates/admin.php:18
+#: templates/admin.php:20
 msgid ""
 "Your data directory and your files are probably accessible from the "
 "internet. The .htaccess file that ownCloud provides is not working. We "
@@ -183,36 +185,36 @@ msgid ""
 " webserver document root."
 msgstr "La cartella dei dati e i tuoi file sono probabilmente accessibili da Internet. Il file .htaccess fornito da ownCloud non funziona. Ti suggeriamo vivamente di configurare il server web in modo che la cartella dei dati non sia più accessibile o sposta tale cartella fuori dalla radice del sito."
 
-#: templates/admin.php:29
+#: templates/admin.php:31
 msgid "Setup Warning"
 msgstr "Avviso di configurazione"
 
-#: templates/admin.php:32
+#: templates/admin.php:34
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Il tuo server web non è configurato correttamente per consentire la sincronizzazione dei file poiché l'interfaccia WebDAV sembra essere danneggiata."
 
-#: templates/admin.php:33
+#: templates/admin.php:35
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Leggi attentamente le <a href='%s'>guide d'installazione</a>."
 
-#: templates/admin.php:44
+#: templates/admin.php:46
 msgid "Module 'fileinfo' missing"
 msgstr "Modulo 'fileinfo' mancante"
 
-#: templates/admin.php:47
+#: templates/admin.php:49
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr "Il modulo PHP 'fileinfo' non è presente. Consigliamo vivamente di abilitare questo modulo per ottenere risultati migliori con il rilevamento dei tipi MIME."
 
-#: templates/admin.php:58
+#: templates/admin.php:60
 msgid "Locale not working"
 msgstr "Locale non funzionante"
 
-#: templates/admin.php:63
+#: templates/admin.php:65
 #, php-format
 msgid ""
 "This ownCloud server can't set system locale to %s. This means that there "
@@ -220,11 +222,11 @@ msgid ""
 " to install the required packages on your system to support %s."
 msgstr "Questo server ownCloud non può impostare la localizzazione a %s. Ciò significa che potrebbero esserci problemi con alcuni caratteri nei nomi dei file. Consigliamo vivamente di installare i pacchetti richiesti sul sistema per supportare %s."
 
-#: templates/admin.php:75
+#: templates/admin.php:77
 msgid "Internet connection not working"
 msgstr "Concessione Internet non funzionante"
 
-#: templates/admin.php:78
+#: templates/admin.php:80
 msgid ""
 "This ownCloud server has no working internet connection. This means that "
 "some of the features like mounting of external storage, notifications about "
@@ -234,102 +236,102 @@ msgid ""
 " of ownCloud."
 msgstr "Questo server ownCloud non ha una connessione a Internet funzionante. Ciò significa che alcune delle funzionalità come il montaggio di archivi esterni, le notifiche degli aggiornamenti o l'installazione di applicazioni di terze parti non funzioneranno. Anche l'accesso remoto ai file e l'invio di email di notifica potrebbero non funzionare. Ti suggeriamo di abilitare la connessione a Internet del server se desideri disporre di tutte le funzionalità di ownCloud."
 
-#: templates/admin.php:92
+#: templates/admin.php:94
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:101
+#: templates/admin.php:103
 msgid "Execute one task with each page loaded"
 msgstr "Esegui un'operazione con ogni pagina caricata"
 
-#: templates/admin.php:111
+#: templates/admin.php:113
 msgid ""
 "cron.php is registered at a webcron service. Call the cron.php page in the "
 "owncloud root once a minute over http."
 msgstr "cron.php è registrato su un sevizio webcron. Invoca la pagina cron.php nella radice di ownCloud ogni minuto, tramite http."
 
-#: templates/admin.php:121
+#: templates/admin.php:123
 msgid ""
 "Use systems cron service. Call the cron.php file in the owncloud folder via "
 "a system cronjob once a minute."
 msgstr "Utilizza il servizio cron di sistema. Invoca il file cron.php nella cartella di ownCloud tramite un job ogni minuto."
 
-#: templates/admin.php:128
+#: templates/admin.php:130
 msgid "Sharing"
 msgstr "Condivisione"
 
-#: templates/admin.php:134
+#: templates/admin.php:136
 msgid "Enable Share API"
 msgstr "Abilita API di condivisione"
 
-#: templates/admin.php:135
+#: templates/admin.php:137
 msgid "Allow apps to use the Share API"
 msgstr "Consenti alle applicazioni di utilizzare le API di condivisione"
 
-#: templates/admin.php:142
+#: templates/admin.php:144
 msgid "Allow links"
 msgstr "Consenti collegamenti"
 
-#: templates/admin.php:143
+#: templates/admin.php:145
 msgid "Allow users to share items to the public with links"
 msgstr "Consenti agli utenti di condividere pubblicamente elementi tramite collegamenti"
 
-#: templates/admin.php:150
+#: templates/admin.php:152
 msgid "Allow resharing"
 msgstr "Consenti la ri-condivisione"
 
-#: templates/admin.php:151
+#: templates/admin.php:153
 msgid "Allow users to share items shared with them again"
 msgstr "Consenti agli utenti di condividere a loro volta elementi condivisi da altri"
 
-#: templates/admin.php:158
+#: templates/admin.php:160
 msgid "Allow users to share with anyone"
 msgstr "Consenti agli utenti di condividere con chiunque"
 
-#: templates/admin.php:161
+#: templates/admin.php:163
 msgid "Allow users to only share with users in their groups"
 msgstr "Consenti agli utenti di condividere solo con utenti dei loro gruppi"
 
-#: templates/admin.php:168
+#: templates/admin.php:170
 msgid "Security"
 msgstr "Protezione"
 
-#: templates/admin.php:181
+#: templates/admin.php:183
 msgid "Enforce HTTPS"
 msgstr "Forza HTTPS"
 
-#: templates/admin.php:182
+#: templates/admin.php:184
 msgid ""
 "Enforces the clients to connect to ownCloud via an encrypted connection."
 msgstr "Obbliga i client a connettersi a ownCloud tramite una confessione cifrata."
 
-#: templates/admin.php:185
+#: templates/admin.php:187
 msgid ""
 "Please connect to this ownCloud instance via HTTPS to enable or disable the "
 "SSL enforcement."
 msgstr "Connettiti a questa istanza di ownCloud tramite HTTPS per abilitare o disabilitare la protezione SSL."
 
-#: templates/admin.php:195
+#: templates/admin.php:197
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:196
+#: templates/admin.php:198
 msgid "Log level"
 msgstr "Livello di log"
 
-#: templates/admin.php:227
+#: templates/admin.php:229
 msgid "More"
 msgstr "Altro"
 
-#: templates/admin.php:228
+#: templates/admin.php:230
 msgid "Less"
 msgstr "Meno"
 
-#: templates/admin.php:235 templates/personal.php:116
+#: templates/admin.php:236 templates/personal.php:116
 msgid "Version"
 msgstr "Versione"
 
-#: templates/admin.php:237 templates/personal.php:119
+#: templates/admin.php:240 templates/personal.php:119
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -387,76 +389,79 @@ msgstr "Sistema di tracciamento bug"
 msgid "Commercial Support"
 msgstr "Supporto commerciale"
 
-#: templates/personal.php:9
+#: templates/personal.php:10
 msgid "Get the apps to sync your files"
 msgstr "Scarica le applicazioni per sincronizzare i tuoi file"
 
-#: templates/personal.php:20
+#: templates/personal.php:21
 msgid "Show First Run Wizard again"
 msgstr "Mostra nuovamente la procedura di primo avvio"
 
-#: templates/personal.php:28
+#: templates/personal.php:29
 #, php-format
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "Hai utilizzato <strong>%s</strong> dei <strong>%s</strong> disponibili"
 
-#: templates/personal.php:40 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:41 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "Password"
 
-#: templates/personal.php:41
+#: templates/personal.php:42
 msgid "Your password was changed"
 msgstr "La tua password è cambiata"
 
-#: templates/personal.php:42
+#: templates/personal.php:43
 msgid "Unable to change your password"
 msgstr "Modifica password non riuscita"
 
-#: templates/personal.php:43
+#: templates/personal.php:44
 msgid "Current password"
 msgstr "Password attuale"
 
-#: templates/personal.php:45
+#: templates/personal.php:46
 msgid "New password"
 msgstr "Nuova password"
 
-#: templates/personal.php:47
+#: templates/personal.php:48
 msgid "Change password"
 msgstr "Modifica password"
 
-#: templates/personal.php:59 templates/users.php:85
+#: templates/personal.php:60 templates/users.php:85
 msgid "Display Name"
 msgstr "Nome visualizzato"
 
-#: templates/personal.php:74
+#: templates/personal.php:75
 msgid "Email"
 msgstr "Posta elettronica"
 
-#: templates/personal.php:76
+#: templates/personal.php:77
 msgid "Your email address"
 msgstr "Il tuo indirizzo email"
 
-#: templates/personal.php:77
+#: templates/personal.php:78
 msgid "Fill in an email address to enable password recovery"
 msgstr "Inserisci il tuo indirizzo email per abilitare il recupero della password"
 
-#: templates/personal.php:86 templates/personal.php:87
+#: templates/personal.php:87 templates/personal.php:88
 msgid "Language"
 msgstr "Lingua"
 
-#: templates/personal.php:99
+#: templates/personal.php:100
 msgid "Help translate"
 msgstr "Migliora la traduzione"
 
-#: templates/personal.php:105
+#: templates/personal.php:106
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:107
-msgid "Use this address to connect to your ownCloud in your file manager"
-msgstr "Usa questo indirizzo per connetterti al tuo ownCloud dal tuo gestore file"
+#: templates/personal.php:108
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
+"target=\"_blank\">access your Files via WebDAV</a>"
+msgstr "Utilizza questo indirizzo per <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">accedere ai tuoi File via WebDAV</a>"
 
-#: templates/users.php:21 templates/users.php:84
+#: templates/users.php:21
 msgid "Login Name"
 msgstr "Nome utente"
 
@@ -486,6 +491,10 @@ msgstr "Illimitata"
 msgid "Other"
 msgstr "Altro"
 
+#: templates/users.php:84
+msgid "Username"
+msgstr "Nome utente"
+
 #: templates/users.php:91
 msgid "Storage"
 msgstr "Archiviazione"
diff --git a/l10n/it/user_ldap.po b/l10n/it/user_ldap.po
index 419b7a63713368c002e2579798b2292c3119f32f..41636ad88f725d05b014facf4c1cc74102388413 100644
--- a/l10n/it/user_ldap.po
+++ b/l10n/it/user_ldap.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:25+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:16+0000\n"
 "Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/it/user_webdavauth.po b/l10n/it/user_webdavauth.po
index 1454f5effb422b974a6b9c3c0fa0e650b6b60e0b..78c08a701504baa68ccfc1d9ff06ea5b97f63f37 100644
--- a/l10n/it/user_webdavauth.po
+++ b/l10n/it/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-06-16 01:59+0200\n"
-"PO-Revision-Date: 2013-06-15 08:20+0000\n"
-"Last-Translator: idetao <marcxosm@gmail.com>\n"
+"POT-Creation-Date: 2013-06-20 02:37+0200\n"
+"PO-Revision-Date: 2013-06-19 06:39+0000\n"
+"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff --git a/l10n/ja_JP/core.po b/l10n/ja_JP/core.po
index 7f4ecc3728ce80f2736b4e0fc0bd278f06380136..a0644f22a1d7a34d494938f50b68b44c398e2c49 100644
--- a/l10n/ja_JP/core.po
+++ b/l10n/ja_JP/core.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
-"Last-Translator: plazmism <gomidori@live.jp>\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
+"Last-Translator: Daisuke Deguchi <ddeguchi@nagoya-u.jp>\n"
 "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -63,135 +63,135 @@ msgstr "削除するカテゴリが選択されていません。"
 msgid "Error removing %s from favorites."
 msgstr "お気に入りから %s の削除エラー"
 
-#: js/config.php:34
+#: js/config.php:32
 msgid "Sunday"
 msgstr "æ—¥"
 
-#: js/config.php:35
+#: js/config.php:33
 msgid "Monday"
 msgstr "月"
 
-#: js/config.php:36
+#: js/config.php:34
 msgid "Tuesday"
 msgstr "火"
 
-#: js/config.php:37
+#: js/config.php:35
 msgid "Wednesday"
 msgstr "æ°´"
 
-#: js/config.php:38
+#: js/config.php:36
 msgid "Thursday"
 msgstr "木"
 
-#: js/config.php:39
+#: js/config.php:37
 msgid "Friday"
 msgstr "金"
 
-#: js/config.php:40
+#: js/config.php:38
 msgid "Saturday"
 msgstr "土"
 
-#: js/config.php:45
+#: js/config.php:43
 msgid "January"
 msgstr "1月"
 
-#: js/config.php:46
+#: js/config.php:44
 msgid "February"
 msgstr "2月"
 
-#: js/config.php:47
+#: js/config.php:45
 msgid "March"
 msgstr "3月"
 
-#: js/config.php:48
+#: js/config.php:46
 msgid "April"
 msgstr "4月"
 
-#: js/config.php:49
+#: js/config.php:47
 msgid "May"
 msgstr "5月"
 
-#: js/config.php:50
+#: js/config.php:48
 msgid "June"
 msgstr "6月"
 
-#: js/config.php:51
+#: js/config.php:49
 msgid "July"
 msgstr "7月"
 
-#: js/config.php:52
+#: js/config.php:50
 msgid "August"
 msgstr "8月"
 
-#: js/config.php:53
+#: js/config.php:51
 msgid "September"
 msgstr "9月"
 
-#: js/config.php:54
+#: js/config.php:52
 msgid "October"
 msgstr "10月"
 
-#: js/config.php:55
+#: js/config.php:53
 msgid "November"
 msgstr "11月"
 
-#: js/config.php:56
+#: js/config.php:54
 msgid "December"
 msgstr "12月"
 
-#: js/js.js:286
+#: js/js.js:293
 msgid "Settings"
 msgstr "設定"
 
-#: js/js.js:718
+#: js/js.js:725
 msgid "seconds ago"
 msgstr "数秒前"
 
-#: js/js.js:719
+#: js/js.js:726
 msgid "1 minute ago"
 msgstr "1 分前"
 
-#: js/js.js:720
+#: js/js.js:727
 msgid "{minutes} minutes ago"
 msgstr "{minutes} 分前"
 
-#: js/js.js:721
+#: js/js.js:728
 msgid "1 hour ago"
 msgstr "1 時間前"
 
-#: js/js.js:722
+#: js/js.js:729
 msgid "{hours} hours ago"
 msgstr "{hours} 時間前"
 
-#: js/js.js:723
+#: js/js.js:730
 msgid "today"
 msgstr "今日"
 
-#: js/js.js:724
+#: js/js.js:731
 msgid "yesterday"
 msgstr "昨日"
 
-#: js/js.js:725
+#: js/js.js:732
 msgid "{days} days ago"
 msgstr "{days} 日前"
 
-#: js/js.js:726
+#: js/js.js:733
 msgid "last month"
 msgstr "一月前"
 
-#: js/js.js:727
+#: js/js.js:734
 msgid "{months} months ago"
 msgstr "{months} 月前"
 
-#: js/js.js:728
+#: js/js.js:735
 msgid "months ago"
 msgstr "月前"
 
-#: js/js.js:729
+#: js/js.js:736
 msgid "last year"
 msgstr "一年前"
 
-#: js/js.js:730
+#: js/js.js:737
 msgid "years ago"
 msgstr "年前"
 
@@ -227,8 +227,8 @@ msgstr "オブジェクタイプが指定されていません。"
 #: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
 #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:577
-#: js/share.js:589
+#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:620
+#: js/share.js:632
 msgid "Error"
 msgstr "エラー"
 
@@ -248,7 +248,7 @@ msgstr "共有中"
 msgid "Share"
 msgstr "共有"
 
-#: js/share.js:125 js/share.js:617
+#: js/share.js:125 js/share.js:660
 msgid "Error while sharing"
 msgstr "共有でエラー発生"
 
@@ -268,99 +268,103 @@ msgstr "あなたと {owner} のグループ {group} で共有中"
 msgid "Shared with you by {owner}"
 msgstr "{owner} と共有中"
 
-#: js/share.js:159
+#: js/share.js:172
 msgid "Share with"
 msgstr "共有者"
 
-#: js/share.js:164
+#: js/share.js:177
 msgid "Share with link"
 msgstr "URLリンクで共有"
 
-#: js/share.js:167
+#: js/share.js:180
 msgid "Password protect"
 msgstr "パスワード保護"
 
-#: js/share.js:169 templates/installation.php:54 templates/login.php:26
+#: js/share.js:182 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "パスワード"
 
-#: js/share.js:173
+#: js/share.js:187
+msgid "Allow Public Upload"
+msgstr "アップロードを許可"
+
+#: js/share.js:191
 msgid "Email link to person"
 msgstr "メールリンク"
 
-#: js/share.js:174
+#: js/share.js:192
 msgid "Send"
 msgstr "送信"
 
-#: js/share.js:178
+#: js/share.js:197
 msgid "Set expiration date"
 msgstr "有効期限を設定"
 
-#: js/share.js:179
+#: js/share.js:198
 msgid "Expiration date"
 msgstr "有効期限"
 
-#: js/share.js:211
+#: js/share.js:230
 msgid "Share via email:"
 msgstr "メール経由で共有:"
 
-#: js/share.js:213
+#: js/share.js:232
 msgid "No people found"
 msgstr "ユーザーが見つかりません"
 
-#: js/share.js:251
+#: js/share.js:270
 msgid "Resharing is not allowed"
 msgstr "再共有は許可されていません"
 
-#: js/share.js:287
+#: js/share.js:306
 msgid "Shared in {item} with {user}"
 msgstr "{item} 内で {user} と共有中"
 
-#: js/share.js:308
+#: js/share.js:327
 msgid "Unshare"
 msgstr "共有解除"
 
-#: js/share.js:320
+#: js/share.js:339
 msgid "can edit"
 msgstr "編集可能"
 
-#: js/share.js:322
+#: js/share.js:341
 msgid "access control"
 msgstr "アクセス権限"
 
-#: js/share.js:325
+#: js/share.js:344
 msgid "create"
 msgstr "作成"
 
-#: js/share.js:328
+#: js/share.js:347
 msgid "update"
 msgstr "æ›´æ–°"
 
-#: js/share.js:331
+#: js/share.js:350
 msgid "delete"
 msgstr "削除"
 
-#: js/share.js:334
+#: js/share.js:353
 msgid "share"
 msgstr "共有"
 
-#: js/share.js:368 js/share.js:564
+#: js/share.js:387 js/share.js:607
 msgid "Password protected"
 msgstr "パスワード保護"
 
-#: js/share.js:577
+#: js/share.js:620
 msgid "Error unsetting expiration date"
 msgstr "有効期限の未設定エラー"
 
-#: js/share.js:589
+#: js/share.js:632
 msgid "Error setting expiration date"
 msgstr "有効期限の設定でエラー発生"
 
-#: js/share.js:604
+#: js/share.js:647
 msgid "Sending ..."
 msgstr "送信中..."
 
-#: js/share.js:615
+#: js/share.js:658
 msgid "Email sent"
 msgstr "メールを送信しました"
 
@@ -375,7 +379,7 @@ msgstr "更新に成功しました。この問題を <a href=\"https://github.c
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "更新に成功しました。今すぐownCloudにリダイレクトします。"
 
-#: lostpassword/controller.php:58
+#: lostpassword/controller.php:60
 msgid "ownCloud password reset"
 msgstr "ownCloudのパスワードをリセットします"
 
@@ -405,17 +409,17 @@ msgstr "ユーザー名"
 
 #: lostpassword/templates/lostpassword.php:22
 msgid ""
-"Your files seems to be encrypted. If you didn't have enabled the recovery "
-"key there will be no way to get your data back once the password was "
-"resetted. If you are not sure what to do, please contact your administrator "
-"first before continue. Do you really want to continue?"
-msgstr "ファイルが暗号化されているようです。復旧キーを有効にしていなかった場合、パスワードをリセットしてからデータを復旧する方法はありません。何をすべきかわからないなら、続ける前にまず管理者に連絡しましょう。本当に続けますか？"
+"Your files are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
+msgstr "ファイルが暗号化されています。復旧キーを有効にしていなかった場合、パスワードをリセットしてからデータを復旧する方法はありません。何をすべきかよくわからないなら、続ける前にまず管理者に連絡しましょう。本当に続けますか？"
 
 #: lostpassword/templates/lostpassword.php:24
 msgid "Yes, I really want to reset my password now"
 msgstr "はい、今すぐパスワードをリセットします。"
 
-#: lostpassword/templates/lostpassword.php:29
+#: lostpassword/templates/lostpassword.php:27
 msgid "Request reset"
 msgstr "リセットを要求します。"
 
@@ -463,7 +467,7 @@ msgstr "アクセスが禁止されています"
 msgid "Cloud not found"
 msgstr "見つかりません"
 
-#: templates/altmail.php:2
+#: templates/altmail.php:4
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -474,10 +478,6 @@ msgid ""
 "Cheers!"
 msgstr "こんにちは、\n\n%s があなたと %s を共有したことをお知らせします。\nそれを表示: %s\n\nそれでは。"
 
-#: templates/altmail.php:7 templates/mail.php:24
-msgid "web services under your control"
-msgstr "管理下のウェブサービス"
-
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
 msgstr "カテゴリを編集"
@@ -570,12 +570,12 @@ msgstr "データベースのホスト名"
 msgid "Finish setup"
 msgstr "セットアップを完了します"
 
-#: templates/layout.user.php:40
+#: templates/layout.user.php:43
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr "%s が利用可能です。更新方法に関してさらに情報を取得して下さい。"
 
-#: templates/layout.user.php:67
+#: templates/layout.user.php:68
 msgid "Log out"
 msgstr "ログアウト"
 
@@ -609,7 +609,7 @@ msgstr "ログイン"
 msgid "Alternative Logins"
 msgstr "代替ログイン"
 
-#: templates/mail.php:15
+#: templates/mail.php:16
 #, php-format
 msgid ""
 "Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
diff --git a/l10n/ja_JP/files.po b/l10n/ja_JP/files.po
index f1638aacc8d37e66c6bd63f8fb98c850620c2a9e..e10e61dba352cb6690a12d0345b5eaa8f76db4f0 100644
--- a/l10n/ja_JP/files.po
+++ b/l10n/ja_JP/files.po
@@ -4,13 +4,15 @@
 # 
 # Translators:
 # Daisuke Deguchi <ddeguchi@nagoya-u.jp>, 2013
+# plazmism <gomidori@live.jp>, 2013
+# tt yn <tetuyano+transi@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:01+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
-"Last-Translator: Daisuke Deguchi <ddeguchi@nagoya-u.jp>\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
+"Last-Translator: tt yn <tetuyano+transi@gmail.com>\n"
 "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -28,46 +30,54 @@ msgstr "%s を移動できませんでした ― この名前のファイルは
 msgid "Could not move %s"
 msgstr "%s を移動できませんでした"
 
-#: ajax/upload.php:19
+#: ajax/upload.php:16 ajax/upload.php:45
+msgid "Unable to set upload directory."
+msgstr "アップロードディレクトリを設定出来ません。"
+
+#: ajax/upload.php:22
+msgid "Invalid Token"
+msgstr "無効なトークン"
+
+#: ajax/upload.php:59
 msgid "No file was uploaded. Unknown error"
 msgstr "ファイルは何もアップロードされていません。不明なエラー"
 
-#: ajax/upload.php:26
+#: ajax/upload.php:66
 msgid "There is no error, the file uploaded with success"
 msgstr "エラーはありません。ファイルのアップロードは成功しました"
 
-#: ajax/upload.php:27
+#: ajax/upload.php:67
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr "アップロードされたファイルはphp.ini の upload_max_filesize に設定されたサイズを超えています:"
 
-#: ajax/upload.php:29
+#: ajax/upload.php:69
 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:30
+#: ajax/upload.php:70
 msgid "The uploaded file was only partially uploaded"
 msgstr "アップロードファイルは一部分だけアップロードされました"
 
-#: ajax/upload.php:31
+#: ajax/upload.php:71
 msgid "No file was uploaded"
 msgstr "ファイルはアップロードされませんでした"
 
-#: ajax/upload.php:32
+#: ajax/upload.php:72
 msgid "Missing a temporary folder"
 msgstr "一時保存フォルダが見つかりません"
 
-#: ajax/upload.php:33
+#: ajax/upload.php:73
 msgid "Failed to write to disk"
 msgstr "ディスクへの書き込みに失敗しました"
 
-#: ajax/upload.php:51
+#: ajax/upload.php:91
 msgid "Not enough storage available"
 msgstr "ストレージに十分な空き容量がありません"
 
-#: ajax/upload.php:83
+#: ajax/upload.php:123
 msgid "Invalid directory."
 msgstr "無効なディレクトリです。"
 
@@ -75,6 +85,36 @@ msgstr "無効なディレクトリです。"
 msgid "Files"
 msgstr "ファイル"
 
+#: js/file-upload.js:11
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr "ディレクトリもしくは0バイトのファイルはアップロードできません"
+
+#: js/file-upload.js:24
+msgid "Not enough space available"
+msgstr "利用可能なスペースが十分にありません"
+
+#: js/file-upload.js:64
+msgid "Upload cancelled."
+msgstr "アップロードはキャンセルされました。"
+
+#: js/file-upload.js:167 js/files.js:266
+msgid ""
+"File upload is in progress. Leaving the page now will cancel the upload."
+msgstr "ファイル転送を実行中です。今このページから移動するとアップロードが中止されます。"
+
+#: js/file-upload.js:233 js/files.js:339
+msgid "URL cannot be empty."
+msgstr "URLは空にできません。"
+
+#: js/file-upload.js:238 lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr "無効なフォルダ名です。'Shared' の利用はownCloudで予約済みです"
+
+#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
+#: js/files.js:693 js/files.js:731
+msgid "Error"
+msgstr "エラー"
+
 #: js/fileactions.js:116
 msgid "Share"
 msgstr "共有"
@@ -91,43 +131,43 @@ msgstr "削除"
 msgid "Rename"
 msgstr "名前の変更"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:464
 msgid "Pending"
 msgstr "中断"
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "{new_name} already exists"
 msgstr "{new_name} はすでに存在しています"
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "replace"
 msgstr "置き換え"
 
-#: js/filelist.js:259
+#: js/filelist.js:302
 msgid "suggest name"
 msgstr "推奨名称"
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "cancel"
 msgstr "キャンセル"
 
-#: js/filelist.js:306
+#: js/filelist.js:349
 msgid "replaced {new_name} with {old_name}"
 msgstr "{old_name} を {new_name} に置換"
 
-#: js/filelist.js:306
+#: js/filelist.js:349
 msgid "undo"
 msgstr "元に戻す"
 
-#: js/filelist.js:331
+#: js/filelist.js:374
 msgid "perform delete operation"
 msgstr "削除を実行"
 
-#: js/filelist.js:413
+#: js/filelist.js:456
 msgid "1 file uploading"
 msgstr "ファイルを1つアップロード中"
 
-#: js/filelist.js:416 js/filelist.js:470
+#: js/filelist.js:459 js/filelist.js:517
 msgid "files uploading"
 msgstr "ファイルをアップロード中"
 
@@ -159,70 +199,42 @@ msgid ""
 "big."
 msgstr "ダウンロードの準備中です。ファイルサイズが大きい場合は少し時間がかかるかもしれません。"
 
-#: js/files.js:264
-msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "ディレクトリもしくは0バイトのファイルはアップロードできません"
-
-#: js/files.js:277
-msgid "Not enough space available"
-msgstr "利用可能なスペースが十分にありません"
-
-#: js/files.js:317
-msgid "Upload cancelled."
-msgstr "アップロードはキャンセルされました。"
-
-#: js/files.js:413
-msgid ""
-"File upload is in progress. Leaving the page now will cancel the upload."
-msgstr "ファイル転送を実行中です。今このページから移動するとアップロードが中止されます。"
-
-#: js/files.js:486
-msgid "URL cannot be empty."
-msgstr "URLは空にできません。"
-
-#: js/files.js:491
+#: js/files.js:344
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "無効なフォルダ名です。'Shared' の利用は ownCloud が予約済みです。"
 
-#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
-msgid "Error"
-msgstr "エラー"
-
-#: js/files.js:877 templates/index.php:69
+#: js/files.js:744 templates/index.php:69
 msgid "Name"
 msgstr "名前"
 
-#: js/files.js:878 templates/index.php:80
+#: js/files.js:745 templates/index.php:80
 msgid "Size"
 msgstr "サイズ"
 
-#: js/files.js:879 templates/index.php:82
+#: js/files.js:746 templates/index.php:82
 msgid "Modified"
 msgstr "変更"
 
-#: js/files.js:898
+#: js/files.js:765
 msgid "1 folder"
 msgstr "1 フォルダ"
 
-#: js/files.js:900
+#: js/files.js:767
 msgid "{count} folders"
 msgstr "{count} フォルダ"
 
-#: js/files.js:908
+#: js/files.js:775
 msgid "1 file"
 msgstr "1 ファイル"
 
-#: js/files.js:910
+#: js/files.js:777
 msgid "{count} files"
 msgstr "{count} ファイル"
 
-#: lib/app.php:53
-msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
-msgstr "無効なフォルダ名です。'Shared' の利用はownCloudで予約済みです"
-
 #: lib/app.php:73
-msgid "Unable to rename file"
-msgstr "ファイル名の変更ができません"
+#, php-format
+msgid "%s could not be renamed"
+msgstr "%sの名前を変更できませんでした"
 
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
@@ -318,6 +330,22 @@ msgstr "ファイルをスキャンしています、しばらくお待ちくだ
 msgid "Current scanning"
 msgstr "スキャン中"
 
+#: templates/part.list.php:76
+msgid "directory"
+msgstr "ディレクトリ"
+
+#: templates/part.list.php:78
+msgid "directories"
+msgstr "ディレクトリ"
+
+#: templates/part.list.php:87
+msgid "file"
+msgstr "ファイル"
+
+#: templates/part.list.php:89
+msgid "files"
+msgstr "ファイル"
+
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
 msgstr "ファイルシステムキャッシュを更新中..."
diff --git a/l10n/ja_JP/files_encryption.po b/l10n/ja_JP/files_encryption.po
index 9b3310cd58f1680ac6952b7d55e7305b1dd66c37..1697707c7feeff73bcb5242c054797021e1f37cc 100644
--- a/l10n/ja_JP/files_encryption.po
+++ b/l10n/ja_JP/files_encryption.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-06-15 01:58+0200\n"
-"PO-Revision-Date: 2013-06-14 10:30+0000\n"
-"Last-Translator: plazmism <gomidori@live.jp>\n"
+"POT-Creation-Date: 2013-07-07 01:58+0200\n"
+"PO-Revision-Date: 2013-07-06 01:30+0000\n"
+"Last-Translator: tt yn <tetuyano+transi@gmail.com>\n"
 "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -58,10 +58,22 @@ msgstr "秘密鍵のパスワードを更新できませんでした。古いパ
 
 #: files/error.php:7
 msgid ""
-"Your private key is not valid! Maybe your password was changed from outside."
-" You can update your private key password in your personal settings to "
-"regain access to your files"
-msgstr "秘密鍵が有効ではありません。パスワードが外部から変更された恐れがあります。。個人設定で秘密鍵のパスワードを更新して、ファイルへのアクセス権を奪還できます。"
+"Your private key is not valid! Likely your password was changed outside the "
+"ownCloud system (e.g. your corporate directory). You can update your private"
+" key password in your personal settings to recover access to your encrypted "
+"files."
+msgstr "秘密鍵が有効ではありません。パスワードがownCloudシステムの外部(例えば、企業ディレクトリ)から変更された恐れがあります。個人設定で秘密鍵のパスワードを更新して、暗号化されたファイルを回復出来ます。"
+
+#: hooks/hooks.php:44
+msgid "Missing requirements."
+msgstr "必要要件が満たされていません。"
+
+#: hooks/hooks.php:45
+msgid ""
+"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL "
+"PHP extension is enabled and configured properly. For now, the encryption "
+"app has been disabled."
+msgstr "必ず、PHP 5.3.3以上をインストールし、OpenSSLのPHP拡張を有効にして適切に設定してください。現時点では暗号化アプリは無効になっています。"
 
 #: js/settings-admin.js:11
 msgid "Saving..."
@@ -87,12 +99,12 @@ msgstr "暗号化"
 
 #: templates/settings-admin.php:10
 msgid ""
-"Enable encryption passwords recovery key (allow sharing to recovery key):"
-msgstr "暗号化パスワードの復旧キーを有効にする(復旧キーを共有することを許可):"
+"Enable recovery key (allow to recover users files in case of password loss):"
+msgstr "復旧キーを有効化 (万一パスワードを亡くした場合もユーザーのファイルを回復できる):"
 
 #: templates/settings-admin.php:14
-msgid "Recovery account password"
-msgstr "復旧アカウントのパスワード"
+msgid "Recovery key password"
+msgstr "復旧キーのパスワード"
 
 #: templates/settings-admin.php:21 templates/settings-personal.php:54
 msgid "Enabled"
@@ -103,16 +115,16 @@ msgid "Disabled"
 msgstr "無効"
 
 #: templates/settings-admin.php:34
-msgid "Change encryption passwords recovery key:"
-msgstr "復旧キーの暗号化パスワードを変更:"
+msgid "Change recovery key password:"
+msgstr "復旧キーのパスワードを変更:"
 
 #: templates/settings-admin.php:41
-msgid "Old Recovery account password"
-msgstr "古い復旧アカウントのパスワード"
+msgid "Old Recovery key password"
+msgstr "古い復旧キーのパスワード"
 
 #: templates/settings-admin.php:48
-msgid "New Recovery account password"
-msgstr "新しい復旧アカウントのパスワード"
+msgid "New Recovery key password"
+msgstr "新しい復旧キーのパスワード"
 
 #: templates/settings-admin.php:53
 msgid "Change Password"
diff --git a/l10n/ja_JP/files_external.po b/l10n/ja_JP/files_external.po
index 08607c344433779ae77b221b4640dc5e0df24138..5c50a228e8dc3fa2ce675c1022b83b13ad93df55 100644
--- a/l10n/ja_JP/files_external.po
+++ b/l10n/ja_JP/files_external.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/ja_JP/files_sharing.po b/l10n/ja_JP/files_sharing.po
index 35025b120908b7a9256188b9f41c4befbc3ba435..c91cd514e611cef135c3490006ae6010b41fddeb 100644
--- a/l10n/ja_JP/files_sharing.po
+++ b/l10n/ja_JP/files_sharing.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# tt yn <tetuyano+transi@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
+"Last-Translator: tt yn <tetuyano+transi@gmail.com>\n"
 "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,27 +19,39 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: templates/authenticate.php:4
+msgid "The password is wrong. Try again."
+msgstr "パスワードが間違っています。再試行してください。"
+
+#: templates/authenticate.php:7
 msgid "Password"
 msgstr "パスワード"
 
-#: templates/authenticate.php:6
+#: templates/authenticate.php:9
 msgid "Submit"
 msgstr "送信"
 
-#: templates/public.php:10
+#: templates/public.php:17
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s はフォルダー %s をあなたと共有中です"
 
-#: templates/public.php:13
+#: templates/public.php:20
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s はファイル %s をあなたと共有中です"
 
-#: templates/public.php:19 templates/public.php:43
+#: templates/public.php:28 templates/public.php:90
 msgid "Download"
 msgstr "ダウンロード"
 
-#: templates/public.php:40
+#: templates/public.php:45 templates/public.php:48
+msgid "Upload"
+msgstr "アップロード"
+
+#: templates/public.php:58
+msgid "Cancel upload"
+msgstr "アップロードをキャンセル"
+
+#: templates/public.php:87
 msgid "No preview available for"
 msgstr "プレビューはありません"
diff --git a/l10n/ja_JP/files_trashbin.po b/l10n/ja_JP/files_trashbin.po
index 6016942dd4a1e6e9095f9483f35b2eff4acc486a..0b93e87a43f451dd7a4753ea377250785651bbd9 100644
--- a/l10n/ja_JP/files_trashbin.po
+++ b/l10n/ja_JP/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:16+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/ja_JP/lib.po b/l10n/ja_JP/lib.po
index 0f0586f87ce0e397f155aa6f306fa7006527c7f6..0ae5915f28c148073397b6e750da807b2f965f9c 100644
--- a/l10n/ja_JP/lib.po
+++ b/l10n/ja_JP/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-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
-"Last-Translator: tt yn <tetuyano+transi@gmail.com>\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,43 +18,47 @@ msgstr ""
 "Language: ja_JP\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: app.php:359
+#: app.php:360
 msgid "Help"
 msgstr "ヘルプ"
 
-#: app.php:372
+#: app.php:373
 msgid "Personal"
 msgstr "個人"
 
-#: app.php:383
+#: app.php:384
 msgid "Settings"
 msgstr "設定"
 
-#: app.php:395
+#: app.php:396
 msgid "Users"
 msgstr "ユーザ"
 
-#: app.php:408
+#: app.php:409
 msgid "Apps"
 msgstr "アプリ"
 
-#: app.php:416
+#: app.php:417
 msgid "Admin"
 msgstr "管理"
 
-#: files.php:210
+#: defaults.php:33
+msgid "web services under your control"
+msgstr "管理下のウェブサービス"
+
+#: files.php:226
 msgid "ZIP download is turned off."
 msgstr "ZIPダウンロードは無効です。"
 
-#: files.php:211
+#: files.php:227
 msgid "Files need to be downloaded one by one."
 msgstr "ファイルは1つずつダウンロードする必要があります。"
 
-#: files.php:212 files.php:245
+#: files.php:228 files.php:261
 msgid "Back to Files"
 msgstr "ファイルに戻る"
 
-#: files.php:242
+#: files.php:258
 msgid "Selected files too large to generate zip file."
 msgstr "選択したファイルはZIPファイルの生成には大きすぎます。"
 
@@ -86,104 +90,102 @@ msgstr "TTY TDD"
 msgid "Images"
 msgstr "画像"
 
-#: setup.php:34
-msgid "Set an admin username."
-msgstr "管理者のユーザ名を設定。"
-
-#: setup.php:37
-msgid "Set an admin password."
-msgstr "管理者のパスワードを設定。"
-
-#: setup.php:55
+#: setup/abstractdatabase.php:22
 #, php-format
 msgid "%s enter the database username."
 msgstr "%s のデータベースのユーザ名を入力してください。"
 
-#: setup.php:58
+#: setup/abstractdatabase.php:25
 #, php-format
 msgid "%s enter the database name."
 msgstr "%s のデータベース名を入力してください。"
 
-#: setup.php:61
+#: setup/abstractdatabase.php:28
 #, php-format
 msgid "%s you may not use dots in the database name"
 msgstr "%s ではデータベース名にドットを利用できないかもしれません。"
 
-#: setup.php:64
+#: setup/mssql.php:20
 #, php-format
-msgid "%s set the database host."
-msgstr "%s にデータベースホストを設定します。"
-
-#: setup.php:126 setup.php:332 setup.php:377
-msgid "PostgreSQL username and/or password not valid"
-msgstr "PostgreSQLのユーザ名もしくはパスワードは有効ではありません"
+msgid "MS SQL username and/or password not valid: %s"
+msgstr "MS SQL サーバーのユーザー名/パスワードが正しくありません: %s"
 
-#: setup.php:127 setup.php:235
+#: setup/mssql.php:21 setup/mysql.php:13 setup/oci.php:114
+#: setup/postgresql.php:24 setup/postgresql.php:70
 msgid "You need to enter either an existing account or the administrator."
 msgstr "既存のアカウントもしくは管理者のどちらかを入力する必要があります。"
 
-#: setup.php:152
-msgid "Oracle connection could not be established"
-msgstr "Oracleへの接続が確立できませんでした。"
-
-#: setup.php:234
+#: setup/mysql.php:12
 msgid "MySQL username and/or password not valid"
 msgstr "MySQLのユーザ名もしくはパスワードは有効ではありません"
 
-#: setup.php:288 setup.php:398 setup.php:407 setup.php:425 setup.php:435
-#: setup.php:444 setup.php:477 setup.php:543 setup.php:569 setup.php:576
-#: setup.php:587 setup.php:594 setup.php:603 setup.php:611 setup.php:620
-#: setup.php:626
+#: setup/mysql.php:67 setup/oci.php:54 setup/oci.php:121 setup/oci.php:147
+#: setup/oci.php:154 setup/oci.php:165 setup/oci.php:172 setup/oci.php:181
+#: setup/oci.php:189 setup/oci.php:198 setup/oci.php:204
+#: setup/postgresql.php:89 setup/postgresql.php:98 setup/postgresql.php:115
+#: setup/postgresql.php:125 setup/postgresql.php:134
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr "DBエラー: \"%s\""
 
-#: setup.php:289 setup.php:399 setup.php:408 setup.php:426 setup.php:436
-#: setup.php:445 setup.php:478 setup.php:544 setup.php:570 setup.php:577
-#: setup.php:588 setup.php:604 setup.php:612 setup.php:621
+#: setup/mysql.php:68 setup/oci.php:55 setup/oci.php:122 setup/oci.php:148
+#: setup/oci.php:155 setup/oci.php:166 setup/oci.php:182 setup/oci.php:190
+#: setup/oci.php:199 setup/postgresql.php:90 setup/postgresql.php:99
+#: setup/postgresql.php:116 setup/postgresql.php:126 setup/postgresql.php:135
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr "違反コマンド: \"%s\""
 
-#: setup.php:305
+#: setup/mysql.php:85
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr "MySQLのユーザ '%s'@'localhost' はすでに存在します。"
 
-#: setup.php:306
+#: setup/mysql.php:86
 msgid "Drop this user from MySQL"
 msgstr "MySQLからこのユーザを削除"
 
-#: setup.php:311
+#: setup/mysql.php:91
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr "MySQLのユーザ '%s'@'%%' はすでに存在します。"
 
-#: setup.php:312
+#: setup/mysql.php:92
 msgid "Drop this user from MySQL."
 msgstr "MySQLからこのユーザを削除する。"
 
-#: setup.php:469 setup.php:536
+#: setup/oci.php:34
+msgid "Oracle connection could not be established"
+msgstr "Oracleへの接続が確立できませんでした。"
+
+#: setup/oci.php:41 setup/oci.php:113
 msgid "Oracle username and/or password not valid"
 msgstr "Oracleのユーザ名もしくはパスワードは有効ではありません"
 
-#: setup.php:595 setup.php:627
+#: setup/oci.php:173 setup/oci.php:205
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr "違反コマンド: \"%s\"、名前: %s、パスワード: %s"
 
-#: setup.php:647
-#, php-format
-msgid "MS SQL username and/or password not valid: %s"
-msgstr "MS SQL サーバーのユーザー名/パスワードが正しくありません: %s"
+#: setup/postgresql.php:23 setup/postgresql.php:69
+msgid "PostgreSQL username and/or password not valid"
+msgstr "PostgreSQLのユーザ名もしくはパスワードは有効ではありません"
+
+#: setup.php:42
+msgid "Set an admin username."
+msgstr "管理者のユーザ名を設定。"
+
+#: setup.php:45
+msgid "Set an admin password."
+msgstr "管理者のパスワードを設定。"
 
-#: setup.php:870
+#: setup.php:198
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "WebDAVインタフェースが動作していないと考えられるため、あなたのWEBサーバはまだファイルの同期を許可するように適切な設定がされていません。"
 
-#: setup.php:871
+#: setup.php:199
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "<a href='%s'>インストールガイド</a>をよく確認してください。"
diff --git a/l10n/ja_JP/settings.po b/l10n/ja_JP/settings.po
index 8765ce5b5b269f002d8c9f117c0dfc74a6cf161f..e7b7413622dfba1bdb5953dfac42ea74139fd8dd 100644
--- a/l10n/ja_JP/settings.po
+++ b/l10n/ja_JP/settings.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
-"Last-Translator: plazmism <gomidori@live.jp>\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
+"Last-Translator: Daisuke Deguchi <ddeguchi@nagoya-u.jp>\n"
 "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -91,35 +91,35 @@ msgstr "ユーザをグループ %s から削除できません"
 msgid "Couldn't update app."
 msgstr "アプリを更新出来ませんでした。"
 
-#: js/apps.js:30
+#: js/apps.js:35
 msgid "Update to {appversion}"
 msgstr "{appversion} に更新"
 
-#: js/apps.js:36 js/apps.js:76
+#: js/apps.js:41 js/apps.js:81
 msgid "Disable"
 msgstr "無効"
 
-#: js/apps.js:36 js/apps.js:64 js/apps.js:83
+#: js/apps.js:41 js/apps.js:69 js/apps.js:88
 msgid "Enable"
 msgstr "有効化"
 
-#: js/apps.js:55
+#: js/apps.js:60
 msgid "Please wait...."
 msgstr "しばらくお待ちください。"
 
-#: js/apps.js:59 js/apps.js:71 js/apps.js:80 js/apps.js:93
+#: js/apps.js:64 js/apps.js:76 js/apps.js:85 js/apps.js:98
 msgid "Error"
 msgstr "エラー"
 
-#: js/apps.js:90
+#: js/apps.js:95
 msgid "Updating...."
 msgstr "更新中...."
 
-#: js/apps.js:93
+#: js/apps.js:98
 msgid "Error while updating app"
 msgstr "アプリの更新中にエラーが発生"
 
-#: js/apps.js:96
+#: js/apps.js:101
 msgid "Updated"
 msgstr "更新済み"
 
@@ -168,15 +168,15 @@ msgstr "ユーザ作成エラー"
 msgid "A valid password must be provided"
 msgstr "有効なパスワードを指定する必要があります"
 
-#: personal.php:35 personal.php:36
+#: personal.php:37 personal.php:38
 msgid "__language_name__"
 msgstr "Japanese (日本語)"
 
-#: templates/admin.php:15
+#: templates/admin.php:17
 msgid "Security Warning"
 msgstr "セキュリティ警告"
 
-#: templates/admin.php:18
+#: templates/admin.php:20
 msgid ""
 "Your data directory and your files are probably accessible from the "
 "internet. The .htaccess file that ownCloud provides is not working. We "
@@ -185,36 +185,36 @@ msgid ""
 " webserver document root."
 msgstr "データディレクトリとファイルが恐らくインターネットからアクセスできるようになっています。ownCloudが提供する .htaccessファイルが機能していません。データディレクトリを全くアクセスできないようにするか、データディレクトリをウェブサーバのドキュメントルートの外に置くようにウェブサーバを設定することを強くお勧めします。 "
 
-#: templates/admin.php:29
+#: templates/admin.php:31
 msgid "Setup Warning"
 msgstr "セットアップ警告"
 
-#: templates/admin.php:32
+#: templates/admin.php:34
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "WebDAVインタフェースが動作していないと考えられるため、あなたのWEBサーバはまだファイルの同期を許可するように適切な設定がされていません。"
 
-#: templates/admin.php:33
+#: templates/admin.php:35
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "<a href='%s'>インストールガイド</a>をよく確認してください。"
 
-#: templates/admin.php:44
+#: templates/admin.php:46
 msgid "Module 'fileinfo' missing"
 msgstr "モジュール 'fileinfo' が見つかりません"
 
-#: templates/admin.php:47
+#: templates/admin.php:49
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr "PHP のモジュール 'fileinfo' が見つかりません。mimeタイプの検出を精度良く行うために、このモジュールを有効にすることを強くお勧めします。"
 
-#: templates/admin.php:58
+#: templates/admin.php:60
 msgid "Locale not working"
 msgstr "ロケールが動作していません"
 
-#: templates/admin.php:63
+#: templates/admin.php:65
 #, php-format
 msgid ""
 "This ownCloud server can't set system locale to %s. This means that there "
@@ -222,11 +222,11 @@ msgid ""
 " to install the required packages on your system to support %s."
 msgstr "この ownCloud サーバは、システムロケールを %s に設定できません。これは、ファイル名の特定の文字で問題が発生する可能性があることを意味しています。%s をサポートするために、システムに必要なパッケージをインストールすることを強く推奨します。"
 
-#: templates/admin.php:75
+#: templates/admin.php:77
 msgid "Internet connection not working"
 msgstr "インターネット接続が動作していません"
 
-#: templates/admin.php:78
+#: templates/admin.php:80
 msgid ""
 "This ownCloud server has no working internet connection. This means that "
 "some of the features like mounting of external storage, notifications about "
@@ -236,102 +236,102 @@ msgid ""
 " of ownCloud."
 msgstr "この ownCloud サーバには有効なインターネット接続がありません。これは、外部ストレージのマウント、更新の通知、サードパーティ製アプリのインストール、のようないくつかの機能が動作しないことを意味しています。リモートからファイルにアクセスしたり、通知メールを送信したりすることもできません。全ての機能を利用するためには、このサーバのインターネット接続を有効にすることを推奨します。"
 
-#: templates/admin.php:92
+#: templates/admin.php:94
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:101
+#: templates/admin.php:103
 msgid "Execute one task with each page loaded"
 msgstr "各ページの読み込み時にタスクを実行する"
 
-#: templates/admin.php:111
+#: templates/admin.php:113
 msgid ""
 "cron.php is registered at a webcron service. Call the cron.php page in the "
 "owncloud root once a minute over http."
 msgstr "cron.php は webcron サービスに登録されています。owncloud のルートにある cron.php のページを http 経由で1分に1回呼び出して下さい。"
 
-#: templates/admin.php:121
+#: templates/admin.php:123
 msgid ""
 "Use systems cron service. Call the cron.php file in the owncloud folder via "
 "a system cronjob once a minute."
 msgstr "システムの cron サービスを利用する。システムの cronjob を通して1分に1回 owncloud 内の cron.php ファイルを呼び出して下さい。"
 
-#: templates/admin.php:128
+#: templates/admin.php:130
 msgid "Sharing"
 msgstr "共有"
 
-#: templates/admin.php:134
+#: templates/admin.php:136
 msgid "Enable Share API"
 msgstr "共有APIを有効にする"
 
-#: templates/admin.php:135
+#: templates/admin.php:137
 msgid "Allow apps to use the Share API"
 msgstr "アプリからの共有APIの利用を許可する"
 
-#: templates/admin.php:142
+#: templates/admin.php:144
 msgid "Allow links"
 msgstr "リンクを許可する"
 
-#: templates/admin.php:143
+#: templates/admin.php:145
 msgid "Allow users to share items to the public with links"
 msgstr "リンクによりアイテムを公開することを許可する"
 
-#: templates/admin.php:150
+#: templates/admin.php:152
 msgid "Allow resharing"
 msgstr "再共有を許可する"
 
-#: templates/admin.php:151
+#: templates/admin.php:153
 msgid "Allow users to share items shared with them again"
 msgstr "ユーザが共有しているアイテムの再共有を許可する"
 
-#: templates/admin.php:158
+#: templates/admin.php:160
 msgid "Allow users to share with anyone"
 msgstr "ユーザが誰とでも共有することを許可する"
 
-#: templates/admin.php:161
+#: templates/admin.php:163
 msgid "Allow users to only share with users in their groups"
 msgstr "ユーザにグループ内のユーザとのみ共有を許可する"
 
-#: templates/admin.php:168
+#: templates/admin.php:170
 msgid "Security"
 msgstr "セキュリティ"
 
-#: templates/admin.php:181
+#: templates/admin.php:183
 msgid "Enforce HTTPS"
 msgstr "常にHTTPSを使用する"
 
-#: templates/admin.php:182
+#: templates/admin.php:184
 msgid ""
 "Enforces the clients to connect to ownCloud via an encrypted connection."
 msgstr "クライアントからownCloudへの接続を常に暗号化する"
 
-#: templates/admin.php:185
+#: templates/admin.php:187
 msgid ""
 "Please connect to this ownCloud instance via HTTPS to enable or disable the "
 "SSL enforcement."
 msgstr "常にSSL接続を有効／無効にするために、HTTPS経由でこの ownCloud に接続して下さい。"
 
-#: templates/admin.php:195
+#: templates/admin.php:197
 msgid "Log"
 msgstr "ログ"
 
-#: templates/admin.php:196
+#: templates/admin.php:198
 msgid "Log level"
 msgstr "ログレベル"
 
-#: templates/admin.php:227
+#: templates/admin.php:229
 msgid "More"
 msgstr "もっと見る"
 
-#: templates/admin.php:228
+#: templates/admin.php:230
 msgid "Less"
 msgstr "閉じる"
 
-#: templates/admin.php:235 templates/personal.php:116
+#: templates/admin.php:236 templates/personal.php:116
 msgid "Version"
 msgstr "バージョン"
 
-#: templates/admin.php:237 templates/personal.php:119
+#: templates/admin.php:240 templates/personal.php:119
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -389,76 +389,79 @@ msgstr "バグトラッカー"
 msgid "Commercial Support"
 msgstr "コマーシャルサポート"
 
-#: templates/personal.php:9
+#: templates/personal.php:10
 msgid "Get the apps to sync your files"
 msgstr "ファイルを同期するためのアプリを取得"
 
-#: templates/personal.php:20
+#: templates/personal.php:21
 msgid "Show First Run Wizard again"
 msgstr "初回ウィザードを再表示する"
 
-#: templates/personal.php:28
+#: templates/personal.php:29
 #, php-format
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "現在、<strong>%s</strong> / <strong>%s</strong> を利用しています"
 
-#: templates/personal.php:40 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:41 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "パスワード"
 
-#: templates/personal.php:41
+#: templates/personal.php:42
 msgid "Your password was changed"
 msgstr "パスワードを変更しました"
 
-#: templates/personal.php:42
+#: templates/personal.php:43
 msgid "Unable to change your password"
 msgstr "パスワードを変更することができません"
 
-#: templates/personal.php:43
+#: templates/personal.php:44
 msgid "Current password"
 msgstr "Current password"
 
-#: templates/personal.php:45
+#: templates/personal.php:46
 msgid "New password"
 msgstr "新しいパスワードを入力"
 
-#: templates/personal.php:47
+#: templates/personal.php:48
 msgid "Change password"
 msgstr "パスワードを変更"
 
-#: templates/personal.php:59 templates/users.php:85
+#: templates/personal.php:60 templates/users.php:85
 msgid "Display Name"
 msgstr "表示名"
 
-#: templates/personal.php:74
+#: templates/personal.php:75
 msgid "Email"
 msgstr "メール"
 
-#: templates/personal.php:76
+#: templates/personal.php:77
 msgid "Your email address"
 msgstr "あなたのメールアドレス"
 
-#: templates/personal.php:77
+#: templates/personal.php:78
 msgid "Fill in an email address to enable password recovery"
 msgstr "※パスワード回復を有効にするにはメールアドレスの入力が必要です"
 
-#: templates/personal.php:86 templates/personal.php:87
+#: templates/personal.php:87 templates/personal.php:88
 msgid "Language"
 msgstr "言語"
 
-#: templates/personal.php:99
+#: templates/personal.php:100
 msgid "Help translate"
 msgstr "翻訳に協力する"
 
-#: templates/personal.php:105
+#: templates/personal.php:106
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:107
-msgid "Use this address to connect to your ownCloud in your file manager"
-msgstr "ファイルマネージャでownCloudに接続する際はこのアドレスを利用してください"
+#: templates/personal.php:108
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
+"target=\"_blank\">access your Files via WebDAV</a>"
+msgstr "<a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">WebDAV経由でファイルにアクセス</a>するにはこのアドレスを利用してください"
 
-#: templates/users.php:21 templates/users.php:84
+#: templates/users.php:21
 msgid "Login Name"
 msgstr "ログイン名"
 
@@ -488,6 +491,10 @@ msgstr "無制限"
 msgid "Other"
 msgstr "その他"
 
+#: templates/users.php:84
+msgid "Username"
+msgstr "ユーザー名"
+
 #: templates/users.php:91
 msgid "Storage"
 msgstr "ストレージ"
diff --git a/l10n/ja_JP/user_ldap.po b/l10n/ja_JP/user_ldap.po
index dcc68d9c631025c5140f5022e1500d03eab79145..722336d3c8abd5f62c47eac55a1d4e776e4eebdb 100644
--- a/l10n/ja_JP/user_ldap.po
+++ b/l10n/ja_JP/user_ldap.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:25+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:16+0000\n"
 "Last-Translator: Daisuke Deguchi <ddeguchi@nagoya-u.jp>\n"
 "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/ka/core.po b/l10n/ka/core.po
index af6bce82f116151276f3f32d4188b34f2b9bb532..5dea5056dfe9a9a1fc7c88a58a8cb9a0340150e9 100644
--- a/l10n/ka/core.po
+++ b/l10n/ka/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-15 01:59+0200\n"
-"PO-Revision-Date: 2013-06-14 23:59+0000\n"
+"POT-Creation-Date: 2013-07-06 02:02+0200\n"
+"PO-Revision-Date: 2013-07-06 00:02+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Georgian (http://www.transifex.com/projects/p/owncloud/language/ka/)\n"
 "MIME-Version: 1.0\n"
@@ -61,135 +61,135 @@ msgstr ""
 msgid "Error removing %s from favorites."
 msgstr ""
 
-#: js/config.php:34
+#: js/config.php:32
 msgid "Sunday"
 msgstr ""
 
-#: js/config.php:35
+#: js/config.php:33
 msgid "Monday"
 msgstr ""
 
-#: js/config.php:36
+#: js/config.php:34
 msgid "Tuesday"
 msgstr ""
 
-#: js/config.php:37
+#: js/config.php:35
 msgid "Wednesday"
 msgstr ""
 
-#: js/config.php:38
+#: js/config.php:36
 msgid "Thursday"
 msgstr ""
 
-#: js/config.php:39
+#: js/config.php:37
 msgid "Friday"
 msgstr ""
 
-#: js/config.php:40
+#: js/config.php:38
 msgid "Saturday"
 msgstr ""
 
-#: js/config.php:45
+#: js/config.php:43
 msgid "January"
 msgstr ""
 
-#: js/config.php:46
+#: js/config.php:44
 msgid "February"
 msgstr ""
 
-#: js/config.php:47
+#: js/config.php:45
 msgid "March"
 msgstr ""
 
-#: js/config.php:48
+#: js/config.php:46
 msgid "April"
 msgstr ""
 
-#: js/config.php:49
+#: js/config.php:47
 msgid "May"
 msgstr ""
 
-#: js/config.php:50
+#: js/config.php:48
 msgid "June"
 msgstr ""
 
-#: js/config.php:51
+#: js/config.php:49
 msgid "July"
 msgstr ""
 
-#: js/config.php:52
+#: js/config.php:50
 msgid "August"
 msgstr ""
 
-#: js/config.php:53
+#: js/config.php:51
 msgid "September"
 msgstr ""
 
-#: js/config.php:54
+#: js/config.php:52
 msgid "October"
 msgstr ""
 
-#: js/config.php:55
+#: js/config.php:53
 msgid "November"
 msgstr ""
 
-#: js/config.php:56
+#: js/config.php:54
 msgid "December"
 msgstr ""
 
-#: js/js.js:286
+#: js/js.js:289
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:718
+#: js/js.js:721
 msgid "seconds ago"
 msgstr "წამის წინ"
 
-#: js/js.js:719
+#: js/js.js:722
 msgid "1 minute ago"
 msgstr "1 წუთის წინ"
 
-#: js/js.js:720
+#: js/js.js:723
 msgid "{minutes} minutes ago"
 msgstr ""
 
-#: js/js.js:721
+#: js/js.js:724
 msgid "1 hour ago"
 msgstr "1 საათის წინ"
 
-#: js/js.js:722
+#: js/js.js:725
 msgid "{hours} hours ago"
 msgstr ""
 
-#: js/js.js:723
+#: js/js.js:726
 msgid "today"
 msgstr "დღეს"
 
-#: js/js.js:724
+#: js/js.js:727
 msgid "yesterday"
 msgstr "გუშინ"
 
-#: js/js.js:725
+#: js/js.js:728
 msgid "{days} days ago"
 msgstr ""
 
-#: js/js.js:726
+#: js/js.js:729
 msgid "last month"
 msgstr ""
 
-#: js/js.js:727
+#: js/js.js:730
 msgid "{months} months ago"
 msgstr ""
 
-#: js/js.js:728
+#: js/js.js:731
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:729
+#: js/js.js:732
 msgid "last year"
 msgstr ""
 
-#: js/js.js:730
+#: js/js.js:733
 msgid "years ago"
 msgstr ""
 
@@ -225,8 +225,8 @@ msgstr ""
 #: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
 #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:577
-#: js/share.js:589
+#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:620
+#: js/share.js:632
 msgid "Error"
 msgstr ""
 
@@ -246,7 +246,7 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: js/share.js:125 js/share.js:617
+#: js/share.js:125 js/share.js:660
 msgid "Error while sharing"
 msgstr ""
 
@@ -266,99 +266,103 @@ msgstr ""
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:159
+#: js/share.js:172
 msgid "Share with"
 msgstr ""
 
-#: js/share.js:164
+#: js/share.js:177
 msgid "Share with link"
 msgstr ""
 
-#: js/share.js:167
+#: js/share.js:180
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:169 templates/installation.php:54 templates/login.php:26
+#: js/share.js:182 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "პაროლი"
 
-#: js/share.js:173
+#: js/share.js:187
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:191
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:174
+#: js/share.js:192
 msgid "Send"
 msgstr ""
 
-#: js/share.js:178
+#: js/share.js:197
 msgid "Set expiration date"
 msgstr ""
 
-#: js/share.js:179
+#: js/share.js:198
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:211
+#: js/share.js:230
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:213
+#: js/share.js:232
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:251
+#: js/share.js:270
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:287
+#: js/share.js:306
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:308
+#: js/share.js:327
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:320
+#: js/share.js:339
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:322
+#: js/share.js:341
 msgid "access control"
 msgstr ""
 
-#: js/share.js:325
+#: js/share.js:344
 msgid "create"
 msgstr ""
 
-#: js/share.js:328
+#: js/share.js:347
 msgid "update"
 msgstr ""
 
-#: js/share.js:331
+#: js/share.js:350
 msgid "delete"
 msgstr ""
 
-#: js/share.js:334
+#: js/share.js:353
 msgid "share"
 msgstr ""
 
-#: js/share.js:368 js/share.js:564
+#: js/share.js:387 js/share.js:607
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:577
+#: js/share.js:620
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:589
+#: js/share.js:632
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:604
+#: js/share.js:647
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:615
+#: js/share.js:658
 msgid "Email sent"
 msgstr ""
 
@@ -373,7 +377,7 @@ msgstr ""
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
-#: lostpassword/controller.php:58
+#: lostpassword/controller.php:60
 msgid "ownCloud password reset"
 msgstr ""
 
@@ -403,17 +407,17 @@ msgstr ""
 
 #: lostpassword/templates/lostpassword.php:22
 msgid ""
-"Your files seems to be encrypted. If you didn't have enabled the recovery "
-"key there will be no way to get your data back once the password was "
-"resetted. If you are not sure what to do, please contact your administrator "
-"first before continue. Do you really want to continue?"
+"Your files are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
 msgstr ""
 
 #: lostpassword/templates/lostpassword.php:24
 msgid "Yes, I really want to reset my password now"
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:29
+#: lostpassword/templates/lostpassword.php:27
 msgid "Request reset"
 msgstr ""
 
@@ -461,7 +465,7 @@ msgstr ""
 msgid "Cloud not found"
 msgstr ""
 
-#: templates/altmail.php:2
+#: templates/altmail.php:4
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -472,10 +476,6 @@ msgid ""
 "Cheers!"
 msgstr ""
 
-#: templates/altmail.php:7 templates/mail.php:24
-msgid "web services under your control"
-msgstr ""
-
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
 msgstr ""
@@ -568,12 +568,12 @@ msgstr ""
 msgid "Finish setup"
 msgstr ""
 
-#: templates/layout.user.php:40
+#: templates/layout.user.php:43
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:67
+#: templates/layout.user.php:68
 msgid "Log out"
 msgstr ""
 
@@ -607,7 +607,7 @@ msgstr ""
 msgid "Alternative Logins"
 msgstr ""
 
-#: templates/mail.php:15
+#: templates/mail.php:16
 #, php-format
 msgid ""
 "Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
diff --git a/l10n/ka/files.po b/l10n/ka/files.po
index bc3ec2a2a2af76e8950e00fa39b3c4cc72d16589..9145eb34e618939e3c4c4d139d527d3ea03ba1eb 100644
--- a/l10n/ka/files.po
+++ b/l10n/ka/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:01+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Georgian (http://www.transifex.com/projects/p/owncloud/language/ka/)\n"
 "MIME-Version: 1.0\n"
@@ -27,46 +27,54 @@ msgstr ""
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/upload.php:19
+#: ajax/upload.php:16 ajax/upload.php:45
+msgid "Unable to set upload directory."
+msgstr ""
+
+#: ajax/upload.php:22
+msgid "Invalid Token"
+msgstr ""
+
+#: ajax/upload.php:59
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: ajax/upload.php:26
+#: ajax/upload.php:66
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/upload.php:27
+#: ajax/upload.php:67
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:29
+#: ajax/upload.php:69
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/upload.php:30
+#: ajax/upload.php:70
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/upload.php:31
+#: ajax/upload.php:71
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/upload.php:32
+#: ajax/upload.php:72
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/upload.php:33
+#: ajax/upload.php:73
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:51
+#: ajax/upload.php:91
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:83
+#: ajax/upload.php:123
 msgid "Invalid directory."
 msgstr ""
 
@@ -74,6 +82,36 @@ msgstr ""
 msgid "Files"
 msgstr "ფაილები"
 
+#: js/file-upload.js:11
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/file-upload.js:24
+msgid "Not enough space available"
+msgstr ""
+
+#: js/file-upload.js:64
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/file-upload.js:167 js/files.js:266
+msgid ""
+"File upload is in progress. Leaving the page now will cancel the upload."
+msgstr ""
+
+#: js/file-upload.js:233 js/files.js:339
+msgid "URL cannot be empty."
+msgstr ""
+
+#: js/file-upload.js:238 lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr ""
+
+#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
+#: js/files.js:693 js/files.js:731
+msgid "Error"
+msgstr ""
+
 #: js/fileactions.js:116
 msgid "Share"
 msgstr ""
@@ -90,43 +128,43 @@ msgstr ""
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:464
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:259
+#: js/filelist.js:302
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:306
+#: js/filelist.js:349
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:306
+#: js/filelist.js:349
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:331
+#: js/filelist.js:374
 msgid "perform delete operation"
 msgstr ""
 
-#: js/filelist.js:413
+#: js/filelist.js:456
 msgid "1 file uploading"
 msgstr ""
 
-#: js/filelist.js:416 js/filelist.js:470
+#: js/filelist.js:459 js/filelist.js:517
 msgid "files uploading"
 msgstr ""
 
@@ -158,69 +196,41 @@ msgid ""
 "big."
 msgstr ""
 
-#: js/files.js:264
-msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr ""
-
-#: js/files.js:277
-msgid "Not enough space available"
-msgstr ""
-
-#: js/files.js:317
-msgid "Upload cancelled."
-msgstr ""
-
-#: js/files.js:413
-msgid ""
-"File upload is in progress. Leaving the page now will cancel the upload."
-msgstr ""
-
-#: js/files.js:486
-msgid "URL cannot be empty."
-msgstr ""
-
-#: js/files.js:491
+#: js/files.js:344
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
-msgid "Error"
-msgstr ""
-
-#: js/files.js:877 templates/index.php:69
+#: js/files.js:744 templates/index.php:69
 msgid "Name"
 msgstr ""
 
-#: js/files.js:878 templates/index.php:80
+#: js/files.js:745 templates/index.php:80
 msgid "Size"
 msgstr ""
 
-#: js/files.js:879 templates/index.php:82
+#: js/files.js:746 templates/index.php:82
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:898
+#: js/files.js:765
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:900
+#: js/files.js:767
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:908
+#: js/files.js:775
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:910
+#: js/files.js:777
 msgid "{count} files"
 msgstr ""
 
-#: lib/app.php:53
-msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
-msgstr ""
-
 #: lib/app.php:73
-msgid "Unable to rename file"
+#, php-format
+msgid "%s could not be renamed"
 msgstr ""
 
 #: lib/helper.php:11 templates/index.php:18
@@ -317,6 +327,22 @@ msgstr ""
 msgid "Current scanning"
 msgstr ""
 
+#: templates/part.list.php:76
+msgid "directory"
+msgstr ""
+
+#: templates/part.list.php:78
+msgid "directories"
+msgstr ""
+
+#: templates/part.list.php:87
+msgid "file"
+msgstr ""
+
+#: templates/part.list.php:89
+msgid "files"
+msgstr ""
+
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
 msgstr ""
diff --git a/l10n/ka/files_encryption.po b/l10n/ka/files_encryption.po
index a269ba75c044aa72f2f35657af0e2530fccfcb65..30ae56a19d1cafeb6b574c886edc83eaca6c6171 100644
--- a/l10n/ka/files_encryption.po
+++ b/l10n/ka/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-14 02:46+0200\n"
-"PO-Revision-Date: 2013-06-14 00:47+0000\n"
+"POT-Creation-Date: 2013-07-05 02:12+0200\n"
+"PO-Revision-Date: 2013-07-05 00:13+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Georgian (http://www.transifex.com/projects/p/owncloud/language/ka/)\n"
 "MIME-Version: 1.0\n"
@@ -55,9 +55,21 @@ msgstr ""
 
 #: files/error.php:7
 msgid ""
-"Your private key is not valid! Maybe your password was changed from outside."
-" You can update your private key password in your personal settings to "
-"regain access to your files"
+"Your private key is not valid! Likely your password was changed outside the "
+"ownCloud system (e.g. your corporate directory). You can update your private"
+" key password in your personal settings to recover access to your encrypted "
+"files."
+msgstr ""
+
+#: hooks/hooks.php:44
+msgid "Missing requirements."
+msgstr ""
+
+#: hooks/hooks.php:45
+msgid ""
+"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL "
+"PHP extension is enabled and configured properly. For now, the encryption "
+"app has been disabled."
 msgstr ""
 
 #: js/settings-admin.js:11
@@ -84,11 +96,11 @@ msgstr ""
 
 #: templates/settings-admin.php:10
 msgid ""
-"Enable encryption passwords recovery key (allow sharing to recovery key):"
+"Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
 #: templates/settings-admin.php:14
-msgid "Recovery account password"
+msgid "Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:21 templates/settings-personal.php:54
@@ -100,15 +112,15 @@ msgid "Disabled"
 msgstr ""
 
 #: templates/settings-admin.php:34
-msgid "Change encryption passwords recovery key:"
+msgid "Change recovery key password:"
 msgstr ""
 
 #: templates/settings-admin.php:41
-msgid "Old Recovery account password"
+msgid "Old Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:48
-msgid "New Recovery account password"
+msgid "New Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:53
diff --git a/l10n/ka/files_sharing.po b/l10n/ka/files_sharing.po
index 1016eaeda810825733db61623408da5f6897df25..177bc807388e9893ecb6eed1e544fcf691a08e2a 100644
--- a/l10n/ka/files_sharing.po
+++ b/l10n/ka/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Georgian (http://www.transifex.com/projects/p/owncloud/language/ka/)\n"
 "MIME-Version: 1.0\n"
@@ -18,27 +18,39 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: templates/authenticate.php:4
+msgid "The password is wrong. Try again."
+msgstr ""
+
+#: templates/authenticate.php:7
 msgid "Password"
 msgstr "პაროლი"
 
-#: templates/authenticate.php:6
+#: templates/authenticate.php:9
 msgid "Submit"
 msgstr ""
 
-#: templates/public.php:10
+#: templates/public.php:17
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr ""
 
-#: templates/public.php:13
+#: templates/public.php:20
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr ""
 
-#: templates/public.php:19 templates/public.php:43
+#: templates/public.php:28 templates/public.php:90
 msgid "Download"
 msgstr "გადმოწერა"
 
-#: templates/public.php:40
+#: templates/public.php:45 templates/public.php:48
+msgid "Upload"
+msgstr ""
+
+#: templates/public.php:58
+msgid "Cancel upload"
+msgstr ""
+
+#: templates/public.php:87
 msgid "No preview available for"
 msgstr ""
diff --git a/l10n/ka/lib.po b/l10n/ka/lib.po
index 9974f858cf014572d65f7ec6f0b160546d88cf61..4fa2845d636b6955712978c523920de0d5077e31 100644
--- a/l10n/ka/lib.po
+++ b/l10n/ka/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-25 02:02+0200\n"
-"PO-Revision-Date: 2013-05-24 13:27+0000\n"
+"POT-Creation-Date: 2013-07-05 02:13+0200\n"
+"PO-Revision-Date: 2013-07-05 00:13+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Georgian (http://www.transifex.com/projects/p/owncloud/language/ka/)\n"
 "MIME-Version: 1.0\n"
@@ -17,47 +17,51 @@ msgstr ""
 "Language: ka\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: app.php:357
+#: app.php:360
 msgid "Help"
 msgstr "შველა"
 
-#: app.php:370
+#: app.php:373
 msgid "Personal"
 msgstr "პერსონა"
 
-#: app.php:381
+#: app.php:384
 msgid "Settings"
 msgstr ""
 
-#: app.php:393
+#: app.php:396
 msgid "Users"
 msgstr "მომხმარებლები"
 
-#: app.php:406
+#: app.php:409
 msgid "Apps"
 msgstr ""
 
-#: app.php:414
+#: app.php:417
 msgid "Admin"
 msgstr "ადმინისტრატორი"
 
-#: files.php:207
+#: defaults.php:33
+msgid "web services under your control"
+msgstr ""
+
+#: files.php:210
 msgid "ZIP download is turned off."
 msgstr "ZIP გადმოწერა გამორთულია"
 
-#: files.php:208
+#: files.php:211
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:209 files.php:242
+#: files.php:212 files.php:245
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:239
+#: files.php:242
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
-#: helper.php:228
+#: helper.php:236
 msgid "couldn't be determined"
 msgstr ""
 
@@ -85,104 +89,102 @@ msgstr ""
 msgid "Images"
 msgstr ""
 
-#: setup.php:34
-msgid "Set an admin username."
-msgstr ""
-
-#: setup.php:37
-msgid "Set an admin password."
-msgstr ""
-
-#: setup.php:55
+#: setup/abstractdatabase.php:22
 #, php-format
 msgid "%s enter the database username."
 msgstr ""
 
-#: setup.php:58
+#: setup/abstractdatabase.php:25
 #, php-format
 msgid "%s enter the database name."
 msgstr ""
 
-#: setup.php:61
+#: setup/abstractdatabase.php:28
 #, php-format
 msgid "%s you may not use dots in the database name"
 msgstr ""
 
-#: setup.php:64
+#: setup/mssql.php:20
 #, php-format
-msgid "%s set the database host."
-msgstr ""
-
-#: setup.php:132 setup.php:329 setup.php:374
-msgid "PostgreSQL username and/or password not valid"
+msgid "MS SQL username and/or password not valid: %s"
 msgstr ""
 
-#: setup.php:133 setup.php:238
+#: setup/mssql.php:21 setup/mysql.php:13 setup/oci.php:114
+#: setup/postgresql.php:24 setup/postgresql.php:70
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:155
-msgid "Oracle connection could not be established"
-msgstr ""
-
-#: setup.php:237
+#: setup/mysql.php:12
 msgid "MySQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
-#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
-#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
-#: setup.php:623
+#: setup/mysql.php:67 setup/oci.php:54 setup/oci.php:121 setup/oci.php:147
+#: setup/oci.php:154 setup/oci.php:165 setup/oci.php:172 setup/oci.php:181
+#: setup/oci.php:189 setup/oci.php:198 setup/oci.php:204
+#: setup/postgresql.php:89 setup/postgresql.php:98 setup/postgresql.php:115
+#: setup/postgresql.php:125 setup/postgresql.php:134
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr ""
 
-#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
-#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
-#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
+#: setup/mysql.php:68 setup/oci.php:55 setup/oci.php:122 setup/oci.php:148
+#: setup/oci.php:155 setup/oci.php:166 setup/oci.php:182 setup/oci.php:190
+#: setup/oci.php:199 setup/postgresql.php:90 setup/postgresql.php:99
+#: setup/postgresql.php:116 setup/postgresql.php:126 setup/postgresql.php:135
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:308
+#: setup/mysql.php:85
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:309
+#: setup/mysql.php:86
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:314
+#: setup/mysql.php:91
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:315
+#: setup/mysql.php:92
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:466 setup.php:533
+#: setup/oci.php:34
+msgid "Oracle connection could not be established"
+msgstr ""
+
+#: setup/oci.php:41 setup/oci.php:113
 msgid "Oracle username and/or password not valid"
 msgstr ""
 
-#: setup.php:592 setup.php:624
+#: setup/oci.php:173 setup/oci.php:205
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:644
-#, php-format
-msgid "MS SQL username and/or password not valid: %s"
+#: setup/postgresql.php:23 setup/postgresql.php:69
+msgid "PostgreSQL username and/or password not valid"
+msgstr ""
+
+#: setup.php:42
+msgid "Set an admin username."
+msgstr ""
+
+#: setup.php:45
+msgid "Set an admin password."
 msgstr ""
 
-#: setup.php:867
+#: setup.php:198
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:868
+#: setup.php:199
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
diff --git a/l10n/ka/settings.po b/l10n/ka/settings.po
index 6c4f017b65e178ae20b4a84389548893f4330905..59b8b61428f6479e0594969922b181eb2522b948 100644
--- a/l10n/ka/settings.po
+++ b/l10n/ka/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-11 01:57+0200\n"
-"PO-Revision-Date: 2013-06-10 23:57+0000\n"
+"POT-Creation-Date: 2013-07-09 02:04+0200\n"
+"PO-Revision-Date: 2013-07-09 00:04+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Georgian (http://www.transifex.com/projects/p/owncloud/language/ka/)\n"
 "MIME-Version: 1.0\n"
@@ -58,7 +58,7 @@ msgstr ""
 msgid "Unable to delete group"
 msgstr ""
 
-#: ajax/removeuser.php:24
+#: ajax/removeuser.php:25
 msgid "Unable to delete user"
 msgstr ""
 
@@ -88,35 +88,35 @@ msgstr ""
 msgid "Couldn't update app."
 msgstr ""
 
-#: js/apps.js:30
+#: js/apps.js:35
 msgid "Update to {appversion}"
 msgstr ""
 
-#: js/apps.js:36 js/apps.js:76
+#: js/apps.js:41 js/apps.js:81
 msgid "Disable"
 msgstr ""
 
-#: js/apps.js:36 js/apps.js:64 js/apps.js:83
+#: js/apps.js:41 js/apps.js:69 js/apps.js:88
 msgid "Enable"
 msgstr ""
 
-#: js/apps.js:55
+#: js/apps.js:60
 msgid "Please wait...."
 msgstr ""
 
-#: js/apps.js:59 js/apps.js:71 js/apps.js:80 js/apps.js:93
+#: js/apps.js:64 js/apps.js:76 js/apps.js:85 js/apps.js:98
 msgid "Error"
 msgstr ""
 
-#: js/apps.js:90
+#: js/apps.js:95
 msgid "Updating...."
 msgstr ""
 
-#: js/apps.js:93
+#: js/apps.js:98
 msgid "Error while updating app"
 msgstr ""
 
-#: js/apps.js:96
+#: js/apps.js:101
 msgid "Updated"
 msgstr ""
 
@@ -165,15 +165,15 @@ msgstr ""
 msgid "A valid password must be provided"
 msgstr ""
 
-#: personal.php:35 personal.php:36
+#: personal.php:37 personal.php:38
 msgid "__language_name__"
 msgstr ""
 
-#: templates/admin.php:15
+#: templates/admin.php:17
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:18
+#: templates/admin.php:20
 msgid ""
 "Your data directory and your files are probably accessible from the "
 "internet. The .htaccess file that ownCloud provides is not working. We "
@@ -182,36 +182,36 @@ msgid ""
 " webserver document root."
 msgstr ""
 
-#: templates/admin.php:29
+#: templates/admin.php:31
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:32
+#: templates/admin.php:34
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: templates/admin.php:33
+#: templates/admin.php:35
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:44
+#: templates/admin.php:46
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:47
+#: templates/admin.php:49
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr ""
 
-#: templates/admin.php:58
+#: templates/admin.php:60
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:63
+#: templates/admin.php:65
 #, php-format
 msgid ""
 "This ownCloud server can't set system locale to %s. This means that there "
@@ -219,11 +219,11 @@ msgid ""
 " to install the required packages on your system to support %s."
 msgstr ""
 
-#: templates/admin.php:75
+#: templates/admin.php:77
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:78
+#: templates/admin.php:80
 msgid ""
 "This ownCloud server has no working internet connection. This means that "
 "some of the features like mounting of external storage, notifications about "
@@ -233,102 +233,102 @@ msgid ""
 " of ownCloud."
 msgstr ""
 
-#: templates/admin.php:92
+#: templates/admin.php:94
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:101
+#: templates/admin.php:103
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:111
+#: templates/admin.php:113
 msgid ""
 "cron.php is registered at a webcron service. Call the cron.php page in the "
 "owncloud root once a minute over http."
 msgstr ""
 
-#: templates/admin.php:121
+#: templates/admin.php:123
 msgid ""
 "Use systems cron service. Call the cron.php file in the owncloud folder via "
 "a system cronjob once a minute."
 msgstr ""
 
-#: templates/admin.php:128
+#: templates/admin.php:130
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:134
+#: templates/admin.php:136
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:135
+#: templates/admin.php:137
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:142
+#: templates/admin.php:144
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:143
+#: templates/admin.php:145
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:150
+#: templates/admin.php:152
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:151
+#: templates/admin.php:153
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:158
+#: templates/admin.php:160
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:161
+#: templates/admin.php:163
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:168
+#: templates/admin.php:170
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:181
+#: templates/admin.php:183
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:182
+#: templates/admin.php:184
 msgid ""
 "Enforces the clients to connect to ownCloud via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:185
+#: templates/admin.php:187
 msgid ""
 "Please connect to this ownCloud instance via HTTPS to enable or disable the "
 "SSL enforcement."
 msgstr ""
 
-#: templates/admin.php:195
+#: templates/admin.php:197
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:196
+#: templates/admin.php:198
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:227
+#: templates/admin.php:229
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:228
+#: templates/admin.php:230
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:235 templates/personal.php:111
+#: templates/admin.php:236 templates/personal.php:116
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:237 templates/personal.php:114
+#: templates/admin.php:240 templates/personal.php:119
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -338,27 +338,27 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr ""
 
-#: templates/apps.php:11
+#: templates/apps.php:13
 msgid "Add your App"
 msgstr ""
 
-#: templates/apps.php:12
+#: templates/apps.php:28
 msgid "More Apps"
 msgstr ""
 
-#: templates/apps.php:28
+#: templates/apps.php:33
 msgid "Select an App"
 msgstr ""
 
-#: templates/apps.php:34
+#: templates/apps.php:39
 msgid "See application page at apps.owncloud.com"
 msgstr ""
 
-#: templates/apps.php:36
+#: templates/apps.php:41
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr ""
 
-#: templates/apps.php:38
+#: templates/apps.php:43
 msgid "Update"
 msgstr ""
 
@@ -386,76 +386,79 @@ msgstr ""
 msgid "Commercial Support"
 msgstr ""
 
-#: templates/personal.php:8
-#, php-format
-msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
-msgstr ""
-
-#: templates/personal.php:15
+#: templates/personal.php:10
 msgid "Get the apps to sync your files"
 msgstr ""
 
-#: templates/personal.php:26
+#: templates/personal.php:21
 msgid "Show First Run Wizard again"
 msgstr ""
 
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:29
+#, php-format
+msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
+msgstr ""
+
+#: templates/personal.php:41 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "პაროლი"
 
-#: templates/personal.php:38
+#: templates/personal.php:42
 msgid "Your password was changed"
 msgstr ""
 
-#: templates/personal.php:39
+#: templates/personal.php:43
 msgid "Unable to change your password"
 msgstr ""
 
-#: templates/personal.php:40
+#: templates/personal.php:44
 msgid "Current password"
 msgstr ""
 
-#: templates/personal.php:42
+#: templates/personal.php:46
 msgid "New password"
 msgstr ""
 
-#: templates/personal.php:44
+#: templates/personal.php:48
 msgid "Change password"
 msgstr ""
 
-#: templates/personal.php:56 templates/users.php:85
+#: templates/personal.php:60 templates/users.php:85
 msgid "Display Name"
 msgstr ""
 
-#: templates/personal.php:71
+#: templates/personal.php:75
 msgid "Email"
 msgstr ""
 
-#: templates/personal.php:73
+#: templates/personal.php:77
 msgid "Your email address"
 msgstr ""
 
-#: templates/personal.php:74
+#: templates/personal.php:78
 msgid "Fill in an email address to enable password recovery"
 msgstr ""
 
-#: templates/personal.php:83 templates/personal.php:84
+#: templates/personal.php:87 templates/personal.php:88
 msgid "Language"
 msgstr ""
 
-#: templates/personal.php:95
+#: templates/personal.php:100
 msgid "Help translate"
 msgstr ""
 
-#: templates/personal.php:100
+#: templates/personal.php:106
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:102
-msgid "Use this address to connect to your ownCloud in your file manager"
+#: templates/personal.php:108
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
+"target=\"_blank\">access your Files via WebDAV</a>"
 msgstr ""
 
-#: templates/users.php:21 templates/users.php:84
+#: templates/users.php:21
 msgid "Login Name"
 msgstr ""
 
@@ -485,6 +488,10 @@ msgstr ""
 msgid "Other"
 msgstr ""
 
+#: templates/users.php:84
+msgid "Username"
+msgstr ""
+
 #: templates/users.php:91
 msgid "Storage"
 msgstr ""
diff --git a/l10n/ka/user_ldap.po b/l10n/ka/user_ldap.po
index d171be00d72574fee1306d1634c3db2b8547a5c4..43c61e51c4cbc8e7a55a2543c9934934d770c7af 100644
--- a/l10n/ka/user_ldap.po
+++ b/l10n/ka/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-25 02:01+0200\n"
-"PO-Revision-Date: 2013-05-24 13:28+0000\n"
+"POT-Creation-Date: 2013-06-23 01:59+0200\n"
+"PO-Revision-Date: 2013-06-22 10:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Georgian (http://www.transifex.com/projects/p/owncloud/language/ka/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/ka_GE/core.po b/l10n/ka_GE/core.po
index eb6dbd1c21f4a184f33c9cc58d4594e30409ec7d..56ab6ae9cd788f32797971128e0d7d587051dbdf 100644
--- a/l10n/ka_GE/core.po
+++ b/l10n/ka_GE/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
 "MIME-Version: 1.0\n"
@@ -61,135 +61,135 @@ msgstr "სარედაქტირებელი კატეგორი
 msgid "Error removing %s from favorites."
 msgstr "შეცდომა  %s–ის ფევორიტებიდან წაშლის დროს."
 
-#: js/config.php:34
+#: js/config.php:32
 msgid "Sunday"
 msgstr "კვირა"
 
-#: js/config.php:35
+#: js/config.php:33
 msgid "Monday"
 msgstr "ორშაბათი"
 
-#: js/config.php:36
+#: js/config.php:34
 msgid "Tuesday"
 msgstr "სამშაბათი"
 
-#: js/config.php:37
+#: js/config.php:35
 msgid "Wednesday"
 msgstr "ოთხშაბათი"
 
-#: js/config.php:38
+#: js/config.php:36
 msgid "Thursday"
 msgstr "ხუთშაბათი"
 
-#: js/config.php:39
+#: js/config.php:37
 msgid "Friday"
 msgstr "პარასკევი"
 
-#: js/config.php:40
+#: js/config.php:38
 msgid "Saturday"
 msgstr "შაბათი"
 
-#: js/config.php:45
+#: js/config.php:43
 msgid "January"
 msgstr "იანვარი"
 
-#: js/config.php:46
+#: js/config.php:44
 msgid "February"
 msgstr "თებერვალი"
 
-#: js/config.php:47
+#: js/config.php:45
 msgid "March"
 msgstr "მარტი"
 
-#: js/config.php:48
+#: js/config.php:46
 msgid "April"
 msgstr "აპრილი"
 
-#: js/config.php:49
+#: js/config.php:47
 msgid "May"
 msgstr "მაისი"
 
-#: js/config.php:50
+#: js/config.php:48
 msgid "June"
 msgstr "ივნისი"
 
-#: js/config.php:51
+#: js/config.php:49
 msgid "July"
 msgstr "ივლისი"
 
-#: js/config.php:52
+#: js/config.php:50
 msgid "August"
 msgstr "აგვისტო"
 
-#: js/config.php:53
+#: js/config.php:51
 msgid "September"
 msgstr "სექტემბერი"
 
-#: js/config.php:54
+#: js/config.php:52
 msgid "October"
 msgstr "ოქტომბერი"
 
-#: js/config.php:55
+#: js/config.php:53
 msgid "November"
 msgstr "ნოემბერი"
 
-#: js/config.php:56
+#: js/config.php:54
 msgid "December"
 msgstr "დეკემბერი"
 
-#: js/js.js:286
+#: js/js.js:293
 msgid "Settings"
 msgstr "პარამეტრები"
 
-#: js/js.js:718
+#: js/js.js:725
 msgid "seconds ago"
 msgstr "წამის წინ"
 
-#: js/js.js:719
+#: js/js.js:726
 msgid "1 minute ago"
 msgstr "1 წუთის წინ"
 
-#: js/js.js:720
+#: js/js.js:727
 msgid "{minutes} minutes ago"
 msgstr "{minutes} წუთის წინ"
 
-#: js/js.js:721
+#: js/js.js:728
 msgid "1 hour ago"
 msgstr "1 საათის წინ"
 
-#: js/js.js:722
+#: js/js.js:729
 msgid "{hours} hours ago"
 msgstr "{hours} საათის წინ"
 
-#: js/js.js:723
+#: js/js.js:730
 msgid "today"
 msgstr "დღეს"
 
-#: js/js.js:724
+#: js/js.js:731
 msgid "yesterday"
 msgstr "გუშინ"
 
-#: js/js.js:725
+#: js/js.js:732
 msgid "{days} days ago"
 msgstr "{days} დღის წინ"
 
-#: js/js.js:726
+#: js/js.js:733
 msgid "last month"
 msgstr "გასულ თვეში"
 
-#: js/js.js:727
+#: js/js.js:734
 msgid "{months} months ago"
 msgstr "{months} თვის წინ"
 
-#: js/js.js:728
+#: js/js.js:735
 msgid "months ago"
 msgstr "თვის წინ"
 
-#: js/js.js:729
+#: js/js.js:736
 msgid "last year"
 msgstr "ბოლო წელს"
 
-#: js/js.js:730
+#: js/js.js:737
 msgid "years ago"
 msgstr "წლის წინ"
 
@@ -225,8 +225,8 @@ msgstr "ობიექტის ტიპი არ არის მითი
 #: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
 #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:577
-#: js/share.js:589
+#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:620
+#: js/share.js:632
 msgid "Error"
 msgstr "შეცდომა"
 
@@ -246,7 +246,7 @@ msgstr "გაზიარებული"
 msgid "Share"
 msgstr "გაზიარება"
 
-#: js/share.js:125 js/share.js:617
+#: js/share.js:125 js/share.js:660
 msgid "Error while sharing"
 msgstr "შეცდომა გაზიარების დროს"
 
@@ -266,99 +266,103 @@ msgstr "გაზიარდა თქვენთვის და ჯგუფ
 msgid "Shared with you by {owner}"
 msgstr "გაზიარდა თქვენთვის {owner}–ის მიერ"
 
-#: js/share.js:159
+#: js/share.js:172
 msgid "Share with"
 msgstr "გააზიარე შემდეგით:"
 
-#: js/share.js:164
+#: js/share.js:177
 msgid "Share with link"
 msgstr "გაუზიარე ლინკით"
 
-#: js/share.js:167
+#: js/share.js:180
 msgid "Password protect"
 msgstr "პაროლით დაცვა"
 
-#: js/share.js:169 templates/installation.php:54 templates/login.php:26
+#: js/share.js:182 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "პაროლი"
 
-#: js/share.js:173
+#: js/share.js:187
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:191
 msgid "Email link to person"
 msgstr "ლინკის პიროვნების იმეილზე გაგზავნა"
 
-#: js/share.js:174
+#: js/share.js:192
 msgid "Send"
 msgstr "გაგზავნა"
 
-#: js/share.js:178
+#: js/share.js:197
 msgid "Set expiration date"
 msgstr "მიუთითე ვადის გასვლის დრო"
 
-#: js/share.js:179
+#: js/share.js:198
 msgid "Expiration date"
 msgstr "ვადის გასვლის დრო"
 
-#: js/share.js:211
+#: js/share.js:230
 msgid "Share via email:"
 msgstr "გააზიარე მეილზე"
 
-#: js/share.js:213
+#: js/share.js:232
 msgid "No people found"
 msgstr "მომხმარებელი არ არის ნაპოვნი"
 
-#: js/share.js:251
+#: js/share.js:270
 msgid "Resharing is not allowed"
 msgstr "მეორეჯერ გაზიარება არ არის დაშვებული"
 
-#: js/share.js:287
+#: js/share.js:306
 msgid "Shared in {item} with {user}"
 msgstr "გაზიარდა {item}–ში  {user}–ის მიერ"
 
-#: js/share.js:308
+#: js/share.js:327
 msgid "Unshare"
 msgstr "გაუზიარებადი"
 
-#: js/share.js:320
+#: js/share.js:339
 msgid "can edit"
 msgstr "შეგიძლია შეცვლა"
 
-#: js/share.js:322
+#: js/share.js:341
 msgid "access control"
 msgstr "დაშვების კონტროლი"
 
-#: js/share.js:325
+#: js/share.js:344
 msgid "create"
 msgstr "შექმნა"
 
-#: js/share.js:328
+#: js/share.js:347
 msgid "update"
 msgstr "განახლება"
 
-#: js/share.js:331
+#: js/share.js:350
 msgid "delete"
 msgstr "წაშლა"
 
-#: js/share.js:334
+#: js/share.js:353
 msgid "share"
 msgstr "გაზიარება"
 
-#: js/share.js:368 js/share.js:564
+#: js/share.js:387 js/share.js:607
 msgid "Password protected"
 msgstr "პაროლით დაცული"
 
-#: js/share.js:577
+#: js/share.js:620
 msgid "Error unsetting expiration date"
 msgstr "შეცდომა ვადის გასვლის მოხსნის დროს"
 
-#: js/share.js:589
+#: js/share.js:632
 msgid "Error setting expiration date"
 msgstr "შეცდომა ვადის გასვლის მითითების დროს"
 
-#: js/share.js:604
+#: js/share.js:647
 msgid "Sending ..."
 msgstr "გაგზავნა ...."
 
-#: js/share.js:615
+#: js/share.js:658
 msgid "Email sent"
 msgstr "იმეილი გაიგზავნა"
 
@@ -373,7 +377,7 @@ msgstr "განახლება ვერ განხორციელდ
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "განახლება ვერ განხორციელდა. გადამისამართება თქვენს ownCloud–ზე."
 
-#: lostpassword/controller.php:58
+#: lostpassword/controller.php:60
 msgid "ownCloud password reset"
 msgstr "ownCloud პაროლის შეცვლა"
 
@@ -403,17 +407,17 @@ msgstr "მომხმარებლის სახელი"
 
 #: lostpassword/templates/lostpassword.php:22
 msgid ""
-"Your files seems to be encrypted. If you didn't have enabled the recovery "
-"key there will be no way to get your data back once the password was "
-"resetted. If you are not sure what to do, please contact your administrator "
-"first before continue. Do you really want to continue?"
+"Your files are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
 msgstr ""
 
 #: lostpassword/templates/lostpassword.php:24
 msgid "Yes, I really want to reset my password now"
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:29
+#: lostpassword/templates/lostpassword.php:27
 msgid "Request reset"
 msgstr "პაროლის შეცვლის მოთხოვნა"
 
@@ -461,7 +465,7 @@ msgstr "წვდომა აკრძალულია"
 msgid "Cloud not found"
 msgstr "ღრუბელი არ არსებობს"
 
-#: templates/altmail.php:2
+#: templates/altmail.php:4
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -472,10 +476,6 @@ msgid ""
 "Cheers!"
 msgstr ""
 
-#: templates/altmail.php:7 templates/mail.php:24
-msgid "web services under your control"
-msgstr "web services under your control"
-
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
 msgstr "კატეგორიების რედაქტირება"
@@ -568,12 +568,12 @@ msgstr "მონაცემთა ბაზის ჰოსტი"
 msgid "Finish setup"
 msgstr "კონფიგურაციის დასრულება"
 
-#: templates/layout.user.php:40
+#: templates/layout.user.php:43
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:67
+#: templates/layout.user.php:68
 msgid "Log out"
 msgstr "გამოსვლა"
 
@@ -607,7 +607,7 @@ msgstr "შესვლა"
 msgid "Alternative Logins"
 msgstr "ალტერნატიული Login–ი"
 
-#: templates/mail.php:15
+#: templates/mail.php:16
 #, php-format
 msgid ""
 "Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
diff --git a/l10n/ka_GE/files.po b/l10n/ka_GE/files.po
index a9cfcb93b6f3d5ea4414f0db3158583c11cef80b..9bafb819c71bf04361d03c6dc0e2b84e8020c8d9 100644
--- a/l10n/ka_GE/files.po
+++ b/l10n/ka_GE/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:01+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
 "MIME-Version: 1.0\n"
@@ -27,46 +27,54 @@ msgstr "%s –ის გადატანა ვერ მოხერხდა
 msgid "Could not move %s"
 msgstr "%s –ის გადატანა ვერ მოხერხდა"
 
-#: ajax/upload.php:19
+#: ajax/upload.php:16 ajax/upload.php:45
+msgid "Unable to set upload directory."
+msgstr ""
+
+#: ajax/upload.php:22
+msgid "Invalid Token"
+msgstr ""
+
+#: ajax/upload.php:59
 msgid "No file was uploaded. Unknown error"
 msgstr "ფაილი არ აიტვირთა. უცნობი შეცდომა"
 
-#: ajax/upload.php:26
+#: ajax/upload.php:66
 msgid "There is no error, the file uploaded with success"
 msgstr "ჭოცდომა არ დაფიქსირდა, ფაილი წარმატებით აიტვირთა"
 
-#: ajax/upload.php:27
+#: ajax/upload.php:67
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr "ატვირთული ფაილი აჭარბებს upload_max_filesize დირექტივას php.ini ფაილში"
 
-#: ajax/upload.php:29
+#: ajax/upload.php:69
 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:30
+#: ajax/upload.php:70
 msgid "The uploaded file was only partially uploaded"
 msgstr "ატვირთული ფაილი მხოლოდ ნაწილობრივ აიტვირთა"
 
-#: ajax/upload.php:31
+#: ajax/upload.php:71
 msgid "No file was uploaded"
 msgstr "ფაილი არ აიტვირთა"
 
-#: ajax/upload.php:32
+#: ajax/upload.php:72
 msgid "Missing a temporary folder"
 msgstr "დროებითი საქაღალდე არ არსებობს"
 
-#: ajax/upload.php:33
+#: ajax/upload.php:73
 msgid "Failed to write to disk"
 msgstr "შეცდომა დისკზე ჩაწერისას"
 
-#: ajax/upload.php:51
+#: ajax/upload.php:91
 msgid "Not enough storage available"
 msgstr "საცავში საკმარისი ადგილი არ არის"
 
-#: ajax/upload.php:83
+#: ajax/upload.php:123
 msgid "Invalid directory."
 msgstr "დაუშვებელი დირექტორია."
 
@@ -74,6 +82,36 @@ msgstr "დაუშვებელი დირექტორია."
 msgid "Files"
 msgstr "ფაილები"
 
+#: js/file-upload.js:11
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr "თქვენი ფაილის ატვირთვა ვერ მოხერხდა. ის არის საქაღალდე და შეიცავს 0 ბაიტს"
+
+#: js/file-upload.js:24
+msgid "Not enough space available"
+msgstr "საკმარისი ადგილი არ არის"
+
+#: js/file-upload.js:64
+msgid "Upload cancelled."
+msgstr "ატვირთვა შეჩერებულ იქნა."
+
+#: js/file-upload.js:167 js/files.js:266
+msgid ""
+"File upload is in progress. Leaving the page now will cancel the upload."
+msgstr "მიმდინარეობს ფაილის ატვირთვა. სხვა გვერდზე გადასვლა გამოიწვევს ატვირთვის შეჩერებას"
+
+#: js/file-upload.js:233 js/files.js:339
+msgid "URL cannot be empty."
+msgstr "URL არ შეიძლება იყოს ცარიელი."
+
+#: js/file-upload.js:238 lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr ""
+
+#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
+#: js/files.js:693 js/files.js:731
+msgid "Error"
+msgstr "შეცდომა"
+
 #: js/fileactions.js:116
 msgid "Share"
 msgstr "გაზიარება"
@@ -90,43 +128,43 @@ msgstr "წაშლა"
 msgid "Rename"
 msgstr "გადარქმევა"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:464
 msgid "Pending"
 msgstr "მოცდის რეჟიმში"
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "{new_name} already exists"
 msgstr "{new_name} უკვე არსებობს"
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "replace"
 msgstr "შეცვლა"
 
-#: js/filelist.js:259
+#: js/filelist.js:302
 msgid "suggest name"
 msgstr "სახელის შემოთავაზება"
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "cancel"
 msgstr "უარყოფა"
 
-#: js/filelist.js:306
+#: js/filelist.js:349
 msgid "replaced {new_name} with {old_name}"
 msgstr "{new_name} შეცვლილია {old_name}–ით"
 
-#: js/filelist.js:306
+#: js/filelist.js:349
 msgid "undo"
 msgstr "დაბრუნება"
 
-#: js/filelist.js:331
+#: js/filelist.js:374
 msgid "perform delete operation"
 msgstr "მიმდინარეობს წაშლის ოპერაცია"
 
-#: js/filelist.js:413
+#: js/filelist.js:456
 msgid "1 file uploading"
 msgstr "1 ფაილის ატვირთვა"
 
-#: js/filelist.js:416 js/filelist.js:470
+#: js/filelist.js:459 js/filelist.js:517
 msgid "files uploading"
 msgstr "ფაილები იტვირთება"
 
@@ -158,70 +196,42 @@ msgid ""
 "big."
 msgstr "გადმოწერის მოთხოვნა მუშავდება. ის მოითხოვს გარკვეულ დროს რაგდან ფაილები არის დიდი ზომის."
 
-#: js/files.js:264
-msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "თქვენი ფაილის ატვირთვა ვერ მოხერხდა. ის არის საქაღალდე და შეიცავს 0 ბაიტს"
-
-#: js/files.js:277
-msgid "Not enough space available"
-msgstr "საკმარისი ადგილი არ არის"
-
-#: js/files.js:317
-msgid "Upload cancelled."
-msgstr "ატვირთვა შეჩერებულ იქნა."
-
-#: js/files.js:413
-msgid ""
-"File upload is in progress. Leaving the page now will cancel the upload."
-msgstr "მიმდინარეობს ფაილის ატვირთვა. სხვა გვერდზე გადასვლა გამოიწვევს ატვირთვის შეჩერებას"
-
-#: js/files.js:486
-msgid "URL cannot be empty."
-msgstr "URL არ შეიძლება იყოს ცარიელი."
-
-#: js/files.js:491
+#: js/files.js:344
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "დაუშვებელი ფოლდერის სახელი.  'Shared'–ის გამოყენება რეზერვირებულია Owncloud–ის მიერ"
 
-#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
-msgid "Error"
-msgstr "შეცდომა"
-
-#: js/files.js:877 templates/index.php:69
+#: js/files.js:744 templates/index.php:69
 msgid "Name"
 msgstr "სახელი"
 
-#: js/files.js:878 templates/index.php:80
+#: js/files.js:745 templates/index.php:80
 msgid "Size"
 msgstr "ზომა"
 
-#: js/files.js:879 templates/index.php:82
+#: js/files.js:746 templates/index.php:82
 msgid "Modified"
 msgstr "შეცვლილია"
 
-#: js/files.js:898
+#: js/files.js:765
 msgid "1 folder"
 msgstr "1 საქაღალდე"
 
-#: js/files.js:900
+#: js/files.js:767
 msgid "{count} folders"
 msgstr "{count} საქაღალდე"
 
-#: js/files.js:908
+#: js/files.js:775
 msgid "1 file"
 msgstr "1 ფაილი"
 
-#: js/files.js:910
+#: js/files.js:777
 msgid "{count} files"
 msgstr "{count} ფაილი"
 
-#: lib/app.php:53
-msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
-msgstr ""
-
 #: lib/app.php:73
-msgid "Unable to rename file"
-msgstr "ფაილის სახელის გადარქმევა ვერ მოხერხდა"
+#, php-format
+msgid "%s could not be renamed"
+msgstr ""
 
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
@@ -317,6 +327,22 @@ msgstr "მიმდინარეობს ფაილების სკა
 msgid "Current scanning"
 msgstr "მიმდინარე სკანირება"
 
+#: templates/part.list.php:76
+msgid "directory"
+msgstr ""
+
+#: templates/part.list.php:78
+msgid "directories"
+msgstr ""
+
+#: templates/part.list.php:87
+msgid "file"
+msgstr ""
+
+#: templates/part.list.php:89
+msgid "files"
+msgstr ""
+
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
 msgstr "ფაილური სისტემის ქეშის განახლება...."
diff --git a/l10n/ka_GE/files_encryption.po b/l10n/ka_GE/files_encryption.po
index bf083e8ca0466a12ec8408332ddedbef72e128ea..39799227c61dcc3bbc842e4bbf2f8662ecbe9da4 100644
--- a/l10n/ka_GE/files_encryption.po
+++ b/l10n/ka_GE/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-14 02:46+0200\n"
-"PO-Revision-Date: 2013-06-14 00:47+0000\n"
+"POT-Creation-Date: 2013-07-05 02:12+0200\n"
+"PO-Revision-Date: 2013-07-05 00:13+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"
@@ -55,9 +55,21 @@ msgstr ""
 
 #: files/error.php:7
 msgid ""
-"Your private key is not valid! Maybe your password was changed from outside."
-" You can update your private key password in your personal settings to "
-"regain access to your files"
+"Your private key is not valid! Likely your password was changed outside the "
+"ownCloud system (e.g. your corporate directory). You can update your private"
+" key password in your personal settings to recover access to your encrypted "
+"files."
+msgstr ""
+
+#: hooks/hooks.php:44
+msgid "Missing requirements."
+msgstr ""
+
+#: hooks/hooks.php:45
+msgid ""
+"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL "
+"PHP extension is enabled and configured properly. For now, the encryption "
+"app has been disabled."
 msgstr ""
 
 #: js/settings-admin.js:11
@@ -84,11 +96,11 @@ msgstr "ენკრიპცია"
 
 #: templates/settings-admin.php:10
 msgid ""
-"Enable encryption passwords recovery key (allow sharing to recovery key):"
+"Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
 #: templates/settings-admin.php:14
-msgid "Recovery account password"
+msgid "Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:21 templates/settings-personal.php:54
@@ -100,15 +112,15 @@ msgid "Disabled"
 msgstr ""
 
 #: templates/settings-admin.php:34
-msgid "Change encryption passwords recovery key:"
+msgid "Change recovery key password:"
 msgstr ""
 
 #: templates/settings-admin.php:41
-msgid "Old Recovery account password"
+msgid "Old Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:48
-msgid "New Recovery account password"
+msgid "New Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:53
diff --git a/l10n/ka_GE/files_external.po b/l10n/ka_GE/files_external.po
index f06d1f0e89eb458082ac61c6001ede37d1df0540..dceb11f51a784f254b3129c46ed60b72b7295161 100644
--- a/l10n/ka_GE/files_external.po
+++ b/l10n/ka_GE/files_external.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: drlinux64 <romeo@energo-pro.ge>\n"
 "Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/ka_GE/files_sharing.po b/l10n/ka_GE/files_sharing.po
index 5598b06b22f5f192c776643414250380de314638..9d920997ffb7cccfe1d944de3ed4035161e50037 100644
--- a/l10n/ka_GE/files_sharing.po
+++ b/l10n/ka_GE/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
 "MIME-Version: 1.0\n"
@@ -18,27 +18,39 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: templates/authenticate.php:4
+msgid "The password is wrong. Try again."
+msgstr ""
+
+#: templates/authenticate.php:7
 msgid "Password"
 msgstr "პაროლი"
 
-#: templates/authenticate.php:6
+#: templates/authenticate.php:9
 msgid "Submit"
 msgstr "გაგზავნა"
 
-#: templates/public.php:10
+#: templates/public.php:17
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s–მა გაგიზიარათ ფოლდერი %s"
 
-#: templates/public.php:13
+#: templates/public.php:20
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s–მა გაგიზიარათ ფაილი %s"
 
-#: templates/public.php:19 templates/public.php:43
+#: templates/public.php:28 templates/public.php:90
 msgid "Download"
 msgstr "ჩამოტვირთვა"
 
-#: templates/public.php:40
+#: templates/public.php:45 templates/public.php:48
+msgid "Upload"
+msgstr "ატვირთვა"
+
+#: templates/public.php:58
+msgid "Cancel upload"
+msgstr "ატვირთვის გაუქმება"
+
+#: templates/public.php:87
 msgid "No preview available for"
 msgstr "წინასწარი დათვალიერება შეუძლებელია"
diff --git a/l10n/ka_GE/files_trashbin.po b/l10n/ka_GE/files_trashbin.po
index 09661d5d66b0523ed90751f9cb2472ccd7fa2801..b7ac3bbe6a4786e9278cc0a9fc0608493e638096 100644
--- a/l10n/ka_GE/files_trashbin.po
+++ b/l10n/ka_GE/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:16+0000\n"
 "Last-Translator: drlinux64 <romeo@energo-pro.ge>\n"
 "Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/ka_GE/lib.po b/l10n/ka_GE/lib.po
index 2df50c389e2b990c72887ca0983c6a6f3084820f..e3b2b840c154e7d309d44661f3b85896b68385fb 100644
--- a/l10n/ka_GE/lib.po
+++ b/l10n/ka_GE/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
 "MIME-Version: 1.0\n"
@@ -17,43 +17,47 @@ msgstr ""
 "Language: ka_GE\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: app.php:359
+#: app.php:360
 msgid "Help"
 msgstr "დახმარება"
 
-#: app.php:372
+#: app.php:373
 msgid "Personal"
 msgstr "პირადი"
 
-#: app.php:383
+#: app.php:384
 msgid "Settings"
 msgstr "პარამეტრები"
 
-#: app.php:395
+#: app.php:396
 msgid "Users"
 msgstr "მომხმარებელი"
 
-#: app.php:408
+#: app.php:409
 msgid "Apps"
 msgstr "აპლიკაციები"
 
-#: app.php:416
+#: app.php:417
 msgid "Admin"
 msgstr "ადმინისტრატორი"
 
-#: files.php:210
+#: defaults.php:33
+msgid "web services under your control"
+msgstr "web services under your control"
+
+#: files.php:226
 msgid "ZIP download is turned off."
 msgstr "ZIP download–ი გათიშულია"
 
-#: files.php:211
+#: files.php:227
 msgid "Files need to be downloaded one by one."
 msgstr "ფაილები უნდა გადმოიტვირთოს სათითაოდ."
 
-#: files.php:212 files.php:245
+#: files.php:228 files.php:261
 msgid "Back to Files"
 msgstr "უკან ფაილებში"
 
-#: files.php:242
+#: files.php:258
 msgid "Selected files too large to generate zip file."
 msgstr "არჩეული ფაილები ძალიან დიდია zip ფაილის გენერაციისთვის."
 
@@ -85,104 +89,102 @@ msgstr "ტექსტი"
 msgid "Images"
 msgstr "სურათები"
 
-#: setup.php:34
-msgid "Set an admin username."
-msgstr "დააყენეთ ადმინისტრატორის სახელი."
-
-#: setup.php:37
-msgid "Set an admin password."
-msgstr "დააყენეთ ადმინისტრატორის პაროლი."
-
-#: setup.php:55
+#: setup/abstractdatabase.php:22
 #, php-format
 msgid "%s enter the database username."
 msgstr "%s შეიყვანეთ ბაზის იუზერნეიმი."
 
-#: setup.php:58
+#: setup/abstractdatabase.php:25
 #, php-format
 msgid "%s enter the database name."
 msgstr "%s შეიყვანეთ ბაზის სახელი."
 
-#: setup.php:61
+#: setup/abstractdatabase.php:28
 #, php-format
 msgid "%s you may not use dots in the database name"
 msgstr "%s არ მიუთითოთ წერტილი ბაზის სახელში"
 
-#: setup.php:64
+#: setup/mssql.php:20
 #, php-format
-msgid "%s set the database host."
-msgstr "%s მიუთითეთ ბაზის ჰოსტი."
-
-#: setup.php:126 setup.php:332 setup.php:377
-msgid "PostgreSQL username and/or password not valid"
-msgstr "PostgreSQL იუზერნეიმი და/ან პაროლი არ არის სწორი"
+msgid "MS SQL username and/or password not valid: %s"
+msgstr "MS SQL მომხმარებელი და/ან პაროლი არ არის მართებული: %s"
 
-#: setup.php:127 setup.php:235
+#: setup/mssql.php:21 setup/mysql.php:13 setup/oci.php:114
+#: setup/postgresql.php:24 setup/postgresql.php:70
 msgid "You need to enter either an existing account or the administrator."
 msgstr "თქვენ უნდა შეიყვანოთ არსებული მომხმარებელის სახელი ან ადმინისტრატორი."
 
-#: setup.php:152
-msgid "Oracle connection could not be established"
-msgstr ""
-
-#: setup.php:234
+#: setup/mysql.php:12
 msgid "MySQL username and/or password not valid"
 msgstr "MySQL იუზერნეიმი და/ან პაროლი არ არის სწორი"
 
-#: setup.php:288 setup.php:398 setup.php:407 setup.php:425 setup.php:435
-#: setup.php:444 setup.php:477 setup.php:543 setup.php:569 setup.php:576
-#: setup.php:587 setup.php:594 setup.php:603 setup.php:611 setup.php:620
-#: setup.php:626
+#: setup/mysql.php:67 setup/oci.php:54 setup/oci.php:121 setup/oci.php:147
+#: setup/oci.php:154 setup/oci.php:165 setup/oci.php:172 setup/oci.php:181
+#: setup/oci.php:189 setup/oci.php:198 setup/oci.php:204
+#: setup/postgresql.php:89 setup/postgresql.php:98 setup/postgresql.php:115
+#: setup/postgresql.php:125 setup/postgresql.php:134
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr "DB შეცდომა: \"%s\""
 
-#: setup.php:289 setup.php:399 setup.php:408 setup.php:426 setup.php:436
-#: setup.php:445 setup.php:478 setup.php:544 setup.php:570 setup.php:577
-#: setup.php:588 setup.php:604 setup.php:612 setup.php:621
+#: setup/mysql.php:68 setup/oci.php:55 setup/oci.php:122 setup/oci.php:148
+#: setup/oci.php:155 setup/oci.php:166 setup/oci.php:182 setup/oci.php:190
+#: setup/oci.php:199 setup/postgresql.php:90 setup/postgresql.php:99
+#: setup/postgresql.php:116 setup/postgresql.php:126 setup/postgresql.php:135
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr "Offending ბრძანება იყო: \"%s\""
 
-#: setup.php:305
+#: setup/mysql.php:85
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr "MySQL მომხმარებელი '%s'@'localhost' უკვე არსებობს."
 
-#: setup.php:306
+#: setup/mysql.php:86
 msgid "Drop this user from MySQL"
 msgstr "წაშალე ეს მომხამრებელი MySQL–იდან"
 
-#: setup.php:311
+#: setup/mysql.php:91
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr "MySQL მომხმარებელი '%s'@'%%' უკვე არსებობს"
 
-#: setup.php:312
+#: setup/mysql.php:92
 msgid "Drop this user from MySQL."
 msgstr "წაშალე ეს მომხამრებელი MySQL–იდან"
 
-#: setup.php:469 setup.php:536
+#: setup/oci.php:34
+msgid "Oracle connection could not be established"
+msgstr ""
+
+#: setup/oci.php:41 setup/oci.php:113
 msgid "Oracle username and/or password not valid"
 msgstr "Oracle იუზერნეიმი და/ან პაროლი არ არის სწორი"
 
-#: setup.php:595 setup.php:627
+#: setup/oci.php:173 setup/oci.php:205
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr "Offending ბრძანება იყო: \"%s\", სახელი: %s, პაროლი: %s"
 
-#: setup.php:647
-#, php-format
-msgid "MS SQL username and/or password not valid: %s"
-msgstr "MS SQL მომხმარებელი და/ან პაროლი არ არის მართებული: %s"
+#: setup/postgresql.php:23 setup/postgresql.php:69
+msgid "PostgreSQL username and/or password not valid"
+msgstr "PostgreSQL იუზერნეიმი და/ან პაროლი არ არის სწორი"
+
+#: setup.php:42
+msgid "Set an admin username."
+msgstr "დააყენეთ ადმინისტრატორის სახელი."
+
+#: setup.php:45
+msgid "Set an admin password."
+msgstr "დააყენეთ ადმინისტრატორის პაროლი."
 
-#: setup.php:870
+#: setup.php:198
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "თქვენი web სერვერი არ არის კონფიგურირებული ფაილ სინქრონიზაციისთვის, რადგან WebDAV ინტერფეისი შეიძლება იყოს გატეხილი."
 
-#: setup.php:871
+#: setup.php:199
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "გთხოვთ გადაათვალიეროთ <a href='%s'>ინსტალაციის გზამკვლევი</a>."
diff --git a/l10n/ka_GE/settings.po b/l10n/ka_GE/settings.po
index b6f77832c5d9c4a98c103f0a6eaa837a9dc15ba3..0cbe60dd865eff3e0fbf0bb20c7fa1599eecd16f 100644
--- a/l10n/ka_GE/settings.po
+++ b/l10n/ka_GE/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
 "MIME-Version: 1.0\n"
@@ -89,35 +89,35 @@ msgstr "მომხმარებლის წაშლა ვერ მოხ
 msgid "Couldn't update app."
 msgstr "ვერ მოხერხდა აპლიკაციის განახლება."
 
-#: js/apps.js:30
+#: js/apps.js:35
 msgid "Update to {appversion}"
 msgstr "განაახლე {appversion}–მდე"
 
-#: js/apps.js:36 js/apps.js:76
+#: js/apps.js:41 js/apps.js:81
 msgid "Disable"
 msgstr "გამორთვა"
 
-#: js/apps.js:36 js/apps.js:64 js/apps.js:83
+#: js/apps.js:41 js/apps.js:69 js/apps.js:88
 msgid "Enable"
 msgstr "ჩართვა"
 
-#: js/apps.js:55
+#: js/apps.js:60
 msgid "Please wait...."
 msgstr "დაიცადეთ...."
 
-#: js/apps.js:59 js/apps.js:71 js/apps.js:80 js/apps.js:93
+#: js/apps.js:64 js/apps.js:76 js/apps.js:85 js/apps.js:98
 msgid "Error"
 msgstr "შეცდომა"
 
-#: js/apps.js:90
+#: js/apps.js:95
 msgid "Updating...."
 msgstr "მიმდინარეობს განახლება...."
 
-#: js/apps.js:93
+#: js/apps.js:98
 msgid "Error while updating app"
 msgstr "შეცდომა აპლიკაციის განახლების დროს"
 
-#: js/apps.js:96
+#: js/apps.js:101
 msgid "Updated"
 msgstr "განახლებულია"
 
@@ -166,15 +166,15 @@ msgstr "შეცდომა მომხმარებლის შექმ
 msgid "A valid password must be provided"
 msgstr "უნდა მიუთითოთ არსებული პაროლი"
 
-#: personal.php:35 personal.php:36
+#: personal.php:37 personal.php:38
 msgid "__language_name__"
 msgstr "__language_name__"
 
-#: templates/admin.php:15
+#: templates/admin.php:17
 msgid "Security Warning"
 msgstr "უსაფრთხოების გაფრთხილება"
 
-#: templates/admin.php:18
+#: templates/admin.php:20
 msgid ""
 "Your data directory and your files are probably accessible from the "
 "internet. The .htaccess file that ownCloud provides is not working. We "
@@ -183,36 +183,36 @@ msgid ""
 " webserver document root."
 msgstr "თქვენი data დირექტორია და ფაილები არის დაშვებადი ინტერნეტიდან. .htaccess ფაილი რომელსაც ownCloud გვთავაზობს არ მუშაობს. ჩვენ გირჩევთ რომ თქვენი ვებსერვერი დააკონფიგურიროთ ისე რომ data დირექტორია არ იყოს დაშვებადი, ან გაიტანოთ data დირექტორია ვებსერვერის document root დირექტორიის გარეთ."
 
-#: templates/admin.php:29
+#: templates/admin.php:31
 msgid "Setup Warning"
 msgstr "გაფრთხილება დაყენებისას"
 
-#: templates/admin.php:32
+#: templates/admin.php:34
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "თქვენი web სერვერი არ არის კონფიგურირებული ფაილ სინქრონიზაციისთვის, რადგან WebDAV ინტერფეისი შეიძლება იყოს გატეხილი."
 
-#: templates/admin.php:33
+#: templates/admin.php:35
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "გთხოვთ გადაათვალიეროთ <a href='%s'>ინსტალაციის გზამკვლევი</a>."
 
-#: templates/admin.php:44
+#: templates/admin.php:46
 msgid "Module 'fileinfo' missing"
 msgstr "მოდული 'fileinfo'  არ არსებობს"
 
-#: templates/admin.php:47
+#: templates/admin.php:49
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr "PHP მოდული 'fileinfo' არ არსებობს. ჩვენ გირჩევთ რომ აუცილებლად ჩართოთ ეს მოდული, რომ მიიღოთ კარგი შედეგები mime-type–ს აღმოჩენისას."
 
-#: templates/admin.php:58
+#: templates/admin.php:60
 msgid "Locale not working"
 msgstr "ლოკალიზაცია არ მუშაობს"
 
-#: templates/admin.php:63
+#: templates/admin.php:65
 #, php-format
 msgid ""
 "This ownCloud server can't set system locale to %s. This means that there "
@@ -220,11 +220,11 @@ msgid ""
 " to install the required packages on your system to support %s."
 msgstr "თქვენი ownCloud სერვერი ვერ აყენებს %s სისტემურ ენას. ეს გულისხმობს იმას რომ შეიძლება შეიქმნას პრობლემა გარკვეულ სიმბოლოებზე ფაილის სახელებში. ჩვენ გიჩევთ რომ დააინსტალიროთ საჭირო პაკეტები თქვენს სისტემაზე იმისათვის რომ იყოს %s –ის მხარდაჭერა."
 
-#: templates/admin.php:75
+#: templates/admin.php:77
 msgid "Internet connection not working"
 msgstr "ინტერნეტ კავშირი არ მუშაობს"
 
-#: templates/admin.php:78
+#: templates/admin.php:80
 msgid ""
 "This ownCloud server has no working internet connection. This means that "
 "some of the features like mounting of external storage, notifications about "
@@ -234,102 +234,102 @@ msgid ""
 " of ownCloud."
 msgstr "ownCloud სერვერს არ გააჩნია ინტერნეტთან კავშირი. ეს ნიშნავს იმას რომ გარკვეული ფუნქციები როგორიცაა ექსტერნალ საცავების მონტირება, შეტყობინებები განახლების შესახებ ან სხვადასხვა 3rd აპლიკაციების ინსტალაცია არ იმუშავებს. ფაილებთან წვდომა გარე სამყაროდან და შეტყობინების იმეილებიც აგრეთვე არ იმუშავებს. ჩვენ გირჩევთ რომ ჩართოთ ინტერნეტ კავშირი ამ სერვერისთვის იმისათვის რომ გქონდეთ ownCloud–ის ყველა ფუნქცია გააქტიურებული."
 
-#: templates/admin.php:92
+#: templates/admin.php:94
 msgid "Cron"
 msgstr "Cron–ი"
 
-#: templates/admin.php:101
+#: templates/admin.php:103
 msgid "Execute one task with each page loaded"
 msgstr "გაუშვი თითო მოქმედება ყველა ჩატვირთულ გვერდზე"
 
-#: templates/admin.php:111
+#: templates/admin.php:113
 msgid ""
 "cron.php is registered at a webcron service. Call the cron.php page in the "
 "owncloud root once a minute over http."
 msgstr "cron.php რეგისტრირებულია webcron სერვისად. გაუშვით cron.php გვერდი რომელიც მოთავსებულია owncloud root დირექტორიაში, წუთში ერთხელ  http–ით."
 
-#: templates/admin.php:121
+#: templates/admin.php:123
 msgid ""
 "Use systems cron service. Call the cron.php file in the owncloud folder via "
 "a system cronjob once a minute."
 msgstr "გამოიყენე სისტემური cron სერვისი. გაუშვით cron.php ფაილი owncloud ფოლდერიდან სისტემურ cronjob–ში წუთში ერთხელ."
 
-#: templates/admin.php:128
+#: templates/admin.php:130
 msgid "Sharing"
 msgstr "გაზიარება"
 
-#: templates/admin.php:134
+#: templates/admin.php:136
 msgid "Enable Share API"
 msgstr "Share API–ის ჩართვა"
 
-#: templates/admin.php:135
+#: templates/admin.php:137
 msgid "Allow apps to use the Share API"
 msgstr "დაუშვი აპლიკაციების უფლება  Share API –ზე"
 
-#: templates/admin.php:142
+#: templates/admin.php:144
 msgid "Allow links"
 msgstr "ლინკების დაშვება"
 
-#: templates/admin.php:143
+#: templates/admin.php:145
 msgid "Allow users to share items to the public with links"
 msgstr "მიეცი მომხმარებლებს უფლება რომ გააზიაროს ელემენტები საჯაროდ ლინკებით"
 
-#: templates/admin.php:150
+#: templates/admin.php:152
 msgid "Allow resharing"
 msgstr "გადაზიარების დაშვება"
 
-#: templates/admin.php:151
+#: templates/admin.php:153
 msgid "Allow users to share items shared with them again"
 msgstr "მიეცით მომხმარებლებს უფლება რომ გააზიაროს მისთვის გაზიარებული"
 
-#: templates/admin.php:158
+#: templates/admin.php:160
 msgid "Allow users to share with anyone"
 msgstr "მიეცით უფლება მომხმარებლებს გააზიაროს ყველასთვის"
 
-#: templates/admin.php:161
+#: templates/admin.php:163
 msgid "Allow users to only share with users in their groups"
 msgstr "მიეცით უფლება მომხმარებლებს რომ გააზიაროს მხოლოდ თავიანთი ჯგუფისთვის"
 
-#: templates/admin.php:168
+#: templates/admin.php:170
 msgid "Security"
 msgstr "უსაფრთხოება"
 
-#: templates/admin.php:181
+#: templates/admin.php:183
 msgid "Enforce HTTPS"
 msgstr "HTTPS–ის ჩართვა"
 
-#: templates/admin.php:182
+#: templates/admin.php:184
 msgid ""
 "Enforces the clients to connect to ownCloud via an encrypted connection."
 msgstr "ვაიძულოთ მომხმარებლები რომ დაუკავშირდნენ ownCloud დაცული კავშირით (https)."
 
-#: templates/admin.php:185
+#: templates/admin.php:187
 msgid ""
 "Please connect to this ownCloud instance via HTTPS to enable or disable the "
 "SSL enforcement."
 msgstr "გთხოვთ დაუკავშირდეთ ownCloud–ს  HTTPS–ით რომ შეძლოთ SSL–ის ჩართვა გამორთვა."
 
-#: templates/admin.php:195
+#: templates/admin.php:197
 msgid "Log"
 msgstr "ლოგი"
 
-#: templates/admin.php:196
+#: templates/admin.php:198
 msgid "Log level"
 msgstr "ლოგირების დონე"
 
-#: templates/admin.php:227
+#: templates/admin.php:229
 msgid "More"
 msgstr "უფრო მეტი"
 
-#: templates/admin.php:228
+#: templates/admin.php:230
 msgid "Less"
 msgstr "უფრო ნაკლები"
 
-#: templates/admin.php:235 templates/personal.php:116
+#: templates/admin.php:236 templates/personal.php:116
 msgid "Version"
 msgstr "ვერსია"
 
-#: templates/admin.php:237 templates/personal.php:119
+#: templates/admin.php:240 templates/personal.php:119
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -387,76 +387,79 @@ msgstr "ბაგთრექერი"
 msgid "Commercial Support"
 msgstr "კომერციული მხარდაჭერა"
 
-#: templates/personal.php:9
+#: templates/personal.php:10
 msgid "Get the apps to sync your files"
 msgstr "აპლიკაცია ფაილების სინქრონიზაციისთვის"
 
-#: templates/personal.php:20
+#: templates/personal.php:21
 msgid "Show First Run Wizard again"
 msgstr "მაჩვენე თავიდან გაშვებული ვიზარდი"
 
-#: templates/personal.php:28
+#: templates/personal.php:29
 #, php-format
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "თქვენ გამოყენებული გაქვთ <strong>%s</strong> –ი –<strong>%s<strong>–დან"
 
-#: templates/personal.php:40 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:41 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "პაროლი"
 
-#: templates/personal.php:41
+#: templates/personal.php:42
 msgid "Your password was changed"
 msgstr "თქვენი პაროლი შეიცვალა"
 
-#: templates/personal.php:42
+#: templates/personal.php:43
 msgid "Unable to change your password"
 msgstr "თქვენი პაროლი არ შეიცვალა"
 
-#: templates/personal.php:43
+#: templates/personal.php:44
 msgid "Current password"
 msgstr "მიმდინარე პაროლი"
 
-#: templates/personal.php:45
+#: templates/personal.php:46
 msgid "New password"
 msgstr "ახალი პაროლი"
 
-#: templates/personal.php:47
+#: templates/personal.php:48
 msgid "Change password"
 msgstr "პაროლის შეცვლა"
 
-#: templates/personal.php:59 templates/users.php:85
+#: templates/personal.php:60 templates/users.php:85
 msgid "Display Name"
 msgstr "დისპლეის სახელი"
 
-#: templates/personal.php:74
+#: templates/personal.php:75
 msgid "Email"
 msgstr "იმეილი"
 
-#: templates/personal.php:76
+#: templates/personal.php:77
 msgid "Your email address"
 msgstr "თქვენი იმეილ მისამართი"
 
-#: templates/personal.php:77
+#: templates/personal.php:78
 msgid "Fill in an email address to enable password recovery"
 msgstr "შეავსეთ იმეილ მისამართის ველი პაროლის აღსადგენად"
 
-#: templates/personal.php:86 templates/personal.php:87
+#: templates/personal.php:87 templates/personal.php:88
 msgid "Language"
 msgstr "ენა"
 
-#: templates/personal.php:99
+#: templates/personal.php:100
 msgid "Help translate"
 msgstr "თარგმნის დახმარება"
 
-#: templates/personal.php:105
+#: templates/personal.php:106
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:107
-msgid "Use this address to connect to your ownCloud in your file manager"
-msgstr "გამოიყენე შემდეგი მისამართი ownCloud–თან დასაკავშირებლად შენს ფაილმენეჯერში"
+#: templates/personal.php:108
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
+"target=\"_blank\">access your Files via WebDAV</a>"
+msgstr ""
 
-#: templates/users.php:21 templates/users.php:84
+#: templates/users.php:21
 msgid "Login Name"
 msgstr "მომხმარებლის სახელი"
 
@@ -486,6 +489,10 @@ msgstr "ულიმიტო"
 msgid "Other"
 msgstr "სხვა"
 
+#: templates/users.php:84
+msgid "Username"
+msgstr "მომხმარებლის სახელი"
+
 #: templates/users.php:91
 msgid "Storage"
 msgstr "საცავი"
diff --git a/l10n/ka_GE/user_ldap.po b/l10n/ka_GE/user_ldap.po
index aa2444a6c90409fa66493baa3769aa7c73057cad..b166ce3bf5952a49ead86858ef3e7fd553cdedb7 100644
--- a/l10n/ka_GE/user_ldap.po
+++ b/l10n/ka_GE/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:25+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:16+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/kn/core.po b/l10n/kn/core.po
index feab760f672da549ab1cdcfe1c567e3af8ee9db0..aef3d399ed344f0cee7ae2f3bb003ebf7e75ce60 100644
--- a/l10n/kn/core.po
+++ b/l10n/kn/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-15 01:59+0200\n"
-"PO-Revision-Date: 2013-06-14 23:59+0000\n"
+"POT-Creation-Date: 2013-07-06 02:02+0200\n"
+"PO-Revision-Date: 2013-07-06 00:02+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Kannada (http://www.transifex.com/projects/p/owncloud/language/kn/)\n"
 "MIME-Version: 1.0\n"
@@ -61,135 +61,135 @@ msgstr ""
 msgid "Error removing %s from favorites."
 msgstr ""
 
-#: js/config.php:34
+#: js/config.php:32
 msgid "Sunday"
 msgstr ""
 
-#: js/config.php:35
+#: js/config.php:33
 msgid "Monday"
 msgstr ""
 
-#: js/config.php:36
+#: js/config.php:34
 msgid "Tuesday"
 msgstr ""
 
-#: js/config.php:37
+#: js/config.php:35
 msgid "Wednesday"
 msgstr ""
 
-#: js/config.php:38
+#: js/config.php:36
 msgid "Thursday"
 msgstr ""
 
-#: js/config.php:39
+#: js/config.php:37
 msgid "Friday"
 msgstr ""
 
-#: js/config.php:40
+#: js/config.php:38
 msgid "Saturday"
 msgstr ""
 
-#: js/config.php:45
+#: js/config.php:43
 msgid "January"
 msgstr ""
 
-#: js/config.php:46
+#: js/config.php:44
 msgid "February"
 msgstr ""
 
-#: js/config.php:47
+#: js/config.php:45
 msgid "March"
 msgstr ""
 
-#: js/config.php:48
+#: js/config.php:46
 msgid "April"
 msgstr ""
 
-#: js/config.php:49
+#: js/config.php:47
 msgid "May"
 msgstr ""
 
-#: js/config.php:50
+#: js/config.php:48
 msgid "June"
 msgstr ""
 
-#: js/config.php:51
+#: js/config.php:49
 msgid "July"
 msgstr ""
 
-#: js/config.php:52
+#: js/config.php:50
 msgid "August"
 msgstr ""
 
-#: js/config.php:53
+#: js/config.php:51
 msgid "September"
 msgstr ""
 
-#: js/config.php:54
+#: js/config.php:52
 msgid "October"
 msgstr ""
 
-#: js/config.php:55
+#: js/config.php:53
 msgid "November"
 msgstr ""
 
-#: js/config.php:56
+#: js/config.php:54
 msgid "December"
 msgstr ""
 
-#: js/js.js:286
+#: js/js.js:289
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:718
+#: js/js.js:721
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:719
+#: js/js.js:722
 msgid "1 minute ago"
 msgstr ""
 
-#: js/js.js:720
+#: js/js.js:723
 msgid "{minutes} minutes ago"
 msgstr ""
 
-#: js/js.js:721
+#: js/js.js:724
 msgid "1 hour ago"
 msgstr ""
 
-#: js/js.js:722
+#: js/js.js:725
 msgid "{hours} hours ago"
 msgstr ""
 
-#: js/js.js:723
+#: js/js.js:726
 msgid "today"
 msgstr ""
 
-#: js/js.js:724
+#: js/js.js:727
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:725
+#: js/js.js:728
 msgid "{days} days ago"
 msgstr ""
 
-#: js/js.js:726
+#: js/js.js:729
 msgid "last month"
 msgstr ""
 
-#: js/js.js:727
+#: js/js.js:730
 msgid "{months} months ago"
 msgstr ""
 
-#: js/js.js:728
+#: js/js.js:731
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:729
+#: js/js.js:732
 msgid "last year"
 msgstr ""
 
-#: js/js.js:730
+#: js/js.js:733
 msgid "years ago"
 msgstr ""
 
@@ -225,8 +225,8 @@ msgstr ""
 #: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
 #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:577
-#: js/share.js:589
+#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:620
+#: js/share.js:632
 msgid "Error"
 msgstr ""
 
@@ -246,7 +246,7 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: js/share.js:125 js/share.js:617
+#: js/share.js:125 js/share.js:660
 msgid "Error while sharing"
 msgstr ""
 
@@ -266,99 +266,103 @@ msgstr ""
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:159
+#: js/share.js:172
 msgid "Share with"
 msgstr ""
 
-#: js/share.js:164
+#: js/share.js:177
 msgid "Share with link"
 msgstr ""
 
-#: js/share.js:167
+#: js/share.js:180
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:169 templates/installation.php:54 templates/login.php:26
+#: js/share.js:182 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr ""
 
-#: js/share.js:173
+#: js/share.js:187
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:191
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:174
+#: js/share.js:192
 msgid "Send"
 msgstr ""
 
-#: js/share.js:178
+#: js/share.js:197
 msgid "Set expiration date"
 msgstr ""
 
-#: js/share.js:179
+#: js/share.js:198
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:211
+#: js/share.js:230
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:213
+#: js/share.js:232
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:251
+#: js/share.js:270
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:287
+#: js/share.js:306
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:308
+#: js/share.js:327
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:320
+#: js/share.js:339
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:322
+#: js/share.js:341
 msgid "access control"
 msgstr ""
 
-#: js/share.js:325
+#: js/share.js:344
 msgid "create"
 msgstr ""
 
-#: js/share.js:328
+#: js/share.js:347
 msgid "update"
 msgstr ""
 
-#: js/share.js:331
+#: js/share.js:350
 msgid "delete"
 msgstr ""
 
-#: js/share.js:334
+#: js/share.js:353
 msgid "share"
 msgstr ""
 
-#: js/share.js:368 js/share.js:564
+#: js/share.js:387 js/share.js:607
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:577
+#: js/share.js:620
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:589
+#: js/share.js:632
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:604
+#: js/share.js:647
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:615
+#: js/share.js:658
 msgid "Email sent"
 msgstr ""
 
@@ -373,7 +377,7 @@ msgstr ""
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
-#: lostpassword/controller.php:58
+#: lostpassword/controller.php:60
 msgid "ownCloud password reset"
 msgstr ""
 
@@ -403,17 +407,17 @@ msgstr ""
 
 #: lostpassword/templates/lostpassword.php:22
 msgid ""
-"Your files seems to be encrypted. If you didn't have enabled the recovery "
-"key there will be no way to get your data back once the password was "
-"resetted. If you are not sure what to do, please contact your administrator "
-"first before continue. Do you really want to continue?"
+"Your files are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
 msgstr ""
 
 #: lostpassword/templates/lostpassword.php:24
 msgid "Yes, I really want to reset my password now"
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:29
+#: lostpassword/templates/lostpassword.php:27
 msgid "Request reset"
 msgstr ""
 
@@ -461,7 +465,7 @@ msgstr ""
 msgid "Cloud not found"
 msgstr ""
 
-#: templates/altmail.php:2
+#: templates/altmail.php:4
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -472,10 +476,6 @@ msgid ""
 "Cheers!"
 msgstr ""
 
-#: templates/altmail.php:7 templates/mail.php:24
-msgid "web services under your control"
-msgstr ""
-
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
 msgstr ""
@@ -568,12 +568,12 @@ msgstr ""
 msgid "Finish setup"
 msgstr ""
 
-#: templates/layout.user.php:40
+#: templates/layout.user.php:43
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:67
+#: templates/layout.user.php:68
 msgid "Log out"
 msgstr ""
 
@@ -607,7 +607,7 @@ msgstr ""
 msgid "Alternative Logins"
 msgstr ""
 
-#: templates/mail.php:15
+#: templates/mail.php:16
 #, php-format
 msgid ""
 "Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
diff --git a/l10n/kn/files.po b/l10n/kn/files.po
index d8ead40a6064706155178d8833d417b06692633b..1b7d00ff32dcc2bde760c400730bac6a3c5dca46 100644
--- a/l10n/kn/files.po
+++ b/l10n/kn/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-25 02:01+0200\n"
-"PO-Revision-Date: 2013-05-24 13:26+0000\n"
+"POT-Creation-Date: 2013-07-04 09:30+0200\n"
+"PO-Revision-Date: 2013-07-04 07:31+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Kannada (http://www.transifex.com/projects/p/owncloud/language/kn/)\n"
 "MIME-Version: 1.0\n"
@@ -27,46 +27,54 @@ msgstr ""
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/upload.php:19
+#: ajax/upload.php:16 ajax/upload.php:39
+msgid "Unable to set upload directory."
+msgstr ""
+
+#: ajax/upload.php:23
+msgid "Invalid Token"
+msgstr ""
+
+#: ajax/upload.php:55
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: ajax/upload.php:26
+#: ajax/upload.php:62
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/upload.php:27
+#: ajax/upload.php:63
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:29
+#: ajax/upload.php:65
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/upload.php:30
+#: ajax/upload.php:66
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/upload.php:31
+#: ajax/upload.php:67
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/upload.php:32
+#: ajax/upload.php:68
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/upload.php:33
+#: ajax/upload.php:69
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:51
+#: ajax/upload.php:87
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:83
+#: ajax/upload.php:119
 msgid "Invalid directory."
 msgstr ""
 
@@ -74,6 +82,36 @@ msgstr ""
 msgid "Files"
 msgstr ""
 
+#: js/file-upload.js:11
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/file-upload.js:24
+msgid "Not enough space available"
+msgstr ""
+
+#: js/file-upload.js:64
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/file-upload.js:167 js/files.js:266
+msgid ""
+"File upload is in progress. Leaving the page now will cancel the upload."
+msgstr ""
+
+#: js/file-upload.js:233 js/files.js:339
+msgid "URL cannot be empty."
+msgstr ""
+
+#: js/file-upload.js:238 lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr ""
+
+#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
+#: js/files.js:693 js/files.js:731
+msgid "Error"
+msgstr ""
+
 #: js/fileactions.js:116
 msgid "Share"
 msgstr ""
@@ -90,43 +128,43 @@ msgstr ""
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:464
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:259
+#: js/filelist.js:302
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:306
+#: js/filelist.js:349
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:306
+#: js/filelist.js:349
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:331
+#: js/filelist.js:374
 msgid "perform delete operation"
 msgstr ""
 
-#: js/filelist.js:413
+#: js/filelist.js:456
 msgid "1 file uploading"
 msgstr ""
 
-#: js/filelist.js:416 js/filelist.js:470
+#: js/filelist.js:459 js/filelist.js:517
 msgid "files uploading"
 msgstr ""
 
@@ -158,69 +196,41 @@ msgid ""
 "big."
 msgstr ""
 
-#: js/files.js:264
-msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr ""
-
-#: js/files.js:277
-msgid "Not enough space available"
-msgstr ""
-
-#: js/files.js:317
-msgid "Upload cancelled."
-msgstr ""
-
-#: js/files.js:413
-msgid ""
-"File upload is in progress. Leaving the page now will cancel the upload."
-msgstr ""
-
-#: js/files.js:486
-msgid "URL cannot be empty."
-msgstr ""
-
-#: js/files.js:491
+#: js/files.js:344
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
-msgid "Error"
-msgstr ""
-
-#: js/files.js:877 templates/index.php:69
+#: js/files.js:744 templates/index.php:69
 msgid "Name"
 msgstr ""
 
-#: js/files.js:878 templates/index.php:80
+#: js/files.js:745 templates/index.php:80
 msgid "Size"
 msgstr ""
 
-#: js/files.js:879 templates/index.php:82
+#: js/files.js:746 templates/index.php:82
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:898
+#: js/files.js:765
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:900
+#: js/files.js:767
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:908
+#: js/files.js:775
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:910
+#: js/files.js:777
 msgid "{count} files"
 msgstr ""
 
-#: lib/app.php:53
-msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
-msgstr ""
-
 #: lib/app.php:73
-msgid "Unable to rename file"
+#, php-format
+msgid "%s could not be renamed"
 msgstr ""
 
 #: lib/helper.php:11 templates/index.php:18
@@ -317,6 +327,22 @@ msgstr ""
 msgid "Current scanning"
 msgstr ""
 
+#: templates/part.list.php:78
+msgid "directory"
+msgstr ""
+
+#: templates/part.list.php:80
+msgid "directories"
+msgstr ""
+
+#: templates/part.list.php:89
+msgid "file"
+msgstr ""
+
+#: templates/part.list.php:91
+msgid "files"
+msgstr ""
+
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
 msgstr ""
diff --git a/l10n/kn/files_encryption.po b/l10n/kn/files_encryption.po
index 260b2a5a71528cfd34354298ee5fabfbef53cda0..227f1e73e33ce344b874bcec0bafd9f4d871a6b4 100644
--- a/l10n/kn/files_encryption.po
+++ b/l10n/kn/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-14 02:46+0200\n"
-"PO-Revision-Date: 2013-06-14 00:47+0000\n"
+"POT-Creation-Date: 2013-07-05 02:12+0200\n"
+"PO-Revision-Date: 2013-07-05 00:13+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Kannada (http://www.transifex.com/projects/p/owncloud/language/kn/)\n"
 "MIME-Version: 1.0\n"
@@ -55,9 +55,21 @@ msgstr ""
 
 #: files/error.php:7
 msgid ""
-"Your private key is not valid! Maybe your password was changed from outside."
-" You can update your private key password in your personal settings to "
-"regain access to your files"
+"Your private key is not valid! Likely your password was changed outside the "
+"ownCloud system (e.g. your corporate directory). You can update your private"
+" key password in your personal settings to recover access to your encrypted "
+"files."
+msgstr ""
+
+#: hooks/hooks.php:44
+msgid "Missing requirements."
+msgstr ""
+
+#: hooks/hooks.php:45
+msgid ""
+"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL "
+"PHP extension is enabled and configured properly. For now, the encryption "
+"app has been disabled."
 msgstr ""
 
 #: js/settings-admin.js:11
@@ -84,11 +96,11 @@ msgstr ""
 
 #: templates/settings-admin.php:10
 msgid ""
-"Enable encryption passwords recovery key (allow sharing to recovery key):"
+"Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
 #: templates/settings-admin.php:14
-msgid "Recovery account password"
+msgid "Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:21 templates/settings-personal.php:54
@@ -100,15 +112,15 @@ msgid "Disabled"
 msgstr ""
 
 #: templates/settings-admin.php:34
-msgid "Change encryption passwords recovery key:"
+msgid "Change recovery key password:"
 msgstr ""
 
 #: templates/settings-admin.php:41
-msgid "Old Recovery account password"
+msgid "Old Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:48
-msgid "New Recovery account password"
+msgid "New Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:53
diff --git a/l10n/kn/files_sharing.po b/l10n/kn/files_sharing.po
index f0d51d40c7ef3dac6ceecba56b34e49df99ccc35..2d27aa7fc366313df61ece51aa10ac7d16b263af 100644
--- a/l10n/kn/files_sharing.po
+++ b/l10n/kn/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-14 02:47+0200\n"
-"PO-Revision-Date: 2013-06-14 00:47+0000\n"
+"POT-Creation-Date: 2013-07-05 02:13+0200\n"
+"PO-Revision-Date: 2013-07-05 00:13+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Kannada (http://www.transifex.com/projects/p/owncloud/language/kn/)\n"
 "MIME-Version: 1.0\n"
@@ -18,27 +18,39 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: templates/authenticate.php:4
+msgid "The password is wrong. Try again."
+msgstr ""
+
+#: templates/authenticate.php:7
 msgid "Password"
 msgstr ""
 
-#: templates/authenticate.php:6
+#: templates/authenticate.php:9
 msgid "Submit"
 msgstr ""
 
-#: templates/public.php:10
+#: templates/public.php:17
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr ""
 
-#: templates/public.php:13
+#: templates/public.php:20
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr ""
 
-#: templates/public.php:19 templates/public.php:43
+#: templates/public.php:28 templates/public.php:86
 msgid "Download"
 msgstr ""
 
-#: templates/public.php:40
+#: templates/public.php:44
+msgid "Upload"
+msgstr ""
+
+#: templates/public.php:54
+msgid "Cancel upload"
+msgstr ""
+
+#: templates/public.php:83
 msgid "No preview available for"
 msgstr ""
diff --git a/l10n/kn/lib.po b/l10n/kn/lib.po
index 2e4f63e50ecbd128820bfb46326e94bb5d0003e7..308114917bc48c6407f97ee063aa870a7498ea84 100644
--- a/l10n/kn/lib.po
+++ b/l10n/kn/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-25 02:02+0200\n"
-"PO-Revision-Date: 2013-05-24 13:27+0000\n"
+"POT-Creation-Date: 2013-07-05 02:13+0200\n"
+"PO-Revision-Date: 2013-07-05 00:13+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Kannada (http://www.transifex.com/projects/p/owncloud/language/kn/)\n"
 "MIME-Version: 1.0\n"
@@ -17,47 +17,51 @@ msgstr ""
 "Language: kn\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: app.php:357
+#: app.php:360
 msgid "Help"
 msgstr ""
 
-#: app.php:370
+#: app.php:373
 msgid "Personal"
 msgstr ""
 
-#: app.php:381
+#: app.php:384
 msgid "Settings"
 msgstr ""
 
-#: app.php:393
+#: app.php:396
 msgid "Users"
 msgstr ""
 
-#: app.php:406
+#: app.php:409
 msgid "Apps"
 msgstr ""
 
-#: app.php:414
+#: app.php:417
 msgid "Admin"
 msgstr ""
 
-#: files.php:207
+#: defaults.php:33
+msgid "web services under your control"
+msgstr ""
+
+#: files.php:210
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: files.php:208
+#: files.php:211
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:209 files.php:242
+#: files.php:212 files.php:245
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:239
+#: files.php:242
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
-#: helper.php:228
+#: helper.php:236
 msgid "couldn't be determined"
 msgstr ""
 
@@ -85,104 +89,102 @@ msgstr ""
 msgid "Images"
 msgstr ""
 
-#: setup.php:34
-msgid "Set an admin username."
-msgstr ""
-
-#: setup.php:37
-msgid "Set an admin password."
-msgstr ""
-
-#: setup.php:55
+#: setup/abstractdatabase.php:22
 #, php-format
 msgid "%s enter the database username."
 msgstr ""
 
-#: setup.php:58
+#: setup/abstractdatabase.php:25
 #, php-format
 msgid "%s enter the database name."
 msgstr ""
 
-#: setup.php:61
+#: setup/abstractdatabase.php:28
 #, php-format
 msgid "%s you may not use dots in the database name"
 msgstr ""
 
-#: setup.php:64
+#: setup/mssql.php:20
 #, php-format
-msgid "%s set the database host."
-msgstr ""
-
-#: setup.php:132 setup.php:329 setup.php:374
-msgid "PostgreSQL username and/or password not valid"
+msgid "MS SQL username and/or password not valid: %s"
 msgstr ""
 
-#: setup.php:133 setup.php:238
+#: setup/mssql.php:21 setup/mysql.php:13 setup/oci.php:114
+#: setup/postgresql.php:24 setup/postgresql.php:70
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:155
-msgid "Oracle connection could not be established"
-msgstr ""
-
-#: setup.php:237
+#: setup/mysql.php:12
 msgid "MySQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
-#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
-#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
-#: setup.php:623
+#: setup/mysql.php:67 setup/oci.php:54 setup/oci.php:121 setup/oci.php:147
+#: setup/oci.php:154 setup/oci.php:165 setup/oci.php:172 setup/oci.php:181
+#: setup/oci.php:189 setup/oci.php:198 setup/oci.php:204
+#: setup/postgresql.php:89 setup/postgresql.php:98 setup/postgresql.php:115
+#: setup/postgresql.php:125 setup/postgresql.php:134
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr ""
 
-#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
-#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
-#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
+#: setup/mysql.php:68 setup/oci.php:55 setup/oci.php:122 setup/oci.php:148
+#: setup/oci.php:155 setup/oci.php:166 setup/oci.php:182 setup/oci.php:190
+#: setup/oci.php:199 setup/postgresql.php:90 setup/postgresql.php:99
+#: setup/postgresql.php:116 setup/postgresql.php:126 setup/postgresql.php:135
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:308
+#: setup/mysql.php:85
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:309
+#: setup/mysql.php:86
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:314
+#: setup/mysql.php:91
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:315
+#: setup/mysql.php:92
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:466 setup.php:533
+#: setup/oci.php:34
+msgid "Oracle connection could not be established"
+msgstr ""
+
+#: setup/oci.php:41 setup/oci.php:113
 msgid "Oracle username and/or password not valid"
 msgstr ""
 
-#: setup.php:592 setup.php:624
+#: setup/oci.php:173 setup/oci.php:205
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:644
-#, php-format
-msgid "MS SQL username and/or password not valid: %s"
+#: setup/postgresql.php:23 setup/postgresql.php:69
+msgid "PostgreSQL username and/or password not valid"
+msgstr ""
+
+#: setup.php:42
+msgid "Set an admin username."
+msgstr ""
+
+#: setup.php:45
+msgid "Set an admin password."
 msgstr ""
 
-#: setup.php:867
+#: setup.php:198
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:868
+#: setup.php:199
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
diff --git a/l10n/kn/settings.po b/l10n/kn/settings.po
index 435aa50322b22f491dc00ae7d10c3bd503d2d707..9c122a4cda76e6bfb3e4d55919c68bf538f0e8a2 100644
--- a/l10n/kn/settings.po
+++ b/l10n/kn/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-11 01:57+0200\n"
-"PO-Revision-Date: 2013-06-10 23:57+0000\n"
+"POT-Creation-Date: 2013-07-09 02:04+0200\n"
+"PO-Revision-Date: 2013-07-09 00:04+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Kannada (http://www.transifex.com/projects/p/owncloud/language/kn/)\n"
 "MIME-Version: 1.0\n"
@@ -58,7 +58,7 @@ msgstr ""
 msgid "Unable to delete group"
 msgstr ""
 
-#: ajax/removeuser.php:24
+#: ajax/removeuser.php:25
 msgid "Unable to delete user"
 msgstr ""
 
@@ -88,35 +88,35 @@ msgstr ""
 msgid "Couldn't update app."
 msgstr ""
 
-#: js/apps.js:30
+#: js/apps.js:35
 msgid "Update to {appversion}"
 msgstr ""
 
-#: js/apps.js:36 js/apps.js:76
+#: js/apps.js:41 js/apps.js:81
 msgid "Disable"
 msgstr ""
 
-#: js/apps.js:36 js/apps.js:64 js/apps.js:83
+#: js/apps.js:41 js/apps.js:69 js/apps.js:88
 msgid "Enable"
 msgstr ""
 
-#: js/apps.js:55
+#: js/apps.js:60
 msgid "Please wait...."
 msgstr ""
 
-#: js/apps.js:59 js/apps.js:71 js/apps.js:80 js/apps.js:93
+#: js/apps.js:64 js/apps.js:76 js/apps.js:85 js/apps.js:98
 msgid "Error"
 msgstr ""
 
-#: js/apps.js:90
+#: js/apps.js:95
 msgid "Updating...."
 msgstr ""
 
-#: js/apps.js:93
+#: js/apps.js:98
 msgid "Error while updating app"
 msgstr ""
 
-#: js/apps.js:96
+#: js/apps.js:101
 msgid "Updated"
 msgstr ""
 
@@ -165,15 +165,15 @@ msgstr ""
 msgid "A valid password must be provided"
 msgstr ""
 
-#: personal.php:35 personal.php:36
+#: personal.php:37 personal.php:38
 msgid "__language_name__"
 msgstr ""
 
-#: templates/admin.php:15
+#: templates/admin.php:17
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:18
+#: templates/admin.php:20
 msgid ""
 "Your data directory and your files are probably accessible from the "
 "internet. The .htaccess file that ownCloud provides is not working. We "
@@ -182,36 +182,36 @@ msgid ""
 " webserver document root."
 msgstr ""
 
-#: templates/admin.php:29
+#: templates/admin.php:31
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:32
+#: templates/admin.php:34
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: templates/admin.php:33
+#: templates/admin.php:35
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:44
+#: templates/admin.php:46
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:47
+#: templates/admin.php:49
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr ""
 
-#: templates/admin.php:58
+#: templates/admin.php:60
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:63
+#: templates/admin.php:65
 #, php-format
 msgid ""
 "This ownCloud server can't set system locale to %s. This means that there "
@@ -219,11 +219,11 @@ msgid ""
 " to install the required packages on your system to support %s."
 msgstr ""
 
-#: templates/admin.php:75
+#: templates/admin.php:77
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:78
+#: templates/admin.php:80
 msgid ""
 "This ownCloud server has no working internet connection. This means that "
 "some of the features like mounting of external storage, notifications about "
@@ -233,102 +233,102 @@ msgid ""
 " of ownCloud."
 msgstr ""
 
-#: templates/admin.php:92
+#: templates/admin.php:94
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:101
+#: templates/admin.php:103
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:111
+#: templates/admin.php:113
 msgid ""
 "cron.php is registered at a webcron service. Call the cron.php page in the "
 "owncloud root once a minute over http."
 msgstr ""
 
-#: templates/admin.php:121
+#: templates/admin.php:123
 msgid ""
 "Use systems cron service. Call the cron.php file in the owncloud folder via "
 "a system cronjob once a minute."
 msgstr ""
 
-#: templates/admin.php:128
+#: templates/admin.php:130
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:134
+#: templates/admin.php:136
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:135
+#: templates/admin.php:137
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:142
+#: templates/admin.php:144
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:143
+#: templates/admin.php:145
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:150
+#: templates/admin.php:152
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:151
+#: templates/admin.php:153
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:158
+#: templates/admin.php:160
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:161
+#: templates/admin.php:163
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:168
+#: templates/admin.php:170
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:181
+#: templates/admin.php:183
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:182
+#: templates/admin.php:184
 msgid ""
 "Enforces the clients to connect to ownCloud via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:185
+#: templates/admin.php:187
 msgid ""
 "Please connect to this ownCloud instance via HTTPS to enable or disable the "
 "SSL enforcement."
 msgstr ""
 
-#: templates/admin.php:195
+#: templates/admin.php:197
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:196
+#: templates/admin.php:198
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:227
+#: templates/admin.php:229
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:228
+#: templates/admin.php:230
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:235 templates/personal.php:111
+#: templates/admin.php:236 templates/personal.php:116
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:237 templates/personal.php:114
+#: templates/admin.php:240 templates/personal.php:119
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -338,27 +338,27 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr ""
 
-#: templates/apps.php:11
+#: templates/apps.php:13
 msgid "Add your App"
 msgstr ""
 
-#: templates/apps.php:12
+#: templates/apps.php:28
 msgid "More Apps"
 msgstr ""
 
-#: templates/apps.php:28
+#: templates/apps.php:33
 msgid "Select an App"
 msgstr ""
 
-#: templates/apps.php:34
+#: templates/apps.php:39
 msgid "See application page at apps.owncloud.com"
 msgstr ""
 
-#: templates/apps.php:36
+#: templates/apps.php:41
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr ""
 
-#: templates/apps.php:38
+#: templates/apps.php:43
 msgid "Update"
 msgstr ""
 
@@ -386,76 +386,79 @@ msgstr ""
 msgid "Commercial Support"
 msgstr ""
 
-#: templates/personal.php:8
-#, php-format
-msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
-msgstr ""
-
-#: templates/personal.php:15
+#: templates/personal.php:10
 msgid "Get the apps to sync your files"
 msgstr ""
 
-#: templates/personal.php:26
+#: templates/personal.php:21
 msgid "Show First Run Wizard again"
 msgstr ""
 
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:29
+#, php-format
+msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
+msgstr ""
+
+#: templates/personal.php:41 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr ""
 
-#: templates/personal.php:38
+#: templates/personal.php:42
 msgid "Your password was changed"
 msgstr ""
 
-#: templates/personal.php:39
+#: templates/personal.php:43
 msgid "Unable to change your password"
 msgstr ""
 
-#: templates/personal.php:40
+#: templates/personal.php:44
 msgid "Current password"
 msgstr ""
 
-#: templates/personal.php:42
+#: templates/personal.php:46
 msgid "New password"
 msgstr ""
 
-#: templates/personal.php:44
+#: templates/personal.php:48
 msgid "Change password"
 msgstr ""
 
-#: templates/personal.php:56 templates/users.php:85
+#: templates/personal.php:60 templates/users.php:85
 msgid "Display Name"
 msgstr ""
 
-#: templates/personal.php:71
+#: templates/personal.php:75
 msgid "Email"
 msgstr ""
 
-#: templates/personal.php:73
+#: templates/personal.php:77
 msgid "Your email address"
 msgstr ""
 
-#: templates/personal.php:74
+#: templates/personal.php:78
 msgid "Fill in an email address to enable password recovery"
 msgstr ""
 
-#: templates/personal.php:83 templates/personal.php:84
+#: templates/personal.php:87 templates/personal.php:88
 msgid "Language"
 msgstr ""
 
-#: templates/personal.php:95
+#: templates/personal.php:100
 msgid "Help translate"
 msgstr ""
 
-#: templates/personal.php:100
+#: templates/personal.php:106
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:102
-msgid "Use this address to connect to your ownCloud in your file manager"
+#: templates/personal.php:108
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
+"target=\"_blank\">access your Files via WebDAV</a>"
 msgstr ""
 
-#: templates/users.php:21 templates/users.php:84
+#: templates/users.php:21
 msgid "Login Name"
 msgstr ""
 
@@ -485,6 +488,10 @@ msgstr ""
 msgid "Other"
 msgstr ""
 
+#: templates/users.php:84
+msgid "Username"
+msgstr ""
+
 #: templates/users.php:91
 msgid "Storage"
 msgstr ""
diff --git a/l10n/ko/core.po b/l10n/ko/core.po
index 728a9b984f335c69aacbb0aed37b2318e023f3b9..c4b5d0edbda8226d830a569bcdbcb189a9d1567c 100644
--- a/l10n/ko/core.po
+++ b/l10n/ko/core.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:22+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:14+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
 "MIME-Version: 1.0\n"
@@ -62,135 +62,135 @@ msgstr "삭제할 분류를 선택하지 않았습니다. "
 msgid "Error removing %s from favorites."
 msgstr "책갈피에서 %s을(를) 삭제할 수 없었습니다."
 
-#: js/config.php:34
+#: js/config.php:32
 msgid "Sunday"
 msgstr "일요일"
 
-#: js/config.php:35
+#: js/config.php:33
 msgid "Monday"
 msgstr "월요일"
 
-#: js/config.php:36
+#: js/config.php:34
 msgid "Tuesday"
 msgstr "화요일"
 
-#: js/config.php:37
+#: js/config.php:35
 msgid "Wednesday"
 msgstr "수요일"
 
-#: js/config.php:38
+#: js/config.php:36
 msgid "Thursday"
 msgstr "목요일"
 
-#: js/config.php:39
+#: js/config.php:37
 msgid "Friday"
 msgstr "금요일"
 
-#: js/config.php:40
+#: js/config.php:38
 msgid "Saturday"
 msgstr "토요일"
 
-#: js/config.php:45
+#: js/config.php:43
 msgid "January"
 msgstr "1ì›”"
 
-#: js/config.php:46
+#: js/config.php:44
 msgid "February"
 msgstr "2ì›”"
 
-#: js/config.php:47
+#: js/config.php:45
 msgid "March"
 msgstr "3ì›”"
 
-#: js/config.php:48
+#: js/config.php:46
 msgid "April"
 msgstr "4ì›”"
 
-#: js/config.php:49
+#: js/config.php:47
 msgid "May"
 msgstr "5ì›”"
 
-#: js/config.php:50
+#: js/config.php:48
 msgid "June"
 msgstr "6ì›”"
 
-#: js/config.php:51
+#: js/config.php:49
 msgid "July"
 msgstr "7ì›”"
 
-#: js/config.php:52
+#: js/config.php:50
 msgid "August"
 msgstr "8ì›”"
 
-#: js/config.php:53
+#: js/config.php:51
 msgid "September"
 msgstr "9ì›”"
 
-#: js/config.php:54
+#: js/config.php:52
 msgid "October"
 msgstr "10ì›”"
 
-#: js/config.php:55
+#: js/config.php:53
 msgid "November"
 msgstr "11ì›”"
 
-#: js/config.php:56
+#: js/config.php:54
 msgid "December"
 msgstr "12ì›”"
 
-#: js/js.js:286
+#: js/js.js:293
 msgid "Settings"
 msgstr "설정"
 
-#: js/js.js:718
+#: js/js.js:725
 msgid "seconds ago"
 msgstr "ì´ˆ ì „"
 
-#: js/js.js:719
+#: js/js.js:726
 msgid "1 minute ago"
 msgstr "1분 전"
 
-#: js/js.js:720
+#: js/js.js:727
 msgid "{minutes} minutes ago"
 msgstr "{minutes}분 전"
 
-#: js/js.js:721
+#: js/js.js:728
 msgid "1 hour ago"
 msgstr "1시간 전"
 
-#: js/js.js:722
+#: js/js.js:729
 msgid "{hours} hours ago"
 msgstr "{hours}시간 전"
 
-#: js/js.js:723
+#: js/js.js:730
 msgid "today"
 msgstr "오늘"
 
-#: js/js.js:724
+#: js/js.js:731
 msgid "yesterday"
 msgstr "어제"
 
-#: js/js.js:725
+#: js/js.js:732
 msgid "{days} days ago"
 msgstr "{days}일 전"
 
-#: js/js.js:726
+#: js/js.js:733
 msgid "last month"
 msgstr "지난 달"
 
-#: js/js.js:727
+#: js/js.js:734
 msgid "{months} months ago"
 msgstr "{months}개월 전"
 
-#: js/js.js:728
+#: js/js.js:735
 msgid "months ago"
 msgstr "개월 전"
 
-#: js/js.js:729
+#: js/js.js:736
 msgid "last year"
 msgstr "ìž‘ë…„"
 
-#: js/js.js:730
+#: js/js.js:737
 msgid "years ago"
 msgstr "ë…„ ì „"
 
@@ -226,8 +226,8 @@ msgstr "객체 유형이 지정되지 않았습니다."
 #: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
 #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:577
-#: js/share.js:589
+#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:620
+#: js/share.js:632
 msgid "Error"
 msgstr "오류"
 
@@ -247,7 +247,7 @@ msgstr "공유됨"
 msgid "Share"
 msgstr "공유"
 
-#: js/share.js:125 js/share.js:617
+#: js/share.js:125 js/share.js:660
 msgid "Error while sharing"
 msgstr "공유하는 중 오류 발생"
 
@@ -267,99 +267,103 @@ msgstr "{owner} 님이 여러분 및 그룹 {group}와(과) 공유 중"
 msgid "Shared with you by {owner}"
 msgstr "{owner} 님이 공유 중"
 
-#: js/share.js:159
+#: js/share.js:172
 msgid "Share with"
 msgstr "다음으로 공유"
 
-#: js/share.js:164
+#: js/share.js:177
 msgid "Share with link"
 msgstr "URL 링크로 공유"
 
-#: js/share.js:167
+#: js/share.js:180
 msgid "Password protect"
 msgstr "암호 보호"
 
-#: js/share.js:169 templates/installation.php:54 templates/login.php:26
+#: js/share.js:182 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "암호"
 
-#: js/share.js:173
+#: js/share.js:187
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:191
 msgid "Email link to person"
 msgstr "이메일 주소"
 
-#: js/share.js:174
+#: js/share.js:192
 msgid "Send"
 msgstr "전송"
 
-#: js/share.js:178
+#: js/share.js:197
 msgid "Set expiration date"
 msgstr "만료 날짜 설정"
 
-#: js/share.js:179
+#: js/share.js:198
 msgid "Expiration date"
 msgstr "만료 날짜"
 
-#: js/share.js:211
+#: js/share.js:230
 msgid "Share via email:"
 msgstr "이메일로 공유:"
 
-#: js/share.js:213
+#: js/share.js:232
 msgid "No people found"
 msgstr "발견된 사람 없음"
 
-#: js/share.js:251
+#: js/share.js:270
 msgid "Resharing is not allowed"
 msgstr "다시 공유할 수 없습니다"
 
-#: js/share.js:287
+#: js/share.js:306
 msgid "Shared in {item} with {user}"
 msgstr "{user} 님과 {item}에서 공유 중"
 
-#: js/share.js:308
+#: js/share.js:327
 msgid "Unshare"
 msgstr "공유 해제"
 
-#: js/share.js:320
+#: js/share.js:339
 msgid "can edit"
 msgstr "편집 가능"
 
-#: js/share.js:322
+#: js/share.js:341
 msgid "access control"
 msgstr "접근 제어"
 
-#: js/share.js:325
+#: js/share.js:344
 msgid "create"
 msgstr "생성"
 
-#: js/share.js:328
+#: js/share.js:347
 msgid "update"
 msgstr "업데이트"
 
-#: js/share.js:331
+#: js/share.js:350
 msgid "delete"
 msgstr "삭제"
 
-#: js/share.js:334
+#: js/share.js:353
 msgid "share"
 msgstr "공유"
 
-#: js/share.js:368 js/share.js:564
+#: js/share.js:387 js/share.js:607
 msgid "Password protected"
 msgstr "암호로 보호됨"
 
-#: js/share.js:577
+#: js/share.js:620
 msgid "Error unsetting expiration date"
 msgstr "만료 날짜 해제 오류"
 
-#: js/share.js:589
+#: js/share.js:632
 msgid "Error setting expiration date"
 msgstr "만료 날짜 설정 오류"
 
-#: js/share.js:604
+#: js/share.js:647
 msgid "Sending ..."
 msgstr "전송 중..."
 
-#: js/share.js:615
+#: js/share.js:658
 msgid "Email sent"
 msgstr "이메일 발송됨"
 
@@ -374,7 +378,7 @@ msgstr "업데이트가 실패하였습니다. 이 문제를 <a href=\"https://g
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "업데이트가 성공하였습니다. ownCloud로 돌아갑니다."
 
-#: lostpassword/controller.php:58
+#: lostpassword/controller.php:60
 msgid "ownCloud password reset"
 msgstr "ownCloud 암호 재설정"
 
@@ -404,17 +408,17 @@ msgstr "사용자 이름"
 
 #: lostpassword/templates/lostpassword.php:22
 msgid ""
-"Your files seems to be encrypted. If you didn't have enabled the recovery "
-"key there will be no way to get your data back once the password was "
-"resetted. If you are not sure what to do, please contact your administrator "
-"first before continue. Do you really want to continue?"
+"Your files are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
 msgstr ""
 
 #: lostpassword/templates/lostpassword.php:24
 msgid "Yes, I really want to reset my password now"
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:29
+#: lostpassword/templates/lostpassword.php:27
 msgid "Request reset"
 msgstr "요청 초기화"
 
@@ -462,7 +466,7 @@ msgstr "접근 금지됨"
 msgid "Cloud not found"
 msgstr "클라우드를 찾을 수 없습니다"
 
-#: templates/altmail.php:2
+#: templates/altmail.php:4
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -473,10 +477,6 @@ msgid ""
 "Cheers!"
 msgstr ""
 
-#: templates/altmail.php:7 templates/mail.php:24
-msgid "web services under your control"
-msgstr "내가 관리하는 웹 서비스"
-
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
 msgstr "분류 수정"
@@ -569,12 +569,12 @@ msgstr "데이터베이스 호스트"
 msgid "Finish setup"
 msgstr "설치 완료"
 
-#: templates/layout.user.php:40
+#: templates/layout.user.php:43
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:67
+#: templates/layout.user.php:68
 msgid "Log out"
 msgstr "로그아웃"
 
@@ -608,7 +608,7 @@ msgstr "로그인"
 msgid "Alternative Logins"
 msgstr "대체 "
 
-#: templates/mail.php:15
+#: templates/mail.php:16
 #, php-format
 msgid ""
 "Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
diff --git a/l10n/ko/files.po b/l10n/ko/files.po
index d8fdcd466dde68ea4209209c03d39a180f79c821..31c0f7b50f6d65fa443ca1bfc10c886c5e325e47 100644
--- a/l10n/ko/files.po
+++ b/l10n/ko/files.po
@@ -3,14 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# ujuc Gang <potopro@gmail.com>, 2013
-# ujuc Gang <potopro@gmail.com>, 2013
+# Sungjin Gang <potopro@gmail.com>, 2013
+# Sungjin Gang <potopro@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:01+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
 "MIME-Version: 1.0\n"
@@ -29,46 +29,54 @@ msgstr "%s 항목을 이동시키지 못하였음 - 파일 이름이 이미 존
 msgid "Could not move %s"
 msgstr "%s 항목을 이딩시키지 못하였음"
 
-#: ajax/upload.php:19
+#: ajax/upload.php:16 ajax/upload.php:45
+msgid "Unable to set upload directory."
+msgstr ""
+
+#: ajax/upload.php:22
+msgid "Invalid Token"
+msgstr ""
+
+#: ajax/upload.php:59
 msgid "No file was uploaded. Unknown error"
 msgstr "파일이 업로드되지 않았습니다. 알 수 없는 오류입니다"
 
-#: ajax/upload.php:26
+#: ajax/upload.php:66
 msgid "There is no error, the file uploaded with success"
 msgstr "파일 업로드에 성공하였습니다."
 
-#: ajax/upload.php:27
+#: ajax/upload.php:67
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr "업로드한 파일이 php.ini의 upload_max_filesize보다 큽니다:"
 
-#: ajax/upload.php:29
+#: ajax/upload.php:69
 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:30
+#: ajax/upload.php:70
 msgid "The uploaded file was only partially uploaded"
 msgstr "파일의 일부분만 업로드됨"
 
-#: ajax/upload.php:31
+#: ajax/upload.php:71
 msgid "No file was uploaded"
 msgstr "파일이 업로드되지 않았음"
 
-#: ajax/upload.php:32
+#: ajax/upload.php:72
 msgid "Missing a temporary folder"
 msgstr "임시 폴더가 없음"
 
-#: ajax/upload.php:33
+#: ajax/upload.php:73
 msgid "Failed to write to disk"
 msgstr "디스크에 쓰지 못했습니다"
 
-#: ajax/upload.php:51
+#: ajax/upload.php:91
 msgid "Not enough storage available"
 msgstr "저장소가 용량이 충분하지 않습니다."
 
-#: ajax/upload.php:83
+#: ajax/upload.php:123
 msgid "Invalid directory."
 msgstr "올바르지 않은 디렉터리입니다."
 
@@ -76,6 +84,36 @@ msgstr "올바르지 않은 디렉터리입니다."
 msgid "Files"
 msgstr "파일"
 
+#: js/file-upload.js:11
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr "디렉터리 및 빈 파일은 업로드할 수 없습니다"
+
+#: js/file-upload.js:24
+msgid "Not enough space available"
+msgstr "여유 공간이 부족합니다"
+
+#: js/file-upload.js:64
+msgid "Upload cancelled."
+msgstr "업로드가 취소되었습니다."
+
+#: js/file-upload.js:167 js/files.js:266
+msgid ""
+"File upload is in progress. Leaving the page now will cancel the upload."
+msgstr "파일 업로드가 진행 중입니다. 이 페이지를 벗어나면 업로드가 취소됩니다."
+
+#: js/file-upload.js:233 js/files.js:339
+msgid "URL cannot be empty."
+msgstr "URL을 입력해야 합니다."
+
+#: js/file-upload.js:238 lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr ""
+
+#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
+#: js/files.js:693 js/files.js:731
+msgid "Error"
+msgstr "오류"
+
 #: js/fileactions.js:116
 msgid "Share"
 msgstr "공유"
@@ -92,43 +130,43 @@ msgstr "삭제"
 msgid "Rename"
 msgstr "이름 바꾸기"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:464
 msgid "Pending"
 msgstr "대기 중"
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "{new_name} already exists"
 msgstr "{new_name}이(가) 이미 존재함"
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "replace"
 msgstr "바꾸기"
 
-#: js/filelist.js:259
+#: js/filelist.js:302
 msgid "suggest name"
 msgstr "이름 제안"
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "cancel"
 msgstr "취소"
 
-#: js/filelist.js:306
+#: js/filelist.js:349
 msgid "replaced {new_name} with {old_name}"
 msgstr "{old_name}이(가) {new_name}(으)로 대체됨"
 
-#: js/filelist.js:306
+#: js/filelist.js:349
 msgid "undo"
 msgstr "되돌리기"
 
-#: js/filelist.js:331
+#: js/filelist.js:374
 msgid "perform delete operation"
 msgstr "삭제 작업중"
 
-#: js/filelist.js:413
+#: js/filelist.js:456
 msgid "1 file uploading"
 msgstr "파일 1개 업로드 중"
 
-#: js/filelist.js:416 js/filelist.js:470
+#: js/filelist.js:459 js/filelist.js:517
 msgid "files uploading"
 msgstr "파일 업로드중"
 
@@ -160,70 +198,42 @@ msgid ""
 "big."
 msgstr "다운로드가 준비 중입니다. 파일 크기가 크다면 시간이 오래 걸릴 수도 있습니다."
 
-#: js/files.js:264
-msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "디렉터리 및 빈 파일은 업로드할 수 없습니다"
-
-#: js/files.js:277
-msgid "Not enough space available"
-msgstr "여유 공간이 부족합니다"
-
-#: js/files.js:317
-msgid "Upload cancelled."
-msgstr "업로드가 취소되었습니다."
-
-#: js/files.js:413
-msgid ""
-"File upload is in progress. Leaving the page now will cancel the upload."
-msgstr "파일 업로드가 진행 중입니다. 이 페이지를 벗어나면 업로드가 취소됩니다."
-
-#: js/files.js:486
-msgid "URL cannot be empty."
-msgstr "URL을 입력해야 합니다."
-
-#: js/files.js:491
+#: js/files.js:344
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "폴더 이름이 유효하지 않습니다. "
 
-#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
-msgid "Error"
-msgstr "오류"
-
-#: js/files.js:877 templates/index.php:69
+#: js/files.js:744 templates/index.php:69
 msgid "Name"
 msgstr "이름"
 
-#: js/files.js:878 templates/index.php:80
+#: js/files.js:745 templates/index.php:80
 msgid "Size"
 msgstr "크기"
 
-#: js/files.js:879 templates/index.php:82
+#: js/files.js:746 templates/index.php:82
 msgid "Modified"
 msgstr "수정됨"
 
-#: js/files.js:898
+#: js/files.js:765
 msgid "1 folder"
 msgstr "폴더 1개"
 
-#: js/files.js:900
+#: js/files.js:767
 msgid "{count} folders"
 msgstr "폴더 {count}개"
 
-#: js/files.js:908
+#: js/files.js:775
 msgid "1 file"
 msgstr "파일 1개"
 
-#: js/files.js:910
+#: js/files.js:777
 msgid "{count} files"
 msgstr "파일 {count}개"
 
-#: lib/app.php:53
-msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
-msgstr ""
-
 #: lib/app.php:73
-msgid "Unable to rename file"
-msgstr "파일 이름바꾸기 할 수 없음"
+#, php-format
+msgid "%s could not be renamed"
+msgstr ""
 
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
@@ -319,6 +329,22 @@ msgstr "파일을 검색하고 있습니다. 기다려 주십시오."
 msgid "Current scanning"
 msgstr "현재 검색"
 
+#: templates/part.list.php:76
+msgid "directory"
+msgstr ""
+
+#: templates/part.list.php:78
+msgid "directories"
+msgstr ""
+
+#: templates/part.list.php:87
+msgid "file"
+msgstr "파일"
+
+#: templates/part.list.php:89
+msgid "files"
+msgstr "파일"
+
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
 msgstr "파일 시스템 캐시 업그레이드 중..."
diff --git a/l10n/ko/files_encryption.po b/l10n/ko/files_encryption.po
index 1b93cac0578ccbf67fd4e99059a6814c5230aa20..8fe2f1bc3b32efc7c1c9fffffeb8bb68f4cf8e9b 100644
--- a/l10n/ko/files_encryption.po
+++ b/l10n/ko/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-14 02:46+0200\n"
-"PO-Revision-Date: 2013-06-14 00:47+0000\n"
+"POT-Creation-Date: 2013-07-05 02:12+0200\n"
+"PO-Revision-Date: 2013-07-05 00:13+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"
@@ -55,9 +55,21 @@ msgstr ""
 
 #: files/error.php:7
 msgid ""
-"Your private key is not valid! Maybe your password was changed from outside."
-" You can update your private key password in your personal settings to "
-"regain access to your files"
+"Your private key is not valid! Likely your password was changed outside the "
+"ownCloud system (e.g. your corporate directory). You can update your private"
+" key password in your personal settings to recover access to your encrypted "
+"files."
+msgstr ""
+
+#: hooks/hooks.php:44
+msgid "Missing requirements."
+msgstr ""
+
+#: hooks/hooks.php:45
+msgid ""
+"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL "
+"PHP extension is enabled and configured properly. For now, the encryption "
+"app has been disabled."
 msgstr ""
 
 #: js/settings-admin.js:11
@@ -84,11 +96,11 @@ msgstr "암호화"
 
 #: templates/settings-admin.php:10
 msgid ""
-"Enable encryption passwords recovery key (allow sharing to recovery key):"
+"Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
 #: templates/settings-admin.php:14
-msgid "Recovery account password"
+msgid "Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:21 templates/settings-personal.php:54
@@ -100,15 +112,15 @@ msgid "Disabled"
 msgstr ""
 
 #: templates/settings-admin.php:34
-msgid "Change encryption passwords recovery key:"
+msgid "Change recovery key password:"
 msgstr ""
 
 #: templates/settings-admin.php:41
-msgid "Old Recovery account password"
+msgid "Old Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:48
-msgid "New Recovery account password"
+msgid "New Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:53
diff --git a/l10n/ko/files_external.po b/l10n/ko/files_external.po
index 2aacc5c07578dc1f6197ccb57200ff74c591aead..ff9ab7fb1f271777091374e86a544c04d4710213 100644
--- a/l10n/ko/files_external.po
+++ b/l10n/ko/files_external.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Shinjo Park <kde@peremen.name>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
+"Last-Translator: Shinjo Park <kde@peremen.name>\n"
 "Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -55,7 +56,7 @@ msgid ""
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
 "Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
 "your system administrator to install it."
-msgstr ""
+msgstr "<b>경고:</b> PHP Curl 지원이 비활성화되어 있거나 설치되지 않았습니다. 다른 ownCloud, WebDAV, Google 드라이브 공유를 마운트할 수 없습니다. 시스템 관리자에게 설치를 요청하십시오."
 
 #: templates/settings.php:3
 msgid "External Storage"
@@ -67,7 +68,7 @@ msgstr "폴더 이름"
 
 #: templates/settings.php:10
 msgid "External storage"
-msgstr ""
+msgstr "외부 저장소"
 
 #: templates/settings.php:11
 msgid "Configuration"
@@ -83,7 +84,7 @@ msgstr "적용 가능"
 
 #: templates/settings.php:33
 msgid "Add storage"
-msgstr ""
+msgstr "저장소 추가"
 
 #: templates/settings.php:90
 msgid "None set"
diff --git a/l10n/ko/files_sharing.po b/l10n/ko/files_sharing.po
index 4a063859e14df1f2424301ec72963bd3b32862ae..c04ee8f09357550962548e96d9f3ed0e4ab1b209 100644
--- a/l10n/ko/files_sharing.po
+++ b/l10n/ko/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
 "MIME-Version: 1.0\n"
@@ -18,27 +18,39 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: templates/authenticate.php:4
+msgid "The password is wrong. Try again."
+msgstr ""
+
+#: templates/authenticate.php:7
 msgid "Password"
 msgstr "암호"
 
-#: templates/authenticate.php:6
+#: templates/authenticate.php:9
 msgid "Submit"
 msgstr "제출"
 
-#: templates/public.php:10
+#: templates/public.php:17
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s 님이 폴더 %s을(를) 공유하였습니다"
 
-#: templates/public.php:13
+#: templates/public.php:20
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s 님이 파일 %s을(를) 공유하였습니다"
 
-#: templates/public.php:19 templates/public.php:43
+#: templates/public.php:28 templates/public.php:90
 msgid "Download"
 msgstr "다운로드"
 
-#: templates/public.php:40
+#: templates/public.php:45 templates/public.php:48
+msgid "Upload"
+msgstr "업로드"
+
+#: templates/public.php:58
+msgid "Cancel upload"
+msgstr "업로드 취소"
+
+#: templates/public.php:87
 msgid "No preview available for"
 msgstr "다음 항목을 미리 볼 수 없음:"
diff --git a/l10n/ko/files_trashbin.po b/l10n/ko/files_trashbin.po
index 4faf9aa8418a6186288a624f65677cb5df1b03d4..0fd7ae7cd9b5d4052e663f07e39002140e61fbf5 100644
--- a/l10n/ko/files_trashbin.po
+++ b/l10n/ko/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:16+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/ko/files_versions.po b/l10n/ko/files_versions.po
index ce0e200f0ba0a561749aff22cfd54bef9241cb19..f92a63026989a27f73dff720be0a0e33a409319b 100644
--- a/l10n/ko/files_versions.po
+++ b/l10n/ko/files_versions.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Shinjo Park <kde@peremen.name>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-25 02:01+0200\n"
-"PO-Revision-Date: 2013-05-24 13:28+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-06-20 02:37+0200\n"
+"PO-Revision-Date: 2013-06-19 08:50+0000\n"
+"Last-Translator: Shinjo Park <kde@peremen.name>\n"
 "Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -24,12 +25,12 @@ msgstr "되돌릴 수 없습니다: %s"
 
 #: history.php:40
 msgid "success"
-msgstr "완료"
+msgstr "성공"
 
 #: history.php:42
 #, php-format
 msgid "File %s was reverted to version %s"
-msgstr "파일 %s를 버전 %s로 변경하였습니다."
+msgstr "파일 %s을(를) 버전 %s(으)로 되돌림"
 
 #: history.php:49
 msgid "failure"
@@ -38,20 +39,20 @@ msgstr "실패"
 #: history.php:51
 #, php-format
 msgid "File %s could not be reverted to version %s"
-msgstr "파일 %s를 버전 %s로 되돌리지 못했습니다."
+msgstr "파일 %s을(를) 버전 %s(으)로 되돌리지 못했음"
 
 #: history.php:69
 msgid "No old versions available"
-msgstr "오래된 버전을 사용할 수 없습니다"
+msgstr "오래된 버전을 사용할 수 없음"
 
 #: history.php:74
 msgid "No path specified"
-msgstr "경로를 알수 없습니다."
+msgstr "경로가 지정되지 않았음"
 
 #: js/versions.js:6
 msgid "Versions"
-msgstr "버젼"
+msgstr "버전"
 
 #: templates/history.php:20
 msgid "Revert a file to a previous version by clicking on its revert button"
-msgstr "변경 버튼을 클릭하여 이전 버전의 파일로 변경할 수 있습니다."
+msgstr "변경 단추를 눌러 이전 버전의 파일로 되돌릴 수 있습니다"
diff --git a/l10n/ko/lib.po b/l10n/ko/lib.po
index 1f90b67d281bb36975f1a3111069bc329bda9988..212aa1e0a73eb87798b5b8680ba7bc5d79298e6a 100644
--- a/l10n/ko/lib.po
+++ b/l10n/ko/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
 "MIME-Version: 1.0\n"
@@ -17,43 +17,47 @@ msgstr ""
 "Language: ko\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: app.php:359
+#: app.php:360
 msgid "Help"
 msgstr "도움말"
 
-#: app.php:372
+#: app.php:373
 msgid "Personal"
 msgstr "개인"
 
-#: app.php:383
+#: app.php:384
 msgid "Settings"
 msgstr "설정"
 
-#: app.php:395
+#: app.php:396
 msgid "Users"
 msgstr "사용자"
 
-#: app.php:408
+#: app.php:409
 msgid "Apps"
 msgstr "앱"
 
-#: app.php:416
+#: app.php:417
 msgid "Admin"
 msgstr "관리자"
 
-#: files.php:210
+#: defaults.php:33
+msgid "web services under your control"
+msgstr "내가 관리하는 웹 서비스"
+
+#: files.php:226
 msgid "ZIP download is turned off."
 msgstr "ZIP 다운로드가 비활성화되었습니다."
 
-#: files.php:211
+#: files.php:227
 msgid "Files need to be downloaded one by one."
 msgstr "파일을 개별적으로 다운로드해야 합니다."
 
-#: files.php:212 files.php:245
+#: files.php:228 files.php:261
 msgid "Back to Files"
 msgstr "파일로 돌아가기"
 
-#: files.php:242
+#: files.php:258
 msgid "Selected files too large to generate zip file."
 msgstr "선택한 파일들은 ZIP 파일을 생성하기에 너무 큽니다."
 
@@ -85,107 +89,105 @@ msgstr "텍스트"
 msgid "Images"
 msgstr "그림"
 
-#: setup.php:34
-msgid "Set an admin username."
-msgstr ""
-
-#: setup.php:37
-msgid "Set an admin password."
-msgstr ""
-
-#: setup.php:55
+#: setup/abstractdatabase.php:22
 #, php-format
 msgid "%s enter the database username."
 msgstr ""
 
-#: setup.php:58
+#: setup/abstractdatabase.php:25
 #, php-format
 msgid "%s enter the database name."
 msgstr ""
 
-#: setup.php:61
+#: setup/abstractdatabase.php:28
 #, php-format
 msgid "%s you may not use dots in the database name"
 msgstr ""
 
-#: setup.php:64
+#: setup/mssql.php:20
 #, php-format
-msgid "%s set the database host."
-msgstr ""
-
-#: setup.php:126 setup.php:332 setup.php:377
-msgid "PostgreSQL username and/or password not valid"
+msgid "MS SQL username and/or password not valid: %s"
 msgstr ""
 
-#: setup.php:127 setup.php:235
+#: setup/mssql.php:21 setup/mysql.php:13 setup/oci.php:114
+#: setup/postgresql.php:24 setup/postgresql.php:70
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:152
-msgid "Oracle connection could not be established"
-msgstr ""
-
-#: setup.php:234
+#: setup/mysql.php:12
 msgid "MySQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:288 setup.php:398 setup.php:407 setup.php:425 setup.php:435
-#: setup.php:444 setup.php:477 setup.php:543 setup.php:569 setup.php:576
-#: setup.php:587 setup.php:594 setup.php:603 setup.php:611 setup.php:620
-#: setup.php:626
+#: setup/mysql.php:67 setup/oci.php:54 setup/oci.php:121 setup/oci.php:147
+#: setup/oci.php:154 setup/oci.php:165 setup/oci.php:172 setup/oci.php:181
+#: setup/oci.php:189 setup/oci.php:198 setup/oci.php:204
+#: setup/postgresql.php:89 setup/postgresql.php:98 setup/postgresql.php:115
+#: setup/postgresql.php:125 setup/postgresql.php:134
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr ""
 
-#: setup.php:289 setup.php:399 setup.php:408 setup.php:426 setup.php:436
-#: setup.php:445 setup.php:478 setup.php:544 setup.php:570 setup.php:577
-#: setup.php:588 setup.php:604 setup.php:612 setup.php:621
+#: setup/mysql.php:68 setup/oci.php:55 setup/oci.php:122 setup/oci.php:148
+#: setup/oci.php:155 setup/oci.php:166 setup/oci.php:182 setup/oci.php:190
+#: setup/oci.php:199 setup/postgresql.php:90 setup/postgresql.php:99
+#: setup/postgresql.php:116 setup/postgresql.php:126 setup/postgresql.php:135
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:305
+#: setup/mysql.php:85
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:306
+#: setup/mysql.php:86
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:311
+#: setup/mysql.php:91
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:312
+#: setup/mysql.php:92
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:469 setup.php:536
+#: setup/oci.php:34
+msgid "Oracle connection could not be established"
+msgstr ""
+
+#: setup/oci.php:41 setup/oci.php:113
 msgid "Oracle username and/or password not valid"
 msgstr ""
 
-#: setup.php:595 setup.php:627
+#: setup/oci.php:173 setup/oci.php:205
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:647
-#, php-format
-msgid "MS SQL username and/or password not valid: %s"
+#: setup/postgresql.php:23 setup/postgresql.php:69
+msgid "PostgreSQL username and/or password not valid"
+msgstr ""
+
+#: setup.php:42
+msgid "Set an admin username."
 msgstr ""
 
-#: setup.php:870
+#: setup.php:45
+msgid "Set an admin password."
+msgstr ""
+
+#: setup.php:198
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
-msgstr ""
+msgstr "WebDAV 인터페이스가 제대로 작동하지 않습니다. 웹 서버에서 파일 동기화를 사용할 수 있도록 설정이 제대로 되지 않은 것 같습니다."
 
-#: setup.php:871
+#: setup.php:199
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
-msgstr ""
+msgstr "<a href='%s'>설치 가이드</a>를 다시 한 번 확인하십시오."
 
 #: template.php:113
 msgid "seconds ago"
diff --git a/l10n/ko/settings.po b/l10n/ko/settings.po
index 17b777832bf68cb323688e5f21d5a3b44ef0cc35..6ed3d87042ac03d5ee999ababc78702880755816 100644
--- a/l10n/ko/settings.po
+++ b/l10n/ko/settings.po
@@ -3,12 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Shinjo Park <kde@peremen.name>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
 "MIME-Version: 1.0\n"
@@ -28,19 +29,19 @@ msgstr "인증 오류"
 
 #: ajax/changedisplayname.php:31
 msgid "Your display name has been changed."
-msgstr ""
+msgstr "표시 이름이 변경되었습니다."
 
 #: ajax/changedisplayname.php:34
 msgid "Unable to change display name"
-msgstr ""
+msgstr "표시 이름을 변경할 수 없음"
 
 #: ajax/creategroup.php:10
 msgid "Group already exists"
-msgstr "그룹이 이미 존재합니다."
+msgstr "그룹이 이미 존재함"
 
 #: ajax/creategroup.php:19
 msgid "Unable to add group"
-msgstr "그룹을 추가할 수 없습니다."
+msgstr "그룹을 추가할 수 없음"
 
 #: ajax/enableapp.php:11
 msgid "Could not enable app. "
@@ -56,15 +57,15 @@ msgstr "잘못된 이메일 주소"
 
 #: ajax/removegroup.php:13
 msgid "Unable to delete group"
-msgstr "그룹을 삭제할 수 없습니다."
+msgstr "그룹을 삭제할 수 없음"
 
 #: ajax/removeuser.php:25
 msgid "Unable to delete user"
-msgstr "사용자를 삭제할 수 없습니다."
+msgstr "사용자를 삭제할 수 없음."
 
 #: ajax/setlanguage.php:15
 msgid "Language changed"
-msgstr "언어가 변경되었습니다"
+msgstr "언어가 변경됨"
 
 #: ajax/setlanguage.php:17 ajax/setlanguage.php:20
 msgid "Invalid request"
@@ -72,53 +73,53 @@ msgstr "잘못된 요청"
 
 #: ajax/togglegroups.php:12
 msgid "Admins can't remove themself from the admin group"
-msgstr "관리자 자신을 관리자 그룹에서 삭제할 수 없습니다"
+msgstr "관리자 자신을 관리자 그룹에서 삭제할 수 없음"
 
 #: ajax/togglegroups.php:30
 #, php-format
 msgid "Unable to add user to group %s"
-msgstr "그룹 %s에 사용자를 추가할 수 없습니다."
+msgstr "그룹 %s에 사용자를 추가할 수 없음"
 
 #: ajax/togglegroups.php:36
 #, php-format
 msgid "Unable to remove user from group %s"
-msgstr "그룹 %s에서 사용자를 삭제할 수 없습니다."
+msgstr "그룹 %s에서 사용자를 삭제할 수 없음"
 
 #: ajax/updateapp.php:14
 msgid "Couldn't update app."
-msgstr ""
+msgstr "앱을 업데이트할 수 없습니다."
 
-#: js/apps.js:30
+#: js/apps.js:35
 msgid "Update to {appversion}"
-msgstr ""
+msgstr "버전 {appversion}(으)로 업데이트"
 
-#: js/apps.js:36 js/apps.js:76
+#: js/apps.js:41 js/apps.js:81
 msgid "Disable"
 msgstr "비활성화"
 
-#: js/apps.js:36 js/apps.js:64 js/apps.js:83
+#: js/apps.js:41 js/apps.js:69 js/apps.js:88
 msgid "Enable"
 msgstr "사용함"
 
-#: js/apps.js:55
+#: js/apps.js:60
 msgid "Please wait...."
-msgstr ""
+msgstr "기다려 주십시오...."
 
-#: js/apps.js:59 js/apps.js:71 js/apps.js:80 js/apps.js:93
+#: js/apps.js:64 js/apps.js:76 js/apps.js:85 js/apps.js:98
 msgid "Error"
 msgstr "오류"
 
-#: js/apps.js:90
+#: js/apps.js:95
 msgid "Updating...."
-msgstr ""
+msgstr "업데이트 중...."
 
-#: js/apps.js:93
+#: js/apps.js:98
 msgid "Error while updating app"
-msgstr ""
+msgstr "앱을 업데이트하는 중 오류 발생"
 
-#: js/apps.js:96
+#: js/apps.js:101
 msgid "Updated"
-msgstr ""
+msgstr "업데이트됨"
 
 #: js/personal.js:118
 msgid "Saving..."
@@ -126,15 +127,15 @@ msgstr "저장 중..."
 
 #: js/users.js:47
 msgid "deleted"
-msgstr "삭제"
+msgstr "삭제됨"
 
 #: js/users.js:47
 msgid "undo"
-msgstr "되돌리기"
+msgstr "실행 취소"
 
 #: js/users.js:79
 msgid "Unable to remove user"
-msgstr ""
+msgstr "사용자를 삭제할 수 없음"
 
 #: js/users.js:92 templates/users.php:26 templates/users.php:87
 #: templates/users.php:112
@@ -151,29 +152,29 @@ msgstr "삭제"
 
 #: js/users.js:269
 msgid "add group"
-msgstr ""
+msgstr "그룹 추가"
 
 #: js/users.js:428
 msgid "A valid username must be provided"
-msgstr ""
+msgstr "올바른 사용자 이름을 입력해야 함"
 
 #: js/users.js:429 js/users.js:435 js/users.js:450
 msgid "Error creating user"
-msgstr ""
+msgstr "사용자 생성 오류"
 
 #: js/users.js:434
 msgid "A valid password must be provided"
-msgstr ""
+msgstr "올바른 암호를 입력해야 함"
 
-#: personal.php:35 personal.php:36
+#: personal.php:37 personal.php:38
 msgid "__language_name__"
 msgstr "한국어"
 
-#: templates/admin.php:15
+#: templates/admin.php:17
 msgid "Security Warning"
 msgstr "보안 경고"
 
-#: templates/admin.php:18
+#: templates/admin.php:20
 msgid ""
 "Your data directory and your files are probably accessible from the "
 "internet. The .htaccess file that ownCloud provides is not working. We "
@@ -182,48 +183,48 @@ msgid ""
 " webserver document root."
 msgstr "데이터 디렉터리와 파일을 인터넷에서 접근할 수 있는 것 같습니다. ownCloud에서 제공한 .htaccess 파일이 작동하지 않습니다. 웹 서버를 다시 설정하여 데이터 디렉터리에 접근할 수 없도록 하거나 문서 루트 바깥쪽으로 옮기는 것을 추천합니다."
 
-#: templates/admin.php:29
+#: templates/admin.php:31
 msgid "Setup Warning"
 msgstr "설정 경고"
 
-#: templates/admin.php:32
+#: templates/admin.php:34
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
-msgstr ""
+msgstr "WebDAV 인터페이스가 제대로 작동하지 않습니다. 웹 서버에서 파일 동기화를 사용할 수 있도록 설정이 제대로 되지 않은 것 같습니다."
 
-#: templates/admin.php:33
+#: templates/admin.php:35
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
-msgstr ""
+msgstr "<a href='%s'>설치 가이드</a>를 다시 한 번 확인하십시오."
 
-#: templates/admin.php:44
+#: templates/admin.php:46
 msgid "Module 'fileinfo' missing"
-msgstr ""
+msgstr "모듈 'fileinfo'가 없음"
 
-#: templates/admin.php:47
+#: templates/admin.php:49
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
-msgstr ""
+msgstr "PHP 모듈 'fileinfo'가 존재하지 않습니다. MIME 형식 감지 결과를 향상시키기 위하여 이 모듈을 활성화하는 것을 추천합니다."
 
-#: templates/admin.php:58
+#: templates/admin.php:60
 msgid "Locale not working"
-msgstr ""
+msgstr "로캘이 작동하지 않음"
 
-#: templates/admin.php:63
+#: templates/admin.php:65
 #, php-format
 msgid ""
 "This ownCloud server can't set system locale to %s. This means that there "
 "might be problems with certain characters in file names. We strongly suggest"
 " to install the required packages on your system to support %s."
-msgstr ""
+msgstr "ownCloud 서버의 시스템 로캘을 %s(으)로 설정할 수 없습니다. 파일 이름에 특정한 글자가 들어가 있는 경우 문제가 발생할 수 있습니다. %s을(를) 지원하기 위해서 시스템에 필요한 패키지를 설치하는 것을 추천합니다."
 
-#: templates/admin.php:75
+#: templates/admin.php:77
 msgid "Internet connection not working"
-msgstr ""
+msgstr "인터넷에 연결할 수 없음"
 
-#: templates/admin.php:78
+#: templates/admin.php:80
 msgid ""
 "This ownCloud server has no working internet connection. This means that "
 "some of the features like mounting of external storage, notifications about "
@@ -231,104 +232,104 @@ msgid ""
 "remote and sending of notification emails might also not work. We suggest to"
 " enable internet connection for this server if you want to have all features"
 " of ownCloud."
-msgstr ""
+msgstr "ownCloud 서버에서 인터넷에 연결할 수 없습니다. 외부 저장소 마운트, 업데이트 알림, 외부 앱 설치 등이 작동하지 않을 것입니다. 외부에서 파일에 접근하거나, 알림 이메일을 보내지 못할 수도 있습니다. ownCloud의 모든 기능을 사용하려면 이 서버를 인터넷에 연결하는 것을 추천합니다."
 
-#: templates/admin.php:92
+#: templates/admin.php:94
 msgid "Cron"
 msgstr "크론"
 
-#: templates/admin.php:101
+#: templates/admin.php:103
 msgid "Execute one task with each page loaded"
-msgstr ""
+msgstr "개별 페이지를 불러올 때마다 실행"
 
-#: templates/admin.php:111
+#: templates/admin.php:113
 msgid ""
 "cron.php is registered at a webcron service. Call the cron.php page in the "
 "owncloud root once a minute over http."
-msgstr ""
+msgstr "cron.php가 webcron 서비스에 등록되어 있습니다. HTTP를 통하여 1분마다 ownCloud 루트에서 cron.php 페이지를 불러옵니다."
 
-#: templates/admin.php:121
+#: templates/admin.php:123
 msgid ""
 "Use systems cron service. Call the cron.php file in the owncloud folder via "
 "a system cronjob once a minute."
-msgstr ""
+msgstr "시스템 cron 서비스를 사용합니다. 시스템 cronjob을 사용하여 ownCloud 폴더의 cron.php 파일을 1분마다 불러옵니다."
 
-#: templates/admin.php:128
+#: templates/admin.php:130
 msgid "Sharing"
-msgstr ""
+msgstr "공유"
 
-#: templates/admin.php:134
+#: templates/admin.php:136
 msgid "Enable Share API"
-msgstr ""
+msgstr "공유 API 사용하기"
 
-#: templates/admin.php:135
+#: templates/admin.php:137
 msgid "Allow apps to use the Share API"
-msgstr ""
+msgstr "앱에서 공유 API를 사용할 수 있도록 허용"
 
-#: templates/admin.php:142
+#: templates/admin.php:144
 msgid "Allow links"
-msgstr ""
+msgstr "링크 허용"
 
-#: templates/admin.php:143
+#: templates/admin.php:145
 msgid "Allow users to share items to the public with links"
-msgstr ""
+msgstr "사용자가 개별 항목의 링크를 공유할 수 있도록 허용"
 
-#: templates/admin.php:150
+#: templates/admin.php:152
 msgid "Allow resharing"
-msgstr ""
+msgstr "재공유 허용"
 
-#: templates/admin.php:151
+#: templates/admin.php:153
 msgid "Allow users to share items shared with them again"
-msgstr ""
+msgstr "사용자에게 공유된 항목을 다시 공유할 수 있도록 허용"
 
-#: templates/admin.php:158
+#: templates/admin.php:160
 msgid "Allow users to share with anyone"
-msgstr ""
+msgstr "누구나와 공유할 수 있도록 허용"
 
-#: templates/admin.php:161
+#: templates/admin.php:163
 msgid "Allow users to only share with users in their groups"
-msgstr ""
+msgstr "사용자가 속해 있는 그룹의 사용자와만 공유할 수 있도록 허용"
 
-#: templates/admin.php:168
+#: templates/admin.php:170
 msgid "Security"
-msgstr ""
+msgstr "보안"
 
-#: templates/admin.php:181
+#: templates/admin.php:183
 msgid "Enforce HTTPS"
-msgstr ""
+msgstr "HTTPS 강제 사용"
 
-#: templates/admin.php:182
+#: templates/admin.php:184
 msgid ""
 "Enforces the clients to connect to ownCloud via an encrypted connection."
-msgstr ""
+msgstr "클라이언트가 ownCloud에 항상 암호화된 연결로 연결하도록 강제합니다."
 
-#: templates/admin.php:185
+#: templates/admin.php:187
 msgid ""
 "Please connect to this ownCloud instance via HTTPS to enable or disable the "
 "SSL enforcement."
-msgstr ""
+msgstr "SSL 강제 사용 설정을 변경하려면 ownCloud 인스턴스에 HTTPS로 연결하십시오."
 
-#: templates/admin.php:195
+#: templates/admin.php:197
 msgid "Log"
 msgstr "로그"
 
-#: templates/admin.php:196
+#: templates/admin.php:198
 msgid "Log level"
 msgstr "로그 단계"
 
-#: templates/admin.php:227
+#: templates/admin.php:229
 msgid "More"
 msgstr "더 중요함"
 
-#: templates/admin.php:228
+#: templates/admin.php:230
 msgid "Less"
 msgstr "덜 중요함"
 
-#: templates/admin.php:235 templates/personal.php:116
+#: templates/admin.php:236 templates/personal.php:116
 msgid "Version"
 msgstr "버전"
 
-#: templates/admin.php:237 templates/personal.php:119
+#: templates/admin.php:240 templates/personal.php:119
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -340,7 +341,7 @@ msgstr "<a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud 커
 
 #: templates/apps.php:13
 msgid "Add your App"
-msgstr "앱 추가"
+msgstr "내 앱 추가"
 
 #: templates/apps.php:28
 msgid "More Apps"
@@ -386,76 +387,79 @@ msgstr "버그 트래커"
 msgid "Commercial Support"
 msgstr "상업용 지원"
 
-#: templates/personal.php:9
+#: templates/personal.php:10
 msgid "Get the apps to sync your files"
-msgstr "앱을 이용하여 당신의 파일을 동기화 할 수 있습니다."
+msgstr "파일 동기화 앱 가져오기"
 
-#: templates/personal.php:20
+#: templates/personal.php:21
 msgid "Show First Run Wizard again"
 msgstr "첫 실행 마법사 다시 보이기"
 
-#: templates/personal.php:28
+#: templates/personal.php:29
 #, php-format
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
-msgstr "현재 공간 <strong>%s</strong>/<strong>%s</strong>을(를) 사용 중입니다"
+msgstr "현재 공간 중 <strong>%s</strong>/<strong>%s</strong>을(를) 사용 중입니다"
 
-#: templates/personal.php:40 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:41 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "암호"
 
-#: templates/personal.php:41
+#: templates/personal.php:42
 msgid "Your password was changed"
 msgstr "암호가 변경되었습니다"
 
-#: templates/personal.php:42
+#: templates/personal.php:43
 msgid "Unable to change your password"
 msgstr "암호를 변경할 수 없음"
 
-#: templates/personal.php:43
+#: templates/personal.php:44
 msgid "Current password"
 msgstr "현재 암호"
 
-#: templates/personal.php:45
+#: templates/personal.php:46
 msgid "New password"
 msgstr "새 암호"
 
-#: templates/personal.php:47
+#: templates/personal.php:48
 msgid "Change password"
 msgstr "암호 변경"
 
-#: templates/personal.php:59 templates/users.php:85
+#: templates/personal.php:60 templates/users.php:85
 msgid "Display Name"
 msgstr "표시 이름"
 
-#: templates/personal.php:74
+#: templates/personal.php:75
 msgid "Email"
 msgstr "이메일"
 
-#: templates/personal.php:76
+#: templates/personal.php:77
 msgid "Your email address"
 msgstr "이메일 주소"
 
-#: templates/personal.php:77
+#: templates/personal.php:78
 msgid "Fill in an email address to enable password recovery"
-msgstr "암호 찾기 기능을 사용하려면 이메일 주소를 입력하십시오."
+msgstr "암호 찾기 기능을 사용하려면 이메일 주소를 입력하십시오"
 
-#: templates/personal.php:86 templates/personal.php:87
+#: templates/personal.php:87 templates/personal.php:88
 msgid "Language"
 msgstr "언어"
 
-#: templates/personal.php:99
+#: templates/personal.php:100
 msgid "Help translate"
 msgstr "번역 돕기"
 
-#: templates/personal.php:105
+#: templates/personal.php:106
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:107
-msgid "Use this address to connect to your ownCloud in your file manager"
-msgstr "파일 관리자에서 ownCloud에 접속하려면 이 주소를 사용하십시오."
+#: templates/personal.php:108
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
+"target=\"_blank\">access your Files via WebDAV</a>"
+msgstr ""
 
-#: templates/users.php:21 templates/users.php:84
+#: templates/users.php:21
 msgid "Login Name"
 msgstr "로그인 이름"
 
@@ -465,13 +469,13 @@ msgstr "만들기"
 
 #: templates/users.php:36
 msgid "Admin Recovery Password"
-msgstr ""
+msgstr "관리자 복구 암호"
 
 #: templates/users.php:37 templates/users.php:38
 msgid ""
 "Enter the recovery password in order to recover the users files during "
 "password change"
-msgstr ""
+msgstr "암호 변경 시 변경된 사용자 파일을 복구하려면 복구 암호를 입력하십시오"
 
 #: templates/users.php:42
 msgid "Default Storage"
@@ -485,6 +489,10 @@ msgstr "무제한"
 msgid "Other"
 msgstr "기타"
 
+#: templates/users.php:84
+msgid "Username"
+msgstr "사용자 이름"
+
 #: templates/users.php:91
 msgid "Storage"
 msgstr "저장소"
diff --git a/l10n/ko/user_ldap.po b/l10n/ko/user_ldap.po
index cb6b5866339a6e26ece0de536108f41a915aadf6..1cac47e1b705dca6804c42ee545c3e214ce73822 100644
--- a/l10n/ko/user_ldap.po
+++ b/l10n/ko/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:16+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/ku_IQ/core.po b/l10n/ku_IQ/core.po
index a23911413671db02a53b8f08305dc927cc7e6a1d..3b3ad5fbed74adb87f34c71a02b8a06be3a60cad 100644
--- a/l10n/ku_IQ/core.po
+++ b/l10n/ku_IQ/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:22+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
 "MIME-Version: 1.0\n"
@@ -61,135 +61,135 @@ msgstr ""
 msgid "Error removing %s from favorites."
 msgstr ""
 
-#: js/config.php:34
+#: js/config.php:32
 msgid "Sunday"
 msgstr ""
 
-#: js/config.php:35
+#: js/config.php:33
 msgid "Monday"
 msgstr ""
 
-#: js/config.php:36
+#: js/config.php:34
 msgid "Tuesday"
 msgstr ""
 
-#: js/config.php:37
+#: js/config.php:35
 msgid "Wednesday"
 msgstr ""
 
-#: js/config.php:38
+#: js/config.php:36
 msgid "Thursday"
 msgstr ""
 
-#: js/config.php:39
+#: js/config.php:37
 msgid "Friday"
 msgstr ""
 
-#: js/config.php:40
+#: js/config.php:38
 msgid "Saturday"
 msgstr ""
 
-#: js/config.php:45
+#: js/config.php:43
 msgid "January"
 msgstr ""
 
-#: js/config.php:46
+#: js/config.php:44
 msgid "February"
 msgstr ""
 
-#: js/config.php:47
+#: js/config.php:45
 msgid "March"
 msgstr ""
 
-#: js/config.php:48
+#: js/config.php:46
 msgid "April"
 msgstr ""
 
-#: js/config.php:49
+#: js/config.php:47
 msgid "May"
 msgstr ""
 
-#: js/config.php:50
+#: js/config.php:48
 msgid "June"
 msgstr ""
 
-#: js/config.php:51
+#: js/config.php:49
 msgid "July"
 msgstr ""
 
-#: js/config.php:52
+#: js/config.php:50
 msgid "August"
 msgstr ""
 
-#: js/config.php:53
+#: js/config.php:51
 msgid "September"
 msgstr ""
 
-#: js/config.php:54
+#: js/config.php:52
 msgid "October"
 msgstr ""
 
-#: js/config.php:55
+#: js/config.php:53
 msgid "November"
 msgstr ""
 
-#: js/config.php:56
+#: js/config.php:54
 msgid "December"
 msgstr ""
 
-#: js/js.js:286
+#: js/js.js:293
 msgid "Settings"
 msgstr "ده‌ستكاری"
 
-#: js/js.js:718
+#: js/js.js:725
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:719
+#: js/js.js:726
 msgid "1 minute ago"
 msgstr ""
 
-#: js/js.js:720
+#: js/js.js:727
 msgid "{minutes} minutes ago"
 msgstr ""
 
-#: js/js.js:721
+#: js/js.js:728
 msgid "1 hour ago"
 msgstr ""
 
-#: js/js.js:722
+#: js/js.js:729
 msgid "{hours} hours ago"
 msgstr ""
 
-#: js/js.js:723
+#: js/js.js:730
 msgid "today"
 msgstr ""
 
-#: js/js.js:724
+#: js/js.js:731
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:725
+#: js/js.js:732
 msgid "{days} days ago"
 msgstr ""
 
-#: js/js.js:726
+#: js/js.js:733
 msgid "last month"
 msgstr ""
 
-#: js/js.js:727
+#: js/js.js:734
 msgid "{months} months ago"
 msgstr ""
 
-#: js/js.js:728
+#: js/js.js:735
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:729
+#: js/js.js:736
 msgid "last year"
 msgstr ""
 
-#: js/js.js:730
+#: js/js.js:737
 msgid "years ago"
 msgstr ""
 
@@ -225,8 +225,8 @@ msgstr ""
 #: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
 #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:577
-#: js/share.js:589
+#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:620
+#: js/share.js:632
 msgid "Error"
 msgstr "هه‌ڵه"
 
@@ -246,7 +246,7 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: js/share.js:125 js/share.js:617
+#: js/share.js:125 js/share.js:660
 msgid "Error while sharing"
 msgstr ""
 
@@ -266,99 +266,103 @@ msgstr ""
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:159
+#: js/share.js:172
 msgid "Share with"
 msgstr ""
 
-#: js/share.js:164
+#: js/share.js:177
 msgid "Share with link"
 msgstr ""
 
-#: js/share.js:167
+#: js/share.js:180
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:169 templates/installation.php:54 templates/login.php:26
+#: js/share.js:182 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "وشەی تێپەربو"
 
-#: js/share.js:173
+#: js/share.js:187
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:191
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:174
+#: js/share.js:192
 msgid "Send"
 msgstr ""
 
-#: js/share.js:178
+#: js/share.js:197
 msgid "Set expiration date"
 msgstr ""
 
-#: js/share.js:179
+#: js/share.js:198
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:211
+#: js/share.js:230
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:213
+#: js/share.js:232
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:251
+#: js/share.js:270
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:287
+#: js/share.js:306
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:308
+#: js/share.js:327
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:320
+#: js/share.js:339
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:322
+#: js/share.js:341
 msgid "access control"
 msgstr ""
 
-#: js/share.js:325
+#: js/share.js:344
 msgid "create"
 msgstr ""
 
-#: js/share.js:328
+#: js/share.js:347
 msgid "update"
 msgstr ""
 
-#: js/share.js:331
+#: js/share.js:350
 msgid "delete"
 msgstr ""
 
-#: js/share.js:334
+#: js/share.js:353
 msgid "share"
 msgstr ""
 
-#: js/share.js:368 js/share.js:564
+#: js/share.js:387 js/share.js:607
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:577
+#: js/share.js:620
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:589
+#: js/share.js:632
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:604
+#: js/share.js:647
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:615
+#: js/share.js:658
 msgid "Email sent"
 msgstr ""
 
@@ -373,7 +377,7 @@ msgstr ""
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
-#: lostpassword/controller.php:58
+#: lostpassword/controller.php:60
 msgid "ownCloud password reset"
 msgstr ""
 
@@ -403,17 +407,17 @@ msgstr "ناوی به‌کارهێنه‌ر"
 
 #: lostpassword/templates/lostpassword.php:22
 msgid ""
-"Your files seems to be encrypted. If you didn't have enabled the recovery "
-"key there will be no way to get your data back once the password was "
-"resetted. If you are not sure what to do, please contact your administrator "
-"first before continue. Do you really want to continue?"
+"Your files are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
 msgstr ""
 
 #: lostpassword/templates/lostpassword.php:24
 msgid "Yes, I really want to reset my password now"
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:29
+#: lostpassword/templates/lostpassword.php:27
 msgid "Request reset"
 msgstr ""
 
@@ -461,7 +465,7 @@ msgstr ""
 msgid "Cloud not found"
 msgstr "هیچ نه‌دۆزرایه‌وه‌"
 
-#: templates/altmail.php:2
+#: templates/altmail.php:4
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -472,10 +476,6 @@ msgid ""
 "Cheers!"
 msgstr ""
 
-#: templates/altmail.php:7 templates/mail.php:24
-msgid "web services under your control"
-msgstr "ڕاژه‌ی وێب له‌ژێر چاودێریت دایه"
-
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
 msgstr ""
@@ -568,12 +568,12 @@ msgstr "هۆستی داتابه‌یس"
 msgid "Finish setup"
 msgstr "كۆتایی هات ده‌ستكاریه‌كان"
 
-#: templates/layout.user.php:40
+#: templates/layout.user.php:43
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:67
+#: templates/layout.user.php:68
 msgid "Log out"
 msgstr "چوونەدەرەوە"
 
@@ -607,7 +607,7 @@ msgstr ""
 msgid "Alternative Logins"
 msgstr ""
 
-#: templates/mail.php:15
+#: templates/mail.php:16
 #, php-format
 msgid ""
 "Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
diff --git a/l10n/ku_IQ/files.po b/l10n/ku_IQ/files.po
index d97e457f4cafebb85138d025db121c2b99991dd0..36d64a57a0b4bd6ee7958559bd087515fa11c69c 100644
--- a/l10n/ku_IQ/files.po
+++ b/l10n/ku_IQ/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:01+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
 "MIME-Version: 1.0\n"
@@ -27,46 +27,54 @@ msgstr ""
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/upload.php:19
+#: ajax/upload.php:16 ajax/upload.php:45
+msgid "Unable to set upload directory."
+msgstr ""
+
+#: ajax/upload.php:22
+msgid "Invalid Token"
+msgstr ""
+
+#: ajax/upload.php:59
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: ajax/upload.php:26
+#: ajax/upload.php:66
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/upload.php:27
+#: ajax/upload.php:67
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:29
+#: ajax/upload.php:69
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/upload.php:30
+#: ajax/upload.php:70
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/upload.php:31
+#: ajax/upload.php:71
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/upload.php:32
+#: ajax/upload.php:72
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/upload.php:33
+#: ajax/upload.php:73
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:51
+#: ajax/upload.php:91
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:83
+#: ajax/upload.php:123
 msgid "Invalid directory."
 msgstr ""
 
@@ -74,6 +82,36 @@ msgstr ""
 msgid "Files"
 msgstr ""
 
+#: js/file-upload.js:11
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/file-upload.js:24
+msgid "Not enough space available"
+msgstr ""
+
+#: js/file-upload.js:64
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/file-upload.js:167 js/files.js:266
+msgid ""
+"File upload is in progress. Leaving the page now will cancel the upload."
+msgstr ""
+
+#: js/file-upload.js:233 js/files.js:339
+msgid "URL cannot be empty."
+msgstr "ناونیشانی به‌سته‌ر نابێت به‌تاڵ بێت."
+
+#: js/file-upload.js:238 lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr ""
+
+#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
+#: js/files.js:693 js/files.js:731
+msgid "Error"
+msgstr "هه‌ڵه"
+
 #: js/fileactions.js:116
 msgid "Share"
 msgstr ""
@@ -90,43 +128,43 @@ msgstr ""
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:464
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:259
+#: js/filelist.js:302
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:306
+#: js/filelist.js:349
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:306
+#: js/filelist.js:349
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:331
+#: js/filelist.js:374
 msgid "perform delete operation"
 msgstr ""
 
-#: js/filelist.js:413
+#: js/filelist.js:456
 msgid "1 file uploading"
 msgstr ""
 
-#: js/filelist.js:416 js/filelist.js:470
+#: js/filelist.js:459 js/filelist.js:517
 msgid "files uploading"
 msgstr ""
 
@@ -158,69 +196,41 @@ msgid ""
 "big."
 msgstr ""
 
-#: js/files.js:264
-msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr ""
-
-#: js/files.js:277
-msgid "Not enough space available"
-msgstr ""
-
-#: js/files.js:317
-msgid "Upload cancelled."
-msgstr ""
-
-#: js/files.js:413
-msgid ""
-"File upload is in progress. Leaving the page now will cancel the upload."
-msgstr ""
-
-#: js/files.js:486
-msgid "URL cannot be empty."
-msgstr "ناونیشانی به‌سته‌ر نابێت به‌تاڵ بێت."
-
-#: js/files.js:491
+#: js/files.js:344
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
-msgid "Error"
-msgstr "هه‌ڵه"
-
-#: js/files.js:877 templates/index.php:69
+#: js/files.js:744 templates/index.php:69
 msgid "Name"
 msgstr "ناو"
 
-#: js/files.js:878 templates/index.php:80
+#: js/files.js:745 templates/index.php:80
 msgid "Size"
 msgstr ""
 
-#: js/files.js:879 templates/index.php:82
+#: js/files.js:746 templates/index.php:82
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:898
+#: js/files.js:765
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:900
+#: js/files.js:767
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:908
+#: js/files.js:775
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:910
+#: js/files.js:777
 msgid "{count} files"
 msgstr ""
 
-#: lib/app.php:53
-msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
-msgstr ""
-
 #: lib/app.php:73
-msgid "Unable to rename file"
+#, php-format
+msgid "%s could not be renamed"
 msgstr ""
 
 #: lib/helper.php:11 templates/index.php:18
@@ -317,6 +327,22 @@ msgstr ""
 msgid "Current scanning"
 msgstr ""
 
+#: templates/part.list.php:76
+msgid "directory"
+msgstr ""
+
+#: templates/part.list.php:78
+msgid "directories"
+msgstr ""
+
+#: templates/part.list.php:87
+msgid "file"
+msgstr ""
+
+#: templates/part.list.php:89
+msgid "files"
+msgstr ""
+
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
 msgstr ""
diff --git a/l10n/ku_IQ/files_encryption.po b/l10n/ku_IQ/files_encryption.po
index 79e9763bf0f35d16bc154f94b2d0635ea3fe5577..0adc093d2f9911e7889547fd1116f188bbc70eee 100644
--- a/l10n/ku_IQ/files_encryption.po
+++ b/l10n/ku_IQ/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-14 02:46+0200\n"
-"PO-Revision-Date: 2013-06-14 00:47+0000\n"
+"POT-Creation-Date: 2013-07-05 02:12+0200\n"
+"PO-Revision-Date: 2013-07-05 00:13+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"
@@ -55,9 +55,21 @@ msgstr ""
 
 #: files/error.php:7
 msgid ""
-"Your private key is not valid! Maybe your password was changed from outside."
-" You can update your private key password in your personal settings to "
-"regain access to your files"
+"Your private key is not valid! Likely your password was changed outside the "
+"ownCloud system (e.g. your corporate directory). You can update your private"
+" key password in your personal settings to recover access to your encrypted "
+"files."
+msgstr ""
+
+#: hooks/hooks.php:44
+msgid "Missing requirements."
+msgstr ""
+
+#: hooks/hooks.php:45
+msgid ""
+"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL "
+"PHP extension is enabled and configured properly. For now, the encryption "
+"app has been disabled."
 msgstr ""
 
 #: js/settings-admin.js:11
@@ -84,11 +96,11 @@ msgstr "نهێنیکردن"
 
 #: templates/settings-admin.php:10
 msgid ""
-"Enable encryption passwords recovery key (allow sharing to recovery key):"
+"Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
 #: templates/settings-admin.php:14
-msgid "Recovery account password"
+msgid "Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:21 templates/settings-personal.php:54
@@ -100,15 +112,15 @@ msgid "Disabled"
 msgstr ""
 
 #: templates/settings-admin.php:34
-msgid "Change encryption passwords recovery key:"
+msgid "Change recovery key password:"
 msgstr ""
 
 #: templates/settings-admin.php:41
-msgid "Old Recovery account password"
+msgid "Old Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:48
-msgid "New Recovery account password"
+msgid "New Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:53
diff --git a/l10n/ku_IQ/files_sharing.po b/l10n/ku_IQ/files_sharing.po
index 99d1f23f038c6a5b1a08d01f3e2b86f95fafd8f5..135d739fc7b3e9849c2277da6ea8f16eb5e63eb4 100644
--- a/l10n/ku_IQ/files_sharing.po
+++ b/l10n/ku_IQ/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
 "MIME-Version: 1.0\n"
@@ -18,27 +18,39 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: templates/authenticate.php:4
+msgid "The password is wrong. Try again."
+msgstr ""
+
+#: templates/authenticate.php:7
 msgid "Password"
 msgstr "وشەی تێپەربو"
 
-#: templates/authenticate.php:6
+#: templates/authenticate.php:9
 msgid "Submit"
 msgstr "ناردن"
 
-#: templates/public.php:10
+#: templates/public.php:17
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s دابه‌شی کردووه‌ بوخچه‌ی %s له‌گه‌ڵ تۆ"
 
-#: templates/public.php:13
+#: templates/public.php:20
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s دابه‌شی کردووه‌ په‌ڕگه‌یی %s له‌گه‌ڵ تۆ"
 
-#: templates/public.php:19 templates/public.php:43
+#: templates/public.php:28 templates/public.php:90
 msgid "Download"
 msgstr "داگرتن"
 
-#: templates/public.php:40
+#: templates/public.php:45 templates/public.php:48
+msgid "Upload"
+msgstr "بارکردن"
+
+#: templates/public.php:58
+msgid "Cancel upload"
+msgstr ""
+
+#: templates/public.php:87
 msgid "No preview available for"
 msgstr "هیچ پێشبینیه‌ك ئاماده‌ نیه بۆ"
diff --git a/l10n/ku_IQ/files_trashbin.po b/l10n/ku_IQ/files_trashbin.po
index ceb41f40b93404353dd6510e0d62ab9b591a71d1..d91b93eb440f6fb746bbd91b7c301f71cea012e4 100644
--- a/l10n/ku_IQ/files_trashbin.po
+++ b/l10n/ku_IQ/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:16+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/ku_IQ/lib.po b/l10n/ku_IQ/lib.po
index 085812d610d54504c9a4359baa7c3f0d348ec202..403ef01cdf1e911678a68ea5161ca59740f8852c 100644
--- a/l10n/ku_IQ/lib.po
+++ b/l10n/ku_IQ/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 00:04+0000\n"
+"POT-Creation-Date: 2013-07-09 02:04+0200\n"
+"PO-Revision-Date: 2013-07-09 00:02+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
 "MIME-Version: 1.0\n"
@@ -17,30 +17,34 @@ msgstr ""
 "Language: ku_IQ\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:359
+#: app.php:360
 msgid "Help"
 msgstr "یارمەتی"
 
-#: app.php:372
+#: app.php:373
 msgid "Personal"
 msgstr ""
 
-#: app.php:383
+#: app.php:384
 msgid "Settings"
 msgstr "ده‌ستكاری"
 
-#: app.php:395
+#: app.php:396
 msgid "Users"
 msgstr "به‌كارهێنه‌ر"
 
-#: app.php:408
+#: app.php:409
 msgid "Apps"
 msgstr "به‌رنامه‌كان"
 
-#: app.php:416
+#: app.php:417
 msgid "Admin"
 msgstr "به‌ڕێوه‌به‌ری سه‌ره‌كی"
 
+#: defaults.php:33
+msgid "web services under your control"
+msgstr "ڕاژه‌ی وێب له‌ژێر چاودێریت دایه"
+
 #: files.php:210
 msgid "ZIP download is turned off."
 msgstr ""
@@ -85,104 +89,102 @@ msgstr ""
 msgid "Images"
 msgstr ""
 
-#: setup.php:34
-msgid "Set an admin username."
-msgstr ""
-
-#: setup.php:37
-msgid "Set an admin password."
-msgstr ""
-
-#: setup.php:55
+#: setup/abstractdatabase.php:22
 #, php-format
 msgid "%s enter the database username."
 msgstr ""
 
-#: setup.php:58
+#: setup/abstractdatabase.php:25
 #, php-format
 msgid "%s enter the database name."
 msgstr ""
 
-#: setup.php:61
+#: setup/abstractdatabase.php:28
 #, php-format
 msgid "%s you may not use dots in the database name"
 msgstr ""
 
-#: setup.php:64
+#: setup/mssql.php:20
 #, php-format
-msgid "%s set the database host."
-msgstr ""
-
-#: setup.php:126 setup.php:332 setup.php:377
-msgid "PostgreSQL username and/or password not valid"
+msgid "MS SQL username and/or password not valid: %s"
 msgstr ""
 
-#: setup.php:127 setup.php:235
+#: setup/mssql.php:21 setup/mysql.php:13 setup/oci.php:114
+#: setup/postgresql.php:24 setup/postgresql.php:70
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:152
-msgid "Oracle connection could not be established"
-msgstr ""
-
-#: setup.php:234
+#: setup/mysql.php:12
 msgid "MySQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:288 setup.php:398 setup.php:407 setup.php:425 setup.php:435
-#: setup.php:444 setup.php:477 setup.php:543 setup.php:569 setup.php:576
-#: setup.php:587 setup.php:594 setup.php:603 setup.php:611 setup.php:620
-#: setup.php:626
+#: setup/mysql.php:67 setup/oci.php:54 setup/oci.php:121 setup/oci.php:147
+#: setup/oci.php:154 setup/oci.php:165 setup/oci.php:172 setup/oci.php:181
+#: setup/oci.php:189 setup/oci.php:198 setup/oci.php:204
+#: setup/postgresql.php:89 setup/postgresql.php:98 setup/postgresql.php:115
+#: setup/postgresql.php:125 setup/postgresql.php:134
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr ""
 
-#: setup.php:289 setup.php:399 setup.php:408 setup.php:426 setup.php:436
-#: setup.php:445 setup.php:478 setup.php:544 setup.php:570 setup.php:577
-#: setup.php:588 setup.php:604 setup.php:612 setup.php:621
+#: setup/mysql.php:68 setup/oci.php:55 setup/oci.php:122 setup/oci.php:148
+#: setup/oci.php:155 setup/oci.php:166 setup/oci.php:182 setup/oci.php:190
+#: setup/oci.php:199 setup/postgresql.php:90 setup/postgresql.php:99
+#: setup/postgresql.php:116 setup/postgresql.php:126 setup/postgresql.php:135
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:305
+#: setup/mysql.php:85
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:306
+#: setup/mysql.php:86
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:311
+#: setup/mysql.php:91
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:312
+#: setup/mysql.php:92
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:469 setup.php:536
+#: setup/oci.php:34
+msgid "Oracle connection could not be established"
+msgstr ""
+
+#: setup/oci.php:41 setup/oci.php:113
 msgid "Oracle username and/or password not valid"
 msgstr ""
 
-#: setup.php:595 setup.php:627
+#: setup/oci.php:173 setup/oci.php:205
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:647
-#, php-format
-msgid "MS SQL username and/or password not valid: %s"
+#: setup/postgresql.php:23 setup/postgresql.php:69
+msgid "PostgreSQL username and/or password not valid"
+msgstr ""
+
+#: setup.php:42
+msgid "Set an admin username."
+msgstr ""
+
+#: setup.php:45
+msgid "Set an admin password."
 msgstr ""
 
-#: setup.php:870
+#: setup.php:198
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:871
+#: setup.php:199
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
diff --git a/l10n/ku_IQ/settings.po b/l10n/ku_IQ/settings.po
index 8e606d676597709aa16b717001a970d0c90ec71c..ead100e652a221d87be9cb1f71caa4f040611a09 100644
--- a/l10n/ku_IQ/settings.po
+++ b/l10n/ku_IQ/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
 "MIME-Version: 1.0\n"
@@ -88,35 +88,35 @@ msgstr ""
 msgid "Couldn't update app."
 msgstr ""
 
-#: js/apps.js:30
+#: js/apps.js:35
 msgid "Update to {appversion}"
 msgstr ""
 
-#: js/apps.js:36 js/apps.js:76
+#: js/apps.js:41 js/apps.js:81
 msgid "Disable"
 msgstr ""
 
-#: js/apps.js:36 js/apps.js:64 js/apps.js:83
+#: js/apps.js:41 js/apps.js:69 js/apps.js:88
 msgid "Enable"
 msgstr "چالاککردن"
 
-#: js/apps.js:55
+#: js/apps.js:60
 msgid "Please wait...."
 msgstr ""
 
-#: js/apps.js:59 js/apps.js:71 js/apps.js:80 js/apps.js:93
+#: js/apps.js:64 js/apps.js:76 js/apps.js:85 js/apps.js:98
 msgid "Error"
 msgstr "هه‌ڵه"
 
-#: js/apps.js:90
+#: js/apps.js:95
 msgid "Updating...."
 msgstr ""
 
-#: js/apps.js:93
+#: js/apps.js:98
 msgid "Error while updating app"
 msgstr ""
 
-#: js/apps.js:96
+#: js/apps.js:101
 msgid "Updated"
 msgstr ""
 
@@ -165,15 +165,15 @@ msgstr ""
 msgid "A valid password must be provided"
 msgstr ""
 
-#: personal.php:35 personal.php:36
+#: personal.php:37 personal.php:38
 msgid "__language_name__"
 msgstr ""
 
-#: templates/admin.php:15
+#: templates/admin.php:17
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:18
+#: templates/admin.php:20
 msgid ""
 "Your data directory and your files are probably accessible from the "
 "internet. The .htaccess file that ownCloud provides is not working. We "
@@ -182,36 +182,36 @@ msgid ""
 " webserver document root."
 msgstr ""
 
-#: templates/admin.php:29
+#: templates/admin.php:31
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:32
+#: templates/admin.php:34
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: templates/admin.php:33
+#: templates/admin.php:35
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:44
+#: templates/admin.php:46
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:47
+#: templates/admin.php:49
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr ""
 
-#: templates/admin.php:58
+#: templates/admin.php:60
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:63
+#: templates/admin.php:65
 #, php-format
 msgid ""
 "This ownCloud server can't set system locale to %s. This means that there "
@@ -219,11 +219,11 @@ msgid ""
 " to install the required packages on your system to support %s."
 msgstr ""
 
-#: templates/admin.php:75
+#: templates/admin.php:77
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:78
+#: templates/admin.php:80
 msgid ""
 "This ownCloud server has no working internet connection. This means that "
 "some of the features like mounting of external storage, notifications about "
@@ -233,102 +233,102 @@ msgid ""
 " of ownCloud."
 msgstr ""
 
-#: templates/admin.php:92
+#: templates/admin.php:94
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:101
+#: templates/admin.php:103
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:111
+#: templates/admin.php:113
 msgid ""
 "cron.php is registered at a webcron service. Call the cron.php page in the "
 "owncloud root once a minute over http."
 msgstr ""
 
-#: templates/admin.php:121
+#: templates/admin.php:123
 msgid ""
 "Use systems cron service. Call the cron.php file in the owncloud folder via "
 "a system cronjob once a minute."
 msgstr ""
 
-#: templates/admin.php:128
+#: templates/admin.php:130
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:134
+#: templates/admin.php:136
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:135
+#: templates/admin.php:137
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:142
+#: templates/admin.php:144
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:143
+#: templates/admin.php:145
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:150
+#: templates/admin.php:152
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:151
+#: templates/admin.php:153
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:158
+#: templates/admin.php:160
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:161
+#: templates/admin.php:163
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:168
+#: templates/admin.php:170
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:181
+#: templates/admin.php:183
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:182
+#: templates/admin.php:184
 msgid ""
 "Enforces the clients to connect to ownCloud via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:185
+#: templates/admin.php:187
 msgid ""
 "Please connect to this ownCloud instance via HTTPS to enable or disable the "
 "SSL enforcement."
 msgstr ""
 
-#: templates/admin.php:195
+#: templates/admin.php:197
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:196
+#: templates/admin.php:198
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:227
+#: templates/admin.php:229
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:228
+#: templates/admin.php:230
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:235 templates/personal.php:116
+#: templates/admin.php:236 templates/personal.php:116
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:237 templates/personal.php:119
+#: templates/admin.php:240 templates/personal.php:119
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -386,76 +386,79 @@ msgstr ""
 msgid "Commercial Support"
 msgstr ""
 
-#: templates/personal.php:9
+#: templates/personal.php:10
 msgid "Get the apps to sync your files"
 msgstr ""
 
-#: templates/personal.php:20
+#: templates/personal.php:21
 msgid "Show First Run Wizard again"
 msgstr ""
 
-#: templates/personal.php:28
+#: templates/personal.php:29
 #, php-format
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr ""
 
-#: templates/personal.php:40 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:41 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "وشەی تێپەربو"
 
-#: templates/personal.php:41
+#: templates/personal.php:42
 msgid "Your password was changed"
 msgstr ""
 
-#: templates/personal.php:42
+#: templates/personal.php:43
 msgid "Unable to change your password"
 msgstr ""
 
-#: templates/personal.php:43
+#: templates/personal.php:44
 msgid "Current password"
 msgstr ""
 
-#: templates/personal.php:45
+#: templates/personal.php:46
 msgid "New password"
 msgstr "وشەی نهێنی نوێ"
 
-#: templates/personal.php:47
+#: templates/personal.php:48
 msgid "Change password"
 msgstr ""
 
-#: templates/personal.php:59 templates/users.php:85
+#: templates/personal.php:60 templates/users.php:85
 msgid "Display Name"
 msgstr ""
 
-#: templates/personal.php:74
+#: templates/personal.php:75
 msgid "Email"
 msgstr "ئیمه‌یل"
 
-#: templates/personal.php:76
+#: templates/personal.php:77
 msgid "Your email address"
 msgstr ""
 
-#: templates/personal.php:77
+#: templates/personal.php:78
 msgid "Fill in an email address to enable password recovery"
 msgstr ""
 
-#: templates/personal.php:86 templates/personal.php:87
+#: templates/personal.php:87 templates/personal.php:88
 msgid "Language"
 msgstr ""
 
-#: templates/personal.php:99
+#: templates/personal.php:100
 msgid "Help translate"
 msgstr ""
 
-#: templates/personal.php:105
+#: templates/personal.php:106
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:107
-msgid "Use this address to connect to your ownCloud in your file manager"
+#: templates/personal.php:108
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
+"target=\"_blank\">access your Files via WebDAV</a>"
 msgstr ""
 
-#: templates/users.php:21 templates/users.php:84
+#: templates/users.php:21
 msgid "Login Name"
 msgstr ""
 
@@ -485,6 +488,10 @@ msgstr ""
 msgid "Other"
 msgstr ""
 
+#: templates/users.php:84
+msgid "Username"
+msgstr "ناوی به‌کارهێنه‌ر"
+
 #: templates/users.php:91
 msgid "Storage"
 msgstr ""
diff --git a/l10n/ku_IQ/user_ldap.po b/l10n/ku_IQ/user_ldap.po
index ac98cb7219eb368d6ed1e257b84cfa0adb014de3..ade069fc501af816428f34d8b12c1ac7f8cb88de 100644
--- a/l10n/ku_IQ/user_ldap.po
+++ b/l10n/ku_IQ/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:25+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:16+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/lb/core.po b/l10n/lb/core.po
index 59e4d3261876666fdd2ec543817d24917ac33ccc..941ef244ef6096a6af6dca2fc7c5c90cf035d8ae 100644
--- a/l10n/lb/core.po
+++ b/l10n/lb/core.po
@@ -3,12 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Michel Weimerskirch <michel@weimerskirch.net>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:22+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
 "MIME-Version: 1.0\n"
@@ -20,11 +21,11 @@ msgstr ""
 #: ajax/share.php:97
 #, php-format
 msgid "%s shared »%s« with you"
-msgstr ""
+msgstr "Den/D' %s huet »%s« mat dir gedeelt"
 
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
-msgstr ""
+msgstr "Typ vun der Kategorie net uginn."
 
 #: ajax/vcategories/add.php:30
 msgid "No category to add?"
@@ -33,24 +34,24 @@ msgstr "Keng Kategorie fir bäizesetzen?"
 #: ajax/vcategories/add.php:37
 #, php-format
 msgid "This category already exists: %s"
-msgstr ""
+msgstr "Dës Kategorie existéiert schon: %s"
 
 #: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27
 #: ajax/vcategories/favorites.php:24
 #: ajax/vcategories/removeFromFavorites.php:26
 msgid "Object type not provided."
-msgstr ""
+msgstr "Typ vum Objet net uginn."
 
 #: ajax/vcategories/addToFavorites.php:30
 #: ajax/vcategories/removeFromFavorites.php:30
 #, php-format
 msgid "%s ID not provided."
-msgstr ""
+msgstr "%s ID net uginn."
 
 #: ajax/vcategories/addToFavorites.php:35
 #, php-format
 msgid "Error adding %s to favorites."
-msgstr ""
+msgstr "Feeler beim dobäisetze vun %s bei d'Favoritten."
 
 #: ajax/vcategories/delete.php:35 js/oc-vcategories.js:136
 msgid "No categories selected for deletion."
@@ -59,139 +60,139 @@ msgstr "Keng Kategorien ausgewielt fir ze läschen."
 #: ajax/vcategories/removeFromFavorites.php:35
 #, php-format
 msgid "Error removing %s from favorites."
-msgstr ""
+msgstr "Feeler beim läsche vun %s aus de Favoritten."
 
-#: js/config.php:34
+#: js/config.php:32
 msgid "Sunday"
-msgstr "Sonndes"
+msgstr "Sonndeg"
 
-#: js/config.php:35
+#: js/config.php:33
 msgid "Monday"
-msgstr "Méindes"
+msgstr "Méindeg"
 
-#: js/config.php:36
+#: js/config.php:34
 msgid "Tuesday"
-msgstr "Dënschdes"
+msgstr "Dënschdeg"
 
-#: js/config.php:37
+#: js/config.php:35
 msgid "Wednesday"
 msgstr "Mëttwoch"
 
-#: js/config.php:38
+#: js/config.php:36
 msgid "Thursday"
-msgstr "Donneschdes"
+msgstr "Donneschdeg"
 
-#: js/config.php:39
+#: js/config.php:37
 msgid "Friday"
-msgstr "Freides"
+msgstr "Freideg"
 
-#: js/config.php:40
+#: js/config.php:38
 msgid "Saturday"
-msgstr "Samschdes"
+msgstr "Samschdeg"
 
-#: js/config.php:45
+#: js/config.php:43
 msgid "January"
 msgstr "Januar"
 
-#: js/config.php:46
+#: js/config.php:44
 msgid "February"
 msgstr "Februar"
 
-#: js/config.php:47
+#: js/config.php:45
 msgid "March"
 msgstr "Mäerz"
 
-#: js/config.php:48
+#: js/config.php:46
 msgid "April"
 msgstr "Abrëll"
 
-#: js/config.php:49
+#: js/config.php:47
 msgid "May"
 msgstr "Mee"
 
-#: js/config.php:50
+#: js/config.php:48
 msgid "June"
 msgstr "Juni"
 
-#: js/config.php:51
+#: js/config.php:49
 msgid "July"
 msgstr "Juli"
 
-#: js/config.php:52
+#: js/config.php:50
 msgid "August"
 msgstr "August"
 
-#: js/config.php:53
+#: js/config.php:51
 msgid "September"
 msgstr "September"
 
-#: js/config.php:54
+#: js/config.php:52
 msgid "October"
 msgstr "Oktober"
 
-#: js/config.php:55
+#: js/config.php:53
 msgid "November"
 msgstr "November"
 
-#: js/config.php:56
+#: js/config.php:54
 msgid "December"
 msgstr "Dezember"
 
-#: js/js.js:286
+#: js/js.js:293
 msgid "Settings"
 msgstr "Astellungen"
 
-#: js/js.js:718
+#: js/js.js:725
 msgid "seconds ago"
-msgstr ""
+msgstr "Sekonnen hir"
 
-#: js/js.js:719
+#: js/js.js:726
 msgid "1 minute ago"
-msgstr ""
+msgstr "1 Minutt hir"
 
-#: js/js.js:720
+#: js/js.js:727
 msgid "{minutes} minutes ago"
-msgstr ""
+msgstr "virun {minutes} Minutten"
 
-#: js/js.js:721
+#: js/js.js:728
 msgid "1 hour ago"
-msgstr "vrun 1 Stonn"
+msgstr "virun 1 Stonn"
 
-#: js/js.js:722
+#: js/js.js:729
 msgid "{hours} hours ago"
-msgstr "vru {hours} Stonnen"
+msgstr "virun {hours} Stonnen"
 
-#: js/js.js:723
+#: js/js.js:730
 msgid "today"
-msgstr ""
+msgstr "haut"
 
-#: js/js.js:724
+#: js/js.js:731
 msgid "yesterday"
-msgstr ""
+msgstr "gëschter"
 
-#: js/js.js:725
+#: js/js.js:732
 msgid "{days} days ago"
-msgstr ""
+msgstr "virun {days} Deeg"
 
-#: js/js.js:726
+#: js/js.js:733
 msgid "last month"
-msgstr "Läschte Mount"
+msgstr "leschte Mount"
 
-#: js/js.js:727
+#: js/js.js:734
 msgid "{months} months ago"
-msgstr "vru {months} Méint"
+msgstr "virun {months} Méint"
 
-#: js/js.js:728
+#: js/js.js:735
 msgid "months ago"
-msgstr "Méint hier"
+msgstr "Méint hir"
 
-#: js/js.js:729
+#: js/js.js:736
 msgid "last year"
-msgstr "Läscht Joer"
+msgstr "Lescht Joer"
 
-#: js/js.js:730
+#: js/js.js:737
 msgid "years ago"
-msgstr "Joren hier"
+msgstr "Joren hir"
 
 #: js/oc-dialogs.js:117
 msgid "Choose"
@@ -203,7 +204,7 @@ msgstr "Ofbriechen"
 
 #: js/oc-dialogs.js:141 js/oc-dialogs.js:200
 msgid "Error loading file picker template"
-msgstr ""
+msgstr "Feeler beim Luede vun der Virlag fir d'Fichiers-Selektioun"
 
 #: js/oc-dialogs.js:164
 msgid "Yes"
@@ -220,181 +221,185 @@ 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 "Den Typ vum Object ass net uginn."
 
 #: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
 #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:577
-#: js/share.js:589
+#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:620
+#: js/share.js:632
 msgid "Error"
-msgstr "Fehler"
+msgstr "Feeler"
 
 #: js/oc-vcategories.js:179
 msgid "The app name is not specified."
-msgstr ""
+msgstr "Den Numm vun der App ass net uginn."
 
 #: js/oc-vcategories.js:194
 msgid "The required file {file} is not installed!"
-msgstr ""
+msgstr "De benéidegte Fichier {file} ass net installéiert!"
 
 #: js/share.js:30 js/share.js:45 js/share.js:87
 msgid "Shared"
-msgstr ""
+msgstr "Gedeelt"
 
 #: js/share.js:90
 msgid "Share"
 msgstr "Deelen"
 
-#: js/share.js:125 js/share.js:617
+#: js/share.js:125 js/share.js:660
 msgid "Error while sharing"
-msgstr ""
+msgstr "Feeler beim Deelen"
 
 #: js/share.js:136
 msgid "Error while unsharing"
-msgstr ""
+msgstr "Feeler beim Annuléiere vum Deelen"
 
 #: js/share.js:143
 msgid "Error while changing permissions"
-msgstr ""
+msgstr "Feeler beim Ännere vun de Rechter"
 
 #: js/share.js:152
 msgid "Shared with you and the group {group} by {owner}"
-msgstr ""
+msgstr "Gedeelt mat dir an der Grupp {group} vum {owner}"
 
 #: js/share.js:154
 msgid "Shared with you by {owner}"
-msgstr ""
+msgstr "Gedeelt mat dir vum {owner}"
 
-#: js/share.js:159
+#: js/share.js:172
 msgid "Share with"
-msgstr ""
+msgstr "Deele mat"
 
-#: js/share.js:164
+#: js/share.js:177
 msgid "Share with link"
-msgstr ""
+msgstr "Mat Link deelen"
 
-#: js/share.js:167
+#: js/share.js:180
 msgid "Password protect"
-msgstr ""
+msgstr "Passwuertgeschützt"
 
-#: js/share.js:169 templates/installation.php:54 templates/login.php:26
+#: js/share.js:182 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "Passwuert"
 
-#: js/share.js:173
+#: js/share.js:187
+msgid "Allow Public Upload"
+msgstr "Ëffentlechen Upload erlaaben"
+
+#: js/share.js:191
 msgid "Email link to person"
-msgstr ""
+msgstr "Link enger Persoun mailen"
 
-#: js/share.js:174
+#: js/share.js:192
 msgid "Send"
-msgstr ""
+msgstr "Schécken"
 
-#: js/share.js:178
+#: js/share.js:197
 msgid "Set expiration date"
-msgstr ""
+msgstr "Verfallsdatum setzen"
 
-#: js/share.js:179
+#: js/share.js:198
 msgid "Expiration date"
-msgstr ""
+msgstr "Verfallsdatum"
 
-#: js/share.js:211
+#: js/share.js:230
 msgid "Share via email:"
-msgstr ""
+msgstr "Via E-Mail deelen:"
 
-#: js/share.js:213
+#: js/share.js:232
 msgid "No people found"
-msgstr ""
+msgstr "Keng Persoune fonnt"
 
-#: js/share.js:251
+#: js/share.js:270
 msgid "Resharing is not allowed"
-msgstr ""
+msgstr "Weiderdeelen ass net erlaabt"
 
-#: js/share.js:287
+#: js/share.js:306
 msgid "Shared in {item} with {user}"
-msgstr ""
+msgstr "Gedeelt an {item} mat {user}"
 
-#: js/share.js:308
+#: js/share.js:327
 msgid "Unshare"
 msgstr "Net méi deelen"
 
-#: js/share.js:320
+#: js/share.js:339
 msgid "can edit"
-msgstr ""
+msgstr "kann änneren"
 
-#: js/share.js:322
+#: js/share.js:341
 msgid "access control"
-msgstr ""
+msgstr "Zougrëffskontroll"
 
-#: js/share.js:325
+#: js/share.js:344
 msgid "create"
 msgstr "erstellen"
 
-#: js/share.js:328
+#: js/share.js:347
 msgid "update"
-msgstr ""
+msgstr "aktualiséieren"
 
-#: js/share.js:331
+#: js/share.js:350
 msgid "delete"
 msgstr "läschen"
 
-#: js/share.js:334
+#: js/share.js:353
 msgid "share"
 msgstr "deelen"
 
-#: js/share.js:368 js/share.js:564
+#: js/share.js:387 js/share.js:607
 msgid "Password protected"
-msgstr ""
+msgstr "Passwuertgeschützt"
 
-#: js/share.js:577
+#: js/share.js:620
 msgid "Error unsetting expiration date"
-msgstr ""
+msgstr "Feeler beim Läsche vum Verfallsdatum"
 
-#: js/share.js:589
+#: js/share.js:632
 msgid "Error setting expiration date"
-msgstr ""
+msgstr "Feeler beim Setze vum Verfallsdatum"
 
-#: js/share.js:604
+#: js/share.js:647
 msgid "Sending ..."
-msgstr ""
+msgstr "Gëtt geschéckt..."
 
-#: js/share.js:615
+#: js/share.js:658
 msgid "Email sent"
-msgstr ""
+msgstr "Email geschéckt"
 
 #: js/update.js:14
 msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
 "href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
 "community</a>."
-msgstr ""
+msgstr "Den Update war net erfollegräich. Mell dëse Problem w.e.gl der<a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud-Community</a>."
 
 #: js/update.js:18
 msgid "The update was successful. Redirecting you to ownCloud now."
-msgstr ""
+msgstr "Den Update war erfollegräich.  Du gëss elo bei d'ownCloud ëmgeleet."
 
-#: lostpassword/controller.php:58
+#: lostpassword/controller.php:60
 msgid "ownCloud password reset"
-msgstr "ownCloud Passwuert reset"
+msgstr "Passwuert-Zrécksetzung vun der ownCloud"
 
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
-msgstr "Benotz folgende Link fir däi Passwuert ze reseten: {link}"
+msgstr "Benotz folgende Link fir däi Passwuert zréckzesetzen: {link}"
 
 #: lostpassword/templates/lostpassword.php:4
 msgid ""
 "The link to reset your password has been sent to your email.<br>If you do "
 "not receive it within a reasonable amount of time, check your spam/junk "
 "folders.<br>If it is not there ask your local administrator ."
-msgstr ""
+msgstr "De Link fir d'Passwuert zréckzesetzen gouf un deng E-Mail-Adress geschéckt.<br>Falls du d'Mail net an den nächste Minutte kriss, kuck w.e.gl. an dengem Spam-Dossier.<br>Wann do och keng Mail ass, fro w.e.gl. däin Adminstrateur."
 
 #: lostpassword/templates/lostpassword.php:12
 msgid "Request failed!<br>Did you make sure your email/username was right?"
-msgstr ""
+msgstr "Ufro feelfeschloen!<br>Hues du séchergestallt dass deng Email respektiv däi Benotzernumm korrekt sinn?"
 
 #: lostpassword/templates/lostpassword.php:15
 msgid "You will receive a link to reset your password via Email."
-msgstr "Du kriss en Link fir däin Passwuert nei ze setzen via Email geschéckt."
+msgstr "Du kriss e Link fir däi Passwuert zréckzesetze via Email geschéckt."
 
 #: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
 #: templates/login.php:19
@@ -403,27 +408,27 @@ msgstr "Benotzernumm"
 
 #: lostpassword/templates/lostpassword.php:22
 msgid ""
-"Your files seems to be encrypted. If you didn't have enabled the recovery "
-"key there will be no way to get your data back once the password was "
-"resetted. If you are not sure what to do, please contact your administrator "
-"first before continue. Do you really want to continue?"
-msgstr ""
+"Your files are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
+msgstr "Deng Fichiere si verschlësselt. Falls du de Recuperatiouns-Schlëssel net aktivéiert hues, gëtt et keng Méiglechkeet nees un deng Daten ze komme wann däi Passwuert muss zréckgesat ginn. Falls du net sécher bass wat s de maache soll, kontaktéier w.e.gl däin Administrateur bevir s de weidermëss. Wëlls de wierklech weidermaachen?"
 
 #: lostpassword/templates/lostpassword.php:24
 msgid "Yes, I really want to reset my password now"
-msgstr ""
+msgstr "Jo, ech wëll mäi Passwuert elo zrécksetzen"
 
-#: lostpassword/templates/lostpassword.php:29
+#: lostpassword/templates/lostpassword.php:27
 msgid "Request reset"
-msgstr "Reset ufroen"
+msgstr "Zrécksetzung ufroen"
 
 #: lostpassword/templates/resetpassword.php:4
 msgid "Your password was reset"
-msgstr "Dän Passwuert ass zeréck gesat gin"
+msgstr "Däi Passwuert ass zréck gesat ginn"
 
 #: lostpassword/templates/resetpassword.php:5
 msgid "To login page"
-msgstr "Op d'Login Säit"
+msgstr "Bei d'Login-Säit"
 
 #: lostpassword/templates/resetpassword.php:8
 msgid "New password"
@@ -431,7 +436,7 @@ msgstr "Neit Passwuert"
 
 #: lostpassword/templates/resetpassword.php:11
 msgid "Reset password"
-msgstr "Passwuert zeréck setzen"
+msgstr "Passwuert zréck setzen"
 
 #: strings.php:5
 msgid "Personal"
@@ -443,7 +448,7 @@ msgstr "Benotzer"
 
 #: strings.php:7
 msgid "Apps"
-msgstr "Applicatiounen"
+msgstr "Applikatiounen"
 
 #: strings.php:8
 msgid "Admin"
@@ -455,13 +460,13 @@ msgstr "Hëllef"
 
 #: templates/403.php:12
 msgid "Access forbidden"
-msgstr "Access net erlaabt"
+msgstr "Zougrëff net erlaabt"
 
 #: templates/404.php:12
 msgid "Cloud not found"
 msgstr "Cloud net fonnt"
 
-#: templates/altmail.php:2
+#: templates/altmail.php:4
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -470,11 +475,7 @@ msgid ""
 "View it: %s\n"
 "\n"
 "Cheers!"
-msgstr ""
-
-#: templates/altmail.php:7 templates/mail.php:24
-msgid "web services under your control"
-msgstr "Web Servicer ënnert denger Kontroll"
+msgstr "Hallo,\n\nech wëll just Bescheed soen dass den/d' %s,  »%s« mat dir gedeelt huet.\nKucken: %s\n\nE schéine Bonjour!"
 
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
@@ -487,44 +488,44 @@ msgstr "Dobäisetzen"
 #: templates/installation.php:24 templates/installation.php:31
 #: templates/installation.php:38
 msgid "Security Warning"
-msgstr "Sécherheets Warnung"
+msgstr "Sécherheets-Warnung"
 
 #: templates/installation.php:25
 msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
-msgstr ""
+msgstr "Deng PHP-Versioun ass verwonnbar duerch d'NULL-Byte-Attack (CVE-2006-7243)"
 
 #: templates/installation.php:26
 msgid "Please update your PHP installation to use ownCloud securely."
-msgstr ""
+msgstr "Aktualiséier w.e.gl deng PHP-Installatioun fir ownCloud sécher benotzen ze kënnen."
 
 #: templates/installation.php:32
 msgid ""
 "No secure random number generator is available, please enable the PHP "
 "OpenSSL extension."
-msgstr ""
+msgstr "Et ass kee sécheren Zoufallsgenerator verfügbar. Aktivéier w.e.gl d'OpenSSL-Erweiderung vu PHP."
 
 #: templates/installation.php:33
 msgid ""
 "Without a secure random number generator an attacker may be able to predict "
 "password reset tokens and take over your account."
-msgstr ""
+msgstr "Ouni e sécheren Zoufallsgenerator kann en Ugräifer d'Passwuert-Zrécksetzungs-Schlësselen viraussoen an en Account iwwerhuelen."
 
 #: templates/installation.php:39
 msgid ""
 "Your data directory and files are probably accessible from the internet "
 "because the .htaccess file does not work."
-msgstr ""
+msgstr "Däin Daten-Dossier an deng Fichieren si wahrscheinlech iwwert den Internet accessibel well den .htaccess-Fichier net funktionnéiert."
 
 #: templates/installation.php:40
 msgid ""
 "For information how to properly configure your server, please see the <a "
 "href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" "
 "target=\"_blank\">documentation</a>."
-msgstr ""
+msgstr "Kuck w.e.gl. an der <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">Dokumentatioun</a> fir Informatiounen iwwert eng uerdentlech Konfiguratioun vum Server."
 
 #: templates/installation.php:44
 msgid "Create an <strong>admin account</strong>"
-msgstr "En <strong>Admin Account</strong> uleeën"
+msgstr "En <strong>Admin-Account</strong> uleeën"
 
 #: templates/installation.php:62
 msgid "Advanced"
@@ -532,11 +533,11 @@ msgstr "Avancéiert"
 
 #: templates/installation.php:64
 msgid "Data folder"
-msgstr "Daten Dossier"
+msgstr "Daten-Dossier"
 
 #: templates/installation.php:74
 msgid "Configure the database"
-msgstr "Datebank konfiguréieren"
+msgstr "D'Datebank konfiguréieren"
 
 #: templates/installation.php:79 templates/installation.php:91
 #: templates/installation.php:102 templates/installation.php:113
@@ -546,11 +547,11 @@ msgstr "wärt benotzt ginn"
 
 #: templates/installation.php:137
 msgid "Database user"
-msgstr "Datebank Benotzer"
+msgstr "Datebank-Benotzer"
 
 #: templates/installation.php:144
 msgid "Database password"
-msgstr "Datebank Passwuert"
+msgstr "Datebank-Passwuert"
 
 #: templates/installation.php:149
 msgid "Database name"
@@ -558,38 +559,38 @@ msgstr "Datebank Numm"
 
 #: templates/installation.php:159
 msgid "Database tablespace"
-msgstr "Datebank Tabelle-Gréisst"
+msgstr "Tabelle-Plaz vun der Datebank"
 
 #: templates/installation.php:166
 msgid "Database host"
-msgstr "Datebank Server"
+msgstr "Datebank-Server"
 
 #: templates/installation.php:172
 msgid "Finish setup"
 msgstr "Installatioun ofschléissen"
 
-#: templates/layout.user.php:40
+#: templates/layout.user.php:43
 #, php-format
 msgid "%s is available. Get more information on how to update."
-msgstr ""
+msgstr "%s ass verfügbar. Kréi méi Informatiounen doriwwer wéi d'Aktualiséierung ofleeft."
 
-#: templates/layout.user.php:67
+#: templates/layout.user.php:68
 msgid "Log out"
-msgstr "Ausloggen"
+msgstr "Ofmellen"
 
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
-msgstr ""
+msgstr "Automatesch Umeldung ofgeleent!"
 
 #: templates/login.php:10
 msgid ""
 "If you did not change your password recently, your account may be "
 "compromised!"
-msgstr ""
+msgstr "Falls du däi Passwuert net viru kuerzem geännert hues, kéint däin Account kompromittéiert sinn!"
 
 #: templates/login.php:12
 msgid "Please change your password to secure your account again."
-msgstr ""
+msgstr "Änner w.e.gl däi Passwuert fir däin Account nees ofzesécheren."
 
 #: templates/login.php:34
 msgid "Lost your password?"
@@ -601,18 +602,18 @@ msgstr "verhalen"
 
 #: templates/login.php:41
 msgid "Log in"
-msgstr "Log dech an"
+msgstr "Umellen"
 
 #: templates/login.php:47
 msgid "Alternative Logins"
-msgstr ""
+msgstr "Alternativ Umeldungen"
 
-#: templates/mail.php:15
+#: templates/mail.php:16
 #, php-format
 msgid ""
 "Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
 "href=\"%s\">View it!</a><br><br>Cheers!"
-msgstr ""
+msgstr "Hallo,<br><br>ech wëll just Bescheed soen dass den/d' %s,  »%s« mat dir gedeelt huet.<br><a href=\"%s\">Kucken!</a><br><br>E schéine Bonjour!"
 
 #: templates/part.pagenavi.php:3
 msgid "prev"
@@ -625,4 +626,4 @@ msgstr "weider"
 #: templates/update.php:3
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
-msgstr ""
+msgstr "ownCloud gëtt op d'Versioun %s aktualiséiert, dat kéint e Moment daueren."
diff --git a/l10n/lb/files.po b/l10n/lb/files.po
index a2cff0aab0b3059c3b9f1efb6b1a3a699f44d0bc..281c49d7d76d47f5d53f3aa3e57781b519928098 100644
--- a/l10n/lb/files.po
+++ b/l10n/lb/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:01+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
 "MIME-Version: 1.0\n"
@@ -27,46 +27,54 @@ msgstr ""
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/upload.php:19
+#: ajax/upload.php:16 ajax/upload.php:45
+msgid "Unable to set upload directory."
+msgstr ""
+
+#: ajax/upload.php:22
+msgid "Invalid Token"
+msgstr ""
+
+#: ajax/upload.php:59
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: ajax/upload.php:26
+#: ajax/upload.php:66
 msgid "There is no error, the file uploaded with success"
 msgstr "Keen Feeler, Datei ass komplett ropgelueden ginn"
 
-#: ajax/upload.php:27
+#: ajax/upload.php:67
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:29
+#: ajax/upload.php:69
 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:30
+#: ajax/upload.php:70
 msgid "The uploaded file was only partially uploaded"
 msgstr "Déi ropgelueden Datei ass nëmmen hallef ropgelueden ginn"
 
-#: ajax/upload.php:31
+#: ajax/upload.php:71
 msgid "No file was uploaded"
 msgstr "Et ass kee Fichier ropgeluede ginn"
 
-#: ajax/upload.php:32
+#: ajax/upload.php:72
 msgid "Missing a temporary folder"
 msgstr "Et feelt en temporären Dossier"
 
-#: ajax/upload.php:33
+#: ajax/upload.php:73
 msgid "Failed to write to disk"
 msgstr "Konnt net op den Disk schreiwen"
 
-#: ajax/upload.php:51
+#: ajax/upload.php:91
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:83
+#: ajax/upload.php:123
 msgid "Invalid directory."
 msgstr ""
 
@@ -74,6 +82,36 @@ msgstr ""
 msgid "Files"
 msgstr "Dateien"
 
+#: js/file-upload.js:11
+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/file-upload.js:24
+msgid "Not enough space available"
+msgstr ""
+
+#: js/file-upload.js:64
+msgid "Upload cancelled."
+msgstr "Upload ofgebrach."
+
+#: js/file-upload.js:167 js/files.js:266
+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/file-upload.js:233 js/files.js:339
+msgid "URL cannot be empty."
+msgstr ""
+
+#: js/file-upload.js:238 lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr ""
+
+#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
+#: js/files.js:693 js/files.js:731
+msgid "Error"
+msgstr "Fehler"
+
 #: js/fileactions.js:116
 msgid "Share"
 msgstr "Deelen"
@@ -90,43 +128,43 @@ msgstr "Läschen"
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:464
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "replace"
 msgstr "ersetzen"
 
-#: js/filelist.js:259
+#: js/filelist.js:302
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "cancel"
 msgstr "ofbriechen"
 
-#: js/filelist.js:306
+#: js/filelist.js:349
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:306
+#: js/filelist.js:349
 msgid "undo"
 msgstr "réckgängeg man"
 
-#: js/filelist.js:331
+#: js/filelist.js:374
 msgid "perform delete operation"
 msgstr ""
 
-#: js/filelist.js:413
+#: js/filelist.js:456
 msgid "1 file uploading"
 msgstr ""
 
-#: js/filelist.js:416 js/filelist.js:470
+#: js/filelist.js:459 js/filelist.js:517
 msgid "files uploading"
 msgstr ""
 
@@ -158,69 +196,41 @@ msgid ""
 "big."
 msgstr ""
 
-#: js/files.js:264
-msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "Kann deng Datei net eroplueden well et en Dossier ass oder 0 byte grouss ass."
-
-#: js/files.js:277
-msgid "Not enough space available"
-msgstr ""
-
-#: js/files.js:317
-msgid "Upload cancelled."
-msgstr "Upload ofgebrach."
-
-#: js/files.js:413
-msgid ""
-"File upload is in progress. Leaving the page now will cancel the upload."
-msgstr "File Upload am gaang. Wann's de des Säit verléiss gëtt den Upload ofgebrach."
-
-#: js/files.js:486
-msgid "URL cannot be empty."
-msgstr ""
-
-#: js/files.js:491
+#: js/files.js:344
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
-msgid "Error"
-msgstr "Fehler"
-
-#: js/files.js:877 templates/index.php:69
+#: js/files.js:744 templates/index.php:69
 msgid "Name"
 msgstr "Numm"
 
-#: js/files.js:878 templates/index.php:80
+#: js/files.js:745 templates/index.php:80
 msgid "Size"
 msgstr "Gréisst"
 
-#: js/files.js:879 templates/index.php:82
+#: js/files.js:746 templates/index.php:82
 msgid "Modified"
 msgstr "Geännert"
 
-#: js/files.js:898
+#: js/files.js:765
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:900
+#: js/files.js:767
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:908
+#: js/files.js:775
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:910
+#: js/files.js:777
 msgid "{count} files"
 msgstr ""
 
-#: lib/app.php:53
-msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
-msgstr ""
-
 #: lib/app.php:73
-msgid "Unable to rename file"
+#, php-format
+msgid "%s could not be renamed"
 msgstr ""
 
 #: lib/helper.php:11 templates/index.php:18
@@ -317,6 +327,22 @@ msgstr "Fichieren gi gescannt, war weg."
 msgid "Current scanning"
 msgstr "Momentane Scan"
 
+#: templates/part.list.php:76
+msgid "directory"
+msgstr ""
+
+#: templates/part.list.php:78
+msgid "directories"
+msgstr ""
+
+#: templates/part.list.php:87
+msgid "file"
+msgstr "Datei"
+
+#: templates/part.list.php:89
+msgid "files"
+msgstr "Dateien"
+
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
 msgstr ""
diff --git a/l10n/lb/files_encryption.po b/l10n/lb/files_encryption.po
index ab40dca41a4702a105008f9e36f2e0f6b3781b22..cecd9c334341e2e25a4e3583a980ab309016bb05 100644
--- a/l10n/lb/files_encryption.po
+++ b/l10n/lb/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-14 02:46+0200\n"
-"PO-Revision-Date: 2013-06-14 00:47+0000\n"
+"POT-Creation-Date: 2013-07-05 02:12+0200\n"
+"PO-Revision-Date: 2013-07-05 00:13+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"
@@ -55,9 +55,21 @@ msgstr ""
 
 #: files/error.php:7
 msgid ""
-"Your private key is not valid! Maybe your password was changed from outside."
-" You can update your private key password in your personal settings to "
-"regain access to your files"
+"Your private key is not valid! Likely your password was changed outside the "
+"ownCloud system (e.g. your corporate directory). You can update your private"
+" key password in your personal settings to recover access to your encrypted "
+"files."
+msgstr ""
+
+#: hooks/hooks.php:44
+msgid "Missing requirements."
+msgstr ""
+
+#: hooks/hooks.php:45
+msgid ""
+"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL "
+"PHP extension is enabled and configured properly. For now, the encryption "
+"app has been disabled."
 msgstr ""
 
 #: js/settings-admin.js:11
@@ -84,11 +96,11 @@ msgstr ""
 
 #: templates/settings-admin.php:10
 msgid ""
-"Enable encryption passwords recovery key (allow sharing to recovery key):"
+"Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
 #: templates/settings-admin.php:14
-msgid "Recovery account password"
+msgid "Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:21 templates/settings-personal.php:54
@@ -100,15 +112,15 @@ msgid "Disabled"
 msgstr ""
 
 #: templates/settings-admin.php:34
-msgid "Change encryption passwords recovery key:"
+msgid "Change recovery key password:"
 msgstr ""
 
 #: templates/settings-admin.php:41
-msgid "Old Recovery account password"
+msgid "Old Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:48
-msgid "New Recovery account password"
+msgid "New Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:53
diff --git a/l10n/lb/files_external.po b/l10n/lb/files_external.po
index 9bdd1dba467738645462817d4f1a578ed7d26e1a..53030bdee166055595c46d4ce9a9703f1f89cf3a 100644
--- a/l10n/lb/files_external.po
+++ b/l10n/lb/files_external.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/lb/files_sharing.po b/l10n/lb/files_sharing.po
index 48dd1399544d79d88e9060c6970cc9d8fab0391e..8132adb60e104a9ecaec0a412f72f0995176d5bf 100644
--- a/l10n/lb/files_sharing.po
+++ b/l10n/lb/files_sharing.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# llaera <llaera@outlook.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
+"Last-Translator: llaera <llaera@outlook.com>\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"
@@ -18,27 +19,39 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: templates/authenticate.php:4
+msgid "The password is wrong. Try again."
+msgstr "Den Passwuert ass incorrect. Probeier ed nach eng keier."
+
+#: templates/authenticate.php:7
 msgid "Password"
 msgstr "Passwuert"
 
-#: templates/authenticate.php:6
+#: templates/authenticate.php:9
 msgid "Submit"
 msgstr "Fortschécken"
 
-#: templates/public.php:10
+#: templates/public.php:17
 #, php-format
 msgid "%s shared the folder %s with you"
-msgstr ""
+msgstr "%s huet den Dossier %s mad der gedeelt"
 
-#: templates/public.php:13
+#: templates/public.php:20
 #, php-format
 msgid "%s shared the file %s with you"
-msgstr ""
+msgstr "%s deelt den Fichier %s mad dir"
 
-#: templates/public.php:19 templates/public.php:43
+#: templates/public.php:28 templates/public.php:90
 msgid "Download"
 msgstr "Download"
 
-#: templates/public.php:40
+#: templates/public.php:45 templates/public.php:48
+msgid "Upload"
+msgstr "Eroplueden"
+
+#: templates/public.php:58
+msgid "Cancel upload"
+msgstr "Upload ofbriechen"
+
+#: templates/public.php:87
 msgid "No preview available for"
-msgstr ""
+msgstr "Keeng Preview do fir"
diff --git a/l10n/lb/files_trashbin.po b/l10n/lb/files_trashbin.po
index 565b230a4563357806310834d8dbf6370d024498..eeab6d758fad7015db61dffee4fca7a40d0135c6 100644
--- a/l10n/lb/files_trashbin.po
+++ b/l10n/lb/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:16+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/lb/lib.po b/l10n/lb/lib.po
index 9a7f5d205adcf587246c7b0ea28a97e8bd63c907..0d96e950349fa2a6f211e981f954673030506435 100644
--- a/l10n/lb/lib.po
+++ b/l10n/lb/lib.po
@@ -3,12 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Michel Weimerskirch <michel@weimerskirch.net>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
 "MIME-Version: 1.0\n"
@@ -17,43 +18,47 @@ msgstr ""
 "Language: lb\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:359
+#: app.php:360
 msgid "Help"
 msgstr "Hëllef"
 
-#: app.php:372
+#: app.php:373
 msgid "Personal"
 msgstr "Perséinlech"
 
-#: app.php:383
+#: app.php:384
 msgid "Settings"
 msgstr "Astellungen"
 
-#: app.php:395
+#: app.php:396
 msgid "Users"
 msgstr "Benotzer"
 
-#: app.php:408
+#: app.php:409
 msgid "Apps"
-msgstr "Applicatiounen"
+msgstr "Applikatiounen"
 
-#: app.php:416
+#: app.php:417
 msgid "Admin"
 msgstr "Admin"
 
-#: files.php:210
+#: defaults.php:33
+msgid "web services under your control"
+msgstr "Web-Servicer ënnert denger Kontroll"
+
+#: files.php:226
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: files.php:211
+#: files.php:227
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:212 files.php:245
+#: files.php:228 files.php:261
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:242
+#: files.php:258
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
@@ -85,115 +90,113 @@ msgstr "SMS"
 msgid "Images"
 msgstr ""
 
-#: setup.php:34
-msgid "Set an admin username."
-msgstr ""
-
-#: setup.php:37
-msgid "Set an admin password."
-msgstr ""
-
-#: setup.php:55
+#: setup/abstractdatabase.php:22
 #, php-format
 msgid "%s enter the database username."
 msgstr ""
 
-#: setup.php:58
+#: setup/abstractdatabase.php:25
 #, php-format
 msgid "%s enter the database name."
 msgstr ""
 
-#: setup.php:61
+#: setup/abstractdatabase.php:28
 #, php-format
 msgid "%s you may not use dots in the database name"
 msgstr ""
 
-#: setup.php:64
+#: setup/mssql.php:20
 #, php-format
-msgid "%s set the database host."
-msgstr ""
-
-#: setup.php:126 setup.php:332 setup.php:377
-msgid "PostgreSQL username and/or password not valid"
+msgid "MS SQL username and/or password not valid: %s"
 msgstr ""
 
-#: setup.php:127 setup.php:235
+#: setup/mssql.php:21 setup/mysql.php:13 setup/oci.php:114
+#: setup/postgresql.php:24 setup/postgresql.php:70
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:152
-msgid "Oracle connection could not be established"
-msgstr ""
-
-#: setup.php:234
+#: setup/mysql.php:12
 msgid "MySQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:288 setup.php:398 setup.php:407 setup.php:425 setup.php:435
-#: setup.php:444 setup.php:477 setup.php:543 setup.php:569 setup.php:576
-#: setup.php:587 setup.php:594 setup.php:603 setup.php:611 setup.php:620
-#: setup.php:626
+#: setup/mysql.php:67 setup/oci.php:54 setup/oci.php:121 setup/oci.php:147
+#: setup/oci.php:154 setup/oci.php:165 setup/oci.php:172 setup/oci.php:181
+#: setup/oci.php:189 setup/oci.php:198 setup/oci.php:204
+#: setup/postgresql.php:89 setup/postgresql.php:98 setup/postgresql.php:115
+#: setup/postgresql.php:125 setup/postgresql.php:134
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr ""
 
-#: setup.php:289 setup.php:399 setup.php:408 setup.php:426 setup.php:436
-#: setup.php:445 setup.php:478 setup.php:544 setup.php:570 setup.php:577
-#: setup.php:588 setup.php:604 setup.php:612 setup.php:621
+#: setup/mysql.php:68 setup/oci.php:55 setup/oci.php:122 setup/oci.php:148
+#: setup/oci.php:155 setup/oci.php:166 setup/oci.php:182 setup/oci.php:190
+#: setup/oci.php:199 setup/postgresql.php:90 setup/postgresql.php:99
+#: setup/postgresql.php:116 setup/postgresql.php:126 setup/postgresql.php:135
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:305
+#: setup/mysql.php:85
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:306
+#: setup/mysql.php:86
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:311
+#: setup/mysql.php:91
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:312
+#: setup/mysql.php:92
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:469 setup.php:536
+#: setup/oci.php:34
+msgid "Oracle connection could not be established"
+msgstr ""
+
+#: setup/oci.php:41 setup/oci.php:113
 msgid "Oracle username and/or password not valid"
 msgstr ""
 
-#: setup.php:595 setup.php:627
+#: setup/oci.php:173 setup/oci.php:205
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:647
-#, php-format
-msgid "MS SQL username and/or password not valid: %s"
+#: setup/postgresql.php:23 setup/postgresql.php:69
+msgid "PostgreSQL username and/or password not valid"
+msgstr ""
+
+#: setup.php:42
+msgid "Set an admin username."
 msgstr ""
 
-#: setup.php:870
+#: setup.php:45
+msgid "Set an admin password."
+msgstr ""
+
+#: setup.php:198
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:871
+#: setup.php:199
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
 #: template.php:113
 msgid "seconds ago"
-msgstr ""
+msgstr "Sekonnen hir"
 
 #: template.php:114
 msgid "1 minute ago"
-msgstr ""
+msgstr "1 Minutt hir"
 
 #: template.php:115
 #, php-format
@@ -211,11 +214,11 @@ msgstr ""
 
 #: template.php:118
 msgid "today"
-msgstr ""
+msgstr "haut"
 
 #: template.php:119
 msgid "yesterday"
-msgstr ""
+msgstr "gëschter"
 
 #: template.php:120
 #, php-format
diff --git a/l10n/lb/settings.po b/l10n/lb/settings.po
index 5daa7db884c5d867d31f7708f8406c7019d70eba..3f7814acc4c6cded4747da26971be71c52f42b35 100644
--- a/l10n/lb/settings.po
+++ b/l10n/lb/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
 "MIME-Version: 1.0\n"
@@ -88,35 +88,35 @@ msgstr ""
 msgid "Couldn't update app."
 msgstr ""
 
-#: js/apps.js:30
+#: js/apps.js:35
 msgid "Update to {appversion}"
 msgstr ""
 
-#: js/apps.js:36 js/apps.js:76
+#: js/apps.js:41 js/apps.js:81
 msgid "Disable"
 msgstr "Ofschalten"
 
-#: js/apps.js:36 js/apps.js:64 js/apps.js:83
+#: js/apps.js:41 js/apps.js:69 js/apps.js:88
 msgid "Enable"
 msgstr "Aschalten"
 
-#: js/apps.js:55
+#: js/apps.js:60
 msgid "Please wait...."
 msgstr ""
 
-#: js/apps.js:59 js/apps.js:71 js/apps.js:80 js/apps.js:93
+#: js/apps.js:64 js/apps.js:76 js/apps.js:85 js/apps.js:98
 msgid "Error"
 msgstr "Fehler"
 
-#: js/apps.js:90
+#: js/apps.js:95
 msgid "Updating...."
 msgstr ""
 
-#: js/apps.js:93
+#: js/apps.js:98
 msgid "Error while updating app"
 msgstr ""
 
-#: js/apps.js:96
+#: js/apps.js:101
 msgid "Updated"
 msgstr ""
 
@@ -165,15 +165,15 @@ msgstr ""
 msgid "A valid password must be provided"
 msgstr ""
 
-#: personal.php:35 personal.php:36
+#: personal.php:37 personal.php:38
 msgid "__language_name__"
 msgstr "__language_name__"
 
-#: templates/admin.php:15
+#: templates/admin.php:17
 msgid "Security Warning"
 msgstr "Sécherheets Warnung"
 
-#: templates/admin.php:18
+#: templates/admin.php:20
 msgid ""
 "Your data directory and your files are probably accessible from the "
 "internet. The .htaccess file that ownCloud provides is not working. We "
@@ -182,36 +182,36 @@ msgid ""
 " webserver document root."
 msgstr ""
 
-#: templates/admin.php:29
+#: templates/admin.php:31
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:32
+#: templates/admin.php:34
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: templates/admin.php:33
+#: templates/admin.php:35
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:44
+#: templates/admin.php:46
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:47
+#: templates/admin.php:49
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr ""
 
-#: templates/admin.php:58
+#: templates/admin.php:60
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:63
+#: templates/admin.php:65
 #, php-format
 msgid ""
 "This ownCloud server can't set system locale to %s. This means that there "
@@ -219,11 +219,11 @@ msgid ""
 " to install the required packages on your system to support %s."
 msgstr ""
 
-#: templates/admin.php:75
+#: templates/admin.php:77
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:78
+#: templates/admin.php:80
 msgid ""
 "This ownCloud server has no working internet connection. This means that "
 "some of the features like mounting of external storage, notifications about "
@@ -233,102 +233,102 @@ msgid ""
 " of ownCloud."
 msgstr ""
 
-#: templates/admin.php:92
+#: templates/admin.php:94
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:101
+#: templates/admin.php:103
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:111
+#: templates/admin.php:113
 msgid ""
 "cron.php is registered at a webcron service. Call the cron.php page in the "
 "owncloud root once a minute over http."
 msgstr ""
 
-#: templates/admin.php:121
+#: templates/admin.php:123
 msgid ""
 "Use systems cron service. Call the cron.php file in the owncloud folder via "
 "a system cronjob once a minute."
 msgstr ""
 
-#: templates/admin.php:128
+#: templates/admin.php:130
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:134
+#: templates/admin.php:136
 msgid "Enable Share API"
 msgstr "Share API aschalten"
 
-#: templates/admin.php:135
+#: templates/admin.php:137
 msgid "Allow apps to use the Share API"
 msgstr "Erlab Apps d'Share API ze benotzen"
 
-#: templates/admin.php:142
+#: templates/admin.php:144
 msgid "Allow links"
 msgstr "Links erlaben"
 
-#: templates/admin.php:143
+#: templates/admin.php:145
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:150
+#: templates/admin.php:152
 msgid "Allow resharing"
 msgstr "Resharing erlaben"
 
-#: templates/admin.php:151
+#: templates/admin.php:153
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:158
+#: templates/admin.php:160
 msgid "Allow users to share with anyone"
 msgstr "Useren erlaben mat egal wiem ze sharen"
 
-#: templates/admin.php:161
+#: templates/admin.php:163
 msgid "Allow users to only share with users in their groups"
 msgstr "Useren nëmmen erlaben mat Useren aus hirer Grupp ze sharen"
 
-#: templates/admin.php:168
+#: templates/admin.php:170
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:181
+#: templates/admin.php:183
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:182
+#: templates/admin.php:184
 msgid ""
 "Enforces the clients to connect to ownCloud via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:185
+#: templates/admin.php:187
 msgid ""
 "Please connect to this ownCloud instance via HTTPS to enable or disable the "
 "SSL enforcement."
 msgstr ""
 
-#: templates/admin.php:195
+#: templates/admin.php:197
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:196
+#: templates/admin.php:198
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:227
+#: templates/admin.php:229
 msgid "More"
 msgstr "Méi"
 
-#: templates/admin.php:228
+#: templates/admin.php:230
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:235 templates/personal.php:116
+#: templates/admin.php:236 templates/personal.php:116
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:237 templates/personal.php:119
+#: templates/admin.php:240 templates/personal.php:119
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -386,76 +386,79 @@ msgstr ""
 msgid "Commercial Support"
 msgstr ""
 
-#: templates/personal.php:9
+#: templates/personal.php:10
 msgid "Get the apps to sync your files"
 msgstr ""
 
-#: templates/personal.php:20
+#: templates/personal.php:21
 msgid "Show First Run Wizard again"
 msgstr ""
 
-#: templates/personal.php:28
+#: templates/personal.php:29
 #, php-format
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr ""
 
-#: templates/personal.php:40 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:41 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "Passwuert"
 
-#: templates/personal.php:41
+#: templates/personal.php:42
 msgid "Your password was changed"
 msgstr ""
 
-#: templates/personal.php:42
+#: templates/personal.php:43
 msgid "Unable to change your password"
 msgstr "Konnt däin Passwuert net änneren"
 
-#: templates/personal.php:43
+#: templates/personal.php:44
 msgid "Current password"
 msgstr "Momentan 't Passwuert"
 
-#: templates/personal.php:45
+#: templates/personal.php:46
 msgid "New password"
 msgstr "Neit Passwuert"
 
-#: templates/personal.php:47
+#: templates/personal.php:48
 msgid "Change password"
 msgstr "Passwuert änneren"
 
-#: templates/personal.php:59 templates/users.php:85
+#: templates/personal.php:60 templates/users.php:85
 msgid "Display Name"
 msgstr ""
 
-#: templates/personal.php:74
+#: templates/personal.php:75
 msgid "Email"
 msgstr "Email"
 
-#: templates/personal.php:76
+#: templates/personal.php:77
 msgid "Your email address"
 msgstr "Deng Email Adress"
 
-#: templates/personal.php:77
+#: templates/personal.php:78
 msgid "Fill in an email address to enable password recovery"
 msgstr "Gëff eng Email Adress an fir d'Passwuert recovery ze erlaben"
 
-#: templates/personal.php:86 templates/personal.php:87
+#: templates/personal.php:87 templates/personal.php:88
 msgid "Language"
 msgstr "Sprooch"
 
-#: templates/personal.php:99
+#: templates/personal.php:100
 msgid "Help translate"
 msgstr "Hëllef iwwersetzen"
 
-#: templates/personal.php:105
+#: templates/personal.php:106
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:107
-msgid "Use this address to connect to your ownCloud in your file manager"
+#: templates/personal.php:108
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
+"target=\"_blank\">access your Files via WebDAV</a>"
 msgstr ""
 
-#: templates/users.php:21 templates/users.php:84
+#: templates/users.php:21
 msgid "Login Name"
 msgstr ""
 
@@ -485,6 +488,10 @@ msgstr ""
 msgid "Other"
 msgstr "Aner"
 
+#: templates/users.php:84
+msgid "Username"
+msgstr "Benotzernumm"
+
 #: templates/users.php:91
 msgid "Storage"
 msgstr ""
diff --git a/l10n/lb/user_ldap.po b/l10n/lb/user_ldap.po
index 1cf5b951b041cb13a4a0a3c46f901f99bdd8da18..996401cf68049b1cc4b4eeae8550690676174dc1 100644
--- a/l10n/lb/user_ldap.po
+++ b/l10n/lb/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:25+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:16+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/lt_LT/core.po b/l10n/lt_LT/core.po
index f2ee33bb5ae312225f531bc165a4b34d74252fea..3860d53a25ed5a65ff045ec42ff8b0cc17b0ce09 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-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:22+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
 "MIME-Version: 1.0\n"
@@ -63,135 +63,135 @@ msgstr "Trynimui nepasirinkta jokia kategorija."
 msgid "Error removing %s from favorites."
 msgstr "Klaida ištrinant %s iš jūsų mėgstamiausius."
 
-#: js/config.php:34
+#: js/config.php:32
 msgid "Sunday"
 msgstr "Sekmadienis"
 
-#: js/config.php:35
+#: js/config.php:33
 msgid "Monday"
 msgstr "Pirmadienis"
 
-#: js/config.php:36
+#: js/config.php:34
 msgid "Tuesday"
 msgstr "Antradienis"
 
-#: js/config.php:37
+#: js/config.php:35
 msgid "Wednesday"
 msgstr "Trečiadienis"
 
-#: js/config.php:38
+#: js/config.php:36
 msgid "Thursday"
 msgstr "Ketvirtadienis"
 
-#: js/config.php:39
+#: js/config.php:37
 msgid "Friday"
 msgstr "Penktadienis"
 
-#: js/config.php:40
+#: js/config.php:38
 msgid "Saturday"
 msgstr "Šeštadienis"
 
-#: js/config.php:45
+#: js/config.php:43
 msgid "January"
 msgstr "Sausis"
 
-#: js/config.php:46
+#: js/config.php:44
 msgid "February"
 msgstr "Vasaris"
 
-#: js/config.php:47
+#: js/config.php:45
 msgid "March"
 msgstr "Kovas"
 
-#: js/config.php:48
+#: js/config.php:46
 msgid "April"
 msgstr "Balandis"
 
-#: js/config.php:49
+#: js/config.php:47
 msgid "May"
 msgstr "Gegužė"
 
-#: js/config.php:50
+#: js/config.php:48
 msgid "June"
 msgstr "Birželis"
 
-#: js/config.php:51
+#: js/config.php:49
 msgid "July"
 msgstr "Liepa"
 
-#: js/config.php:52
+#: js/config.php:50
 msgid "August"
 msgstr "Rugpjūtis"
 
-#: js/config.php:53
+#: js/config.php:51
 msgid "September"
 msgstr "RugsÄ—jis"
 
-#: js/config.php:54
+#: js/config.php:52
 msgid "October"
 msgstr "Spalis"
 
-#: js/config.php:55
+#: js/config.php:53
 msgid "November"
 msgstr "Lapkritis"
 
-#: js/config.php:56
+#: js/config.php:54
 msgid "December"
 msgstr "Gruodis"
 
-#: js/js.js:286
+#: js/js.js:293
 msgid "Settings"
 msgstr "Nustatymai"
 
-#: js/js.js:718
+#: js/js.js:725
 msgid "seconds ago"
 msgstr "prieš sekundę"
 
-#: js/js.js:719
+#: js/js.js:726
 msgid "1 minute ago"
 msgstr "Prieš 1 minutę"
 
-#: js/js.js:720
+#: js/js.js:727
 msgid "{minutes} minutes ago"
 msgstr "Prieš {count} minutes"
 
-#: js/js.js:721
+#: js/js.js:728
 msgid "1 hour ago"
 msgstr "prieš 1 valandą"
 
-#: js/js.js:722
+#: js/js.js:729
 msgid "{hours} hours ago"
 msgstr "prieš {hours} valandas"
 
-#: js/js.js:723
+#: js/js.js:730
 msgid "today"
 msgstr "Å¡iandien"
 
-#: js/js.js:724
+#: js/js.js:731
 msgid "yesterday"
 msgstr "vakar"
 
-#: js/js.js:725
+#: js/js.js:732
 msgid "{days} days ago"
 msgstr "Prieš {days}  dienas"
 
-#: js/js.js:726
+#: js/js.js:733
 msgid "last month"
 msgstr "praeitą mėnesį"
 
-#: js/js.js:727
+#: js/js.js:734
 msgid "{months} months ago"
 msgstr "prieš {months} mėnesių"
 
-#: js/js.js:728
+#: js/js.js:735
 msgid "months ago"
 msgstr "prieš mėnesį"
 
-#: js/js.js:729
+#: js/js.js:736
 msgid "last year"
 msgstr "praeitais metais"
 
-#: js/js.js:730
+#: js/js.js:737
 msgid "years ago"
 msgstr "prieš metus"
 
@@ -227,8 +227,8 @@ msgstr "Objekto tipas nenurodytas."
 #: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
 #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:577
-#: js/share.js:589
+#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:620
+#: js/share.js:632
 msgid "Error"
 msgstr "Klaida"
 
@@ -248,7 +248,7 @@ msgstr "Dalinamasi"
 msgid "Share"
 msgstr "Dalintis"
 
-#: js/share.js:125 js/share.js:617
+#: js/share.js:125 js/share.js:660
 msgid "Error while sharing"
 msgstr "Klaida, dalijimosi metu"
 
@@ -268,99 +268,103 @@ msgstr "Pasidalino su Jumis ir {group} grupe {owner}"
 msgid "Shared with you by {owner}"
 msgstr "Pasidalino su Jumis {owner}"
 
-#: js/share.js:159
+#: js/share.js:172
 msgid "Share with"
 msgstr "Dalintis su"
 
-#: js/share.js:164
+#: js/share.js:177
 msgid "Share with link"
 msgstr "Dalintis nuoroda"
 
-#: js/share.js:167
+#: js/share.js:180
 msgid "Password protect"
 msgstr "Apsaugotas slaptažodžiu"
 
-#: js/share.js:169 templates/installation.php:54 templates/login.php:26
+#: js/share.js:182 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "Slaptažodis"
 
-#: js/share.js:173
+#: js/share.js:187
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:191
 msgid "Email link to person"
 msgstr "Nusiųsti nuorodą paštu"
 
-#: js/share.js:174
+#: js/share.js:192
 msgid "Send"
 msgstr "Siųsti"
 
-#: js/share.js:178
+#: js/share.js:197
 msgid "Set expiration date"
 msgstr "Nustatykite galiojimo laikÄ…"
 
-#: js/share.js:179
+#: js/share.js:198
 msgid "Expiration date"
 msgstr "Galiojimo laikas"
 
-#: js/share.js:211
+#: js/share.js:230
 msgid "Share via email:"
 msgstr "Dalintis per el. paštą:"
 
-#: js/share.js:213
+#: js/share.js:232
 msgid "No people found"
 msgstr "Žmonių nerasta"
 
-#: js/share.js:251
+#: js/share.js:270
 msgid "Resharing is not allowed"
 msgstr "Dalijinasis išnaujo negalimas"
 
-#: js/share.js:287
+#: js/share.js:306
 msgid "Shared in {item} with {user}"
 msgstr "Pasidalino {item} su {user}"
 
-#: js/share.js:308
+#: js/share.js:327
 msgid "Unshare"
 msgstr "Nebesidalinti"
 
-#: js/share.js:320
+#: js/share.js:339
 msgid "can edit"
 msgstr "gali redaguoti"
 
-#: js/share.js:322
+#: js/share.js:341
 msgid "access control"
 msgstr "priÄ—jimo kontrolÄ—"
 
-#: js/share.js:325
+#: js/share.js:344
 msgid "create"
 msgstr "sukurti"
 
-#: js/share.js:328
+#: js/share.js:347
 msgid "update"
 msgstr "atnaujinti"
 
-#: js/share.js:331
+#: js/share.js:350
 msgid "delete"
 msgstr "ištrinti"
 
-#: js/share.js:334
+#: js/share.js:353
 msgid "share"
 msgstr "dalintis"
 
-#: js/share.js:368 js/share.js:564
+#: js/share.js:387 js/share.js:607
 msgid "Password protected"
 msgstr "Apsaugota slaptažodžiu"
 
-#: js/share.js:577
+#: js/share.js:620
 msgid "Error unsetting expiration date"
 msgstr "Klaida nuimant galiojimo laikÄ…"
 
-#: js/share.js:589
+#: js/share.js:632
 msgid "Error setting expiration date"
 msgstr "Klaida nustatant galiojimo laikÄ…"
 
-#: js/share.js:604
+#: js/share.js:647
 msgid "Sending ..."
 msgstr "Siunčiama..."
 
-#: js/share.js:615
+#: js/share.js:658
 msgid "Email sent"
 msgstr "Laiškas išsiųstas"
 
@@ -375,7 +379,7 @@ msgstr "Atnaujinimas buvo nesėkmingas. PApie tai prašome pranešti the <a href
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "Atnaujinimas buvo sėkmingas. Nukreipiame į jūsų ownCloud."
 
-#: lostpassword/controller.php:58
+#: lostpassword/controller.php:60
 msgid "ownCloud password reset"
 msgstr "ownCloud slaptažodžio atkūrimas"
 
@@ -405,17 +409,17 @@ msgstr "Prisijungimo vardas"
 
 #: lostpassword/templates/lostpassword.php:22
 msgid ""
-"Your files seems to be encrypted. If you didn't have enabled the recovery "
-"key there will be no way to get your data back once the password was "
-"resetted. If you are not sure what to do, please contact your administrator "
-"first before continue. Do you really want to continue?"
+"Your files are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
 msgstr ""
 
 #: lostpassword/templates/lostpassword.php:24
 msgid "Yes, I really want to reset my password now"
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:29
+#: lostpassword/templates/lostpassword.php:27
 msgid "Request reset"
 msgstr "Prašyti nustatymo iš najo"
 
@@ -463,7 +467,7 @@ msgstr "Priėjimas draudžiamas"
 msgid "Cloud not found"
 msgstr "Negalima rasti"
 
-#: templates/altmail.php:2
+#: templates/altmail.php:4
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -474,10 +478,6 @@ msgid ""
 "Cheers!"
 msgstr ""
 
-#: templates/altmail.php:7 templates/mail.php:24
-msgid "web services under your control"
-msgstr "jūsų valdomos web paslaugos"
-
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
 msgstr "Redaguoti kategorijas"
@@ -570,12 +570,12 @@ msgstr "Duomenų bazės serveris"
 msgid "Finish setup"
 msgstr "Baigti diegimÄ…"
 
-#: templates/layout.user.php:40
+#: templates/layout.user.php:43
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr "%s yra prieinama. Gaukite daugiau informacijos apie atnaujinimÄ…."
 
-#: templates/layout.user.php:67
+#: templates/layout.user.php:68
 msgid "Log out"
 msgstr "Atsijungti"
 
@@ -609,7 +609,7 @@ msgstr "Prisijungti"
 msgid "Alternative Logins"
 msgstr "Alternatyvūs prisijungimai"
 
-#: templates/mail.php:15
+#: templates/mail.php:16
 #, php-format
 msgid ""
 "Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
diff --git a/l10n/lt_LT/files.po b/l10n/lt_LT/files.po
index b9e6931e89b552e0907131758eb6f0d4351fd329..82f50e27b7617f3de944f7ba7092c341a0cd970e 100644
--- a/l10n/lt_LT/files.po
+++ b/l10n/lt_LT/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-06-17 02:01+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
-"Last-Translator: fizikiukas <fizikiukas@gmail.com>\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -28,46 +28,54 @@ msgstr "Nepavyko perkelti %s - failas su tokiu pavadinimu jau egzistuoja"
 msgid "Could not move %s"
 msgstr "Nepavyko perkelti %s"
 
-#: ajax/upload.php:19
+#: ajax/upload.php:16 ajax/upload.php:45
+msgid "Unable to set upload directory."
+msgstr ""
+
+#: ajax/upload.php:22
+msgid "Invalid Token"
+msgstr ""
+
+#: ajax/upload.php:59
 msgid "No file was uploaded. Unknown error"
 msgstr "Failai nebuvo įkelti dėl nežinomos priežasties"
 
-#: ajax/upload.php:26
+#: ajax/upload.php:66
 msgid "There is no error, the file uploaded with success"
 msgstr "Failas įkeltas sėkmingai, be klaidų"
 
-#: ajax/upload.php:27
+#: ajax/upload.php:67
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr "Įkeliamas failas yra didesnis nei leidžia upload_max_filesize php.ini faile:"
 
-#: ajax/upload.php:29
+#: ajax/upload.php:69
 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 nustatymą, kuris naudojamas HTML formoje."
 
-#: ajax/upload.php:30
+#: ajax/upload.php:70
 msgid "The uploaded file was only partially uploaded"
 msgstr "Failas buvo įkeltas tik dalinai"
 
-#: ajax/upload.php:31
+#: ajax/upload.php:71
 msgid "No file was uploaded"
 msgstr "Nebuvo įkeltas joks failas"
 
-#: ajax/upload.php:32
+#: ajax/upload.php:72
 msgid "Missing a temporary folder"
 msgstr "NÄ—ra laikinojo katalogo"
 
-#: ajax/upload.php:33
+#: ajax/upload.php:73
 msgid "Failed to write to disk"
 msgstr "Nepavyko įrašyti į diską"
 
-#: ajax/upload.php:51
+#: ajax/upload.php:91
 msgid "Not enough storage available"
 msgstr "Nepakanka vietos serveryje"
 
-#: ajax/upload.php:83
+#: ajax/upload.php:123
 msgid "Invalid directory."
 msgstr "Neteisingas aplankas"
 
@@ -75,6 +83,36 @@ msgstr "Neteisingas aplankas"
 msgid "Files"
 msgstr "Failai"
 
+#: js/file-upload.js:11
+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/file-upload.js:24
+msgid "Not enough space available"
+msgstr "Nepakanka vietos"
+
+#: js/file-upload.js:64
+msgid "Upload cancelled."
+msgstr "Įkėlimas atšauktas."
+
+#: js/file-upload.js:167 js/files.js:266
+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/file-upload.js:233 js/files.js:339
+msgid "URL cannot be empty."
+msgstr "URL negali būti tuščias."
+
+#: js/file-upload.js:238 lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr "Negalimas aplanko pavadinimas. 'Shared' pavadinimas yra rezervuotas ownCloud"
+
+#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
+#: js/files.js:693 js/files.js:731
+msgid "Error"
+msgstr "Klaida"
+
 #: js/fileactions.js:116
 msgid "Share"
 msgstr "Dalintis"
@@ -91,43 +129,43 @@ msgstr "IÅ¡trinti"
 msgid "Rename"
 msgstr "Pervadinti"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:464
 msgid "Pending"
 msgstr "Laukiantis"
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "{new_name} already exists"
 msgstr "{new_name} jau egzistuoja"
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "replace"
 msgstr "pakeisti"
 
-#: js/filelist.js:259
+#: js/filelist.js:302
 msgid "suggest name"
 msgstr "pasiūlyti pavadinimą"
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "cancel"
 msgstr "atšaukti"
 
-#: js/filelist.js:306
+#: js/filelist.js:349
 msgid "replaced {new_name} with {old_name}"
 msgstr "pakeiskite {new_name} į {old_name}"
 
-#: js/filelist.js:306
+#: js/filelist.js:349
 msgid "undo"
 msgstr "anuliuoti"
 
-#: js/filelist.js:331
+#: js/filelist.js:374
 msgid "perform delete operation"
 msgstr "ištrinti"
 
-#: js/filelist.js:413
+#: js/filelist.js:456
 msgid "1 file uploading"
 msgstr "įkeliamas 1 failas"
 
-#: js/filelist.js:416 js/filelist.js:470
+#: js/filelist.js:459 js/filelist.js:517
 msgid "files uploading"
 msgstr "įkeliami failai"
 
@@ -159,70 +197,42 @@ msgid ""
 "big."
 msgstr "Jūsų atsisiuntimas yra paruošiamas. tai gali užtrukti jei atsisiunčiamas didelis failas."
 
-#: js/files.js:264
-msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "Neįmanoma įkelti failo - jo dydis gali būti 0 bitų arba tai katalogas"
-
-#: js/files.js:277
-msgid "Not enough space available"
-msgstr "Nepakanka vietos"
-
-#: js/files.js:317
-msgid "Upload cancelled."
-msgstr "Įkėlimas atšauktas."
-
-#: js/files.js:413
-msgid ""
-"File upload is in progress. Leaving the page now will cancel the upload."
-msgstr "Failo įkėlimas pradėtas. Jei paliksite šį puslapį, įkėlimas nutrūks."
-
-#: js/files.js:486
-msgid "URL cannot be empty."
-msgstr "URL negali būti tuščias."
-
-#: js/files.js:491
+#: js/files.js:344
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Negalimas aplanko pavadinimas. 'Shared' pavadinimas yra rezervuotas ownCloud"
 
-#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
-msgid "Error"
-msgstr "Klaida"
-
-#: js/files.js:877 templates/index.php:69
+#: js/files.js:744 templates/index.php:69
 msgid "Name"
 msgstr "Pavadinimas"
 
-#: js/files.js:878 templates/index.php:80
+#: js/files.js:745 templates/index.php:80
 msgid "Size"
 msgstr "Dydis"
 
-#: js/files.js:879 templates/index.php:82
+#: js/files.js:746 templates/index.php:82
 msgid "Modified"
 msgstr "Pakeista"
 
-#: js/files.js:898
+#: js/files.js:765
 msgid "1 folder"
 msgstr "1 aplankalas"
 
-#: js/files.js:900
+#: js/files.js:767
 msgid "{count} folders"
 msgstr "{count} aplankalai"
 
-#: js/files.js:908
+#: js/files.js:775
 msgid "1 file"
 msgstr "1 failas"
 
-#: js/files.js:910
+#: js/files.js:777
 msgid "{count} files"
 msgstr "{count} failai"
 
-#: lib/app.php:53
-msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
-msgstr "Negalimas aplanko pavadinimas. 'Shared' pavadinimas yra rezervuotas ownCloud"
-
 #: lib/app.php:73
-msgid "Unable to rename file"
-msgstr "Nepavyko pervadinti failo"
+#, php-format
+msgid "%s could not be renamed"
+msgstr ""
 
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
@@ -318,6 +328,22 @@ msgstr "Skenuojami failai, prašome palaukti."
 msgid "Current scanning"
 msgstr "Å iuo metu skenuojama"
 
+#: templates/part.list.php:76
+msgid "directory"
+msgstr ""
+
+#: templates/part.list.php:78
+msgid "directories"
+msgstr ""
+
+#: templates/part.list.php:87
+msgid "file"
+msgstr "failas"
+
+#: templates/part.list.php:89
+msgid "files"
+msgstr "failai"
+
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
 msgstr "Atnaujinamas sistemos kešavimas..."
diff --git a/l10n/lt_LT/files_encryption.po b/l10n/lt_LT/files_encryption.po
index fa7a51d932638222b74b48cc8382730b3d404f62..a17364ca8ecb81a0c52cebebd5d65a187518a2ce 100644
--- a/l10n/lt_LT/files_encryption.po
+++ b/l10n/lt_LT/files_encryption.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-14 02:46+0200\n"
-"PO-Revision-Date: 2013-06-14 00:47+0000\n"
+"POT-Creation-Date: 2013-07-05 02:12+0200\n"
+"PO-Revision-Date: 2013-07-05 00:13+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"
@@ -56,9 +56,21 @@ msgstr ""
 
 #: files/error.php:7
 msgid ""
-"Your private key is not valid! Maybe your password was changed from outside."
-" You can update your private key password in your personal settings to "
-"regain access to your files"
+"Your private key is not valid! Likely your password was changed outside the "
+"ownCloud system (e.g. your corporate directory). You can update your private"
+" key password in your personal settings to recover access to your encrypted "
+"files."
+msgstr ""
+
+#: hooks/hooks.php:44
+msgid "Missing requirements."
+msgstr ""
+
+#: hooks/hooks.php:45
+msgid ""
+"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL "
+"PHP extension is enabled and configured properly. For now, the encryption "
+"app has been disabled."
 msgstr ""
 
 #: js/settings-admin.js:11
@@ -85,12 +97,12 @@ msgstr "Å ifravimas"
 
 #: templates/settings-admin.php:10
 msgid ""
-"Enable encryption passwords recovery key (allow sharing to recovery key):"
-msgstr "Įjungti šifravimo slaptažodžio atstatymo raktą (leidžia dalintis su atstatymo raktu):"
+"Enable recovery key (allow to recover users files in case of password loss):"
+msgstr ""
 
 #: templates/settings-admin.php:14
-msgid "Recovery account password"
-msgstr "Atstatymo vartotojo slaptažodis"
+msgid "Recovery key password"
+msgstr ""
 
 #: templates/settings-admin.php:21 templates/settings-personal.php:54
 msgid "Enabled"
@@ -101,16 +113,16 @@ msgid "Disabled"
 msgstr "IÅ¡jungta"
 
 #: templates/settings-admin.php:34
-msgid "Change encryption passwords recovery key:"
-msgstr "Pakeisti šifravimo slaptažodžio atstatymo raktą:"
+msgid "Change recovery key password:"
+msgstr ""
 
 #: templates/settings-admin.php:41
-msgid "Old Recovery account password"
-msgstr "Seno atstatymo vartotojo slaptažodis"
+msgid "Old Recovery key password"
+msgstr ""
 
 #: templates/settings-admin.php:48
-msgid "New Recovery account password"
-msgstr "naujo atstatymo vartotojo slaptažodis"
+msgid "New Recovery key password"
+msgstr ""
 
 #: templates/settings-admin.php:53
 msgid "Change Password"
diff --git a/l10n/lt_LT/files_external.po b/l10n/lt_LT/files_external.po
index 7ba9d3aa5eee6dcc4b142f2d86d5c97bb397a7b7..2688c7e6d01f0618c55933575067bcfeee70458f 100644
--- a/l10n/lt_LT/files_external.po
+++ b/l10n/lt_LT/files_external.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: Min2liz <min2lizz@gmail.com>\n"
 "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/lt_LT/files_sharing.po b/l10n/lt_LT/files_sharing.po
index 750e1c3a202c304e9ddfc49a9c988bb2e04b0ebc..8a19ec83d7d8d88aa900b247a00e3eeb53459c9a 100644
--- a/l10n/lt_LT/files_sharing.po
+++ b/l10n/lt_LT/files_sharing.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
 "MIME-Version: 1.0\n"
@@ -19,27 +19,39 @@ msgstr ""
 "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/authenticate.php:4
+msgid "The password is wrong. Try again."
+msgstr ""
+
+#: templates/authenticate.php:7
 msgid "Password"
 msgstr "Slaptažodis"
 
-#: templates/authenticate.php:6
+#: templates/authenticate.php:9
 msgid "Submit"
 msgstr "IÅ¡saugoti"
 
-#: templates/public.php:10
+#: templates/public.php:17
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s pasidalino su jumis %s aplanku"
 
-#: templates/public.php:13
+#: templates/public.php:20
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s pasidalino su jumis %s failu"
 
-#: templates/public.php:19 templates/public.php:43
+#: templates/public.php:28 templates/public.php:90
 msgid "Download"
 msgstr "Atsisiųsti"
 
-#: templates/public.php:40
+#: templates/public.php:45 templates/public.php:48
+msgid "Upload"
+msgstr "Įkelti"
+
+#: templates/public.php:58
+msgid "Cancel upload"
+msgstr "Atšaukti siuntimą"
+
+#: templates/public.php:87
 msgid "No preview available for"
 msgstr "Peržiūra nėra galima"
diff --git a/l10n/lt_LT/files_trashbin.po b/l10n/lt_LT/files_trashbin.po
index 3c889214ff0c0d0eae373d4c1fa7dda19f781381..22fc6d7b1668c569b45866dfea4a09c287c44bcc 100644
--- a/l10n/lt_LT/files_trashbin.po
+++ b/l10n/lt_LT/files_trashbin.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:16+0000\n"
 "Last-Translator: fizikiukas <fizikiukas@gmail.com>\n"
 "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/lt_LT/lib.po b/l10n/lt_LT/lib.po
index 09b052eaa5a76adf1223732b4ffc08149b20e0d6..9bd675a8d4192440a7665c2dab528cabf91722b1 100644
--- a/l10n/lt_LT/lib.po
+++ b/l10n/lt_LT/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-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
-"Last-Translator: fizikiukas <fizikiukas@gmail.com>\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,43 +18,47 @@ msgstr ""
 "Language: lt_LT\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: app.php:359
+#: app.php:360
 msgid "Help"
 msgstr "Pagalba"
 
-#: app.php:372
+#: app.php:373
 msgid "Personal"
 msgstr "Asmeniniai"
 
-#: app.php:383
+#: app.php:384
 msgid "Settings"
 msgstr "Nustatymai"
 
-#: app.php:395
+#: app.php:396
 msgid "Users"
 msgstr "Vartotojai"
 
-#: app.php:408
+#: app.php:409
 msgid "Apps"
 msgstr "Programos"
 
-#: app.php:416
+#: app.php:417
 msgid "Admin"
 msgstr "Administravimas"
 
-#: files.php:210
+#: defaults.php:33
+msgid "web services under your control"
+msgstr "jūsų valdomos web paslaugos"
+
+#: files.php:226
 msgid "ZIP download is turned off."
 msgstr "ZIP atsisiuntimo galimybė yra išjungta."
 
-#: files.php:211
+#: files.php:227
 msgid "Files need to be downloaded one by one."
 msgstr "Failai turi būti parsiunčiami vienas po kito."
 
-#: files.php:212 files.php:245
+#: files.php:228 files.php:261
 msgid "Back to Files"
 msgstr "Atgal į Failus"
 
-#: files.php:242
+#: files.php:258
 msgid "Selected files too large to generate zip file."
 msgstr "Pasirinkti failai per dideli archyvavimui į ZIP."
 
@@ -86,104 +90,102 @@ msgstr "Žinučių"
 msgid "Images"
 msgstr "PaveikslÄ—liai"
 
-#: setup.php:34
-msgid "Set an admin username."
-msgstr ""
-
-#: setup.php:37
-msgid "Set an admin password."
-msgstr ""
-
-#: setup.php:55
+#: setup/abstractdatabase.php:22
 #, php-format
 msgid "%s enter the database username."
 msgstr ""
 
-#: setup.php:58
+#: setup/abstractdatabase.php:25
 #, php-format
 msgid "%s enter the database name."
 msgstr ""
 
-#: setup.php:61
+#: setup/abstractdatabase.php:28
 #, php-format
 msgid "%s you may not use dots in the database name"
 msgstr ""
 
-#: setup.php:64
+#: setup/mssql.php:20
 #, php-format
-msgid "%s set the database host."
-msgstr ""
-
-#: setup.php:126 setup.php:332 setup.php:377
-msgid "PostgreSQL username and/or password not valid"
+msgid "MS SQL username and/or password not valid: %s"
 msgstr ""
 
-#: setup.php:127 setup.php:235
+#: setup/mssql.php:21 setup/mysql.php:13 setup/oci.php:114
+#: setup/postgresql.php:24 setup/postgresql.php:70
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:152
-msgid "Oracle connection could not be established"
-msgstr ""
-
-#: setup.php:234
+#: setup/mysql.php:12
 msgid "MySQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:288 setup.php:398 setup.php:407 setup.php:425 setup.php:435
-#: setup.php:444 setup.php:477 setup.php:543 setup.php:569 setup.php:576
-#: setup.php:587 setup.php:594 setup.php:603 setup.php:611 setup.php:620
-#: setup.php:626
+#: setup/mysql.php:67 setup/oci.php:54 setup/oci.php:121 setup/oci.php:147
+#: setup/oci.php:154 setup/oci.php:165 setup/oci.php:172 setup/oci.php:181
+#: setup/oci.php:189 setup/oci.php:198 setup/oci.php:204
+#: setup/postgresql.php:89 setup/postgresql.php:98 setup/postgresql.php:115
+#: setup/postgresql.php:125 setup/postgresql.php:134
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr ""
 
-#: setup.php:289 setup.php:399 setup.php:408 setup.php:426 setup.php:436
-#: setup.php:445 setup.php:478 setup.php:544 setup.php:570 setup.php:577
-#: setup.php:588 setup.php:604 setup.php:612 setup.php:621
+#: setup/mysql.php:68 setup/oci.php:55 setup/oci.php:122 setup/oci.php:148
+#: setup/oci.php:155 setup/oci.php:166 setup/oci.php:182 setup/oci.php:190
+#: setup/oci.php:199 setup/postgresql.php:90 setup/postgresql.php:99
+#: setup/postgresql.php:116 setup/postgresql.php:126 setup/postgresql.php:135
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:305
+#: setup/mysql.php:85
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:306
+#: setup/mysql.php:86
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:311
+#: setup/mysql.php:91
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:312
+#: setup/mysql.php:92
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:469 setup.php:536
+#: setup/oci.php:34
+msgid "Oracle connection could not be established"
+msgstr ""
+
+#: setup/oci.php:41 setup/oci.php:113
 msgid "Oracle username and/or password not valid"
 msgstr ""
 
-#: setup.php:595 setup.php:627
+#: setup/oci.php:173 setup/oci.php:205
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:647
-#, php-format
-msgid "MS SQL username and/or password not valid: %s"
+#: setup/postgresql.php:23 setup/postgresql.php:69
+msgid "PostgreSQL username and/or password not valid"
+msgstr ""
+
+#: setup.php:42
+msgid "Set an admin username."
+msgstr ""
+
+#: setup.php:45
+msgid "Set an admin password."
 msgstr ""
 
-#: setup.php:870
+#: setup.php:198
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:871
+#: setup.php:199
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
diff --git a/l10n/lt_LT/settings.po b/l10n/lt_LT/settings.po
index f1673c058b278bf1143bfcf48a2206def4285849..80b34f4df7ae1f8b8e18dceeb90a882f0194f56c 100644
--- a/l10n/lt_LT/settings.po
+++ b/l10n/lt_LT/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
 "MIME-Version: 1.0\n"
@@ -88,35 +88,35 @@ msgstr ""
 msgid "Couldn't update app."
 msgstr ""
 
-#: js/apps.js:30
+#: js/apps.js:35
 msgid "Update to {appversion}"
 msgstr ""
 
-#: js/apps.js:36 js/apps.js:76
+#: js/apps.js:41 js/apps.js:81
 msgid "Disable"
 msgstr "IÅ¡jungti"
 
-#: js/apps.js:36 js/apps.js:64 js/apps.js:83
+#: js/apps.js:41 js/apps.js:69 js/apps.js:88
 msgid "Enable"
 msgstr "Įjungti"
 
-#: js/apps.js:55
+#: js/apps.js:60
 msgid "Please wait...."
 msgstr ""
 
-#: js/apps.js:59 js/apps.js:71 js/apps.js:80 js/apps.js:93
+#: js/apps.js:64 js/apps.js:76 js/apps.js:85 js/apps.js:98
 msgid "Error"
 msgstr "Klaida"
 
-#: js/apps.js:90
+#: js/apps.js:95
 msgid "Updating...."
 msgstr ""
 
-#: js/apps.js:93
+#: js/apps.js:98
 msgid "Error while updating app"
 msgstr ""
 
-#: js/apps.js:96
+#: js/apps.js:101
 msgid "Updated"
 msgstr ""
 
@@ -165,15 +165,15 @@ msgstr ""
 msgid "A valid password must be provided"
 msgstr ""
 
-#: personal.php:35 personal.php:36
+#: personal.php:37 personal.php:38
 msgid "__language_name__"
 msgstr "Kalba"
 
-#: templates/admin.php:15
+#: templates/admin.php:17
 msgid "Security Warning"
 msgstr "Saugumo pranešimas"
 
-#: templates/admin.php:18
+#: templates/admin.php:20
 msgid ""
 "Your data directory and your files are probably accessible from the "
 "internet. The .htaccess file that ownCloud provides is not working. We "
@@ -182,36 +182,36 @@ msgid ""
 " webserver document root."
 msgstr "Jūsų duomenų aplankalas ir Jūsų failai turbūt yra pasiekiami per internetą. Failas .htaccess, kuris duodamas, neveikia. Mes rekomenduojame susitvarkyti savo nustatymsu taip, kad failai nebūtų pasiekiami per internetą, arba persikelti juos kitur."
 
-#: templates/admin.php:29
+#: templates/admin.php:31
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:32
+#: templates/admin.php:34
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: templates/admin.php:33
+#: templates/admin.php:35
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:44
+#: templates/admin.php:46
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:47
+#: templates/admin.php:49
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr ""
 
-#: templates/admin.php:58
+#: templates/admin.php:60
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:63
+#: templates/admin.php:65
 #, php-format
 msgid ""
 "This ownCloud server can't set system locale to %s. This means that there "
@@ -219,11 +219,11 @@ msgid ""
 " to install the required packages on your system to support %s."
 msgstr ""
 
-#: templates/admin.php:75
+#: templates/admin.php:77
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:78
+#: templates/admin.php:80
 msgid ""
 "This ownCloud server has no working internet connection. This means that "
 "some of the features like mounting of external storage, notifications about "
@@ -233,102 +233,102 @@ msgid ""
 " of ownCloud."
 msgstr ""
 
-#: templates/admin.php:92
+#: templates/admin.php:94
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:101
+#: templates/admin.php:103
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:111
+#: templates/admin.php:113
 msgid ""
 "cron.php is registered at a webcron service. Call the cron.php page in the "
 "owncloud root once a minute over http."
 msgstr ""
 
-#: templates/admin.php:121
+#: templates/admin.php:123
 msgid ""
 "Use systems cron service. Call the cron.php file in the owncloud folder via "
 "a system cronjob once a minute."
 msgstr ""
 
-#: templates/admin.php:128
+#: templates/admin.php:130
 msgid "Sharing"
 msgstr "Dalijimasis"
 
-#: templates/admin.php:134
+#: templates/admin.php:136
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:135
+#: templates/admin.php:137
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:142
+#: templates/admin.php:144
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:143
+#: templates/admin.php:145
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:150
+#: templates/admin.php:152
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:151
+#: templates/admin.php:153
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:158
+#: templates/admin.php:160
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:161
+#: templates/admin.php:163
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:168
+#: templates/admin.php:170
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:181
+#: templates/admin.php:183
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:182
+#: templates/admin.php:184
 msgid ""
 "Enforces the clients to connect to ownCloud via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:185
+#: templates/admin.php:187
 msgid ""
 "Please connect to this ownCloud instance via HTTPS to enable or disable the "
 "SSL enforcement."
 msgstr ""
 
-#: templates/admin.php:195
+#: templates/admin.php:197
 msgid "Log"
 msgstr "Žurnalas"
 
-#: templates/admin.php:196
+#: templates/admin.php:198
 msgid "Log level"
 msgstr "Žurnalo išsamumas"
 
-#: templates/admin.php:227
+#: templates/admin.php:229
 msgid "More"
 msgstr "Daugiau"
 
-#: templates/admin.php:228
+#: templates/admin.php:230
 msgid "Less"
 msgstr "Mažiau"
 
-#: templates/admin.php:235 templates/personal.php:116
+#: templates/admin.php:236 templates/personal.php:116
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:237 templates/personal.php:119
+#: templates/admin.php:240 templates/personal.php:119
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -386,76 +386,79 @@ msgstr ""
 msgid "Commercial Support"
 msgstr ""
 
-#: templates/personal.php:9
+#: templates/personal.php:10
 msgid "Get the apps to sync your files"
 msgstr "Atsisiųskite programėlių, kad sinchronizuotumėte savo failus"
 
-#: templates/personal.php:20
+#: templates/personal.php:21
 msgid "Show First Run Wizard again"
 msgstr ""
 
-#: templates/personal.php:28
+#: templates/personal.php:29
 #, php-format
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr ""
 
-#: templates/personal.php:40 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:41 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "Slaptažodis"
 
-#: templates/personal.php:41
+#: templates/personal.php:42
 msgid "Your password was changed"
 msgstr "Jūsų slaptažodis buvo pakeistas"
 
-#: templates/personal.php:42
+#: templates/personal.php:43
 msgid "Unable to change your password"
 msgstr "Neįmanoma pakeisti slaptažodžio"
 
-#: templates/personal.php:43
+#: templates/personal.php:44
 msgid "Current password"
 msgstr "Dabartinis slaptažodis"
 
-#: templates/personal.php:45
+#: templates/personal.php:46
 msgid "New password"
 msgstr "Naujas slaptažodis"
 
-#: templates/personal.php:47
+#: templates/personal.php:48
 msgid "Change password"
 msgstr "Pakeisti slaptažodį"
 
-#: templates/personal.php:59 templates/users.php:85
+#: templates/personal.php:60 templates/users.php:85
 msgid "Display Name"
 msgstr ""
 
-#: templates/personal.php:74
+#: templates/personal.php:75
 msgid "Email"
 msgstr "El. Paštas"
 
-#: templates/personal.php:76
+#: templates/personal.php:77
 msgid "Your email address"
 msgstr "Jūsų el. pašto adresas"
 
-#: templates/personal.php:77
+#: templates/personal.php:78
 msgid "Fill in an email address to enable password recovery"
 msgstr "Pamiršto slaptažodžio atkūrimui įveskite savo el. pašto adresą"
 
-#: templates/personal.php:86 templates/personal.php:87
+#: templates/personal.php:87 templates/personal.php:88
 msgid "Language"
 msgstr "Kalba"
 
-#: templates/personal.php:99
+#: templates/personal.php:100
 msgid "Help translate"
 msgstr "Padėkite išversti"
 
-#: templates/personal.php:105
+#: templates/personal.php:106
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:107
-msgid "Use this address to connect to your ownCloud in your file manager"
+#: templates/personal.php:108
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
+"target=\"_blank\">access your Files via WebDAV</a>"
 msgstr ""
 
-#: templates/users.php:21 templates/users.php:84
+#: templates/users.php:21
 msgid "Login Name"
 msgstr ""
 
@@ -485,6 +488,10 @@ msgstr ""
 msgid "Other"
 msgstr "Kita"
 
+#: templates/users.php:84
+msgid "Username"
+msgstr "Prisijungimo vardas"
+
 #: templates/users.php:91
 msgid "Storage"
 msgstr ""
diff --git a/l10n/lt_LT/user_ldap.po b/l10n/lt_LT/user_ldap.po
index 3378a86e425a0134b2813392dd2ae9636b304e7a..ae3c70dca594ab822daf35b1368eebcba8735b99 100644
--- a/l10n/lt_LT/user_ldap.po
+++ b/l10n/lt_LT/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:25+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:16+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/lv/core.po b/l10n/lv/core.po
index c183386292740efe84eb4a0485589c3b233bbac1..c915d3d88b4769239493f05806c3100eb74b0969 100644
--- a/l10n/lv/core.po
+++ b/l10n/lv/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
 "MIME-Version: 1.0\n"
@@ -61,135 +61,135 @@ msgstr "Neviena kategorija nav izvēlēta dzēšanai."
 msgid "Error removing %s from favorites."
 msgstr "Kļūda, izņemot %s no izlases."
 
-#: js/config.php:34
+#: js/config.php:32
 msgid "Sunday"
 msgstr "Svētdiena"
 
-#: js/config.php:35
+#: js/config.php:33
 msgid "Monday"
 msgstr "Pirmdiena"
 
-#: js/config.php:36
+#: js/config.php:34
 msgid "Tuesday"
 msgstr "Otrdiena"
 
-#: js/config.php:37
+#: js/config.php:35
 msgid "Wednesday"
 msgstr "Trešdiena"
 
-#: js/config.php:38
+#: js/config.php:36
 msgid "Thursday"
 msgstr "Ceturtdiena"
 
-#: js/config.php:39
+#: js/config.php:37
 msgid "Friday"
 msgstr "Piektdiena"
 
-#: js/config.php:40
+#: js/config.php:38
 msgid "Saturday"
 msgstr "Sestdiena"
 
-#: js/config.php:45
+#: js/config.php:43
 msgid "January"
 msgstr "Janvāris"
 
-#: js/config.php:46
+#: js/config.php:44
 msgid "February"
 msgstr "Februāris"
 
-#: js/config.php:47
+#: js/config.php:45
 msgid "March"
 msgstr "Marts"
 
-#: js/config.php:48
+#: js/config.php:46
 msgid "April"
 msgstr "Aprīlis"
 
-#: js/config.php:49
+#: js/config.php:47
 msgid "May"
 msgstr "Maijs"
 
-#: js/config.php:50
+#: js/config.php:48
 msgid "June"
 msgstr "JÅ«nijs"
 
-#: js/config.php:51
+#: js/config.php:49
 msgid "July"
 msgstr "JÅ«lijs"
 
-#: js/config.php:52
+#: js/config.php:50
 msgid "August"
 msgstr "Augusts"
 
-#: js/config.php:53
+#: js/config.php:51
 msgid "September"
 msgstr "Septembris"
 
-#: js/config.php:54
+#: js/config.php:52
 msgid "October"
 msgstr "Oktobris"
 
-#: js/config.php:55
+#: js/config.php:53
 msgid "November"
 msgstr "Novembris"
 
-#: js/config.php:56
+#: js/config.php:54
 msgid "December"
 msgstr "Decembris"
 
-#: js/js.js:286
+#: js/js.js:293
 msgid "Settings"
 msgstr "Iestatījumi"
 
-#: js/js.js:718
+#: js/js.js:725
 msgid "seconds ago"
 msgstr "sekundes atpakaļ"
 
-#: js/js.js:719
+#: js/js.js:726
 msgid "1 minute ago"
 msgstr "pirms 1 minūtes"
 
-#: js/js.js:720
+#: js/js.js:727
 msgid "{minutes} minutes ago"
 msgstr "pirms {minutes} minūtēm"
 
-#: js/js.js:721
+#: js/js.js:728
 msgid "1 hour ago"
 msgstr "pirms 1 stundas"
 
-#: js/js.js:722
+#: js/js.js:729
 msgid "{hours} hours ago"
 msgstr "pirms {hours} stundām"
 
-#: js/js.js:723
+#: js/js.js:730
 msgid "today"
 msgstr "Å¡odien"
 
-#: js/js.js:724
+#: js/js.js:731
 msgid "yesterday"
 msgstr "vakar"
 
-#: js/js.js:725
+#: js/js.js:732
 msgid "{days} days ago"
 msgstr "pirms {days} dienām"
 
-#: js/js.js:726
+#: js/js.js:733
 msgid "last month"
 msgstr "pagājušajā mēnesī"
 
-#: js/js.js:727
+#: js/js.js:734
 msgid "{months} months ago"
 msgstr "pirms {months} mēnešiem"
 
-#: js/js.js:728
+#: js/js.js:735
 msgid "months ago"
 msgstr "mēnešus atpakaļ"
 
-#: js/js.js:729
+#: js/js.js:736
 msgid "last year"
 msgstr "gājušajā gadā"
 
-#: js/js.js:730
+#: js/js.js:737
 msgid "years ago"
 msgstr "gadus atpakaļ"
 
@@ -225,8 +225,8 @@ msgstr "Nav norādīts objekta tips."
 #: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
 #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:577
-#: js/share.js:589
+#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:620
+#: js/share.js:632
 msgid "Error"
 msgstr "Kļūda"
 
@@ -246,7 +246,7 @@ msgstr "Kopīgs"
 msgid "Share"
 msgstr "Dalīties"
 
-#: js/share.js:125 js/share.js:617
+#: js/share.js:125 js/share.js:660
 msgid "Error while sharing"
 msgstr "Kļūda, daloties"
 
@@ -266,99 +266,103 @@ msgstr "{owner} dalījās ar jums un grupu {group}"
 msgid "Shared with you by {owner}"
 msgstr "{owner} dalījās ar jums"
 
-#: js/share.js:159
+#: js/share.js:172
 msgid "Share with"
 msgstr "Dalīties ar"
 
-#: js/share.js:164
+#: js/share.js:177
 msgid "Share with link"
 msgstr "Dalīties ar saiti"
 
-#: js/share.js:167
+#: js/share.js:180
 msgid "Password protect"
 msgstr "Aizsargāt ar paroli"
 
-#: js/share.js:169 templates/installation.php:54 templates/login.php:26
+#: js/share.js:182 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "Parole"
 
-#: js/share.js:173
+#: js/share.js:187
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:191
 msgid "Email link to person"
 msgstr "Sūtīt saiti personai pa e-pastu"
 
-#: js/share.js:174
+#: js/share.js:192
 msgid "Send"
 msgstr "Sūtīt"
 
-#: js/share.js:178
+#: js/share.js:197
 msgid "Set expiration date"
 msgstr "Iestaties termiņa datumu"
 
-#: js/share.js:179
+#: js/share.js:198
 msgid "Expiration date"
 msgstr "Termiņa datums"
 
-#: js/share.js:211
+#: js/share.js:230
 msgid "Share via email:"
 msgstr "Dalīties, izmantojot e-pastu:"
 
-#: js/share.js:213
+#: js/share.js:232
 msgid "No people found"
 msgstr "Nav atrastu cilvēku"
 
-#: js/share.js:251
+#: js/share.js:270
 msgid "Resharing is not allowed"
 msgstr "Atkārtota dalīšanās nav atļauta"
 
-#: js/share.js:287
+#: js/share.js:306
 msgid "Shared in {item} with {user}"
 msgstr "Dalījās ar {item} ar {user}"
 
-#: js/share.js:308
+#: js/share.js:327
 msgid "Unshare"
 msgstr "Pārtraukt dalīšanos"
 
-#: js/share.js:320
+#: js/share.js:339
 msgid "can edit"
 msgstr "var rediģēt"
 
-#: js/share.js:322
+#: js/share.js:341
 msgid "access control"
 msgstr "piekļuves vadība"
 
-#: js/share.js:325
+#: js/share.js:344
 msgid "create"
 msgstr "izveidot"
 
-#: js/share.js:328
+#: js/share.js:347
 msgid "update"
 msgstr "atjaunināt"
 
-#: js/share.js:331
+#: js/share.js:350
 msgid "delete"
 msgstr "dzēst"
 
-#: js/share.js:334
+#: js/share.js:353
 msgid "share"
 msgstr "dalīties"
 
-#: js/share.js:368 js/share.js:564
+#: js/share.js:387 js/share.js:607
 msgid "Password protected"
 msgstr "Aizsargāts ar paroli"
 
-#: js/share.js:577
+#: js/share.js:620
 msgid "Error unsetting expiration date"
 msgstr "Kļūda, noņemot termiņa datumu"
 
-#: js/share.js:589
+#: js/share.js:632
 msgid "Error setting expiration date"
 msgstr "Kļūda, iestatot termiņa datumu"
 
-#: js/share.js:604
+#: js/share.js:647
 msgid "Sending ..."
 msgstr "SÅ«ta..."
 
-#: js/share.js:615
+#: js/share.js:658
 msgid "Email sent"
 msgstr "Vēstule nosūtīta"
 
@@ -373,7 +377,7 @@ msgstr "Atjaunināšana beidzās nesekmīgi. Lūdzu, ziņojiet par šo problēmu
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "Atjaunināšana beidzās sekmīgi. Tagad pārsūta jūs uz ownCloud."
 
-#: lostpassword/controller.php:58
+#: lostpassword/controller.php:60
 msgid "ownCloud password reset"
 msgstr "ownCloud paroles maiņa"
 
@@ -403,17 +407,17 @@ msgstr "Lietotājvārds"
 
 #: lostpassword/templates/lostpassword.php:22
 msgid ""
-"Your files seems to be encrypted. If you didn't have enabled the recovery "
-"key there will be no way to get your data back once the password was "
-"resetted. If you are not sure what to do, please contact your administrator "
-"first before continue. Do you really want to continue?"
+"Your files are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
 msgstr ""
 
 #: lostpassword/templates/lostpassword.php:24
 msgid "Yes, I really want to reset my password now"
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:29
+#: lostpassword/templates/lostpassword.php:27
 msgid "Request reset"
 msgstr "Pieprasīt paroles maiņu"
 
@@ -461,7 +465,7 @@ msgstr "Pieeja ir liegta"
 msgid "Cloud not found"
 msgstr "Mākonis netika atrasts"
 
-#: templates/altmail.php:2
+#: templates/altmail.php:4
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -472,10 +476,6 @@ msgid ""
 "Cheers!"
 msgstr ""
 
-#: templates/altmail.php:7 templates/mail.php:24
-msgid "web services under your control"
-msgstr "tīmekļa servisi tavā varā"
-
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
 msgstr "Rediģēt kategoriju"
@@ -568,12 +568,12 @@ msgstr "Datubāzes serveris"
 msgid "Finish setup"
 msgstr "Pabeigt iestatīšanu"
 
-#: templates/layout.user.php:40
+#: templates/layout.user.php:43
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:67
+#: templates/layout.user.php:68
 msgid "Log out"
 msgstr "Izrakstīties"
 
@@ -607,7 +607,7 @@ msgstr "Ierakstīties"
 msgid "Alternative Logins"
 msgstr "Alternatīvās pieteikšanās"
 
-#: templates/mail.php:15
+#: templates/mail.php:16
 #, php-format
 msgid ""
 "Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
diff --git a/l10n/lv/files.po b/l10n/lv/files.po
index f825401fbf30f7672fe29493137f1b79a2a7362e..176cddd665fd3ab90e917cb6a06826cfe061b7fc 100644
--- a/l10n/lv/files.po
+++ b/l10n/lv/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:01+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
 "MIME-Version: 1.0\n"
@@ -27,46 +27,54 @@ msgstr "Nevarēja pārvietot %s — jau eksistē datne ar tādu nosaukumu"
 msgid "Could not move %s"
 msgstr "Nevarēja pārvietot %s"
 
-#: ajax/upload.php:19
+#: ajax/upload.php:16 ajax/upload.php:45
+msgid "Unable to set upload directory."
+msgstr ""
+
+#: ajax/upload.php:22
+msgid "Invalid Token"
+msgstr ""
+
+#: ajax/upload.php:59
 msgid "No file was uploaded. Unknown error"
 msgstr "Netika augšupielādēta neviena datne. Nezināma kļūda"
 
-#: ajax/upload.php:26
+#: ajax/upload.php:66
 msgid "There is no error, the file uploaded with success"
 msgstr "Viss kārtībā, datne augšupielādēta veiksmīga"
 
-#: ajax/upload.php:27
+#: ajax/upload.php:67
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr "Augšupielādētā datne pārsniedz upload_max_filesize norādījumu php.ini datnē:"
 
-#: ajax/upload.php:29
+#: ajax/upload.php:69
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Augšupielādētā datne pārsniedz MAX_FILE_SIZE norādi, kas ir norādīta HTML formā"
 
-#: ajax/upload.php:30
+#: ajax/upload.php:70
 msgid "The uploaded file was only partially uploaded"
 msgstr "Augšupielādētā datne ir tikai daļēji augšupielādēta"
 
-#: ajax/upload.php:31
+#: ajax/upload.php:71
 msgid "No file was uploaded"
 msgstr "Neviena datne netika augšupielādēta"
 
-#: ajax/upload.php:32
+#: ajax/upload.php:72
 msgid "Missing a temporary folder"
 msgstr "Trūkst pagaidu mapes"
 
-#: ajax/upload.php:33
+#: ajax/upload.php:73
 msgid "Failed to write to disk"
 msgstr "Neizdevās saglabāt diskā"
 
-#: ajax/upload.php:51
+#: ajax/upload.php:91
 msgid "Not enough storage available"
 msgstr "Nav pietiekami daudz vietas"
 
-#: ajax/upload.php:83
+#: ajax/upload.php:123
 msgid "Invalid directory."
 msgstr "Nederīga direktorija."
 
@@ -74,6 +82,36 @@ msgstr "Nederīga direktorija."
 msgid "Files"
 msgstr "Datnes"
 
+#: js/file-upload.js:11
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr "Nevar augšupielādēt jūsu datni, jo tā ir direktorija vai arī tā ir 0 baitu liela"
+
+#: js/file-upload.js:24
+msgid "Not enough space available"
+msgstr "Nepietiek brīvas vietas"
+
+#: js/file-upload.js:64
+msgid "Upload cancelled."
+msgstr "Augšupielāde ir atcelta."
+
+#: js/file-upload.js:167 js/files.js:266
+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/file-upload.js:233 js/files.js:339
+msgid "URL cannot be empty."
+msgstr "URL nevar būt tukšs."
+
+#: js/file-upload.js:238 lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr ""
+
+#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
+#: js/files.js:693 js/files.js:731
+msgid "Error"
+msgstr "Kļūda"
+
 #: js/fileactions.js:116
 msgid "Share"
 msgstr "Dalīties"
@@ -90,43 +128,43 @@ msgstr "Dzēst"
 msgid "Rename"
 msgstr "Pārsaukt"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:464
 msgid "Pending"
 msgstr "Gaida savu kārtu"
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "{new_name} already exists"
 msgstr "{new_name} jau eksistē"
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "replace"
 msgstr "aizvietot"
 
-#: js/filelist.js:259
+#: js/filelist.js:302
 msgid "suggest name"
 msgstr "ieteiktais nosaukums"
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "cancel"
 msgstr "atcelt"
 
-#: js/filelist.js:306
+#: js/filelist.js:349
 msgid "replaced {new_name} with {old_name}"
 msgstr "aizvietoja {new_name} ar {old_name}"
 
-#: js/filelist.js:306
+#: js/filelist.js:349
 msgid "undo"
 msgstr "atsaukt"
 
-#: js/filelist.js:331
+#: js/filelist.js:374
 msgid "perform delete operation"
 msgstr "veikt dzēšanas darbību"
 
-#: js/filelist.js:413
+#: js/filelist.js:456
 msgid "1 file uploading"
 msgstr "Augšupielādē 1 datni"
 
-#: js/filelist.js:416 js/filelist.js:470
+#: js/filelist.js:459 js/filelist.js:517
 msgid "files uploading"
 msgstr ""
 
@@ -158,70 +196,42 @@ msgid ""
 "big."
 msgstr "Tiek sagatavota lejupielāde. Tas var aizņemt kādu laiciņu, ja datnes ir lielas."
 
-#: js/files.js:264
-msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "Nevar augšupielādēt jūsu datni, jo tā ir direktorija vai arī tā ir 0 baitu liela"
-
-#: js/files.js:277
-msgid "Not enough space available"
-msgstr "Nepietiek brīvas vietas"
-
-#: js/files.js:317
-msgid "Upload cancelled."
-msgstr "Augšupielāde ir atcelta."
-
-#: js/files.js:413
-msgid ""
-"File upload is in progress. Leaving the page now will cancel the upload."
-msgstr "Notiek augšupielāde. Pametot lapu tagad, tiks atcelta augšupielāde."
-
-#: js/files.js:486
-msgid "URL cannot be empty."
-msgstr "URL nevar būt tukšs."
-
-#: js/files.js:491
+#: js/files.js:344
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Nederīgs mapes nosaukums. “Koplietots” izmantojums ir rezervēts ownCloud servisam."
 
-#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
-msgid "Error"
-msgstr "Kļūda"
-
-#: js/files.js:877 templates/index.php:69
+#: js/files.js:744 templates/index.php:69
 msgid "Name"
 msgstr "Nosaukums"
 
-#: js/files.js:878 templates/index.php:80
+#: js/files.js:745 templates/index.php:80
 msgid "Size"
 msgstr "Izmērs"
 
-#: js/files.js:879 templates/index.php:82
+#: js/files.js:746 templates/index.php:82
 msgid "Modified"
 msgstr "Mainīts"
 
-#: js/files.js:898
+#: js/files.js:765
 msgid "1 folder"
 msgstr "1 mape"
 
-#: js/files.js:900
+#: js/files.js:767
 msgid "{count} folders"
 msgstr "{count} mapes"
 
-#: js/files.js:908
+#: js/files.js:775
 msgid "1 file"
 msgstr "1 datne"
 
-#: js/files.js:910
+#: js/files.js:777
 msgid "{count} files"
 msgstr "{count} datnes"
 
-#: lib/app.php:53
-msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
-msgstr ""
-
 #: lib/app.php:73
-msgid "Unable to rename file"
-msgstr "Nevarēja pārsaukt datni"
+#, php-format
+msgid "%s could not be renamed"
+msgstr ""
 
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
@@ -317,6 +327,22 @@ msgstr "Datnes šobrīd tiek caurskatītas, lūdzu, uzgaidiet."
 msgid "Current scanning"
 msgstr "Šobrīd tiek caurskatīts"
 
+#: templates/part.list.php:76
+msgid "directory"
+msgstr ""
+
+#: templates/part.list.php:78
+msgid "directories"
+msgstr ""
+
+#: templates/part.list.php:87
+msgid "file"
+msgstr "fails"
+
+#: templates/part.list.php:89
+msgid "files"
+msgstr "faili"
+
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
 msgstr "Uzlabo datņu sistēmas kešatmiņu..."
diff --git a/l10n/lv/files_encryption.po b/l10n/lv/files_encryption.po
index aed651ab905f9641b23721167101bff888073956..f75bfcbdf54bbfdc2756942932898491ddd4ee31 100644
--- a/l10n/lv/files_encryption.po
+++ b/l10n/lv/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-14 02:46+0200\n"
-"PO-Revision-Date: 2013-06-14 00:47+0000\n"
+"POT-Creation-Date: 2013-07-05 02:12+0200\n"
+"PO-Revision-Date: 2013-07-05 00:13+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"
@@ -55,9 +55,21 @@ msgstr ""
 
 #: files/error.php:7
 msgid ""
-"Your private key is not valid! Maybe your password was changed from outside."
-" You can update your private key password in your personal settings to "
-"regain access to your files"
+"Your private key is not valid! Likely your password was changed outside the "
+"ownCloud system (e.g. your corporate directory). You can update your private"
+" key password in your personal settings to recover access to your encrypted "
+"files."
+msgstr ""
+
+#: hooks/hooks.php:44
+msgid "Missing requirements."
+msgstr ""
+
+#: hooks/hooks.php:45
+msgid ""
+"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL "
+"PHP extension is enabled and configured properly. For now, the encryption "
+"app has been disabled."
 msgstr ""
 
 #: js/settings-admin.js:11
@@ -84,11 +96,11 @@ msgstr "Šifrēšana"
 
 #: templates/settings-admin.php:10
 msgid ""
-"Enable encryption passwords recovery key (allow sharing to recovery key):"
+"Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
 #: templates/settings-admin.php:14
-msgid "Recovery account password"
+msgid "Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:21 templates/settings-personal.php:54
@@ -100,15 +112,15 @@ msgid "Disabled"
 msgstr ""
 
 #: templates/settings-admin.php:34
-msgid "Change encryption passwords recovery key:"
+msgid "Change recovery key password:"
 msgstr ""
 
 #: templates/settings-admin.php:41
-msgid "Old Recovery account password"
+msgid "Old Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:48
-msgid "New Recovery account password"
+msgid "New Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:53
diff --git a/l10n/lv/files_external.po b/l10n/lv/files_external.po
index 7c43d6fb6f8913b914b7076609fcb041c1f429fc..58024d398f422b8cb0f36ff4fbaac54e21318ce6 100644
--- a/l10n/lv/files_external.po
+++ b/l10n/lv/files_external.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/lv/files_sharing.po b/l10n/lv/files_sharing.po
index c7ac8d9041e90bd043f9e6971c8825542dcf588d..8ad99db9ad6608adea83ef412e088e519c9a0a3c 100644
--- a/l10n/lv/files_sharing.po
+++ b/l10n/lv/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
 "MIME-Version: 1.0\n"
@@ -18,27 +18,39 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
 
 #: templates/authenticate.php:4
+msgid "The password is wrong. Try again."
+msgstr ""
+
+#: templates/authenticate.php:7
 msgid "Password"
 msgstr "Parole"
 
-#: templates/authenticate.php:6
+#: templates/authenticate.php:9
 msgid "Submit"
 msgstr "Iesniegt"
 
-#: templates/public.php:10
+#: templates/public.php:17
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s ar jums dalījās ar mapi %s"
 
-#: templates/public.php:13
+#: templates/public.php:20
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s ar jums dalījās ar datni %s"
 
-#: templates/public.php:19 templates/public.php:43
+#: templates/public.php:28 templates/public.php:90
 msgid "Download"
 msgstr "Lejupielādēt"
 
-#: templates/public.php:40
+#: templates/public.php:45 templates/public.php:48
+msgid "Upload"
+msgstr "Augšupielādēt"
+
+#: templates/public.php:58
+msgid "Cancel upload"
+msgstr "Atcelt augšupielādi"
+
+#: templates/public.php:87
 msgid "No preview available for"
 msgstr "Nav pieejams priekšskatījums priekš"
diff --git a/l10n/lv/files_trashbin.po b/l10n/lv/files_trashbin.po
index b14559f1d7f9b8b5d266bfe3a67d2e8f829c5089..b6565ea4002b25e03e14b208fdf4f6436aa50388 100644
--- a/l10n/lv/files_trashbin.po
+++ b/l10n/lv/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:16+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/lv/lib.po b/l10n/lv/lib.po
index ddf45cfa2640ddcc577892f2c38d05598a317a24..ad04c58dd89ac73837d7e3c89641d2b999df23ca 100644
--- a/l10n/lv/lib.po
+++ b/l10n/lv/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
 "MIME-Version: 1.0\n"
@@ -17,43 +17,47 @@ msgstr ""
 "Language: lv\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
 
-#: app.php:359
+#: app.php:360
 msgid "Help"
 msgstr "Palīdzība"
 
-#: app.php:372
+#: app.php:373
 msgid "Personal"
 msgstr "Personīgi"
 
-#: app.php:383
+#: app.php:384
 msgid "Settings"
 msgstr "Iestatījumi"
 
-#: app.php:395
+#: app.php:396
 msgid "Users"
 msgstr "Lietotāji"
 
-#: app.php:408
+#: app.php:409
 msgid "Apps"
 msgstr "Lietotnes"
 
-#: app.php:416
+#: app.php:417
 msgid "Admin"
 msgstr "Administratori"
 
-#: files.php:210
+#: defaults.php:33
+msgid "web services under your control"
+msgstr "tīmekļa servisi tavā varā"
+
+#: files.php:226
 msgid "ZIP download is turned off."
 msgstr "ZIP lejupielādēšana ir izslēgta."
 
-#: files.php:211
+#: files.php:227
 msgid "Files need to be downloaded one by one."
 msgstr "Datnes var lejupielādēt tikai katru atsevišķi."
 
-#: files.php:212 files.php:245
+#: files.php:228 files.php:261
 msgid "Back to Files"
 msgstr "Atpakaļ pie datnēm"
 
-#: files.php:242
+#: files.php:258
 msgid "Selected files too large to generate zip file."
 msgstr "Izvēlētās datnes ir pārāk lielas, lai izveidotu zip datni."
 
@@ -85,104 +89,102 @@ msgstr "Teksts"
 msgid "Images"
 msgstr "Attēli"
 
-#: setup.php:34
-msgid "Set an admin username."
-msgstr "Iestatiet administratora lietotājvārdu."
-
-#: setup.php:37
-msgid "Set an admin password."
-msgstr "Iestatiet administratora paroli."
-
-#: setup.php:55
+#: setup/abstractdatabase.php:22
 #, php-format
 msgid "%s enter the database username."
 msgstr "%s ievadiet datubāzes lietotājvārdu."
 
-#: setup.php:58
+#: setup/abstractdatabase.php:25
 #, php-format
 msgid "%s enter the database name."
 msgstr "%s ievadiet datubāzes nosaukumu."
 
-#: setup.php:61
+#: setup/abstractdatabase.php:28
 #, php-format
 msgid "%s you may not use dots in the database name"
 msgstr "%s datubāžu nosaukumos nedrīkst izmantot punktus"
 
-#: setup.php:64
+#: setup/mssql.php:20
 #, php-format
-msgid "%s set the database host."
-msgstr "%s iestatiet datubāžu serveri."
-
-#: setup.php:126 setup.php:332 setup.php:377
-msgid "PostgreSQL username and/or password not valid"
-msgstr "Nav derīga PostgreSQL parole un/vai lietotājvārds"
+msgid "MS SQL username and/or password not valid: %s"
+msgstr "Nav derīga MySQL parole un/vai lietotājvārds — %s"
 
-#: setup.php:127 setup.php:235
+#: setup/mssql.php:21 setup/mysql.php:13 setup/oci.php:114
+#: setup/postgresql.php:24 setup/postgresql.php:70
 msgid "You need to enter either an existing account or the administrator."
 msgstr "Jums jāievada vai nu esošs vai administratora konts."
 
-#: setup.php:152
-msgid "Oracle connection could not be established"
-msgstr ""
-
-#: setup.php:234
+#: setup/mysql.php:12
 msgid "MySQL username and/or password not valid"
 msgstr "Nav derīga MySQL parole un/vai lietotājvārds"
 
-#: setup.php:288 setup.php:398 setup.php:407 setup.php:425 setup.php:435
-#: setup.php:444 setup.php:477 setup.php:543 setup.php:569 setup.php:576
-#: setup.php:587 setup.php:594 setup.php:603 setup.php:611 setup.php:620
-#: setup.php:626
+#: setup/mysql.php:67 setup/oci.php:54 setup/oci.php:121 setup/oci.php:147
+#: setup/oci.php:154 setup/oci.php:165 setup/oci.php:172 setup/oci.php:181
+#: setup/oci.php:189 setup/oci.php:198 setup/oci.php:204
+#: setup/postgresql.php:89 setup/postgresql.php:98 setup/postgresql.php:115
+#: setup/postgresql.php:125 setup/postgresql.php:134
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr "DB kļūda — “%s”"
 
-#: setup.php:289 setup.php:399 setup.php:408 setup.php:426 setup.php:436
-#: setup.php:445 setup.php:478 setup.php:544 setup.php:570 setup.php:577
-#: setup.php:588 setup.php:604 setup.php:612 setup.php:621
+#: setup/mysql.php:68 setup/oci.php:55 setup/oci.php:122 setup/oci.php:148
+#: setup/oci.php:155 setup/oci.php:166 setup/oci.php:182 setup/oci.php:190
+#: setup/oci.php:199 setup/postgresql.php:90 setup/postgresql.php:99
+#: setup/postgresql.php:116 setup/postgresql.php:126 setup/postgresql.php:135
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr "Vainīgā komanda bija “%s”"
 
-#: setup.php:305
+#: setup/mysql.php:85
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr "MySQL lietotājs %s'@'localhost' jau eksistē."
 
-#: setup.php:306
+#: setup/mysql.php:86
 msgid "Drop this user from MySQL"
 msgstr "Izmest šo lietotāju no MySQL"
 
-#: setup.php:311
+#: setup/mysql.php:91
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr "MySQL lietotājs '%s'@'%%' jau eksistē"
 
-#: setup.php:312
+#: setup/mysql.php:92
 msgid "Drop this user from MySQL."
 msgstr "Izmest šo lietotāju no MySQL."
 
-#: setup.php:469 setup.php:536
+#: setup/oci.php:34
+msgid "Oracle connection could not be established"
+msgstr ""
+
+#: setup/oci.php:41 setup/oci.php:113
 msgid "Oracle username and/or password not valid"
 msgstr "Nav derīga Oracle parole un/vai lietotājvārds"
 
-#: setup.php:595 setup.php:627
+#: setup/oci.php:173 setup/oci.php:205
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr "Vainīgā komanda bija \"%s\", vārds: %s, parole: %s"
 
-#: setup.php:647
-#, php-format
-msgid "MS SQL username and/or password not valid: %s"
-msgstr "Nav derīga MySQL parole un/vai lietotājvārds — %s"
+#: setup/postgresql.php:23 setup/postgresql.php:69
+msgid "PostgreSQL username and/or password not valid"
+msgstr "Nav derīga PostgreSQL parole un/vai lietotājvārds"
+
+#: setup.php:42
+msgid "Set an admin username."
+msgstr "Iestatiet administratora lietotājvārdu."
+
+#: setup.php:45
+msgid "Set an admin password."
+msgstr "Iestatiet administratora paroli."
 
-#: setup.php:870
+#: setup.php:198
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Jūsu serveris vēl nav pareizi iestatīts, lai ļautu sinhronizēt datnes, jo izskatās, ka WebDAV saskarne ir salauzta."
 
-#: setup.php:871
+#: setup.php:199
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Lūdzu, vēlreiz pārbaudiet <a href='%s'>instalēšanas palīdzību</a>."
diff --git a/l10n/lv/settings.po b/l10n/lv/settings.po
index 63d7c64c80042989f4ed8d86de5ed596c4ae341f..85aa0b17a87e9634b678b6f1949382b4436a8109 100644
--- a/l10n/lv/settings.po
+++ b/l10n/lv/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
 "MIME-Version: 1.0\n"
@@ -88,35 +88,35 @@ msgstr "Nevar izņemt lietotāju no grupas %s"
 msgid "Couldn't update app."
 msgstr "Nevarēja atjaunināt lietotni."
 
-#: js/apps.js:30
+#: js/apps.js:35
 msgid "Update to {appversion}"
 msgstr "Atjaunināt uz {appversion}"
 
-#: js/apps.js:36 js/apps.js:76
+#: js/apps.js:41 js/apps.js:81
 msgid "Disable"
 msgstr "Deaktivēt"
 
-#: js/apps.js:36 js/apps.js:64 js/apps.js:83
+#: js/apps.js:41 js/apps.js:69 js/apps.js:88
 msgid "Enable"
 msgstr "Aktivēt"
 
-#: js/apps.js:55
+#: js/apps.js:60
 msgid "Please wait...."
 msgstr "LÅ«dzu, uzgaidiet...."
 
-#: js/apps.js:59 js/apps.js:71 js/apps.js:80 js/apps.js:93
+#: js/apps.js:64 js/apps.js:76 js/apps.js:85 js/apps.js:98
 msgid "Error"
 msgstr "Kļūda"
 
-#: js/apps.js:90
+#: js/apps.js:95
 msgid "Updating...."
 msgstr "Atjaunina...."
 
-#: js/apps.js:93
+#: js/apps.js:98
 msgid "Error while updating app"
 msgstr "Kļūda, atjauninot lietotni"
 
-#: js/apps.js:96
+#: js/apps.js:101
 msgid "Updated"
 msgstr "Atjaunināta"
 
@@ -165,15 +165,15 @@ msgstr "Kļūda, veidojot lietotāju"
 msgid "A valid password must be provided"
 msgstr "Jānorāda derīga parole"
 
-#: personal.php:35 personal.php:36
+#: personal.php:37 personal.php:38
 msgid "__language_name__"
 msgstr "__valodas_nosaukums__"
 
-#: templates/admin.php:15
+#: templates/admin.php:17
 msgid "Security Warning"
 msgstr "Brīdinājums par drošību"
 
-#: templates/admin.php:18
+#: templates/admin.php:20
 msgid ""
 "Your data directory and your files are probably accessible from the "
 "internet. The .htaccess file that ownCloud provides is not working. We "
@@ -182,36 +182,36 @@ msgid ""
 " webserver document root."
 msgstr "Jūsu datu direktorija un datnes visdrīzāk ir pieejamas no interneta. ownCloud nodrošinātā .htaccess datne nedarbojas. Mēs iesakām konfigurēt serveri tā, lai datu direktorija vairs nebūtu pieejama, vai arī pārvietojiet datu direktoriju ārpus tīmekļa servera dokumentu saknes."
 
-#: templates/admin.php:29
+#: templates/admin.php:31
 msgid "Setup Warning"
 msgstr "Iestatīšanas brīdinājums"
 
-#: templates/admin.php:32
+#: templates/admin.php:34
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Jūsu serveris vēl nav pareizi iestatīts, lai ļautu sinhronizēt datnes, jo izskatās, ka WebDAV saskarne ir salauzta."
 
-#: templates/admin.php:33
+#: templates/admin.php:35
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Lūdzu, vēlreiz pārbaudiet <a href='%s'>instalēšanas palīdzību</a>."
 
-#: templates/admin.php:44
+#: templates/admin.php:46
 msgid "Module 'fileinfo' missing"
 msgstr "Trūkst modulis “fileinfo”"
 
-#: templates/admin.php:47
+#: templates/admin.php:49
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr "Trūkst PHP modulis “fileinfo”. Mēs iesakām to aktivēt, lai pēc iespējas labāk noteiktu mime tipus."
 
-#: templates/admin.php:58
+#: templates/admin.php:60
 msgid "Locale not working"
 msgstr "Lokāle nestrādā"
 
-#: templates/admin.php:63
+#: templates/admin.php:65
 #, php-format
 msgid ""
 "This ownCloud server can't set system locale to %s. This means that there "
@@ -219,11 +219,11 @@ msgid ""
 " to install the required packages on your system to support %s."
 msgstr "Šis ownCloud serveris nevar iestatīt sistēmas lokāli uz %s. Tas nozīmē, ka varētu būt problēmas ar noteiktām rakstzīmēm datņu nosaukumos. Mēs iesakām instalēt vajadzīgās pakotnes savā sistēmā %s atbalstam."
 
-#: templates/admin.php:75
+#: templates/admin.php:77
 msgid "Internet connection not working"
 msgstr "Interneta savienojums nedarbojas"
 
-#: templates/admin.php:78
+#: templates/admin.php:80
 msgid ""
 "This ownCloud server has no working internet connection. This means that "
 "some of the features like mounting of external storage, notifications about "
@@ -233,102 +233,102 @@ msgid ""
 " of ownCloud."
 msgstr "Šim ownCloud serverim nav strādājoša interneta savienojuma. Tas nozīmē, ka dažas no šīm iespējām, piemēram, ārējas krātuves montēšana, paziņošana par atjauninājumiem vai trešās puses programmatūras instalēšana nestrādā. Varētu nestrādāt attālināta piekļuve pie datnēm un paziņojumu e-pasta vēstuļu sūtīšana. Mēs iesakām aktivēt interneta savienojumu šim serverim, ja vēlaties visas ownCloud iespējas."
 
-#: templates/admin.php:92
+#: templates/admin.php:94
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:101
+#: templates/admin.php:103
 msgid "Execute one task with each page loaded"
 msgstr "Izpildīt vienu uzdevumu ar katru ielādēto lapu"
 
-#: templates/admin.php:111
+#: templates/admin.php:113
 msgid ""
 "cron.php is registered at a webcron service. Call the cron.php page in the "
 "owncloud root once a minute over http."
 msgstr "cron.php ir reģistrēts webcron servisā. Izsauciet cron.php lapu ownCloud saknē caur http reizi sekundē."
 
-#: templates/admin.php:121
+#: templates/admin.php:123
 msgid ""
 "Use systems cron service. Call the cron.php file in the owncloud folder via "
 "a system cronjob once a minute."
 msgstr "Izmantot sistēmas cron servisu. Izsauciet cron.php datni ownCloud mapē caur sistēmas cornjob reizi minūtē."
 
-#: templates/admin.php:128
+#: templates/admin.php:130
 msgid "Sharing"
 msgstr "Dalīšanās"
 
-#: templates/admin.php:134
+#: templates/admin.php:136
 msgid "Enable Share API"
 msgstr "Aktivēt koplietošanas API"
 
-#: templates/admin.php:135
+#: templates/admin.php:137
 msgid "Allow apps to use the Share API"
 msgstr "Ļauj lietotnēm izmantot koplietošanas API"
 
-#: templates/admin.php:142
+#: templates/admin.php:144
 msgid "Allow links"
 msgstr "Atļaut saites"
 
-#: templates/admin.php:143
+#: templates/admin.php:145
 msgid "Allow users to share items to the public with links"
 msgstr "Ļaut lietotājiem publiski dalīties ar vienumiem, izmantojot saites"
 
-#: templates/admin.php:150
+#: templates/admin.php:152
 msgid "Allow resharing"
 msgstr "Atļaut atkārtotu koplietošanu"
 
-#: templates/admin.php:151
+#: templates/admin.php:153
 msgid "Allow users to share items shared with them again"
 msgstr "Ļaut lietotājiem dalīties ar vienumiem atkārtoti"
 
-#: templates/admin.php:158
+#: templates/admin.php:160
 msgid "Allow users to share with anyone"
 msgstr "Ļaut lietotājiem dalīties ar visiem"
 
-#: templates/admin.php:161
+#: templates/admin.php:163
 msgid "Allow users to only share with users in their groups"
 msgstr "Ļaut lietotājiem dalīties ar lietotājiem to grupās"
 
-#: templates/admin.php:168
+#: templates/admin.php:170
 msgid "Security"
 msgstr "Drošība"
 
-#: templates/admin.php:181
+#: templates/admin.php:183
 msgid "Enforce HTTPS"
 msgstr "Uzspiest HTTPS"
 
-#: templates/admin.php:182
+#: templates/admin.php:184
 msgid ""
 "Enforces the clients to connect to ownCloud via an encrypted connection."
 msgstr "Piespiež klientus savienoties ar ownCloud caur šifrētu savienojumu."
 
-#: templates/admin.php:185
+#: templates/admin.php:187
 msgid ""
 "Please connect to this ownCloud instance via HTTPS to enable or disable the "
 "SSL enforcement."
 msgstr "Lūdzu, savienojieties ar šo ownCloud pakalpojumu caur HTTPS, lai aktivētu vai deaktivētu SSL piemērošanu."
 
-#: templates/admin.php:195
+#: templates/admin.php:197
 msgid "Log"
 msgstr "Žurnāls"
 
-#: templates/admin.php:196
+#: templates/admin.php:198
 msgid "Log level"
 msgstr "Žurnāla līmenis"
 
-#: templates/admin.php:227
+#: templates/admin.php:229
 msgid "More"
 msgstr "Vairāk"
 
-#: templates/admin.php:228
+#: templates/admin.php:230
 msgid "Less"
 msgstr "Mazāk"
 
-#: templates/admin.php:235 templates/personal.php:116
+#: templates/admin.php:236 templates/personal.php:116
 msgid "Version"
 msgstr "Versija"
 
-#: templates/admin.php:237 templates/personal.php:119
+#: templates/admin.php:240 templates/personal.php:119
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -386,76 +386,79 @@ msgstr "Kļūdu sekotājs"
 msgid "Commercial Support"
 msgstr "Komerciālais atbalsts"
 
-#: templates/personal.php:9
+#: templates/personal.php:10
 msgid "Get the apps to sync your files"
 msgstr "Saņem lietotnes, lai sinhronizētu savas datnes"
 
-#: templates/personal.php:20
+#: templates/personal.php:21
 msgid "Show First Run Wizard again"
 msgstr "Vēlreiz rādīt pirmās palaišanas vedni"
 
-#: templates/personal.php:28
+#: templates/personal.php:29
 #, php-format
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "JÅ«s lietojat <strong>%s</strong> no pieejamajiem <strong>%s</strong>"
 
-#: templates/personal.php:40 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:41 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "Parole"
 
-#: templates/personal.php:41
+#: templates/personal.php:42
 msgid "Your password was changed"
 msgstr "Jūru parole tika nomainīta"
 
-#: templates/personal.php:42
+#: templates/personal.php:43
 msgid "Unable to change your password"
 msgstr "Nevar nomainīt jūsu paroli"
 
-#: templates/personal.php:43
+#: templates/personal.php:44
 msgid "Current password"
 msgstr "Pašreizējā parole"
 
-#: templates/personal.php:45
+#: templates/personal.php:46
 msgid "New password"
 msgstr "Jauna parole"
 
-#: templates/personal.php:47
+#: templates/personal.php:48
 msgid "Change password"
 msgstr "Mainīt paroli"
 
-#: templates/personal.php:59 templates/users.php:85
+#: templates/personal.php:60 templates/users.php:85
 msgid "Display Name"
 msgstr "Redzamais vārds"
 
-#: templates/personal.php:74
+#: templates/personal.php:75
 msgid "Email"
 msgstr "E-pasts"
 
-#: templates/personal.php:76
+#: templates/personal.php:77
 msgid "Your email address"
 msgstr "JÅ«su e-pasta adrese"
 
-#: templates/personal.php:77
+#: templates/personal.php:78
 msgid "Fill in an email address to enable password recovery"
 msgstr "Ievadiet e-pasta adresi, lai vēlāk varētu atgūt paroli, ja būs nepieciešamība"
 
-#: templates/personal.php:86 templates/personal.php:87
+#: templates/personal.php:87 templates/personal.php:88
 msgid "Language"
 msgstr "Valoda"
 
-#: templates/personal.php:99
+#: templates/personal.php:100
 msgid "Help translate"
 msgstr "Palīdzi tulkot"
 
-#: templates/personal.php:105
+#: templates/personal.php:106
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:107
-msgid "Use this address to connect to your ownCloud in your file manager"
-msgstr "Izmanto šo adresi, lai, izmantojot datņu pārvaldnieku, savienotos ar savu ownCloud"
+#: templates/personal.php:108
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
+"target=\"_blank\">access your Files via WebDAV</a>"
+msgstr ""
 
-#: templates/users.php:21 templates/users.php:84
+#: templates/users.php:21
 msgid "Login Name"
 msgstr "Ierakstīšanās vārds"
 
@@ -485,6 +488,10 @@ msgstr "Neierobežota"
 msgid "Other"
 msgstr "Cits"
 
+#: templates/users.php:84
+msgid "Username"
+msgstr "Lietotājvārds"
+
 #: templates/users.php:91
 msgid "Storage"
 msgstr "Krātuve"
diff --git a/l10n/lv/user_ldap.po b/l10n/lv/user_ldap.po
index 3a056a1cae84fa9a8f6e8f8ff87988ee50b7b452..9cdc9b946ae0ef8de7743fa4188a9adc20c721aa 100644
--- a/l10n/lv/user_ldap.po
+++ b/l10n/lv/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:25+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:16+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/mk/core.po b/l10n/mk/core.po
index f9e9d476cd30eb9546f8876b3889c272d07bc1aa..e56ae4bb022575a8d4851c209ed55ec1b8f6a04c 100644
--- a/l10n/mk/core.po
+++ b/l10n/mk/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:22+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:14+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
 "MIME-Version: 1.0\n"
@@ -61,135 +61,135 @@ msgstr "Не е одбрана категорија за бришење."
 msgid "Error removing %s from favorites."
 msgstr "Грешка при бришење на %s од омилени."
 
-#: js/config.php:34
+#: js/config.php:32
 msgid "Sunday"
 msgstr "Недела"
 
-#: js/config.php:35
+#: js/config.php:33
 msgid "Monday"
 msgstr "Понеделник"
 
-#: js/config.php:36
+#: js/config.php:34
 msgid "Tuesday"
 msgstr "Вторник"
 
-#: js/config.php:37
+#: js/config.php:35
 msgid "Wednesday"
 msgstr "Среда"
 
-#: js/config.php:38
+#: js/config.php:36
 msgid "Thursday"
 msgstr "Четврток"
 
-#: js/config.php:39
+#: js/config.php:37
 msgid "Friday"
 msgstr "Петок"
 
-#: js/config.php:40
+#: js/config.php:38
 msgid "Saturday"
 msgstr "Сабота"
 
-#: js/config.php:45
+#: js/config.php:43
 msgid "January"
 msgstr "Јануари"
 
-#: js/config.php:46
+#: js/config.php:44
 msgid "February"
 msgstr "Февруари"
 
-#: js/config.php:47
+#: js/config.php:45
 msgid "March"
 msgstr "Март"
 
-#: js/config.php:48
+#: js/config.php:46
 msgid "April"
 msgstr "Април"
 
-#: js/config.php:49
+#: js/config.php:47
 msgid "May"
 msgstr "Мај"
 
-#: js/config.php:50
+#: js/config.php:48
 msgid "June"
 msgstr "Јуни"
 
-#: js/config.php:51
+#: js/config.php:49
 msgid "July"
 msgstr "Јули"
 
-#: js/config.php:52
+#: js/config.php:50
 msgid "August"
 msgstr "Август"
 
-#: js/config.php:53
+#: js/config.php:51
 msgid "September"
 msgstr "Септември"
 
-#: js/config.php:54
+#: js/config.php:52
 msgid "October"
 msgstr "Октомври"
 
-#: js/config.php:55
+#: js/config.php:53
 msgid "November"
 msgstr "Ноември"
 
-#: js/config.php:56
+#: js/config.php:54
 msgid "December"
 msgstr "Декември"
 
-#: js/js.js:286
+#: js/js.js:293
 msgid "Settings"
 msgstr "Подесувања"
 
-#: js/js.js:718
+#: js/js.js:725
 msgid "seconds ago"
 msgstr "пред секунди"
 
-#: js/js.js:719
+#: js/js.js:726
 msgid "1 minute ago"
 msgstr "пред 1 минута"
 
-#: js/js.js:720
+#: js/js.js:727
 msgid "{minutes} minutes ago"
 msgstr "пред {minutes} минути"
 
-#: js/js.js:721
+#: js/js.js:728
 msgid "1 hour ago"
 msgstr "пред 1 час"
 
-#: js/js.js:722
+#: js/js.js:729
 msgid "{hours} hours ago"
 msgstr "пред {hours} часови"
 
-#: js/js.js:723
+#: js/js.js:730
 msgid "today"
 msgstr "денеска"
 
-#: js/js.js:724
+#: js/js.js:731
 msgid "yesterday"
 msgstr "вчера"
 
-#: js/js.js:725
+#: js/js.js:732
 msgid "{days} days ago"
 msgstr "пред {days} денови"
 
-#: js/js.js:726
+#: js/js.js:733
 msgid "last month"
 msgstr "минатиот месец"
 
-#: js/js.js:727
+#: js/js.js:734
 msgid "{months} months ago"
 msgstr "пред {months} месеци"
 
-#: js/js.js:728
+#: js/js.js:735
 msgid "months ago"
 msgstr "пред месеци"
 
-#: js/js.js:729
+#: js/js.js:736
 msgid "last year"
 msgstr "минатата година"
 
-#: js/js.js:730
+#: js/js.js:737
 msgid "years ago"
 msgstr "пред години"
 
@@ -225,8 +225,8 @@ msgstr "Не е специфициран типот на објект."
 #: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
 #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:577
-#: js/share.js:589
+#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:620
+#: js/share.js:632
 msgid "Error"
 msgstr "Грешка"
 
@@ -246,7 +246,7 @@ msgstr ""
 msgid "Share"
 msgstr "Сподели"
 
-#: js/share.js:125 js/share.js:617
+#: js/share.js:125 js/share.js:660
 msgid "Error while sharing"
 msgstr "Грешка при споделување"
 
@@ -266,99 +266,103 @@ msgstr "Споделено со Вас и групата {group} од {owner}"
 msgid "Shared with you by {owner}"
 msgstr "Споделено со Вас од {owner}"
 
-#: js/share.js:159
+#: js/share.js:172
 msgid "Share with"
 msgstr "Сподели со"
 
-#: js/share.js:164
+#: js/share.js:177
 msgid "Share with link"
 msgstr "Сподели со врска"
 
-#: js/share.js:167
+#: js/share.js:180
 msgid "Password protect"
 msgstr "Заштити со лозинка"
 
-#: js/share.js:169 templates/installation.php:54 templates/login.php:26
+#: js/share.js:182 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "Лозинка"
 
-#: js/share.js:173
+#: js/share.js:187
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:191
 msgid "Email link to person"
 msgstr "Прати врска по е-пошта на личност"
 
-#: js/share.js:174
+#: js/share.js:192
 msgid "Send"
 msgstr "Прати"
 
-#: js/share.js:178
+#: js/share.js:197
 msgid "Set expiration date"
 msgstr "Постави рок на траење"
 
-#: js/share.js:179
+#: js/share.js:198
 msgid "Expiration date"
 msgstr "Рок на траење"
 
-#: js/share.js:211
+#: js/share.js:230
 msgid "Share via email:"
 msgstr "Сподели по е-пошта:"
 
-#: js/share.js:213
+#: js/share.js:232
 msgid "No people found"
 msgstr "Не се најдени луѓе"
 
-#: js/share.js:251
+#: js/share.js:270
 msgid "Resharing is not allowed"
 msgstr "Повторно споделување не е дозволено"
 
-#: js/share.js:287
+#: js/share.js:306
 msgid "Shared in {item} with {user}"
 msgstr "Споделено во {item} со {user}"
 
-#: js/share.js:308
+#: js/share.js:327
 msgid "Unshare"
 msgstr "Не споделувај"
 
-#: js/share.js:320
+#: js/share.js:339
 msgid "can edit"
 msgstr "може да се измени"
 
-#: js/share.js:322
+#: js/share.js:341
 msgid "access control"
 msgstr "контрола на пристап"
 
-#: js/share.js:325
+#: js/share.js:344
 msgid "create"
 msgstr "креирај"
 
-#: js/share.js:328
+#: js/share.js:347
 msgid "update"
 msgstr "ажурирај"
 
-#: js/share.js:331
+#: js/share.js:350
 msgid "delete"
 msgstr "избриши"
 
-#: js/share.js:334
+#: js/share.js:353
 msgid "share"
 msgstr "сподели"
 
-#: js/share.js:368 js/share.js:564
+#: js/share.js:387 js/share.js:607
 msgid "Password protected"
 msgstr "Заштитено со лозинка"
 
-#: js/share.js:577
+#: js/share.js:620
 msgid "Error unsetting expiration date"
 msgstr "Грешка при тргање на рокот на траење"
 
-#: js/share.js:589
+#: js/share.js:632
 msgid "Error setting expiration date"
 msgstr "Грешка при поставување на рок на траење"
 
-#: js/share.js:604
+#: js/share.js:647
 msgid "Sending ..."
 msgstr "Праќање..."
 
-#: js/share.js:615
+#: js/share.js:658
 msgid "Email sent"
 msgstr "Е-порака пратена"
 
@@ -373,7 +377,7 @@ msgstr ""
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
-#: lostpassword/controller.php:58
+#: lostpassword/controller.php:60
 msgid "ownCloud password reset"
 msgstr "ресетирање на лозинка за ownCloud"
 
@@ -403,17 +407,17 @@ msgstr "Корисничко име"
 
 #: lostpassword/templates/lostpassword.php:22
 msgid ""
-"Your files seems to be encrypted. If you didn't have enabled the recovery "
-"key there will be no way to get your data back once the password was "
-"resetted. If you are not sure what to do, please contact your administrator "
-"first before continue. Do you really want to continue?"
+"Your files are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
 msgstr ""
 
 #: lostpassword/templates/lostpassword.php:24
 msgid "Yes, I really want to reset my password now"
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:29
+#: lostpassword/templates/lostpassword.php:27
 msgid "Request reset"
 msgstr "Побарајте ресетирање"
 
@@ -461,7 +465,7 @@ msgstr "Забранет пристап"
 msgid "Cloud not found"
 msgstr "Облакот не е најден"
 
-#: templates/altmail.php:2
+#: templates/altmail.php:4
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -472,10 +476,6 @@ msgid ""
 "Cheers!"
 msgstr ""
 
-#: templates/altmail.php:7 templates/mail.php:24
-msgid "web services under your control"
-msgstr "веб сервиси под Ваша контрола"
-
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
 msgstr "Уреди категории"
@@ -568,12 +568,12 @@ msgstr "Сервер со база"
 msgid "Finish setup"
 msgstr "Заврши го подесувањето"
 
-#: templates/layout.user.php:40
+#: templates/layout.user.php:43
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:67
+#: templates/layout.user.php:68
 msgid "Log out"
 msgstr "Одјава"
 
@@ -607,7 +607,7 @@ msgstr "Најава"
 msgid "Alternative Logins"
 msgstr ""
 
-#: templates/mail.php:15
+#: templates/mail.php:16
 #, php-format
 msgid ""
 "Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
diff --git a/l10n/mk/files.po b/l10n/mk/files.po
index 5b599c474fe48f3410633fd494465a9b5bb7ac2d..86bb94162f979fd5ef5123983e39f3ba007391b6 100644
--- a/l10n/mk/files.po
+++ b/l10n/mk/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:01+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
 "MIME-Version: 1.0\n"
@@ -27,46 +27,54 @@ msgstr ""
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/upload.php:19
+#: ajax/upload.php:16 ajax/upload.php:45
+msgid "Unable to set upload directory."
+msgstr ""
+
+#: ajax/upload.php:22
+msgid "Invalid Token"
+msgstr ""
+
+#: ajax/upload.php:59
 msgid "No file was uploaded. Unknown error"
 msgstr "Ниту еден фајл не се вчита. Непозната грешка"
 
-#: ajax/upload.php:26
+#: ajax/upload.php:66
 msgid "There is no error, the file uploaded with success"
 msgstr "Датотеката беше успешно подигната."
 
-#: ajax/upload.php:27
+#: ajax/upload.php:67
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr "Подигнатата датотека ја надминува upload_max_filesize директивата во php.ini:"
 
-#: ajax/upload.php:29
+#: ajax/upload.php:69
 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:30
+#: ajax/upload.php:70
 msgid "The uploaded file was only partially uploaded"
 msgstr "Датотеката беше само делумно подигната."
 
-#: ajax/upload.php:31
+#: ajax/upload.php:71
 msgid "No file was uploaded"
 msgstr "Не беше подигната датотека."
 
-#: ajax/upload.php:32
+#: ajax/upload.php:72
 msgid "Missing a temporary folder"
 msgstr "Недостасува привремена папка"
 
-#: ajax/upload.php:33
+#: ajax/upload.php:73
 msgid "Failed to write to disk"
 msgstr "Неуспеав да запишам на диск"
 
-#: ajax/upload.php:51
+#: ajax/upload.php:91
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:83
+#: ajax/upload.php:123
 msgid "Invalid directory."
 msgstr ""
 
@@ -74,6 +82,36 @@ msgstr ""
 msgid "Files"
 msgstr "Датотеки"
 
+#: js/file-upload.js:11
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr "Не може да се преземе вашата датотека бидејќи фолдерот во кој се наоѓа фајлот има големина од 0 бајти"
+
+#: js/file-upload.js:24
+msgid "Not enough space available"
+msgstr ""
+
+#: js/file-upload.js:64
+msgid "Upload cancelled."
+msgstr "Преземањето е прекинато."
+
+#: js/file-upload.js:167 js/files.js:266
+msgid ""
+"File upload is in progress. Leaving the page now will cancel the upload."
+msgstr "Подигање на датотека е во тек. Напуштење на страницата ќе го прекине."
+
+#: js/file-upload.js:233 js/files.js:339
+msgid "URL cannot be empty."
+msgstr "Адресата неможе да биде празна."
+
+#: js/file-upload.js:238 lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr ""
+
+#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
+#: js/files.js:693 js/files.js:731
+msgid "Error"
+msgstr "Грешка"
+
 #: js/fileactions.js:116
 msgid "Share"
 msgstr "Сподели"
@@ -90,43 +128,43 @@ msgstr "Избриши"
 msgid "Rename"
 msgstr "Преименувај"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:464
 msgid "Pending"
 msgstr "Чека"
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "{new_name} already exists"
 msgstr "{new_name} веќе постои"
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "replace"
 msgstr "замени"
 
-#: js/filelist.js:259
+#: js/filelist.js:302
 msgid "suggest name"
 msgstr "предложи име"
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "cancel"
 msgstr "откажи"
 
-#: js/filelist.js:306
+#: js/filelist.js:349
 msgid "replaced {new_name} with {old_name}"
 msgstr "заменета {new_name} со {old_name}"
 
-#: js/filelist.js:306
+#: js/filelist.js:349
 msgid "undo"
 msgstr "врати"
 
-#: js/filelist.js:331
+#: js/filelist.js:374
 msgid "perform delete operation"
 msgstr ""
 
-#: js/filelist.js:413
+#: js/filelist.js:456
 msgid "1 file uploading"
 msgstr "1 датотека се подига"
 
-#: js/filelist.js:416 js/filelist.js:470
+#: js/filelist.js:459 js/filelist.js:517
 msgid "files uploading"
 msgstr ""
 
@@ -158,69 +196,41 @@ msgid ""
 "big."
 msgstr ""
 
-#: js/files.js:264
-msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "Не може да се преземе вашата датотека бидејќи фолдерот во кој се наоѓа фајлот има големина од 0 бајти"
-
-#: js/files.js:277
-msgid "Not enough space available"
-msgstr ""
-
-#: js/files.js:317
-msgid "Upload cancelled."
-msgstr "Преземањето е прекинато."
-
-#: js/files.js:413
-msgid ""
-"File upload is in progress. Leaving the page now will cancel the upload."
-msgstr "Подигање на датотека е во тек. Напуштење на страницата ќе го прекине."
-
-#: js/files.js:486
-msgid "URL cannot be empty."
-msgstr "Адресата неможе да биде празна."
-
-#: js/files.js:491
+#: js/files.js:344
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
-msgid "Error"
-msgstr "Грешка"
-
-#: js/files.js:877 templates/index.php:69
+#: js/files.js:744 templates/index.php:69
 msgid "Name"
 msgstr "Име"
 
-#: js/files.js:878 templates/index.php:80
+#: js/files.js:745 templates/index.php:80
 msgid "Size"
 msgstr "Големина"
 
-#: js/files.js:879 templates/index.php:82
+#: js/files.js:746 templates/index.php:82
 msgid "Modified"
 msgstr "Променето"
 
-#: js/files.js:898
+#: js/files.js:765
 msgid "1 folder"
 msgstr "1 папка"
 
-#: js/files.js:900
+#: js/files.js:767
 msgid "{count} folders"
 msgstr "{count} папки"
 
-#: js/files.js:908
+#: js/files.js:775
 msgid "1 file"
 msgstr "1 датотека"
 
-#: js/files.js:910
+#: js/files.js:777
 msgid "{count} files"
 msgstr "{count} датотеки"
 
-#: lib/app.php:53
-msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
-msgstr ""
-
 #: lib/app.php:73
-msgid "Unable to rename file"
+#, php-format
+msgid "%s could not be renamed"
 msgstr ""
 
 #: lib/helper.php:11 templates/index.php:18
@@ -317,6 +327,22 @@ msgstr "Се скенираат датотеки, ве молам почекај
 msgid "Current scanning"
 msgstr "Моментално скенирам"
 
+#: templates/part.list.php:76
+msgid "directory"
+msgstr ""
+
+#: templates/part.list.php:78
+msgid "directories"
+msgstr ""
+
+#: templates/part.list.php:87
+msgid "file"
+msgstr "датотека"
+
+#: templates/part.list.php:89
+msgid "files"
+msgstr "датотеки"
+
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
 msgstr ""
diff --git a/l10n/mk/files_encryption.po b/l10n/mk/files_encryption.po
index 567f8e4727f0aeb7f751841027abdefbdad94a53..377a5a10467d6faf6316559f15ebd23bce3a716e 100644
--- a/l10n/mk/files_encryption.po
+++ b/l10n/mk/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-14 02:46+0200\n"
-"PO-Revision-Date: 2013-06-14 00:47+0000\n"
+"POT-Creation-Date: 2013-07-05 02:12+0200\n"
+"PO-Revision-Date: 2013-07-05 00:13+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"
@@ -55,9 +55,21 @@ msgstr ""
 
 #: files/error.php:7
 msgid ""
-"Your private key is not valid! Maybe your password was changed from outside."
-" You can update your private key password in your personal settings to "
-"regain access to your files"
+"Your private key is not valid! Likely your password was changed outside the "
+"ownCloud system (e.g. your corporate directory). You can update your private"
+" key password in your personal settings to recover access to your encrypted "
+"files."
+msgstr ""
+
+#: hooks/hooks.php:44
+msgid "Missing requirements."
+msgstr ""
+
+#: hooks/hooks.php:45
+msgid ""
+"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL "
+"PHP extension is enabled and configured properly. For now, the encryption "
+"app has been disabled."
 msgstr ""
 
 #: js/settings-admin.js:11
@@ -84,11 +96,11 @@ msgstr "Енкрипција"
 
 #: templates/settings-admin.php:10
 msgid ""
-"Enable encryption passwords recovery key (allow sharing to recovery key):"
+"Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
 #: templates/settings-admin.php:14
-msgid "Recovery account password"
+msgid "Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:21 templates/settings-personal.php:54
@@ -100,15 +112,15 @@ msgid "Disabled"
 msgstr ""
 
 #: templates/settings-admin.php:34
-msgid "Change encryption passwords recovery key:"
+msgid "Change recovery key password:"
 msgstr ""
 
 #: templates/settings-admin.php:41
-msgid "Old Recovery account password"
+msgid "Old Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:48
-msgid "New Recovery account password"
+msgid "New Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:53
diff --git a/l10n/mk/files_external.po b/l10n/mk/files_external.po
index 03eb11a89a9ee252372a7ba217abf4952c8a5aea..5ec7185a2d130b7e1809bdef9bd24b9b95665d0f 100644
--- a/l10n/mk/files_external.po
+++ b/l10n/mk/files_external.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/mk/files_sharing.po b/l10n/mk/files_sharing.po
index 0ff2f6e80b5e98ec9a8568f1d39a50faab4e5fc8..720ceab14637201824f181bdd59824e44f5b1882 100644
--- a/l10n/mk/files_sharing.po
+++ b/l10n/mk/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
 "MIME-Version: 1.0\n"
@@ -18,27 +18,39 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n"
 
 #: templates/authenticate.php:4
+msgid "The password is wrong. Try again."
+msgstr ""
+
+#: templates/authenticate.php:7
 msgid "Password"
 msgstr "Лозинка"
 
-#: templates/authenticate.php:6
+#: templates/authenticate.php:9
 msgid "Submit"
 msgstr "Прати"
 
-#: templates/public.php:10
+#: templates/public.php:17
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s ја сподели папката %s со Вас"
 
-#: templates/public.php:13
+#: templates/public.php:20
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s ја сподели датотеката %s со Вас"
 
-#: templates/public.php:19 templates/public.php:43
+#: templates/public.php:28 templates/public.php:90
 msgid "Download"
 msgstr "Преземи"
 
-#: templates/public.php:40
+#: templates/public.php:45 templates/public.php:48
+msgid "Upload"
+msgstr "Подигни"
+
+#: templates/public.php:58
+msgid "Cancel upload"
+msgstr "Откажи прикачување"
+
+#: templates/public.php:87
 msgid "No preview available for"
 msgstr "Нема достапно преглед за"
diff --git a/l10n/mk/files_trashbin.po b/l10n/mk/files_trashbin.po
index bb79cbd00f3313bde1f3071d2113b54b365a4877..79ea6353d9aa764cbd08dd35d0cfa79beaf128be 100644
--- a/l10n/mk/files_trashbin.po
+++ b/l10n/mk/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/mk/lib.po b/l10n/mk/lib.po
index c9f4a5254002c7edc4df01cd34eeb38a2df3e303..846bd709f677c13a3996760f79cdfe4369ec7a27 100644
--- a/l10n/mk/lib.po
+++ b/l10n/mk/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
 "MIME-Version: 1.0\n"
@@ -17,43 +17,47 @@ msgstr ""
 "Language: mk\n"
 "Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n"
 
-#: app.php:359
+#: app.php:360
 msgid "Help"
 msgstr "Помош"
 
-#: app.php:372
+#: app.php:373
 msgid "Personal"
 msgstr "Лично"
 
-#: app.php:383
+#: app.php:384
 msgid "Settings"
 msgstr "Подесувања"
 
-#: app.php:395
+#: app.php:396
 msgid "Users"
 msgstr "Корисници"
 
-#: app.php:408
+#: app.php:409
 msgid "Apps"
 msgstr "Аппликации"
 
-#: app.php:416
+#: app.php:417
 msgid "Admin"
 msgstr "Админ"
 
-#: files.php:210
+#: defaults.php:33
+msgid "web services under your control"
+msgstr "веб сервиси под Ваша контрола"
+
+#: files.php:226
 msgid "ZIP download is turned off."
 msgstr "Преземање во ZIP е исклучено"
 
-#: files.php:211
+#: files.php:227
 msgid "Files need to be downloaded one by one."
 msgstr "Датотеките треба да се симнат една по една."
 
-#: files.php:212 files.php:245
+#: files.php:228 files.php:261
 msgid "Back to Files"
 msgstr "Назад кон датотеки"
 
-#: files.php:242
+#: files.php:258
 msgid "Selected files too large to generate zip file."
 msgstr "Избраните датотеки се преголеми за да се генерира zip."
 
@@ -85,104 +89,102 @@ msgstr "Текст"
 msgid "Images"
 msgstr "Слики"
 
-#: setup.php:34
-msgid "Set an admin username."
-msgstr ""
-
-#: setup.php:37
-msgid "Set an admin password."
-msgstr ""
-
-#: setup.php:55
+#: setup/abstractdatabase.php:22
 #, php-format
 msgid "%s enter the database username."
 msgstr ""
 
-#: setup.php:58
+#: setup/abstractdatabase.php:25
 #, php-format
 msgid "%s enter the database name."
 msgstr ""
 
-#: setup.php:61
+#: setup/abstractdatabase.php:28
 #, php-format
 msgid "%s you may not use dots in the database name"
 msgstr ""
 
-#: setup.php:64
+#: setup/mssql.php:20
 #, php-format
-msgid "%s set the database host."
-msgstr ""
-
-#: setup.php:126 setup.php:332 setup.php:377
-msgid "PostgreSQL username and/or password not valid"
+msgid "MS SQL username and/or password not valid: %s"
 msgstr ""
 
-#: setup.php:127 setup.php:235
+#: setup/mssql.php:21 setup/mysql.php:13 setup/oci.php:114
+#: setup/postgresql.php:24 setup/postgresql.php:70
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:152
-msgid "Oracle connection could not be established"
-msgstr ""
-
-#: setup.php:234
+#: setup/mysql.php:12
 msgid "MySQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:288 setup.php:398 setup.php:407 setup.php:425 setup.php:435
-#: setup.php:444 setup.php:477 setup.php:543 setup.php:569 setup.php:576
-#: setup.php:587 setup.php:594 setup.php:603 setup.php:611 setup.php:620
-#: setup.php:626
+#: setup/mysql.php:67 setup/oci.php:54 setup/oci.php:121 setup/oci.php:147
+#: setup/oci.php:154 setup/oci.php:165 setup/oci.php:172 setup/oci.php:181
+#: setup/oci.php:189 setup/oci.php:198 setup/oci.php:204
+#: setup/postgresql.php:89 setup/postgresql.php:98 setup/postgresql.php:115
+#: setup/postgresql.php:125 setup/postgresql.php:134
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr ""
 
-#: setup.php:289 setup.php:399 setup.php:408 setup.php:426 setup.php:436
-#: setup.php:445 setup.php:478 setup.php:544 setup.php:570 setup.php:577
-#: setup.php:588 setup.php:604 setup.php:612 setup.php:621
+#: setup/mysql.php:68 setup/oci.php:55 setup/oci.php:122 setup/oci.php:148
+#: setup/oci.php:155 setup/oci.php:166 setup/oci.php:182 setup/oci.php:190
+#: setup/oci.php:199 setup/postgresql.php:90 setup/postgresql.php:99
+#: setup/postgresql.php:116 setup/postgresql.php:126 setup/postgresql.php:135
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:305
+#: setup/mysql.php:85
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:306
+#: setup/mysql.php:86
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:311
+#: setup/mysql.php:91
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:312
+#: setup/mysql.php:92
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:469 setup.php:536
+#: setup/oci.php:34
+msgid "Oracle connection could not be established"
+msgstr ""
+
+#: setup/oci.php:41 setup/oci.php:113
 msgid "Oracle username and/or password not valid"
 msgstr ""
 
-#: setup.php:595 setup.php:627
+#: setup/oci.php:173 setup/oci.php:205
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:647
-#, php-format
-msgid "MS SQL username and/or password not valid: %s"
+#: setup/postgresql.php:23 setup/postgresql.php:69
+msgid "PostgreSQL username and/or password not valid"
+msgstr ""
+
+#: setup.php:42
+msgid "Set an admin username."
+msgstr ""
+
+#: setup.php:45
+msgid "Set an admin password."
 msgstr ""
 
-#: setup.php:870
+#: setup.php:198
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:871
+#: setup.php:199
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
diff --git a/l10n/mk/settings.po b/l10n/mk/settings.po
index 104532e440f34331438e3ca9c066c672c52a0d15..b1e4b38b4ebe58b9ca5634df2f2266247d0691fb 100644
--- a/l10n/mk/settings.po
+++ b/l10n/mk/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
 "MIME-Version: 1.0\n"
@@ -88,35 +88,35 @@ msgstr "Неможе да избришам корисник од група %s"
 msgid "Couldn't update app."
 msgstr ""
 
-#: js/apps.js:30
+#: js/apps.js:35
 msgid "Update to {appversion}"
 msgstr ""
 
-#: js/apps.js:36 js/apps.js:76
+#: js/apps.js:41 js/apps.js:81
 msgid "Disable"
 msgstr "Оневозможи"
 
-#: js/apps.js:36 js/apps.js:64 js/apps.js:83
+#: js/apps.js:41 js/apps.js:69 js/apps.js:88
 msgid "Enable"
 msgstr "Овозможи"
 
-#: js/apps.js:55
+#: js/apps.js:60
 msgid "Please wait...."
 msgstr ""
 
-#: js/apps.js:59 js/apps.js:71 js/apps.js:80 js/apps.js:93
+#: js/apps.js:64 js/apps.js:76 js/apps.js:85 js/apps.js:98
 msgid "Error"
 msgstr "Грешка"
 
-#: js/apps.js:90
+#: js/apps.js:95
 msgid "Updating...."
 msgstr ""
 
-#: js/apps.js:93
+#: js/apps.js:98
 msgid "Error while updating app"
 msgstr ""
 
-#: js/apps.js:96
+#: js/apps.js:101
 msgid "Updated"
 msgstr ""
 
@@ -165,15 +165,15 @@ msgstr ""
 msgid "A valid password must be provided"
 msgstr ""
 
-#: personal.php:35 personal.php:36
+#: personal.php:37 personal.php:38
 msgid "__language_name__"
 msgstr "__language_name__"
 
-#: templates/admin.php:15
+#: templates/admin.php:17
 msgid "Security Warning"
 msgstr "Безбедносно предупредување"
 
-#: templates/admin.php:18
+#: templates/admin.php:20
 msgid ""
 "Your data directory and your files are probably accessible from the "
 "internet. The .htaccess file that ownCloud provides is not working. We "
@@ -182,36 +182,36 @@ msgid ""
 " webserver document root."
 msgstr "Вашата папка со податоци и датотеките е најверојатно достапна од интернет. .htaccess датотеката што ја овозможува ownCloud не фунционира. Силно препорачуваме да го исконфигурирате вашиот сервер за вашата папка со податоци не е достапна преку интернетт или преместете ја надвор од коренот на веб серверот."
 
-#: templates/admin.php:29
+#: templates/admin.php:31
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:32
+#: templates/admin.php:34
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: templates/admin.php:33
+#: templates/admin.php:35
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:44
+#: templates/admin.php:46
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:47
+#: templates/admin.php:49
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr ""
 
-#: templates/admin.php:58
+#: templates/admin.php:60
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:63
+#: templates/admin.php:65
 #, php-format
 msgid ""
 "This ownCloud server can't set system locale to %s. This means that there "
@@ -219,11 +219,11 @@ msgid ""
 " to install the required packages on your system to support %s."
 msgstr ""
 
-#: templates/admin.php:75
+#: templates/admin.php:77
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:78
+#: templates/admin.php:80
 msgid ""
 "This ownCloud server has no working internet connection. This means that "
 "some of the features like mounting of external storage, notifications about "
@@ -233,102 +233,102 @@ msgid ""
 " of ownCloud."
 msgstr ""
 
-#: templates/admin.php:92
+#: templates/admin.php:94
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:101
+#: templates/admin.php:103
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:111
+#: templates/admin.php:113
 msgid ""
 "cron.php is registered at a webcron service. Call the cron.php page in the "
 "owncloud root once a minute over http."
 msgstr ""
 
-#: templates/admin.php:121
+#: templates/admin.php:123
 msgid ""
 "Use systems cron service. Call the cron.php file in the owncloud folder via "
 "a system cronjob once a minute."
 msgstr ""
 
-#: templates/admin.php:128
+#: templates/admin.php:130
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:134
+#: templates/admin.php:136
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:135
+#: templates/admin.php:137
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:142
+#: templates/admin.php:144
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:143
+#: templates/admin.php:145
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:150
+#: templates/admin.php:152
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:151
+#: templates/admin.php:153
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:158
+#: templates/admin.php:160
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:161
+#: templates/admin.php:163
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:168
+#: templates/admin.php:170
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:181
+#: templates/admin.php:183
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:182
+#: templates/admin.php:184
 msgid ""
 "Enforces the clients to connect to ownCloud via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:185
+#: templates/admin.php:187
 msgid ""
 "Please connect to this ownCloud instance via HTTPS to enable or disable the "
 "SSL enforcement."
 msgstr ""
 
-#: templates/admin.php:195
+#: templates/admin.php:197
 msgid "Log"
 msgstr "Записник"
 
-#: templates/admin.php:196
+#: templates/admin.php:198
 msgid "Log level"
 msgstr "Ниво на логирање"
 
-#: templates/admin.php:227
+#: templates/admin.php:229
 msgid "More"
 msgstr "Повеќе"
 
-#: templates/admin.php:228
+#: templates/admin.php:230
 msgid "Less"
 msgstr "Помалку"
 
-#: templates/admin.php:235 templates/personal.php:116
+#: templates/admin.php:236 templates/personal.php:116
 msgid "Version"
 msgstr "Верзија"
 
-#: templates/admin.php:237 templates/personal.php:119
+#: templates/admin.php:240 templates/personal.php:119
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -386,76 +386,79 @@ msgstr ""
 msgid "Commercial Support"
 msgstr "Комерцијална подршка"
 
-#: templates/personal.php:9
+#: templates/personal.php:10
 msgid "Get the apps to sync your files"
 msgstr ""
 
-#: templates/personal.php:20
+#: templates/personal.php:21
 msgid "Show First Run Wizard again"
 msgstr ""
 
-#: templates/personal.php:28
+#: templates/personal.php:29
 #, php-format
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "Имате искористено <strong>%s</strong> од достапните <strong>%s</strong>"
 
-#: templates/personal.php:40 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:41 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "Лозинка"
 
-#: templates/personal.php:41
+#: templates/personal.php:42
 msgid "Your password was changed"
 msgstr "Вашата лозинка беше променета."
 
-#: templates/personal.php:42
+#: templates/personal.php:43
 msgid "Unable to change your password"
 msgstr "Вашата лозинка неможе да се смени"
 
-#: templates/personal.php:43
+#: templates/personal.php:44
 msgid "Current password"
 msgstr "Моментална лозинка"
 
-#: templates/personal.php:45
+#: templates/personal.php:46
 msgid "New password"
 msgstr "Нова лозинка"
 
-#: templates/personal.php:47
+#: templates/personal.php:48
 msgid "Change password"
 msgstr "Смени лозинка"
 
-#: templates/personal.php:59 templates/users.php:85
+#: templates/personal.php:60 templates/users.php:85
 msgid "Display Name"
 msgstr ""
 
-#: templates/personal.php:74
+#: templates/personal.php:75
 msgid "Email"
 msgstr "Е-пошта"
 
-#: templates/personal.php:76
+#: templates/personal.php:77
 msgid "Your email address"
 msgstr "Вашата адреса за е-пошта"
 
-#: templates/personal.php:77
+#: templates/personal.php:78
 msgid "Fill in an email address to enable password recovery"
 msgstr "Пополни ја адресата за е-пошта за да може да ја обновуваш лозинката"
 
-#: templates/personal.php:86 templates/personal.php:87
+#: templates/personal.php:87 templates/personal.php:88
 msgid "Language"
 msgstr "Јазик"
 
-#: templates/personal.php:99
+#: templates/personal.php:100
 msgid "Help translate"
 msgstr "Помогни во преводот"
 
-#: templates/personal.php:105
+#: templates/personal.php:106
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:107
-msgid "Use this address to connect to your ownCloud in your file manager"
-msgstr "Користете ја оваа адреса да "
+#: templates/personal.php:108
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
+"target=\"_blank\">access your Files via WebDAV</a>"
+msgstr ""
 
-#: templates/users.php:21 templates/users.php:84
+#: templates/users.php:21
 msgid "Login Name"
 msgstr ""
 
@@ -485,6 +488,10 @@ msgstr ""
 msgid "Other"
 msgstr "Останато"
 
+#: templates/users.php:84
+msgid "Username"
+msgstr "Корисничко име"
+
 #: templates/users.php:91
 msgid "Storage"
 msgstr ""
diff --git a/l10n/mk/user_ldap.po b/l10n/mk/user_ldap.po
index ff3d3ab4a1425643aee9f0284dcaa192709fd44a..bc4940a44012ab4246e89fce41e0d27088caf380 100644
--- a/l10n/mk/user_ldap.po
+++ b/l10n/mk/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:16+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/ml_IN/core.po b/l10n/ml_IN/core.po
new file mode 100644
index 0000000000000000000000000000000000000000..11842cfad4696b2a1063bca8e98324b280e98e5f
--- /dev/null
+++ b/l10n/ml_IN/core.po
@@ -0,0 +1,628 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2013-07-06 02:02+0200\n"
+"PO-Revision-Date: 2013-07-06 00:02+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"Language-Team: Malayalam (India) (http://www.transifex.com/projects/p/owncloud/language/ml_IN/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ml_IN\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ajax/share.php:97
+#, php-format
+msgid "%s shared »%s« with you"
+msgstr ""
+
+#: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
+msgid "Category type not provided."
+msgstr ""
+
+#: ajax/vcategories/add.php:30
+msgid "No category to add?"
+msgstr ""
+
+#: ajax/vcategories/add.php:37
+#, php-format
+msgid "This category already exists: %s"
+msgstr ""
+
+#: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27
+#: ajax/vcategories/favorites.php:24
+#: ajax/vcategories/removeFromFavorites.php:26
+msgid "Object type not provided."
+msgstr ""
+
+#: ajax/vcategories/addToFavorites.php:30
+#: ajax/vcategories/removeFromFavorites.php:30
+#, php-format
+msgid "%s ID not provided."
+msgstr ""
+
+#: ajax/vcategories/addToFavorites.php:35
+#, php-format
+msgid "Error adding %s to favorites."
+msgstr ""
+
+#: ajax/vcategories/delete.php:35 js/oc-vcategories.js:136
+msgid "No categories selected for deletion."
+msgstr ""
+
+#: ajax/vcategories/removeFromFavorites.php:35
+#, php-format
+msgid "Error removing %s from favorites."
+msgstr ""
+
+#: js/config.php:32
+msgid "Sunday"
+msgstr ""
+
+#: js/config.php:33
+msgid "Monday"
+msgstr ""
+
+#: js/config.php:34
+msgid "Tuesday"
+msgstr ""
+
+#: js/config.php:35
+msgid "Wednesday"
+msgstr ""
+
+#: js/config.php:36
+msgid "Thursday"
+msgstr ""
+
+#: js/config.php:37
+msgid "Friday"
+msgstr ""
+
+#: js/config.php:38
+msgid "Saturday"
+msgstr ""
+
+#: js/config.php:43
+msgid "January"
+msgstr ""
+
+#: js/config.php:44
+msgid "February"
+msgstr ""
+
+#: js/config.php:45
+msgid "March"
+msgstr ""
+
+#: js/config.php:46
+msgid "April"
+msgstr ""
+
+#: js/config.php:47
+msgid "May"
+msgstr ""
+
+#: js/config.php:48
+msgid "June"
+msgstr ""
+
+#: js/config.php:49
+msgid "July"
+msgstr ""
+
+#: js/config.php:50
+msgid "August"
+msgstr ""
+
+#: js/config.php:51
+msgid "September"
+msgstr ""
+
+#: js/config.php:52
+msgid "October"
+msgstr ""
+
+#: js/config.php:53
+msgid "November"
+msgstr ""
+
+#: js/config.php:54
+msgid "December"
+msgstr ""
+
+#: js/js.js:289
+msgid "Settings"
+msgstr ""
+
+#: js/js.js:721
+msgid "seconds ago"
+msgstr ""
+
+#: js/js.js:722
+msgid "1 minute ago"
+msgstr ""
+
+#: js/js.js:723
+msgid "{minutes} minutes ago"
+msgstr ""
+
+#: js/js.js:724
+msgid "1 hour ago"
+msgstr ""
+
+#: js/js.js:725
+msgid "{hours} hours ago"
+msgstr ""
+
+#: js/js.js:726
+msgid "today"
+msgstr ""
+
+#: js/js.js:727
+msgid "yesterday"
+msgstr ""
+
+#: js/js.js:728
+msgid "{days} days ago"
+msgstr ""
+
+#: js/js.js:729
+msgid "last month"
+msgstr ""
+
+#: js/js.js:730
+msgid "{months} months ago"
+msgstr ""
+
+#: js/js.js:731
+msgid "months ago"
+msgstr ""
+
+#: js/js.js:732
+msgid "last year"
+msgstr ""
+
+#: js/js.js:733
+msgid "years ago"
+msgstr ""
+
+#: js/oc-dialogs.js:117
+msgid "Choose"
+msgstr ""
+
+#: js/oc-dialogs.js:122
+msgid "Cancel"
+msgstr ""
+
+#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+msgid "Error loading file picker template"
+msgstr ""
+
+#: js/oc-dialogs.js:164
+msgid "Yes"
+msgstr ""
+
+#: js/oc-dialogs.js:172
+msgid "No"
+msgstr ""
+
+#: js/oc-dialogs.js:185
+msgid "Ok"
+msgstr ""
+
+#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
+#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
+msgid "The object type is not specified."
+msgstr ""
+
+#: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
+#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
+#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
+#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:620
+#: js/share.js:632
+msgid "Error"
+msgstr ""
+
+#: js/oc-vcategories.js:179
+msgid "The app name is not specified."
+msgstr ""
+
+#: js/oc-vcategories.js:194
+msgid "The required file {file} is not installed!"
+msgstr ""
+
+#: js/share.js:30 js/share.js:45 js/share.js:87
+msgid "Shared"
+msgstr ""
+
+#: js/share.js:90
+msgid "Share"
+msgstr ""
+
+#: js/share.js:125 js/share.js:660
+msgid "Error while sharing"
+msgstr ""
+
+#: js/share.js:136
+msgid "Error while unsharing"
+msgstr ""
+
+#: js/share.js:143
+msgid "Error while changing permissions"
+msgstr ""
+
+#: js/share.js:152
+msgid "Shared with you and the group {group} by {owner}"
+msgstr ""
+
+#: js/share.js:154
+msgid "Shared with you by {owner}"
+msgstr ""
+
+#: js/share.js:172
+msgid "Share with"
+msgstr ""
+
+#: js/share.js:177
+msgid "Share with link"
+msgstr ""
+
+#: js/share.js:180
+msgid "Password protect"
+msgstr ""
+
+#: js/share.js:182 templates/installation.php:54 templates/login.php:26
+msgid "Password"
+msgstr ""
+
+#: js/share.js:187
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:191
+msgid "Email link to person"
+msgstr ""
+
+#: js/share.js:192
+msgid "Send"
+msgstr ""
+
+#: js/share.js:197
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:198
+msgid "Expiration date"
+msgstr ""
+
+#: js/share.js:230
+msgid "Share via email:"
+msgstr ""
+
+#: js/share.js:232
+msgid "No people found"
+msgstr ""
+
+#: js/share.js:270
+msgid "Resharing is not allowed"
+msgstr ""
+
+#: js/share.js:306
+msgid "Shared in {item} with {user}"
+msgstr ""
+
+#: js/share.js:327
+msgid "Unshare"
+msgstr ""
+
+#: js/share.js:339
+msgid "can edit"
+msgstr ""
+
+#: js/share.js:341
+msgid "access control"
+msgstr ""
+
+#: js/share.js:344
+msgid "create"
+msgstr ""
+
+#: js/share.js:347
+msgid "update"
+msgstr ""
+
+#: js/share.js:350
+msgid "delete"
+msgstr ""
+
+#: js/share.js:353
+msgid "share"
+msgstr ""
+
+#: js/share.js:387 js/share.js:607
+msgid "Password protected"
+msgstr ""
+
+#: js/share.js:620
+msgid "Error unsetting expiration date"
+msgstr ""
+
+#: js/share.js:632
+msgid "Error setting expiration date"
+msgstr ""
+
+#: js/share.js:647
+msgid "Sending ..."
+msgstr ""
+
+#: js/share.js:658
+msgid "Email sent"
+msgstr ""
+
+#: js/update.js:14
+msgid ""
+"The update was unsuccessful. Please report this issue to the <a "
+"href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
+"community</a>."
+msgstr ""
+
+#: js/update.js:18
+msgid "The update was successful. Redirecting you to ownCloud now."
+msgstr ""
+
+#: lostpassword/controller.php:60
+msgid "ownCloud password reset"
+msgstr ""
+
+#: lostpassword/templates/email.php:2
+msgid "Use the following link to reset your password: {link}"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:4
+msgid ""
+"The link to reset your password has been sent to your email.<br>If you do "
+"not receive it within a reasonable amount of time, check your spam/junk "
+"folders.<br>If it is not there ask your local administrator ."
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:12
+msgid "Request failed!<br>Did you make sure your email/username was right?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:15
+msgid "You will receive a link to reset your password via Email."
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
+#: templates/login.php:19
+msgid "Username"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:22
+msgid ""
+"Your files are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:24
+msgid "Yes, I really want to reset my password now"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:27
+msgid "Request reset"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:4
+msgid "Your password was reset"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:5
+msgid "To login page"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:8
+msgid "New password"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:11
+msgid "Reset password"
+msgstr ""
+
+#: strings.php:5
+msgid "Personal"
+msgstr ""
+
+#: strings.php:6
+msgid "Users"
+msgstr ""
+
+#: strings.php:7
+msgid "Apps"
+msgstr ""
+
+#: strings.php:8
+msgid "Admin"
+msgstr ""
+
+#: strings.php:9
+msgid "Help"
+msgstr ""
+
+#: templates/403.php:12
+msgid "Access forbidden"
+msgstr ""
+
+#: templates/404.php:12
+msgid "Cloud not found"
+msgstr ""
+
+#: templates/altmail.php:4
+#, php-format
+msgid ""
+"Hey there,\n"
+"\n"
+"just letting you know that %s shared %s with you.\n"
+"View it: %s\n"
+"\n"
+"Cheers!"
+msgstr ""
+
+#: templates/edit_categories_dialog.php:4
+msgid "Edit categories"
+msgstr ""
+
+#: templates/edit_categories_dialog.php:16
+msgid "Add"
+msgstr ""
+
+#: templates/installation.php:24 templates/installation.php:31
+#: templates/installation.php:38
+msgid "Security Warning"
+msgstr ""
+
+#: templates/installation.php:25
+msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
+msgstr ""
+
+#: templates/installation.php:26
+msgid "Please update your PHP installation to use ownCloud securely."
+msgstr ""
+
+#: templates/installation.php:32
+msgid ""
+"No secure random number generator is available, please enable the PHP "
+"OpenSSL extension."
+msgstr ""
+
+#: templates/installation.php:33
+msgid ""
+"Without a secure random number generator an attacker may be able to predict "
+"password reset tokens and take over your account."
+msgstr ""
+
+#: templates/installation.php:39
+msgid ""
+"Your data directory and files are probably accessible from the internet "
+"because the .htaccess file does not work."
+msgstr ""
+
+#: templates/installation.php:40
+msgid ""
+"For information how to properly configure your server, please see the <a "
+"href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" "
+"target=\"_blank\">documentation</a>."
+msgstr ""
+
+#: templates/installation.php:44
+msgid "Create an <strong>admin account</strong>"
+msgstr ""
+
+#: templates/installation.php:62
+msgid "Advanced"
+msgstr ""
+
+#: templates/installation.php:64
+msgid "Data folder"
+msgstr ""
+
+#: templates/installation.php:74
+msgid "Configure the database"
+msgstr ""
+
+#: templates/installation.php:79 templates/installation.php:91
+#: templates/installation.php:102 templates/installation.php:113
+#: templates/installation.php:125
+msgid "will be used"
+msgstr ""
+
+#: templates/installation.php:137
+msgid "Database user"
+msgstr ""
+
+#: templates/installation.php:144
+msgid "Database password"
+msgstr ""
+
+#: templates/installation.php:149
+msgid "Database name"
+msgstr ""
+
+#: templates/installation.php:159
+msgid "Database tablespace"
+msgstr ""
+
+#: templates/installation.php:166
+msgid "Database host"
+msgstr ""
+
+#: templates/installation.php:172
+msgid "Finish setup"
+msgstr ""
+
+#: templates/layout.user.php:43
+#, php-format
+msgid "%s is available. Get more information on how to update."
+msgstr ""
+
+#: templates/layout.user.php:68
+msgid "Log out"
+msgstr ""
+
+#: templates/login.php:9
+msgid "Automatic logon rejected!"
+msgstr ""
+
+#: templates/login.php:10
+msgid ""
+"If you did not change your password recently, your account may be "
+"compromised!"
+msgstr ""
+
+#: templates/login.php:12
+msgid "Please change your password to secure your account again."
+msgstr ""
+
+#: templates/login.php:34
+msgid "Lost your password?"
+msgstr ""
+
+#: templates/login.php:39
+msgid "remember"
+msgstr ""
+
+#: templates/login.php:41
+msgid "Log in"
+msgstr ""
+
+#: templates/login.php:47
+msgid "Alternative Logins"
+msgstr ""
+
+#: templates/mail.php:16
+#, php-format
+msgid ""
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
+"href=\"%s\">View it!</a><br><br>Cheers!"
+msgstr ""
+
+#: templates/part.pagenavi.php:3
+msgid "prev"
+msgstr ""
+
+#: templates/part.pagenavi.php:20
+msgid "next"
+msgstr ""
+
+#: templates/update.php:3
+#, php-format
+msgid "Updating ownCloud to version %s, this may take a while."
+msgstr ""
diff --git a/l10n/ml_IN/files.po b/l10n/ml_IN/files.po
new file mode 100644
index 0000000000000000000000000000000000000000..90706b4f0b6bb0be4fc63d9b43386d350128303d
--- /dev/null
+++ b/l10n/ml_IN/files.po
@@ -0,0 +1,348 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2013-07-06 02:01+0200\n"
+"PO-Revision-Date: 2013-07-05 08:25+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"Language-Team: Malayalam (India) (http://www.transifex.com/projects/p/owncloud/language/ml_IN/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ml_IN\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ajax/move.php:17
+#, php-format
+msgid "Could not move %s - File with this name already exists"
+msgstr ""
+
+#: ajax/move.php:27 ajax/move.php:30
+#, php-format
+msgid "Could not move %s"
+msgstr ""
+
+#: ajax/upload.php:16 ajax/upload.php:36 ajax/upload.php:48
+msgid "Unable to set upload directory."
+msgstr ""
+
+#: ajax/upload.php:22
+msgid "Invalid Token"
+msgstr ""
+
+#: ajax/upload.php:62
+msgid "No file was uploaded. Unknown error"
+msgstr ""
+
+#: ajax/upload.php:69
+msgid "There is no error, the file uploaded with success"
+msgstr ""
+
+#: ajax/upload.php:70
+msgid ""
+"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
+msgstr ""
+
+#: ajax/upload.php:72
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form"
+msgstr ""
+
+#: ajax/upload.php:73
+msgid "The uploaded file was only partially uploaded"
+msgstr ""
+
+#: ajax/upload.php:74
+msgid "No file was uploaded"
+msgstr ""
+
+#: ajax/upload.php:75
+msgid "Missing a temporary folder"
+msgstr ""
+
+#: ajax/upload.php:76
+msgid "Failed to write to disk"
+msgstr ""
+
+#: ajax/upload.php:94
+msgid "Not enough storage available"
+msgstr ""
+
+#: ajax/upload.php:126
+msgid "Invalid directory."
+msgstr ""
+
+#: appinfo/app.php:12
+msgid "Files"
+msgstr ""
+
+#: js/file-upload.js:11
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/file-upload.js:24
+msgid "Not enough space available"
+msgstr ""
+
+#: js/file-upload.js:64
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/file-upload.js:167 js/files.js:266
+msgid ""
+"File upload is in progress. Leaving the page now will cancel the upload."
+msgstr ""
+
+#: js/file-upload.js:233 js/files.js:339
+msgid "URL cannot be empty."
+msgstr ""
+
+#: js/file-upload.js:238 lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr ""
+
+#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
+#: js/files.js:693 js/files.js:731
+msgid "Error"
+msgstr ""
+
+#: js/fileactions.js:116
+msgid "Share"
+msgstr ""
+
+#: js/fileactions.js:126
+msgid "Delete permanently"
+msgstr ""
+
+#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
+msgid "Delete"
+msgstr ""
+
+#: js/fileactions.js:194
+msgid "Rename"
+msgstr ""
+
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:464
+msgid "Pending"
+msgstr ""
+
+#: js/filelist.js:302 js/filelist.js:304
+msgid "{new_name} already exists"
+msgstr ""
+
+#: js/filelist.js:302 js/filelist.js:304
+msgid "replace"
+msgstr ""
+
+#: js/filelist.js:302
+msgid "suggest name"
+msgstr ""
+
+#: js/filelist.js:302 js/filelist.js:304
+msgid "cancel"
+msgstr ""
+
+#: js/filelist.js:349
+msgid "replaced {new_name} with {old_name}"
+msgstr ""
+
+#: js/filelist.js:349
+msgid "undo"
+msgstr ""
+
+#: js/filelist.js:374
+msgid "perform delete operation"
+msgstr ""
+
+#: js/filelist.js:456
+msgid "1 file uploading"
+msgstr ""
+
+#: js/filelist.js:459 js/filelist.js:517
+msgid "files uploading"
+msgstr ""
+
+#: js/files.js:52
+msgid "'.' is an invalid file name."
+msgstr ""
+
+#: js/files.js:56
+msgid "File name cannot be empty."
+msgstr ""
+
+#: js/files.js:64
+msgid ""
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
+"allowed."
+msgstr ""
+
+#: js/files.js:78
+msgid "Your storage is full, files can not be updated or synced anymore!"
+msgstr ""
+
+#: js/files.js:82
+msgid "Your storage is almost full ({usedSpacePercent}%)"
+msgstr ""
+
+#: js/files.js:231
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
+msgstr ""
+
+#: js/files.js:344
+msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
+msgstr ""
+
+#: js/files.js:744 templates/index.php:69
+msgid "Name"
+msgstr ""
+
+#: js/files.js:745 templates/index.php:80
+msgid "Size"
+msgstr ""
+
+#: js/files.js:746 templates/index.php:82
+msgid "Modified"
+msgstr ""
+
+#: js/files.js:765
+msgid "1 folder"
+msgstr ""
+
+#: js/files.js:767
+msgid "{count} folders"
+msgstr ""
+
+#: js/files.js:775
+msgid "1 file"
+msgstr ""
+
+#: js/files.js:777
+msgid "{count} files"
+msgstr ""
+
+#: lib/app.php:73
+#, php-format
+msgid "%s could not be renamed"
+msgstr ""
+
+#: lib/helper.php:11 templates/index.php:18
+msgid "Upload"
+msgstr ""
+
+#: templates/admin.php:5
+msgid "File handling"
+msgstr ""
+
+#: templates/admin.php:7
+msgid "Maximum upload size"
+msgstr ""
+
+#: templates/admin.php:10
+msgid "max. possible: "
+msgstr ""
+
+#: templates/admin.php:15
+msgid "Needed for multi-file and folder downloads."
+msgstr ""
+
+#: templates/admin.php:17
+msgid "Enable ZIP-download"
+msgstr ""
+
+#: templates/admin.php:20
+msgid "0 is unlimited"
+msgstr ""
+
+#: templates/admin.php:22
+msgid "Maximum input size for ZIP files"
+msgstr ""
+
+#: templates/admin.php:26
+msgid "Save"
+msgstr ""
+
+#: templates/index.php:7
+msgid "New"
+msgstr ""
+
+#: templates/index.php:10
+msgid "Text file"
+msgstr ""
+
+#: templates/index.php:12
+msgid "Folder"
+msgstr ""
+
+#: templates/index.php:14
+msgid "From link"
+msgstr ""
+
+#: templates/index.php:42
+msgid "Deleted files"
+msgstr ""
+
+#: templates/index.php:48
+msgid "Cancel upload"
+msgstr ""
+
+#: templates/index.php:54
+msgid "You don’t have write permissions here."
+msgstr ""
+
+#: templates/index.php:61
+msgid "Nothing in here. Upload something!"
+msgstr ""
+
+#: templates/index.php:75
+msgid "Download"
+msgstr ""
+
+#: templates/index.php:87 templates/index.php:88
+msgid "Unshare"
+msgstr ""
+
+#: templates/index.php:107
+msgid "Upload too large"
+msgstr ""
+
+#: templates/index.php:109
+msgid ""
+"The files you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+#: templates/index.php:114
+msgid "Files are being scanned, please wait."
+msgstr ""
+
+#: templates/index.php:117
+msgid "Current scanning"
+msgstr ""
+
+#: templates/part.list.php:78
+msgid "directory"
+msgstr ""
+
+#: templates/part.list.php:80
+msgid "directories"
+msgstr ""
+
+#: templates/part.list.php:89
+msgid "file"
+msgstr ""
+
+#: templates/part.list.php:91
+msgid "files"
+msgstr ""
+
+#: templates/upgrade.php:2
+msgid "Upgrading filesystem cache..."
+msgstr ""
diff --git a/l10n/ml_IN/files_encryption.po b/l10n/ml_IN/files_encryption.po
new file mode 100644
index 0000000000000000000000000000000000000000..788f7259d4f8be447d4e2f7fc054a28dae050549
--- /dev/null
+++ b/l10n/ml_IN/files_encryption.po
@@ -0,0 +1,172 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2013-07-06 02:01+0200\n"
+"PO-Revision-Date: 2013-07-05 08:25+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"Language-Team: Malayalam (India) (http://www.transifex.com/projects/p/owncloud/language/ml_IN/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ml_IN\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ajax/adminrecovery.php:29
+msgid "Recovery key successfully enabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:34
+msgid ""
+"Could not enable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/adminrecovery.php:48
+msgid "Recovery key successfully disabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:53
+msgid ""
+"Could not disable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr ""
+
+#: ajax/updatePrivateKeyPassword.php:51
+msgid "Private key password successfully updated."
+msgstr ""
+
+#: ajax/updatePrivateKeyPassword.php:53
+msgid ""
+"Could not update the private key password. Maybe the old password was not "
+"correct."
+msgstr ""
+
+#: files/error.php:7
+msgid ""
+"Your private key is not valid! Likely your password was changed outside the "
+"ownCloud system (e.g. your corporate directory). You can update your private"
+" key password in your personal settings to recover access to your encrypted "
+"files."
+msgstr ""
+
+#: hooks/hooks.php:44
+msgid "Missing requirements."
+msgstr ""
+
+#: hooks/hooks.php:45
+msgid ""
+"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL "
+"PHP extension is enabled and configured properly. For now, the encryption "
+"app has been disabled."
+msgstr ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr ""
+
+#: templates/invalid_private_key.php:5
+msgid ""
+"Your private key is not valid! Maybe the your password was changed from "
+"outside."
+msgstr ""
+
+#: templates/invalid_private_key.php:7
+msgid "You can unlock your private key in your "
+msgstr ""
+
+#: templates/invalid_private_key.php:7
+msgid "personal settings"
+msgstr ""
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
+msgid "Encryption"
+msgstr ""
+
+#: templates/settings-admin.php:10
+msgid ""
+"Enable recovery key (allow to recover users files in case of password loss):"
+msgstr ""
+
+#: templates/settings-admin.php:14
+msgid "Recovery key password"
+msgstr ""
+
+#: templates/settings-admin.php:21 templates/settings-personal.php:54
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:29 templates/settings-personal.php:62
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:34
+msgid "Change recovery key password:"
+msgstr ""
+
+#: templates/settings-admin.php:41
+msgid "Old Recovery key password"
+msgstr ""
+
+#: templates/settings-admin.php:48
+msgid "New Recovery key password"
+msgstr ""
+
+#: templates/settings-admin.php:53
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:11
+msgid "Your private key password no longer match your log-in password:"
+msgstr ""
+
+#: templates/settings-personal.php:14
+msgid "Set your old private key password to your current log-in password."
+msgstr ""
+
+#: templates/settings-personal.php:16
+msgid ""
+" If you don't remember your old password you can ask your administrator to "
+"recover your files."
+msgstr ""
+
+#: templates/settings-personal.php:24
+msgid "Old log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:30
+msgid "Current log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:35
+msgid "Update Private Key Password"
+msgstr ""
+
+#: templates/settings-personal.php:45
+msgid "Enable password recovery:"
+msgstr ""
+
+#: templates/settings-personal.php:47
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files in case of password loss"
+msgstr ""
+
+#: templates/settings-personal.php:63
+msgid "File recovery settings updated"
+msgstr ""
+
+#: templates/settings-personal.php:64
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/ml_IN/files_external.po b/l10n/ml_IN/files_external.po
new file mode 100644
index 0000000000000000000000000000000000000000..1b638a2af4f54a5584d65a90290e3a0a2f762c27
--- /dev/null
+++ b/l10n/ml_IN/files_external.po
@@ -0,0 +1,123 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2013-07-06 02:01+0200\n"
+"PO-Revision-Date: 2013-07-05 08:25+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"Language-Team: Malayalam (India) (http://www.transifex.com/projects/p/owncloud/language/ml_IN/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ml_IN\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: js/dropbox.js:7 js/dropbox.js:28 js/google.js:16 js/google.js:34
+msgid "Access granted"
+msgstr ""
+
+#: js/dropbox.js:30 js/dropbox.js:96 js/dropbox.js:102
+msgid "Error configuring Dropbox storage"
+msgstr ""
+
+#: js/dropbox.js:65 js/google.js:66
+msgid "Grant access"
+msgstr ""
+
+#: js/dropbox.js:101
+msgid "Please provide a valid Dropbox app key and secret."
+msgstr ""
+
+#: js/google.js:36 js/google.js:93
+msgid "Error configuring Google Drive storage"
+msgstr ""
+
+#: lib/config.php:431
+msgid ""
+"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
+"is not possible. Please ask your system administrator to install it."
+msgstr ""
+
+#: lib/config.php:434
+msgid ""
+"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
+" of FTP shares is not possible. Please ask your system administrator to "
+"install it."
+msgstr ""
+
+#: lib/config.php:437
+msgid ""
+"<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
+"Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
+"your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:3
+msgid "External Storage"
+msgstr ""
+
+#: templates/settings.php:9 templates/settings.php:28
+msgid "Folder name"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "External storage"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Configuration"
+msgstr ""
+
+#: templates/settings.php:12
+msgid "Options"
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Applicable"
+msgstr ""
+
+#: templates/settings.php:33
+msgid "Add storage"
+msgstr ""
+
+#: templates/settings.php:90
+msgid "None set"
+msgstr ""
+
+#: templates/settings.php:91
+msgid "All Users"
+msgstr ""
+
+#: templates/settings.php:92
+msgid "Groups"
+msgstr ""
+
+#: templates/settings.php:100
+msgid "Users"
+msgstr ""
+
+#: templates/settings.php:113 templates/settings.php:114
+#: templates/settings.php:149 templates/settings.php:150
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:129
+msgid "Enable User External Storage"
+msgstr ""
+
+#: templates/settings.php:130
+msgid "Allow users to mount their own external storage"
+msgstr ""
+
+#: templates/settings.php:141
+msgid "SSL root certificates"
+msgstr ""
+
+#: templates/settings.php:159
+msgid "Import Root Certificate"
+msgstr ""
diff --git a/l10n/ml_IN/files_sharing.po b/l10n/ml_IN/files_sharing.po
new file mode 100644
index 0000000000000000000000000000000000000000..dbf8befe5f96c6b6763704053d0e3ca4e6bbb360
--- /dev/null
+++ b/l10n/ml_IN/files_sharing.po
@@ -0,0 +1,56 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2013-07-06 02:01+0200\n"
+"PO-Revision-Date: 2013-07-05 08:25+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"Language-Team: Malayalam (India) (http://www.transifex.com/projects/p/owncloud/language/ml_IN/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ml_IN\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: templates/authenticate.php:4
+msgid "The password is wrong. Try again."
+msgstr ""
+
+#: templates/authenticate.php:7
+msgid "Password"
+msgstr ""
+
+#: templates/authenticate.php:9
+msgid "Submit"
+msgstr ""
+
+#: templates/public.php:17
+#, php-format
+msgid "%s shared the folder %s with you"
+msgstr ""
+
+#: templates/public.php:20
+#, php-format
+msgid "%s shared the file %s with you"
+msgstr ""
+
+#: templates/public.php:28 templates/public.php:90
+msgid "Download"
+msgstr ""
+
+#: templates/public.php:45 templates/public.php:48
+msgid "Upload"
+msgstr ""
+
+#: templates/public.php:58
+msgid "Cancel upload"
+msgstr ""
+
+#: templates/public.php:87
+msgid "No preview available for"
+msgstr ""
diff --git a/l10n/ml_IN/files_trashbin.po b/l10n/ml_IN/files_trashbin.po
new file mode 100644
index 0000000000000000000000000000000000000000..6aae4c873145463fa1debcfec1f98abc471a3598
--- /dev/null
+++ b/l10n/ml_IN/files_trashbin.po
@@ -0,0 +1,84 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2013-07-06 02:01+0200\n"
+"PO-Revision-Date: 2013-07-05 08:25+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"Language-Team: Malayalam (India) (http://www.transifex.com/projects/p/owncloud/language/ml_IN/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ml_IN\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ajax/delete.php:42
+#, php-format
+msgid "Couldn't delete %s permanently"
+msgstr ""
+
+#: ajax/undelete.php:42
+#, php-format
+msgid "Couldn't restore %s"
+msgstr ""
+
+#: js/trash.js:7 js/trash.js:97
+msgid "perform restore operation"
+msgstr ""
+
+#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
+msgid "Error"
+msgstr ""
+
+#: js/trash.js:34
+msgid "delete file permanently"
+msgstr ""
+
+#: js/trash.js:123
+msgid "Delete permanently"
+msgstr ""
+
+#: js/trash.js:176 templates/index.php:17
+msgid "Name"
+msgstr ""
+
+#: js/trash.js:177 templates/index.php:27
+msgid "Deleted"
+msgstr ""
+
+#: js/trash.js:186
+msgid "1 folder"
+msgstr ""
+
+#: js/trash.js:188
+msgid "{count} folders"
+msgstr ""
+
+#: js/trash.js:196
+msgid "1 file"
+msgstr ""
+
+#: js/trash.js:198
+msgid "{count} files"
+msgstr ""
+
+#: templates/index.php:9
+msgid "Nothing in here. Your trash bin is empty!"
+msgstr ""
+
+#: templates/index.php:20 templates/index.php:22
+msgid "Restore"
+msgstr ""
+
+#: templates/index.php:30 templates/index.php:31
+msgid "Delete"
+msgstr ""
+
+#: templates/part.breadcrumb.php:9
+msgid "Deleted Files"
+msgstr ""
diff --git a/l10n/ml_IN/files_versions.po b/l10n/ml_IN/files_versions.po
new file mode 100644
index 0000000000000000000000000000000000000000..7fbfa21dcc72451d15a9e7704408691c96e4d47c
--- /dev/null
+++ b/l10n/ml_IN/files_versions.po
@@ -0,0 +1,57 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2013-07-06 02:01+0200\n"
+"PO-Revision-Date: 2013-07-05 08:25+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"Language-Team: Malayalam (India) (http://www.transifex.com/projects/p/owncloud/language/ml_IN/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ml_IN\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ajax/rollbackVersion.php:15
+#, php-format
+msgid "Could not revert: %s"
+msgstr ""
+
+#: history.php:40
+msgid "success"
+msgstr ""
+
+#: history.php:42
+#, php-format
+msgid "File %s was reverted to version %s"
+msgstr ""
+
+#: history.php:49
+msgid "failure"
+msgstr ""
+
+#: history.php:51
+#, php-format
+msgid "File %s could not be reverted to version %s"
+msgstr ""
+
+#: history.php:69
+msgid "No old versions available"
+msgstr ""
+
+#: history.php:74
+msgid "No path specified"
+msgstr ""
+
+#: js/versions.js:6
+msgid "Versions"
+msgstr ""
+
+#: templates/history.php:20
+msgid "Revert a file to a previous version by clicking on its revert button"
+msgstr ""
diff --git a/l10n/ml_IN/lib.po b/l10n/ml_IN/lib.po
new file mode 100644
index 0000000000000000000000000000000000000000..d4532ad9a440e2e69629474194a918867afd7efd
--- /dev/null
+++ b/l10n/ml_IN/lib.po
@@ -0,0 +1,247 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2013-07-06 02:02+0200\n"
+"PO-Revision-Date: 2013-07-05 08:25+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"Language-Team: Malayalam (India) (http://www.transifex.com/projects/p/owncloud/language/ml_IN/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ml_IN\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: app.php:360
+msgid "Help"
+msgstr ""
+
+#: app.php:373
+msgid "Personal"
+msgstr ""
+
+#: app.php:384
+msgid "Settings"
+msgstr ""
+
+#: app.php:396
+msgid "Users"
+msgstr ""
+
+#: app.php:409
+msgid "Apps"
+msgstr ""
+
+#: app.php:417
+msgid "Admin"
+msgstr ""
+
+#: defaults.php:33
+msgid "web services under your control"
+msgstr ""
+
+#: files.php:210
+msgid "ZIP download is turned off."
+msgstr ""
+
+#: files.php:211
+msgid "Files need to be downloaded one by one."
+msgstr ""
+
+#: files.php:212 files.php:245
+msgid "Back to Files"
+msgstr ""
+
+#: files.php:242
+msgid "Selected files too large to generate zip file."
+msgstr ""
+
+#: helper.php:236
+msgid "couldn't be determined"
+msgstr ""
+
+#: json.php:28
+msgid "Application is not enabled"
+msgstr ""
+
+#: json.php:39 json.php:62 json.php:73
+msgid "Authentication error"
+msgstr ""
+
+#: json.php:51
+msgid "Token expired. Please reload page."
+msgstr ""
+
+#: search/provider/file.php:17 search/provider/file.php:35
+msgid "Files"
+msgstr ""
+
+#: search/provider/file.php:26 search/provider/file.php:33
+msgid "Text"
+msgstr ""
+
+#: search/provider/file.php:29
+msgid "Images"
+msgstr ""
+
+#: setup/abstractdatabase.php:22
+#, php-format
+msgid "%s enter the database username."
+msgstr ""
+
+#: setup/abstractdatabase.php:25
+#, php-format
+msgid "%s enter the database name."
+msgstr ""
+
+#: setup/abstractdatabase.php:28
+#, php-format
+msgid "%s you may not use dots in the database name"
+msgstr ""
+
+#: setup/mssql.php:20
+#, php-format
+msgid "MS SQL username and/or password not valid: %s"
+msgstr ""
+
+#: setup/mssql.php:21 setup/mysql.php:13 setup/oci.php:114
+#: setup/postgresql.php:24 setup/postgresql.php:70
+msgid "You need to enter either an existing account or the administrator."
+msgstr ""
+
+#: setup/mysql.php:12
+msgid "MySQL username and/or password not valid"
+msgstr ""
+
+#: setup/mysql.php:67 setup/oci.php:54 setup/oci.php:121 setup/oci.php:147
+#: setup/oci.php:154 setup/oci.php:165 setup/oci.php:172 setup/oci.php:181
+#: setup/oci.php:189 setup/oci.php:198 setup/oci.php:204
+#: setup/postgresql.php:89 setup/postgresql.php:98 setup/postgresql.php:115
+#: setup/postgresql.php:125 setup/postgresql.php:134
+#, php-format
+msgid "DB Error: \"%s\""
+msgstr ""
+
+#: setup/mysql.php:68 setup/oci.php:55 setup/oci.php:122 setup/oci.php:148
+#: setup/oci.php:155 setup/oci.php:166 setup/oci.php:182 setup/oci.php:190
+#: setup/oci.php:199 setup/postgresql.php:90 setup/postgresql.php:99
+#: setup/postgresql.php:116 setup/postgresql.php:126 setup/postgresql.php:135
+#, php-format
+msgid "Offending command was: \"%s\""
+msgstr ""
+
+#: setup/mysql.php:85
+#, php-format
+msgid "MySQL user '%s'@'localhost' exists already."
+msgstr ""
+
+#: setup/mysql.php:86
+msgid "Drop this user from MySQL"
+msgstr ""
+
+#: setup/mysql.php:91
+#, php-format
+msgid "MySQL user '%s'@'%%' already exists"
+msgstr ""
+
+#: setup/mysql.php:92
+msgid "Drop this user from MySQL."
+msgstr ""
+
+#: setup/oci.php:34
+msgid "Oracle connection could not be established"
+msgstr ""
+
+#: setup/oci.php:41 setup/oci.php:113
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: setup/oci.php:173 setup/oci.php:205
+#, php-format
+msgid "Offending command was: \"%s\", name: %s, password: %s"
+msgstr ""
+
+#: setup/postgresql.php:23 setup/postgresql.php:69
+msgid "PostgreSQL username and/or password not valid"
+msgstr ""
+
+#: setup.php:42
+msgid "Set an admin username."
+msgstr ""
+
+#: setup.php:45
+msgid "Set an admin password."
+msgstr ""
+
+#: setup.php:198
+msgid ""
+"Your web server is not yet properly setup to allow files synchronization "
+"because the WebDAV interface seems to be broken."
+msgstr ""
+
+#: setup.php:199
+#, php-format
+msgid "Please double check the <a href='%s'>installation guides</a>."
+msgstr ""
+
+#: template.php:113
+msgid "seconds ago"
+msgstr ""
+
+#: template.php:114
+msgid "1 minute ago"
+msgstr ""
+
+#: template.php:115
+#, php-format
+msgid "%d minutes ago"
+msgstr ""
+
+#: template.php:116
+msgid "1 hour ago"
+msgstr ""
+
+#: template.php:117
+#, php-format
+msgid "%d hours ago"
+msgstr ""
+
+#: template.php:118
+msgid "today"
+msgstr ""
+
+#: template.php:119
+msgid "yesterday"
+msgstr ""
+
+#: template.php:120
+#, php-format
+msgid "%d days ago"
+msgstr ""
+
+#: template.php:121
+msgid "last month"
+msgstr ""
+
+#: template.php:122
+#, php-format
+msgid "%d months ago"
+msgstr ""
+
+#: template.php:123
+msgid "last year"
+msgstr ""
+
+#: template.php:124
+msgid "years ago"
+msgstr ""
+
+#: vcategories.php:188 vcategories.php:249
+#, php-format
+msgid "Could not find category \"%s\""
+msgstr ""
diff --git a/l10n/ml_IN/settings.po b/l10n/ml_IN/settings.po
new file mode 100644
index 0000000000000000000000000000000000000000..e1facfe86945fc70e40afcd9eb2eb9cdb6f0a666
--- /dev/null
+++ b/l10n/ml_IN/settings.po
@@ -0,0 +1,509 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2013-07-09 02:04+0200\n"
+"PO-Revision-Date: 2013-07-09 00:04+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"Language-Team: Malayalam (India) (http://www.transifex.com/projects/p/owncloud/language/ml_IN/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ml_IN\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ajax/apps/ocs.php:20
+msgid "Unable to load list from App Store"
+msgstr ""
+
+#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/togglegroups.php:20
+msgid "Authentication error"
+msgstr ""
+
+#: ajax/changedisplayname.php:31
+msgid "Your display name has been changed."
+msgstr ""
+
+#: ajax/changedisplayname.php:34
+msgid "Unable to change display name"
+msgstr ""
+
+#: ajax/creategroup.php:10
+msgid "Group already exists"
+msgstr ""
+
+#: ajax/creategroup.php:19
+msgid "Unable to add group"
+msgstr ""
+
+#: ajax/enableapp.php:11
+msgid "Could not enable app. "
+msgstr ""
+
+#: ajax/lostpassword.php:12
+msgid "Email saved"
+msgstr ""
+
+#: ajax/lostpassword.php:14
+msgid "Invalid email"
+msgstr ""
+
+#: ajax/removegroup.php:13
+msgid "Unable to delete group"
+msgstr ""
+
+#: ajax/removeuser.php:25
+msgid "Unable to delete user"
+msgstr ""
+
+#: ajax/setlanguage.php:15
+msgid "Language changed"
+msgstr ""
+
+#: ajax/setlanguage.php:17 ajax/setlanguage.php:20
+msgid "Invalid request"
+msgstr ""
+
+#: ajax/togglegroups.php:12
+msgid "Admins can't remove themself from the admin group"
+msgstr ""
+
+#: ajax/togglegroups.php:30
+#, php-format
+msgid "Unable to add user to group %s"
+msgstr ""
+
+#: ajax/togglegroups.php:36
+#, php-format
+msgid "Unable to remove user from group %s"
+msgstr ""
+
+#: ajax/updateapp.php:14
+msgid "Couldn't update app."
+msgstr ""
+
+#: js/apps.js:35
+msgid "Update to {appversion}"
+msgstr ""
+
+#: js/apps.js:41 js/apps.js:81
+msgid "Disable"
+msgstr ""
+
+#: js/apps.js:41 js/apps.js:69 js/apps.js:88
+msgid "Enable"
+msgstr ""
+
+#: js/apps.js:60
+msgid "Please wait...."
+msgstr ""
+
+#: js/apps.js:64 js/apps.js:76 js/apps.js:85 js/apps.js:98
+msgid "Error"
+msgstr ""
+
+#: js/apps.js:95
+msgid "Updating...."
+msgstr ""
+
+#: js/apps.js:98
+msgid "Error while updating app"
+msgstr ""
+
+#: js/apps.js:101
+msgid "Updated"
+msgstr ""
+
+#: js/personal.js:118
+msgid "Saving..."
+msgstr ""
+
+#: js/users.js:47
+msgid "deleted"
+msgstr ""
+
+#: js/users.js:47
+msgid "undo"
+msgstr ""
+
+#: js/users.js:79
+msgid "Unable to remove user"
+msgstr ""
+
+#: js/users.js:92 templates/users.php:26 templates/users.php:87
+#: templates/users.php:112
+msgid "Groups"
+msgstr ""
+
+#: js/users.js:95 templates/users.php:89 templates/users.php:124
+msgid "Group Admin"
+msgstr ""
+
+#: js/users.js:115 templates/users.php:164
+msgid "Delete"
+msgstr ""
+
+#: js/users.js:269
+msgid "add group"
+msgstr ""
+
+#: js/users.js:428
+msgid "A valid username must be provided"
+msgstr ""
+
+#: js/users.js:429 js/users.js:435 js/users.js:450
+msgid "Error creating user"
+msgstr ""
+
+#: js/users.js:434
+msgid "A valid password must be provided"
+msgstr ""
+
+#: personal.php:37 personal.php:38
+msgid "__language_name__"
+msgstr ""
+
+#: templates/admin.php:17
+msgid "Security Warning"
+msgstr ""
+
+#: templates/admin.php:20
+msgid ""
+"Your data directory and your files are probably accessible from the "
+"internet. The .htaccess file that ownCloud provides is not working. We "
+"strongly suggest that you configure your webserver in a way that the data "
+"directory is no longer accessible or you move the data directory outside the"
+" webserver document root."
+msgstr ""
+
+#: templates/admin.php:31
+msgid "Setup Warning"
+msgstr ""
+
+#: templates/admin.php:34
+msgid ""
+"Your web server is not yet properly setup to allow files synchronization "
+"because the WebDAV interface seems to be broken."
+msgstr ""
+
+#: templates/admin.php:35
+#, php-format
+msgid "Please double check the <a href='%s'>installation guides</a>."
+msgstr ""
+
+#: templates/admin.php:46
+msgid "Module 'fileinfo' missing"
+msgstr ""
+
+#: templates/admin.php:49
+msgid ""
+"The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
+"module to get best results with mime-type detection."
+msgstr ""
+
+#: templates/admin.php:60
+msgid "Locale not working"
+msgstr ""
+
+#: templates/admin.php:65
+#, php-format
+msgid ""
+"This ownCloud server can't set system locale to %s. This means that there "
+"might be problems with certain characters in file names. We strongly suggest"
+" to install the required packages on your system to support %s."
+msgstr ""
+
+#: templates/admin.php:77
+msgid "Internet connection not working"
+msgstr ""
+
+#: templates/admin.php:80
+msgid ""
+"This ownCloud server has no working internet connection. This means that "
+"some of the features like mounting of external storage, notifications about "
+"updates or installation of 3rd party apps don´t work. Accessing files from "
+"remote and sending of notification emails might also not work. We suggest to"
+" enable internet connection for this server if you want to have all features"
+" of ownCloud."
+msgstr ""
+
+#: templates/admin.php:94
+msgid "Cron"
+msgstr ""
+
+#: templates/admin.php:103
+msgid "Execute one task with each page loaded"
+msgstr ""
+
+#: templates/admin.php:113
+msgid ""
+"cron.php is registered at a webcron service. Call the cron.php page in the "
+"owncloud root once a minute over http."
+msgstr ""
+
+#: templates/admin.php:123
+msgid ""
+"Use systems cron service. Call the cron.php file in the owncloud folder via "
+"a system cronjob once a minute."
+msgstr ""
+
+#: templates/admin.php:130
+msgid "Sharing"
+msgstr ""
+
+#: templates/admin.php:136
+msgid "Enable Share API"
+msgstr ""
+
+#: templates/admin.php:137
+msgid "Allow apps to use the Share API"
+msgstr ""
+
+#: templates/admin.php:144
+msgid "Allow links"
+msgstr ""
+
+#: templates/admin.php:145
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:152
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:153
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:160
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:163
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:170
+msgid "Security"
+msgstr ""
+
+#: templates/admin.php:183
+msgid "Enforce HTTPS"
+msgstr ""
+
+#: templates/admin.php:184
+msgid ""
+"Enforces the clients to connect to ownCloud via an encrypted connection."
+msgstr ""
+
+#: templates/admin.php:187
+msgid ""
+"Please connect to this ownCloud instance via HTTPS to enable or disable the "
+"SSL enforcement."
+msgstr ""
+
+#: templates/admin.php:197
+msgid "Log"
+msgstr ""
+
+#: templates/admin.php:198
+msgid "Log level"
+msgstr ""
+
+#: templates/admin.php:229
+msgid "More"
+msgstr ""
+
+#: templates/admin.php:230
+msgid "Less"
+msgstr ""
+
+#: templates/admin.php:236 templates/personal.php:116
+msgid "Version"
+msgstr ""
+
+#: templates/admin.php:240 templates/personal.php:119
+msgid ""
+"Developed by the <a href=\"http://ownCloud.org/contact\" "
+"target=\"_blank\">ownCloud community</a>, the <a "
+"href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is "
+"licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" "
+"target=\"_blank\"><abbr title=\"Affero General Public "
+"License\">AGPL</abbr></a>."
+msgstr ""
+
+#: templates/apps.php:13
+msgid "Add your App"
+msgstr ""
+
+#: templates/apps.php:28
+msgid "More Apps"
+msgstr ""
+
+#: templates/apps.php:33
+msgid "Select an App"
+msgstr ""
+
+#: templates/apps.php:39
+msgid "See application page at apps.owncloud.com"
+msgstr ""
+
+#: templates/apps.php:41
+msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
+msgstr ""
+
+#: templates/apps.php:43
+msgid "Update"
+msgstr ""
+
+#: templates/help.php:4
+msgid "User Documentation"
+msgstr ""
+
+#: templates/help.php:6
+msgid "Administrator Documentation"
+msgstr ""
+
+#: templates/help.php:9
+msgid "Online Documentation"
+msgstr ""
+
+#: templates/help.php:11
+msgid "Forum"
+msgstr ""
+
+#: templates/help.php:14
+msgid "Bugtracker"
+msgstr ""
+
+#: templates/help.php:17
+msgid "Commercial Support"
+msgstr ""
+
+#: templates/personal.php:10
+msgid "Get the apps to sync your files"
+msgstr ""
+
+#: templates/personal.php:21
+msgid "Show First Run Wizard again"
+msgstr ""
+
+#: templates/personal.php:29
+#, php-format
+msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
+msgstr ""
+
+#: templates/personal.php:41 templates/users.php:23 templates/users.php:86
+msgid "Password"
+msgstr ""
+
+#: templates/personal.php:42
+msgid "Your password was changed"
+msgstr ""
+
+#: templates/personal.php:43
+msgid "Unable to change your password"
+msgstr ""
+
+#: templates/personal.php:44
+msgid "Current password"
+msgstr ""
+
+#: templates/personal.php:46
+msgid "New password"
+msgstr ""
+
+#: templates/personal.php:48
+msgid "Change password"
+msgstr ""
+
+#: templates/personal.php:60 templates/users.php:85
+msgid "Display Name"
+msgstr ""
+
+#: templates/personal.php:75
+msgid "Email"
+msgstr ""
+
+#: templates/personal.php:77
+msgid "Your email address"
+msgstr ""
+
+#: templates/personal.php:78
+msgid "Fill in an email address to enable password recovery"
+msgstr ""
+
+#: templates/personal.php:87 templates/personal.php:88
+msgid "Language"
+msgstr ""
+
+#: templates/personal.php:100
+msgid "Help translate"
+msgstr ""
+
+#: templates/personal.php:106
+msgid "WebDAV"
+msgstr ""
+
+#: templates/personal.php:108
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
+"target=\"_blank\">access your Files via WebDAV</a>"
+msgstr ""
+
+#: templates/users.php:21
+msgid "Login Name"
+msgstr ""
+
+#: templates/users.php:30
+msgid "Create"
+msgstr ""
+
+#: templates/users.php:36
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:37 templates/users.php:38
+msgid ""
+"Enter the recovery password in order to recover the users files during "
+"password change"
+msgstr ""
+
+#: templates/users.php:42
+msgid "Default Storage"
+msgstr ""
+
+#: templates/users.php:48 templates/users.php:142
+msgid "Unlimited"
+msgstr ""
+
+#: templates/users.php:66 templates/users.php:157
+msgid "Other"
+msgstr ""
+
+#: templates/users.php:84
+msgid "Username"
+msgstr ""
+
+#: templates/users.php:91
+msgid "Storage"
+msgstr ""
+
+#: templates/users.php:102
+msgid "change display name"
+msgstr ""
+
+#: templates/users.php:106
+msgid "set new password"
+msgstr ""
+
+#: templates/users.php:137
+msgid "Default"
+msgstr ""
diff --git a/l10n/ml_IN/user_ldap.po b/l10n/ml_IN/user_ldap.po
new file mode 100644
index 0000000000000000000000000000000000000000..0488df2f5a20db3cb8856ac250a8c57b2e4caa03
--- /dev/null
+++ b/l10n/ml_IN/user_ldap.po
@@ -0,0 +1,419 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2013-07-06 02:01+0200\n"
+"PO-Revision-Date: 2013-07-05 08:25+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"Language-Team: Malayalam (India) (http://www.transifex.com/projects/p/owncloud/language/ml_IN/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ml_IN\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
+#: ajax/deleteConfiguration.php:34
+msgid "Failed to delete the server configuration"
+msgstr ""
+
+#: ajax/testConfiguration.php:36
+msgid "The configuration is valid and the connection could be established!"
+msgstr ""
+
+#: ajax/testConfiguration.php:39
+msgid ""
+"The configuration is valid, but the Bind failed. Please check the server "
+"settings and credentials."
+msgstr ""
+
+#: ajax/testConfiguration.php:43
+msgid ""
+"The configuration is invalid. Please look in the ownCloud log for further "
+"details."
+msgstr ""
+
+#: js/settings.js:66
+msgid "Deletion failed"
+msgstr ""
+
+#: js/settings.js:82
+msgid "Take over settings from recent server configuration?"
+msgstr ""
+
+#: js/settings.js:83
+msgid "Keep settings?"
+msgstr ""
+
+#: js/settings.js:97
+msgid "Cannot add server configuration"
+msgstr ""
+
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr ""
+
+#: js/settings.js:141
+msgid "Connection test succeeded"
+msgstr ""
+
+#: js/settings.js:146
+msgid "Connection test failed"
+msgstr ""
+
+#: js/settings.js:156
+msgid "Do you really want to delete the current Server Configuration?"
+msgstr ""
+
+#: js/settings.js:157
+msgid "Confirm Deletion"
+msgstr ""
+
+#: templates/settings.php:9
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:12
+msgid ""
+"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
+"work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:16
+msgid "Server configuration"
+msgstr ""
+
+#: templates/settings.php:32
+msgid "Add Server Configuration"
+msgstr ""
+
+#: templates/settings.php:37
+msgid "Host"
+msgstr ""
+
+#: templates/settings.php:39
+msgid ""
+"You can omit the protocol, except you require SSL. Then start with ldaps://"
+msgstr ""
+
+#: templates/settings.php:40
+msgid "Base DN"
+msgstr ""
+
+#: templates/settings.php:41
+msgid "One Base DN per line"
+msgstr ""
+
+#: templates/settings.php:42
+msgid "You can specify Base DN for users and groups in the Advanced tab"
+msgstr ""
+
+#: templates/settings.php:44
+msgid "User DN"
+msgstr ""
+
+#: templates/settings.php:46
+msgid ""
+"The DN of the client user with which the bind shall be done, e.g. "
+"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
+"empty."
+msgstr ""
+
+#: templates/settings.php:47
+msgid "Password"
+msgstr ""
+
+#: templates/settings.php:50
+msgid "For anonymous access, leave DN and Password empty."
+msgstr ""
+
+#: templates/settings.php:51
+msgid "User Login Filter"
+msgstr ""
+
+#: templates/settings.php:54
+#, php-format
+msgid ""
+"Defines the filter to apply, when login is attempted. %%uid replaces the "
+"username in the login action."
+msgstr ""
+
+#: templates/settings.php:55
+#, php-format
+msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
+msgstr ""
+
+#: templates/settings.php:56
+msgid "User List Filter"
+msgstr ""
+
+#: templates/settings.php:59
+msgid "Defines the filter to apply, when retrieving users."
+msgstr ""
+
+#: templates/settings.php:60
+msgid "without any placeholder, e.g. \"objectClass=person\"."
+msgstr ""
+
+#: templates/settings.php:61
+msgid "Group Filter"
+msgstr ""
+
+#: templates/settings.php:64
+msgid "Defines the filter to apply, when retrieving groups."
+msgstr ""
+
+#: templates/settings.php:65
+msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+msgstr ""
+
+#: templates/settings.php:69
+msgid "Connection Settings"
+msgstr ""
+
+#: templates/settings.php:71
+msgid "Configuration Active"
+msgstr ""
+
+#: templates/settings.php:71
+msgid "When unchecked, this configuration will be skipped."
+msgstr ""
+
+#: templates/settings.php:72
+msgid "Port"
+msgstr ""
+
+#: templates/settings.php:73
+msgid "Backup (Replica) Host"
+msgstr ""
+
+#: templates/settings.php:73
+msgid ""
+"Give an optional backup host. It must be a replica of the main LDAP/AD "
+"server."
+msgstr ""
+
+#: templates/settings.php:74
+msgid "Backup (Replica) Port"
+msgstr ""
+
+#: templates/settings.php:75
+msgid "Disable Main Server"
+msgstr ""
+
+#: templates/settings.php:75
+msgid "When switched on, ownCloud will only connect to the replica server."
+msgstr ""
+
+#: templates/settings.php:76
+msgid "Use TLS"
+msgstr ""
+
+#: templates/settings.php:76
+msgid "Do not use it additionally for LDAPS connections, it will fail."
+msgstr ""
+
+#: templates/settings.php:77
+msgid "Case insensitve LDAP server (Windows)"
+msgstr ""
+
+#: templates/settings.php:78
+msgid "Turn off SSL certificate validation."
+msgstr ""
+
+#: templates/settings.php:78
+msgid ""
+"If connection only works with this option, import the LDAP server's SSL "
+"certificate in your ownCloud server."
+msgstr ""
+
+#: templates/settings.php:78
+msgid "Not recommended, use for testing only."
+msgstr ""
+
+#: templates/settings.php:79
+msgid "Cache Time-To-Live"
+msgstr ""
+
+#: templates/settings.php:79
+msgid "in seconds. A change empties the cache."
+msgstr ""
+
+#: templates/settings.php:81
+msgid "Directory Settings"
+msgstr ""
+
+#: templates/settings.php:83
+msgid "User Display Name Field"
+msgstr ""
+
+#: templates/settings.php:83
+msgid "The LDAP attribute to use to generate the user`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:84
+msgid "Base User Tree"
+msgstr ""
+
+#: templates/settings.php:84
+msgid "One User Base DN per line"
+msgstr ""
+
+#: templates/settings.php:85
+msgid "User Search Attributes"
+msgstr ""
+
+#: templates/settings.php:85 templates/settings.php:88
+msgid "Optional; one attribute per line"
+msgstr ""
+
+#: templates/settings.php:86
+msgid "Group Display Name Field"
+msgstr ""
+
+#: templates/settings.php:86
+msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:87
+msgid "Base Group Tree"
+msgstr ""
+
+#: templates/settings.php:87
+msgid "One Group Base DN per line"
+msgstr ""
+
+#: templates/settings.php:88
+msgid "Group Search Attributes"
+msgstr ""
+
+#: templates/settings.php:89
+msgid "Group-Member association"
+msgstr ""
+
+#: templates/settings.php:91
+msgid "Special Attributes"
+msgstr ""
+
+#: templates/settings.php:93
+msgid "Quota Field"
+msgstr ""
+
+#: templates/settings.php:94
+msgid "Quota Default"
+msgstr ""
+
+#: templates/settings.php:94
+msgid "in bytes"
+msgstr ""
+
+#: templates/settings.php:95
+msgid "Email Field"
+msgstr ""
+
+#: templates/settings.php:96
+msgid "User Home Folder Naming Rule"
+msgstr ""
+
+#: templates/settings.php:96
+msgid ""
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
+"attribute."
+msgstr ""
+
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder in "
+"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
+"services. With this setting, the default behaviour can be overriden. To "
+"achieve a similar behaviour as before ownCloud 5 enter the user display name"
+" attribute in the following field. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
+"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"ownCloud uses usernames to store and assign (meta) data. In order to "
+"precisely identify and recognize users, each LDAP user will have a internal "
+"username. This requires a mapping from ownCloud username to LDAP user. The "
+"created username is mapped to the UUID of the LDAP user. Additionally the DN"
+" is cached as well to reduce LDAP interaction, but it is not used for "
+"identification. If the DN changes, the changes will be found by ownCloud. "
+"The internal ownCloud name is used all over in ownCloud. Clearing the "
+"Mappings will have leftovers everywhere. Clearing the Mappings is not "
+"configuration sensitive, it affects all LDAP configurations! Do never clear "
+"the mappings in a production environment. Only clear mappings in a testing "
+"or experimental stage."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
+msgid "Test Configuration"
+msgstr ""
+
+#: templates/settings.php:111
+msgid "Help"
+msgstr ""
diff --git a/l10n/ml_IN/user_webdavauth.po b/l10n/ml_IN/user_webdavauth.po
new file mode 100644
index 0000000000000000000000000000000000000000..883156e8a55d34486f363acf5e29385607f7fdb3
--- /dev/null
+++ b/l10n/ml_IN/user_webdavauth.po
@@ -0,0 +1,33 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2013-07-06 02:01+0200\n"
+"PO-Revision-Date: 2013-07-05 08:25+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"Language-Team: Malayalam (India) (http://www.transifex.com/projects/p/owncloud/language/ml_IN/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ml_IN\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: templates/settings.php:3
+msgid "WebDAV Authentication"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "URL: "
+msgstr ""
+
+#: templates/settings.php:7
+msgid ""
+"ownCloud will send the user credentials to this URL. This plugin checks the "
+"response and will interpret the HTTP statuscodes 401 and 403 as invalid "
+"credentials, and all other responses as valid credentials."
+msgstr ""
diff --git a/l10n/ms_MY/core.po b/l10n/ms_MY/core.po
index 39edfdbaecca14e4c7db02acd32296780f620c76..794029238df89d48f1f1225e2247b1c681a15a73 100644
--- a/l10n/ms_MY/core.po
+++ b/l10n/ms_MY/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:22+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
 "MIME-Version: 1.0\n"
@@ -61,135 +61,135 @@ msgstr "Tiada kategori dipilih untuk dibuang."
 msgid "Error removing %s from favorites."
 msgstr ""
 
-#: js/config.php:34
+#: js/config.php:32
 msgid "Sunday"
 msgstr "Ahad"
 
-#: js/config.php:35
+#: js/config.php:33
 msgid "Monday"
 msgstr "Isnin"
 
-#: js/config.php:36
+#: js/config.php:34
 msgid "Tuesday"
 msgstr "Selasa"
 
-#: js/config.php:37
+#: js/config.php:35
 msgid "Wednesday"
 msgstr "Rabu"
 
-#: js/config.php:38
+#: js/config.php:36
 msgid "Thursday"
 msgstr "Khamis"
 
-#: js/config.php:39
+#: js/config.php:37
 msgid "Friday"
 msgstr "Jumaat"
 
-#: js/config.php:40
+#: js/config.php:38
 msgid "Saturday"
 msgstr "Sabtu"
 
-#: js/config.php:45
+#: js/config.php:43
 msgid "January"
 msgstr "Januari"
 
-#: js/config.php:46
+#: js/config.php:44
 msgid "February"
 msgstr "Februari"
 
-#: js/config.php:47
+#: js/config.php:45
 msgid "March"
 msgstr "Mac"
 
-#: js/config.php:48
+#: js/config.php:46
 msgid "April"
 msgstr "April"
 
-#: js/config.php:49
+#: js/config.php:47
 msgid "May"
 msgstr "Mei"
 
-#: js/config.php:50
+#: js/config.php:48
 msgid "June"
 msgstr "Jun"
 
-#: js/config.php:51
+#: js/config.php:49
 msgid "July"
 msgstr "Julai"
 
-#: js/config.php:52
+#: js/config.php:50
 msgid "August"
 msgstr "Ogos"
 
-#: js/config.php:53
+#: js/config.php:51
 msgid "September"
 msgstr "September"
 
-#: js/config.php:54
+#: js/config.php:52
 msgid "October"
 msgstr "Oktober"
 
-#: js/config.php:55
+#: js/config.php:53
 msgid "November"
 msgstr "November"
 
-#: js/config.php:56
+#: js/config.php:54
 msgid "December"
 msgstr "Disember"
 
-#: js/js.js:286
+#: js/js.js:293
 msgid "Settings"
 msgstr "Tetapan"
 
-#: js/js.js:718
+#: js/js.js:725
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:719
+#: js/js.js:726
 msgid "1 minute ago"
 msgstr ""
 
-#: js/js.js:720
+#: js/js.js:727
 msgid "{minutes} minutes ago"
 msgstr ""
 
-#: js/js.js:721
+#: js/js.js:728
 msgid "1 hour ago"
 msgstr ""
 
-#: js/js.js:722
+#: js/js.js:729
 msgid "{hours} hours ago"
 msgstr ""
 
-#: js/js.js:723
+#: js/js.js:730
 msgid "today"
 msgstr ""
 
-#: js/js.js:724
+#: js/js.js:731
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:725
+#: js/js.js:732
 msgid "{days} days ago"
 msgstr ""
 
-#: js/js.js:726
+#: js/js.js:733
 msgid "last month"
 msgstr ""
 
-#: js/js.js:727
+#: js/js.js:734
 msgid "{months} months ago"
 msgstr ""
 
-#: js/js.js:728
+#: js/js.js:735
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:729
+#: js/js.js:736
 msgid "last year"
 msgstr ""
 
-#: js/js.js:730
+#: js/js.js:737
 msgid "years ago"
 msgstr ""
 
@@ -225,8 +225,8 @@ msgstr ""
 #: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
 #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:577
-#: js/share.js:589
+#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:620
+#: js/share.js:632
 msgid "Error"
 msgstr "Ralat"
 
@@ -246,7 +246,7 @@ msgstr ""
 msgid "Share"
 msgstr "Kongsi"
 
-#: js/share.js:125 js/share.js:617
+#: js/share.js:125 js/share.js:660
 msgid "Error while sharing"
 msgstr ""
 
@@ -266,99 +266,103 @@ msgstr ""
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:159
+#: js/share.js:172
 msgid "Share with"
 msgstr ""
 
-#: js/share.js:164
+#: js/share.js:177
 msgid "Share with link"
 msgstr ""
 
-#: js/share.js:167
+#: js/share.js:180
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:169 templates/installation.php:54 templates/login.php:26
+#: js/share.js:182 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "Kata laluan"
 
-#: js/share.js:173
+#: js/share.js:187
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:191
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:174
+#: js/share.js:192
 msgid "Send"
 msgstr ""
 
-#: js/share.js:178
+#: js/share.js:197
 msgid "Set expiration date"
 msgstr ""
 
-#: js/share.js:179
+#: js/share.js:198
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:211
+#: js/share.js:230
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:213
+#: js/share.js:232
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:251
+#: js/share.js:270
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:287
+#: js/share.js:306
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:308
+#: js/share.js:327
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:320
+#: js/share.js:339
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:322
+#: js/share.js:341
 msgid "access control"
 msgstr ""
 
-#: js/share.js:325
+#: js/share.js:344
 msgid "create"
 msgstr ""
 
-#: js/share.js:328
+#: js/share.js:347
 msgid "update"
 msgstr ""
 
-#: js/share.js:331
+#: js/share.js:350
 msgid "delete"
 msgstr ""
 
-#: js/share.js:334
+#: js/share.js:353
 msgid "share"
 msgstr ""
 
-#: js/share.js:368 js/share.js:564
+#: js/share.js:387 js/share.js:607
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:577
+#: js/share.js:620
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:589
+#: js/share.js:632
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:604
+#: js/share.js:647
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:615
+#: js/share.js:658
 msgid "Email sent"
 msgstr ""
 
@@ -373,7 +377,7 @@ msgstr ""
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
-#: lostpassword/controller.php:58
+#: lostpassword/controller.php:60
 msgid "ownCloud password reset"
 msgstr "Set semula kata lalaun ownCloud"
 
@@ -403,17 +407,17 @@ msgstr "Nama pengguna"
 
 #: lostpassword/templates/lostpassword.php:22
 msgid ""
-"Your files seems to be encrypted. If you didn't have enabled the recovery "
-"key there will be no way to get your data back once the password was "
-"resetted. If you are not sure what to do, please contact your administrator "
-"first before continue. Do you really want to continue?"
+"Your files are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
 msgstr ""
 
 #: lostpassword/templates/lostpassword.php:24
 msgid "Yes, I really want to reset my password now"
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:29
+#: lostpassword/templates/lostpassword.php:27
 msgid "Request reset"
 msgstr "Permintaan set semula"
 
@@ -461,7 +465,7 @@ msgstr "Larangan akses"
 msgid "Cloud not found"
 msgstr "Awan tidak dijumpai"
 
-#: templates/altmail.php:2
+#: templates/altmail.php:4
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -472,10 +476,6 @@ msgid ""
 "Cheers!"
 msgstr ""
 
-#: templates/altmail.php:7 templates/mail.php:24
-msgid "web services under your control"
-msgstr "Perkhidmatan web di bawah kawalan anda"
-
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
 msgstr "Ubah kategori"
@@ -568,12 +568,12 @@ msgstr "Hos pangkalan data"
 msgid "Finish setup"
 msgstr "Setup selesai"
 
-#: templates/layout.user.php:40
+#: templates/layout.user.php:43
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:67
+#: templates/layout.user.php:68
 msgid "Log out"
 msgstr "Log keluar"
 
@@ -607,7 +607,7 @@ msgstr "Log masuk"
 msgid "Alternative Logins"
 msgstr ""
 
-#: templates/mail.php:15
+#: templates/mail.php:16
 #, php-format
 msgid ""
 "Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
diff --git a/l10n/ms_MY/files.po b/l10n/ms_MY/files.po
index 32344a2313332eedf67efbc864b4353e7ac8d737..7e792458b4dfe99e4564a9014117b1ec0dbc9261 100644
--- a/l10n/ms_MY/files.po
+++ b/l10n/ms_MY/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:01+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
 "MIME-Version: 1.0\n"
@@ -27,46 +27,54 @@ msgstr ""
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/upload.php:19
+#: ajax/upload.php:16 ajax/upload.php:45
+msgid "Unable to set upload directory."
+msgstr ""
+
+#: ajax/upload.php:22
+msgid "Invalid Token"
+msgstr ""
+
+#: ajax/upload.php:59
 msgid "No file was uploaded. Unknown error"
 msgstr "Tiada fail dimuatnaik. Ralat tidak diketahui."
 
-#: ajax/upload.php:26
+#: ajax/upload.php:66
 msgid "There is no error, the file uploaded with success"
 msgstr "Tiada ralat berlaku, fail berjaya dimuatnaik"
 
-#: ajax/upload.php:27
+#: ajax/upload.php:67
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:29
+#: ajax/upload.php:69
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Saiz fail yang dimuatnaik melebihi MAX_FILE_SIZE yang ditetapkan dalam borang HTML"
 
-#: ajax/upload.php:30
+#: ajax/upload.php:70
 msgid "The uploaded file was only partially uploaded"
 msgstr "Fail yang dimuatnaik tidak lengkap"
 
-#: ajax/upload.php:31
+#: ajax/upload.php:71
 msgid "No file was uploaded"
 msgstr "Tiada fail dimuatnaik"
 
-#: ajax/upload.php:32
+#: ajax/upload.php:72
 msgid "Missing a temporary folder"
 msgstr "Direktori sementara hilang"
 
-#: ajax/upload.php:33
+#: ajax/upload.php:73
 msgid "Failed to write to disk"
 msgstr "Gagal untuk disimpan"
 
-#: ajax/upload.php:51
+#: ajax/upload.php:91
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:83
+#: ajax/upload.php:123
 msgid "Invalid directory."
 msgstr ""
 
@@ -74,6 +82,36 @@ msgstr ""
 msgid "Files"
 msgstr "Fail-fail"
 
+#: js/file-upload.js:11
+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/file-upload.js:24
+msgid "Not enough space available"
+msgstr ""
+
+#: js/file-upload.js:64
+msgid "Upload cancelled."
+msgstr "Muatnaik dibatalkan."
+
+#: js/file-upload.js:167 js/files.js:266
+msgid ""
+"File upload is in progress. Leaving the page now will cancel the upload."
+msgstr ""
+
+#: js/file-upload.js:233 js/files.js:339
+msgid "URL cannot be empty."
+msgstr ""
+
+#: js/file-upload.js:238 lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr ""
+
+#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
+#: js/files.js:693 js/files.js:731
+msgid "Error"
+msgstr "Ralat"
+
 #: js/fileactions.js:116
 msgid "Share"
 msgstr "Kongsi"
@@ -90,43 +128,43 @@ msgstr "Padam"
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:464
 msgid "Pending"
 msgstr "Dalam proses"
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "replace"
 msgstr "ganti"
 
-#: js/filelist.js:259
+#: js/filelist.js:302
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "cancel"
 msgstr "Batal"
 
-#: js/filelist.js:306
+#: js/filelist.js:349
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:306
+#: js/filelist.js:349
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:331
+#: js/filelist.js:374
 msgid "perform delete operation"
 msgstr ""
 
-#: js/filelist.js:413
+#: js/filelist.js:456
 msgid "1 file uploading"
 msgstr ""
 
-#: js/filelist.js:416 js/filelist.js:470
+#: js/filelist.js:459 js/filelist.js:517
 msgid "files uploading"
 msgstr ""
 
@@ -158,69 +196,41 @@ msgid ""
 "big."
 msgstr ""
 
-#: js/files.js:264
-msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "Tidak boleh memuatnaik fail anda kerana mungkin ianya direktori atau saiz fail 0 bytes"
-
-#: js/files.js:277
-msgid "Not enough space available"
-msgstr ""
-
-#: js/files.js:317
-msgid "Upload cancelled."
-msgstr "Muatnaik dibatalkan."
-
-#: js/files.js:413
-msgid ""
-"File upload is in progress. Leaving the page now will cancel the upload."
-msgstr ""
-
-#: js/files.js:486
-msgid "URL cannot be empty."
-msgstr ""
-
-#: js/files.js:491
+#: js/files.js:344
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
-msgid "Error"
-msgstr "Ralat"
-
-#: js/files.js:877 templates/index.php:69
+#: js/files.js:744 templates/index.php:69
 msgid "Name"
 msgstr "Nama"
 
-#: js/files.js:878 templates/index.php:80
+#: js/files.js:745 templates/index.php:80
 msgid "Size"
 msgstr "Saiz"
 
-#: js/files.js:879 templates/index.php:82
+#: js/files.js:746 templates/index.php:82
 msgid "Modified"
 msgstr "Dimodifikasi"
 
-#: js/files.js:898
+#: js/files.js:765
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:900
+#: js/files.js:767
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:908
+#: js/files.js:775
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:910
+#: js/files.js:777
 msgid "{count} files"
 msgstr ""
 
-#: lib/app.php:53
-msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
-msgstr ""
-
 #: lib/app.php:73
-msgid "Unable to rename file"
+#, php-format
+msgid "%s could not be renamed"
 msgstr ""
 
 #: lib/helper.php:11 templates/index.php:18
@@ -317,6 +327,22 @@ msgstr "Fail sedang diimbas, harap bersabar."
 msgid "Current scanning"
 msgstr "Imbasan semasa"
 
+#: templates/part.list.php:76
+msgid "directory"
+msgstr ""
+
+#: templates/part.list.php:78
+msgid "directories"
+msgstr ""
+
+#: templates/part.list.php:87
+msgid "file"
+msgstr "fail"
+
+#: templates/part.list.php:89
+msgid "files"
+msgstr "fail"
+
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
 msgstr ""
diff --git a/l10n/ms_MY/files_encryption.po b/l10n/ms_MY/files_encryption.po
index 19d498e835acf401c0463d1871db6bfc4e460ca2..80ba103e3db507de265e1ee590c6119905ae80e6 100644
--- a/l10n/ms_MY/files_encryption.po
+++ b/l10n/ms_MY/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-14 02:46+0200\n"
-"PO-Revision-Date: 2013-06-14 00:47+0000\n"
+"POT-Creation-Date: 2013-07-05 02:12+0200\n"
+"PO-Revision-Date: 2013-07-05 00:13+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"
@@ -55,9 +55,21 @@ msgstr ""
 
 #: files/error.php:7
 msgid ""
-"Your private key is not valid! Maybe your password was changed from outside."
-" You can update your private key password in your personal settings to "
-"regain access to your files"
+"Your private key is not valid! Likely your password was changed outside the "
+"ownCloud system (e.g. your corporate directory). You can update your private"
+" key password in your personal settings to recover access to your encrypted "
+"files."
+msgstr ""
+
+#: hooks/hooks.php:44
+msgid "Missing requirements."
+msgstr ""
+
+#: hooks/hooks.php:45
+msgid ""
+"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL "
+"PHP extension is enabled and configured properly. For now, the encryption "
+"app has been disabled."
 msgstr ""
 
 #: js/settings-admin.js:11
@@ -84,11 +96,11 @@ msgstr ""
 
 #: templates/settings-admin.php:10
 msgid ""
-"Enable encryption passwords recovery key (allow sharing to recovery key):"
+"Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
 #: templates/settings-admin.php:14
-msgid "Recovery account password"
+msgid "Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:21 templates/settings-personal.php:54
@@ -100,15 +112,15 @@ msgid "Disabled"
 msgstr ""
 
 #: templates/settings-admin.php:34
-msgid "Change encryption passwords recovery key:"
+msgid "Change recovery key password:"
 msgstr ""
 
 #: templates/settings-admin.php:41
-msgid "Old Recovery account password"
+msgid "Old Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:48
-msgid "New Recovery account password"
+msgid "New Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:53
diff --git a/l10n/ms_MY/files_external.po b/l10n/ms_MY/files_external.po
index e37c2127aba922e6c43242538c36770e7ed4f0e8..2a9347fe246897ccfe713390dd39310a612daeb7 100644
--- a/l10n/ms_MY/files_external.po
+++ b/l10n/ms_MY/files_external.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/ms_MY/files_sharing.po b/l10n/ms_MY/files_sharing.po
index 6f1ae5bbf116aceb96eb6aa06c672cc2280c7ab0..0a856bd24697eac74d159a0ad972e920cd5de70d 100644
--- a/l10n/ms_MY/files_sharing.po
+++ b/l10n/ms_MY/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
 "MIME-Version: 1.0\n"
@@ -18,27 +18,39 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: templates/authenticate.php:4
+msgid "The password is wrong. Try again."
+msgstr ""
+
+#: templates/authenticate.php:7
 msgid "Password"
 msgstr "Kata laluan"
 
-#: templates/authenticate.php:6
+#: templates/authenticate.php:9
 msgid "Submit"
 msgstr "Hantar"
 
-#: templates/public.php:10
+#: templates/public.php:17
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr ""
 
-#: templates/public.php:13
+#: templates/public.php:20
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr ""
 
-#: templates/public.php:19 templates/public.php:43
+#: templates/public.php:28 templates/public.php:90
 msgid "Download"
 msgstr "Muat turun"
 
-#: templates/public.php:40
+#: templates/public.php:45 templates/public.php:48
+msgid "Upload"
+msgstr "Muat naik"
+
+#: templates/public.php:58
+msgid "Cancel upload"
+msgstr "Batal muat naik"
+
+#: templates/public.php:87
 msgid "No preview available for"
 msgstr ""
diff --git a/l10n/ms_MY/files_trashbin.po b/l10n/ms_MY/files_trashbin.po
index afcfdaf49161c73fb39df62d9b123c51fea70c3a..dcc7146350e2f6656825e3f0e68a21ddda94c9ca 100644
--- a/l10n/ms_MY/files_trashbin.po
+++ b/l10n/ms_MY/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:16+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/ms_MY/lib.po b/l10n/ms_MY/lib.po
index 2a565960a3051302909889466054ea8dae1b333a..c47b1071810f8604117ea7f61f7aabdf47755fa4 100644
--- a/l10n/ms_MY/lib.po
+++ b/l10n/ms_MY/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
 "MIME-Version: 1.0\n"
@@ -17,43 +17,47 @@ msgstr ""
 "Language: ms_MY\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: app.php:359
+#: app.php:360
 msgid "Help"
 msgstr "Bantuan"
 
-#: app.php:372
+#: app.php:373
 msgid "Personal"
 msgstr "Peribadi"
 
-#: app.php:383
+#: app.php:384
 msgid "Settings"
 msgstr "Tetapan"
 
-#: app.php:395
+#: app.php:396
 msgid "Users"
 msgstr "Pengguna"
 
-#: app.php:408
+#: app.php:409
 msgid "Apps"
 msgstr "Aplikasi"
 
-#: app.php:416
+#: app.php:417
 msgid "Admin"
 msgstr "Admin"
 
-#: files.php:210
+#: defaults.php:33
+msgid "web services under your control"
+msgstr "Perkhidmatan web di bawah kawalan anda"
+
+#: files.php:226
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: files.php:211
+#: files.php:227
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:212 files.php:245
+#: files.php:228 files.php:261
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:242
+#: files.php:258
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
@@ -85,104 +89,102 @@ msgstr "Teks"
 msgid "Images"
 msgstr ""
 
-#: setup.php:34
-msgid "Set an admin username."
-msgstr ""
-
-#: setup.php:37
-msgid "Set an admin password."
-msgstr ""
-
-#: setup.php:55
+#: setup/abstractdatabase.php:22
 #, php-format
 msgid "%s enter the database username."
 msgstr ""
 
-#: setup.php:58
+#: setup/abstractdatabase.php:25
 #, php-format
 msgid "%s enter the database name."
 msgstr ""
 
-#: setup.php:61
+#: setup/abstractdatabase.php:28
 #, php-format
 msgid "%s you may not use dots in the database name"
 msgstr ""
 
-#: setup.php:64
+#: setup/mssql.php:20
 #, php-format
-msgid "%s set the database host."
-msgstr ""
-
-#: setup.php:126 setup.php:332 setup.php:377
-msgid "PostgreSQL username and/or password not valid"
+msgid "MS SQL username and/or password not valid: %s"
 msgstr ""
 
-#: setup.php:127 setup.php:235
+#: setup/mssql.php:21 setup/mysql.php:13 setup/oci.php:114
+#: setup/postgresql.php:24 setup/postgresql.php:70
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:152
-msgid "Oracle connection could not be established"
-msgstr ""
-
-#: setup.php:234
+#: setup/mysql.php:12
 msgid "MySQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:288 setup.php:398 setup.php:407 setup.php:425 setup.php:435
-#: setup.php:444 setup.php:477 setup.php:543 setup.php:569 setup.php:576
-#: setup.php:587 setup.php:594 setup.php:603 setup.php:611 setup.php:620
-#: setup.php:626
+#: setup/mysql.php:67 setup/oci.php:54 setup/oci.php:121 setup/oci.php:147
+#: setup/oci.php:154 setup/oci.php:165 setup/oci.php:172 setup/oci.php:181
+#: setup/oci.php:189 setup/oci.php:198 setup/oci.php:204
+#: setup/postgresql.php:89 setup/postgresql.php:98 setup/postgresql.php:115
+#: setup/postgresql.php:125 setup/postgresql.php:134
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr ""
 
-#: setup.php:289 setup.php:399 setup.php:408 setup.php:426 setup.php:436
-#: setup.php:445 setup.php:478 setup.php:544 setup.php:570 setup.php:577
-#: setup.php:588 setup.php:604 setup.php:612 setup.php:621
+#: setup/mysql.php:68 setup/oci.php:55 setup/oci.php:122 setup/oci.php:148
+#: setup/oci.php:155 setup/oci.php:166 setup/oci.php:182 setup/oci.php:190
+#: setup/oci.php:199 setup/postgresql.php:90 setup/postgresql.php:99
+#: setup/postgresql.php:116 setup/postgresql.php:126 setup/postgresql.php:135
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:305
+#: setup/mysql.php:85
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:306
+#: setup/mysql.php:86
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:311
+#: setup/mysql.php:91
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:312
+#: setup/mysql.php:92
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:469 setup.php:536
+#: setup/oci.php:34
+msgid "Oracle connection could not be established"
+msgstr ""
+
+#: setup/oci.php:41 setup/oci.php:113
 msgid "Oracle username and/or password not valid"
 msgstr ""
 
-#: setup.php:595 setup.php:627
+#: setup/oci.php:173 setup/oci.php:205
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:647
-#, php-format
-msgid "MS SQL username and/or password not valid: %s"
+#: setup/postgresql.php:23 setup/postgresql.php:69
+msgid "PostgreSQL username and/or password not valid"
+msgstr ""
+
+#: setup.php:42
+msgid "Set an admin username."
+msgstr ""
+
+#: setup.php:45
+msgid "Set an admin password."
 msgstr ""
 
-#: setup.php:870
+#: setup.php:198
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:871
+#: setup.php:199
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
diff --git a/l10n/ms_MY/settings.po b/l10n/ms_MY/settings.po
index a3a5b1f3b54901f7e8d25988036d3bf4a5fb893c..da50f35d527fa94346b9853941734b8246ffd2f6 100644
--- a/l10n/ms_MY/settings.po
+++ b/l10n/ms_MY/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
 "MIME-Version: 1.0\n"
@@ -88,35 +88,35 @@ msgstr ""
 msgid "Couldn't update app."
 msgstr ""
 
-#: js/apps.js:30
+#: js/apps.js:35
 msgid "Update to {appversion}"
 msgstr ""
 
-#: js/apps.js:36 js/apps.js:76
+#: js/apps.js:41 js/apps.js:81
 msgid "Disable"
 msgstr "Nyahaktif"
 
-#: js/apps.js:36 js/apps.js:64 js/apps.js:83
+#: js/apps.js:41 js/apps.js:69 js/apps.js:88
 msgid "Enable"
 msgstr "Aktif"
 
-#: js/apps.js:55
+#: js/apps.js:60
 msgid "Please wait...."
 msgstr ""
 
-#: js/apps.js:59 js/apps.js:71 js/apps.js:80 js/apps.js:93
+#: js/apps.js:64 js/apps.js:76 js/apps.js:85 js/apps.js:98
 msgid "Error"
 msgstr "Ralat"
 
-#: js/apps.js:90
+#: js/apps.js:95
 msgid "Updating...."
 msgstr ""
 
-#: js/apps.js:93
+#: js/apps.js:98
 msgid "Error while updating app"
 msgstr ""
 
-#: js/apps.js:96
+#: js/apps.js:101
 msgid "Updated"
 msgstr ""
 
@@ -165,15 +165,15 @@ msgstr ""
 msgid "A valid password must be provided"
 msgstr ""
 
-#: personal.php:35 personal.php:36
+#: personal.php:37 personal.php:38
 msgid "__language_name__"
 msgstr "_nama_bahasa_"
 
-#: templates/admin.php:15
+#: templates/admin.php:17
 msgid "Security Warning"
 msgstr "Amaran keselamatan"
 
-#: templates/admin.php:18
+#: templates/admin.php:20
 msgid ""
 "Your data directory and your files are probably accessible from the "
 "internet. The .htaccess file that ownCloud provides is not working. We "
@@ -182,36 +182,36 @@ msgid ""
 " webserver document root."
 msgstr ""
 
-#: templates/admin.php:29
+#: templates/admin.php:31
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:32
+#: templates/admin.php:34
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: templates/admin.php:33
+#: templates/admin.php:35
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:44
+#: templates/admin.php:46
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:47
+#: templates/admin.php:49
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr ""
 
-#: templates/admin.php:58
+#: templates/admin.php:60
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:63
+#: templates/admin.php:65
 #, php-format
 msgid ""
 "This ownCloud server can't set system locale to %s. This means that there "
@@ -219,11 +219,11 @@ msgid ""
 " to install the required packages on your system to support %s."
 msgstr ""
 
-#: templates/admin.php:75
+#: templates/admin.php:77
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:78
+#: templates/admin.php:80
 msgid ""
 "This ownCloud server has no working internet connection. This means that "
 "some of the features like mounting of external storage, notifications about "
@@ -233,102 +233,102 @@ msgid ""
 " of ownCloud."
 msgstr ""
 
-#: templates/admin.php:92
+#: templates/admin.php:94
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:101
+#: templates/admin.php:103
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:111
+#: templates/admin.php:113
 msgid ""
 "cron.php is registered at a webcron service. Call the cron.php page in the "
 "owncloud root once a minute over http."
 msgstr ""
 
-#: templates/admin.php:121
+#: templates/admin.php:123
 msgid ""
 "Use systems cron service. Call the cron.php file in the owncloud folder via "
 "a system cronjob once a minute."
 msgstr ""
 
-#: templates/admin.php:128
+#: templates/admin.php:130
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:134
+#: templates/admin.php:136
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:135
+#: templates/admin.php:137
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:142
+#: templates/admin.php:144
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:143
+#: templates/admin.php:145
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:150
+#: templates/admin.php:152
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:151
+#: templates/admin.php:153
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:158
+#: templates/admin.php:160
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:161
+#: templates/admin.php:163
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:168
+#: templates/admin.php:170
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:181
+#: templates/admin.php:183
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:182
+#: templates/admin.php:184
 msgid ""
 "Enforces the clients to connect to ownCloud via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:185
+#: templates/admin.php:187
 msgid ""
 "Please connect to this ownCloud instance via HTTPS to enable or disable the "
 "SSL enforcement."
 msgstr ""
 
-#: templates/admin.php:195
+#: templates/admin.php:197
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:196
+#: templates/admin.php:198
 msgid "Log level"
 msgstr "Tahap Log"
 
-#: templates/admin.php:227
+#: templates/admin.php:229
 msgid "More"
 msgstr "Lanjutan"
 
-#: templates/admin.php:228
+#: templates/admin.php:230
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:235 templates/personal.php:116
+#: templates/admin.php:236 templates/personal.php:116
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:237 templates/personal.php:119
+#: templates/admin.php:240 templates/personal.php:119
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -386,76 +386,79 @@ msgstr ""
 msgid "Commercial Support"
 msgstr ""
 
-#: templates/personal.php:9
+#: templates/personal.php:10
 msgid "Get the apps to sync your files"
 msgstr ""
 
-#: templates/personal.php:20
+#: templates/personal.php:21
 msgid "Show First Run Wizard again"
 msgstr ""
 
-#: templates/personal.php:28
+#: templates/personal.php:29
 #, php-format
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr ""
 
-#: templates/personal.php:40 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:41 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "Kata laluan"
 
-#: templates/personal.php:41
+#: templates/personal.php:42
 msgid "Your password was changed"
 msgstr ""
 
-#: templates/personal.php:42
+#: templates/personal.php:43
 msgid "Unable to change your password"
 msgstr "Gagal mengubah kata laluan anda "
 
-#: templates/personal.php:43
+#: templates/personal.php:44
 msgid "Current password"
 msgstr "Kata laluan semasa"
 
-#: templates/personal.php:45
+#: templates/personal.php:46
 msgid "New password"
 msgstr "Kata laluan baru"
 
-#: templates/personal.php:47
+#: templates/personal.php:48
 msgid "Change password"
 msgstr "Ubah kata laluan"
 
-#: templates/personal.php:59 templates/users.php:85
+#: templates/personal.php:60 templates/users.php:85
 msgid "Display Name"
 msgstr ""
 
-#: templates/personal.php:74
+#: templates/personal.php:75
 msgid "Email"
 msgstr "Email"
 
-#: templates/personal.php:76
+#: templates/personal.php:77
 msgid "Your email address"
 msgstr "Alamat emel anda"
 
-#: templates/personal.php:77
+#: templates/personal.php:78
 msgid "Fill in an email address to enable password recovery"
 msgstr "Isi alamat emel anda untuk membolehkan pemulihan kata laluan"
 
-#: templates/personal.php:86 templates/personal.php:87
+#: templates/personal.php:87 templates/personal.php:88
 msgid "Language"
 msgstr "Bahasa"
 
-#: templates/personal.php:99
+#: templates/personal.php:100
 msgid "Help translate"
 msgstr "Bantu terjemah"
 
-#: templates/personal.php:105
+#: templates/personal.php:106
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:107
-msgid "Use this address to connect to your ownCloud in your file manager"
+#: templates/personal.php:108
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
+"target=\"_blank\">access your Files via WebDAV</a>"
 msgstr ""
 
-#: templates/users.php:21 templates/users.php:84
+#: templates/users.php:21
 msgid "Login Name"
 msgstr ""
 
@@ -485,6 +488,10 @@ msgstr ""
 msgid "Other"
 msgstr "Lain"
 
+#: templates/users.php:84
+msgid "Username"
+msgstr "Nama pengguna"
+
 #: templates/users.php:91
 msgid "Storage"
 msgstr ""
diff --git a/l10n/ms_MY/user_ldap.po b/l10n/ms_MY/user_ldap.po
index 4cf1253323ee5b712429eac5f595e4f41fbff5c8..92ec24c71a856ba0cc8cc70b0560b67cb70988d8 100644
--- a/l10n/ms_MY/user_ldap.po
+++ b/l10n/ms_MY/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:25+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:16+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/my_MM/core.po b/l10n/my_MM/core.po
index 5519e10dbc2b44c6632d04c1d0cb88511b0dca8d..492f9a363db9ffac638ec253b2df5674fd8d4c82 100644
--- a/l10n/my_MM/core.po
+++ b/l10n/my_MM/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:22+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n"
 "MIME-Version: 1.0\n"
@@ -61,135 +61,135 @@ msgstr "ဖျက်ရန်အတွက်ခေါင်းစဉ်မရွ
 msgid "Error removing %s from favorites."
 msgstr ""
 
-#: js/config.php:34
+#: js/config.php:32
 msgid "Sunday"
 msgstr ""
 
-#: js/config.php:35
+#: js/config.php:33
 msgid "Monday"
 msgstr ""
 
-#: js/config.php:36
+#: js/config.php:34
 msgid "Tuesday"
 msgstr ""
 
-#: js/config.php:37
+#: js/config.php:35
 msgid "Wednesday"
 msgstr ""
 
-#: js/config.php:38
+#: js/config.php:36
 msgid "Thursday"
 msgstr ""
 
-#: js/config.php:39
+#: js/config.php:37
 msgid "Friday"
 msgstr ""
 
-#: js/config.php:40
+#: js/config.php:38
 msgid "Saturday"
 msgstr ""
 
-#: js/config.php:45
+#: js/config.php:43
 msgid "January"
 msgstr "ဇန်နဝါရီ"
 
-#: js/config.php:46
+#: js/config.php:44
 msgid "February"
 msgstr "ဖေဖော်ဝါရီ"
 
-#: js/config.php:47
+#: js/config.php:45
 msgid "March"
 msgstr "မတ်"
 
-#: js/config.php:48
+#: js/config.php:46
 msgid "April"
 msgstr "ဧပြီ"
 
-#: js/config.php:49
+#: js/config.php:47
 msgid "May"
 msgstr "မေ"
 
-#: js/config.php:50
+#: js/config.php:48
 msgid "June"
 msgstr "ဇွန်"
 
-#: js/config.php:51
+#: js/config.php:49
 msgid "July"
 msgstr "ဇူလိုင်"
 
-#: js/config.php:52
+#: js/config.php:50
 msgid "August"
 msgstr "ဩဂုတ်"
 
-#: js/config.php:53
+#: js/config.php:51
 msgid "September"
 msgstr "စက်တင်ဘာ"
 
-#: js/config.php:54
+#: js/config.php:52
 msgid "October"
 msgstr "အောက်တိုဘာ"
 
-#: js/config.php:55
+#: js/config.php:53
 msgid "November"
 msgstr "နိုဝင်ဘာ"
 
-#: js/config.php:56
+#: js/config.php:54
 msgid "December"
 msgstr "ဒီဇင်ဘာ"
 
-#: js/js.js:286
+#: js/js.js:293
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:718
+#: js/js.js:725
 msgid "seconds ago"
 msgstr "စက္ကန့်အနည်းငယ်က"
 
-#: js/js.js:719
+#: js/js.js:726
 msgid "1 minute ago"
 msgstr "၁ မိနစ်အရင်က"
 
-#: js/js.js:720
+#: js/js.js:727
 msgid "{minutes} minutes ago"
 msgstr ""
 
-#: js/js.js:721
+#: js/js.js:728
 msgid "1 hour ago"
 msgstr "၁ နာရီ အရင်က"
 
-#: js/js.js:722
+#: js/js.js:729
 msgid "{hours} hours ago"
 msgstr ""
 
-#: js/js.js:723
+#: js/js.js:730
 msgid "today"
 msgstr "ယနေ့"
 
-#: js/js.js:724
+#: js/js.js:731
 msgid "yesterday"
 msgstr "မနေ့က"
 
-#: js/js.js:725
+#: js/js.js:732
 msgid "{days} days ago"
 msgstr ""
 
-#: js/js.js:726
+#: js/js.js:733
 msgid "last month"
 msgstr "ပြီးခဲ့သောလ"
 
-#: js/js.js:727
+#: js/js.js:734
 msgid "{months} months ago"
 msgstr ""
 
-#: js/js.js:728
+#: js/js.js:735
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:729
+#: js/js.js:736
 msgid "last year"
 msgstr "မနှစ်က"
 
-#: js/js.js:730
+#: js/js.js:737
 msgid "years ago"
 msgstr "နှစ် အရင်က"
 
@@ -225,8 +225,8 @@ msgstr ""
 #: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
 #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:577
-#: js/share.js:589
+#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:620
+#: js/share.js:632
 msgid "Error"
 msgstr ""
 
@@ -246,7 +246,7 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: js/share.js:125 js/share.js:617
+#: js/share.js:125 js/share.js:660
 msgid "Error while sharing"
 msgstr ""
 
@@ -266,99 +266,103 @@ msgstr ""
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:159
+#: js/share.js:172
 msgid "Share with"
 msgstr ""
 
-#: js/share.js:164
+#: js/share.js:177
 msgid "Share with link"
 msgstr ""
 
-#: js/share.js:167
+#: js/share.js:180
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:169 templates/installation.php:54 templates/login.php:26
+#: js/share.js:182 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "စကားဝှက်"
 
-#: js/share.js:173
+#: js/share.js:187
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:191
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:174
+#: js/share.js:192
 msgid "Send"
 msgstr ""
 
-#: js/share.js:178
+#: js/share.js:197
 msgid "Set expiration date"
 msgstr "သက်တမ်းကုန်ဆုံးမည့်ရက်သတ်မှတ်မည်"
 
-#: js/share.js:179
+#: js/share.js:198
 msgid "Expiration date"
 msgstr "သက်တမ်းကုန်ဆုံးမည့်ရက်"
 
-#: js/share.js:211
+#: js/share.js:230
 msgid "Share via email:"
 msgstr "အီးမေးလ်ဖြင့်ဝေမျှမည် -"
 
-#: js/share.js:213
+#: js/share.js:232
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:251
+#: js/share.js:270
 msgid "Resharing is not allowed"
 msgstr "ပြန်လည်ဝေမျှခြင်းခွင့်မပြုပါ"
 
-#: js/share.js:287
+#: js/share.js:306
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:308
+#: js/share.js:327
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:320
+#: js/share.js:339
 msgid "can edit"
 msgstr "ပြင်ဆင်နိုင်"
 
-#: js/share.js:322
+#: js/share.js:341
 msgid "access control"
 msgstr ""
 
-#: js/share.js:325
+#: js/share.js:344
 msgid "create"
 msgstr "ဖန်တီးမည်"
 
-#: js/share.js:328
+#: js/share.js:347
 msgid "update"
 msgstr ""
 
-#: js/share.js:331
+#: js/share.js:350
 msgid "delete"
 msgstr "ဖျက်မည်"
 
-#: js/share.js:334
+#: js/share.js:353
 msgid "share"
 msgstr "ဝေမျှမည်"
 
-#: js/share.js:368 js/share.js:564
+#: js/share.js:387 js/share.js:607
 msgid "Password protected"
 msgstr "စကားဝှက်ဖြင့်ကာကွယ်ထားသည်"
 
-#: js/share.js:577
+#: js/share.js:620
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:589
+#: js/share.js:632
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:604
+#: js/share.js:647
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:615
+#: js/share.js:658
 msgid "Email sent"
 msgstr ""
 
@@ -373,7 +377,7 @@ msgstr ""
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
-#: lostpassword/controller.php:58
+#: lostpassword/controller.php:60
 msgid "ownCloud password reset"
 msgstr ""
 
@@ -403,17 +407,17 @@ msgstr "သုံးစွဲသူအမည်"
 
 #: lostpassword/templates/lostpassword.php:22
 msgid ""
-"Your files seems to be encrypted. If you didn't have enabled the recovery "
-"key there will be no way to get your data back once the password was "
-"resetted. If you are not sure what to do, please contact your administrator "
-"first before continue. Do you really want to continue?"
+"Your files are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
 msgstr ""
 
 #: lostpassword/templates/lostpassword.php:24
 msgid "Yes, I really want to reset my password now"
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:29
+#: lostpassword/templates/lostpassword.php:27
 msgid "Request reset"
 msgstr ""
 
@@ -461,7 +465,7 @@ msgstr ""
 msgid "Cloud not found"
 msgstr "မတွေ့ရှိမိပါ"
 
-#: templates/altmail.php:2
+#: templates/altmail.php:4
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -472,10 +476,6 @@ msgid ""
 "Cheers!"
 msgstr ""
 
-#: templates/altmail.php:7 templates/mail.php:24
-msgid "web services under your control"
-msgstr "သင်၏ထိန်းချုပ်မှု့အောက်တွင်ရှိသော Web services"
-
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
 msgstr ""
@@ -568,12 +568,12 @@ msgstr ""
 msgid "Finish setup"
 msgstr "တပ်ဆင်ခြင်းပြီးပါပြီ။"
 
-#: templates/layout.user.php:40
+#: templates/layout.user.php:43
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:67
+#: templates/layout.user.php:68
 msgid "Log out"
 msgstr ""
 
@@ -607,7 +607,7 @@ msgstr "ဝင်ရောက်ရန်"
 msgid "Alternative Logins"
 msgstr ""
 
-#: templates/mail.php:15
+#: templates/mail.php:16
 #, php-format
 msgid ""
 "Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
diff --git a/l10n/my_MM/files.po b/l10n/my_MM/files.po
index 7ef2423ca5ba79b67cd429082282d67d27f83084..2395cb8f7ef90693cecdb72f41df023dc3e3b5ed 100644
--- a/l10n/my_MM/files.po
+++ b/l10n/my_MM/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:01+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n"
 "MIME-Version: 1.0\n"
@@ -27,46 +27,54 @@ msgstr ""
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/upload.php:19
+#: ajax/upload.php:16 ajax/upload.php:45
+msgid "Unable to set upload directory."
+msgstr ""
+
+#: ajax/upload.php:22
+msgid "Invalid Token"
+msgstr ""
+
+#: ajax/upload.php:59
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: ajax/upload.php:26
+#: ajax/upload.php:66
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/upload.php:27
+#: ajax/upload.php:67
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:29
+#: ajax/upload.php:69
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/upload.php:30
+#: ajax/upload.php:70
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/upload.php:31
+#: ajax/upload.php:71
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/upload.php:32
+#: ajax/upload.php:72
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/upload.php:33
+#: ajax/upload.php:73
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:51
+#: ajax/upload.php:91
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:83
+#: ajax/upload.php:123
 msgid "Invalid directory."
 msgstr ""
 
@@ -74,6 +82,36 @@ msgstr ""
 msgid "Files"
 msgstr "ဖိုင်များ"
 
+#: js/file-upload.js:11
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/file-upload.js:24
+msgid "Not enough space available"
+msgstr ""
+
+#: js/file-upload.js:64
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/file-upload.js:167 js/files.js:266
+msgid ""
+"File upload is in progress. Leaving the page now will cancel the upload."
+msgstr ""
+
+#: js/file-upload.js:233 js/files.js:339
+msgid "URL cannot be empty."
+msgstr ""
+
+#: js/file-upload.js:238 lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr ""
+
+#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
+#: js/files.js:693 js/files.js:731
+msgid "Error"
+msgstr ""
+
 #: js/fileactions.js:116
 msgid "Share"
 msgstr ""
@@ -90,43 +128,43 @@ msgstr ""
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:464
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:259
+#: js/filelist.js:302
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:306
+#: js/filelist.js:349
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:306
+#: js/filelist.js:349
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:331
+#: js/filelist.js:374
 msgid "perform delete operation"
 msgstr ""
 
-#: js/filelist.js:413
+#: js/filelist.js:456
 msgid "1 file uploading"
 msgstr ""
 
-#: js/filelist.js:416 js/filelist.js:470
+#: js/filelist.js:459 js/filelist.js:517
 msgid "files uploading"
 msgstr ""
 
@@ -158,69 +196,41 @@ msgid ""
 "big."
 msgstr ""
 
-#: js/files.js:264
-msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr ""
-
-#: js/files.js:277
-msgid "Not enough space available"
-msgstr ""
-
-#: js/files.js:317
-msgid "Upload cancelled."
-msgstr ""
-
-#: js/files.js:413
-msgid ""
-"File upload is in progress. Leaving the page now will cancel the upload."
-msgstr ""
-
-#: js/files.js:486
-msgid "URL cannot be empty."
-msgstr ""
-
-#: js/files.js:491
+#: js/files.js:344
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
-msgid "Error"
-msgstr ""
-
-#: js/files.js:877 templates/index.php:69
+#: js/files.js:744 templates/index.php:69
 msgid "Name"
 msgstr ""
 
-#: js/files.js:878 templates/index.php:80
+#: js/files.js:745 templates/index.php:80
 msgid "Size"
 msgstr ""
 
-#: js/files.js:879 templates/index.php:82
+#: js/files.js:746 templates/index.php:82
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:898
+#: js/files.js:765
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:900
+#: js/files.js:767
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:908
+#: js/files.js:775
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:910
+#: js/files.js:777
 msgid "{count} files"
 msgstr ""
 
-#: lib/app.php:53
-msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
-msgstr ""
-
 #: lib/app.php:73
-msgid "Unable to rename file"
+#, php-format
+msgid "%s could not be renamed"
 msgstr ""
 
 #: lib/helper.php:11 templates/index.php:18
@@ -317,6 +327,22 @@ msgstr ""
 msgid "Current scanning"
 msgstr ""
 
+#: templates/part.list.php:76
+msgid "directory"
+msgstr ""
+
+#: templates/part.list.php:78
+msgid "directories"
+msgstr ""
+
+#: templates/part.list.php:87
+msgid "file"
+msgstr ""
+
+#: templates/part.list.php:89
+msgid "files"
+msgstr ""
+
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
 msgstr ""
diff --git a/l10n/my_MM/files_encryption.po b/l10n/my_MM/files_encryption.po
index 5c24e30b340fb081297aba1bc56ed64de8e0e398..3465eb2405ec5931f8228c3bdbc27beb3a6b0ae4 100644
--- a/l10n/my_MM/files_encryption.po
+++ b/l10n/my_MM/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-14 02:46+0200\n"
-"PO-Revision-Date: 2013-06-14 00:47+0000\n"
+"POT-Creation-Date: 2013-07-05 02:12+0200\n"
+"PO-Revision-Date: 2013-07-05 00:13+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n"
 "MIME-Version: 1.0\n"
@@ -55,9 +55,21 @@ msgstr ""
 
 #: files/error.php:7
 msgid ""
-"Your private key is not valid! Maybe your password was changed from outside."
-" You can update your private key password in your personal settings to "
-"regain access to your files"
+"Your private key is not valid! Likely your password was changed outside the "
+"ownCloud system (e.g. your corporate directory). You can update your private"
+" key password in your personal settings to recover access to your encrypted "
+"files."
+msgstr ""
+
+#: hooks/hooks.php:44
+msgid "Missing requirements."
+msgstr ""
+
+#: hooks/hooks.php:45
+msgid ""
+"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL "
+"PHP extension is enabled and configured properly. For now, the encryption "
+"app has been disabled."
 msgstr ""
 
 #: js/settings-admin.js:11
@@ -84,11 +96,11 @@ msgstr ""
 
 #: templates/settings-admin.php:10
 msgid ""
-"Enable encryption passwords recovery key (allow sharing to recovery key):"
+"Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
 #: templates/settings-admin.php:14
-msgid "Recovery account password"
+msgid "Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:21 templates/settings-personal.php:54
@@ -100,15 +112,15 @@ msgid "Disabled"
 msgstr ""
 
 #: templates/settings-admin.php:34
-msgid "Change encryption passwords recovery key:"
+msgid "Change recovery key password:"
 msgstr ""
 
 #: templates/settings-admin.php:41
-msgid "Old Recovery account password"
+msgid "Old Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:48
-msgid "New Recovery account password"
+msgid "New Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:53
diff --git a/l10n/my_MM/files_sharing.po b/l10n/my_MM/files_sharing.po
index b32b0ce216ed59803a109ff68ac8b60bfa74a043..ccf2d42dd235d31f579a6cda19c8e5118f11c0e8 100644
--- a/l10n/my_MM/files_sharing.po
+++ b/l10n/my_MM/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n"
 "MIME-Version: 1.0\n"
@@ -18,27 +18,39 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: templates/authenticate.php:4
+msgid "The password is wrong. Try again."
+msgstr ""
+
+#: templates/authenticate.php:7
 msgid "Password"
 msgstr "စကားဝှက်"
 
-#: templates/authenticate.php:6
+#: templates/authenticate.php:9
 msgid "Submit"
 msgstr "ထည့်သွင်းမည်"
 
-#: templates/public.php:10
+#: templates/public.php:17
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr ""
 
-#: templates/public.php:13
+#: templates/public.php:20
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr ""
 
-#: templates/public.php:19 templates/public.php:43
+#: templates/public.php:28 templates/public.php:90
 msgid "Download"
 msgstr "ဒေါင်းလုတ်"
 
-#: templates/public.php:40
+#: templates/public.php:45 templates/public.php:48
+msgid "Upload"
+msgstr ""
+
+#: templates/public.php:58
+msgid "Cancel upload"
+msgstr ""
+
+#: templates/public.php:87
 msgid "No preview available for"
 msgstr ""
diff --git a/l10n/my_MM/lib.po b/l10n/my_MM/lib.po
index 9af080dfd0955529b1a671427594ce2cd6aa4c95..21d94816e315bee0e7d8c97df3ceb1743ee9aa6a 100644
--- a/l10n/my_MM/lib.po
+++ b/l10n/my_MM/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n"
 "MIME-Version: 1.0\n"
@@ -17,43 +17,47 @@ msgstr ""
 "Language: my_MM\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: app.php:359
+#: app.php:360
 msgid "Help"
 msgstr "အကူအညီ"
 
-#: app.php:372
+#: app.php:373
 msgid "Personal"
 msgstr ""
 
-#: app.php:383
+#: app.php:384
 msgid "Settings"
 msgstr ""
 
-#: app.php:395
+#: app.php:396
 msgid "Users"
 msgstr "သုံးစွဲသူ"
 
-#: app.php:408
+#: app.php:409
 msgid "Apps"
 msgstr "Apps"
 
-#: app.php:416
+#: app.php:417
 msgid "Admin"
 msgstr "အက်ဒမင်"
 
-#: files.php:210
+#: defaults.php:33
+msgid "web services under your control"
+msgstr "သင်၏ထိန်းချုပ်မှု့အောက်တွင်ရှိသော Web services"
+
+#: files.php:226
 msgid "ZIP download is turned off."
 msgstr "ZIP ဒေါင်းလုတ်ကိုပိတ်ထားသည်"
 
-#: files.php:211
+#: files.php:227
 msgid "Files need to be downloaded one by one."
 msgstr "ဖိုင်များသည် တစ်ခုပြီး တစ်ခုဒေါင်းလုတ်ချရန်လိုအပ်သည်"
 
-#: files.php:212 files.php:245
+#: files.php:228 files.php:261
 msgid "Back to Files"
 msgstr "ဖိုင်သို့ပြန်သွားမည်"
 
-#: files.php:242
+#: files.php:258
 msgid "Selected files too large to generate zip file."
 msgstr "zip ဖိုင်အဖြစ်ပြုလုပ်ရန် ရွေးချယ်ထားသောဖိုင်များသည် အရမ်းကြီးလွန်းသည်"
 
@@ -85,104 +89,102 @@ msgstr "စာသား"
 msgid "Images"
 msgstr "ပုံရိပ်များ"
 
-#: setup.php:34
-msgid "Set an admin username."
-msgstr ""
-
-#: setup.php:37
-msgid "Set an admin password."
-msgstr ""
-
-#: setup.php:55
+#: setup/abstractdatabase.php:22
 #, php-format
 msgid "%s enter the database username."
 msgstr ""
 
-#: setup.php:58
+#: setup/abstractdatabase.php:25
 #, php-format
 msgid "%s enter the database name."
 msgstr ""
 
-#: setup.php:61
+#: setup/abstractdatabase.php:28
 #, php-format
 msgid "%s you may not use dots in the database name"
 msgstr ""
 
-#: setup.php:64
+#: setup/mssql.php:20
 #, php-format
-msgid "%s set the database host."
-msgstr ""
-
-#: setup.php:126 setup.php:332 setup.php:377
-msgid "PostgreSQL username and/or password not valid"
+msgid "MS SQL username and/or password not valid: %s"
 msgstr ""
 
-#: setup.php:127 setup.php:235
+#: setup/mssql.php:21 setup/mysql.php:13 setup/oci.php:114
+#: setup/postgresql.php:24 setup/postgresql.php:70
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:152
-msgid "Oracle connection could not be established"
-msgstr ""
-
-#: setup.php:234
+#: setup/mysql.php:12
 msgid "MySQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:288 setup.php:398 setup.php:407 setup.php:425 setup.php:435
-#: setup.php:444 setup.php:477 setup.php:543 setup.php:569 setup.php:576
-#: setup.php:587 setup.php:594 setup.php:603 setup.php:611 setup.php:620
-#: setup.php:626
+#: setup/mysql.php:67 setup/oci.php:54 setup/oci.php:121 setup/oci.php:147
+#: setup/oci.php:154 setup/oci.php:165 setup/oci.php:172 setup/oci.php:181
+#: setup/oci.php:189 setup/oci.php:198 setup/oci.php:204
+#: setup/postgresql.php:89 setup/postgresql.php:98 setup/postgresql.php:115
+#: setup/postgresql.php:125 setup/postgresql.php:134
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr ""
 
-#: setup.php:289 setup.php:399 setup.php:408 setup.php:426 setup.php:436
-#: setup.php:445 setup.php:478 setup.php:544 setup.php:570 setup.php:577
-#: setup.php:588 setup.php:604 setup.php:612 setup.php:621
+#: setup/mysql.php:68 setup/oci.php:55 setup/oci.php:122 setup/oci.php:148
+#: setup/oci.php:155 setup/oci.php:166 setup/oci.php:182 setup/oci.php:190
+#: setup/oci.php:199 setup/postgresql.php:90 setup/postgresql.php:99
+#: setup/postgresql.php:116 setup/postgresql.php:126 setup/postgresql.php:135
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:305
+#: setup/mysql.php:85
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:306
+#: setup/mysql.php:86
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:311
+#: setup/mysql.php:91
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:312
+#: setup/mysql.php:92
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:469 setup.php:536
+#: setup/oci.php:34
+msgid "Oracle connection could not be established"
+msgstr ""
+
+#: setup/oci.php:41 setup/oci.php:113
 msgid "Oracle username and/or password not valid"
 msgstr ""
 
-#: setup.php:595 setup.php:627
+#: setup/oci.php:173 setup/oci.php:205
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:647
-#, php-format
-msgid "MS SQL username and/or password not valid: %s"
+#: setup/postgresql.php:23 setup/postgresql.php:69
+msgid "PostgreSQL username and/or password not valid"
+msgstr ""
+
+#: setup.php:42
+msgid "Set an admin username."
+msgstr ""
+
+#: setup.php:45
+msgid "Set an admin password."
 msgstr ""
 
-#: setup.php:870
+#: setup.php:198
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:871
+#: setup.php:199
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
diff --git a/l10n/my_MM/settings.po b/l10n/my_MM/settings.po
index 6053a208e8289c830a42408f9b2e055922570239..be3a8d04bcb517e1a8ef35fb1f620372113e127c 100644
--- a/l10n/my_MM/settings.po
+++ b/l10n/my_MM/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-11 01:57+0200\n"
-"PO-Revision-Date: 2013-06-10 23:57+0000\n"
+"POT-Creation-Date: 2013-07-09 02:04+0200\n"
+"PO-Revision-Date: 2013-07-09 00:04+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n"
 "MIME-Version: 1.0\n"
@@ -58,7 +58,7 @@ msgstr ""
 msgid "Unable to delete group"
 msgstr ""
 
-#: ajax/removeuser.php:24
+#: ajax/removeuser.php:25
 msgid "Unable to delete user"
 msgstr ""
 
@@ -88,35 +88,35 @@ msgstr ""
 msgid "Couldn't update app."
 msgstr ""
 
-#: js/apps.js:30
+#: js/apps.js:35
 msgid "Update to {appversion}"
 msgstr ""
 
-#: js/apps.js:36 js/apps.js:76
+#: js/apps.js:41 js/apps.js:81
 msgid "Disable"
 msgstr ""
 
-#: js/apps.js:36 js/apps.js:64 js/apps.js:83
+#: js/apps.js:41 js/apps.js:69 js/apps.js:88
 msgid "Enable"
 msgstr ""
 
-#: js/apps.js:55
+#: js/apps.js:60
 msgid "Please wait...."
 msgstr ""
 
-#: js/apps.js:59 js/apps.js:71 js/apps.js:80 js/apps.js:93
+#: js/apps.js:64 js/apps.js:76 js/apps.js:85 js/apps.js:98
 msgid "Error"
 msgstr ""
 
-#: js/apps.js:90
+#: js/apps.js:95
 msgid "Updating...."
 msgstr ""
 
-#: js/apps.js:93
+#: js/apps.js:98
 msgid "Error while updating app"
 msgstr ""
 
-#: js/apps.js:96
+#: js/apps.js:101
 msgid "Updated"
 msgstr ""
 
@@ -165,15 +165,15 @@ msgstr ""
 msgid "A valid password must be provided"
 msgstr ""
 
-#: personal.php:35 personal.php:36
+#: personal.php:37 personal.php:38
 msgid "__language_name__"
 msgstr ""
 
-#: templates/admin.php:15
+#: templates/admin.php:17
 msgid "Security Warning"
 msgstr "လုံခြုံရေးသတိပေးချက်"
 
-#: templates/admin.php:18
+#: templates/admin.php:20
 msgid ""
 "Your data directory and your files are probably accessible from the "
 "internet. The .htaccess file that ownCloud provides is not working. We "
@@ -182,36 +182,36 @@ msgid ""
 " webserver document root."
 msgstr ""
 
-#: templates/admin.php:29
+#: templates/admin.php:31
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:32
+#: templates/admin.php:34
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: templates/admin.php:33
+#: templates/admin.php:35
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:44
+#: templates/admin.php:46
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:47
+#: templates/admin.php:49
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr ""
 
-#: templates/admin.php:58
+#: templates/admin.php:60
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:63
+#: templates/admin.php:65
 #, php-format
 msgid ""
 "This ownCloud server can't set system locale to %s. This means that there "
@@ -219,11 +219,11 @@ msgid ""
 " to install the required packages on your system to support %s."
 msgstr ""
 
-#: templates/admin.php:75
+#: templates/admin.php:77
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:78
+#: templates/admin.php:80
 msgid ""
 "This ownCloud server has no working internet connection. This means that "
 "some of the features like mounting of external storage, notifications about "
@@ -233,102 +233,102 @@ msgid ""
 " of ownCloud."
 msgstr ""
 
-#: templates/admin.php:92
+#: templates/admin.php:94
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:101
+#: templates/admin.php:103
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:111
+#: templates/admin.php:113
 msgid ""
 "cron.php is registered at a webcron service. Call the cron.php page in the "
 "owncloud root once a minute over http."
 msgstr ""
 
-#: templates/admin.php:121
+#: templates/admin.php:123
 msgid ""
 "Use systems cron service. Call the cron.php file in the owncloud folder via "
 "a system cronjob once a minute."
 msgstr ""
 
-#: templates/admin.php:128
+#: templates/admin.php:130
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:134
+#: templates/admin.php:136
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:135
+#: templates/admin.php:137
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:142
+#: templates/admin.php:144
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:143
+#: templates/admin.php:145
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:150
+#: templates/admin.php:152
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:151
+#: templates/admin.php:153
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:158
+#: templates/admin.php:160
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:161
+#: templates/admin.php:163
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:168
+#: templates/admin.php:170
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:181
+#: templates/admin.php:183
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:182
+#: templates/admin.php:184
 msgid ""
 "Enforces the clients to connect to ownCloud via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:185
+#: templates/admin.php:187
 msgid ""
 "Please connect to this ownCloud instance via HTTPS to enable or disable the "
 "SSL enforcement."
 msgstr ""
 
-#: templates/admin.php:195
+#: templates/admin.php:197
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:196
+#: templates/admin.php:198
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:227
+#: templates/admin.php:229
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:228
+#: templates/admin.php:230
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:235 templates/personal.php:111
+#: templates/admin.php:236 templates/personal.php:116
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:237 templates/personal.php:114
+#: templates/admin.php:240 templates/personal.php:119
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -338,27 +338,27 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr ""
 
-#: templates/apps.php:11
+#: templates/apps.php:13
 msgid "Add your App"
 msgstr ""
 
-#: templates/apps.php:12
+#: templates/apps.php:28
 msgid "More Apps"
 msgstr ""
 
-#: templates/apps.php:28
+#: templates/apps.php:33
 msgid "Select an App"
 msgstr ""
 
-#: templates/apps.php:34
+#: templates/apps.php:39
 msgid "See application page at apps.owncloud.com"
 msgstr ""
 
-#: templates/apps.php:36
+#: templates/apps.php:41
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr ""
 
-#: templates/apps.php:38
+#: templates/apps.php:43
 msgid "Update"
 msgstr ""
 
@@ -386,76 +386,79 @@ msgstr ""
 msgid "Commercial Support"
 msgstr ""
 
-#: templates/personal.php:8
-#, php-format
-msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
-msgstr ""
-
-#: templates/personal.php:15
+#: templates/personal.php:10
 msgid "Get the apps to sync your files"
 msgstr ""
 
-#: templates/personal.php:26
+#: templates/personal.php:21
 msgid "Show First Run Wizard again"
 msgstr ""
 
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:29
+#, php-format
+msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
+msgstr ""
+
+#: templates/personal.php:41 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "စကားဝှက်"
 
-#: templates/personal.php:38
+#: templates/personal.php:42
 msgid "Your password was changed"
 msgstr ""
 
-#: templates/personal.php:39
+#: templates/personal.php:43
 msgid "Unable to change your password"
 msgstr ""
 
-#: templates/personal.php:40
+#: templates/personal.php:44
 msgid "Current password"
 msgstr ""
 
-#: templates/personal.php:42
+#: templates/personal.php:46
 msgid "New password"
 msgstr "စကားဝှက်အသစ်"
 
-#: templates/personal.php:44
+#: templates/personal.php:48
 msgid "Change password"
 msgstr ""
 
-#: templates/personal.php:56 templates/users.php:85
+#: templates/personal.php:60 templates/users.php:85
 msgid "Display Name"
 msgstr ""
 
-#: templates/personal.php:71
+#: templates/personal.php:75
 msgid "Email"
 msgstr ""
 
-#: templates/personal.php:73
+#: templates/personal.php:77
 msgid "Your email address"
 msgstr ""
 
-#: templates/personal.php:74
+#: templates/personal.php:78
 msgid "Fill in an email address to enable password recovery"
 msgstr ""
 
-#: templates/personal.php:83 templates/personal.php:84
+#: templates/personal.php:87 templates/personal.php:88
 msgid "Language"
 msgstr ""
 
-#: templates/personal.php:95
+#: templates/personal.php:100
 msgid "Help translate"
 msgstr ""
 
-#: templates/personal.php:100
+#: templates/personal.php:106
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:102
-msgid "Use this address to connect to your ownCloud in your file manager"
+#: templates/personal.php:108
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
+"target=\"_blank\">access your Files via WebDAV</a>"
 msgstr ""
 
-#: templates/users.php:21 templates/users.php:84
+#: templates/users.php:21
 msgid "Login Name"
 msgstr ""
 
@@ -485,6 +488,10 @@ msgstr ""
 msgid "Other"
 msgstr ""
 
+#: templates/users.php:84
+msgid "Username"
+msgstr "သုံးစွဲသူအမည်"
+
 #: templates/users.php:91
 msgid "Storage"
 msgstr ""
diff --git a/l10n/my_MM/user_ldap.po b/l10n/my_MM/user_ldap.po
index f5d26e3942c2384645cb5c9272fb4edbf4df04a5..be14d277016e7823fcfd7a19bd13aa36b8a552fb 100644
--- a/l10n/my_MM/user_ldap.po
+++ b/l10n/my_MM/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-25 02:01+0200\n"
-"PO-Revision-Date: 2013-05-24 13:28+0000\n"
+"POT-Creation-Date: 2013-06-23 01:59+0200\n"
+"PO-Revision-Date: 2013-06-22 10:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/nb_NO/core.po b/l10n/nb_NO/core.po
index 5152e81c5c903568fd7d1f5a6886f8dcd2165db6..4eb5129e269e1a02cb4b9809675e87122471445c 100644
--- a/l10n/nb_NO/core.po
+++ b/l10n/nb_NO/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:22+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -61,135 +61,135 @@ msgstr "Ingen kategorier merket for sletting."
 msgid "Error removing %s from favorites."
 msgstr ""
 
-#: js/config.php:34
+#: js/config.php:32
 msgid "Sunday"
 msgstr "Søndag"
 
-#: js/config.php:35
+#: js/config.php:33
 msgid "Monday"
 msgstr "Mandag"
 
-#: js/config.php:36
+#: js/config.php:34
 msgid "Tuesday"
 msgstr "Tirsdag"
 
-#: js/config.php:37
+#: js/config.php:35
 msgid "Wednesday"
 msgstr "Onsdag"
 
-#: js/config.php:38
+#: js/config.php:36
 msgid "Thursday"
 msgstr "Torsdag"
 
-#: js/config.php:39
+#: js/config.php:37
 msgid "Friday"
 msgstr "Fredag"
 
-#: js/config.php:40
+#: js/config.php:38
 msgid "Saturday"
 msgstr "Lørdag"
 
-#: js/config.php:45
+#: js/config.php:43
 msgid "January"
 msgstr "Januar"
 
-#: js/config.php:46
+#: js/config.php:44
 msgid "February"
 msgstr "Februar"
 
-#: js/config.php:47
+#: js/config.php:45
 msgid "March"
 msgstr "Mars"
 
-#: js/config.php:48
+#: js/config.php:46
 msgid "April"
 msgstr "April"
 
-#: js/config.php:49
+#: js/config.php:47
 msgid "May"
 msgstr "Mai"
 
-#: js/config.php:50
+#: js/config.php:48
 msgid "June"
 msgstr "Juni"
 
-#: js/config.php:51
+#: js/config.php:49
 msgid "July"
 msgstr "Juli"
 
-#: js/config.php:52
+#: js/config.php:50
 msgid "August"
 msgstr "August"
 
-#: js/config.php:53
+#: js/config.php:51
 msgid "September"
 msgstr "September"
 
-#: js/config.php:54
+#: js/config.php:52
 msgid "October"
 msgstr "Oktober"
 
-#: js/config.php:55
+#: js/config.php:53
 msgid "November"
 msgstr "November"
 
-#: js/config.php:56
+#: js/config.php:54
 msgid "December"
 msgstr "Desember"
 
-#: js/js.js:286
+#: js/js.js:293
 msgid "Settings"
 msgstr "Innstillinger"
 
-#: js/js.js:718
+#: js/js.js:725
 msgid "seconds ago"
 msgstr "sekunder siden"
 
-#: js/js.js:719
+#: js/js.js:726
 msgid "1 minute ago"
 msgstr "1 minutt siden"
 
-#: js/js.js:720
+#: js/js.js:727
 msgid "{minutes} minutes ago"
 msgstr "{minutes} minutter siden"
 
-#: js/js.js:721
+#: js/js.js:728
 msgid "1 hour ago"
 msgstr "1 time siden"
 
-#: js/js.js:722
+#: js/js.js:729
 msgid "{hours} hours ago"
 msgstr "{hours} timer siden"
 
-#: js/js.js:723
+#: js/js.js:730
 msgid "today"
 msgstr "i dag"
 
-#: js/js.js:724
+#: js/js.js:731
 msgid "yesterday"
 msgstr "i går"
 
-#: js/js.js:725
+#: js/js.js:732
 msgid "{days} days ago"
 msgstr "{days} dager siden"
 
-#: js/js.js:726
+#: js/js.js:733
 msgid "last month"
 msgstr "forrige måned"
 
-#: js/js.js:727
+#: js/js.js:734
 msgid "{months} months ago"
 msgstr "{months} måneder siden"
 
-#: js/js.js:728
+#: js/js.js:735
 msgid "months ago"
 msgstr "måneder siden"
 
-#: js/js.js:729
+#: js/js.js:736
 msgid "last year"
 msgstr "forrige år"
 
-#: js/js.js:730
+#: js/js.js:737
 msgid "years ago"
 msgstr "Ã¥r siden"
 
@@ -225,8 +225,8 @@ msgstr ""
 #: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
 #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:577
-#: js/share.js:589
+#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:620
+#: js/share.js:632
 msgid "Error"
 msgstr "Feil"
 
@@ -246,7 +246,7 @@ msgstr ""
 msgid "Share"
 msgstr "Del"
 
-#: js/share.js:125 js/share.js:617
+#: js/share.js:125 js/share.js:660
 msgid "Error while sharing"
 msgstr "Feil under deling"
 
@@ -266,99 +266,103 @@ msgstr ""
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:159
+#: js/share.js:172
 msgid "Share with"
 msgstr "Del med"
 
-#: js/share.js:164
+#: js/share.js:177
 msgid "Share with link"
 msgstr "Del med link"
 
-#: js/share.js:167
+#: js/share.js:180
 msgid "Password protect"
 msgstr "Passordbeskyttet"
 
-#: js/share.js:169 templates/installation.php:54 templates/login.php:26
+#: js/share.js:182 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "Passord"
 
-#: js/share.js:173
+#: js/share.js:187
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:191
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:174
+#: js/share.js:192
 msgid "Send"
 msgstr "Send"
 
-#: js/share.js:178
+#: js/share.js:197
 msgid "Set expiration date"
 msgstr "Set utløpsdato"
 
-#: js/share.js:179
+#: js/share.js:198
 msgid "Expiration date"
 msgstr "Utløpsdato"
 
-#: js/share.js:211
+#: js/share.js:230
 msgid "Share via email:"
 msgstr "Del på epost"
 
-#: js/share.js:213
+#: js/share.js:232
 msgid "No people found"
 msgstr "Ingen personer funnet"
 
-#: js/share.js:251
+#: js/share.js:270
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:287
+#: js/share.js:306
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:308
+#: js/share.js:327
 msgid "Unshare"
 msgstr "Avslutt deling"
 
-#: js/share.js:320
+#: js/share.js:339
 msgid "can edit"
 msgstr "kan endre"
 
-#: js/share.js:322
+#: js/share.js:341
 msgid "access control"
 msgstr "tilgangskontroll"
 
-#: js/share.js:325
+#: js/share.js:344
 msgid "create"
 msgstr "opprett"
 
-#: js/share.js:328
+#: js/share.js:347
 msgid "update"
 msgstr "oppdater"
 
-#: js/share.js:331
+#: js/share.js:350
 msgid "delete"
 msgstr "slett"
 
-#: js/share.js:334
+#: js/share.js:353
 msgid "share"
 msgstr "del"
 
-#: js/share.js:368 js/share.js:564
+#: js/share.js:387 js/share.js:607
 msgid "Password protected"
 msgstr "Passordbeskyttet"
 
-#: js/share.js:577
+#: js/share.js:620
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:589
+#: js/share.js:632
 msgid "Error setting expiration date"
 msgstr "Kan ikke sette utløpsdato"
 
-#: js/share.js:604
+#: js/share.js:647
 msgid "Sending ..."
 msgstr "Sender..."
 
-#: js/share.js:615
+#: js/share.js:658
 msgid "Email sent"
 msgstr "E-post sendt"
 
@@ -373,7 +377,7 @@ msgstr ""
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
-#: lostpassword/controller.php:58
+#: lostpassword/controller.php:60
 msgid "ownCloud password reset"
 msgstr "Tilbakestill ownCloud passord"
 
@@ -403,17 +407,17 @@ msgstr "Brukernavn"
 
 #: lostpassword/templates/lostpassword.php:22
 msgid ""
-"Your files seems to be encrypted. If you didn't have enabled the recovery "
-"key there will be no way to get your data back once the password was "
-"resetted. If you are not sure what to do, please contact your administrator "
-"first before continue. Do you really want to continue?"
+"Your files are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
 msgstr ""
 
 #: lostpassword/templates/lostpassword.php:24
 msgid "Yes, I really want to reset my password now"
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:29
+#: lostpassword/templates/lostpassword.php:27
 msgid "Request reset"
 msgstr "Anmod tilbakestilling"
 
@@ -461,7 +465,7 @@ msgstr "Tilgang nektet"
 msgid "Cloud not found"
 msgstr "Sky ikke funnet"
 
-#: templates/altmail.php:2
+#: templates/altmail.php:4
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -472,10 +476,6 @@ msgid ""
 "Cheers!"
 msgstr ""
 
-#: templates/altmail.php:7 templates/mail.php:24
-msgid "web services under your control"
-msgstr "web tjenester du kontrollerer"
-
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
 msgstr "Rediger kategorier"
@@ -568,12 +568,12 @@ msgstr "Databasevert"
 msgid "Finish setup"
 msgstr "Fullfør oppsetting"
 
-#: templates/layout.user.php:40
+#: templates/layout.user.php:43
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:67
+#: templates/layout.user.php:68
 msgid "Log out"
 msgstr "Logg ut"
 
@@ -607,7 +607,7 @@ msgstr "Logg inn"
 msgid "Alternative Logins"
 msgstr ""
 
-#: templates/mail.php:15
+#: templates/mail.php:16
 #, php-format
 msgid ""
 "Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
diff --git a/l10n/nb_NO/files.po b/l10n/nb_NO/files.po
index 89e882aea205b364311bc78925af51e8151786e3..5f194c2550edd0ed75eec942e9939fce4bb4768f 100644
--- a/l10n/nb_NO/files.po
+++ b/l10n/nb_NO/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-06-17 02:01+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
-"Last-Translator: Hans Nesse <>\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -28,46 +28,54 @@ msgstr "Kan ikke flytte %s - En fil med samme navn finnes allerede"
 msgid "Could not move %s"
 msgstr "Kunne ikke flytte %s"
 
-#: ajax/upload.php:19
+#: ajax/upload.php:16 ajax/upload.php:45
+msgid "Unable to set upload directory."
+msgstr ""
+
+#: ajax/upload.php:22
+msgid "Invalid Token"
+msgstr ""
+
+#: ajax/upload.php:59
 msgid "No file was uploaded. Unknown error"
 msgstr "Ingen filer ble lastet opp. Ukjent feil."
 
-#: ajax/upload.php:26
+#: ajax/upload.php:66
 msgid "There is no error, the file uploaded with success"
 msgstr "Pust ut, ingen feil. Filen ble lastet opp problemfritt"
 
-#: ajax/upload.php:27
+#: ajax/upload.php:67
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr "Filstørrelsen overskrider maksgrensedirektivet upload_max_filesize i php.ini-konfigurasjonen."
 
-#: ajax/upload.php:29
+#: ajax/upload.php:69
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Filen du prøvde å laste opp var større enn grensen satt i MAX_FILE_SIZE i HTML-skjemaet."
 
-#: ajax/upload.php:30
+#: ajax/upload.php:70
 msgid "The uploaded file was only partially uploaded"
 msgstr "Filen du prøvde å laste opp ble kun delvis lastet opp"
 
-#: ajax/upload.php:31
+#: ajax/upload.php:71
 msgid "No file was uploaded"
 msgstr "Ingen filer ble lastet opp"
 
-#: ajax/upload.php:32
+#: ajax/upload.php:72
 msgid "Missing a temporary folder"
 msgstr "Mangler midlertidig mappe"
 
-#: ajax/upload.php:33
+#: ajax/upload.php:73
 msgid "Failed to write to disk"
 msgstr "Klarte ikke å skrive til disk"
 
-#: ajax/upload.php:51
+#: ajax/upload.php:91
 msgid "Not enough storage available"
 msgstr "Ikke nok lagringsplass"
 
-#: ajax/upload.php:83
+#: ajax/upload.php:123
 msgid "Invalid directory."
 msgstr "Ugyldig katalog."
 
@@ -75,6 +83,36 @@ msgstr "Ugyldig katalog."
 msgid "Files"
 msgstr "Filer"
 
+#: js/file-upload.js:11
+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/file-upload.js:24
+msgid "Not enough space available"
+msgstr "Ikke nok lagringsplass"
+
+#: js/file-upload.js:64
+msgid "Upload cancelled."
+msgstr "Opplasting avbrutt."
+
+#: js/file-upload.js:167 js/files.js:266
+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/file-upload.js:233 js/files.js:339
+msgid "URL cannot be empty."
+msgstr "URL-en kan ikke være tom."
+
+#: js/file-upload.js:238 lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr "Ugyldig mappenavn. Bruk av \"Shared\" er reservert av ownCloud."
+
+#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
+#: js/files.js:693 js/files.js:731
+msgid "Error"
+msgstr "Feil"
+
 #: js/fileactions.js:116
 msgid "Share"
 msgstr "Del"
@@ -91,43 +129,43 @@ msgstr "Slett"
 msgid "Rename"
 msgstr "Omdøp"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:464
 msgid "Pending"
 msgstr "Ventende"
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "{new_name} already exists"
 msgstr "{new_name} finnes allerede"
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "replace"
 msgstr "erstatt"
 
-#: js/filelist.js:259
+#: js/filelist.js:302
 msgid "suggest name"
 msgstr "foreslå navn"
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "cancel"
 msgstr "avbryt"
 
-#: js/filelist.js:306
+#: js/filelist.js:349
 msgid "replaced {new_name} with {old_name}"
 msgstr "erstatt {new_name} med {old_name}"
 
-#: js/filelist.js:306
+#: js/filelist.js:349
 msgid "undo"
 msgstr "angre"
 
-#: js/filelist.js:331
+#: js/filelist.js:374
 msgid "perform delete operation"
 msgstr "utfør sletting"
 
-#: js/filelist.js:413
+#: js/filelist.js:456
 msgid "1 file uploading"
 msgstr "1 fil lastes opp"
 
-#: js/filelist.js:416 js/filelist.js:470
+#: js/filelist.js:459 js/filelist.js:517
 msgid "files uploading"
 msgstr "filer lastes opp"
 
@@ -159,70 +197,42 @@ msgid ""
 "big."
 msgstr "Nedlastingen din klargjøres. Hvis filene er store kan dette ta litt tid."
 
-#: js/files.js:264
-msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "Kan ikke laste opp filen din siden det er en mappe eller den har 0 bytes"
-
-#: js/files.js:277
-msgid "Not enough space available"
-msgstr "Ikke nok lagringsplass"
-
-#: js/files.js:317
-msgid "Upload cancelled."
-msgstr "Opplasting avbrutt."
-
-#: js/files.js:413
-msgid ""
-"File upload is in progress. Leaving the page now will cancel the upload."
-msgstr "Filopplasting pågår. Forlater du siden nå avbrytes opplastingen."
-
-#: js/files.js:486
-msgid "URL cannot be empty."
-msgstr "URL-en kan ikke være tom."
-
-#: js/files.js:491
+#: js/files.js:344
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Ugyldig mappenavn. Bruk av \"Shared\" er reservert av ownCloud."
 
-#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
-msgid "Error"
-msgstr "Feil"
-
-#: js/files.js:877 templates/index.php:69
+#: js/files.js:744 templates/index.php:69
 msgid "Name"
 msgstr "Navn"
 
-#: js/files.js:878 templates/index.php:80
+#: js/files.js:745 templates/index.php:80
 msgid "Size"
 msgstr "Størrelse"
 
-#: js/files.js:879 templates/index.php:82
+#: js/files.js:746 templates/index.php:82
 msgid "Modified"
 msgstr "Endret"
 
-#: js/files.js:898
+#: js/files.js:765
 msgid "1 folder"
 msgstr "1 mappe"
 
-#: js/files.js:900
+#: js/files.js:767
 msgid "{count} folders"
 msgstr "{count} mapper"
 
-#: js/files.js:908
+#: js/files.js:775
 msgid "1 file"
 msgstr "1 fil"
 
-#: js/files.js:910
+#: js/files.js:777
 msgid "{count} files"
 msgstr "{count} filer"
 
-#: lib/app.php:53
-msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
-msgstr "Ugyldig mappenavn. Bruk av \"Shared\" er reservert av ownCloud."
-
 #: lib/app.php:73
-msgid "Unable to rename file"
-msgstr "Kan ikke gi nytt navn"
+#, php-format
+msgid "%s could not be renamed"
+msgstr ""
 
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
@@ -318,6 +328,22 @@ msgstr "Skanner etter filer, vennligst vent."
 msgid "Current scanning"
 msgstr "Pågående skanning"
 
+#: templates/part.list.php:76
+msgid "directory"
+msgstr ""
+
+#: templates/part.list.php:78
+msgid "directories"
+msgstr ""
+
+#: templates/part.list.php:87
+msgid "file"
+msgstr "fil"
+
+#: templates/part.list.php:89
+msgid "files"
+msgstr "filer"
+
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
 msgstr "Oppgraderer filsystemets  mellomlager..."
diff --git a/l10n/nb_NO/files_encryption.po b/l10n/nb_NO/files_encryption.po
index a898d9f093c4a92ace36cdd8828236017df28191..0daabad1ea72fea27b7059819897c297976900bd 100644
--- a/l10n/nb_NO/files_encryption.po
+++ b/l10n/nb_NO/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-14 02:46+0200\n"
-"PO-Revision-Date: 2013-06-14 00:47+0000\n"
+"POT-Creation-Date: 2013-07-05 02:12+0200\n"
+"PO-Revision-Date: 2013-07-05 00:13+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"
@@ -55,9 +55,21 @@ msgstr ""
 
 #: files/error.php:7
 msgid ""
-"Your private key is not valid! Maybe your password was changed from outside."
-" You can update your private key password in your personal settings to "
-"regain access to your files"
+"Your private key is not valid! Likely your password was changed outside the "
+"ownCloud system (e.g. your corporate directory). You can update your private"
+" key password in your personal settings to recover access to your encrypted "
+"files."
+msgstr ""
+
+#: hooks/hooks.php:44
+msgid "Missing requirements."
+msgstr ""
+
+#: hooks/hooks.php:45
+msgid ""
+"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL "
+"PHP extension is enabled and configured properly. For now, the encryption "
+"app has been disabled."
 msgstr ""
 
 #: js/settings-admin.js:11
@@ -84,11 +96,11 @@ msgstr "Kryptering"
 
 #: templates/settings-admin.php:10
 msgid ""
-"Enable encryption passwords recovery key (allow sharing to recovery key):"
+"Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
 #: templates/settings-admin.php:14
-msgid "Recovery account password"
+msgid "Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:21 templates/settings-personal.php:54
@@ -100,15 +112,15 @@ msgid "Disabled"
 msgstr ""
 
 #: templates/settings-admin.php:34
-msgid "Change encryption passwords recovery key:"
+msgid "Change recovery key password:"
 msgstr ""
 
 #: templates/settings-admin.php:41
-msgid "Old Recovery account password"
+msgid "Old Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:48
-msgid "New Recovery account password"
+msgid "New Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:53
diff --git a/l10n/nb_NO/files_external.po b/l10n/nb_NO/files_external.po
index 2cf8ef1fd6448d41b32d2cfb429e80d24f7b77bb..5f19905bba6dd9b604e01334785b633c271edb6c 100644
--- a/l10n/nb_NO/files_external.po
+++ b/l10n/nb_NO/files_external.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: Hans Nesse <>\n"
 "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/nb_NO/files_sharing.po b/l10n/nb_NO/files_sharing.po
index a330640cd92c790ccba297c3012844bd9c4c35e1..b76d7237ac7671cef037bb08b671ee9f6efd926e 100644
--- a/l10n/nb_NO/files_sharing.po
+++ b/l10n/nb_NO/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -18,27 +18,39 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: templates/authenticate.php:4
+msgid "The password is wrong. Try again."
+msgstr ""
+
+#: templates/authenticate.php:7
 msgid "Password"
 msgstr "Passord"
 
-#: templates/authenticate.php:6
+#: templates/authenticate.php:9
 msgid "Submit"
 msgstr "Send inn"
 
-#: templates/public.php:10
+#: templates/public.php:17
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s delte mappen %s med deg"
 
-#: templates/public.php:13
+#: templates/public.php:20
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s delte filen %s med deg"
 
-#: templates/public.php:19 templates/public.php:43
+#: templates/public.php:28 templates/public.php:90
 msgid "Download"
 msgstr "Last ned"
 
-#: templates/public.php:40
+#: templates/public.php:45 templates/public.php:48
+msgid "Upload"
+msgstr "Last opp"
+
+#: templates/public.php:58
+msgid "Cancel upload"
+msgstr "Avbryt opplasting"
+
+#: templates/public.php:87
 msgid "No preview available for"
 msgstr "Forhåndsvisning ikke tilgjengelig for"
diff --git a/l10n/nb_NO/files_trashbin.po b/l10n/nb_NO/files_trashbin.po
index 3da5b4139133c4a8dc9c303ba85d6d773b8bd869..d637ce5bf530bdd771c1fb05deda8e1564a230b4 100644
--- a/l10n/nb_NO/files_trashbin.po
+++ b/l10n/nb_NO/files_trashbin.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:16+0000\n"
 "Last-Translator: Hans Nesse <>\n"
 "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/nb_NO/lib.po b/l10n/nb_NO/lib.po
index d567f140755b38362ee4ab4dd1697ae77407c818..00d8408490361512d6eeea82283a073f5f36e476 100644
--- a/l10n/nb_NO/lib.po
+++ b/l10n/nb_NO/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -17,43 +17,47 @@ msgstr ""
 "Language: nb_NO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:359
+#: app.php:360
 msgid "Help"
 msgstr "Hjelp"
 
-#: app.php:372
+#: app.php:373
 msgid "Personal"
 msgstr "Personlig"
 
-#: app.php:383
+#: app.php:384
 msgid "Settings"
 msgstr "Innstillinger"
 
-#: app.php:395
+#: app.php:396
 msgid "Users"
 msgstr "Brukere"
 
-#: app.php:408
+#: app.php:409
 msgid "Apps"
 msgstr "Apper"
 
-#: app.php:416
+#: app.php:417
 msgid "Admin"
 msgstr "Admin"
 
-#: files.php:210
+#: defaults.php:33
+msgid "web services under your control"
+msgstr "web tjenester du kontrollerer"
+
+#: files.php:226
 msgid "ZIP download is turned off."
 msgstr "ZIP-nedlasting av avslått"
 
-#: files.php:211
+#: files.php:227
 msgid "Files need to be downloaded one by one."
 msgstr "Filene må lastes ned en om gangen"
 
-#: files.php:212 files.php:245
+#: files.php:228 files.php:261
 msgid "Back to Files"
 msgstr "Tilbake til filer"
 
-#: files.php:242
+#: files.php:258
 msgid "Selected files too large to generate zip file."
 msgstr "De valgte filene er for store til å kunne generere ZIP-fil"
 
@@ -85,104 +89,102 @@ msgstr "Tekst"
 msgid "Images"
 msgstr "Bilder"
 
-#: setup.php:34
-msgid "Set an admin username."
-msgstr ""
-
-#: setup.php:37
-msgid "Set an admin password."
-msgstr ""
-
-#: setup.php:55
+#: setup/abstractdatabase.php:22
 #, php-format
 msgid "%s enter the database username."
 msgstr ""
 
-#: setup.php:58
+#: setup/abstractdatabase.php:25
 #, php-format
 msgid "%s enter the database name."
 msgstr ""
 
-#: setup.php:61
+#: setup/abstractdatabase.php:28
 #, php-format
 msgid "%s you may not use dots in the database name"
 msgstr ""
 
-#: setup.php:64
+#: setup/mssql.php:20
 #, php-format
-msgid "%s set the database host."
-msgstr ""
-
-#: setup.php:126 setup.php:332 setup.php:377
-msgid "PostgreSQL username and/or password not valid"
+msgid "MS SQL username and/or password not valid: %s"
 msgstr ""
 
-#: setup.php:127 setup.php:235
+#: setup/mssql.php:21 setup/mysql.php:13 setup/oci.php:114
+#: setup/postgresql.php:24 setup/postgresql.php:70
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:152
-msgid "Oracle connection could not be established"
-msgstr ""
-
-#: setup.php:234
+#: setup/mysql.php:12
 msgid "MySQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:288 setup.php:398 setup.php:407 setup.php:425 setup.php:435
-#: setup.php:444 setup.php:477 setup.php:543 setup.php:569 setup.php:576
-#: setup.php:587 setup.php:594 setup.php:603 setup.php:611 setup.php:620
-#: setup.php:626
+#: setup/mysql.php:67 setup/oci.php:54 setup/oci.php:121 setup/oci.php:147
+#: setup/oci.php:154 setup/oci.php:165 setup/oci.php:172 setup/oci.php:181
+#: setup/oci.php:189 setup/oci.php:198 setup/oci.php:204
+#: setup/postgresql.php:89 setup/postgresql.php:98 setup/postgresql.php:115
+#: setup/postgresql.php:125 setup/postgresql.php:134
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr ""
 
-#: setup.php:289 setup.php:399 setup.php:408 setup.php:426 setup.php:436
-#: setup.php:445 setup.php:478 setup.php:544 setup.php:570 setup.php:577
-#: setup.php:588 setup.php:604 setup.php:612 setup.php:621
+#: setup/mysql.php:68 setup/oci.php:55 setup/oci.php:122 setup/oci.php:148
+#: setup/oci.php:155 setup/oci.php:166 setup/oci.php:182 setup/oci.php:190
+#: setup/oci.php:199 setup/postgresql.php:90 setup/postgresql.php:99
+#: setup/postgresql.php:116 setup/postgresql.php:126 setup/postgresql.php:135
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:305
+#: setup/mysql.php:85
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:306
+#: setup/mysql.php:86
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:311
+#: setup/mysql.php:91
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:312
+#: setup/mysql.php:92
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:469 setup.php:536
+#: setup/oci.php:34
+msgid "Oracle connection could not be established"
+msgstr ""
+
+#: setup/oci.php:41 setup/oci.php:113
 msgid "Oracle username and/or password not valid"
 msgstr ""
 
-#: setup.php:595 setup.php:627
+#: setup/oci.php:173 setup/oci.php:205
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:647
-#, php-format
-msgid "MS SQL username and/or password not valid: %s"
+#: setup/postgresql.php:23 setup/postgresql.php:69
+msgid "PostgreSQL username and/or password not valid"
+msgstr ""
+
+#: setup.php:42
+msgid "Set an admin username."
+msgstr ""
+
+#: setup.php:45
+msgid "Set an admin password."
 msgstr ""
 
-#: setup.php:870
+#: setup.php:198
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Din nettservev er ikke konfigurert korrekt for filsynkronisering. WebDAV ser ut til å ikke funkere."
 
-#: setup.php:871
+#: setup.php:199
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Vennligst dobbelsjekk <a href='%s'>installasjonsguiden</a>."
diff --git a/l10n/nb_NO/settings.po b/l10n/nb_NO/settings.po
index eca14e3c61f4c48f5069e91962803cae179da04f..b8079222f6239e0d662972ac1a0da146576f913e 100644
--- a/l10n/nb_NO/settings.po
+++ b/l10n/nb_NO/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -89,35 +89,35 @@ msgstr "Kan ikke slette bruker fra gruppen %s"
 msgid "Couldn't update app."
 msgstr "Kunne ikke oppdatere app."
 
-#: js/apps.js:30
+#: js/apps.js:35
 msgid "Update to {appversion}"
 msgstr "Oppdater til {appversion}"
 
-#: js/apps.js:36 js/apps.js:76
+#: js/apps.js:41 js/apps.js:81
 msgid "Disable"
 msgstr "Slå avBehandle "
 
-#: js/apps.js:36 js/apps.js:64 js/apps.js:83
+#: js/apps.js:41 js/apps.js:69 js/apps.js:88
 msgid "Enable"
 msgstr "Aktiver"
 
-#: js/apps.js:55
+#: js/apps.js:60
 msgid "Please wait...."
 msgstr "Vennligst vent..."
 
-#: js/apps.js:59 js/apps.js:71 js/apps.js:80 js/apps.js:93
+#: js/apps.js:64 js/apps.js:76 js/apps.js:85 js/apps.js:98
 msgid "Error"
 msgstr "Feil"
 
-#: js/apps.js:90
+#: js/apps.js:95
 msgid "Updating...."
 msgstr "Oppdaterer..."
 
-#: js/apps.js:93
+#: js/apps.js:98
 msgid "Error while updating app"
 msgstr "Feil ved oppdatering av app"
 
-#: js/apps.js:96
+#: js/apps.js:101
 msgid "Updated"
 msgstr "Oppdatert"
 
@@ -166,15 +166,15 @@ msgstr "Feil ved oppretting av bruker"
 msgid "A valid password must be provided"
 msgstr "Oppgi et gyldig passord"
 
-#: personal.php:35 personal.php:36
+#: personal.php:37 personal.php:38
 msgid "__language_name__"
 msgstr "__language_name__"
 
-#: templates/admin.php:15
+#: templates/admin.php:17
 msgid "Security Warning"
 msgstr "Sikkerhetsadvarsel"
 
-#: templates/admin.php:18
+#: templates/admin.php:20
 msgid ""
 "Your data directory and your files are probably accessible from the "
 "internet. The .htaccess file that ownCloud provides is not working. We "
@@ -183,36 +183,36 @@ msgid ""
 " webserver document root."
 msgstr "Ditt data mappe og dine filer er sannsynligvis tilgjengelig fra internet. .htaccess filene som ownCloud bruker virker ikke. Du bør konfigurere din nettserver slik at data mappa ikke lenger er tilgjengelig eller flytt data mappe ut av nettserverens dokumentområde."
 
-#: templates/admin.php:29
+#: templates/admin.php:31
 msgid "Setup Warning"
 msgstr "Installasjonsadvarsel"
 
-#: templates/admin.php:32
+#: templates/admin.php:34
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Din nettservev er ikke konfigurert korrekt for filsynkronisering. WebDAV ser ut til å ikke funkere."
 
-#: templates/admin.php:33
+#: templates/admin.php:35
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Vennligst dobbelsjekk <a href='%s'>installasjonsguiden</a>."
 
-#: templates/admin.php:44
+#: templates/admin.php:46
 msgid "Module 'fileinfo' missing"
 msgstr "Modulen 'fileinfo' mangler"
 
-#: templates/admin.php:47
+#: templates/admin.php:49
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr "PHP modulen 'fileinfo' mangler. Vi anbefaler at du aktiverer denne modulen for å kunne detektere mime-typen korrekt."
 
-#: templates/admin.php:58
+#: templates/admin.php:60
 msgid "Locale not working"
 msgstr "Språk virker ikke"
 
-#: templates/admin.php:63
+#: templates/admin.php:65
 #, php-format
 msgid ""
 "This ownCloud server can't set system locale to %s. This means that there "
@@ -220,11 +220,11 @@ msgid ""
 " to install the required packages on your system to support %s."
 msgstr "Denne ownCloud serveren kan ikke sette systemspråk til %s. Det kan være problemer med visse tegn i filnavn. Vi foreslår at du installerer de nødvendige pakkene på ditt system for å støtte %s."
 
-#: templates/admin.php:75
+#: templates/admin.php:77
 msgid "Internet connection not working"
 msgstr "Ingen internettilkopling"
 
-#: templates/admin.php:78
+#: templates/admin.php:80
 msgid ""
 "This ownCloud server has no working internet connection. This means that "
 "some of the features like mounting of external storage, notifications about "
@@ -234,102 +234,102 @@ msgid ""
 " of ownCloud."
 msgstr "Denne ownCloud serveren har ikke tilkopling til internett. Noen funksjoner som f.eks. tilkopling til ekstern lager, melgin om oppdatering og installasjon av tredjeparts apps vil ikke virke. Vi foreslår at du aktivere en internettilkopling til denne serveren hvis du vil bruke alle funksjonene i ownCloud."
 
-#: templates/admin.php:92
+#: templates/admin.php:94
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:101
+#: templates/admin.php:103
 msgid "Execute one task with each page loaded"
 msgstr "Utfør en oppgave med hver side som blir lastet"
 
-#: templates/admin.php:111
+#: templates/admin.php:113
 msgid ""
 "cron.php is registered at a webcron service. Call the cron.php page in the "
 "owncloud root once a minute over http."
 msgstr "cron.php er registrert som webcron-tjeneste. Kjør cron.php siden  i ownCloud rot hvert minutt vha http."
 
-#: templates/admin.php:121
+#: templates/admin.php:123
 msgid ""
 "Use systems cron service. Call the cron.php file in the owncloud folder via "
 "a system cronjob once a minute."
 msgstr "Bruk systemets crontjeneste. Kjør cron.php filen i owncloud mappa vha systemets crontjeneste hver minutt."
 
-#: templates/admin.php:128
+#: templates/admin.php:130
 msgid "Sharing"
 msgstr "Deling"
 
-#: templates/admin.php:134
+#: templates/admin.php:136
 msgid "Enable Share API"
 msgstr "Aktiver API for Deling"
 
-#: templates/admin.php:135
+#: templates/admin.php:137
 msgid "Allow apps to use the Share API"
 msgstr "Tillat apps å bruke API for Deling"
 
-#: templates/admin.php:142
+#: templates/admin.php:144
 msgid "Allow links"
 msgstr "Tillat lenker"
 
-#: templates/admin.php:143
+#: templates/admin.php:145
 msgid "Allow users to share items to the public with links"
 msgstr "Tillat brukere å dele filer med lenker"
 
-#: templates/admin.php:150
+#: templates/admin.php:152
 msgid "Allow resharing"
 msgstr "TIllat videredeling"
 
-#: templates/admin.php:151
+#: templates/admin.php:153
 msgid "Allow users to share items shared with them again"
 msgstr "Tillat brukere å dele filer som allerede har blitt delt med dem"
 
-#: templates/admin.php:158
+#: templates/admin.php:160
 msgid "Allow users to share with anyone"
 msgstr "Tillat brukere å dele med alle"
 
-#: templates/admin.php:161
+#: templates/admin.php:163
 msgid "Allow users to only share with users in their groups"
 msgstr "Tillat kun deling med andre brukere i samme gruppe"
 
-#: templates/admin.php:168
+#: templates/admin.php:170
 msgid "Security"
 msgstr "Sikkerhet"
 
-#: templates/admin.php:181
+#: templates/admin.php:183
 msgid "Enforce HTTPS"
 msgstr "Tving HTTPS"
 
-#: templates/admin.php:182
+#: templates/admin.php:184
 msgid ""
 "Enforces the clients to connect to ownCloud via an encrypted connection."
 msgstr "Tvinger klienter til å bruke ownCloud via kryptert tilkopling."
 
-#: templates/admin.php:185
+#: templates/admin.php:187
 msgid ""
 "Please connect to this ownCloud instance via HTTPS to enable or disable the "
 "SSL enforcement."
 msgstr "Vær vennlig, bruk denne ownCloud instansen via HTTPS for å aktivere eller deaktivere tvungen bruk av SSL."
 
-#: templates/admin.php:195
+#: templates/admin.php:197
 msgid "Log"
 msgstr "Logg"
 
-#: templates/admin.php:196
+#: templates/admin.php:198
 msgid "Log level"
 msgstr "Loggnivå"
 
-#: templates/admin.php:227
+#: templates/admin.php:229
 msgid "More"
 msgstr "Mer"
 
-#: templates/admin.php:228
+#: templates/admin.php:230
 msgid "Less"
 msgstr "Mindre"
 
-#: templates/admin.php:235 templates/personal.php:116
+#: templates/admin.php:236 templates/personal.php:116
 msgid "Version"
 msgstr "Versjon"
 
-#: templates/admin.php:237 templates/personal.php:119
+#: templates/admin.php:240 templates/personal.php:119
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -387,76 +387,79 @@ msgstr "Feilsporing"
 msgid "Commercial Support"
 msgstr "Kommersiell støtte"
 
-#: templates/personal.php:9
+#: templates/personal.php:10
 msgid "Get the apps to sync your files"
 msgstr "Få dine apps til å synkronisere dine filer"
 
-#: templates/personal.php:20
+#: templates/personal.php:21
 msgid "Show First Run Wizard again"
 msgstr "Vis \"Førstegangs veiveiseren\" på nytt"
 
-#: templates/personal.php:28
+#: templates/personal.php:29
 #, php-format
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "Du har brukt <strong>%s</strong> av tilgjengelig <strong>%s</strong>"
 
-#: templates/personal.php:40 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:41 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "Passord"
 
-#: templates/personal.php:41
+#: templates/personal.php:42
 msgid "Your password was changed"
 msgstr "Passord har blitt endret"
 
-#: templates/personal.php:42
+#: templates/personal.php:43
 msgid "Unable to change your password"
 msgstr "Kunne ikke endre passordet ditt"
 
-#: templates/personal.php:43
+#: templates/personal.php:44
 msgid "Current password"
 msgstr "Nåværende passord"
 
-#: templates/personal.php:45
+#: templates/personal.php:46
 msgid "New password"
 msgstr "Nytt passord"
 
-#: templates/personal.php:47
+#: templates/personal.php:48
 msgid "Change password"
 msgstr "Endre passord"
 
-#: templates/personal.php:59 templates/users.php:85
+#: templates/personal.php:60 templates/users.php:85
 msgid "Display Name"
 msgstr "Visningsnavn"
 
-#: templates/personal.php:74
+#: templates/personal.php:75
 msgid "Email"
 msgstr "Epost"
 
-#: templates/personal.php:76
+#: templates/personal.php:77
 msgid "Your email address"
 msgstr "Din e-postadresse"
 
-#: templates/personal.php:77
+#: templates/personal.php:78
 msgid "Fill in an email address to enable password recovery"
 msgstr "Oppi epostadressen du vil tilbakestille passordet for"
 
-#: templates/personal.php:86 templates/personal.php:87
+#: templates/personal.php:87 templates/personal.php:88
 msgid "Language"
 msgstr "Språk"
 
-#: templates/personal.php:99
+#: templates/personal.php:100
 msgid "Help translate"
 msgstr "Bidra til oversettelsen"
 
-#: templates/personal.php:105
+#: templates/personal.php:106
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:107
-msgid "Use this address to connect to your ownCloud in your file manager"
-msgstr "Bruk denne adressen for å kople til ownCloud i din filbehandler"
+#: templates/personal.php:108
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
+"target=\"_blank\">access your Files via WebDAV</a>"
+msgstr ""
 
-#: templates/users.php:21 templates/users.php:84
+#: templates/users.php:21
 msgid "Login Name"
 msgstr "Logginn navn"
 
@@ -486,6 +489,10 @@ msgstr "Ubegrenset"
 msgid "Other"
 msgstr "Annet"
 
+#: templates/users.php:84
+msgid "Username"
+msgstr "Brukernavn"
+
 #: templates/users.php:91
 msgid "Storage"
 msgstr "Lager"
diff --git a/l10n/nb_NO/user_ldap.po b/l10n/nb_NO/user_ldap.po
index a10ed0a2d7ec53ed06dd51e95e3b82a127cf2b77..492d7a88a119b7a75d1d347d6a3ddff50cae3696 100644
--- a/l10n/nb_NO/user_ldap.po
+++ b/l10n/nb_NO/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:25+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:16+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/ne/core.po b/l10n/ne/core.po
index 049092f64c48ff87d3f2be3433bd8aaa657ccfb1..a8062fa9dbdd567aecb7d722756f0e7fe71e3702 100644
--- a/l10n/ne/core.po
+++ b/l10n/ne/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-15 01:59+0200\n"
-"PO-Revision-Date: 2013-06-14 23:59+0000\n"
+"POT-Creation-Date: 2013-07-06 02:02+0200\n"
+"PO-Revision-Date: 2013-07-06 00:02+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Nepali (http://www.transifex.com/projects/p/owncloud/language/ne/)\n"
 "MIME-Version: 1.0\n"
@@ -61,135 +61,135 @@ msgstr ""
 msgid "Error removing %s from favorites."
 msgstr ""
 
-#: js/config.php:34
+#: js/config.php:32
 msgid "Sunday"
 msgstr ""
 
-#: js/config.php:35
+#: js/config.php:33
 msgid "Monday"
 msgstr ""
 
-#: js/config.php:36
+#: js/config.php:34
 msgid "Tuesday"
 msgstr ""
 
-#: js/config.php:37
+#: js/config.php:35
 msgid "Wednesday"
 msgstr ""
 
-#: js/config.php:38
+#: js/config.php:36
 msgid "Thursday"
 msgstr ""
 
-#: js/config.php:39
+#: js/config.php:37
 msgid "Friday"
 msgstr ""
 
-#: js/config.php:40
+#: js/config.php:38
 msgid "Saturday"
 msgstr ""
 
-#: js/config.php:45
+#: js/config.php:43
 msgid "January"
 msgstr ""
 
-#: js/config.php:46
+#: js/config.php:44
 msgid "February"
 msgstr ""
 
-#: js/config.php:47
+#: js/config.php:45
 msgid "March"
 msgstr ""
 
-#: js/config.php:48
+#: js/config.php:46
 msgid "April"
 msgstr ""
 
-#: js/config.php:49
+#: js/config.php:47
 msgid "May"
 msgstr ""
 
-#: js/config.php:50
+#: js/config.php:48
 msgid "June"
 msgstr ""
 
-#: js/config.php:51
+#: js/config.php:49
 msgid "July"
 msgstr ""
 
-#: js/config.php:52
+#: js/config.php:50
 msgid "August"
 msgstr ""
 
-#: js/config.php:53
+#: js/config.php:51
 msgid "September"
 msgstr ""
 
-#: js/config.php:54
+#: js/config.php:52
 msgid "October"
 msgstr ""
 
-#: js/config.php:55
+#: js/config.php:53
 msgid "November"
 msgstr ""
 
-#: js/config.php:56
+#: js/config.php:54
 msgid "December"
 msgstr ""
 
-#: js/js.js:286
+#: js/js.js:289
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:718
+#: js/js.js:721
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:719
+#: js/js.js:722
 msgid "1 minute ago"
 msgstr ""
 
-#: js/js.js:720
+#: js/js.js:723
 msgid "{minutes} minutes ago"
 msgstr ""
 
-#: js/js.js:721
+#: js/js.js:724
 msgid "1 hour ago"
 msgstr ""
 
-#: js/js.js:722
+#: js/js.js:725
 msgid "{hours} hours ago"
 msgstr ""
 
-#: js/js.js:723
+#: js/js.js:726
 msgid "today"
 msgstr ""
 
-#: js/js.js:724
+#: js/js.js:727
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:725
+#: js/js.js:728
 msgid "{days} days ago"
 msgstr ""
 
-#: js/js.js:726
+#: js/js.js:729
 msgid "last month"
 msgstr ""
 
-#: js/js.js:727
+#: js/js.js:730
 msgid "{months} months ago"
 msgstr ""
 
-#: js/js.js:728
+#: js/js.js:731
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:729
+#: js/js.js:732
 msgid "last year"
 msgstr ""
 
-#: js/js.js:730
+#: js/js.js:733
 msgid "years ago"
 msgstr ""
 
@@ -225,8 +225,8 @@ msgstr ""
 #: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
 #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:577
-#: js/share.js:589
+#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:620
+#: js/share.js:632
 msgid "Error"
 msgstr ""
 
@@ -246,7 +246,7 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: js/share.js:125 js/share.js:617
+#: js/share.js:125 js/share.js:660
 msgid "Error while sharing"
 msgstr ""
 
@@ -266,99 +266,103 @@ msgstr ""
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:159
+#: js/share.js:172
 msgid "Share with"
 msgstr ""
 
-#: js/share.js:164
+#: js/share.js:177
 msgid "Share with link"
 msgstr ""
 
-#: js/share.js:167
+#: js/share.js:180
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:169 templates/installation.php:54 templates/login.php:26
+#: js/share.js:182 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr ""
 
-#: js/share.js:173
+#: js/share.js:187
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:191
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:174
+#: js/share.js:192
 msgid "Send"
 msgstr ""
 
-#: js/share.js:178
+#: js/share.js:197
 msgid "Set expiration date"
 msgstr ""
 
-#: js/share.js:179
+#: js/share.js:198
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:211
+#: js/share.js:230
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:213
+#: js/share.js:232
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:251
+#: js/share.js:270
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:287
+#: js/share.js:306
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:308
+#: js/share.js:327
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:320
+#: js/share.js:339
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:322
+#: js/share.js:341
 msgid "access control"
 msgstr ""
 
-#: js/share.js:325
+#: js/share.js:344
 msgid "create"
 msgstr ""
 
-#: js/share.js:328
+#: js/share.js:347
 msgid "update"
 msgstr ""
 
-#: js/share.js:331
+#: js/share.js:350
 msgid "delete"
 msgstr ""
 
-#: js/share.js:334
+#: js/share.js:353
 msgid "share"
 msgstr ""
 
-#: js/share.js:368 js/share.js:564
+#: js/share.js:387 js/share.js:607
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:577
+#: js/share.js:620
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:589
+#: js/share.js:632
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:604
+#: js/share.js:647
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:615
+#: js/share.js:658
 msgid "Email sent"
 msgstr ""
 
@@ -373,7 +377,7 @@ msgstr ""
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
-#: lostpassword/controller.php:58
+#: lostpassword/controller.php:60
 msgid "ownCloud password reset"
 msgstr ""
 
@@ -403,17 +407,17 @@ msgstr ""
 
 #: lostpassword/templates/lostpassword.php:22
 msgid ""
-"Your files seems to be encrypted. If you didn't have enabled the recovery "
-"key there will be no way to get your data back once the password was "
-"resetted. If you are not sure what to do, please contact your administrator "
-"first before continue. Do you really want to continue?"
+"Your files are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
 msgstr ""
 
 #: lostpassword/templates/lostpassword.php:24
 msgid "Yes, I really want to reset my password now"
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:29
+#: lostpassword/templates/lostpassword.php:27
 msgid "Request reset"
 msgstr ""
 
@@ -461,7 +465,7 @@ msgstr ""
 msgid "Cloud not found"
 msgstr ""
 
-#: templates/altmail.php:2
+#: templates/altmail.php:4
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -472,10 +476,6 @@ msgid ""
 "Cheers!"
 msgstr ""
 
-#: templates/altmail.php:7 templates/mail.php:24
-msgid "web services under your control"
-msgstr ""
-
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
 msgstr ""
@@ -568,12 +568,12 @@ msgstr ""
 msgid "Finish setup"
 msgstr ""
 
-#: templates/layout.user.php:40
+#: templates/layout.user.php:43
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:67
+#: templates/layout.user.php:68
 msgid "Log out"
 msgstr ""
 
@@ -607,7 +607,7 @@ msgstr ""
 msgid "Alternative Logins"
 msgstr ""
 
-#: templates/mail.php:15
+#: templates/mail.php:16
 #, php-format
 msgid ""
 "Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
diff --git a/l10n/ne/files.po b/l10n/ne/files.po
index 2a295626b154b5a7793414e54e742d87c166f067..ef843dbbaaabe4b9b3b2697f991db141fe1c2cfb 100644
--- a/l10n/ne/files.po
+++ b/l10n/ne/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-25 02:01+0200\n"
-"PO-Revision-Date: 2013-05-24 13:26+0000\n"
+"POT-Creation-Date: 2013-07-04 09:30+0200\n"
+"PO-Revision-Date: 2013-07-04 07:31+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Nepali (http://www.transifex.com/projects/p/owncloud/language/ne/)\n"
 "MIME-Version: 1.0\n"
@@ -27,46 +27,54 @@ msgstr ""
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/upload.php:19
+#: ajax/upload.php:16 ajax/upload.php:39
+msgid "Unable to set upload directory."
+msgstr ""
+
+#: ajax/upload.php:23
+msgid "Invalid Token"
+msgstr ""
+
+#: ajax/upload.php:55
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: ajax/upload.php:26
+#: ajax/upload.php:62
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/upload.php:27
+#: ajax/upload.php:63
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:29
+#: ajax/upload.php:65
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/upload.php:30
+#: ajax/upload.php:66
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/upload.php:31
+#: ajax/upload.php:67
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/upload.php:32
+#: ajax/upload.php:68
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/upload.php:33
+#: ajax/upload.php:69
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:51
+#: ajax/upload.php:87
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:83
+#: ajax/upload.php:119
 msgid "Invalid directory."
 msgstr ""
 
@@ -74,6 +82,36 @@ msgstr ""
 msgid "Files"
 msgstr ""
 
+#: js/file-upload.js:11
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/file-upload.js:24
+msgid "Not enough space available"
+msgstr ""
+
+#: js/file-upload.js:64
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/file-upload.js:167 js/files.js:266
+msgid ""
+"File upload is in progress. Leaving the page now will cancel the upload."
+msgstr ""
+
+#: js/file-upload.js:233 js/files.js:339
+msgid "URL cannot be empty."
+msgstr ""
+
+#: js/file-upload.js:238 lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr ""
+
+#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
+#: js/files.js:693 js/files.js:731
+msgid "Error"
+msgstr ""
+
 #: js/fileactions.js:116
 msgid "Share"
 msgstr ""
@@ -90,43 +128,43 @@ msgstr ""
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:464
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:259
+#: js/filelist.js:302
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:306
+#: js/filelist.js:349
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:306
+#: js/filelist.js:349
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:331
+#: js/filelist.js:374
 msgid "perform delete operation"
 msgstr ""
 
-#: js/filelist.js:413
+#: js/filelist.js:456
 msgid "1 file uploading"
 msgstr ""
 
-#: js/filelist.js:416 js/filelist.js:470
+#: js/filelist.js:459 js/filelist.js:517
 msgid "files uploading"
 msgstr ""
 
@@ -158,69 +196,41 @@ msgid ""
 "big."
 msgstr ""
 
-#: js/files.js:264
-msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr ""
-
-#: js/files.js:277
-msgid "Not enough space available"
-msgstr ""
-
-#: js/files.js:317
-msgid "Upload cancelled."
-msgstr ""
-
-#: js/files.js:413
-msgid ""
-"File upload is in progress. Leaving the page now will cancel the upload."
-msgstr ""
-
-#: js/files.js:486
-msgid "URL cannot be empty."
-msgstr ""
-
-#: js/files.js:491
+#: js/files.js:344
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
-msgid "Error"
-msgstr ""
-
-#: js/files.js:877 templates/index.php:69
+#: js/files.js:744 templates/index.php:69
 msgid "Name"
 msgstr ""
 
-#: js/files.js:878 templates/index.php:80
+#: js/files.js:745 templates/index.php:80
 msgid "Size"
 msgstr ""
 
-#: js/files.js:879 templates/index.php:82
+#: js/files.js:746 templates/index.php:82
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:898
+#: js/files.js:765
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:900
+#: js/files.js:767
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:908
+#: js/files.js:775
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:910
+#: js/files.js:777
 msgid "{count} files"
 msgstr ""
 
-#: lib/app.php:53
-msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
-msgstr ""
-
 #: lib/app.php:73
-msgid "Unable to rename file"
+#, php-format
+msgid "%s could not be renamed"
 msgstr ""
 
 #: lib/helper.php:11 templates/index.php:18
@@ -317,6 +327,22 @@ msgstr ""
 msgid "Current scanning"
 msgstr ""
 
+#: templates/part.list.php:78
+msgid "directory"
+msgstr ""
+
+#: templates/part.list.php:80
+msgid "directories"
+msgstr ""
+
+#: templates/part.list.php:89
+msgid "file"
+msgstr ""
+
+#: templates/part.list.php:91
+msgid "files"
+msgstr ""
+
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
 msgstr ""
diff --git a/l10n/ne/files_encryption.po b/l10n/ne/files_encryption.po
index 6d6ca4927ed142996e8037d75a48ecd5005d19aa..53e5a46e0070d6008b2e7991ff3edf2aa3af21b1 100644
--- a/l10n/ne/files_encryption.po
+++ b/l10n/ne/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-14 02:46+0200\n"
-"PO-Revision-Date: 2013-06-14 00:47+0000\n"
+"POT-Creation-Date: 2013-07-05 02:12+0200\n"
+"PO-Revision-Date: 2013-07-05 00:13+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Nepali (http://www.transifex.com/projects/p/owncloud/language/ne/)\n"
 "MIME-Version: 1.0\n"
@@ -55,9 +55,21 @@ msgstr ""
 
 #: files/error.php:7
 msgid ""
-"Your private key is not valid! Maybe your password was changed from outside."
-" You can update your private key password in your personal settings to "
-"regain access to your files"
+"Your private key is not valid! Likely your password was changed outside the "
+"ownCloud system (e.g. your corporate directory). You can update your private"
+" key password in your personal settings to recover access to your encrypted "
+"files."
+msgstr ""
+
+#: hooks/hooks.php:44
+msgid "Missing requirements."
+msgstr ""
+
+#: hooks/hooks.php:45
+msgid ""
+"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL "
+"PHP extension is enabled and configured properly. For now, the encryption "
+"app has been disabled."
 msgstr ""
 
 #: js/settings-admin.js:11
@@ -84,11 +96,11 @@ msgstr ""
 
 #: templates/settings-admin.php:10
 msgid ""
-"Enable encryption passwords recovery key (allow sharing to recovery key):"
+"Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
 #: templates/settings-admin.php:14
-msgid "Recovery account password"
+msgid "Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:21 templates/settings-personal.php:54
@@ -100,15 +112,15 @@ msgid "Disabled"
 msgstr ""
 
 #: templates/settings-admin.php:34
-msgid "Change encryption passwords recovery key:"
+msgid "Change recovery key password:"
 msgstr ""
 
 #: templates/settings-admin.php:41
-msgid "Old Recovery account password"
+msgid "Old Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:48
-msgid "New Recovery account password"
+msgid "New Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:53
diff --git a/l10n/ne/files_sharing.po b/l10n/ne/files_sharing.po
index fa5c18ee25c9c47f8a72a686788d7c935fe510b8..4dc2fd5cd44e1c94f0e66f72424add9d515be3e6 100644
--- a/l10n/ne/files_sharing.po
+++ b/l10n/ne/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-14 02:47+0200\n"
-"PO-Revision-Date: 2013-06-14 00:47+0000\n"
+"POT-Creation-Date: 2013-07-05 02:13+0200\n"
+"PO-Revision-Date: 2013-07-05 00:13+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Nepali (http://www.transifex.com/projects/p/owncloud/language/ne/)\n"
 "MIME-Version: 1.0\n"
@@ -18,27 +18,39 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: templates/authenticate.php:4
+msgid "The password is wrong. Try again."
+msgstr ""
+
+#: templates/authenticate.php:7
 msgid "Password"
 msgstr ""
 
-#: templates/authenticate.php:6
+#: templates/authenticate.php:9
 msgid "Submit"
 msgstr ""
 
-#: templates/public.php:10
+#: templates/public.php:17
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr ""
 
-#: templates/public.php:13
+#: templates/public.php:20
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr ""
 
-#: templates/public.php:19 templates/public.php:43
+#: templates/public.php:28 templates/public.php:86
 msgid "Download"
 msgstr ""
 
-#: templates/public.php:40
+#: templates/public.php:44
+msgid "Upload"
+msgstr ""
+
+#: templates/public.php:54
+msgid "Cancel upload"
+msgstr ""
+
+#: templates/public.php:83
 msgid "No preview available for"
 msgstr ""
diff --git a/l10n/ne/lib.po b/l10n/ne/lib.po
index 17b8279af6310c6bc44301e26cadc423900502ac..37489e0ed6462e6fd40952de290d884bb9e05a88 100644
--- a/l10n/ne/lib.po
+++ b/l10n/ne/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-25 02:02+0200\n"
-"PO-Revision-Date: 2013-05-24 13:27+0000\n"
+"POT-Creation-Date: 2013-07-05 02:13+0200\n"
+"PO-Revision-Date: 2013-07-05 00:13+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Nepali (http://www.transifex.com/projects/p/owncloud/language/ne/)\n"
 "MIME-Version: 1.0\n"
@@ -17,47 +17,51 @@ msgstr ""
 "Language: ne\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:357
+#: app.php:360
 msgid "Help"
 msgstr ""
 
-#: app.php:370
+#: app.php:373
 msgid "Personal"
 msgstr ""
 
-#: app.php:381
+#: app.php:384
 msgid "Settings"
 msgstr ""
 
-#: app.php:393
+#: app.php:396
 msgid "Users"
 msgstr ""
 
-#: app.php:406
+#: app.php:409
 msgid "Apps"
 msgstr ""
 
-#: app.php:414
+#: app.php:417
 msgid "Admin"
 msgstr ""
 
-#: files.php:207
+#: defaults.php:33
+msgid "web services under your control"
+msgstr ""
+
+#: files.php:210
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: files.php:208
+#: files.php:211
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:209 files.php:242
+#: files.php:212 files.php:245
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:239
+#: files.php:242
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
-#: helper.php:228
+#: helper.php:236
 msgid "couldn't be determined"
 msgstr ""
 
@@ -85,104 +89,102 @@ msgstr ""
 msgid "Images"
 msgstr ""
 
-#: setup.php:34
-msgid "Set an admin username."
-msgstr ""
-
-#: setup.php:37
-msgid "Set an admin password."
-msgstr ""
-
-#: setup.php:55
+#: setup/abstractdatabase.php:22
 #, php-format
 msgid "%s enter the database username."
 msgstr ""
 
-#: setup.php:58
+#: setup/abstractdatabase.php:25
 #, php-format
 msgid "%s enter the database name."
 msgstr ""
 
-#: setup.php:61
+#: setup/abstractdatabase.php:28
 #, php-format
 msgid "%s you may not use dots in the database name"
 msgstr ""
 
-#: setup.php:64
+#: setup/mssql.php:20
 #, php-format
-msgid "%s set the database host."
-msgstr ""
-
-#: setup.php:132 setup.php:329 setup.php:374
-msgid "PostgreSQL username and/or password not valid"
+msgid "MS SQL username and/or password not valid: %s"
 msgstr ""
 
-#: setup.php:133 setup.php:238
+#: setup/mssql.php:21 setup/mysql.php:13 setup/oci.php:114
+#: setup/postgresql.php:24 setup/postgresql.php:70
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:155
-msgid "Oracle connection could not be established"
-msgstr ""
-
-#: setup.php:237
+#: setup/mysql.php:12
 msgid "MySQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
-#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
-#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
-#: setup.php:623
+#: setup/mysql.php:67 setup/oci.php:54 setup/oci.php:121 setup/oci.php:147
+#: setup/oci.php:154 setup/oci.php:165 setup/oci.php:172 setup/oci.php:181
+#: setup/oci.php:189 setup/oci.php:198 setup/oci.php:204
+#: setup/postgresql.php:89 setup/postgresql.php:98 setup/postgresql.php:115
+#: setup/postgresql.php:125 setup/postgresql.php:134
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr ""
 
-#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
-#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
-#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
+#: setup/mysql.php:68 setup/oci.php:55 setup/oci.php:122 setup/oci.php:148
+#: setup/oci.php:155 setup/oci.php:166 setup/oci.php:182 setup/oci.php:190
+#: setup/oci.php:199 setup/postgresql.php:90 setup/postgresql.php:99
+#: setup/postgresql.php:116 setup/postgresql.php:126 setup/postgresql.php:135
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:308
+#: setup/mysql.php:85
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:309
+#: setup/mysql.php:86
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:314
+#: setup/mysql.php:91
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:315
+#: setup/mysql.php:92
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:466 setup.php:533
+#: setup/oci.php:34
+msgid "Oracle connection could not be established"
+msgstr ""
+
+#: setup/oci.php:41 setup/oci.php:113
 msgid "Oracle username and/or password not valid"
 msgstr ""
 
-#: setup.php:592 setup.php:624
+#: setup/oci.php:173 setup/oci.php:205
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:644
-#, php-format
-msgid "MS SQL username and/or password not valid: %s"
+#: setup/postgresql.php:23 setup/postgresql.php:69
+msgid "PostgreSQL username and/or password not valid"
+msgstr ""
+
+#: setup.php:42
+msgid "Set an admin username."
+msgstr ""
+
+#: setup.php:45
+msgid "Set an admin password."
 msgstr ""
 
-#: setup.php:867
+#: setup.php:198
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:868
+#: setup.php:199
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
diff --git a/l10n/ne/settings.po b/l10n/ne/settings.po
index 4c04e9f3f2da08bc309818e3c883446f52ad84ba..b73182b3a623d1abea00eb637be4866a8f8db358 100644
--- a/l10n/ne/settings.po
+++ b/l10n/ne/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-11 01:57+0200\n"
-"PO-Revision-Date: 2013-06-10 23:57+0000\n"
+"POT-Creation-Date: 2013-07-09 02:04+0200\n"
+"PO-Revision-Date: 2013-07-09 00:04+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Nepali (http://www.transifex.com/projects/p/owncloud/language/ne/)\n"
 "MIME-Version: 1.0\n"
@@ -58,7 +58,7 @@ msgstr ""
 msgid "Unable to delete group"
 msgstr ""
 
-#: ajax/removeuser.php:24
+#: ajax/removeuser.php:25
 msgid "Unable to delete user"
 msgstr ""
 
@@ -88,35 +88,35 @@ msgstr ""
 msgid "Couldn't update app."
 msgstr ""
 
-#: js/apps.js:30
+#: js/apps.js:35
 msgid "Update to {appversion}"
 msgstr ""
 
-#: js/apps.js:36 js/apps.js:76
+#: js/apps.js:41 js/apps.js:81
 msgid "Disable"
 msgstr ""
 
-#: js/apps.js:36 js/apps.js:64 js/apps.js:83
+#: js/apps.js:41 js/apps.js:69 js/apps.js:88
 msgid "Enable"
 msgstr ""
 
-#: js/apps.js:55
+#: js/apps.js:60
 msgid "Please wait...."
 msgstr ""
 
-#: js/apps.js:59 js/apps.js:71 js/apps.js:80 js/apps.js:93
+#: js/apps.js:64 js/apps.js:76 js/apps.js:85 js/apps.js:98
 msgid "Error"
 msgstr ""
 
-#: js/apps.js:90
+#: js/apps.js:95
 msgid "Updating...."
 msgstr ""
 
-#: js/apps.js:93
+#: js/apps.js:98
 msgid "Error while updating app"
 msgstr ""
 
-#: js/apps.js:96
+#: js/apps.js:101
 msgid "Updated"
 msgstr ""
 
@@ -165,15 +165,15 @@ msgstr ""
 msgid "A valid password must be provided"
 msgstr ""
 
-#: personal.php:35 personal.php:36
+#: personal.php:37 personal.php:38
 msgid "__language_name__"
 msgstr ""
 
-#: templates/admin.php:15
+#: templates/admin.php:17
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:18
+#: templates/admin.php:20
 msgid ""
 "Your data directory and your files are probably accessible from the "
 "internet. The .htaccess file that ownCloud provides is not working. We "
@@ -182,36 +182,36 @@ msgid ""
 " webserver document root."
 msgstr ""
 
-#: templates/admin.php:29
+#: templates/admin.php:31
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:32
+#: templates/admin.php:34
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: templates/admin.php:33
+#: templates/admin.php:35
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:44
+#: templates/admin.php:46
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:47
+#: templates/admin.php:49
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr ""
 
-#: templates/admin.php:58
+#: templates/admin.php:60
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:63
+#: templates/admin.php:65
 #, php-format
 msgid ""
 "This ownCloud server can't set system locale to %s. This means that there "
@@ -219,11 +219,11 @@ msgid ""
 " to install the required packages on your system to support %s."
 msgstr ""
 
-#: templates/admin.php:75
+#: templates/admin.php:77
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:78
+#: templates/admin.php:80
 msgid ""
 "This ownCloud server has no working internet connection. This means that "
 "some of the features like mounting of external storage, notifications about "
@@ -233,102 +233,102 @@ msgid ""
 " of ownCloud."
 msgstr ""
 
-#: templates/admin.php:92
+#: templates/admin.php:94
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:101
+#: templates/admin.php:103
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:111
+#: templates/admin.php:113
 msgid ""
 "cron.php is registered at a webcron service. Call the cron.php page in the "
 "owncloud root once a minute over http."
 msgstr ""
 
-#: templates/admin.php:121
+#: templates/admin.php:123
 msgid ""
 "Use systems cron service. Call the cron.php file in the owncloud folder via "
 "a system cronjob once a minute."
 msgstr ""
 
-#: templates/admin.php:128
+#: templates/admin.php:130
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:134
+#: templates/admin.php:136
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:135
+#: templates/admin.php:137
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:142
+#: templates/admin.php:144
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:143
+#: templates/admin.php:145
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:150
+#: templates/admin.php:152
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:151
+#: templates/admin.php:153
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:158
+#: templates/admin.php:160
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:161
+#: templates/admin.php:163
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:168
+#: templates/admin.php:170
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:181
+#: templates/admin.php:183
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:182
+#: templates/admin.php:184
 msgid ""
 "Enforces the clients to connect to ownCloud via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:185
+#: templates/admin.php:187
 msgid ""
 "Please connect to this ownCloud instance via HTTPS to enable or disable the "
 "SSL enforcement."
 msgstr ""
 
-#: templates/admin.php:195
+#: templates/admin.php:197
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:196
+#: templates/admin.php:198
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:227
+#: templates/admin.php:229
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:228
+#: templates/admin.php:230
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:235 templates/personal.php:111
+#: templates/admin.php:236 templates/personal.php:116
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:237 templates/personal.php:114
+#: templates/admin.php:240 templates/personal.php:119
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -338,27 +338,27 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr ""
 
-#: templates/apps.php:11
+#: templates/apps.php:13
 msgid "Add your App"
 msgstr ""
 
-#: templates/apps.php:12
+#: templates/apps.php:28
 msgid "More Apps"
 msgstr ""
 
-#: templates/apps.php:28
+#: templates/apps.php:33
 msgid "Select an App"
 msgstr ""
 
-#: templates/apps.php:34
+#: templates/apps.php:39
 msgid "See application page at apps.owncloud.com"
 msgstr ""
 
-#: templates/apps.php:36
+#: templates/apps.php:41
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr ""
 
-#: templates/apps.php:38
+#: templates/apps.php:43
 msgid "Update"
 msgstr ""
 
@@ -386,76 +386,79 @@ msgstr ""
 msgid "Commercial Support"
 msgstr ""
 
-#: templates/personal.php:8
-#, php-format
-msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
-msgstr ""
-
-#: templates/personal.php:15
+#: templates/personal.php:10
 msgid "Get the apps to sync your files"
 msgstr ""
 
-#: templates/personal.php:26
+#: templates/personal.php:21
 msgid "Show First Run Wizard again"
 msgstr ""
 
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:29
+#, php-format
+msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
+msgstr ""
+
+#: templates/personal.php:41 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr ""
 
-#: templates/personal.php:38
+#: templates/personal.php:42
 msgid "Your password was changed"
 msgstr ""
 
-#: templates/personal.php:39
+#: templates/personal.php:43
 msgid "Unable to change your password"
 msgstr ""
 
-#: templates/personal.php:40
+#: templates/personal.php:44
 msgid "Current password"
 msgstr ""
 
-#: templates/personal.php:42
+#: templates/personal.php:46
 msgid "New password"
 msgstr ""
 
-#: templates/personal.php:44
+#: templates/personal.php:48
 msgid "Change password"
 msgstr ""
 
-#: templates/personal.php:56 templates/users.php:85
+#: templates/personal.php:60 templates/users.php:85
 msgid "Display Name"
 msgstr ""
 
-#: templates/personal.php:71
+#: templates/personal.php:75
 msgid "Email"
 msgstr ""
 
-#: templates/personal.php:73
+#: templates/personal.php:77
 msgid "Your email address"
 msgstr ""
 
-#: templates/personal.php:74
+#: templates/personal.php:78
 msgid "Fill in an email address to enable password recovery"
 msgstr ""
 
-#: templates/personal.php:83 templates/personal.php:84
+#: templates/personal.php:87 templates/personal.php:88
 msgid "Language"
 msgstr ""
 
-#: templates/personal.php:95
+#: templates/personal.php:100
 msgid "Help translate"
 msgstr ""
 
-#: templates/personal.php:100
+#: templates/personal.php:106
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:102
-msgid "Use this address to connect to your ownCloud in your file manager"
+#: templates/personal.php:108
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
+"target=\"_blank\">access your Files via WebDAV</a>"
 msgstr ""
 
-#: templates/users.php:21 templates/users.php:84
+#: templates/users.php:21
 msgid "Login Name"
 msgstr ""
 
@@ -485,6 +488,10 @@ msgstr ""
 msgid "Other"
 msgstr ""
 
+#: templates/users.php:84
+msgid "Username"
+msgstr ""
+
 #: templates/users.php:91
 msgid "Storage"
 msgstr ""
diff --git a/l10n/nl/core.po b/l10n/nl/core.po
index eec21a297baf8cb9bb680c3583cb67f112f6a2ec..f5b0b2ed83861467c5f3443fdc2c7d478789eea4 100644
--- a/l10n/nl/core.po
+++ b/l10n/nl/core.po
@@ -4,13 +4,14 @@
 # 
 # Translators:
 # André Koot <meneer@tken.net>, 2013
+# Jorcee <mail@jordyc.nl>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:22+0000\n"
-"Last-Translator: André Koot <meneer@tken.net>\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,7 +22,7 @@ msgstr ""
 #: ajax/share.php:97
 #, php-format
 msgid "%s shared »%s« with you"
-msgstr "%s deelde »%s« met u"
+msgstr "%s deelde »%s« met jou"
 
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
@@ -29,7 +30,7 @@ msgstr "Categorie type niet opgegeven."
 
 #: ajax/vcategories/add.php:30
 msgid "No category to add?"
-msgstr "Geen categorie toevoegen?"
+msgstr "Geen categorie om toe te voegen?"
 
 #: ajax/vcategories/add.php:37
 #, php-format
@@ -62,135 +63,135 @@ msgstr "Geen categorie geselecteerd voor verwijdering."
 msgid "Error removing %s from favorites."
 msgstr "Verwijderen %s van favorieten is mislukt."
 
-#: js/config.php:34
+#: js/config.php:32
 msgid "Sunday"
-msgstr "Zondag"
+msgstr "zondag"
 
-#: js/config.php:35
+#: js/config.php:33
 msgid "Monday"
-msgstr "Maandag"
+msgstr "maandag"
 
-#: js/config.php:36
+#: js/config.php:34
 msgid "Tuesday"
-msgstr "Dinsdag"
+msgstr "dinsdag"
 
-#: js/config.php:37
+#: js/config.php:35
 msgid "Wednesday"
-msgstr "Woensdag"
+msgstr "woensdag"
 
-#: js/config.php:38
+#: js/config.php:36
 msgid "Thursday"
-msgstr "Donderdag"
+msgstr "donderdag"
 
-#: js/config.php:39
+#: js/config.php:37
 msgid "Friday"
-msgstr "Vrijdag"
+msgstr "vrijdag"
 
-#: js/config.php:40
+#: js/config.php:38
 msgid "Saturday"
-msgstr "Zaterdag"
+msgstr "zaterdag"
 
-#: js/config.php:45
+#: js/config.php:43
 msgid "January"
 msgstr "januari"
 
-#: js/config.php:46
+#: js/config.php:44
 msgid "February"
 msgstr "februari"
 
-#: js/config.php:47
+#: js/config.php:45
 msgid "March"
 msgstr "maart"
 
-#: js/config.php:48
+#: js/config.php:46
 msgid "April"
 msgstr "april"
 
-#: js/config.php:49
+#: js/config.php:47
 msgid "May"
 msgstr "mei"
 
-#: js/config.php:50
+#: js/config.php:48
 msgid "June"
 msgstr "juni"
 
-#: js/config.php:51
+#: js/config.php:49
 msgid "July"
 msgstr "juli"
 
-#: js/config.php:52
+#: js/config.php:50
 msgid "August"
 msgstr "augustus"
 
-#: js/config.php:53
+#: js/config.php:51
 msgid "September"
 msgstr "september"
 
-#: js/config.php:54
+#: js/config.php:52
 msgid "October"
 msgstr "oktober"
 
-#: js/config.php:55
+#: js/config.php:53
 msgid "November"
 msgstr "november"
 
-#: js/config.php:56
+#: js/config.php:54
 msgid "December"
 msgstr "december"
 
-#: js/js.js:286
+#: js/js.js:293
 msgid "Settings"
 msgstr "Instellingen"
 
-#: js/js.js:718
+#: js/js.js:725
 msgid "seconds ago"
 msgstr "seconden geleden"
 
-#: js/js.js:719
+#: js/js.js:726
 msgid "1 minute ago"
 msgstr "1 minuut geleden"
 
-#: js/js.js:720
+#: js/js.js:727
 msgid "{minutes} minutes ago"
 msgstr "{minutes} minuten geleden"
 
-#: js/js.js:721
+#: js/js.js:728
 msgid "1 hour ago"
 msgstr "1 uur geleden"
 
-#: js/js.js:722
+#: js/js.js:729
 msgid "{hours} hours ago"
 msgstr "{hours} uren geleden"
 
-#: js/js.js:723
+#: js/js.js:730
 msgid "today"
 msgstr "vandaag"
 
-#: js/js.js:724
+#: js/js.js:731
 msgid "yesterday"
 msgstr "gisteren"
 
-#: js/js.js:725
+#: js/js.js:732
 msgid "{days} days ago"
 msgstr "{days} dagen geleden"
 
-#: js/js.js:726
+#: js/js.js:733
 msgid "last month"
 msgstr "vorige maand"
 
-#: js/js.js:727
+#: js/js.js:734
 msgid "{months} months ago"
 msgstr "{months} maanden geleden"
 
-#: js/js.js:728
+#: js/js.js:735
 msgid "months ago"
 msgstr "maanden geleden"
 
-#: js/js.js:729
+#: js/js.js:736
 msgid "last year"
 msgstr "vorig jaar"
 
-#: js/js.js:730
+#: js/js.js:737
 msgid "years ago"
 msgstr "jaar geleden"
 
@@ -226,8 +227,8 @@ msgstr "Het object type is niet gespecificeerd."
 #: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
 #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:577
-#: js/share.js:589
+#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:620
+#: js/share.js:632
 msgid "Error"
 msgstr "Fout"
 
@@ -247,7 +248,7 @@ msgstr "Gedeeld"
 msgid "Share"
 msgstr "Delen"
 
-#: js/share.js:125 js/share.js:617
+#: js/share.js:125 js/share.js:660
 msgid "Error while sharing"
 msgstr "Fout tijdens het delen"
 
@@ -267,99 +268,103 @@ msgstr "Gedeeld met u en de groep {group} door {owner}"
 msgid "Shared with you by {owner}"
 msgstr "Gedeeld met u door {owner}"
 
-#: js/share.js:159
+#: js/share.js:172
 msgid "Share with"
 msgstr "Deel met"
 
-#: js/share.js:164
+#: js/share.js:177
 msgid "Share with link"
 msgstr "Deel met link"
 
-#: js/share.js:167
+#: js/share.js:180
 msgid "Password protect"
-msgstr "Wachtwoord beveiliging"
+msgstr "Wachtwoord beveiligd"
 
-#: js/share.js:169 templates/installation.php:54 templates/login.php:26
+#: js/share.js:182 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "Wachtwoord"
 
-#: js/share.js:173
+#: js/share.js:187
+msgid "Allow Public Upload"
+msgstr "Sta publieke uploads toe"
+
+#: js/share.js:191
 msgid "Email link to person"
 msgstr "E-mail link naar persoon"
 
-#: js/share.js:174
+#: js/share.js:192
 msgid "Send"
 msgstr "Versturen"
 
-#: js/share.js:178
+#: js/share.js:197
 msgid "Set expiration date"
 msgstr "Stel vervaldatum in"
 
-#: js/share.js:179
+#: js/share.js:198
 msgid "Expiration date"
 msgstr "Vervaldatum"
 
-#: js/share.js:211
+#: js/share.js:230
 msgid "Share via email:"
-msgstr "Deel via email:"
+msgstr "Deel via e-mail:"
 
-#: js/share.js:213
+#: js/share.js:232
 msgid "No people found"
 msgstr "Geen mensen gevonden"
 
-#: js/share.js:251
+#: js/share.js:270
 msgid "Resharing is not allowed"
 msgstr "Verder delen is niet toegestaan"
 
-#: js/share.js:287
+#: js/share.js:306
 msgid "Shared in {item} with {user}"
 msgstr "Gedeeld in {item} met {user}"
 
-#: js/share.js:308
+#: js/share.js:327
 msgid "Unshare"
 msgstr "Stop met delen"
 
-#: js/share.js:320
+#: js/share.js:339
 msgid "can edit"
 msgstr "kan wijzigen"
 
-#: js/share.js:322
+#: js/share.js:341
 msgid "access control"
 msgstr "toegangscontrole"
 
-#: js/share.js:325
+#: js/share.js:344
 msgid "create"
 msgstr "creëer"
 
-#: js/share.js:328
+#: js/share.js:347
 msgid "update"
 msgstr "bijwerken"
 
-#: js/share.js:331
+#: js/share.js:350
 msgid "delete"
 msgstr "verwijderen"
 
-#: js/share.js:334
+#: js/share.js:353
 msgid "share"
 msgstr "deel"
 
-#: js/share.js:368 js/share.js:564
+#: js/share.js:387 js/share.js:607
 msgid "Password protected"
 msgstr "Wachtwoord beveiligd"
 
-#: js/share.js:577
+#: js/share.js:620
 msgid "Error unsetting expiration date"
 msgstr "Fout tijdens het verwijderen van de verval datum"
 
-#: js/share.js:589
+#: js/share.js:632
 msgid "Error setting expiration date"
 msgstr "Fout tijdens het instellen van de vervaldatum"
 
-#: js/share.js:604
+#: js/share.js:647
 msgid "Sending ..."
 msgstr "Versturen ..."
 
-#: js/share.js:615
+#: js/share.js:658
 msgid "Email sent"
 msgstr "E-mail verzonden"
 
@@ -372,11 +377,11 @@ msgstr "De update is niet geslaagd. Meld dit probleem aan bij de <a href=\"https
 
 #: js/update.js:18
 msgid "The update was successful. Redirecting you to ownCloud now."
-msgstr "De update is geslaagd. U wordt teruggeleid naar uw eigen ownCloud."
+msgstr "De update is geslaagd. Je wordt teruggeleid naar je eigen ownCloud."
 
-#: lostpassword/controller.php:58
+#: lostpassword/controller.php:60
 msgid "ownCloud password reset"
-msgstr "ownCloud wachtwoord herstellen"
+msgstr "ownCloud-wachtwoord herstellen"
 
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
@@ -387,15 +392,15 @@ msgid ""
 "The link to reset your password has been sent to your email.<br>If you do "
 "not receive it within a reasonable amount of time, check your spam/junk "
 "folders.<br>If it is not there ask your local administrator ."
-msgstr "De link voor het resetten van uw wachtwoord is verzonden naar uw e-mailadres.<br>Als u dat bericht niet snel ontvangen hebt, controleer dan uw spambakje.<br>Als het daar ook niet is, vraag dan uw beheerder om te helpen."
+msgstr "De link voor het resetten van je wachtwoord is verzonden naar je e-mailadres.<br>Als je dat bericht niet snel ontvangen hebt, controleer dan uw spambakje.<br>Als het daar ook niet is, vraag dan je beheerder om te helpen."
 
 #: lostpassword/templates/lostpassword.php:12
 msgid "Request failed!<br>Did you make sure your email/username was right?"
-msgstr "Aanvraag mislukt!<br>Weet u zeker dat uw gebruikersnaam en/of wachtwoord goed waren?"
+msgstr "Aanvraag mislukt!<br>Weet je zeker dat je gebruikersnaam en/of wachtwoord goed waren?"
 
 #: lostpassword/templates/lostpassword.php:15
 msgid "You will receive a link to reset your password via Email."
-msgstr "U ontvangt een link om uw wachtwoord opnieuw in te stellen via e-mail."
+msgstr "Je ontvangt een link om je wachtwoord opnieuw in te stellen via e-mail."
 
 #: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
 #: templates/login.php:19
@@ -404,17 +409,17 @@ msgstr "Gebruikersnaam"
 
 #: lostpassword/templates/lostpassword.php:22
 msgid ""
-"Your files seems to be encrypted. If you didn't have enabled the recovery "
-"key there will be no way to get your data back once the password was "
-"resetted. If you are not sure what to do, please contact your administrator "
-"first before continue. Do you really want to continue?"
-msgstr ""
+"Your files are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
+msgstr "Je bestanden zijn versleuteld. Als je geen recoverykey hebt ingeschakeld is er geen manier om je data terug te krijgen indien je je wachtwoord reset!\nAls je niet weet wat te doen, neem dan alsjeblieft contact op met je administrator eer je doorgaat.\nWil je echt doorgaan?"
 
 #: lostpassword/templates/lostpassword.php:24
 msgid "Yes, I really want to reset my password now"
 msgstr "Ja, ik wil mijn wachtwoord nu echt resetten"
 
-#: lostpassword/templates/lostpassword.php:29
+#: lostpassword/templates/lostpassword.php:27
 msgid "Request reset"
 msgstr "Resetaanvraag"
 
@@ -428,7 +433,7 @@ msgstr "Naar de login-pagina"
 
 #: lostpassword/templates/resetpassword.php:8
 msgid "New password"
-msgstr "Nieuw"
+msgstr "Nieuw wachtwoord"
 
 #: lostpassword/templates/resetpassword.php:11
 msgid "Reset password"
@@ -462,7 +467,7 @@ msgstr "Toegang verboden"
 msgid "Cloud not found"
 msgstr "Cloud niet gevonden"
 
-#: templates/altmail.php:2
+#: templates/altmail.php:4
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -471,11 +476,7 @@ msgid ""
 "View it: %s\n"
 "\n"
 "Cheers!"
-msgstr "Hallo daar,\n\n%s deelde %s met u.\nBekijk: %s\n\nVeel plezier!"
-
-#: templates/altmail.php:7 templates/mail.php:24
-msgid "web services under your control"
-msgstr "Webdiensten in eigen beheer"
+msgstr "Hallo daar,\n\n%s deelde %s met jou.\nBekijk: %s\n\nVeel plezier!"
 
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
@@ -492,36 +493,36 @@ msgstr "Beveiligingswaarschuwing"
 
 #: templates/installation.php:25
 msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
-msgstr "Uw PHP versie is kwetsbaar voor de NULL byte aanval (CVE-2006-7243)"
+msgstr "Je PHP-versie is kwetsbaar voor de NULL byte aanval (CVE-2006-7243)"
 
 #: templates/installation.php:26
 msgid "Please update your PHP installation to use ownCloud securely."
-msgstr "Werk uw PHP installatie bij om ownCloud veilig te kunnen gebruiken."
+msgstr "Werk je PHP-installatie bij om ownCloud veilig te kunnen gebruiken."
 
 #: templates/installation.php:32
 msgid ""
 "No secure random number generator is available, please enable the PHP "
 "OpenSSL extension."
-msgstr "Er kon geen willekeurig nummer worden gegenereerd. Zet de PHP OpenSSL extentie aan."
+msgstr "Er kon geen willekeurig nummer worden gegenereerd. Zet de PHP OpenSSL-extentie aan."
 
 #: templates/installation.php:33
 msgid ""
 "Without a secure random number generator an attacker may be able to predict "
 "password reset tokens and take over your account."
-msgstr "Zonder random nummer generator is het mogelijk voor een aanvaller om de reset tokens van wachtwoorden te voorspellen. Dit kan leiden tot het inbreken op uw account."
+msgstr "Zonder random nummer generator is het mogelijk voor een aanvaller om de resettokens van wachtwoorden te voorspellen. Dit kan leiden tot het inbreken op uw account."
 
 #: templates/installation.php:39
 msgid ""
 "Your data directory and files are probably accessible from the internet "
 "because the .htaccess file does not work."
-msgstr "Uw gegevensdirectory en bestanden zijn vermoedelijk bereikbaar vanaf het internet omdat het .htaccess bestand niet werkt."
+msgstr "Je gegevensdirectory en bestanden zijn vermoedelijk bereikbaar vanaf het internet omdat het .htaccess-bestand niet werkt."
 
 #: templates/installation.php:40
 msgid ""
 "For information how to properly configure your server, please see the <a "
 "href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" "
 "target=\"_blank\">documentation</a>."
-msgstr "Informatie over het configureren van uw server is hier te vinden <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentatie</a>."
+msgstr "Informatie over het configureren van uw server is <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">hier</a> te vinden."
 
 #: templates/installation.php:44
 msgid "Create an <strong>admin account</strong>"
@@ -563,18 +564,18 @@ msgstr "Database tablespace"
 
 #: templates/installation.php:166
 msgid "Database host"
-msgstr "Database server"
+msgstr "Databaseserver"
 
 #: templates/installation.php:172
 msgid "Finish setup"
 msgstr "Installatie afronden"
 
-#: templates/layout.user.php:40
+#: templates/layout.user.php:43
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr "%s is beschikbaar. Verkrijg meer informatie over het bijwerken."
 
-#: templates/layout.user.php:67
+#: templates/layout.user.php:68
 msgid "Log out"
 msgstr "Afmelden"
 
@@ -586,15 +587,15 @@ msgstr "Automatische aanmelding geweigerd!"
 msgid ""
 "If you did not change your password recently, your account may be "
 "compromised!"
-msgstr "Als u uw wachtwoord niet onlangs heeft aangepast, kan uw account overgenomen zijn!"
+msgstr "Als je je wachtwoord niet onlangs heeft aangepast, kan je account overgenomen zijn!"
 
 #: templates/login.php:12
 msgid "Please change your password to secure your account again."
-msgstr "Wijzig uw wachtwoord zodat uw account weer beveiligd is."
+msgstr "Wijzig je wachtwoord zodat je account weer beveiligd is."
 
 #: templates/login.php:34
 msgid "Lost your password?"
-msgstr "Uw wachtwoord vergeten?"
+msgstr "Wachtwoord vergeten?"
 
 #: templates/login.php:39
 msgid "remember"
@@ -608,12 +609,12 @@ msgstr "Meld je aan"
 msgid "Alternative Logins"
 msgstr "Alternatieve inlogs"
 
-#: templates/mail.php:15
+#: templates/mail.php:16
 #, php-format
 msgid ""
 "Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
 "href=\"%s\">View it!</a><br><br>Cheers!"
-msgstr "Hallo daar,<br><br> %s deelde »%s« met u.<br><a href=\"%s\">Bekijk!</a><br><br>Veel plezier!"
+msgstr "Hallo daar,<br><br> %s deelde »%s« met jou.<br><a href=\"%s\">Bekijk!</a><br><br>Veel plezier!"
 
 #: templates/part.pagenavi.php:3
 msgid "prev"
@@ -626,4 +627,4 @@ msgstr "volgende"
 #: templates/update.php:3
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
-msgstr "Updaten ownCloud naar versie %s, dit kan even duren."
+msgstr "Updaten ownCloud naar versie %s, dit kan even duren..."
diff --git a/l10n/nl/files.po b/l10n/nl/files.po
index eb4bb5e484d53481753e6cd3fa1f7cb4ed5f3dd6..581f08cb420ca7ef5e0e97ef7a0c609c2a0c7429 100644
--- a/l10n/nl/files.po
+++ b/l10n/nl/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-06-17 02:01+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
-"Last-Translator: André Koot <meneer@tken.net>\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -28,46 +28,54 @@ msgstr "Kon %s niet verplaatsen - Er bestaat al een bestand met deze naam"
 msgid "Could not move %s"
 msgstr "Kon %s niet verplaatsen"
 
-#: ajax/upload.php:19
+#: ajax/upload.php:16 ajax/upload.php:45
+msgid "Unable to set upload directory."
+msgstr "Kan upload map niet instellen."
+
+#: ajax/upload.php:22
+msgid "Invalid Token"
+msgstr "Ongeldig Token"
+
+#: ajax/upload.php:59
 msgid "No file was uploaded. Unknown error"
 msgstr "Er was geen bestand geladen.  Onbekende fout"
 
-#: ajax/upload.php:26
+#: ajax/upload.php:66
 msgid "There is no error, the file uploaded with success"
 msgstr "De upload van het bestand is goedgegaan."
 
-#: ajax/upload.php:27
+#: ajax/upload.php:67
 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:29
+#: ajax/upload.php:69
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Het bestand overschrijdt de MAX_FILE_SIZE instelling dat is opgegeven in het HTML formulier"
 
-#: ajax/upload.php:30
+#: ajax/upload.php:70
 msgid "The uploaded file was only partially uploaded"
 msgstr "Het bestand is gedeeltelijk geüpload"
 
-#: ajax/upload.php:31
+#: ajax/upload.php:71
 msgid "No file was uploaded"
 msgstr "Er is geen bestand geüpload"
 
-#: ajax/upload.php:32
+#: ajax/upload.php:72
 msgid "Missing a temporary folder"
 msgstr "Er ontbreekt een tijdelijke map"
 
-#: ajax/upload.php:33
+#: ajax/upload.php:73
 msgid "Failed to write to disk"
 msgstr "Schrijven naar schijf mislukt"
 
-#: ajax/upload.php:51
+#: ajax/upload.php:91
 msgid "Not enough storage available"
 msgstr "Niet genoeg opslagruimte beschikbaar"
 
-#: ajax/upload.php:83
+#: ajax/upload.php:123
 msgid "Invalid directory."
 msgstr "Ongeldige directory."
 
@@ -75,6 +83,36 @@ msgstr "Ongeldige directory."
 msgid "Files"
 msgstr "Bestanden"
 
+#: js/file-upload.js:11
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr "Het lukt niet om uw bestand te uploaded, omdat het een folder of 0 bytes is"
+
+#: js/file-upload.js:24
+msgid "Not enough space available"
+msgstr "Niet genoeg ruimte beschikbaar"
+
+#: js/file-upload.js:64
+msgid "Upload cancelled."
+msgstr "Uploaden geannuleerd."
+
+#: js/file-upload.js:167 js/files.js:266
+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/file-upload.js:233 js/files.js:339
+msgid "URL cannot be empty."
+msgstr "URL kan niet leeg zijn."
+
+#: js/file-upload.js:238 lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr "Ongeldige mapnaam. Gebruik van 'Gedeeld' is voorbehouden aan Owncloud zelf"
+
+#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
+#: js/files.js:693 js/files.js:731
+msgid "Error"
+msgstr "Fout"
+
 #: js/fileactions.js:116
 msgid "Share"
 msgstr "Delen"
@@ -91,43 +129,43 @@ msgstr "Verwijder"
 msgid "Rename"
 msgstr "Hernoem"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:464
 msgid "Pending"
 msgstr "In behandeling"
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "{new_name} already exists"
 msgstr "{new_name} bestaat al"
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "replace"
 msgstr "vervang"
 
-#: js/filelist.js:259
+#: js/filelist.js:302
 msgid "suggest name"
 msgstr "Stel een naam voor"
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "cancel"
 msgstr "annuleren"
 
-#: js/filelist.js:306
+#: js/filelist.js:349
 msgid "replaced {new_name} with {old_name}"
 msgstr "verving {new_name} met {old_name}"
 
-#: js/filelist.js:306
+#: js/filelist.js:349
 msgid "undo"
 msgstr "ongedaan maken"
 
-#: js/filelist.js:331
+#: js/filelist.js:374
 msgid "perform delete operation"
 msgstr "uitvoeren verwijderactie"
 
-#: js/filelist.js:413
+#: js/filelist.js:456
 msgid "1 file uploading"
 msgstr "1 bestand wordt ge-upload"
 
-#: js/filelist.js:416 js/filelist.js:470
+#: js/filelist.js:459 js/filelist.js:517
 msgid "files uploading"
 msgstr "bestanden aan het uploaden"
 
@@ -159,70 +197,42 @@ msgid ""
 "big."
 msgstr "Uw download wordt voorbereid. Dit kan enige tijd duren bij grote bestanden."
 
-#: js/files.js:264
-msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "Het lukt niet om uw bestand te uploaded, omdat het een folder of 0 bytes is"
-
-#: js/files.js:277
-msgid "Not enough space available"
-msgstr "Niet genoeg ruimte beschikbaar"
-
-#: js/files.js:317
-msgid "Upload cancelled."
-msgstr "Uploaden geannuleerd."
-
-#: js/files.js:413
-msgid ""
-"File upload is in progress. Leaving the page now will cancel the upload."
-msgstr "Bestandsupload is bezig. Wanneer de pagina nu verlaten wordt, stopt de upload."
-
-#: js/files.js:486
-msgid "URL cannot be empty."
-msgstr "URL kan niet leeg zijn."
-
-#: js/files.js:491
+#: js/files.js:344
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Ongeldige mapnaam. Gebruik van'Gedeeld' is voorbehouden aan Owncloud"
 
-#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
-msgid "Error"
-msgstr "Fout"
-
-#: js/files.js:877 templates/index.php:69
+#: js/files.js:744 templates/index.php:69
 msgid "Name"
 msgstr "Naam"
 
-#: js/files.js:878 templates/index.php:80
+#: js/files.js:745 templates/index.php:80
 msgid "Size"
 msgstr "Grootte"
 
-#: js/files.js:879 templates/index.php:82
+#: js/files.js:746 templates/index.php:82
 msgid "Modified"
 msgstr "Aangepast"
 
-#: js/files.js:898
+#: js/files.js:765
 msgid "1 folder"
 msgstr "1 map"
 
-#: js/files.js:900
+#: js/files.js:767
 msgid "{count} folders"
 msgstr "{count} mappen"
 
-#: js/files.js:908
+#: js/files.js:775
 msgid "1 file"
 msgstr "1 bestand"
 
-#: js/files.js:910
+#: js/files.js:777
 msgid "{count} files"
 msgstr "{count} bestanden"
 
-#: lib/app.php:53
-msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
-msgstr "Ongeldige mapnaam. Gebruik van 'Gedeeld' is voorbehouden aan Owncloud zelf"
-
 #: lib/app.php:73
-msgid "Unable to rename file"
-msgstr "Kan bestand niet hernoemen"
+#, php-format
+msgid "%s could not be renamed"
+msgstr ""
 
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
@@ -318,6 +328,22 @@ msgstr "Bestanden worden gescand, even wachten."
 msgid "Current scanning"
 msgstr "Er wordt gescand"
 
+#: templates/part.list.php:76
+msgid "directory"
+msgstr ""
+
+#: templates/part.list.php:78
+msgid "directories"
+msgstr ""
+
+#: templates/part.list.php:87
+msgid "file"
+msgstr "bestand"
+
+#: templates/part.list.php:89
+msgid "files"
+msgstr "bestanden"
+
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
 msgstr "Upgraden bestandssysteem cache..."
diff --git a/l10n/nl/files_encryption.po b/l10n/nl/files_encryption.po
index a2c16d01202660cb463ec1a59d74fb8dd6ab7568..d69aec2838528de3ef2657c09e78f2e65c930b42 100644
--- a/l10n/nl/files_encryption.po
+++ b/l10n/nl/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-06-16 01:58+0200\n"
-"PO-Revision-Date: 2013-06-15 21:40+0000\n"
-"Last-Translator: André Koot <meneer@tken.net>\n"
+"POT-Creation-Date: 2013-07-05 02:12+0200\n"
+"PO-Revision-Date: 2013-07-05 00:13+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"
@@ -46,19 +46,31 @@ msgstr "Kon wachtwoord niet wijzigen. Wellicht oude wachtwoord niet juist ingevo
 
 #: ajax/updatePrivateKeyPassword.php:51
 msgid "Private key password successfully updated."
-msgstr ""
+msgstr "Privésleutel succesvol bijgewerkt."
 
 #: ajax/updatePrivateKeyPassword.php:53
 msgid ""
 "Could not update the private key password. Maybe the old password was not "
 "correct."
-msgstr ""
+msgstr "Kon het wachtwoord van de privésleutel niet wijzigen. Misschien was het oude wachtwoord onjuist."
 
 #: files/error.php:7
 msgid ""
-"Your private key is not valid! Maybe your password was changed from outside."
-" You can update your private key password in your personal settings to "
-"regain access to your files"
+"Your private key is not valid! Likely your password was changed outside the "
+"ownCloud system (e.g. your corporate directory). You can update your private"
+" key password in your personal settings to recover access to your encrypted "
+"files."
+msgstr ""
+
+#: hooks/hooks.php:44
+msgid "Missing requirements."
+msgstr ""
+
+#: hooks/hooks.php:45
+msgid ""
+"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL "
+"PHP extension is enabled and configured properly. For now, the encryption "
+"app has been disabled."
 msgstr ""
 
 #: js/settings-admin.js:11
@@ -85,12 +97,12 @@ msgstr "Versleuteling"
 
 #: templates/settings-admin.php:10
 msgid ""
-"Enable encryption passwords recovery key (allow sharing to recovery key):"
-msgstr "Activeer versleuteling van wachtwoorden herstelsleutel (maak delen met herstel sleutel mogelijk):"
+"Enable recovery key (allow to recover users files in case of password loss):"
+msgstr "Activeren herstelsleutel (maakt het mogelijk om gebruikersbestanden terug te halen in geval van verlies van het wachtwoord):"
 
 #: templates/settings-admin.php:14
-msgid "Recovery account password"
-msgstr "Herstel account wachtwoord"
+msgid "Recovery key password"
+msgstr "Wachtwoord herstelsleulel"
 
 #: templates/settings-admin.php:21 templates/settings-personal.php:54
 msgid "Enabled"
@@ -101,16 +113,16 @@ msgid "Disabled"
 msgstr "Gedeactiveerd"
 
 #: templates/settings-admin.php:34
-msgid "Change encryption passwords recovery key:"
-msgstr "Wijzig versleuteling wachtwoord herstelsleutel"
+msgid "Change recovery key password:"
+msgstr "Wijzig wachtwoord herstelsleutel:"
 
 #: templates/settings-admin.php:41
-msgid "Old Recovery account password"
-msgstr "Oude herstel account wachtwoord"
+msgid "Old Recovery key password"
+msgstr "Oude wachtwoord herstelsleutel"
 
 #: templates/settings-admin.php:48
-msgid "New Recovery account password"
-msgstr "Nieuwe herstel account wachtwoord"
+msgid "New Recovery key password"
+msgstr "Nieuwe wachtwoord herstelsleutel"
 
 #: templates/settings-admin.php:53
 msgid "Change Password"
@@ -118,11 +130,11 @@ msgstr "Wijzigen wachtwoord"
 
 #: templates/settings-personal.php:11
 msgid "Your private key password no longer match your log-in password:"
-msgstr ""
+msgstr "Het wachtwoord van uw privésleutel komt niet meer overeen met uw inlogwachtwoord:"
 
 #: templates/settings-personal.php:14
 msgid "Set your old private key password to your current log-in password."
-msgstr ""
+msgstr "Stel het wachtwoord van uw oude privésleutel in op uw huidige inlogwachtwoord."
 
 #: templates/settings-personal.php:16
 msgid ""
diff --git a/l10n/nl/files_external.po b/l10n/nl/files_external.po
index b74e83850bd08be9c9654d71e9a3dfe08c293e39..51d5728ecf9590d50b9c814c850485872fc01a2d 100644
--- a/l10n/nl/files_external.po
+++ b/l10n/nl/files_external.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: André Koot <meneer@tken.net>\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/nl/files_sharing.po b/l10n/nl/files_sharing.po
index 7e3c9962d97be1e7c8d2cd858d24cefcf69aec99..9e527d60b3f93e9e245af484adc0e234cf71fa01 100644
--- a/l10n/nl/files_sharing.po
+++ b/l10n/nl/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
 "MIME-Version: 1.0\n"
@@ -18,27 +18,39 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: templates/authenticate.php:4
+msgid "The password is wrong. Try again."
+msgstr ""
+
+#: templates/authenticate.php:7
 msgid "Password"
 msgstr "Wachtwoord"
 
-#: templates/authenticate.php:6
+#: templates/authenticate.php:9
 msgid "Submit"
 msgstr "Verzenden"
 
-#: templates/public.php:10
+#: templates/public.php:17
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s deelt de map %s met u"
 
-#: templates/public.php:13
+#: templates/public.php:20
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s deelt het bestand %s met u"
 
-#: templates/public.php:19 templates/public.php:43
+#: templates/public.php:28 templates/public.php:90
 msgid "Download"
 msgstr "Downloaden"
 
-#: templates/public.php:40
+#: templates/public.php:45 templates/public.php:48
+msgid "Upload"
+msgstr "Uploaden"
+
+#: templates/public.php:58
+msgid "Cancel upload"
+msgstr "Upload afbreken"
+
+#: templates/public.php:87
 msgid "No preview available for"
 msgstr "Geen voorbeeldweergave beschikbaar voor"
diff --git a/l10n/nl/files_trashbin.po b/l10n/nl/files_trashbin.po
index 306a7055f2daf944b94627f0dff37c36fe21126d..35a1f307925c9a93fc8c047db93b46209ff0ba50 100644
--- a/l10n/nl/files_trashbin.po
+++ b/l10n/nl/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:16+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/nl/lib.po b/l10n/nl/lib.po
index 6d033c861dae92f440a0fac1c6580b04d9261a88..4bdf8dcf8bf75677251a727c23ed42b2a45f71b5 100644
--- a/l10n/nl/lib.po
+++ b/l10n/nl/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-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
-"Last-Translator: André Koot <meneer@tken.net>\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,43 +18,47 @@ msgstr ""
 "Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:359
+#: app.php:360
 msgid "Help"
 msgstr "Help"
 
-#: app.php:372
+#: app.php:373
 msgid "Personal"
 msgstr "Persoonlijk"
 
-#: app.php:383
+#: app.php:384
 msgid "Settings"
 msgstr "Instellingen"
 
-#: app.php:395
+#: app.php:396
 msgid "Users"
 msgstr "Gebruikers"
 
-#: app.php:408
+#: app.php:409
 msgid "Apps"
 msgstr "Apps"
 
-#: app.php:416
+#: app.php:417
 msgid "Admin"
 msgstr "Beheerder"
 
-#: files.php:210
+#: defaults.php:33
+msgid "web services under your control"
+msgstr "Webdiensten in eigen beheer"
+
+#: files.php:226
 msgid "ZIP download is turned off."
 msgstr "ZIP download is uitgeschakeld."
 
-#: files.php:211
+#: files.php:227
 msgid "Files need to be downloaded one by one."
 msgstr "Bestanden moeten één voor één worden gedownload."
 
-#: files.php:212 files.php:245
+#: files.php:228 files.php:261
 msgid "Back to Files"
 msgstr "Terug naar bestanden"
 
-#: files.php:242
+#: files.php:258
 msgid "Selected files too large to generate zip file."
 msgstr "De geselecteerde bestanden zijn te groot om een zip bestand te maken."
 
@@ -86,104 +90,102 @@ msgstr "Tekst"
 msgid "Images"
 msgstr "Afbeeldingen"
 
-#: setup.php:34
-msgid "Set an admin username."
-msgstr "Stel de gebruikersnaam van de beheerder in."
-
-#: setup.php:37
-msgid "Set an admin password."
-msgstr "Stel een beheerderswachtwoord in."
-
-#: setup.php:55
+#: setup/abstractdatabase.php:22
 #, php-format
 msgid "%s enter the database username."
 msgstr "%s opgeven database gebruikersnaam."
 
-#: setup.php:58
+#: setup/abstractdatabase.php:25
 #, php-format
 msgid "%s enter the database name."
 msgstr "%s opgeven databasenaam."
 
-#: setup.php:61
+#: setup/abstractdatabase.php:28
 #, php-format
 msgid "%s you may not use dots in the database name"
 msgstr "%s er mogen geen puntjes in de databasenaam voorkomen"
 
-#: setup.php:64
+#: setup/mssql.php:20
 #, php-format
-msgid "%s set the database host."
-msgstr "%s instellen databaseservernaam."
-
-#: setup.php:126 setup.php:332 setup.php:377
-msgid "PostgreSQL username and/or password not valid"
-msgstr "PostgreSQL gebruikersnaam en/of wachtwoord ongeldig"
+msgid "MS SQL username and/or password not valid: %s"
+msgstr "MS SQL gebruikersnaam en/of wachtwoord niet geldig: %s"
 
-#: setup.php:127 setup.php:235
+#: setup/mssql.php:21 setup/mysql.php:13 setup/oci.php:114
+#: setup/postgresql.php:24 setup/postgresql.php:70
 msgid "You need to enter either an existing account or the administrator."
 msgstr "Geef of een bestaand account op of het beheerdersaccount."
 
-#: setup.php:152
-msgid "Oracle connection could not be established"
-msgstr "Er kon geen verbinding met Oracle worden bereikt"
-
-#: setup.php:234
+#: setup/mysql.php:12
 msgid "MySQL username and/or password not valid"
 msgstr "MySQL gebruikersnaam en/of wachtwoord ongeldig"
 
-#: setup.php:288 setup.php:398 setup.php:407 setup.php:425 setup.php:435
-#: setup.php:444 setup.php:477 setup.php:543 setup.php:569 setup.php:576
-#: setup.php:587 setup.php:594 setup.php:603 setup.php:611 setup.php:620
-#: setup.php:626
+#: setup/mysql.php:67 setup/oci.php:54 setup/oci.php:121 setup/oci.php:147
+#: setup/oci.php:154 setup/oci.php:165 setup/oci.php:172 setup/oci.php:181
+#: setup/oci.php:189 setup/oci.php:198 setup/oci.php:204
+#: setup/postgresql.php:89 setup/postgresql.php:98 setup/postgresql.php:115
+#: setup/postgresql.php:125 setup/postgresql.php:134
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr "DB Fout: \"%s\""
 
-#: setup.php:289 setup.php:399 setup.php:408 setup.php:426 setup.php:436
-#: setup.php:445 setup.php:478 setup.php:544 setup.php:570 setup.php:577
-#: setup.php:588 setup.php:604 setup.php:612 setup.php:621
+#: setup/mysql.php:68 setup/oci.php:55 setup/oci.php:122 setup/oci.php:148
+#: setup/oci.php:155 setup/oci.php:166 setup/oci.php:182 setup/oci.php:190
+#: setup/oci.php:199 setup/postgresql.php:90 setup/postgresql.php:99
+#: setup/postgresql.php:116 setup/postgresql.php:126 setup/postgresql.php:135
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr "Onjuiste commande was: \"%s\""
 
-#: setup.php:305
+#: setup/mysql.php:85
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr "MySQL gebruiker '%s'@'localhost' bestaat al."
 
-#: setup.php:306
+#: setup/mysql.php:86
 msgid "Drop this user from MySQL"
 msgstr "Verwijder deze gebruiker uit MySQL"
 
-#: setup.php:311
+#: setup/mysql.php:91
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr "MySQL gebruiker '%s'@'%%' bestaat al"
 
-#: setup.php:312
+#: setup/mysql.php:92
 msgid "Drop this user from MySQL."
 msgstr "Verwijder deze gebruiker uit MySQL."
 
-#: setup.php:469 setup.php:536
+#: setup/oci.php:34
+msgid "Oracle connection could not be established"
+msgstr "Er kon geen verbinding met Oracle worden bereikt"
+
+#: setup/oci.php:41 setup/oci.php:113
 msgid "Oracle username and/or password not valid"
 msgstr "Oracle gebruikersnaam en/of wachtwoord ongeldig"
 
-#: setup.php:595 setup.php:627
+#: setup/oci.php:173 setup/oci.php:205
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr "Onjuiste commando was: \"%s\", naam: %s, wachtwoord: %s"
 
-#: setup.php:647
-#, php-format
-msgid "MS SQL username and/or password not valid: %s"
-msgstr "MS SQL gebruikersnaam en/of wachtwoord niet geldig: %s"
+#: setup/postgresql.php:23 setup/postgresql.php:69
+msgid "PostgreSQL username and/or password not valid"
+msgstr "PostgreSQL gebruikersnaam en/of wachtwoord ongeldig"
+
+#: setup.php:42
+msgid "Set an admin username."
+msgstr "Stel de gebruikersnaam van de beheerder in."
+
+#: setup.php:45
+msgid "Set an admin password."
+msgstr "Stel een beheerderswachtwoord in."
 
-#: setup.php:870
+#: setup.php:198
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Uw webserver is nog niet goed ingesteld voor bestandssynchronisatie omdat de WebDAV interface verbroken lijkt."
 
-#: setup.php:871
+#: setup.php:199
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Controleer de <a href='%s'>installatiehandleiding</a> goed."
diff --git a/l10n/nl/settings.po b/l10n/nl/settings.po
index 8ecf552fa01d40677514100aa8c6a2058a12f840..e04b0109d123becaf6e78926240d9fd0a4882d49 100644
--- a/l10n/nl/settings.po
+++ b/l10n/nl/settings.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
-"Last-Translator: André Koot <meneer@tken.net>\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -90,35 +90,35 @@ msgstr "Niet in staat om gebruiker te verwijderen uit groep %s"
 msgid "Couldn't update app."
 msgstr "Kon de app niet bijwerken."
 
-#: js/apps.js:30
+#: js/apps.js:35
 msgid "Update to {appversion}"
 msgstr "Bijwerken naar {appversion}"
 
-#: js/apps.js:36 js/apps.js:76
+#: js/apps.js:41 js/apps.js:81
 msgid "Disable"
 msgstr "Uitschakelen"
 
-#: js/apps.js:36 js/apps.js:64 js/apps.js:83
+#: js/apps.js:41 js/apps.js:69 js/apps.js:88
 msgid "Enable"
 msgstr "Activeer"
 
-#: js/apps.js:55
+#: js/apps.js:60
 msgid "Please wait...."
 msgstr "Even geduld aub...."
 
-#: js/apps.js:59 js/apps.js:71 js/apps.js:80 js/apps.js:93
+#: js/apps.js:64 js/apps.js:76 js/apps.js:85 js/apps.js:98
 msgid "Error"
 msgstr "Fout"
 
-#: js/apps.js:90
+#: js/apps.js:95
 msgid "Updating...."
 msgstr "Bijwerken...."
 
-#: js/apps.js:93
+#: js/apps.js:98
 msgid "Error while updating app"
 msgstr "Fout bij bijwerken app"
 
-#: js/apps.js:96
+#: js/apps.js:101
 msgid "Updated"
 msgstr "Bijgewerkt"
 
@@ -167,15 +167,15 @@ msgstr "Fout bij aanmaken gebruiker"
 msgid "A valid password must be provided"
 msgstr "Er moet een geldig wachtwoord worden opgegeven"
 
-#: personal.php:35 personal.php:36
+#: personal.php:37 personal.php:38
 msgid "__language_name__"
 msgstr "Nederlands"
 
-#: templates/admin.php:15
+#: templates/admin.php:17
 msgid "Security Warning"
 msgstr "Beveiligingswaarschuwing"
 
-#: templates/admin.php:18
+#: templates/admin.php:20
 msgid ""
 "Your data directory and your files are probably accessible from the "
 "internet. The .htaccess file that ownCloud provides is not working. We "
@@ -184,36 +184,36 @@ msgid ""
 " webserver document root."
 msgstr "Uw data is waarschijnlijk toegankelijk vanaf net internet. Het  .htaccess bestand dat ownCloud levert werkt niet goed. U wordt aangeraden om de configuratie van uw webserver zodanig aan te passen dat de data folders niet meer publiekelijk toegankelijk zijn. U kunt ook de data folder verplaatsen naar een folder buiten de webserver document folder."
 
-#: templates/admin.php:29
+#: templates/admin.php:31
 msgid "Setup Warning"
 msgstr "Instellingswaarschuwing"
 
-#: templates/admin.php:32
+#: templates/admin.php:34
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Uw webserver is nog niet goed ingesteld voor bestandssynchronisatie omdat de WebDAV interface verbroken lijkt."
 
-#: templates/admin.php:33
+#: templates/admin.php:35
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Controleer de <a href='%s'>installatiehandleiding</a> goed."
 
-#: templates/admin.php:44
+#: templates/admin.php:46
 msgid "Module 'fileinfo' missing"
 msgstr "Module 'fileinfo' ontbreekt"
 
-#: templates/admin.php:47
+#: templates/admin.php:49
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr "De PHP module 'fileinfo' ontbreekt. We adviseren met klem om deze module te activeren om de beste resultaten te bereiken voor mime-type detectie."
 
-#: templates/admin.php:58
+#: templates/admin.php:60
 msgid "Locale not working"
 msgstr "Taalbestand werkt niet"
 
-#: templates/admin.php:63
+#: templates/admin.php:65
 #, php-format
 msgid ""
 "This ownCloud server can't set system locale to %s. This means that there "
@@ -221,11 +221,11 @@ msgid ""
 " to install the required packages on your system to support %s."
 msgstr "Deze ownCloud server kan de systeemtaal niet instellen op %s. Hierdoor kunnen er mogelijk problemen optreden met bepaalde tekens in bestandsnamen. Het wordt sterk aangeraden om de vereiste pakketen op uw systeem te installeren zodat %s ondersteund wordt."
 
-#: templates/admin.php:75
+#: templates/admin.php:77
 msgid "Internet connection not working"
 msgstr "Internet verbinding werkt niet"
 
-#: templates/admin.php:78
+#: templates/admin.php:80
 msgid ""
 "This ownCloud server has no working internet connection. This means that "
 "some of the features like mounting of external storage, notifications about "
@@ -235,102 +235,102 @@ msgid ""
 " of ownCloud."
 msgstr "Deze ownCloud server heeft geen actieve internet verbinding. dat betekent dat sommige functies, zoals aankoppelen van externe opslag, notificaties over updates of installatie van apps van 3e partijen niet werken. Ook het benaderen van bestanden vanaf een remote locatie en het versturen van notificatie emails kan mislukken. We adviseren om de internet verbinding voor deze server in te schakelen als u alle functies van ownCloud wilt gebruiken."
 
-#: templates/admin.php:92
+#: templates/admin.php:94
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:101
+#: templates/admin.php:103
 msgid "Execute one task with each page loaded"
 msgstr "Bij laden van elke pagina één taak uitvoeren"
 
-#: templates/admin.php:111
+#: templates/admin.php:113
 msgid ""
 "cron.php is registered at a webcron service. Call the cron.php page in the "
 "owncloud root once a minute over http."
 msgstr "cron.php is geregistreerd bij een webcron service. Roep eens per minuut de cron.php pagina aan over http in de ownCloud root."
 
-#: templates/admin.php:121
+#: templates/admin.php:123
 msgid ""
 "Use systems cron service. Call the cron.php file in the owncloud folder via "
 "a system cronjob once a minute."
 msgstr "Gebruik de systems cron service. Roep eens per minuut de cron.php file in de ownCloud map via een systeem cronjob."
 
-#: templates/admin.php:128
+#: templates/admin.php:130
 msgid "Sharing"
 msgstr "Delen"
 
-#: templates/admin.php:134
+#: templates/admin.php:136
 msgid "Enable Share API"
 msgstr "Activeren Share API"
 
-#: templates/admin.php:135
+#: templates/admin.php:137
 msgid "Allow apps to use the Share API"
 msgstr "Apps toestaan de Share API te gebruiken"
 
-#: templates/admin.php:142
+#: templates/admin.php:144
 msgid "Allow links"
 msgstr "Toestaan links"
 
-#: templates/admin.php:143
+#: templates/admin.php:145
 msgid "Allow users to share items to the public with links"
 msgstr "Toestaan dat gebruikers objecten met links delen met anderen"
 
-#: templates/admin.php:150
+#: templates/admin.php:152
 msgid "Allow resharing"
 msgstr "Toestaan opnieuw delen"
 
-#: templates/admin.php:151
+#: templates/admin.php:153
 msgid "Allow users to share items shared with them again"
 msgstr "Toestaan dat gebruikers objecten die anderen met hun gedeeld hebben zelf ook weer delen met anderen"
 
-#: templates/admin.php:158
+#: templates/admin.php:160
 msgid "Allow users to share with anyone"
 msgstr "Toestaan dat gebruikers met iedereen delen"
 
-#: templates/admin.php:161
+#: templates/admin.php:163
 msgid "Allow users to only share with users in their groups"
 msgstr "Instellen dat gebruikers alleen met leden binnen hun groepen delen"
 
-#: templates/admin.php:168
+#: templates/admin.php:170
 msgid "Security"
 msgstr "Beveiliging"
 
-#: templates/admin.php:181
+#: templates/admin.php:183
 msgid "Enforce HTTPS"
 msgstr "Afdwingen HTTPS"
 
-#: templates/admin.php:182
+#: templates/admin.php:184
 msgid ""
 "Enforces the clients to connect to ownCloud via an encrypted connection."
 msgstr "Afdwingen dat de clients alleen via versleutelde verbinding contact maken met ownCloud."
 
-#: templates/admin.php:185
+#: templates/admin.php:187
 msgid ""
 "Please connect to this ownCloud instance via HTTPS to enable or disable the "
 "SSL enforcement."
 msgstr "Maak via HTTPS verbinding met deze ownCloud inrichting om het afdwingen van gebruik van SSL te activeren of deactiveren."
 
-#: templates/admin.php:195
+#: templates/admin.php:197
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:196
+#: templates/admin.php:198
 msgid "Log level"
 msgstr "Log niveau"
 
-#: templates/admin.php:227
+#: templates/admin.php:229
 msgid "More"
 msgstr "Meer"
 
-#: templates/admin.php:228
+#: templates/admin.php:230
 msgid "Less"
 msgstr "Minder"
 
-#: templates/admin.php:235 templates/personal.php:116
+#: templates/admin.php:236 templates/personal.php:116
 msgid "Version"
 msgstr "Versie"
 
-#: templates/admin.php:237 templates/personal.php:119
+#: templates/admin.php:240 templates/personal.php:119
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -388,76 +388,79 @@ msgstr "Bugtracker"
 msgid "Commercial Support"
 msgstr "Commerciële ondersteuning"
 
-#: templates/personal.php:9
+#: templates/personal.php:10
 msgid "Get the apps to sync your files"
 msgstr "Download de apps om bestanden te syncen"
 
-#: templates/personal.php:20
+#: templates/personal.php:21
 msgid "Show First Run Wizard again"
 msgstr "Toon de Eerste start Wizard opnieuw"
 
-#: templates/personal.php:28
+#: templates/personal.php:29
 #, php-format
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "Je hebt <strong>%s</strong> gebruikt van de beschikbare <strong>%s<strong>"
 
-#: templates/personal.php:40 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:41 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "Wachtwoord"
 
-#: templates/personal.php:41
+#: templates/personal.php:42
 msgid "Your password was changed"
 msgstr "Je wachtwoord is veranderd"
 
-#: templates/personal.php:42
+#: templates/personal.php:43
 msgid "Unable to change your password"
 msgstr "Niet in staat om uw wachtwoord te wijzigen"
 
-#: templates/personal.php:43
+#: templates/personal.php:44
 msgid "Current password"
 msgstr "Huidig wachtwoord"
 
-#: templates/personal.php:45
+#: templates/personal.php:46
 msgid "New password"
 msgstr "Nieuw"
 
-#: templates/personal.php:47
+#: templates/personal.php:48
 msgid "Change password"
 msgstr "Wijzig wachtwoord"
 
-#: templates/personal.php:59 templates/users.php:85
+#: templates/personal.php:60 templates/users.php:85
 msgid "Display Name"
 msgstr "Weergavenaam"
 
-#: templates/personal.php:74
+#: templates/personal.php:75
 msgid "Email"
 msgstr "E-mailadres"
 
-#: templates/personal.php:76
+#: templates/personal.php:77
 msgid "Your email address"
 msgstr "Uw e-mailadres"
 
-#: templates/personal.php:77
+#: templates/personal.php:78
 msgid "Fill in an email address to enable password recovery"
 msgstr "Vul een mailadres in om je wachtwoord te kunnen herstellen"
 
-#: templates/personal.php:86 templates/personal.php:87
+#: templates/personal.php:87 templates/personal.php:88
 msgid "Language"
 msgstr "Taal"
 
-#: templates/personal.php:99
+#: templates/personal.php:100
 msgid "Help translate"
 msgstr "Help met vertalen"
 
-#: templates/personal.php:105
+#: templates/personal.php:106
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:107
-msgid "Use this address to connect to your ownCloud in your file manager"
-msgstr "Gebruik dit adres om te verbinden met uw ownCloud in uw bestandsbeheer"
+#: templates/personal.php:108
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
+"target=\"_blank\">access your Files via WebDAV</a>"
+msgstr ""
 
-#: templates/users.php:21 templates/users.php:84
+#: templates/users.php:21
 msgid "Login Name"
 msgstr "Inlognaam"
 
@@ -487,6 +490,10 @@ msgstr "Ongelimiteerd"
 msgid "Other"
 msgstr "Anders"
 
+#: templates/users.php:84
+msgid "Username"
+msgstr "Gebruikersnaam"
+
 #: templates/users.php:91
 msgid "Storage"
 msgstr "Opslaglimiet"
diff --git a/l10n/nl/user_ldap.po b/l10n/nl/user_ldap.po
index 0b26e0379670008ee65bfd2fc2b2d9146e75b066..6bba174de0820ea6e74ef4595d2e868568c4122e 100644
--- a/l10n/nl/user_ldap.po
+++ b/l10n/nl/user_ldap.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:25+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:16+0000\n"
 "Last-Translator: André Koot <meneer@tken.net>\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/nn_NO/core.po b/l10n/nn_NO/core.po
index 04991fdf88560db8c0c8c4c2bb53b2ae73e31707..5a481e732a8f18d897ebdd00cfd30eade11897b7 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-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:22+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:14+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -63,135 +63,135 @@ msgstr "Ingen kategoriar valt for sletting."
 msgid "Error removing %s from favorites."
 msgstr "Klarte ikkje fjerna %s frå favorittar."
 
-#: js/config.php:34
+#: js/config.php:32
 msgid "Sunday"
 msgstr "Søndag"
 
-#: js/config.php:35
+#: js/config.php:33
 msgid "Monday"
 msgstr "MÃ¥ndag"
 
-#: js/config.php:36
+#: js/config.php:34
 msgid "Tuesday"
 msgstr "Tysdag"
 
-#: js/config.php:37
+#: js/config.php:35
 msgid "Wednesday"
 msgstr "Onsdag"
 
-#: js/config.php:38
+#: js/config.php:36
 msgid "Thursday"
 msgstr "Torsdag"
 
-#: js/config.php:39
+#: js/config.php:37
 msgid "Friday"
 msgstr "Fredag"
 
-#: js/config.php:40
+#: js/config.php:38
 msgid "Saturday"
 msgstr "Laurdag"
 
-#: js/config.php:45
+#: js/config.php:43
 msgid "January"
 msgstr "Januar"
 
-#: js/config.php:46
+#: js/config.php:44
 msgid "February"
 msgstr "Februar"
 
-#: js/config.php:47
+#: js/config.php:45
 msgid "March"
 msgstr "Mars"
 
-#: js/config.php:48
+#: js/config.php:46
 msgid "April"
 msgstr "April"
 
-#: js/config.php:49
+#: js/config.php:47
 msgid "May"
 msgstr "Mai"
 
-#: js/config.php:50
+#: js/config.php:48
 msgid "June"
 msgstr "Juni"
 
-#: js/config.php:51
+#: js/config.php:49
 msgid "July"
 msgstr "Juli"
 
-#: js/config.php:52
+#: js/config.php:50
 msgid "August"
 msgstr "August"
 
-#: js/config.php:53
+#: js/config.php:51
 msgid "September"
 msgstr "September"
 
-#: js/config.php:54
+#: js/config.php:52
 msgid "October"
 msgstr "Oktober"
 
-#: js/config.php:55
+#: js/config.php:53
 msgid "November"
 msgstr "November"
 
-#: js/config.php:56
+#: js/config.php:54
 msgid "December"
 msgstr "Desember"
 
-#: js/js.js:286
+#: js/js.js:293
 msgid "Settings"
 msgstr "Innstillingar"
 
-#: js/js.js:718
+#: js/js.js:725
 msgid "seconds ago"
 msgstr "sekund sidan"
 
-#: js/js.js:719
+#: js/js.js:726
 msgid "1 minute ago"
 msgstr "1 minutt sidan"
 
-#: js/js.js:720
+#: js/js.js:727
 msgid "{minutes} minutes ago"
 msgstr "{minutes} minutt sidan"
 
-#: js/js.js:721
+#: js/js.js:728
 msgid "1 hour ago"
 msgstr "1 time sidan"
 
-#: js/js.js:722
+#: js/js.js:729
 msgid "{hours} hours ago"
 msgstr "{hours} timar sidan"
 
-#: js/js.js:723
+#: js/js.js:730
 msgid "today"
 msgstr "i dag"
 
-#: js/js.js:724
+#: js/js.js:731
 msgid "yesterday"
 msgstr "i går"
 
-#: js/js.js:725
+#: js/js.js:732
 msgid "{days} days ago"
 msgstr "{days} dagar sidan"
 
-#: js/js.js:726
+#: js/js.js:733
 msgid "last month"
 msgstr "førre månad"
 
-#: js/js.js:727
+#: js/js.js:734
 msgid "{months} months ago"
 msgstr "{months} månadar sidan"
 
-#: js/js.js:728
+#: js/js.js:735
 msgid "months ago"
 msgstr "månadar sidan"
 
-#: js/js.js:729
+#: js/js.js:736
 msgid "last year"
 msgstr "i fjor"
 
-#: js/js.js:730
+#: js/js.js:737
 msgid "years ago"
 msgstr "Ã¥r sidan"
 
@@ -227,8 +227,8 @@ msgstr "Objekttypen er ikkje spesifisert."
 #: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
 #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:577
-#: js/share.js:589
+#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:620
+#: js/share.js:632
 msgid "Error"
 msgstr "Feil"
 
@@ -248,7 +248,7 @@ msgstr "Delt"
 msgid "Share"
 msgstr "Del"
 
-#: js/share.js:125 js/share.js:617
+#: js/share.js:125 js/share.js:660
 msgid "Error while sharing"
 msgstr "Feil ved deling"
 
@@ -268,99 +268,103 @@ msgstr "Delt med deg og gruppa {group} av {owner}"
 msgid "Shared with you by {owner}"
 msgstr "Delt med deg av {owner}"
 
-#: js/share.js:159
+#: js/share.js:172
 msgid "Share with"
 msgstr "Del med"
 
-#: js/share.js:164
+#: js/share.js:177
 msgid "Share with link"
 msgstr "Del med lenkje"
 
-#: js/share.js:167
+#: js/share.js:180
 msgid "Password protect"
 msgstr "Passordvern"
 
-#: js/share.js:169 templates/installation.php:54 templates/login.php:26
+#: js/share.js:182 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "Passord"
 
-#: js/share.js:173
+#: js/share.js:187
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:191
 msgid "Email link to person"
 msgstr "Send lenkja over e-post"
 
-#: js/share.js:174
+#: js/share.js:192
 msgid "Send"
 msgstr "Send"
 
-#: js/share.js:178
+#: js/share.js:197
 msgid "Set expiration date"
 msgstr "Set utløpsdato"
 
-#: js/share.js:179
+#: js/share.js:198
 msgid "Expiration date"
 msgstr "Utløpsdato"
 
-#: js/share.js:211
+#: js/share.js:230
 msgid "Share via email:"
 msgstr "Del over e-post:"
 
-#: js/share.js:213
+#: js/share.js:232
 msgid "No people found"
 msgstr "Fann ingen personar"
 
-#: js/share.js:251
+#: js/share.js:270
 msgid "Resharing is not allowed"
 msgstr "Vidaredeling er ikkje tillate"
 
-#: js/share.js:287
+#: js/share.js:306
 msgid "Shared in {item} with {user}"
 msgstr "Delt i {item} med {brukar}"
 
-#: js/share.js:308
+#: js/share.js:327
 msgid "Unshare"
 msgstr "Udel"
 
-#: js/share.js:320
+#: js/share.js:339
 msgid "can edit"
 msgstr "kan endra"
 
-#: js/share.js:322
+#: js/share.js:341
 msgid "access control"
 msgstr "tilgangskontroll"
 
-#: js/share.js:325
+#: js/share.js:344
 msgid "create"
 msgstr "lag"
 
-#: js/share.js:328
+#: js/share.js:347
 msgid "update"
 msgstr "oppdater"
 
-#: js/share.js:331
+#: js/share.js:350
 msgid "delete"
 msgstr "slett"
 
-#: js/share.js:334
+#: js/share.js:353
 msgid "share"
 msgstr "del"
 
-#: js/share.js:368 js/share.js:564
+#: js/share.js:387 js/share.js:607
 msgid "Password protected"
 msgstr "Passordverna"
 
-#: js/share.js:577
+#: js/share.js:620
 msgid "Error unsetting expiration date"
 msgstr "Klarte ikkje fjerna utløpsdato"
 
-#: js/share.js:589
+#: js/share.js:632
 msgid "Error setting expiration date"
 msgstr "Klarte ikkje setja utløpsdato"
 
-#: js/share.js:604
+#: js/share.js:647
 msgid "Sending ..."
 msgstr "Sender …"
 
-#: js/share.js:615
+#: js/share.js:658
 msgid "Email sent"
 msgstr "E-post sendt"
 
@@ -375,7 +379,7 @@ msgstr "Oppdateringa feila. Ver venleg og rapporter feilen til <a href=\"https:/
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "Oppdateringa er fullført. Sender deg vidare til ownCloud no."
 
-#: lostpassword/controller.php:58
+#: lostpassword/controller.php:60
 msgid "ownCloud password reset"
 msgstr "Nullstilling av ownCloud-passord"
 
@@ -405,17 +409,17 @@ msgstr "Brukarnamn"
 
 #: lostpassword/templates/lostpassword.php:22
 msgid ""
-"Your files seems to be encrypted. If you didn't have enabled the recovery "
-"key there will be no way to get your data back once the password was "
-"resetted. If you are not sure what to do, please contact your administrator "
-"first before continue. Do you really want to continue?"
+"Your files are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
 msgstr ""
 
 #: lostpassword/templates/lostpassword.php:24
 msgid "Yes, I really want to reset my password now"
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:29
+#: lostpassword/templates/lostpassword.php:27
 msgid "Request reset"
 msgstr "Be om nullstilling"
 
@@ -463,7 +467,7 @@ msgstr "Tilgang forbudt"
 msgid "Cloud not found"
 msgstr "Fann ikkje skyen"
 
-#: templates/altmail.php:2
+#: templates/altmail.php:4
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -474,10 +478,6 @@ msgid ""
 "Cheers!"
 msgstr ""
 
-#: templates/altmail.php:7 templates/mail.php:24
-msgid "web services under your control"
-msgstr "Vev tjenester under din kontroll"
-
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
 msgstr "Endra kategoriar"
@@ -570,12 +570,12 @@ msgstr "Databasetenar"
 msgid "Finish setup"
 msgstr "Fullfør oppsettet"
 
-#: templates/layout.user.php:40
+#: templates/layout.user.php:43
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr "%s er tilgjengeleg. FÃ¥ meir informasjon om korleis du oppdaterer."
 
-#: templates/layout.user.php:67
+#: templates/layout.user.php:68
 msgid "Log out"
 msgstr "Logg ut"
 
@@ -609,7 +609,7 @@ msgstr "Logg inn"
 msgid "Alternative Logins"
 msgstr "Alternative innloggingar"
 
-#: templates/mail.php:15
+#: templates/mail.php:16
 #, php-format
 msgid ""
 "Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
diff --git a/l10n/nn_NO/files.po b/l10n/nn_NO/files.po
index 5b8d9321ef90f5dc036b89709060766e2d43349a..22504c66703a928e3a047a4542df746c3fdc2cde 100644
--- a/l10n/nn_NO/files.po
+++ b/l10n/nn_NO/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-06-17 02:01+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
-"Last-Translator: unhammer <unhammer+dill@mm.st>\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -29,46 +29,54 @@ msgstr "Klarte ikkje flytta %s – det finst allereie ei fil med dette namnet"
 msgid "Could not move %s"
 msgstr "Klarte ikkje flytta %s"
 
-#: ajax/upload.php:19
+#: ajax/upload.php:16 ajax/upload.php:45
+msgid "Unable to set upload directory."
+msgstr ""
+
+#: ajax/upload.php:22
+msgid "Invalid Token"
+msgstr ""
+
+#: ajax/upload.php:59
 msgid "No file was uploaded. Unknown error"
 msgstr "Ingen filer lasta opp. Ukjend feil"
 
-#: ajax/upload.php:26
+#: ajax/upload.php:66
 msgid "There is no error, the file uploaded with success"
 msgstr "Ingen feil, fila vart lasta opp"
 
-#: ajax/upload.php:27
+#: ajax/upload.php:67
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr "Fila du lasta opp er større enn det «upload_max_filesize» i php.ini tillater: "
 
-#: ajax/upload.php:29
+#: ajax/upload.php:69
 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:30
+#: ajax/upload.php:70
 msgid "The uploaded file was only partially uploaded"
 msgstr "Fila vart berre delvis lasta opp"
 
-#: ajax/upload.php:31
+#: ajax/upload.php:71
 msgid "No file was uploaded"
 msgstr "Ingen filer vart lasta opp"
 
-#: ajax/upload.php:32
+#: ajax/upload.php:72
 msgid "Missing a temporary folder"
 msgstr "Manglar ei mellombels mappe"
 
-#: ajax/upload.php:33
+#: ajax/upload.php:73
 msgid "Failed to write to disk"
 msgstr "Klarte ikkje skriva til disk"
 
-#: ajax/upload.php:51
+#: ajax/upload.php:91
 msgid "Not enough storage available"
 msgstr "Ikkje nok lagringsplass tilgjengeleg"
 
-#: ajax/upload.php:83
+#: ajax/upload.php:123
 msgid "Invalid directory."
 msgstr "Ugyldig mappe."
 
@@ -76,6 +84,36 @@ msgstr "Ugyldig mappe."
 msgid "Files"
 msgstr "Filer"
 
+#: js/file-upload.js:11
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr "Klarte ikkje lasta opp fila sidan ho er ei mappe eller er på 0 byte"
+
+#: js/file-upload.js:24
+msgid "Not enough space available"
+msgstr "Ikkje nok lagringsplass tilgjengeleg"
+
+#: js/file-upload.js:64
+msgid "Upload cancelled."
+msgstr "Opplasting avbroten."
+
+#: js/file-upload.js:167 js/files.js:266
+msgid ""
+"File upload is in progress. Leaving the page now will cancel the upload."
+msgstr "Fila lastar no opp. Viss du forlèt sida no vil opplastinga verta avbroten."
+
+#: js/file-upload.js:233 js/files.js:339
+msgid "URL cannot be empty."
+msgstr "Nettadressa kan ikkje vera tom."
+
+#: js/file-upload.js:238 lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr "Ugyldig mappenamn. Mappa «Shared» er reservert av ownCloud"
+
+#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
+#: js/files.js:693 js/files.js:731
+msgid "Error"
+msgstr "Feil"
+
 #: js/fileactions.js:116
 msgid "Share"
 msgstr "Del"
@@ -92,43 +130,43 @@ msgstr "Slett"
 msgid "Rename"
 msgstr "Endra namn"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:464
 msgid "Pending"
 msgstr "Under vegs"
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "{new_name} already exists"
 msgstr "{new_name} finst allereie"
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "replace"
 msgstr "byt ut"
 
-#: js/filelist.js:259
+#: js/filelist.js:302
 msgid "suggest name"
 msgstr "føreslå namn"
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "cancel"
 msgstr "avbryt"
 
-#: js/filelist.js:306
+#: js/filelist.js:349
 msgid "replaced {new_name} with {old_name}"
 msgstr "bytte ut {new_name} med {old_name}"
 
-#: js/filelist.js:306
+#: js/filelist.js:349
 msgid "undo"
 msgstr "angre"
 
-#: js/filelist.js:331
+#: js/filelist.js:374
 msgid "perform delete operation"
 msgstr "utfør sletting"
 
-#: js/filelist.js:413
+#: js/filelist.js:456
 msgid "1 file uploading"
 msgstr "1 fil lastar opp"
 
-#: js/filelist.js:416 js/filelist.js:470
+#: js/filelist.js:459 js/filelist.js:517
 msgid "files uploading"
 msgstr "filer lastar opp"
 
@@ -160,70 +198,42 @@ msgid ""
 "big."
 msgstr "Gjer klar nedlastinga di. Dette kan ta ei stund viss filene er store."
 
-#: js/files.js:264
-msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "Klarte ikkje lasta opp fila sidan ho er ei mappe eller er på 0 byte"
-
-#: js/files.js:277
-msgid "Not enough space available"
-msgstr "Ikkje nok lagringsplass tilgjengeleg"
-
-#: js/files.js:317
-msgid "Upload cancelled."
-msgstr "Opplasting avbroten."
-
-#: js/files.js:413
-msgid ""
-"File upload is in progress. Leaving the page now will cancel the upload."
-msgstr "Fila lastar no opp. Viss du forlèt sida no vil opplastinga verta avbroten."
-
-#: js/files.js:486
-msgid "URL cannot be empty."
-msgstr "Nettadressa kan ikkje vera tom."
-
-#: js/files.js:491
+#: js/files.js:344
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Ugyldig mappenamn. Mappa «Shared» er reservert av ownCloud"
 
-#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
-msgid "Error"
-msgstr "Feil"
-
-#: js/files.js:877 templates/index.php:69
+#: js/files.js:744 templates/index.php:69
 msgid "Name"
 msgstr "Namn"
 
-#: js/files.js:878 templates/index.php:80
+#: js/files.js:745 templates/index.php:80
 msgid "Size"
 msgstr "Storleik"
 
-#: js/files.js:879 templates/index.php:82
+#: js/files.js:746 templates/index.php:82
 msgid "Modified"
 msgstr "Endra"
 
-#: js/files.js:898
+#: js/files.js:765
 msgid "1 folder"
 msgstr "1 mappe"
 
-#: js/files.js:900
+#: js/files.js:767
 msgid "{count} folders"
 msgstr "{count} mapper"
 
-#: js/files.js:908
+#: js/files.js:775
 msgid "1 file"
 msgstr "1 fil"
 
-#: js/files.js:910
+#: js/files.js:777
 msgid "{count} files"
 msgstr "{count} filer"
 
-#: lib/app.php:53
-msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
-msgstr "Ugyldig mappenamn. Mappa «Shared» er reservert av ownCloud"
-
 #: lib/app.php:73
-msgid "Unable to rename file"
-msgstr "Klarte ikkje endra filnamnet"
+#, php-format
+msgid "%s could not be renamed"
+msgstr ""
 
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
@@ -319,6 +329,22 @@ msgstr "Skannar filer, ver venleg og vent."
 msgid "Current scanning"
 msgstr "Køyrande skanning"
 
+#: templates/part.list.php:76
+msgid "directory"
+msgstr ""
+
+#: templates/part.list.php:78
+msgid "directories"
+msgstr ""
+
+#: templates/part.list.php:87
+msgid "file"
+msgstr ""
+
+#: templates/part.list.php:89
+msgid "files"
+msgstr ""
+
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
 msgstr "Oppgraderer mellomlageret av filsystemet …"
diff --git a/l10n/nn_NO/files_encryption.po b/l10n/nn_NO/files_encryption.po
index a060c341931b8b814d0d93936d4e28fdd45076fe..c8ba72ef42d8f01971a26bbe0033e401c76b1432 100644
--- a/l10n/nn_NO/files_encryption.po
+++ b/l10n/nn_NO/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-14 02:46+0200\n"
-"PO-Revision-Date: 2013-06-14 00:47+0000\n"
+"POT-Creation-Date: 2013-07-05 02:12+0200\n"
+"PO-Revision-Date: 2013-07-05 00:13+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"
@@ -55,9 +55,21 @@ msgstr ""
 
 #: files/error.php:7
 msgid ""
-"Your private key is not valid! Maybe your password was changed from outside."
-" You can update your private key password in your personal settings to "
-"regain access to your files"
+"Your private key is not valid! Likely your password was changed outside the "
+"ownCloud system (e.g. your corporate directory). You can update your private"
+" key password in your personal settings to recover access to your encrypted "
+"files."
+msgstr ""
+
+#: hooks/hooks.php:44
+msgid "Missing requirements."
+msgstr ""
+
+#: hooks/hooks.php:45
+msgid ""
+"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL "
+"PHP extension is enabled and configured properly. For now, the encryption "
+"app has been disabled."
 msgstr ""
 
 #: js/settings-admin.js:11
@@ -84,11 +96,11 @@ msgstr ""
 
 #: templates/settings-admin.php:10
 msgid ""
-"Enable encryption passwords recovery key (allow sharing to recovery key):"
+"Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
 #: templates/settings-admin.php:14
-msgid "Recovery account password"
+msgid "Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:21 templates/settings-personal.php:54
@@ -100,15 +112,15 @@ msgid "Disabled"
 msgstr ""
 
 #: templates/settings-admin.php:34
-msgid "Change encryption passwords recovery key:"
+msgid "Change recovery key password:"
 msgstr ""
 
 #: templates/settings-admin.php:41
-msgid "Old Recovery account password"
+msgid "Old Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:48
-msgid "New Recovery account password"
+msgid "New Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:53
diff --git a/l10n/nn_NO/files_external.po b/l10n/nn_NO/files_external.po
index 5f10dfcb13dec845b60d5444c04e83810856cd6d..0a4f9dd4c572d3335f0979d16e6823f094deda71 100644
--- a/l10n/nn_NO/files_external.po
+++ b/l10n/nn_NO/files_external.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/nn_NO/files_sharing.po b/l10n/nn_NO/files_sharing.po
index 99ad81bf4ac145f1b8c28f1487bf33c3b564e856..4e05d07f5c8a39e8d3dbc1e2bf4507c60c5b2451 100644
--- a/l10n/nn_NO/files_sharing.po
+++ b/l10n/nn_NO/files_sharing.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -19,27 +19,39 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: templates/authenticate.php:4
+msgid "The password is wrong. Try again."
+msgstr ""
+
+#: templates/authenticate.php:7
 msgid "Password"
 msgstr "Passord"
 
-#: templates/authenticate.php:6
+#: templates/authenticate.php:9
 msgid "Submit"
 msgstr "Send"
 
-#: templates/public.php:10
+#: templates/public.php:17
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s delte mappa %s med deg"
 
-#: templates/public.php:13
+#: templates/public.php:20
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s delte fila %s med deg"
 
-#: templates/public.php:19 templates/public.php:43
+#: templates/public.php:28 templates/public.php:90
 msgid "Download"
 msgstr "Last ned"
 
-#: templates/public.php:40
+#: templates/public.php:45 templates/public.php:48
+msgid "Upload"
+msgstr "Last opp"
+
+#: templates/public.php:58
+msgid "Cancel upload"
+msgstr "Avbryt opplasting"
+
+#: templates/public.php:87
 msgid "No preview available for"
 msgstr "Inga førehandsvising tilgjengeleg for"
diff --git a/l10n/nn_NO/files_trashbin.po b/l10n/nn_NO/files_trashbin.po
index e371c5937abbc9298708bb75163d4628bd82d12d..1a9abca4c615f33d5b65bfeb46493146f54bcb59 100644
--- a/l10n/nn_NO/files_trashbin.po
+++ b/l10n/nn_NO/files_trashbin.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:16+0000\n"
 "Last-Translator: unhammer <unhammer+dill@mm.st>\n"
 "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/nn_NO/lib.po b/l10n/nn_NO/lib.po
index 61ea95d973aede7b7f5c6520c4537da6922b6bcb..3b369ba7654d453125c535b94ce2e80177f950ff 100644
--- a/l10n/nn_NO/lib.po
+++ b/l10n/nn_NO/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-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
-"Last-Translator: unhammer <unhammer+dill@mm.st>\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,43 +18,47 @@ msgstr ""
 "Language: nn_NO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:359
+#: app.php:360
 msgid "Help"
 msgstr "Hjelp"
 
-#: app.php:372
+#: app.php:373
 msgid "Personal"
 msgstr "Personleg"
 
-#: app.php:383
+#: app.php:384
 msgid "Settings"
 msgstr "Innstillingar"
 
-#: app.php:395
+#: app.php:396
 msgid "Users"
 msgstr "Brukarar"
 
-#: app.php:408
+#: app.php:409
 msgid "Apps"
 msgstr "Program"
 
-#: app.php:416
+#: app.php:417
 msgid "Admin"
 msgstr "Administrer"
 
-#: files.php:210
+#: defaults.php:33
+msgid "web services under your control"
+msgstr "Vev tjenester under din kontroll"
+
+#: files.php:226
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: files.php:211
+#: files.php:227
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:212 files.php:245
+#: files.php:228 files.php:261
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:242
+#: files.php:258
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
@@ -86,104 +90,102 @@ msgstr "Tekst"
 msgid "Images"
 msgstr ""
 
-#: setup.php:34
-msgid "Set an admin username."
-msgstr ""
-
-#: setup.php:37
-msgid "Set an admin password."
-msgstr ""
-
-#: setup.php:55
+#: setup/abstractdatabase.php:22
 #, php-format
 msgid "%s enter the database username."
 msgstr ""
 
-#: setup.php:58
+#: setup/abstractdatabase.php:25
 #, php-format
 msgid "%s enter the database name."
 msgstr ""
 
-#: setup.php:61
+#: setup/abstractdatabase.php:28
 #, php-format
 msgid "%s you may not use dots in the database name"
 msgstr ""
 
-#: setup.php:64
+#: setup/mssql.php:20
 #, php-format
-msgid "%s set the database host."
-msgstr ""
-
-#: setup.php:126 setup.php:332 setup.php:377
-msgid "PostgreSQL username and/or password not valid"
+msgid "MS SQL username and/or password not valid: %s"
 msgstr ""
 
-#: setup.php:127 setup.php:235
+#: setup/mssql.php:21 setup/mysql.php:13 setup/oci.php:114
+#: setup/postgresql.php:24 setup/postgresql.php:70
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:152
-msgid "Oracle connection could not be established"
-msgstr ""
-
-#: setup.php:234
+#: setup/mysql.php:12
 msgid "MySQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:288 setup.php:398 setup.php:407 setup.php:425 setup.php:435
-#: setup.php:444 setup.php:477 setup.php:543 setup.php:569 setup.php:576
-#: setup.php:587 setup.php:594 setup.php:603 setup.php:611 setup.php:620
-#: setup.php:626
+#: setup/mysql.php:67 setup/oci.php:54 setup/oci.php:121 setup/oci.php:147
+#: setup/oci.php:154 setup/oci.php:165 setup/oci.php:172 setup/oci.php:181
+#: setup/oci.php:189 setup/oci.php:198 setup/oci.php:204
+#: setup/postgresql.php:89 setup/postgresql.php:98 setup/postgresql.php:115
+#: setup/postgresql.php:125 setup/postgresql.php:134
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr ""
 
-#: setup.php:289 setup.php:399 setup.php:408 setup.php:426 setup.php:436
-#: setup.php:445 setup.php:478 setup.php:544 setup.php:570 setup.php:577
-#: setup.php:588 setup.php:604 setup.php:612 setup.php:621
+#: setup/mysql.php:68 setup/oci.php:55 setup/oci.php:122 setup/oci.php:148
+#: setup/oci.php:155 setup/oci.php:166 setup/oci.php:182 setup/oci.php:190
+#: setup/oci.php:199 setup/postgresql.php:90 setup/postgresql.php:99
+#: setup/postgresql.php:116 setup/postgresql.php:126 setup/postgresql.php:135
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:305
+#: setup/mysql.php:85
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:306
+#: setup/mysql.php:86
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:311
+#: setup/mysql.php:91
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:312
+#: setup/mysql.php:92
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:469 setup.php:536
+#: setup/oci.php:34
+msgid "Oracle connection could not be established"
+msgstr ""
+
+#: setup/oci.php:41 setup/oci.php:113
 msgid "Oracle username and/or password not valid"
 msgstr ""
 
-#: setup.php:595 setup.php:627
+#: setup/oci.php:173 setup/oci.php:205
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:647
-#, php-format
-msgid "MS SQL username and/or password not valid: %s"
+#: setup/postgresql.php:23 setup/postgresql.php:69
+msgid "PostgreSQL username and/or password not valid"
+msgstr ""
+
+#: setup.php:42
+msgid "Set an admin username."
+msgstr ""
+
+#: setup.php:45
+msgid "Set an admin password."
 msgstr ""
 
-#: setup.php:870
+#: setup.php:198
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Tenaren din er ikkje enno rett innstilt til å tilby filsynkronisering sidan WebDAV-grensesnittet ser ut til å vera øydelagt."
 
-#: setup.php:871
+#: setup.php:199
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Ver vennleg og dobbeltsjekk <a href='%s'>installasjonsrettleiinga</a>."
diff --git a/l10n/nn_NO/settings.po b/l10n/nn_NO/settings.po
index b5fe6d1eda6c90d64969608ae56de18e81563d18..b1a43ec241bf64464d53fe49ff8d6f26183be35f 100644
--- a/l10n/nn_NO/settings.po
+++ b/l10n/nn_NO/settings.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -90,35 +90,35 @@ msgstr "Klarte ikkje fjerna brukaren frå gruppa %s"
 msgid "Couldn't update app."
 msgstr "Klarte ikkje oppdatera programmet."
 
-#: js/apps.js:30
+#: js/apps.js:35
 msgid "Update to {appversion}"
 msgstr "Oppdater til {appversion}"
 
-#: js/apps.js:36 js/apps.js:76
+#: js/apps.js:41 js/apps.js:81
 msgid "Disable"
 msgstr "Slå av"
 
-#: js/apps.js:36 js/apps.js:64 js/apps.js:83
+#: js/apps.js:41 js/apps.js:69 js/apps.js:88
 msgid "Enable"
 msgstr "Slå på"
 
-#: js/apps.js:55
+#: js/apps.js:60
 msgid "Please wait...."
 msgstr "Ver venleg og vent …"
 
-#: js/apps.js:59 js/apps.js:71 js/apps.js:80 js/apps.js:93
+#: js/apps.js:64 js/apps.js:76 js/apps.js:85 js/apps.js:98
 msgid "Error"
 msgstr "Feil"
 
-#: js/apps.js:90
+#: js/apps.js:95
 msgid "Updating...."
 msgstr "Oppdaterer …"
 
-#: js/apps.js:93
+#: js/apps.js:98
 msgid "Error while updating app"
 msgstr "Feil ved oppdatering av app"
 
-#: js/apps.js:96
+#: js/apps.js:101
 msgid "Updated"
 msgstr "Oppdatert"
 
@@ -167,15 +167,15 @@ msgstr "Feil ved oppretting av brukar"
 msgid "A valid password must be provided"
 msgstr "Du må oppgje eit gyldig passord"
 
-#: personal.php:35 personal.php:36
+#: personal.php:37 personal.php:38
 msgid "__language_name__"
 msgstr "Nynorsk"
 
-#: templates/admin.php:15
+#: templates/admin.php:17
 msgid "Security Warning"
 msgstr "Tryggleiksåtvaring"
 
-#: templates/admin.php:18
+#: templates/admin.php:20
 msgid ""
 "Your data directory and your files are probably accessible from the "
 "internet. The .htaccess file that ownCloud provides is not working. We "
@@ -184,36 +184,36 @@ msgid ""
 " webserver document root."
 msgstr "Datamappa og filene dine er sannsynlegvis tilgjengelege frå Internett. Fila .htaccess som ownCloud tilbyr fungerer ikkje. Me rår sterkt til at du set opp tenaren din slik at datamappa ikkje lenger er tilgjengeleg, eller at du flyttar datamappa vekk frå dokumentrota til tenaren."
 
-#: templates/admin.php:29
+#: templates/admin.php:31
 msgid "Setup Warning"
 msgstr "Oppsettsåtvaring"
 
-#: templates/admin.php:32
+#: templates/admin.php:34
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Tenaren din er ikkje enno rett innstilt til å tilby filsynkronisering sidan WebDAV-grensesnittet ser ut til å vera øydelagt."
 
-#: templates/admin.php:33
+#: templates/admin.php:35
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Ver venleg og dobbeltsjekk <a href='%s'>installasjonsrettleiinga</a>."
 
-#: templates/admin.php:44
+#: templates/admin.php:46
 msgid "Module 'fileinfo' missing"
 msgstr "Modulen «fileinfo» manglar"
 
-#: templates/admin.php:47
+#: templates/admin.php:49
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr "PHP-modulen «fileinfo» manglar. Me rår sterkt til å slå på denne modulen for å best mogleg oppdaga MIME-typar."
 
-#: templates/admin.php:58
+#: templates/admin.php:60
 msgid "Locale not working"
 msgstr "Regionaldata fungerer ikkje"
 
-#: templates/admin.php:63
+#: templates/admin.php:65
 #, php-format
 msgid ""
 "This ownCloud server can't set system locale to %s. This means that there "
@@ -221,11 +221,11 @@ msgid ""
 " to install the required packages on your system to support %s."
 msgstr "Denne ownCloud-tenaren kan ikkje stilla regionen til %s. Dette tyder at det kan vera problem med visse teikn i filnamn. Me rår sterkt til å installera systempakkane som trengst for å støtta %s."
 
-#: templates/admin.php:75
+#: templates/admin.php:77
 msgid "Internet connection not working"
 msgstr "Nettilkoplinga fungerer ikkje"
 
-#: templates/admin.php:78
+#: templates/admin.php:80
 msgid ""
 "This ownCloud server has no working internet connection. This means that "
 "some of the features like mounting of external storage, notifications about "
@@ -235,102 +235,102 @@ msgid ""
 " of ownCloud."
 msgstr "Denne ownCloud-tenaren har ikkje nokon fungerande nettilkopling. Difor vil visse funksjonar, t.d. montering av ekstern lagring, varsling om oppdatering, eller installering av tredjepartsprogram ikkje fungera. Varslingsepostar og ekstern tilgang til filer vil kanskje heller ikkje fungera. Me foreslår at du slå på nettilkoplinga til denne tenaren viss du vil nytta alle funksjonane til ownCloud."
 
-#: templates/admin.php:92
+#: templates/admin.php:94
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:101
+#: templates/admin.php:103
 msgid "Execute one task with each page loaded"
 msgstr "Utfør éi oppgåve for kvar sidelasting"
 
-#: templates/admin.php:111
+#: templates/admin.php:113
 msgid ""
 "cron.php is registered at a webcron service. Call the cron.php page in the "
 "owncloud root once a minute over http."
 msgstr "cron.php er registrert ved ei webcron-teneste. Last sida cron.php i ownCloud-rota ein gong i minuttet over http."
 
-#: templates/admin.php:121
+#: templates/admin.php:123
 msgid ""
 "Use systems cron service. Call the cron.php file in the owncloud folder via "
 "a system cronjob once a minute."
 msgstr "Bruk cron-tenesta til systemet. Køyr fila cron.php i ownCloud-mappa frå ein cron-jobb på systemet ein gong i minuttet."
 
-#: templates/admin.php:128
+#: templates/admin.php:130
 msgid "Sharing"
 msgstr "Deling"
 
-#: templates/admin.php:134
+#: templates/admin.php:136
 msgid "Enable Share API"
 msgstr "Slå på API-et for deling"
 
-#: templates/admin.php:135
+#: templates/admin.php:137
 msgid "Allow apps to use the Share API"
 msgstr "La app-ar bruka API-et til deling"
 
-#: templates/admin.php:142
+#: templates/admin.php:144
 msgid "Allow links"
 msgstr "Tillat lenkjer"
 
-#: templates/admin.php:143
+#: templates/admin.php:145
 msgid "Allow users to share items to the public with links"
 msgstr "La brukarar dela ting offentleg med lenkjer"
 
-#: templates/admin.php:150
+#: templates/admin.php:152
 msgid "Allow resharing"
 msgstr "Tillat vidaredeling"
 
-#: templates/admin.php:151
+#: templates/admin.php:153
 msgid "Allow users to share items shared with them again"
 msgstr "La brukarar vidaredela delte ting"
 
-#: templates/admin.php:158
+#: templates/admin.php:160
 msgid "Allow users to share with anyone"
 msgstr "La brukarar dela med kven som helst"
 
-#: templates/admin.php:161
+#: templates/admin.php:163
 msgid "Allow users to only share with users in their groups"
 msgstr "La brukarar dela berre med brukarar i deira grupper"
 
-#: templates/admin.php:168
+#: templates/admin.php:170
 msgid "Security"
 msgstr "Tryggleik"
 
-#: templates/admin.php:181
+#: templates/admin.php:183
 msgid "Enforce HTTPS"
 msgstr "Krev HTTPS"
 
-#: templates/admin.php:182
+#: templates/admin.php:184
 msgid ""
 "Enforces the clients to connect to ownCloud via an encrypted connection."
 msgstr "Krev at klientar koplar til ownCloud med ei kryptert tilkopling."
 
-#: templates/admin.php:185
+#: templates/admin.php:187
 msgid ""
 "Please connect to this ownCloud instance via HTTPS to enable or disable the "
 "SSL enforcement."
 msgstr "Ver venleg og kopla denne ownCloud-instansen til via HTTPS for å slå av/på SSL-handhevinga."
 
-#: templates/admin.php:195
+#: templates/admin.php:197
 msgid "Log"
 msgstr "Logg"
 
-#: templates/admin.php:196
+#: templates/admin.php:198
 msgid "Log level"
 msgstr "Log nivå"
 
-#: templates/admin.php:227
+#: templates/admin.php:229
 msgid "More"
 msgstr "Meir"
 
-#: templates/admin.php:228
+#: templates/admin.php:230
 msgid "Less"
 msgstr "Mindre"
 
-#: templates/admin.php:235 templates/personal.php:116
+#: templates/admin.php:236 templates/personal.php:116
 msgid "Version"
 msgstr "Utgåve"
 
-#: templates/admin.php:237 templates/personal.php:119
+#: templates/admin.php:240 templates/personal.php:119
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -388,76 +388,79 @@ msgstr "Feilsporar"
 msgid "Commercial Support"
 msgstr "Betalt brukarstøtte"
 
-#: templates/personal.php:9
+#: templates/personal.php:10
 msgid "Get the apps to sync your files"
 msgstr "FÃ¥ app-ar som kan synkronisera filene dine"
 
-#: templates/personal.php:20
+#: templates/personal.php:21
 msgid "Show First Run Wizard again"
 msgstr "Vis Oppstartvegvisaren igjen"
 
-#: templates/personal.php:28
+#: templates/personal.php:29
 #, php-format
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "Du har brukt <strong>%s</strong> av dine tilgjengelege <strong>%s</strong>"
 
-#: templates/personal.php:40 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:41 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "Passord"
 
-#: templates/personal.php:41
+#: templates/personal.php:42
 msgid "Your password was changed"
 msgstr "Passordet ditt er endra"
 
-#: templates/personal.php:42
+#: templates/personal.php:43
 msgid "Unable to change your password"
 msgstr "Klarte ikkje endra passordet"
 
-#: templates/personal.php:43
+#: templates/personal.php:44
 msgid "Current password"
 msgstr "Passord"
 
-#: templates/personal.php:45
+#: templates/personal.php:46
 msgid "New password"
 msgstr "Nytt passord"
 
-#: templates/personal.php:47
+#: templates/personal.php:48
 msgid "Change password"
 msgstr "Endra passord"
 
-#: templates/personal.php:59 templates/users.php:85
+#: templates/personal.php:60 templates/users.php:85
 msgid "Display Name"
 msgstr "Visingsnamn"
 
-#: templates/personal.php:74
+#: templates/personal.php:75
 msgid "Email"
 msgstr "E-post"
 
-#: templates/personal.php:76
+#: templates/personal.php:77
 msgid "Your email address"
 msgstr "Di epost-adresse"
 
-#: templates/personal.php:77
+#: templates/personal.php:78
 msgid "Fill in an email address to enable password recovery"
 msgstr "Fyll inn e-postadressa di for å gjera passordgjenoppretting mogleg"
 
-#: templates/personal.php:86 templates/personal.php:87
+#: templates/personal.php:87 templates/personal.php:88
 msgid "Language"
 msgstr "Språk"
 
-#: templates/personal.php:99
+#: templates/personal.php:100
 msgid "Help translate"
 msgstr "Hjelp oss å omsetja"
 
-#: templates/personal.php:105
+#: templates/personal.php:106
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:107
-msgid "Use this address to connect to your ownCloud in your file manager"
-msgstr "Bruk denne adressa for å kopla til din ownCloud frå filhandsamaren din"
+#: templates/personal.php:108
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
+"target=\"_blank\">access your Files via WebDAV</a>"
+msgstr ""
 
-#: templates/users.php:21 templates/users.php:84
+#: templates/users.php:21
 msgid "Login Name"
 msgstr "Innloggingsnamn"
 
@@ -487,6 +490,10 @@ msgstr "Ubegrensa"
 msgid "Other"
 msgstr "Anna"
 
+#: templates/users.php:84
+msgid "Username"
+msgstr "Brukarnamn"
+
 #: templates/users.php:91
 msgid "Storage"
 msgstr "Lagring"
diff --git a/l10n/nn_NO/user_ldap.po b/l10n/nn_NO/user_ldap.po
index ec4f9c4dea55a9f24bb519ba65cfcf990f95e39c..efefc82d7ba106f5219027b0c87416962c66498d 100644
--- a/l10n/nn_NO/user_ldap.po
+++ b/l10n/nn_NO/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:25+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:16+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/oc/core.po b/l10n/oc/core.po
index 545c1fb0f08fcc1f5ab00b10388acb1ac1447b3f..8a5fd73d5710aecd9f56b7fd739f801b3a6d267b 100644
--- a/l10n/oc/core.po
+++ b/l10n/oc/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:22+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:14+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
 "MIME-Version: 1.0\n"
@@ -61,135 +61,135 @@ msgstr "Pas de categorias seleccionadas per escafar."
 msgid "Error removing %s from favorites."
 msgstr ""
 
-#: js/config.php:34
+#: js/config.php:32
 msgid "Sunday"
 msgstr "Dimenge"
 
-#: js/config.php:35
+#: js/config.php:33
 msgid "Monday"
 msgstr "Diluns"
 
-#: js/config.php:36
+#: js/config.php:34
 msgid "Tuesday"
 msgstr "Dimarç"
 
-#: js/config.php:37
+#: js/config.php:35
 msgid "Wednesday"
 msgstr "Dimecres"
 
-#: js/config.php:38
+#: js/config.php:36
 msgid "Thursday"
 msgstr "Dijòus"
 
-#: js/config.php:39
+#: js/config.php:37
 msgid "Friday"
 msgstr "Divendres"
 
-#: js/config.php:40
+#: js/config.php:38
 msgid "Saturday"
 msgstr "Dissabte"
 
-#: js/config.php:45
+#: js/config.php:43
 msgid "January"
 msgstr "genièr"
 
-#: js/config.php:46
+#: js/config.php:44
 msgid "February"
 msgstr "febrièr"
 
-#: js/config.php:47
+#: js/config.php:45
 msgid "March"
 msgstr "març"
 
-#: js/config.php:48
+#: js/config.php:46
 msgid "April"
 msgstr "abril"
 
-#: js/config.php:49
+#: js/config.php:47
 msgid "May"
 msgstr "mai"
 
-#: js/config.php:50
+#: js/config.php:48
 msgid "June"
 msgstr "junh"
 
-#: js/config.php:51
+#: js/config.php:49
 msgid "July"
 msgstr "julhet"
 
-#: js/config.php:52
+#: js/config.php:50
 msgid "August"
 msgstr "agost"
 
-#: js/config.php:53
+#: js/config.php:51
 msgid "September"
 msgstr "septembre"
 
-#: js/config.php:54
+#: js/config.php:52
 msgid "October"
 msgstr "octobre"
 
-#: js/config.php:55
+#: js/config.php:53
 msgid "November"
 msgstr "Novembre"
 
-#: js/config.php:56
+#: js/config.php:54
 msgid "December"
 msgstr "Decembre"
 
-#: js/js.js:286
+#: js/js.js:293
 msgid "Settings"
 msgstr "Configuracion"
 
-#: js/js.js:718
+#: js/js.js:725
 msgid "seconds ago"
 msgstr "segonda a"
 
-#: js/js.js:719
+#: js/js.js:726
 msgid "1 minute ago"
 msgstr "1 minuta a"
 
-#: js/js.js:720
+#: js/js.js:727
 msgid "{minutes} minutes ago"
 msgstr ""
 
-#: js/js.js:721
+#: js/js.js:728
 msgid "1 hour ago"
 msgstr ""
 
-#: js/js.js:722
+#: js/js.js:729
 msgid "{hours} hours ago"
 msgstr ""
 
-#: js/js.js:723
+#: js/js.js:730
 msgid "today"
 msgstr "uèi"
 
-#: js/js.js:724
+#: js/js.js:731
 msgid "yesterday"
 msgstr "ièr"
 
-#: js/js.js:725
+#: js/js.js:732
 msgid "{days} days ago"
 msgstr ""
 
-#: js/js.js:726
+#: js/js.js:733
 msgid "last month"
 msgstr "mes passat"
 
-#: js/js.js:727
+#: js/js.js:734
 msgid "{months} months ago"
 msgstr ""
 
-#: js/js.js:728
+#: js/js.js:735
 msgid "months ago"
 msgstr "meses  a"
 
-#: js/js.js:729
+#: js/js.js:736
 msgid "last year"
 msgstr "an passat"
 
-#: js/js.js:730
+#: js/js.js:737
 msgid "years ago"
 msgstr "ans a"
 
@@ -225,8 +225,8 @@ msgstr ""
 #: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
 #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:577
-#: js/share.js:589
+#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:620
+#: js/share.js:632
 msgid "Error"
 msgstr "Error"
 
@@ -246,7 +246,7 @@ msgstr ""
 msgid "Share"
 msgstr "Parteja"
 
-#: js/share.js:125 js/share.js:617
+#: js/share.js:125 js/share.js:660
 msgid "Error while sharing"
 msgstr "Error al partejar"
 
@@ -266,99 +266,103 @@ msgstr ""
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:159
+#: js/share.js:172
 msgid "Share with"
 msgstr "Parteja amb"
 
-#: js/share.js:164
+#: js/share.js:177
 msgid "Share with link"
 msgstr "Parteja amb lo ligam"
 
-#: js/share.js:167
+#: js/share.js:180
 msgid "Password protect"
 msgstr "Parat per senhal"
 
-#: js/share.js:169 templates/installation.php:54 templates/login.php:26
+#: js/share.js:182 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "Senhal"
 
-#: js/share.js:173
+#: js/share.js:187
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:191
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:174
+#: js/share.js:192
 msgid "Send"
 msgstr ""
 
-#: js/share.js:178
+#: js/share.js:197
 msgid "Set expiration date"
 msgstr "Met la data d'expiracion"
 
-#: js/share.js:179
+#: js/share.js:198
 msgid "Expiration date"
 msgstr "Data d'expiracion"
 
-#: js/share.js:211
+#: js/share.js:230
 msgid "Share via email:"
 msgstr "Parteja tras corrièl :"
 
-#: js/share.js:213
+#: js/share.js:232
 msgid "No people found"
 msgstr "Deguns trobat"
 
-#: js/share.js:251
+#: js/share.js:270
 msgid "Resharing is not allowed"
 msgstr "Tornar partejar es pas permis"
 
-#: js/share.js:287
+#: js/share.js:306
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:308
+#: js/share.js:327
 msgid "Unshare"
 msgstr "Pas partejador"
 
-#: js/share.js:320
+#: js/share.js:339
 msgid "can edit"
 msgstr "pòt modificar"
 
-#: js/share.js:322
+#: js/share.js:341
 msgid "access control"
 msgstr "Contraròtle d'acces"
 
-#: js/share.js:325
+#: js/share.js:344
 msgid "create"
 msgstr "crea"
 
-#: js/share.js:328
+#: js/share.js:347
 msgid "update"
 msgstr "met a jorn"
 
-#: js/share.js:331
+#: js/share.js:350
 msgid "delete"
 msgstr "escafa"
 
-#: js/share.js:334
+#: js/share.js:353
 msgid "share"
 msgstr "parteja"
 
-#: js/share.js:368 js/share.js:564
+#: js/share.js:387 js/share.js:607
 msgid "Password protected"
 msgstr "Parat per senhal"
 
-#: js/share.js:577
+#: js/share.js:620
 msgid "Error unsetting expiration date"
 msgstr "Error al metre de la data d'expiracion"
 
-#: js/share.js:589
+#: js/share.js:632
 msgid "Error setting expiration date"
 msgstr "Error setting expiration date"
 
-#: js/share.js:604
+#: js/share.js:647
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:615
+#: js/share.js:658
 msgid "Email sent"
 msgstr ""
 
@@ -373,7 +377,7 @@ msgstr ""
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
-#: lostpassword/controller.php:58
+#: lostpassword/controller.php:60
 msgid "ownCloud password reset"
 msgstr "senhal d'ownCloud tornat botar"
 
@@ -403,17 +407,17 @@ msgstr "Non d'usancièr"
 
 #: lostpassword/templates/lostpassword.php:22
 msgid ""
-"Your files seems to be encrypted. If you didn't have enabled the recovery "
-"key there will be no way to get your data back once the password was "
-"resetted. If you are not sure what to do, please contact your administrator "
-"first before continue. Do you really want to continue?"
+"Your files are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
 msgstr ""
 
 #: lostpassword/templates/lostpassword.php:24
 msgid "Yes, I really want to reset my password now"
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:29
+#: lostpassword/templates/lostpassword.php:27
 msgid "Request reset"
 msgstr "Tornar botar requesit"
 
@@ -461,7 +465,7 @@ msgstr "Acces enebit"
 msgid "Cloud not found"
 msgstr "Nívol pas trobada"
 
-#: templates/altmail.php:2
+#: templates/altmail.php:4
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -472,10 +476,6 @@ msgid ""
 "Cheers!"
 msgstr ""
 
-#: templates/altmail.php:7 templates/mail.php:24
-msgid "web services under your control"
-msgstr "Services web jos ton contraròtle"
-
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
 msgstr "Edita categorias"
@@ -568,12 +568,12 @@ msgstr "Ã’ste de basa de donadas"
 msgid "Finish setup"
 msgstr "Configuracion acabada"
 
-#: templates/layout.user.php:40
+#: templates/layout.user.php:43
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:67
+#: templates/layout.user.php:68
 msgid "Log out"
 msgstr "Sortida"
 
@@ -607,7 +607,7 @@ msgstr "Dintrada"
 msgid "Alternative Logins"
 msgstr ""
 
-#: templates/mail.php:15
+#: templates/mail.php:16
 #, php-format
 msgid ""
 "Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
diff --git a/l10n/oc/files.po b/l10n/oc/files.po
index 8d56be5f7e02019a329febbd3c7bf28ec361f4bb..e45976afa9ec624fe34396585bf56657f05efce5 100644
--- a/l10n/oc/files.po
+++ b/l10n/oc/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:01+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
 "MIME-Version: 1.0\n"
@@ -27,46 +27,54 @@ msgstr ""
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/upload.php:19
+#: ajax/upload.php:16 ajax/upload.php:45
+msgid "Unable to set upload directory."
+msgstr ""
+
+#: ajax/upload.php:22
+msgid "Invalid Token"
+msgstr ""
+
+#: ajax/upload.php:59
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: ajax/upload.php:26
+#: ajax/upload.php:66
 msgid "There is no error, the file uploaded with success"
 msgstr "Amontcargament capitat, pas d'errors"
 
-#: ajax/upload.php:27
+#: ajax/upload.php:67
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:29
+#: ajax/upload.php:69
 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:30
+#: ajax/upload.php:70
 msgid "The uploaded file was only partially uploaded"
 msgstr "Lo fichièr foguèt pas completament amontcargat"
 
-#: ajax/upload.php:31
+#: ajax/upload.php:71
 msgid "No file was uploaded"
 msgstr "Cap de fichièrs son estats amontcargats"
 
-#: ajax/upload.php:32
+#: ajax/upload.php:72
 msgid "Missing a temporary folder"
 msgstr "Un dorsièr temporari manca"
 
-#: ajax/upload.php:33
+#: ajax/upload.php:73
 msgid "Failed to write to disk"
 msgstr "L'escriptura sul disc a fracassat"
 
-#: ajax/upload.php:51
+#: ajax/upload.php:91
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:83
+#: ajax/upload.php:123
 msgid "Invalid directory."
 msgstr ""
 
@@ -74,6 +82,36 @@ msgstr ""
 msgid "Files"
 msgstr "Fichièrs"
 
+#: js/file-upload.js:11
+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/file-upload.js:24
+msgid "Not enough space available"
+msgstr ""
+
+#: js/file-upload.js:64
+msgid "Upload cancelled."
+msgstr "Amontcargar anullat."
+
+#: js/file-upload.js:167 js/files.js:266
+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/file-upload.js:233 js/files.js:339
+msgid "URL cannot be empty."
+msgstr ""
+
+#: js/file-upload.js:238 lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr ""
+
+#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
+#: js/files.js:693 js/files.js:731
+msgid "Error"
+msgstr "Error"
+
 #: js/fileactions.js:116
 msgid "Share"
 msgstr "Parteja"
@@ -90,43 +128,43 @@ msgstr "Escafa"
 msgid "Rename"
 msgstr "Torna nomenar"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:464
 msgid "Pending"
 msgstr "Al esperar"
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "replace"
 msgstr "remplaça"
 
-#: js/filelist.js:259
+#: js/filelist.js:302
 msgid "suggest name"
 msgstr "nom prepausat"
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "cancel"
 msgstr "anulla"
 
-#: js/filelist.js:306
+#: js/filelist.js:349
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:306
+#: js/filelist.js:349
 msgid "undo"
 msgstr "defar"
 
-#: js/filelist.js:331
+#: js/filelist.js:374
 msgid "perform delete operation"
 msgstr ""
 
-#: js/filelist.js:413
+#: js/filelist.js:456
 msgid "1 file uploading"
 msgstr "1 fichièr al amontcargar"
 
-#: js/filelist.js:416 js/filelist.js:470
+#: js/filelist.js:459 js/filelist.js:517
 msgid "files uploading"
 msgstr "fichièrs al amontcargar"
 
@@ -158,69 +196,41 @@ msgid ""
 "big."
 msgstr ""
 
-#: js/files.js:264
-msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "Impossible d'amontcargar lo teu fichièr qu'es un repertòri o que ten pas que 0 octet."
-
-#: js/files.js:277
-msgid "Not enough space available"
-msgstr ""
-
-#: js/files.js:317
-msgid "Upload cancelled."
-msgstr "Amontcargar anullat."
-
-#: js/files.js:413
-msgid ""
-"File upload is in progress. Leaving the page now will cancel the upload."
-msgstr "Un amontcargar es a se far. Daissar aquesta pagina ara tamparà lo cargament. "
-
-#: js/files.js:486
-msgid "URL cannot be empty."
-msgstr ""
-
-#: js/files.js:491
+#: js/files.js:344
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
-msgid "Error"
-msgstr "Error"
-
-#: js/files.js:877 templates/index.php:69
+#: js/files.js:744 templates/index.php:69
 msgid "Name"
 msgstr "Nom"
 
-#: js/files.js:878 templates/index.php:80
+#: js/files.js:745 templates/index.php:80
 msgid "Size"
 msgstr "Talha"
 
-#: js/files.js:879 templates/index.php:82
+#: js/files.js:746 templates/index.php:82
 msgid "Modified"
 msgstr "Modificat"
 
-#: js/files.js:898
+#: js/files.js:765
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:900
+#: js/files.js:767
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:908
+#: js/files.js:775
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:910
+#: js/files.js:777
 msgid "{count} files"
 msgstr ""
 
-#: lib/app.php:53
-msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
-msgstr ""
-
 #: lib/app.php:73
-msgid "Unable to rename file"
+#, php-format
+msgid "%s could not be renamed"
 msgstr ""
 
 #: lib/helper.php:11 templates/index.php:18
@@ -317,6 +327,22 @@ msgstr "Los fiichièrs son a èsser explorats, "
 msgid "Current scanning"
 msgstr "Exploracion en cors"
 
+#: templates/part.list.php:76
+msgid "directory"
+msgstr ""
+
+#: templates/part.list.php:78
+msgid "directories"
+msgstr ""
+
+#: templates/part.list.php:87
+msgid "file"
+msgstr "fichièr"
+
+#: templates/part.list.php:89
+msgid "files"
+msgstr "fichièrs"
+
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
 msgstr ""
diff --git a/l10n/oc/files_encryption.po b/l10n/oc/files_encryption.po
index aa6ce987a0bb918d90be04d4a94b54d1fcbbfcb0..a9474224b7bdcf16549dbe97b4e5ec23dad58d5e 100644
--- a/l10n/oc/files_encryption.po
+++ b/l10n/oc/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-14 02:46+0200\n"
-"PO-Revision-Date: 2013-06-14 00:47+0000\n"
+"POT-Creation-Date: 2013-07-05 02:12+0200\n"
+"PO-Revision-Date: 2013-07-05 00:13+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"
@@ -55,9 +55,21 @@ msgstr ""
 
 #: files/error.php:7
 msgid ""
-"Your private key is not valid! Maybe your password was changed from outside."
-" You can update your private key password in your personal settings to "
-"regain access to your files"
+"Your private key is not valid! Likely your password was changed outside the "
+"ownCloud system (e.g. your corporate directory). You can update your private"
+" key password in your personal settings to recover access to your encrypted "
+"files."
+msgstr ""
+
+#: hooks/hooks.php:44
+msgid "Missing requirements."
+msgstr ""
+
+#: hooks/hooks.php:45
+msgid ""
+"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL "
+"PHP extension is enabled and configured properly. For now, the encryption "
+"app has been disabled."
 msgstr ""
 
 #: js/settings-admin.js:11
@@ -84,11 +96,11 @@ msgstr ""
 
 #: templates/settings-admin.php:10
 msgid ""
-"Enable encryption passwords recovery key (allow sharing to recovery key):"
+"Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
 #: templates/settings-admin.php:14
-msgid "Recovery account password"
+msgid "Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:21 templates/settings-personal.php:54
@@ -100,15 +112,15 @@ msgid "Disabled"
 msgstr ""
 
 #: templates/settings-admin.php:34
-msgid "Change encryption passwords recovery key:"
+msgid "Change recovery key password:"
 msgstr ""
 
 #: templates/settings-admin.php:41
-msgid "Old Recovery account password"
+msgid "Old Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:48
-msgid "New Recovery account password"
+msgid "New Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:53
diff --git a/l10n/oc/files_external.po b/l10n/oc/files_external.po
index e4990692a70da55914dc6eb4c242852e655b43e2..53710e64ea2dead1fb92430032c66692565d860b 100644
--- a/l10n/oc/files_external.po
+++ b/l10n/oc/files_external.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/oc/files_sharing.po b/l10n/oc/files_sharing.po
index c0b967f8caee4b974b8ada344153efd3a8b158b6..7e7deb63d6df673f03f7ccfaaee146bc1fbe70fe 100644
--- a/l10n/oc/files_sharing.po
+++ b/l10n/oc/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
 "MIME-Version: 1.0\n"
@@ -18,27 +18,39 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: templates/authenticate.php:4
+msgid "The password is wrong. Try again."
+msgstr ""
+
+#: templates/authenticate.php:7
 msgid "Password"
 msgstr "Senhal"
 
-#: templates/authenticate.php:6
+#: templates/authenticate.php:9
 msgid "Submit"
 msgstr "Sosmetre"
 
-#: templates/public.php:10
+#: templates/public.php:17
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr ""
 
-#: templates/public.php:13
+#: templates/public.php:20
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr ""
 
-#: templates/public.php:19 templates/public.php:43
+#: templates/public.php:28 templates/public.php:90
 msgid "Download"
 msgstr "Avalcarga"
 
-#: templates/public.php:40
+#: templates/public.php:45 templates/public.php:48
+msgid "Upload"
+msgstr "Amontcarga"
+
+#: templates/public.php:58
+msgid "Cancel upload"
+msgstr " Anulla l'amontcargar"
+
+#: templates/public.php:87
 msgid "No preview available for"
 msgstr ""
diff --git a/l10n/oc/files_trashbin.po b/l10n/oc/files_trashbin.po
index 697c5388ccc7d1ce4bc0026cf92154dfc0a65576..da6dc2def51da4a86458fd2599c3e924fe6b341a 100644
--- a/l10n/oc/files_trashbin.po
+++ b/l10n/oc/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:16+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/oc/lib.po b/l10n/oc/lib.po
index 217bb5e3a7d7698fc6b3fab9ff0ffabbcb3cc91f..cdf17381116a5de85f73cf6cc533971f3107c762 100644
--- a/l10n/oc/lib.po
+++ b/l10n/oc/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 00:04+0000\n"
+"POT-Creation-Date: 2013-07-09 02:04+0200\n"
+"PO-Revision-Date: 2013-07-09 00:02+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
 "MIME-Version: 1.0\n"
@@ -17,30 +17,34 @@ msgstr ""
 "Language: oc\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: app.php:359
+#: app.php:360
 msgid "Help"
 msgstr "Ajuda"
 
-#: app.php:372
+#: app.php:373
 msgid "Personal"
 msgstr "Personal"
 
-#: app.php:383
+#: app.php:384
 msgid "Settings"
 msgstr "Configuracion"
 
-#: app.php:395
+#: app.php:396
 msgid "Users"
 msgstr "Usancièrs"
 
-#: app.php:408
+#: app.php:409
 msgid "Apps"
 msgstr "Apps"
 
-#: app.php:416
+#: app.php:417
 msgid "Admin"
 msgstr "Admin"
 
+#: defaults.php:33
+msgid "web services under your control"
+msgstr "Services web jos ton contraròtle"
+
 #: files.php:210
 msgid "ZIP download is turned off."
 msgstr "Avalcargar los ZIP es inactiu."
@@ -85,104 +89,102 @@ msgstr ""
 msgid "Images"
 msgstr ""
 
-#: setup.php:34
-msgid "Set an admin username."
-msgstr ""
-
-#: setup.php:37
-msgid "Set an admin password."
-msgstr ""
-
-#: setup.php:55
+#: setup/abstractdatabase.php:22
 #, php-format
 msgid "%s enter the database username."
 msgstr ""
 
-#: setup.php:58
+#: setup/abstractdatabase.php:25
 #, php-format
 msgid "%s enter the database name."
 msgstr ""
 
-#: setup.php:61
+#: setup/abstractdatabase.php:28
 #, php-format
 msgid "%s you may not use dots in the database name"
 msgstr ""
 
-#: setup.php:64
+#: setup/mssql.php:20
 #, php-format
-msgid "%s set the database host."
-msgstr ""
-
-#: setup.php:126 setup.php:332 setup.php:377
-msgid "PostgreSQL username and/or password not valid"
+msgid "MS SQL username and/or password not valid: %s"
 msgstr ""
 
-#: setup.php:127 setup.php:235
+#: setup/mssql.php:21 setup/mysql.php:13 setup/oci.php:114
+#: setup/postgresql.php:24 setup/postgresql.php:70
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:152
-msgid "Oracle connection could not be established"
-msgstr ""
-
-#: setup.php:234
+#: setup/mysql.php:12
 msgid "MySQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:288 setup.php:398 setup.php:407 setup.php:425 setup.php:435
-#: setup.php:444 setup.php:477 setup.php:543 setup.php:569 setup.php:576
-#: setup.php:587 setup.php:594 setup.php:603 setup.php:611 setup.php:620
-#: setup.php:626
+#: setup/mysql.php:67 setup/oci.php:54 setup/oci.php:121 setup/oci.php:147
+#: setup/oci.php:154 setup/oci.php:165 setup/oci.php:172 setup/oci.php:181
+#: setup/oci.php:189 setup/oci.php:198 setup/oci.php:204
+#: setup/postgresql.php:89 setup/postgresql.php:98 setup/postgresql.php:115
+#: setup/postgresql.php:125 setup/postgresql.php:134
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr ""
 
-#: setup.php:289 setup.php:399 setup.php:408 setup.php:426 setup.php:436
-#: setup.php:445 setup.php:478 setup.php:544 setup.php:570 setup.php:577
-#: setup.php:588 setup.php:604 setup.php:612 setup.php:621
+#: setup/mysql.php:68 setup/oci.php:55 setup/oci.php:122 setup/oci.php:148
+#: setup/oci.php:155 setup/oci.php:166 setup/oci.php:182 setup/oci.php:190
+#: setup/oci.php:199 setup/postgresql.php:90 setup/postgresql.php:99
+#: setup/postgresql.php:116 setup/postgresql.php:126 setup/postgresql.php:135
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:305
+#: setup/mysql.php:85
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:306
+#: setup/mysql.php:86
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:311
+#: setup/mysql.php:91
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:312
+#: setup/mysql.php:92
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:469 setup.php:536
+#: setup/oci.php:34
+msgid "Oracle connection could not be established"
+msgstr ""
+
+#: setup/oci.php:41 setup/oci.php:113
 msgid "Oracle username and/or password not valid"
 msgstr ""
 
-#: setup.php:595 setup.php:627
+#: setup/oci.php:173 setup/oci.php:205
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:647
-#, php-format
-msgid "MS SQL username and/or password not valid: %s"
+#: setup/postgresql.php:23 setup/postgresql.php:69
+msgid "PostgreSQL username and/or password not valid"
+msgstr ""
+
+#: setup.php:42
+msgid "Set an admin username."
+msgstr ""
+
+#: setup.php:45
+msgid "Set an admin password."
 msgstr ""
 
-#: setup.php:870
+#: setup.php:198
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:871
+#: setup.php:199
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
diff --git a/l10n/oc/settings.po b/l10n/oc/settings.po
index e356f5fd50863cc428489dec4e08d24eca61680b..003373841e3886188ad4c79d6d797279378be163 100644
--- a/l10n/oc/settings.po
+++ b/l10n/oc/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
 "MIME-Version: 1.0\n"
@@ -88,35 +88,35 @@ msgstr "Pas capable de tira un usancièr del grop %s"
 msgid "Couldn't update app."
 msgstr ""
 
-#: js/apps.js:30
+#: js/apps.js:35
 msgid "Update to {appversion}"
 msgstr ""
 
-#: js/apps.js:36 js/apps.js:76
+#: js/apps.js:41 js/apps.js:81
 msgid "Disable"
 msgstr "Desactiva"
 
-#: js/apps.js:36 js/apps.js:64 js/apps.js:83
+#: js/apps.js:41 js/apps.js:69 js/apps.js:88
 msgid "Enable"
 msgstr "Activa"
 
-#: js/apps.js:55
+#: js/apps.js:60
 msgid "Please wait...."
 msgstr ""
 
-#: js/apps.js:59 js/apps.js:71 js/apps.js:80 js/apps.js:93
+#: js/apps.js:64 js/apps.js:76 js/apps.js:85 js/apps.js:98
 msgid "Error"
 msgstr "Error"
 
-#: js/apps.js:90
+#: js/apps.js:95
 msgid "Updating...."
 msgstr ""
 
-#: js/apps.js:93
+#: js/apps.js:98
 msgid "Error while updating app"
 msgstr ""
 
-#: js/apps.js:96
+#: js/apps.js:101
 msgid "Updated"
 msgstr ""
 
@@ -165,15 +165,15 @@ msgstr ""
 msgid "A valid password must be provided"
 msgstr ""
 
-#: personal.php:35 personal.php:36
+#: personal.php:37 personal.php:38
 msgid "__language_name__"
 msgstr "__language_name__"
 
-#: templates/admin.php:15
+#: templates/admin.php:17
 msgid "Security Warning"
 msgstr "Avertiment de securitat"
 
-#: templates/admin.php:18
+#: templates/admin.php:20
 msgid ""
 "Your data directory and your files are probably accessible from the "
 "internet. The .htaccess file that ownCloud provides is not working. We "
@@ -182,36 +182,36 @@ msgid ""
 " webserver document root."
 msgstr ""
 
-#: templates/admin.php:29
+#: templates/admin.php:31
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:32
+#: templates/admin.php:34
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: templates/admin.php:33
+#: templates/admin.php:35
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:44
+#: templates/admin.php:46
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:47
+#: templates/admin.php:49
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr ""
 
-#: templates/admin.php:58
+#: templates/admin.php:60
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:63
+#: templates/admin.php:65
 #, php-format
 msgid ""
 "This ownCloud server can't set system locale to %s. This means that there "
@@ -219,11 +219,11 @@ msgid ""
 " to install the required packages on your system to support %s."
 msgstr ""
 
-#: templates/admin.php:75
+#: templates/admin.php:77
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:78
+#: templates/admin.php:80
 msgid ""
 "This ownCloud server has no working internet connection. This means that "
 "some of the features like mounting of external storage, notifications about "
@@ -233,102 +233,102 @@ msgid ""
 " of ownCloud."
 msgstr ""
 
-#: templates/admin.php:92
+#: templates/admin.php:94
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:101
+#: templates/admin.php:103
 msgid "Execute one task with each page loaded"
 msgstr "Executa un prètfach amb cada pagina cargada"
 
-#: templates/admin.php:111
+#: templates/admin.php:113
 msgid ""
 "cron.php is registered at a webcron service. Call the cron.php page in the "
 "owncloud root once a minute over http."
 msgstr ""
 
-#: templates/admin.php:121
+#: templates/admin.php:123
 msgid ""
 "Use systems cron service. Call the cron.php file in the owncloud folder via "
 "a system cronjob once a minute."
 msgstr "Utiliza lo servici cron de ton sistèm operatiu. Executa lo fichièr cron.php dins lo dorsier owncloud tras cronjob del sistèm cada minuta."
 
-#: templates/admin.php:128
+#: templates/admin.php:130
 msgid "Sharing"
 msgstr "Al partejar"
 
-#: templates/admin.php:134
+#: templates/admin.php:136
 msgid "Enable Share API"
 msgstr "Activa API partejada"
 
-#: templates/admin.php:135
+#: templates/admin.php:137
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:142
+#: templates/admin.php:144
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:143
+#: templates/admin.php:145
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:150
+#: templates/admin.php:152
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:151
+#: templates/admin.php:153
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:158
+#: templates/admin.php:160
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:161
+#: templates/admin.php:163
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:168
+#: templates/admin.php:170
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:181
+#: templates/admin.php:183
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:182
+#: templates/admin.php:184
 msgid ""
 "Enforces the clients to connect to ownCloud via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:185
+#: templates/admin.php:187
 msgid ""
 "Please connect to this ownCloud instance via HTTPS to enable or disable the "
 "SSL enforcement."
 msgstr ""
 
-#: templates/admin.php:195
+#: templates/admin.php:197
 msgid "Log"
 msgstr "Jornal"
 
-#: templates/admin.php:196
+#: templates/admin.php:198
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:227
+#: templates/admin.php:229
 msgid "More"
 msgstr "Mai d'aquò"
 
-#: templates/admin.php:228
+#: templates/admin.php:230
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:235 templates/personal.php:116
+#: templates/admin.php:236 templates/personal.php:116
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:237 templates/personal.php:119
+#: templates/admin.php:240 templates/personal.php:119
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -386,76 +386,79 @@ msgstr ""
 msgid "Commercial Support"
 msgstr ""
 
-#: templates/personal.php:9
+#: templates/personal.php:10
 msgid "Get the apps to sync your files"
 msgstr ""
 
-#: templates/personal.php:20
+#: templates/personal.php:21
 msgid "Show First Run Wizard again"
 msgstr ""
 
-#: templates/personal.php:28
+#: templates/personal.php:29
 #, php-format
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr ""
 
-#: templates/personal.php:40 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:41 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "Senhal"
 
-#: templates/personal.php:41
+#: templates/personal.php:42
 msgid "Your password was changed"
 msgstr "Ton senhal a cambiat"
 
-#: templates/personal.php:42
+#: templates/personal.php:43
 msgid "Unable to change your password"
 msgstr "Pas possible de cambiar ton senhal"
 
-#: templates/personal.php:43
+#: templates/personal.php:44
 msgid "Current password"
 msgstr "Senhal en cors"
 
-#: templates/personal.php:45
+#: templates/personal.php:46
 msgid "New password"
 msgstr "Senhal novèl"
 
-#: templates/personal.php:47
+#: templates/personal.php:48
 msgid "Change password"
 msgstr "Cambia lo senhal"
 
-#: templates/personal.php:59 templates/users.php:85
+#: templates/personal.php:60 templates/users.php:85
 msgid "Display Name"
 msgstr ""
 
-#: templates/personal.php:74
+#: templates/personal.php:75
 msgid "Email"
 msgstr "Corrièl"
 
-#: templates/personal.php:76
+#: templates/personal.php:77
 msgid "Your email address"
 msgstr "Ton adreiça de corrièl"
 
-#: templates/personal.php:77
+#: templates/personal.php:78
 msgid "Fill in an email address to enable password recovery"
 msgstr "Emplena una adreiça de corrièl per permetre lo mandadís del senhal perdut"
 
-#: templates/personal.php:86 templates/personal.php:87
+#: templates/personal.php:87 templates/personal.php:88
 msgid "Language"
 msgstr "Lenga"
 
-#: templates/personal.php:99
+#: templates/personal.php:100
 msgid "Help translate"
 msgstr "Ajuda a la revirada"
 
-#: templates/personal.php:105
+#: templates/personal.php:106
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:107
-msgid "Use this address to connect to your ownCloud in your file manager"
+#: templates/personal.php:108
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
+"target=\"_blank\">access your Files via WebDAV</a>"
 msgstr ""
 
-#: templates/users.php:21 templates/users.php:84
+#: templates/users.php:21
 msgid "Login Name"
 msgstr ""
 
@@ -485,6 +488,10 @@ msgstr ""
 msgid "Other"
 msgstr "Autres"
 
+#: templates/users.php:84
+msgid "Username"
+msgstr "Non d'usancièr"
+
 #: templates/users.php:91
 msgid "Storage"
 msgstr ""
diff --git a/l10n/oc/user_ldap.po b/l10n/oc/user_ldap.po
index 09a9eeb5268adbfa70933758da0a93a63ca5d691..2a5ef1188c361c61f775df02d81cca682a127354 100644
--- a/l10n/oc/user_ldap.po
+++ b/l10n/oc/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:16+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/pl/core.po b/l10n/pl/core.po
index 0cf3d1eca727b82fadc86baf4876165e874c078d..2252350e36d79e245f92bb230b678e85044787bc 100644
--- a/l10n/pl/core.po
+++ b/l10n/pl/core.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:22+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:14+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
 "MIME-Version: 1.0\n"
@@ -22,7 +22,7 @@ msgstr ""
 #: ajax/share.php:97
 #, php-format
 msgid "%s shared »%s« with you"
-msgstr ""
+msgstr "%s Współdzielone »%s« z tobą"
 
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
@@ -63,135 +63,135 @@ msgstr "Nie zaznaczono kategorii do usunięcia."
 msgid "Error removing %s from favorites."
 msgstr "BÅ‚Ä…d podczas usuwania %s z ulubionych."
 
-#: js/config.php:34
+#: js/config.php:32
 msgid "Sunday"
 msgstr "Niedziela"
 
-#: js/config.php:35
+#: js/config.php:33
 msgid "Monday"
 msgstr "Poniedziałek"
 
-#: js/config.php:36
+#: js/config.php:34
 msgid "Tuesday"
 msgstr "Wtorek"
 
-#: js/config.php:37
+#: js/config.php:35
 msgid "Wednesday"
 msgstr "Åšroda"
 
-#: js/config.php:38
+#: js/config.php:36
 msgid "Thursday"
 msgstr "Czwartek"
 
-#: js/config.php:39
+#: js/config.php:37
 msgid "Friday"
 msgstr "PiÄ…tek"
 
-#: js/config.php:40
+#: js/config.php:38
 msgid "Saturday"
 msgstr "Sobota"
 
-#: js/config.php:45
+#: js/config.php:43
 msgid "January"
 msgstr "Styczeń"
 
-#: js/config.php:46
+#: js/config.php:44
 msgid "February"
 msgstr "Luty"
 
-#: js/config.php:47
+#: js/config.php:45
 msgid "March"
 msgstr "Marzec"
 
-#: js/config.php:48
+#: js/config.php:46
 msgid "April"
 msgstr "Kwiecień"
 
-#: js/config.php:49
+#: js/config.php:47
 msgid "May"
 msgstr "Maj"
 
-#: js/config.php:50
+#: js/config.php:48
 msgid "June"
 msgstr "Czerwiec"
 
-#: js/config.php:51
+#: js/config.php:49
 msgid "July"
 msgstr "Lipiec"
 
-#: js/config.php:52
+#: js/config.php:50
 msgid "August"
 msgstr "Sierpień"
 
-#: js/config.php:53
+#: js/config.php:51
 msgid "September"
 msgstr "Wrzesień"
 
-#: js/config.php:54
+#: js/config.php:52
 msgid "October"
 msgstr "Październik"
 
-#: js/config.php:55
+#: js/config.php:53
 msgid "November"
 msgstr "Listopad"
 
-#: js/config.php:56
+#: js/config.php:54
 msgid "December"
 msgstr "Grudzień"
 
-#: js/js.js:286
+#: js/js.js:293
 msgid "Settings"
 msgstr "Ustawienia"
 
-#: js/js.js:718
+#: js/js.js:725
 msgid "seconds ago"
 msgstr "sekund temu"
 
-#: js/js.js:719
+#: js/js.js:726
 msgid "1 minute ago"
 msgstr "1 minutÄ™ temu"
 
-#: js/js.js:720
+#: js/js.js:727
 msgid "{minutes} minutes ago"
 msgstr "{minutes} minut temu"
 
-#: js/js.js:721
+#: js/js.js:728
 msgid "1 hour ago"
 msgstr "1 godzinÄ™ temu"
 
-#: js/js.js:722
+#: js/js.js:729
 msgid "{hours} hours ago"
 msgstr "{hours} godzin temu"
 
-#: js/js.js:723
+#: js/js.js:730
 msgid "today"
 msgstr "dziÅ›"
 
-#: js/js.js:724
+#: js/js.js:731
 msgid "yesterday"
 msgstr "wczoraj"
 
-#: js/js.js:725
+#: js/js.js:732
 msgid "{days} days ago"
 msgstr "{days} dni temu"
 
-#: js/js.js:726
+#: js/js.js:733
 msgid "last month"
 msgstr "w zeszłym miesiącu"
 
-#: js/js.js:727
+#: js/js.js:734
 msgid "{months} months ago"
 msgstr "{months} miesięcy temu"
 
-#: js/js.js:728
+#: js/js.js:735
 msgid "months ago"
 msgstr "miesięcy temu"
 
-#: js/js.js:729
+#: js/js.js:736
 msgid "last year"
 msgstr "w zeszłym roku"
 
-#: js/js.js:730
+#: js/js.js:737
 msgid "years ago"
 msgstr "lat temu"
 
@@ -227,8 +227,8 @@ msgstr "Nie określono typu obiektu."
 #: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
 #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:577
-#: js/share.js:589
+#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:620
+#: js/share.js:632
 msgid "Error"
 msgstr "BÅ‚Ä…d"
 
@@ -248,7 +248,7 @@ msgstr "Udostępniono"
 msgid "Share"
 msgstr "Udostępnij"
 
-#: js/share.js:125 js/share.js:617
+#: js/share.js:125 js/share.js:660
 msgid "Error while sharing"
 msgstr "Błąd podczas współdzielenia"
 
@@ -268,99 +268,103 @@ msgstr "Udostępnione tobie i grupie {group} przez {owner}"
 msgid "Shared with you by {owner}"
 msgstr "Udostępnione tobie przez {owner}"
 
-#: js/share.js:159
+#: js/share.js:172
 msgid "Share with"
 msgstr "Współdziel z"
 
-#: js/share.js:164
+#: js/share.js:177
 msgid "Share with link"
 msgstr "Współdziel wraz z odnośnikiem"
 
-#: js/share.js:167
+#: js/share.js:180
 msgid "Password protect"
 msgstr "Zabezpiecz hasłem"
 
-#: js/share.js:169 templates/installation.php:54 templates/login.php:26
+#: js/share.js:182 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "Hasło"
 
-#: js/share.js:173
+#: js/share.js:187
+msgid "Allow Public Upload"
+msgstr "Pozwól na  publiczne wczytywanie"
+
+#: js/share.js:191
 msgid "Email link to person"
 msgstr "Wyślij osobie odnośnik poprzez e-mail"
 
-#: js/share.js:174
+#: js/share.js:192
 msgid "Send"
 msgstr "Wyślij"
 
-#: js/share.js:178
+#: js/share.js:197
 msgid "Set expiration date"
 msgstr "Ustaw datę wygaśnięcia"
 
-#: js/share.js:179
+#: js/share.js:198
 msgid "Expiration date"
 msgstr "Data wygaśnięcia"
 
-#: js/share.js:211
+#: js/share.js:230
 msgid "Share via email:"
 msgstr "Współdziel poprzez e-mail:"
 
-#: js/share.js:213
+#: js/share.js:232
 msgid "No people found"
 msgstr "Nie znaleziono ludzi"
 
-#: js/share.js:251
+#: js/share.js:270
 msgid "Resharing is not allowed"
 msgstr "Współdzielenie nie jest możliwe"
 
-#: js/share.js:287
+#: js/share.js:306
 msgid "Shared in {item} with {user}"
 msgstr "Współdzielone w {item} z {user}"
 
-#: js/share.js:308
+#: js/share.js:327
 msgid "Unshare"
 msgstr "Zatrzymaj współdzielenie"
 
-#: js/share.js:320
+#: js/share.js:339
 msgid "can edit"
 msgstr "może edytować"
 
-#: js/share.js:322
+#: js/share.js:341
 msgid "access control"
 msgstr "kontrola dostępu"
 
-#: js/share.js:325
+#: js/share.js:344
 msgid "create"
 msgstr "utwórz"
 
-#: js/share.js:328
+#: js/share.js:347
 msgid "update"
 msgstr "uaktualnij"
 
-#: js/share.js:331
+#: js/share.js:350
 msgid "delete"
 msgstr "usuń"
 
-#: js/share.js:334
+#: js/share.js:353
 msgid "share"
 msgstr "współdziel"
 
-#: js/share.js:368 js/share.js:564
+#: js/share.js:387 js/share.js:607
 msgid "Password protected"
 msgstr "Zabezpieczone hasłem"
 
-#: js/share.js:577
+#: js/share.js:620
 msgid "Error unsetting expiration date"
 msgstr "Błąd podczas usuwania daty wygaśnięcia"
 
-#: js/share.js:589
+#: js/share.js:632
 msgid "Error setting expiration date"
 msgstr "Błąd podczas ustawiania daty wygaśnięcia"
 
-#: js/share.js:604
+#: js/share.js:647
 msgid "Sending ..."
 msgstr "Wysyłanie..."
 
-#: js/share.js:615
+#: js/share.js:658
 msgid "Email sent"
 msgstr "E-mail wysłany"
 
@@ -375,7 +379,7 @@ msgstr "Aktualizacja zakończyła się niepowodzeniem. Zgłoś ten problem <a hr
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "Aktualizacji zakończyła się powodzeniem. Przekierowuję do ownCloud."
 
-#: lostpassword/controller.php:58
+#: lostpassword/controller.php:60
 msgid "ownCloud password reset"
 msgstr "restart hasła ownCloud"
 
@@ -405,17 +409,17 @@ msgstr "Nazwa użytkownika"
 
 #: lostpassword/templates/lostpassword.php:22
 msgid ""
-"Your files seems to be encrypted. If you didn't have enabled the recovery "
-"key there will be no way to get your data back once the password was "
-"resetted. If you are not sure what to do, please contact your administrator "
-"first before continue. Do you really want to continue?"
+"Your files are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
 msgstr ""
 
 #: lostpassword/templates/lostpassword.php:24
 msgid "Yes, I really want to reset my password now"
-msgstr ""
+msgstr "Tak, naprawdę chcę zresetować hasło teraz"
 
-#: lostpassword/templates/lostpassword.php:29
+#: lostpassword/templates/lostpassword.php:27
 msgid "Request reset"
 msgstr "Żądanie resetowania"
 
@@ -463,7 +467,7 @@ msgstr "Dostęp zabroniony"
 msgid "Cloud not found"
 msgstr "Nie odnaleziono chmury"
 
-#: templates/altmail.php:2
+#: templates/altmail.php:4
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -474,10 +478,6 @@ msgid ""
 "Cheers!"
 msgstr ""
 
-#: templates/altmail.php:7 templates/mail.php:24
-msgid "web services under your control"
-msgstr "Kontrolowane serwisy"
-
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
 msgstr "Edytuj kategorie"
@@ -570,12 +570,12 @@ msgstr "Komputer bazy danych"
 msgid "Finish setup"
 msgstr "Zakończ konfigurowanie"
 
-#: templates/layout.user.php:40
+#: templates/layout.user.php:43
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr "%s jest dostępna. Dowiedz się więcej na temat aktualizacji."
 
-#: templates/layout.user.php:67
+#: templates/layout.user.php:68
 msgid "Log out"
 msgstr "Wyloguj"
 
@@ -609,7 +609,7 @@ msgstr "Zaloguj"
 msgid "Alternative Logins"
 msgstr "Alternatywne loginy"
 
-#: templates/mail.php:15
+#: templates/mail.php:16
 #, php-format
 msgid ""
 "Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
diff --git a/l10n/pl/files.po b/l10n/pl/files.po
index dd227738128149fa428eb6db65641016cb9ad84b..db44323c38eb34e17ef9bd25895c895a59094e8e 100644
--- a/l10n/pl/files.po
+++ b/l10n/pl/files.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Cyryl Sochacki <cyrylsochacki@gmail.com>, 2013
 # adbrand <pkwiecin@adbrand.pl>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:01+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
-"Last-Translator: adbrand <pkwiecin@adbrand.pl>\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
+"Last-Translator: Cyryl Sochacki <cyrylsochacki@gmail.com>\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -28,46 +29,54 @@ msgstr "Nie można było przenieść %s - Plik o takiej nazwie już istnieje"
 msgid "Could not move %s"
 msgstr "Nie można było przenieść %s"
 
-#: ajax/upload.php:19
+#: ajax/upload.php:16 ajax/upload.php:45
+msgid "Unable to set upload directory."
+msgstr "Nie można ustawić katalog wczytywania."
+
+#: ajax/upload.php:22
+msgid "Invalid Token"
+msgstr "Nieprawidłowy Token"
+
+#: ajax/upload.php:59
 msgid "No file was uploaded. Unknown error"
 msgstr "Żaden plik nie został załadowany. Nieznany błąd"
 
-#: ajax/upload.php:26
+#: ajax/upload.php:66
 msgid "There is no error, the file uploaded with success"
 msgstr "Nie było błędów, plik wysłano poprawnie."
 
-#: ajax/upload.php:27
+#: ajax/upload.php:67
 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:29
+#: ajax/upload.php:69
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Wysłany plik przekracza wielkość dyrektywy MAX_FILE_SIZE określonej w formularzu HTML"
 
-#: ajax/upload.php:30
+#: ajax/upload.php:70
 msgid "The uploaded file was only partially uploaded"
 msgstr "Załadowany plik został wysłany tylko częściowo."
 
-#: ajax/upload.php:31
+#: ajax/upload.php:71
 msgid "No file was uploaded"
 msgstr "Nie wysłano żadnego pliku"
 
-#: ajax/upload.php:32
+#: ajax/upload.php:72
 msgid "Missing a temporary folder"
 msgstr "Brak folderu tymczasowego"
 
-#: ajax/upload.php:33
+#: ajax/upload.php:73
 msgid "Failed to write to disk"
 msgstr "BÅ‚Ä…d zapisu na dysk"
 
-#: ajax/upload.php:51
+#: ajax/upload.php:91
 msgid "Not enough storage available"
 msgstr "Za mało dostępnego miejsca"
 
-#: ajax/upload.php:83
+#: ajax/upload.php:123
 msgid "Invalid directory."
 msgstr "Zła ścieżka."
 
@@ -75,6 +84,36 @@ msgstr "Zła ścieżka."
 msgid "Files"
 msgstr "Pliki"
 
+#: js/file-upload.js:11
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr "Nie można wczytać pliku, ponieważ jest on katalogiem lub ma 0 bajtów"
+
+#: js/file-upload.js:24
+msgid "Not enough space available"
+msgstr "Za mało miejsca"
+
+#: js/file-upload.js:64
+msgid "Upload cancelled."
+msgstr "Wczytywanie anulowane."
+
+#: js/file-upload.js:167 js/files.js:266
+msgid ""
+"File upload is in progress. Leaving the page now will cancel the upload."
+msgstr "Wysyłanie pliku jest w toku. Jeśli opuścisz tę stronę, wysyłanie zostanie przerwane."
+
+#: js/file-upload.js:233 js/files.js:339
+msgid "URL cannot be empty."
+msgstr "URL nie może być pusty."
+
+#: js/file-upload.js:238 lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr "Nieprawidłowa nazwa folderu. Wykorzystanie 'Shared' jest zarezerwowane przez ownCloud"
+
+#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
+#: js/files.js:693 js/files.js:731
+msgid "Error"
+msgstr "BÅ‚Ä…d"
+
 #: js/fileactions.js:116
 msgid "Share"
 msgstr "Udostępnij"
@@ -91,43 +130,43 @@ msgstr "Usuń"
 msgid "Rename"
 msgstr "Zmień nazwę"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:464
 msgid "Pending"
 msgstr "OczekujÄ…ce"
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "{new_name} already exists"
 msgstr "{new_name} już istnieje"
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "replace"
 msgstr "zastÄ…p"
 
-#: js/filelist.js:259
+#: js/filelist.js:302
 msgid "suggest name"
 msgstr "zasugeruj nazwÄ™"
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "cancel"
 msgstr "anuluj"
 
-#: js/filelist.js:306
+#: js/filelist.js:349
 msgid "replaced {new_name} with {old_name}"
 msgstr "zastÄ…piono {new_name} przez {old_name}"
 
-#: js/filelist.js:306
+#: js/filelist.js:349
 msgid "undo"
 msgstr "cofnij"
 
-#: js/filelist.js:331
+#: js/filelist.js:374
 msgid "perform delete operation"
 msgstr "wykonaj operację usunięcia"
 
-#: js/filelist.js:413
+#: js/filelist.js:456
 msgid "1 file uploading"
 msgstr "1 plik wczytywany"
 
-#: js/filelist.js:416 js/filelist.js:470
+#: js/filelist.js:459 js/filelist.js:517
 msgid "files uploading"
 msgstr "pliki wczytane"
 
@@ -159,70 +198,42 @@ msgid ""
 "big."
 msgstr "Pobieranie jest przygotowywane. Może to zająć trochę czasu jeśli pliki są duże."
 
-#: js/files.js:264
-msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "Nie można wczytać pliku, ponieważ jest on katalogiem lub ma 0 bajtów"
-
-#: js/files.js:277
-msgid "Not enough space available"
-msgstr "Za mało miejsca"
-
-#: js/files.js:317
-msgid "Upload cancelled."
-msgstr "Wczytywanie anulowane."
-
-#: js/files.js:413
-msgid ""
-"File upload is in progress. Leaving the page now will cancel the upload."
-msgstr "Wysyłanie pliku jest w toku. Jeśli opuścisz tę stronę, wysyłanie zostanie przerwane."
-
-#: js/files.js:486
-msgid "URL cannot be empty."
-msgstr "URL nie może być pusty."
-
-#: js/files.js:491
+#: js/files.js:344
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Nieprawidłowa nazwa folderu. Korzystanie z nazwy „Shared” jest zarezerwowane dla ownCloud"
 
-#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
-msgid "Error"
-msgstr "BÅ‚Ä…d"
-
-#: js/files.js:877 templates/index.php:69
+#: js/files.js:744 templates/index.php:69
 msgid "Name"
 msgstr "Nazwa"
 
-#: js/files.js:878 templates/index.php:80
+#: js/files.js:745 templates/index.php:80
 msgid "Size"
 msgstr "Rozmiar"
 
-#: js/files.js:879 templates/index.php:82
+#: js/files.js:746 templates/index.php:82
 msgid "Modified"
 msgstr "Modyfikacja"
 
-#: js/files.js:898
+#: js/files.js:765
 msgid "1 folder"
 msgstr "1 folder"
 
-#: js/files.js:900
+#: js/files.js:767
 msgid "{count} folders"
 msgstr "Ilość folderów: {count}"
 
-#: js/files.js:908
+#: js/files.js:775
 msgid "1 file"
 msgstr "1 plik"
 
-#: js/files.js:910
+#: js/files.js:777
 msgid "{count} files"
 msgstr "Ilość plików: {count}"
 
-#: lib/app.php:53
-msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
-msgstr "Nieprawidłowa nazwa folderu. Wykorzystanie 'Shared' jest zarezerwowane przez ownCloud"
-
 #: lib/app.php:73
-msgid "Unable to rename file"
-msgstr "Nie można zmienić nazwy pliku"
+#, php-format
+msgid "%s could not be renamed"
+msgstr "%s nie można zmienić nazwy"
 
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
@@ -318,6 +329,22 @@ msgstr "Skanowanie plików, proszę czekać."
 msgid "Current scanning"
 msgstr "Aktualnie skanowane"
 
+#: templates/part.list.php:76
+msgid "directory"
+msgstr "Katalog"
+
+#: templates/part.list.php:78
+msgid "directories"
+msgstr "Katalogi"
+
+#: templates/part.list.php:87
+msgid "file"
+msgstr "plik"
+
+#: templates/part.list.php:89
+msgid "files"
+msgstr "pliki"
+
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
 msgstr "Uaktualnianie plików pamięci podręcznej..."
diff --git a/l10n/pl/files_encryption.po b/l10n/pl/files_encryption.po
index 3add4b1966503dcc4eb22b386bdd247c1005704a..8342d627db94e89bb7b38a5613d283d22a0ab910 100644
--- a/l10n/pl/files_encryption.po
+++ b/l10n/pl/files_encryption.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-14 02:46+0200\n"
-"PO-Revision-Date: 2013-06-14 00:47+0000\n"
+"POT-Creation-Date: 2013-07-05 02:12+0200\n"
+"PO-Revision-Date: 2013-07-05 00:13+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"
@@ -20,21 +20,21 @@ msgstr ""
 
 #: ajax/adminrecovery.php:29
 msgid "Recovery key successfully enabled"
-msgstr ""
+msgstr "Klucz odzyskiwania włączony"
 
 #: ajax/adminrecovery.php:34
 msgid ""
 "Could not enable recovery key. Please check your recovery key password!"
-msgstr ""
+msgstr "Nie można włączyć klucza odzyskiwania. Proszę sprawdzić swoje hasło odzyskiwania!"
 
 #: ajax/adminrecovery.php:48
 msgid "Recovery key successfully disabled"
-msgstr ""
+msgstr "Klucz odzyskiwania wyłączony"
 
 #: ajax/adminrecovery.php:53
 msgid ""
 "Could not disable recovery key. Please check your recovery key password!"
-msgstr ""
+msgstr "Nie można wyłączyć klucza odzyskiwania. Proszę sprawdzić swoje hasło odzyskiwania!"
 
 #: ajax/changeRecoveryPassword.php:49
 msgid "Password successfully changed."
@@ -46,19 +46,31 @@ msgstr "Nie można zmienić hasła. Może stare hasło nie było poprawne."
 
 #: ajax/updatePrivateKeyPassword.php:51
 msgid "Private key password successfully updated."
-msgstr ""
+msgstr "Pomyślnie zaktualizowano hasło klucza prywatnego."
 
 #: ajax/updatePrivateKeyPassword.php:53
 msgid ""
 "Could not update the private key password. Maybe the old password was not "
 "correct."
-msgstr ""
+msgstr "Nie można zmienić prywatnego hasła. Może stare hasło nie było poprawne."
 
 #: files/error.php:7
 msgid ""
-"Your private key is not valid! Maybe your password was changed from outside."
-" You can update your private key password in your personal settings to "
-"regain access to your files"
+"Your private key is not valid! Likely your password was changed outside the "
+"ownCloud system (e.g. your corporate directory). You can update your private"
+" key password in your personal settings to recover access to your encrypted "
+"files."
+msgstr ""
+
+#: hooks/hooks.php:44
+msgid "Missing requirements."
+msgstr ""
+
+#: hooks/hooks.php:45
+msgid ""
+"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL "
+"PHP extension is enabled and configured properly. For now, the encryption "
+"app has been disabled."
 msgstr ""
 
 #: js/settings-admin.js:11
@@ -69,15 +81,15 @@ msgstr "Zapisywanie..."
 msgid ""
 "Your private key is not valid! Maybe the your password was changed from "
 "outside."
-msgstr ""
+msgstr "Klucz prywatny nie jest poprawny! Może Twoje hasło zostało zmienione z zewnątrz."
 
 #: templates/invalid_private_key.php:7
 msgid "You can unlock your private key in your "
-msgstr ""
+msgstr "Możesz odblokować swój klucz prywatny w swojej"
 
 #: templates/invalid_private_key.php:7
 msgid "personal settings"
-msgstr ""
+msgstr "Ustawienia osobiste"
 
 #: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
@@ -85,12 +97,12 @@ msgstr "Szyfrowanie"
 
 #: templates/settings-admin.php:10
 msgid ""
-"Enable encryption passwords recovery key (allow sharing to recovery key):"
-msgstr "Włącz szyfrowanie odzyskiwanych haseł klucza (zezwalaj na odzyskiwanie klucza):"
+"Enable recovery key (allow to recover users files in case of password loss):"
+msgstr "Włączhasło klucza odzyskiwania (pozwala odzyskać pliki użytkowników w przypadku utraty hasła):"
 
 #: templates/settings-admin.php:14
-msgid "Recovery account password"
-msgstr "Odzyskiwanie hasła konta"
+msgid "Recovery key password"
+msgstr "Hasło klucza odzyskiwania"
 
 #: templates/settings-admin.php:21 templates/settings-personal.php:54
 msgid "Enabled"
@@ -101,16 +113,16 @@ msgid "Disabled"
 msgstr "Wyłączone"
 
 #: templates/settings-admin.php:34
-msgid "Change encryption passwords recovery key:"
-msgstr "Zmiana klucza szyfrowania haseł odzyskiwania:"
+msgid "Change recovery key password:"
+msgstr "Zmień hasło klucza odzyskiwania"
 
 #: templates/settings-admin.php:41
-msgid "Old Recovery account password"
-msgstr "Stare hasło odzyskiwania"
+msgid "Old Recovery key password"
+msgstr "Stare hasło klucza odzyskiwania"
 
 #: templates/settings-admin.php:48
-msgid "New Recovery account password"
-msgstr "Nowe hasło odzyskiwania"
+msgid "New Recovery key password"
+msgstr "Nowe hasło klucza odzyskiwania"
 
 #: templates/settings-admin.php:53
 msgid "Change Password"
@@ -118,39 +130,39 @@ msgstr "Zmień hasło"
 
 #: templates/settings-personal.php:11
 msgid "Your private key password no longer match your log-in password:"
-msgstr ""
+msgstr "Hasło klucza prywatnego nie pasuje do  hasła logowania:"
 
 #: templates/settings-personal.php:14
 msgid "Set your old private key password to your current log-in password."
-msgstr ""
+msgstr "Podaj swoje stare prywatne hasło aby ustawić nowe"
 
 #: templates/settings-personal.php:16
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
-msgstr ""
+msgstr "Jeśli nie pamiętasz swojego starego hasła, poproś swojego administratora, aby odzyskać pliki."
 
 #: templates/settings-personal.php:24
 msgid "Old log-in password"
-msgstr ""
+msgstr "Stare hasło logowania"
 
 #: templates/settings-personal.php:30
 msgid "Current log-in password"
-msgstr ""
+msgstr "Bieżące hasło logowania"
 
 #: templates/settings-personal.php:35
 msgid "Update Private Key Password"
-msgstr ""
+msgstr "Aktualizacja hasła klucza prywatnego"
 
 #: templates/settings-personal.php:45
 msgid "Enable password recovery:"
-msgstr ""
+msgstr "Włącz hasło odzyskiwania:"
 
 #: templates/settings-personal.php:47
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
-msgstr ""
+msgstr "Włączenie tej opcji umożliwia otrzymać dostęp do zaszyfrowanych plików w przypadku utraty hasła"
 
 #: templates/settings-personal.php:63
 msgid "File recovery settings updated"
diff --git a/l10n/pl/files_external.po b/l10n/pl/files_external.po
index f6288b915c3965d438ecca45b5ab11ee697d31c5..7c19484e5bc0ada834dd2d3c380f04ab374a1d45 100644
--- a/l10n/pl/files_external.po
+++ b/l10n/pl/files_external.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: Cyryl Sochacki <cyrylsochacki@gmail.com>\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/pl/files_sharing.po b/l10n/pl/files_sharing.po
index afe0c1c62058edb7c45ea30dd5a954cdab4438c2..7df2ec96ee8a1c9d2fb90615882c78fce53a5b2a 100644
--- a/l10n/pl/files_sharing.po
+++ b/l10n/pl/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
 "MIME-Version: 1.0\n"
@@ -18,27 +18,39 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: templates/authenticate.php:4
+msgid "The password is wrong. Try again."
+msgstr ""
+
+#: templates/authenticate.php:7
 msgid "Password"
 msgstr "Hasło"
 
-#: templates/authenticate.php:6
+#: templates/authenticate.php:9
 msgid "Submit"
 msgstr "Wyślij"
 
-#: templates/public.php:10
+#: templates/public.php:17
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s współdzieli folder z tobą %s"
 
-#: templates/public.php:13
+#: templates/public.php:20
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s współdzieli z tobą plik %s"
 
-#: templates/public.php:19 templates/public.php:43
+#: templates/public.php:28 templates/public.php:90
 msgid "Download"
 msgstr "Pobierz"
 
-#: templates/public.php:40
+#: templates/public.php:45 templates/public.php:48
+msgid "Upload"
+msgstr "Wyślij"
+
+#: templates/public.php:58
+msgid "Cancel upload"
+msgstr "Anuluj wysyłanie"
+
+#: templates/public.php:87
 msgid "No preview available for"
 msgstr "Podgląd nie jest dostępny dla"
diff --git a/l10n/pl/files_trashbin.po b/l10n/pl/files_trashbin.po
index e7dd38d8e91b693b9290cd58e3ba16ce13be5f98..a852646e7ee5bcd2a7e9a974c22f5a8c61ed8b80 100644
--- a/l10n/pl/files_trashbin.po
+++ b/l10n/pl/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:16+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/pl/lib.po b/l10n/pl/lib.po
index ae1066f6e1513bb700403623b85129339762da30..77aa74cdeb93df4c66ce7d9e341429508b85feb8 100644
--- a/l10n/pl/lib.po
+++ b/l10n/pl/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-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
-"Last-Translator: Cyryl Sochacki <cyrylsochacki@gmail.com>\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,43 +18,47 @@ msgstr ""
 "Language: pl\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: app.php:359
+#: app.php:360
 msgid "Help"
 msgstr "Pomoc"
 
-#: app.php:372
+#: app.php:373
 msgid "Personal"
 msgstr "Osobiste"
 
-#: app.php:383
+#: app.php:384
 msgid "Settings"
 msgstr "Ustawienia"
 
-#: app.php:395
+#: app.php:396
 msgid "Users"
 msgstr "Użytkownicy"
 
-#: app.php:408
+#: app.php:409
 msgid "Apps"
 msgstr "Aplikacje"
 
-#: app.php:416
+#: app.php:417
 msgid "Admin"
 msgstr "Administrator"
 
-#: files.php:210
+#: defaults.php:33
+msgid "web services under your control"
+msgstr "Kontrolowane serwisy"
+
+#: files.php:226
 msgid "ZIP download is turned off."
 msgstr "Pobieranie ZIP jest wyłączone."
 
-#: files.php:211
+#: files.php:227
 msgid "Files need to be downloaded one by one."
 msgstr "Pliki muszą zostać pobrane pojedynczo."
 
-#: files.php:212 files.php:245
+#: files.php:228 files.php:261
 msgid "Back to Files"
 msgstr "Wróć do plików"
 
-#: files.php:242
+#: files.php:258
 msgid "Selected files too large to generate zip file."
 msgstr "Wybrane pliki są zbyt duże, aby wygenerować plik zip."
 
@@ -86,104 +90,102 @@ msgstr "Połączenie tekstowe"
 msgid "Images"
 msgstr "Obrazy"
 
-#: setup.php:34
-msgid "Set an admin username."
-msgstr "Ustaw nazwÄ™ administratora."
-
-#: setup.php:37
-msgid "Set an admin password."
-msgstr "Ustaw hasło administratora."
-
-#: setup.php:55
+#: setup/abstractdatabase.php:22
 #, php-format
 msgid "%s enter the database username."
 msgstr "%s wpisz nazwę użytkownika do  bazy"
 
-#: setup.php:58
+#: setup/abstractdatabase.php:25
 #, php-format
 msgid "%s enter the database name."
 msgstr "%s wpisz nazwÄ™ bazy."
 
-#: setup.php:61
+#: setup/abstractdatabase.php:28
 #, php-format
 msgid "%s you may not use dots in the database name"
 msgstr "%s nie można używać kropki w nazwie bazy danych"
 
-#: setup.php:64
+#: setup/mssql.php:20
 #, php-format
-msgid "%s set the database host."
-msgstr "%s ustaw hosta bazy danych."
-
-#: setup.php:126 setup.php:332 setup.php:377
-msgid "PostgreSQL username and/or password not valid"
-msgstr "PostgreSQL: Nazwa użytkownika i/lub hasło jest niepoprawne"
+msgid "MS SQL username and/or password not valid: %s"
+msgstr "Nazwa i/lub hasło serwera MS SQL jest niepoprawne: %s."
 
-#: setup.php:127 setup.php:235
+#: setup/mssql.php:21 setup/mysql.php:13 setup/oci.php:114
+#: setup/postgresql.php:24 setup/postgresql.php:70
 msgid "You need to enter either an existing account or the administrator."
 msgstr "Należy wprowadzić istniejące konto użytkownika lub  administratora."
 
-#: setup.php:152
-msgid "Oracle connection could not be established"
-msgstr "Nie można ustanowić połączenia z bazą Oracle"
-
-#: setup.php:234
+#: setup/mysql.php:12
 msgid "MySQL username and/or password not valid"
 msgstr "MySQL: Nazwa użytkownika i/lub hasło jest niepoprawne"
 
-#: setup.php:288 setup.php:398 setup.php:407 setup.php:425 setup.php:435
-#: setup.php:444 setup.php:477 setup.php:543 setup.php:569 setup.php:576
-#: setup.php:587 setup.php:594 setup.php:603 setup.php:611 setup.php:620
-#: setup.php:626
+#: setup/mysql.php:67 setup/oci.php:54 setup/oci.php:121 setup/oci.php:147
+#: setup/oci.php:154 setup/oci.php:165 setup/oci.php:172 setup/oci.php:181
+#: setup/oci.php:189 setup/oci.php:198 setup/oci.php:204
+#: setup/postgresql.php:89 setup/postgresql.php:98 setup/postgresql.php:115
+#: setup/postgresql.php:125 setup/postgresql.php:134
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr "BÅ‚Ä…d DB: \"%s\""
 
-#: setup.php:289 setup.php:399 setup.php:408 setup.php:426 setup.php:436
-#: setup.php:445 setup.php:478 setup.php:544 setup.php:570 setup.php:577
-#: setup.php:588 setup.php:604 setup.php:612 setup.php:621
+#: setup/mysql.php:68 setup/oci.php:55 setup/oci.php:122 setup/oci.php:148
+#: setup/oci.php:155 setup/oci.php:166 setup/oci.php:182 setup/oci.php:190
+#: setup/oci.php:199 setup/postgresql.php:90 setup/postgresql.php:99
+#: setup/postgresql.php:116 setup/postgresql.php:126 setup/postgresql.php:135
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr "Niepoprawna komenda: \"%s\""
 
-#: setup.php:305
+#: setup/mysql.php:85
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr "Użytkownik MySQL  '%s'@'localhost' już istnieje"
 
-#: setup.php:306
+#: setup/mysql.php:86
 msgid "Drop this user from MySQL"
 msgstr "Usuń tego użytkownika z MySQL"
 
-#: setup.php:311
+#: setup/mysql.php:91
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr "Użytkownik MySQL  '%s'@'%%t' już istnieje"
 
-#: setup.php:312
+#: setup/mysql.php:92
 msgid "Drop this user from MySQL."
 msgstr "Usuń tego użytkownika z MySQL."
 
-#: setup.php:469 setup.php:536
+#: setup/oci.php:34
+msgid "Oracle connection could not be established"
+msgstr "Nie można ustanowić połączenia z bazą Oracle"
+
+#: setup/oci.php:41 setup/oci.php:113
 msgid "Oracle username and/or password not valid"
 msgstr "Oracle: Nazwa użytkownika i/lub hasło jest niepoprawne"
 
-#: setup.php:595 setup.php:627
+#: setup/oci.php:173 setup/oci.php:205
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr "Niepoprawne polecania:  \"%s\", nazwa: %s, hasło: %s"
 
-#: setup.php:647
-#, php-format
-msgid "MS SQL username and/or password not valid: %s"
-msgstr "Nazwa i/lub hasło serwera MS SQL jest niepoprawne: %s."
+#: setup/postgresql.php:23 setup/postgresql.php:69
+msgid "PostgreSQL username and/or password not valid"
+msgstr "PostgreSQL: Nazwa użytkownika i/lub hasło jest niepoprawne"
+
+#: setup.php:42
+msgid "Set an admin username."
+msgstr "Ustaw nazwÄ™ administratora."
+
+#: setup.php:45
+msgid "Set an admin password."
+msgstr "Ustaw hasło administratora."
 
-#: setup.php:870
+#: setup.php:198
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Serwer internetowy nie jest jeszcze poprawnie skonfigurowany, aby umożliwić synchronizację plików, ponieważ interfejs WebDAV wydaje się być uszkodzony."
 
-#: setup.php:871
+#: setup.php:199
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Sprawdź ponownie <a href='%s'>przewodniki instalacji</a>."
diff --git a/l10n/pl/settings.po b/l10n/pl/settings.po
index 127dac3d6c48b492a872418b4dfaab60eda40637..f3cc3ba53e3d83e5ea60e3747e2d2d0d8383a965 100644
--- a/l10n/pl/settings.po
+++ b/l10n/pl/settings.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
 "MIME-Version: 1.0\n"
@@ -90,35 +90,35 @@ msgstr "Nie można usunąć użytkownika z grupy %s"
 msgid "Couldn't update app."
 msgstr "Nie można uaktualnić aplikacji."
 
-#: js/apps.js:30
+#: js/apps.js:35
 msgid "Update to {appversion}"
 msgstr "Aktualizacja do {appversion}"
 
-#: js/apps.js:36 js/apps.js:76
+#: js/apps.js:41 js/apps.js:81
 msgid "Disable"
 msgstr "Wyłącz"
 
-#: js/apps.js:36 js/apps.js:64 js/apps.js:83
+#: js/apps.js:41 js/apps.js:69 js/apps.js:88
 msgid "Enable"
 msgstr "WÅ‚Ä…cz"
 
-#: js/apps.js:55
+#: js/apps.js:60
 msgid "Please wait...."
 msgstr "Proszę czekać..."
 
-#: js/apps.js:59 js/apps.js:71 js/apps.js:80 js/apps.js:93
+#: js/apps.js:64 js/apps.js:76 js/apps.js:85 js/apps.js:98
 msgid "Error"
 msgstr "BÅ‚Ä…d"
 
-#: js/apps.js:90
+#: js/apps.js:95
 msgid "Updating...."
 msgstr "Aktualizacja w toku..."
 
-#: js/apps.js:93
+#: js/apps.js:98
 msgid "Error while updating app"
 msgstr "BÅ‚Ä…d podczas aktualizacji aplikacji"
 
-#: js/apps.js:96
+#: js/apps.js:101
 msgid "Updated"
 msgstr "Zaktualizowano"
 
@@ -167,15 +167,15 @@ msgstr "Błąd podczas tworzenia użytkownika"
 msgid "A valid password must be provided"
 msgstr "Należy podać prawidłowe hasło"
 
-#: personal.php:35 personal.php:36
+#: personal.php:37 personal.php:38
 msgid "__language_name__"
 msgstr "polski"
 
-#: templates/admin.php:15
+#: templates/admin.php:17
 msgid "Security Warning"
 msgstr "Ostrzeżenie o zabezpieczeniach"
 
-#: templates/admin.php:18
+#: templates/admin.php:20
 msgid ""
 "Your data directory and your files are probably accessible from the "
 "internet. The .htaccess file that ownCloud provides is not working. We "
@@ -184,36 +184,36 @@ msgid ""
 " webserver document root."
 msgstr "Katalog danych i twoje pliki są prawdopodobnie dostępne z Internetu. Plik .htaccess dostarczony przez ownCloud nie działa. Zalecamy skonfigurowanie serwera internetowego w taki sposób, aby katalog z danymi nie był dostępny lub przeniesienie katalogu z danymi poza katalog główny serwera internetowego."
 
-#: templates/admin.php:29
+#: templates/admin.php:31
 msgid "Setup Warning"
 msgstr "Ostrzeżenia konfiguracji"
 
-#: templates/admin.php:32
+#: templates/admin.php:34
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Serwer internetowy nie jest jeszcze poprawnie skonfigurowany, aby umożliwić synchronizację plików, ponieważ interfejs WebDAV wydaje się być uszkodzony."
 
-#: templates/admin.php:33
+#: templates/admin.php:35
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Sprawdź ponownie <a href='%s'>przewodniki instalacji</a>."
 
-#: templates/admin.php:44
+#: templates/admin.php:46
 msgid "Module 'fileinfo' missing"
 msgstr "Brak modułu „fileinfo”"
 
-#: templates/admin.php:47
+#: templates/admin.php:49
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr "Brak modułu PHP „fileinfo”. Zalecamy włączenie tego modułu, aby uzyskać najlepsze wyniki podczas wykrywania typów MIME."
 
-#: templates/admin.php:58
+#: templates/admin.php:60
 msgid "Locale not working"
 msgstr "Lokalizacja nie działa"
 
-#: templates/admin.php:63
+#: templates/admin.php:65
 #, php-format
 msgid ""
 "This ownCloud server can't set system locale to %s. This means that there "
@@ -221,11 +221,11 @@ msgid ""
 " to install the required packages on your system to support %s."
 msgstr "Ten serwer ownCloud nie może włączyć ustawień regionalnych %s. Może to oznaczać, że wystąpiły problemy z niektórymi znakami w nazwach plików. Zalecamy instalację wymaganych pakietów na tym systemie w celu wsparcia %s."
 
-#: templates/admin.php:75
+#: templates/admin.php:77
 msgid "Internet connection not working"
 msgstr "Połączenie internetowe nie działa"
 
-#: templates/admin.php:78
+#: templates/admin.php:80
 msgid ""
 "This ownCloud server has no working internet connection. This means that "
 "some of the features like mounting of external storage, notifications about "
@@ -235,102 +235,102 @@ msgid ""
 " of ownCloud."
 msgstr "Ten serwer OwnCloud nie ma działającego połączenia z Internetem. Oznacza to, że niektóre z funkcji, takich jak montowanie zewnętrznych zasobów, powiadomienia o aktualizacji lub instalacja dodatkowych aplikacji nie będą działać. Dostęp do plików z zewnątrz i wysyłanie powiadomień e-mail może również nie działać. Sugerujemy, aby włączyć połączenie internetowe dla tego serwera, jeśli chcesz korzystać ze wszystkich funkcji ownCloud."
 
-#: templates/admin.php:92
+#: templates/admin.php:94
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:101
+#: templates/admin.php:103
 msgid "Execute one task with each page loaded"
 msgstr "Wykonuj jedno zadanie wraz z każdą wczytaną stroną"
 
-#: templates/admin.php:111
+#: templates/admin.php:113
 msgid ""
 "cron.php is registered at a webcron service. Call the cron.php page in the "
 "owncloud root once a minute over http."
 msgstr "cron.php jest zarejestrowany w usłudze webcron. Przywołaj stronę cron.php w katalogu głównym ownCloud raz na minutę przez http."
 
-#: templates/admin.php:121
+#: templates/admin.php:123
 msgid ""
 "Use systems cron service. Call the cron.php file in the owncloud folder via "
 "a system cronjob once a minute."
 msgstr "Użyj systemowej usługi cron. Przywołaj plik cron.php z katalogu ownCloud przez systemowy cronjob raz na minutę."
 
-#: templates/admin.php:128
+#: templates/admin.php:130
 msgid "Sharing"
 msgstr "Udostępnianie"
 
-#: templates/admin.php:134
+#: templates/admin.php:136
 msgid "Enable Share API"
 msgstr "Włącz API udostępniania"
 
-#: templates/admin.php:135
+#: templates/admin.php:137
 msgid "Allow apps to use the Share API"
 msgstr "Zezwalaj aplikacjom na korzystanie z API udostępniania"
 
-#: templates/admin.php:142
+#: templates/admin.php:144
 msgid "Allow links"
 msgstr "Zezwalaj na odnośniki"
 
-#: templates/admin.php:143
+#: templates/admin.php:145
 msgid "Allow users to share items to the public with links"
 msgstr "Zezwalaj użytkownikom na publiczne współdzielenie zasobów za pomocą odnośników"
 
-#: templates/admin.php:150
+#: templates/admin.php:152
 msgid "Allow resharing"
 msgstr "Zezwalaj na ponowne udostępnianie"
 
-#: templates/admin.php:151
+#: templates/admin.php:153
 msgid "Allow users to share items shared with them again"
 msgstr "Zezwalaj użytkownikom na ponowne współdzielenie zasobów już z nimi współdzielonych"
 
-#: templates/admin.php:158
+#: templates/admin.php:160
 msgid "Allow users to share with anyone"
 msgstr "Zezwalaj użytkownikom na współdzielenie z kimkolwiek"
 
-#: templates/admin.php:161
+#: templates/admin.php:163
 msgid "Allow users to only share with users in their groups"
 msgstr "Zezwalaj użytkownikom współdzielić z użytkownikami ze swoich grup"
 
-#: templates/admin.php:168
+#: templates/admin.php:170
 msgid "Security"
 msgstr "Bezpieczeństwo"
 
-#: templates/admin.php:181
+#: templates/admin.php:183
 msgid "Enforce HTTPS"
 msgstr "WymuÅ› HTTPS"
 
-#: templates/admin.php:182
+#: templates/admin.php:184
 msgid ""
 "Enforces the clients to connect to ownCloud via an encrypted connection."
 msgstr "Wymusza na klientach na łączenie się ownCloud za pośrednictwem połączenia szyfrowanego."
 
-#: templates/admin.php:185
+#: templates/admin.php:187
 msgid ""
 "Please connect to this ownCloud instance via HTTPS to enable or disable the "
 "SSL enforcement."
 msgstr "Proszę połącz się do tej instancji ownCloud za pośrednictwem protokołu HTTPS, aby włączyć lub wyłączyć stosowanie protokołu SSL."
 
-#: templates/admin.php:195
+#: templates/admin.php:197
 msgid "Log"
 msgstr "Logi"
 
-#: templates/admin.php:196
+#: templates/admin.php:198
 msgid "Log level"
 msgstr "Poziom logów"
 
-#: templates/admin.php:227
+#: templates/admin.php:229
 msgid "More"
 msgstr "Więcej"
 
-#: templates/admin.php:228
+#: templates/admin.php:230
 msgid "Less"
 msgstr "Mniej"
 
-#: templates/admin.php:235 templates/personal.php:116
+#: templates/admin.php:236 templates/personal.php:116
 msgid "Version"
 msgstr "Wersja"
 
-#: templates/admin.php:237 templates/personal.php:119
+#: templates/admin.php:240 templates/personal.php:119
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -388,76 +388,79 @@ msgstr "Zgłaszanie błędów"
 msgid "Commercial Support"
 msgstr "Wsparcie komercyjne"
 
-#: templates/personal.php:9
+#: templates/personal.php:10
 msgid "Get the apps to sync your files"
 msgstr "Pobierz aplikacje żeby synchronizować swoje pliki"
 
-#: templates/personal.php:20
+#: templates/personal.php:21
 msgid "Show First Run Wizard again"
 msgstr "Uruchom ponownie kreatora pierwszego uruchomienia"
 
-#: templates/personal.php:28
+#: templates/personal.php:29
 #, php-format
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "Wykorzystujesz <strong>%s</strong> z dostępnych <strong>%s</strong>"
 
-#: templates/personal.php:40 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:41 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "Hasło"
 
-#: templates/personal.php:41
+#: templates/personal.php:42
 msgid "Your password was changed"
 msgstr "Twoje hasło zostało zmienione"
 
-#: templates/personal.php:42
+#: templates/personal.php:43
 msgid "Unable to change your password"
 msgstr "Nie można zmienić hasła"
 
-#: templates/personal.php:43
+#: templates/personal.php:44
 msgid "Current password"
 msgstr "Bieżące hasło"
 
-#: templates/personal.php:45
+#: templates/personal.php:46
 msgid "New password"
 msgstr "Nowe hasło"
 
-#: templates/personal.php:47
+#: templates/personal.php:48
 msgid "Change password"
 msgstr "Zmień hasło"
 
-#: templates/personal.php:59 templates/users.php:85
+#: templates/personal.php:60 templates/users.php:85
 msgid "Display Name"
 msgstr "Wyświetlana nazwa"
 
-#: templates/personal.php:74
+#: templates/personal.php:75
 msgid "Email"
 msgstr "Email"
 
-#: templates/personal.php:76
+#: templates/personal.php:77
 msgid "Your email address"
 msgstr "Twój adres e-mail"
 
-#: templates/personal.php:77
+#: templates/personal.php:78
 msgid "Fill in an email address to enable password recovery"
 msgstr "Podaj adres e-mail, aby uzyskać możliwość odzyskania hasła"
 
-#: templates/personal.php:86 templates/personal.php:87
+#: templates/personal.php:87 templates/personal.php:88
 msgid "Language"
 msgstr "Język"
 
-#: templates/personal.php:99
+#: templates/personal.php:100
 msgid "Help translate"
 msgstr "Pomóż w tłumaczeniu"
 
-#: templates/personal.php:105
+#: templates/personal.php:106
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:107
-msgid "Use this address to connect to your ownCloud in your file manager"
-msgstr "Użyj tego adresu aby podłączyć zasób ownCloud w menedżerze plików"
+#: templates/personal.php:108
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
+"target=\"_blank\">access your Files via WebDAV</a>"
+msgstr ""
 
-#: templates/users.php:21 templates/users.php:84
+#: templates/users.php:21
 msgid "Login Name"
 msgstr "Login"
 
@@ -473,7 +476,7 @@ msgstr "Odzyskiwanie hasła administratora"
 msgid ""
 "Enter the recovery password in order to recover the users files during "
 "password change"
-msgstr ""
+msgstr "Wpisz hasło odzyskiwania, aby odzyskać pliki użytkowników podczas zmiany hasła"
 
 #: templates/users.php:42
 msgid "Default Storage"
@@ -487,6 +490,10 @@ msgstr "Bez limitu"
 msgid "Other"
 msgstr "Inne"
 
+#: templates/users.php:84
+msgid "Username"
+msgstr "Nazwa użytkownika"
+
 #: templates/users.php:91
 msgid "Storage"
 msgstr "Magazyn"
diff --git a/l10n/pl/user_ldap.po b/l10n/pl/user_ldap.po
index 336f9eec0e82476b23f26b6b71229775abab376c..9a50b043573edf8046b99d4de6a0be3df273c021 100644
--- a/l10n/pl/user_ldap.po
+++ b/l10n/pl/user_ldap.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:16+0000\n"
 "Last-Translator: orcio6 <orcio6@o2.pl>\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/pl/user_webdavauth.po b/l10n/pl/user_webdavauth.po
index 4b08a260393d427edc0bccba3f78b12314941898..2df6fe576de2f9469a2e781b072dfc472f8a0adf 100644
--- a/l10n/pl/user_webdavauth.po
+++ b/l10n/pl/user_webdavauth.po
@@ -4,15 +4,15 @@
 # 
 # Translators:
 # bbartlomiej <bbartlomiej@gmail.com>, 2013
-# Cyryl Sochacki <cyrylsochacki@gmail.com>, 2012
+# Cyryl Sochacki <cyrylsochacki@gmail.com>, 2012-2013
 # Marcin Małecki <gerber@tkdami.net>, 2012
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-15 01:59+0200\n"
-"PO-Revision-Date: 2013-06-15 00:00+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-06-18 02:04+0200\n"
+"PO-Revision-Date: 2013-06-17 09:50+0000\n"
+"Last-Translator: Cyryl Sochacki <cyrylsochacki@gmail.com>\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -26,7 +26,7 @@ msgstr "Uwierzytelnienie WebDAV"
 
 #: templates/settings.php:4
 msgid "URL: "
-msgstr ""
+msgstr "URL: "
 
 #: templates/settings.php:7
 msgid ""
diff --git a/l10n/pt_BR/core.po b/l10n/pt_BR/core.po
index e98aaa1d1a60769a52cd77fbae74194c125b694d..0bb0fccb2162089d39817ee21388a6655e6a7b2a 100644
--- a/l10n/pt_BR/core.po
+++ b/l10n/pt_BR/core.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# bjamalaro <bjamalaro@yahoo.com.br>, 2013
 # Flávio Veras <flaviove@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:22+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:14+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"
@@ -21,7 +22,7 @@ msgstr ""
 #: ajax/share.php:97
 #, php-format
 msgid "%s shared »%s« with you"
-msgstr ""
+msgstr "%s compartilhou »%s« com você"
 
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
@@ -62,135 +63,135 @@ msgstr "Nenhuma categoria selecionada para remoção."
 msgid "Error removing %s from favorites."
 msgstr "Erro ao remover %s dos favoritos."
 
-#: js/config.php:34
+#: js/config.php:32
 msgid "Sunday"
 msgstr "Domingo"
 
-#: js/config.php:35
+#: js/config.php:33
 msgid "Monday"
 msgstr "Segunda-feira"
 
-#: js/config.php:36
+#: js/config.php:34
 msgid "Tuesday"
 msgstr "Terça-feira"
 
-#: js/config.php:37
+#: js/config.php:35
 msgid "Wednesday"
 msgstr "Quarta-feira"
 
-#: js/config.php:38
+#: js/config.php:36
 msgid "Thursday"
 msgstr "Quinta-feira"
 
-#: js/config.php:39
+#: js/config.php:37
 msgid "Friday"
 msgstr "Sexta-feira"
 
-#: js/config.php:40
+#: js/config.php:38
 msgid "Saturday"
 msgstr "Sábado"
 
-#: js/config.php:45
+#: js/config.php:43
 msgid "January"
 msgstr "janeiro"
 
-#: js/config.php:46
+#: js/config.php:44
 msgid "February"
 msgstr "fevereiro"
 
-#: js/config.php:47
+#: js/config.php:45
 msgid "March"
 msgstr "março"
 
-#: js/config.php:48
+#: js/config.php:46
 msgid "April"
 msgstr "abril"
 
-#: js/config.php:49
+#: js/config.php:47
 msgid "May"
 msgstr "maio"
 
-#: js/config.php:50
+#: js/config.php:48
 msgid "June"
 msgstr "junho"
 
-#: js/config.php:51
+#: js/config.php:49
 msgid "July"
 msgstr "julho"
 
-#: js/config.php:52
+#: js/config.php:50
 msgid "August"
 msgstr "agosto"
 
-#: js/config.php:53
+#: js/config.php:51
 msgid "September"
 msgstr "setembro"
 
-#: js/config.php:54
+#: js/config.php:52
 msgid "October"
 msgstr "outubro"
 
-#: js/config.php:55
+#: js/config.php:53
 msgid "November"
 msgstr "novembro"
 
-#: js/config.php:56
+#: js/config.php:54
 msgid "December"
 msgstr "dezembro"
 
-#: js/js.js:286
+#: js/js.js:293
 msgid "Settings"
 msgstr "Ajustes"
 
-#: js/js.js:718
+#: js/js.js:725
 msgid "seconds ago"
 msgstr "segundos atrás"
 
-#: js/js.js:719
+#: js/js.js:726
 msgid "1 minute ago"
 msgstr "1 minuto atrás"
 
-#: js/js.js:720
+#: js/js.js:727
 msgid "{minutes} minutes ago"
 msgstr "{minutes} minutos atrás"
 
-#: js/js.js:721
+#: js/js.js:728
 msgid "1 hour ago"
 msgstr "1 hora atrás"
 
-#: js/js.js:722
+#: js/js.js:729
 msgid "{hours} hours ago"
 msgstr "{hours} horas atrás"
 
-#: js/js.js:723
+#: js/js.js:730
 msgid "today"
 msgstr "hoje"
 
-#: js/js.js:724
+#: js/js.js:731
 msgid "yesterday"
 msgstr "ontem"
 
-#: js/js.js:725
+#: js/js.js:732
 msgid "{days} days ago"
 msgstr "{days} dias atrás"
 
-#: js/js.js:726
+#: js/js.js:733
 msgid "last month"
 msgstr "último mês"
 
-#: js/js.js:727
+#: js/js.js:734
 msgid "{months} months ago"
 msgstr "{months} meses atrás"
 
-#: js/js.js:728
+#: js/js.js:735
 msgid "months ago"
 msgstr "meses atrás"
 
-#: js/js.js:729
+#: js/js.js:736
 msgid "last year"
 msgstr "último ano"
 
-#: js/js.js:730
+#: js/js.js:737
 msgid "years ago"
 msgstr "anos atrás"
 
@@ -226,8 +227,8 @@ msgstr "O tipo de objeto não foi especificado."
 #: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
 #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:577
-#: js/share.js:589
+#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:620
+#: js/share.js:632
 msgid "Error"
 msgstr "Erro"
 
@@ -247,7 +248,7 @@ msgstr "Compartilhados"
 msgid "Share"
 msgstr "Compartilhar"
 
-#: js/share.js:125 js/share.js:617
+#: js/share.js:125 js/share.js:660
 msgid "Error while sharing"
 msgstr "Erro ao compartilhar"
 
@@ -267,99 +268,103 @@ msgstr "Compartilhado com você e com o grupo {group} por {owner}"
 msgid "Shared with you by {owner}"
 msgstr "Compartilhado com você por {owner}"
 
-#: js/share.js:159
+#: js/share.js:172
 msgid "Share with"
 msgstr "Compartilhar com"
 
-#: js/share.js:164
+#: js/share.js:177
 msgid "Share with link"
 msgstr "Compartilhar com link"
 
-#: js/share.js:167
+#: js/share.js:180
 msgid "Password protect"
 msgstr "Proteger com senha"
 
-#: js/share.js:169 templates/installation.php:54 templates/login.php:26
+#: js/share.js:182 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "Senha"
 
-#: js/share.js:173
+#: js/share.js:187
+msgid "Allow Public Upload"
+msgstr "Permitir upload público"
+
+#: js/share.js:191
 msgid "Email link to person"
 msgstr "Enviar link por e-mail"
 
-#: js/share.js:174
+#: js/share.js:192
 msgid "Send"
 msgstr "Enviar"
 
-#: js/share.js:178
+#: js/share.js:197
 msgid "Set expiration date"
 msgstr "Definir data de expiração"
 
-#: js/share.js:179
+#: js/share.js:198
 msgid "Expiration date"
 msgstr "Data de expiração"
 
-#: js/share.js:211
+#: js/share.js:230
 msgid "Share via email:"
 msgstr "Compartilhar via e-mail:"
 
-#: js/share.js:213
+#: js/share.js:232
 msgid "No people found"
 msgstr "Nenhuma pessoa encontrada"
 
-#: js/share.js:251
+#: js/share.js:270
 msgid "Resharing is not allowed"
 msgstr "Não é permitido re-compartilhar"
 
-#: js/share.js:287
+#: js/share.js:306
 msgid "Shared in {item} with {user}"
 msgstr "Compartilhado em {item} com {user}"
 
-#: js/share.js:308
+#: js/share.js:327
 msgid "Unshare"
 msgstr "Descompartilhar"
 
-#: js/share.js:320
+#: js/share.js:339
 msgid "can edit"
 msgstr "pode editar"
 
-#: js/share.js:322
+#: js/share.js:341
 msgid "access control"
 msgstr "controle de acesso"
 
-#: js/share.js:325
+#: js/share.js:344
 msgid "create"
 msgstr "criar"
 
-#: js/share.js:328
+#: js/share.js:347
 msgid "update"
 msgstr "atualizar"
 
-#: js/share.js:331
+#: js/share.js:350
 msgid "delete"
 msgstr "remover"
 
-#: js/share.js:334
+#: js/share.js:353
 msgid "share"
 msgstr "compartilhar"
 
-#: js/share.js:368 js/share.js:564
+#: js/share.js:387 js/share.js:607
 msgid "Password protected"
 msgstr "Protegido com senha"
 
-#: js/share.js:577
+#: js/share.js:620
 msgid "Error unsetting expiration date"
 msgstr "Erro ao remover data de expiração"
 
-#: js/share.js:589
+#: js/share.js:632
 msgid "Error setting expiration date"
 msgstr "Erro ao definir data de expiração"
 
-#: js/share.js:604
+#: js/share.js:647
 msgid "Sending ..."
 msgstr "Enviando ..."
 
-#: js/share.js:615
+#: js/share.js:658
 msgid "Email sent"
 msgstr "E-mail enviado"
 
@@ -374,7 +379,7 @@ msgstr "A atualização falhou. Por favor, relate este problema para a <a href=\
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "A atualização teve êxito. Você será redirecionado ao ownCloud agora."
 
-#: lostpassword/controller.php:58
+#: lostpassword/controller.php:60
 msgid "ownCloud password reset"
 msgstr "Redefinir senha ownCloud"
 
@@ -404,17 +409,17 @@ msgstr "Nome de usuário"
 
 #: lostpassword/templates/lostpassword.php:22
 msgid ""
-"Your files seems to be encrypted. If you didn't have enabled the recovery "
-"key there will be no way to get your data back once the password was "
-"resetted. If you are not sure what to do, please contact your administrator "
-"first before continue. Do you really want to continue?"
-msgstr ""
+"Your files are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
+msgstr "Seus arquivos estão encriptados. Se você não habilitou a chave de recuperação, não haverá maneira de recuperar seus dados após criar uma nova senha. Se você não tem certeza do que fazer,  por favor entre em contato com o administrador antes de continuar. Tem certeza que realmente quer continuar?"
 
 #: lostpassword/templates/lostpassword.php:24
 msgid "Yes, I really want to reset my password now"
-msgstr ""
+msgstr "Sim, realmente quero criar uma nova senha."
 
-#: lostpassword/templates/lostpassword.php:29
+#: lostpassword/templates/lostpassword.php:27
 msgid "Request reset"
 msgstr "Pedir redefinição"
 
@@ -462,7 +467,7 @@ msgstr "Acesso proibido"
 msgid "Cloud not found"
 msgstr "Cloud não encontrado"
 
-#: templates/altmail.php:2
+#: templates/altmail.php:4
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -471,11 +476,7 @@ msgid ""
 "View it: %s\n"
 "\n"
 "Cheers!"
-msgstr ""
-
-#: templates/altmail.php:7 templates/mail.php:24
-msgid "web services under your control"
-msgstr "serviços web sob seu controle"
+msgstr "Olá,\n\napenas para você saber que %s compartilhou %s com você.\nVeja: %s\n\nAbraços!"
 
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
@@ -569,12 +570,12 @@ msgstr "Host do banco de dados"
 msgid "Finish setup"
 msgstr "Concluir configuração"
 
-#: templates/layout.user.php:40
+#: templates/layout.user.php:43
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr "%s está disponível. Obtenha mais informações sobre como atualizar."
 
-#: templates/layout.user.php:67
+#: templates/layout.user.php:68
 msgid "Log out"
 msgstr "Sair"
 
@@ -608,12 +609,12 @@ msgstr "Fazer login"
 msgid "Alternative Logins"
 msgstr "Logins alternativos"
 
-#: templates/mail.php:15
+#: templates/mail.php:16
 #, php-format
 msgid ""
 "Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
 "href=\"%s\">View it!</a><br><br>Cheers!"
-msgstr ""
+msgstr "Olá,<br><br>apenas para você saber que %s compartilhou %s com você.<br><a href=\"%s\">Veja: </a><br><br>Abraços!"
 
 #: templates/part.pagenavi.php:3
 msgid "prev"
diff --git a/l10n/pt_BR/files.po b/l10n/pt_BR/files.po
index f635bf45d7a449d985113324c283f89d278d8781..521653e20c0e668d0d070b6635f2a76ef429d799 100644
--- a/l10n/pt_BR/files.po
+++ b/l10n/pt_BR/files.po
@@ -3,14 +3,16 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# bjamalaro <bjamalaro@yahoo.com.br>, 2013
 # Flávio Veras <flaviove@gmail.com>, 2013
+# tuliouel, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:01+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
-"Last-Translator: Flávio Veras <flaviove@gmail.com>\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
+"Last-Translator: tuliouel\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -28,46 +30,54 @@ msgstr "Impossível mover %s - Um arquivo com este nome já existe"
 msgid "Could not move %s"
 msgstr "Impossível mover %s"
 
-#: ajax/upload.php:19
+#: ajax/upload.php:16 ajax/upload.php:45
+msgid "Unable to set upload directory."
+msgstr "Impossível configurar o diretório de upload"
+
+#: ajax/upload.php:22
+msgid "Invalid Token"
+msgstr "Token inválido"
+
+#: ajax/upload.php:59
 msgid "No file was uploaded. Unknown error"
 msgstr "Nenhum arquivo foi enviado. Erro desconhecido"
 
-#: ajax/upload.php:26
+#: ajax/upload.php:66
 msgid "There is no error, the file uploaded with success"
 msgstr "Sem erros, o arquivo foi enviado com sucesso"
 
-#: ajax/upload.php:27
+#: ajax/upload.php:67
 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:29
+#: ajax/upload.php:69
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "O arquivo carregado excede o argumento MAX_FILE_SIZE especificado no formulário HTML"
 
-#: ajax/upload.php:30
+#: ajax/upload.php:70
 msgid "The uploaded file was only partially uploaded"
 msgstr "O arquivo foi parcialmente enviado"
 
-#: ajax/upload.php:31
+#: ajax/upload.php:71
 msgid "No file was uploaded"
 msgstr "Nenhum arquivo enviado"
 
-#: ajax/upload.php:32
+#: ajax/upload.php:72
 msgid "Missing a temporary folder"
 msgstr "Pasta temporária não encontrada"
 
-#: ajax/upload.php:33
+#: ajax/upload.php:73
 msgid "Failed to write to disk"
 msgstr "Falha ao escrever no disco"
 
-#: ajax/upload.php:51
+#: ajax/upload.php:91
 msgid "Not enough storage available"
 msgstr "Espaço de armazenamento insuficiente"
 
-#: ajax/upload.php:83
+#: ajax/upload.php:123
 msgid "Invalid directory."
 msgstr "Diretório inválido."
 
@@ -75,6 +85,36 @@ msgstr "Diretório inválido."
 msgid "Files"
 msgstr "Arquivos"
 
+#: js/file-upload.js:11
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr "Impossível enviar seus arquivo por ele ser um diretório ou ter 0 bytes."
+
+#: js/file-upload.js:24
+msgid "Not enough space available"
+msgstr "Espaço de armazenamento insuficiente"
+
+#: js/file-upload.js:64
+msgid "Upload cancelled."
+msgstr "Envio cancelado."
+
+#: js/file-upload.js:167 js/files.js:266
+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/file-upload.js:233 js/files.js:339
+msgid "URL cannot be empty."
+msgstr "URL não pode ficar em branco"
+
+#: js/file-upload.js:238 lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr "Nome de pasta inválido. O uso do nome 'Compartilhado' é reservado ao ownCloud"
+
+#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
+#: js/files.js:693 js/files.js:731
+msgid "Error"
+msgstr "Erro"
+
 #: js/fileactions.js:116
 msgid "Share"
 msgstr "Compartilhar"
@@ -91,43 +131,43 @@ msgstr "Excluir"
 msgid "Rename"
 msgstr "Renomear"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:464
 msgid "Pending"
 msgstr "Pendente"
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "{new_name} already exists"
 msgstr "{new_name} já existe"
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "replace"
 msgstr "substituir"
 
-#: js/filelist.js:259
+#: js/filelist.js:302
 msgid "suggest name"
 msgstr "sugerir nome"
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "cancel"
 msgstr "cancelar"
 
-#: js/filelist.js:306
+#: js/filelist.js:349
 msgid "replaced {new_name} with {old_name}"
 msgstr "Substituído {old_name} por {new_name} "
 
-#: js/filelist.js:306
+#: js/filelist.js:349
 msgid "undo"
 msgstr "desfazer"
 
-#: js/filelist.js:331
+#: js/filelist.js:374
 msgid "perform delete operation"
 msgstr "realizar operação de exclusão"
 
-#: js/filelist.js:413
+#: js/filelist.js:456
 msgid "1 file uploading"
 msgstr "enviando 1 arquivo"
 
-#: js/filelist.js:416 js/filelist.js:470
+#: js/filelist.js:459 js/filelist.js:517
 msgid "files uploading"
 msgstr "enviando arquivos"
 
@@ -159,70 +199,42 @@ msgid ""
 "big."
 msgstr "Seu download está sendo preparado. Isto pode levar algum tempo se os arquivos forem grandes."
 
-#: js/files.js:264
-msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "Impossível enviar seus arquivo por ele ser um diretório ou ter 0 bytes."
-
-#: js/files.js:277
-msgid "Not enough space available"
-msgstr "Espaço de armazenamento insuficiente"
-
-#: js/files.js:317
-msgid "Upload cancelled."
-msgstr "Envio cancelado."
-
-#: js/files.js:413
-msgid ""
-"File upload is in progress. Leaving the page now will cancel the upload."
-msgstr "Upload em andamento. Sair da página agora resultará no cancelamento do envio."
-
-#: js/files.js:486
-msgid "URL cannot be empty."
-msgstr "URL não pode ficar em branco"
-
-#: js/files.js:491
+#: js/files.js:344
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Nome de pasta inválido. O uso de 'Shared' é reservado para o Owncloud"
 
-#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
-msgid "Error"
-msgstr "Erro"
-
-#: js/files.js:877 templates/index.php:69
+#: js/files.js:744 templates/index.php:69
 msgid "Name"
 msgstr "Nome"
 
-#: js/files.js:878 templates/index.php:80
+#: js/files.js:745 templates/index.php:80
 msgid "Size"
 msgstr "Tamanho"
 
-#: js/files.js:879 templates/index.php:82
+#: js/files.js:746 templates/index.php:82
 msgid "Modified"
 msgstr "Modificado"
 
-#: js/files.js:898
+#: js/files.js:765
 msgid "1 folder"
 msgstr "1 pasta"
 
-#: js/files.js:900
+#: js/files.js:767
 msgid "{count} folders"
 msgstr "{count} pastas"
 
-#: js/files.js:908
+#: js/files.js:775
 msgid "1 file"
 msgstr "1 arquivo"
 
-#: js/files.js:910
+#: js/files.js:777
 msgid "{count} files"
 msgstr "{count} arquivos"
 
-#: lib/app.php:53
-msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
-msgstr "Nome de pasta inválido. O uso do nome 'Compartilhado' é reservado ao ownCloud"
-
 #: lib/app.php:73
-msgid "Unable to rename file"
-msgstr "Impossível renomear arquivo"
+#, php-format
+msgid "%s could not be renamed"
+msgstr "%s não pode ser renomeado"
 
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
@@ -318,6 +330,22 @@ msgstr "Arquivos sendo escaneados, por favor aguarde."
 msgid "Current scanning"
 msgstr "Scanning atual"
 
+#: templates/part.list.php:76
+msgid "directory"
+msgstr "diretório"
+
+#: templates/part.list.php:78
+msgid "directories"
+msgstr "diretórios"
+
+#: templates/part.list.php:87
+msgid "file"
+msgstr "arquivo"
+
+#: templates/part.list.php:89
+msgid "files"
+msgstr "arquivos"
+
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
 msgstr "Atualizando cache do sistema de arquivos..."
diff --git a/l10n/pt_BR/files_encryption.po b/l10n/pt_BR/files_encryption.po
index 1a19c4276708b5ab61e7f4e3c0defb17190675e3..907be4d30a22d6c6fbaf78853a19229c6427f699 100644
--- a/l10n/pt_BR/files_encryption.po
+++ b/l10n/pt_BR/files_encryption.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# bjamalaro <bjamalaro@yahoo.com.br>, 2013
 # Flávio Veras <flaviove@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-14 02:46+0200\n"
-"PO-Revision-Date: 2013-06-14 00:47+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-07-06 02:01+0200\n"
+"PO-Revision-Date: 2013-07-05 23:10+0000\n"
+"Last-Translator: Flávio Veras <flaviove@gmail.com>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -46,20 +47,32 @@ msgstr "Não foi possível alterar a senha. Talvez a senha antiga não estava co
 
 #: ajax/updatePrivateKeyPassword.php:51
 msgid "Private key password successfully updated."
-msgstr ""
+msgstr "Senha de chave privada atualizada com sucesso."
 
 #: ajax/updatePrivateKeyPassword.php:53
 msgid ""
 "Could not update the private key password. Maybe the old password was not "
 "correct."
-msgstr ""
+msgstr "Não foi possível atualizar a senha de chave privada. Talvez a senha antiga esteja incorreta."
 
 #: files/error.php:7
 msgid ""
-"Your private key is not valid! Maybe your password was changed from outside."
-" You can update your private key password in your personal settings to "
-"regain access to your files"
-msgstr ""
+"Your private key is not valid! Likely your password was changed outside the "
+"ownCloud system (e.g. your corporate directory). You can update your private"
+" key password in your personal settings to recover access to your encrypted "
+"files."
+msgstr "Sua chave privada não é válida! Provavelmente sua senha foi alterada fora do sistema ownCloud (por exemplo, seu diretório corporativo). Você pode atualizar sua senha de chave privada em suas configurações pessoais para recuperar o acesso a seus arquivos criptografados."
+
+#: hooks/hooks.php:44
+msgid "Missing requirements."
+msgstr "Requisitos em falta."
+
+#: hooks/hooks.php:45
+msgid ""
+"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL "
+"PHP extension is enabled and configured properly. For now, the encryption "
+"app has been disabled."
+msgstr "Por favor, certifique-se que o PHP 5.3.3 ou mais recente está instalado e que a extensão PHP OpenSSL está habilitado e configurado corretamente. Por enquanto, o aplicativo de criptografia foi desativado."
 
 #: js/settings-admin.js:11
 msgid "Saving..."
@@ -69,15 +82,15 @@ msgstr "Salvando..."
 msgid ""
 "Your private key is not valid! Maybe the your password was changed from "
 "outside."
-msgstr ""
+msgstr "Sua chave privada não é válida! Talvez sua senha tenha sido mudada."
 
 #: templates/invalid_private_key.php:7
 msgid "You can unlock your private key in your "
-msgstr ""
+msgstr "Você pode desbloquear sua chave privada nas suas"
 
 #: templates/invalid_private_key.php:7
 msgid "personal settings"
-msgstr ""
+msgstr "configurações pessoais."
 
 #: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
@@ -85,12 +98,12 @@ msgstr "Criptografia"
 
 #: templates/settings-admin.php:10
 msgid ""
-"Enable encryption passwords recovery key (allow sharing to recovery key):"
-msgstr "Ativar a criptografia de chave de recuperação de senhas (permitir compartilhar a chave de recuperação):"
+"Enable recovery key (allow to recover users files in case of password loss):"
+msgstr "Habilitar chave de recuperação (permite recuperar arquivos de usuários em caso de perda de senha):"
 
 #: templates/settings-admin.php:14
-msgid "Recovery account password"
-msgstr "Recuperar a senha da conta"
+msgid "Recovery key password"
+msgstr "Senha da chave de recuperação"
 
 #: templates/settings-admin.php:21 templates/settings-personal.php:54
 msgid "Enabled"
@@ -101,16 +114,16 @@ msgid "Disabled"
 msgstr "Desabilitado"
 
 #: templates/settings-admin.php:34
-msgid "Change encryption passwords recovery key:"
-msgstr "Mudar a criptografia de chave de recuperação de senhas:"
+msgid "Change recovery key password:"
+msgstr "Mudar a senha da chave de recuperação:"
 
 #: templates/settings-admin.php:41
-msgid "Old Recovery account password"
-msgstr "Recuperação de senha de conta antiga"
+msgid "Old Recovery key password"
+msgstr "Senha antiga da chave de recuperação"
 
 #: templates/settings-admin.php:48
-msgid "New Recovery account password"
-msgstr "Senha Nova  da conta de Recuperação"
+msgid "New Recovery key password"
+msgstr "Nova senha da chave de recuperação"
 
 #: templates/settings-admin.php:53
 msgid "Change Password"
@@ -118,39 +131,39 @@ msgstr "Trocar Senha"
 
 #: templates/settings-personal.php:11
 msgid "Your private key password no longer match your log-in password:"
-msgstr ""
+msgstr "Sua senha de chave privada não coincide mais com sua senha de login:"
 
 #: templates/settings-personal.php:14
 msgid "Set your old private key password to your current log-in password."
-msgstr ""
+msgstr "Configure sua antiga senha de chave privada para sua atual senha de login."
 
 #: templates/settings-personal.php:16
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
-msgstr ""
+msgstr "Se você não se lembra de sua antiga senha você pode pedir ao administrador que recupere seus arquivos."
 
 #: templates/settings-personal.php:24
 msgid "Old log-in password"
-msgstr ""
+msgstr "Senha antiga de login"
 
 #: templates/settings-personal.php:30
 msgid "Current log-in password"
-msgstr ""
+msgstr "Atual senha de login"
 
 #: templates/settings-personal.php:35
 msgid "Update Private Key Password"
-msgstr ""
+msgstr "Atualizar senha de chave privada"
 
 #: templates/settings-personal.php:45
 msgid "Enable password recovery:"
-msgstr ""
+msgstr "Habilitar recuperação de senha:"
 
 #: templates/settings-personal.php:47
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
-msgstr ""
+msgstr "Habilitar essa opção vai permitir que você obtenha novamente acesso aos seus arquivos encriptados em caso de perda de senha"
 
 #: templates/settings-personal.php:63
 msgid "File recovery settings updated"
diff --git a/l10n/pt_BR/files_external.po b/l10n/pt_BR/files_external.po
index 1745a7157c7aa1b1b025e433fce07a024d86af7f..e43ad1e5bd0ca1640252a7da927a3db044242488 100644
--- a/l10n/pt_BR/files_external.po
+++ b/l10n/pt_BR/files_external.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: Flávio Veras <flaviove@gmail.com>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/pt_BR/files_sharing.po b/l10n/pt_BR/files_sharing.po
index 45b58395a92659ec9ad8488fdd570a256f471c07..ac2ddb2bf3daabcb0919b104b0720784813c05cf 100644
--- a/l10n/pt_BR/files_sharing.po
+++ b/l10n/pt_BR/files_sharing.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Flávio Veras <flaviove@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
+"Last-Translator: Flávio Veras <flaviove@gmail.com>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,27 +19,39 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: templates/authenticate.php:4
+msgid "The password is wrong. Try again."
+msgstr "Senha incorreta. Tente novamente."
+
+#: templates/authenticate.php:7
 msgid "Password"
 msgstr "Senha"
 
-#: templates/authenticate.php:6
+#: templates/authenticate.php:9
 msgid "Submit"
 msgstr "Submeter"
 
-#: templates/public.php:10
+#: templates/public.php:17
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s compartilhou a pasta %s com você"
 
-#: templates/public.php:13
+#: templates/public.php:20
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s compartilhou o arquivo %s com você"
 
-#: templates/public.php:19 templates/public.php:43
+#: templates/public.php:28 templates/public.php:90
 msgid "Download"
 msgstr "Baixar"
 
-#: templates/public.php:40
+#: templates/public.php:45 templates/public.php:48
+msgid "Upload"
+msgstr "Upload"
+
+#: templates/public.php:58
+msgid "Cancel upload"
+msgstr "Cancelar upload"
+
+#: templates/public.php:87
 msgid "No preview available for"
 msgstr "Nenhuma visualização disponível para"
diff --git a/l10n/pt_BR/files_trashbin.po b/l10n/pt_BR/files_trashbin.po
index 60e965a2512a892792f92d72dd09144c9b965b65..917894bab82517b219c37df5219888f1a9424604 100644
--- a/l10n/pt_BR/files_trashbin.po
+++ b/l10n/pt_BR/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:16+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/pt_BR/lib.po b/l10n/pt_BR/lib.po
index 85b52f94aa983096b9b37e49db8c0e3c29ea9946..59ed1bc382a61955bf47c0113e406076cc4f1e34 100644
--- a/l10n/pt_BR/lib.po
+++ b/l10n/pt_BR/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-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
-"Last-Translator: Flávio Veras <flaviove@gmail.com>\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,43 +18,47 @@ msgstr ""
 "Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: app.php:359
+#: app.php:360
 msgid "Help"
 msgstr "Ajuda"
 
-#: app.php:372
+#: app.php:373
 msgid "Personal"
 msgstr "Pessoal"
 
-#: app.php:383
+#: app.php:384
 msgid "Settings"
 msgstr "Ajustes"
 
-#: app.php:395
+#: app.php:396
 msgid "Users"
 msgstr "Usuários"
 
-#: app.php:408
+#: app.php:409
 msgid "Apps"
 msgstr "Aplicações"
 
-#: app.php:416
+#: app.php:417
 msgid "Admin"
 msgstr "Admin"
 
-#: files.php:210
+#: defaults.php:33
+msgid "web services under your control"
+msgstr "serviços web sob seu controle"
+
+#: files.php:226
 msgid "ZIP download is turned off."
 msgstr "Download ZIP está desligado."
 
-#: files.php:211
+#: files.php:227
 msgid "Files need to be downloaded one by one."
 msgstr "Arquivos precisam ser baixados um de cada vez."
 
-#: files.php:212 files.php:245
+#: files.php:228 files.php:261
 msgid "Back to Files"
 msgstr "Voltar para Arquivos"
 
-#: files.php:242
+#: files.php:258
 msgid "Selected files too large to generate zip file."
 msgstr "Arquivos selecionados são muito grandes para gerar arquivo zip."
 
@@ -86,104 +90,102 @@ msgstr "Texto"
 msgid "Images"
 msgstr "Imagens"
 
-#: setup.php:34
-msgid "Set an admin username."
-msgstr "Defina um nome de usuário de administrador."
-
-#: setup.php:37
-msgid "Set an admin password."
-msgstr "Defina uma senha de administrador."
-
-#: setup.php:55
+#: setup/abstractdatabase.php:22
 #, php-format
 msgid "%s enter the database username."
 msgstr "%s insira o nome de usuário do banco de dados."
 
-#: setup.php:58
+#: setup/abstractdatabase.php:25
 #, php-format
 msgid "%s enter the database name."
 msgstr "%s insira o nome do banco de dados."
 
-#: setup.php:61
+#: setup/abstractdatabase.php:28
 #, php-format
 msgid "%s you may not use dots in the database name"
 msgstr "%s você não pode usar pontos no nome do banco de dados"
 
-#: setup.php:64
+#: setup/mssql.php:20
 #, php-format
-msgid "%s set the database host."
-msgstr "%s defina o host do banco de dados."
-
-#: setup.php:126 setup.php:332 setup.php:377
-msgid "PostgreSQL username and/or password not valid"
-msgstr "Nome de usuário e/ou senha PostgreSQL inválido(s)"
+msgid "MS SQL username and/or password not valid: %s"
+msgstr "Nome de usuário e/ou senha MS SQL inválido(s): %s"
 
-#: setup.php:127 setup.php:235
+#: setup/mssql.php:21 setup/mysql.php:13 setup/oci.php:114
+#: setup/postgresql.php:24 setup/postgresql.php:70
 msgid "You need to enter either an existing account or the administrator."
 msgstr "Você precisa inserir uma conta existente ou o administrador."
 
-#: setup.php:152
-msgid "Oracle connection could not be established"
-msgstr "Conexão Oracle não pode ser estabelecida"
-
-#: setup.php:234
+#: setup/mysql.php:12
 msgid "MySQL username and/or password not valid"
 msgstr "Nome de usuário e/ou senha MySQL inválido(s)"
 
-#: setup.php:288 setup.php:398 setup.php:407 setup.php:425 setup.php:435
-#: setup.php:444 setup.php:477 setup.php:543 setup.php:569 setup.php:576
-#: setup.php:587 setup.php:594 setup.php:603 setup.php:611 setup.php:620
-#: setup.php:626
+#: setup/mysql.php:67 setup/oci.php:54 setup/oci.php:121 setup/oci.php:147
+#: setup/oci.php:154 setup/oci.php:165 setup/oci.php:172 setup/oci.php:181
+#: setup/oci.php:189 setup/oci.php:198 setup/oci.php:204
+#: setup/postgresql.php:89 setup/postgresql.php:98 setup/postgresql.php:115
+#: setup/postgresql.php:125 setup/postgresql.php:134
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr "Erro no BD: \"%s\""
 
-#: setup.php:289 setup.php:399 setup.php:408 setup.php:426 setup.php:436
-#: setup.php:445 setup.php:478 setup.php:544 setup.php:570 setup.php:577
-#: setup.php:588 setup.php:604 setup.php:612 setup.php:621
+#: setup/mysql.php:68 setup/oci.php:55 setup/oci.php:122 setup/oci.php:148
+#: setup/oci.php:155 setup/oci.php:166 setup/oci.php:182 setup/oci.php:190
+#: setup/oci.php:199 setup/postgresql.php:90 setup/postgresql.php:99
+#: setup/postgresql.php:116 setup/postgresql.php:126 setup/postgresql.php:135
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr "Comando ofensivo era: \"%s\""
 
-#: setup.php:305
+#: setup/mysql.php:85
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr "O usuário MySQL '%s'@'localhost' já existe."
 
-#: setup.php:306
+#: setup/mysql.php:86
 msgid "Drop this user from MySQL"
 msgstr "Derrubar este usuário do MySQL"
 
-#: setup.php:311
+#: setup/mysql.php:91
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr "Usuário MySQL '%s'@'%%' já existe"
 
-#: setup.php:312
+#: setup/mysql.php:92
 msgid "Drop this user from MySQL."
 msgstr "Derrube este usuário do MySQL."
 
-#: setup.php:469 setup.php:536
+#: setup/oci.php:34
+msgid "Oracle connection could not be established"
+msgstr "Conexão Oracle não pode ser estabelecida"
+
+#: setup/oci.php:41 setup/oci.php:113
 msgid "Oracle username and/or password not valid"
 msgstr "Nome de usuário e/ou senha Oracle inválido(s)"
 
-#: setup.php:595 setup.php:627
+#: setup/oci.php:173 setup/oci.php:205
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr "Comando ofensivo era: \"%s\", nome: %s, senha: %s"
 
-#: setup.php:647
-#, php-format
-msgid "MS SQL username and/or password not valid: %s"
-msgstr "Nome de usuário e/ou senha MS SQL inválido(s): %s"
+#: setup/postgresql.php:23 setup/postgresql.php:69
+msgid "PostgreSQL username and/or password not valid"
+msgstr "Nome de usuário e/ou senha PostgreSQL inválido(s)"
+
+#: setup.php:42
+msgid "Set an admin username."
+msgstr "Defina um nome de usuário de administrador."
+
+#: setup.php:45
+msgid "Set an admin password."
+msgstr "Defina uma senha de administrador."
 
-#: setup.php:870
+#: setup.php:198
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Seu servidor web não está configurado corretamente para permitir sincronização de arquivos porque a interface WebDAV parece estar quebrada."
 
-#: setup.php:871
+#: setup.php:199
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Por favor, confira os <a href='%s'>guias de instalação</a>."
diff --git a/l10n/pt_BR/settings.po b/l10n/pt_BR/settings.po
index 5caa4961bd22950ee3e08216dea37bb8c81a2528..ad994930b51f456c67d3b8486c92f308ca2960b8 100644
--- a/l10n/pt_BR/settings.po
+++ b/l10n/pt_BR/settings.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
-"Last-Translator: bjamalaro <bjamalaro@yahoo.com.br>\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -90,35 +90,35 @@ msgstr "Não foi possível remover usuário do grupo %s"
 msgid "Couldn't update app."
 msgstr "Não foi possível atualizar a app."
 
-#: js/apps.js:30
+#: js/apps.js:35
 msgid "Update to {appversion}"
 msgstr "Atualizar para {appversion}"
 
-#: js/apps.js:36 js/apps.js:76
+#: js/apps.js:41 js/apps.js:81
 msgid "Disable"
 msgstr "Desabilitar"
 
-#: js/apps.js:36 js/apps.js:64 js/apps.js:83
+#: js/apps.js:41 js/apps.js:69 js/apps.js:88
 msgid "Enable"
 msgstr "Habilitar"
 
-#: js/apps.js:55
+#: js/apps.js:60
 msgid "Please wait...."
 msgstr "Por favor, aguarde..."
 
-#: js/apps.js:59 js/apps.js:71 js/apps.js:80 js/apps.js:93
+#: js/apps.js:64 js/apps.js:76 js/apps.js:85 js/apps.js:98
 msgid "Error"
 msgstr "Erro"
 
-#: js/apps.js:90
+#: js/apps.js:95
 msgid "Updating...."
 msgstr "Atualizando..."
 
-#: js/apps.js:93
+#: js/apps.js:98
 msgid "Error while updating app"
 msgstr "Erro ao atualizar aplicativo"
 
-#: js/apps.js:96
+#: js/apps.js:101
 msgid "Updated"
 msgstr "Atualizado"
 
@@ -167,15 +167,15 @@ msgstr "Erro ao criar usuário"
 msgid "A valid password must be provided"
 msgstr "Forneça uma senha válida"
 
-#: personal.php:35 personal.php:36
+#: personal.php:37 personal.php:38
 msgid "__language_name__"
 msgstr "Português (Brasil)"
 
-#: templates/admin.php:15
+#: templates/admin.php:17
 msgid "Security Warning"
 msgstr "Aviso de Segurança"
 
-#: templates/admin.php:18
+#: templates/admin.php:20
 msgid ""
 "Your data directory and your files are probably accessible from the "
 "internet. The .htaccess file that ownCloud provides is not working. We "
@@ -184,36 +184,36 @@ msgid ""
 " webserver document root."
 msgstr "Seu diretório de dados e seus arquivos estão, provavelmente, acessíveis a partir da internet. O .htaccess que o ownCloud fornece não está funcionando. Nós sugerimos que você configure o seu servidor web de uma forma que o diretório de dados esteja mais acessível ou que você mova o diretório de dados para fora da raiz do servidor web."
 
-#: templates/admin.php:29
+#: templates/admin.php:31
 msgid "Setup Warning"
 msgstr "Aviso de Configuração"
 
-#: templates/admin.php:32
+#: templates/admin.php:34
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Seu servidor web não está configurado corretamente para permitir sincronização de arquivos porque a interface WebDAV parece não estar funcionando."
 
-#: templates/admin.php:33
+#: templates/admin.php:35
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Por favor, confira o <a href='%s'>guia de instalação</a>."
 
-#: templates/admin.php:44
+#: templates/admin.php:46
 msgid "Module 'fileinfo' missing"
 msgstr "Módulo 'fileinfo' faltando"
 
-#: templates/admin.php:47
+#: templates/admin.php:49
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr "O módulo PHP 'fileinfo' está faltando. Recomendamos que ative este módulo para obter uma melhor detecção do tipo de mídia (mime-type)."
 
-#: templates/admin.php:58
+#: templates/admin.php:60
 msgid "Locale not working"
 msgstr "Localização não funcionando"
 
-#: templates/admin.php:63
+#: templates/admin.php:65
 #, php-format
 msgid ""
 "This ownCloud server can't set system locale to %s. This means that there "
@@ -221,11 +221,11 @@ msgid ""
 " to install the required packages on your system to support %s."
 msgstr "Este servidor ownCloud não pode configurar a localização do sistema para %s.  Isto significa que pode haver problema com alguns caracteres nos nomes de arquivos.  Nós recomendamos fortemente que você instale os pacotes requeridos em seu sistema para suportar %s."
 
-#: templates/admin.php:75
+#: templates/admin.php:77
 msgid "Internet connection not working"
 msgstr "Sem conexão com a internet"
 
-#: templates/admin.php:78
+#: templates/admin.php:80
 msgid ""
 "This ownCloud server has no working internet connection. This means that "
 "some of the features like mounting of external storage, notifications about "
@@ -235,102 +235,102 @@ msgid ""
 " of ownCloud."
 msgstr "Este servidor ownCloud não tem conexão com a internet. Isto significa que alguns dos recursos como montar armazenamento externo, notificar atualizações ou instalar aplicativos de terceiros não funcionam. Acesso remoto a arquivos e envio de e-mails de notificação podem também não funcionar. Sugerimos que habilite a conexão com a internet neste servidor se quiser usufruir de todos os recursos do ownCloud."
 
-#: templates/admin.php:92
+#: templates/admin.php:94
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:101
+#: templates/admin.php:103
 msgid "Execute one task with each page loaded"
 msgstr "Execute uma tarefa com cada página carregada"
 
-#: templates/admin.php:111
+#: templates/admin.php:113
 msgid ""
 "cron.php is registered at a webcron service. Call the cron.php page in the "
 "owncloud root once a minute over http."
 msgstr "cron.php está registrado no serviço webcron. Chame a página cron.php na raíz do owncloud a cada minuto por http."
 
-#: templates/admin.php:121
+#: templates/admin.php:123
 msgid ""
 "Use systems cron service. Call the cron.php file in the owncloud folder via "
 "a system cronjob once a minute."
 msgstr "Usar serviço de cron do sistema. Chama o arquivo cron.php na pasta owncloud via cronjob do sistema a cada minuto."
 
-#: templates/admin.php:128
+#: templates/admin.php:130
 msgid "Sharing"
 msgstr "Compartilhamento"
 
-#: templates/admin.php:134
+#: templates/admin.php:136
 msgid "Enable Share API"
 msgstr "Habilitar API de Compartilhamento"
 
-#: templates/admin.php:135
+#: templates/admin.php:137
 msgid "Allow apps to use the Share API"
 msgstr "Permitir que aplicativos usem a API de Compartilhamento"
 
-#: templates/admin.php:142
+#: templates/admin.php:144
 msgid "Allow links"
 msgstr "Permitir links"
 
-#: templates/admin.php:143
+#: templates/admin.php:145
 msgid "Allow users to share items to the public with links"
 msgstr "Permitir que usuários compartilhem itens com o público usando links"
 
-#: templates/admin.php:150
+#: templates/admin.php:152
 msgid "Allow resharing"
 msgstr "Permitir recompartilhamento"
 
-#: templates/admin.php:151
+#: templates/admin.php:153
 msgid "Allow users to share items shared with them again"
 msgstr "Permitir que usuários compartilhem novamente itens compartilhados com eles"
 
-#: templates/admin.php:158
+#: templates/admin.php:160
 msgid "Allow users to share with anyone"
 msgstr "Permitir que usuários compartilhem com qualquer um"
 
-#: templates/admin.php:161
+#: templates/admin.php:163
 msgid "Allow users to only share with users in their groups"
 msgstr "Permitir que usuários compartilhem somente com usuários em seus grupos"
 
-#: templates/admin.php:168
+#: templates/admin.php:170
 msgid "Security"
 msgstr "Segurança"
 
-#: templates/admin.php:181
+#: templates/admin.php:183
 msgid "Enforce HTTPS"
 msgstr "Forçar HTTPS"
 
-#: templates/admin.php:182
+#: templates/admin.php:184
 msgid ""
 "Enforces the clients to connect to ownCloud via an encrypted connection."
 msgstr "Força o cliente a conectar-se ao ownCloud por uma conexão criptografada."
 
-#: templates/admin.php:185
+#: templates/admin.php:187
 msgid ""
 "Please connect to this ownCloud instance via HTTPS to enable or disable the "
 "SSL enforcement."
 msgstr "Por favor, conecte-se a esta instância do ownCloud via HTTPS para habilitar ou desabilitar 'Forçar SSL'."
 
-#: templates/admin.php:195
+#: templates/admin.php:197
 msgid "Log"
 msgstr "Registro"
 
-#: templates/admin.php:196
+#: templates/admin.php:198
 msgid "Log level"
 msgstr "Nível de registro"
 
-#: templates/admin.php:227
+#: templates/admin.php:229
 msgid "More"
 msgstr "Mais"
 
-#: templates/admin.php:228
+#: templates/admin.php:230
 msgid "Less"
 msgstr "Menos"
 
-#: templates/admin.php:235 templates/personal.php:116
+#: templates/admin.php:236 templates/personal.php:116
 msgid "Version"
 msgstr "Versão"
 
-#: templates/admin.php:237 templates/personal.php:119
+#: templates/admin.php:240 templates/personal.php:119
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -388,76 +388,79 @@ msgstr "Rastreador de Bugs"
 msgid "Commercial Support"
 msgstr "Suporte Comercial"
 
-#: templates/personal.php:9
+#: templates/personal.php:10
 msgid "Get the apps to sync your files"
 msgstr "Faça com que os apps sincronize seus arquivos"
 
-#: templates/personal.php:20
+#: templates/personal.php:21
 msgid "Show First Run Wizard again"
 msgstr "Mostrar este Assistente de novo"
 
-#: templates/personal.php:28
+#: templates/personal.php:29
 #, php-format
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "Você usou <strong>%s</strong> do seu espaço de <strong>%s</strong>"
 
-#: templates/personal.php:40 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:41 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "Senha"
 
-#: templates/personal.php:41
+#: templates/personal.php:42
 msgid "Your password was changed"
 msgstr "Sua senha foi alterada"
 
-#: templates/personal.php:42
+#: templates/personal.php:43
 msgid "Unable to change your password"
 msgstr "Não é possivel alterar a sua senha"
 
-#: templates/personal.php:43
+#: templates/personal.php:44
 msgid "Current password"
 msgstr "Senha atual"
 
-#: templates/personal.php:45
+#: templates/personal.php:46
 msgid "New password"
 msgstr "Nova senha"
 
-#: templates/personal.php:47
+#: templates/personal.php:48
 msgid "Change password"
 msgstr "Alterar senha"
 
-#: templates/personal.php:59 templates/users.php:85
+#: templates/personal.php:60 templates/users.php:85
 msgid "Display Name"
 msgstr "Nome de Exibição"
 
-#: templates/personal.php:74
+#: templates/personal.php:75
 msgid "Email"
 msgstr "E-mail"
 
-#: templates/personal.php:76
+#: templates/personal.php:77
 msgid "Your email address"
 msgstr "Seu endereço de e-mail"
 
-#: templates/personal.php:77
+#: templates/personal.php:78
 msgid "Fill in an email address to enable password recovery"
 msgstr "Preencha um endereço de e-mail para habilitar a recuperação de senha"
 
-#: templates/personal.php:86 templates/personal.php:87
+#: templates/personal.php:87 templates/personal.php:88
 msgid "Language"
 msgstr "Idioma"
 
-#: templates/personal.php:99
+#: templates/personal.php:100
 msgid "Help translate"
 msgstr "Ajude a traduzir"
 
-#: templates/personal.php:105
+#: templates/personal.php:106
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:107
-msgid "Use this address to connect to your ownCloud in your file manager"
-msgstr "Usar este endereço para conectar-se ao seu ownCloud no seu gerenciador de arquivos"
+#: templates/personal.php:108
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
+"target=\"_blank\">access your Files via WebDAV</a>"
+msgstr ""
 
-#: templates/users.php:21 templates/users.php:84
+#: templates/users.php:21
 msgid "Login Name"
 msgstr "Nome de Login"
 
@@ -487,6 +490,10 @@ msgstr "Ilimitado"
 msgid "Other"
 msgstr "Outro"
 
+#: templates/users.php:84
+msgid "Username"
+msgstr "Nome de Usuário"
+
 #: templates/users.php:91
 msgid "Storage"
 msgstr "Armazenamento"
diff --git a/l10n/pt_BR/user_ldap.po b/l10n/pt_BR/user_ldap.po
index f4a891cfce78afe78f3f4aece2c87e20aba5ef1d..3c7f045fcd083d32c593a36d4d707a9599b54b61 100644
--- a/l10n/pt_BR/user_ldap.po
+++ b/l10n/pt_BR/user_ldap.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:25+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:16+0000\n"
 "Last-Translator: Flávio Veras <flaviove@gmail.com>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/pt_BR/user_webdavauth.po b/l10n/pt_BR/user_webdavauth.po
index 0b37738524a3d4cab8fec05ff1187c90094ad012..c62680557cd8b348da5f9ef6b88faa1297790fae 100644
--- a/l10n/pt_BR/user_webdavauth.po
+++ b/l10n/pt_BR/user_webdavauth.po
@@ -3,15 +3,16 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# bjamalaro <bjamalaro@yahoo.com.br>, 2013
 # Rodrigo Tavares <rodrigo.st23@hotmail.com>, 2013
 # thoriumbr <thoriumbr@gmail.com>, 2012
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-15 01:59+0200\n"
-"PO-Revision-Date: 2013-06-15 00:00+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-06-21 08:49+0200\n"
+"PO-Revision-Date: 2013-06-20 21:50+0000\n"
+"Last-Translator: bjamalaro <bjamalaro@yahoo.com.br>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -25,7 +26,7 @@ msgstr "Autenticação WebDAV"
 
 #: templates/settings.php:4
 msgid "URL: "
-msgstr ""
+msgstr "URL:"
 
 #: templates/settings.php:7
 msgid ""
diff --git a/l10n/pt_PT/core.po b/l10n/pt_PT/core.po
index 3fa25d8d116fd219916fee7bcffc295157907c24..202cd1360a96f43b0b8f4b7b973ea525911356e5 100644
--- a/l10n/pt_PT/core.po
+++ b/l10n/pt_PT/core.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:22+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:14+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
 "MIME-Version: 1.0\n"
@@ -63,135 +63,135 @@ msgstr "Nenhuma categoria seleccionada para eliminar."
 msgid "Error removing %s from favorites."
 msgstr "Erro a remover %s dos favoritos."
 
-#: js/config.php:34
+#: js/config.php:32
 msgid "Sunday"
 msgstr "Domingo"
 
-#: js/config.php:35
+#: js/config.php:33
 msgid "Monday"
 msgstr "Segunda"
 
-#: js/config.php:36
+#: js/config.php:34
 msgid "Tuesday"
 msgstr "Terça"
 
-#: js/config.php:37
+#: js/config.php:35
 msgid "Wednesday"
 msgstr "Quarta"
 
-#: js/config.php:38
+#: js/config.php:36
 msgid "Thursday"
 msgstr "Quinta"
 
-#: js/config.php:39
+#: js/config.php:37
 msgid "Friday"
 msgstr "Sexta"
 
-#: js/config.php:40
+#: js/config.php:38
 msgid "Saturday"
 msgstr "Sábado"
 
-#: js/config.php:45
+#: js/config.php:43
 msgid "January"
 msgstr "Janeiro"
 
-#: js/config.php:46
+#: js/config.php:44
 msgid "February"
 msgstr "Fevereiro"
 
-#: js/config.php:47
+#: js/config.php:45
 msgid "March"
 msgstr "Março"
 
-#: js/config.php:48
+#: js/config.php:46
 msgid "April"
 msgstr "Abril"
 
-#: js/config.php:49
+#: js/config.php:47
 msgid "May"
 msgstr "Maio"
 
-#: js/config.php:50
+#: js/config.php:48
 msgid "June"
 msgstr "Junho"
 
-#: js/config.php:51
+#: js/config.php:49
 msgid "July"
 msgstr "Julho"
 
-#: js/config.php:52
+#: js/config.php:50
 msgid "August"
 msgstr "Agosto"
 
-#: js/config.php:53
+#: js/config.php:51
 msgid "September"
 msgstr "Setembro"
 
-#: js/config.php:54
+#: js/config.php:52
 msgid "October"
 msgstr "Outubro"
 
-#: js/config.php:55
+#: js/config.php:53
 msgid "November"
 msgstr "Novembro"
 
-#: js/config.php:56
+#: js/config.php:54
 msgid "December"
 msgstr "Dezembro"
 
-#: js/js.js:286
+#: js/js.js:293
 msgid "Settings"
 msgstr "Configurações"
 
-#: js/js.js:718
+#: js/js.js:725
 msgid "seconds ago"
 msgstr "Minutos atrás"
 
-#: js/js.js:719
+#: js/js.js:726
 msgid "1 minute ago"
 msgstr "Há 1 minuto"
 
-#: js/js.js:720
+#: js/js.js:727
 msgid "{minutes} minutes ago"
 msgstr "{minutes} minutos atrás"
 
-#: js/js.js:721
+#: js/js.js:728
 msgid "1 hour ago"
 msgstr "Há 1 horas"
 
-#: js/js.js:722
+#: js/js.js:729
 msgid "{hours} hours ago"
 msgstr "Há {hours} horas atrás"
 
-#: js/js.js:723
+#: js/js.js:730
 msgid "today"
 msgstr "hoje"
 
-#: js/js.js:724
+#: js/js.js:731
 msgid "yesterday"
 msgstr "ontem"
 
-#: js/js.js:725
+#: js/js.js:732
 msgid "{days} days ago"
 msgstr "{days} dias atrás"
 
-#: js/js.js:726
+#: js/js.js:733
 msgid "last month"
 msgstr "ultímo mês"
 
-#: js/js.js:727
+#: js/js.js:734
 msgid "{months} months ago"
 msgstr "Há {months} meses atrás"
 
-#: js/js.js:728
+#: js/js.js:735
 msgid "months ago"
 msgstr "meses atrás"
 
-#: js/js.js:729
+#: js/js.js:736
 msgid "last year"
 msgstr "ano passado"
 
-#: js/js.js:730
+#: js/js.js:737
 msgid "years ago"
 msgstr "anos atrás"
 
@@ -227,8 +227,8 @@ msgstr "O tipo de objecto não foi especificado"
 #: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
 #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:577
-#: js/share.js:589
+#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:620
+#: js/share.js:632
 msgid "Error"
 msgstr "Erro"
 
@@ -248,7 +248,7 @@ msgstr "Partilhado"
 msgid "Share"
 msgstr "Partilhar"
 
-#: js/share.js:125 js/share.js:617
+#: js/share.js:125 js/share.js:660
 msgid "Error while sharing"
 msgstr "Erro ao partilhar"
 
@@ -268,99 +268,103 @@ msgstr "Partilhado consigo e com o grupo {group} por {owner}"
 msgid "Shared with you by {owner}"
 msgstr "Partilhado consigo por {owner}"
 
-#: js/share.js:159
+#: js/share.js:172
 msgid "Share with"
 msgstr "Partilhar com"
 
-#: js/share.js:164
+#: js/share.js:177
 msgid "Share with link"
 msgstr "Partilhar com link"
 
-#: js/share.js:167
+#: js/share.js:180
 msgid "Password protect"
 msgstr "Proteger com palavra-passe"
 
-#: js/share.js:169 templates/installation.php:54 templates/login.php:26
+#: js/share.js:182 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "Password"
 
-#: js/share.js:173
+#: js/share.js:187
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:191
 msgid "Email link to person"
 msgstr "Enviar o link por e-mail"
 
-#: js/share.js:174
+#: js/share.js:192
 msgid "Send"
 msgstr "Enviar"
 
-#: js/share.js:178
+#: js/share.js:197
 msgid "Set expiration date"
 msgstr "Especificar data de expiração"
 
-#: js/share.js:179
+#: js/share.js:198
 msgid "Expiration date"
 msgstr "Data de expiração"
 
-#: js/share.js:211
+#: js/share.js:230
 msgid "Share via email:"
 msgstr "Partilhar via email:"
 
-#: js/share.js:213
+#: js/share.js:232
 msgid "No people found"
 msgstr "Não foi encontrado ninguém"
 
-#: js/share.js:251
+#: js/share.js:270
 msgid "Resharing is not allowed"
 msgstr "Não é permitido partilhar de novo"
 
-#: js/share.js:287
+#: js/share.js:306
 msgid "Shared in {item} with {user}"
 msgstr "Partilhado em {item} com {user}"
 
-#: js/share.js:308
+#: js/share.js:327
 msgid "Unshare"
 msgstr "Deixar de partilhar"
 
-#: js/share.js:320
+#: js/share.js:339
 msgid "can edit"
 msgstr "pode editar"
 
-#: js/share.js:322
+#: js/share.js:341
 msgid "access control"
 msgstr "Controlo de acesso"
 
-#: js/share.js:325
+#: js/share.js:344
 msgid "create"
 msgstr "criar"
 
-#: js/share.js:328
+#: js/share.js:347
 msgid "update"
 msgstr "actualizar"
 
-#: js/share.js:331
+#: js/share.js:350
 msgid "delete"
 msgstr "apagar"
 
-#: js/share.js:334
+#: js/share.js:353
 msgid "share"
 msgstr "partilhar"
 
-#: js/share.js:368 js/share.js:564
+#: js/share.js:387 js/share.js:607
 msgid "Password protected"
 msgstr "Protegido com palavra-passe"
 
-#: js/share.js:577
+#: js/share.js:620
 msgid "Error unsetting expiration date"
 msgstr "Erro ao retirar a data de expiração"
 
-#: js/share.js:589
+#: js/share.js:632
 msgid "Error setting expiration date"
 msgstr "Erro ao aplicar a data de expiração"
 
-#: js/share.js:604
+#: js/share.js:647
 msgid "Sending ..."
 msgstr "A Enviar..."
 
-#: js/share.js:615
+#: js/share.js:658
 msgid "Email sent"
 msgstr "E-mail enviado"
 
@@ -375,7 +379,7 @@ msgstr "A actualização falhou. Por favor reporte este incidente seguindo este
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "A actualização foi concluída com sucesso. Vai ser redireccionado para o ownCloud agora."
 
-#: lostpassword/controller.php:58
+#: lostpassword/controller.php:60
 msgid "ownCloud password reset"
 msgstr "Reposição da password ownCloud"
 
@@ -405,17 +409,17 @@ msgstr "Nome de utilizador"
 
 #: lostpassword/templates/lostpassword.php:22
 msgid ""
-"Your files seems to be encrypted. If you didn't have enabled the recovery "
-"key there will be no way to get your data back once the password was "
-"resetted. If you are not sure what to do, please contact your administrator "
-"first before continue. Do you really want to continue?"
+"Your files are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
 msgstr ""
 
 #: lostpassword/templates/lostpassword.php:24
 msgid "Yes, I really want to reset my password now"
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:29
+#: lostpassword/templates/lostpassword.php:27
 msgid "Request reset"
 msgstr "Pedir reposição"
 
@@ -463,7 +467,7 @@ msgstr "Acesso interdito"
 msgid "Cloud not found"
 msgstr "Cloud nao encontrada"
 
-#: templates/altmail.php:2
+#: templates/altmail.php:4
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -474,10 +478,6 @@ msgid ""
 "Cheers!"
 msgstr ""
 
-#: templates/altmail.php:7 templates/mail.php:24
-msgid "web services under your control"
-msgstr "serviços web sob o seu controlo"
-
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
 msgstr "Editar categorias"
@@ -570,12 +570,12 @@ msgstr "Anfitrião da base de dados"
 msgid "Finish setup"
 msgstr "Acabar instalação"
 
-#: templates/layout.user.php:40
+#: templates/layout.user.php:43
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr "%s está disponível. Tenha mais informações como actualizar."
 
-#: templates/layout.user.php:67
+#: templates/layout.user.php:68
 msgid "Log out"
 msgstr "Sair"
 
@@ -609,7 +609,7 @@ msgstr "Entrar"
 msgid "Alternative Logins"
 msgstr "Contas de acesso alternativas"
 
-#: templates/mail.php:15
+#: templates/mail.php:16
 #, php-format
 msgid ""
 "Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
diff --git a/l10n/pt_PT/files.po b/l10n/pt_PT/files.po
index 3dea965f39009b032a62d10874fc80f64cc80a35..082b3e88c764705127a986490618e5f7d0a404e5 100644
--- a/l10n/pt_PT/files.po
+++ b/l10n/pt_PT/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-06-17 02:01+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
-"Last-Translator: bmgmatias <bmgmatias@gmail.com>\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -28,46 +28,54 @@ msgstr "Não foi possível mover o ficheiro %s - Já existe um ficheiro com esse
 msgid "Could not move %s"
 msgstr "Não foi possível move o ficheiro %s"
 
-#: ajax/upload.php:19
+#: ajax/upload.php:16 ajax/upload.php:45
+msgid "Unable to set upload directory."
+msgstr ""
+
+#: ajax/upload.php:22
+msgid "Invalid Token"
+msgstr ""
+
+#: ajax/upload.php:59
 msgid "No file was uploaded. Unknown error"
 msgstr "Nenhum ficheiro foi carregado. Erro desconhecido"
 
-#: ajax/upload.php:26
+#: ajax/upload.php:66
 msgid "There is no error, the file uploaded with success"
 msgstr "Não ocorreram erros, o ficheiro foi submetido com sucesso"
 
-#: ajax/upload.php:27
+#: ajax/upload.php:67
 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:29
+#: ajax/upload.php:69
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "O tamanho do ficheiro carregado ultrapassa o valor MAX_FILE_SIZE definido no formulário HTML"
 
-#: ajax/upload.php:30
+#: ajax/upload.php:70
 msgid "The uploaded file was only partially uploaded"
 msgstr "O ficheiro seleccionado foi apenas carregado parcialmente"
 
-#: ajax/upload.php:31
+#: ajax/upload.php:71
 msgid "No file was uploaded"
 msgstr "Nenhum ficheiro foi submetido"
 
-#: ajax/upload.php:32
+#: ajax/upload.php:72
 msgid "Missing a temporary folder"
 msgstr "Está a faltar a pasta temporária"
 
-#: ajax/upload.php:33
+#: ajax/upload.php:73
 msgid "Failed to write to disk"
 msgstr "Falhou a escrita no disco"
 
-#: ajax/upload.php:51
+#: ajax/upload.php:91
 msgid "Not enough storage available"
 msgstr "Não há espaço suficiente em disco"
 
-#: ajax/upload.php:83
+#: ajax/upload.php:123
 msgid "Invalid directory."
 msgstr "Directório Inválido"
 
@@ -75,6 +83,36 @@ msgstr "Directório Inválido"
 msgid "Files"
 msgstr "Ficheiros"
 
+#: js/file-upload.js:11
+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/file-upload.js:24
+msgid "Not enough space available"
+msgstr "Espaço em disco insuficiente!"
+
+#: js/file-upload.js:64
+msgid "Upload cancelled."
+msgstr "Envio cancelado."
+
+#: js/file-upload.js:167 js/files.js:266
+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/file-upload.js:233 js/files.js:339
+msgid "URL cannot be empty."
+msgstr "O URL não pode estar vazio."
+
+#: js/file-upload.js:238 lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr "Nome da pasta inválido. Palavra 'Shared' é reservado pela ownCloud"
+
+#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
+#: js/files.js:693 js/files.js:731
+msgid "Error"
+msgstr "Erro"
+
 #: js/fileactions.js:116
 msgid "Share"
 msgstr "Partilhar"
@@ -91,43 +129,43 @@ msgstr "Eliminar"
 msgid "Rename"
 msgstr "Renomear"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:464
 msgid "Pending"
 msgstr "Pendente"
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "{new_name} already exists"
 msgstr "O nome {new_name} já existe"
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "replace"
 msgstr "substituir"
 
-#: js/filelist.js:259
+#: js/filelist.js:302
 msgid "suggest name"
 msgstr "sugira um nome"
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "cancel"
 msgstr "cancelar"
 
-#: js/filelist.js:306
+#: js/filelist.js:349
 msgid "replaced {new_name} with {old_name}"
 msgstr "substituido {new_name} por {old_name}"
 
-#: js/filelist.js:306
+#: js/filelist.js:349
 msgid "undo"
 msgstr "desfazer"
 
-#: js/filelist.js:331
+#: js/filelist.js:374
 msgid "perform delete operation"
 msgstr "Executar a tarefa de apagar"
 
-#: js/filelist.js:413
+#: js/filelist.js:456
 msgid "1 file uploading"
 msgstr "A enviar 1 ficheiro"
 
-#: js/filelist.js:416 js/filelist.js:470
+#: js/filelist.js:459 js/filelist.js:517
 msgid "files uploading"
 msgstr "A enviar os ficheiros"
 
@@ -159,70 +197,42 @@ msgid ""
 "big."
 msgstr "O seu download está a ser preparado. Este processo pode demorar algum tempo se os ficheiros forem grandes."
 
-#: js/files.js:264
-msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "Não é possível fazer o envio do ficheiro devido a ser uma pasta ou ter 0 bytes"
-
-#: js/files.js:277
-msgid "Not enough space available"
-msgstr "Espaço em disco insuficiente!"
-
-#: js/files.js:317
-msgid "Upload cancelled."
-msgstr "Envio cancelado."
-
-#: js/files.js:413
-msgid ""
-"File upload is in progress. Leaving the page now will cancel the upload."
-msgstr "Envio de ficheiro em progresso. Irá cancelar o envio se sair da página agora."
-
-#: js/files.js:486
-msgid "URL cannot be empty."
-msgstr "O URL não pode estar vazio."
-
-#: js/files.js:491
+#: js/files.js:344
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Nome de pasta inválido. O Uso de 'shared' é reservado para o ownCloud"
 
-#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
-msgid "Error"
-msgstr "Erro"
-
-#: js/files.js:877 templates/index.php:69
+#: js/files.js:744 templates/index.php:69
 msgid "Name"
 msgstr "Nome"
 
-#: js/files.js:878 templates/index.php:80
+#: js/files.js:745 templates/index.php:80
 msgid "Size"
 msgstr "Tamanho"
 
-#: js/files.js:879 templates/index.php:82
+#: js/files.js:746 templates/index.php:82
 msgid "Modified"
 msgstr "Modificado"
 
-#: js/files.js:898
+#: js/files.js:765
 msgid "1 folder"
 msgstr "1 pasta"
 
-#: js/files.js:900
+#: js/files.js:767
 msgid "{count} folders"
 msgstr "{count} pastas"
 
-#: js/files.js:908
+#: js/files.js:775
 msgid "1 file"
 msgstr "1 ficheiro"
 
-#: js/files.js:910
+#: js/files.js:777
 msgid "{count} files"
 msgstr "{count} ficheiros"
 
-#: lib/app.php:53
-msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
-msgstr "Nome da pasta inválido. Palavra 'Shared' é reservado pela ownCloud"
-
 #: lib/app.php:73
-msgid "Unable to rename file"
-msgstr "Não foi possível renomear o ficheiro"
+#, php-format
+msgid "%s could not be renamed"
+msgstr ""
 
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
@@ -318,6 +328,22 @@ msgstr "Os ficheiros estão a ser analisados, por favor aguarde."
 msgid "Current scanning"
 msgstr "Análise actual"
 
+#: templates/part.list.php:76
+msgid "directory"
+msgstr ""
+
+#: templates/part.list.php:78
+msgid "directories"
+msgstr ""
+
+#: templates/part.list.php:87
+msgid "file"
+msgstr "ficheiro"
+
+#: templates/part.list.php:89
+msgid "files"
+msgstr "ficheiros"
+
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
 msgstr "Atualizar cache do sistema de ficheiros..."
diff --git a/l10n/pt_PT/files_encryption.po b/l10n/pt_PT/files_encryption.po
index 235135a664db83092a3f2c7b34062022f7eeaf81..7ad79e88e85db96adbaa8c8b1016e83fa57328db 100644
--- a/l10n/pt_PT/files_encryption.po
+++ b/l10n/pt_PT/files_encryption.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-14 02:46+0200\n"
-"PO-Revision-Date: 2013-06-14 00:47+0000\n"
+"POT-Creation-Date: 2013-07-05 02:12+0200\n"
+"PO-Revision-Date: 2013-07-05 00:13+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"
@@ -57,9 +57,21 @@ msgstr ""
 
 #: files/error.php:7
 msgid ""
-"Your private key is not valid! Maybe your password was changed from outside."
-" You can update your private key password in your personal settings to "
-"regain access to your files"
+"Your private key is not valid! Likely your password was changed outside the "
+"ownCloud system (e.g. your corporate directory). You can update your private"
+" key password in your personal settings to recover access to your encrypted "
+"files."
+msgstr ""
+
+#: hooks/hooks.php:44
+msgid "Missing requirements."
+msgstr ""
+
+#: hooks/hooks.php:45
+msgid ""
+"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL "
+"PHP extension is enabled and configured properly. For now, the encryption "
+"app has been disabled."
 msgstr ""
 
 #: js/settings-admin.js:11
@@ -86,12 +98,12 @@ msgstr "Encriptação"
 
 #: templates/settings-admin.php:10
 msgid ""
-"Enable encryption passwords recovery key (allow sharing to recovery key):"
-msgstr "Activar a chave de recuperação das passwords de encriptação (permitir partilha da chave de recuperação):"
+"Enable recovery key (allow to recover users files in case of password loss):"
+msgstr ""
 
 #: templates/settings-admin.php:14
-msgid "Recovery account password"
-msgstr "Password de recuperação de conta"
+msgid "Recovery key password"
+msgstr ""
 
 #: templates/settings-admin.php:21 templates/settings-personal.php:54
 msgid "Enabled"
@@ -102,16 +114,16 @@ msgid "Disabled"
 msgstr "Desactivado"
 
 #: templates/settings-admin.php:34
-msgid "Change encryption passwords recovery key:"
-msgstr "Alterar a chave de recuperação da password de encriptação:"
+msgid "Change recovery key password:"
+msgstr ""
 
 #: templates/settings-admin.php:41
-msgid "Old Recovery account password"
-msgstr "Password de recuperação de conta antiga:"
+msgid "Old Recovery key password"
+msgstr ""
 
 #: templates/settings-admin.php:48
-msgid "New Recovery account password"
-msgstr "Nova password de recuperação de conta"
+msgid "New Recovery key password"
+msgstr ""
 
 #: templates/settings-admin.php:53
 msgid "Change Password"
diff --git a/l10n/pt_PT/files_external.po b/l10n/pt_PT/files_external.po
index b867812cd04c4ec19a76efb0a38fcb1fee79ef24..99be8a1b58192c578ca73dd4a04d07c3623d2480 100644
--- a/l10n/pt_PT/files_external.po
+++ b/l10n/pt_PT/files_external.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: Mouxy <daniel@mouxy.net>\n"
 "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/pt_PT/files_sharing.po b/l10n/pt_PT/files_sharing.po
index 81473e830433451ad6a0b99bbf97bdccebc60713..91edf213f0c3955f2035e864425d8859d55b7986 100644
--- a/l10n/pt_PT/files_sharing.po
+++ b/l10n/pt_PT/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
 "MIME-Version: 1.0\n"
@@ -18,27 +18,39 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: templates/authenticate.php:4
+msgid "The password is wrong. Try again."
+msgstr ""
+
+#: templates/authenticate.php:7
 msgid "Password"
 msgstr "Password"
 
-#: templates/authenticate.php:6
+#: templates/authenticate.php:9
 msgid "Submit"
 msgstr "Submeter"
 
-#: templates/public.php:10
+#: templates/public.php:17
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s partilhou a pasta %s consigo"
 
-#: templates/public.php:13
+#: templates/public.php:20
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s partilhou o ficheiro %s consigo"
 
-#: templates/public.php:19 templates/public.php:43
+#: templates/public.php:28 templates/public.php:90
 msgid "Download"
 msgstr "Transferir"
 
-#: templates/public.php:40
+#: templates/public.php:45 templates/public.php:48
+msgid "Upload"
+msgstr "Carregar"
+
+#: templates/public.php:58
+msgid "Cancel upload"
+msgstr "Cancelar envio"
+
+#: templates/public.php:87
 msgid "No preview available for"
 msgstr "Não há pré-visualização para"
diff --git a/l10n/pt_PT/files_trashbin.po b/l10n/pt_PT/files_trashbin.po
index f98670bd66973a3e4616cf06b6aeec0be09512c4..36fdeb2ee177cc429e28c758651455dc65b69f6c 100644
--- a/l10n/pt_PT/files_trashbin.po
+++ b/l10n/pt_PT/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:16+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/pt_PT/lib.po b/l10n/pt_PT/lib.po
index 2cca0274ec716e6469e246ad72f6932c73649e3d..2c0230768ba61266a82b3df7ee88adb6a2117d2c 100644
--- a/l10n/pt_PT/lib.po
+++ b/l10n/pt_PT/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-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
-"Last-Translator: Helder Meneses <helder.meneses@gmail.com>\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,43 +18,47 @@ msgstr ""
 "Language: pt_PT\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:359
+#: app.php:360
 msgid "Help"
 msgstr "Ajuda"
 
-#: app.php:372
+#: app.php:373
 msgid "Personal"
 msgstr "Pessoal"
 
-#: app.php:383
+#: app.php:384
 msgid "Settings"
 msgstr "Configurações"
 
-#: app.php:395
+#: app.php:396
 msgid "Users"
 msgstr "Utilizadores"
 
-#: app.php:408
+#: app.php:409
 msgid "Apps"
 msgstr "Aplicações"
 
-#: app.php:416
+#: app.php:417
 msgid "Admin"
 msgstr "Admin"
 
-#: files.php:210
+#: defaults.php:33
+msgid "web services under your control"
+msgstr "serviços web sob o seu controlo"
+
+#: files.php:226
 msgid "ZIP download is turned off."
 msgstr "Descarregamento em ZIP está desligado."
 
-#: files.php:211
+#: files.php:227
 msgid "Files need to be downloaded one by one."
 msgstr "Os ficheiros precisam de ser descarregados um por um."
 
-#: files.php:212 files.php:245
+#: files.php:228 files.php:261
 msgid "Back to Files"
 msgstr "Voltar a Ficheiros"
 
-#: files.php:242
+#: files.php:258
 msgid "Selected files too large to generate zip file."
 msgstr "Os ficheiros seleccionados são grandes demais para gerar um ficheiro zip."
 
@@ -86,104 +90,102 @@ msgstr "Texto"
 msgid "Images"
 msgstr "Imagens"
 
-#: setup.php:34
-msgid "Set an admin username."
-msgstr "Definir um nome de utilizador de administrador"
-
-#: setup.php:37
-msgid "Set an admin password."
-msgstr "Definiar uma password de administrador"
-
-#: setup.php:55
+#: setup/abstractdatabase.php:22
 #, php-format
 msgid "%s enter the database username."
 msgstr "%s introduza o nome de utilizador da base de dados"
 
-#: setup.php:58
+#: setup/abstractdatabase.php:25
 #, php-format
 msgid "%s enter the database name."
 msgstr "%s introduza o nome da base de dados"
 
-#: setup.php:61
+#: setup/abstractdatabase.php:28
 #, php-format
 msgid "%s you may not use dots in the database name"
 msgstr "%s não é permitido utilizar pontos (.) no nome da base de dados"
 
-#: setup.php:64
+#: setup/mssql.php:20
 #, php-format
-msgid "%s set the database host."
-msgstr "%s defina o servidor da base de dados (geralmente localhost)"
-
-#: setup.php:126 setup.php:332 setup.php:377
-msgid "PostgreSQL username and/or password not valid"
-msgstr "Nome de utilizador/password do PostgreSQL inválido"
+msgid "MS SQL username and/or password not valid: %s"
+msgstr "Nome de utilizador/password do MySQL é inválido: %s"
 
-#: setup.php:127 setup.php:235
+#: setup/mssql.php:21 setup/mysql.php:13 setup/oci.php:114
+#: setup/postgresql.php:24 setup/postgresql.php:70
 msgid "You need to enter either an existing account or the administrator."
 msgstr "Precisa de introduzir uma conta existente ou de administrador"
 
-#: setup.php:152
-msgid "Oracle connection could not be established"
-msgstr "Não foi possível estabelecer a ligação Oracle"
-
-#: setup.php:234
+#: setup/mysql.php:12
 msgid "MySQL username and/or password not valid"
 msgstr "Nome de utilizador/password do MySQL inválida"
 
-#: setup.php:288 setup.php:398 setup.php:407 setup.php:425 setup.php:435
-#: setup.php:444 setup.php:477 setup.php:543 setup.php:569 setup.php:576
-#: setup.php:587 setup.php:594 setup.php:603 setup.php:611 setup.php:620
-#: setup.php:626
+#: setup/mysql.php:67 setup/oci.php:54 setup/oci.php:121 setup/oci.php:147
+#: setup/oci.php:154 setup/oci.php:165 setup/oci.php:172 setup/oci.php:181
+#: setup/oci.php:189 setup/oci.php:198 setup/oci.php:204
+#: setup/postgresql.php:89 setup/postgresql.php:98 setup/postgresql.php:115
+#: setup/postgresql.php:125 setup/postgresql.php:134
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr "Erro na BD: \"%s\""
 
-#: setup.php:289 setup.php:399 setup.php:408 setup.php:426 setup.php:436
-#: setup.php:445 setup.php:478 setup.php:544 setup.php:570 setup.php:577
-#: setup.php:588 setup.php:604 setup.php:612 setup.php:621
+#: setup/mysql.php:68 setup/oci.php:55 setup/oci.php:122 setup/oci.php:148
+#: setup/oci.php:155 setup/oci.php:166 setup/oci.php:182 setup/oci.php:190
+#: setup/oci.php:199 setup/postgresql.php:90 setup/postgresql.php:99
+#: setup/postgresql.php:116 setup/postgresql.php:126 setup/postgresql.php:135
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr "O comando gerador de erro foi: \"%s\""
 
-#: setup.php:305
+#: setup/mysql.php:85
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr "O utilizador '%s'@'localhost' do MySQL já existe."
 
-#: setup.php:306
+#: setup/mysql.php:86
 msgid "Drop this user from MySQL"
 msgstr "Eliminar este utilizador do MySQL"
 
-#: setup.php:311
+#: setup/mysql.php:91
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr "O utilizador '%s'@'%%' do MySQL já existe"
 
-#: setup.php:312
+#: setup/mysql.php:92
 msgid "Drop this user from MySQL."
 msgstr "Eliminar este utilizador do MySQL"
 
-#: setup.php:469 setup.php:536
+#: setup/oci.php:34
+msgid "Oracle connection could not be established"
+msgstr "Não foi possível estabelecer a ligação Oracle"
+
+#: setup/oci.php:41 setup/oci.php:113
 msgid "Oracle username and/or password not valid"
 msgstr "Nome de utilizador/password do Oracle inválida"
 
-#: setup.php:595 setup.php:627
+#: setup/oci.php:173 setup/oci.php:205
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr "O comando gerador de erro foi: \"%s\", nome: %s, password: %s"
 
-#: setup.php:647
-#, php-format
-msgid "MS SQL username and/or password not valid: %s"
-msgstr "Nome de utilizador/password do MySQL é inválido: %s"
+#: setup/postgresql.php:23 setup/postgresql.php:69
+msgid "PostgreSQL username and/or password not valid"
+msgstr "Nome de utilizador/password do PostgreSQL inválido"
+
+#: setup.php:42
+msgid "Set an admin username."
+msgstr "Definir um nome de utilizador de administrador"
+
+#: setup.php:45
+msgid "Set an admin password."
+msgstr "Definiar uma password de administrador"
 
-#: setup.php:870
+#: setup.php:198
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "O seu servidor web não está configurado correctamente para autorizar sincronização de ficheiros, pois o interface WebDAV parece estar com problemas."
 
-#: setup.php:871
+#: setup.php:199
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Por favor verifique <a href='%s'>installation guides</a>."
diff --git a/l10n/pt_PT/settings.po b/l10n/pt_PT/settings.po
index a54d1599e77296c2bf61c10af158932e7fe7c208..018ea181f3c265445839464835bd4ee914508716 100644
--- a/l10n/pt_PT/settings.po
+++ b/l10n/pt_PT/settings.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
-"Last-Translator: Nelson Rosado <nelsontrosado@gmail.com>\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -91,35 +91,35 @@ msgstr "Impossível apagar utilizador do grupo %s"
 msgid "Couldn't update app."
 msgstr "Não foi possível actualizar a aplicação."
 
-#: js/apps.js:30
+#: js/apps.js:35
 msgid "Update to {appversion}"
 msgstr "Actualizar para a versão {appversion}"
 
-#: js/apps.js:36 js/apps.js:76
+#: js/apps.js:41 js/apps.js:81
 msgid "Disable"
 msgstr "Desactivar"
 
-#: js/apps.js:36 js/apps.js:64 js/apps.js:83
+#: js/apps.js:41 js/apps.js:69 js/apps.js:88
 msgid "Enable"
 msgstr "Activar"
 
-#: js/apps.js:55
+#: js/apps.js:60
 msgid "Please wait...."
 msgstr "Por favor aguarde..."
 
-#: js/apps.js:59 js/apps.js:71 js/apps.js:80 js/apps.js:93
+#: js/apps.js:64 js/apps.js:76 js/apps.js:85 js/apps.js:98
 msgid "Error"
 msgstr "Erro"
 
-#: js/apps.js:90
+#: js/apps.js:95
 msgid "Updating...."
 msgstr "A Actualizar..."
 
-#: js/apps.js:93
+#: js/apps.js:98
 msgid "Error while updating app"
 msgstr "Erro enquanto actualizava a aplicação"
 
-#: js/apps.js:96
+#: js/apps.js:101
 msgid "Updated"
 msgstr "Actualizado"
 
@@ -168,15 +168,15 @@ msgstr "Erro a criar utilizador"
 msgid "A valid password must be provided"
 msgstr "Uma password válida deve ser fornecida"
 
-#: personal.php:35 personal.php:36
+#: personal.php:37 personal.php:38
 msgid "__language_name__"
 msgstr "__language_name__"
 
-#: templates/admin.php:15
+#: templates/admin.php:17
 msgid "Security Warning"
 msgstr "Aviso de Segurança"
 
-#: templates/admin.php:18
+#: templates/admin.php:20
 msgid ""
 "Your data directory and your files are probably accessible from the "
 "internet. The .htaccess file that ownCloud provides is not working. We "
@@ -185,36 +185,36 @@ msgid ""
 " webserver document root."
 msgstr "A sua pasta com os dados e os seus ficheiros estão provavelmente acessíveis a partir das internet. Sugerimos veementemente que configure o seu servidor web de maneira a que a pasta com os dados deixe de ficar acessível, ou mova a pasta com os dados para fora da raiz de documentos do servidor web."
 
-#: templates/admin.php:29
+#: templates/admin.php:31
 msgid "Setup Warning"
 msgstr "Aviso de setup"
 
-#: templates/admin.php:32
+#: templates/admin.php:34
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "O seu servidor web não está configurado correctamente para autorizar sincronização de ficheiros, pois o interface WebDAV parece estar com problemas."
 
-#: templates/admin.php:33
+#: templates/admin.php:35
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Por favor verifique <a href='%s'>installation guides</a>."
 
-#: templates/admin.php:44
+#: templates/admin.php:46
 msgid "Module 'fileinfo' missing"
 msgstr "Falta o módulo 'fileinfo'"
 
-#: templates/admin.php:47
+#: templates/admin.php:49
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr "O Módulo PHP 'fileinfo' não se encontra instalado/activado. É fortemente recomendado que active este módulo para obter os melhores resultado com a detecção dos tipos de mime."
 
-#: templates/admin.php:58
+#: templates/admin.php:60
 msgid "Locale not working"
 msgstr "Internacionalização não está a funcionar"
 
-#: templates/admin.php:63
+#: templates/admin.php:65
 #, php-format
 msgid ""
 "This ownCloud server can't set system locale to %s. This means that there "
@@ -222,11 +222,11 @@ msgid ""
 " to install the required packages on your system to support %s."
 msgstr "Este servidor de ownCloud não consegue definir a codificação de caracteres para %s. Isto significa que pode haver problemas com alguns caracteres nos nomes dos ficheiros. É fortemente recomendado que instale o pacote recomendado para ser possível ver caracteres codificados em %s."
 
-#: templates/admin.php:75
+#: templates/admin.php:77
 msgid "Internet connection not working"
 msgstr "A ligação à internet não está a funcionar"
 
-#: templates/admin.php:78
+#: templates/admin.php:80
 msgid ""
 "This ownCloud server has no working internet connection. This means that "
 "some of the features like mounting of external storage, notifications about "
@@ -236,102 +236,102 @@ msgid ""
 " of ownCloud."
 msgstr "Este servidor ownCloud não tem uma ligação de internet funcional. Isto significa que algumas funcionalidades como o acesso a locais externos (dropbox, gdrive, etc), notificações sobre actualizções, ou a instalação de aplicações não irá funcionar. Sugerimos que active uma ligação à internet se pretende obter todas as funcionalidades do ownCloud."
 
-#: templates/admin.php:92
+#: templates/admin.php:94
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:101
+#: templates/admin.php:103
 msgid "Execute one task with each page loaded"
 msgstr "Executar uma tarefa com cada página carregada"
 
-#: templates/admin.php:111
+#: templates/admin.php:113
 msgid ""
 "cron.php is registered at a webcron service. Call the cron.php page in the "
 "owncloud root once a minute over http."
 msgstr "cron.php está registado como um serviço webcron. Aceda a pagina cron.php que se encontra na raiz do ownCloud uma vez por minuto utilizando o seu browser."
 
-#: templates/admin.php:121
+#: templates/admin.php:123
 msgid ""
 "Use systems cron service. Call the cron.php file in the owncloud folder via "
 "a system cronjob once a minute."
 msgstr "Usar o serviço cron do sistema. Aceda a pagina cron.php que se encontra na raiz do ownCloud uma vez por minuto utilizando o seu browser."
 
-#: templates/admin.php:128
+#: templates/admin.php:130
 msgid "Sharing"
 msgstr "Partilha"
 
-#: templates/admin.php:134
+#: templates/admin.php:136
 msgid "Enable Share API"
 msgstr "Activar a API de partilha"
 
-#: templates/admin.php:135
+#: templates/admin.php:137
 msgid "Allow apps to use the Share API"
 msgstr "Permitir que os utilizadores usem a API de partilha"
 
-#: templates/admin.php:142
+#: templates/admin.php:144
 msgid "Allow links"
 msgstr "Permitir links"
 
-#: templates/admin.php:143
+#: templates/admin.php:145
 msgid "Allow users to share items to the public with links"
 msgstr "Permitir que os utilizadores partilhem itens com o público utilizando um link."
 
-#: templates/admin.php:150
+#: templates/admin.php:152
 msgid "Allow resharing"
 msgstr "Permitir repartilha"
 
-#: templates/admin.php:151
+#: templates/admin.php:153
 msgid "Allow users to share items shared with them again"
 msgstr "Permitir que os utilizadores partilhem itens partilhados com eles"
 
-#: templates/admin.php:158
+#: templates/admin.php:160
 msgid "Allow users to share with anyone"
 msgstr "Permitir que os utilizadores partilhem com todos"
 
-#: templates/admin.php:161
+#: templates/admin.php:163
 msgid "Allow users to only share with users in their groups"
 msgstr "Permitir que os utilizadores partilhem somente com utilizadores do seu grupo"
 
-#: templates/admin.php:168
+#: templates/admin.php:170
 msgid "Security"
 msgstr "Segurança"
 
-#: templates/admin.php:181
+#: templates/admin.php:183
 msgid "Enforce HTTPS"
 msgstr "Forçar HTTPS"
 
-#: templates/admin.php:182
+#: templates/admin.php:184
 msgid ""
 "Enforces the clients to connect to ownCloud via an encrypted connection."
 msgstr "Forçar clientes a ligar através de uma ligação encriptada"
 
-#: templates/admin.php:185
+#: templates/admin.php:187
 msgid ""
 "Please connect to this ownCloud instance via HTTPS to enable or disable the "
 "SSL enforcement."
 msgstr "Por favor ligue-se ao ownCloud através de uma ligação HTTPS para ligar/desligar o forçar da ligação por SSL"
 
-#: templates/admin.php:195
+#: templates/admin.php:197
 msgid "Log"
 msgstr "Registo"
 
-#: templates/admin.php:196
+#: templates/admin.php:198
 msgid "Log level"
 msgstr "Nível do registo"
 
-#: templates/admin.php:227
+#: templates/admin.php:229
 msgid "More"
 msgstr "Mais"
 
-#: templates/admin.php:228
+#: templates/admin.php:230
 msgid "Less"
 msgstr "Menos"
 
-#: templates/admin.php:235 templates/personal.php:116
+#: templates/admin.php:236 templates/personal.php:116
 msgid "Version"
 msgstr "Versão"
 
-#: templates/admin.php:237 templates/personal.php:119
+#: templates/admin.php:240 templates/personal.php:119
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -389,76 +389,79 @@ msgstr "Bugtracker"
 msgid "Commercial Support"
 msgstr "Suporte Comercial"
 
-#: templates/personal.php:9
+#: templates/personal.php:10
 msgid "Get the apps to sync your files"
 msgstr "Obtenha as aplicações para sincronizar os seus ficheiros"
 
-#: templates/personal.php:20
+#: templates/personal.php:21
 msgid "Show First Run Wizard again"
 msgstr "Mostrar novamente Wizard de Arranque Inicial"
 
-#: templates/personal.php:28
+#: templates/personal.php:29
 #, php-format
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "Usou <strong>%s</strong> do disponivel <strong>%s</strong>"
 
-#: templates/personal.php:40 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:41 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "Password"
 
-#: templates/personal.php:41
+#: templates/personal.php:42
 msgid "Your password was changed"
 msgstr "A sua palavra-passe foi alterada"
 
-#: templates/personal.php:42
+#: templates/personal.php:43
 msgid "Unable to change your password"
 msgstr "Não foi possivel alterar a sua palavra-chave"
 
-#: templates/personal.php:43
+#: templates/personal.php:44
 msgid "Current password"
 msgstr "Palavra-chave actual"
 
-#: templates/personal.php:45
+#: templates/personal.php:46
 msgid "New password"
 msgstr "Nova palavra-chave"
 
-#: templates/personal.php:47
+#: templates/personal.php:48
 msgid "Change password"
 msgstr "Alterar palavra-chave"
 
-#: templates/personal.php:59 templates/users.php:85
+#: templates/personal.php:60 templates/users.php:85
 msgid "Display Name"
 msgstr "Nome público"
 
-#: templates/personal.php:74
+#: templates/personal.php:75
 msgid "Email"
 msgstr "Email"
 
-#: templates/personal.php:76
+#: templates/personal.php:77
 msgid "Your email address"
 msgstr "O seu endereço de email"
 
-#: templates/personal.php:77
+#: templates/personal.php:78
 msgid "Fill in an email address to enable password recovery"
 msgstr "Preencha com o seu endereço de email para ativar a recuperação da palavra-chave"
 
-#: templates/personal.php:86 templates/personal.php:87
+#: templates/personal.php:87 templates/personal.php:88
 msgid "Language"
 msgstr "Idioma"
 
-#: templates/personal.php:99
+#: templates/personal.php:100
 msgid "Help translate"
 msgstr "Ajude a traduzir"
 
-#: templates/personal.php:105
+#: templates/personal.php:106
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:107
-msgid "Use this address to connect to your ownCloud in your file manager"
-msgstr "Use este endereço no seu gestor de ficheiros para ligar à sua ownCloud"
+#: templates/personal.php:108
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
+"target=\"_blank\">access your Files via WebDAV</a>"
+msgstr ""
 
-#: templates/users.php:21 templates/users.php:84
+#: templates/users.php:21
 msgid "Login Name"
 msgstr "Nome de utilizador"
 
@@ -488,6 +491,10 @@ msgstr "Ilimitado"
 msgid "Other"
 msgstr "Outro"
 
+#: templates/users.php:84
+msgid "Username"
+msgstr "Nome de utilizador"
+
 #: templates/users.php:91
 msgid "Storage"
 msgstr "Armazenamento"
diff --git a/l10n/pt_PT/user_ldap.po b/l10n/pt_PT/user_ldap.po
index 3a79c47da02f8e3b994bf5a3fe65f6cfa26e443d..7c5410de9ffeeacff59907064b20cab26f4795ac 100644
--- a/l10n/pt_PT/user_ldap.po
+++ b/l10n/pt_PT/user_ldap.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:25+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:16+0000\n"
 "Last-Translator: Mouxy <daniel@mouxy.net>\n"
 "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/ro/core.po b/l10n/ro/core.po
index 703aa55f95bcc5e71c8d6827d6e912b399ab590a..17ba0eabf09eb7f81faded8f90aa6f329b33ac0b 100644
--- a/l10n/ro/core.po
+++ b/l10n/ro/core.po
@@ -3,13 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# dimaursu16 <dima@ceata.org>, 2013
 # ripkid666 <ripkid666@gmail.com>, 2013
+# sergiu_sechel <sergiu.sechel@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
 "MIME-Version: 1.0\n"
@@ -21,11 +23,11 @@ msgstr ""
 #: ajax/share.php:97
 #, php-format
 msgid "%s shared »%s« with you"
-msgstr ""
+msgstr "%s Partajat »%s« cu tine de"
 
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
-msgstr "Tipul de categorie nu este prevazut"
+msgstr "Tipul de categorie nu a fost specificat."
 
 #: ajax/vcategories/add.php:30
 msgid "No category to add?"
@@ -62,135 +64,135 @@ msgstr "Nici o categorie selectată pentru ștergere."
 msgid "Error removing %s from favorites."
 msgstr "Eroare la ștergerea %s din favorite"
 
-#: js/config.php:34
+#: js/config.php:32
 msgid "Sunday"
 msgstr "Duminică"
 
-#: js/config.php:35
+#: js/config.php:33
 msgid "Monday"
 msgstr "Luni"
 
-#: js/config.php:36
+#: js/config.php:34
 msgid "Tuesday"
 msgstr "Marți"
 
-#: js/config.php:37
+#: js/config.php:35
 msgid "Wednesday"
 msgstr "Miercuri"
 
-#: js/config.php:38
+#: js/config.php:36
 msgid "Thursday"
 msgstr "Joi"
 
-#: js/config.php:39
+#: js/config.php:37
 msgid "Friday"
 msgstr "Vineri"
 
-#: js/config.php:40
+#: js/config.php:38
 msgid "Saturday"
 msgstr "Sâmbătă"
 
-#: js/config.php:45
+#: js/config.php:43
 msgid "January"
 msgstr "Ianuarie"
 
-#: js/config.php:46
+#: js/config.php:44
 msgid "February"
 msgstr "Februarie"
 
-#: js/config.php:47
+#: js/config.php:45
 msgid "March"
 msgstr "Martie"
 
-#: js/config.php:48
+#: js/config.php:46
 msgid "April"
 msgstr "Aprilie"
 
-#: js/config.php:49
+#: js/config.php:47
 msgid "May"
 msgstr "Mai"
 
-#: js/config.php:50
+#: js/config.php:48
 msgid "June"
 msgstr "Iunie"
 
-#: js/config.php:51
+#: js/config.php:49
 msgid "July"
 msgstr "Iulie"
 
-#: js/config.php:52
+#: js/config.php:50
 msgid "August"
 msgstr "August"
 
-#: js/config.php:53
+#: js/config.php:51
 msgid "September"
 msgstr "Septembrie"
 
-#: js/config.php:54
+#: js/config.php:52
 msgid "October"
 msgstr "Octombrie"
 
-#: js/config.php:55
+#: js/config.php:53
 msgid "November"
 msgstr "Noiembrie"
 
-#: js/config.php:56
+#: js/config.php:54
 msgid "December"
 msgstr "Decembrie"
 
-#: js/js.js:286
+#: js/js.js:293
 msgid "Settings"
 msgstr "Setări"
 
-#: js/js.js:718
+#: js/js.js:725
 msgid "seconds ago"
 msgstr "secunde în urmă"
 
-#: js/js.js:719
+#: js/js.js:726
 msgid "1 minute ago"
 msgstr "1 minut în urmă"
 
-#: js/js.js:720
+#: js/js.js:727
 msgid "{minutes} minutes ago"
 msgstr "{minutes} minute in urma"
 
-#: js/js.js:721
+#: js/js.js:728
 msgid "1 hour ago"
 msgstr "Acum o ora"
 
-#: js/js.js:722
+#: js/js.js:729
 msgid "{hours} hours ago"
 msgstr "{hours} ore în urmă"
 
-#: js/js.js:723
+#: js/js.js:730
 msgid "today"
 msgstr "astăzi"
 
-#: js/js.js:724
+#: js/js.js:731
 msgid "yesterday"
 msgstr "ieri"
 
-#: js/js.js:725
+#: js/js.js:732
 msgid "{days} days ago"
 msgstr "{days} zile in urma"
 
-#: js/js.js:726
+#: js/js.js:733
 msgid "last month"
 msgstr "ultima lună"
 
-#: js/js.js:727
+#: js/js.js:734
 msgid "{months} months ago"
 msgstr "{months} luni în urmă"
 
-#: js/js.js:728
+#: js/js.js:735
 msgid "months ago"
 msgstr "luni în urmă"
 
-#: js/js.js:729
+#: js/js.js:736
 msgid "last year"
 msgstr "ultimul an"
 
-#: js/js.js:730
+#: js/js.js:737
 msgid "years ago"
 msgstr "ani în urmă"
 
@@ -204,7 +206,7 @@ msgstr "Anulare"
 
 #: js/oc-dialogs.js:141 js/oc-dialogs.js:200
 msgid "Error loading file picker template"
-msgstr ""
+msgstr "Eroare la încărcarea șablonului selectorului de fișiere"
 
 #: js/oc-dialogs.js:164
 msgid "Yes"
@@ -226,8 +228,8 @@ msgstr "Tipul obiectului nu a fost specificat"
 #: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
 #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:577
-#: js/share.js:589
+#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:620
+#: js/share.js:632
 msgid "Error"
 msgstr "Eroare"
 
@@ -247,7 +249,7 @@ msgstr "Partajat"
 msgid "Share"
 msgstr "Partajează"
 
-#: js/share.js:125 js/share.js:617
+#: js/share.js:125 js/share.js:660
 msgid "Error while sharing"
 msgstr "Eroare la partajare"
 
@@ -267,99 +269,103 @@ msgstr "Distribuie cu tine si grupul {group} de {owner}"
 msgid "Shared with you by {owner}"
 msgstr "Distribuie cu tine de {owner}"
 
-#: js/share.js:159
+#: js/share.js:172
 msgid "Share with"
 msgstr "Partajat cu"
 
-#: js/share.js:164
+#: js/share.js:177
 msgid "Share with link"
 msgstr "Partajare cu legătură"
 
-#: js/share.js:167
+#: js/share.js:180
 msgid "Password protect"
 msgstr "Protejare cu parolă"
 
-#: js/share.js:169 templates/installation.php:54 templates/login.php:26
+#: js/share.js:182 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "Parolă"
 
-#: js/share.js:173
+#: js/share.js:187
+msgid "Allow Public Upload"
+msgstr "Permiteţi încărcarea publică."
+
+#: js/share.js:191
 msgid "Email link to person"
 msgstr "Expediază legătura prin poșta electronică"
 
-#: js/share.js:174
+#: js/share.js:192
 msgid "Send"
 msgstr "Expediază"
 
-#: js/share.js:178
+#: js/share.js:197
 msgid "Set expiration date"
 msgstr "Specifică data expirării"
 
-#: js/share.js:179
+#: js/share.js:198
 msgid "Expiration date"
 msgstr "Data expirării"
 
-#: js/share.js:211
+#: js/share.js:230
 msgid "Share via email:"
 msgstr "Distribuie prin email:"
 
-#: js/share.js:213
+#: js/share.js:232
 msgid "No people found"
 msgstr "Nici o persoană găsită"
 
-#: js/share.js:251
+#: js/share.js:270
 msgid "Resharing is not allowed"
 msgstr "Repartajarea nu este permisă"
 
-#: js/share.js:287
+#: js/share.js:306
 msgid "Shared in {item} with {user}"
 msgstr "Distribuie in {item} si {user}"
 
-#: js/share.js:308
+#: js/share.js:327
 msgid "Unshare"
 msgstr "Anulare partajare"
 
-#: js/share.js:320
+#: js/share.js:339
 msgid "can edit"
 msgstr "poate edita"
 
-#: js/share.js:322
+#: js/share.js:341
 msgid "access control"
 msgstr "control acces"
 
-#: js/share.js:325
+#: js/share.js:344
 msgid "create"
 msgstr "creare"
 
-#: js/share.js:328
+#: js/share.js:347
 msgid "update"
 msgstr "actualizare"
 
-#: js/share.js:331
+#: js/share.js:350
 msgid "delete"
 msgstr "ștergere"
 
-#: js/share.js:334
+#: js/share.js:353
 msgid "share"
 msgstr "partajare"
 
-#: js/share.js:368 js/share.js:564
+#: js/share.js:387 js/share.js:607
 msgid "Password protected"
 msgstr "Protejare cu parolă"
 
-#: js/share.js:577
+#: js/share.js:620
 msgid "Error unsetting expiration date"
 msgstr "Eroare la anularea datei de expirare"
 
-#: js/share.js:589
+#: js/share.js:632
 msgid "Error setting expiration date"
 msgstr "Eroare la specificarea datei de expirare"
 
-#: js/share.js:604
+#: js/share.js:647
 msgid "Sending ..."
 msgstr "Se expediază..."
 
-#: js/share.js:615
+#: js/share.js:658
 msgid "Email sent"
 msgstr "Mesajul a fost expediat"
 
@@ -374,7 +380,7 @@ msgstr "Modernizarea a eșuat! <a href=\"https://github.com/owncloud/core/issues
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "Modernizare reusita! Vei fii redirectionat!"
 
-#: lostpassword/controller.php:58
+#: lostpassword/controller.php:60
 msgid "ownCloud password reset"
 msgstr "Resetarea parolei ownCloud "
 
@@ -404,17 +410,17 @@ msgstr "Nume utilizator"
 
 #: lostpassword/templates/lostpassword.php:22
 msgid ""
-"Your files seems to be encrypted. If you didn't have enabled the recovery "
-"key there will be no way to get your data back once the password was "
-"resetted. If you are not sure what to do, please contact your administrator "
-"first before continue. Do you really want to continue?"
-msgstr ""
+"Your files are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
+msgstr "Fișierele tale sunt criptate. Dacă nu ai activat o cheie de recuperare, nu va mai exista nici o metodă prin care să îți recuperezi datele după resetarea parole. Dacă nu ești sigur în privința la ce ai de făcut, contactează un administrator înainte să continuii. Chiar vrei să continui?"
 
 #: lostpassword/templates/lostpassword.php:24
 msgid "Yes, I really want to reset my password now"
-msgstr ""
+msgstr "Da, eu chiar doresc să îmi resetez parola acum"
 
-#: lostpassword/templates/lostpassword.php:29
+#: lostpassword/templates/lostpassword.php:27
 msgid "Request reset"
 msgstr "Cerere trimisă"
 
@@ -462,7 +468,7 @@ msgstr "Acces interzis"
 msgid "Cloud not found"
 msgstr "Nu s-a găsit"
 
-#: templates/altmail.php:2
+#: templates/altmail.php:4
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -471,11 +477,7 @@ msgid ""
 "View it: %s\n"
 "\n"
 "Cheers!"
-msgstr ""
-
-#: templates/altmail.php:7 templates/mail.php:24
-msgid "web services under your control"
-msgstr "servicii web controlate de tine"
+msgstr "Salutare,\n\nVă aduc la cunoștință că %s a partajat %s cu tine.\nAccesează la: %s\n\nNumai bine!"
 
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
@@ -569,12 +571,12 @@ msgstr "Bază date"
 msgid "Finish setup"
 msgstr "Finalizează instalarea"
 
-#: templates/layout.user.php:40
+#: templates/layout.user.php:43
 #, php-format
 msgid "%s is available. Get more information on how to update."
-msgstr ""
+msgstr "%s este disponibil. Vezi mai multe informații despre procesul de actualizare."
 
-#: templates/layout.user.php:67
+#: templates/layout.user.php:68
 msgid "Log out"
 msgstr "Ieșire"
 
@@ -608,12 +610,12 @@ msgstr "Autentificare"
 msgid "Alternative Logins"
 msgstr "Conectări alternative"
 
-#: templates/mail.php:15
+#: templates/mail.php:16
 #, php-format
 msgid ""
 "Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
 "href=\"%s\">View it!</a><br><br>Cheers!"
-msgstr ""
+msgstr "Salutare, <br><br>Vă aduc la cunoștință că %s a partajat %s cu tine.<br><a href=\"%s\">Accesează-l!</a><br><br>Numai bine!"
 
 #: templates/part.pagenavi.php:3
 msgid "prev"
diff --git a/l10n/ro/files.po b/l10n/ro/files.po
index 874153b9a786a5be5600a106ad56f02f01dccb3a..47b9ff6832462b83912d3cce62450752af1193b9 100644
--- a/l10n/ro/files.po
+++ b/l10n/ro/files.po
@@ -3,14 +3,16 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# dimaursu16 <dima@ceata.org>, 2013
 # ripkid666 <ripkid666@gmail.com>, 2013
+# sergiu_sechel <sergiu.sechel@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:01+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
+"Last-Translator: sergiu_sechel <sergiu.sechel@gmail.com>\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"
@@ -21,53 +23,61 @@ msgstr ""
 #: ajax/move.php:17
 #, php-format
 msgid "Could not move %s - File with this name already exists"
-msgstr "Nu se poate de mutat %s - Fișier cu acest nume deja există"
+msgstr "%s nu se poate muta - Fișierul cu acest nume există deja "
 
 #: ajax/move.php:27 ajax/move.php:30
 #, php-format
 msgid "Could not move %s"
 msgstr "Nu s-a putut muta %s"
 
-#: ajax/upload.php:19
+#: ajax/upload.php:16 ajax/upload.php:45
+msgid "Unable to set upload directory."
+msgstr "Imposibil de a seta directorul pentru incărcare."
+
+#: ajax/upload.php:22
+msgid "Invalid Token"
+msgstr "Jeton Invalid"
+
+#: ajax/upload.php:59
 msgid "No file was uploaded. Unknown error"
 msgstr "Nici un fișier nu a fost încărcat. Eroare necunoscută"
 
-#: ajax/upload.php:26
+#: ajax/upload.php:66
 msgid "There is no error, the file uploaded with success"
 msgstr "Nu a apărut nici o eroare, fișierul a fost încărcat cu succes"
 
-#: ajax/upload.php:27
+#: ajax/upload.php:67
 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:29
+#: ajax/upload.php:69
 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:30
+#: ajax/upload.php:70
 msgid "The uploaded file was only partially uploaded"
 msgstr "Fișierul a fost încărcat doar parțial"
 
-#: ajax/upload.php:31
+#: ajax/upload.php:71
 msgid "No file was uploaded"
 msgstr "Nu a fost încărcat nici un fișier"
 
-#: ajax/upload.php:32
+#: ajax/upload.php:72
 msgid "Missing a temporary folder"
 msgstr "Lipsește un director temporar"
 
-#: ajax/upload.php:33
+#: ajax/upload.php:73
 msgid "Failed to write to disk"
 msgstr "Eroare la scriere pe disc"
 
-#: ajax/upload.php:51
+#: ajax/upload.php:91
 msgid "Not enough storage available"
 msgstr "Nu este suficient spațiu disponibil"
 
-#: ajax/upload.php:83
+#: ajax/upload.php:123
 msgid "Invalid directory."
 msgstr "Director invalid."
 
@@ -75,6 +85,36 @@ msgstr "Director invalid."
 msgid "Files"
 msgstr "Fișiere"
 
+#: js/file-upload.js:11
+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/file-upload.js:24
+msgid "Not enough space available"
+msgstr "Nu este suficient spațiu disponibil"
+
+#: js/file-upload.js:64
+msgid "Upload cancelled."
+msgstr "Încărcare anulată."
+
+#: js/file-upload.js:167 js/files.js:266
+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/file-upload.js:233 js/files.js:339
+msgid "URL cannot be empty."
+msgstr "Adresa URL nu poate fi goală."
+
+#: js/file-upload.js:238 lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr "Nume de dosar invalid. Utilizarea 'Shared' e rezervată de ownCloud"
+
+#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
+#: js/files.js:693 js/files.js:731
+msgid "Error"
+msgstr "Eroare"
+
 #: js/fileactions.js:116
 msgid "Share"
 msgstr "Partajează"
@@ -91,43 +131,43 @@ msgstr "Șterge"
 msgid "Rename"
 msgstr "Redenumire"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:464
 msgid "Pending"
 msgstr "În așteptare"
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "{new_name} already exists"
 msgstr "{new_name} deja exista"
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "replace"
 msgstr "înlocuire"
 
-#: js/filelist.js:259
+#: js/filelist.js:302
 msgid "suggest name"
 msgstr "sugerează nume"
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "cancel"
 msgstr "anulare"
 
-#: js/filelist.js:306
+#: js/filelist.js:349
 msgid "replaced {new_name} with {old_name}"
 msgstr "{new_name} inlocuit cu {old_name}"
 
-#: js/filelist.js:306
+#: js/filelist.js:349
 msgid "undo"
 msgstr "Anulează ultima acțiune"
 
-#: js/filelist.js:331
+#: js/filelist.js:374
 msgid "perform delete operation"
 msgstr "efectueaza operatiunea de stergere"
 
-#: js/filelist.js:413
+#: js/filelist.js:456
 msgid "1 file uploading"
 msgstr "un fișier se încarcă"
 
-#: js/filelist.js:416 js/filelist.js:470
+#: js/filelist.js:459 js/filelist.js:517
 msgid "files uploading"
 msgstr "fișiere se încarcă"
 
@@ -159,70 +199,42 @@ msgid ""
 "big."
 msgstr "Se pregătește descărcarea. Aceasta poate să dureze ceva timp dacă fișierele sunt mari."
 
-#: js/files.js:264
-msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "Nu s-a putut încărca fișierul tău deoarece pare să fie un director sau are 0 bytes."
-
-#: js/files.js:277
-msgid "Not enough space available"
-msgstr "Nu este suficient spațiu disponibil"
-
-#: js/files.js:317
-msgid "Upload cancelled."
-msgstr "Încărcare anulată."
-
-#: js/files.js:413
-msgid ""
-"File upload is in progress. Leaving the page now will cancel the upload."
-msgstr "Fișierul este în curs de încărcare. Părăsirea paginii va întrerupe încărcarea."
-
-#: js/files.js:486
-msgid "URL cannot be empty."
-msgstr "Adresa URL nu poate fi goală."
-
-#: js/files.js:491
+#: js/files.js:344
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Invalid folder name. Usage of 'Shared' is reserved by Ownclou"
 
-#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
-msgid "Error"
-msgstr "Eroare"
-
-#: js/files.js:877 templates/index.php:69
+#: js/files.js:744 templates/index.php:69
 msgid "Name"
 msgstr "Nume"
 
-#: js/files.js:878 templates/index.php:80
+#: js/files.js:745 templates/index.php:80
 msgid "Size"
 msgstr "Dimensiune"
 
-#: js/files.js:879 templates/index.php:82
+#: js/files.js:746 templates/index.php:82
 msgid "Modified"
 msgstr "Modificat"
 
-#: js/files.js:898
+#: js/files.js:765
 msgid "1 folder"
 msgstr "1 folder"
 
-#: js/files.js:900
+#: js/files.js:767
 msgid "{count} folders"
 msgstr "{count} foldare"
 
-#: js/files.js:908
+#: js/files.js:775
 msgid "1 file"
 msgstr "1 fisier"
 
-#: js/files.js:910
+#: js/files.js:777
 msgid "{count} files"
 msgstr "{count} fisiere"
 
-#: lib/app.php:53
-msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
-msgstr ""
-
 #: lib/app.php:73
-msgid "Unable to rename file"
-msgstr "Nu s-a putut redenumi fișierul"
+#, php-format
+msgid "%s could not be renamed"
+msgstr "%s nu a putut fi redenumit"
 
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
@@ -318,6 +330,22 @@ msgstr "Fișierele sunt scanate, te rog așteptă."
 msgid "Current scanning"
 msgstr "ÃŽn curs de scanare"
 
+#: templates/part.list.php:76
+msgid "directory"
+msgstr "catalog"
+
+#: templates/part.list.php:78
+msgid "directories"
+msgstr "cataloage"
+
+#: templates/part.list.php:87
+msgid "file"
+msgstr "fișier"
+
+#: templates/part.list.php:89
+msgid "files"
+msgstr "fișiere"
+
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
 msgstr "Modernizare fisiere de sistem cache.."
diff --git a/l10n/ro/files_encryption.po b/l10n/ro/files_encryption.po
index 4c006f7a60fdf2f9dcd05fc764d8294fcdb53e87..d499ad94c54db7fc2e8381f3356f9c8ebebb41f5 100644
--- a/l10n/ro/files_encryption.po
+++ b/l10n/ro/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-14 02:46+0200\n"
-"PO-Revision-Date: 2013-06-14 00:47+0000\n"
+"POT-Creation-Date: 2013-07-05 02:12+0200\n"
+"PO-Revision-Date: 2013-07-05 00:13+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"
@@ -55,9 +55,21 @@ msgstr ""
 
 #: files/error.php:7
 msgid ""
-"Your private key is not valid! Maybe your password was changed from outside."
-" You can update your private key password in your personal settings to "
-"regain access to your files"
+"Your private key is not valid! Likely your password was changed outside the "
+"ownCloud system (e.g. your corporate directory). You can update your private"
+" key password in your personal settings to recover access to your encrypted "
+"files."
+msgstr ""
+
+#: hooks/hooks.php:44
+msgid "Missing requirements."
+msgstr ""
+
+#: hooks/hooks.php:45
+msgid ""
+"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL "
+"PHP extension is enabled and configured properly. For now, the encryption "
+"app has been disabled."
 msgstr ""
 
 #: js/settings-admin.js:11
@@ -84,11 +96,11 @@ msgstr "ÃŽncriptare"
 
 #: templates/settings-admin.php:10
 msgid ""
-"Enable encryption passwords recovery key (allow sharing to recovery key):"
+"Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
 #: templates/settings-admin.php:14
-msgid "Recovery account password"
+msgid "Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:21 templates/settings-personal.php:54
@@ -100,15 +112,15 @@ msgid "Disabled"
 msgstr ""
 
 #: templates/settings-admin.php:34
-msgid "Change encryption passwords recovery key:"
+msgid "Change recovery key password:"
 msgstr ""
 
 #: templates/settings-admin.php:41
-msgid "Old Recovery account password"
+msgid "Old Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:48
-msgid "New Recovery account password"
+msgid "New Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:53
diff --git a/l10n/ro/files_external.po b/l10n/ro/files_external.po
index 8a939852e6535c9b02bb8eb55a24c5e95065637b..0aa96d165c7a1da284f46394052c332abac90f42 100644
--- a/l10n/ro/files_external.po
+++ b/l10n/ro/files_external.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/ro/files_sharing.po b/l10n/ro/files_sharing.po
index 2662cb732278242da7fb8a1b513bff4192e39bdc..c5d7d17116f721ea95ed0463ace2f0b2f5c98cdb 100644
--- a/l10n/ro/files_sharing.po
+++ b/l10n/ro/files_sharing.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# sergiu_sechel <sergiu.sechel@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
+"Last-Translator: sergiu_sechel <sergiu.sechel@gmail.com>\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,27 +19,39 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
 
 #: templates/authenticate.php:4
+msgid "The password is wrong. Try again."
+msgstr "Parola este incorectă. Încercaţi din nou."
+
+#: templates/authenticate.php:7
 msgid "Password"
 msgstr "Parolă"
 
-#: templates/authenticate.php:6
+#: templates/authenticate.php:9
 msgid "Submit"
 msgstr "Trimite"
 
-#: templates/public.php:10
+#: templates/public.php:17
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s a partajat directorul %s cu tine"
 
-#: templates/public.php:13
+#: templates/public.php:20
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s a partajat fișierul %s cu tine"
 
-#: templates/public.php:19 templates/public.php:43
+#: templates/public.php:28 templates/public.php:90
 msgid "Download"
 msgstr "Descarcă"
 
-#: templates/public.php:40
+#: templates/public.php:45 templates/public.php:48
+msgid "Upload"
+msgstr "Încărcare"
+
+#: templates/public.php:58
+msgid "Cancel upload"
+msgstr "Anulează încărcarea"
+
+#: templates/public.php:87
 msgid "No preview available for"
 msgstr "Nici o previzualizare disponibilă pentru "
diff --git a/l10n/ro/files_trashbin.po b/l10n/ro/files_trashbin.po
index 0ac40c75707bd450cb119a545e40e237bf0d002a..a67949a4c643054f84c2799f80908c157259361e 100644
--- a/l10n/ro/files_trashbin.po
+++ b/l10n/ro/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:16+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/ro/lib.po b/l10n/ro/lib.po
index bcd25eb14e14a979f335786de3e8951d3ea8e224..043718154d7bf748fd19e8794a0b134bcc78a043 100644
--- a/l10n/ro/lib.po
+++ b/l10n/ro/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
 "MIME-Version: 1.0\n"
@@ -17,43 +17,47 @@ msgstr ""
 "Language: ro\n"
 "Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
 
-#: app.php:359
+#: app.php:360
 msgid "Help"
 msgstr "Ajutor"
 
-#: app.php:372
+#: app.php:373
 msgid "Personal"
 msgstr "Personal"
 
-#: app.php:383
+#: app.php:384
 msgid "Settings"
 msgstr "Setări"
 
-#: app.php:395
+#: app.php:396
 msgid "Users"
 msgstr "Utilizatori"
 
-#: app.php:408
+#: app.php:409
 msgid "Apps"
 msgstr "Aplicații"
 
-#: app.php:416
+#: app.php:417
 msgid "Admin"
 msgstr "Admin"
 
-#: files.php:210
+#: defaults.php:33
+msgid "web services under your control"
+msgstr "servicii web controlate de tine"
+
+#: files.php:226
 msgid "ZIP download is turned off."
 msgstr "Descărcarea ZIP este dezactivată."
 
-#: files.php:211
+#: files.php:227
 msgid "Files need to be downloaded one by one."
 msgstr "Fișierele trebuie descărcate unul câte unul."
 
-#: files.php:212 files.php:245
+#: files.php:228 files.php:261
 msgid "Back to Files"
 msgstr "Înapoi la fișiere"
 
-#: files.php:242
+#: files.php:258
 msgid "Selected files too large to generate zip file."
 msgstr "Fișierele selectate sunt prea mari pentru a genera un fișier zip."
 
@@ -85,107 +89,105 @@ msgstr "Text"
 msgid "Images"
 msgstr "Imagini"
 
-#: setup.php:34
-msgid "Set an admin username."
-msgstr ""
-
-#: setup.php:37
-msgid "Set an admin password."
-msgstr ""
-
-#: setup.php:55
+#: setup/abstractdatabase.php:22
 #, php-format
 msgid "%s enter the database username."
 msgstr ""
 
-#: setup.php:58
+#: setup/abstractdatabase.php:25
 #, php-format
 msgid "%s enter the database name."
 msgstr ""
 
-#: setup.php:61
+#: setup/abstractdatabase.php:28
 #, php-format
 msgid "%s you may not use dots in the database name"
 msgstr ""
 
-#: setup.php:64
+#: setup/mssql.php:20
 #, php-format
-msgid "%s set the database host."
-msgstr ""
-
-#: setup.php:126 setup.php:332 setup.php:377
-msgid "PostgreSQL username and/or password not valid"
+msgid "MS SQL username and/or password not valid: %s"
 msgstr ""
 
-#: setup.php:127 setup.php:235
+#: setup/mssql.php:21 setup/mysql.php:13 setup/oci.php:114
+#: setup/postgresql.php:24 setup/postgresql.php:70
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:152
-msgid "Oracle connection could not be established"
-msgstr ""
-
-#: setup.php:234
+#: setup/mysql.php:12
 msgid "MySQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:288 setup.php:398 setup.php:407 setup.php:425 setup.php:435
-#: setup.php:444 setup.php:477 setup.php:543 setup.php:569 setup.php:576
-#: setup.php:587 setup.php:594 setup.php:603 setup.php:611 setup.php:620
-#: setup.php:626
+#: setup/mysql.php:67 setup/oci.php:54 setup/oci.php:121 setup/oci.php:147
+#: setup/oci.php:154 setup/oci.php:165 setup/oci.php:172 setup/oci.php:181
+#: setup/oci.php:189 setup/oci.php:198 setup/oci.php:204
+#: setup/postgresql.php:89 setup/postgresql.php:98 setup/postgresql.php:115
+#: setup/postgresql.php:125 setup/postgresql.php:134
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr ""
 
-#: setup.php:289 setup.php:399 setup.php:408 setup.php:426 setup.php:436
-#: setup.php:445 setup.php:478 setup.php:544 setup.php:570 setup.php:577
-#: setup.php:588 setup.php:604 setup.php:612 setup.php:621
+#: setup/mysql.php:68 setup/oci.php:55 setup/oci.php:122 setup/oci.php:148
+#: setup/oci.php:155 setup/oci.php:166 setup/oci.php:182 setup/oci.php:190
+#: setup/oci.php:199 setup/postgresql.php:90 setup/postgresql.php:99
+#: setup/postgresql.php:116 setup/postgresql.php:126 setup/postgresql.php:135
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:305
+#: setup/mysql.php:85
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:306
+#: setup/mysql.php:86
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:311
+#: setup/mysql.php:91
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:312
+#: setup/mysql.php:92
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:469 setup.php:536
+#: setup/oci.php:34
+msgid "Oracle connection could not be established"
+msgstr ""
+
+#: setup/oci.php:41 setup/oci.php:113
 msgid "Oracle username and/or password not valid"
 msgstr ""
 
-#: setup.php:595 setup.php:627
+#: setup/oci.php:173 setup/oci.php:205
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:647
-#, php-format
-msgid "MS SQL username and/or password not valid: %s"
+#: setup/postgresql.php:23 setup/postgresql.php:69
+msgid "PostgreSQL username and/or password not valid"
+msgstr ""
+
+#: setup.php:42
+msgid "Set an admin username."
 msgstr ""
 
-#: setup.php:870
+#: setup.php:45
+msgid "Set an admin password."
+msgstr ""
+
+#: setup.php:198
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
-msgstr ""
+msgstr "Serverul de web nu este încă setat corespunzător pentru a permite sincronizarea fișierelor deoarece interfața WebDAV pare a fi întreruptă."
 
-#: setup.php:871
+#: setup.php:199
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
-msgstr ""
+msgstr "Vă rugăm să verificați <a href='%s'>ghiduri de instalare</ a>."
 
 #: template.php:113
 msgid "seconds ago"
diff --git a/l10n/ro/settings.po b/l10n/ro/settings.po
index 5fa551bd67c379e16a275d17f5ecd4cd358a1673..5880c612e9e3521ec261ef9dcc4242cc6cd480c0 100644
--- a/l10n/ro/settings.po
+++ b/l10n/ro/settings.po
@@ -3,12 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# sergiu_sechel <sergiu.sechel@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
 "MIME-Version: 1.0\n"
@@ -19,7 +20,7 @@ msgstr ""
 
 #: ajax/apps/ocs.php:20
 msgid "Unable to load list from App Store"
-msgstr "Imposibil de încărcat lista din App Store"
+msgstr "Imposibil de actualizat lista din  App Store."
 
 #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
 #: ajax/togglegroups.php:20
@@ -28,11 +29,11 @@ msgstr "Eroare la autentificare"
 
 #: ajax/changedisplayname.php:31
 msgid "Your display name has been changed."
-msgstr ""
+msgstr "Numele afiÅŸat a fost schimbat."
 
 #: ajax/changedisplayname.php:34
 msgid "Unable to change display name"
-msgstr ""
+msgstr "Imposibil de schimbat numele afiÅŸat."
 
 #: ajax/creategroup.php:10
 msgid "Group already exists"
@@ -86,39 +87,39 @@ msgstr "Nu s-a putut elimina utilizatorul din grupul %s"
 
 #: ajax/updateapp.php:14
 msgid "Couldn't update app."
-msgstr ""
+msgstr "Aplicaţia nu s-a putut actualiza."
 
-#: js/apps.js:30
+#: js/apps.js:35
 msgid "Update to {appversion}"
-msgstr ""
+msgstr "Actualizat la {versiuneaaplicaţiei}"
 
-#: js/apps.js:36 js/apps.js:76
+#: js/apps.js:41 js/apps.js:81
 msgid "Disable"
 msgstr "Dezactivați"
 
-#: js/apps.js:36 js/apps.js:64 js/apps.js:83
+#: js/apps.js:41 js/apps.js:69 js/apps.js:88
 msgid "Enable"
 msgstr "Activare"
 
-#: js/apps.js:55
+#: js/apps.js:60
 msgid "Please wait...."
-msgstr ""
+msgstr "Aşteptaţi vă rog...."
 
-#: js/apps.js:59 js/apps.js:71 js/apps.js:80 js/apps.js:93
+#: js/apps.js:64 js/apps.js:76 js/apps.js:85 js/apps.js:98
 msgid "Error"
 msgstr "Eroare"
 
-#: js/apps.js:90
+#: js/apps.js:95
 msgid "Updating...."
-msgstr ""
+msgstr "Actualizare în curs...."
 
-#: js/apps.js:93
+#: js/apps.js:98
 msgid "Error while updating app"
-msgstr ""
+msgstr "Eroare în timpul actualizării aplicaţiei"
 
-#: js/apps.js:96
+#: js/apps.js:101
 msgid "Updated"
-msgstr ""
+msgstr "Actualizat"
 
 #: js/personal.js:118
 msgid "Saving..."
@@ -134,7 +135,7 @@ msgstr "Anulează ultima acțiune"
 
 #: js/users.js:79
 msgid "Unable to remove user"
-msgstr ""
+msgstr "Imposibil de eliminat utilizatorul"
 
 #: js/users.js:92 templates/users.php:26 templates/users.php:87
 #: templates/users.php:112
@@ -151,29 +152,29 @@ msgstr "Șterge"
 
 #: js/users.js:269
 msgid "add group"
-msgstr ""
+msgstr "adăugaţi grupul"
 
 #: js/users.js:428
 msgid "A valid username must be provided"
-msgstr ""
+msgstr "Trebuie să furnizaţi un nume de utilizator valid"
 
 #: js/users.js:429 js/users.js:435 js/users.js:450
 msgid "Error creating user"
-msgstr ""
+msgstr "Eroare la crearea utilizatorului"
 
 #: js/users.js:434
 msgid "A valid password must be provided"
-msgstr ""
+msgstr "Trebuie să furnizaţi o parolă validă"
 
-#: personal.php:35 personal.php:36
+#: personal.php:37 personal.php:38
 msgid "__language_name__"
 msgstr "_language_name_"
 
-#: templates/admin.php:15
+#: templates/admin.php:17
 msgid "Security Warning"
 msgstr "Avertisment de securitate"
 
-#: templates/admin.php:18
+#: templates/admin.php:20
 msgid ""
 "Your data directory and your files are probably accessible from the "
 "internet. The .htaccess file that ownCloud provides is not working. We "
@@ -182,48 +183,48 @@ msgid ""
 " webserver document root."
 msgstr "Directorul tău de date și fișierele tale probabil sunt accesibile prin internet. Fișierul .htaccess oferit de ownCloud nu funcționează. Îți recomandăm să configurezi server-ul tău web într-un mod în care directorul de date să nu mai fie accesibil sau mută directorul de date în afara directorului root al server-ului web."
 
-#: templates/admin.php:29
+#: templates/admin.php:31
 msgid "Setup Warning"
-msgstr ""
+msgstr "Atenţie la implementare"
 
-#: templates/admin.php:32
+#: templates/admin.php:34
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
-msgstr ""
+msgstr "Serverul de web nu este încă setat corespunzător pentru a permite sincronizarea fișierelor deoarece interfața WebDAV pare a fi întreruptă."
 
-#: templates/admin.php:33
+#: templates/admin.php:35
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
-msgstr ""
+msgstr "Vă rugăm să verificați <a href='%s'>ghiduri de instalare</ a>."
 
-#: templates/admin.php:44
+#: templates/admin.php:46
 msgid "Module 'fileinfo' missing"
-msgstr ""
+msgstr "Modulul \"Fileinfo\" lipsește"
 
-#: templates/admin.php:47
+#: templates/admin.php:49
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
-msgstr ""
+msgstr "Modulul PHP \"Fileinfo\" lipsește. Va recomandam sa activaţi acest modul pentru a obține cele mai bune rezultate cu detectarea mime-type."
 
-#: templates/admin.php:58
+#: templates/admin.php:60
 msgid "Locale not working"
-msgstr ""
+msgstr "Localizarea nu funcționează"
 
-#: templates/admin.php:63
+#: templates/admin.php:65
 #, php-format
 msgid ""
 "This ownCloud server can't set system locale to %s. This means that there "
 "might be problems with certain characters in file names. We strongly suggest"
 " to install the required packages on your system to support %s."
-msgstr ""
+msgstr "Acest server ownCloud nu poate seta sistemul de localizare pentru% s. Acest lucru înseamnă că ar putea exista probleme cu anumite caractere în numele de fișiere. Vă recomandăm să instalați pachetele necesare pe sistemul dumneavoastră pentru a sprijini% s."
 
-#: templates/admin.php:75
+#: templates/admin.php:77
 msgid "Internet connection not working"
-msgstr ""
+msgstr "Conexiunea la internet nu funcționează"
 
-#: templates/admin.php:78
+#: templates/admin.php:80
 msgid ""
 "This ownCloud server has no working internet connection. This means that "
 "some of the features like mounting of external storage, notifications about "
@@ -231,104 +232,104 @@ msgid ""
 "remote and sending of notification emails might also not work. We suggest to"
 " enable internet connection for this server if you want to have all features"
 " of ownCloud."
-msgstr ""
+msgstr "Acest server ownCloud nu are nici o conexiune la internet activă. Acest lucru înseamnă că anumite caracteristici, cum ar fi montarea mediilor de stocare externe, notificări despre actualizări sau instalarea de aplicatii tereţe nu funcționează. Accesarea fișierelor de la distanță și trimiterea de e-mailuri de notificare s-ar putea, de asemenea, să nu funcționeze. Vă sugerăm să permiteţi conectarea la Internet pentru acest server, dacă doriți să aveți toate caracteristicile de oferite de ownCloud."
 
-#: templates/admin.php:92
+#: templates/admin.php:94
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:101
+#: templates/admin.php:103
 msgid "Execute one task with each page loaded"
 msgstr "Execută o sarcină la fiecare pagină încărcată"
 
-#: templates/admin.php:111
+#: templates/admin.php:113
 msgid ""
 "cron.php is registered at a webcron service. Call the cron.php page in the "
 "owncloud root once a minute over http."
 msgstr "cron.php este înregistrat în serviciul webcron. Accesează pagina cron.php din root-ul owncloud odată pe minut prin http."
 
-#: templates/admin.php:121
+#: templates/admin.php:123
 msgid ""
 "Use systems cron service. Call the cron.php file in the owncloud folder via "
 "a system cronjob once a minute."
 msgstr "Folosește serviciul cron al sistemului. Accesează fișierul cron.php din directorul owncloud printr-un cronjob de sistem odată la fiecare minut."
 
-#: templates/admin.php:128
+#: templates/admin.php:130
 msgid "Sharing"
 msgstr "Partajare"
 
-#: templates/admin.php:134
+#: templates/admin.php:136
 msgid "Enable Share API"
 msgstr "Activare API partajare"
 
-#: templates/admin.php:135
+#: templates/admin.php:137
 msgid "Allow apps to use the Share API"
 msgstr "Permite aplicațiilor să folosească API-ul de partajare"
 
-#: templates/admin.php:142
+#: templates/admin.php:144
 msgid "Allow links"
 msgstr "Pemite legături"
 
-#: templates/admin.php:143
+#: templates/admin.php:145
 msgid "Allow users to share items to the public with links"
 msgstr "Permite utilizatorilor să partajeze fișiere în mod public prin legături"
 
-#: templates/admin.php:150
+#: templates/admin.php:152
 msgid "Allow resharing"
 msgstr "Permite repartajarea"
 
-#: templates/admin.php:151
+#: templates/admin.php:153
 msgid "Allow users to share items shared with them again"
 msgstr "Permite utilizatorilor să repartajeze fișiere partajate cu ei"
 
-#: templates/admin.php:158
+#: templates/admin.php:160
 msgid "Allow users to share with anyone"
 msgstr "Permite utilizatorilor să partajeze cu oricine"
 
-#: templates/admin.php:161
+#: templates/admin.php:163
 msgid "Allow users to only share with users in their groups"
 msgstr "Permite utilizatorilor să partajeze doar cu utilizatori din același grup"
 
-#: templates/admin.php:168
+#: templates/admin.php:170
 msgid "Security"
-msgstr ""
+msgstr "Securitate"
 
-#: templates/admin.php:181
+#: templates/admin.php:183
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:182
+#: templates/admin.php:184
 msgid ""
 "Enforces the clients to connect to ownCloud via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:185
+#: templates/admin.php:187
 msgid ""
 "Please connect to this ownCloud instance via HTTPS to enable or disable the "
 "SSL enforcement."
 msgstr ""
 
-#: templates/admin.php:195
+#: templates/admin.php:197
 msgid "Log"
 msgstr "Jurnal de activitate"
 
-#: templates/admin.php:196
+#: templates/admin.php:198
 msgid "Log level"
 msgstr "Nivel jurnal"
 
-#: templates/admin.php:227
+#: templates/admin.php:229
 msgid "More"
 msgstr "Mai mult"
 
-#: templates/admin.php:228
+#: templates/admin.php:230
 msgid "Less"
 msgstr "Mai puțin"
 
-#: templates/admin.php:235 templates/personal.php:116
+#: templates/admin.php:236 templates/personal.php:116
 msgid "Version"
 msgstr "Versiunea"
 
-#: templates/admin.php:237 templates/personal.php:119
+#: templates/admin.php:240 templates/personal.php:119
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -386,76 +387,79 @@ msgstr "Urmărire bug-uri"
 msgid "Commercial Support"
 msgstr "Suport comercial"
 
-#: templates/personal.php:9
+#: templates/personal.php:10
 msgid "Get the apps to sync your files"
 msgstr "Ia acum aplicatia pentru sincronizarea fisierelor "
 
-#: templates/personal.php:20
+#: templates/personal.php:21
 msgid "Show First Run Wizard again"
 msgstr ""
 
-#: templates/personal.php:28
+#: templates/personal.php:29
 #, php-format
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "Ați utilizat <strong>%s</strong> din <strong>%s</strong> disponibile"
 
-#: templates/personal.php:40 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:41 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "Parolă"
 
-#: templates/personal.php:41
+#: templates/personal.php:42
 msgid "Your password was changed"
 msgstr "Parola a fost modificată"
 
-#: templates/personal.php:42
+#: templates/personal.php:43
 msgid "Unable to change your password"
 msgstr "Imposibil de-ați schimbat parola"
 
-#: templates/personal.php:43
+#: templates/personal.php:44
 msgid "Current password"
 msgstr "Parola curentă"
 
-#: templates/personal.php:45
+#: templates/personal.php:46
 msgid "New password"
 msgstr "Noua parolă"
 
-#: templates/personal.php:47
+#: templates/personal.php:48
 msgid "Change password"
 msgstr "Schimbă parola"
 
-#: templates/personal.php:59 templates/users.php:85
+#: templates/personal.php:60 templates/users.php:85
 msgid "Display Name"
 msgstr ""
 
-#: templates/personal.php:74
+#: templates/personal.php:75
 msgid "Email"
 msgstr "Email"
 
-#: templates/personal.php:76
+#: templates/personal.php:77
 msgid "Your email address"
 msgstr "Adresa ta de email"
 
-#: templates/personal.php:77
+#: templates/personal.php:78
 msgid "Fill in an email address to enable password recovery"
 msgstr "Completează o adresă de mail pentru a-ți putea recupera parola"
 
-#: templates/personal.php:86 templates/personal.php:87
+#: templates/personal.php:87 templates/personal.php:88
 msgid "Language"
 msgstr "Limba"
 
-#: templates/personal.php:99
+#: templates/personal.php:100
 msgid "Help translate"
 msgstr "Ajută la traducere"
 
-#: templates/personal.php:105
+#: templates/personal.php:106
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:107
-msgid "Use this address to connect to your ownCloud in your file manager"
-msgstr "Folosește această adresă pentru a conecta ownCloud cu managerul de fișiere"
+#: templates/personal.php:108
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
+"target=\"_blank\">access your Files via WebDAV</a>"
+msgstr ""
 
-#: templates/users.php:21 templates/users.php:84
+#: templates/users.php:21
 msgid "Login Name"
 msgstr ""
 
@@ -485,6 +489,10 @@ msgstr "Nelimitată"
 msgid "Other"
 msgstr "Altele"
 
+#: templates/users.php:84
+msgid "Username"
+msgstr "Nume utilizator"
+
 #: templates/users.php:91
 msgid "Storage"
 msgstr "Stocare"
diff --git a/l10n/ro/user_ldap.po b/l10n/ro/user_ldap.po
index 0d344ebca9c6e1994cf88c4def498f250ef3617f..a475db8c7888a0e7ce6af6bbeeb88d35921b874e 100644
--- a/l10n/ro/user_ldap.po
+++ b/l10n/ro/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:25+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:16+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/ru/core.po b/l10n/ru/core.po
index 340dce6738ddc1c3f66ad3a50d307db415352878..ba3afc7b6a93286d2704c145ba9a27d5113325e7 100644
--- a/l10n/ru/core.po
+++ b/l10n/ru/core.po
@@ -3,16 +3,19 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# alfsoft <alfsoft@gmail.com>, 2013
+# lord93 <lordakryl@gmail.com>, 2013
 # foool <andrglad@mail.ru>, 2013
+# Victor Bravo <>, 2013
 # Vyacheslav Muranov <s@neola.ru>, 2013
 # Langaru <langaru@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:22+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:14+0000\n"
+"Last-Translator: Victor Bravo <>\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"
@@ -23,7 +26,7 @@ msgstr ""
 #: ajax/share.php:97
 #, php-format
 msgid "%s shared »%s« with you"
-msgstr ""
+msgstr "%s поделился »%s« с вами"
 
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
@@ -64,135 +67,135 @@ msgstr "Нет категорий для удаления."
 msgid "Error removing %s from favorites."
 msgstr "Ошибка удаления %s из избранного"
 
-#: js/config.php:34
+#: js/config.php:32
 msgid "Sunday"
 msgstr "Воскресенье"
 
-#: js/config.php:35
+#: js/config.php:33
 msgid "Monday"
 msgstr "Понедельник"
 
-#: js/config.php:36
+#: js/config.php:34
 msgid "Tuesday"
 msgstr "Вторник"
 
-#: js/config.php:37
+#: js/config.php:35
 msgid "Wednesday"
 msgstr "Среда"
 
-#: js/config.php:38
+#: js/config.php:36
 msgid "Thursday"
 msgstr "Четверг"
 
-#: js/config.php:39
+#: js/config.php:37
 msgid "Friday"
 msgstr "Пятница"
 
-#: js/config.php:40
+#: js/config.php:38
 msgid "Saturday"
 msgstr "Суббота"
 
-#: js/config.php:45
+#: js/config.php:43
 msgid "January"
 msgstr "Январь"
 
-#: js/config.php:46
+#: js/config.php:44
 msgid "February"
 msgstr "Февраль"
 
-#: js/config.php:47
+#: js/config.php:45
 msgid "March"
 msgstr "Март"
 
-#: js/config.php:48
+#: js/config.php:46
 msgid "April"
 msgstr "Апрель"
 
-#: js/config.php:49
+#: js/config.php:47
 msgid "May"
 msgstr "Май"
 
-#: js/config.php:50
+#: js/config.php:48
 msgid "June"
 msgstr "Июнь"
 
-#: js/config.php:51
+#: js/config.php:49
 msgid "July"
 msgstr "Июль"
 
-#: js/config.php:52
+#: js/config.php:50
 msgid "August"
 msgstr "Август"
 
-#: js/config.php:53
+#: js/config.php:51
 msgid "September"
 msgstr "Сентябрь"
 
-#: js/config.php:54
+#: js/config.php:52
 msgid "October"
 msgstr "Октябрь"
 
-#: js/config.php:55
+#: js/config.php:53
 msgid "November"
 msgstr "Ноябрь"
 
-#: js/config.php:56
+#: js/config.php:54
 msgid "December"
 msgstr "Декабрь"
 
-#: js/js.js:286
+#: js/js.js:293
 msgid "Settings"
 msgstr "Конфигурация"
 
-#: js/js.js:718
+#: js/js.js:725
 msgid "seconds ago"
 msgstr "несколько секунд назад"
 
-#: js/js.js:719
+#: js/js.js:726
 msgid "1 minute ago"
 msgstr "1 минуту назад"
 
-#: js/js.js:720
+#: js/js.js:727
 msgid "{minutes} minutes ago"
 msgstr "{minutes} минут назад"
 
-#: js/js.js:721
+#: js/js.js:728
 msgid "1 hour ago"
 msgstr "час назад"
 
-#: js/js.js:722
+#: js/js.js:729
 msgid "{hours} hours ago"
 msgstr "{hours} часов назад"
 
-#: js/js.js:723
+#: js/js.js:730
 msgid "today"
 msgstr "сегодня"
 
-#: js/js.js:724
+#: js/js.js:731
 msgid "yesterday"
 msgstr "вчера"
 
-#: js/js.js:725
+#: js/js.js:732
 msgid "{days} days ago"
 msgstr "{days} дней назад"
 
-#: js/js.js:726
+#: js/js.js:733
 msgid "last month"
 msgstr "в прошлом месяце"
 
-#: js/js.js:727
+#: js/js.js:734
 msgid "{months} months ago"
 msgstr "{months} месяцев назад"
 
-#: js/js.js:728
+#: js/js.js:735
 msgid "months ago"
 msgstr "несколько месяцев назад"
 
-#: js/js.js:729
+#: js/js.js:736
 msgid "last year"
 msgstr "в прошлом году"
 
-#: js/js.js:730
+#: js/js.js:737
 msgid "years ago"
 msgstr "несколько лет назад"
 
@@ -206,7 +209,7 @@ msgstr "Отменить"
 
 #: js/oc-dialogs.js:141 js/oc-dialogs.js:200
 msgid "Error loading file picker template"
-msgstr "Ошибка при загрузке файла выбора  шаблона"
+msgstr "Ошибка при загрузке файла выбора шаблона"
 
 #: js/oc-dialogs.js:164
 msgid "Yes"
@@ -228,8 +231,8 @@ msgstr "Тип объекта не указан"
 #: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
 #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:577
-#: js/share.js:589
+#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:620
+#: js/share.js:632
 msgid "Error"
 msgstr "Ошибка"
 
@@ -249,7 +252,7 @@ msgstr "Общие"
 msgid "Share"
 msgstr "Открыть доступ"
 
-#: js/share.js:125 js/share.js:617
+#: js/share.js:125 js/share.js:660
 msgid "Error while sharing"
 msgstr "Ошибка при открытии доступа"
 
@@ -269,99 +272,103 @@ msgstr "{owner} открыл доступ для Вас и группы {group}
 msgid "Shared with you by {owner}"
 msgstr "{owner} открыл доступ для Вас"
 
-#: js/share.js:159
+#: js/share.js:172
 msgid "Share with"
 msgstr "Поделиться с"
 
-#: js/share.js:164
+#: js/share.js:177
 msgid "Share with link"
 msgstr "Поделиться с ссылкой"
 
-#: js/share.js:167
+#: js/share.js:180
 msgid "Password protect"
 msgstr "Защитить паролем"
 
-#: js/share.js:169 templates/installation.php:54 templates/login.php:26
+#: js/share.js:182 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "Пароль"
 
-#: js/share.js:173
+#: js/share.js:187
+msgid "Allow Public Upload"
+msgstr "Разрешить открытую загрузку"
+
+#: js/share.js:191
 msgid "Email link to person"
 msgstr "Почтовая ссылка на персону"
 
-#: js/share.js:174
+#: js/share.js:192
 msgid "Send"
 msgstr "Отправить"
 
-#: js/share.js:178
+#: js/share.js:197
 msgid "Set expiration date"
 msgstr "Установить срок доступа"
 
-#: js/share.js:179
+#: js/share.js:198
 msgid "Expiration date"
 msgstr "Дата окончания"
 
-#: js/share.js:211
+#: js/share.js:230
 msgid "Share via email:"
 msgstr "Поделится через электронную почту:"
 
-#: js/share.js:213
+#: js/share.js:232
 msgid "No people found"
 msgstr "Ни один человек не найден"
 
-#: js/share.js:251
+#: js/share.js:270
 msgid "Resharing is not allowed"
 msgstr "Общий доступ не разрешен"
 
-#: js/share.js:287
+#: js/share.js:306
 msgid "Shared in {item} with {user}"
 msgstr "Общий доступ к {item} с {user}"
 
-#: js/share.js:308
+#: js/share.js:327
 msgid "Unshare"
 msgstr "Закрыть общий доступ"
 
-#: js/share.js:320
+#: js/share.js:339
 msgid "can edit"
 msgstr "может редактировать"
 
-#: js/share.js:322
+#: js/share.js:341
 msgid "access control"
 msgstr "контроль доступа"
 
-#: js/share.js:325
+#: js/share.js:344
 msgid "create"
 msgstr "создать"
 
-#: js/share.js:328
+#: js/share.js:347
 msgid "update"
 msgstr "обновить"
 
-#: js/share.js:331
+#: js/share.js:350
 msgid "delete"
 msgstr "удалить"
 
-#: js/share.js:334
+#: js/share.js:353
 msgid "share"
 msgstr "открыть доступ"
 
-#: js/share.js:368 js/share.js:564
+#: js/share.js:387 js/share.js:607
 msgid "Password protected"
 msgstr "Защищено паролем"
 
-#: js/share.js:577
+#: js/share.js:620
 msgid "Error unsetting expiration date"
 msgstr "Ошибка при отмене срока доступа"
 
-#: js/share.js:589
+#: js/share.js:632
 msgid "Error setting expiration date"
 msgstr "Ошибка при установке срока доступа"
 
-#: js/share.js:604
+#: js/share.js:647
 msgid "Sending ..."
 msgstr "Отправляется ..."
 
-#: js/share.js:615
+#: js/share.js:658
 msgid "Email sent"
 msgstr "Письмо отправлено"
 
@@ -376,7 +383,7 @@ msgstr "При обновлении произошла ошибка. Пожал
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "Обновление прошло успешно. Перенаправляемся в Ваш ownCloud..."
 
-#: lostpassword/controller.php:58
+#: lostpassword/controller.php:60
 msgid "ownCloud password reset"
 msgstr "Сброс пароля "
 
@@ -389,11 +396,11 @@ msgid ""
 "The link to reset your password has been sent to your email.<br>If you do "
 "not receive it within a reasonable amount of time, check your spam/junk "
 "folders.<br>If it is not there ask your local administrator ."
-msgstr "Ссылка для сброса пароля была отправлена ​​по электронной почте. <br> Если вы не получите его в пределах одной двух минут, проверьте папку спам. <br> Если это не возможно, обратитесь к Вашему администратору."
+msgstr "Ссылка для сброса пароля отправлена вам ​​по электронной почте.<br>Если вы не получите письмо в пределах одной-двух минут, проверьте папку Спам. <br>Если письма там нет, обратитесь к своему администратору."
 
 #: lostpassword/templates/lostpassword.php:12
 msgid "Request failed!<br>Did you make sure your email/username was right?"
-msgstr "Что-то не так. Вы уверены что Email / Имя пользователя указаны верно?"
+msgstr "Запрос не удался. Вы уверены, что email или имя пользователя указаны верно?"
 
 #: lostpassword/templates/lostpassword.php:15
 msgid "You will receive a link to reset your password via Email."
@@ -406,17 +413,17 @@ msgstr "Имя пользователя"
 
 #: lostpassword/templates/lostpassword.php:22
 msgid ""
-"Your files seems to be encrypted. If you didn't have enabled the recovery "
-"key there will be no way to get your data back once the password was "
-"resetted. If you are not sure what to do, please contact your administrator "
-"first before continue. Do you really want to continue?"
-msgstr ""
+"Your files are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
+msgstr "Ваши файлы зашифрованы. Если вы не активировали ключ восстановления, то после сброса пароля все ваши данные будут потеряны навсегда. Если вы не знаете что делать, свяжитесь со своим администратором до того как продолжить. Вы действительно хотите продолжить?"
 
 #: lostpassword/templates/lostpassword.php:24
 msgid "Yes, I really want to reset my password now"
-msgstr ""
+msgstr "Да, я действительно хочу сбросить свой пароль"
 
-#: lostpassword/templates/lostpassword.php:29
+#: lostpassword/templates/lostpassword.php:27
 msgid "Request reset"
 msgstr "Запросить сброс"
 
@@ -464,7 +471,7 @@ msgstr "Доступ запрещён"
 msgid "Cloud not found"
 msgstr "Облако не найдено"
 
-#: templates/altmail.php:2
+#: templates/altmail.php:4
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -473,11 +480,7 @@ msgid ""
 "View it: %s\n"
 "\n"
 "Cheers!"
-msgstr ""
-
-#: templates/altmail.php:7 templates/mail.php:24
-msgid "web services under your control"
-msgstr "веб-сервисы под вашим управлением"
+msgstr "Приветствую,⏎\n⏎\nпросто даю знать, что %s поделился %s с вами.⏎\nПосмотреть: %s⏎\n⏎\nУдачи!"
 
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
@@ -504,7 +507,7 @@ msgstr "Пожалуйста обновите Ваш PHP чтобы исполь
 msgid ""
 "No secure random number generator is available, please enable the PHP "
 "OpenSSL extension."
-msgstr "Нет доступного защищенного генератора случайных чисел, пожалуйста, включите расширение PHP OpenSSL."
+msgstr "Отсутствует защищенный генератор случайных чисел, пожалуйста, включите расширение PHP OpenSSL."
 
 #: templates/installation.php:33
 msgid ""
@@ -571,12 +574,12 @@ msgstr "Хост базы данных"
 msgid "Finish setup"
 msgstr "Завершить установку"
 
-#: templates/layout.user.php:40
+#: templates/layout.user.php:43
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr "%s доступно. Получить дополнительную информацию о порядке обновления."
 
-#: templates/layout.user.php:67
+#: templates/layout.user.php:68
 msgid "Log out"
 msgstr "Выйти"
 
@@ -610,12 +613,12 @@ msgstr "Войти"
 msgid "Alternative Logins"
 msgstr "Альтернативные имена пользователя"
 
-#: templates/mail.php:15
+#: templates/mail.php:16
 #, php-format
 msgid ""
 "Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
 "href=\"%s\">View it!</a><br><br>Cheers!"
-msgstr ""
+msgstr "Приветствую,<br><br>просто даю знать, что %s поделился »%s« с вами.<br><a href=\"%s\">Посмотреть!</a><br><br>Удачи!"
 
 #: templates/part.pagenavi.php:3
 msgid "prev"
@@ -628,4 +631,4 @@ msgstr "след"
 #: templates/update.php:3
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
-msgstr "Производится обновление ownCloud до версии %s. Это может занять некоторое время."
+msgstr "Идёт обновление ownCloud до версии %s. Это может занять некоторое время."
diff --git a/l10n/ru/files.po b/l10n/ru/files.po
index fc3bc0a80e35d3da688970a43c51b0a2296ecf75..cf3395d24d7a2750f8148bca6f636d30786c14ad 100644
--- a/l10n/ru/files.po
+++ b/l10n/ru/files.po
@@ -3,14 +3,16 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# lord93 <lordakryl@gmail.com>, 2013
+# Victor Bravo <>, 2013
 # Friktor <antonshramko@yandex.ru>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:01+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
-"Last-Translator: Friktor <antonshramko@yandex.ru>\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
+"Last-Translator: Victor Bravo <>\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"
@@ -28,46 +30,54 @@ msgstr "Невозможно переместить %s - файл с таким
 msgid "Could not move %s"
 msgstr "Невозможно переместить %s"
 
-#: ajax/upload.php:19
+#: ajax/upload.php:16 ajax/upload.php:45
+msgid "Unable to set upload directory."
+msgstr "Не удалось установить каталог загрузки."
+
+#: ajax/upload.php:22
+msgid "Invalid Token"
+msgstr "Недопустимый маркер"
+
+#: ajax/upload.php:59
 msgid "No file was uploaded. Unknown error"
 msgstr "Файл не был загружен. Неизвестная ошибка"
 
-#: ajax/upload.php:26
+#: ajax/upload.php:66
 msgid "There is no error, the file uploaded with success"
 msgstr "Файл загружен успешно."
 
-#: ajax/upload.php:27
+#: ajax/upload.php:67
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr "Файл превышает размер установленный upload_max_filesize в php.ini:"
 
-#: ajax/upload.php:29
+#: ajax/upload.php:69
 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:30
+#: ajax/upload.php:70
 msgid "The uploaded file was only partially uploaded"
 msgstr "Файл загружен частично"
 
-#: ajax/upload.php:31
+#: ajax/upload.php:71
 msgid "No file was uploaded"
 msgstr "Файл не был загружен"
 
-#: ajax/upload.php:32
+#: ajax/upload.php:72
 msgid "Missing a temporary folder"
 msgstr "Отсутствует временная папка"
 
-#: ajax/upload.php:33
+#: ajax/upload.php:73
 msgid "Failed to write to disk"
 msgstr "Ошибка записи на диск"
 
-#: ajax/upload.php:51
+#: ajax/upload.php:91
 msgid "Not enough storage available"
 msgstr "Недостаточно доступного места в хранилище"
 
-#: ajax/upload.php:83
+#: ajax/upload.php:123
 msgid "Invalid directory."
 msgstr "Неправильный каталог."
 
@@ -75,6 +85,36 @@ msgstr "Неправильный каталог."
 msgid "Files"
 msgstr "Файлы"
 
+#: js/file-upload.js:11
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr "Файл не был загружен: его размер 0 байт либо это не файл, а директория."
+
+#: js/file-upload.js:24
+msgid "Not enough space available"
+msgstr "Недостаточно свободного места"
+
+#: js/file-upload.js:64
+msgid "Upload cancelled."
+msgstr "Загрузка отменена."
+
+#: js/file-upload.js:167 js/files.js:266
+msgid ""
+"File upload is in progress. Leaving the page now will cancel the upload."
+msgstr "Файл в процессе загрузки. Покинув страницу вы прервёте загрузку."
+
+#: js/file-upload.js:233 js/files.js:339
+msgid "URL cannot be empty."
+msgstr "Ссылка не может быть пустой."
+
+#: js/file-upload.js:238 lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr "Неправильное имя каталога. Имя 'Shared' зарезервировано."
+
+#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
+#: js/files.js:693 js/files.js:731
+msgid "Error"
+msgstr "Ошибка"
+
 #: js/fileactions.js:116
 msgid "Share"
 msgstr "Открыть доступ"
@@ -91,43 +131,43 @@ msgstr "Удалить"
 msgid "Rename"
 msgstr "Переименовать"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:464
 msgid "Pending"
 msgstr "Ожидание"
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "{new_name} already exists"
 msgstr "{new_name} уже существует"
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "replace"
 msgstr "заменить"
 
-#: js/filelist.js:259
+#: js/filelist.js:302
 msgid "suggest name"
 msgstr "предложить название"
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "cancel"
 msgstr "отмена"
 
-#: js/filelist.js:306
+#: js/filelist.js:349
 msgid "replaced {new_name} with {old_name}"
 msgstr "заменено {new_name} на {old_name}"
 
-#: js/filelist.js:306
+#: js/filelist.js:349
 msgid "undo"
 msgstr "отмена"
 
-#: js/filelist.js:331
+#: js/filelist.js:374
 msgid "perform delete operation"
 msgstr "выполняется операция удаления"
 
-#: js/filelist.js:413
+#: js/filelist.js:456
 msgid "1 file uploading"
 msgstr "загружается 1 файл"
 
-#: js/filelist.js:416 js/filelist.js:470
+#: js/filelist.js:459 js/filelist.js:517
 msgid "files uploading"
 msgstr "файлы загружаются"
 
@@ -159,70 +199,42 @@ msgid ""
 "big."
 msgstr "Загрузка началась. Это может потребовать много времени, если файл большого размера."
 
-#: js/files.js:264
-msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "Файл не был загружен: его размер 0 байт либо это не файл, а директория."
-
-#: js/files.js:277
-msgid "Not enough space available"
-msgstr "Недостаточно свободного места"
-
-#: js/files.js:317
-msgid "Upload cancelled."
-msgstr "Загрузка отменена."
-
-#: js/files.js:413
-msgid ""
-"File upload is in progress. Leaving the page now will cancel the upload."
-msgstr "Файл в процессе загрузки. Покинув страницу вы прервёте загрузку."
-
-#: js/files.js:486
-msgid "URL cannot be empty."
-msgstr "Ссылка не может быть пустой."
-
-#: js/files.js:491
+#: js/files.js:344
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Неправильное имя каталога. Имя 'Shared' зарезервировано."
 
-#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
-msgid "Error"
-msgstr "Ошибка"
-
-#: js/files.js:877 templates/index.php:69
+#: js/files.js:744 templates/index.php:69
 msgid "Name"
 msgstr "Имя"
 
-#: js/files.js:878 templates/index.php:80
+#: js/files.js:745 templates/index.php:80
 msgid "Size"
 msgstr "Размер"
 
-#: js/files.js:879 templates/index.php:82
+#: js/files.js:746 templates/index.php:82
 msgid "Modified"
 msgstr "Изменён"
 
-#: js/files.js:898
+#: js/files.js:765
 msgid "1 folder"
 msgstr "1 папка"
 
-#: js/files.js:900
+#: js/files.js:767
 msgid "{count} folders"
 msgstr "{count} папок"
 
-#: js/files.js:908
+#: js/files.js:775
 msgid "1 file"
 msgstr "1 файл"
 
-#: js/files.js:910
+#: js/files.js:777
 msgid "{count} files"
 msgstr "{count} файлов"
 
-#: lib/app.php:53
-msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
-msgstr "Неправильное имя каталога. Имя 'Shared' зарезервировано."
-
 #: lib/app.php:73
-msgid "Unable to rename file"
-msgstr "Невозможно переименовать файл"
+#, php-format
+msgid "%s could not be renamed"
+msgstr "%s не может быть переименован"
 
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
@@ -308,7 +320,7 @@ msgstr "Файл слишком велик"
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
-msgstr "Файлы, которые Вы пытаетесь загрузить, превышают лимит для файлов на этом сервере."
+msgstr "Файлы, которые вы пытаетесь загрузить, превышают лимит для файлов на этом сервере."
 
 #: templates/index.php:114
 msgid "Files are being scanned, please wait."
@@ -318,6 +330,22 @@ msgstr "Подождите, файлы сканируются."
 msgid "Current scanning"
 msgstr "Текущее сканирование"
 
+#: templates/part.list.php:76
+msgid "directory"
+msgstr "директория"
+
+#: templates/part.list.php:78
+msgid "directories"
+msgstr "директории"
+
+#: templates/part.list.php:87
+msgid "file"
+msgstr "файл"
+
+#: templates/part.list.php:89
+msgid "files"
+msgstr "файлы"
+
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
-msgstr "Обновление кеша файловой системы..."
+msgstr "Обновление кэша файловой системы..."
diff --git a/l10n/ru/files_encryption.po b/l10n/ru/files_encryption.po
index b1bc75c9e289b7909b7f43a80ccd8fec948924c2..d206ebc812059b226bb5267497062fe6a59987b4 100644
--- a/l10n/ru/files_encryption.po
+++ b/l10n/ru/files_encryption.po
@@ -4,13 +4,17 @@
 # 
 # Translators:
 # Ант По <du6egub@gmail.com>, 2013
+# alfsoft <alfsoft@gmail.com>, 2013
+# lord93 <lordakryl@gmail.com>, 2013
+# jekader <jekader@gmail.com>, 2013
+# Victor Bravo <>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-14 02:46+0200\n"
-"PO-Revision-Date: 2013-06-14 00:47+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-07-09 02:03+0200\n"
+"PO-Revision-Date: 2013-07-08 10:40+0000\n"
+"Last-Translator: Victor Bravo <>\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,21 +24,21 @@ msgstr ""
 
 #: ajax/adminrecovery.php:29
 msgid "Recovery key successfully enabled"
-msgstr ""
+msgstr "Ключ восстановления успешно установлен"
 
 #: ajax/adminrecovery.php:34
 msgid ""
 "Could not enable recovery key. Please check your recovery key password!"
-msgstr ""
+msgstr "Невозможно включить ключ восстановления. Проверьте правильность пароля от ключа!"
 
 #: ajax/adminrecovery.php:48
 msgid "Recovery key successfully disabled"
-msgstr ""
+msgstr "Ключ восстановления успешно отключен"
 
 #: ajax/adminrecovery.php:53
 msgid ""
 "Could not disable recovery key. Please check your recovery key password!"
-msgstr ""
+msgstr "Невозможно выключить ключ восстановления. Проверьте правильность пароля от ключа!"
 
 #: ajax/changeRecoveryPassword.php:49
 msgid "Password successfully changed."
@@ -46,20 +50,32 @@ msgstr "Невозможно изменить пароль. Возможно с
 
 #: ajax/updatePrivateKeyPassword.php:51
 msgid "Private key password successfully updated."
-msgstr ""
+msgstr "Пароль секретного ключа успешно обновлён."
 
 #: ajax/updatePrivateKeyPassword.php:53
 msgid ""
 "Could not update the private key password. Maybe the old password was not "
 "correct."
-msgstr ""
+msgstr "Невозможно обновить пароль от секретного ключа. Возможно, старый пароль указан неверно."
 
 #: files/error.php:7
 msgid ""
-"Your private key is not valid! Maybe your password was changed from outside."
-" You can update your private key password in your personal settings to "
-"regain access to your files"
-msgstr ""
+"Your private key is not valid! Likely your password was changed outside the "
+"ownCloud system (e.g. your corporate directory). You can update your private"
+" key password in your personal settings to recover access to your encrypted "
+"files."
+msgstr "Ваш секретный ключ не действителен! Вероятно, ваш пароль был изменен вне системы OwnCloud (например, корпоративный каталог). Вы можете обновить секретный ключ в личных настройках на странице восстановления доступа к зашифрованным файлам. "
+
+#: hooks/hooks.php:44
+msgid "Missing requirements."
+msgstr "Требования отсутствуют."
+
+#: hooks/hooks.php:45
+msgid ""
+"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL "
+"PHP extension is enabled and configured properly. For now, the encryption "
+"app has been disabled."
+msgstr "Пожалуйста, убедитесь, что PHP 5.3.3 или новее установлен и что расширение OpenSSL PHP включен и настроен. В настоящее время, шифрование для приложения было отключено."
 
 #: js/settings-admin.js:11
 msgid "Saving..."
@@ -69,15 +85,15 @@ msgstr "Сохранение..."
 msgid ""
 "Your private key is not valid! Maybe the your password was changed from "
 "outside."
-msgstr ""
+msgstr "Секретный ключ недействителен! Возможно, Ваш пароль был изменён в другой программе."
 
 #: templates/invalid_private_key.php:7
 msgid "You can unlock your private key in your "
-msgstr ""
+msgstr "Вы можете разблокировать закрытый ключ в своём "
 
 #: templates/invalid_private_key.php:7
 msgid "personal settings"
-msgstr ""
+msgstr "персональные настройки"
 
 #: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
@@ -85,12 +101,12 @@ msgstr "Шифрование"
 
 #: templates/settings-admin.php:10
 msgid ""
-"Enable encryption passwords recovery key (allow sharing to recovery key):"
-msgstr "Включить шифрование пароля ключа восстановления (понадобится разрешение для восстановления ключа)"
+"Enable recovery key (allow to recover users files in case of password loss):"
+msgstr "Включить ключ восстановления (позволяет пользователям восстановить файлы при потере пароля):"
 
 #: templates/settings-admin.php:14
-msgid "Recovery account password"
-msgstr "Восстановление пароля учетной записи"
+msgid "Recovery key password"
+msgstr "Пароль для ключа восстановления"
 
 #: templates/settings-admin.php:21 templates/settings-personal.php:54
 msgid "Enabled"
@@ -101,16 +117,16 @@ msgid "Disabled"
 msgstr "Отключено"
 
 #: templates/settings-admin.php:34
-msgid "Change encryption passwords recovery key:"
-msgstr "Изменить шифрование пароля ключа восстановления:"
+msgid "Change recovery key password:"
+msgstr "Сменить пароль для ключа восстановления:"
 
 #: templates/settings-admin.php:41
-msgid "Old Recovery account password"
-msgstr "Старое Восстановление пароля учетной записи"
+msgid "Old Recovery key password"
+msgstr "Старый пароль для ключа восстановления"
 
 #: templates/settings-admin.php:48
-msgid "New Recovery account password"
-msgstr "Новое Восстановление пароля учетной записи"
+msgid "New Recovery key password"
+msgstr "Новый пароль для ключа восстановления"
 
 #: templates/settings-admin.php:53
 msgid "Change Password"
@@ -118,39 +134,39 @@ msgstr "Изменить пароль"
 
 #: templates/settings-personal.php:11
 msgid "Your private key password no longer match your log-in password:"
-msgstr ""
+msgstr "Пароль от секретного ключа больше не соответствует паролю входа:"
 
 #: templates/settings-personal.php:14
 msgid "Set your old private key password to your current log-in password."
-msgstr ""
+msgstr "Замените старый пароль от секретного ключа на новый пароль входа."
 
 #: templates/settings-personal.php:16
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
-msgstr ""
+msgstr "Если вы не помните свой старый пароль, вы можете попросить своего администратора восстановить ваши файлы"
 
 #: templates/settings-personal.php:24
 msgid "Old log-in password"
-msgstr ""
+msgstr "Старый пароль для входа"
 
 #: templates/settings-personal.php:30
 msgid "Current log-in password"
-msgstr ""
+msgstr "Текущйи пароль для входа"
 
 #: templates/settings-personal.php:35
 msgid "Update Private Key Password"
-msgstr ""
+msgstr "Обновить пароль от секретного ключа"
 
 #: templates/settings-personal.php:45
 msgid "Enable password recovery:"
-msgstr ""
+msgstr "Включить восстановление пароля:"
 
 #: templates/settings-personal.php:47
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
-msgstr ""
+msgstr "Включение этой опции позволит вам получить доступ к своим зашифрованным файлам в случае утери пароля"
 
 #: templates/settings-personal.php:63
 msgid "File recovery settings updated"
diff --git a/l10n/ru/files_external.po b/l10n/ru/files_external.po
index 45a5938fa783027e285e7f7a4c1693c216c416c0..14b4f5c69bc40e8d4cb07697d81ea256fb00d8ea 100644
--- a/l10n/ru/files_external.po
+++ b/l10n/ru/files_external.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/ru/files_sharing.po b/l10n/ru/files_sharing.po
index f8c6a6e1fbda4380c0c5655aff2c7e7575b4f1bc..67c0b8a6fd2526261747ddb02ebc7ef062dd3b33 100644
--- a/l10n/ru/files_sharing.po
+++ b/l10n/ru/files_sharing.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Victor Bravo <>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
+"Last-Translator: Victor Bravo <>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,27 +19,39 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: templates/authenticate.php:4
+msgid "The password is wrong. Try again."
+msgstr "Неверный пароль. Попробуйте еще раз."
+
+#: templates/authenticate.php:7
 msgid "Password"
 msgstr "Пароль"
 
-#: templates/authenticate.php:6
+#: templates/authenticate.php:9
 msgid "Submit"
 msgstr "Отправить"
 
-#: templates/public.php:10
+#: templates/public.php:17
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s открыл доступ к папке %s для Вас"
 
-#: templates/public.php:13
+#: templates/public.php:20
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s открыл доступ к файлу %s для Вас"
 
-#: templates/public.php:19 templates/public.php:43
+#: templates/public.php:28 templates/public.php:90
 msgid "Download"
 msgstr "Скачать"
 
-#: templates/public.php:40
+#: templates/public.php:45 templates/public.php:48
+msgid "Upload"
+msgstr "Загрузка"
+
+#: templates/public.php:58
+msgid "Cancel upload"
+msgstr "Отмена загрузки"
+
+#: templates/public.php:87
 msgid "No preview available for"
 msgstr "Предпросмотр недоступен для"
diff --git a/l10n/ru/files_trashbin.po b/l10n/ru/files_trashbin.po
index 12908e3c54bed7210b6c4b17ee58a239736f0739..3a6e6489ddd4c45417d7f33133d3c1b57832c0e2 100644
--- a/l10n/ru/files_trashbin.po
+++ b/l10n/ru/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/ru/lib.po b/l10n/ru/lib.po
index 5009f6f99124361f07bc0d362f472fdb3b9bc78e..38d97da209bd56852d1a2255f59838b01bcbf630 100644
--- a/l10n/ru/lib.po
+++ b/l10n/ru/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-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
-"Last-Translator: Friktor <antonshramko@yandex.ru>\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,43 +18,47 @@ msgstr ""
 "Language: ru\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: app.php:359
+#: app.php:360
 msgid "Help"
 msgstr "Помощь"
 
-#: app.php:372
+#: app.php:373
 msgid "Personal"
 msgstr "Личное"
 
-#: app.php:383
+#: app.php:384
 msgid "Settings"
 msgstr "Конфигурация"
 
-#: app.php:395
+#: app.php:396
 msgid "Users"
 msgstr "Пользователи"
 
-#: app.php:408
+#: app.php:409
 msgid "Apps"
 msgstr "Приложения"
 
-#: app.php:416
+#: app.php:417
 msgid "Admin"
 msgstr "Admin"
 
-#: files.php:210
+#: defaults.php:33
+msgid "web services under your control"
+msgstr "веб-сервисы под вашим управлением"
+
+#: files.php:226
 msgid "ZIP download is turned off."
 msgstr "ZIP-скачивание отключено."
 
-#: files.php:211
+#: files.php:227
 msgid "Files need to be downloaded one by one."
 msgstr "Файлы должны быть загружены по одному."
 
-#: files.php:212 files.php:245
+#: files.php:228 files.php:261
 msgid "Back to Files"
 msgstr "Назад к файлам"
 
-#: files.php:242
+#: files.php:258
 msgid "Selected files too large to generate zip file."
 msgstr "Выбранные файлы слишком велики, чтобы создать zip файл."
 
@@ -86,104 +90,102 @@ msgstr "Текст"
 msgid "Images"
 msgstr "Изображения"
 
-#: setup.php:34
-msgid "Set an admin username."
-msgstr "Установить имя пользователя для admin."
-
-#: setup.php:37
-msgid "Set an admin password."
-msgstr "становит пароль для admin."
-
-#: setup.php:55
+#: setup/abstractdatabase.php:22
 #, php-format
 msgid "%s enter the database username."
 msgstr "%s введите имя пользователя базы данных."
 
-#: setup.php:58
+#: setup/abstractdatabase.php:25
 #, php-format
 msgid "%s enter the database name."
 msgstr "%s введите имя базы данных."
 
-#: setup.php:61
+#: setup/abstractdatabase.php:28
 #, php-format
 msgid "%s you may not use dots in the database name"
 msgstr "%s Вы не можете использовать точки в имени базы данных"
 
-#: setup.php:64
+#: setup/mssql.php:20
 #, php-format
-msgid "%s set the database host."
-msgstr "%s задайте хост базы данных."
-
-#: setup.php:126 setup.php:332 setup.php:377
-msgid "PostgreSQL username and/or password not valid"
-msgstr "Неверное имя пользователя и/или пароль PostgreSQL"
+msgid "MS SQL username and/or password not valid: %s"
+msgstr "Имя пользователя и/или пароль MS SQL не подходит: %s"
 
-#: setup.php:127 setup.php:235
+#: setup/mssql.php:21 setup/mysql.php:13 setup/oci.php:114
+#: setup/postgresql.php:24 setup/postgresql.php:70
 msgid "You need to enter either an existing account or the administrator."
 msgstr "Вы должны войти или в существующий аккаунт или под администратором."
 
-#: setup.php:152
-msgid "Oracle connection could not be established"
-msgstr "соединение с Oracle не может быть установлено"
-
-#: setup.php:234
+#: setup/mysql.php:12
 msgid "MySQL username and/or password not valid"
 msgstr "Неверное имя пользователя и/или пароль MySQL"
 
-#: setup.php:288 setup.php:398 setup.php:407 setup.php:425 setup.php:435
-#: setup.php:444 setup.php:477 setup.php:543 setup.php:569 setup.php:576
-#: setup.php:587 setup.php:594 setup.php:603 setup.php:611 setup.php:620
-#: setup.php:626
+#: setup/mysql.php:67 setup/oci.php:54 setup/oci.php:121 setup/oci.php:147
+#: setup/oci.php:154 setup/oci.php:165 setup/oci.php:172 setup/oci.php:181
+#: setup/oci.php:189 setup/oci.php:198 setup/oci.php:204
+#: setup/postgresql.php:89 setup/postgresql.php:98 setup/postgresql.php:115
+#: setup/postgresql.php:125 setup/postgresql.php:134
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr "Ошибка БД: \"%s\""
 
-#: setup.php:289 setup.php:399 setup.php:408 setup.php:426 setup.php:436
-#: setup.php:445 setup.php:478 setup.php:544 setup.php:570 setup.php:577
-#: setup.php:588 setup.php:604 setup.php:612 setup.php:621
+#: setup/mysql.php:68 setup/oci.php:55 setup/oci.php:122 setup/oci.php:148
+#: setup/oci.php:155 setup/oci.php:166 setup/oci.php:182 setup/oci.php:190
+#: setup/oci.php:199 setup/postgresql.php:90 setup/postgresql.php:99
+#: setup/postgresql.php:116 setup/postgresql.php:126 setup/postgresql.php:135
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr "Вызываемая команда была: \"%s\""
 
-#: setup.php:305
+#: setup/mysql.php:85
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr "Пользователь MySQL '%s'@'localhost' уже существует."
 
-#: setup.php:306
+#: setup/mysql.php:86
 msgid "Drop this user from MySQL"
 msgstr "Удалить этого пользователя из MySQL"
 
-#: setup.php:311
+#: setup/mysql.php:91
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr "Пользователь MySQL '%s'@'%%' уже существует"
 
-#: setup.php:312
+#: setup/mysql.php:92
 msgid "Drop this user from MySQL."
 msgstr "Удалить этого пользователя из MySQL."
 
-#: setup.php:469 setup.php:536
+#: setup/oci.php:34
+msgid "Oracle connection could not be established"
+msgstr "соединение с Oracle не может быть установлено"
+
+#: setup/oci.php:41 setup/oci.php:113
 msgid "Oracle username and/or password not valid"
 msgstr "Неверное имя пользователя и/или пароль Oracle"
 
-#: setup.php:595 setup.php:627
+#: setup/oci.php:173 setup/oci.php:205
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr "Вызываемая команда была: \"%s\", имя: %s, пароль: %s"
 
-#: setup.php:647
-#, php-format
-msgid "MS SQL username and/or password not valid: %s"
-msgstr "Имя пользователя и/или пароль MS SQL не подходит: %s"
+#: setup/postgresql.php:23 setup/postgresql.php:69
+msgid "PostgreSQL username and/or password not valid"
+msgstr "Неверное имя пользователя и/или пароль PostgreSQL"
+
+#: setup.php:42
+msgid "Set an admin username."
+msgstr "Установить имя пользователя для admin."
+
+#: setup.php:45
+msgid "Set an admin password."
+msgstr "становит пароль для admin."
 
-#: setup.php:870
+#: setup.php:198
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Ваш веб сервер до сих пор не настроен правильно для возможности синхронизации файлов, похоже что проблема в неисправности интерфейса WebDAV."
 
-#: setup.php:871
+#: setup.php:199
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Пожалуйста, дважды просмотрите <a href='%s'>инструкции по установке</a>."
diff --git a/l10n/ru/settings.po b/l10n/ru/settings.po
index 8eb83bf0302b9216c616a2f000d78b9a4680b70b..e3c76038e24adbb2fe3bea114329c8b38d37ff14 100644
--- a/l10n/ru/settings.po
+++ b/l10n/ru/settings.po
@@ -3,14 +3,16 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# alfsoft <alfsoft@gmail.com>, 2013
+# lord93 <lordakryl@gmail.com>, 2013
 # eurekafag <eurekafag@eureka7.ru>, 2013
 # Friktor <antonshramko@yandex.ru>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
 "MIME-Version: 1.0\n"
@@ -21,7 +23,7 @@ msgstr ""
 
 #: ajax/apps/ocs.php:20
 msgid "Unable to load list from App Store"
-msgstr "Загрузка из App Store запрещена"
+msgstr "Не удалось загрузить список из App Store"
 
 #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
 #: ajax/togglegroups.php:20
@@ -90,35 +92,35 @@ msgstr "Невозможно удалить пользователя из гру
 msgid "Couldn't update app."
 msgstr "Невозможно обновить приложение"
 
-#: js/apps.js:30
+#: js/apps.js:35
 msgid "Update to {appversion}"
 msgstr "Обновить до {версия приложения}"
 
-#: js/apps.js:36 js/apps.js:76
+#: js/apps.js:41 js/apps.js:81
 msgid "Disable"
 msgstr "Выключить"
 
-#: js/apps.js:36 js/apps.js:64 js/apps.js:83
+#: js/apps.js:41 js/apps.js:69 js/apps.js:88
 msgid "Enable"
 msgstr "Включить"
 
-#: js/apps.js:55
+#: js/apps.js:60
 msgid "Please wait...."
-msgstr "Повремени..."
+msgstr "Подождите..."
 
-#: js/apps.js:59 js/apps.js:71 js/apps.js:80 js/apps.js:93
+#: js/apps.js:64 js/apps.js:76 js/apps.js:85 js/apps.js:98
 msgid "Error"
 msgstr "Ошибка"
 
-#: js/apps.js:90
+#: js/apps.js:95
 msgid "Updating...."
 msgstr "Обновление..."
 
-#: js/apps.js:93
+#: js/apps.js:98
 msgid "Error while updating app"
-msgstr "Ошибка в процессе обновления приложения"
+msgstr "Ошибка при обновлении приложения"
 
-#: js/apps.js:96
+#: js/apps.js:101
 msgid "Updated"
 msgstr "Обновлено"
 
@@ -157,7 +159,7 @@ msgstr "добавить группу"
 
 #: js/users.js:428
 msgid "A valid username must be provided"
-msgstr "Предоставте подходящее имя пользователя"
+msgstr "Укажите правильное имя пользователя"
 
 #: js/users.js:429 js/users.js:435 js/users.js:450
 msgid "Error creating user"
@@ -165,55 +167,55 @@ msgstr "Ошибка создания пользователя"
 
 #: js/users.js:434
 msgid "A valid password must be provided"
-msgstr "Предоставте подходящий пароль"
+msgstr "Укажите валидный пароль"
 
-#: personal.php:35 personal.php:36
+#: personal.php:37 personal.php:38
 msgid "__language_name__"
 msgstr "Русский "
 
-#: templates/admin.php:15
+#: templates/admin.php:17
 msgid "Security Warning"
 msgstr "Предупреждение безопасности"
 
-#: templates/admin.php:18
+#: templates/admin.php:20
 msgid ""
 "Your data directory and your files are probably accessible from the "
 "internet. The .htaccess file that ownCloud provides is not working. We "
 "strongly suggest that you configure your webserver in a way that the data "
 "directory is no longer accessible or you move the data directory outside the"
 " webserver document root."
-msgstr "Ваши каталоги данных и файлы, вероятно, доступны из Интернета. Файл .htaccess, предоставляемый ownCloud, не работает. Мы настоятельно рекомендуем Вам настроить вебсервер таким образом, чтобы каталоги данных больше не были доступны, или переместить их за пределы корневого каталога документов веб-сервера."
+msgstr "Ваш каталог с данными и файлы, вероятно, доступны из интернета. Файл .htaccess, предоставляемый ownCloud, не работает. Мы настоятельно рекомендуем настроить веб-сервер таким образом, чтобы каталоги данных больше не были доступны, или переместить их за пределы корневого каталога документов веб-сервера."
 
-#: templates/admin.php:29
+#: templates/admin.php:31
 msgid "Setup Warning"
 msgstr "Предупреждение установки"
 
-#: templates/admin.php:32
+#: templates/admin.php:34
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
-msgstr "Ваш веб сервер до сих пор не настроен правильно для возможности синхронизации файлов, похоже что проблема в неисправности интерфейса WebDAV."
+msgstr "Веб-сервер до сих пор не настроен для возможности синхронизации файлов. Похоже что проблема в неисправности интерфейса WebDAV."
 
-#: templates/admin.php:33
+#: templates/admin.php:35
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Пожалуйста, дважды просмотрите <a href='%s'>инструкции по установке</a>."
 
-#: templates/admin.php:44
+#: templates/admin.php:46
 msgid "Module 'fileinfo' missing"
-msgstr "Модуль 'fileinfo' потерян"
+msgstr "Модуль 'fileinfo' отсутствует"
 
-#: templates/admin.php:47
+#: templates/admin.php:49
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
-msgstr "PHP модуль 'fileinfo' потерян. Мы настоятельно рекомендуем включить этот модуль для получения лучших результатов в mime-типе обнаружения."
+msgstr "PHP модуль 'fileinfo' отсутствует. Мы настоятельно рекомендуем включить этот модуль для улучшения определения типов (mime-type) файлов."
 
-#: templates/admin.php:58
+#: templates/admin.php:60
 msgid "Locale not working"
 msgstr "Локализация не работает"
 
-#: templates/admin.php:63
+#: templates/admin.php:65
 #, php-format
 msgid ""
 "This ownCloud server can't set system locale to %s. This means that there "
@@ -221,11 +223,11 @@ msgid ""
 " to install the required packages on your system to support %s."
 msgstr "Этот сервер ownCloud не может установить язык системы на %s. Это означает, что могут быть проблемы с некоторыми символами в именах файлов. Мы настоятельно рекомендуем установить необходимые пакеты в вашей системе для поддержки %s."
 
-#: templates/admin.php:75
+#: templates/admin.php:77
 msgid "Internet connection not working"
-msgstr "Интернет соединение не работает"
+msgstr "Интернет-соединение не работает"
 
-#: templates/admin.php:78
+#: templates/admin.php:80
 msgid ""
 "This ownCloud server has no working internet connection. This means that "
 "some of the features like mounting of external storage, notifications about "
@@ -233,104 +235,104 @@ msgid ""
 "remote and sending of notification emails might also not work. We suggest to"
 " enable internet connection for this server if you want to have all features"
 " of ownCloud."
-msgstr "Этот сервер ownCloud не имеет ни одного рабочего интернет соединения. Это значит, что некоторые возможности, такие как монтаж внешних носителей, уведомления о обновлениях или установки 3го рода приложений,не работают."
+msgstr "Этот сервер ownCloud не имеет рабочего интернет-соединения. Это значит, что некоторые возможности отключены, например: подключение внешних носителей, уведомления об обновлениях, установка сторонних приложений."
 
-#: templates/admin.php:92
+#: templates/admin.php:94
 msgid "Cron"
-msgstr "Демон"
+msgstr "Планировщик задач по расписанию"
 
-#: templates/admin.php:101
+#: templates/admin.php:103
 msgid "Execute one task with each page loaded"
 msgstr "Выполнять одно задание с каждой загруженной страницей"
 
-#: templates/admin.php:111
+#: templates/admin.php:113
 msgid ""
 "cron.php is registered at a webcron service. Call the cron.php page in the "
 "owncloud root once a minute over http."
-msgstr "cron.php зарегистрирован на webcron сервисе. Вызов страницы cron.php в корне owncloud раз в минуту через http."
+msgstr "Зарегистрировать cron.php в службе webcron сервисе. Вызывает страницу cron.php в корне owncloud раз в минуту через http."
 
-#: templates/admin.php:121
+#: templates/admin.php:123
 msgid ""
 "Use systems cron service. Call the cron.php file in the owncloud folder via "
 "a system cronjob once a minute."
-msgstr "Использование системной службы cron. Вызов файла cron.php в папке owncloud через систему cronjob раз в минуту."
+msgstr "Использовать системную службу cron. Вызов файла cron.php в папке owncloud через систему cronjob раз в минуту."
 
-#: templates/admin.php:128
+#: templates/admin.php:130
 msgid "Sharing"
 msgstr "Общий доступ"
 
-#: templates/admin.php:134
+#: templates/admin.php:136
 msgid "Enable Share API"
 msgstr "Включить API общего доступа"
 
-#: templates/admin.php:135
+#: templates/admin.php:137
 msgid "Allow apps to use the Share API"
-msgstr "Позволить программам использовать API общего доступа"
+msgstr "Позволить приложениям использовать API общего доступа"
 
-#: templates/admin.php:142
+#: templates/admin.php:144
 msgid "Allow links"
 msgstr "Разрешить ссылки"
 
-#: templates/admin.php:143
+#: templates/admin.php:145
 msgid "Allow users to share items to the public with links"
-msgstr "Разрешить пользователям открывать в общий доступ эллементы с публичной ссылкой"
+msgstr "Разрешить пользователям открывать в общий доступ элементы с публичной ссылкой"
 
-#: templates/admin.php:150
+#: templates/admin.php:152
 msgid "Allow resharing"
 msgstr "Разрешить переоткрытие общего доступа"
 
-#: templates/admin.php:151
+#: templates/admin.php:153
 msgid "Allow users to share items shared with them again"
 msgstr "Позволить пользователям открывать общий доступ к эллементам уже открытым в общий доступ"
 
-#: templates/admin.php:158
+#: templates/admin.php:160
 msgid "Allow users to share with anyone"
 msgstr "Разрешить пользователя делать общий доступ любому"
 
-#: templates/admin.php:161
+#: templates/admin.php:163
 msgid "Allow users to only share with users in their groups"
 msgstr "Разрешить пользователям делать общий доступ только для пользователей их групп"
 
-#: templates/admin.php:168
+#: templates/admin.php:170
 msgid "Security"
 msgstr "Безопасность"
 
-#: templates/admin.php:181
+#: templates/admin.php:183
 msgid "Enforce HTTPS"
 msgstr "Принудить к HTTPS"
 
-#: templates/admin.php:182
+#: templates/admin.php:184
 msgid ""
 "Enforces the clients to connect to ownCloud via an encrypted connection."
 msgstr "Принудить клиентов подключаться к ownCloud через шифрованное подключение."
 
-#: templates/admin.php:185
+#: templates/admin.php:187
 msgid ""
 "Please connect to this ownCloud instance via HTTPS to enable or disable the "
 "SSL enforcement."
 msgstr "Пожалуйста, подключитесь к этому экземпляру ownCloud через HTTPS для включения или отключения SSL принуждения."
 
-#: templates/admin.php:195
+#: templates/admin.php:197
 msgid "Log"
 msgstr "Лог"
 
-#: templates/admin.php:196
+#: templates/admin.php:198
 msgid "Log level"
 msgstr "Уровень лога"
 
-#: templates/admin.php:227
+#: templates/admin.php:229
 msgid "More"
 msgstr "Больше"
 
-#: templates/admin.php:228
+#: templates/admin.php:230
 msgid "Less"
 msgstr "Меньше"
 
-#: templates/admin.php:235 templates/personal.php:116
+#: templates/admin.php:236 templates/personal.php:116
 msgid "Version"
 msgstr "Версия"
 
-#: templates/admin.php:237 templates/personal.php:119
+#: templates/admin.php:240 templates/personal.php:119
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -388,76 +390,79 @@ msgstr "Bugtracker"
 msgid "Commercial Support"
 msgstr "Коммерческая поддержка"
 
-#: templates/personal.php:9
+#: templates/personal.php:10
 msgid "Get the apps to sync your files"
 msgstr "Получить приложения для синхронизации ваших файлов"
 
-#: templates/personal.php:20
+#: templates/personal.php:21
 msgid "Show First Run Wizard again"
 msgstr "Показать помощник настройки"
 
-#: templates/personal.php:28
+#: templates/personal.php:29
 #, php-format
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "Вы использовали <strong>%s</strong> из доступных <strong>%s</strong>"
 
-#: templates/personal.php:40 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:41 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "Пароль"
 
-#: templates/personal.php:41
+#: templates/personal.php:42
 msgid "Your password was changed"
 msgstr "Ваш пароль изменён"
 
-#: templates/personal.php:42
+#: templates/personal.php:43
 msgid "Unable to change your password"
 msgstr "Невозможно сменить пароль"
 
-#: templates/personal.php:43
+#: templates/personal.php:44
 msgid "Current password"
 msgstr "Текущий пароль"
 
-#: templates/personal.php:45
+#: templates/personal.php:46
 msgid "New password"
 msgstr "Новый пароль"
 
-#: templates/personal.php:47
+#: templates/personal.php:48
 msgid "Change password"
 msgstr "Сменить пароль"
 
-#: templates/personal.php:59 templates/users.php:85
+#: templates/personal.php:60 templates/users.php:85
 msgid "Display Name"
 msgstr "Отображаемое имя"
 
-#: templates/personal.php:74
+#: templates/personal.php:75
 msgid "Email"
 msgstr "E-mail"
 
-#: templates/personal.php:76
+#: templates/personal.php:77
 msgid "Your email address"
 msgstr "Ваш адрес электронной почты"
 
-#: templates/personal.php:77
+#: templates/personal.php:78
 msgid "Fill in an email address to enable password recovery"
 msgstr "Введите адрес электронной почты чтобы появилась возможность восстановления пароля"
 
-#: templates/personal.php:86 templates/personal.php:87
+#: templates/personal.php:87 templates/personal.php:88
 msgid "Language"
 msgstr "Язык"
 
-#: templates/personal.php:99
+#: templates/personal.php:100
 msgid "Help translate"
 msgstr "Помочь с переводом"
 
-#: templates/personal.php:105
+#: templates/personal.php:106
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:107
-msgid "Use this address to connect to your ownCloud in your file manager"
-msgstr "Используйте этот URL для подключения файлового менеджера к Вашему хранилищу"
+#: templates/personal.php:108
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
+"target=\"_blank\">access your Files via WebDAV</a>"
+msgstr ""
 
-#: templates/users.php:21 templates/users.php:84
+#: templates/users.php:21
 msgid "Login Name"
 msgstr "Имя пользователя"
 
@@ -473,7 +478,7 @@ msgstr "Восстановление Пароля Администратора"
 msgid ""
 "Enter the recovery password in order to recover the users files during "
 "password change"
-msgstr ""
+msgstr "Введите пароль для того, чтобы восстановить файлы пользователей при смене пароля"
 
 #: templates/users.php:42
 msgid "Default Storage"
@@ -487,6 +492,10 @@ msgstr "Неограниченно"
 msgid "Other"
 msgstr "Другое"
 
+#: templates/users.php:84
+msgid "Username"
+msgstr "Имя пользователя"
+
 #: templates/users.php:91
 msgid "Storage"
 msgstr "Хранилище"
@@ -501,4 +510,4 @@ msgstr "установить новый пароль"
 
 #: templates/users.php:137
 msgid "Default"
-msgstr "По-умолчанию"
+msgstr "По умолчанию"
diff --git a/l10n/ru/user_ldap.po b/l10n/ru/user_ldap.po
index e50bef440deeceecf5c602acbc7e1fa4c7e765fb..600bce5afd2716968a00150075d0fbb2838ae271 100644
--- a/l10n/ru/user_ldap.po
+++ b/l10n/ru/user_ldap.po
@@ -4,13 +4,14 @@
 # 
 # Translators:
 # Fenuks <fenuksuh@ya.ru>, 2013
+# alfsoft <alfsoft@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
-"Last-Translator: Fenuks <fenuksuh@ya.ru>\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:16+0000\n"
+"Last-Translator: alfsoft <alfsoft@gmail.com>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -359,7 +360,7 @@ msgid ""
 "achieve a similar behaviour as before ownCloud 5 enter the user display name"
 " attribute in the following field. Leave it empty for default behaviour. "
 "Changes will have effect only on newly mapped (added) LDAP users."
-msgstr ""
+msgstr "По-умолчанию внутреннее имя пользователя будет создано из атрибута UUID. Это необходимо для того, чтобы имя пользователя было уникальным и не содержало в себе запрещенных символов. Внутреннее имя пользователя может состоять только из следующих символов: [ a-zA-Z0-9_.@- ]. Остальные символы замещаются соответствиями из таблицы ASCII или же просто пропускаются. При совпадении к имени будет добавлено число. Внутреннее имя пользователя используется для внутренней идентификации пользователя. Также оно является именем по-умолчанию для папки пользователя в ownCloud. Оно также портом для удаленных ссылок, к примеру, для всех сервисов *DAV. С помощию данной настройки можно изменить поведение по-умолчанию. Чтобы достичь поведения, как было настроено до изменения, ownCloud 5 выводит атрибут имени пользователя в этом поле. Оставьте его пустым для режима по-умолчанию. Изменения будут иметь эффект только для новых подключенных (добавленных) пользователей LDAP."
 
 #: templates/settings.php:103
 msgid "Internal Username Attribute:"
@@ -378,7 +379,7 @@ msgid ""
 "You must make sure that the attribute of your choice can be fetched for both"
 " users and groups and it is unique. Leave it empty for default behaviour. "
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
-msgstr ""
+msgstr "По-умолчанию, ownCloud определяет атрибут UUID автоматически. Этот атрибут используется для того, чтобы достоверно индентифицировать пользователей и группы LDAP. Также, на основании атрибута UUID создается внутреннее имя пользователя, если выше не указано иначе. Вы можете переопределить эту настройку и указать свой атрибут по выбору. Вы должны удостовериться, что выбранный вами атрибут может быть выбран для пользователей и групп, а также то, что он уникальный. Оставьте поле пустым для поведения по-умолчанию. Изменения вступят в силу только для новых подключенных (добавленных) пользователей и групп LDAP."
 
 #: templates/settings.php:106
 msgid "UUID Attribute:"
@@ -401,7 +402,7 @@ msgid ""
 "configuration sensitive, it affects all LDAP configurations! Do never clear "
 "the mappings in a production environment. Only clear mappings in a testing "
 "or experimental stage."
-msgstr ""
+msgstr "ownCloud использует имена пользователей для хранения и назначения метаданных. Для точной идентификации и распознавания пользователей, каждый пользователь LDAP будет иметь свое внутреннее имя пользователя. Это требует наличия соответствия имени пользователя ownCloud к пользователю LDAP. При создании имя пользователя назначается идентификатору UUID пользователя LDAP. Помимо этого кэшируется доменное имя (DN) для снижения взаимодействия LDAP, однако оно не используется для идентификации. Если доменное имя было изменено, об этом станет известно ownCloud. Внутреннее имя ownCloud используется повсеместно в ownCloud. При очистке соответствий повсюду будут оставаться \"хвосты\". Очистка соответствий не привязана к конкретной конфигурации, она влияет на все конфигурации LDAP! Никогда не очищайте соответствия в рабочем окружении. Очищайте соответствия только во время тестов или в экспериментальных конфигурациях."
 
 #: templates/settings.php:109
 msgid "Clear Username-LDAP User Mapping"
diff --git a/l10n/ru/user_webdavauth.po b/l10n/ru/user_webdavauth.po
index ad92e25e80dbb8b65348b24d04504ad33e052310..c246ab7984969895d15318bf685b556e795a96e1 100644
--- a/l10n/ru/user_webdavauth.po
+++ b/l10n/ru/user_webdavauth.po
@@ -3,16 +3,18 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# lord93 <lordakryl@gmail.com>, 2013
 # Denis <reg.transifex.net@demitel.ru>, 2013
 # adol <sharov3@gmail.com>, 2012
 # skoptev <skoptev@ukr.net>, 2012
+# Victor Bravo <>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-15 01:59+0200\n"
-"PO-Revision-Date: 2013-06-15 00:00+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-07-09 02:03+0200\n"
+"PO-Revision-Date: 2013-07-08 10:40+0000\n"
+"Last-Translator: Victor Bravo <>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -26,11 +28,11 @@ msgstr "Идентификация WebDAV"
 
 #: templates/settings.php:4
 msgid "URL: "
-msgstr ""
+msgstr "URL:"
 
 #: templates/settings.php:7
 msgid ""
 "ownCloud will send the user credentials to this URL. This plugin checks the "
 "response and will interpret the HTTP statuscodes 401 and 403 as invalid "
 "credentials, and all other responses as valid credentials."
-msgstr "ownCloud отправит пользовательские данные на этот URL. Затем плагин проверит ответ, в случае HTTP ответа 401 или 403 данные будут считаться неверными, при любых других ответах - верными."
+msgstr "ownCloud отправит учётные данные пользователя на этот адрес. Затем плагин проверит ответ, в случае HTTP ответа 401 или 403 данные будут считаться неверными, при любых других ответах - верными."
diff --git a/l10n/si_LK/core.po b/l10n/si_LK/core.po
index 7b0b5b559662b7bd30b152e361273e14cbd60ca0..625f32a45e89b3ed850780c3985e8510f0c4b989 100644
--- a/l10n/si_LK/core.po
+++ b/l10n/si_LK/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:22+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:14+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
 "MIME-Version: 1.0\n"
@@ -61,135 +61,135 @@ msgstr "මකා දැමීම සඳහා ප්‍රවර්ගයන්
 msgid "Error removing %s from favorites."
 msgstr ""
 
-#: js/config.php:34
+#: js/config.php:32
 msgid "Sunday"
 msgstr "ඉරිදා"
 
-#: js/config.php:35
+#: js/config.php:33
 msgid "Monday"
 msgstr "සඳුදා"
 
-#: js/config.php:36
+#: js/config.php:34
 msgid "Tuesday"
 msgstr "අඟහරුවාදා"
 
-#: js/config.php:37
+#: js/config.php:35
 msgid "Wednesday"
 msgstr "බදාදා"
 
-#: js/config.php:38
+#: js/config.php:36
 msgid "Thursday"
 msgstr "බ්‍රහස්පතින්දා"
 
-#: js/config.php:39
+#: js/config.php:37
 msgid "Friday"
 msgstr "සිකුරාදා"
 
-#: js/config.php:40
+#: js/config.php:38
 msgid "Saturday"
 msgstr "සෙනසුරාදා"
 
-#: js/config.php:45
+#: js/config.php:43
 msgid "January"
 msgstr "ජනවාරි"
 
-#: js/config.php:46
+#: js/config.php:44
 msgid "February"
 msgstr "පෙබරවාරි"
 
-#: js/config.php:47
+#: js/config.php:45
 msgid "March"
 msgstr "මාර්තු"
 
-#: js/config.php:48
+#: js/config.php:46
 msgid "April"
 msgstr "අප්‍රේල්"
 
-#: js/config.php:49
+#: js/config.php:47
 msgid "May"
 msgstr "මැයි"
 
-#: js/config.php:50
+#: js/config.php:48
 msgid "June"
 msgstr "ජූනි"
 
-#: js/config.php:51
+#: js/config.php:49
 msgid "July"
 msgstr "ජූලි"
 
-#: js/config.php:52
+#: js/config.php:50
 msgid "August"
 msgstr "අගෝස්තු"
 
-#: js/config.php:53
+#: js/config.php:51
 msgid "September"
 msgstr "සැප්තැම්බර්"
 
-#: js/config.php:54
+#: js/config.php:52
 msgid "October"
 msgstr "ඔක්තෝබර"
 
-#: js/config.php:55
+#: js/config.php:53
 msgid "November"
 msgstr "නොවැම්බර්"
 
-#: js/config.php:56
+#: js/config.php:54
 msgid "December"
 msgstr "දෙසැම්බර්"
 
-#: js/js.js:286
+#: js/js.js:293
 msgid "Settings"
 msgstr "සිටුවම්"
 
-#: js/js.js:718
+#: js/js.js:725
 msgid "seconds ago"
 msgstr "තත්පරයන්ට පෙර"
 
-#: js/js.js:719
+#: js/js.js:726
 msgid "1 minute ago"
 msgstr "1 මිනිත්තුවකට පෙර"
 
-#: js/js.js:720
+#: js/js.js:727
 msgid "{minutes} minutes ago"
 msgstr ""
 
-#: js/js.js:721
+#: js/js.js:728
 msgid "1 hour ago"
 msgstr ""
 
-#: js/js.js:722
+#: js/js.js:729
 msgid "{hours} hours ago"
 msgstr ""
 
-#: js/js.js:723
+#: js/js.js:730
 msgid "today"
 msgstr "අද"
 
-#: js/js.js:724
+#: js/js.js:731
 msgid "yesterday"
 msgstr "ඊයේ"
 
-#: js/js.js:725
+#: js/js.js:732
 msgid "{days} days ago"
 msgstr ""
 
-#: js/js.js:726
+#: js/js.js:733
 msgid "last month"
 msgstr "පෙර මාසයේ"
 
-#: js/js.js:727
+#: js/js.js:734
 msgid "{months} months ago"
 msgstr ""
 
-#: js/js.js:728
+#: js/js.js:735
 msgid "months ago"
 msgstr "මාස කීපයකට පෙර"
 
-#: js/js.js:729
+#: js/js.js:736
 msgid "last year"
 msgstr "පෙර අවුරුද්දේ"
 
-#: js/js.js:730
+#: js/js.js:737
 msgid "years ago"
 msgstr "අවුරුදු කීපයකට පෙර"
 
@@ -225,8 +225,8 @@ msgstr ""
 #: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
 #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:577
-#: js/share.js:589
+#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:620
+#: js/share.js:632
 msgid "Error"
 msgstr "දෝෂයක්"
 
@@ -246,7 +246,7 @@ msgstr ""
 msgid "Share"
 msgstr "බෙදා හදා ගන්න"
 
-#: js/share.js:125 js/share.js:617
+#: js/share.js:125 js/share.js:660
 msgid "Error while sharing"
 msgstr ""
 
@@ -266,99 +266,103 @@ msgstr ""
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:159
+#: js/share.js:172
 msgid "Share with"
 msgstr "බෙදාගන්න"
 
-#: js/share.js:164
+#: js/share.js:177
 msgid "Share with link"
 msgstr "යොමුවක් මඟින් බෙදාගන්න"
 
-#: js/share.js:167
+#: js/share.js:180
 msgid "Password protect"
 msgstr "මුර පදයකින් ආරක්ශාකරන්න"
 
-#: js/share.js:169 templates/installation.php:54 templates/login.php:26
+#: js/share.js:182 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "මුර පදය"
 
-#: js/share.js:173
+#: js/share.js:187
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:191
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:174
+#: js/share.js:192
 msgid "Send"
 msgstr ""
 
-#: js/share.js:178
+#: js/share.js:197
 msgid "Set expiration date"
 msgstr "කල් ඉකුත් විමේ දිනය දමන්න"
 
-#: js/share.js:179
+#: js/share.js:198
 msgid "Expiration date"
 msgstr "කල් ඉකුත් විමේ දිනය"
 
-#: js/share.js:211
+#: js/share.js:230
 msgid "Share via email:"
 msgstr "විද්‍යුත් තැපෑල මඟින් බෙදාගන්න: "
 
-#: js/share.js:213
+#: js/share.js:232
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:251
+#: js/share.js:270
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:287
+#: js/share.js:306
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:308
+#: js/share.js:327
 msgid "Unshare"
 msgstr "නොබෙදු"
 
-#: js/share.js:320
+#: js/share.js:339
 msgid "can edit"
 msgstr "සංස්කරණය කළ හැක"
 
-#: js/share.js:322
+#: js/share.js:341
 msgid "access control"
 msgstr "ප්‍රවේශ පාලනය"
 
-#: js/share.js:325
+#: js/share.js:344
 msgid "create"
 msgstr "සදන්න"
 
-#: js/share.js:328
+#: js/share.js:347
 msgid "update"
 msgstr "යාවත්කාලීන කරන්න"
 
-#: js/share.js:331
+#: js/share.js:350
 msgid "delete"
 msgstr "මකන්න"
 
-#: js/share.js:334
+#: js/share.js:353
 msgid "share"
 msgstr "බෙදාහදාගන්න"
 
-#: js/share.js:368 js/share.js:564
+#: js/share.js:387 js/share.js:607
 msgid "Password protected"
 msgstr "මුර පදයකින් ආරක්ශාකර ඇත"
 
-#: js/share.js:577
+#: js/share.js:620
 msgid "Error unsetting expiration date"
 msgstr "කල් ඉකුත් දිනය ඉවත් කිරීමේ දෝෂයක්"
 
-#: js/share.js:589
+#: js/share.js:632
 msgid "Error setting expiration date"
 msgstr "කල් ඉකුත් දිනය ස්ථාපනය කිරීමේ දෝෂයක්"
 
-#: js/share.js:604
+#: js/share.js:647
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:615
+#: js/share.js:658
 msgid "Email sent"
 msgstr ""
 
@@ -373,7 +377,7 @@ msgstr ""
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
-#: lostpassword/controller.php:58
+#: lostpassword/controller.php:60
 msgid "ownCloud password reset"
 msgstr "ownCloud මුරපදය ප්‍රත්‍යාරම්භ කරන්න"
 
@@ -403,17 +407,17 @@ msgstr "පරිශීලක නම"
 
 #: lostpassword/templates/lostpassword.php:22
 msgid ""
-"Your files seems to be encrypted. If you didn't have enabled the recovery "
-"key there will be no way to get your data back once the password was "
-"resetted. If you are not sure what to do, please contact your administrator "
-"first before continue. Do you really want to continue?"
+"Your files are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
 msgstr ""
 
 #: lostpassword/templates/lostpassword.php:24
 msgid "Yes, I really want to reset my password now"
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:29
+#: lostpassword/templates/lostpassword.php:27
 msgid "Request reset"
 msgstr ""
 
@@ -461,7 +465,7 @@ msgstr "ඇතුල් වීම තහනම්"
 msgid "Cloud not found"
 msgstr "සොයා ගත නොහැක"
 
-#: templates/altmail.php:2
+#: templates/altmail.php:4
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -472,10 +476,6 @@ msgid ""
 "Cheers!"
 msgstr ""
 
-#: templates/altmail.php:7 templates/mail.php:24
-msgid "web services under your control"
-msgstr "ඔබට පාලනය කළ හැකි වෙබ් සේවාවන්"
-
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
 msgstr "ප්‍රභේදයන් සංස්කරණය"
@@ -568,12 +568,12 @@ msgstr "දත්තගබඩා සේවාදායකයා"
 msgid "Finish setup"
 msgstr "ස්ථාපනය කිරීම අවසන් කරන්න"
 
-#: templates/layout.user.php:40
+#: templates/layout.user.php:43
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:67
+#: templates/layout.user.php:68
 msgid "Log out"
 msgstr "නික්මීම"
 
@@ -607,7 +607,7 @@ msgstr "ප්‍රවේශවන්න"
 msgid "Alternative Logins"
 msgstr ""
 
-#: templates/mail.php:15
+#: templates/mail.php:16
 #, php-format
 msgid ""
 "Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
diff --git a/l10n/si_LK/files.po b/l10n/si_LK/files.po
index ff3caa0613e142b03312751550e29f828316a5a4..6cff435336f1c99572df505b9717c21ba40c3c78 100644
--- a/l10n/si_LK/files.po
+++ b/l10n/si_LK/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:01+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
 "MIME-Version: 1.0\n"
@@ -27,46 +27,54 @@ msgstr ""
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/upload.php:19
+#: ajax/upload.php:16 ajax/upload.php:45
+msgid "Unable to set upload directory."
+msgstr ""
+
+#: ajax/upload.php:22
+msgid "Invalid Token"
+msgstr ""
+
+#: ajax/upload.php:59
 msgid "No file was uploaded. Unknown error"
 msgstr "ගොනුවක් උඩුගත නොවුනි. නොහැඳිනු දෝෂයක්"
 
-#: ajax/upload.php:26
+#: ajax/upload.php:66
 msgid "There is no error, the file uploaded with success"
 msgstr "දෝෂයක් නොමැත. සාර්ථකව ගොනුව උඩුගත කෙරුණි"
 
-#: ajax/upload.php:27
+#: ajax/upload.php:67
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:29
+#: ajax/upload.php:69
 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:30
+#: ajax/upload.php:70
 msgid "The uploaded file was only partially uploaded"
 msgstr "උඩුගත කළ ගොනුවේ කොටසක් පමණක් උඩුගත විය"
 
-#: ajax/upload.php:31
+#: ajax/upload.php:71
 msgid "No file was uploaded"
 msgstr "ගොනුවක් උඩුගත නොවුණි"
 
-#: ajax/upload.php:32
+#: ajax/upload.php:72
 msgid "Missing a temporary folder"
 msgstr "තාවකාලික ෆොල්ඩරයක් අතුරුදහන්"
 
-#: ajax/upload.php:33
+#: ajax/upload.php:73
 msgid "Failed to write to disk"
 msgstr "තැටිගත කිරීම අසාර්ථකයි"
 
-#: ajax/upload.php:51
+#: ajax/upload.php:91
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:83
+#: ajax/upload.php:123
 msgid "Invalid directory."
 msgstr ""
 
@@ -74,6 +82,36 @@ msgstr ""
 msgid "Files"
 msgstr "ගොනු"
 
+#: js/file-upload.js:11
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/file-upload.js:24
+msgid "Not enough space available"
+msgstr ""
+
+#: js/file-upload.js:64
+msgid "Upload cancelled."
+msgstr "උඩුගත කිරීම අත් හරින්න ලදී"
+
+#: js/file-upload.js:167 js/files.js:266
+msgid ""
+"File upload is in progress. Leaving the page now will cancel the upload."
+msgstr "උඩුගතකිරීමක් සිදුවේ. පිටුව හැර යාමෙන් එය නැවතෙනු ඇත"
+
+#: js/file-upload.js:233 js/files.js:339
+msgid "URL cannot be empty."
+msgstr "යොමුව හිස් විය නොහැක"
+
+#: js/file-upload.js:238 lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr ""
+
+#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
+#: js/files.js:693 js/files.js:731
+msgid "Error"
+msgstr "දෝෂයක්"
+
 #: js/fileactions.js:116
 msgid "Share"
 msgstr "බෙදා හදා ගන්න"
@@ -90,43 +128,43 @@ msgstr "මකා දමන්න"
 msgid "Rename"
 msgstr "නැවත නම් කරන්න"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:464
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "replace"
 msgstr "ප්‍රතිස්ථාපනය කරන්න"
 
-#: js/filelist.js:259
+#: js/filelist.js:302
 msgid "suggest name"
 msgstr "නමක් යෝජනා කරන්න"
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "cancel"
 msgstr "අත් හරින්න"
 
-#: js/filelist.js:306
+#: js/filelist.js:349
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:306
+#: js/filelist.js:349
 msgid "undo"
 msgstr "නිෂ්ප්‍රභ කරන්න"
 
-#: js/filelist.js:331
+#: js/filelist.js:374
 msgid "perform delete operation"
 msgstr ""
 
-#: js/filelist.js:413
+#: js/filelist.js:456
 msgid "1 file uploading"
 msgstr "1 ගොනුවක් උඩගත කෙරේ"
 
-#: js/filelist.js:416 js/filelist.js:470
+#: js/filelist.js:459 js/filelist.js:517
 msgid "files uploading"
 msgstr ""
 
@@ -158,69 +196,41 @@ msgid ""
 "big."
 msgstr ""
 
-#: js/files.js:264
-msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr ""
-
-#: js/files.js:277
-msgid "Not enough space available"
-msgstr ""
-
-#: js/files.js:317
-msgid "Upload cancelled."
-msgstr "උඩුගත කිරීම අත් හරින්න ලදී"
-
-#: js/files.js:413
-msgid ""
-"File upload is in progress. Leaving the page now will cancel the upload."
-msgstr "උඩුගතකිරීමක් සිදුවේ. පිටුව හැර යාමෙන් එය නැවතෙනු ඇත"
-
-#: js/files.js:486
-msgid "URL cannot be empty."
-msgstr "යොමුව හිස් විය නොහැක"
-
-#: js/files.js:491
+#: js/files.js:344
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
-msgid "Error"
-msgstr "දෝෂයක්"
-
-#: js/files.js:877 templates/index.php:69
+#: js/files.js:744 templates/index.php:69
 msgid "Name"
 msgstr "නම"
 
-#: js/files.js:878 templates/index.php:80
+#: js/files.js:745 templates/index.php:80
 msgid "Size"
 msgstr "ප්‍රමාණය"
 
-#: js/files.js:879 templates/index.php:82
+#: js/files.js:746 templates/index.php:82
 msgid "Modified"
 msgstr "වෙනස් කළ"
 
-#: js/files.js:898
+#: js/files.js:765
 msgid "1 folder"
 msgstr "1 ෆොල්ඩරයක්"
 
-#: js/files.js:900
+#: js/files.js:767
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:908
+#: js/files.js:775
 msgid "1 file"
 msgstr "1 ගොනුවක්"
 
-#: js/files.js:910
+#: js/files.js:777
 msgid "{count} files"
 msgstr ""
 
-#: lib/app.php:53
-msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
-msgstr ""
-
 #: lib/app.php:73
-msgid "Unable to rename file"
+#, php-format
+msgid "%s could not be renamed"
 msgstr ""
 
 #: lib/helper.php:11 templates/index.php:18
@@ -317,6 +327,22 @@ msgstr "ගොනු පරික්ෂා කෙරේ. මඳක් රැඳ
 msgid "Current scanning"
 msgstr "වර්තමාන පරික්ෂාව"
 
+#: templates/part.list.php:76
+msgid "directory"
+msgstr ""
+
+#: templates/part.list.php:78
+msgid "directories"
+msgstr ""
+
+#: templates/part.list.php:87
+msgid "file"
+msgstr "ගොනුව"
+
+#: templates/part.list.php:89
+msgid "files"
+msgstr "ගොනු"
+
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
 msgstr ""
diff --git a/l10n/si_LK/files_encryption.po b/l10n/si_LK/files_encryption.po
index 0ccbfdf0bd0ebd9c258189aa55d5f494663e9b33..fee22ab53772f069b6121cdaf0f84acb502743df 100644
--- a/l10n/si_LK/files_encryption.po
+++ b/l10n/si_LK/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-14 02:46+0200\n"
-"PO-Revision-Date: 2013-06-14 00:47+0000\n"
+"POT-Creation-Date: 2013-07-05 02:12+0200\n"
+"PO-Revision-Date: 2013-07-05 00:13+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"
@@ -55,9 +55,21 @@ msgstr ""
 
 #: files/error.php:7
 msgid ""
-"Your private key is not valid! Maybe your password was changed from outside."
-" You can update your private key password in your personal settings to "
-"regain access to your files"
+"Your private key is not valid! Likely your password was changed outside the "
+"ownCloud system (e.g. your corporate directory). You can update your private"
+" key password in your personal settings to recover access to your encrypted "
+"files."
+msgstr ""
+
+#: hooks/hooks.php:44
+msgid "Missing requirements."
+msgstr ""
+
+#: hooks/hooks.php:45
+msgid ""
+"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL "
+"PHP extension is enabled and configured properly. For now, the encryption "
+"app has been disabled."
 msgstr ""
 
 #: js/settings-admin.js:11
@@ -84,11 +96,11 @@ msgstr "ගුප්ත කේතනය"
 
 #: templates/settings-admin.php:10
 msgid ""
-"Enable encryption passwords recovery key (allow sharing to recovery key):"
+"Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
 #: templates/settings-admin.php:14
-msgid "Recovery account password"
+msgid "Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:21 templates/settings-personal.php:54
@@ -100,15 +112,15 @@ msgid "Disabled"
 msgstr ""
 
 #: templates/settings-admin.php:34
-msgid "Change encryption passwords recovery key:"
+msgid "Change recovery key password:"
 msgstr ""
 
 #: templates/settings-admin.php:41
-msgid "Old Recovery account password"
+msgid "Old Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:48
-msgid "New Recovery account password"
+msgid "New Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:53
diff --git a/l10n/si_LK/files_external.po b/l10n/si_LK/files_external.po
index 22557191d0467d46f789f264a75ca50a2f1e3344..dc16ff8bcb556433ca3e9f1ff95b2ee9236e6d5d 100644
--- a/l10n/si_LK/files_external.po
+++ b/l10n/si_LK/files_external.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/si_LK/files_sharing.po b/l10n/si_LK/files_sharing.po
index 03c481103aa7f82c82d80990f485e2ee690d964d..5b3bfd4108efcd01c8e4cfcd8e846f2dc02a79d8 100644
--- a/l10n/si_LK/files_sharing.po
+++ b/l10n/si_LK/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
 "MIME-Version: 1.0\n"
@@ -18,27 +18,39 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: templates/authenticate.php:4
+msgid "The password is wrong. Try again."
+msgstr ""
+
+#: templates/authenticate.php:7
 msgid "Password"
 msgstr "මුර පදය"
 
-#: templates/authenticate.php:6
+#: templates/authenticate.php:9
 msgid "Submit"
 msgstr "යොමු කරන්න"
 
-#: templates/public.php:10
+#: templates/public.php:17
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s ඔබව %s ෆෝල්ඩරයට හවුල් කරගත්තේය"
 
-#: templates/public.php:13
+#: templates/public.php:20
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s ඔබ සමඟ %s ගොනුව බෙදාහදාගත්තේය"
 
-#: templates/public.php:19 templates/public.php:43
+#: templates/public.php:28 templates/public.php:90
 msgid "Download"
 msgstr "බාන්න"
 
-#: templates/public.php:40
+#: templates/public.php:45 templates/public.php:48
+msgid "Upload"
+msgstr "උඩුගත කරන්න"
+
+#: templates/public.php:58
+msgid "Cancel upload"
+msgstr "උඩුගත කිරීම අත් හරින්න"
+
+#: templates/public.php:87
 msgid "No preview available for"
 msgstr "පූර්වදර්ශනයක් නොමැත"
diff --git a/l10n/si_LK/files_trashbin.po b/l10n/si_LK/files_trashbin.po
index e8c75ae0edbf2af0107eae21a50c3851c9dbd616..e36b324e82ea95276bf60a495fe72720168d74ad 100644
--- a/l10n/si_LK/files_trashbin.po
+++ b/l10n/si_LK/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/si_LK/lib.po b/l10n/si_LK/lib.po
index c61ce1e7324d171050a10da179c8740f1945d18b..88db827ca633826ff9c31f49860f953ded8a7f72 100644
--- a/l10n/si_LK/lib.po
+++ b/l10n/si_LK/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
 "MIME-Version: 1.0\n"
@@ -17,43 +17,47 @@ msgstr ""
 "Language: si_LK\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:359
+#: app.php:360
 msgid "Help"
 msgstr "උදව්"
 
-#: app.php:372
+#: app.php:373
 msgid "Personal"
 msgstr "පෞද්ගලික"
 
-#: app.php:383
+#: app.php:384
 msgid "Settings"
 msgstr "සිටුවම්"
 
-#: app.php:395
+#: app.php:396
 msgid "Users"
 msgstr "පරිශීලකයන්"
 
-#: app.php:408
+#: app.php:409
 msgid "Apps"
 msgstr "යෙදුම්"
 
-#: app.php:416
+#: app.php:417
 msgid "Admin"
 msgstr "පරිපාලක"
 
-#: files.php:210
+#: defaults.php:33
+msgid "web services under your control"
+msgstr "ඔබට පාලනය කළ හැකි වෙබ් සේවාවන්"
+
+#: files.php:226
 msgid "ZIP download is turned off."
 msgstr "ZIP භාගත කිරීම් අක්‍රියයි"
 
-#: files.php:211
+#: files.php:227
 msgid "Files need to be downloaded one by one."
 msgstr "ගොනු එකින් එක භාගත යුතුයි"
 
-#: files.php:212 files.php:245
+#: files.php:228 files.php:261
 msgid "Back to Files"
 msgstr "ගොනු වෙතට නැවත යන්න"
 
-#: files.php:242
+#: files.php:258
 msgid "Selected files too large to generate zip file."
 msgstr "තෝරාගත් ගොනු ZIP ගොනුවක් තැනීමට විශාල වැඩිය."
 
@@ -85,104 +89,102 @@ msgstr "පෙළ"
 msgid "Images"
 msgstr "අනු රූ"
 
-#: setup.php:34
-msgid "Set an admin username."
-msgstr ""
-
-#: setup.php:37
-msgid "Set an admin password."
-msgstr ""
-
-#: setup.php:55
+#: setup/abstractdatabase.php:22
 #, php-format
 msgid "%s enter the database username."
 msgstr ""
 
-#: setup.php:58
+#: setup/abstractdatabase.php:25
 #, php-format
 msgid "%s enter the database name."
 msgstr ""
 
-#: setup.php:61
+#: setup/abstractdatabase.php:28
 #, php-format
 msgid "%s you may not use dots in the database name"
 msgstr ""
 
-#: setup.php:64
+#: setup/mssql.php:20
 #, php-format
-msgid "%s set the database host."
-msgstr ""
-
-#: setup.php:126 setup.php:332 setup.php:377
-msgid "PostgreSQL username and/or password not valid"
+msgid "MS SQL username and/or password not valid: %s"
 msgstr ""
 
-#: setup.php:127 setup.php:235
+#: setup/mssql.php:21 setup/mysql.php:13 setup/oci.php:114
+#: setup/postgresql.php:24 setup/postgresql.php:70
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:152
-msgid "Oracle connection could not be established"
-msgstr ""
-
-#: setup.php:234
+#: setup/mysql.php:12
 msgid "MySQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:288 setup.php:398 setup.php:407 setup.php:425 setup.php:435
-#: setup.php:444 setup.php:477 setup.php:543 setup.php:569 setup.php:576
-#: setup.php:587 setup.php:594 setup.php:603 setup.php:611 setup.php:620
-#: setup.php:626
+#: setup/mysql.php:67 setup/oci.php:54 setup/oci.php:121 setup/oci.php:147
+#: setup/oci.php:154 setup/oci.php:165 setup/oci.php:172 setup/oci.php:181
+#: setup/oci.php:189 setup/oci.php:198 setup/oci.php:204
+#: setup/postgresql.php:89 setup/postgresql.php:98 setup/postgresql.php:115
+#: setup/postgresql.php:125 setup/postgresql.php:134
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr ""
 
-#: setup.php:289 setup.php:399 setup.php:408 setup.php:426 setup.php:436
-#: setup.php:445 setup.php:478 setup.php:544 setup.php:570 setup.php:577
-#: setup.php:588 setup.php:604 setup.php:612 setup.php:621
+#: setup/mysql.php:68 setup/oci.php:55 setup/oci.php:122 setup/oci.php:148
+#: setup/oci.php:155 setup/oci.php:166 setup/oci.php:182 setup/oci.php:190
+#: setup/oci.php:199 setup/postgresql.php:90 setup/postgresql.php:99
+#: setup/postgresql.php:116 setup/postgresql.php:126 setup/postgresql.php:135
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:305
+#: setup/mysql.php:85
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:306
+#: setup/mysql.php:86
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:311
+#: setup/mysql.php:91
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:312
+#: setup/mysql.php:92
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:469 setup.php:536
+#: setup/oci.php:34
+msgid "Oracle connection could not be established"
+msgstr ""
+
+#: setup/oci.php:41 setup/oci.php:113
 msgid "Oracle username and/or password not valid"
 msgstr ""
 
-#: setup.php:595 setup.php:627
+#: setup/oci.php:173 setup/oci.php:205
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:647
-#, php-format
-msgid "MS SQL username and/or password not valid: %s"
+#: setup/postgresql.php:23 setup/postgresql.php:69
+msgid "PostgreSQL username and/or password not valid"
+msgstr ""
+
+#: setup.php:42
+msgid "Set an admin username."
+msgstr ""
+
+#: setup.php:45
+msgid "Set an admin password."
 msgstr ""
 
-#: setup.php:870
+#: setup.php:198
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:871
+#: setup.php:199
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
diff --git a/l10n/si_LK/settings.po b/l10n/si_LK/settings.po
index 36accd932007cf94c3007cb9ca5137c1868c1438..b6d7297ef0c67c121af9c4405c2b3256088d13dc 100644
--- a/l10n/si_LK/settings.po
+++ b/l10n/si_LK/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
 "MIME-Version: 1.0\n"
@@ -88,35 +88,35 @@ msgstr "පරිශීලකයා %s කණ්ඩායමින් ඉවත
 msgid "Couldn't update app."
 msgstr ""
 
-#: js/apps.js:30
+#: js/apps.js:35
 msgid "Update to {appversion}"
 msgstr ""
 
-#: js/apps.js:36 js/apps.js:76
+#: js/apps.js:41 js/apps.js:81
 msgid "Disable"
 msgstr "අක්‍රිය කරන්න"
 
-#: js/apps.js:36 js/apps.js:64 js/apps.js:83
+#: js/apps.js:41 js/apps.js:69 js/apps.js:88
 msgid "Enable"
 msgstr "සක්‍රිය කරන්න"
 
-#: js/apps.js:55
+#: js/apps.js:60
 msgid "Please wait...."
 msgstr ""
 
-#: js/apps.js:59 js/apps.js:71 js/apps.js:80 js/apps.js:93
+#: js/apps.js:64 js/apps.js:76 js/apps.js:85 js/apps.js:98
 msgid "Error"
 msgstr "දෝෂයක්"
 
-#: js/apps.js:90
+#: js/apps.js:95
 msgid "Updating...."
 msgstr ""
 
-#: js/apps.js:93
+#: js/apps.js:98
 msgid "Error while updating app"
 msgstr ""
 
-#: js/apps.js:96
+#: js/apps.js:101
 msgid "Updated"
 msgstr ""
 
@@ -165,15 +165,15 @@ msgstr ""
 msgid "A valid password must be provided"
 msgstr ""
 
-#: personal.php:35 personal.php:36
+#: personal.php:37 personal.php:38
 msgid "__language_name__"
 msgstr ""
 
-#: templates/admin.php:15
+#: templates/admin.php:17
 msgid "Security Warning"
 msgstr "ආරක්ෂක නිවේදනයක්"
 
-#: templates/admin.php:18
+#: templates/admin.php:20
 msgid ""
 "Your data directory and your files are probably accessible from the "
 "internet. The .htaccess file that ownCloud provides is not working. We "
@@ -182,36 +182,36 @@ msgid ""
 " webserver document root."
 msgstr "ඔබගේ දත්ත ඩිරෙක්ටරිය හා ගොනුවලට අන්තර්ජාලයෙන් පිවිසිය හැක. ownCloud සපයා ඇති .htaccess ගොනුව ක්‍රියාකරන්නේ නැත. අපි තරයේ කියා සිටිනුයේ නම්, මෙම දත්ත හා ගොනු එසේ පිවිසීමට නොහැකි වන ලෙස ඔබේ වෙබ් සේවාදායකයා  වින්‍යාස කරන ලෙස හෝ එම ඩිරෙක්ටරිය වෙබ් මූලයෙන් පිටතට ගෙනයන ලෙසය."
 
-#: templates/admin.php:29
+#: templates/admin.php:31
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:32
+#: templates/admin.php:34
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: templates/admin.php:33
+#: templates/admin.php:35
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:44
+#: templates/admin.php:46
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:47
+#: templates/admin.php:49
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr ""
 
-#: templates/admin.php:58
+#: templates/admin.php:60
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:63
+#: templates/admin.php:65
 #, php-format
 msgid ""
 "This ownCloud server can't set system locale to %s. This means that there "
@@ -219,11 +219,11 @@ msgid ""
 " to install the required packages on your system to support %s."
 msgstr ""
 
-#: templates/admin.php:75
+#: templates/admin.php:77
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:78
+#: templates/admin.php:80
 msgid ""
 "This ownCloud server has no working internet connection. This means that "
 "some of the features like mounting of external storage, notifications about "
@@ -233,102 +233,102 @@ msgid ""
 " of ownCloud."
 msgstr ""
 
-#: templates/admin.php:92
+#: templates/admin.php:94
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:101
+#: templates/admin.php:103
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:111
+#: templates/admin.php:113
 msgid ""
 "cron.php is registered at a webcron service. Call the cron.php page in the "
 "owncloud root once a minute over http."
 msgstr ""
 
-#: templates/admin.php:121
+#: templates/admin.php:123
 msgid ""
 "Use systems cron service. Call the cron.php file in the owncloud folder via "
 "a system cronjob once a minute."
 msgstr ""
 
-#: templates/admin.php:128
+#: templates/admin.php:130
 msgid "Sharing"
 msgstr "හුවමාරු කිරීම"
 
-#: templates/admin.php:134
+#: templates/admin.php:136
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:135
+#: templates/admin.php:137
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:142
+#: templates/admin.php:144
 msgid "Allow links"
 msgstr "යොමු සලසන්න"
 
-#: templates/admin.php:143
+#: templates/admin.php:145
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:150
+#: templates/admin.php:152
 msgid "Allow resharing"
 msgstr "යළි යළිත් හුවමාරුවට අවසර දෙමි"
 
-#: templates/admin.php:151
+#: templates/admin.php:153
 msgid "Allow users to share items shared with them again"
 msgstr "හුවමාරු කළ  හුවමාරුවට අවසර දෙමි"
 
-#: templates/admin.php:158
+#: templates/admin.php:160
 msgid "Allow users to share with anyone"
 msgstr "ඕනෑම අයෙකු හා හුවමාරුවට අවසර දෙමි"
 
-#: templates/admin.php:161
+#: templates/admin.php:163
 msgid "Allow users to only share with users in their groups"
 msgstr "තම කණ්ඩායමේ අයෙකු හා පමණක් හුවමාරුවට අවසර දෙමි"
 
-#: templates/admin.php:168
+#: templates/admin.php:170
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:181
+#: templates/admin.php:183
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:182
+#: templates/admin.php:184
 msgid ""
 "Enforces the clients to connect to ownCloud via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:185
+#: templates/admin.php:187
 msgid ""
 "Please connect to this ownCloud instance via HTTPS to enable or disable the "
 "SSL enforcement."
 msgstr ""
 
-#: templates/admin.php:195
+#: templates/admin.php:197
 msgid "Log"
 msgstr "ලඝුව"
 
-#: templates/admin.php:196
+#: templates/admin.php:198
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:227
+#: templates/admin.php:229
 msgid "More"
 msgstr "වැඩි"
 
-#: templates/admin.php:228
+#: templates/admin.php:230
 msgid "Less"
 msgstr "අඩු"
 
-#: templates/admin.php:235 templates/personal.php:116
+#: templates/admin.php:236 templates/personal.php:116
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:237 templates/personal.php:119
+#: templates/admin.php:240 templates/personal.php:119
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -386,76 +386,79 @@ msgstr ""
 msgid "Commercial Support"
 msgstr ""
 
-#: templates/personal.php:9
+#: templates/personal.php:10
 msgid "Get the apps to sync your files"
 msgstr ""
 
-#: templates/personal.php:20
+#: templates/personal.php:21
 msgid "Show First Run Wizard again"
 msgstr ""
 
-#: templates/personal.php:28
+#: templates/personal.php:29
 #, php-format
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr ""
 
-#: templates/personal.php:40 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:41 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "මුර පදය"
 
-#: templates/personal.php:41
+#: templates/personal.php:42
 msgid "Your password was changed"
 msgstr "ඔබගේ මුර පදය වෙනස් කෙරුණි"
 
-#: templates/personal.php:42
+#: templates/personal.php:43
 msgid "Unable to change your password"
 msgstr "මුර පදය වෙනස් කළ නොහැකි විය"
 
-#: templates/personal.php:43
+#: templates/personal.php:44
 msgid "Current password"
 msgstr "වත්මන් මුරපදය"
 
-#: templates/personal.php:45
+#: templates/personal.php:46
 msgid "New password"
 msgstr "නව මුරපදය"
 
-#: templates/personal.php:47
+#: templates/personal.php:48
 msgid "Change password"
 msgstr "මුරපදය වෙනස් කිරීම"
 
-#: templates/personal.php:59 templates/users.php:85
+#: templates/personal.php:60 templates/users.php:85
 msgid "Display Name"
 msgstr ""
 
-#: templates/personal.php:74
+#: templates/personal.php:75
 msgid "Email"
 msgstr "විද්‍යුත් තැපෑල"
 
-#: templates/personal.php:76
+#: templates/personal.php:77
 msgid "Your email address"
 msgstr "ඔබගේ විද්‍යුත් තැපෑල"
 
-#: templates/personal.php:77
+#: templates/personal.php:78
 msgid "Fill in an email address to enable password recovery"
 msgstr "මුරපද ප්‍රතිස්ථාපනය සඳහා විද්‍යුත් තැපැල් විස්තර ලබා දෙන්න"
 
-#: templates/personal.php:86 templates/personal.php:87
+#: templates/personal.php:87 templates/personal.php:88
 msgid "Language"
 msgstr "භාෂාව"
 
-#: templates/personal.php:99
+#: templates/personal.php:100
 msgid "Help translate"
 msgstr "පරිවර්ථන සහය"
 
-#: templates/personal.php:105
+#: templates/personal.php:106
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:107
-msgid "Use this address to connect to your ownCloud in your file manager"
+#: templates/personal.php:108
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
+"target=\"_blank\">access your Files via WebDAV</a>"
 msgstr ""
 
-#: templates/users.php:21 templates/users.php:84
+#: templates/users.php:21
 msgid "Login Name"
 msgstr ""
 
@@ -485,6 +488,10 @@ msgstr ""
 msgid "Other"
 msgstr "වෙනත්"
 
+#: templates/users.php:84
+msgid "Username"
+msgstr "පරිශීලක නම"
+
 #: templates/users.php:91
 msgid "Storage"
 msgstr ""
diff --git a/l10n/si_LK/user_ldap.po b/l10n/si_LK/user_ldap.po
index 659e656d1788a8420a4576d9cf9dbeaa2b6bb203..d0248c7e173d07226b8e69cfbbd325ae1910c767 100644
--- a/l10n/si_LK/user_ldap.po
+++ b/l10n/si_LK/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:16+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/sk/core.po b/l10n/sk/core.po
index 4910cee063b0078bfbcc3452bc71e2107aba71ed..0afee3edf45f3ad3dc7e822462a5c0c756a4a3ee 100644
--- a/l10n/sk/core.po
+++ b/l10n/sk/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-15 01:59+0200\n"
-"PO-Revision-Date: 2013-06-14 23:59+0000\n"
+"POT-Creation-Date: 2013-07-06 02:02+0200\n"
+"PO-Revision-Date: 2013-07-06 00:02+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Slovak (http://www.transifex.com/projects/p/owncloud/language/sk/)\n"
 "MIME-Version: 1.0\n"
@@ -61,135 +61,135 @@ msgstr ""
 msgid "Error removing %s from favorites."
 msgstr ""
 
-#: js/config.php:34
+#: js/config.php:32
 msgid "Sunday"
 msgstr ""
 
-#: js/config.php:35
+#: js/config.php:33
 msgid "Monday"
 msgstr ""
 
-#: js/config.php:36
+#: js/config.php:34
 msgid "Tuesday"
 msgstr ""
 
-#: js/config.php:37
+#: js/config.php:35
 msgid "Wednesday"
 msgstr ""
 
-#: js/config.php:38
+#: js/config.php:36
 msgid "Thursday"
 msgstr ""
 
-#: js/config.php:39
+#: js/config.php:37
 msgid "Friday"
 msgstr ""
 
-#: js/config.php:40
+#: js/config.php:38
 msgid "Saturday"
 msgstr ""
 
-#: js/config.php:45
+#: js/config.php:43
 msgid "January"
 msgstr ""
 
-#: js/config.php:46
+#: js/config.php:44
 msgid "February"
 msgstr ""
 
-#: js/config.php:47
+#: js/config.php:45
 msgid "March"
 msgstr ""
 
-#: js/config.php:48
+#: js/config.php:46
 msgid "April"
 msgstr ""
 
-#: js/config.php:49
+#: js/config.php:47
 msgid "May"
 msgstr ""
 
-#: js/config.php:50
+#: js/config.php:48
 msgid "June"
 msgstr ""
 
-#: js/config.php:51
+#: js/config.php:49
 msgid "July"
 msgstr ""
 
-#: js/config.php:52
+#: js/config.php:50
 msgid "August"
 msgstr ""
 
-#: js/config.php:53
+#: js/config.php:51
 msgid "September"
 msgstr ""
 
-#: js/config.php:54
+#: js/config.php:52
 msgid "October"
 msgstr ""
 
-#: js/config.php:55
+#: js/config.php:53
 msgid "November"
 msgstr ""
 
-#: js/config.php:56
+#: js/config.php:54
 msgid "December"
 msgstr ""
 
-#: js/js.js:286
+#: js/js.js:289
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:718
+#: js/js.js:721
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:719
+#: js/js.js:722
 msgid "1 minute ago"
 msgstr ""
 
-#: js/js.js:720
+#: js/js.js:723
 msgid "{minutes} minutes ago"
 msgstr ""
 
-#: js/js.js:721
+#: js/js.js:724
 msgid "1 hour ago"
 msgstr ""
 
-#: js/js.js:722
+#: js/js.js:725
 msgid "{hours} hours ago"
 msgstr ""
 
-#: js/js.js:723
+#: js/js.js:726
 msgid "today"
 msgstr ""
 
-#: js/js.js:724
+#: js/js.js:727
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:725
+#: js/js.js:728
 msgid "{days} days ago"
 msgstr ""
 
-#: js/js.js:726
+#: js/js.js:729
 msgid "last month"
 msgstr ""
 
-#: js/js.js:727
+#: js/js.js:730
 msgid "{months} months ago"
 msgstr ""
 
-#: js/js.js:728
+#: js/js.js:731
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:729
+#: js/js.js:732
 msgid "last year"
 msgstr ""
 
-#: js/js.js:730
+#: js/js.js:733
 msgid "years ago"
 msgstr ""
 
@@ -225,8 +225,8 @@ msgstr ""
 #: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
 #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:577
-#: js/share.js:589
+#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:620
+#: js/share.js:632
 msgid "Error"
 msgstr ""
 
@@ -246,7 +246,7 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: js/share.js:125 js/share.js:617
+#: js/share.js:125 js/share.js:660
 msgid "Error while sharing"
 msgstr ""
 
@@ -266,99 +266,103 @@ msgstr ""
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:159
+#: js/share.js:172
 msgid "Share with"
 msgstr ""
 
-#: js/share.js:164
+#: js/share.js:177
 msgid "Share with link"
 msgstr ""
 
-#: js/share.js:167
+#: js/share.js:180
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:169 templates/installation.php:54 templates/login.php:26
+#: js/share.js:182 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr ""
 
-#: js/share.js:173
+#: js/share.js:187
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:191
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:174
+#: js/share.js:192
 msgid "Send"
 msgstr ""
 
-#: js/share.js:178
+#: js/share.js:197
 msgid "Set expiration date"
 msgstr ""
 
-#: js/share.js:179
+#: js/share.js:198
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:211
+#: js/share.js:230
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:213
+#: js/share.js:232
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:251
+#: js/share.js:270
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:287
+#: js/share.js:306
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:308
+#: js/share.js:327
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:320
+#: js/share.js:339
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:322
+#: js/share.js:341
 msgid "access control"
 msgstr ""
 
-#: js/share.js:325
+#: js/share.js:344
 msgid "create"
 msgstr ""
 
-#: js/share.js:328
+#: js/share.js:347
 msgid "update"
 msgstr ""
 
-#: js/share.js:331
+#: js/share.js:350
 msgid "delete"
 msgstr ""
 
-#: js/share.js:334
+#: js/share.js:353
 msgid "share"
 msgstr ""
 
-#: js/share.js:368 js/share.js:564
+#: js/share.js:387 js/share.js:607
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:577
+#: js/share.js:620
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:589
+#: js/share.js:632
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:604
+#: js/share.js:647
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:615
+#: js/share.js:658
 msgid "Email sent"
 msgstr ""
 
@@ -373,7 +377,7 @@ msgstr ""
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
-#: lostpassword/controller.php:58
+#: lostpassword/controller.php:60
 msgid "ownCloud password reset"
 msgstr ""
 
@@ -403,17 +407,17 @@ msgstr ""
 
 #: lostpassword/templates/lostpassword.php:22
 msgid ""
-"Your files seems to be encrypted. If you didn't have enabled the recovery "
-"key there will be no way to get your data back once the password was "
-"resetted. If you are not sure what to do, please contact your administrator "
-"first before continue. Do you really want to continue?"
+"Your files are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
 msgstr ""
 
 #: lostpassword/templates/lostpassword.php:24
 msgid "Yes, I really want to reset my password now"
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:29
+#: lostpassword/templates/lostpassword.php:27
 msgid "Request reset"
 msgstr ""
 
@@ -461,7 +465,7 @@ msgstr ""
 msgid "Cloud not found"
 msgstr ""
 
-#: templates/altmail.php:2
+#: templates/altmail.php:4
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -472,10 +476,6 @@ msgid ""
 "Cheers!"
 msgstr ""
 
-#: templates/altmail.php:7 templates/mail.php:24
-msgid "web services under your control"
-msgstr ""
-
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
 msgstr ""
@@ -568,12 +568,12 @@ msgstr ""
 msgid "Finish setup"
 msgstr ""
 
-#: templates/layout.user.php:40
+#: templates/layout.user.php:43
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:67
+#: templates/layout.user.php:68
 msgid "Log out"
 msgstr ""
 
@@ -607,7 +607,7 @@ msgstr ""
 msgid "Alternative Logins"
 msgstr ""
 
-#: templates/mail.php:15
+#: templates/mail.php:16
 #, php-format
 msgid ""
 "Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
diff --git a/l10n/sk/files.po b/l10n/sk/files.po
index 98060efa362ff91eb49974421a21089ecc8c5ea1..d2ec9cb542b5e50e28bc2f73708544c4c165d110 100644
--- a/l10n/sk/files.po
+++ b/l10n/sk/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-25 02:01+0200\n"
-"PO-Revision-Date: 2013-05-24 13:26+0000\n"
+"POT-Creation-Date: 2013-07-04 09:30+0200\n"
+"PO-Revision-Date: 2013-07-04 07:31+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Slovak (http://www.transifex.com/projects/p/owncloud/language/sk/)\n"
 "MIME-Version: 1.0\n"
@@ -27,46 +27,54 @@ msgstr ""
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/upload.php:19
+#: ajax/upload.php:16 ajax/upload.php:39
+msgid "Unable to set upload directory."
+msgstr ""
+
+#: ajax/upload.php:23
+msgid "Invalid Token"
+msgstr ""
+
+#: ajax/upload.php:55
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: ajax/upload.php:26
+#: ajax/upload.php:62
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/upload.php:27
+#: ajax/upload.php:63
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:29
+#: ajax/upload.php:65
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/upload.php:30
+#: ajax/upload.php:66
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/upload.php:31
+#: ajax/upload.php:67
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/upload.php:32
+#: ajax/upload.php:68
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/upload.php:33
+#: ajax/upload.php:69
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:51
+#: ajax/upload.php:87
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:83
+#: ajax/upload.php:119
 msgid "Invalid directory."
 msgstr ""
 
@@ -74,6 +82,36 @@ msgstr ""
 msgid "Files"
 msgstr ""
 
+#: js/file-upload.js:11
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/file-upload.js:24
+msgid "Not enough space available"
+msgstr ""
+
+#: js/file-upload.js:64
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/file-upload.js:167 js/files.js:266
+msgid ""
+"File upload is in progress. Leaving the page now will cancel the upload."
+msgstr ""
+
+#: js/file-upload.js:233 js/files.js:339
+msgid "URL cannot be empty."
+msgstr ""
+
+#: js/file-upload.js:238 lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr ""
+
+#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
+#: js/files.js:693 js/files.js:731
+msgid "Error"
+msgstr ""
+
 #: js/fileactions.js:116
 msgid "Share"
 msgstr ""
@@ -90,43 +128,43 @@ msgstr ""
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:464
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:259
+#: js/filelist.js:302
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:306
+#: js/filelist.js:349
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:306
+#: js/filelist.js:349
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:331
+#: js/filelist.js:374
 msgid "perform delete operation"
 msgstr ""
 
-#: js/filelist.js:413
+#: js/filelist.js:456
 msgid "1 file uploading"
 msgstr ""
 
-#: js/filelist.js:416 js/filelist.js:470
+#: js/filelist.js:459 js/filelist.js:517
 msgid "files uploading"
 msgstr ""
 
@@ -158,69 +196,41 @@ msgid ""
 "big."
 msgstr ""
 
-#: js/files.js:264
-msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr ""
-
-#: js/files.js:277
-msgid "Not enough space available"
-msgstr ""
-
-#: js/files.js:317
-msgid "Upload cancelled."
-msgstr ""
-
-#: js/files.js:413
-msgid ""
-"File upload is in progress. Leaving the page now will cancel the upload."
-msgstr ""
-
-#: js/files.js:486
-msgid "URL cannot be empty."
-msgstr ""
-
-#: js/files.js:491
+#: js/files.js:344
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
-msgid "Error"
-msgstr ""
-
-#: js/files.js:877 templates/index.php:69
+#: js/files.js:744 templates/index.php:69
 msgid "Name"
 msgstr ""
 
-#: js/files.js:878 templates/index.php:80
+#: js/files.js:745 templates/index.php:80
 msgid "Size"
 msgstr ""
 
-#: js/files.js:879 templates/index.php:82
+#: js/files.js:746 templates/index.php:82
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:898
+#: js/files.js:765
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:900
+#: js/files.js:767
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:908
+#: js/files.js:775
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:910
+#: js/files.js:777
 msgid "{count} files"
 msgstr ""
 
-#: lib/app.php:53
-msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
-msgstr ""
-
 #: lib/app.php:73
-msgid "Unable to rename file"
+#, php-format
+msgid "%s could not be renamed"
 msgstr ""
 
 #: lib/helper.php:11 templates/index.php:18
@@ -317,6 +327,22 @@ msgstr ""
 msgid "Current scanning"
 msgstr ""
 
+#: templates/part.list.php:78
+msgid "directory"
+msgstr ""
+
+#: templates/part.list.php:80
+msgid "directories"
+msgstr ""
+
+#: templates/part.list.php:89
+msgid "file"
+msgstr ""
+
+#: templates/part.list.php:91
+msgid "files"
+msgstr ""
+
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
 msgstr ""
diff --git a/l10n/sk/files_encryption.po b/l10n/sk/files_encryption.po
index dece56ab8999e23a8f278e96d7bf3c52db9f33f7..f4a23c5980a6e5623172eb3d6e24b4d5fbd84276 100644
--- a/l10n/sk/files_encryption.po
+++ b/l10n/sk/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-14 02:46+0200\n"
-"PO-Revision-Date: 2013-06-14 00:47+0000\n"
+"POT-Creation-Date: 2013-07-05 02:12+0200\n"
+"PO-Revision-Date: 2013-07-05 00:13+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Slovak (http://www.transifex.com/projects/p/owncloud/language/sk/)\n"
 "MIME-Version: 1.0\n"
@@ -55,9 +55,21 @@ msgstr ""
 
 #: files/error.php:7
 msgid ""
-"Your private key is not valid! Maybe your password was changed from outside."
-" You can update your private key password in your personal settings to "
-"regain access to your files"
+"Your private key is not valid! Likely your password was changed outside the "
+"ownCloud system (e.g. your corporate directory). You can update your private"
+" key password in your personal settings to recover access to your encrypted "
+"files."
+msgstr ""
+
+#: hooks/hooks.php:44
+msgid "Missing requirements."
+msgstr ""
+
+#: hooks/hooks.php:45
+msgid ""
+"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL "
+"PHP extension is enabled and configured properly. For now, the encryption "
+"app has been disabled."
 msgstr ""
 
 #: js/settings-admin.js:11
@@ -84,11 +96,11 @@ msgstr ""
 
 #: templates/settings-admin.php:10
 msgid ""
-"Enable encryption passwords recovery key (allow sharing to recovery key):"
+"Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
 #: templates/settings-admin.php:14
-msgid "Recovery account password"
+msgid "Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:21 templates/settings-personal.php:54
@@ -100,15 +112,15 @@ msgid "Disabled"
 msgstr ""
 
 #: templates/settings-admin.php:34
-msgid "Change encryption passwords recovery key:"
+msgid "Change recovery key password:"
 msgstr ""
 
 #: templates/settings-admin.php:41
-msgid "Old Recovery account password"
+msgid "Old Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:48
-msgid "New Recovery account password"
+msgid "New Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:53
diff --git a/l10n/sk/files_sharing.po b/l10n/sk/files_sharing.po
index c4a1511387b5df3c6fb3b916ae37eb134bffd369..00454814546bc40502b3cca139e556a238c1c07e 100644
--- a/l10n/sk/files_sharing.po
+++ b/l10n/sk/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-14 02:47+0200\n"
-"PO-Revision-Date: 2013-06-14 00:47+0000\n"
+"POT-Creation-Date: 2013-07-05 02:13+0200\n"
+"PO-Revision-Date: 2013-07-05 00:13+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Slovak (http://www.transifex.com/projects/p/owncloud/language/sk/)\n"
 "MIME-Version: 1.0\n"
@@ -18,27 +18,39 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
 #: templates/authenticate.php:4
+msgid "The password is wrong. Try again."
+msgstr ""
+
+#: templates/authenticate.php:7
 msgid "Password"
 msgstr ""
 
-#: templates/authenticate.php:6
+#: templates/authenticate.php:9
 msgid "Submit"
 msgstr ""
 
-#: templates/public.php:10
+#: templates/public.php:17
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr ""
 
-#: templates/public.php:13
+#: templates/public.php:20
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr ""
 
-#: templates/public.php:19 templates/public.php:43
+#: templates/public.php:28 templates/public.php:86
 msgid "Download"
 msgstr ""
 
-#: templates/public.php:40
+#: templates/public.php:44
+msgid "Upload"
+msgstr ""
+
+#: templates/public.php:54
+msgid "Cancel upload"
+msgstr ""
+
+#: templates/public.php:83
 msgid "No preview available for"
 msgstr ""
diff --git a/l10n/sk/lib.po b/l10n/sk/lib.po
index d2b85b1a0fc16e387102dcb0d73aa7e629283a03..d1f1b336f10d5b054111c33d4e18a670d76bfdd2 100644
--- a/l10n/sk/lib.po
+++ b/l10n/sk/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-25 02:02+0200\n"
-"PO-Revision-Date: 2013-05-24 13:27+0000\n"
+"POT-Creation-Date: 2013-07-05 02:13+0200\n"
+"PO-Revision-Date: 2013-07-05 00:13+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Slovak (http://www.transifex.com/projects/p/owncloud/language/sk/)\n"
 "MIME-Version: 1.0\n"
@@ -17,47 +17,51 @@ msgstr ""
 "Language: sk\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: app.php:357
+#: app.php:360
 msgid "Help"
 msgstr ""
 
-#: app.php:370
+#: app.php:373
 msgid "Personal"
 msgstr ""
 
-#: app.php:381
+#: app.php:384
 msgid "Settings"
 msgstr ""
 
-#: app.php:393
+#: app.php:396
 msgid "Users"
 msgstr ""
 
-#: app.php:406
+#: app.php:409
 msgid "Apps"
 msgstr ""
 
-#: app.php:414
+#: app.php:417
 msgid "Admin"
 msgstr ""
 
-#: files.php:207
+#: defaults.php:33
+msgid "web services under your control"
+msgstr ""
+
+#: files.php:210
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: files.php:208
+#: files.php:211
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:209 files.php:242
+#: files.php:212 files.php:245
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:239
+#: files.php:242
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
-#: helper.php:228
+#: helper.php:236
 msgid "couldn't be determined"
 msgstr ""
 
@@ -85,104 +89,102 @@ msgstr ""
 msgid "Images"
 msgstr ""
 
-#: setup.php:34
-msgid "Set an admin username."
-msgstr ""
-
-#: setup.php:37
-msgid "Set an admin password."
-msgstr ""
-
-#: setup.php:55
+#: setup/abstractdatabase.php:22
 #, php-format
 msgid "%s enter the database username."
 msgstr ""
 
-#: setup.php:58
+#: setup/abstractdatabase.php:25
 #, php-format
 msgid "%s enter the database name."
 msgstr ""
 
-#: setup.php:61
+#: setup/abstractdatabase.php:28
 #, php-format
 msgid "%s you may not use dots in the database name"
 msgstr ""
 
-#: setup.php:64
+#: setup/mssql.php:20
 #, php-format
-msgid "%s set the database host."
-msgstr ""
-
-#: setup.php:132 setup.php:329 setup.php:374
-msgid "PostgreSQL username and/or password not valid"
+msgid "MS SQL username and/or password not valid: %s"
 msgstr ""
 
-#: setup.php:133 setup.php:238
+#: setup/mssql.php:21 setup/mysql.php:13 setup/oci.php:114
+#: setup/postgresql.php:24 setup/postgresql.php:70
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:155
-msgid "Oracle connection could not be established"
-msgstr ""
-
-#: setup.php:237
+#: setup/mysql.php:12
 msgid "MySQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
-#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
-#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
-#: setup.php:623
+#: setup/mysql.php:67 setup/oci.php:54 setup/oci.php:121 setup/oci.php:147
+#: setup/oci.php:154 setup/oci.php:165 setup/oci.php:172 setup/oci.php:181
+#: setup/oci.php:189 setup/oci.php:198 setup/oci.php:204
+#: setup/postgresql.php:89 setup/postgresql.php:98 setup/postgresql.php:115
+#: setup/postgresql.php:125 setup/postgresql.php:134
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr ""
 
-#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
-#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
-#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
+#: setup/mysql.php:68 setup/oci.php:55 setup/oci.php:122 setup/oci.php:148
+#: setup/oci.php:155 setup/oci.php:166 setup/oci.php:182 setup/oci.php:190
+#: setup/oci.php:199 setup/postgresql.php:90 setup/postgresql.php:99
+#: setup/postgresql.php:116 setup/postgresql.php:126 setup/postgresql.php:135
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:308
+#: setup/mysql.php:85
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:309
+#: setup/mysql.php:86
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:314
+#: setup/mysql.php:91
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:315
+#: setup/mysql.php:92
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:466 setup.php:533
+#: setup/oci.php:34
+msgid "Oracle connection could not be established"
+msgstr ""
+
+#: setup/oci.php:41 setup/oci.php:113
 msgid "Oracle username and/or password not valid"
 msgstr ""
 
-#: setup.php:592 setup.php:624
+#: setup/oci.php:173 setup/oci.php:205
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:644
-#, php-format
-msgid "MS SQL username and/or password not valid: %s"
+#: setup/postgresql.php:23 setup/postgresql.php:69
+msgid "PostgreSQL username and/or password not valid"
+msgstr ""
+
+#: setup.php:42
+msgid "Set an admin username."
+msgstr ""
+
+#: setup.php:45
+msgid "Set an admin password."
 msgstr ""
 
-#: setup.php:867
+#: setup.php:198
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:868
+#: setup.php:199
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
diff --git a/l10n/sk/settings.po b/l10n/sk/settings.po
index 145d6154a7e7391f4f49a839b66ca8905a52c9d8..937bab7f327bdd290e674b3e87a13675ace64e20 100644
--- a/l10n/sk/settings.po
+++ b/l10n/sk/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-11 01:57+0200\n"
-"PO-Revision-Date: 2013-06-10 23:57+0000\n"
+"POT-Creation-Date: 2013-07-09 02:04+0200\n"
+"PO-Revision-Date: 2013-07-09 00:04+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Slovak (http://www.transifex.com/projects/p/owncloud/language/sk/)\n"
 "MIME-Version: 1.0\n"
@@ -58,7 +58,7 @@ msgstr ""
 msgid "Unable to delete group"
 msgstr ""
 
-#: ajax/removeuser.php:24
+#: ajax/removeuser.php:25
 msgid "Unable to delete user"
 msgstr ""
 
@@ -88,35 +88,35 @@ msgstr ""
 msgid "Couldn't update app."
 msgstr ""
 
-#: js/apps.js:30
+#: js/apps.js:35
 msgid "Update to {appversion}"
 msgstr ""
 
-#: js/apps.js:36 js/apps.js:76
+#: js/apps.js:41 js/apps.js:81
 msgid "Disable"
 msgstr ""
 
-#: js/apps.js:36 js/apps.js:64 js/apps.js:83
+#: js/apps.js:41 js/apps.js:69 js/apps.js:88
 msgid "Enable"
 msgstr ""
 
-#: js/apps.js:55
+#: js/apps.js:60
 msgid "Please wait...."
 msgstr ""
 
-#: js/apps.js:59 js/apps.js:71 js/apps.js:80 js/apps.js:93
+#: js/apps.js:64 js/apps.js:76 js/apps.js:85 js/apps.js:98
 msgid "Error"
 msgstr ""
 
-#: js/apps.js:90
+#: js/apps.js:95
 msgid "Updating...."
 msgstr ""
 
-#: js/apps.js:93
+#: js/apps.js:98
 msgid "Error while updating app"
 msgstr ""
 
-#: js/apps.js:96
+#: js/apps.js:101
 msgid "Updated"
 msgstr ""
 
@@ -165,15 +165,15 @@ msgstr ""
 msgid "A valid password must be provided"
 msgstr ""
 
-#: personal.php:35 personal.php:36
+#: personal.php:37 personal.php:38
 msgid "__language_name__"
 msgstr ""
 
-#: templates/admin.php:15
+#: templates/admin.php:17
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:18
+#: templates/admin.php:20
 msgid ""
 "Your data directory and your files are probably accessible from the "
 "internet. The .htaccess file that ownCloud provides is not working. We "
@@ -182,36 +182,36 @@ msgid ""
 " webserver document root."
 msgstr ""
 
-#: templates/admin.php:29
+#: templates/admin.php:31
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:32
+#: templates/admin.php:34
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: templates/admin.php:33
+#: templates/admin.php:35
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:44
+#: templates/admin.php:46
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:47
+#: templates/admin.php:49
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr ""
 
-#: templates/admin.php:58
+#: templates/admin.php:60
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:63
+#: templates/admin.php:65
 #, php-format
 msgid ""
 "This ownCloud server can't set system locale to %s. This means that there "
@@ -219,11 +219,11 @@ msgid ""
 " to install the required packages on your system to support %s."
 msgstr ""
 
-#: templates/admin.php:75
+#: templates/admin.php:77
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:78
+#: templates/admin.php:80
 msgid ""
 "This ownCloud server has no working internet connection. This means that "
 "some of the features like mounting of external storage, notifications about "
@@ -233,102 +233,102 @@ msgid ""
 " of ownCloud."
 msgstr ""
 
-#: templates/admin.php:92
+#: templates/admin.php:94
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:101
+#: templates/admin.php:103
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:111
+#: templates/admin.php:113
 msgid ""
 "cron.php is registered at a webcron service. Call the cron.php page in the "
 "owncloud root once a minute over http."
 msgstr ""
 
-#: templates/admin.php:121
+#: templates/admin.php:123
 msgid ""
 "Use systems cron service. Call the cron.php file in the owncloud folder via "
 "a system cronjob once a minute."
 msgstr ""
 
-#: templates/admin.php:128
+#: templates/admin.php:130
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:134
+#: templates/admin.php:136
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:135
+#: templates/admin.php:137
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:142
+#: templates/admin.php:144
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:143
+#: templates/admin.php:145
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:150
+#: templates/admin.php:152
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:151
+#: templates/admin.php:153
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:158
+#: templates/admin.php:160
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:161
+#: templates/admin.php:163
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:168
+#: templates/admin.php:170
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:181
+#: templates/admin.php:183
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:182
+#: templates/admin.php:184
 msgid ""
 "Enforces the clients to connect to ownCloud via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:185
+#: templates/admin.php:187
 msgid ""
 "Please connect to this ownCloud instance via HTTPS to enable or disable the "
 "SSL enforcement."
 msgstr ""
 
-#: templates/admin.php:195
+#: templates/admin.php:197
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:196
+#: templates/admin.php:198
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:227
+#: templates/admin.php:229
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:228
+#: templates/admin.php:230
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:235 templates/personal.php:111
+#: templates/admin.php:236 templates/personal.php:116
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:237 templates/personal.php:114
+#: templates/admin.php:240 templates/personal.php:119
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -338,27 +338,27 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr ""
 
-#: templates/apps.php:11
+#: templates/apps.php:13
 msgid "Add your App"
 msgstr ""
 
-#: templates/apps.php:12
+#: templates/apps.php:28
 msgid "More Apps"
 msgstr ""
 
-#: templates/apps.php:28
+#: templates/apps.php:33
 msgid "Select an App"
 msgstr ""
 
-#: templates/apps.php:34
+#: templates/apps.php:39
 msgid "See application page at apps.owncloud.com"
 msgstr ""
 
-#: templates/apps.php:36
+#: templates/apps.php:41
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr ""
 
-#: templates/apps.php:38
+#: templates/apps.php:43
 msgid "Update"
 msgstr ""
 
@@ -386,76 +386,79 @@ msgstr ""
 msgid "Commercial Support"
 msgstr ""
 
-#: templates/personal.php:8
-#, php-format
-msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
-msgstr ""
-
-#: templates/personal.php:15
+#: templates/personal.php:10
 msgid "Get the apps to sync your files"
 msgstr ""
 
-#: templates/personal.php:26
+#: templates/personal.php:21
 msgid "Show First Run Wizard again"
 msgstr ""
 
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:29
+#, php-format
+msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
+msgstr ""
+
+#: templates/personal.php:41 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr ""
 
-#: templates/personal.php:38
+#: templates/personal.php:42
 msgid "Your password was changed"
 msgstr ""
 
-#: templates/personal.php:39
+#: templates/personal.php:43
 msgid "Unable to change your password"
 msgstr ""
 
-#: templates/personal.php:40
+#: templates/personal.php:44
 msgid "Current password"
 msgstr ""
 
-#: templates/personal.php:42
+#: templates/personal.php:46
 msgid "New password"
 msgstr ""
 
-#: templates/personal.php:44
+#: templates/personal.php:48
 msgid "Change password"
 msgstr ""
 
-#: templates/personal.php:56 templates/users.php:85
+#: templates/personal.php:60 templates/users.php:85
 msgid "Display Name"
 msgstr ""
 
-#: templates/personal.php:71
+#: templates/personal.php:75
 msgid "Email"
 msgstr ""
 
-#: templates/personal.php:73
+#: templates/personal.php:77
 msgid "Your email address"
 msgstr ""
 
-#: templates/personal.php:74
+#: templates/personal.php:78
 msgid "Fill in an email address to enable password recovery"
 msgstr ""
 
-#: templates/personal.php:83 templates/personal.php:84
+#: templates/personal.php:87 templates/personal.php:88
 msgid "Language"
 msgstr ""
 
-#: templates/personal.php:95
+#: templates/personal.php:100
 msgid "Help translate"
 msgstr ""
 
-#: templates/personal.php:100
+#: templates/personal.php:106
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:102
-msgid "Use this address to connect to your ownCloud in your file manager"
+#: templates/personal.php:108
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
+"target=\"_blank\">access your Files via WebDAV</a>"
 msgstr ""
 
-#: templates/users.php:21 templates/users.php:84
+#: templates/users.php:21
 msgid "Login Name"
 msgstr ""
 
@@ -485,6 +488,10 @@ msgstr ""
 msgid "Other"
 msgstr ""
 
+#: templates/users.php:84
+msgid "Username"
+msgstr ""
+
 #: templates/users.php:91
 msgid "Storage"
 msgstr ""
diff --git a/l10n/sk_SK/core.po b/l10n/sk_SK/core.po
index b96fd9fb09c655ec3b00221d108a75dae6e8d5ed..90a0894267ad5e7ccf6af5d728173da6b4f8d635 100644
--- a/l10n/sk_SK/core.po
+++ b/l10n/sk_SK/core.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:22+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:14+0000\n"
+"Last-Translator: mhh <marian.hvolka@stuba.sk>\n"
 "Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,7 +21,7 @@ msgstr ""
 #: ajax/share.php:97
 #, php-format
 msgid "%s shared »%s« with you"
-msgstr ""
+msgstr "%s s Vami zdieľa »%s«"
 
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
@@ -62,135 +62,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/config.php:34
+#: js/config.php:32
 msgid "Sunday"
 msgstr "Nedeľa"
 
-#: js/config.php:35
+#: js/config.php:33
 msgid "Monday"
 msgstr "Pondelok"
 
-#: js/config.php:36
+#: js/config.php:34
 msgid "Tuesday"
 msgstr "Utorok"
 
-#: js/config.php:37
+#: js/config.php:35
 msgid "Wednesday"
 msgstr "Streda"
 
-#: js/config.php:38
+#: js/config.php:36
 msgid "Thursday"
 msgstr "Å tvrtok"
 
-#: js/config.php:39
+#: js/config.php:37
 msgid "Friday"
 msgstr "Piatok"
 
-#: js/config.php:40
+#: js/config.php:38
 msgid "Saturday"
 msgstr "Sobota"
 
-#: js/config.php:45
+#: js/config.php:43
 msgid "January"
 msgstr "Január"
 
-#: js/config.php:46
+#: js/config.php:44
 msgid "February"
 msgstr "Február"
 
-#: js/config.php:47
+#: js/config.php:45
 msgid "March"
 msgstr "Marec"
 
-#: js/config.php:48
+#: js/config.php:46
 msgid "April"
 msgstr "Apríl"
 
-#: js/config.php:49
+#: js/config.php:47
 msgid "May"
 msgstr "Máj"
 
-#: js/config.php:50
+#: js/config.php:48
 msgid "June"
 msgstr "Jún"
 
-#: js/config.php:51
+#: js/config.php:49
 msgid "July"
 msgstr "Júl"
 
-#: js/config.php:52
+#: js/config.php:50
 msgid "August"
 msgstr "August"
 
-#: js/config.php:53
+#: js/config.php:51
 msgid "September"
 msgstr "September"
 
-#: js/config.php:54
+#: js/config.php:52
 msgid "October"
 msgstr "Október"
 
-#: js/config.php:55
+#: js/config.php:53
 msgid "November"
 msgstr "November"
 
-#: js/config.php:56
+#: js/config.php:54
 msgid "December"
 msgstr "December"
 
-#: js/js.js:286
+#: js/js.js:293
 msgid "Settings"
 msgstr "Nastavenia"
 
-#: js/js.js:718
+#: js/js.js:725
 msgid "seconds ago"
 msgstr "pred sekundami"
 
-#: js/js.js:719
+#: js/js.js:726
 msgid "1 minute ago"
 msgstr "pred minútou"
 
-#: js/js.js:720
+#: js/js.js:727
 msgid "{minutes} minutes ago"
 msgstr "pred {minutes} minútami"
 
-#: js/js.js:721
+#: js/js.js:728
 msgid "1 hour ago"
 msgstr "Pred 1 hodinou"
 
-#: js/js.js:722
+#: js/js.js:729
 msgid "{hours} hours ago"
 msgstr "Pred {hours} hodinami."
 
-#: js/js.js:723
+#: js/js.js:730
 msgid "today"
 msgstr "dnes"
 
-#: js/js.js:724
+#: js/js.js:731
 msgid "yesterday"
 msgstr "včera"
 
-#: js/js.js:725
+#: js/js.js:732
 msgid "{days} days ago"
 msgstr "pred {days} dňami"
 
-#: js/js.js:726
+#: js/js.js:733
 msgid "last month"
 msgstr "minulý mesiac"
 
-#: js/js.js:727
+#: js/js.js:734
 msgid "{months} months ago"
 msgstr "Pred {months} mesiacmi."
 
-#: js/js.js:728
+#: js/js.js:735
 msgid "months ago"
 msgstr "pred mesiacmi"
 
-#: js/js.js:729
+#: js/js.js:736
 msgid "last year"
 msgstr "minulý rok"
 
-#: js/js.js:730
+#: js/js.js:737
 msgid "years ago"
 msgstr "pred rokmi"
 
@@ -204,7 +204,7 @@ msgstr "Zrušiť"
 
 #: js/oc-dialogs.js:141 js/oc-dialogs.js:200
 msgid "Error loading file picker template"
-msgstr ""
+msgstr "Chyba pri načítaní šablóny výberu súborov"
 
 #: js/oc-dialogs.js:164
 msgid "Yes"
@@ -226,8 +226,8 @@ msgstr "Nešpecifikovaný typ objektu."
 #: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
 #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:577
-#: js/share.js:589
+#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:620
+#: js/share.js:632
 msgid "Error"
 msgstr "Chyba"
 
@@ -247,7 +247,7 @@ msgstr "Zdieľané"
 msgid "Share"
 msgstr "Zdieľať"
 
-#: js/share.js:125 js/share.js:617
+#: js/share.js:125 js/share.js:660
 msgid "Error while sharing"
 msgstr "Chyba počas zdieľania"
 
@@ -267,99 +267,103 @@ msgstr "Zdieľané s vami a so skupinou {group} používateľom {owner}"
 msgid "Shared with you by {owner}"
 msgstr "Zdieľané s vami používateľom {owner}"
 
-#: js/share.js:159
+#: js/share.js:172
 msgid "Share with"
 msgstr "Zdieľať s"
 
-#: js/share.js:164
+#: js/share.js:177
 msgid "Share with link"
 msgstr "Zdieľať cez odkaz"
 
-#: js/share.js:167
+#: js/share.js:180
 msgid "Password protect"
 msgstr "Chrániť heslom"
 
-#: js/share.js:169 templates/installation.php:54 templates/login.php:26
+#: js/share.js:182 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "Heslo"
 
-#: js/share.js:173
+#: js/share.js:187
+msgid "Allow Public Upload"
+msgstr "Povoliť verejné nahrávanie"
+
+#: js/share.js:191
 msgid "Email link to person"
 msgstr "Odoslať odkaz emailom"
 
-#: js/share.js:174
+#: js/share.js:192
 msgid "Send"
 msgstr "Odoslať"
 
-#: js/share.js:178
+#: js/share.js:197
 msgid "Set expiration date"
 msgstr "Nastaviť dátum expirácie"
 
-#: js/share.js:179
+#: js/share.js:198
 msgid "Expiration date"
 msgstr "Dátum expirácie"
 
-#: js/share.js:211
+#: js/share.js:230
 msgid "Share via email:"
 msgstr "Zdieľať cez e-mail:"
 
-#: js/share.js:213
+#: js/share.js:232
 msgid "No people found"
 msgstr "Používateľ nenájdený"
 
-#: js/share.js:251
+#: js/share.js:270
 msgid "Resharing is not allowed"
 msgstr "Zdieľanie už zdieľanej položky nie je povolené"
 
-#: js/share.js:287
+#: js/share.js:306
 msgid "Shared in {item} with {user}"
 msgstr "Zdieľané v {item} s {user}"
 
-#: js/share.js:308
+#: js/share.js:327
 msgid "Unshare"
 msgstr "Zrušiť zdieľanie"
 
-#: js/share.js:320
+#: js/share.js:339
 msgid "can edit"
 msgstr "môže upraviť"
 
-#: js/share.js:322
+#: js/share.js:341
 msgid "access control"
 msgstr "prístupové práva"
 
-#: js/share.js:325
+#: js/share.js:344
 msgid "create"
 msgstr "vytvoriť"
 
-#: js/share.js:328
+#: js/share.js:347
 msgid "update"
 msgstr "aktualizovať"
 
-#: js/share.js:331
+#: js/share.js:350
 msgid "delete"
 msgstr "vymazať"
 
-#: js/share.js:334
+#: js/share.js:353
 msgid "share"
 msgstr "zdieľať"
 
-#: js/share.js:368 js/share.js:564
+#: js/share.js:387 js/share.js:607
 msgid "Password protected"
 msgstr "Chránené heslom"
 
-#: js/share.js:577
+#: js/share.js:620
 msgid "Error unsetting expiration date"
 msgstr "Chyba pri odstraňovaní dátumu expirácie"
 
-#: js/share.js:589
+#: js/share.js:632
 msgid "Error setting expiration date"
 msgstr "Chyba pri nastavení dátumu expirácie"
 
-#: js/share.js:604
+#: js/share.js:647
 msgid "Sending ..."
 msgstr "Odosielam ..."
 
-#: js/share.js:615
+#: js/share.js:658
 msgid "Email sent"
 msgstr "Email odoslaný"
 
@@ -374,7 +378,7 @@ msgstr "Aktualizácia nebola úspešná. Problém nahláste na <a href=\"https:/
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "Aktualizácia bola úspešná. Presmerovávam na prihlasovaciu stránku."
 
-#: lostpassword/controller.php:58
+#: lostpassword/controller.php:60
 msgid "ownCloud password reset"
 msgstr "Obnovenie hesla pre ownCloud"
 
@@ -404,17 +408,17 @@ msgstr "Meno používateľa"
 
 #: lostpassword/templates/lostpassword.php:22
 msgid ""
-"Your files seems to be encrypted. If you didn't have enabled the recovery "
-"key there will be no way to get your data back once the password was "
-"resetted. If you are not sure what to do, please contact your administrator "
-"first before continue. Do you really want to continue?"
-msgstr ""
+"Your files are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
+msgstr "Vaše súbory sú šifrované. Ak nemáte povolený kľúč obnovy, nie je spôsob, ako získať po obnove hesla Vaše dáta. Ak nie ste si isí tým, čo robíte, obráťte sa najskôr na administrátora. Naozaj chcete pokračovať?"
 
 #: lostpassword/templates/lostpassword.php:24
 msgid "Yes, I really want to reset my password now"
-msgstr ""
+msgstr "Áno, želám si teraz obnoviť svoje heslo"
 
-#: lostpassword/templates/lostpassword.php:29
+#: lostpassword/templates/lostpassword.php:27
 msgid "Request reset"
 msgstr "Požiadať o obnovenie"
 
@@ -462,7 +466,7 @@ msgstr "Prístup odmietnutý"
 msgid "Cloud not found"
 msgstr "Nenájdené"
 
-#: templates/altmail.php:2
+#: templates/altmail.php:4
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -471,11 +475,7 @@ msgid ""
 "View it: %s\n"
 "\n"
 "Cheers!"
-msgstr ""
-
-#: templates/altmail.php:7 templates/mail.php:24
-msgid "web services under your control"
-msgstr "webové služby pod Vašou kontrolou"
+msgstr "Ahoj,\n\nChcem Vám oznámiť, že %s s Vami zdieľa %s.\nPozrieť si to môžete tu: %s\n\nVďaka"
 
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
@@ -569,12 +569,12 @@ msgstr "Server databázy"
 msgid "Finish setup"
 msgstr "Dokončiť inštaláciu"
 
-#: templates/layout.user.php:40
+#: templates/layout.user.php:43
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr "%s je dostupná. Získajte viac informácií k postupu aktualizáce."
 
-#: templates/layout.user.php:67
+#: templates/layout.user.php:68
 msgid "Log out"
 msgstr "Odhlásiť"
 
@@ -608,12 +608,12 @@ msgstr "Prihlásiť sa"
 msgid "Alternative Logins"
 msgstr "Alternatívne prihlasovanie"
 
-#: templates/mail.php:15
+#: templates/mail.php:16
 #, php-format
 msgid ""
 "Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
 "href=\"%s\">View it!</a><br><br>Cheers!"
-msgstr ""
+msgstr "Ahoj,<br><br>chcem Vám oznámiť, že %s s Vami zdieľa %s.\nPozrieť si to môžete tu: <br><a href=\"%s\">zde</a>.<br><br>Vďaka"
 
 #: templates/part.pagenavi.php:3
 msgid "prev"
diff --git a/l10n/sk_SK/files.po b/l10n/sk_SK/files.po
index 71388424f0868b0c23a2a5d4bd7ce42380dda50e..33f3f8f9ffefe7874330c9c2fb2d2f042e4045bf 100644
--- a/l10n/sk_SK/files.po
+++ b/l10n/sk_SK/files.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:01+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: mhh <marian.hvolka@stuba.sk>\n"
 "Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
 "MIME-Version: 1.0\n"
@@ -28,53 +28,91 @@ msgstr "Nie je možné presunúť %s - súbor s týmto menom už existuje"
 msgid "Could not move %s"
 msgstr "Nie je možné presunúť %s"
 
-#: ajax/upload.php:19
+#: ajax/upload.php:16 ajax/upload.php:45
+msgid "Unable to set upload directory."
+msgstr "Nemožno nastaviť priečinok pre nahrané súbory."
+
+#: ajax/upload.php:22
+msgid "Invalid Token"
+msgstr "Neplatný token"
+
+#: ajax/upload.php:59
 msgid "No file was uploaded. Unknown error"
 msgstr "Žiaden súbor nebol odoslaný. Neznáma chyba"
 
-#: ajax/upload.php:26
+#: ajax/upload.php:66
 msgid "There is no error, the file uploaded with success"
 msgstr "Nenastala žiadna chyba, súbor bol úspešne nahraný"
 
-#: ajax/upload.php:27
+#: ajax/upload.php:67
 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:29
+#: ajax/upload.php:69
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Ukladaný súbor prekračuje nastavenie MAX_FILE_SIZE z volieb HTML formulára."
 
-#: ajax/upload.php:30
+#: ajax/upload.php:70
 msgid "The uploaded file was only partially uploaded"
 msgstr "Ukladaný súbor sa nahral len čiastočne"
 
-#: ajax/upload.php:31
+#: ajax/upload.php:71
 msgid "No file was uploaded"
 msgstr "Žiadny súbor nebol uložený"
 
-#: ajax/upload.php:32
+#: ajax/upload.php:72
 msgid "Missing a temporary folder"
 msgstr "Chýba dočasný priečinok"
 
-#: ajax/upload.php:33
+#: ajax/upload.php:73
 msgid "Failed to write to disk"
 msgstr "Zápis na disk sa nepodaril"
 
-#: ajax/upload.php:51
+#: ajax/upload.php:91
 msgid "Not enough storage available"
 msgstr "Nedostatok dostupného úložného priestoru"
 
-#: ajax/upload.php:83
+#: ajax/upload.php:123
 msgid "Invalid directory."
-msgstr "Neplatný priečinok"
+msgstr "Neplatný priečinok."
 
 #: appinfo/app.php:12
 msgid "Files"
 msgstr "Súbory"
 
+#: js/file-upload.js:11
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr "Nedá sa odoslať Váš súbor, pretože je to priečinok, alebo je jeho veľkosť 0 bajtov"
+
+#: js/file-upload.js:24
+msgid "Not enough space available"
+msgstr "Nie je k dispozícii dostatok miesta"
+
+#: js/file-upload.js:64
+msgid "Upload cancelled."
+msgstr "Odosielanie zrušené."
+
+#: js/file-upload.js:167 js/files.js:266
+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/file-upload.js:233 js/files.js:339
+msgid "URL cannot be empty."
+msgstr "URL nemôže byť prázdne."
+
+#: js/file-upload.js:238 lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr "Neplatný názov priečinka. Názov \"Shared\" je rezervovaný pre ownCloud"
+
+#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
+#: js/files.js:693 js/files.js:731
+msgid "Error"
+msgstr "Chyba"
+
 #: js/fileactions.js:116
 msgid "Share"
 msgstr "Zdieľať"
@@ -91,43 +129,43 @@ msgstr "Zmazať"
 msgid "Rename"
 msgstr "Premenovať"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:464
 msgid "Pending"
 msgstr "Prebieha"
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "{new_name} already exists"
 msgstr "{new_name} už existuje"
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "replace"
 msgstr "nahradiť"
 
-#: js/filelist.js:259
+#: js/filelist.js:302
 msgid "suggest name"
 msgstr "pomôcť s menom"
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "cancel"
 msgstr "zrušiť"
 
-#: js/filelist.js:306
+#: js/filelist.js:349
 msgid "replaced {new_name} with {old_name}"
 msgstr "prepísaný {new_name} súborom {old_name}"
 
-#: js/filelist.js:306
+#: js/filelist.js:349
 msgid "undo"
 msgstr "vrátiť"
 
-#: js/filelist.js:331
+#: js/filelist.js:374
 msgid "perform delete operation"
 msgstr "vykonať zmazanie"
 
-#: js/filelist.js:413
+#: js/filelist.js:456
 msgid "1 file uploading"
 msgstr "1 súbor sa posiela "
 
-#: js/filelist.js:416 js/filelist.js:470
+#: js/filelist.js:459 js/filelist.js:517
 msgid "files uploading"
 msgstr "nahrávanie súborov"
 
@@ -159,70 +197,42 @@ msgid ""
 "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:264
-msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "Nedá sa odoslať Váš súbor, pretože je to priečinok, alebo je jeho veľkosť 0 bajtov"
-
-#: js/files.js:277
-msgid "Not enough space available"
-msgstr "Nie je k dispozícii dostatok miesta"
-
-#: js/files.js:317
-msgid "Upload cancelled."
-msgstr "Odosielanie zrušené"
-
-#: js/files.js:413
-msgid ""
-"File upload is in progress. Leaving the page now will cancel the upload."
-msgstr "Opustenie stránky zruší práve prebiehajúce odosielanie súboru."
-
-#: js/files.js:486
-msgid "URL cannot be empty."
-msgstr "URL nemôže byť prázdne"
-
-#: js/files.js:491
+#: js/files.js:344
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Neplatné meno priečinka. Používanie mena 'Shared' je vyhradené len pre Owncloud"
 
-#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
-msgid "Error"
-msgstr "Chyba"
-
-#: js/files.js:877 templates/index.php:69
+#: js/files.js:744 templates/index.php:69
 msgid "Name"
 msgstr "Názov"
 
-#: js/files.js:878 templates/index.php:80
+#: js/files.js:745 templates/index.php:80
 msgid "Size"
 msgstr "Veľkosť"
 
-#: js/files.js:879 templates/index.php:82
+#: js/files.js:746 templates/index.php:82
 msgid "Modified"
 msgstr "Upravené"
 
-#: js/files.js:898
+#: js/files.js:765
 msgid "1 folder"
 msgstr "1 priečinok"
 
-#: js/files.js:900
+#: js/files.js:767
 msgid "{count} folders"
 msgstr "{count} priečinkov"
 
-#: js/files.js:908
+#: js/files.js:775
 msgid "1 file"
 msgstr "1 súbor"
 
-#: js/files.js:910
+#: js/files.js:777
 msgid "{count} files"
 msgstr "{count} súborov"
 
-#: lib/app.php:53
-msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
-msgstr "Neplatný názov priečinka. Názov \"Shared\" je rezervovaný pre ownCloud"
-
 #: lib/app.php:73
-msgid "Unable to rename file"
-msgstr "Nemožno premenovať súbor"
+#, php-format
+msgid "%s could not be renamed"
+msgstr "%s nemohol byť premenovaný"
 
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
@@ -318,6 +328,22 @@ msgstr "Čakajte, súbory sú prehľadávané."
 msgid "Current scanning"
 msgstr "Práve prezerané"
 
+#: templates/part.list.php:76
+msgid "directory"
+msgstr "priečinok"
+
+#: templates/part.list.php:78
+msgid "directories"
+msgstr "priečinky"
+
+#: templates/part.list.php:87
+msgid "file"
+msgstr "súbor"
+
+#: templates/part.list.php:89
+msgid "files"
+msgstr "súbory"
+
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
 msgstr "Aktualizujem medzipamäť súborového systému..."
diff --git a/l10n/sk_SK/files_encryption.po b/l10n/sk_SK/files_encryption.po
index 05d92a7c7e7da5131b9ba7c2eb02eb4a28e9be11..f32ee0daedd6a398863beb27054bd1b792979ece 100644
--- a/l10n/sk_SK/files_encryption.po
+++ b/l10n/sk_SK/files_encryption.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-14 02:46+0200\n"
-"PO-Revision-Date: 2013-06-14 00:47+0000\n"
+"POT-Creation-Date: 2013-07-05 02:12+0200\n"
+"PO-Revision-Date: 2013-07-05 00:13+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
 "MIME-Version: 1.0\n"
@@ -20,21 +20,21 @@ msgstr ""
 
 #: ajax/adminrecovery.php:29
 msgid "Recovery key successfully enabled"
-msgstr ""
+msgstr "Záchranný kľúč bol úspešne povolený"
 
 #: ajax/adminrecovery.php:34
 msgid ""
 "Could not enable recovery key. Please check your recovery key password!"
-msgstr ""
+msgstr "Nepodarilo sa povoliť záchranný kľúč. Skontrolujte prosím Vaše heslo záchranného kľúča!"
 
 #: ajax/adminrecovery.php:48
 msgid "Recovery key successfully disabled"
-msgstr ""
+msgstr "Záchranný kľúč bol úspešne zakázaný"
 
 #: ajax/adminrecovery.php:53
 msgid ""
 "Could not disable recovery key. Please check your recovery key password!"
-msgstr ""
+msgstr "Nepodarilo sa zakázať záchranný kľúč. Skontrolujte prosím Vaše heslo záchranného kľúča!"
 
 #: ajax/changeRecoveryPassword.php:49
 msgid "Password successfully changed."
@@ -42,23 +42,35 @@ msgstr "Heslo úspešne zmenené."
 
 #: ajax/changeRecoveryPassword.php:51
 msgid "Could not change the password. Maybe the old password was not correct."
-msgstr ""
+msgstr "Nemožno zmeniť heslo. Pravdepodobne nebolo staré heslo zadané správne."
 
 #: ajax/updatePrivateKeyPassword.php:51
 msgid "Private key password successfully updated."
-msgstr ""
+msgstr "Heslo súkromného kľúča je úspešne aktualizované."
 
 #: ajax/updatePrivateKeyPassword.php:53
 msgid ""
 "Could not update the private key password. Maybe the old password was not "
 "correct."
-msgstr ""
+msgstr "Nemožno aktualizovať heslo súkromného kľúča. Možno nebolo staré heslo správne."
 
 #: files/error.php:7
 msgid ""
-"Your private key is not valid! Maybe your password was changed from outside."
-" You can update your private key password in your personal settings to "
-"regain access to your files"
+"Your private key is not valid! Likely your password was changed outside the "
+"ownCloud system (e.g. your corporate directory). You can update your private"
+" key password in your personal settings to recover access to your encrypted "
+"files."
+msgstr ""
+
+#: hooks/hooks.php:44
+msgid "Missing requirements."
+msgstr ""
+
+#: hooks/hooks.php:45
+msgid ""
+"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL "
+"PHP extension is enabled and configured properly. For now, the encryption "
+"app has been disabled."
 msgstr ""
 
 #: js/settings-admin.js:11
@@ -69,7 +81,7 @@ msgstr "Ukladám..."
 msgid ""
 "Your private key is not valid! Maybe the your password was changed from "
 "outside."
-msgstr ""
+msgstr "Váš súkromný kľúč je neplatný. Možno bolo Vaše heslo zmenené z vonku."
 
 #: templates/invalid_private_key.php:7
 msgid "You can unlock your private key in your "
@@ -77,7 +89,7 @@ msgstr ""
 
 #: templates/invalid_private_key.php:7
 msgid "personal settings"
-msgstr ""
+msgstr "osobné nastavenia"
 
 #: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
@@ -85,11 +97,11 @@ msgstr "Å ifrovanie"
 
 #: templates/settings-admin.php:10
 msgid ""
-"Enable encryption passwords recovery key (allow sharing to recovery key):"
+"Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
 #: templates/settings-admin.php:14
-msgid "Recovery account password"
+msgid "Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:21 templates/settings-personal.php:54
@@ -101,15 +113,15 @@ msgid "Disabled"
 msgstr "Zakázané"
 
 #: templates/settings-admin.php:34
-msgid "Change encryption passwords recovery key:"
-msgstr "Zmeniť šifrovacie heslo obnovovacieho kľúča:"
+msgid "Change recovery key password:"
+msgstr ""
 
 #: templates/settings-admin.php:41
-msgid "Old Recovery account password"
+msgid "Old Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:48
-msgid "New Recovery account password"
+msgid "New Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:53
@@ -118,39 +130,39 @@ msgstr "Zmeniť heslo"
 
 #: templates/settings-personal.php:11
 msgid "Your private key password no longer match your log-in password:"
-msgstr ""
+msgstr "Vaše heslo súkromného kľúča je rovnaké ako Vaše prihlasovacie heslo:"
 
 #: templates/settings-personal.php:14
 msgid "Set your old private key password to your current log-in password."
-msgstr ""
+msgstr "Nastavte si staré heslo súkromného kľúča k Vášmu súčasnému prihlasovaciemu heslu."
 
 #: templates/settings-personal.php:16
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
-msgstr ""
+msgstr "Ak si nepamätáte svoje staré heslo, môžete požiadať správcu o obnovenie svojich súborov."
 
 #: templates/settings-personal.php:24
 msgid "Old log-in password"
-msgstr ""
+msgstr "Staré prihlasovacie heslo"
 
 #: templates/settings-personal.php:30
 msgid "Current log-in password"
-msgstr ""
+msgstr "Súčasné prihlasovacie heslo"
 
 #: templates/settings-personal.php:35
 msgid "Update Private Key Password"
-msgstr ""
+msgstr "Aktualizovať heslo súkromného kľúča"
 
 #: templates/settings-personal.php:45
 msgid "Enable password recovery:"
-msgstr ""
+msgstr "Povoliť obnovu hesla:"
 
 #: templates/settings-personal.php:47
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
-msgstr ""
+msgstr "Povolenie Vám umožní znovu získať prístup k Vašim zašifrovaným súborom, ak stratíte heslo"
 
 #: templates/settings-personal.php:63
 msgid "File recovery settings updated"
diff --git a/l10n/sk_SK/files_external.po b/l10n/sk_SK/files_external.po
index 1509c8bbcb41a52c9b2e7230100115e47075034f..c17cbeda073412519ee78d9de494ee95cec8a671 100644
--- a/l10n/sk_SK/files_external.po
+++ b/l10n/sk_SK/files_external.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: mhh <marian.hvolka@stuba.sk>\n"
 "Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/sk_SK/files_sharing.po b/l10n/sk_SK/files_sharing.po
index 30017153f1d5be008d929fdee622e0fd8f7edb4c..5d388785f272f845d27a00d4ffc54d193a654223 100644
--- a/l10n/sk_SK/files_sharing.po
+++ b/l10n/sk_SK/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
 "MIME-Version: 1.0\n"
@@ -18,27 +18,39 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
 #: templates/authenticate.php:4
+msgid "The password is wrong. Try again."
+msgstr ""
+
+#: templates/authenticate.php:7
 msgid "Password"
 msgstr "Heslo"
 
-#: templates/authenticate.php:6
+#: templates/authenticate.php:9
 msgid "Submit"
 msgstr "Odoslať"
 
-#: templates/public.php:10
+#: templates/public.php:17
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s zdieľa s vami priečinok %s"
 
-#: templates/public.php:13
+#: templates/public.php:20
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s zdieľa s vami súbor %s"
 
-#: templates/public.php:19 templates/public.php:43
+#: templates/public.php:28 templates/public.php:90
 msgid "Download"
 msgstr "SÅ¥ahovanie"
 
-#: templates/public.php:40
+#: templates/public.php:45 templates/public.php:48
+msgid "Upload"
+msgstr "Odoslať"
+
+#: templates/public.php:58
+msgid "Cancel upload"
+msgstr "Zrušiť odosielanie"
+
+#: templates/public.php:87
 msgid "No preview available for"
 msgstr "Žiaden náhľad k dispozícii pre"
diff --git a/l10n/sk_SK/files_trashbin.po b/l10n/sk_SK/files_trashbin.po
index ee3167b8eb2df9b7fc6cd84732c16328cbd13846..ab5413fcc5bf1b06b9335bdb765e539dcec7b840 100644
--- a/l10n/sk_SK/files_trashbin.po
+++ b/l10n/sk_SK/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:16+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/sk_SK/lib.po b/l10n/sk_SK/lib.po
index 3464d349a2e8b2103413f9999ea5ecb255ffc9f8..e635a91a785a0f25dc474d39b81098dc1264f47e 100644
--- a/l10n/sk_SK/lib.po
+++ b/l10n/sk_SK/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-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
-"Last-Translator: mhh <marian.hvolka@stuba.sk>\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,43 +18,47 @@ msgstr ""
 "Language: sk_SK\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: app.php:359
+#: app.php:360
 msgid "Help"
 msgstr "Pomoc"
 
-#: app.php:372
+#: app.php:373
 msgid "Personal"
 msgstr "Osobné"
 
-#: app.php:383
+#: app.php:384
 msgid "Settings"
 msgstr "Nastavenia"
 
-#: app.php:395
+#: app.php:396
 msgid "Users"
 msgstr "Používatelia"
 
-#: app.php:408
+#: app.php:409
 msgid "Apps"
 msgstr "Aplikácie"
 
-#: app.php:416
+#: app.php:417
 msgid "Admin"
 msgstr "Administrátor"
 
-#: files.php:210
+#: defaults.php:33
+msgid "web services under your control"
+msgstr "webové služby pod Vašou kontrolou"
+
+#: files.php:226
 msgid "ZIP download is turned off."
 msgstr "Sťahovanie súborov ZIP je vypnuté."
 
-#: files.php:211
+#: files.php:227
 msgid "Files need to be downloaded one by one."
 msgstr "Súbory musia byť nahrávané jeden za druhým."
 
-#: files.php:212 files.php:245
+#: files.php:228 files.php:261
 msgid "Back to Files"
 msgstr "Späť na súbory"
 
-#: files.php:242
+#: files.php:258
 msgid "Selected files too large to generate zip file."
 msgstr "Zvolené súbory sú príliš veľké na vygenerovanie zip súboru."
 
@@ -86,104 +90,102 @@ msgstr "Text"
 msgid "Images"
 msgstr "Obrázky"
 
-#: setup.php:34
-msgid "Set an admin username."
-msgstr "Zadajte používateľské meno administrátora."
-
-#: setup.php:37
-msgid "Set an admin password."
-msgstr "Zadajte heslo administrátora."
-
-#: setup.php:55
+#: setup/abstractdatabase.php:22
 #, php-format
 msgid "%s enter the database username."
 msgstr "Zadajte používateľské meno %s databázy.."
 
-#: setup.php:58
+#: setup/abstractdatabase.php:25
 #, php-format
 msgid "%s enter the database name."
 msgstr "Zadajte názov databázy pre %s databázy."
 
-#: setup.php:61
+#: setup/abstractdatabase.php:28
 #, php-format
 msgid "%s you may not use dots in the database name"
 msgstr "V názve databázy %s nemôžete používať bodky"
 
-#: setup.php:64
+#: setup/mssql.php:20
 #, php-format
-msgid "%s set the database host."
-msgstr "Zadajte názov počítača s databázou %s."
-
-#: setup.php:126 setup.php:332 setup.php:377
-msgid "PostgreSQL username and/or password not valid"
-msgstr "Používateľské meno a/alebo heslo pre PostgreSQL databázu je neplatné"
+msgid "MS SQL username and/or password not valid: %s"
+msgstr "Používateľské meno, alebo heslo MS SQL nie je platné: %s"
 
-#: setup.php:127 setup.php:235
+#: setup/mssql.php:21 setup/mysql.php:13 setup/oci.php:114
+#: setup/postgresql.php:24 setup/postgresql.php:70
 msgid "You need to enter either an existing account or the administrator."
 msgstr "Musíte zadať jestvujúci účet alebo administrátora."
 
-#: setup.php:152
-msgid "Oracle connection could not be established"
-msgstr "Nie je možné pripojiť sa k Oracle"
-
-#: setup.php:234
+#: setup/mysql.php:12
 msgid "MySQL username and/or password not valid"
 msgstr "Používateľské meno a/alebo heslo pre MySQL databázu je neplatné"
 
-#: setup.php:288 setup.php:398 setup.php:407 setup.php:425 setup.php:435
-#: setup.php:444 setup.php:477 setup.php:543 setup.php:569 setup.php:576
-#: setup.php:587 setup.php:594 setup.php:603 setup.php:611 setup.php:620
-#: setup.php:626
+#: setup/mysql.php:67 setup/oci.php:54 setup/oci.php:121 setup/oci.php:147
+#: setup/oci.php:154 setup/oci.php:165 setup/oci.php:172 setup/oci.php:181
+#: setup/oci.php:189 setup/oci.php:198 setup/oci.php:204
+#: setup/postgresql.php:89 setup/postgresql.php:98 setup/postgresql.php:115
+#: setup/postgresql.php:125 setup/postgresql.php:134
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr "Chyba DB: \"%s\""
 
-#: setup.php:289 setup.php:399 setup.php:408 setup.php:426 setup.php:436
-#: setup.php:445 setup.php:478 setup.php:544 setup.php:570 setup.php:577
-#: setup.php:588 setup.php:604 setup.php:612 setup.php:621
+#: setup/mysql.php:68 setup/oci.php:55 setup/oci.php:122 setup/oci.php:148
+#: setup/oci.php:155 setup/oci.php:166 setup/oci.php:182 setup/oci.php:190
+#: setup/oci.php:199 setup/postgresql.php:90 setup/postgresql.php:99
+#: setup/postgresql.php:116 setup/postgresql.php:126 setup/postgresql.php:135
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr "Podozrivý príkaz bol: \"%s\""
 
-#: setup.php:305
+#: setup/mysql.php:85
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr "Používateľ '%s'@'localhost' už v MySQL existuje."
 
-#: setup.php:306
+#: setup/mysql.php:86
 msgid "Drop this user from MySQL"
 msgstr "Zahodiť používateľa z MySQL."
 
-#: setup.php:311
+#: setup/mysql.php:91
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr "Používateľ '%s'@'%%' už v MySQL existuje"
 
-#: setup.php:312
+#: setup/mysql.php:92
 msgid "Drop this user from MySQL."
 msgstr "Zahodiť používateľa z MySQL."
 
-#: setup.php:469 setup.php:536
+#: setup/oci.php:34
+msgid "Oracle connection could not be established"
+msgstr "Nie je možné pripojiť sa k Oracle"
+
+#: setup/oci.php:41 setup/oci.php:113
 msgid "Oracle username and/or password not valid"
 msgstr "Používateľské meno a/alebo heslo pre Oracle databázu je neplatné"
 
-#: setup.php:595 setup.php:627
+#: setup/oci.php:173 setup/oci.php:205
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr "Podozrivý príkaz bol: \"%s\", meno: %s, heslo: %s"
 
-#: setup.php:647
-#, php-format
-msgid "MS SQL username and/or password not valid: %s"
-msgstr "Používateľské meno, alebo heslo MS SQL nie je platné: %s"
+#: setup/postgresql.php:23 setup/postgresql.php:69
+msgid "PostgreSQL username and/or password not valid"
+msgstr "Používateľské meno a/alebo heslo pre PostgreSQL databázu je neplatné"
+
+#: setup.php:42
+msgid "Set an admin username."
+msgstr "Zadajte používateľské meno administrátora."
+
+#: setup.php:45
+msgid "Set an admin password."
+msgstr "Zadajte heslo administrátora."
 
-#: setup.php:870
+#: setup.php:198
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Váš webový server nie je správne nastavený na synchronizáciu, pretože rozhranie WebDAV je poškodené."
 
-#: setup.php:871
+#: setup.php:199
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Prosím skontrolujte <a href='%s'>inštalačnú príručku</a>."
diff --git a/l10n/sk_SK/settings.po b/l10n/sk_SK/settings.po
index 396ba0b26879dfdbe68ef8bd2444a8c526f326fa..f00cfb71c854244fdfb26132af52c82cb10eb83a 100644
--- a/l10n/sk_SK/settings.po
+++ b/l10n/sk_SK/settings.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
+"Last-Translator: mhh <marian.hvolka@stuba.sk>\n"
 "Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -89,35 +89,35 @@ msgstr "Nie je možné odstrániť používateľa zo skupiny %s"
 msgid "Couldn't update app."
 msgstr "Nemožno aktualizovať aplikáciu."
 
-#: js/apps.js:30
+#: js/apps.js:35
 msgid "Update to {appversion}"
 msgstr "Aktualizovať na {appversion}"
 
-#: js/apps.js:36 js/apps.js:76
+#: js/apps.js:41 js/apps.js:81
 msgid "Disable"
 msgstr "Zakázať"
 
-#: js/apps.js:36 js/apps.js:64 js/apps.js:83
+#: js/apps.js:41 js/apps.js:69 js/apps.js:88
 msgid "Enable"
 msgstr "Zapnúť"
 
-#: js/apps.js:55
+#: js/apps.js:60
 msgid "Please wait...."
 msgstr "Čakajte prosím..."
 
-#: js/apps.js:59 js/apps.js:71 js/apps.js:80 js/apps.js:93
+#: js/apps.js:64 js/apps.js:76 js/apps.js:85 js/apps.js:98
 msgid "Error"
 msgstr "Chyba"
 
-#: js/apps.js:90
+#: js/apps.js:95
 msgid "Updating...."
 msgstr "Aktualizujem..."
 
-#: js/apps.js:93
+#: js/apps.js:98
 msgid "Error while updating app"
 msgstr "chyba pri aktualizácii aplikácie"
 
-#: js/apps.js:96
+#: js/apps.js:101
 msgid "Updated"
 msgstr "Aktualizované"
 
@@ -166,15 +166,15 @@ msgstr "Chyba pri vytváraní používateľa"
 msgid "A valid password must be provided"
 msgstr "Musíte zadať platné heslo"
 
-#: personal.php:35 personal.php:36
+#: personal.php:37 personal.php:38
 msgid "__language_name__"
 msgstr "Slovensky"
 
-#: templates/admin.php:15
+#: templates/admin.php:17
 msgid "Security Warning"
 msgstr "Bezpečnostné varovanie"
 
-#: templates/admin.php:18
+#: templates/admin.php:20
 msgid ""
 "Your data directory and your files are probably accessible from the "
 "internet. The .htaccess file that ownCloud provides is not working. We "
@@ -183,36 +183,36 @@ msgid ""
 " webserver document root."
 msgstr "Váš priečinok s dátami a Vaše súbory sú pravdepodobne dostupné z internetu. .htaccess súbor dodávaný s inštaláciou ownCloud nespĺňa úlohu. Dôrazne Vám doporučujeme nakonfigurovať webserver takým spôsobom, aby dáta v priečinku neboli verejné, alebo presuňte dáta mimo štruktúry priečinkov webservera."
 
-#: templates/admin.php:29
+#: templates/admin.php:31
 msgid "Setup Warning"
 msgstr "Nastavenia oznámení"
 
-#: templates/admin.php:32
+#: templates/admin.php:34
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Váš webový server nie je správne nastavený na synchronizáciu, pretože rozhranie WebDAV je poškodené."
 
-#: templates/admin.php:33
+#: templates/admin.php:35
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Prosím skontrolujte <a href='%s'>inštalačnú príručku</a>."
 
-#: templates/admin.php:44
+#: templates/admin.php:46
 msgid "Module 'fileinfo' missing"
 msgstr "Chýba modul 'fileinfo'"
 
-#: templates/admin.php:47
+#: templates/admin.php:49
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr "Chýba modul 'fileinfo'. Dôrazne doporučujeme ho povoliť pre dosiahnutie najlepších výsledkov zisťovania mime-typu."
 
-#: templates/admin.php:58
+#: templates/admin.php:60
 msgid "Locale not working"
 msgstr "Lokalizácia nefunguje"
 
-#: templates/admin.php:63
+#: templates/admin.php:65
 #, php-format
 msgid ""
 "This ownCloud server can't set system locale to %s. This means that there "
@@ -220,11 +220,11 @@ msgid ""
 " to install the required packages on your system to support %s."
 msgstr "Tento server ownCloud nemôže nastaviť národné prostredie systému na %s. To znamená, že by mohli byť problémy s niektorými znakmi v názvoch súborov. Veľmi odporúčame nainštalovať požadované balíky na podporu %s."
 
-#: templates/admin.php:75
+#: templates/admin.php:77
 msgid "Internet connection not working"
 msgstr "Pripojenie na internet nefunguje"
 
-#: templates/admin.php:78
+#: templates/admin.php:80
 msgid ""
 "This ownCloud server has no working internet connection. This means that "
 "some of the features like mounting of external storage, notifications about "
@@ -234,102 +234,102 @@ msgid ""
 " of ownCloud."
 msgstr "Tento server ownCloud nemá funkčné pripojenie k internetu. To znamená, že niektoré z funkcií, ako je pripojenie externého úložiska, oznámenia o aktualizáciách či inštalácia aplikácií tretích strán nefungujú. Prístup k súborom zo vzdialených miest a odosielanie oznamovacích e-mailov tiež nemusí fungovať. Odporúčame pripojiť tento server  k internetu, ak chcete využívať všetky vlastnosti ownCloud."
 
-#: templates/admin.php:92
+#: templates/admin.php:94
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:101
+#: templates/admin.php:103
 msgid "Execute one task with each page loaded"
 msgstr "Vykonať jednu úlohu s každým načítaní stránky"
 
-#: templates/admin.php:111
+#: templates/admin.php:113
 msgid ""
 "cron.php is registered at a webcron service. Call the cron.php page in the "
 "owncloud root once a minute over http."
 msgstr "cron.php je registrovaná u služby webcron. Zavolá cron.php stránku v koreňovom priečinku owncloud raz za minútu cez protokol HTTP."
 
-#: templates/admin.php:121
+#: templates/admin.php:123
 msgid ""
 "Use systems cron service. Call the cron.php file in the owncloud folder via "
 "a system cronjob once a minute."
 msgstr "Používať systémovú službu cron. Zavolať cron.php v priečinku owncloud cez systémovú úlohu raz za minútu"
 
-#: templates/admin.php:128
+#: templates/admin.php:130
 msgid "Sharing"
 msgstr "Zdieľanie"
 
-#: templates/admin.php:134
+#: templates/admin.php:136
 msgid "Enable Share API"
 msgstr "Povoliť API zdieľania"
 
-#: templates/admin.php:135
+#: templates/admin.php:137
 msgid "Allow apps to use the Share API"
 msgstr "Povoliť aplikáciám používať API na zdieľanie"
 
-#: templates/admin.php:142
+#: templates/admin.php:144
 msgid "Allow links"
 msgstr "Povoliť odkazy"
 
-#: templates/admin.php:143
+#: templates/admin.php:145
 msgid "Allow users to share items to the public with links"
 msgstr "Povoliť používateľom zdieľať položky pre verejnosť cez odkazy"
 
-#: templates/admin.php:150
+#: templates/admin.php:152
 msgid "Allow resharing"
 msgstr "Povoliť zdieľanie ďalej"
 
-#: templates/admin.php:151
+#: templates/admin.php:153
 msgid "Allow users to share items shared with them again"
 msgstr "Povoliť používateľom ďalej zdieľať zdieľané položky"
 
-#: templates/admin.php:158
+#: templates/admin.php:160
 msgid "Allow users to share with anyone"
 msgstr "Povoliť používateľom zdieľať s kýmkoľvek"
 
-#: templates/admin.php:161
+#: templates/admin.php:163
 msgid "Allow users to only share with users in their groups"
 msgstr "Povoliť používateľom zdieľať len s používateľmi v ich skupinách"
 
-#: templates/admin.php:168
+#: templates/admin.php:170
 msgid "Security"
 msgstr "Zabezpečenie"
 
-#: templates/admin.php:181
+#: templates/admin.php:183
 msgid "Enforce HTTPS"
 msgstr "Vynútiť HTTPS"
 
-#: templates/admin.php:182
+#: templates/admin.php:184
 msgid ""
 "Enforces the clients to connect to ownCloud via an encrypted connection."
 msgstr "Vynúti pripojovanie klientov ownCloud cez šifrované pripojenie."
 
-#: templates/admin.php:185
+#: templates/admin.php:187
 msgid ""
 "Please connect to this ownCloud instance via HTTPS to enable or disable the "
 "SSL enforcement."
 msgstr "Pripojte sa k tejto inštancii ownCloud cez HTTPS pre povolenie alebo zakázanie vynútenia SSL."
 
-#: templates/admin.php:195
+#: templates/admin.php:197
 msgid "Log"
 msgstr "Záznam"
 
-#: templates/admin.php:196
+#: templates/admin.php:198
 msgid "Log level"
 msgstr "Úroveň záznamu"
 
-#: templates/admin.php:227
+#: templates/admin.php:229
 msgid "More"
 msgstr "Viac"
 
-#: templates/admin.php:228
+#: templates/admin.php:230
 msgid "Less"
 msgstr "Menej"
 
-#: templates/admin.php:235 templates/personal.php:116
+#: templates/admin.php:236 templates/personal.php:116
 msgid "Version"
 msgstr "Verzia"
 
-#: templates/admin.php:237 templates/personal.php:119
+#: templates/admin.php:240 templates/personal.php:119
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -387,76 +387,79 @@ msgstr "Bugtracker"
 msgid "Commercial Support"
 msgstr "Komerčná podpora"
 
-#: templates/personal.php:9
+#: templates/personal.php:10
 msgid "Get the apps to sync your files"
 msgstr "Získať aplikácie na synchronizáciu Vašich súborov"
 
-#: templates/personal.php:20
+#: templates/personal.php:21
 msgid "Show First Run Wizard again"
 msgstr "Znovu zobraziť sprievodcu prvým spustením"
 
-#: templates/personal.php:28
+#: templates/personal.php:29
 #, php-format
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "Použili ste <strong>%s</strong> z <strong>%s</strong> dostupných "
 
-#: templates/personal.php:40 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:41 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "Heslo"
 
-#: templates/personal.php:41
+#: templates/personal.php:42
 msgid "Your password was changed"
 msgstr "Heslo bolo zmenené"
 
-#: templates/personal.php:42
+#: templates/personal.php:43
 msgid "Unable to change your password"
 msgstr "Nie je možné zmeniť vaše heslo"
 
-#: templates/personal.php:43
+#: templates/personal.php:44
 msgid "Current password"
 msgstr "Aktuálne heslo"
 
-#: templates/personal.php:45
+#: templates/personal.php:46
 msgid "New password"
 msgstr "Nové heslo"
 
-#: templates/personal.php:47
+#: templates/personal.php:48
 msgid "Change password"
 msgstr "Zmeniť heslo"
 
-#: templates/personal.php:59 templates/users.php:85
+#: templates/personal.php:60 templates/users.php:85
 msgid "Display Name"
 msgstr "Zobrazované meno"
 
-#: templates/personal.php:74
+#: templates/personal.php:75
 msgid "Email"
 msgstr "Email"
 
-#: templates/personal.php:76
+#: templates/personal.php:77
 msgid "Your email address"
 msgstr "Vaša emailová adresa"
 
-#: templates/personal.php:77
+#: templates/personal.php:78
 msgid "Fill in an email address to enable password recovery"
 msgstr "Vyplňte emailovú adresu pre aktivovanie obnovy hesla"
 
-#: templates/personal.php:86 templates/personal.php:87
+#: templates/personal.php:87 templates/personal.php:88
 msgid "Language"
 msgstr "Jazyk"
 
-#: templates/personal.php:99
+#: templates/personal.php:100
 msgid "Help translate"
 msgstr "Pomôcť s prekladom"
 
-#: templates/personal.php:105
+#: templates/personal.php:106
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:107
-msgid "Use this address to connect to your ownCloud in your file manager"
-msgstr "Použite túto adresu pre pripojenie vášho ownCloud k súborovému správcovi"
+#: templates/personal.php:108
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
+"target=\"_blank\">access your Files via WebDAV</a>"
+msgstr "Použite túto adresu <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">pre prístup k súborom cez WebDAV</a>"
 
-#: templates/users.php:21 templates/users.php:84
+#: templates/users.php:21
 msgid "Login Name"
 msgstr "Prihlasovacie meno"
 
@@ -472,7 +475,7 @@ msgstr "Obnovenie hesla administrátora"
 msgid ""
 "Enter the recovery password in order to recover the users files during "
 "password change"
-msgstr ""
+msgstr "Zadajte heslo pre obnovenie súborov používateľa pri zmene hesla"
 
 #: templates/users.php:42
 msgid "Default Storage"
@@ -486,6 +489,10 @@ msgstr "Nelimitované"
 msgid "Other"
 msgstr "Iné"
 
+#: templates/users.php:84
+msgid "Username"
+msgstr "Meno používateľa"
+
 #: templates/users.php:91
 msgid "Storage"
 msgstr "Úložisko"
diff --git a/l10n/sk_SK/user_ldap.po b/l10n/sk_SK/user_ldap.po
index 18b09d0576894150ab928ff9b97ec41d8295ebf2..4cd5e216783684e83d3528ae987bcb6ee37c81dc 100644
--- a/l10n/sk_SK/user_ldap.po
+++ b/l10n/sk_SK/user_ldap.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:25+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:16+0000\n"
 "Last-Translator: mhh <marian.hvolka@stuba.sk>\n"
 "Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
 "MIME-Version: 1.0\n"
@@ -386,7 +386,7 @@ msgstr "UUID atribút:"
 
 #: templates/settings.php:107
 msgid "Username-LDAP User Mapping"
-msgstr ""
+msgstr "Mapovanie názvov LDAP používateľských mien"
 
 #: templates/settings.php:108
 msgid ""
@@ -405,11 +405,11 @@ msgstr ""
 
 #: templates/settings.php:109
 msgid "Clear Username-LDAP User Mapping"
-msgstr ""
+msgstr "Zrušiť mapovanie LDAP používateľských mien"
 
 #: templates/settings.php:109
 msgid "Clear Groupname-LDAP Group Mapping"
-msgstr ""
+msgstr "Zrušiť mapovanie názvov LDAP skupín"
 
 #: templates/settings.php:111
 msgid "Test Configuration"
diff --git a/l10n/sk_SK/user_webdavauth.po b/l10n/sk_SK/user_webdavauth.po
index 584941b201d099429e3bfe3be71d70b85ad05525..ae90bb92d46978e69d8399ee96d4a3fd06f8efde 100644
--- a/l10n/sk_SK/user_webdavauth.po
+++ b/l10n/sk_SK/user_webdavauth.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-15 01:59+0200\n"
-"PO-Revision-Date: 2013-06-15 00:00+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-06-21 08:49+0200\n"
+"PO-Revision-Date: 2013-06-20 17:30+0000\n"
+"Last-Translator: mhh <marian.hvolka@stuba.sk>\n"
 "Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -25,7 +25,7 @@ msgstr "WebDAV overenie"
 
 #: templates/settings.php:4
 msgid "URL: "
-msgstr ""
+msgstr "URL: "
 
 #: templates/settings.php:7
 msgid ""
diff --git a/l10n/sl/core.po b/l10n/sl/core.po
index 2dea4f598a571d8509129656e221f79b41b47601..8ee3882b56901564ae01221dd48cebc783dde5ad 100644
--- a/l10n/sl/core.po
+++ b/l10n/sl/core.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# barbarak <barbarak@arnes.si>, 2013
 # mateju <>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:22+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:14+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
@@ -21,7 +22,7 @@ msgstr ""
 #: ajax/share.php:97
 #, php-format
 msgid "%s shared »%s« with you"
-msgstr ""
+msgstr "%s je delil »%s« z vami"
 
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
@@ -62,135 +63,135 @@ msgstr "Za izbris ni izbrana nobena kategorija."
 msgid "Error removing %s from favorites."
 msgstr "Napaka odstranjevanja %s iz priljubljenih predmetov."
 
-#: js/config.php:34
+#: js/config.php:32
 msgid "Sunday"
 msgstr "nedelja"
 
-#: js/config.php:35
+#: js/config.php:33
 msgid "Monday"
 msgstr "ponedeljek"
 
-#: js/config.php:36
+#: js/config.php:34
 msgid "Tuesday"
 msgstr "torek"
 
-#: js/config.php:37
+#: js/config.php:35
 msgid "Wednesday"
 msgstr "sreda"
 
-#: js/config.php:38
+#: js/config.php:36
 msgid "Thursday"
 msgstr "četrtek"
 
-#: js/config.php:39
+#: js/config.php:37
 msgid "Friday"
 msgstr "petek"
 
-#: js/config.php:40
+#: js/config.php:38
 msgid "Saturday"
 msgstr "sobota"
 
-#: js/config.php:45
+#: js/config.php:43
 msgid "January"
 msgstr "januar"
 
-#: js/config.php:46
+#: js/config.php:44
 msgid "February"
 msgstr "februar"
 
-#: js/config.php:47
+#: js/config.php:45
 msgid "March"
 msgstr "marec"
 
-#: js/config.php:48
+#: js/config.php:46
 msgid "April"
 msgstr "april"
 
-#: js/config.php:49
+#: js/config.php:47
 msgid "May"
 msgstr "maj"
 
-#: js/config.php:50
+#: js/config.php:48
 msgid "June"
 msgstr "junij"
 
-#: js/config.php:51
+#: js/config.php:49
 msgid "July"
 msgstr "julij"
 
-#: js/config.php:52
+#: js/config.php:50
 msgid "August"
 msgstr "avgust"
 
-#: js/config.php:53
+#: js/config.php:51
 msgid "September"
 msgstr "september"
 
-#: js/config.php:54
+#: js/config.php:52
 msgid "October"
 msgstr "oktober"
 
-#: js/config.php:55
+#: js/config.php:53
 msgid "November"
 msgstr "november"
 
-#: js/config.php:56
+#: js/config.php:54
 msgid "December"
 msgstr "december"
 
-#: js/js.js:286
+#: js/js.js:293
 msgid "Settings"
 msgstr "Nastavitve"
 
-#: js/js.js:718
+#: js/js.js:725
 msgid "seconds ago"
 msgstr "pred nekaj sekundami"
 
-#: js/js.js:719
+#: js/js.js:726
 msgid "1 minute ago"
 msgstr "pred minuto"
 
-#: js/js.js:720
+#: js/js.js:727
 msgid "{minutes} minutes ago"
 msgstr "pred {minutes} minutami"
 
-#: js/js.js:721
+#: js/js.js:728
 msgid "1 hour ago"
 msgstr "Pred 1 uro"
 
-#: js/js.js:722
+#: js/js.js:729
 msgid "{hours} hours ago"
 msgstr "pred {hours} urami"
 
-#: js/js.js:723
+#: js/js.js:730
 msgid "today"
 msgstr "danes"
 
-#: js/js.js:724
+#: js/js.js:731
 msgid "yesterday"
 msgstr "včeraj"
 
-#: js/js.js:725
+#: js/js.js:732
 msgid "{days} days ago"
 msgstr "pred {days} dnevi"
 
-#: js/js.js:726
+#: js/js.js:733
 msgid "last month"
 msgstr "zadnji mesec"
 
-#: js/js.js:727
+#: js/js.js:734
 msgid "{months} months ago"
 msgstr "pred {months} meseci"
 
-#: js/js.js:728
+#: js/js.js:735
 msgid "months ago"
 msgstr "mesecev nazaj"
 
-#: js/js.js:729
+#: js/js.js:736
 msgid "last year"
 msgstr "lansko leto"
 
-#: js/js.js:730
+#: js/js.js:737
 msgid "years ago"
 msgstr "let nazaj"
 
@@ -204,7 +205,7 @@ msgstr "Prekliči"
 
 #: js/oc-dialogs.js:141 js/oc-dialogs.js:200
 msgid "Error loading file picker template"
-msgstr ""
+msgstr "Napaka pri nalaganju predloge za izbor dokumenta"
 
 #: js/oc-dialogs.js:164
 msgid "Yes"
@@ -226,8 +227,8 @@ msgstr "Vrsta predmeta ni podana."
 #: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
 #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:577
-#: js/share.js:589
+#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:620
+#: js/share.js:632
 msgid "Error"
 msgstr "Napaka"
 
@@ -247,7 +248,7 @@ msgstr "V souporabi"
 msgid "Share"
 msgstr "Souporaba"
 
-#: js/share.js:125 js/share.js:617
+#: js/share.js:125 js/share.js:660
 msgid "Error while sharing"
 msgstr "Napaka med souporabo"
 
@@ -267,99 +268,103 @@ msgstr "V souporabi z vami in skupino {group}. Lastnik je {owner}."
 msgid "Shared with you by {owner}"
 msgstr "V souporabi z vami. Lastnik je {owner}."
 
-#: js/share.js:159
+#: js/share.js:172
 msgid "Share with"
 msgstr "Omogoči souporabo z"
 
-#: js/share.js:164
+#: js/share.js:177
 msgid "Share with link"
 msgstr "Omogoči souporabo preko povezave"
 
-#: js/share.js:167
+#: js/share.js:180
 msgid "Password protect"
 msgstr "Zaščiti z geslom"
 
-#: js/share.js:169 templates/installation.php:54 templates/login.php:26
+#: js/share.js:182 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "Geslo"
 
-#: js/share.js:173
+#: js/share.js:187
+msgid "Allow Public Upload"
+msgstr "Dovoli javne prenose na strežnik"
+
+#: js/share.js:191
 msgid "Email link to person"
 msgstr "Posreduj povezavo po elektronski pošti"
 
-#: js/share.js:174
+#: js/share.js:192
 msgid "Send"
 msgstr "Pošlji"
 
-#: js/share.js:178
+#: js/share.js:197
 msgid "Set expiration date"
 msgstr "Nastavi datum preteka"
 
-#: js/share.js:179
+#: js/share.js:198
 msgid "Expiration date"
 msgstr "Datum preteka"
 
-#: js/share.js:211
+#: js/share.js:230
 msgid "Share via email:"
 msgstr "Souporaba preko elektronske pošte:"
 
-#: js/share.js:213
+#: js/share.js:232
 msgid "No people found"
 msgstr "Ni najdenih uporabnikov"
 
-#: js/share.js:251
+#: js/share.js:270
 msgid "Resharing is not allowed"
 msgstr "Nadaljnja souporaba ni dovoljena"
 
-#: js/share.js:287
+#: js/share.js:306
 msgid "Shared in {item} with {user}"
 msgstr "V souporabi v {item} z {user}"
 
-#: js/share.js:308
+#: js/share.js:327
 msgid "Unshare"
 msgstr "Prekliči souporabo"
 
-#: js/share.js:320
+#: js/share.js:339
 msgid "can edit"
 msgstr "lahko ureja"
 
-#: js/share.js:322
+#: js/share.js:341
 msgid "access control"
 msgstr "nadzor dostopa"
 
-#: js/share.js:325
+#: js/share.js:344
 msgid "create"
 msgstr "ustvari"
 
-#: js/share.js:328
+#: js/share.js:347
 msgid "update"
 msgstr "posodobi"
 
-#: js/share.js:331
+#: js/share.js:350
 msgid "delete"
 msgstr "izbriši"
 
-#: js/share.js:334
+#: js/share.js:353
 msgid "share"
 msgstr "določi souporabo"
 
-#: js/share.js:368 js/share.js:564
+#: js/share.js:387 js/share.js:607
 msgid "Password protected"
 msgstr "Zaščiteno z geslom"
 
-#: js/share.js:577
+#: js/share.js:620
 msgid "Error unsetting expiration date"
 msgstr "Napaka brisanja datuma preteka"
 
-#: js/share.js:589
+#: js/share.js:632
 msgid "Error setting expiration date"
 msgstr "Napaka med nastavljanjem datuma preteka"
 
-#: js/share.js:604
+#: js/share.js:647
 msgid "Sending ..."
 msgstr "Pošiljanje ..."
 
-#: js/share.js:615
+#: js/share.js:658
 msgid "Email sent"
 msgstr "Elektronska pošta je poslana"
 
@@ -374,7 +379,7 @@ msgstr "Posodobitev ni uspela. Pošljite poročilo o napaki na sistemu <a href=\
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "Posodobitev je uspešno končana. Stran bo preusmerjena na oblak ownCloud."
 
-#: lostpassword/controller.php:58
+#: lostpassword/controller.php:60
 msgid "ownCloud password reset"
 msgstr "Ponastavitev gesla za oblak ownCloud"
 
@@ -404,17 +409,17 @@ msgstr "Uporabniško ime"
 
 #: lostpassword/templates/lostpassword.php:22
 msgid ""
-"Your files seems to be encrypted. If you didn't have enabled the recovery "
-"key there will be no way to get your data back once the password was "
-"resetted. If you are not sure what to do, please contact your administrator "
-"first before continue. Do you really want to continue?"
-msgstr ""
+"Your files are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
+msgstr "Datoteke so šifrirane. Če niste omogočili ključa za obnovitev, žal podatkov ne bo mogoče pridobiti nazaj, ko boste geslo enkrat spremenili. Če niste prepričani, kaj storiti, se obrnite na skrbnika storitve. Ste prepričani, da želite nadaljevati?"
 
 #: lostpassword/templates/lostpassword.php:24
 msgid "Yes, I really want to reset my password now"
-msgstr ""
+msgstr "Da, potrjujem ponastavitev gesla"
 
-#: lostpassword/templates/lostpassword.php:29
+#: lostpassword/templates/lostpassword.php:27
 msgid "Request reset"
 msgstr "Zahtevaj ponovno nastavitev"
 
@@ -462,7 +467,7 @@ msgstr "Dostop je prepovedan"
 msgid "Cloud not found"
 msgstr "Oblaka ni mogoče najti"
 
-#: templates/altmail.php:2
+#: templates/altmail.php:4
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -471,11 +476,7 @@ msgid ""
 "View it: %s\n"
 "\n"
 "Cheers!"
-msgstr ""
-
-#: templates/altmail.php:7 templates/mail.php:24
-msgid "web services under your control"
-msgstr "spletne storitve pod vašim nadzorom"
+msgstr "Pozdravljen/a,⏎\n⏎\nsporočam, da je %s delil %s s teboj.⏎\nPoglej na: %s⏎\n⏎\nLep pozdrav!"
 
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
@@ -569,12 +570,12 @@ msgstr "Gostitelj podatkovne zbirke"
 msgid "Finish setup"
 msgstr "Končaj namestitev"
 
-#: templates/layout.user.php:40
+#: templates/layout.user.php:43
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr "%s je na voljo. Pridobite več podrobnosti za posodobitev."
 
-#: templates/layout.user.php:67
+#: templates/layout.user.php:68
 msgid "Log out"
 msgstr "Odjava"
 
@@ -608,12 +609,12 @@ msgstr "Prijava"
 msgid "Alternative Logins"
 msgstr "Druge prijavne možnosti"
 
-#: templates/mail.php:15
+#: templates/mail.php:16
 #, php-format
 msgid ""
 "Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
 "href=\"%s\">View it!</a><br><br>Cheers!"
-msgstr ""
+msgstr "Pozdravljen/a,<br><br>sporočam, da je %s delil »%s« s teboj.<br><a href=\"%s\">Poglej vsebine!</a><br><br>Lep pozdrav!"
 
 #: templates/part.pagenavi.php:3
 msgid "prev"
diff --git a/l10n/sl/files.po b/l10n/sl/files.po
index c144a5d902216490d02c175cbe177d59e5f3eef6..c5343353985b4ea06241ebe0980137141f20c14a 100644
--- a/l10n/sl/files.po
+++ b/l10n/sl/files.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# barbarak <barbarak@arnes.si>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:01+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
+"Last-Translator: barbarak <barbarak@arnes.si>\n"
 "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,53 +21,61 @@ msgstr ""
 #: ajax/move.php:17
 #, php-format
 msgid "Could not move %s - File with this name already exists"
-msgstr "Ni mogoče premakniti %s - datoteka s tem imenom že obstaja"
+msgstr "%s ni mogoče premakniti  - datoteka s tem imenom že obstaja"
 
 #: ajax/move.php:27 ajax/move.php:30
 #, php-format
 msgid "Could not move %s"
 msgstr "Ni mogoče premakniti %s"
 
-#: ajax/upload.php:19
+#: ajax/upload.php:16 ajax/upload.php:45
+msgid "Unable to set upload directory."
+msgstr "Mapo, v katero boste prenašali dokumente, ni mogoče določiti"
+
+#: ajax/upload.php:22
+msgid "Invalid Token"
+msgstr "Neveljaven žeton"
+
+#: ajax/upload.php:59
 msgid "No file was uploaded. Unknown error"
 msgstr "Ni poslane datoteke. Neznana napaka."
 
-#: ajax/upload.php:26
+#: ajax/upload.php:66
 msgid "There is no error, the file uploaded with success"
 msgstr "Datoteka je uspešno naložena."
 
-#: ajax/upload.php:27
+#: ajax/upload.php:67
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr "Poslana datoteka presega dovoljeno velikost, ki je določena z možnostjo upload_max_filesize v datoteki php.ini:"
 
-#: ajax/upload.php:29
+#: ajax/upload.php:69
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Poslana datoteka presega velikost, ki jo določa parameter največje dovoljene velikosti v obrazcu HTML."
 
-#: ajax/upload.php:30
+#: ajax/upload.php:70
 msgid "The uploaded file was only partially uploaded"
 msgstr "Poslan je le del datoteke."
 
-#: ajax/upload.php:31
+#: ajax/upload.php:71
 msgid "No file was uploaded"
 msgstr "Ni poslane datoteke"
 
-#: ajax/upload.php:32
+#: ajax/upload.php:72
 msgid "Missing a temporary folder"
 msgstr "Manjka začasna mapa"
 
-#: ajax/upload.php:33
+#: ajax/upload.php:73
 msgid "Failed to write to disk"
 msgstr "Pisanje na disk je spodletelo"
 
-#: ajax/upload.php:51
+#: ajax/upload.php:91
 msgid "Not enough storage available"
 msgstr "Na voljo ni dovolj prostora"
 
-#: ajax/upload.php:83
+#: ajax/upload.php:123
 msgid "Invalid directory."
 msgstr "Neveljavna mapa."
 
@@ -74,6 +83,36 @@ msgstr "Neveljavna mapa."
 msgid "Files"
 msgstr "Datoteke"
 
+#: js/file-upload.js:11
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr "Pošiljanja ni mogoče izvesti, saj gre za mapo oziroma datoteko velikosti 0 bajtov."
+
+#: js/file-upload.js:24
+msgid "Not enough space available"
+msgstr "Na voljo ni dovolj prostora."
+
+#: js/file-upload.js:64
+msgid "Upload cancelled."
+msgstr "Pošiljanje je preklicano."
+
+#: js/file-upload.js:167 js/files.js:266
+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/file-upload.js:233 js/files.js:339
+msgid "URL cannot be empty."
+msgstr "Naslov URL ne sme biti prazna vrednost."
+
+#: js/file-upload.js:238 lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr "Ime mape je neveljavno. Uporaba oznake \"Souporaba\" je rezervirana za ownCloud"
+
+#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
+#: js/files.js:693 js/files.js:731
+msgid "Error"
+msgstr "Napaka"
+
 #: js/fileactions.js:116
 msgid "Share"
 msgstr "Souporaba"
@@ -90,43 +129,43 @@ msgstr "Izbriši"
 msgid "Rename"
 msgstr "Preimenuj"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:464
 msgid "Pending"
 msgstr "V čakanju ..."
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "{new_name} already exists"
 msgstr "{new_name} že obstaja"
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "replace"
 msgstr "zamenjaj"
 
-#: js/filelist.js:259
+#: js/filelist.js:302
 msgid "suggest name"
 msgstr "predlagaj ime"
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "cancel"
 msgstr "prekliči"
 
-#: js/filelist.js:306
+#: js/filelist.js:349
 msgid "replaced {new_name} with {old_name}"
 msgstr "preimenovano ime {new_name} z imenom {old_name}"
 
-#: js/filelist.js:306
+#: js/filelist.js:349
 msgid "undo"
 msgstr "razveljavi"
 
-#: js/filelist.js:331
+#: js/filelist.js:374
 msgid "perform delete operation"
 msgstr "izvedi opravilo brisanja"
 
-#: js/filelist.js:413
+#: js/filelist.js:456
 msgid "1 file uploading"
 msgstr "Pošiljanje 1 datoteke"
 
-#: js/filelist.js:416 js/filelist.js:470
+#: js/filelist.js:459 js/filelist.js:517
 msgid "files uploading"
 msgstr "poteka pošiljanje datotek"
 
@@ -158,70 +197,42 @@ msgid ""
 "big."
 msgstr "Postopek priprave datoteke za prejem je lahko dolgotrajen, če je datoteka zelo velika."
 
-#: js/files.js:264
-msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "Pošiljanja ni mogoče izvesti, saj gre za mapo oziroma datoteko velikosti 0 bajtov."
-
-#: js/files.js:277
-msgid "Not enough space available"
-msgstr "Na voljo ni dovolj prostora."
-
-#: js/files.js:317
-msgid "Upload cancelled."
-msgstr "Pošiljanje je preklicano."
-
-#: js/files.js:413
-msgid ""
-"File upload is in progress. Leaving the page now will cancel the upload."
-msgstr "V teku je pošiljanje datoteke. Če zapustite to stran zdaj, bo pošiljanje preklicano."
-
-#: js/files.js:486
-msgid "URL cannot be empty."
-msgstr "Naslov URL ne sme biti prazna vrednost."
-
-#: js/files.js:491
+#: js/files.js:344
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Neveljavno ime mape. Uporaba oznake \"Souporaba\" je zadržan za sistem ownCloud."
 
-#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
-msgid "Error"
-msgstr "Napaka"
-
-#: js/files.js:877 templates/index.php:69
+#: js/files.js:744 templates/index.php:69
 msgid "Name"
 msgstr "Ime"
 
-#: js/files.js:878 templates/index.php:80
+#: js/files.js:745 templates/index.php:80
 msgid "Size"
 msgstr "Velikost"
 
-#: js/files.js:879 templates/index.php:82
+#: js/files.js:746 templates/index.php:82
 msgid "Modified"
 msgstr "Spremenjeno"
 
-#: js/files.js:898
+#: js/files.js:765
 msgid "1 folder"
 msgstr "1 mapa"
 
-#: js/files.js:900
+#: js/files.js:767
 msgid "{count} folders"
 msgstr "{count} map"
 
-#: js/files.js:908
+#: js/files.js:775
 msgid "1 file"
 msgstr "1 datoteka"
 
-#: js/files.js:910
+#: js/files.js:777
 msgid "{count} files"
 msgstr "{count} datotek"
 
-#: lib/app.php:53
-msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
-msgstr ""
-
 #: lib/app.php:73
-msgid "Unable to rename file"
-msgstr "Ni mogoče preimenovati datoteke"
+#, php-format
+msgid "%s could not be renamed"
+msgstr "%s ni bilo mogoče preimenovati"
 
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
@@ -317,6 +328,22 @@ msgstr "Poteka preučevanje datotek, počakajte ..."
 msgid "Current scanning"
 msgstr "Trenutno poteka preučevanje"
 
+#: templates/part.list.php:76
+msgid "directory"
+msgstr "direktorij"
+
+#: templates/part.list.php:78
+msgid "directories"
+msgstr "direktoriji"
+
+#: templates/part.list.php:87
+msgid "file"
+msgstr "datoteka"
+
+#: templates/part.list.php:89
+msgid "files"
+msgstr "datoteke"
+
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
 msgstr "Nadgrajevanje predpomnilnika datotečnega sistema ..."
diff --git a/l10n/sl/files_encryption.po b/l10n/sl/files_encryption.po
index e98e6030c070212c8a6c46cb2d674455693155c7..0386afaca31bdbcddc8f74a682b7f4b56c5531dd 100644
--- a/l10n/sl/files_encryption.po
+++ b/l10n/sl/files_encryption.po
@@ -3,12 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# barbarak <barbarak@arnes.si>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-14 02:46+0200\n"
-"PO-Revision-Date: 2013-06-14 00:47+0000\n"
+"POT-Creation-Date: 2013-07-05 02:12+0200\n"
+"PO-Revision-Date: 2013-07-05 00:13+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
@@ -19,45 +20,57 @@ msgstr ""
 
 #: ajax/adminrecovery.php:29
 msgid "Recovery key successfully enabled"
-msgstr ""
+msgstr "Ključ za obnovitev gesla je bil uspešno nastavljen"
 
 #: ajax/adminrecovery.php:34
 msgid ""
 "Could not enable recovery key. Please check your recovery key password!"
-msgstr ""
+msgstr "Ključa za obnovitev gesla ni bilo mogoče nastaviti. Preverite ključ!"
 
 #: ajax/adminrecovery.php:48
 msgid "Recovery key successfully disabled"
-msgstr ""
+msgstr "Ključ za obnovitev gesla je bil uspešno onemogočen"
 
 #: ajax/adminrecovery.php:53
 msgid ""
 "Could not disable recovery key. Please check your recovery key password!"
-msgstr ""
+msgstr "Ključa za obnovitev gesla ni bilo mogoče onemogočiti. Preverite ključ!"
 
 #: ajax/changeRecoveryPassword.php:49
 msgid "Password successfully changed."
-msgstr ""
+msgstr "Geslo je bilo uspešno spremenjeno."
 
 #: ajax/changeRecoveryPassword.php:51
 msgid "Could not change the password. Maybe the old password was not correct."
-msgstr ""
+msgstr "Gesla ni bilo mogoče spremeniti. Morda vnos starega gesla ni bil pravilen."
 
 #: ajax/updatePrivateKeyPassword.php:51
 msgid "Private key password successfully updated."
-msgstr ""
+msgstr "Zasebni ključ za geslo je bil uspešno posodobljen."
 
 #: ajax/updatePrivateKeyPassword.php:53
 msgid ""
 "Could not update the private key password. Maybe the old password was not "
 "correct."
-msgstr ""
+msgstr "Zasebnega ključa za geslo ni bilo mogoče posodobiti. Morda vnos starega gesla ni bil pravilen."
 
 #: files/error.php:7
 msgid ""
-"Your private key is not valid! Maybe your password was changed from outside."
-" You can update your private key password in your personal settings to "
-"regain access to your files"
+"Your private key is not valid! Likely your password was changed outside the "
+"ownCloud system (e.g. your corporate directory). You can update your private"
+" key password in your personal settings to recover access to your encrypted "
+"files."
+msgstr "Vaš zasebni ključ ni veljaven. Morda je bilo vaše geslo spremenjeno zunaj sistema ownCloud (npr. v skupnem imeniku). Svoj zasebni ključ, ki vam bo omogočil dostop do šifriranih dokumentov, lahko posodobite v osebnih nastavitvah."
+
+#: hooks/hooks.php:44
+msgid "Missing requirements."
+msgstr ""
+
+#: hooks/hooks.php:45
+msgid ""
+"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL "
+"PHP extension is enabled and configured properly. For now, the encryption "
+"app has been disabled."
 msgstr ""
 
 #: js/settings-admin.js:11
@@ -68,15 +81,15 @@ msgstr "Poteka shranjevanje ..."
 msgid ""
 "Your private key is not valid! Maybe the your password was changed from "
 "outside."
-msgstr ""
+msgstr "Vaš zasebni ključ ni veljaven. Morda je bilo vaše geslo spremenjeno."
 
 #: templates/invalid_private_key.php:7
 msgid "You can unlock your private key in your "
-msgstr ""
+msgstr "Svoj zasebni ključ lahko odklenite v"
 
 #: templates/invalid_private_key.php:7
 msgid "personal settings"
-msgstr ""
+msgstr "osebne nastavitve"
 
 #: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
@@ -84,77 +97,77 @@ msgstr "Å ifriranje"
 
 #: templates/settings-admin.php:10
 msgid ""
-"Enable encryption passwords recovery key (allow sharing to recovery key):"
-msgstr ""
+"Enable recovery key (allow to recover users files in case of password loss):"
+msgstr "Omogoči ključ za obnovitev datotek (v primeru izgube gesla)"
 
 #: templates/settings-admin.php:14
-msgid "Recovery account password"
-msgstr ""
+msgid "Recovery key password"
+msgstr "Ključ za obnovitev gesla"
 
 #: templates/settings-admin.php:21 templates/settings-personal.php:54
 msgid "Enabled"
-msgstr ""
+msgstr "Omogočeno"
 
 #: templates/settings-admin.php:29 templates/settings-personal.php:62
 msgid "Disabled"
-msgstr ""
+msgstr "Onemogočeno"
 
 #: templates/settings-admin.php:34
-msgid "Change encryption passwords recovery key:"
-msgstr ""
+msgid "Change recovery key password:"
+msgstr "Spremeni ključ za obnovitev gesla:"
 
 #: templates/settings-admin.php:41
-msgid "Old Recovery account password"
-msgstr ""
+msgid "Old Recovery key password"
+msgstr "Stari ključ za obnovitev gesla"
 
 #: templates/settings-admin.php:48
-msgid "New Recovery account password"
-msgstr ""
+msgid "New Recovery key password"
+msgstr "Nov ključ za obnovitev gesla"
 
 #: templates/settings-admin.php:53
 msgid "Change Password"
-msgstr ""
+msgstr "Spremeni geslo"
 
 #: templates/settings-personal.php:11
 msgid "Your private key password no longer match your log-in password:"
-msgstr ""
+msgstr "Vaš zasebni ključ za geslo se ne ujema z vnešenim geslom ob prijavi:"
 
 #: templates/settings-personal.php:14
 msgid "Set your old private key password to your current log-in password."
-msgstr ""
+msgstr "Nastavite svoj star zasebni ključ v geslo, vnešeno ob prijavi."
 
 #: templates/settings-personal.php:16
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
-msgstr ""
+msgstr "Če ste svoje geslo pozabili, lahko vaše datoteke obnovi skrbnik sistema."
 
 #: templates/settings-personal.php:24
 msgid "Old log-in password"
-msgstr ""
+msgstr "Staro geslo"
 
 #: templates/settings-personal.php:30
 msgid "Current log-in password"
-msgstr ""
+msgstr "Trenutno geslo"
 
 #: templates/settings-personal.php:35
 msgid "Update Private Key Password"
-msgstr ""
+msgstr "Posodobi zasebni ključ"
 
 #: templates/settings-personal.php:45
 msgid "Enable password recovery:"
-msgstr ""
+msgstr "Omogoči obnovitev gesla:"
 
 #: templates/settings-personal.php:47
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
-msgstr ""
+msgstr "Nastavitev te možnosti omogoča ponovno pridobitev dostopa do šifriranih datotek, v primeru da boste geslo pozabili."
 
 #: templates/settings-personal.php:63
 msgid "File recovery settings updated"
-msgstr ""
+msgstr "Nastavitve obnavljanja dokumentov so bile posodobljene"
 
 #: templates/settings-personal.php:64
 msgid "Could not update file recovery"
-msgstr ""
+msgstr "Nastavitev za obnavljanje dokumentov ni bilo mogoče posodobiti"
diff --git a/l10n/sl/files_external.po b/l10n/sl/files_external.po
index 9a87074d0740c9965a8a6c42a894faceba45310c..bb8ba9c953e5a8126e72dd7edc4ca04f0fe4978c 100644
--- a/l10n/sl/files_external.po
+++ b/l10n/sl/files_external.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: mateju <>\n"
 "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/sl/files_sharing.po b/l10n/sl/files_sharing.po
index c7c8a5d536cf32e8251ce512c2322cacca59f6f9..ce3b2e47ec820c60909e7463645f807dfbf2debc 100644
--- a/l10n/sl/files_sharing.po
+++ b/l10n/sl/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
@@ -18,27 +18,39 @@ msgstr ""
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n"
 
 #: templates/authenticate.php:4
+msgid "The password is wrong. Try again."
+msgstr ""
+
+#: templates/authenticate.php:7
 msgid "Password"
 msgstr "Geslo"
 
-#: templates/authenticate.php:6
+#: templates/authenticate.php:9
 msgid "Submit"
 msgstr "Pošlji"
 
-#: templates/public.php:10
+#: templates/public.php:17
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "Oseba %s je določila mapo %s za souporabo"
 
-#: templates/public.php:13
+#: templates/public.php:20
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "Oseba %s je določila datoteko %s za souporabo"
 
-#: templates/public.php:19 templates/public.php:43
+#: templates/public.php:28 templates/public.php:90
 msgid "Download"
 msgstr "Prejmi"
 
-#: templates/public.php:40
+#: templates/public.php:45 templates/public.php:48
+msgid "Upload"
+msgstr "Pošlji"
+
+#: templates/public.php:58
+msgid "Cancel upload"
+msgstr "Prekliči pošiljanje"
+
+#: templates/public.php:87
 msgid "No preview available for"
 msgstr "Predogled ni na voljo za"
diff --git a/l10n/sl/files_trashbin.po b/l10n/sl/files_trashbin.po
index 83f2cc431014815863b919419cf6105e7195dfba..52b3d69cfb9fd8e06fc87ef5976dd32429c3888c 100644
--- a/l10n/sl/files_trashbin.po
+++ b/l10n/sl/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:16+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/sl/lib.po b/l10n/sl/lib.po
index 0ff29962d0c01db5c9e7a8f4d1547a052278b014..bcc9237037d13764919a65a612fa0c82950b3343 100644
--- a/l10n/sl/lib.po
+++ b/l10n/sl/lib.po
@@ -3,12 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# barbarak <barbarak@arnes.si>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
@@ -17,43 +18,47 @@ msgstr ""
 "Language: sl\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n"
 
-#: app.php:359
+#: app.php:360
 msgid "Help"
 msgstr "Pomoč"
 
-#: app.php:372
+#: app.php:373
 msgid "Personal"
 msgstr "Osebno"
 
-#: app.php:383
+#: app.php:384
 msgid "Settings"
 msgstr "Nastavitve"
 
-#: app.php:395
+#: app.php:396
 msgid "Users"
 msgstr "Uporabniki"
 
-#: app.php:408
+#: app.php:409
 msgid "Apps"
 msgstr "Programi"
 
-#: app.php:416
+#: app.php:417
 msgid "Admin"
 msgstr "Skrbništvo"
 
-#: files.php:210
+#: defaults.php:33
+msgid "web services under your control"
+msgstr "spletne storitve pod vašim nadzorom"
+
+#: files.php:226
 msgid "ZIP download is turned off."
 msgstr "Prejemanje datotek v paketu ZIP je onemogočeno."
 
-#: files.php:211
+#: files.php:227
 msgid "Files need to be downloaded one by one."
 msgstr "Datoteke je mogoče prejeti le posamično."
 
-#: files.php:212 files.php:245
+#: files.php:228 files.php:261
 msgid "Back to Files"
 msgstr "Nazaj na datoteke"
 
-#: files.php:242
+#: files.php:258
 msgid "Selected files too large to generate zip file."
 msgstr "Izbrane datoteke so prevelike za ustvarjanje datoteke arhiva zip."
 
@@ -85,104 +90,102 @@ msgstr "Besedilo"
 msgid "Images"
 msgstr "Slike"
 
-#: setup.php:34
-msgid "Set an admin username."
-msgstr "Nastavi uporabniško ime skrbnika."
-
-#: setup.php:37
-msgid "Set an admin password."
-msgstr "Nastavi geslo skrbnika."
-
-#: setup.php:55
+#: setup/abstractdatabase.php:22
 #, php-format
 msgid "%s enter the database username."
 msgstr "%s - vnos uporabniškega imena podatkovne zbirke."
 
-#: setup.php:58
+#: setup/abstractdatabase.php:25
 #, php-format
 msgid "%s enter the database name."
 msgstr "%s - vnos imena podatkovne zbirke."
 
-#: setup.php:61
+#: setup/abstractdatabase.php:28
 #, php-format
 msgid "%s you may not use dots in the database name"
 msgstr "%s - v imenu podatkovne zbirke ni dovoljeno uporabljati pik."
 
-#: setup.php:64
+#: setup/mssql.php:20
 #, php-format
-msgid "%s set the database host."
-msgstr "%s - vnos gostitelja podatkovne zbirke."
-
-#: setup.php:126 setup.php:332 setup.php:377
-msgid "PostgreSQL username and/or password not valid"
-msgstr "Uporabniško ime ali geslo PostgreSQL ni veljavno"
+msgid "MS SQL username and/or password not valid: %s"
+msgstr "Uporabniško ime ali geslo MS SQL ni veljavno: %s"
 
-#: setup.php:127 setup.php:235
+#: setup/mssql.php:21 setup/mysql.php:13 setup/oci.php:114
+#: setup/postgresql.php:24 setup/postgresql.php:70
 msgid "You need to enter either an existing account or the administrator."
 msgstr "Prijaviti se je treba v obstoječi ali pa skrbniški račun."
 
-#: setup.php:152
-msgid "Oracle connection could not be established"
-msgstr ""
-
-#: setup.php:234
+#: setup/mysql.php:12
 msgid "MySQL username and/or password not valid"
 msgstr "Uporabniško ime ali geslo MySQL ni veljavno"
 
-#: setup.php:288 setup.php:398 setup.php:407 setup.php:425 setup.php:435
-#: setup.php:444 setup.php:477 setup.php:543 setup.php:569 setup.php:576
-#: setup.php:587 setup.php:594 setup.php:603 setup.php:611 setup.php:620
-#: setup.php:626
+#: setup/mysql.php:67 setup/oci.php:54 setup/oci.php:121 setup/oci.php:147
+#: setup/oci.php:154 setup/oci.php:165 setup/oci.php:172 setup/oci.php:181
+#: setup/oci.php:189 setup/oci.php:198 setup/oci.php:204
+#: setup/postgresql.php:89 setup/postgresql.php:98 setup/postgresql.php:115
+#: setup/postgresql.php:125 setup/postgresql.php:134
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr "Napaka podatkovne zbirke: \"%s\""
 
-#: setup.php:289 setup.php:399 setup.php:408 setup.php:426 setup.php:436
-#: setup.php:445 setup.php:478 setup.php:544 setup.php:570 setup.php:577
-#: setup.php:588 setup.php:604 setup.php:612 setup.php:621
+#: setup/mysql.php:68 setup/oci.php:55 setup/oci.php:122 setup/oci.php:148
+#: setup/oci.php:155 setup/oci.php:166 setup/oci.php:182 setup/oci.php:190
+#: setup/oci.php:199 setup/postgresql.php:90 setup/postgresql.php:99
+#: setup/postgresql.php:116 setup/postgresql.php:126 setup/postgresql.php:135
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr "Napačni ukaz je: \"%s\""
 
-#: setup.php:305
+#: setup/mysql.php:85
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr "Uporabnik MySQL '%s'@'localhost' že obstaja."
 
-#: setup.php:306
+#: setup/mysql.php:86
 msgid "Drop this user from MySQL"
 msgstr "Odstrani uporabnika s podatkovne zbirke MySQL"
 
-#: setup.php:311
+#: setup/mysql.php:91
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr "Uporabnik MySQL '%s'@'%%' že obstaja."
 
-#: setup.php:312
+#: setup/mysql.php:92
 msgid "Drop this user from MySQL."
 msgstr "Odstrani uporabnika s podatkovne zbirke MySQL"
 
-#: setup.php:469 setup.php:536
+#: setup/oci.php:34
+msgid "Oracle connection could not be established"
+msgstr "Povezava z bazo Oracle ni uspela."
+
+#: setup/oci.php:41 setup/oci.php:113
 msgid "Oracle username and/or password not valid"
 msgstr "Uporabniško ime ali geslo Oracle ni veljavno"
 
-#: setup.php:595 setup.php:627
+#: setup/oci.php:173 setup/oci.php:205
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr "Napačni ukaz je: \"%s\", ime: %s, geslo: %s"
 
-#: setup.php:647
-#, php-format
-msgid "MS SQL username and/or password not valid: %s"
-msgstr "Uporabniško ime ali geslo MS SQL ni veljavno: %s"
+#: setup/postgresql.php:23 setup/postgresql.php:69
+msgid "PostgreSQL username and/or password not valid"
+msgstr "Uporabniško ime ali geslo PostgreSQL ni veljavno"
+
+#: setup.php:42
+msgid "Set an admin username."
+msgstr "Nastavi uporabniško ime skrbnika."
+
+#: setup.php:45
+msgid "Set an admin password."
+msgstr "Nastavi geslo skrbnika."
 
-#: setup.php:870
+#: setup.php:198
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Spletni stražnik še ni ustrezno nastavljen in ne omogoča usklajevanja, saj je nastavitev WebDAV okvarjena."
 
-#: setup.php:871
+#: setup.php:199
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Preverite <a href='%s'>navodila namestitve</a>."
diff --git a/l10n/sl/settings.po b/l10n/sl/settings.po
index bfc077acf4bf8ec039ab44ba0103e68526a3c899..894d6058d64b2c6aac1d67d244546cca9dc09f76 100644
--- a/l10n/sl/settings.po
+++ b/l10n/sl/settings.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# barbarak <barbarak@arnes.si>, 2013
 # mateju <>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
@@ -89,35 +90,35 @@ msgstr "Uporabnika ni mogoče odstraniti iz skupine %s"
 msgid "Couldn't update app."
 msgstr "Programa ni mogoče posodobiti."
 
-#: js/apps.js:30
+#: js/apps.js:35
 msgid "Update to {appversion}"
 msgstr "Posodobi na {appversion}"
 
-#: js/apps.js:36 js/apps.js:76
+#: js/apps.js:41 js/apps.js:81
 msgid "Disable"
 msgstr "Onemogoči"
 
-#: js/apps.js:36 js/apps.js:64 js/apps.js:83
+#: js/apps.js:41 js/apps.js:69 js/apps.js:88
 msgid "Enable"
 msgstr "Omogoči"
 
-#: js/apps.js:55
+#: js/apps.js:60
 msgid "Please wait...."
 msgstr "Počakajte ..."
 
-#: js/apps.js:59 js/apps.js:71 js/apps.js:80 js/apps.js:93
+#: js/apps.js:64 js/apps.js:76 js/apps.js:85 js/apps.js:98
 msgid "Error"
 msgstr "Napaka"
 
-#: js/apps.js:90
+#: js/apps.js:95
 msgid "Updating...."
 msgstr "Poteka posodabljanje ..."
 
-#: js/apps.js:93
+#: js/apps.js:98
 msgid "Error while updating app"
 msgstr "Prišlo je do napake med posodabljanjem programa."
 
-#: js/apps.js:96
+#: js/apps.js:101
 msgid "Updated"
 msgstr "Posodobljeno"
 
@@ -166,15 +167,15 @@ msgstr "Napaka ustvarjanja uporabnika"
 msgid "A valid password must be provided"
 msgstr "Navedeno mora biti veljavno geslo"
 
-#: personal.php:35 personal.php:36
+#: personal.php:37 personal.php:38
 msgid "__language_name__"
 msgstr "Slovenščina"
 
-#: templates/admin.php:15
+#: templates/admin.php:17
 msgid "Security Warning"
 msgstr "Varnostno opozorilo"
 
-#: templates/admin.php:18
+#: templates/admin.php:20
 msgid ""
 "Your data directory and your files are probably accessible from the "
 "internet. The .htaccess file that ownCloud provides is not working. We "
@@ -183,36 +184,36 @@ msgid ""
 " webserver document root."
 msgstr "Trenutno je dostop do podatkovne mape in datotek najverjetneje omogočen vsem uporabnikom na omrežju. Datoteka .htaccess, vključena v ownCloud, namreč ni ustrezno nastavljena. Priporočljivo je nastaviti spletni strežnik tako, da mapa podatkov ne bo javno dostopna, ali pa, da jo prestavite v podrejeno mapo korenske mape spletnega strežnika."
 
-#: templates/admin.php:29
+#: templates/admin.php:31
 msgid "Setup Warning"
 msgstr "Opozorilo nastavitve"
 
-#: templates/admin.php:32
+#: templates/admin.php:34
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Spletni stražnik še ni ustrezno nastavljen in ne omogoča usklajevanja, saj je nastavitev WebDAV okvarjena."
 
-#: templates/admin.php:33
+#: templates/admin.php:35
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Preverite <a href='%s'>navodila namestitve</a>."
 
-#: templates/admin.php:44
+#: templates/admin.php:46
 msgid "Module 'fileinfo' missing"
 msgstr "Manjka modul 'fileinfo'."
 
-#: templates/admin.php:47
+#: templates/admin.php:49
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr "Manjka modul PHP 'fileinfo'. Priporočljivo je omogočiti ta modul za popolno zaznavanje vrst MIME."
 
-#: templates/admin.php:58
+#: templates/admin.php:60
 msgid "Locale not working"
 msgstr "Jezikovne prilagoditve ne delujejo."
 
-#: templates/admin.php:63
+#: templates/admin.php:65
 #, php-format
 msgid ""
 "This ownCloud server can't set system locale to %s. This means that there "
@@ -220,11 +221,11 @@ msgid ""
 " to install the required packages on your system to support %s."
 msgstr "Na strežniku ownCloud ni mogoče nastaviti jezikovnih določil na jezik %s. Najverjetneje so težave s posebnimi znaki v imenih datotek. Priporočljivo je namestiti zahtevane pakete za podporo jeziku %s."
 
-#: templates/admin.php:75
+#: templates/admin.php:77
 msgid "Internet connection not working"
 msgstr "Internetna povezava ne deluje."
 
-#: templates/admin.php:78
+#: templates/admin.php:80
 msgid ""
 "This ownCloud server has no working internet connection. This means that "
 "some of the features like mounting of external storage, notifications about "
@@ -234,102 +235,102 @@ msgid ""
 " of ownCloud."
 msgstr "Strežnik ownCloud je brez delujoče internetne povezave. To pomeni, da bodo nekatere možnosti onemogočene. Ne bo mogoče priklapljati zunanjih priklopnih točk, ne bo obvestil o posodobitvah ali namestitvah programske opreme, prav tako najverjetneje ne bo mogoče pošiljati obvestilnih sporočil preko elektronske pošte. Za uporabo vseh zmožnosti oblaka ownCloud, mora biti internetna povezava vzpostavljena in delujoča."
 
-#: templates/admin.php:92
+#: templates/admin.php:94
 msgid "Cron"
 msgstr "Periodično opravilo"
 
-#: templates/admin.php:101
+#: templates/admin.php:103
 msgid "Execute one task with each page loaded"
 msgstr "Izvedi eno nalogo z vsako naloženo stranjo."
 
-#: templates/admin.php:111
+#: templates/admin.php:113
 msgid ""
 "cron.php is registered at a webcron service. Call the cron.php page in the "
 "owncloud root once a minute over http."
 msgstr "Datoteka cron.php je vpisana pri storitvi webcron. Preko protokola HTTP je datoteka cron.php, ki se nahaja v korenski mapi ownCloud, klicana enkrat na minuto."
 
-#: templates/admin.php:121
+#: templates/admin.php:123
 msgid ""
 "Use systems cron service. Call the cron.php file in the owncloud folder via "
 "a system cronjob once a minute."
 msgstr "Uporaba sistemske storitve cron. Preko sistemskega posla cron je datoteka cron.php, ki se nahaja v mapi ownCloud, klicana enkrat na minuto."
 
-#: templates/admin.php:128
+#: templates/admin.php:130
 msgid "Sharing"
 msgstr "Souporaba"
 
-#: templates/admin.php:134
+#: templates/admin.php:136
 msgid "Enable Share API"
 msgstr "Omogoči API souporabe"
 
-#: templates/admin.php:135
+#: templates/admin.php:137
 msgid "Allow apps to use the Share API"
 msgstr "Dovoli programom uporabo vmesnika API souporabe"
 
-#: templates/admin.php:142
+#: templates/admin.php:144
 msgid "Allow links"
 msgstr "Dovoli povezave"
 
-#: templates/admin.php:143
+#: templates/admin.php:145
 msgid "Allow users to share items to the public with links"
 msgstr "Uporabnikom dovoli souporabo predmetov z javnimi povezavami"
 
-#: templates/admin.php:150
+#: templates/admin.php:152
 msgid "Allow resharing"
 msgstr "Dovoli nadaljnjo souporabo"
 
-#: templates/admin.php:151
+#: templates/admin.php:153
 msgid "Allow users to share items shared with them again"
 msgstr "Uporabnikom dovoli nadaljnjo souporabo predmetov"
 
-#: templates/admin.php:158
+#: templates/admin.php:160
 msgid "Allow users to share with anyone"
 msgstr "Uporabnikom dovoli souporabo s komerkoli"
 
-#: templates/admin.php:161
+#: templates/admin.php:163
 msgid "Allow users to only share with users in their groups"
 msgstr "Uporabnikom dovoli souporabo z ostalimi uporabniki njihove skupine"
 
-#: templates/admin.php:168
+#: templates/admin.php:170
 msgid "Security"
 msgstr "Varnost"
 
-#: templates/admin.php:181
+#: templates/admin.php:183
 msgid "Enforce HTTPS"
 msgstr "Zahtevaj uporabo HTTPS"
 
-#: templates/admin.php:182
+#: templates/admin.php:184
 msgid ""
 "Enforces the clients to connect to ownCloud via an encrypted connection."
 msgstr "Zahtevaj Å¡ifrirano povezovanje odjemalcev v oblak ownCloud"
 
-#: templates/admin.php:185
+#: templates/admin.php:187
 msgid ""
 "Please connect to this ownCloud instance via HTTPS to enable or disable the "
 "SSL enforcement."
 msgstr "Prijava mora biti vzpostavljena z uporabo protokola HTTPS za omogočanje šifriranja SSL."
 
-#: templates/admin.php:195
+#: templates/admin.php:197
 msgid "Log"
 msgstr "Dnevnik"
 
-#: templates/admin.php:196
+#: templates/admin.php:198
 msgid "Log level"
 msgstr "Raven beleženja"
 
-#: templates/admin.php:227
+#: templates/admin.php:229
 msgid "More"
 msgstr "Več"
 
-#: templates/admin.php:228
+#: templates/admin.php:230
 msgid "Less"
 msgstr "Manj"
 
-#: templates/admin.php:235 templates/personal.php:116
+#: templates/admin.php:236 templates/personal.php:116
 msgid "Version"
 msgstr "Različica"
 
-#: templates/admin.php:237 templates/personal.php:119
+#: templates/admin.php:240 templates/personal.php:119
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -387,76 +388,79 @@ msgstr "Sledilnik hroščev"
 msgid "Commercial Support"
 msgstr "Podpora strankam"
 
-#: templates/personal.php:9
+#: templates/personal.php:10
 msgid "Get the apps to sync your files"
 msgstr "Pridobi programe za usklajevanje datotek"
 
-#: templates/personal.php:20
+#: templates/personal.php:21
 msgid "Show First Run Wizard again"
 msgstr "Zaženi čarovnika prvega zagona"
 
-#: templates/personal.php:28
+#: templates/personal.php:29
 #, php-format
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "Uporabljenega je <strong>%s</strong> od razpoložljivih <strong>%s</strong> prostora."
 
-#: templates/personal.php:40 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:41 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "Geslo"
 
-#: templates/personal.php:41
+#: templates/personal.php:42
 msgid "Your password was changed"
 msgstr "Geslo je spremenjeno"
 
-#: templates/personal.php:42
+#: templates/personal.php:43
 msgid "Unable to change your password"
 msgstr "Gesla ni mogoče spremeniti."
 
-#: templates/personal.php:43
+#: templates/personal.php:44
 msgid "Current password"
 msgstr "Trenutno geslo"
 
-#: templates/personal.php:45
+#: templates/personal.php:46
 msgid "New password"
 msgstr "Novo geslo"
 
-#: templates/personal.php:47
+#: templates/personal.php:48
 msgid "Change password"
 msgstr "Spremeni geslo"
 
-#: templates/personal.php:59 templates/users.php:85
+#: templates/personal.php:60 templates/users.php:85
 msgid "Display Name"
 msgstr "Prikazano ime"
 
-#: templates/personal.php:74
+#: templates/personal.php:75
 msgid "Email"
 msgstr "Elektronski naslov"
 
-#: templates/personal.php:76
+#: templates/personal.php:77
 msgid "Your email address"
 msgstr "Osebni elektronski naslov"
 
-#: templates/personal.php:77
+#: templates/personal.php:78
 msgid "Fill in an email address to enable password recovery"
 msgstr "Vpišite osebni elektronski naslov in s tem omogočite obnovitev gesla"
 
-#: templates/personal.php:86 templates/personal.php:87
+#: templates/personal.php:87 templates/personal.php:88
 msgid "Language"
 msgstr "Jezik"
 
-#: templates/personal.php:99
+#: templates/personal.php:100
 msgid "Help translate"
 msgstr "Sodelujte pri prevajanju"
 
-#: templates/personal.php:105
+#: templates/personal.php:106
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:107
-msgid "Use this address to connect to your ownCloud in your file manager"
-msgstr "Ta naslov uporabite za povezavo upravljalnika datotek z oblakom ownCloud."
+#: templates/personal.php:108
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
+"target=\"_blank\">access your Files via WebDAV</a>"
+msgstr ""
 
-#: templates/users.php:21 templates/users.php:84
+#: templates/users.php:21
 msgid "Login Name"
 msgstr "Prijavno ime"
 
@@ -466,13 +470,13 @@ msgstr "Ustvari"
 
 #: templates/users.php:36
 msgid "Admin Recovery Password"
-msgstr ""
+msgstr "Obnovitev administratorjevega gesla"
 
 #: templates/users.php:37 templates/users.php:38
 msgid ""
 "Enter the recovery password in order to recover the users files during "
 "password change"
-msgstr ""
+msgstr "Vnesite geslo za obnovitev, ki ga boste uporabljali za obnovitev datotek uporabnikov med spremembo gesla"
 
 #: templates/users.php:42
 msgid "Default Storage"
@@ -486,6 +490,10 @@ msgstr "Neomejeno"
 msgid "Other"
 msgstr "Drugo"
 
+#: templates/users.php:84
+msgid "Username"
+msgstr "Uporabniško ime"
+
 #: templates/users.php:91
 msgid "Storage"
 msgstr "Shramba"
diff --git a/l10n/sl/user_ldap.po b/l10n/sl/user_ldap.po
index d3b0448c8391074c890dcd40d5a9f37005be075d..0c786ff68dce6aebadc74a3c7def128df416c538 100644
--- a/l10n/sl/user_ldap.po
+++ b/l10n/sl/user_ldap.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# barbarak <barbarak@arnes.si>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:25+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:16+0000\n"
+"Last-Translator: barbarak <barbarak@arnes.si>\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,7 +20,7 @@ msgstr ""
 
 #: ajax/clearMappings.php:34
 msgid "Failed to clear the mappings."
-msgstr ""
+msgstr "Preslikav ni bilo mogoče izbrisati"
 
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
@@ -59,7 +60,7 @@ msgstr "Ni mogoče dodati nastavitev strežnika"
 
 #: js/settings.js:111
 msgid "mappings cleared"
-msgstr ""
+msgstr "Preslikave so izbrisane"
 
 #: js/settings.js:112
 msgid "Success"
@@ -342,7 +343,7 @@ msgstr "Pustite prazno za uporabniško ime (privzeto), sicer navedite atribut LD
 
 #: templates/settings.php:101
 msgid "Internal Username"
-msgstr ""
+msgstr "Interno uporabniško ime"
 
 #: templates/settings.php:102
 msgid ""
@@ -358,15 +359,15 @@ msgid ""
 "achieve a similar behaviour as before ownCloud 5 enter the user display name"
 " attribute in the following field. Leave it empty for default behaviour. "
 "Changes will have effect only on newly mapped (added) LDAP users."
-msgstr ""
+msgstr "Po privzetih nastavitvah bo uporabniško ime nastavljeno na podlagi atributa UUID. Ta zagotovi, da je uporabniško ime unikatno in, da znakov ni potrebno pretvarjati. Interno uporabniško ime ima omejitev v uporabi znakov, in sicer so dovoljeni le znaki [ a-zA-Z0-9_.@- ]. Ostali znaki so nadomeščeni z njihovimi ustreznicami v ASCII ali so enostavno prezrti. Pri prekrivanju znakov bo dodana številka. Interno uporabniško ime je v uporabi za interno identifikacijo uporabnika. Je tudi privzeto ime za uporabnikovo domačo mapo v ownCloudu.  Predstavlja tudi vrata za oddaljene internetne naslove, na primer za vse storitve *DAV. S to nastavitvijo se privzete nastavitve ne bodo upoštevale. Če boste želeli doseči isto obnašanje kot pri različicah ownClouda 5, vnesite atribut za Ime za prikaz v spodnje polje. Če boste polje pustili prazno, bo uporabljena privzeta vrednost. Spremembe bodo vplivale samo na novo dodane LDAP-uporabnike."
 
 #: templates/settings.php:103
 msgid "Internal Username Attribute:"
-msgstr ""
+msgstr "Atribut Interno uporabniško ime"
 
 #: templates/settings.php:104
 msgid "Override UUID detection"
-msgstr ""
+msgstr "Prezri zaznavo UUID"
 
 #: templates/settings.php:105
 msgid ""
@@ -377,15 +378,15 @@ msgid ""
 "You must make sure that the attribute of your choice can be fetched for both"
 " users and groups and it is unique. Leave it empty for default behaviour. "
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
-msgstr ""
+msgstr "Po privzetih nastavitvah ownCloud sam zazna atribute UUID. Atribut UUID je uporabljen za identifikacijo LDAP-uporabnikov in skupin. Na podlagi atributa UUID se ustvari tudi interno uporabniško ime, če ne navedete drugačnih nastavitev sami. Nastavitev lahko povozite in izberete nastavitev po vaši izbiri. Potrebno je zagotoviti, da je izbran atribut lahko uporabljen tako za kreiranje uporabnikov kot skupin in je unikaten. Pustite praznega, če želite, da sistem uporabi privzete nastavitve. Spremembe bodo uporabljene šele pri novo preslikanih ali dodanih LDAP-uporabnikih in skupinah."
 
 #: templates/settings.php:106
 msgid "UUID Attribute:"
-msgstr ""
+msgstr "Atribut UUID"
 
 #: templates/settings.php:107
 msgid "Username-LDAP User Mapping"
-msgstr ""
+msgstr "Preslikava uporabniško ime - LDAP-uporabnik"
 
 #: templates/settings.php:108
 msgid ""
@@ -400,15 +401,15 @@ msgid ""
 "configuration sensitive, it affects all LDAP configurations! Do never clear "
 "the mappings in a production environment. Only clear mappings in a testing "
 "or experimental stage."
-msgstr ""
+msgstr "ownCloud uporablja uporabniška imena za shranjevanje in določanje metapodatkov. Za natančno identifikacijo in prepoznavo uporabnikov, ima vsak LDAP-uporabnik svoje interno uporabniško ime. To zahteva preslikavo iz uporabniškega imena v ownCloudu v LDAP-uporabnika.  Ustvarjeno uporabniško ime je preslikano v UUID LDAP-uporabnika. Hkrati je v predpomnilnik shranjen DN uporabnika, zato da se zmanjšajo povezave z LDAP-om, ni pa uporabljen za identifikacijo uporabnikov. Če se DN spremeni, bo ownCloud sam našel te spremembe. Interno ime v ownCloudu je uporabljeno v celotnem sistemu. Brisanje preslikav bo pustilo posledice povsod. Brisanje preslikav je zato problematično za konfiguracijo, vpliva na celotno LDAP-konfiguracijo. Nikoli ne brišite preslikav na produkcijskem okolju. Preslikave brišite samo v fazi preizkušanja storitve."
 
 #: templates/settings.php:109
 msgid "Clear Username-LDAP User Mapping"
-msgstr ""
+msgstr "Izbriši preslikavo Uporabniškega imena in LDAP-uporabnika"
 
 #: templates/settings.php:109
 msgid "Clear Groupname-LDAP Group Mapping"
-msgstr ""
+msgstr "Izbriši preslikavo Skupine in LDAP-skupine"
 
 #: templates/settings.php:111
 msgid "Test Configuration"
diff --git a/l10n/sl/user_webdavauth.po b/l10n/sl/user_webdavauth.po
index 8dadab8687771cdc47f2a8f8521b786810fa0d50..3f1ee543539d118e5e3a969bd866b3fdb719c828 100644
--- a/l10n/sl/user_webdavauth.po
+++ b/l10n/sl/user_webdavauth.po
@@ -3,15 +3,16 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# barbarak <barbarak@arnes.si>, 2013
 # mateju <>, 2013
 # Peter Peroša <peter.perosa@gmail.com>, 2012-2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-15 01:59+0200\n"
-"PO-Revision-Date: 2013-06-15 00:00+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-06-29 02:03+0200\n"
+"PO-Revision-Date: 2013-06-28 17:00+0000\n"
+"Last-Translator: barbarak <barbarak@arnes.si>\n"
 "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -25,7 +26,7 @@ msgstr "Overitev WebDAV"
 
 #: templates/settings.php:4
 msgid "URL: "
-msgstr ""
+msgstr "URL:"
 
 #: templates/settings.php:7
 msgid ""
diff --git a/l10n/sq/core.po b/l10n/sq/core.po
index a6d044a5505ddca8a7c529c0879418687e9984b6..9b68027f89919273a49482b8a920980dbaa73028 100644
--- a/l10n/sq/core.po
+++ b/l10n/sq/core.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:22+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:14+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
 "MIME-Version: 1.0\n"
@@ -62,135 +62,135 @@ msgstr "Nuk selektuar për tu eliminuar asnjë kategori."
 msgid "Error removing %s from favorites."
 msgstr "Veprim i gabuar gjatë heqjes së %s nga të parapëlqyerat."
 
-#: js/config.php:34
+#: js/config.php:32
 msgid "Sunday"
 msgstr "E djelë"
 
-#: js/config.php:35
+#: js/config.php:33
 msgid "Monday"
 msgstr "E hënë"
 
-#: js/config.php:36
+#: js/config.php:34
 msgid "Tuesday"
 msgstr "E martë"
 
-#: js/config.php:37
+#: js/config.php:35
 msgid "Wednesday"
 msgstr "E mërkurë"
 
-#: js/config.php:38
+#: js/config.php:36
 msgid "Thursday"
 msgstr "E enjte"
 
-#: js/config.php:39
+#: js/config.php:37
 msgid "Friday"
 msgstr "E premte"
 
-#: js/config.php:40
+#: js/config.php:38
 msgid "Saturday"
 msgstr "E shtunë"
 
-#: js/config.php:45
+#: js/config.php:43
 msgid "January"
 msgstr "Janar"
 
-#: js/config.php:46
+#: js/config.php:44
 msgid "February"
 msgstr "Shkurt"
 
-#: js/config.php:47
+#: js/config.php:45
 msgid "March"
 msgstr "Mars"
 
-#: js/config.php:48
+#: js/config.php:46
 msgid "April"
 msgstr "Prill"
 
-#: js/config.php:49
+#: js/config.php:47
 msgid "May"
 msgstr "Maj"
 
-#: js/config.php:50
+#: js/config.php:48
 msgid "June"
 msgstr "Qershor"
 
-#: js/config.php:51
+#: js/config.php:49
 msgid "July"
 msgstr "Korrik"
 
-#: js/config.php:52
+#: js/config.php:50
 msgid "August"
 msgstr "Gusht"
 
-#: js/config.php:53
+#: js/config.php:51
 msgid "September"
 msgstr "Shtator"
 
-#: js/config.php:54
+#: js/config.php:52
 msgid "October"
 msgstr "Tetor"
 
-#: js/config.php:55
+#: js/config.php:53
 msgid "November"
 msgstr "Nëntor"
 
-#: js/config.php:56
+#: js/config.php:54
 msgid "December"
 msgstr "Dhjetor"
 
-#: js/js.js:286
+#: js/js.js:293
 msgid "Settings"
 msgstr "Parametra"
 
-#: js/js.js:718
+#: js/js.js:725
 msgid "seconds ago"
 msgstr "sekonda më parë"
 
-#: js/js.js:719
+#: js/js.js:726
 msgid "1 minute ago"
 msgstr "1 minutë më parë"
 
-#: js/js.js:720
+#: js/js.js:727
 msgid "{minutes} minutes ago"
 msgstr "{minutes} minuta më parë"
 
-#: js/js.js:721
+#: js/js.js:728
 msgid "1 hour ago"
 msgstr "1 orë më parë"
 
-#: js/js.js:722
+#: js/js.js:729
 msgid "{hours} hours ago"
 msgstr "{hours} orë më parë"
 
-#: js/js.js:723
+#: js/js.js:730
 msgid "today"
 msgstr "sot"
 
-#: js/js.js:724
+#: js/js.js:731
 msgid "yesterday"
 msgstr "dje"
 
-#: js/js.js:725
+#: js/js.js:732
 msgid "{days} days ago"
 msgstr "{days} ditë më parë"
 
-#: js/js.js:726
+#: js/js.js:733
 msgid "last month"
 msgstr "muajin e shkuar"
 
-#: js/js.js:727
+#: js/js.js:734
 msgid "{months} months ago"
 msgstr "{months} muaj më parë"
 
-#: js/js.js:728
+#: js/js.js:735
 msgid "months ago"
 msgstr "muaj më parë"
 
-#: js/js.js:729
+#: js/js.js:736
 msgid "last year"
 msgstr "vitin e shkuar"
 
-#: js/js.js:730
+#: js/js.js:737
 msgid "years ago"
 msgstr "vite më parë"
 
@@ -226,8 +226,8 @@ msgstr "Nuk është specifikuar tipi i objektit."
 #: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
 #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:577
-#: js/share.js:589
+#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:620
+#: js/share.js:632
 msgid "Error"
 msgstr "Veprim i gabuar"
 
@@ -247,7 +247,7 @@ msgstr "Ndarë"
 msgid "Share"
 msgstr "Nda"
 
-#: js/share.js:125 js/share.js:617
+#: js/share.js:125 js/share.js:660
 msgid "Error while sharing"
 msgstr "Veprim i gabuar gjatë ndarjes"
 
@@ -267,99 +267,103 @@ msgstr "Ndarë me ju dhe me grupin {group} nga {owner}"
 msgid "Shared with you by {owner}"
 msgstr "Ndarë me ju nga {owner}"
 
-#: js/share.js:159
+#: js/share.js:172
 msgid "Share with"
 msgstr "Nda me"
 
-#: js/share.js:164
+#: js/share.js:177
 msgid "Share with link"
 msgstr "Nda me lidhje"
 
-#: js/share.js:167
+#: js/share.js:180
 msgid "Password protect"
 msgstr "Mbro me kod"
 
-#: js/share.js:169 templates/installation.php:54 templates/login.php:26
+#: js/share.js:182 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "Kodi"
 
-#: js/share.js:173
+#: js/share.js:187
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:191
 msgid "Email link to person"
 msgstr "Dërgo email me lidhjen"
 
-#: js/share.js:174
+#: js/share.js:192
 msgid "Send"
 msgstr "Dërgo"
 
-#: js/share.js:178
+#: js/share.js:197
 msgid "Set expiration date"
 msgstr "Cakto datën e përfundimit"
 
-#: js/share.js:179
+#: js/share.js:198
 msgid "Expiration date"
 msgstr "Data e përfundimit"
 
-#: js/share.js:211
+#: js/share.js:230
 msgid "Share via email:"
 msgstr "Nda me email:"
 
-#: js/share.js:213
+#: js/share.js:232
 msgid "No people found"
 msgstr "Nuk u gjet asnjë person"
 
-#: js/share.js:251
+#: js/share.js:270
 msgid "Resharing is not allowed"
 msgstr "Rindarja nuk lejohet"
 
-#: js/share.js:287
+#: js/share.js:306
 msgid "Shared in {item} with {user}"
 msgstr "Ndarë në {item} me {user}"
 
-#: js/share.js:308
+#: js/share.js:327
 msgid "Unshare"
 msgstr "Hiq ndarjen"
 
-#: js/share.js:320
+#: js/share.js:339
 msgid "can edit"
 msgstr "mund të ndryshosh"
 
-#: js/share.js:322
+#: js/share.js:341
 msgid "access control"
 msgstr "kontrollimi i hyrjeve"
 
-#: js/share.js:325
+#: js/share.js:344
 msgid "create"
 msgstr "krijo"
 
-#: js/share.js:328
+#: js/share.js:347
 msgid "update"
 msgstr "azhurno"
 
-#: js/share.js:331
+#: js/share.js:350
 msgid "delete"
 msgstr "elimino"
 
-#: js/share.js:334
+#: js/share.js:353
 msgid "share"
 msgstr "nda"
 
-#: js/share.js:368 js/share.js:564
+#: js/share.js:387 js/share.js:607
 msgid "Password protected"
 msgstr "Mbrojtur me kod"
 
-#: js/share.js:577
+#: js/share.js:620
 msgid "Error unsetting expiration date"
 msgstr "Veprim i gabuar gjatë heqjes së datës së përfundimit"
 
-#: js/share.js:589
+#: js/share.js:632
 msgid "Error setting expiration date"
 msgstr "Veprim i gabuar gjatë caktimit të datës së përfundimit"
 
-#: js/share.js:604
+#: js/share.js:647
 msgid "Sending ..."
 msgstr "Duke dërguar..."
 
-#: js/share.js:615
+#: js/share.js:658
 msgid "Email sent"
 msgstr "Email-i u dërgua"
 
@@ -374,7 +378,7 @@ msgstr "Azhurnimi dështoi. Ju lutemi njoftoni për këtë problem <a href=\"htt
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "Azhurnimi u krye. Tani do t'ju kaloj tek ownCloud-i."
 
-#: lostpassword/controller.php:58
+#: lostpassword/controller.php:60
 msgid "ownCloud password reset"
 msgstr "Rivendosja e kodit të ownCloud-it"
 
@@ -404,17 +408,17 @@ msgstr "Përdoruesi"
 
 #: lostpassword/templates/lostpassword.php:22
 msgid ""
-"Your files seems to be encrypted. If you didn't have enabled the recovery "
-"key there will be no way to get your data back once the password was "
-"resetted. If you are not sure what to do, please contact your administrator "
-"first before continue. Do you really want to continue?"
+"Your files are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
 msgstr ""
 
 #: lostpassword/templates/lostpassword.php:24
 msgid "Yes, I really want to reset my password now"
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:29
+#: lostpassword/templates/lostpassword.php:27
 msgid "Request reset"
 msgstr "Bëj kërkesë për rivendosjen"
 
@@ -462,7 +466,7 @@ msgstr "Ndalohet hyrja"
 msgid "Cloud not found"
 msgstr "Cloud-i nuk u gjet"
 
-#: templates/altmail.php:2
+#: templates/altmail.php:4
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -473,10 +477,6 @@ msgid ""
 "Cheers!"
 msgstr ""
 
-#: templates/altmail.php:7 templates/mail.php:24
-msgid "web services under your control"
-msgstr "shërbime web nën kontrollin tënd"
-
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
 msgstr "Ndrysho kategoritë"
@@ -569,12 +569,12 @@ msgstr "Pozicioni (host) i database-it"
 msgid "Finish setup"
 msgstr "Mbaro setup-in"
 
-#: templates/layout.user.php:40
+#: templates/layout.user.php:43
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:67
+#: templates/layout.user.php:68
 msgid "Log out"
 msgstr "Dalje"
 
@@ -608,7 +608,7 @@ msgstr "Hyrje"
 msgid "Alternative Logins"
 msgstr "Hyrje alternative"
 
-#: templates/mail.php:15
+#: templates/mail.php:16
 #, php-format
 msgid ""
 "Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
diff --git a/l10n/sq/files.po b/l10n/sq/files.po
index ea510307d8856d46ec879f6e7be1f5cfbaa33404..9e89d9a6ac137d54158765454c86dc6507dc0c97 100644
--- a/l10n/sq/files.po
+++ b/l10n/sq/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:01+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
 "MIME-Version: 1.0\n"
@@ -27,46 +27,54 @@ msgstr "%s nuk u spostua - Aty ekziston një skedar me të njëjtin emër"
 msgid "Could not move %s"
 msgstr "%s nuk u spostua"
 
-#: ajax/upload.php:19
+#: ajax/upload.php:16 ajax/upload.php:45
+msgid "Unable to set upload directory."
+msgstr ""
+
+#: ajax/upload.php:22
+msgid "Invalid Token"
+msgstr ""
+
+#: ajax/upload.php:59
 msgid "No file was uploaded. Unknown error"
 msgstr "Nuk u ngarkua asnjë skedar. Veprim i gabuar i panjohur"
 
-#: ajax/upload.php:26
+#: ajax/upload.php:66
 msgid "There is no error, the file uploaded with success"
 msgstr "Nuk pati veprime të gabuara, skedari u ngarkua me sukses"
 
-#: ajax/upload.php:27
+#: ajax/upload.php:67
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr "Skedari i ngarkuar tejkalon udhëzimin upload_max_filesize tek php.ini:"
 
-#: ajax/upload.php:29
+#: ajax/upload.php:69
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Skedari i ngarkuar tejkalon udhëzimin MAX_FILE_SIZE të specifikuar në formularin HTML"
 
-#: ajax/upload.php:30
+#: ajax/upload.php:70
 msgid "The uploaded file was only partially uploaded"
 msgstr "Skedari i ngarkuar u ngarkua vetëm pjesërisht"
 
-#: ajax/upload.php:31
+#: ajax/upload.php:71
 msgid "No file was uploaded"
 msgstr "Nuk u ngarkua asnjë skedar"
 
-#: ajax/upload.php:32
+#: ajax/upload.php:72
 msgid "Missing a temporary folder"
 msgstr "Një dosje e përkohshme nuk u gjet"
 
-#: ajax/upload.php:33
+#: ajax/upload.php:73
 msgid "Failed to write to disk"
 msgstr "Ruajtja në disk dështoi"
 
-#: ajax/upload.php:51
+#: ajax/upload.php:91
 msgid "Not enough storage available"
 msgstr "Nuk ka mbetur hapësirë memorizimi e mjaftueshme"
 
-#: ajax/upload.php:83
+#: ajax/upload.php:123
 msgid "Invalid directory."
 msgstr "Dosje e pavlefshme."
 
@@ -74,6 +82,36 @@ msgstr "Dosje e pavlefshme."
 msgid "Files"
 msgstr "Skedarët"
 
+#: js/file-upload.js:11
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr "Nuk është i mundur ngarkimi i skedarit tuaj sepse është dosje ose ka dimension 0 byte"
+
+#: js/file-upload.js:24
+msgid "Not enough space available"
+msgstr "Nuk ka hapësirë memorizimi e mjaftueshme"
+
+#: js/file-upload.js:64
+msgid "Upload cancelled."
+msgstr "Ngarkimi u anulua."
+
+#: js/file-upload.js:167 js/files.js:266
+msgid ""
+"File upload is in progress. Leaving the page now will cancel the upload."
+msgstr "Ngarkimi i skedarit është në vazhdim. Nqse ndërroni faqen tani ngarkimi do të anulohet."
+
+#: js/file-upload.js:233 js/files.js:339
+msgid "URL cannot be empty."
+msgstr "URL-i nuk mund të jetë bosh."
+
+#: js/file-upload.js:238 lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr ""
+
+#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
+#: js/files.js:693 js/files.js:731
+msgid "Error"
+msgstr "Veprim i gabuar"
+
 #: js/fileactions.js:116
 msgid "Share"
 msgstr "Nda"
@@ -90,43 +128,43 @@ msgstr "Elimino"
 msgid "Rename"
 msgstr "Riemërto"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:464
 msgid "Pending"
 msgstr "Pezulluar"
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "{new_name} already exists"
 msgstr "{new_name} ekziston"
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "replace"
 msgstr "zëvëndëso"
 
-#: js/filelist.js:259
+#: js/filelist.js:302
 msgid "suggest name"
 msgstr "sugjero një emër"
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "cancel"
 msgstr "anulo"
 
-#: js/filelist.js:306
+#: js/filelist.js:349
 msgid "replaced {new_name} with {old_name}"
 msgstr "U zëvëndësua {new_name} me {old_name}"
 
-#: js/filelist.js:306
+#: js/filelist.js:349
 msgid "undo"
 msgstr "anulo"
 
-#: js/filelist.js:331
+#: js/filelist.js:374
 msgid "perform delete operation"
 msgstr "ekzekuto operacionin e eliminimit"
 
-#: js/filelist.js:413
+#: js/filelist.js:456
 msgid "1 file uploading"
 msgstr "Po ngarkohet 1 skedar"
 
-#: js/filelist.js:416 js/filelist.js:470
+#: js/filelist.js:459 js/filelist.js:517
 msgid "files uploading"
 msgstr "po ngarkoj skedarët"
 
@@ -158,70 +196,42 @@ msgid ""
 "big."
 msgstr "Shkarkimi juaj po përgatitet. Mund të duhet pak kohë nqse skedarët janë të mëdhenj."
 
-#: js/files.js:264
-msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "Nuk është i mundur ngarkimi i skedarit tuaj sepse është dosje ose ka dimension 0 byte"
-
-#: js/files.js:277
-msgid "Not enough space available"
-msgstr "Nuk ka hapësirë memorizimi e mjaftueshme"
-
-#: js/files.js:317
-msgid "Upload cancelled."
-msgstr "Ngarkimi u anulua."
-
-#: js/files.js:413
-msgid ""
-"File upload is in progress. Leaving the page now will cancel the upload."
-msgstr "Ngarkimi i skedarit është në vazhdim. Nqse ndërroni faqen tani ngarkimi do të anulohet."
-
-#: js/files.js:486
-msgid "URL cannot be empty."
-msgstr "URL-i nuk mund të jetë bosh."
-
-#: js/files.js:491
+#: js/files.js:344
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Emri i dosjes është i pavlefshëm. Përdorimi i \"Shared\" është i rezervuar nga Owncloud-i."
 
-#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
-msgid "Error"
-msgstr "Veprim i gabuar"
-
-#: js/files.js:877 templates/index.php:69
+#: js/files.js:744 templates/index.php:69
 msgid "Name"
 msgstr "Emri"
 
-#: js/files.js:878 templates/index.php:80
+#: js/files.js:745 templates/index.php:80
 msgid "Size"
 msgstr "Dimensioni"
 
-#: js/files.js:879 templates/index.php:82
+#: js/files.js:746 templates/index.php:82
 msgid "Modified"
 msgstr "Modifikuar"
 
-#: js/files.js:898
+#: js/files.js:765
 msgid "1 folder"
 msgstr "1 dosje"
 
-#: js/files.js:900
+#: js/files.js:767
 msgid "{count} folders"
 msgstr "{count} dosje"
 
-#: js/files.js:908
+#: js/files.js:775
 msgid "1 file"
 msgstr "1 skedar"
 
-#: js/files.js:910
+#: js/files.js:777
 msgid "{count} files"
 msgstr "{count} skedarë"
 
-#: lib/app.php:53
-msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
-msgstr ""
-
 #: lib/app.php:73
-msgid "Unable to rename file"
-msgstr "Nuk është i mundur riemërtimi i skedarit"
+#, php-format
+msgid "%s could not be renamed"
+msgstr ""
 
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
@@ -317,6 +327,22 @@ msgstr "Skedarët po analizohen, ju lutemi pritni."
 msgid "Current scanning"
 msgstr "Analizimi aktual"
 
+#: templates/part.list.php:76
+msgid "directory"
+msgstr ""
+
+#: templates/part.list.php:78
+msgid "directories"
+msgstr ""
+
+#: templates/part.list.php:87
+msgid "file"
+msgstr ""
+
+#: templates/part.list.php:89
+msgid "files"
+msgstr ""
+
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
 msgstr "Po përmirësoj memorjen e filesystem-it..."
diff --git a/l10n/sq/files_encryption.po b/l10n/sq/files_encryption.po
index 57fd333cb0721c592fd612e37c1d102c21f927ee..1642b96a8247e981a113f830e5ff6d56641bacd3 100644
--- a/l10n/sq/files_encryption.po
+++ b/l10n/sq/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-14 02:46+0200\n"
-"PO-Revision-Date: 2013-06-14 00:47+0000\n"
+"POT-Creation-Date: 2013-07-05 02:12+0200\n"
+"PO-Revision-Date: 2013-07-05 00:13+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"
@@ -55,9 +55,21 @@ msgstr ""
 
 #: files/error.php:7
 msgid ""
-"Your private key is not valid! Maybe your password was changed from outside."
-" You can update your private key password in your personal settings to "
-"regain access to your files"
+"Your private key is not valid! Likely your password was changed outside the "
+"ownCloud system (e.g. your corporate directory). You can update your private"
+" key password in your personal settings to recover access to your encrypted "
+"files."
+msgstr ""
+
+#: hooks/hooks.php:44
+msgid "Missing requirements."
+msgstr ""
+
+#: hooks/hooks.php:45
+msgid ""
+"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL "
+"PHP extension is enabled and configured properly. For now, the encryption "
+"app has been disabled."
 msgstr ""
 
 #: js/settings-admin.js:11
@@ -84,11 +96,11 @@ msgstr ""
 
 #: templates/settings-admin.php:10
 msgid ""
-"Enable encryption passwords recovery key (allow sharing to recovery key):"
+"Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
 #: templates/settings-admin.php:14
-msgid "Recovery account password"
+msgid "Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:21 templates/settings-personal.php:54
@@ -100,15 +112,15 @@ msgid "Disabled"
 msgstr ""
 
 #: templates/settings-admin.php:34
-msgid "Change encryption passwords recovery key:"
+msgid "Change recovery key password:"
 msgstr ""
 
 #: templates/settings-admin.php:41
-msgid "Old Recovery account password"
+msgid "Old Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:48
-msgid "New Recovery account password"
+msgid "New Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:53
diff --git a/l10n/sq/files_external.po b/l10n/sq/files_external.po
index a07082b4588b8a79d1f21a43d42f50916a2e6558..ae0eacc5ac46451785ac4e491ae5f475131998a0 100644
--- a/l10n/sq/files_external.po
+++ b/l10n/sq/files_external.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/sq/files_sharing.po b/l10n/sq/files_sharing.po
index 4cbb12e8136b7058292c2388ca264ead861c84f0..5b702ae4af0585f05a1db36891cb015e8134da69 100644
--- a/l10n/sq/files_sharing.po
+++ b/l10n/sq/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
 "MIME-Version: 1.0\n"
@@ -18,27 +18,39 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: templates/authenticate.php:4
+msgid "The password is wrong. Try again."
+msgstr ""
+
+#: templates/authenticate.php:7
 msgid "Password"
 msgstr "Kodi"
 
-#: templates/authenticate.php:6
+#: templates/authenticate.php:9
 msgid "Submit"
 msgstr "Parashtro"
 
-#: templates/public.php:10
+#: templates/public.php:17
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s ndau me ju dosjen %s"
 
-#: templates/public.php:13
+#: templates/public.php:20
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s ndau me ju skedarin %s"
 
-#: templates/public.php:19 templates/public.php:43
+#: templates/public.php:28 templates/public.php:90
 msgid "Download"
 msgstr "Shkarko"
 
-#: templates/public.php:40
+#: templates/public.php:45 templates/public.php:48
+msgid "Upload"
+msgstr "Ngarko"
+
+#: templates/public.php:58
+msgid "Cancel upload"
+msgstr "Anulo ngarkimin"
+
+#: templates/public.php:87
 msgid "No preview available for"
 msgstr "Shikimi paraprak nuk është i mundur për"
diff --git a/l10n/sq/files_trashbin.po b/l10n/sq/files_trashbin.po
index 2a95b6477c05bfdde0d5f214f3103be4e92b9782..a40119d1a6c08b4505e785f9978131cf29b38bec 100644
--- a/l10n/sq/files_trashbin.po
+++ b/l10n/sq/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/sq/lib.po b/l10n/sq/lib.po
index 023030d00100c5f30f31a778652c96156042da6b..4ee6ea7f5c8a998b0564ceeed65fd7d933b195b4 100644
--- a/l10n/sq/lib.po
+++ b/l10n/sq/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
 "MIME-Version: 1.0\n"
@@ -17,43 +17,47 @@ msgstr ""
 "Language: sq\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:359
+#: app.php:360
 msgid "Help"
 msgstr "Ndihmë"
 
-#: app.php:372
+#: app.php:373
 msgid "Personal"
 msgstr "Personale"
 
-#: app.php:383
+#: app.php:384
 msgid "Settings"
 msgstr "Parametra"
 
-#: app.php:395
+#: app.php:396
 msgid "Users"
 msgstr "Përdoruesit"
 
-#: app.php:408
+#: app.php:409
 msgid "Apps"
 msgstr "App"
 
-#: app.php:416
+#: app.php:417
 msgid "Admin"
 msgstr "Admin"
 
-#: files.php:210
+#: defaults.php:33
+msgid "web services under your control"
+msgstr "shërbime web nën kontrollin tënd"
+
+#: files.php:226
 msgid "ZIP download is turned off."
 msgstr "Shkarimi i skedarëve ZIP është i çaktivizuar."
 
-#: files.php:211
+#: files.php:227
 msgid "Files need to be downloaded one by one."
 msgstr "Skedarët duhet të shkarkohen një nga një."
 
-#: files.php:212 files.php:245
+#: files.php:228 files.php:261
 msgid "Back to Files"
 msgstr "Kthehu tek skedarët"
 
-#: files.php:242
+#: files.php:258
 msgid "Selected files too large to generate zip file."
 msgstr "Skedarët e selektuar janë shumë të mëdhenj për të krijuar një skedar ZIP."
 
@@ -85,104 +89,102 @@ msgstr "Tekst"
 msgid "Images"
 msgstr "Foto"
 
-#: setup.php:34
-msgid "Set an admin username."
-msgstr "Cakto emrin e administratorit."
-
-#: setup.php:37
-msgid "Set an admin password."
-msgstr "Cakto kodin e administratorit."
-
-#: setup.php:55
+#: setup/abstractdatabase.php:22
 #, php-format
 msgid "%s enter the database username."
 msgstr "% shkruani përdoruesin e database-it."
 
-#: setup.php:58
+#: setup/abstractdatabase.php:25
 #, php-format
 msgid "%s enter the database name."
 msgstr "%s shkruani emrin e database-it."
 
-#: setup.php:61
+#: setup/abstractdatabase.php:28
 #, php-format
 msgid "%s you may not use dots in the database name"
 msgstr "%s nuk mund të përdorni pikat tek emri i database-it"
 
-#: setup.php:64
+#: setup/mssql.php:20
 #, php-format
-msgid "%s set the database host."
-msgstr "%s caktoni pozicionin (host) e database-it."
-
-#: setup.php:126 setup.php:332 setup.php:377
-msgid "PostgreSQL username and/or password not valid"
-msgstr "Përdoruesi dhe/apo kodi i PostgreSQL i pavlefshëm"
+msgid "MS SQL username and/or password not valid: %s"
+msgstr "Përdoruesi dhe/apo kodi i MS SQL i pavlefshëm: %s"
 
-#: setup.php:127 setup.php:235
+#: setup/mssql.php:21 setup/mysql.php:13 setup/oci.php:114
+#: setup/postgresql.php:24 setup/postgresql.php:70
 msgid "You need to enter either an existing account or the administrator."
 msgstr "Duhet të përdorni një llogari ekzistuese ose llogarinë e administratorit."
 
-#: setup.php:152
-msgid "Oracle connection could not be established"
-msgstr ""
-
-#: setup.php:234
+#: setup/mysql.php:12
 msgid "MySQL username and/or password not valid"
 msgstr "Përdoruesi dhe/apo kodi i MySQL-it i pavlefshëm."
 
-#: setup.php:288 setup.php:398 setup.php:407 setup.php:425 setup.php:435
-#: setup.php:444 setup.php:477 setup.php:543 setup.php:569 setup.php:576
-#: setup.php:587 setup.php:594 setup.php:603 setup.php:611 setup.php:620
-#: setup.php:626
+#: setup/mysql.php:67 setup/oci.php:54 setup/oci.php:121 setup/oci.php:147
+#: setup/oci.php:154 setup/oci.php:165 setup/oci.php:172 setup/oci.php:181
+#: setup/oci.php:189 setup/oci.php:198 setup/oci.php:204
+#: setup/postgresql.php:89 setup/postgresql.php:98 setup/postgresql.php:115
+#: setup/postgresql.php:125 setup/postgresql.php:134
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr "Veprim i gabuar i DB-it: \"%s\""
 
-#: setup.php:289 setup.php:399 setup.php:408 setup.php:426 setup.php:436
-#: setup.php:445 setup.php:478 setup.php:544 setup.php:570 setup.php:577
-#: setup.php:588 setup.php:604 setup.php:612 setup.php:621
+#: setup/mysql.php:68 setup/oci.php:55 setup/oci.php:122 setup/oci.php:148
+#: setup/oci.php:155 setup/oci.php:166 setup/oci.php:182 setup/oci.php:190
+#: setup/oci.php:199 setup/postgresql.php:90 setup/postgresql.php:99
+#: setup/postgresql.php:116 setup/postgresql.php:126 setup/postgresql.php:135
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr "Komanda e gabuar ishte: \"%s\""
 
-#: setup.php:305
+#: setup/mysql.php:85
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr "Përdoruesi MySQL '%s'@'localhost' ekziston."
 
-#: setup.php:306
+#: setup/mysql.php:86
 msgid "Drop this user from MySQL"
 msgstr "Eliminoni këtë përdorues nga MySQL"
 
-#: setup.php:311
+#: setup/mysql.php:91
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr "Përdoruesi MySQL '%s'@'%%' ekziston"
 
-#: setup.php:312
+#: setup/mysql.php:92
 msgid "Drop this user from MySQL."
 msgstr "Eliminoni këtë përdorues nga MySQL."
 
-#: setup.php:469 setup.php:536
+#: setup/oci.php:34
+msgid "Oracle connection could not be established"
+msgstr ""
+
+#: setup/oci.php:41 setup/oci.php:113
 msgid "Oracle username and/or password not valid"
 msgstr "Përdoruesi dhe/apo kodi i Oracle-it i pavlefshëm"
 
-#: setup.php:595 setup.php:627
+#: setup/oci.php:173 setup/oci.php:205
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr "Komanda e gabuar ishte: \"%s\", përdoruesi: %s, kodi: %s"
 
-#: setup.php:647
-#, php-format
-msgid "MS SQL username and/or password not valid: %s"
-msgstr "Përdoruesi dhe/apo kodi i MS SQL i pavlefshëm: %s"
+#: setup/postgresql.php:23 setup/postgresql.php:69
+msgid "PostgreSQL username and/or password not valid"
+msgstr "Përdoruesi dhe/apo kodi i PostgreSQL i pavlefshëm"
+
+#: setup.php:42
+msgid "Set an admin username."
+msgstr "Cakto emrin e administratorit."
+
+#: setup.php:45
+msgid "Set an admin password."
+msgstr "Cakto kodin e administratorit."
 
-#: setup.php:870
+#: setup.php:198
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Serveri web i juaji nuk është konfiguruar akoma për të lejuar sinkronizimin e skedarëve sepse ndërfaqja WebDAV mund të jetë e dëmtuar."
 
-#: setup.php:871
+#: setup.php:199
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Ju lutemi kontrolloni mirë <a href='%s'>shoqëruesin e instalimit</a>."
diff --git a/l10n/sq/settings.po b/l10n/sq/settings.po
index 89fec145fa3c320cb44a86898f3984e2cd9c44a0..e73539c723a2b5ee9aef737a6c4abe92e0d8ea57 100644
--- a/l10n/sq/settings.po
+++ b/l10n/sq/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
 "MIME-Version: 1.0\n"
@@ -88,35 +88,35 @@ msgstr ""
 msgid "Couldn't update app."
 msgstr ""
 
-#: js/apps.js:30
+#: js/apps.js:35
 msgid "Update to {appversion}"
 msgstr ""
 
-#: js/apps.js:36 js/apps.js:76
+#: js/apps.js:41 js/apps.js:81
 msgid "Disable"
 msgstr ""
 
-#: js/apps.js:36 js/apps.js:64 js/apps.js:83
+#: js/apps.js:41 js/apps.js:69 js/apps.js:88
 msgid "Enable"
 msgstr ""
 
-#: js/apps.js:55
+#: js/apps.js:60
 msgid "Please wait...."
 msgstr ""
 
-#: js/apps.js:59 js/apps.js:71 js/apps.js:80 js/apps.js:93
+#: js/apps.js:64 js/apps.js:76 js/apps.js:85 js/apps.js:98
 msgid "Error"
 msgstr "Veprim i gabuar"
 
-#: js/apps.js:90
+#: js/apps.js:95
 msgid "Updating...."
 msgstr ""
 
-#: js/apps.js:93
+#: js/apps.js:98
 msgid "Error while updating app"
 msgstr ""
 
-#: js/apps.js:96
+#: js/apps.js:101
 msgid "Updated"
 msgstr ""
 
@@ -165,15 +165,15 @@ msgstr ""
 msgid "A valid password must be provided"
 msgstr ""
 
-#: personal.php:35 personal.php:36
+#: personal.php:37 personal.php:38
 msgid "__language_name__"
 msgstr ""
 
-#: templates/admin.php:15
+#: templates/admin.php:17
 msgid "Security Warning"
 msgstr "Paralajmërim sigurie"
 
-#: templates/admin.php:18
+#: templates/admin.php:20
 msgid ""
 "Your data directory and your files are probably accessible from the "
 "internet. The .htaccess file that ownCloud provides is not working. We "
@@ -182,36 +182,36 @@ msgid ""
 " webserver document root."
 msgstr ""
 
-#: templates/admin.php:29
+#: templates/admin.php:31
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:32
+#: templates/admin.php:34
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Serveri web i juaji nuk është konfiguruar akoma për të lejuar sinkronizimin e skedarëve sepse ndërfaqja WebDAV mund të jetë e dëmtuar."
 
-#: templates/admin.php:33
+#: templates/admin.php:35
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Ju lutemi kontrolloni mirë <a href='%s'>shoqëruesin e instalimit</a>."
 
-#: templates/admin.php:44
+#: templates/admin.php:46
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:47
+#: templates/admin.php:49
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr ""
 
-#: templates/admin.php:58
+#: templates/admin.php:60
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:63
+#: templates/admin.php:65
 #, php-format
 msgid ""
 "This ownCloud server can't set system locale to %s. This means that there "
@@ -219,11 +219,11 @@ msgid ""
 " to install the required packages on your system to support %s."
 msgstr ""
 
-#: templates/admin.php:75
+#: templates/admin.php:77
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:78
+#: templates/admin.php:80
 msgid ""
 "This ownCloud server has no working internet connection. This means that "
 "some of the features like mounting of external storage, notifications about "
@@ -233,102 +233,102 @@ msgid ""
 " of ownCloud."
 msgstr ""
 
-#: templates/admin.php:92
+#: templates/admin.php:94
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:101
+#: templates/admin.php:103
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:111
+#: templates/admin.php:113
 msgid ""
 "cron.php is registered at a webcron service. Call the cron.php page in the "
 "owncloud root once a minute over http."
 msgstr ""
 
-#: templates/admin.php:121
+#: templates/admin.php:123
 msgid ""
 "Use systems cron service. Call the cron.php file in the owncloud folder via "
 "a system cronjob once a minute."
 msgstr ""
 
-#: templates/admin.php:128
+#: templates/admin.php:130
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:134
+#: templates/admin.php:136
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:135
+#: templates/admin.php:137
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:142
+#: templates/admin.php:144
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:143
+#: templates/admin.php:145
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:150
+#: templates/admin.php:152
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:151
+#: templates/admin.php:153
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:158
+#: templates/admin.php:160
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:161
+#: templates/admin.php:163
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:168
+#: templates/admin.php:170
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:181
+#: templates/admin.php:183
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:182
+#: templates/admin.php:184
 msgid ""
 "Enforces the clients to connect to ownCloud via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:185
+#: templates/admin.php:187
 msgid ""
 "Please connect to this ownCloud instance via HTTPS to enable or disable the "
 "SSL enforcement."
 msgstr ""
 
-#: templates/admin.php:195
+#: templates/admin.php:197
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:196
+#: templates/admin.php:198
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:227
+#: templates/admin.php:229
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:228
+#: templates/admin.php:230
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:235 templates/personal.php:116
+#: templates/admin.php:236 templates/personal.php:116
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:237 templates/personal.php:119
+#: templates/admin.php:240 templates/personal.php:119
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -386,76 +386,79 @@ msgstr ""
 msgid "Commercial Support"
 msgstr ""
 
-#: templates/personal.php:9
+#: templates/personal.php:10
 msgid "Get the apps to sync your files"
 msgstr "Merrni app-et për sinkronizimin e skedarëve tuaj"
 
-#: templates/personal.php:20
+#: templates/personal.php:21
 msgid "Show First Run Wizard again"
 msgstr ""
 
-#: templates/personal.php:28
+#: templates/personal.php:29
 #, php-format
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr ""
 
-#: templates/personal.php:40 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:41 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "Kodi"
 
-#: templates/personal.php:41
+#: templates/personal.php:42
 msgid "Your password was changed"
 msgstr ""
 
-#: templates/personal.php:42
+#: templates/personal.php:43
 msgid "Unable to change your password"
 msgstr ""
 
-#: templates/personal.php:43
+#: templates/personal.php:44
 msgid "Current password"
 msgstr ""
 
-#: templates/personal.php:45
+#: templates/personal.php:46
 msgid "New password"
 msgstr "Kodi i ri"
 
-#: templates/personal.php:47
+#: templates/personal.php:48
 msgid "Change password"
 msgstr ""
 
-#: templates/personal.php:59 templates/users.php:85
+#: templates/personal.php:60 templates/users.php:85
 msgid "Display Name"
 msgstr ""
 
-#: templates/personal.php:74
+#: templates/personal.php:75
 msgid "Email"
 msgstr "Email-i"
 
-#: templates/personal.php:76
+#: templates/personal.php:77
 msgid "Your email address"
 msgstr ""
 
-#: templates/personal.php:77
+#: templates/personal.php:78
 msgid "Fill in an email address to enable password recovery"
 msgstr ""
 
-#: templates/personal.php:86 templates/personal.php:87
+#: templates/personal.php:87 templates/personal.php:88
 msgid "Language"
 msgstr ""
 
-#: templates/personal.php:99
+#: templates/personal.php:100
 msgid "Help translate"
 msgstr ""
 
-#: templates/personal.php:105
+#: templates/personal.php:106
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:107
-msgid "Use this address to connect to your ownCloud in your file manager"
+#: templates/personal.php:108
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
+"target=\"_blank\">access your Files via WebDAV</a>"
 msgstr ""
 
-#: templates/users.php:21 templates/users.php:84
+#: templates/users.php:21
 msgid "Login Name"
 msgstr ""
 
@@ -485,6 +488,10 @@ msgstr ""
 msgid "Other"
 msgstr ""
 
+#: templates/users.php:84
+msgid "Username"
+msgstr "Përdoruesi"
+
 #: templates/users.php:91
 msgid "Storage"
 msgstr ""
diff --git a/l10n/sq/user_ldap.po b/l10n/sq/user_ldap.po
index d3c5f488249a0930a0807f8871535a9c99960dac..e33ebbb7667d0bc4e0b2abe1aeb54ada67003d7d 100644
--- a/l10n/sq/user_ldap.po
+++ b/l10n/sq/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:16+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/sr/core.po b/l10n/sr/core.po
index 1ba8aa1cb718ebb2b14c4843f04a4c1eee57bbcc..2a2ebfd70c266d6985b7ec25e95592f0554df09d 100644
--- a/l10n/sr/core.po
+++ b/l10n/sr/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:22+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:14+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
 "MIME-Version: 1.0\n"
@@ -61,135 +61,135 @@ msgstr "Ни једна категорија није означена за бр
 msgid "Error removing %s from favorites."
 msgstr "Грешка приликом уклањања %s из омиљених"
 
-#: js/config.php:34
+#: js/config.php:32
 msgid "Sunday"
 msgstr "Недеља"
 
-#: js/config.php:35
+#: js/config.php:33
 msgid "Monday"
 msgstr "Понедељак"
 
-#: js/config.php:36
+#: js/config.php:34
 msgid "Tuesday"
 msgstr "Уторак"
 
-#: js/config.php:37
+#: js/config.php:35
 msgid "Wednesday"
 msgstr "Среда"
 
-#: js/config.php:38
+#: js/config.php:36
 msgid "Thursday"
 msgstr "Четвртак"
 
-#: js/config.php:39
+#: js/config.php:37
 msgid "Friday"
 msgstr "Петак"
 
-#: js/config.php:40
+#: js/config.php:38
 msgid "Saturday"
 msgstr "Субота"
 
-#: js/config.php:45
+#: js/config.php:43
 msgid "January"
 msgstr "Јануар"
 
-#: js/config.php:46
+#: js/config.php:44
 msgid "February"
 msgstr "Фебруар"
 
-#: js/config.php:47
+#: js/config.php:45
 msgid "March"
 msgstr "Март"
 
-#: js/config.php:48
+#: js/config.php:46
 msgid "April"
 msgstr "Април"
 
-#: js/config.php:49
+#: js/config.php:47
 msgid "May"
 msgstr "Мај"
 
-#: js/config.php:50
+#: js/config.php:48
 msgid "June"
 msgstr "Јун"
 
-#: js/config.php:51
+#: js/config.php:49
 msgid "July"
 msgstr "Јул"
 
-#: js/config.php:52
+#: js/config.php:50
 msgid "August"
 msgstr "Август"
 
-#: js/config.php:53
+#: js/config.php:51
 msgid "September"
 msgstr "Септембар"
 
-#: js/config.php:54
+#: js/config.php:52
 msgid "October"
 msgstr "Октобар"
 
-#: js/config.php:55
+#: js/config.php:53
 msgid "November"
 msgstr "Новембар"
 
-#: js/config.php:56
+#: js/config.php:54
 msgid "December"
 msgstr "Децембар"
 
-#: js/js.js:286
+#: js/js.js:293
 msgid "Settings"
 msgstr "Поставке"
 
-#: js/js.js:718
+#: js/js.js:725
 msgid "seconds ago"
 msgstr "пре неколико секунди"
 
-#: js/js.js:719
+#: js/js.js:726
 msgid "1 minute ago"
 msgstr "пре 1 минут"
 
-#: js/js.js:720
+#: js/js.js:727
 msgid "{minutes} minutes ago"
 msgstr "пре {minutes} минута"
 
-#: js/js.js:721
+#: js/js.js:728
 msgid "1 hour ago"
 msgstr "Пре једног сата"
 
-#: js/js.js:722
+#: js/js.js:729
 msgid "{hours} hours ago"
 msgstr "Пре {hours} сата (сати)"
 
-#: js/js.js:723
+#: js/js.js:730
 msgid "today"
 msgstr "данас"
 
-#: js/js.js:724
+#: js/js.js:731
 msgid "yesterday"
 msgstr "јуче"
 
-#: js/js.js:725
+#: js/js.js:732
 msgid "{days} days ago"
 msgstr "пре {days} дана"
 
-#: js/js.js:726
+#: js/js.js:733
 msgid "last month"
 msgstr "прошлог месеца"
 
-#: js/js.js:727
+#: js/js.js:734
 msgid "{months} months ago"
 msgstr "Пре {months} месеца (месеци)"
 
-#: js/js.js:728
+#: js/js.js:735
 msgid "months ago"
 msgstr "месеци раније"
 
-#: js/js.js:729
+#: js/js.js:736
 msgid "last year"
 msgstr "прошле године"
 
-#: js/js.js:730
+#: js/js.js:737
 msgid "years ago"
 msgstr "година раније"
 
@@ -225,8 +225,8 @@ msgstr "Врста објекта није подешена."
 #: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
 #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:577
-#: js/share.js:589
+#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:620
+#: js/share.js:632
 msgid "Error"
 msgstr "Грешка"
 
@@ -246,7 +246,7 @@ msgstr ""
 msgid "Share"
 msgstr "Дели"
 
-#: js/share.js:125 js/share.js:617
+#: js/share.js:125 js/share.js:660
 msgid "Error while sharing"
 msgstr "Грешка у дељењу"
 
@@ -266,99 +266,103 @@ msgstr "Дељено са вама и са групом {group}. Поделио
 msgid "Shared with you by {owner}"
 msgstr "Поделио са вама {owner}"
 
-#: js/share.js:159
+#: js/share.js:172
 msgid "Share with"
 msgstr "Подели са"
 
-#: js/share.js:164
+#: js/share.js:177
 msgid "Share with link"
 msgstr "Подели линк"
 
-#: js/share.js:167
+#: js/share.js:180
 msgid "Password protect"
 msgstr "Заштићено лозинком"
 
-#: js/share.js:169 templates/installation.php:54 templates/login.php:26
+#: js/share.js:182 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "Лозинка"
 
-#: js/share.js:173
+#: js/share.js:187
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:191
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:174
+#: js/share.js:192
 msgid "Send"
 msgstr "Пошаљи"
 
-#: js/share.js:178
+#: js/share.js:197
 msgid "Set expiration date"
 msgstr "Постави датум истека"
 
-#: js/share.js:179
+#: js/share.js:198
 msgid "Expiration date"
 msgstr "Датум истека"
 
-#: js/share.js:211
+#: js/share.js:230
 msgid "Share via email:"
 msgstr "Подели поштом:"
 
-#: js/share.js:213
+#: js/share.js:232
 msgid "No people found"
 msgstr "Особе нису пронађене."
 
-#: js/share.js:251
+#: js/share.js:270
 msgid "Resharing is not allowed"
 msgstr "Поновно дељење није дозвољено"
 
-#: js/share.js:287
+#: js/share.js:306
 msgid "Shared in {item} with {user}"
 msgstr "Подељено унутар {item} са {user}"
 
-#: js/share.js:308
+#: js/share.js:327
 msgid "Unshare"
 msgstr "Укини дељење"
 
-#: js/share.js:320
+#: js/share.js:339
 msgid "can edit"
 msgstr "може да мења"
 
-#: js/share.js:322
+#: js/share.js:341
 msgid "access control"
 msgstr "права приступа"
 
-#: js/share.js:325
+#: js/share.js:344
 msgid "create"
 msgstr "направи"
 
-#: js/share.js:328
+#: js/share.js:347
 msgid "update"
 msgstr "ажурирај"
 
-#: js/share.js:331
+#: js/share.js:350
 msgid "delete"
 msgstr "обриши"
 
-#: js/share.js:334
+#: js/share.js:353
 msgid "share"
 msgstr "подели"
 
-#: js/share.js:368 js/share.js:564
+#: js/share.js:387 js/share.js:607
 msgid "Password protected"
 msgstr "Заштићено лозинком"
 
-#: js/share.js:577
+#: js/share.js:620
 msgid "Error unsetting expiration date"
 msgstr "Грешка код поништавања датума истека"
 
-#: js/share.js:589
+#: js/share.js:632
 msgid "Error setting expiration date"
 msgstr "Грешка код постављања датума истека"
 
-#: js/share.js:604
+#: js/share.js:647
 msgid "Sending ..."
 msgstr "Шаљем..."
 
-#: js/share.js:615
+#: js/share.js:658
 msgid "Email sent"
 msgstr "Порука је послата"
 
@@ -373,7 +377,7 @@ msgstr ""
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
-#: lostpassword/controller.php:58
+#: lostpassword/controller.php:60
 msgid "ownCloud password reset"
 msgstr "Поништавање лозинке за ownCloud"
 
@@ -403,17 +407,17 @@ msgstr "Корисничко име"
 
 #: lostpassword/templates/lostpassword.php:22
 msgid ""
-"Your files seems to be encrypted. If you didn't have enabled the recovery "
-"key there will be no way to get your data back once the password was "
-"resetted. If you are not sure what to do, please contact your administrator "
-"first before continue. Do you really want to continue?"
+"Your files are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
 msgstr ""
 
 #: lostpassword/templates/lostpassword.php:24
 msgid "Yes, I really want to reset my password now"
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:29
+#: lostpassword/templates/lostpassword.php:27
 msgid "Request reset"
 msgstr "Захтевај ресетовање"
 
@@ -461,7 +465,7 @@ msgstr "Забрањен приступ"
 msgid "Cloud not found"
 msgstr "Облак није нађен"
 
-#: templates/altmail.php:2
+#: templates/altmail.php:4
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -472,10 +476,6 @@ msgid ""
 "Cheers!"
 msgstr ""
 
-#: templates/altmail.php:7 templates/mail.php:24
-msgid "web services under your control"
-msgstr "веб сервиси под контролом"
-
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
 msgstr "Измени категорије"
@@ -568,12 +568,12 @@ msgstr "Домаћин базе"
 msgid "Finish setup"
 msgstr "Заврши подешавање"
 
-#: templates/layout.user.php:40
+#: templates/layout.user.php:43
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:67
+#: templates/layout.user.php:68
 msgid "Log out"
 msgstr "Одјава"
 
@@ -607,7 +607,7 @@ msgstr "Пријава"
 msgid "Alternative Logins"
 msgstr ""
 
-#: templates/mail.php:15
+#: templates/mail.php:16
 #, php-format
 msgid ""
 "Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
diff --git a/l10n/sr/files.po b/l10n/sr/files.po
index ad4483860e1d79dd25fb532dde617cd9ad06f724..077bf9f580610cfdb91d96560dac67a67a4dee5e 100644
--- a/l10n/sr/files.po
+++ b/l10n/sr/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:01+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
 "MIME-Version: 1.0\n"
@@ -27,46 +27,54 @@ msgstr "Не могу да преместим %s – датотека с ови
 msgid "Could not move %s"
 msgstr "Не могу да преместим %s"
 
-#: ajax/upload.php:19
+#: ajax/upload.php:16 ajax/upload.php:45
+msgid "Unable to set upload directory."
+msgstr ""
+
+#: ajax/upload.php:22
+msgid "Invalid Token"
+msgstr ""
+
+#: ajax/upload.php:59
 msgid "No file was uploaded. Unknown error"
 msgstr "Ниједна датотека није отпремљена услед непознате грешке"
 
-#: ajax/upload.php:26
+#: ajax/upload.php:66
 msgid "There is no error, the file uploaded with success"
 msgstr "Није дошло до грешке. Датотека је успешно отпремљена."
 
-#: ajax/upload.php:27
+#: ajax/upload.php:67
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr "Отпремљена датотека прелази смерницу upload_max_filesize у датотеци php.ini:"
 
-#: ajax/upload.php:29
+#: ajax/upload.php:69
 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:30
+#: ajax/upload.php:70
 msgid "The uploaded file was only partially uploaded"
 msgstr "Датотека је делимично отпремљена"
 
-#: ajax/upload.php:31
+#: ajax/upload.php:71
 msgid "No file was uploaded"
 msgstr "Датотека није отпремљена"
 
-#: ajax/upload.php:32
+#: ajax/upload.php:72
 msgid "Missing a temporary folder"
 msgstr "Недостаје привремена фасцикла"
 
-#: ajax/upload.php:33
+#: ajax/upload.php:73
 msgid "Failed to write to disk"
 msgstr "Не могу да пишем на диск"
 
-#: ajax/upload.php:51
+#: ajax/upload.php:91
 msgid "Not enough storage available"
 msgstr "Нема довољно простора"
 
-#: ajax/upload.php:83
+#: ajax/upload.php:123
 msgid "Invalid directory."
 msgstr "неисправна фасцикла."
 
@@ -74,6 +82,36 @@ msgstr "неисправна фасцикла."
 msgid "Files"
 msgstr "Датотеке"
 
+#: js/file-upload.js:11
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr "Не могу да отпремим датотеку као фасциклу или она има 0 бајтова"
+
+#: js/file-upload.js:24
+msgid "Not enough space available"
+msgstr "Нема довољно простора"
+
+#: js/file-upload.js:64
+msgid "Upload cancelled."
+msgstr "Отпремање је прекинуто."
+
+#: js/file-upload.js:167 js/files.js:266
+msgid ""
+"File upload is in progress. Leaving the page now will cancel the upload."
+msgstr "Отпремање датотеке је у току. Ако сада напустите страницу, прекинућете отпремање."
+
+#: js/file-upload.js:233 js/files.js:339
+msgid "URL cannot be empty."
+msgstr "Адреса не може бити празна."
+
+#: js/file-upload.js:238 lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr ""
+
+#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
+#: js/files.js:693 js/files.js:731
+msgid "Error"
+msgstr "Грешка"
+
 #: js/fileactions.js:116
 msgid "Share"
 msgstr "Дели"
@@ -90,43 +128,43 @@ msgstr "Обриши"
 msgid "Rename"
 msgstr "Преименуј"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:464
 msgid "Pending"
 msgstr "На чекању"
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "{new_name} already exists"
 msgstr "{new_name} већ постоји"
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "replace"
 msgstr "замени"
 
-#: js/filelist.js:259
+#: js/filelist.js:302
 msgid "suggest name"
 msgstr "предложи назив"
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "cancel"
 msgstr "откажи"
 
-#: js/filelist.js:306
+#: js/filelist.js:349
 msgid "replaced {new_name} with {old_name}"
 msgstr "замењено {new_name} са {old_name}"
 
-#: js/filelist.js:306
+#: js/filelist.js:349
 msgid "undo"
 msgstr "опозови"
 
-#: js/filelist.js:331
+#: js/filelist.js:374
 msgid "perform delete operation"
 msgstr "обриши"
 
-#: js/filelist.js:413
+#: js/filelist.js:456
 msgid "1 file uploading"
 msgstr "Отпремам 1 датотеку"
 
-#: js/filelist.js:416 js/filelist.js:470
+#: js/filelist.js:459 js/filelist.js:517
 msgid "files uploading"
 msgstr "датотеке се отпремају"
 
@@ -158,70 +196,42 @@ msgid ""
 "big."
 msgstr "Припремам преузимање. Ово може да потраје ако су датотеке велике."
 
-#: js/files.js:264
-msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "Не могу да отпремим датотеку као фасциклу или она има 0 бајтова"
-
-#: js/files.js:277
-msgid "Not enough space available"
-msgstr "Нема довољно простора"
-
-#: js/files.js:317
-msgid "Upload cancelled."
-msgstr "Отпремање је прекинуто."
-
-#: js/files.js:413
-msgid ""
-"File upload is in progress. Leaving the page now will cancel the upload."
-msgstr "Отпремање датотеке је у току. Ако сада напустите страницу, прекинућете отпремање."
-
-#: js/files.js:486
-msgid "URL cannot be empty."
-msgstr "Адреса не може бити празна."
-
-#: js/files.js:491
+#: js/files.js:344
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Неисправно име фасцикле. Фасцикла „Shared“ је резервисана за ownCloud."
 
-#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
-msgid "Error"
-msgstr "Грешка"
-
-#: js/files.js:877 templates/index.php:69
+#: js/files.js:744 templates/index.php:69
 msgid "Name"
 msgstr "Име"
 
-#: js/files.js:878 templates/index.php:80
+#: js/files.js:745 templates/index.php:80
 msgid "Size"
 msgstr "Величина"
 
-#: js/files.js:879 templates/index.php:82
+#: js/files.js:746 templates/index.php:82
 msgid "Modified"
 msgstr "Измењено"
 
-#: js/files.js:898
+#: js/files.js:765
 msgid "1 folder"
 msgstr "1 фасцикла"
 
-#: js/files.js:900
+#: js/files.js:767
 msgid "{count} folders"
 msgstr "{count} фасцикле/и"
 
-#: js/files.js:908
+#: js/files.js:775
 msgid "1 file"
 msgstr "1 датотека"
 
-#: js/files.js:910
+#: js/files.js:777
 msgid "{count} files"
 msgstr "{count} датотеке/а"
 
-#: lib/app.php:53
-msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
-msgstr ""
-
 #: lib/app.php:73
-msgid "Unable to rename file"
-msgstr "Не могу да преименујем датотеку"
+#, php-format
+msgid "%s could not be renamed"
+msgstr ""
 
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
@@ -317,6 +327,22 @@ msgstr "Скенирам датотеке…"
 msgid "Current scanning"
 msgstr "Тренутно скенирање"
 
+#: templates/part.list.php:76
+msgid "directory"
+msgstr ""
+
+#: templates/part.list.php:78
+msgid "directories"
+msgstr ""
+
+#: templates/part.list.php:87
+msgid "file"
+msgstr ""
+
+#: templates/part.list.php:89
+msgid "files"
+msgstr ""
+
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
 msgstr "Дограђујем кеш система датотека…"
diff --git a/l10n/sr/files_encryption.po b/l10n/sr/files_encryption.po
index d0b0e9f6405de6b1971eabba497bda66778da66e..081f03f53f64a17d98ed3af9873dc7c24474faa5 100644
--- a/l10n/sr/files_encryption.po
+++ b/l10n/sr/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-14 02:46+0200\n"
-"PO-Revision-Date: 2013-06-14 00:47+0000\n"
+"POT-Creation-Date: 2013-07-05 02:12+0200\n"
+"PO-Revision-Date: 2013-07-05 00:13+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"
@@ -55,9 +55,21 @@ msgstr ""
 
 #: files/error.php:7
 msgid ""
-"Your private key is not valid! Maybe your password was changed from outside."
-" You can update your private key password in your personal settings to "
-"regain access to your files"
+"Your private key is not valid! Likely your password was changed outside the "
+"ownCloud system (e.g. your corporate directory). You can update your private"
+" key password in your personal settings to recover access to your encrypted "
+"files."
+msgstr ""
+
+#: hooks/hooks.php:44
+msgid "Missing requirements."
+msgstr ""
+
+#: hooks/hooks.php:45
+msgid ""
+"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL "
+"PHP extension is enabled and configured properly. For now, the encryption "
+"app has been disabled."
 msgstr ""
 
 #: js/settings-admin.js:11
@@ -84,11 +96,11 @@ msgstr "Шифровање"
 
 #: templates/settings-admin.php:10
 msgid ""
-"Enable encryption passwords recovery key (allow sharing to recovery key):"
+"Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
 #: templates/settings-admin.php:14
-msgid "Recovery account password"
+msgid "Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:21 templates/settings-personal.php:54
@@ -100,15 +112,15 @@ msgid "Disabled"
 msgstr ""
 
 #: templates/settings-admin.php:34
-msgid "Change encryption passwords recovery key:"
+msgid "Change recovery key password:"
 msgstr ""
 
 #: templates/settings-admin.php:41
-msgid "Old Recovery account password"
+msgid "Old Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:48
-msgid "New Recovery account password"
+msgid "New Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:53
diff --git a/l10n/sr/files_external.po b/l10n/sr/files_external.po
index d63ec04d58cb330e5187b9b6a685dcd7440c6ba4..55aca2edb27d27c89d9ad5d1e0984359c07bff26 100644
--- a/l10n/sr/files_external.po
+++ b/l10n/sr/files_external.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/sr/files_sharing.po b/l10n/sr/files_sharing.po
index aa017387134d222cae7b4cde59a19c44ebd40ef0..a34900b3769c8c325791e1e0c14c2b88b9b0825f 100644
--- a/l10n/sr/files_sharing.po
+++ b/l10n/sr/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
 "MIME-Version: 1.0\n"
@@ -18,27 +18,39 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: templates/authenticate.php:4
+msgid "The password is wrong. Try again."
+msgstr ""
+
+#: templates/authenticate.php:7
 msgid "Password"
 msgstr "Лозинка"
 
-#: templates/authenticate.php:6
+#: templates/authenticate.php:9
 msgid "Submit"
 msgstr "Пошаљи"
 
-#: templates/public.php:10
+#: templates/public.php:17
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr ""
 
-#: templates/public.php:13
+#: templates/public.php:20
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr ""
 
-#: templates/public.php:19 templates/public.php:43
+#: templates/public.php:28 templates/public.php:90
 msgid "Download"
 msgstr "Преузми"
 
-#: templates/public.php:40
+#: templates/public.php:45 templates/public.php:48
+msgid "Upload"
+msgstr "Отпреми"
+
+#: templates/public.php:58
+msgid "Cancel upload"
+msgstr "Прекини отпремање"
+
+#: templates/public.php:87
 msgid "No preview available for"
 msgstr ""
diff --git a/l10n/sr/files_trashbin.po b/l10n/sr/files_trashbin.po
index 0479b2c1c548990b5076d2849a9b35c1651b4f6f..365dbba86fba3e59e12c901d71f9881e134e96f8 100644
--- a/l10n/sr/files_trashbin.po
+++ b/l10n/sr/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:16+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/sr/lib.po b/l10n/sr/lib.po
index 466bf88f49c70a1d0194c215d01d0ec3c3b6749f..ac591afe882a586d49d4ceff2897b0472542dd03 100644
--- a/l10n/sr/lib.po
+++ b/l10n/sr/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
 "MIME-Version: 1.0\n"
@@ -17,43 +17,47 @@ msgstr ""
 "Language: sr\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: app.php:359
+#: app.php:360
 msgid "Help"
 msgstr "Помоћ"
 
-#: app.php:372
+#: app.php:373
 msgid "Personal"
 msgstr "Лично"
 
-#: app.php:383
+#: app.php:384
 msgid "Settings"
 msgstr "Поставке"
 
-#: app.php:395
+#: app.php:396
 msgid "Users"
 msgstr "Корисници"
 
-#: app.php:408
+#: app.php:409
 msgid "Apps"
 msgstr "Апликације"
 
-#: app.php:416
+#: app.php:417
 msgid "Admin"
 msgstr "Администратор"
 
-#: files.php:210
+#: defaults.php:33
+msgid "web services under your control"
+msgstr "веб сервиси под контролом"
+
+#: files.php:226
 msgid "ZIP download is turned off."
 msgstr "Преузимање ZIP-а је искључено."
 
-#: files.php:211
+#: files.php:227
 msgid "Files need to be downloaded one by one."
 msgstr "Датотеке морате преузимати једну по једну."
 
-#: files.php:212 files.php:245
+#: files.php:228 files.php:261
 msgid "Back to Files"
 msgstr "Назад на датотеке"
 
-#: files.php:242
+#: files.php:258
 msgid "Selected files too large to generate zip file."
 msgstr "Изабране датотеке су превелике да бисте направили ZIP датотеку."
 
@@ -85,104 +89,102 @@ msgstr "Текст"
 msgid "Images"
 msgstr "Слике"
 
-#: setup.php:34
-msgid "Set an admin username."
-msgstr ""
-
-#: setup.php:37
-msgid "Set an admin password."
-msgstr ""
-
-#: setup.php:55
+#: setup/abstractdatabase.php:22
 #, php-format
 msgid "%s enter the database username."
 msgstr ""
 
-#: setup.php:58
+#: setup/abstractdatabase.php:25
 #, php-format
 msgid "%s enter the database name."
 msgstr ""
 
-#: setup.php:61
+#: setup/abstractdatabase.php:28
 #, php-format
 msgid "%s you may not use dots in the database name"
 msgstr ""
 
-#: setup.php:64
+#: setup/mssql.php:20
 #, php-format
-msgid "%s set the database host."
-msgstr ""
-
-#: setup.php:126 setup.php:332 setup.php:377
-msgid "PostgreSQL username and/or password not valid"
+msgid "MS SQL username and/or password not valid: %s"
 msgstr ""
 
-#: setup.php:127 setup.php:235
+#: setup/mssql.php:21 setup/mysql.php:13 setup/oci.php:114
+#: setup/postgresql.php:24 setup/postgresql.php:70
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:152
-msgid "Oracle connection could not be established"
-msgstr ""
-
-#: setup.php:234
+#: setup/mysql.php:12
 msgid "MySQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:288 setup.php:398 setup.php:407 setup.php:425 setup.php:435
-#: setup.php:444 setup.php:477 setup.php:543 setup.php:569 setup.php:576
-#: setup.php:587 setup.php:594 setup.php:603 setup.php:611 setup.php:620
-#: setup.php:626
+#: setup/mysql.php:67 setup/oci.php:54 setup/oci.php:121 setup/oci.php:147
+#: setup/oci.php:154 setup/oci.php:165 setup/oci.php:172 setup/oci.php:181
+#: setup/oci.php:189 setup/oci.php:198 setup/oci.php:204
+#: setup/postgresql.php:89 setup/postgresql.php:98 setup/postgresql.php:115
+#: setup/postgresql.php:125 setup/postgresql.php:134
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr ""
 
-#: setup.php:289 setup.php:399 setup.php:408 setup.php:426 setup.php:436
-#: setup.php:445 setup.php:478 setup.php:544 setup.php:570 setup.php:577
-#: setup.php:588 setup.php:604 setup.php:612 setup.php:621
+#: setup/mysql.php:68 setup/oci.php:55 setup/oci.php:122 setup/oci.php:148
+#: setup/oci.php:155 setup/oci.php:166 setup/oci.php:182 setup/oci.php:190
+#: setup/oci.php:199 setup/postgresql.php:90 setup/postgresql.php:99
+#: setup/postgresql.php:116 setup/postgresql.php:126 setup/postgresql.php:135
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:305
+#: setup/mysql.php:85
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:306
+#: setup/mysql.php:86
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:311
+#: setup/mysql.php:91
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:312
+#: setup/mysql.php:92
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:469 setup.php:536
+#: setup/oci.php:34
+msgid "Oracle connection could not be established"
+msgstr ""
+
+#: setup/oci.php:41 setup/oci.php:113
 msgid "Oracle username and/or password not valid"
 msgstr ""
 
-#: setup.php:595 setup.php:627
+#: setup/oci.php:173 setup/oci.php:205
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:647
-#, php-format
-msgid "MS SQL username and/or password not valid: %s"
+#: setup/postgresql.php:23 setup/postgresql.php:69
+msgid "PostgreSQL username and/or password not valid"
+msgstr ""
+
+#: setup.php:42
+msgid "Set an admin username."
+msgstr ""
+
+#: setup.php:45
+msgid "Set an admin password."
 msgstr ""
 
-#: setup.php:870
+#: setup.php:198
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Ваш веб сервер тренутно не подржава синхронизацију датотека јер се чини да је WebDAV сучеље неисправно."
 
-#: setup.php:871
+#: setup.php:199
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Погледајте <a href='%s'>водиче за инсталацију</a>."
diff --git a/l10n/sr/settings.po b/l10n/sr/settings.po
index 5a79894c07061397df50da5612f7692483a34b59..df81f2649611348748a19307d8189d5959a1c8de 100644
--- a/l10n/sr/settings.po
+++ b/l10n/sr/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
 "MIME-Version: 1.0\n"
@@ -88,35 +88,35 @@ msgstr "Не могу да уклоним корисника из групе %s"
 msgid "Couldn't update app."
 msgstr "Не могу да ажурирам апликацију."
 
-#: js/apps.js:30
+#: js/apps.js:35
 msgid "Update to {appversion}"
 msgstr "Ажурирај на {appversion}"
 
-#: js/apps.js:36 js/apps.js:76
+#: js/apps.js:41 js/apps.js:81
 msgid "Disable"
 msgstr "Искључи"
 
-#: js/apps.js:36 js/apps.js:64 js/apps.js:83
+#: js/apps.js:41 js/apps.js:69 js/apps.js:88
 msgid "Enable"
 msgstr "Омогући"
 
-#: js/apps.js:55
+#: js/apps.js:60
 msgid "Please wait...."
 msgstr "Сачекајте…"
 
-#: js/apps.js:59 js/apps.js:71 js/apps.js:80 js/apps.js:93
+#: js/apps.js:64 js/apps.js:76 js/apps.js:85 js/apps.js:98
 msgid "Error"
 msgstr "Грешка"
 
-#: js/apps.js:90
+#: js/apps.js:95
 msgid "Updating...."
 msgstr "Ажурирам…"
 
-#: js/apps.js:93
+#: js/apps.js:98
 msgid "Error while updating app"
 msgstr "Грешка при ажурирању апликације"
 
-#: js/apps.js:96
+#: js/apps.js:101
 msgid "Updated"
 msgstr "Ажурирано"
 
@@ -165,15 +165,15 @@ msgstr "Грешка при прављењу корисника"
 msgid "A valid password must be provided"
 msgstr "Морате унети исправну лозинку"
 
-#: personal.php:35 personal.php:36
+#: personal.php:37 personal.php:38
 msgid "__language_name__"
 msgstr "__language_name__"
 
-#: templates/admin.php:15
+#: templates/admin.php:17
 msgid "Security Warning"
 msgstr "Сигурносно упозорење"
 
-#: templates/admin.php:18
+#: templates/admin.php:20
 msgid ""
 "Your data directory and your files are probably accessible from the "
 "internet. The .htaccess file that ownCloud provides is not working. We "
@@ -182,36 +182,36 @@ msgid ""
 " webserver document root."
 msgstr "Тренутно су ваши подаци и датотеке доступне са интернета. Датотека .htaccess коју је обезбедио пакет ownCloud не функционише. Саветујемо вам да подесите веб сервер тако да директоријум са подацима не буде изложен или да га преместите изван коренског директоријума веб сервера."
 
-#: templates/admin.php:29
+#: templates/admin.php:31
 msgid "Setup Warning"
 msgstr "Упозорење о подешавању"
 
-#: templates/admin.php:32
+#: templates/admin.php:34
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Ваш веб сервер тренутно не подржава синхронизацију датотека јер се чини да је WebDAV сучеље неисправно."
 
-#: templates/admin.php:33
+#: templates/admin.php:35
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Погледајте <a href='%s'>водиче за инсталацију</a>."
 
-#: templates/admin.php:44
+#: templates/admin.php:46
 msgid "Module 'fileinfo' missing"
 msgstr "Недостаје модул „fileinfo“"
 
-#: templates/admin.php:47
+#: templates/admin.php:49
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr "Недостаје PHP модул „fileinfo“. Препоручујемо вам да га омогућите да бисте добили најбоље резултате с откривањем MIME врста."
 
-#: templates/admin.php:58
+#: templates/admin.php:60
 msgid "Locale not working"
 msgstr "Локализација не ради"
 
-#: templates/admin.php:63
+#: templates/admin.php:65
 #, php-format
 msgid ""
 "This ownCloud server can't set system locale to %s. This means that there "
@@ -219,11 +219,11 @@ msgid ""
 " to install the required packages on your system to support %s."
 msgstr ""
 
-#: templates/admin.php:75
+#: templates/admin.php:77
 msgid "Internet connection not working"
 msgstr "Веза с интернетом не ради"
 
-#: templates/admin.php:78
+#: templates/admin.php:80
 msgid ""
 "This ownCloud server has no working internet connection. This means that "
 "some of the features like mounting of external storage, notifications about "
@@ -233,102 +233,102 @@ msgid ""
 " of ownCloud."
 msgstr ""
 
-#: templates/admin.php:92
+#: templates/admin.php:94
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:101
+#: templates/admin.php:103
 msgid "Execute one task with each page loaded"
 msgstr "Изврши један задатак са сваком учитаном страницом"
 
-#: templates/admin.php:111
+#: templates/admin.php:113
 msgid ""
 "cron.php is registered at a webcron service. Call the cron.php page in the "
 "owncloud root once a minute over http."
 msgstr ""
 
-#: templates/admin.php:121
+#: templates/admin.php:123
 msgid ""
 "Use systems cron service. Call the cron.php file in the owncloud folder via "
 "a system cronjob once a minute."
 msgstr ""
 
-#: templates/admin.php:128
+#: templates/admin.php:130
 msgid "Sharing"
 msgstr "Дељење"
 
-#: templates/admin.php:134
+#: templates/admin.php:136
 msgid "Enable Share API"
 msgstr "Омогући API Share"
 
-#: templates/admin.php:135
+#: templates/admin.php:137
 msgid "Allow apps to use the Share API"
 msgstr "Дозвољава апликацијама да користе API Share"
 
-#: templates/admin.php:142
+#: templates/admin.php:144
 msgid "Allow links"
 msgstr "Дозволи везе"
 
-#: templates/admin.php:143
+#: templates/admin.php:145
 msgid "Allow users to share items to the public with links"
 msgstr "Дозволи корисницима да деле ставке с другима путем веза"
 
-#: templates/admin.php:150
+#: templates/admin.php:152
 msgid "Allow resharing"
 msgstr "Дозволи поновно дељење"
 
-#: templates/admin.php:151
+#: templates/admin.php:153
 msgid "Allow users to share items shared with them again"
 msgstr "Дозволи корисницима да поновно деле ставке с другима"
 
-#: templates/admin.php:158
+#: templates/admin.php:160
 msgid "Allow users to share with anyone"
 msgstr "Дозволи корисницима да деле са било ким"
 
-#: templates/admin.php:161
+#: templates/admin.php:163
 msgid "Allow users to only share with users in their groups"
 msgstr "Дозволи корисницима да деле само са корисницима у њиховим групама"
 
-#: templates/admin.php:168
+#: templates/admin.php:170
 msgid "Security"
 msgstr "Безбедност"
 
-#: templates/admin.php:181
+#: templates/admin.php:183
 msgid "Enforce HTTPS"
 msgstr "Наметни HTTPS"
 
-#: templates/admin.php:182
+#: templates/admin.php:184
 msgid ""
 "Enforces the clients to connect to ownCloud via an encrypted connection."
 msgstr "Намеће клијентима да се повежу са ownCloud-ом путем шифроване везе."
 
-#: templates/admin.php:185
+#: templates/admin.php:187
 msgid ""
 "Please connect to this ownCloud instance via HTTPS to enable or disable the "
 "SSL enforcement."
 msgstr ""
 
-#: templates/admin.php:195
+#: templates/admin.php:197
 msgid "Log"
 msgstr "Бележење"
 
-#: templates/admin.php:196
+#: templates/admin.php:198
 msgid "Log level"
 msgstr "Ниво бележења"
 
-#: templates/admin.php:227
+#: templates/admin.php:229
 msgid "More"
 msgstr "Више"
 
-#: templates/admin.php:228
+#: templates/admin.php:230
 msgid "Less"
 msgstr "Мање"
 
-#: templates/admin.php:235 templates/personal.php:116
+#: templates/admin.php:236 templates/personal.php:116
 msgid "Version"
 msgstr "Верзија"
 
-#: templates/admin.php:237 templates/personal.php:119
+#: templates/admin.php:240 templates/personal.php:119
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -386,76 +386,79 @@ msgstr "Праћење грешака"
 msgid "Commercial Support"
 msgstr "Комерцијална подршка"
 
-#: templates/personal.php:9
+#: templates/personal.php:10
 msgid "Get the apps to sync your files"
 msgstr "Преузмите апликације ради синхронизовања датотека"
 
-#: templates/personal.php:20
+#: templates/personal.php:21
 msgid "Show First Run Wizard again"
 msgstr "Поново прикажи чаробњак за прво покретање"
 
-#: templates/personal.php:28
+#: templates/personal.php:29
 #, php-format
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "Искористили сте <strong>%s</strong> од дозвољених <strong>%s</strong>"
 
-#: templates/personal.php:40 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:41 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "Лозинка"
 
-#: templates/personal.php:41
+#: templates/personal.php:42
 msgid "Your password was changed"
 msgstr "Лозинка је промењена"
 
-#: templates/personal.php:42
+#: templates/personal.php:43
 msgid "Unable to change your password"
 msgstr "Не могу да изменим вашу лозинку"
 
-#: templates/personal.php:43
+#: templates/personal.php:44
 msgid "Current password"
 msgstr "Тренутна лозинка"
 
-#: templates/personal.php:45
+#: templates/personal.php:46
 msgid "New password"
 msgstr "Нова лозинка"
 
-#: templates/personal.php:47
+#: templates/personal.php:48
 msgid "Change password"
 msgstr "Измени лозинку"
 
-#: templates/personal.php:59 templates/users.php:85
+#: templates/personal.php:60 templates/users.php:85
 msgid "Display Name"
 msgstr "Име за приказ"
 
-#: templates/personal.php:74
+#: templates/personal.php:75
 msgid "Email"
 msgstr "Е-пошта"
 
-#: templates/personal.php:76
+#: templates/personal.php:77
 msgid "Your email address"
 msgstr "Ваша адреса е-поште"
 
-#: templates/personal.php:77
+#: templates/personal.php:78
 msgid "Fill in an email address to enable password recovery"
 msgstr "Ун"
 
-#: templates/personal.php:86 templates/personal.php:87
+#: templates/personal.php:87 templates/personal.php:88
 msgid "Language"
 msgstr "Језик"
 
-#: templates/personal.php:99
+#: templates/personal.php:100
 msgid "Help translate"
 msgstr " Помозите у превођењу"
 
-#: templates/personal.php:105
+#: templates/personal.php:106
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:107
-msgid "Use this address to connect to your ownCloud in your file manager"
-msgstr "Користите ову адресу да се повежете са ownCloud-ом у управљачу датотекама"
+#: templates/personal.php:108
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
+"target=\"_blank\">access your Files via WebDAV</a>"
+msgstr ""
 
-#: templates/users.php:21 templates/users.php:84
+#: templates/users.php:21
 msgid "Login Name"
 msgstr "Корисничко име"
 
@@ -485,6 +488,10 @@ msgstr "Неограничено"
 msgid "Other"
 msgstr "Друго"
 
+#: templates/users.php:84
+msgid "Username"
+msgstr "Корисничко име"
+
 #: templates/users.php:91
 msgid "Storage"
 msgstr "Складиште"
diff --git a/l10n/sr/user_ldap.po b/l10n/sr/user_ldap.po
index 0801cb7969bcc8071890dcb53873641d41e8fe0c..be499a9453fac0acc32d1ecf807c6c2f973e6870 100644
--- a/l10n/sr/user_ldap.po
+++ b/l10n/sr/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:16+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/sr@latin/core.po b/l10n/sr@latin/core.po
index 2e2b46c4b73c8d8f054961b0b04bc42776ef4b61..29b63e1c13c0d4d117a766e785ea06f8a01541e5 100644
--- a/l10n/sr@latin/core.po
+++ b/l10n/sr@latin/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:22+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:14+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
 "MIME-Version: 1.0\n"
@@ -61,135 +61,135 @@ msgstr ""
 msgid "Error removing %s from favorites."
 msgstr ""
 
-#: js/config.php:34
+#: js/config.php:32
 msgid "Sunday"
 msgstr "Nedelja"
 
-#: js/config.php:35
+#: js/config.php:33
 msgid "Monday"
 msgstr "Ponedeljak"
 
-#: js/config.php:36
+#: js/config.php:34
 msgid "Tuesday"
 msgstr "Utorak"
 
-#: js/config.php:37
+#: js/config.php:35
 msgid "Wednesday"
 msgstr "Sreda"
 
-#: js/config.php:38
+#: js/config.php:36
 msgid "Thursday"
 msgstr "ÄŒetvrtak"
 
-#: js/config.php:39
+#: js/config.php:37
 msgid "Friday"
 msgstr "Petak"
 
-#: js/config.php:40
+#: js/config.php:38
 msgid "Saturday"
 msgstr "Subota"
 
-#: js/config.php:45
+#: js/config.php:43
 msgid "January"
 msgstr "Januar"
 
-#: js/config.php:46
+#: js/config.php:44
 msgid "February"
 msgstr "Februar"
 
-#: js/config.php:47
+#: js/config.php:45
 msgid "March"
 msgstr "Mart"
 
-#: js/config.php:48
+#: js/config.php:46
 msgid "April"
 msgstr "April"
 
-#: js/config.php:49
+#: js/config.php:47
 msgid "May"
 msgstr "Maj"
 
-#: js/config.php:50
+#: js/config.php:48
 msgid "June"
 msgstr "Jun"
 
-#: js/config.php:51
+#: js/config.php:49
 msgid "July"
 msgstr "Jul"
 
-#: js/config.php:52
+#: js/config.php:50
 msgid "August"
 msgstr "Avgust"
 
-#: js/config.php:53
+#: js/config.php:51
 msgid "September"
 msgstr "Septembar"
 
-#: js/config.php:54
+#: js/config.php:52
 msgid "October"
 msgstr "Oktobar"
 
-#: js/config.php:55
+#: js/config.php:53
 msgid "November"
 msgstr "Novembar"
 
-#: js/config.php:56
+#: js/config.php:54
 msgid "December"
 msgstr "Decembar"
 
-#: js/js.js:286
+#: js/js.js:293
 msgid "Settings"
 msgstr "Podešavanja"
 
-#: js/js.js:718
+#: js/js.js:725
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:719
+#: js/js.js:726
 msgid "1 minute ago"
 msgstr ""
 
-#: js/js.js:720
+#: js/js.js:727
 msgid "{minutes} minutes ago"
 msgstr ""
 
-#: js/js.js:721
+#: js/js.js:728
 msgid "1 hour ago"
 msgstr ""
 
-#: js/js.js:722
+#: js/js.js:729
 msgid "{hours} hours ago"
 msgstr ""
 
-#: js/js.js:723
+#: js/js.js:730
 msgid "today"
 msgstr ""
 
-#: js/js.js:724
+#: js/js.js:731
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:725
+#: js/js.js:732
 msgid "{days} days ago"
 msgstr ""
 
-#: js/js.js:726
+#: js/js.js:733
 msgid "last month"
 msgstr ""
 
-#: js/js.js:727
+#: js/js.js:734
 msgid "{months} months ago"
 msgstr ""
 
-#: js/js.js:728
+#: js/js.js:735
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:729
+#: js/js.js:736
 msgid "last year"
 msgstr ""
 
-#: js/js.js:730
+#: js/js.js:737
 msgid "years ago"
 msgstr ""
 
@@ -225,8 +225,8 @@ msgstr ""
 #: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
 #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:577
-#: js/share.js:589
+#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:620
+#: js/share.js:632
 msgid "Error"
 msgstr ""
 
@@ -246,7 +246,7 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: js/share.js:125 js/share.js:617
+#: js/share.js:125 js/share.js:660
 msgid "Error while sharing"
 msgstr ""
 
@@ -266,99 +266,103 @@ msgstr ""
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:159
+#: js/share.js:172
 msgid "Share with"
 msgstr ""
 
-#: js/share.js:164
+#: js/share.js:177
 msgid "Share with link"
 msgstr ""
 
-#: js/share.js:167
+#: js/share.js:180
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:169 templates/installation.php:54 templates/login.php:26
+#: js/share.js:182 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "Lozinka"
 
-#: js/share.js:173
+#: js/share.js:187
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:191
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:174
+#: js/share.js:192
 msgid "Send"
 msgstr ""
 
-#: js/share.js:178
+#: js/share.js:197
 msgid "Set expiration date"
 msgstr ""
 
-#: js/share.js:179
+#: js/share.js:198
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:211
+#: js/share.js:230
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:213
+#: js/share.js:232
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:251
+#: js/share.js:270
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:287
+#: js/share.js:306
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:308
+#: js/share.js:327
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:320
+#: js/share.js:339
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:322
+#: js/share.js:341
 msgid "access control"
 msgstr ""
 
-#: js/share.js:325
+#: js/share.js:344
 msgid "create"
 msgstr ""
 
-#: js/share.js:328
+#: js/share.js:347
 msgid "update"
 msgstr ""
 
-#: js/share.js:331
+#: js/share.js:350
 msgid "delete"
 msgstr ""
 
-#: js/share.js:334
+#: js/share.js:353
 msgid "share"
 msgstr ""
 
-#: js/share.js:368 js/share.js:564
+#: js/share.js:387 js/share.js:607
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:577
+#: js/share.js:620
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:589
+#: js/share.js:632
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:604
+#: js/share.js:647
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:615
+#: js/share.js:658
 msgid "Email sent"
 msgstr ""
 
@@ -373,7 +377,7 @@ msgstr ""
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
-#: lostpassword/controller.php:58
+#: lostpassword/controller.php:60
 msgid "ownCloud password reset"
 msgstr ""
 
@@ -403,17 +407,17 @@ msgstr "Korisničko ime"
 
 #: lostpassword/templates/lostpassword.php:22
 msgid ""
-"Your files seems to be encrypted. If you didn't have enabled the recovery "
-"key there will be no way to get your data back once the password was "
-"resetted. If you are not sure what to do, please contact your administrator "
-"first before continue. Do you really want to continue?"
+"Your files are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
 msgstr ""
 
 #: lostpassword/templates/lostpassword.php:24
 msgid "Yes, I really want to reset my password now"
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:29
+#: lostpassword/templates/lostpassword.php:27
 msgid "Request reset"
 msgstr "Zahtevaj resetovanje"
 
@@ -461,7 +465,7 @@ msgstr ""
 msgid "Cloud not found"
 msgstr "Oblak nije nađen"
 
-#: templates/altmail.php:2
+#: templates/altmail.php:4
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -472,10 +476,6 @@ msgid ""
 "Cheers!"
 msgstr ""
 
-#: templates/altmail.php:7 templates/mail.php:24
-msgid "web services under your control"
-msgstr ""
-
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
 msgstr ""
@@ -568,12 +568,12 @@ msgstr "Domaćin baze"
 msgid "Finish setup"
 msgstr "Završi podešavanje"
 
-#: templates/layout.user.php:40
+#: templates/layout.user.php:43
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:67
+#: templates/layout.user.php:68
 msgid "Log out"
 msgstr "Odjava"
 
@@ -607,7 +607,7 @@ msgstr ""
 msgid "Alternative Logins"
 msgstr ""
 
-#: templates/mail.php:15
+#: templates/mail.php:16
 #, php-format
 msgid ""
 "Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
diff --git a/l10n/sr@latin/files.po b/l10n/sr@latin/files.po
index c63cff5c4fde2b2c5f4ac84188b75309976e52ca..4533ac43dd00c49ab5a2c2e53a1dcd6f249fff8f 100644
--- a/l10n/sr@latin/files.po
+++ b/l10n/sr@latin/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:01+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
 "MIME-Version: 1.0\n"
@@ -27,46 +27,54 @@ msgstr ""
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/upload.php:19
+#: ajax/upload.php:16 ajax/upload.php:45
+msgid "Unable to set upload directory."
+msgstr ""
+
+#: ajax/upload.php:22
+msgid "Invalid Token"
+msgstr ""
+
+#: ajax/upload.php:59
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: ajax/upload.php:26
+#: ajax/upload.php:66
 msgid "There is no error, the file uploaded with success"
 msgstr "Nema greške, fajl je uspešno poslat"
 
-#: ajax/upload.php:27
+#: ajax/upload.php:67
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:29
+#: ajax/upload.php:69
 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:30
+#: ajax/upload.php:70
 msgid "The uploaded file was only partially uploaded"
 msgstr "Poslati fajl je samo delimično otpremljen!"
 
-#: ajax/upload.php:31
+#: ajax/upload.php:71
 msgid "No file was uploaded"
 msgstr "Nijedan fajl nije poslat"
 
-#: ajax/upload.php:32
+#: ajax/upload.php:72
 msgid "Missing a temporary folder"
 msgstr "Nedostaje privremena fascikla"
 
-#: ajax/upload.php:33
+#: ajax/upload.php:73
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:51
+#: ajax/upload.php:91
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:83
+#: ajax/upload.php:123
 msgid "Invalid directory."
 msgstr ""
 
@@ -74,6 +82,36 @@ msgstr ""
 msgid "Files"
 msgstr "Fajlovi"
 
+#: js/file-upload.js:11
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/file-upload.js:24
+msgid "Not enough space available"
+msgstr ""
+
+#: js/file-upload.js:64
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/file-upload.js:167 js/files.js:266
+msgid ""
+"File upload is in progress. Leaving the page now will cancel the upload."
+msgstr ""
+
+#: js/file-upload.js:233 js/files.js:339
+msgid "URL cannot be empty."
+msgstr ""
+
+#: js/file-upload.js:238 lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr ""
+
+#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
+#: js/files.js:693 js/files.js:731
+msgid "Error"
+msgstr ""
+
 #: js/fileactions.js:116
 msgid "Share"
 msgstr ""
@@ -90,43 +128,43 @@ msgstr "Obriši"
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:464
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:259
+#: js/filelist.js:302
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:306
+#: js/filelist.js:349
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:306
+#: js/filelist.js:349
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:331
+#: js/filelist.js:374
 msgid "perform delete operation"
 msgstr ""
 
-#: js/filelist.js:413
+#: js/filelist.js:456
 msgid "1 file uploading"
 msgstr ""
 
-#: js/filelist.js:416 js/filelist.js:470
+#: js/filelist.js:459 js/filelist.js:517
 msgid "files uploading"
 msgstr ""
 
@@ -158,69 +196,41 @@ msgid ""
 "big."
 msgstr ""
 
-#: js/files.js:264
-msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr ""
-
-#: js/files.js:277
-msgid "Not enough space available"
-msgstr ""
-
-#: js/files.js:317
-msgid "Upload cancelled."
-msgstr ""
-
-#: js/files.js:413
-msgid ""
-"File upload is in progress. Leaving the page now will cancel the upload."
-msgstr ""
-
-#: js/files.js:486
-msgid "URL cannot be empty."
-msgstr ""
-
-#: js/files.js:491
+#: js/files.js:344
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
-msgid "Error"
-msgstr ""
-
-#: js/files.js:877 templates/index.php:69
+#: js/files.js:744 templates/index.php:69
 msgid "Name"
 msgstr "Ime"
 
-#: js/files.js:878 templates/index.php:80
+#: js/files.js:745 templates/index.php:80
 msgid "Size"
 msgstr "Veličina"
 
-#: js/files.js:879 templates/index.php:82
+#: js/files.js:746 templates/index.php:82
 msgid "Modified"
 msgstr "Zadnja izmena"
 
-#: js/files.js:898
+#: js/files.js:765
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:900
+#: js/files.js:767
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:908
+#: js/files.js:775
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:910
+#: js/files.js:777
 msgid "{count} files"
 msgstr ""
 
-#: lib/app.php:53
-msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
-msgstr ""
-
 #: lib/app.php:73
-msgid "Unable to rename file"
+#, php-format
+msgid "%s could not be renamed"
 msgstr ""
 
 #: lib/helper.php:11 templates/index.php:18
@@ -317,6 +327,22 @@ msgstr ""
 msgid "Current scanning"
 msgstr ""
 
+#: templates/part.list.php:76
+msgid "directory"
+msgstr ""
+
+#: templates/part.list.php:78
+msgid "directories"
+msgstr ""
+
+#: templates/part.list.php:87
+msgid "file"
+msgstr ""
+
+#: templates/part.list.php:89
+msgid "files"
+msgstr ""
+
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
 msgstr ""
diff --git a/l10n/sr@latin/files_encryption.po b/l10n/sr@latin/files_encryption.po
index e2356b43ef4f44c2de1b948d096c5b999efc46a2..a85e29f4eb3aafa96e302d293334f9e7140eede4 100644
--- a/l10n/sr@latin/files_encryption.po
+++ b/l10n/sr@latin/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-14 02:46+0200\n"
-"PO-Revision-Date: 2013-06-14 00:47+0000\n"
+"POT-Creation-Date: 2013-07-05 02:12+0200\n"
+"PO-Revision-Date: 2013-07-05 00:13+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"
@@ -55,9 +55,21 @@ msgstr ""
 
 #: files/error.php:7
 msgid ""
-"Your private key is not valid! Maybe your password was changed from outside."
-" You can update your private key password in your personal settings to "
-"regain access to your files"
+"Your private key is not valid! Likely your password was changed outside the "
+"ownCloud system (e.g. your corporate directory). You can update your private"
+" key password in your personal settings to recover access to your encrypted "
+"files."
+msgstr ""
+
+#: hooks/hooks.php:44
+msgid "Missing requirements."
+msgstr ""
+
+#: hooks/hooks.php:45
+msgid ""
+"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL "
+"PHP extension is enabled and configured properly. For now, the encryption "
+"app has been disabled."
 msgstr ""
 
 #: js/settings-admin.js:11
@@ -84,11 +96,11 @@ msgstr ""
 
 #: templates/settings-admin.php:10
 msgid ""
-"Enable encryption passwords recovery key (allow sharing to recovery key):"
+"Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
 #: templates/settings-admin.php:14
-msgid "Recovery account password"
+msgid "Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:21 templates/settings-personal.php:54
@@ -100,15 +112,15 @@ msgid "Disabled"
 msgstr ""
 
 #: templates/settings-admin.php:34
-msgid "Change encryption passwords recovery key:"
+msgid "Change recovery key password:"
 msgstr ""
 
 #: templates/settings-admin.php:41
-msgid "Old Recovery account password"
+msgid "Old Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:48
-msgid "New Recovery account password"
+msgid "New Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:53
diff --git a/l10n/sr@latin/files_external.po b/l10n/sr@latin/files_external.po
index fcdd970a75124866478c72f1a24607e7ae4b09a2..ad2bcc3cff60ed61e4e829ac59295ae450dcfeb8 100644
--- a/l10n/sr@latin/files_external.po
+++ b/l10n/sr@latin/files_external.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/sr@latin/files_sharing.po b/l10n/sr@latin/files_sharing.po
index 778fd915658dff50f664711da34ad4a0e7257ce7..aeb0fa5e32bfe349be2d03c84eb7335bb98b695c 100644
--- a/l10n/sr@latin/files_sharing.po
+++ b/l10n/sr@latin/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
 "MIME-Version: 1.0\n"
@@ -18,27 +18,39 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: templates/authenticate.php:4
+msgid "The password is wrong. Try again."
+msgstr ""
+
+#: templates/authenticate.php:7
 msgid "Password"
 msgstr "Lozinka"
 
-#: templates/authenticate.php:6
+#: templates/authenticate.php:9
 msgid "Submit"
 msgstr "Pošalji"
 
-#: templates/public.php:10
+#: templates/public.php:17
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr ""
 
-#: templates/public.php:13
+#: templates/public.php:20
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr ""
 
-#: templates/public.php:19 templates/public.php:43
+#: templates/public.php:28 templates/public.php:90
 msgid "Download"
 msgstr "Preuzmi"
 
-#: templates/public.php:40
+#: templates/public.php:45 templates/public.php:48
+msgid "Upload"
+msgstr "Pošalji"
+
+#: templates/public.php:58
+msgid "Cancel upload"
+msgstr ""
+
+#: templates/public.php:87
 msgid "No preview available for"
 msgstr ""
diff --git a/l10n/sr@latin/files_trashbin.po b/l10n/sr@latin/files_trashbin.po
index 08b49fb32b86218f20d07ee965e7e7685a551bbf..bc969962243492b8e4e5a61a087e831fd8311874 100644
--- a/l10n/sr@latin/files_trashbin.po
+++ b/l10n/sr@latin/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/sr@latin/lib.po b/l10n/sr@latin/lib.po
index 2cdd6e3eb7b0dd527804b2b46ac856745e2d67fe..ce0a0b53fcc8bf4a78e9ad1a9d0de5f9881bde56 100644
--- a/l10n/sr@latin/lib.po
+++ b/l10n/sr@latin/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
 "MIME-Version: 1.0\n"
@@ -17,43 +17,47 @@ msgstr ""
 "Language: sr@latin\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: app.php:359
+#: app.php:360
 msgid "Help"
 msgstr "Pomoć"
 
-#: app.php:372
+#: app.php:373
 msgid "Personal"
 msgstr "Lično"
 
-#: app.php:383
+#: app.php:384
 msgid "Settings"
 msgstr "Podešavanja"
 
-#: app.php:395
+#: app.php:396
 msgid "Users"
 msgstr "Korisnici"
 
-#: app.php:408
+#: app.php:409
 msgid "Apps"
 msgstr "Programi"
 
-#: app.php:416
+#: app.php:417
 msgid "Admin"
 msgstr "Adninistracija"
 
-#: files.php:210
+#: defaults.php:33
+msgid "web services under your control"
+msgstr ""
+
+#: files.php:226
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: files.php:211
+#: files.php:227
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:212 files.php:245
+#: files.php:228 files.php:261
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:242
+#: files.php:258
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
@@ -85,104 +89,102 @@ msgstr "Tekst"
 msgid "Images"
 msgstr ""
 
-#: setup.php:34
-msgid "Set an admin username."
-msgstr ""
-
-#: setup.php:37
-msgid "Set an admin password."
-msgstr ""
-
-#: setup.php:55
+#: setup/abstractdatabase.php:22
 #, php-format
 msgid "%s enter the database username."
 msgstr ""
 
-#: setup.php:58
+#: setup/abstractdatabase.php:25
 #, php-format
 msgid "%s enter the database name."
 msgstr ""
 
-#: setup.php:61
+#: setup/abstractdatabase.php:28
 #, php-format
 msgid "%s you may not use dots in the database name"
 msgstr ""
 
-#: setup.php:64
+#: setup/mssql.php:20
 #, php-format
-msgid "%s set the database host."
-msgstr ""
-
-#: setup.php:126 setup.php:332 setup.php:377
-msgid "PostgreSQL username and/or password not valid"
+msgid "MS SQL username and/or password not valid: %s"
 msgstr ""
 
-#: setup.php:127 setup.php:235
+#: setup/mssql.php:21 setup/mysql.php:13 setup/oci.php:114
+#: setup/postgresql.php:24 setup/postgresql.php:70
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:152
-msgid "Oracle connection could not be established"
-msgstr ""
-
-#: setup.php:234
+#: setup/mysql.php:12
 msgid "MySQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:288 setup.php:398 setup.php:407 setup.php:425 setup.php:435
-#: setup.php:444 setup.php:477 setup.php:543 setup.php:569 setup.php:576
-#: setup.php:587 setup.php:594 setup.php:603 setup.php:611 setup.php:620
-#: setup.php:626
+#: setup/mysql.php:67 setup/oci.php:54 setup/oci.php:121 setup/oci.php:147
+#: setup/oci.php:154 setup/oci.php:165 setup/oci.php:172 setup/oci.php:181
+#: setup/oci.php:189 setup/oci.php:198 setup/oci.php:204
+#: setup/postgresql.php:89 setup/postgresql.php:98 setup/postgresql.php:115
+#: setup/postgresql.php:125 setup/postgresql.php:134
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr ""
 
-#: setup.php:289 setup.php:399 setup.php:408 setup.php:426 setup.php:436
-#: setup.php:445 setup.php:478 setup.php:544 setup.php:570 setup.php:577
-#: setup.php:588 setup.php:604 setup.php:612 setup.php:621
+#: setup/mysql.php:68 setup/oci.php:55 setup/oci.php:122 setup/oci.php:148
+#: setup/oci.php:155 setup/oci.php:166 setup/oci.php:182 setup/oci.php:190
+#: setup/oci.php:199 setup/postgresql.php:90 setup/postgresql.php:99
+#: setup/postgresql.php:116 setup/postgresql.php:126 setup/postgresql.php:135
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:305
+#: setup/mysql.php:85
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:306
+#: setup/mysql.php:86
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:311
+#: setup/mysql.php:91
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:312
+#: setup/mysql.php:92
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:469 setup.php:536
+#: setup/oci.php:34
+msgid "Oracle connection could not be established"
+msgstr ""
+
+#: setup/oci.php:41 setup/oci.php:113
 msgid "Oracle username and/or password not valid"
 msgstr ""
 
-#: setup.php:595 setup.php:627
+#: setup/oci.php:173 setup/oci.php:205
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:647
-#, php-format
-msgid "MS SQL username and/or password not valid: %s"
+#: setup/postgresql.php:23 setup/postgresql.php:69
+msgid "PostgreSQL username and/or password not valid"
+msgstr ""
+
+#: setup.php:42
+msgid "Set an admin username."
+msgstr ""
+
+#: setup.php:45
+msgid "Set an admin password."
 msgstr ""
 
-#: setup.php:870
+#: setup.php:198
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:871
+#: setup.php:199
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
diff --git a/l10n/sr@latin/settings.po b/l10n/sr@latin/settings.po
index 98ae0def7e38642f0c0ea8f393577c9be4224fd5..22b4eb9a352803e0745da4d1a3502d78445b8927 100644
--- a/l10n/sr@latin/settings.po
+++ b/l10n/sr@latin/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
 "MIME-Version: 1.0\n"
@@ -88,35 +88,35 @@ msgstr ""
 msgid "Couldn't update app."
 msgstr ""
 
-#: js/apps.js:30
+#: js/apps.js:35
 msgid "Update to {appversion}"
 msgstr ""
 
-#: js/apps.js:36 js/apps.js:76
+#: js/apps.js:41 js/apps.js:81
 msgid "Disable"
 msgstr ""
 
-#: js/apps.js:36 js/apps.js:64 js/apps.js:83
+#: js/apps.js:41 js/apps.js:69 js/apps.js:88
 msgid "Enable"
 msgstr ""
 
-#: js/apps.js:55
+#: js/apps.js:60
 msgid "Please wait...."
 msgstr ""
 
-#: js/apps.js:59 js/apps.js:71 js/apps.js:80 js/apps.js:93
+#: js/apps.js:64 js/apps.js:76 js/apps.js:85 js/apps.js:98
 msgid "Error"
 msgstr ""
 
-#: js/apps.js:90
+#: js/apps.js:95
 msgid "Updating...."
 msgstr ""
 
-#: js/apps.js:93
+#: js/apps.js:98
 msgid "Error while updating app"
 msgstr ""
 
-#: js/apps.js:96
+#: js/apps.js:101
 msgid "Updated"
 msgstr ""
 
@@ -165,15 +165,15 @@ msgstr ""
 msgid "A valid password must be provided"
 msgstr ""
 
-#: personal.php:35 personal.php:36
+#: personal.php:37 personal.php:38
 msgid "__language_name__"
 msgstr ""
 
-#: templates/admin.php:15
+#: templates/admin.php:17
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:18
+#: templates/admin.php:20
 msgid ""
 "Your data directory and your files are probably accessible from the "
 "internet. The .htaccess file that ownCloud provides is not working. We "
@@ -182,36 +182,36 @@ msgid ""
 " webserver document root."
 msgstr ""
 
-#: templates/admin.php:29
+#: templates/admin.php:31
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:32
+#: templates/admin.php:34
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: templates/admin.php:33
+#: templates/admin.php:35
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:44
+#: templates/admin.php:46
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:47
+#: templates/admin.php:49
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr ""
 
-#: templates/admin.php:58
+#: templates/admin.php:60
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:63
+#: templates/admin.php:65
 #, php-format
 msgid ""
 "This ownCloud server can't set system locale to %s. This means that there "
@@ -219,11 +219,11 @@ msgid ""
 " to install the required packages on your system to support %s."
 msgstr ""
 
-#: templates/admin.php:75
+#: templates/admin.php:77
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:78
+#: templates/admin.php:80
 msgid ""
 "This ownCloud server has no working internet connection. This means that "
 "some of the features like mounting of external storage, notifications about "
@@ -233,102 +233,102 @@ msgid ""
 " of ownCloud."
 msgstr ""
 
-#: templates/admin.php:92
+#: templates/admin.php:94
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:101
+#: templates/admin.php:103
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:111
+#: templates/admin.php:113
 msgid ""
 "cron.php is registered at a webcron service. Call the cron.php page in the "
 "owncloud root once a minute over http."
 msgstr ""
 
-#: templates/admin.php:121
+#: templates/admin.php:123
 msgid ""
 "Use systems cron service. Call the cron.php file in the owncloud folder via "
 "a system cronjob once a minute."
 msgstr ""
 
-#: templates/admin.php:128
+#: templates/admin.php:130
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:134
+#: templates/admin.php:136
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:135
+#: templates/admin.php:137
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:142
+#: templates/admin.php:144
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:143
+#: templates/admin.php:145
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:150
+#: templates/admin.php:152
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:151
+#: templates/admin.php:153
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:158
+#: templates/admin.php:160
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:161
+#: templates/admin.php:163
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:168
+#: templates/admin.php:170
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:181
+#: templates/admin.php:183
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:182
+#: templates/admin.php:184
 msgid ""
 "Enforces the clients to connect to ownCloud via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:185
+#: templates/admin.php:187
 msgid ""
 "Please connect to this ownCloud instance via HTTPS to enable or disable the "
 "SSL enforcement."
 msgstr ""
 
-#: templates/admin.php:195
+#: templates/admin.php:197
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:196
+#: templates/admin.php:198
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:227
+#: templates/admin.php:229
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:228
+#: templates/admin.php:230
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:235 templates/personal.php:116
+#: templates/admin.php:236 templates/personal.php:116
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:237 templates/personal.php:119
+#: templates/admin.php:240 templates/personal.php:119
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -386,76 +386,79 @@ msgstr ""
 msgid "Commercial Support"
 msgstr ""
 
-#: templates/personal.php:9
+#: templates/personal.php:10
 msgid "Get the apps to sync your files"
 msgstr ""
 
-#: templates/personal.php:20
+#: templates/personal.php:21
 msgid "Show First Run Wizard again"
 msgstr ""
 
-#: templates/personal.php:28
+#: templates/personal.php:29
 #, php-format
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr ""
 
-#: templates/personal.php:40 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:41 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "Lozinka"
 
-#: templates/personal.php:41
+#: templates/personal.php:42
 msgid "Your password was changed"
 msgstr ""
 
-#: templates/personal.php:42
+#: templates/personal.php:43
 msgid "Unable to change your password"
 msgstr "Ne mogu da izmenim vašu lozinku"
 
-#: templates/personal.php:43
+#: templates/personal.php:44
 msgid "Current password"
 msgstr "Trenutna lozinka"
 
-#: templates/personal.php:45
+#: templates/personal.php:46
 msgid "New password"
 msgstr "Nova lozinka"
 
-#: templates/personal.php:47
+#: templates/personal.php:48
 msgid "Change password"
 msgstr "Izmeni lozinku"
 
-#: templates/personal.php:59 templates/users.php:85
+#: templates/personal.php:60 templates/users.php:85
 msgid "Display Name"
 msgstr ""
 
-#: templates/personal.php:74
+#: templates/personal.php:75
 msgid "Email"
 msgstr "E-mail"
 
-#: templates/personal.php:76
+#: templates/personal.php:77
 msgid "Your email address"
 msgstr ""
 
-#: templates/personal.php:77
+#: templates/personal.php:78
 msgid "Fill in an email address to enable password recovery"
 msgstr ""
 
-#: templates/personal.php:86 templates/personal.php:87
+#: templates/personal.php:87 templates/personal.php:88
 msgid "Language"
 msgstr "Jezik"
 
-#: templates/personal.php:99
+#: templates/personal.php:100
 msgid "Help translate"
 msgstr ""
 
-#: templates/personal.php:105
+#: templates/personal.php:106
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:107
-msgid "Use this address to connect to your ownCloud in your file manager"
+#: templates/personal.php:108
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
+"target=\"_blank\">access your Files via WebDAV</a>"
 msgstr ""
 
-#: templates/users.php:21 templates/users.php:84
+#: templates/users.php:21
 msgid "Login Name"
 msgstr ""
 
@@ -485,6 +488,10 @@ msgstr ""
 msgid "Other"
 msgstr "Drugo"
 
+#: templates/users.php:84
+msgid "Username"
+msgstr "Korisničko ime"
+
 #: templates/users.php:91
 msgid "Storage"
 msgstr ""
diff --git a/l10n/sr@latin/user_ldap.po b/l10n/sr@latin/user_ldap.po
index fa87c1da98e9197cae156f57404edfe20a763157..b828fa148051718a4efeb22670c901417f9599a1 100644
--- a/l10n/sr@latin/user_ldap.po
+++ b/l10n/sr@latin/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-25 02:01+0200\n"
-"PO-Revision-Date: 2013-05-24 13:28+0000\n"
+"POT-Creation-Date: 2013-06-23 01:59+0200\n"
+"PO-Revision-Date: 2013-06-22 10:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/sv/core.po b/l10n/sv/core.po
index 3db0482048e41cb960802cc2cb88b6f4e8b3cd4d..c17b316c0b14b9fe967aa86173c00eb17e684857 100644
--- a/l10n/sv/core.po
+++ b/l10n/sv/core.po
@@ -5,14 +5,15 @@
 # Translators:
 # Gunnar Norin <blittan@xbmc.org>, 2013
 # medialabs, 2013
+# Magnus Höglund <magnus@linux.com>, 2013
 # medialabs, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:22+0000\n"
-"Last-Translator: medialabs\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -64,135 +65,135 @@ msgstr "Inga kategorier valda för radering."
 msgid "Error removing %s from favorites."
 msgstr "Fel vid borttagning av %s från favoriter."
 
-#: js/config.php:34
+#: js/config.php:32
 msgid "Sunday"
 msgstr "Söndag"
 
-#: js/config.php:35
+#: js/config.php:33
 msgid "Monday"
 msgstr "MÃ¥ndag"
 
-#: js/config.php:36
+#: js/config.php:34
 msgid "Tuesday"
 msgstr "Tisdag"
 
-#: js/config.php:37
+#: js/config.php:35
 msgid "Wednesday"
 msgstr "Onsdag"
 
-#: js/config.php:38
+#: js/config.php:36
 msgid "Thursday"
 msgstr "Torsdag"
 
-#: js/config.php:39
+#: js/config.php:37
 msgid "Friday"
 msgstr "Fredag"
 
-#: js/config.php:40
+#: js/config.php:38
 msgid "Saturday"
 msgstr "Lördag"
 
-#: js/config.php:45
+#: js/config.php:43
 msgid "January"
 msgstr "Januari"
 
-#: js/config.php:46
+#: js/config.php:44
 msgid "February"
 msgstr "Februari"
 
-#: js/config.php:47
+#: js/config.php:45
 msgid "March"
 msgstr "Mars"
 
-#: js/config.php:48
+#: js/config.php:46
 msgid "April"
 msgstr "April"
 
-#: js/config.php:49
+#: js/config.php:47
 msgid "May"
 msgstr "Maj"
 
-#: js/config.php:50
+#: js/config.php:48
 msgid "June"
 msgstr "Juni"
 
-#: js/config.php:51
+#: js/config.php:49
 msgid "July"
 msgstr "Juli"
 
-#: js/config.php:52
+#: js/config.php:50
 msgid "August"
 msgstr "Augusti"
 
-#: js/config.php:53
+#: js/config.php:51
 msgid "September"
 msgstr "September"
 
-#: js/config.php:54
+#: js/config.php:52
 msgid "October"
 msgstr "Oktober"
 
-#: js/config.php:55
+#: js/config.php:53
 msgid "November"
 msgstr "November"
 
-#: js/config.php:56
+#: js/config.php:54
 msgid "December"
 msgstr "December"
 
-#: js/js.js:286
+#: js/js.js:293
 msgid "Settings"
 msgstr "Inställningar"
 
-#: js/js.js:718
+#: js/js.js:725
 msgid "seconds ago"
 msgstr "sekunder sedan"
 
-#: js/js.js:719
+#: js/js.js:726
 msgid "1 minute ago"
 msgstr "1 minut sedan"
 
-#: js/js.js:720
+#: js/js.js:727
 msgid "{minutes} minutes ago"
 msgstr "{minutes} minuter sedan"
 
-#: js/js.js:721
+#: js/js.js:728
 msgid "1 hour ago"
 msgstr "1 timme sedan"
 
-#: js/js.js:722
+#: js/js.js:729
 msgid "{hours} hours ago"
 msgstr "{hours} timmar sedan"
 
-#: js/js.js:723
+#: js/js.js:730
 msgid "today"
 msgstr "i dag"
 
-#: js/js.js:724
+#: js/js.js:731
 msgid "yesterday"
 msgstr "i går"
 
-#: js/js.js:725
+#: js/js.js:732
 msgid "{days} days ago"
 msgstr "{days} dagar sedan"
 
-#: js/js.js:726
+#: js/js.js:733
 msgid "last month"
 msgstr "förra månaden"
 
-#: js/js.js:727
+#: js/js.js:734
 msgid "{months} months ago"
 msgstr "{months} månader sedan"
 
-#: js/js.js:728
+#: js/js.js:735
 msgid "months ago"
 msgstr "månader sedan"
 
-#: js/js.js:729
+#: js/js.js:736
 msgid "last year"
 msgstr "förra året"
 
-#: js/js.js:730
+#: js/js.js:737
 msgid "years ago"
 msgstr "Ã¥r sedan"
 
@@ -228,8 +229,8 @@ msgstr "Objekttypen är inte specificerad."
 #: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
 #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:577
-#: js/share.js:589
+#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:620
+#: js/share.js:632
 msgid "Error"
 msgstr "Fel"
 
@@ -249,7 +250,7 @@ msgstr "Delad"
 msgid "Share"
 msgstr "Dela"
 
-#: js/share.js:125 js/share.js:617
+#: js/share.js:125 js/share.js:660
 msgid "Error while sharing"
 msgstr "Fel vid delning"
 
@@ -269,99 +270,103 @@ msgstr "Delad med dig och gruppen {group} av {owner}"
 msgid "Shared with you by {owner}"
 msgstr "Delad med dig av {owner}"
 
-#: js/share.js:159
+#: js/share.js:172
 msgid "Share with"
 msgstr "Delad med"
 
-#: js/share.js:164
+#: js/share.js:177
 msgid "Share with link"
 msgstr "Delad med länk"
 
-#: js/share.js:167
+#: js/share.js:180
 msgid "Password protect"
 msgstr "Lösenordsskydda"
 
-#: js/share.js:169 templates/installation.php:54 templates/login.php:26
+#: js/share.js:182 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "Lösenord"
 
-#: js/share.js:173
+#: js/share.js:187
+msgid "Allow Public Upload"
+msgstr "Tillåt publik uppladdning"
+
+#: js/share.js:191
 msgid "Email link to person"
 msgstr "E-posta länk till person"
 
-#: js/share.js:174
+#: js/share.js:192
 msgid "Send"
 msgstr "Skicka"
 
-#: js/share.js:178
+#: js/share.js:197
 msgid "Set expiration date"
 msgstr "Sätt utgångsdatum"
 
-#: js/share.js:179
+#: js/share.js:198
 msgid "Expiration date"
 msgstr "Utgångsdatum"
 
-#: js/share.js:211
+#: js/share.js:230
 msgid "Share via email:"
 msgstr "Dela via e-post:"
 
-#: js/share.js:213
+#: js/share.js:232
 msgid "No people found"
 msgstr "Hittar inga användare"
 
-#: js/share.js:251
+#: js/share.js:270
 msgid "Resharing is not allowed"
 msgstr "Dela vidare är inte tillåtet"
 
-#: js/share.js:287
+#: js/share.js:306
 msgid "Shared in {item} with {user}"
 msgstr "Delad i {item} med {user}"
 
-#: js/share.js:308
+#: js/share.js:327
 msgid "Unshare"
 msgstr "Sluta dela"
 
-#: js/share.js:320
+#: js/share.js:339
 msgid "can edit"
 msgstr "kan redigera"
 
-#: js/share.js:322
+#: js/share.js:341
 msgid "access control"
 msgstr "Ã¥tkomstkontroll"
 
-#: js/share.js:325
+#: js/share.js:344
 msgid "create"
 msgstr "skapa"
 
-#: js/share.js:328
+#: js/share.js:347
 msgid "update"
 msgstr "uppdatera"
 
-#: js/share.js:331
+#: js/share.js:350
 msgid "delete"
 msgstr "radera"
 
-#: js/share.js:334
+#: js/share.js:353
 msgid "share"
 msgstr "dela"
 
-#: js/share.js:368 js/share.js:564
+#: js/share.js:387 js/share.js:607
 msgid "Password protected"
 msgstr "Lösenordsskyddad"
 
-#: js/share.js:577
+#: js/share.js:620
 msgid "Error unsetting expiration date"
 msgstr "Fel vid borttagning av utgångsdatum"
 
-#: js/share.js:589
+#: js/share.js:632
 msgid "Error setting expiration date"
 msgstr "Fel vid sättning av utgångsdatum"
 
-#: js/share.js:604
+#: js/share.js:647
 msgid "Sending ..."
 msgstr "Skickar ..."
 
-#: js/share.js:615
+#: js/share.js:658
 msgid "Email sent"
 msgstr "E-post skickat"
 
@@ -376,7 +381,7 @@ msgstr "Uppdateringen misslyckades. Rapportera detta problem till <a href=\"http
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "Uppdateringen lyckades. Du omdirigeras nu till OwnCloud."
 
-#: lostpassword/controller.php:58
+#: lostpassword/controller.php:60
 msgid "ownCloud password reset"
 msgstr "ownCloud lösenordsåterställning"
 
@@ -406,17 +411,17 @@ msgstr "Användarnamn"
 
 #: lostpassword/templates/lostpassword.php:22
 msgid ""
-"Your files seems to be encrypted. If you didn't have enabled the recovery "
-"key there will be no way to get your data back once the password was "
-"resetted. If you are not sure what to do, please contact your administrator "
-"first before continue. Do you really want to continue?"
-msgstr "Dina filer ser ut att vara krypterade. Om du inte har aktiverat återställningsnyckeln så finns finns det inget sätt att få tillbaka dina filer när du väl har återställt lösenordet. Om du inte är säker på vad du ska göra, vänligen kontakta din administratör innan du fortsätter. Vill du verkligen fortsätta?"
+"Your files are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
+msgstr "Dina filer är krypterade. Om du inte har aktiverat återställningsnyckeln kommer det inte att finnas någon möjlighet att få tillbaka dina filer efter att ditt lösenord har återställts. Om du är osäker, kontakta din systemadministratör innan du fortsätter. Är du verkligen säker på att fortsätta?"
 
 #: lostpassword/templates/lostpassword.php:24
 msgid "Yes, I really want to reset my password now"
 msgstr "Ja, jag vill verkligen återställa mitt lösenord nu"
 
-#: lostpassword/templates/lostpassword.php:29
+#: lostpassword/templates/lostpassword.php:27
 msgid "Request reset"
 msgstr "Begär återställning"
 
@@ -464,7 +469,7 @@ msgstr "Åtkomst förbjuden"
 msgid "Cloud not found"
 msgstr "Hittade inget moln"
 
-#: templates/altmail.php:2
+#: templates/altmail.php:4
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -475,10 +480,6 @@ msgid ""
 "Cheers!"
 msgstr "Hej där,⏎\n⏎\nville bara meddela dig att %s delade %s med dig.⏎\nTitta på den: %s⏎\n⏎\nVi hörs!"
 
-#: templates/altmail.php:7 templates/mail.php:24
-msgid "web services under your control"
-msgstr "webbtjänster under din kontroll"
-
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
 msgstr "Editera kategorier"
@@ -571,12 +572,12 @@ msgstr "Databasserver"
 msgid "Finish setup"
 msgstr "Avsluta installation"
 
-#: templates/layout.user.php:40
+#: templates/layout.user.php:43
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr "%s är tillgänglig. Få mer information om hur du går tillväga för att uppdatera."
 
-#: templates/layout.user.php:67
+#: templates/layout.user.php:68
 msgid "Log out"
 msgstr "Logga ut"
 
@@ -610,7 +611,7 @@ msgstr "Logga in"
 msgid "Alternative Logins"
 msgstr "Alternativa inloggningar"
 
-#: templates/mail.php:15
+#: templates/mail.php:16
 #, php-format
 msgid ""
 "Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
diff --git a/l10n/sv/files.po b/l10n/sv/files.po
index a4f40138b45d08ad7faf9fe3dfc7fe7fc9572c40..7ab7b4dd546359fa5e0ad5986a9faccdb2bd96c6 100644
--- a/l10n/sv/files.po
+++ b/l10n/sv/files.po
@@ -4,14 +4,15 @@
 # 
 # Translators:
 # Gunnar Norin <blittan@xbmc.org>, 2013
+# Magnus Höglund <magnus@linux.com>, 2013
 # medialabs, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:01+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
-"Last-Translator: Gunnar Norin <blittan@xbmc.org>\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+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"
@@ -29,46 +30,54 @@ msgstr "Kunde inte flytta %s - Det finns redan en fil med detta namn"
 msgid "Could not move %s"
 msgstr "Kan inte flytta %s"
 
-#: ajax/upload.php:19
+#: ajax/upload.php:16 ajax/upload.php:45
+msgid "Unable to set upload directory."
+msgstr "Kan inte sätta mapp för uppladdning."
+
+#: ajax/upload.php:22
+msgid "Invalid Token"
+msgstr "Ogiltig token"
+
+#: ajax/upload.php:59
 msgid "No file was uploaded. Unknown error"
 msgstr "Ingen fil uppladdad. Okänt fel"
 
-#: ajax/upload.php:26
+#: ajax/upload.php:66
 msgid "There is no error, the file uploaded with success"
 msgstr "Inga fel uppstod. Filen laddades upp utan problem."
 
-#: ajax/upload.php:27
+#: ajax/upload.php:67
 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:29
+#: ajax/upload.php:69
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Den uppladdade filen överskrider MAX_FILE_SIZE direktivet som har angetts i HTML formuläret"
 
-#: ajax/upload.php:30
+#: ajax/upload.php:70
 msgid "The uploaded file was only partially uploaded"
 msgstr "Den uppladdade filen var endast delvis uppladdad"
 
-#: ajax/upload.php:31
+#: ajax/upload.php:71
 msgid "No file was uploaded"
 msgstr "Ingen fil laddades upp"
 
-#: ajax/upload.php:32
+#: ajax/upload.php:72
 msgid "Missing a temporary folder"
 msgstr "En temporär mapp saknas"
 
-#: ajax/upload.php:33
+#: ajax/upload.php:73
 msgid "Failed to write to disk"
 msgstr "Misslyckades spara till disk"
 
-#: ajax/upload.php:51
+#: ajax/upload.php:91
 msgid "Not enough storage available"
 msgstr "Inte tillräckligt med lagringsutrymme tillgängligt"
 
-#: ajax/upload.php:83
+#: ajax/upload.php:123
 msgid "Invalid directory."
 msgstr "Felaktig mapp."
 
@@ -76,6 +85,36 @@ msgstr "Felaktig mapp."
 msgid "Files"
 msgstr "Filer"
 
+#: js/file-upload.js:11
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr "Kan inte ladda upp din fil eftersom det är en katalog eller har 0 bytes"
+
+#: js/file-upload.js:24
+msgid "Not enough space available"
+msgstr "Inte tillräckligt med utrymme tillgängligt"
+
+#: js/file-upload.js:64
+msgid "Upload cancelled."
+msgstr "Uppladdning avbruten."
+
+#: js/file-upload.js:167 js/files.js:266
+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/file-upload.js:233 js/files.js:339
+msgid "URL cannot be empty."
+msgstr "URL kan inte vara tom."
+
+#: js/file-upload.js:238 lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr "Ogiltigt mappnamn. Användning av 'Shared' är reserverad av ownCloud"
+
+#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
+#: js/files.js:693 js/files.js:731
+msgid "Error"
+msgstr "Fel"
+
 #: js/fileactions.js:116
 msgid "Share"
 msgstr "Dela"
@@ -92,43 +131,43 @@ msgstr "Radera"
 msgid "Rename"
 msgstr "Byt namn"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:464
 msgid "Pending"
 msgstr "Väntar"
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "{new_name} already exists"
 msgstr "{new_name} finns redan"
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "replace"
 msgstr "ersätt"
 
-#: js/filelist.js:259
+#: js/filelist.js:302
 msgid "suggest name"
 msgstr "föreslå namn"
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "cancel"
 msgstr "avbryt"
 
-#: js/filelist.js:306
+#: js/filelist.js:349
 msgid "replaced {new_name} with {old_name}"
 msgstr "ersatt {new_name} med {old_name}"
 
-#: js/filelist.js:306
+#: js/filelist.js:349
 msgid "undo"
 msgstr "Ã¥ngra"
 
-#: js/filelist.js:331
+#: js/filelist.js:374
 msgid "perform delete operation"
 msgstr "utför raderingen"
 
-#: js/filelist.js:413
+#: js/filelist.js:456
 msgid "1 file uploading"
 msgstr "1 filuppladdning"
 
-#: js/filelist.js:416 js/filelist.js:470
+#: js/filelist.js:459 js/filelist.js:517
 msgid "files uploading"
 msgstr "filer laddas upp"
 
@@ -160,70 +199,42 @@ msgid ""
 "big."
 msgstr "Din nedladdning förbereds. Det kan ta tid om det är stora filer."
 
-#: js/files.js:264
-msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "Kan inte ladda upp din fil eftersom det är en katalog eller har 0 bytes"
-
-#: js/files.js:277
-msgid "Not enough space available"
-msgstr "Inte tillräckligt med utrymme tillgängligt"
-
-#: js/files.js:317
-msgid "Upload cancelled."
-msgstr "Uppladdning avbruten."
-
-#: js/files.js:413
-msgid ""
-"File upload is in progress. Leaving the page now will cancel the upload."
-msgstr "Filuppladdning pågår. Lämnar du sidan så avbryts uppladdningen."
-
-#: js/files.js:486
-msgid "URL cannot be empty."
-msgstr "URL kan inte vara tom."
-
-#: js/files.js:491
+#: js/files.js:344
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Ogiltigt mappnamn. Användande av 'Shared' är reserverat av ownCloud"
 
-#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
-msgid "Error"
-msgstr "Fel"
-
-#: js/files.js:877 templates/index.php:69
+#: js/files.js:744 templates/index.php:69
 msgid "Name"
 msgstr "Namn"
 
-#: js/files.js:878 templates/index.php:80
+#: js/files.js:745 templates/index.php:80
 msgid "Size"
 msgstr "Storlek"
 
-#: js/files.js:879 templates/index.php:82
+#: js/files.js:746 templates/index.php:82
 msgid "Modified"
 msgstr "Ändrad"
 
-#: js/files.js:898
+#: js/files.js:765
 msgid "1 folder"
 msgstr "1 mapp"
 
-#: js/files.js:900
+#: js/files.js:767
 msgid "{count} folders"
 msgstr "{count} mappar"
 
-#: js/files.js:908
+#: js/files.js:775
 msgid "1 file"
 msgstr "1 fil"
 
-#: js/files.js:910
+#: js/files.js:777
 msgid "{count} files"
 msgstr "{count} filer"
 
-#: lib/app.php:53
-msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
-msgstr "Ogiltigt mappnamn. Användning av 'Shared' är reserverad av ownCloud"
-
 #: lib/app.php:73
-msgid "Unable to rename file"
-msgstr "Kan inte byta namn på filen"
+#, php-format
+msgid "%s could not be renamed"
+msgstr "%s kunde inte namnändras"
 
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
@@ -319,6 +330,22 @@ msgstr "Filer skannas, var god vänta"
 msgid "Current scanning"
 msgstr "Aktuell skanning"
 
+#: templates/part.list.php:76
+msgid "directory"
+msgstr "mapp"
+
+#: templates/part.list.php:78
+msgid "directories"
+msgstr "mappar"
+
+#: templates/part.list.php:87
+msgid "file"
+msgstr "fil"
+
+#: templates/part.list.php:89
+msgid "files"
+msgstr "filer"
+
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
 msgstr "Uppgraderar filsystemets cache..."
diff --git a/l10n/sv/files_encryption.po b/l10n/sv/files_encryption.po
index 65010140e99614a439c26cba636cd5f835cc328c..e311ebaf59e8937c5d973e1a3bf323212f103348 100644
--- a/l10n/sv/files_encryption.po
+++ b/l10n/sv/files_encryption.po
@@ -4,14 +4,15 @@
 # 
 # Translators:
 # medialabs, 2013
+# Magnus Höglund <magnus@linux.com>, 2013
 # medialabs, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-16 01:58+0200\n"
-"PO-Revision-Date: 2013-06-15 16:00+0000\n"
-"Last-Translator: medialabs\n"
+"POT-Creation-Date: 2013-07-05 02:12+0200\n"
+"PO-Revision-Date: 2013-07-05 00:13+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"
@@ -57,10 +58,22 @@ msgstr "Kunde inte uppdatera den privata lösenordsnyckeln. Kanske var det gamla
 
 #: files/error.php:7
 msgid ""
-"Your private key is not valid! Maybe your password was changed from outside."
-" You can update your private key password in your personal settings to "
-"regain access to your files"
-msgstr "Din privata lösenordsnyckel är inte giltig! Kanske byttes ditt lösenord från utsidan. Du kan uppdatera din privata lösenordsnyckel under dina personliga inställningar för att återfå tillgång till dina filer"
+"Your private key is not valid! Likely your password was changed outside the "
+"ownCloud system (e.g. your corporate directory). You can update your private"
+" key password in your personal settings to recover access to your encrypted "
+"files."
+msgstr "Din privata lösenordsnyckel är inte giltig! Troligen har ditt lösenord ändrats utanför ownCloud (t.ex. i företagets katalogtjänst). Du kan uppdatera den privata lösenordsnyckeln under dina personliga inställningar för att återfå tillgång till dina filer."
+
+#: hooks/hooks.php:44
+msgid "Missing requirements."
+msgstr ""
+
+#: hooks/hooks.php:45
+msgid ""
+"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL "
+"PHP extension is enabled and configured properly. For now, the encryption "
+"app has been disabled."
+msgstr ""
 
 #: js/settings-admin.js:11
 msgid "Saving..."
@@ -86,12 +99,12 @@ msgstr "Kryptering"
 
 #: templates/settings-admin.php:10
 msgid ""
-"Enable encryption passwords recovery key (allow sharing to recovery key):"
-msgstr "Aktivera återställningsnyckel för krypterade lösenord. (tillåt delning till återställningsnyckeln):"
+"Enable recovery key (allow to recover users files in case of password loss):"
+msgstr "Aktivera lösenordsnyckel (för att kunna återfå användarens filer vid glömt eller förlorat lösenord):"
 
 #: templates/settings-admin.php:14
-msgid "Recovery account password"
-msgstr "Återställning av kontolösenord"
+msgid "Recovery key password"
+msgstr "Lösenordsnyckel"
 
 #: templates/settings-admin.php:21 templates/settings-personal.php:54
 msgid "Enabled"
@@ -102,16 +115,16 @@ msgid "Disabled"
 msgstr "Inaktiverad"
 
 #: templates/settings-admin.php:34
-msgid "Change encryption passwords recovery key:"
-msgstr "Ändra återställningsnyckeln för krypterade lösenord:"
+msgid "Change recovery key password:"
+msgstr "Ändra lösenordsnyckel:"
 
 #: templates/settings-admin.php:41
-msgid "Old Recovery account password"
-msgstr "Gamla lösenordet för återställningskontot"
+msgid "Old Recovery key password"
+msgstr "Gammal lösenordsnyckel"
 
 #: templates/settings-admin.php:48
-msgid "New Recovery account password"
-msgstr "Nytt återställningslösenord för kontot"
+msgid "New Recovery key password"
+msgstr "Ny lösenordsnyckel"
 
 #: templates/settings-admin.php:53
 msgid "Change Password"
@@ -151,7 +164,7 @@ msgstr "Aktivera lösenordsåterställning"
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
-msgstr ""
+msgstr "Genom att aktivera detta alternativ kommer du kunna återfå tillgång till dina krypterade filer om du skulle förlora/glömma ditt lösenord"
 
 #: templates/settings-personal.php:63
 msgid "File recovery settings updated"
diff --git a/l10n/sv/files_external.po b/l10n/sv/files_external.po
index 487a36a976a10f4126fee5c7f0af38ac31c24178..c901d5e8b4f1ff403cb06d0b18d3e5c8df68c5e4 100644
--- a/l10n/sv/files_external.po
+++ b/l10n/sv/files_external.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: medialabs\n"
 "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/sv/files_sharing.po b/l10n/sv/files_sharing.po
index 59b337cad3f295807ff33c15a4e5e7dd1ab72193..a0eb517610060f0c5eae83bef3c5b83dee5d140d 100644
--- a/l10n/sv/files_sharing.po
+++ b/l10n/sv/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
 "MIME-Version: 1.0\n"
@@ -18,27 +18,39 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: templates/authenticate.php:4
+msgid "The password is wrong. Try again."
+msgstr ""
+
+#: templates/authenticate.php:7
 msgid "Password"
 msgstr "Lösenord"
 
-#: templates/authenticate.php:6
+#: templates/authenticate.php:9
 msgid "Submit"
 msgstr "Skicka"
 
-#: templates/public.php:10
+#: templates/public.php:17
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s delade mappen %s med dig"
 
-#: templates/public.php:13
+#: templates/public.php:20
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s delade filen %s med dig"
 
-#: templates/public.php:19 templates/public.php:43
+#: templates/public.php:28 templates/public.php:90
 msgid "Download"
 msgstr "Ladda ner"
 
-#: templates/public.php:40
+#: templates/public.php:45 templates/public.php:48
+msgid "Upload"
+msgstr "Ladda upp"
+
+#: templates/public.php:58
+msgid "Cancel upload"
+msgstr "Avbryt uppladdning"
+
+#: templates/public.php:87
 msgid "No preview available for"
 msgstr "Ingen förhandsgranskning tillgänglig för"
diff --git a/l10n/sv/files_trashbin.po b/l10n/sv/files_trashbin.po
index d5d549eeafb58aabee1c62074c4331b31d25f04e..290192c74dcd47d8a6fd740f49c508d08c7388a6 100644
--- a/l10n/sv/files_trashbin.po
+++ b/l10n/sv/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:16+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/sv/lib.po b/l10n/sv/lib.po
index 983cb0aa3225fe5e040f546de7f3833384e437d2..607f62d5c1acc51cb51114b0ca2ec17b764ea389 100644
--- a/l10n/sv/lib.po
+++ b/l10n/sv/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-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
-"Last-Translator: medialabs\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,43 +18,47 @@ msgstr ""
 "Language: sv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:359
+#: app.php:360
 msgid "Help"
 msgstr "Hjälp"
 
-#: app.php:372
+#: app.php:373
 msgid "Personal"
 msgstr "Personligt"
 
-#: app.php:383
+#: app.php:384
 msgid "Settings"
 msgstr "Inställningar"
 
-#: app.php:395
+#: app.php:396
 msgid "Users"
 msgstr "Användare"
 
-#: app.php:408
+#: app.php:409
 msgid "Apps"
 msgstr "Program"
 
-#: app.php:416
+#: app.php:417
 msgid "Admin"
 msgstr "Admin"
 
-#: files.php:210
+#: defaults.php:33
+msgid "web services under your control"
+msgstr "webbtjänster under din kontroll"
+
+#: files.php:226
 msgid "ZIP download is turned off."
 msgstr "Nerladdning av ZIP är avstängd."
 
-#: files.php:211
+#: files.php:227
 msgid "Files need to be downloaded one by one."
 msgstr "Filer laddas ner en åt gången."
 
-#: files.php:212 files.php:245
+#: files.php:228 files.php:261
 msgid "Back to Files"
 msgstr "Tillbaka till Filer"
 
-#: files.php:242
+#: files.php:258
 msgid "Selected files too large to generate zip file."
 msgstr "Valda filer är för stora för att skapa zip-fil."
 
@@ -86,104 +90,102 @@ msgstr "Text"
 msgid "Images"
 msgstr "Bilder"
 
-#: setup.php:34
-msgid "Set an admin username."
-msgstr "Ange ett användarnamn för administratören."
-
-#: setup.php:37
-msgid "Set an admin password."
-msgstr "Ange ett administratörslösenord."
-
-#: setup.php:55
+#: setup/abstractdatabase.php:22
 #, php-format
 msgid "%s enter the database username."
 msgstr "%s ange databasanvändare."
 
-#: setup.php:58
+#: setup/abstractdatabase.php:25
 #, php-format
 msgid "%s enter the database name."
 msgstr "%s ange databasnamn"
 
-#: setup.php:61
+#: setup/abstractdatabase.php:28
 #, php-format
 msgid "%s you may not use dots in the database name"
 msgstr "%s du får inte använda punkter i databasnamnet"
 
-#: setup.php:64
+#: setup/mssql.php:20
 #, php-format
-msgid "%s set the database host."
-msgstr "%s ange databasserver/host."
-
-#: setup.php:126 setup.php:332 setup.php:377
-msgid "PostgreSQL username and/or password not valid"
-msgstr "PostgreSQL-användarnamnet och/eller lösenordet är felaktigt"
+msgid "MS SQL username and/or password not valid: %s"
+msgstr "MS SQL-användaren och/eller lösenordet var inte giltigt: %s"
 
-#: setup.php:127 setup.php:235
+#: setup/mssql.php:21 setup/mysql.php:13 setup/oci.php:114
+#: setup/postgresql.php:24 setup/postgresql.php:70
 msgid "You need to enter either an existing account or the administrator."
 msgstr "Du måste antingen ange ett befintligt konto eller administratör."
 
-#: setup.php:152
-msgid "Oracle connection could not be established"
-msgstr "Oracle-anslutning kunde inte etableras"
-
-#: setup.php:234
+#: setup/mysql.php:12
 msgid "MySQL username and/or password not valid"
 msgstr "MySQL-användarnamnet och/eller lösenordet är felaktigt"
 
-#: setup.php:288 setup.php:398 setup.php:407 setup.php:425 setup.php:435
-#: setup.php:444 setup.php:477 setup.php:543 setup.php:569 setup.php:576
-#: setup.php:587 setup.php:594 setup.php:603 setup.php:611 setup.php:620
-#: setup.php:626
+#: setup/mysql.php:67 setup/oci.php:54 setup/oci.php:121 setup/oci.php:147
+#: setup/oci.php:154 setup/oci.php:165 setup/oci.php:172 setup/oci.php:181
+#: setup/oci.php:189 setup/oci.php:198 setup/oci.php:204
+#: setup/postgresql.php:89 setup/postgresql.php:98 setup/postgresql.php:115
+#: setup/postgresql.php:125 setup/postgresql.php:134
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr "DB error: \"%s\""
 
-#: setup.php:289 setup.php:399 setup.php:408 setup.php:426 setup.php:436
-#: setup.php:445 setup.php:478 setup.php:544 setup.php:570 setup.php:577
-#: setup.php:588 setup.php:604 setup.php:612 setup.php:621
+#: setup/mysql.php:68 setup/oci.php:55 setup/oci.php:122 setup/oci.php:148
+#: setup/oci.php:155 setup/oci.php:166 setup/oci.php:182 setup/oci.php:190
+#: setup/oci.php:199 setup/postgresql.php:90 setup/postgresql.php:99
+#: setup/postgresql.php:116 setup/postgresql.php:126 setup/postgresql.php:135
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr "Det felaktiga kommandot var: \"%s\""
 
-#: setup.php:305
+#: setup/mysql.php:85
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr "MySQL-användaren '%s'@'localhost' existerar redan."
 
-#: setup.php:306
+#: setup/mysql.php:86
 msgid "Drop this user from MySQL"
 msgstr "Radera denna användare från MySQL"
 
-#: setup.php:311
+#: setup/mysql.php:91
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr "MySQl-användare '%s'@'%%' existerar redan"
 
-#: setup.php:312
+#: setup/mysql.php:92
 msgid "Drop this user from MySQL."
 msgstr "Radera denna användare från MySQL."
 
-#: setup.php:469 setup.php:536
+#: setup/oci.php:34
+msgid "Oracle connection could not be established"
+msgstr "Oracle-anslutning kunde inte etableras"
+
+#: setup/oci.php:41 setup/oci.php:113
 msgid "Oracle username and/or password not valid"
 msgstr "Oracle-användarnamnet och/eller lösenordet är felaktigt"
 
-#: setup.php:595 setup.php:627
+#: setup/oci.php:173 setup/oci.php:205
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr "Det felande kommandot var: \"%s\", name: %s, password: %s"
 
-#: setup.php:647
-#, php-format
-msgid "MS SQL username and/or password not valid: %s"
-msgstr "MS SQL-användaren och/eller lösenordet var inte giltigt: %s"
+#: setup/postgresql.php:23 setup/postgresql.php:69
+msgid "PostgreSQL username and/or password not valid"
+msgstr "PostgreSQL-användarnamnet och/eller lösenordet är felaktigt"
+
+#: setup.php:42
+msgid "Set an admin username."
+msgstr "Ange ett användarnamn för administratören."
+
+#: setup.php:45
+msgid "Set an admin password."
+msgstr "Ange ett administratörslösenord."
 
-#: setup.php:870
+#: setup.php:198
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Din webbserver är inte korrekt konfigurerad för att tillåta filsynkronisering eftersom WebDAV inte verkar fungera."
 
-#: setup.php:871
+#: setup.php:199
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Var god kontrollera <a href='%s'>installationsguiden</a>."
diff --git a/l10n/sv/settings.po b/l10n/sv/settings.po
index ac67cf6ce0dd4e6ca2273c8a3759bda9eb82ed91..5d992a333a4d3069d127b1733b0cfad8495d868f 100644
--- a/l10n/sv/settings.po
+++ b/l10n/sv/settings.po
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
-"Last-Translator: Gunnar Norin <blittan@xbmc.org>\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -92,35 +92,35 @@ msgstr "Kan inte radera användare från gruppen %s"
 msgid "Couldn't update app."
 msgstr "Kunde inte uppdatera appen."
 
-#: js/apps.js:30
+#: js/apps.js:35
 msgid "Update to {appversion}"
 msgstr "Uppdatera till {appversion}"
 
-#: js/apps.js:36 js/apps.js:76
+#: js/apps.js:41 js/apps.js:81
 msgid "Disable"
 msgstr "Deaktivera"
 
-#: js/apps.js:36 js/apps.js:64 js/apps.js:83
+#: js/apps.js:41 js/apps.js:69 js/apps.js:88
 msgid "Enable"
 msgstr "Aktivera"
 
-#: js/apps.js:55
+#: js/apps.js:60
 msgid "Please wait...."
 msgstr "Var god vänta..."
 
-#: js/apps.js:59 js/apps.js:71 js/apps.js:80 js/apps.js:93
+#: js/apps.js:64 js/apps.js:76 js/apps.js:85 js/apps.js:98
 msgid "Error"
 msgstr "Fel"
 
-#: js/apps.js:90
+#: js/apps.js:95
 msgid "Updating...."
 msgstr "Uppdaterar..."
 
-#: js/apps.js:93
+#: js/apps.js:98
 msgid "Error while updating app"
 msgstr "Fel uppstod vid uppdatering av appen"
 
-#: js/apps.js:96
+#: js/apps.js:101
 msgid "Updated"
 msgstr "Uppdaterad"
 
@@ -169,15 +169,15 @@ msgstr "Fel vid skapande av användare"
 msgid "A valid password must be provided"
 msgstr "Ett giltigt lösenord måste anges"
 
-#: personal.php:35 personal.php:36
+#: personal.php:37 personal.php:38
 msgid "__language_name__"
 msgstr "__language_name__"
 
-#: templates/admin.php:15
+#: templates/admin.php:17
 msgid "Security Warning"
 msgstr "Säkerhetsvarning"
 
-#: templates/admin.php:18
+#: templates/admin.php:20
 msgid ""
 "Your data directory and your files are probably accessible from the "
 "internet. The .htaccess file that ownCloud provides is not working. We "
@@ -186,36 +186,36 @@ msgid ""
 " webserver document root."
 msgstr "Din datakatalog och dina filer är förmodligen tillgängliga från Internet. Den .htaccess-fil som ownCloud tillhandahåller fungerar inte. Vi rekommenderar starkt att du konfigurerar webbservern så att datakatalogen inte längre är tillgänglig eller att du flyttar datakatalogen utanför webbserverns dokument-root."
 
-#: templates/admin.php:29
+#: templates/admin.php:31
 msgid "Setup Warning"
 msgstr "Installationsvarning"
 
-#: templates/admin.php:32
+#: templates/admin.php:34
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Din webbserver är inte korrekt konfigurerad för att tillåta filsynkronisering eftersom WebDAV inte verkar fungera."
 
-#: templates/admin.php:33
+#: templates/admin.php:35
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Var god kontrollera <a href='%s'>installationsguiden</a>."
 
-#: templates/admin.php:44
+#: templates/admin.php:46
 msgid "Module 'fileinfo' missing"
 msgstr "Modulen \"fileinfo\" saknas"
 
-#: templates/admin.php:47
+#: templates/admin.php:49
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr "PHP-modulen 'fileinfo' saknas. Vi rekommenderar starkt att aktivera den här modulen för att kunna upptäcka korrekt mime-typ."
 
-#: templates/admin.php:58
+#: templates/admin.php:60
 msgid "Locale not working"
 msgstr "Locale fungerar inte"
 
-#: templates/admin.php:63
+#: templates/admin.php:65
 #, php-format
 msgid ""
 "This ownCloud server can't set system locale to %s. This means that there "
@@ -223,11 +223,11 @@ msgid ""
 " to install the required packages on your system to support %s."
 msgstr "Denna ownCloud server kan inte sätta system locale till %s. Det innebär att det kan vara problem med vissa tecken i filnamnet. Vi vill verkligen rekommendera att du installerar nödvändiga paket på ditt system för att stödja %s."
 
-#: templates/admin.php:75
+#: templates/admin.php:77
 msgid "Internet connection not working"
 msgstr "Internetförbindelsen fungerar inte"
 
-#: templates/admin.php:78
+#: templates/admin.php:80
 msgid ""
 "This ownCloud server has no working internet connection. This means that "
 "some of the features like mounting of external storage, notifications about "
@@ -237,102 +237,102 @@ msgid ""
 " of ownCloud."
 msgstr "Den här ownCloudservern har ingen fungerande internetförbindelse. Det innebär att några funktioner som t.ex. att montera externa lagringsplatser, meddelanden om uppdateringar eller installation av tredjepartsappar inte fungerar. Det kan vara så att det inte går att få fjärråtkomst till filer och att e-post inte fungerar. Vi rekommenderar att du tillåter internetåtkomst för den här servern om du vill ha tillgång till alla funktioner hos ownCloud"
 
-#: templates/admin.php:92
+#: templates/admin.php:94
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:101
+#: templates/admin.php:103
 msgid "Execute one task with each page loaded"
 msgstr "Exekvera en uppgift vid varje sidladdning"
 
-#: templates/admin.php:111
+#: templates/admin.php:113
 msgid ""
 "cron.php is registered at a webcron service. Call the cron.php page in the "
 "owncloud root once a minute over http."
 msgstr "cron.php är registrerad som en webcron-tjänst. Anropa cron.php sidan i ownCloud en gång i minuten över HTTP."
 
-#: templates/admin.php:121
+#: templates/admin.php:123
 msgid ""
 "Use systems cron service. Call the cron.php file in the owncloud folder via "
 "a system cronjob once a minute."
 msgstr "Använd system-tjänsten cron. Anropa filen cron.php i ownCloud-mappen via ett cronjobb varje minut."
 
-#: templates/admin.php:128
+#: templates/admin.php:130
 msgid "Sharing"
 msgstr "Dela"
 
-#: templates/admin.php:134
+#: templates/admin.php:136
 msgid "Enable Share API"
 msgstr "Aktivera delat API"
 
-#: templates/admin.php:135
+#: templates/admin.php:137
 msgid "Allow apps to use the Share API"
 msgstr "Tillåt applikationer att använda delat API"
 
-#: templates/admin.php:142
+#: templates/admin.php:144
 msgid "Allow links"
 msgstr "Tillåt länkar"
 
-#: templates/admin.php:143
+#: templates/admin.php:145
 msgid "Allow users to share items to the public with links"
 msgstr "Tillåt delning till allmänheten via publika länkar"
 
-#: templates/admin.php:150
+#: templates/admin.php:152
 msgid "Allow resharing"
 msgstr "Tillåt vidaredelning"
 
-#: templates/admin.php:151
+#: templates/admin.php:153
 msgid "Allow users to share items shared with them again"
 msgstr "Tillåt användare att dela vidare filer som delats med dem"
 
-#: templates/admin.php:158
+#: templates/admin.php:160
 msgid "Allow users to share with anyone"
 msgstr "Tillåt delning med alla"
 
-#: templates/admin.php:161
+#: templates/admin.php:163
 msgid "Allow users to only share with users in their groups"
 msgstr "Tillåt bara delning med användare i egna grupper"
 
-#: templates/admin.php:168
+#: templates/admin.php:170
 msgid "Security"
 msgstr "Säkerhet"
 
-#: templates/admin.php:181
+#: templates/admin.php:183
 msgid "Enforce HTTPS"
 msgstr "Kräv HTTPS"
 
-#: templates/admin.php:182
+#: templates/admin.php:184
 msgid ""
 "Enforces the clients to connect to ownCloud via an encrypted connection."
 msgstr "Tvingar klienter att ansluta till ownCloud via en krypterad förbindelse."
 
-#: templates/admin.php:185
+#: templates/admin.php:187
 msgid ""
 "Please connect to this ownCloud instance via HTTPS to enable or disable the "
 "SSL enforcement."
 msgstr "Vänligen anslut till denna instans av ownCloud via HTTPS för att aktivera/avaktivera SSL"
 
-#: templates/admin.php:195
+#: templates/admin.php:197
 msgid "Log"
 msgstr "Logg"
 
-#: templates/admin.php:196
+#: templates/admin.php:198
 msgid "Log level"
 msgstr "Nivå på loggning"
 
-#: templates/admin.php:227
+#: templates/admin.php:229
 msgid "More"
 msgstr "Mer"
 
-#: templates/admin.php:228
+#: templates/admin.php:230
 msgid "Less"
 msgstr "Mindre"
 
-#: templates/admin.php:235 templates/personal.php:116
+#: templates/admin.php:236 templates/personal.php:116
 msgid "Version"
 msgstr "Version"
 
-#: templates/admin.php:237 templates/personal.php:119
+#: templates/admin.php:240 templates/personal.php:119
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -390,76 +390,79 @@ msgstr "Bugtracker"
 msgid "Commercial Support"
 msgstr "Kommersiell support"
 
-#: templates/personal.php:9
+#: templates/personal.php:10
 msgid "Get the apps to sync your files"
 msgstr "Skaffa apparna för att synkronisera dina filer"
 
-#: templates/personal.php:20
+#: templates/personal.php:21
 msgid "Show First Run Wizard again"
 msgstr "Visa Första uppstarts-guiden igen"
 
-#: templates/personal.php:28
+#: templates/personal.php:29
 #, php-format
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "Du har använt <strong>%s</strong> av tillgängliga <strong>%s</strong>"
 
-#: templates/personal.php:40 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:41 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "Lösenord"
 
-#: templates/personal.php:41
+#: templates/personal.php:42
 msgid "Your password was changed"
 msgstr "Ditt lösenord har ändrats"
 
-#: templates/personal.php:42
+#: templates/personal.php:43
 msgid "Unable to change your password"
 msgstr "Kunde inte ändra ditt lösenord"
 
-#: templates/personal.php:43
+#: templates/personal.php:44
 msgid "Current password"
 msgstr "Nuvarande lösenord"
 
-#: templates/personal.php:45
+#: templates/personal.php:46
 msgid "New password"
 msgstr "Nytt lösenord"
 
-#: templates/personal.php:47
+#: templates/personal.php:48
 msgid "Change password"
 msgstr "Ändra lösenord"
 
-#: templates/personal.php:59 templates/users.php:85
+#: templates/personal.php:60 templates/users.php:85
 msgid "Display Name"
 msgstr "Visningsnamn"
 
-#: templates/personal.php:74
+#: templates/personal.php:75
 msgid "Email"
 msgstr "E-post"
 
-#: templates/personal.php:76
+#: templates/personal.php:77
 msgid "Your email address"
 msgstr "Din e-postadress"
 
-#: templates/personal.php:77
+#: templates/personal.php:78
 msgid "Fill in an email address to enable password recovery"
 msgstr "Fyll i en e-postadress för att aktivera återställning av lösenord"
 
-#: templates/personal.php:86 templates/personal.php:87
+#: templates/personal.php:87 templates/personal.php:88
 msgid "Language"
 msgstr "Språk"
 
-#: templates/personal.php:99
+#: templates/personal.php:100
 msgid "Help translate"
 msgstr "Hjälp att översätta"
 
-#: templates/personal.php:105
+#: templates/personal.php:106
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:107
-msgid "Use this address to connect to your ownCloud in your file manager"
-msgstr "Använd denna adress för att ansluta till ownCloud i din filhanterare"
+#: templates/personal.php:108
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
+"target=\"_blank\">access your Files via WebDAV</a>"
+msgstr ""
 
-#: templates/users.php:21 templates/users.php:84
+#: templates/users.php:21
 msgid "Login Name"
 msgstr "Inloggningsnamn"
 
@@ -489,6 +492,10 @@ msgstr "Obegränsad"
 msgid "Other"
 msgstr "Annat"
 
+#: templates/users.php:84
+msgid "Username"
+msgstr "Användarnamn"
+
 #: templates/users.php:91
 msgid "Storage"
 msgstr "Lagring"
diff --git a/l10n/sv/user_ldap.po b/l10n/sv/user_ldap.po
index 86898105bf7ab8105b93e7d9f83b75741ba9f018..72e779369f45f8f7bd8bf81da66993a443bfa134 100644
--- a/l10n/sv/user_ldap.po
+++ b/l10n/sv/user_ldap.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:25+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:16+0000\n"
 "Last-Translator: medialabs\n"
 "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/sw_KE/core.po b/l10n/sw_KE/core.po
index 1fc1e959455c52427089f45c1ce0d39f88359715..834f706c36bb0922e1c94ed665c5444f20da2160 100644
--- a/l10n/sw_KE/core.po
+++ b/l10n/sw_KE/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-15 01:59+0200\n"
-"PO-Revision-Date: 2013-06-14 23:59+0000\n"
+"POT-Creation-Date: 2013-07-06 02:02+0200\n"
+"PO-Revision-Date: 2013-07-06 00:02+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Swahili (Kenya) (http://www.transifex.com/projects/p/owncloud/language/sw_KE/)\n"
 "MIME-Version: 1.0\n"
@@ -61,135 +61,135 @@ msgstr ""
 msgid "Error removing %s from favorites."
 msgstr ""
 
-#: js/config.php:34
+#: js/config.php:32
 msgid "Sunday"
 msgstr ""
 
-#: js/config.php:35
+#: js/config.php:33
 msgid "Monday"
 msgstr ""
 
-#: js/config.php:36
+#: js/config.php:34
 msgid "Tuesday"
 msgstr ""
 
-#: js/config.php:37
+#: js/config.php:35
 msgid "Wednesday"
 msgstr ""
 
-#: js/config.php:38
+#: js/config.php:36
 msgid "Thursday"
 msgstr ""
 
-#: js/config.php:39
+#: js/config.php:37
 msgid "Friday"
 msgstr ""
 
-#: js/config.php:40
+#: js/config.php:38
 msgid "Saturday"
 msgstr ""
 
-#: js/config.php:45
+#: js/config.php:43
 msgid "January"
 msgstr ""
 
-#: js/config.php:46
+#: js/config.php:44
 msgid "February"
 msgstr ""
 
-#: js/config.php:47
+#: js/config.php:45
 msgid "March"
 msgstr ""
 
-#: js/config.php:48
+#: js/config.php:46
 msgid "April"
 msgstr ""
 
-#: js/config.php:49
+#: js/config.php:47
 msgid "May"
 msgstr ""
 
-#: js/config.php:50
+#: js/config.php:48
 msgid "June"
 msgstr ""
 
-#: js/config.php:51
+#: js/config.php:49
 msgid "July"
 msgstr ""
 
-#: js/config.php:52
+#: js/config.php:50
 msgid "August"
 msgstr ""
 
-#: js/config.php:53
+#: js/config.php:51
 msgid "September"
 msgstr ""
 
-#: js/config.php:54
+#: js/config.php:52
 msgid "October"
 msgstr ""
 
-#: js/config.php:55
+#: js/config.php:53
 msgid "November"
 msgstr ""
 
-#: js/config.php:56
+#: js/config.php:54
 msgid "December"
 msgstr ""
 
-#: js/js.js:286
+#: js/js.js:289
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:718
+#: js/js.js:721
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:719
+#: js/js.js:722
 msgid "1 minute ago"
 msgstr ""
 
-#: js/js.js:720
+#: js/js.js:723
 msgid "{minutes} minutes ago"
 msgstr ""
 
-#: js/js.js:721
+#: js/js.js:724
 msgid "1 hour ago"
 msgstr ""
 
-#: js/js.js:722
+#: js/js.js:725
 msgid "{hours} hours ago"
 msgstr ""
 
-#: js/js.js:723
+#: js/js.js:726
 msgid "today"
 msgstr ""
 
-#: js/js.js:724
+#: js/js.js:727
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:725
+#: js/js.js:728
 msgid "{days} days ago"
 msgstr ""
 
-#: js/js.js:726
+#: js/js.js:729
 msgid "last month"
 msgstr ""
 
-#: js/js.js:727
+#: js/js.js:730
 msgid "{months} months ago"
 msgstr ""
 
-#: js/js.js:728
+#: js/js.js:731
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:729
+#: js/js.js:732
 msgid "last year"
 msgstr ""
 
-#: js/js.js:730
+#: js/js.js:733
 msgid "years ago"
 msgstr ""
 
@@ -225,8 +225,8 @@ msgstr ""
 #: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
 #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:577
-#: js/share.js:589
+#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:620
+#: js/share.js:632
 msgid "Error"
 msgstr ""
 
@@ -246,7 +246,7 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: js/share.js:125 js/share.js:617
+#: js/share.js:125 js/share.js:660
 msgid "Error while sharing"
 msgstr ""
 
@@ -266,99 +266,103 @@ msgstr ""
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:159
+#: js/share.js:172
 msgid "Share with"
 msgstr ""
 
-#: js/share.js:164
+#: js/share.js:177
 msgid "Share with link"
 msgstr ""
 
-#: js/share.js:167
+#: js/share.js:180
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:169 templates/installation.php:54 templates/login.php:26
+#: js/share.js:182 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr ""
 
-#: js/share.js:173
+#: js/share.js:187
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:191
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:174
+#: js/share.js:192
 msgid "Send"
 msgstr ""
 
-#: js/share.js:178
+#: js/share.js:197
 msgid "Set expiration date"
 msgstr ""
 
-#: js/share.js:179
+#: js/share.js:198
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:211
+#: js/share.js:230
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:213
+#: js/share.js:232
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:251
+#: js/share.js:270
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:287
+#: js/share.js:306
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:308
+#: js/share.js:327
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:320
+#: js/share.js:339
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:322
+#: js/share.js:341
 msgid "access control"
 msgstr ""
 
-#: js/share.js:325
+#: js/share.js:344
 msgid "create"
 msgstr ""
 
-#: js/share.js:328
+#: js/share.js:347
 msgid "update"
 msgstr ""
 
-#: js/share.js:331
+#: js/share.js:350
 msgid "delete"
 msgstr ""
 
-#: js/share.js:334
+#: js/share.js:353
 msgid "share"
 msgstr ""
 
-#: js/share.js:368 js/share.js:564
+#: js/share.js:387 js/share.js:607
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:577
+#: js/share.js:620
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:589
+#: js/share.js:632
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:604
+#: js/share.js:647
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:615
+#: js/share.js:658
 msgid "Email sent"
 msgstr ""
 
@@ -373,7 +377,7 @@ msgstr ""
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
-#: lostpassword/controller.php:58
+#: lostpassword/controller.php:60
 msgid "ownCloud password reset"
 msgstr ""
 
@@ -403,17 +407,17 @@ msgstr ""
 
 #: lostpassword/templates/lostpassword.php:22
 msgid ""
-"Your files seems to be encrypted. If you didn't have enabled the recovery "
-"key there will be no way to get your data back once the password was "
-"resetted. If you are not sure what to do, please contact your administrator "
-"first before continue. Do you really want to continue?"
+"Your files are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
 msgstr ""
 
 #: lostpassword/templates/lostpassword.php:24
 msgid "Yes, I really want to reset my password now"
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:29
+#: lostpassword/templates/lostpassword.php:27
 msgid "Request reset"
 msgstr ""
 
@@ -461,7 +465,7 @@ msgstr ""
 msgid "Cloud not found"
 msgstr ""
 
-#: templates/altmail.php:2
+#: templates/altmail.php:4
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -472,10 +476,6 @@ msgid ""
 "Cheers!"
 msgstr ""
 
-#: templates/altmail.php:7 templates/mail.php:24
-msgid "web services under your control"
-msgstr ""
-
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
 msgstr ""
@@ -568,12 +568,12 @@ msgstr ""
 msgid "Finish setup"
 msgstr ""
 
-#: templates/layout.user.php:40
+#: templates/layout.user.php:43
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:67
+#: templates/layout.user.php:68
 msgid "Log out"
 msgstr ""
 
@@ -607,7 +607,7 @@ msgstr ""
 msgid "Alternative Logins"
 msgstr ""
 
-#: templates/mail.php:15
+#: templates/mail.php:16
 #, php-format
 msgid ""
 "Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
diff --git a/l10n/sw_KE/files.po b/l10n/sw_KE/files.po
index 838ddc4ca6120b8af3d3b0b1de067986f88565f2..024ede3858ba567a28822cb31a50db11c8f12d6d 100644
--- a/l10n/sw_KE/files.po
+++ b/l10n/sw_KE/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-25 02:01+0200\n"
-"PO-Revision-Date: 2013-05-24 13:26+0000\n"
+"POT-Creation-Date: 2013-07-04 09:30+0200\n"
+"PO-Revision-Date: 2013-07-04 07:31+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Swahili (Kenya) (http://www.transifex.com/projects/p/owncloud/language/sw_KE/)\n"
 "MIME-Version: 1.0\n"
@@ -27,46 +27,54 @@ msgstr ""
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/upload.php:19
+#: ajax/upload.php:16 ajax/upload.php:39
+msgid "Unable to set upload directory."
+msgstr ""
+
+#: ajax/upload.php:23
+msgid "Invalid Token"
+msgstr ""
+
+#: ajax/upload.php:55
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: ajax/upload.php:26
+#: ajax/upload.php:62
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/upload.php:27
+#: ajax/upload.php:63
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:29
+#: ajax/upload.php:65
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/upload.php:30
+#: ajax/upload.php:66
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/upload.php:31
+#: ajax/upload.php:67
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/upload.php:32
+#: ajax/upload.php:68
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/upload.php:33
+#: ajax/upload.php:69
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:51
+#: ajax/upload.php:87
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:83
+#: ajax/upload.php:119
 msgid "Invalid directory."
 msgstr ""
 
@@ -74,6 +82,36 @@ msgstr ""
 msgid "Files"
 msgstr ""
 
+#: js/file-upload.js:11
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/file-upload.js:24
+msgid "Not enough space available"
+msgstr ""
+
+#: js/file-upload.js:64
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/file-upload.js:167 js/files.js:266
+msgid ""
+"File upload is in progress. Leaving the page now will cancel the upload."
+msgstr ""
+
+#: js/file-upload.js:233 js/files.js:339
+msgid "URL cannot be empty."
+msgstr ""
+
+#: js/file-upload.js:238 lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr ""
+
+#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
+#: js/files.js:693 js/files.js:731
+msgid "Error"
+msgstr ""
+
 #: js/fileactions.js:116
 msgid "Share"
 msgstr ""
@@ -90,43 +128,43 @@ msgstr ""
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:464
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:259
+#: js/filelist.js:302
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:306
+#: js/filelist.js:349
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:306
+#: js/filelist.js:349
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:331
+#: js/filelist.js:374
 msgid "perform delete operation"
 msgstr ""
 
-#: js/filelist.js:413
+#: js/filelist.js:456
 msgid "1 file uploading"
 msgstr ""
 
-#: js/filelist.js:416 js/filelist.js:470
+#: js/filelist.js:459 js/filelist.js:517
 msgid "files uploading"
 msgstr ""
 
@@ -158,69 +196,41 @@ msgid ""
 "big."
 msgstr ""
 
-#: js/files.js:264
-msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr ""
-
-#: js/files.js:277
-msgid "Not enough space available"
-msgstr ""
-
-#: js/files.js:317
-msgid "Upload cancelled."
-msgstr ""
-
-#: js/files.js:413
-msgid ""
-"File upload is in progress. Leaving the page now will cancel the upload."
-msgstr ""
-
-#: js/files.js:486
-msgid "URL cannot be empty."
-msgstr ""
-
-#: js/files.js:491
+#: js/files.js:344
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
-msgid "Error"
-msgstr ""
-
-#: js/files.js:877 templates/index.php:69
+#: js/files.js:744 templates/index.php:69
 msgid "Name"
 msgstr ""
 
-#: js/files.js:878 templates/index.php:80
+#: js/files.js:745 templates/index.php:80
 msgid "Size"
 msgstr ""
 
-#: js/files.js:879 templates/index.php:82
+#: js/files.js:746 templates/index.php:82
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:898
+#: js/files.js:765
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:900
+#: js/files.js:767
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:908
+#: js/files.js:775
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:910
+#: js/files.js:777
 msgid "{count} files"
 msgstr ""
 
-#: lib/app.php:53
-msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
-msgstr ""
-
 #: lib/app.php:73
-msgid "Unable to rename file"
+#, php-format
+msgid "%s could not be renamed"
 msgstr ""
 
 #: lib/helper.php:11 templates/index.php:18
@@ -317,6 +327,22 @@ msgstr ""
 msgid "Current scanning"
 msgstr ""
 
+#: templates/part.list.php:78
+msgid "directory"
+msgstr ""
+
+#: templates/part.list.php:80
+msgid "directories"
+msgstr ""
+
+#: templates/part.list.php:89
+msgid "file"
+msgstr ""
+
+#: templates/part.list.php:91
+msgid "files"
+msgstr ""
+
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
 msgstr ""
diff --git a/l10n/sw_KE/files_encryption.po b/l10n/sw_KE/files_encryption.po
index 2eb5754f9b3d0dda3f8c34af6a75b2eacf6a6070..50c13bf25ed458b5064a4cb6225f9683bc027fc4 100644
--- a/l10n/sw_KE/files_encryption.po
+++ b/l10n/sw_KE/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-14 02:46+0200\n"
-"PO-Revision-Date: 2013-06-14 00:47+0000\n"
+"POT-Creation-Date: 2013-07-05 02:12+0200\n"
+"PO-Revision-Date: 2013-07-05 00:13+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Swahili (Kenya) (http://www.transifex.com/projects/p/owncloud/language/sw_KE/)\n"
 "MIME-Version: 1.0\n"
@@ -55,9 +55,21 @@ msgstr ""
 
 #: files/error.php:7
 msgid ""
-"Your private key is not valid! Maybe your password was changed from outside."
-" You can update your private key password in your personal settings to "
-"regain access to your files"
+"Your private key is not valid! Likely your password was changed outside the "
+"ownCloud system (e.g. your corporate directory). You can update your private"
+" key password in your personal settings to recover access to your encrypted "
+"files."
+msgstr ""
+
+#: hooks/hooks.php:44
+msgid "Missing requirements."
+msgstr ""
+
+#: hooks/hooks.php:45
+msgid ""
+"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL "
+"PHP extension is enabled and configured properly. For now, the encryption "
+"app has been disabled."
 msgstr ""
 
 #: js/settings-admin.js:11
@@ -84,11 +96,11 @@ msgstr ""
 
 #: templates/settings-admin.php:10
 msgid ""
-"Enable encryption passwords recovery key (allow sharing to recovery key):"
+"Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
 #: templates/settings-admin.php:14
-msgid "Recovery account password"
+msgid "Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:21 templates/settings-personal.php:54
@@ -100,15 +112,15 @@ msgid "Disabled"
 msgstr ""
 
 #: templates/settings-admin.php:34
-msgid "Change encryption passwords recovery key:"
+msgid "Change recovery key password:"
 msgstr ""
 
 #: templates/settings-admin.php:41
-msgid "Old Recovery account password"
+msgid "Old Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:48
-msgid "New Recovery account password"
+msgid "New Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:53
diff --git a/l10n/sw_KE/files_sharing.po b/l10n/sw_KE/files_sharing.po
index aa7674bece00fe3c00bc354121cbd40a3f782c46..5e4f08ccb5228611130cbc5d8720b50452fa08ed 100644
--- a/l10n/sw_KE/files_sharing.po
+++ b/l10n/sw_KE/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-14 02:47+0200\n"
-"PO-Revision-Date: 2013-06-14 00:47+0000\n"
+"POT-Creation-Date: 2013-07-05 02:13+0200\n"
+"PO-Revision-Date: 2013-07-05 00:13+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Swahili (Kenya) (http://www.transifex.com/projects/p/owncloud/language/sw_KE/)\n"
 "MIME-Version: 1.0\n"
@@ -18,27 +18,39 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: templates/authenticate.php:4
+msgid "The password is wrong. Try again."
+msgstr ""
+
+#: templates/authenticate.php:7
 msgid "Password"
 msgstr ""
 
-#: templates/authenticate.php:6
+#: templates/authenticate.php:9
 msgid "Submit"
 msgstr ""
 
-#: templates/public.php:10
+#: templates/public.php:17
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr ""
 
-#: templates/public.php:13
+#: templates/public.php:20
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr ""
 
-#: templates/public.php:19 templates/public.php:43
+#: templates/public.php:28 templates/public.php:86
 msgid "Download"
 msgstr ""
 
-#: templates/public.php:40
+#: templates/public.php:44
+msgid "Upload"
+msgstr ""
+
+#: templates/public.php:54
+msgid "Cancel upload"
+msgstr ""
+
+#: templates/public.php:83
 msgid "No preview available for"
 msgstr ""
diff --git a/l10n/sw_KE/lib.po b/l10n/sw_KE/lib.po
index 1b46612b1c1220fa437778f82abebb142724c988..cf3d110e8eb3765c2e38597e5272b72ed91da91a 100644
--- a/l10n/sw_KE/lib.po
+++ b/l10n/sw_KE/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-25 02:02+0200\n"
-"PO-Revision-Date: 2013-05-24 13:27+0000\n"
+"POT-Creation-Date: 2013-07-05 02:13+0200\n"
+"PO-Revision-Date: 2013-07-05 00:13+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Swahili (Kenya) (http://www.transifex.com/projects/p/owncloud/language/sw_KE/)\n"
 "MIME-Version: 1.0\n"
@@ -17,47 +17,51 @@ msgstr ""
 "Language: sw_KE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:357
+#: app.php:360
 msgid "Help"
 msgstr ""
 
-#: app.php:370
+#: app.php:373
 msgid "Personal"
 msgstr ""
 
-#: app.php:381
+#: app.php:384
 msgid "Settings"
 msgstr ""
 
-#: app.php:393
+#: app.php:396
 msgid "Users"
 msgstr ""
 
-#: app.php:406
+#: app.php:409
 msgid "Apps"
 msgstr ""
 
-#: app.php:414
+#: app.php:417
 msgid "Admin"
 msgstr ""
 
-#: files.php:207
+#: defaults.php:33
+msgid "web services under your control"
+msgstr ""
+
+#: files.php:210
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: files.php:208
+#: files.php:211
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:209 files.php:242
+#: files.php:212 files.php:245
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:239
+#: files.php:242
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
-#: helper.php:228
+#: helper.php:236
 msgid "couldn't be determined"
 msgstr ""
 
@@ -85,104 +89,102 @@ msgstr ""
 msgid "Images"
 msgstr ""
 
-#: setup.php:34
-msgid "Set an admin username."
-msgstr ""
-
-#: setup.php:37
-msgid "Set an admin password."
-msgstr ""
-
-#: setup.php:55
+#: setup/abstractdatabase.php:22
 #, php-format
 msgid "%s enter the database username."
 msgstr ""
 
-#: setup.php:58
+#: setup/abstractdatabase.php:25
 #, php-format
 msgid "%s enter the database name."
 msgstr ""
 
-#: setup.php:61
+#: setup/abstractdatabase.php:28
 #, php-format
 msgid "%s you may not use dots in the database name"
 msgstr ""
 
-#: setup.php:64
+#: setup/mssql.php:20
 #, php-format
-msgid "%s set the database host."
-msgstr ""
-
-#: setup.php:132 setup.php:329 setup.php:374
-msgid "PostgreSQL username and/or password not valid"
+msgid "MS SQL username and/or password not valid: %s"
 msgstr ""
 
-#: setup.php:133 setup.php:238
+#: setup/mssql.php:21 setup/mysql.php:13 setup/oci.php:114
+#: setup/postgresql.php:24 setup/postgresql.php:70
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:155
-msgid "Oracle connection could not be established"
-msgstr ""
-
-#: setup.php:237
+#: setup/mysql.php:12
 msgid "MySQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
-#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
-#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
-#: setup.php:623
+#: setup/mysql.php:67 setup/oci.php:54 setup/oci.php:121 setup/oci.php:147
+#: setup/oci.php:154 setup/oci.php:165 setup/oci.php:172 setup/oci.php:181
+#: setup/oci.php:189 setup/oci.php:198 setup/oci.php:204
+#: setup/postgresql.php:89 setup/postgresql.php:98 setup/postgresql.php:115
+#: setup/postgresql.php:125 setup/postgresql.php:134
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr ""
 
-#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
-#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
-#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
+#: setup/mysql.php:68 setup/oci.php:55 setup/oci.php:122 setup/oci.php:148
+#: setup/oci.php:155 setup/oci.php:166 setup/oci.php:182 setup/oci.php:190
+#: setup/oci.php:199 setup/postgresql.php:90 setup/postgresql.php:99
+#: setup/postgresql.php:116 setup/postgresql.php:126 setup/postgresql.php:135
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:308
+#: setup/mysql.php:85
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:309
+#: setup/mysql.php:86
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:314
+#: setup/mysql.php:91
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:315
+#: setup/mysql.php:92
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:466 setup.php:533
+#: setup/oci.php:34
+msgid "Oracle connection could not be established"
+msgstr ""
+
+#: setup/oci.php:41 setup/oci.php:113
 msgid "Oracle username and/or password not valid"
 msgstr ""
 
-#: setup.php:592 setup.php:624
+#: setup/oci.php:173 setup/oci.php:205
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:644
-#, php-format
-msgid "MS SQL username and/or password not valid: %s"
+#: setup/postgresql.php:23 setup/postgresql.php:69
+msgid "PostgreSQL username and/or password not valid"
+msgstr ""
+
+#: setup.php:42
+msgid "Set an admin username."
+msgstr ""
+
+#: setup.php:45
+msgid "Set an admin password."
 msgstr ""
 
-#: setup.php:867
+#: setup.php:198
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:868
+#: setup.php:199
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
diff --git a/l10n/sw_KE/settings.po b/l10n/sw_KE/settings.po
index 668dde05ff3aa11293222855e9ec1e01b8fae432..cabca70f94809300f844b4e25096fed60721995f 100644
--- a/l10n/sw_KE/settings.po
+++ b/l10n/sw_KE/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-11 01:57+0200\n"
-"PO-Revision-Date: 2013-06-10 23:57+0000\n"
+"POT-Creation-Date: 2013-07-09 02:04+0200\n"
+"PO-Revision-Date: 2013-07-09 00:04+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Swahili (Kenya) (http://www.transifex.com/projects/p/owncloud/language/sw_KE/)\n"
 "MIME-Version: 1.0\n"
@@ -58,7 +58,7 @@ msgstr ""
 msgid "Unable to delete group"
 msgstr ""
 
-#: ajax/removeuser.php:24
+#: ajax/removeuser.php:25
 msgid "Unable to delete user"
 msgstr ""
 
@@ -88,35 +88,35 @@ msgstr ""
 msgid "Couldn't update app."
 msgstr ""
 
-#: js/apps.js:30
+#: js/apps.js:35
 msgid "Update to {appversion}"
 msgstr ""
 
-#: js/apps.js:36 js/apps.js:76
+#: js/apps.js:41 js/apps.js:81
 msgid "Disable"
 msgstr ""
 
-#: js/apps.js:36 js/apps.js:64 js/apps.js:83
+#: js/apps.js:41 js/apps.js:69 js/apps.js:88
 msgid "Enable"
 msgstr ""
 
-#: js/apps.js:55
+#: js/apps.js:60
 msgid "Please wait...."
 msgstr ""
 
-#: js/apps.js:59 js/apps.js:71 js/apps.js:80 js/apps.js:93
+#: js/apps.js:64 js/apps.js:76 js/apps.js:85 js/apps.js:98
 msgid "Error"
 msgstr ""
 
-#: js/apps.js:90
+#: js/apps.js:95
 msgid "Updating...."
 msgstr ""
 
-#: js/apps.js:93
+#: js/apps.js:98
 msgid "Error while updating app"
 msgstr ""
 
-#: js/apps.js:96
+#: js/apps.js:101
 msgid "Updated"
 msgstr ""
 
@@ -165,15 +165,15 @@ msgstr ""
 msgid "A valid password must be provided"
 msgstr ""
 
-#: personal.php:35 personal.php:36
+#: personal.php:37 personal.php:38
 msgid "__language_name__"
 msgstr ""
 
-#: templates/admin.php:15
+#: templates/admin.php:17
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:18
+#: templates/admin.php:20
 msgid ""
 "Your data directory and your files are probably accessible from the "
 "internet. The .htaccess file that ownCloud provides is not working. We "
@@ -182,36 +182,36 @@ msgid ""
 " webserver document root."
 msgstr ""
 
-#: templates/admin.php:29
+#: templates/admin.php:31
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:32
+#: templates/admin.php:34
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: templates/admin.php:33
+#: templates/admin.php:35
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:44
+#: templates/admin.php:46
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:47
+#: templates/admin.php:49
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr ""
 
-#: templates/admin.php:58
+#: templates/admin.php:60
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:63
+#: templates/admin.php:65
 #, php-format
 msgid ""
 "This ownCloud server can't set system locale to %s. This means that there "
@@ -219,11 +219,11 @@ msgid ""
 " to install the required packages on your system to support %s."
 msgstr ""
 
-#: templates/admin.php:75
+#: templates/admin.php:77
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:78
+#: templates/admin.php:80
 msgid ""
 "This ownCloud server has no working internet connection. This means that "
 "some of the features like mounting of external storage, notifications about "
@@ -233,102 +233,102 @@ msgid ""
 " of ownCloud."
 msgstr ""
 
-#: templates/admin.php:92
+#: templates/admin.php:94
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:101
+#: templates/admin.php:103
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:111
+#: templates/admin.php:113
 msgid ""
 "cron.php is registered at a webcron service. Call the cron.php page in the "
 "owncloud root once a minute over http."
 msgstr ""
 
-#: templates/admin.php:121
+#: templates/admin.php:123
 msgid ""
 "Use systems cron service. Call the cron.php file in the owncloud folder via "
 "a system cronjob once a minute."
 msgstr ""
 
-#: templates/admin.php:128
+#: templates/admin.php:130
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:134
+#: templates/admin.php:136
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:135
+#: templates/admin.php:137
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:142
+#: templates/admin.php:144
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:143
+#: templates/admin.php:145
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:150
+#: templates/admin.php:152
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:151
+#: templates/admin.php:153
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:158
+#: templates/admin.php:160
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:161
+#: templates/admin.php:163
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:168
+#: templates/admin.php:170
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:181
+#: templates/admin.php:183
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:182
+#: templates/admin.php:184
 msgid ""
 "Enforces the clients to connect to ownCloud via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:185
+#: templates/admin.php:187
 msgid ""
 "Please connect to this ownCloud instance via HTTPS to enable or disable the "
 "SSL enforcement."
 msgstr ""
 
-#: templates/admin.php:195
+#: templates/admin.php:197
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:196
+#: templates/admin.php:198
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:227
+#: templates/admin.php:229
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:228
+#: templates/admin.php:230
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:235 templates/personal.php:111
+#: templates/admin.php:236 templates/personal.php:116
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:237 templates/personal.php:114
+#: templates/admin.php:240 templates/personal.php:119
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -338,27 +338,27 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr ""
 
-#: templates/apps.php:11
+#: templates/apps.php:13
 msgid "Add your App"
 msgstr ""
 
-#: templates/apps.php:12
+#: templates/apps.php:28
 msgid "More Apps"
 msgstr ""
 
-#: templates/apps.php:28
+#: templates/apps.php:33
 msgid "Select an App"
 msgstr ""
 
-#: templates/apps.php:34
+#: templates/apps.php:39
 msgid "See application page at apps.owncloud.com"
 msgstr ""
 
-#: templates/apps.php:36
+#: templates/apps.php:41
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr ""
 
-#: templates/apps.php:38
+#: templates/apps.php:43
 msgid "Update"
 msgstr ""
 
@@ -386,76 +386,79 @@ msgstr ""
 msgid "Commercial Support"
 msgstr ""
 
-#: templates/personal.php:8
-#, php-format
-msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
-msgstr ""
-
-#: templates/personal.php:15
+#: templates/personal.php:10
 msgid "Get the apps to sync your files"
 msgstr ""
 
-#: templates/personal.php:26
+#: templates/personal.php:21
 msgid "Show First Run Wizard again"
 msgstr ""
 
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:29
+#, php-format
+msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
+msgstr ""
+
+#: templates/personal.php:41 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr ""
 
-#: templates/personal.php:38
+#: templates/personal.php:42
 msgid "Your password was changed"
 msgstr ""
 
-#: templates/personal.php:39
+#: templates/personal.php:43
 msgid "Unable to change your password"
 msgstr ""
 
-#: templates/personal.php:40
+#: templates/personal.php:44
 msgid "Current password"
 msgstr ""
 
-#: templates/personal.php:42
+#: templates/personal.php:46
 msgid "New password"
 msgstr ""
 
-#: templates/personal.php:44
+#: templates/personal.php:48
 msgid "Change password"
 msgstr ""
 
-#: templates/personal.php:56 templates/users.php:85
+#: templates/personal.php:60 templates/users.php:85
 msgid "Display Name"
 msgstr ""
 
-#: templates/personal.php:71
+#: templates/personal.php:75
 msgid "Email"
 msgstr ""
 
-#: templates/personal.php:73
+#: templates/personal.php:77
 msgid "Your email address"
 msgstr ""
 
-#: templates/personal.php:74
+#: templates/personal.php:78
 msgid "Fill in an email address to enable password recovery"
 msgstr ""
 
-#: templates/personal.php:83 templates/personal.php:84
+#: templates/personal.php:87 templates/personal.php:88
 msgid "Language"
 msgstr ""
 
-#: templates/personal.php:95
+#: templates/personal.php:100
 msgid "Help translate"
 msgstr ""
 
-#: templates/personal.php:100
+#: templates/personal.php:106
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:102
-msgid "Use this address to connect to your ownCloud in your file manager"
+#: templates/personal.php:108
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
+"target=\"_blank\">access your Files via WebDAV</a>"
 msgstr ""
 
-#: templates/users.php:21 templates/users.php:84
+#: templates/users.php:21
 msgid "Login Name"
 msgstr ""
 
@@ -485,6 +488,10 @@ msgstr ""
 msgid "Other"
 msgstr ""
 
+#: templates/users.php:84
+msgid "Username"
+msgstr ""
+
 #: templates/users.php:91
 msgid "Storage"
 msgstr ""
diff --git a/l10n/ta_LK/core.po b/l10n/ta_LK/core.po
index b6c7984a6f498f08f53402cb53ea061e5dee8248..edf88955463628b4068f14536dd32ccae58e3fbb 100644
--- a/l10n/ta_LK/core.po
+++ b/l10n/ta_LK/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
 "MIME-Version: 1.0\n"
@@ -61,135 +61,135 @@ msgstr "நீக்குவதற்கு எந்தப் பிரிவ
 msgid "Error removing %s from favorites."
 msgstr "விருப்பத்திலிருந்து %s ஐ அகற்றுவதில் வழு.உஇஇ"
 
-#: js/config.php:34
+#: js/config.php:32
 msgid "Sunday"
 msgstr "ஞாயிற்றுக்கிழமை"
 
-#: js/config.php:35
+#: js/config.php:33
 msgid "Monday"
 msgstr "திங்கட்கிழமை"
 
-#: js/config.php:36
+#: js/config.php:34
 msgid "Tuesday"
 msgstr "செவ்வாய்க்கிழமை"
 
-#: js/config.php:37
+#: js/config.php:35
 msgid "Wednesday"
 msgstr "புதன்கிழமை"
 
-#: js/config.php:38
+#: js/config.php:36
 msgid "Thursday"
 msgstr "வியாழக்கிழமை"
 
-#: js/config.php:39
+#: js/config.php:37
 msgid "Friday"
 msgstr "வெள்ளிக்கிழமை"
 
-#: js/config.php:40
+#: js/config.php:38
 msgid "Saturday"
 msgstr "சனிக்கிழமை"
 
-#: js/config.php:45
+#: js/config.php:43
 msgid "January"
 msgstr "தை"
 
-#: js/config.php:46
+#: js/config.php:44
 msgid "February"
 msgstr "மாசி"
 
-#: js/config.php:47
+#: js/config.php:45
 msgid "March"
 msgstr "பங்குனி"
 
-#: js/config.php:48
+#: js/config.php:46
 msgid "April"
 msgstr "சித்திரை"
 
-#: js/config.php:49
+#: js/config.php:47
 msgid "May"
 msgstr "வைகாசி"
 
-#: js/config.php:50
+#: js/config.php:48
 msgid "June"
 msgstr "ஆனி"
 
-#: js/config.php:51
+#: js/config.php:49
 msgid "July"
 msgstr "ஆடி"
 
-#: js/config.php:52
+#: js/config.php:50
 msgid "August"
 msgstr "ஆவணி"
 
-#: js/config.php:53
+#: js/config.php:51
 msgid "September"
 msgstr "புரட்டாசி"
 
-#: js/config.php:54
+#: js/config.php:52
 msgid "October"
 msgstr "ஐப்பசி"
 
-#: js/config.php:55
+#: js/config.php:53
 msgid "November"
 msgstr "கார்த்திகை"
 
-#: js/config.php:56
+#: js/config.php:54
 msgid "December"
 msgstr "மார்கழி"
 
-#: js/js.js:286
+#: js/js.js:293
 msgid "Settings"
 msgstr "அமைப்புகள்"
 
-#: js/js.js:718
+#: js/js.js:725
 msgid "seconds ago"
 msgstr "செக்கன்களுக்கு முன்"
 
-#: js/js.js:719
+#: js/js.js:726
 msgid "1 minute ago"
 msgstr "1 நிமிடத்திற்கு முன் "
 
-#: js/js.js:720
+#: js/js.js:727
 msgid "{minutes} minutes ago"
 msgstr "{நிமிடங்கள்} நிமிடங்களுக்கு முன் "
 
-#: js/js.js:721
+#: js/js.js:728
 msgid "1 hour ago"
 msgstr "1 மணித்தியாலத்திற்கு முன்"
 
-#: js/js.js:722
+#: js/js.js:729
 msgid "{hours} hours ago"
 msgstr "{மணித்தியாலங்கள்} மணித்தியாலங்களிற்கு முன்"
 
-#: js/js.js:723
+#: js/js.js:730
 msgid "today"
 msgstr "இன்று"
 
-#: js/js.js:724
+#: js/js.js:731
 msgid "yesterday"
 msgstr "நேற்று"
 
-#: js/js.js:725
+#: js/js.js:732
 msgid "{days} days ago"
 msgstr "{நாட்கள்} நாட்களுக்கு முன்"
 
-#: js/js.js:726
+#: js/js.js:733
 msgid "last month"
 msgstr "கடந்த மாதம்"
 
-#: js/js.js:727
+#: js/js.js:734
 msgid "{months} months ago"
 msgstr "{மாதங்கள்} மாதங்களிற்கு முன்"
 
-#: js/js.js:728
+#: js/js.js:735
 msgid "months ago"
 msgstr "மாதங்களுக்கு முன்"
 
-#: js/js.js:729
+#: js/js.js:736
 msgid "last year"
 msgstr "கடந்த வருடம்"
 
-#: js/js.js:730
+#: js/js.js:737
 msgid "years ago"
 msgstr "வருடங்களுக்கு முன்"
 
@@ -225,8 +225,8 @@ msgstr "பொருள் வகை குறிப்பிடப்படவ
 #: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
 #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:577
-#: js/share.js:589
+#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:620
+#: js/share.js:632
 msgid "Error"
 msgstr "வழு"
 
@@ -246,7 +246,7 @@ msgstr ""
 msgid "Share"
 msgstr "பகிர்வு"
 
-#: js/share.js:125 js/share.js:617
+#: js/share.js:125 js/share.js:660
 msgid "Error while sharing"
 msgstr "பகிரும் போதான வழு"
 
@@ -266,99 +266,103 @@ msgstr "உங்களுடனும் குழுவுக்கிடை
 msgid "Shared with you by {owner}"
 msgstr "உங்களுடன் பகிரப்பட்டுள்ளது {உரிமையாளர்}"
 
-#: js/share.js:159
+#: js/share.js:172
 msgid "Share with"
 msgstr "பகிர்தல்"
 
-#: js/share.js:164
+#: js/share.js:177
 msgid "Share with link"
 msgstr "இணைப்புடன் பகிர்தல்"
 
-#: js/share.js:167
+#: js/share.js:180
 msgid "Password protect"
 msgstr "கடவுச்சொல்லை பாதுகாத்தல்"
 
-#: js/share.js:169 templates/installation.php:54 templates/login.php:26
+#: js/share.js:182 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "கடவுச்சொல்"
 
-#: js/share.js:173
+#: js/share.js:187
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:191
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:174
+#: js/share.js:192
 msgid "Send"
 msgstr ""
 
-#: js/share.js:178
+#: js/share.js:197
 msgid "Set expiration date"
 msgstr "காலாவதி தேதியை குறிப்பிடுக"
 
-#: js/share.js:179
+#: js/share.js:198
 msgid "Expiration date"
 msgstr "காலவதியாகும் திகதி"
 
-#: js/share.js:211
+#: js/share.js:230
 msgid "Share via email:"
 msgstr "மின்னஞ்சலினூடான பகிர்வு: "
 
-#: js/share.js:213
+#: js/share.js:232
 msgid "No people found"
 msgstr "நபர்கள் யாரும் இல்லை"
 
-#: js/share.js:251
+#: js/share.js:270
 msgid "Resharing is not allowed"
 msgstr "மீள்பகிர்வதற்கு அனுமதி இல்லை "
 
-#: js/share.js:287
+#: js/share.js:306
 msgid "Shared in {item} with {user}"
 msgstr "{பயனாளர்} உடன் {உருப்படி} பகிரப்பட்டுள்ளது"
 
-#: js/share.js:308
+#: js/share.js:327
 msgid "Unshare"
 msgstr "பகிரப்படாதது"
 
-#: js/share.js:320
+#: js/share.js:339
 msgid "can edit"
 msgstr "தொகுக்க முடியும்"
 
-#: js/share.js:322
+#: js/share.js:341
 msgid "access control"
 msgstr "கட்டுப்பாடான அணுகல்"
 
-#: js/share.js:325
+#: js/share.js:344
 msgid "create"
 msgstr "உருவவாக்கல்"
 
-#: js/share.js:328
+#: js/share.js:347
 msgid "update"
 msgstr "இற்றைப்படுத்தல்"
 
-#: js/share.js:331
+#: js/share.js:350
 msgid "delete"
 msgstr "நீக்குக"
 
-#: js/share.js:334
+#: js/share.js:353
 msgid "share"
 msgstr "பகிர்தல்"
 
-#: js/share.js:368 js/share.js:564
+#: js/share.js:387 js/share.js:607
 msgid "Password protected"
 msgstr "கடவுச்சொல் பாதுகாக்கப்பட்டது"
 
-#: js/share.js:577
+#: js/share.js:620
 msgid "Error unsetting expiration date"
 msgstr "காலாவதியாகும் திகதியை குறிப்பிடாமைக்கான வழு"
 
-#: js/share.js:589
+#: js/share.js:632
 msgid "Error setting expiration date"
 msgstr "காலாவதியாகும் திகதியை குறிப்பிடுவதில் வழு"
 
-#: js/share.js:604
+#: js/share.js:647
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:615
+#: js/share.js:658
 msgid "Email sent"
 msgstr ""
 
@@ -373,7 +377,7 @@ msgstr ""
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
-#: lostpassword/controller.php:58
+#: lostpassword/controller.php:60
 msgid "ownCloud password reset"
 msgstr "ownCloud இன் கடவுச்சொல் மீளமைப்பு"
 
@@ -403,17 +407,17 @@ msgstr "பயனாளர் பெயர்"
 
 #: lostpassword/templates/lostpassword.php:22
 msgid ""
-"Your files seems to be encrypted. If you didn't have enabled the recovery "
-"key there will be no way to get your data back once the password was "
-"resetted. If you are not sure what to do, please contact your administrator "
-"first before continue. Do you really want to continue?"
+"Your files are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
 msgstr ""
 
 #: lostpassword/templates/lostpassword.php:24
 msgid "Yes, I really want to reset my password now"
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:29
+#: lostpassword/templates/lostpassword.php:27
 msgid "Request reset"
 msgstr "கோரிக்கை மீளமைப்பு"
 
@@ -461,7 +465,7 @@ msgstr "அணுக தடை"
 msgid "Cloud not found"
 msgstr "Cloud காணப்படவில்லை"
 
-#: templates/altmail.php:2
+#: templates/altmail.php:4
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -472,10 +476,6 @@ msgid ""
 "Cheers!"
 msgstr ""
 
-#: templates/altmail.php:7 templates/mail.php:24
-msgid "web services under your control"
-msgstr "வலைய சேவைகள் உங்களுடைய கட்டுப்பாட்டின் கீழ் உள்ளது"
-
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
 msgstr "வகைகளை தொகுக்க"
@@ -568,12 +568,12 @@ msgstr "தரவுத்தள ஓம்புனர்"
 msgid "Finish setup"
 msgstr "அமைப்பை முடிக்க"
 
-#: templates/layout.user.php:40
+#: templates/layout.user.php:43
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:67
+#: templates/layout.user.php:68
 msgid "Log out"
 msgstr "விடுபதிகை செய்க"
 
@@ -607,7 +607,7 @@ msgstr "புகுபதிகை"
 msgid "Alternative Logins"
 msgstr ""
 
-#: templates/mail.php:15
+#: templates/mail.php:16
 #, php-format
 msgid ""
 "Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
diff --git a/l10n/ta_LK/files.po b/l10n/ta_LK/files.po
index eeb4f94e824e90a6854f1b5693c383b54f0de93e..ea153deca3ea09ba64ba973dedd9b331ac4145df 100644
--- a/l10n/ta_LK/files.po
+++ b/l10n/ta_LK/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:01+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
 "MIME-Version: 1.0\n"
@@ -27,46 +27,54 @@ msgstr ""
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/upload.php:19
+#: ajax/upload.php:16 ajax/upload.php:45
+msgid "Unable to set upload directory."
+msgstr ""
+
+#: ajax/upload.php:22
+msgid "Invalid Token"
+msgstr ""
+
+#: ajax/upload.php:59
 msgid "No file was uploaded. Unknown error"
 msgstr "ஒரு கோப்பும் பதிவேற்றப்படவில்லை. அறியப்படாத வழு"
 
-#: ajax/upload.php:26
+#: ajax/upload.php:66
 msgid "There is no error, the file uploaded with success"
 msgstr "இங்கு வழு இல்லை, கோப்பு வெற்றிகரமாக பதிவேற்றப்பட்டது"
 
-#: ajax/upload.php:27
+#: ajax/upload.php:67
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:29
+#: ajax/upload.php:69
 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:30
+#: ajax/upload.php:70
 msgid "The uploaded file was only partially uploaded"
 msgstr "பதிவேற்றப்பட்ட கோப்பானது பகுதியாக மட்டுமே பதிவேற்றப்பட்டுள்ளது"
 
-#: ajax/upload.php:31
+#: ajax/upload.php:71
 msgid "No file was uploaded"
 msgstr "எந்த கோப்பும் பதிவேற்றப்படவில்லை"
 
-#: ajax/upload.php:32
+#: ajax/upload.php:72
 msgid "Missing a temporary folder"
 msgstr "ஒரு தற்காலிகமான கோப்புறையை காணவில்லை"
 
-#: ajax/upload.php:33
+#: ajax/upload.php:73
 msgid "Failed to write to disk"
 msgstr "வட்டில் எழுத முடியவில்லை"
 
-#: ajax/upload.php:51
+#: ajax/upload.php:91
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:83
+#: ajax/upload.php:123
 msgid "Invalid directory."
 msgstr ""
 
@@ -74,6 +82,36 @@ msgstr ""
 msgid "Files"
 msgstr "கோப்புகள்"
 
+#: js/file-upload.js:11
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr "அடைவு அல்லது 0 bytes ஐ கொண்டுள்ளதால் உங்களுடைய கோப்பை பதிவேற்ற முடியவில்லை"
+
+#: js/file-upload.js:24
+msgid "Not enough space available"
+msgstr ""
+
+#: js/file-upload.js:64
+msgid "Upload cancelled."
+msgstr "பதிவேற்றல் இரத்து செய்யப்பட்டுள்ளது"
+
+#: js/file-upload.js:167 js/files.js:266
+msgid ""
+"File upload is in progress. Leaving the page now will cancel the upload."
+msgstr "கோப்பு பதிவேற்றம் செயல்பாட்டில் உள்ளது. இந்தப் பக்கத்திலிருந்து வெறியேறுவதானது பதிவேற்றலை இரத்து செய்யும்."
+
+#: js/file-upload.js:233 js/files.js:339
+msgid "URL cannot be empty."
+msgstr "URL  வெறுமையாக இருக்கமுடியாது."
+
+#: js/file-upload.js:238 lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr ""
+
+#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
+#: js/files.js:693 js/files.js:731
+msgid "Error"
+msgstr "வழு"
+
 #: js/fileactions.js:116
 msgid "Share"
 msgstr "பகிர்வு"
@@ -90,43 +128,43 @@ msgstr "நீக்குக"
 msgid "Rename"
 msgstr "பெயர்மாற்றம்"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:464
 msgid "Pending"
 msgstr "நிலுவையிலுள்ள"
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "{new_name} already exists"
 msgstr "{new_name} ஏற்கனவே உள்ளது"
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "replace"
 msgstr "மாற்றிடுக"
 
-#: js/filelist.js:259
+#: js/filelist.js:302
 msgid "suggest name"
 msgstr "பெயரை பரிந்துரைக்க"
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "cancel"
 msgstr "இரத்து செய்க"
 
-#: js/filelist.js:306
+#: js/filelist.js:349
 msgid "replaced {new_name} with {old_name}"
 msgstr "{new_name} ஆனது {old_name} இனால் மாற்றப்பட்டது"
 
-#: js/filelist.js:306
+#: js/filelist.js:349
 msgid "undo"
 msgstr "முன் செயல் நீக்கம் "
 
-#: js/filelist.js:331
+#: js/filelist.js:374
 msgid "perform delete operation"
 msgstr ""
 
-#: js/filelist.js:413
+#: js/filelist.js:456
 msgid "1 file uploading"
 msgstr "1 கோப்பு பதிவேற்றப்படுகிறது"
 
-#: js/filelist.js:416 js/filelist.js:470
+#: js/filelist.js:459 js/filelist.js:517
 msgid "files uploading"
 msgstr ""
 
@@ -158,69 +196,41 @@ msgid ""
 "big."
 msgstr ""
 
-#: js/files.js:264
-msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "அடைவு அல்லது 0 bytes ஐ கொண்டுள்ளதால் உங்களுடைய கோப்பை பதிவேற்ற முடியவில்லை"
-
-#: js/files.js:277
-msgid "Not enough space available"
-msgstr ""
-
-#: js/files.js:317
-msgid "Upload cancelled."
-msgstr "பதிவேற்றல் இரத்து செய்யப்பட்டுள்ளது"
-
-#: js/files.js:413
-msgid ""
-"File upload is in progress. Leaving the page now will cancel the upload."
-msgstr "கோப்பு பதிவேற்றம் செயல்பாட்டில் உள்ளது. இந்தப் பக்கத்திலிருந்து வெறியேறுவதானது பதிவேற்றலை இரத்து செய்யும்."
-
-#: js/files.js:486
-msgid "URL cannot be empty."
-msgstr "URL  வெறுமையாக இருக்கமுடியாது."
-
-#: js/files.js:491
+#: js/files.js:344
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
-msgid "Error"
-msgstr "வழு"
-
-#: js/files.js:877 templates/index.php:69
+#: js/files.js:744 templates/index.php:69
 msgid "Name"
 msgstr "பெயர்"
 
-#: js/files.js:878 templates/index.php:80
+#: js/files.js:745 templates/index.php:80
 msgid "Size"
 msgstr "அளவு"
 
-#: js/files.js:879 templates/index.php:82
+#: js/files.js:746 templates/index.php:82
 msgid "Modified"
 msgstr "மாற்றப்பட்டது"
 
-#: js/files.js:898
+#: js/files.js:765
 msgid "1 folder"
 msgstr "1 கோப்புறை"
 
-#: js/files.js:900
+#: js/files.js:767
 msgid "{count} folders"
 msgstr "{எண்ணிக்கை} கோப்புறைகள்"
 
-#: js/files.js:908
+#: js/files.js:775
 msgid "1 file"
 msgstr "1 கோப்பு"
 
-#: js/files.js:910
+#: js/files.js:777
 msgid "{count} files"
 msgstr "{எண்ணிக்கை} கோப்புகள்"
 
-#: lib/app.php:53
-msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
-msgstr ""
-
 #: lib/app.php:73
-msgid "Unable to rename file"
+#, php-format
+msgid "%s could not be renamed"
 msgstr ""
 
 #: lib/helper.php:11 templates/index.php:18
@@ -317,6 +327,22 @@ msgstr "கோப்புகள் வருடப்படுகின்ற
 msgid "Current scanning"
 msgstr "தற்போது வருடப்படுபவை"
 
+#: templates/part.list.php:76
+msgid "directory"
+msgstr ""
+
+#: templates/part.list.php:78
+msgid "directories"
+msgstr ""
+
+#: templates/part.list.php:87
+msgid "file"
+msgstr ""
+
+#: templates/part.list.php:89
+msgid "files"
+msgstr ""
+
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
 msgstr ""
diff --git a/l10n/ta_LK/files_encryption.po b/l10n/ta_LK/files_encryption.po
index 3185af526cc99cebb8cd1770805733796e1759e5..fc2389171d96517d046f03ecf53684a51b1d565c 100644
--- a/l10n/ta_LK/files_encryption.po
+++ b/l10n/ta_LK/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-14 02:46+0200\n"
-"PO-Revision-Date: 2013-06-14 00:47+0000\n"
+"POT-Creation-Date: 2013-07-05 02:12+0200\n"
+"PO-Revision-Date: 2013-07-05 00:13+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"
@@ -55,9 +55,21 @@ msgstr ""
 
 #: files/error.php:7
 msgid ""
-"Your private key is not valid! Maybe your password was changed from outside."
-" You can update your private key password in your personal settings to "
-"regain access to your files"
+"Your private key is not valid! Likely your password was changed outside the "
+"ownCloud system (e.g. your corporate directory). You can update your private"
+" key password in your personal settings to recover access to your encrypted "
+"files."
+msgstr ""
+
+#: hooks/hooks.php:44
+msgid "Missing requirements."
+msgstr ""
+
+#: hooks/hooks.php:45
+msgid ""
+"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL "
+"PHP extension is enabled and configured properly. For now, the encryption "
+"app has been disabled."
 msgstr ""
 
 #: js/settings-admin.js:11
@@ -84,11 +96,11 @@ msgstr "மறைக்குறியீடு"
 
 #: templates/settings-admin.php:10
 msgid ""
-"Enable encryption passwords recovery key (allow sharing to recovery key):"
+"Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
 #: templates/settings-admin.php:14
-msgid "Recovery account password"
+msgid "Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:21 templates/settings-personal.php:54
@@ -100,15 +112,15 @@ msgid "Disabled"
 msgstr ""
 
 #: templates/settings-admin.php:34
-msgid "Change encryption passwords recovery key:"
+msgid "Change recovery key password:"
 msgstr ""
 
 #: templates/settings-admin.php:41
-msgid "Old Recovery account password"
+msgid "Old Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:48
-msgid "New Recovery account password"
+msgid "New Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:53
diff --git a/l10n/ta_LK/files_external.po b/l10n/ta_LK/files_external.po
index 8b71c9f5eafc0b77a10cf74a6c17e7cf080b2c66..83d56773d6101c359782c95f07ad845952a32eaf 100644
--- a/l10n/ta_LK/files_external.po
+++ b/l10n/ta_LK/files_external.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/ta_LK/files_sharing.po b/l10n/ta_LK/files_sharing.po
index 9adeae93e1d530f3f4ea36850cca5c8668f32b7c..4c8ca73bd771a8054715e9cab727c414468740e0 100644
--- a/l10n/ta_LK/files_sharing.po
+++ b/l10n/ta_LK/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
 "MIME-Version: 1.0\n"
@@ -18,27 +18,39 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: templates/authenticate.php:4
+msgid "The password is wrong. Try again."
+msgstr ""
+
+#: templates/authenticate.php:7
 msgid "Password"
 msgstr "கடவுச்சொல்"
 
-#: templates/authenticate.php:6
+#: templates/authenticate.php:9
 msgid "Submit"
 msgstr "சமர்ப்பிக்குக"
 
-#: templates/public.php:10
+#: templates/public.php:17
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s கோப்புறையானது %s உடன் பகிரப்பட்டது"
 
-#: templates/public.php:13
+#: templates/public.php:20
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s கோப்பானது %s உடன் பகிரப்பட்டது"
 
-#: templates/public.php:19 templates/public.php:43
+#: templates/public.php:28 templates/public.php:90
 msgid "Download"
 msgstr "பதிவிறக்குக"
 
-#: templates/public.php:40
+#: templates/public.php:45 templates/public.php:48
+msgid "Upload"
+msgstr "பதிவேற்றுக"
+
+#: templates/public.php:58
+msgid "Cancel upload"
+msgstr "பதிவேற்றலை இரத்து செய்க"
+
+#: templates/public.php:87
 msgid "No preview available for"
 msgstr "அதற்கு முன்னோக்கு ஒன்றும் இல்லை"
diff --git a/l10n/ta_LK/files_trashbin.po b/l10n/ta_LK/files_trashbin.po
index 6fbfb622d6dbba99163273ee1a07ecdd874e0998..76b07710fd7ba790923047cff8a1553aca1d7c69 100644
--- a/l10n/ta_LK/files_trashbin.po
+++ b/l10n/ta_LK/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:16+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/ta_LK/lib.po b/l10n/ta_LK/lib.po
index 66f05a3914248faa8fa75f9a08c48b6dcabd1e3a..975877cbabef514ae8944d862ae291f7813ac2b9 100644
--- a/l10n/ta_LK/lib.po
+++ b/l10n/ta_LK/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
 "MIME-Version: 1.0\n"
@@ -17,43 +17,47 @@ msgstr ""
 "Language: ta_LK\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:359
+#: app.php:360
 msgid "Help"
 msgstr "உதவி"
 
-#: app.php:372
+#: app.php:373
 msgid "Personal"
 msgstr "தனிப்பட்ட"
 
-#: app.php:383
+#: app.php:384
 msgid "Settings"
 msgstr "அமைப்புகள்"
 
-#: app.php:395
+#: app.php:396
 msgid "Users"
 msgstr "பயனாளர்"
 
-#: app.php:408
+#: app.php:409
 msgid "Apps"
 msgstr "செயலிகள்"
 
-#: app.php:416
+#: app.php:417
 msgid "Admin"
 msgstr "நிர்வாகம்"
 
-#: files.php:210
+#: defaults.php:33
+msgid "web services under your control"
+msgstr "வலைய சேவைகள் உங்களுடைய கட்டுப்பாட்டின் கீழ் உள்ளது"
+
+#: files.php:226
 msgid "ZIP download is turned off."
 msgstr "வீசொலிப் பூட்டு பதிவிறக்கம் நிறுத்தப்பட்டுள்ளது."
 
-#: files.php:211
+#: files.php:227
 msgid "Files need to be downloaded one by one."
 msgstr "கோப்புகள்ஒன்றன் பின் ஒன்றாக பதிவிறக்கப்படவேண்டும்."
 
-#: files.php:212 files.php:245
+#: files.php:228 files.php:261
 msgid "Back to Files"
 msgstr "கோப்புகளுக்கு செல்க"
 
-#: files.php:242
+#: files.php:258
 msgid "Selected files too large to generate zip file."
 msgstr "வீ சொலிக் கோப்புகளை உருவாக்குவதற்கு தெரிவுசெய்யப்பட்ட கோப்புகள் மிகப்பெரியவை"
 
@@ -85,104 +89,102 @@ msgstr "உரை"
 msgid "Images"
 msgstr "படங்கள்"
 
-#: setup.php:34
-msgid "Set an admin username."
-msgstr ""
-
-#: setup.php:37
-msgid "Set an admin password."
-msgstr ""
-
-#: setup.php:55
+#: setup/abstractdatabase.php:22
 #, php-format
 msgid "%s enter the database username."
 msgstr ""
 
-#: setup.php:58
+#: setup/abstractdatabase.php:25
 #, php-format
 msgid "%s enter the database name."
 msgstr ""
 
-#: setup.php:61
+#: setup/abstractdatabase.php:28
 #, php-format
 msgid "%s you may not use dots in the database name"
 msgstr ""
 
-#: setup.php:64
+#: setup/mssql.php:20
 #, php-format
-msgid "%s set the database host."
-msgstr ""
-
-#: setup.php:126 setup.php:332 setup.php:377
-msgid "PostgreSQL username and/or password not valid"
+msgid "MS SQL username and/or password not valid: %s"
 msgstr ""
 
-#: setup.php:127 setup.php:235
+#: setup/mssql.php:21 setup/mysql.php:13 setup/oci.php:114
+#: setup/postgresql.php:24 setup/postgresql.php:70
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:152
-msgid "Oracle connection could not be established"
-msgstr ""
-
-#: setup.php:234
+#: setup/mysql.php:12
 msgid "MySQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:288 setup.php:398 setup.php:407 setup.php:425 setup.php:435
-#: setup.php:444 setup.php:477 setup.php:543 setup.php:569 setup.php:576
-#: setup.php:587 setup.php:594 setup.php:603 setup.php:611 setup.php:620
-#: setup.php:626
+#: setup/mysql.php:67 setup/oci.php:54 setup/oci.php:121 setup/oci.php:147
+#: setup/oci.php:154 setup/oci.php:165 setup/oci.php:172 setup/oci.php:181
+#: setup/oci.php:189 setup/oci.php:198 setup/oci.php:204
+#: setup/postgresql.php:89 setup/postgresql.php:98 setup/postgresql.php:115
+#: setup/postgresql.php:125 setup/postgresql.php:134
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr ""
 
-#: setup.php:289 setup.php:399 setup.php:408 setup.php:426 setup.php:436
-#: setup.php:445 setup.php:478 setup.php:544 setup.php:570 setup.php:577
-#: setup.php:588 setup.php:604 setup.php:612 setup.php:621
+#: setup/mysql.php:68 setup/oci.php:55 setup/oci.php:122 setup/oci.php:148
+#: setup/oci.php:155 setup/oci.php:166 setup/oci.php:182 setup/oci.php:190
+#: setup/oci.php:199 setup/postgresql.php:90 setup/postgresql.php:99
+#: setup/postgresql.php:116 setup/postgresql.php:126 setup/postgresql.php:135
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:305
+#: setup/mysql.php:85
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:306
+#: setup/mysql.php:86
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:311
+#: setup/mysql.php:91
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:312
+#: setup/mysql.php:92
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:469 setup.php:536
+#: setup/oci.php:34
+msgid "Oracle connection could not be established"
+msgstr ""
+
+#: setup/oci.php:41 setup/oci.php:113
 msgid "Oracle username and/or password not valid"
 msgstr ""
 
-#: setup.php:595 setup.php:627
+#: setup/oci.php:173 setup/oci.php:205
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:647
-#, php-format
-msgid "MS SQL username and/or password not valid: %s"
+#: setup/postgresql.php:23 setup/postgresql.php:69
+msgid "PostgreSQL username and/or password not valid"
+msgstr ""
+
+#: setup.php:42
+msgid "Set an admin username."
+msgstr ""
+
+#: setup.php:45
+msgid "Set an admin password."
 msgstr ""
 
-#: setup.php:870
+#: setup.php:198
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:871
+#: setup.php:199
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
diff --git a/l10n/ta_LK/settings.po b/l10n/ta_LK/settings.po
index 1b64ce2d0f6901c54af8521bff8a93e6aef2f2f1..9bc443abac0b05c047f70901a16dc433eeec7d7f 100644
--- a/l10n/ta_LK/settings.po
+++ b/l10n/ta_LK/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
 "MIME-Version: 1.0\n"
@@ -88,35 +88,35 @@ msgstr "குழு %s இலிருந்து பயனாளரை நீ
 msgid "Couldn't update app."
 msgstr ""
 
-#: js/apps.js:30
+#: js/apps.js:35
 msgid "Update to {appversion}"
 msgstr ""
 
-#: js/apps.js:36 js/apps.js:76
+#: js/apps.js:41 js/apps.js:81
 msgid "Disable"
 msgstr "இயலுமைப்ப"
 
-#: js/apps.js:36 js/apps.js:64 js/apps.js:83
+#: js/apps.js:41 js/apps.js:69 js/apps.js:88
 msgid "Enable"
 msgstr "இயலுமைப்படுத்துக"
 
-#: js/apps.js:55
+#: js/apps.js:60
 msgid "Please wait...."
 msgstr ""
 
-#: js/apps.js:59 js/apps.js:71 js/apps.js:80 js/apps.js:93
+#: js/apps.js:64 js/apps.js:76 js/apps.js:85 js/apps.js:98
 msgid "Error"
 msgstr "வழு"
 
-#: js/apps.js:90
+#: js/apps.js:95
 msgid "Updating...."
 msgstr ""
 
-#: js/apps.js:93
+#: js/apps.js:98
 msgid "Error while updating app"
 msgstr ""
 
-#: js/apps.js:96
+#: js/apps.js:101
 msgid "Updated"
 msgstr ""
 
@@ -165,15 +165,15 @@ msgstr ""
 msgid "A valid password must be provided"
 msgstr ""
 
-#: personal.php:35 personal.php:36
+#: personal.php:37 personal.php:38
 msgid "__language_name__"
 msgstr "_மொழி_பெயர்_"
 
-#: templates/admin.php:15
+#: templates/admin.php:17
 msgid "Security Warning"
 msgstr "பாதுகாப்பு எச்சரிக்கை"
 
-#: templates/admin.php:18
+#: templates/admin.php:20
 msgid ""
 "Your data directory and your files are probably accessible from the "
 "internet. The .htaccess file that ownCloud provides is not working. We "
@@ -182,36 +182,36 @@ msgid ""
 " webserver document root."
 msgstr "உங்களுடைய தரவு அடைவு மற்றும் உங்களுடைய கோப்புக்களை பெரும்பாலும் இணையத்தினூடாக அணுகலாம். ownCloud இனால் வழங்கப்படுகின்ற .htaccess கோப்பு வேலை செய்யவில்லை. தரவு அடைவை நீண்ட நேரத்திற்கு அணுகக்கூடியதாக உங்களுடைய வலைய சேவையகத்தை தகவமைக்குமாறு நாங்கள் உறுதியாக கூறுகிறோம் அல்லது தரவு அடைவை வலைய சேவையக மூல ஆவணத்திலிருந்து வெளியே அகற்றுக.  "
 
-#: templates/admin.php:29
+#: templates/admin.php:31
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:32
+#: templates/admin.php:34
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: templates/admin.php:33
+#: templates/admin.php:35
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:44
+#: templates/admin.php:46
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:47
+#: templates/admin.php:49
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr ""
 
-#: templates/admin.php:58
+#: templates/admin.php:60
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:63
+#: templates/admin.php:65
 #, php-format
 msgid ""
 "This ownCloud server can't set system locale to %s. This means that there "
@@ -219,11 +219,11 @@ msgid ""
 " to install the required packages on your system to support %s."
 msgstr ""
 
-#: templates/admin.php:75
+#: templates/admin.php:77
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:78
+#: templates/admin.php:80
 msgid ""
 "This ownCloud server has no working internet connection. This means that "
 "some of the features like mounting of external storage, notifications about "
@@ -233,102 +233,102 @@ msgid ""
 " of ownCloud."
 msgstr ""
 
-#: templates/admin.php:92
+#: templates/admin.php:94
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:101
+#: templates/admin.php:103
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:111
+#: templates/admin.php:113
 msgid ""
 "cron.php is registered at a webcron service. Call the cron.php page in the "
 "owncloud root once a minute over http."
 msgstr ""
 
-#: templates/admin.php:121
+#: templates/admin.php:123
 msgid ""
 "Use systems cron service. Call the cron.php file in the owncloud folder via "
 "a system cronjob once a minute."
 msgstr ""
 
-#: templates/admin.php:128
+#: templates/admin.php:130
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:134
+#: templates/admin.php:136
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:135
+#: templates/admin.php:137
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:142
+#: templates/admin.php:144
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:143
+#: templates/admin.php:145
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:150
+#: templates/admin.php:152
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:151
+#: templates/admin.php:153
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:158
+#: templates/admin.php:160
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:161
+#: templates/admin.php:163
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:168
+#: templates/admin.php:170
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:181
+#: templates/admin.php:183
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:182
+#: templates/admin.php:184
 msgid ""
 "Enforces the clients to connect to ownCloud via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:185
+#: templates/admin.php:187
 msgid ""
 "Please connect to this ownCloud instance via HTTPS to enable or disable the "
 "SSL enforcement."
 msgstr ""
 
-#: templates/admin.php:195
+#: templates/admin.php:197
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:196
+#: templates/admin.php:198
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:227
+#: templates/admin.php:229
 msgid "More"
 msgstr "மேலதிக"
 
-#: templates/admin.php:228
+#: templates/admin.php:230
 msgid "Less"
 msgstr "குறைவான"
 
-#: templates/admin.php:235 templates/personal.php:116
+#: templates/admin.php:236 templates/personal.php:116
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:237 templates/personal.php:119
+#: templates/admin.php:240 templates/personal.php:119
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -386,76 +386,79 @@ msgstr ""
 msgid "Commercial Support"
 msgstr ""
 
-#: templates/personal.php:9
+#: templates/personal.php:10
 msgid "Get the apps to sync your files"
 msgstr ""
 
-#: templates/personal.php:20
+#: templates/personal.php:21
 msgid "Show First Run Wizard again"
 msgstr ""
 
-#: templates/personal.php:28
+#: templates/personal.php:29
 #, php-format
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "நீங்கள் <strong>%s</strong> இலுள்ள <strong>%s</strong>பயன்படுத்தியுள்ளீர்கள்"
 
-#: templates/personal.php:40 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:41 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "கடவுச்சொல்"
 
-#: templates/personal.php:41
+#: templates/personal.php:42
 msgid "Your password was changed"
 msgstr "உங்களுடைய கடவுச்சொல் மாற்றப்பட்டுள்ளது"
 
-#: templates/personal.php:42
+#: templates/personal.php:43
 msgid "Unable to change your password"
 msgstr "உங்களுடைய கடவுச்சொல்லை மாற்றமுடியாது"
 
-#: templates/personal.php:43
+#: templates/personal.php:44
 msgid "Current password"
 msgstr "தற்போதைய கடவுச்சொல்"
 
-#: templates/personal.php:45
+#: templates/personal.php:46
 msgid "New password"
 msgstr "புதிய கடவுச்சொல்"
 
-#: templates/personal.php:47
+#: templates/personal.php:48
 msgid "Change password"
 msgstr "கடவுச்சொல்லை மாற்றுக"
 
-#: templates/personal.php:59 templates/users.php:85
+#: templates/personal.php:60 templates/users.php:85
 msgid "Display Name"
 msgstr ""
 
-#: templates/personal.php:74
+#: templates/personal.php:75
 msgid "Email"
 msgstr "மின்னஞ்சல்"
 
-#: templates/personal.php:76
+#: templates/personal.php:77
 msgid "Your email address"
 msgstr "உங்களுடைய மின்னஞ்சல் முகவரி"
 
-#: templates/personal.php:77
+#: templates/personal.php:78
 msgid "Fill in an email address to enable password recovery"
 msgstr "கடவுச்சொல் மீள் பெறுவதை இயலுமைப்படுத்துவதற்கு மின்னஞ்சல் முகவரியை இயலுமைப்படுத்துக"
 
-#: templates/personal.php:86 templates/personal.php:87
+#: templates/personal.php:87 templates/personal.php:88
 msgid "Language"
 msgstr "மொழி"
 
-#: templates/personal.php:99
+#: templates/personal.php:100
 msgid "Help translate"
 msgstr "மொழிபெயர்க்க உதவி"
 
-#: templates/personal.php:105
+#: templates/personal.php:106
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:107
-msgid "Use this address to connect to your ownCloud in your file manager"
+#: templates/personal.php:108
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
+"target=\"_blank\">access your Files via WebDAV</a>"
 msgstr ""
 
-#: templates/users.php:21 templates/users.php:84
+#: templates/users.php:21
 msgid "Login Name"
 msgstr ""
 
@@ -485,6 +488,10 @@ msgstr ""
 msgid "Other"
 msgstr "மற்றவை"
 
+#: templates/users.php:84
+msgid "Username"
+msgstr "பயனாளர் பெயர்"
+
 #: templates/users.php:91
 msgid "Storage"
 msgstr ""
diff --git a/l10n/ta_LK/user_ldap.po b/l10n/ta_LK/user_ldap.po
index c71e429591e5c22fa9060f13a1a5cf00def34794..f70519d29b8e2a9ced551f042fe1a4751069dbdb 100644
--- a/l10n/ta_LK/user_ldap.po
+++ b/l10n/ta_LK/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:25+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:16+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/te/core.po b/l10n/te/core.po
index 3621c0e7bf33f2ae321b57890b86b7af22ece929..603fcb98452552b47d772bbd52e8fd89f34416c8 100644
--- a/l10n/te/core.po
+++ b/l10n/te/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:22+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n"
 "MIME-Version: 1.0\n"
@@ -61,135 +61,135 @@ msgstr ""
 msgid "Error removing %s from favorites."
 msgstr ""
 
-#: js/config.php:34
+#: js/config.php:32
 msgid "Sunday"
 msgstr "ఆదివారం"
 
-#: js/config.php:35
+#: js/config.php:33
 msgid "Monday"
 msgstr "సోమవారం"
 
-#: js/config.php:36
+#: js/config.php:34
 msgid "Tuesday"
 msgstr "మంగళవారం"
 
-#: js/config.php:37
+#: js/config.php:35
 msgid "Wednesday"
 msgstr "బుధవారం"
 
-#: js/config.php:38
+#: js/config.php:36
 msgid "Thursday"
 msgstr "గురువారం"
 
-#: js/config.php:39
+#: js/config.php:37
 msgid "Friday"
 msgstr "శుక్రవారం"
 
-#: js/config.php:40
+#: js/config.php:38
 msgid "Saturday"
 msgstr "శనివారం"
 
-#: js/config.php:45
+#: js/config.php:43
 msgid "January"
 msgstr "జనవరి"
 
-#: js/config.php:46
+#: js/config.php:44
 msgid "February"
 msgstr "ఫిబ్రవరి"
 
-#: js/config.php:47
+#: js/config.php:45
 msgid "March"
 msgstr "మార్చి"
 
-#: js/config.php:48
+#: js/config.php:46
 msgid "April"
 msgstr "ఏప్రిల్"
 
-#: js/config.php:49
+#: js/config.php:47
 msgid "May"
 msgstr "మే"
 
-#: js/config.php:50
+#: js/config.php:48
 msgid "June"
 msgstr "జూన్"
 
-#: js/config.php:51
+#: js/config.php:49
 msgid "July"
 msgstr "జూలై"
 
-#: js/config.php:52
+#: js/config.php:50
 msgid "August"
 msgstr "ఆగస్ట్"
 
-#: js/config.php:53
+#: js/config.php:51
 msgid "September"
 msgstr "సెప్టెంబర్"
 
-#: js/config.php:54
+#: js/config.php:52
 msgid "October"
 msgstr "అక్టోబర్"
 
-#: js/config.php:55
+#: js/config.php:53
 msgid "November"
 msgstr "నవంబర్"
 
-#: js/config.php:56
+#: js/config.php:54
 msgid "December"
 msgstr "డిసెంబర్"
 
-#: js/js.js:286
+#: js/js.js:293
 msgid "Settings"
 msgstr "అమరికలు"
 
-#: js/js.js:718
+#: js/js.js:725
 msgid "seconds ago"
 msgstr "క్షణాల క్రితం"
 
-#: js/js.js:719
+#: js/js.js:726
 msgid "1 minute ago"
 msgstr "1 నిమిషం క్రితం"
 
-#: js/js.js:720
+#: js/js.js:727
 msgid "{minutes} minutes ago"
 msgstr "{minutes} నిమిషాల క్రితం"
 
-#: js/js.js:721
+#: js/js.js:728
 msgid "1 hour ago"
 msgstr "1 గంట క్రితం"
 
-#: js/js.js:722
+#: js/js.js:729
 msgid "{hours} hours ago"
 msgstr "{hours} గంటల క్రితం"
 
-#: js/js.js:723
+#: js/js.js:730
 msgid "today"
 msgstr "ఈరోజు"
 
-#: js/js.js:724
+#: js/js.js:731
 msgid "yesterday"
 msgstr "నిన్న"
 
-#: js/js.js:725
+#: js/js.js:732
 msgid "{days} days ago"
 msgstr "{days} రోజుల క్రితం"
 
-#: js/js.js:726
+#: js/js.js:733
 msgid "last month"
 msgstr "పోయిన నెల"
 
-#: js/js.js:727
+#: js/js.js:734
 msgid "{months} months ago"
 msgstr "{months} నెలల క్రితం"
 
-#: js/js.js:728
+#: js/js.js:735
 msgid "months ago"
 msgstr "నెలల క్రితం"
 
-#: js/js.js:729
+#: js/js.js:736
 msgid "last year"
 msgstr "పోయిన సంవత్సరం"
 
-#: js/js.js:730
+#: js/js.js:737
 msgid "years ago"
 msgstr "సంవత్సరాల క్రితం"
 
@@ -225,8 +225,8 @@ msgstr ""
 #: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
 #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:577
-#: js/share.js:589
+#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:620
+#: js/share.js:632
 msgid "Error"
 msgstr "పొరపాటు"
 
@@ -246,7 +246,7 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: js/share.js:125 js/share.js:617
+#: js/share.js:125 js/share.js:660
 msgid "Error while sharing"
 msgstr ""
 
@@ -266,99 +266,103 @@ msgstr ""
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:159
+#: js/share.js:172
 msgid "Share with"
 msgstr ""
 
-#: js/share.js:164
+#: js/share.js:177
 msgid "Share with link"
 msgstr ""
 
-#: js/share.js:167
+#: js/share.js:180
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:169 templates/installation.php:54 templates/login.php:26
+#: js/share.js:182 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "సంకేతపదం"
 
-#: js/share.js:173
+#: js/share.js:187
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:191
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:174
+#: js/share.js:192
 msgid "Send"
 msgstr "పంపించు"
 
-#: js/share.js:178
+#: js/share.js:197
 msgid "Set expiration date"
 msgstr ""
 
-#: js/share.js:179
+#: js/share.js:198
 msgid "Expiration date"
 msgstr "కాలం చెల్లు తేదీ"
 
-#: js/share.js:211
+#: js/share.js:230
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:213
+#: js/share.js:232
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:251
+#: js/share.js:270
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:287
+#: js/share.js:306
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:308
+#: js/share.js:327
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:320
+#: js/share.js:339
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:322
+#: js/share.js:341
 msgid "access control"
 msgstr ""
 
-#: js/share.js:325
+#: js/share.js:344
 msgid "create"
 msgstr ""
 
-#: js/share.js:328
+#: js/share.js:347
 msgid "update"
 msgstr ""
 
-#: js/share.js:331
+#: js/share.js:350
 msgid "delete"
 msgstr "తొలగించు"
 
-#: js/share.js:334
+#: js/share.js:353
 msgid "share"
 msgstr ""
 
-#: js/share.js:368 js/share.js:564
+#: js/share.js:387 js/share.js:607
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:577
+#: js/share.js:620
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:589
+#: js/share.js:632
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:604
+#: js/share.js:647
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:615
+#: js/share.js:658
 msgid "Email sent"
 msgstr ""
 
@@ -373,7 +377,7 @@ msgstr ""
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
-#: lostpassword/controller.php:58
+#: lostpassword/controller.php:60
 msgid "ownCloud password reset"
 msgstr ""
 
@@ -403,17 +407,17 @@ msgstr "వాడుకరి పేరు"
 
 #: lostpassword/templates/lostpassword.php:22
 msgid ""
-"Your files seems to be encrypted. If you didn't have enabled the recovery "
-"key there will be no way to get your data back once the password was "
-"resetted. If you are not sure what to do, please contact your administrator "
-"first before continue. Do you really want to continue?"
+"Your files are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
 msgstr ""
 
 #: lostpassword/templates/lostpassword.php:24
 msgid "Yes, I really want to reset my password now"
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:29
+#: lostpassword/templates/lostpassword.php:27
 msgid "Request reset"
 msgstr ""
 
@@ -461,7 +465,7 @@ msgstr ""
 msgid "Cloud not found"
 msgstr ""
 
-#: templates/altmail.php:2
+#: templates/altmail.php:4
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -472,10 +476,6 @@ msgid ""
 "Cheers!"
 msgstr ""
 
-#: templates/altmail.php:7 templates/mail.php:24
-msgid "web services under your control"
-msgstr ""
-
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
 msgstr ""
@@ -568,12 +568,12 @@ msgstr ""
 msgid "Finish setup"
 msgstr ""
 
-#: templates/layout.user.php:40
+#: templates/layout.user.php:43
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:67
+#: templates/layout.user.php:68
 msgid "Log out"
 msgstr "నిష్క్రమించు"
 
@@ -607,7 +607,7 @@ msgstr ""
 msgid "Alternative Logins"
 msgstr ""
 
-#: templates/mail.php:15
+#: templates/mail.php:16
 #, php-format
 msgid ""
 "Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
diff --git a/l10n/te/files.po b/l10n/te/files.po
index 2d8be8431ef1c2e4eb8342c1d687a2c95daa6cf6..8b385ace49416aa662a2283ef172ef1495a55738 100644
--- a/l10n/te/files.po
+++ b/l10n/te/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:01+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n"
 "MIME-Version: 1.0\n"
@@ -27,46 +27,54 @@ msgstr ""
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/upload.php:19
+#: ajax/upload.php:16 ajax/upload.php:45
+msgid "Unable to set upload directory."
+msgstr ""
+
+#: ajax/upload.php:22
+msgid "Invalid Token"
+msgstr ""
+
+#: ajax/upload.php:59
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: ajax/upload.php:26
+#: ajax/upload.php:66
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/upload.php:27
+#: ajax/upload.php:67
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:29
+#: ajax/upload.php:69
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/upload.php:30
+#: ajax/upload.php:70
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/upload.php:31
+#: ajax/upload.php:71
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/upload.php:32
+#: ajax/upload.php:72
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/upload.php:33
+#: ajax/upload.php:73
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:51
+#: ajax/upload.php:91
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:83
+#: ajax/upload.php:123
 msgid "Invalid directory."
 msgstr ""
 
@@ -74,6 +82,36 @@ msgstr ""
 msgid "Files"
 msgstr ""
 
+#: js/file-upload.js:11
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/file-upload.js:24
+msgid "Not enough space available"
+msgstr ""
+
+#: js/file-upload.js:64
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/file-upload.js:167 js/files.js:266
+msgid ""
+"File upload is in progress. Leaving the page now will cancel the upload."
+msgstr ""
+
+#: js/file-upload.js:233 js/files.js:339
+msgid "URL cannot be empty."
+msgstr ""
+
+#: js/file-upload.js:238 lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr ""
+
+#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
+#: js/files.js:693 js/files.js:731
+msgid "Error"
+msgstr "పొరపాటు"
+
 #: js/fileactions.js:116
 msgid "Share"
 msgstr ""
@@ -90,43 +128,43 @@ msgstr "తొలగించు"
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:464
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:259
+#: js/filelist.js:302
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "cancel"
 msgstr "రద్దుచేయి"
 
-#: js/filelist.js:306
+#: js/filelist.js:349
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:306
+#: js/filelist.js:349
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:331
+#: js/filelist.js:374
 msgid "perform delete operation"
 msgstr ""
 
-#: js/filelist.js:413
+#: js/filelist.js:456
 msgid "1 file uploading"
 msgstr ""
 
-#: js/filelist.js:416 js/filelist.js:470
+#: js/filelist.js:459 js/filelist.js:517
 msgid "files uploading"
 msgstr ""
 
@@ -158,69 +196,41 @@ msgid ""
 "big."
 msgstr ""
 
-#: js/files.js:264
-msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr ""
-
-#: js/files.js:277
-msgid "Not enough space available"
-msgstr ""
-
-#: js/files.js:317
-msgid "Upload cancelled."
-msgstr ""
-
-#: js/files.js:413
-msgid ""
-"File upload is in progress. Leaving the page now will cancel the upload."
-msgstr ""
-
-#: js/files.js:486
-msgid "URL cannot be empty."
-msgstr ""
-
-#: js/files.js:491
+#: js/files.js:344
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
-msgid "Error"
-msgstr "పొరపాటు"
-
-#: js/files.js:877 templates/index.php:69
+#: js/files.js:744 templates/index.php:69
 msgid "Name"
 msgstr "పేరు"
 
-#: js/files.js:878 templates/index.php:80
+#: js/files.js:745 templates/index.php:80
 msgid "Size"
 msgstr "పరిమాణం"
 
-#: js/files.js:879 templates/index.php:82
+#: js/files.js:746 templates/index.php:82
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:898
+#: js/files.js:765
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:900
+#: js/files.js:767
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:908
+#: js/files.js:775
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:910
+#: js/files.js:777
 msgid "{count} files"
 msgstr ""
 
-#: lib/app.php:53
-msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
-msgstr ""
-
 #: lib/app.php:73
-msgid "Unable to rename file"
+#, php-format
+msgid "%s could not be renamed"
 msgstr ""
 
 #: lib/helper.php:11 templates/index.php:18
@@ -269,7 +279,7 @@ msgstr ""
 
 #: templates/index.php:12
 msgid "Folder"
-msgstr ""
+msgstr "సంచయం"
 
 #: templates/index.php:14
 msgid "From link"
@@ -317,6 +327,22 @@ msgstr ""
 msgid "Current scanning"
 msgstr ""
 
+#: templates/part.list.php:76
+msgid "directory"
+msgstr ""
+
+#: templates/part.list.php:78
+msgid "directories"
+msgstr ""
+
+#: templates/part.list.php:87
+msgid "file"
+msgstr ""
+
+#: templates/part.list.php:89
+msgid "files"
+msgstr ""
+
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
 msgstr ""
diff --git a/l10n/te/files_encryption.po b/l10n/te/files_encryption.po
index ee18899a2bd4843749ff97ba83ec30779af23350..20a34b874a488e7b9fd4404959001fa42cbf47a9 100644
--- a/l10n/te/files_encryption.po
+++ b/l10n/te/files_encryption.po
@@ -3,12 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# వీవెన్ <veeven@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-14 02:46+0200\n"
-"PO-Revision-Date: 2013-06-14 00:47+0000\n"
+"POT-Creation-Date: 2013-07-05 02:12+0200\n"
+"PO-Revision-Date: 2013-07-05 00:13+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n"
 "MIME-Version: 1.0\n"
@@ -55,9 +56,21 @@ msgstr ""
 
 #: files/error.php:7
 msgid ""
-"Your private key is not valid! Maybe your password was changed from outside."
-" You can update your private key password in your personal settings to "
-"regain access to your files"
+"Your private key is not valid! Likely your password was changed outside the "
+"ownCloud system (e.g. your corporate directory). You can update your private"
+" key password in your personal settings to recover access to your encrypted "
+"files."
+msgstr ""
+
+#: hooks/hooks.php:44
+msgid "Missing requirements."
+msgstr ""
+
+#: hooks/hooks.php:45
+msgid ""
+"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL "
+"PHP extension is enabled and configured properly. For now, the encryption "
+"app has been disabled."
 msgstr ""
 
 #: js/settings-admin.js:11
@@ -76,7 +89,7 @@ msgstr ""
 
 #: templates/invalid_private_key.php:7
 msgid "personal settings"
-msgstr ""
+msgstr "వ్యక్తిగత అమరికలు"
 
 #: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
@@ -84,11 +97,11 @@ msgstr ""
 
 #: templates/settings-admin.php:10
 msgid ""
-"Enable encryption passwords recovery key (allow sharing to recovery key):"
+"Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
 #: templates/settings-admin.php:14
-msgid "Recovery account password"
+msgid "Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:21 templates/settings-personal.php:54
@@ -100,15 +113,15 @@ msgid "Disabled"
 msgstr ""
 
 #: templates/settings-admin.php:34
-msgid "Change encryption passwords recovery key:"
+msgid "Change recovery key password:"
 msgstr ""
 
 #: templates/settings-admin.php:41
-msgid "Old Recovery account password"
+msgid "Old Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:48
-msgid "New Recovery account password"
+msgid "New Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:53
diff --git a/l10n/te/files_external.po b/l10n/te/files_external.po
index d2653046ed14d3c0c0e08629980e7f84940de67a..e19b0f7e8d3812b13d0e143db210449d4d304769 100644
--- a/l10n/te/files_external.po
+++ b/l10n/te/files_external.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n"
 "MIME-Version: 1.0\n"
@@ -63,7 +63,7 @@ msgstr ""
 
 #: templates/settings.php:9 templates/settings.php:28
 msgid "Folder name"
-msgstr ""
+msgstr "సంచయం పేరు"
 
 #: templates/settings.php:10
 msgid "External storage"
diff --git a/l10n/te/files_sharing.po b/l10n/te/files_sharing.po
index 5a1f15a0a63e39388c2485823ea803dfa1f63f1f..1016563e1e949763a9de969b2dca3c6a306761d7 100644
--- a/l10n/te/files_sharing.po
+++ b/l10n/te/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-14 02:47+0200\n"
-"PO-Revision-Date: 2013-06-14 00:47+0000\n"
+"POT-Creation-Date: 2013-07-05 02:13+0200\n"
+"PO-Revision-Date: 2013-07-05 00:13+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n"
 "MIME-Version: 1.0\n"
@@ -18,27 +18,39 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: templates/authenticate.php:4
+msgid "The password is wrong. Try again."
+msgstr ""
+
+#: templates/authenticate.php:7
 msgid "Password"
 msgstr "సంకేతపదం"
 
-#: templates/authenticate.php:6
+#: templates/authenticate.php:9
 msgid "Submit"
 msgstr ""
 
-#: templates/public.php:10
+#: templates/public.php:17
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr ""
 
-#: templates/public.php:13
+#: templates/public.php:20
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr ""
 
-#: templates/public.php:19 templates/public.php:43
+#: templates/public.php:28 templates/public.php:86
 msgid "Download"
 msgstr ""
 
-#: templates/public.php:40
+#: templates/public.php:44
+msgid "Upload"
+msgstr ""
+
+#: templates/public.php:54
+msgid "Cancel upload"
+msgstr ""
+
+#: templates/public.php:83
 msgid "No preview available for"
 msgstr ""
diff --git a/l10n/te/files_trashbin.po b/l10n/te/files_trashbin.po
index b4c9da7af40ede5b732e211540a0b476875118b4..3b796ab1021a25636009741b244986a6399ea68a 100644
--- a/l10n/te/files_trashbin.po
+++ b/l10n/te/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:16+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/te/lib.po b/l10n/te/lib.po
index f6a30e2acd0ad9ca062b5409da2536773bf9d70e..b67354d7333aa4a57e6553947c38f31c6c854868 100644
--- a/l10n/te/lib.po
+++ b/l10n/te/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 00:04+0000\n"
+"POT-Creation-Date: 2013-07-09 02:04+0200\n"
+"PO-Revision-Date: 2013-07-09 00:02+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n"
 "MIME-Version: 1.0\n"
@@ -17,30 +17,34 @@ msgstr ""
 "Language: te\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:359
+#: app.php:360
 msgid "Help"
 msgstr "సహాయం"
 
-#: app.php:372
+#: app.php:373
 msgid "Personal"
 msgstr ""
 
-#: app.php:383
+#: app.php:384
 msgid "Settings"
 msgstr "అమరికలు"
 
-#: app.php:395
+#: app.php:396
 msgid "Users"
 msgstr "వాడుకరులు"
 
-#: app.php:408
+#: app.php:409
 msgid "Apps"
 msgstr ""
 
-#: app.php:416
+#: app.php:417
 msgid "Admin"
 msgstr ""
 
+#: defaults.php:33
+msgid "web services under your control"
+msgstr ""
+
 #: files.php:210
 msgid "ZIP download is turned off."
 msgstr ""
@@ -85,104 +89,102 @@ msgstr ""
 msgid "Images"
 msgstr ""
 
-#: setup.php:34
-msgid "Set an admin username."
-msgstr ""
-
-#: setup.php:37
-msgid "Set an admin password."
-msgstr ""
-
-#: setup.php:55
+#: setup/abstractdatabase.php:22
 #, php-format
 msgid "%s enter the database username."
 msgstr ""
 
-#: setup.php:58
+#: setup/abstractdatabase.php:25
 #, php-format
 msgid "%s enter the database name."
 msgstr ""
 
-#: setup.php:61
+#: setup/abstractdatabase.php:28
 #, php-format
 msgid "%s you may not use dots in the database name"
 msgstr ""
 
-#: setup.php:64
+#: setup/mssql.php:20
 #, php-format
-msgid "%s set the database host."
-msgstr ""
-
-#: setup.php:126 setup.php:332 setup.php:377
-msgid "PostgreSQL username and/or password not valid"
+msgid "MS SQL username and/or password not valid: %s"
 msgstr ""
 
-#: setup.php:127 setup.php:235
+#: setup/mssql.php:21 setup/mysql.php:13 setup/oci.php:114
+#: setup/postgresql.php:24 setup/postgresql.php:70
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:152
-msgid "Oracle connection could not be established"
-msgstr ""
-
-#: setup.php:234
+#: setup/mysql.php:12
 msgid "MySQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:288 setup.php:398 setup.php:407 setup.php:425 setup.php:435
-#: setup.php:444 setup.php:477 setup.php:543 setup.php:569 setup.php:576
-#: setup.php:587 setup.php:594 setup.php:603 setup.php:611 setup.php:620
-#: setup.php:626
+#: setup/mysql.php:67 setup/oci.php:54 setup/oci.php:121 setup/oci.php:147
+#: setup/oci.php:154 setup/oci.php:165 setup/oci.php:172 setup/oci.php:181
+#: setup/oci.php:189 setup/oci.php:198 setup/oci.php:204
+#: setup/postgresql.php:89 setup/postgresql.php:98 setup/postgresql.php:115
+#: setup/postgresql.php:125 setup/postgresql.php:134
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr ""
 
-#: setup.php:289 setup.php:399 setup.php:408 setup.php:426 setup.php:436
-#: setup.php:445 setup.php:478 setup.php:544 setup.php:570 setup.php:577
-#: setup.php:588 setup.php:604 setup.php:612 setup.php:621
+#: setup/mysql.php:68 setup/oci.php:55 setup/oci.php:122 setup/oci.php:148
+#: setup/oci.php:155 setup/oci.php:166 setup/oci.php:182 setup/oci.php:190
+#: setup/oci.php:199 setup/postgresql.php:90 setup/postgresql.php:99
+#: setup/postgresql.php:116 setup/postgresql.php:126 setup/postgresql.php:135
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:305
+#: setup/mysql.php:85
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:306
+#: setup/mysql.php:86
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:311
+#: setup/mysql.php:91
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:312
+#: setup/mysql.php:92
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:469 setup.php:536
+#: setup/oci.php:34
+msgid "Oracle connection could not be established"
+msgstr ""
+
+#: setup/oci.php:41 setup/oci.php:113
 msgid "Oracle username and/or password not valid"
 msgstr ""
 
-#: setup.php:595 setup.php:627
+#: setup/oci.php:173 setup/oci.php:205
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:647
-#, php-format
-msgid "MS SQL username and/or password not valid: %s"
+#: setup/postgresql.php:23 setup/postgresql.php:69
+msgid "PostgreSQL username and/or password not valid"
+msgstr ""
+
+#: setup.php:42
+msgid "Set an admin username."
+msgstr ""
+
+#: setup.php:45
+msgid "Set an admin password."
 msgstr ""
 
-#: setup.php:870
+#: setup.php:198
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:871
+#: setup.php:199
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
diff --git a/l10n/te/settings.po b/l10n/te/settings.po
index d8075f6d8d2ff62a3ac2a4ebbb816b328fac6d0e..f26f606cf24b9c68f105e4f85d2b04d6c1595983 100644
--- a/l10n/te/settings.po
+++ b/l10n/te/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n"
 "MIME-Version: 1.0\n"
@@ -88,35 +88,35 @@ msgstr ""
 msgid "Couldn't update app."
 msgstr ""
 
-#: js/apps.js:30
+#: js/apps.js:35
 msgid "Update to {appversion}"
 msgstr ""
 
-#: js/apps.js:36 js/apps.js:76
+#: js/apps.js:41 js/apps.js:81
 msgid "Disable"
 msgstr ""
 
-#: js/apps.js:36 js/apps.js:64 js/apps.js:83
+#: js/apps.js:41 js/apps.js:69 js/apps.js:88
 msgid "Enable"
 msgstr ""
 
-#: js/apps.js:55
+#: js/apps.js:60
 msgid "Please wait...."
 msgstr ""
 
-#: js/apps.js:59 js/apps.js:71 js/apps.js:80 js/apps.js:93
+#: js/apps.js:64 js/apps.js:76 js/apps.js:85 js/apps.js:98
 msgid "Error"
 msgstr "పొరపాటు"
 
-#: js/apps.js:90
+#: js/apps.js:95
 msgid "Updating...."
 msgstr ""
 
-#: js/apps.js:93
+#: js/apps.js:98
 msgid "Error while updating app"
 msgstr ""
 
-#: js/apps.js:96
+#: js/apps.js:101
 msgid "Updated"
 msgstr ""
 
@@ -165,15 +165,15 @@ msgstr ""
 msgid "A valid password must be provided"
 msgstr ""
 
-#: personal.php:35 personal.php:36
+#: personal.php:37 personal.php:38
 msgid "__language_name__"
 msgstr ""
 
-#: templates/admin.php:15
+#: templates/admin.php:17
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:18
+#: templates/admin.php:20
 msgid ""
 "Your data directory and your files are probably accessible from the "
 "internet. The .htaccess file that ownCloud provides is not working. We "
@@ -182,36 +182,36 @@ msgid ""
 " webserver document root."
 msgstr ""
 
-#: templates/admin.php:29
+#: templates/admin.php:31
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:32
+#: templates/admin.php:34
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: templates/admin.php:33
+#: templates/admin.php:35
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:44
+#: templates/admin.php:46
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:47
+#: templates/admin.php:49
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr ""
 
-#: templates/admin.php:58
+#: templates/admin.php:60
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:63
+#: templates/admin.php:65
 #, php-format
 msgid ""
 "This ownCloud server can't set system locale to %s. This means that there "
@@ -219,11 +219,11 @@ msgid ""
 " to install the required packages on your system to support %s."
 msgstr ""
 
-#: templates/admin.php:75
+#: templates/admin.php:77
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:78
+#: templates/admin.php:80
 msgid ""
 "This ownCloud server has no working internet connection. This means that "
 "some of the features like mounting of external storage, notifications about "
@@ -233,102 +233,102 @@ msgid ""
 " of ownCloud."
 msgstr ""
 
-#: templates/admin.php:92
+#: templates/admin.php:94
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:101
+#: templates/admin.php:103
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:111
+#: templates/admin.php:113
 msgid ""
 "cron.php is registered at a webcron service. Call the cron.php page in the "
 "owncloud root once a minute over http."
 msgstr ""
 
-#: templates/admin.php:121
+#: templates/admin.php:123
 msgid ""
 "Use systems cron service. Call the cron.php file in the owncloud folder via "
 "a system cronjob once a minute."
 msgstr ""
 
-#: templates/admin.php:128
+#: templates/admin.php:130
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:134
+#: templates/admin.php:136
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:135
+#: templates/admin.php:137
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:142
+#: templates/admin.php:144
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:143
+#: templates/admin.php:145
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:150
+#: templates/admin.php:152
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:151
+#: templates/admin.php:153
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:158
+#: templates/admin.php:160
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:161
+#: templates/admin.php:163
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:168
+#: templates/admin.php:170
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:181
+#: templates/admin.php:183
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:182
+#: templates/admin.php:184
 msgid ""
 "Enforces the clients to connect to ownCloud via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:185
+#: templates/admin.php:187
 msgid ""
 "Please connect to this ownCloud instance via HTTPS to enable or disable the "
 "SSL enforcement."
 msgstr ""
 
-#: templates/admin.php:195
+#: templates/admin.php:197
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:196
+#: templates/admin.php:198
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:227
+#: templates/admin.php:229
 msgid "More"
 msgstr "మరిన్ని"
 
-#: templates/admin.php:228
+#: templates/admin.php:230
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:235 templates/personal.php:116
+#: templates/admin.php:236 templates/personal.php:116
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:237 templates/personal.php:119
+#: templates/admin.php:240 templates/personal.php:119
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -386,76 +386,79 @@ msgstr ""
 msgid "Commercial Support"
 msgstr ""
 
-#: templates/personal.php:9
+#: templates/personal.php:10
 msgid "Get the apps to sync your files"
 msgstr ""
 
-#: templates/personal.php:20
+#: templates/personal.php:21
 msgid "Show First Run Wizard again"
 msgstr ""
 
-#: templates/personal.php:28
+#: templates/personal.php:29
 #, php-format
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr ""
 
-#: templates/personal.php:40 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:41 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "సంకేతపదం"
 
-#: templates/personal.php:41
+#: templates/personal.php:42
 msgid "Your password was changed"
 msgstr ""
 
-#: templates/personal.php:42
+#: templates/personal.php:43
 msgid "Unable to change your password"
 msgstr ""
 
-#: templates/personal.php:43
+#: templates/personal.php:44
 msgid "Current password"
 msgstr ""
 
-#: templates/personal.php:45
+#: templates/personal.php:46
 msgid "New password"
 msgstr "కొత్త సంకేతపదం"
 
-#: templates/personal.php:47
+#: templates/personal.php:48
 msgid "Change password"
 msgstr ""
 
-#: templates/personal.php:59 templates/users.php:85
+#: templates/personal.php:60 templates/users.php:85
 msgid "Display Name"
 msgstr ""
 
-#: templates/personal.php:74
+#: templates/personal.php:75
 msgid "Email"
-msgstr ""
+msgstr "ఈమెయిలు"
 
-#: templates/personal.php:76
+#: templates/personal.php:77
 msgid "Your email address"
 msgstr "మీ ఈమెయిలు చిరునామా"
 
-#: templates/personal.php:77
+#: templates/personal.php:78
 msgid "Fill in an email address to enable password recovery"
 msgstr ""
 
-#: templates/personal.php:86 templates/personal.php:87
+#: templates/personal.php:87 templates/personal.php:88
 msgid "Language"
 msgstr "భాష"
 
-#: templates/personal.php:99
+#: templates/personal.php:100
 msgid "Help translate"
 msgstr ""
 
-#: templates/personal.php:105
+#: templates/personal.php:106
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:107
-msgid "Use this address to connect to your ownCloud in your file manager"
+#: templates/personal.php:108
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
+"target=\"_blank\">access your Files via WebDAV</a>"
 msgstr ""
 
-#: templates/users.php:21 templates/users.php:84
+#: templates/users.php:21
 msgid "Login Name"
 msgstr ""
 
@@ -485,6 +488,10 @@ msgstr ""
 msgid "Other"
 msgstr ""
 
+#: templates/users.php:84
+msgid "Username"
+msgstr "వాడుకరి పేరు"
+
 #: templates/users.php:91
 msgid "Storage"
 msgstr ""
diff --git a/l10n/te/user_ldap.po b/l10n/te/user_ldap.po
index 457e1ebe6bb309ade75162fa5c45b18969e55ae5..61f10199df94f97c5699ed3c1d4708178cbeac67 100644
--- a/l10n/te/user_ldap.po
+++ b/l10n/te/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:25+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:16+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index e1d617e4b97b6942bc638d57a5213971ca728a15..13700bc37590eb5b4a8f360d241ede0d32df92b1 100644
--- a/l10n/templates/core.pot
+++ b/l10n/templates/core.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 5.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -61,135 +61,135 @@ msgstr ""
 msgid "Error removing %s from favorites."
 msgstr ""
 
-#: js/config.php:34
+#: js/config.php:32
 msgid "Sunday"
 msgstr ""
 
-#: js/config.php:35
+#: js/config.php:33
 msgid "Monday"
 msgstr ""
 
-#: js/config.php:36
+#: js/config.php:34
 msgid "Tuesday"
 msgstr ""
 
-#: js/config.php:37
+#: js/config.php:35
 msgid "Wednesday"
 msgstr ""
 
-#: js/config.php:38
+#: js/config.php:36
 msgid "Thursday"
 msgstr ""
 
-#: js/config.php:39
+#: js/config.php:37
 msgid "Friday"
 msgstr ""
 
-#: js/config.php:40
+#: js/config.php:38
 msgid "Saturday"
 msgstr ""
 
-#: js/config.php:45
+#: js/config.php:43
 msgid "January"
 msgstr ""
 
-#: js/config.php:46
+#: js/config.php:44
 msgid "February"
 msgstr ""
 
-#: js/config.php:47
+#: js/config.php:45
 msgid "March"
 msgstr ""
 
-#: js/config.php:48
+#: js/config.php:46
 msgid "April"
 msgstr ""
 
-#: js/config.php:49
+#: js/config.php:47
 msgid "May"
 msgstr ""
 
-#: js/config.php:50
+#: js/config.php:48
 msgid "June"
 msgstr ""
 
-#: js/config.php:51
+#: js/config.php:49
 msgid "July"
 msgstr ""
 
-#: js/config.php:52
+#: js/config.php:50
 msgid "August"
 msgstr ""
 
-#: js/config.php:53
+#: js/config.php:51
 msgid "September"
 msgstr ""
 
-#: js/config.php:54
+#: js/config.php:52
 msgid "October"
 msgstr ""
 
-#: js/config.php:55
+#: js/config.php:53
 msgid "November"
 msgstr ""
 
-#: js/config.php:56
+#: js/config.php:54
 msgid "December"
 msgstr ""
 
-#: js/js.js:286
+#: js/js.js:293
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:718
+#: js/js.js:725
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:719
+#: js/js.js:726
 msgid "1 minute ago"
 msgstr ""
 
-#: js/js.js:720
+#: js/js.js:727
 msgid "{minutes} minutes ago"
 msgstr ""
 
-#: js/js.js:721
+#: js/js.js:728
 msgid "1 hour ago"
 msgstr ""
 
-#: js/js.js:722
+#: js/js.js:729
 msgid "{hours} hours ago"
 msgstr ""
 
-#: js/js.js:723
+#: js/js.js:730
 msgid "today"
 msgstr ""
 
-#: js/js.js:724
+#: js/js.js:731
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:725
+#: js/js.js:732
 msgid "{days} days ago"
 msgstr ""
 
-#: js/js.js:726
+#: js/js.js:733
 msgid "last month"
 msgstr ""
 
-#: js/js.js:727
+#: js/js.js:734
 msgid "{months} months ago"
 msgstr ""
 
-#: js/js.js:728
+#: js/js.js:735
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:729
+#: js/js.js:736
 msgid "last year"
 msgstr ""
 
-#: js/js.js:730
+#: js/js.js:737
 msgid "years ago"
 msgstr ""
 
@@ -225,8 +225,8 @@ msgstr ""
 #: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
 #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:577
-#: js/share.js:589
+#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:620
+#: js/share.js:632
 msgid "Error"
 msgstr ""
 
@@ -246,7 +246,7 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: js/share.js:125 js/share.js:617
+#: js/share.js:125 js/share.js:660
 msgid "Error while sharing"
 msgstr ""
 
@@ -266,99 +266,103 @@ msgstr ""
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:159
+#: js/share.js:172
 msgid "Share with"
 msgstr ""
 
-#: js/share.js:164
+#: js/share.js:177
 msgid "Share with link"
 msgstr ""
 
-#: js/share.js:167
+#: js/share.js:180
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:169 templates/installation.php:54 templates/login.php:26
+#: js/share.js:182 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr ""
 
-#: js/share.js:173
+#: js/share.js:187
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:191
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:174
+#: js/share.js:192
 msgid "Send"
 msgstr ""
 
-#: js/share.js:178
+#: js/share.js:197
 msgid "Set expiration date"
 msgstr ""
 
-#: js/share.js:179
+#: js/share.js:198
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:211
+#: js/share.js:230
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:213
+#: js/share.js:232
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:251
+#: js/share.js:270
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:287
+#: js/share.js:306
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:308
+#: js/share.js:327
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:320
+#: js/share.js:339
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:322
+#: js/share.js:341
 msgid "access control"
 msgstr ""
 
-#: js/share.js:325
+#: js/share.js:344
 msgid "create"
 msgstr ""
 
-#: js/share.js:328
+#: js/share.js:347
 msgid "update"
 msgstr ""
 
-#: js/share.js:331
+#: js/share.js:350
 msgid "delete"
 msgstr ""
 
-#: js/share.js:334
+#: js/share.js:353
 msgid "share"
 msgstr ""
 
-#: js/share.js:368 js/share.js:564
+#: js/share.js:387 js/share.js:607
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:577
+#: js/share.js:620
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:589
+#: js/share.js:632
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:604
+#: js/share.js:647
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:615
+#: js/share.js:658
 msgid "Email sent"
 msgstr ""
 
@@ -373,7 +377,7 @@ msgstr ""
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
-#: lostpassword/controller.php:58
+#: lostpassword/controller.php:60
 msgid "ownCloud password reset"
 msgstr ""
 
@@ -403,17 +407,17 @@ msgstr ""
 
 #: lostpassword/templates/lostpassword.php:22
 msgid ""
-"Your files seems to be encrypted. If you didn't have enabled the recovery "
-"key there will be no way to get your data back once the password was "
-"resetted. If you are not sure what to do, please contact your administrator "
-"first before continue. Do you really want to continue?"
+"Your files are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
 msgstr ""
 
 #: lostpassword/templates/lostpassword.php:24
 msgid "Yes, I really want to reset my password now"
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:29
+#: lostpassword/templates/lostpassword.php:27
 msgid "Request reset"
 msgstr ""
 
@@ -461,7 +465,7 @@ msgstr ""
 msgid "Cloud not found"
 msgstr ""
 
-#: templates/altmail.php:2
+#: templates/altmail.php:4
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -472,10 +476,6 @@ msgid ""
 "Cheers!"
 msgstr ""
 
-#: templates/altmail.php:7 templates/mail.php:24
-msgid "web services under your control"
-msgstr ""
-
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
 msgstr ""
@@ -568,12 +568,12 @@ msgstr ""
 msgid "Finish setup"
 msgstr ""
 
-#: templates/layout.user.php:40
+#: templates/layout.user.php:43
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:67
+#: templates/layout.user.php:68
 msgid "Log out"
 msgstr ""
 
@@ -607,7 +607,7 @@ msgstr ""
 msgid "Alternative Logins"
 msgstr ""
 
-#: templates/mail.php:15
+#: templates/mail.php:16
 #, php-format
 msgid ""
 "Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot
index bb1623fc74ed2efef19d35aba62bd96500a0d0e4..ad13d09f2f48b7e377f7d8ee47f098d99cd4742e 100644
--- a/l10n/templates/files.pot
+++ b/l10n/templates/files.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 5.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-06-17 02:01+0200\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -27,46 +27,54 @@ msgstr ""
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/upload.php:19
+#: ajax/upload.php:16 ajax/upload.php:45
+msgid "Unable to set upload directory."
+msgstr ""
+
+#: ajax/upload.php:22
+msgid "Invalid Token"
+msgstr ""
+
+#: ajax/upload.php:59
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: ajax/upload.php:26
+#: ajax/upload.php:66
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/upload.php:27
+#: ajax/upload.php:67
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:29
+#: ajax/upload.php:69
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/upload.php:30
+#: ajax/upload.php:70
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/upload.php:31
+#: ajax/upload.php:71
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/upload.php:32
+#: ajax/upload.php:72
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/upload.php:33
+#: ajax/upload.php:73
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:51
+#: ajax/upload.php:91
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:83
+#: ajax/upload.php:123
 msgid "Invalid directory."
 msgstr ""
 
@@ -74,6 +82,36 @@ msgstr ""
 msgid "Files"
 msgstr ""
 
+#: js/file-upload.js:11
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/file-upload.js:24
+msgid "Not enough space available"
+msgstr ""
+
+#: js/file-upload.js:64
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/file-upload.js:167 js/files.js:266
+msgid ""
+"File upload is in progress. Leaving the page now will cancel the upload."
+msgstr ""
+
+#: js/file-upload.js:233 js/files.js:339
+msgid "URL cannot be empty."
+msgstr ""
+
+#: js/file-upload.js:238 lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr ""
+
+#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
+#: js/files.js:693 js/files.js:731
+msgid "Error"
+msgstr ""
+
 #: js/fileactions.js:116
 msgid "Share"
 msgstr ""
@@ -90,43 +128,43 @@ msgstr ""
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:464
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:259
+#: js/filelist.js:302
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:306
+#: js/filelist.js:349
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:306
+#: js/filelist.js:349
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:331
+#: js/filelist.js:374
 msgid "perform delete operation"
 msgstr ""
 
-#: js/filelist.js:413
+#: js/filelist.js:456
 msgid "1 file uploading"
 msgstr ""
 
-#: js/filelist.js:416 js/filelist.js:470
+#: js/filelist.js:459 js/filelist.js:517
 msgid "files uploading"
 msgstr ""
 
@@ -158,69 +196,41 @@ msgid ""
 "big."
 msgstr ""
 
-#: js/files.js:264
-msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr ""
-
-#: js/files.js:277
-msgid "Not enough space available"
-msgstr ""
-
-#: js/files.js:317
-msgid "Upload cancelled."
-msgstr ""
-
-#: js/files.js:413
-msgid ""
-"File upload is in progress. Leaving the page now will cancel the upload."
-msgstr ""
-
-#: js/files.js:486
-msgid "URL cannot be empty."
-msgstr ""
-
-#: js/files.js:491
+#: js/files.js:344
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
-msgid "Error"
-msgstr ""
-
-#: js/files.js:877 templates/index.php:69
+#: js/files.js:744 templates/index.php:69
 msgid "Name"
 msgstr ""
 
-#: js/files.js:878 templates/index.php:80
+#: js/files.js:745 templates/index.php:80
 msgid "Size"
 msgstr ""
 
-#: js/files.js:879 templates/index.php:82
+#: js/files.js:746 templates/index.php:82
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:898
+#: js/files.js:765
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:900
+#: js/files.js:767
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:908
+#: js/files.js:775
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:910
+#: js/files.js:777
 msgid "{count} files"
 msgstr ""
 
-#: lib/app.php:53
-msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
-msgstr ""
-
 #: lib/app.php:73
-msgid "Unable to rename file"
+#, php-format
+msgid "%s could not be renamed"
 msgstr ""
 
 #: lib/helper.php:11 templates/index.php:18
@@ -317,6 +327,22 @@ msgstr ""
 msgid "Current scanning"
 msgstr ""
 
+#: templates/part.list.php:76
+msgid "directory"
+msgstr ""
+
+#: templates/part.list.php:78
+msgid "directories"
+msgstr ""
+
+#: templates/part.list.php:87
+msgid "file"
+msgstr ""
+
+#: templates/part.list.php:89
+msgid "files"
+msgstr ""
+
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
 msgstr ""
diff --git a/l10n/templates/files_encryption.pot b/l10n/templates/files_encryption.pot
index 876013105c891a60ec68cf12c7af6563764dbfa8..d03c09aec86ae06e2da8e546b93d14edd862628c 100644
--- a/l10n/templates/files_encryption.pot
+++ b/l10n/templates/files_encryption.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 5.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -54,9 +54,21 @@ msgstr ""
 
 #: files/error.php:7
 msgid ""
-"Your private key is not valid! Maybe your password was changed from outside. "
-"You can update your private key password in your personal settings to regain "
-"access to your files"
+"Your private key is not valid! Likely your password was changed outside the "
+"ownCloud system (e.g. your corporate directory). You can update your private "
+"key password in your personal settings to recover access to your encrypted "
+"files."
+msgstr ""
+
+#: hooks/hooks.php:44
+msgid "Missing requirements."
+msgstr ""
+
+#: hooks/hooks.php:45
+msgid ""
+"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL "
+"PHP extension is enabled and configured properly. For now, the encryption "
+"app has been disabled."
 msgstr ""
 
 #: js/settings-admin.js:11
@@ -83,11 +95,11 @@ msgstr ""
 
 #: templates/settings-admin.php:10
 msgid ""
-"Enable encryption passwords recovery key (allow sharing to recovery key):"
+"Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
 #: templates/settings-admin.php:14
-msgid "Recovery account password"
+msgid "Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:21 templates/settings-personal.php:54
@@ -99,15 +111,15 @@ msgid "Disabled"
 msgstr ""
 
 #: templates/settings-admin.php:34
-msgid "Change encryption passwords recovery key:"
+msgid "Change recovery key password:"
 msgstr ""
 
 #: templates/settings-admin.php:41
-msgid "Old Recovery account password"
+msgid "Old Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:48
-msgid "New Recovery account password"
+msgid "New Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:53
diff --git a/l10n/templates/files_external.pot b/l10n/templates/files_external.pot
index d45e8a76d09d008bfccd3e39ae847d72229022a5..28f28f230ae7f0d76151ad07cd5a7610f69414da 100644
--- a/l10n/templates/files_external.pot
+++ b/l10n/templates/files_external.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 5.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_sharing.pot b/l10n/templates/files_sharing.pot
index 0e39f821ef3ae5c4ccdd0f23519d731b2fc136f1..1a2710bcb878df12bffc67c405e2da5125b9a65c 100644
--- a/l10n/templates/files_sharing.pot
+++ b/l10n/templates/files_sharing.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 5.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,27 +18,39 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: templates/authenticate.php:4
+msgid "The password is wrong. Try again."
+msgstr ""
+
+#: templates/authenticate.php:7
 msgid "Password"
 msgstr ""
 
-#: templates/authenticate.php:6
+#: templates/authenticate.php:9
 msgid "Submit"
 msgstr ""
 
-#: templates/public.php:10
+#: templates/public.php:17
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr ""
 
-#: templates/public.php:13
+#: templates/public.php:20
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr ""
 
-#: templates/public.php:19 templates/public.php:43
+#: templates/public.php:28 templates/public.php:90
 msgid "Download"
 msgstr ""
 
-#: templates/public.php:40
+#: templates/public.php:45 templates/public.php:48
+msgid "Upload"
+msgstr ""
+
+#: templates/public.php:58
+msgid "Cancel upload"
+msgstr ""
+
+#: templates/public.php:87
 msgid "No preview available for"
 msgstr ""
diff --git a/l10n/templates/files_trashbin.pot b/l10n/templates/files_trashbin.pot
index cdef6df66dd2ee1b93b35efb90d760455d3f6e55..a6e92666b2145714577d398d4bf15d25a6d04d84 100644
--- a/l10n/templates/files_trashbin.pot
+++ b/l10n/templates/files_trashbin.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 5.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_versions.pot b/l10n/templates/files_versions.pot
index baa9aa99c2afe3c6ba51c92730d96fb8e4c3aa6f..83de71fc6651c314dfcf5917e159eb42f4383735 100644
--- a/l10n/templates/files_versions.pot
+++ b/l10n/templates/files_versions.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 5.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/lib.pot b/l10n/templates/lib.pot
index 630449d254c83d0cc0463e4bb2de2969106e7258..2fb86489dcfdf1d6b32bc950cdf66f1b63547c09 100644
--- a/l10n/templates/lib.pot
+++ b/l10n/templates/lib.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 5.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,43 +17,47 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: app.php:359
+#: app.php:360
 msgid "Help"
 msgstr ""
 
-#: app.php:372
+#: app.php:373
 msgid "Personal"
 msgstr ""
 
-#: app.php:383
+#: app.php:384
 msgid "Settings"
 msgstr ""
 
-#: app.php:395
+#: app.php:396
 msgid "Users"
 msgstr ""
 
-#: app.php:408
+#: app.php:409
 msgid "Apps"
 msgstr ""
 
-#: app.php:416
+#: app.php:417
 msgid "Admin"
 msgstr ""
 
-#: files.php:210
+#: defaults.php:33
+msgid "web services under your control"
+msgstr ""
+
+#: files.php:226
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: files.php:211
+#: files.php:227
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:212 files.php:245
+#: files.php:228 files.php:261
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:242
+#: files.php:258
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
@@ -85,104 +89,102 @@ msgstr ""
 msgid "Images"
 msgstr ""
 
-#: setup.php:34
-msgid "Set an admin username."
-msgstr ""
-
-#: setup.php:37
-msgid "Set an admin password."
-msgstr ""
-
-#: setup.php:55
+#: setup/abstractdatabase.php:22
 #, php-format
 msgid "%s enter the database username."
 msgstr ""
 
-#: setup.php:58
+#: setup/abstractdatabase.php:25
 #, php-format
 msgid "%s enter the database name."
 msgstr ""
 
-#: setup.php:61
+#: setup/abstractdatabase.php:28
 #, php-format
 msgid "%s you may not use dots in the database name"
 msgstr ""
 
-#: setup.php:64
+#: setup/mssql.php:20
 #, php-format
-msgid "%s set the database host."
-msgstr ""
-
-#: setup.php:126 setup.php:332 setup.php:377
-msgid "PostgreSQL username and/or password not valid"
+msgid "MS SQL username and/or password not valid: %s"
 msgstr ""
 
-#: setup.php:127 setup.php:235
+#: setup/mssql.php:21 setup/mysql.php:13 setup/oci.php:114
+#: setup/postgresql.php:24 setup/postgresql.php:70
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:152
-msgid "Oracle connection could not be established"
-msgstr ""
-
-#: setup.php:234
+#: setup/mysql.php:12
 msgid "MySQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:288 setup.php:398 setup.php:407 setup.php:425 setup.php:435
-#: setup.php:444 setup.php:477 setup.php:543 setup.php:569 setup.php:576
-#: setup.php:587 setup.php:594 setup.php:603 setup.php:611 setup.php:620
-#: setup.php:626
+#: setup/mysql.php:67 setup/oci.php:54 setup/oci.php:121 setup/oci.php:147
+#: setup/oci.php:154 setup/oci.php:165 setup/oci.php:172 setup/oci.php:181
+#: setup/oci.php:189 setup/oci.php:198 setup/oci.php:204
+#: setup/postgresql.php:89 setup/postgresql.php:98 setup/postgresql.php:115
+#: setup/postgresql.php:125 setup/postgresql.php:134
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr ""
 
-#: setup.php:289 setup.php:399 setup.php:408 setup.php:426 setup.php:436
-#: setup.php:445 setup.php:478 setup.php:544 setup.php:570 setup.php:577
-#: setup.php:588 setup.php:604 setup.php:612 setup.php:621
+#: setup/mysql.php:68 setup/oci.php:55 setup/oci.php:122 setup/oci.php:148
+#: setup/oci.php:155 setup/oci.php:166 setup/oci.php:182 setup/oci.php:190
+#: setup/oci.php:199 setup/postgresql.php:90 setup/postgresql.php:99
+#: setup/postgresql.php:116 setup/postgresql.php:126 setup/postgresql.php:135
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:305
+#: setup/mysql.php:85
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:306
+#: setup/mysql.php:86
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:311
+#: setup/mysql.php:91
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:312
+#: setup/mysql.php:92
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:469 setup.php:536
+#: setup/oci.php:34
+msgid "Oracle connection could not be established"
+msgstr ""
+
+#: setup/oci.php:41 setup/oci.php:113
 msgid "Oracle username and/or password not valid"
 msgstr ""
 
-#: setup.php:595 setup.php:627
+#: setup/oci.php:173 setup/oci.php:205
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:647
-#, php-format
-msgid "MS SQL username and/or password not valid: %s"
+#: setup/postgresql.php:23 setup/postgresql.php:69
+msgid "PostgreSQL username and/or password not valid"
+msgstr ""
+
+#: setup.php:42
+msgid "Set an admin username."
+msgstr ""
+
+#: setup.php:45
+msgid "Set an admin password."
 msgstr ""
 
-#: setup.php:870
+#: setup.php:198
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:871
+#: setup.php:199
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot
index e01592e5069076f7fe302996b4187089c207c40c..fb7be24163e94ad28aa305f5af2216fbe9084558 100644
--- a/l10n/templates/settings.pot
+++ b/l10n/templates/settings.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 5.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -88,35 +88,35 @@ msgstr ""
 msgid "Couldn't update app."
 msgstr ""
 
-#: js/apps.js:30
+#: js/apps.js:35
 msgid "Update to {appversion}"
 msgstr ""
 
-#: js/apps.js:36 js/apps.js:76
+#: js/apps.js:41 js/apps.js:81
 msgid "Disable"
 msgstr ""
 
-#: js/apps.js:36 js/apps.js:64 js/apps.js:83
+#: js/apps.js:41 js/apps.js:69 js/apps.js:88
 msgid "Enable"
 msgstr ""
 
-#: js/apps.js:55
+#: js/apps.js:60
 msgid "Please wait...."
 msgstr ""
 
-#: js/apps.js:59 js/apps.js:71 js/apps.js:80 js/apps.js:93
+#: js/apps.js:64 js/apps.js:76 js/apps.js:85 js/apps.js:98
 msgid "Error"
 msgstr ""
 
-#: js/apps.js:90
+#: js/apps.js:95
 msgid "Updating...."
 msgstr ""
 
-#: js/apps.js:93
+#: js/apps.js:98
 msgid "Error while updating app"
 msgstr ""
 
-#: js/apps.js:96
+#: js/apps.js:101
 msgid "Updated"
 msgstr ""
 
@@ -165,15 +165,15 @@ msgstr ""
 msgid "A valid password must be provided"
 msgstr ""
 
-#: personal.php:35 personal.php:36
+#: personal.php:37 personal.php:38
 msgid "__language_name__"
 msgstr ""
 
-#: templates/admin.php:15
+#: templates/admin.php:17
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:18
+#: templates/admin.php:20
 msgid ""
 "Your data directory and your files are probably accessible from the "
 "internet. The .htaccess file that ownCloud provides is not working. We "
@@ -182,36 +182,36 @@ msgid ""
 "webserver document root."
 msgstr ""
 
-#: templates/admin.php:29
+#: templates/admin.php:31
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:32
+#: templates/admin.php:34
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: templates/admin.php:33
+#: templates/admin.php:35
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:44
+#: templates/admin.php:46
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:47
+#: templates/admin.php:49
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr ""
 
-#: templates/admin.php:58
+#: templates/admin.php:60
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:63
+#: templates/admin.php:65
 #, php-format
 msgid ""
 "This ownCloud server can't set system locale to %s. This means that there "
@@ -219,11 +219,11 @@ msgid ""
 "to install the required packages on your system to support %s."
 msgstr ""
 
-#: templates/admin.php:75
+#: templates/admin.php:77
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:78
+#: templates/admin.php:80
 msgid ""
 "This ownCloud server has no working internet connection. This means that "
 "some of the features like mounting of external storage, notifications about "
@@ -233,102 +233,102 @@ msgid ""
 "of ownCloud."
 msgstr ""
 
-#: templates/admin.php:92
+#: templates/admin.php:94
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:101
+#: templates/admin.php:103
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:111
+#: templates/admin.php:113
 msgid ""
 "cron.php is registered at a webcron service. Call the cron.php page in the "
 "owncloud root once a minute over http."
 msgstr ""
 
-#: templates/admin.php:121
+#: templates/admin.php:123
 msgid ""
 "Use systems cron service. Call the cron.php file in the owncloud folder via "
 "a system cronjob once a minute."
 msgstr ""
 
-#: templates/admin.php:128
+#: templates/admin.php:130
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:134
+#: templates/admin.php:136
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:135
+#: templates/admin.php:137
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:142
+#: templates/admin.php:144
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:143
+#: templates/admin.php:145
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:150
+#: templates/admin.php:152
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:151
+#: templates/admin.php:153
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:158
+#: templates/admin.php:160
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:161
+#: templates/admin.php:163
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:168
+#: templates/admin.php:170
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:181
+#: templates/admin.php:183
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:182
+#: templates/admin.php:184
 msgid ""
 "Enforces the clients to connect to ownCloud via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:185
+#: templates/admin.php:187
 msgid ""
 "Please connect to this ownCloud instance via HTTPS to enable or disable the "
 "SSL enforcement."
 msgstr ""
 
-#: templates/admin.php:195
+#: templates/admin.php:197
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:196
+#: templates/admin.php:198
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:227
+#: templates/admin.php:229
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:228
+#: templates/admin.php:230
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:235 templates/personal.php:116
+#: templates/admin.php:236 templates/personal.php:116
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:237 templates/personal.php:119
+#: templates/admin.php:240 templates/personal.php:119
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank"
 "\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" "
@@ -386,76 +386,79 @@ msgstr ""
 msgid "Commercial Support"
 msgstr ""
 
-#: templates/personal.php:9
+#: templates/personal.php:10
 msgid "Get the apps to sync your files"
 msgstr ""
 
-#: templates/personal.php:20
+#: templates/personal.php:21
 msgid "Show First Run Wizard again"
 msgstr ""
 
-#: templates/personal.php:28
+#: templates/personal.php:29
 #, php-format
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr ""
 
-#: templates/personal.php:40 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:41 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr ""
 
-#: templates/personal.php:41
+#: templates/personal.php:42
 msgid "Your password was changed"
 msgstr ""
 
-#: templates/personal.php:42
+#: templates/personal.php:43
 msgid "Unable to change your password"
 msgstr ""
 
-#: templates/personal.php:43
+#: templates/personal.php:44
 msgid "Current password"
 msgstr ""
 
-#: templates/personal.php:45
+#: templates/personal.php:46
 msgid "New password"
 msgstr ""
 
-#: templates/personal.php:47
+#: templates/personal.php:48
 msgid "Change password"
 msgstr ""
 
-#: templates/personal.php:59 templates/users.php:85
+#: templates/personal.php:60 templates/users.php:85
 msgid "Display Name"
 msgstr ""
 
-#: templates/personal.php:74
+#: templates/personal.php:75
 msgid "Email"
 msgstr ""
 
-#: templates/personal.php:76
+#: templates/personal.php:77
 msgid "Your email address"
 msgstr ""
 
-#: templates/personal.php:77
+#: templates/personal.php:78
 msgid "Fill in an email address to enable password recovery"
 msgstr ""
 
-#: templates/personal.php:86 templates/personal.php:87
+#: templates/personal.php:87 templates/personal.php:88
 msgid "Language"
 msgstr ""
 
-#: templates/personal.php:99
+#: templates/personal.php:100
 msgid "Help translate"
 msgstr ""
 
-#: templates/personal.php:105
+#: templates/personal.php:106
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:107
-msgid "Use this address to connect to your ownCloud in your file manager"
+#: templates/personal.php:108
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
+"target=\"_blank\">access your Files via WebDAV</a>"
 msgstr ""
 
-#: templates/users.php:21 templates/users.php:84
+#: templates/users.php:21
 msgid "Login Name"
 msgstr ""
 
@@ -485,6 +488,10 @@ msgstr ""
 msgid "Other"
 msgstr ""
 
+#: templates/users.php:84
+msgid "Username"
+msgstr ""
+
 #: templates/users.php:91
 msgid "Storage"
 msgstr ""
diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot
index b09d97e687ba1d8ca9a09263d30162c3dc445ab4..aee51a5ee8b68d81fafd7ec08e543fa3db894d6b 100644
--- a/l10n/templates/user_ldap.pot
+++ b/l10n/templates/user_ldap.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 5.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/user_webdavauth.pot b/l10n/templates/user_webdavauth.pot
index 965793af7a59063bbc2568bf9236c3529f9ecbda..fd1807815e10dfd3177ed69087e8c86e21c71cdb 100644
--- a/l10n/templates/user_webdavauth.pot
+++ b/l10n/templates/user_webdavauth.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 5.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/th_TH/core.po b/l10n/th_TH/core.po
index 247f3f4906b334423f4b0a01a475291b7b630b2c..91083c3d64420180aba174c37eaf5a60998ba4e7 100644
--- a/l10n/th_TH/core.po
+++ b/l10n/th_TH/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:22+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
 "MIME-Version: 1.0\n"
@@ -61,135 +61,135 @@ msgstr "ยังไม่ได้เลือกหมวดหมู่ที
 msgid "Error removing %s from favorites."
 msgstr "เกิดข้อผิดพลาดในการลบ %s ออกจากรายการโปรด"
 
-#: js/config.php:34
+#: js/config.php:32
 msgid "Sunday"
 msgstr "วันอาทิตย์"
 
-#: js/config.php:35
+#: js/config.php:33
 msgid "Monday"
 msgstr "วันจันทร์"
 
-#: js/config.php:36
+#: js/config.php:34
 msgid "Tuesday"
 msgstr "วันอังคาร"
 
-#: js/config.php:37
+#: js/config.php:35
 msgid "Wednesday"
 msgstr "วันพุธ"
 
-#: js/config.php:38
+#: js/config.php:36
 msgid "Thursday"
 msgstr "วันพฤหัสบดี"
 
-#: js/config.php:39
+#: js/config.php:37
 msgid "Friday"
 msgstr "วันศุกร์"
 
-#: js/config.php:40
+#: js/config.php:38
 msgid "Saturday"
 msgstr "วันเสาร์"
 
-#: js/config.php:45
+#: js/config.php:43
 msgid "January"
 msgstr "มกราคม"
 
-#: js/config.php:46
+#: js/config.php:44
 msgid "February"
 msgstr "กุมภาพันธ์"
 
-#: js/config.php:47
+#: js/config.php:45
 msgid "March"
 msgstr "มีนาคม"
 
-#: js/config.php:48
+#: js/config.php:46
 msgid "April"
 msgstr "เมษายน"
 
-#: js/config.php:49
+#: js/config.php:47
 msgid "May"
 msgstr "พฤษภาคม"
 
-#: js/config.php:50
+#: js/config.php:48
 msgid "June"
 msgstr "มิถุนายน"
 
-#: js/config.php:51
+#: js/config.php:49
 msgid "July"
 msgstr "กรกฏาคม"
 
-#: js/config.php:52
+#: js/config.php:50
 msgid "August"
 msgstr "สิงหาคม"
 
-#: js/config.php:53
+#: js/config.php:51
 msgid "September"
 msgstr "กันยายน"
 
-#: js/config.php:54
+#: js/config.php:52
 msgid "October"
 msgstr "ตุลาคม"
 
-#: js/config.php:55
+#: js/config.php:53
 msgid "November"
 msgstr "พฤศจิกายน"
 
-#: js/config.php:56
+#: js/config.php:54
 msgid "December"
 msgstr "ธันวาคม"
 
-#: js/js.js:286
+#: js/js.js:293
 msgid "Settings"
 msgstr "ตั้งค่า"
 
-#: js/js.js:718
+#: js/js.js:725
 msgid "seconds ago"
 msgstr "วินาที ก่อนหน้านี้"
 
-#: js/js.js:719
+#: js/js.js:726
 msgid "1 minute ago"
 msgstr "1 นาทีก่อนหน้านี้"
 
-#: js/js.js:720
+#: js/js.js:727
 msgid "{minutes} minutes ago"
 msgstr "{minutes} นาทีก่อนหน้านี้"
 
-#: js/js.js:721
+#: js/js.js:728
 msgid "1 hour ago"
 msgstr "1 ชั่วโมงก่อนหน้านี้"
 
-#: js/js.js:722
+#: js/js.js:729
 msgid "{hours} hours ago"
 msgstr "{hours} ชั่วโมงก่อนหน้านี้"
 
-#: js/js.js:723
+#: js/js.js:730
 msgid "today"
 msgstr "วันนี้"
 
-#: js/js.js:724
+#: js/js.js:731
 msgid "yesterday"
 msgstr "เมื่อวานนี้"
 
-#: js/js.js:725
+#: js/js.js:732
 msgid "{days} days ago"
 msgstr "{day} วันก่อนหน้านี้"
 
-#: js/js.js:726
+#: js/js.js:733
 msgid "last month"
 msgstr "เดือนที่แล้ว"
 
-#: js/js.js:727
+#: js/js.js:734
 msgid "{months} months ago"
 msgstr "{months} เดือนก่อนหน้านี้"
 
-#: js/js.js:728
+#: js/js.js:735
 msgid "months ago"
 msgstr "เดือน ที่ผ่านมา"
 
-#: js/js.js:729
+#: js/js.js:736
 msgid "last year"
 msgstr "ปีที่แล้ว"
 
-#: js/js.js:730
+#: js/js.js:737
 msgid "years ago"
 msgstr "ปี ที่ผ่านมา"
 
@@ -225,8 +225,8 @@ msgstr "ชนิดของวัตถุยังไม่ได้รับ
 #: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
 #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:577
-#: js/share.js:589
+#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:620
+#: js/share.js:632
 msgid "Error"
 msgstr "ข้อผิดพลาด"
 
@@ -246,7 +246,7 @@ msgstr "แชร์แล้ว"
 msgid "Share"
 msgstr "แชร์"
 
-#: js/share.js:125 js/share.js:617
+#: js/share.js:125 js/share.js:660
 msgid "Error while sharing"
 msgstr "เกิดข้อผิดพลาดในระหว่างการแชร์ข้อมูล"
 
@@ -266,99 +266,103 @@ msgstr "ได้แชร์ให้กับคุณ และกลุ่
 msgid "Shared with you by {owner}"
 msgstr "ถูกแชร์ให้กับคุณโดย {owner}"
 
-#: js/share.js:159
+#: js/share.js:172
 msgid "Share with"
 msgstr "แชร์ให้กับ"
 
-#: js/share.js:164
+#: js/share.js:177
 msgid "Share with link"
 msgstr "แชร์ด้วยลิงก์"
 
-#: js/share.js:167
+#: js/share.js:180
 msgid "Password protect"
 msgstr "ใส่รหัสผ่านไว้"
 
-#: js/share.js:169 templates/installation.php:54 templates/login.php:26
+#: js/share.js:182 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "รหัสผ่าน"
 
-#: js/share.js:173
+#: js/share.js:187
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:191
 msgid "Email link to person"
 msgstr "ส่งลิงก์ให้ทางอีเมล"
 
-#: js/share.js:174
+#: js/share.js:192
 msgid "Send"
 msgstr "ส่ง"
 
-#: js/share.js:178
+#: js/share.js:197
 msgid "Set expiration date"
 msgstr "กำหนดวันที่หมดอายุ"
 
-#: js/share.js:179
+#: js/share.js:198
 msgid "Expiration date"
 msgstr "วันที่หมดอายุ"
 
-#: js/share.js:211
+#: js/share.js:230
 msgid "Share via email:"
 msgstr "แชร์ผ่านทางอีเมล"
 
-#: js/share.js:213
+#: js/share.js:232
 msgid "No people found"
 msgstr "ไม่พบบุคคลที่ต้องการ"
 
-#: js/share.js:251
+#: js/share.js:270
 msgid "Resharing is not allowed"
 msgstr "ไม่อนุญาตให้แชร์ข้อมูลซ้ำได้"
 
-#: js/share.js:287
+#: js/share.js:306
 msgid "Shared in {item} with {user}"
 msgstr "ได้แชร์ {item} ให้กับ {user}"
 
-#: js/share.js:308
+#: js/share.js:327
 msgid "Unshare"
 msgstr "ยกเลิกการแชร์"
 
-#: js/share.js:320
+#: js/share.js:339
 msgid "can edit"
 msgstr "สามารถแก้ไข"
 
-#: js/share.js:322
+#: js/share.js:341
 msgid "access control"
 msgstr "ระดับควบคุมการเข้าใช้งาน"
 
-#: js/share.js:325
+#: js/share.js:344
 msgid "create"
 msgstr "สร้าง"
 
-#: js/share.js:328
+#: js/share.js:347
 msgid "update"
 msgstr "อัพเดท"
 
-#: js/share.js:331
+#: js/share.js:350
 msgid "delete"
 msgstr "ลบ"
 
-#: js/share.js:334
+#: js/share.js:353
 msgid "share"
 msgstr "แชร์"
 
-#: js/share.js:368 js/share.js:564
+#: js/share.js:387 js/share.js:607
 msgid "Password protected"
 msgstr "ใส่รหัสผ่านไว้"
 
-#: js/share.js:577
+#: js/share.js:620
 msgid "Error unsetting expiration date"
 msgstr "เกิดข้อผิดพลาดในการยกเลิกการตั้งค่าวันที่หมดอายุ"
 
-#: js/share.js:589
+#: js/share.js:632
 msgid "Error setting expiration date"
 msgstr "เกิดข้อผิดพลาดในการตั้งค่าวันที่หมดอายุ"
 
-#: js/share.js:604
+#: js/share.js:647
 msgid "Sending ..."
 msgstr "กำลังส่ง..."
 
-#: js/share.js:615
+#: js/share.js:658
 msgid "Email sent"
 msgstr "ส่งอีเมล์แล้ว"
 
@@ -373,7 +377,7 @@ msgstr "การอัพเดทไม่เป็นผลสำเร็จ
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "การอัพเดทเสร็จเรียบร้อยแล้ว กำลังเปลี่ยนเส้นทางไปที่ ownCloud อยู่ในขณะนี้"
 
-#: lostpassword/controller.php:58
+#: lostpassword/controller.php:60
 msgid "ownCloud password reset"
 msgstr "รีเซ็ตรหัสผ่าน ownCloud"
 
@@ -403,17 +407,17 @@ msgstr "ชื่อผู้ใช้งาน"
 
 #: lostpassword/templates/lostpassword.php:22
 msgid ""
-"Your files seems to be encrypted. If you didn't have enabled the recovery "
-"key there will be no way to get your data back once the password was "
-"resetted. If you are not sure what to do, please contact your administrator "
-"first before continue. Do you really want to continue?"
+"Your files are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
 msgstr ""
 
 #: lostpassword/templates/lostpassword.php:24
 msgid "Yes, I really want to reset my password now"
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:29
+#: lostpassword/templates/lostpassword.php:27
 msgid "Request reset"
 msgstr "ขอเปลี่ยนรหัสใหม่"
 
@@ -461,7 +465,7 @@ msgstr "การเข้าถึงถูกหวงห้าม"
 msgid "Cloud not found"
 msgstr "ไม่พบ Cloud"
 
-#: templates/altmail.php:2
+#: templates/altmail.php:4
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -472,10 +476,6 @@ msgid ""
 "Cheers!"
 msgstr ""
 
-#: templates/altmail.php:7 templates/mail.php:24
-msgid "web services under your control"
-msgstr "เว็บเซอร์วิสที่คุณควบคุมการใช้งานได้"
-
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
 msgstr "แก้ไขหมวดหมู่"
@@ -568,12 +568,12 @@ msgstr "Database host"
 msgid "Finish setup"
 msgstr "ติดตั้งเรียบร้อยแล้ว"
 
-#: templates/layout.user.php:40
+#: templates/layout.user.php:43
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:67
+#: templates/layout.user.php:68
 msgid "Log out"
 msgstr "ออกจากระบบ"
 
@@ -607,7 +607,7 @@ msgstr "เข้าสู่ระบบ"
 msgid "Alternative Logins"
 msgstr ""
 
-#: templates/mail.php:15
+#: templates/mail.php:16
 #, php-format
 msgid ""
 "Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
diff --git a/l10n/th_TH/files.po b/l10n/th_TH/files.po
index caf6ea0b3901781c0b7249ca41c7f59a2042409c..3fb53a1336b4f49f7b2815a5a81c985b715d11a1 100644
--- a/l10n/th_TH/files.po
+++ b/l10n/th_TH/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:01+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
 "MIME-Version: 1.0\n"
@@ -27,46 +27,54 @@ msgstr "ไม่สามารถย้าย %s ได้ - ไฟล์ท
 msgid "Could not move %s"
 msgstr "ไม่สามารถย้าย %s ได้"
 
-#: ajax/upload.php:19
+#: ajax/upload.php:16 ajax/upload.php:45
+msgid "Unable to set upload directory."
+msgstr ""
+
+#: ajax/upload.php:22
+msgid "Invalid Token"
+msgstr ""
+
+#: ajax/upload.php:59
 msgid "No file was uploaded. Unknown error"
 msgstr "ยังไม่มีไฟล์ใดที่ถูกอัพโหลด เกิดข้อผิดพลาดที่ไม่ทราบสาเหตุ"
 
-#: ajax/upload.php:26
+#: ajax/upload.php:66
 msgid "There is no error, the file uploaded with success"
 msgstr "ไม่พบข้อผิดพลาดใดๆ, ไฟล์ถูกอัพโหลดเรียบร้อยแล้ว"
 
-#: ajax/upload.php:27
+#: ajax/upload.php:67
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr "ขนาดไฟล์ที่อัพโหลดมีขนาดเกิน upload_max_filesize ที่ระบุไว้ใน php.ini"
 
-#: ajax/upload.php:29
+#: ajax/upload.php:69
 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:30
+#: ajax/upload.php:70
 msgid "The uploaded file was only partially uploaded"
 msgstr "ไฟล์ถูกอัพโหลดได้เพียงบางส่วนเท่านั้น"
 
-#: ajax/upload.php:31
+#: ajax/upload.php:71
 msgid "No file was uploaded"
 msgstr "ไม่มีไฟล์ที่ถูกอัพโหลด"
 
-#: ajax/upload.php:32
+#: ajax/upload.php:72
 msgid "Missing a temporary folder"
 msgstr "โฟลเดอร์ชั่วคราวเกิดการสูญหาย"
 
-#: ajax/upload.php:33
+#: ajax/upload.php:73
 msgid "Failed to write to disk"
 msgstr "เขียนข้อมูลลงแผ่นดิสก์ล้มเหลว"
 
-#: ajax/upload.php:51
+#: ajax/upload.php:91
 msgid "Not enough storage available"
 msgstr "เหลือพื้นที่ไม่เพียงสำหรับใช้งาน"
 
-#: ajax/upload.php:83
+#: ajax/upload.php:123
 msgid "Invalid directory."
 msgstr "ไดเร็กทอรี่ไม่ถูกต้อง"
 
@@ -74,6 +82,36 @@ msgstr "ไดเร็กทอรี่ไม่ถูกต้อง"
 msgid "Files"
 msgstr "ไฟล์"
 
+#: js/file-upload.js:11
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr "ไม่สามารถอัพโหลดไฟล์ของคุณได้ เนื่องจากไฟล์ดังกล่าวเป็นไดเร็กทอรี่ หรือ มีขนาดไฟล์ 0 ไบต์"
+
+#: js/file-upload.js:24
+msgid "Not enough space available"
+msgstr "มีพื้นที่เหลือไม่เพียงพอ"
+
+#: js/file-upload.js:64
+msgid "Upload cancelled."
+msgstr "การอัพโหลดถูกยกเลิก"
+
+#: js/file-upload.js:167 js/files.js:266
+msgid ""
+"File upload is in progress. Leaving the page now will cancel the upload."
+msgstr "การอัพโหลดไฟล์กำลังอยู่ในระหว่างดำเนินการ การออกจากหน้าเว็บนี้จะทำให้การอัพโหลดถูกยกเลิก"
+
+#: js/file-upload.js:233 js/files.js:339
+msgid "URL cannot be empty."
+msgstr "URL ไม่สามารถเว้นว่างได้"
+
+#: js/file-upload.js:238 lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr ""
+
+#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
+#: js/files.js:693 js/files.js:731
+msgid "Error"
+msgstr "ข้อผิดพลาด"
+
 #: js/fileactions.js:116
 msgid "Share"
 msgstr "แชร์"
@@ -90,43 +128,43 @@ msgstr "ลบ"
 msgid "Rename"
 msgstr "เปลี่ยนชื่อ"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:464
 msgid "Pending"
 msgstr "อยู่ระหว่างดำเนินการ"
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "{new_name} already exists"
 msgstr "{new_name} มีอยู่แล้วในระบบ"
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "replace"
 msgstr "แทนที่"
 
-#: js/filelist.js:259
+#: js/filelist.js:302
 msgid "suggest name"
 msgstr "แนะนำชื่อ"
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "cancel"
 msgstr "ยกเลิก"
 
-#: js/filelist.js:306
+#: js/filelist.js:349
 msgid "replaced {new_name} with {old_name}"
 msgstr "แทนที่ {new_name} ด้วย {old_name} แล้ว"
 
-#: js/filelist.js:306
+#: js/filelist.js:349
 msgid "undo"
 msgstr "เลิกทำ"
 
-#: js/filelist.js:331
+#: js/filelist.js:374
 msgid "perform delete operation"
 msgstr "ดำเนินการตามคำสั่งลบ"
 
-#: js/filelist.js:413
+#: js/filelist.js:456
 msgid "1 file uploading"
 msgstr "กำลังอัพโหลดไฟล์ 1 ไฟล์"
 
-#: js/filelist.js:416 js/filelist.js:470
+#: js/filelist.js:459 js/filelist.js:517
 msgid "files uploading"
 msgstr "การอัพโหลดไฟล์"
 
@@ -158,70 +196,42 @@ msgid ""
 "big."
 msgstr "กำลังเตรียมดาวน์โหลดข้อมูล หากไฟล์มีขนาดใหญ่ อาจใช้เวลาสักครู่"
 
-#: js/files.js:264
-msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "ไม่สามารถอัพโหลดไฟล์ของคุณได้ เนื่องจากไฟล์ดังกล่าวเป็นไดเร็กทอรี่ หรือ มีขนาดไฟล์ 0 ไบต์"
-
-#: js/files.js:277
-msgid "Not enough space available"
-msgstr "มีพื้นที่เหลือไม่เพียงพอ"
-
-#: js/files.js:317
-msgid "Upload cancelled."
-msgstr "การอัพโหลดถูกยกเลิก"
-
-#: js/files.js:413
-msgid ""
-"File upload is in progress. Leaving the page now will cancel the upload."
-msgstr "การอัพโหลดไฟล์กำลังอยู่ในระหว่างดำเนินการ การออกจากหน้าเว็บนี้จะทำให้การอัพโหลดถูกยกเลิก"
-
-#: js/files.js:486
-msgid "URL cannot be empty."
-msgstr "URL ไม่สามารถเว้นว่างได้"
-
-#: js/files.js:491
+#: js/files.js:344
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "ชื่อโฟลเดอร์ไม่ถูกต้อง การใช้งาน 'แชร์' สงวนไว้สำหรับ Owncloud เท่านั้น"
 
-#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
-msgid "Error"
-msgstr "ข้อผิดพลาด"
-
-#: js/files.js:877 templates/index.php:69
+#: js/files.js:744 templates/index.php:69
 msgid "Name"
 msgstr "ชื่อ"
 
-#: js/files.js:878 templates/index.php:80
+#: js/files.js:745 templates/index.php:80
 msgid "Size"
 msgstr "ขนาด"
 
-#: js/files.js:879 templates/index.php:82
+#: js/files.js:746 templates/index.php:82
 msgid "Modified"
 msgstr "แก้ไขแล้ว"
 
-#: js/files.js:898
+#: js/files.js:765
 msgid "1 folder"
 msgstr "1 โฟลเดอร์"
 
-#: js/files.js:900
+#: js/files.js:767
 msgid "{count} folders"
 msgstr "{count} โฟลเดอร์"
 
-#: js/files.js:908
+#: js/files.js:775
 msgid "1 file"
 msgstr "1 ไฟล์"
 
-#: js/files.js:910
+#: js/files.js:777
 msgid "{count} files"
 msgstr "{count} ไฟล์"
 
-#: lib/app.php:53
-msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
-msgstr ""
-
 #: lib/app.php:73
-msgid "Unable to rename file"
-msgstr "ไม่สามารถเปลี่ยนชื่อไฟล์ได้"
+#, php-format
+msgid "%s could not be renamed"
+msgstr ""
 
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
@@ -317,6 +327,22 @@ msgstr "ไฟล์กำลังอยู่ระหว่างการส
 msgid "Current scanning"
 msgstr "ไฟล์ที่กำลังสแกนอยู่ขณะนี้"
 
+#: templates/part.list.php:76
+msgid "directory"
+msgstr ""
+
+#: templates/part.list.php:78
+msgid "directories"
+msgstr ""
+
+#: templates/part.list.php:87
+msgid "file"
+msgstr "ไฟล์"
+
+#: templates/part.list.php:89
+msgid "files"
+msgstr "ไฟล์"
+
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
 msgstr "กำลังอัพเกรดหน่วยความจำแคชของระบบไฟล์..."
diff --git a/l10n/th_TH/files_encryption.po b/l10n/th_TH/files_encryption.po
index 2b764c9d97d27b0731fb410fdfc33e2db4654f74..ad469023b19e95e738f1aa94967a2f3a742d41a9 100644
--- a/l10n/th_TH/files_encryption.po
+++ b/l10n/th_TH/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-14 02:46+0200\n"
-"PO-Revision-Date: 2013-06-14 00:47+0000\n"
+"POT-Creation-Date: 2013-07-05 02:12+0200\n"
+"PO-Revision-Date: 2013-07-05 00:13+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"
@@ -55,9 +55,21 @@ msgstr ""
 
 #: files/error.php:7
 msgid ""
-"Your private key is not valid! Maybe your password was changed from outside."
-" You can update your private key password in your personal settings to "
-"regain access to your files"
+"Your private key is not valid! Likely your password was changed outside the "
+"ownCloud system (e.g. your corporate directory). You can update your private"
+" key password in your personal settings to recover access to your encrypted "
+"files."
+msgstr ""
+
+#: hooks/hooks.php:44
+msgid "Missing requirements."
+msgstr ""
+
+#: hooks/hooks.php:45
+msgid ""
+"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL "
+"PHP extension is enabled and configured properly. For now, the encryption "
+"app has been disabled."
 msgstr ""
 
 #: js/settings-admin.js:11
@@ -84,11 +96,11 @@ msgstr "การเข้ารหัส"
 
 #: templates/settings-admin.php:10
 msgid ""
-"Enable encryption passwords recovery key (allow sharing to recovery key):"
+"Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
 #: templates/settings-admin.php:14
-msgid "Recovery account password"
+msgid "Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:21 templates/settings-personal.php:54
@@ -100,15 +112,15 @@ msgid "Disabled"
 msgstr ""
 
 #: templates/settings-admin.php:34
-msgid "Change encryption passwords recovery key:"
+msgid "Change recovery key password:"
 msgstr ""
 
 #: templates/settings-admin.php:41
-msgid "Old Recovery account password"
+msgid "Old Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:48
-msgid "New Recovery account password"
+msgid "New Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:53
diff --git a/l10n/th_TH/files_external.po b/l10n/th_TH/files_external.po
index 64c93b4223a9337a7d0537c5130622d154e76d1d..3c6a6f2bd3ad606837762ab64b854e2609b1fdd8 100644
--- a/l10n/th_TH/files_external.po
+++ b/l10n/th_TH/files_external.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/th_TH/files_sharing.po b/l10n/th_TH/files_sharing.po
index bdabc112bf19e359b00acb14903558f0744a695a..4801631a9ce32254171ad7fb30b0eec5bea20ac5 100644
--- a/l10n/th_TH/files_sharing.po
+++ b/l10n/th_TH/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
 "MIME-Version: 1.0\n"
@@ -18,27 +18,39 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: templates/authenticate.php:4
+msgid "The password is wrong. Try again."
+msgstr ""
+
+#: templates/authenticate.php:7
 msgid "Password"
 msgstr "รหัสผ่าน"
 
-#: templates/authenticate.php:6
+#: templates/authenticate.php:9
 msgid "Submit"
 msgstr "ส่ง"
 
-#: templates/public.php:10
+#: templates/public.php:17
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s ได้แชร์โฟลเดอร์ %s ให้กับคุณ"
 
-#: templates/public.php:13
+#: templates/public.php:20
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s ได้แชร์ไฟล์ %s ให้กับคุณ"
 
-#: templates/public.php:19 templates/public.php:43
+#: templates/public.php:28 templates/public.php:90
 msgid "Download"
 msgstr "ดาวน์โหลด"
 
-#: templates/public.php:40
+#: templates/public.php:45 templates/public.php:48
+msgid "Upload"
+msgstr "อัพโหลด"
+
+#: templates/public.php:58
+msgid "Cancel upload"
+msgstr "ยกเลิกการอัพโหลด"
+
+#: templates/public.php:87
 msgid "No preview available for"
 msgstr "ไม่สามารถดูตัวอย่างได้สำหรับ"
diff --git a/l10n/th_TH/files_trashbin.po b/l10n/th_TH/files_trashbin.po
index d0d5f74b5ecd071432811be362b07842ae1e7b7b..a9c81b5f7568dc4bfacb4eda80c474a1ab32b2d9 100644
--- a/l10n/th_TH/files_trashbin.po
+++ b/l10n/th_TH/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:16+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/th_TH/lib.po b/l10n/th_TH/lib.po
index b2ff943d4025f5aa16fa80314795826ce946a8de..f3f2e8285738c42c64d5aba4c76f2ac718c89be9 100644
--- a/l10n/th_TH/lib.po
+++ b/l10n/th_TH/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
 "MIME-Version: 1.0\n"
@@ -17,43 +17,47 @@ msgstr ""
 "Language: th_TH\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: app.php:359
+#: app.php:360
 msgid "Help"
 msgstr "ช่วยเหลือ"
 
-#: app.php:372
+#: app.php:373
 msgid "Personal"
 msgstr "ส่วนตัว"
 
-#: app.php:383
+#: app.php:384
 msgid "Settings"
 msgstr "ตั้งค่า"
 
-#: app.php:395
+#: app.php:396
 msgid "Users"
 msgstr "ผู้ใช้งาน"
 
-#: app.php:408
+#: app.php:409
 msgid "Apps"
 msgstr "แอปฯ"
 
-#: app.php:416
+#: app.php:417
 msgid "Admin"
 msgstr "ผู้ดูแล"
 
-#: files.php:210
+#: defaults.php:33
+msgid "web services under your control"
+msgstr "เว็บเซอร์วิสที่คุณควบคุมการใช้งานได้"
+
+#: files.php:226
 msgid "ZIP download is turned off."
 msgstr "คุณสมบัติการดาวน์โหลด zip ถูกปิดการใช้งานไว้"
 
-#: files.php:211
+#: files.php:227
 msgid "Files need to be downloaded one by one."
 msgstr "ไฟล์สามารถดาวน์โหลดได้ทีละครั้งเท่านั้น"
 
-#: files.php:212 files.php:245
+#: files.php:228 files.php:261
 msgid "Back to Files"
 msgstr "กลับไปที่ไฟล์"
 
-#: files.php:242
+#: files.php:258
 msgid "Selected files too large to generate zip file."
 msgstr "ไฟล์ที่เลือกมีขนาดใหญ่เกินกว่าที่จะสร้างเป็นไฟล์ zip"
 
@@ -85,104 +89,102 @@ msgstr "ข้อความ"
 msgid "Images"
 msgstr "รูปภาพ"
 
-#: setup.php:34
-msgid "Set an admin username."
-msgstr ""
-
-#: setup.php:37
-msgid "Set an admin password."
-msgstr ""
-
-#: setup.php:55
+#: setup/abstractdatabase.php:22
 #, php-format
 msgid "%s enter the database username."
 msgstr ""
 
-#: setup.php:58
+#: setup/abstractdatabase.php:25
 #, php-format
 msgid "%s enter the database name."
 msgstr ""
 
-#: setup.php:61
+#: setup/abstractdatabase.php:28
 #, php-format
 msgid "%s you may not use dots in the database name"
 msgstr ""
 
-#: setup.php:64
+#: setup/mssql.php:20
 #, php-format
-msgid "%s set the database host."
-msgstr ""
-
-#: setup.php:126 setup.php:332 setup.php:377
-msgid "PostgreSQL username and/or password not valid"
+msgid "MS SQL username and/or password not valid: %s"
 msgstr ""
 
-#: setup.php:127 setup.php:235
+#: setup/mssql.php:21 setup/mysql.php:13 setup/oci.php:114
+#: setup/postgresql.php:24 setup/postgresql.php:70
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:152
-msgid "Oracle connection could not be established"
-msgstr ""
-
-#: setup.php:234
+#: setup/mysql.php:12
 msgid "MySQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:288 setup.php:398 setup.php:407 setup.php:425 setup.php:435
-#: setup.php:444 setup.php:477 setup.php:543 setup.php:569 setup.php:576
-#: setup.php:587 setup.php:594 setup.php:603 setup.php:611 setup.php:620
-#: setup.php:626
+#: setup/mysql.php:67 setup/oci.php:54 setup/oci.php:121 setup/oci.php:147
+#: setup/oci.php:154 setup/oci.php:165 setup/oci.php:172 setup/oci.php:181
+#: setup/oci.php:189 setup/oci.php:198 setup/oci.php:204
+#: setup/postgresql.php:89 setup/postgresql.php:98 setup/postgresql.php:115
+#: setup/postgresql.php:125 setup/postgresql.php:134
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr ""
 
-#: setup.php:289 setup.php:399 setup.php:408 setup.php:426 setup.php:436
-#: setup.php:445 setup.php:478 setup.php:544 setup.php:570 setup.php:577
-#: setup.php:588 setup.php:604 setup.php:612 setup.php:621
+#: setup/mysql.php:68 setup/oci.php:55 setup/oci.php:122 setup/oci.php:148
+#: setup/oci.php:155 setup/oci.php:166 setup/oci.php:182 setup/oci.php:190
+#: setup/oci.php:199 setup/postgresql.php:90 setup/postgresql.php:99
+#: setup/postgresql.php:116 setup/postgresql.php:126 setup/postgresql.php:135
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:305
+#: setup/mysql.php:85
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:306
+#: setup/mysql.php:86
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:311
+#: setup/mysql.php:91
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:312
+#: setup/mysql.php:92
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:469 setup.php:536
+#: setup/oci.php:34
+msgid "Oracle connection could not be established"
+msgstr ""
+
+#: setup/oci.php:41 setup/oci.php:113
 msgid "Oracle username and/or password not valid"
 msgstr ""
 
-#: setup.php:595 setup.php:627
+#: setup/oci.php:173 setup/oci.php:205
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:647
-#, php-format
-msgid "MS SQL username and/or password not valid: %s"
+#: setup/postgresql.php:23 setup/postgresql.php:69
+msgid "PostgreSQL username and/or password not valid"
+msgstr ""
+
+#: setup.php:42
+msgid "Set an admin username."
+msgstr ""
+
+#: setup.php:45
+msgid "Set an admin password."
 msgstr ""
 
-#: setup.php:870
+#: setup.php:198
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:871
+#: setup.php:199
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
diff --git a/l10n/th_TH/settings.po b/l10n/th_TH/settings.po
index 45adad44313fc7fd6ce59022c7006b50655b0118..48fb2e21531fd72626ac2a2b16af458c28c291a3 100644
--- a/l10n/th_TH/settings.po
+++ b/l10n/th_TH/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
 "MIME-Version: 1.0\n"
@@ -88,35 +88,35 @@ msgstr "ไม่สามารถลบผู้ใช้งานออกจ
 msgid "Couldn't update app."
 msgstr "ไม่สามารถอัพเดทแอปฯ"
 
-#: js/apps.js:30
+#: js/apps.js:35
 msgid "Update to {appversion}"
 msgstr "อัพเดทไปเป็นรุ่น {appversion}"
 
-#: js/apps.js:36 js/apps.js:76
+#: js/apps.js:41 js/apps.js:81
 msgid "Disable"
 msgstr "ปิดใช้งาน"
 
-#: js/apps.js:36 js/apps.js:64 js/apps.js:83
+#: js/apps.js:41 js/apps.js:69 js/apps.js:88
 msgid "Enable"
 msgstr "เปิดใช้งาน"
 
-#: js/apps.js:55
+#: js/apps.js:60
 msgid "Please wait...."
 msgstr "กรุณารอสักครู่..."
 
-#: js/apps.js:59 js/apps.js:71 js/apps.js:80 js/apps.js:93
+#: js/apps.js:64 js/apps.js:76 js/apps.js:85 js/apps.js:98
 msgid "Error"
 msgstr "ข้อผิดพลาด"
 
-#: js/apps.js:90
+#: js/apps.js:95
 msgid "Updating...."
 msgstr "กำลังอัพเดทข้อมูล..."
 
-#: js/apps.js:93
+#: js/apps.js:98
 msgid "Error while updating app"
 msgstr "เกิดข้อผิดพลาดในระหว่างการอัพเดทแอปฯ"
 
-#: js/apps.js:96
+#: js/apps.js:101
 msgid "Updated"
 msgstr "อัพเดทแล้ว"
 
@@ -165,15 +165,15 @@ msgstr ""
 msgid "A valid password must be provided"
 msgstr ""
 
-#: personal.php:35 personal.php:36
+#: personal.php:37 personal.php:38
 msgid "__language_name__"
 msgstr "ภาษาไทย"
 
-#: templates/admin.php:15
+#: templates/admin.php:17
 msgid "Security Warning"
 msgstr "คำเตือนเกี่ยวกับความปลอดภัย"
 
-#: templates/admin.php:18
+#: templates/admin.php:20
 msgid ""
 "Your data directory and your files are probably accessible from the "
 "internet. The .htaccess file that ownCloud provides is not working. We "
@@ -182,36 +182,36 @@ msgid ""
 " webserver document root."
 msgstr "ไดเร็กทอรี่ข้อมูลและไฟล์ของคุณสามารถเข้าถึงได้จากอินเทอร์เน็ต ไฟล์ .htaccess ที่ ownCloud มีให้ไม่สามารถทำงานได้อย่างเหมาะสม เราขอแนะนำให้คุณกำหนดค่าเว็บเซิร์ฟเวอร์ใหม่ในรูปแบบที่ไดเร็กทอรี่เก็บข้อมูลไม่สามารถเข้าถึงได้อีกต่อไป หรือคุณได้ย้ายไดเร็กทอรี่ที่ใช้เก็บข้อมูลไปอยู่ภายนอกตำแหน่ง root ของเว็บเซิร์ฟเวอร์แล้ว"
 
-#: templates/admin.php:29
+#: templates/admin.php:31
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:32
+#: templates/admin.php:34
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: templates/admin.php:33
+#: templates/admin.php:35
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:44
+#: templates/admin.php:46
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:47
+#: templates/admin.php:49
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr ""
 
-#: templates/admin.php:58
+#: templates/admin.php:60
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:63
+#: templates/admin.php:65
 #, php-format
 msgid ""
 "This ownCloud server can't set system locale to %s. This means that there "
@@ -219,11 +219,11 @@ msgid ""
 " to install the required packages on your system to support %s."
 msgstr ""
 
-#: templates/admin.php:75
+#: templates/admin.php:77
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:78
+#: templates/admin.php:80
 msgid ""
 "This ownCloud server has no working internet connection. This means that "
 "some of the features like mounting of external storage, notifications about "
@@ -233,102 +233,102 @@ msgid ""
 " of ownCloud."
 msgstr ""
 
-#: templates/admin.php:92
+#: templates/admin.php:94
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:101
+#: templates/admin.php:103
 msgid "Execute one task with each page loaded"
 msgstr "ประมวลคำสั่งหนึ่งงานในแต่ละครั้งที่มีการโหลดหน้าเว็บ"
 
-#: templates/admin.php:111
+#: templates/admin.php:113
 msgid ""
 "cron.php is registered at a webcron service. Call the cron.php page in the "
 "owncloud root once a minute over http."
 msgstr "cron.php ได้รับการลงทะเบียนแล้วกับเว็บผู้ให้บริการ webcron เรียกหน้าเว็บ cron.php ที่ตำแหน่ง root ของ owncloud หลังจากนี้สักครู่ผ่านทาง http"
 
-#: templates/admin.php:121
+#: templates/admin.php:123
 msgid ""
 "Use systems cron service. Call the cron.php file in the owncloud folder via "
 "a system cronjob once a minute."
 msgstr "ใช้บริการ cron จากระบบ เรียกไฟล์ cron.php ในโฟลเดอร์ owncloud ผ่านทาง cronjob ของระบบหลังจากนี้สักครู่"
 
-#: templates/admin.php:128
+#: templates/admin.php:130
 msgid "Sharing"
 msgstr "การแชร์ข้อมูล"
 
-#: templates/admin.php:134
+#: templates/admin.php:136
 msgid "Enable Share API"
 msgstr "เปิดใช้งาน API สำหรับคุณสมบัติแชร์ข้อมูล"
 
-#: templates/admin.php:135
+#: templates/admin.php:137
 msgid "Allow apps to use the Share API"
 msgstr "อนุญาตให้แอปฯสามารถใช้ API สำหรับแชร์ข้อมูลได้"
 
-#: templates/admin.php:142
+#: templates/admin.php:144
 msgid "Allow links"
 msgstr "อนุญาตให้ใช้งานลิงก์ได้"
 
-#: templates/admin.php:143
+#: templates/admin.php:145
 msgid "Allow users to share items to the public with links"
 msgstr "อนุญาตให้ผู้ใช้งานสามารถแชร์ข้อมูลรายการต่างๆไปให้สาธารณะชนเป็นลิงก์ได้"
 
-#: templates/admin.php:150
+#: templates/admin.php:152
 msgid "Allow resharing"
 msgstr "อนุญาตให้แชร์ข้อมูลซ้ำใหม่ได้"
 
-#: templates/admin.php:151
+#: templates/admin.php:153
 msgid "Allow users to share items shared with them again"
 msgstr "อนุญาตให้ผู้ใช้งานแชร์ข้อมูลรายการต่างๆที่ถูกแชร์มาให้ตัวผู้ใช้งานได้เท่านั้น"
 
-#: templates/admin.php:158
+#: templates/admin.php:160
 msgid "Allow users to share with anyone"
 msgstr "อนุญาตให้ผู้ใช้งานแชร์ข้อมูลถึงใครก็ได้"
 
-#: templates/admin.php:161
+#: templates/admin.php:163
 msgid "Allow users to only share with users in their groups"
 msgstr "อนุญาตให้ผู้ใช้งานแชร์ข้อมูลได้เฉพาะกับผู้ใช้งานที่อยู่ในกลุ่มเดียวกันเท่านั้น"
 
-#: templates/admin.php:168
+#: templates/admin.php:170
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:181
+#: templates/admin.php:183
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:182
+#: templates/admin.php:184
 msgid ""
 "Enforces the clients to connect to ownCloud via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:185
+#: templates/admin.php:187
 msgid ""
 "Please connect to this ownCloud instance via HTTPS to enable or disable the "
 "SSL enforcement."
 msgstr ""
 
-#: templates/admin.php:195
+#: templates/admin.php:197
 msgid "Log"
 msgstr "บันทึกการเปลี่ยนแปลง"
 
-#: templates/admin.php:196
+#: templates/admin.php:198
 msgid "Log level"
 msgstr "ระดับการเก็บบันทึก log"
 
-#: templates/admin.php:227
+#: templates/admin.php:229
 msgid "More"
 msgstr "มาก"
 
-#: templates/admin.php:228
+#: templates/admin.php:230
 msgid "Less"
 msgstr "น้อย"
 
-#: templates/admin.php:235 templates/personal.php:116
+#: templates/admin.php:236 templates/personal.php:116
 msgid "Version"
 msgstr "รุ่น"
 
-#: templates/admin.php:237 templates/personal.php:119
+#: templates/admin.php:240 templates/personal.php:119
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -386,76 +386,79 @@ msgstr "Bugtracker"
 msgid "Commercial Support"
 msgstr "บริการลูกค้าแบบเสียค่าใช้จ่าย"
 
-#: templates/personal.php:9
+#: templates/personal.php:10
 msgid "Get the apps to sync your files"
 msgstr ""
 
-#: templates/personal.php:20
+#: templates/personal.php:21
 msgid "Show First Run Wizard again"
 msgstr "แสดงหน้าจอวิซาร์ดนำทางครั้งแรกอีกครั้ง"
 
-#: templates/personal.php:28
+#: templates/personal.php:29
 #, php-format
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "คุณได้ใช้งานไปแล้ว <strong>%s</strong> จากจำนวนที่สามารถใช้ได้ <strong>%s</strong>"
 
-#: templates/personal.php:40 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:41 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "รหัสผ่าน"
 
-#: templates/personal.php:41
+#: templates/personal.php:42
 msgid "Your password was changed"
 msgstr "รหัสผ่านของคุณถูกเปลี่ยนแล้ว"
 
-#: templates/personal.php:42
+#: templates/personal.php:43
 msgid "Unable to change your password"
 msgstr "ไม่สามารถเปลี่ยนรหัสผ่านของคุณได้"
 
-#: templates/personal.php:43
+#: templates/personal.php:44
 msgid "Current password"
 msgstr "รหัสผ่านปัจจุบัน"
 
-#: templates/personal.php:45
+#: templates/personal.php:46
 msgid "New password"
 msgstr "รหัสผ่านใหม่"
 
-#: templates/personal.php:47
+#: templates/personal.php:48
 msgid "Change password"
 msgstr "เปลี่ยนรหัสผ่าน"
 
-#: templates/personal.php:59 templates/users.php:85
+#: templates/personal.php:60 templates/users.php:85
 msgid "Display Name"
 msgstr "ชื่อที่ต้องการแสดง"
 
-#: templates/personal.php:74
+#: templates/personal.php:75
 msgid "Email"
 msgstr "อีเมล"
 
-#: templates/personal.php:76
+#: templates/personal.php:77
 msgid "Your email address"
 msgstr "ที่อยู่อีเมล์ของคุณ"
 
-#: templates/personal.php:77
+#: templates/personal.php:78
 msgid "Fill in an email address to enable password recovery"
 msgstr "กรอกที่อยู่อีเมล์ของคุณเพื่อเปิดให้มีการกู้คืนรหัสผ่านได้"
 
-#: templates/personal.php:86 templates/personal.php:87
+#: templates/personal.php:87 templates/personal.php:88
 msgid "Language"
 msgstr "ภาษา"
 
-#: templates/personal.php:99
+#: templates/personal.php:100
 msgid "Help translate"
 msgstr "ช่วยกันแปล"
 
-#: templates/personal.php:105
+#: templates/personal.php:106
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:107
-msgid "Use this address to connect to your ownCloud in your file manager"
-msgstr "ใช้ที่อยู่นี้เพื่อเชื่อมต่อกับ ownCloud ในโปรแกรมจัดการไฟล์ของคุณ"
+#: templates/personal.php:108
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
+"target=\"_blank\">access your Files via WebDAV</a>"
+msgstr ""
 
-#: templates/users.php:21 templates/users.php:84
+#: templates/users.php:21
 msgid "Login Name"
 msgstr "ชื่อที่ใช้สำหรับเข้าสู่ระบบ"
 
@@ -485,6 +488,10 @@ msgstr "ไม่จำกัดจำนวน"
 msgid "Other"
 msgstr "อื่นๆ"
 
+#: templates/users.php:84
+msgid "Username"
+msgstr "ชื่อผู้ใช้งาน"
+
 #: templates/users.php:91
 msgid "Storage"
 msgstr "พื้นที่จัดเก็บข้อมูล"
diff --git a/l10n/th_TH/user_ldap.po b/l10n/th_TH/user_ldap.po
index c0b46a90d0a4f764ca525e330010cacb4e5320f2..9a2b54c0bf2e1f628d9e6ce56e4b834497e2e1f3 100644
--- a/l10n/th_TH/user_ldap.po
+++ b/l10n/th_TH/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:25+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:16+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/tr/core.po b/l10n/tr/core.po
index 00b3a6fdd0e416989e81b2237f8b44317fec30c7..7f59f4a0c91f2511f4bf17958ba4cf985f566f05 100644
--- a/l10n/tr/core.po
+++ b/l10n/tr/core.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:22+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
 "MIME-Version: 1.0\n"
@@ -62,135 +62,135 @@ msgstr "Silmek için bir kategori seçilmedi"
 msgid "Error removing %s from favorites."
 msgstr "%s favorilere çıkarılırken hata oluştu"
 
-#: js/config.php:34
+#: js/config.php:32
 msgid "Sunday"
 msgstr "Pazar"
 
-#: js/config.php:35
+#: js/config.php:33
 msgid "Monday"
 msgstr "Pazartesi"
 
-#: js/config.php:36
+#: js/config.php:34
 msgid "Tuesday"
 msgstr "Salı"
 
-#: js/config.php:37
+#: js/config.php:35
 msgid "Wednesday"
 msgstr "Çarşamba"
 
-#: js/config.php:38
+#: js/config.php:36
 msgid "Thursday"
 msgstr "PerÅŸembe"
 
-#: js/config.php:39
+#: js/config.php:37
 msgid "Friday"
 msgstr "Cuma"
 
-#: js/config.php:40
+#: js/config.php:38
 msgid "Saturday"
 msgstr "Cumartesi"
 
-#: js/config.php:45
+#: js/config.php:43
 msgid "January"
 msgstr "Ocak"
 
-#: js/config.php:46
+#: js/config.php:44
 msgid "February"
 msgstr "Åžubat"
 
-#: js/config.php:47
+#: js/config.php:45
 msgid "March"
 msgstr "Mart"
 
-#: js/config.php:48
+#: js/config.php:46
 msgid "April"
 msgstr "Nisan"
 
-#: js/config.php:49
+#: js/config.php:47
 msgid "May"
 msgstr "Mayıs"
 
-#: js/config.php:50
+#: js/config.php:48
 msgid "June"
 msgstr "Haziran"
 
-#: js/config.php:51
+#: js/config.php:49
 msgid "July"
 msgstr "Temmuz"
 
-#: js/config.php:52
+#: js/config.php:50
 msgid "August"
 msgstr "AÄŸustos"
 
-#: js/config.php:53
+#: js/config.php:51
 msgid "September"
 msgstr "Eylül"
 
-#: js/config.php:54
+#: js/config.php:52
 msgid "October"
 msgstr "Ekim"
 
-#: js/config.php:55
+#: js/config.php:53
 msgid "November"
 msgstr "Kasım"
 
-#: js/config.php:56
+#: js/config.php:54
 msgid "December"
 msgstr "Aralık"
 
-#: js/js.js:286
+#: js/js.js:293
 msgid "Settings"
 msgstr "Ayarlar"
 
-#: js/js.js:718
+#: js/js.js:725
 msgid "seconds ago"
 msgstr "saniye önce"
 
-#: js/js.js:719
+#: js/js.js:726
 msgid "1 minute ago"
 msgstr "1 dakika önce"
 
-#: js/js.js:720
+#: js/js.js:727
 msgid "{minutes} minutes ago"
 msgstr "{minutes} dakika önce"
 
-#: js/js.js:721
+#: js/js.js:728
 msgid "1 hour ago"
 msgstr "1 saat önce"
 
-#: js/js.js:722
+#: js/js.js:729
 msgid "{hours} hours ago"
 msgstr "{hours} saat önce"
 
-#: js/js.js:723
+#: js/js.js:730
 msgid "today"
 msgstr "bugün"
 
-#: js/js.js:724
+#: js/js.js:731
 msgid "yesterday"
 msgstr "dün"
 
-#: js/js.js:725
+#: js/js.js:732
 msgid "{days} days ago"
 msgstr "{days} gün önce"
 
-#: js/js.js:726
+#: js/js.js:733
 msgid "last month"
 msgstr "geçen ay"
 
-#: js/js.js:727
+#: js/js.js:734
 msgid "{months} months ago"
 msgstr "{months} ay önce"
 
-#: js/js.js:728
+#: js/js.js:735
 msgid "months ago"
 msgstr "ay önce"
 
-#: js/js.js:729
+#: js/js.js:736
 msgid "last year"
 msgstr "geçen yıl"
 
-#: js/js.js:730
+#: js/js.js:737
 msgid "years ago"
 msgstr "yıl önce"
 
@@ -226,8 +226,8 @@ msgstr "Nesne türü belirtilmemiş."
 #: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
 #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:577
-#: js/share.js:589
+#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:620
+#: js/share.js:632
 msgid "Error"
 msgstr "Hata"
 
@@ -247,7 +247,7 @@ msgstr "Paylaşılan"
 msgid "Share"
 msgstr "PaylaÅŸ"
 
-#: js/share.js:125 js/share.js:617
+#: js/share.js:125 js/share.js:660
 msgid "Error while sharing"
 msgstr "Paylaşım sırasında hata  "
 
@@ -267,99 +267,103 @@ msgstr " {owner} tarafından sizinle ve {group} ile paylaştırılmış"
 msgid "Shared with you by {owner}"
 msgstr "{owner} trafından sizinle paylaştırıldı"
 
-#: js/share.js:159
+#: js/share.js:172
 msgid "Share with"
 msgstr "ile PaylaÅŸ"
 
-#: js/share.js:164
+#: js/share.js:177
 msgid "Share with link"
 msgstr "Bağlantı ile paylaş"
 
-#: js/share.js:167
+#: js/share.js:180
 msgid "Password protect"
 msgstr "Şifre korunması"
 
-#: js/share.js:169 templates/installation.php:54 templates/login.php:26
+#: js/share.js:182 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "Parola"
 
-#: js/share.js:173
+#: js/share.js:187
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:191
 msgid "Email link to person"
 msgstr "KiÅŸiye e-posta linki"
 
-#: js/share.js:174
+#: js/share.js:192
 msgid "Send"
 msgstr "Gönder"
 
-#: js/share.js:178
+#: js/share.js:197
 msgid "Set expiration date"
 msgstr "Son kullanma tarihini ayarla"
 
-#: js/share.js:179
+#: js/share.js:198
 msgid "Expiration date"
 msgstr "Son kullanım tarihi"
 
-#: js/share.js:211
+#: js/share.js:230
 msgid "Share via email:"
 msgstr "Eposta ile paylaÅŸ"
 
-#: js/share.js:213
+#: js/share.js:232
 msgid "No people found"
 msgstr "Kişi bulunamadı"
 
-#: js/share.js:251
+#: js/share.js:270
 msgid "Resharing is not allowed"
 msgstr "Tekrar paylaÅŸmaya izin verilmiyor"
 
-#: js/share.js:287
+#: js/share.js:306
 msgid "Shared in {item} with {user}"
 msgstr " {item} içinde  {user} ile paylaşılanlarlar"
 
-#: js/share.js:308
+#: js/share.js:327
 msgid "Unshare"
 msgstr "Paylaşılmayan"
 
-#: js/share.js:320
+#: js/share.js:339
 msgid "can edit"
 msgstr "düzenleyebilir"
 
-#: js/share.js:322
+#: js/share.js:341
 msgid "access control"
 msgstr "erişim kontrolü"
 
-#: js/share.js:325
+#: js/share.js:344
 msgid "create"
 msgstr "oluÅŸtur"
 
-#: js/share.js:328
+#: js/share.js:347
 msgid "update"
 msgstr "güncelle"
 
-#: js/share.js:331
+#: js/share.js:350
 msgid "delete"
 msgstr "sil"
 
-#: js/share.js:334
+#: js/share.js:353
 msgid "share"
 msgstr "paylaÅŸ"
 
-#: js/share.js:368 js/share.js:564
+#: js/share.js:387 js/share.js:607
 msgid "Password protected"
 msgstr "Paralo korumalı"
 
-#: js/share.js:577
+#: js/share.js:620
 msgid "Error unsetting expiration date"
 msgstr "Geçerlilik tarihi tanımlama kaldırma hatası"
 
-#: js/share.js:589
+#: js/share.js:632
 msgid "Error setting expiration date"
 msgstr "Geçerlilik tarihi tanımlama hatası"
 
-#: js/share.js:604
+#: js/share.js:647
 msgid "Sending ..."
 msgstr "Gönderiliyor..."
 
-#: js/share.js:615
+#: js/share.js:658
 msgid "Email sent"
 msgstr "Eposta gönderildi"
 
@@ -374,7 +378,7 @@ msgstr "Güncelleme başarılı olmadı. Lütfen bu hatayı bildirin <a href=\"h
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "Güncelleme başarılı. ownCloud'a yönlendiriliyor."
 
-#: lostpassword/controller.php:58
+#: lostpassword/controller.php:60
 msgid "ownCloud password reset"
 msgstr "ownCloud parola sıfırlama"
 
@@ -404,17 +408,17 @@ msgstr "Kullanıcı Adı"
 
 #: lostpassword/templates/lostpassword.php:22
 msgid ""
-"Your files seems to be encrypted. If you didn't have enabled the recovery "
-"key there will be no way to get your data back once the password was "
-"resetted. If you are not sure what to do, please contact your administrator "
-"first before continue. Do you really want to continue?"
+"Your files are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
 msgstr ""
 
 #: lostpassword/templates/lostpassword.php:24
 msgid "Yes, I really want to reset my password now"
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:29
+#: lostpassword/templates/lostpassword.php:27
 msgid "Request reset"
 msgstr "Sıfırlama iste"
 
@@ -462,7 +466,7 @@ msgstr "Erişim yasaklı"
 msgid "Cloud not found"
 msgstr "Bulut bulunamadı"
 
-#: templates/altmail.php:2
+#: templates/altmail.php:4
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -473,10 +477,6 @@ msgid ""
 "Cheers!"
 msgstr ""
 
-#: templates/altmail.php:7 templates/mail.php:24
-msgid "web services under your control"
-msgstr "Bilgileriniz güvenli ve şifreli"
-
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
 msgstr "Kategorileri düzenle"
@@ -569,12 +569,12 @@ msgstr "Veritabanı sunucusu"
 msgid "Finish setup"
 msgstr "Kurulumu tamamla"
 
-#: templates/layout.user.php:40
+#: templates/layout.user.php:43
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr "%s mevcuttur. Güncelleştirme hakkında daha fazla bilgi alın."
 
-#: templates/layout.user.php:67
+#: templates/layout.user.php:68
 msgid "Log out"
 msgstr "Çıkış yap"
 
@@ -608,7 +608,7 @@ msgstr "GiriÅŸ yap"
 msgid "Alternative Logins"
 msgstr "Alternatif GiriÅŸler"
 
-#: templates/mail.php:15
+#: templates/mail.php:16
 #, php-format
 msgid ""
 "Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
diff --git a/l10n/tr/files.po b/l10n/tr/files.po
index e861719cc294d85d5e439a446264e63b1b18ad80..3200d202081f4e6f49a32251932e90d6c39a6160 100644
--- a/l10n/tr/files.po
+++ b/l10n/tr/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-06-17 02:01+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
-"Last-Translator: ismail yenigül <ismail.yenigul@surgate.com>\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -28,46 +28,54 @@ msgstr "%s taşınamadı. Bu isimde dosya zaten var."
 msgid "Could not move %s"
 msgstr "%s taşınamadı"
 
-#: ajax/upload.php:19
+#: ajax/upload.php:16 ajax/upload.php:45
+msgid "Unable to set upload directory."
+msgstr ""
+
+#: ajax/upload.php:22
+msgid "Invalid Token"
+msgstr ""
+
+#: ajax/upload.php:59
 msgid "No file was uploaded. Unknown error"
 msgstr "Dosya yüklenmedi. Bilinmeyen hata"
 
-#: ajax/upload.php:26
+#: ajax/upload.php:66
 msgid "There is no error, the file uploaded with success"
 msgstr "Dosya başarıyla yüklendi, hata oluşmadı"
 
-#: ajax/upload.php:27
+#: ajax/upload.php:67
 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:29
+#: ajax/upload.php:69
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Yüklenecek dosyanın boyutu HTML formunda belirtilen MAX_FILE_SIZE limitini aşıyor"
 
-#: ajax/upload.php:30
+#: ajax/upload.php:70
 msgid "The uploaded file was only partially uploaded"
 msgstr "Dosya kısmen karşıya yüklenebildi"
 
-#: ajax/upload.php:31
+#: ajax/upload.php:71
 msgid "No file was uploaded"
 msgstr "Hiç dosya gönderilmedi"
 
-#: ajax/upload.php:32
+#: ajax/upload.php:72
 msgid "Missing a temporary folder"
 msgstr "Geçici dizin eksik"
 
-#: ajax/upload.php:33
+#: ajax/upload.php:73
 msgid "Failed to write to disk"
 msgstr "Diske yazılamadı"
 
-#: ajax/upload.php:51
+#: ajax/upload.php:91
 msgid "Not enough storage available"
 msgstr "Yeterli disk alanı yok"
 
-#: ajax/upload.php:83
+#: ajax/upload.php:123
 msgid "Invalid directory."
 msgstr "Geçersiz dizin."
 
@@ -75,6 +83,36 @@ msgstr "Geçersiz dizin."
 msgid "Files"
 msgstr "Dosyalar"
 
+#: js/file-upload.js:11
+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/file-upload.js:24
+msgid "Not enough space available"
+msgstr "Yeterli disk alanı yok"
+
+#: js/file-upload.js:64
+msgid "Upload cancelled."
+msgstr "Yükleme iptal edildi."
+
+#: js/file-upload.js:167 js/files.js:266
+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/file-upload.js:233 js/files.js:339
+msgid "URL cannot be empty."
+msgstr "URL boÅŸ olamaz."
+
+#: js/file-upload.js:238 lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr "Geçersiz dizin adı. 'Shared' dizin ismi kullanımı ownCloud tarafından rezerve edilmiştir."
+
+#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
+#: js/files.js:693 js/files.js:731
+msgid "Error"
+msgstr "Hata"
+
 #: js/fileactions.js:116
 msgid "Share"
 msgstr "PaylaÅŸ"
@@ -91,43 +129,43 @@ msgstr "Sil"
 msgid "Rename"
 msgstr "Ä°sim deÄŸiÅŸtir."
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:464
 msgid "Pending"
 msgstr "Bekliyor"
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "{new_name} already exists"
 msgstr "{new_name} zaten mevcut"
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "replace"
 msgstr "deÄŸiÅŸtir"
 
-#: js/filelist.js:259
+#: js/filelist.js:302
 msgid "suggest name"
 msgstr "Öneri ad"
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "cancel"
 msgstr "iptal"
 
-#: js/filelist.js:306
+#: js/filelist.js:349
 msgid "replaced {new_name} with {old_name}"
 msgstr "{new_name} ismi {old_name} ile deÄŸiÅŸtirildi"
 
-#: js/filelist.js:306
+#: js/filelist.js:349
 msgid "undo"
 msgstr "geri al"
 
-#: js/filelist.js:331
+#: js/filelist.js:374
 msgid "perform delete operation"
 msgstr "Silme işlemini gerçekleştir"
 
-#: js/filelist.js:413
+#: js/filelist.js:456
 msgid "1 file uploading"
 msgstr "1 dosya yüklendi"
 
-#: js/filelist.js:416 js/filelist.js:470
+#: js/filelist.js:459 js/filelist.js:517
 msgid "files uploading"
 msgstr "Dosyalar yükleniyor"
 
@@ -159,70 +197,42 @@ msgid ""
 "big."
 msgstr "İndirmeniz hazırlanıyor. Dosya büyük ise biraz zaman alabilir."
 
-#: js/files.js:264
-msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "Dosyanızın boyutu 0 byte olduğundan veya bir dizin olduğundan yüklenemedi"
-
-#: js/files.js:277
-msgid "Not enough space available"
-msgstr "Yeterli disk alanı yok"
-
-#: js/files.js:317
-msgid "Upload cancelled."
-msgstr "Yükleme iptal edildi."
-
-#: js/files.js:413
-msgid ""
-"File upload is in progress. Leaving the page now will cancel the upload."
-msgstr "Dosya yükleme işlemi sürüyor. Şimdi sayfadan ayrılırsanız işleminiz iptal olur."
-
-#: js/files.js:486
-msgid "URL cannot be empty."
-msgstr "URL boÅŸ olamaz."
-
-#: js/files.js:491
+#: js/files.js:344
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Geçersiz dizin adı. Shared isminin kullanımı Owncloud tarafından rezerver edilmiştir."
 
-#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
-msgid "Error"
-msgstr "Hata"
-
-#: js/files.js:877 templates/index.php:69
+#: js/files.js:744 templates/index.php:69
 msgid "Name"
 msgstr "Ä°sim"
 
-#: js/files.js:878 templates/index.php:80
+#: js/files.js:745 templates/index.php:80
 msgid "Size"
 msgstr "Boyut"
 
-#: js/files.js:879 templates/index.php:82
+#: js/files.js:746 templates/index.php:82
 msgid "Modified"
 msgstr "DeÄŸiÅŸtirilme"
 
-#: js/files.js:898
+#: js/files.js:765
 msgid "1 folder"
 msgstr "1 dizin"
 
-#: js/files.js:900
+#: js/files.js:767
 msgid "{count} folders"
 msgstr "{count} dizin"
 
-#: js/files.js:908
+#: js/files.js:775
 msgid "1 file"
 msgstr "1 dosya"
 
-#: js/files.js:910
+#: js/files.js:777
 msgid "{count} files"
 msgstr "{count} dosya"
 
-#: lib/app.php:53
-msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
-msgstr "Geçersiz dizin adı. 'Shared' dizin ismi kullanımı ownCloud tarafından rezerve edilmiştir."
-
 #: lib/app.php:73
-msgid "Unable to rename file"
-msgstr "Dosya adı değiştirilemedi"
+#, php-format
+msgid "%s could not be renamed"
+msgstr ""
 
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
@@ -318,6 +328,22 @@ msgstr "Dosyalar taranıyor, lütfen bekleyin."
 msgid "Current scanning"
 msgstr "Güncel tarama"
 
+#: templates/part.list.php:76
+msgid "directory"
+msgstr ""
+
+#: templates/part.list.php:78
+msgid "directories"
+msgstr ""
+
+#: templates/part.list.php:87
+msgid "file"
+msgstr "dosya"
+
+#: templates/part.list.php:89
+msgid "files"
+msgstr "dosyalar"
+
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
 msgstr "Sistem dosyası önbelleği güncelleniyor"
diff --git a/l10n/tr/files_encryption.po b/l10n/tr/files_encryption.po
index e6a73fd95a098b485fadfddb102588a7ecd89451..5948a3dedb375809e908e6ebdc48bf41269a9d97 100644
--- a/l10n/tr/files_encryption.po
+++ b/l10n/tr/files_encryption.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-14 02:46+0200\n"
-"PO-Revision-Date: 2013-06-14 00:47+0000\n"
+"POT-Creation-Date: 2013-07-05 02:12+0200\n"
+"PO-Revision-Date: 2013-07-05 00:13+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
 "MIME-Version: 1.0\n"
@@ -56,9 +56,21 @@ msgstr ""
 
 #: files/error.php:7
 msgid ""
-"Your private key is not valid! Maybe your password was changed from outside."
-" You can update your private key password in your personal settings to "
-"regain access to your files"
+"Your private key is not valid! Likely your password was changed outside the "
+"ownCloud system (e.g. your corporate directory). You can update your private"
+" key password in your personal settings to recover access to your encrypted "
+"files."
+msgstr ""
+
+#: hooks/hooks.php:44
+msgid "Missing requirements."
+msgstr ""
+
+#: hooks/hooks.php:45
+msgid ""
+"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL "
+"PHP extension is enabled and configured properly. For now, the encryption "
+"app has been disabled."
 msgstr ""
 
 #: js/settings-admin.js:11
@@ -85,12 +97,12 @@ msgstr "Åžifreleme"
 
 #: templates/settings-admin.php:10
 msgid ""
-"Enable encryption passwords recovery key (allow sharing to recovery key):"
-msgstr "Şifreli parola kurtarma anahtarını etkinleştir(kurtarma anahtarı paylaşımına izin ver)"
+"Enable recovery key (allow to recover users files in case of password loss):"
+msgstr ""
 
 #: templates/settings-admin.php:14
-msgid "Recovery account password"
-msgstr "Kurtarma hesabı parolası"
+msgid "Recovery key password"
+msgstr ""
 
 #: templates/settings-admin.php:21 templates/settings-personal.php:54
 msgid "Enabled"
@@ -101,16 +113,16 @@ msgid "Disabled"
 msgstr "Devre dışı"
 
 #: templates/settings-admin.php:34
-msgid "Change encryption passwords recovery key:"
-msgstr "Şifreli parolalar kurtarma anahtarını değiştir:"
+msgid "Change recovery key password:"
+msgstr ""
 
 #: templates/settings-admin.php:41
-msgid "Old Recovery account password"
-msgstr "Eski kurtarma hesabı parolası"
+msgid "Old Recovery key password"
+msgstr ""
 
 #: templates/settings-admin.php:48
-msgid "New Recovery account password"
-msgstr "Yeni kurtarma hesabı parolası"
+msgid "New Recovery key password"
+msgstr ""
 
 #: templates/settings-admin.php:53
 msgid "Change Password"
diff --git a/l10n/tr/files_external.po b/l10n/tr/files_external.po
index 701dcb2efcf5f0ebe2dd9680640b273a72dcb708..dbf1df741862a361663fff8582dd9f20ae2f2620 100644
--- a/l10n/tr/files_external.po
+++ b/l10n/tr/files_external.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/tr/files_sharing.po b/l10n/tr/files_sharing.po
index 959c5e043083473acd33c58bbc83c4fd1da69b12..3f20f1dc1d942cb06f94c9a60c5d0f84ed09fcbf 100644
--- a/l10n/tr/files_sharing.po
+++ b/l10n/tr/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
 "MIME-Version: 1.0\n"
@@ -18,27 +18,39 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: templates/authenticate.php:4
+msgid "The password is wrong. Try again."
+msgstr ""
+
+#: templates/authenticate.php:7
 msgid "Password"
 msgstr "Parola"
 
-#: templates/authenticate.php:6
+#: templates/authenticate.php:9
 msgid "Submit"
 msgstr "Gönder"
 
-#: templates/public.php:10
+#: templates/public.php:17
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s sizinle paylaşılan  %s klasör"
 
-#: templates/public.php:13
+#: templates/public.php:20
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s sizinle paylaşılan  %s klasör"
 
-#: templates/public.php:19 templates/public.php:43
+#: templates/public.php:28 templates/public.php:90
 msgid "Download"
 msgstr "Ä°ndir"
 
-#: templates/public.php:40
+#: templates/public.php:45 templates/public.php:48
+msgid "Upload"
+msgstr "Yükle"
+
+#: templates/public.php:58
+msgid "Cancel upload"
+msgstr "Yüklemeyi iptal et"
+
+#: templates/public.php:87
 msgid "No preview available for"
 msgstr "Kullanılabilir önizleme yok"
diff --git a/l10n/tr/files_trashbin.po b/l10n/tr/files_trashbin.po
index c13957b998668b2e53bebe3a4e8c16b8ab9155a9..8c9f08695d89caf86c8b60f24cae161496ed0b1e 100644
--- a/l10n/tr/files_trashbin.po
+++ b/l10n/tr/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:16+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/tr/lib.po b/l10n/tr/lib.po
index 0588ebd182b9a1c33d449fde84a38c3e43bc3871..140afd16017de82c1802eef1e82fee1ec821b3d5 100644
--- a/l10n/tr/lib.po
+++ b/l10n/tr/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-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
-"Last-Translator: ismail yenigül <ismail.yenigul@surgate.com>\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,43 +18,47 @@ msgstr ""
 "Language: tr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: app.php:359
+#: app.php:360
 msgid "Help"
 msgstr "Yardım"
 
-#: app.php:372
+#: app.php:373
 msgid "Personal"
 msgstr "KiÅŸisel"
 
-#: app.php:383
+#: app.php:384
 msgid "Settings"
 msgstr "Ayarlar"
 
-#: app.php:395
+#: app.php:396
 msgid "Users"
 msgstr "Kullanıcılar"
 
-#: app.php:408
+#: app.php:409
 msgid "Apps"
 msgstr "Uygulamalar"
 
-#: app.php:416
+#: app.php:417
 msgid "Admin"
 msgstr "Yönetici"
 
-#: files.php:210
+#: defaults.php:33
+msgid "web services under your control"
+msgstr "Bilgileriniz güvenli ve şifreli"
+
+#: files.php:226
 msgid "ZIP download is turned off."
 msgstr "ZIP indirmeleri kapatılmıştır."
 
-#: files.php:211
+#: files.php:227
 msgid "Files need to be downloaded one by one."
 msgstr "Dosyaların birer birer indirilmesi gerekmektedir."
 
-#: files.php:212 files.php:245
+#: files.php:228 files.php:261
 msgid "Back to Files"
 msgstr "Dosyalara dön"
 
-#: files.php:242
+#: files.php:258
 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."
 
@@ -86,104 +90,102 @@ msgstr "Metin"
 msgid "Images"
 msgstr "Resimler"
 
-#: setup.php:34
-msgid "Set an admin username."
-msgstr "Bir adi kullanici vermek. "
-
-#: setup.php:37
-msgid "Set an admin password."
-msgstr "Parola yonetici birlemek. "
-
-#: setup.php:55
+#: setup/abstractdatabase.php:22
 #, php-format
 msgid "%s enter the database username."
 msgstr "%s veritabanı kullanıcı adını gir."
 
-#: setup.php:58
+#: setup/abstractdatabase.php:25
 #, php-format
 msgid "%s enter the database name."
 msgstr "%s veritabanı adını gir."
 
-#: setup.php:61
+#: setup/abstractdatabase.php:28
 #, php-format
 msgid "%s you may not use dots in the database name"
 msgstr "%s veritabanı adında nokta kullanamayabilirsiniz"
 
-#: setup.php:64
+#: setup/mssql.php:20
 #, php-format
-msgid "%s set the database host."
-msgstr "%s veritabanı sunucu adını tanımla"
-
-#: setup.php:126 setup.php:332 setup.php:377
-msgid "PostgreSQL username and/or password not valid"
-msgstr "PostgreSQL adi kullanici ve/veya parola yasal degildir. "
+msgid "MS SQL username and/or password not valid: %s"
+msgstr "MS SQL kullanıcı adı ve/veya parolası geçersiz: %s"
 
-#: setup.php:127 setup.php:235
+#: setup/mssql.php:21 setup/mysql.php:13 setup/oci.php:114
+#: setup/postgresql.php:24 setup/postgresql.php:70
 msgid "You need to enter either an existing account or the administrator."
 msgstr "Bir konto veya kullanici birlemek ihtiyacin. "
 
-#: setup.php:152
-msgid "Oracle connection could not be established"
-msgstr "Oracle bağlantısı kurulamadı"
-
-#: setup.php:234
+#: setup/mysql.php:12
 msgid "MySQL username and/or password not valid"
 msgstr "MySQL kullanıcı adı ve/veya parolası geçerli değil"
 
-#: setup.php:288 setup.php:398 setup.php:407 setup.php:425 setup.php:435
-#: setup.php:444 setup.php:477 setup.php:543 setup.php:569 setup.php:576
-#: setup.php:587 setup.php:594 setup.php:603 setup.php:611 setup.php:620
-#: setup.php:626
+#: setup/mysql.php:67 setup/oci.php:54 setup/oci.php:121 setup/oci.php:147
+#: setup/oci.php:154 setup/oci.php:165 setup/oci.php:172 setup/oci.php:181
+#: setup/oci.php:189 setup/oci.php:198 setup/oci.php:204
+#: setup/postgresql.php:89 setup/postgresql.php:98 setup/postgresql.php:115
+#: setup/postgresql.php:125 setup/postgresql.php:134
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr "DB Hata: ''%s''"
 
-#: setup.php:289 setup.php:399 setup.php:408 setup.php:426 setup.php:436
-#: setup.php:445 setup.php:478 setup.php:544 setup.php:570 setup.php:577
-#: setup.php:588 setup.php:604 setup.php:612 setup.php:621
+#: setup/mysql.php:68 setup/oci.php:55 setup/oci.php:122 setup/oci.php:148
+#: setup/oci.php:155 setup/oci.php:166 setup/oci.php:182 setup/oci.php:190
+#: setup/oci.php:199 setup/postgresql.php:90 setup/postgresql.php:99
+#: setup/postgresql.php:116 setup/postgresql.php:126 setup/postgresql.php:135
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr "Komut rahasiz ''%s''. "
 
-#: setup.php:305
+#: setup/mysql.php:85
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr "MySQL kullanici '%s @local host zatan var. "
 
-#: setup.php:306
+#: setup/mysql.php:86
 msgid "Drop this user from MySQL"
 msgstr "Bu kullanici MySQLden list disari koymak. "
 
-#: setup.php:311
+#: setup/mysql.php:91
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr "MySQL kullanici '%s @ % % zaten var (zaten yazili)"
 
-#: setup.php:312
+#: setup/mysql.php:92
 msgid "Drop this user from MySQL."
 msgstr "Bu kulanıcıyı MySQL veritabanından kaldır"
 
-#: setup.php:469 setup.php:536
+#: setup/oci.php:34
+msgid "Oracle connection could not be established"
+msgstr "Oracle bağlantısı kurulamadı"
+
+#: setup/oci.php:41 setup/oci.php:113
 msgid "Oracle username and/or password not valid"
 msgstr "Adi klullanici ve/veya parola Oracle mantikli deÄŸildir. "
 
-#: setup.php:595 setup.php:627
+#: setup/oci.php:173 setup/oci.php:205
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr "Hatalı komut: \"%s\", ad: %s, parola: %s"
 
-#: setup.php:647
-#, php-format
-msgid "MS SQL username and/or password not valid: %s"
-msgstr "MS SQL kullanıcı adı ve/veya parolası geçersiz: %s"
+#: setup/postgresql.php:23 setup/postgresql.php:69
+msgid "PostgreSQL username and/or password not valid"
+msgstr "PostgreSQL adi kullanici ve/veya parola yasal degildir. "
+
+#: setup.php:42
+msgid "Set an admin username."
+msgstr "Bir adi kullanici vermek. "
+
+#: setup.php:45
+msgid "Set an admin password."
+msgstr "Parola yonetici birlemek. "
 
-#: setup.php:870
+#: setup.php:198
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Web sunucunuz dosya transferi için düzgün bir şekilde yapılandırılmamış. WevDAV arabirimini sorunlu gözüküyor."
 
-#: setup.php:871
+#: setup.php:199
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Lütfen <a href='%s'>kurulum kılavuzlarını</a> iki kez kontrol edin."
diff --git a/l10n/tr/settings.po b/l10n/tr/settings.po
index f723b52d59b75039219b7c7e9995ec03d4045532..982298aa30a1eaaf99b4314cc6a739011cb5fa66 100644
--- a/l10n/tr/settings.po
+++ b/l10n/tr/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
 "MIME-Version: 1.0\n"
@@ -89,35 +89,35 @@ msgstr "%s grubundan kullanıcı kaldırılamıyor"
 msgid "Couldn't update app."
 msgstr "Uygulama güncellenemedi."
 
-#: js/apps.js:30
+#: js/apps.js:35
 msgid "Update to {appversion}"
 msgstr "{appversion} Güncelle"
 
-#: js/apps.js:36 js/apps.js:76
+#: js/apps.js:41 js/apps.js:81
 msgid "Disable"
 msgstr "Etkin deÄŸil"
 
-#: js/apps.js:36 js/apps.js:64 js/apps.js:83
+#: js/apps.js:41 js/apps.js:69 js/apps.js:88
 msgid "Enable"
 msgstr "EtkinleÅŸtir"
 
-#: js/apps.js:55
+#: js/apps.js:60
 msgid "Please wait...."
 msgstr "Lütfen bekleyin...."
 
-#: js/apps.js:59 js/apps.js:71 js/apps.js:80 js/apps.js:93
+#: js/apps.js:64 js/apps.js:76 js/apps.js:85 js/apps.js:98
 msgid "Error"
 msgstr "Hata"
 
-#: js/apps.js:90
+#: js/apps.js:95
 msgid "Updating...."
 msgstr "Güncelleniyor...."
 
-#: js/apps.js:93
+#: js/apps.js:98
 msgid "Error while updating app"
 msgstr "Uygulama güncellenirken hata"
 
-#: js/apps.js:96
+#: js/apps.js:101
 msgid "Updated"
 msgstr "Güncellendi"
 
@@ -166,15 +166,15 @@ msgstr "Kullanıcı oluşturulurken hata"
 msgid "A valid password must be provided"
 msgstr "Geçerli bir parola mutlaka sağlanmalı"
 
-#: personal.php:35 personal.php:36
+#: personal.php:37 personal.php:38
 msgid "__language_name__"
 msgstr "Türkçe"
 
-#: templates/admin.php:15
+#: templates/admin.php:17
 msgid "Security Warning"
 msgstr "Güvenlik Uyarisi"
 
-#: templates/admin.php:18
+#: templates/admin.php:20
 msgid ""
 "Your data directory and your files are probably accessible from the "
 "internet. The .htaccess file that ownCloud provides is not working. We "
@@ -183,36 +183,36 @@ msgid ""
 " webserver document root."
 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/admin.php:29
+#: templates/admin.php:31
 msgid "Setup Warning"
 msgstr "Kurulum Uyarısı"
 
-#: templates/admin.php:32
+#: templates/admin.php:34
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Web sunucunuz dosya transferi için düzgün bir şekilde yapılandırılmamış. WevDAV arabirimini sorunlu gözüküyor."
 
-#: templates/admin.php:33
+#: templates/admin.php:35
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Lütfen <a href='%s'>kurulum kılavuzlarını</a> iki kez kontrol edin."
 
-#: templates/admin.php:44
+#: templates/admin.php:46
 msgid "Module 'fileinfo' missing"
 msgstr "Modül 'fileinfo' kayıp"
 
-#: templates/admin.php:47
+#: templates/admin.php:49
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr "PHP modülü 'fileinfo' kayıp. MIME-tip tanıma ile en iyi sonuçları elde etmek için bu modülü etkinleştirmenizi öneririz."
 
-#: templates/admin.php:58
+#: templates/admin.php:60
 msgid "Locale not working"
 msgstr "Locale çalışmıyor."
 
-#: templates/admin.php:63
+#: templates/admin.php:65
 #, php-format
 msgid ""
 "This ownCloud server can't set system locale to %s. This means that there "
@@ -220,11 +220,11 @@ msgid ""
 " to install the required packages on your system to support %s."
 msgstr "Bu ownCloud sunucusu sistem yerelini %s olarak değiştiremedi. Bu, dosya adlarındaki bazı karakterler ile sorun yaşanabileceği anlamına gelir. %s yerelini desteklemek için gerekli paketleri kurmanızı şiddetle öneririz."
 
-#: templates/admin.php:75
+#: templates/admin.php:77
 msgid "Internet connection not working"
 msgstr "İnternet bağlantısı çalışmıyor"
 
-#: templates/admin.php:78
+#: templates/admin.php:80
 msgid ""
 "This ownCloud server has no working internet connection. This means that "
 "some of the features like mounting of external storage, notifications about "
@@ -234,102 +234,102 @@ msgid ""
 " of ownCloud."
 msgstr "ownCloud sunucusunun internet bağlantısı yok. Bu nedenle harici depolama bağlantısı, güncelleştirme bildirimleri veya 3. parti uygulama kurma gibi bazı özellikler çalışmayacaktır. Uzak dosyalara erişim ve e-posta ile bildirim gönderme çalışmayacak. Eğer ownCloud tüm özelliklerini kullanmak istiyorsanız, internet bağlantısı gerekmektedir."
 
-#: templates/admin.php:92
+#: templates/admin.php:94
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:101
+#: templates/admin.php:103
 msgid "Execute one task with each page loaded"
 msgstr "Yüklenen her sayfa ile bir görev çalıştır"
 
-#: templates/admin.php:111
+#: templates/admin.php:113
 msgid ""
 "cron.php is registered at a webcron service. Call the cron.php page in the "
 "owncloud root once a minute over http."
 msgstr "cron.php bir webcron hizmetinde kaydedilir. Owncloud kökündeki cron.php sayfasını http üzerinden dakikada bir çağır."
 
-#: templates/admin.php:121
+#: templates/admin.php:123
 msgid ""
 "Use systems cron service. Call the cron.php file in the owncloud folder via "
 "a system cronjob once a minute."
 msgstr "Sistemin cron hizmetini kullan. Bir sistem cronjob'ı ile owncloud klasöründeki cron.php dosyasını dakikada bir çağır."
 
-#: templates/admin.php:128
+#: templates/admin.php:130
 msgid "Sharing"
 msgstr "Paylaşım"
 
-#: templates/admin.php:134
+#: templates/admin.php:136
 msgid "Enable Share API"
 msgstr "Paylaşım API'sini etkinleştir."
 
-#: templates/admin.php:135
+#: templates/admin.php:137
 msgid "Allow apps to use the Share API"
 msgstr "Uygulamaların paylaşım API'sini kullanmasına izin ver"
 
-#: templates/admin.php:142
+#: templates/admin.php:144
 msgid "Allow links"
 msgstr "Bağlantıları izin ver."
 
-#: templates/admin.php:143
+#: templates/admin.php:145
 msgid "Allow users to share items to the public with links"
 msgstr "Kullanıcıların nesneleri paylaşımı için herkese açık bağlantılara izin ver"
 
-#: templates/admin.php:150
+#: templates/admin.php:152
 msgid "Allow resharing"
 msgstr "Paylaşıma izin ver"
 
-#: templates/admin.php:151
+#: templates/admin.php:153
 msgid "Allow users to share items shared with them again"
 msgstr "Kullanıcıların kendileri ile paylaşılan öğeleri yeniden paylaşmasına izin ver"
 
-#: templates/admin.php:158
+#: templates/admin.php:160
 msgid "Allow users to share with anyone"
 msgstr "Kullanıcıların herşeyi paylaşmalarına izin ver"
 
-#: templates/admin.php:161
+#: templates/admin.php:163
 msgid "Allow users to only share with users in their groups"
 msgstr "Kullanıcıların sadece kendi gruplarındaki kullanıcılarla paylaşmasına izin ver"
 
-#: templates/admin.php:168
+#: templates/admin.php:170
 msgid "Security"
 msgstr "Güvenlik"
 
-#: templates/admin.php:181
+#: templates/admin.php:183
 msgid "Enforce HTTPS"
 msgstr "HTTPS bağlantısına zorla"
 
-#: templates/admin.php:182
+#: templates/admin.php:184
 msgid ""
 "Enforces the clients to connect to ownCloud via an encrypted connection."
 msgstr "İstemcileri ownCloud'a şifreli bir bağlantı ile bağlanmaya zorlar."
 
-#: templates/admin.php:185
+#: templates/admin.php:187
 msgid ""
 "Please connect to this ownCloud instance via HTTPS to enable or disable the "
 "SSL enforcement."
 msgstr "SSL zorlamasını etkinleştirmek ya da devre dışı bırakmak için lütfen bu ownCloud örneğine HTTPS ile bağlanın."
 
-#: templates/admin.php:195
+#: templates/admin.php:197
 msgid "Log"
 msgstr "Kayıtlar"
 
-#: templates/admin.php:196
+#: templates/admin.php:198
 msgid "Log level"
 msgstr "Günlük seviyesi"
 
-#: templates/admin.php:227
+#: templates/admin.php:229
 msgid "More"
 msgstr "Daha fazla"
 
-#: templates/admin.php:228
+#: templates/admin.php:230
 msgid "Less"
 msgstr "Az"
 
-#: templates/admin.php:235 templates/personal.php:116
+#: templates/admin.php:236 templates/personal.php:116
 msgid "Version"
 msgstr "Sürüm"
 
-#: templates/admin.php:237 templates/personal.php:119
+#: templates/admin.php:240 templates/personal.php:119
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -387,76 +387,79 @@ msgstr "Hata Takip Sistemi"
 msgid "Commercial Support"
 msgstr "Ticari Destek"
 
-#: templates/personal.php:9
+#: templates/personal.php:10
 msgid "Get the apps to sync your files"
 msgstr "Dosyalarınızı senkronize etmek için uygulamayı indirin"
 
-#: templates/personal.php:20
+#: templates/personal.php:21
 msgid "Show First Run Wizard again"
 msgstr "İlk Çalıştırma Sihirbazını yeniden göster"
 
-#: templates/personal.php:28
+#: templates/personal.php:29
 #, php-format
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "Kullandığınız:<strong>%s</strong> seçilebilecekler: <strong>%s</strong>"
 
-#: templates/personal.php:40 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:41 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "Parola"
 
-#: templates/personal.php:41
+#: templates/personal.php:42
 msgid "Your password was changed"
 msgstr "Åžifreniz deÄŸiÅŸtirildi"
 
-#: templates/personal.php:42
+#: templates/personal.php:43
 msgid "Unable to change your password"
 msgstr "Parolanız değiştirilemiyor"
 
-#: templates/personal.php:43
+#: templates/personal.php:44
 msgid "Current password"
 msgstr "Mevcut parola"
 
-#: templates/personal.php:45
+#: templates/personal.php:46
 msgid "New password"
 msgstr "Yeni parola"
 
-#: templates/personal.php:47
+#: templates/personal.php:48
 msgid "Change password"
 msgstr "Parola deÄŸiÅŸtir"
 
-#: templates/personal.php:59 templates/users.php:85
+#: templates/personal.php:60 templates/users.php:85
 msgid "Display Name"
 msgstr "Ekran Adı"
 
-#: templates/personal.php:74
+#: templates/personal.php:75
 msgid "Email"
 msgstr "Eposta"
 
-#: templates/personal.php:76
+#: templates/personal.php:77
 msgid "Your email address"
 msgstr "Eposta adresiniz"
 
-#: templates/personal.php:77
+#: templates/personal.php:78
 msgid "Fill in an email address to enable password recovery"
 msgstr "Parola kurtarmayı etkinleştirmek için bir eposta adresi girin"
 
-#: templates/personal.php:86 templates/personal.php:87
+#: templates/personal.php:87 templates/personal.php:88
 msgid "Language"
 msgstr "Dil"
 
-#: templates/personal.php:99
+#: templates/personal.php:100
 msgid "Help translate"
 msgstr "Çevirilere yardım edin"
 
-#: templates/personal.php:105
+#: templates/personal.php:106
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:107
-msgid "Use this address to connect to your ownCloud in your file manager"
-msgstr "Bu adresi kullanarak ownCloud 'unuza dosya yöneticinizde bağlanın"
+#: templates/personal.php:108
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
+"target=\"_blank\">access your Files via WebDAV</a>"
+msgstr ""
 
-#: templates/users.php:21 templates/users.php:84
+#: templates/users.php:21
 msgid "Login Name"
 msgstr "Giriş Adı"
 
@@ -486,6 +489,10 @@ msgstr "Limitsiz"
 msgid "Other"
 msgstr "DiÄŸer"
 
+#: templates/users.php:84
+msgid "Username"
+msgstr "Kullanıcı Adı"
+
 #: templates/users.php:91
 msgid "Storage"
 msgstr "Depolama"
diff --git a/l10n/tr/user_ldap.po b/l10n/tr/user_ldap.po
index ba83a78f525f902789de9a143fd3686d241cd23f..de878997a64baa8cd9c1fd4235ddf6494d23043b 100644
--- a/l10n/tr/user_ldap.po
+++ b/l10n/tr/user_ldap.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:25+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:16+0000\n"
 "Last-Translator: ismail yenigül <ismail.yenigul@surgate.com>\n"
 "Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/ug/core.po b/l10n/ug/core.po
index 5804dbcf263fbe280f279cc0c50a41d08fc54932..5300c0bfdad93849d789a05c1b3baed8687f9a97 100644
--- a/l10n/ug/core.po
+++ b/l10n/ug/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:22+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:14+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Uighur <uqkun@outlook.com>\n"
 "MIME-Version: 1.0\n"
@@ -61,135 +61,135 @@ msgstr ""
 msgid "Error removing %s from favorites."
 msgstr ""
 
-#: js/config.php:34
+#: js/config.php:32
 msgid "Sunday"
 msgstr "يەكشەنبە"
 
-#: js/config.php:35
+#: js/config.php:33
 msgid "Monday"
 msgstr "دۈشەنبە"
 
-#: js/config.php:36
+#: js/config.php:34
 msgid "Tuesday"
 msgstr "سەيشەنبە"
 
-#: js/config.php:37
+#: js/config.php:35
 msgid "Wednesday"
 msgstr "چارشەنبە"
 
-#: js/config.php:38
+#: js/config.php:36
 msgid "Thursday"
 msgstr "پەيشەنبە"
 
-#: js/config.php:39
+#: js/config.php:37
 msgid "Friday"
 msgstr "جۈمە"
 
-#: js/config.php:40
+#: js/config.php:38
 msgid "Saturday"
 msgstr "شەنبە"
 
-#: js/config.php:45
+#: js/config.php:43
 msgid "January"
 msgstr "قەھرىتان"
 
-#: js/config.php:46
+#: js/config.php:44
 msgid "February"
 msgstr "ھۇت"
 
-#: js/config.php:47
+#: js/config.php:45
 msgid "March"
 msgstr "نەۋرۇز"
 
-#: js/config.php:48
+#: js/config.php:46
 msgid "April"
 msgstr "ئۇمۇت"
 
-#: js/config.php:49
+#: js/config.php:47
 msgid "May"
 msgstr "باھار"
 
-#: js/config.php:50
+#: js/config.php:48
 msgid "June"
 msgstr "سەپەر"
 
-#: js/config.php:51
+#: js/config.php:49
 msgid "July"
 msgstr "چىللە"
 
-#: js/config.php:52
+#: js/config.php:50
 msgid "August"
 msgstr "تومۇز"
 
-#: js/config.php:53
+#: js/config.php:51
 msgid "September"
 msgstr "مىزان"
 
-#: js/config.php:54
+#: js/config.php:52
 msgid "October"
 msgstr "ئوغۇز"
 
-#: js/config.php:55
+#: js/config.php:53
 msgid "November"
 msgstr "ئوغلاق"
 
-#: js/config.php:56
+#: js/config.php:54
 msgid "December"
 msgstr "ÙƒÛ†Ù†Û•Ùƒ"
 
-#: js/js.js:286
+#: js/js.js:293
 msgid "Settings"
 msgstr "تەڭشەكلەر"
 
-#: js/js.js:718
+#: js/js.js:725
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:719
+#: js/js.js:726
 msgid "1 minute ago"
 msgstr "1 مىنۇت ئىلگىرى"
 
-#: js/js.js:720
+#: js/js.js:727
 msgid "{minutes} minutes ago"
 msgstr ""
 
-#: js/js.js:721
+#: js/js.js:728
 msgid "1 hour ago"
 msgstr "1 سائەت ئىلگىرى"
 
-#: js/js.js:722
+#: js/js.js:729
 msgid "{hours} hours ago"
 msgstr ""
 
-#: js/js.js:723
+#: js/js.js:730
 msgid "today"
 msgstr "بۈگۈن"
 
-#: js/js.js:724
+#: js/js.js:731
 msgid "yesterday"
 msgstr "تۈنۈگۈن"
 
-#: js/js.js:725
+#: js/js.js:732
 msgid "{days} days ago"
 msgstr ""
 
-#: js/js.js:726
+#: js/js.js:733
 msgid "last month"
 msgstr ""
 
-#: js/js.js:727
+#: js/js.js:734
 msgid "{months} months ago"
 msgstr ""
 
-#: js/js.js:728
+#: js/js.js:735
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:729
+#: js/js.js:736
 msgid "last year"
 msgstr ""
 
-#: js/js.js:730
+#: js/js.js:737
 msgid "years ago"
 msgstr ""
 
@@ -225,8 +225,8 @@ msgstr ""
 #: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
 #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:577
-#: js/share.js:589
+#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:620
+#: js/share.js:632
 msgid "Error"
 msgstr "خاتالىق"
 
@@ -246,7 +246,7 @@ msgstr ""
 msgid "Share"
 msgstr "ھەمبەھىر"
 
-#: js/share.js:125 js/share.js:617
+#: js/share.js:125 js/share.js:660
 msgid "Error while sharing"
 msgstr ""
 
@@ -266,99 +266,103 @@ msgstr ""
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:159
+#: js/share.js:172
 msgid "Share with"
 msgstr "ھەمبەھىر"
 
-#: js/share.js:164
+#: js/share.js:177
 msgid "Share with link"
 msgstr ""
 
-#: js/share.js:167
+#: js/share.js:180
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:169 templates/installation.php:54 templates/login.php:26
+#: js/share.js:182 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "ئىم"
 
-#: js/share.js:173
+#: js/share.js:187
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:191
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:174
+#: js/share.js:192
 msgid "Send"
 msgstr "يوللا"
 
-#: js/share.js:178
+#: js/share.js:197
 msgid "Set expiration date"
 msgstr ""
 
-#: js/share.js:179
+#: js/share.js:198
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:211
+#: js/share.js:230
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:213
+#: js/share.js:232
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:251
+#: js/share.js:270
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:287
+#: js/share.js:306
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:308
+#: js/share.js:327
 msgid "Unshare"
 msgstr "ھەمبەھىرلىمە"
 
-#: js/share.js:320
+#: js/share.js:339
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:322
+#: js/share.js:341
 msgid "access control"
 msgstr ""
 
-#: js/share.js:325
+#: js/share.js:344
 msgid "create"
 msgstr ""
 
-#: js/share.js:328
+#: js/share.js:347
 msgid "update"
 msgstr ""
 
-#: js/share.js:331
+#: js/share.js:350
 msgid "delete"
 msgstr "ئۆچۈر"
 
-#: js/share.js:334
+#: js/share.js:353
 msgid "share"
 msgstr "ھەمبەھىر"
 
-#: js/share.js:368 js/share.js:564
+#: js/share.js:387 js/share.js:607
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:577
+#: js/share.js:620
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:589
+#: js/share.js:632
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:604
+#: js/share.js:647
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:615
+#: js/share.js:658
 msgid "Email sent"
 msgstr ""
 
@@ -373,7 +377,7 @@ msgstr ""
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
-#: lostpassword/controller.php:58
+#: lostpassword/controller.php:60
 msgid "ownCloud password reset"
 msgstr ""
 
@@ -403,17 +407,17 @@ msgstr "ئىشلەتكۈچى ئاتى"
 
 #: lostpassword/templates/lostpassword.php:22
 msgid ""
-"Your files seems to be encrypted. If you didn't have enabled the recovery "
-"key there will be no way to get your data back once the password was "
-"resetted. If you are not sure what to do, please contact your administrator "
-"first before continue. Do you really want to continue?"
+"Your files are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
 msgstr ""
 
 #: lostpassword/templates/lostpassword.php:24
 msgid "Yes, I really want to reset my password now"
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:29
+#: lostpassword/templates/lostpassword.php:27
 msgid "Request reset"
 msgstr ""
 
@@ -461,7 +465,7 @@ msgstr ""
 msgid "Cloud not found"
 msgstr ""
 
-#: templates/altmail.php:2
+#: templates/altmail.php:4
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -472,10 +476,6 @@ msgid ""
 "Cheers!"
 msgstr ""
 
-#: templates/altmail.php:7 templates/mail.php:24
-msgid "web services under your control"
-msgstr ""
-
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
 msgstr ""
@@ -568,12 +568,12 @@ msgstr ""
 msgid "Finish setup"
 msgstr "تەڭشەك تامام"
 
-#: templates/layout.user.php:40
+#: templates/layout.user.php:43
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:67
+#: templates/layout.user.php:68
 msgid "Log out"
 msgstr "تىزىمدىن چىق"
 
@@ -607,7 +607,7 @@ msgstr ""
 msgid "Alternative Logins"
 msgstr ""
 
-#: templates/mail.php:15
+#: templates/mail.php:16
 #, php-format
 msgid ""
 "Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
diff --git a/l10n/ug/files.po b/l10n/ug/files.po
index 6c8add22bd36479673f746c399a098c776a1e44a..dff477401313d4564b353b3a4fc1edcc5a457ab2 100644
--- a/l10n/ug/files.po
+++ b/l10n/ug/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:01+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Uighur <uqkun@outlook.com>\n"
 "MIME-Version: 1.0\n"
@@ -27,46 +27,54 @@ msgstr ""
 msgid "Could not move %s"
 msgstr "%s يۆتكىيەلمەيدۇ"
 
-#: ajax/upload.php:19
+#: ajax/upload.php:16 ajax/upload.php:45
+msgid "Unable to set upload directory."
+msgstr ""
+
+#: ajax/upload.php:22
+msgid "Invalid Token"
+msgstr ""
+
+#: ajax/upload.php:59
 msgid "No file was uploaded. Unknown error"
 msgstr "ھېچقانداق ھۆججەت يۈكلەنمىدى. يوچۇن خاتالىق"
 
-#: ajax/upload.php:26
+#: ajax/upload.php:66
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/upload.php:27
+#: ajax/upload.php:67
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:29
+#: ajax/upload.php:69
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/upload.php:30
+#: ajax/upload.php:70
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/upload.php:31
+#: ajax/upload.php:71
 msgid "No file was uploaded"
 msgstr "ھېچقانداق ھۆججەت يۈكلەنمىدى"
 
-#: ajax/upload.php:32
+#: ajax/upload.php:72
 msgid "Missing a temporary folder"
 msgstr "ۋاقىتلىق قىسقۇچ كەم."
 
-#: ajax/upload.php:33
+#: ajax/upload.php:73
 msgid "Failed to write to disk"
 msgstr "دىسكىغا يازالمىدى"
 
-#: ajax/upload.php:51
+#: ajax/upload.php:91
 msgid "Not enough storage available"
 msgstr "يېتەرلىك ساقلاش بوشلۇقى يوق"
 
-#: ajax/upload.php:83
+#: ajax/upload.php:123
 msgid "Invalid directory."
 msgstr ""
 
@@ -74,6 +82,36 @@ msgstr ""
 msgid "Files"
 msgstr "ھۆججەتلەر"
 
+#: js/file-upload.js:11
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/file-upload.js:24
+msgid "Not enough space available"
+msgstr "يېتەرلىك بوشلۇق يوق"
+
+#: js/file-upload.js:64
+msgid "Upload cancelled."
+msgstr "يۈكلەشتىن ۋاز كەچتى."
+
+#: js/file-upload.js:167 js/files.js:266
+msgid ""
+"File upload is in progress. Leaving the page now will cancel the upload."
+msgstr "ھۆججەت يۈكلەش مەشغۇلاتى ئېلىپ بېرىلىۋاتىدۇ. Leaving the page now will cancel the upload."
+
+#: js/file-upload.js:233 js/files.js:339
+msgid "URL cannot be empty."
+msgstr ""
+
+#: js/file-upload.js:238 lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr ""
+
+#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
+#: js/files.js:693 js/files.js:731
+msgid "Error"
+msgstr "خاتالىق"
+
 #: js/fileactions.js:116
 msgid "Share"
 msgstr "ھەمبەھىر"
@@ -90,43 +128,43 @@ msgstr "ئۆچۈر"
 msgid "Rename"
 msgstr "ئات ئۆزگەرت"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:464
 msgid "Pending"
 msgstr "كۈتۈۋاتىدۇ"
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "{new_name} already exists"
 msgstr "{new_name} مەۋجۇت"
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "replace"
 msgstr "ئالماشتۇر"
 
-#: js/filelist.js:259
+#: js/filelist.js:302
 msgid "suggest name"
 msgstr "تەۋسىيە ئات"
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "cancel"
 msgstr "ۋاز كەچ"
 
-#: js/filelist.js:306
+#: js/filelist.js:349
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:306
+#: js/filelist.js:349
 msgid "undo"
 msgstr "يېنىۋال"
 
-#: js/filelist.js:331
+#: js/filelist.js:374
 msgid "perform delete operation"
 msgstr ""
 
-#: js/filelist.js:413
+#: js/filelist.js:456
 msgid "1 file uploading"
 msgstr "1 ھۆججەت يۈكلىنىۋاتىدۇ"
 
-#: js/filelist.js:416 js/filelist.js:470
+#: js/filelist.js:459 js/filelist.js:517
 msgid "files uploading"
 msgstr "ھۆججەت يۈكلىنىۋاتىدۇ"
 
@@ -158,70 +196,42 @@ msgid ""
 "big."
 msgstr ""
 
-#: js/files.js:264
-msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr ""
-
-#: js/files.js:277
-msgid "Not enough space available"
-msgstr "يېتەرلىك بوشلۇق يوق"
-
-#: js/files.js:317
-msgid "Upload cancelled."
-msgstr "يۈكلەشتىن ۋاز كەچتى."
-
-#: js/files.js:413
-msgid ""
-"File upload is in progress. Leaving the page now will cancel the upload."
-msgstr "ھۆججەت يۈكلەش مەشغۇلاتى ئېلىپ بېرىلىۋاتىدۇ. Leaving the page now will cancel the upload."
-
-#: js/files.js:486
-msgid "URL cannot be empty."
-msgstr ""
-
-#: js/files.js:491
+#: js/files.js:344
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
-msgid "Error"
-msgstr "خاتالىق"
-
-#: js/files.js:877 templates/index.php:69
+#: js/files.js:744 templates/index.php:69
 msgid "Name"
 msgstr "ئاتى"
 
-#: js/files.js:878 templates/index.php:80
+#: js/files.js:745 templates/index.php:80
 msgid "Size"
 msgstr "چوڭلۇقى"
 
-#: js/files.js:879 templates/index.php:82
+#: js/files.js:746 templates/index.php:82
 msgid "Modified"
 msgstr "ئۆزگەرتكەن"
 
-#: js/files.js:898
+#: js/files.js:765
 msgid "1 folder"
 msgstr "1 قىسقۇچ"
 
-#: js/files.js:900
+#: js/files.js:767
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:908
+#: js/files.js:775
 msgid "1 file"
 msgstr "1 ھۆججەت"
 
-#: js/files.js:910
+#: js/files.js:777
 msgid "{count} files"
 msgstr "{count} ھۆججەت"
 
-#: lib/app.php:53
-msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
-msgstr ""
-
 #: lib/app.php:73
-msgid "Unable to rename file"
-msgstr "ھۆججەت ئاتىنى ئۆزگەرتكىلى بولمايدۇ"
+#, php-format
+msgid "%s could not be renamed"
+msgstr ""
 
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
@@ -317,6 +327,22 @@ msgstr ""
 msgid "Current scanning"
 msgstr ""
 
+#: templates/part.list.php:76
+msgid "directory"
+msgstr ""
+
+#: templates/part.list.php:78
+msgid "directories"
+msgstr ""
+
+#: templates/part.list.php:87
+msgid "file"
+msgstr ""
+
+#: templates/part.list.php:89
+msgid "files"
+msgstr ""
+
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
 msgstr "ھۆججەت سىستېما غەملىكىنى يۈكسەلدۈرۈۋاتىدۇ…"
diff --git a/l10n/ug/files_encryption.po b/l10n/ug/files_encryption.po
index 326a70f47789e581b0a661a6f34fbbe442efc9ee..896e7bb478669159947fd18b207f1410790f5d05 100644
--- a/l10n/ug/files_encryption.po
+++ b/l10n/ug/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-14 02:46+0200\n"
-"PO-Revision-Date: 2013-06-14 00:47+0000\n"
+"POT-Creation-Date: 2013-07-05 02:12+0200\n"
+"PO-Revision-Date: 2013-07-05 00:13+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Uighur <uqkun@outlook.com>\n"
 "MIME-Version: 1.0\n"
@@ -55,9 +55,21 @@ msgstr ""
 
 #: files/error.php:7
 msgid ""
-"Your private key is not valid! Maybe your password was changed from outside."
-" You can update your private key password in your personal settings to "
-"regain access to your files"
+"Your private key is not valid! Likely your password was changed outside the "
+"ownCloud system (e.g. your corporate directory). You can update your private"
+" key password in your personal settings to recover access to your encrypted "
+"files."
+msgstr ""
+
+#: hooks/hooks.php:44
+msgid "Missing requirements."
+msgstr ""
+
+#: hooks/hooks.php:45
+msgid ""
+"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL "
+"PHP extension is enabled and configured properly. For now, the encryption "
+"app has been disabled."
 msgstr ""
 
 #: js/settings-admin.js:11
@@ -84,11 +96,11 @@ msgstr "شىفىرلاش"
 
 #: templates/settings-admin.php:10
 msgid ""
-"Enable encryption passwords recovery key (allow sharing to recovery key):"
+"Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
 #: templates/settings-admin.php:14
-msgid "Recovery account password"
+msgid "Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:21 templates/settings-personal.php:54
@@ -100,15 +112,15 @@ msgid "Disabled"
 msgstr ""
 
 #: templates/settings-admin.php:34
-msgid "Change encryption passwords recovery key:"
+msgid "Change recovery key password:"
 msgstr ""
 
 #: templates/settings-admin.php:41
-msgid "Old Recovery account password"
+msgid "Old Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:48
-msgid "New Recovery account password"
+msgid "New Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:53
diff --git a/l10n/ug/files_external.po b/l10n/ug/files_external.po
index ca1b6f18316e9e1a8b59f61a79516c2286f9d018..d3fad934f06d716d03e9472fceaf81bbbf5a7786 100644
--- a/l10n/ug/files_external.po
+++ b/l10n/ug/files_external.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: Abduqadir Abliz <sahran.ug@gmail.com>\n"
 "Language-Team: Uighur <uqkun@outlook.com>\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/ug/files_sharing.po b/l10n/ug/files_sharing.po
index 5ade987b2370a096668264d80f50d0b3a5af73be..69cbee16b1a27d73e404e00536a56a8e36049ea7 100644
--- a/l10n/ug/files_sharing.po
+++ b/l10n/ug/files_sharing.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Uighur <uqkun@outlook.com>\n"
 "MIME-Version: 1.0\n"
@@ -19,27 +19,39 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: templates/authenticate.php:4
+msgid "The password is wrong. Try again."
+msgstr ""
+
+#: templates/authenticate.php:7
 msgid "Password"
 msgstr "ئىم"
 
-#: templates/authenticate.php:6
+#: templates/authenticate.php:9
 msgid "Submit"
 msgstr "تاپشۇر"
 
-#: templates/public.php:10
+#: templates/public.php:17
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr ""
 
-#: templates/public.php:13
+#: templates/public.php:20
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr ""
 
-#: templates/public.php:19 templates/public.php:43
+#: templates/public.php:28 templates/public.php:90
 msgid "Download"
 msgstr "چۈشۈر"
 
-#: templates/public.php:40
+#: templates/public.php:45 templates/public.php:48
+msgid "Upload"
+msgstr "يۈكلە"
+
+#: templates/public.php:58
+msgid "Cancel upload"
+msgstr "يۈكلەشتىن ۋاز كەچ"
+
+#: templates/public.php:87
 msgid "No preview available for"
 msgstr ""
diff --git a/l10n/ug/files_trashbin.po b/l10n/ug/files_trashbin.po
index 608253e15e84a40de2953560be396dc4ae14eaa3..6b7085daca7bc308a8909e2faae11513c117bb2e 100644
--- a/l10n/ug/files_trashbin.po
+++ b/l10n/ug/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:16+0000\n"
 "Last-Translator: Abduqadir Abliz <sahran.ug@gmail.com>\n"
 "Language-Team: Uighur <uqkun@outlook.com>\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/ug/lib.po b/l10n/ug/lib.po
index 86118a06f2899fcf74dd7215d315030945e98ad4..88efe2259dc8545d35bb44711674657f7d9ecbd1 100644
--- a/l10n/ug/lib.po
+++ b/l10n/ug/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-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
-"Last-Translator: Abduqadir Abliz <sahran.ug@gmail.com>\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Uighur <uqkun@outlook.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,43 +17,47 @@ msgstr ""
 "Language: ug\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: app.php:359
+#: app.php:360
 msgid "Help"
 msgstr "ياردەم"
 
-#: app.php:372
+#: app.php:373
 msgid "Personal"
 msgstr "شەخسىي"
 
-#: app.php:383
+#: app.php:384
 msgid "Settings"
 msgstr "تەڭشەكلەر"
 
-#: app.php:395
+#: app.php:396
 msgid "Users"
 msgstr "ئىشلەتكۈچىلەر"
 
-#: app.php:408
+#: app.php:409
 msgid "Apps"
 msgstr "ئەپلەر"
 
-#: app.php:416
+#: app.php:417
 msgid "Admin"
 msgstr ""
 
-#: files.php:210
+#: defaults.php:33
+msgid "web services under your control"
+msgstr ""
+
+#: files.php:226
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: files.php:211
+#: files.php:227
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:212 files.php:245
+#: files.php:228 files.php:261
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:242
+#: files.php:258
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
@@ -85,104 +89,102 @@ msgstr "قىسقا ئۇچۇر"
 msgid "Images"
 msgstr "سۈرەتلەر"
 
-#: setup.php:34
-msgid "Set an admin username."
-msgstr ""
-
-#: setup.php:37
-msgid "Set an admin password."
-msgstr ""
-
-#: setup.php:55
+#: setup/abstractdatabase.php:22
 #, php-format
 msgid "%s enter the database username."
 msgstr ""
 
-#: setup.php:58
+#: setup/abstractdatabase.php:25
 #, php-format
 msgid "%s enter the database name."
 msgstr ""
 
-#: setup.php:61
+#: setup/abstractdatabase.php:28
 #, php-format
 msgid "%s you may not use dots in the database name"
 msgstr ""
 
-#: setup.php:64
+#: setup/mssql.php:20
 #, php-format
-msgid "%s set the database host."
-msgstr ""
-
-#: setup.php:126 setup.php:332 setup.php:377
-msgid "PostgreSQL username and/or password not valid"
+msgid "MS SQL username and/or password not valid: %s"
 msgstr ""
 
-#: setup.php:127 setup.php:235
+#: setup/mssql.php:21 setup/mysql.php:13 setup/oci.php:114
+#: setup/postgresql.php:24 setup/postgresql.php:70
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:152
-msgid "Oracle connection could not be established"
-msgstr ""
-
-#: setup.php:234
+#: setup/mysql.php:12
 msgid "MySQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:288 setup.php:398 setup.php:407 setup.php:425 setup.php:435
-#: setup.php:444 setup.php:477 setup.php:543 setup.php:569 setup.php:576
-#: setup.php:587 setup.php:594 setup.php:603 setup.php:611 setup.php:620
-#: setup.php:626
+#: setup/mysql.php:67 setup/oci.php:54 setup/oci.php:121 setup/oci.php:147
+#: setup/oci.php:154 setup/oci.php:165 setup/oci.php:172 setup/oci.php:181
+#: setup/oci.php:189 setup/oci.php:198 setup/oci.php:204
+#: setup/postgresql.php:89 setup/postgresql.php:98 setup/postgresql.php:115
+#: setup/postgresql.php:125 setup/postgresql.php:134
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr ""
 
-#: setup.php:289 setup.php:399 setup.php:408 setup.php:426 setup.php:436
-#: setup.php:445 setup.php:478 setup.php:544 setup.php:570 setup.php:577
-#: setup.php:588 setup.php:604 setup.php:612 setup.php:621
+#: setup/mysql.php:68 setup/oci.php:55 setup/oci.php:122 setup/oci.php:148
+#: setup/oci.php:155 setup/oci.php:166 setup/oci.php:182 setup/oci.php:190
+#: setup/oci.php:199 setup/postgresql.php:90 setup/postgresql.php:99
+#: setup/postgresql.php:116 setup/postgresql.php:126 setup/postgresql.php:135
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:305
+#: setup/mysql.php:85
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:306
+#: setup/mysql.php:86
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:311
+#: setup/mysql.php:91
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:312
+#: setup/mysql.php:92
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:469 setup.php:536
+#: setup/oci.php:34
+msgid "Oracle connection could not be established"
+msgstr ""
+
+#: setup/oci.php:41 setup/oci.php:113
 msgid "Oracle username and/or password not valid"
 msgstr ""
 
-#: setup.php:595 setup.php:627
+#: setup/oci.php:173 setup/oci.php:205
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:647
-#, php-format
-msgid "MS SQL username and/or password not valid: %s"
+#: setup/postgresql.php:23 setup/postgresql.php:69
+msgid "PostgreSQL username and/or password not valid"
+msgstr ""
+
+#: setup.php:42
+msgid "Set an admin username."
+msgstr ""
+
+#: setup.php:45
+msgid "Set an admin password."
 msgstr ""
 
-#: setup.php:870
+#: setup.php:198
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:871
+#: setup.php:199
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
diff --git a/l10n/ug/settings.po b/l10n/ug/settings.po
index e758df121ec31124cb624e5f6a15589062b46e45..9a2e5b5697992a70d6fed6b362282ab720c870de 100644
--- a/l10n/ug/settings.po
+++ b/l10n/ug/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Uighur <uqkun@outlook.com>\n"
 "MIME-Version: 1.0\n"
@@ -88,35 +88,35 @@ msgstr "ئىشلەتكۈچىنى %s گۇرۇپپىدىن چىقىرىۋېتەل
 msgid "Couldn't update app."
 msgstr "ئەپنى يېڭىلىيالمايدۇ."
 
-#: js/apps.js:30
+#: js/apps.js:35
 msgid "Update to {appversion}"
 msgstr "{appversion} غا يېڭىلايدۇ"
 
-#: js/apps.js:36 js/apps.js:76
+#: js/apps.js:41 js/apps.js:81
 msgid "Disable"
 msgstr "چەكلە"
 
-#: js/apps.js:36 js/apps.js:64 js/apps.js:83
+#: js/apps.js:41 js/apps.js:69 js/apps.js:88
 msgid "Enable"
 msgstr "قوزغات"
 
-#: js/apps.js:55
+#: js/apps.js:60
 msgid "Please wait...."
 msgstr "سەل كۈتۈڭ…"
 
-#: js/apps.js:59 js/apps.js:71 js/apps.js:80 js/apps.js:93
+#: js/apps.js:64 js/apps.js:76 js/apps.js:85 js/apps.js:98
 msgid "Error"
 msgstr "خاتالىق"
 
-#: js/apps.js:90
+#: js/apps.js:95
 msgid "Updating...."
 msgstr "يېڭىلاۋاتىدۇ…"
 
-#: js/apps.js:93
+#: js/apps.js:98
 msgid "Error while updating app"
 msgstr "ئەپنى يېڭىلاۋاتقاندا خاتالىق كۆرۈلدى"
 
-#: js/apps.js:96
+#: js/apps.js:101
 msgid "Updated"
 msgstr "يېڭىلاندى"
 
@@ -165,15 +165,15 @@ msgstr ""
 msgid "A valid password must be provided"
 msgstr ""
 
-#: personal.php:35 personal.php:36
+#: personal.php:37 personal.php:38
 msgid "__language_name__"
 msgstr ""
 
-#: templates/admin.php:15
+#: templates/admin.php:17
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:18
+#: templates/admin.php:20
 msgid ""
 "Your data directory and your files are probably accessible from the "
 "internet. The .htaccess file that ownCloud provides is not working. We "
@@ -182,36 +182,36 @@ msgid ""
 " webserver document root."
 msgstr ""
 
-#: templates/admin.php:29
+#: templates/admin.php:31
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:32
+#: templates/admin.php:34
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: templates/admin.php:33
+#: templates/admin.php:35
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:44
+#: templates/admin.php:46
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:47
+#: templates/admin.php:49
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr ""
 
-#: templates/admin.php:58
+#: templates/admin.php:60
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:63
+#: templates/admin.php:65
 #, php-format
 msgid ""
 "This ownCloud server can't set system locale to %s. This means that there "
@@ -219,11 +219,11 @@ msgid ""
 " to install the required packages on your system to support %s."
 msgstr ""
 
-#: templates/admin.php:75
+#: templates/admin.php:77
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:78
+#: templates/admin.php:80
 msgid ""
 "This ownCloud server has no working internet connection. This means that "
 "some of the features like mounting of external storage, notifications about "
@@ -233,102 +233,102 @@ msgid ""
 " of ownCloud."
 msgstr ""
 
-#: templates/admin.php:92
+#: templates/admin.php:94
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:101
+#: templates/admin.php:103
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:111
+#: templates/admin.php:113
 msgid ""
 "cron.php is registered at a webcron service. Call the cron.php page in the "
 "owncloud root once a minute over http."
 msgstr ""
 
-#: templates/admin.php:121
+#: templates/admin.php:123
 msgid ""
 "Use systems cron service. Call the cron.php file in the owncloud folder via "
 "a system cronjob once a minute."
 msgstr ""
 
-#: templates/admin.php:128
+#: templates/admin.php:130
 msgid "Sharing"
 msgstr "ھەمبەھىر"
 
-#: templates/admin.php:134
+#: templates/admin.php:136
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:135
+#: templates/admin.php:137
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:142
+#: templates/admin.php:144
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:143
+#: templates/admin.php:145
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:150
+#: templates/admin.php:152
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:151
+#: templates/admin.php:153
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:158
+#: templates/admin.php:160
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:161
+#: templates/admin.php:163
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:168
+#: templates/admin.php:170
 msgid "Security"
 msgstr "بىخەتەرلىك"
 
-#: templates/admin.php:181
+#: templates/admin.php:183
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:182
+#: templates/admin.php:184
 msgid ""
 "Enforces the clients to connect to ownCloud via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:185
+#: templates/admin.php:187
 msgid ""
 "Please connect to this ownCloud instance via HTTPS to enable or disable the "
 "SSL enforcement."
 msgstr ""
 
-#: templates/admin.php:195
+#: templates/admin.php:197
 msgid "Log"
 msgstr "خاتىرە"
 
-#: templates/admin.php:196
+#: templates/admin.php:198
 msgid "Log level"
 msgstr "خاتىرە دەرىجىسى"
 
-#: templates/admin.php:227
+#: templates/admin.php:229
 msgid "More"
 msgstr "تېخىمۇ كۆپ"
 
-#: templates/admin.php:228
+#: templates/admin.php:230
 msgid "Less"
 msgstr "ئاز"
 
-#: templates/admin.php:235 templates/personal.php:116
+#: templates/admin.php:236 templates/personal.php:116
 msgid "Version"
 msgstr "نەشرى"
 
-#: templates/admin.php:237 templates/personal.php:119
+#: templates/admin.php:240 templates/personal.php:119
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -386,76 +386,79 @@ msgstr ""
 msgid "Commercial Support"
 msgstr ""
 
-#: templates/personal.php:9
+#: templates/personal.php:10
 msgid "Get the apps to sync your files"
 msgstr ""
 
-#: templates/personal.php:20
+#: templates/personal.php:21
 msgid "Show First Run Wizard again"
 msgstr ""
 
-#: templates/personal.php:28
+#: templates/personal.php:29
 #, php-format
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr ""
 
-#: templates/personal.php:40 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:41 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "ئىم"
 
-#: templates/personal.php:41
+#: templates/personal.php:42
 msgid "Your password was changed"
 msgstr "ئىمىڭىز مۇۋەپپەقىيەتلىك ئۆزگەرتىلدى"
 
-#: templates/personal.php:42
+#: templates/personal.php:43
 msgid "Unable to change your password"
 msgstr "ئىمنى ئۆزگەرتكىلى بولمايدۇ."
 
-#: templates/personal.php:43
+#: templates/personal.php:44
 msgid "Current password"
 msgstr "نۆۋەتتىكى ئىم"
 
-#: templates/personal.php:45
+#: templates/personal.php:46
 msgid "New password"
 msgstr "يېڭى ئىم"
 
-#: templates/personal.php:47
+#: templates/personal.php:48
 msgid "Change password"
 msgstr "ئىم ئۆزگەرت"
 
-#: templates/personal.php:59 templates/users.php:85
+#: templates/personal.php:60 templates/users.php:85
 msgid "Display Name"
 msgstr "كۆرسىتىش ئىسمى"
 
-#: templates/personal.php:74
+#: templates/personal.php:75
 msgid "Email"
 msgstr "تورخەت"
 
-#: templates/personal.php:76
+#: templates/personal.php:77
 msgid "Your email address"
 msgstr "تورخەت ئادرېسىڭىز"
 
-#: templates/personal.php:77
+#: templates/personal.php:78
 msgid "Fill in an email address to enable password recovery"
 msgstr "ئىم ئەسلىگە كەلتۈرۈشتە ئىشلىتىدىغان تور خەت ئادرېسىنى تولدۇرۇڭ"
 
-#: templates/personal.php:86 templates/personal.php:87
+#: templates/personal.php:87 templates/personal.php:88
 msgid "Language"
 msgstr "تىل"
 
-#: templates/personal.php:99
+#: templates/personal.php:100
 msgid "Help translate"
 msgstr "تەرجىمىگە ياردەم"
 
-#: templates/personal.php:105
+#: templates/personal.php:106
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:107
-msgid "Use this address to connect to your ownCloud in your file manager"
+#: templates/personal.php:108
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
+"target=\"_blank\">access your Files via WebDAV</a>"
 msgstr ""
 
-#: templates/users.php:21 templates/users.php:84
+#: templates/users.php:21
 msgid "Login Name"
 msgstr "تىزىمغا كىرىش ئاتى"
 
@@ -485,6 +488,10 @@ msgstr "چەكسىز"
 msgid "Other"
 msgstr "باشقا"
 
+#: templates/users.php:84
+msgid "Username"
+msgstr "ئىشلەتكۈچى ئاتى"
+
 #: templates/users.php:91
 msgid "Storage"
 msgstr "ساقلىغۇچ"
diff --git a/l10n/ug/user_ldap.po b/l10n/ug/user_ldap.po
index c3caa24cb29ddbc733ff0a38034204258de38ee1..9a9ffa229de17d81d6a000d069f0673e04aae486 100644
--- a/l10n/ug/user_ldap.po
+++ b/l10n/ug/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:25+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:16+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Uighur <uqkun@outlook.com>\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/uk/core.po b/l10n/uk/core.po
index 775080772d8175b22656069a42885118fa516b3d..68d6e18204bfb6caa066e45c9df8c56c7c993f5d 100644
--- a/l10n/uk/core.po
+++ b/l10n/uk/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
 "MIME-Version: 1.0\n"
@@ -61,135 +61,135 @@ msgstr "Жодної категорії не обрано для видален
 msgid "Error removing %s from favorites."
 msgstr "Помилка при видалені %s із обраного."
 
-#: js/config.php:34
+#: js/config.php:32
 msgid "Sunday"
 msgstr "Неділя"
 
-#: js/config.php:35
+#: js/config.php:33
 msgid "Monday"
 msgstr "Понеділок"
 
-#: js/config.php:36
+#: js/config.php:34
 msgid "Tuesday"
 msgstr "Вівторок"
 
-#: js/config.php:37
+#: js/config.php:35
 msgid "Wednesday"
 msgstr "Середа"
 
-#: js/config.php:38
+#: js/config.php:36
 msgid "Thursday"
 msgstr "Четвер"
 
-#: js/config.php:39
+#: js/config.php:37
 msgid "Friday"
 msgstr "П'ятниця"
 
-#: js/config.php:40
+#: js/config.php:38
 msgid "Saturday"
 msgstr "Субота"
 
-#: js/config.php:45
+#: js/config.php:43
 msgid "January"
 msgstr "Січень"
 
-#: js/config.php:46
+#: js/config.php:44
 msgid "February"
 msgstr "Лютий"
 
-#: js/config.php:47
+#: js/config.php:45
 msgid "March"
 msgstr "Березень"
 
-#: js/config.php:48
+#: js/config.php:46
 msgid "April"
 msgstr "Квітень"
 
-#: js/config.php:49
+#: js/config.php:47
 msgid "May"
 msgstr "Травень"
 
-#: js/config.php:50
+#: js/config.php:48
 msgid "June"
 msgstr "Червень"
 
-#: js/config.php:51
+#: js/config.php:49
 msgid "July"
 msgstr "Липень"
 
-#: js/config.php:52
+#: js/config.php:50
 msgid "August"
 msgstr "Серпень"
 
-#: js/config.php:53
+#: js/config.php:51
 msgid "September"
 msgstr "Вересень"
 
-#: js/config.php:54
+#: js/config.php:52
 msgid "October"
 msgstr "Жовтень"
 
-#: js/config.php:55
+#: js/config.php:53
 msgid "November"
 msgstr "Листопад"
 
-#: js/config.php:56
+#: js/config.php:54
 msgid "December"
 msgstr "Грудень"
 
-#: js/js.js:286
+#: js/js.js:293
 msgid "Settings"
 msgstr "Налаштування"
 
-#: js/js.js:718
+#: js/js.js:725
 msgid "seconds ago"
 msgstr "секунди тому"
 
-#: js/js.js:719
+#: js/js.js:726
 msgid "1 minute ago"
 msgstr "1 хвилину тому"
 
-#: js/js.js:720
+#: js/js.js:727
 msgid "{minutes} minutes ago"
 msgstr "{minutes} хвилин тому"
 
-#: js/js.js:721
+#: js/js.js:728
 msgid "1 hour ago"
 msgstr "1 годину тому"
 
-#: js/js.js:722
+#: js/js.js:729
 msgid "{hours} hours ago"
 msgstr "{hours} години тому"
 
-#: js/js.js:723
+#: js/js.js:730
 msgid "today"
 msgstr "сьогодні"
 
-#: js/js.js:724
+#: js/js.js:731
 msgid "yesterday"
 msgstr "вчора"
 
-#: js/js.js:725
+#: js/js.js:732
 msgid "{days} days ago"
 msgstr "{days} днів тому"
 
-#: js/js.js:726
+#: js/js.js:733
 msgid "last month"
 msgstr "минулого місяця"
 
-#: js/js.js:727
+#: js/js.js:734
 msgid "{months} months ago"
 msgstr "{months} місяців тому"
 
-#: js/js.js:728
+#: js/js.js:735
 msgid "months ago"
 msgstr "місяці тому"
 
-#: js/js.js:729
+#: js/js.js:736
 msgid "last year"
 msgstr "минулого року"
 
-#: js/js.js:730
+#: js/js.js:737
 msgid "years ago"
 msgstr "роки тому"
 
@@ -225,8 +225,8 @@ msgstr "Не визначено тип об'єкту."
 #: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
 #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:577
-#: js/share.js:589
+#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:620
+#: js/share.js:632
 msgid "Error"
 msgstr "Помилка"
 
@@ -246,7 +246,7 @@ msgstr "Опубліковано"
 msgid "Share"
 msgstr "Поділитися"
 
-#: js/share.js:125 js/share.js:617
+#: js/share.js:125 js/share.js:660
 msgid "Error while sharing"
 msgstr "Помилка під час публікації"
 
@@ -266,99 +266,103 @@ msgstr " {owner} опублікував для Вас та для групи {gr
 msgid "Shared with you by {owner}"
 msgstr "{owner} опублікував для Вас"
 
-#: js/share.js:159
+#: js/share.js:172
 msgid "Share with"
 msgstr "Опублікувати для"
 
-#: js/share.js:164
+#: js/share.js:177
 msgid "Share with link"
 msgstr "Опублікувати через посилання"
 
-#: js/share.js:167
+#: js/share.js:180
 msgid "Password protect"
 msgstr "Захистити паролем"
 
-#: js/share.js:169 templates/installation.php:54 templates/login.php:26
+#: js/share.js:182 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "Пароль"
 
-#: js/share.js:173
+#: js/share.js:187
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:191
 msgid "Email link to person"
 msgstr "Ел. пошта належить Пану"
 
-#: js/share.js:174
+#: js/share.js:192
 msgid "Send"
 msgstr "Надіслати"
 
-#: js/share.js:178
+#: js/share.js:197
 msgid "Set expiration date"
 msgstr "Встановити термін дії"
 
-#: js/share.js:179
+#: js/share.js:198
 msgid "Expiration date"
 msgstr "Термін дії"
 
-#: js/share.js:211
+#: js/share.js:230
 msgid "Share via email:"
 msgstr "Опублікувати через Ел. пошту:"
 
-#: js/share.js:213
+#: js/share.js:232
 msgid "No people found"
 msgstr "Жодної людини не знайдено"
 
-#: js/share.js:251
+#: js/share.js:270
 msgid "Resharing is not allowed"
 msgstr "Пере-публікація не дозволяється"
 
-#: js/share.js:287
+#: js/share.js:306
 msgid "Shared in {item} with {user}"
 msgstr "Опубліковано {item} для {user}"
 
-#: js/share.js:308
+#: js/share.js:327
 msgid "Unshare"
 msgstr "Закрити доступ"
 
-#: js/share.js:320
+#: js/share.js:339
 msgid "can edit"
 msgstr "може редагувати"
 
-#: js/share.js:322
+#: js/share.js:341
 msgid "access control"
 msgstr "контроль доступу"
 
-#: js/share.js:325
+#: js/share.js:344
 msgid "create"
 msgstr "створити"
 
-#: js/share.js:328
+#: js/share.js:347
 msgid "update"
 msgstr "оновити"
 
-#: js/share.js:331
+#: js/share.js:350
 msgid "delete"
 msgstr "видалити"
 
-#: js/share.js:334
+#: js/share.js:353
 msgid "share"
 msgstr "опублікувати"
 
-#: js/share.js:368 js/share.js:564
+#: js/share.js:387 js/share.js:607
 msgid "Password protected"
 msgstr "Захищено паролем"
 
-#: js/share.js:577
+#: js/share.js:620
 msgid "Error unsetting expiration date"
 msgstr "Помилка при відміні терміна дії"
 
-#: js/share.js:589
+#: js/share.js:632
 msgid "Error setting expiration date"
 msgstr "Помилка при встановленні терміна дії"
 
-#: js/share.js:604
+#: js/share.js:647
 msgid "Sending ..."
 msgstr "Надсилання..."
 
-#: js/share.js:615
+#: js/share.js:658
 msgid "Email sent"
 msgstr "Ел. пошта надіслана"
 
@@ -373,7 +377,7 @@ msgstr "Оновлення виконалось неуспішно. Будь л
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "Оновлення виконалось успішно. Перенаправляємо вас на  ownCloud."
 
-#: lostpassword/controller.php:58
+#: lostpassword/controller.php:60
 msgid "ownCloud password reset"
 msgstr "скидання пароля ownCloud"
 
@@ -403,17 +407,17 @@ msgstr "Ім'я користувача"
 
 #: lostpassword/templates/lostpassword.php:22
 msgid ""
-"Your files seems to be encrypted. If you didn't have enabled the recovery "
-"key there will be no way to get your data back once the password was "
-"resetted. If you are not sure what to do, please contact your administrator "
-"first before continue. Do you really want to continue?"
+"Your files are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
 msgstr ""
 
 #: lostpassword/templates/lostpassword.php:24
 msgid "Yes, I really want to reset my password now"
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:29
+#: lostpassword/templates/lostpassword.php:27
 msgid "Request reset"
 msgstr "Запит скидання"
 
@@ -461,7 +465,7 @@ msgstr "Доступ заборонено"
 msgid "Cloud not found"
 msgstr "Cloud не знайдено"
 
-#: templates/altmail.php:2
+#: templates/altmail.php:4
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -472,10 +476,6 @@ msgid ""
 "Cheers!"
 msgstr ""
 
-#: templates/altmail.php:7 templates/mail.php:24
-msgid "web services under your control"
-msgstr "підконтрольні Вам веб-сервіси"
-
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
 msgstr "Редагувати категорії"
@@ -568,12 +568,12 @@ msgstr "Хост бази даних"
 msgid "Finish setup"
 msgstr "Завершити налаштування"
 
-#: templates/layout.user.php:40
+#: templates/layout.user.php:43
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:67
+#: templates/layout.user.php:68
 msgid "Log out"
 msgstr "Вихід"
 
@@ -607,7 +607,7 @@ msgstr "Вхід"
 msgid "Alternative Logins"
 msgstr "Альтернативні Логіни"
 
-#: templates/mail.php:15
+#: templates/mail.php:16
 #, php-format
 msgid ""
 "Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
diff --git a/l10n/uk/files.po b/l10n/uk/files.po
index 9765c74af525fb1815b336faf94705f8bc4e3dbf..22c76cf8a0a781998b78866dc0e99c7387961125 100644
--- a/l10n/uk/files.po
+++ b/l10n/uk/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:01+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
 "MIME-Version: 1.0\n"
@@ -27,46 +27,54 @@ msgstr "Не вдалося перемістити %s - Файл з таким 
 msgid "Could not move %s"
 msgstr "Не вдалося перемістити %s"
 
-#: ajax/upload.php:19
+#: ajax/upload.php:16 ajax/upload.php:45
+msgid "Unable to set upload directory."
+msgstr ""
+
+#: ajax/upload.php:22
+msgid "Invalid Token"
+msgstr ""
+
+#: ajax/upload.php:59
 msgid "No file was uploaded. Unknown error"
 msgstr "Не завантажено жодного файлу. Невідома помилка"
 
-#: ajax/upload.php:26
+#: ajax/upload.php:66
 msgid "There is no error, the file uploaded with success"
 msgstr "Файл успішно вивантажено без помилок."
 
-#: ajax/upload.php:27
+#: ajax/upload.php:67
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr "Розмір звантаження перевищує upload_max_filesize параметра в php.ini: "
 
-#: ajax/upload.php:29
+#: ajax/upload.php:69
 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:30
+#: ajax/upload.php:70
 msgid "The uploaded file was only partially uploaded"
 msgstr "Файл відвантажено лише частково"
 
-#: ajax/upload.php:31
+#: ajax/upload.php:71
 msgid "No file was uploaded"
 msgstr "Не відвантажено жодного файлу"
 
-#: ajax/upload.php:32
+#: ajax/upload.php:72
 msgid "Missing a temporary folder"
 msgstr "Відсутній тимчасовий каталог"
 
-#: ajax/upload.php:33
+#: ajax/upload.php:73
 msgid "Failed to write to disk"
 msgstr "Невдалося записати на диск"
 
-#: ajax/upload.php:51
+#: ajax/upload.php:91
 msgid "Not enough storage available"
 msgstr "Місця більше немає"
 
-#: ajax/upload.php:83
+#: ajax/upload.php:123
 msgid "Invalid directory."
 msgstr "Невірний каталог."
 
@@ -74,6 +82,36 @@ msgstr "Невірний каталог."
 msgid "Files"
 msgstr "Файли"
 
+#: js/file-upload.js:11
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr "Неможливо завантажити ваш файл тому, що він тека або файл розміром 0 байт"
+
+#: js/file-upload.js:24
+msgid "Not enough space available"
+msgstr "Місця більше немає"
+
+#: js/file-upload.js:64
+msgid "Upload cancelled."
+msgstr "Завантаження перервано."
+
+#: js/file-upload.js:167 js/files.js:266
+msgid ""
+"File upload is in progress. Leaving the page now will cancel the upload."
+msgstr "Виконується завантаження файлу. Закриття цієї сторінки приведе до відміни завантаження."
+
+#: js/file-upload.js:233 js/files.js:339
+msgid "URL cannot be empty."
+msgstr "URL не може бути пустим."
+
+#: js/file-upload.js:238 lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr ""
+
+#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
+#: js/files.js:693 js/files.js:731
+msgid "Error"
+msgstr "Помилка"
+
 #: js/fileactions.js:116
 msgid "Share"
 msgstr "Поділитися"
@@ -90,43 +128,43 @@ msgstr "Видалити"
 msgid "Rename"
 msgstr "Перейменувати"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:464
 msgid "Pending"
 msgstr "Очікування"
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "{new_name} already exists"
 msgstr "{new_name} вже існує"
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "replace"
 msgstr "заміна"
 
-#: js/filelist.js:259
+#: js/filelist.js:302
 msgid "suggest name"
 msgstr "запропонуйте назву"
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "cancel"
 msgstr "відміна"
 
-#: js/filelist.js:306
+#: js/filelist.js:349
 msgid "replaced {new_name} with {old_name}"
 msgstr "замінено {new_name} на {old_name}"
 
-#: js/filelist.js:306
+#: js/filelist.js:349
 msgid "undo"
 msgstr "відмінити"
 
-#: js/filelist.js:331
+#: js/filelist.js:374
 msgid "perform delete operation"
 msgstr "виконати операцію видалення"
 
-#: js/filelist.js:413
+#: js/filelist.js:456
 msgid "1 file uploading"
 msgstr "1 файл завантажується"
 
-#: js/filelist.js:416 js/filelist.js:470
+#: js/filelist.js:459 js/filelist.js:517
 msgid "files uploading"
 msgstr "файли завантажуються"
 
@@ -158,70 +196,42 @@ msgid ""
 "big."
 msgstr "Ваше завантаження готується. Це може зайняти деякий час, якщо файли завеликі."
 
-#: js/files.js:264
-msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "Неможливо завантажити ваш файл тому, що він тека або файл розміром 0 байт"
-
-#: js/files.js:277
-msgid "Not enough space available"
-msgstr "Місця більше немає"
-
-#: js/files.js:317
-msgid "Upload cancelled."
-msgstr "Завантаження перервано."
-
-#: js/files.js:413
-msgid ""
-"File upload is in progress. Leaving the page now will cancel the upload."
-msgstr "Виконується завантаження файлу. Закриття цієї сторінки приведе до відміни завантаження."
-
-#: js/files.js:486
-msgid "URL cannot be empty."
-msgstr "URL не може бути пустим."
-
-#: js/files.js:491
+#: js/files.js:344
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Невірне ім'я теки. Використання \"Shared\" зарезервовано Owncloud"
 
-#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
-msgid "Error"
-msgstr "Помилка"
-
-#: js/files.js:877 templates/index.php:69
+#: js/files.js:744 templates/index.php:69
 msgid "Name"
 msgstr "Ім'я"
 
-#: js/files.js:878 templates/index.php:80
+#: js/files.js:745 templates/index.php:80
 msgid "Size"
 msgstr "Розмір"
 
-#: js/files.js:879 templates/index.php:82
+#: js/files.js:746 templates/index.php:82
 msgid "Modified"
 msgstr "Змінено"
 
-#: js/files.js:898
+#: js/files.js:765
 msgid "1 folder"
 msgstr "1 папка"
 
-#: js/files.js:900
+#: js/files.js:767
 msgid "{count} folders"
 msgstr "{count} папок"
 
-#: js/files.js:908
+#: js/files.js:775
 msgid "1 file"
 msgstr "1 файл"
 
-#: js/files.js:910
+#: js/files.js:777
 msgid "{count} files"
 msgstr "{count} файлів"
 
-#: lib/app.php:53
-msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
-msgstr ""
-
 #: lib/app.php:73
-msgid "Unable to rename file"
-msgstr "Не вдалося перейменувати файл"
+#, php-format
+msgid "%s could not be renamed"
+msgstr ""
 
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
@@ -317,6 +327,22 @@ msgstr "Файли скануються, зачекайте, будь-ласка
 msgid "Current scanning"
 msgstr "Поточне сканування"
 
+#: templates/part.list.php:76
+msgid "directory"
+msgstr ""
+
+#: templates/part.list.php:78
+msgid "directories"
+msgstr ""
+
+#: templates/part.list.php:87
+msgid "file"
+msgstr "файл"
+
+#: templates/part.list.php:89
+msgid "files"
+msgstr "файли"
+
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
 msgstr "Оновлення кеша файлової системи..."
diff --git a/l10n/uk/files_encryption.po b/l10n/uk/files_encryption.po
index 8ea782c7d5bf8154ed43d12a20429a2b61ba870f..4899683a1780343a04ae04c52c8de46d546b60ba 100644
--- a/l10n/uk/files_encryption.po
+++ b/l10n/uk/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-14 02:46+0200\n"
-"PO-Revision-Date: 2013-06-14 00:47+0000\n"
+"POT-Creation-Date: 2013-07-05 02:12+0200\n"
+"PO-Revision-Date: 2013-07-05 00:13+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"
@@ -55,9 +55,21 @@ msgstr ""
 
 #: files/error.php:7
 msgid ""
-"Your private key is not valid! Maybe your password was changed from outside."
-" You can update your private key password in your personal settings to "
-"regain access to your files"
+"Your private key is not valid! Likely your password was changed outside the "
+"ownCloud system (e.g. your corporate directory). You can update your private"
+" key password in your personal settings to recover access to your encrypted "
+"files."
+msgstr ""
+
+#: hooks/hooks.php:44
+msgid "Missing requirements."
+msgstr ""
+
+#: hooks/hooks.php:45
+msgid ""
+"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL "
+"PHP extension is enabled and configured properly. For now, the encryption "
+"app has been disabled."
 msgstr ""
 
 #: js/settings-admin.js:11
@@ -84,11 +96,11 @@ msgstr "Шифрування"
 
 #: templates/settings-admin.php:10
 msgid ""
-"Enable encryption passwords recovery key (allow sharing to recovery key):"
+"Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
 #: templates/settings-admin.php:14
-msgid "Recovery account password"
+msgid "Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:21 templates/settings-personal.php:54
@@ -100,15 +112,15 @@ msgid "Disabled"
 msgstr ""
 
 #: templates/settings-admin.php:34
-msgid "Change encryption passwords recovery key:"
+msgid "Change recovery key password:"
 msgstr ""
 
 #: templates/settings-admin.php:41
-msgid "Old Recovery account password"
+msgid "Old Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:48
-msgid "New Recovery account password"
+msgid "New Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:53
diff --git a/l10n/uk/files_external.po b/l10n/uk/files_external.po
index 09deb2b9db61be6ab5218fe006323604bdbeac1d..277156b54d94fbecb50dae7c33a4ae82b077e26b 100644
--- a/l10n/uk/files_external.po
+++ b/l10n/uk/files_external.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/uk/files_sharing.po b/l10n/uk/files_sharing.po
index 43228521ca5ff9581253d8f06763cbbf2f4a0ffa..864b3b0596102d629bcbadcfd39c098e992445c5 100644
--- a/l10n/uk/files_sharing.po
+++ b/l10n/uk/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
 "MIME-Version: 1.0\n"
@@ -18,27 +18,39 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: templates/authenticate.php:4
+msgid "The password is wrong. Try again."
+msgstr ""
+
+#: templates/authenticate.php:7
 msgid "Password"
 msgstr "Пароль"
 
-#: templates/authenticate.php:6
+#: templates/authenticate.php:9
 msgid "Submit"
 msgstr "Передати"
 
-#: templates/public.php:10
+#: templates/public.php:17
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s опублікував каталог %s для Вас"
 
-#: templates/public.php:13
+#: templates/public.php:20
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s опублікував файл %s для Вас"
 
-#: templates/public.php:19 templates/public.php:43
+#: templates/public.php:28 templates/public.php:90
 msgid "Download"
 msgstr "Завантажити"
 
-#: templates/public.php:40
+#: templates/public.php:45 templates/public.php:48
+msgid "Upload"
+msgstr "Вивантажити"
+
+#: templates/public.php:58
+msgid "Cancel upload"
+msgstr "Перервати завантаження"
+
+#: templates/public.php:87
 msgid "No preview available for"
 msgstr "Попередній перегляд недоступний для"
diff --git a/l10n/uk/files_trashbin.po b/l10n/uk/files_trashbin.po
index 3e9eb69e8b609f8a7e47ea56d80d45c9d15f97a8..3b3ca985ee2b68bdc6607dfe9dbcffbbccc3ca94 100644
--- a/l10n/uk/files_trashbin.po
+++ b/l10n/uk/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:16+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/uk/lib.po b/l10n/uk/lib.po
index a9a396413b83fa445aa8a23c34fa8a26b90a077f..a0d6d4e04b26d6af6b4fb01a844d6980e5866e45 100644
--- a/l10n/uk/lib.po
+++ b/l10n/uk/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
 "MIME-Version: 1.0\n"
@@ -17,43 +17,47 @@ msgstr ""
 "Language: uk\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: app.php:359
+#: app.php:360
 msgid "Help"
 msgstr "Допомога"
 
-#: app.php:372
+#: app.php:373
 msgid "Personal"
 msgstr "Особисте"
 
-#: app.php:383
+#: app.php:384
 msgid "Settings"
 msgstr "Налаштування"
 
-#: app.php:395
+#: app.php:396
 msgid "Users"
 msgstr "Користувачі"
 
-#: app.php:408
+#: app.php:409
 msgid "Apps"
 msgstr "Додатки"
 
-#: app.php:416
+#: app.php:417
 msgid "Admin"
 msgstr "Адмін"
 
-#: files.php:210
+#: defaults.php:33
+msgid "web services under your control"
+msgstr "підконтрольні Вам веб-сервіси"
+
+#: files.php:226
 msgid "ZIP download is turned off."
 msgstr "ZIP завантаження вимкнено."
 
-#: files.php:211
+#: files.php:227
 msgid "Files need to be downloaded one by one."
 msgstr "Файли повинні бути завантаженні послідовно."
 
-#: files.php:212 files.php:245
+#: files.php:228 files.php:261
 msgid "Back to Files"
 msgstr "Повернутися до файлів"
 
-#: files.php:242
+#: files.php:258
 msgid "Selected files too large to generate zip file."
 msgstr "Вибрані фали завеликі для генерування zip файлу."
 
@@ -85,104 +89,102 @@ msgstr "Текст"
 msgid "Images"
 msgstr "Зображення"
 
-#: setup.php:34
-msgid "Set an admin username."
-msgstr "Встановіть ім'я адміністратора."
-
-#: setup.php:37
-msgid "Set an admin password."
-msgstr "Встановіть пароль адміністратора."
-
-#: setup.php:55
+#: setup/abstractdatabase.php:22
 #, php-format
 msgid "%s enter the database username."
 msgstr "%s введіть ім'я користувача бази даних."
 
-#: setup.php:58
+#: setup/abstractdatabase.php:25
 #, php-format
 msgid "%s enter the database name."
 msgstr "%s введіть назву бази даних."
 
-#: setup.php:61
+#: setup/abstractdatabase.php:28
 #, php-format
 msgid "%s you may not use dots in the database name"
 msgstr "%s не можна використовувати крапки в назві бази даних"
 
-#: setup.php:64
+#: setup/mssql.php:20
 #, php-format
-msgid "%s set the database host."
-msgstr "%s встановити хост бази даних."
-
-#: setup.php:126 setup.php:332 setup.php:377
-msgid "PostgreSQL username and/or password not valid"
-msgstr "PostgreSQL ім'я користувача та/або пароль не дійсні"
+msgid "MS SQL username and/or password not valid: %s"
+msgstr "MS SQL ім'я користувача та/або пароль не дійсні: %s"
 
-#: setup.php:127 setup.php:235
+#: setup/mssql.php:21 setup/mysql.php:13 setup/oci.php:114
+#: setup/postgresql.php:24 setup/postgresql.php:70
 msgid "You need to enter either an existing account or the administrator."
 msgstr "Вам потрібно ввести або існуючий обліковий запис або administrator."
 
-#: setup.php:152
-msgid "Oracle connection could not be established"
-msgstr ""
-
-#: setup.php:234
+#: setup/mysql.php:12
 msgid "MySQL username and/or password not valid"
 msgstr "MySQL ім'я користувача та/або пароль не дійсні"
 
-#: setup.php:288 setup.php:398 setup.php:407 setup.php:425 setup.php:435
-#: setup.php:444 setup.php:477 setup.php:543 setup.php:569 setup.php:576
-#: setup.php:587 setup.php:594 setup.php:603 setup.php:611 setup.php:620
-#: setup.php:626
+#: setup/mysql.php:67 setup/oci.php:54 setup/oci.php:121 setup/oci.php:147
+#: setup/oci.php:154 setup/oci.php:165 setup/oci.php:172 setup/oci.php:181
+#: setup/oci.php:189 setup/oci.php:198 setup/oci.php:204
+#: setup/postgresql.php:89 setup/postgresql.php:98 setup/postgresql.php:115
+#: setup/postgresql.php:125 setup/postgresql.php:134
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr "Помилка БД: \"%s\""
 
-#: setup.php:289 setup.php:399 setup.php:408 setup.php:426 setup.php:436
-#: setup.php:445 setup.php:478 setup.php:544 setup.php:570 setup.php:577
-#: setup.php:588 setup.php:604 setup.php:612 setup.php:621
+#: setup/mysql.php:68 setup/oci.php:55 setup/oci.php:122 setup/oci.php:148
+#: setup/oci.php:155 setup/oci.php:166 setup/oci.php:182 setup/oci.php:190
+#: setup/oci.php:199 setup/postgresql.php:90 setup/postgresql.php:99
+#: setup/postgresql.php:116 setup/postgresql.php:126 setup/postgresql.php:135
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr "Команда, що викликала проблему: \"%s\""
 
-#: setup.php:305
+#: setup/mysql.php:85
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr "Користувач MySQL '%s'@'localhost' вже існує."
 
-#: setup.php:306
+#: setup/mysql.php:86
 msgid "Drop this user from MySQL"
 msgstr "Видалити цього користувача з MySQL"
 
-#: setup.php:311
+#: setup/mysql.php:91
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr "Користувач MySQL '%s'@'%%' вже існує"
 
-#: setup.php:312
+#: setup/mysql.php:92
 msgid "Drop this user from MySQL."
 msgstr "Видалити цього користувача з MySQL."
 
-#: setup.php:469 setup.php:536
+#: setup/oci.php:34
+msgid "Oracle connection could not be established"
+msgstr ""
+
+#: setup/oci.php:41 setup/oci.php:113
 msgid "Oracle username and/or password not valid"
 msgstr "Oracle ім'я користувача та/або пароль не дійсні"
 
-#: setup.php:595 setup.php:627
+#: setup/oci.php:173 setup/oci.php:205
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr "Команда, що викликала проблему: \"%s\", ім'я: %s, пароль: %s"
 
-#: setup.php:647
-#, php-format
-msgid "MS SQL username and/or password not valid: %s"
-msgstr "MS SQL ім'я користувача та/або пароль не дійсні: %s"
+#: setup/postgresql.php:23 setup/postgresql.php:69
+msgid "PostgreSQL username and/or password not valid"
+msgstr "PostgreSQL ім'я користувача та/або пароль не дійсні"
+
+#: setup.php:42
+msgid "Set an admin username."
+msgstr "Встановіть ім'я адміністратора."
+
+#: setup.php:45
+msgid "Set an admin password."
+msgstr "Встановіть пароль адміністратора."
 
-#: setup.php:870
+#: setup.php:198
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Ваш Web-сервер ще не налаштований належним чином для того, щоб дозволити синхронізацію файлів, через те що інтерфейс WebDAV, здається, зламаний."
 
-#: setup.php:871
+#: setup.php:199
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Будь ласка, перевірте <a href='%s'>інструкції по встановленню</a>."
diff --git a/l10n/uk/settings.po b/l10n/uk/settings.po
index e4db481755ab3b03f65e55b1ed8018a43bee0160..dbb85588d42ce279b2693b0e2a43b35537484952 100644
--- a/l10n/uk/settings.po
+++ b/l10n/uk/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
 "MIME-Version: 1.0\n"
@@ -88,35 +88,35 @@ msgstr "Не вдалося видалити користувача із гру
 msgid "Couldn't update app."
 msgstr "Не вдалося оновити програму. "
 
-#: js/apps.js:30
+#: js/apps.js:35
 msgid "Update to {appversion}"
 msgstr "Оновити до {appversion}"
 
-#: js/apps.js:36 js/apps.js:76
+#: js/apps.js:41 js/apps.js:81
 msgid "Disable"
 msgstr "Вимкнути"
 
-#: js/apps.js:36 js/apps.js:64 js/apps.js:83
+#: js/apps.js:41 js/apps.js:69 js/apps.js:88
 msgid "Enable"
 msgstr "Включити"
 
-#: js/apps.js:55
+#: js/apps.js:60
 msgid "Please wait...."
 msgstr "Зачекайте, будь ласка..."
 
-#: js/apps.js:59 js/apps.js:71 js/apps.js:80 js/apps.js:93
+#: js/apps.js:64 js/apps.js:76 js/apps.js:85 js/apps.js:98
 msgid "Error"
 msgstr "Помилка"
 
-#: js/apps.js:90
+#: js/apps.js:95
 msgid "Updating...."
 msgstr "Оновлюється..."
 
-#: js/apps.js:93
+#: js/apps.js:98
 msgid "Error while updating app"
 msgstr "Помилка при оновленні програми"
 
-#: js/apps.js:96
+#: js/apps.js:101
 msgid "Updated"
 msgstr "Оновлено"
 
@@ -165,15 +165,15 @@ msgstr "Помилка при створенні користувача"
 msgid "A valid password must be provided"
 msgstr "Потрібно задати вірний пароль"
 
-#: personal.php:35 personal.php:36
+#: personal.php:37 personal.php:38
 msgid "__language_name__"
 msgstr "__language_name__"
 
-#: templates/admin.php:15
+#: templates/admin.php:17
 msgid "Security Warning"
 msgstr "Попередження про небезпеку"
 
-#: templates/admin.php:18
+#: templates/admin.php:20
 msgid ""
 "Your data directory and your files are probably accessible from the "
 "internet. The .htaccess file that ownCloud provides is not working. We "
@@ -182,36 +182,36 @@ msgid ""
 " webserver document root."
 msgstr "Ваш каталог з даними та Ваші файли можливо доступні з Інтернету. Файл .htaccess, наданий з ownCloud, не працює. Ми наполегливо рекомендуємо Вам налаштувати свій веб-сервер таким чином, щоб каталог data більше не був доступний, або перемістити каталог data за межі кореневого каталогу документів веб-сервера."
 
-#: templates/admin.php:29
+#: templates/admin.php:31
 msgid "Setup Warning"
 msgstr "Попередження при Налаштуванні"
 
-#: templates/admin.php:32
+#: templates/admin.php:34
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Ваш Web-сервер ще не налаштований належним чином для того, щоб дозволити синхронізацію файлів, через те що інтерфейс WebDAV, здається, зламаний."
 
-#: templates/admin.php:33
+#: templates/admin.php:35
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Будь ласка, перевірте <a href='%s'>інструкції по встановленню</a>."
 
-#: templates/admin.php:44
+#: templates/admin.php:46
 msgid "Module 'fileinfo' missing"
 msgstr "Модуль 'fileinfo' відсутній"
 
-#: templates/admin.php:47
+#: templates/admin.php:49
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr "PHP модуль 'fileinfo' відсутній. Ми наполегливо рекомендуємо увімкнути цей модуль, щоб отримати кращі результати при виявленні MIME-типів."
 
-#: templates/admin.php:58
+#: templates/admin.php:60
 msgid "Locale not working"
 msgstr "Локалізація не працює"
 
-#: templates/admin.php:63
+#: templates/admin.php:65
 #, php-format
 msgid ""
 "This ownCloud server can't set system locale to %s. This means that there "
@@ -219,11 +219,11 @@ msgid ""
 " to install the required packages on your system to support %s."
 msgstr "Цей сервер ownCloud не може встановити мову системи %s. Це означає, що можуть бути проблеми з деякими символами в іменах файлів. Ми наполегливо рекомендуємо встановити необхідні пакети у вашій системі для підтримки %s."
 
-#: templates/admin.php:75
+#: templates/admin.php:77
 msgid "Internet connection not working"
 msgstr "Інтернет-з'єднання не працює"
 
-#: templates/admin.php:78
+#: templates/admin.php:80
 msgid ""
 "This ownCloud server has no working internet connection. This means that "
 "some of the features like mounting of external storage, notifications about "
@@ -233,102 +233,102 @@ msgid ""
 " of ownCloud."
 msgstr "Цей сервер ownCloud не має під'єднання до Інтернету. Це означає, що деякі функції, такі як монтування зовнішніх накопичувачів, повідомлення про оновлення або встановлення допоміжних програм не працюють. Доступ до файлів ​​віддалено та відправка повідомлень електронною поштою також може не працювати. Ми пропонуємо увімкнути під'єднання до Інтернету для даного сервера, якщо ви хочете мати всі можливості ownCloud."
 
-#: templates/admin.php:92
+#: templates/admin.php:94
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:101
+#: templates/admin.php:103
 msgid "Execute one task with each page loaded"
 msgstr "Виконати одне завдання для кожної завантаженої сторінки "
 
-#: templates/admin.php:111
+#: templates/admin.php:113
 msgid ""
 "cron.php is registered at a webcron service. Call the cron.php page in the "
 "owncloud root once a minute over http."
 msgstr "cron.php зареєстрований в службі webcron. Викликає cron.php сторінку в кореневому каталозі owncloud кожну хвилину по http."
 
-#: templates/admin.php:121
+#: templates/admin.php:123
 msgid ""
 "Use systems cron service. Call the cron.php file in the owncloud folder via "
 "a system cronjob once a minute."
 msgstr "Використовується системний cron сервіс. Виклик cron.php файла з owncloud теки за допомогою системного cronjob раз на хвилину."
 
-#: templates/admin.php:128
+#: templates/admin.php:130
 msgid "Sharing"
 msgstr "Спільний доступ"
 
-#: templates/admin.php:134
+#: templates/admin.php:136
 msgid "Enable Share API"
 msgstr "Увімкнути API спільного доступу"
 
-#: templates/admin.php:135
+#: templates/admin.php:137
 msgid "Allow apps to use the Share API"
 msgstr "Дозволити програмам використовувати API спільного доступу"
 
-#: templates/admin.php:142
+#: templates/admin.php:144
 msgid "Allow links"
 msgstr "Дозволити посилання"
 
-#: templates/admin.php:143
+#: templates/admin.php:145
 msgid "Allow users to share items to the public with links"
 msgstr "Дозволити користувачам відкривати спільний доступ до елементів за допомогою посилань"
 
-#: templates/admin.php:150
+#: templates/admin.php:152
 msgid "Allow resharing"
 msgstr "Дозволити перевідкривати спільний доступ"
 
-#: templates/admin.php:151
+#: templates/admin.php:153
 msgid "Allow users to share items shared with them again"
 msgstr "Дозволити користувачам знову відкривати спільний доступ до елементів, які вже відкриті для доступу"
 
-#: templates/admin.php:158
+#: templates/admin.php:160
 msgid "Allow users to share with anyone"
 msgstr "Дозволити користувачам відкривати спільний доступ для всіх"
 
-#: templates/admin.php:161
+#: templates/admin.php:163
 msgid "Allow users to only share with users in their groups"
 msgstr "Дозволити користувачам відкривати спільний доступ лише для користувачів з їхньої групи"
 
-#: templates/admin.php:168
+#: templates/admin.php:170
 msgid "Security"
 msgstr "Безпека"
 
-#: templates/admin.php:181
+#: templates/admin.php:183
 msgid "Enforce HTTPS"
 msgstr "Примусове застосування HTTPS"
 
-#: templates/admin.php:182
+#: templates/admin.php:184
 msgid ""
 "Enforces the clients to connect to ownCloud via an encrypted connection."
 msgstr "Зобов'язати клієнтів під'єднуватись до ownCloud через шифроване з'єднання."
 
-#: templates/admin.php:185
+#: templates/admin.php:187
 msgid ""
 "Please connect to this ownCloud instance via HTTPS to enable or disable the "
 "SSL enforcement."
 msgstr "Будь ласка, під'єднайтесь до цього ownCloud за допомогою HTTPS, щоб увімкнути або вимкнути використання SSL."
 
-#: templates/admin.php:195
+#: templates/admin.php:197
 msgid "Log"
 msgstr "Протокол"
 
-#: templates/admin.php:196
+#: templates/admin.php:198
 msgid "Log level"
 msgstr "Рівень протоколювання"
 
-#: templates/admin.php:227
+#: templates/admin.php:229
 msgid "More"
 msgstr "Більше"
 
-#: templates/admin.php:228
+#: templates/admin.php:230
 msgid "Less"
 msgstr "Менше"
 
-#: templates/admin.php:235 templates/personal.php:116
+#: templates/admin.php:236 templates/personal.php:116
 msgid "Version"
 msgstr "Версія"
 
-#: templates/admin.php:237 templates/personal.php:119
+#: templates/admin.php:240 templates/personal.php:119
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -386,76 +386,79 @@ msgstr "БагТрекер"
 msgid "Commercial Support"
 msgstr "Комерційна підтримка"
 
-#: templates/personal.php:9
+#: templates/personal.php:10
 msgid "Get the apps to sync your files"
 msgstr "Отримати додатки для синхронізації ваших файлів"
 
-#: templates/personal.php:20
+#: templates/personal.php:21
 msgid "Show First Run Wizard again"
 msgstr "Показувати Майстер Налаштувань знову"
 
-#: templates/personal.php:28
+#: templates/personal.php:29
 #, php-format
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "Ви використали <strong>%s</strong> із доступних <strong>%s</strong>"
 
-#: templates/personal.php:40 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:41 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "Пароль"
 
-#: templates/personal.php:41
+#: templates/personal.php:42
 msgid "Your password was changed"
 msgstr "Ваш пароль змінено"
 
-#: templates/personal.php:42
+#: templates/personal.php:43
 msgid "Unable to change your password"
 msgstr "Не вдалося змінити Ваш пароль"
 
-#: templates/personal.php:43
+#: templates/personal.php:44
 msgid "Current password"
 msgstr "Поточний пароль"
 
-#: templates/personal.php:45
+#: templates/personal.php:46
 msgid "New password"
 msgstr "Новий пароль"
 
-#: templates/personal.php:47
+#: templates/personal.php:48
 msgid "Change password"
 msgstr "Змінити пароль"
 
-#: templates/personal.php:59 templates/users.php:85
+#: templates/personal.php:60 templates/users.php:85
 msgid "Display Name"
 msgstr "Показати Ім'я"
 
-#: templates/personal.php:74
+#: templates/personal.php:75
 msgid "Email"
 msgstr "Ел.пошта"
 
-#: templates/personal.php:76
+#: templates/personal.php:77
 msgid "Your email address"
 msgstr "Ваша адреса електронної пошти"
 
-#: templates/personal.php:77
+#: templates/personal.php:78
 msgid "Fill in an email address to enable password recovery"
 msgstr "Введіть адресу електронної пошти для відновлення паролю"
 
-#: templates/personal.php:86 templates/personal.php:87
+#: templates/personal.php:87 templates/personal.php:88
 msgid "Language"
 msgstr "Мова"
 
-#: templates/personal.php:99
+#: templates/personal.php:100
 msgid "Help translate"
 msgstr "Допомогти з перекладом"
 
-#: templates/personal.php:105
+#: templates/personal.php:106
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:107
-msgid "Use this address to connect to your ownCloud in your file manager"
-msgstr "Використовуйте цю адресу для під'єднання до вашого ownCloud у вашому файловому менеджері"
+#: templates/personal.php:108
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
+"target=\"_blank\">access your Files via WebDAV</a>"
+msgstr ""
 
-#: templates/users.php:21 templates/users.php:84
+#: templates/users.php:21
 msgid "Login Name"
 msgstr "Ім'я Логіну"
 
@@ -485,6 +488,10 @@ msgstr "Необмежено"
 msgid "Other"
 msgstr "Інше"
 
+#: templates/users.php:84
+msgid "Username"
+msgstr "Ім'я користувача"
+
 #: templates/users.php:91
 msgid "Storage"
 msgstr "Сховище"
diff --git a/l10n/uk/user_ldap.po b/l10n/uk/user_ldap.po
index 354c745f3b454e7d6eebc0cef8b4b34ad1bcf07a..f8fb5e7e86708705cfc010bc29f09a3912a26344 100644
--- a/l10n/uk/user_ldap.po
+++ b/l10n/uk/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:25+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:16+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/ur_PK/core.po b/l10n/ur_PK/core.po
index e546158a01cd8f1995e8c9f01a404f59c1832234..ed9f466ccc947bde72e2f6861cfa305beea7d202 100644
--- a/l10n/ur_PK/core.po
+++ b/l10n/ur_PK/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:22+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:14+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n"
 "MIME-Version: 1.0\n"
@@ -61,135 +61,135 @@ msgstr "ختم کرنے کے لیے کسی زمرہ جات کا انتخاب ن
 msgid "Error removing %s from favorites."
 msgstr ""
 
-#: js/config.php:34
+#: js/config.php:32
 msgid "Sunday"
 msgstr ""
 
-#: js/config.php:35
+#: js/config.php:33
 msgid "Monday"
 msgstr ""
 
-#: js/config.php:36
+#: js/config.php:34
 msgid "Tuesday"
 msgstr ""
 
-#: js/config.php:37
+#: js/config.php:35
 msgid "Wednesday"
 msgstr ""
 
-#: js/config.php:38
+#: js/config.php:36
 msgid "Thursday"
 msgstr ""
 
-#: js/config.php:39
+#: js/config.php:37
 msgid "Friday"
 msgstr ""
 
-#: js/config.php:40
+#: js/config.php:38
 msgid "Saturday"
 msgstr ""
 
-#: js/config.php:45
+#: js/config.php:43
 msgid "January"
 msgstr "جنوری"
 
-#: js/config.php:46
+#: js/config.php:44
 msgid "February"
 msgstr "فرورئ"
 
-#: js/config.php:47
+#: js/config.php:45
 msgid "March"
 msgstr "مارچ"
 
-#: js/config.php:48
+#: js/config.php:46
 msgid "April"
 msgstr "اپریل"
 
-#: js/config.php:49
+#: js/config.php:47
 msgid "May"
 msgstr "مئی"
 
-#: js/config.php:50
+#: js/config.php:48
 msgid "June"
 msgstr "جون"
 
-#: js/config.php:51
+#: js/config.php:49
 msgid "July"
 msgstr "جولائی"
 
-#: js/config.php:52
+#: js/config.php:50
 msgid "August"
 msgstr "اگست"
 
-#: js/config.php:53
+#: js/config.php:51
 msgid "September"
 msgstr "ستمبر"
 
-#: js/config.php:54
+#: js/config.php:52
 msgid "October"
 msgstr "اکتوبر"
 
-#: js/config.php:55
+#: js/config.php:53
 msgid "November"
 msgstr "نومبر"
 
-#: js/config.php:56
+#: js/config.php:54
 msgid "December"
 msgstr "دسمبر"
 
-#: js/js.js:286
+#: js/js.js:293
 msgid "Settings"
 msgstr "سیٹینگز"
 
-#: js/js.js:718
+#: js/js.js:725
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:719
+#: js/js.js:726
 msgid "1 minute ago"
 msgstr ""
 
-#: js/js.js:720
+#: js/js.js:727
 msgid "{minutes} minutes ago"
 msgstr ""
 
-#: js/js.js:721
+#: js/js.js:728
 msgid "1 hour ago"
 msgstr ""
 
-#: js/js.js:722
+#: js/js.js:729
 msgid "{hours} hours ago"
 msgstr ""
 
-#: js/js.js:723
+#: js/js.js:730
 msgid "today"
 msgstr ""
 
-#: js/js.js:724
+#: js/js.js:731
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:725
+#: js/js.js:732
 msgid "{days} days ago"
 msgstr ""
 
-#: js/js.js:726
+#: js/js.js:733
 msgid "last month"
 msgstr ""
 
-#: js/js.js:727
+#: js/js.js:734
 msgid "{months} months ago"
 msgstr ""
 
-#: js/js.js:728
+#: js/js.js:735
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:729
+#: js/js.js:736
 msgid "last year"
 msgstr ""
 
-#: js/js.js:730
+#: js/js.js:737
 msgid "years ago"
 msgstr ""
 
@@ -225,8 +225,8 @@ msgstr ""
 #: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
 #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:577
-#: js/share.js:589
+#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:620
+#: js/share.js:632
 msgid "Error"
 msgstr "ایرر"
 
@@ -246,7 +246,7 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: js/share.js:125 js/share.js:617
+#: js/share.js:125 js/share.js:660
 msgid "Error while sharing"
 msgstr "شئیرنگ کے دوران ایرر"
 
@@ -266,99 +266,103 @@ msgstr ""
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:159
+#: js/share.js:172
 msgid "Share with"
 msgstr "اس کے ساتھ شئیر کریں"
 
-#: js/share.js:164
+#: js/share.js:177
 msgid "Share with link"
 msgstr "لنک کے ساتھ شئیر کریں"
 
-#: js/share.js:167
+#: js/share.js:180
 msgid "Password protect"
 msgstr "پاسورڈ سے محفوظ کریں"
 
-#: js/share.js:169 templates/installation.php:54 templates/login.php:26
+#: js/share.js:182 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "پاسورڈ"
 
-#: js/share.js:173
+#: js/share.js:187
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:191
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:174
+#: js/share.js:192
 msgid "Send"
 msgstr ""
 
-#: js/share.js:178
+#: js/share.js:197
 msgid "Set expiration date"
 msgstr "تاریخ معیاد سیٹ کریں"
 
-#: js/share.js:179
+#: js/share.js:198
 msgid "Expiration date"
 msgstr "تاریخ معیاد"
 
-#: js/share.js:211
+#: js/share.js:230
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:213
+#: js/share.js:232
 msgid "No people found"
 msgstr "کوئی لوگ نہیں ملے۔"
 
-#: js/share.js:251
+#: js/share.js:270
 msgid "Resharing is not allowed"
 msgstr "دوبارہ شئیر کرنے کی اجازت نہیں"
 
-#: js/share.js:287
+#: js/share.js:306
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:308
+#: js/share.js:327
 msgid "Unshare"
 msgstr "شئیرنگ ختم کریں"
 
-#: js/share.js:320
+#: js/share.js:339
 msgid "can edit"
 msgstr "ایڈٹ کر سکے"
 
-#: js/share.js:322
+#: js/share.js:341
 msgid "access control"
 msgstr "اسیس کنٹرول"
 
-#: js/share.js:325
+#: js/share.js:344
 msgid "create"
 msgstr "نیا بنائیں"
 
-#: js/share.js:328
+#: js/share.js:347
 msgid "update"
 msgstr "اپ ڈیٹ"
 
-#: js/share.js:331
+#: js/share.js:350
 msgid "delete"
 msgstr "ختم کریں"
 
-#: js/share.js:334
+#: js/share.js:353
 msgid "share"
 msgstr "شئیر کریں"
 
-#: js/share.js:368 js/share.js:564
+#: js/share.js:387 js/share.js:607
 msgid "Password protected"
 msgstr "پاسورڈ سے محفوظ کیا گیا ہے"
 
-#: js/share.js:577
+#: js/share.js:620
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:589
+#: js/share.js:632
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:604
+#: js/share.js:647
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:615
+#: js/share.js:658
 msgid "Email sent"
 msgstr ""
 
@@ -373,7 +377,7 @@ msgstr ""
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
-#: lostpassword/controller.php:58
+#: lostpassword/controller.php:60
 msgid "ownCloud password reset"
 msgstr "اون کلاؤڈ پاسورڈ ری سیٹ"
 
@@ -403,17 +407,17 @@ msgstr "یوزر نیم"
 
 #: lostpassword/templates/lostpassword.php:22
 msgid ""
-"Your files seems to be encrypted. If you didn't have enabled the recovery "
-"key there will be no way to get your data back once the password was "
-"resetted. If you are not sure what to do, please contact your administrator "
-"first before continue. Do you really want to continue?"
+"Your files are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
 msgstr ""
 
 #: lostpassword/templates/lostpassword.php:24
 msgid "Yes, I really want to reset my password now"
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:29
+#: lostpassword/templates/lostpassword.php:27
 msgid "Request reset"
 msgstr "ری سیٹ کی درخواست کریں"
 
@@ -461,7 +465,7 @@ msgstr "پہنچ کی اجازت نہیں"
 msgid "Cloud not found"
 msgstr "نہیں مل سکا"
 
-#: templates/altmail.php:2
+#: templates/altmail.php:4
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -472,10 +476,6 @@ msgid ""
 "Cheers!"
 msgstr ""
 
-#: templates/altmail.php:7 templates/mail.php:24
-msgid "web services under your control"
-msgstr "آپ کے اختیار میں ویب سروسیز"
-
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
 msgstr "زمرہ جات کی تدوین کریں"
@@ -568,12 +568,12 @@ msgstr "ڈیٹابیس ہوسٹ"
 msgid "Finish setup"
 msgstr "سیٹ اپ ختم کریں"
 
-#: templates/layout.user.php:40
+#: templates/layout.user.php:43
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:67
+#: templates/layout.user.php:68
 msgid "Log out"
 msgstr "لاگ آؤٹ"
 
@@ -607,7 +607,7 @@ msgstr "لاگ ان"
 msgid "Alternative Logins"
 msgstr ""
 
-#: templates/mail.php:15
+#: templates/mail.php:16
 #, php-format
 msgid ""
 "Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
diff --git a/l10n/ur_PK/files.po b/l10n/ur_PK/files.po
index c945d218ceaa1975e59637cfc36e54472485e2f5..1228fc43c1dff0b32b7abfbde9fa9f67932c5228 100644
--- a/l10n/ur_PK/files.po
+++ b/l10n/ur_PK/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:01+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n"
 "MIME-Version: 1.0\n"
@@ -27,46 +27,54 @@ msgstr ""
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/upload.php:19
+#: ajax/upload.php:16 ajax/upload.php:45
+msgid "Unable to set upload directory."
+msgstr ""
+
+#: ajax/upload.php:22
+msgid "Invalid Token"
+msgstr ""
+
+#: ajax/upload.php:59
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: ajax/upload.php:26
+#: ajax/upload.php:66
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/upload.php:27
+#: ajax/upload.php:67
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:29
+#: ajax/upload.php:69
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/upload.php:30
+#: ajax/upload.php:70
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/upload.php:31
+#: ajax/upload.php:71
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/upload.php:32
+#: ajax/upload.php:72
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/upload.php:33
+#: ajax/upload.php:73
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:51
+#: ajax/upload.php:91
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:83
+#: ajax/upload.php:123
 msgid "Invalid directory."
 msgstr ""
 
@@ -74,6 +82,36 @@ msgstr ""
 msgid "Files"
 msgstr ""
 
+#: js/file-upload.js:11
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/file-upload.js:24
+msgid "Not enough space available"
+msgstr ""
+
+#: js/file-upload.js:64
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/file-upload.js:167 js/files.js:266
+msgid ""
+"File upload is in progress. Leaving the page now will cancel the upload."
+msgstr ""
+
+#: js/file-upload.js:233 js/files.js:339
+msgid "URL cannot be empty."
+msgstr ""
+
+#: js/file-upload.js:238 lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr ""
+
+#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
+#: js/files.js:693 js/files.js:731
+msgid "Error"
+msgstr "ایرر"
+
 #: js/fileactions.js:116
 msgid "Share"
 msgstr ""
@@ -90,43 +128,43 @@ msgstr ""
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:464
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:259
+#: js/filelist.js:302
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:306
+#: js/filelist.js:349
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:306
+#: js/filelist.js:349
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:331
+#: js/filelist.js:374
 msgid "perform delete operation"
 msgstr ""
 
-#: js/filelist.js:413
+#: js/filelist.js:456
 msgid "1 file uploading"
 msgstr ""
 
-#: js/filelist.js:416 js/filelist.js:470
+#: js/filelist.js:459 js/filelist.js:517
 msgid "files uploading"
 msgstr ""
 
@@ -158,69 +196,41 @@ msgid ""
 "big."
 msgstr ""
 
-#: js/files.js:264
-msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr ""
-
-#: js/files.js:277
-msgid "Not enough space available"
-msgstr ""
-
-#: js/files.js:317
-msgid "Upload cancelled."
-msgstr ""
-
-#: js/files.js:413
-msgid ""
-"File upload is in progress. Leaving the page now will cancel the upload."
-msgstr ""
-
-#: js/files.js:486
-msgid "URL cannot be empty."
-msgstr ""
-
-#: js/files.js:491
+#: js/files.js:344
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
-msgid "Error"
-msgstr "ایرر"
-
-#: js/files.js:877 templates/index.php:69
+#: js/files.js:744 templates/index.php:69
 msgid "Name"
 msgstr ""
 
-#: js/files.js:878 templates/index.php:80
+#: js/files.js:745 templates/index.php:80
 msgid "Size"
 msgstr ""
 
-#: js/files.js:879 templates/index.php:82
+#: js/files.js:746 templates/index.php:82
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:898
+#: js/files.js:765
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:900
+#: js/files.js:767
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:908
+#: js/files.js:775
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:910
+#: js/files.js:777
 msgid "{count} files"
 msgstr ""
 
-#: lib/app.php:53
-msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
-msgstr ""
-
 #: lib/app.php:73
-msgid "Unable to rename file"
+#, php-format
+msgid "%s could not be renamed"
 msgstr ""
 
 #: lib/helper.php:11 templates/index.php:18
@@ -317,6 +327,22 @@ msgstr ""
 msgid "Current scanning"
 msgstr ""
 
+#: templates/part.list.php:76
+msgid "directory"
+msgstr ""
+
+#: templates/part.list.php:78
+msgid "directories"
+msgstr ""
+
+#: templates/part.list.php:87
+msgid "file"
+msgstr ""
+
+#: templates/part.list.php:89
+msgid "files"
+msgstr ""
+
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
 msgstr ""
diff --git a/l10n/ur_PK/files_encryption.po b/l10n/ur_PK/files_encryption.po
index b002ce1524413e588bd4410be91a8e093b9db8af..b082d1236b975cd90b9acdc4243aae248b260f8f 100644
--- a/l10n/ur_PK/files_encryption.po
+++ b/l10n/ur_PK/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-14 02:46+0200\n"
-"PO-Revision-Date: 2013-06-14 00:47+0000\n"
+"POT-Creation-Date: 2013-07-05 02:12+0200\n"
+"PO-Revision-Date: 2013-07-05 00:13+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n"
 "MIME-Version: 1.0\n"
@@ -55,9 +55,21 @@ msgstr ""
 
 #: files/error.php:7
 msgid ""
-"Your private key is not valid! Maybe your password was changed from outside."
-" You can update your private key password in your personal settings to "
-"regain access to your files"
+"Your private key is not valid! Likely your password was changed outside the "
+"ownCloud system (e.g. your corporate directory). You can update your private"
+" key password in your personal settings to recover access to your encrypted "
+"files."
+msgstr ""
+
+#: hooks/hooks.php:44
+msgid "Missing requirements."
+msgstr ""
+
+#: hooks/hooks.php:45
+msgid ""
+"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL "
+"PHP extension is enabled and configured properly. For now, the encryption "
+"app has been disabled."
 msgstr ""
 
 #: js/settings-admin.js:11
@@ -84,11 +96,11 @@ msgstr ""
 
 #: templates/settings-admin.php:10
 msgid ""
-"Enable encryption passwords recovery key (allow sharing to recovery key):"
+"Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
 #: templates/settings-admin.php:14
-msgid "Recovery account password"
+msgid "Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:21 templates/settings-personal.php:54
@@ -100,15 +112,15 @@ msgid "Disabled"
 msgstr ""
 
 #: templates/settings-admin.php:34
-msgid "Change encryption passwords recovery key:"
+msgid "Change recovery key password:"
 msgstr ""
 
 #: templates/settings-admin.php:41
-msgid "Old Recovery account password"
+msgid "Old Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:48
-msgid "New Recovery account password"
+msgid "New Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:53
diff --git a/l10n/ur_PK/files_sharing.po b/l10n/ur_PK/files_sharing.po
index 65623d2348bac444d470206dbc7ca2e3f3e1ee4f..119e4cb853ffdf8473f2804d9d49b9860cbbf36a 100644
--- a/l10n/ur_PK/files_sharing.po
+++ b/l10n/ur_PK/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-14 02:47+0200\n"
-"PO-Revision-Date: 2013-06-14 00:47+0000\n"
+"POT-Creation-Date: 2013-07-05 02:13+0200\n"
+"PO-Revision-Date: 2013-07-05 00:13+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n"
 "MIME-Version: 1.0\n"
@@ -18,27 +18,39 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: templates/authenticate.php:4
+msgid "The password is wrong. Try again."
+msgstr ""
+
+#: templates/authenticate.php:7
 msgid "Password"
 msgstr "پاسورڈ"
 
-#: templates/authenticate.php:6
+#: templates/authenticate.php:9
 msgid "Submit"
 msgstr ""
 
-#: templates/public.php:10
+#: templates/public.php:17
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr ""
 
-#: templates/public.php:13
+#: templates/public.php:20
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr ""
 
-#: templates/public.php:19 templates/public.php:43
+#: templates/public.php:28 templates/public.php:86
 msgid "Download"
 msgstr ""
 
-#: templates/public.php:40
+#: templates/public.php:44
+msgid "Upload"
+msgstr ""
+
+#: templates/public.php:54
+msgid "Cancel upload"
+msgstr ""
+
+#: templates/public.php:83
 msgid "No preview available for"
 msgstr ""
diff --git a/l10n/ur_PK/files_trashbin.po b/l10n/ur_PK/files_trashbin.po
index 6fe896a1c3c23860686bf76c856f31d10f4cfde0..8ae2610c63d0144668c8c03ab112b02d0cf69d66 100644
--- a/l10n/ur_PK/files_trashbin.po
+++ b/l10n/ur_PK/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:16+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/ur_PK/lib.po b/l10n/ur_PK/lib.po
index fe1ddaf99cde83f3c2efc6f93586c52617b69a4c..0935352b0b4a247a4efb4cf20697f7dd1e770ddc 100644
--- a/l10n/ur_PK/lib.po
+++ b/l10n/ur_PK/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 00:04+0000\n"
+"POT-Creation-Date: 2013-07-09 02:04+0200\n"
+"PO-Revision-Date: 2013-07-09 00:02+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n"
 "MIME-Version: 1.0\n"
@@ -17,30 +17,34 @@ msgstr ""
 "Language: ur_PK\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:359
+#: app.php:360
 msgid "Help"
 msgstr "مدد"
 
-#: app.php:372
+#: app.php:373
 msgid "Personal"
 msgstr "ذاتی"
 
-#: app.php:383
+#: app.php:384
 msgid "Settings"
 msgstr "سیٹینگز"
 
-#: app.php:395
+#: app.php:396
 msgid "Users"
 msgstr "یوزرز"
 
-#: app.php:408
+#: app.php:409
 msgid "Apps"
 msgstr "ایپز"
 
-#: app.php:416
+#: app.php:417
 msgid "Admin"
 msgstr "ایڈمن"
 
+#: defaults.php:33
+msgid "web services under your control"
+msgstr "آپ کے اختیار میں ویب سروسیز"
+
 #: files.php:210
 msgid "ZIP download is turned off."
 msgstr ""
@@ -85,104 +89,102 @@ msgstr ""
 msgid "Images"
 msgstr ""
 
-#: setup.php:34
-msgid "Set an admin username."
-msgstr ""
-
-#: setup.php:37
-msgid "Set an admin password."
-msgstr ""
-
-#: setup.php:55
+#: setup/abstractdatabase.php:22
 #, php-format
 msgid "%s enter the database username."
 msgstr ""
 
-#: setup.php:58
+#: setup/abstractdatabase.php:25
 #, php-format
 msgid "%s enter the database name."
 msgstr ""
 
-#: setup.php:61
+#: setup/abstractdatabase.php:28
 #, php-format
 msgid "%s you may not use dots in the database name"
 msgstr ""
 
-#: setup.php:64
+#: setup/mssql.php:20
 #, php-format
-msgid "%s set the database host."
-msgstr ""
-
-#: setup.php:126 setup.php:332 setup.php:377
-msgid "PostgreSQL username and/or password not valid"
+msgid "MS SQL username and/or password not valid: %s"
 msgstr ""
 
-#: setup.php:127 setup.php:235
+#: setup/mssql.php:21 setup/mysql.php:13 setup/oci.php:114
+#: setup/postgresql.php:24 setup/postgresql.php:70
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:152
-msgid "Oracle connection could not be established"
-msgstr ""
-
-#: setup.php:234
+#: setup/mysql.php:12
 msgid "MySQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:288 setup.php:398 setup.php:407 setup.php:425 setup.php:435
-#: setup.php:444 setup.php:477 setup.php:543 setup.php:569 setup.php:576
-#: setup.php:587 setup.php:594 setup.php:603 setup.php:611 setup.php:620
-#: setup.php:626
+#: setup/mysql.php:67 setup/oci.php:54 setup/oci.php:121 setup/oci.php:147
+#: setup/oci.php:154 setup/oci.php:165 setup/oci.php:172 setup/oci.php:181
+#: setup/oci.php:189 setup/oci.php:198 setup/oci.php:204
+#: setup/postgresql.php:89 setup/postgresql.php:98 setup/postgresql.php:115
+#: setup/postgresql.php:125 setup/postgresql.php:134
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr ""
 
-#: setup.php:289 setup.php:399 setup.php:408 setup.php:426 setup.php:436
-#: setup.php:445 setup.php:478 setup.php:544 setup.php:570 setup.php:577
-#: setup.php:588 setup.php:604 setup.php:612 setup.php:621
+#: setup/mysql.php:68 setup/oci.php:55 setup/oci.php:122 setup/oci.php:148
+#: setup/oci.php:155 setup/oci.php:166 setup/oci.php:182 setup/oci.php:190
+#: setup/oci.php:199 setup/postgresql.php:90 setup/postgresql.php:99
+#: setup/postgresql.php:116 setup/postgresql.php:126 setup/postgresql.php:135
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:305
+#: setup/mysql.php:85
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:306
+#: setup/mysql.php:86
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:311
+#: setup/mysql.php:91
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:312
+#: setup/mysql.php:92
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:469 setup.php:536
+#: setup/oci.php:34
+msgid "Oracle connection could not be established"
+msgstr ""
+
+#: setup/oci.php:41 setup/oci.php:113
 msgid "Oracle username and/or password not valid"
 msgstr ""
 
-#: setup.php:595 setup.php:627
+#: setup/oci.php:173 setup/oci.php:205
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:647
-#, php-format
-msgid "MS SQL username and/or password not valid: %s"
+#: setup/postgresql.php:23 setup/postgresql.php:69
+msgid "PostgreSQL username and/or password not valid"
+msgstr ""
+
+#: setup.php:42
+msgid "Set an admin username."
+msgstr ""
+
+#: setup.php:45
+msgid "Set an admin password."
 msgstr ""
 
-#: setup.php:870
+#: setup.php:198
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:871
+#: setup.php:199
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
diff --git a/l10n/ur_PK/settings.po b/l10n/ur_PK/settings.po
index 7120aba682f56e96174649ff29751e53af427554..f73aaa5c27a2eedfd3e87031b21d743d36637573 100644
--- a/l10n/ur_PK/settings.po
+++ b/l10n/ur_PK/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n"
 "MIME-Version: 1.0\n"
@@ -88,35 +88,35 @@ msgstr ""
 msgid "Couldn't update app."
 msgstr ""
 
-#: js/apps.js:30
+#: js/apps.js:35
 msgid "Update to {appversion}"
 msgstr ""
 
-#: js/apps.js:36 js/apps.js:76
+#: js/apps.js:41 js/apps.js:81
 msgid "Disable"
 msgstr ""
 
-#: js/apps.js:36 js/apps.js:64 js/apps.js:83
+#: js/apps.js:41 js/apps.js:69 js/apps.js:88
 msgid "Enable"
 msgstr ""
 
-#: js/apps.js:55
+#: js/apps.js:60
 msgid "Please wait...."
 msgstr ""
 
-#: js/apps.js:59 js/apps.js:71 js/apps.js:80 js/apps.js:93
+#: js/apps.js:64 js/apps.js:76 js/apps.js:85 js/apps.js:98
 msgid "Error"
 msgstr "ایرر"
 
-#: js/apps.js:90
+#: js/apps.js:95
 msgid "Updating...."
 msgstr ""
 
-#: js/apps.js:93
+#: js/apps.js:98
 msgid "Error while updating app"
 msgstr ""
 
-#: js/apps.js:96
+#: js/apps.js:101
 msgid "Updated"
 msgstr ""
 
@@ -165,15 +165,15 @@ msgstr ""
 msgid "A valid password must be provided"
 msgstr ""
 
-#: personal.php:35 personal.php:36
+#: personal.php:37 personal.php:38
 msgid "__language_name__"
 msgstr ""
 
-#: templates/admin.php:15
+#: templates/admin.php:17
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:18
+#: templates/admin.php:20
 msgid ""
 "Your data directory and your files are probably accessible from the "
 "internet. The .htaccess file that ownCloud provides is not working. We "
@@ -182,36 +182,36 @@ msgid ""
 " webserver document root."
 msgstr ""
 
-#: templates/admin.php:29
+#: templates/admin.php:31
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:32
+#: templates/admin.php:34
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: templates/admin.php:33
+#: templates/admin.php:35
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:44
+#: templates/admin.php:46
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:47
+#: templates/admin.php:49
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr ""
 
-#: templates/admin.php:58
+#: templates/admin.php:60
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:63
+#: templates/admin.php:65
 #, php-format
 msgid ""
 "This ownCloud server can't set system locale to %s. This means that there "
@@ -219,11 +219,11 @@ msgid ""
 " to install the required packages on your system to support %s."
 msgstr ""
 
-#: templates/admin.php:75
+#: templates/admin.php:77
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:78
+#: templates/admin.php:80
 msgid ""
 "This ownCloud server has no working internet connection. This means that "
 "some of the features like mounting of external storage, notifications about "
@@ -233,102 +233,102 @@ msgid ""
 " of ownCloud."
 msgstr ""
 
-#: templates/admin.php:92
+#: templates/admin.php:94
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:101
+#: templates/admin.php:103
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:111
+#: templates/admin.php:113
 msgid ""
 "cron.php is registered at a webcron service. Call the cron.php page in the "
 "owncloud root once a minute over http."
 msgstr ""
 
-#: templates/admin.php:121
+#: templates/admin.php:123
 msgid ""
 "Use systems cron service. Call the cron.php file in the owncloud folder via "
 "a system cronjob once a minute."
 msgstr ""
 
-#: templates/admin.php:128
+#: templates/admin.php:130
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:134
+#: templates/admin.php:136
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:135
+#: templates/admin.php:137
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:142
+#: templates/admin.php:144
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:143
+#: templates/admin.php:145
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:150
+#: templates/admin.php:152
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:151
+#: templates/admin.php:153
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:158
+#: templates/admin.php:160
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:161
+#: templates/admin.php:163
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:168
+#: templates/admin.php:170
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:181
+#: templates/admin.php:183
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:182
+#: templates/admin.php:184
 msgid ""
 "Enforces the clients to connect to ownCloud via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:185
+#: templates/admin.php:187
 msgid ""
 "Please connect to this ownCloud instance via HTTPS to enable or disable the "
 "SSL enforcement."
 msgstr ""
 
-#: templates/admin.php:195
+#: templates/admin.php:197
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:196
+#: templates/admin.php:198
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:227
+#: templates/admin.php:229
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:228
+#: templates/admin.php:230
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:235 templates/personal.php:116
+#: templates/admin.php:236 templates/personal.php:116
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:237 templates/personal.php:119
+#: templates/admin.php:240 templates/personal.php:119
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -386,76 +386,79 @@ msgstr ""
 msgid "Commercial Support"
 msgstr ""
 
-#: templates/personal.php:9
+#: templates/personal.php:10
 msgid "Get the apps to sync your files"
 msgstr ""
 
-#: templates/personal.php:20
+#: templates/personal.php:21
 msgid "Show First Run Wizard again"
 msgstr ""
 
-#: templates/personal.php:28
+#: templates/personal.php:29
 #, php-format
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr ""
 
-#: templates/personal.php:40 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:41 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "پاسورڈ"
 
-#: templates/personal.php:41
+#: templates/personal.php:42
 msgid "Your password was changed"
 msgstr ""
 
-#: templates/personal.php:42
+#: templates/personal.php:43
 msgid "Unable to change your password"
 msgstr ""
 
-#: templates/personal.php:43
+#: templates/personal.php:44
 msgid "Current password"
 msgstr ""
 
-#: templates/personal.php:45
+#: templates/personal.php:46
 msgid "New password"
 msgstr "نیا پاسورڈ"
 
-#: templates/personal.php:47
+#: templates/personal.php:48
 msgid "Change password"
 msgstr ""
 
-#: templates/personal.php:59 templates/users.php:85
+#: templates/personal.php:60 templates/users.php:85
 msgid "Display Name"
 msgstr ""
 
-#: templates/personal.php:74
+#: templates/personal.php:75
 msgid "Email"
 msgstr ""
 
-#: templates/personal.php:76
+#: templates/personal.php:77
 msgid "Your email address"
 msgstr ""
 
-#: templates/personal.php:77
+#: templates/personal.php:78
 msgid "Fill in an email address to enable password recovery"
 msgstr ""
 
-#: templates/personal.php:86 templates/personal.php:87
+#: templates/personal.php:87 templates/personal.php:88
 msgid "Language"
 msgstr ""
 
-#: templates/personal.php:99
+#: templates/personal.php:100
 msgid "Help translate"
 msgstr ""
 
-#: templates/personal.php:105
+#: templates/personal.php:106
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:107
-msgid "Use this address to connect to your ownCloud in your file manager"
+#: templates/personal.php:108
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
+"target=\"_blank\">access your Files via WebDAV</a>"
 msgstr ""
 
-#: templates/users.php:21 templates/users.php:84
+#: templates/users.php:21
 msgid "Login Name"
 msgstr ""
 
@@ -485,6 +488,10 @@ msgstr ""
 msgid "Other"
 msgstr ""
 
+#: templates/users.php:84
+msgid "Username"
+msgstr "یوزر نیم"
+
 #: templates/users.php:91
 msgid "Storage"
 msgstr ""
diff --git a/l10n/ur_PK/user_ldap.po b/l10n/ur_PK/user_ldap.po
index 8507331d9111137f4b2831342d6358941a650e86..e0bc31512958fcb97655f36b6a45f68446867868 100644
--- a/l10n/ur_PK/user_ldap.po
+++ b/l10n/ur_PK/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:25+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:16+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/vi/core.po b/l10n/vi/core.po
index ae6f675611826b7a3204873e3ad15c119e9d3a40..86a71e77b2e3d8c05c0e7757531874b63ce6b9fe 100644
--- a/l10n/vi/core.po
+++ b/l10n/vi/core.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:22+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
 "MIME-Version: 1.0\n"
@@ -62,135 +62,135 @@ msgstr "Bạn chưa chọn mục để xóa"
 msgid "Error removing %s from favorites."
 msgstr "Lỗi xóa %s từ mục yêu thích."
 
-#: js/config.php:34
+#: js/config.php:32
 msgid "Sunday"
 msgstr "Chủ nhật"
 
-#: js/config.php:35
+#: js/config.php:33
 msgid "Monday"
 msgstr "Thứ 2"
 
-#: js/config.php:36
+#: js/config.php:34
 msgid "Tuesday"
 msgstr "Thứ 3"
 
-#: js/config.php:37
+#: js/config.php:35
 msgid "Wednesday"
 msgstr "Thứ 4"
 
-#: js/config.php:38
+#: js/config.php:36
 msgid "Thursday"
 msgstr "Thứ 5"
 
-#: js/config.php:39
+#: js/config.php:37
 msgid "Friday"
 msgstr "Thứ "
 
-#: js/config.php:40
+#: js/config.php:38
 msgid "Saturday"
 msgstr "Thứ 7"
 
-#: js/config.php:45
+#: js/config.php:43
 msgid "January"
 msgstr "Tháng 1"
 
-#: js/config.php:46
+#: js/config.php:44
 msgid "February"
 msgstr "Tháng 2"
 
-#: js/config.php:47
+#: js/config.php:45
 msgid "March"
 msgstr "Tháng 3"
 
-#: js/config.php:48
+#: js/config.php:46
 msgid "April"
 msgstr "Tháng 4"
 
-#: js/config.php:49
+#: js/config.php:47
 msgid "May"
 msgstr "Tháng 5"
 
-#: js/config.php:50
+#: js/config.php:48
 msgid "June"
 msgstr "Tháng 6"
 
-#: js/config.php:51
+#: js/config.php:49
 msgid "July"
 msgstr "Tháng 7"
 
-#: js/config.php:52
+#: js/config.php:50
 msgid "August"
 msgstr "Tháng 8"
 
-#: js/config.php:53
+#: js/config.php:51
 msgid "September"
 msgstr "Tháng 9"
 
-#: js/config.php:54
+#: js/config.php:52
 msgid "October"
 msgstr "Tháng 10"
 
-#: js/config.php:55
+#: js/config.php:53
 msgid "November"
 msgstr "Tháng 11"
 
-#: js/config.php:56
+#: js/config.php:54
 msgid "December"
 msgstr "Tháng 12"
 
-#: js/js.js:286
+#: js/js.js:293
 msgid "Settings"
 msgstr "Cài đặt"
 
-#: js/js.js:718
+#: js/js.js:725
 msgid "seconds ago"
 msgstr "vài giây trước"
 
-#: js/js.js:719
+#: js/js.js:726
 msgid "1 minute ago"
 msgstr "1 phút trước"
 
-#: js/js.js:720
+#: js/js.js:727
 msgid "{minutes} minutes ago"
 msgstr "{minutes} phút trước"
 
-#: js/js.js:721
+#: js/js.js:728
 msgid "1 hour ago"
 msgstr "1 giờ trước"
 
-#: js/js.js:722
+#: js/js.js:729
 msgid "{hours} hours ago"
 msgstr "{hours} giờ trước"
 
-#: js/js.js:723
+#: js/js.js:730
 msgid "today"
 msgstr "hôm nay"
 
-#: js/js.js:724
+#: js/js.js:731
 msgid "yesterday"
 msgstr "hôm qua"
 
-#: js/js.js:725
+#: js/js.js:732
 msgid "{days} days ago"
 msgstr "{days} ngày trước"
 
-#: js/js.js:726
+#: js/js.js:733
 msgid "last month"
 msgstr "tháng trước"
 
-#: js/js.js:727
+#: js/js.js:734
 msgid "{months} months ago"
 msgstr "{months} tháng trước"
 
-#: js/js.js:728
+#: js/js.js:735
 msgid "months ago"
 msgstr "tháng trước"
 
-#: js/js.js:729
+#: js/js.js:736
 msgid "last year"
 msgstr "năm trước"
 
-#: js/js.js:730
+#: js/js.js:737
 msgid "years ago"
 msgstr "năm trước"
 
@@ -226,8 +226,8 @@ msgstr "Loại đối tượng không được chỉ định."
 #: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
 #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:577
-#: js/share.js:589
+#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:620
+#: js/share.js:632
 msgid "Error"
 msgstr "Lá»—i"
 
@@ -247,7 +247,7 @@ msgstr "Được chia sẻ"
 msgid "Share"
 msgstr "Chia sẻ"
 
-#: js/share.js:125 js/share.js:617
+#: js/share.js:125 js/share.js:660
 msgid "Error while sharing"
 msgstr "Lỗi trong quá trình chia sẻ"
 
@@ -267,99 +267,103 @@ msgstr "Đã được chia sẽ với bạn và nhóm {group} bởi {owner}"
 msgid "Shared with you by {owner}"
 msgstr "Đã được chia sẽ bởi {owner}"
 
-#: js/share.js:159
+#: js/share.js:172
 msgid "Share with"
 msgstr "Chia sẻ với"
 
-#: js/share.js:164
+#: js/share.js:177
 msgid "Share with link"
 msgstr "Chia sẻ với liên kết"
 
-#: js/share.js:167
+#: js/share.js:180
 msgid "Password protect"
 msgstr "Mật khẩu bảo vệ"
 
-#: js/share.js:169 templates/installation.php:54 templates/login.php:26
+#: js/share.js:182 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "Mật khẩu"
 
-#: js/share.js:173
+#: js/share.js:187
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:191
 msgid "Email link to person"
 msgstr "Liên kết email tới cá nhân"
 
-#: js/share.js:174
+#: js/share.js:192
 msgid "Send"
 msgstr "Gởi"
 
-#: js/share.js:178
+#: js/share.js:197
 msgid "Set expiration date"
 msgstr "Đặt ngày kết thúc"
 
-#: js/share.js:179
+#: js/share.js:198
 msgid "Expiration date"
 msgstr "Ngày kết thúc"
 
-#: js/share.js:211
+#: js/share.js:230
 msgid "Share via email:"
 msgstr "Chia sẻ thông qua email"
 
-#: js/share.js:213
+#: js/share.js:232
 msgid "No people found"
 msgstr "Không tìm thấy người nào"
 
-#: js/share.js:251
+#: js/share.js:270
 msgid "Resharing is not allowed"
 msgstr "Chia sẻ lại không được cho phép"
 
-#: js/share.js:287
+#: js/share.js:306
 msgid "Shared in {item} with {user}"
 msgstr "Đã được chia sẽ trong {item} với {user}"
 
-#: js/share.js:308
+#: js/share.js:327
 msgid "Unshare"
 msgstr "Bỏ chia sẻ"
 
-#: js/share.js:320
+#: js/share.js:339
 msgid "can edit"
 msgstr "có thể chỉnh sửa"
 
-#: js/share.js:322
+#: js/share.js:341
 msgid "access control"
 msgstr "quản lý truy cập"
 
-#: js/share.js:325
+#: js/share.js:344
 msgid "create"
 msgstr "tạo"
 
-#: js/share.js:328
+#: js/share.js:347
 msgid "update"
 msgstr "cập nhật"
 
-#: js/share.js:331
+#: js/share.js:350
 msgid "delete"
 msgstr "xóa"
 
-#: js/share.js:334
+#: js/share.js:353
 msgid "share"
 msgstr "chia sẻ"
 
-#: js/share.js:368 js/share.js:564
+#: js/share.js:387 js/share.js:607
 msgid "Password protected"
 msgstr "Mật khẩu bảo vệ"
 
-#: js/share.js:577
+#: js/share.js:620
 msgid "Error unsetting expiration date"
 msgstr "Lỗi không thiết lập ngày kết thúc"
 
-#: js/share.js:589
+#: js/share.js:632
 msgid "Error setting expiration date"
 msgstr "Lỗi cấu hình ngày kết thúc"
 
-#: js/share.js:604
+#: js/share.js:647
 msgid "Sending ..."
 msgstr "Đang gởi ..."
 
-#: js/share.js:615
+#: js/share.js:658
 msgid "Email sent"
 msgstr "Email đã được gửi"
 
@@ -374,7 +378,7 @@ msgstr "Cập nhật không thành công . Vui lòng thông báo đến <a href=
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "Cập nhật thành công .Hệ thống sẽ đưa bạn tới ownCloud."
 
-#: lostpassword/controller.php:58
+#: lostpassword/controller.php:60
 msgid "ownCloud password reset"
 msgstr "Khôi phục mật khẩu Owncloud "
 
@@ -404,17 +408,17 @@ msgstr "Tên đăng nhập"
 
 #: lostpassword/templates/lostpassword.php:22
 msgid ""
-"Your files seems to be encrypted. If you didn't have enabled the recovery "
-"key there will be no way to get your data back once the password was "
-"resetted. If you are not sure what to do, please contact your administrator "
-"first before continue. Do you really want to continue?"
+"Your files are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
 msgstr ""
 
 #: lostpassword/templates/lostpassword.php:24
 msgid "Yes, I really want to reset my password now"
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:29
+#: lostpassword/templates/lostpassword.php:27
 msgid "Request reset"
 msgstr "Yêu cầu thiết lập lại "
 
@@ -462,7 +466,7 @@ msgstr "Truy cập bị cấm"
 msgid "Cloud not found"
 msgstr "Không tìm thấy Clound"
 
-#: templates/altmail.php:2
+#: templates/altmail.php:4
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -473,10 +477,6 @@ msgid ""
 "Cheers!"
 msgstr ""
 
-#: templates/altmail.php:7 templates/mail.php:24
-msgid "web services under your control"
-msgstr "dịch vụ web dưới sự kiểm soát của bạn"
-
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
 msgstr "Sửa chuyên mục"
@@ -569,12 +569,12 @@ msgstr "Database host"
 msgid "Finish setup"
 msgstr "Cài đặt hoàn tất"
 
-#: templates/layout.user.php:40
+#: templates/layout.user.php:43
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr "%s còn trống. Xem thêm thông tin cách cập nhật."
 
-#: templates/layout.user.php:67
+#: templates/layout.user.php:68
 msgid "Log out"
 msgstr "Đăng xuất"
 
@@ -608,7 +608,7 @@ msgstr "Đăng nhập"
 msgid "Alternative Logins"
 msgstr "Đăng nhập khác"
 
-#: templates/mail.php:15
+#: templates/mail.php:16
 #, php-format
 msgid ""
 "Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
diff --git a/l10n/vi/files.po b/l10n/vi/files.po
index d080cffa1252886918aa7951a7d9dfe293032b39..c4131cd7ecfa1539c1c4241399dcde2e29da5e0b 100644
--- a/l10n/vi/files.po
+++ b/l10n/vi/files.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:01+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
 "MIME-Version: 1.0\n"
@@ -28,46 +28,54 @@ msgstr "Không thể di chuyển %s - Đã có tên tập tin này trên hệ th
 msgid "Could not move %s"
 msgstr "Không thể di chuyển %s"
 
-#: ajax/upload.php:19
+#: ajax/upload.php:16 ajax/upload.php:45
+msgid "Unable to set upload directory."
+msgstr ""
+
+#: ajax/upload.php:22
+msgid "Invalid Token"
+msgstr ""
+
+#: ajax/upload.php:59
 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:26
+#: ajax/upload.php:66
 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:27
+#: ajax/upload.php:67
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 
-#: ajax/upload.php:29
+#: ajax/upload.php:69
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Tập tin được tải lên vượt quá MAX_FILE_SIZE được quy định trong mẫu HTML"
 
-#: ajax/upload.php:30
+#: ajax/upload.php:70
 msgid "The uploaded file was only partially uploaded"
 msgstr "Các tập tin được tải lên chỉ tải lên được một phần"
 
-#: ajax/upload.php:31
+#: ajax/upload.php:71
 msgid "No file was uploaded"
 msgstr "Chưa có file nào được tải lên"
 
-#: ajax/upload.php:32
+#: ajax/upload.php:72
 msgid "Missing a temporary folder"
 msgstr "Không tìm thấy thư mục tạm"
 
-#: ajax/upload.php:33
+#: ajax/upload.php:73
 msgid "Failed to write to disk"
 msgstr "Không thể ghi "
 
-#: ajax/upload.php:51
+#: ajax/upload.php:91
 msgid "Not enough storage available"
 msgstr "Không đủ không gian lưu trữ"
 
-#: ajax/upload.php:83
+#: ajax/upload.php:123
 msgid "Invalid directory."
 msgstr "Thư mục không hợp lệ"
 
@@ -75,6 +83,36 @@ msgstr "Thư mục không hợp lệ"
 msgid "Files"
 msgstr "Tập tin"
 
+#: js/file-upload.js:11
+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 của bạn ,nó như là một thư mục hoặc có 0 byte"
+
+#: js/file-upload.js:24
+msgid "Not enough space available"
+msgstr "Không đủ chỗ trống cần thiết"
+
+#: js/file-upload.js:64
+msgid "Upload cancelled."
+msgstr "Hủy tải lên"
+
+#: js/file-upload.js:167 js/files.js:266
+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/file-upload.js:233 js/files.js:339
+msgid "URL cannot be empty."
+msgstr "URL không được để trống."
+
+#: js/file-upload.js:238 lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr ""
+
+#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
+#: js/files.js:693 js/files.js:731
+msgid "Error"
+msgstr "Lá»—i"
+
 #: js/fileactions.js:116
 msgid "Share"
 msgstr "Chia sẻ"
@@ -91,43 +129,43 @@ msgstr "Xóa"
 msgid "Rename"
 msgstr "Sửa tên"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:464
 msgid "Pending"
 msgstr "Đang chờ"
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "{new_name} already exists"
 msgstr "{new_name} đã tồn tại"
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "replace"
 msgstr "thay thế"
 
-#: js/filelist.js:259
+#: js/filelist.js:302
 msgid "suggest name"
 msgstr "tên gợi ý"
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "cancel"
 msgstr "hủy"
 
-#: js/filelist.js:306
+#: js/filelist.js:349
 msgid "replaced {new_name} with {old_name}"
 msgstr "đã thay thế {new_name} bằng {old_name}"
 
-#: js/filelist.js:306
+#: js/filelist.js:349
 msgid "undo"
 msgstr "lùi lại"
 
-#: js/filelist.js:331
+#: js/filelist.js:374
 msgid "perform delete operation"
 msgstr "thực hiện việc xóa"
 
-#: js/filelist.js:413
+#: js/filelist.js:456
 msgid "1 file uploading"
 msgstr "1 tệp tin đang được tải lên"
 
-#: js/filelist.js:416 js/filelist.js:470
+#: js/filelist.js:459 js/filelist.js:517
 msgid "files uploading"
 msgstr "tệp tin đang được tải lên"
 
@@ -159,70 +197,42 @@ msgid ""
 "big."
 msgstr "Your download is being prepared. This might take some time if the files are big."
 
-#: js/files.js:264
-msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "Không thể tải lên tập tin của bạn ,nó như là một thư mục hoặc có 0 byte"
-
-#: js/files.js:277
-msgid "Not enough space available"
-msgstr "Không đủ chỗ trống cần thiết"
-
-#: js/files.js:317
-msgid "Upload cancelled."
-msgstr "Hủy tải lên"
-
-#: js/files.js:413
-msgid ""
-"File upload is in progress. Leaving the page now will cancel the upload."
-msgstr "Tập tin tải lên đang được xử lý. Nếu bạn rời khỏi trang bây giờ sẽ hủy quá trình này."
-
-#: js/files.js:486
-msgid "URL cannot be empty."
-msgstr "URL không được để trống."
-
-#: js/files.js:491
+#: js/files.js:344
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 
-#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
-msgid "Error"
-msgstr "Lá»—i"
-
-#: js/files.js:877 templates/index.php:69
+#: js/files.js:744 templates/index.php:69
 msgid "Name"
 msgstr "Tên"
 
-#: js/files.js:878 templates/index.php:80
+#: js/files.js:745 templates/index.php:80
 msgid "Size"
 msgstr "Kích cỡ"
 
-#: js/files.js:879 templates/index.php:82
+#: js/files.js:746 templates/index.php:82
 msgid "Modified"
 msgstr "Thay đổi"
 
-#: js/files.js:898
+#: js/files.js:765
 msgid "1 folder"
 msgstr "1 thư mục"
 
-#: js/files.js:900
+#: js/files.js:767
 msgid "{count} folders"
 msgstr "{count} thư mục"
 
-#: js/files.js:908
+#: js/files.js:775
 msgid "1 file"
 msgstr "1 tập tin"
 
-#: js/files.js:910
+#: js/files.js:777
 msgid "{count} files"
 msgstr "{count} tập tin"
 
-#: lib/app.php:53
-msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
-msgstr ""
-
 #: lib/app.php:73
-msgid "Unable to rename file"
-msgstr "Không thể đổi tên file"
+#, php-format
+msgid "%s could not be renamed"
+msgstr ""
 
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
@@ -318,6 +328,22 @@ msgstr "Tập tin đang được quét ,vui lòng chờ."
 msgid "Current scanning"
 msgstr "Hiện tại đang quét"
 
+#: templates/part.list.php:76
+msgid "directory"
+msgstr ""
+
+#: templates/part.list.php:78
+msgid "directories"
+msgstr ""
+
+#: templates/part.list.php:87
+msgid "file"
+msgstr "file"
+
+#: templates/part.list.php:89
+msgid "files"
+msgstr "files"
+
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
 msgstr "Đang nâng cấp bộ nhớ đệm cho tập tin hệ thống..."
diff --git a/l10n/vi/files_encryption.po b/l10n/vi/files_encryption.po
index 84588ba7ac5816c8f853c362413b49c80a21f4fb..d075fbbae3b579b1967753bd3248f92ef6e7d6dd 100644
--- a/l10n/vi/files_encryption.po
+++ b/l10n/vi/files_encryption.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-14 02:46+0200\n"
-"PO-Revision-Date: 2013-06-14 00:47+0000\n"
+"POT-Creation-Date: 2013-07-05 02:12+0200\n"
+"PO-Revision-Date: 2013-07-05 00:13+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"
@@ -56,9 +56,21 @@ msgstr ""
 
 #: files/error.php:7
 msgid ""
-"Your private key is not valid! Maybe your password was changed from outside."
-" You can update your private key password in your personal settings to "
-"regain access to your files"
+"Your private key is not valid! Likely your password was changed outside the "
+"ownCloud system (e.g. your corporate directory). You can update your private"
+" key password in your personal settings to recover access to your encrypted "
+"files."
+msgstr ""
+
+#: hooks/hooks.php:44
+msgid "Missing requirements."
+msgstr ""
+
+#: hooks/hooks.php:45
+msgid ""
+"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL "
+"PHP extension is enabled and configured properly. For now, the encryption "
+"app has been disabled."
 msgstr ""
 
 #: js/settings-admin.js:11
@@ -85,12 +97,12 @@ msgstr "Mã hóa"
 
 #: templates/settings-admin.php:10
 msgid ""
-"Enable encryption passwords recovery key (allow sharing to recovery key):"
+"Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
 #: templates/settings-admin.php:14
-msgid "Recovery account password"
-msgstr "Mật khẩu cho tài khoản cứu hộ"
+msgid "Recovery key password"
+msgstr ""
 
 #: templates/settings-admin.php:21 templates/settings-personal.php:54
 msgid "Enabled"
@@ -101,15 +113,15 @@ msgid "Disabled"
 msgstr "Tắt"
 
 #: templates/settings-admin.php:34
-msgid "Change encryption passwords recovery key:"
+msgid "Change recovery key password:"
 msgstr ""
 
 #: templates/settings-admin.php:41
-msgid "Old Recovery account password"
+msgid "Old Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:48
-msgid "New Recovery account password"
+msgid "New Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:53
diff --git a/l10n/vi/files_external.po b/l10n/vi/files_external.po
index 7211ba53a3572fd95f8dad6a895b82a655c8ca1d..6c0b21b152ab95660d163f0087cbcf471cd4adce 100644
--- a/l10n/vi/files_external.po
+++ b/l10n/vi/files_external.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: xtdv <truong.tx8@gmail.com>\n"
 "Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/vi/files_sharing.po b/l10n/vi/files_sharing.po
index ab0ba85246d5dfa15c7e084a848127fb7757be7e..76ab8382815548242e61baaa0395650448501f4f 100644
--- a/l10n/vi/files_sharing.po
+++ b/l10n/vi/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
 "MIME-Version: 1.0\n"
@@ -18,27 +18,39 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: templates/authenticate.php:4
+msgid "The password is wrong. Try again."
+msgstr ""
+
+#: templates/authenticate.php:7
 msgid "Password"
 msgstr "Mật khẩu"
 
-#: templates/authenticate.php:6
+#: templates/authenticate.php:9
 msgid "Submit"
 msgstr "Xác nhận"
 
-#: templates/public.php:10
+#: templates/public.php:17
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s đã chia sẻ thư mục %s với bạn"
 
-#: templates/public.php:13
+#: templates/public.php:20
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s đã chia sẻ tập tin %s với bạn"
 
-#: templates/public.php:19 templates/public.php:43
+#: templates/public.php:28 templates/public.php:90
 msgid "Download"
 msgstr "Tải về"
 
-#: templates/public.php:40
+#: templates/public.php:45 templates/public.php:48
+msgid "Upload"
+msgstr "Tải lên"
+
+#: templates/public.php:58
+msgid "Cancel upload"
+msgstr "Hủy upload"
+
+#: templates/public.php:87
 msgid "No preview available for"
 msgstr "Không có xem trước cho"
diff --git a/l10n/vi/files_trashbin.po b/l10n/vi/files_trashbin.po
index b5e445cf4b94ed0256b5c05c3bb74622f60d9ca6..3746181c9fc8cbfa5ea484ce659b37ac393d9e8c 100644
--- a/l10n/vi/files_trashbin.po
+++ b/l10n/vi/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:16+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/vi/lib.po b/l10n/vi/lib.po
index 7b4b17070ab6462975d8785baf2d4e7b353bb877..fae71650319460324794273080da0917367f0421 100644
--- a/l10n/vi/lib.po
+++ b/l10n/vi/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
 "MIME-Version: 1.0\n"
@@ -17,43 +17,47 @@ msgstr ""
 "Language: vi\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: app.php:359
+#: app.php:360
 msgid "Help"
 msgstr "Giúp đỡ"
 
-#: app.php:372
+#: app.php:373
 msgid "Personal"
 msgstr "Cá nhân"
 
-#: app.php:383
+#: app.php:384
 msgid "Settings"
 msgstr "Cài đặt"
 
-#: app.php:395
+#: app.php:396
 msgid "Users"
 msgstr "Người dùng"
 
-#: app.php:408
+#: app.php:409
 msgid "Apps"
 msgstr "Ứng dụng"
 
-#: app.php:416
+#: app.php:417
 msgid "Admin"
 msgstr "Quản trị"
 
-#: files.php:210
+#: defaults.php:33
+msgid "web services under your control"
+msgstr "dịch vụ web dưới sự kiểm soát của bạn"
+
+#: files.php:226
 msgid "ZIP download is turned off."
 msgstr "Tải về ZIP đã bị tắt."
 
-#: files.php:211
+#: files.php:227
 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:212 files.php:245
+#: files.php:228 files.php:261
 msgid "Back to Files"
 msgstr "Trở lại tập tin"
 
-#: files.php:242
+#: files.php:258
 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."
 
@@ -85,104 +89,102 @@ msgstr "Văn bản"
 msgid "Images"
 msgstr "Hình ảnh"
 
-#: setup.php:34
-msgid "Set an admin username."
-msgstr ""
-
-#: setup.php:37
-msgid "Set an admin password."
-msgstr ""
-
-#: setup.php:55
+#: setup/abstractdatabase.php:22
 #, php-format
 msgid "%s enter the database username."
 msgstr ""
 
-#: setup.php:58
+#: setup/abstractdatabase.php:25
 #, php-format
 msgid "%s enter the database name."
 msgstr ""
 
-#: setup.php:61
+#: setup/abstractdatabase.php:28
 #, php-format
 msgid "%s you may not use dots in the database name"
 msgstr ""
 
-#: setup.php:64
+#: setup/mssql.php:20
 #, php-format
-msgid "%s set the database host."
-msgstr ""
-
-#: setup.php:126 setup.php:332 setup.php:377
-msgid "PostgreSQL username and/or password not valid"
+msgid "MS SQL username and/or password not valid: %s"
 msgstr ""
 
-#: setup.php:127 setup.php:235
+#: setup/mssql.php:21 setup/mysql.php:13 setup/oci.php:114
+#: setup/postgresql.php:24 setup/postgresql.php:70
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:152
-msgid "Oracle connection could not be established"
-msgstr ""
-
-#: setup.php:234
+#: setup/mysql.php:12
 msgid "MySQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:288 setup.php:398 setup.php:407 setup.php:425 setup.php:435
-#: setup.php:444 setup.php:477 setup.php:543 setup.php:569 setup.php:576
-#: setup.php:587 setup.php:594 setup.php:603 setup.php:611 setup.php:620
-#: setup.php:626
+#: setup/mysql.php:67 setup/oci.php:54 setup/oci.php:121 setup/oci.php:147
+#: setup/oci.php:154 setup/oci.php:165 setup/oci.php:172 setup/oci.php:181
+#: setup/oci.php:189 setup/oci.php:198 setup/oci.php:204
+#: setup/postgresql.php:89 setup/postgresql.php:98 setup/postgresql.php:115
+#: setup/postgresql.php:125 setup/postgresql.php:134
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr ""
 
-#: setup.php:289 setup.php:399 setup.php:408 setup.php:426 setup.php:436
-#: setup.php:445 setup.php:478 setup.php:544 setup.php:570 setup.php:577
-#: setup.php:588 setup.php:604 setup.php:612 setup.php:621
+#: setup/mysql.php:68 setup/oci.php:55 setup/oci.php:122 setup/oci.php:148
+#: setup/oci.php:155 setup/oci.php:166 setup/oci.php:182 setup/oci.php:190
+#: setup/oci.php:199 setup/postgresql.php:90 setup/postgresql.php:99
+#: setup/postgresql.php:116 setup/postgresql.php:126 setup/postgresql.php:135
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:305
+#: setup/mysql.php:85
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:306
+#: setup/mysql.php:86
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:311
+#: setup/mysql.php:91
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:312
+#: setup/mysql.php:92
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:469 setup.php:536
+#: setup/oci.php:34
+msgid "Oracle connection could not be established"
+msgstr ""
+
+#: setup/oci.php:41 setup/oci.php:113
 msgid "Oracle username and/or password not valid"
 msgstr ""
 
-#: setup.php:595 setup.php:627
+#: setup/oci.php:173 setup/oci.php:205
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:647
-#, php-format
-msgid "MS SQL username and/or password not valid: %s"
+#: setup/postgresql.php:23 setup/postgresql.php:69
+msgid "PostgreSQL username and/or password not valid"
+msgstr ""
+
+#: setup.php:42
+msgid "Set an admin username."
+msgstr ""
+
+#: setup.php:45
+msgid "Set an admin password."
 msgstr ""
 
-#: setup.php:870
+#: setup.php:198
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:871
+#: setup.php:199
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
diff --git a/l10n/vi/settings.po b/l10n/vi/settings.po
index 1855f1e47023c0b33b9bfb66c97b9738b87c1bba..b6ad9c0d19f8da67d2e7dbcb33b50c02f8b05070 100644
--- a/l10n/vi/settings.po
+++ b/l10n/vi/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
 "MIME-Version: 1.0\n"
@@ -88,35 +88,35 @@ msgstr "Không thể xóa người dùng từ nhóm %s"
 msgid "Couldn't update app."
 msgstr "Không thể cập nhật ứng dụng"
 
-#: js/apps.js:30
+#: js/apps.js:35
 msgid "Update to {appversion}"
 msgstr "Cập nhật lên {appversion}"
 
-#: js/apps.js:36 js/apps.js:76
+#: js/apps.js:41 js/apps.js:81
 msgid "Disable"
 msgstr "Tắt"
 
-#: js/apps.js:36 js/apps.js:64 js/apps.js:83
+#: js/apps.js:41 js/apps.js:69 js/apps.js:88
 msgid "Enable"
 msgstr "Bật"
 
-#: js/apps.js:55
+#: js/apps.js:60
 msgid "Please wait...."
 msgstr "Xin hãy đợi..."
 
-#: js/apps.js:59 js/apps.js:71 js/apps.js:80 js/apps.js:93
+#: js/apps.js:64 js/apps.js:76 js/apps.js:85 js/apps.js:98
 msgid "Error"
 msgstr "Lá»—i"
 
-#: js/apps.js:90
+#: js/apps.js:95
 msgid "Updating...."
 msgstr "Đang cập nhật..."
 
-#: js/apps.js:93
+#: js/apps.js:98
 msgid "Error while updating app"
 msgstr "Lỗi khi cập nhật ứng dụng"
 
-#: js/apps.js:96
+#: js/apps.js:101
 msgid "Updated"
 msgstr "Đã cập nhật"
 
@@ -165,15 +165,15 @@ msgstr ""
 msgid "A valid password must be provided"
 msgstr ""
 
-#: personal.php:35 personal.php:36
+#: personal.php:37 personal.php:38
 msgid "__language_name__"
 msgstr "__Ngôn ngữ___"
 
-#: templates/admin.php:15
+#: templates/admin.php:17
 msgid "Security Warning"
 msgstr "Cảnh bảo bảo mật"
 
-#: templates/admin.php:18
+#: templates/admin.php:20
 msgid ""
 "Your data directory and your files are probably accessible from the "
 "internet. The .htaccess file that ownCloud provides is not working. We "
@@ -182,36 +182,36 @@ msgid ""
 " webserver document root."
 msgstr "Thư mục dữ liệu và những tập tin của bạn có thể dễ dàng bị truy cập từ mạng. Tập tin .htaccess do ownCloud cung cấp không hoạt động. Chúng tôi đề nghị bạn nên cấu hình lại máy chủ web để thư mục dữ liệu không còn bị truy cập hoặc bạn nên di chuyển thư mục dữ liệu ra bên ngoài thư mục gốc của máy chủ."
 
-#: templates/admin.php:29
+#: templates/admin.php:31
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:32
+#: templates/admin.php:34
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: templates/admin.php:33
+#: templates/admin.php:35
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:44
+#: templates/admin.php:46
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:47
+#: templates/admin.php:49
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr ""
 
-#: templates/admin.php:58
+#: templates/admin.php:60
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:63
+#: templates/admin.php:65
 #, php-format
 msgid ""
 "This ownCloud server can't set system locale to %s. This means that there "
@@ -219,11 +219,11 @@ msgid ""
 " to install the required packages on your system to support %s."
 msgstr ""
 
-#: templates/admin.php:75
+#: templates/admin.php:77
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:78
+#: templates/admin.php:80
 msgid ""
 "This ownCloud server has no working internet connection. This means that "
 "some of the features like mounting of external storage, notifications about "
@@ -233,102 +233,102 @@ msgid ""
 " of ownCloud."
 msgstr ""
 
-#: templates/admin.php:92
+#: templates/admin.php:94
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:101
+#: templates/admin.php:103
 msgid "Execute one task with each page loaded"
 msgstr "Thực thi tác vụ mỗi khi trang được tải"
 
-#: templates/admin.php:111
+#: templates/admin.php:113
 msgid ""
 "cron.php is registered at a webcron service. Call the cron.php page in the "
 "owncloud root once a minute over http."
 msgstr "cron.php đã được đăng ký tại một dịch vụ webcron. Gọi trang cron.php mỗi phút một lần thông qua giao thức http."
 
-#: templates/admin.php:121
+#: templates/admin.php:123
 msgid ""
 "Use systems cron service. Call the cron.php file in the owncloud folder via "
 "a system cronjob once a minute."
 msgstr "Sử dụng dịch vụ cron của hệ thống. Gọi tệp tin cron.php mỗi phút một lần."
 
-#: templates/admin.php:128
+#: templates/admin.php:130
 msgid "Sharing"
 msgstr "Chia sẻ"
 
-#: templates/admin.php:134
+#: templates/admin.php:136
 msgid "Enable Share API"
 msgstr "Bật chia sẻ API"
 
-#: templates/admin.php:135
+#: templates/admin.php:137
 msgid "Allow apps to use the Share API"
 msgstr "Cho phép các ứng dụng sử dụng chia sẻ API"
 
-#: templates/admin.php:142
+#: templates/admin.php:144
 msgid "Allow links"
 msgstr "Cho phép liên kết"
 
-#: templates/admin.php:143
+#: templates/admin.php:145
 msgid "Allow users to share items to the public with links"
 msgstr "Cho phép người dùng chia sẻ công khai các mục bằng các liên kết"
 
-#: templates/admin.php:150
+#: templates/admin.php:152
 msgid "Allow resharing"
 msgstr "Cho phép chia sẻ lại"
 
-#: templates/admin.php:151
+#: templates/admin.php:153
 msgid "Allow users to share items shared with them again"
 msgstr "Cho phép người dùng chia sẻ lại những mục đã được chia sẻ"
 
-#: templates/admin.php:158
+#: templates/admin.php:160
 msgid "Allow users to share with anyone"
 msgstr "Cho phép người dùng chia sẻ với bất cứ ai"
 
-#: templates/admin.php:161
+#: templates/admin.php:163
 msgid "Allow users to only share with users in their groups"
 msgstr "Chỉ cho phép người dùng chia sẻ với những người dùng trong nhóm của họ"
 
-#: templates/admin.php:168
+#: templates/admin.php:170
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:181
+#: templates/admin.php:183
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:182
+#: templates/admin.php:184
 msgid ""
 "Enforces the clients to connect to ownCloud via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:185
+#: templates/admin.php:187
 msgid ""
 "Please connect to this ownCloud instance via HTTPS to enable or disable the "
 "SSL enforcement."
 msgstr ""
 
-#: templates/admin.php:195
+#: templates/admin.php:197
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:196
+#: templates/admin.php:198
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:227
+#: templates/admin.php:229
 msgid "More"
 msgstr "hơn"
 
-#: templates/admin.php:228
+#: templates/admin.php:230
 msgid "Less"
 msgstr "ít"
 
-#: templates/admin.php:235 templates/personal.php:116
+#: templates/admin.php:236 templates/personal.php:116
 msgid "Version"
 msgstr "Phiên bản"
 
-#: templates/admin.php:237 templates/personal.php:119
+#: templates/admin.php:240 templates/personal.php:119
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -386,76 +386,79 @@ msgstr "Hệ ghi nhận lỗi"
 msgid "Commercial Support"
 msgstr "Hỗ trợ có phí"
 
-#: templates/personal.php:9
+#: templates/personal.php:10
 msgid "Get the apps to sync your files"
 msgstr "Nhận ứng dụng để đồng bộ file của bạn"
 
-#: templates/personal.php:20
+#: templates/personal.php:21
 msgid "Show First Run Wizard again"
 msgstr "Hiện lại việc chạy đồ thuật khởi đầu"
 
-#: templates/personal.php:28
+#: templates/personal.php:29
 #, php-format
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "Bạn đã sử dụng <strong>%s </ strong> có sẵn <strong> %s </ strong>"
 
-#: templates/personal.php:40 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:41 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "Mật khẩu"
 
-#: templates/personal.php:41
+#: templates/personal.php:42
 msgid "Your password was changed"
 msgstr "Mật khẩu của bạn đã được thay đổi."
 
-#: templates/personal.php:42
+#: templates/personal.php:43
 msgid "Unable to change your password"
 msgstr "Không thể đổi mật khẩu"
 
-#: templates/personal.php:43
+#: templates/personal.php:44
 msgid "Current password"
 msgstr "Mật khẩu cũ"
 
-#: templates/personal.php:45
+#: templates/personal.php:46
 msgid "New password"
 msgstr "Mật khẩu mới"
 
-#: templates/personal.php:47
+#: templates/personal.php:48
 msgid "Change password"
 msgstr "Đổi mật khẩu"
 
-#: templates/personal.php:59 templates/users.php:85
+#: templates/personal.php:60 templates/users.php:85
 msgid "Display Name"
 msgstr "Tên hiển thị"
 
-#: templates/personal.php:74
+#: templates/personal.php:75
 msgid "Email"
 msgstr "Email"
 
-#: templates/personal.php:76
+#: templates/personal.php:77
 msgid "Your email address"
 msgstr "Email của bạn"
 
-#: templates/personal.php:77
+#: templates/personal.php:78
 msgid "Fill in an email address to enable password recovery"
 msgstr "Nhập địa chỉ email của bạn để khôi phục lại mật khẩu"
 
-#: templates/personal.php:86 templates/personal.php:87
+#: templates/personal.php:87 templates/personal.php:88
 msgid "Language"
 msgstr "Ngôn ngữ"
 
-#: templates/personal.php:99
+#: templates/personal.php:100
 msgid "Help translate"
 msgstr "Hỗ trợ dịch thuật"
 
-#: templates/personal.php:105
+#: templates/personal.php:106
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:107
-msgid "Use this address to connect to your ownCloud in your file manager"
-msgstr "Sử dụng địa chỉ này để kết nối ownCloud của bạn trong trình quản lý file của bạn"
+#: templates/personal.php:108
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
+"target=\"_blank\">access your Files via WebDAV</a>"
+msgstr ""
 
-#: templates/users.php:21 templates/users.php:84
+#: templates/users.php:21
 msgid "Login Name"
 msgstr "Tên đăng nhập"
 
@@ -485,6 +488,10 @@ msgstr "Không giới hạn"
 msgid "Other"
 msgstr "Khác"
 
+#: templates/users.php:84
+msgid "Username"
+msgstr "Tên đăng nhập"
+
 #: templates/users.php:91
 msgid "Storage"
 msgstr "Bá»™ nhá»›"
diff --git a/l10n/vi/user_ldap.po b/l10n/vi/user_ldap.po
index 10c3ef2f8681d2d5080b5e3327b6ef87d277674e..0f97d93eb1ad4eac8c535168640b583dadb386d6 100644
--- a/l10n/vi/user_ldap.po
+++ b/l10n/vi/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:25+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:16+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/zh_CN.GB2312/core.po b/l10n/zh_CN.GB2312/core.po
index 26ca2db0ba09c6fdf465e73e5e29a7780286b242..81b2b09e9619614ceb7a08b6f1d5cdba42057266 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-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:22+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:14+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
 "MIME-Version: 1.0\n"
@@ -63,135 +63,135 @@ msgstr "没有选中要删除的分类。"
 msgid "Error removing %s from favorites."
 msgstr "在移除收藏夹中的 %s 时发生错误。"
 
-#: js/config.php:34
+#: js/config.php:32
 msgid "Sunday"
 msgstr "星期天"
 
-#: js/config.php:35
+#: js/config.php:33
 msgid "Monday"
 msgstr "星期一"
 
-#: js/config.php:36
+#: js/config.php:34
 msgid "Tuesday"
 msgstr "星期二"
 
-#: js/config.php:37
+#: js/config.php:35
 msgid "Wednesday"
 msgstr "星期三"
 
-#: js/config.php:38
+#: js/config.php:36
 msgid "Thursday"
 msgstr "星期四"
 
-#: js/config.php:39
+#: js/config.php:37
 msgid "Friday"
 msgstr "星期五"
 
-#: js/config.php:40
+#: js/config.php:38
 msgid "Saturday"
 msgstr "星期六"
 
-#: js/config.php:45
+#: js/config.php:43
 msgid "January"
 msgstr "一月"
 
-#: js/config.php:46
+#: js/config.php:44
 msgid "February"
 msgstr "二月"
 
-#: js/config.php:47
+#: js/config.php:45
 msgid "March"
 msgstr "三月"
 
-#: js/config.php:48
+#: js/config.php:46
 msgid "April"
 msgstr "四月"
 
-#: js/config.php:49
+#: js/config.php:47
 msgid "May"
 msgstr "五月"
 
-#: js/config.php:50
+#: js/config.php:48
 msgid "June"
 msgstr "六月"
 
-#: js/config.php:51
+#: js/config.php:49
 msgid "July"
 msgstr "七月"
 
-#: js/config.php:52
+#: js/config.php:50
 msgid "August"
 msgstr "八月"
 
-#: js/config.php:53
+#: js/config.php:51
 msgid "September"
 msgstr "九月"
 
-#: js/config.php:54
+#: js/config.php:52
 msgid "October"
 msgstr "十月"
 
-#: js/config.php:55
+#: js/config.php:53
 msgid "November"
 msgstr "十一月"
 
-#: js/config.php:56
+#: js/config.php:54
 msgid "December"
 msgstr "十二月"
 
-#: js/js.js:286
+#: js/js.js:293
 msgid "Settings"
 msgstr "设置"
 
-#: js/js.js:718
+#: js/js.js:725
 msgid "seconds ago"
 msgstr "秒前"
 
-#: js/js.js:719
+#: js/js.js:726
 msgid "1 minute ago"
 msgstr "1 分钟前"
 
-#: js/js.js:720
+#: js/js.js:727
 msgid "{minutes} minutes ago"
 msgstr "{minutes} 分钟前"
 
-#: js/js.js:721
+#: js/js.js:728
 msgid "1 hour ago"
 msgstr "1小时前"
 
-#: js/js.js:722
+#: js/js.js:729
 msgid "{hours} hours ago"
 msgstr "{hours}小时前"
 
-#: js/js.js:723
+#: js/js.js:730
 msgid "today"
 msgstr "今天"
 
-#: js/js.js:724
+#: js/js.js:731
 msgid "yesterday"
 msgstr "昨天"
 
-#: js/js.js:725
+#: js/js.js:732
 msgid "{days} days ago"
 msgstr "{days} 天前"
 
-#: js/js.js:726
+#: js/js.js:733
 msgid "last month"
 msgstr "上个月"
 
-#: js/js.js:727
+#: js/js.js:734
 msgid "{months} months ago"
 msgstr "{months}月前"
 
-#: js/js.js:728
+#: js/js.js:735
 msgid "months ago"
 msgstr "月前"
 
-#: js/js.js:729
+#: js/js.js:736
 msgid "last year"
 msgstr "去年"
 
-#: js/js.js:730
+#: js/js.js:737
 msgid "years ago"
 msgstr "年前"
 
@@ -227,8 +227,8 @@ msgstr "未指定对象类型。"
 #: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
 #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:577
-#: js/share.js:589
+#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:620
+#: js/share.js:632
 msgid "Error"
 msgstr "出错"
 
@@ -248,7 +248,7 @@ msgstr "已分享"
 msgid "Share"
 msgstr "分享"
 
-#: js/share.js:125 js/share.js:617
+#: js/share.js:125 js/share.js:660
 msgid "Error while sharing"
 msgstr "分享出错"
 
@@ -268,99 +268,103 @@ msgstr "由 {owner} 与您和 {group} 群组分享"
 msgid "Shared with you by {owner}"
 msgstr "由 {owner} 与您分享"
 
-#: js/share.js:159
+#: js/share.js:172
 msgid "Share with"
 msgstr "分享"
 
-#: js/share.js:164
+#: js/share.js:177
 msgid "Share with link"
 msgstr "分享链接"
 
-#: js/share.js:167
+#: js/share.js:180
 msgid "Password protect"
 msgstr "密码保护"
 
-#: js/share.js:169 templates/installation.php:54 templates/login.php:26
+#: js/share.js:182 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "密码"
 
-#: js/share.js:173
+#: js/share.js:187
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:191
 msgid "Email link to person"
 msgstr "面向个人的电子邮件链接"
 
-#: js/share.js:174
+#: js/share.js:192
 msgid "Send"
 msgstr "发送"
 
-#: js/share.js:178
+#: js/share.js:197
 msgid "Set expiration date"
 msgstr "设置失效日期"
 
-#: js/share.js:179
+#: js/share.js:198
 msgid "Expiration date"
 msgstr "失效日期"
 
-#: js/share.js:211
+#: js/share.js:230
 msgid "Share via email:"
 msgstr "通过电子邮件分享："
 
-#: js/share.js:213
+#: js/share.js:232
 msgid "No people found"
 msgstr "查无此人"
 
-#: js/share.js:251
+#: js/share.js:270
 msgid "Resharing is not allowed"
 msgstr "不允许重复分享"
 
-#: js/share.js:287
+#: js/share.js:306
 msgid "Shared in {item} with {user}"
 msgstr "已经与 {user} 在 {item} 中分享"
 
-#: js/share.js:308
+#: js/share.js:327
 msgid "Unshare"
 msgstr "取消分享"
 
-#: js/share.js:320
+#: js/share.js:339
 msgid "can edit"
 msgstr "可编辑"
 
-#: js/share.js:322
+#: js/share.js:341
 msgid "access control"
 msgstr "访问控制"
 
-#: js/share.js:325
+#: js/share.js:344
 msgid "create"
 msgstr "创建"
 
-#: js/share.js:328
+#: js/share.js:347
 msgid "update"
 msgstr "æ›´æ–°"
 
-#: js/share.js:331
+#: js/share.js:350
 msgid "delete"
 msgstr "删除"
 
-#: js/share.js:334
+#: js/share.js:353
 msgid "share"
 msgstr "分享"
 
-#: js/share.js:368 js/share.js:564
+#: js/share.js:387 js/share.js:607
 msgid "Password protected"
 msgstr "密码保护"
 
-#: js/share.js:577
+#: js/share.js:620
 msgid "Error unsetting expiration date"
 msgstr "取消设置失效日期出错"
 
-#: js/share.js:589
+#: js/share.js:632
 msgid "Error setting expiration date"
 msgstr "设置失效日期出错"
 
-#: js/share.js:604
+#: js/share.js:647
 msgid "Sending ..."
 msgstr "发送中……"
 
-#: js/share.js:615
+#: js/share.js:658
 msgid "Email sent"
 msgstr "电子邮件已发送"
 
@@ -375,7 +379,7 @@ msgstr "升级失败。请向<a href=\"https://github.com/owncloud/core/issues\"
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "升级成功。现在为您跳转到ownCloud。"
 
-#: lostpassword/controller.php:58
+#: lostpassword/controller.php:60
 msgid "ownCloud password reset"
 msgstr "私有云密码重置"
 
@@ -405,17 +409,17 @@ msgstr "用户名"
 
 #: lostpassword/templates/lostpassword.php:22
 msgid ""
-"Your files seems to be encrypted. If you didn't have enabled the recovery "
-"key there will be no way to get your data back once the password was "
-"resetted. If you are not sure what to do, please contact your administrator "
-"first before continue. Do you really want to continue?"
+"Your files are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
 msgstr ""
 
 #: lostpassword/templates/lostpassword.php:24
 msgid "Yes, I really want to reset my password now"
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:29
+#: lostpassword/templates/lostpassword.php:27
 msgid "Request reset"
 msgstr "要求重置"
 
@@ -463,7 +467,7 @@ msgstr "禁止访问"
 msgid "Cloud not found"
 msgstr "云 没有被找到"
 
-#: templates/altmail.php:2
+#: templates/altmail.php:4
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -474,10 +478,6 @@ msgid ""
 "Cheers!"
 msgstr ""
 
-#: templates/altmail.php:7 templates/mail.php:24
-msgid "web services under your control"
-msgstr "您控制的网络服务"
-
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
 msgstr "编辑分类"
@@ -570,12 +570,12 @@ msgstr "数据库主机"
 msgid "Finish setup"
 msgstr "完成安装"
 
-#: templates/layout.user.php:40
+#: templates/layout.user.php:43
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:67
+#: templates/layout.user.php:68
 msgid "Log out"
 msgstr "注销"
 
@@ -609,7 +609,7 @@ msgstr "登陆"
 msgid "Alternative Logins"
 msgstr "备选登录"
 
-#: templates/mail.php:15
+#: templates/mail.php:16
 #, php-format
 msgid ""
 "Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
diff --git a/l10n/zh_CN.GB2312/files.po b/l10n/zh_CN.GB2312/files.po
index 458b3312482f0e2fd9ef76d9ff483a03f23e9660..4e58faa5f1b2367e0e36569778a1158409691d63 100644
--- a/l10n/zh_CN.GB2312/files.po
+++ b/l10n/zh_CN.GB2312/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:01+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
 "MIME-Version: 1.0\n"
@@ -27,46 +27,54 @@ msgstr ""
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/upload.php:19
+#: ajax/upload.php:16 ajax/upload.php:45
+msgid "Unable to set upload directory."
+msgstr ""
+
+#: ajax/upload.php:22
+msgid "Invalid Token"
+msgstr ""
+
+#: ajax/upload.php:59
 msgid "No file was uploaded. Unknown error"
 msgstr "没有上传文件。未知错误"
 
-#: ajax/upload.php:26
+#: ajax/upload.php:66
 msgid "There is no error, the file uploaded with success"
 msgstr "文件上传成功"
 
-#: ajax/upload.php:27
+#: ajax/upload.php:67
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:29
+#: ajax/upload.php:69
 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:30
+#: ajax/upload.php:70
 msgid "The uploaded file was only partially uploaded"
 msgstr "文件部分上传"
 
-#: ajax/upload.php:31
+#: ajax/upload.php:71
 msgid "No file was uploaded"
 msgstr "没有上传文件"
 
-#: ajax/upload.php:32
+#: ajax/upload.php:72
 msgid "Missing a temporary folder"
 msgstr "缺失临时文件夹"
 
-#: ajax/upload.php:33
+#: ajax/upload.php:73
 msgid "Failed to write to disk"
 msgstr "写磁盘失败"
 
-#: ajax/upload.php:51
+#: ajax/upload.php:91
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:83
+#: ajax/upload.php:123
 msgid "Invalid directory."
 msgstr ""
 
@@ -74,6 +82,36 @@ msgstr ""
 msgid "Files"
 msgstr "文件"
 
+#: js/file-upload.js:11
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr "不能上传您的文件，由于它是文件夹或者为空文件"
+
+#: js/file-upload.js:24
+msgid "Not enough space available"
+msgstr ""
+
+#: js/file-upload.js:64
+msgid "Upload cancelled."
+msgstr "上传取消了"
+
+#: js/file-upload.js:167 js/files.js:266
+msgid ""
+"File upload is in progress. Leaving the page now will cancel the upload."
+msgstr "文件正在上传。关闭页面会取消上传。"
+
+#: js/file-upload.js:233 js/files.js:339
+msgid "URL cannot be empty."
+msgstr "网址不能为空。"
+
+#: js/file-upload.js:238 lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr ""
+
+#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
+#: js/files.js:693 js/files.js:731
+msgid "Error"
+msgstr "出错"
+
 #: js/fileactions.js:116
 msgid "Share"
 msgstr "分享"
@@ -90,43 +128,43 @@ msgstr "删除"
 msgid "Rename"
 msgstr "重命名"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:464
 msgid "Pending"
 msgstr "等待中"
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "{new_name} already exists"
 msgstr "{new_name} 已存在"
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "replace"
 msgstr "替换"
 
-#: js/filelist.js:259
+#: js/filelist.js:302
 msgid "suggest name"
 msgstr "推荐名称"
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "cancel"
 msgstr "取消"
 
-#: js/filelist.js:306
+#: js/filelist.js:349
 msgid "replaced {new_name} with {old_name}"
 msgstr "已用 {old_name} 替换 {new_name}"
 
-#: js/filelist.js:306
+#: js/filelist.js:349
 msgid "undo"
 msgstr "撤销"
 
-#: js/filelist.js:331
+#: js/filelist.js:374
 msgid "perform delete operation"
 msgstr ""
 
-#: js/filelist.js:413
+#: js/filelist.js:456
 msgid "1 file uploading"
 msgstr "1 个文件正在上传"
 
-#: js/filelist.js:416 js/filelist.js:470
+#: js/filelist.js:459 js/filelist.js:517
 msgid "files uploading"
 msgstr "个文件正在上传"
 
@@ -158,69 +196,41 @@ msgid ""
 "big."
 msgstr ""
 
-#: js/files.js:264
-msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "不能上传您的文件，由于它是文件夹或者为空文件"
-
-#: js/files.js:277
-msgid "Not enough space available"
-msgstr ""
-
-#: js/files.js:317
-msgid "Upload cancelled."
-msgstr "上传取消了"
-
-#: js/files.js:413
-msgid ""
-"File upload is in progress. Leaving the page now will cancel the upload."
-msgstr "文件正在上传。关闭页面会取消上传。"
-
-#: js/files.js:486
-msgid "URL cannot be empty."
-msgstr "网址不能为空。"
-
-#: js/files.js:491
+#: js/files.js:344
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
-msgid "Error"
-msgstr "出错"
-
-#: js/files.js:877 templates/index.php:69
+#: js/files.js:744 templates/index.php:69
 msgid "Name"
 msgstr "名称"
 
-#: js/files.js:878 templates/index.php:80
+#: js/files.js:745 templates/index.php:80
 msgid "Size"
 msgstr "大小"
 
-#: js/files.js:879 templates/index.php:82
+#: js/files.js:746 templates/index.php:82
 msgid "Modified"
 msgstr "修改日期"
 
-#: js/files.js:898
+#: js/files.js:765
 msgid "1 folder"
 msgstr "1 个文件夹"
 
-#: js/files.js:900
+#: js/files.js:767
 msgid "{count} folders"
 msgstr "{count} 个文件夹"
 
-#: js/files.js:908
+#: js/files.js:775
 msgid "1 file"
 msgstr "1 个文件"
 
-#: js/files.js:910
+#: js/files.js:777
 msgid "{count} files"
 msgstr "{count} 个文件"
 
-#: lib/app.php:53
-msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
-msgstr ""
-
 #: lib/app.php:73
-msgid "Unable to rename file"
+#, php-format
+msgid "%s could not be renamed"
 msgstr ""
 
 #: lib/helper.php:11 templates/index.php:18
@@ -317,6 +327,22 @@ msgstr "正在扫描文件,请稍候."
 msgid "Current scanning"
 msgstr "正在扫描"
 
+#: templates/part.list.php:76
+msgid "directory"
+msgstr ""
+
+#: templates/part.list.php:78
+msgid "directories"
+msgstr ""
+
+#: templates/part.list.php:87
+msgid "file"
+msgstr "文件"
+
+#: templates/part.list.php:89
+msgid "files"
+msgstr "文件"
+
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
 msgstr ""
diff --git a/l10n/zh_CN.GB2312/files_encryption.po b/l10n/zh_CN.GB2312/files_encryption.po
index a6c9670803cb28dca9af55e8af021c0ca1dfe749..ea02882e9b7a1b197042d6910c32c42b39fdacb6 100644
--- a/l10n/zh_CN.GB2312/files_encryption.po
+++ b/l10n/zh_CN.GB2312/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-14 02:46+0200\n"
-"PO-Revision-Date: 2013-06-14 00:47+0000\n"
+"POT-Creation-Date: 2013-07-05 02:12+0200\n"
+"PO-Revision-Date: 2013-07-05 00:13+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"
@@ -55,9 +55,21 @@ msgstr ""
 
 #: files/error.php:7
 msgid ""
-"Your private key is not valid! Maybe your password was changed from outside."
-" You can update your private key password in your personal settings to "
-"regain access to your files"
+"Your private key is not valid! Likely your password was changed outside the "
+"ownCloud system (e.g. your corporate directory). You can update your private"
+" key password in your personal settings to recover access to your encrypted "
+"files."
+msgstr ""
+
+#: hooks/hooks.php:44
+msgid "Missing requirements."
+msgstr ""
+
+#: hooks/hooks.php:45
+msgid ""
+"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL "
+"PHP extension is enabled and configured properly. For now, the encryption "
+"app has been disabled."
 msgstr ""
 
 #: js/settings-admin.js:11
@@ -84,11 +96,11 @@ msgstr "加密"
 
 #: templates/settings-admin.php:10
 msgid ""
-"Enable encryption passwords recovery key (allow sharing to recovery key):"
+"Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
 #: templates/settings-admin.php:14
-msgid "Recovery account password"
+msgid "Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:21 templates/settings-personal.php:54
@@ -100,15 +112,15 @@ msgid "Disabled"
 msgstr ""
 
 #: templates/settings-admin.php:34
-msgid "Change encryption passwords recovery key:"
+msgid "Change recovery key password:"
 msgstr ""
 
 #: templates/settings-admin.php:41
-msgid "Old Recovery account password"
+msgid "Old Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:48
-msgid "New Recovery account password"
+msgid "New Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:53
diff --git a/l10n/zh_CN.GB2312/files_external.po b/l10n/zh_CN.GB2312/files_external.po
index 912858329fab338e4d97a57b5eb6df73d55dc49f..55e061b3ba968a00a67a653dcc628eb5e928b659 100644
--- a/l10n/zh_CN.GB2312/files_external.po
+++ b/l10n/zh_CN.GB2312/files_external.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: hyy0591 <yangyu.huang@gmail.com>\n"
 "Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/zh_CN.GB2312/files_sharing.po b/l10n/zh_CN.GB2312/files_sharing.po
index 9721a8069431d1c5f37092b2631b79b1cfc75f42..510e33378f2060dea18babd1f26fdc14ba97197e 100644
--- a/l10n/zh_CN.GB2312/files_sharing.po
+++ b/l10n/zh_CN.GB2312/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
 "MIME-Version: 1.0\n"
@@ -18,27 +18,39 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: templates/authenticate.php:4
+msgid "The password is wrong. Try again."
+msgstr ""
+
+#: templates/authenticate.php:7
 msgid "Password"
 msgstr "密码"
 
-#: templates/authenticate.php:6
+#: templates/authenticate.php:9
 msgid "Submit"
 msgstr "提交"
 
-#: templates/public.php:10
+#: templates/public.php:17
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s 与您分享了文件夹 %s"
 
-#: templates/public.php:13
+#: templates/public.php:20
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s 与您分享了文件 %s"
 
-#: templates/public.php:19 templates/public.php:43
+#: templates/public.php:28 templates/public.php:90
 msgid "Download"
 msgstr "下载"
 
-#: templates/public.php:40
+#: templates/public.php:45 templates/public.php:48
+msgid "Upload"
+msgstr "上传"
+
+#: templates/public.php:58
+msgid "Cancel upload"
+msgstr "取消上传"
+
+#: templates/public.php:87
 msgid "No preview available for"
 msgstr "没有预览可用于"
diff --git a/l10n/zh_CN.GB2312/files_trashbin.po b/l10n/zh_CN.GB2312/files_trashbin.po
index 8c66f848dd14b2674e9093a12516818440a2dad0..905cf86713ba6dfaf6aed764617615c833775c3d 100644
--- a/l10n/zh_CN.GB2312/files_trashbin.po
+++ b/l10n/zh_CN.GB2312/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:16+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/zh_CN.GB2312/lib.po b/l10n/zh_CN.GB2312/lib.po
index b46b81ded6a80c92809989aeefbb1df576ae2e1b..76e122b96d3bec4d5907033fc5b85f0f29b90cd6 100644
--- a/l10n/zh_CN.GB2312/lib.po
+++ b/l10n/zh_CN.GB2312/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
 "MIME-Version: 1.0\n"
@@ -17,43 +17,47 @@ msgstr ""
 "Language: zh_CN.GB2312\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: app.php:359
+#: app.php:360
 msgid "Help"
 msgstr "帮助"
 
-#: app.php:372
+#: app.php:373
 msgid "Personal"
 msgstr "私人"
 
-#: app.php:383
+#: app.php:384
 msgid "Settings"
 msgstr "设置"
 
-#: app.php:395
+#: app.php:396
 msgid "Users"
 msgstr "用户"
 
-#: app.php:408
+#: app.php:409
 msgid "Apps"
 msgstr "程序"
 
-#: app.php:416
+#: app.php:417
 msgid "Admin"
 msgstr "管理员"
 
-#: files.php:210
+#: defaults.php:33
+msgid "web services under your control"
+msgstr "您控制的网络服务"
+
+#: files.php:226
 msgid "ZIP download is turned off."
 msgstr "ZIP 下载已关闭"
 
-#: files.php:211
+#: files.php:227
 msgid "Files need to be downloaded one by one."
 msgstr "需要逐个下载文件。"
 
-#: files.php:212 files.php:245
+#: files.php:228 files.php:261
 msgid "Back to Files"
 msgstr "返回到文件"
 
-#: files.php:242
+#: files.php:258
 msgid "Selected files too large to generate zip file."
 msgstr "选择的文件太大而不能生成 zip 文件。"
 
@@ -85,104 +89,102 @@ msgstr "文本"
 msgid "Images"
 msgstr "图片"
 
-#: setup.php:34
-msgid "Set an admin username."
-msgstr ""
-
-#: setup.php:37
-msgid "Set an admin password."
-msgstr ""
-
-#: setup.php:55
+#: setup/abstractdatabase.php:22
 #, php-format
 msgid "%s enter the database username."
 msgstr ""
 
-#: setup.php:58
+#: setup/abstractdatabase.php:25
 #, php-format
 msgid "%s enter the database name."
 msgstr ""
 
-#: setup.php:61
+#: setup/abstractdatabase.php:28
 #, php-format
 msgid "%s you may not use dots in the database name"
 msgstr ""
 
-#: setup.php:64
+#: setup/mssql.php:20
 #, php-format
-msgid "%s set the database host."
-msgstr ""
-
-#: setup.php:126 setup.php:332 setup.php:377
-msgid "PostgreSQL username and/or password not valid"
+msgid "MS SQL username and/or password not valid: %s"
 msgstr ""
 
-#: setup.php:127 setup.php:235
+#: setup/mssql.php:21 setup/mysql.php:13 setup/oci.php:114
+#: setup/postgresql.php:24 setup/postgresql.php:70
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:152
-msgid "Oracle connection could not be established"
-msgstr ""
-
-#: setup.php:234
+#: setup/mysql.php:12
 msgid "MySQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:288 setup.php:398 setup.php:407 setup.php:425 setup.php:435
-#: setup.php:444 setup.php:477 setup.php:543 setup.php:569 setup.php:576
-#: setup.php:587 setup.php:594 setup.php:603 setup.php:611 setup.php:620
-#: setup.php:626
+#: setup/mysql.php:67 setup/oci.php:54 setup/oci.php:121 setup/oci.php:147
+#: setup/oci.php:154 setup/oci.php:165 setup/oci.php:172 setup/oci.php:181
+#: setup/oci.php:189 setup/oci.php:198 setup/oci.php:204
+#: setup/postgresql.php:89 setup/postgresql.php:98 setup/postgresql.php:115
+#: setup/postgresql.php:125 setup/postgresql.php:134
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr ""
 
-#: setup.php:289 setup.php:399 setup.php:408 setup.php:426 setup.php:436
-#: setup.php:445 setup.php:478 setup.php:544 setup.php:570 setup.php:577
-#: setup.php:588 setup.php:604 setup.php:612 setup.php:621
+#: setup/mysql.php:68 setup/oci.php:55 setup/oci.php:122 setup/oci.php:148
+#: setup/oci.php:155 setup/oci.php:166 setup/oci.php:182 setup/oci.php:190
+#: setup/oci.php:199 setup/postgresql.php:90 setup/postgresql.php:99
+#: setup/postgresql.php:116 setup/postgresql.php:126 setup/postgresql.php:135
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:305
+#: setup/mysql.php:85
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:306
+#: setup/mysql.php:86
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:311
+#: setup/mysql.php:91
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:312
+#: setup/mysql.php:92
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:469 setup.php:536
+#: setup/oci.php:34
+msgid "Oracle connection could not be established"
+msgstr ""
+
+#: setup/oci.php:41 setup/oci.php:113
 msgid "Oracle username and/or password not valid"
 msgstr ""
 
-#: setup.php:595 setup.php:627
+#: setup/oci.php:173 setup/oci.php:205
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:647
-#, php-format
-msgid "MS SQL username and/or password not valid: %s"
+#: setup/postgresql.php:23 setup/postgresql.php:69
+msgid "PostgreSQL username and/or password not valid"
+msgstr ""
+
+#: setup.php:42
+msgid "Set an admin username."
+msgstr ""
+
+#: setup.php:45
+msgid "Set an admin password."
 msgstr ""
 
-#: setup.php:870
+#: setup.php:198
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "因WebDAV接口故障，您的网络服务器好像并未允许文件同步。"
 
-#: setup.php:871
+#: setup.php:199
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "请双击<a href='%s'>安装向导</a>。"
diff --git a/l10n/zh_CN.GB2312/settings.po b/l10n/zh_CN.GB2312/settings.po
index 987ae7830db640bfebc091e880c41deccdd2de2b..f6b16310148b093475a4506a67a6727687d44096 100644
--- a/l10n/zh_CN.GB2312/settings.po
+++ b/l10n/zh_CN.GB2312/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
 "MIME-Version: 1.0\n"
@@ -89,35 +89,35 @@ msgstr "未能将用户从群组 %s 移除"
 msgid "Couldn't update app."
 msgstr "应用无法升级。"
 
-#: js/apps.js:30
+#: js/apps.js:35
 msgid "Update to {appversion}"
 msgstr "升级至{appversion}"
 
-#: js/apps.js:36 js/apps.js:76
+#: js/apps.js:41 js/apps.js:81
 msgid "Disable"
 msgstr "禁用"
 
-#: js/apps.js:36 js/apps.js:64 js/apps.js:83
+#: js/apps.js:41 js/apps.js:69 js/apps.js:88
 msgid "Enable"
 msgstr "启用"
 
-#: js/apps.js:55
+#: js/apps.js:60
 msgid "Please wait...."
 msgstr "请稍候……"
 
-#: js/apps.js:59 js/apps.js:71 js/apps.js:80 js/apps.js:93
+#: js/apps.js:64 js/apps.js:76 js/apps.js:85 js/apps.js:98
 msgid "Error"
 msgstr "出错"
 
-#: js/apps.js:90
+#: js/apps.js:95
 msgid "Updating...."
 msgstr "升级中……"
 
-#: js/apps.js:93
+#: js/apps.js:98
 msgid "Error while updating app"
 msgstr "应用升级时出现错误"
 
-#: js/apps.js:96
+#: js/apps.js:101
 msgid "Updated"
 msgstr "已升级"
 
@@ -166,15 +166,15 @@ msgstr "新增用户时出现错误"
 msgid "A valid password must be provided"
 msgstr "请填写有效密码"
 
-#: personal.php:35 personal.php:36
+#: personal.php:37 personal.php:38
 msgid "__language_name__"
 msgstr "Chinese"
 
-#: templates/admin.php:15
+#: templates/admin.php:17
 msgid "Security Warning"
 msgstr "安全警告"
 
-#: templates/admin.php:18
+#: templates/admin.php:20
 msgid ""
 "Your data directory and your files are probably accessible from the "
 "internet. The .htaccess file that ownCloud provides is not working. We "
@@ -183,36 +183,36 @@ msgid ""
 " webserver document root."
 msgstr "您的数据文件夹和您的文件或许能够从互联网访问。ownCloud 提供的 .htaccesss 文件未其作用。我们强烈建议您配置网络服务器以使数据文件夹不能从互联网访问，或将移动数据文件夹移出网络服务器文档根目录。"
 
-#: templates/admin.php:29
+#: templates/admin.php:31
 msgid "Setup Warning"
 msgstr "配置注意"
 
-#: templates/admin.php:32
+#: templates/admin.php:34
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "因WebDAV接口故障，您的网络服务器好像并未允许文件同步。"
 
-#: templates/admin.php:33
+#: templates/admin.php:35
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "请双击<a href='%s'>安装向导</a>。"
 
-#: templates/admin.php:44
+#: templates/admin.php:46
 msgid "Module 'fileinfo' missing"
 msgstr "模块“fileinfo”丢失。"
 
-#: templates/admin.php:47
+#: templates/admin.php:49
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr "PHP 模块“fileinfo”丢失。我们强烈建议打开此模块来获得 mine 类型检测的最佳结果。"
 
-#: templates/admin.php:58
+#: templates/admin.php:60
 msgid "Locale not working"
 msgstr "区域设置未运作"
 
-#: templates/admin.php:63
+#: templates/admin.php:65
 #, php-format
 msgid ""
 "This ownCloud server can't set system locale to %s. This means that there "
@@ -220,11 +220,11 @@ msgid ""
 " to install the required packages on your system to support %s."
 msgstr "ownCloud 服务器不能把系统区域设置到 %s。这意味着文件名可内可能含有某些引起问题的字符。我们强烈建议在您的系统上安装必要的包来支持“%s”。"
 
-#: templates/admin.php:75
+#: templates/admin.php:77
 msgid "Internet connection not working"
 msgstr "互联网连接未运作"
 
-#: templates/admin.php:78
+#: templates/admin.php:80
 msgid ""
 "This ownCloud server has no working internet connection. This means that "
 "some of the features like mounting of external storage, notifications about "
@@ -234,102 +234,102 @@ msgid ""
 " of ownCloud."
 msgstr ""
 
-#: templates/admin.php:92
+#: templates/admin.php:94
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:101
+#: templates/admin.php:103
 msgid "Execute one task with each page loaded"
 msgstr "在每个页面载入时执行一项任务"
 
-#: templates/admin.php:111
+#: templates/admin.php:113
 msgid ""
 "cron.php is registered at a webcron service. Call the cron.php page in the "
 "owncloud root once a minute over http."
 msgstr "cron.php 已作为 webcron 服务注册。owncloud 根用户将通过 http 协议每分钟调用一次 cron.php。"
 
-#: templates/admin.php:121
+#: templates/admin.php:123
 msgid ""
 "Use systems cron service. Call the cron.php file in the owncloud folder via "
 "a system cronjob once a minute."
 msgstr "使用系统 cron 服务。通过系统 cronjob 每分钟调用一次 owncloud 文件夹下的 cron.php"
 
-#: templates/admin.php:128
+#: templates/admin.php:130
 msgid "Sharing"
 msgstr "分享"
 
-#: templates/admin.php:134
+#: templates/admin.php:136
 msgid "Enable Share API"
 msgstr "开启分享API"
 
-#: templates/admin.php:135
+#: templates/admin.php:137
 msgid "Allow apps to use the Share API"
 msgstr "允许应用使用分享API"
 
-#: templates/admin.php:142
+#: templates/admin.php:144
 msgid "Allow links"
 msgstr "允许链接"
 
-#: templates/admin.php:143
+#: templates/admin.php:145
 msgid "Allow users to share items to the public with links"
 msgstr "允许用户通过链接共享内容"
 
-#: templates/admin.php:150
+#: templates/admin.php:152
 msgid "Allow resharing"
 msgstr "允许转帖"
 
-#: templates/admin.php:151
+#: templates/admin.php:153
 msgid "Allow users to share items shared with them again"
 msgstr "允许用户再次共享已共享的内容"
 
-#: templates/admin.php:158
+#: templates/admin.php:160
 msgid "Allow users to share with anyone"
 msgstr "允许用户向任何人分享"
 
-#: templates/admin.php:161
+#: templates/admin.php:163
 msgid "Allow users to only share with users in their groups"
 msgstr "只允许用户向所在群组中的其他用户分享"
 
-#: templates/admin.php:168
+#: templates/admin.php:170
 msgid "Security"
 msgstr "安全"
 
-#: templates/admin.php:181
+#: templates/admin.php:183
 msgid "Enforce HTTPS"
 msgstr "强制HTTPS"
 
-#: templates/admin.php:182
+#: templates/admin.php:184
 msgid ""
 "Enforces the clients to connect to ownCloud via an encrypted connection."
 msgstr "强制客户端通过加密连接与ownCloud连接"
 
-#: templates/admin.php:185
+#: templates/admin.php:187
 msgid ""
 "Please connect to this ownCloud instance via HTTPS to enable or disable the "
 "SSL enforcement."
 msgstr ""
 
-#: templates/admin.php:195
+#: templates/admin.php:197
 msgid "Log"
 msgstr "日志"
 
-#: templates/admin.php:196
+#: templates/admin.php:198
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:227
+#: templates/admin.php:229
 msgid "More"
 msgstr "更多"
 
-#: templates/admin.php:228
+#: templates/admin.php:230
 msgid "Less"
 msgstr "æ›´å°‘"
 
-#: templates/admin.php:235 templates/personal.php:116
+#: templates/admin.php:236 templates/personal.php:116
 msgid "Version"
 msgstr "版本"
 
-#: templates/admin.php:237 templates/personal.php:119
+#: templates/admin.php:240 templates/personal.php:119
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -387,76 +387,79 @@ msgstr "Bug追踪者"
 msgid "Commercial Support"
 msgstr "商业支持"
 
-#: templates/personal.php:9
+#: templates/personal.php:10
 msgid "Get the apps to sync your files"
 msgstr "获取应用并同步您的文件"
 
-#: templates/personal.php:20
+#: templates/personal.php:21
 msgid "Show First Run Wizard again"
 msgstr "再次显示首次运行向导"
 
-#: templates/personal.php:28
+#: templates/personal.php:29
 #, php-format
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "您已使用<strong>%s</strong>/<strong>%s</strong>"
 
-#: templates/personal.php:40 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:41 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "密码"
 
-#: templates/personal.php:41
+#: templates/personal.php:42
 msgid "Your password was changed"
 msgstr "您的密码以变更"
 
-#: templates/personal.php:42
+#: templates/personal.php:43
 msgid "Unable to change your password"
 msgstr "不能改变你的密码"
 
-#: templates/personal.php:43
+#: templates/personal.php:44
 msgid "Current password"
 msgstr "现在的密码"
 
-#: templates/personal.php:45
+#: templates/personal.php:46
 msgid "New password"
 msgstr "新密码"
 
-#: templates/personal.php:47
+#: templates/personal.php:48
 msgid "Change password"
 msgstr "改变密码"
 
-#: templates/personal.php:59 templates/users.php:85
+#: templates/personal.php:60 templates/users.php:85
 msgid "Display Name"
 msgstr "显示名称"
 
-#: templates/personal.php:74
+#: templates/personal.php:75
 msgid "Email"
 msgstr "电子邮件"
 
-#: templates/personal.php:76
+#: templates/personal.php:77
 msgid "Your email address"
 msgstr "你的email地址"
 
-#: templates/personal.php:77
+#: templates/personal.php:78
 msgid "Fill in an email address to enable password recovery"
 msgstr "输入一个邮箱地址以激活密码恢复功能"
 
-#: templates/personal.php:86 templates/personal.php:87
+#: templates/personal.php:87 templates/personal.php:88
 msgid "Language"
 msgstr "语言"
 
-#: templates/personal.php:99
+#: templates/personal.php:100
 msgid "Help translate"
 msgstr "帮助翻译"
 
-#: templates/personal.php:105
+#: templates/personal.php:106
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:107
-msgid "Use this address to connect to your ownCloud in your file manager"
-msgstr "使用此地址来在您的文件管理器中连接您的ownCloud"
+#: templates/personal.php:108
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
+"target=\"_blank\">access your Files via WebDAV</a>"
+msgstr ""
 
-#: templates/users.php:21 templates/users.php:84
+#: templates/users.php:21
 msgid "Login Name"
 msgstr "登录名"
 
@@ -486,6 +489,10 @@ msgstr "无限制"
 msgid "Other"
 msgstr "其他"
 
+#: templates/users.php:84
+msgid "Username"
+msgstr "用户名"
+
 #: templates/users.php:91
 msgid "Storage"
 msgstr "容量"
diff --git a/l10n/zh_CN.GB2312/user_ldap.po b/l10n/zh_CN.GB2312/user_ldap.po
index 552bc73fd7ba34a5cb293b26a63c5ff4630cf7fb..dba8e02d2ad297eab949cf5ca8772d6b1e09b0b6 100644
--- a/l10n/zh_CN.GB2312/user_ldap.po
+++ b/l10n/zh_CN.GB2312/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:25+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:16+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/zh_CN/core.po b/l10n/zh_CN/core.po
index 072c4f0c39ebf2513170dcb7cd908cbf2fb6b481..4b97d4cadfde7be6c5f62bab1164ca56e99bb243 100644
--- a/l10n/zh_CN/core.po
+++ b/l10n/zh_CN/core.po
@@ -4,12 +4,13 @@
 # 
 # Translators:
 # zhangmin <zm1990s@gmail.com>, 2013
+# zhangmin <zm1990s@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:22+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
@@ -21,7 +22,7 @@ msgstr ""
 #: ajax/share.php:97
 #, php-format
 msgid "%s shared »%s« with you"
-msgstr ""
+msgstr "%s 向您分享了 »%s«"
 
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
@@ -62,135 +63,135 @@ msgstr "没有选择要删除的类别"
 msgid "Error removing %s from favorites."
 msgstr "从收藏夹中移除%s时出错。"
 
-#: js/config.php:34
+#: js/config.php:32
 msgid "Sunday"
 msgstr "星期日"
 
-#: js/config.php:35
+#: js/config.php:33
 msgid "Monday"
 msgstr "星期一"
 
-#: js/config.php:36
+#: js/config.php:34
 msgid "Tuesday"
 msgstr "星期二"
 
-#: js/config.php:37
+#: js/config.php:35
 msgid "Wednesday"
 msgstr "星期三"
 
-#: js/config.php:38
+#: js/config.php:36
 msgid "Thursday"
 msgstr "星期四"
 
-#: js/config.php:39
+#: js/config.php:37
 msgid "Friday"
 msgstr "星期五"
 
-#: js/config.php:40
+#: js/config.php:38
 msgid "Saturday"
 msgstr "星期六"
 
-#: js/config.php:45
+#: js/config.php:43
 msgid "January"
 msgstr "一月"
 
-#: js/config.php:46
+#: js/config.php:44
 msgid "February"
 msgstr "二月"
 
-#: js/config.php:47
+#: js/config.php:45
 msgid "March"
 msgstr "三月"
 
-#: js/config.php:48
+#: js/config.php:46
 msgid "April"
 msgstr "四月"
 
-#: js/config.php:49
+#: js/config.php:47
 msgid "May"
 msgstr "五月"
 
-#: js/config.php:50
+#: js/config.php:48
 msgid "June"
 msgstr "六月"
 
-#: js/config.php:51
+#: js/config.php:49
 msgid "July"
 msgstr "七月"
 
-#: js/config.php:52
+#: js/config.php:50
 msgid "August"
 msgstr "八月"
 
-#: js/config.php:53
+#: js/config.php:51
 msgid "September"
 msgstr "九月"
 
-#: js/config.php:54
+#: js/config.php:52
 msgid "October"
 msgstr "十月"
 
-#: js/config.php:55
+#: js/config.php:53
 msgid "November"
 msgstr "十一月"
 
-#: js/config.php:56
+#: js/config.php:54
 msgid "December"
 msgstr "十二月"
 
-#: js/js.js:286
+#: js/js.js:293
 msgid "Settings"
 msgstr "设置"
 
-#: js/js.js:718
+#: js/js.js:725
 msgid "seconds ago"
 msgstr "秒前"
 
-#: js/js.js:719
+#: js/js.js:726
 msgid "1 minute ago"
 msgstr "一分钟前"
 
-#: js/js.js:720
+#: js/js.js:727
 msgid "{minutes} minutes ago"
 msgstr "{minutes} 分钟前"
 
-#: js/js.js:721
+#: js/js.js:728
 msgid "1 hour ago"
 msgstr "1小时前"
 
-#: js/js.js:722
+#: js/js.js:729
 msgid "{hours} hours ago"
 msgstr "{hours} 小时前"
 
-#: js/js.js:723
+#: js/js.js:730
 msgid "today"
 msgstr "今天"
 
-#: js/js.js:724
+#: js/js.js:731
 msgid "yesterday"
 msgstr "昨天"
 
-#: js/js.js:725
+#: js/js.js:732
 msgid "{days} days ago"
 msgstr "{days} 天前"
 
-#: js/js.js:726
+#: js/js.js:733
 msgid "last month"
 msgstr "上月"
 
-#: js/js.js:727
+#: js/js.js:734
 msgid "{months} months ago"
 msgstr "{months} 月前"
 
-#: js/js.js:728
+#: js/js.js:735
 msgid "months ago"
 msgstr "月前"
 
-#: js/js.js:729
+#: js/js.js:736
 msgid "last year"
 msgstr "去年"
 
-#: js/js.js:730
+#: js/js.js:737
 msgid "years ago"
 msgstr "年前"
 
@@ -226,8 +227,8 @@ msgstr "未指定对象类型。"
 #: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
 #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:577
-#: js/share.js:589
+#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:620
+#: js/share.js:632
 msgid "Error"
 msgstr "错误"
 
@@ -247,7 +248,7 @@ msgstr "已共享"
 msgid "Share"
 msgstr "分享"
 
-#: js/share.js:125 js/share.js:617
+#: js/share.js:125 js/share.js:660
 msgid "Error while sharing"
 msgstr "共享时出错"
 
@@ -261,105 +262,109 @@ msgstr "修改权限时出错"
 
 #: js/share.js:152
 msgid "Shared with you and the group {group} by {owner}"
-msgstr "{owner}共享给您及{group}组"
+msgstr "{owner} 共享给您及 {group} 组"
 
 #: js/share.js:154
 msgid "Shared with you by {owner}"
-msgstr " {owner}与您共享"
+msgstr "{owner} 与您共享"
 
-#: js/share.js:159
+#: js/share.js:172
 msgid "Share with"
 msgstr "分享之"
 
-#: js/share.js:164
+#: js/share.js:177
 msgid "Share with link"
 msgstr "共享链接"
 
-#: js/share.js:167
+#: js/share.js:180
 msgid "Password protect"
 msgstr "密码保护"
 
-#: js/share.js:169 templates/installation.php:54 templates/login.php:26
+#: js/share.js:182 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "密码"
 
-#: js/share.js:173
+#: js/share.js:187
+msgid "Allow Public Upload"
+msgstr "允许公开上传"
+
+#: js/share.js:191
 msgid "Email link to person"
 msgstr "发送链接到个人"
 
-#: js/share.js:174
+#: js/share.js:192
 msgid "Send"
 msgstr "发送"
 
-#: js/share.js:178
+#: js/share.js:197
 msgid "Set expiration date"
 msgstr "设置过期日期"
 
-#: js/share.js:179
+#: js/share.js:198
 msgid "Expiration date"
 msgstr "过期日期"
 
-#: js/share.js:211
+#: js/share.js:230
 msgid "Share via email:"
 msgstr "通过Email共享"
 
-#: js/share.js:213
+#: js/share.js:232
 msgid "No people found"
 msgstr "未找到此人"
 
-#: js/share.js:251
+#: js/share.js:270
 msgid "Resharing is not allowed"
 msgstr "不允许二次共享"
 
-#: js/share.js:287
+#: js/share.js:306
 msgid "Shared in {item} with {user}"
-msgstr "在{item} 与 {user}共享。"
+msgstr "在 {item} 与 {user} 共享。"
 
-#: js/share.js:308
+#: js/share.js:327
 msgid "Unshare"
 msgstr "取消共享"
 
-#: js/share.js:320
+#: js/share.js:339
 msgid "can edit"
 msgstr "可以修改"
 
-#: js/share.js:322
+#: js/share.js:341
 msgid "access control"
 msgstr "访问控制"
 
-#: js/share.js:325
+#: js/share.js:344
 msgid "create"
 msgstr "创建"
 
-#: js/share.js:328
+#: js/share.js:347
 msgid "update"
 msgstr "æ›´æ–°"
 
-#: js/share.js:331
+#: js/share.js:350
 msgid "delete"
 msgstr "删除"
 
-#: js/share.js:334
+#: js/share.js:353
 msgid "share"
 msgstr "共享"
 
-#: js/share.js:368 js/share.js:564
+#: js/share.js:387 js/share.js:607
 msgid "Password protected"
 msgstr "密码已受保护"
 
-#: js/share.js:577
+#: js/share.js:620
 msgid "Error unsetting expiration date"
 msgstr "取消设置过期日期时出错"
 
-#: js/share.js:589
+#: js/share.js:632
 msgid "Error setting expiration date"
 msgstr "设置过期日期时出错"
 
-#: js/share.js:604
+#: js/share.js:647
 msgid "Sending ..."
 msgstr "正在发送..."
 
-#: js/share.js:615
+#: js/share.js:658
 msgid "Email sent"
 msgstr "邮件已发送"
 
@@ -374,7 +379,7 @@ msgstr "更新不成功。请汇报将此问题汇报给  <a href=\"https://gith
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "更新成功。正在重定向至 ownCloud。"
 
-#: lostpassword/controller.php:58
+#: lostpassword/controller.php:60
 msgid "ownCloud password reset"
 msgstr "重置 ownCloud 密码"
 
@@ -404,17 +409,17 @@ msgstr "用户名"
 
 #: lostpassword/templates/lostpassword.php:22
 msgid ""
-"Your files seems to be encrypted. If you didn't have enabled the recovery "
-"key there will be no way to get your data back once the password was "
-"resetted. If you are not sure what to do, please contact your administrator "
-"first before continue. Do you really want to continue?"
-msgstr ""
+"Your files are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
+msgstr "您的文件已加密。如果您不启用恢复密钥，您将无法在重设密码后取回文件。如果您不太确定，请在继续前联系您的管理员。您真的要继续吗？"
 
 #: lostpassword/templates/lostpassword.php:24
 msgid "Yes, I really want to reset my password now"
-msgstr ""
+msgstr "使得，我真的要现在重设密码"
 
-#: lostpassword/templates/lostpassword.php:29
+#: lostpassword/templates/lostpassword.php:27
 msgid "Request reset"
 msgstr "请求重置"
 
@@ -462,7 +467,7 @@ msgstr "访问禁止"
 msgid "Cloud not found"
 msgstr "未找到云"
 
-#: templates/altmail.php:2
+#: templates/altmail.php:4
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -471,11 +476,7 @@ msgid ""
 "View it: %s\n"
 "\n"
 "Cheers!"
-msgstr ""
-
-#: templates/altmail.php:7 templates/mail.php:24
-msgid "web services under your control"
-msgstr "您控制的web服务"
+msgstr "您好，\n\n%s 向您分享了 %s。\n查看： %s"
 
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
@@ -569,12 +570,12 @@ msgstr "数据库主机"
 msgid "Finish setup"
 msgstr "安装完成"
 
-#: templates/layout.user.php:40
+#: templates/layout.user.php:43
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr "%s 可用。获取更多关于如何升级的信息。"
 
-#: templates/layout.user.php:67
+#: templates/layout.user.php:68
 msgid "Log out"
 msgstr "注销"
 
@@ -608,12 +609,12 @@ msgstr "登录"
 msgid "Alternative Logins"
 msgstr "其他登录方式"
 
-#: templates/mail.php:15
+#: templates/mail.php:16
 #, php-format
 msgid ""
 "Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
 "href=\"%s\">View it!</a><br><br>Cheers!"
-msgstr ""
+msgstr "您好，<br><br>%s 向您分享了 »%s«。<br><a href=\"%s\">查看</a>"
 
 #: templates/part.pagenavi.php:3
 msgid "prev"
diff --git a/l10n/zh_CN/files.po b/l10n/zh_CN/files.po
index b61fe3b7c4d3609f35c0420b6f5166a5c5f7d19a..27b61db54205622067dab886da6f8418e937640a 100644
--- a/l10n/zh_CN/files.po
+++ b/l10n/zh_CN/files.po
@@ -3,14 +3,16 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Mengz You <mengz.you@gmail.com>, 2013
+# zhangmin <zm1990s@gmail.com>, 2013
 # zhangmin <zm1990s@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:01+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
-"Last-Translator: zhangmin <zm1990s@gmail.com>\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -28,46 +30,54 @@ msgstr "无法移动 %s - 同名文件已存在"
 msgid "Could not move %s"
 msgstr "无法移动 %s"
 
-#: ajax/upload.php:19
+#: ajax/upload.php:16 ajax/upload.php:45
+msgid "Unable to set upload directory."
+msgstr "无法设置上传文件夹。"
+
+#: ajax/upload.php:22
+msgid "Invalid Token"
+msgstr "无效密匙"
+
+#: ajax/upload.php:59
 msgid "No file was uploaded. Unknown error"
 msgstr "没有文件被上传。未知错误"
 
-#: ajax/upload.php:26
+#: ajax/upload.php:66
 msgid "There is no error, the file uploaded with success"
 msgstr "文件上传成功，没有错误发生"
 
-#: ajax/upload.php:27
+#: ajax/upload.php:67
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr "上传文件大小已超过php.ini中upload_max_filesize所规定的值"
 
-#: ajax/upload.php:29
+#: ajax/upload.php:69
 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:30
+#: ajax/upload.php:70
 msgid "The uploaded file was only partially uploaded"
 msgstr "已上传文件只上传了部分（不完整）"
 
-#: ajax/upload.php:31
+#: ajax/upload.php:71
 msgid "No file was uploaded"
 msgstr "没有文件被上传"
 
-#: ajax/upload.php:32
+#: ajax/upload.php:72
 msgid "Missing a temporary folder"
 msgstr "缺少临时目录"
 
-#: ajax/upload.php:33
+#: ajax/upload.php:73
 msgid "Failed to write to disk"
 msgstr "写入磁盘失败"
 
-#: ajax/upload.php:51
+#: ajax/upload.php:91
 msgid "Not enough storage available"
 msgstr "没有足够的存储空间"
 
-#: ajax/upload.php:83
+#: ajax/upload.php:123
 msgid "Invalid directory."
 msgstr "无效文件夹。"
 
@@ -75,6 +85,36 @@ msgstr "无效文件夹。"
 msgid "Files"
 msgstr "文件"
 
+#: js/file-upload.js:11
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr "无法上传您的文件，文件夹或者空文件"
+
+#: js/file-upload.js:24
+msgid "Not enough space available"
+msgstr "没有足够可用空间"
+
+#: js/file-upload.js:64
+msgid "Upload cancelled."
+msgstr "上传已取消"
+
+#: js/file-upload.js:167 js/files.js:266
+msgid ""
+"File upload is in progress. Leaving the page now will cancel the upload."
+msgstr "文件正在上传中。现在离开此页会导致上传动作被取消。"
+
+#: js/file-upload.js:233 js/files.js:339
+msgid "URL cannot be empty."
+msgstr "URL不能为空"
+
+#: js/file-upload.js:238 lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr "无效的文件夹名。”Shared“ 是 Owncloud 预留的文件夹"
+
+#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
+#: js/files.js:693 js/files.js:731
+msgid "Error"
+msgstr "错误"
+
 #: js/fileactions.js:116
 msgid "Share"
 msgstr "分享"
@@ -91,43 +131,43 @@ msgstr "删除"
 msgid "Rename"
 msgstr "重命名"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:464
 msgid "Pending"
 msgstr "等待"
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "{new_name} already exists"
 msgstr "{new_name} 已存在"
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "replace"
 msgstr "替换"
 
-#: js/filelist.js:259
+#: js/filelist.js:302
 msgid "suggest name"
 msgstr "建议名称"
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "cancel"
 msgstr "取消"
 
-#: js/filelist.js:306
+#: js/filelist.js:349
 msgid "replaced {new_name} with {old_name}"
 msgstr "已将 {old_name}替换成 {new_name}"
 
-#: js/filelist.js:306
+#: js/filelist.js:349
 msgid "undo"
 msgstr "撤销"
 
-#: js/filelist.js:331
+#: js/filelist.js:374
 msgid "perform delete operation"
 msgstr "进行删除操作"
 
-#: js/filelist.js:413
+#: js/filelist.js:456
 msgid "1 file uploading"
 msgstr "1个文件上传中"
 
-#: js/filelist.js:416 js/filelist.js:470
+#: js/filelist.js:459 js/filelist.js:517
 msgid "files uploading"
 msgstr "文件上传中"
 
@@ -159,70 +199,42 @@ msgid ""
 "big."
 msgstr "下载正在准备中。如果文件较大可能会花费一些时间。"
 
-#: js/files.js:264
-msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "无法上传您的文件，文件夹或者空文件"
-
-#: js/files.js:277
-msgid "Not enough space available"
-msgstr "没有足够可用空间"
-
-#: js/files.js:317
-msgid "Upload cancelled."
-msgstr "上传已取消"
-
-#: js/files.js:413
-msgid ""
-"File upload is in progress. Leaving the page now will cancel the upload."
-msgstr "文件正在上传中。现在离开此页会导致上传动作被取消。"
-
-#: js/files.js:486
-msgid "URL cannot be empty."
-msgstr "URL不能为空"
-
-#: js/files.js:491
+#: js/files.js:344
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "无效文件夹名。'共享' 是 Owncloud 预留的文件夹名。"
 
-#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
-msgid "Error"
-msgstr "错误"
-
-#: js/files.js:877 templates/index.php:69
+#: js/files.js:744 templates/index.php:69
 msgid "Name"
 msgstr "名称"
 
-#: js/files.js:878 templates/index.php:80
+#: js/files.js:745 templates/index.php:80
 msgid "Size"
 msgstr "大小"
 
-#: js/files.js:879 templates/index.php:82
+#: js/files.js:746 templates/index.php:82
 msgid "Modified"
 msgstr "修改日期"
 
-#: js/files.js:898
+#: js/files.js:765
 msgid "1 folder"
 msgstr "1个文件夹"
 
-#: js/files.js:900
+#: js/files.js:767
 msgid "{count} folders"
 msgstr "{count} 个文件夹"
 
-#: js/files.js:908
+#: js/files.js:775
 msgid "1 file"
 msgstr "1 个文件"
 
-#: js/files.js:910
+#: js/files.js:777
 msgid "{count} files"
 msgstr "{count} 个文件"
 
-#: lib/app.php:53
-msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
-msgstr "无效的文件夹名。”Shared“ 是 Owncloud 预留的文件夹"
-
 #: lib/app.php:73
-msgid "Unable to rename file"
-msgstr "无法重命名文件"
+#, php-format
+msgid "%s could not be renamed"
+msgstr "%s 不能被重命名"
 
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
@@ -278,7 +290,7 @@ msgstr "来自链接"
 
 #: templates/index.php:42
 msgid "Deleted files"
-msgstr "删除文件"
+msgstr "已删除文件"
 
 #: templates/index.php:48
 msgid "Cancel upload"
@@ -318,6 +330,22 @@ msgstr "文件正在被扫描，请稍候。"
 msgid "Current scanning"
 msgstr "当前扫描"
 
+#: templates/part.list.php:76
+msgid "directory"
+msgstr ""
+
+#: templates/part.list.php:78
+msgid "directories"
+msgstr ""
+
+#: templates/part.list.php:87
+msgid "file"
+msgstr "文件"
+
+#: templates/part.list.php:89
+msgid "files"
+msgstr "文件"
+
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
 msgstr "正在更新文件系统缓存..."
diff --git a/l10n/zh_CN/files_encryption.po b/l10n/zh_CN/files_encryption.po
index fa7a66b2a514d3e5a315c895d0fad95a438217ce..08588336e19018a604d6cdff64fcc09147a876bb 100644
--- a/l10n/zh_CN/files_encryption.po
+++ b/l10n/zh_CN/files_encryption.po
@@ -3,13 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Mengz You <mengz.you@gmail.com>, 2013
+# m13253 <m13253@hotmail.com>, 2013
 # modokwang <modokwang@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-14 02:46+0200\n"
-"PO-Revision-Date: 2013-06-14 00:47+0000\n"
+"POT-Creation-Date: 2013-07-05 02:12+0200\n"
+"PO-Revision-Date: 2013-07-05 00:13+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"
@@ -46,19 +48,31 @@ msgstr "不能修改密码。旧密码可能不正确。"
 
 #: ajax/updatePrivateKeyPassword.php:51
 msgid "Private key password successfully updated."
-msgstr ""
+msgstr "私钥密码成功更新。"
 
 #: ajax/updatePrivateKeyPassword.php:53
 msgid ""
 "Could not update the private key password. Maybe the old password was not "
 "correct."
-msgstr ""
+msgstr "无法更新私钥密码。可能旧密码不正确。"
 
 #: files/error.php:7
 msgid ""
-"Your private key is not valid! Maybe your password was changed from outside."
-" You can update your private key password in your personal settings to "
-"regain access to your files"
+"Your private key is not valid! Likely your password was changed outside the "
+"ownCloud system (e.g. your corporate directory). You can update your private"
+" key password in your personal settings to recover access to your encrypted "
+"files."
+msgstr "您的私有密钥无效！也许是您在 ownCloud 系统外更改了密码 (比如，在您的公司目录)。您可以在个人设置里更新您的私钥密码来恢复访问你的加密文件。"
+
+#: hooks/hooks.php:44
+msgid "Missing requirements."
+msgstr ""
+
+#: hooks/hooks.php:45
+msgid ""
+"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL "
+"PHP extension is enabled and configured properly. For now, the encryption "
+"app has been disabled."
 msgstr ""
 
 #: js/settings-admin.js:11
@@ -69,15 +83,15 @@ msgstr "保存中"
 msgid ""
 "Your private key is not valid! Maybe the your password was changed from "
 "outside."
-msgstr ""
+msgstr "您的私钥不正确！可能您在别处更改了密码。"
 
 #: templates/invalid_private_key.php:7
 msgid "You can unlock your private key in your "
-msgstr ""
+msgstr "您可以在这里解锁您的私钥："
 
 #: templates/invalid_private_key.php:7
 msgid "personal settings"
-msgstr ""
+msgstr "个人设置"
 
 #: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
@@ -85,12 +99,12 @@ msgstr "加密"
 
 #: templates/settings-admin.php:10
 msgid ""
-"Enable encryption passwords recovery key (allow sharing to recovery key):"
-msgstr "启用加密密码恢复密钥（允许共享恢复密钥）："
+"Enable recovery key (allow to recover users files in case of password loss):"
+msgstr "启用恢复密钥（允许你在密码丢失后恢复文件）："
 
 #: templates/settings-admin.php:14
-msgid "Recovery account password"
-msgstr "恢复账户密码"
+msgid "Recovery key password"
+msgstr "恢复密钥密码"
 
 #: templates/settings-admin.php:21 templates/settings-personal.php:54
 msgid "Enabled"
@@ -101,16 +115,16 @@ msgid "Disabled"
 msgstr "禁用"
 
 #: templates/settings-admin.php:34
-msgid "Change encryption passwords recovery key:"
-msgstr "变更加密密码恢复密钥："
+msgid "Change recovery key password:"
+msgstr "更改恢复密钥密码"
 
 #: templates/settings-admin.php:41
-msgid "Old Recovery account password"
-msgstr "旧恢复账号密码"
+msgid "Old Recovery key password"
+msgstr "旧的恢复密钥密码"
 
 #: templates/settings-admin.php:48
-msgid "New Recovery account password"
-msgstr "新恢复账号密码"
+msgid "New Recovery key password"
+msgstr "新的恢复密钥密码"
 
 #: templates/settings-admin.php:53
 msgid "Change Password"
@@ -118,39 +132,39 @@ msgstr "修改密码"
 
 #: templates/settings-personal.php:11
 msgid "Your private key password no longer match your log-in password:"
-msgstr ""
+msgstr "您的私钥密码不再匹配您的登录密码："
 
 #: templates/settings-personal.php:14
 msgid "Set your old private key password to your current log-in password."
-msgstr ""
+msgstr "讲您旧的私钥密码改为当前登录密码。"
 
 #: templates/settings-personal.php:16
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
-msgstr ""
+msgstr "如果您记不住旧的密码，您可以请求管理员恢复您的文件。"
 
 #: templates/settings-personal.php:24
 msgid "Old log-in password"
-msgstr ""
+msgstr "旧登录密码"
 
 #: templates/settings-personal.php:30
 msgid "Current log-in password"
-msgstr ""
+msgstr "当前登录密码"
 
 #: templates/settings-personal.php:35
 msgid "Update Private Key Password"
-msgstr ""
+msgstr "更新私钥密码"
 
 #: templates/settings-personal.php:45
 msgid "Enable password recovery:"
-msgstr ""
+msgstr "启用密码恢复："
 
 #: templates/settings-personal.php:47
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
-msgstr ""
+msgstr "启用该项将允许你在密码丢失后取回您的加密文件"
 
 #: templates/settings-personal.php:63
 msgid "File recovery settings updated"
diff --git a/l10n/zh_CN/files_external.po b/l10n/zh_CN/files_external.po
index 3b6586ea1245f231c4c27478e297dd755735f153..069f8d13bdc5bfba8a3c4ffee37ae94e02d9c6ca 100644
--- a/l10n/zh_CN/files_external.po
+++ b/l10n/zh_CN/files_external.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/zh_CN/files_sharing.po b/l10n/zh_CN/files_sharing.po
index 5445e589df58ac02ccbc180248bbdd95dee3c1fd..ce909e7c47ea07e7502dc5d32bfbd01c5ceb7bf3 100644
--- a/l10n/zh_CN/files_sharing.po
+++ b/l10n/zh_CN/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
@@ -18,27 +18,39 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: templates/authenticate.php:4
+msgid "The password is wrong. Try again."
+msgstr ""
+
+#: templates/authenticate.php:7
 msgid "Password"
 msgstr "密码"
 
-#: templates/authenticate.php:6
+#: templates/authenticate.php:9
 msgid "Submit"
 msgstr "提交"
 
-#: templates/public.php:10
+#: templates/public.php:17
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s与您共享了%s文件夹"
 
-#: templates/public.php:13
+#: templates/public.php:20
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s与您共享了%s文件"
 
-#: templates/public.php:19 templates/public.php:43
+#: templates/public.php:28 templates/public.php:90
 msgid "Download"
 msgstr "下载"
 
-#: templates/public.php:40
+#: templates/public.php:45 templates/public.php:48
+msgid "Upload"
+msgstr "上传"
+
+#: templates/public.php:58
+msgid "Cancel upload"
+msgstr "取消上传"
+
+#: templates/public.php:87
 msgid "No preview available for"
 msgstr "没有预览"
diff --git a/l10n/zh_CN/files_trashbin.po b/l10n/zh_CN/files_trashbin.po
index 11b73a1638e437f806a50d562ad4c9887b36c104..841b9bfa6267a07bd7c47979a6f49cd69b7253bd 100644
--- a/l10n/zh_CN/files_trashbin.po
+++ b/l10n/zh_CN/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:16+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/zh_CN/lib.po b/l10n/zh_CN/lib.po
index b61a5e154a46d01162f4ed6369b032ebddecd768..b952e9807e8cd69d60c04360116fe0d5303e4930 100644
--- a/l10n/zh_CN/lib.po
+++ b/l10n/zh_CN/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-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
-"Last-Translator: modokwang <modokwang@gmail.com>\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,43 +18,47 @@ msgstr ""
 "Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: app.php:359
+#: app.php:360
 msgid "Help"
 msgstr "帮助"
 
-#: app.php:372
+#: app.php:373
 msgid "Personal"
 msgstr "个人"
 
-#: app.php:383
+#: app.php:384
 msgid "Settings"
 msgstr "设置"
 
-#: app.php:395
+#: app.php:396
 msgid "Users"
 msgstr "用户"
 
-#: app.php:408
+#: app.php:409
 msgid "Apps"
 msgstr "应用"
 
-#: app.php:416
+#: app.php:417
 msgid "Admin"
 msgstr "管理"
 
-#: files.php:210
+#: defaults.php:33
+msgid "web services under your control"
+msgstr "您控制的web服务"
+
+#: files.php:226
 msgid "ZIP download is turned off."
 msgstr "ZIP 下载已经关闭"
 
-#: files.php:211
+#: files.php:227
 msgid "Files need to be downloaded one by one."
 msgstr "需要逐一下载文件"
 
-#: files.php:212 files.php:245
+#: files.php:228 files.php:261
 msgid "Back to Files"
 msgstr "回到文件"
 
-#: files.php:242
+#: files.php:258
 msgid "Selected files too large to generate zip file."
 msgstr "选择的文件太大，无法生成 zip 文件。"
 
@@ -86,104 +90,102 @@ msgstr "文本"
 msgid "Images"
 msgstr "图片"
 
-#: setup.php:34
-msgid "Set an admin username."
-msgstr "请设置一个管理员用户名。"
-
-#: setup.php:37
-msgid "Set an admin password."
-msgstr "请设置一个管理员密码。"
-
-#: setup.php:55
+#: setup/abstractdatabase.php:22
 #, php-format
 msgid "%s enter the database username."
 msgstr "%s 输入数据库用户名。"
 
-#: setup.php:58
+#: setup/abstractdatabase.php:25
 #, php-format
 msgid "%s enter the database name."
 msgstr "%s 输入数据库名称。"
 
-#: setup.php:61
+#: setup/abstractdatabase.php:28
 #, php-format
 msgid "%s you may not use dots in the database name"
 msgstr "%s 您不能在数据库名称中使用英文句号。"
 
-#: setup.php:64
+#: setup/mssql.php:20
 #, php-format
-msgid "%s set the database host."
-msgstr "%s 设置数据库所在主机。"
-
-#: setup.php:126 setup.php:332 setup.php:377
-msgid "PostgreSQL username and/or password not valid"
-msgstr "PostgreSQL 数据库用户名和/或密码无效"
+msgid "MS SQL username and/or password not valid: %s"
+msgstr "MS SQL 用户名和/或密码无效：%s"
 
-#: setup.php:127 setup.php:235
+#: setup/mssql.php:21 setup/mysql.php:13 setup/oci.php:114
+#: setup/postgresql.php:24 setup/postgresql.php:70
 msgid "You need to enter either an existing account or the administrator."
 msgstr "你需要输入一个数据库中已有的账户或管理员账户。"
 
-#: setup.php:152
-msgid "Oracle connection could not be established"
-msgstr "不能建立甲骨文连接"
-
-#: setup.php:234
+#: setup/mysql.php:12
 msgid "MySQL username and/or password not valid"
 msgstr "MySQL 数据库用户名和/或密码无效"
 
-#: setup.php:288 setup.php:398 setup.php:407 setup.php:425 setup.php:435
-#: setup.php:444 setup.php:477 setup.php:543 setup.php:569 setup.php:576
-#: setup.php:587 setup.php:594 setup.php:603 setup.php:611 setup.php:620
-#: setup.php:626
+#: setup/mysql.php:67 setup/oci.php:54 setup/oci.php:121 setup/oci.php:147
+#: setup/oci.php:154 setup/oci.php:165 setup/oci.php:172 setup/oci.php:181
+#: setup/oci.php:189 setup/oci.php:198 setup/oci.php:204
+#: setup/postgresql.php:89 setup/postgresql.php:98 setup/postgresql.php:115
+#: setup/postgresql.php:125 setup/postgresql.php:134
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr "数据库错误：\"%s\""
 
-#: setup.php:289 setup.php:399 setup.php:408 setup.php:426 setup.php:436
-#: setup.php:445 setup.php:478 setup.php:544 setup.php:570 setup.php:577
-#: setup.php:588 setup.php:604 setup.php:612 setup.php:621
+#: setup/mysql.php:68 setup/oci.php:55 setup/oci.php:122 setup/oci.php:148
+#: setup/oci.php:155 setup/oci.php:166 setup/oci.php:182 setup/oci.php:190
+#: setup/oci.php:199 setup/postgresql.php:90 setup/postgresql.php:99
+#: setup/postgresql.php:116 setup/postgresql.php:126 setup/postgresql.php:135
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr "冲突命令为：\"%s\""
 
-#: setup.php:305
+#: setup/mysql.php:85
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr "MySQL 用户 '%s'@'localhost' 已存在。"
 
-#: setup.php:306
+#: setup/mysql.php:86
 msgid "Drop this user from MySQL"
 msgstr "建议从 MySQL 数据库中丢弃 Drop 此用户"
 
-#: setup.php:311
+#: setup/mysql.php:91
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr "MySQL 用户 '%s'@'%%' 已存在"
 
-#: setup.php:312
+#: setup/mysql.php:92
 msgid "Drop this user from MySQL."
 msgstr "建议从 MySQL 数据库中丢弃 Drop 此用户。"
 
-#: setup.php:469 setup.php:536
+#: setup/oci.php:34
+msgid "Oracle connection could not be established"
+msgstr "不能建立甲骨文连接"
+
+#: setup/oci.php:41 setup/oci.php:113
 msgid "Oracle username and/or password not valid"
 msgstr "Oracle 数据库用户名和/或密码无效"
 
-#: setup.php:595 setup.php:627
+#: setup/oci.php:173 setup/oci.php:205
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr "冲突命令为：\"%s\"，名称：%s，密码：%s"
 
-#: setup.php:647
-#, php-format
-msgid "MS SQL username and/or password not valid: %s"
-msgstr "MS SQL 用户名和/或密码无效：%s"
+#: setup/postgresql.php:23 setup/postgresql.php:69
+msgid "PostgreSQL username and/or password not valid"
+msgstr "PostgreSQL 数据库用户名和/或密码无效"
+
+#: setup.php:42
+msgid "Set an admin username."
+msgstr "请设置一个管理员用户名。"
+
+#: setup.php:45
+msgid "Set an admin password."
+msgstr "请设置一个管理员密码。"
 
-#: setup.php:870
+#: setup.php:198
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "您的Web服务器尚未正确设置以允许文件同步, 因为WebDAV的接口似乎已损坏."
 
-#: setup.php:871
+#: setup.php:199
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "请认真检查<a href='%s'>安装指南</a>."
diff --git a/l10n/zh_CN/settings.po b/l10n/zh_CN/settings.po
index 524169d86d6bf3bd213d1a1f8cce3a48c060888a..f7bddf6db6597af31a2e5a652d1a023684785e27 100644
--- a/l10n/zh_CN/settings.po
+++ b/l10n/zh_CN/settings.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# m13253 <m13253@hotmail.com>, 2013
 # modokwang <modokwang@gmail.com>, 2013
 # zhangmin <zm1990s@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
@@ -90,35 +91,35 @@ msgstr "无法从组%s中移除用户"
 msgid "Couldn't update app."
 msgstr "无法更新 app。"
 
-#: js/apps.js:30
+#: js/apps.js:35
 msgid "Update to {appversion}"
 msgstr "更新至 {appversion}"
 
-#: js/apps.js:36 js/apps.js:76
+#: js/apps.js:41 js/apps.js:81
 msgid "Disable"
 msgstr "禁用"
 
-#: js/apps.js:36 js/apps.js:64 js/apps.js:83
+#: js/apps.js:41 js/apps.js:69 js/apps.js:88
 msgid "Enable"
 msgstr "开启"
 
-#: js/apps.js:55
+#: js/apps.js:60
 msgid "Please wait...."
 msgstr "请稍等...."
 
-#: js/apps.js:59 js/apps.js:71 js/apps.js:80 js/apps.js:93
+#: js/apps.js:64 js/apps.js:76 js/apps.js:85 js/apps.js:98
 msgid "Error"
 msgstr "错误"
 
-#: js/apps.js:90
+#: js/apps.js:95
 msgid "Updating...."
 msgstr "正在更新...."
 
-#: js/apps.js:93
+#: js/apps.js:98
 msgid "Error while updating app"
 msgstr "更新 app 时出错"
 
-#: js/apps.js:96
+#: js/apps.js:101
 msgid "Updated"
 msgstr "已更新"
 
@@ -167,15 +168,15 @@ msgstr "创建用户出错"
 msgid "A valid password must be provided"
 msgstr "必须提供合法的密码"
 
-#: personal.php:35 personal.php:36
+#: personal.php:37 personal.php:38
 msgid "__language_name__"
 msgstr "简体中文"
 
-#: templates/admin.php:15
+#: templates/admin.php:17
 msgid "Security Warning"
 msgstr "安全警告"
 
-#: templates/admin.php:18
+#: templates/admin.php:20
 msgid ""
 "Your data directory and your files are probably accessible from the "
 "internet. The .htaccess file that ownCloud provides is not working. We "
@@ -184,36 +185,36 @@ msgid ""
 " webserver document root."
 msgstr "您的数据文件夹和文件可由互联网访问。OwnCloud提供的.htaccess文件未生效。我们强烈建议您配置服务器，以使数据文件夹不可被访问，或者将数据文件夹移到web服务器根目录以外。"
 
-#: templates/admin.php:29
+#: templates/admin.php:31
 msgid "Setup Warning"
 msgstr "设置警告"
 
-#: templates/admin.php:32
+#: templates/admin.php:34
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "您的Web服务器尚未正确设置以允许文件同步, 因为WebDAV的接口似乎已损坏."
 
-#: templates/admin.php:33
+#: templates/admin.php:35
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "请认真检查<a href='%s'>安装指南</a>."
 
-#: templates/admin.php:44
+#: templates/admin.php:46
 msgid "Module 'fileinfo' missing"
 msgstr "模块'文件信息'丢失"
 
-#: templates/admin.php:47
+#: templates/admin.php:49
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr "PHP模块'文件信息'丢失. 我们强烈建议启用此模块以便mime类型检测取得最佳结果."
 
-#: templates/admin.php:58
+#: templates/admin.php:60
 msgid "Locale not working"
 msgstr "本地化无法工作"
 
-#: templates/admin.php:63
+#: templates/admin.php:65
 #, php-format
 msgid ""
 "This ownCloud server can't set system locale to %s. This means that there "
@@ -221,11 +222,11 @@ msgid ""
 " to install the required packages on your system to support %s."
 msgstr "此ownCloud服务器无法设置系统本地化到%s. 这意味着可能文件名中有一些字符引起问题. 我们强烈建议在你系统上安装所需的软件包来支持%s"
 
-#: templates/admin.php:75
+#: templates/admin.php:77
 msgid "Internet connection not working"
 msgstr "因特网连接无法工作"
 
-#: templates/admin.php:78
+#: templates/admin.php:80
 msgid ""
 "This ownCloud server has no working internet connection. This means that "
 "some of the features like mounting of external storage, notifications about "
@@ -235,102 +236,102 @@ msgid ""
 " of ownCloud."
 msgstr "此ownCloud服务器上没有可用的因特网连接. 这意味着某些特性例如挂载外部存储器, 提醒更新或安装第三方应用无法工作. 从远程访问文件和发送提醒电子邮件可能也无法工作. 如果你想要ownCloud的所有特性, 我们建议启用此服务器的因特网连接."
 
-#: templates/admin.php:92
+#: templates/admin.php:94
 msgid "Cron"
 msgstr "计划任务"
 
-#: templates/admin.php:101
+#: templates/admin.php:103
 msgid "Execute one task with each page loaded"
 msgstr "每个页面加载后执行一个任务"
 
-#: templates/admin.php:111
+#: templates/admin.php:113
 msgid ""
 "cron.php is registered at a webcron service. Call the cron.php page in the "
 "owncloud root once a minute over http."
 msgstr "cron.php已被注册到网络定时任务服务。通过http每分钟调用owncloud根目录的cron.php网页。"
 
-#: templates/admin.php:121
+#: templates/admin.php:123
 msgid ""
 "Use systems cron service. Call the cron.php file in the owncloud folder via "
 "a system cronjob once a minute."
 msgstr "使用系统定时任务服务。每分钟通过系统定时任务调用owncloud文件夹中的cron.php文件"
 
-#: templates/admin.php:128
+#: templates/admin.php:130
 msgid "Sharing"
 msgstr "共享"
 
-#: templates/admin.php:134
+#: templates/admin.php:136
 msgid "Enable Share API"
 msgstr "启用共享API"
 
-#: templates/admin.php:135
+#: templates/admin.php:137
 msgid "Allow apps to use the Share API"
 msgstr "允许应用软件使用共享API"
 
-#: templates/admin.php:142
+#: templates/admin.php:144
 msgid "Allow links"
 msgstr "允许链接"
 
-#: templates/admin.php:143
+#: templates/admin.php:145
 msgid "Allow users to share items to the public with links"
 msgstr "允许用户使用连接公开共享项目"
 
-#: templates/admin.php:150
+#: templates/admin.php:152
 msgid "Allow resharing"
 msgstr "允许再次共享"
 
-#: templates/admin.php:151
+#: templates/admin.php:153
 msgid "Allow users to share items shared with them again"
 msgstr "允许用户将共享给他们的项目再次共享"
 
-#: templates/admin.php:158
+#: templates/admin.php:160
 msgid "Allow users to share with anyone"
 msgstr "允许用户向任何人共享"
 
-#: templates/admin.php:161
+#: templates/admin.php:163
 msgid "Allow users to only share with users in their groups"
 msgstr "允许用户只向同组用户共享"
 
-#: templates/admin.php:168
+#: templates/admin.php:170
 msgid "Security"
 msgstr "安全"
 
-#: templates/admin.php:181
+#: templates/admin.php:183
 msgid "Enforce HTTPS"
 msgstr "强制使用 HTTPS"
 
-#: templates/admin.php:182
+#: templates/admin.php:184
 msgid ""
 "Enforces the clients to connect to ownCloud via an encrypted connection."
 msgstr "强制客户端通过加密连接连接到 ownCloud。"
 
-#: templates/admin.php:185
+#: templates/admin.php:187
 msgid ""
 "Please connect to this ownCloud instance via HTTPS to enable or disable the "
 "SSL enforcement."
 msgstr "请经由HTTPS连接到这个ownCloud实例来启用或禁用强制SSL."
 
-#: templates/admin.php:195
+#: templates/admin.php:197
 msgid "Log"
 msgstr "日志"
 
-#: templates/admin.php:196
+#: templates/admin.php:198
 msgid "Log level"
 msgstr "日志级别"
 
-#: templates/admin.php:227
+#: templates/admin.php:229
 msgid "More"
 msgstr "更多"
 
-#: templates/admin.php:228
+#: templates/admin.php:230
 msgid "Less"
 msgstr "æ›´å°‘"
 
-#: templates/admin.php:235 templates/personal.php:116
+#: templates/admin.php:236 templates/personal.php:116
 msgid "Version"
 msgstr "版本"
 
-#: templates/admin.php:237 templates/personal.php:119
+#: templates/admin.php:240 templates/personal.php:119
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -388,76 +389,79 @@ msgstr "问题跟踪器"
 msgid "Commercial Support"
 msgstr "商业支持"
 
-#: templates/personal.php:9
+#: templates/personal.php:10
 msgid "Get the apps to sync your files"
 msgstr "安装应用进行文件同步"
 
-#: templates/personal.php:20
+#: templates/personal.php:21
 msgid "Show First Run Wizard again"
 msgstr "再次显示首次运行向导"
 
-#: templates/personal.php:28
+#: templates/personal.php:29
 #, php-format
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "你已使用 <strong>%s</strong>，有效空间 <strong>%s</strong>"
 
-#: templates/personal.php:40 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:41 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "密码"
 
-#: templates/personal.php:41
+#: templates/personal.php:42
 msgid "Your password was changed"
 msgstr "密码已修改"
 
-#: templates/personal.php:42
+#: templates/personal.php:43
 msgid "Unable to change your password"
 msgstr "无法修改密码"
 
-#: templates/personal.php:43
+#: templates/personal.php:44
 msgid "Current password"
 msgstr "当前密码"
 
-#: templates/personal.php:45
+#: templates/personal.php:46
 msgid "New password"
 msgstr "新密码"
 
-#: templates/personal.php:47
+#: templates/personal.php:48
 msgid "Change password"
 msgstr "修改密码"
 
-#: templates/personal.php:59 templates/users.php:85
+#: templates/personal.php:60 templates/users.php:85
 msgid "Display Name"
 msgstr "显示名称"
 
-#: templates/personal.php:74
+#: templates/personal.php:75
 msgid "Email"
 msgstr "电子邮件"
 
-#: templates/personal.php:76
+#: templates/personal.php:77
 msgid "Your email address"
 msgstr "您的电子邮件"
 
-#: templates/personal.php:77
+#: templates/personal.php:78
 msgid "Fill in an email address to enable password recovery"
 msgstr "填写电子邮件地址以启用密码恢复功能"
 
-#: templates/personal.php:86 templates/personal.php:87
+#: templates/personal.php:87 templates/personal.php:88
 msgid "Language"
 msgstr "语言"
 
-#: templates/personal.php:99
+#: templates/personal.php:100
 msgid "Help translate"
 msgstr "帮助翻译"
 
-#: templates/personal.php:105
+#: templates/personal.php:106
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:107
-msgid "Use this address to connect to your ownCloud in your file manager"
-msgstr "用该地址来连接文件管理器中的 ownCloud"
+#: templates/personal.php:108
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
+"target=\"_blank\">access your Files via WebDAV</a>"
+msgstr ""
 
-#: templates/users.php:21 templates/users.php:84
+#: templates/users.php:21
 msgid "Login Name"
 msgstr "登录名称"
 
@@ -473,7 +477,7 @@ msgstr "管理恢复密码"
 msgid ""
 "Enter the recovery password in order to recover the users files during "
 "password change"
-msgstr ""
+msgstr "输入恢复密码来在更改密码的时候恢复用户文件"
 
 #: templates/users.php:42
 msgid "Default Storage"
@@ -487,6 +491,10 @@ msgstr "无限"
 msgid "Other"
 msgstr "其它"
 
+#: templates/users.php:84
+msgid "Username"
+msgstr "用户名"
+
 #: templates/users.php:91
 msgid "Storage"
 msgstr "存储"
diff --git a/l10n/zh_CN/user_ldap.po b/l10n/zh_CN/user_ldap.po
index 06c3ec21444b73349106b545168527a06e2e0e96..40ee57b233d75891d839d2332462200d36f3ab0b 100644
--- a/l10n/zh_CN/user_ldap.po
+++ b/l10n/zh_CN/user_ldap.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:25+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:16+0000\n"
 "Last-Translator: modokwang <modokwang@gmail.com>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/zh_CN/user_webdavauth.po b/l10n/zh_CN/user_webdavauth.po
index 084e95b9302bf0ce42783c67a19255b42e6236d3..403b5b0582243009398ebe09cf9c8d941e404853 100644
--- a/l10n/zh_CN/user_webdavauth.po
+++ b/l10n/zh_CN/user_webdavauth.po
@@ -6,14 +6,15 @@
 # hanfeng <appweb.cn@gmail.com>, 2012
 # Dianjin Wang <1132321739qq@gmail.com>, 2012
 # marguerite su <i@marguerite.su>, 2013
+# modokwang <modokwang@gmail.com>, 2013
 # Xuetian Weng <wengxt@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-15 01:59+0200\n"
-"PO-Revision-Date: 2013-06-15 00:00+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-07-02 15:33+0200\n"
+"PO-Revision-Date: 2013-07-01 08:00+0000\n"
+"Last-Translator: modokwang <modokwang@gmail.com>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -27,7 +28,7 @@ msgstr "WebDAV 认证"
 
 #: templates/settings.php:4
 msgid "URL: "
-msgstr ""
+msgstr "地址："
 
 #: templates/settings.php:7
 msgid ""
diff --git a/l10n/zh_HK/core.po b/l10n/zh_HK/core.po
index 0f4b924ac8619bf4a7e028575dce8229e405a16e..e8cb924ab5bc46539a2637f69ee2f8fcd9da6c82 100644
--- a/l10n/zh_HK/core.po
+++ b/l10n/zh_HK/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:22+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
 "MIME-Version: 1.0\n"
@@ -61,135 +61,135 @@ msgstr ""
 msgid "Error removing %s from favorites."
 msgstr ""
 
-#: js/config.php:34
+#: js/config.php:32
 msgid "Sunday"
 msgstr "星期日"
 
-#: js/config.php:35
+#: js/config.php:33
 msgid "Monday"
 msgstr "星期一"
 
-#: js/config.php:36
+#: js/config.php:34
 msgid "Tuesday"
 msgstr "星期二"
 
-#: js/config.php:37
+#: js/config.php:35
 msgid "Wednesday"
 msgstr "星期三"
 
-#: js/config.php:38
+#: js/config.php:36
 msgid "Thursday"
 msgstr "星期四"
 
-#: js/config.php:39
+#: js/config.php:37
 msgid "Friday"
 msgstr "星期五"
 
-#: js/config.php:40
+#: js/config.php:38
 msgid "Saturday"
 msgstr "星期六"
 
-#: js/config.php:45
+#: js/config.php:43
 msgid "January"
 msgstr "一月"
 
-#: js/config.php:46
+#: js/config.php:44
 msgid "February"
 msgstr "二月"
 
-#: js/config.php:47
+#: js/config.php:45
 msgid "March"
 msgstr "三月"
 
-#: js/config.php:48
+#: js/config.php:46
 msgid "April"
 msgstr "四月"
 
-#: js/config.php:49
+#: js/config.php:47
 msgid "May"
 msgstr "五月"
 
-#: js/config.php:50
+#: js/config.php:48
 msgid "June"
 msgstr "六月"
 
-#: js/config.php:51
+#: js/config.php:49
 msgid "July"
 msgstr "七月"
 
-#: js/config.php:52
+#: js/config.php:50
 msgid "August"
 msgstr "八月"
 
-#: js/config.php:53
+#: js/config.php:51
 msgid "September"
 msgstr "九月"
 
-#: js/config.php:54
+#: js/config.php:52
 msgid "October"
 msgstr "十月"
 
-#: js/config.php:55
+#: js/config.php:53
 msgid "November"
 msgstr "十一月"
 
-#: js/config.php:56
+#: js/config.php:54
 msgid "December"
 msgstr "十二月"
 
-#: js/js.js:286
+#: js/js.js:293
 msgid "Settings"
 msgstr "設定"
 
-#: js/js.js:718
+#: js/js.js:725
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:719
+#: js/js.js:726
 msgid "1 minute ago"
 msgstr ""
 
-#: js/js.js:720
+#: js/js.js:727
 msgid "{minutes} minutes ago"
 msgstr ""
 
-#: js/js.js:721
+#: js/js.js:728
 msgid "1 hour ago"
 msgstr ""
 
-#: js/js.js:722
+#: js/js.js:729
 msgid "{hours} hours ago"
 msgstr ""
 
-#: js/js.js:723
+#: js/js.js:730
 msgid "today"
 msgstr "今日"
 
-#: js/js.js:724
+#: js/js.js:731
 msgid "yesterday"
 msgstr "昨日"
 
-#: js/js.js:725
+#: js/js.js:732
 msgid "{days} days ago"
 msgstr ""
 
-#: js/js.js:726
+#: js/js.js:733
 msgid "last month"
 msgstr "前一月"
 
-#: js/js.js:727
+#: js/js.js:734
 msgid "{months} months ago"
 msgstr ""
 
-#: js/js.js:728
+#: js/js.js:735
 msgid "months ago"
 msgstr "個月之前"
 
-#: js/js.js:729
+#: js/js.js:736
 msgid "last year"
 msgstr ""
 
-#: js/js.js:730
+#: js/js.js:737
 msgid "years ago"
 msgstr ""
 
@@ -225,8 +225,8 @@ msgstr ""
 #: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
 #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:577
-#: js/share.js:589
+#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:620
+#: js/share.js:632
 msgid "Error"
 msgstr "錯誤"
 
@@ -246,7 +246,7 @@ msgstr "已分享"
 msgid "Share"
 msgstr "分享"
 
-#: js/share.js:125 js/share.js:617
+#: js/share.js:125 js/share.js:660
 msgid "Error while sharing"
 msgstr "分享時發生錯誤"
 
@@ -266,99 +266,103 @@ msgstr "{owner}與你及群組的分享"
 msgid "Shared with you by {owner}"
 msgstr "{owner}與你的分享"
 
-#: js/share.js:159
+#: js/share.js:172
 msgid "Share with"
 msgstr "分享"
 
-#: js/share.js:164
+#: js/share.js:177
 msgid "Share with link"
 msgstr "以連結分享"
 
-#: js/share.js:167
+#: js/share.js:180
 msgid "Password protect"
 msgstr "密碼保護"
 
-#: js/share.js:169 templates/installation.php:54 templates/login.php:26
+#: js/share.js:182 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "密碼"
 
-#: js/share.js:173
+#: js/share.js:187
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:191
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:174
+#: js/share.js:192
 msgid "Send"
 msgstr "傳送"
 
-#: js/share.js:178
+#: js/share.js:197
 msgid "Set expiration date"
 msgstr "設定分享期限"
 
-#: js/share.js:179
+#: js/share.js:198
 msgid "Expiration date"
 msgstr "分享期限"
 
-#: js/share.js:211
+#: js/share.js:230
 msgid "Share via email:"
 msgstr "以電郵分享"
 
-#: js/share.js:213
+#: js/share.js:232
 msgid "No people found"
 msgstr "找不到"
 
-#: js/share.js:251
+#: js/share.js:270
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:287
+#: js/share.js:306
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:308
+#: js/share.js:327
 msgid "Unshare"
 msgstr "取消分享"
 
-#: js/share.js:320
+#: js/share.js:339
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:322
+#: js/share.js:341
 msgid "access control"
 msgstr ""
 
-#: js/share.js:325
+#: js/share.js:344
 msgid "create"
 msgstr "新增"
 
-#: js/share.js:328
+#: js/share.js:347
 msgid "update"
 msgstr "æ›´æ–°"
 
-#: js/share.js:331
+#: js/share.js:350
 msgid "delete"
 msgstr "刪除"
 
-#: js/share.js:334
+#: js/share.js:353
 msgid "share"
 msgstr "分享"
 
-#: js/share.js:368 js/share.js:564
+#: js/share.js:387 js/share.js:607
 msgid "Password protected"
 msgstr "密碼保護"
 
-#: js/share.js:577
+#: js/share.js:620
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:589
+#: js/share.js:632
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:604
+#: js/share.js:647
 msgid "Sending ..."
 msgstr "傳送中"
 
-#: js/share.js:615
+#: js/share.js:658
 msgid "Email sent"
 msgstr "郵件已傳"
 
@@ -373,7 +377,7 @@ msgstr ""
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "更新成功, 正"
 
-#: lostpassword/controller.php:58
+#: lostpassword/controller.php:60
 msgid "ownCloud password reset"
 msgstr ""
 
@@ -403,17 +407,17 @@ msgstr "用戶名稱"
 
 #: lostpassword/templates/lostpassword.php:22
 msgid ""
-"Your files seems to be encrypted. If you didn't have enabled the recovery "
-"key there will be no way to get your data back once the password was "
-"resetted. If you are not sure what to do, please contact your administrator "
-"first before continue. Do you really want to continue?"
+"Your files are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
 msgstr ""
 
 #: lostpassword/templates/lostpassword.php:24
 msgid "Yes, I really want to reset my password now"
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:29
+#: lostpassword/templates/lostpassword.php:27
 msgid "Request reset"
 msgstr "重設"
 
@@ -461,7 +465,7 @@ msgstr ""
 msgid "Cloud not found"
 msgstr "未找到Cloud"
 
-#: templates/altmail.php:2
+#: templates/altmail.php:4
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -472,10 +476,6 @@ msgid ""
 "Cheers!"
 msgstr ""
 
-#: templates/altmail.php:7 templates/mail.php:24
-msgid "web services under your control"
-msgstr ""
-
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
 msgstr ""
@@ -568,12 +568,12 @@ msgstr ""
 msgid "Finish setup"
 msgstr ""
 
-#: templates/layout.user.php:40
+#: templates/layout.user.php:43
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:67
+#: templates/layout.user.php:68
 msgid "Log out"
 msgstr "登出"
 
@@ -607,7 +607,7 @@ msgstr "登入"
 msgid "Alternative Logins"
 msgstr ""
 
-#: templates/mail.php:15
+#: templates/mail.php:16
 #, php-format
 msgid ""
 "Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
diff --git a/l10n/zh_HK/files.po b/l10n/zh_HK/files.po
index ff12dc36a2b0c69b4c8ef20493d67bede851514b..0ef695e4a8cbb7f2f45757bedcd32155ebf6c045 100644
--- a/l10n/zh_HK/files.po
+++ b/l10n/zh_HK/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:01+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
 "MIME-Version: 1.0\n"
@@ -27,46 +27,54 @@ msgstr ""
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/upload.php:19
+#: ajax/upload.php:16 ajax/upload.php:45
+msgid "Unable to set upload directory."
+msgstr ""
+
+#: ajax/upload.php:22
+msgid "Invalid Token"
+msgstr ""
+
+#: ajax/upload.php:59
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: ajax/upload.php:26
+#: ajax/upload.php:66
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/upload.php:27
+#: ajax/upload.php:67
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:29
+#: ajax/upload.php:69
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/upload.php:30
+#: ajax/upload.php:70
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/upload.php:31
+#: ajax/upload.php:71
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/upload.php:32
+#: ajax/upload.php:72
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/upload.php:33
+#: ajax/upload.php:73
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:51
+#: ajax/upload.php:91
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:83
+#: ajax/upload.php:123
 msgid "Invalid directory."
 msgstr ""
 
@@ -74,6 +82,36 @@ msgstr ""
 msgid "Files"
 msgstr "文件"
 
+#: js/file-upload.js:11
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/file-upload.js:24
+msgid "Not enough space available"
+msgstr ""
+
+#: js/file-upload.js:64
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/file-upload.js:167 js/files.js:266
+msgid ""
+"File upload is in progress. Leaving the page now will cancel the upload."
+msgstr ""
+
+#: js/file-upload.js:233 js/files.js:339
+msgid "URL cannot be empty."
+msgstr ""
+
+#: js/file-upload.js:238 lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr ""
+
+#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
+#: js/files.js:693 js/files.js:731
+msgid "Error"
+msgstr "錯誤"
+
 #: js/fileactions.js:116
 msgid "Share"
 msgstr "分享"
@@ -90,43 +128,43 @@ msgstr "刪除"
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:464
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:259
+#: js/filelist.js:302
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:306
+#: js/filelist.js:349
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:306
+#: js/filelist.js:349
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:331
+#: js/filelist.js:374
 msgid "perform delete operation"
 msgstr ""
 
-#: js/filelist.js:413
+#: js/filelist.js:456
 msgid "1 file uploading"
 msgstr ""
 
-#: js/filelist.js:416 js/filelist.js:470
+#: js/filelist.js:459 js/filelist.js:517
 msgid "files uploading"
 msgstr ""
 
@@ -158,69 +196,41 @@ msgid ""
 "big."
 msgstr ""
 
-#: js/files.js:264
-msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr ""
-
-#: js/files.js:277
-msgid "Not enough space available"
-msgstr ""
-
-#: js/files.js:317
-msgid "Upload cancelled."
-msgstr ""
-
-#: js/files.js:413
-msgid ""
-"File upload is in progress. Leaving the page now will cancel the upload."
-msgstr ""
-
-#: js/files.js:486
-msgid "URL cannot be empty."
-msgstr ""
-
-#: js/files.js:491
+#: js/files.js:344
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
-msgid "Error"
-msgstr "錯誤"
-
-#: js/files.js:877 templates/index.php:69
+#: js/files.js:744 templates/index.php:69
 msgid "Name"
 msgstr "名稱"
 
-#: js/files.js:878 templates/index.php:80
+#: js/files.js:745 templates/index.php:80
 msgid "Size"
 msgstr ""
 
-#: js/files.js:879 templates/index.php:82
+#: js/files.js:746 templates/index.php:82
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:898
+#: js/files.js:765
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:900
+#: js/files.js:767
 msgid "{count} folders"
 msgstr "{}文件夾"
 
-#: js/files.js:908
+#: js/files.js:775
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:910
+#: js/files.js:777
 msgid "{count} files"
 msgstr ""
 
-#: lib/app.php:53
-msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
-msgstr ""
-
 #: lib/app.php:73
-msgid "Unable to rename file"
+#, php-format
+msgid "%s could not be renamed"
 msgstr ""
 
 #: lib/helper.php:11 templates/index.php:18
@@ -317,6 +327,22 @@ msgstr ""
 msgid "Current scanning"
 msgstr ""
 
+#: templates/part.list.php:76
+msgid "directory"
+msgstr ""
+
+#: templates/part.list.php:78
+msgid "directories"
+msgstr ""
+
+#: templates/part.list.php:87
+msgid "file"
+msgstr ""
+
+#: templates/part.list.php:89
+msgid "files"
+msgstr ""
+
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
 msgstr ""
diff --git a/l10n/zh_HK/files_encryption.po b/l10n/zh_HK/files_encryption.po
index c61e3c1db8a46f70df5ea6d04557bf857d8e0faa..7a7dd9fef9c2e7adf1d73b606bfe9ae0b838deb2 100644
--- a/l10n/zh_HK/files_encryption.po
+++ b/l10n/zh_HK/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-14 02:46+0200\n"
-"PO-Revision-Date: 2013-06-14 00:47+0000\n"
+"POT-Creation-Date: 2013-07-05 02:12+0200\n"
+"PO-Revision-Date: 2013-07-05 00:13+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"
@@ -55,9 +55,21 @@ msgstr ""
 
 #: files/error.php:7
 msgid ""
-"Your private key is not valid! Maybe your password was changed from outside."
-" You can update your private key password in your personal settings to "
-"regain access to your files"
+"Your private key is not valid! Likely your password was changed outside the "
+"ownCloud system (e.g. your corporate directory). You can update your private"
+" key password in your personal settings to recover access to your encrypted "
+"files."
+msgstr ""
+
+#: hooks/hooks.php:44
+msgid "Missing requirements."
+msgstr ""
+
+#: hooks/hooks.php:45
+msgid ""
+"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL "
+"PHP extension is enabled and configured properly. For now, the encryption "
+"app has been disabled."
 msgstr ""
 
 #: js/settings-admin.js:11
@@ -84,11 +96,11 @@ msgstr "加密"
 
 #: templates/settings-admin.php:10
 msgid ""
-"Enable encryption passwords recovery key (allow sharing to recovery key):"
+"Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
 #: templates/settings-admin.php:14
-msgid "Recovery account password"
+msgid "Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:21 templates/settings-personal.php:54
@@ -100,15 +112,15 @@ msgid "Disabled"
 msgstr ""
 
 #: templates/settings-admin.php:34
-msgid "Change encryption passwords recovery key:"
+msgid "Change recovery key password:"
 msgstr ""
 
 #: templates/settings-admin.php:41
-msgid "Old Recovery account password"
+msgid "Old Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:48
-msgid "New Recovery account password"
+msgid "New Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:53
diff --git a/l10n/zh_HK/files_external.po b/l10n/zh_HK/files_external.po
index d793ce84ac3e508abb88c4c5cc301c736139bec7..337cef2a729756221dccd586f9221776a1d2030d 100644
--- a/l10n/zh_HK/files_external.po
+++ b/l10n/zh_HK/files_external.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/zh_HK/files_sharing.po b/l10n/zh_HK/files_sharing.po
index 22a2697c1c80e8b8d37221ba79cbe0c6edb09432..4a1681cdffc6a096ea57271925dc9e39ff5e1074 100644
--- a/l10n/zh_HK/files_sharing.po
+++ b/l10n/zh_HK/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
 "MIME-Version: 1.0\n"
@@ -18,27 +18,39 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: templates/authenticate.php:4
+msgid "The password is wrong. Try again."
+msgstr ""
+
+#: templates/authenticate.php:7
 msgid "Password"
 msgstr "密碼"
 
-#: templates/authenticate.php:6
+#: templates/authenticate.php:9
 msgid "Submit"
 msgstr ""
 
-#: templates/public.php:10
+#: templates/public.php:17
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr ""
 
-#: templates/public.php:13
+#: templates/public.php:20
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr ""
 
-#: templates/public.php:19 templates/public.php:43
+#: templates/public.php:28 templates/public.php:90
 msgid "Download"
 msgstr "下載"
 
-#: templates/public.php:40
+#: templates/public.php:45 templates/public.php:48
+msgid "Upload"
+msgstr "上傳"
+
+#: templates/public.php:58
+msgid "Cancel upload"
+msgstr ""
+
+#: templates/public.php:87
 msgid "No preview available for"
 msgstr ""
diff --git a/l10n/zh_HK/files_trashbin.po b/l10n/zh_HK/files_trashbin.po
index 816a70f3a4045905c134314f697957d9a42642bc..15b562bf76917f4a4a85861796685753d87b80c2 100644
--- a/l10n/zh_HK/files_trashbin.po
+++ b/l10n/zh_HK/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:16+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/zh_HK/lib.po b/l10n/zh_HK/lib.po
index 638d43a558e2b2ff996a13faf20dad4c27875349..da2ed86b3511bd52cd4ec7010747bce58a728426 100644
--- a/l10n/zh_HK/lib.po
+++ b/l10n/zh_HK/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
 "MIME-Version: 1.0\n"
@@ -17,43 +17,47 @@ msgstr ""
 "Language: zh_HK\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: app.php:359
+#: app.php:360
 msgid "Help"
 msgstr "幫助"
 
-#: app.php:372
+#: app.php:373
 msgid "Personal"
 msgstr "個人"
 
-#: app.php:383
+#: app.php:384
 msgid "Settings"
 msgstr "設定"
 
-#: app.php:395
+#: app.php:396
 msgid "Users"
 msgstr "用戶"
 
-#: app.php:408
+#: app.php:409
 msgid "Apps"
 msgstr "軟件"
 
-#: app.php:416
+#: app.php:417
 msgid "Admin"
 msgstr "管理"
 
-#: files.php:210
+#: defaults.php:33
+msgid "web services under your control"
+msgstr ""
+
+#: files.php:226
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: files.php:211
+#: files.php:227
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:212 files.php:245
+#: files.php:228 files.php:261
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:242
+#: files.php:258
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
@@ -85,104 +89,102 @@ msgstr "文字"
 msgid "Images"
 msgstr ""
 
-#: setup.php:34
-msgid "Set an admin username."
-msgstr ""
-
-#: setup.php:37
-msgid "Set an admin password."
-msgstr ""
-
-#: setup.php:55
+#: setup/abstractdatabase.php:22
 #, php-format
 msgid "%s enter the database username."
 msgstr ""
 
-#: setup.php:58
+#: setup/abstractdatabase.php:25
 #, php-format
 msgid "%s enter the database name."
 msgstr ""
 
-#: setup.php:61
+#: setup/abstractdatabase.php:28
 #, php-format
 msgid "%s you may not use dots in the database name"
 msgstr ""
 
-#: setup.php:64
+#: setup/mssql.php:20
 #, php-format
-msgid "%s set the database host."
-msgstr ""
-
-#: setup.php:126 setup.php:332 setup.php:377
-msgid "PostgreSQL username and/or password not valid"
+msgid "MS SQL username and/or password not valid: %s"
 msgstr ""
 
-#: setup.php:127 setup.php:235
+#: setup/mssql.php:21 setup/mysql.php:13 setup/oci.php:114
+#: setup/postgresql.php:24 setup/postgresql.php:70
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:152
-msgid "Oracle connection could not be established"
-msgstr ""
-
-#: setup.php:234
+#: setup/mysql.php:12
 msgid "MySQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:288 setup.php:398 setup.php:407 setup.php:425 setup.php:435
-#: setup.php:444 setup.php:477 setup.php:543 setup.php:569 setup.php:576
-#: setup.php:587 setup.php:594 setup.php:603 setup.php:611 setup.php:620
-#: setup.php:626
+#: setup/mysql.php:67 setup/oci.php:54 setup/oci.php:121 setup/oci.php:147
+#: setup/oci.php:154 setup/oci.php:165 setup/oci.php:172 setup/oci.php:181
+#: setup/oci.php:189 setup/oci.php:198 setup/oci.php:204
+#: setup/postgresql.php:89 setup/postgresql.php:98 setup/postgresql.php:115
+#: setup/postgresql.php:125 setup/postgresql.php:134
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr ""
 
-#: setup.php:289 setup.php:399 setup.php:408 setup.php:426 setup.php:436
-#: setup.php:445 setup.php:478 setup.php:544 setup.php:570 setup.php:577
-#: setup.php:588 setup.php:604 setup.php:612 setup.php:621
+#: setup/mysql.php:68 setup/oci.php:55 setup/oci.php:122 setup/oci.php:148
+#: setup/oci.php:155 setup/oci.php:166 setup/oci.php:182 setup/oci.php:190
+#: setup/oci.php:199 setup/postgresql.php:90 setup/postgresql.php:99
+#: setup/postgresql.php:116 setup/postgresql.php:126 setup/postgresql.php:135
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:305
+#: setup/mysql.php:85
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:306
+#: setup/mysql.php:86
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:311
+#: setup/mysql.php:91
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:312
+#: setup/mysql.php:92
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:469 setup.php:536
+#: setup/oci.php:34
+msgid "Oracle connection could not be established"
+msgstr ""
+
+#: setup/oci.php:41 setup/oci.php:113
 msgid "Oracle username and/or password not valid"
 msgstr ""
 
-#: setup.php:595 setup.php:627
+#: setup/oci.php:173 setup/oci.php:205
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:647
-#, php-format
-msgid "MS SQL username and/or password not valid: %s"
+#: setup/postgresql.php:23 setup/postgresql.php:69
+msgid "PostgreSQL username and/or password not valid"
+msgstr ""
+
+#: setup.php:42
+msgid "Set an admin username."
+msgstr ""
+
+#: setup.php:45
+msgid "Set an admin password."
 msgstr ""
 
-#: setup.php:870
+#: setup.php:198
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:871
+#: setup.php:199
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
diff --git a/l10n/zh_HK/settings.po b/l10n/zh_HK/settings.po
index d631d63b55dc26dcf1a2bfaca9c5a31638b965d1..bacca91e6707ea8a25df1e514e1516555c4c0c29 100644
--- a/l10n/zh_HK/settings.po
+++ b/l10n/zh_HK/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
 "MIME-Version: 1.0\n"
@@ -88,35 +88,35 @@ msgstr ""
 msgid "Couldn't update app."
 msgstr ""
 
-#: js/apps.js:30
+#: js/apps.js:35
 msgid "Update to {appversion}"
 msgstr ""
 
-#: js/apps.js:36 js/apps.js:76
+#: js/apps.js:41 js/apps.js:81
 msgid "Disable"
 msgstr ""
 
-#: js/apps.js:36 js/apps.js:64 js/apps.js:83
+#: js/apps.js:41 js/apps.js:69 js/apps.js:88
 msgid "Enable"
 msgstr ""
 
-#: js/apps.js:55
+#: js/apps.js:60
 msgid "Please wait...."
 msgstr ""
 
-#: js/apps.js:59 js/apps.js:71 js/apps.js:80 js/apps.js:93
+#: js/apps.js:64 js/apps.js:76 js/apps.js:85 js/apps.js:98
 msgid "Error"
 msgstr "錯誤"
 
-#: js/apps.js:90
+#: js/apps.js:95
 msgid "Updating...."
 msgstr ""
 
-#: js/apps.js:93
+#: js/apps.js:98
 msgid "Error while updating app"
 msgstr ""
 
-#: js/apps.js:96
+#: js/apps.js:101
 msgid "Updated"
 msgstr ""
 
@@ -165,15 +165,15 @@ msgstr ""
 msgid "A valid password must be provided"
 msgstr ""
 
-#: personal.php:35 personal.php:36
+#: personal.php:37 personal.php:38
 msgid "__language_name__"
 msgstr ""
 
-#: templates/admin.php:15
+#: templates/admin.php:17
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:18
+#: templates/admin.php:20
 msgid ""
 "Your data directory and your files are probably accessible from the "
 "internet. The .htaccess file that ownCloud provides is not working. We "
@@ -182,36 +182,36 @@ msgid ""
 " webserver document root."
 msgstr ""
 
-#: templates/admin.php:29
+#: templates/admin.php:31
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:32
+#: templates/admin.php:34
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: templates/admin.php:33
+#: templates/admin.php:35
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:44
+#: templates/admin.php:46
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:47
+#: templates/admin.php:49
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr ""
 
-#: templates/admin.php:58
+#: templates/admin.php:60
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:63
+#: templates/admin.php:65
 #, php-format
 msgid ""
 "This ownCloud server can't set system locale to %s. This means that there "
@@ -219,11 +219,11 @@ msgid ""
 " to install the required packages on your system to support %s."
 msgstr ""
 
-#: templates/admin.php:75
+#: templates/admin.php:77
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:78
+#: templates/admin.php:80
 msgid ""
 "This ownCloud server has no working internet connection. This means that "
 "some of the features like mounting of external storage, notifications about "
@@ -233,102 +233,102 @@ msgid ""
 " of ownCloud."
 msgstr ""
 
-#: templates/admin.php:92
+#: templates/admin.php:94
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:101
+#: templates/admin.php:103
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:111
+#: templates/admin.php:113
 msgid ""
 "cron.php is registered at a webcron service. Call the cron.php page in the "
 "owncloud root once a minute over http."
 msgstr ""
 
-#: templates/admin.php:121
+#: templates/admin.php:123
 msgid ""
 "Use systems cron service. Call the cron.php file in the owncloud folder via "
 "a system cronjob once a minute."
 msgstr ""
 
-#: templates/admin.php:128
+#: templates/admin.php:130
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:134
+#: templates/admin.php:136
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:135
+#: templates/admin.php:137
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:142
+#: templates/admin.php:144
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:143
+#: templates/admin.php:145
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:150
+#: templates/admin.php:152
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:151
+#: templates/admin.php:153
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:158
+#: templates/admin.php:160
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:161
+#: templates/admin.php:163
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:168
+#: templates/admin.php:170
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:181
+#: templates/admin.php:183
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:182
+#: templates/admin.php:184
 msgid ""
 "Enforces the clients to connect to ownCloud via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:185
+#: templates/admin.php:187
 msgid ""
 "Please connect to this ownCloud instance via HTTPS to enable or disable the "
 "SSL enforcement."
 msgstr ""
 
-#: templates/admin.php:195
+#: templates/admin.php:197
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:196
+#: templates/admin.php:198
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:227
+#: templates/admin.php:229
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:228
+#: templates/admin.php:230
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:235 templates/personal.php:116
+#: templates/admin.php:236 templates/personal.php:116
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:237 templates/personal.php:119
+#: templates/admin.php:240 templates/personal.php:119
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -386,76 +386,79 @@ msgstr ""
 msgid "Commercial Support"
 msgstr ""
 
-#: templates/personal.php:9
+#: templates/personal.php:10
 msgid "Get the apps to sync your files"
 msgstr ""
 
-#: templates/personal.php:20
+#: templates/personal.php:21
 msgid "Show First Run Wizard again"
 msgstr ""
 
-#: templates/personal.php:28
+#: templates/personal.php:29
 #, php-format
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr ""
 
-#: templates/personal.php:40 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:41 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "密碼"
 
-#: templates/personal.php:41
+#: templates/personal.php:42
 msgid "Your password was changed"
 msgstr ""
 
-#: templates/personal.php:42
+#: templates/personal.php:43
 msgid "Unable to change your password"
 msgstr ""
 
-#: templates/personal.php:43
+#: templates/personal.php:44
 msgid "Current password"
 msgstr ""
 
-#: templates/personal.php:45
+#: templates/personal.php:46
 msgid "New password"
 msgstr "新密碼"
 
-#: templates/personal.php:47
+#: templates/personal.php:48
 msgid "Change password"
 msgstr ""
 
-#: templates/personal.php:59 templates/users.php:85
+#: templates/personal.php:60 templates/users.php:85
 msgid "Display Name"
 msgstr ""
 
-#: templates/personal.php:74
+#: templates/personal.php:75
 msgid "Email"
 msgstr "電郵"
 
-#: templates/personal.php:76
+#: templates/personal.php:77
 msgid "Your email address"
 msgstr ""
 
-#: templates/personal.php:77
+#: templates/personal.php:78
 msgid "Fill in an email address to enable password recovery"
 msgstr ""
 
-#: templates/personal.php:86 templates/personal.php:87
+#: templates/personal.php:87 templates/personal.php:88
 msgid "Language"
 msgstr ""
 
-#: templates/personal.php:99
+#: templates/personal.php:100
 msgid "Help translate"
 msgstr ""
 
-#: templates/personal.php:105
+#: templates/personal.php:106
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:107
-msgid "Use this address to connect to your ownCloud in your file manager"
+#: templates/personal.php:108
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
+"target=\"_blank\">access your Files via WebDAV</a>"
 msgstr ""
 
-#: templates/users.php:21 templates/users.php:84
+#: templates/users.php:21
 msgid "Login Name"
 msgstr ""
 
@@ -485,6 +488,10 @@ msgstr ""
 msgid "Other"
 msgstr ""
 
+#: templates/users.php:84
+msgid "Username"
+msgstr "用戶名稱"
+
 #: templates/users.php:91
 msgid "Storage"
 msgstr ""
diff --git a/l10n/zh_HK/user_ldap.po b/l10n/zh_HK/user_ldap.po
index a1f1dc6b182657cc60da1b9e99b29fa48fe10fce..ff35fc3a4a6ffcfb19e9e407f913df8bd7a0395d 100644
--- a/l10n/zh_HK/user_ldap.po
+++ b/l10n/zh_HK/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:25+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:16+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/zh_TW/core.po b/l10n/zh_TW/core.po
index 67c10c0e857f21cdf91c9c3989149ccc9b7e2f16..666050144d42591901678878c31ad0ed11126808 100644
--- a/l10n/zh_TW/core.po
+++ b/l10n/zh_TW/core.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# chenanyeh <chnjsn1221@gmail.com>, 2013
 # pellaeon <nfsmwlin@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:22+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
@@ -62,135 +63,135 @@ msgstr "沒有選擇要刪除的分類。"
 msgid "Error removing %s from favorites."
 msgstr "從最愛移除 %s 時發生錯誤。"
 
-#: js/config.php:34
+#: js/config.php:32
 msgid "Sunday"
 msgstr "週日"
 
-#: js/config.php:35
+#: js/config.php:33
 msgid "Monday"
 msgstr "週一"
 
-#: js/config.php:36
+#: js/config.php:34
 msgid "Tuesday"
 msgstr "週二"
 
-#: js/config.php:37
+#: js/config.php:35
 msgid "Wednesday"
 msgstr "週三"
 
-#: js/config.php:38
+#: js/config.php:36
 msgid "Thursday"
 msgstr "週四"
 
-#: js/config.php:39
+#: js/config.php:37
 msgid "Friday"
 msgstr "週五"
 
-#: js/config.php:40
+#: js/config.php:38
 msgid "Saturday"
 msgstr "週六"
 
-#: js/config.php:45
+#: js/config.php:43
 msgid "January"
 msgstr "一月"
 
-#: js/config.php:46
+#: js/config.php:44
 msgid "February"
 msgstr "二月"
 
-#: js/config.php:47
+#: js/config.php:45
 msgid "March"
 msgstr "三月"
 
-#: js/config.php:48
+#: js/config.php:46
 msgid "April"
 msgstr "四月"
 
-#: js/config.php:49
+#: js/config.php:47
 msgid "May"
 msgstr "五月"
 
-#: js/config.php:50
+#: js/config.php:48
 msgid "June"
 msgstr "六月"
 
-#: js/config.php:51
+#: js/config.php:49
 msgid "July"
 msgstr "七月"
 
-#: js/config.php:52
+#: js/config.php:50
 msgid "August"
 msgstr "八月"
 
-#: js/config.php:53
+#: js/config.php:51
 msgid "September"
 msgstr "九月"
 
-#: js/config.php:54
+#: js/config.php:52
 msgid "October"
 msgstr "十月"
 
-#: js/config.php:55
+#: js/config.php:53
 msgid "November"
 msgstr "十一月"
 
-#: js/config.php:56
+#: js/config.php:54
 msgid "December"
 msgstr "十二月"
 
-#: js/js.js:286
+#: js/js.js:293
 msgid "Settings"
 msgstr "設定"
 
-#: js/js.js:718
+#: js/js.js:725
 msgid "seconds ago"
 msgstr "幾秒前"
 
-#: js/js.js:719
+#: js/js.js:726
 msgid "1 minute ago"
 msgstr "1 分鐘前"
 
-#: js/js.js:720
+#: js/js.js:727
 msgid "{minutes} minutes ago"
 msgstr "{minutes} 分鐘前"
 
-#: js/js.js:721
+#: js/js.js:728
 msgid "1 hour ago"
 msgstr "1 小時之前"
 
-#: js/js.js:722
+#: js/js.js:729
 msgid "{hours} hours ago"
 msgstr "{hours} 小時前"
 
-#: js/js.js:723
+#: js/js.js:730
 msgid "today"
 msgstr "今天"
 
-#: js/js.js:724
+#: js/js.js:731
 msgid "yesterday"
 msgstr "昨天"
 
-#: js/js.js:725
+#: js/js.js:732
 msgid "{days} days ago"
 msgstr "{days} 天前"
 
-#: js/js.js:726
+#: js/js.js:733
 msgid "last month"
 msgstr "上個月"
 
-#: js/js.js:727
+#: js/js.js:734
 msgid "{months} months ago"
 msgstr "{months} 個月前"
 
-#: js/js.js:728
+#: js/js.js:735
 msgid "months ago"
 msgstr "幾個月前"
 
-#: js/js.js:729
+#: js/js.js:736
 msgid "last year"
 msgstr "去年"
 
-#: js/js.js:730
+#: js/js.js:737
 msgid "years ago"
 msgstr "幾年前"
 
@@ -226,8 +227,8 @@ msgstr "未指定物件類型。"
 #: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
 #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:577
-#: js/share.js:589
+#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:620
+#: js/share.js:632
 msgid "Error"
 msgstr "錯誤"
 
@@ -247,7 +248,7 @@ msgstr "已分享"
 msgid "Share"
 msgstr "分享"
 
-#: js/share.js:125 js/share.js:617
+#: js/share.js:125 js/share.js:660
 msgid "Error while sharing"
 msgstr "分享時發生錯誤"
 
@@ -267,99 +268,103 @@ msgstr "由 {owner} 分享給您和 {group}"
 msgid "Shared with you by {owner}"
 msgstr "{owner} 已經和您分享"
 
-#: js/share.js:159
+#: js/share.js:172
 msgid "Share with"
 msgstr "與...分享"
 
-#: js/share.js:164
+#: js/share.js:177
 msgid "Share with link"
 msgstr "使用連結分享"
 
-#: js/share.js:167
+#: js/share.js:180
 msgid "Password protect"
 msgstr "密碼保護"
 
-#: js/share.js:169 templates/installation.php:54 templates/login.php:26
+#: js/share.js:182 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "密碼"
 
-#: js/share.js:173
+#: js/share.js:187
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:191
 msgid "Email link to person"
 msgstr "將連結 email 給別人"
 
-#: js/share.js:174
+#: js/share.js:192
 msgid "Send"
 msgstr "寄出"
 
-#: js/share.js:178
+#: js/share.js:197
 msgid "Set expiration date"
 msgstr "設置到期日"
 
-#: js/share.js:179
+#: js/share.js:198
 msgid "Expiration date"
 msgstr "到期日"
 
-#: js/share.js:211
+#: js/share.js:230
 msgid "Share via email:"
 msgstr "透過電子郵件分享："
 
-#: js/share.js:213
+#: js/share.js:232
 msgid "No people found"
 msgstr "沒有找到任何人"
 
-#: js/share.js:251
+#: js/share.js:270
 msgid "Resharing is not allowed"
 msgstr "不允許重新分享"
 
-#: js/share.js:287
+#: js/share.js:306
 msgid "Shared in {item} with {user}"
 msgstr "已和 {user} 分享 {item}"
 
-#: js/share.js:308
+#: js/share.js:327
 msgid "Unshare"
 msgstr "取消共享"
 
-#: js/share.js:320
+#: js/share.js:339
 msgid "can edit"
 msgstr "可編輯"
 
-#: js/share.js:322
+#: js/share.js:341
 msgid "access control"
 msgstr "存取控制"
 
-#: js/share.js:325
+#: js/share.js:344
 msgid "create"
 msgstr "建立"
 
-#: js/share.js:328
+#: js/share.js:347
 msgid "update"
 msgstr "æ›´æ–°"
 
-#: js/share.js:331
+#: js/share.js:350
 msgid "delete"
 msgstr "刪除"
 
-#: js/share.js:334
+#: js/share.js:353
 msgid "share"
 msgstr "分享"
 
-#: js/share.js:368 js/share.js:564
+#: js/share.js:387 js/share.js:607
 msgid "Password protected"
 msgstr "受密碼保護"
 
-#: js/share.js:577
+#: js/share.js:620
 msgid "Error unsetting expiration date"
 msgstr "解除過期日設定失敗"
 
-#: js/share.js:589
+#: js/share.js:632
 msgid "Error setting expiration date"
 msgstr "錯誤的到期日設定"
 
-#: js/share.js:604
+#: js/share.js:647
 msgid "Sending ..."
 msgstr "正在傳送..."
 
-#: js/share.js:615
+#: js/share.js:658
 msgid "Email sent"
 msgstr "Email 已寄出"
 
@@ -374,7 +379,7 @@ msgstr "升級失敗，請將此問題回報 <a href=\"https://github.com/ownclo
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "升級成功，正將您重新導向至 ownCloud 。"
 
-#: lostpassword/controller.php:58
+#: lostpassword/controller.php:60
 msgid "ownCloud password reset"
 msgstr "ownCloud 密碼重設"
 
@@ -404,17 +409,17 @@ msgstr "使用者名稱"
 
 #: lostpassword/templates/lostpassword.php:22
 msgid ""
-"Your files seems to be encrypted. If you didn't have enabled the recovery "
-"key there will be no way to get your data back once the password was "
-"resetted. If you are not sure what to do, please contact your administrator "
-"first before continue. Do you really want to continue?"
+"Your files are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
 msgstr ""
 
 #: lostpassword/templates/lostpassword.php:24
 msgid "Yes, I really want to reset my password now"
-msgstr ""
+msgstr "對，我現在想要重設我的密碼。"
 
-#: lostpassword/templates/lostpassword.php:29
+#: lostpassword/templates/lostpassword.php:27
 msgid "Request reset"
 msgstr "請求重設"
 
@@ -462,7 +467,7 @@ msgstr "存取被拒"
 msgid "Cloud not found"
 msgstr "未發現雲端"
 
-#: templates/altmail.php:2
+#: templates/altmail.php:4
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -473,10 +478,6 @@ msgid ""
 "Cheers!"
 msgstr ""
 
-#: templates/altmail.php:7 templates/mail.php:24
-msgid "web services under your control"
-msgstr "由您控制的網路服務"
-
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
 msgstr "編輯分類"
@@ -569,12 +570,12 @@ msgstr "資料庫主機"
 msgid "Finish setup"
 msgstr "完成設定"
 
-#: templates/layout.user.php:40
+#: templates/layout.user.php:43
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr "%s 已經釋出，瞭解更多資訊以進行更新。"
 
-#: templates/layout.user.php:67
+#: templates/layout.user.php:68
 msgid "Log out"
 msgstr "登出"
 
@@ -608,7 +609,7 @@ msgstr "登入"
 msgid "Alternative Logins"
 msgstr "替代登入方法"
 
-#: templates/mail.php:15
+#: templates/mail.php:16
 #, php-format
 msgid ""
 "Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
diff --git a/l10n/zh_TW/files.po b/l10n/zh_TW/files.po
index 2c79b51dd373c1d14f76ea0076be5dddeedce1f9..4625a489d1e4e86d0c5834f3796ed91f5e4ce7b6 100644
--- a/l10n/zh_TW/files.po
+++ b/l10n/zh_TW/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-06-17 02:01+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
-"Last-Translator: pellaeon <nfsmwlin@gmail.com>\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -28,46 +28,54 @@ msgstr "無法移動 %s - 同名的檔案已經存在"
 msgid "Could not move %s"
 msgstr "無法移動 %s"
 
-#: ajax/upload.php:19
+#: ajax/upload.php:16 ajax/upload.php:45
+msgid "Unable to set upload directory."
+msgstr ""
+
+#: ajax/upload.php:22
+msgid "Invalid Token"
+msgstr ""
+
+#: ajax/upload.php:59
 msgid "No file was uploaded. Unknown error"
 msgstr "沒有檔案被上傳。未知的錯誤。"
 
-#: ajax/upload.php:26
+#: ajax/upload.php:66
 msgid "There is no error, the file uploaded with success"
 msgstr "無錯誤，檔案上傳成功"
 
-#: ajax/upload.php:27
+#: ajax/upload.php:67
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr "上傳的檔案大小超過 php.ini 當中 upload_max_filesize 參數的設定："
 
-#: ajax/upload.php:29
+#: ajax/upload.php:69
 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:30
+#: ajax/upload.php:70
 msgid "The uploaded file was only partially uploaded"
 msgstr "只有檔案的一部分被上傳"
 
-#: ajax/upload.php:31
+#: ajax/upload.php:71
 msgid "No file was uploaded"
 msgstr "沒有檔案被上傳"
 
-#: ajax/upload.php:32
+#: ajax/upload.php:72
 msgid "Missing a temporary folder"
 msgstr "找不到暫存資料夾"
 
-#: ajax/upload.php:33
+#: ajax/upload.php:73
 msgid "Failed to write to disk"
 msgstr "寫入硬碟失敗"
 
-#: ajax/upload.php:51
+#: ajax/upload.php:91
 msgid "Not enough storage available"
 msgstr "儲存空間不足"
 
-#: ajax/upload.php:83
+#: ajax/upload.php:123
 msgid "Invalid directory."
 msgstr "無效的資料夾。"
 
@@ -75,6 +83,36 @@ msgstr "無效的資料夾。"
 msgid "Files"
 msgstr "檔案"
 
+#: js/file-upload.js:11
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr "無法上傳您的檔案因為它可能是一個目錄或檔案大小為0"
+
+#: js/file-upload.js:24
+msgid "Not enough space available"
+msgstr "沒有足夠的可用空間"
+
+#: js/file-upload.js:64
+msgid "Upload cancelled."
+msgstr "上傳已取消"
+
+#: js/file-upload.js:167 js/files.js:266
+msgid ""
+"File upload is in progress. Leaving the page now will cancel the upload."
+msgstr "檔案上傳中。離開此頁面將會取消上傳。"
+
+#: js/file-upload.js:233 js/files.js:339
+msgid "URL cannot be empty."
+msgstr "URL 不能為空白。"
+
+#: js/file-upload.js:238 lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr "無效的資料夾名稱，'Shared' 的使用被 ownCloud 保留"
+
+#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
+#: js/files.js:693 js/files.js:731
+msgid "Error"
+msgstr "錯誤"
+
 #: js/fileactions.js:116
 msgid "Share"
 msgstr "分享"
@@ -91,43 +129,43 @@ msgstr "刪除"
 msgid "Rename"
 msgstr "重新命名"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:464
 msgid "Pending"
 msgstr "等候中"
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "{new_name} already exists"
 msgstr "{new_name} 已經存在"
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "replace"
 msgstr "取代"
 
-#: js/filelist.js:259
+#: js/filelist.js:302
 msgid "suggest name"
 msgstr "建議檔名"
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:302 js/filelist.js:304
 msgid "cancel"
 msgstr "取消"
 
-#: js/filelist.js:306
+#: js/filelist.js:349
 msgid "replaced {new_name} with {old_name}"
 msgstr "使用 {new_name} 取代 {old_name}"
 
-#: js/filelist.js:306
+#: js/filelist.js:349
 msgid "undo"
 msgstr "復原"
 
-#: js/filelist.js:331
+#: js/filelist.js:374
 msgid "perform delete operation"
 msgstr "進行刪除動作"
 
-#: js/filelist.js:413
+#: js/filelist.js:456
 msgid "1 file uploading"
 msgstr "1 個檔案正在上傳"
 
-#: js/filelist.js:416 js/filelist.js:470
+#: js/filelist.js:459 js/filelist.js:517
 msgid "files uploading"
 msgstr "檔案正在上傳中"
 
@@ -159,70 +197,42 @@ msgid ""
 "big."
 msgstr "正在準備您的下載，若您的檔案較大，將會需要更多時間。"
 
-#: js/files.js:264
-msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "無法上傳您的檔案因為它可能是一個目錄或檔案大小為0"
-
-#: js/files.js:277
-msgid "Not enough space available"
-msgstr "沒有足夠的可用空間"
-
-#: js/files.js:317
-msgid "Upload cancelled."
-msgstr "上傳已取消"
-
-#: js/files.js:413
-msgid ""
-"File upload is in progress. Leaving the page now will cancel the upload."
-msgstr "檔案上傳中。離開此頁面將會取消上傳。"
-
-#: js/files.js:486
-msgid "URL cannot be empty."
-msgstr "URL 不能為空白。"
-
-#: js/files.js:491
+#: js/files.js:344
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "無效的資料夾名稱，'Shared' 的使用被 ownCloud 保留"
 
-#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
-msgid "Error"
-msgstr "錯誤"
-
-#: js/files.js:877 templates/index.php:69
+#: js/files.js:744 templates/index.php:69
 msgid "Name"
 msgstr "名稱"
 
-#: js/files.js:878 templates/index.php:80
+#: js/files.js:745 templates/index.php:80
 msgid "Size"
 msgstr "大小"
 
-#: js/files.js:879 templates/index.php:82
+#: js/files.js:746 templates/index.php:82
 msgid "Modified"
 msgstr "修改"
 
-#: js/files.js:898
+#: js/files.js:765
 msgid "1 folder"
 msgstr "1 個資料夾"
 
-#: js/files.js:900
+#: js/files.js:767
 msgid "{count} folders"
 msgstr "{count} 個資料夾"
 
-#: js/files.js:908
+#: js/files.js:775
 msgid "1 file"
 msgstr "1 個檔案"
 
-#: js/files.js:910
+#: js/files.js:777
 msgid "{count} files"
 msgstr "{count} 個檔案"
 
-#: lib/app.php:53
-msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
-msgstr "無效的資料夾名稱，'Shared' 的使用被 ownCloud 保留"
-
 #: lib/app.php:73
-msgid "Unable to rename file"
-msgstr "無法重新命名檔案"
+#, php-format
+msgid "%s could not be renamed"
+msgstr ""
 
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
@@ -318,6 +328,22 @@ msgstr "正在掃描檔案，請稍等。"
 msgid "Current scanning"
 msgstr "目前掃描"
 
+#: templates/part.list.php:76
+msgid "directory"
+msgstr ""
+
+#: templates/part.list.php:78
+msgid "directories"
+msgstr ""
+
+#: templates/part.list.php:87
+msgid "file"
+msgstr ""
+
+#: templates/part.list.php:89
+msgid "files"
+msgstr ""
+
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
 msgstr "正在升級檔案系統快取..."
diff --git a/l10n/zh_TW/files_encryption.po b/l10n/zh_TW/files_encryption.po
index 032ac45557c755b43af595f8c1513f94dcd3a0d7..0ad4c062c9a9544888aa3447cd63a4e642a0c1a4 100644
--- a/l10n/zh_TW/files_encryption.po
+++ b/l10n/zh_TW/files_encryption.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-14 02:46+0200\n"
-"PO-Revision-Date: 2013-06-14 00:47+0000\n"
+"POT-Creation-Date: 2013-07-05 02:12+0200\n"
+"PO-Revision-Date: 2013-07-05 00:13+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
@@ -56,9 +56,21 @@ msgstr ""
 
 #: files/error.php:7
 msgid ""
-"Your private key is not valid! Maybe your password was changed from outside."
-" You can update your private key password in your personal settings to "
-"regain access to your files"
+"Your private key is not valid! Likely your password was changed outside the "
+"ownCloud system (e.g. your corporate directory). You can update your private"
+" key password in your personal settings to recover access to your encrypted "
+"files."
+msgstr ""
+
+#: hooks/hooks.php:44
+msgid "Missing requirements."
+msgstr ""
+
+#: hooks/hooks.php:45
+msgid ""
+"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL "
+"PHP extension is enabled and configured properly. For now, the encryption "
+"app has been disabled."
 msgstr ""
 
 #: js/settings-admin.js:11
@@ -85,11 +97,11 @@ msgstr "加密"
 
 #: templates/settings-admin.php:10
 msgid ""
-"Enable encryption passwords recovery key (allow sharing to recovery key):"
+"Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
 #: templates/settings-admin.php:14
-msgid "Recovery account password"
+msgid "Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:21 templates/settings-personal.php:54
@@ -101,15 +113,15 @@ msgid "Disabled"
 msgstr "已停用"
 
 #: templates/settings-admin.php:34
-msgid "Change encryption passwords recovery key:"
-msgstr "變更加密密碼還原金鑰："
+msgid "Change recovery key password:"
+msgstr ""
 
 #: templates/settings-admin.php:41
-msgid "Old Recovery account password"
+msgid "Old Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:48
-msgid "New Recovery account password"
+msgid "New Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:53
diff --git a/l10n/zh_TW/files_external.po b/l10n/zh_TW/files_external.po
index 08202bfdd992d3d6ea31b54e889e85110f79fe23..501d749c0746945374ae023bb7684d2ba369c0c5 100644
--- a/l10n/zh_TW/files_external.po
+++ b/l10n/zh_TW/files_external.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: pellaeon <nfsmwlin@gmail.com>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/zh_TW/files_sharing.po b/l10n/zh_TW/files_sharing.po
index 6b0936e5fc4fb58941b63ebd33d1fd735ab626c5..fa5b8926ab4e9d357d8c58f8c774ad5dc4f40c36 100644
--- a/l10n/zh_TW/files_sharing.po
+++ b/l10n/zh_TW/files_sharing.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
@@ -19,27 +19,39 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: templates/authenticate.php:4
+msgid "The password is wrong. Try again."
+msgstr ""
+
+#: templates/authenticate.php:7
 msgid "Password"
 msgstr "密碼"
 
-#: templates/authenticate.php:6
+#: templates/authenticate.php:9
 msgid "Submit"
 msgstr "送出"
 
-#: templates/public.php:10
+#: templates/public.php:17
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s 和您分享了資料夾 %s "
 
-#: templates/public.php:13
+#: templates/public.php:20
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s 和您分享了檔案 %s"
 
-#: templates/public.php:19 templates/public.php:43
+#: templates/public.php:28 templates/public.php:90
 msgid "Download"
 msgstr "下載"
 
-#: templates/public.php:40
+#: templates/public.php:45 templates/public.php:48
+msgid "Upload"
+msgstr "上傳"
+
+#: templates/public.php:58
+msgid "Cancel upload"
+msgstr "取消上傳"
+
+#: templates/public.php:87
 msgid "No preview available for"
 msgstr "無法預覽"
diff --git a/l10n/zh_TW/files_trashbin.po b/l10n/zh_TW/files_trashbin.po
index 9f259beac2d5c9d9473b1d9f8a36305990c9987a..87cc2062fc5580f5a825d19a97c96887691439fb 100644
--- a/l10n/zh_TW/files_trashbin.po
+++ b/l10n/zh_TW/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:16+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/zh_TW/lib.po b/l10n/zh_TW/lib.po
index 7f50bfecd6f0d7fa1a88cd57270ec07fd59690df..018999a9b2444aee993003f99eab1285dd13004a 100644
--- a/l10n/zh_TW/lib.po
+++ b/l10n/zh_TW/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-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
-"Last-Translator: pellaeon <nfsmwlin@gmail.com>\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,43 +18,47 @@ msgstr ""
 "Language: zh_TW\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: app.php:359
+#: app.php:360
 msgid "Help"
 msgstr "說明"
 
-#: app.php:372
+#: app.php:373
 msgid "Personal"
 msgstr "個人"
 
-#: app.php:383
+#: app.php:384
 msgid "Settings"
 msgstr "設定"
 
-#: app.php:395
+#: app.php:396
 msgid "Users"
 msgstr "使用者"
 
-#: app.php:408
+#: app.php:409
 msgid "Apps"
 msgstr "應用程式"
 
-#: app.php:416
+#: app.php:417
 msgid "Admin"
 msgstr "管理"
 
-#: files.php:210
+#: defaults.php:33
+msgid "web services under your control"
+msgstr "由您控制的網路服務"
+
+#: files.php:226
 msgid "ZIP download is turned off."
 msgstr "ZIP 下載已關閉。"
 
-#: files.php:211
+#: files.php:227
 msgid "Files need to be downloaded one by one."
 msgstr "檔案需要逐一下載。"
 
-#: files.php:212 files.php:245
+#: files.php:228 files.php:261
 msgid "Back to Files"
 msgstr "回到檔案列表"
 
-#: files.php:242
+#: files.php:258
 msgid "Selected files too large to generate zip file."
 msgstr "選擇的檔案太大以致於無法產生壓縮檔。"
 
@@ -86,104 +90,102 @@ msgstr "文字"
 msgid "Images"
 msgstr "圖片"
 
-#: setup.php:34
-msgid "Set an admin username."
-msgstr "設定管理員帳號。"
-
-#: setup.php:37
-msgid "Set an admin password."
-msgstr "設定管理員密碼。"
-
-#: setup.php:55
+#: setup/abstractdatabase.php:22
 #, php-format
 msgid "%s enter the database username."
 msgstr "%s 輸入資料庫使用者名稱。"
 
-#: setup.php:58
+#: setup/abstractdatabase.php:25
 #, php-format
 msgid "%s enter the database name."
 msgstr "%s 輸入資料庫名稱。"
 
-#: setup.php:61
+#: setup/abstractdatabase.php:28
 #, php-format
 msgid "%s you may not use dots in the database name"
 msgstr "%s 資料庫名稱不能包含小數點"
 
-#: setup.php:64
+#: setup/mssql.php:20
 #, php-format
-msgid "%s set the database host."
-msgstr "%s 設定資料庫主機。"
-
-#: setup.php:126 setup.php:332 setup.php:377
-msgid "PostgreSQL username and/or password not valid"
-msgstr "PostgreSQL 用戶名和/或密碼無效"
+msgid "MS SQL username and/or password not valid: %s"
+msgstr "MS SQL 使用者和/或密碼無效：%s"
 
-#: setup.php:127 setup.php:235
+#: setup/mssql.php:21 setup/mysql.php:13 setup/oci.php:114
+#: setup/postgresql.php:24 setup/postgresql.php:70
 msgid "You need to enter either an existing account or the administrator."
 msgstr "您必須輸入一個現有的帳號或管理員帳號。"
 
-#: setup.php:152
-msgid "Oracle connection could not be established"
-msgstr "無法建立 Oracle 資料庫連線"
-
-#: setup.php:234
+#: setup/mysql.php:12
 msgid "MySQL username and/or password not valid"
 msgstr "MySQL 用戶名和/或密碼無效"
 
-#: setup.php:288 setup.php:398 setup.php:407 setup.php:425 setup.php:435
-#: setup.php:444 setup.php:477 setup.php:543 setup.php:569 setup.php:576
-#: setup.php:587 setup.php:594 setup.php:603 setup.php:611 setup.php:620
-#: setup.php:626
+#: setup/mysql.php:67 setup/oci.php:54 setup/oci.php:121 setup/oci.php:147
+#: setup/oci.php:154 setup/oci.php:165 setup/oci.php:172 setup/oci.php:181
+#: setup/oci.php:189 setup/oci.php:198 setup/oci.php:204
+#: setup/postgresql.php:89 setup/postgresql.php:98 setup/postgresql.php:115
+#: setup/postgresql.php:125 setup/postgresql.php:134
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr "資料庫錯誤：\"%s\""
 
-#: setup.php:289 setup.php:399 setup.php:408 setup.php:426 setup.php:436
-#: setup.php:445 setup.php:478 setup.php:544 setup.php:570 setup.php:577
-#: setup.php:588 setup.php:604 setup.php:612 setup.php:621
+#: setup/mysql.php:68 setup/oci.php:55 setup/oci.php:122 setup/oci.php:148
+#: setup/oci.php:155 setup/oci.php:166 setup/oci.php:182 setup/oci.php:190
+#: setup/oci.php:199 setup/postgresql.php:90 setup/postgresql.php:99
+#: setup/postgresql.php:116 setup/postgresql.php:126 setup/postgresql.php:135
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr "有問題的指令是：\"%s\""
 
-#: setup.php:305
+#: setup/mysql.php:85
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr "MySQL 使用者 '%s'@'localhost' 已經存在。"
 
-#: setup.php:306
+#: setup/mysql.php:86
 msgid "Drop this user from MySQL"
 msgstr "在 MySQL 移除這個使用者"
 
-#: setup.php:311
+#: setup/mysql.php:91
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr "MySQL 使用者 '%s'@'%%' 已經存在"
 
-#: setup.php:312
+#: setup/mysql.php:92
 msgid "Drop this user from MySQL."
 msgstr "在 MySQL 移除這個使用者。"
 
-#: setup.php:469 setup.php:536
+#: setup/oci.php:34
+msgid "Oracle connection could not be established"
+msgstr "無法建立 Oracle 資料庫連線"
+
+#: setup/oci.php:41 setup/oci.php:113
 msgid "Oracle username and/or password not valid"
 msgstr "Oracle 用戶名和/或密碼無效"
 
-#: setup.php:595 setup.php:627
+#: setup/oci.php:173 setup/oci.php:205
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr "有問題的指令是：\"%s\" ，使用者：\"%s\"，密碼：\"%s\""
 
-#: setup.php:647
-#, php-format
-msgid "MS SQL username and/or password not valid: %s"
-msgstr "MS SQL 使用者和/或密碼無效：%s"
+#: setup/postgresql.php:23 setup/postgresql.php:69
+msgid "PostgreSQL username and/or password not valid"
+msgstr "PostgreSQL 用戶名和/或密碼無效"
+
+#: setup.php:42
+msgid "Set an admin username."
+msgstr "設定管理員帳號。"
+
+#: setup.php:45
+msgid "Set an admin password."
+msgstr "設定管理員密碼。"
 
-#: setup.php:870
+#: setup.php:198
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "您的網頁伺服器尚未被正確設定來進行檔案同步，因為您的 WebDAV 界面似乎無法使用。"
 
-#: setup.php:871
+#: setup.php:199
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "請參考<a href='%s'>安裝指南</a>。"
diff --git a/l10n/zh_TW/settings.po b/l10n/zh_TW/settings.po
index 663a8cbb80289c7f905ffc1386eca10aeb049bad..e67062589cd2f584c68781ce6c38969671393625 100644
--- a/l10n/zh_TW/settings.po
+++ b/l10n/zh_TW/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:23+0000\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
@@ -89,35 +89,35 @@ msgstr "使用者移出群組%s錯誤"
 msgid "Couldn't update app."
 msgstr "無法更新應用程式"
 
-#: js/apps.js:30
+#: js/apps.js:35
 msgid "Update to {appversion}"
 msgstr "更新至 {appversion}"
 
-#: js/apps.js:36 js/apps.js:76
+#: js/apps.js:41 js/apps.js:81
 msgid "Disable"
 msgstr "停用"
 
-#: js/apps.js:36 js/apps.js:64 js/apps.js:83
+#: js/apps.js:41 js/apps.js:69 js/apps.js:88
 msgid "Enable"
 msgstr "啟用"
 
-#: js/apps.js:55
+#: js/apps.js:60
 msgid "Please wait...."
 msgstr "請稍候..."
 
-#: js/apps.js:59 js/apps.js:71 js/apps.js:80 js/apps.js:93
+#: js/apps.js:64 js/apps.js:76 js/apps.js:85 js/apps.js:98
 msgid "Error"
 msgstr "錯誤"
 
-#: js/apps.js:90
+#: js/apps.js:95
 msgid "Updating...."
 msgstr "更新中..."
 
-#: js/apps.js:93
+#: js/apps.js:98
 msgid "Error while updating app"
 msgstr "更新應用程式錯誤"
 
-#: js/apps.js:96
+#: js/apps.js:101
 msgid "Updated"
 msgstr "已更新"
 
@@ -166,15 +166,15 @@ msgstr "創建用戶時出現錯誤"
 msgid "A valid password must be provided"
 msgstr "一定要提供一個有效的密碼"
 
-#: personal.php:35 personal.php:36
+#: personal.php:37 personal.php:38
 msgid "__language_name__"
 msgstr "__語言_名稱__"
 
-#: templates/admin.php:15
+#: templates/admin.php:17
 msgid "Security Warning"
 msgstr "安全性警告"
 
-#: templates/admin.php:18
+#: templates/admin.php:20
 msgid ""
 "Your data directory and your files are probably accessible from the "
 "internet. The .htaccess file that ownCloud provides is not working. We "
@@ -183,36 +183,36 @@ msgid ""
 " webserver document root."
 msgstr "您的資料目錄 (Data Directory) 和檔案可能可以由網際網路上面公開存取。Owncloud 所提供的 .htaccess 設定檔並未生效，我們強烈建議您設定您的網頁伺服器以防止資料目錄被公開存取，或將您的資料目錄移出網頁伺服器的 document root 。"
 
-#: templates/admin.php:29
+#: templates/admin.php:31
 msgid "Setup Warning"
 msgstr "設定警告"
 
-#: templates/admin.php:32
+#: templates/admin.php:34
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "您的網頁伺服器尚未被正確設定來進行檔案同步，因為您的 WebDAV 界面似乎無法使用。"
 
-#: templates/admin.php:33
+#: templates/admin.php:35
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "請參考<a href='%s'>安裝指南</a>。"
 
-#: templates/admin.php:44
+#: templates/admin.php:46
 msgid "Module 'fileinfo' missing"
 msgstr "遺失 'fileinfo' 模組"
 
-#: templates/admin.php:47
+#: templates/admin.php:49
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr "未偵測到 PHP 模組 'fileinfo'。我們強烈建議啟用這個模組以取得最好的 mime-type 支援。"
 
-#: templates/admin.php:58
+#: templates/admin.php:60
 msgid "Locale not working"
 msgstr "語系無法運作"
 
-#: templates/admin.php:63
+#: templates/admin.php:65
 #, php-format
 msgid ""
 "This ownCloud server can't set system locale to %s. This means that there "
@@ -220,11 +220,11 @@ msgid ""
 " to install the required packages on your system to support %s."
 msgstr "ownCloud 伺服器無法將系統語系設為 %s ，可能有一些檔名中的字元有問題，建議您安裝所有所需的套件以支援 %s 。"
 
-#: templates/admin.php:75
+#: templates/admin.php:77
 msgid "Internet connection not working"
 msgstr "去連線"
 
-#: templates/admin.php:78
+#: templates/admin.php:80
 msgid ""
 "This ownCloud server has no working internet connection. This means that "
 "some of the features like mounting of external storage, notifications about "
@@ -234,102 +234,102 @@ msgid ""
 " of ownCloud."
 msgstr "這臺 ownCloud 伺服器沒有連接到網際網路，因此有些功能像是掛載外部儲存空間、更新 ownCloud 或應用程式的通知沒有辦法運作。透過網際網路存取檔案還有電子郵件通知可能也無法運作。如果想要 ownCloud 完整的功能，建議您將這臺伺服器連接至網際網路。"
 
-#: templates/admin.php:92
+#: templates/admin.php:94
 msgid "Cron"
 msgstr "定期執行"
 
-#: templates/admin.php:101
+#: templates/admin.php:103
 msgid "Execute one task with each page loaded"
 msgstr "當頁面載入時，執行"
 
-#: templates/admin.php:111
+#: templates/admin.php:113
 msgid ""
 "cron.php is registered at a webcron service. Call the cron.php page in the "
 "owncloud root once a minute over http."
 msgstr "cron.php 已經在 webcron 服務當中註冊，請每分鐘透過 HTTP 呼叫 ownCloud 根目錄當中的 cron.php 一次。"
 
-#: templates/admin.php:121
+#: templates/admin.php:123
 msgid ""
 "Use systems cron service. Call the cron.php file in the owncloud folder via "
 "a system cronjob once a minute."
 msgstr "使用系統的 cron 服務，每分鐘執行一次 owncloud 資料夾中的 cron.php 。"
 
-#: templates/admin.php:128
+#: templates/admin.php:130
 msgid "Sharing"
 msgstr "分享"
 
-#: templates/admin.php:134
+#: templates/admin.php:136
 msgid "Enable Share API"
 msgstr "啟用分享 API"
 
-#: templates/admin.php:135
+#: templates/admin.php:137
 msgid "Allow apps to use the Share API"
 msgstr "允許 apps 使用分享 API"
 
-#: templates/admin.php:142
+#: templates/admin.php:144
 msgid "Allow links"
 msgstr "允許連結"
 
-#: templates/admin.php:143
+#: templates/admin.php:145
 msgid "Allow users to share items to the public with links"
 msgstr "允許使用者透過公開的連結分享檔案"
 
-#: templates/admin.php:150
+#: templates/admin.php:152
 msgid "Allow resharing"
 msgstr "允許轉貼分享"
 
-#: templates/admin.php:151
+#: templates/admin.php:153
 msgid "Allow users to share items shared with them again"
 msgstr "允許使用者分享其他使用者分享給他的檔案"
 
-#: templates/admin.php:158
+#: templates/admin.php:160
 msgid "Allow users to share with anyone"
 msgstr "允許使用者與任何人分享檔案"
 
-#: templates/admin.php:161
+#: templates/admin.php:163
 msgid "Allow users to only share with users in their groups"
 msgstr "僅允許使用者在群組內分享"
 
-#: templates/admin.php:168
+#: templates/admin.php:170
 msgid "Security"
 msgstr "安全性"
 
-#: templates/admin.php:181
+#: templates/admin.php:183
 msgid "Enforce HTTPS"
 msgstr "強制啟用 HTTPS"
 
-#: templates/admin.php:182
+#: templates/admin.php:184
 msgid ""
 "Enforces the clients to connect to ownCloud via an encrypted connection."
 msgstr "強制指定用戶端使用加密的連線連接到 ownCloud"
 
-#: templates/admin.php:185
+#: templates/admin.php:187
 msgid ""
 "Please connect to this ownCloud instance via HTTPS to enable or disable the "
 "SSL enforcement."
 msgstr "請使用 HTTPS 連線到 ownCloud，或是關閉強制使用 SSL 的選項。"
 
-#: templates/admin.php:195
+#: templates/admin.php:197
 msgid "Log"
 msgstr "紀錄"
 
-#: templates/admin.php:196
+#: templates/admin.php:198
 msgid "Log level"
 msgstr "紀錄層級"
 
-#: templates/admin.php:227
+#: templates/admin.php:229
 msgid "More"
 msgstr "更多"
 
-#: templates/admin.php:228
+#: templates/admin.php:230
 msgid "Less"
 msgstr "å°‘"
 
-#: templates/admin.php:235 templates/personal.php:116
+#: templates/admin.php:236 templates/personal.php:116
 msgid "Version"
 msgstr "版本"
 
-#: templates/admin.php:237 templates/personal.php:119
+#: templates/admin.php:240 templates/personal.php:119
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -387,76 +387,79 @@ msgstr "Bugtracker"
 msgid "Commercial Support"
 msgstr "商用支援"
 
-#: templates/personal.php:9
+#: templates/personal.php:10
 msgid "Get the apps to sync your files"
 msgstr "下載應用程式來同步您的檔案"
 
-#: templates/personal.php:20
+#: templates/personal.php:21
 msgid "Show First Run Wizard again"
 msgstr "再次顯示首次使用精靈"
 
-#: templates/personal.php:28
+#: templates/personal.php:29
 #, php-format
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "您已經使用了 <strong>%s</strong> ，目前可用空間為 <strong>%s</strong>"
 
-#: templates/personal.php:40 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:41 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "密碼"
 
-#: templates/personal.php:41
+#: templates/personal.php:42
 msgid "Your password was changed"
 msgstr "你的密碼已更改"
 
-#: templates/personal.php:42
+#: templates/personal.php:43
 msgid "Unable to change your password"
 msgstr "無法變更您的密碼"
 
-#: templates/personal.php:43
+#: templates/personal.php:44
 msgid "Current password"
 msgstr "目前密碼"
 
-#: templates/personal.php:45
+#: templates/personal.php:46
 msgid "New password"
 msgstr "新密碼"
 
-#: templates/personal.php:47
+#: templates/personal.php:48
 msgid "Change password"
 msgstr "變更密碼"
 
-#: templates/personal.php:59 templates/users.php:85
+#: templates/personal.php:60 templates/users.php:85
 msgid "Display Name"
 msgstr "顯示名稱"
 
-#: templates/personal.php:74
+#: templates/personal.php:75
 msgid "Email"
 msgstr "ä¿¡ç®±"
 
-#: templates/personal.php:76
+#: templates/personal.php:77
 msgid "Your email address"
 msgstr "您的電子郵件信箱"
 
-#: templates/personal.php:77
+#: templates/personal.php:78
 msgid "Fill in an email address to enable password recovery"
 msgstr "請填入電子郵件信箱以便回復密碼"
 
-#: templates/personal.php:86 templates/personal.php:87
+#: templates/personal.php:87 templates/personal.php:88
 msgid "Language"
 msgstr "語言"
 
-#: templates/personal.php:99
+#: templates/personal.php:100
 msgid "Help translate"
 msgstr "幫助翻譯"
 
-#: templates/personal.php:105
+#: templates/personal.php:106
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:107
-msgid "Use this address to connect to your ownCloud in your file manager"
-msgstr "在您的檔案管理員中使用這個地址來連線到 ownCloud"
+#: templates/personal.php:108
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
+"target=\"_blank\">access your Files via WebDAV</a>"
+msgstr ""
 
-#: templates/users.php:21 templates/users.php:84
+#: templates/users.php:21
 msgid "Login Name"
 msgstr "登入名稱"
 
@@ -486,6 +489,10 @@ msgstr "無限制"
 msgid "Other"
 msgstr "其他"
 
+#: templates/users.php:84
+msgid "Username"
+msgstr "使用者名稱"
+
 #: templates/users.php:91
 msgid "Storage"
 msgstr "儲存區"
diff --git a/l10n/zh_TW/user_ldap.po b/l10n/zh_TW/user_ldap.po
index 4b878bf470a143a7e622369b3de0aae6c7f65465..d322f5a8dbcb831ccaf695e310353a32198ddb9e 100644
--- a/l10n/zh_TW/user_ldap.po
+++ b/l10n/zh_TW/user_ldap.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# chenanyeh <chnjsn1221@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 23:25+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-07-10 02:13+0200\n"
+"PO-Revision-Date: 2013-07-09 23:16+0000\n"
+"Last-Translator: chenanyeh <chnjsn1221@gmail.com>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,27 +20,27 @@ msgstr ""
 
 #: ajax/clearMappings.php:34
 msgid "Failed to clear the mappings."
-msgstr ""
+msgstr "清除映射失敗"
 
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
-msgstr ""
+msgstr "刪除伺服器設定時失敗"
 
 #: ajax/testConfiguration.php:36
 msgid "The configuration is valid and the connection could be established!"
-msgstr ""
+msgstr "設定有效且連線可建立"
 
 #: ajax/testConfiguration.php:39
 msgid ""
 "The configuration is valid, but the Bind failed. Please check the server "
 "settings and credentials."
-msgstr ""
+msgstr "設定有效但連線無法建立。請檢查伺服器的設定與認證資料。"
 
 #: ajax/testConfiguration.php:43
 msgid ""
 "The configuration is invalid. Please look in the ownCloud log for further "
 "details."
-msgstr ""
+msgstr "設定無效。更多細節請參閱ownCloud的記錄檔。"
 
 #: js/settings.js:66
 msgid "Deletion failed"
@@ -47,19 +48,19 @@ msgstr "移除失敗"
 
 #: js/settings.js:82
 msgid "Take over settings from recent server configuration?"
-msgstr ""
+msgstr "要使用最近一次的伺服器設定嗎?"
 
 #: js/settings.js:83
 msgid "Keep settings?"
-msgstr ""
+msgstr "維持設定嗎?"
 
 #: js/settings.js:97
 msgid "Cannot add server configuration"
-msgstr ""
+msgstr "無法新增伺服器設定"
 
 #: js/settings.js:111
 msgid "mappings cleared"
-msgstr ""
+msgstr "映射已清除"
 
 #: js/settings.js:112
 msgid "Success"
@@ -71,40 +72,40 @@ msgstr "錯誤"
 
 #: js/settings.js:141
 msgid "Connection test succeeded"
-msgstr ""
+msgstr "連線測試成功"
 
 #: js/settings.js:146
 msgid "Connection test failed"
-msgstr ""
+msgstr "連線測試失敗"
 
 #: js/settings.js:156
 msgid "Do you really want to delete the current Server Configuration?"
-msgstr ""
+msgstr "您真的確定要刪除現在的伺服器設定嗎?"
 
 #: js/settings.js:157
 msgid "Confirm Deletion"
-msgstr ""
+msgstr "確認已刪除"
 
 #: templates/settings.php:9
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
 " experience unexpected behaviour. Please ask your system administrator to "
 "disable one of them."
-msgstr ""
+msgstr "<b>警告:</b> 應用程式user_ldap和user_webdavauth互不相容。可能會造成無法預期的結果。請要求您的系統管理員將兩者其中之一停用。"
 
 #: templates/settings.php:12
 msgid ""
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
 "work. Please ask your system administrator to install it."
-msgstr ""
+msgstr "<b>警告:</b>沒有安裝 PHP LDAP 模組，後端系統將無法運作。請要求您的系統管理員安裝模組。"
 
 #: templates/settings.php:16
 msgid "Server configuration"
-msgstr ""
+msgstr "伺服器設定"
 
 #: templates/settings.php:32
 msgid "Add Server Configuration"
-msgstr ""
+msgstr "新增伺服器設定"
 
 #: templates/settings.php:37
 msgid "Host"
@@ -113,7 +114,7 @@ msgstr "主機"
 #: templates/settings.php:39
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
-msgstr ""
+msgstr "若您不需要SSL加密傳輸則可忽略通訊協定。若非如此請從ldaps://開始"
 
 #: templates/settings.php:40
 msgid "Base DN"
@@ -121,11 +122,11 @@ msgstr ""
 
 #: templates/settings.php:41
 msgid "One Base DN per line"
-msgstr ""
+msgstr "一行一個Base DN"
 
 #: templates/settings.php:42
 msgid "You can specify Base DN for users and groups in the Advanced tab"
-msgstr ""
+msgstr "您可以在進階標籤頁裡面指定使用者及群組的Base DN"
 
 #: templates/settings.php:44
 msgid "User DN"
@@ -136,7 +137,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 "客戶端使用者的DN與特定字詞的連結需要完善，例如:uid=agent,dc=example,dc=com。若是匿名連接，則將DN與密碼欄位留白。"
 
 #: templates/settings.php:47
 msgid "Password"
@@ -144,59 +145,59 @@ msgstr "密碼"
 
 #: templates/settings.php:50
 msgid "For anonymous access, leave DN and Password empty."
-msgstr ""
+msgstr "匿名連接時請將DN與密碼欄位留白"
 
 #: templates/settings.php:51
 msgid "User Login Filter"
-msgstr ""
+msgstr "使用者登入過濾器"
 
 #: templates/settings.php:54
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action."
-msgstr ""
+msgstr "試圖登入時會定義要套用的篩選器。登入過程中%%uid會取代使用者名稱。"
 
 #: templates/settings.php:55
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr ""
+msgstr "請使用 %%uid placeholder，例如:\"uid=%%uid\""
 
 #: templates/settings.php:56
 msgid "User List Filter"
-msgstr ""
+msgstr "使用者名單篩選器"
 
 #: templates/settings.php:59
 msgid "Defines the filter to apply, when retrieving users."
-msgstr ""
+msgstr "檢索使用者時定義要套用的篩選器"
 
 #: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
-msgstr ""
+msgstr "請勿使用任何placeholder，例如:\"objectClass=person\"。"
 
 #: templates/settings.php:61
 msgid "Group Filter"
-msgstr ""
+msgstr "群組篩選器"
 
 #: templates/settings.php:64
 msgid "Defines the filter to apply, when retrieving groups."
-msgstr ""
+msgstr "檢索群組時，定義要套用的篩選器"
 
 #: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
-msgstr ""
+msgstr "請勿使用任何placeholder，例如:\"objectClass=posixGroup\"。"
 
 #: templates/settings.php:69
 msgid "Connection Settings"
-msgstr ""
+msgstr "連線設定"
 
 #: templates/settings.php:71
 msgid "Configuration Active"
-msgstr ""
+msgstr "設定為主動模式"
 
 #: templates/settings.php:71
 msgid "When unchecked, this configuration will be skipped."
-msgstr ""
+msgstr "沒有被勾選時，此設定會被略過。"
 
 #: templates/settings.php:72
 msgid "Port"
@@ -204,25 +205,25 @@ msgstr "連接阜"
 
 #: templates/settings.php:73
 msgid "Backup (Replica) Host"
-msgstr ""
+msgstr "備用主機"
 
 #: templates/settings.php:73
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
-msgstr ""
+msgstr "請給定一個可選的備用主機。必須是LDAP/AD中央伺服器的複本。"
 
 #: templates/settings.php:74
 msgid "Backup (Replica) Port"
-msgstr ""
+msgstr "備用(複本)連接阜"
 
 #: templates/settings.php:75
 msgid "Disable Main Server"
-msgstr ""
+msgstr "停用主伺服器"
 
 #: templates/settings.php:75
 msgid "When switched on, ownCloud will only connect to the replica server."
-msgstr ""
+msgstr "當開關打開時，ownCloud將只會連接複本伺服器。"
 
 #: templates/settings.php:76
 msgid "Use TLS"
@@ -234,7 +235,7 @@ msgstr ""
 
 #: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
-msgstr ""
+msgstr "不區分大小寫的LDAP伺服器(Windows)"
 
 #: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
@@ -244,51 +245,51 @@ msgstr "關閉 SSL 憑證驗證"
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
-msgstr ""
+msgstr "若連線只有在此選項開啟時運作，請匯入LDAP伺服器的SSL認證到您的ownCloud伺服器。"
 
 #: templates/settings.php:78
 msgid "Not recommended, use for testing only."
-msgstr ""
+msgstr "不推薦使用，僅供測試用途。"
 
 #: templates/settings.php:79
 msgid "Cache Time-To-Live"
-msgstr ""
+msgstr "快取的存活時間"
 
 #: templates/settings.php:79
 msgid "in seconds. A change empties the cache."
-msgstr ""
+msgstr "以秒為單位。更變後會清空快取。"
 
 #: templates/settings.php:81
 msgid "Directory Settings"
-msgstr ""
+msgstr "目錄選項"
 
 #: templates/settings.php:83
 msgid "User Display Name Field"
-msgstr ""
+msgstr "使用者名稱欄位"
 
 #: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
-msgstr ""
+msgstr "用於產生ownCloud名稱"
 
 #: templates/settings.php:84
 msgid "Base User Tree"
-msgstr ""
+msgstr "Base使用者數"
 
 #: templates/settings.php:84
 msgid "One User Base DN per line"
-msgstr ""
+msgstr "一行一個使用者Base DN"
 
 #: templates/settings.php:85
 msgid "User Search Attributes"
-msgstr ""
+msgstr "使用者搜索屬性"
 
 #: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
-msgstr ""
+msgstr "可選的; 一行一項屬性"
 
 #: templates/settings.php:86
 msgid "Group Display Name Field"
-msgstr ""
+msgstr "群組顯示名稱欄位"
 
 #: templates/settings.php:86
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
@@ -296,53 +297,53 @@ msgstr ""
 
 #: templates/settings.php:87
 msgid "Base Group Tree"
-msgstr ""
+msgstr "Base群組樹"
 
 #: templates/settings.php:87
 msgid "One Group Base DN per line"
-msgstr ""
+msgstr "一行一個群組Base DN"
 
 #: templates/settings.php:88
 msgid "Group Search Attributes"
-msgstr ""
+msgstr "群組搜索屬性"
 
 #: templates/settings.php:89
 msgid "Group-Member association"
-msgstr ""
+msgstr "群組成員的關係"
 
 #: templates/settings.php:91
 msgid "Special Attributes"
-msgstr ""
+msgstr "特殊屬性"
 
 #: templates/settings.php:93
 msgid "Quota Field"
-msgstr ""
+msgstr "配額欄位"
 
 #: templates/settings.php:94
 msgid "Quota Default"
-msgstr ""
+msgstr "預設配額"
 
 #: templates/settings.php:94
 msgid "in bytes"
-msgstr ""
+msgstr "以位元組為單位"
 
 #: templates/settings.php:95
 msgid "Email Field"
-msgstr ""
+msgstr "電郵欄位"
 
 #: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
-msgstr ""
+msgstr "使用者家目錄的命名規則"
 
 #: templates/settings.php:96
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
-msgstr ""
+msgstr "使用者名稱請留白(預設)。若不留白請指定一個LDAP/AD屬性。"
 
 #: templates/settings.php:101
 msgid "Internal Username"
-msgstr ""
+msgstr "內部使用者名稱"
 
 #: templates/settings.php:102
 msgid ""
@@ -412,7 +413,7 @@ msgstr ""
 
 #: templates/settings.php:111
 msgid "Test Configuration"
-msgstr ""
+msgstr "測試此設定"
 
 #: templates/settings.php:111
 msgid "Help"
diff --git a/lib/api.php b/lib/api.php
index fc76836995be415ae104b422b17606ced32c8133..31f3f968d9b67ef41183e8005665872dd46e652e 100644
--- a/lib/api.php
+++ b/lib/api.php
@@ -67,6 +67,8 @@ class OC_API {
 			OC::getRouter()->useCollection('ocs');
 			OC::getRouter()->create($name, $url)
 				->method($method)
+				->defaults($defaults)
+				->requirements($requirements)
 				->action('OC_API', 'call');
 			self::$actions[$name] = array();
 		}
diff --git a/lib/app.php b/lib/app.php
index f974dd9f594d0330f6f48dd6219ab9cd1cf394e4..f9b1c5ca7b55c21c065568ce135d2a6e2fd3f7f9 100644
--- a/lib/app.php
+++ b/lib/app.php
@@ -259,6 +259,7 @@ class OC_App{
 	 */
 	public static function disable( $app ) {
 		// check if app is a shipped app or not. if not delete
+		\OC_Hook::emit('OC_App', 'pre_disable', array('app' => $app));
 		OC_Appconfig::setValue( $app, 'enabled', 'no' );
 
 		// check if app is a shipped app or not. if not delete
diff --git a/lib/autoloader.php b/lib/autoloader.php
index 9615838a9a2a27d608621ad32cf8eddb6e0ac5e2..21170639092029561eefb9e9aa0212d5202bb09d 100644
--- a/lib/autoloader.php
+++ b/lib/autoloader.php
@@ -96,8 +96,8 @@ class Autoloader {
 		} else {
 			foreach ($this->prefixPaths as $prefix => $dir) {
 				if (0 === strpos($class, $prefix)) {
-					$path = str_replace('\\', DIRECTORY_SEPARATOR, $class) . '.php';
-					$path = str_replace('_', DIRECTORY_SEPARATOR, $path);
+					$path = str_replace('\\', '/', $class) . '.php';
+					$path = str_replace('_', '/', $path);
 					$paths[] = $dir . '/' . $path;
 				}
 			}
diff --git a/lib/base.php b/lib/base.php
index 4ef524e49e741277e88250dda268c5bfda2c2be4..c40453f2f593dcc6ec1e316c545e0d60bd8c2671 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -173,11 +173,12 @@ class OC {
 	public static function checkConfig() {
 		if (file_exists(OC::$SERVERROOT . "/config/config.php")
 			and !is_writable(OC::$SERVERROOT . "/config/config.php")) {
+			$defaults = new OC_Defaults();
 			$tmpl = new OC_Template('', 'error', 'guest');
 			$tmpl->assign('errors', array(1 => array(
 				'error' => "Can't write into config directory 'config'",
-				'hint' => 'You can usually fix this by giving the webserver user write access'
-					.' to the config directory in owncloud'
+				'hint' => 'This can usually be fixed by '
+					.'<a href="' . $defaults->getDocBaseUrl() . '/server/5.0/admin_manual/installation/installation_source.html#set-the-directory-permissions" target="_blank">giving the webserver write access to the config directory</a>.'
 			)));
 			$tmpl->printPage();
 			exit();
@@ -288,14 +289,14 @@ class OC {
 		$cookie_path = OC::$WEBROOT ?: '/';
 		ini_set('session.cookie_path', $cookie_path);
 
+		//set the session object to a dummy session so code relying on the session existing still works
+		self::$session = new \OC\Session\Memory('');
+		
 		try{
 			// set the session name to the instance id - which is unique
 			self::$session = new \OC\Session\Internal(OC_Util::getInstanceId());
 			// if session cant be started break with http 500 error
 		}catch (Exception $e){
-			//set the session object to a dummy session so code relying on the session existing still works
-			self::$session = new \OC\Session\Memory('');
-
 			OC_Log::write('core', 'Session could not be initialized',
 				OC_Log::ERROR);
 
@@ -311,16 +312,17 @@ class OC {
 			exit();
 		}
 
+		$sessionLifeTime = self::getSessionLifeTime();
 		// regenerate session id periodically to avoid session fixation
 		if (!self::$session->exists('SID_CREATED')) {
 			self::$session->set('SID_CREATED', time());
-		} else if (time() - self::$session->get('SID_CREATED') > 60*60*12) {
+		} else if (time() - self::$session->get('SID_CREATED') > $sessionLifeTime / 2) {
 			session_regenerate_id(true);
 			self::$session->set('SID_CREATED', time());
 		}
 
 		// session timeout
-		if (self::$session->exists('LAST_ACTIVITY') && (time() - self::$session->get('LAST_ACTIVITY') > 60*60*24)) {
+		if (self::$session->exists('LAST_ACTIVITY') && (time() - self::$session->get('LAST_ACTIVITY') > $sessionLifeTime)) {
 			if (isset($_COOKIE[session_name()])) {
 				setcookie(session_name(), '', time() - 42000, $cookie_path);
 			}
@@ -332,6 +334,13 @@ class OC {
 		self::$session->set('LAST_ACTIVITY', time());
 	}
 
+	/**
+	 * @return int
+	 */
+	private static function getSessionLifeTime() {
+		return OC_Config::getValue('session_lifetime', 60 * 60 * 24);
+	}
+
 	public static function getRouter() {
 		if (!isset(OC::$router)) {
 			OC::$router = new OC_Router();
@@ -393,9 +402,6 @@ class OC {
 		@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'];
@@ -455,6 +461,10 @@ class OC {
 			exit;
 		}
 
+		//try to set the session lifetime
+		$sessionLifeTime = self::getSessionLifeTime();
+		@ini_set('gc_maxlifetime', (string)$sessionLifeTime);
+
 		// User and Groups
 		if (!OC_Config::getValue("installed", false)) {
 			self::$session->set('user_id','');
diff --git a/lib/config.php b/lib/config.php
index 3cbb89fb98138c0de2398a2eaf924ed1d5189ff5..7dd596fcea57d3582d4aea9fc005c593efadebab 100644
--- a/lib/config.php
+++ b/lib/config.php
@@ -132,6 +132,9 @@ class OC_Config{
 
 		// read all file in config dir ending by config.php
 		$config_files = glob( OC::$SERVERROOT."/config/*.config.php");
+		if (!is_array($config_files)) {
+			$config_files = array();
+		}
 
 		//Filter only regular files
 		$config_files = array_filter($config_files, 'is_file');
@@ -144,7 +147,7 @@ class OC_Config{
 
 		//Include file and merge config
 		foreach($config_files as $file){
-			include $file;
+			@include $file;
 			if( isset( $CONFIG ) && is_array( $CONFIG )) {
 				self::$cache = array_merge(self::$cache, $CONFIG);
 			}
@@ -165,6 +168,7 @@ class OC_Config{
 	 */
 	public static function writeData() {
 		// Create a php file ...
+		$defaults = new OC_Defaults;
 		$content = "<?php\n ";
 		if (defined('DEBUG') && DEBUG) {
 			$content .= "define('DEBUG',true);\n";
@@ -180,8 +184,8 @@ class OC_Config{
 			$tmpl = new OC_Template( '', 'error', 'guest' );
 			$tmpl->assign('errors', array(1=>array(
 				'error'=>"Can't write into config directory 'config'",
-				'hint'=>'You can usually fix this by giving the webserver user write access'
-					.' to the config directory in owncloud')));
+				'hint'=>'This can usually be fixed by '
+					.'<a href="' . $defaults->getDocBaseUrl() . '/server/5.0/admin_manual/installation/installation_source.html#set-the-directory-permissions" target="_blank">giving the webserver write access to the config directory</a>.')));
 			$tmpl->printPage();
 			exit;
 		}
diff --git a/lib/connector/sabre/directory.php b/lib/connector/sabre/directory.php
index 6ccb54b79abe564ba18d3694c8b87b04de4b1d1c..3d15a2a584d4acca517a9089e45f30902d2aeaac 100644
--- a/lib/connector/sabre/directory.php
+++ b/lib/connector/sabre/directory.php
@@ -45,9 +45,15 @@ class OC_Connector_Sabre_Directory extends OC_Connector_Sabre_Node implements Sa
 	 *
 	 * @param string $name Name of the file
 	 * @param resource|string $data Initial payload
+	 * @throws Sabre_DAV_Exception_Forbidden
 	 * @return null|string
 	 */
 	public function createFile($name, $data = null) {
+
+		if (!\OC\Files\Filesystem::isCreatable($this->path)) {
+			throw new \Sabre_DAV_Exception_Forbidden();
+		}
+
 		if (isset($_SERVER['HTTP_OC_CHUNKED'])) {
 			$info = OC_FileChunking::decodeName($name);
 			if (empty($info)) {
@@ -102,10 +108,15 @@ class OC_Connector_Sabre_Directory extends OC_Connector_Sabre_Node implements Sa
 	 * Creates a new subdirectory
 	 *
 	 * @param string $name
+	 * @throws Sabre_DAV_Exception_Forbidden
 	 * @return void
 	 */
 	public function createDirectory($name) {
 
+		if (!\OC\Files\Filesystem::isCreatable($this->path)) {
+			throw new \Sabre_DAV_Exception_Forbidden();
+		}
+
 		$newPath = $this->path . '/' . $name;
 		if(!\OC\Files\Filesystem::mkdir($newPath)) {
 			throw new Sabre_DAV_Exception_Forbidden('Could not create directory '.$newPath);
@@ -203,9 +214,13 @@ class OC_Connector_Sabre_Directory extends OC_Connector_Sabre_Node implements Sa
 	 * Deletes all files in this directory, and then itself
 	 *
 	 * @return void
+	 * @throws Sabre_DAV_Exception_Forbidden
 	 */
 	public function delete() {
 
+		if (!\OC\Files\Filesystem::isDeletable($this->path)) {
+			throw new \Sabre_DAV_Exception_Forbidden();
+		}
 		if ($this->path != "/Shared") {
 			foreach($this->getChildren() as $child) $child->delete();
 			\OC\Files\Filesystem::rmdir($this->path);
diff --git a/lib/connector/sabre/file.php b/lib/connector/sabre/file.php
index 91646312e901a6cdb77f4697908e876be8238e55..438d9871c228ef83851f87bf2497112b35528d46 100644
--- a/lib/connector/sabre/file.php
+++ b/lib/connector/sabre/file.php
@@ -41,24 +41,29 @@ class OC_Connector_Sabre_File extends OC_Connector_Sabre_Node implements Sabre_D
 	 * return an ETag, and just return null.
 	 *
 	 * @param resource $data
+	 * @throws Sabre_DAV_Exception_Forbidden
 	 * @return string|null
 	 */
 	public function put($data) {
 
+		if (!\OC\Files\Filesystem::isUpdatable($this->path)) {
+			throw new \Sabre_DAV_Exception_Forbidden();
+		}
+
 		// mark file as partial while uploading (ignored by the scanner)
 		$partpath = $this->path . '.part';
 
 		\OC\Files\Filesystem::file_put_contents($partpath, $data);
 
 		//detect aborted upload
-		if (isset ($_SERVER['REQUEST_METHOD']) && $_SERVER['REQUEST_METHOD'] === 'PUT' ) {
+		if (isset ($_SERVER['REQUEST_METHOD']) && $_SERVER['REQUEST_METHOD'] === 'PUT') {
 			if (isset($_SERVER['CONTENT_LENGTH'])) {
 				$expected = $_SERVER['CONTENT_LENGTH'];
 				$actual = \OC\Files\Filesystem::filesize($partpath);
 				if ($actual != $expected) {
 					\OC\Files\Filesystem::unlink($partpath);
 					throw new Sabre_DAV_Exception_BadRequest(
-							'expected filesize ' . $expected . ' got ' . $actual);
+						'expected filesize ' . $expected . ' got ' . $actual);
 				}
 			}
 		}
@@ -69,7 +74,7 @@ class OC_Connector_Sabre_File extends OC_Connector_Sabre_Node implements Sabre_D
 		//allow sync clients to send the mtime along in a header
 		$mtime = OC_Request::hasModificationTime();
 		if ($mtime !== false) {
-			if(\OC\Files\Filesystem::touch($this->path, $mtime)) {
+			if (\OC\Files\Filesystem::touch($this->path, $mtime)) {
 				header('X-OC-MTime: accepted');
 			}
 		}
@@ -92,9 +97,13 @@ class OC_Connector_Sabre_File extends OC_Connector_Sabre_Node implements Sabre_D
 	 * Delete the current file
 	 *
 	 * @return void
+	 * @throws Sabre_DAV_Exception_Forbidden
 	 */
 	public function delete() {
 
+		if (!\OC\Files\Filesystem::isDeletable($this->path)) {
+			throw new \Sabre_DAV_Exception_Forbidden();
+		}
 		\OC\Files\Filesystem::unlink($this->path);
 
 	}
diff --git a/lib/connector/sabre/locks.php b/lib/connector/sabre/locks.php
index cbc495dec19b8ce6699e6507dac0e1b83d1c5982..69496c15adadd75db8eda4fa35e719f83c5fca3d 100644
--- a/lib/connector/sabre/locks.php
+++ b/lib/connector/sabre/locks.php
@@ -176,9 +176,13 @@ class OC_Connector_Sabre_Locks extends Sabre_DAV_Locks_Backend_Abstract {
 	public function unlock($uri, Sabre_DAV_Locks_LockInfo $lockInfo) {
 
 		$sql = 'DELETE FROM `*PREFIX*locks` WHERE `userid` = ? AND `uri` = ? AND `token` = ?';
+		if (OC_Config::getValue( "dbtype") === 'oci') {
+			//FIXME oracle hack: need to explicitly cast CLOB to CHAR for comparison
+			$sql = 'DELETE FROM `*PREFIX*locks` WHERE `userid` = ? AND to_char(`uri`) = ? AND `token` = ?';
+		}
 		$result = OC_DB::executeAudited( $sql, array(OC_User::getUser(), $uri, $lockInfo->token));
 
-		return $result->numRows() === 1;
+		return $result === 1;
 
 	}
 
diff --git a/lib/connector/sabre/node.php b/lib/connector/sabre/node.php
index 1ffa048d6b23b8725538ee5c80673ae18ea6cb93..0bffa58af78b9efe3a3688c0afb749054b34a1e3 100644
--- a/lib/connector/sabre/node.php
+++ b/lib/connector/sabre/node.php
@@ -189,8 +189,8 @@ abstract class OC_Connector_Sabre_Node implements Sabre_DAV_INode, Sabre_DAV_IPr
 	 */
 	public function getProperties($properties) {
 		if (is_null($this->property_cache)) {
-			$query = OC_DB::prepare( 'SELECT * FROM `*PREFIX*properties` WHERE `userid` = ? AND `propertypath` = ?' );
-			$result = $query->execute( array( OC_User::getUser(), $this->path ));
+			$sql = 'SELECT * FROM `*PREFIX*properties` WHERE `userid` = ? AND `propertypath` = ?';
+			$result = OC_DB::executeAudited( $sql, array( OC_User::getUser(), $this->path ) );
 
 			$this->property_cache = array();
 			while( $row = $result->fetchRow()) {
diff --git a/lib/db.php b/lib/db.php
index a6b81aaba69afd943091274ce2fe72390eefe808..6fec60e53ce85d3c364419a0d745550acbd81ead 100644
--- a/lib/db.php
+++ b/lib/db.php
@@ -180,28 +180,18 @@ class OC_DB {
 							$dsn = 'oci:dbname=//' . $host . '/' . $name;
 					}
 					break;
-                case 'mssql':
+				case 'mssql':
 					if ($port) {
 							$dsn='sqlsrv:Server='.$host.','.$port.';Database='.$name;
 					} else {
 							$dsn='sqlsrv:Server='.$host.';Database='.$name;
 					}
-					break;                    
+					break;
 				default:
 					return false;
 			}
-			try{
-				self::$PDO=new PDO($dsn, $user, $pass, $opts);
-			}catch(PDOException $e) {
-				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();
-			}
+			self::$PDO=new PDO($dsn, $user, $pass, $opts);
+			
 			// We always, really always want associative arrays
 			self::$PDO->setAttribute(PDO::ATTR_DEFAULT_FETCH_MODE, PDO::FETCH_ASSOC);
 			self::$PDO->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
@@ -299,19 +289,8 @@ class OC_DB {
 
 			// Try to establish connection
 			self::$MDB2 = MDB2::factory( $dsn, $options );
-
-			// Die if we could not connect
-			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_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();
-			}
+			
+			self::raiseExceptionOnError( self::$MDB2 );
 
 			// We always, really always want associative arrays
 			self::$MDB2->setFetchMode(MDB2_FETCHMODE_ASSOC);
@@ -326,11 +305,12 @@ class OC_DB {
 	 * @param string $query Query string
 	 * @param int $limit
 	 * @param int $offset
+	 * @param bool $isManipulation
 	 * @return MDB2_Statement_Common prepared SQL query
 	 *
 	 * SQL query via MDB2 prepare(), needs to be execute()'d!
 	 */
-	static public function prepare( $query , $limit=null, $offset=null ) {
+	static public function prepare( $query , $limit = null, $offset = null, $isManipulation = null) {
 
 		if (!is_null($limit) && $limit != -1) {
 			if (self::$backend == self::BACKEND_MDB2) {
@@ -367,12 +347,23 @@ class OC_DB {
 			OC_Log::write('core', 'DB prepare : '.$query, OC_Log::DEBUG);
 		}
 		self::connect();
+		
+		if ($isManipulation === null) {
+			//try to guess, so we return the number of rows on manipulations
+			$isManipulation = self::isManipulation($query);
+		}
+		
 		// return the result
 		if(self::$backend==self::BACKEND_MDB2) {
-			$result = self::$connection->prepare( $query );
+			// differentiate between query and manipulation
+			if ($isManipulation) {
+				$result = self::$connection->prepare( $query, null, MDB2_PREPARE_MANIP );
+			} else {
+				$result = self::$connection->prepare( $query, null, MDB2_PREPARE_RESULT );
+			}
 
 			// Die if we have an error (error means: bad query, not 0 results!)
-			if( PEAR::isError($result)) {
+			if( self::isError($result)) {
 				throw new DatabaseException($result->getMessage(), $query);
 			}
 		}else{
@@ -381,7 +372,8 @@ class OC_DB {
 			}catch(PDOException $e) {
 				throw new DatabaseException($e->getMessage(), $query);
 			}
-			$result=new PDOStatementWrapper($result);
+			// differentiate between query and manipulation
+			$result = new PDOStatementWrapper($result, $isManipulation);
 		}
 		if ((is_null($limit) || $limit == -1) and self::$cachingEnabled ) {
 			$type = OC_Config::getValue( "dbtype", "sqlite" );
@@ -391,7 +383,33 @@ class OC_DB {
 		}
 		return $result;
 	}
-
+	
+	/**
+	 * tries to guess the type of statement based on the first 10 characters
+	 * the current check allows some whitespace but does not work with IF EXISTS or other more complex statements
+	 * 
+	 * @param string $sql
+	 */
+	static public function isManipulation( $sql ) {
+		$selectOccurence = stripos ($sql, "SELECT");
+		if ($selectOccurence !== false && $selectOccurence < 10) {
+			return false;
+		}
+		$insertOccurence = stripos ($sql, "INSERT");
+		if ($insertOccurence !== false && $insertOccurence < 10) {
+			return true;
+		}
+		$updateOccurence = stripos ($sql, "UPDATE");
+		if ($updateOccurence !== false && $updateOccurence < 10) {
+			return true;
+		}
+		$deleteOccurance = stripos ($sql, "DELETE");
+		if ($deleteOccurance !== false && $deleteOccurance < 10) {
+			return true;
+		}
+		return false;
+	}
+	
 	/**
 	 * @brief execute a prepared statement, on error write log and throw exception
 	 * @param mixed $stmt PDOStatementWrapper | MDB2_Statement_Common ,
@@ -663,7 +681,7 @@ class OC_DB {
 	 * @brief Insert a row if a matching row doesn't exists.
 	 * @param string $table. The table to insert into in the form '*PREFIX*tableName'
 	 * @param array $input. An array of fieldname/value pairs
-	 * @returns The return value from PDOStatementWrapper->execute()
+	 * @returns int number of updated rows
 	 */
 	public static function insertIfNotExist($table, $input) {
 		self::connect();
@@ -697,7 +715,7 @@ class OC_DB {
 					. implode('`,`', array_keys($input)) . '`) VALUES('
 					. str_repeat('?,', count($input)-1).'? ' . ')';
 			} else {
-				return true;
+				return 0; //no rows updated
 			}
 		} elseif( $type == 'pgsql' || $type == 'oci' || $type == 'mysql' || $type == 'mssql') {
 			$query = 'INSERT INTO `' .$table . '` (`'
@@ -754,15 +772,16 @@ class OC_DB {
 		}elseif( $type == 'oci'  ) {
 			$query = str_replace( '`', '"', $query );
 			$query = str_ireplace( 'NOW()', 'CURRENT_TIMESTAMP', $query );
+			$query = str_ireplace( 'UNIX_TIMESTAMP()', '((CAST(SYS_EXTRACT_UTC(systimestamp) AS DATE))-TO_DATE(\'1970101000000\',\'YYYYMMDDHH24MiSS\'))*24*3600', $query );
 		}elseif( $type == 'mssql' ) {
 			$query = preg_replace( "/\`(.*?)`/", "[$1]", $query );
 			$query = str_replace( 'NOW()', 'CURRENT_TIMESTAMP', $query );
 			$query = str_replace( 'now()', 'CURRENT_TIMESTAMP', $query );
 			$query = str_replace( 'LENGTH(', 'LEN(', $query );
 			$query = str_replace( 'SUBSTR(', 'SUBSTRING(', $query );
-            
-            $query = self::fixLimitClauseForMSSQL($query);
-        }
+
+			$query = self::fixLimitClauseForMSSQL($query);
+		}
 
 		// replace table name prefix
 		$query = str_replace( '*PREFIX*', $prefix, $query );
@@ -770,60 +789,60 @@ class OC_DB {
 		return $query;
 	}
 
-    private static function fixLimitClauseForMSSQL($query) {
-        $limitLocation = stripos ($query, "LIMIT");
-        
-        if ( $limitLocation === false ) {
-            return $query;
-        } 
-        
-        // total == 0 means all results - not zero results
-        //
-        // First number is either total or offset, locate it by first space
-        //
-        $offset = substr ($query, $limitLocation + 5);
-        $offset = substr ($offset, 0, stripos ($offset, ' '));
-        $offset = trim ($offset);
-
-        // check for another parameter
-        if (stripos ($offset, ',') === false) {
-            // no more parameters
-            $offset = 0;
-            $total = intval ($offset);
-        } else {
-            // found another parameter
-            $offset = intval ($offset);
-
-            $total = substr ($query, $limitLocation + 5);
-            $total = substr ($total, stripos ($total, ','));
-
-            $total = substr ($total, 0, stripos ($total, ' '));
-            $total = intval ($total);
-        }
-
-        $query = trim (substr ($query, 0, $limitLocation));
-
-        if ($offset == 0 && $total !== 0) {
-            if (strpos($query, "SELECT") === false) {
-                $query = "TOP {$total} " . $query;
-            } else {
-                $query = preg_replace('/SELECT(\s*DISTINCT)?/Dsi', 'SELECT$1 TOP '.$total, $query);
-            }
-        } else if ($offset > 0) {
-            $query = preg_replace('/SELECT(\s*DISTINCT)?/Dsi', 'SELECT$1 TOP(10000000) ', $query);
-            $query = 'SELECT *
-                    FROM (SELECT sub2.*, ROW_NUMBER() OVER(ORDER BY sub2.line2) AS line3
-                    FROM (SELECT 1 AS line2, sub1.* FROM (' . $query . ') AS sub1) as sub2) AS sub3';
-
-            if ($total > 0) {
-                $query .= ' WHERE line3 BETWEEN ' . ($offset + 1) . ' AND ' . ($offset + $total);
-            } else {
-                $query .= ' WHERE line3 > ' . $offset;
-            }
-        }
-        return $query;
-    }
-    
+	private static function fixLimitClauseForMSSQL($query) {
+		$limitLocation = stripos ($query, "LIMIT");
+
+		if ( $limitLocation === false ) {
+			return $query;
+		} 
+
+		// total == 0 means all results - not zero results
+		//
+		// First number is either total or offset, locate it by first space
+		//
+		$offset = substr ($query, $limitLocation + 5);
+		$offset = substr ($offset, 0, stripos ($offset, ' '));
+		$offset = trim ($offset);
+
+		// check for another parameter
+		if (stripos ($offset, ',') === false) {
+			// no more parameters
+			$offset = 0;
+			$total = intval ($offset);
+		} else {
+			// found another parameter
+			$offset = intval ($offset);
+
+			$total = substr ($query, $limitLocation + 5);
+			$total = substr ($total, stripos ($total, ','));
+
+			$total = substr ($total, 0, stripos ($total, ' '));
+			$total = intval ($total);
+		}
+
+		$query = trim (substr ($query, 0, $limitLocation));
+
+		if ($offset == 0 && $total !== 0) {
+			if (strpos($query, "SELECT") === false) {
+				$query = "TOP {$total} " . $query;
+			} else {
+				$query = preg_replace('/SELECT(\s*DISTINCT)?/Dsi', 'SELECT$1 TOP '.$total, $query);
+			}
+		} else if ($offset > 0) {
+			$query = preg_replace('/SELECT(\s*DISTINCT)?/Dsi', 'SELECT$1 TOP(10000000) ', $query);
+			$query = 'SELECT *
+					FROM (SELECT sub2.*, ROW_NUMBER() OVER(ORDER BY sub2.line2) AS line3
+					FROM (SELECT 1 AS line2, sub1.* FROM (' . $query . ') AS sub1) as sub2) AS sub3';
+
+			if ($total > 0) {
+				$query .= ' WHERE line3 BETWEEN ' . ($offset + 1) . ' AND ' . ($offset + $total);
+			} else {
+				$query .= ' WHERE line3 > ' . $offset;
+			}
+		}
+		return $query;
+	}
+
 	/**
 	 * @brief drop a table
 	 * @param string $tableName the table to drop
@@ -919,18 +938,21 @@ class OC_DB {
 	 * @return bool
 	 */
 	public static function isError($result) {
-		if(!$result) {
+		//MDB2 returns an MDB2_Error object
+		if (class_exists('PEAR') === true && PEAR::isError($result)) {
 			return true;
-		}elseif(self::$backend==self::BACKEND_MDB2 and PEAR::isError($result)) {
+		}
+		//PDO returns false on error (and throws an exception)
+		if (self::$backend===self::BACKEND_PDO and $result === false) {
 			return true;
-		}else{
-			return false;
 		}
+
+		return false;
 	}
 	/**
 	 * check if a result is an error and throws an exception, works with MDB2 and PDOException
 	 * @param mixed $result
-	 * @param string message
+	 * @param string $message
 	 * @return void
 	 * @throws DatabaseException
 	 */
@@ -946,12 +968,15 @@ class OC_DB {
 	}
 
 	public static function getErrorCode($error) {
-		if ( self::$backend==self::BACKEND_MDB2 and PEAR::isError($error) ) {
-			$code = $error->getCode();
-		} elseif ( self::$backend==self::BACKEND_PDO and self::$PDO ) {
-			$code = self::$PDO->errorCode();
+		if ( class_exists('PEAR') === true && PEAR::isError($error) ) {
+			/** @var $error PEAR_Error */
+			return $error->getCode();
 		}
-		return $code;
+		if ( self::$backend==self::BACKEND_PDO and self::$PDO ) {
+			return self::$PDO->errorCode();
+		}
+
+		return -1;
 	}
 	/**
 	 * returns the error code and message as a string for logging
@@ -960,23 +985,24 @@ class OC_DB {
 	 * @return string
 	 */
 	public static function getErrorMessage($error) {
-		if ( self::$backend==self::BACKEND_MDB2 and PEAR::isError($error) ) {
+		if ( class_exists('PEAR') === true && PEAR::isError($error) ) {
 			$msg = $error->getCode() . ': ' . $error->getMessage();
 			$msg .= ' (' . $error->getDebugInfo() . ')';
-		} elseif (self::$backend==self::BACKEND_PDO and self::$PDO) {
+
+			return $msg;
+		}
+		if (self::$backend==self::BACKEND_PDO and self::$PDO) {
 			$msg = self::$PDO->errorCode() . ': ';
 			$errorInfo = self::$PDO->errorInfo();
 			if (is_array($errorInfo)) {
 				$msg .= 'SQLSTATE = '.$errorInfo[0] . ', ';
 				$msg .= 'Driver Code = '.$errorInfo[1] . ', ';
 				$msg .= 'Driver Message = '.$errorInfo[2];
-			}else{
-				$msg = '';
 			}
-		}else{
-			$msg = '';
+			return $msg;
 		}
-		return $msg;
+
+		return '';
 	}
 
 	/**
@@ -997,15 +1023,17 @@ class PDOStatementWrapper{
 	/**
 	 * @var PDOStatement
 	 */
-	private $statement=null;
-	private $lastArguments=array();
+	private $statement = null;
+	private $isManipulation = false;
+	private $lastArguments = array();
 
-	public function __construct($statement) {
-		$this->statement=$statement;
+	public function __construct($statement, $isManipulation = false) {
+		$this->statement = $statement;
+		$this->isManipulation = $isManipulation;
 	}
 
 	/**
-	 * make execute return the result instead of a bool
+	 * make execute return the result or updated row count instead of a bool
 	 */
 	public function execute($input=array()) {
 		if(OC_Config::getValue( "log_query", false)) {
@@ -1023,16 +1051,19 @@ class PDOStatementWrapper{
 				$input = $this->tryFixSubstringLastArgumentDataForMSSQL($input);
 			}
 
-			$result=$this->statement->execute($input);
+			$result = $this->statement->execute($input);
 		} else {
-			$result=$this->statement->execute();
+			$result = $this->statement->execute();
 		}
 		
-		if ($result) {
-			return $this;
-		} else {
+		if ($result === false) {
 			return false;
 		}
+		if ($this->isManipulation) {
+			return $this->statement->rowCount();
+		} else {
+			return $this;
+		}
 	}
 
 	private function tryFixSubstringLastArgumentDataForMSSQL($input) {
@@ -1124,7 +1155,7 @@ class PDOStatementWrapper{
 			die ($entry);
 		}
 	}
-    
+
 	/**
 	 * provide numRows
 	 */
diff --git a/lib/defaults.php b/lib/defaults.php
index 7dc6fbd0ada1964847843a57ac7e148a37103d4a..196bb5cf14df4ed9ea97e0dac533d4db550f43bd 100644
--- a/lib/defaults.php
+++ b/lib/defaults.php
@@ -5,70 +5,121 @@
  * community edition. Use the get methods to always get the right strings.
  */
 
+
+if (file_exists(OC::$SERVERROOT . '/themes/' . OC_Util::getTheme() . '/defaults.php')) {
+	require_once 'themes/' . OC_Util::getTheme() . '/defaults.php';
+}
+
 class OC_Defaults {
 
-	private static $communityEntity = "ownCloud";
-	private static $communityName = "ownCloud";
-	private static $communityBaseUrl = "http://owncloud.org";
-	private static $communitySyncClientUrl = " http://owncloud.org/sync-clients/";
-	private static $communityDocBaseUrl = "http://doc.owncloud.org";
-	private static $communitySlogan = "web services under your control";
+	private $theme;
 
-	private static $enterpriseEntity = "ownCloud Inc.";
-	private static $enterpriseName = "ownCloud Enterprise Edition";
-	private static $enterpriseBaseUrl = "https://owncloud.com";
-	private static $enterpriseDocBaseUrl = "http://doc.owncloud.com";
-	private static $enterpiseSyncClientUrl = "https://owncloud.com/products/desktop-clients";
-	private static $enterpriseSlogan = "Your Cloud, Your Data, Your Way!";
+	private $defaultEntity;
+	private $defaultName;
+	private $defaultBaseUrl;
+	private $defaultSyncClientUrl;
+	private $defaultDocBaseUrl;
+	private $defaultSlogan;
+	private $defaultLogoClaim;
+
+	function __construct() {
+		$l = OC_L10N::get('core');
 
+		$this->defaultEntity = "ownCloud";
+		$this->defaultName = "ownCloud";
+		$this->defaultBaseUrl = "http://owncloud.org";
+		$this->defaultSyncClientUrl = " http://owncloud.org/sync-clients/";
+		$this->defaultDocBaseUrl = "http://doc.owncloud.org";
+		$this->defaultSlogan = $l->t("web services under your control");
+		$this->defaultLogoClaim = "";
+
+		if (class_exists("OC_Theme")) {
+			$this->theme = new OC_Theme();
+		}
+	}
 
-	public static function getBaseUrl() {
-		if (OC_Util::getEditionString() === '') {
-			return self::$communityBaseUrl;
+	private function themeExist($method) {
+		if (OC_Util::getTheme() !== '' && method_exists('OC_Theme', $method)) {
+			return true;
+		}
+		return false;
+	}
+
+	public function getBaseUrl() {
+		if ($this->themeExist('getBaseUrl')) {
+			return $this->theme->getBaseUrl();
 		} else {
-			return self::$enterpriseBaseUrl;
+			return $this->defaultBaseUrl;
 		}
 	}
 
-	public static function getSyncClientUrl() {
-		if (OC_Util::getEditionString() === '') {
-			return self::$communitySyncClientUrl;
+	public function getSyncClientUrl() {
+		if ($this->themeExist('getSyncClientUrl')) {
+			return $this->theme->getSyncClientUrl();
 		} else {
-			return self::$enterpiseSyncClientUrl;
+			return $this->defaultSyncClientUrl;
 		}
 	}
 
-	public static function getDocBaseUrl() {
-		if (OC_Util::getEditionString() === '') {
-			return self::$communityDocBaseUrl;
+	public function getDocBaseUrl() {
+		if ($this->themeExist('getDocBaseUrl')) {
+			return $this->theme->getDocBaseUrl();
 		} else {
-			return self::$enterpriseDocBaseUrl;
+			return $this->defaultDocBaseUrl;
 		}
 	}
 
-	public static function getName() {
-		if (OC_Util::getEditionString() === '') {
-			return self::$communityName;
+	public function getName() {
+		if ($this->themeExist('getName')) {
+			return $this->theme->getName();
 		} else {
-			return self::$enterpriseName;
+			return $this->defaultName;
 		}
 	}
 
-	public static function getEntity() {
-		if (OC_Util::getEditionString() === '') {
-			return self::$communityEntity;
+	public function getEntity() {
+		if ($this->themeExist('getEntity')) {
+			return $this->theme->getEntity();
 		} else {
-			return self::$enterpriseEntity;
+			return $this->defaultEntity;
 		}
 	}
 
-	public static function getSlogan() {
-		$l = OC_L10N::get('core');
-		if (OC_Util::getEditionString() === '') {
-			return $l->t(self::$communitySlogan);
+	public function getSlogan() {
+		if ($this->themeExist('getSlogan')) {
+			return $this->theme->getSlogan();
 		} else {
-			return self::$enterpriseSlogan;
+			return $this->defaultSlogan;
 		}
 	}
 
-}
\ No newline at end of file
+	public function getLogoClaim() {
+		if ($this->themeExist('getLogoClaim')) {
+			return $this->theme->getLogoClaim();
+		} else {
+			return $this->defaultLogoClaim;
+		}
+	}
+
+	public function getShortFooter() {
+		if ($this->themeExist('getShortFooter')) {
+			$footer = $this->theme->getShortFooter();
+		} else {
+			$footer = "<a href=\"". $this->getBaseUrl() . "\" target=\"_blank\">" .$this->getEntity() . "</a>".
+				' – ' . $this->getSlogan();
+		}
+
+		return $footer;
+	}
+
+	public function getLongFooter() {
+		if ($this->themeExist('getLongFooter')) {
+			$footer = $this->theme->getLongFooter();
+		} else {
+			$footer = $this->getShortFooter();
+		}
+
+		return $footer;
+	}
+
+}
diff --git a/lib/files.php b/lib/files.php
index abb1617c25ee85709a618e79fdaab0971da3e411..f5dffd970d2ca13b817cd96c5c3a65c63dd3a9ab 100644
--- a/lib/files.php
+++ b/lib/files.php
@@ -46,6 +46,7 @@ class OC_Files {
 	public static function get($dir, $files, $only_header = false) {
 		$xsendfile = false;
 		if (isset($_SERVER['MOD_X_SENDFILE_ENABLED']) ||
+			isset($_SERVER['MOD_X_SENDFILE2_ENABLED']) ||
 			isset($_SERVER['MOD_X_ACCEL_REDIRECT_ENABLED'])) {
 			$xsendfile = true;
 		}
@@ -170,7 +171,22 @@ class OC_Files {
 	private static function addSendfileHeader($filename) {
 		if (isset($_SERVER['MOD_X_SENDFILE_ENABLED'])) {
 			header("X-Sendfile: " . $filename);
+ 		}
+ 		if (isset($_SERVER['MOD_X_SENDFILE2_ENABLED'])) {
+			if (isset($_SERVER['HTTP_RANGE']) && 
+				preg_match("/^bytes=([0-9]+)-([0-9]*)$/", $_SERVER['HTTP_RANGE'], $range)) {
+				$filelength = filesize($filename);
+ 				if ($range[2] == "") {
+ 					$range[2] = $filelength - 1;
+ 				}
+ 				header("Content-Range: bytes $range[1]-$range[2]/" . $filelength);
+ 				header("HTTP/1.1 206 Partial content");
+ 				header("X-Sendfile2: " . str_replace(",", "%2c", rawurlencode($filename)) . " $range[1]-$range[2]");
+ 			} else {
+ 				header("X-Sendfile: " . $filename);
+ 			}
 		}
+		
 		if (isset($_SERVER['MOD_X_ACCEL_REDIRECT_ENABLED'])) {
 			header("X-Accel-Redirect: " . $filename);
 		}
diff --git a/lib/files/cache/scanner.php b/lib/files/cache/scanner.php
index 8f9a7921956f6a4c3fbc9eab9d6ef70b8ee64caf..9b94a24f48123e3e6e20eb1c531cb2ab23f6cfd1 100644
--- a/lib/files/cache/scanner.php
+++ b/lib/files/cache/scanner.php
@@ -8,6 +8,8 @@
 
 namespace OC\Files\Cache;
 
+use OC\Files\Filesystem;
+
 class Scanner {
 	/**
 	 * @var \OC\Files\Storage\Storage $storage
@@ -27,6 +29,9 @@ class Scanner {
 	const SCAN_RECURSIVE = true;
 	const SCAN_SHALLOW = false;
 
+	const REUSE_ETAG = 1;
+	const REUSE_SIZE = 2;
+
 	public function __construct(\OC\Files\Storage\Storage $storage) {
 		$this->storage = $storage;
 		$this->storageId = $this->storage->getId();
@@ -59,12 +64,12 @@ class Scanner {
 	 * scan a single file and store it in the cache
 	 *
 	 * @param string $file
-	 * @param bool $checkExisting check existing folder sizes in the cache instead of always using -1 for folder size
+	 * @param int $reuseExisting
 	 * @return array with metadata of the scanned file
 	 */
-	public function scanFile($file, $checkExisting = false) {
-		if ( ! self::isPartialFile($file)
-			and ! \OC\Files\Filesystem::isFileBlacklisted($file)
+	public function scanFile($file, $reuseExisting = 0) {
+		if (!self::isPartialFile($file)
+			and !Filesystem::isFileBlacklisted($file)
 		) {
 			\OC_Hook::emit('\OC\Files\Cache\Scanner', 'scan_file', array('path' => $file, 'storage' => $this->storageId));
 			$data = $this->getData($file);
@@ -79,20 +84,22 @@ class Scanner {
 					}
 				}
 				$newData = $data;
-				if ($cacheData = $this->cache->get($file)) {
-					if ($checkExisting && $data['size'] === -1) {
-						$data['size'] = $cacheData['size'];
-					}
-					if ($data['mtime'] === $cacheData['mtime'] &&
-						$data['size'] === $cacheData['size']) {
-						$data['etag'] = $cacheData['etag'];
+				if ($reuseExisting and $cacheData = $this->cache->get($file)) {
+					// only reuse data if the file hasn't explicitly changed
+					if ($data['mtime'] === $cacheData['mtime']) {
+						if (($reuseExisting & self::REUSE_SIZE) && ($data['size'] === -1)) {
+							$data['size'] = $cacheData['size'];
+						}
+						if ($reuseExisting & self::REUSE_ETAG) {
+							$data['etag'] = $cacheData['etag'];
+						}
 					}
 					// Only update metadata that has changed
 					$newData = array_diff($data, $cacheData);
 				}
-				if (!empty($newData)) {
-					$this->cache->put($file, $newData);
-				}
+			}
+			if (!empty($newData)) {
+				$this->cache->put($file, $newData);
 			}
 			return $data;
 		}
@@ -100,55 +107,79 @@ class Scanner {
 	}
 
 	/**
-	 * scan all the files in a folder and store them in the cache
+	 * scan a folder and all it's children
 	 *
 	 * @param string $path
 	 * @param bool $recursive
-	 * @param bool $onlyChilds
+	 * @param int $reuse
 	 * @return int the size of the scanned folder or -1 if the size is unknown at this stage
 	 */
-	public function scan($path, $recursive = self::SCAN_RECURSIVE, $onlyChilds = false) {
-		\OC_Hook::emit('\OC\Files\Cache\Scanner', 'scan_folder', array('path' => $path, 'storage' => $this->storageId));
-		$childQueue = array();
-		if (!$onlyChilds) {
-			$this->scanFile($path);
+	public function scan($path, $recursive = self::SCAN_RECURSIVE, $reuse = -1) {
+		if ($reuse === -1) {
+			$reuse = ($recursive === self::SCAN_SHALLOW) ? self::REUSE_ETAG | self::REUSE_SIZE : 0;
 		}
+		$this->scanFile($path, $reuse);
+		return $this->scanChildren($path, $recursive, $reuse);
+	}
 
+	/**
+	 * scan all the files and folders in a folder
+	 *
+	 * @param string $path
+	 * @param bool $recursive
+	 * @param int $reuse
+	 * @return int the size of the scanned folder or -1 if the size is unknown at this stage
+	 */
+	public function scanChildren($path, $recursive = self::SCAN_RECURSIVE, $reuse = -1) {
+		if ($reuse === -1) {
+			$reuse = ($recursive === self::SCAN_SHALLOW) ? self::REUSE_ETAG | self::REUSE_SIZE : 0;
+		}
+		\OC_Hook::emit('\OC\Files\Cache\Scanner', 'scan_folder', array('path' => $path, 'storage' => $this->storageId));
 		$size = 0;
+		$childQueue = array();
+		$existingChildren = array();
+		if ($this->cache->inCache($path)) {
+			$children = $this->cache->getFolderContents($path);
+			foreach ($children as $child) {
+				$existingChildren[] = $child['name'];
+			}
+		}
+		$newChildren = array();
 		if ($this->storage->is_dir($path) && ($dh = $this->storage->opendir($path))) {
 			\OC_DB::beginTransaction();
 			while ($file = readdir($dh)) {
 				$child = ($path) ? $path . '/' . $file : $file;
-				if (!\OC\Files\Filesystem::isIgnoredDir($file)) {
-					$data = $this->scanFile($child, $recursive === self::SCAN_SHALLOW);
+				if (!Filesystem::isIgnoredDir($file)) {
+					$newChildren[] = $file;
+					$data = $this->scanFile($child, $reuse);
 					if ($data) {
 						if ($data['size'] === -1) {
 							if ($recursive === self::SCAN_RECURSIVE) {
 								$childQueue[] = $child;
-								$data['size'] = 0;
 							} else {
 								$size = -1;
 							}
-						}
-
-						if ($size !== -1) {
+						} else if ($size !== -1) {
 							$size += $data['size'];
 						}
 					}
 				}
 			}
+			$removedChildren = \array_diff($existingChildren, $newChildren);
+			foreach ($removedChildren as $childName) {
+				$child = ($path) ? $path . '/' . $childName : $childName;
+				$this->cache->remove($child);
+			}
 			\OC_DB::commit();
 			foreach ($childQueue as $child) {
-				$childSize = $this->scan($child, self::SCAN_RECURSIVE, true);
+				$childSize = $this->scanChildren($child, self::SCAN_RECURSIVE);
 				if ($childSize === -1) {
 					$size = -1;
 				} else {
 					$size += $childSize;
 				}
 			}
-			if ($size !== -1) {
-				$this->cache->put($path, array('size' => $size));
-			}
+			$this->cache->put($path, array('size' => $size));
 		}
 		return $size;
 	}
diff --git a/lib/files/cache/updater.php b/lib/files/cache/updater.php
index 417a47f3830d8d9c5575e0630393c0ff1f2e3a1e..87c33a313a482ebb755ef0bbdfc3ac56bfbb37ec 100644
--- a/lib/files/cache/updater.php
+++ b/lib/files/cache/updater.php
@@ -7,6 +7,7 @@
  */
 
 namespace OC\Files\Cache;
+use OCP\Util;
 
 /**
  * listen to filesystem hooks and change the cache accordingly
@@ -102,7 +103,7 @@ class Updater {
 	static public function correctFolder($path, $time) {
 		if ($path !== '' && $path !== '/') {
 			$parent = dirname($path);
-			if ($parent === '.') {
+			if ($parent === '.' || $parent === '\\') {
 				$parent = '';
 			}
 			/**
@@ -116,6 +117,8 @@ class Updater {
 				if ($id !== -1) {
 					$cache->update($id, array('mtime' => $time, 'etag' => $storage->getETag($internalPath)));
 					self::correctFolder($parent, $time);
+				} else {
+					Util::writeLog('core', 'Path not in cache: '.$internalPath, Util::ERROR);
 				}
 			}
 		}
diff --git a/lib/files/filesystem.php b/lib/files/filesystem.php
index d3fddf8c421ba73f19e0d172acef4e6cf15ff669..3d7d5abf8fe49463107cb329cd8179c7a68da183 100644
--- a/lib/files/filesystem.php
+++ b/lib/files/filesystem.php
@@ -30,6 +30,7 @@
 
 namespace OC\Files;
 
+use OC\Files\Storage\Loader;
 const FREE_SPACE_UNKNOWN = -2;
 const FREE_SPACE_UNLIMITED = -3;
 
@@ -142,6 +143,18 @@ class Filesystem {
 	 */
 	const signal_param_run = 'run';
 
+	/**
+	 * @var \OC\Files\Storage\Loader $loader
+	 */
+	private static $loader;
+
+	public static function getLoader(){
+		if (!self::$loader) {
+			self::$loader = new Loader();
+		}
+		return self::$loader;
+	}
+
 	/**
 	 * get the mountpoint of the storage object for a path
 	 * ( note: because a storage is not always mounted inside the fakeroot, the
@@ -239,6 +252,7 @@ class Filesystem {
 		if (self::$defaultInstance) {
 			return false;
 		}
+		self::getLoader();
 		self::$defaultInstance = new View($root);
 
 		if (!self::$mounts) {
@@ -393,7 +407,7 @@ class Filesystem {
 		if (!self::$mounts) {
 			\OC_Util::setupFS();
 		}
-		$mount = new Mount\Mount($class, $mountpoint, $arguments);
+		$mount = new Mount\Mount($class, $mountpoint, $arguments, self::getLoader());
 		self::$mounts->addMount($mount);
 	}
 
diff --git a/lib/files/mount/mount.php b/lib/files/mount/mount.php
index 69b8285ab4c210fd7fbffbb761a2dba1a28320dd..17b0055ee8468dc78dd14b4ee9fe5e1c0c00504b 100644
--- a/lib/files/mount/mount.php
+++ b/lib/files/mount/mount.php
@@ -9,10 +9,10 @@
 namespace OC\Files\Mount;
 
 use \OC\Files\Filesystem;
+use OC\Files\Storage\Loader;
+use OC\Files\Storage\Storage;
 
 class Mount {
-
-
 	/**
 	 * @var \OC\Files\Storage\Storage $storage
 	 */
@@ -23,19 +23,30 @@ class Mount {
 	private $mountPoint;
 
 	/**
-	 * @param string|\OC\Files\Storage\Storage $storage
+	 * @var \OC\Files\Storage\Loader $loader
+	 */
+	private $loader;
+
+	/**
+	 * @param string | \OC\Files\Storage\Storage $storage
 	 * @param string $mountpoint
-	 * @param array $arguments (optional)
+	 * @param array $arguments (optional)\
+	 * @param \OC\Files\Storage\Loader $loader
 	 */
-	public function __construct($storage, $mountpoint, $arguments = null) {
+	public function __construct($storage, $mountpoint, $arguments = null, $loader = null) {
 		if (is_null($arguments)) {
 			$arguments = array();
 		}
+		if (is_null($loader)) {
+			$this->loader = new Loader();
+		} else {
+			$this->loader = $loader;
+		}
 
 		$mountpoint = $this->formatPath($mountpoint);
-		if ($storage instanceof \OC\Files\Storage\Storage) {
+		if ($storage instanceof Storage) {
 			$this->class = get_class($storage);
-			$this->storage = $storage;
+			$this->storage = $this->loader->wrap($mountpoint, $storage);
 		} else {
 			// Update old classes to new namespace
 			if (strpos($storage, 'OC_Filestorage_') !== false) {
@@ -62,7 +73,7 @@ class Mount {
 	private function createStorage() {
 		if (class_exists($this->class)) {
 			try {
-				return new $this->class($this->arguments);
+				return $this->loader->load($this->mountPoint, $this->class, $this->arguments);
 			} catch (\Exception $exception) {
 				\OC_Log::write('core', $exception->getMessage(), \OC_Log::ERROR);
 				return null;
diff --git a/lib/files/storage/loader.php b/lib/files/storage/loader.php
new file mode 100644
index 0000000000000000000000000000000000000000..2572ef443bc6c6bcd381309e222032524a8c2b61
--- /dev/null
+++ b/lib/files/storage/loader.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ * Copyright (c) 2012 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OC\Files\Storage;
+
+class Loader {
+	/**
+	 * @var callable[] $storageWrappers
+	 */
+	private $storageWrappers = array();
+
+	/**
+	 * allow modifier storage behaviour by adding wrappers around storages
+	 *
+	 * $callback should be a function of type (string $mountPoint, Storage $storage) => Storage
+	 *
+	 * @param callable $callback
+	 */
+	public function addStorageWrapper($callback) {
+		$this->storageWrappers[] = $callback;
+	}
+
+	public function load($mountPoint, $class, $arguments) {
+		return $this->wrap($mountPoint, new $class($arguments));
+	}
+
+	public function wrap($mountPoint, $storage) {
+		foreach ($this->storageWrappers as $wrapper) {
+			$storage = $wrapper($mountPoint, $storage);
+		}
+		return $storage;
+	}
+}
diff --git a/lib/files/storage/local.php b/lib/files/storage/local.php
index d684905bf9a4e5856762f1ffe44076234dc55311..b08fd73ce1977cd41d1b1e9d51f7f47715bd7080 100644
--- a/lib/files/storage/local.php
+++ b/lib/files/storage/local.php
@@ -39,7 +39,27 @@ if (\OC_Util::runningOnWindows()) {
 		}
 
 		public function rmdir($path) {
-			return @rmdir($this->datadir . $path);
+			try {
+				$it = new \RecursiveIteratorIterator(
+					new \RecursiveDirectoryIterator($this->datadir . $path),
+					\RecursiveIteratorIterator::CHILD_FIRST
+				);
+				foreach ($it as $file) {
+					/**
+					 * @var \SplFileInfo $file
+					 */
+					if (in_array($file->getBasename(), array('.', '..'))) {
+						continue;
+					} elseif ($file->isDir()) {
+						rmdir($file->getPathname());
+					} elseif ($file->isFile() || $file->isLink()) {
+						unlink($file->getPathname());
+					}
+				}
+				return rmdir($this->datadir . $path);
+			} catch (\UnexpectedValueException $e) {
+				return false;
+			}
 		}
 
 		public function opendir($path) {
diff --git a/lib/files/storage/mappedlocal.php b/lib/files/storage/mappedlocal.php
index ba3fcdc5c9e5bee3368c0423a6b1cdd370e16429..cf5d9b3ef4f0b5b048e373fcc50cb6f7d7db2b49 100644
--- a/lib/files/storage/mappedlocal.php
+++ b/lib/files/storage/mappedlocal.php
@@ -34,10 +34,30 @@ class MappedLocal extends \OC\Files\Storage\Common{
 		return @mkdir($this->buildPath($path));
 	}
 	public function rmdir($path) {
-		if ($result = @rmdir($this->buildPath($path))) {
-			$this->cleanMapper($path);
+		try {
+			$it = new \RecursiveIteratorIterator(
+				new \RecursiveDirectoryIterator($this->buildPath($path)),
+				\RecursiveIteratorIterator::CHILD_FIRST
+			);
+			foreach ($it as $file) {
+				/**
+				 * @var \SplFileInfo $file
+				 */
+				if (in_array($file->getBasename(), array('.', '..'))) {
+					continue;
+				} elseif ($file->isDir()) {
+					rmdir($file->getPathname());
+				} elseif ($file->isFile() || $file->isLink()) {
+					unlink($file->getPathname());
+				}
+			}
+			if ($result = @rmdir($this->buildPath($path))) {
+				$this->cleanMapper($path);
+			}
+			return $result;
+		} catch (\UnexpectedValueException $e) {
+			return false;
 		}
-		return $result;
 	}
 	public function opendir($path) {
 		$files = array('.', '..');
diff --git a/lib/files/storage/wrapper/wrapper.php b/lib/files/storage/wrapper/wrapper.php
new file mode 100644
index 0000000000000000000000000000000000000000..4feb0520f12865bc5f5f6f6d4b5ece9390abb9ed
--- /dev/null
+++ b/lib/files/storage/wrapper/wrapper.php
@@ -0,0 +1,427 @@
+<?php
+/**
+ * Copyright (c) 2013 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OC\Files\Storage\Wrapper;
+
+class Wrapper implements \OC\Files\Storage\Storage {
+	/**
+	 * @var \OC\Files\Storage\Storage $storage
+	 */
+	protected $storage;
+
+	/**
+	 * @param array $parameters
+	 */
+	public function __construct($parameters) {
+		$this->storage = $parameters['storage'];
+	}
+
+	/**
+	 * @return \OC\Files\Storage\Storage
+	 */
+	public function getWrapperStorage() {
+		return $this->storage;
+	}
+
+	/**
+	 * Get the identifier for the storage,
+	 * the returned id should be the same for every storage object that is created with the same parameters
+	 * and two storage objects with the same id should refer to two storages that display the same files.
+	 *
+	 * @return string
+	 */
+	public function getId() {
+		return $this->storage->getId();
+	}
+
+	/**
+	 * see http://php.net/manual/en/function.mkdir.php
+	 *
+	 * @param string $path
+	 * @return bool
+	 */
+	public function mkdir($path) {
+		return $this->storage->mkdir($path);
+	}
+
+	/**
+	 * see http://php.net/manual/en/function.rmdir.php
+	 *
+	 * @param string $path
+	 * @return bool
+	 */
+	public function rmdir($path) {
+		return $this->storage->rmdir($path);
+	}
+
+	/**
+	 * see http://php.net/manual/en/function.opendir.php
+	 *
+	 * @param string $path
+	 * @return resource
+	 */
+	public function opendir($path) {
+		return $this->storage->opendir($path);
+	}
+
+	/**
+	 * see http://php.net/manual/en/function.is_dir.php
+	 *
+	 * @param string $path
+	 * @return bool
+	 */
+	public function is_dir($path) {
+		return $this->storage->is_dir($path);
+	}
+
+	/**
+	 * see http://php.net/manual/en/function.is_file.php
+	 *
+	 * @param string $path
+	 * @return bool
+	 */
+	public function is_file($path) {
+		return $this->storage->is_file($path);
+	}
+
+	/**
+	 * see http://php.net/manual/en/function.stat.php
+	 * only the following keys are required in the result: size and mtime
+	 *
+	 * @param string $path
+	 * @return array
+	 */
+	public function stat($path) {
+		return $this->storage->stat($path);
+	}
+
+	/**
+	 * see http://php.net/manual/en/function.filetype.php
+	 *
+	 * @param string $path
+	 * @return bool
+	 */
+	public function filetype($path) {
+		return $this->storage->filetype($path);
+	}
+
+	/**
+	 * see http://php.net/manual/en/function.filesize.php
+	 * The result for filesize when called on a folder is required to be 0
+	 *
+	 * @param string $path
+	 * @return int
+	 */
+	public function filesize($path) {
+		return $this->storage->filesize($path);
+	}
+
+	/**
+	 * check if a file can be created in $path
+	 *
+	 * @param string $path
+	 * @return bool
+	 */
+	public function isCreatable($path) {
+		return $this->storage->isCreatable($path);
+	}
+
+	/**
+	 * check if a file can be read
+	 *
+	 * @param string $path
+	 * @return bool
+	 */
+	public function isReadable($path) {
+		return $this->storage->isReadable($path);
+	}
+
+	/**
+	 * check if a file can be written to
+	 *
+	 * @param string $path
+	 * @return bool
+	 */
+	public function isUpdatable($path) {
+		return $this->storage->isUpdatable($path);
+	}
+
+	/**
+	 * check if a file can be deleted
+	 *
+	 * @param string $path
+	 * @return bool
+	 */
+	public function isDeletable($path) {
+		return $this->storage->isDeletable($path);
+	}
+
+	/**
+	 * check if a file can be shared
+	 *
+	 * @param string $path
+	 * @return bool
+	 */
+	public function isSharable($path) {
+		return $this->storage->isSharable($path);
+	}
+
+	/**
+	 * get the full permissions of a path.
+	 * Should return a combination of the PERMISSION_ constants defined in lib/public/constants.php
+	 *
+	 * @param string $path
+	 * @return int
+	 */
+	public function getPermissions($path) {
+		return $this->storage->getPermissions($path);
+	}
+
+	/**
+	 * see http://php.net/manual/en/function.file_exists.php
+	 *
+	 * @param string $path
+	 * @return bool
+	 */
+	public function file_exists($path) {
+		return $this->storage->file_exists($path);
+	}
+
+	/**
+	 * see http://php.net/manual/en/function.filemtime.php
+	 *
+	 * @param string $path
+	 * @return int
+	 */
+	public function filemtime($path) {
+		return $this->storage->filemtime($path);
+	}
+
+	/**
+	 * see http://php.net/manual/en/function.file_get_contents.php
+	 *
+	 * @param string $path
+	 * @return string
+	 */
+	public function file_get_contents($path) {
+		return $this->storage->file_get_contents($path);
+	}
+
+	/**
+	 * see http://php.net/manual/en/function.file_put_contents.php
+	 *
+	 * @param string $path
+	 * @param string $data
+	 * @return bool
+	 */
+	public function file_put_contents($path, $data) {
+		return $this->storage->file_put_contents($path, $data);
+	}
+
+	/**
+	 * see http://php.net/manual/en/function.unlink.php
+	 *
+	 * @param string $path
+	 * @return bool
+	 */
+	public function unlink($path) {
+		return $this->storage->unlink($path);
+	}
+
+	/**
+	 * see http://php.net/manual/en/function.rename.php
+	 *
+	 * @param string $path1
+	 * @param string $path2
+	 * @return bool
+	 */
+	public function rename($path1, $path2) {
+		return $this->storage->rename($path1, $path2);
+	}
+
+	/**
+	 * see http://php.net/manual/en/function.copy.php
+	 *
+	 * @param string $path1
+	 * @param string $path2
+	 * @return bool
+	 */
+	public function copy($path1, $path2) {
+		return $this->storage->copy($path1, $path2);
+	}
+
+	/**
+	 * see http://php.net/manual/en/function.fopen.php
+	 *
+	 * @param string $path
+	 * @param string $mode
+	 * @return resource
+	 */
+	public function fopen($path, $mode) {
+		return $this->storage->fopen($path, $mode);
+	}
+
+	/**
+	 * get the mimetype for a file or folder
+	 * The mimetype for a folder is required to be "httpd/unix-directory"
+	 *
+	 * @param string $path
+	 * @return string
+	 */
+	public function getMimeType($path) {
+		return $this->storage->getMimeType($path);
+	}
+
+	/**
+	 * see http://php.net/manual/en/function.hash.php
+	 *
+	 * @param string $type
+	 * @param string $path
+	 * @param bool $raw
+	 * @return string
+	 */
+	public function hash($type, $path, $raw = false) {
+		return $this->storage->hash($type, $path, $raw);
+	}
+
+	/**
+	 * see http://php.net/manual/en/function.free_space.php
+	 *
+	 * @param string $path
+	 * @return int
+	 */
+	public function free_space($path) {
+		return $this->storage->free_space($path);
+	}
+
+	/**
+	 * search for occurrences of $query in file names
+	 *
+	 * @param string $query
+	 * @return array
+	 */
+	public function search($query) {
+		return $this->storage->search($query);
+	}
+
+	/**
+	 * see http://php.net/manual/en/function.touch.php
+	 * If the backend does not support the operation, false should be returned
+	 *
+	 * @param string $path
+	 * @param int $mtime
+	 * @return bool
+	 */
+	public function touch($path, $mtime = null) {
+		return $this->storage->touch($path, $mtime);
+	}
+
+	/**
+	 * get the path to a local version of the file.
+	 * The local version of the file can be temporary and doesn't have to be persistent across requests
+	 *
+	 * @param string $path
+	 * @return string
+	 */
+	public function getLocalFile($path) {
+		return $this->storage->getLocalFile($path);
+	}
+
+	/**
+	 * get the path to a local version of the folder.
+	 * The local version of the folder can be temporary and doesn't have to be persistent across requests
+	 *
+	 * @param string $path
+	 * @return string
+	 */
+	public function getLocalFolder($path) {
+		return $this->storage->getLocalFolder($path);
+	}
+
+	/**
+	 * check if a file or folder has been updated since $time
+	 *
+	 * @param string $path
+	 * @param int $time
+	 * @return bool
+	 *
+	 * hasUpdated for folders should return at least true if a file inside the folder is add, removed or renamed.
+	 * returning true for other changes in the folder is optional
+	 */
+	public function hasUpdated($path, $time) {
+		return $this->storage->hasUpdated($path, $time);
+	}
+
+	/**
+	 * get a cache instance for the storage
+	 *
+	 * @param string $path
+	 * @return \OC\Files\Cache\Cache
+	 */
+	public function getCache($path = '') {
+		return $this->storage->getCache($path);
+	}
+
+	/**
+	 * get a scanner instance for the storage
+	 *
+	 * @param string $path
+	 * @return \OC\Files\Cache\Scanner
+	 */
+	public function getScanner($path = '') {
+		return $this->storage->getScanner($path);
+	}
+
+
+	/**
+	 * get the user id of the owner of a file or folder
+	 *
+	 * @param string $path
+	 * @return string
+	 */
+	public function getOwner($path) {
+		return $this->storage->getOwner($path);
+	}
+
+	/**
+	 * get a permissions cache instance for the cache
+	 *
+	 * @param string $path
+	 * @return \OC\Files\Cache\Permissions
+	 */
+	public function getPermissionsCache($path = '') {
+		return $this->storage->getPermissions($path);
+	}
+
+	/**
+	 * get a watcher instance for the cache
+	 *
+	 * @param string $path
+	 * @return \OC\Files\Cache\Watcher
+	 */
+	public function getWatcher($path = '') {
+		return $this->storage->getWatcher($path);
+	}
+
+	/**
+	 * @return \OC\Files\Cache\Storage
+	 */
+	public function getStorageCache() {
+		return $this->storage->getStorageCache();
+	}
+
+	/**
+	 * get the ETag for a file or folder
+	 *
+	 * @param string $path
+	 * @return string
+	 */
+	public function getETag($path) {
+		return $this->storage->getETag($path);
+	}
+}
diff --git a/lib/files/stream/staticstream.php b/lib/files/stream/staticstream.php
index 7725a6a5a0458c0a5b4930e8e70d47464caa5888..45b1a7a81f81ce66b7abff3ec3c55eae0c7e1a78 100644
--- a/lib/files/stream/staticstream.php
+++ b/lib/files/stream/staticstream.php
@@ -9,6 +9,8 @@
 namespace OC\Files\Stream;
 
 class StaticStream {
+	const MODE_FILE = 0100000;
+
 	public $context;
 	protected static $data = array();
 
@@ -26,6 +28,10 @@ class StaticStream {
 	public function stream_flush() {
 	}
 
+	public static function clear() {
+		self::$data = array();
+	}
+
 	public function stream_open($path, $mode, $options, &$opened_path) {
 		switch ($mode[0]) {
 			case 'r':
@@ -94,36 +100,7 @@ class StaticStream {
 	}
 
 	public function stream_stat() {
-		$size = strlen(self::$data[$this->path]);
-		$time = time();
-		return array(
-			0 => 0,
-			'dev' => 0,
-			1 => 0,
-			'ino' => 0,
-			2 => 0777,
-			'mode' => 0777,
-			3 => 1,
-			'nlink' => 1,
-			4 => 0,
-			'uid' => 0,
-			5 => 0,
-			'gid' => 0,
-			6 => '',
-			'rdev' => '',
-			7 => $size,
-			'size' => $size,
-			8 => $time,
-			'atime' => $time,
-			9 => $time,
-			'mtime' => $time,
-			10 => $time,
-			'ctime' => $time,
-			11 => -1,
-			'blksize' => -1,
-			12 => -1,
-			'blocks' => -1,
-		);
+		return $this->url_stat($this->path);
 	}
 
 	public function stream_tell() {
@@ -157,34 +134,22 @@ class StaticStream {
 		if (isset(self::$data[$path])) {
 			$size = strlen(self::$data[$path]);
 			$time = time();
-			return array(
-				0 => 0,
+			$data = array(
 				'dev' => 0,
-				1 => 0,
 				'ino' => 0,
-				2 => 0777,
-				'mode' => 0777,
-				3 => 1,
+				'mode' => self::MODE_FILE | 0777,
 				'nlink' => 1,
-				4 => 0,
 				'uid' => 0,
-				5 => 0,
 				'gid' => 0,
-				6 => '',
 				'rdev' => '',
-				7 => $size,
 				'size' => $size,
-				8 => $time,
 				'atime' => $time,
-				9 => $time,
 				'mtime' => $time,
-				10 => $time,
 				'ctime' => $time,
-				11 => -1,
 				'blksize' => -1,
-				12 => -1,
 				'blocks' => -1,
 			);
+			return array_values($data) + $data;
 		}
 		return false;
 	}
diff --git a/lib/files/view.php b/lib/files/view.php
index e2fc8d965b892dfdc405f47e227757b8feaea00a..c9727fe49841a0e48f8475cf0494fa4640aa09f1 100644
--- a/lib/files/view.php
+++ b/lib/files/view.php
@@ -353,7 +353,16 @@ class View {
 				return false;
 			}
 			$run = true;
-			if ($this->fakeRoot == Filesystem::getRoot() && !Cache\Scanner::isPartialFile($path1)) {
+			if ($this->fakeRoot == Filesystem::getRoot() && (Cache\Scanner::isPartialFile($path1) && !Cache\Scanner::isPartialFile($path2))) {
+				// if it was a rename from a part file to a regular file it was a write and not a rename operation
+				\OC_Hook::emit(
+					Filesystem::CLASSNAME, Filesystem::signal_write,
+					array(
+						Filesystem::signal_param_path => $path2,
+						Filesystem::signal_param_run => &$run
+					)
+				);
+			} elseif ($this->fakeRoot == Filesystem::getRoot()) {
 				\OC_Hook::emit(
 					Filesystem::CLASSNAME, Filesystem::signal_rename,
 					array(
@@ -386,13 +395,28 @@ class View {
 						$source = $this->fopen($path1 . $postFix1, 'r');
 						$target = $this->fopen($path2 . $postFix2, 'w');
 						list($count, $result) = \OC_Helper::streamCopy($source, $target);
+
+						// close open handle - especially $source is necessary because unlink below will
+						// throw an exception on windows because the file is locked
+						fclose($source);
+						fclose($target);
+
 						if ($result !== false) {
 							list($storage1, $internalPath1) = Filesystem::resolvePath($absolutePath1 . $postFix1);
 							$storage1->unlink($internalPath1);
 						}
 					}
 				}
-				if ($this->fakeRoot == Filesystem::getRoot() && !Cache\Scanner::isPartialFile($path1) && $result !== false) {
+				if ($this->fakeRoot == Filesystem::getRoot() && (Cache\Scanner::isPartialFile($path1) && !Cache\Scanner::isPartialFile($path2)) && $result !== false) {
+					// if it was a rename from a part file to a regular file it was a write and not a rename operation
+					\OC_Hook::emit(
+						Filesystem::CLASSNAME,
+						Filesystem::signal_post_write,
+						array(
+							Filesystem::signal_param_path => $path2,
+						)
+					);
+				} elseif ($this->fakeRoot == Filesystem::getRoot() && $result !== false) {
 					\OC_Hook::emit(
 						Filesystem::CLASSNAME,
 						Filesystem::signal_post_rename,
@@ -664,7 +688,7 @@ class View {
 	private function runHooks($hooks, $path, $post = false) {
 		$prefix = ($post) ? 'post_' : '';
 		$run = true;
-		if (Filesystem::$loaded and $this->fakeRoot == Filesystem::getRoot()) {
+		if (Filesystem::$loaded and $this->fakeRoot == Filesystem::getRoot() && !Cache\Scanner::isPartialFile($path)) {
 			foreach ($hooks as $hook) {
 				if ($hook != 'read') {
 					\OC_Hook::emit(
@@ -748,7 +772,7 @@ class View {
 						if ($subStorage) {
 							$subCache = $subStorage->getCache('');
 							$rootEntry = $subCache->get('');
-							$data['size'] += $rootEntry['size'];
+							$data['size'] += isset($rootEntry['size']) ? $rootEntry['size'] : 0;
 						}
 					}
 				}
diff --git a/lib/helper.php b/lib/helper.php
index 326f2567f99b6527b4b6b4231676ea0c6340b27c..856dba625b38941f812b27b944ebb049d94f234d 100644
--- a/lib/helper.php
+++ b/lib/helper.php
@@ -798,9 +798,9 @@ class OC_Helper {
 		$upload_max_filesize = OCP\Util::computerFileSize(ini_get('upload_max_filesize'));
 		$post_max_size = OCP\Util::computerFileSize(ini_get('post_max_size'));
 		$freeSpace = \OC\Files\Filesystem::free_space($dir);
-		if ($upload_max_filesize == 0 and $post_max_size == 0) {
+		if ((int)$upload_max_filesize === 0 and (int)$post_max_size === 0) {
 			$maxUploadFilesize = \OC\Files\FREE_SPACE_UNLIMITED;
-		} elseif ($upload_max_filesize === 0 or $post_max_size === 0) {
+		} elseif ((int)$upload_max_filesize === 0 or (int)$post_max_size === 0) {
 			$maxUploadFilesize = max($upload_max_filesize, $post_max_size); //only the non 0 value counts
 		} else {
 			$maxUploadFilesize = min($upload_max_filesize, $post_max_size);
diff --git a/lib/l10n/af_ZA.php b/lib/l10n/af_ZA.php
index 38e91288fbefa5a34fc8a1eeef6d35d24e0caa77..de32778026fbad9c6158e0fc0496e3b35a21b40c 100644
--- a/lib/l10n/af_ZA.php
+++ b/lib/l10n/af_ZA.php
@@ -4,5 +4,6 @@
 "Settings" => "Instellings",
 "Users" => "Gebruikers",
 "Apps" => "Toepassings",
-"Admin" => "Admin"
+"Admin" => "Admin",
+"web services under your control" => "webdienste onder jou beheer"
 );
diff --git a/lib/l10n/ar.php b/lib/l10n/ar.php
index 22c934e238d8c3f0b9448d5d53e2a0c10f80b32c..107b27a1fc861333ac41c7a863e2dad3551f7f04 100644
--- a/lib/l10n/ar.php
+++ b/lib/l10n/ar.php
@@ -5,6 +5,7 @@
 "Users" => "المستخدمين",
 "Apps" => "التطبيقات",
 "Admin" => "المدير",
+"web services under your control" => "خدمات الشبكة تحت سيطرتك",
 "ZIP download is turned off." => "تحميل ملفات ZIP متوقف",
 "Files need to be downloaded one by one." => "الملفات بحاجة الى ان يتم تحميلها واحد تلو الاخر",
 "Back to Files" => "العودة الى الملفات",
@@ -16,13 +17,10 @@
 "Files" => "الملفات",
 "Text" => "معلومات إضافية",
 "Images" => "صور",
-"Set an admin username." => "اعداد اسم مستخدم للمدير",
-"Set an admin password." => "اعداد كلمة مرور للمدير",
 "%s enter the database username." => "%s ادخل اسم المستخدم الخاص بقاعدة البيانات.",
 "%s enter the database name." => "%s ادخل اسم فاعدة البيانات",
 "%s you may not use dots in the database name" => "%s لا يسمح لك باستخدام نقطه (.) في اسم قاعدة البيانات",
-"%s set the database host." => "%s ادخل اسم خادم قاعدة البيانات",
-"PostgreSQL username and/or password not valid" => "اسم المستخدم / أو كلمة المرور الخاصة بـPostgreSQL غير صحيحة",
+"MS SQL username and/or password not valid: %s" => "اسم المستخدم  و/أو  كلمة المرور لنظام MS SQL غير صحيح : %s",
 "You need to enter either an existing account or the administrator." => "انت بحاجة لكتابة اسم مستخدم موجود أو حساب المدير.",
 "MySQL username and/or password not valid" => "اسم المستخدم  و/أو  كلمة المرور لنظام MySQL غير صحيح",
 "DB Error: \"%s\"" => "خطأ في قواعد البيانات : \"%s\"",
@@ -33,7 +31,9 @@
 "Drop this user from MySQL." => "احذف اسم المستخدم هذا من الـ MySQL.",
 "Oracle username and/or password not valid" => "اسم المستخدم  و/أو  كلمة المرور لنظام Oracle غير صحيح",
 "Offending command was: \"%s\", name: %s, password: %s" => "الأمر المخالف كان : \"%s\", اسم المستخدم : %s, كلمة المرور: %s",
-"MS SQL username and/or password not valid: %s" => "اسم المستخدم  و/أو  كلمة المرور لنظام MS SQL غير صحيح : %s",
+"PostgreSQL username and/or password not valid" => "اسم المستخدم / أو كلمة المرور الخاصة بـPostgreSQL غير صحيحة",
+"Set an admin username." => "اعداد اسم مستخدم للمدير",
+"Set an admin password." => "اعداد كلمة مرور للمدير",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "اعدادات خادمك غير صحيحة بشكل تسمح لك بمزامنة ملفاتك وذلك بسبب أن واجهة WebDAV تبدو معطلة",
 "Please double check the <a href='%s'>installation guides</a>." => "الرجاء التحقق من <a href='%s'>دليل التنصيب</a>.",
 "seconds ago" => "منذ ثواني",
diff --git a/lib/l10n/bg_BG.php b/lib/l10n/bg_BG.php
index 8412ac9548f03d80600eb498e45c47bb6ad54cef..e23112c83025bf73744d7c9bf53049786404db9d 100644
--- a/lib/l10n/bg_BG.php
+++ b/lib/l10n/bg_BG.php
@@ -5,6 +5,7 @@
 "Users" => "Потребители",
 "Apps" => "Приложения",
 "Admin" => "Админ",
+"web services under your control" => "уеб услуги под Ваш контрол",
 "ZIP download is turned off." => "Изтеглянето като ZIP е изключено.",
 "Files need to be downloaded one by one." => "Файловете трябва да се изтеглят един по един.",
 "Back to Files" => "Назад към файловете",
@@ -16,15 +17,11 @@
 "Files" => "Файлове",
 "Text" => "Текст",
 "Images" => "Снимки",
-"Set an admin username." => "Въведете потребителско име за администратор.",
-"Set an admin password." => "Въведете парола за администратор.",
 "%s enter the database username." => "%s въведете потребителско име за базата с данни.",
 "%s enter the database name." => "%s въведете име на базата с данни.",
 "%s you may not use dots in the database name" => "%s, не можете да ползвате точки в името на базата от данни",
-"%s set the database host." => "%s задай хост на базата данни.",
-"PostgreSQL username and/or password not valid" => "Невалидно PostgreSQL потребителско име и/или парола",
+"MS SQL username and/or password not valid: %s" => "Невалидно MS SQL потребителско име и/или парола: %s",
 "You need to enter either an existing account or the administrator." => "Необходимо е да влезете в всъществуващ акаунт или като администратора",
-"Oracle connection could not be established" => "Oracle връзка не можа да се осъществи",
 "MySQL username and/or password not valid" => "Невалидно MySQL потребителско име и/или парола",
 "DB Error: \"%s\"" => "Грешка в базата от данни: \"%s\"",
 "Offending command was: \"%s\"" => "Проблемната команда беше: \"%s\"",
@@ -32,9 +29,12 @@
 "Drop this user from MySQL" => "Изтриване на потребителя от MySQL",
 "MySQL user '%s'@'%%' already exists" => "MySQL потребителят  '%s'@'%%' вече съществува.",
 "Drop this user from MySQL." => "Изтриване на потребителя от MySQL.",
+"Oracle connection could not be established" => "Oracle връзка не можа да се осъществи",
 "Oracle username and/or password not valid" => "Невалидно Oracle потребителско име и/или парола",
 "Offending command was: \"%s\", name: %s, password: %s" => "Проблемната команда беше: \"%s\", име: %s, парола: %s",
-"MS SQL username and/or password not valid: %s" => "Невалидно MS SQL потребителско име и/или парола: %s",
+"PostgreSQL username and/or password not valid" => "Невалидно PostgreSQL потребителско име и/или парола",
+"Set an admin username." => "Въведете потребителско име за администратор.",
+"Set an admin password." => "Въведете парола за администратор.",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Вашият web сървър все още не е удачно настроен да позволява синхронизация на файлове, защото WebDAV интерфейсът изглежда не работи.",
 "Please double check the <a href='%s'>installation guides</a>." => "Моля направете повторна справка с <a href='%s'>ръководството за инсталиране</a>.",
 "seconds ago" => "преди секунди",
diff --git a/lib/l10n/bn_BD.php b/lib/l10n/bn_BD.php
index f7c8f57466d89082161d8215b799d5434b3a5b3e..ab1d9b94d0dc1471ba7db57034fa680de38d9ccf 100644
--- a/lib/l10n/bn_BD.php
+++ b/lib/l10n/bn_BD.php
@@ -5,6 +5,7 @@
 "Users" => "ব্যবহারকারী",
 "Apps" => "অ্যাপ",
 "Admin" => "প্রশাসন",
+"web services under your control" => "ওয়েব সার্ভিস আপনার হাতের মুঠোয়",
 "ZIP download is turned off." => "ZIP ডাউনলোড বন্ধ করা আছে।",
 "Files need to be downloaded one by one." => "ফাইলগুলো একে একে ডাউনলোড করা আবশ্যক।",
 "Back to Files" => "ফাইলে ফিরে চল",
diff --git a/lib/l10n/ca.php b/lib/l10n/ca.php
index 5c368a85b28f7e5d068bb9619947073d1cda1daf..93f7fa5f7bc456516f72740777f8aaece7b94414 100644
--- a/lib/l10n/ca.php
+++ b/lib/l10n/ca.php
@@ -5,6 +5,7 @@
 "Users" => "Usuaris",
 "Apps" => "Aplicacions",
 "Admin" => "Administració",
+"web services under your control" => "controleu els vostres serveis web",
 "ZIP download is turned off." => "La baixada en ZIP està desactivada.",
 "Files need to be downloaded one by one." => "Els fitxers s'han de baixar d'un en un.",
 "Back to Files" => "Torna a Fitxers",
@@ -16,15 +17,11 @@
 "Files" => "Fitxers",
 "Text" => "Text",
 "Images" => "Imatges",
-"Set an admin username." => "Establiu un nom d'usuari per l'administrador.",
-"Set an admin password." => "Establiu una contrasenya per l'administrador.",
 "%s enter the database username." => "%s escriviu el nom d'usuari de la base de dades.",
 "%s enter the database name." => "%s escriviu el nom de la base de dades.",
 "%s you may not use dots in the database name" => "%s no podeu usar punts en el nom de la base de dades",
-"%s set the database host." => "%s establiu l'ordinador central de la base de dades.",
-"PostgreSQL username and/or password not valid" => "Nom d'usuari i/o contrasenya PostgreSQL no vàlids",
+"MS SQL username and/or password not valid: %s" => "Nom d'usuari i/o contrasenya MS SQL no vàlids: %s",
 "You need to enter either an existing account or the administrator." => "Heu d'escriure un compte existent o el d'administrador.",
-"Oracle connection could not be established" => "No s'ha pogut establir la connexió Oracle",
 "MySQL username and/or password not valid" => "Nom d'usuari i/o contrasenya MySQL no vàlids",
 "DB Error: \"%s\"" => "Error DB: \"%s\"",
 "Offending command was: \"%s\"" => "L'ordre en conflicte és: \"%s\"",
@@ -32,9 +29,12 @@
 "Drop this user from MySQL" => "Elimina aquest usuari de MySQL",
 "MySQL user '%s'@'%%' already exists" => "L'usuari MySQL '%s'@'%%' ja existeix",
 "Drop this user from MySQL." => "Elimina aquest usuari de MySQL.",
+"Oracle connection could not be established" => "No s'ha pogut establir la connexió Oracle",
 "Oracle username and/or password not valid" => "Nom d'usuari i/o contrasenya Oracle no vàlids",
 "Offending command was: \"%s\", name: %s, password: %s" => "L'ordre en conflicte és: \"%s\", nom: %s, contrasenya: %s",
-"MS SQL username and/or password not valid: %s" => "Nom d'usuari i/o contrasenya MS SQL no vàlids: %s",
+"PostgreSQL username and/or password not valid" => "Nom d'usuari i/o contrasenya PostgreSQL no vàlids",
+"Set an admin username." => "Establiu un nom d'usuari per l'administrador.",
+"Set an admin password." => "Establiu una contrasenya per l'administrador.",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "El servidor web no està configurat correctament per permetre la sincronització de fitxers perquè la interfície WebDAV sembla no funcionar correctament.",
 "Please double check the <a href='%s'>installation guides</a>." => "Comproveu les <a href='%s'>guies d'instal·lació</a>.",
 "seconds ago" => "segons enrere",
diff --git a/lib/l10n/cs_CZ.php b/lib/l10n/cs_CZ.php
index b74b9a7184c4dfed26889912d6d741945fb3f78a..917f383bb8989bb7c1e6ee041a7626523276c821 100644
--- a/lib/l10n/cs_CZ.php
+++ b/lib/l10n/cs_CZ.php
@@ -5,6 +5,7 @@
 "Users" => "Uživatelé",
 "Apps" => "Aplikace",
 "Admin" => "Administrace",
+"web services under your control" => "služby webu pod Vaší kontrolou",
 "ZIP download is turned off." => "Stahování ZIPu je vypnuto.",
 "Files need to be downloaded one by one." => "Soubory musí být stahovány jednotlivě.",
 "Back to Files" => "Zpět k souborům",
@@ -16,15 +17,11 @@
 "Files" => "Soubory",
 "Text" => "Text",
 "Images" => "Obrázky",
-"Set an admin username." => "Zadejte uživatelské jméno správce.",
-"Set an admin password." => "Zadejte heslo správce.",
 "%s enter the database username." => "Zadejte uživatelské jméno %s databáze.",
 "%s enter the database name." => "Zadejte název databáze pro %s databáze.",
 "%s you may not use dots in the database name" => "V názvu databáze %s nesmíte používat tečky.",
-"%s set the database host." => "Zadejte název počítače s databází %s.",
-"PostgreSQL username and/or password not valid" => "Uživatelské jméno, či heslo PostgreSQL není platné",
+"MS SQL username and/or password not valid: %s" => "Uživatelské jméno, či heslo MSSQL není platné: %s",
 "You need to enter either an existing account or the administrator." => "Musíte zadat existující účet, či správce.",
-"Oracle connection could not be established" => "Spojení s Oracle nemohlo být navázáno",
 "MySQL username and/or password not valid" => "Uživatelské jméno, či heslo MySQL není platné",
 "DB Error: \"%s\"" => "Chyba DB: \"%s\"",
 "Offending command was: \"%s\"" => "Podezřelý příkaz byl: \"%s\"",
@@ -32,9 +29,12 @@
 "Drop this user from MySQL" => "Zahodit uživatele z MySQL",
 "MySQL user '%s'@'%%' already exists" => "Uživatel '%s'@'%%' již v MySQL existuje",
 "Drop this user from MySQL." => "Zahodit uživatele z MySQL.",
+"Oracle connection could not be established" => "Spojení s Oracle nemohlo být navázáno",
 "Oracle username and/or password not valid" => "Uživatelské jméno, či heslo Oracle není platné",
 "Offending command was: \"%s\", name: %s, password: %s" => "Podezřelý příkaz byl: \"%s\", jméno: %s, heslo: %s",
-"MS SQL username and/or password not valid: %s" => "Uživatelské jméno, či heslo MSSQL není platné: %s",
+"PostgreSQL username and/or password not valid" => "Uživatelské jméno, či heslo PostgreSQL není platné",
+"Set an admin username." => "Zadejte uživatelské jméno správce.",
+"Set an admin password." => "Zadejte heslo správce.",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Váš webový server není správně nastaven pro umožnění synchronizace, protože rozhraní WebDAV je rozbité.",
 "Please double check the <a href='%s'>installation guides</a>." => "Zkonzultujte, prosím, <a href='%s'>průvodce instalací</a>.",
 "seconds ago" => "před pár vteřinami",
diff --git a/lib/l10n/cy_GB.php b/lib/l10n/cy_GB.php
index b3503dcc5727a9b1498c94da30a6a5198b5fef1c..27140ba6dbbd52f1e9969e158a0bde94db2448e3 100644
--- a/lib/l10n/cy_GB.php
+++ b/lib/l10n/cy_GB.php
@@ -5,6 +5,7 @@
 "Users" => "Defnyddwyr",
 "Apps" => "Pecynnau",
 "Admin" => "Gweinyddu",
+"web services under your control" => "gwasanaethau gwe a reolir gennych",
 "ZIP download is turned off." => "Mae llwytho ZIP wedi ei ddiffodd.",
 "Files need to be downloaded one by one." => "Mae angen llwytho ffeiliau i lawr fesul un.",
 "Back to Files" => "Nôl i Ffeiliau",
@@ -16,13 +17,10 @@
 "Files" => "Ffeiliau",
 "Text" => "Testun",
 "Images" => "Delweddau",
-"Set an admin username." => "Creu enw defnyddiwr i'r gweinyddwr.",
-"Set an admin password." => "Gosod cyfrinair y gweinyddwr.",
 "%s enter the database username." => "%s rhowch enw defnyddiwr y gronfa ddata.",
 "%s enter the database name." => "%s rhowch enw'r gronfa ddata.",
 "%s you may not use dots in the database name" => "%s does dim hawl defnyddio dot yn enw'r gronfa ddata",
-"%s set the database host." => "%s gosod gwesteiwr y gronfa ddata.",
-"PostgreSQL username and/or password not valid" => "Enw a/neu gyfrinair PostgreSQL annilys",
+"MS SQL username and/or password not valid: %s" => "Enw a/neu gyfrinair MS SQL annilys: %s",
 "You need to enter either an existing account or the administrator." => "Rhaid i chi naill ai gyflwyno cyfrif presennol neu'r gweinyddwr.",
 "MySQL username and/or password not valid" => "Enw a/neu gyfrinair MySQL annilys",
 "DB Error: \"%s\"" => "Gwall DB: \"%s\"",
@@ -33,7 +31,9 @@
 "Drop this user from MySQL." => "Gollwng y defnyddiwr hwn o MySQL.",
 "Oracle username and/or password not valid" => "Enw a/neu gyfrinair Oracle annilys",
 "Offending command was: \"%s\", name: %s, password: %s" => "Y gorchymyn wnaeth beri tramgwydd oedd: \"%s\", enw: %s, cyfrinair: %s",
-"MS SQL username and/or password not valid: %s" => "Enw a/neu gyfrinair MS SQL annilys: %s",
+"PostgreSQL username and/or password not valid" => "Enw a/neu gyfrinair PostgreSQL annilys",
+"Set an admin username." => "Creu enw defnyddiwr i'r gweinyddwr.",
+"Set an admin password." => "Gosod cyfrinair y gweinyddwr.",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Nid yw eich gweinydd wedi'i gyflunio eto i ganiatáu cydweddu ffeiliau oherwydd bod y rhyngwyneb WebDAV wedi torri.",
 "Please double check the <a href='%s'>installation guides</a>." => "Gwiriwch y <a href='%s'>canllawiau gosod</a> eto.",
 "seconds ago" => "eiliad yn ôl",
diff --git a/lib/l10n/da.php b/lib/l10n/da.php
index 3202ae3a335a809dc8dff44c3c76c772450d401c..5f11453bcdd6c78e992b9ea9eb31c2bad5a72e08 100644
--- a/lib/l10n/da.php
+++ b/lib/l10n/da.php
@@ -5,6 +5,7 @@
 "Users" => "Brugere",
 "Apps" => "Apps",
 "Admin" => "Admin",
+"web services under your control" => "Webtjenester under din kontrol",
 "ZIP download is turned off." => "ZIP-download er slået fra.",
 "Files need to be downloaded one by one." => "Filer skal downloades en for en.",
 "Back to Files" => "Tilbage til Filer",
@@ -16,15 +17,11 @@
 "Files" => "Filer",
 "Text" => "SMS",
 "Images" => "Billeder",
-"Set an admin username." => "Angiv et admin brugernavn.",
-"Set an admin password." => "Angiv et admin kodeord.",
 "%s enter the database username." => "%s indtast database brugernavnet.",
 "%s enter the database name." => "%s indtast database navnet.",
 "%s you may not use dots in the database name" => "%s du må ikke bruge punktummer i databasenavnet.",
-"%s set the database host." => "%s sæt database værten.",
-"PostgreSQL username and/or password not valid" => "PostgreSQL brugernavn og/eller kodeord er ikke gyldigt.",
+"MS SQL username and/or password not valid: %s" => "MS SQL brugernavn og/eller adgangskode ikke er gyldigt: %s",
 "You need to enter either an existing account or the administrator." => "Du bliver nødt til at indtaste en eksisterende bruger eller en administrator.",
-"Oracle connection could not be established" => "Oracle forbindelsen kunne ikke etableres",
 "MySQL username and/or password not valid" => "MySQL brugernavn og/eller kodeord er ikke gyldigt.",
 "DB Error: \"%s\"" => "Databasefejl: \"%s\"",
 "Offending command was: \"%s\"" => "Fejlende kommando var: \"%s\"",
@@ -32,9 +29,12 @@
 "Drop this user from MySQL" => "Slet denne bruger fra MySQL",
 "MySQL user '%s'@'%%' already exists" => "MySQL brugeren '%s'@'%%' eksisterer allerede.",
 "Drop this user from MySQL." => "Slet denne bruger fra MySQL",
+"Oracle connection could not be established" => "Oracle forbindelsen kunne ikke etableres",
 "Oracle username and/or password not valid" => "Oracle brugernavn og/eller kodeord er ikke gyldigt.",
 "Offending command was: \"%s\", name: %s, password: %s" => "Fejlende kommando var: \"%s\", navn: %s, password: %s",
-"MS SQL username and/or password not valid: %s" => "MS SQL brugernavn og/eller adgangskode ikke er gyldigt: %s",
+"PostgreSQL username and/or password not valid" => "PostgreSQL brugernavn og/eller kodeord er ikke gyldigt.",
+"Set an admin username." => "Angiv et admin brugernavn.",
+"Set an admin password." => "Angiv et admin kodeord.",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Din webserver er endnu ikke sat op til at tillade fil synkronisering fordi WebDAV grænsefladen virker ødelagt.",
 "Please double check the <a href='%s'>installation guides</a>." => "Dobbelttjek venligst <a href='%s'>installations vejledningerne</a>.",
 "seconds ago" => "sekunder siden",
diff --git a/lib/l10n/de.php b/lib/l10n/de.php
index 4869689ba78afddde1751c56a8bb59cc00e6473d..4ef02402b9bc0c76e80ac9837503e1056768d284 100644
--- a/lib/l10n/de.php
+++ b/lib/l10n/de.php
@@ -5,6 +5,7 @@
 "Users" => "Benutzer",
 "Apps" => "Apps",
 "Admin" => "Administration",
+"web services under your control" => "Web-Services unter Deiner Kontrolle",
 "ZIP download is turned off." => "Der ZIP-Download ist deaktiviert.",
 "Files need to be downloaded one by one." => "Die Dateien müssen einzeln heruntergeladen werden.",
 "Back to Files" => "Zurück zu \"Dateien\"",
@@ -16,15 +17,11 @@
 "Files" => "Dateien",
 "Text" => "Text",
 "Images" => "Bilder",
-"Set an admin username." => "Setze Administrator Benutzername.",
-"Set an admin password." => "Setze Administrator Passwort",
 "%s enter the database username." => "%s gib den Datenbank-Benutzernamen an.",
 "%s enter the database name." => "%s gib den Datenbank-Namen an.",
 "%s you may not use dots in the database name" => "%s Der Datenbank-Name darf keine Punkte enthalten",
-"%s set the database host." => "%s setze den Datenbank-Host",
-"PostgreSQL username and/or password not valid" => "PostgreSQL Benutzername und/oder Passwort ungültig",
+"MS SQL username and/or password not valid: %s" => "MS SQL Benutzername und/oder Password ungültig: %s",
 "You need to enter either an existing account or the administrator." => "Du musst entweder ein existierendes Benutzerkonto oder das Administratoren-Konto angeben.",
-"Oracle connection could not be established" => "Es konnte keine Verbindung zur Oracle-Datenbank hergestellt werden",
 "MySQL username and/or password not valid" => "MySQL Benutzername und/oder Passwort ungültig",
 "DB Error: \"%s\"" => "DB Fehler: \"%s\"",
 "Offending command was: \"%s\"" => "Fehlerhafter Befehl war: \"%s\"",
@@ -32,9 +29,12 @@
 "Drop this user from MySQL" => "Lösche diesen Benutzer von MySQL",
 "MySQL user '%s'@'%%' already exists" => "MySQL Benutzer '%s'@'%%' existiert bereits",
 "Drop this user from MySQL." => "Lösche diesen Benutzer aus MySQL.",
+"Oracle connection could not be established" => "Es konnte keine Verbindung zur Oracle-Datenbank hergestellt werden",
 "Oracle username and/or password not valid" => "Oracle Benutzername und/oder Passwort ungültig",
 "Offending command was: \"%s\", name: %s, password: %s" => "Fehlerhafter Befehl war: \"%s\", Name: %s, Passwort: %s",
-"MS SQL username and/or password not valid: %s" => "MS SQL Benutzername und/oder Password ungültig: %s",
+"PostgreSQL username and/or password not valid" => "PostgreSQL Benutzername und/oder Passwort ungültig",
+"Set an admin username." => "Setze Administrator Benutzername.",
+"Set an admin password." => "Setze Administrator Passwort",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Dein Web-Server ist noch nicht für Datei-Synchronisation bereit, weil die WebDAV-Schnittstelle vermutlich defekt ist.",
 "Please double check the <a href='%s'>installation guides</a>." => "Bitte prüfe die <a href='%s'>Installationsanleitungen</a>.",
 "seconds ago" => "Gerade eben",
diff --git a/lib/l10n/de_DE.php b/lib/l10n/de_DE.php
index 5ebe4fb26fc35b9300b3b5d1a18bb8470d9296f7..823d423abcd533a1e7c371ac254db720c5618f88 100644
--- a/lib/l10n/de_DE.php
+++ b/lib/l10n/de_DE.php
@@ -5,6 +5,7 @@
 "Users" => "Benutzer",
 "Apps" => "Apps",
 "Admin" => "Administrator",
+"web services under your control" => "Web-Services unter Ihrer Kontrolle",
 "ZIP download is turned off." => "Der ZIP-Download ist deaktiviert.",
 "Files need to be downloaded one by one." => "Die Dateien müssen einzeln heruntergeladen werden.",
 "Back to Files" => "Zurück zu \"Dateien\"",
@@ -16,15 +17,11 @@
 "Files" => "Dateien",
 "Text" => "Text",
 "Images" => "Bilder",
-"Set an admin username." => "Setze Administrator Benutzername.",
-"Set an admin password." => "Setze Administrator Passwort",
 "%s enter the database username." => "%s geben Sie den Datenbank-Benutzernamen an.",
 "%s enter the database name." => "%s geben Sie den Datenbank-Namen an.",
 "%s you may not use dots in the database name" => "%s Der Datenbank-Name darf keine Punkte enthalten",
-"%s set the database host." => "%s setze den Datenbank-Host",
-"PostgreSQL username and/or password not valid" => "PostgreSQL Benutzername und/oder Passwort ungültig",
+"MS SQL username and/or password not valid: %s" => "MS SQL Benutzername und/oder Passwort ungültig: %s",
 "You need to enter either an existing account or the administrator." => "Sie müssen entweder ein existierendes Benutzerkonto oder das Administratoren-Konto angeben.",
-"Oracle connection could not be established" => "Die Oracle-Verbindung konnte nicht aufgebaut werden.",
 "MySQL username and/or password not valid" => "MySQL Benutzername und/oder Passwort ungültig",
 "DB Error: \"%s\"" => "DB Fehler: \"%s\"",
 "Offending command was: \"%s\"" => "Fehlerhafter Befehl war: \"%s\"",
@@ -32,9 +29,12 @@
 "Drop this user from MySQL" => "Lösche diesen Benutzer aus MySQL",
 "MySQL user '%s'@'%%' already exists" => "MySQL Benutzer '%s'@'%%' existiert bereits",
 "Drop this user from MySQL." => "Lösche diesen Benutzer aus MySQL.",
+"Oracle connection could not be established" => "Die Oracle-Verbindung konnte nicht aufgebaut werden.",
 "Oracle username and/or password not valid" => "Oracle Benutzername und/oder Passwort ungültig",
 "Offending command was: \"%s\", name: %s, password: %s" => "Fehlerhafter Befehl war: \"%s\", Name: %s, Passwort: %s",
-"MS SQL username and/or password not valid: %s" => "MS SQL Benutzername und/oder Passwort ungültig: %s",
+"PostgreSQL username and/or password not valid" => "PostgreSQL Benutzername und/oder Passwort ungültig",
+"Set an admin username." => "Setze Administrator Benutzername.",
+"Set an admin password." => "Setze Administrator Passwort",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Ihr Web-Server ist noch nicht für eine Datei-Synchronisation konfiguriert, weil die WebDAV-Schnittstelle vermutlich defekt ist.",
 "Please double check the <a href='%s'>installation guides</a>." => "Bitte prüfen Sie die <a href='%s'>Installationsanleitungen</a>.",
 "seconds ago" => "Gerade eben",
diff --git a/lib/l10n/el.php b/lib/l10n/el.php
index 8637b8da269b30f88f86a702655fa16af21563e4..3e876aefdfec1f92f03ebd5bcba8363353112f9f 100644
--- a/lib/l10n/el.php
+++ b/lib/l10n/el.php
@@ -5,6 +5,7 @@
 "Users" => "Χρήστες",
 "Apps" => "Εφαρμογές",
 "Admin" => "Διαχειριστής",
+"web services under your control" => "υπηρεσίες δικτύου υπό τον έλεγχό σας",
 "ZIP download is turned off." => "Η λήψη ZIP απενεργοποιήθηκε.",
 "Files need to be downloaded one by one." => "Τα αρχεία πρέπει να ληφθούν ένα-ένα.",
 "Back to Files" => "Πίσω στα Αρχεία",
@@ -16,13 +17,10 @@
 "Files" => "Αρχεία",
 "Text" => "Κείμενο",
 "Images" => "Εικόνες",
-"Set an admin username." => "Εισάγετε όνομα χρήστη διαχειριστή.",
-"Set an admin password." => "Εισάγετε συνθηματικό διαχειριστή.",
 "%s enter the database username." => "%s εισάγετε το όνομα χρήστη της βάσης δεδομένων.",
 "%s enter the database name." => "%s εισάγετε το όνομα της βάσης δεδομένων.",
 "%s you may not use dots in the database name" => "%s μάλλον δεν χρησιμοποιείτε τελείες στο όνομα της βάσης δεδομένων",
-"%s set the database host." => "%s ρυθμίση του κεντρικόυ υπολογιστή βάσης δεδομένων. ",
-"PostgreSQL username and/or password not valid" => "Μη έγκυρος χρήστης και/ή συνθηματικό της PostgreSQL",
+"MS SQL username and/or password not valid: %s" => "Το όνομα χρήστη και/ή ο κωδικός της MS SQL δεν είναι έγκυρα: %s",
 "You need to enter either an existing account or the administrator." => "Χρειάζεται να εισάγετε είτε έναν υπάρχον λογαριασμό ή του διαχειριστή.",
 "MySQL username and/or password not valid" => "Μη έγκυρος χρήστης και/ή συνθηματικό της MySQL",
 "DB Error: \"%s\"" => "Σφάλμα Βάσης Δεδομένων: \"%s\"",
@@ -31,9 +29,12 @@
 "Drop this user from MySQL" => "Απόρριψη αυτού του χρήστη από την MySQL",
 "MySQL user '%s'@'%%' already exists" => "Ο χρήστης '%s'@'%%' της MySQL υπάρχει ήδη",
 "Drop this user from MySQL." => "Απόρριψη αυτού του χρήστη από την MySQL",
+"Oracle connection could not be established" => "Αδυναμία σύνδεσης Oracle",
 "Oracle username and/or password not valid" => "Μη έγκυρος χρήστης και/ή συνθηματικό της Oracle",
 "Offending command was: \"%s\", name: %s, password: %s" => "Η εντολη παραβατικοτητας ηταν: \"%s\", ονομα: %s, κωδικος: %s",
-"MS SQL username and/or password not valid: %s" => "Το όνομα χρήστη και/ή ο κωδικός της MS SQL δεν είναι έγκυρα: %s",
+"PostgreSQL username and/or password not valid" => "Μη έγκυρος χρήστης και/ή συνθηματικό της PostgreSQL",
+"Set an admin username." => "Εισάγετε όνομα χρήστη διαχειριστή.",
+"Set an admin password." => "Εισάγετε συνθηματικό διαχειριστή.",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Ο διακομιστής σας δεν έχει ρυθμιστεί κατάλληλα ώστε να επιτρέπει τον συγχρονισμό αρχείων γιατί η διεπαφή WebDAV πιθανόν να είναι κατεστραμμένη.",
 "Please double check the <a href='%s'>installation guides</a>." => "Ελέγξτε ξανά τις <a href='%s'>οδηγίες εγκατάστασης</a>.",
 "seconds ago" => "δευτερόλεπτα πριν",
diff --git a/lib/l10n/en@pirate.php b/lib/l10n/en@pirate.php
new file mode 100644
index 0000000000000000000000000000000000000000..02ff0331e0513195a656150f57f4da764945a17d
--- /dev/null
+++ b/lib/l10n/en@pirate.php
@@ -0,0 +1,3 @@
+<?php $TRANSLATIONS = array(
+"web services under your control" => "web services under your control"
+);
diff --git a/lib/l10n/eo.php b/lib/l10n/eo.php
index 2782be65da9e7a3030139a7bf79d4f5a0e18edd5..fd45f30c69bf1197dff7e7ada28b7c6ded7dee05 100644
--- a/lib/l10n/eo.php
+++ b/lib/l10n/eo.php
@@ -5,6 +5,7 @@
 "Users" => "Uzantoj",
 "Apps" => "Aplikaĵoj",
 "Admin" => "Administranto",
+"web services under your control" => "TTT-servoj regataj de vi",
 "ZIP download is turned off." => "ZIP-elŝuto estas malkapabligita.",
 "Files need to be downloaded one by one." => "Dosieroj devas elŝutiĝi unuope.",
 "Back to Files" => "Reen al la dosieroj",
@@ -15,6 +16,23 @@
 "Files" => "Dosieroj",
 "Text" => "Teksto",
 "Images" => "Bildoj",
+"%s enter the database username." => "%s enigu la uzantonomon de la datumbazo.",
+"%s enter the database name." => "%s enigu la nomon de la datumbazo.",
+"%s you may not use dots in the database name" => "%s vi ne povas uzi punktojn en la nomo de la datumbazo",
+"MS SQL username and/or password not valid: %s" => "La uzantonomo de MS SQL aÅ­ la pasvorto ne validas: %s",
+"MySQL username and/or password not valid" => "La uzantonomo de MySQL aÅ­ la pasvorto ne validas",
+"DB Error: \"%s\"" => "Datumbaza eraro: “%s”",
+"MySQL user '%s'@'localhost' exists already." => "La uzanto de MySQL “%s”@“localhost” jam ekzistas.",
+"Drop this user from MySQL" => "Forigi ĉi tiun uzanton el MySQL",
+"MySQL user '%s'@'%%' already exists" => "La uzanto de MySQL “%s”@“%%” jam ekzistas",
+"Drop this user from MySQL." => "Forigi ĉi tiun uzanton el MySQL.",
+"Oracle connection could not be established" => "Konekto al Oracle ne povas stariĝi",
+"Oracle username and/or password not valid" => "La uzantonomo de Oracle aÅ­ la pasvorto ne validas",
+"PostgreSQL username and/or password not valid" => "La uzantonomo de PostgreSQL aÅ­ la pasvorto ne validas",
+"Set an admin username." => "Starigi administran uzantonomon.",
+"Set an admin password." => "Starigi administran pasvorton.",
+"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Via TTT-servilo ankoraŭ ne ĝuste agordiĝis por permesi sinkronigi dosierojn ĉar la WebDAV-interfaco ŝajnas rompita.",
+"Please double check the <a href='%s'>installation guides</a>." => "Bonvolu duoble kontroli la <a href='%s'>gvidilon por instalo</a>.",
 "seconds ago" => "sekundoj antaÅ­e",
 "1 minute ago" => "antaÅ­ 1 minuto",
 "%d minutes ago" => "antaÅ­ %d minutoj",
diff --git a/lib/l10n/es.php b/lib/l10n/es.php
index 3b32036d3af7e898ae22b26b580d2536ec2ade54..1f243a224e41e15c1ab24aca67b8c92fbd5299b3 100644
--- a/lib/l10n/es.php
+++ b/lib/l10n/es.php
@@ -5,6 +5,7 @@
 "Users" => "Usuarios",
 "Apps" => "Aplicaciones",
 "Admin" => "Administración",
+"web services under your control" => "Servicios web bajo su control",
 "ZIP download is turned off." => "La descarga en ZIP está desactivada.",
 "Files need to be downloaded one by one." => "Los archivos deben ser descargados uno por uno.",
 "Back to Files" => "Volver a Archivos",
@@ -16,15 +17,11 @@
 "Files" => "Archivos",
 "Text" => "Texto",
 "Images" => "Imágenes",
-"Set an admin username." => "Configurar un nombre de usuario del administrador",
-"Set an admin password." => "Configurar la contraseña del administrador.",
 "%s enter the database username." => "%s ingresar el usuario de la base de datos.",
 "%s enter the database name." => "%s ingresar el nombre de la base de datos",
 "%s you may not use dots in the database name" => "%s no se puede utilizar puntos en el nombre de la base de datos",
-"%s set the database host." => "%s ingresar el host de la base de datos.",
-"PostgreSQL username and/or password not valid" => "Usuario y/o contraseña de PostgreSQL no válidos",
+"MS SQL username and/or password not valid: %s" => "Usuario y/o contraseña de MS SQL no válidos: %s",
 "You need to enter either an existing account or the administrator." => "Tiene que ingresar una cuenta existente o la del administrador.",
-"Oracle connection could not be established" => "No se pudo establecer la conexión a Oracle",
 "MySQL username and/or password not valid" => "Usuario y/o contraseña de MySQL no válidos",
 "DB Error: \"%s\"" => "Error BD: \"%s\"",
 "Offending command was: \"%s\"" => "Comando infractor: \"%s\"",
@@ -32,9 +29,12 @@
 "Drop this user from MySQL" => "Eliminar este usuario de MySQL",
 "MySQL user '%s'@'%%' already exists" => "Usuario MySQL '%s'@'%%' ya existe",
 "Drop this user from MySQL." => "Eliminar este usuario de MySQL.",
+"Oracle connection could not be established" => "No se pudo establecer la conexión a Oracle",
 "Oracle username and/or password not valid" => "Usuario y/o contraseña de Oracle no válidos",
 "Offending command was: \"%s\", name: %s, password: %s" => "Comando infractor: \"%s\", nombre: %s, contraseña: %s",
-"MS SQL username and/or password not valid: %s" => "Usuario y/o contraseña de MS SQL no válidos: %s",
+"PostgreSQL username and/or password not valid" => "Usuario y/o contraseña de PostgreSQL no válidos",
+"Set an admin username." => "Configurar un nombre de usuario del administrador",
+"Set an admin password." => "Configurar la contraseña del administrador.",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Su servidor web aún no está configurado adecuadamente para permitir sincronización de archivos ya que la interfaz WebDAV parece no estar funcionando.",
 "Please double check the <a href='%s'>installation guides</a>." => "Por favor, vuelva a comprobar las <a href='%s'>guías de instalación</a>.",
 "seconds ago" => "hace segundos",
diff --git a/lib/l10n/es_AR.php b/lib/l10n/es_AR.php
index b4b2a33cd011438ba9d6ab0233f20cae6479b186..e66771f7e747eec8e7967969ad987129269f3be3 100644
--- a/lib/l10n/es_AR.php
+++ b/lib/l10n/es_AR.php
@@ -5,6 +5,7 @@
 "Users" => "Usuarios",
 "Apps" => "Aplicaciones",
 "Admin" => "Administración",
+"web services under your control" => "servicios web que controlás",
 "ZIP download is turned off." => "La descarga en ZIP está desactivada.",
 "Files need to be downloaded one by one." => "Los archivos deben ser descargados de a uno.",
 "Back to Files" => "Volver a archivos",
@@ -16,15 +17,11 @@
 "Files" => "Archivos",
 "Text" => "Texto",
 "Images" => "Imágenes",
-"Set an admin username." => "Configurar un nombre de administrador",
-"Set an admin password." => "Configurar una palabra clave de administrador",
 "%s enter the database username." => "%s Entre el Usuario de la Base de Datos",
 "%s enter the database name." => "%s Entre el Nombre de la Base de Datos",
 "%s you may not use dots in the database name" => "%s no puede usar puntos en el nombre de la Base de Datos",
-"%s set the database host." => "%s Especifique la dirección de la Base de Datos",
-"PostgreSQL username and/or password not valid" => "Nombre de usuario o contraseña de PostgradeSQL no válido.",
+"MS SQL username and/or password not valid: %s" => "Nombre de usuario y contraseña de MS SQL no son válidas: %s",
 "You need to enter either an existing account or the administrator." => "Debe ingresar una cuenta existente o el administrador",
-"Oracle connection could not be established" => "No fue posible establecer la conexión a Oracle",
 "MySQL username and/or password not valid" => "Usuario y/o contraseña MySQL no válido",
 "DB Error: \"%s\"" => "Error DB: \"%s\"",
 "Offending command was: \"%s\"" => "El comando no comprendido es: \"%s\"",
@@ -32,9 +29,12 @@
 "Drop this user from MySQL" => "Borrar este usuario de MySQL",
 "MySQL user '%s'@'%%' already exists" => "Usuario MySQL '%s'@'%%' ya existente",
 "Drop this user from MySQL." => "Borrar este usuario de MySQL",
+"Oracle connection could not be established" => "No fue posible establecer la conexión a Oracle",
 "Oracle username and/or password not valid" => "El nombre de usuario y contraseña no son válidos",
 "Offending command was: \"%s\", name: %s, password: %s" => "El comando no comprendido es: \"%s\", nombre: \"%s\", contraseña: \"%s\"",
-"MS SQL username and/or password not valid: %s" => "Nombre de usuario y contraseña de MS SQL no son válidas: %s",
+"PostgreSQL username and/or password not valid" => "Nombre de usuario o contraseña de PostgradeSQL no válido.",
+"Set an admin username." => "Configurar un nombre de administrador",
+"Set an admin password." => "Configurar una palabra clave de administrador",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Tu servidor web no está configurado todavía para permitir sincronización de archivos porque la interfaz WebDAV parece no funcionar.",
 "Please double check the <a href='%s'>installation guides</a>." => "Por favor, comprobá nuevamente la <a href='%s'>guía de instalación</a>.",
 "seconds ago" => "segundos atrás",
diff --git a/lib/l10n/et_EE.php b/lib/l10n/et_EE.php
index 24fc98bde6429bb63445760f67e82e1e850fc780..4da2c36d6acc508824d08c520db3054b61e8d58e 100644
--- a/lib/l10n/et_EE.php
+++ b/lib/l10n/et_EE.php
@@ -5,6 +5,7 @@
 "Users" => "Kasutajad",
 "Apps" => "Rakendused",
 "Admin" => "Admin",
+"web services under your control" => "veebitenused sinu kontrolli all",
 "ZIP download is turned off." => "ZIP-ina allalaadimine on välja lülitatud.",
 "Files need to be downloaded one by one." => "Failid tuleb alla laadida ükshaaval.",
 "Back to Files" => "Tagasi failide juurde",
@@ -16,15 +17,11 @@
 "Files" => "Failid",
 "Text" => "Tekst",
 "Images" => "Pildid",
-"Set an admin username." => "Määra admin kasutajanimi.",
-"Set an admin password." => "Määra admini parool.",
 "%s enter the database username." => "%s sisesta andmebaasi kasutajatunnus.",
 "%s enter the database name." => "%s sisesta andmebaasi nimi.",
 "%s you may not use dots in the database name" => "%s punktide kasutamine andmebaasi nimes pole lubatud",
-"%s set the database host." => "%s määra andmebaasi server.",
-"PostgreSQL username and/or password not valid" => "PostgreSQL kasutajatunnus ja/või parool pole õiged",
+"MS SQL username and/or password not valid: %s" => "MS SQL kasutajatunnus ja/või parool pole õiged: %s",
 "You need to enter either an existing account or the administrator." => "Sisesta kas juba olemasolev konto või administrator.",
-"Oracle connection could not be established" => "Ei suuda luua ühendust Oracle baasiga",
 "MySQL username and/or password not valid" => "MySQL kasutajatunnus ja/või parool pole õiged",
 "DB Error: \"%s\"" => "Andmebaasi viga: \"%s\"",
 "Offending command was: \"%s\"" => "Tõrkuv käsk oli: \"%s\"",
@@ -32,9 +29,12 @@
 "Drop this user from MySQL" => "Kustuta see kasutaja MySQL-ist",
 "MySQL user '%s'@'%%' already exists" => "MySQL kasutaja '%s'@'%%' on juba olemas",
 "Drop this user from MySQL." => "Kustuta see kasutaja MySQL-ist.",
+"Oracle connection could not be established" => "Ei suuda luua ühendust Oracle baasiga",
 "Oracle username and/or password not valid" => "Oracle kasutajatunnus ja/või parool pole õiged",
 "Offending command was: \"%s\", name: %s, password: %s" => "Tõrkuv käsk oli: \"%s\", nimi: %s, parool: %s",
-"MS SQL username and/or password not valid: %s" => "MS SQL kasutajatunnus ja/või parool pole õiged: %s",
+"PostgreSQL username and/or password not valid" => "PostgreSQL kasutajatunnus ja/või parool pole õiged",
+"Set an admin username." => "Määra admin kasutajanimi.",
+"Set an admin password." => "Määra admini parool.",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Veebiserveri ei ole veel korralikult seadistatud võimaldamaks failide sünkroniseerimist, kuna WebDAV liides näib olevat mittetoimiv.",
 "Please double check the <a href='%s'>installation guides</a>." => "Palun tutvu veelkord <a href='%s'>paigalduse juhenditega</a>.",
 "seconds ago" => "sekundit tagasi",
diff --git a/lib/l10n/eu.php b/lib/l10n/eu.php
index 05b68b062c5a6c8c0ec5d81b59e4a4932f1a37e1..028ad0a631efc08673ddd56cfbfd04360cd0428b 100644
--- a/lib/l10n/eu.php
+++ b/lib/l10n/eu.php
@@ -5,6 +5,7 @@
 "Users" => "Erabiltzaileak",
 "Apps" => "Aplikazioak",
 "Admin" => "Admin",
+"web services under your control" => "web zerbitzuak zure kontrolpean",
 "ZIP download is turned off." => "ZIP deskarga ez dago gaituta.",
 "Files need to be downloaded one by one." => "Fitxategiak banan-banan deskargatu behar dira.",
 "Back to Files" => "Itzuli fitxategietara",
@@ -16,13 +17,10 @@
 "Files" => "Fitxategiak",
 "Text" => "Testua",
 "Images" => "Irudiak",
-"Set an admin username." => "Ezarri administraziorako erabiltzaile izena.",
-"Set an admin password." => "Ezarri administraziorako pasahitza.",
 "%s enter the database username." => "%s sartu datu basearen erabiltzaile izena.",
 "%s enter the database name." => "%s sartu datu basearen izena.",
 "%s you may not use dots in the database name" => "%s ezin duzu punturik erabili datu basearen izenean.",
-"%s set the database host." => "%s sartu datu basearen hostalaria.",
-"PostgreSQL username and/or password not valid" => "PostgreSQL erabiltzaile edota pasahitza ez dira egokiak.",
+"MS SQL username and/or password not valid: %s" => "MS SQL erabiltzaile izena edota pasahitza ez dira egokiak: %s",
 "You need to enter either an existing account or the administrator." => "Existitzen den kontu bat edo administradorearena jarri behar duzu.",
 "MySQL username and/or password not valid" => "MySQL erabiltzaile edota pasahitza ez dira egokiak.",
 "DB Error: \"%s\"" => "DB errorea: \"%s\"",
@@ -33,7 +31,9 @@
 "Drop this user from MySQL." => "Ezabatu erabiltzaile hau MySQLtik.",
 "Oracle username and/or password not valid" => "Oracle erabiltzaile edota pasahitza ez dira egokiak.",
 "Offending command was: \"%s\", name: %s, password: %s" => "Errorea komando honek sortu du: \"%s\", izena: %s, pasahitza: %s",
-"MS SQL username and/or password not valid: %s" => "MS SQL erabiltzaile izena edota pasahitza ez dira egokiak: %s",
+"PostgreSQL username and/or password not valid" => "PostgreSQL erabiltzaile edota pasahitza ez dira egokiak.",
+"Set an admin username." => "Ezarri administraziorako erabiltzaile izena.",
+"Set an admin password." => "Ezarri administraziorako pasahitza.",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Zure web zerbitzaria ez dago oraindik ongi konfiguratuta fitxategien sinkronizazioa egiteko, WebDAV interfazea ongi ez dagoela dirudi.",
 "Please double check the <a href='%s'>installation guides</a>." => "Mesedez begiratu <a href='%s'>instalazio gidak</a>.",
 "seconds ago" => "segundu",
diff --git a/lib/l10n/fa.php b/lib/l10n/fa.php
index b0d423421df2ae20e890481f99e199a2ab80abf6..40a778e2126808eb12423e05df095b1c54bf7778 100644
--- a/lib/l10n/fa.php
+++ b/lib/l10n/fa.php
@@ -5,15 +5,36 @@
 "Users" => "کاربران",
 "Apps" => "  برنامه ها",
 "Admin" => "مدیر",
+"web services under your control" => "سرویس های تحت وب در کنترل شما",
 "ZIP download is turned off." => "دانلود به صورت فشرده غیر فعال است",
 "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." => "رمز منقضی شده است. لطفا دوباره صفحه را بارگذاری نمایید.",
 "Files" => "پرونده‌ها",
 "Text" => "متن",
 "Images" => "تصاویر",
+"%s enter the database username." => "%s نام کاربری پایگاه داده را وارد نمایید.",
+"%s enter the database name." => "%s نام پایگاه داده را وارد نمایید.",
+"%s you may not use dots in the database name" => "%s شما نباید از نقطه در نام پایگاه داده استفاده نمایید.",
+"MS SQL username and/or password not valid: %s" => "نام کاربری و / یا رمزعبور MS SQL معتبر نیست:  %s",
+"You need to enter either an existing account or the administrator." => "شما نیاز به وارد کردن یک حساب کاربری موجود یا حساب مدیریتی دارید.",
+"MySQL username and/or password not valid" => "نام کاربری و / یا رمزعبور MySQL  معتبر نیست.",
+"DB Error: \"%s\"" => "خطای پایگاه داده: \"%s\"",
+"Offending command was: \"%s\"" => "دستور متخلف عبارت است از: \"%s\"",
+"MySQL user '%s'@'localhost' exists already." => "کاربرMySQL '%s'@'localhost' درحال حاضر موجود است.",
+"Drop this user from MySQL" => "این کاربر را از MySQL حذف نمایید.",
+"MySQL user '%s'@'%%' already exists" => "کاربر'%s'@'%%'  MySQL  در حال حاضر موجود است.",
+"Drop this user from MySQL." => "این کاربر را از MySQL حذف نمایید.",
+"Oracle connection could not be established" => "ارتباط اراکل نمیتواند برقرار باشد.",
+"Oracle username and/or password not valid" => "نام کاربری و / یا رمزعبور اراکل معتبر نیست.",
+"Offending command was: \"%s\", name: %s, password: %s" => "دستور متخلف عبارت است از: \"%s\"، نام: \"%s\"، رمزعبور:\"%s\"",
+"PostgreSQL username and/or password not valid" => "PostgreSQL نام کاربری و / یا رمزعبور معتبر نیست.",
+"Set an admin username." => "یک نام کاربری برای مدیر تنظیم نمایید.",
+"Set an admin password." => "یک رمزعبور برای مدیر تنظیم نمایید.",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "احتمالاً وب سرور شما طوری تنظیم نشده است که اجازه ی همگام سازی فایلها را بدهد زیرا به نظر میرسد رابط WebDAV از کار افتاده است.",
 "Please double check the <a href='%s'>installation guides</a>." => "لطفاً دوباره <a href='%s'>راهنمای نصب</a>را بررسی کنید.",
 "seconds ago" => "ثانیه‌ها پیش",
diff --git a/lib/l10n/fi_FI.php b/lib/l10n/fi_FI.php
index 0caa7b12df6d5ffc4c9a3a9dc24b5807e8d0c9b2..75576c3034dc59edf81d50ef96a3d6d73139486e 100644
--- a/lib/l10n/fi_FI.php
+++ b/lib/l10n/fi_FI.php
@@ -5,6 +5,7 @@
 "Users" => "Käyttäjät",
 "Apps" => "Sovellukset",
 "Admin" => "Ylläpitäjä",
+"web services under your control" => "verkkopalvelut hallinnassasi",
 "ZIP download is turned off." => "ZIP-lataus on poistettu käytöstä.",
 "Files need to be downloaded one by one." => "Tiedostot on ladattava yksittäin.",
 "Back to Files" => "Takaisin tiedostoihin",
@@ -16,21 +17,21 @@
 "Files" => "Tiedostot",
 "Text" => "Teksti",
 "Images" => "Kuvat",
-"Set an admin username." => "Aseta ylläpitäjän käyttäjätunnus.",
-"Set an admin password." => "Aseta ylläpitäjän salasana.",
 "%s enter the database username." => "%s anna tietokannan käyttäjätunnus.",
 "%s enter the database name." => "%s anna tietokannan nimi.",
 "%s you may not use dots in the database name" => "%s et voi käyttää pisteitä tietokannan nimessä",
-"PostgreSQL username and/or password not valid" => "PostgreSQL:n käyttäjätunnus ja/tai salasana on väärin",
-"Oracle connection could not be established" => "Oracle-yhteyttä ei voitu muodostaa",
+"MS SQL username and/or password not valid: %s" => "MS SQL -käyttäjätunnus ja/tai -salasana on väärin: %s",
 "MySQL username and/or password not valid" => "MySQL:n käyttäjätunnus ja/tai salasana on väärin",
 "DB Error: \"%s\"" => "Tietokantavirhe: \"%s\"",
 "MySQL user '%s'@'localhost' exists already." => "MySQL-käyttäjä '%s'@'localhost' on jo olemassa.",
 "Drop this user from MySQL" => "Pudota tämä käyttäjä MySQL:stä",
 "MySQL user '%s'@'%%' already exists" => "MySQL-käyttäjä '%s'@'%%' on jo olemassa",
 "Drop this user from MySQL." => "Pudota tämä käyttäjä MySQL:stä.",
+"Oracle connection could not be established" => "Oracle-yhteyttä ei voitu muodostaa",
 "Oracle username and/or password not valid" => "Oraclen käyttäjätunnus ja/tai salasana on väärin",
-"MS SQL username and/or password not valid: %s" => "MS SQL -käyttäjätunnus ja/tai -salasana on väärin: %s",
+"PostgreSQL username and/or password not valid" => "PostgreSQL:n käyttäjätunnus ja/tai salasana on väärin",
+"Set an admin username." => "Aseta ylläpitäjän käyttäjätunnus.",
+"Set an admin password." => "Aseta ylläpitäjän salasana.",
 "Please double check the <a href='%s'>installation guides</a>." => "Lue tarkasti <a href='%s'>asennusohjeet</a>.",
 "seconds ago" => "sekuntia sitten",
 "1 minute ago" => "1 minuutti sitten",
diff --git a/lib/l10n/fr.php b/lib/l10n/fr.php
index aed5d056f370dc6af67db055595cc0a19cd16ce4..9f30b60269654c19a585217b72ae0d80483b48ee 100644
--- a/lib/l10n/fr.php
+++ b/lib/l10n/fr.php
@@ -5,6 +5,7 @@
 "Users" => "Utilisateurs",
 "Apps" => "Applications",
 "Admin" => "Administration",
+"web services under your control" => "services web sous votre contrôle",
 "ZIP download is turned off." => "Téléchargement ZIP désactivé.",
 "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",
@@ -16,15 +17,11 @@
 "Files" => "Fichiers",
 "Text" => "Texte",
 "Images" => "Images",
-"Set an admin username." => "Spécifiez un nom d'utilisateur pour l'administrateur.",
-"Set an admin password." => "Spécifiez un mot de passe administrateur.",
 "%s enter the database username." => "%s entrez le nom d'utilisateur de la base de données.",
 "%s enter the database name." => "%s entrez le nom de la base de données.",
 "%s you may not use dots in the database name" => "%s vous nez pouvez pas utiliser de points dans le nom de la base de données",
-"%s set the database host." => "%s spécifiez l'hôte de la base de données.",
-"PostgreSQL username and/or password not valid" => "Nom d'utilisateur et/ou mot de passe de la base PostgreSQL invalide",
+"MS SQL username and/or password not valid: %s" => "Le nom d'utilisateur et/ou le mot de passe de la base MS SQL est invalide : %s",
 "You need to enter either an existing account or the administrator." => "Vous devez spécifier soit le nom d'un compte existant, soit celui de l'administrateur.",
-"Oracle connection could not be established" => "La connexion Oracle ne peut pas être établie",
 "MySQL username and/or password not valid" => "Nom d'utilisateur et/ou mot de passe de la base MySQL invalide",
 "DB Error: \"%s\"" => "Erreur de la base de données : \"%s\"",
 "Offending command was: \"%s\"" => "La requête en cause est : \"%s\"",
@@ -32,9 +29,12 @@
 "Drop this user from MySQL" => "Retirer cet utilisateur de la base MySQL",
 "MySQL user '%s'@'%%' already exists" => "L'utilisateur MySQL '%s'@'%%' existe déjà",
 "Drop this user from MySQL." => "Retirer cet utilisateur de la base MySQL.",
+"Oracle connection could not be established" => "La connexion Oracle ne peut pas être établie",
 "Oracle username and/or password not valid" => "Nom d'utilisateur et/ou mot de passe de la base Oracle invalide",
 "Offending command was: \"%s\", name: %s, password: %s" => "La requête en cause est : \"%s\", nom : %s, mot de passe : %s",
-"MS SQL username and/or password not valid: %s" => "Le nom d'utilisateur et/ou le mot de passe de la base MS SQL est invalide : %s",
+"PostgreSQL username and/or password not valid" => "Nom d'utilisateur et/ou mot de passe de la base PostgreSQL invalide",
+"Set an admin username." => "Spécifiez un nom d'utilisateur pour l'administrateur.",
+"Set an admin password." => "Spécifiez un mot de passe administrateur.",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Votre serveur web, n'est pas correctement configuré pour permettre la synchronisation des fichiers, car l'interface WebDav ne fonctionne pas comme il faut.",
 "Please double check the <a href='%s'>installation guides</a>." => "Veuillez vous référer au <a href='%s'>guide d'installation</a>.",
 "seconds ago" => "il y a quelques secondes",
diff --git a/lib/l10n/gl.php b/lib/l10n/gl.php
index 1b4db4b30af86b704d60b400c12c1a9cfd3ec15c..351f18c715588f9a45bbb25e0ab3f09331f6bafc 100644
--- a/lib/l10n/gl.php
+++ b/lib/l10n/gl.php
@@ -5,6 +5,7 @@
 "Users" => "Usuarios",
 "Apps" => "Aplicativos",
 "Admin" => "Administración",
+"web services under your control" => "servizos web baixo o seu control",
 "ZIP download is turned off." => "As descargas ZIP están desactivadas.",
 "Files need to be downloaded one by one." => "Os ficheiros necesitan seren descargados dun en un.",
 "Back to Files" => "Volver aos ficheiros",
@@ -16,15 +17,11 @@
 "Files" => "Ficheiros",
 "Text" => "Texto",
 "Images" => "Imaxes",
-"Set an admin username." => "Estabeleza un nome de usuario administrador",
-"Set an admin password." => "Estabeleza un contrasinal de administrador",
 "%s enter the database username." => "%s introduza o nome de usuario da base de datos",
 "%s enter the database name." => "%s introduza o nome da base de datos",
 "%s you may not use dots in the database name" => "%s non se poden empregar puntos na base de datos",
-"%s set the database host." => "%s estabeleza o servidor da base de datos",
-"PostgreSQL username and/or password not valid" => "Nome de usuario e/ou contrasinal de PostgreSQL incorrecto",
+"MS SQL username and/or password not valid: %s" => "Nome de usuario e/ou contrasinal de MS SQL incorrecto: %s",
 "You need to enter either an existing account or the administrator." => "Deberá introducir unha conta existente ou o administrador.",
-"Oracle connection could not be established" => "Non foi posíbel estabelecer a conexión con Oracle",
 "MySQL username and/or password not valid" => "Nome de usuario e/ou contrasinal de MySQL incorrecto",
 "DB Error: \"%s\"" => "Produciuse un erro na base de datos: «%s»",
 "Offending command was: \"%s\"" => "A orde ofensiva foi: «%s»",
@@ -32,9 +29,12 @@
 "Drop this user from MySQL" => "Omitir este usuario de MySQL",
 "MySQL user '%s'@'%%' already exists" => "O usuario MySQL «%s»@«%%» xa existe.",
 "Drop this user from MySQL." => "Omitir este usuario de MySQL.",
+"Oracle connection could not be established" => "Non foi posíbel estabelecer a conexión con Oracle",
 "Oracle username and/or password not valid" => "Nome de usuario e/ou contrasinal de Oracle incorrecto",
 "Offending command was: \"%s\", name: %s, password: %s" => "A orde ofensiva foi: «%s», nome: %s, contrasinal: %s",
-"MS SQL username and/or password not valid: %s" => "Nome de usuario e/ou contrasinal de MS SQL incorrecto: %s",
+"PostgreSQL username and/or password not valid" => "Nome de usuario e/ou contrasinal de PostgreSQL incorrecto",
+"Set an admin username." => "Estabeleza un nome de usuario administrador",
+"Set an admin password." => "Estabeleza un contrasinal de administrador",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "O seu servidor web non está aínda configurado adecuadamente para permitir a sincronización de ficheiros xa que semella que a interface WebDAV non está a funcionar.",
 "Please double check the <a href='%s'>installation guides</a>." => "Volva comprobar as <a href='%s'>guías de instalación</a>",
 "seconds ago" => "segundos atrás",
diff --git a/lib/l10n/he.php b/lib/l10n/he.php
index 0069d77eee414ddde8cec366df952486029c5860..2e011e342a07d923cc0902c68e71758e6251bad1 100644
--- a/lib/l10n/he.php
+++ b/lib/l10n/he.php
@@ -5,6 +5,7 @@
 "Users" => "משתמשים",
 "Apps" => "יישומים",
 "Admin" => "מנהל",
+"web services under your control" => "שירותי רשת תחת השליטה שלך",
 "ZIP download is turned off." => "הורדת ZIP כבויה",
 "Files need to be downloaded one by one." => "יש להוריד את הקבצים אחד אחרי השני.",
 "Back to Files" => "חזרה לקבצים",
diff --git a/lib/l10n/hr.php b/lib/l10n/hr.php
index 3ce75c99f0e016c3a7a2b7e09e35bfde93994bdb..41c34d3108cafab4f3795a0b2aa0c5f613f89f0e 100644
--- a/lib/l10n/hr.php
+++ b/lib/l10n/hr.php
@@ -5,6 +5,7 @@
 "Users" => "Korisnici",
 "Apps" => "Aplikacije",
 "Admin" => "Administrator",
+"web services under your control" => "web usluge pod vašom kontrolom",
 "Authentication error" => "Greška kod autorizacije",
 "Files" => "Datoteke",
 "Text" => "Tekst",
diff --git a/lib/l10n/hu_HU.php b/lib/l10n/hu_HU.php
index 3b5c886bd2cb532b57224c5bb172cb3851a455cb..3aa04274fa3a7db07fd3bcf58ab037920684c543 100644
--- a/lib/l10n/hu_HU.php
+++ b/lib/l10n/hu_HU.php
@@ -5,6 +5,7 @@
 "Users" => "Felhasználók",
 "Apps" => "Alkalmazások",
 "Admin" => "Adminsztráció",
+"web services under your control" => "webszolgáltatások saját kézben",
 "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",
@@ -16,15 +17,11 @@
 "Files" => "Fájlok",
 "Text" => "Szöveg",
 "Images" => "Képek",
-"Set an admin username." => "Állítson be egy felhasználói nevet az adminisztrációhoz.",
-"Set an admin password." => "Állítson be egy jelszót az adminisztrációhoz.",
 "%s enter the database username." => "%s adja meg az adatbázist elérő felhasználó login nevét.",
 "%s enter the database name." => "%s adja meg az adatbázis nevét.",
 "%s you may not use dots in the database name" => "%s az adatbázis neve nem tartalmazhat pontot",
-"%s set the database host." => "%s adja meg az adatbázist szolgáltató számítógép nevét.",
-"PostgreSQL username and/or password not valid" => "A PostgreSQL felhasználói név és/vagy jelszó érvénytelen",
+"MS SQL username and/or password not valid: %s" => "Az MS SQL felhasználónév és/vagy jelszó érvénytelen: %s",
 "You need to enter either an existing account or the administrator." => "Vagy egy létező felhasználó vagy az adminisztrátor bejelentkezési nevét kell megadnia",
-"Oracle connection could not be established" => "Az Oracle kapcsolat nem hozható létre",
 "MySQL username and/or password not valid" => "A MySQL felhasználói név és/vagy jelszó érvénytelen",
 "DB Error: \"%s\"" => "Adatbázis hiba: \"%s\"",
 "Offending command was: \"%s\"" => "A hibát ez a parancs okozta: \"%s\"",
@@ -32,9 +29,12 @@
 "Drop this user from MySQL" => "Törölje ezt a felhasználót a MySQL-ből",
 "MySQL user '%s'@'%%' already exists" => "A '%s'@'%%' MySQL felhasználó már létezik",
 "Drop this user from MySQL." => "Törölje ezt a felhasználót a MySQL-ből.",
+"Oracle connection could not be established" => "Az Oracle kapcsolat nem hozható létre",
 "Oracle username and/or password not valid" => "Az Oracle felhasználói név és/vagy jelszó érvénytelen",
 "Offending command was: \"%s\", name: %s, password: %s" => "A hibát okozó parancs ez volt: \"%s\", login név: %s, jelszó: %s",
-"MS SQL username and/or password not valid: %s" => "Az MS SQL felhasználónév és/vagy jelszó érvénytelen: %s",
+"PostgreSQL username and/or password not valid" => "A PostgreSQL felhasználói név és/vagy jelszó érvénytelen",
+"Set an admin username." => "Állítson be egy felhasználói nevet az adminisztrációhoz.",
+"Set an admin password." => "Állítson be egy jelszót az adminisztrációhoz.",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Az Ön webkiszolgálója nincs megfelelően beállítva az állományok szinkronizálásához, mert a WebDAV-elérés úgy tűnik, nem működik.",
 "Please double check the <a href='%s'>installation guides</a>." => "Kérjük tüzetesen tanulmányozza át a <a href='%s'>telepítési útmutatót</a>.",
 "seconds ago" => "pár másodperce",
diff --git a/lib/l10n/ia.php b/lib/l10n/ia.php
index 573281553fcc031065264c1999a3213a713597e2..e5f6e3ddf581c438612c158c524950ca50166836 100644
--- a/lib/l10n/ia.php
+++ b/lib/l10n/ia.php
@@ -5,6 +5,7 @@
 "Users" => "Usatores",
 "Apps" => "Applicationes",
 "Admin" => "Administration",
+"web services under your control" => "servicios web sub tu controlo",
 "Files" => "Files",
 "Text" => "Texto"
 );
diff --git a/lib/l10n/id.php b/lib/l10n/id.php
index 29843a9532702c26ee0c83f51d6e7c6b38bd321d..c247651f0c969246ce7c89d0ceab175673dd4ec6 100644
--- a/lib/l10n/id.php
+++ b/lib/l10n/id.php
@@ -5,6 +5,7 @@
 "Users" => "Pengguna",
 "Apps" => "Aplikasi",
 "Admin" => "Admin",
+"web services under your control" => "layanan web dalam kontrol Anda",
 "ZIP download is turned off." => "Pengunduhan ZIP dimatikan.",
 "Files need to be downloaded one by one." => "Berkas harus diunduh satu persatu.",
 "Back to Files" => "Kembali ke Daftar Berkas",
@@ -16,13 +17,10 @@
 "Files" => "Berkas",
 "Text" => "Teks",
 "Images" => "Gambar",
-"Set an admin username." => "Setel nama pengguna admin.",
-"Set an admin password." => "Setel sandi admin.",
 "%s enter the database username." => "%s masukkan nama pengguna basis data.",
 "%s enter the database name." => "%s masukkan nama basis data.",
 "%s you may not use dots in the database name" => "%sAnda tidak boleh menggunakan karakter titik pada nama basis data",
-"%s set the database host." => "%s setel host basis data.",
-"PostgreSQL username and/or password not valid" => "Nama pengguna dan/atau sandi PostgreSQL tidak valid",
+"MS SQL username and/or password not valid: %s" => "Nama pengguna dan/atau sandi MySQL tidak valid: %s",
 "You need to enter either an existing account or the administrator." => "Anda harus memasukkan akun yang sudah ada atau administrator.",
 "MySQL username and/or password not valid" => "Nama pengguna dan/atau sandi MySQL tidak valid",
 "DB Error: \"%s\"" => "Galat Basis Data: \"%s\"",
@@ -33,7 +31,9 @@
 "Drop this user from MySQL." => "Hapus pengguna ini dari MySQL.",
 "Oracle username and/or password not valid" => "Nama pengguna dan/atau sandi Oracle tidak valid",
 "Offending command was: \"%s\", name: %s, password: %s" => "Perintah yang bermasalah: \"%s\", nama pengguna: %s, sandi: %s",
-"MS SQL username and/or password not valid: %s" => "Nama pengguna dan/atau sandi MySQL tidak valid: %s",
+"PostgreSQL username and/or password not valid" => "Nama pengguna dan/atau sandi PostgreSQL tidak valid",
+"Set an admin username." => "Setel nama pengguna admin.",
+"Set an admin password." => "Setel sandi admin.",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Web server Anda belum dikonfigurasikan dengan baik untuk mengizinkan sinkronisasi berkas karena tampaknya antarmuka WebDAV rusak.",
 "Please double check the <a href='%s'>installation guides</a>." => "Silakan periksa ulang <a href='%s'>panduan instalasi</a>.",
 "seconds ago" => "beberapa detik yang lalu",
diff --git a/lib/l10n/is.php b/lib/l10n/is.php
index 05bb68839536a50f936d5dd3f4c02edd772c20fa..0f7a22fd13ef1e34560201d2b6952ac13f44c824 100644
--- a/lib/l10n/is.php
+++ b/lib/l10n/is.php
@@ -5,6 +5,7 @@
 "Users" => "Notendur",
 "Apps" => "Forrit",
 "Admin" => "Stjórnun",
+"web services under your control" => "vefþjónusta undir þinni stjórn",
 "ZIP download is turned off." => "Slökkt á ZIP niðurhali.",
 "Files need to be downloaded one by one." => "Skrárnar verður að sækja eina og eina",
 "Back to Files" => "Aftur í skrár",
diff --git a/lib/l10n/it.php b/lib/l10n/it.php
index db26ac82ae3422663b8f01e72010f14fdf269afd..74483315ca016f9fbe1fc23722e3e324a94202bf 100644
--- a/lib/l10n/it.php
+++ b/lib/l10n/it.php
@@ -5,6 +5,7 @@
 "Users" => "Utenti",
 "Apps" => "Applicazioni",
 "Admin" => "Admin",
+"web services under your control" => "servizi web nelle tue mani",
 "ZIP download is turned off." => "Lo scaricamento in formato ZIP è stato disabilitato.",
 "Files need to be downloaded one by one." => "I file devono essere scaricati uno alla volta.",
 "Back to Files" => "Torna ai file",
@@ -16,15 +17,11 @@
 "Files" => "File",
 "Text" => "Testo",
 "Images" => "Immagini",
-"Set an admin username." => "Imposta un nome utente di amministrazione.",
-"Set an admin password." => "Imposta una password di amministrazione.",
 "%s enter the database username." => "%s digita il nome utente del database.",
 "%s enter the database name." => "%s digita il nome del database.",
 "%s you may not use dots in the database name" => "%s non dovresti utilizzare punti nel nome del database",
-"%s set the database host." => "%s imposta l'host del database.",
-"PostgreSQL username and/or password not valid" => "Nome utente e/o password di PostgreSQL non validi",
+"MS SQL username and/or password not valid: %s" => "Nome utente e/o password MS SQL non validi: %s",
 "You need to enter either an existing account or the administrator." => "È necessario inserire un account esistente o l'amministratore.",
-"Oracle connection could not be established" => "La connessione a Oracle non può essere stabilita",
 "MySQL username and/or password not valid" => "Nome utente e/o password di MySQL non validi",
 "DB Error: \"%s\"" => "Errore DB: \"%s\"",
 "Offending command was: \"%s\"" => "Il comando non consentito era: \"%s\"",
@@ -32,9 +29,12 @@
 "Drop this user from MySQL" => "Elimina questo utente da MySQL",
 "MySQL user '%s'@'%%' already exists" => "L'utente MySQL '%s'@'%%' esiste già",
 "Drop this user from MySQL." => "Elimina questo utente da MySQL.",
+"Oracle connection could not be established" => "La connessione a Oracle non può essere stabilita",
 "Oracle username and/or password not valid" => "Nome utente e/o password di Oracle non validi",
 "Offending command was: \"%s\", name: %s, password: %s" => "Il comando non consentito era: \"%s\", nome: %s, password: %s",
-"MS SQL username and/or password not valid: %s" => "Nome utente e/o password MS SQL non validi: %s",
+"PostgreSQL username and/or password not valid" => "Nome utente e/o password di PostgreSQL non validi",
+"Set an admin username." => "Imposta un nome utente di amministrazione.",
+"Set an admin password." => "Imposta una password di amministrazione.",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Il tuo server web non è configurato correttamente per consentire la sincronizzazione dei file poiché l'interfaccia WebDAV sembra essere danneggiata.",
 "Please double check the <a href='%s'>installation guides</a>." => "Leggi attentamente le <a href='%s'>guide d'installazione</a>.",
 "seconds ago" => "secondi fa",
diff --git a/lib/l10n/ja_JP.php b/lib/l10n/ja_JP.php
index a2eb4bee67bc6c824c325dd165fe08823519c3a4..36d06d360b95ec3158e0440812d39db9bf3e2cb0 100644
--- a/lib/l10n/ja_JP.php
+++ b/lib/l10n/ja_JP.php
@@ -5,6 +5,7 @@
 "Users" => "ユーザ",
 "Apps" => "アプリ",
 "Admin" => "管理",
+"web services under your control" => "管理下のウェブサービス",
 "ZIP download is turned off." => "ZIPダウンロードは無効です。",
 "Files need to be downloaded one by one." => "ファイルは1つずつダウンロードする必要があります。",
 "Back to Files" => "ファイルに戻る",
@@ -16,15 +17,11 @@
 "Files" => "ファイル",
 "Text" => "TTY TDD",
 "Images" => "画像",
-"Set an admin username." => "管理者のユーザ名を設定。",
-"Set an admin password." => "管理者のパスワードを設定。",
 "%s enter the database username." => "%s のデータベースのユーザ名を入力してください。",
 "%s enter the database name." => "%s のデータベース名を入力してください。",
 "%s you may not use dots in the database name" => "%s ではデータベース名にドットを利用できないかもしれません。",
-"%s set the database host." => "%s にデータベースホストを設定します。",
-"PostgreSQL username and/or password not valid" => "PostgreSQLのユーザ名もしくはパスワードは有効ではありません",
+"MS SQL username and/or password not valid: %s" => "MS SQL サーバーのユーザー名/パスワードが正しくありません: %s",
 "You need to enter either an existing account or the administrator." => "既存のアカウントもしくは管理者のどちらかを入力する必要があります。",
-"Oracle connection could not be established" => "Oracleへの接続が確立できませんでした。",
 "MySQL username and/or password not valid" => "MySQLのユーザ名もしくはパスワードは有効ではありません",
 "DB Error: \"%s\"" => "DBエラー: \"%s\"",
 "Offending command was: \"%s\"" => "違反コマンド: \"%s\"",
@@ -32,9 +29,12 @@
 "Drop this user from MySQL" => "MySQLからこのユーザを削除",
 "MySQL user '%s'@'%%' already exists" => "MySQLのユーザ '%s'@'%%' はすでに存在します。",
 "Drop this user from MySQL." => "MySQLからこのユーザを削除する。",
+"Oracle connection could not be established" => "Oracleへの接続が確立できませんでした。",
 "Oracle username and/or password not valid" => "Oracleのユーザ名もしくはパスワードは有効ではありません",
 "Offending command was: \"%s\", name: %s, password: %s" => "違反コマンド: \"%s\"、名前: %s、パスワード: %s",
-"MS SQL username and/or password not valid: %s" => "MS SQL サーバーのユーザー名/パスワードが正しくありません: %s",
+"PostgreSQL username and/or password not valid" => "PostgreSQLのユーザ名もしくはパスワードは有効ではありません",
+"Set an admin username." => "管理者のユーザ名を設定。",
+"Set an admin password." => "管理者のパスワードを設定。",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "WebDAVインタフェースが動作していないと考えられるため、あなたのWEBサーバはまだファイルの同期を許可するように適切な設定がされていません。",
 "Please double check the <a href='%s'>installation guides</a>." => "<a href='%s'>インストールガイド</a>をよく確認してください。",
 "seconds ago" => "数秒前",
diff --git a/lib/l10n/ka_GE.php b/lib/l10n/ka_GE.php
index 93835e4ead7a69ba3f2b512bcc79061c260ffa86..c6e77da2dac6ce36a9e3a3ebcced02731639ab14 100644
--- a/lib/l10n/ka_GE.php
+++ b/lib/l10n/ka_GE.php
@@ -5,6 +5,7 @@
 "Users" => "მომხმარებელი",
 "Apps" => "აპლიკაციები",
 "Admin" => "ადმინისტრატორი",
+"web services under your control" => "web services under your control",
 "ZIP download is turned off." => "ZIP download–ი გათიშულია",
 "Files need to be downloaded one by one." => "ფაილები უნდა გადმოიტვირთოს სათითაოდ.",
 "Back to Files" => "უკან ფაილებში",
@@ -16,13 +17,10 @@
 "Files" => "ფაილები",
 "Text" => "ტექსტი",
 "Images" => "სურათები",
-"Set an admin username." => "დააყენეთ ადმინისტრატორის სახელი.",
-"Set an admin password." => "დააყენეთ ადმინისტრატორის პაროლი.",
 "%s enter the database username." => "%s შეიყვანეთ ბაზის იუზერნეიმი.",
 "%s enter the database name." => "%s შეიყვანეთ ბაზის სახელი.",
 "%s you may not use dots in the database name" => "%s არ მიუთითოთ წერტილი ბაზის სახელში",
-"%s set the database host." => "%s მიუთითეთ ბაზის ჰოსტი.",
-"PostgreSQL username and/or password not valid" => "PostgreSQL იუზერნეიმი და/ან პაროლი არ არის სწორი",
+"MS SQL username and/or password not valid: %s" => "MS SQL მომხმარებელი და/ან პაროლი არ არის მართებული: %s",
 "You need to enter either an existing account or the administrator." => "თქვენ უნდა შეიყვანოთ არსებული მომხმარებელის სახელი ან ადმინისტრატორი.",
 "MySQL username and/or password not valid" => "MySQL იუზერნეიმი და/ან პაროლი არ არის სწორი",
 "DB Error: \"%s\"" => "DB შეცდომა: \"%s\"",
@@ -33,7 +31,9 @@
 "Drop this user from MySQL." => "წაშალე ეს მომხამრებელი MySQL–იდან",
 "Oracle username and/or password not valid" => "Oracle იუზერნეიმი და/ან პაროლი არ არის სწორი",
 "Offending command was: \"%s\", name: %s, password: %s" => "Offending ბრძანება იყო: \"%s\", სახელი: %s, პაროლი: %s",
-"MS SQL username and/or password not valid: %s" => "MS SQL მომხმარებელი და/ან პაროლი არ არის მართებული: %s",
+"PostgreSQL username and/or password not valid" => "PostgreSQL იუზერნეიმი და/ან პაროლი არ არის სწორი",
+"Set an admin username." => "დააყენეთ ადმინისტრატორის სახელი.",
+"Set an admin password." => "დააყენეთ ადმინისტრატორის პაროლი.",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "თქვენი web სერვერი არ არის კონფიგურირებული ფაილ სინქრონიზაციისთვის, რადგან WebDAV ინტერფეისი შეიძლება იყოს გატეხილი.",
 "Please double check the <a href='%s'>installation guides</a>." => "გთხოვთ გადაათვალიეროთ <a href='%s'>ინსტალაციის გზამკვლევი</a>.",
 "seconds ago" => "წამის წინ",
diff --git a/lib/l10n/ko.php b/lib/l10n/ko.php
index bf2a68369f162d265eaf4acb31e63c808cf0342e..31245ea96f20e8fc9170087ecec04788e6da3068 100644
--- a/lib/l10n/ko.php
+++ b/lib/l10n/ko.php
@@ -5,6 +5,7 @@
 "Users" => "사용자",
 "Apps" => "앱",
 "Admin" => "관리자",
+"web services under your control" => "내가 관리하는 웹 서비스",
 "ZIP download is turned off." => "ZIP 다운로드가 비활성화되었습니다.",
 "Files need to be downloaded one by one." => "파일을 개별적으로 다운로드해야 합니다.",
 "Back to Files" => "파일로 돌아가기",
@@ -16,6 +17,8 @@
 "Files" => "파일",
 "Text" => "텍스트",
 "Images" => "그림",
+"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "WebDAV 인터페이스가 제대로 작동하지 않습니다. 웹 서버에서 파일 동기화를 사용할 수 있도록 설정이 제대로 되지 않은 것 같습니다.",
+"Please double check the <a href='%s'>installation guides</a>." => "<a href='%s'>설치 가이드</a>를 다시 한 번 확인하십시오.",
 "seconds ago" => "ì´ˆ ì „",
 "1 minute ago" => "1분 전",
 "%d minutes ago" => "%d분 전",
diff --git a/lib/l10n/ku_IQ.php b/lib/l10n/ku_IQ.php
index 20d0249f5691341033c76a6627e7bcaff0a53a53..6d7461a1685ba084616659529e6b7f6b73a2f3b0 100644
--- a/lib/l10n/ku_IQ.php
+++ b/lib/l10n/ku_IQ.php
@@ -3,5 +3,6 @@
 "Settings" => "ده‌ستكاری",
 "Users" => "به‌كارهێنه‌ر",
 "Apps" => "به‌رنامه‌كان",
-"Admin" => "به‌ڕێوه‌به‌ری سه‌ره‌كی"
+"Admin" => "به‌ڕێوه‌به‌ری سه‌ره‌كی",
+"web services under your control" => "ڕاژه‌ی وێب له‌ژێر چاودێریت دایه"
 );
diff --git a/lib/l10n/lb.php b/lib/l10n/lb.php
index 889fc3a377df48bd328e85f9c7022810315cdb78..867b0a3740933c066ac22a84fe4da5944df54660 100644
--- a/lib/l10n/lb.php
+++ b/lib/l10n/lb.php
@@ -3,12 +3,17 @@
 "Personal" => "Perséinlech",
 "Settings" => "Astellungen",
 "Users" => "Benotzer",
-"Apps" => "Applicatiounen",
+"Apps" => "Applikatiounen",
 "Admin" => "Admin",
+"web services under your control" => "Web-Servicer ënnert denger Kontroll",
 "Authentication error" => "Authentifikatioun's Fehler",
 "Files" => "Dateien",
 "Text" => "SMS",
+"seconds ago" => "Sekonnen hir",
+"1 minute ago" => "1 Minutt hir",
 "1 hour ago" => "vrun 1 Stonn",
+"today" => "haut",
+"yesterday" => "gëschter",
 "last month" => "Läschte Mount",
 "last year" => "Läscht Joer",
 "years ago" => "Joren hier"
diff --git a/lib/l10n/lt_LT.php b/lib/l10n/lt_LT.php
index b8268ed4376f0d8f2dbda01238fc5237651f05b0..5e3a04820330d63a346239f9f6384a0a3d62e9da 100644
--- a/lib/l10n/lt_LT.php
+++ b/lib/l10n/lt_LT.php
@@ -5,6 +5,7 @@
 "Users" => "Vartotojai",
 "Apps" => "Programos",
 "Admin" => "Administravimas",
+"web services under your control" => "jūsų valdomos web paslaugos",
 "ZIP download is turned off." => "ZIP atsisiuntimo galimybė yra išjungta.",
 "Files need to be downloaded one by one." => "Failai turi būti parsiunčiami vienas po kito.",
 "Back to Files" => "Atgal į Failus",
diff --git a/lib/l10n/lv.php b/lib/l10n/lv.php
index 140c75af3ce66f6f8fed701000a116b3637e01b6..662f4d5b245647f280d516cd40a23a7faacb230a 100644
--- a/lib/l10n/lv.php
+++ b/lib/l10n/lv.php
@@ -5,6 +5,7 @@
 "Users" => "Lietotāji",
 "Apps" => "Lietotnes",
 "Admin" => "Administratori",
+"web services under your control" => "tīmekļa servisi tavā varā",
 "ZIP download is turned off." => "ZIP lejupielādēšana ir izslēgta.",
 "Files need to be downloaded one by one." => "Datnes var lejupielādēt tikai katru atsevišķi.",
 "Back to Files" => "Atpakaļ pie datnēm",
@@ -16,13 +17,10 @@
 "Files" => "Datnes",
 "Text" => "Teksts",
 "Images" => "Attēli",
-"Set an admin username." => "Iestatiet administratora lietotājvārdu.",
-"Set an admin password." => "Iestatiet administratora paroli.",
 "%s enter the database username." => "%s ievadiet datubāzes lietotājvārdu.",
 "%s enter the database name." => "%s ievadiet datubāzes nosaukumu.",
 "%s you may not use dots in the database name" => "%s datubāžu nosaukumos nedrīkst izmantot punktus",
-"%s set the database host." => "%s iestatiet datubāžu serveri.",
-"PostgreSQL username and/or password not valid" => "Nav derīga PostgreSQL parole un/vai lietotājvārds",
+"MS SQL username and/or password not valid: %s" => "Nav derīga MySQL parole un/vai lietotājvārds — %s",
 "You need to enter either an existing account or the administrator." => "Jums jāievada vai nu esošs vai administratora konts.",
 "MySQL username and/or password not valid" => "Nav derīga MySQL parole un/vai lietotājvārds",
 "DB Error: \"%s\"" => "DB kļūda — “%s”",
@@ -33,7 +31,9 @@
 "Drop this user from MySQL." => "Izmest šo lietotāju no MySQL.",
 "Oracle username and/or password not valid" => "Nav derīga Oracle parole un/vai lietotājvārds",
 "Offending command was: \"%s\", name: %s, password: %s" => "Vainīgā komanda bija \"%s\", vārds: %s, parole: %s",
-"MS SQL username and/or password not valid: %s" => "Nav derīga MySQL parole un/vai lietotājvārds — %s",
+"PostgreSQL username and/or password not valid" => "Nav derīga PostgreSQL parole un/vai lietotājvārds",
+"Set an admin username." => "Iestatiet administratora lietotājvārdu.",
+"Set an admin password." => "Iestatiet administratora paroli.",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Jūsu serveris vēl nav pareizi iestatīts, lai ļautu sinhronizēt datnes, jo izskatās, ka WebDAV saskarne ir salauzta.",
 "Please double check the <a href='%s'>installation guides</a>." => "Lūdzu, vēlreiz pārbaudiet <a href='%s'>instalēšanas palīdzību</a>.",
 "seconds ago" => "sekundes atpakaļ",
diff --git a/lib/l10n/mk.php b/lib/l10n/mk.php
index 34790c93745da0585dda0fa713f87fc0918c3c37..30fa9ab73c1671dd28921507f9bda614491a42aa 100644
--- a/lib/l10n/mk.php
+++ b/lib/l10n/mk.php
@@ -5,6 +5,7 @@
 "Users" => "Корисници",
 "Apps" => "Аппликации",
 "Admin" => "Админ",
+"web services under your control" => "веб сервиси под Ваша контрола",
 "ZIP download is turned off." => "Преземање во ZIP е исклучено",
 "Files need to be downloaded one by one." => "Датотеките треба да се симнат една по една.",
 "Back to Files" => "Назад кон датотеки",
diff --git a/lib/l10n/ms_MY.php b/lib/l10n/ms_MY.php
index 6abbbe86e804794e2f77475790e3a4f8b72e9194..a2930597971a22f126aa800211f9e23feed0a7b8 100644
--- a/lib/l10n/ms_MY.php
+++ b/lib/l10n/ms_MY.php
@@ -5,6 +5,7 @@
 "Users" => "Pengguna",
 "Apps" => "Aplikasi",
 "Admin" => "Admin",
+"web services under your control" => "Perkhidmatan web di bawah kawalan anda",
 "Authentication error" => "Ralat pengesahan",
 "Files" => "Fail-fail",
 "Text" => "Teks"
diff --git a/lib/l10n/my_MM.php b/lib/l10n/my_MM.php
index 5d1812fd742ad4a6919c6c4fa5272d068e4bec6e..f214a1ed79426afd8c884f434201550cca719f25 100644
--- a/lib/l10n/my_MM.php
+++ b/lib/l10n/my_MM.php
@@ -3,6 +3,7 @@
 "Users" => "သုံးစွဲသူ",
 "Apps" => "Apps",
 "Admin" => "အက်ဒမင်",
+"web services under your control" => "သင်၏ထိန်းချုပ်မှု့အောက်တွင်ရှိသော Web services",
 "ZIP download is turned off." => "ZIP ဒေါင်းလုတ်ကိုပိတ်ထားသည်",
 "Files need to be downloaded one by one." => "ဖိုင်များသည် တစ်ခုပြီး တစ်ခုဒေါင်းလုတ်ချရန်လိုအပ်သည်",
 "Back to Files" => "ဖိုင်သို့ပြန်သွားမည်",
diff --git a/lib/l10n/nb_NO.php b/lib/l10n/nb_NO.php
index 23146154c77b1228256c9602ec0c7763ce8d8441..ab2d4f91920f8772a5f2a1d1a17617e8bc47de24 100644
--- a/lib/l10n/nb_NO.php
+++ b/lib/l10n/nb_NO.php
@@ -5,6 +5,7 @@
 "Users" => "Brukere",
 "Apps" => "Apper",
 "Admin" => "Admin",
+"web services under your control" => "web tjenester du kontrollerer",
 "ZIP download is turned off." => "ZIP-nedlasting av avslått",
 "Files need to be downloaded one by one." => "Filene må lastes ned en om gangen",
 "Back to Files" => "Tilbake til filer",
diff --git a/lib/l10n/nl.php b/lib/l10n/nl.php
index 2a6086a5968fb3082830050909f777db76c34dff..de80d1b5d56045a40e9435711892deb80f644deb 100644
--- a/lib/l10n/nl.php
+++ b/lib/l10n/nl.php
@@ -5,6 +5,7 @@
 "Users" => "Gebruikers",
 "Apps" => "Apps",
 "Admin" => "Beheerder",
+"web services under your control" => "Webdiensten in eigen beheer",
 "ZIP download is turned off." => "ZIP download is uitgeschakeld.",
 "Files need to be downloaded one by one." => "Bestanden moeten één voor één worden gedownload.",
 "Back to Files" => "Terug naar bestanden",
@@ -16,15 +17,11 @@
 "Files" => "Bestanden",
 "Text" => "Tekst",
 "Images" => "Afbeeldingen",
-"Set an admin username." => "Stel de gebruikersnaam van de beheerder in.",
-"Set an admin password." => "Stel een beheerderswachtwoord in.",
 "%s enter the database username." => "%s opgeven database gebruikersnaam.",
 "%s enter the database name." => "%s opgeven databasenaam.",
 "%s you may not use dots in the database name" => "%s er mogen geen puntjes in de databasenaam voorkomen",
-"%s set the database host." => "%s instellen databaseservernaam.",
-"PostgreSQL username and/or password not valid" => "PostgreSQL gebruikersnaam en/of wachtwoord ongeldig",
+"MS SQL username and/or password not valid: %s" => "MS SQL gebruikersnaam en/of wachtwoord niet geldig: %s",
 "You need to enter either an existing account or the administrator." => "Geef of een bestaand account op of het beheerdersaccount.",
-"Oracle connection could not be established" => "Er kon geen verbinding met Oracle worden bereikt",
 "MySQL username and/or password not valid" => "MySQL gebruikersnaam en/of wachtwoord ongeldig",
 "DB Error: \"%s\"" => "DB Fout: \"%s\"",
 "Offending command was: \"%s\"" => "Onjuiste commande was: \"%s\"",
@@ -32,9 +29,12 @@
 "Drop this user from MySQL" => "Verwijder deze gebruiker uit MySQL",
 "MySQL user '%s'@'%%' already exists" => "MySQL gebruiker '%s'@'%%' bestaat al",
 "Drop this user from MySQL." => "Verwijder deze gebruiker uit MySQL.",
+"Oracle connection could not be established" => "Er kon geen verbinding met Oracle worden bereikt",
 "Oracle username and/or password not valid" => "Oracle gebruikersnaam en/of wachtwoord ongeldig",
 "Offending command was: \"%s\", name: %s, password: %s" => "Onjuiste commando was: \"%s\", naam: %s, wachtwoord: %s",
-"MS SQL username and/or password not valid: %s" => "MS SQL gebruikersnaam en/of wachtwoord niet geldig: %s",
+"PostgreSQL username and/or password not valid" => "PostgreSQL gebruikersnaam en/of wachtwoord ongeldig",
+"Set an admin username." => "Stel de gebruikersnaam van de beheerder in.",
+"Set an admin password." => "Stel een beheerderswachtwoord in.",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Uw webserver is nog niet goed ingesteld voor bestandssynchronisatie omdat de WebDAV interface verbroken lijkt.",
 "Please double check the <a href='%s'>installation guides</a>." => "Controleer de <a href='%s'>installatiehandleiding</a> goed.",
 "seconds ago" => "seconden geleden",
diff --git a/lib/l10n/nn_NO.php b/lib/l10n/nn_NO.php
index 8241573f9aeda9afeff0e54a914fa712045fdb70..c17393981095d8b4e545dcc466894654632b41d7 100644
--- a/lib/l10n/nn_NO.php
+++ b/lib/l10n/nn_NO.php
@@ -5,6 +5,7 @@
 "Users" => "Brukarar",
 "Apps" => "Program",
 "Admin" => "Administrer",
+"web services under your control" => "Vev tjenester under din kontroll",
 "Authentication error" => "Feil i autentisering",
 "Files" => "Filer",
 "Text" => "Tekst",
diff --git a/lib/l10n/oc.php b/lib/l10n/oc.php
index 85e2a27b431034519f3dee9b83807fb021223762..a72da90790aca632ed309f0e5f7f6a43b0414fc7 100644
--- a/lib/l10n/oc.php
+++ b/lib/l10n/oc.php
@@ -5,6 +5,7 @@
 "Users" => "Usancièrs",
 "Apps" => "Apps",
 "Admin" => "Admin",
+"web services under your control" => "Services web jos ton contraròtle",
 "ZIP download is turned off." => "Avalcargar los ZIP es inactiu.",
 "Files need to be downloaded one by one." => "Los fichièrs devan èsser avalcargats un per un.",
 "Back to Files" => "Torna cap als fichièrs",
diff --git a/lib/l10n/pl.php b/lib/l10n/pl.php
index 53a9290785c9e200b3b83fbd3a3b89cdc4ba5232..bbca1913b70c1417e918b0044eb9770d9e1d6cec 100644
--- a/lib/l10n/pl.php
+++ b/lib/l10n/pl.php
@@ -5,6 +5,7 @@
 "Users" => "Użytkownicy",
 "Apps" => "Aplikacje",
 "Admin" => "Administrator",
+"web services under your control" => "Kontrolowane serwisy",
 "ZIP download is turned off." => "Pobieranie ZIP jest wyłączone.",
 "Files need to be downloaded one by one." => "Pliki muszą zostać pobrane pojedynczo.",
 "Back to Files" => "Wróć do plików",
@@ -16,15 +17,11 @@
 "Files" => "Pliki",
 "Text" => "Połączenie tekstowe",
 "Images" => "Obrazy",
-"Set an admin username." => "Ustaw nazwÄ™ administratora.",
-"Set an admin password." => "Ustaw hasło administratora.",
 "%s enter the database username." => "%s wpisz nazwę użytkownika do  bazy",
 "%s enter the database name." => "%s wpisz nazwÄ™ bazy.",
 "%s you may not use dots in the database name" => "%s nie można używać kropki w nazwie bazy danych",
-"%s set the database host." => "%s ustaw hosta bazy danych.",
-"PostgreSQL username and/or password not valid" => "PostgreSQL: Nazwa użytkownika i/lub hasło jest niepoprawne",
+"MS SQL username and/or password not valid: %s" => "Nazwa i/lub hasło serwera MS SQL jest niepoprawne: %s.",
 "You need to enter either an existing account or the administrator." => "Należy wprowadzić istniejące konto użytkownika lub  administratora.",
-"Oracle connection could not be established" => "Nie można ustanowić połączenia z bazą Oracle",
 "MySQL username and/or password not valid" => "MySQL: Nazwa użytkownika i/lub hasło jest niepoprawne",
 "DB Error: \"%s\"" => "BÅ‚Ä…d DB: \"%s\"",
 "Offending command was: \"%s\"" => "Niepoprawna komenda: \"%s\"",
@@ -32,9 +29,12 @@
 "Drop this user from MySQL" => "Usuń tego użytkownika z MySQL",
 "MySQL user '%s'@'%%' already exists" => "Użytkownik MySQL  '%s'@'%%t' już istnieje",
 "Drop this user from MySQL." => "Usuń tego użytkownika z MySQL.",
+"Oracle connection could not be established" => "Nie można ustanowić połączenia z bazą Oracle",
 "Oracle username and/or password not valid" => "Oracle: Nazwa użytkownika i/lub hasło jest niepoprawne",
 "Offending command was: \"%s\", name: %s, password: %s" => "Niepoprawne polecania:  \"%s\", nazwa: %s, hasło: %s",
-"MS SQL username and/or password not valid: %s" => "Nazwa i/lub hasło serwera MS SQL jest niepoprawne: %s.",
+"PostgreSQL username and/or password not valid" => "PostgreSQL: Nazwa użytkownika i/lub hasło jest niepoprawne",
+"Set an admin username." => "Ustaw nazwÄ™ administratora.",
+"Set an admin password." => "Ustaw hasło administratora.",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Serwer internetowy nie jest jeszcze poprawnie skonfigurowany, aby umożliwić synchronizację plików, ponieważ interfejs WebDAV wydaje się być uszkodzony.",
 "Please double check the <a href='%s'>installation guides</a>." => "Sprawdź ponownie <a href='%s'>przewodniki instalacji</a>.",
 "seconds ago" => "sekund temu",
diff --git a/lib/l10n/pt_BR.php b/lib/l10n/pt_BR.php
index 9606477d945a1e9141dd55426d36cd7acb080a1b..029331fdec8206b9f6d769619fcac3ece2424287 100644
--- a/lib/l10n/pt_BR.php
+++ b/lib/l10n/pt_BR.php
@@ -5,6 +5,7 @@
 "Users" => "Usuários",
 "Apps" => "Aplicações",
 "Admin" => "Admin",
+"web services under your control" => "serviços web sob seu controle",
 "ZIP download is turned off." => "Download ZIP está desligado.",
 "Files need to be downloaded one by one." => "Arquivos precisam ser baixados um de cada vez.",
 "Back to Files" => "Voltar para Arquivos",
@@ -16,15 +17,11 @@
 "Files" => "Arquivos",
 "Text" => "Texto",
 "Images" => "Imagens",
-"Set an admin username." => "Defina um nome de usuário de administrador.",
-"Set an admin password." => "Defina uma senha de administrador.",
 "%s enter the database username." => "%s insira o nome de usuário do banco de dados.",
 "%s enter the database name." => "%s insira o nome do banco de dados.",
 "%s you may not use dots in the database name" => "%s você não pode usar pontos no nome do banco de dados",
-"%s set the database host." => "%s defina o host do banco de dados.",
-"PostgreSQL username and/or password not valid" => "Nome de usuário e/ou senha PostgreSQL inválido(s)",
+"MS SQL username and/or password not valid: %s" => "Nome de usuário e/ou senha MS SQL inválido(s): %s",
 "You need to enter either an existing account or the administrator." => "Você precisa inserir uma conta existente ou o administrador.",
-"Oracle connection could not be established" => "Conexão Oracle não pode ser estabelecida",
 "MySQL username and/or password not valid" => "Nome de usuário e/ou senha MySQL inválido(s)",
 "DB Error: \"%s\"" => "Erro no BD: \"%s\"",
 "Offending command was: \"%s\"" => "Comando ofensivo era: \"%s\"",
@@ -32,9 +29,12 @@
 "Drop this user from MySQL" => "Derrubar este usuário do MySQL",
 "MySQL user '%s'@'%%' already exists" => "Usuário MySQL '%s'@'%%' já existe",
 "Drop this user from MySQL." => "Derrube este usuário do MySQL.",
+"Oracle connection could not be established" => "Conexão Oracle não pode ser estabelecida",
 "Oracle username and/or password not valid" => "Nome de usuário e/ou senha Oracle inválido(s)",
 "Offending command was: \"%s\", name: %s, password: %s" => "Comando ofensivo era: \"%s\", nome: %s, senha: %s",
-"MS SQL username and/or password not valid: %s" => "Nome de usuário e/ou senha MS SQL inválido(s): %s",
+"PostgreSQL username and/or password not valid" => "Nome de usuário e/ou senha PostgreSQL inválido(s)",
+"Set an admin username." => "Defina um nome de usuário de administrador.",
+"Set an admin password." => "Defina uma senha de administrador.",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Seu servidor web não está configurado corretamente para permitir sincronização de arquivos porque a interface WebDAV parece estar quebrada.",
 "Please double check the <a href='%s'>installation guides</a>." => "Por favor, confira os <a href='%s'>guias de instalação</a>.",
 "seconds ago" => "segundos atrás",
diff --git a/lib/l10n/pt_PT.php b/lib/l10n/pt_PT.php
index f49258157edba3f5d3302e8b35f88e7ec709e936..7480026e920d43f5fd42e18989a5219c6effd90f 100644
--- a/lib/l10n/pt_PT.php
+++ b/lib/l10n/pt_PT.php
@@ -5,6 +5,7 @@
 "Users" => "Utilizadores",
 "Apps" => "Aplicações",
 "Admin" => "Admin",
+"web services under your control" => "serviços web sob o seu controlo",
 "ZIP download is turned off." => "Descarregamento em ZIP está desligado.",
 "Files need to be downloaded one by one." => "Os ficheiros precisam de ser descarregados um por um.",
 "Back to Files" => "Voltar a Ficheiros",
@@ -16,15 +17,11 @@
 "Files" => "Ficheiros",
 "Text" => "Texto",
 "Images" => "Imagens",
-"Set an admin username." => "Definir um nome de utilizador de administrador",
-"Set an admin password." => "Definiar uma password de administrador",
 "%s enter the database username." => "%s introduza o nome de utilizador da base de dados",
 "%s enter the database name." => "%s introduza o nome da base de dados",
 "%s you may not use dots in the database name" => "%s não é permitido utilizar pontos (.) no nome da base de dados",
-"%s set the database host." => "%s defina o servidor da base de dados (geralmente localhost)",
-"PostgreSQL username and/or password not valid" => "Nome de utilizador/password do PostgreSQL inválido",
+"MS SQL username and/or password not valid: %s" => "Nome de utilizador/password do MySQL é inválido: %s",
 "You need to enter either an existing account or the administrator." => "Precisa de introduzir uma conta existente ou de administrador",
-"Oracle connection could not be established" => "Não foi possível estabelecer a ligação Oracle",
 "MySQL username and/or password not valid" => "Nome de utilizador/password do MySQL inválida",
 "DB Error: \"%s\"" => "Erro na BD: \"%s\"",
 "Offending command was: \"%s\"" => "O comando gerador de erro foi: \"%s\"",
@@ -32,9 +29,12 @@
 "Drop this user from MySQL" => "Eliminar este utilizador do MySQL",
 "MySQL user '%s'@'%%' already exists" => "O utilizador '%s'@'%%' do MySQL já existe",
 "Drop this user from MySQL." => "Eliminar este utilizador do MySQL",
+"Oracle connection could not be established" => "Não foi possível estabelecer a ligação Oracle",
 "Oracle username and/or password not valid" => "Nome de utilizador/password do Oracle inválida",
 "Offending command was: \"%s\", name: %s, password: %s" => "O comando gerador de erro foi: \"%s\", nome: %s, password: %s",
-"MS SQL username and/or password not valid: %s" => "Nome de utilizador/password do MySQL é inválido: %s",
+"PostgreSQL username and/or password not valid" => "Nome de utilizador/password do PostgreSQL inválido",
+"Set an admin username." => "Definir um nome de utilizador de administrador",
+"Set an admin password." => "Definiar uma password de administrador",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "O seu servidor web não está configurado correctamente para autorizar sincronização de ficheiros, pois o interface WebDAV parece estar com problemas.",
 "Please double check the <a href='%s'>installation guides</a>." => "Por favor verifique <a href='%s'>installation guides</a>.",
 "seconds ago" => "Minutos atrás",
diff --git a/lib/l10n/ro.php b/lib/l10n/ro.php
index 6661caf86e735f62d56e57b99e0ef48aa72fca73..5a34e9571e5dbcc4b13c2e0ca67fbdf9b1d181d2 100644
--- a/lib/l10n/ro.php
+++ b/lib/l10n/ro.php
@@ -5,6 +5,7 @@
 "Users" => "Utilizatori",
 "Apps" => "Aplicații",
 "Admin" => "Admin",
+"web services under your control" => "servicii web controlate de tine",
 "ZIP download is turned off." => "Descărcarea ZIP este dezactivată.",
 "Files need to be downloaded one by one." => "Fișierele trebuie descărcate unul câte unul.",
 "Back to Files" => "Înapoi la fișiere",
@@ -16,6 +17,8 @@
 "Files" => "Fișiere",
 "Text" => "Text",
 "Images" => "Imagini",
+"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Serverul de web nu este încă setat corespunzător pentru a permite sincronizarea fișierelor deoarece interfața WebDAV pare a fi întreruptă.",
+"Please double check the <a href='%s'>installation guides</a>." => "Vă rugăm să verificați <a href='%s'>ghiduri de instalare</ a>.",
 "seconds ago" => "secunde în urmă",
 "1 minute ago" => "1 minut în urmă",
 "%d minutes ago" => "%d minute în urmă",
diff --git a/lib/l10n/ru.php b/lib/l10n/ru.php
index e3e3aee5a922a21b2530ede3768b268f71d3781c..052b0487c6cb554f5ba0755e27dc87c8916b833c 100644
--- a/lib/l10n/ru.php
+++ b/lib/l10n/ru.php
@@ -5,6 +5,7 @@
 "Users" => "Пользователи",
 "Apps" => "Приложения",
 "Admin" => "Admin",
+"web services under your control" => "веб-сервисы под вашим управлением",
 "ZIP download is turned off." => "ZIP-скачивание отключено.",
 "Files need to be downloaded one by one." => "Файлы должны быть загружены по одному.",
 "Back to Files" => "Назад к файлам",
@@ -16,15 +17,11 @@
 "Files" => "Файлы",
 "Text" => "Текст",
 "Images" => "Изображения",
-"Set an admin username." => "Установить имя пользователя для admin.",
-"Set an admin password." => "становит пароль для admin.",
 "%s enter the database username." => "%s введите имя пользователя базы данных.",
 "%s enter the database name." => "%s введите имя базы данных.",
 "%s you may not use dots in the database name" => "%s Вы не можете использовать точки в имени базы данных",
-"%s set the database host." => "%s задайте хост базы данных.",
-"PostgreSQL username and/or password not valid" => "Неверное имя пользователя и/или пароль PostgreSQL",
+"MS SQL username and/or password not valid: %s" => "Имя пользователя и/или пароль MS SQL не подходит: %s",
 "You need to enter either an existing account or the administrator." => "Вы должны войти или в существующий аккаунт или под администратором.",
-"Oracle connection could not be established" => "соединение с Oracle не может быть установлено",
 "MySQL username and/or password not valid" => "Неверное имя пользователя и/или пароль MySQL",
 "DB Error: \"%s\"" => "Ошибка БД: \"%s\"",
 "Offending command was: \"%s\"" => "Вызываемая команда была: \"%s\"",
@@ -32,9 +29,12 @@
 "Drop this user from MySQL" => "Удалить этого пользователя из MySQL",
 "MySQL user '%s'@'%%' already exists" => "Пользователь MySQL '%s'@'%%' уже существует",
 "Drop this user from MySQL." => "Удалить этого пользователя из MySQL.",
+"Oracle connection could not be established" => "соединение с Oracle не может быть установлено",
 "Oracle username and/or password not valid" => "Неверное имя пользователя и/или пароль Oracle",
 "Offending command was: \"%s\", name: %s, password: %s" => "Вызываемая команда была: \"%s\", имя: %s, пароль: %s",
-"MS SQL username and/or password not valid: %s" => "Имя пользователя и/или пароль MS SQL не подходит: %s",
+"PostgreSQL username and/or password not valid" => "Неверное имя пользователя и/или пароль PostgreSQL",
+"Set an admin username." => "Установить имя пользователя для admin.",
+"Set an admin password." => "становит пароль для admin.",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Ваш веб сервер до сих пор не настроен правильно для возможности синхронизации файлов, похоже что проблема в неисправности интерфейса WebDAV.",
 "Please double check the <a href='%s'>installation guides</a>." => "Пожалуйста, дважды просмотрите <a href='%s'>инструкции по установке</a>.",
 "seconds ago" => "несколько секунд назад",
diff --git a/lib/l10n/si_LK.php b/lib/l10n/si_LK.php
index 4846fdcc06675177e7daf68911bdf183375f2542..49ded7026e0a6227a7306c3bb063f3d6fa92b778 100644
--- a/lib/l10n/si_LK.php
+++ b/lib/l10n/si_LK.php
@@ -5,6 +5,7 @@
 "Users" => "පරිශීලකයන්",
 "Apps" => "යෙදුම්",
 "Admin" => "පරිපාලක",
+"web services under your control" => "ඔබට පාලනය කළ හැකි වෙබ් සේවාවන්",
 "ZIP download is turned off." => "ZIP භාගත කිරීම් අක්‍රියයි",
 "Files need to be downloaded one by one." => "ගොනු එකින් එක භාගත යුතුයි",
 "Back to Files" => "ගොනු වෙතට නැවත යන්න",
diff --git a/lib/l10n/sk_SK.php b/lib/l10n/sk_SK.php
index c1ec2470b46c5bd08833f95338ccffe6efcd0fb2..64ad1e540f3c14036aa166d13e359576552f9e73 100644
--- a/lib/l10n/sk_SK.php
+++ b/lib/l10n/sk_SK.php
@@ -5,6 +5,7 @@
 "Users" => "Používatelia",
 "Apps" => "Aplikácie",
 "Admin" => "Administrátor",
+"web services under your control" => "webové služby pod Vašou kontrolou",
 "ZIP download is turned off." => "Sťahovanie súborov ZIP je vypnuté.",
 "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",
@@ -16,15 +17,11 @@
 "Files" => "Súbory",
 "Text" => "Text",
 "Images" => "Obrázky",
-"Set an admin username." => "Zadajte používateľské meno administrátora.",
-"Set an admin password." => "Zadajte heslo administrátora.",
 "%s enter the database username." => "Zadajte používateľské meno %s databázy..",
 "%s enter the database name." => "Zadajte názov databázy pre %s databázy.",
 "%s you may not use dots in the database name" => "V názve databázy %s nemôžete používať bodky",
-"%s set the database host." => "Zadajte názov počítača s databázou %s.",
-"PostgreSQL username and/or password not valid" => "Používateľské meno a/alebo heslo pre PostgreSQL databázu je neplatné",
+"MS SQL username and/or password not valid: %s" => "Používateľské meno, alebo heslo MS SQL nie je platné: %s",
 "You need to enter either an existing account or the administrator." => "Musíte zadať jestvujúci účet alebo administrátora.",
-"Oracle connection could not be established" => "Nie je možné pripojiť sa k Oracle",
 "MySQL username and/or password not valid" => "Používateľské meno a/alebo heslo pre MySQL databázu je neplatné",
 "DB Error: \"%s\"" => "Chyba DB: \"%s\"",
 "Offending command was: \"%s\"" => "Podozrivý príkaz bol: \"%s\"",
@@ -32,9 +29,12 @@
 "Drop this user from MySQL" => "Zahodiť používateľa z MySQL.",
 "MySQL user '%s'@'%%' already exists" => "Používateľ '%s'@'%%' už v MySQL existuje",
 "Drop this user from MySQL." => "Zahodiť používateľa z MySQL.",
+"Oracle connection could not be established" => "Nie je možné pripojiť sa k Oracle",
 "Oracle username and/or password not valid" => "Používateľské meno a/alebo heslo pre Oracle databázu je neplatné",
 "Offending command was: \"%s\", name: %s, password: %s" => "Podozrivý príkaz bol: \"%s\", meno: %s, heslo: %s",
-"MS SQL username and/or password not valid: %s" => "Používateľské meno, alebo heslo MS SQL nie je platné: %s",
+"PostgreSQL username and/or password not valid" => "Používateľské meno a/alebo heslo pre PostgreSQL databázu je neplatné",
+"Set an admin username." => "Zadajte používateľské meno administrátora.",
+"Set an admin password." => "Zadajte heslo administrátora.",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Váš webový server nie je správne nastavený na synchronizáciu, pretože rozhranie WebDAV je poškodené.",
 "Please double check the <a href='%s'>installation guides</a>." => "Prosím skontrolujte <a href='%s'>inštalačnú príručku</a>.",
 "seconds ago" => "pred sekundami",
diff --git a/lib/l10n/sl.php b/lib/l10n/sl.php
index 7f8827d17f32c51f012be394d048a323b330781e..a5b4decd61a0ab01d27f4ea1bb7f4149990f0e1e 100644
--- a/lib/l10n/sl.php
+++ b/lib/l10n/sl.php
@@ -5,6 +5,7 @@
 "Users" => "Uporabniki",
 "Apps" => "Programi",
 "Admin" => "Skrbništvo",
+"web services under your control" => "spletne storitve pod vašim nadzorom",
 "ZIP download is turned off." => "Prejemanje datotek v paketu ZIP je onemogočeno.",
 "Files need to be downloaded one by one." => "Datoteke je mogoče prejeti le posamično.",
 "Back to Files" => "Nazaj na datoteke",
@@ -16,13 +17,10 @@
 "Files" => "Datoteke",
 "Text" => "Besedilo",
 "Images" => "Slike",
-"Set an admin username." => "Nastavi uporabniško ime skrbnika.",
-"Set an admin password." => "Nastavi geslo skrbnika.",
 "%s enter the database username." => "%s - vnos uporabniškega imena podatkovne zbirke.",
 "%s enter the database name." => "%s - vnos imena podatkovne zbirke.",
 "%s you may not use dots in the database name" => "%s - v imenu podatkovne zbirke ni dovoljeno uporabljati pik.",
-"%s set the database host." => "%s - vnos gostitelja podatkovne zbirke.",
-"PostgreSQL username and/or password not valid" => "Uporabniško ime ali geslo PostgreSQL ni veljavno",
+"MS SQL username and/or password not valid: %s" => "Uporabniško ime ali geslo MS SQL ni veljavno: %s",
 "You need to enter either an existing account or the administrator." => "Prijaviti se je treba v obstoječi ali pa skrbniški račun.",
 "MySQL username and/or password not valid" => "Uporabniško ime ali geslo MySQL ni veljavno",
 "DB Error: \"%s\"" => "Napaka podatkovne zbirke: \"%s\"",
@@ -31,9 +29,12 @@
 "Drop this user from MySQL" => "Odstrani uporabnika s podatkovne zbirke MySQL",
 "MySQL user '%s'@'%%' already exists" => "Uporabnik MySQL '%s'@'%%' že obstaja.",
 "Drop this user from MySQL." => "Odstrani uporabnika s podatkovne zbirke MySQL",
+"Oracle connection could not be established" => "Povezava z bazo Oracle ni uspela.",
 "Oracle username and/or password not valid" => "Uporabniško ime ali geslo Oracle ni veljavno",
 "Offending command was: \"%s\", name: %s, password: %s" => "Napačni ukaz je: \"%s\", ime: %s, geslo: %s",
-"MS SQL username and/or password not valid: %s" => "Uporabniško ime ali geslo MS SQL ni veljavno: %s",
+"PostgreSQL username and/or password not valid" => "Uporabniško ime ali geslo PostgreSQL ni veljavno",
+"Set an admin username." => "Nastavi uporabniško ime skrbnika.",
+"Set an admin password." => "Nastavi geslo skrbnika.",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Spletni stražnik še ni ustrezno nastavljen in ne omogoča usklajevanja, saj je nastavitev WebDAV okvarjena.",
 "Please double check the <a href='%s'>installation guides</a>." => "Preverite <a href='%s'>navodila namestitve</a>.",
 "seconds ago" => "pred nekaj sekundami",
diff --git a/lib/l10n/sq.php b/lib/l10n/sq.php
index 04186f62102832ce82155034ee00e057c3b1e3e8..df5e2a317433c50d6da794b50e5bd02ecdd83cb0 100644
--- a/lib/l10n/sq.php
+++ b/lib/l10n/sq.php
@@ -5,6 +5,7 @@
 "Users" => "Përdoruesit",
 "Apps" => "App",
 "Admin" => "Admin",
+"web services under your control" => "shërbime web nën kontrollin tënd",
 "ZIP download is turned off." => "Shkarimi i skedarëve ZIP është i çaktivizuar.",
 "Files need to be downloaded one by one." => "Skedarët duhet të shkarkohen një nga një.",
 "Back to Files" => "Kthehu tek skedarët",
@@ -16,13 +17,10 @@
 "Files" => "Skedarët",
 "Text" => "Tekst",
 "Images" => "Foto",
-"Set an admin username." => "Cakto emrin e administratorit.",
-"Set an admin password." => "Cakto kodin e administratorit.",
 "%s enter the database username." => "% shkruani përdoruesin e database-it.",
 "%s enter the database name." => "%s shkruani emrin e database-it.",
 "%s you may not use dots in the database name" => "%s nuk mund të përdorni pikat tek emri i database-it",
-"%s set the database host." => "%s caktoni pozicionin (host) e database-it.",
-"PostgreSQL username and/or password not valid" => "Përdoruesi dhe/apo kodi i PostgreSQL i pavlefshëm",
+"MS SQL username and/or password not valid: %s" => "Përdoruesi dhe/apo kodi i MS SQL i pavlefshëm: %s",
 "You need to enter either an existing account or the administrator." => "Duhet të përdorni një llogari ekzistuese ose llogarinë e administratorit.",
 "MySQL username and/or password not valid" => "Përdoruesi dhe/apo kodi i MySQL-it i pavlefshëm.",
 "DB Error: \"%s\"" => "Veprim i gabuar i DB-it: \"%s\"",
@@ -33,7 +31,9 @@
 "Drop this user from MySQL." => "Eliminoni këtë përdorues nga MySQL.",
 "Oracle username and/or password not valid" => "Përdoruesi dhe/apo kodi i Oracle-it i pavlefshëm",
 "Offending command was: \"%s\", name: %s, password: %s" => "Komanda e gabuar ishte: \"%s\", përdoruesi: %s, kodi: %s",
-"MS SQL username and/or password not valid: %s" => "Përdoruesi dhe/apo kodi i MS SQL i pavlefshëm: %s",
+"PostgreSQL username and/or password not valid" => "Përdoruesi dhe/apo kodi i PostgreSQL i pavlefshëm",
+"Set an admin username." => "Cakto emrin e administratorit.",
+"Set an admin password." => "Cakto kodin e administratorit.",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Serveri web i juaji nuk është konfiguruar akoma për të lejuar sinkronizimin e skedarëve sepse ndërfaqja WebDAV mund të jetë e dëmtuar.",
 "Please double check the <a href='%s'>installation guides</a>." => "Ju lutemi kontrolloni mirë <a href='%s'>shoqëruesin e instalimit</a>.",
 "seconds ago" => "sekonda më parë",
diff --git a/lib/l10n/sr.php b/lib/l10n/sr.php
index 45b8e06200cc6320a8cb1fd2205da3c06573a778..71d627e78900df2bf632c3894f0eac8587dba017 100644
--- a/lib/l10n/sr.php
+++ b/lib/l10n/sr.php
@@ -5,6 +5,7 @@
 "Users" => "Корисници",
 "Apps" => "Апликације",
 "Admin" => "Администратор",
+"web services under your control" => "веб сервиси под контролом",
 "ZIP download is turned off." => "Преузимање ZIP-а је искључено.",
 "Files need to be downloaded one by one." => "Датотеке морате преузимати једну по једну.",
 "Back to Files" => "Назад на датотеке",
diff --git a/lib/l10n/sv.php b/lib/l10n/sv.php
index f2b7c89205804d6da79b3bef3019d5216d29e588..56776e574aaf153b1c38ba8ae4306a018029f419 100644
--- a/lib/l10n/sv.php
+++ b/lib/l10n/sv.php
@@ -5,6 +5,7 @@
 "Users" => "Användare",
 "Apps" => "Program",
 "Admin" => "Admin",
+"web services under your control" => "webbtjänster under din kontroll",
 "ZIP download is turned off." => "Nerladdning av ZIP är avstängd.",
 "Files need to be downloaded one by one." => "Filer laddas ner en åt gången.",
 "Back to Files" => "Tillbaka till Filer",
@@ -16,15 +17,11 @@
 "Files" => "Filer",
 "Text" => "Text",
 "Images" => "Bilder",
-"Set an admin username." => "Ange ett användarnamn för administratören.",
-"Set an admin password." => "Ange ett administratörslösenord.",
 "%s enter the database username." => "%s ange databasanvändare.",
 "%s enter the database name." => "%s ange databasnamn",
 "%s you may not use dots in the database name" => "%s du får inte använda punkter i databasnamnet",
-"%s set the database host." => "%s ange databasserver/host.",
-"PostgreSQL username and/or password not valid" => "PostgreSQL-användarnamnet och/eller lösenordet är felaktigt",
+"MS SQL username and/or password not valid: %s" => "MS SQL-användaren och/eller lösenordet var inte giltigt: %s",
 "You need to enter either an existing account or the administrator." => "Du måste antingen ange ett befintligt konto eller administratör.",
-"Oracle connection could not be established" => "Oracle-anslutning kunde inte etableras",
 "MySQL username and/or password not valid" => "MySQL-användarnamnet och/eller lösenordet är felaktigt",
 "DB Error: \"%s\"" => "DB error: \"%s\"",
 "Offending command was: \"%s\"" => "Det felaktiga kommandot var: \"%s\"",
@@ -32,9 +29,12 @@
 "Drop this user from MySQL" => "Radera denna användare från MySQL",
 "MySQL user '%s'@'%%' already exists" => "MySQl-användare '%s'@'%%' existerar redan",
 "Drop this user from MySQL." => "Radera denna användare från MySQL.",
+"Oracle connection could not be established" => "Oracle-anslutning kunde inte etableras",
 "Oracle username and/or password not valid" => "Oracle-användarnamnet och/eller lösenordet är felaktigt",
 "Offending command was: \"%s\", name: %s, password: %s" => "Det felande kommandot var: \"%s\", name: %s, password: %s",
-"MS SQL username and/or password not valid: %s" => "MS SQL-användaren och/eller lösenordet var inte giltigt: %s",
+"PostgreSQL username and/or password not valid" => "PostgreSQL-användarnamnet och/eller lösenordet är felaktigt",
+"Set an admin username." => "Ange ett användarnamn för administratören.",
+"Set an admin password." => "Ange ett administratörslösenord.",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Din webbserver är inte korrekt konfigurerad för att tillåta filsynkronisering eftersom WebDAV inte verkar fungera.",
 "Please double check the <a href='%s'>installation guides</a>." => "Var god kontrollera <a href='%s'>installationsguiden</a>.",
 "seconds ago" => "sekunder sedan",
diff --git a/lib/l10n/ta_LK.php b/lib/l10n/ta_LK.php
index c9bb578b40f665ceb4e15fba1af7549207a06c80..9193f6f1d2f9c45cbcd79d541d72a1065eebd248 100644
--- a/lib/l10n/ta_LK.php
+++ b/lib/l10n/ta_LK.php
@@ -5,6 +5,7 @@
 "Users" => "பயனாளர்",
 "Apps" => "செயலிகள்",
 "Admin" => "நிர்வாகம்",
+"web services under your control" => "வலைய சேவைகள் உங்களுடைய கட்டுப்பாட்டின் கீழ் உள்ளது",
 "ZIP download is turned off." => "வீசொலிப் பூட்டு பதிவிறக்கம் நிறுத்தப்பட்டுள்ளது.",
 "Files need to be downloaded one by one." => "கோப்புகள்ஒன்றன் பின் ஒன்றாக பதிவிறக்கப்படவேண்டும்.",
 "Back to Files" => "கோப்புகளுக்கு செல்க",
diff --git a/lib/l10n/th_TH.php b/lib/l10n/th_TH.php
index 7cda4ab6ae6d52b41f8d31a3bbc5b3de6aea0f67..4ec6ef55f4e91210aba933c9d434dad3e861716f 100644
--- a/lib/l10n/th_TH.php
+++ b/lib/l10n/th_TH.php
@@ -5,6 +5,7 @@
 "Users" => "ผู้ใช้งาน",
 "Apps" => "แอปฯ",
 "Admin" => "ผู้ดูแล",
+"web services under your control" => "เว็บเซอร์วิสที่คุณควบคุมการใช้งานได้",
 "ZIP download is turned off." => "คุณสมบัติการดาวน์โหลด zip ถูกปิดการใช้งานไว้",
 "Files need to be downloaded one by one." => "ไฟล์สามารถดาวน์โหลดได้ทีละครั้งเท่านั้น",
 "Back to Files" => "กลับไปที่ไฟล์",
diff --git a/lib/l10n/tr.php b/lib/l10n/tr.php
index 2662d61649de8fa195934cafeb085dce2722f17a..6325ad9886aecdd86efc67e290579c98a79d181a 100644
--- a/lib/l10n/tr.php
+++ b/lib/l10n/tr.php
@@ -5,6 +5,7 @@
 "Users" => "Kullanıcılar",
 "Apps" => "Uygulamalar",
 "Admin" => "Yönetici",
+"web services under your control" => "Bilgileriniz güvenli ve şifreli",
 "ZIP download is turned off." => "ZIP indirmeleri kapatılmıştır.",
 "Files need to be downloaded one by one." => "Dosyaların birer birer indirilmesi gerekmektedir.",
 "Back to Files" => "Dosyalara dön",
@@ -16,15 +17,11 @@
 "Files" => "Dosyalar",
 "Text" => "Metin",
 "Images" => "Resimler",
-"Set an admin username." => "Bir adi kullanici vermek. ",
-"Set an admin password." => "Parola yonetici birlemek. ",
 "%s enter the database username." => "%s veritabanı kullanıcı adını gir.",
 "%s enter the database name." => "%s veritabanı adını gir.",
 "%s you may not use dots in the database name" => "%s veritabanı adında nokta kullanamayabilirsiniz",
-"%s set the database host." => "%s veritabanı sunucu adını tanımla",
-"PostgreSQL username and/or password not valid" => "PostgreSQL adi kullanici ve/veya parola yasal degildir. ",
+"MS SQL username and/or password not valid: %s" => "MS SQL kullanıcı adı ve/veya parolası geçersiz: %s",
 "You need to enter either an existing account or the administrator." => "Bir konto veya kullanici birlemek ihtiyacin. ",
-"Oracle connection could not be established" => "Oracle bağlantısı kurulamadı",
 "MySQL username and/or password not valid" => "MySQL kullanıcı adı ve/veya parolası geçerli değil",
 "DB Error: \"%s\"" => "DB Hata: ''%s''",
 "Offending command was: \"%s\"" => "Komut rahasiz ''%s''. ",
@@ -32,9 +29,12 @@
 "Drop this user from MySQL" => "Bu kullanici MySQLden list disari koymak. ",
 "MySQL user '%s'@'%%' already exists" => "MySQL kullanici '%s @ % % zaten var (zaten yazili)",
 "Drop this user from MySQL." => "Bu kulanıcıyı MySQL veritabanından kaldır",
+"Oracle connection could not be established" => "Oracle bağlantısı kurulamadı",
 "Oracle username and/or password not valid" => "Adi klullanici ve/veya parola Oracle mantikli deÄŸildir. ",
 "Offending command was: \"%s\", name: %s, password: %s" => "Hatalı komut: \"%s\", ad: %s, parola: %s",
-"MS SQL username and/or password not valid: %s" => "MS SQL kullanıcı adı ve/veya parolası geçersiz: %s",
+"PostgreSQL username and/or password not valid" => "PostgreSQL adi kullanici ve/veya parola yasal degildir. ",
+"Set an admin username." => "Bir adi kullanici vermek. ",
+"Set an admin password." => "Parola yonetici birlemek. ",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Web sunucunuz dosya transferi için düzgün bir şekilde yapılandırılmamış. WevDAV arabirimini sorunlu gözüküyor.",
 "Please double check the <a href='%s'>installation guides</a>." => "Lütfen <a href='%s'>kurulum kılavuzlarını</a> iki kez kontrol edin.",
 "seconds ago" => "saniye önce",
diff --git a/lib/l10n/uk.php b/lib/l10n/uk.php
index 676879629ef37fbbe7cca86f41227d57643594d0..7ff7829e1a25e126bca179f54f6ecaf87b13e22c 100644
--- a/lib/l10n/uk.php
+++ b/lib/l10n/uk.php
@@ -5,6 +5,7 @@
 "Users" => "Користувачі",
 "Apps" => "Додатки",
 "Admin" => "Адмін",
+"web services under your control" => "підконтрольні Вам веб-сервіси",
 "ZIP download is turned off." => "ZIP завантаження вимкнено.",
 "Files need to be downloaded one by one." => "Файли повинні бути завантаженні послідовно.",
 "Back to Files" => "Повернутися до файлів",
@@ -16,13 +17,10 @@
 "Files" => "Файли",
 "Text" => "Текст",
 "Images" => "Зображення",
-"Set an admin username." => "Встановіть ім'я адміністратора.",
-"Set an admin password." => "Встановіть пароль адміністратора.",
 "%s enter the database username." => "%s введіть ім'я користувача бази даних.",
 "%s enter the database name." => "%s введіть назву бази даних.",
 "%s you may not use dots in the database name" => "%s не можна використовувати крапки в назві бази даних",
-"%s set the database host." => "%s встановити хост бази даних.",
-"PostgreSQL username and/or password not valid" => "PostgreSQL ім'я користувача та/або пароль не дійсні",
+"MS SQL username and/or password not valid: %s" => "MS SQL ім'я користувача та/або пароль не дійсні: %s",
 "You need to enter either an existing account or the administrator." => "Вам потрібно ввести або існуючий обліковий запис або administrator.",
 "MySQL username and/or password not valid" => "MySQL ім'я користувача та/або пароль не дійсні",
 "DB Error: \"%s\"" => "Помилка БД: \"%s\"",
@@ -33,7 +31,9 @@
 "Drop this user from MySQL." => "Видалити цього користувача з MySQL.",
 "Oracle username and/or password not valid" => "Oracle ім'я користувача та/або пароль не дійсні",
 "Offending command was: \"%s\", name: %s, password: %s" => "Команда, що викликала проблему: \"%s\", ім'я: %s, пароль: %s",
-"MS SQL username and/or password not valid: %s" => "MS SQL ім'я користувача та/або пароль не дійсні: %s",
+"PostgreSQL username and/or password not valid" => "PostgreSQL ім'я користувача та/або пароль не дійсні",
+"Set an admin username." => "Встановіть ім'я адміністратора.",
+"Set an admin password." => "Встановіть пароль адміністратора.",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Ваш Web-сервер ще не налаштований належним чином для того, щоб дозволити синхронізацію файлів, через те що інтерфейс WebDAV, здається, зламаний.",
 "Please double check the <a href='%s'>installation guides</a>." => "Будь ласка, перевірте <a href='%s'>інструкції по встановленню</a>.",
 "seconds ago" => "секунди тому",
diff --git a/lib/l10n/ur_PK.php b/lib/l10n/ur_PK.php
index 7e09d79bc68b64088f6219d61a3d8fd07d8cf010..21e711c6df5fb10e46739f6be8d69dbac4bbe124 100644
--- a/lib/l10n/ur_PK.php
+++ b/lib/l10n/ur_PK.php
@@ -4,5 +4,6 @@
 "Settings" => "سیٹینگز",
 "Users" => "یوزرز",
 "Apps" => "ایپز",
-"Admin" => "ایڈمن"
+"Admin" => "ایڈمن",
+"web services under your control" => "آپ کے اختیار میں ویب سروسیز"
 );
diff --git a/lib/l10n/vi.php b/lib/l10n/vi.php
index 6a4b8ebac938eaaa6ee1450fe2e5872c1ecc4c9e..f2a7d669b8f25607ed7671163798c7024c0833bc 100644
--- a/lib/l10n/vi.php
+++ b/lib/l10n/vi.php
@@ -5,6 +5,7 @@
 "Users" => "Người dùng",
 "Apps" => "Ứng dụng",
 "Admin" => "Quản trị",
+"web services under your control" => "dịch vụ web dưới sự kiểm soát của bạn",
 "ZIP download is turned off." => "Tải về ZIP đã bị tắt.",
 "Files need to be downloaded one by one." => "Tập tin cần phải được tải về từng người một.",
 "Back to Files" => "Trở lại tập tin",
diff --git a/lib/l10n/zh_CN.GB2312.php b/lib/l10n/zh_CN.GB2312.php
index 3ab35f2bafa2088a8bc215f1dd6df2993d709459..4780a69eb34aa84d6c4b55a50ed72b49a17a6ff3 100644
--- a/lib/l10n/zh_CN.GB2312.php
+++ b/lib/l10n/zh_CN.GB2312.php
@@ -5,6 +5,7 @@
 "Users" => "用户",
 "Apps" => "程序",
 "Admin" => "管理员",
+"web services under your control" => "您控制的网络服务",
 "ZIP download is turned off." => "ZIP 下载已关闭",
 "Files need to be downloaded one by one." => "需要逐个下载文件。",
 "Back to Files" => "返回到文件",
diff --git a/lib/l10n/zh_CN.php b/lib/l10n/zh_CN.php
index edb0f81ee9d6ad5bb35434e121a477f5464067bc..7630f885c4a2ccec67b3ae591c179d78293609f5 100644
--- a/lib/l10n/zh_CN.php
+++ b/lib/l10n/zh_CN.php
@@ -5,6 +5,7 @@
 "Users" => "用户",
 "Apps" => "应用",
 "Admin" => "管理",
+"web services under your control" => "您控制的web服务",
 "ZIP download is turned off." => "ZIP 下载已经关闭",
 "Files need to be downloaded one by one." => "需要逐一下载文件",
 "Back to Files" => "回到文件",
@@ -16,15 +17,11 @@
 "Files" => "文件",
 "Text" => "文本",
 "Images" => "图片",
-"Set an admin username." => "请设置一个管理员用户名。",
-"Set an admin password." => "请设置一个管理员密码。",
 "%s enter the database username." => "%s 输入数据库用户名。",
 "%s enter the database name." => "%s 输入数据库名称。",
 "%s you may not use dots in the database name" => "%s 您不能在数据库名称中使用英文句号。",
-"%s set the database host." => "%s 设置数据库所在主机。",
-"PostgreSQL username and/or password not valid" => "PostgreSQL 数据库用户名和/或密码无效",
+"MS SQL username and/or password not valid: %s" => "MS SQL 用户名和/或密码无效：%s",
 "You need to enter either an existing account or the administrator." => "你需要输入一个数据库中已有的账户或管理员账户。",
-"Oracle connection could not be established" => "不能建立甲骨文连接",
 "MySQL username and/or password not valid" => "MySQL 数据库用户名和/或密码无效",
 "DB Error: \"%s\"" => "数据库错误：\"%s\"",
 "Offending command was: \"%s\"" => "冲突命令为：\"%s\"",
@@ -32,9 +29,12 @@
 "Drop this user from MySQL" => "建议从 MySQL 数据库中丢弃 Drop 此用户",
 "MySQL user '%s'@'%%' already exists" => "MySQL 用户 '%s'@'%%' 已存在",
 "Drop this user from MySQL." => "建议从 MySQL 数据库中丢弃 Drop 此用户。",
+"Oracle connection could not be established" => "不能建立甲骨文连接",
 "Oracle username and/or password not valid" => "Oracle 数据库用户名和/或密码无效",
 "Offending command was: \"%s\", name: %s, password: %s" => "冲突命令为：\"%s\"，名称：%s，密码：%s",
-"MS SQL username and/or password not valid: %s" => "MS SQL 用户名和/或密码无效：%s",
+"PostgreSQL username and/or password not valid" => "PostgreSQL 数据库用户名和/或密码无效",
+"Set an admin username." => "请设置一个管理员用户名。",
+"Set an admin password." => "请设置一个管理员密码。",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "您的Web服务器尚未正确设置以允许文件同步, 因为WebDAV的接口似乎已损坏.",
 "Please double check the <a href='%s'>installation guides</a>." => "请认真检查<a href='%s'>安装指南</a>.",
 "seconds ago" => "秒前",
diff --git a/lib/l10n/zh_TW.php b/lib/l10n/zh_TW.php
index 4e0d50e7fc9dc43ea7223ca9c658bbe7ab30a482..afd196f7c821315f49f40649e98bbf7d2b9eab72 100644
--- a/lib/l10n/zh_TW.php
+++ b/lib/l10n/zh_TW.php
@@ -5,6 +5,7 @@
 "Users" => "使用者",
 "Apps" => "應用程式",
 "Admin" => "管理",
+"web services under your control" => "由您控制的網路服務",
 "ZIP download is turned off." => "ZIP 下載已關閉。",
 "Files need to be downloaded one by one." => "檔案需要逐一下載。",
 "Back to Files" => "回到檔案列表",
@@ -16,15 +17,11 @@
 "Files" => "檔案",
 "Text" => "文字",
 "Images" => "圖片",
-"Set an admin username." => "設定管理員帳號。",
-"Set an admin password." => "設定管理員密碼。",
 "%s enter the database username." => "%s 輸入資料庫使用者名稱。",
 "%s enter the database name." => "%s 輸入資料庫名稱。",
 "%s you may not use dots in the database name" => "%s 資料庫名稱不能包含小數點",
-"%s set the database host." => "%s 設定資料庫主機。",
-"PostgreSQL username and/or password not valid" => "PostgreSQL 用戶名和/或密碼無效",
+"MS SQL username and/or password not valid: %s" => "MS SQL 使用者和/或密碼無效：%s",
 "You need to enter either an existing account or the administrator." => "您必須輸入一個現有的帳號或管理員帳號。",
-"Oracle connection could not be established" => "無法建立 Oracle 資料庫連線",
 "MySQL username and/or password not valid" => "MySQL 用戶名和/或密碼無效",
 "DB Error: \"%s\"" => "資料庫錯誤：\"%s\"",
 "Offending command was: \"%s\"" => "有問題的指令是：\"%s\"",
@@ -32,9 +29,12 @@
 "Drop this user from MySQL" => "在 MySQL 移除這個使用者",
 "MySQL user '%s'@'%%' already exists" => "MySQL 使用者 '%s'@'%%' 已經存在",
 "Drop this user from MySQL." => "在 MySQL 移除這個使用者。",
+"Oracle connection could not be established" => "無法建立 Oracle 資料庫連線",
 "Oracle username and/or password not valid" => "Oracle 用戶名和/或密碼無效",
 "Offending command was: \"%s\", name: %s, password: %s" => "有問題的指令是：\"%s\" ，使用者：\"%s\"，密碼：\"%s\"",
-"MS SQL username and/or password not valid: %s" => "MS SQL 使用者和/或密碼無效：%s",
+"PostgreSQL username and/or password not valid" => "PostgreSQL 用戶名和/或密碼無效",
+"Set an admin username." => "設定管理員帳號。",
+"Set an admin password." => "設定管理員密碼。",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "您的網頁伺服器尚未被正確設定來進行檔案同步，因為您的 WebDAV 界面似乎無法使用。",
 "Please double check the <a href='%s'>installation guides</a>." => "請參考<a href='%s'>安裝指南</a>。",
 "seconds ago" => "幾秒前",
diff --git a/lib/legacy/log.php b/lib/legacy/log.php
new file mode 100644
index 0000000000000000000000000000000000000000..7802ead24127d27012fcfef31cb91dcf4668e791
--- /dev/null
+++ b/lib/legacy/log.php
@@ -0,0 +1,77 @@
+<?php
+/**
+ * Copyright (c) 2012 Bart Visscher <bartv@thisnet.nl>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+/**
+ * logging utilities
+ *
+ * Log is saved by default at data/owncloud.log using OC_Log_Owncloud.
+ * Selecting other backend is done with a config option 'log_type'.
+ */
+
+OC_Log::$object = new \OC\Log();
+class OC_Log {
+	public static $object;
+
+	const DEBUG=0;
+	const INFO=1;
+	const WARN=2;
+	const ERROR=3;
+	const FATAL=4;
+
+	static private $level_funcs = array(
+		self::DEBUG	=> 'debug',
+		self::INFO	=> 'info',
+		self::WARN	=> 'warning',
+		self::ERROR	=> 'error',
+		self::FATAL	=> 'emergency',
+		);
+
+	static public $enabled = true;
+	static protected $class = null;
+
+	/**
+	 * write a message in the log
+	 * @param string $app
+	 * @param string $message
+	 * @param int $level
+	 */
+	public static function write($app, $message, $level) {
+		if (self::$enabled) {
+			$context = array('app' => $app);
+			$func = array(self::$object, self::$level_funcs[$level]);
+			call_user_func($func, $message, $context);
+		}
+	}
+
+	//Fatal errors handler
+	public static function onShutdown() {
+		$error = error_get_last();
+		if($error) {
+			//ob_end_clean();
+			self::write('PHP', $error['message'] . ' at ' . $error['file'] . '#' . $error['line'], self::FATAL);
+		} else {
+			return true;
+		}
+	}
+
+	// Uncaught exception handler
+	public static function onException($exception) {
+		self::write('PHP',
+			$exception->getMessage() . ' at ' . $exception->getFile() . '#' . $exception->getLine(),
+			self::FATAL);
+	}
+
+	//Recoverable errors handler
+	public static function onError($number, $message, $file, $line) {
+		if (error_reporting() === 0) {
+			return;
+		}
+		self::write('PHP', $message . ' at ' . $file . '#' . $line, self::WARN);
+
+	}
+}
diff --git a/lib/legacy/updater.php b/lib/legacy/updater.php
new file mode 100644
index 0000000000000000000000000000000000000000..eea7bb129cfba66bff7c88bb394ced024ce1a2b9
--- /dev/null
+++ b/lib/legacy/updater.php
@@ -0,0 +1,14 @@
+<?php
+/**
+ * Copyright (c) 2013 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+class OC_Updater {
+	public static function check() {
+		$updater = new \OC\Updater();
+		return $updater->check('http://apps.owncloud.com/updater.php');
+	}
+}
diff --git a/lib/log.php b/lib/log.php
index 3f3334801e5e6a9bb6ff9818f41947ab85a175f5..e0b9fe3c696a85e72c2ae02e76251921703c9d69 100644
--- a/lib/log.php
+++ b/lib/log.php
@@ -1,69 +1,136 @@
 <?php
 /**
- * Copyright (c) 2012 Bart Visscher <bartv@thisnet.nl>
+ * Copyright (c) 2013 Bart Visscher <bartv@thisnet.nl>
  * This file is licensed under the Affero General Public License version 3 or
  * later.
  * See the COPYING-README file.
  */
 
+namespace OC;
+
 /**
  * logging utilities
  *
- * Log is saved by default at data/owncloud.log using OC_Log_Owncloud.
- * Selecting other backend is done with a config option 'log_type'.
+ * This is a stand in, this should be replaced by a Psr\Log\LoggerInterface
+ * compatible logger. See https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-3-logger-interface.md
+ * for the full interface specification.
+ *
+ * MonoLog is an example implementing this interface.
  */
 
-class OC_Log {
-	const DEBUG=0;
-	const INFO=1;
-	const WARN=2;
-	const ERROR=3;
-	const FATAL=4;
+class Log {
+	private $logClass;
 
-	static public $enabled = true;
-	static protected $class = null;
+	/**
+	 * System is unusable.
+	 *
+	 * @param string $message
+	 * @param array $context
+	 */
+	public function emergency($message, array $context = array()) {
+		$this->log(\OC_Log::FATAL, $message, $context);
+	}
 
 	/**
-	 * write a message in the log
-	 * @param string $app
+	 * Action must be taken immediately.
+	 *
+	 * Example: Entire website down, database unavailable, etc. This should
+	 * trigger the SMS alerts and wake you up.
+	 *
 	 * @param string $message
-	 * @param int level
+	 * @param array $context
 	 */
-	public static function write($app, $message, $level) {
-		if (self::$enabled) {
-			if (!self::$class) {
-				self::$class = 'OC_Log_'.ucfirst(OC_Config::getValue('log_type', 'owncloud'));
-				call_user_func(array(self::$class, 'init'));
-			}
-			$log_class=self::$class;
-			$log_class::write($app, $message, $level);
-		}
+	public function alert($message, array $context = array()) {
+		$this->log(\OC_Log::ERROR, $message, $context);
 	}
 
-	//Fatal errors handler
-	public static function onShutdown() {
-		$error = error_get_last();
-		if($error) {
-			//ob_end_clean();
-			self::write('PHP', $error['message'] . ' at ' . $error['file'] . '#' . $error['line'], self::FATAL);
-		} else {
-			return true;
-		}
+	/**
+	 * Critical conditions.
+	 *
+	 * Example: Application component unavailable, unexpected exception.
+	 *
+	 * @param string $message
+	 * @param array $context
+	 */
+	public function critical($message, array $context = array()) {
+		$this->log(\OC_Log::ERROR, $message, $context);
 	}
 
-	// Uncaught exception handler
-	public static function onException($exception) {
-		self::write('PHP',
-			$exception->getMessage() . ' at ' . $exception->getFile() . '#' . $exception->getLine(),
-			self::FATAL);
+	/**
+	 * Runtime errors that do not require immediate action but should typically
+	 * be logged and monitored.
+	 *
+	 * @param string $message
+	 * @param array $context
+	 */
+	public function error($message, array $context = array()) {
+		$this->log(\OC_Log::ERROR, $message, $context);
 	}
 
-	//Recoverable errors handler
-	public static function onError($number, $message, $file, $line) {
-		if (error_reporting() === 0) {
-			return;
-		}
-		self::write('PHP', $message . ' at ' . $file . '#' . $line, self::WARN);
+	/**
+	 * Exceptional occurrences that are not errors.
+	 *
+	 * Example: Use of deprecated APIs, poor use of an API, undesirable things
+	 * that are not necessarily wrong.
+	 *
+	 * @param string $message
+	 * @param array $context
+	 */
+	public function warning($message, array $context = array()) {
+		$this->log(\OC_Log::WARN, $message, $context);
+	}
+
+	/**
+	 * Normal but significant events.
+	 *
+	 * @param string $message
+	 * @param array $context
+	 */
+	public function notice($message, array $context = array()) {
+		$this->log(\OC_Log::INFO, $message, $context);
+	}
 
+	/**
+	 * Interesting events.
+	 *
+	 * Example: User logs in, SQL logs.
+	 *
+	 * @param string $message
+	 * @param array $context
+	 */
+	public function info($message, array $context = array()) {
+		$this->log(\OC_Log::INFO, $message, $context);
+	}
+
+	/**
+	 * Detailed debug information.
+	 *
+	 * @param string $message
+	 * @param array $context
+	 */
+	public function debug($message, array $context = array()) {
+		$this->log(\OC_Log::DEBUG, $message, $context);
+	}
+
+	public function __construct() {
+		$this->logClass = 'OC_Log_'.ucfirst(\OC_Config::getValue('log_type', 'owncloud'));
+		call_user_func(array($this->logClass, 'init'));
+	}
+
+	/**
+	 * Logs with an arbitrary level.
+	 *
+	 * @param mixed $level
+	 * @param string $message
+	 * @param array $context
+	 */
+	public function log($level, $message, array $context = array()) {
+		if (isset($context['app'])) {
+			$app = $context['app'];
+		} else {
+			$app = 'no app in context';
+		}
+		$logClass=$this->logClass;
+		$logClass::write($app, $message, $level);
 	}
 }
diff --git a/lib/mail.php b/lib/mail.php
index e15af277a640ee47962a3c070f789eb5e952d1c7..b339b33e9622e4f7a39ff20c87946a4c28fda25c 100644
--- a/lib/mail.php
+++ b/lib/mail.php
@@ -113,9 +113,12 @@ class OC_Mail {
 	 */
 	public static function getfooter() {
 
-		$txt="\n-- \n";
-		$txt.="ownCloud\n";
-		$txt.="Your Cloud, Your Data, Your Way!\n";
+		$defaults = new OC_Defaults();
+
+		$txt="\n--\n";
+		$txt.=$defaults->getName() . "\n";
+		$txt.=$defaults->getSlogan() . "\n";
+
 		return($txt);
 
 	}
diff --git a/lib/public/defaults.php b/lib/public/defaults.php
new file mode 100644
index 0000000000000000000000000000000000000000..147f23e341f3e583e856962c036429ae4c9939cc
--- /dev/null
+++ b/lib/public/defaults.php
@@ -0,0 +1,108 @@
+<?php
+/**
+* ownCloud
+*
+* @author Björn Schießle
+* @copyright 2013 Björn Schießle 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 OCP;
+
+/*
+ * public api to access default strings and urls for your templates
+ */
+
+class Defaults {
+
+	private $defaults;
+
+	function __construct() {
+		$this->defaults = new \OC_Defaults();
+	}
+
+	/**
+	 * @breif get base URL for the organisation behind your ownCloud instance
+	 * @return string
+	 */
+	public function getBaseUrl() {
+		return $this->defaults->getBaseUrl();
+	}
+
+	/**
+	 * @breif link to the desktop sync client
+	 * @return string
+	 */
+	public function getSyncClientUrl() {
+		return $this->defaults->getSyncClientUrl();
+	}
+
+	/**
+	 * @breif base URL to the documentation of your ownCloud instance
+	 * @return string
+	 */
+	public function getDocBaseUrl() {
+		return $this->defaults->getDocBaseUrl();
+	}
+
+	/**
+	 * @breif name of your ownCloud instance
+	 * @return string
+	 */
+	public function getName() {
+		return $this->defaults->getName();
+	}
+
+	/**
+	 * @breif Entity behind your onwCloud instance
+	 * @return string
+	 */
+	public function getEntity() {
+		return $this->defaults->getEntity();
+	}
+
+	/**
+	 * @breif ownCloud slogan
+	 * @return string
+	 */
+	public function getSlogan() {
+		return $this->defaults->getSlogan();
+	}
+
+	/**
+	 * @breif logo claim
+	 * @return string
+	 */
+	public function getLogoClaim() {
+		return $this->defaults->getLogoClaim();
+	}
+
+	/**
+	 * @breif footer, short version
+	 * @return string
+	 */
+	public function getShortFooter() {
+		return $this->defaults->getShortFooter();
+	}
+
+	/**
+	 * @breif footer, long version
+	 * @return string
+	 */
+	public function getLongFooter() {
+		return $this->defaults->getLongFooter();
+	}
+}
diff --git a/lib/public/share.php b/lib/public/share.php
index 122ab3fa03019717d15af5a199de0c493d2eaf48..596a729a47d06a3c02357c99584235014ae38c33 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -291,6 +291,29 @@ class Share {
 		return $result->fetchRow();
 	}
 
+	/**
+	 * @brief resolves reshares down to the last real share
+	 * @param $linkItem
+	 * @return $fileOwner
+	 */
+	public static function resolveReShare($linkItem)
+	{
+		if (isset($linkItem['parent'])) {
+			$parent = $linkItem['parent'];
+			while (isset($parent)) {
+				$query = \OC_DB::prepare('SELECT * FROM `*PREFIX*share` WHERE `id` = ?', 1);
+				$item = $query->execute(array($parent))->fetchRow();
+				if (isset($item['parent'])) {
+					$parent = $item['parent'];
+				} else {
+					return $item;
+				}
+			}
+		}
+		return $linkItem;
+	}
+
+
 	/**
 	* @brief Get the shared items of item type owned by the current user
 	* @param string Item type
@@ -312,7 +335,7 @@ class Share {
 	* @return Return depends on format
 	*/
 	public static function getItemShared($itemType, $itemSource, $format = self::FORMAT_NONE,
-		$parameters = null, $includeCollections = false) {
+	                                     $parameters = null, $includeCollections = false) {
 		return self::getItems($itemType, $itemSource, null, null, \OC_User::getUser(), $format,
 			$parameters, -1, $includeCollections);
 	}
@@ -634,6 +657,17 @@ class Share {
 			}
 			$query = \OC_DB::prepare('UPDATE `*PREFIX*share` SET `permissions` = ? WHERE `id` = ?');
 			$query->execute(array($permissions, $item['id']));
+			if ($itemType === 'file' || $itemType === 'folder') {
+				\OC_Hook::emit('OCP\Share', 'post_update_permissions', array(
+					'itemType' => $itemType,
+					'itemSource' => $itemSource,
+					'shareType' => $shareType,
+					'shareWith' => $shareWith,
+					'uidOwner' => \OC_User::getUser(),
+					'permissions' => $permissions,
+					'path' => $item['path'],
+				));
+			}
 			// Check if permissions were removed
 			if ($item['permissions'] & ~$permissions) {
 				// If share permission is removed all reshares must be deleted
@@ -662,7 +696,13 @@ class Share {
 					// Remove the permissions for all reshares of this item
 					if (!empty($ids)) {
 						$ids = "'".implode("','", $ids)."'";
-						$query = \OC_DB::prepare('UPDATE `*PREFIX*share` SET `permissions` = `permissions` & ?'
+						// TODO this should be done with Doctrine platform objects
+						if (\OC_Config::getValue( "dbtype") === 'oci') {
+							$andOp = 'BITAND(`permissions`, ?)';
+						} else {
+							$andOp = '`permissions` & ?';
+						}
+						$query = \OC_DB::prepare('UPDATE `*PREFIX*share` SET `permissions` = '.$andOp
 							.' WHERE `id` IN ('.$ids.')');
 						$query->execute(array($permissions));
 					}
@@ -963,6 +1003,30 @@ class Share {
 		$switchedItems = array();
 		$mounts = array();
 		while ($row = $result->fetchRow()) {
+			if (isset($row['id'])) {
+				$row['id']=(int)$row['id'];
+			}
+			if (isset($row['share_type'])) {
+				$row['share_type']=(int)$row['share_type'];
+			}
+			if (isset($row['parent'])) {
+				$row['parent']=(int)$row['parent'];
+			}
+			if (isset($row['file_parent'])) {
+				$row['file_parent']=(int)$row['file_parent'];
+			}
+			if (isset($row['file_source'])) {
+				$row['file_source']=(int)$row['file_source'];
+			}
+			if (isset($row['permissions'])) {
+				$row['permissions']=(int)$row['permissions'];
+			}
+			if (isset($row['storage'])) {
+				$row['storage']=(int)$row['storage'];
+			}
+			if (isset($row['stime'])) {
+				$row['stime']=(int)$row['stime'];
+			}
 			// Filter out duplicate group shares for users with unique targets
 			if ($row['share_type'] == self::$shareTypeGroupUserUnique && isset($items[$row['parent']])) {
 				$row['share_type'] = self::SHARE_TYPE_GROUP;
@@ -978,7 +1042,7 @@ class Share {
 					// Check if the same owner shared with the user twice
 					// through a group and user share - this is allowed
 					$id = $targets[$row[$column]];
-					if ($items[$id]['uid_owner'] == $row['uid_owner']) {
+					if (isset($items[$id]) && $items[$id]['uid_owner'] == $row['uid_owner']) {
 						// Switch to group share type to ensure resharing conditions aren't bypassed
 						if ($items[$id]['share_type'] != self::SHARE_TYPE_GROUP) {
 							$items[$id]['share_type'] = self::SHARE_TYPE_GROUP;
diff --git a/lib/public/util.php b/lib/public/util.php
index 6744c2d37bdde2535f20a7646d8a307a2ccd1a17..d69602f4507af9654c60cc54b95aeaae544fd284 100644
--- a/lib/public/util.php
+++ b/lib/public/util.php
@@ -355,6 +355,20 @@ class Util {
 	public static function sanitizeHTML( $value ) {
 		return(\OC_Util::sanitizeHTML($value));
 	}
+		
+	/**
+	 * @brief Public function to encode url parameters
+	 *
+	 * This function is used to encode path to file before output.
+	 * Encoding is done according to RFC 3986 with one exception:
+	 * Character '/' is preserved as is. 
+	 *
+	 * @param string $component part of URI to encode
+	 * @return string 
+	 */
+	public static function encodePath($component) {
+		return(\OC_Util::encodePath($component));
+	}
 
 	/**
 	* @brief Returns an array with all keys from input lowercased or uppercased. Numbered indices are left as is.
diff --git a/lib/request.php b/lib/request.php
index 4d8380eb9ac49b85d1676fd057d18613d374e816..df33217f95d65bde3bcddc1af2e0e37ea5e78816 100755
--- a/lib/request.php
+++ b/lib/request.php
@@ -9,7 +9,7 @@
 class OC_Request {
 	/**
 	 * @brief Check overwrite condition
-	 * @returns true/false
+	 * @returns bool
 	 */
 	private static function isOverwriteCondition($type = '') {
 		$regex = '/' . OC_Config::getValue('overwritecondaddr', '')  . '/';
@@ -19,7 +19,7 @@ class OC_Request {
 
 	/**
 	 * @brief Returns the server host
-	 * @returns the server host
+	 * @returns string the server host
 	 *
 	 * Returns the server host, even if the website uses one or more
 	 * reverse proxies
@@ -40,7 +40,13 @@ class OC_Request {
 			}
 		}
 		else{
-			$host = $_SERVER['HTTP_HOST'];
+			if (isset($_SERVER['HTTP_HOST'])) {
+				return $_SERVER['HTTP_HOST'];
+			}
+			if (isset($_SERVER['SERVER_NAME'])) {
+				return $_SERVER['SERVER_NAME'];
+			}
+			return 'localhost';
 		}
 		return $host;
 	}
@@ -48,7 +54,7 @@ class OC_Request {
 
 	/**
 	* @brief Returns the server protocol
-	* @returns the server protocol
+	* @returns string the server protocol
 	*
 	* Returns the server protocol. It respects reverse proxy servers and load balancers
 	*/
@@ -70,7 +76,7 @@ class OC_Request {
 
 	/**
 	 * @brief Returns the request uri
-	 * @returns the request uri
+	 * @returns string the request uri
 	 *
 	 * Returns the request uri, even if the website uses one or more
 	 * reverse proxies
@@ -85,7 +91,7 @@ class OC_Request {
 
 	/**
 	 * @brief Returns the script name
-	 * @returns the script name
+	 * @returns string the script name
 	 *
 	 * Returns the script name, even if the website uses one or more
 	 * reverse proxies
@@ -139,7 +145,7 @@ class OC_Request {
 
 	/**
 	 * @brief Check if this is a no-cache request
-	 * @returns true for no-cache
+	 * @returns boolean true for no-cache
 	 */
 	static public function isNoCache() {
 		if (!isset($_SERVER['HTTP_CACHE_CONTROL'])) {
@@ -150,7 +156,7 @@ class OC_Request {
 
 	/**
 	 * @brief Check if the requestor understands gzip
-	 * @returns true for gzip encoding supported
+	 * @returns boolean true for gzip encoding supported
 	 */
 	static public function acceptGZip() {
 		if (!isset($_SERVER['HTTP_ACCEPT_ENCODING'])) {
diff --git a/lib/setup.php b/lib/setup.php
index 61ef7d22b112e9494b1edb8eae84d7ab96b3e006..d8f4cbfbcbd982f19624710e5cbaf503cec2ea98 100644
--- a/lib/setup.php
+++ b/lib/setup.php
@@ -19,6 +19,14 @@ class DatabaseSetupException extends Exception
 }
 
 class OC_Setup {
+	static $dbSetupClasses = array(
+		'mysql' => '\OC\Setup\MySQL',
+		'pgsql' => '\OC\Setup\PostgreSQL',
+		'oci'   => '\OC\Setup\OCI',
+		'mssql' => '\OC\Setup\MSSQL',
+		'sqlite' => '\OC\Setup\Sqlite',
+		'sqlite3' => '\OC\Setup\Sqlite',
+	);
 
 	public static function getTrans(){
 		return OC_L10N::get('lib');
@@ -40,768 +48,88 @@ class OC_Setup {
 			$options['directory'] = OC::$SERVERROOT."/data";
 		}
 
-		if($dbtype == 'mysql' or $dbtype == 'pgsql' or $dbtype == 'oci' or $dbtype == 'mssql') { //mysql and postgresql needs more config options
-			if($dbtype == 'mysql')
-				$dbprettyname = 'MySQL';
-			else if($dbtype == 'pgsql')
-				$dbprettyname = 'PostgreSQL';
-			else if ($dbtype == 'mssql')
-				$dbprettyname = 'MS SQL Server';
-			else
-				$dbprettyname = 'Oracle';
-
-
-			if(empty($options['dbuser'])) {
-				$error[] = $l->t("%s enter the database username.", array($dbprettyname));
-			}
-			if(empty($options['dbname'])) {
-				$error[] = $l->t("%s enter the database name.", array($dbprettyname));
-			}
-			if(substr_count($options['dbname'], '.') >= 1) {
-				$error[] = $l->t("%s you may not use dots in the database name", array($dbprettyname));
-			}
-			if($dbtype != 'oci' && empty($options['dbhost'])) {
-				$error[] = $l->t("%s set the database host.", array($dbprettyname));
-			}
+		if (!isset(self::$dbSetupClasses[$dbtype])) {
+			$dbtype = 'sqlite';
 		}
 
-		if(count($error) == 0) { //no errors, good
-			$username = htmlspecialchars_decode($options['adminlogin']);
-			$password = htmlspecialchars_decode($options['adminpass']);
-			$datadir = htmlspecialchars_decode($options['directory']);
-
-			if (OC_Util::runningOnWindows()) {
-				$datadir = rtrim(realpath($datadir), '\\');
-			}
-
-			//use sqlite3 when available, otherise sqlite2 will be used.
-			if($dbtype=='sqlite' and class_exists('SQLite3')) {
-				$dbtype='sqlite3';
-			}
-
-			//generate a random salt that is used to salt the local user passwords
-			$salt = OC_Util::generate_random_bytes(30);
-			OC_Config::setValue('passwordsalt', $salt);
-
-			//write the config file
-			OC_Config::setValue('datadirectory', $datadir);
-			OC_Config::setValue('dbtype', $dbtype);
-			OC_Config::setValue('version', implode('.', OC_Util::getVersion()));
-			if($dbtype == 'mysql') {
-				$dbuser = $options['dbuser'];
-				$dbpass = $options['dbpass'];
-				$dbname = $options['dbname'];
-				$dbhost = $options['dbhost'];
-				$dbtableprefix = isset($options['dbtableprefix']) ? $options['dbtableprefix'] : 'oc_';
-
-				OC_Config::setValue('dbname', $dbname);
-				OC_Config::setValue('dbhost', $dbhost);
-				OC_Config::setValue('dbtableprefix', $dbtableprefix);
-
-				try {
-					self::setupMySQLDatabase($dbhost, $dbuser, $dbpass, $dbname, $dbtableprefix, $username);
-				} catch (DatabaseSetupException $e) {
-					$error[] = array(
-						'error' => $e->getMessage(),
-						'hint' => $e->getHint()
-					);
-					return($error);
-				}
-			}
-			elseif($dbtype == 'pgsql') {
-				$dbuser = $options['dbuser'];
-				$dbpass = $options['dbpass'];
-				$dbname = $options['dbname'];
-				$dbhost = $options['dbhost'];
-				$dbtableprefix = isset($options['dbtableprefix']) ? $options['dbtableprefix'] : 'oc_';
-
-				OC_Config::setValue('dbname', $dbname);
-				OC_Config::setValue('dbhost', $dbhost);
-				OC_Config::setValue('dbtableprefix', $dbtableprefix);
-
-				try {
-					self::setupPostgreSQLDatabase($dbhost, $dbuser, $dbpass, $dbname, $dbtableprefix, $username);
-				} catch (DatabaseSetupException $e) {
-					$error[] = array(
-						'error' => $l->t('PostgreSQL username and/or password not valid'),
-						'hint' => $l->t('You need to enter either an existing account or the administrator.')
-					);
-					return $error;
-				}
-			}
-			elseif($dbtype == 'oci') {
-				$dbuser = $options['dbuser'];
-				$dbpass = $options['dbpass'];
-				$dbname = $options['dbname'];
-				if (array_key_exists('dbtablespace', $options)) {
-					$dbtablespace = $options['dbtablespace'];
-				} else {
-					$dbtablespace = 'USERS';
-				}
-				$dbhost = isset($options['dbhost'])?$options['dbhost']:'';
-				$dbtableprefix = isset($options['dbtableprefix']) ? $options['dbtableprefix'] : 'oc_';
-
-				OC_Config::setValue('dbname', $dbname);
-				OC_Config::setValue('dbhost', $dbhost);
-				OC_Config::setValue('dbtableprefix', $dbtableprefix);
-
-				try {
-					self::setupOCIDatabase($dbhost, $dbuser, $dbpass, $dbname, $dbtableprefix, $dbtablespace, $username);
-				} catch (DatabaseSetupException $e) {
-					$error[] = array(
-						'error' => $l->t('Oracle connection could not be established'),
-						'hint' => $e->getMessage().' Check environment: ORACLE_HOME='.getenv('ORACLE_HOME')
-							.' ORACLE_SID='.getenv('ORACLE_SID')
-							.' LD_LIBRARY_PATH='.getenv('LD_LIBRARY_PATH')
-							.' NLS_LANG='.getenv('NLS_LANG')
-							.' tnsnames.ora is '.(is_readable(getenv('ORACLE_HOME').'/network/admin/tnsnames.ora')?'':'not ').'readable'
-					);
-					return $error;
-				}
-			}
-			elseif ($dbtype == 'mssql') {
-				$dbuser = $options['dbuser'];
-				$dbpass = $options['dbpass'];
-				$dbname = $options['dbname'];
-				$dbhost = $options['dbhost'];
-				$dbtableprefix = isset($options['dbtableprefix']) ? $options['dbtableprefix'] : 'oc_';
-
-				OC_Config::setValue('dbname', $dbname);
-				OC_Config::setValue('dbhost', $dbhost);
-				OC_Config::setValue('dbuser', $dbuser);
-				OC_Config::setValue('dbpassword', $dbpass);
-				OC_Config::setValue('dbtableprefix', $dbtableprefix);
+		$class = self::$dbSetupClasses[$dbtype];
+		$dbSetup = new $class(self::getTrans(), 'db_structure.xml');
+		$error = array_merge($error, $dbSetup->validate($options));
 
-				try {
-					self::setupMSSQLDatabase($dbhost, $dbuser, $dbpass, $dbname, $dbtableprefix);
-				} catch (DatabaseSetupException $e) {
-					$error[] = array(
-						'error' => 'MS SQL username and/or password not valid',
-						'hint' => 'You need to enter either an existing account or the administrator.'
-					);
-					return $error;
-				}
-			}
-			else {
-				//delete the old sqlite database first, might cause infinte loops otherwise
-				if(file_exists("$datadir/owncloud.db")) {
-					unlink("$datadir/owncloud.db");
-				}
-				//in case of sqlite, we can always fill the database
-				error_log("creating sqlite db");
-				OC_DB::createDbFromStructure('db_structure.xml');
-			}
-
-			//create the user and group
-			try {
-				OC_User::createUser($username, $password);
-			}
-			catch(Exception $exception) {
-				$error[] = 'Error while trying to create admin user: ' . $exception->getMessage();
-			}
-
-			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);
-
-				//guess what this does
-				OC_Installer::installShippedApps();
-
-				//create htaccess files for apache hosts
-				if (isset($_SERVER['SERVER_SOFTWARE']) && strstr($_SERVER['SERVER_SOFTWARE'], 'Apache')) {
-					self::createHtaccess();
-				}
-
-				//and we are done
-				OC_Config::setValue('installed', true);
-			}
+		if(count($error) != 0) {
+			return $error;
 		}
 
-		return $error;
-	}
+		//no errors, good
+		$username = htmlspecialchars_decode($options['adminlogin']);
+		$password = htmlspecialchars_decode($options['adminpass']);
+		$datadir = htmlspecialchars_decode($options['directory']);
 
-	private static function setupMySQLDatabase($dbhost, $dbuser, $dbpass, $dbname, $dbtableprefix, $username) {
-		//check if the database user has admin right
-		$l = self::getTrans();
-		$connection = @mysql_connect($dbhost, $dbuser, $dbpass);
-		if(!$connection) {
-			throw new DatabaseSetupException($l->t('MySQL username and/or password not valid'),
-				$l->t('You need to enter either an existing account or the administrator.'));
+		if (OC_Util::runningOnWindows()) {
+			$datadir = rtrim(realpath($datadir), '\\');
 		}
-		$oldUser=OC_Config::getValue('dbuser', false);
-
-		//this should be enough to check for admin rights in mysql
-		$query="SELECT user FROM mysql.user WHERE user='$dbuser'";
-		if(mysql_query($query, $connection)) {
-			//use the admin login data for the new database user
-
-			//add prefix to the mysql user name to prevent collisions
-			$dbusername=substr('oc_'.$username, 0, 16);
-			if($dbusername!=$oldUser) {
-				//hash the password so we don't need to store the admin config in the config file
-				$dbpassword=OC_Util::generate_random_bytes(30);
 
-				self::createDBUser($dbusername, $dbpassword, $connection);
-
-				OC_Config::setValue('dbuser', $dbusername);
-				OC_Config::setValue('dbpassword', $dbpassword);
-			}
-
-			//create the database
-			self::createMySQLDatabase($dbname, $dbusername, $connection);
+		//use sqlite3 when available, otherise sqlite2 will be used.
+		if($dbtype=='sqlite' and class_exists('SQLite3')) {
+			$dbtype='sqlite3';
 		}
-		else {
-			if($dbuser!=$oldUser) {
-				OC_Config::setValue('dbuser', $dbuser);
-				OC_Config::setValue('dbpassword', $dbpass);
-			}
 
-			//create the database
-			self::createMySQLDatabase($dbname, $dbuser, $connection);
-		}
+		//generate a random salt that is used to salt the local user passwords
+		$salt = OC_Util::generate_random_bytes(30);
+		OC_Config::setValue('passwordsalt', $salt);
 
-		//fill the database if needed
-		$query='select count(*) from information_schema.tables'
-			." where table_schema='$dbname' AND table_name = '{$dbtableprefix}users';";
-		$result = mysql_query($query, $connection);
-		if($result) {
-			$row=mysql_fetch_row($result);
+		//write the config file
+		OC_Config::setValue('datadirectory', $datadir);
+		OC_Config::setValue('dbtype', $dbtype);
+		OC_Config::setValue('version', implode('.', OC_Util::getVersion()));
+		try {
+			$dbSetup->initialize($options);
+			$dbSetup->setupDatabase($username);
+		} catch (DatabaseSetupException $e) {
+			$error[] = array(
+				'error' => $e->getMessage(),
+				'hint' => $e->getHint()
+			);
+			return($error);
+		} catch (Exception $e) {
+			$error[] = array(
+				'error' => 'Error while trying to create admin user: ' . $e->getMessage(),
+				'hint' => ''
+			);
+			return($error);
 		}
-		if(!$result or $row[0]==0) {
-			OC_DB::createDbFromStructure('db_structure.xml');
-		}
-		mysql_close($connection);
-	}
 
-	private static function createMySQLDatabase($name, $user, $connection) {
-		//we cant use OC_BD functions here because we need to connect as the administrative user.
-		$l = self::getTrans();
-		$query = "CREATE DATABASE IF NOT EXISTS  `$name`";
-		$result = mysql_query($query, $connection);
-		if(!$result) {
-			$entry = $l->t('DB Error: "%s"', array(mysql_error($connection))) . '<br />';
-			$entry .= $l->t('Offending command was: "%s"', array($query)) . '<br />';
-			\OC_Log::write('setup.mssql', $entry, \OC_Log::WARN);
+		//create the user and group
+		try {
+			OC_User::createUser($username, $password);
 		}
-		$query="GRANT ALL PRIVILEGES ON  `$name` . * TO  '$user'";
-
-		//this query will fail if there aren't the right permissions, ignore the error
-		mysql_query($query, $connection);
-	}
-
-	private static function createDBUser($name, $password, $connection) {
-		// we need to create 2 accounts, one for global use and one for local user. if we don't specify the local one,
-		// the anonymous user would take precedence when there is one.
-		$l = self::getTrans();
-		$query = "CREATE USER '$name'@'localhost' IDENTIFIED BY '$password'";
-		$result = mysql_query($query, $connection);
-		if (!$result) {
-			throw new DatabaseSetupException($l->t("MySQL user '%s'@'localhost' exists already.",
-				array($name)), $l->t("Drop this user from MySQL", array($name)));
-		}
-		$query = "CREATE USER '$name'@'%' IDENTIFIED BY '$password'";
-		$result = mysql_query($query, $connection);
-		if (!$result) {
-			throw new DatabaseSetupException($l->t("MySQL user '%s'@'%%' already exists", array($name)),
-				$l->t("Drop this user from MySQL."));
-		}
-	}
-
-	private static function setupPostgreSQLDatabase($dbhost, $dbuser, $dbpass, $dbname, $dbtableprefix, $username) {
-		$e_host = addslashes($dbhost);
-		$e_user = addslashes($dbuser);
-		$e_password = addslashes($dbpass);
-		$l = self::getTrans();
-
-		//check if the database user has admin rights
-		$connection_string = "host='$e_host' dbname=postgres user='$e_user' password='$e_password'";
-		$connection = @pg_connect($connection_string);
-		if(!$connection) {
-			// Try if we can connect to the DB with the specified name
-			$e_dbname = addslashes($dbname);
-			$connection_string = "host='$e_host' dbname='$e_dbname' user='$e_user' password='$e_password'";
-			$connection = @pg_connect($connection_string);
-
-			if(!$connection)
-				throw new DatabaseSetupException($l->t('PostgreSQL username and/or password not valid'));
-		}
-		$e_user = pg_escape_string($dbuser);
-		//check for roles creation rights in postgresql
-		$query="SELECT 1 FROM pg_roles WHERE rolcreaterole=TRUE AND rolname='$e_user'";
-		$result = pg_query($connection, $query);
-		if($result and pg_num_rows($result) > 0) {
-			//use the admin login data for the new database user
-
-			//add prefix to the postgresql user name to prevent collisions
-			$dbusername='oc_'.$username;
-			//create a new password so we don't need to store the admin config in the config file
-			$dbpassword=OC_Util::generate_random_bytes(30);
-
-			self::pg_createDBUser($dbusername, $dbpassword, $connection);
-
-			OC_Config::setValue('dbuser', $dbusername);
-			OC_Config::setValue('dbpassword', $dbpassword);
-
-			//create the database
-			self::pg_createDatabase($dbname, $dbusername, $connection);
-		}
-		else {
-			OC_Config::setValue('dbuser', $dbuser);
-			OC_Config::setValue('dbpassword', $dbpass);
-
-			//create the database
-			self::pg_createDatabase($dbname, $dbuser, $connection);
+		catch(Exception $exception) {
+			$error[] = $exception->getMessage();
 		}
 
-		// the connection to dbname=postgres is not needed anymore
-		pg_close($connection);
+		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');
 
-		// connect to the ownCloud database (dbname=$dbname) and check if it needs to be filled
-		$dbuser = OC_Config::getValue('dbuser');
-		$dbpass = OC_Config::getValue('dbpassword');
+			OC_Group::createGroup('admin');
+			OC_Group::addToGroup($username, 'admin');
+			OC_User::login($username, $password);
 
-		$e_host = addslashes($dbhost);
-		$e_dbname = addslashes($dbname);
-		$e_user = addslashes($dbuser);
-		$e_password = addslashes($dbpass);
+			//guess what this does
+			OC_Installer::installShippedApps();
 
-		$connection_string = "host='$e_host' dbname='$e_dbname' user='$e_user' password='$e_password'";
-		$connection = @pg_connect($connection_string);
-		if(!$connection) {
-			throw new DatabaseSetupException($l->t('PostgreSQL username and/or password not valid'));
-		}
-		$query = "select count(*) FROM pg_class WHERE relname='{$dbtableprefix}users' limit 1";
-		$result = pg_query($connection, $query);
-		if($result) {
-			$row = pg_fetch_row($result);
-		}
-		if(!$result or $row[0]==0) {
-			OC_DB::createDbFromStructure('db_structure.xml');
-		}
-	}
-
-	private static function pg_createDatabase($name, $user, $connection) {
-
-		//we cant use OC_BD functions here because we need to connect as the administrative user.
-		$l = self::getTrans();
-		$e_name = pg_escape_string($name);
-		$e_user = pg_escape_string($user);
-		$query = "select datname from pg_database where datname = '$e_name'";
-		$result = pg_query($connection, $query);
-		if(!$result) {
-			$entry = $l->t('DB Error: "%s"', array(pg_last_error($connection))) . '<br />';
-			$entry .= $l->t('Offending command was: "%s"', array($query)) . '<br />';
-			\OC_Log::write('setup.pg', $entry, \OC_Log::WARN);
-		}
-		if(! pg_fetch_row($result)) {
-			//The database does not exists... let's create it
-			$query = "CREATE DATABASE \"$e_name\" OWNER \"$e_user\"";
-			$result = pg_query($connection, $query);
-			if(!$result) {
-				$entry = $l->t('DB Error: "%s"', array(pg_last_error($connection))) . '<br />';
-				$entry .= $l->t('Offending command was: "%s"', array($query)) . '<br />';
-				\OC_Log::write('setup.pg', $entry, \OC_Log::WARN);
-			}
-			else {
-				$query = "REVOKE ALL PRIVILEGES ON DATABASE \"$e_name\" FROM PUBLIC";
-				pg_query($connection, $query);
+			//create htaccess files for apache hosts
+			if (isset($_SERVER['SERVER_SOFTWARE']) && strstr($_SERVER['SERVER_SOFTWARE'], 'Apache')) {
+				self::createHtaccess();
 			}
-		}
-	}
 
-	private static function pg_createDBUser($name, $password, $connection) {
-		$l = self::getTrans();
-		$e_name = pg_escape_string($name);
-		$e_password = pg_escape_string($password);
-		$query = "select * from pg_roles where rolname='$e_name';";
-		$result = pg_query($connection, $query);
-		if(!$result) {
-			$entry = $l->t('DB Error: "%s"', array(pg_last_error($connection))) . '<br />';
-			$entry .= $l->t('Offending command was: "%s"', array($query)) . '<br />';
-			\OC_Log::write('setup.pg', $entry, \OC_Log::WARN);
-		}
-
-		if(! pg_fetch_row($result)) {
-			//user does not exists let's create it :)
-			$query = "CREATE USER \"$e_name\" CREATEDB PASSWORD '$e_password';";
-			$result = pg_query($connection, $query);
-			if(!$result) {
-				$entry = $l->t('DB Error: "%s"', array(pg_last_error($connection))) . '<br />';
-				$entry .= $l->t('Offending command was: "%s"', array($query)) . '<br />';
-				\OC_Log::write('setup.pg', $entry, \OC_Log::WARN);
-			}
-		}
-		else { // change password of the existing role
-			$query = "ALTER ROLE \"$e_name\" WITH PASSWORD '$e_password';";
-			$result = pg_query($connection, $query);
-			if(!$result) {
-				$entry = $l->t('DB Error: "%s"', array(pg_last_error($connection))) . '<br />';
-				$entry .= $l->t('Offending command was: "%s"', array($query)) . '<br />';
-				\OC_Log::write('setup.pg', $entry, \OC_Log::WARN);
-			}
+			//and we are done
+			OC_Config::setValue('installed', true);
 		}
-	}
 
-	private static function setupOCIDatabase($dbhost, $dbuser, $dbpass, $dbname, $dbtableprefix, $dbtablespace,
-			$username) {
-		$l = self::getTrans();
-		$e_host = addslashes($dbhost);
-		$e_dbname = addslashes($dbname);
-		//check if the database user has admin right
-		if ($e_host == '') {
-			$easy_connect_string = $e_dbname; // use dbname as easy connect name
-		} else {
-			$easy_connect_string = '//'.$e_host.'/'.$e_dbname;
-		}
-		\OC_Log::write('setup oracle', 'connect string: ' . $easy_connect_string, \OC_Log::DEBUG);
-		$connection = @oci_connect($dbuser, $dbpass, $easy_connect_string);
-		if(!$connection) {
-			$e = oci_error();
-			if (is_array ($e) && isset ($e['message'])) {
-				throw new DatabaseSetupException($e['message']);
-			}
-			throw new DatabaseSetupException($l->t('Oracle username and/or password not valid'));
-		}
-		//check for roles creation rights in oracle
-
-		$query='SELECT count(*) FROM user_role_privs, role_sys_privs'
-			." WHERE user_role_privs.granted_role = role_sys_privs.role AND privilege = 'CREATE ROLE'";
-		$stmt = oci_parse($connection, $query);
-		if (!$stmt) {
-			$entry = $l->t('DB Error: "%s"', array(oci_last_error($connection))) . '<br />';
-			$entry .= $l->t('Offending command was: "%s"', array($query)) . '<br />';
-			\OC_Log::write('setup.oci', $entry, \OC_Log::WARN);
-		}
-		$result = oci_execute($stmt);
-		if($result) {
-			$row = oci_fetch_row($stmt);
-		}
-		if($result and $row[0] > 0) {
-			//use the admin login data for the new database user
-
-			//add prefix to the oracle user name to prevent collisions
-			$dbusername='oc_'.$username;
-			//create a new password so we don't need to store the admin config in the config file
-			$dbpassword=OC_Util::generate_random_bytes(30);
-
-			//oracle passwords are treated as identifiers:
-			//  must start with aphanumeric char
-			//  needs to be shortened to 30 bytes, as the two " needed to escape the identifier count towards the identifier length.
-			$dbpassword=substr($dbpassword, 0, 30);
-
-			self::oci_createDBUser($dbusername, $dbpassword, $dbtablespace, $connection);
-
-			OC_Config::setValue('dbuser', $dbusername);
-			OC_Config::setValue('dbname', $dbusername);
-			OC_Config::setValue('dbpassword', $dbpassword);
-
-			//create the database not neccessary, oracle implies user = schema
-			//self::oci_createDatabase($dbname, $dbusername, $connection);
-		} else {
-
-			OC_Config::setValue('dbuser', $dbuser);
-			OC_Config::setValue('dbname', $dbname);
-			OC_Config::setValue('dbpassword', $dbpass);
-
-			//create the database not neccessary, oracle implies user = schema
-			//self::oci_createDatabase($dbname, $dbuser, $connection);
-		}
-
-		//FIXME check tablespace exists: select * from user_tablespaces
-
-		// the connection to dbname=oracle is not needed anymore
-		oci_close($connection);
-
-		// connect to the oracle database (schema=$dbuser) an check if the schema needs to be filled
-		$dbuser = OC_Config::getValue('dbuser');
-		//$dbname = OC_Config::getValue('dbname');
-		$dbpass = OC_Config::getValue('dbpassword');
-
-		$e_host = addslashes($dbhost);
-		$e_dbname = addslashes($dbname);
-
-		if ($e_host == '') {
-			$easy_connect_string = $e_dbname; // use dbname as easy connect name
-		} else {
-			$easy_connect_string = '//'.$e_host.'/'.$e_dbname;
-		}
-		$connection = @oci_connect($dbuser, $dbpass, $easy_connect_string);
-		if(!$connection) {
-			throw new DatabaseSetupException($l->t('Oracle username and/or password not valid'));
-		}
-		$query = "SELECT count(*) FROM user_tables WHERE table_name = :un";
-		$stmt = oci_parse($connection, $query);
-		$un = $dbtableprefix.'users';
-		oci_bind_by_name($stmt, ':un', $un);
-		if (!$stmt) {
-			$entry = $l->t('DB Error: "%s"', array(oci_error($connection))) . '<br />';
-			$entry .= $l->t('Offending command was: "%s"', array($query)) . '<br />';
-			\OC_Log::write('setup.oci', $entry, \OC_Log::WARN);
-		}
-		$result = oci_execute($stmt);
-
-		if($result) {
-			$row = oci_fetch_row($stmt);
-		}
-		if(!$result or $row[0]==0) {
-			OC_DB::createDbFromStructure('db_structure.xml');
-		}
-	}
-
-	/**
-	 *
-	 * @param String $name
-	 * @param String $password
-	 * @param String $tablespace
-	 * @param resource $connection
-	 */
-	private static function oci_createDBUser($name, $password, $tablespace, $connection) {
-		$l = self::getTrans();
-		$query = "SELECT * FROM all_users WHERE USERNAME = :un";
-		$stmt = oci_parse($connection, $query);
-		if (!$stmt) {
-			$entry = $l->t('DB Error: "%s"', array(oci_error($connection))) . '<br />';
-			$entry .= $l->t('Offending command was: "%s"', array($query)) . '<br />';
-			\OC_Log::write('setup.oci', $entry, \OC_Log::WARN);
-		}
-		oci_bind_by_name($stmt, ':un', $name);
-		$result = oci_execute($stmt);
-		if(!$result) {
-			$entry = $l->t('DB Error: "%s"', array(oci_error($connection))) . '<br />';
-			$entry .= $l->t('Offending command was: "%s"', array($query)) . '<br />';
-			\OC_Log::write('setup.oci', $entry, \OC_Log::WARN);
-		}
-
-		if(! oci_fetch_row($stmt)) {
-			//user does not exists let's create it :)
-			//password must start with alphabetic character in oracle
-			$query = 'CREATE USER '.$name.' IDENTIFIED BY "'.$password.'" DEFAULT TABLESPACE '.$tablespace; //TODO set default tablespace
-			$stmt = oci_parse($connection, $query);
-			if (!$stmt) {
-				$entry = $l->t('DB Error: "%s"', array(oci_error($connection))) . '<br />';
-				$entry .= $l->t('Offending command was: "%s"', array($query)) . '<br />';
-				\OC_Log::write('setup.oci', $entry, \OC_Log::WARN);
-			}
-			//oci_bind_by_name($stmt, ':un', $name);
-			$result = oci_execute($stmt);
-			if(!$result) {
-				$entry = $l->t('DB Error: "%s"', array(oci_error($connection))) . '<br />';
-				$entry .= $l->t('Offending command was: "%s", name: %s, password: %s',
-					array($query, $name, $password)) . '<br />';
-				\OC_Log::write('setup.oci', $entry, \OC_Log::WARN);
-			}
-		} else { // change password of the existing role
-			$query = "ALTER USER :un IDENTIFIED BY :pw";
-			$stmt = oci_parse($connection, $query);
-			if (!$stmt) {
-				$entry = $l->t('DB Error: "%s"', array(oci_error($connection))) . '<br />';
-				$entry .= $l->t('Offending command was: "%s"', array($query)) . '<br />';
-				\OC_Log::write('setup.oci', $entry, \OC_Log::WARN);
-			}
-			oci_bind_by_name($stmt, ':un', $name);
-			oci_bind_by_name($stmt, ':pw', $password);
-			$result = oci_execute($stmt);
-			if(!$result) {
-				$entry = $l->t('DB Error: "%s"', array(oci_error($connection))) . '<br />';
-				$entry .= $l->t('Offending command was: "%s"', array($query)) . '<br />';
-				\OC_Log::write('setup.oci', $entry, \OC_Log::WARN);
-			}
-		}
-		// grant necessary roles
-		$query = 'GRANT CREATE SESSION, CREATE TABLE, CREATE SEQUENCE, CREATE TRIGGER, UNLIMITED TABLESPACE TO '.$name;
-		$stmt = oci_parse($connection, $query);
-		if (!$stmt) {
-			$entry = $l->t('DB Error: "%s"', array(oci_error($connection))) . '<br />';
-			$entry .= $l->t('Offending command was: "%s"', array($query)) . '<br />';
-			\OC_Log::write('setup.oci', $entry, \OC_Log::WARN);
-		}
-		$result = oci_execute($stmt);
-		if(!$result) {
-			$entry = $l->t('DB Error: "%s"', array(oci_error($connection))) . '<br />';
-			$entry .= $l->t('Offending command was: "%s", name: %s, password: %s',
-				array($query, $name, $password)) . '<br />';
-			\OC_Log::write('setup.oci', $entry, \OC_Log::WARN);
-		}
-	}
-
-	private static function setupMSSQLDatabase($dbhost, $dbuser, $dbpass, $dbname, $dbtableprefix) {
-		$l = self::getTrans();
-
-		//check if the database user has admin right
-		$masterConnectionInfo = array( "Database" => "master", "UID" => $dbuser, "PWD" => $dbpass);
-
-		$masterConnection = @sqlsrv_connect($dbhost, $masterConnectionInfo);
-		if(!$masterConnection) {
-			$entry = null;
-			if( ($errors = sqlsrv_errors() ) != null) {
-				$entry='DB Error: "'.print_r(sqlsrv_errors()).'"<br />';
-			} else {
-				$entry = '';
-			}
-			throw new DatabaseSetupException($l->t('MS SQL username and/or password not valid: %s', array($entry)));
-		}
-
-		OC_Config::setValue('dbuser', $dbuser);
-		OC_Config::setValue('dbpassword', $dbpass);
-
-		self::mssql_createDBLogin($dbuser, $dbpass, $masterConnection);
-
-		self::mssql_createDatabase($dbname, $masterConnection);
-
-		self::mssql_createDBUser($dbuser, $dbname, $masterConnection);
-
-		sqlsrv_close($masterConnection);
-
-		self::mssql_createDatabaseStructure($dbhost, $dbname, $dbuser, $dbpass, $dbtableprefix);
-	}
-
-	private static function mssql_createDBLogin($name, $password, $connection) {
-		$query = "SELECT * FROM master.sys.server_principals WHERE name = '".$name."';";
-		$result = sqlsrv_query($connection, $query);
-		if ($result === false) {
-			if ( ($errors = sqlsrv_errors() ) != null) {
-				$entry='DB Error: "'.print_r(sqlsrv_errors()).'"<br />';
-			} else {
-				$entry = '';
-			}
-			$entry.='Offending command was: '.$query.'<br />';
-			\OC_Log::write('setup.mssql', $entry, \OC_Log::WARN);
-		} else {
-			$row = sqlsrv_fetch_array($result);
-
-			if ($row === false) {
-				if ( ($errors = sqlsrv_errors() ) != null) {
-					$entry='DB Error: "'.print_r(sqlsrv_errors()).'"<br />';
-				} else {
-					$entry = '';
-				}
-				$entry.='Offending command was: '.$query.'<br />';
-				\OC_Log::write('setup.mssql', $entry, \OC_Log::WARN);
-			} else {
-				if ($row == null) {
-					$query = "CREATE LOGIN [".$name."] WITH PASSWORD = '".$password."';";
-					$result = sqlsrv_query($connection, $query);
-					if (!$result or $result === false) {
-						if ( ($errors = sqlsrv_errors() ) != null) {
-							$entry='DB Error: "'.print_r(sqlsrv_errors()).'"<br />';
-						} else {
-							$entry = '';
-						}
-						$entry.='Offending command was: '.$query.'<br />';
-						\OC_Log::write('setup.mssql', $entry, \OC_Log::WARN);
-					}
-				}
-			}
-		}
-	}
-
-	private static function mssql_createDBUser($name, $dbname, $connection) {
-		$query = "SELECT * FROM [".$dbname."].sys.database_principals WHERE name = '".$name."';";
-		$result = sqlsrv_query($connection, $query);
-		if ($result === false) {
-			if ( ($errors = sqlsrv_errors() ) != null) {
-				$entry='DB Error: "'.print_r(sqlsrv_errors()).'"<br />';
-			} else {
-				$entry = '';
-			}
-			$entry.='Offending command was: '.$query.'<br />';
-			\OC_Log::write('setup.mssql', $entry, \OC_Log::WARN);
-		} else {
-			$row = sqlsrv_fetch_array($result);
-
-			if ($row === false) {
-				if ( ($errors = sqlsrv_errors() ) != null) {
-					$entry='DB Error: "'.print_r(sqlsrv_errors()).'"<br />';
-				} else {
-					$entry = '';
-				}
-				$entry.='Offending command was: '.$query.'<br />';
-				\OC_Log::write('setup.mssql', $entry, \OC_Log::WARN);
-			} else {
-				if ($row == null) {
-					$query = "USE [".$dbname."]; CREATE USER [".$name."] FOR LOGIN [".$name."];";
-					$result = sqlsrv_query($connection, $query);
-					if (!$result || $result === false) {
-						if ( ($errors = sqlsrv_errors() ) != null) {
-							$entry = 'DB Error: "'.print_r(sqlsrv_errors()).'"<br />';
-						} else {
-							$entry = '';
-						}
-						$entry.='Offending command was: '.$query.'<br />';
-						\OC_Log::write('setup.mssql', $entry, \OC_Log::WARN);
-					}
-				}
-
-				$query = "USE [".$dbname."]; EXEC sp_addrolemember 'db_owner', '".$name."';";
-				$result = sqlsrv_query($connection, $query);
-				if (!$result || $result === false) {
-					if ( ($errors = sqlsrv_errors() ) != null) {
-						$entry='DB Error: "'.print_r(sqlsrv_errors()).'"<br />';
-					} else {
-						$entry = '';
-					}
-					$entry.='Offending command was: '.$query.'<br />';
-					\OC_Log::write('setup.mssql', $entry, \OC_Log::WARN);
-				}
-			}
-		}
-	}
-
-	private static function mssql_createDatabase($dbname, $connection) {
-		$query = "CREATE DATABASE [".$dbname."];";
-		$result = sqlsrv_query($connection, $query);
-		if (!$result || $result === false) {
-			if ( ($errors = sqlsrv_errors() ) != null) {
-				$entry='DB Error: "'.print_r(sqlsrv_errors()).'"<br />';
-			} else {
-				$entry = '';
-			}
-			$entry.='Offending command was: '.$query.'<br />';
-			\OC_Log::write('setup.mssql', $entry, \OC_Log::WARN);
-		}
-	}
-
-	private static function mssql_createDatabaseStructure($dbhost, $dbname, $dbuser, $dbpass, $dbtableprefix) {
-		$connectionInfo = array( "Database" => $dbname, "UID" => $dbuser, "PWD" => $dbpass);
-
-		$connection = @sqlsrv_connect($dbhost, $connectionInfo);
-
-		//fill the database if needed
-		$query = "SELECT * FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_SCHEMA = '{$dbname}' AND TABLE_NAME = '{$dbtableprefix}users'";
-		$result = sqlsrv_query($connection, $query);
-		if ($result === false) {
-			if ( ($errors = sqlsrv_errors() ) != null) {
-				$entry='DB Error: "'.print_r(sqlsrv_errors()).'"<br />';
-			} else {
-				$entry = '';
-			}
-			$entry.='Offending command was: '.$query.'<br />';
-			\OC_Log::write('setup.mssql', $entry, \OC_Log::WARN);
-		} else {
-			$row = sqlsrv_fetch_array($result);
-
-			if ($row === false) {
-				if ( ($errors = sqlsrv_errors() ) != null) {
-					$entry='DB Error: "'.print_r(sqlsrv_errors()).'"<br />';
-				} else {
-					$entry = '';
-				}
-				$entry.='Offending command was: '.$query.'<br />';
-				\OC_Log::write('setup.mssql', $entry, \OC_Log::WARN);
-			} else {
-				if ($row == null) {
-					OC_DB::createDbFromStructure('db_structure.xml');
-				}
-			}
-		}
-
-		sqlsrv_close($connection);
+		return $error;
 	}
 
 	/**
diff --git a/lib/setup/abstractdatabase.php b/lib/setup/abstractdatabase.php
new file mode 100644
index 0000000000000000000000000000000000000000..0beada7bd299d2151e24842e2ad271f6c867a4d3
--- /dev/null
+++ b/lib/setup/abstractdatabase.php
@@ -0,0 +1,50 @@
+<?php
+
+namespace OC\Setup;
+
+abstract class AbstractDatabase {
+	protected $trans;
+	protected $dbDefinitionFile;
+	protected $dbuser;
+	protected $dbpassword;
+	protected $dbname;
+	protected $dbhost;
+	protected $tableprefix;
+
+	public function __construct($trans, $dbDefinitionFile) {
+		$this->trans = $trans;
+		$this->dbDefinitionFile = $dbDefinitionFile;
+	}
+
+	public function validate($config) {
+		$errors = array();
+		if(empty($config['dbuser'])) {
+			$errors[] = $this->trans->t("%s enter the database username.", array($this->dbprettyname));
+		}
+		if(empty($config['dbname'])) {
+			$errors[] = $this->trans->t("%s enter the database name.", array($this->dbprettyname));
+		}
+		if(substr_count($config['dbname'], '.') >= 1) {
+			$errors[] = $this->trans->t("%s you may not use dots in the database name", array($this->dbprettyname));
+		}
+		return $errors;
+	}
+
+	public function initialize($config) {
+		$dbuser = $config['dbuser'];
+		$dbpass = $config['dbpass'];
+		$dbname = $config['dbname'];
+		$dbhost = !empty($config['dbhost']) ? $config['dbhost'] : 'localhost';
+		$dbtableprefix = isset($config['dbtableprefix']) ? $config['dbtableprefix'] : 'oc_';
+
+		\OC_Config::setValue('dbname', $dbname);
+		\OC_Config::setValue('dbhost', $dbhost);
+		\OC_Config::setValue('dbtableprefix', $dbtableprefix);
+
+		$this->dbuser = $dbuser;
+		$this->dbpassword = $dbpass;
+		$this->dbname = $dbname;
+		$this->dbhost = $dbhost;
+		$this->tableprefix = $dbtableprefix;
+	}
+}
diff --git a/lib/setup/mssql.php b/lib/setup/mssql.php
new file mode 100644
index 0000000000000000000000000000000000000000..b8329f9907963d26f8dc6f0b991b7488e6e9eb41
--- /dev/null
+++ b/lib/setup/mssql.php
@@ -0,0 +1,182 @@
+<?php
+
+namespace OC\Setup;
+
+class MSSQL extends AbstractDatabase {
+	public $dbprettyname = 'MS SQL Server';
+
+	public function setupDatabase() {
+		//check if the database user has admin right
+		$masterConnectionInfo = array( "Database" => "master", "UID" => $this->dbuser, "PWD" => $this->dbpassword);
+
+		$masterConnection = @sqlsrv_connect($this->dbhost, $masterConnectionInfo);
+		if(!$masterConnection) {
+			$entry = null;
+			if( ($errors = sqlsrv_errors() ) != null) {
+				$entry='DB Error: "'.print_r(sqlsrv_errors()).'"<br />';
+			} else {
+				$entry = '';
+			}
+			throw new \DatabaseSetupException($this->trans->t('MS SQL username and/or password not valid: %s', array($entry)),
+					$this->trans->t('You need to enter either an existing account or the administrator.'));
+		}
+
+		\OC_Config::setValue('dbuser', $this->dbuser);
+		\OC_Config::setValue('dbpassword', $this->dbpassword);
+
+		$this->createDBLogin($masterConnection);
+
+		$this->createDatabase($masterConnection);
+
+		$this->createDBUser($masterConnection);
+
+		sqlsrv_close($masterConnection);
+
+		$this->createDatabaseStructure();
+	}
+
+	private function createDBLogin($connection) {
+		$query = "SELECT * FROM master.sys.server_principals WHERE name = '".$this->dbuser."';";
+		$result = sqlsrv_query($connection, $query);
+		if ($result === false) {
+			if ( ($errors = sqlsrv_errors() ) != null) {
+				$entry='DB Error: "'.print_r(sqlsrv_errors()).'"<br />';
+			} else {
+				$entry = '';
+			}
+			$entry.='Offending command was: '.$query.'<br />';
+			\OC_Log::write('setup.mssql', $entry, \OC_Log::WARN);
+		} else {
+			$row = sqlsrv_fetch_array($result);
+
+			if ($row === false) {
+				if ( ($errors = sqlsrv_errors() ) != null) {
+					$entry='DB Error: "'.print_r(sqlsrv_errors()).'"<br />';
+				} else {
+					$entry = '';
+				}
+				$entry.='Offending command was: '.$query.'<br />';
+				\OC_Log::write('setup.mssql', $entry, \OC_Log::WARN);
+			} else {
+				if ($row == null) {
+					$query = "CREATE LOGIN [".$this->dbuser."] WITH PASSWORD = '".$this->dbpassword."';";
+					$result = sqlsrv_query($connection, $query);
+					if (!$result or $result === false) {
+						if ( ($errors = sqlsrv_errors() ) != null) {
+							$entry='DB Error: "'.print_r(sqlsrv_errors()).'"<br />';
+						} else {
+							$entry = '';
+						}
+						$entry.='Offending command was: '.$query.'<br />';
+						\OC_Log::write('setup.mssql', $entry, \OC_Log::WARN);
+					}
+				}
+			}
+		}
+	}
+
+	private function createDBUser($connection) {
+		$query = "SELECT * FROM [".$this->dbname."].sys.database_principals WHERE name = '".$this->dbuser."';";
+		$result = sqlsrv_query($connection, $query);
+		if ($result === false) {
+			if ( ($errors = sqlsrv_errors() ) != null) {
+				$entry='DB Error: "'.print_r(sqlsrv_errors()).'"<br />';
+			} else {
+				$entry = '';
+			}
+			$entry.='Offending command was: '.$query.'<br />';
+			\OC_Log::write('setup.mssql', $entry, \OC_Log::WARN);
+		} else {
+			$row = sqlsrv_fetch_array($result);
+
+			if ($row === false) {
+				if ( ($errors = sqlsrv_errors() ) != null) {
+					$entry='DB Error: "'.print_r(sqlsrv_errors()).'"<br />';
+				} else {
+					$entry = '';
+				}
+				$entry.='Offending command was: '.$query.'<br />';
+				\OC_Log::write('setup.mssql', $entry, \OC_Log::WARN);
+			} else {
+				if ($row == null) {
+					$query = "USE [".$this->dbname."]; CREATE USER [".$this->dbuser."] FOR LOGIN [".$this->dbuser."];";
+					$result = sqlsrv_query($connection, $query);
+					if (!$result || $result === false) {
+						if ( ($errors = sqlsrv_errors() ) != null) {
+							$entry = 'DB Error: "'.print_r(sqlsrv_errors()).'"<br />';
+						} else {
+							$entry = '';
+						}
+						$entry.='Offending command was: '.$query.'<br />';
+						\OC_Log::write('setup.mssql', $entry, \OC_Log::WARN);
+					}
+				}
+
+				$query = "USE [".$this->dbname."]; EXEC sp_addrolemember 'db_owner', '".$this->dbuser."';";
+				$result = sqlsrv_query($connection, $query);
+				if (!$result || $result === false) {
+					if ( ($errors = sqlsrv_errors() ) != null) {
+						$entry='DB Error: "'.print_r(sqlsrv_errors()).'"<br />';
+					} else {
+						$entry = '';
+					}
+					$entry.='Offending command was: '.$query.'<br />';
+					\OC_Log::write('setup.mssql', $entry, \OC_Log::WARN);
+				}
+			}
+		}
+	}
+
+	private function createDatabase($connection) {
+		$query = "CREATE DATABASE [".$this->dbname."];";
+		$result = sqlsrv_query($connection, $query);
+		if (!$result || $result === false) {
+			if ( ($errors = sqlsrv_errors() ) != null) {
+				$entry='DB Error: "'.print_r(sqlsrv_errors()).'"<br />';
+			} else {
+				$entry = '';
+			}
+			$entry.='Offending command was: '.$query.'<br />';
+			\OC_Log::write('setup.mssql', $entry, \OC_Log::WARN);
+		}
+	}
+
+	private function createDatabaseStructure() {
+		$connectionInfo = array( "Database" => $this->dbname, "UID" => $this->dbuser, "PWD" => $this->dbpassword);
+
+		$connection = @sqlsrv_connect($this->dbhost, $connectionInfo);
+
+		//fill the database if needed
+		$query = "SELECT * FROM INFORMATION_SCHEMA.TABLES"
+			." WHERE TABLE_SCHEMA = '".$this->dbname."'"
+			." AND TABLE_NAME = '".$this->tableprefix."users'";
+		$result = sqlsrv_query($connection, $query);
+		if ($result === false) {
+			if ( ($errors = sqlsrv_errors() ) != null) {
+				$entry='DB Error: "'.print_r(sqlsrv_errors()).'"<br />';
+			} else {
+				$entry = '';
+			}
+			$entry.='Offending command was: '.$query.'<br />';
+			\OC_Log::write('setup.mssql', $entry, \OC_Log::WARN);
+		} else {
+			$row = sqlsrv_fetch_array($result);
+
+			if ($row === false) {
+				if ( ($errors = sqlsrv_errors() ) != null) {
+					$entry='DB Error: "'.print_r(sqlsrv_errors()).'"<br />';
+				} else {
+					$entry = '';
+				}
+				$entry.='Offending command was: '.$query.'<br />';
+				\OC_Log::write('setup.mssql', $entry, \OC_Log::WARN);
+			} else {
+				if ($row == null) {
+					\OC_DB::createDbFromStructure($this->dbDefinitionFile);
+				}
+			}
+		}
+
+		sqlsrv_close($connection);
+	}
+}
diff --git a/lib/setup/mysql.php b/lib/setup/mysql.php
new file mode 100644
index 0000000000000000000000000000000000000000..0cf04fde5a1ca17c68c6d04ec61e66a3f8c32b11
--- /dev/null
+++ b/lib/setup/mysql.php
@@ -0,0 +1,95 @@
+<?php
+
+namespace OC\Setup;
+
+class MySQL extends AbstractDatabase {
+	public $dbprettyname = 'MySQL';
+
+	public function setupDatabase($username) {
+		//check if the database user has admin right
+		$connection = @mysql_connect($this->dbhost, $this->dbuser, $this->dbpassword);
+		if(!$connection) {
+			throw new \DatabaseSetupException($this->trans->t('MySQL username and/or password not valid'),
+				$this->trans->t('You need to enter either an existing account or the administrator.'));
+		}
+		$oldUser=\OC_Config::getValue('dbuser', false);
+
+		//this should be enough to check for admin rights in mysql
+		$query="SELECT user FROM mysql.user WHERE user='$this->dbuser'";
+		if(mysql_query($query, $connection)) {
+			//use the admin login data for the new database user
+
+			//add prefix to the mysql user name to prevent collisions
+			$this->dbuser=substr('oc_'.$username, 0, 16);
+			if($this->dbuser!=$oldUser) {
+				//hash the password so we don't need to store the admin config in the config file
+				$this->dbpassword=\OC_Util::generate_random_bytes(30);
+
+				$this->createDBUser($connection);
+
+				\OC_Config::setValue('dbuser', $this->dbuser);
+				\OC_Config::setValue('dbpassword', $this->dbpassword);
+			}
+
+			//create the database
+			$this->createDatabase($connection);
+		}
+		else {
+			if($this->dbuser!=$oldUser) {
+				\OC_Config::setValue('dbuser', $this->dbuser);
+				\OC_Config::setValue('dbpassword', $this->dbpassword);
+			}
+
+			//create the database
+			$this->createDatabase($connection);
+		}
+
+		//fill the database if needed
+		$query='select count(*) from information_schema.tables'
+			." where table_schema='".$this->dbname."' AND table_name = '".$this->tableprefix."users';";
+		$result = mysql_query($query, $connection);
+		if($result) {
+			$row=mysql_fetch_row($result);
+		}
+		if(!$result or $row[0]==0) {
+			\OC_DB::createDbFromStructure($this->dbDefinitionFile);
+		}
+		mysql_close($connection);
+	}
+
+	private function createDatabase($connection) {
+		$name = $this->dbname;
+		$user = $this->dbuser;
+		//we cant use OC_BD functions here because we need to connect as the administrative user.
+		$query = "CREATE DATABASE IF NOT EXISTS `$name`";
+		$result = mysql_query($query, $connection);
+		if(!$result) {
+			$entry = $this->trans->t('DB Error: "%s"', array(mysql_error($connection))) . '<br />';
+			$entry .= $this->trans->t('Offending command was: "%s"', array($query)) . '<br />';
+			\OC_Log::write('setup.mssql', $entry, \OC_Log::WARN);
+		}
+		$query="GRANT ALL PRIVILEGES ON `$name` . * TO '$user'";
+
+		//this query will fail if there aren't the right permissions, ignore the error
+		mysql_query($query, $connection);
+	}
+
+	private function createDBUser($connection) {
+		$name = $this->dbuser;
+		$password = $this->dbpassword;
+		// we need to create 2 accounts, one for global use and one for local user. if we don't specify the local one,
+		// 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($this->trans->t("MySQL user '%s'@'localhost' exists already.", array($name)),
+				$this->trans->t("Drop this user from MySQL", array($name)));
+		}
+		$query = "CREATE USER '$name'@'%' IDENTIFIED BY '$password'";
+		$result = mysql_query($query, $connection);
+		if (!$result) {
+			throw new \DatabaseSetupException($this->trans->t("MySQL user '%s'@'%%' already exists", array($name)),
+				$this->trans->t("Drop this user from MySQL."));
+		}
+	}
+}
diff --git a/lib/setup/oci.php b/lib/setup/oci.php
new file mode 100644
index 0000000000000000000000000000000000000000..86b53de45a49513d9021be521b145874f89db953
--- /dev/null
+++ b/lib/setup/oci.php
@@ -0,0 +1,210 @@
+<?php
+
+namespace OC\Setup;
+
+class OCI extends AbstractDatabase {
+	public $dbprettyname = 'Oracle';
+
+	protected $dbtablespace;
+
+	public function initialize($config) {
+		parent::initialize($config);
+		if (array_key_exists('dbtablespace', $config)) {
+			$this->dbtablespace = $config['dbtablespace'];
+		} else {
+			$this->dbtablespace = 'USERS';
+		}
+		\OC_Config::setValue('dbtablespace', $this->dbtablespace);
+	}
+
+	public function setupDatabase($username) {
+		$e_host = addslashes($this->dbhost);
+		$e_dbname = addslashes($this->dbname);
+		//check if the database user has admin right
+		if ($e_host == '') {
+			$easy_connect_string = $e_dbname; // use dbname as easy connect name
+		} else {
+			$easy_connect_string = '//'.$e_host.'/'.$e_dbname;
+		}
+		\OC_Log::write('setup oracle', 'connect string: ' . $easy_connect_string, \OC_Log::DEBUG);
+		$connection = @oci_connect($this->dbuser, $this->dbpassword, $easy_connect_string);
+		if(!$connection) {
+			$e = oci_error();
+			if (is_array ($e) && isset ($e['message'])) {
+				throw new \DatabaseSetupException($this->trans->t('Oracle connection could not be established'),
+				$e['message'].' Check environment: ORACLE_HOME='.getenv('ORACLE_HOME')
+							.' ORACLE_SID='.getenv('ORACLE_SID')
+							.' LD_LIBRARY_PATH='.getenv('LD_LIBRARY_PATH')
+							.' NLS_LANG='.getenv('NLS_LANG')
+							.' tnsnames.ora is '.(is_readable(getenv('ORACLE_HOME').'/network/admin/tnsnames.ora')?'':'not ').'readable');
+			}
+			throw new \DatabaseSetupException($this->trans->t('Oracle username and/or password not valid'),
+					'Check environment: ORACLE_HOME='.getenv('ORACLE_HOME')
+							.' ORACLE_SID='.getenv('ORACLE_SID')
+							.' LD_LIBRARY_PATH='.getenv('LD_LIBRARY_PATH')
+							.' NLS_LANG='.getenv('NLS_LANG')
+							.' tnsnames.ora is '.(is_readable(getenv('ORACLE_HOME').'/network/admin/tnsnames.ora')?'':'not ').'readable');
+		}
+		//check for roles creation rights in oracle
+
+		$query='SELECT count(*) FROM user_role_privs, role_sys_privs'
+			." WHERE user_role_privs.granted_role = role_sys_privs.role AND privilege = 'CREATE ROLE'";
+		$stmt = oci_parse($connection, $query);
+		if (!$stmt) {
+			$entry = $this->trans->t('DB Error: "%s"', array(oci_last_error($connection))) . '<br />';
+			$entry .= $this->trans->t('Offending command was: "%s"', array($query)) . '<br />';
+			\OC_Log::write('setup.oci', $entry, \OC_Log::WARN);
+		}
+		$result = oci_execute($stmt);
+		if($result) {
+			$row = oci_fetch_row($stmt);
+		}
+		if($result and $row[0] > 0) {
+			//use the admin login data for the new database user
+
+			//add prefix to the oracle user name to prevent collisions
+			$this->dbuser='oc_'.$username;
+			//create a new password so we don't need to store the admin config in the config file
+			$this->dbpassword=\OC_Util::generate_random_bytes(30);
+
+			//oracle passwords are treated as identifiers:
+			//  must start with aphanumeric char
+			//  needs to be shortened to 30 bytes, as the two " needed to escape the identifier count towards the identifier length.
+			$this->dbpassword=substr($this->dbpassword, 0, 30);
+
+			$this->createDBUser($connection);
+
+			\OC_Config::setValue('dbuser', $this->dbusername);
+			\OC_Config::setValue('dbname', $this->dbusername);
+			\OC_Config::setValue('dbpassword', $this->dbpassword);
+
+			//create the database not neccessary, oracle implies user = schema
+			//$this->createDatabase($this->dbname, $this->dbusername, $connection);
+		} else {
+
+			\OC_Config::setValue('dbuser', $this->dbuser);
+			\OC_Config::setValue('dbname', $this->dbname);
+			\OC_Config::setValue('dbpassword', $this->dbpassword);
+
+			//create the database not neccessary, oracle implies user = schema
+			//$this->createDatabase($this->dbname, $this->dbuser, $connection);
+		}
+
+		//FIXME check tablespace exists: select * from user_tablespaces
+
+		// the connection to dbname=oracle is not needed anymore
+		oci_close($connection);
+
+		// connect to the oracle database (schema=$this->dbuser) an check if the schema needs to be filled
+		$this->dbuser = \OC_Config::getValue('dbuser');
+		//$this->dbname = \OC_Config::getValue('dbname');
+		$this->dbpassword = \OC_Config::getValue('dbpassword');
+
+		$e_host = addslashes($this->dbhost);
+		$e_dbname = addslashes($this->dbname);
+
+		if ($e_host == '') {
+			$easy_connect_string = $e_dbname; // use dbname as easy connect name
+		} else {
+			$easy_connect_string = '//'.$e_host.'/'.$e_dbname;
+		}
+		$connection = @oci_connect($this->dbuser, $this->dbpassword, $easy_connect_string);
+		if(!$connection) {
+			throw new \DatabaseSetupException($this->trans->t('Oracle username and/or password not valid'),
+					$this->trans->t('You need to enter either an existing account or the administrator.'));
+		}
+		$query = "SELECT count(*) FROM user_tables WHERE table_name = :un";
+		$stmt = oci_parse($connection, $query);
+		$un = $this->dbtableprefix.'users';
+		oci_bind_by_name($stmt, ':un', $un);
+		if (!$stmt) {
+			$entry = $this->trans->t('DB Error: "%s"', array(oci_error($connection))) . '<br />';
+			$entry .= $this->trans->t('Offending command was: "%s"', array($query)) . '<br />';
+			\OC_Log::write('setup.oci', $entry, \OC_Log::WARN);
+		}
+		$result = oci_execute($stmt);
+
+		if($result) {
+			$row = oci_fetch_row($stmt);
+		}
+		if(!$result or $row[0]==0) {
+			\OC_DB::createDbFromStructure($this->dbDefinitionFile);
+		}
+	}
+
+	/**
+	 *
+	 * @param String $name
+	 * @param String $password
+	 * @param resource $connection
+	 */
+	private function createDBUser($connection) {
+		$name = $this->dbuser;
+		$password = $this->password;
+		$query = "SELECT * FROM all_users WHERE USERNAME = :un";
+		$stmt = oci_parse($connection, $query);
+		if (!$stmt) {
+			$entry = $this->trans->t('DB Error: "%s"', array(oci_error($connection))) . '<br />';
+			$entry .= $this->trans->t('Offending command was: "%s"', array($query)) . '<br />';
+			\OC_Log::write('setup.oci', $entry, \OC_Log::WARN);
+		}
+		oci_bind_by_name($stmt, ':un', $name);
+		$result = oci_execute($stmt);
+		if(!$result) {
+			$entry = $this->trans->t('DB Error: "%s"', array(oci_error($connection))) . '<br />';
+			$entry .= $this->trans->t('Offending command was: "%s"', array($query)) . '<br />';
+			\OC_Log::write('setup.oci', $entry, \OC_Log::WARN);
+		}
+
+		if(! oci_fetch_row($stmt)) {
+			//user does not exists let's create it :)
+			//password must start with alphabetic character in oracle
+			$query = 'CREATE USER '.$name.' IDENTIFIED BY "'.$password.'" DEFAULT TABLESPACE '.$this->dbtablespace;
+			$stmt = oci_parse($connection, $query);
+			if (!$stmt) {
+				$entry = $this->trans->t('DB Error: "%s"', array(oci_error($connection))) . '<br />';
+				$entry .= $this->trans->t('Offending command was: "%s"', array($query)) . '<br />';
+				\OC_Log::write('setup.oci', $entry, \OC_Log::WARN);
+			}
+			//oci_bind_by_name($stmt, ':un', $name);
+			$result = oci_execute($stmt);
+			if(!$result) {
+				$entry = $this->trans->t('DB Error: "%s"', array(oci_error($connection))) . '<br />';
+				$entry .= $this->trans->t('Offending command was: "%s", name: %s, password: %s',
+					array($query, $name, $password)) . '<br />';
+				\OC_Log::write('setup.oci', $entry, \OC_Log::WARN);
+			}
+		} else { // change password of the existing role
+			$query = "ALTER USER :un IDENTIFIED BY :pw";
+			$stmt = oci_parse($connection, $query);
+			if (!$stmt) {
+				$entry = $this->trans->t('DB Error: "%s"', array(oci_error($connection))) . '<br />';
+				$entry .= $this->trans->t('Offending command was: "%s"', array($query)) . '<br />';
+				\OC_Log::write('setup.oci', $entry, \OC_Log::WARN);
+			}
+			oci_bind_by_name($stmt, ':un', $name);
+			oci_bind_by_name($stmt, ':pw', $password);
+			$result = oci_execute($stmt);
+			if(!$result) {
+				$entry = $this->trans->t('DB Error: "%s"', array(oci_error($connection))) . '<br />';
+				$entry .= $this->trans->t('Offending command was: "%s"', array($query)) . '<br />';
+				\OC_Log::write('setup.oci', $entry, \OC_Log::WARN);
+			}
+		}
+		// grant necessary roles
+		$query = 'GRANT CREATE SESSION, CREATE TABLE, CREATE SEQUENCE, CREATE TRIGGER, UNLIMITED TABLESPACE TO '.$name;
+		$stmt = oci_parse($connection, $query);
+		if (!$stmt) {
+			$entry = $this->trans->t('DB Error: "%s"', array(oci_error($connection))) . '<br />';
+			$entry .= $this->trans->t('Offending command was: "%s"', array($query)) . '<br />';
+			\OC_Log::write('setup.oci', $entry, \OC_Log::WARN);
+		}
+		$result = oci_execute($stmt);
+		if(!$result) {
+			$entry = $this->trans->t('DB Error: "%s"', array(oci_error($connection))) . '<br />';
+			$entry .= $this->trans->t('Offending command was: "%s", name: %s, password: %s',
+				array($query, $name, $password)) . '<br />';
+			\OC_Log::write('setup.oci', $entry, \OC_Log::WARN);
+		}
+	}
+}
diff --git a/lib/setup/postgresql.php b/lib/setup/postgresql.php
new file mode 100644
index 0000000000000000000000000000000000000000..49fcbf0326e5e23b655a5683b357acf86e5c7a50
--- /dev/null
+++ b/lib/setup/postgresql.php
@@ -0,0 +1,140 @@
+<?php
+
+namespace OC\Setup;
+
+class PostgreSQL extends AbstractDatabase {
+	public $dbprettyname = 'PostgreSQL';
+
+	public function setupDatabase($username) {
+		$e_host = addslashes($this->dbhost);
+		$e_user = addslashes($this->dbuser);
+		$e_password = addslashes($this->dbpassword);
+
+		//check if the database user has admin rights
+		$connection_string = "host='$e_host' dbname=postgres user='$e_user' password='$e_password'";
+		$connection = @pg_connect($connection_string);
+		if(!$connection) {
+			// Try if we can connect to the DB with the specified name
+			$e_dbname = addslashes($this->dbname);
+			$connection_string = "host='$e_host' dbname='$e_dbname' user='$e_user' password='$e_password'";
+			$connection = @pg_connect($connection_string);
+
+			if(!$connection)
+				throw new \DatabaseSetupException($this->trans->t('PostgreSQL username and/or password not valid'),
+						$this->trans->t('You need to enter either an existing account or the administrator.'));
+		}
+		$e_user = pg_escape_string($this->dbuser);
+		//check for roles creation rights in postgresql
+		$query="SELECT 1 FROM pg_roles WHERE rolcreaterole=TRUE AND rolname='$e_user'";
+		$result = pg_query($connection, $query);
+		if($result and pg_num_rows($result) > 0) {
+			//use the admin login data for the new database user
+
+			//add prefix to the postgresql user name to prevent collisions
+			$this->dbuser='oc_'.$username;
+			//create a new password so we don't need to store the admin config in the config file
+			$this->dbpassword=\OC_Util::generate_random_bytes(30);
+
+			$this->createDBUser($connection);
+
+			\OC_Config::setValue('dbuser', $this->dbuser);
+			\OC_Config::setValue('dbpassword', $this->dbpassword);
+
+			//create the database
+			$this->createDatabase($connection);
+		}
+		else {
+			\OC_Config::setValue('dbuser', $this->dbuser);
+			\OC_Config::setValue('dbpassword', $this->dbpassword);
+
+			//create the database
+			$this->createDatabase($connection);
+		}
+
+		// the connection to dbname=postgres is not needed anymore
+		pg_close($connection);
+
+		// connect to the ownCloud database (dbname=$this->dbname) and check if it needs to be filled
+		$this->dbuser = \OC_Config::getValue('dbuser');
+		$this->dbpassword = \OC_Config::getValue('dbpassword');
+
+		$e_host = addslashes($this->dbhost);
+		$e_dbname = addslashes($this->dbname);
+		$e_user = addslashes($this->dbuser);
+		$e_password = addslashes($this->dbpassword);
+
+		$connection_string = "host='$e_host' dbname='$e_dbname' user='$e_user' password='$e_password'";
+		$connection = @pg_connect($connection_string);
+		if(!$connection) {
+			throw new \DatabaseSetupException($this->trans->t('PostgreSQL username and/or password not valid'),
+					$this->trans->t('You need to enter either an existing account or the administrator.'));
+		}
+		$query = "select count(*) FROM pg_class WHERE relname='".$this->tableprefix."users' limit 1";
+		$result = pg_query($connection, $query);
+		if($result) {
+			$row = pg_fetch_row($result);
+		}
+		if(!$result or $row[0]==0) {
+			\OC_DB::createDbFromStructure($this->dbDefinitionFile);
+		}
+	}
+
+	private function createDatabase($connection) {
+		//we cant use OC_BD functions here because we need to connect as the administrative user.
+		$e_name = pg_escape_string($this->dbname);
+		$e_user = pg_escape_string($this->dbuser);
+		$query = "select datname from pg_database where datname = '$e_name'";
+		$result = pg_query($connection, $query);
+		if(!$result) {
+			$entry = $this->trans->t('DB Error: "%s"', array(pg_last_error($connection))) . '<br />';
+			$entry .= $this->trans->t('Offending command was: "%s"', array($query)) . '<br />';
+			\OC_Log::write('setup.pg', $entry, \OC_Log::WARN);
+		}
+		if(! pg_fetch_row($result)) {
+			//The database does not exists... let's create it
+			$query = "CREATE DATABASE \"$e_name\" OWNER \"$e_user\"";
+			$result = pg_query($connection, $query);
+			if(!$result) {
+				$entry = $this->trans->t('DB Error: "%s"', array(pg_last_error($connection))) . '<br />';
+				$entry .= $this->trans->t('Offending command was: "%s"', array($query)) . '<br />';
+				\OC_Log::write('setup.pg', $entry, \OC_Log::WARN);
+			}
+			else {
+				$query = "REVOKE ALL PRIVILEGES ON DATABASE \"$e_name\" FROM PUBLIC";
+				pg_query($connection, $query);
+			}
+		}
+	}
+
+	private function createDBUser($connection) {
+		$e_name = pg_escape_string($this->dbuser);
+		$e_password = pg_escape_string($this->dbpassword);
+		$query = "select * from pg_roles where rolname='$e_name';";
+		$result = pg_query($connection, $query);
+		if(!$result) {
+			$entry = $this->trans->t('DB Error: "%s"', array(pg_last_error($connection))) . '<br />';
+			$entry .= $this->trans->t('Offending command was: "%s"', array($query)) . '<br />';
+			\OC_Log::write('setup.pg', $entry, \OC_Log::WARN);
+		}
+
+		if(! pg_fetch_row($result)) {
+			//user does not exists let's create it :)
+			$query = "CREATE USER \"$e_name\" CREATEDB PASSWORD '$e_password';";
+			$result = pg_query($connection, $query);
+			if(!$result) {
+				$entry = $this->trans->t('DB Error: "%s"', array(pg_last_error($connection))) . '<br />';
+				$entry .= $this->trans->t('Offending command was: "%s"', array($query)) . '<br />';
+				\OC_Log::write('setup.pg', $entry, \OC_Log::WARN);
+			}
+		}
+		else { // change password of the existing role
+			$query = "ALTER ROLE \"$e_name\" WITH PASSWORD '$e_password';";
+			$result = pg_query($connection, $query);
+			if(!$result) {
+				$entry = $this->trans->t('DB Error: "%s"', array(pg_last_error($connection))) . '<br />';
+				$entry .= $this->trans->t('Offending command was: "%s"', array($query)) . '<br />';
+				\OC_Log::write('setup.pg', $entry, \OC_Log::WARN);
+			}
+		}
+	}
+}
diff --git a/lib/setup/sqlite.php b/lib/setup/sqlite.php
new file mode 100644
index 0000000000000000000000000000000000000000..fd4df792d622c0cdcb05775dab94d307313817f9
--- /dev/null
+++ b/lib/setup/sqlite.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace OC\Setup;
+
+class Sqlite extends AbstractDatabase {
+	public $dbprettyname = 'Sqlite';
+
+	public function validate($config) {
+		return array();
+	}
+
+	public function initialize($config) {
+	}
+
+	public function setupDatabase($username) {
+		$datadir = \OC_Config::getValue('datadirectory');
+
+		//delete the old sqlite database first, might cause infinte loops otherwise
+		if(file_exists("$datadir/owncloud.db")) {
+			unlink("$datadir/owncloud.db");
+		}
+		//in case of sqlite, we can always fill the database
+		error_log("creating sqlite db");
+		\OC_DB::createDbFromStructure($this->dbDefinitionFile);
+	}
+}
diff --git a/lib/updater.php b/lib/updater.php
index 9081bfc4be80be4310acc7103b049a7045df90f8..df7332a96a97c24e79f72246d5477f0bae8ce89c 100644
--- a/lib/updater.php
+++ b/lib/updater.php
@@ -1,56 +1,67 @@
 <?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/>.
- *
+ * Copyright (c) 2013 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
  */
 
+namespace OC;
+use OC\Hooks\BasicEmitter;
+
 /**
- * Class that handels autoupdating of ownCloud
+ * Class that handles autoupdating of ownCloud
+ *
+ * Hooks provided in scope \OC\Updater
+ *  - maintenanceStart()
+ *  - maintenanceEnd()
+ *  - dbUpgrade()
+ *  - filecacheStart()
+ *  - filecacheProgress(int $percentage)
+ *  - filecacheDone()
+ *  - failure(string $message)
  */
-class OC_Updater{
+class Updater extends BasicEmitter {
+
+	/**
+	 * @var \OC\Log $log
+	 */
+	private $log;
+
+	/**
+	 * @param \OC\Log $log
+	 */
+	public function __construct($log = null) {
+		$this->log = $log;
+	}
 
 	/**
 	 * Check if a new version is available
+	 * @param string $updateUrl the url to check, i.e. 'http://apps.owncloud.com/updater.php'
+	 * @return array | bool
 	 */
-	public static function check() {
+	public function check($updaterUrl) {
 
 		// Look up the cache - it is invalidated all 30 minutes
-		if((OC_Appconfig::getValue('core', 'lastupdatedat') + 1800) > time()) {
-			return json_decode(OC_Appconfig::getValue('core', 'lastupdateResult'), true);
+		if ((\OC_Appconfig::getValue('core', 'lastupdatedat') + 1800) > time()) {
+			return json_decode(\OC_Appconfig::getValue('core', 'lastupdateResult'), true);
 		}
 
-		OC_Appconfig::setValue('core', 'lastupdatedat', time());
+		\OC_Appconfig::setValue('core', 'lastupdatedat', time());
 
-		if(OC_Appconfig::getValue('core', 'installedat', '')=='') {
-			OC_Appconfig::setValue('core', 'installedat', microtime(true));
+		if (\OC_Appconfig::getValue('core', 'installedat', '') == '') {
+			\OC_Appconfig::setValue('core', 'installedat', microtime(true));
 		}
 
-		$updaterurl='http://apps.owncloud.com/updater.php';
-		$version=OC_Util::getVersion();
-		$version['installed']=OC_Appconfig::getValue('core', 'installedat');
-		$version['updated']=OC_Appconfig::getValue('core', 'lastupdatedat');
-		$version['updatechannel']='stable';
-		$version['edition']=OC_Util::getEditionString();
-		$versionstring=implode('x', $version);
+		$version = \OC_Util::getVersion();
+		$version['installed'] = \OC_Appconfig::getValue('core', 'installedat');
+		$version['updated'] = \OC_Appconfig::getValue('core', 'lastupdatedat');
+		$version['updatechannel'] = 'stable';
+		$version['edition'] = \OC_Util::getEditionString();
+		$versionString = implode('x', $version);
 
 		//fetch xml data from updater
-		$url=$updaterurl.'?version='.$versionstring;
+		$url = $updaterUrl . '?version=' . $versionString;
 
 		// set a sensible timeout of 10 sec to stay responsive even if the update server is down.
 		$ctx = stream_context_create(
@@ -60,21 +71,89 @@ class OC_Updater{
 				)
 			)
 		);
-		$xml=@file_get_contents($url, 0, $ctx);
-		if($xml==false) {
+		$xml = @file_get_contents($url, 0, $ctx);
+		if ($xml == false) {
 			return array();
 		}
-		$data=@simplexml_load_string($xml);
+		$data = @simplexml_load_string($xml);
 
-		$tmp=array();
+		$tmp = array();
 		$tmp['version'] = $data->version;
 		$tmp['versionstring'] = $data->versionstring;
 		$tmp['url'] = $data->url;
 		$tmp['web'] = $data->web;
 
 		// Cache the result
-		OC_Appconfig::setValue('core', 'lastupdateResult', json_encode($data));
+		\OC_Appconfig::setValue('core', 'lastupdateResult', json_encode($data));
 
 		return $tmp;
 	}
-}
\ No newline at end of file
+
+	/**
+	 * runs the update actions in maintenance mode, does not upgrade the source files
+	 */
+	public function upgrade() {
+		\OC_DB::enableCaching(false);
+		\OC_Config::setValue('maintenance', true);
+		$installedVersion = \OC_Config::getValue('version', '0.0.0');
+		$currentVersion = implode('.', \OC_Util::getVersion());
+		if ($this->log) {
+			$this->log->debug('starting upgrade from ' . $installedVersion . ' to ' . $currentVersion, array('app' => 'core'));
+		}
+		$this->emit('\OC\Updater', 'maintenanceStart');
+		try {
+			\OC_DB::updateDbFromStructure(\OC::$SERVERROOT . '/db_structure.xml');
+			$this->emit('\OC\Updater', 'dbUpgrade');
+
+			// do a file cache upgrade for users with files
+			// this can take loooooooooooooooooooooooong
+			$this->upgradeFileCache();
+		} catch (\Exception $exception) {
+			$this->emit('\OC\Updater', 'failure', array($exception->getMessage()));
+		}
+		\OC_Config::setValue('version', implode('.', \OC_Util::getVersion()));
+		\OC_App::checkAppsRequirements();
+		// load all apps to also upgrade enabled apps
+		\OC_App::loadApps();
+		\OC_Config::setValue('maintenance', false);
+		$this->emit('\OC\Updater', 'maintenanceEnd');
+	}
+
+	private function upgradeFileCache() {
+		try {
+			$query = \OC_DB::prepare('
+				SELECT DISTINCT `user`
+				FROM `*PREFIX*fscache`
+			');
+			$result = $query->execute();
+		} catch (\Exception $e) {
+			return;
+		}
+		$users = $result->fetchAll();
+		if (count($users) == 0) {
+			return;
+		}
+		$step = 100 / count($users);
+		$percentCompleted = 0;
+		$lastPercentCompletedOutput = 0;
+		$startInfoShown = false;
+		foreach ($users as $userRow) {
+			$user = $userRow['user'];
+			\OC\Files\Filesystem::initMountPoints($user);
+			\OC\Files\Cache\Upgrade::doSilentUpgrade($user);
+			if (!$startInfoShown) {
+				//We show it only now, because otherwise Info about upgraded apps
+				//will appear between this and progress info
+				$this->emit('\OC\Updater', 'filecacheStart');
+				$startInfoShown = true;
+			}
+			$percentCompleted += $step;
+			$out = floor($percentCompleted);
+			if ($out != $lastPercentCompletedOutput) {
+				$this->emit('\OC\Updater', 'filecacheProgress', array($out));
+				$lastPercentCompletedOutput = $out;
+			}
+		}
+		$this->emit('\OC\Updater', 'filecacheDone');
+	}
+}
diff --git a/lib/user.php b/lib/user.php
index 06ea8e791dd795fa8247b4798336e872e4a8832b..830f13bb8df6900304eb60d042d410ac844b54ef 100644
--- a/lib/user.php
+++ b/lib/user.php
@@ -190,7 +190,7 @@ class OC_User {
 					// use Reflection to create a new instance, using the $args
 					$backend = $reflectionObj->newInstanceArgs($arguments);
 					self::useBackend($backend);
-					$_setupedBackends[] = $i;
+					self::$_setupedBackends[] = $i;
 				} else {
 					OC_Log::write('core', 'User backend ' . $class . ' already initialized.', OC_Log::DEBUG);
 				}
diff --git a/lib/user/database.php b/lib/user/database.php
index d70b620f2abf055d9fd102fd36930bdce474f16f..9f00a022d9fa59ced26ff23d213b935a97545423 100644
--- a/lib/user/database.php
+++ b/lib/user/database.php
@@ -85,7 +85,7 @@ class OC_User_Database extends OC_User_Backend {
 	 */
 	public function deleteUser( $uid ) {
 		// Delete user-group-relation
-		$query = OC_DB::prepare( 'DELETE FROM `*PREFIX*users` WHERE uid = ?' );
+		$query = OC_DB::prepare( 'DELETE FROM `*PREFIX*users` WHERE `uid` = ?' );
 		$query->execute( array( $uid ));
 		return true;
 	}
diff --git a/lib/util.php b/lib/util.php
index ddef0c63c55da806099ff4912f940614aa52263a..981b05b2b46130a60318203705059da1c9e5fc88 100755
--- a/lib/util.php
+++ b/lib/util.php
@@ -172,6 +172,8 @@ class OC_Util {
 	public static function checkServer() {
 		$errors=array();
 
+		$defaults = new \OC_Defaults();
+
 		$web_server_restart= false;
 		//check for database drivers
 		if(!(is_callable('sqlite_open') or class_exists('SQLite3'))
@@ -184,14 +186,16 @@ class OC_Util {
 		}
 
 		//common hint for all file permissons error messages
-		$permissionsHint='Permissions can usually be fixed by giving the webserver write access'
-			.' to the ownCloud directory';
+		$permissionsHint = 'Permissions can usually be fixed by '
+			.'<a href="' . $defaults->getDocBaseUrl() . '/server/5.0/admin_manual/installation/installation_source.html#set-the-directory-permissions" target="_blank">giving the webserver write access to the root directory</a>.';
 
 		// Check if config folder is writable.
 		if(!is_writable(OC::$SERVERROOT."/config/") or !is_readable(OC::$SERVERROOT."/config/")) {
-			$errors[]=array('error'=>"Can't write into config directory 'config'",
-				'hint'=>'You can usually fix this by giving the webserver user write access'
-					.' to the config directory in owncloud');
+			$errors[] = array(
+				'error' => "Can't write into config directory",
+				'hint' => 'This can usually be fixed by '
+					.'<a href="' . $defaults->getDocBaseUrl() . '/server/5.0/admin_manual/installation/installation_source.html#set-the-directory-permissions" target="_blank">giving the webserver write access to the config directory</a>.'
+				);
 		}
 
 		// Check if there is a writable install folder.
@@ -199,9 +203,12 @@ class OC_Util {
 			if( OC_App::getInstallPath() === null
 				|| !is_writable(OC_App::getInstallPath())
 				|| !is_readable(OC_App::getInstallPath()) ) {
-				$errors[]=array('error'=>"Can't write into apps directory",
-					'hint'=>'You can usually fix this by giving the webserver user write access'
-					.' to the apps directory in owncloud or disabling the appstore in the config file.');
+				$errors[] = array(
+					'error' => "Can't write into apps directory",
+					'hint' => 'This can usually be fixed by '
+						.'<a href="' . $defaults->getDocBaseUrl() . '/server/5.0/admin_manual/installation/installation_source.html#set-the-directory-permissions" target="_blank">giving the webserver write access to the apps directory</a> '
+						.'or disabling the appstore in the config file.'
+					);
 			}
 		}
 		$CONFIG_DATADIRECTORY = OC_Config::getValue( "datadirectory", OC::$SERVERROOT."/data" );
@@ -211,10 +218,11 @@ class OC_Util {
 			if ($success) {
 				$errors = array_merge($errors, self::checkDataDirectoryPermissions($CONFIG_DATADIRECTORY));
 			} else {
-				$errors[]=array('error'=>"Can't create data directory (".$CONFIG_DATADIRECTORY.")",
-					'hint'=>"You can usually fix this by giving the webserver write access to the ownCloud directory '"
-						.OC::$SERVERROOT."' (in a terminal, use the command "
-						."'chown -R www-data:www-data /path/to/your/owncloud/install/data' ");
+				$errors[] = array(
+					'error' => "Can't create data directory (".$CONFIG_DATADIRECTORY.")",
+					'hint' => 'This can usually be fixed by '
+					.'<a href="' . $defaults->getDocBaseUrl() . '/server/5.0/admin_manual/installation/installation_source.html#set-the-directory-permissions" target="_blank">giving the webserver write access to the root directory</a>.'
+				);
 			}
 		} else if(!is_writable($CONFIG_DATADIRECTORY) or !is_readable($CONFIG_DATADIRECTORY)) {
 			$errors[]=array('error'=>'Data directory ('.$CONFIG_DATADIRECTORY.') not writable by ownCloud',
@@ -531,7 +539,22 @@ class OC_Util {
 		}
 		return $value;
 	}
-
+	
+	/**
+	 * @brief Public function to encode url parameters
+	 *
+	 * This function is used to encode path to file before output.
+	 * Encoding is done according to RFC 3986 with one exception:
+	 * Character '/' is preserved as is. 
+	 *
+	 * @param string $component part of URI to encode
+	 * @return string 
+	 */
+	public static function encodePath($component) {
+		$encoded = rawurlencode($component);
+		$encoded = str_replace('%2F', '/', $encoded);
+		return $encoded;
+	}
 
 	/**
 	 * Check if the htaccess file is working by creating a test file in the data directory and trying to access via http
@@ -819,9 +842,9 @@ class OC_Util {
 	 * @return string the theme
 	 */
 	public static function getTheme() {
-		$theme = OC_Config::getValue("theme");
+		$theme = OC_Config::getValue("theme", '');
 
-		if(is_null($theme)) {
+		if($theme === '') {
 			
 			if(is_dir(OC::$SERVERROOT . '/themes/default')) {
 				$theme = 'default';
diff --git a/lib/vcategories.php b/lib/vcategories.php
index 91c72d5dfaecda0cf31c007f8a411b45b8bf3ae7..8403695835973d7b73e1c381d66c604c8fe0e6c2 100644
--- a/lib/vcategories.php
+++ b/lib/vcategories.php
@@ -125,7 +125,7 @@ class OC_VCategories {
 				OC_Log::write('core', __METHOD__. 'DB error: ' . OC_DB::getErrorMessage($result), OC_Log::ERROR);
 				return false;
 			}
-			return ($result->numRows() == 0);
+			return ($result->numRows() === 0);
 		} catch(Exception $e) {
 			OCP\Util::writeLog('core', __METHOD__.', exception: '.$e->getMessage(),
 				OCP\Util::ERROR);
@@ -554,7 +554,7 @@ class OC_VCategories {
 		}
 		try {
 			$stmt = OCP\DB::prepare('DELETE FROM `' . self::CATEGORY_TABLE . '` '
-				. 'WHERE `uid` = ? AND');
+				. 'WHERE `uid` = ?');
 			$result = $stmt->execute(array($arguments['uid']));
 			if (OC_DB::isError($result)) {
 				OC_Log::write('core', __METHOD__. 'DB error: ' . OC_DB::getErrorMessage($result), OC_Log::ERROR);
diff --git a/ocs/v1.php b/ocs/v1.php
index af83a56ff147715f7ebd1378ade420ccee4b60f2..1c7d1c8976824efe44dea0abe24a9f041b7df201 100644
--- a/ocs/v1.php
+++ b/ocs/v1.php
@@ -26,7 +26,7 @@ use Symfony\Component\Routing\Exception\ResourceNotFoundException;
 use Symfony\Component\Routing\Exception\MethodNotAllowedException;
 
 try {
-	OC::getRouter()->match('/ocs'.$_SERVER['PATH_INFO']);
+	OC::getRouter()->match('/ocs'.OC_Request::getRawPathInfo());
 } catch (ResourceNotFoundException $e) {
 	OC_OCS::notFound();
 } catch (MethodNotAllowedException $e) {
diff --git a/search/css/results.css b/search/css/results.css
index c6329a2c02a5e64f6dd2f4f67d96eb7825daeee3..2f092f3789cc9dc1e38001a9e113286c88d7be60 100644
--- a/search/css/results.css
+++ b/search/css/results.css
@@ -17,6 +17,10 @@
  	width:26.5em;
  	z-index:75;
  }
+ 
+ .ie8 #searchresults {
+	 border: 1px solid #666 !important;
+ }
 
  #searchresults li.resultHeader {
  	background-color:#eee;
diff --git a/settings/js/apps.js b/settings/js/apps.js
index 9c1604cfcd9ff42236569741cde127795d2c2596..1ee3372f893c0b9b080d290e131b8e775acc91f5 100644
--- a/settings/js/apps.js
+++ b/settings/js/apps.js
@@ -20,6 +20,11 @@ OC.Settings.Apps = OC.Settings.Apps || {
 		page.find('span.score').html(app.score);
 		page.find('p.description').text(app.description);
 		page.find('img.preview').attr('src', app.preview);
+		if (app.preview && app.preview.length) {
+			page.find('img.preview').show();
+		} else {
+			page.find('img.preview').hide();
+		}
 		page.find('small.externalapp').attr('style', 'visibility:visible');
 		page.find('span.author').text(app.author);
 		page.find('span.licence').text(app.licence);
@@ -142,12 +147,16 @@ OC.Settings.Apps = OC.Settings.Apps || {
 						li.attr('data-id', entry.id);
 						var img= $('<img class="icon"/>').attr({ src: entry.icon});
 						var a=$('<a></a>').attr('href', entry.href);
-						var filename=$('<span></span>')
+						var filename=$('<span></span>');
 						filename.text(entry.name);
 						a.prepend(filename);
 						a.prepend(img);
 						li.append(a);
 						container.append(li);
+						if (!SVGSupport() && entry.icon.match(/\.svg$/i)) {
+							$(img).addClass('svg');
+							replaceSVG();
+						}
 					}
 				}
 			}
diff --git a/settings/js/users.js b/settings/js/users.js
index f3fab34b090cc6cb9a97f060a925be5df1a22daa..9fe593214f21611c1c940da804f528e8ed9320a4 100644
--- a/settings/js/users.js
+++ b/settings/js/users.js
@@ -88,7 +88,7 @@ var UserList = {
 		tr.attr('data-uid', username);
 		tr.attr('data-displayName', displayname);
 		tr.find('td.name').text(username);
-		tr.find('td.displayName').text(displayname);
+		tr.find('td.displayName > span').text(displayname);
 		var groupsSelect = $('<select multiple="multiple" class="groupsselect" data-placehoder="Groups" title="' + t('settings', 'Groups') + '"></select>').attr('data-username', username).attr('data-user-groups', groups);
 		tr.find('td.groups').empty();
 		if (tr.find('td.subadmins').length > 0) {
@@ -449,8 +449,10 @@ $(document).ready(function () {
 					OC.dialogs.alert(result.data.message,
 						t('settings', 'Error creating user'));
 				} else {
-					var addedGroups = result.data.groups.split(', ');
-					UserList.availableGroups = $.unique($.merge(UserList.availableGroups, addedGroups));
+					if (result.data.groups) {
+						var addedGroups = result.data.groups.split(', ');
+						UserList.availableGroups = $.unique($.merge(UserList.availableGroups, addedGroups));
+					}
 					if($('tr[data-uid="' + username + '"]').length === 0) {
 						UserList.add(username, username, result.data.groups, null, 'default', true);
 					}
diff --git a/settings/l10n/af_ZA.php b/settings/l10n/af_ZA.php
index f32b79b80f45125035af7a1e6ed64e11467dd9e2..f89e0062928bd27984752c4f67b0f2fb803554af 100644
--- a/settings/l10n/af_ZA.php
+++ b/settings/l10n/af_ZA.php
@@ -1,4 +1,5 @@
 <?php $TRANSLATIONS = array(
 "Password" => "Wagwoord",
-"New password" => "Nuwe wagwoord"
+"New password" => "Nuwe wagwoord",
+"Username" => "Gebruikersnaam"
 );
diff --git a/settings/l10n/ar.php b/settings/l10n/ar.php
index db79ae2b093bc589f0c2815a15195dd34180debb..0f23111abbb03a60bbff0d9ff07b12f8f403b48b 100644
--- a/settings/l10n/ar.php
+++ b/settings/l10n/ar.php
@@ -97,12 +97,12 @@
 "Language" => "اللغة",
 "Help translate" => "ساعد في الترجمه",
 "WebDAV" => "WebDAV",
-"Use this address to connect to your ownCloud in your file manager" => "إستخدم هذا العنوان للإتصال بـ ownCloud في مدير الملفات",
 "Login Name" => "اسم الدخول",
 "Create" => "انشئ",
 "Default Storage" => "وحدة التخزين الافتراضية",
 "Unlimited" => "غير محدود",
 "Other" => "شيء آخر",
+"Username" => "إسم المستخدم",
 "Storage" => "وحدة التخزين",
 "change display name" => "تغيير اسم الحساب",
 "set new password" => "اعداد كلمة مرور جديدة",
diff --git a/settings/l10n/bg_BG.php b/settings/l10n/bg_BG.php
index d20e64f2e0bcdc6297bebba39b8d5309f8a01106..31e5132edd28c800e27a543b5ab9b406ff75961f 100644
--- a/settings/l10n/bg_BG.php
+++ b/settings/l10n/bg_BG.php
@@ -57,6 +57,7 @@
 "Default Storage" => "Хранилище по подразбиране",
 "Unlimited" => "Неограничено",
 "Other" => "Други",
+"Username" => "Потребител",
 "Storage" => "Хранилище",
 "Default" => "По подразбиране"
 );
diff --git a/settings/l10n/bn_BD.php b/settings/l10n/bn_BD.php
index 8c25913fc1c844a64f8e4428444b4fba04a88e4f..c5116af74633a24787c3884bc427da66fe9609df 100644
--- a/settings/l10n/bn_BD.php
+++ b/settings/l10n/bn_BD.php
@@ -53,11 +53,11 @@
 "Language" => "ভাষা",
 "Help translate" => "অনুবাদ করতে সহায়তা করুন",
 "WebDAV" => "WebDAV",
-"Use this address to connect to your ownCloud in your file manager" => "আপনার ownCloud এ সংযুক্ত হতে এই ঠিকানাটি আপনার ফাইল ব্যবস্থাপকে ব্যবহার করুন",
 "Create" => "তৈরী কর",
 "Default Storage" => "পূর্বনির্ধারিত সংরক্ষণাগার",
 "Unlimited" => "অসীম",
 "Other" => "অন্যান্য",
+"Username" => "ব্যবহারকারী",
 "Storage" => "সংরক্ষণাগার",
 "Default" => "পূর্বনির্ধারিত"
 );
diff --git a/settings/l10n/ca.php b/settings/l10n/ca.php
index 201c15536accd552fbda904983d550319479a49b..55b48a4d606d0e82cd009eaf8b8c12749cfd055f 100644
--- a/settings/l10n/ca.php
+++ b/settings/l10n/ca.php
@@ -98,7 +98,6 @@
 "Language" => "Idioma",
 "Help translate" => "Ajudeu-nos amb la traducció",
 "WebDAV" => "WebDAV",
-"Use this address to connect to your ownCloud in your file manager" => "Useu aquesta adreça per connectar amb ownCloud des del gestor de fitxers",
 "Login Name" => "Nom d'accés",
 "Create" => "Crea",
 "Admin Recovery Password" => "Recuperació de contrasenya d'administrador",
@@ -106,6 +105,7 @@
 "Default Storage" => "Emmagatzemament per defecte",
 "Unlimited" => "Il·limitat",
 "Other" => "Un altre",
+"Username" => "Nom d'usuari",
 "Storage" => "Emmagatzemament",
 "change display name" => "canvia el nom a mostrar",
 "set new password" => "estableix nova contrasenya",
diff --git a/settings/l10n/cs_CZ.php b/settings/l10n/cs_CZ.php
index 3906c2f7187b1895cc58051d1fbee3f7a41eb516..433eb83462f5a61183c5b340ee75d779ffe15ca4 100644
--- a/settings/l10n/cs_CZ.php
+++ b/settings/l10n/cs_CZ.php
@@ -98,7 +98,6 @@
 "Language" => "Jazyk",
 "Help translate" => "Pomoci s překladem",
 "WebDAV" => "WebDAV",
-"Use this address to connect to your ownCloud in your file manager" => "Použijte tuto adresu pro připojení k vašemu ownCloud skrze správce souborů",
 "Login Name" => "Přihlašovací jméno",
 "Create" => "Vytvořit",
 "Admin Recovery Password" => "Heslo obnovy správce",
@@ -106,6 +105,7 @@
 "Default Storage" => "Výchozí úložiště",
 "Unlimited" => "NeomezenÄ›",
 "Other" => "Jiný",
+"Username" => "Uživatelské jméno",
 "Storage" => "Úložiště",
 "change display name" => "změnit zobrazované jméno",
 "set new password" => "nastavit nové heslo",
diff --git a/settings/l10n/cy_GB.php b/settings/l10n/cy_GB.php
index 7ffcbdb45b5e7f0c776cb47a890e5c082ee6412b..98a46f5aca9bc20cd2bd64fa66902d4ba5017b43 100644
--- a/settings/l10n/cy_GB.php
+++ b/settings/l10n/cy_GB.php
@@ -12,5 +12,6 @@
 "Password" => "Cyfrinair",
 "New password" => "Cyfrinair newydd",
 "Email" => "E-bost",
-"Other" => "Arall"
+"Other" => "Arall",
+"Username" => "Enw defnyddiwr"
 );
diff --git a/settings/l10n/da.php b/settings/l10n/da.php
index 8e9d682ab7810ed4c3d8fcd56d03b24cf0e03ee9..0b7b4b6e97a73c657676485fce74c23b7f43b9cd 100644
--- a/settings/l10n/da.php
+++ b/settings/l10n/da.php
@@ -98,7 +98,6 @@
 "Language" => "Sprog",
 "Help translate" => "Hjælp med oversættelsen",
 "WebDAV" => "WebDAV",
-"Use this address to connect to your ownCloud in your file manager" => "Brug denne adresse til at oprette forbindelse til din ownCloud i din filstyring",
 "Login Name" => "Loginnavn",
 "Create" => "Ny",
 "Admin Recovery Password" => "Administrator gendannelse kodeord",
@@ -106,6 +105,7 @@
 "Default Storage" => "Standard opbevaring",
 "Unlimited" => "Ubegrænset",
 "Other" => "Andet",
+"Username" => "Brugernavn",
 "Storage" => "Opbevaring",
 "change display name" => "skift skærmnavn",
 "set new password" => "skift kodeord",
diff --git a/settings/l10n/de.php b/settings/l10n/de.php
index 3722d5db0c92a5ace382e297b217919fc890877d..b48ffb103038818466e96a610d5aa03b9d8d5e9d 100644
--- a/settings/l10n/de.php
+++ b/settings/l10n/de.php
@@ -98,13 +98,14 @@
 "Language" => "Sprache",
 "Help translate" => "Hilf bei der Ãœbersetzung",
 "WebDAV" => "WebDAV",
-"Use this address to connect to your ownCloud in your file manager" => "Verwende diese Adresse, um Deinen Dateimanager mit Deiner ownCloud zu verbinden",
 "Login Name" => "Loginname",
 "Create" => "Anlegen",
 "Admin Recovery Password" => "Admin-Wiederherstellungspasswort",
+"Enter the recovery password in order to recover the users files during password change" => "Geben Sie das Wiederherstellungspasswort ein, um die Benutzerdateien während Passwortänderung wiederherzustellen",
 "Default Storage" => "Standard-Speicher",
 "Unlimited" => "Unbegrenzt",
 "Other" => "Andere",
+"Username" => "Benutzername",
 "Storage" => "Speicher",
 "change display name" => "Anzeigenamen ändern",
 "set new password" => "Neues Passwort setzen",
diff --git a/settings/l10n/de_DE.php b/settings/l10n/de_DE.php
index c7846f79b3040c04cfb4b33a7ab3181a8771cffb..5dea8e534e4a271a515673ee1600dd63f7ebb6b6 100644
--- a/settings/l10n/de_DE.php
+++ b/settings/l10n/de_DE.php
@@ -98,13 +98,14 @@
 "Language" => "Sprache",
 "Help translate" => "Helfen Sie bei der Ãœbersetzung",
 "WebDAV" => "WebDAV",
-"Use this address to connect to your ownCloud in your file manager" => "Verwenden Sie diese Adresse, um Ihren Dateimanager mit Ihrer ownCloud zu verbinden",
 "Login Name" => "Loginname",
 "Create" => "Erstellen",
 "Admin Recovery Password" => "Admin-Paswort-Wiederherstellung",
+"Enter the recovery password in order to recover the users files during password change" => "Geben Sie das Wiederherstellungspasswort ein, um die Benutzerdateien während Passwortänderung wiederherzustellen",
 "Default Storage" => "Standard-Speicher",
 "Unlimited" => "Unbegrenzt",
 "Other" => "Andere",
+"Username" => "Benutzername",
 "Storage" => "Speicher",
 "change display name" => "Anzeigenamen ändern",
 "set new password" => "Neues Passwort setzen",
diff --git a/settings/l10n/el.php b/settings/l10n/el.php
index 6c07c9d8b48da5a87be78ffd90d7dcb41dc01d3d..7ef677bc746e5594833a024dd02c4be61b9110e6 100644
--- a/settings/l10n/el.php
+++ b/settings/l10n/el.php
@@ -98,13 +98,14 @@
 "Language" => "Γλώσσα",
 "Help translate" => "Βοηθήστε στη μετάφραση",
 "WebDAV" => "WebDAV",
-"Use this address to connect to your ownCloud in your file manager" => "Χρήση αυτής της διεύθυνσης για σύνδεση στο ownCloud με τον διαχειριστή αρχείων σας",
 "Login Name" => "Όνομα Σύνδεσης",
 "Create" => "Δημιουργία",
 "Admin Recovery Password" => "Κωδικός Επαναφοράς Διαχειριστή ",
+"Enter the recovery password in order to recover the users files during password change" => "Εισάγετε το συνθηματικό ανάκτησης ώστε να ανακτήσετε τα αρχεία χρηστών κατά την αλλαγή συνθηματικού",
 "Default Storage" => "Προκαθορισμένη Αποθήκευση ",
 "Unlimited" => "Απεριόριστο",
 "Other" => "Άλλο",
+"Username" => "Όνομα χρήστη",
 "Storage" => "Αποθήκευση",
 "change display name" => "αλλαγή ονόματος εμφάνισης",
 "set new password" => "επιλογή νέου κωδικού",
diff --git a/settings/l10n/eo.php b/settings/l10n/eo.php
index 9fd1d5b320600b282116c4e53963809073124299..5ca1cea113519d673af8430346bf665712c52937 100644
--- a/settings/l10n/eo.php
+++ b/settings/l10n/eo.php
@@ -24,6 +24,8 @@
 "Delete" => "Forigi",
 "__language_name__" => "Esperanto",
 "Security Warning" => "Sekureca averto",
+"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Via TTT-servilo ankoraŭ ne ĝuste agordiĝis por permesi sinkronigi dosierojn ĉar la WebDAV-interfaco ŝajnas rompita.",
+"Please double check the <a href='%s'>installation guides</a>." => "Bonvolu duoble kontroli la <a href='%s'>gvidilon por instalo</a>.",
 "Cron" => "Cron",
 "Sharing" => "Kunhavigo",
 "Enable Share API" => "Kapabligi API-on por Kunhavigo",
@@ -52,6 +54,7 @@
 "Forum" => "Forumo",
 "Bugtracker" => "Cimoraportejo",
 "Commercial Support" => "Komerca subteno",
+"Get the apps to sync your files" => "Ekhavu la aplikaĵojn por sinkronigi viajn dosierojn",
 "You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Vi uzas <strong>%s</strong> el la haveblaj <strong>%s</strong>",
 "Password" => "Pasvorto",
 "Your password was changed" => "Via pasvorto ŝanĝiĝis",
@@ -65,11 +68,11 @@
 "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",
 "Create" => "Krei",
 "Default Storage" => "DefaÅ­lta konservejo",
 "Unlimited" => "Senlima",
 "Other" => "Alia",
+"Username" => "Uzantonomo",
 "Storage" => "Konservejo",
 "Default" => "DefaÅ­lta"
 );
diff --git a/settings/l10n/es.php b/settings/l10n/es.php
index 2204f10dee2aee5a9dae9c4e8c0d3d72cc7d64dc..55eb1aad1b5368a9dd41a4a600adab6ae87acae2 100644
--- a/settings/l10n/es.php
+++ b/settings/l10n/es.php
@@ -98,7 +98,6 @@
 "Language" => "Idioma",
 "Help translate" => "Ayúdnos a traducir",
 "WebDAV" => "WebDAV",
-"Use this address to connect to your ownCloud in your file manager" => "Use esta dirección para conectarse a su cuenta de ownCloud en el administrador de archivos",
 "Login Name" => "Nombre de usuario",
 "Create" => "Crear",
 "Admin Recovery Password" => "Recuperación de la contraseña de administración",
@@ -106,6 +105,7 @@
 "Default Storage" => "Almacenamiento predeterminado",
 "Unlimited" => "Ilimitado",
 "Other" => "Otro",
+"Username" => "Nombre de usuario",
 "Storage" => "Almacenamiento",
 "change display name" => "Cambiar nombre a mostrar",
 "set new password" => "Configurar nueva contraseña",
diff --git a/settings/l10n/es_AR.php b/settings/l10n/es_AR.php
index 9ca0e68aa35a191ac51175ec57ea0fc6e2539052..496ee1f58169a3e2ddf3d88e45b35c0918c7552c 100644
--- a/settings/l10n/es_AR.php
+++ b/settings/l10n/es_AR.php
@@ -1,37 +1,37 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "Imposible cargar la lista desde el App Store",
 "Authentication error" => "Error al autenticar",
-"Your display name has been changed." => "El nombre mostrado fue cambiado",
+"Your display name has been changed." => "El nombre mostrado que usás fue cambiado.",
 "Unable to change display name" => "No fue posible cambiar el nombre mostrado",
 "Group already exists" => "El grupo ya existe",
 "Unable to add group" => "No fue posible añadir el grupo",
-"Could not enable app. " => "No se puede  habilitar la aplicación.",
+"Could not enable app. " => "No se pudo habilitar la App.",
 "Email saved" => "e-mail guardado",
-"Invalid email" => "el e-mail no es válido ",
-"Unable to delete group" => "No fue posible eliminar el grupo",
-"Unable to delete user" => "No fue posible eliminar el usuario",
+"Invalid email" => "El e-mail no es válido ",
+"Unable to delete group" => "No fue posible borrar el grupo",
+"Unable to delete user" => "No fue posible borrar el usuario",
 "Language changed" => "Idioma cambiado",
-"Invalid request" => "Pedido no válido",
-"Admins can't remove themself from the admin group" => "Los administradores no se pueden quitar a ellos mismos del grupo administrador. ",
-"Unable to add user to group %s" => "No fue posible añadir el usuario al grupo %s",
-"Unable to remove user from group %s" => "No es posible eliminar al usuario del grupo %s",
-"Couldn't update app." => "No se pudo actualizar la aplicación.",
-"Update to {appversion}" => "Actualizado a {appversion}",
+"Invalid request" => "Pedido inválido",
+"Admins can't remove themself from the admin group" => "Los administradores no se pueden quitar a si mismos del grupo administrador. ",
+"Unable to add user to group %s" => "No fue posible agregar el usuario al grupo %s",
+"Unable to remove user from group %s" => "No es posible borrar al usuario del grupo %s",
+"Couldn't update app." => "No se pudo actualizar la App.",
+"Update to {appversion}" => "Actualizar a {appversion}",
 "Disable" => "Desactivar",
 "Enable" => "Activar",
 "Please wait...." => "Por favor, esperá....",
 "Error" => "Error",
 "Updating...." => "Actualizando....",
-"Error while updating app" => "Error al actualizar",
+"Error while updating app" => "Error al actualizar App",
 "Updated" => "Actualizado",
 "Saving..." => "Guardando...",
 "deleted" => "borrado",
 "undo" => "deshacer",
-"Unable to remove user" => "Imposible remover usuario",
+"Unable to remove user" => "Imposible borrar usuario",
 "Groups" => "Grupos",
 "Group Admin" => "Grupo Administrador",
 "Delete" => "Borrar",
-"add group" => "Agregar grupo",
+"add group" => "agregar grupo",
 "A valid username must be provided" => "Debe ingresar un nombre de usuario válido",
 "Error creating user" => "Error creando usuario",
 "A valid password must be provided" => "Debe ingresar una contraseña válida",
@@ -41,38 +41,38 @@
 "Setup Warning" => "Alerta de Configuración",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Tu servidor web no está configurado todavía para permitir sincronización de archivos porque la interfaz WebDAV parece no funcionar.",
 "Please double check the <a href='%s'>installation guides</a>." => "Por favor, comprobá nuevamente la <a href='%s'>guía de instalación</a>.",
-"Module 'fileinfo' missing" => "Modulo 'fileinfo' no existe",
-"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "El modulo PHP 'fileinfo' no existe. Es muy recomendable que active este modulo para obtener mejores resultados con la detección mime-type",
+"Module 'fileinfo' missing" => "El módulo 'fileinfo' no existe",
+"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "El módulo PHP 'fileinfo' no existe. Es recomendable que actives este módulo para obtener mejores resultados con la detección mime-type",
 "Locale not working" => "\"Locale\" no está funcionando",
-"This ownCloud server can't set system locale to %s. This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support %s." => "El servidor ownCloud no pude asignar la localización de sistema a %s. Esto puede hacer que hayan problemas con algunos caracteres en los nombres de los archivos. Te sugerimos que instales los paquetes necesarios en tu sistema para dar soporte a %s.",
+"This ownCloud server can't set system locale to %s. This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support %s." => "El servidor ownCloud no puede asignar la localización de sistema a %s. Esto puede provocar que existan problemas con algunos caracteres en los nombres de los archivos. Te sugerimos que instales los paquetes necesarios en tu sistema para dar soporte a %s.",
 "Internet connection not working" => "La conexión a Internet no esta funcionando. ",
-"This ownCloud server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features of ownCloud." => "Este servidor ownCloud no tiene una conexión a internet que funcione. Esto significa que alguno de sus servicios como montar dispositivos externos, notificaciones de actualizaciones o instalar aplicaciones de otros desarrolladores no funcionan. Acceder a archivos remotos y mandar e-mails puede ser que tampoco funcione. Te sugerimos que actives una conexión a internet si querés estas características  de ownCloud.",
+"This ownCloud server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features of ownCloud." => "Este servidor ownCloud no tiene una conexión a internet que funcione. Esto significa que alguno de sus servicios, tales  como montar dispositivos externos, notificación de actualizaciones o instalar Apps de otros desarrolladores no funcionan. Puede ser que tampoco puedas acceder a archivos remotos y mandar e-mails. Te sugerimos que actives una conexión a internet si querés estas características en ownCloud.",
 "Cron" => "Cron",
-"Execute one task with each page loaded" => "Ejecute una tarea con cada pagina cargada.",
+"Execute one task with each page loaded" => "Ejecutá una tarea con cada pagina cargada.",
 "cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "cron.php está registrado como un servicio webcron. Llamar la página cron.php en la raíz de ownCloud una vez al minuto sobre http.",
-"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "Usa el servicio de sistema cron. Llama al archivo cron.php en la carpeta de ownCloud a través del sistema cronjob cada un minuto.",
+"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "Usar el servicio de sistema cron. Llama al archivo cron.php en la carpeta de ownCloud a través del sistema cronjob cada un minuto.",
 "Sharing" => "Compartiendo",
 "Enable Share API" => "Habilitar Share API",
 "Allow apps to use the Share API" => "Permitir a las aplicaciones usar la Share API",
 "Allow links" => "Permitir enlaces",
 "Allow users to share items to the public with links" => "Permitir a los usuarios compartir enlaces públicos",
 "Allow resharing" => "Permitir Re-Compartir",
-"Allow users to share items shared with them again" => "Permite a los usuarios volver a compartir items que le han compartido",
-"Allow users to share with anyone" => "Permitir a los usuarios compartir con todos.",
-"Allow users to only share with users in their groups" => "Permitir a los usuarios compartir solo con los de su propio grupo",
+"Allow users to share items shared with them again" => "Permite a los usuarios volver a compartir items que les fueron compartidos",
+"Allow users to share with anyone" => "Permitir a los usuarios compartir con cualquiera.",
+"Allow users to only share with users in their groups" => "Permitir a los usuarios compartir sólo con los de sus mismos grupos",
 "Security" => "Seguridad",
 "Enforce HTTPS" => "Forzar HTTPS",
-"Enforces the clients to connect to ownCloud via an encrypted connection." => "Forzar a los clientes conectar a ownCloud vía conexión encriptada",
-"Please connect to this ownCloud instance via HTTPS to enable or disable the SSL enforcement." => "Por favor conectese a este ownCloud vía HTTPS para habilitar o des-habilitar el forzado de SSL",
+"Enforces the clients to connect to ownCloud via an encrypted connection." => "Forzar a los clientes conectar a ownCloud vía conexión encriptada.",
+"Please connect to this ownCloud instance via HTTPS to enable or disable the SSL enforcement." => "Por favor conectate a este ownCloud vía HTTPS para habilitar o deshabilitar el SSL.",
 "Log" => "Log",
 "Log level" => "Nivel de Log",
 "More" => "Más",
 "Less" => "Menos",
 "Version" => "Versión",
 "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Desarrollado por la <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunidad ownCloud</a>, el <a href=\"https://github.com/owncloud\" target=\"_blank\">código fuente</a> está bajo licencia <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
-"Add your App" => "Añadí tu aplicación",
-"More Apps" => "Más aplicaciones",
-"Select an App" => "Seleccionar una aplicación",
+"Add your App" => "Añadí tu App",
+"More Apps" => "Más Apps",
+"Select an App" => "Elegí una App",
 "See application page at apps.owncloud.com" => "Mirá la web de aplicaciones apps.owncloud.com",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licenciado por <span class=\"author\">",
 "Update" => "Actualizar",
@@ -82,9 +82,9 @@
 "Forum" => "Foro",
 "Bugtracker" => "Informar errores",
 "Commercial Support" => "Soporte comercial",
-"Get the apps to sync your files" => "Obtené aplicaciones para sincronizar tus archivos",
+"Get the apps to sync your files" => "Obtené Apps para sincronizar tus archivos",
 "Show First Run Wizard again" => "Mostrar de nuevo el asistente de primera ejecución",
-"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Usaste  <strong>%s</strong>  de los  <strong>%s</strong>  disponibles",
+"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Usás <strong>%s</strong>  de los <strong>%s</strong> disponibles",
 "Password" => "Contraseña",
 "Your password was changed" => "Tu contraseña fue cambiada",
 "Unable to change your password" => "No fue posible cambiar tu contraseña",
@@ -92,22 +92,22 @@
 "New password" => "Nueva contraseña:",
 "Change password" => "Cambiar contraseña",
 "Display Name" => "Nombre a mostrar",
-"Email" => "Correo Electrónico",
+"Email" => "e-mail",
 "Your email address" => "Tu dirección de e-mail",
-"Fill in an email address to enable password recovery" => "Escribí una dirección de correo electrónico para restablecer la contraseña",
+"Fill in an email address to enable password recovery" => "Escribí una dirección de e-mail para restablecer la contraseña",
 "Language" => "Idioma",
 "Help translate" => "Ayudanos a traducir",
 "WebDAV" => "WebDAV",
-"Use this address to connect to your ownCloud in your file manager" => "Utiliza esta dirección para conectarte con ownCloud en tu Administrador de Archivos",
-"Login Name" => "Nombre de ",
+"Login Name" => "Nombre de Usuario",
 "Create" => "Crear",
 "Admin Recovery Password" => "Recuperación de contraseña de administrador",
 "Enter the recovery password in order to recover the users files during password change" => "Ingresá la contraseña de recuperación para recuperar los archivos de usuario al cambiar contraseña",
 "Default Storage" => "Almacenamiento Predeterminado",
 "Unlimited" => "Ilimitado",
 "Other" => "Otros",
+"Username" => "Nombre de usuario",
 "Storage" => "Almacenamiento",
-"change display name" => "Cambiar el nombre que se muestra",
+"change display name" => "Cambiar el nombre mostrado",
 "set new password" => "Configurar nueva contraseña",
 "Default" => "Predeterminado"
 );
diff --git a/settings/l10n/et_EE.php b/settings/l10n/et_EE.php
index ab9cda4b56541eff57c766b0dd6e07006d8c559d..0bbebaee78e34d22aa6d5568cd70e2b37ab7455f 100644
--- a/settings/l10n/et_EE.php
+++ b/settings/l10n/et_EE.php
@@ -98,7 +98,6 @@
 "Language" => "Keel",
 "Help translate" => "Aita tõlkida",
 "WebDAV" => "WebDAV",
-"Use this address to connect to your ownCloud in your file manager" => "Kasuta seda aadressi ühendamaks oma ownCloudi failihalduriga",
 "Login Name" => "Kasutajanimi",
 "Create" => "Lisa",
 "Admin Recovery Password" => "Admin taasteparool",
@@ -106,6 +105,7 @@
 "Default Storage" => "Vaikimisi maht",
 "Unlimited" => "Piiramatult",
 "Other" => "Muu",
+"Username" => "Kasutajanimi",
 "Storage" => "Maht",
 "change display name" => "muuda näidatavat nime",
 "set new password" => "määra uus parool",
diff --git a/settings/l10n/eu.php b/settings/l10n/eu.php
index b7a6cacc47440f45b8fe108fec589d72d1dbee8c..4cf22c06a981e998b3349a57b831030c7cb4421d 100644
--- a/settings/l10n/eu.php
+++ b/settings/l10n/eu.php
@@ -1,6 +1,7 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "Ezin izan da App Dendatik zerrenda kargatu",
 "Authentication error" => "Autentifikazio errorea",
+"Your display name has been changed." => "Zure bistaratze izena aldatu egin da.",
 "Unable to change display name" => "Ezin izan da bistaratze izena aldatu",
 "Group already exists" => "Taldea dagoeneko existitzenda",
 "Unable to add group" => "Ezin izan da taldea gehitu",
@@ -97,12 +98,14 @@
 "Language" => "Hizkuntza",
 "Help translate" => "Lagundu itzultzen",
 "WebDAV" => "WebDAV",
-"Use this address to connect to your ownCloud in your file manager" => "Erabili helbide hau zure fitxategi kudeatzailean zure ownCloudera konektatzeko",
 "Login Name" => "Sarrera Izena",
 "Create" => "Sortu",
+"Admin Recovery Password" => "Kudeatzaile pasahitz berreskuratzea",
+"Enter the recovery password in order to recover the users files during password change" => "berreskuratze pasahitza idatzi pasahitz aldaketan erabiltzaileen fitxategiak berreskuratzeko",
 "Default Storage" => "Lehenetsitako Biltegiratzea",
 "Unlimited" => "Mugarik gabe",
 "Other" => "Bestelakoa",
+"Username" => "Erabiltzaile izena",
 "Storage" => "Biltegiratzea",
 "change display name" => "aldatu bistaratze izena",
 "set new password" => "ezarri pasahitz berria",
diff --git a/settings/l10n/fa.php b/settings/l10n/fa.php
index b415f2990d40f8fac89ad41fab1be32751d6bbaa..a8a5e33824184366625cc64493aceb302e7c5cbc 100644
--- a/settings/l10n/fa.php
+++ b/settings/l10n/fa.php
@@ -1,6 +1,7 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "قادر به بارگذاری لیست از فروشگاه اپ نیستم",
 "Authentication error" => "خطا در اعتبار سنجی",
+"Your display name has been changed." => "نام نمایش شما تغییر یافته است.",
 "Unable to change display name" => "امکان تغییر نام نمایشی شما وجود ندارد",
 "Group already exists" => "این گروه در حال حاضر موجود است",
 "Unable to add group" => "افزودن گروه امکان پذیر نیست",
@@ -42,10 +43,14 @@
 "Please double check the <a href='%s'>installation guides</a>." => "لطفاً دوباره <a href='%s'>راهنمای نصب</a>را بررسی کنید.",
 "Module 'fileinfo' missing" => "ماژول 'fileinfo' از کار افتاده",
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "ماژول 'fileinfo' PHP از کار افتاده است.ما اکیدا توصیه می کنیم که این ماژول را فعال کنید تا نتایج بهتری به وسیله ی mime-type detection دریافت کنید.",
+"Locale not working" => "زبان محلی کار نمی کند.",
 "This ownCloud server can't set system locale to %s. This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support %s." => "این سرور ownCloud نمی تواند سیستم محلی را بر روی %s تنظیم کند.این به این معنی ست که ممکن است با کاراکترهای خاصی در نام فایل ها مشکل داشته باشد.ما اکیداً نصب کردن بسته های لازم را بر روی سیستم خودتان برای پشتیبانی %s توصیه می کنیم.",
 "Internet connection not working" => "اتصال اینترنت کار نمی کند",
 "This ownCloud server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features of ownCloud." => "این سرور OwnCloud ارتباط اینترنتی ندارد.این بدین معناست که بعضی از خصوصیات نظیر خارج کردن منبع ذخیره ی خارجی، اطلاعات در مورد بروزرسانی ها یا نصب برنامه های نوع 3ام کار نمی کنند.دسترسی به فایل ها از راه دور و ارسال آگاه سازی ایمیل ها ممکن است همچنان کار نکنند.اگرشما همه ی خصوصیات OwnCloud می خواهید ما پیشنهاد می کنیم تا ارتباط اینترنتی مربوط به این سرور را فعال کنید.",
+"Cron" => "زمانبند",
 "Execute one task with each page loaded" => "اجرای یک وظیفه با هر بار بارگذاری صفحه",
+"cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "cron.php در یک سرویس webcron ثبت شده است. تماس یک بار در دقیقه بر روی http با صفحه  cron.php در ریشه owncloud .",
+"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "استفاده از سیستم های سرویس cron . تماس یک بار در دقیقه با فایل cron.php در پوشه owncloud از طریق یک سیستم cronjob .",
 "Sharing" => "اشتراک گذاری",
 "Enable Share API" => "فعال کردن API اشتراک گذاری",
 "Allow apps to use the Share API" => "اجازه ی برنامه ها برای استفاده از API اشتراک گذاری",
@@ -58,7 +63,9 @@
 "Security" => "امنیت",
 "Enforce HTTPS" => "وادار کردن HTTPS",
 "Enforces the clients to connect to ownCloud via an encrypted connection." => "وادار کردن مشتریان برای ارتباط با ownCloud از طریق رمزگذاری ارتباط",
+"Please connect to this ownCloud instance via HTTPS to enable or disable the SSL enforcement." => "از طریق HTTPS به این نسخه از ownCloud متصل شوید تا بتوانید SSL  را فعال یا غیر فعال نمایید.",
 "Log" => "کارنامه",
+"Log level" => "سطح ورود",
 "More" => "بیش‌تر",
 "Less" => "کم‌تر",
 "Version" => "نسخه",
@@ -90,12 +97,16 @@
 "Fill in an email address to enable password recovery" => "پست الکترونیکی را پرکنید  تا بازیابی گذرواژه فعال شود",
 "Language" => "زبان",
 "Help translate" => "به ترجمه آن کمک کنید",
-"Use this address to connect to your ownCloud in your file manager" => "از این نشانی برای اتصال به ownCloud خودتان در بخش مدیریت فایل خودتان استفاده کنید",
+"WebDAV" => "WebDAV",
+"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "استفاده ابن آدرس <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\"> برای دسترسی فایل های شما از طریق WebDAV </a>",
 "Login Name" => "نام کاربری",
 "Create" => "ایجاد کردن",
+"Admin Recovery Password" => "مدیریت بازیابی رمز عبور",
+"Enter the recovery password in order to recover the users files during password change" => "در حین تغییر رمز عبور به منظور بازیابی فایل های کاربران، رمز عبور بازیابی را وارد کنید",
 "Default Storage" => "ذخیره سازی پیش فرض",
 "Unlimited" => "نامحدود",
 "Other" => "دیگر",
+"Username" => "نام کاربری",
 "Storage" => "حافظه",
 "change display name" => "تغییر نام نمایشی",
 "set new password" => "تنظیم کلمه عبور جدید",
diff --git a/settings/l10n/fi_FI.php b/settings/l10n/fi_FI.php
index 38ba5629c8fb6f2b99c8b4f8e92795794694a3f4..f81f786370400815eae9ece2faa6a0ba47b6ef48 100644
--- a/settings/l10n/fi_FI.php
+++ b/settings/l10n/fi_FI.php
@@ -32,7 +32,9 @@
 "Group Admin" => "Ryhmän ylläpitäjä",
 "Delete" => "Poista",
 "add group" => "lisää ryhmä",
+"A valid username must be provided" => "Anna kelvollinen käyttäjätunnus",
 "Error creating user" => "Virhe käyttäjää luotaessa",
+"A valid password must be provided" => "Anna kelvollinen salasana",
 "__language_name__" => "_kielen_nimi_",
 "Security Warning" => "Turvallisuusvaroitus",
 "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-kansio ja tiedostot ovat ehkä saavutettavissa Internetistä. .htaccess-tiedosto, jolla kontrolloidaan pääsyä, ei toimi. Suosittelemme, että muutat web-palvelimesi asetukset niin ettei data-kansio ole enää pääsyä tai siirrät data-kansion pois web-palvelimen tiedostojen juuresta.",
@@ -85,12 +87,13 @@
 "Language" => "Kieli",
 "Help translate" => "Auta kääntämisessä",
 "WebDAV" => "WebDAV",
-"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",
+"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "Käytä tätä osoitetta <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">päästäksesi käsiksi tiedostoihisi WebDAVin kautta</a>",
 "Login Name" => "Kirjautumisnimi",
 "Create" => "Luo",
 "Default Storage" => "Oletustallennustila",
 "Unlimited" => "Rajoittamaton",
 "Other" => "Muu",
+"Username" => "Käyttäjätunnus",
 "Storage" => "Tallennustila",
 "change display name" => "vaihda näyttönimi",
 "set new password" => "aseta uusi salasana",
diff --git a/settings/l10n/fr.php b/settings/l10n/fr.php
index 5997ccbf24d61d03935856fbf9dbc3ca834c55c2..2b11d0c865ac0449dfde19413ab3f8371f5786a2 100644
--- a/settings/l10n/fr.php
+++ b/settings/l10n/fr.php
@@ -98,7 +98,6 @@
 "Language" => "Langue",
 "Help translate" => "Aidez à traduire",
 "WebDAV" => "WebDAV",
-"Use this address to connect to your ownCloud in your file manager" => "Utiliser cette adresse pour vous connecter à ownCloud dans votre gestionnaire de fichiers",
 "Login Name" => "Nom de la connexion",
 "Create" => "Créer",
 "Admin Recovery Password" => "Récupération du mot de passe administrateur",
@@ -106,6 +105,7 @@
 "Default Storage" => "Support de stockage par défaut",
 "Unlimited" => "Illimité",
 "Other" => "Autre",
+"Username" => "Nom d'utilisateur",
 "Storage" => "Support de stockage",
 "change display name" => "Changer le nom affiché",
 "set new password" => "Changer le mot de passe",
diff --git a/settings/l10n/gl.php b/settings/l10n/gl.php
index 51e8ee95e0e7452191869bcfb56e99e813beff90..16b10158c8cab6bf3cb7492ab14b0f22b45106f0 100644
--- a/settings/l10n/gl.php
+++ b/settings/l10n/gl.php
@@ -98,7 +98,7 @@
 "Language" => "Idioma",
 "Help translate" => "Axude na tradución",
 "WebDAV" => "WebDAV",
-"Use this address to connect to your ownCloud in your file manager" => "Utilice este enderezo para conectarse ao seu ownCloud co administrador de ficheiros",
+"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "Empregue esta ligazón <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">para acceder aos sus ficheiros mediante WebDAV</a>",
 "Login Name" => "Nome de acceso",
 "Create" => "Crear",
 "Admin Recovery Password" => "Contrasinal de recuperación do administrador",
@@ -106,6 +106,7 @@
 "Default Storage" => "Almacenamento predeterminado",
 "Unlimited" => "Sen límites",
 "Other" => "Outro",
+"Username" => "Nome de usuario",
 "Storage" => "Almacenamento",
 "change display name" => "cambiar o nome visíbel",
 "set new password" => "estabelecer un novo contrasinal",
diff --git a/settings/l10n/he.php b/settings/l10n/he.php
index b2edebe08f6e00c80a9e04e8ebb2731d5a708df3..077bc9e97f9c249ed57bba1645ffd7856edfbde1 100644
--- a/settings/l10n/he.php
+++ b/settings/l10n/he.php
@@ -90,13 +90,13 @@
 "Language" => "פה",
 "Help translate" => "עזרה בתרגום",
 "WebDAV" => "WebDAV",
-"Use this address to connect to your ownCloud in your file manager" => "השתמש בכתובת זאת על מנת להתחבר אל ownCloud דרך סייר קבצים.",
 "Login Name" => "שם כניסה",
 "Create" => "יצירה",
 "Admin Recovery Password" => "ססמת השחזור של המנהל",
 "Default Storage" => "אחסון בררת המחדל",
 "Unlimited" => "ללא הגבלה",
 "Other" => "אחר",
+"Username" => "שם משתמש",
 "Storage" => "אחסון",
 "change display name" => "החלפת שם התצוגה",
 "set new password" => "הגדרת ססמה חדשה",
diff --git a/settings/l10n/hi.php b/settings/l10n/hi.php
index 034ededf5f982ce7ae7e749caf852c5635f3eb4d..eb3fcc251f4698aee273972059f459f13fea619a 100644
--- a/settings/l10n/hi.php
+++ b/settings/l10n/hi.php
@@ -1,4 +1,7 @@
 <?php $TRANSLATIONS = array(
+"Error" => "त्रुटि",
+"Update" => "अद्यतन",
 "Password" => "पासवर्ड",
-"New password" => "नया पासवर्ड"
+"New password" => "नया पासवर्ड",
+"Username" => "प्रयोक्ता का नाम"
 );
diff --git a/settings/l10n/hr.php b/settings/l10n/hr.php
index 87ebf13f798db10f4ca6b008c73b6deca195facf..4bfbc2d3d50defb11409911fe2c9ddd0dcdff1b5 100644
--- a/settings/l10n/hr.php
+++ b/settings/l10n/hr.php
@@ -32,5 +32,6 @@
 "Language" => "Jezik",
 "Help translate" => "Pomoć prevesti",
 "Create" => "Izradi",
-"Other" => "ostali"
+"Other" => "ostali",
+"Username" => "Korisničko ime"
 );
diff --git a/settings/l10n/hu_HU.php b/settings/l10n/hu_HU.php
index 872e8f971daad6b33f522d77efa15b62301d250a..377ec24956247b7d19c9074f6cb55c2460bd8776 100644
--- a/settings/l10n/hu_HU.php
+++ b/settings/l10n/hu_HU.php
@@ -98,13 +98,14 @@
 "Language" => "Nyelv",
 "Help translate" => "Segítsen a fordításban!",
 "WebDAV" => "WebDAV",
-"Use this address to connect to your ownCloud in your file manager" => "Ennek a címnek a megadásával a WebDAV-protokollon keresztül saját gépének fájlkezelőjével is is elérheti az állományait.",
 "Login Name" => "Bejelentkezési név",
 "Create" => "Létrehozás",
 "Admin Recovery Password" => "A jelszóvisszaállítás adminisztrációja",
+"Enter the recovery password in order to recover the users files during password change" => "Adja meg az adatok visszanyeréséhez szükséges jelszót arra az esetre, ha a felhasználók megváltoztatják a jelszavukat",
 "Default Storage" => "Alapértelmezett tárhely",
 "Unlimited" => "Korlátlan",
 "Other" => "Más",
+"Username" => "Felhasználónév",
 "Storage" => "Tárhely",
 "change display name" => "a megjelenített név módosítása",
 "set new password" => "új jelszó beállítása",
diff --git a/settings/l10n/ia.php b/settings/l10n/ia.php
index 8d67b45347a72e1b0b6b78d867f00fe8c09a02bf..d6d1c9eb86e102d0d80aa9d71fa1c1dc6440de01 100644
--- a/settings/l10n/ia.php
+++ b/settings/l10n/ia.php
@@ -21,5 +21,6 @@
 "Language" => "Linguage",
 "Help translate" => "Adjuta a traducer",
 "Create" => "Crear",
-"Other" => "Altere"
+"Other" => "Altere",
+"Username" => "Nomine de usator"
 );
diff --git a/settings/l10n/id.php b/settings/l10n/id.php
index 02da3c3cf2cfe81dc26412cd4dd844f8e882a9b9..012f5885b423af7bda95431ae535fe368758a040 100644
--- a/settings/l10n/id.php
+++ b/settings/l10n/id.php
@@ -97,12 +97,12 @@
 "Language" => "Bahasa",
 "Help translate" => "Bantu menerjemahkan",
 "WebDAV" => "WebDAV",
-"Use this address to connect to your ownCloud in your file manager" => "Gunakan alamat ini untuk terhubung ke ownCloud Anda pada manajer berkas ",
 "Login Name" => "Nama Masuk",
 "Create" => "Buat",
 "Default Storage" => "Penyimpanan Baku",
 "Unlimited" => "Tak terbatas",
 "Other" => "Lainnya",
+"Username" => "Nama pengguna",
 "Storage" => "Penyimpanan",
 "change display name" => "ubah nama tampilan",
 "set new password" => "setel sandi baru",
diff --git a/settings/l10n/is.php b/settings/l10n/is.php
index e8f64966ce76c61e2b4446e2cbff7a21b183930a..fecc82ec6d73c2ba6a75cc0da61bd921b563ccfe 100644
--- a/settings/l10n/is.php
+++ b/settings/l10n/is.php
@@ -58,11 +58,11 @@
 "Language" => "Tungumál",
 "Help translate" => "Hjálpa við þýðingu",
 "WebDAV" => "WebDAV",
-"Use this address to connect to your ownCloud in your file manager" => "Notaðu þessa vefslóð til að tengjast ownCloud svæðinu þínu",
 "Create" => "Búa til",
 "Default Storage" => "Sjálfgefin gagnageymsla",
 "Unlimited" => "Ótakmarkað",
 "Other" => "Annað",
+"Username" => "Notendanafn",
 "Storage" => "gagnapláss",
 "Default" => "Sjálfgefið"
 );
diff --git a/settings/l10n/it.php b/settings/l10n/it.php
index 3433f56f2df90225ceba79003288d9e2c9e26f6c..fc7bd90142032b9e5bc72a1b933dbb22118b9f4b 100644
--- a/settings/l10n/it.php
+++ b/settings/l10n/it.php
@@ -98,7 +98,7 @@
 "Language" => "Lingua",
 "Help translate" => "Migliora la traduzione",
 "WebDAV" => "WebDAV",
-"Use this address to connect to your ownCloud in your file manager" => "Usa questo indirizzo per connetterti al tuo ownCloud dal tuo gestore file",
+"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "Utilizza questo indirizzo per <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">accedere ai tuoi File via WebDAV</a>",
 "Login Name" => "Nome utente",
 "Create" => "Crea",
 "Admin Recovery Password" => "Password di ripristino amministrativa",
@@ -106,6 +106,7 @@
 "Default Storage" => "Archiviazione predefinita",
 "Unlimited" => "Illimitata",
 "Other" => "Altro",
+"Username" => "Nome utente",
 "Storage" => "Archiviazione",
 "change display name" => "cambia il nome visualizzato",
 "set new password" => "imposta una nuova password",
diff --git a/settings/l10n/ja_JP.php b/settings/l10n/ja_JP.php
index ddff0f328a15fe01ea826b6c3c629e6dc2175e22..2ec69194925d6df74f7827024586385cdfc75278 100644
--- a/settings/l10n/ja_JP.php
+++ b/settings/l10n/ja_JP.php
@@ -98,7 +98,7 @@
 "Language" => "言語",
 "Help translate" => "翻訳に協力する",
 "WebDAV" => "WebDAV",
-"Use this address to connect to your ownCloud in your file manager" => "ファイルマネージャでownCloudに接続する際はこのアドレスを利用してください",
+"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "<a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">WebDAV経由でファイルにアクセス</a>するにはこのアドレスを利用してください",
 "Login Name" => "ログイン名",
 "Create" => "作成",
 "Admin Recovery Password" => "管理者復旧パスワード",
@@ -106,6 +106,7 @@
 "Default Storage" => "デフォルトストレージ",
 "Unlimited" => "無制限",
 "Other" => "その他",
+"Username" => "ユーザー名",
 "Storage" => "ストレージ",
 "change display name" => "表示名を変更",
 "set new password" => "新しいパスワードを設定",
diff --git a/settings/l10n/ka_GE.php b/settings/l10n/ka_GE.php
index 4a118eb78510c2c237c059eda10e240328259bf9..302745052cc5f994f996e666dc501e8dbbdf8e02 100644
--- a/settings/l10n/ka_GE.php
+++ b/settings/l10n/ka_GE.php
@@ -98,12 +98,12 @@
 "Language" => "ენა",
 "Help translate" => "თარგმნის დახმარება",
 "WebDAV" => "WebDAV",
-"Use this address to connect to your ownCloud in your file manager" => "გამოიყენე შემდეგი მისამართი ownCloud–თან დასაკავშირებლად შენს ფაილმენეჯერში",
 "Login Name" => "მომხმარებლის სახელი",
 "Create" => "შექმნა",
 "Default Storage" => "საწყისი საცავი",
 "Unlimited" => "ულიმიტო",
 "Other" => "სხვა",
+"Username" => "მომხმარებლის სახელი",
 "Storage" => "საცავი",
 "change display name" => "შეცვალე დისფლეის სახელი",
 "set new password" => "დააყენეთ ახალი პაროლი",
diff --git a/settings/l10n/ko.php b/settings/l10n/ko.php
index c58a578cae86e0c836051a3fc23df463a5ad34ab..230a2185bfb0585425380f3ae8df786d0b12f526 100644
--- a/settings/l10n/ko.php
+++ b/settings/l10n/ko.php
@@ -1,39 +1,76 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "앱 스토어에서 목록을 가져올 수 없습니다",
 "Authentication error" => "인증 오류",
-"Group already exists" => "그룹이 이미 존재합니다.",
-"Unable to add group" => "그룹을 추가할 수 없습니다.",
+"Your display name has been changed." => "표시 이름이 변경되었습니다.",
+"Unable to change display name" => "표시 이름을 변경할 수 없음",
+"Group already exists" => "그룹이 이미 존재함",
+"Unable to add group" => "그룹을 추가할 수 없음",
 "Could not enable app. " => "앱을 활성화할 수 없습니다.",
 "Email saved" => "이메일 저장됨",
 "Invalid email" => "잘못된 이메일 주소",
-"Unable to delete group" => "그룹을 삭제할 수 없습니다.",
-"Unable to delete user" => "사용자를 삭제할 수 없습니다.",
-"Language changed" => "언어가 변경되었습니다",
+"Unable to delete group" => "그룹을 삭제할 수 없음",
+"Unable to delete user" => "사용자를 삭제할 수 없음.",
+"Language changed" => "언어가 변경됨",
 "Invalid request" => "잘못된 요청",
-"Admins can't remove themself from the admin group" => "관리자 자신을 관리자 그룹에서 삭제할 수 없습니다",
-"Unable to add user to group %s" => "그룹 %s에 사용자를 추가할 수 없습니다.",
-"Unable to remove user from group %s" => "그룹 %s에서 사용자를 삭제할 수 없습니다.",
+"Admins can't remove themself from the admin group" => "관리자 자신을 관리자 그룹에서 삭제할 수 없음",
+"Unable to add user to group %s" => "그룹 %s에 사용자를 추가할 수 없음",
+"Unable to remove user from group %s" => "그룹 %s에서 사용자를 삭제할 수 없음",
+"Couldn't update app." => "앱을 업데이트할 수 없습니다.",
+"Update to {appversion}" => "버전 {appversion}(으)로 업데이트",
 "Disable" => "비활성화",
 "Enable" => "사용함",
+"Please wait...." => "기다려 주십시오....",
 "Error" => "오류",
+"Updating...." => "업데이트 중....",
+"Error while updating app" => "앱을 업데이트하는 중 오류 발생",
+"Updated" => "업데이트됨",
 "Saving..." => "저장 중...",
-"deleted" => "삭제",
-"undo" => "되돌리기",
+"deleted" => "삭제됨",
+"undo" => "실행 취소",
+"Unable to remove user" => "사용자를 삭제할 수 없음",
 "Groups" => "그룹",
 "Group Admin" => "그룹 관리자",
 "Delete" => "삭제",
+"add group" => "그룹 추가",
+"A valid username must be provided" => "올바른 사용자 이름을 입력해야 함",
+"Error creating user" => "사용자 생성 오류",
+"A valid password must be provided" => "올바른 암호를 입력해야 함",
 "__language_name__" => "한국어",
 "Security Warning" => "보안 경고",
 "Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "데이터 디렉터리와 파일을 인터넷에서 접근할 수 있는 것 같습니다. ownCloud에서 제공한 .htaccess 파일이 작동하지 않습니다. 웹 서버를 다시 설정하여 데이터 디렉터리에 접근할 수 없도록 하거나 문서 루트 바깥쪽으로 옮기는 것을 추천합니다.",
 "Setup Warning" => "설정 경고",
+"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "WebDAV 인터페이스가 제대로 작동하지 않습니다. 웹 서버에서 파일 동기화를 사용할 수 있도록 설정이 제대로 되지 않은 것 같습니다.",
+"Please double check the <a href='%s'>installation guides</a>." => "<a href='%s'>설치 가이드</a>를 다시 한 번 확인하십시오.",
+"Module 'fileinfo' missing" => "모듈 'fileinfo'가 없음",
+"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "PHP 모듈 'fileinfo'가 존재하지 않습니다. MIME 형식 감지 결과를 향상시키기 위하여 이 모듈을 활성화하는 것을 추천합니다.",
+"Locale not working" => "로캘이 작동하지 않음",
+"This ownCloud server can't set system locale to %s. This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support %s." => "ownCloud 서버의 시스템 로캘을 %s(으)로 설정할 수 없습니다. 파일 이름에 특정한 글자가 들어가 있는 경우 문제가 발생할 수 있습니다. %s을(를) 지원하기 위해서 시스템에 필요한 패키지를 설치하는 것을 추천합니다.",
+"Internet connection not working" => "인터넷에 연결할 수 없음",
+"This ownCloud server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features of ownCloud." => "ownCloud 서버에서 인터넷에 연결할 수 없습니다. 외부 저장소 마운트, 업데이트 알림, 외부 앱 설치 등이 작동하지 않을 것입니다. 외부에서 파일에 접근하거나, 알림 이메일을 보내지 못할 수도 있습니다. ownCloud의 모든 기능을 사용하려면 이 서버를 인터넷에 연결하는 것을 추천합니다.",
 "Cron" => "크론",
+"Execute one task with each page loaded" => "개별 페이지를 불러올 때마다 실행",
+"cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "cron.php가 webcron 서비스에 등록되어 있습니다. HTTP를 통하여 1분마다 ownCloud 루트에서 cron.php 페이지를 불러옵니다.",
+"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "시스템 cron 서비스를 사용합니다. 시스템 cronjob을 사용하여 ownCloud 폴더의 cron.php 파일을 1분마다 불러옵니다.",
+"Sharing" => "공유",
+"Enable Share API" => "공유 API 사용하기",
+"Allow apps to use the Share API" => "앱에서 공유 API를 사용할 수 있도록 허용",
+"Allow links" => "링크 허용",
+"Allow users to share items to the public with links" => "사용자가 개별 항목의 링크를 공유할 수 있도록 허용",
+"Allow resharing" => "재공유 허용",
+"Allow users to share items shared with them again" => "사용자에게 공유된 항목을 다시 공유할 수 있도록 허용",
+"Allow users to share with anyone" => "누구나와 공유할 수 있도록 허용",
+"Allow users to only share with users in their groups" => "사용자가 속해 있는 그룹의 사용자와만 공유할 수 있도록 허용",
+"Security" => "보안",
+"Enforce HTTPS" => "HTTPS 강제 사용",
+"Enforces the clients to connect to ownCloud via an encrypted connection." => "클라이언트가 ownCloud에 항상 암호화된 연결로 연결하도록 강제합니다.",
+"Please connect to this ownCloud instance via HTTPS to enable or disable the SSL enforcement." => "SSL 강제 사용 설정을 변경하려면 ownCloud 인스턴스에 HTTPS로 연결하십시오.",
 "Log" => "로그",
 "Log level" => "로그 단계",
 "More" => "더 중요함",
 "Less" => "덜 중요함",
 "Version" => "버전",
 "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "<a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud 커뮤니티</a>에 의해서 개발되었습니다. <a href=\"https://github.com/owncloud\" target=\"_blank\">원본 코드</a>는 <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>에 따라 사용이 허가됩니다.",
-"Add your App" => "앱 추가",
+"Add your App" => "내 앱 추가",
 "More Apps" => "더 많은 앱",
 "Select an App" => "앱 선택",
 "See application page at apps.owncloud.com" => "apps.owncloud.com에 있는 앱 페이지를 참고하십시오",
@@ -45,9 +82,9 @@
 "Forum" => "포럼",
 "Bugtracker" => "버그 트래커",
 "Commercial Support" => "상업용 지원",
-"Get the apps to sync your files" => "앱을 이용하여 당신의 파일을 동기화 할 수 있습니다.",
+"Get the apps to sync your files" => "파일 동기화 앱 가져오기",
 "Show First Run Wizard again" => "첫 실행 마법사 다시 보이기",
-"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "현재 공간 <strong>%s</strong>/<strong>%s</strong>을(를) 사용 중입니다",
+"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "현재 공간 중 <strong>%s</strong>/<strong>%s</strong>을(를) 사용 중입니다",
 "Password" => "암호",
 "Your password was changed" => "암호가 변경되었습니다",
 "Unable to change your password" => "암호를 변경할 수 없음",
@@ -57,16 +94,18 @@
 "Display Name" => "표시 이름",
 "Email" => "이메일",
 "Your email address" => "이메일 주소",
-"Fill in an email address to enable password recovery" => "암호 찾기 기능을 사용하려면 이메일 주소를 입력하십시오.",
+"Fill in an email address to enable password recovery" => "암호 찾기 기능을 사용하려면 이메일 주소를 입력하십시오",
 "Language" => "언어",
 "Help translate" => "번역 돕기",
 "WebDAV" => "WebDAV",
-"Use this address to connect to your ownCloud in your file manager" => "파일 관리자에서 ownCloud에 접속하려면 이 주소를 사용하십시오.",
 "Login Name" => "로그인 이름",
 "Create" => "만들기",
+"Admin Recovery Password" => "관리자 복구 암호",
+"Enter the recovery password in order to recover the users files during password change" => "암호 변경 시 변경된 사용자 파일을 복구하려면 복구 암호를 입력하십시오",
 "Default Storage" => "기본 저장소",
 "Unlimited" => "무제한",
 "Other" => "기타",
+"Username" => "사용자 이름",
 "Storage" => "저장소",
 "change display name" => "표시 이름 변경",
 "set new password" => "새 암호 설정",
diff --git a/settings/l10n/ku_IQ.php b/settings/l10n/ku_IQ.php
index a7d2daa70baca053ec9c94c5bb99d36013bd82a5..244aba63a2c72276b05dbcd1aa7d440f6bf85d84 100644
--- a/settings/l10n/ku_IQ.php
+++ b/settings/l10n/ku_IQ.php
@@ -5,5 +5,6 @@
 "Update" => "نوێکردنه‌وه",
 "Password" => "وشەی تێپەربو",
 "New password" => "وشەی نهێنی نوێ",
-"Email" => "ئیمه‌یل"
+"Email" => "ئیمه‌یل",
+"Username" => "ناوی به‌کارهێنه‌ر"
 );
diff --git a/settings/l10n/lb.php b/settings/l10n/lb.php
index 427e6568a403a43a531df9b03fdf981b247e712e..7060d41537a95d813ba742d6804dda20db85d77b 100644
--- a/settings/l10n/lb.php
+++ b/settings/l10n/lb.php
@@ -39,5 +39,6 @@
 "Language" => "Sprooch",
 "Help translate" => "Hëllef iwwersetzen",
 "Create" => "Erstellen",
-"Other" => "Aner"
+"Other" => "Aner",
+"Username" => "Benotzernumm"
 );
diff --git a/settings/l10n/lt_LT.php b/settings/l10n/lt_LT.php
index 225185686d0a8ebfcba01662a373860968b43b03..eb628a530eb10cb953b03a76853de93c3cd92f25 100644
--- a/settings/l10n/lt_LT.php
+++ b/settings/l10n/lt_LT.php
@@ -40,5 +40,6 @@
 "Language" => "Kalba",
 "Help translate" => "Padėkite išversti",
 "Create" => "Sukurti",
-"Other" => "Kita"
+"Other" => "Kita",
+"Username" => "Prisijungimo vardas"
 );
diff --git a/settings/l10n/lv.php b/settings/l10n/lv.php
index fd6c2090f55fc48c69d17f6b46fa8099584ce5ef..b9836634a03aa344ef0e70af666e7c5d3d71611e 100644
--- a/settings/l10n/lv.php
+++ b/settings/l10n/lv.php
@@ -97,12 +97,12 @@
 "Language" => "Valoda",
 "Help translate" => "Palīdzi tulkot",
 "WebDAV" => "WebDAV",
-"Use this address to connect to your ownCloud in your file manager" => "Izmanto šo adresi, lai, izmantojot datņu pārvaldnieku, savienotos ar savu ownCloud",
 "Login Name" => "Ierakstīšanās vārds",
 "Create" => "Izveidot",
 "Default Storage" => "Noklusējuma krātuve",
 "Unlimited" => "Neierobežota",
 "Other" => "Cits",
+"Username" => "Lietotājvārds",
 "Storage" => "Krātuve",
 "change display name" => "mainīt redzamo vārdu",
 "set new password" => "iestatīt jaunu paroli",
diff --git a/settings/l10n/mk.php b/settings/l10n/mk.php
index 902a8d2d6a798a2d25496e2629ecb8b7380842f5..f36bb8c7fce9b3321b8e067d613f00275a9a718d 100644
--- a/settings/l10n/mk.php
+++ b/settings/l10n/mk.php
@@ -54,7 +54,7 @@
 "Language" => "Јазик",
 "Help translate" => "Помогни во преводот",
 "WebDAV" => "WebDAV",
-"Use this address to connect to your ownCloud in your file manager" => "Користете ја оваа адреса да ",
 "Create" => "Создај",
-"Other" => "Останато"
+"Other" => "Останато",
+"Username" => "Корисничко име"
 );
diff --git a/settings/l10n/ms_MY.php b/settings/l10n/ms_MY.php
index a0b94f1a1bd1f94c0a4049bf9a9b80497f072682..d151cba29f94560506ab13d114cbd0ea791378c9 100644
--- a/settings/l10n/ms_MY.php
+++ b/settings/l10n/ms_MY.php
@@ -31,5 +31,6 @@
 "Language" => "Bahasa",
 "Help translate" => "Bantu terjemah",
 "Create" => "Buat",
-"Other" => "Lain"
+"Other" => "Lain",
+"Username" => "Nama pengguna"
 );
diff --git a/settings/l10n/my_MM.php b/settings/l10n/my_MM.php
index d12c9bcf036db87f8a07fe4274f0f28614de1058..9459a2e53fec7506d16faea3976833a6ac39513e 100644
--- a/settings/l10n/my_MM.php
+++ b/settings/l10n/my_MM.php
@@ -3,5 +3,6 @@
 "Invalid request" => "တောင်းဆိုချက်မမှန်ကန်ပါ",
 "Security Warning" => "လုံခြုံရေးသတိပေးချက်",
 "Password" => "စကားဝှက်",
-"New password" => "စကားဝှက်အသစ်"
+"New password" => "စကားဝှက်အသစ်",
+"Username" => "သုံးစွဲသူအမည်"
 );
diff --git a/settings/l10n/nb_NO.php b/settings/l10n/nb_NO.php
index b6182cc3080d848890b703a0d36eca7c39bebebf..f24aa50dbf399c5f96c1623ebe92e9fd742bfd6e 100644
--- a/settings/l10n/nb_NO.php
+++ b/settings/l10n/nb_NO.php
@@ -98,12 +98,12 @@
 "Language" => "Språk",
 "Help translate" => "Bidra til oversettelsen",
 "WebDAV" => "WebDAV",
-"Use this address to connect to your ownCloud in your file manager" => "Bruk denne adressen for å kople til ownCloud i din filbehandler",
 "Login Name" => "Logginn navn",
 "Create" => "Opprett",
 "Default Storage" => "Standard lager",
 "Unlimited" => "Ubegrenset",
 "Other" => "Annet",
+"Username" => "Brukernavn",
 "Storage" => "Lager",
 "change display name" => "endre visningsnavn",
 "set new password" => "sett nytt passord",
diff --git a/settings/l10n/nl.php b/settings/l10n/nl.php
index a2df948d13e9dd38e5371c4196cf3bf89d7a4c61..d51d1d3af5c3e4c78e8c8c583a581fdeb712dc95 100644
--- a/settings/l10n/nl.php
+++ b/settings/l10n/nl.php
@@ -98,7 +98,6 @@
 "Language" => "Taal",
 "Help translate" => "Help met vertalen",
 "WebDAV" => "WebDAV",
-"Use this address to connect to your ownCloud in your file manager" => "Gebruik dit adres om te verbinden met uw ownCloud in uw bestandsbeheer",
 "Login Name" => "Inlognaam",
 "Create" => "Creëer",
 "Admin Recovery Password" => "Beheer herstel wachtwoord",
@@ -106,6 +105,7 @@
 "Default Storage" => "Standaard Opslaglimiet",
 "Unlimited" => "Ongelimiteerd",
 "Other" => "Anders",
+"Username" => "Gebruikersnaam",
 "Storage" => "Opslaglimiet",
 "change display name" => "wijzig weergavenaam",
 "set new password" => "Instellen nieuw wachtwoord",
diff --git a/settings/l10n/nn_NO.php b/settings/l10n/nn_NO.php
index 61ece5823d8ef19b27dfe683db031195ad9dbcc1..642f523006175bea4f0d23fce1f5d16b6895e9da 100644
--- a/settings/l10n/nn_NO.php
+++ b/settings/l10n/nn_NO.php
@@ -98,12 +98,12 @@
 "Language" => "Språk",
 "Help translate" => "Hjelp oss å omsetja",
 "WebDAV" => "WebDAV",
-"Use this address to connect to your ownCloud in your file manager" => "Bruk denne adressa for å kopla til din ownCloud frå filhandsamaren din",
 "Login Name" => "Innloggingsnamn",
 "Create" => "Lag",
 "Default Storage" => "Standardlagring",
 "Unlimited" => "Ubegrensa",
 "Other" => "Anna",
+"Username" => "Brukarnamn",
 "Storage" => "Lagring",
 "change display name" => "endra visingsnamn",
 "set new password" => "lag nytt passord",
diff --git a/settings/l10n/oc.php b/settings/l10n/oc.php
index 052974591a2a06b9b85302e60950715749646567..34820d0349d2dd3d187f7777141e9d0cf825c16d 100644
--- a/settings/l10n/oc.php
+++ b/settings/l10n/oc.php
@@ -46,5 +46,6 @@
 "Language" => "Lenga",
 "Help translate" => "Ajuda a la revirada",
 "Create" => "Crea",
-"Other" => "Autres"
+"Other" => "Autres",
+"Username" => "Non d'usancièr"
 );
diff --git a/settings/l10n/pl.php b/settings/l10n/pl.php
index ec99000b4d964235af4ad4d0a73df171306ab261..d5f4f5a155e531666697b875cefd0f7d8cdeaf59 100644
--- a/settings/l10n/pl.php
+++ b/settings/l10n/pl.php
@@ -98,13 +98,14 @@
 "Language" => "Język",
 "Help translate" => "Pomóż w tłumaczeniu",
 "WebDAV" => "WebDAV",
-"Use this address to connect to your ownCloud in your file manager" => "Użyj tego adresu aby podłączyć zasób ownCloud w menedżerze plików",
 "Login Name" => "Login",
 "Create" => "Utwórz",
 "Admin Recovery Password" => "Odzyskiwanie hasła administratora",
+"Enter the recovery password in order to recover the users files during password change" => "Wpisz hasło odzyskiwania, aby odzyskać pliki użytkowników podczas zmiany hasła",
 "Default Storage" => "Magazyn domyślny",
 "Unlimited" => "Bez limitu",
 "Other" => "Inne",
+"Username" => "Nazwa użytkownika",
 "Storage" => "Magazyn",
 "change display name" => "zmień wyświetlaną nazwę",
 "set new password" => "ustaw nowe hasło",
diff --git a/settings/l10n/pt_BR.php b/settings/l10n/pt_BR.php
index 2ffa32f603cd4085575253e1ca81a7ff9cf9c682..9a900cbd5af9b5ab13f67d964c3d79aded795838 100644
--- a/settings/l10n/pt_BR.php
+++ b/settings/l10n/pt_BR.php
@@ -98,7 +98,6 @@
 "Language" => "Idioma",
 "Help translate" => "Ajude a traduzir",
 "WebDAV" => "WebDAV",
-"Use this address to connect to your ownCloud in your file manager" => "Usar este endereço para conectar-se ao seu ownCloud no seu gerenciador de arquivos",
 "Login Name" => "Nome de Login",
 "Create" => "Criar",
 "Admin Recovery Password" => "Recuperação da Senha do Administrador",
@@ -106,6 +105,7 @@
 "Default Storage" => "Armazenamento Padrão",
 "Unlimited" => "Ilimitado",
 "Other" => "Outro",
+"Username" => "Nome de Usuário",
 "Storage" => "Armazenamento",
 "change display name" => "alterar nome de exibição",
 "set new password" => "definir nova senha",
diff --git a/settings/l10n/pt_PT.php b/settings/l10n/pt_PT.php
index b810d51a2e261795417186caa2356c44ef79a4ff..1390cd16be5301dbcbca343f39cc2e4aae892ae1 100644
--- a/settings/l10n/pt_PT.php
+++ b/settings/l10n/pt_PT.php
@@ -98,7 +98,6 @@
 "Language" => "Idioma",
 "Help translate" => "Ajude a traduzir",
 "WebDAV" => "WebDAV",
-"Use this address to connect to your ownCloud in your file manager" => "Use este endereço no seu gestor de ficheiros para ligar à sua ownCloud",
 "Login Name" => "Nome de utilizador",
 "Create" => "Criar",
 "Admin Recovery Password" => "Recuperar password de administrador",
@@ -106,6 +105,7 @@
 "Default Storage" => "Armazenamento Padrão",
 "Unlimited" => "Ilimitado",
 "Other" => "Outro",
+"Username" => "Nome de utilizador",
 "Storage" => "Armazenamento",
 "change display name" => "modificar nome exibido",
 "set new password" => "definir nova palavra-passe",
diff --git a/settings/l10n/ro.php b/settings/l10n/ro.php
index 99fb14b4dff1ab816f1f11a91cd5547e4568dabd..5fced879701a526172122b8ff00f01ea0b478fc2 100644
--- a/settings/l10n/ro.php
+++ b/settings/l10n/ro.php
@@ -1,6 +1,8 @@
 <?php $TRANSLATIONS = array(
-"Unable to load list from App Store" => "Imposibil de încărcat lista din App Store",
+"Unable to load list from App Store" => "Imposibil de actualizat lista din  App Store.",
 "Authentication error" => "Eroare la autentificare",
+"Your display name has been changed." => "Numele afiÅŸat a fost schimbat.",
+"Unable to change display name" => "Imposibil de schimbat numele afiÅŸat.",
 "Group already exists" => "Grupul există deja",
 "Unable to add group" => "Nu s-a putut adăuga grupul",
 "Could not enable app. " => "Nu s-a putut activa aplicația.",
@@ -13,18 +15,38 @@
 "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",
+"Couldn't update app." => "Aplicaţia nu s-a putut actualiza.",
+"Update to {appversion}" => "Actualizat la {versiuneaaplicaţiei}",
 "Disable" => "Dezactivați",
 "Enable" => "Activare",
+"Please wait...." => "Aşteptaţi vă rog....",
 "Error" => "Eroare",
+"Updating...." => "Actualizare în curs....",
+"Error while updating app" => "Eroare în timpul actualizării aplicaţiei",
+"Updated" => "Actualizat",
 "Saving..." => "Se salvează...",
 "deleted" => "șters",
 "undo" => "Anulează ultima acțiune",
+"Unable to remove user" => "Imposibil de eliminat utilizatorul",
 "Groups" => "Grupuri",
 "Group Admin" => "Grupul Admin ",
 "Delete" => "Șterge",
+"add group" => "adăugaţi grupul",
+"A valid username must be provided" => "Trebuie să furnizaţi un nume de utilizator valid",
+"Error creating user" => "Eroare la crearea utilizatorului",
+"A valid password must be provided" => "Trebuie să furnizaţi o parolă validă",
 "__language_name__" => "_language_name_",
 "Security Warning" => "Avertisment de securitate",
 "Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Directorul tău de date și fișierele tale probabil sunt accesibile prin internet. Fișierul .htaccess oferit de ownCloud nu funcționează. Îți recomandăm să configurezi server-ul tău web într-un mod în care directorul de date să nu mai fie accesibil sau mută directorul de date în afara directorului root al server-ului web.",
+"Setup Warning" => "Atenţie la implementare",
+"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Serverul de web nu este încă setat corespunzător pentru a permite sincronizarea fișierelor deoarece interfața WebDAV pare a fi întreruptă.",
+"Please double check the <a href='%s'>installation guides</a>." => "Vă rugăm să verificați <a href='%s'>ghiduri de instalare</ a>.",
+"Module 'fileinfo' missing" => "Modulul \"Fileinfo\" lipsește",
+"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "Modulul PHP \"Fileinfo\" lipsește. Va recomandam sa activaţi acest modul pentru a obține cele mai bune rezultate cu detectarea mime-type.",
+"Locale not working" => "Localizarea nu funcționează",
+"This ownCloud server can't set system locale to %s. This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support %s." => "Acest server ownCloud nu poate seta sistemul de localizare pentru% s. Acest lucru înseamnă că ar putea exista probleme cu anumite caractere în numele de fișiere. Vă recomandăm să instalați pachetele necesare pe sistemul dumneavoastră pentru a sprijini% s.",
+"Internet connection not working" => "Conexiunea la internet nu funcționează",
+"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." => "Acest server ownCloud nu are nici o conexiune la internet activă. Acest lucru înseamnă că anumite caracteristici, cum ar fi montarea mediilor de stocare externe, notificări despre actualizări sau instalarea de aplicatii tereţe nu funcționează. Accesarea fișierelor de la distanță și trimiterea de e-mailuri de notificare s-ar putea, de asemenea, să nu funcționeze. Vă sugerăm să permiteţi conectarea la Internet pentru acest server, dacă doriți să aveți toate caracteristicile de oferite de ownCloud.",
 "Cron" => "Cron",
 "Execute one task with each page loaded" => "Execută o sarcină la fiecare pagină încărcată",
 "cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "cron.php este înregistrat în serviciul webcron. Accesează pagina cron.php din root-ul owncloud odată pe minut prin http.",
@@ -38,6 +60,7 @@
 "Allow users to share items shared with them again" => "Permite utilizatorilor să repartajeze fișiere partajate cu ei",
 "Allow users to share with anyone" => "Permite utilizatorilor să partajeze cu oricine",
 "Allow users to only share with users in their groups" => "Permite utilizatorilor să partajeze doar cu utilizatori din același grup",
+"Security" => "Securitate",
 "Log" => "Jurnal de activitate",
 "Log level" => "Nivel jurnal",
 "More" => "Mai mult",
@@ -70,11 +93,11 @@
 "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",
 "Create" => "Crează",
 "Default Storage" => "Stocare implicită",
 "Unlimited" => "Nelimitată",
 "Other" => "Altele",
+"Username" => "Nume utilizator",
 "Storage" => "Stocare",
 "Default" => "Implicită"
 );
diff --git a/settings/l10n/ru.php b/settings/l10n/ru.php
index 3d852d3b20b8a7679a325ec879075e4e8e97a9e0..d2c9425c7aac2a18b1d44b355bf6716bccd3761d 100644
--- a/settings/l10n/ru.php
+++ b/settings/l10n/ru.php
@@ -1,5 +1,5 @@
 <?php $TRANSLATIONS = array(
-"Unable to load list from App Store" => "Загрузка из App Store запрещена",
+"Unable to load list from App Store" => "Не удалось загрузить список из App Store",
 "Authentication error" => "Ошибка аутентификации",
 "Your display name has been changed." => "Ваше отображаемое имя было изменено.",
 "Unable to change display name" => "Невозможно изменить отображаемое имя",
@@ -19,10 +19,10 @@
 "Update to {appversion}" => "Обновить до {версия приложения}",
 "Disable" => "Выключить",
 "Enable" => "Включить",
-"Please wait...." => "Повремени...",
+"Please wait...." => "Подождите...",
 "Error" => "Ошибка",
 "Updating...." => "Обновление...",
-"Error while updating app" => "Ошибка в процессе обновления приложения",
+"Error while updating app" => "Ошибка при обновлении приложения",
 "Updated" => "Обновлено",
 "Saving..." => "Сохранение...",
 "deleted" => "удален",
@@ -32,30 +32,30 @@
 "Group Admin" => "Группа Администраторы",
 "Delete" => "Удалить",
 "add group" => "добавить группу",
-"A valid username must be provided" => "Предоставте подходящее имя пользователя",
+"A valid username must be provided" => "Укажите правильное имя пользователя",
 "Error creating user" => "Ошибка создания пользователя",
-"A valid password must be provided" => "Предоставте подходящий пароль",
+"A valid password must be provided" => "Укажите валидный пароль",
 "__language_name__" => "Русский ",
 "Security Warning" => "Предупреждение безопасности",
-"Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Ваши каталоги данных и файлы, вероятно, доступны из Интернета. Файл .htaccess, предоставляемый ownCloud, не работает. Мы настоятельно рекомендуем Вам настроить вебсервер таким образом, чтобы каталоги данных больше не были доступны, или переместить их за пределы корневого каталога документов веб-сервера.",
+"Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Ваш каталог с данными и файлы, вероятно, доступны из интернета. Файл .htaccess, предоставляемый ownCloud, не работает. Мы настоятельно рекомендуем настроить веб-сервер таким образом, чтобы каталоги данных больше не были доступны, или переместить их за пределы корневого каталога документов веб-сервера.",
 "Setup Warning" => "Предупреждение установки",
-"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Ваш веб сервер до сих пор не настроен правильно для возможности синхронизации файлов, похоже что проблема в неисправности интерфейса WebDAV.",
+"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Веб-сервер до сих пор не настроен для возможности синхронизации файлов. Похоже что проблема в неисправности интерфейса WebDAV.",
 "Please double check the <a href='%s'>installation guides</a>." => "Пожалуйста, дважды просмотрите <a href='%s'>инструкции по установке</a>.",
-"Module 'fileinfo' missing" => "Модуль 'fileinfo' потерян",
-"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "PHP модуль 'fileinfo' потерян. Мы настоятельно рекомендуем включить этот модуль для получения лучших результатов в mime-типе обнаружения.",
+"Module 'fileinfo' missing" => "Модуль 'fileinfo' отсутствует",
+"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "PHP модуль 'fileinfo' отсутствует. Мы настоятельно рекомендуем включить этот модуль для улучшения определения типов (mime-type) файлов.",
 "Locale not working" => "Локализация не работает",
 "This ownCloud server can't set system locale to %s. This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support %s." => "Этот сервер ownCloud не может установить язык системы на %s. Это означает, что могут быть проблемы с некоторыми символами в именах файлов. Мы настоятельно рекомендуем установить необходимые пакеты в вашей системе для поддержки %s.",
-"Internet connection not working" => "Интернет соединение не работает",
-"This ownCloud server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features of ownCloud." => "Этот сервер ownCloud не имеет ни одного рабочего интернет соединения. Это значит, что некоторые возможности, такие как монтаж внешних носителей, уведомления о обновлениях или установки 3го рода приложений,не работают.",
-"Cron" => "Демон",
+"Internet connection not working" => "Интернет-соединение не работает",
+"This ownCloud server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features of ownCloud." => "Этот сервер ownCloud не имеет рабочего интернет-соединения. Это значит, что некоторые возможности отключены, например: подключение внешних носителей, уведомления об обновлениях, установка сторонних приложений.",
+"Cron" => "Планировщик задач по расписанию",
 "Execute one task with each page loaded" => "Выполнять одно задание с каждой загруженной страницей",
-"cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "cron.php зарегистрирован на webcron сервисе. Вызов страницы cron.php в корне owncloud раз в минуту через http.",
-"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "Использование системной службы cron. Вызов файла cron.php в папке owncloud через систему cronjob раз в минуту.",
+"cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "Зарегистрировать cron.php в службе webcron сервисе. Вызывает страницу cron.php в корне owncloud раз в минуту через http.",
+"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "Использовать системную службу cron. Вызов файла cron.php в папке owncloud через систему cronjob раз в минуту.",
 "Sharing" => "Общий доступ",
 "Enable Share API" => "Включить API общего доступа",
-"Allow apps to use the Share API" => "Позволить программам использовать API общего доступа",
+"Allow apps to use the Share API" => "Позволить приложениям использовать API общего доступа",
 "Allow links" => "Разрешить ссылки",
-"Allow users to share items to the public with links" => "Разрешить пользователям открывать в общий доступ эллементы с публичной ссылкой",
+"Allow users to share items to the public with links" => "Разрешить пользователям открывать в общий доступ элементы с публичной ссылкой",
 "Allow resharing" => "Разрешить переоткрытие общего доступа",
 "Allow users to share items shared with them again" => "Позволить пользователям открывать общий доступ к эллементам уже открытым в общий доступ",
 "Allow users to share with anyone" => "Разрешить пользователя делать общий доступ любому",
@@ -98,15 +98,16 @@
 "Language" => "Язык",
 "Help translate" => "Помочь с переводом",
 "WebDAV" => "WebDAV",
-"Use this address to connect to your ownCloud in your file manager" => "Используйте этот URL для подключения файлового менеджера к Вашему хранилищу",
 "Login Name" => "Имя пользователя",
 "Create" => "Создать",
 "Admin Recovery Password" => "Восстановление Пароля Администратора",
+"Enter the recovery password in order to recover the users files during password change" => "Введите пароль для того, чтобы восстановить файлы пользователей при смене пароля",
 "Default Storage" => "Хранилище по-умолчанию",
 "Unlimited" => "Неограниченно",
 "Other" => "Другое",
+"Username" => "Имя пользователя",
 "Storage" => "Хранилище",
 "change display name" => "изменить отображаемое имя",
 "set new password" => "установить новый пароль",
-"Default" => "По-умолчанию"
+"Default" => "По умолчанию"
 );
diff --git a/settings/l10n/si_LK.php b/settings/l10n/si_LK.php
index 4303b14c37ec2e6e3167821aa25b088f6ca25041..5fa1eaf5f43cc2f86c5d7169799f796cf13f387e 100644
--- a/settings/l10n/si_LK.php
+++ b/settings/l10n/si_LK.php
@@ -47,5 +47,6 @@
 "Language" => "භාෂාව",
 "Help translate" => "පරිවර්ථන සහය",
 "Create" => "තනන්න",
-"Other" => "වෙනත්"
+"Other" => "වෙනත්",
+"Username" => "පරිශීලක නම"
 );
diff --git a/settings/l10n/sk_SK.php b/settings/l10n/sk_SK.php
index 595a75833a34956e2f9ce2125a1f241ee9e519ba..952df66d399cc458a677b27c40138dded28a6d5d 100644
--- a/settings/l10n/sk_SK.php
+++ b/settings/l10n/sk_SK.php
@@ -98,13 +98,15 @@
 "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",
+"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "Použite túto adresu <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">pre prístup k súborom cez WebDAV</a>",
 "Login Name" => "Prihlasovacie meno",
 "Create" => "Vytvoriť",
 "Admin Recovery Password" => "Obnovenie hesla administrátora",
+"Enter the recovery password in order to recover the users files during password change" => "Zadajte heslo pre obnovenie súborov používateľa pri zmene hesla",
 "Default Storage" => "Predvolené úložisko",
 "Unlimited" => "Nelimitované",
 "Other" => "Iné",
+"Username" => "Meno používateľa",
 "Storage" => "Úložisko",
 "change display name" => "zmeniť zobrazované meno",
 "set new password" => "nastaviť nové heslo",
diff --git a/settings/l10n/sl.php b/settings/l10n/sl.php
index 413300abc56de8961344f63e0ad6e4e6c80c6a01..f9b6942b97ef7e7568db84e52d20731ea19cbcd6 100644
--- a/settings/l10n/sl.php
+++ b/settings/l10n/sl.php
@@ -98,12 +98,14 @@
 "Language" => "Jezik",
 "Help translate" => "Sodelujte pri prevajanju",
 "WebDAV" => "WebDAV",
-"Use this address to connect to your ownCloud in your file manager" => "Ta naslov uporabite za povezavo upravljalnika datotek z oblakom ownCloud.",
 "Login Name" => "Prijavno ime",
 "Create" => "Ustvari",
+"Admin Recovery Password" => "Obnovitev administratorjevega gesla",
+"Enter the recovery password in order to recover the users files during password change" => "Vnesite geslo za obnovitev, ki ga boste uporabljali za obnovitev datotek uporabnikov med spremembo gesla",
 "Default Storage" => "Privzeta shramba",
 "Unlimited" => "Neomejeno",
 "Other" => "Drugo",
+"Username" => "Uporabniško ime",
 "Storage" => "Shramba",
 "change display name" => "spremeni prikazano ime",
 "set new password" => "nastavi novo geslo",
diff --git a/settings/l10n/sq.php b/settings/l10n/sq.php
index 03db0cd8fcd4fba4f2c2514082be3366cfe9be0f..c81e58e2fa09280fda68306c3292171862329dcc 100644
--- a/settings/l10n/sq.php
+++ b/settings/l10n/sq.php
@@ -10,5 +10,6 @@
 "Get the apps to sync your files" => "Merrni app-et për sinkronizimin e skedarëve tuaj",
 "Password" => "Kodi",
 "New password" => "Kodi i ri",
-"Email" => "Email-i"
+"Email" => "Email-i",
+"Username" => "Përdoruesi"
 );
diff --git a/settings/l10n/sr.php b/settings/l10n/sr.php
index 8437c054da5e80dfa27778930943506caab27921..1d1bcdddf5f0599b54b8442bf7d401600c76d024 100644
--- a/settings/l10n/sr.php
+++ b/settings/l10n/sr.php
@@ -91,12 +91,12 @@
 "Language" => "Језик",
 "Help translate" => " Помозите у превођењу",
 "WebDAV" => "WebDAV",
-"Use this address to connect to your ownCloud in your file manager" => "Користите ову адресу да се повежете са ownCloud-ом у управљачу датотекама",
 "Login Name" => "Корисничко име",
 "Create" => "Направи",
 "Default Storage" => "Подразумевано складиште",
 "Unlimited" => "Неограничено",
 "Other" => "Друго",
+"Username" => "Корисничко име",
 "Storage" => "Складиште",
 "change display name" => "промени име за приказ",
 "set new password" => "постави нову лозинку",
diff --git a/settings/l10n/sr@latin.php b/settings/l10n/sr@latin.php
index 96190507d5312f6b1f11b9ccc74d5560d3037f5d..8e375a7f23c064099ee67bc1fd6cc0c57e9b2cac 100644
--- a/settings/l10n/sr@latin.php
+++ b/settings/l10n/sr@latin.php
@@ -13,5 +13,6 @@
 "Email" => "E-mail",
 "Language" => "Jezik",
 "Create" => "Napravi",
-"Other" => "Drugo"
+"Other" => "Drugo",
+"Username" => "Korisničko ime"
 );
diff --git a/settings/l10n/sv.php b/settings/l10n/sv.php
index 0eae1907378fb23c36ffc6fd42fa0882119dbeab..567c21999015d1c45fea5ad4cb2db9754f77de39 100644
--- a/settings/l10n/sv.php
+++ b/settings/l10n/sv.php
@@ -98,7 +98,6 @@
 "Language" => "Språk",
 "Help translate" => "Hjälp att översätta",
 "WebDAV" => "WebDAV",
-"Use this address to connect to your ownCloud in your file manager" => "Använd denna adress för att ansluta till ownCloud i din filhanterare",
 "Login Name" => "Inloggningsnamn",
 "Create" => "Skapa",
 "Admin Recovery Password" => "Admin återställningslösenord",
@@ -106,6 +105,7 @@
 "Default Storage" => "Förvald lagring",
 "Unlimited" => "Obegränsad",
 "Other" => "Annat",
+"Username" => "Användarnamn",
 "Storage" => "Lagring",
 "change display name" => "ändra visningsnamn",
 "set new password" => "ange nytt lösenord",
diff --git a/settings/l10n/ta_LK.php b/settings/l10n/ta_LK.php
index 052bb823655caa4a2c1eb775c1a5eac9e913336c..64e9cb85aa7ed03a3d0a0f35145b3884246c3de2 100644
--- a/settings/l10n/ta_LK.php
+++ b/settings/l10n/ta_LK.php
@@ -45,5 +45,6 @@
 "Language" => "மொழி",
 "Help translate" => "மொழிபெயர்க்க உதவி",
 "Create" => "உருவாக்குக",
-"Other" => "மற்றவை"
+"Other" => "மற்றவை",
+"Username" => "பயனாளர் பெயர்"
 );
diff --git a/settings/l10n/te.php b/settings/l10n/te.php
index 8bce394ddfac3f19aa6227af29c9f249ffd9238a..3a85a015205ced09c4e5bc9a889c9f113f8b2bbe 100644
--- a/settings/l10n/te.php
+++ b/settings/l10n/te.php
@@ -4,6 +4,8 @@
 "More" => "మరిన్ని",
 "Password" => "సంకేతపదం",
 "New password" => "కొత్త సంకేతపదం",
+"Email" => "ఈమెయిలు",
 "Your email address" => "మీ ఈమెయిలు చిరునామా",
-"Language" => "భాష"
+"Language" => "భాష",
+"Username" => "వాడుకరి పేరు"
 );
diff --git a/settings/l10n/th_TH.php b/settings/l10n/th_TH.php
index 895e1c3e83e62155888da0195de81383d70e91ff..9725df23c243c716e286b883dd87e82953c334ab 100644
--- a/settings/l10n/th_TH.php
+++ b/settings/l10n/th_TH.php
@@ -77,12 +77,12 @@
 "Language" => "ภาษา",
 "Help translate" => "ช่วยกันแปล",
 "WebDAV" => "WebDAV",
-"Use this address to connect to your ownCloud in your file manager" => "ใช้ที่อยู่นี้เพื่อเชื่อมต่อกับ ownCloud ในโปรแกรมจัดการไฟล์ของคุณ",
 "Login Name" => "ชื่อที่ใช้สำหรับเข้าสู่ระบบ",
 "Create" => "สร้าง",
 "Default Storage" => "พื้นที่จำกัดข้อมูลเริ่มต้น",
 "Unlimited" => "ไม่จำกัดจำนวน",
 "Other" => "อื่นๆ",
+"Username" => "ชื่อผู้ใช้งาน",
 "Storage" => "พื้นที่จัดเก็บข้อมูล",
 "change display name" => "เปลี่ยนชื่อที่ต้องการให้แสดง",
 "set new password" => "ตั้งค่ารหัสผ่านใหม่",
diff --git a/settings/l10n/tr.php b/settings/l10n/tr.php
index 1fcf6ac6c0e516a89d9c33cc96abe406feb29ff3..30b637ab94da48aa90adad09423ca3927dbde0cd 100644
--- a/settings/l10n/tr.php
+++ b/settings/l10n/tr.php
@@ -98,13 +98,13 @@
 "Language" => "Dil",
 "Help translate" => "Çevirilere yardım edin",
 "WebDAV" => "WebDAV",
-"Use this address to connect to your ownCloud in your file manager" => "Bu adresi kullanarak ownCloud 'unuza dosya yöneticinizde bağlanın",
 "Login Name" => "Giriş Adı",
 "Create" => "OluÅŸtur",
 "Admin Recovery Password" => "Yönetici kurtarma parolası",
 "Default Storage" => "Varsayılan Depolama",
 "Unlimited" => "Limitsiz",
 "Other" => "DiÄŸer",
+"Username" => "Kullanıcı Adı",
 "Storage" => "Depolama",
 "change display name" => "ekran adını değiştir",
 "set new password" => "yeni parola belirle",
diff --git a/settings/l10n/ug.php b/settings/l10n/ug.php
index 8e8c17f0d363a38963adce7c5b7acd6558bfb5d3..abed87ef0d419443c9b1989dec2e689d1b92a3ba 100644
--- a/settings/l10n/ug.php
+++ b/settings/l10n/ug.php
@@ -64,6 +64,7 @@
 "Default Storage" => "كۆڭۈلدىكى ساقلىغۇچ",
 "Unlimited" => "چەكسىز",
 "Other" => "باشقا",
+"Username" => "ئىشلەتكۈچى ئاتى",
 "Storage" => "ساقلىغۇچ",
 "change display name" => "كۆرسىتىدىغان ئىسىمنى ئۆزگەرت",
 "set new password" => "يېڭى ئىم تەڭشە",
diff --git a/settings/l10n/uk.php b/settings/l10n/uk.php
index ca5a5d8a0727cc7f01d25d599f304983a142e83d..8b567f3995aa24bd9cbaca5d0528c32964256052 100644
--- a/settings/l10n/uk.php
+++ b/settings/l10n/uk.php
@@ -97,12 +97,12 @@
 "Language" => "Мова",
 "Help translate" => "Допомогти з перекладом",
 "WebDAV" => "WebDAV",
-"Use this address to connect to your ownCloud in your file manager" => "Використовуйте цю адресу для під'єднання до вашого ownCloud у вашому файловому менеджері",
 "Login Name" => "Ім'я Логіну",
 "Create" => "Створити",
 "Default Storage" => "сховище за замовчуванням",
 "Unlimited" => "Необмежено",
 "Other" => "Інше",
+"Username" => "Ім'я користувача",
 "Storage" => "Сховище",
 "change display name" => "змінити зображене ім'я",
 "set new password" => "встановити новий пароль",
diff --git a/settings/l10n/ur_PK.php b/settings/l10n/ur_PK.php
index 02bcb0573271b25e3b1161049ad1defc7e90b922..ce1d425c9703ca19b532c34a8b9a34e4a6e35052 100644
--- a/settings/l10n/ur_PK.php
+++ b/settings/l10n/ur_PK.php
@@ -1,5 +1,6 @@
 <?php $TRANSLATIONS = array(
 "Error" => "ایرر",
 "Password" => "پاسورڈ",
-"New password" => "نیا پاسورڈ"
+"New password" => "نیا پاسورڈ",
+"Username" => "یوزر نیم"
 );
diff --git a/settings/l10n/vi.php b/settings/l10n/vi.php
index d7b4b81e1135b4d51737f4dae285fbd167a7f0b2..4768e9b243e6f2f0a111871f450ec1774a264296 100644
--- a/settings/l10n/vi.php
+++ b/settings/l10n/vi.php
@@ -78,12 +78,12 @@
 "Language" => "Ngôn ngữ",
 "Help translate" => "Hỗ trợ dịch thuật",
 "WebDAV" => "WebDAV",
-"Use this address to connect to your ownCloud in your file manager" => "Sử dụng địa chỉ này để kết nối ownCloud của bạn trong trình quản lý file của bạn",
 "Login Name" => "Tên đăng nhập",
 "Create" => "Tạo",
 "Default Storage" => "Bộ nhớ mặc định",
 "Unlimited" => "Không giới hạn",
 "Other" => "Khác",
+"Username" => "Tên đăng nhập",
 "Storage" => "Bá»™ nhá»›",
 "change display name" => "Thay đổi tên hiển thị",
 "set new password" => "đặt mật khẩu mới",
diff --git a/settings/l10n/zh_CN.GB2312.php b/settings/l10n/zh_CN.GB2312.php
index 67946587e56ef8c010b3feffc34727e3528be565..65a6938c8b6e48b901027c15bb7ec400b82629ee 100644
--- a/settings/l10n/zh_CN.GB2312.php
+++ b/settings/l10n/zh_CN.GB2312.php
@@ -95,12 +95,12 @@
 "Language" => "语言",
 "Help translate" => "帮助翻译",
 "WebDAV" => "WebDAV",
-"Use this address to connect to your ownCloud in your file manager" => "使用此地址来在您的文件管理器中连接您的ownCloud",
 "Login Name" => "登录名",
 "Create" => "新建",
 "Default Storage" => "默认容量",
 "Unlimited" => "无限制",
 "Other" => "其他",
+"Username" => "用户名",
 "Storage" => "容量",
 "change display name" => "更改显示名称",
 "set new password" => "设置新的密码",
diff --git a/settings/l10n/zh_CN.php b/settings/l10n/zh_CN.php
index 248fce04eb2498f9b4e512d7a0794eb430d9617d..7a11845404f40fcf3c8b1b6a4b0b7cfdaf5f0c40 100644
--- a/settings/l10n/zh_CN.php
+++ b/settings/l10n/zh_CN.php
@@ -98,13 +98,14 @@
 "Language" => "语言",
 "Help translate" => "帮助翻译",
 "WebDAV" => "WebDAV",
-"Use this address to connect to your ownCloud in your file manager" => "用该地址来连接文件管理器中的 ownCloud",
 "Login Name" => "登录名称",
 "Create" => "创建",
 "Admin Recovery Password" => "管理恢复密码",
+"Enter the recovery password in order to recover the users files during password change" => "输入恢复密码来在更改密码的时候恢复用户文件",
 "Default Storage" => "默认存储",
 "Unlimited" => "无限",
 "Other" => "其它",
+"Username" => "用户名",
 "Storage" => "存储",
 "change display name" => "修改显示名称",
 "set new password" => "设置新密码",
diff --git a/settings/l10n/zh_HK.php b/settings/l10n/zh_HK.php
index 843a41c9c103fb02f5848388334cc234ac4aca63..8da974627517e40a7cf227d628884a6548eb8cdf 100644
--- a/settings/l10n/zh_HK.php
+++ b/settings/l10n/zh_HK.php
@@ -4,5 +4,6 @@
 "Delete" => "刪除",
 "Password" => "密碼",
 "New password" => "新密碼",
-"Email" => "電郵"
+"Email" => "電郵",
+"Username" => "用戶名稱"
 );
diff --git a/settings/l10n/zh_TW.php b/settings/l10n/zh_TW.php
index ae52b17086785c569071041906fcab2862ed6499..8bdfc37b2bacb87bbaec313302861e67eabcaf54 100644
--- a/settings/l10n/zh_TW.php
+++ b/settings/l10n/zh_TW.php
@@ -98,13 +98,13 @@
 "Language" => "語言",
 "Help translate" => "幫助翻譯",
 "WebDAV" => "WebDAV",
-"Use this address to connect to your ownCloud in your file manager" => "在您的檔案管理員中使用這個地址來連線到 ownCloud",
 "Login Name" => "登入名稱",
 "Create" => "建立",
 "Admin Recovery Password" => "管理者復原密碼",
 "Default Storage" => "預設儲存區",
 "Unlimited" => "無限制",
 "Other" => "其他",
+"Username" => "使用者名稱",
 "Storage" => "儲存區",
 "change display name" => "修改顯示名稱",
 "set new password" => "設定新密碼",
diff --git a/settings/personal.php b/settings/personal.php
index cb411cacc5b218f5c6877cf0c35028a642873af6..2c0b4b9e33fc665198f3513d6bdbf111a59fd24e 100644
--- a/settings/personal.php
+++ b/settings/personal.php
@@ -8,6 +8,8 @@
 OC_Util::checkLoggedIn();
 OC_App::loadApps();
 
+$defaults = new OC_Defaults(); // initialize themable default strings and urls
+
 // Highlight navigation entry
 OC_Util::addScript( 'settings', 'personal' );
 OC_Util::addStyle( 'settings', 'settings' );
@@ -60,7 +62,7 @@ usort( $languages, function ($a, $b) {
 
 //links to clients
 $clients = array(
-	'desktop' => OC_Config::getValue('customclient_desktop', OC_Defaults::getSyncClientUrl()),
+	'desktop' => OC_Config::getValue('customclient_desktop', $defaults->getSyncClientUrl()),
 	'android' => OC_Config::getValue('customclient_android', 'https://play.google.com/store/apps/details?id=com.owncloud.android'),
 	'ios'     => OC_Config::getValue('customclient_ios', 'https://itunes.apple.com/us/app/owncloud/id543672169?mt=8')
 );
diff --git a/settings/templates/admin.php b/settings/templates/admin.php
index 1ed3f6ef47fffbd5b900af9e889286a19e4e5d0b..4af53a649b89840aff14bf8c4e05eeb16b81b2e7 100644
--- a/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@ -4,6 +4,8 @@
  * See the COPYING-README file.
  */
 $levels = array('Debug', 'Info', 'Warning', 'Error', 'Fatal');
+
+$defaults = new OC_Defaults(); // initialize themable default strings and urls
 ?>
 
 <?php
@@ -230,12 +232,17 @@ endfor;?>
 
 </fieldset>
 
-<fieldset class="personalblock credits-footer">
-<?php if (OC_Util::getEditionString() === ''): ?>
+<fieldset class="personalblock">
 	<legend><strong><?php p($l->t('Version'));?></strong></legend>
-	<strong>ownCloud</strong> <?php p(OC_Util::getVersionString()); ?> <?php p(OC_Util::getEditionString()); ?><br/>
-	<?php print_unescaped($l->t('Developed by the <a href="http://ownCloud.org/contact" target="_blank">ownCloud community</a>, the <a href="https://github.com/owncloud" target="_blank">source code</a> is licensed under the <a href="http://www.gnu.org/licenses/agpl-3.0.html" target="_blank"><abbr title="Affero General Public License">AGPL</abbr></a>.')); ?>
-<?php else: ?>
-    <p>© 2013 <a href="<?php p(OC_Defaults::getBaseUrl()); ?>" target="_blank"><?php p(OC_Defaults::getEntity()); ?></a> – <?php p(OC_Defaults::getSlogan()); ?></p>
+	<strong><?php p($defaults->getName()); ?></strong> <?php p(OC_Util::getVersionString()); ?>
+<?php if (OC_Util::getEditionString() === ''): ?>
+	<p>
+		<?php print_unescaped($l->t('Developed by the <a href="http://ownCloud.org/contact" target="_blank">ownCloud community</a>, the <a href="https://github.com/owncloud" target="_blank">source code</a> is licensed under the <a href="http://www.gnu.org/licenses/agpl-3.0.html" target="_blank"><abbr title="Affero General Public License">AGPL</abbr></a>.')); ?>
+	</p>
 <?php endif; ?>
 </fieldset>
+<fieldset class="personalblock credits-footer">
+<p>
+	<?php print_unescaped($defaults->getShortFooter()); ?>
+</p>
+</fieldset>
diff --git a/settings/templates/apps.php b/settings/templates/apps.php
index 0903b9bd5c429988f4516278e0e688e5776a232b..d60fd82f9175f94b815bb57407cffc0f05787ad3 100644
--- a/settings/templates/apps.php
+++ b/settings/templates/apps.php
@@ -34,7 +34,7 @@
 		class="version"></span><small class="externalapp" style="visibility:hidden;"></small></h3>
 	<span class="score"></span>
 	<p class="description"></p>
-	<img src="" class="preview" />
+	<img src="" class="preview hidden" />
 	<p class="appslink hidden"><a href="#" target="_blank"><?php
 		p($l->t('See application page at apps.owncloud.com'));?></a></p>
 	<p class="license hidden"><?php
diff --git a/settings/templates/personal.php b/settings/templates/personal.php
index a9457399d5dc8004fb76c52a3837b0115b410699..147ad834a9c5c8422d1e23148ff9aeb7386d4f07 100644
--- a/settings/templates/personal.php
+++ b/settings/templates/personal.php
@@ -4,6 +4,7 @@
  * See the COPYING-README file.
  */?>
 
+<?php $defaults = new OC_Defaults(); // initialize themable default strings and urls ?>
 
 <div class="clientsbox">
 	<h2><?php p($l->t('Get the apps to sync your files'));?></h2>
@@ -104,20 +105,22 @@ if($_['passwordChangeSupported']) {
 <fieldset class="personalblock">
 	<legend><strong><?php p($l->t('WebDAV'));?></strong></legend>
 	<code><?php print_unescaped(OC_Helper::linkToRemote('webdav')); ?></code><br />
-	<em><?php p($l->t('Use this address to connect to your ownCloud in your file manager'));?></em>
+	<em><?php print_unescaped($l->t('Use this address to <a href="%s/server/5.0/user_manual/files/files.html" target="_blank">access your Files via WebDAV</a>', array($defaults->getDocBaseUrl())));?></em>
 </fieldset>
 
 <?php foreach($_['forms'] as $form) {
 	print_unescaped($form);
 };?>
 
-<fieldset class="personalblock credits-footer">
-<?php if (OC_Util::getEditionString() === ''): ?>
+<fieldset class="personalblock">
 	<legend><strong><?php p($l->t('Version'));?></strong></legend>
-	<strong>ownCloud</strong> <?php p(OC_Util::getVersionString()); ?>
-	<?php p(OC_Util::getEditionString()); ?> <br />
+	<strong><?php p($defaults->getName()); ?></strong> <?php p(OC_Util::getVersionString()); ?><br/>
+<?php if (OC_Util::getEditionString() === ''): ?>
 	<?php print_unescaped($l->t('Developed by the <a href="http://ownCloud.org/contact" target="_blank">ownCloud community</a>, the <a href="https://github.com/owncloud" target="_blank">source code</a> is licensed under the <a href="http://www.gnu.org/licenses/agpl-3.0.html" target="_blank"><abbr title="Affero General Public License">AGPL</abbr></a>.')); ?>
-<?php else: ?>
-    <p>© 2013 <a href="<?php p(OC_Defaults::getBaseUrl()); ?>" target="_blank"><?php p(OC_Defaults::getEntity()); ?></a> – <?php p(OC_Defaults::getSlogan()); ?></p>
 <?php endif; ?>
 </fieldset>
+<fieldset class="personalblock credits-footer">
+<p>
+	<?php print_unescaped($defaults->getShortFooter()); ?>
+</p>
+</fieldset>
diff --git a/settings/templates/users.php b/settings/templates/users.php
index b0637814f5de533df5b87f676b6e7df6fedb4eee..9fcc11ab89a4bf680d170ec54eb1d2605935fa1a 100644
--- a/settings/templates/users.php
+++ b/settings/templates/users.php
@@ -81,7 +81,7 @@ $_['subadmingroups'] = array_flip($items);
 <table class="hascontrols" data-groups="<?php p(implode(', ', $allGroups));?>">
 	<thead>
 		<tr>
-			<th id='headerName'><?php p($l->t('Login Name'))?></th>
+			<th id='headerName'><?php p($l->t('Username'))?></th>
 			<th id="headerDisplayName"><?php p($l->t( 'Display Name' )); ?></th>
 			<th id="headerPassword"><?php p($l->t( 'Password' )); ?></th>
 			<th id="headerGroups"><?php p($l->t( 'Groups' )); ?></th>
diff --git a/tests/data/db_structure2.xml b/tests/data/db_structure2.xml
index fc6fe0bba7d513d14e997fc97631f3bc85d6a79b..6f12f81f477d94cb7a118288d9a41c0285f0ccdc 100644
--- a/tests/data/db_structure2.xml
+++ b/tests/data/db_structure2.xml
@@ -49,8 +49,9 @@
 
    <field>
     <name>description</name>
-    <type>clob</type>
+    <type>text</type>
     <notnull>false</notnull>
+    <length>1024</length>
    </field>
 
    <field>
diff --git a/tests/lib/archive/tar.php b/tests/lib/archive/tar.php
index e66a87408790590fccaeff81f8b6d95efbf01e04..d831487b16fae3e83e1992717a7687a7d040ba28 100644
--- a/tests/lib/archive/tar.php
+++ b/tests/lib/archive/tar.php
@@ -10,6 +10,12 @@ require_once 'archive.php';
 
 if (!OC_Util::runningOnWindows()) {
 class Test_Archive_TAR extends Test_Archive {
+	public function setUp() {
+		if (floatval(phpversion())>=5.5) {
+			$this->markTestSkipped('php 5.5 changed unpack function.');
+			return;
+		}
+	}
 	protected function getExisting() {
 		$dir = OC::$SERVERROOT . '/tests/data';
 		return new OC_Archive_TAR($dir . '/data.tar.gz');
diff --git a/tests/lib/backgroundjob/timedjob.php b/tests/lib/backgroundjob/timedjob.php
index 0af933afef873adea45a7e3bfb84557ccac433fa..f3c3eb4d0ddbbeddb618c34b73a975ff77631fc3 100644
--- a/tests/lib/backgroundjob/timedjob.php
+++ b/tests/lib/backgroundjob/timedjob.php
@@ -41,6 +41,7 @@ class TimedJob extends \PHPUnit_Framework_TestCase {
 			$this->fail("job should have run");
 		} catch (JobRun $e) {
 		}
+		$this->assertTrue(true);
 	}
 
 	public function testShouldNotRunWithinInterval() {
@@ -50,6 +51,7 @@ class TimedJob extends \PHPUnit_Framework_TestCase {
 		} catch (JobRun $e) {
 			$this->fail("job should not have run");
 		}
+		$this->assertTrue(true);
 	}
 
 	public function testShouldNotTwice() {
@@ -64,5 +66,6 @@ class TimedJob extends \PHPUnit_Framework_TestCase {
 				$this->fail("job should not have run the second time");
 			}
 		}
+		$this->assertTrue(true);
 	}
 }
diff --git a/tests/lib/db.php b/tests/lib/db.php
index afbdb413c3d7e61e64adcad3b7a2588d8cf98c6a..69e3542f9263f4a29cdf2b309cdb014fb6089464 100644
--- a/tests/lib/db.php
+++ b/tests/lib/db.php
@@ -40,7 +40,7 @@ class Test_DB extends PHPUnit_Framework_TestCase {
 		$this->assertFalse((bool)$row); //PDO returns false, MDB2 returns null
 		$query = OC_DB::prepare('INSERT INTO `*PREFIX*'.$this->table2.'` (`fullname`,`uri`) VALUES (?,?)');
 		$result = $query->execute(array('fullname test', 'uri_1'));
-		$this->assertTrue((bool)$result);
+		$this->assertEquals(1, $result);
 		$query = OC_DB::prepare('SELECT `fullname`,`uri` FROM `*PREFIX*'.$this->table2.'` WHERE `uri` = ?');
 		$result = $query->execute(array('uri_1'));
 		$this->assertTrue((bool)$result);
@@ -57,7 +57,7 @@ class Test_DB extends PHPUnit_Framework_TestCase {
 	public function testNOW() {
 		$query = OC_DB::prepare('INSERT INTO `*PREFIX*'.$this->table2.'` (`fullname`,`uri`) VALUES (NOW(),?)');
 		$result = $query->execute(array('uri_2'));
-		$this->assertTrue((bool)$result);
+		$this->assertEquals(1, $result);
 		$query = OC_DB::prepare('SELECT `fullname`,`uri` FROM `*PREFIX*'.$this->table2.'` WHERE `uri` = ?');
 		$result = $query->execute(array('uri_2'));
 		$this->assertTrue((bool)$result);
@@ -66,7 +66,7 @@ class Test_DB extends PHPUnit_Framework_TestCase {
 	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((bool)$result);
+		$this->assertEquals(1, $result);
 		$query = OC_DB::prepare('SELECT `fullname`,`uri` FROM `*PREFIX*'.$this->table2.'` WHERE `uri` = ?');
 		$result = $query->execute(array('uri_3'));
 		$this->assertTrue((bool)$result);
@@ -74,11 +74,11 @@ class Test_DB extends PHPUnit_Framework_TestCase {
 
 	public function testinsertIfNotExist() {
 		$categoryentries = array(
-				array('user' => 'test', 'type' => 'contact', 'category' => 'Family'),
-				array('user' => 'test', 'type' => 'contact', 'category' => 'Friends'),
-				array('user' => 'test', 'type' => 'contact', 'category' => 'Coworkers'),
-				array('user' => 'test', 'type' => 'contact', 'category' => 'Coworkers'),
-				array('user' => 'test', 'type' => 'contact', 'category' => 'School'),
+				array('user' => 'test', 'type' => 'contact', 'category' => 'Family',    'expectedResult' => 1),
+				array('user' => 'test', 'type' => 'contact', 'category' => 'Friends',   'expectedResult' => 1),
+				array('user' => 'test', 'type' => 'contact', 'category' => 'Coworkers', 'expectedResult' => 1),
+				array('user' => 'test', 'type' => 'contact', 'category' => 'Coworkers', 'expectedResult' => 0),
+				array('user' => 'test', 'type' => 'contact', 'category' => 'School',    'expectedResult' => 1),
 			);
 
 		foreach($categoryentries as $entry) {
@@ -88,13 +88,13 @@ class Test_DB extends PHPUnit_Framework_TestCase {
 					'type' => $entry['type'],
 					'category' => $entry['category'],
 				));
-			$this->assertTrue((bool)$result);
+			$this->assertEquals($entry['expectedResult'], $result);
 		}
 
 		$query = OC_DB::prepare('SELECT * FROM `*PREFIX*'.$this->table3.'`');
 		$result = $query->execute();
 		$this->assertTrue((bool)$result);
-		$this->assertEquals('4', $result->numRows());
+		$this->assertEquals(4, $result->numRows());
 	}
 
 	public function testinsertIfNotExistDontOverwrite() {
@@ -105,14 +105,14 @@ class Test_DB extends PHPUnit_Framework_TestCase {
 		// 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((bool)$result);
+		$this->assertEquals(1, $result);
 		$query = OC_DB::prepare('SELECT `fullname`, `uri`, `carddata` FROM `*PREFIX*'.$this->table2.'` WHERE `uri` = ?');
 		$result = $query->execute(array($uri));
 		$this->assertTrue((bool)$result);
 		$row = $result->fetchRow();
 		$this->assertArrayHasKey('carddata', $row);
 		$this->assertEquals($carddata, $row['carddata']);
-		$this->assertEquals('1', $result->numRows());
+		$this->assertEquals(1, $result->numRows());
 
 		// Try to insert a new row
 		$result = OC_DB::insertIfNotExist('*PREFIX*'.$this->table2,
@@ -120,7 +120,7 @@ class Test_DB extends PHPUnit_Framework_TestCase {
 				'fullname' => $fullname,
 				'uri' => $uri,
 			));
-		$this->assertTrue((bool)$result);
+		$this->assertEquals(0, $result);
 
 		$query = OC_DB::prepare('SELECT `fullname`, `uri`, `carddata` FROM `*PREFIX*'.$this->table2.'` WHERE `uri` = ?');
 		$result = $query->execute(array($uri));
@@ -130,7 +130,7 @@ class Test_DB extends PHPUnit_Framework_TestCase {
 		// Test that previously inserted data isn't overwritten
 		$this->assertEquals($carddata, $row['carddata']);
 		// And that a new row hasn't been inserted.
-		$this->assertEquals('1', $result->numRows());
+		$this->assertEquals(1, $result->numRows());
 
 	}
 }
diff --git a/tests/lib/dbschema.php b/tests/lib/dbschema.php
index 59f203993efc8d845993182c1ed1e9932c8ef64f..c2e55eabf4b6b18026fec3732c135f2d1365cd90 100644
--- a/tests/lib/dbschema.php
+++ b/tests/lib/dbschema.php
@@ -7,9 +7,8 @@
  */
 
 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;
+	protected $schema_file = 'static://test_db_scheme';
+	protected $schema_file2 = 'static://test_db_scheme2';
 	protected $table1;
 	protected $table2;
 
@@ -20,19 +19,20 @@ class Test_DBSchema extends PHPUnit_Framework_TestCase {
 		$r = '_'.OC_Util::generate_random_bytes('4').'_';
 		$content = file_get_contents( $dbfile );
 		$content = str_replace( '*dbprefix*', '*dbprefix*'.$r, $content );
-		file_put_contents( self::$schema_file, $content );
+		file_put_contents( $this->schema_file, $content );
 		$content = file_get_contents( $dbfile2 );
 		$content = str_replace( '*dbprefix*', '*dbprefix*'.$r, $content );
-		file_put_contents( self::$schema_file2, $content );
+		file_put_contents( $this->schema_file2, $content );
 
-		$this->test_prefix = $r;
-		$this->table1 = $this->test_prefix.'cntcts_addrsbks';
-		$this->table2 = $this->test_prefix.'cntcts_cards';
+		$prefix = OC_Config::getValue( "dbtableprefix", "oc_" );
+		
+		$this->table1 = $prefix.$r.'cntcts_addrsbks';
+		$this->table2 = $prefix.$r.'cntcts_cards';
 	}
 
 	public function tearDown() {
-		unlink(self::$schema_file);
-		unlink(self::$schema_file2);
+		unlink($this->schema_file);
+		unlink($this->schema_file2);
 	}
 
 	// everything in one test, they depend on each other
@@ -47,13 +47,13 @@ class Test_DBSchema extends PHPUnit_Framework_TestCase {
 	}
 
 	public function doTestSchemaCreating() {
-		OC_DB::createDbFromStructure(self::$schema_file);
+		OC_DB::createDbFromStructure($this->schema_file);
 		$this->assertTableExist($this->table1);
 		$this->assertTableExist($this->table2);
 	}
 
 	public function doTestSchemaChanging() {
-		OC_DB::updateDbFromStructure(self::$schema_file2);
+		OC_DB::updateDbFromStructure($this->schema_file2);
 		$this->assertTableExist($this->table2);
 	}
 
@@ -66,67 +66,61 @@ class Test_DBSchema extends PHPUnit_Framework_TestCase {
 	}
 
 	public function doTestSchemaRemoving() {
-		OC_DB::removeDBStructure(self::$schema_file);
+		OC_DB::removeDBStructure($this->schema_file);
 		$this->assertTableNotExist($this->table1);
 		$this->assertTableNotExist($this->table2);
 	}
 
 	public function tableExist($table) {
-		$table = '*PREFIX*' . $table;
 
 		switch (OC_Config::getValue( 'dbtype', 'sqlite' )) {
 			case 'sqlite':
 			case 'sqlite3':
 				$sql = "SELECT name FROM sqlite_master "
-				. "WHERE type = 'table' AND name != 'sqlite_sequence' "
-				.  "AND name != 'geometry_columns' AND name != 'spatial_ref_sys' "
-				. "UNION ALL SELECT name FROM sqlite_temp_master "
-				. "WHERE type = 'table' AND name = '".$table."'";
-				$query = OC_DB::prepare($sql);
-				$result = $query->execute(array());
-				$exists = $result && $result->fetchOne();
+					.  "WHERE type = 'table' AND name = ? "
+					.  "UNION ALL SELECT name FROM sqlite_temp_master "
+					.  "WHERE type = 'table' AND name = ?";
+				$result = \OC_DB::executeAudited($sql, array($table, $table));
 				break;
 			case 'mysql':
-				$sql = 'SHOW TABLES LIKE "'.$table.'"';
-				$query = OC_DB::prepare($sql);
-				$result = $query->execute(array());
-				$exists = $result && $result->fetchOne();
+				$sql = 'SHOW TABLES LIKE ?';
+				$result = \OC_DB::executeAudited($sql, array($table));
 				break;
 			case 'pgsql':
-				$sql = "SELECT tablename AS table_name, schemaname AS schema_name "
-					.  "FROM pg_tables WHERE schemaname NOT LIKE 'pg_%' "
-					.  "AND schemaname != 'information_schema' "
-					.  "AND tablename = '".$table."'";
-				$query = OC_DB::prepare($sql);
-				$result = $query->execute(array());
-				$exists = $result && $result->fetchOne();
+				$sql = 'SELECT tablename AS table_name, schemaname AS schema_name '
+					.  'FROM pg_tables WHERE schemaname NOT LIKE \'pg_%\' '
+					.  'AND schemaname != \'information_schema\' '
+					.  'AND tablename = ?';
+				$result = \OC_DB::executeAudited($sql, array($table));
 				break;
 			case 'oci':
-				$sql = 'SELECT table_name FROM user_tables WHERE table_name = ?';
+				$sql = 'SELECT TABLE_NAME FROM USER_TABLES WHERE TABLE_NAME = ?';
 				$result = \OC_DB::executeAudited($sql, array($table));
-				$exists = (bool)$result->fetchOne(); //oracle uses MDB2 and returns null
 				break;
 			case 'mssql':
-				$sql = "SELECT * FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = '{$table}'";
-				$query = OC_DB::prepare($sql);
-				$result = $query->execute(array());
-				$exists = $result && $result->fetchOne();
+				$sql = 'SELECT TABLE_NAME FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = ?';
+				$result = \OC_DB::executeAudited($sql, array($table));
 				break;
 		}
-		return $exists;
+		
+		$name = $result->fetchOne(); //FIXME checking with '$result->numRows() === 1' does not seem to work?
+		if ($name === $table) {
+			return true;
+		} else {
+			return false;
+		}
 	}
 
 	public function assertTableExist($table) {
-		$this->assertTrue($this->tableExist($table));
+		$this->assertTrue($this->tableExist($table), 'Table ' . $table . ' does not exist');
 	}
 
 	public function assertTableNotExist($table) {
 		$type=OC_Config::getValue( "dbtype", "sqlite" );
 		if( $type == 'sqlite' || $type == 'sqlite3' ) {
 			// sqlite removes the tables after closing the DB
-		}
-		else {
-			$this->assertFalse($this->tableExist($table));
+		} else {
+			$this->assertFalse($this->tableExist($table), 'Table ' . $table . ' exists.');
 		}
 	}
 }
diff --git a/tests/lib/files/cache/cache.php b/tests/lib/files/cache/cache.php
index f272655925b6633fdf7a4226f9f70140e8001c63..527c1d1b2a13c84092ab68175393dedb7b5f4698 100644
--- a/tests/lib/files/cache/cache.php
+++ b/tests/lib/files/cache/cache.php
@@ -348,7 +348,9 @@ class Cache extends \PHPUnit_Framework_TestCase {
 	}
 
 	public function tearDown() {
-		$this->cache->clear();
+		if ($this->cache) {
+			$this->cache->clear();
+		}
 	}
 
 	public function setUp() {
diff --git a/tests/lib/files/cache/scanner.php b/tests/lib/files/cache/scanner.php
index 3885c99e6d325121c260547c39ea1cfa02995531..263ceadccc7deeb0497e6fbb92860253b1d2fef7 100644
--- a/tests/lib/files/cache/scanner.php
+++ b/tests/lib/files/cache/scanner.php
@@ -104,7 +104,7 @@ class Scanner extends \PHPUnit_Framework_TestCase {
 		$this->assertNotEquals($cachedDataFolder['size'], -1);
 	}
 
-	function testBackgroundScan(){
+	function testBackgroundScan() {
 		$this->fillTestFolders();
 		$this->storage->mkdir('folder2');
 		$this->storage->file_put_contents('folder2/bar.txt', 'foobar');
@@ -126,6 +126,46 @@ class Scanner extends \PHPUnit_Framework_TestCase {
 		$this->assertFalse($this->cache->getIncomplete());
 	}
 
+	public function testReuseExisting() {
+		$this->fillTestFolders();
+
+		$this->scanner->scan('');
+		$oldData = $this->cache->get('');
+		$this->storage->unlink('folder/bar.txt');
+		$this->cache->put('folder', array('mtime' => $this->storage->filemtime('folder')));
+		$this->scanner->scan('', \OC\Files\Cache\Scanner::SCAN_SHALLOW, \OC\Files\Cache\Scanner::REUSE_SIZE);
+		$newData = $this->cache->get('');
+		$this->assertNotEquals($oldData['etag'], $newData['etag']);
+		$this->assertEquals($oldData['size'], $newData['size']);
+
+		$oldData = $newData;
+		$this->scanner->scan('', \OC\Files\Cache\Scanner::SCAN_SHALLOW, \OC\Files\Cache\Scanner::REUSE_ETAG);
+		$newData = $this->cache->get('');
+		$this->assertEquals($oldData['etag'], $newData['etag']);
+		$this->assertEquals(-1, $newData['size']);
+	}
+
+	public function testRemovedFile() {
+		$this->fillTestFolders();
+
+		$this->scanner->scan('');
+		$this->assertTrue($this->cache->inCache('foo.txt'));
+		$this->storage->unlink('foo.txt');
+		$this->scanner->scan('', \OC\Files\Cache\Scanner::SCAN_SHALLOW);
+		$this->assertFalse($this->cache->inCache('foo.txt'));
+	}
+
+	public function testRemovedFolder() {
+		$this->fillTestFolders();
+
+		$this->scanner->scan('');
+		$this->assertTrue($this->cache->inCache('folder/bar.txt'));
+		$this->storage->unlink('/folder');
+		$this->scanner->scan('', \OC\Files\Cache\Scanner::SCAN_SHALLOW);
+		$this->assertFalse($this->cache->inCache('folder'));
+		$this->assertFalse($this->cache->inCache('folder/bar.txt'));
+	}
+
 	function setUp() {
 		$this->storage = new \OC\Files\Storage\Temporary(array());
 		$this->scanner = new \OC\Files\Cache\Scanner($this->storage);
@@ -133,9 +173,11 @@ class Scanner extends \PHPUnit_Framework_TestCase {
 	}
 
 	function tearDown() {
-		$ids = $this->cache->getAll();
-		$permissionsCache = $this->storage->getPermissionsCache();
-		$permissionsCache->removeMultiple($ids, \OC_User::getUser());
-		$this->cache->clear();
+		if ($this->cache) {
+			$ids = $this->cache->getAll();
+			$permissionsCache = $this->storage->getPermissionsCache();
+			$permissionsCache->removeMultiple($ids, \OC_User::getUser());
+			$this->cache->clear();
+		}
 	}
 }
diff --git a/tests/lib/files/cache/updater.php b/tests/lib/files/cache/updater.php
index dad3cd7e6503cf671375fd1049bc8b7cc3e3f9fa..5d7997b054481219d06867713f6c25d8bfa4b7c3 100644
--- a/tests/lib/files/cache/updater.php
+++ b/tests/lib/files/cache/updater.php
@@ -56,7 +56,7 @@ class Updater extends \PHPUnit_Framework_TestCase {
 		\OC_Hook::connect('OC_Filesystem', 'post_write', '\OC\Files\Cache\Updater', 'writeHook');
 		\OC_Hook::connect('OC_Filesystem', 'post_delete', '\OC\Files\Cache\Updater', 'deleteHook');
 		\OC_Hook::connect('OC_Filesystem', 'post_rename', '\OC\Files\Cache\Updater', 'renameHook');
-
+		\OC_Hook::connect('OC_Filesystem', 'post_touch', '\OC\Files\Cache\Updater', 'touchHook');
 	}
 
 	public function tearDown() {
@@ -69,6 +69,7 @@ class Updater extends \PHPUnit_Framework_TestCase {
 	public function testWrite() {
 		$textSize = strlen("dummy file data\n");
 		$imageSize = filesize(\OC::$SERVERROOT . '/core/img/logo.png');
+		$this->cache->put('foo.txt', array('mtime' => 100));
 		$rootCachedData = $this->cache->get('');
 		$this->assertEquals(3 * $textSize + $imageSize, $rootCachedData['size']);
 
@@ -77,11 +78,9 @@ class Updater extends \PHPUnit_Framework_TestCase {
 		$cachedData = $this->cache->get('foo.txt');
 		$this->assertEquals(3, $cachedData['size']);
 		$this->assertNotEquals($fooCachedData['etag'], $cachedData['etag']);
-		$mtime = $cachedData['mtime'];
 		$cachedData = $this->cache->get('');
 		$this->assertEquals(2 * $textSize + $imageSize + 3, $cachedData['size']);
 		$this->assertNotEquals($rootCachedData['etag'], $cachedData['etag']);
-		$this->assertGreaterThanOrEqual($rootCachedData['mtime'], $mtime);
 		$rootCachedData = $cachedData;
 
 		$this->assertFalse($this->cache->inCache('bar.txt'));
@@ -96,6 +95,27 @@ class Updater extends \PHPUnit_Framework_TestCase {
 		$this->assertGreaterThanOrEqual($rootCachedData['mtime'], $mtime);
 	}
 
+	public function testWriteWithMountPoints() {
+		$storage2 = new \OC\Files\Storage\Temporary(array());
+		$cache2 = $storage2->getCache();
+		Filesystem::mount($storage2, array(), '/' . self::$user . '/files/folder/substorage');
+		$folderCachedData = $this->cache->get('folder');
+		$substorageCachedData = $cache2->get('');
+		Filesystem::file_put_contents('folder/substorage/foo.txt', 'asd');
+		$this->assertTrue($cache2->inCache('foo.txt'));
+		$cachedData = $cache2->get('foo.txt');
+		$this->assertEquals(3, $cachedData['size']);
+		$mtime = $cachedData['mtime'];
+
+		$cachedData = $cache2->get('');
+		$this->assertNotEquals($substorageCachedData['etag'], $cachedData['etag']);
+		$this->assertEquals($mtime, $cachedData['mtime']);
+
+		$cachedData = $this->cache->get('folder');
+		$this->assertNotEquals($folderCachedData['etag'], $cachedData['etag']);
+		$this->assertEquals($mtime, $cachedData['mtime']);
+	}
+
 	public function testDelete() {
 		$textSize = strlen("dummy file data\n");
 		$imageSize = filesize(\OC::$SERVERROOT . '/core/img/logo.png');
@@ -103,7 +123,7 @@ class Updater extends \PHPUnit_Framework_TestCase {
 		$this->assertEquals(3 * $textSize + $imageSize, $rootCachedData['size']);
 
 		$this->assertTrue($this->cache->inCache('foo.txt'));
-		Filesystem::unlink('foo.txt', 'asd');
+		Filesystem::unlink('foo.txt');
 		$this->assertFalse($this->cache->inCache('foo.txt'));
 		$cachedData = $this->cache->get('');
 		$this->assertEquals(2 * $textSize + $imageSize, $cachedData['size']);
@@ -123,6 +143,26 @@ class Updater extends \PHPUnit_Framework_TestCase {
 		$this->assertGreaterThanOrEqual($rootCachedData['mtime'], $cachedData['mtime']);
 	}
 
+	public function testDeleteWithMountPoints() {
+		$storage2 = new \OC\Files\Storage\Temporary(array());
+		$cache2 = $storage2->getCache();
+		Filesystem::mount($storage2, array(), '/' . self::$user . '/files/folder/substorage');
+		Filesystem::file_put_contents('folder/substorage/foo.txt', 'asd');
+		$this->assertTrue($cache2->inCache('foo.txt'));
+		$folderCachedData = $this->cache->get('folder');
+		$substorageCachedData = $cache2->get('');
+		Filesystem::unlink('folder/substorage/foo.txt');
+		$this->assertFalse($cache2->inCache('foo.txt'));
+
+		$cachedData = $cache2->get('');
+		$this->assertNotEquals($substorageCachedData['etag'], $cachedData['etag']);
+		$this->assertGreaterThanOrEqual($substorageCachedData['mtime'], $cachedData['mtime']);
+
+		$cachedData = $this->cache->get('folder');
+		$this->assertNotEquals($folderCachedData['etag'], $cachedData['etag']);
+		$this->assertGreaterThanOrEqual($folderCachedData['mtime'], $cachedData['mtime']);
+	}
+
 	public function testRename() {
 		$textSize = strlen("dummy file data\n");
 		$imageSize = filesize(\OC::$SERVERROOT . '/core/img/logo.png');
@@ -142,4 +182,87 @@ class Updater extends \PHPUnit_Framework_TestCase {
 		$this->assertEquals(3 * $textSize + $imageSize, $cachedData['size']);
 		$this->assertNotEquals($rootCachedData['etag'], $cachedData['etag']);
 	}
+
+	public function testRenameWithMountPoints() {
+		$storage2 = new \OC\Files\Storage\Temporary(array());
+		$cache2 = $storage2->getCache();
+		Filesystem::mount($storage2, array(), '/' . self::$user . '/files/folder/substorage');
+		Filesystem::file_put_contents('folder/substorage/foo.txt', 'asd');
+		$this->assertTrue($cache2->inCache('foo.txt'));
+		$folderCachedData = $this->cache->get('folder');
+		$substorageCachedData = $cache2->get('');
+		$fooCachedData = $cache2->get('foo.txt');
+		Filesystem::rename('folder/substorage/foo.txt', 'folder/substorage/bar.txt');
+		$this->assertFalse($cache2->inCache('foo.txt'));
+		$this->assertTrue($cache2->inCache('bar.txt'));
+		$cachedData = $cache2->get('bar.txt');
+		$this->assertEquals($fooCachedData['fileid'], $cachedData['fileid']);
+		$mtime = $cachedData['mtime'];
+
+		$cachedData = $cache2->get('');
+		$this->assertNotEquals($substorageCachedData['etag'], $cachedData['etag']);
+		// rename can cause mtime change - invalid assert
+//		$this->assertEquals($mtime, $cachedData['mtime']);
+
+		$cachedData = $this->cache->get('folder');
+		$this->assertNotEquals($folderCachedData['etag'], $cachedData['etag']);
+		// rename can cause mtime change - invalid assert
+//		$this->assertEquals($mtime, $cachedData['mtime']);
+	}
+
+	public function testTouch() {
+		$rootCachedData = $this->cache->get('');
+		$fooCachedData = $this->cache->get('foo.txt');
+		Filesystem::touch('foo.txt');
+		$cachedData = $this->cache->get('foo.txt');
+		$this->assertNotEquals($fooCachedData['etag'], $cachedData['etag']);
+		$this->assertGreaterThanOrEqual($fooCachedData['mtime'], $cachedData['mtime']);
+
+		$cachedData = $this->cache->get('');
+		$this->assertNotEquals($rootCachedData['etag'], $cachedData['etag']);
+		$this->assertGreaterThanOrEqual($rootCachedData['mtime'], $cachedData['mtime']);
+		$rootCachedData = $cachedData;
+
+		$time = 1371006070;
+		$barCachedData = $this->cache->get('folder/bar.txt');
+		$folderCachedData = $this->cache->get('folder');
+		Filesystem::touch('folder/bar.txt', $time);
+		$cachedData = $this->cache->get('folder/bar.txt');
+		$this->assertNotEquals($barCachedData['etag'], $cachedData['etag']);
+		$this->assertEquals($time, $cachedData['mtime']);
+
+		$cachedData = $this->cache->get('folder');
+		$this->assertNotEquals($folderCachedData['etag'], $cachedData['etag']);
+		$this->assertEquals($time, $cachedData['mtime']);
+
+		$cachedData = $this->cache->get('');
+		$this->assertNotEquals($rootCachedData['etag'], $cachedData['etag']);
+		$this->assertEquals($time, $cachedData['mtime']);
+	}
+
+	public function testTouchWithMountPoints() {
+		$storage2 = new \OC\Files\Storage\Temporary(array());
+		$cache2 = $storage2->getCache();
+		Filesystem::mount($storage2, array(), '/' . self::$user . '/files/folder/substorage');
+		Filesystem::file_put_contents('folder/substorage/foo.txt', 'asd');
+		$this->assertTrue($cache2->inCache('foo.txt'));
+		$folderCachedData = $this->cache->get('folder');
+		$substorageCachedData = $cache2->get('');
+		$fooCachedData = $cache2->get('foo.txt');
+		$cachedData = $cache2->get('foo.txt');
+		$time = 1371006070;
+		Filesystem::touch('folder/substorage/foo.txt', $time);
+		$cachedData = $cache2->get('foo.txt');
+		$this->assertNotEquals($fooCachedData['etag'], $cachedData['etag']);
+		$this->assertEquals($time, $cachedData['mtime']);
+
+		$cachedData = $cache2->get('');
+		$this->assertNotEquals($substorageCachedData['etag'], $cachedData['etag']);
+		$this->assertEquals($time, $cachedData['mtime']);
+
+		$cachedData = $this->cache->get('folder');
+		$this->assertNotEquals($folderCachedData['etag'], $cachedData['etag']);
+		$this->assertEquals($time, $cachedData['mtime']);
+	}
+
 }
diff --git a/tests/lib/files/mount/mount.php b/tests/lib/files/mount/mount.php
new file mode 100644
index 0000000000000000000000000000000000000000..b057204ad3552929e7f932214e747cf55e6461a2
--- /dev/null
+++ b/tests/lib/files/mount/mount.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * Copyright (c) 2013 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace Test\Files\Mount;
+
+
+use OC\Files\Storage\Loader;
+use OC\Files\Storage\Wrapper\Wrapper;
+
+class Mount extends \PHPUnit_Framework_TestCase {
+	public function testFromStorageObject() {
+		$storage = $this->getMockBuilder('\OC\Files\Storage\Temporary')
+			->disableOriginalConstructor()
+			->getMock();
+		$mount = new \OC\Files\Mount\Mount($storage, '/foo');
+		$this->assertInstanceOf('\OC\Files\Storage\Temporary', $mount->getStorage());
+	}
+
+	public function testFromStorageClassname() {
+		$mount = new \OC\Files\Mount\Mount('\OC\Files\Storage\Temporary', '/foo');
+		$this->assertInstanceOf('\OC\Files\Storage\Temporary', $mount->getStorage());
+	}
+
+	public function testWrapper() {
+		$test = $this;
+		$wrapper = function ($mountPoint, $storage) use (&$test) {
+			$test->assertEquals('/foo/', $mountPoint);
+			$test->assertInstanceOf('\OC\Files\Storage\Storage', $storage);
+			return new Wrapper(array('storage' => $storage));
+		};
+
+		$loader = new Loader();
+		$loader->addStorageWrapper($wrapper);
+
+		$storage = $this->getMockBuilder('\OC\Files\Storage\Temporary')
+			->disableOriginalConstructor()
+			->getMock();
+		$mount = new \OC\Files\Mount\Mount($storage, '/foo', array(), $loader);
+		$this->assertInstanceOf('\OC\Files\Storage\Wrapper\Wrapper', $mount->getStorage());
+	}
+}
diff --git a/tests/lib/files/storage/storage.php b/tests/lib/files/storage/storage.php
index 0e22f26ae838f79c7fe76f8500d1dbf5670006a0..fb3e05e66b3c74380aa9196545cd917d48231708 100644
--- a/tests/lib/files/storage/storage.php
+++ b/tests/lib/files/storage/storage.php
@@ -258,9 +258,21 @@ abstract class Storage extends \PHPUnit_Framework_TestCase {
 		$this->assertEquals(file_get_contents($textFile), $content);
 	}
 
-	public function testTouchCreateFile(){
+	public function testTouchCreateFile() {
 		$this->assertFalse($this->instance->file_exists('foo'));
 		$this->instance->touch('foo');
 		$this->assertTrue($this->instance->file_exists('foo'));
 	}
+
+	public function testRecursiveRmdir() {
+		$this->instance->mkdir('folder');
+		$this->instance->mkdir('folder/bar');
+		$this->instance->file_put_contents('folder/asd.txt', 'foobar');
+		$this->instance->file_put_contents('folder/bar/foo.txt', 'asd');
+		$this->instance->rmdir('folder');
+		$this->assertFalse($this->instance->file_exists('folder/asd.txt'));
+		$this->assertFalse($this->instance->file_exists('folder/bar/foo.txt'));
+		$this->assertFalse($this->instance->file_exists('folder/bar'));
+		$this->assertFalse($this->instance->file_exists('folder'));
+	}
 }
diff --git a/tests/lib/files/storage/wrapper.php b/tests/lib/files/storage/wrapper.php
new file mode 100644
index 0000000000000000000000000000000000000000..2794a0a62631863b3c51d8b25958292218a44884
--- /dev/null
+++ b/tests/lib/files/storage/wrapper.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Copyright (c) 2013 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace Test\Files\Storage;
+
+class Wrapper extends Storage {
+	/**
+	 * @var string tmpDir
+	 */
+	private $tmpDir;
+
+	public function setUp() {
+		$this->tmpDir = \OC_Helper::tmpFolder();
+		$storage = new \OC\Files\Storage\Local(array('datadir' => $this->tmpDir));
+		$this->instance = new \OC\Files\Storage\Wrapper\Wrapper(array('storage' => $storage));
+	}
+
+	public function tearDown() {
+		\OC_Helper::rmdirr($this->tmpDir);
+	}
+}
diff --git a/tests/lib/files/stream/staticstream.php b/tests/lib/files/stream/staticstream.php
new file mode 100644
index 0000000000000000000000000000000000000000..d55086196a005359229e566038a9408be8ebadde
--- /dev/null
+++ b/tests/lib/files/stream/staticstream.php
@@ -0,0 +1,68 @@
+<?php
+/**
+ * Copyright (c) 2013 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace Test\Files\Stream;
+
+class StaticStream extends \PHPUnit_Framework_TestCase {
+
+	private $sourceFile;
+	private $sourceText;
+
+	public function __construct() {
+		$this->sourceFile = \OC::$SERVERROOT . '/tests/data/lorem.txt';
+		$this->sourceText = file_get_contents($this->sourceFile);
+	}
+
+	public function tearDown() {
+		\OC\Files\Stream\StaticStream::clear();
+	}
+
+	public function testContent() {
+		file_put_contents('static://foo', $this->sourceText);
+		$this->assertEquals($this->sourceText, file_get_contents('static://foo'));
+	}
+
+	public function testMultipleFiles() {
+		file_put_contents('static://foo', $this->sourceText);
+		file_put_contents('static://bar', strrev($this->sourceText));
+		$this->assertEquals($this->sourceText, file_get_contents('static://foo'));
+		$this->assertEquals(strrev($this->sourceText), file_get_contents('static://bar'));
+	}
+
+	public function testOverwrite() {
+		file_put_contents('static://foo', $this->sourceText);
+		file_put_contents('static://foo', 'qwerty');
+		$this->assertEquals('qwerty', file_get_contents('static://foo'));
+	}
+
+	public function testIsFile() {
+		$this->assertFalse(is_file('static://foo'));
+		file_put_contents('static://foo', $this->sourceText);
+		$this->assertTrue(is_file('static://foo'));
+	}
+
+	public function testIsDir() {
+		$this->assertFalse(is_dir('static://foo'));
+		file_put_contents('static://foo', $this->sourceText);
+		$this->assertFalse(is_dir('static://foo'));
+	}
+
+	public function testFileType() {
+		file_put_contents('static://foo', $this->sourceText);
+		$this->assertEquals('file', filetype('static://foo'));
+	}
+
+	public function testUnlink() {
+		$this->assertFalse(file_exists('static://foo'));
+		file_put_contents('static://foo', $this->sourceText);
+		$this->assertTrue(file_exists('static://foo'));
+		unlink('static://foo');
+		clearstatcache();
+		$this->assertFalse(file_exists('static://foo'));
+	}
+}
diff --git a/tests/lib/hooks/basicemitter.php b/tests/lib/hooks/basicemitter.php
index f48dc53c5635d1ae1cdf5ca36edcef96c5cfd09a..0eae730d03056f2e159b0dc228301433043511c4 100644
--- a/tests/lib/hooks/basicemitter.php
+++ b/tests/lib/hooks/basicemitter.php
@@ -155,6 +155,8 @@ class BasicEmitter extends \PHPUnit_Framework_TestCase {
 		$this->emitter->listen('Test', 'test', $listener);
 		$this->emitter->removeListener('Test', 'test', $listener);
 		$this->emitter->emitEvent('Test', 'test');
+
+		$this->assertTrue(true);
 	}
 
 	public function testRemoveWildcardListener() {
@@ -168,6 +170,8 @@ class BasicEmitter extends \PHPUnit_Framework_TestCase {
 		$this->emitter->listen('Test', 'test', $listener2);
 		$this->emitter->removeListener('Test', 'test');
 		$this->emitter->emitEvent('Test', 'test');
+
+		$this->assertTrue(true);
 	}
 
 	public function testRemoveWildcardMethod() {
@@ -179,6 +183,8 @@ class BasicEmitter extends \PHPUnit_Framework_TestCase {
 		$this->emitter->removeListener('Test', null, $listener);
 		$this->emitter->emitEvent('Test', 'test');
 		$this->emitter->emitEvent('Test', 'foo');
+
+		$this->assertTrue(true);
 	}
 
 	public function testRemoveWildcardScope() {
@@ -190,6 +196,8 @@ class BasicEmitter extends \PHPUnit_Framework_TestCase {
 		$this->emitter->removeListener(null, 'test', $listener);
 		$this->emitter->emitEvent('Test', 'test');
 		$this->emitter->emitEvent('Bar', 'test');
+
+		$this->assertTrue(true);
 	}
 
 	public function testRemoveWildcardScopeAndMethod() {
@@ -203,6 +211,8 @@ class BasicEmitter extends \PHPUnit_Framework_TestCase {
 		$this->emitter->emitEvent('Test', 'test');
 		$this->emitter->emitEvent('Test', 'foo');
 		$this->emitter->emitEvent('Bar', 'foo');
+
+		$this->assertTrue(true);
 	}
 
 	/**
@@ -219,6 +229,8 @@ class BasicEmitter extends \PHPUnit_Framework_TestCase {
 		$this->emitter->listen('Test', 'test', $listener2);
 		$this->emitter->removeListener('Test', 'test', $listener1);
 		$this->emitter->emitEvent('Test', 'test');
+
+		$this->assertTrue(true);
 	}
 
 	/**
@@ -232,6 +244,8 @@ class BasicEmitter extends \PHPUnit_Framework_TestCase {
 		$this->emitter->listen('Test', 'foo', $listener);
 		$this->emitter->removeListener('Test', 'foo', $listener);
 		$this->emitter->emitEvent('Test', 'test');
+
+		$this->assertTrue(true);
 	}
 
 	/**
@@ -245,6 +259,8 @@ class BasicEmitter extends \PHPUnit_Framework_TestCase {
 		$this->emitter->listen('Bar', 'test', $listener);
 		$this->emitter->removeListener('Bar', 'test', $listener);
 		$this->emitter->emitEvent('Test', 'test');
+
+		$this->assertTrue(true);
 	}
 
 	/**
@@ -257,5 +273,7 @@ class BasicEmitter extends \PHPUnit_Framework_TestCase {
 		$this->emitter->listen('Test', 'test', $listener);
 		$this->emitter->removeListener('Bar', 'test', $listener);
 		$this->emitter->emitEvent('Test', 'test');
+
+		$this->assertTrue(true);
 	}
 }
diff --git a/tests/lib/session/session.php b/tests/lib/session/session.php
index 72dee44e7cb14e4b35f096fba62428c612d52766..9ce11274c840d6b715e9bd621625ec8272b916a3 100644
--- a/tests/lib/session/session.php
+++ b/tests/lib/session/session.php
@@ -44,7 +44,9 @@ abstract class Session extends \PHPUnit_Framework_TestCase {
 	}
 
 	public function testRemoveNonExisting() {
+		$this->assertFalse($this->instance->exists('foo'));
 		$this->instance->remove('foo');
+		$this->assertFalse($this->instance->exists('foo'));
 	}
 
 	public function testNotExistsAfterClear() {
diff --git a/tests/lib/streamwrappers.php b/tests/lib/streamwrappers.php
index c7e51ccfa48560c0f682b5e34198c70170eed0c8..d15b712139db631c2d0a04d2d5c3567c76a0cd14 100644
--- a/tests/lib/streamwrappers.php
+++ b/tests/lib/streamwrappers.php
@@ -33,18 +33,6 @@ class Test_StreamWrappers extends PHPUnit_Framework_TestCase {
 		$this->assertEquals(count($items), count($result));
 	}
 
-	public function testStaticStream() {
-		$sourceFile = OC::$SERVERROOT . '/tests/data/lorem.txt';
-		$staticFile = 'static://test';
-		$this->assertFalse(file_exists($staticFile));
-		file_put_contents($staticFile, file_get_contents($sourceFile));
-		$this->assertTrue(file_exists($staticFile));
-		$this->assertEquals(file_get_contents($sourceFile), file_get_contents($staticFile));
-		unlink($staticFile);
-		clearstatcache();
-		$this->assertFalse(file_exists($staticFile));
-	}
-
 	public function testCloseStream() {
 		//ensure all basic stream stuff works
 		$sourceFile = OC::$SERVERROOT . '/tests/data/lorem.txt';
diff --git a/tests/lib/util.php b/tests/lib/util.php
index 1f253825920cb6860b4ab5c0c549640268dce3b6..9742d57ac7a9ba57d7783966d1b50bdece147908 100644
--- a/tests/lib/util.php
+++ b/tests/lib/util.php
@@ -37,6 +37,12 @@ class Test_Util extends PHPUnit_Framework_TestCase {
 		$result = OC_Util::sanitizeHTML($goodString);
 		$this->assertEquals("This is an harmless string.", $result);
 	}
+	
+	function testEncodePath(){
+		$component = '/§#@test%&^ä/-child';
+		$result = OC_Util::encodePath($component);
+		$this->assertEquals("/%C2%A7%23%40test%25%26%5E%C3%A4/-child", $result);
+	}
 
 	function testGenerate_random_bytes() {
 		$result = strlen(OC_Util::generate_random_bytes(59));
diff --git a/tests/phpunit.xml b/tests/phpunit.xml.dist
similarity index 86%
rename from tests/phpunit.xml
rename to tests/phpunit.xml.dist
index 510c38a3c8bf3bfcf5f87c52b52ce34465df655d..25dfc64cfeb748a9f5f8fbff820c1c8be86ba826 100644
--- a/tests/phpunit.xml
+++ b/tests/phpunit.xml.dist
@@ -15,7 +15,4 @@
 			</exclude>
 		</whitelist>
 	</filter>
-	<listeners>
-		<listener class="PHPUnit_Util_Log_JSON"></listener>
-	</listeners>
 </phpunit>