Merge branch 'master' into routing

Conflicts:
	apps/files/js/filelist.js
	core/js/js.js
	lib/ocs.php

64 files changed, 981 insertions, 233 deletions

diff --git a/core/ajax/share.php b/core/ajax/share.php
index 3ace97d4d02..446d4cc32ec 100644
--- a/core/ajax/share.php
+++ b/core/ajax/share.php
@@ -21,6 +21,8 @@
 require_once '../../lib/base.php';
 
 OC_JSON::checkLoggedIn();
+OCP\JSON::callCheck();
+
 if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['itemSource'])) {
 	switch ($_POST['action']) {
 		case 'share':
@@ -55,6 +57,12 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['itemSo
 				($return) ? OC_JSON::success() : OC_JSON::error();
 			}
 			break;
+		case 'setExpirationDate':
+			if (isset($_POST['date'])) {
+				$return = OCP\Share::setExpirationDate($_POST['itemType'], $_POST['itemSource'], $_POST['date']);
+				($return) ? OC_JSON::success() : OC_JSON::error();
+			}
+			break;
 	}
 } else if (isset($_GET['fetch'])) {
 	switch ($_GET['fetch']) {
@@ -72,7 +80,7 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['itemSo
 					$reshare = false;
 				}
 				if ($_GET['checkShares'] == 'true') {
-					$shares = OCP\Share::getItemShared($_GET['itemType'], $_GET['itemSource']);
+					$shares = OCP\Share::getItemShared($_GET['itemType'], $_GET['itemSource'], OCP\Share::FORMAT_NONE, null, true);
 				} else {
 					$shares = false;
 				}
@@ -82,23 +90,23 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['itemSo
 		case 'getShareWith':
 			if (isset($_GET['search'])) {
 				$shareWith = array();
-				if (OC_App::isEnabled('contacts')) {
-					// TODO Add function to contacts to only get the 'fullname' column to improve performance
-					$ids = OC_Contacts_Addressbook::activeIds();
-					foreach ($ids as $id) {
-						$vcards = OC_Contacts_VCard::all($id);
-						foreach ($vcards as $vcard) {
-							$contact = $vcard['fullname'];
-							if (stripos($contact, $_GET['search']) !== false
-								&& (!isset($_GET['itemShares'])
-								|| !isset($_GET['itemShares'][OCP\Share::SHARE_TYPE_CONTACT])
-								|| !is_array($_GET['itemShares'][OCP\Share::SHARE_TYPE_CONTACT])
-								|| !in_array($contact, $_GET['itemShares'][OCP\Share::SHARE_TYPE_CONTACT]))) {
-								$shareWith[] = array('label' => $contact, 'value' => array('shareType' => 5, 'shareWith' => $vcard['id']));
-							}
-						}
-					}
-				}
+// 				if (OC_App::isEnabled('contacts')) {
+// 					// TODO Add function to contacts to only get the 'fullname' column to improve performance
+// 					$ids = OC_Contacts_Addressbook::activeIds();
+// 					foreach ($ids as $id) {
+// 						$vcards = OC_Contacts_VCard::all($id);
+// 						foreach ($vcards as $vcard) {
+// 							$contact = $vcard['fullname'];
+// 							if (stripos($contact, $_GET['search']) !== false
+// 								&& (!isset($_GET['itemShares'])
+// 								|| !isset($_GET['itemShares'][OCP\Share::SHARE_TYPE_CONTACT])
+// 								|| !is_array($_GET['itemShares'][OCP\Share::SHARE_TYPE_CONTACT])
+// 								|| !in_array($contact, $_GET['itemShares'][OCP\Share::SHARE_TYPE_CONTACT]))) {
+// 								$shareWith[] = array('label' => $contact, 'value' => array('shareType' => 5, 'shareWith' => $vcard['id']));
+// 							}
+// 						}
+// 					}
+// 				}
 				$count = 0;
 				$users = array();
 				$limit = 0;
diff --git a/core/css/share.css b/core/css/share.css
index cccc3585a47..c2fa051b129 100644
--- a/core/css/share.css
+++ b/core/css/share.css
@@ -17,4 +17,6 @@ a.unshare { float:right; display:inline; padding:.3em 0 0 .3em !important; opaci
 a.unshare:hover { opacity:1; }
 #link { border-top:1px solid #ddd; padding-top:0.5em; }
 #dropdown input[type="text"], #dropdown input[type="password"] { width:90%; }
-#linkText, #linkPass { display:none; }
+#linkText, #linkPass, #expiration { display:none; }
+#link #showPassword img { width:12px; padding-left: 0.3em; }
+#link label, #expiration label{ padding-left: 0.5em; }
\ No newline at end of file
diff --git a/core/css/styles.css b/core/css/styles.css
index 488ac48e4b4..7d855556c84 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -143,6 +143,10 @@ a.bookmarklet { background-color: #ddd; border:1px solid #ccc; padding: 5px;padd
 .exception{color: #000000;}
 .exception textarea{width:95%;height: 200px;background:#ffe;border:0;}
 
+.ui-icon-circle-triangle-e{ background-image: url('../img/actions/play-next.svg'); }
+.ui-icon-circle-triangle-w{ background-image: url('../img/actions/play-previous.svg'); }
+.ui-datepicker-prev,.ui-datepicker-next{ border: 1px solid #ddd; background: #ffffff; }
+
 /* ---- DIALOGS ---- */
 #dirtree {width: 100%;}
 #filelist {height: 270px; overflow:scroll; background-color: white; width: 100%;}
@@ -169,3 +173,8 @@ a.bookmarklet { background-color: #ddd; border:1px solid #ccc; padding: 5px;padd
 .arrow.left { left: -13px; bottom: 1.2em; -webkit-transform: rotate(270deg); -moz-transform: rotate(270deg); -o-transform: rotate(270deg); -ms-transform: rotate(270deg); transform: rotate(270deg); }
 .arrow.up { top: -8px; right: 2em; }
 .arrow.down { -webkit-transform: rotate(180deg); -moz-transform: rotate(180deg); -o-transform: rotate(180deg); -ms-transform: rotate(180deg); transform: rotate(180deg); }
+
+/* ---- BREADCRUMB ---- */
+div.crumb { float:left; display:block; background:no-repeat right 0; padding:.75em 1.5em 0 1em; height:2.9em; }
+div.crumb:first-child { padding-left:1em; }
+div.crumb.last { font-weight:bold; }
diff --git a/core/img/actions/clock.png b/core/img/actions/clock.png
new file mode 100644
index 00000000000..671b3f4f0c1
--- /dev/null
+++ b/core/img/actions/clock.png
diff --git a/core/img/actions/clock.svg b/core/img/actions/clock.svg
new file mode 100755
index 00000000000..1821f474df5
--- /dev/null
+++ b/core/img/actions/clock.svg
@@ -0,0 +1,20 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" id="Layer_1" x="0px" y="0px" width="16px" height="16px" viewBox="0 0 100 100" xml:space="preserve">
+<path d="M50,89.836c-23.389,0-42.418-19.027-42.418-42.417C7.582,24.029,26.611,5,50,5c23.389,0,42.418,19.029,42.418,42.419  C92.418,70.809,73.389,89.836,50,89.836z M50,9.912c-20.681,0-37.506,16.826-37.506,37.508c0,20.681,16.826,37.505,37.506,37.505  s37.507-16.824,37.507-37.505C87.507,26.737,70.681,9.912,50,9.912z"/>
+<path d="M50.001,49.875c-0.141,0-0.283-0.011-0.427-0.037c-1.173-0.206-2.03-1.226-2.03-2.419V29.442c0-1.355,1.1-2.456,2.456-2.456  c1.355,0,2.456,1.1,2.456,2.456v4.003l5.431-14.974c0.464-1.274,1.872-1.937,3.146-1.471c1.274,0.462,1.934,1.871,1.471,3.146  l-10.195,28.11C51.952,49.241,51.019,49.875,50.001,49.875z"/>
+<circle cx="49.999" cy="12.956" r="1.617"/>
+<path d="M50,14.778c-1.006,0-1.823-0.817-1.823-1.823c0-1.005,0.817-1.823,1.823-1.823c1.004,0,1.821,0.817,1.821,1.823  C51.821,13.961,51.004,14.778,50,14.778z M50,11.542c-0.779,0-1.414,0.635-1.414,1.413c0,0.779,0.635,1.414,1.414,1.414  s1.412-0.635,1.412-1.414C51.412,12.177,50.779,11.542,50,11.542z"/>
+<circle cx="34.343" cy="20.301" r="1.47"/>
+<path d="M23.617,30.488c0.703,0.409,0.945,1.305,0.537,2.008c-0.405,0.704-1.305,0.947-2.007,0.538  c-0.703-0.403-0.945-1.305-0.539-2.008C22.016,30.325,22.913,30.085,23.617,30.488z"/>
+<circle cx="15.536" cy="47.42" r="1.618"/>
+<path d="M15.536,49.242c-1.006,0-1.823-0.817-1.823-1.823c0.001-1,0.819-1.819,1.823-1.822c1.006,0,1.823,0.817,1.823,1.822  C17.359,48.425,16.542,49.242,15.536,49.242z M15.536,46.006c-0.777,0.003-1.412,0.636-1.414,1.413c0,0.779,0.635,1.414,1.414,1.414  s1.413-0.635,1.413-1.414C16.949,46.641,16.315,46.006,15.536,46.006z"/>
+<path d="M22.147,61.803c0.705-0.406,1.602-0.167,2.007,0.537c0.408,0.703,0.166,1.602-0.537,2.008  c-0.704,0.406-1.604,0.163-2.008-0.537C21.202,63.104,21.447,62.209,22.147,61.803z"/>
+<path d="M33.07,73.803c0.408-0.706,1.305-0.946,2.008-0.537c0.704,0.403,0.945,1.302,0.538,2.005  c-0.405,0.704-1.307,0.947-2.007,0.537C32.904,75.402,32.667,74.507,33.07,73.803z"/>
+<path d="M48.382,81.884c0-0.896,0.725-1.618,1.618-1.618c0.892-0.003,1.618,0.723,1.618,1.618c0,0.892-0.728,1.618-1.618,1.618  C49.104,83.498,48.385,82.775,48.382,81.884z"/>
+<path d="M50,83.706L50,83.706c-1.002-0.003-1.819-0.82-1.823-1.822c0-1.006,0.817-1.823,1.823-1.823  c1.007,0,1.822,0.817,1.822,1.823C51.822,82.889,51.006,83.706,50,83.706z M50.006,80.47c-0.785,0-1.42,0.635-1.42,1.414  c0.003,0.775,0.637,1.41,1.414,1.413c0.78,0,1.413-0.635,1.413-1.413C51.413,81.104,50.782,80.47,50.006,80.47z"/>
+<path d="M64.385,75.271c-0.408-0.703-0.167-1.602,0.537-2.005c0.702-0.409,1.601-0.169,2.008,0.537  c0.406,0.7,0.163,1.603-0.539,2.005C65.686,76.214,64.791,75.971,64.385,75.271z"/>
+<path d="M76.384,64.348c-0.704-0.406-0.945-1.305-0.537-2.008c0.402-0.704,1.301-0.943,2.006-0.537  c0.704,0.402,0.945,1.308,0.539,2.008C77.98,64.511,77.087,64.751,76.384,64.348z"/>
+<path d="M84.464,49.038c-0.896-0.003-1.618-0.726-1.618-1.618c-0.001-0.892,0.723-1.618,1.618-1.618  c0.893-0.003,1.618,0.726,1.618,1.618C86.077,48.315,85.356,49.034,84.464,49.038z"/>
+<path d="M84.464,49.242L84.464,49.242c-1.006-0.003-1.822-0.822-1.822-1.823c-0.002-0.486,0.188-0.943,0.532-1.287  c0.344-0.345,0.803-0.535,1.29-0.535c1.007,0,1.822,0.817,1.822,1.822C86.282,48.422,85.463,49.239,84.464,49.242z M84.471,46.006  c-0.386,0-0.74,0.147-1.008,0.416c-0.267,0.267-0.412,0.621-0.412,0.998c0,0.777,0.635,1.41,1.413,1.414  c0.775-0.003,1.408-0.638,1.413-1.415C85.877,46.641,85.246,46.006,84.471,46.006z"/>
+<path d="M77.853,33.034c-0.705,0.409-1.604,0.166-2.006-0.538c-0.408-0.7-0.168-1.599,0.537-2.008  c0.701-0.406,1.604-0.163,2.008,0.537C78.795,31.732,78.553,32.627,77.853,33.034z"/>
+<path d="M66.93,21.036c-0.407,0.704-1.308,0.943-2.008,0.537c-0.704-0.403-0.945-1.305-0.537-2.008  c0.404-0.703,1.306-0.943,2.006-0.537C67.095,19.437,67.333,20.333,66.93,21.036z"/>
+</svg>
\ No newline at end of file
diff --git a/core/img/actions/lock.png b/core/img/actions/lock.png
new file mode 100644
index 00000000000..511bfa615bb
--- /dev/null
+++ b/core/img/actions/lock.png
diff --git a/core/img/actions/lock.svg b/core/img/actions/lock.svg
new file mode 100755
index 00000000000..8fb039b9e3b
--- /dev/null
+++ b/core/img/actions/lock.svg
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->

+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">

+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"

+	 width="16px" height="16px" viewBox="0 0 71 100" xml:space="preserve">

+<path d="M65.5,45V30c0-16.542-13.458-30-30-30s-30,13.458-30,30v15H0v55h71V45H65.5z M13.5,30c0-12.131,9.869-22,22-22

+	s22,9.869,22,22v15h-44V30z"/>

+</svg>

diff --git a/core/js/js.js b/core/js/js.js
index c392991d456..39a58a24599 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -4,21 +4,20 @@
  * @param text the string to translate
  * @return string
  */
-var OC;
 
 function t(app,text){
-	if( !( app in t.cache )){
+	if( !( t.cache[app] )){
 		$.ajax(OC.filePath('core','ajax','translations.php'),{
 			async:false,//todo a proper sollution for this without sync ajax calls
 			data:{'app': app},
 			type:'POST',
 			success:function(jsondata){
 				t.cache[app] = jsondata.data;
-			},
+			}
 		});
 
 		// Bad answer ...
-		if( !( app in t.cache )){
+		if( !( t.cache[app] )){
 			t.cache[app] = [];
 		}
 	}
@@ -41,7 +40,7 @@ function fileDownloadPath(dir, file) {
 	return OC.filePath('files', 'ajax', 'download.php')+encodeURIComponent('?files='+encodeURIComponent(file)+'&dir='+encodeURIComponent(dir));
 }
 
-OC={
+var OC={
 	PERMISSION_CREATE:4,
 	PERMISSION_READ:1,
 	PERMISSION_UPDATE:2,
@@ -68,9 +67,9 @@ OC={
 	 * @return string
 	 */
 	filePath:function(app,type,file){
-		var isCore=OC.coreApps.indexOf(app)!=-1;
-		var link=OC.webroot;
-		if((file.substring(file.length-3) == 'php' || file.substring(file.length-3) == 'css') && !isCore){
+		var isCore=OC.coreApps.indexOf(app)!==-1,
+			link=OC.webroot;
+		if((file.substring(file.length-3) === 'php' || file.substring(file.length-3) === 'css') && !isCore){
 			link+='/index.php/apps/' + app;
 			if (file != 'index.php') {
 				link+='/';
@@ -79,20 +78,21 @@ OC={
 				}
 				link+= file;
 			}
-		}else if(file.substring(file.length-3) != 'php' && !isCore){
+		}else if(file.substring(file.length-3) !== 'php' && !isCore){
 			link=OC.appswebroots[app];
 			if(type){
 				link+= '/'+type+'/';
 			}
-			if(link.substring(link.length-1) != '/')
+			if(link.substring(link.length-1) !== '/'){
 				link+='/';
+			}
 			link+=file;
 		}else{
 			link+='/';
 			if(!isCore){
 				link+='apps/';
 			}
-			if (app != '') {
+			if (app !== '') {
 				app+='/';
 				link+=app;
 			}
@@ -126,12 +126,12 @@ OC={
 	 * if the script is already loaded, the event handeler will be called directly
 	 */
 	addScript:function(app,script,ready){
-		var path=OC.filePath(app,'js',script+'.js');
+		var deferred, path=OC.filePath(app,'js',script+'.js');
 		if(!OC.addScript.loaded[path]){
 			if(ready){
-				var deferred=$.getScript(path,ready);
+				deferred=$.getScript(path,ready);
 			}else{
-				var deferred=$.getScript(path);
+				deferred=$.getScript(path);
 			}
 			OC.addScript.loaded[path]=deferred;
 		}else{
@@ -148,12 +148,18 @@ OC={
 	 */
 	addStyle:function(app,style){
 		var path=OC.filePath(app,'css',style+'.css');
-		if(OC.addStyle.loaded.indexOf(path)==-1){
+		if(OC.addStyle.loaded.indexOf(path)===-1){
 			OC.addStyle.loaded.push(path);
-			var style=$('<link rel="stylesheet" type="text/css" href="'+path+'"/>');
+			style=$('<link rel="stylesheet" type="text/css" href="'+path+'"/>');
 			$('head').append(style);
 		}
 	},
+	basename: function(path) {
+		return path.replace(/\\/g,'/').replace( /.*\//, '' );
+	},
+	dirname: function(path) {
+		return path.replace(/\\/g,'/').replace(/\/[^\/]*$/, '');
+	},
 	/**
 	 * do a search query and display the results
 	 * @param query the search query
@@ -169,10 +175,9 @@ OC={
 	},
 	dialogs:OCdialogs,
 	mtime2date:function(mtime) {
-		mtime = parseInt(mtime);
+		mtime = parseInt(mtime,10);
 		var date = new Date(1000*mtime);
-		var ret = date.getDate()+'.'+(date.getMonth()+1)+'.'+date.getFullYear()+', '+date.getHours()+':'+date.getMinutes();
-		return ret;
+		return date.getDate()+'.'+(date.getMonth()+1)+'.'+date.getFullYear()+', '+date.getHours()+':'+date.getMinutes();
 	},
 	/**
 	 * Opens a popup with the setting for an app.
@@ -238,31 +243,74 @@ OC.search.lastResults={};
 OC.addStyle.loaded=[];
 OC.addScript.loaded=[];
 
-if(typeof localStorage !='undefined' && localStorage != null){
-	//user and instance awere localstorage
+OC.Breadcrumb={
+	container:null,
+	crumbs:[],
+	push:function(name, link){
+		if(!OC.Breadcrumb.container){//default
+			OC.Breadcrumb.container=$('#controls');
+		}
+		var crumb=$('<div/>');
+		crumb.addClass('crumb').addClass('last');
+		crumb.attr('style','background-image:url("'+OC.imagePath('core','breadcrumb')+'")');
+
+		var crumbLink=$('<a/>');
+		crumbLink.attr('href',link);
+		crumbLink.text(name);
+		crumb.append(crumbLink);
+
+		var existing=OC.Breadcrumb.container.find('div.crumb');
+		if(existing.length){
+			existing.removeClass('last');
+			existing.last().after(crumb);
+		}else{
+			OC.Breadcrumb.container.append(crumb);
+		}
+		OC.Breadcrumb.crumbs.push(crumb);
+		return crumb;
+	},
+	pop:function(){
+		if(!OC.Breadcrumb.container){//default
+			OC.Breadcrumb.container=$('#controls');
+		}
+		OC.Breadcrumb.container.find('div.crumb').last().remove();
+		OC.Breadcrumb.container.find('div.crumb').last().addClass('last');
+		OC.Breadcrumb.crumbs.pop();
+	},
+	clear:function(){
+		if(!OC.Breadcrumb.container){//default
+			OC.Breadcrumb.container=$('#controls');
+		}
+		OC.Breadcrumb.container.find('div.crumb').remove();
+		OC.Breadcrumb.crumbs=[];
+	}
+};
+
+if(typeof localStorage !=='undefined' && localStorage !== null){
+	//user and instance aware localstorage
 	OC.localStorage={
 		namespace:'oc_'+OC.currentUser+'_'+OC.webroot+'_',
 		hasItem:function(name){
-			return OC.localStorage.getItem(name)!=null;
+			return OC.localStorage.getItem(name)!==null;
 		},
 		setItem:function(name,item){
 			return localStorage.setItem(OC.localStorage.namespace+name,JSON.stringify(item));
 		},
 		getItem:function(name){
-			if(localStorage.getItem(OC.localStorage.namespace+name)==null){return null;}
+			if(localStorage.getItem(OC.localStorage.namespace+name)===null){return null;}
 			return JSON.parse(localStorage.getItem(OC.localStorage.namespace+name));
 		}
 	};
 }else{
 	//dummy localstorage
 	OC.localStorage={
-		hasItem:function(name){
+		hasItem:function(){
 			return false;
 		},
-		setItem:function(name,item){
+		setItem:function(){
 			return false;
 		},
-		getItem:function(name){
+		getItem:function(){
 			return null;
 		}
 	};
@@ -274,8 +322,9 @@ if(typeof localStorage !='undefined' && localStorage != null){
 if (!Array.prototype.filter) {
 	Array.prototype.filter = function(fun /*, thisp*/) {
 		var len = this.length >>> 0;
-		if (typeof fun != "function")
+		if (typeof fun !== "function"){
 			throw new TypeError();
+		}
 
 		var res = [];
 		var thisp = arguments[1];
@@ -298,17 +347,16 @@ if (!Array.prototype.indexOf){
 		var len = this.length;
 
 		var from = Number(arguments[1]) || 0;
-		from = (from < 0)
-		? Math.ceil(from)
-		: Math.floor(from);
-		if (from < 0)
+		from = (from < 0) ? Math.ceil(from) : Math.floor(from);
+		if (from < 0){
 			from += len;
+		}
 
 		for (; from < len; from++)
 		{
-			if (from in this &&
-				this[from] === elt)
+			if (from in this && this[from] === elt){
 				return from;
+			}
 		}
 		return -1;
 	};
@@ -329,16 +377,16 @@ SVGSupport.checkMimeType=function(){
 			$.each(headerParts,function(i,text){
 				if(text){
 					var parts=text.split(':',2);
-					if(parts.length==2){
+					if(parts.length===2){
 						var value=parts[1].trim();
-						if(value[0]=='"'){
+						if(value[0]==='"'){
 							value=value.substr(1,value.length-2);
 						}
 						headers[parts[0]]=value;
 					}
 				}
 			});
-			if(headers["Content-Type"]!='image/svg+xml'){
+			if(headers["Content-Type"]!=='image/svg+xml'){
 				replaceSVG();
 				SVGSupport.checkMimeType.correct=false;
 			}
@@ -395,27 +443,29 @@ function object(o) {
  * Fills height of window. (more precise than height: 100%;)
  */
 function fillHeight(selector) {
-	if (selector.length == 0) {
+	if (selector.length === 0) {
 		return;
 	}
 	var height = parseFloat($(window).height())-selector.offset().top;
 	selector.css('height', height + 'px');
-	if(selector.outerHeight() > selector.height())
+	if(selector.outerHeight() > selector.height()){
 		selector.css('height', height-(selector.outerHeight()-selector.height()) + 'px');
+	}
 }
 
 /**
  * Fills height and width of window. (more precise than height: 100%; or width: 100%;)
  */
 function fillWindow(selector) {
-	if (selector.length == 0) {
+	if (selector.length === 0) {
 		return;
 	}
 	fillHeight(selector);
 	var width = parseFloat($(window).width())-selector.offset().left;
 	selector.css('width', width + 'px');
-	if(selector.outerWidth() > selector.width())
+	if(selector.outerWidth() > selector.width()){
 		selector.css('width', width-(selector.outerWidth()-selector.width()) + 'px');
+	}
 }
 
 $(document).ready(function(){
@@ -436,26 +486,26 @@ $(document).ready(function(){
 		event.preventDefault();
 	});
 	$('#searchbox').keyup(function(event){
-		if(event.keyCode==13){//enter
+		if(event.keyCode===13){//enter
 			if(OC.search.currentResult>-1){
 				var result=$('#searchresults tr.result a')[OC.search.currentResult];
 				window.location = $(result).attr('href');
 			}
-		}else if(event.keyCode==38){//up
+		}else if(event.keyCode===38){//up
 			if(OC.search.currentResult>0){
 				OC.search.currentResult--;
 				OC.search.renderCurrent();
 			}
-		}else if(event.keyCode==40){//down
+		}else if(event.keyCode===40){//down
 			if(OC.search.lastResults.length>OC.search.currentResult+1){
 				OC.search.currentResult++;
 				OC.search.renderCurrent();
 			}
-		}else if(event.keyCode==27){//esc
+		}else if(event.keyCode===27){//esc
 			OC.search.hide();
 		}else{
 			var query=$('#searchbox').val();
-			if(OC.search.lastQuery!=query){
+			if(OC.search.lastQuery!==query){
 				OC.search.lastQuery=query;
 				OC.search.currentResult=-1;
 				if(query.length>2){
@@ -475,10 +525,10 @@ $(document).ready(function(){
 	//use infield labels
 	$("label.infield").inFieldLabels();
 
-	checkShowCredentials = function() {
+	var checkShowCredentials = function() {
 		var empty = false;
 		$('input#user, input#password').each(function() {
-			if ($(this).val() == '') {
+			if ($(this).val() === '') {
 				empty = true;
 			}
 		});
@@ -491,14 +541,14 @@ $(document).ready(function(){
 			$('#remember_login').show();
 			$('#remember_login+label').fadeIn();
 		}
-	}
+	};
 	// hide log in button etc. when form fields not filled
 	// commented out due to some browsers having issues with it
 	// checkShowCredentials();
 	// $('input#user, input#password').keyup(checkShowCredentials);
 
 	$('#settings #expand').keydown(function(event) {
-		if (event.which == 13 || event.which == 32) {
+		if (event.which === 13 || event.which === 32) {
 			$('#expand').click()
 		}
 	});
@@ -509,8 +559,8 @@ $(document).ready(function(){
 	$('#settings #expanddiv').click(function(event){
 		event.stopPropagation();
 	});
-	$(window).click(function(){//hide the settings menu when clicking oustide it
-		if($('body').attr("id")=="body-user"){
+	$(window).click(function(){//hide the settings menu when clicking outside it
+		if($('body').attr("id")==="body-user"){
 			$('#settings #expanddiv').slideUp();
 		}
 	});
@@ -537,13 +587,15 @@ if (!Array.prototype.map){
 	Array.prototype.map = function(fun /*, thisp */){
 		"use strict";
 
-		if (this === void 0 || this === null)
+		if (this === void 0 || this === null){
 			throw new TypeError();
+		}
 
 		var t = Object(this);
 		var len = t.length >>> 0;
-		if (typeof fun !== "function")
+		if (typeof fun !== "function"){
 			throw new TypeError();
+		}
 
 		var res = new Array(len);
 		var thisp = arguments[1];
@@ -565,13 +617,13 @@ $.fn.filterAttr = function(attr_name, attr_value) {
 };
 
 function humanFileSize(size) {
-	humanList = ['B', 'kB', 'MB', 'GB', 'TB'];
+	var humanList = ['B', 'kB', 'MB', 'GB', 'TB'];
 	// Calculate Log with base 1024: size = 1024 ** order
-	order = Math.floor(Math.log(size) / Math.log(1024));
+	var order = Math.floor(Math.log(size) / Math.log(1024));
 	// Stay in range of the byte sizes that are defined
 	order = Math.min(humanList.length - 1, order);
-	readableFormat = humanList[order];
-	relativeSize = (size / Math.pow(1024, order)).toFixed(1);
+	var readableFormat = humanList[order];
+	var relativeSize = (size / Math.pow(1024, order)).toFixed(1);
 	if(relativeSize.substr(relativeSize.length-2,2)=='.0'){
 		relativeSize=relativeSize.substr(0,relativeSize.length-2);
 	}
@@ -579,7 +631,7 @@ function humanFileSize(size) {
 }
 
 function simpleFileSize(bytes) {
-	mbytes = Math.round(bytes/(1024*1024/10))/10;
+	var mbytes = Math.round(bytes/(1024*1024/10))/10;
 	if(bytes == 0) { return '0'; }
 	else if(mbytes < 0.1) { return '< 0.1'; }
 	else if(mbytes > 1000) { return '> 1000'; }
@@ -611,7 +663,7 @@ OC.get=function(name) {
 		}
 	}
 	return context[tail];
-}
+};
 
 /**
  * set a variable by name
@@ -630,4 +682,4 @@ OC.set=function(name, value) {
 		context = context[namespaces[i]];
 	}
 	context[tail]=value;
-}
+};
diff --git a/core/js/oc-dialogs.js b/core/js/oc-dialogs.js
index 4dd3c89c14d..2467af61121 100644
--- a/core/js/oc-dialogs.js
+++ b/core/js/oc-dialogs.js
@@ -106,7 +106,7 @@ var OCdialogs = {
 		var c_name = 'oc-dialog-'+OCdialogs.dialogs_counter+'-content';
 		var c_id = '#'+c_name;
 		var d = '<div id="'+c_name+'" title="'+title+'"><select id="dirtree"><option value="0">'+OC.currentUser+'</option></select><div id="filelist"></div><div class="filepicker_loader"><img src="'+OC.filePath('gallery','img','loading.gif')+'"></div></div>';
-		if (!modal) modal = false; // Huh..?
+		if (!modal) modal = false; // Huh..
 		if (!multiselect) multiselect = false;
 		$('body').append(d);
 		$(c_id + ' #dirtree').focus(function() {
@@ -120,7 +120,7 @@ var OCdialogs = {
 		}).data('multiselect', multiselect).data('mimetype',mimetype_filter);
 		// build buttons
 		var b = [{
-			text: t('dialogs', 'Choose'), 
+			text: t('core', 'Choose'), 
 			click: function(){
 				if (callback != undefined) {
 					var p;
@@ -140,7 +140,7 @@ var OCdialogs = {
 			}
 		},
 		{
-			text: t('dialogs', 'Cancel'), 
+			text: t('core', 'Cancel'), 
 			click: function(){$(c_id).dialog('close'); }}
 		];
 		$(c_id).dialog({width: ((4*$('body').width())/9), height: 400, modal: modal, buttons: b});
@@ -156,11 +156,11 @@ var OCdialogs = {
 		var b = [];
 		switch (buttons) {
 			case OCdialogs.YES_NO_BUTTONS:
-				b[1] = {text: t('dialogs', 'No'), click: function(){ if (callback != undefined) callback(false); $(c_id).dialog('close'); }};
-				b[0] = {text: t('dialogs', 'Yes'), click: function(){ if (callback != undefined) callback(true); $(c_id).dialog('close');}};
+				b[1] = {text: t('core', 'No'), click: function(){ if (callback != undefined) callback(false); $(c_id).dialog('close'); }};
+				b[0] = {text: t('core', 'Yes'), click: function(){ if (callback != undefined) callback(true); $(c_id).dialog('close');}};
 			break;
 			case OCdialogs.OK_CANCEL_BUTTONS:
-				b[1] = {text: t('dialogs', 'Cancel'), click: function(){$(c_id).dialog('close'); }};
+				b[1] = {text: t('core', 'Cancel'), click: function(){$(c_id).dialog('close'); }};
 			case OCdialogs.OK_BUTTON: // fallthrough
 				var f;
 				switch(dialog_type) {
@@ -174,7 +174,7 @@ var OCdialogs = {
 						f = function(){OCdialogs.form_ok_handler(callback, c_id)};
 					break;
 				}
-				b[0] = {text: t('dialogs', 'Ok'), click: f};
+				b[0] = {text: t('core', 'Ok'), click: f};
 			break;
 		}
 		var possible_height = ($('tr', d).size()+1)*30;
diff --git a/core/js/share.js b/core/js/share.js
index b5e8b0e6613..36ee39d8eab 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -35,21 +35,29 @@ OC.Share={
 			}
 		}
 		var shares = false;
+		var link = false;
+		var image = OC.imagePath('core', 'actions/share');
 		$.each(OC.Share.itemShares, function(index) {
-			if (OC.Share.itemShares[index].length > 0) {
-				shares = true;
-				return;
+			if (OC.Share.itemShares[index]) {
+				if (index == OC.Share.SHARE_TYPE_LINK) {
+					if (OC.Share.itemShares[index] == true) {
+						shares = true;
+						image = OC.imagePath('core', 'actions/public');
+						link = true;
+						return;
+					}
+				} else if (OC.Share.itemShares[index].length > 0) {
+					shares = true;
+					image = OC.imagePath('core', 'actions/shared');
+				}
 			}
 		});
+		if (itemType != 'file' && itemType != 'folder') {
+			$('a.share[data-item="'+itemSource+'"]').css('background', 'url('+image+') no-repeat center');
+		}
 		if (shares) {
-			$('a.share[data-item="'+itemSource+'"]').css('background', 'url('+OC.imagePath('core', 'actions/shared')+') no-repeat center');
-			if (typeof OC.Share.statuses[itemSource] === 'undefined') {
-				OC.Share.statuses[itemSource] = false;
-			}
+			OC.Share.statuses[itemSource] = link;
 		} else {
-			if (itemType != 'file' && itemType != 'folder') {
-				$('a.share[data-item="'+itemSource+'"]').css('background', 'url('+OC.imagePath('core', 'actions/share')+') no-repeat center');
-			}
 			delete OC.Share.statuses[itemSource];
 		}
 	},
@@ -71,7 +79,8 @@ OC.Share={
 			var item = itemSource;
 		}
 		if (typeof OC.Share.statuses[item] === 'undefined') {
-			checkShares = false;
+			// NOTE: Check does not always work and misses some shares, fix later
+			checkShares = true;
 		} else {
 			checkShares = true;
 		}
@@ -91,7 +100,7 @@ OC.Share={
 					callback(result.data);
 				}
 			} else {
-				OC.dialogs.alert(result.data.message, 'Error while sharing');
+				OC.dialogs.alert(result.data.message, t('core', 'Error while sharing'));
 			}
 		});
 	},
@@ -102,14 +111,14 @@ OC.Share={
 					callback();
 				}
 			} else {
-				OC.dialogs.alert('Error', 'Error while unsharing');
+				OC.dialogs.alert(t('core', 'Error'), t('core', 'Error while unsharing'));
 			}
 		});
 	},
 	setPermissions:function(itemType, itemSource, shareType, shareWith, permissions) {
 		$.post(OC.filePath('core', 'ajax', 'share.php'), { action: 'setPermissions', itemType: itemType, itemSource: itemSource, shareType: shareType, shareWith: shareWith, permissions: permissions }, function(result) {
 			if (!result || result.status !== 'success') {
-				OC.dialogs.alert('Error', 'Error while changing permissions');
+				OC.dialogs.alert(t('core', 'Error'), t('core', 'Error while changing permissions'));
 			}
 		});
 	},
@@ -118,28 +127,30 @@ OC.Share={
 		var html = '<div id="dropdown" class="drop" data-item-type="'+itemType+'" data-item-source="'+itemSource+'">';
 		if (data.reshare) {
 			if (data.reshare.share_type == OC.Share.SHARE_TYPE_GROUP) {
-				html += '<span class="reshare">Shared with you and the group '+data.reshare.share_with+' by '+data.reshare.uid_owner+'</span>';
+				html += '<span class="reshare">'+t('core', 'Shared with you and the group %s by %s', data.reshare.share_with, data.reshare.uid_owner)+'</span>';
 			} else {
-				html += '<span class="reshare">Shared with you by '+data.reshare.uid_owner+'</span>';
+				html += '<span class="reshare">'+t('core', 'Shared with you by %s', data.reshare.uid_owner)+'</span>';
 			}
 			html += '<br />';
 		}
 		if (possiblePermissions & OC.PERMISSION_SHARE) {
-			html += '<input id="shareWith" type="text" placeholder="Share with" />';
+			html += '<input id="shareWith" type="text" placeholder="'+t('core', 'Share with')+'" />';
 			html += '<ul id="shareWithList">';
 			html += '</ul>';
 			if (link) {
 				html += '<div id="link">';
-				html += '<input type="checkbox" name="linkCheckbox" id="linkCheckbox" value="1" /><label for="linkCheckbox">Share with link</label>';
-				// TODO Change to lock/unlock icon?
-				html += '<a href="#" id="showPassword" style="display:none;"><img class="svg" alt="Password protect" src="'+OC.imagePath('core', 'actions/triangle-n')+'"/></a>';
+				html += '<input type="checkbox" name="linkCheckbox" id="linkCheckbox" value="1" /><label for="linkCheckbox">'+t('core', 'Share with link')+'</label>';
+				html += '<a href="#" id="showPassword" style="display:none;"><img class="svg" alt="'+t('core', 'Password protect')+'" src="'+OC.imagePath('core', 'actions/lock')+'"/></a>';
 				html += '<br />';
 				html += '<input id="linkText" type="text" readonly="readonly" />';
 				html += '<div id="linkPass">';
-				html += '<input id="linkPassText" type="password" placeholder="Password" />';
+				html += '<input id="linkPassText" type="password" placeholder="'+t('core', 'Password')+'" />';
 				html += '</div>';
 				html += '</div>';
 			}
+			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%;" />';
 			html += '</div>';
 			$(html).appendTo(appendTo);
 			// Reset item shares
@@ -149,7 +160,14 @@ OC.Share={
 					if (share.share_type == OC.Share.SHARE_TYPE_LINK) {
 						OC.Share.showLink(itemSource, share.share_with);
 					} else {
-						OC.Share.addShareWith(share.share_type, share.share_with, share.permissions, possiblePermissions);
+						if (share.collection) {
+							OC.Share.addShareWith(share.share_type, share.share_with, share.permissions, possiblePermissions, share.collection);
+						} else {
+							OC.Share.addShareWith(share.share_type, share.share_with, share.permissions, possiblePermissions, false);
+						}
+					}
+					if (share.expiration.length > 0) {
+						OC.Share.showExpirationDate(share.expiration);
 					}
 				});
 			}
@@ -162,12 +180,12 @@ OC.Share={
 							response(result.data);
 						} else {
 							// Suggest sharing via email if valid email address
-							var pattern = new RegExp(/^[+a-zA-Z0-9._-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4}$/i);
-							if (pattern.test(search.term)) {
-								response([{label: 'Share via email: '+search.term, value: {shareType: OC.Share.SHARE_TYPE_EMAIL, shareWith: search.term}}]);
-							} else {
-								response(['No people found']);
-							}
+// 							var pattern = new RegExp(/^[+a-zA-Z0-9._-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4}$/i);
+// 							if (pattern.test(search.term)) {
+// 								response([{label: t('core', 'Share via email: %s', search.term), value: {shareType: OC.Share.SHARE_TYPE_EMAIL, shareWith: search.term}}]);
+// 							} else {
+								response([t('core', 'No people found')]);
+// 							}
 						}
 					});
 	// 			}
@@ -176,6 +194,7 @@ OC.Share={
 				event.preventDefault();
 			},
 			select: function(event, selected) {
+				event.stopPropagation();
 				var itemType = $('#dropdown').data('item-type');
 				var itemSource = $('#dropdown').data('item-source');
 				var shareType = selected.item.value.shareType;
@@ -192,7 +211,7 @@ OC.Share={
 			}
 			});
 		} else {
-			html += '<input id="shareWith" type="text" placeholder="Resharing is not allowed" style="width:90%;" disabled="disabled"/>';
+			html += '<input id="shareWith" type="text" placeholder="'+t('core', 'Resharing is not allowed')+'" style="width:90%;" disabled="disabled"/>';
 			html += '</div>';
 			$(html).appendTo(appendTo);
 		}
@@ -213,58 +232,74 @@ OC.Share={
 			}
 		});
 	},
-	addShareWith:function(shareType, shareWith, permissions, possiblePermissions) {
+	addShareWith:function(shareType, shareWith, permissions, possiblePermissions, collection) {
 		if (!OC.Share.itemShares[shareType]) {
 			OC.Share.itemShares[shareType] = [];
 		}
 		OC.Share.itemShares[shareType].push(shareWith);
-		var editChecked = createChecked = updateChecked = deleteChecked = shareChecked = '';
-		if (permissions & OC.PERMISSION_CREATE) {
-			createChecked = 'checked="checked"';
-			editChecked = 'checked="checked"';
-		}
-		if (permissions & OC.PERMISSION_UPDATE) {
-			updateChecked = 'checked="checked"';
-			editChecked = 'checked="checked"';
-		}
-		if (permissions & OC.PERMISSION_DELETE) {
-			deleteChecked = 'checked="checked"';
-			editChecked = 'checked="checked"';
-		}
-		if (permissions & OC.PERMISSION_SHARE) {
-			shareChecked = 'checked="checked"';
-		}
-		var html = '<li style="clear: both;" data-share-type="'+shareType+'" data-share-with="'+shareWith+'">';
-		html += shareWith;
-		if (possiblePermissions & OC.PERMISSION_CREATE || possiblePermissions & OC.PERMISSION_UPDATE || possiblePermissions & OC.PERMISSION_DELETE) {
-			if (editChecked == '') {
-				html += '<label style="display:none;">';
+		if (collection) {
+			if (collection.item_type == 'file' || collection.item_type == 'folder') {
+				var item = collection.path;
 			} else {
-				html += '<label>';
+				var item = collection.item_source;
 			}
-			html += '<input type="checkbox" name="edit" class="permissions" '+editChecked+' />can edit</label>';
-		}
-		html += '<a href="#" class="showCruds" style="display:none;"><img class="svg" alt="Unshare" src="'+OC.imagePath('core', 'actions/triangle-s')+'"/></a>';
-		html += '<a href="#" class="unshare" style="display:none;"><img class="svg" alt="Unshare" src="'+OC.imagePath('core', 'actions/delete')+'"/></a>';
-		html += '<div class="cruds" style="display:none;">';
-			if (possiblePermissions & OC.PERMISSION_CREATE) {
-				html += '<label><input type="checkbox" name="create" class="permissions" '+createChecked+' data-permissions="'+OC.PERMISSION_CREATE+'" />create</label>';
+			var collectionList = $('#shareWithList li').filterAttr('data-collection', item);
+			if (collectionList.length > 0) {
+				$(collectionList).append(', '+shareWith);
+			} else {
+				var html = '<li style="clear: both;" data-collection="'+item+'">'+t('core', 'Shared in %s with %s', item, shareWith)+'</li>';
+				$('#shareWithList').prepend(html);
 			}
-			if (possiblePermissions & OC.PERMISSION_UPDATE) {
-				html += '<label><input type="checkbox" name="update" class="permissions" '+updateChecked+' data-permissions="'+OC.PERMISSION_UPDATE+'" />update</label>';
+		} else {
+			var editChecked = createChecked = updateChecked = deleteChecked = shareChecked = '';
+			if (permissions & OC.PERMISSION_CREATE) {
+				createChecked = 'checked="checked"';
+				editChecked = 'checked="checked"';
 			}
-			if (possiblePermissions & OC.PERMISSION_DELETE) {
-				html += '<label><input type="checkbox" name="delete" class="permissions" '+deleteChecked+' data-permissions="'+OC.PERMISSION_DELETE+'" />delete</label>';
+			if (permissions & OC.PERMISSION_UPDATE) {
+				updateChecked = 'checked="checked"';
+				editChecked = 'checked="checked"';
 			}
-			if (possiblePermissions & OC.PERMISSION_SHARE) {
-				html += '<label><input type="checkbox" name="share" class="permissions" '+shareChecked+' data-permissions="'+OC.PERMISSION_SHARE+'" />share</label>';
+			if (permissions & OC.PERMISSION_DELETE) {
+				deleteChecked = 'checked="checked"';
+				editChecked = 'checked="checked"';
 			}
-		html += '</div>';
-		html += '</li>';
-		$(html).appendTo('#shareWithList');
-
+			if (permissions & OC.PERMISSION_SHARE) {
+				shareChecked = 'checked="checked"';
+			}
+			var html = '<li style="clear: both;" data-share-type="'+shareType+'" data-share-with="'+shareWith+'">';
+			html += '<a href="#" class="unshare" style="display:none;"><img class="svg" alt="'+t('core', 'Unshare')+'" src="'+OC.imagePath('core', 'actions/delete')+'"/></a>';
+			html += shareWith;
+			if (possiblePermissions & OC.PERMISSION_CREATE || possiblePermissions & OC.PERMISSION_UPDATE || possiblePermissions & OC.PERMISSION_DELETE) {
+				if (editChecked == '') {
+					html += '<label style="display:none;">';
+				} else {
+					html += '<label>';
+				}
+				html += '<input type="checkbox" name="edit" class="permissions" '+editChecked+' />'+t('core', 'can edit')+'</label>';
+			}
+			html += '<a href="#" class="showCruds" style="display:none;"><img class="svg" alt="'+t('core', 'access control')+'" src="'+OC.imagePath('core', 'actions/triangle-s')+'"/></a>';
+			html += '<div class="cruds" style="display:none;">';
+				if (possiblePermissions & OC.PERMISSION_CREATE) {
+					html += '<label><input type="checkbox" name="create" class="permissions" '+createChecked+' data-permissions="'+OC.PERMISSION_CREATE+'" />'+t('core', 'create')+'</label>';
+				}
+				if (possiblePermissions & OC.PERMISSION_UPDATE) {
+					html += '<label><input type="checkbox" name="update" class="permissions" '+updateChecked+' data-permissions="'+OC.PERMISSION_UPDATE+'" />'+t('core', 'update')+'</label>';
+				}
+				if (possiblePermissions & OC.PERMISSION_DELETE) {
+					html += '<label><input type="checkbox" name="delete" class="permissions" '+deleteChecked+' data-permissions="'+OC.PERMISSION_DELETE+'" />'+t('core', 'delete')+'</label>';
+				}
+				if (possiblePermissions & OC.PERMISSION_SHARE) {
+					html += '<label><input type="checkbox" name="share" class="permissions" '+shareChecked+' data-permissions="'+OC.PERMISSION_SHARE+'" />'+t('core', 'share')+'</label>';
+				}
+			html += '</div>';
+			html += '</li>';
+			$(html).appendTo('#shareWithList');
+			$('#expiration').show();
+		}
 	},
 	showLink:function(itemSource, password) {
+		OC.Share.itemShares[OC.Share.SHARE_TYPE_LINK] = true;
 		$('#linkCheckbox').attr('checked', true);
 		var filename = $('tr').filterAttr('data-id', String(itemSource)).data('file');
 		if ($('#dir').val() == '/') {
@@ -279,8 +314,9 @@ OC.Share={
 		$('#showPassword').show();
 		if (password != null) {
 			$('#linkPass').show('blind');
-			$('#linkPassText').attr('placeholder', 'Password protected');
+			$('#linkPassText').attr('placeholder', t('core', 'Password protected'));
 		}
+		$('#expiration').show();
 	},
 	hideLink:function() {
 		$('#linkText').hide('blind');
@@ -289,6 +325,15 @@ OC.Share={
 	},
 	dirname:function(path) {
 		return path.replace(/\\/g,'/').replace(/\/[^\/]*$/, '');
+	},
+	showExpirationDate:function(date) {
+		$('#expirationCheckbox').attr('checked', true);
+		$('#expirationDate').before('<br />');
+		$('#expirationDate').val(date);
+		$('#expirationDate').show();
+		$('#expirationDate').datepicker({
+			dateFormat : 'dd-mm-yy'
+		});
 	}
 }
 
@@ -358,6 +403,9 @@ $(document).ready(function() {
 			var index = OC.Share.itemShares[shareType].indexOf(shareWith);
 			OC.Share.itemShares[shareType].splice(index, 1);
 			OC.Share.updateIcon(itemType, itemSource);
+			if (typeof OC.Share.statuses[itemSource] === 'undefined') {
+				$('#expiration').hide();
+			}
 		});
 	});
 
@@ -395,12 +443,17 @@ $(document).ready(function() {
 			// Create a link
 			OC.Share.share(itemType, itemSource, OC.Share.SHARE_TYPE_LINK, '', OC.PERMISSION_READ, function() {
 				OC.Share.showLink(itemSource);
-				// TODO Change icon
+				OC.Share.updateIcon(itemType, itemSource);
 			});
 		} else {
 			// Delete private link
 			OC.Share.unshare(itemType, itemSource, OC.Share.SHARE_TYPE_LINK, '', function() {
 				OC.Share.hideLink();
+				OC.Share.itemShares[OC.Share.SHARE_TYPE_LINK] = false;
+				OC.Share.updateIcon(itemType, itemSource);
+				if (typeof OC.Share.statuses[itemSource] === 'undefined') {
+					$('#expiration').hide();
+				}
 			});
 		}
 	});
@@ -420,8 +473,34 @@ $(document).ready(function() {
 			var itemSource = $('#dropdown').data('item-source');
 			OC.Share.share(itemType, itemSource, OC.Share.SHARE_TYPE_LINK, $(this).val(), OC.PERMISSION_READ, function() {
 				$('#linkPassText').val('');
-				$('#linkPassText').attr('placeholder', 'Password protected');
+				$('#linkPassText').attr('placeholder', t('core', 'Password protected'));
+			});
+		}
+	});
+
+	$('#expirationCheckbox').live('click', function() {
+		if (this.checked) {
+			OC.Share.showExpirationDate('');
+		} else {
+			var itemType = $('#dropdown').data('item-type');
+			var itemSource = $('#dropdown').data('item-source');
+			$.post(OC.filePath('core', 'ajax', 'share.php'), { action: 'setExpirationDate', itemType: itemType, itemSource: itemSource, date: '' }, function(result) {
+				if (!result || result.status !== 'success') {
+					OC.dialogs.alert(t('core', 'Error'), t('core', 'Error unsetting expiration date'));
+				}
+				$('#expirationDate').hide();
 			});
 		}
 	});
+	
+	$('#expirationDate').live('change', function() {
+		var itemType = $('#dropdown').data('item-type');
+		var itemSource = $('#dropdown').data('item-source');
+		$.post(OC.filePath('core', 'ajax', 'share.php'), { action: 'setExpirationDate', itemType: itemType, itemSource: itemSource, date: $(this).val() }, function(result) {
+			if (!result || result.status !== 'success') {
+				OC.dialogs.alert(t('core', 'Error'), t('core', 'Error setting expiration date'));
+			}
+		});
+	});
+
 });
diff --git a/core/l10n/ar.php b/core/l10n/ar.php
index 4b694f33bd8..6efe63cc2af 100644
--- a/core/l10n/ar.php
+++ b/core/l10n/ar.php
@@ -1,5 +1,6 @@
 <?php $TRANSLATIONS = array(
 "Settings" => "تعديلات",
+"Password" => "كلمة السر",
 "Use the following link to reset your password: {link}" => "استخدم هذه الوصلة لاسترجاع كلمة السر: {link}",
 "You will receive a link to reset your password via Email." => "سوف نرسل لك بريد يحتوي على وصلة لتجديد كلمة السر.",
 "Requested" => "تم طلب",
@@ -17,7 +18,6 @@
 "Help" => "المساعدة",
 "Cloud not found" => "لم يتم إيجاد",
 "Create an <strong>admin account</strong>" => "أضف </strong>مستخدم رئيسي <strong>",
-"Password" => "كلمة السر",
 "Advanced" => "خيارات متقدمة",
 "Data folder" => "مجلد المعلومات",
 "Configure the database" => "أسس قاعدة البيانات",
diff --git a/core/l10n/bg_BG.php b/core/l10n/bg_BG.php
index 19b32a700ba..779abe075aa 100644
--- a/core/l10n/bg_BG.php
+++ b/core/l10n/bg_BG.php
@@ -19,6 +19,7 @@
 "Ok" => "Добре",
 "No categories selected for deletion." => "Няма избрани категории за изтриване",
 "Error" => "Грешка",
+"Password" => "Парола",
 "You will receive a link to reset your password via Email." => "Ще получите връзка за нулиране на паролата Ви.",
 "Requested" => "Заявено",
 "Login failed!" => "Входа пропадна!",
@@ -37,7 +38,6 @@
 "Edit categories" => "Редактиране на категориите",
 "Add" => "Добавяне",
 "Create an <strong>admin account</strong>" => "Създаване на <strong>админ профил</strong>",
-"Password" => "Парола",
 "Advanced" => "Разширено",
 "Data folder" => "Директория за данни",
 "Configure the database" => "Конфигуриране на базата",
diff --git a/core/l10n/ca.php b/core/l10n/ca.php
index 6c70c29e6cb..11f93d5fbbf 100644
--- a/core/l10n/ca.php
+++ b/core/l10n/ca.php
@@ -21,6 +21,7 @@
 "Ok" => "D'acord",
 "No categories selected for deletion." => "No hi ha categories per eliminar.",
 "Error" => "Error",
+"Password" => "Contrasenya",
 "ownCloud password reset" => "estableix de nou la contrasenya Owncloud",
 "Use the following link to reset your password: {link}" => "Useu l'enllaç següent per restablir la contrasenya: {link}",
 "You will receive a link to reset your password via Email." => "Rebreu un enllaç al correu electrònic per reiniciar la contrasenya.",
@@ -42,7 +43,6 @@
 "Edit categories" => "Edita les categories",
 "Add" => "Afegeix",
 "Create an <strong>admin account</strong>" => "Crea un <strong>compte d'administrador</strong>",
-"Password" => "Contrasenya",
 "Advanced" => "Avançat",
 "Data folder" => "Carpeta de dades",
 "Configure the database" => "Configura la base de dades",
diff --git a/core/l10n/cs_CZ.php b/core/l10n/cs_CZ.php
index 6a4dad08cbd..790ab423e38 100644
--- a/core/l10n/cs_CZ.php
+++ b/core/l10n/cs_CZ.php
@@ -15,12 +15,38 @@
 "October" => "Říjen",
 "November" => "Listopad",
 "December" => "Prosinec",
+"Choose" => "Vybrat",
 "Cancel" => "Zrušit",
 "No" => "Ne",
 "Yes" => "Ano",
 "Ok" => "Ok",
 "No categories selected for deletion." => "Žádné kategorie nebyly vybrány ke smazání.",
 "Error" => "Chyba",
+"Error while sharing" => "Chyba při sdílení",
+"Error while unsharing" => "Chyba při rušení sdílení",
+"Error while changing permissions" => "Chyba při změně oprávnění",
+"Shared with you and the group %s by %s" => "Sdíleno s Vámi a skupinou %s od %s",
+"Shared with you by %s" => "Sdíleno s Vámi od %s",
+"Share with" => "Sdílet s",
+"Share with link" => "Sdílet s odkazem",
+"Password protect" => "Chránit heslem",
+"Password" => "Heslo",
+"Set expiration date" => "Nastavit datum vypršení platnosti",
+"Expiration date" => "Datum vypršení platnosti",
+"Share via email: %s" => "Sdílet e-mailem: %s",
+"No people found" => "Žádní lidé nenalezeni",
+"Resharing is not allowed" => "Sdílení již sdílené položky není povoleno",
+"Shared in %s with %s" => "Sdíleno v %s s %s",
+"Unshare" => "Zrušit sdílení",
+"can edit" => "lze upravovat",
+"access control" => "řízení přístupu",
+"create" => "vytvořit",
+"update" => "aktualizovat",
+"delete" => "smazat",
+"share" => "sdílet",
+"Password protected" => "Chráněno heslem",
+"Error unsetting expiration date" => "Chyba při odstraňování data vypršení platnosti",
+"Error setting expiration date" => "Chyba při nastavení data vypršení platnosti",
 "ownCloud password reset" => "Obnovení hesla pro ownCloud",
 "Use the following link to reset your password: {link}" => "Heslo obnovíte použitím následujícího odkazu: {link}",
 "You will receive a link to reset your password via Email." => "Bude Vám e-mailem zaslán odkaz pro obnovu hesla.",
@@ -42,7 +68,6 @@
 "Edit categories" => "Upravit kategorie",
 "Add" => "Přidat",
 "Create an <strong>admin account</strong>" => "Vytvořit <strong>účet správce</strong>",
-"Password" => "Heslo",
 "Advanced" => "Pokročilé",
 "Data folder" => "Složka s daty",
 "Configure the database" => "Nastavit databázi",
diff --git a/core/l10n/da.php b/core/l10n/da.php
index 4bb953a4c5d..284a16c4524 100644
--- a/core/l10n/da.php
+++ b/core/l10n/da.php
@@ -15,12 +15,37 @@
 "October" => "Oktober",
 "November" => "November",
 "December" => "December",
+"Choose" => "Vælg",
 "Cancel" => "Fortryd",
 "No" => "Nej",
 "Yes" => "Ja",
 "Ok" => "OK",
 "No categories selected for deletion." => "Ingen kategorier valgt",
 "Error" => "Fejl",
+"Error while sharing" => "Fejl under deling",
+"Error while unsharing" => "Fejl under annullering af deling",
+"Error while changing permissions" => "Fejl under justering af rettigheder",
+"Shared with you and the group %s by %s" => "Delt med dig og gruppen %s af %s",
+"Shared with you by %s" => "Delt med dig af %s",
+"Share with" => "Del med",
+"Share with link" => "Del med link",
+"Password protect" => "Beskyt med adgangskode",
+"Password" => "Kodeord",
+"Set expiration date" => "Vælg udløbsdato",
+"Expiration date" => "Udløbsdato",
+"Share via email: %s" => "Del over email: %s",
+"No people found" => "Ingen personer fundet",
+"Resharing is not allowed" => "Videredeling ikke tilladt",
+"Shared in %s with %s" => "Delt i %s med %s",
+"Unshare" => "Fjern deling",
+"can edit" => "kan redigere",
+"access control" => "Adgangskontrol",
+"create" => "opret",
+"update" => "opdater",
+"delete" => "slet",
+"share" => "del",
+"Password protected" => "Beskyttet med adgangskode",
+"Error setting expiration date" => "Fejl under sætning af udløbsdato",
 "ownCloud password reset" => "Nulstil ownCloud kodeord",
 "Use the following link to reset your password: {link}" => "Anvend følgende link til at nulstille din adgangskode: {link}",
 "You will receive a link to reset your password via Email." => "Du vil modtage et link til at nulstille dit kodeord via email.",
@@ -42,7 +67,6 @@
 "Edit categories" => "Rediger kategorier",
 "Add" => "Tilføj",
 "Create an <strong>admin account</strong>" => "Opret en <strong>administratorkonto</strong>",
-"Password" => "Kodeord",
 "Advanced" => "Avanceret",
 "Data folder" => "Datamappe",
 "Configure the database" => "Konfigurer databasen",
diff --git a/core/l10n/de.php b/core/l10n/de.php
index 611c208fe4d..fddb6859912 100644
--- a/core/l10n/de.php
+++ b/core/l10n/de.php
@@ -1,5 +1,5 @@
 <?php $TRANSLATIONS = array(
-"Application name not provided." => "Applikationsname nicht angegeben",
+"Application name not provided." => "Der Anwendungsname wurde nicht angegeben.",
 "No category to add?" => "Keine Kategorie hinzuzufügen?",
 "This category already exists: " => "Kategorie existiert bereits:",
 "Settings" => "Einstellungen",
@@ -15,19 +15,45 @@
 "October" => "Oktober",
 "November" => "November",
 "December" => "Dezember",
+"Choose" => "Auswählen",
 "Cancel" => "Abbrechen",
 "No" => "Nein",
 "Yes" => "Ja",
 "Ok" => "OK",
 "No categories selected for deletion." => "Es wurde keine Kategorien zum Löschen ausgewählt.",
 "Error" => "Fehler",
+"Error while sharing" => "Fehler beim Freigeben",
+"Error while unsharing" => "Fehler beim Aufheben der Freigabe",
+"Error while changing permissions" => "Fehler beim Ändern  der Rechte",
+"Shared with you and the group %s by %s" => "%s hat dies für dich und die Gruppe %s freigegeben.",
+"Shared with you by %s" => "%s hat dies mit dir geteilt.",
+"Share with" => "Freigeben für",
+"Share with link" => "Über einen Link freigeben",
+"Password protect" => "Passwortschutz",
+"Password" => "Passwort",
+"Set expiration date" => "Setze ein Ablaufdatum",
+"Expiration date" => "Ablaufdatum",
+"Share via email: %s" => "Über eine E-Mail freigeben: %s",
+"No people found" => "Niemand gefunden",
+"Resharing is not allowed" => "Weiterverteilen ist nicht erlaubt",
+"Shared in %s with %s" => "In %s für %s freigegeben",
+"Unshare" => "Freigabe aufheben",
+"can edit" => "kann bearbeiten",
+"access control" => "Zugriffskontrolle",
+"create" => "erstellen",
+"update" => "aktualisieren",
+"delete" => "löschen",
+"share" => "teilen",
+"Password protected" => "Durch ein Passwort geschützt",
+"Error unsetting expiration date" => "Fehler beim entfernen des Ablaufdatums",
+"Error setting expiration date" => "Fehler beim Setzen des Ablaufdatums",
 "ownCloud password reset" => "ownCloud-Passwort zurücksetzen",
 "Use the following link to reset your password: {link}" => "Nutzen Sie den nachfolgenden Link, um Ihr Passwort zurückzusetzen: {link}",
-"You will receive a link to reset your password via Email." => "Sie erhalten einen Link, um Ihr Passwort per E-Mail zurückzusetzen.",
+"You will receive a link to reset your password via Email." => "Du erhälst einen Link per E-Mail, um Dein Passwort zurückzusetzen.",
 "Requested" => "Angefragt",
 "Login failed!" => "Login fehlgeschlagen!",
 "Username" => "Benutzername",
-"Request reset" => "Anfrage zurückgesetzt",
+"Request reset" => "Beantrage Zurücksetzung",
 "Your password was reset" => "Ihr Passwort wurde zurückgesetzt.",
 "To login page" => "Zur Login-Seite",
 "New password" => "Neues Passwort",
@@ -42,11 +68,10 @@
 "Edit categories" => "Kategorien bearbeiten",
 "Add" => "Hinzufügen",
 "Create an <strong>admin account</strong>" => "<strong>Administrator-Konto</strong> anlegen",
-"Password" => "Passwort",
-"Advanced" => "Erweitert",
+"Advanced" => "Fortgeschritten",
 "Data folder" => "Datenverzeichnis",
 "Configure the database" => "Datenbank einrichten",
-"will be used" => "wird genutzt",
+"will be used" => "wird verwendet",
 "Database user" => "Datenbank-Benutzer",
 "Database password" => "Datenbank-Passwort",
 "Database name" => "Datenbank-Name",
@@ -58,7 +83,7 @@
 "Lost your password?" => "Passwort vergessen?",
 "remember" => "merken",
 "Log in" => "Einloggen",
-"You are logged out." => "Sie wurden abgemeldet.",
+"You are logged out." => "Du wurdest abgemeldet.",
 "prev" => "Zurück",
 "next" => "Weiter"
 );
diff --git a/core/l10n/el.php b/core/l10n/el.php
index 18a26f892c0..ce341176adf 100644
--- a/core/l10n/el.php
+++ b/core/l10n/el.php
@@ -21,6 +21,7 @@
 "Ok" => "Οκ",
 "No categories selected for deletion." => "Δεν επιλέχτηκαν κατηγορίες για διαγραφή",
 "Error" => "Σφάλμα",
+"Password" => "Κωδικός",
 "ownCloud password reset" => "Επαναφορά κωδικού ownCloud",
 "Use the following link to reset your password: {link}" => "Χρησιμοποιήστε τον ακόλουθο σύνδεσμο για να επανεκδόσετε τον κωδικό: {link}",
 "You will receive a link to reset your password via Email." => "Θα λάβετε ένα σύνδεσμο για να επαναφέρετε τον κωδικό πρόσβασής σας μέσω ηλεκτρονικού ταχυδρομείου.",
@@ -42,7 +43,6 @@
 "Edit categories" => "Επεξεργασία κατηγορίας",
 "Add" => "Προσθήκη",
 "Create an <strong>admin account</strong>" => "Δημιουργήστε έναν <strong>λογαριασμό διαχειριστή</strong>",
-"Password" => "Κωδικός",
 "Advanced" => "Για προχωρημένους",
 "Data folder" => "Φάκελος δεδομένων",
 "Configure the database" => "Διαμόρφωση της βάσης δεδομένων",
@@ -50,6 +50,7 @@
 "Database user" => "Χρήστης της βάσης δεδομένων",
 "Database password" => "Κωδικός πρόσβασης βάσης δεδομένων",
 "Database name" => "Όνομα βάσης δεδομένων",
+"Database tablespace" => "Κενά Πινάκων Βάσης Δεδομένων",
 "Database host" => "Διακομιστής βάσης δεδομένων",
 "Finish setup" => "Ολοκλήρωση εγκατάστασης",
 "web services under your control" => "Υπηρεσίες web υπό τον έλεγχό σας",
diff --git a/core/l10n/eo.php b/core/l10n/eo.php
index 930b20a30af..9e03abfdc23 100644
--- a/core/l10n/eo.php
+++ b/core/l10n/eo.php
@@ -21,6 +21,7 @@
 "Ok" => "Akcepti",
 "No categories selected for deletion." => "Neniu kategorio elektiĝis por forigo.",
 "Error" => "Eraro",
+"Password" => "Pasvorto",
 "ownCloud password reset" => "La pasvorto de ownCloud restariĝis.",
 "Use the following link to reset your password: {link}" => "Uzu la jenan ligilon por restarigi vian pasvorton: {link}",
 "You will receive a link to reset your password via Email." => "Vi ricevos ligilon retpoŝte por rekomencigi vian pasvorton.",
@@ -42,7 +43,6 @@
 "Edit categories" => "Redakti kategoriojn",
 "Add" => "Aldoni",
 "Create an <strong>admin account</strong>" => "Krei <strong>administran konton</strong>",
-"Password" => "Pasvorto",
 "Advanced" => "Progresinta",
 "Data folder" => "Datuma dosierujo",
 "Configure the database" => "Agordi la datumbazon",
@@ -50,6 +50,7 @@
 "Database user" => "Datumbaza uzanto",
 "Database password" => "Datumbaza pasvorto",
 "Database name" => "Datumbaza nomo",
+"Database tablespace" => "Datumbaza tabelospaco",
 "Database host" => "Datumbaza gastigo",
 "Finish setup" => "Fini la instalon",
 "web services under your control" => "TTT-servoj sub via kontrolo",
diff --git a/core/l10n/es.php b/core/l10n/es.php
index 21866d2ed67..1f55a59deb1 100644
--- a/core/l10n/es.php
+++ b/core/l10n/es.php
@@ -15,12 +15,37 @@
 "October" => "Octubre",
 "November" => "Noviembre",
 "December" => "Diciembre",
+"Choose" => "Seleccionar",
 "Cancel" => "Cancelar",
 "No" => "No",
 "Yes" => "Sí",
 "Ok" => "Aceptar",
 "No categories selected for deletion." => "No hay categorías seleccionadas para borrar.",
 "Error" => "Fallo",
+"Error while sharing" => "Error compartiendo",
+"Error while unsharing" => "Error descompartiendo",
+"Error while changing permissions" => "Error cambiando permisos",
+"Shared with you and the group %s by %s" => "Compartido contigo y el grupo %s por %s",
+"Shared with you by %s" => "Compartido contigo por %s",
+"Share with" => "Compartir con",
+"Share with link" => "Enlace de compartir con ",
+"Password protect" => "Protegido por contraseña",
+"Password" => "Contraseña",
+"Set expiration date" => "Establecer fecha de caducidad",
+"Expiration date" => "Fecha de caducidad",
+"Share via email: %s" => "Compartir por email: %s",
+"No people found" => "No se encontró gente",
+"Resharing is not allowed" => "No se permite compartir de nuevo",
+"Shared in %s with %s" => "Compartido en %s con %s",
+"Unshare" => "No compartir",
+"can edit" => "puede editar",
+"access control" => "control de acceso",
+"create" => "crear",
+"update" => "modificar",
+"delete" => "eliminar",
+"share" => "compartir",
+"Password protected" => "Protegido por contraseña",
+"Error setting expiration date" => "Error estableciendo fecha de caducidad",
 "ownCloud password reset" => "Reiniciar contraseña de ownCloud",
 "Use the following link to reset your password: {link}" => "Utiliza el siguiente enlace para restablecer tu contraseña: {link}",
 "You will receive a link to reset your password via Email." => "Recibirás un enlace por correo electrónico para restablecer tu contraseña",
@@ -42,7 +67,6 @@
 "Edit categories" => "Editar categorías",
 "Add" => "Añadir",
 "Create an <strong>admin account</strong>" => "Crea una <strong>cuenta de administrador</strong>",
-"Password" => "Contraseña",
 "Advanced" => "Avanzado",
 "Data folder" => "Directorio de almacenamiento",
 "Configure the database" => "Configurar la base de datos",
diff --git a/core/l10n/es_AR.php b/core/l10n/es_AR.php
new file mode 100644
index 00000000000..2a98e068501
--- /dev/null
+++ b/core/l10n/es_AR.php
@@ -0,0 +1,88 @@
+<?php $TRANSLATIONS = array(
+"Application name not provided." => "Nombre de la aplicación no provisto.",
+"No category to add?" => "¿Ninguna categoría para añadir?",
+"This category already exists: " => "Esta categoría ya existe: ",
+"Settings" => "Ajustes",
+"January" => "Enero",
+"February" => "Febrero",
+"March" => "Marzo",
+"April" => "Abril",
+"May" => "Mayo",
+"June" => "Junio",
+"July" => "Julio",
+"August" => "Agosto",
+"September" => "Septiembre",
+"October" => "Octubre",
+"November" => "Noviembre",
+"December" => "Diciembre",
+"Choose" => "Elegir",
+"Cancel" => "Cancelar",
+"No" => "No",
+"Yes" => "Sí",
+"Ok" => "Aceptar",
+"No categories selected for deletion." => "No hay categorías seleccionadas para borrar.",
+"Error" => "Error",
+"Error while sharing" => "Error al compartir",
+"Error while unsharing" => "Error en el procedimiento de ",
+"Error while changing permissions" => "Error al cambiar permisos",
+"Shared with you and the group %s by %s" => "Compartido con vos y con el grupo %s por %s",
+"Shared with you by %s" => "Compartido con vos por %s",
+"Share with" => "Compartir con",
+"Share with link" => "Compartir con link",
+"Password protect" => "Proteger con contraseña ",
+"Password" => "Contraseña",
+"Set expiration date" => "Asignar fecha de vencimiento",
+"Expiration date" => "Fecha de vencimiento",
+"Share via email: %s" => "Compartir por e-mail: %s",
+"No people found" => "No se encontraron usuarios",
+"Resharing is not allowed" => "No se permite volver a compartir",
+"Shared in %s with %s" => "Compartido en %s con %s",
+"Unshare" => "Remover compartir",
+"can edit" => "puede editar",
+"access control" => "control de acceso",
+"create" => "crear",
+"update" => "actualizar",
+"delete" => "remover",
+"share" => "compartir",
+"Password protected" => "Protegido por contraseña",
+"Error setting expiration date" => "Error al asignar fecha de vencimiento",
+"ownCloud password reset" => "Restablecer contraseña de ownCloud",
+"Use the following link to reset your password: {link}" => "Usá este enlace para restablecer tu contraseña: {link}",
+"You will receive a link to reset your password via Email." => "Vas a recibir un enlace por e-mail para restablecer tu contraseña",
+"Requested" => "Pedido",
+"Login failed!" => "¡Fallo al iniciar sesión!",
+"Username" => "Nombre de usuario",
+"Request reset" => "Solicitar restablecimiento",
+"Your password was reset" => "Tu contraseña ha sido restablecida",
+"To login page" => "A la página de inicio de sesión",
+"New password" => "Nueva contraseña",
+"Reset password" => "Restablecer contraseña",
+"Personal" => "Personal",
+"Users" => "Usuarios",
+"Apps" => "Aplicaciones",
+"Admin" => "Administrador",
+"Help" => "Ayuda",
+"Access forbidden" => "Acceso denegado",
+"Cloud not found" => "No se encontró owncloud",
+"Edit categories" => "Editar categorías",
+"Add" => "Añadir",
+"Create an <strong>admin account</strong>" => "Creá 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",
+"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",
+"Finish setup" => "Completar la instalación",
+"web services under your control" => "servicios web sobre los que tenés control",
+"Log out" => "Cerrar la sesión",
+"Lost your password?" => "¿Perdiste tu contraseña?",
+"remember" => "recordame",
+"Log in" => "Entrar",
+"You are logged out." => "Terminaste la sesión.",
+"prev" => "anterior",
+"next" => "siguiente"
+);
diff --git a/core/l10n/et_EE.php b/core/l10n/et_EE.php
index 871cc25fee0..bc97cd04036 100644
--- a/core/l10n/et_EE.php
+++ b/core/l10n/et_EE.php
@@ -21,6 +21,7 @@
 "Ok" => "Ok",
 "No categories selected for deletion." => "Kustutamiseks pole kategooriat valitud.",
 "Error" => "Viga",
+"Password" => "Parool",
 "ownCloud password reset" => "ownCloud parooli taastamine",
 "Use the following link to reset your password: {link}" => "Kasuta järgnevat linki oma parooli taastamiseks: {link}",
 "You will receive a link to reset your password via Email." => "Sinu parooli taastamise link saadetakse sulle e-postile.",
@@ -42,7 +43,6 @@
 "Edit categories" => "Muuda kategooriaid",
 "Add" => "Lisa",
 "Create an <strong>admin account</strong>" => "Loo <strong>admini konto</strong>",
-"Password" => "Parool",
 "Advanced" => "Lisavalikud",
 "Data folder" => "Andmete kaust",
 "Configure the database" => "Seadista andmebaasi",
diff --git a/core/l10n/eu.php b/core/l10n/eu.php
index 9e9717dd8d8..fc400a69f11 100644
--- a/core/l10n/eu.php
+++ b/core/l10n/eu.php
@@ -15,12 +15,37 @@
 "October" => "Urria",
 "November" => "Azaroa",
 "December" => "Abendua",
+"Choose" => "Aukeratu",
 "Cancel" => "Ezeztatu",
 "No" => "Ez",
 "Yes" => "Bai",
 "Ok" => "Ados",
 "No categories selected for deletion." => "Ez da ezabatzeko kategoriarik hautatu.",
 "Error" => "Errorea",
+"Error while sharing" => "Errore bat egon da elkarbanatzean",
+"Error while unsharing" => "Errore bat egon da elkarbanaketa desegitean",
+"Error while changing permissions" => "Errore bat egon da baimenak aldatzean",
+"Shared with you and the group %s by %s" => "Zurekin eta %s taldearekin %sk elkarbanatuta",
+"Shared with you by %s" => "%sk zurekin elkarbanatuta",
+"Share with" => "Elkarbanatu honekin",
+"Share with link" => "Elkarbanatu lotura batekin",
+"Password protect" => "Babestu pasahitzarekin",
+"Password" => "Pasahitza",
+"Set expiration date" => "Ezarri muga data",
+"Expiration date" => "Muga data",
+"Share via email: %s" => "Elkarbanatu eposta bidez: %s",
+"No people found" => "Ez da inor aurkitu",
+"Resharing is not allowed" => "Berriz elkarbanatzea ez dago baimendua",
+"Shared in %s with %s" => "Elkarbanatuta hemen %s %srekin",
+"Unshare" => "Ez elkarbanatu",
+"can edit" => "editatu dezake",
+"access control" => "sarrera kontrola",
+"create" => "sortu",
+"update" => "eguneratu",
+"delete" => "ezabatu",
+"share" => "elkarbanatu",
+"Password protected" => "Pasahitzarekin babestuta",
+"Error setting expiration date" => "Errore bat egon da muga data ezartzean",
 "ownCloud password reset" => "ownCloud-en pasahitza berrezarri",
 "Use the following link to reset your password: {link}" => "Eribili hurrengo lotura zure pasahitza berrezartzeko: {link}",
 "You will receive a link to reset your password via Email." => "Zure pashitza berrezartzeko lotura bat jasoko duzu Epostaren bidez.",
@@ -42,7 +67,6 @@
 "Edit categories" => "Editatu kategoriak",
 "Add" => "Gehitu",
 "Create an <strong>admin account</strong>" => "Sortu <strong>kudeatzaile kontu<strong> bat",
-"Password" => "Pasahitza",
 "Advanced" => "Aurreratua",
 "Data folder" => "Datuen karpeta",
 "Configure the database" => "Konfiguratu datu basea",
@@ -50,6 +74,7 @@
 "Database user" => "Datubasearen erabiltzailea",
 "Database password" => "Datubasearen pasahitza",
 "Database name" => "Datubasearen izena",
+"Database tablespace" => "Datu basearen taula-lekua",
 "Database host" => "Datubasearen hostalaria",
 "Finish setup" => "Bukatu konfigurazioa",
 "web services under your control" => "web zerbitzuak zure kontrolpean",
diff --git a/core/l10n/fa.php b/core/l10n/fa.php
index 7b7af3937b8..2b96162c0cc 100644
--- a/core/l10n/fa.php
+++ b/core/l10n/fa.php
@@ -21,6 +21,7 @@
 "Ok" => "قبول",
 "No categories selected for deletion." => "هیج دسته ای برای پاک شدن انتخاب نشده است",
 "Error" => "خطا",
+"Password" => "گذرواژه",
 "ownCloud password reset" => "پسورد ابرهای شما تغییرکرد",
 "Use the following link to reset your password: {link}" => "از لینک زیر جهت دوباره سازی پسورد استفاده کنید :\n{link}",
 "You will receive a link to reset your password via Email." => "شما یک نامه الکترونیکی حاوی یک لینک جهت بازسازی گذرواژه دریافت خواهید کرد.",
@@ -42,7 +43,6 @@
 "Edit categories" => "ویرایش گروه ها",
 "Add" => "افزودن",
 "Create an <strong>admin account</strong>" => "لطفا یک <strong> شناسه برای مدیر</strong> بسازید",
-"Password" => "گذرواژه",
 "Advanced" => "حرفه ای",
 "Data folder" => "پوشه اطلاعاتی",
 "Configure the database" => "پایگاه داده برنامه ریزی شدند",
diff --git a/core/l10n/fi_FI.php b/core/l10n/fi_FI.php
index d253ee9433a..4a723b3448f 100644
--- a/core/l10n/fi_FI.php
+++ b/core/l10n/fi_FI.php
@@ -15,12 +15,27 @@
 "October" => "Lokakuu",
 "November" => "Marraskuu",
 "December" => "Joulukuu",
+"Choose" => "Valitse",
 "Cancel" => "Peru",
 "No" => "Ei",
 "Yes" => "Kyllä",
 "Ok" => "Ok",
 "No categories selected for deletion." => "Luokkia ei valittu poistettavaksi.",
 "Error" => "Virhe",
+"Error while changing permissions" => "Virhe oikeuksia muuttaessa",
+"Password protect" => "Suojaa salasanalla",
+"Password" => "Salasana",
+"Set expiration date" => "Aseta päättymispäivä",
+"Expiration date" => "Päättymispäivä",
+"Share via email: %s" => "Jaa sähköpostitse: %s",
+"Resharing is not allowed" => "Jakaminen uudelleen ei ole salittu",
+"can edit" => "voi muokata",
+"create" => "luo",
+"update" => "päivitä",
+"delete" => "poista",
+"share" => "jaa",
+"Password protected" => "Salasanasuojattu",
+"Error setting expiration date" => "Virhe päättymispäivää asettaessa",
 "ownCloud password reset" => "ownCloud-salasanan nollaus",
 "Use the following link to reset your password: {link}" => "Voit palauttaa salasanasi seuraavassa osoitteessa: {link}",
 "You will receive a link to reset your password via Email." => "Saat sähköpostitse linkin nollataksesi salasanan.",
@@ -42,7 +57,6 @@
 "Edit categories" => "Muokkaa luokkia",
 "Add" => "Lisää",
 "Create an <strong>admin account</strong>" => "Luo <strong>ylläpitäjän tunnus</strong>",
-"Password" => "Salasana",
 "Advanced" => "Lisäasetukset",
 "Data folder" => "Datakansio",
 "Configure the database" => "Muokkaa tietokantaa",
diff --git a/core/l10n/fr.php b/core/l10n/fr.php
index 2904ebf48b2..1a2d17c69d0 100644
--- a/core/l10n/fr.php
+++ b/core/l10n/fr.php
@@ -15,12 +15,38 @@
 "October" => "octobre",
 "November" => "novembre",
 "December" => "décembre",
+"Choose" => "Choisir",
 "Cancel" => "Annuler",
 "No" => "Non",
 "Yes" => "Oui",
 "Ok" => "Ok",
 "No categories selected for deletion." => "Aucune catégorie sélectionnée pour suppression",
 "Error" => "Erreur",
+"Error while sharing" => "Erreur lors de la mise en partage",
+"Error while unsharing" => "Erreur lors de l'annulation du partage",
+"Error while changing permissions" => "Erreur lors du changement des permissions",
+"Shared with you and the group %s by %s" => "Partagé avec vous ainsi qu'avec le groupe %s par %s",
+"Shared with you by %s" => "Partagé avec vous par %s",
+"Share with" => "Partager avec",
+"Share with link" => "Partager via lien",
+"Password protect" => "Protéger par un mot de passe",
+"Password" => "Mot de passe",
+"Set expiration date" => "Spécifier la date d'expiration",
+"Expiration date" => "Date d'expiration",
+"Share via email: %s" => "Partager via email : %s",
+"No people found" => "Aucun utilisateur trouvé",
+"Resharing is not allowed" => "Le repartage n'est pas autorisé",
+"Shared in %s with %s" => "Partagé dans %s avec %s",
+"Unshare" => "Ne plus partager",
+"can edit" => "édition autorisée",
+"access control" => "contrôle des accès",
+"create" => "créer",
+"update" => "mettre à jour",
+"delete" => "supprimer",
+"share" => "partager",
+"Password protected" => "Protégé par un mot de passe",
+"Error unsetting expiration date" => "Un erreur est survenue pendant la suppression de la date d'expiration",
+"Error setting expiration date" => "Erreur lors de la spécification de la date d'expiration",
 "ownCloud password reset" => "Réinitialisation de votre mot de passe Owncloud",
 "Use the following link to reset your password: {link}" => "Utilisez le lien suivant pour réinitialiser votre mot de passe : {link}",
 "You will receive a link to reset your password via Email." => "Vous allez recevoir un e-mail contenant un lien pour réinitialiser votre mot de passe.",
@@ -42,7 +68,6 @@
 "Edit categories" => "Modifier les catégories",
 "Add" => "Ajouter",
 "Create an <strong>admin account</strong>" => "Créer un <strong>compte administrateur</strong>",
-"Password" => "Mot de passe",
 "Advanced" => "Avancé",
 "Data folder" => "Répertoire des données",
 "Configure the database" => "Configurer la base de données",
diff --git a/core/l10n/gl.php b/core/l10n/gl.php
index af849712199..61c113c5915 100644
--- a/core/l10n/gl.php
+++ b/core/l10n/gl.php
@@ -21,6 +21,7 @@
 "Ok" => "Ok",
 "No categories selected for deletion." => "Non hai categorías seleccionadas para eliminar.",
 "Error" => "Erro",
+"Password" => "Contrasinal",
 "ownCloud password reset" => "Restablecer contrasinal de ownCloud",
 "Use the following link to reset your password: {link}" => "Use a seguinte ligazón para restablecer o contrasinal: {link}",
 "You will receive a link to reset your password via Email." => "Recibirá unha ligazón por correo electrónico para restablecer o contrasinal",
@@ -42,7 +43,6 @@
 "Edit categories" => "Editar categorias",
 "Add" => "Engadir",
 "Create an <strong>admin account</strong>" => "Crear unha <strong>contra de administrador</strong>",
-"Password" => "Contrasinal",
 "Advanced" => "Avanzado",
 "Data folder" => "Cartafol de datos",
 "Configure the database" => "Configurar a base de datos",
diff --git a/core/l10n/he.php b/core/l10n/he.php
index f0a18103a8f..0be59b8baef 100644
--- a/core/l10n/he.php
+++ b/core/l10n/he.php
@@ -21,6 +21,7 @@
 "Ok" => "בסדר",
 "No categories selected for deletion." => "לא נבחרו קטגוריות למחיקה",
 "Error" => "שגיאה",
+"Password" => "ססמה",
 "ownCloud password reset" => "איפוס הססמה של ownCloud",
 "Use the following link to reset your password: {link}" => "יש להשתמש בקישור הבא כדי לאפס את הססמה שלך: {link}",
 "You will receive a link to reset your password via Email." => "יישלח לתיבת הדוא״ל שלך קישור לאיפוס הססמה.",
@@ -42,7 +43,6 @@
 "Edit categories" => "עריכת הקטגוריות",
 "Add" => "הוספה",
 "Create an <strong>admin account</strong>" => "יצירת <strong>חשבון מנהל</strong>",
-"Password" => "ססמה",
 "Advanced" => "מתקדם",
 "Data folder" => "תיקיית נתונים",
 "Configure the database" => "הגדרת מסד הנתונים",
@@ -50,6 +50,7 @@
 "Database user" => "שם משתמש במסד הנתונים",
 "Database password" => "ססמת מסד הנתונים",
 "Database name" => "שם מסד הנתונים",
+"Database tablespace" => "מרחב הכתובות של מסד הנתונים",
 "Database host" => "שרת בסיס נתונים",
 "Finish setup" => "סיום התקנה",
 "web services under your control" => "שירותי רשת בשליטתך",
diff --git a/core/l10n/hi.php b/core/l10n/hi.php
index cc9cbdb22f3..c84f76c4e49 100644
--- a/core/l10n/hi.php
+++ b/core/l10n/hi.php
@@ -1,8 +1,8 @@
 <?php $TRANSLATIONS = array(
+"Password" => "पासवर्ड",
 "Username" => "प्रयोक्ता का नाम",
 "Cloud not found" => "क्लौड नहीं मिला ",
 "Create an <strong>admin account</strong>" => "व्यवस्थापक खाता बनाएँ",
-"Password" => "पासवर्ड",
 "Advanced" => "उन्नत",
 "Configure the database" => "डेटाबेस कॉन्फ़िगर करें ",
 "Database user" => "डेटाबेस उपयोगकर्ता",
diff --git a/core/l10n/hr.php b/core/l10n/hr.php
index 723cceb4d01..c8f683d8270 100644
--- a/core/l10n/hr.php
+++ b/core/l10n/hr.php
@@ -21,6 +21,7 @@
 "Ok" => "U redu",
 "No categories selected for deletion." => "Nema odabranih kategorija za brisanje.",
 "Error" => "Pogreška",
+"Password" => "Lozinka",
 "ownCloud password reset" => "ownCloud resetiranje lozinke",
 "Use the following link to reset your password: {link}" => "Koristite ovaj link da biste poništili lozinku: {link}",
 "You will receive a link to reset your password via Email." => "Primit ćete link kako biste poništili zaporku putem e-maila.",
@@ -42,7 +43,6 @@
 "Edit categories" => "Uredi kategorije",
 "Add" => "Dodaj",
 "Create an <strong>admin account</strong>" => "Stvori <strong>administratorski račun</strong>",
-"Password" => "Lozinka",
 "Advanced" => "Dodatno",
 "Data folder" => "Mapa baze podataka",
 "Configure the database" => "Konfiguriraj bazu podataka",
diff --git a/core/l10n/hu_HU.php b/core/l10n/hu_HU.php
index a97c4cb8861..9a1f3a1abf3 100644
--- a/core/l10n/hu_HU.php
+++ b/core/l10n/hu_HU.php
@@ -21,6 +21,7 @@
 "Ok" => "Ok",
 "No categories selected for deletion." => "Nincs törlésre jelölt kategória",
 "Error" => "Hiba",
+"Password" => "Jelszó",
 "ownCloud password reset" => "ownCloud jelszó-visszaállítás",
 "Use the following link to reset your password: {link}" => "Használja az alábbi linket a jelszó-visszaállításhoz: {link}",
 "You will receive a link to reset your password via Email." => "Egy e-mailben kap értesítést a jelszóváltoztatás módjáról.",
@@ -42,7 +43,6 @@
 "Edit categories" => "Kategóriák szerkesztése",
 "Add" => "Hozzáadás",
 "Create an <strong>admin account</strong>" => "<strong>Rendszergazdafiók</strong> létrehozása",
-"Password" => "Jelszó",
 "Advanced" => "Haladó",
 "Data folder" => "Adatkönyvtár",
 "Configure the database" => "Adatbázis konfigurálása",
diff --git a/core/l10n/ia.php b/core/l10n/ia.php
index e202daafa32..862c5eb0a29 100644
--- a/core/l10n/ia.php
+++ b/core/l10n/ia.php
@@ -1,6 +1,7 @@
 <?php $TRANSLATIONS = array(
 "This category already exists: " => "Iste categoria jam existe:",
 "Settings" => "Configurationes",
+"Password" => "Contrasigno",
 "ownCloud password reset" => "Reinitialisation del contrasigno de ownCLoud",
 "Requested" => "Requestate",
 "Login failed!" => "Initio de session fallite!",
@@ -20,7 +21,6 @@
 "Edit categories" => "Modificar categorias",
 "Add" => "Adder",
 "Create an <strong>admin account</strong>" => "Crear un <strong>conto de administration</strong>",
-"Password" => "Contrasigno",
 "Advanced" => "Avantiate",
 "Data folder" => "Dossier de datos",
 "Configure the database" => "Configurar le base de datos",
diff --git a/core/l10n/id.php b/core/l10n/id.php
index 47758f8861b..c71d767dbf5 100644
--- a/core/l10n/id.php
+++ b/core/l10n/id.php
@@ -20,6 +20,7 @@
 "Yes" => "Ya",
 "Ok" => "Oke",
 "No categories selected for deletion." => "Tidak ada kategori terpilih untuk penghapusan.",
+"Password" => "Password",
 "ownCloud password reset" => "reset password ownCloud",
 "Use the following link to reset your password: {link}" => "Gunakan tautan berikut untuk mereset password anda: {link}",
 "You will receive a link to reset your password via Email." => "Anda akan mendapatkan link untuk mereset password anda lewat Email.",
@@ -41,7 +42,6 @@
 "Edit categories" => "Edit kategori",
 "Add" => "Tambahkan",
 "Create an <strong>admin account</strong>" => "Buat sebuah <strong>akun admin</strong>",
-"Password" => "Password",
 "Advanced" => "Tingkat Lanjut",
 "Data folder" => "Folder data",
 "Configure the database" => "Konfigurasi database",
diff --git a/core/l10n/it.php b/core/l10n/it.php
index 8d9ac21cd43..669c6b6e44a 100644
--- a/core/l10n/it.php
+++ b/core/l10n/it.php
@@ -15,12 +15,38 @@
 "October" => "Ottobre",
 "November" => "Novembre",
 "December" => "Dicembre",
+"Choose" => "Scegli",
 "Cancel" => "Annulla",
 "No" => "No",
 "Yes" => "Sì",
 "Ok" => "Ok",
 "No categories selected for deletion." => "Nessuna categoria selezionata per l'eliminazione.",
 "Error" => "Errore",
+"Error while sharing" => "Errore durante la condivisione",
+"Error while unsharing" => "Errore durante la rimozione della condivisione",
+"Error while changing permissions" => "Errore durante la modifica dei permessi",
+"Shared with you and the group %s by %s" => "Condivisa con te e con il gruppo %s da %s",
+"Shared with you by %s" => "Condiviso con te da %s",
+"Share with" => "Condividi con",
+"Share with link" => "Condividi con collegamento",
+"Password protect" => "Proteggi con password",
+"Password" => "Password",
+"Set expiration date" => "Imposta data di scadenza",
+"Expiration date" => "Data di scadenza",
+"Share via email: %s" => "Condividi tramite email: %s",
+"No people found" => "Non sono state trovate altre persone",
+"Resharing is not allowed" => "La ri-condivisione non è consentita",
+"Shared in %s with %s" => "Condiviso in %s con %s",
+"Unshare" => "Rimuovi condivisione",
+"can edit" => "può modificare",
+"access control" => "controllo d'accesso",
+"create" => "creare",
+"update" => "aggiornare",
+"delete" => "eliminare",
+"share" => "condividere",
+"Password protected" => "Protetta da password",
+"Error unsetting expiration date" => "Errore durante la rimozione della data di scadenza",
+"Error setting expiration date" => "Errore durante l'impostazione della data di scadenza",
 "ownCloud password reset" => "Ripristino password di ownCloud",
 "Use the following link to reset your password: {link}" => "Usa il collegamento seguente per ripristinare la password: {link}",
 "You will receive a link to reset your password via Email." => "Riceverai un collegamento per ripristinare la tua password via email",
@@ -42,7 +68,6 @@
 "Edit categories" => "Modifica le categorie",
 "Add" => "Aggiungi",
 "Create an <strong>admin account</strong>" => "Crea un <strong>account amministratore</strong>",
-"Password" => "Password",
 "Advanced" => "Avanzate",
 "Data folder" => "Cartella dati",
 "Configure the database" => "Configura il database",
diff --git a/core/l10n/ja_JP.php b/core/l10n/ja_JP.php
index 62f5e16f3ca..bd442ef4116 100644
--- a/core/l10n/ja_JP.php
+++ b/core/l10n/ja_JP.php
@@ -15,12 +15,38 @@
 "October" => "10月",
 "November" => "11月",
 "December" => "12月",
+"Choose" => "選択",
 "Cancel" => "キャンセル",
 "No" => "いいえ",
 "Yes" => "はい",
 "Ok" => "OK",
 "No categories selected for deletion." => "削除するカテゴリが選択されていません。",
 "Error" => "エラー",
+"Error while sharing" => "共有でエラー発生",
+"Error while unsharing" => "共有解除でエラー発生",
+"Error while changing permissions" => "権限変更でエラー発生",
+"Shared with you and the group %s by %s" => "あなたと %s グループが %s で共有しています",
+"Shared with you by %s" => "あなたと %s で共有しています",
+"Share with" => "共有者",
+"Share with link" => "URLリンクで共有",
+"Password protect" => "パスワード保護",
+"Password" => "パスワード",
+"Set expiration date" => "有効期限を設定",
+"Expiration date" => "有効期限",
+"Share via email: %s" => "メール経由で共有: %s",
+"No people found" => "ユーザーが見つかりません",
+"Resharing is not allowed" => "再共有は許可されていません",
+"Shared in %s with %s" => "%s 内で %s と共有",
+"Unshare" => "共有解除",
+"can edit" => "編集可能",
+"access control" => "アクセス権限",
+"create" => "作成",
+"update" => "更新",
+"delete" => "削除",
+"share" => "共有",
+"Password protected" => "パスワード保護",
+"Error unsetting expiration date" => "有効期限の未設定エラー",
+"Error setting expiration date" => "有効期限の設定でエラー発生",
 "ownCloud password reset" => "ownCloudのパスワードをリセットします",
 "Use the following link to reset your password: {link}" => "パスワードをリセットするには次のリンクをクリックして下さい: {link}",
 "You will receive a link to reset your password via Email." => "メールでパスワードをリセットするリンクが届きます。",
@@ -42,7 +68,6 @@
 "Edit categories" => "カテゴリを編集",
 "Add" => "追加",
 "Create an <strong>admin account</strong>" => "<strong>管理者アカウント</strong>を作成してください",
-"Password" => "パスワード",
 "Advanced" => "詳細設定",
 "Data folder" => "データフォルダ",
 "Configure the database" => "データベースを設定してください",
diff --git a/core/l10n/ko.php b/core/l10n/ko.php
index 9f82a79c43c..0430495861d 100644
--- a/core/l10n/ko.php
+++ b/core/l10n/ko.php
@@ -21,6 +21,7 @@
 "Ok" => "승락",
 "No categories selected for deletion." => "삭제 카테고리를 선택하지 않았습니다.",
 "Error" => "에러",
+"Password" => "암호",
 "ownCloud password reset" => "ownCloud 비밀번호 재설정",
 "Use the following link to reset your password: {link}" => "다음 링크를 사용하여 암호를 초기화할 수 있습니다: {link}",
 "You will receive a link to reset your password via Email." => "전자 우편으로 암호 재설정 링크를 보냈습니다.",
@@ -42,7 +43,6 @@
 "Edit categories" => "카테고리 편집",
 "Add" => "추가",
 "Create an <strong>admin account</strong>" => "<strong>관리자 계정</strong>을 만드십시오",
-"Password" => "암호",
 "Advanced" => "고급",
 "Data folder" => "자료 폴더",
 "Configure the database" => "데이터베이스 구성",
diff --git a/core/l10n/lb.php b/core/l10n/lb.php
index 0959e0ed25f..de8ab502721 100644
--- a/core/l10n/lb.php
+++ b/core/l10n/lb.php
@@ -21,6 +21,7 @@
 "Ok" => "OK",
 "No categories selected for deletion." => "Keng Kategorien ausgewielt fir ze läschen.",
 "Error" => "Fehler",
+"Password" => "Passwuert",
 "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.",
@@ -42,7 +43,6 @@
 "Edit categories" => "Kategorien editéieren",
 "Add" => "Bäisetzen",
 "Create an <strong>admin account</strong>" => "En <strong>Admin Account</strong> uleeën",
-"Password" => "Passwuert",
 "Advanced" => "Advanced",
 "Data folder" => "Daten Dossier",
 "Configure the database" => "Datebank konfiguréieren",
diff --git a/core/l10n/lt_LT.php b/core/l10n/lt_LT.php
index 0a3320351cf..4839c667718 100644
--- a/core/l10n/lt_LT.php
+++ b/core/l10n/lt_LT.php
@@ -21,6 +21,7 @@
 "Ok" => "Gerai",
 "No categories selected for deletion." => "Trynimui nepasirinkta jokia kategorija.",
 "Error" => "Klaida",
+"Password" => "Slaptažodis",
 "ownCloud password reset" => "ownCloud slaptažodžio atkūrimas",
 "Use the following link to reset your password: {link}" => "Slaptažodio atkūrimui naudokite šią nuorodą: {link}",
 "You will receive a link to reset your password via Email." => "Elektroniniu paštu gausite nuorodą, su kuria galėsite iš naujo nustatyti slaptažodį.",
@@ -42,7 +43,6 @@
 "Edit categories" => "Redaguoti kategorijas",
 "Add" => "Pridėti",
 "Create an <strong>admin account</strong>" => "Sukurti <strong>administratoriaus paskyrą</strong>",
-"Password" => "Slaptažodis",
 "Advanced" => "Išplėstiniai",
 "Data folder" => "Duomenų katalogas",
 "Configure the database" => "Nustatyti duomenų bazę",
diff --git a/core/l10n/lv.php b/core/l10n/lv.php
index 6435c501587..7825d5aec1e 100644
--- a/core/l10n/lv.php
+++ b/core/l10n/lv.php
@@ -1,5 +1,6 @@
 <?php $TRANSLATIONS = array(
 "Settings" => "Iestatījumi",
+"Password" => "Parole",
 "Use the following link to reset your password: {link}" => "Izmantojiet šo linku lai mainītu paroli",
 "You will receive a link to reset your password via Email." => "Jūs savā epastā saņemsiet interneta saiti, caur kuru varēsiet atjaunot paroli.",
 "Requested" => "Obligāts",
@@ -16,7 +17,6 @@
 "Admin" => "Administrators",
 "Help" => "Palīdzība",
 "Cloud not found" => "Mākonis netika atrasts",
-"Password" => "Parole",
 "Data folder" => "Datu mape",
 "Configure the database" => "Nokonfigurēt datubāzi",
 "will be used" => "tiks izmantots",
diff --git a/core/l10n/mk.php b/core/l10n/mk.php
index 3eea6cd58d1..149dd4a5b40 100644
--- a/core/l10n/mk.php
+++ b/core/l10n/mk.php
@@ -21,6 +21,7 @@
 "Ok" => "Во ред",
 "No categories selected for deletion." => "Не е одбрана категорија за бришење.",
 "Error" => "Грешка",
+"Password" => "Лозинка",
 "ownCloud password reset" => "ресетирање на лозинка за ownCloud",
 "Use the following link to reset your password: {link}" => "Користете ја следната врска да ја ресетирате Вашата лозинка: {link}",
 "You will receive a link to reset your password via Email." => "Ќе добиете врска по е-пошта за да може да ја ресетирате Вашата лозинка.",
@@ -42,7 +43,6 @@
 "Edit categories" => "Уреди категории",
 "Add" => "Додади",
 "Create an <strong>admin account</strong>" => "Направете <strong>администраторска сметка</strong>",
-"Password" => "Лозинка",
 "Advanced" => "Напредно",
 "Data folder" => "Фолдер со податоци",
 "Configure the database" => "Конфигурирај ја базата",
diff --git a/core/l10n/ms_MY.php b/core/l10n/ms_MY.php
index c99c510be62..8a271660e4a 100644
--- a/core/l10n/ms_MY.php
+++ b/core/l10n/ms_MY.php
@@ -21,6 +21,7 @@
 "Ok" => "Ok",
 "No categories selected for deletion." => "tiada kategori dipilih untuk penghapusan",
 "Error" => "Ralat",
+"Password" => "Kata laluan",
 "ownCloud password reset" => "Set semula kata lalaun ownCloud",
 "Use the following link to reset your password: {link}" => "Guna pautan berikut untuk menetapkan semula kata laluan anda: {link}",
 "You will receive a link to reset your password via Email." => "Anda akan menerima pautan untuk menetapkan semula kata laluan anda melalui emel",
@@ -42,7 +43,6 @@
 "Edit categories" => "Edit kategori",
 "Add" => "Tambah",
 "Create an <strong>admin account</strong>" => "buat <strong>akaun admin</strong>",
-"Password" => "Kata laluan",
 "Advanced" => "Maju",
 "Data folder" => "Fail data",
 "Configure the database" => "Konfigurasi pangkalan data",
diff --git a/core/l10n/nb_NO.php b/core/l10n/nb_NO.php
index a8bfebb8a55..e8e76bad4c3 100644
--- a/core/l10n/nb_NO.php
+++ b/core/l10n/nb_NO.php
@@ -21,6 +21,7 @@
 "Ok" => "Ok",
 "No categories selected for deletion." => "Ingen kategorier merket for sletting.",
 "Error" => "Feil",
+"Password" => "Passord",
 "ownCloud password reset" => "Tilbakestill ownCloud passord",
 "Use the following link to reset your password: {link}" => "Bruk følgende lenke for å tilbakestille passordet ditt: {link}",
 "You will receive a link to reset your password via Email." => "Du burde motta detaljer om å tilbakestille passordet ditt via epost.",
@@ -42,7 +43,6 @@
 "Edit categories" => "Rediger kategorier",
 "Add" => "Legg til",
 "Create an <strong>admin account</strong>" => "opprett en <strong>administrator-konto</strong>",
-"Password" => "Passord",
 "Advanced" => "Avansert",
 "Data folder" => "Datamappe",
 "Configure the database" => "Konfigurer databasen",
diff --git a/core/l10n/nl.php b/core/l10n/nl.php
index 3497381f74c..c5235690eae 100644
--- a/core/l10n/nl.php
+++ b/core/l10n/nl.php
@@ -15,12 +15,37 @@
 "October" => "Oktober",
 "November" => "November",
 "December" => "December",
+"Choose" => "Kies",
 "Cancel" => "Annuleren",
 "No" => "Nee",
 "Yes" => "Ja",
 "Ok" => "Ok",
 "No categories selected for deletion." => "Geen categorie geselecteerd voor verwijdering.",
 "Error" => "Fout",
+"Error while sharing" => "Fout tijdens het delen",
+"Error while unsharing" => "Fout tijdens het stoppen met delen",
+"Error while changing permissions" => "Fout tijdens het veranderen van permissies",
+"Shared with you and the group %s by %s" => "Gedeeld met u en de group %s door %s",
+"Shared with you by %s" => "Gedeeld met u door %s",
+"Share with" => "Deel met",
+"Share with link" => "Deel met link",
+"Password protect" => "Passeerwoord beveiliging",
+"Password" => "Wachtwoord",
+"Set expiration date" => "Zet vervaldatum",
+"Expiration date" => "Vervaldatum",
+"Share via email: %s" => "Deel via email: %s",
+"No people found" => "Geen mensen gevonden",
+"Resharing is not allowed" => "Verder delen is niet toegestaan",
+"Shared in %s with %s" => "Deel in %s met %s",
+"Unshare" => "Stop met delen",
+"can edit" => "kan wijzigen",
+"access control" => "toegangscontrole",
+"create" => "maak",
+"update" => "bijwerken",
+"delete" => "verwijderen",
+"share" => "deel",
+"Password protected" => "Passeerwoord beveiligd",
+"Error setting expiration date" => "Fout tijdens het configureren van de vervaldatum",
 "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}",
 "You will receive a link to reset your password via Email." => "U ontvangt een link om je wachtwoord opnieuw in te stellen via e-mail.",
@@ -42,7 +67,6 @@
 "Edit categories" => "Wijzigen categorieën",
 "Add" => "Toevoegen",
 "Create an <strong>admin account</strong>" => "Maak een <strong>beheerdersaccount</strong> aan",
-"Password" => "Wachtwoord",
 "Advanced" => "Geavanceerd",
 "Data folder" => "Gegevensmap",
 "Configure the database" => "Configureer de databank",
diff --git a/core/l10n/nn_NO.php b/core/l10n/nn_NO.php
index 9dfce36049f..147afb35fbd 100644
--- a/core/l10n/nn_NO.php
+++ b/core/l10n/nn_NO.php
@@ -1,5 +1,6 @@
 <?php $TRANSLATIONS = array(
 "Settings" => "Innstillingar",
+"Password" => "Passord",
 "Use the following link to reset your password: {link}" => "Bruk føljane link til å tilbakestille passordet ditt: {link}",
 "You will receive a link to reset your password via Email." => "Du vil få ei lenkje for å nullstilla passordet via epost.",
 "Requested" => "Førespurt",
@@ -17,7 +18,6 @@
 "Help" => "Hjelp",
 "Cloud not found" => "Fann ikkje skyen",
 "Create an <strong>admin account</strong>" => "Lag ein <strong>admin-konto</strong>",
-"Password" => "Passord",
 "Advanced" => "Avansert",
 "Data folder" => "Datamappe",
 "Configure the database" => "Konfigurer databasen",
diff --git a/core/l10n/pl.php b/core/l10n/pl.php
index 5f8752b69bb..7dcf0161792 100644
--- a/core/l10n/pl.php
+++ b/core/l10n/pl.php
@@ -15,12 +15,32 @@
 "October" => "Październik",
 "November" => "Listopad",
 "December" => "Grudzień",
+"Choose" => "Wybierz",
 "Cancel" => "Anuluj",
 "No" => "Nie",
 "Yes" => "Tak",
 "Ok" => "Ok",
 "No categories selected for deletion." => "Nie ma kategorii zaznaczonych do usunięcia.",
 "Error" => "Błąd",
+"Error while sharing" => "Błąd podczas współdzielenia",
+"Error while changing permissions" => "Błąd przy zmianie uprawnień",
+"Share with" => "Współdziel z",
+"Share with link" => "Współdziel z link",
+"Password protect" => "Zabezpieczone hasłem",
+"Password" => "Hasło",
+"Set expiration date" => "Ustaw datę wygaśnięcia",
+"Expiration date" => "Data wygaśnięcia",
+"Share via email: %s" => "Współdziel przez email: %s",
+"No people found" => "Nie znaleziono ludzi",
+"Resharing is not allowed" => "Współdzielenie nie jest możliwe",
+"can edit" => "można edytować",
+"access control" => "kontrola dostępu",
+"create" => "utwórz",
+"update" => "uaktualnij",
+"delete" => "usuń",
+"share" => "współdziel",
+"Password protected" => "Zabezpieczone hasłem",
+"Error setting expiration date" => "Błąd podczas ustawiania daty wygaśnięcia",
 "ownCloud password reset" => "restart hasła",
 "Use the following link to reset your password: {link}" => "Proszę użyć tego odnośnika do zresetowania hasła: {link}",
 "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.",
@@ -42,7 +62,6 @@
 "Edit categories" => "Edytuj kategorię",
 "Add" => "Dodaj",
 "Create an <strong>admin account</strong>" => "Tworzenie <strong>konta administratora</strong>",
-"Password" => "Hasło",
 "Advanced" => "Zaawansowane",
 "Data folder" => "Katalog danych",
 "Configure the database" => "Konfiguracja bazy danych",
diff --git a/core/l10n/pt_BR.php b/core/l10n/pt_BR.php
index 9ad2f3de53f..cd7064e89c3 100644
--- a/core/l10n/pt_BR.php
+++ b/core/l10n/pt_BR.php
@@ -15,12 +15,38 @@
 "October" => "Outubro",
 "November" => "Novembro",
 "December" => "Dezembro",
+"Choose" => "Escolha",
 "Cancel" => "Cancelar",
 "No" => "Não",
 "Yes" => "Sim",
 "Ok" => "Ok",
 "No categories selected for deletion." => "Nenhuma categoria selecionada para deletar.",
 "Error" => "Erro",
+"Error while sharing" => "Erro ao compartilhar",
+"Error while unsharing" => "Erro ao descompartilhar",
+"Error while changing permissions" => "Erro ao mudar permissões",
+"Shared with you and the group %s by %s" => "Compartilhado com você e o grupo %s por %s",
+"Shared with you by %s" => "Compartilhado com você por %s",
+"Share with" => "Compartilhar com",
+"Share with link" => "Compartilhar com link",
+"Password protect" => "Proteger com senha",
+"Password" => "Senha",
+"Set expiration date" => "Definir data de expiração",
+"Expiration date" => "Data de expiração",
+"Share via email: %s" => "Compartilhar via email: %s",
+"No people found" => "Nenhuma pessoa encontrada",
+"Resharing is not allowed" => "Não é permitido re-compartilhar",
+"Shared in %s with %s" => "Compartilhado em %s com %s",
+"Unshare" => "Descompartilhar",
+"can edit" => "pode editar",
+"access control" => "controle de acesso",
+"create" => "criar",
+"update" => "atualizar",
+"delete" => "remover",
+"share" => "compartilhar",
+"Password protected" => "Protegido com senha",
+"Error unsetting expiration date" => "Erro ao remover data de expiração",
+"Error setting expiration date" => "Erro ao definir data de expiração",
 "ownCloud password reset" => "Redefinir senha ownCloud",
 "Use the following link to reset your password: {link}" => "Use o seguinte link para redefinir sua senha: {link}",
 "You will receive a link to reset your password via Email." => "Você receberá um link para redefinir sua senha via e-mail.",
@@ -42,7 +68,6 @@
 "Edit categories" => "Editar categorias",
 "Add" => "Adicionar",
 "Create an <strong>admin account</strong>" => "Criar uma <strong>conta</strong> de <strong>administrador</strong>",
-"Password" => "Senha",
 "Advanced" => "Avançado",
 "Data folder" => "Pasta de dados",
 "Configure the database" => "Configurar o banco de dados",
@@ -50,6 +75,7 @@
 "Database user" => "Usuário de banco de dados",
 "Database password" => "Senha do banco de dados",
 "Database name" => "Nome do banco de dados",
+"Database tablespace" => "Espaço de tabela do banco de dados",
 "Database host" => "Banco de dados do host",
 "Finish setup" => "Concluir configuração",
 "web services under your control" => "web services sob seu controle",
diff --git a/core/l10n/pt_PT.php b/core/l10n/pt_PT.php
index 4da513c1aec..4ab9958f430 100644
--- a/core/l10n/pt_PT.php
+++ b/core/l10n/pt_PT.php
@@ -21,6 +21,7 @@
 "Ok" => "Ok",
 "No categories selected for deletion." => "Nenhuma categoria seleccionar para eliminar",
 "Error" => "Erro",
+"Password" => "Palavra chave",
 "ownCloud password reset" => "Reposição da password ownCloud",
 "Use the following link to reset your password: {link}" => "Use o seguinte endereço para repor a sua password: {link}",
 "You will receive a link to reset your password via Email." => "Vai receber um endereço para repor a sua password",
@@ -42,7 +43,6 @@
 "Edit categories" => "Editar categorias",
 "Add" => "Adicionar",
 "Create an <strong>admin account</strong>" => "Criar uma <strong>conta administrativa</strong>",
-"Password" => "Palavra chave",
 "Advanced" => "Avançado",
 "Data folder" => "Pasta de dados",
 "Configure the database" => "Configure a base de dados",
diff --git a/core/l10n/ro.php b/core/l10n/ro.php
index 484a47727dc..4083113a653 100644
--- a/core/l10n/ro.php
+++ b/core/l10n/ro.php
@@ -3,6 +3,50 @@
 "No category to add?" => "Nici o categorie de adăugat?",
 "This category already exists: " => "Această categorie deja există:",
 "Settings" => "Configurări",
+"January" => "Ianuarie",
+"February" => "Februarie",
+"March" => "Martie",
+"April" => "Aprilie",
+"May" => "Mai",
+"June" => "Iunie",
+"July" => "Iulie",
+"August" => "August",
+"September" => "Septembrie",
+"October" => "Octombrie",
+"November" => "Noiembrie",
+"December" => "Decembrie",
+"Choose" => "Alege",
+"Cancel" => "Anulare",
+"No" => "Nu",
+"Yes" => "Da",
+"Ok" => "Ok",
+"No categories selected for deletion." => "Nici o categorie selectată pentru ștergere.",
+"Error" => "Eroare",
+"Error while sharing" => "Eroare la partajare",
+"Error while unsharing" => "Eroare la anularea partajării",
+"Error while changing permissions" => "Eroare la modificarea permisiunilor",
+"Shared with you and the group %s by %s" => "Partajat cu tine și grupul %s de %s",
+"Shared with you by %s" => "Partajat cu tine de %s",
+"Share with" => "Partajat cu",
+"Share with link" => "Partajare cu legătură",
+"Password protect" => "Protejare cu parolă",
+"Password" => "Parola",
+"Set expiration date" => "Specifică data expirării",
+"Expiration date" => "Data expirării",
+"Share via email: %s" => "Partajare prin email: %s",
+"No people found" => "Nici o persoană găsită",
+"Resharing is not allowed" => "Repartajarea nu este permisă",
+"Shared in %s with %s" => "Partajat în %s cu %s",
+"Unshare" => "Anulare partajare",
+"can edit" => "poate edita",
+"access control" => "control acces",
+"create" => "creare",
+"update" => "actualizare",
+"delete" => "ștergere",
+"share" => "partajare",
+"Password protected" => "Protejare cu parolă",
+"Error unsetting expiration date" => "Eroare la anularea datei de expirare",
+"Error setting expiration date" => "Eroare la specificarea datei de expirare",
 "ownCloud password reset" => "Resetarea parolei ownCloud ",
 "Use the following link to reset your password: {link}" => "Folosește următorul link pentru a reseta parola: {link}",
 "You will receive a link to reset your password via Email." => "Vei primi un mesaj prin care vei putea reseta parola via email",
@@ -24,7 +68,6 @@
 "Edit categories" => "Editează categoriile",
 "Add" => "Adaugă",
 "Create an <strong>admin account</strong>" => "Crează un <strong>cont de administrator</strong>",
-"Password" => "Parola",
 "Advanced" => "Avansat",
 "Data folder" => "Director date",
 "Configure the database" => "Configurează baza de date",
@@ -32,6 +75,7 @@
 "Database user" => "Utilizatorul bazei de date",
 "Database password" => "Parola bazei de date",
 "Database name" => "Numele bazei de date",
+"Database tablespace" => "Tabela de spațiu a bazei de date",
 "Database host" => "Bază date",
 "Finish setup" => "Finalizează instalarea",
 "web services under your control" => "servicii web controlate de tine",
diff --git a/core/l10n/ru.php b/core/l10n/ru.php
index 81b579aeb0d..4aec059d407 100644
--- a/core/l10n/ru.php
+++ b/core/l10n/ru.php
@@ -21,6 +21,7 @@
 "Ok" => "Ок",
 "No categories selected for deletion." => "Нет категорий для удаления.",
 "Error" => "Ошибка",
+"Password" => "Пароль",
 "ownCloud password reset" => "Сброс пароля ",
 "Use the following link to reset your password: {link}" => "Используйте следующую ссылку чтобы сбросить пароль: {link}",
 "You will receive a link to reset your password via Email." => "На ваш адрес Email выслана ссылка для сброса пароля.",
@@ -42,7 +43,6 @@
 "Edit categories" => "Редактировать категории",
 "Add" => "Добавить",
 "Create an <strong>admin account</strong>" => "Создать <strong>учётную запись администратора</strong>",
-"Password" => "Пароль",
 "Advanced" => "Дополнительно",
 "Data folder" => "Директория с данными",
 "Configure the database" => "Настройка базы данных",
@@ -50,6 +50,7 @@
 "Database user" => "Имя пользователя для базы данных",
 "Database password" => "Пароль для базы данных",
 "Database name" => "Название базы данных",
+"Database tablespace" => "Табличое пространство базы данных",
 "Database host" => "Хост базы данных",
 "Finish setup" => "Завершить установку",
 "web services under your control" => "Сетевые службы под твоим контролем",
diff --git a/core/l10n/ru_RU.php b/core/l10n/ru_RU.php
new file mode 100644
index 00000000000..563a261e5d4
--- /dev/null
+++ b/core/l10n/ru_RU.php
@@ -0,0 +1,77 @@
+<?php $TRANSLATIONS = array(
+"Application name not provided." => "Имя приложения не предоставлено.",
+"No category to add?" => "Нет категории для добавления?",
+"This category already exists: " => "Эта категория уже существует:",
+"Settings" => "Настройки",
+"January" => "Январь",
+"February" => "Февраль",
+"March" => "Март",
+"April" => "Апрель",
+"May" => "Май",
+"June" => "Июнь",
+"July" => "Июль",
+"August" => "Август",
+"September" => "Сентябрь",
+"October" => "Октябрь",
+"November" => "Ноябрь",
+"December" => "Декабрь",
+"Choose" => "Выбрать",
+"Cancel" => "Отмена",
+"No" => "Нет",
+"Yes" => "Да",
+"Ok" => "Да",
+"No categories selected for deletion." => "Нет категорий, выбранных для удаления.",
+"Error" => "Ошибка",
+"Error while sharing" => "Ошибка создания общего доступа",
+"Error while unsharing" => "Ошибка отключения общего доступа",
+"Error while changing permissions" => "Ошибка при изменении прав доступа",
+"Shared with you and the group %s by %s" => "Общий доступ для Вас и группы %s к %s",
+"Password protect" => "Защитить паролем",
+"Password" => "Пароль",
+"No people found" => "Не найдено людей",
+"Unshare" => "Отключить общий доступ",
+"access control" => "контроль доступа",
+"create" => "создать",
+"update" => "обновить",
+"delete" => "удалить",
+"share" => "сделать общим",
+"ownCloud password reset" => "Переназначение пароля",
+"Use the following link to reset your password: {link}" => "Воспользуйтесь следующей ссылкой для переназначения пароля: {link}",
+"You will receive a link to reset your password via Email." => "Вы получите ссылку для восстановления пароля по электронной почте.",
+"Requested" => "Запрашиваемое",
+"Login failed!" => "Войти не удалось!",
+"Username" => "Имя пользователя",
+"Request reset" => "Сброс запроса",
+"Your password was reset" => "Ваш пароль был переустановлен",
+"To login page" => "На страницу входа",
+"New password" => "Новый пароль",
+"Reset password" => "Переназначение пароля",
+"Personal" => "Персональный",
+"Users" => "Пользователи",
+"Apps" => "Приложения",
+"Admin" => "Администратор",
+"Help" => "Помощь",
+"Access forbidden" => "Доступ запрещен",
+"Cloud not found" => "Облако не найдено",
+"Edit categories" => "Редактирование категорий",
+"Add" => "Добавить",
+"Create an <strong>admin account</strong>" => "Создать <strong>admin account</strong>",
+"Advanced" => "Расширенный",
+"Data folder" => "Папка данных",
+"Configure the database" => "Настроить базу данных",
+"will be used" => "будет использоваться",
+"Database user" => "Пользователь базы данных",
+"Database password" => "Пароль базы данных",
+"Database name" => "Имя базы данных",
+"Database tablespace" => "Табличная область базы данных",
+"Database host" => "Сервер базы данных",
+"Finish setup" => "Завершение настройки",
+"web services under your control" => "веб-сервисы под Вашим контролем",
+"Log out" => "Выйти",
+"Lost your password?" => "Забыли пароль?",
+"remember" => "запомнить",
+"Log in" => "Войти",
+"You are logged out." => "Вы вышли из системы.",
+"prev" => "предыдущий",
+"next" => "следующий"
+);
diff --git a/core/l10n/sk_SK.php b/core/l10n/sk_SK.php
index 8c3339170d6..069a169b5df 100644
--- a/core/l10n/sk_SK.php
+++ b/core/l10n/sk_SK.php
@@ -21,6 +21,7 @@
 "Ok" => "Ok",
 "No categories selected for deletion." => "Neboli vybrané žiadne kategórie pre odstránenie.",
 "Error" => "Chyba",
+"Password" => "Heslo",
 "ownCloud password reset" => "Obnovenie hesla pre ownCloud",
 "Use the following link to reset your password: {link}" => "Použite nasledujúci odkaz pre obnovenie vášho hesla: {link}",
 "You will receive a link to reset your password via Email." => "Odkaz pre obnovenie hesla obdržíte E-mailom.",
@@ -38,11 +39,10 @@
 "Admin" => "Administrácia",
 "Help" => "Pomoc",
 "Access forbidden" => "Prístup odmietnutý",
-"Cloud not found" => "Nedokážem nájsť",
+"Cloud not found" => "Nenájdené",
 "Edit categories" => "Úprava kategórií",
 "Add" => "Pridať",
 "Create an <strong>admin account</strong>" => "Vytvoriť <strong>administrátorský účet</strong>",
-"Password" => "Heslo",
 "Advanced" => "Pokročilé",
 "Data folder" => "Priečinok dát",
 "Configure the database" => "Nastaviť databázu",
diff --git a/core/l10n/sl.php b/core/l10n/sl.php
index b7850c28619..2c8ff34e63d 100644
--- a/core/l10n/sl.php
+++ b/core/l10n/sl.php
@@ -21,6 +21,8 @@
 "Ok" => "V redu",
 "No categories selected for deletion." => "Za izbris ni bila izbrana nobena kategorija.",
 "Error" => "Napaka",
+"Password" => "Geslo",
+"Password protected" => "Zaščiteno z geslom",
 "ownCloud password reset" => "Ponastavitev gesla ownCloud",
 "Use the following link to reset your password: {link}" => "Uporabite sledečo povezavo za ponastavitev gesla: {link}",
 "You will receive a link to reset your password via Email." => "Na e-pošto boste prejeli povezavo s katero lahko ponastavite vaše geslo.",
@@ -42,7 +44,6 @@
 "Edit categories" => "Uredi kategorije",
 "Add" => "Dodaj",
 "Create an <strong>admin account</strong>" => "Ustvari <strong>skrbniški račun</strong>",
-"Password" => "Geslo",
 "Advanced" => "Napredne možnosti",
 "Data folder" => "Mapa s podatki",
 "Configure the database" => "Nastavi podatkovno zbirko",
diff --git a/core/l10n/sr.php b/core/l10n/sr.php
index c2f2f07640e..dca207441fc 100644
--- a/core/l10n/sr.php
+++ b/core/l10n/sr.php
@@ -1,5 +1,6 @@
 <?php $TRANSLATIONS = array(
 "Settings" => "Подешавања",
+"Password" => "Лозинка",
 "Use the following link to reset your password: {link}" => "Овом везом ресетујте своју лозинку: {link}",
 "You will receive a link to reset your password via Email." => "Добићете везу за ресетовање лозинке путем е-поште.",
 "Requested" => "Захтевано",
@@ -17,7 +18,6 @@
 "Help" => "Помоћ",
 "Cloud not found" => "Облак није нађен",
 "Create an <strong>admin account</strong>" => "Направи <strong>административни налог</strong>",
-"Password" => "Лозинка",
 "Advanced" => "Напредно",
 "Data folder" => "Фацикла података",
 "Configure the database" => "Подешавање базе",
diff --git a/core/l10n/sr@latin.php b/core/l10n/sr@latin.php
index 8bc20cf1a6f..c1d8a96073a 100644
--- a/core/l10n/sr@latin.php
+++ b/core/l10n/sr@latin.php
@@ -1,5 +1,6 @@
 <?php $TRANSLATIONS = array(
 "Settings" => "Podešavanja",
+"Password" => "Lozinka",
 "You will receive a link to reset your password via Email." => "Dobićete vezu za resetovanje lozinke putem e-pošte.",
 "Requested" => "Zahtevano",
 "Login failed!" => "Nesupela prijava!",
@@ -15,7 +16,6 @@
 "Help" => "Pomoć",
 "Cloud not found" => "Oblak nije nađen",
 "Create an <strong>admin account</strong>" => "Napravi <strong>administrativni nalog</strong>",
-"Password" => "Lozinka",
 "Advanced" => "Napredno",
 "Data folder" => "Facikla podataka",
 "Configure the database" => "Podešavanje baze",
diff --git a/core/l10n/sv.php b/core/l10n/sv.php
index 6b075f0aaf2..993aae71ac3 100644
--- a/core/l10n/sv.php
+++ b/core/l10n/sv.php
@@ -15,12 +15,38 @@
 "October" => "Oktober",
 "November" => "November",
 "December" => "December",
+"Choose" => "Välj",
 "Cancel" => "Avbryt",
 "No" => "Nej",
 "Yes" => "Ja",
 "Ok" => "Ok",
 "No categories selected for deletion." => "Inga kategorier valda för radering.",
 "Error" => "Fel",
+"Error while sharing" => "Fel vid delning",
+"Error while unsharing" => "Fel när delning skulle avslutas",
+"Error while changing permissions" => "Fel vid ändring av rättigheter",
+"Shared with you and the group %s by %s" => "Delad med dig och gruppen %s av %s",
+"Shared with you by %s" => "Delad med dig av %s",
+"Share with" => "Delad med",
+"Share with link" => "Delad med länk",
+"Password protect" => "Lösenordsskydda",
+"Password" => "Lösenord",
+"Set expiration date" => "Sätt utgångsdatum",
+"Expiration date" => "Utgångsdatum",
+"Share via email: %s" => "Dela via e-post: %s",
+"No people found" => "Hittar inga användare",
+"Resharing is not allowed" => "Dela vidare är inte tillåtet",
+"Shared in %s with %s" => "Delad i %s med %s",
+"Unshare" => "Sluta dela",
+"can edit" => "kan redigera",
+"access control" => "åtkomstkontroll",
+"create" => "skapa",
+"update" => "uppdatera",
+"delete" => "radera",
+"share" => "dela",
+"Password protected" => "Lösenordsskyddad",
+"Error unsetting expiration date" => "Fel vid borttagning av utgångsdatum",
+"Error setting expiration date" => "Fel vid sättning av utgångsdatum",
 "ownCloud password reset" => "ownCloud lösenordsåterställning",
 "Use the following link to reset your password: {link}" => "Använd följande länk för att återställa lösenordet: {link}",
 "You will receive a link to reset your password via Email." => "Du får en länk att återställa ditt lösenord via e-post.",
@@ -42,7 +68,6 @@
 "Edit categories" => "Redigera kategorier",
 "Add" => "Lägg till",
 "Create an <strong>admin account</strong>" => "Skapa ett <strong>administratörskonto</strong>",
-"Password" => "Lösenord",
 "Advanced" => "Avancerat",
 "Data folder" => "Datamapp",
 "Configure the database" => "Konfigurera databasen",
diff --git a/core/l10n/th_TH.php b/core/l10n/th_TH.php
index fd25105f150..65b14b121d5 100644
--- a/core/l10n/th_TH.php
+++ b/core/l10n/th_TH.php
@@ -15,12 +15,38 @@
 "October" => "ตุลาคม",
 "November" => "พฤศจิกายน",
 "December" => "ธันวาคม",
+"Choose" => "เลือก",
 "Cancel" => "ยกเลิก",
 "No" => "ไม่ตกลง",
 "Yes" => "ตกลง",
 "Ok" => "ตกลง",
 "No categories selected for deletion." => "ยังไม่ได้เลือกหมวดหมู่ที่ต้องการลบ",
 "Error" => "พบข้อผิดพลาด",
+"Error while sharing" => "เกิดข้อผิดพลาดในระหว่างการแชร์ข้อมูล",
+"Error while unsharing" => "เกิดข้อผิดพลาดในการยกเลิกการแชร์ข้อมูล",
+"Error while changing permissions" => "เกิดข้อผิดพลาดในการเปลี่ยนสิทธิ์การเข้าใช้งาน",
+"Shared with you and the group %s by %s" => "ได้แชร์ให้กับคุณและกลุ่ม %s โดย %s",
+"Shared with you by %s" => "แชร์ให้กับคุณโดย %s",
+"Share with" => "แชร์ให้กับ",
+"Share with link" => "แชร์ด้วยลิงก์",
+"Password protect" => "ใส่รหัสผ่านไว้",
+"Password" => "รหัสผ่าน",
+"Set expiration date" => "กำหนดวันที่หมดอายุ",
+"Expiration date" => "วันที่หมดอายุ",
+"Share via email: %s" => "แชร์ผ่านทางอีเมล: %s",
+"No people found" => "ไม่พบบุคคลที่ต้องการ",
+"Resharing is not allowed" => "ไม่อนุญาตให้แชร์ข้อมูลซ้ำได้",
+"Shared in %s with %s" => "ถูกแชร์ใน %s ด้วย %s",
+"Unshare" => "ยกเลิกการแชร์",
+"can edit" => "สามารถแก้ไข",
+"access control" => "ระดับควบคุมการเข้าใช้งาน",
+"create" => "สร้าง",
+"update" => "อัพเดท",
+"delete" => "ลบ",
+"share" => "แชร์",
+"Password protected" => "ใส่รหัสผ่านไว้",
+"Error unsetting expiration date" => "เกิดข้อผิดพลาดในการยกเลิกการตั้งค่าวันที่หมดอายุ",
+"Error setting expiration date" => "เกิดข้อผิดพลาดในการตั้งค่าวันที่หมดอายุ",
 "ownCloud password reset" => "รีเซ็ตรหัสผ่าน ownCloud",
 "Use the following link to reset your password: {link}" => "ใช้ลิงค์ต่อไปนี้เพื่อเปลี่ยนรหัสผ่านของคุณใหม่: {link}",
 "You will receive a link to reset your password via Email." => "คุณจะได้รับลิงค์เพื่อกำหนดรหัสผ่านใหม่ทางอีเมล์",
@@ -42,7 +68,6 @@
 "Edit categories" => "แก้ไขหมวดหมู่",
 "Add" => "เพิ่ม",
 "Create an <strong>admin account</strong>" => "สร้าง <strong>บัญชีผู้ดูแลระบบ</strong>",
-"Password" => "รหัสผ่าน",
 "Advanced" => "ขั้นสูง",
 "Data folder" => "โฟลเดอร์เก็บข้อมูล",
 "Configure the database" => "กำหนดค่าฐานข้อมูล",
diff --git a/core/l10n/tr.php b/core/l10n/tr.php
index 7d6d4a33a6d..4e86f9493f5 100644
--- a/core/l10n/tr.php
+++ b/core/l10n/tr.php
@@ -21,6 +21,7 @@
 "Ok" => "Tamam",
 "No categories selected for deletion." => "Silmek için bir kategori seçilmedi",
 "Error" => "Hata",
+"Password" => "Parola",
 "ownCloud password reset" => "ownCloud parola sıfırlama",
 "Use the following link to reset your password: {link}" => "Bu bağlantıyı kullanarak parolanızı sıfırlayın: {link}",
 "You will receive a link to reset your password via Email." => "Parolanızı sıfırlamak için bir bağlantı Eposta olarak gönderilecek.",
@@ -42,7 +43,6 @@
 "Edit categories" => "Kategorileri düzenle",
 "Add" => "Ekle",
 "Create an <strong>admin account</strong>" => "Bir <strong>yönetici hesabı</strong> oluşturun",
-"Password" => "Parola",
 "Advanced" => "Gelişmiş",
 "Data folder" => "Veri klasörü",
 "Configure the database" => "Veritabanını ayarla",
diff --git a/core/l10n/uk.php b/core/l10n/uk.php
index 4a10a9fc745..73ad3f3dfb8 100644
--- a/core/l10n/uk.php
+++ b/core/l10n/uk.php
@@ -1,5 +1,22 @@
 <?php $TRANSLATIONS = array(
 "Settings" => "Налаштування",
+"January" => "Січень",
+"February" => "Лютий",
+"March" => "Березень",
+"April" => "Квітень",
+"May" => "Травень",
+"June" => "Червень",
+"July" => "Липень",
+"August" => "Серпень",
+"September" => "Вересень",
+"October" => "Жовтень",
+"November" => "Листопад",
+"December" => "Грудень",
+"Cancel" => "Відмінити",
+"No" => "Ні",
+"Yes" => "Так",
+"Error" => "Помилка",
+"Password" => "Пароль",
 "You will receive a link to reset your password via Email." => "Ви отримаєте посилання для скидання вашого паролю на e-mail.",
 "Username" => "Ім'я користувача",
 "Your password was reset" => "Ваш пароль був скинутий",
@@ -10,7 +27,7 @@
 "Users" => "Користувачі",
 "Admin" => "Адміністратор",
 "Help" => "Допомога",
-"Password" => "Пароль",
+"Add" => "Додати",
 "Configure the database" => "Налаштування бази даних",
 "will be used" => "буде використано",
 "Database user" => "Користувач бази даних",
diff --git a/core/l10n/vi.php b/core/l10n/vi.php
index de4764c3a54..26155a18663 100644
--- a/core/l10n/vi.php
+++ b/core/l10n/vi.php
@@ -21,6 +21,7 @@
 "Ok" => "Ok",
 "No categories selected for deletion." => "Không có thể loại nào được chọn để xóa.",
 "Error" => "Lỗi",
+"Password" => "Mật khẩu",
 "ownCloud password reset" => "Khôi phục mật khẩu Owncloud ",
 "Use the following link to reset your password: {link}" => "Dùng đường dẫn sau để khôi phục lại mật khẩu : {link}",
 "You will receive a link to reset your password via Email." => "Vui lòng kiểm tra Email để khôi phục lại mật khẩu.",
@@ -42,7 +43,6 @@
 "Edit categories" => "Sửa thể loại",
 "Add" => "Thêm",
 "Create an <strong>admin account</strong>" => "Tạo một <strong>tài khoản quản trị</strong>",
-"Password" => "Mật khẩu",
 "Advanced" => "Nâng cao",
 "Data folder" => "Thư mục dữ liệu",
 "Configure the database" => "Cấu hình Cơ Sở Dữ Liệu",
diff --git a/core/l10n/zh_CN.GB2312.php b/core/l10n/zh_CN.GB2312.php
index 58104df3997..de437cf2e4c 100644
--- a/core/l10n/zh_CN.GB2312.php
+++ b/core/l10n/zh_CN.GB2312.php
@@ -21,6 +21,7 @@
 "Ok" => "好的",
 "No categories selected for deletion." => "没有选者要删除的分类.",
 "Error" => "错误",
+"Password" => "密码",
 "ownCloud password reset" => "私有云密码重置",
 "Use the following link to reset your password: {link}" => "使用下面的链接来重置你的密码:{link}",
 "You will receive a link to reset your password via Email." => "你将会收到一个重置密码的链接",
@@ -42,7 +43,6 @@
 "Edit categories" => "编辑分类",
 "Add" => "添加",
 "Create an <strong>admin account</strong>" => "建立一个 <strong>管理帐户</strong>",
-"Password" => "密码",
 "Advanced" => "进阶",
 "Data folder" => "数据存放文件夹",
 "Configure the database" => "配置数据库",
@@ -50,6 +50,7 @@
 "Database user" => "数据库用户",
 "Database password" => "数据库密码",
 "Database name" => "数据库用户名",
+"Database tablespace" => "数据库表格空间",
 "Database host" => "数据库主机",
 "Finish setup" => "完成安装",
 "web services under your control" => "你控制下的网络服务",
diff --git a/core/l10n/zh_CN.php b/core/l10n/zh_CN.php
index 4e0a37a8774..47bda01ab54 100644
--- a/core/l10n/zh_CN.php
+++ b/core/l10n/zh_CN.php
@@ -15,12 +15,38 @@
 "October" => "十月",
 "November" => "十一月",
 "December" => "十二月",
+"Choose" => "选择(&C)...",
 "Cancel" => "取消",
 "No" => "否",
 "Yes" => "是",
 "Ok" => "好",
 "No categories selected for deletion." => "没有选择要删除的类别",
 "Error" => "错误",
+"Error while sharing" => "共享时出错",
+"Error while unsharing" => "取消共享时出错",
+"Error while changing permissions" => "修改权限时出错",
+"Shared with you and the group %s by %s" => "与你及%s组共享，共享人: %s",
+"Shared with you by %s" => "共享人: %s",
+"Share with" => "共享",
+"Share with link" => "共享链接",
+"Password protect" => "密码保护",
+"Password" => "密码",
+"Set expiration date" => "设置过期日期",
+"Expiration date" => "过期日期",
+"Share via email: %s" => "发电子邮件分享: %s",
+"No people found" => "未找到此人",
+"Resharing is not allowed" => "不允许二次共享",
+"Shared in %s with %s" => "在%s中与%s共享",
+"Unshare" => "取消共享",
+"can edit" => "可以修改",
+"access control" => "访问控制",
+"create" => "创建",
+"update" => "更新",
+"delete" => "删除",
+"share" => "共享",
+"Password protected" => "密码已受保护",
+"Error unsetting expiration date" => "取消设置过期日期时出错",
+"Error setting expiration date" => "设置过期日期时出错",
 "ownCloud password reset" => "重置 ownCloud 密码",
 "Use the following link to reset your password: {link}" => "使用以下链接重置您的密码：{link}",
 "You will receive a link to reset your password via Email." => "您将会收到包含可以重置密码链接的邮件。",
@@ -42,7 +68,6 @@
 "Edit categories" => "编辑分类",
 "Add" => "添加",
 "Create an <strong>admin account</strong>" => "创建<strong>管理员账号</strong>",
-"Password" => "密码",
 "Advanced" => "高级",
 "Data folder" => "数据目录",
 "Configure the database" => "配置数据库",
diff --git a/core/l10n/zh_TW.php b/core/l10n/zh_TW.php
index 57a087fae92..ccaa6b95eeb 100644
--- a/core/l10n/zh_TW.php
+++ b/core/l10n/zh_TW.php
@@ -21,6 +21,7 @@
 "Ok" => "Ok",
 "No categories selected for deletion." => "沒選擇要刪除的分類",
 "Error" => "錯誤",
+"Password" => "密碼",
 "ownCloud password reset" => "ownCloud 密碼重設",
 "Use the following link to reset your password: {link}" => "請循以下聯結重設你的密碼: （聯結） ",
 "You will receive a link to reset your password via Email." => "重設密碼的連結將會寄到你的電子郵件信箱",
@@ -42,7 +43,6 @@
 "Edit categories" => "編輯分類",
 "Add" => "添加",
 "Create an <strong>admin account</strong>" => "建立一個<strong>管理者帳號</strong>",
-"Password" => "密碼",
 "Advanced" => "進階",
 "Data folder" => "資料夾",
 "Configure the database" => "設定資料庫",
diff --git a/core/templates/layout.base.php b/core/templates/layout.base.php
index bfd23a9ce97..c113a4db24e 100644
--- a/core/templates/layout.base.php
+++ b/core/templates/layout.base.php
@@ -4,9 +4,6 @@
 		<title>ownCloud</title>
 		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 		<link rel="shortcut icon" href="<?php echo image_path('', 'favicon.png'); ?>" /><link rel="apple-touch-icon-precomposed" href="<?php echo image_path('', 'favicon-touch.png'); ?>" />
-		<?php if (!empty(OC_Util::$core_styles)): ?>
-			<link rel="stylesheet" href="<?php echo OC_Helper::linkToRemote('core.css', false) ?>" type="text/css" media="screen" />
-		<?php endif ?>
 		<?php foreach ($_['cssfiles'] as $cssfile): ?>
 			<link rel="stylesheet" href="<?php echo $cssfile; ?>" type="text/css" media="screen" />
 		<?php endforeach; ?>
@@ -14,9 +11,6 @@
 			var oc_webroot = '<?php echo OC::$WEBROOT; ?>';
 			var oc_appswebroots = <?php echo $_['apps_paths'] ?>;
 		</script>
-		<?php if (!empty(OC_Util::$core_scripts)): ?>
-			<script type="text/javascript" src="<?php echo OC_Helper::linkToRemote('core.js', false) ?>"></script>
-		<?php endif ?>
 		<?php foreach ($_['jsfiles'] as $jsfile): ?>
 			<script type="text/javascript" src="<?php echo $jsfile; ?>"></script>
 		<?php endforeach; ?>
diff --git a/core/templates/layout.guest.php b/core/templates/layout.guest.php
index 9a5a056eb2b..0d2e71c180f 100644
--- a/core/templates/layout.guest.php
+++ b/core/templates/layout.guest.php
@@ -4,9 +4,6 @@
 		<title>ownCloud</title>
 		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 		<link rel="shortcut icon" href="<?php echo image_path('', 'favicon.png'); ?>" /><link rel="apple-touch-icon-precomposed" href="<?php echo image_path('', 'favicon-touch.png'); ?>" />
-		<?php if (!empty(OC_Util::$core_styles)): ?>
-		<link rel="stylesheet" href="<?php echo OC_Helper::linkToRemote('core.css', false) ?>" type="text/css" media="screen" />
-		<?php endif ?>
 		<?php foreach($_['cssfiles'] as $cssfile): ?>
 			<link rel="stylesheet" href="<?php echo $cssfile; ?>" type="text/css" media="screen" />
 		<?php endforeach; ?>
@@ -14,9 +11,6 @@
 			var oc_webroot = '<?php echo OC::$WEBROOT; ?>';
 			var oc_appswebroots = <?php echo $_['apps_paths'] ?>;
 		</script>
-		<?php if (!empty(OC_Util::$core_scripts)): ?>
-		<script type="text/javascript" src="<?php echo OC_Helper::linkToRemote('core.js', false) ?>"></script>
-		<?php endif ?>
 		<?php foreach($_['jsfiles'] as $jsfile): ?>
 			<script type="text/javascript" src="<?php echo $jsfile; ?>"></script>
 		<?php endforeach; ?>
diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index 89b8027fc0f..679be2657d4 100644
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@ -4,9 +4,6 @@
 		<title><?php echo isset($_['application']) && !empty($_['application'])?$_['application'].' | ':'' ?>ownCloud <?php echo OC_User::getUser()?' ('.OC_User::getUser().') ':'' ?></title>
 		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 		<link rel="shortcut icon" href="<?php echo image_path('', 'favicon.png'); ?>" /><link rel="apple-touch-icon-precomposed" href="<?php echo image_path('', 'favicon-touch.png'); ?>" />
-		<?php if (!empty(OC_Util::$core_styles)): ?>
-		<link rel="stylesheet" href="<?php echo OC_Helper::linkToRemote('core.css', false) ?>" type="text/css" media="screen" />
-		<?php endif ?>
 		<?php foreach($_['cssfiles'] as $cssfile): ?>
 			<link rel="stylesheet" href="<?php echo $cssfile; ?>" type="text/css" media="screen" />
 		<?php endforeach; ?>
@@ -15,9 +12,6 @@
 			var oc_appswebroots = <?php echo $_['apps_paths'] ?>;
 			var oc_current_user = '<?php echo OC_User::getUser() ?>';
 		</script>
-		<?php if (!empty(OC_Util::$core_scripts)): ?>
-		<script type="text/javascript" src="<?php echo OC_Helper::linkToRemote('core.js', false) ?>"></script>
-		<?php endif ?>
 		<?php foreach($_['jsfiles'] as $jsfile): ?>
 			<script type="text/javascript" src="<?php echo $jsfile; ?>"></script>
 		<?php endforeach; ?>
@@ -42,7 +36,7 @@
 	<body id="<?php echo $_['bodyid'];?>">
 		<header><div id="header">
 			<a href="<?php echo link_to('', 'index.php'); ?>" title="" id="owncloud"><img class="svg" src="<?php echo image_path('', 'logo-wide.svg'); ?>" alt="ownCloud" /></a>
-			<a class="header-right header-action" id="logout" href="<?php echo link_to('', 'index.php'); ?>?logout=true"><img class="svg" alt="<?php echo $l->t('Log out');?>" title="<?php echo $l->t('Log out');?>" src="<?php echo image_path('', 'actions/logout.svg'); ?>" /></a>
+			<a class="header-right header-action" id="logout" href="<?php echo link_to('', 'index.php'); ?>?logout=true"><img class="svg" alt="<?php echo $l->t('Log out');?>" title="<?php echo $l->t('Log out');  echo OC_User::getUser()?' ('.OC_User::getUser().') ':'' ?>" src="<?php echo image_path('', 'actions/logout.svg'); ?>" /></a>
 			<form class="searchbox header-right" action="#" method="post">
 				<input id="searchbox" class="svg" type="search" name="query" value="<?php if(isset($_POST['query'])) {echo OC_Util::sanitizeHTML($_POST['query']);};?>" autocomplete="off" x-webkit-speech />
 			</form>