Merge branch 'master' into routing

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

34 files changed, 299 insertions, 66 deletions

diff --git a/settings/ajax/changepassword.php b/settings/ajax/changepassword.php
index 200fdec26de..a0fe5947b6d 100644
--- a/settings/ajax/changepassword.php
+++ b/settings/ajax/changepassword.php
@@ -1,15 +1,13 @@
 <?php
 
+// Check if we are a user
 OCP\JSON::callCheck();
+OC_JSON::checkLoggedIn();
 
 $username = isset($_POST["username"]) ? $_POST["username"] : OC_User::getUser();
 $password = $_POST["password"];
 $oldPassword=isset($_POST["oldpassword"])?$_POST["oldpassword"]:'';
 
-// Check if we are a user
-OC_JSON::checkLoggedIn();
-OCP\JSON::callCheck();
-
 $userstatus = null;
 if(OC_Group::inGroup(OC_User::getUser(), 'admin')) {
 	$userstatus = 'admin';
@@ -17,8 +15,15 @@ if(OC_Group::inGroup(OC_User::getUser(), 'admin')) {
 if(OC_SubAdmin::isUserAccessible(OC_User::getUser(), $username)) {
 	$userstatus = 'subadmin';
 }
-if(OC_User::getUser() == $username && OC_User::checkPassword($username, $oldPassword)) {
-	$userstatus = 'user';
+if(OC_User::getUser() === $username) {
+	if (OC_User::checkPassword($username, $oldPassword))
+	{
+		$userstatus = 'user';
+	}  else {
+		if (!OC_Util::isUserVerified()) {
+			$userstatus = null;
+		}
+	}
 }
 
 if(is_null($userstatus)) {
@@ -26,6 +31,10 @@ if(is_null($userstatus)) {
 	exit();
 }
 
+if($userstatus === 'admin' || $userstatus === 'subadmin') {
+	OC_JSON::verifyUser();
+}
+
 // Return Success story
 if( OC_User::setPassword( $username, $password )) {
 	OC_JSON::success(array("data" => array( "username" => $username )));
diff --git a/settings/ajax/creategroup.php b/settings/ajax/creategroup.php
index bb3b0620e8a..0a79527c219 100644
--- a/settings/ajax/creategroup.php
+++ b/settings/ajax/creategroup.php
@@ -1,14 +1,7 @@
 <?php
 
 OCP\JSON::callCheck();
-
-// Check if we are a user
-if( !OC_User::isLoggedIn() || !OC_Group::inGroup( OC_User::getUser(), 'admin' )) {
-	OC_JSON::error(array("data" => array( "message" => $l->t("Authentication error") )));
-	exit();
-}
-
-OCP\JSON::callCheck();
+OC_JSON::checkAdminUser();
 
 $groupname = $_POST["groupname"];
 
diff --git a/settings/ajax/createuser.php b/settings/ajax/createuser.php
index 49fc0e0f53b..c87ff422f61 100644
--- a/settings/ajax/createuser.php
+++ b/settings/ajax/createuser.php
@@ -1,13 +1,7 @@
 <?php
 
 OCP\JSON::callCheck();
-
-// Check if we are a user
-if( !OC_User::isLoggedIn() || (!OC_Group::inGroup( OC_User::getUser(), 'admin' ) && !OC_SubAdmin::isSubAdmin(OC_User::getUser()))) {
-	OC_JSON::error(array("data" => array( "message" => "Authentication error" )));
-	exit();
-}
-OCP\JSON::callCheck();
+OC_JSON::checkSubAdminUser();
 
 $isadmin = OC_Group::inGroup(OC_User::getUser(), 'admin')?true:false;
 
diff --git a/settings/ajax/removeuser.php b/settings/ajax/removeuser.php
index a10dc29321d..9ffb32a0b23 100644
--- a/settings/ajax/removeuser.php
+++ b/settings/ajax/removeuser.php
@@ -5,6 +5,11 @@ OCP\JSON::callCheck();
 
 $username = $_POST["username"];
 
+// A user shouldn't be able to delete his own account
+if(OC_User::getUser() === $username) {
+	exit;
+}
+
 if(!OC_Group::inGroup(OC_User::getUser(), 'admin') && !OC_SubAdmin::isUserAccessible(OC_User::getUser(), $username)) {
 	$l = OC_L10N::get('core');
 	OC_JSON::error(array( 'data' => array( 'message' => $l->t('Authentication error') )));
diff --git a/settings/css/settings.css b/settings/css/settings.css
index 2015e93b43c..60a42784661 100644
--- a/settings/css/settings.css
+++ b/settings/css/settings.css
@@ -38,7 +38,7 @@ div.quota { float:right; display:block; position:absolute; right:25em; top:0; }
 div.quota-select-wrapper { position: relative; }
 select.quota { position:absolute; left:0; top:0; width:10em; }
 select.quota-user { position:relative; left:0; top:0; width:10em; }
-input.quota-other { display:none; position:absolute; left:0.1em; top:0.1em; width:7em; border:none; -webkit-box-shadow: none -mox-box-shadow:none ; box-shadow:none; }
+input.quota-other { display:none; position:absolute; left:0.1em; top:0.1em; width:7em; border:none; -webkit-box-shadow: none; -moz-box-shadow:none ; box-shadow:none; }
 div.quota>span { position:absolute; right:0em; white-space:nowrap; top: 0.7em }
 select.quota.active { background: #fff; }
 
@@ -50,7 +50,7 @@ li { color:#888; }
 li.active { color:#000; }
 small.externalapp { color:#FFF; background-color:#BBB; font-weight:bold; font-size: 0.6em; margin: 0; padding: 0.1em 0.2em; border-radius: 4px;}
 small.externalapp.list { float: right; }
-span.version { margin-left:3em; margin-right:3em; color:#555; }
+span.version { margin-left:1em; margin-right:1em; color:#555; }
 
 .app { position: relative; display: inline-block; padding: 0.2em 0 0.2em 0 !important; text-overflow: hidden; overflow: hidden; white-space: nowrap; /*transition: .2s max-width linear; -o-transition: .2s max-width linear; -moz-transition: .2s max-width linear; -webkit-transition: .2s max-width linear; -ms-transition: .2s max-width linear;*/ }
 .app.externalapp { max-width: 12.5em; z-index: 100; }
@@ -58,6 +58,7 @@ span.version { margin-left:3em; margin-right:3em; color:#555; }
 .app:hover, .app:active { max-width: inherit; }
 
 .appslink { text-decoration: underline; }
+.score { color:#666; font-weight:bold; font-size:0.8em; }
 
 /* LOG */
 #log { white-space:normal; }
diff --git a/settings/js/apps.js b/settings/js/apps.js
index 4ffbc41f22c..8de95100c4c 100644
--- a/settings/js/apps.js
+++ b/settings/js/apps.js
@@ -17,6 +17,7 @@ OC.Settings.Apps = OC.Settings.Apps || {
 		} else {
 			page.find('span.version').text('');
 		}
+		page.find('span.score').html(app.score);
 		page.find('p.description').html(app.description);
 		page.find('img.preview').attr('src', app.preview);
 		page.find('small.externalapp').attr('style', 'visibility:visible');
@@ -28,10 +29,13 @@ OC.Settings.Apps = OC.Settings.Apps || {
 		page.find('input.enable').data('appid', app.id);
 		page.find('input.enable').data('active', app.active);
 		if (app.internal == false) {
+			page.find('span.score').show();
 			page.find('p.appslink').show();
 			page.find('a').attr('href', 'http://apps.owncloud.com/content/show.php?content=' + app.id);
+			page.find('small.externalapp').hide();
 		} else {
 			page.find('p.appslink').hide();
+			page.find('span.score').hide();
 		}
 	},
 	enableApp:function(appid, active, element) {
diff --git a/settings/l10n/ca.php b/settings/l10n/ca.php
index 54bfdecde74..16660fb07d3 100644
--- a/settings/l10n/ca.php
+++ b/settings/l10n/ca.php
@@ -36,6 +36,7 @@
 "More" => "Més",
 "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Desenvolupat per la <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunitat ownCloud</a>, el <a href=\"https://github.com/owncloud\" target=\"_blank\">codi font</a> té llicència <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
 "Add your App" => "Afegiu la vostra aplicació",
+"More Apps" => "Més aplicacions",
 "Select an App" => "Seleccioneu una aplicació",
 "See application page at apps.owncloud.com" => "Mireu la pàgina d'aplicacions a apps.owncloud.com",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-propietat de <span class=\"author\"></span>",
diff --git a/settings/l10n/cs_CZ.php b/settings/l10n/cs_CZ.php
index bc64b68992b..c0f7ebd8686 100644
--- a/settings/l10n/cs_CZ.php
+++ b/settings/l10n/cs_CZ.php
@@ -36,6 +36,7 @@
 "More" => "Více",
 "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Vyvinuto <a href=\"http://ownCloud.org/contact\" target=\"_blank\">komunitou ownCloud</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">zdrojový kód</a> je licencován pod <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
 "Add your App" => "Přidat Vaší aplikaci",
+"More Apps" => "Více aplikací",
 "Select an App" => "Vyberte aplikaci",
 "See application page at apps.owncloud.com" => "Více na stránce s aplikacemi na apps.owncloud.com",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licencováno <span class=\"author\"></span>",
diff --git a/settings/l10n/da.php b/settings/l10n/da.php
index 4549bcc9d3d..f93d7b6cd11 100644
--- a/settings/l10n/da.php
+++ b/settings/l10n/da.php
@@ -36,6 +36,7 @@
 "More" => "Mere",
 "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Udviklet af <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownClouds community</a>, og <a href=\"https://github.com/owncloud\" target=\"_blank\">kildekoden</a> er underlagt licensen <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
 "Add your App" => "Tilføj din App",
+"More Apps" => "Flere Apps",
 "Select an App" => "Vælg en App",
 "See application page at apps.owncloud.com" => "Se applikationens side på apps.owncloud.com",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licenseret af <span class=\"author\"></span>",
diff --git a/settings/l10n/de.php b/settings/l10n/de.php
index 6b86a08ced5..13ada5d35e5 100644
--- a/settings/l10n/de.php
+++ b/settings/l10n/de.php
@@ -1,6 +1,5 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "Die Liste der Anwendungen im Store konnte nicht geladen werden.",
-"Authentication error" => "Fehler bei der Anmeldung",
 "Group already exists" => "Gruppe existiert bereits",
 "Unable to add group" => "Gruppe konnte nicht angelegt werden",
 "Could not enable app. " => "App konnte nicht aktiviert werden.",
@@ -9,6 +8,7 @@
 "OpenID Changed" => "OpenID geändert",
 "Invalid request" => "Ungültige Anfrage",
 "Unable to delete group" => "Gruppe konnte nicht gelöscht werden",
+"Authentication error" => "Fehler bei der Anmeldung",
 "Unable to delete user" => "Benutzer konnte nicht gelöscht werden",
 "Language changed" => "Sprache geändert",
 "Unable to add user to group %s" => "Der Benutzer konnte nicht zur Gruppe %s hinzugefügt werden",
@@ -16,9 +16,9 @@
 "Disable" => "Deaktivieren",
 "Enable" => "Aktivieren",
 "Saving..." => "Speichern...",
-"__language_name__" => "Deutsch",
+"__language_name__" => "Deutsch (Persönlich)",
 "Security Warning" => "Sicherheitshinweis",
-"Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Ihr Datenverzeichnis ist möglicher Weise aus dem Internet erreichbar. Die .htaccess-Datei von ownCloud funktioniert nicht. Wir raten Ihnen dringend, dass Sie Ihren Webserver dahingehend konfigurieren, dass Ihr Datenverzeichnis nicht länger aus dem Internet erreichbar ist, oder Sie verschieben das Datenverzeichnis außerhalb des Wurzelverzeichnisses des Webservers.",
+"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 ist möglicherweise aus dem Internet erreichbar. Die .htaccess-Datei von ownCloud funktioniert nicht. Wir raten Dir dringend, dass Du Deinen Webserver dahingehend konfigurieren, dass Dein Datenverzeichnis nicht länger aus dem Internet erreichbar ist, oder Du verschiebst das Datenverzeichnis außerhalb des Wurzelverzeichnisses des Webservers.",
 "Cron" => "Cron-Jobs",
 "Execute one task with each page loaded" => "Führe eine Aufgabe bei jeder geladenen Seite aus.",
 "cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "cron.php ist bei einem Webcron-Dienst registriert. Ruf die Seite cron.php im ownCloud-Root minütlich per HTTP auf.",
@@ -36,6 +36,7 @@
 "More" => "Mehr",
 "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Entwickelt von der <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud-Community</a>, der <a href=\"https://github.com/owncloud\" target=\"_blank\">Quellcode</a> ist unter der <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> lizenziert.",
 "Add your App" => "Füge Deine Anwendung hinzu",
+"More Apps" => "Weitere Anwendungen",
 "Select an App" => "Wähle eine Anwendung aus",
 "See application page at apps.owncloud.com" => "Weitere Anwendungen findest Du auf apps.owncloud.com",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-lizenziert von <span class=\"author\"></span>",
@@ -59,7 +60,7 @@
 "Fill in an email address to enable password recovery" => "Trage eine E-Mail-Adresse ein, um die Passwort-Wiederherstellung zu aktivieren.",
 "Language" => "Sprache",
 "Help translate" => "Hilf bei der Übersetzung",
-"use this address to connect to your ownCloud in your file manager" => "Benutzen Sie diese Adresse, um Ihre ownCloud mit Ihrem Dateimanager zu verbinden.",
+"use this address to connect to your ownCloud in your file manager" => "Verwende diese Adresse, um Deine ownCloud mit Deinem Dateimanager zu verbinden.",
 "Name" => "Name",
 "Password" => "Passwort",
 "Groups" => "Gruppen",
diff --git a/settings/l10n/de_DE.php b/settings/l10n/de_DE.php
new file mode 100644
index 00000000000..100cbfd113f
--- /dev/null
+++ b/settings/l10n/de_DE.php
@@ -0,0 +1,73 @@
+<?php $TRANSLATIONS = array(
+"Unable to load list from App Store" => "Die Liste der Anwendungen im Store konnte nicht geladen werden.",
+"Group already exists" => "Gruppe existiert bereits",
+"Unable to add group" => "Gruppe konnte nicht angelegt werden",
+"Could not enable app. " => "App konnte nicht aktiviert werden.",
+"Email saved" => "E-Mail Adresse gespeichert",
+"Invalid email" => "Ungültige E-Mail Adresse",
+"OpenID Changed" => "OpenID geändert",
+"Invalid request" => "Ungültige Anfrage",
+"Unable to delete group" => "Gruppe konnte nicht gelöscht werden",
+"Authentication error" => "Fehler bei der Anmeldung",
+"Unable to delete user" => "Benutzer konnte nicht gelöscht werden",
+"Language changed" => "Sprache geändert",
+"Unable to add user to group %s" => "Der Benutzer konnte nicht zur Gruppe %s hinzugefügt werden",
+"Unable to remove user from group %s" => "Der Benutzer konnte nicht aus der Gruppe %s entfernt werden",
+"Disable" => "Deaktivieren",
+"Enable" => "Aktivieren",
+"Saving..." => "Speichern...",
+"__language_name__" => "Deutsch (Förmlich)",
+"Security Warning" => "Sicherheitshinweis",
+"Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Ihr Datenverzeichnis ist möglicher Weise aus dem Internet erreichbar. Die .htaccess-Datei von ownCloud funktioniert nicht. Wir raten Ihnen dringend, dass Sie Ihren Webserver dahingehend konfigurieren, dass Ihr Datenverzeichnis nicht länger aus dem Internet erreichbar ist, oder Sie verschieben das Datenverzeichnis außerhalb des Wurzelverzeichnisses des Webservers.",
+"Cron" => "Cron-Jobs",
+"Execute one task with each page loaded" => "Führt eine Aufgabe bei jeder geladenen Seite aus.",
+"cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "cron.php ist bei einem Webcron-Dienst registriert. Ruf die Seite cron.php im ownCloud-Root minütlich per HTTP auf.",
+"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "Verwenden Sie den System-Crondienst. Bitte rufen Sie die cron.php im ownCloud-Ordner über einen System-Cronjob minütlich auf.",
+"Sharing" => "Freigabe",
+"Enable Share API" => "Freigabe-API aktivieren",
+"Allow apps to use the Share API" => "Erlaubt Anwendungen, die Freigabe-API zu nutzen",
+"Allow links" => "Links erlauben",
+"Allow users to share items to the public with links" => "Erlaube Nutzern, Dateien mithilfe von Links öffentlich zu teilen",
+"Allow resharing" => "Erneutes Teilen erlauben",
+"Allow users to share items shared with them again" => "Erlaubt Nutzern, Dateien die mit ihnen geteilt wurden, erneut zu teilen",
+"Allow users to share with anyone" => "Erlaubet Nutzern mit jedem zu Teilen",
+"Allow users to only share with users in their groups" => "Erlaubet Nutzern nur das Teilen in ihrer Gruppe",
+"Log" => "Log",
+"More" => "Mehr",
+"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Entwickelt von der <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud-Community</a>, der <a href=\"https://github.com/owncloud\" target=\"_blank\">Quellcode</a> ist unter der <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> lizenziert.",
+"Add your App" => "Fügen Sie Ihre Anwendung hinzu",
+"More Apps" => "Weitere Anwendungen",
+"Select an App" => "Wählen Sie eine Anwendung aus",
+"See application page at apps.owncloud.com" => "Weitere Anwendungen finden Sie auf apps.owncloud.com",
+"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-lizenziert von <span class=\"author\"></span>",
+"Documentation" => "Dokumentation",
+"Managing Big Files" => "Große Dateien verwalten",
+"Ask a question" => "Stellen Sie eine Frage",
+"Problems connecting to help database." => "Probleme bei der Verbindung zur Hilfe-Datenbank.",
+"Go there manually." => "Datenbank direkt besuchen.",
+"Answer" => "Antwort",
+"You have used <strong>%s</strong> of the available <strong>%s<strong>" => "Sie verwenden <strong>%s</strong> der verfügbaren <strong>%s<strong>",
+"Desktop and Mobile Syncing Clients" => "Desktop- und mobile Clients für die Synchronisation",
+"Download" => "Download",
+"Your password was changed" => "Ihr Passwort wurde geändert.",
+"Unable to change your password" => "Passwort konnte nicht geändert werden",
+"Current password" => "Aktuelles Passwort",
+"New password" => "Neues Passwort",
+"show" => "zeigen",
+"Change password" => "Passwort ändern",
+"Email" => "E-Mail",
+"Your email address" => "Ihre E-Mail-Adresse",
+"Fill in an email address to enable password recovery" => "Bitte tragen Sie eine E-Mail-Adresse ein, um die Passwort-Wiederherstellung zu aktivieren.",
+"Language" => "Sprache",
+"Help translate" => "Hilf bei der Übersetzung",
+"use this address to connect to your ownCloud in your file manager" => "Benutzen Sie diese Adresse, um Ihre ownCloud mit Ihrem Dateimanager zu verbinden.",
+"Name" => "Name",
+"Password" => "Passwort",
+"Groups" => "Gruppen",
+"Create" => "Anlegen",
+"Default Quota" => "Standard-Quota",
+"Other" => "Andere",
+"Group Admin" => "Gruppenadministrator",
+"Quota" => "Quota",
+"Delete" => "Löschen"
+);
diff --git a/settings/l10n/el.php b/settings/l10n/el.php
index c6bb9857100..bf74d0bde21 100644
--- a/settings/l10n/el.php
+++ b/settings/l10n/el.php
@@ -4,7 +4,7 @@
 "Group already exists" => "Η ομάδα υπάρχει ήδη",
 "Unable to add group" => "Αδυναμία προσθήκης ομάδας",
 "Could not enable app. " => "Αδυναμία ενεργοποίησης εφαρμογής ",
-"Email saved" => "Το Email αποθηκεύτηκε ",
+"Email saved" => "Το email αποθηκεύτηκε ",
 "Invalid email" => "Μη έγκυρο email",
 "OpenID Changed" => "Το OpenID άλλαξε",
 "Invalid request" => "Μη έγκυρο αίτημα",
@@ -33,14 +33,15 @@
 "Allow users to share with anyone" => "Να επιτρέπεται ο διαμοιρασμός με οποιονδήποτε",
 "Allow users to only share with users in their groups" => "Να επιτρέπεται ο διαμοιρασμός μόνο με χρήστες της ίδιας ομάδας",
 "Log" => "Αρχείο καταγραφής",
-"More" => "Περισσότερο",
+"More" => "Περισσότερα",
 "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Αναπτύχθηκε από την <a href=\"http://ownCloud.org/contact\" target=\"_blank\">κοινότητα ownCloud</a>, ο <a href=\"https://github.com/owncloud\" target=\"_blank\">πηγαίος κώδικας</a> είναι υπό άδεια χρήσης <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
-"Add your App" => "Πρόσθεσε τη δικιά σου εφαρμογή ",
-"Select an App" => "Επιλέξτε μια εφαρμογή",
-"See application page at apps.owncloud.com" => "Η σελίδα εφαρμογών στο apps.owncloud.com",
+"Add your App" => "Πρόσθεστε τη Δικιά σας Εφαρμογή",
+"More Apps" => "Περισσότερες Εφαρμογές",
+"Select an App" => "Επιλέξτε μια Εφαρμογή",
+"See application page at apps.owncloud.com" => "Δείτε την σελίδα εφαρμογών στο apps.owncloud.com",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-άδεια από <span class=\"author\"></span>",
 "Documentation" => "Τεκμηρίωση",
-"Managing Big Files" => "Διαχείριση μεγάλων αρχείων",
+"Managing Big Files" => "Διαχείριση Μεγάλων Αρχείων",
 "Ask a question" => "Ρωτήστε μια ερώτηση",
 "Problems connecting to help database." => "Προβλήματα κατά τη σύνδεση με τη βάση δεδομένων βοήθειας.",
 "Go there manually." => "Χειροκίνητη μετάβαση.",
@@ -55,18 +56,18 @@
 "show" => "εμφάνιση",
 "Change password" => "Αλλαγή συνθηματικού",
 "Email" => "Email",
-"Your email address" => "Διεύθυνση ηλεκτρονικού ταχυδρομείου σας",
+"Your email address" => "Η διεύθυνση ηλεκτρονικού ταχυδρομείου σας",
 "Fill in an email address to enable password recovery" => "Συμπληρώστε μια διεύθυνση ηλεκτρονικού ταχυδρομείου για να ενεργοποιηθεί η ανάκτηση συνθηματικού",
 "Language" => "Γλώσσα",
-"Help translate" => "Βοηθήστε στην μετάφραση",
-"use this address to connect to your ownCloud in your file manager" => "χρησιμοποιήστε αυτή τη διεύθυνση για να συνδεθείτε στο ownCloud σας από το διαχειριστή αρχείων σας",
+"Help translate" => "Βοηθήστε στη μετάφραση",
+"use this address to connect to your ownCloud in your file manager" => "χρησιμοποιήστε αυτήν τη διεύθυνση για να συνδεθείτε στο ownCloud σας από το διαχειριστή αρχείων σας",
 "Name" => "Όνομα",
 "Password" => "Συνθηματικό",
 "Groups" => "Ομάδες",
 "Create" => "Δημιουργία",
-"Default Quota" => "Προεπιλεγμένο όριο",
+"Default Quota" => "Προεπιλεγμένο Όριο",
 "Other" => "Άλλα",
 "Group Admin" => "Ομάδα Διαχειριστών",
-"Quota" => "Σύνολο χώρου",
+"Quota" => "Σύνολο Χώρου",
 "Delete" => "Διαγραφή"
 );
diff --git a/settings/l10n/eo.php b/settings/l10n/eo.php
index 7052bf34c92..2c8263d292f 100644
--- a/settings/l10n/eo.php
+++ b/settings/l10n/eo.php
@@ -1,30 +1,50 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "Ne eblis ŝargi liston el aplikaĵovendejo",
 "Authentication error" => "Aŭtentiga eraro",
+"Group already exists" => "La grupo jam ekzistas",
+"Unable to add group" => "Ne eblis aldoni la grupon",
+"Could not enable app. " => "Ne eblis kapabligi la aplikaĵon.",
 "Email saved" => "La retpoŝtadreso konserviĝis",
 "Invalid email" => "Nevalida retpoŝtadreso",
 "OpenID Changed" => "La agordo de OpenID estas ŝanĝita",
 "Invalid request" => "Nevalida peto",
+"Unable to delete group" => "Ne eblis forigi la grupon",
+"Unable to delete user" => "Ne eblis forigi la uzanton",
 "Language changed" => "La lingvo estas ŝanĝita",
+"Unable to add user to group %s" => "Ne eblis aldoni la uzanton al la grupo %s",
+"Unable to remove user from group %s" => "Ne eblis forigi la uzantan el la grupo %s",
 "Disable" => "Malkapabligi",
 "Enable" => "Kapabligi",
 "Saving..." => "Konservante...",
 "__language_name__" => "Esperanto",
 "Security Warning" => "Sekureca averto",
 "Cron" => "Cron",
+"Sharing" => "Kunhavigo",
+"Enable Share API" => "Kapabligi API-on por Kunhavigo",
+"Allow apps to use the Share API" => "Kapabligi aplikaĵojn uzi la API-on pri Kunhavigo",
+"Allow links" => "Kapabligi ligilojn",
+"Allow users to share items to the public with links" => "Kapabligi uzantojn kunhavigi erojn kun la publiko perligile",
+"Allow resharing" => "Kapabligi rekunhavigon",
+"Allow users to share items shared with them again" => "Kapabligi uzantojn rekunhavigi erojn kunhavigitajn kun ili",
+"Allow users to share with anyone" => "Kapabligi uzantojn kunhavigi kun ĉiu ajn",
+"Allow users to only share with users in their groups" => "Kapabligi uzantojn nur kunhavigi kun uzantoj el siaj grupoj",
 "Log" => "Protokolo",
 "More" => "Pli",
 "Add your App" => "Aldonu vian aplikaĵon",
+"More Apps" => "Pli da aplikaĵoj",
 "Select an App" => "Elekti aplikaĵon",
 "See application page at apps.owncloud.com" => "Vidu la paĝon pri aplikaĵoj ĉe apps.owncloud.com",
+"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"</span>-permesilhavigita de <span class=\"author\"></span>",
 "Documentation" => "Dokumentaro",
 "Managing Big Files" => "Administrante grandajn dosierojn",
 "Ask a question" => "Faru demandon",
 "Problems connecting to help database." => "Problemoj okazis dum konektado al la helpa datumbazo.",
 "Go there manually." => "Iri tien mane.",
 "Answer" => "Respondi",
+"You have used <strong>%s</strong> of the available <strong>%s<strong>" => "Vi uzas <strong>%s</strong> el la haveblaj <strong>%s</strong>",
 "Desktop and Mobile Syncing Clients" => "Labortablaj kaj porteblaj sinkronigoklientoj",
 "Download" => "Elŝuti",
+"Your password was changed" => "Via pasvorto ŝanĝiĝis",
 "Unable to change your password" => "Ne eblis ŝanĝi vian pasvorton",
 "Current password" => "Nuna pasvorto",
 "New password" => "Nova pasvorto",
diff --git a/settings/l10n/es.php b/settings/l10n/es.php
index 268c7ef1263..9a578fa6368 100644
--- a/settings/l10n/es.php
+++ b/settings/l10n/es.php
@@ -36,6 +36,7 @@
 "More" => "Más",
 "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Desarrollado por la <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunidad ownCloud</a>, el <a href=\"https://github.com/owncloud\" target=\"_blank\">código fuente</a> está bajo licencia <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
 "Add your App" => "Añade tu aplicación",
+"More Apps" => "Más aplicaciones",
 "Select an App" => "Seleccionar una aplicación",
 "See application page at apps.owncloud.com" => "Echa un vistazo a la web de aplicaciones apps.owncloud.com",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licenciado por <span class=\"author\"></span>",
diff --git a/settings/l10n/es_AR.php b/settings/l10n/es_AR.php
index 06f808ee516..0b103406fab 100644
--- a/settings/l10n/es_AR.php
+++ b/settings/l10n/es_AR.php
@@ -36,6 +36,7 @@
 "More" => "Más",
 "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Desarrollado por la <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunidad ownCloud</a>, el <a href=\"https://github.com/owncloud\" target=\"_blank\">código fuente</a> está bajo licencia <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
 "Add your App" => "Añadí tu aplicación",
+"More Apps" => "Más aplicaciones",
 "Select an App" => "Seleccionar una aplicación",
 "See application page at apps.owncloud.com" => "Mirá la web de aplicaciones apps.owncloud.com",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licenciado por <span class=\"author\">",
diff --git a/settings/l10n/fr.php b/settings/l10n/fr.php
index b81f545b13e..3a7bf0749bf 100644
--- a/settings/l10n/fr.php
+++ b/settings/l10n/fr.php
@@ -1,6 +1,5 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "Impossible de charger la liste depuis l'App Store",
-"Authentication error" => "Erreur d'authentification",
 "Group already exists" => "Ce groupe existe déjà",
 "Unable to add group" => "Impossible d'ajouter le groupe",
 "Could not enable app. " => "Impossible d'activer l'Application",
@@ -9,6 +8,7 @@
 "OpenID Changed" => "Identifiant OpenID changé",
 "Invalid request" => "Requête invalide",
 "Unable to delete group" => "Impossible de supprimer le groupe",
+"Authentication error" => "Erreur d'authentification",
 "Unable to delete user" => "Impossible de supprimer l'utilisateur",
 "Language changed" => "Langue changée",
 "Unable to add user to group %s" => "Impossible d'ajouter l'utilisateur au groupe %s",
@@ -36,6 +36,7 @@
 "More" => "Plus",
 "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Développé par la <a href=\"http://ownCloud.org/contact\" target=\"_blank\">communauté ownCloud</a>, le <a href=\"https://github.com/owncloud\" target=\"_blank\">code source</a> est publié sous license <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
 "Add your App" => "Ajoutez votre application",
+"More Apps" => "Plus d'applications…",
 "Select an App" => "Sélectionner une Application",
 "See application page at apps.owncloud.com" => "Voir la page des applications à l'url apps.owncloud.com",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "Distribué sous licence <span class=\"licence\"></span>, par <span class=\"author\"></span>",
diff --git a/settings/l10n/it.php b/settings/l10n/it.php
index 474149c836c..0fc32c0b931 100644
--- a/settings/l10n/it.php
+++ b/settings/l10n/it.php
@@ -36,6 +36,7 @@
 "More" => "Altro",
 "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Sviluppato dalla <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunità di ownCloud</a>, il <a href=\"https://github.com/owncloud\" target=\"_blank\">codice sorgente</a> è licenziato nei termini della <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
 "Add your App" => "Aggiungi la tua applicazione",
+"More Apps" => "Altre applicazioni",
 "Select an App" => "Seleziona un'applicazione",
 "See application page at apps.owncloud.com" => "Vedere la pagina dell'applicazione su apps.owncloud.com",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licenziato da <span class=\"author\"></span>",
diff --git a/settings/l10n/ja_JP.php b/settings/l10n/ja_JP.php
index 72f79837d90..81b7861a3be 100644
--- a/settings/l10n/ja_JP.php
+++ b/settings/l10n/ja_JP.php
@@ -1,6 +1,5 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "アプリストアからリストをロードできません",
-"Authentication error" => "認証エラー",
 "Group already exists" => "グループは既に存在しています",
 "Unable to add group" => "グループを追加できません",
 "Could not enable app. " => "アプリを有効にできませんでした。",
@@ -9,6 +8,7 @@
 "OpenID Changed" => "OpenIDが変更されました",
 "Invalid request" => "無効なリクエストです",
 "Unable to delete group" => "グループを削除できません",
+"Authentication error" => "認証エラー",
 "Unable to delete user" => "ユーザを削除できません",
 "Language changed" => "言語が変更されました",
 "Unable to add user to group %s" => "ユーザをグループ %s に追加できません",
@@ -36,6 +36,7 @@
 "More" => "もっと",
 "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "<a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>により開発されています、<a href=\"https://github.com/owncloud\" target=\"_blank\">ソースコード</a>ライセンスは、<a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> ライセンスにより提供されています。",
 "Add your App" => "アプリを追加",
+"More Apps" => "さらにアプリを表示",
 "Select an App" => "アプリを選択してください",
 "See application page at apps.owncloud.com" => "apps.owncloud.com でアプリケーションのページを見てください",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-ライセンス: <span class=\"author\"></span>",
@@ -45,7 +46,7 @@
 "Problems connecting to help database." => "ヘルプデータベースへの接続時に問題が発生しました",
 "Go there manually." => "手動で移動してください。",
 "Answer" => "解答",
-"You have used <strong>%s</strong> of the available <strong>%s<strong>" => "現在､<strong>%s</strong> / <strong>%s<strong> を利用しています",
+"You have used <strong>%s</strong> of the available <strong>%s<strong>" => "現在､ <strong>%s</strong> / <strong>%s<strong> を利用しています",
 "Desktop and Mobile Syncing Clients" => "デスクトップおよびモバイル用の同期クライアント",
 "Download" => "ダウンロード",
 "Your password was changed" => "パスワードを変更しました",
diff --git a/settings/l10n/nl.php b/settings/l10n/nl.php
index caff2ee2c29..d24c4f04ad1 100644
--- a/settings/l10n/nl.php
+++ b/settings/l10n/nl.php
@@ -36,6 +36,7 @@
 "More" => "Meer",
 "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Ontwikkeld door de <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud gemeenschap</a>, de <a href=\"https://github.com/owncloud\" target=\"_blank\">bron code</a> is gelicenseerd onder de <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
 "Add your App" => "Voeg je App toe",
+"More Apps" => "Meer apps",
 "Select an App" => "Selecteer een app",
 "See application page at apps.owncloud.com" => "Zie de applicatiepagina op apps.owncloud.com",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-Gelicenseerd door <span class=\"author\"></span>",
@@ -66,7 +67,7 @@
 "Create" => "Creëer",
 "Default Quota" => "Standaard limiet",
 "Other" => "Andere",
-"Group Admin" => "Groep Administrator",
+"Group Admin" => "Groep beheerder",
 "Quota" => "Limieten",
 "Delete" => "verwijderen"
 );
diff --git a/settings/l10n/oc.php b/settings/l10n/oc.php
new file mode 100644
index 00000000000..28835df95c1
--- /dev/null
+++ b/settings/l10n/oc.php
@@ -0,0 +1,61 @@
+<?php $TRANSLATIONS = array(
+"Unable to load list from App Store" => "Pas possible de cargar la tièra dempuèi App Store",
+"Authentication error" => "Error d'autentificacion",
+"Group already exists" => "Lo grop existís ja",
+"Unable to add group" => "Pas capable d'apondre  un grop",
+"Could not enable app. " => "Pòt pas activar app. ",
+"Email saved" => "Corrièl enregistrat",
+"Invalid email" => "Corrièl incorrècte",
+"OpenID Changed" => "OpenID cambiat",
+"Invalid request" => "Demanda invalida",
+"Unable to delete group" => "Pas capable d'escafar un grop",
+"Unable to delete user" => "Pas capable d'escafar un usancièr",
+"Language changed" => "Lengas cambiadas",
+"Unable to add user to group %s" => "Pas capable d'apondre un usancièr al grop %s",
+"Unable to remove user from group %s" => "Pas capable de tira un usancièr del grop %s",
+"Disable" => "Desactiva",
+"Enable" => "Activa",
+"Saving..." => "Enregistra...",
+"__language_name__" => "__language_name__",
+"Security Warning" => "Avertiment de securitat",
+"Cron" => "Cron",
+"Execute one task with each page loaded" => "Executa un prètfach amb cada pagina cargada",
+"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "Utiliza lo servici cron de ton sistèm operatiu. Executa lo fichièr cron.php dins lo dorsier owncloud tras cronjob del sistèm cada minuta.",
+"Sharing" => "Al partejar",
+"Enable Share API" => "Activa API partejada",
+"Log" => "Jornal",
+"More" => "Mai d'aquò",
+"Add your App" => "Ajusta ton App",
+"Select an App" => "Selecciona una applicacion",
+"See application page at apps.owncloud.com" => "Agacha la pagina d'applications en cò de apps.owncloud.com",
+"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licençiat per <span class=\"author\"></span>",
+"Documentation" => "Documentacion",
+"Managing Big Files" => "Al bailejar de fichièrs pesucasses",
+"Ask a question" => "Respond a una question",
+"Problems connecting to help database." => "Problemas al connectar de la basa de donadas d'ajuda",
+"Go there manually." => "Vas çai manualament",
+"Answer" => "Responsa",
+"You have used <strong>%s</strong> of the available <strong>%s<strong>" => "As utilizat <strong>%s</strong> dels <strong>%s<strong> disponibles",
+"Download" => "Avalcarga",
+"Your password was changed" => "Ton senhal a cambiat",
+"Unable to change your password" => "Pas possible de cambiar ton senhal",
+"Current password" => "Senhal en cors",
+"New password" => "Senhal novèl",
+"show" => "mòstra",
+"Change password" => "Cambia lo senhal",
+"Email" => "Corrièl",
+"Your email address" => "Ton adreiça de corrièl",
+"Fill in an email address to enable password recovery" => "Emplena una adreiça de corrièl per permetre lo mandadís del senhal perdut",
+"Language" => "Lenga",
+"Help translate" => "Ajuda a la revirada",
+"use this address to connect to your ownCloud in your file manager" => "utiliza aquela adreiça per te connectar al ownCloud amb ton explorator de fichièrs",
+"Name" => "Nom",
+"Password" => "Senhal",
+"Groups" => "Grops",
+"Create" => "Crea",
+"Default Quota" => "Quota per defaut",
+"Other" => "Autres",
+"Group Admin" => "Grop Admin",
+"Quota" => "Quota",
+"Delete" => "Escafa"
+);
diff --git a/settings/l10n/pl.php b/settings/l10n/pl.php
index 432b303b0a5..5ea1f022c66 100644
--- a/settings/l10n/pl.php
+++ b/settings/l10n/pl.php
@@ -13,8 +13,8 @@
 "Language changed" => "Język zmieniony",
 "Unable to add user to group %s" => "Nie można dodać użytkownika do grupy %s",
 "Unable to remove user from group %s" => "Nie można usunąć użytkownika z grupy %s",
-"Disable" => "Wyłączone",
-"Enable" => "Włączone",
+"Disable" => "Wyłącz",
+"Enable" => "Włącz",
 "Saving..." => "Zapisywanie...",
 "__language_name__" => "Polski",
 "Security Warning" => "Ostrzeżenia bezpieczeństwa",
@@ -36,6 +36,7 @@
 "More" => "Więcej",
 "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Stwirzone przez <a href=\"http://ownCloud.org/contact\" target=\"_blank\"> społeczność ownCloud</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">kod źródłowy</a> na licencji <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
 "Add your App" => "Dodaj aplikacje",
+"More Apps" => "Więcej aplikacji",
 "Select an App" => "Zaznacz aplikacje",
 "See application page at apps.owncloud.com" => "Zobacz stronę aplikacji na apps.owncloud.com",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licencjonowane przez <span class=\"author\"></span>",
diff --git a/settings/l10n/pt_BR.php b/settings/l10n/pt_BR.php
index ddfba1a670e..7ca5160d9a8 100644
--- a/settings/l10n/pt_BR.php
+++ b/settings/l10n/pt_BR.php
@@ -36,6 +36,7 @@
 "More" => "Mais",
 "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Desenvolvido pela <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunidade ownCloud</a>, o <a href=\"https://github.com/owncloud\" target=\"_blank\">código fonte</a> está licenciado sob <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
 "Add your App" => "Adicione seu Aplicativo",
+"More Apps" => "Mais Apps",
 "Select an App" => "Selecione uma Aplicação",
 "See application page at apps.owncloud.com" => "Ver página do aplicativo em apps.owncloud.com",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licenciado por <span class=\"author\"></span>",
@@ -45,7 +46,7 @@
 "Problems connecting to help database." => "Problemas ao conectar na base de dados.",
 "Go there manually." => "Ir manualmente.",
 "Answer" => "Resposta",
-"You have used <strong>%s</strong> of the available <strong>%s<strong>" => "Você usou <strong>%s</strong> do <strong>%s</strong> disponível",
+"You have used <strong>%s</strong> of the available <strong>%s<strong>" => "Você usou <strong>%s</strong> do espaço disponível de <strong>%s</strong> ",
 "Desktop and Mobile Syncing Clients" => "Sincronizando Desktop e Mobile",
 "Download" => "Download",
 "Your password was changed" => "Sua senha foi alterada",
diff --git a/settings/l10n/pt_PT.php b/settings/l10n/pt_PT.php
index f7440d832a0..a5eb8c399be 100644
--- a/settings/l10n/pt_PT.php
+++ b/settings/l10n/pt_PT.php
@@ -1,32 +1,57 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "Incapaz de carregar a lista da App Store",
 "Authentication error" => "Erro de autenticação",
+"Group already exists" => "O grupo já existe",
+"Unable to add group" => "Impossível acrescentar o grupo",
+"Could not enable app. " => "Não foi possível activar a app.",
 "Email saved" => "Email guardado",
 "Invalid email" => "Email inválido",
 "OpenID Changed" => "OpenID alterado",
 "Invalid request" => "Pedido inválido",
+"Unable to delete group" => "Impossível apagar grupo",
+"Unable to delete user" => "Impossível apagar utilizador",
 "Language changed" => "Idioma alterado",
-"Disable" => "Desativar",
-"Enable" => "Ativar",
+"Unable to add user to group %s" => "Impossível acrescentar utilizador ao grupo %s",
+"Unable to remove user from group %s" => "Impossível apagar utilizador do grupo %s",
+"Disable" => "Desactivar",
+"Enable" => "Activar",
 "Saving..." => "A guardar...",
 "__language_name__" => "__language_name__",
 "Security Warning" => "Aviso de Segurança",
+"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." => "A sua pasta com os dados e os seus ficheiros estão provavelmente acessíveis a partir das internet. Sugerimos veementemente que configure o seu servidor web de maneira a que a pasta com os dados deixe de ficar acessível, ou mova a pasta com os dados para fora da raiz de documentos do servidor web.",
 "Cron" => "Cron",
+"Execute one task with each page loaded" => "Executar uma tarefa ao carregar cada página",
+"cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "cron.php está registado num serviço webcron. Chame a página cron.php na raiz owncloud por http uma vez por minuto.",
+"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "Usar o serviço cron do sistema. Chame a página cron.php na pasta owncloud via um cronjob do sistema uma vez por minuto.",
+"Sharing" => "Partilhando",
+"Enable Share API" => "Activar API de partilha",
+"Allow apps to use the Share API" => "Permitir que as aplicações usem a API de partilha",
+"Allow links" => "Permitir ligações",
+"Allow users to share items to the public with links" => "Permitir que os utilizadores partilhem itens com o público com ligações",
+"Allow resharing" => "Permitir voltar a partilhar",
+"Allow users to share items shared with them again" => "Permitir que os utilizadores partilhem itens que foram partilhados com eles",
+"Allow users to share with anyone" => "Permitir que os utilizadores partilhem com toda a gente",
+"Allow users to only share with users in their groups" => "Permitir que os utilizadores apenas partilhem com utilizadores do seu grupo",
 "Log" => "Log",
 "More" => "Mais",
+"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Desenvolvido pela <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunidade ownCloud</a>, o<a href=\"https://github.com/owncloud\" target=\"_blank\">código fonte</a> está licenciado sob a <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
 "Add your App" => "Adicione a sua aplicação",
+"More Apps" => "Mais Aplicações",
 "Select an App" => "Selecione uma aplicação",
 "See application page at apps.owncloud.com" => "Ver a página da aplicação em apps.owncloud.com",
+"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licenciado por <span class=\"author\"></span>",
 "Documentation" => "Documentação",
 "Managing Big Files" => "Gestão de ficheiros grandes",
 "Ask a question" => "Coloque uma questão",
-"Problems connecting to help database." => "Problemas ao conectar à base de dados de ajuda",
+"Problems connecting to help database." => "Problemas ao ligar à base de dados de ajuda",
 "Go there manually." => "Vá lá manualmente",
 "Answer" => "Resposta",
-"Desktop and Mobile Syncing Clients" => "Clientes de sincronização desktop e movel",
+"You have used <strong>%s</strong> of the available <strong>%s<strong>" => "Usou <strong>%s</strong> dos <strong>%s<strong> disponíveis.",
+"Desktop and Mobile Syncing Clients" => "Clientes de sincronização desktop e móvel",
 "Download" => "Transferir",
+"Your password was changed" => "A sua palavra-passe foi alterada",
 "Unable to change your password" => "Não foi possivel alterar a sua palavra-chave",
-"Current password" => "Palavra-chave atual",
+"Current password" => "Palavra-chave actual",
 "New password" => "Nova palavra-chave",
 "show" => "mostrar",
 "Change password" => "Alterar palavra-chave",
@@ -35,12 +60,12 @@
 "Fill in an email address to enable password recovery" => "Preencha com o seu endereço de email para ativar a recuperação da palavra-chave",
 "Language" => "Idioma",
 "Help translate" => "Ajude a traduzir",
-"use this address to connect to your ownCloud in your file manager" => "utilize este endereço para conectar ao seu ownCloud através do seu gerenciador de ficheiros",
+"use this address to connect to your ownCloud in your file manager" => "utilize este endereço para ligar ao seu ownCloud através do seu gestor de ficheiros",
 "Name" => "Nome",
 "Password" => "Palavra-chave",
 "Groups" => "Grupos",
 "Create" => "Criar",
-"Default Quota" => "Quota por defeito",
+"Default Quota" => "Quota por padrão",
 "Other" => "Outro",
 "Group Admin" => "Grupo Administrador",
 "Quota" => "Quota",
diff --git a/settings/l10n/ru_RU.php b/settings/l10n/ru_RU.php
index a61b40e4fb2..e94c371fe4c 100644
--- a/settings/l10n/ru_RU.php
+++ b/settings/l10n/ru_RU.php
@@ -27,6 +27,7 @@
 "Enable Share API" => "Включить разделяемые API",
 "Allow apps to use the Share API" => "Разрешить приложениям использовать Share API",
 "Allow links" => "Предоставить ссылки",
+"Allow users to share items to the public with links" => "Позволяет пользователям добавлять объекты в общий доступ по ссылке",
 "Allow resharing" => "Разрешить повторное совместное использование",
 "Allow users to share with anyone" => "Разрешить пользователям разделение с кем-либо",
 "Allow users to only share with users in their groups" => "Разрешить пользователям разделение только с пользователями в их группах",
@@ -34,6 +35,7 @@
 "More" => "Подробнее",
 "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Разработанный <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
 "Add your App" => "Добавить Ваше приложение",
+"More Apps" => "Больше приложений",
 "Select an App" => "Выбрать приложение",
 "See application page at apps.owncloud.com" => "Обратитесь к странице приложений на apps.owncloud.com",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>",
@@ -43,8 +45,10 @@
 "Problems connecting to help database." => "Проблемы, связанные с разделом Помощь базы данных",
 "Go there manually." => "Сделать вручную.",
 "Answer" => "Ответ",
+"You have used <strong>%s</strong> of the available <strong>%s<strong>" => "Вы использовали <strong>%s</strong> из доступных<strong>%s<strong>",
 "Desktop and Mobile Syncing Clients" => "Клиенты синхронизации настольной и мобильной систем",
 "Download" => "Загрузка",
+"Your password was changed" => "Ваш пароль был изменен",
 "Unable to change your password" => "Невозможно изменить Ваш пароль",
 "Current password" => "Текущий пароль",
 "New password" => "Новый пароль",
diff --git a/settings/l10n/si_LK.php b/settings/l10n/si_LK.php
new file mode 100644
index 00000000000..451fb8a9858
--- /dev/null
+++ b/settings/l10n/si_LK.php
@@ -0,0 +1,15 @@
+<?php $TRANSLATIONS = array(
+"Invalid request" => "අවලංගු අයදුම",
+"Language changed" => "භාෂාව ාවනස් කිරීම",
+"Answer" => "පිළිතුර",
+"Current password" => "නූතන මුරපදය",
+"New password" => "නව මුරපදය",
+"show" => "ප්‍රදර්ශනය කිරීම",
+"Change password" => "මුරපදය වෙනස් කිරීම",
+"Language" => "භාෂාව",
+"Name" => "නාමය",
+"Password" => "මුරපදය",
+"Groups" => "සමූහය",
+"Create" => "තනනවා",
+"Delete" => "මකා දමනවා"
+);
diff --git a/settings/l10n/sk_SK.php b/settings/l10n/sk_SK.php
index ebbd495df7b..cbbc04e0095 100644
--- a/settings/l10n/sk_SK.php
+++ b/settings/l10n/sk_SK.php
@@ -1,6 +1,5 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "Nie je možné nahrať zoznam z App Store",
-"Authentication error" => "Chyba pri autentifikácii",
 "Group already exists" => "Skupina už existuje",
 "Unable to add group" => "Nie je možné pridať skupinu",
 "Could not enable app. " => "Nie je možné zapnúť aplikáciu.",
@@ -9,6 +8,7 @@
 "OpenID Changed" => "OpenID zmenené",
 "Invalid request" => "Neplatná požiadavka",
 "Unable to delete group" => "Nie je možné zmazať skupinu",
+"Authentication error" => "Chyba pri autentifikácii",
 "Unable to delete user" => "Nie je možné zmazať užívateľa",
 "Language changed" => "Jazyk zmenený",
 "Unable to add user to group %s" => "Nie je možné pridať užívateľa do skupiny %s",
@@ -18,31 +18,36 @@
 "Saving..." => "Ukladám...",
 "__language_name__" => "Slovensky",
 "Security Warning" => "Bezpečnostné varovanie",
+"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áš priečinok s dátami a vaše súbory sú pravdepodobne dostupné z internetu. .htaccess súbor dodávaný s inštaláciou ownCloud nespĺňa úlohu. Dôrazne vám doporučujeme nakonfigurovať webserver takým spôsobom, aby dáta v priečinku neboli verejné, alebo presuňte dáta mimo štruktúry priečinkov webservera.",
+"Execute one task with each page loaded" => "Vykonať jednu úlohu každým nahraním stránky",
+"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "Používať systémovú službu cron. Každú minútu bude spustený súbor cron.php v priečinku owncloud pomocou systémového programu cronjob.",
 "Sharing" => "Zdieľanie",
 "Enable Share API" => "Zapnúť API zdieľania",
 "Allow apps to use the Share API" => "Povoliť aplikáciam používať API pre zdieľanie",
 "Allow links" => "Povoliť odkazy",
 "Allow users to share items to the public with links" => "Povoliť užívateľom zdieľať obsah pomocou verejných odkazov",
 "Allow resharing" => "Povoliť opakované zdieľanie",
+"Allow users to share items shared with them again" => "Povoliť zdieľanie zdielaného obsahu iného užívateľa",
 "Allow users to share with anyone" => "Povoliť užívateľom zdieľať s každým",
 "Allow users to only share with users in their groups" => "Povoliť užívateľom zdieľanie iba s užívateľmi ich vlastnej skupiny",
 "Log" => "Záznam",
 "More" => "Viac",
 "Add your App" => "Pridať vašu aplikáciu",
+"More Apps" => "Viac aplikácií",
 "Select an App" => "Vyberte aplikáciu",
-"See application page at apps.owncloud.com" => "Pozrite si stránku aplikácie na apps.owncloud.com",
+"See application page at apps.owncloud.com" => "Pozrite si stránku aplikácií na apps.owncloud.com",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licencované <span class=\"author\"></span>",
 "Documentation" => "Dokumentácia",
-"Managing Big Files" => "Spravovanie veľké súbory",
+"Managing Big Files" => "Správa veľkých súborov",
 "Ask a question" => "Opýtajte sa otázku",
-"Problems connecting to help database." => "Problémy spojené s pomocnou databázou.",
+"Problems connecting to help database." => "Problémy s pripojením na databázu pomocníka.",
 "Go there manually." => "Prejsť tam ručne.",
 "Answer" => "Odpoveď",
 "You have used <strong>%s</strong> of the available <strong>%s<strong>" => "Použili ste <strong>%s</strong> dostupného <strong>%s<strong>",
 "Desktop and Mobile Syncing Clients" => "Klienti pre synchronizáciu",
 "Download" => "Stiahnúť",
 "Your password was changed" => "Heslo bolo zmenené",
-"Unable to change your password" => "Nedokážem zmeniť vaše heslo",
+"Unable to change your password" => "Nie je možné zmeniť vaše heslo",
 "Current password" => "Aktuálne heslo",
 "New password" => "Nové heslo",
 "show" => "zobraziť",
diff --git a/settings/l10n/sv.php b/settings/l10n/sv.php
index 8e6f0dbbd7b..17d33896423 100644
--- a/settings/l10n/sv.php
+++ b/settings/l10n/sv.php
@@ -36,6 +36,7 @@
 "More" => "Mera",
 "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Utvecklad av <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud kommunity</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">källkoden</a> är licenserad under <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
 "Add your App" => "Lägg till din applikation",
+"More Apps" => "Fler Appar",
 "Select an App" => "Välj en App",
 "See application page at apps.owncloud.com" => "Se programsida på apps.owncloud.com",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licensierad av <span class=\"author\"></span>",
diff --git a/settings/l10n/th_TH.php b/settings/l10n/th_TH.php
index c3ed4e859fc..0b2d1ecfb54 100644
--- a/settings/l10n/th_TH.php
+++ b/settings/l10n/th_TH.php
@@ -36,6 +36,7 @@
 "More" => "เพิ่มเติม",
 "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "พัฒนาโดย the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ชุมชนผู้ใช้งาน ownCloud</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">ซอร์สโค้ด</a>อยู่ภายใต้สัญญาอนุญาตของ <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
 "Add your App" => "เพิ่มแอปของคุณ",
+"More Apps" => "แอปฯอื่นเพิ่มเติม",
 "Select an App" => "เลือก App",
 "See application page at apps.owncloud.com" => "ดูหน้าแอพพลิเคชั่นที่ apps.owncloud.com",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-ลิขสิทธิ์การใช้งานโดย <span class=\"author\"></span>",
diff --git a/settings/l10n/vi.php b/settings/l10n/vi.php
index 18de6a6068f..7486f7f8d14 100644
--- a/settings/l10n/vi.php
+++ b/settings/l10n/vi.php
@@ -1,13 +1,14 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "Không thể tải danh sách ứng dụng từ App Store",
-"Authentication error" => "Lỗi xác thực",
 "Group already exists" => "Nhóm đã tồn tại",
 "Unable to add group" => "Không thể thêm nhóm",
+"Could not enable app. " => "không thể kích hoạt ứng dụng.",
 "Email saved" => "Lưu email",
 "Invalid email" => "Email không hợp lệ",
 "OpenID Changed" => "Đổi OpenID",
 "Invalid request" => "Yêu cầu không hợp lệ",
 "Unable to delete group" => "Không thể xóa nhóm",
+"Authentication error" => "Lỗi xác thực",
 "Unable to delete user" => "Không thể xóa người dùng",
 "Language changed" => "Ngôn ngữ đã được thay đổi",
 "Unable to add user to group %s" => "Không thể thêm người dùng vào nhóm %s",
@@ -19,6 +20,10 @@
 "Security Warning" => "Cảnh bảo bảo mậ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." => "Thư mục dữ liệu và những tập tin của bạn có thể dễ dàng bị truy cập từ internet. Tập tin .htaccess của ownCloud cung cấp không hoạt động. Chúng tôi đề nghị bạn nên cấu hình lại máy chủ webserver của bạn để thư mục dữ liệu không  còn bị truy cập hoặc bạn di chuyển thư mục dữ liệu ra bên ngoài thư mục gốc của máy chủ.",
 "Cron" => "Cron",
+"Execute one task with each page loaded" => "Thực thi tác vụ mỗi khi trang được tải",
+"cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "cron.php đã được đăng ký tại một dịch vụ webcron. Gọi trang cron.php mỗi phút một lần thông qua giao thức http.",
+"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "Sử dụng dịch vụ cron của hệ thống. Gọi tệp tin cron.php mỗi phút một lần.",
+"Sharing" => "Chia sẻ",
 "Enable Share API" => "Bật chia sẻ API",
 "Allow apps to use the Share API" => "Cho phép các ứng dụng sử dụng chia sẻ API",
 "Allow links" => "Cho phép liên kết",
@@ -31,6 +36,7 @@
 "More" => "nhiều hơn",
 "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Được phát triển bởi <a href=\"http://ownCloud.org/contact\" target=\"_blank\">cộng đồng ownCloud</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">mã nguồn </a> đã được cấp phép theo chuẩn <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
 "Add your App" => "Thêm ứng dụng của bạn",
+"More Apps" => "Nhiều ứng dụng hơn",
 "Select an App" => "Chọn một ứng dụng",
 "See application page at apps.owncloud.com" => "Xem ứng dụng tại apps.owncloud.com",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-Giấy phép được cấp bởi  <span class=\"author\"></span>",
@@ -40,8 +46,10 @@
 "Problems connecting to help database." => "Vấn đề kết nối đến cơ sở dữ liệu.",
 "Go there manually." => "Đến bằng thủ công",
 "Answer" => "trả lời",
+"You have used <strong>%s</strong> of the available <strong>%s<strong>" => "Bạn đã sử dụng <strong>%s</strong> trong <strong>%s</strong> được phép.",
 "Desktop and Mobile Syncing Clients" => "Đồng bộ dữ liệu",
 "Download" => "Tải về",
+"Your password was changed" => "Mật khẩu của bạn đã được thay đổi.",
 "Unable to change your password" => "Không thể đổi mật khẩu",
 "Current password" => "Mật khẩu cũ",
 "New password" => "Mật khẩu mới ",
diff --git a/settings/l10n/zh_CN.GB2312.php b/settings/l10n/zh_CN.GB2312.php
index 26bfbbd7ae5..ea4d00bfcd3 100644
--- a/settings/l10n/zh_CN.GB2312.php
+++ b/settings/l10n/zh_CN.GB2312.php
@@ -1,6 +1,5 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "不能从App Store 中加载列表",
-"Authentication error" => "认证错误",
 "Group already exists" => "群组已存在",
 "Unable to add group" => "未能添加群组",
 "Could not enable app. " => "未能启用应用",
@@ -9,6 +8,7 @@
 "OpenID Changed" => "OpenID 改变了",
 "Invalid request" => "非法请求",
 "Unable to delete group" => "未能删除群组",
+"Authentication error" => "认证错误",
 "Unable to delete user" => "未能删除用户",
 "Language changed" => "语言改变了",
 "Unable to add user to group %s" => "未能添加用户到群组 %s",
@@ -36,6 +36,7 @@
 "More" => "更多",
 "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "由 <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud 社区</a>开发，<a href=\"https://github.com/owncloud\" target=\"_blank\">s源代码</a> 以 <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> 许可协议发布。",
 "Add your App" => "添加你的应用程序",
+"More Apps" => "更多应用",
 "Select an App" => "选择一个程序",
 "See application page at apps.owncloud.com" => "在owncloud.com上查看应用程序",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>授权协议 <span class=\"author\"></span>",
diff --git a/settings/languageCodes.php b/settings/languageCodes.php
index 6d3b6ebe634..221aa13cf6a 100644
--- a/settings/languageCodes.php
+++ b/settings/languageCodes.php
@@ -9,7 +9,8 @@ return array(
 'ca'=>'Català',
 'cs_CZ'=>'Čeština',
 'da'=>'Dansk',
-'de'=>'Deutsch',
+'de'=>'Deutsch (Persönlich)',
+'de_DE'=>'Deutsch (Förmlich)',
 'el'=>'Ελληνικά',
 'en'=>'English',
 'es'=>'Español',
diff --git a/settings/personal.php b/settings/personal.php
index ce9065247df..f28ab2ae755 100644
--- a/settings/personal.php
+++ b/settings/personal.php
@@ -18,12 +18,8 @@ OC_App::setActiveNavigationEntry( 'personal' );
 // calculate the disc space
 $rootInfo=OC_FileCache::get('');
 $sharedInfo=OC_FileCache::get('/Shared');
-if (!isset($sharedInfo['size'])) {
-	$sharedSize = 0;
-} else {
-	$sharedSize = $sharedInfo['size'];
-}
-$used=$rootInfo['size']-$sharedSize;
+$used=$rootInfo['size'];
+if($used<0) $used=0;
 $free=OC_Filesystem::free_space();
 $total=$free+$used;
 if($total==0) $total=1;  // prevent division by zero
diff --git a/settings/settings.php b/settings/settings.php
index 1e05452ec4d..add94b5b011 100644
--- a/settings/settings.php
+++ b/settings/settings.php
@@ -6,6 +6,7 @@
  */
 
 OC_Util::checkLoggedIn();
+OC_Util::verifyUser();
 OC_App::loadApps();
 
 OC_Util::addStyle( 'settings', 'settings' );
diff --git a/settings/templates/apps.php b/settings/templates/apps.php
index 0662148ebf2..1e9598de1e3 100644
--- a/settings/templates/apps.php
+++ b/settings/templates/apps.php
@@ -8,6 +8,7 @@
 </script>
 <div id="controls">
 	<a class="button" target="_blank" href="http://owncloud.org/dev/apps/getting-started/"><?php echo $l->t('Add your App');?></a>
+	<a class="button" target="_blank" href="http://apps.owncloud.com"><?php echo $l->t('More Apps');?></a>
 </div>
 <ul id="leftcontent" class="applist">
 	<?php foreach($_['apps'] as $app):?>
@@ -24,6 +25,7 @@
 <div id="rightcontent">
 	<div class="appinfo">
 	<h3><strong><span class="name"><?php echo $l->t('Select an App');?></span></strong><span class="version"></span><small class="externalapp" style="visibility:hidden;"></small></h3>
+	<span class="score"></span>
 	<p class="description"></p>
 	<img src="" class="preview" />
 	<p class="appslink hidden"><a href="#" target="_blank"><?php echo $l->t('See application page at apps.owncloud.com');?></a></p>