Merge branch 'master' into routing

Conflicts:
	lib/search/provider/file.php
	settings/ajax/changepassword.php
	settings/settings.php

53 files changed, 792 insertions, 113 deletions

diff --git a/core/ajax/share.php b/core/ajax/share.php
index b6f96bfd340..0fa162fb371 100644
--- a/core/ajax/share.php
+++ b/core/ajax/share.php
@@ -88,6 +88,7 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['itemSo
 			break;
 		case 'getShareWith':
 			if (isset($_GET['search'])) {
+				$sharePolicy = OC_Appconfig::getValue('core', 'shareapi_share_policy', 'global');
 				$shareWith = array();
 // 				if (OC_App::isEnabled('contacts')) {
 // 					// TODO Add function to contacts to only get the 'fullname' column to improve performance
@@ -106,13 +107,22 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['itemSo
 // 						}
 // 					}
 // 				}
+				if ($sharePolicy == 'groups_only') {
+					$groups = OC_Group::getUserGroups(OC_User::getUser());
+				} else {
+					$groups = OC_Group::getGroups();
+				}
 				$count = 0;
 				$users = array();
 				$limit = 0;
 				$offset = 0;
 				while ($count < 4 && count($users) == $limit) {
 					$limit = 4 - $count;
-					$users = OC_User::getUsers($_GET['search'], $limit, $offset);
+					if ($sharePolicy == 'groups_only') {
+						$users = OC_Group::usersInGroups($groups, $_GET['search'], $limit, $offset);
+					} else {
+						$users = OC_User::getUsers($_GET['search'], $limit, $offset);
+					}
 					$offset += $limit;
 					foreach ($users as $user) {
 						if ((!isset($_GET['itemShares']) || !is_array($_GET['itemShares'][OCP\Share::SHARE_TYPE_USER]) || !in_array($user, $_GET['itemShares'][OCP\Share::SHARE_TYPE_USER])) && $user != OC_User::getUser()) {
@@ -122,7 +132,6 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['itemSo
 					}
 				}
 				$count = 0;
-				$groups = OC_Group::getUserGroups(OC_User::getUser());
 				foreach ($groups as $group) {
 					if ($count < 4) {
 						if (stripos($group, $_GET['search']) !== false
diff --git a/core/css/styles.css b/core/css/styles.css
index 7d855556c84..35ef8c36ddf 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -160,7 +160,7 @@ a.bookmarklet { background-color: #ddd; border:1px solid #ccc; padding: 5px;padd
 #categoryform .bottombuttons * { float: left;}
 /*#categorylist { border:1px solid #ddd;}*/
 #categorylist li { background:#f8f8f8; padding:.3em .8em; white-space:nowrap; overflow:hidden; text-overflow:ellipsis; -webkit-transition:background-color 500ms; -moz-transition:background-color 500ms; -o-transition:background-color 500ms; transition:background-color 500ms; }
-#categorylist li:hover, li:active { background:#eee; }
+#categorylist li:hover, #categorylist li:active { background:#eee; }
 #category_addinput { width: 10em; }
 
 /* ---- APP SETTINGS ---- */
diff --git a/core/img/rating/s1.png b/core/img/rating/s1.png
new file mode 100644
index 00000000000..445d965ffeb
--- /dev/null
+++ b/core/img/rating/s1.png
diff --git a/core/img/rating/s10.png b/core/img/rating/s10.png
new file mode 100644
index 00000000000..b8d66c2a4c4
--- /dev/null
+++ b/core/img/rating/s10.png
diff --git a/core/img/rating/s11.png b/core/img/rating/s11.png
new file mode 100644
index 00000000000..aee9f921560
--- /dev/null
+++ b/core/img/rating/s11.png
diff --git a/core/img/rating/s2.png b/core/img/rating/s2.png
new file mode 100644
index 00000000000..4f860e74ca1
--- /dev/null
+++ b/core/img/rating/s2.png
diff --git a/core/img/rating/s3.png b/core/img/rating/s3.png
new file mode 100644
index 00000000000..26c9baff55f
--- /dev/null
+++ b/core/img/rating/s3.png
diff --git a/core/img/rating/s4.png b/core/img/rating/s4.png
new file mode 100644
index 00000000000..47f1f694bf7
--- /dev/null
+++ b/core/img/rating/s4.png
diff --git a/core/img/rating/s5.png b/core/img/rating/s5.png
new file mode 100644
index 00000000000..aa225b6a9a9
--- /dev/null
+++ b/core/img/rating/s5.png
diff --git a/core/img/rating/s6.png b/core/img/rating/s6.png
new file mode 100644
index 00000000000..fd4f42e22c6
--- /dev/null
+++ b/core/img/rating/s6.png
diff --git a/core/img/rating/s7.png b/core/img/rating/s7.png
new file mode 100644
index 00000000000..0d18a1dc025
--- /dev/null
+++ b/core/img/rating/s7.png
diff --git a/core/img/rating/s8.png b/core/img/rating/s8.png
new file mode 100644
index 00000000000..951c3fd3be4
--- /dev/null
+++ b/core/img/rating/s8.png
diff --git a/core/img/rating/s9.png b/core/img/rating/s9.png
new file mode 100644
index 00000000000..b1a654c85d2
--- /dev/null
+++ b/core/img/rating/s9.png
diff --git a/core/js/js.js b/core/js/js.js
index 8f3b5a6af1e..285fb38086b 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -5,7 +5,7 @@
  * @return string
  */
 
-function t(app,text){
+function t(app,text, vars){
 	if( !( t.cache[app] )){
 		$.ajax(OC.filePath('core','ajax','translations.php'),{
 			async:false,//todo a proper sollution for this without sync ajax calls
@@ -21,15 +21,40 @@ function t(app,text){
 			t.cache[app] = [];
 		}
 	}
+	var _build = function(text, vars) {
+		return text.replace(/{([^{}]*)}/g,
+			function (a, b) {
+				var r = vars[b];
+				return typeof r === 'string' || typeof r === 'number' ? r : a;
+			}
+		);
+	}
 	if( typeof( t.cache[app][text] ) !== 'undefined' ){
-		return t.cache[app][text];
+		if(typeof vars === 'object') {
+			return _build(t.cache[app][text], vars);
+		} else {
+			return t.cache[app][text];
+		}
 	}
 	else{
-		return text;
+		if(typeof vars === 'object') {
+			return _build(text, vars);
+		} else {
+			return text;
+		}
 	}
 }
 t.cache={};
 
+/*
+* Sanitizes a HTML string
+* @param string
+* @return Sanitized string
+*/
+function escapeHTML(s) {
+		return s.toString().split('&').join('&amp;').split('<').join('&lt;').split('"').join('&quot;');
+}
+
 /**
 * Get the path to download a file
 * @param file The filename
@@ -37,7 +62,7 @@ t.cache={};
 * @return string
 */
 function fileDownloadPath(dir, file) {
-	return OC.filePath('files', 'ajax', 'download.php')+encodeURIComponent('?files='+encodeURIComponent(file)+'&dir='+encodeURIComponent(dir));
+	return OC.filePath('files', 'ajax', 'download.php')+'&files='+encodeURIComponent(file)+'&dir='+encodeURIComponent(dir);
 }
 
 var OC={
diff --git a/core/js/share.js b/core/js/share.js
index 36ee39d8eab..7968edebb7a 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -127,9 +127,9 @@ 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">'+t('core', 'Shared with you and the group %s by %s', data.reshare.share_with, data.reshare.uid_owner)+'</span>';
+				html += '<span class="reshare">'+t('core', 'Shared with you and the group')+' '+data.reshare.share_with+' '+t('core', 'by')+' '+data.reshare.uid_owner+'</span>';
 			} else {
-				html += '<span class="reshare">'+t('core', 'Shared with you by %s', data.reshare.uid_owner)+'</span>';
+				html += '<span class="reshare">'+t('core', 'Shared with you by')+' '+data.reshare.uid_owner+'</span>';
 			}
 			html += '<br />';
 		}
@@ -166,7 +166,7 @@ OC.Share={
 							OC.Share.addShareWith(share.share_type, share.share_with, share.permissions, possiblePermissions, false);
 						}
 					}
-					if (share.expiration.length > 0) {
+					if (share.expiration != null) {
 						OC.Share.showExpirationDate(share.expiration);
 					}
 				});
@@ -182,7 +182,7 @@ OC.Share={
 							// 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: t('core', 'Share via email: %s', search.term), value: {shareType: OC.Share.SHARE_TYPE_EMAIL, shareWith: search.term}}]);
+// 								response([{label: t('core', 'Share via email:')+' '+search.term, value: {shareType: OC.Share.SHARE_TYPE_EMAIL, shareWith: search.term}}]);
 // 							} else {
 								response([t('core', 'No people found')]);
 // 							}
@@ -247,7 +247,7 @@ OC.Share={
 			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>';
+				var html = '<li style="clear: both;" data-collection="'+item+'">'+t('core', 'Shared in')+' '+item+' '+t('core', 'with')+' '+shareWith+'</li>';
 				$('#shareWithList').prepend(html);
 			}
 		} else {
@@ -267,9 +267,13 @@ OC.Share={
 			if (permissions & OC.PERMISSION_SHARE) {
 				shareChecked = 'checked="checked"';
 			}
-			var html = '<li style="clear: both;" data-share-type="'+shareType+'" data-share-with="'+shareWith+'">';
+			var html = '<li style="clear: both;" data-share-type="'+shareType+'" data-share-with="'+shareWith+'" title="' + shareWith + '">';
 			html += '<a href="#" class="unshare" style="display:none;"><img class="svg" alt="'+t('core', 'Unshare')+'" src="'+OC.imagePath('core', 'actions/delete')+'"/></a>';
-			html += shareWith;
+			if(shareWith.length > 14){
+				html += shareWith.substr(0,11) + '...';
+			}else{
+				html += shareWith;
+			}
 			if (possiblePermissions & OC.PERMISSION_CREATE || possiblePermissions & OC.PERMISSION_UPDATE || possiblePermissions & OC.PERMISSION_DELETE) {
 				if (editChecked == '') {
 					html += '<label style="display:none;">';
@@ -302,13 +306,14 @@ OC.Share={
 		OC.Share.itemShares[OC.Share.SHARE_TYPE_LINK] = true;
 		$('#linkCheckbox').attr('checked', true);
 		var filename = $('tr').filterAttr('data-id', String(itemSource)).data('file');
+		var type = $('tr').filterAttr('data-id', String(itemSource)).data('type');
 		if ($('#dir').val() == '/') {
 			var file = $('#dir').val() + filename;
 		} else {
 			var file = $('#dir').val() + '/' + filename;
 		}
 		file = '/'+OC.currentUser+'/files'+file;
-		var link = parent.location.protocol+'//'+location.host+OC.linkTo('', 'public.php')+'?service=files&file='+file;
+		var link = parent.location.protocol+'//'+location.host+OC.linkTo('', 'public.php')+'?service=files&'+type+'='+file;
 		$('#linkText').val(link);
 		$('#linkText').show('blind');
 		$('#showPassword').show();
@@ -365,7 +370,10 @@ $(document).ready(function() {
 	});
 
 	$(this).click(function(event) {
-		if (OC.Share.droppedDown && !($(event.target).hasClass('drop')) && $('#dropdown').has(event.target).length === 0) {
+		var target = $(event.target);
+		var isMatched = !target.is('.drop, .ui-datepicker-next, .ui-datepicker-prev, .ui-icon') 
+			&& !target.closest('#ui-datepicker-div').length;
+		if (OC.Share.droppedDown && isMatched && $('#dropdown').has(event.target).length === 0) {
 			OC.Share.hideDropDown();
 		}
 	});
diff --git a/core/l10n/ca.php b/core/l10n/ca.php
index 11f93d5fbbf..d329b920302 100644
--- a/core/l10n/ca.php
+++ b/core/l10n/ca.php
@@ -15,13 +15,40 @@
 "October" => "Octubre",
 "November" => "Novembre",
 "December" => "Desembre",
+"Choose" => "Escull",
 "Cancel" => "Cancel·la",
 "No" => "No",
 "Yes" => "Sí",
 "Ok" => "D'acord",
 "No categories selected for deletion." => "No hi ha categories per eliminar.",
 "Error" => "Error",
+"Error while sharing" => "Error en compartir",
+"Error while unsharing" => "Error en deixar de compartir",
+"Error while changing permissions" => "Error en canviar els permisos",
+"Shared with you and the group" => "Compartit amb vós i amb el grup",
+"by" => "per",
+"Shared with you by" => "compartit amb vós per",
+"Share with" => "Comparteix amb",
+"Share with link" => "Comparteix amb enllaç",
+"Password protect" => "Protegir amb contrasenya",
 "Password" => "Contrasenya",
+"Set expiration date" => "Estableix la data d'expiració",
+"Expiration date" => "Data d'expiració",
+"Share via email:" => "Comparteix per correu electrònic",
+"No people found" => "No s'ha trobat ningú",
+"Resharing is not allowed" => "No es permet compartir de nou",
+"Shared in" => "Compartit en",
+"with" => "amb",
+"Unshare" => "Deixa de compartir",
+"can edit" => "pot editar",
+"access control" => "control d'accés",
+"create" => "crea",
+"update" => "actualitza",
+"delete" => "elimina",
+"share" => "comparteix",
+"Password protected" => "Protegeix amb contrasenya",
+"Error unsetting expiration date" => "Error en eliminar la data d'expiració",
+"Error setting expiration date" => "Error en establir la data d'expiració",
 "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,6 +69,10 @@
 "Cloud not found" => "No s'ha trobat el núvol",
 "Edit categories" => "Edita les categories",
 "Add" => "Afegeix",
+"Security Warning" => "Avís de seguretat",
+"No secure random number generator is available, please enable the PHP OpenSSL extension." => "No està disponible el generador de nombres aleatoris segurs, habiliteu l'extensió de PHP OpenSSL.",
+"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Sense un generador de nombres aleatoris segurs un atacant podria predir els senyals per restablir la contrasenya i prendre-us el compte.",
+"Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "La carpeta de dades i els fitxers provablement són accessibles des d'internet. El fitxer .htaccess que proporciona ownCloud no funciona. Us recomanem que configureu el vostre servidor web de manera que la carpeta de dades no sigui accessible o que moveu la carpeta de dades fora de la carpeta arrel del servidor web.",
 "Create an <strong>admin account</strong>" => "Crea un <strong>compte d'administrador</strong>",
 "Advanced" => "Avançat",
 "Data folder" => "Carpeta de dades",
@@ -55,10 +86,16 @@
 "Finish setup" => "Acaba la configuració",
 "web services under your control" => "controleu els vostres serveis web",
 "Log out" => "Surt",
+"Automatic logon rejected!" => "L'ha rebutjat l'acceditació automàtica!",
+"If you did not change your password recently, your account may be compromised!" => "Se no heu canviat la contrasenya recentment el vostre compte pot estar compromès!",
+"Please change your password to secure your account again." => "Canvieu la contrasenya de nou per assegurar el vostre compte.",
 "Lost your password?" => "Heu perdut la contrasenya?",
 "remember" => "recorda'm",
 "Log in" => "Inici de sessió",
 "You are logged out." => "Heu tancat la sessió.",
 "prev" => "anterior",
-"next" => "següent"
+"next" => "següent",
+"Security Warning!" => "Avís de seguretat!",
+"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "Comproveu la vostra contrasenya. <br/>Per raons de seguretat se us pot demanar escriure de nou la vostra contrasenya.",
+"Verify" => "Comprova"
 );
diff --git a/core/l10n/cs_CZ.php b/core/l10n/cs_CZ.php
index 790ab423e38..a6e0d42dac3 100644
--- a/core/l10n/cs_CZ.php
+++ b/core/l10n/cs_CZ.php
@@ -25,18 +25,20 @@
 "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",
+"Shared with you and the group" => "S Vámi a skupinou",
+"by" => "sdílí",
+"Shared with you by" => "S Vámi sdílí",
 "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",
+"Share via email:" => "Sdílet e-mailem:",
 "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",
+"Shared in" => "Sdíleno v",
+"with" => "s",
 "Unshare" => "Zrušit sdílení",
 "can edit" => "lze upravovat",
 "access control" => "řízení přístupu",
@@ -67,6 +69,10 @@
 "Cloud not found" => "Cloud nebyl nalezen",
 "Edit categories" => "Upravit kategorie",
 "Add" => "Přidat",
+"Security Warning" => "Bezpečnostní upozornění",
+"No secure random number generator is available, please enable the PHP OpenSSL extension." => "Není dostupný žádný bezpečný generátor náhodných čísel. Povolte, prosím, rozšíření OpenSSL v PHP.",
+"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Bez bezpečného generátoru náhodných čísel může útočník předpovědět token pro obnovu hesla a převzít kontrolu nad Vaším účtem.",
+"Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Váš adresář dat a všechny Vaše soubory jsou pravděpodobně přístupné z internetu. Soubor .htaccess, který je poskytován ownCloud, nefunguje. Důrazně Vám doporučujeme nastavit váš webový server tak, aby nebyl adresář dat přístupný, nebo přesunout adresář dat mimo kořenovou složku dokumentů webového serveru.",
 "Create an <strong>admin account</strong>" => "Vytvořit <strong>účet správce</strong>",
 "Advanced" => "Pokročilé",
 "Data folder" => "Složka s daty",
@@ -80,10 +86,16 @@
 "Finish setup" => "Dokončit nastavení",
 "web services under your control" => "webové služby pod Vaší kontrolou",
 "Log out" => "Odhlásit se",
+"Automatic logon rejected!" => "Automatické přihlášení odmítnuto.",
+"If you did not change your password recently, your account may be compromised!" => "V nedávné době jste nezměnili své heslo, Váš účet může být kompromitován.",
+"Please change your password to secure your account again." => "Změňte, prosím, své heslo pro opětovné zabezpečení Vašeho účtu.",
 "Lost your password?" => "Ztratili jste své heslo?",
 "remember" => "zapamatovat si",
 "Log in" => "Přihlásit",
 "You are logged out." => "Jste odhlášeni.",
 "prev" => "předchozí",
-"next" => "následující"
+"next" => "následující",
+"Security Warning!" => "Bezpečnostní upozornění.",
+"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "Ověřte, prosím, své heslo. <br/>Z bezpečnostních důvodů můžete být občas požádáni o jeho opětovné zadání.",
+"Verify" => "Ověřit"
 );
diff --git a/core/l10n/da.php b/core/l10n/da.php
index 284a16c4524..5a56b670859 100644
--- a/core/l10n/da.php
+++ b/core/l10n/da.php
@@ -25,18 +25,20 @@
 "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",
+"Shared with you and the group" => "Delt med dig og gruppen",
+"by" => "af",
+"Shared with you by" => "Delt med dig af",
 "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",
+"Share via email:" => "Del via email:",
 "No people found" => "Ingen personer fundet",
 "Resharing is not allowed" => "Videredeling ikke tilladt",
-"Shared in %s with %s" => "Delt i %s med %s",
+"Shared in" => "Delt i",
+"with" => "med",
 "Unshare" => "Fjern deling",
 "can edit" => "kan redigere",
 "access control" => "Adgangskontrol",
@@ -45,6 +47,7 @@
 "delete" => "slet",
 "share" => "del",
 "Password protected" => "Beskyttet med adgangskode",
+"Error unsetting expiration date" => "Fejl ved fjernelse af udløbsdato",
 "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}",
diff --git a/core/l10n/de.php b/core/l10n/de.php
index fddb6859912..cb6df3b6d10 100644
--- a/core/l10n/de.php
+++ b/core/l10n/de.php
@@ -25,18 +25,20 @@
 "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.",
+"Shared with you and the group" => "Für Dich und folgende Gruppe freigegeben",
+"by" => "mit",
+"Shared with you by" => "Dies wurde mit dir geteilt von",
 "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",
+"Share via email:" => "Über eine E-Mail freigeben:",
 "No people found" => "Niemand gefunden",
 "Resharing is not allowed" => "Weiterverteilen ist nicht erlaubt",
-"Shared in %s with %s" => "In %s für %s freigegeben",
+"Shared in" => "Freigegeben in",
+"with" => "mit",
 "Unshare" => "Freigabe aufheben",
 "can edit" => "kann bearbeiten",
 "access control" => "Zugriffskontrolle",
@@ -67,6 +69,10 @@
 "Cloud not found" => "Cloud nicht gefunden",
 "Edit categories" => "Kategorien bearbeiten",
 "Add" => "Hinzufügen",
+"Security Warning" => "Sicherheitswarnung",
+"No secure random number generator is available, please enable the PHP OpenSSL extension." => "Es ist kein sicherer Zufallszahlengenerator verfügbar, bitte aktiviere die PHP-Erweiterung für OpenSSL.",
+"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Ohne einen sicheren Zufallszahlengenerator sind Angreifer in der Lage die Tokens für das Zurücksetzen der Passwörter vorherzusehen und Konten  zu übernehmen.",
+"Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Dein Datenverzeichnis und deine Datein sind vielleicht vom Internet aus erreichbar. Die .htaccess Datei, die ownCloud verwendet, arbeitet nicht richtig. Wir schlagen Dir dringend vor, dass du deinen Webserver so konfigurierst, dass das Datenverzeichnis nicht länger erreichbar ist oder, dass du dein Datenverzeichnis aus dem Dokumenten-root des Webservers bewegst.",
 "Create an <strong>admin account</strong>" => "<strong>Administrator-Konto</strong> anlegen",
 "Advanced" => "Fortgeschritten",
 "Data folder" => "Datenverzeichnis",
@@ -80,10 +86,16 @@
 "Finish setup" => "Installation abschließen",
 "web services under your control" => "Web-Services unter Ihrer Kontrolle",
 "Log out" => "Abmelden",
+"Automatic logon rejected!" => "Automatischer Login zurückgewiesen!",
+"If you did not change your password recently, your account may be compromised!" => "Wenn du Dein Passwort nicht änderst, könnte dein Account kompromitiert werden!",
+"Please change your password to secure your account again." => "Bitte ändere Dein Passwort, um Deinen Account wieder zu schützen.",
 "Lost your password?" => "Passwort vergessen?",
 "remember" => "merken",
 "Log in" => "Einloggen",
 "You are logged out." => "Du wurdest abgemeldet.",
 "prev" => "Zurück",
-"next" => "Weiter"
+"next" => "Weiter",
+"Security Warning!" => "Sicherheitswarnung!",
+"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "Bitte bestätige Dein Passwort. <br/> Aus Sicherheitsgründen wirst Du hierbei gebeten, Dein Passwort erneut einzugeben.",
+"Verify" => "Bestätigen"
 );
diff --git a/core/l10n/de_DE.php b/core/l10n/de_DE.php
new file mode 100644
index 00000000000..1d2daeef037
--- /dev/null
+++ b/core/l10n/de_DE.php
@@ -0,0 +1,94 @@
+<?php $TRANSLATIONS = array(
+"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",
+"January" => "Januar",
+"February" => "Februar",
+"March" => "März",
+"April" => "April",
+"May" => "Mai",
+"June" => "Juni",
+"July" => "Juli",
+"August" => "August",
+"September" => "September",
+"October" => "Oktober",
+"November" => "November",
+"December" => "Dezember",
+"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" => "Für Dich und folgende Gruppe freigegeben",
+"by" => "mit",
+"Shared with you by" => "Dies wurde mit dir geteilt von",
+"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:" => "Über eine E-Mail freigeben:",
+"No people found" => "Niemand gefunden",
+"Resharing is not allowed" => "Weiterverteilen ist nicht erlaubt",
+"Shared in" => "Freigegeben in",
+"with" => "mit",
+"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." => "Du erhälst einen Link per E-Mail, um Dein Passwort zurückzusetzen.",
+"Requested" => "Angefragt",
+"Login failed!" => "Login fehlgeschlagen!",
+"Username" => "Benutzername",
+"Request reset" => "Beantrage Zurücksetzung",
+"Your password was reset" => "Ihr Passwort wurde zurückgesetzt.",
+"To login page" => "Zur Login-Seite",
+"New password" => "Neues Passwort",
+"Reset password" => "Passwort zurücksetzen",
+"Personal" => "Persönlich",
+"Users" => "Benutzer",
+"Apps" => "Anwendungen",
+"Admin" => "Admin",
+"Help" => "Hilfe",
+"Access forbidden" => "Zugriff verboten",
+"Cloud not found" => "Cloud nicht gefunden",
+"Edit categories" => "Kategorien bearbeiten",
+"Add" => "Hinzufügen",
+"Security Warning" => "Sicherheitshinweis",
+"No secure random number generator is available, please enable the PHP OpenSSL extension." => "Es ist kein sicherer Zufallszahlengenerator verfügbar, bitte aktivieren Sie die PHP-Erweiterung für OpenSSL",
+"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Ohne einen sicheren Zufallszahlengenerator sind Angreifer in der Lage die Tokens für das Zurücksetzen der Passwörter vorherzusehen und damit können Konten übernommen.",
+"Create an <strong>admin account</strong>" => "<strong>Administrator-Konto</strong> anlegen",
+"Advanced" => "Fortgeschritten",
+"Data folder" => "Datenverzeichnis",
+"Configure the database" => "Datenbank einrichten",
+"will be used" => "wird verwendet",
+"Database user" => "Datenbank-Benutzer",
+"Database password" => "Datenbank-Passwort",
+"Database name" => "Datenbank-Name",
+"Database tablespace" => "Datenbank-Tablespace",
+"Database host" => "Datenbank-Host",
+"Finish setup" => "Installation abschließen",
+"web services under your control" => "Web-Services unter Ihrer Kontrolle",
+"Log out" => "Abmelden",
+"Lost your password?" => "Passwort vergessen?",
+"remember" => "merken",
+"Log in" => "Einloggen",
+"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 ce341176adf..f2b9a48fe12 100644
--- a/core/l10n/el.php
+++ b/core/l10n/el.php
@@ -15,13 +15,40 @@
 "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" => "Διαμοιρασμένο με εσένα και την ομάδα",
+"by" => "από",
+"Shared with you by" => "Μοιράστηκε μαζί σας από ",
+"Share with" => "Διαμοιρασμός με",
+"Share with link" => "Διαμοιρασμός με σύνδεσμο",
+"Password protect" => "Προστασία κωδικού",
 "Password" => "Κωδικός",
+"Set expiration date" => "Ορισμός ημ. λήξης",
+"Expiration date" => "Ημερομηνία λήξης",
+"Share via email:" => "Διαμοιρασμός μέσω email:",
+"No people found" => "Δεν βρέθηκε άνθρωπος",
+"Resharing is not allowed" => "Ξαναμοιρασμός δεν επιτρέπεται",
+"Shared in" => "Διαμοιράστηκε με",
+"with" => "με",
+"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,6 +69,7 @@
 "Cloud not found" => "Δεν βρέθηκε σύννεφο",
 "Edit categories" => "Επεξεργασία κατηγορίας",
 "Add" => "Προσθήκη",
+"Security Warning" => "Προειδοποίηση Ασφαλείας",
 "Create an <strong>admin account</strong>" => "Δημιουργήστε έναν <strong>λογαριασμό διαχειριστή</strong>",
 "Advanced" => "Για προχωρημένους",
 "Data folder" => "Φάκελος δεδομένων",
diff --git a/core/l10n/eo.php b/core/l10n/eo.php
index 9e03abfdc23..a8f5b38a303 100644
--- a/core/l10n/eo.php
+++ b/core/l10n/eo.php
@@ -15,13 +15,40 @@
 "October" => "Oktobro",
 "November" => "Novembro",
 "December" => "Decembro",
+"Choose" => "Elekti",
 "Cancel" => "Nuligi",
 "No" => "Ne",
 "Yes" => "Jes",
 "Ok" => "Akcepti",
 "No categories selected for deletion." => "Neniu kategorio elektiĝis por forigo.",
 "Error" => "Eraro",
+"Error while sharing" => "Eraro dum kunhavigo",
+"Error while unsharing" => "Eraro dum malkunhavigo",
+"Error while changing permissions" => "Eraro dum ŝanĝo de permesoj",
+"Shared with you and the group" => "Kunhavigita kun vi kaj la grupo",
+"by" => "de",
+"Shared with you by" => "Kunhavigita kun vi de",
+"Share with" => "Kunhavigi kun",
+"Share with link" => "Kunhavigi per ligilo",
+"Password protect" => "Protekti per pasvorto",
 "Password" => "Pasvorto",
+"Set expiration date" => "Agordi limdaton",
+"Expiration date" => "Limdato",
+"Share via email:" => "Kunhavigi per retpoŝto:",
+"No people found" => "Ne troviĝis gento",
+"Resharing is not allowed" => "Rekunhavigo ne permesatas",
+"Shared in" => "Kunhavigita en",
+"with" => "kun",
+"Unshare" => "Malkunhavigi",
+"can edit" => "povas redakti",
+"access control" => "alirkontrolo",
+"create" => "krei",
+"update" => "ĝisdatigi",
+"delete" => "forigi",
+"share" => "kunhavigi",
+"Password protected" => "Protektita per pasvorto",
+"Error unsetting expiration date" => "Eraro dum malagordado de limdato",
+"Error setting expiration date" => "Eraro dum agordado de limdato",
 "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.",
diff --git a/core/l10n/es.php b/core/l10n/es.php
index 1f55a59deb1..6c929477453 100644
--- a/core/l10n/es.php
+++ b/core/l10n/es.php
@@ -25,18 +25,20 @@
 "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",
+"Shared with you and the group" => "Comprtido contigo y con el grupo",
+"by" => "por",
+"Shared with you by" => "Compartido contigo por",
 "Share with" => "Compartir con",
-"Share with link" => "Enlace de compartir con ",
+"Share with link" => "Compartir con enlace",
 "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",
+"Share via email:" => "compartido via e-mail:",
 "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",
+"Shared in" => "Compartido en",
+"with" => "con",
 "Unshare" => "No compartir",
 "can edit" => "puede editar",
 "access control" => "control de acceso",
@@ -45,6 +47,7 @@
 "delete" => "eliminar",
 "share" => "compartir",
 "Password protected" => "Protegido por contraseña",
+"Error unsetting expiration date" => "Error al eliminar la fecha de caducidad",
 "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}",
@@ -66,6 +69,10 @@
 "Cloud not found" => "No se ha encontrado la nube",
 "Edit categories" => "Editar categorías",
 "Add" => "Añadir",
+"Security Warning" => "Advertencia de seguridad",
+"No secure random number generator is available, please enable the PHP OpenSSL extension." => "No está disponible un generador de números aleatorios seguro, por favor habilite la extensión OpenSSL de PHP.",
+"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Sin un generador de números aleatorios seguro un atacante podría predecir los tokens de reinicio de su contraseña y tomar control de su cuenta.",
+"Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Su directorio de datos y sus archivos están probablemente accesibles desde internet. El archivo .htaccess que ownCloud provee no está funcionando. Sugerimos fuertemente que configure su servidor web de manera que el directorio de datos ya no esté accesible o mueva el directorio de datos fuera del documento raíz de su servidor web.",
 "Create an <strong>admin account</strong>" => "Crea una <strong>cuenta de administrador</strong>",
 "Advanced" => "Avanzado",
 "Data folder" => "Directorio de almacenamiento",
@@ -79,10 +86,16 @@
 "Finish setup" => "Completar la instalación",
 "web services under your control" => "servicios web bajo tu control",
 "Log out" => "Salir",
+"Automatic logon rejected!" => "¡Inicio de sesión automático rechazado!",
+"If you did not change your password recently, your account may be compromised!" => "Si usted no ha cambiado su contraseña recientemente, ¡puede que su cuenta esté comprometida!",
+"Please change your password to secure your account again." => "Por favor cambie su contraseña para asegurar su cuenta nuevamente.",
 "Lost your password?" => "¿Has perdido tu contraseña?",
 "remember" => "recuérdame",
 "Log in" => "Entrar",
 "You are logged out." => "Has cerrado la sesión.",
 "prev" => "anterior",
-"next" => "siguiente"
+"next" => "siguiente",
+"Security Warning!" => "¡Advertencia de seguridad!",
+"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "Por favor verifique su contraseña. <br/>Por razones de seguridad se le puede volver a preguntar ocasionalmente la contraseña.",
+"Verify" => "Verificar"
 );
diff --git a/core/l10n/es_AR.php b/core/l10n/es_AR.php
index 2a98e068501..ecb909e2ed7 100644
--- a/core/l10n/es_AR.php
+++ b/core/l10n/es_AR.php
@@ -25,18 +25,20 @@
 "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",
+"Shared with you and the group" => "Compartido con vos y con el grupo",
+"by" => "por",
+"Shared with you by" => "Compartido con vos por",
 "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",
+"Share via email:" => "compartido a través de e-mail:",
 "No people found" => "No se encontraron usuarios",
 "Resharing is not allowed" => "No se permite volver a compartir",
-"Shared in %s with %s" => "Compartido en %s con %s",
+"Shared in" => "Compartido en",
+"with" => "con",
 "Unshare" => "Remover compartir",
 "can edit" => "puede editar",
 "access control" => "control de acceso",
@@ -45,6 +47,7 @@
 "delete" => "remover",
 "share" => "compartir",
 "Password protected" => "Protegido por contraseña",
+"Error unsetting expiration date" => "Error al remover la fecha de caducidad",
 "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}",
@@ -66,6 +69,10 @@
 "Cloud not found" => "No se encontró owncloud",
 "Edit categories" => "Editar categorías",
 "Add" => "Añadir",
+"Security Warning" => "Advertencia de seguridad",
+"No secure random number generator is available, please enable the PHP OpenSSL extension." => "No hay disponible ningún generador de números aleatorios seguro. Por favor habilitá la extensión OpenSSL de PHP.",
+"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Sin un generador de números aleatorios seguro un atacante podría predecir los tokens de reinicio de tu contraseña y tomar control de tu cuenta.",
+"Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Tu directorio de datos y tus archivos son probablemente accesibles desde internet. El archivo .htaccess provisto por ownCloud no está funcionando. Te sugerimos que configures tu servidor web de manera que el directorio de datos ya no esté accesible, o que muevas el directorio de datos afuera del directorio raíz de tu servidor web.",
 "Create an <strong>admin account</strong>" => "Creá una <strong>cuenta de administrador</strong>",
 "Advanced" => "Avanzado",
 "Data folder" => "Directorio de almacenamiento",
@@ -79,10 +86,16 @@
 "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",
+"Automatic logon rejected!" => "¡El inicio de sesión automático fue rechazado!",
+"If you did not change your password recently, your account may be compromised!" => "¡Si no cambiaste tu contraseña recientemente, puede ser que tu cuenta esté comprometida!",
+"Please change your password to secure your account again." => "Por favor, cambiá tu contraseña para fortalecer nuevamente la seguridad de tu cuenta.",
 "Lost your password?" => "¿Perdiste tu contraseña?",
 "remember" => "recordame",
 "Log in" => "Entrar",
 "You are logged out." => "Terminaste la sesión.",
 "prev" => "anterior",
-"next" => "siguiente"
+"next" => "siguiente",
+"Security Warning!" => "¡Advertencia de seguridad!",
+"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "Por favor, verificá tu contraseña. <br/>Por razones de seguridad, puede ser que que te pregunte ocasionalmente la contraseña.",
+"Verify" => "Verificar"
 );
diff --git a/core/l10n/eu.php b/core/l10n/eu.php
index fc400a69f11..d60ddfa7349 100644
--- a/core/l10n/eu.php
+++ b/core/l10n/eu.php
@@ -25,18 +25,19 @@
 "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",
+"Shared with you and the group" => "Zurekin eta taldearekin elkarbanatuta",
+"Shared with you by" => "Honek 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",
+"Share via email:" => "Elkarbanatu eposta bidez:",
 "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",
+"Shared in" => "Elkarbanatua hemen:",
+"with" => "honekin",
 "Unshare" => "Ez elkarbanatu",
 "can edit" => "editatu dezake",
 "access control" => "sarrera kontrola",
@@ -45,6 +46,7 @@
 "delete" => "ezabatu",
 "share" => "elkarbanatu",
 "Password protected" => "Pasahitzarekin babestuta",
+"Error unsetting expiration date" => "Errorea izan da muga data kentzean",
 "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}",
diff --git a/core/l10n/fi_FI.php b/core/l10n/fi_FI.php
index 4a723b3448f..a1856067310 100644
--- a/core/l10n/fi_FI.php
+++ b/core/l10n/fi_FI.php
@@ -22,19 +22,28 @@
 "Ok" => "Ok",
 "No categories selected for deletion." => "Luokkia ei valittu poistettavaksi.",
 "Error" => "Virhe",
+"Error while sharing" => "Virhe jaettaessa",
+"Error while unsharing" => "Virhe jakoa peruttaessa",
 "Error while changing permissions" => "Virhe oikeuksia muuttaessa",
+"Shared with you and the group" => "Jaettu sinulle ja ryhmälle",
+"Share with link" => "Jaa linkillä",
 "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",
+"Share via email:" => "Jaa sähköpostilla:",
+"No people found" => "Henkilöitä ei löytynyt",
 "Resharing is not allowed" => "Jakaminen uudelleen ei ole salittu",
+"with" => "kanssa",
+"Unshare" => "Peru jakaminen",
 "can edit" => "voi muokata",
+"access control" => "Pääsyn hallinta",
 "create" => "luo",
 "update" => "päivitä",
 "delete" => "poista",
 "share" => "jaa",
 "Password protected" => "Salasanasuojattu",
+"Error unsetting expiration date" => "Virhe purettaessa eräpäivää",
 "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}",
diff --git a/core/l10n/fr.php b/core/l10n/fr.php
index 1a2d17c69d0..0bdc3a33bdd 100644
--- a/core/l10n/fr.php
+++ b/core/l10n/fr.php
@@ -25,18 +25,20 @@
 "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",
+"Shared with you and the group" => "Partagé avec vous ainsi qu'avec le groupe",
+"by" => "par",
+"Shared with you by" => "Partagé avec vous par",
 "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",
+"Share via email:" => "Partager via e-mail :",
 "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",
+"Shared in" => "Partagé dans",
+"with" => "avec",
 "Unshare" => "Ne plus partager",
 "can edit" => "édition autorisée",
 "access control" => "contrôle des accès",
@@ -67,6 +69,10 @@
 "Cloud not found" => "Introuvable",
 "Edit categories" => "Modifier les catégories",
 "Add" => "Ajouter",
+"Security Warning" => "Avertissement de sécutité",
+"No secure random number generator is available, please enable the PHP OpenSSL extension." => "Aucun générateur de nombre aléatoire sécurisé n'est disponible, veuillez activer l'extension PHP OpenSSL",
+"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Sans générateur de nombre aléatoire sécurisé, un attaquant peut être en mesure de prédire les jetons de réinitialisation du mot de passe, et ainsi prendre le contrôle de votre compte utilisateur.",
+"Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Votre dossier data et vos fichiers sont probablement accessibles depuis internet. Le fichier .htaccess fourni par ownCloud ne fonctionne pas. Nous vous recommandons vivement de configurer votre serveur web de manière à ce que le dossier data ne soit plus accessible ou bien de déplacer le dossier data en dehors du dossier racine des documents du serveur web.",
 "Create an <strong>admin account</strong>" => "Créer un <strong>compte administrateur</strong>",
 "Advanced" => "Avancé",
 "Data folder" => "Répertoire des données",
@@ -80,10 +86,16 @@
 "Finish setup" => "Terminer l'installation",
 "web services under your control" => "services web sous votre contrôle",
 "Log out" => "Se déconnecter",
+"Automatic logon rejected!" => "Connexion automatique rejetée !",
+"If you did not change your password recently, your account may be compromised!" => "Si vous n'avez pas changé votre mot de passe récemment, votre compte risque d'être compromis !",
+"Please change your password to secure your account again." => "Veuillez changer votre mot de passe pour sécuriser à nouveau votre compte.",
 "Lost your password?" => "Mot de passe perdu ?",
 "remember" => "se souvenir de moi",
 "Log in" => "Connexion",
 "You are logged out." => "Vous êtes désormais déconnecté.",
 "prev" => "précédent",
-"next" => "suivant"
+"next" => "suivant",
+"Security Warning!" => "Alerte de sécurité !",
+"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "Veuillez vérifier votre mot de passe. <br/>Par sécurité il vous sera occasionnellement demandé d'entrer votre mot de passe de nouveau.",
+"Verify" => "Vérification"
 );
diff --git a/core/l10n/hr.php b/core/l10n/hr.php
index c8f683d8270..54b42547428 100644
--- a/core/l10n/hr.php
+++ b/core/l10n/hr.php
@@ -15,13 +15,40 @@
 "October" => "Listopad",
 "November" => "Studeni",
 "December" => "Prosinac",
+"Choose" => "Izaberi",
 "Cancel" => "Odustani",
 "No" => "Ne",
 "Yes" => "Da",
 "Ok" => "U redu",
 "No categories selected for deletion." => "Nema odabranih kategorija za brisanje.",
 "Error" => "Pogreška",
+"Error while sharing" => "Greška prilikom djeljenja",
+"Error while unsharing" => "Greška prilikom isključivanja djeljenja",
+"Error while changing permissions" => "Greška prilikom promjena prava",
+"Shared with you and the group" => "Dijeli sa tobom i grupom",
+"by" => "preko",
+"Shared with you by" => "Dijeljeno sa tobom preko ",
+"Share with" => "Djeli sa",
+"Share with link" => "Djeli preko link-a",
+"Password protect" => "Zaštiti lozinkom",
 "Password" => "Lozinka",
+"Set expiration date" => "Postavi datum isteka",
+"Expiration date" => "Datum isteka",
+"Share via email:" => "Dijeli preko email-a:",
+"No people found" => "Osobe nisu pronađene",
+"Resharing is not allowed" => "Ponovo dijeljenje nije dopušteno",
+"Shared in" => "Dijeljeno u",
+"with" => "sa",
+"Unshare" => "Makni djeljenje",
+"can edit" => "može mjenjat",
+"access control" => "kontrola pristupa",
+"create" => "kreiraj",
+"update" => "ažuriraj",
+"delete" => "izbriši",
+"share" => "djeli",
+"Password protected" => "Zaštita lozinkom",
+"Error unsetting expiration date" => "Greška prilikom brisanja datuma isteka",
+"Error setting expiration date" => "Greška prilikom postavljanja datuma isteka",
 "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.",
@@ -50,6 +77,7 @@
 "Database user" => "Korisnik baze podataka",
 "Database password" => "Lozinka baze podataka",
 "Database name" => "Ime baze podataka",
+"Database tablespace" => "Database tablespace",
 "Database host" => "Poslužitelj baze podataka",
 "Finish setup" => "Završi postavljanje",
 "web services under your control" => "web usluge pod vašom kontrolom",
diff --git a/core/l10n/it.php b/core/l10n/it.php
index 669c6b6e44a..950517f9d07 100644
--- a/core/l10n/it.php
+++ b/core/l10n/it.php
@@ -25,18 +25,20 @@
 "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",
+"Shared with you and the group" => "Condiviso con te e con il gruppo",
+"by" => "da",
+"Shared with you by" => "Condiviso con te da",
 "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",
+"Share via email:" => "Condividi tramite email:",
 "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",
+"Shared in" => "Condiviso in",
+"with" => "con",
 "Unshare" => "Rimuovi condivisione",
 "can edit" => "può modificare",
 "access control" => "controllo d'accesso",
@@ -67,6 +69,10 @@
 "Cloud not found" => "Nuvola non trovata",
 "Edit categories" => "Modifica le categorie",
 "Add" => "Aggiungi",
+"Security Warning" => "Avviso di sicurezza",
+"No secure random number generator is available, please enable the PHP OpenSSL extension." => "Non è disponibile alcun generatore di numeri casuali sicuro. Abilita l'estensione OpenSSL di PHP",
+"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Senza un generatore di numeri casuali sicuro, un malintenzionato potrebbe riuscire a individuare i token di ripristino delle password e impossessarsi del tuo account.",
+"Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "La cartella dei dati e i tuoi file sono probabilmente accessibili da Internet. Il file .htaccess fornito da ownCloud non funziona. Ti suggeriamo vivamente di configurare il server web in modo che la cartella dei dati non sia più accessibile o sposta tale cartella fuori dalla radice del sito.",
 "Create an <strong>admin account</strong>" => "Crea un <strong>account amministratore</strong>",
 "Advanced" => "Avanzate",
 "Data folder" => "Cartella dati",
@@ -80,10 +86,16 @@
 "Finish setup" => "Termina la configurazione",
 "web services under your control" => "servizi web nelle tue mani",
 "Log out" => "Esci",
+"Automatic logon rejected!" => "Accesso automatico rifiutato.",
+"If you did not change your password recently, your account may be compromised!" => "Se non hai cambiato la password recentemente, il tuo account potrebbe essere stato compromesso.",
+"Please change your password to secure your account again." => "Cambia la password per rendere nuovamente sicuro il tuo account.",
 "Lost your password?" => "Hai perso la password?",
 "remember" => "ricorda",
 "Log in" => "Accedi",
 "You are logged out." => "Sei uscito.",
 "prev" => "precedente",
-"next" => "successivo"
+"next" => "successivo",
+"Security Warning!" => "Avviso di sicurezza",
+"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "Verifica la tua password.<br/>Per motivi di sicurezza, potresti ricevere una richiesta di digitare nuovamente la password.",
+"Verify" => "Verifica"
 );
diff --git a/core/l10n/ja_JP.php b/core/l10n/ja_JP.php
index bd442ef4116..cb3f02a2efd 100644
--- a/core/l10n/ja_JP.php
+++ b/core/l10n/ja_JP.php
@@ -25,18 +25,20 @@
 "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 で共有しています",
+"Shared with you and the group" => "あなたとグループで共有中",
+"by" => "により",
+"Shared with you by" => "あなたと共有",
 "Share with" => "共有者",
 "Share with link" => "URLリンクで共有",
 "Password protect" => "パスワード保護",
 "Password" => "パスワード",
 "Set expiration date" => "有効期限を設定",
 "Expiration date" => "有効期限",
-"Share via email: %s" => "メール経由で共有: %s",
+"Share via email:" => "メール経由で共有:",
 "No people found" => "ユーザーが見つかりません",
 "Resharing is not allowed" => "再共有は許可されていません",
-"Shared in %s with %s" => "%s 内で %s と共有",
+"Shared in" => "の中で共有中",
+"with" => "と",
 "Unshare" => "共有解除",
 "can edit" => "編集可能",
 "access control" => "アクセス権限",
@@ -67,6 +69,10 @@
 "Cloud not found" => "見つかりません",
 "Edit categories" => "カテゴリを編集",
 "Add" => "追加",
+"Security Warning" => "セキュリティ警告",
+"No secure random number generator is available, please enable the PHP OpenSSL extension." => "セキュアな乱数生成器が利用可能ではありません。PHPのOpenSSL拡張を有効にして下さい。",
+"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "セキュアな乱数生成器が無い場合、攻撃者はパスワードリセットのトークンを予測してアカウントを乗っ取られる可能性があります。",
+"Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "データディレクトリとファイルが恐らくインターネットからアクセスできるようになっています。ownCloudが提供する .htaccessファイルが機能していません。データディレクトリを全くアクセスできないようにするか、データディレクトリをウェブサーバのドキュメントルートの外に置くようにウェブサーバを設定することを強くお勧めします。 ",
 "Create an <strong>admin account</strong>" => "<strong>管理者アカウント</strong>を作成してください",
 "Advanced" => "詳細設定",
 "Data folder" => "データフォルダ",
@@ -80,10 +86,16 @@
 "Finish setup" => "セットアップを完了します",
 "web services under your control" => "管理下にあるウェブサービス",
 "Log out" => "ログアウト",
+"Automatic logon rejected!" => "自動ログインは拒否されました！",
+"If you did not change your password recently, your account may be compromised!" => "最近パスワードを変更していない場合、あなたのアカウントは危険にさらされているかもしれません。",
+"Please change your password to secure your account again." => "アカウント保護の為、パスワードを再度の変更をお願いいたします。",
 "Lost your password?" => "パスワードを忘れましたか？",
 "remember" => "パスワードを記憶する",
 "Log in" => "ログイン",
 "You are logged out." => "ログアウトしました。",
 "prev" => "前",
-"next" => "次"
+"next" => "次",
+"Security Warning!" => "セキュリティ警告！",
+"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "パスワードの確認をお願いします。<br/>セキュリティ上の理由により、時々パスワードの再入力をお願いする場合があります。",
+"Verify" => "確認"
 );
diff --git a/core/l10n/ku_IQ.php b/core/l10n/ku_IQ.php
new file mode 100644
index 00000000000..8eb72e588d0
--- /dev/null
+++ b/core/l10n/ku_IQ.php
@@ -0,0 +1,21 @@
+<?php $TRANSLATIONS = array(
+"Settings" => "ده‌ستكاری",
+"Password" => "وشەی تێپەربو",
+"New password" => "وشەی نهێنی نوێ",
+"Reset password" => "دووباره‌ كردنه‌وه‌ی وشه‌ی نهێنی",
+"Users" => "به‌كارهێنه‌ر",
+"Apps" => "به‌رنامه‌كان",
+"Admin" => "به‌ڕێوه‌به‌ری سه‌ره‌كی",
+"Help" => "یارمەتی",
+"Cloud not found" => "هیچ نه‌دۆزرایه‌وه‌",
+"Advanced" => "هه‌ڵبژاردنی پیشكه‌وتوو",
+"Data folder" => "زانیاری فۆڵده‌ر",
+"Database user" => "به‌كارهێنه‌ری داتابه‌یس",
+"Database password" => "وشه‌ی نهێنی داتا به‌یس",
+"Database name" => "ناوی داتابه‌یس",
+"Database host" => "هۆستی داتابه‌یس",
+"Finish setup" => "كۆتایی هات ده‌ستكاریه‌كان",
+"Log out" => "چوونەدەرەوە",
+"prev" => "پێشتر",
+"next" => "دواتر"
+);
diff --git a/core/l10n/nl.php b/core/l10n/nl.php
index c5235690eae..2e2a32c29bb 100644
--- a/core/l10n/nl.php
+++ b/core/l10n/nl.php
@@ -25,18 +25,20 @@
 "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",
+"Shared with you and the group" => "Gedeeld me u en de groep",
+"by" => "door",
+"Shared with you by" => "Gedeeld met u door",
 "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",
+"Share via email:" => "Deel via email:",
 "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",
+"Shared in" => "Gedeeld in",
+"with" => "met",
 "Unshare" => "Stop met delen",
 "can edit" => "kan wijzigen",
 "access control" => "toegangscontrole",
@@ -45,6 +47,7 @@
 "delete" => "verwijderen",
 "share" => "deel",
 "Password protected" => "Passeerwoord beveiligd",
+"Error unsetting expiration date" => "Fout tijdens het verwijderen van de verval datum",
 "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}",
diff --git a/core/l10n/oc.php b/core/l10n/oc.php
new file mode 100644
index 00000000000..328cc0b60ba
--- /dev/null
+++ b/core/l10n/oc.php
@@ -0,0 +1,91 @@
+<?php $TRANSLATIONS = array(
+"Application name not provided." => "Nom d'applicacion pas donat.",
+"No category to add?" => "Pas de categoria d'ajustar ?",
+"This category already exists: " => "La categoria exista ja :",
+"Settings" => "Configuracion",
+"January" => "Genièr",
+"February" => "Febrièr",
+"March" => "Març",
+"April" => "Abril",
+"May" => "Mai",
+"June" => "Junh",
+"July" => "Julhet",
+"August" => "Agost",
+"September" => "Septembre",
+"October" => "Octobre",
+"November" => "Novembre",
+"December" => "Decembre",
+"Choose" => "Causís",
+"Cancel" => "Anulla",
+"No" => "Non",
+"Yes" => "Òc",
+"Ok" => "D'accòrdi",
+"No categories selected for deletion." => "Pas de categorias seleccionadas per escafar.",
+"Error" => "Error",
+"Error while sharing" => "Error al partejar",
+"Error while unsharing" => "Error al non partejar",
+"Error while changing permissions" => "Error al cambiar permissions",
+"Shared with you and the group" => "Partejat amb tu e lo grop",
+"by" => "per",
+"Shared with you by" => "Partejat amb tu per",
+"Share with" => "Parteja amb",
+"Share with link" => "Parteja amb lo ligam",
+"Password protect" => "Parat per senhal",
+"Password" => "Senhal",
+"Set expiration date" => "Met la data d'expiracion",
+"Expiration date" => "Data d'expiracion",
+"Share via email:" => "Parteja tras corrièl :",
+"No people found" => "Deguns trobat",
+"Resharing is not allowed" => "Tornar partejar es pas permis",
+"Shared in" => "Partejat dins",
+"with" => "amb",
+"Unshare" => "Non parteje",
+"can edit" => "pòt modificar",
+"access control" => "Contraròtle d'acces",
+"create" => "crea",
+"update" => "met a jorn",
+"delete" => "escafa",
+"share" => "parteja",
+"Password protected" => "Parat per senhal",
+"Error unsetting expiration date" => "Error al metre de la data d'expiracion",
+"Error setting expiration date" => "Error setting expiration date",
+"ownCloud password reset" => "senhal d'ownCloud tornat botar",
+"Use the following link to reset your password: {link}" => "Utiliza lo ligam seguent per tornar botar lo senhal : {link}",
+"You will receive a link to reset your password via Email." => "Reçaupràs un ligam per tornar botar ton senhal via corrièl.",
+"Requested" => "Requesit",
+"Login failed!" => "Fracàs de login",
+"Username" => "Nom d'usancièr",
+"Request reset" => "Tornar botar requesit",
+"Your password was reset" => "Ton senhal es estat tornat botar",
+"To login page" => "Pagina cap al login",
+"New password" => "Senhal nòu",
+"Reset password" => "Senhal tornat botar",
+"Personal" => "Personal",
+"Users" => "Usancièrs",
+"Apps" => "Apps",
+"Admin" => "Admin",
+"Help" => "Ajuda",
+"Access forbidden" => "Acces enebit",
+"Cloud not found" => "Nívol pas trobada",
+"Edit categories" => "Edita categorias",
+"Add" => "Ajusta",
+"Create an <strong>admin account</strong>" => "Crea un <strong>compte admin</strong>",
+"Advanced" => "Avançat",
+"Data folder" => "Dorsièr de donadas",
+"Configure the database" => "Configura la basa de donadas",
+"will be used" => "serà utilizat",
+"Database user" => "Usancièr de la basa de donadas",
+"Database password" => "Senhal de la basa de donadas",
+"Database name" => "Nom de la basa de donadas",
+"Database tablespace" => "Espandi de taula de basa de donadas",
+"Database host" => "Òste de basa de donadas",
+"Finish setup" => "Configuracion acabada",
+"web services under your control" => "Services web jos ton contraròtle",
+"Log out" => "Sortida",
+"Lost your password?" => "L'as perdut lo senhal ?",
+"remember" => "bremba-te",
+"Log in" => "Dintrada",
+"You are logged out." => "Sias pas dintra (t/ada)",
+"prev" => "dariièr",
+"next" => "venent"
+);
diff --git a/core/l10n/pl.php b/core/l10n/pl.php
index 7dcf0161792..44e8aa65457 100644
--- a/core/l10n/pl.php
+++ b/core/l10n/pl.php
@@ -23,16 +23,23 @@
 "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 unsharing" => "Błąd podczas zatrzymywania współdzielenia",
 "Error while changing permissions" => "Błąd przy zmianie uprawnień",
+"Shared with you and the group" => "Współdzielony z tobą i grupą",
+"by" => "przez",
+"Shared with you by" => "Współdzielone z taba przez",
 "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",
+"Share via email:" => "Współdziel poprzez maila",
 "No people found" => "Nie znaleziono ludzi",
 "Resharing is not allowed" => "Współdzielenie nie jest możliwe",
+"Shared in" => "Współdziel  w",
+"with" => "z",
+"Unshare" => "Zatrzymaj współdzielenie",
 "can edit" => "można edytować",
 "access control" => "kontrola dostępu",
 "create" => "utwórz",
@@ -40,6 +47,7 @@
 "delete" => "usuń",
 "share" => "współdziel",
 "Password protected" => "Zabezpieczone hasłem",
+"Error unsetting expiration date" => "Błąd niszczenie daty wygaśnięcia",
 "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}",
diff --git a/core/l10n/pt_BR.php b/core/l10n/pt_BR.php
index cd7064e89c3..54a442bc2f2 100644
--- a/core/l10n/pt_BR.php
+++ b/core/l10n/pt_BR.php
@@ -25,18 +25,20 @@
 "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",
+"Shared with you and the group" => "Compartilhado com você e o grupo",
+"by" => "por",
+"Shared with you by" => "Compartilhado com você por",
 "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",
+"Share via email:" => "Compartilhar via e-mail:",
 "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",
+"Shared in" => "Compartilhado em",
+"with" => "com",
 "Unshare" => "Descompartilhar",
 "can edit" => "pode editar",
 "access control" => "controle de acesso",
@@ -67,6 +69,9 @@
 "Cloud not found" => "Cloud não encontrado",
 "Edit categories" => "Editar categorias",
 "Add" => "Adicionar",
+"Security Warning" => "Aviso de Segurança",
+"No secure random number generator is available, please enable the PHP OpenSSL extension." => "Nenhum gerador de número aleatório de segurança disponível. Habilite a extensão OpenSSL do PHP.",
+"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Sem um gerador de número aleatório de segurança, um invasor pode ser capaz de prever os símbolos de redefinição de senhas e assumir sua conta.",
 "Create an <strong>admin account</strong>" => "Criar uma <strong>conta</strong> de <strong>administrador</strong>",
 "Advanced" => "Avançado",
 "Data folder" => "Pasta de dados",
diff --git a/core/l10n/pt_PT.php b/core/l10n/pt_PT.php
index 4ab9958f430..d483d087103 100644
--- a/core/l10n/pt_PT.php
+++ b/core/l10n/pt_PT.php
@@ -15,13 +15,40 @@
 "October" => "Outubro",
 "November" => "Novembro",
 "December" => "Dezembro",
+"Choose" => "Escolha",
 "Cancel" => "Cancelar",
 "No" => "Não",
 "Yes" => "Sim",
 "Ok" => "Ok",
 "No categories selected for deletion." => "Nenhuma categoria seleccionar para eliminar",
 "Error" => "Erro",
+"Error while sharing" => "Erro ao partilhar",
+"Error while unsharing" => "Erro ao deixar de partilhar",
+"Error while changing permissions" => "Erro ao mudar permissões",
+"Shared with you and the group" => "Partilhado consigo e o grupo",
+"by" => "por",
+"Shared with you by" => "Partilhado consigo por",
+"Share with" => "Partilhar com",
+"Share with link" => "Partilhar com link",
+"Password protect" => "Proteger com palavra-passe",
 "Password" => "Palavra chave",
+"Set expiration date" => "Especificar data de expiração",
+"Expiration date" => "Data de expiração",
+"Share via email:" => "Partilhar via email:",
+"No people found" => "Não foi encontrado ninguém",
+"Resharing is not allowed" => "Não é permitido partilhar de novo",
+"Shared in" => "Partilhado em",
+"with" => "com",
+"Unshare" => "Deixar de partilhar",
+"can edit" => "pode editar",
+"access control" => "Controlo de acesso",
+"create" => "criar",
+"update" => "actualizar",
+"delete" => "apagar",
+"share" => "partilhar",
+"Password protected" => "Protegido com palavra-passe",
+"Error unsetting expiration date" => "Erro ao retirar a data de expiração",
+"Error setting expiration date" => "Erro ao aplicar a data de expiração",
 "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",
@@ -50,6 +77,7 @@
 "Database user" => "Utilizador da base de dados",
 "Database password" => "Password da base de dados",
 "Database name" => "Nome da base de dados",
+"Database tablespace" => "Tablespace da base de dados",
 "Database host" => "Host da base de dados",
 "Finish setup" => "Acabar instalação",
 "web services under your control" => "serviços web sob o seu controlo",
diff --git a/core/l10n/ro.php b/core/l10n/ro.php
index 4083113a653..75e88e2cc16 100644
--- a/core/l10n/ro.php
+++ b/core/l10n/ro.php
@@ -25,18 +25,14 @@
 "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",
diff --git a/core/l10n/ru_RU.php b/core/l10n/ru_RU.php
index 563a261e5d4..d658ecb18e5 100644
--- a/core/l10n/ru_RU.php
+++ b/core/l10n/ru_RU.php
@@ -25,16 +25,25 @@
 "Error while sharing" => "Ошибка создания общего доступа",
 "Error while unsharing" => "Ошибка отключения общего доступа",
 "Error while changing permissions" => "Ошибка при изменении прав доступа",
-"Shared with you and the group %s by %s" => "Общий доступ для Вас и группы %s к %s",
+"Share with" => "Сделать общим с",
 "Password protect" => "Защитить паролем",
 "Password" => "Пароль",
+"Set expiration date" => "Установить срок действия",
+"Expiration date" => "Дата истечения срока действия",
+"Share via email:" => "Сделать общедоступным посредством email:",
 "No people found" => "Не найдено людей",
+"Resharing is not allowed" => "Рекурсивный общий доступ не разрешен",
+"with" => "с",
 "Unshare" => "Отключить общий доступ",
+"can edit" => "возможно редактирование",
 "access control" => "контроль доступа",
 "create" => "создать",
 "update" => "обновить",
 "delete" => "удалить",
 "share" => "сделать общим",
+"Password protected" => "Пароль защищен",
+"Error unsetting expiration date" => "Ошибка при отключении даты истечения срока действия",
+"Error setting expiration date" => "Ошибка при установке даты истечения срока действия",
 "ownCloud password reset" => "Переназначение пароля",
 "Use the following link to reset your password: {link}" => "Воспользуйтесь следующей ссылкой для переназначения пароля: {link}",
 "You will receive a link to reset your password via Email." => "Вы получите ссылку для восстановления пароля по электронной почте.",
@@ -55,6 +64,8 @@
 "Cloud not found" => "Облако не найдено",
 "Edit categories" => "Редактирование категорий",
 "Add" => "Добавить",
+"Security Warning" => "Предупреждение системы безопасности",
+"Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Ваши каталоги данных и файлы, вероятно, доступны из Интернета. Файл .htaccess, предоставляемый ownCloud, не работает. Мы настоятельно рекомендуем Вам настроить вебсервер таким образом, чтобы каталоги данных больше не были доступны, или переместить их за пределы корневого каталога документов веб-сервера.",
 "Create an <strong>admin account</strong>" => "Создать <strong>admin account</strong>",
 "Advanced" => "Расширенный",
 "Data folder" => "Папка данных",
@@ -68,10 +79,16 @@
 "Finish setup" => "Завершение настройки",
 "web services under your control" => "веб-сервисы под Вашим контролем",
 "Log out" => "Выйти",
+"Automatic logon rejected!" => "Автоматический вход в систему отклонен!",
+"If you did not change your password recently, your account may be compromised!" => "Если Вы недавно не меняли пароль, Ваш аккаунт может быть подвергнут опасности!",
+"Please change your password to secure your account again." => "Пожалуйста, измените пароль, чтобы защитить ваш аккаунт еще раз.",
 "Lost your password?" => "Забыли пароль?",
 "remember" => "запомнить",
 "Log in" => "Войти",
 "You are logged out." => "Вы вышли из системы.",
 "prev" => "предыдущий",
-"next" => "следующий"
+"next" => "следующий",
+"Security Warning!" => "Предупреждение системы безопасности!",
+"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "Пожалуйста, проверьте свой ​​пароль. <br/>По соображениям безопасности Вам может быть иногда предложено ввести пароль еще раз.",
+"Verify" => "Проверить"
 );
diff --git a/core/l10n/si_LK.php b/core/l10n/si_LK.php
new file mode 100644
index 00000000000..bfccbfd3e8e
--- /dev/null
+++ b/core/l10n/si_LK.php
@@ -0,0 +1,29 @@
+<?php $TRANSLATIONS = array(
+"Application name not provided." => "යෙදුම් නාමය සපයා නැත.",
+"Settings" => "සැකසුම්",
+"January" => "ජනවාරි",
+"February" => "පෙබරවාරි",
+"March" => "මාර්තු",
+"April" => "අප්‍රේල්",
+"May" => "මැයි",
+"June" => "ජූනි",
+"July" => "ජූලි",
+"August" => "අගෝස්තු",
+"September" => "සැප්තැම්බර්",
+"October" => "ඔක්තෝබර්",
+"November" => "නොවැම්බර්",
+"December" => "දෙසැම්බර්",
+"Choose" => "තෝරන්න",
+"Cancel" => "එපා",
+"No" => "නැහැ",
+"Yes" => "ඔව්",
+"Ok" => "හරි",
+"Password" => "මුර පදය ",
+"To login page" => "පිවිසුම් පිටුවට",
+"New password" => "නව මුර පදයක්",
+"Apps" => "යෙදුම්",
+"Help" => "උදව්",
+"Add" => "එක් කරන්න",
+"Data folder" => "දත්ත ෆෝල්ඩරය",
+"next" => "ඊළඟ"
+);
diff --git a/core/l10n/sk_SK.php b/core/l10n/sk_SK.php
index 069a169b5df..935f9ab16f4 100644
--- a/core/l10n/sk_SK.php
+++ b/core/l10n/sk_SK.php
@@ -15,13 +15,35 @@
 "October" => "Október",
 "November" => "November",
 "December" => "December",
+"Choose" => "Výber",
 "Cancel" => "Zrušiť",
 "No" => "Nie",
 "Yes" => "Áno",
 "Ok" => "Ok",
 "No categories selected for deletion." => "Neboli vybrané žiadne kategórie pre odstránenie.",
 "Error" => "Chyba",
+"Error while sharing" => "Chyba počas zdieľania",
+"Error while unsharing" => "Chyba počas ukončenia zdieľania",
+"Error while changing permissions" => "Chyba počas zmeny oprávnení",
+"Shared with you and the group" => "Zdieľané s vami a so skupinou",
+"by" => "od",
+"Shared with you by" => "Zdieľané s vami od",
+"Share with" => "Zdieľať s",
+"Share with link" => "Zdieľať cez odkaz",
+"Password protect" => "Chrániť heslom",
 "Password" => "Heslo",
+"Set expiration date" => "Nastaviť dátum expirácie",
+"Expiration date" => "Dátum expirácie",
+"Share via email:" => "Zdieľať cez e-mail:",
+"No people found" => "Užívateľ nenájdený",
+"with" => "s",
+"Unshare" => "Zrušiť zdieľanie",
+"can edit" => "môže upraviť",
+"access control" => "riadenie prístupu",
+"create" => "vytvoriť",
+"delete" => "zmazať",
+"share" => "zdieľať",
+"Password protected" => "Chránené heslom",
 "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.",
@@ -42,6 +64,7 @@
 "Cloud not found" => "Nenájdené",
 "Edit categories" => "Úprava kategórií",
 "Add" => "Pridať",
+"Security Warning" => "Bezpečnostné varovanie",
 "Create an <strong>admin account</strong>" => "Vytvoriť <strong>administrátorský účet</strong>",
 "Advanced" => "Pokročilé",
 "Data folder" => "Priečinok dát",
@@ -54,10 +77,13 @@
 "Finish setup" => "Dokončiť inštaláciu",
 "web services under your control" => "webové služby pod vašou kontrolou",
 "Log out" => "Odhlásiť",
+"Automatic logon rejected!" => "Automatické prihlásenie bolo zamietnuté!",
 "Lost your password?" => "Zabudli ste heslo?",
 "remember" => "zapamätať",
 "Log in" => "Prihlásiť sa",
 "You are logged out." => "Ste odhlásený.",
 "prev" => "späť",
-"next" => "ďalej"
+"next" => "ďalej",
+"Security Warning!" => "Bezpečnostné varovanie!",
+"Verify" => "Overenie"
 );
diff --git a/core/l10n/sv.php b/core/l10n/sv.php
index 993aae71ac3..2833792e0b7 100644
--- a/core/l10n/sv.php
+++ b/core/l10n/sv.php
@@ -25,18 +25,20 @@
 "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",
+"Shared with you and the group" => "Delas med dig och gruppen",
+"by" => "av",
+"Shared with you by" => "Delas med dig av",
 "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",
+"Share via email:" => "Dela via e-post:",
 "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",
+"Shared in" => "Delas i",
+"with" => "med",
 "Unshare" => "Sluta dela",
 "can edit" => "kan redigera",
 "access control" => "åtkomstkontroll",
@@ -67,6 +69,9 @@
 "Cloud not found" => "Hittade inget moln",
 "Edit categories" => "Redigera kategorier",
 "Add" => "Lägg till",
+"Security Warning" => "Säkerhetsvarning",
+"No secure random number generator is available, please enable the PHP OpenSSL extension." => "Ingen säker slumptalsgenerator finns tillgänglig. Du bör aktivera PHP OpenSSL-tillägget.",
+"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Utan en säker slumptalsgenerator kan angripare få möjlighet att förutsäga lösenordsåterställningar och ta över ditt konto.",
 "Create an <strong>admin account</strong>" => "Skapa ett <strong>administratörskonto</strong>",
 "Advanced" => "Avancerat",
 "Data folder" => "Datamapp",
diff --git a/core/l10n/th_TH.php b/core/l10n/th_TH.php
index 65b14b121d5..79a50b2c78d 100644
--- a/core/l10n/th_TH.php
+++ b/core/l10n/th_TH.php
@@ -25,18 +25,20 @@
 "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",
+"Shared with you and the group" => "แชร์ให้คุณและกลุ่ม",
+"by" => "โดย",
+"Shared with you by" => "แชร์ให้คุณโดย",
 "Share with" => "แชร์ให้กับ",
 "Share with link" => "แชร์ด้วยลิงก์",
 "Password protect" => "ใส่รหัสผ่านไว้",
 "Password" => "รหัสผ่าน",
 "Set expiration date" => "กำหนดวันที่หมดอายุ",
 "Expiration date" => "วันที่หมดอายุ",
-"Share via email: %s" => "แชร์ผ่านทางอีเมล: %s",
+"Share via email:" => "แชร์ผ่านทางอีเมล",
 "No people found" => "ไม่พบบุคคลที่ต้องการ",
 "Resharing is not allowed" => "ไม่อนุญาตให้แชร์ข้อมูลซ้ำได้",
-"Shared in %s with %s" => "ถูกแชร์ใน %s ด้วย %s",
+"Shared in" => "แชร์ไว้ใน",
+"with" => "ด้วย",
 "Unshare" => "ยกเลิกการแชร์",
 "can edit" => "สามารถแก้ไข",
 "access control" => "ระดับควบคุมการเข้าใช้งาน",
diff --git a/core/l10n/vi.php b/core/l10n/vi.php
index 26155a18663..758bd7274ff 100644
--- a/core/l10n/vi.php
+++ b/core/l10n/vi.php
@@ -15,13 +15,36 @@
 "October" => "Tháng 10",
 "November" => "Tháng 11",
 "December" => "Tháng 12",
+"Choose" => "Chọn",
 "Cancel" => "Hủy",
 "No" => "No",
 "Yes" => "Yes",
 "Ok" => "Ok",
 "No categories selected for deletion." => "Không có thể loại nào được chọn để xóa.",
 "Error" => "Lỗi",
+"Error while sharing" => "Lỗi trong quá trình chia sẻ",
+"Error while unsharing" => "Lỗi trong quá trình gỡ chia sẻ",
+"Error while changing permissions" => "Lỗi trong quá trình phân quyền",
+"Shared with you and the group" => "Được chia sẻ với bạn và Nhóm",
+"Shared with you by" => "Được chia sẻ với bạn qua",
+"Share with" => "Chia sẻ với",
+"Share with link" => "Chia sẻ với link",
 "Password" => "Mật khẩu",
+"Set expiration date" => "Đặt ngày kết thúc",
+"Expiration date" => "Ngày kết thúc",
+"Share via email:" => "Chia sẻ thông qua email",
+"No people found" => "Không tìm thấy người nào",
+"Shared in" => "Chi sẻ trong",
+"with" => "với",
+"Unshare" => "Gỡ bỏ chia sẻ",
+"access control" => "quản lý truy cập",
+"create" => "tạo",
+"update" => "cập nhật",
+"delete" => "xóa",
+"share" => "chia sẻ",
+"Password protected" => "Mật khẩu bảo vệ",
+"Error unsetting expiration date" => "Lỗi trong quá trình gỡ bỏ ngày kết thúc",
+"Error setting expiration date" => "Lỗi cấu hình ngày kết thúc",
 "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.",
diff --git a/core/l10n/zh_CN.GB2312.php b/core/l10n/zh_CN.GB2312.php
index de437cf2e4c..a69bbec0b26 100644
--- a/core/l10n/zh_CN.GB2312.php
+++ b/core/l10n/zh_CN.GB2312.php
@@ -15,13 +15,40 @@
 "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" => "与您和小组成员分享",
+"by" => "由",
+"Shared with you by" => "与您的分享，由",
+"Share with" => "分享",
+"Share with link" => "分享链接",
+"Password protect" => "密码保护",
 "Password" => "密码",
+"Set expiration date" => "设置失效日期",
+"Expiration date" => "失效日期",
+"Share via email:" => "通过电子邮件分享：",
+"No people found" => "查无此人",
+"Resharing is not allowed" => "不允许重复分享",
+"Shared in" => "分享在",
+"with" => "与",
+"Unshare" => "取消分享",
+"can edit" => "可编辑",
+"access control" => "访问控制",
+"create" => "创建",
+"update" => "更新",
+"delete" => "删除",
+"share" => "分享",
+"Password protected" => "密码保护",
+"Error unsetting expiration date" => "取消设置失效日期出错",
+"Error setting expiration date" => "设置失效日期出错",
 "ownCloud password reset" => "私有云密码重置",
 "Use the following link to reset your password: {link}" => "使用下面的链接来重置你的密码:{link}",
 "You will receive a link to reset your password via Email." => "你将会收到一个重置密码的链接",
@@ -42,6 +69,10 @@
 "Cloud not found" => "云 没有被找到",
 "Edit categories" => "编辑分类",
 "Add" => "添加",
+"Security Warning" => "安全警告",
+"No secure random number generator is available, please enable the PHP OpenSSL extension." => "没有安全随机码生成器，请启用 PHP OpenSSL 扩展。",
+"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "没有安全随机码生成器，黑客可以预测密码重置令牌并接管你的账户。",
+"Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "您的数据文件夹和您的文件或许能够从互联网访问。ownCloud 提供的 .htaccesss 文件未其作用。我们强烈建议您配置网络服务器以使数据文件夹不能从互联网访问，或将移动数据文件夹移出网络服务器文档根目录。",
 "Create an <strong>admin account</strong>" => "建立一个 <strong>管理帐户</strong>",
 "Advanced" => "进阶",
 "Data folder" => "数据存放文件夹",
@@ -55,10 +86,16 @@
 "Finish setup" => "完成安装",
 "web services under your control" => "你控制下的网络服务",
 "Log out" => "注销",
+"Automatic logon rejected!" => "自动登录被拒绝！",
+"If you did not change your password recently, your account may be compromised!" => "如果您最近没有修改您的密码，那您的帐号可能被攻击了！",
+"Please change your password to secure your account again." => "请修改您的密码以保护账户。",
 "Lost your password?" => "忘记密码?",
 "remember" => "备忘",
 "Log in" => "登陆",
 "You are logged out." => "你已经注销了",
 "prev" => "后退",
-"next" => "前进"
+"next" => "前进",
+"Security Warning!" => "安全警告！",
+"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "请确认您的密码。<br/>处于安全原因你偶尔也会被要求再次输入您的密码。",
+"Verify" => "确认"
 );
diff --git a/core/l10n/zh_CN.php b/core/l10n/zh_CN.php
index 47bda01ab54..6ddc41ffeb2 100644
--- a/core/l10n/zh_CN.php
+++ b/core/l10n/zh_CN.php
@@ -25,18 +25,14 @@
 "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" => "访问控制",
diff --git a/core/lostpassword/index.php b/core/lostpassword/index.php
index 3f58b03c982..906208dcbc4 100644
--- a/core/lostpassword/index.php
+++ b/core/lostpassword/index.php
@@ -13,11 +13,11 @@ require_once '../../lib/base.php';
 // Someone lost their password:
 if (isset($_POST['user'])) {
 	if (OC_User::userExists($_POST['user'])) {
-		$token = sha1($_POST['user'].md5(uniqid(rand(), true)));
-		OC_Preferences::setValue($_POST['user'], 'owncloud', 'lostpassword', $token);
+		$token = hash("sha256", OC_Util::generate_random_bytes(30).OC_Config::getValue('passwordsalt', ''));
+		OC_Preferences::setValue($_POST['user'], 'owncloud', 'lostpassword', hash("sha256", $token)); // Hash the token again to prevent timing attacks
 		$email = OC_Preferences::getValue($_POST['user'], 'settings', 'email', '');
-		if (!empty($email) and isset($_POST['sectoken']) and isset($_SESSION['sectoken']) and ($_POST['sectoken']==$_SESSION['sectoken']) ) {
-			$link = OC_Helper::linkToAbsolute('core/lostpassword', 'resetpassword.php', array('user' => urlencode($_POST['user']), 'token' => $token));
+		if (!empty($email)) {
+			$link = OC_Helper::linkToAbsolute('core/lostpassword', 'resetpassword.php', array('user' => $_POST['user'], 'token' => $token));
 			$tmpl = new OC_Template('core/lostpassword', 'email');
 			$tmpl->assign('link', $link, false);
 			$msg = $tmpl->fetchPage();
@@ -25,18 +25,11 @@ if (isset($_POST['user'])) {
 			$from = 'lostpassword-noreply@' . OCP\Util::getServerHost();
 			OC_MAIL::send($email, $_POST['user'], $l->t('ownCloud password reset'), $msg, $from, 'ownCloud');
 			echo('sent');
-
 		}
-		$sectoken=rand(1000000, 9999999);
-		$_SESSION['sectoken']=$sectoken;
-		OC_Template::printGuestPage('core/lostpassword', 'lostpassword', array('error' => false, 'requested' => true, 'sectoken' => $sectoken));
+		OC_Template::printGuestPage('core/lostpassword', 'lostpassword', array('error' => false, 'requested' => true));
 	} else {
-		$sectoken=rand(1000000, 9999999);
-		$_SESSION['sectoken']=$sectoken;
-		OC_Template::printGuestPage('core/lostpassword', 'lostpassword', array('error' => true, 'requested' => false, 'sectoken' => $sectoken));
+		OC_Template::printGuestPage('core/lostpassword', 'lostpassword', array('error' => true, 'requested' => false));
 	}
 } else {
-	$sectoken=rand(1000000, 9999999);
-	$_SESSION['sectoken']=$sectoken;
-	OC_Template::printGuestPage('core/lostpassword', 'lostpassword', array('error' => false, 'requested' => false, 'sectoken' => $sectoken));
+	OC_Template::printGuestPage('core/lostpassword', 'lostpassword', array('error' => false, 'requested' => false));
 }
diff --git a/core/lostpassword/resetpassword.php b/core/lostpassword/resetpassword.php
index 28a0063fc64..896c8da76e0 100644
--- a/core/lostpassword/resetpassword.php
+++ b/core/lostpassword/resetpassword.php
@@ -10,7 +10,7 @@ $RUNTIME_NOAPPS = TRUE; //no apps
 require_once '../../lib/base.php';
 
 // Someone wants to reset their password:
-if(isset($_GET['token']) && isset($_GET['user']) && OC_Preferences::getValue($_GET['user'], 'owncloud', 'lostpassword') === $_GET['token']) {
+if(isset($_GET['token']) && isset($_GET['user']) && OC_Preferences::getValue($_GET['user'], 'owncloud', 'lostpassword') === hash("sha256", $_GET['token'])) {
 	if (isset($_POST['password'])) {
 		if (OC_User::setPassword($_GET['user'], $_POST['password'])) {
 			OC_Preferences::deleteKey($_GET['user'], 'owncloud', 'lostpassword');
diff --git a/core/lostpassword/templates/lostpassword.php b/core/lostpassword/templates/lostpassword.php
index 754eabdad67..4b871963b80 100644
--- a/core/lostpassword/templates/lostpassword.php
+++ b/core/lostpassword/templates/lostpassword.php
@@ -10,7 +10,6 @@
 			<p class="infield">
 				<label for="user" class="infield"><?php echo $l->t( 'Username' ); ?></label>
 				<input type="text" name="user" id="user" value="" autocomplete="off" required autofocus />
-				<input type="hidden" name="sectoken" id="sectoken" value="<?php echo($_['sectoken']); ?>"  />
 			</p>
 			<input type="submit" id="submit" value="<?php echo $l->t('Request reset'); ?>" />
 		<?php endif; ?>
diff --git a/core/templates/installation.php b/core/templates/installation.php
index 1a05c3fb762..c0b29ea909d 100644
--- a/core/templates/installation.php
+++ b/core/templates/installation.php
@@ -3,7 +3,6 @@
 <input type='hidden' id='hasPostgreSQL' value='<?php echo $_['hasPostgreSQL'] ?>'></input>
 <input type='hidden' id='hasOracle' value='<?php echo $_['hasOracle'] ?>'></input>
 <form action="index.php" method="post">
-
 <input type="hidden" name="install" value="true" />
 	<?php if(count($_['errors']) > 0): ?>
 	<ul class="errors">
@@ -19,7 +18,20 @@
 		<?php endforeach; ?>
 	</ul>
 	<?php endif; ?>
-
+	<?php if(!$_['secureRNG']): ?>
+	<fieldset style="color: #B94A48; background-color: #F2DEDE; border-color: #EED3D7;">
+		<legend><strong><?php echo $l->t('Security Warning');?></strong></legend>
+		<span><?php echo $l->t('No secure random number generator is available, please enable the PHP OpenSSL extension.');?></span>		
+		<br/>
+		<span><?php echo $l->t('Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account.');?></span>		
+	</fieldset>
+	<?php endif; ?>
+	<?php if(!$_['htaccessWorking']): ?>
+	<fieldset style="color: #B94A48; background-color: #F2DEDE; border-color: #EED3D7;">
+		<legend><strong><?php echo $l->t('Security Warning');?></strong></legend>
+		<span><?php echo $l->t('Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root.');?></span>		
+	</fieldset>
+	<?php endif; ?>
 	<fieldset>
 		<legend><?php echo $l->t( 'Create an <strong>admin account</strong>' ); ?></legend>
 		<p class="infield">
diff --git a/core/templates/layout.base.php b/core/templates/layout.base.php
index c113a4db24e..f78b6ff8bbd 100644
--- a/core/templates/layout.base.php
+++ b/core/templates/layout.base.php
@@ -10,6 +10,8 @@
 		<script type="text/javascript">
 			var oc_webroot = '<?php echo OC::$WEBROOT; ?>';
 			var oc_appswebroots = <?php echo $_['apps_paths'] ?>;
+			var oc_requesttoken = '<?php echo $_['requesttoken']; ?>';
+			var oc_requestlifespan = '<?php echo $_['requestlifespan']; ?>';
 		</script>
 		<?php foreach ($_['jsfiles'] as $jsfile): ?>
 			<script type="text/javascript" src="<?php echo $jsfile; ?>"></script>
diff --git a/core/templates/layout.guest.php b/core/templates/layout.guest.php
index 0d2e71c180f..6f59e18a8e1 100644
--- a/core/templates/layout.guest.php
+++ b/core/templates/layout.guest.php
@@ -10,6 +10,8 @@
 		<script type="text/javascript">
 			var oc_webroot = '<?php echo OC::$WEBROOT; ?>';
 			var oc_appswebroots = <?php echo $_['apps_paths'] ?>;
+			var oc_requesttoken = '<?php echo $_['requesttoken']; ?>';
+			var oc_requestlifespan = '<?php echo $_['requestlifespan']; ?>';
 		</script>
 		<?php foreach($_['jsfiles'] as $jsfile): ?>
 			<script type="text/javascript" src="<?php echo $jsfile; ?>"></script>
diff --git a/core/templates/login.php b/core/templates/login.php
index 2c9b766aa4d..0768b664c6f 100644
--- a/core/templates/login.php
+++ b/core/templates/login.php
@@ -1,10 +1,21 @@
 <!--[if IE 8]><style>input[type="checkbox"]{padding:0;}</style><![endif]-->
-<form action="index.php" method="post">
+<form method="post">
 	<fieldset>
 		<?php if(!empty($_['redirect'])) { echo '<input type="hidden" name="redirect_url" value="'.$_['redirect'].'" />'; } ?>
-		<?php if($_['display_lostpassword']): ?>
-			<a href="./core/lostpassword/"><?php echo $l->t('Lost your password?'); ?></a>
+		<ul>
+		<?php if(isset($_['invalidcookie']) && ($_['invalidcookie'])): ?>
+			<li class="errors">
+				<?php echo $l->t('Automatic logon rejected!'); ?><br>
+				<small><?php echo $l->t('If you did not change your password recently, your account may be compromised!'); ?></small><br>
+				<small><?php echo $l->t('Please change your password to secure your account again.'); ?></small>
+			</li>
 		<?php endif; ?>
+		<?php if(isset($_['invalidpassword']) && ($_['invalidpassword'])): ?>
+			<a href="./core/lostpassword/"><li class="errors">
+				<?php echo $l->t('Lost your password?'); ?>
+			</li></a>
+		<?php endif; ?>
+		</ul>
 		<p class="infield">
 			<label for="user" class="infield"><?php echo $l->t( 'Username' ); ?></label>
 			<input type="text" name="user" id="user" value="<?php echo $_['username']; ?>"<?php echo $_['user_autofocus']?' autofocus':''; ?> autocomplete="on" required />
@@ -12,7 +23,6 @@
 		<p class="infield">
 			<label for="password" class="infield"><?php echo $l->t( 'Password' ); ?></label>
 			<input type="password" name="password" id="password" value="" required<?php echo $_['user_autofocus']?'':' autofocus'; ?> />
-			<input type="hidden" name="sectoken" id="sectoken" value="<?php echo($_['sectoken']); ?>"  />
 		</p>
 		<input type="checkbox" name="remember_login" value="1" id="remember_login" /><label for="remember_login"><?php echo $l->t('remember'); ?></label>
 		<input type="submit" id="submit" class="login" value="<?php echo $l->t( 'Log in' ); ?>" />
diff --git a/core/templates/verify.php b/core/templates/verify.php
new file mode 100644
index 00000000000..600eaca05b7
--- /dev/null
+++ b/core/templates/verify.php
@@ -0,0 +1,18 @@
+<form method="post">
+	<fieldset>
+		<ul>
+			<li class="errors">
+				<?php echo $l->t('Security Warning!'); ?><br>
+				<small><?php echo $l->t("Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again."); ?></small>
+			</li>
+		</ul>
+		<p class="infield">
+			<input type="text"  value="<?php echo $_['username']; ?>" disabled="disabled" />
+		</p>
+		<p class="infield">
+			<label for="password" class="infield"><?php echo $l->t( 'Password' ); ?></label>
+			<input type="password" name="password" id="password" value="" required />
+		</p>
+		<input type="submit" id="submit" class="login" value="<?php echo $l->t( 'Verify' ); ?>" />
+	</fieldset>
+</form>