Rebase to current master

94 files changed, 2355 insertions, 1360 deletions

diff --git a/settings/admin.php b/settings/admin.php
index 7cca7165153..c7848803095 100755
--- a/settings/admin.php
+++ b/settings/admin.php
@@ -31,6 +31,7 @@ $tmpl->assign('entriesremain', $entriesremain);
 $tmpl->assign('htaccessworking', $htaccessworking);
 $tmpl->assign('internetconnectionworking', OC_Util::isinternetconnectionworking());
 $tmpl->assign('islocaleworking', OC_Util::issetlocaleworking());
+$tmpl->assign('isWebDavWorking', OC_Util::isWebDAVWorking());
 $tmpl->assign('has_fileinfo', OC_Util::fileInfoLoaded());
 $tmpl->assign('backgroundjobs_mode', OC_Appconfig::getValue('core', 'backgroundjobs_mode', 'ajax'));
 $tmpl->assign('shareAPIEnabled', OC_Appconfig::getValue('core', 'shareapi_enabled', 'yes'));
diff --git a/settings/ajax/apps/ocs.php b/settings/ajax/apps/ocs.php
index d0205a1ba34..9c5adfcfef9 100644
--- a/settings/ajax/apps/ocs.php
+++ b/settings/ajax/apps/ocs.php
@@ -23,9 +23,9 @@ if(is_null($enabledApps)) {
 $apps=array();
 
 // apps from external repo via OCS
-$catagoryNames=OC_OCSClient::getCategories();
-if(is_array($catagoryNames)) {
-	$categories=array_keys($catagoryNames);
+$categoryNames=OC_OCSClient::getCategories();
+if(is_array($categoryNames)) {
+	$categories=array_keys($categoryNames);
 	$page=0;
 	$filter='approved';
 	$externalApps=OC_OCSClient::getApplications($categories, $page, $filter);
@@ -45,7 +45,7 @@ if(is_array($catagoryNames)) {
 				$pre=$app['preview'];
 			}
 			if($app['label']=='recommended') {
-				$label='3rd Party App';
+				$label='3rd Party';
 			} else {
 				$label='Recommended';
 			}
diff --git a/settings/ajax/changedisplayname.php b/settings/ajax/changedisplayname.php
index 8f2ff865bd5..dff4d733cd2 100644
--- a/settings/ajax/changedisplayname.php
+++ b/settings/ajax/changedisplayname.php
@@ -1,29 +1,33 @@
-<?php

-// Check if we are a user

-

-OCP\JSON::callCheck();

-OC_JSON::checkLoggedIn();

-

-$username = isset($_POST["username"]) ? $_POST["username"] : OC_User::getUser();

-$displayName = $_POST["displayName"];

-

-$userstatus = null;

-if(OC_User::isAdminUser(OC_User::getUser())) {

-	$userstatus = 'admin';

-}

-if(OC_SubAdmin::isUserAccessible(OC_User::getUser(), $username)) {

-	$userstatus = 'subadmin';

-}

-

-if(is_null($userstatus)) {

-	OC_JSON::error( array( "data" => array( "message" => $l->t("Authentication error") )));

-	exit();

-}

-

-// Return Success story

-if( OC_User::setDisplayName( $username, $displayName )) {

-	OC_JSON::success(array("data" => array( "username" => $username, 'displayName' => $displayName )));

-}

-else{

-	OC_JSON::error(array("data" => array( "message" => $l->t("Unable to change display name"), displayName => OC_User::getDisplayName($username) )));

-}
\ No newline at end of file
+<?php
+// Check if we are a user
+
+OCP\JSON::callCheck();
+OC_JSON::checkLoggedIn();
+
+$username = isset($_POST["username"]) ? $_POST["username"] : OC_User::getUser();
+$displayName = $_POST["displayName"];
+
+$userstatus = null;
+if(OC_User::isAdminUser(OC_User::getUser())) {
+	$userstatus = 'admin';
+}
+if(OC_SubAdmin::isUserAccessible(OC_User::getUser(), $username)) {
+	$userstatus = 'subadmin';
+}
+
+if ($username == OC_User::getUser() && OC_User::canUserChangeDisplayName($username)) {
+	$userstatus = 'changeOwnDisplayName';
+}
+
+if(is_null($userstatus)) {
+	OC_JSON::error( array( "data" => array( "message" => $l->t("Authentication error") )));
+	exit();
+}
+
+// Return Success story
+if( OC_User::setDisplayName( $username, $displayName )) {
+	OC_JSON::success(array("data" => array( "username" => $username, 'displayName' => $displayName )));
+}
+else{
+	OC_JSON::error(array("data" => array( "message" => $l->t("Unable to change display name"), 'displayName' => OC_User::getDisplayName($username) )));
+}
diff --git a/settings/ajax/changepassword.php b/settings/ajax/changepassword.php
index ceb4bbeecb0..1fc6d0e1000 100644
--- a/settings/ajax/changepassword.php
+++ b/settings/ajax/changepassword.php
@@ -8,7 +8,7 @@ OC_JSON::checkLoggedIn();
 OC_APP::loadApps();
 
 $username = isset($_POST["username"]) ? $_POST["username"] : OC_User::getUser();
-$password = $_POST["password"];
+$password = isset($_POST["password"]) ? $_POST["password"] : null;
 $oldPassword=isset($_POST["oldpassword"])?$_POST["oldpassword"]:'';
 
 $userstatus = null;
@@ -28,7 +28,7 @@ if(is_null($userstatus)) {
 }
 
 // Return Success story
-if( OC_User::setPassword( $username, $password )) {
+if(!is_null($password) && OC_User::setPassword( $username, $password )) {
 	OC_JSON::success(array("data" => array( "username" => $username )));
 }
 else{
diff --git a/settings/ajax/createuser.php b/settings/ajax/createuser.php
index 09ef25d92fa..56653bed6bd 100644
--- a/settings/ajax/createuser.php
+++ b/settings/ajax/createuser.php
@@ -26,12 +26,6 @@ if(OC_User::isAdminUser(OC_User::getUser())) {
 $username = $_POST["username"];
 $password = $_POST["password"];
 
-// Does the group exist?
-if(OC_User::userExists($username)) {
-	OC_JSON::error(array("data" => array( "message" => "User already exists" )));
-	exit();
-}
-
 // Return Success story
 try {
 	if (!OC_User::createUser($username, $password)) {
diff --git a/settings/ajax/disableapp.php b/settings/ajax/disableapp.php
index e89de928eac..466a719157d 100644
--- a/settings/ajax/disableapp.php
+++ b/settings/ajax/disableapp.php
@@ -2,6 +2,6 @@
 OC_JSON::checkAdminUser();
 OCP\JSON::callCheck();
 
-OC_App::disable($_POST['appid']);
+OC_App::disable(OC_App::cleanAppId($_POST['appid']));
 
 OC_JSON::success();
diff --git a/settings/ajax/enableapp.php b/settings/ajax/enableapp.php
index 18202dc39e9..ab84aee5166 100644
--- a/settings/ajax/enableapp.php
+++ b/settings/ajax/enableapp.php
@@ -3,7 +3,7 @@
 OC_JSON::checkAdminUser();
 OCP\JSON::callCheck();
 
-$appid = OC_App::enable($_POST['appid']);
+$appid = OC_App::enable(OC_App::cleanAppId($_POST['appid']));
 if($appid !== false) {
 	OC_JSON::success(array('data' => array('appid' => $appid)));
 } else {
diff --git a/settings/ajax/getlog.php b/settings/ajax/getlog.php
index 043124fa175..141457e72a0 100644
--- a/settings/ajax/getlog.php
+++ b/settings/ajax/getlog.php
@@ -11,6 +11,8 @@ $count=(isset($_GET['count']))?$_GET['count']:50;
 $offset=(isset($_GET['offset']))?$_GET['offset']:0;
 
 $entries=OC_Log_Owncloud::getEntries($count, $offset);
+$data = array();
+
 OC_JSON::success(array(
-	"data" => OC_Util::sanitizeHTML($entries),
+	"data" => $entries,
 	"remain"=>(count(OC_Log_Owncloud::getEntries(1, $offset + $offset)) != 0) ? true : false));
diff --git a/settings/ajax/navigationdetect.php b/settings/ajax/navigationdetect.php
index 93acb50dc20..7f961eb9bc5 100644
--- a/settings/ajax/navigationdetect.php
+++ b/settings/ajax/navigationdetect.php
@@ -4,11 +4,9 @@ OC_Util::checkAdminUser();
 OCP\JSON::callCheck();
 
 $app = $_GET['app'];
+$app = OC_App::cleanAppId($app);
 
-//load the one app and see what it adds to the navigation
-OC_App::loadApp($app);
-
-$navigation = OC_App::getNavigation();
+$navigation = OC_App::getAppNavigationEntries($app);
 
 $navIds = array();
 foreach ($navigation as $nav) {
diff --git a/settings/ajax/setquota.php b/settings/ajax/setquota.php
index 356466c0c00..cd8dc0e2796 100644
--- a/settings/ajax/setquota.php
+++ b/settings/ajax/setquota.php
@@ -10,7 +10,9 @@ OCP\JSON::callCheck();
 
 $username = isset($_POST["username"])?$_POST["username"]:'';
 
-if(($username == '' && !OC_User::isAdminUser(OC_User::getUser()))|| (!OC_User::isAdminUser(OC_User::getUser()) && !OC_SubAdmin::isUserAccessible(OC_User::getUser(), $username))) {
+if(($username == '' && !OC_User::isAdminUser(OC_User::getUser()))
+	|| (!OC_User::isAdminUser(OC_User::getUser())
+		&& !OC_SubAdmin::isUserAccessible(OC_User::getUser(), $username))) {
 	$l = OC_L10N::get('core');
 	OC_JSON::error(array( 'data' => array( 'message' => $l->t('Authentication error') )));
 	exit();
diff --git a/settings/ajax/togglegroups.php b/settings/ajax/togglegroups.php
index 9bba9c5269d..f6fd9aba6d9 100644
--- a/settings/ajax/togglegroups.php
+++ b/settings/ajax/togglegroups.php
@@ -13,7 +13,9 @@ if($username == OC_User::getUser() && $group == "admin" &&  OC_User::isAdminUser
 	exit();
 }
 
-if(!OC_User::isAdminUser(OC_User::getUser()) && (!OC_SubAdmin::isUserAccessible(OC_User::getUser(), $username) || !OC_SubAdmin::isGroupAccessible(OC_User::getUser(), $group))) {
+if(!OC_User::isAdminUser(OC_User::getUser())
+	&& (!OC_SubAdmin::isUserAccessible(OC_User::getUser(), $username)
+		|| !OC_SubAdmin::isGroupAccessible(OC_User::getUser(), $group))) {
 	$l = OC_L10N::get('core');
 	OC_JSON::error(array( 'data' => array( 'message' => $l->t('Authentication error') )));
 	exit();
diff --git a/settings/ajax/updateapp.php b/settings/ajax/updateapp.php
index 77c0bbc3e36..300e8642515 100644
--- a/settings/ajax/updateapp.php
+++ b/settings/ajax/updateapp.php
@@ -4,6 +4,7 @@ OC_JSON::checkAdminUser();
 OCP\JSON::callCheck();
 
 $appid = $_POST['appid'];
+$appid = OC_App::cleanAppId($appid);
 
 $result = OC_Installer::updateApp($appid);
 if($result !== false) {
@@ -11,7 +12,4 @@ if($result !== false) {
 } else {
 	$l = OC_L10N::get('settings');	
 	OC_JSON::error(array("data" => array( "message" => $l->t("Couldn't update app.") )));
-}
-
-
-
+}
\ No newline at end of file
diff --git a/settings/ajax/userlist.php b/settings/ajax/userlist.php
index 9bbff80ea0c..5282f4a7143 100644
--- a/settings/ajax/userlist.php
+++ b/settings/ajax/userlist.php
@@ -29,10 +29,11 @@ if (isset($_GET['offset'])) {
 }
 $users = array();
 if (OC_User::isAdminUser(OC_User::getUser())) {
-	$batch = OC_User::getUsers('', 10, $offset);
-	foreach ($batch as $user) {
+	$batch = OC_User::getDisplayNames('', 10, $offset);
+	foreach ($batch as $user => $displayname) {
 		$users[] = array(
 			'name' => $user,
+			'displayname' => $displayname,
 			'groups' => join(', ', OC_Group::getUserGroups($user)),
 			'subadmin' => join(', ', OC_SubAdmin::getSubAdminsGroups($user)),
 			'quota' => OC_Preferences::getValue($user, 'files', 'quota', 'default'));
@@ -43,6 +44,7 @@ if (OC_User::isAdminUser(OC_User::getUser())) {
 	foreach ($batch as $user) {
 		$users[] = array(
 			'name' => $user,
+			'displayname' => OC_User::determineDisplayName($user),
 			'groups' => join(', ', OC_Group::getUserGroups($user)),
 			'quota' => OC_Preferences::getValue($user, 'files', 'quota', 'default'));
 	}
diff --git a/settings/apps.php b/settings/apps.php
index b9ed2cac93a..44cfff7e3f1 100644
--- a/settings/apps.php
+++ b/settings/apps.php
@@ -49,7 +49,7 @@ usort( $combinedApps, 'app_sort' );
 
 $tmpl = new OC_Template( "settings", "apps", "user" );
 
-$tmpl->assign('apps', $combinedApps, false);
+$tmpl->assign('apps', $combinedApps);
 
 $appid = (isset($_GET['appid'])?strip_tags($_GET['appid']):'');
 
diff --git a/settings/css/settings.css b/settings/css/settings.css
index 9dd17daaeb7..265a29b8f7f 100644
--- a/settings/css/settings.css
+++ b/settings/css/settings.css
@@ -5,7 +5,15 @@
 select#languageinput, select#timezone { width:15em; }
 input#openid, input#webdav { width:20em; }
 
+
 /* PERSONAL */
+
+/* Sync clients */
+.clientsbox { margin:12px; text-align:center; }
+.clientsbox h1 { font-size:40px; font-weight:bold; margin:50px 0 20px; }
+.clientsbox h2 { font-size:20px; font-weight:bold; margin:35px 0 10px; }
+.clientsbox center { margin-top:10px; }
+
 #passworderror { display:none; }
 #passwordchanged { display:none; }
 #displaynameerror { display:none; }
@@ -35,14 +43,19 @@ tr:hover>td.remove>a { float:right; }
 li.selected { background-color:#ddd; }
 table:not(.nostyle) { width:100%; }
 #rightcontent { padding-left: 1em; }
-div.quota { float:right; display:block; position:absolute; right:25em; top:0; }
+div.quota { float:right; display:block; position:absolute; right:25em; top:-1px; }
 div.quota-select-wrapper { position: relative; }
-select.quota { position:absolute; left:0; top:0.5em; width:10em; }
+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; box-shadow:none; }
 div.quota>span { position:absolute; right:0; white-space:nowrap; top:.7em; color:#888; text-shadow:0 1px 0 #fff; }
 select.quota.active { background: #fff; }
 
+/* positioning fixes */
+#newuser { position:relative; top:-3px; }
+#newuser .multiselect { top:1px; }
+#headerGroups, #headerSubAdmins, #headerQuota { padding-left:18px; }
+
+
 /* APPS */
 .appinfo { margin: 1em; }
 h3 { font-size: 1.4em; font-weight: bold; }
@@ -75,3 +88,4 @@ table.shareAPI td { padding-bottom: 0.8em; }
 
 /* HELP */
 .pressed {background-color:#DDD;}
+
diff --git a/settings/js/apps-custom.php b/settings/js/apps-custom.php
index 9ec2a758ee3..d827dfc7058 100644
--- a/settings/js/apps-custom.php
+++ b/settings/js/apps-custom.php
@@ -23,4 +23,4 @@ foreach($combinedApps as $app) {
 	echo("\n");
 }
 
-echo ("var appid =\"".$_GET['appid']."\";");
\ No newline at end of file
+echo ("var appid =".json_encode($_GET['appid']).";");
\ No newline at end of file
diff --git a/settings/js/apps.js b/settings/js/apps.js
index 3bc3488e490..43013a9e1ec 100644
--- a/settings/js/apps.js
+++ b/settings/js/apps.js
@@ -18,7 +18,7 @@ OC.Settings.Apps = OC.Settings.Apps || {
 			page.find('span.version').text('');
 		}
 		page.find('span.score').html(app.score);
-		page.find('p.description').html(app.description);
+		page.find('p.description').text(app.description);
 		page.find('img.preview').attr('src', app.preview);
 		page.find('small.externalapp').attr('style', 'visibility:visible');
 		page.find('span.author').text(app.author);
@@ -134,7 +134,7 @@ OC.Settings.Apps = OC.Settings.Apps || {
 					if(container.children('li[data-id="'+entry.id+'"]').length === 0){
 						var li=$('<li></li>');
 						li.attr('data-id', entry.id);
-						var img= $('<img></img>').attr({ src: entry.icon, class:'icon'});
+						var img= $('<img class="icon"/>').attr({ src: entry.icon});
 						var a=$('<a></a>').attr('href', entry.href);
 						a.text(entry.name);
 						a.prepend(img);
diff --git a/settings/js/log.js b/settings/js/log.js
index 04a7bf8b288..09b8ec1ab44 100644
--- a/settings/js/log.js
+++ b/settings/js/log.js
@@ -42,7 +42,7 @@ OC.Log={
 			row.append(appTd);
 			
 			var messageTd=$('<td/>');
-			messageTd.html(entry.message);
+			messageTd.text(entry.message);
 			row.append(messageTd);
 			
 			var timeTd=$('<td/>');
diff --git a/settings/js/personal.js b/settings/js/personal.js
index d9455b3786b..d0a471e56b5 100644
--- a/settings/js/personal.js
+++ b/settings/js/personal.js
@@ -31,7 +31,7 @@ $(document).ready(function(){
 		}
 
 	});
-	
+
 	$("#displaynamebutton").click( function(){
 		if ($('#displayName').val() != '' ) {
 			// Serialize the data
@@ -42,6 +42,9 @@ $(document).ready(function(){
 			$.post( 'ajax/changedisplayname.php', post, function(data){
 				if( data.status == "success" ){
 					$('#displaynamechanged').show();
+					$('#oldDisplayName').text($('#displayName').val());
+					// update displayName on the top right expand button
+					$('#expandDisplayName').text($('#displayName').val());
 				}
 				else{
 					$('#newdisplayname').val(data.data.displayName)
diff --git a/settings/js/users.js b/settings/js/users.js
index 094cddda294..9bc7455285a 100644
--- a/settings/js/users.js
+++ b/settings/js/users.js
@@ -5,449 +5,390 @@
  */
 
 var UserList = {
-    useUndo:true,
+	useUndo: true,
 
-    /**
-     * @brief Initiate user deletion process in UI
-     * @param string uid the user ID to be deleted
-     *
-     * Does not actually delete the user; it sets them for
-     * deletion when the current page is unloaded, at which point
-     * finishDelete() completes the process. This allows for 'undo'.
-     */
-    do_delete:function (uid) {
-        if (typeof UserList.deleteUid !== 'undefined') {
-            //Already a user in the undo queue
-            UserList.finishDelete(null);
-        }
-        UserList.deleteUid = uid;
+	/**
+	 * @brief Initiate user deletion process in UI
+	 * @param string uid the user ID to be deleted
+	 *
+	 * Does not actually delete the user; it sets them for
+	 * deletion when the current page is unloaded, at which point
+	 * finishDelete() completes the process. This allows for 'undo'.
+	 */
+	do_delete: function (uid) {
+		if (typeof UserList.deleteUid !== 'undefined') {
+			//Already a user in the undo queue
+			UserList.finishDelete(null);
+		}
+		UserList.deleteUid = uid;
 
-        // Set undo flag
-        UserList.deleteCanceled = false;
+		// Set undo flag
+		UserList.deleteCanceled = false;
 
-        // Provide user with option to undo
-        $('#notification').data('deleteuser', true);
-        OC.Notification.showHtml(t('users', 'deleted') + ' ' + uid + '<span class="undo">' + t('users', 'undo') + '</span>');
-    },
+		// Provide user with option to undo
+		$('#notification').data('deleteuser', true);
+		OC.Notification.showHtml(t('users', 'deleted') + ' ' + escapeHTML(uid) + '<span class="undo">' + t('users', 'undo') + '</span>');
+	},
 
-    /**
-     * @brief Delete a user via ajax
-     * @param bool ready whether to use ready() upon completion
-     *
-     * Executes deletion via ajax of user identified by property deleteUid
-     * if 'undo' has not been used.  Completes the user deletion procedure
-     * and reflects success in UI.
-     */
-    finishDelete:function (ready) {
+	/**
+	 * @brief Delete a user via ajax
+	 * @param bool ready whether to use ready() upon completion
+	 *
+	 * Executes deletion via ajax of user identified by property deleteUid
+	 * if 'undo' has not been used.  Completes the user deletion procedure
+	 * and reflects success in UI.
+	 */
+	finishDelete: function (ready) {
 
-        // Check deletion has not been undone
-        if (!UserList.deleteCanceled && UserList.deleteUid) {
+		// Check deletion has not been undone
+		if (!UserList.deleteCanceled && UserList.deleteUid) {
 
-            // Delete user via ajax
-            $.ajax({
-                type:'POST',
-                url:OC.filePath('settings', 'ajax', 'removeuser.php'),
-                async:false,
-                data:{ username:UserList.deleteUid },
-                success:function (result) {
-                    if (result.status == 'success') {
-                        // Remove undo option, & remove user from table
-                        OC.Notification.hide();
-                        $('tr').filterAttr('data-uid', UserList.deleteUid).remove();
-                        UserList.deleteCanceled = true;
-                        if (ready) {
-                            ready();
-                        }
-                    } else {
-                        oc.dialogs.alert(result.data.message, t('settings', 'Unable to remove user'));
-                    }
-                }
-            });
-        }
-    },
+			// Delete user via ajax
+			$.ajax({
+				type: 'POST',
+				url: OC.filePath('settings', 'ajax', 'removeuser.php'),
+				async: false,
+				data: { username: UserList.deleteUid },
+				success: function (result) {
+					if (result.status == 'success') {
+						// Remove undo option, & remove user from table
+						OC.Notification.hide();
+						$('tr').filterAttr('data-uid', UserList.deleteUid).remove();
+						UserList.deleteCanceled = true;
+						if (ready) {
+							ready();
+						}
+					} else {
+						oc.dialogs.alert(result.data.message, t('settings', 'Unable to remove user'));
+					}
+				}
+			});
+		}
+	},
 
-    add:function (username, groups, subadmin, quota, sort) {
-        var tr = $('tbody tr').first().clone();
-        tr.attr('data-uid', username);
-        tr.attr('data-displayName', username);
-        tr.find('td.name').text(username);
-        tr.find('td.displayName').text(username);
-        var groupsSelect = $('<select multiple="multiple" class="groupsselect" data-placehoder="Groups" title="' + t('settings', 'Groups') + '"></select>').attr('data-username', username).attr('data-user-groups', groups);
-        tr.find('td.groups').empty();
-        if (tr.find('td.subadmins').length > 0) {
-            var subadminSelect = $('<select multiple="multiple" class="subadminsselect" data-placehoder="subadmins" title="' + t('settings', 'Group Admin') + '">').attr('data-username', username).attr('data-user-groups', groups).attr('data-subadmin', subadmin);
-            tr.find('td.subadmins').empty();
-        }
-        var allGroups = String($('#content table').attr('data-groups')).split(', ');
-        $.each(allGroups, function (i, group) {
-            groupsSelect.append($('<option value="' + group + '">' + group + '</option>'));
-            if (typeof subadminSelect !== 'undefined' && group != 'admin') {
-                subadminSelect.append($('<option value="' + group + '">' + group + '</option>'));
-            }
-        });
-        tr.find('td.groups').append(groupsSelect);
-        UserList.applyMultiplySelect(groupsSelect);
-        if (tr.find('td.subadmins').length > 0) {
-            tr.find('td.subadmins').append(subadminSelect);
-            UserList.applyMultiplySelect(subadminSelect);
-        }
-        if (tr.find('td.remove img').length == 0 && OC.currentUser != username) {
-            var rm_img = $('<img>', {
-                class:'svg action',
-                src:OC.imagePath('core', 'actions/delete')
-            });
-            var rm_link = $('<a>', { class:'action delete', href:'#', 'original-title':t('settings', 'Delete')}).append(rm_img);
-            tr.find('td.remove').append(rm_link);
-        } else if (OC.currentUser == username) {
-            tr.find('td.remove a').remove();
-        }
-        var quotaSelect = tr.find('select.quota-user');
-        if (quota == 'default') {
-            quotaSelect.find('option').attr('selected', null);
-            quotaSelect.find('option').first().attr('selected', 'selected');
-            quotaSelect.data('previous', 'default');
-        } else {
-            if (quotaSelect.find('option[value="' + quota + '"]').length > 0) {
-                quotaSelect.find('option[value="' + quota + '"]').attr('selected', 'selected');
-            } else {
-                quotaSelect.append('<option value="' + quota + '" selected="selected">' + quota + '</option>');
-            }
-        }
-        var added = false;
-        if (sort) {
-            username = username.toLowerCase();
-            $('tbody tr').each(function () {
-                if (username < $(this).attr('data-uid').toLowerCase()) {
-                    $(tr).insertBefore($(this));
-                    added = true;
-                    return false;
-                }
-            });
-        }
-        if (!added) {
-            $(tr).appendTo('tbody');
-        }
-        return tr;
-    },
+	add: function (username, displayname, groups, subadmin, quota, sort) {
+		var tr = $('tbody tr').first().clone();
+		tr.attr('data-uid', username);
+		tr.attr('data-displayName', displayname);
+		tr.find('td.name').text(username);
+		tr.find('td.displayName').text(username);
+		var groupsSelect = $('<select multiple="multiple" class="groupsselect" data-placehoder="Groups" title="' + t('settings', 'Groups') + '"></select>').attr('data-username', username).attr('data-user-groups', groups);
+		tr.find('td.groups').empty();
+		if (tr.find('td.subadmins').length > 0) {
+			var subadminSelect = $('<select multiple="multiple" class="subadminsselect" data-placehoder="subadmins" title="' + t('settings', 'Group Admin') + '">').attr('data-username', username).attr('data-user-groups', groups).attr('data-subadmin', subadmin);
+			tr.find('td.subadmins').empty();
+		}
+		var allGroups = String($('#content table').attr('data-groups')).split(', ');
+		$.each(allGroups, function (i, group) {
+			groupsSelect.append($('<option value="' + escapeHTML(group) + '">' + escapeHTML(group) + '</option>'));
+			if (typeof subadminSelect !== 'undefined' && group != 'admin') {
+				subadminSelect.append($('<option value="' + escapeHTML(group) + '">' + escapeHTML(group) + '</option>'));
+			}
+		});
+		tr.find('td.groups').append(groupsSelect);
+		UserList.applyMultiplySelect(groupsSelect);
+		if (tr.find('td.subadmins').length > 0) {
+			tr.find('td.subadmins').append(subadminSelect);
+			UserList.applyMultiplySelect(subadminSelect);
+		}
+		if (tr.find('td.remove img').length == 0 && OC.currentUser != username) {
+			var rm_img = $('<img class="svg action">').attr({
+				src: OC.imagePath('core', 'actions/delete')
+			});
+			var rm_link = $('<a class="action delete">')
+				.attr({ href: '#', 'original-title': t('settings', 'Delete')})
+				.append(rm_img);
+			tr.find('td.remove').append(rm_link);
+		} else if (OC.currentUser == username) {
+			tr.find('td.remove a').remove();
+		}
+		var quotaSelect = tr.find('select.quota-user');
+		if (quota == 'default') {
+			quotaSelect.find('option').attr('selected', null);
+			quotaSelect.find('option').first().attr('selected', 'selected');
+			quotaSelect.data('previous', 'default');
+		} else {
+			if (quotaSelect.find('option[value="' + quota + '"]').length > 0) {
+				quotaSelect.find('option[value="' + quota + '"]').attr('selected', 'selected');
+			} else {
+				quotaSelect.append('<option value="' + escapeHTML(quota) + '" selected="selected">' + escapeHTML(quota) + '</option>');
+			}
+		}
+		var added = false;
+		if (sort) {
+			displayname = displayname.toLowerCase();
+			$('tbody tr').each(function () {
+				if (displayname < $(this).attr('data-uid').toLowerCase()) {
+					$(tr).insertBefore($(this));
+					added = true;
+					return false;
+				}
+			});
+		}
+		if (!added) {
+			$(tr).appendTo('tbody');
+		}
+		return tr;
+	},
 
-    update:function () {
-        if (typeof UserList.offset === 'undefined') {
-            UserList.offset = $('tbody tr').length;
-        }
-        $.get(OC.Router.generate('settings_ajax_userlist', { offset:UserList.offset }), function (result) {
-            if (result.status === 'success') {
-                $.each(result.data, function (index, user) {
-                    var tr = UserList.add(user.name, user.groups, user.subadmin, user.quota, false);
-                    UserList.offset++;
-                    if (index == 9) {
-                        $(tr).bind('inview', function (event, isInView, visiblePartX, visiblePartY) {
-                            $(this).unbind(event);
-                            UserList.update();
-                        });
-                    }
-                });
-            }
-        });
-    },
+	update: function () {
+		if (typeof UserList.offset === 'undefined') {
+			UserList.offset = $('tbody tr').length;
+		}
+		$.get(OC.Router.generate('settings_ajax_userlist', { offset: UserList.offset }), function (result) {
+			if (result.status === 'success') {
+				$.each(result.data, function (index, user) {
+					var tr = UserList.add(user.name, user.displayname, user.groups, user.subadmin, user.quota, false);
+					UserList.offset++;
+					if (index == 9) {
+						$(tr).bind('inview', function (event, isInView, visiblePartX, visiblePartY) {
+							$(this).unbind(event);
+							UserList.update();
+						});
+					}
+				});
+			}
+		});
+	},
 
-    applyMultiplySelect:function (element) {
-        var checked = [];
-        var user = element.attr('data-username');
-        if ($(element).attr('class') == 'groupsselect') {
-            if (element.data('userGroups')) {
-                checked = String(element.data('userGroups')).split(', ');
-            }
-            if (user) {
-                var checkHandeler = function (group) {
-                    if (user == OC.currentUser && group == 'admin') {
-                        return false;
-                    }
-                    if (!isadmin && checked.length == 1 && checked[0] == group) {
-                        return false;
-                    }
-                    $.post(
-                        OC.filePath('settings', 'ajax', 'togglegroups.php'),
-                        {
-                            username:user,
-                            group:group
-                        },
-                        function () {
-                        }
-                    );
-                };
-            } else {
-                checkHandeler = false;
-            }
-            var addGroup = function (select, group) {
-                $('select[multiple]').each(function (index, element) {
-                    if ($(element).find('option[value="' + group + '"]').length === 0 && select.data('msid') !== $(element).data('msid')) {
-                        $(element).append('<option value="' + group + '">' + group + '</option>');
-                    }
-                })
-            };
-            var label;
-            if (isadmin) {
-                label = t('settings', 'add group');
-            } else {
-                label = null;
-            }
-            element.multiSelect({
-                createCallback:addGroup,
-                createText:label,
-                selectedFirst:true,
-                checked:checked,
-                oncheck:checkHandeler,
-                onuncheck:checkHandeler,
-                minWidth:100
-            });
-        }
-        if ($(element).attr('class') == 'subadminsselect') {
-            if (element.data('subadmin')) {
-                checked = String(element.data('subadmin')).split(', ');
-            }
-            var checkHandeler = function (group) {
-                if (group == 'admin') {
-                    return false;
-                }
-                $.post(
-                    OC.filePath('settings', 'ajax', 'togglesubadmins.php'),
-                    {
-                        username:user,
-                        group:group
-                    },
-                    function () {
-                    }
-                );
-            };
+	applyMultiplySelect: function (element) {
+		var checked = [];
+		var user = element.attr('data-username');
+		if ($(element).attr('class') == 'groupsselect') {
+			if (element.data('userGroups')) {
+				checked = String(element.data('userGroups')).split(', ');
+			}
+			if (user) {
+				var checkHandeler = function (group) {
+					if (user == OC.currentUser && group == 'admin') {
+						return false;
+					}
+					if (!isadmin && checked.length == 1 && checked[0] == group) {
+						return false;
+					}
+					$.post(
+						OC.filePath('settings', 'ajax', 'togglegroups.php'),
+						{
+							username: user,
+							group: group
+						},
+						function () {
+						}
+					);
+				};
+			} else {
+				checkHandeler = false;
+			}
+			var addGroup = function (select, group) {
+				$('select[multiple]').each(function (index, element) {
+					if ($(element).find('option[value="' + group + '"]').length === 0 && select.data('msid') !== $(element).data('msid')) {
+						$(element).append('<option value="' + escapeHTML(group) + '">' + escapeHTML(group) + '</option>');
+					}
+				})
+			};
+			var label;
+			if (isadmin) {
+				label = t('settings', 'add group');
+			} else {
+				label = null;
+			}
+			element.multiSelect({
+				createCallback: addGroup,
+				createText: label,
+				selectedFirst: true,
+				checked: checked,
+				oncheck: checkHandeler,
+				onuncheck: checkHandeler,
+				minWidth: 100
+			});
+		}
+		if ($(element).attr('class') == 'subadminsselect') {
+			if (element.data('subadmin')) {
+				checked = String(element.data('subadmin')).split(', ');
+			}
+			var checkHandeler = function (group) {
+				if (group == 'admin') {
+					return false;
+				}
+				$.post(
+					OC.filePath('settings', 'ajax', 'togglesubadmins.php'),
+					{
+						username: user,
+						group: group
+					},
+					function () {
+					}
+				);
+			};
 
-            var addSubAdmin = function (group) {
-                $('select[multiple]').each(function (index, element) {
-                    if ($(element).find('option[value="' + group + '"]').length == 0) {
-                        $(element).append('<option value="' + group + '">' + group + '</option>');
-                    }
-                })
-            };
-            element.multiSelect({
-                createCallback:addSubAdmin,
-                createText:null,
-                checked:checked,
-                oncheck:checkHandeler,
-                onuncheck:checkHandeler,
-                minWidth:100
-            });
-        }
-    }
+			var addSubAdmin = function (group) {
+				$('select[multiple]').each(function (index, element) {
+					if ($(element).find('option[value="' + group + '"]').length == 0) {
+						$(element).append('<option value="' + escapeHTML(group) + '">' + escapeHTML(group) + '</option>');
+					}
+				})
+			};
+			element.multiSelect({
+				createCallback: addSubAdmin,
+				createText: null,
+				checked: checked,
+				oncheck: checkHandeler,
+				onuncheck: checkHandeler,
+				minWidth: 100
+			});
+		}
+	}
 };
 
 $(document).ready(function () {
 
-    $('tbody tr:last').bind('inview', function (event, isInView, visiblePartX, visiblePartY) {
-		OC.Router.registerLoadedCallback(function(){
-        	UserList.update();
+	$('tbody tr:last').bind('inview', function (event, isInView, visiblePartX, visiblePartY) {
+		OC.Router.registerLoadedCallback(function () {
+			UserList.update();
 		});
-    });
+	});
 
-    function setQuota(uid, quota, ready) {
-        $.post(
-            OC.filePath('settings', 'ajax', 'setquota.php'),
-            {username:uid, quota:quota},
-            function (result) {
-                if (ready) {
-                    ready(result.data.quota);
-                }
-            }
-        );
-    }
+	function setQuota (uid, quota, ready) {
+		$.post(
+			OC.filePath('settings', 'ajax', 'setquota.php'),
+			{username: uid, quota: quota},
+			function (result) {
+				if (ready) {
+					ready(result.data.quota);
+				}
+			}
+		);
+	}
 
-    $('select[multiple]').each(function (index, element) {
-        UserList.applyMultiplySelect($(element));
-    });
+	$('select[multiple]').each(function (index, element) {
+		UserList.applyMultiplySelect($(element));
+	});
 
-    $('table').on('click', 'td.remove>a', function (event) {
-        var row = $(this).parent().parent();
-        var uid = $(row).attr('data-uid');
-        $(row).hide();
-        // Call function for handling delete/undo
-        UserList.do_delete(uid);
-    });
+	$('table').on('click', 'td.remove>a', function (event) {
+		var row = $(this).parent().parent();
+		var uid = $(row).attr('data-uid');
+		$(row).hide();
+		// Call function for handling delete/undo
+		UserList.do_delete(uid);
+	});
 
-    $('table').on('click', 'td.password>img', function (event) {
-        event.stopPropagation();
-        var img = $(this);
-        var uid = img.parent().parent().attr('data-uid');
-        var input = $('<input type="password">');
-        img.css('display', 'none');
-        img.parent().children('span').replaceWith(input);
-        input.focus();
-        input.keypress(function (event) {
-            if (event.keyCode == 13) {
-                if ($(this).val().length > 0) {
-                    $.post(
-                        OC.filePath('settings', 'ajax', 'changepassword.php'),
-                        {username:uid, password:$(this).val()},
-                        function (result) {
-                        }
-                    );
-                    input.blur();
-                } else {
-                    input.blur();
-                }
-            }
-        });
-        input.blur(function () {
-            $(this).replaceWith($('<span>●●●●●●●</span>'));
-            img.css('display', '');
-        });
-    });
-    $('table').on('click', 'td.password', function (event) {
-        $(this).children('img').click();
-    });
-    
-    $('table').on('click', 'td.displayName>img', function (event) {
-        event.stopPropagation();
-        var img = $(this);
-        var uid = img.parent().parent().attr('data-uid');
-        var displayName = img.parent().parent().attr('data-displayName');
-        var input = $('<input type="text" value="'+displayName+'">');
-        img.css('display', 'none');
-        img.parent().children('span').replaceWith(input);
-        input.focus();
-        input.keypress(function (event) {
-            if (event.keyCode == 13) {
-                if ($(this).val().length > 0) {
-                    $.post(
-                        OC.filePath('settings', 'ajax', 'changedisplayname.php'),
-                        {username:uid, displayName:$(this).val()},
-                        function (result) {
-                        }
-                    );
-                    input.blur();
-                } else {
-                    input.blur();
-                }
-            }
-        });
-        input.blur(function () {
-            $(this).replaceWith($(this).val());
-            img.css('display', '');
-        });
-    });
-    $('table').on('click', 'td.displayName', function (event) {
-        $(this).children('img').click();
-    });
-    
-
-    $('select.quota, select.quota-user').on('change', function () {
-        var select = $(this);
-        var uid = $(this).parent().parent().parent().attr('data-uid');
-        var quota = $(this).val();
-        var other = $(this).next();
-        if (quota != 'other') {
-            other.hide();
-            select.data('previous', quota);
-            setQuota(uid, quota);
-        } else {
-            other.show();
-            select.addClass('active');
-            other.focus();
-        }
-    });
-    $('select.quota, select.quota-user').each(function (i, select) {
-        $(select).data('previous', $(select).val());
-    })
+	$('table').on('click', 'td.password>img', function (event) {
+		event.stopPropagation();
+		var img = $(this);
+		var uid = img.parent().parent().attr('data-uid');
+		var input = $('<input type="password">');
+		img.css('display', 'none');
+		img.parent().children('span').replaceWith(input);
+		input.focus();
+		input.keypress(function (event) {
+			if (event.keyCode == 13) {
+				if ($(this).val().length > 0) {
+					$.post(
+						OC.filePath('settings', 'ajax', 'changepassword.php'),
+						{username: uid, password: $(this).val()},
+						function (result) {
+						}
+					);
+					input.blur();
+				} else {
+					input.blur();
+				}
+			}
+		});
+		input.blur(function () {
+			$(this).replaceWith($('<span>●●●●●●●</span>'));
+			img.css('display', '');
+		});
+	});
+	$('table').on('click', 'td.password', function (event) {
+		$(this).children('img').click();
+	});
 
-    $('input.quota-other').on('change', function () {
-        var uid = $(this).parent().parent().parent().attr('data-uid');
-        var quota = $(this).val();
-        var select = $(this).prev();
-        var other = $(this);
-        if (quota) {
-            setQuota(uid, quota, function (quota) {
-                select.children().attr('selected', null);
-                var existingOption = select.children().filter(function (i, option) {
-                    return ($(option).val() == quota);
-                });
-                if (existingOption.length) {
-                    existingOption.attr('selected', 'selected');
-                } else {
-                    var option = $('<option/>');
-                    option.attr('selected', 'selected').attr('value', quota).text(quota);
-                    select.children().last().before(option);
-                }
-                select.val(quota);
-                select.removeClass('active');
-                other.val(null);
-                other.hide();
-            });
-        } else {
-            var previous = select.data('previous');
-            select.children().attr('selected', null);
-            select.children().each(function (i, option) {
-                if ($(option).val() == previous) {
-                    $(option).attr('selected', 'selected');
-                }
-            });
-            select.removeClass('active');
-            other.hide();
-        }
-    });
+	$('table').on('click', 'td.displayName>img', function (event) {
+		event.stopPropagation();
+		var img = $(this);
+		var uid = img.parent().parent().attr('data-uid');
+		var displayName = escapeHTML(img.parent().parent().attr('data-displayName'));
+		var input = $('<input type="text" value="' + displayName + '">');
+		img.css('display', 'none');
+		img.parent().children('span').replaceWith(input);
+		input.focus();
+		input.keypress(function (event) {
+			if (event.keyCode == 13) {
+				if ($(this).val().length > 0) {
+					$.post(
+						OC.filePath('settings', 'ajax', 'changedisplayname.php'),
+						{username: uid, displayName: $(this).val()},
+						function (result) {
+						}
+					);
+					input.blur();
+				} else {
+					input.blur();
+				}
+			}
+		});
+		input.blur(function () {
+			$(this).replaceWith(escapeHTML($(this).val()));
+			img.css('display', '');
+		});
+	});
+	$('table').on('click', 'td.displayName', function (event) {
+		$(this).children('img').click();
+	});
 
-    $('input.quota-other').on('blur', function () {
-        $(this).change();
-    })
+	$('select.quota, select.quota-user').singleSelect().on('change', function () {
+		var uid = $(this).parent().parent().attr('data-uid');
+		var quota = $(this).val();
+		setQuota(uid, quota);
+	});
 
-    $('#newuser').submit(function (event) {
-        event.preventDefault();
-        var username = $('#newusername').val();
-        var password = $('#newuserpassword').val();
-        if ($('#content table tbody tr').filterAttr('data-uid', username).length > 0) {
-            OC.dialogs.alert(
-                t('settings', 'The username is already being used'),
-                t('settings', 'Error creating user'));
-            return;
-        }
-        if ($.trim(username) == '') {
-            OC.dialogs.alert(
-                t('settings', 'A valid username must be provided'),
-                t('settings', 'Error creating user'));
-            return false;
-        }
-        if ($.trim(password) == '') {
-            OC.dialogs.alert(
-                t('settings', 'A valid password must be provided'),
-                t('settings', 'Error creating user'));
-            return false;
-        }
-        var groups = $('#newusergroups').prev().children('div').data('settings').checked;
-        $('#newuser').get(0).reset();
-        $.post(
-            OC.filePath('settings', 'ajax', 'createuser.php'),
-            {
-                username:username,
-                password:password,
-                groups:groups
-            },
-            function (result) {
-                if (result.status != 'success') {
-                    OC.dialogs.alert(result.data.message,
-                        t('settings', 'Error creating user'));
-                } else {
-                    UserList.add(username, result.data.groups, null, 'default', true);
-                }
-            }
-        );
-    });
-    // Handle undo notifications
-    OC.Notification.hide();
-    $('#notification').on('click', '.undo', function () {
-        if ($('#notification').data('deleteuser')) {
-            $('tbody tr').filterAttr('data-uid', UserList.deleteUid).show();
-            UserList.deleteCanceled = true;
-        }
-        OC.Notification.hide();
-    });
-    UserList.useUndo = ('onbeforeunload' in window)
-    $(window).bind('beforeunload', function () {
-        UserList.finishDelete(null);
-    });
+	$('#newuser').submit(function (event) {
+		event.preventDefault();
+		var username = $('#newusername').val();
+		var password = $('#newuserpassword').val();
+		if ($.trim(username) == '') {
+			OC.dialogs.alert(
+				t('settings', 'A valid username must be provided'),
+				t('settings', 'Error creating user'));
+			return false;
+		}
+		if ($.trim(password) == '') {
+			OC.dialogs.alert(
+				t('settings', 'A valid password must be provided'),
+				t('settings', 'Error creating user'));
+			return false;
+		}
+		var groups = $('#newusergroups').prev().children('div').data('settings').checked;
+		$('#newuser').get(0).reset();
+		$.post(
+			OC.filePath('settings', 'ajax', 'createuser.php'),
+			{
+				username: username,
+				password: password,
+				groups: groups
+			},
+			function (result) {
+				if (result.status != 'success') {
+					OC.dialogs.alert(result.data.message,
+						t('settings', 'Error creating user'));
+				} else {
+					UserList.add(username, username, result.data.groups, null, 'default', true);
+				}
+			}
+		);
+	});
+	// Handle undo notifications
+	OC.Notification.hide();
+	$('#notification').on('click', '.undo', function () {
+		if ($('#notification').data('deleteuser')) {
+			$('tbody tr').filterAttr('data-uid', UserList.deleteUid).show();
+			UserList.deleteCanceled = true;
+		}
+		OC.Notification.hide();
+	});
+	UserList.useUndo = ('onbeforeunload' in window)
+	$(window).bind('beforeunload', function () {
+		UserList.finishDelete(null);
+	});
 });
diff --git a/settings/l10n/ar.php b/settings/l10n/ar.php
index 499c237eb7b..b2e805d522d 100644
--- a/settings/l10n/ar.php
+++ b/settings/l10n/ar.php
@@ -17,7 +17,14 @@
 "Enable" => "تفعيل",
 "Error" => "خطأ",
 "Saving..." => "حفظ",
+"Groups" => "مجموعات",
+"Group Admin" => "مدير المجموعة",
+"Delete" => "حذف",
 "__language_name__" => "__language_name__",
+"Security Warning" => "تحذير أمان",
+"More" => "المزيد",
+"Version" => "إصدار",
+"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "طوّر من قبل <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud مجتمع</a>, الـ <a href=\"https://github.com/owncloud\" target=\"_blank\">النص المصدري</a> مرخص بموجب <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">رخصة أفيرو العمومية</abbr></a>.",
 "Add your App" => "أضف تطبيقاتك",
 "More Apps" => "المزيد من التطبيقات",
 "Select an App" => "إختر تطبيقاً",
@@ -31,16 +38,11 @@
 "Bugtracker" => "تعقب علة",
 "Commercial Support" => "دعم تجاري",
 "You have used <strong>%s</strong> of the available <strong>%s</strong>" => "تم إستهلاك <strong>%s</strong> من المتوفر <strong>%s</strong>",
-"Clients" => "الزبائن",
-"Download Desktop Clients" => "تحميل عملاء سطح المكتب",
-"Download Android Client" => "تحميل عميل آندرويد",
-"Download iOS Client" => "تحميل عميل آي أو أس",
 "Password" => "كلمات السر",
 "Your password was changed" => "لقد تم تغيير كلمة السر",
 "Unable to change your password" => "لم يتم تعديل كلمة السر بنجاح",
 "Current password" => "كلمات السر الحالية",
 "New password" => "كلمات سر جديدة",
-"show" => "أظهر",
 "Change password" => "عدل كلمة السر",
 "Email" => "العنوان البريدي",
 "Your email address" => "عنوانك البريدي",
@@ -49,11 +51,6 @@
 "Help translate" => "ساعد في الترجمه",
 "WebDAV" => "WebDAV",
 "Use this address to connect to your ownCloud in your file manager" => "إستخدم هذا العنوان للإتصال بـ ownCloud في مدير الملفات",
-"Version" => "إصدار",
-"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "طوّر من قبل <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud مجتمع</a>, الـ <a href=\"https://github.com/owncloud\" target=\"_blank\">النص المصدري</a> مرخص بموجب <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">رخصة أفيرو العمومية</abbr></a>.",
-"Groups" => "مجموعات",
 "Create" => "انشئ",
-"Other" => "شيء آخر",
-"Group Admin" => "مدير المجموعة",
-"Delete" => "حذف"
+"Other" => "شيء آخر"
 );
diff --git a/settings/l10n/bg_BG.php b/settings/l10n/bg_BG.php
index 1cbbd5321c1..24664c5309f 100644
--- a/settings/l10n/bg_BG.php
+++ b/settings/l10n/bg_BG.php
@@ -1,11 +1,53 @@
 <?php $TRANSLATIONS = array(
 "Authentication error" => "Възникна проблем с идентификацията",
+"Group already exists" => "Групата вече съществува",
+"Unable to add group" => "Невъзможно добавяне на група",
+"Unable to delete group" => "Невъзможно изтриване на група",
+"Unable to delete user" => "Невъзможно изтриване на потребител",
+"Language changed" => "Езикът е променен",
 "Invalid request" => "Невалидна заявка",
+"Disable" => "Изключено",
 "Enable" => "Включено",
+"Please wait...." => "Моля почакайте....",
+"Updating...." => "Обновява се...",
 "Error" => "Грешка",
+"Updated" => "Обновено",
+"Saving..." => "Записване...",
+"deleted" => "изтрито",
+"undo" => "възтановяване",
+"Groups" => "Групи",
+"Delete" => "Изтриване",
+"__language_name__" => "__language_name__",
+"Please double check the <a href='%s'>installation guides</a>." => "Моля направете повторна справка с <a href='%s'>ръководството за инсталиране</a>.",
+"More" => "Още",
+"Version" => "Версия",
+"Add your App" => "Добавете Ваше приложение",
+"More Apps" => "Още приложения",
+"Select an App" => "Изберете приложение",
 "Update" => "Обновяване",
+"User Documentation" => "Потребителска документация",
+"Administrator Documentation" => "Административна документация",
+"Online Documentation" => "Документация",
+"Forum" => "Форум",
+"Bugtracker" => "Докладвани грешки",
+"Commercial Support" => "Платена поддръжка",
+"Show First Run Wizard again" => "Покажи настройките за първоначално зареждане отново",
 "Password" => "Парола",
+"Unable to change your password" => "Промяната на паролата не беше извършена",
+"Current password" => "Текуща парола",
+"New password" => "Нова парола",
+"Change password" => "Промяна на паролата",
+"Display Name" => "Екранно име",
 "Email" => "E-mail",
-"Groups" => "Групи",
-"Delete" => "Изтриване"
+"Your email address" => "Вашия email адрес",
+"Language" => "Език",
+"Help translate" => "Помогнете с превода",
+"WebDAV" => "WebDAV",
+"Login Name" => "Потребител",
+"Create" => "Създаване",
+"Default Storage" => "Хранилище по подразбиране",
+"Unlimited" => "Неограничено",
+"Other" => "Други",
+"Storage" => "Хранилище",
+"Default" => "По подразбиране"
 );
diff --git a/settings/l10n/bn_BD.php b/settings/l10n/bn_BD.php
index fc90036536a..bbaa5be0043 100644
--- a/settings/l10n/bn_BD.php
+++ b/settings/l10n/bn_BD.php
@@ -17,7 +17,15 @@
 "Enable" => "সক্রিয় ",
 "Error" => "সমস্যা",
 "Saving..." => "সংরক্ষণ করা হচ্ছে..",
+"undo" => "ক্রিয়া প্রত্যাহার",
+"Groups" => "গোষ্ঠীসমূহ",
+"Group Admin" => "গোষ্ঠী প্রশাসক",
+"Delete" => "মুছে ফেল",
 "__language_name__" => "__language_name__",
+"Security Warning" => "নিরাপত্তাজনিত সতর্কতা",
+"More" => "বেশী",
+"Version" => "ভার্সন",
+"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "তৈলী করেছেন <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud সম্প্রদায়</a>, যার <a href=\"https://github.com/owncloud\" target=\"_blank\"> উৎস কোডটি <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> এর অধীনে লাইসেন্সকৃত।",
 "Add your App" => "আপনার অ্যাপটি যোগ করুন",
 "More Apps" => "আরও অ্যাপ",
 "Select an App" => "অ্যাপ নির্বাচন করুন",
@@ -31,16 +39,12 @@
 "Bugtracker" => "বাগট্র্যাকার",
 "Commercial Support" => "বাণিজ্যিক সাপোর্ট",
 "You have used <strong>%s</strong> of the available <strong>%s</strong>" => "আপনি ব্যবহার করছেন  <strong>%s</strong>, সুলভ  <strong>%s</strong> এর মধ্যে।",
-"Clients" => "ক্লায়েন্ট",
-"Download Desktop Clients" => "ডেস্কটপ ক্লায়েন্ট  ডাউনলোড করুন",
-"Download Android Client" => "অ্যান্ড্রয়েড ক্লায়েন্ট ডাউনলোড করুন",
-"Download iOS Client" => "iOS ক্লায়েন্ট ডাউনলোড করুন",
+"Show First Run Wizard again" => "প্রথমবার চালানোর যাদুকর পূনরায় প্রদর্শন কর",
 "Password" => "কূটশব্দ",
 "Your password was changed" => "আপনার কূটশব্দটি পরিবর্তন করা হয়েছে ",
 "Unable to change your password" => "আপনার কূটশব্দটি পরিবর্তন করতে সক্ষম নয়",
 "Current password" => "বর্তমান কূটশব্দ",
 "New password" => "নতুন কূটশব্দ",
-"show" => "প্রদর্শন",
 "Change password" => "কূটশব্দ পরিবর্তন করুন",
 "Email" => "ই-মেইল ",
 "Your email address" => "আপনার ই-মেইল ঠিকানা",
@@ -49,15 +53,10 @@
 "Help translate" => "অনুবাদ করতে সহায়তা করুন",
 "WebDAV" => "WebDAV",
 "Use this address to connect to your ownCloud in your file manager" => "আপনার ownCloud এ সংযুক্ত হতে এই ঠিকানাটি আপনার ফাইল ব্যবস্থাপকে ব্যবহার করুন",
-"Version" => "ভার্সন",
-"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "তৈলী করেছেন <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud সম্প্রদায়</a>, যার <a href=\"https://github.com/owncloud\" target=\"_blank\"> উৎস কোডটি <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> এর অধীনে লাইসেন্সকৃত।",
-"Groups" => "গোষ্ঠীসমূহ",
 "Create" => "তৈরী কর",
 "Default Storage" => "পূর্বনির্ধারিত সংরক্ষণাগার",
 "Unlimited" => "অসীম",
 "Other" => "অন্যান্য",
-"Group Admin" => "গোষ্ঠী প্রশাসক",
 "Storage" => "সংরক্ষণাগার",
-"Default" => "পূর্বনির্ধারিত",
-"Delete" => "মুছে ফেল"
+"Default" => "পূর্বনির্ধারিত"
 );
diff --git a/settings/l10n/ca.php b/settings/l10n/ca.php
index 301ead2802d..2c969918877 100644
--- a/settings/l10n/ca.php
+++ b/settings/l10n/ca.php
@@ -24,7 +24,50 @@
 "Error" => "Error",
 "Updated" => "Actualitzada",
 "Saving..." => "S'està desant...",
+"deleted" => "esborrat",
+"undo" => "desfés",
+"Unable to remove user" => "No s'ha pogut eliminar l'usuari",
+"Groups" => "Grups",
+"Group Admin" => "Grup Admin",
+"Delete" => "Suprimeix",
+"add group" => "afegeix grup",
+"A valid username must be provided" => "Heu de facilitar un nom d'usuari vàlid",
+"Error creating user" => "Error en crear l'usuari",
+"A valid password must be provided" => "Heu de facilitar una contrasenya vàlida",
 "__language_name__" => "Català",
+"Security Warning" => "Avís de seguretat",
+"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.",
+"Setup Warning" => "Avís de configuració",
+"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "El servidor web no està configurat correctament per permetre la sincronització de fitxers perquè la interfície WebDAV sembla no funcionar correctament.",
+"Please double check the <a href='%s'>installation guides</a>." => "Comproveu les <a href='%s'>guies d'instal·lació</a>.",
+"Module 'fileinfo' missing" => "No s'ha trobat el mòdul 'fileinfo'",
+"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "El mòdul de PHP 'fileinfo' no s'ha trobat. Us recomanem que habiliteu aquest mòdul per obtenir millors resultats amb la detecció mime-type.",
+"Locale not working" => "Locale no funciona",
+"This ownCloud server can't set system locale to %s. This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support %s." => "Aquest servidor ownCloud no pot establir el locale del sistema a %s. Això significa que hi poden haver problemes amb alguns caràcters en el nom dels fitxers. Us recomanem instal·lar els paquets necessaris al sistema per donar suport a %s.",
+"Internet connection not working" => "La connexió a internet no funciona",
+"This ownCloud server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features of ownCloud." => "Aquest servidor ownCloud no té cap connexió a internet que funcioni. Això significa que algunes de les característiques com el muntatge d'emmagatzemament externs, les notificacions quant a actualitzacions o la instal·lació d'aplicacions de tercers no funcionarà. L'accés remot a fitxers i l'enviament de correus electrònics podria tampoc no funcionar. Us suggerim que habiliteu la connexió a internet per aquest servidor si voleu gaudir de totes les possibilitats d'ownCloud.",
+"Cron" => "Cron",
+"Execute one task with each page loaded" => "Executa una tasca per cada paquet carregat",
+"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à registrat en un servei webcron. Feu la crida a cron.php a l'arrel d'ownCloud cada minut a través de http.",
+"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "Usa un servei cron del sistema. Feu la crida al fitxer cron.php a través d'un cronjob del sistema cada minut.",
+"Sharing" => "Compartir",
+"Enable Share API" => "Habilita l'API de compartir",
+"Allow apps to use the Share API" => "Permet que les aplicacions utilitzin l'API de compartir",
+"Allow links" => "Permet enllaços",
+"Allow users to share items to the public with links" => "Permet als usuaris compartir elements amb el públic amb enllaços",
+"Allow resharing" => "Permet compartir de nou",
+"Allow users to share items shared with them again" => "Permet als usuaris compartir de nou elements ja compartits amb ells",
+"Allow users to share with anyone" => "Permet compartir amb qualsevol",
+"Allow users to only share with users in their groups" => "Permet als usuaris compartir només amb els usuaris del seu grup",
+"Security" => "Seguretat",
+"Enforce HTTPS" => "Força HTTPS",
+"Enforces the clients to connect to ownCloud via an encrypted connection." => "Força als clients la connexió amb ownCloud via una connexió encriptada.",
+"Please connect to this ownCloud instance via HTTPS to enable or disable the SSL enforcement." => "Connecteu aquesta instància onwCloud via HTTPS per habilitar o deshabilitar el forçament SSL.",
+"Log" => "Registre",
+"Log level" => "Nivell de registre",
+"More" => "Més",
+"Version" => "Versió",
+"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Desenvolupat per la <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunitat ownCloud</a>, el <a href=\"https://github.com/owncloud\" target=\"_blank\">codi font</a> té llicència <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
 "Add your App" => "Afegiu la vostra aplicació",
 "More Apps" => "Més aplicacions",
 "Select an App" => "Seleccioneu una aplicació",
@@ -38,16 +81,13 @@
 "Bugtracker" => "Seguiment d'errors",
 "Commercial Support" => "Suport comercial",
 "You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Heu utilitzat <strong>%s</strong> d'un total disponible de <strong>%s</strong>",
-"Clients" => "Clients",
-"Download Desktop Clients" => "Baixa clients d'escriptori",
-"Download Android Client" => " Baixa el client per Android",
-"Download iOS Client" => "Baixa el client per iOS",
+"Get the apps to sync your files" => "Obtén les aplicacions per sincronitzar fitxers",
+"Show First Run Wizard again" => "Torna a mostrar l'assistent de primera execució",
 "Password" => "Contrasenya",
 "Your password was changed" => "La seva contrasenya s'ha canviat",
 "Unable to change your password" => "No s'ha pogut canviar la contrasenya",
 "Current password" => "Contrasenya actual",
 "New password" => "Contrasenya nova",
-"show" => "mostra",
 "Change password" => "Canvia la contrasenya",
 "Display Name" => "Nom a mostrar",
 "Your display name was changed" => "El vostre nom a mostrar ha canviat",
@@ -60,18 +100,13 @@
 "Help translate" => "Ajudeu-nos amb la traducció",
 "WebDAV" => "WebDAV",
 "Use this address to connect to your ownCloud in your file manager" => "Useu aquesta adreça per connectar amb ownCloud des del gestor de fitxers",
-"Version" => "Versió",
-"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Desenvolupat per la <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunitat ownCloud</a>, el <a href=\"https://github.com/owncloud\" target=\"_blank\">codi font</a> té llicència <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
 "Login Name" => "Nom d'accés",
-"Groups" => "Grups",
 "Create" => "Crea",
 "Default Storage" => "Emmagatzemament per defecte",
 "Unlimited" => "Il·limitat",
 "Other" => "Un altre",
-"Group Admin" => "Grup Admin",
 "Storage" => "Emmagatzemament",
 "change display name" => "canvia el nom a mostrar",
 "set new password" => "estableix nova contrasenya",
-"Default" => "Per defecte",
-"Delete" => "Suprimeix"
+"Default" => "Per defecte"
 );
diff --git a/settings/l10n/cs_CZ.php b/settings/l10n/cs_CZ.php
index 30f44dfefc6..35b14f11de7 100644
--- a/settings/l10n/cs_CZ.php
+++ b/settings/l10n/cs_CZ.php
@@ -24,7 +24,50 @@
 "Error" => "Chyba",
 "Updated" => "Aktualizováno",
 "Saving..." => "Ukládám...",
+"deleted" => "smazáno",
+"undo" => "zpět",
+"Unable to remove user" => "Nelze odebrat uživatele",
+"Groups" => "Skupiny",
+"Group Admin" => "Správa skupiny",
+"Delete" => "Smazat",
+"add group" => "přidat skupinu",
+"A valid username must be provided" => "Musíte zadat platné uživatelské jméno",
+"Error creating user" => "Chyba při vytváření užiatele",
+"A valid password must be provided" => "Musíte zadat platné heslo",
 "__language_name__" => "Česky",
+"Security Warning" => "Bezpečnostní upozornění",
+"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.",
+"Setup Warning" => "Upozornění nastavení",
+"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Váš webový server není správně nastaven pro umožnění synchronizace, protože rozhraní WebDAV je rozbité.",
+"Please double check the <a href='%s'>installation guides</a>." => "Zkonzultujte, prosím, <a href='%s'>průvodce instalací</a>.",
+"Module 'fileinfo' missing" => "Schází modul 'fileinfo'",
+"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "Schází modul PHP 'fileinfo'. Doporučujeme jej povolit pro nejlepší výsledky detekce typů MIME.",
+"Locale not working" => "Locale nefunguje",
+"This ownCloud server can't set system locale to %s. This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support %s." => "Server ownCloud nemůže nastavit locale systému na %s. Můžete tedy mít problémy s některými znaky v názvech souborů. Důrazně doporučujeme nainstalovat potřebné balíčky pro podporu %s.",
+"Internet connection not working" => "Spojení s internetem nefujguje",
+"This ownCloud server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features of ownCloud." => "Server ownCloud nemá funkční spojení s internetem. Některé moduly jako externí úložiště, oznámení o dostupných aktualizacích, nebo instalace aplikací třetích stran nefungují. Přístup k souborům z jiných míst a odesílání oznamovacích e-mailů také nemusí fungovat. Pokud si přejete využívat všech vlastností ownCloud, doporučujeme povolit internetové spojení pro tento server.",
+"Cron" => "Cron",
+"Execute one task with each page loaded" => "Spustit jednu úlohu s každou načtenou stránkou",
+"cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "cron.php je registrován u služby webcron. Zavolá stránku cron.php v kořenovém adresáři owncloud každou minutu skrze http.",
+"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "Použít systémovou službu cron. Zavolat soubor cron.php ze složky owncloud pomocí systémové úlohy cron každou minutu.",
+"Sharing" => "Sdílení",
+"Enable Share API" => "Povolit API sdílení",
+"Allow apps to use the Share API" => "Povolit aplikacím používat API sdílení",
+"Allow links" => "Povolit odkazy",
+"Allow users to share items to the public with links" => "Povolit uživatelům sdílet položky s veřejností pomocí odkazů",
+"Allow resharing" => "Povolit znovu-sdílení",
+"Allow users to share items shared with them again" => "Povolit uživatelům znovu sdílet položky, které jsou pro ně sdíleny",
+"Allow users to share with anyone" => "Povolit uživatelům sdílet s kýmkoliv",
+"Allow users to only share with users in their groups" => "Povolit uživatelům sdílet pouze s uživateli v jejich skupinách",
+"Security" => "Zabezpečení",
+"Enforce HTTPS" => "Vynutit HTTPS",
+"Enforces the clients to connect to ownCloud via an encrypted connection." => "Vynutí připojování klientů ownCloud skrze šifrované spojení.",
+"Please connect to this ownCloud instance via HTTPS to enable or disable the SSL enforcement." => "Připojte se, prosím, k této instanci ownCloud skrze HTTPS pro povolení, nebo zakažte vynucení SSL.",
+"Log" => "Záznam",
+"Log level" => "Úroveň záznamu",
+"More" => "Více",
+"Version" => "Verze",
+"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Vyvinuto <a href=\"http://ownCloud.org/contact\" target=\"_blank\">komunitou ownCloud</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">zdrojový kód</a> je licencován pod <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
 "Add your App" => "Přidat Vaší aplikaci",
 "More Apps" => "Více aplikací",
 "Select an App" => "Vyberte aplikaci",
@@ -38,16 +81,13 @@
 "Bugtracker" => "Bugtracker",
 "Commercial Support" => "Placená podpora",
 "You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Používáte <strong>%s</strong> z <strong>%s</strong> dostupných",
-"Clients" => "Klienti",
-"Download Desktop Clients" => "Stáhnout klienty pro počítač",
-"Download Android Client" => "Stáhnout klienta pro android",
-"Download iOS Client" => "Stáhnout klienta pro iOS",
+"Get the apps to sync your files" => "Získat aplikace pro synchronizaci vašich souborů",
+"Show First Run Wizard again" => "Znovu zobrazit průvodce prvním spuštěním",
 "Password" => "Heslo",
 "Your password was changed" => "Vaše heslo bylo změněno",
 "Unable to change your password" => "Vaše heslo nelze změnit",
 "Current password" => "Současné heslo",
 "New password" => "Nové heslo",
-"show" => "zobrazit",
 "Change password" => "Změnit heslo",
 "Display Name" => "Zobrazované jméno",
 "Your display name was changed" => "Vaše zobrazované jméno bylo změněno",
@@ -60,18 +100,13 @@
 "Help translate" => "Pomoci s překladem",
 "WebDAV" => "WebDAV",
 "Use this address to connect to your ownCloud in your file manager" => "Použijte tuto adresu pro připojení k vašemu ownCloud skrze správce souborů",
-"Version" => "Verze",
-"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Vyvinuto <a href=\"http://ownCloud.org/contact\" target=\"_blank\">komunitou ownCloud</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">zdrojový kód</a> je licencován pod <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
 "Login Name" => "Přihlašovací jméno",
-"Groups" => "Skupiny",
 "Create" => "Vytvořit",
 "Default Storage" => "Výchozí úložiště",
 "Unlimited" => "Neomezeně",
 "Other" => "Jiná",
-"Group Admin" => "Správa skupiny",
 "Storage" => "Úložiště",
 "change display name" => "změnit zobrazované jméno",
 "set new password" => "nastavit nové heslo",
-"Default" => "Výchozí",
-"Delete" => "Smazat"
+"Default" => "Výchozí"
 );
diff --git a/settings/l10n/da.php b/settings/l10n/da.php
index 294bd918213..5a330d371a8 100644
--- a/settings/l10n/da.php
+++ b/settings/l10n/da.php
@@ -1,6 +1,7 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "Kunne ikke indlæse listen fra App Store",
 "Authentication error" => "Adgangsfejl",
+"Unable to change display name" => "Kunne ikke skifte skærmnavn",
 "Group already exists" => "Gruppen findes allerede",
 "Unable to add group" => "Gruppen kan ikke oprettes",
 "Could not enable app. " => "Applikationen kunne ikke aktiveres.",
@@ -13,11 +14,29 @@
 "Admins can't remove themself from the admin group" => "Administratorer kan ikke fjerne dem selv fra admin gruppen",
 "Unable to add user to group %s" => "Brugeren kan ikke tilføjes til gruppen %s",
 "Unable to remove user from group %s" => "Brugeren kan ikke fjernes fra gruppen %s",
+"Couldn't update app." => "Kunne ikke opdatere app'en.",
+"Update to {appversion}" => "Opdatér til {appversion}",
 "Disable" => "Deaktiver",
 "Enable" => "Aktiver",
+"Please wait...." => "Vent venligst...",
+"Updating...." => "Opdaterer....",
+"Error while updating app" => "Der opstod en fejl under app opgraderingen",
 "Error" => "Fejl",
+"Updated" => "Opdateret",
 "Saving..." => "Gemmer...",
+"deleted" => "Slettet",
+"undo" => "fortryd",
+"Groups" => "Grupper",
+"Group Admin" => "Gruppe Administrator",
+"Delete" => "Slet",
 "__language_name__" => "Dansk",
+"Security Warning" => "Sikkerhedsadvarsel",
+"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." => "Din data mappe og dine filer er muligvis tilgængelige fra internettet. .htaccess filen som ownCloud leverer virker ikke. Vi anbefaler på det kraftigste at du konfigurerer din webserver på en måske så data mappen ikke  længere er tilgængelig eller at du flytter data mappen uden for webserverens dokument rod.  ",
+"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Din webserver er endnu ikke sat op til at tillade fil synkronisering fordi WebDAV grænsefladen virker ødelagt.",
+"Please double check the <a href='%s'>installation guides</a>." => "Dobbelttjek venligst <a href='%s'>installations vejledningerne</a>.",
+"More" => "Mere",
+"Version" => "Version",
+"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Udviklet af <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownClouds community</a>, og <a href=\"https://github.com/owncloud\" target=\"_blank\">kildekoden</a> er underlagt licensen <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
 "Add your App" => "Tilføj din App",
 "More Apps" => "Flere Apps",
 "Select an App" => "Vælg en App",
@@ -31,17 +50,18 @@
 "Bugtracker" => "Bugtracker",
 "Commercial Support" => "Kommerciel support",
 "You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Du har brugt <strong>%s</strong> af den tilgængelige <strong>%s</strong>",
-"Clients" => "Klienter",
-"Download Desktop Clients" => "Hent Desktop Klienter",
-"Download Android Client" => "Hent Android Klient",
-"Download iOS Client" => "Hent iOS Klient",
+"Get the apps to sync your files" => "Hent applikationerne for at synkronisere dine filer",
+"Show First Run Wizard again" => "Vis Første Kørsel Guiden igen",
 "Password" => "Kodeord",
 "Your password was changed" => "Din adgangskode blev ændret",
 "Unable to change your password" => "Ude af stand til at ændre dit kodeord",
 "Current password" => "Nuværende adgangskode",
 "New password" => "Ny adgangskode",
-"show" => "vis",
 "Change password" => "Skift kodeord",
+"Display Name" => "Skærmnavn",
+"Your display name was changed" => "Dit skærmnavn blev ændret",
+"Unable to change your display name" => "Kunne ikke skifte dit skærmnavn",
+"Change display name" => "Skift skærmnavn",
 "Email" => "Email",
 "Your email address" => "Din emailadresse",
 "Fill in an email address to enable password recovery" => "Indtast en emailadresse for at kunne få påmindelse om adgangskode",
@@ -49,15 +69,13 @@
 "Help translate" => "Hjælp med oversættelsen",
 "WebDAV" => "WebDAV",
 "Use this address to connect to your ownCloud in your file manager" => "Brug denne adresse til at oprette forbindelse til din ownCloud i din filstyring",
-"Version" => "Version",
-"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Udviklet af <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownClouds community</a>, og <a href=\"https://github.com/owncloud\" target=\"_blank\">kildekoden</a> er underlagt licensen <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
-"Groups" => "Grupper",
+"Login Name" => "Loginnavn",
 "Create" => "Ny",
 "Default Storage" => "Standard opbevaring",
 "Unlimited" => "Ubegrænset",
 "Other" => "Andet",
-"Group Admin" => "Gruppe Administrator",
 "Storage" => "Opbevaring",
-"Default" => "Standard",
-"Delete" => "Slet"
+"change display name" => "skift skærmnavn",
+"set new password" => "skift kodeord",
+"Default" => "Standard"
 );
diff --git a/settings/l10n/de.php b/settings/l10n/de.php
index b7ace81cf59..6307bdc61b5 100644
--- a/settings/l10n/de.php
+++ b/settings/l10n/de.php
@@ -1,6 +1,7 @@
 <?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",
+"Unable to change display name" => "Das Ändern des Anzeigenamens ist nicht möglich",
 "Group already exists" => "Gruppe existiert bereits",
 "Unable to add group" => "Gruppe konnte nicht angelegt werden",
 "Could not enable app. " => "App konnte nicht aktiviert werden.",
@@ -13,12 +14,60 @@
 "Admins can't remove themself from the admin group" => "Administratoren können sich nicht selbst aus der Admin-Gruppe löschen.",
 "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",
+"Couldn't update app." => "Die App konnte nicht geupdated werden.",
+"Update to {appversion}" => "Update zu {appversion}",
 "Disable" => "Deaktivieren",
 "Enable" => "Aktivieren",
+"Please wait...." => "Bitte warten...",
+"Updating...." => "Update...",
 "Error while updating app" => "Fehler beim Aktualisieren der App",
 "Error" => "Fehler",
+"Updated" => "Geupdated",
 "Saving..." => "Speichern...",
+"deleted" => "gelöscht",
+"undo" => "rückgängig machen",
+"Unable to remove user" => "Benutzer konnte nicht entfernt werden.",
+"Groups" => "Gruppen",
+"Group Admin" => "Gruppenadministrator",
+"Delete" => "Löschen",
+"add group" => "Gruppe hinzufügen",
+"A valid username must be provided" => "Es muss ein gültiger Benutzername angegeben werden",
+"Error creating user" => "Beim anlegen des Benutzers ist ein Fehler aufgetreten",
+"A valid password must be provided" => "Es muss ein gültiges Passwort angegeben werden",
 "__language_name__" => "Deutsch (Persönlich)",
+"Security Warning" => "Sicherheitswarnung",
+"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.",
+"Setup Warning" => "Einrichtungswarnung",
+"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Dein Web-Server ist noch nicht für Datei-Synchronisation bereit, weil die WebDAV-Schnittstelle vermutlich defekt ist.",
+"Please double check the <a href='%s'>installation guides</a>." => "Bitte prüfen Sie die <a href='%s'>Instalationsanleitungen</a>.",
+"Module 'fileinfo' missing" => "Modul 'fileinfo' fehlt ",
+"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "Das PHP-Modul 'fileinfo' fehlt. Wir empfehlen dieses Modul zu aktivieren um die besten Resultate bei der Erkennung der Dateitypen zu erreichen.",
+"Locale not working" => "Ländereinstellung funktioniert nicht",
+"This ownCloud server can't set system locale to %s. This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support %s." => "Dieser ownCloud Server kann die Ländereinstellung nicht auf %s ändern. Dies bedeutet dass es Probleme mit bestimmten Zeichen in Dateinamen geben könnte. Wir empfehlen die für %s benötigten Pakete auf ihrem System zu installieren.",
+"Internet connection not working" => "Keine Netzwerkverbindung",
+"This ownCloud server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features of ownCloud." => "Dieser ownCloud Server hat keine funktionierende Netzwerkverbindung. Dies bedeutet das einige Funktionen wie das Einbinden von externen Speichern, Update-Benachrichtigungen oder die Installation von Drittanbieter-Apps nicht funktionieren. Der Fernzugriff auf Dateien und das Senden von Benachrichtigungsmails funktioniert eventuell ebenfalls nicht. Wir empfehlen die Netzwerkverbindung für diesen Server zu aktivieren wenn Du alle Funktionen von ownCloud nutzen möchtest.",
+"Cron" => "Cron",
+"Execute one task with each page loaded" => "Führe eine Aufgabe mit 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 an einem Webcron-Service registriert. Die cron.php Seite wird einmal pro Minute über http abgerufen.",
+"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "Nutze den Cron Systemdienst. Rufe die Datei cron.php im owncloud Ordner einmal pro Minute über einen Cronjob auf.",
+"Sharing" => "Teilen",
+"Enable Share API" => "Aktiviere Sharing-API",
+"Allow apps to use the Share API" => "Erlaube Apps die Nutzung der Share-API",
+"Allow links" => "Erlaube Links",
+"Allow users to share items to the public with links" => "Erlaube Benutzern Inhalte über öffentliche Links zu teilen",
+"Allow resharing" => "Erlaube erneutes teilen",
+"Allow users to share items shared with them again" => "Erlaube Benutzern mit ihnen geteilte Inhalte erneut zu teilen",
+"Allow users to share with anyone" => "Erlaube Benutzern mit jedem zu teilen",
+"Allow users to only share with users in their groups" => "Erlaube Benutzern nur mit Benutzern ihrer Gruppe zu teilen",
+"Security" => "Sicherheit",
+"Enforce HTTPS" => "Erzwinge HTTPS",
+"Enforces the clients to connect to ownCloud via an encrypted connection." => "Erzwingt die Verwendung einer verschlüsselten Verbindung",
+"Please connect to this ownCloud instance via HTTPS to enable or disable the SSL enforcement." => "Bitte verbinden Sie sich über eine HTTPS Verbindung mit diesem ownCloud Server um diese Einstellung zu ändern",
+"Log" => "Log",
+"Log level" => "Loglevel",
+"More" => "Mehr",
+"Version" => "Version",
+"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Entwickelt von der <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud-Community</a>, der <a href=\"https://github.com/owncloud\" target=\"_blank\">Quellcode</a> ist unter der <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> lizenziert.",
 "Add your App" => "Füge Deine Anwendung hinzu",
 "More Apps" => "Weitere Anwendungen",
 "Select an App" => "Wähle eine Anwendung aus",
@@ -32,18 +81,18 @@
 "Bugtracker" => "Bugtracker",
 "Commercial Support" => "Kommerzieller Support",
 "You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Du verwendest <strong>%s</strong> der verfügbaren <strong>%s<strong>",
-"Clients" => "Clients",
-"Download Desktop Clients" => "Desktop-Client herunterladen",
-"Download Android Client" => "Android-Client herunterladen",
-"Download iOS Client" => "iOS-Client herunterladen",
+"Get the apps to sync your files" => "Lade die Apps zur Synchronisierung Deiner Daten herunter",
+"Show First Run Wizard again" => "Erstinstallation erneut durchführen",
 "Password" => "Passwort",
 "Your password was changed" => "Dein 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",
 "Display Name" => "Anzeigename",
+"Your display name was changed" => "Dein Anzeigename wurde geändert",
+"Unable to change your display name" => "Das Ändern deines Anzeigenamens ist nicht möglich",
+"Change display name" => "Anzeigenamen ändern",
 "Email" => "E-Mail",
 "Your email address" => "Deine E-Mail-Adresse",
 "Fill in an email address to enable password recovery" => "Trage eine E-Mail-Adresse ein, um die Passwort-Wiederherstellung zu aktivieren.",
@@ -51,18 +100,13 @@
 "Help translate" => "Hilf bei der Übersetzung",
 "WebDAV" => "WebDAV",
 "Use this address to connect to your ownCloud in your file manager" => "Verwende diese Adresse, um Deinen Dateimanager mit Deiner ownCloud zu verbinden",
-"Version" => "Version",
-"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Entwickelt von der <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud-Community</a>, der <a href=\"https://github.com/owncloud\" target=\"_blank\">Quellcode</a> ist unter der <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> lizenziert.",
 "Login Name" => "Loginname",
-"Groups" => "Gruppen",
 "Create" => "Anlegen",
 "Default Storage" => "Standard-Speicher",
 "Unlimited" => "Unbegrenzt",
 "Other" => "Andere",
-"Group Admin" => "Gruppenadministrator",
 "Storage" => "Speicher",
 "change display name" => "Anzeigenamen ändern",
 "set new password" => "Neues Passwort setzen",
-"Default" => "Standard",
-"Delete" => "Löschen"
+"Default" => "Standard"
 );
diff --git a/settings/l10n/de_DE.php b/settings/l10n/de_DE.php
index ab8c791bbe0..d8d6ba58b4a 100644
--- a/settings/l10n/de_DE.php
+++ b/settings/l10n/de_DE.php
@@ -22,9 +22,52 @@
 "Updating...." => "Update...",
 "Error while updating app" => "Es ist ein Fehler während des Updates aufgetreten",
 "Error" => "Fehler",
-"Updated" => "Geupdated",
+"Updated" => "Aktualisiert",
 "Saving..." => "Speichern...",
+"deleted" => "gelöscht",
+"undo" => "rückgängig machen",
+"Unable to remove user" => "Benutzer konnte nicht entfernt werden.",
+"Groups" => "Gruppen",
+"Group Admin" => "Gruppenadministrator",
+"Delete" => "Löschen",
+"add group" => "Gruppe hinzufügen",
+"A valid username must be provided" => "Es muss ein gültiger Benutzername angegeben werden",
+"Error creating user" => "Beim Erstellen des Benutzers ist ein Fehler aufgetreten",
+"A valid password must be provided" => "Es muss ein gültiges Passwort angegeben werden",
 "__language_name__" => "Deutsch (Förmlich: Sie)",
+"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 und Ihre Dateien sind wahrscheinlich über das Internet erreichbar. Die von ownCloud bereitgestellte .htaccess Datei funktioniert nicht. Wir empfehlen Ihnen dringend, Ihren Webserver so zu konfigurieren, dass das Datenverzeichnis nicht mehr über das Internet erreichbar ist. Alternativ können Sie auch das Datenverzeichnis aus dem Dokumentenverzeichnis des Webservers verschieben.",
+"Setup Warning" => "Einrichtungswarnung",
+"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Ihr Web-Server ist noch nicht konfiguriert noch nicht für Datei-Synchronisation bereit weil die WebDAV-Schnittstelle vermutlich defekt ist.",
+"Please double check the <a href='%s'>installation guides</a>." => "Bitte prüfen Sie die <a href='%s'>Instalationsanleitungen</a>.",
+"Module 'fileinfo' missing" => "Das Modul 'fileinfo' fehlt",
+"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "Das PHP-Modul 'fileinfo' fehlt. Wir empfehlen Ihnen dieses Modul zu aktivieren um die besten Resultate bei der Bestimmung der Dateitypen zu erzielen.",
+"Locale not working" => "Lokalisierung funktioniert nicht",
+"This ownCloud server can't set system locale to %s. This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support %s." => "Dieser ownCloud Server kann die Ländereinstellung nicht auf %s ändern. Dies bedeutet dass es Probleme mit bestimmten Zeichen in Dateinamen geben könnte. Wir empfehlen die für %s benötigten Pakete auf ihrem System zu installieren.",
+"Internet connection not working" => "Keine Netzwerkverbindung",
+"This ownCloud server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features of ownCloud." => "Dieser ownCloud Server hat keine funktionierende Internetverbindung. Dies bedeutet das einige Funktionen wie das Einbinden von externen Speichern, Update-Benachrichtigungen oder die Installation von Drittanbieter-Apps nicht funktionieren. Der Fernzugriff auf Dateien und das Senden von Benachrichtigungsmails funktioniert eventuell ebenfalls nicht. Wir empfehlen die Internetverbindung für diesen Server zu aktivieren wenn Sie alle Funktionen von ownCloud nutzen wollen.",
+"Cron" => "Cron",
+"Execute one task with each page loaded" => "Führe eine Aufgabe bei jedem Laden der 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-Service registriert. Die cron.php Seite im ownCloud Wurzelverzeichniss wird einmal pro Minute über http abgerufen.",
+"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "Nutzen Sie den Cron Systemdienst. Rufen Sie die Datei cron.php im ownCloud Ordner einmal pro Minute über einen Cronjob auf.",
+"Sharing" => "Teilen",
+"Enable Share API" => "Share-API aktivieren",
+"Allow apps to use the Share API" => "Erlaube es Anwendungen, die Share-API zu benutzen",
+"Allow links" => "Links erlauben",
+"Allow users to share items to the public with links" => "Erlaube es Benutzern, Items per öffentlichem Link zu teilen",
+"Allow resharing" => "Erlaube weiterverteilen",
+"Allow users to share items shared with them again" => "Erlaubt Nutzern mit ihnen geteilte Inhalte erneut zu teilen",
+"Allow users to share with anyone" => "Erlaube Nutzern mit jedem zu teilen",
+"Allow users to only share with users in their groups" => "Erlaube Nutzern nur mit Nutzern in ihrer Gruppe zu teilen",
+"Security" => "Sicherheit",
+"Enforce HTTPS" => "HTTPS erzwingen",
+"Enforces the clients to connect to ownCloud via an encrypted connection." => "Zwingt die Clients, sich über eine verschlüsselte Verbindung mit ownCloud zu verbinden.",
+"Please connect to this ownCloud instance via HTTPS to enable or disable the SSL enforcement." => "Bitte verbinden Sie sich mit dieser ownCloud-Instanz per HTTPS um SSL-Erzwingung zu aktivieren oder deaktivieren.",
+"Log" => "Log",
+"Log level" => "Log-Level",
+"More" => "Mehr",
+"Version" => "Version",
+"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Entwickelt von der <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud-Community</a>. Der <a href=\"https://github.com/owncloud\" target=\"_blank\">Quellcode</a> ist unter der <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> lizenziert.",
 "Add your App" => "Fügen Sie Ihre Anwendung hinzu",
 "More Apps" => "Weitere Anwendungen",
 "Select an App" => "Wählen Sie eine Anwendung aus",
@@ -38,20 +81,17 @@
 "Bugtracker" => "Bugtracker",
 "Commercial Support" => "Kommerzieller Support",
 "You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Sie verwenden <strong>%s</strong> der verfügbaren <strong>%s</strong>",
-"Clients" => "Clients",
-"Download Desktop Clients" => "Desktop-Client herunterladen",
-"Download Android Client" => "Android-Client herunterladen",
-"Download iOS Client" => "iOS-Client herunterladen",
+"Get the apps to sync your files" => "Installieren Sie die Anwendungen um Ihre Dateien zu synchronisieren",
+"Show First Run Wizard again" => "Zeige den Einrichtungsassistenten erneut",
 "Password" => "Passwort",
 "Your password was changed" => "Ihr Passwort wurde geändert.",
 "Unable to change your password" => "Das Passwort konnte nicht geändert werden",
 "Current password" => "Aktuelles Passwort",
 "New password" => "Neues Passwort",
-"show" => "zeigen",
 "Change password" => "Passwort ändern",
 "Display Name" => "Anzeigename",
-"Your display name was changed" => "Dein Anzeigename wurde geändert",
-"Unable to change your display name" => "Das Ändern deines Anzeigenamens ist nicht möglich",
+"Your display name was changed" => "Ihr Anzeigename wurde geändert",
+"Unable to change your display name" => "Das Ändern Ihres Anzeigenamens ist nicht möglich",
 "Change display name" => "Anzeigenamen ändern",
 "Email" => "E-Mail",
 "Your email address" => "Ihre E-Mail-Adresse",
@@ -60,18 +100,13 @@
 "Help translate" => "Helfen Sie bei der Übersetzung",
 "WebDAV" => "WebDAV",
 "Use this address to connect to your ownCloud in your file manager" => "Verwenden Sie diese Adresse, um Ihren Dateimanager mit Ihrer ownCloud zu verbinden",
-"Version" => "Version",
-"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Entwickelt von der <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud-Community</a>. Der <a href=\"https://github.com/owncloud\" target=\"_blank\">Quellcode</a> ist unter der <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> lizenziert.",
 "Login Name" => "Loginname",
-"Groups" => "Gruppen",
 "Create" => "Anlegen",
 "Default Storage" => "Standard-Speicher",
 "Unlimited" => "Unbegrenzt",
 "Other" => "Andere",
-"Group Admin" => "Gruppenadministrator",
 "Storage" => "Speicher",
 "change display name" => "Anzeigenamen ändern",
 "set new password" => "Neues Passwort setzen",
-"Default" => "Standard",
-"Delete" => "Löschen"
+"Default" => "Standard"
 );
diff --git a/settings/l10n/el.php b/settings/l10n/el.php
index 925ecf695aa..fb1b95a72d3 100644
--- a/settings/l10n/el.php
+++ b/settings/l10n/el.php
@@ -1,6 +1,7 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "Σφάλμα στην φόρτωση της λίστας από το App Store",
 "Authentication error" => "Σφάλμα πιστοποίησης",
+"Unable to change display name" => "Δεν είναι δυνατή η αλλαγή του ονόματος εμφάνισης",
 "Group already exists" => "Η ομάδα υπάρχει ήδη",
 "Unable to add group" => "Αδυναμία προσθήκης ομάδας",
 "Could not enable app. " => "Αδυναμία ενεργοποίησης εφαρμογής ",
@@ -13,11 +14,55 @@
 "Admins can't remove themself from the admin group" => "Οι διαχειριστές δεν μπορούν να αφαιρέσουν τους εαυτούς τους από την ομάδα των διαχειριστών",
 "Unable to add user to group %s" => "Αδυναμία προσθήκη χρήστη στην ομάδα %s",
 "Unable to remove user from group %s" => "Αδυναμία αφαίρεσης χρήστη από την ομάδα %s",
+"Couldn't update app." => "Αδυναμία ενημέρωσης εφαρμογής",
+"Update to {appversion}" => "Ενημέρωση σε {appversion}",
 "Disable" => "Απενεργοποίηση",
 "Enable" => "Ενεργοποίηση",
+"Please wait...." => "Παρακαλώ περιμένετε...",
+"Updating...." => "Ενημέρωση...",
+"Error while updating app" => "Σφάλμα κατά την ενημέρωση της εφαρμογής",
 "Error" => "Σφάλμα",
+"Updated" => "Ενημερώθηκε",
 "Saving..." => "Αποθήκευση...",
+"deleted" => "διαγράφηκε",
+"undo" => "αναίρεση",
+"Unable to remove user" => "Αδυναμία αφαίρεση χρήστη",
+"Groups" => "Ομάδες",
+"Group Admin" => "Ομάδα Διαχειριστών",
+"Delete" => "Διαγραφή",
+"add group" => "προσθήκη ομάδας",
+"A valid username must be provided" => "Πρέπει να δοθεί έγκυρο όνομα χρήστη",
+"Error creating user" => "Σφάλμα δημιουργίας χρήστη",
+"A valid password must be provided" => "Πρέπει να δοθεί έγκυρο συνθηματικό",
 "__language_name__" => "__όνομα_γλώσσας__",
+"Security Warning" => "Προειδοποίηση Ασφαλείας",
+"Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Ο κατάλογος data και τα αρχεία σας πιθανόν να είναι διαθέσιμα στο διαδίκτυο. Το αρχείο .htaccess που παρέχει το ownCloud δεν δουλεύει. Σας προτείνουμε ανεπιφύλακτα να ρυθμίσετε το διακομιστή σας με τέτοιο τρόπο ώστε ο κατάλογος data να μην είναι πλέον προσβάσιμος ή να μετακινήσετε τον κατάλογο data έξω από τον κατάλογο του διακομιστή.",
+"Setup Warning" => "Ρύθμιση Προειδοποίησης",
+"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Ο διακομιστής σας δεν έχει ρυθμιστεί κατάλληλα ώστε να επιτρέπει τον συγχρονισμό αρχείων γιατί η διεπαφή WebDAV πιθανόν να είναι κατεστραμμένη.",
+"Please double check the <a href='%s'>installation guides</a>." => "Ελέγξτε ξανά τις <a href='%s'>οδηγίες εγκατάστασης</a>.",
+"Locale not working" => "Η μετάφραση δεν δουλεύει",
+"Internet connection not working" => "Η σύνδεση στο διαδίκτυο δεν δουλεύει",
+"Cron" => "Cron",
+"Execute one task with each page loaded" => "Εκτέλεση μιας διεργασίας με κάθε σελίδα που φορτώνεται",
+"cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "Το cron.php είναι καταχωρημένο στην υπηρεσία webcron. Να καλείται μια φορά το λεπτό η σελίδα cron.php από τον root του owncloud μέσω http",
+"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "Χρήση υπηρεσίας συστήματος cron. Να καλείται μια φορά το λεπτό, το αρχείο cron.php από τον φάκελο του owncloud μέσω του cronjob του συστήματος.",
+"Sharing" => "Διαμοιρασμός",
+"Enable Share API" => "Ενεργοποίηση API Διαμοιρασμού",
+"Allow apps to use the Share API" => "Να επιτρέπεται στις εφαρμογές να χρησιμοποιούν το API Διαμοιρασμού",
+"Allow links" => "Να επιτρέπονται σύνδεσμοι",
+"Allow users to share items to the public with links" => "Να επιτρέπεται στους χρήστες να διαμοιράζουν δημόσια με συνδέσμους",
+"Allow resharing" => "Να επιτρέπεται ο επαναδιαμοιρασμός",
+"Allow users to share items shared with them again" => "Να επιτρέπεται στους χρήστες να διαμοιράζουν ότι τους έχει διαμοιραστεί",
+"Allow users to share with anyone" => "Να επιτρέπεται ο διαμοιρασμός με οποιονδήποτε",
+"Allow users to only share with users in their groups" => "Να επιτρέπεται στους χρήστες ο διαμοιρασμός μόνο με χρήστες της ίδιας ομάδας",
+"Security" => "Ασφάλεια",
+"Enforce HTTPS" => "Επιβολή χρήσης HTTPS",
+"Enforces the clients to connect to ownCloud via an encrypted connection." => "Επιβολή στους πελάτες να συνδεθούν στο ownCloud μέσω μιας κρυπτογραφημένης σύνδεσης.",
+"Log" => "Καταγραφές",
+"Log level" => "Επίπεδο καταγραφής",
+"More" => "Περισσότερα",
+"Version" => "Έκδοση",
+"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Αναπτύχθηκε από την <a href=\"http://ownCloud.org/contact\" target=\"_blank\">κοινότητα ownCloud</a>, ο <a href=\"https://github.com/owncloud\" target=\"_blank\">πηγαίος κώδικας</a> είναι υπό άδεια χρήσης <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
 "Add your App" => "Πρόσθεστε τη Δικιά σας Εφαρμογή",
 "More Apps" => "Περισσότερες Εφαρμογές",
 "Select an App" => "Επιλέξτε μια Εφαρμογή",
@@ -31,17 +76,18 @@
 "Bugtracker" => "Bugtracker",
 "Commercial Support" => "Εμπορική Υποστήριξη",
 "You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Χρησιμοποιήσατε <strong>%s</strong> από διαθέσιμα <strong>%s</strong>",
-"Clients" => "Πελάτες",
-"Download Desktop Clients" => "Λήψη Προγραμμάτων για Σταθερούς Υπολογιστές",
-"Download Android Client" => "Λήψη Προγράμματος Android",
-"Download iOS Client" => "Λήψη Προγράμματος iOS",
+"Get the apps to sync your files" => "Λήψη της εφαρμογής για συγχρονισμό των αρχείων σας",
+"Show First Run Wizard again" => "Προβολή Πρώτης Εκτέλεσης Οδηγού πάλι",
 "Password" => "Συνθηματικό",
 "Your password was changed" => "Το συνθηματικό σας έχει αλλάξει",
 "Unable to change your password" => "Δεν ήταν δυνατή η αλλαγή του κωδικού πρόσβασης",
 "Current password" => "Τρέχων συνθηματικό",
 "New password" => "Νέο συνθηματικό",
-"show" => "εμφάνιση",
 "Change password" => "Αλλαγή συνθηματικού",
+"Display Name" => "Όνομα εμφάνισης",
+"Your display name was changed" => "Το όνομα εμφάνισής σας άλλαξε",
+"Unable to change your display name" => "Δεν ήταν δυνατή η αλλαγή του ονόματος εμφάνισής σας",
+"Change display name" => "Αλλαγή ονόματος εμφάνισης",
 "Email" => "Email",
 "Your email address" => "Η διεύθυνση ηλεκτρονικού ταχυδρομείου σας",
 "Fill in an email address to enable password recovery" => "Συμπληρώστε μια διεύθυνση ηλεκτρονικού ταχυδρομείου για να ενεργοποιηθεί η ανάκτηση συνθηματικού",
@@ -49,15 +95,13 @@
 "Help translate" => "Βοηθήστε στη μετάφραση",
 "WebDAV" => "WebDAV",
 "Use this address to connect to your ownCloud in your file manager" => "Χρήση αυτής της διεύθυνσης για σύνδεση στο ownCloud με τον διαχειριστή αρχείων σας",
-"Version" => "Έκδοση",
-"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Αναπτύχθηκε από την <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>.",
-"Groups" => "Ομάδες",
+"Login Name" => "Όνομα Σύνδεσης",
 "Create" => "Δημιουργία",
 "Default Storage" => "Προκαθορισμένη Αποθήκευση ",
 "Unlimited" => "Απεριόριστο",
 "Other" => "Άλλα",
-"Group Admin" => "Ομάδα Διαχειριστών",
 "Storage" => "Αποθήκευση",
-"Default" => "Προκαθορισμένο",
-"Delete" => "Διαγραφή"
+"change display name" => "αλλαγή ονόματος εμφάνισης",
+"set new password" => "επιλογή νέου κωδικού",
+"Default" => "Προκαθορισμένο"
 );
diff --git a/settings/l10n/eo.php b/settings/l10n/eo.php
index f84526c3c91..e381794f6f3 100644
--- a/settings/l10n/eo.php
+++ b/settings/l10n/eo.php
@@ -17,7 +17,16 @@
 "Enable" => "Kapabligi",
 "Error" => "Eraro",
 "Saving..." => "Konservante...",
+"deleted" => "forigita",
+"undo" => "malfari",
+"Groups" => "Grupoj",
+"Group Admin" => "Grupadministranto",
+"Delete" => "Forigi",
 "__language_name__" => "Esperanto",
+"Security Warning" => "Sekureca averto",
+"More" => "Pli",
+"Version" => "Eldono",
+"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Ellaborita de la <a href=\"http://ownCloud.org/contact\" target=\"_blank\">komunumo de ownCloud</a>, la <a href=\"https://github.com/owncloud\" target=\"_blank\">fontokodo</a> publikas laŭ la permesilo <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
 "Add your App" => "Aldonu vian aplikaĵon",
 "More Apps" => "Pli da aplikaĵoj",
 "Select an App" => "Elekti aplikaĵon",
@@ -31,16 +40,11 @@
 "Bugtracker" => "Cimoraportejo",
 "Commercial Support" => "Komerca subteno",
 "You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Vi uzas <strong>%s</strong> el la haveblaj <strong>%s</strong>",
-"Clients" => "Klientoj",
-"Download Desktop Clients" => "Elŝuti labortablajn klientojn",
-"Download Android Client" => "Elŝuti Android-klienton",
-"Download iOS Client" => "Elŝuti iOS-klienton",
 "Password" => "Pasvorto",
 "Your password was changed" => "Via pasvorto ŝanĝiĝis",
 "Unable to change your password" => "Ne eblis ŝanĝi vian pasvorton",
 "Current password" => "Nuna pasvorto",
 "New password" => "Nova pasvorto",
-"show" => "montri",
 "Change password" => "Ŝanĝi la pasvorton",
 "Email" => "Retpoŝto",
 "Your email address" => "Via retpoŝta adreso",
@@ -49,15 +53,10 @@
 "Help translate" => "Helpu traduki",
 "WebDAV" => "WebDAV",
 "Use this address to connect to your ownCloud in your file manager" => "Uzu ĉi tiun adreson por konekti al via ownCloud vian dosieradministrilon",
-"Version" => "Eldono",
-"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Ellaborita de la <a href=\"http://ownCloud.org/contact\" target=\"_blank\">komunumo de ownCloud</a>, la <a href=\"https://github.com/owncloud\" target=\"_blank\">fontokodo</a> publikas laŭ la permesilo <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
-"Groups" => "Grupoj",
 "Create" => "Krei",
 "Default Storage" => "Defaŭlta konservejo",
 "Unlimited" => "Senlima",
 "Other" => "Alia",
-"Group Admin" => "Grupadministranto",
 "Storage" => "Konservejo",
-"Default" => "Defaŭlta",
-"Delete" => "Forigi"
+"Default" => "Defaŭlta"
 );
diff --git a/settings/l10n/es.php b/settings/l10n/es.php
index 1b4fd6ac7a6..c8467853c4f 100644
--- a/settings/l10n/es.php
+++ b/settings/l10n/es.php
@@ -24,7 +24,50 @@
 "Error" => "Error",
 "Updated" => "Actualizado",
 "Saving..." => "Guardando...",
+"deleted" => "borrado",
+"undo" => "deshacer",
+"Unable to remove user" => "No se puede quitar el usuario",
+"Groups" => "Grupos",
+"Group Admin" => "Grupo admin",
+"Delete" => "Eliminar",
+"add group" => "Añadir Grupo",
+"A valid username must be provided" => "Se debe usar un nombre de usuario  valido",
+"Error creating user" => "Error al crear usuario",
+"A valid password must be provided" => "Se debe usar una contraseña valida",
 "__language_name__" => "Castellano",
+"Security Warning" => "Advertencia de seguridad",
+"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 son 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.",
+"Setup Warning" => "Advertencia de Configuración",
+"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Su servidor web aún no está configurado adecuadamente para permitir sincronización de archivos ya que la interfaz WebDAV parece no estar funcionando.",
+"Please double check the <a href='%s'>installation guides</a>." => "Por favor, vuelva a comprobar las <a href='%s'>guías de instalación</a>.",
+"Module 'fileinfo' missing" => "Modulo 'fileinfo' perdido",
+"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "El modulo PHP 'fileinfo' no se encuentra. Sugerimos habilitar este modulo para tener mejorres resultados con la detección mime-type",
+"Locale not working" => "Configuración regional no está funcionando",
+"This ownCloud server can't set system locale to %s. This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support %s." => "Este servidor ownCloud no puede establecer la configuración regional a %s. Esto significa que puede haber problemas con ciertos caracteres en los nombres de archivos. Le recomendamos que instale los paquetes requeridos en su sistema para soportar %s.",
+"Internet connection not working" => "La conexion a internet no esta funcionando",
+"This ownCloud server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features of ownCloud." => "Este servidor ownCloud no tiene conexion de internet. Esto quiere decir que algunas caracteristicas como montar almacenamiento externo, notificaciones sobre actualizaciones o la instalacion de apps de terceros no funcionaran. Es posible que no pueda acceder remotamente a los archivos ni enviar notificaciones por correo. Sugerimos habilitar la conexión a internet para este servidor si quiere tener todas las caracteristicas de ownCloud.",
+"Cron" => "Cron",
+"Execute one task with each page loaded" => "Ejecutar una tarea con cada página cargada",
+"cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "cron.php es un sistema webcron registrado. Llame a la página cron.php en la raíz de owncloud una vez por minuto sobre http.",
+"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "Utilizar el servicio con del sistema. Llame al archivo cron.php en la carpeta de owncloud vía un sistema conjob una vez por minuto.",
+"Sharing" => "Compartiendo",
+"Enable Share API" => "Activar API de Compartición",
+"Allow apps to use the Share API" => "Permitir a las aplicaciones a que usen la API de Compartición",
+"Allow links" => "Permitir enlaces",
+"Allow users to share items to the public with links" => "Permitir a los usuarios compartir elementos al público con enlaces",
+"Allow resharing" => "Permitir re-compartición",
+"Allow users to share items shared with them again" => "Permitir a los usuarios compartir elementos ya compartidos con ellos mismos",
+"Allow users to share with anyone" => "Permitir a los usuarios compartir con todos",
+"Allow users to only share with users in their groups" => "Permitir a los usuarios compartir sólo con los usuarios en sus grupos",
+"Security" => "Seguridad",
+"Enforce HTTPS" => "Forzar HTTPS",
+"Enforces the clients to connect to ownCloud via an encrypted connection." => "Forzar la conexión de los clientes a ownCloud con una conexión encriptada.",
+"Please connect to this ownCloud instance via HTTPS to enable or disable the SSL enforcement." => "Por favor, conecte esta instancia de ownCloud vía HTTPS para activar o desactivar la aplicación SSL",
+"Log" => "Historial",
+"Log level" => "Nivel de Historial",
+"More" => "Más",
+"Version" => "Version",
+"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Desarrollado por la <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunidad ownCloud</a>, el <a href=\"https://github.com/owncloud\" target=\"_blank\">código fuente</a> está bajo licencia <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
 "Add your App" => "Añade tu aplicación",
 "More Apps" => "Más aplicaciones",
 "Select an App" => "Seleccionar una aplicación",
@@ -38,16 +81,13 @@
 "Bugtracker" => "Rastreador de Bugs",
 "Commercial Support" => "Soporte Comercial",
 "You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Ha usado <strong>%s</strong> de <strong>%s</strong> disponibles",
-"Clients" => "Clientes",
-"Download Desktop Clients" => "Descargar clientes de escritorio",
-"Download Android Client" => "Descargar cliente para android",
-"Download iOS Client" => "Descargar cliente para iOS",
+"Get the apps to sync your files" => "Obtener las apps para sincronizar sus archivos",
+"Show First Run Wizard again" => "Mostrar asistente para iniciar otra vez",
 "Password" => "Contraseña",
 "Your password was changed" => "Su contraseña ha sido cambiada",
 "Unable to change your password" => "No se ha podido cambiar tu contraseña",
 "Current password" => "Contraseña actual",
 "New password" => "Nueva contraseña:",
-"show" => "mostrar",
 "Change password" => "Cambiar contraseña",
 "Display Name" => "Nombre a mostrar",
 "Your display name was changed" => "Su nombre fue cambiado",
@@ -60,18 +100,13 @@
 "Help translate" => "Ayúdanos a traducir",
 "WebDAV" => "WebDAV",
 "Use this address to connect to your ownCloud in your file manager" => "Use esta dirección para conectarse a su cuenta de ownCloud en el administrador de archivos",
-"Version" => "Version",
-"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Desarrollado por la <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunidad ownCloud</a>, el <a href=\"https://github.com/owncloud\" target=\"_blank\">código fuente</a> está bajo licencia <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
 "Login Name" => "Nombre de usuario",
-"Groups" => "Grupos",
 "Create" => "Crear",
 "Default Storage" => "Almacenamiento Predeterminado",
 "Unlimited" => "Ilimitado",
 "Other" => "Otro",
-"Group Admin" => "Grupo admin",
 "Storage" => "Alamacenamiento",
 "change display name" => "Cambiar nombre a mostrar",
 "set new password" => "Configurar nueva contraseña",
-"Default" => "Predeterminado",
-"Delete" => "Eliminar"
+"Default" => "Predeterminado"
 );
diff --git a/settings/l10n/es_AR.php b/settings/l10n/es_AR.php
index a33d9e8063d..b3788d49baa 100644
--- a/settings/l10n/es_AR.php
+++ b/settings/l10n/es_AR.php
@@ -1,6 +1,7 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "Imposible cargar la lista desde el App Store",
 "Authentication error" => "Error al autenticar",
+"Unable to change display name" => "No fue posible cambiar el nombre mostrado",
 "Group already exists" => "El grupo ya existe",
 "Unable to add group" => "No fue posible añadir el grupo",
 "Could not enable app. " => "No se puede  habilitar la aplicación.",
@@ -13,11 +14,60 @@
 "Admins can't remove themself from the admin group" => "Los administradores no se pueden quitar a ellos mismos del grupo administrador. ",
 "Unable to add user to group %s" => "No fue posible añadir el usuario al grupo %s",
 "Unable to remove user from group %s" => "No es posible eliminar al usuario del grupo %s",
+"Couldn't update app." => "No se pudo actualizar la aplicación.",
+"Update to {appversion}" => "Actualizado a {appversion}",
 "Disable" => "Desactivar",
 "Enable" => "Activar",
+"Please wait...." => "Por favor, esperá....",
+"Updating...." => "Actualizando....",
+"Error while updating app" => "Error al actualizar",
 "Error" => "Error",
+"Updated" => "Actualizado",
 "Saving..." => "Guardando...",
+"deleted" => "borrado",
+"undo" => "deshacer",
+"Unable to remove user" => "Imposible remover usuario",
+"Groups" => "Grupos",
+"Group Admin" => "Grupo Administrador",
+"Delete" => "Borrar",
+"add group" => "Agregar grupo",
+"A valid username must be provided" => "Debe ingresar un nombre de usuario válido",
+"Error creating user" => "Error creando usuario",
+"A valid password must be provided" => "Debe ingresar una contraseña válida",
 "__language_name__" => "Castellano (Argentina)",
+"Security Warning" => "Advertencia de seguridad",
+"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.",
+"Setup Warning" => "Alerta de Configuración",
+"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Tu servidor web no está configurado todavía para permitir sincronización de archivos porque la interfaz WebDAV parece no funcionar.",
+"Please double check the <a href='%s'>installation guides</a>." => "Por favor, comprobá nuevamente la <a href='%s'>guía de instalación</a>.",
+"Module 'fileinfo' missing" => "Modulo 'fileinfo' no existe",
+"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "El modulo PHP 'fileinfo' no existe. Es muy recomendable que active este modulo para obtener mejores resultados con la detección mime-type",
+"Locale not working" => "\"Locale\" no está funcionando",
+"This ownCloud server can't set system locale to %s. This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support %s." => "El servidor ownCloud no pude asignar la localización de sistema a %s. Esto puede hacer que hayan problemas con algunos caracteres en los nombres de los archivos. Te sugerimos que instales los paquetes necesarios en tu sistema para dar soporte a %s.",
+"Internet connection not working" => "La conexión a Internet no esta funcionando. ",
+"This ownCloud server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features of ownCloud." => "Este servidor ownCloud no tiene una conexión a internet que funcione. Esto significa que alguno de sus servicios como montar dispositivos externos, notificaciones de actualizaciones o instalar aplicaciones de otros desarrolladores no funcionan. Acceder a archivos remotos y mandar e-mails puede ser que tampoco funcione. Te sugerimos que actives una conexión a internet si querés estas características  de ownCloud.",
+"Cron" => "Cron",
+"Execute one task with each page loaded" => "Ejecute una tarea con cada pagina cargada.",
+"cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "cron.php está registrado como un servicio webcron. Llamar la página cron.php en la raíz de ownCloud una vez al minuto sobre http.",
+"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "Usa el servicio de sistema cron. Llama al archivo cron.php en la carpeta de ownCloud a través del sistema cronjob cada un minuto.",
+"Sharing" => "Compartiendo",
+"Enable Share API" => "Habilitar Share API",
+"Allow apps to use the Share API" => "Permitir a las aplicaciones usar la Share API",
+"Allow links" => "Permitir enlaces",
+"Allow users to share items to the public with links" => "Permitir a los usuarios compartir enlaces públicos",
+"Allow resharing" => "Permitir Re-Compartir",
+"Allow users to share items shared with them again" => "Permite a los usuarios volver a compartir items que le han compartido",
+"Allow users to share with anyone" => "Permitir a los usuarios compartir con todos.",
+"Allow users to only share with users in their groups" => "Permitir a los usuarios compartir solo con los de su propio grupo",
+"Security" => "Seguridad",
+"Enforce HTTPS" => "Forzar HTTPS",
+"Enforces the clients to connect to ownCloud via an encrypted connection." => "Forzar a los clientes conectar a ownCloud vía conexión encriptada",
+"Please connect to this ownCloud instance via HTTPS to enable or disable the SSL enforcement." => "Por favor conectese a este ownCloud vía HTTPS para habilitar o des-habilitar el forzado de SSL",
+"Log" => "Log",
+"Log level" => "Nivel de Log",
+"More" => "Más",
+"Version" => "Versión",
+"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Desarrollado por la <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunidad ownCloud</a>, el <a href=\"https://github.com/owncloud\" target=\"_blank\">código fuente</a> está bajo licencia <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
 "Add your App" => "Añadí tu aplicación",
 "More Apps" => "Más aplicaciones",
 "Select an App" => "Seleccionar una aplicación",
@@ -31,18 +81,18 @@
 "Bugtracker" => "Informar errores",
 "Commercial Support" => "Soporte comercial",
 "You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Usaste  <strong>%s</strong>  de los  <strong>%s</strong>  disponibles",
-"Clients" => "Clientes",
-"Download Desktop Clients" => "Descargar clientes de escritorio",
-"Download Android Client" => "Descargar cliente de Android",
-"Download iOS Client" => "Descargar cliente de iOS",
+"Get the apps to sync your files" => "Obtené aplicaciones para sincronizar tus archivos",
+"Show First Run Wizard again" => "Mostrar de nuevo el asistente de primera ejecución",
 "Password" => "Contraseña",
 "Your password was changed" => "Tu contraseña fue cambiada",
 "Unable to change your password" => "No fue posible cambiar tu contraseña",
 "Current password" => "Contraseña actual",
 "New password" => "Nueva contraseña:",
-"show" => "mostrar",
 "Change password" => "Cambiar contraseña",
 "Display Name" => "Nombre a mostrar",
+"Your display name was changed" => "El nombre mostrado fue cambiado",
+"Unable to change your display name" => "No fue posible cambiar tu nombre",
+"Change display name" => "Cambiar nombre",
 "Email" => "Correo electrónico",
 "Your email address" => "Tu dirección de e-mail",
 "Fill in an email address to enable password recovery" => "Escribí una dirección de correo electrónico para restablecer la contraseña",
@@ -50,16 +100,13 @@
 "Help translate" => "Ayudanos a traducir",
 "WebDAV" => "WebDAV",
 "Use this address to connect to your ownCloud in your file manager" => "Utiliza esta dirección para conectarte con ownCloud en tu Administrador de Archivos",
-"Version" => "Versión",
-"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Desarrollado por la <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunidad ownCloud</a>, el <a href=\"https://github.com/owncloud\" target=\"_blank\">código fuente</a> está bajo licencia <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
 "Login Name" => "Nombre de ",
-"Groups" => "Grupos",
 "Create" => "Crear",
 "Default Storage" => "Almacenamiento Predeterminado",
 "Unlimited" => "Ilimitado",
 "Other" => "Otro",
-"Group Admin" => "Grupo Administrador",
 "Storage" => "Almacenamiento",
-"Default" => "Predeterminado",
-"Delete" => "Borrar"
+"change display name" => "Cambiar el nombre que se muestra",
+"set new password" => "Configurar nueva contraseña",
+"Default" => "Predeterminado"
 );
diff --git a/settings/l10n/et_EE.php b/settings/l10n/et_EE.php
index df5b707fcd5..649e91c43a6 100644
--- a/settings/l10n/et_EE.php
+++ b/settings/l10n/et_EE.php
@@ -12,33 +12,63 @@
 "Invalid request" => "Vigane päring",
 "Unable to add user to group %s" => "Kasutajat ei saa lisada gruppi %s",
 "Unable to remove user from group %s" => "Kasutajat ei saa eemaldada grupist %s",
+"Couldn't update app." => "Rakenduse uuendamine ebaõnnestus.",
+"Update to {appversion}" => "Uuenda versioonile {appversion}",
 "Disable" => "Lülita välja",
 "Enable" => "Lülita sisse",
+"Please wait...." => "Palun oota...",
+"Updating...." => "Uuendamine...",
+"Error while updating app" => "Viga rakenduse uuendamisel",
 "Error" => "Viga",
+"Updated" => "Uuendatud",
 "Saving..." => "Salvestamine...",
+"deleted" => "kustutatud",
+"undo" => "tagasi",
+"Groups" => "Grupid",
+"Group Admin" => "Grupi admin",
+"Delete" => "Kustuta",
+"add group" => "lisa grupp",
+"Error creating user" => "Viga kasutaja loomisel",
 "__language_name__" => "Eesti",
+"Security Warning" => "Turvahoiatus",
+"Sharing" => "Jagamine",
+"Security" => "Turvalisus",
+"Enforce HTTPS" => "Sunni peale HTTPS-i kasutamine",
+"Log" => "Logi",
+"Log level" => "Logi tase",
+"More" => "Rohkem",
+"Version" => "Versioon",
 "Add your App" => "Lisa oma rakendus",
 "More Apps" => "Veel rakendusi",
 "Select an App" => "Vali programm",
 "See application page at apps.owncloud.com" => "Vaata rakenduste lehte aadressil apps.owncloud.com",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-litsenseeritud <span class=\"author\"></span>",
 "Update" => "Uuenda",
-"Clients" => "Kliendid",
+"User Documentation" => "Kasutaja dokumentatsioon",
+"Administrator Documentation" => "Administraatori dokumentatsioon",
+"Online Documentation" => "Online dokumentatsioon",
+"Forum" => "Foorum",
+"Bugtracker" => "Vigade nimekiri",
+"Commercial Support" => "Tasuine kasutajatugi",
 "Password" => "Parool",
 "Your password was changed" => "Sinu parooli on muudetud",
 "Unable to change your password" => "Sa ei saa oma parooli muuta",
 "Current password" => "Praegune parool",
 "New password" => "Uus parool",
-"show" => "näita",
 "Change password" => "Muuda parooli",
+"Display Name" => "Näidatav nimi",
+"Change display name" => "Muuda näidatavat nime",
 "Email" => "E-post",
 "Your email address" => "Sinu e-posti aadress",
 "Fill in an email address to enable password recovery" => "Parooli taastamise sisse lülitamiseks sisesta e-posti aadress",
 "Language" => "Keel",
 "Help translate" => "Aita tõlkida",
-"Groups" => "Grupid",
+"WebDAV" => "WebDAV",
+"Login Name" => "Kasutajanimi",
 "Create" => "Lisa",
+"Unlimited" => "Piiramatult",
 "Other" => "Muu",
-"Group Admin" => "Grupi admin",
-"Delete" => "Kustuta"
+"change display name" => "muuda näidatavat nime",
+"set new password" => "määra uus parool",
+"Default" => "Vaikeväärtus"
 );
diff --git a/settings/l10n/eu.php b/settings/l10n/eu.php
index 1be2c7940bc..410cb8336af 100644
--- a/settings/l10n/eu.php
+++ b/settings/l10n/eu.php
@@ -1,6 +1,7 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "Ezin izan da App Dendatik zerrenda kargatu",
 "Authentication error" => "Autentifikazio errorea",
+"Unable to change display name" => "Ezin izan da bistaratze izena aldatu",
 "Group already exists" => "Taldea dagoeneko existitzenda",
 "Unable to add group" => "Ezin izan da taldea gehitu",
 "Could not enable app. " => "Ezin izan da aplikazioa gaitu.",
@@ -13,11 +14,60 @@
 "Admins can't remove themself from the admin group" => "Kudeatzaileak ezin du bere burua kendu kudeatzaile taldetik",
 "Unable to add user to group %s" => "Ezin izan da erabiltzailea %s taldera gehitu",
 "Unable to remove user from group %s" => "Ezin izan da erabiltzailea %s taldetik ezabatu",
+"Couldn't update app." => "Ezin izan da aplikazioa eguneratu.",
+"Update to {appversion}" => "Eguneratu {appversion}-ra",
 "Disable" => "Ez-gaitu",
 "Enable" => "Gaitu",
+"Please wait...." => "Itxoin mesedez...",
+"Updating...." => "Eguneratzen...",
+"Error while updating app" => "Errorea aplikazioa eguneratzen zen bitartean",
 "Error" => "Errorea",
+"Updated" => "Eguneratuta",
 "Saving..." => "Gordetzen...",
+"deleted" => "ezabatuta",
+"undo" => "desegin",
+"Unable to remove user" => "Ezin izan da erabiltzailea aldatu",
+"Groups" => "Taldeak",
+"Group Admin" => "Talde administradorea",
+"Delete" => "Ezabatu",
+"add group" => "gehitu taldea",
+"A valid username must be provided" => "Baliozko erabiltzaile izena eman behar da",
+"Error creating user" => "Errore bat egon da erabiltzailea sortzean",
+"A valid password must be provided" => "Baliozko pasahitza eman behar da",
 "__language_name__" => "Euskera",
+"Security Warning" => "Segurtasun abisua",
+"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." => "Zure data karpeta eta zure fitxategiak internetetik zuzenean eskuragarri egon daitezke. ownCloudek emandako .htaccess fitxategia ez du bere lana egiten. Aholkatzen dizugu zure web zerbitzaria ongi konfiguratzea data karpeta eskuragarri ez izateko edo data karpeta web zerbitzariaren dokumentu errotik mugitzea.",
+"Setup Warning" => "Konfiguratu Abisuak",
+"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Zure web zerbitzaria ez dago oraindik ongi konfiguratuta fitxategien sinkronizazioa egiteko, WebDAV interfazea ongi ez dagoela dirudi.",
+"Please double check the <a href='%s'>installation guides</a>." => "Mesedez begiratu <a href='%s'>instalazio gidak</a>.",
+"Module 'fileinfo' missing" => "'fileinfo' Modulua falta da",
+"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "PHP 'fileinfo' modulua falta da. Modulu hau gaitzea aholkatzen dizugu mime-type ezberdinak hobe detektatzeko.",
+"Locale not working" => "Lokala ez dabil",
+"This ownCloud server can't set system locale to %s. This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support %s." => "OwnClud zerbitzari honek ezin du sistemaren lokala %s-ra ezarri. Honek fitxategien izenetan karaktere batzuekin arazoak egon daitekeela esan nahi du. Aholkatzen dizugu zure sistema %s lokalea onartzeko beharrezkoak diren paketeak instalatzea.",
+"Internet connection not working" => "Interneteko konexioak ez du funtzionatzen",
+"This ownCloud server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features of ownCloud." => "ownCloud zerbitzari honen interneteko konexioa ez dabil. Honek esan nahi du kanpoko biltegiratze zerbitzuak, eguneraketen informazioa edo bestelako aplikazioen instalazioa bezalako programek ez dutela funtzionatuko. Urrunetik fitxategiak eskuratzea eta e-postak bidaltzea ere ezinezkoa izan daiteke. onwCloud-en aukera guztiak erabili ahal izateko zerbitzari honetan interneteko konexioa gaitzea aholkatzen dizugu.",
+"Cron" => "Cron",
+"Execute one task with each page loaded" => "Exekutatu zeregin bat orri karga bakoitzean",
+"cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "cron.php webcron zerbitzu batean erregistratua dago. Deitu cron.php orria ownclouden erroan minuturo http bidez.",
+"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "Erabili sistemaren cron zerbitzua. Deitu cron.php fitxategia owncloud karpetan minuturo sistemaren cron lan baten bidez.",
+"Sharing" => "Partekatzea",
+"Enable Share API" => "Gaitu Elkarbanatze APIa",
+"Allow apps to use the Share API" => "Baimendu aplikazioak Elkarbanatze APIa erabiltzeko",
+"Allow links" => "Baimendu loturak",
+"Allow users to share items to the public with links" => "Baimendu erabiltzaileak loturen bidez fitxategiak publikoki elkarbanatzen",
+"Allow resharing" => "Baimendu birpartekatzea",
+"Allow users to share items shared with them again" => "Baimendu erabiltzaileak haiekin elkarbanatutako fitxategiak berriz ere elkarbanatzen",
+"Allow users to share with anyone" => "Baimendu erabiltzaileak edonorekin elkarbanatzen",
+"Allow users to only share with users in their groups" => "Baimendu erabiltzaileak bakarrik bere taldeko erabiltzaileekin elkarbanatzen",
+"Security" => "Segurtasuna",
+"Enforce HTTPS" => "Behartu HTTPS",
+"Enforces the clients to connect to ownCloud via an encrypted connection." => "Bezeroak konexio enkriptatu baten bidez ownCloud-era konektatzera behartzen du.",
+"Please connect to this ownCloud instance via HTTPS to enable or disable the SSL enforcement." => "Mesedez konektatu ownCloud honetara HTTPS bidez SSL-ren beharra gaitu edo ezgaitzeko",
+"Log" => "Egunkaria",
+"Log level" => "Erregistro maila",
+"More" => "Gehiago",
+"Version" => "Bertsioa",
+"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "<a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud komunitateak</a> garatuta, <a href=\"https://github.com/owncloud\" target=\"_blank\">itubruru kodea</a><a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr> lizentziarekin banatzen da</a>.",
 "Add your App" => "Gehitu zure aplikazioa",
 "More Apps" => "App gehiago",
 "Select an App" => "Aukeratu programa bat",
@@ -31,18 +81,18 @@
 "Bugtracker" => "Bugtracker",
 "Commercial Support" => "Babes komertziala",
 "You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Dagoeneko <strong>%s</strong> erabili duzu eskuragarri duzun <strong>%s</strong>etatik",
-"Clients" => "Bezeroak",
-"Download Desktop Clients" => "Deskargatu mahaigainerako bezeroak",
-"Download Android Client" => "Deskargatu Android bezeroa",
-"Download iOS Client" => "Deskargatu iOS bezeroa",
+"Get the apps to sync your files" => "Lortu aplikazioak zure fitxategiak sinkronizatzeko",
+"Show First Run Wizard again" => "Erakutsi berriz Lehenengo Aldiko Morroia",
 "Password" => "Pasahitza",
 "Your password was changed" => "Zere pasahitza aldatu da",
 "Unable to change your password" => "Ezin izan da zure pasahitza aldatu",
 "Current password" => "Uneko pasahitza",
 "New password" => "Pasahitz berria",
-"show" => "erakutsi",
 "Change password" => "Aldatu pasahitza",
 "Display Name" => "Bistaratze Izena",
+"Your display name was changed" => "Zure bistaratze izena aldatu da",
+"Unable to change your display name" => "Ezin izan da zure bistaratze izena aldatu",
+"Change display name" => "Aldatu bistaratze izena",
 "Email" => "E-Posta",
 "Your email address" => "Zure e-posta",
 "Fill in an email address to enable password recovery" => "Idatz ezazu e-posta bat pasahitza berreskuratu ahal izateko",
@@ -50,16 +100,13 @@
 "Help translate" => "Lagundu itzultzen",
 "WebDAV" => "WebDAV",
 "Use this address to connect to your ownCloud in your file manager" => "Erabili helbide hau zure fitxategi kudeatzailean zure ownCloudera konektatzeko",
-"Version" => "Bertsioa",
-"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "<a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud komunitateak</a> garatuta, <a href=\"https://github.com/owncloud\" target=\"_blank\">itubruru kodea</a><a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr> lizentziarekin banatzen da</a>.",
 "Login Name" => "Sarrera Izena",
-"Groups" => "Taldeak",
 "Create" => "Sortu",
 "Default Storage" => "Lehenetsitako Biltegiratzea",
 "Unlimited" => "Mugarik gabe",
 "Other" => "Besteak",
-"Group Admin" => "Talde administradorea",
 "Storage" => "Biltegiratzea",
-"Default" => "Lehenetsia",
-"Delete" => "Ezabatu"
+"change display name" => "aldatu bistaratze izena",
+"set new password" => "ezarri pasahitz berria",
+"Default" => "Lehenetsia"
 );
diff --git a/settings/l10n/fa.php b/settings/l10n/fa.php
index d4290f6dee7..d75efa85eba 100644
--- a/settings/l10n/fa.php
+++ b/settings/l10n/fa.php
@@ -1,6 +1,7 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "قادر به بارگذاری لیست از فروشگاه اپ نیستم",
 "Authentication error" => "خطا در اعتبار سنجی",
+"Unable to change display name" => "امکان تغییر نام نمایشی شما وجود ندارد",
 "Group already exists" => "این گروه در حال حاضر موجود است",
 "Unable to add group" => "افزودن گروه امکان پذیر نیست",
 "Email saved" => "ایمیل ذخیره شد",
@@ -9,6 +10,7 @@
 "Unable to delete user" => "حذف کاربر امکان پذیر نیست",
 "Language changed" => "زبان تغییر کرد",
 "Invalid request" => "درخواست غیر قابل قبول",
+"Admins can't remove themself from the admin group" => "مدیران نمی توانند خود را از گروه مدیریت حذف کنند",
 "Disable" => "غیرفعال",
 "Enable" => "فعال",
 "Please wait...." => "لطفا صبر کنید ...",
@@ -16,33 +18,46 @@
 "Error" => "خطا",
 "Updated" => "بروز رسانی انجام شد",
 "Saving..." => "درحال ذخیره ...",
+"deleted" => "حذف شده",
+"undo" => "بازگشت",
+"Groups" => "گروه ها",
+"Delete" => "پاک کردن",
 "__language_name__" => "__language_name__",
+"Security Warning" => "اخطار امنیتی",
+"More" => "بیش‌تر",
+"Version" => "نسخه",
 "Add your App" => "برنامه خود را بیافزایید",
 "More Apps" => "برنامه های بیشتر",
 "Select an App" => "یک برنامه انتخاب کنید",
 "See application page at apps.owncloud.com" => "صفحه این اٌپ را در apps.owncloud.com ببینید",
 "Update" => "به روز رسانی",
+"User Documentation" => "مستندات کاربر",
+"Administrator Documentation" => "مستندات مدیر",
 "Forum" => "انجمن",
-"Clients" => "مشتریان",
+"Commercial Support" => "پشتیبانی تجاری",
+"Show First Run Wizard again" => "راهبری کمکی اجرای اول را دوباره نمایش بده",
 "Password" => "گذرواژه",
 "Your password was changed" => "رمز عبور شما تغییر یافت",
 "Unable to change your password" => "ناتوان در تغییر گذرواژه",
 "Current password" => "گذرواژه کنونی",
 "New password" => "گذرواژه جدید",
-"show" => "نمایش",
 "Change password" => "تغییر گذر واژه",
+"Display Name" => "نام نمایشی",
+"Your display name was changed" => "نام نمایشی شما تغییر یافت",
+"Unable to change your display name" => "امکان تغییر نام نمایشی شما وجود ندارد",
+"Change display name" => "تغییر نام نمایشی",
 "Email" => "پست الکترونیکی",
 "Your email address" => "پست الکترونیکی شما",
 "Fill in an email address to enable password recovery" => "پست الکترونیکی را پرکنید  تا بازیابی گذرواژه فعال شود",
 "Language" => "زبان",
 "Help translate" => "به ترجمه آن کمک کنید",
-"Version" => "نسخه",
-"Groups" => "گروه ها",
+"Login Name" => "نام کاربری",
 "Create" => "ایجاد کردن",
 "Default Storage" => "ذخیره سازی پیش فرض",
 "Unlimited" => "نامحدود",
 "Other" => "سایر",
 "Storage" => "حافظه",
-"Default" => "پیش فرض",
-"Delete" => "پاک کردن"
+"change display name" => "تغییر نام نمایشی",
+"set new password" => "تنظیم کلمه عبور جدید",
+"Default" => "پیش فرض"
 );
diff --git a/settings/l10n/fi_FI.php b/settings/l10n/fi_FI.php
index 9f1feb74a11..ab43f61eeed 100644
--- a/settings/l10n/fi_FI.php
+++ b/settings/l10n/fi_FI.php
@@ -1,6 +1,7 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "Ei pystytä lataamaan listaa sovellusvarastosta (App Store)",
 "Authentication error" => "Todennusvirhe",
+"Unable to change display name" => "Näyttönimen muuttaminen epäonnistui",
 "Group already exists" => "Ryhmä on jo olemassa",
 "Unable to add group" => "Ryhmän lisäys epäonnistui",
 "Could not enable app. " => "Sovelluksen käyttöönotto epäonnistui.",
@@ -23,7 +24,38 @@
 "Error" => "Virhe",
 "Updated" => "Päivitetty",
 "Saving..." => "Tallennetaan...",
+"deleted" => "poistettu",
+"undo" => "kumoa",
+"Unable to remove user" => "Käyttäjän poistaminen ei onnistunut",
+"Groups" => "Ryhmät",
+"Group Admin" => "Ryhmän ylläpitäjä",
+"Delete" => "Poista",
+"add group" => "lisää ryhmä",
+"Error creating user" => "Virhe käyttäjää luotaessa",
 "__language_name__" => "_kielen_nimi_",
+"Security Warning" => "Turvallisuusvaroitus",
+"Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Data-kansio ja tiedostot ovat ehkä saavutettavissa Internetistä. .htaccess-tiedosto, jolla kontrolloidaan pääsyä, ei toimi. Suosittelemme, että muutat web-palvelimesi asetukset niin ettei data-kansio ole enää pääsyä tai siirrät data-kansion pois web-palvelimen tiedostojen juuresta.",
+"Please double check the <a href='%s'>installation guides</a>." => "Lue tarkasti <a href='%s'>asennusohjeet</a>.",
+"Module 'fileinfo' missing" => "Moduuli 'fileinfo' puuttuu",
+"Internet connection not working" => "Internet-yhteys ei toimi",
+"Cron" => "Cron",
+"Sharing" => "Jakaminen",
+"Enable Share API" => "Käytä jakamisen ohjelmointirajapintaa",
+"Allow apps to use the Share API" => "Salli sovellusten käyttää jakamisen ohjelmointirajapintaa",
+"Allow links" => "Salli linkit",
+"Allow users to share items to the public with links" => "Salli käyttäjien jakaa kohteita käyttäen linkkejä",
+"Allow resharing" => "Salli uudelleenjakaminen",
+"Allow users to share items shared with them again" => "Mahdollistaa käyttäjien jakavan uudelleen heidän kanssaan jaettuja kohteita",
+"Allow users to share with anyone" => "Salli käyttäjien jakaa kenen tahansa kanssa",
+"Allow users to only share with users in their groups" => "Salli jakaminen vain samoissa ryhmissä olevien käyttäjien kesken",
+"Security" => "Tietoturva",
+"Enforce HTTPS" => "Pakota HTTPS",
+"Enforces the clients to connect to ownCloud via an encrypted connection." => "Pakottaa salaamaan ownCloudiin kohdistuvat yhteydet.",
+"Log" => "Loki",
+"Log level" => "Lokitaso",
+"More" => "Enemmän",
+"Version" => "Versio",
+"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Kehityksestä on vastannut <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud-yhteisö</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">lähdekoodi</a> on julkaistu lisenssin <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> alaisena.",
 "Add your App" => "Lisää sovelluksesi",
 "More Apps" => "Lisää sovelluksia",
 "Select an App" => "Valitse sovellus",
@@ -37,18 +69,17 @@
 "Bugtracker" => "Ohjelmistovirheiden jäljitys",
 "Commercial Support" => "Kaupallinen tuki",
 "You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Käytössäsi on <strong>%s</strong>/<strong>%s</strong>",
-"Clients" => "Asiakkaat",
-"Download Desktop Clients" => "Lataa työpöytäsovelluksia",
-"Download Android Client" => "Lataa Android-sovellus",
-"Download iOS Client" => "Lataa iOS-sovellus",
+"Show First Run Wizard again" => "Näytä ensimmäisen käyttökerran avustaja uudelleen",
 "Password" => "Salasana",
 "Your password was changed" => "Salasanasi vaihdettiin",
 "Unable to change your password" => "Salasanaasi ei voitu vaihtaa",
 "Current password" => "Nykyinen salasana",
 "New password" => "Uusi salasana",
-"show" => "näytä",
 "Change password" => "Vaihda salasana",
 "Display Name" => "Näyttönimi",
+"Your display name was changed" => "Näyttönimesi muutettiin",
+"Unable to change your display name" => "Näyttönimen muuttaminen epäonnistui",
+"Change display name" => "Muuta näyttönimeä",
 "Email" => "Sähköposti",
 "Your email address" => "Sähköpostiosoitteesi",
 "Fill in an email address to enable password recovery" => "Anna sähköpostiosoitteesi, jotta unohdettu salasana on mahdollista palauttaa",
@@ -56,16 +87,11 @@
 "Help translate" => "Auta kääntämisessä",
 "WebDAV" => "WebDAV",
 "Use this address to connect to your ownCloud in your file manager" => "Käytä tätä osoitetta yhdistäessäsi ownCloudiisi tiedostonhallintaa käyttäen",
-"Version" => "Versio",
-"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Kehityksestä on vastannut <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud-yhteisö</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">lähdekoodi</a> on julkaistu lisenssin <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> alaisena.",
 "Login Name" => "Kirjautumisnimi",
-"Groups" => "Ryhmät",
 "Create" => "Luo",
 "Unlimited" => "Rajoittamaton",
 "Other" => "Muu",
-"Group Admin" => "Ryhmän ylläpitäjä",
 "change display name" => "vaihda näyttönimi",
 "set new password" => "aseta uusi salasana",
-"Default" => "Oletus",
-"Delete" => "Poista"
+"Default" => "Oletus"
 );
diff --git a/settings/l10n/fr.php b/settings/l10n/fr.php
index a47acb6435f..c5ad5642d11 100644
--- a/settings/l10n/fr.php
+++ b/settings/l10n/fr.php
@@ -24,7 +24,50 @@
 "Error" => "Erreur",
 "Updated" => "Mise à jour effectuée avec succès",
 "Saving..." => "Sauvegarde...",
+"deleted" => "supprimé",
+"undo" => "annuler",
+"Unable to remove user" => "Impossible de retirer l'utilisateur",
+"Groups" => "Groupes",
+"Group Admin" => "Groupe Admin",
+"Delete" => "Supprimer",
+"add group" => "ajouter un groupe",
+"A valid username must be provided" => "Un nom d'utilisateur valide doit être saisi",
+"Error creating user" => "Erreur lors de la création de l'utilisateur",
+"A valid password must be provided" => "Un mot de passe valide doit être saisi",
 "__language_name__" => "Français",
+"Security Warning" => "Avertissement de sécurité",
+"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.",
+"Setup Warning" => "Avertissement, problème de configuration",
+"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Votre serveur web, n'est pas correctement configuré pour permettre la synchronisation des fichiers, car l'interface WebDav ne fonctionne pas comme il faut.",
+"Please double check the <a href='%s'>installation guides</a>." => "Veuillez vous référer au <a href='%s'>guide d'installation</a>.",
+"Module 'fileinfo' missing" => "Module 'fileinfo' manquant",
+"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "Le module PHP 'fileinfo' est manquant. Il est vivement recommandé de l'activer afin d'obtenir de meilleurs résultats pour la détection des types de fichiers.",
+"Locale not working" => "Localisation non fonctionnelle",
+"This ownCloud server can't set system locale to %s. This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support %s." => "Ce serveur ownCloud ne peut pas ajuster la localisation du système en %s. Cela signifie qu'il pourra y avoir des problèmes avec certains caractères dans les noms de fichiers. Il est vivement recommandé d'installer les paquets requis pour le support de %s.",
+"Internet connection not working" => "La connexion internet ne fonctionne pas",
+"This ownCloud server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features of ownCloud." => "Ce serveur ownCloud ne peut pas se connecter à internet. Cela signifie que certaines fonctionnalités, telles que l'utilisation de supports de stockage distants, les notifications de mises à jour, ou l'installation d'applications tierces ne fonctionneront pas. L'accès aux fichiers à distance, ainsi que les notifications par mails ne marcheront pas non plus. Il est recommandé d'activer la connexion internet pour ce serveur si vous souhaitez utiliser toutes les fonctionnalités offertes par ownCloud.",
+"Cron" => "Cron",
+"Execute one task with each page loaded" => "Exécute une tâche à chaque chargement de page",
+"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 enregistré en tant que service webcron. Veuillez appeler la page cron.php située à la racine du serveur ownCoud via http toute les minutes.",
+"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "Utilise le service cron du système. Appelle le fichier cron.php du répertoire owncloud toutes les minutes grâce à une tâche cron du système.",
+"Sharing" => "Partage",
+"Enable Share API" => "Activer l'API de partage",
+"Allow apps to use the Share API" => "Autoriser les applications à utiliser l'API de partage",
+"Allow links" => "Autoriser les liens",
+"Allow users to share items to the public with links" => "Autoriser les utilisateurs à partager des éléments publiquement à l'aide de liens",
+"Allow resharing" => "Autoriser le repartage",
+"Allow users to share items shared with them again" => "Autoriser les utilisateurs à partager des éléments qui ont été partagés avec eux",
+"Allow users to share with anyone" => "Autoriser les utilisateurs à partager avec tout le monde",
+"Allow users to only share with users in their groups" => "Autoriser les utilisateurs à partager avec des utilisateurs de leur groupe uniquement",
+"Security" => "Sécurité",
+"Enforce HTTPS" => "Forcer HTTPS",
+"Enforces the clients to connect to ownCloud via an encrypted connection." => "Forcer les clients à se connecter à Owncloud via une connexion chiffrée.",
+"Please connect to this ownCloud instance via HTTPS to enable or disable the SSL enforcement." => "Merci de vous connecter à cette instance Owncloud en HTTPS pour activer ou désactiver SSL.",
+"Log" => "Log",
+"Log level" => "Niveau de log",
+"More" => "Plus",
+"Version" => "Version",
+"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Développé par la <a href=\"http://ownCloud.org/contact\" target=\"_blank\">communauté ownCloud</a>, le <a href=\"https://github.com/owncloud\" target=\"_blank\">code source</a> est publié sous license <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
 "Add your App" => "Ajoutez votre application",
 "More Apps" => "Plus d'applications…",
 "Select an App" => "Sélectionner une Application",
@@ -38,16 +81,13 @@
 "Bugtracker" => "Suivi de bugs",
 "Commercial Support" => "Support commercial",
 "You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Vous avez utilisé <strong>%s</strong> des <strong>%s<strong> disponibles",
-"Clients" => "Clients",
-"Download Desktop Clients" => "Télécharger le client de synchronisation pour votre ordinateur",
-"Download Android Client" => "Télécharger le client Android",
-"Download iOS Client" => "Télécharger le client iOS",
+"Get the apps to sync your files" => "Obtenez les applications de synchronisation de vos fichiers",
+"Show First Run Wizard again" => "Revoir le premier lancement de l'installeur",
 "Password" => "Mot de passe",
 "Your password was changed" => "Votre mot de passe a été changé",
 "Unable to change your password" => "Impossible de changer votre mot de passe",
 "Current password" => "Mot de passe actuel",
 "New password" => "Nouveau mot de passe",
-"show" => "Afficher",
 "Change password" => "Changer de mot de passe",
 "Display Name" => "Nom affiché",
 "Your display name was changed" => "Votre nom d'affichage a bien été modifié",
@@ -60,18 +100,13 @@
 "Help translate" => "Aidez à traduire",
 "WebDAV" => "WebDAV",
 "Use this address to connect to your ownCloud in your file manager" => "Utiliser cette adresse pour vous connecter à ownCloud dans votre gestionnaire de fichiers",
-"Version" => "Version",
-"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Développé par la <a href=\"http://ownCloud.org/contact\" target=\"_blank\">communauté ownCloud</a>, le <a href=\"https://github.com/owncloud\" target=\"_blank\">code source</a> est publié sous license <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
 "Login Name" => "Nom de la connexion",
-"Groups" => "Groupes",
 "Create" => "Créer",
 "Default Storage" => "Support de stockage par défaut",
 "Unlimited" => "Illimité",
 "Other" => "Autre",
-"Group Admin" => "Groupe Admin",
 "Storage" => "Support de stockage",
 "change display name" => "Changer le nom affiché",
 "set new password" => "Changer le mot de passe",
-"Default" => "Défaut",
-"Delete" => "Supprimer"
+"Default" => "Défaut"
 );
diff --git a/settings/l10n/gl.php b/settings/l10n/gl.php
index 997ac53de7e..4d629e06ccb 100644
--- a/settings/l10n/gl.php
+++ b/settings/l10n/gl.php
@@ -1,23 +1,73 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "Non foi posíbel cargar a lista desde a App Store",
 "Authentication error" => "Produciuse un erro de autenticación",
+"Unable to change display name" => "Non é posíbel cambiar o nome visíbel",
 "Group already exists" => "O grupo xa existe",
 "Unable to add group" => "Non é posíbel engadir o grupo",
 "Could not enable app. " => "Non é posíbel activar o aplicativo.",
 "Email saved" => "Correo gardado",
-"Invalid email" => "correo incorrecto",
+"Invalid email" => "Correo incorrecto",
 "Unable to delete group" => "Non é posíbel eliminar o grupo.",
 "Unable to delete user" => "Non é posíbel eliminar o usuario",
 "Language changed" => "O idioma cambiou",
 "Invalid request" => "Petición incorrecta",
-"Admins can't remove themself from the admin group" => "Os administradores non se pode eliminar a si mesmos do grupo admin",
+"Admins can't remove themself from the admin group" => "Os administradores non poden eliminarse a si mesmos do grupo admin",
 "Unable to add user to group %s" => "Non é posíbel engadir o usuario ao grupo %s",
 "Unable to remove user from group %s" => "Non é posíbel eliminar o usuario do grupo %s",
+"Couldn't update app." => "Non foi posíbel actualizar o aplicativo.",
+"Update to {appversion}" => "Actualizar á {appversion}",
 "Disable" => "Desactivar",
 "Enable" => "Activar",
+"Please wait...." => "Agarde...",
+"Updating...." => "Actualizando...",
+"Error while updating app" => "Produciuse un erro mentres actualizaba o aplicativo",
 "Error" => "Erro",
+"Updated" => "Actualizado",
 "Saving..." => "Gardando...",
+"deleted" => "eliminado",
+"undo" => "desfacer",
+"Unable to remove user" => "Non é posíbel retirar o usuario",
+"Groups" => "Grupos",
+"Group Admin" => "Grupo Admin",
+"Delete" => "Eliminar",
+"add group" => "engadir un grupo",
+"A valid username must be provided" => "Debe fornecer un nome de usuario",
+"Error creating user" => "Produciuse un erro ao crear o usuario",
+"A valid password must be provided" => "Debe fornecer un contrasinal",
 "__language_name__" => "Galego",
+"Security Warning" => "Aviso de seguranza",
+"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." => "O seu cartafol de datos e os seus ficheiros probabelmente sexan accesíbeis a través da Internet. O ficheiro .htaccess que fornece ownCloud non está a empregarse. Suxerímoslle que configure o seu servidor web de tal xeito que o cartafol de datos non estea accesíbel ou mova o cartafol de datos fora do directorio raíz de datos do servidor web.",
+"Setup Warning" => "Configurar os avisos",
+"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "O seu servidor web non está aínda configurado adecuadamente para permitir a sincronización de ficheiros xa que semella que a interface WebDAV non está a funcionar.",
+"Please double check the <a href='%s'>installation guides</a>." => "Volva comprobar as <a href='%s'>guías de instalación</a>",
+"Module 'fileinfo' missing" => "Non se atopou o módulo «fileinfo»",
+"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "Non se atopou o módulo de PHP «fileinfo». É recomendábel activar este módulo para obter os mellores resultados coa detección do tipo MIME.",
+"Locale not working" => "A configuración rexional non funciona",
+"This ownCloud server can't set system locale to %s. This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support %s." => "Este servidor ownCloud non pode estabelecer a configuración rexional do sistema a %s. Isto significa que pode haber problemas con certos caracteres nos nomes de ficheiro. Recomendámoslle que inste os paquetes necesarios no sistema para aceptar o %s.",
+"Internet connection not working" => "A conexión á Internet non funciona",
+"This ownCloud server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features of ownCloud." => "Este servidor ownCloud non ten conexión a Internet. Isto significa que algunhas das funcionalidades como a montaxe de almacenamento externo, as notificacións sobre actualizacións ou instalación de aplicativos de terceiros non funcionan. O acceso aos ficheiros de forma remota e o envío de mensaxes de notificación poderían non funcionar. Suxerímoslle que active a conexión a Internet deste servidor se quere dispor de todas as funcionalidades de ownCloud.",
+"Cron" => "Cron",
+"Execute one task with each page loaded" => "Executar unha tarefa con cada páxina cargada",
+"cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "cron.php está rexistrado nun servizo de WebCron. Chame á página cron.php na raíz ownCloud unha vez por minuto a través de HTTP.",
+"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "Use o servizo de sistema cron. Chame ao ficheiro cron.php no catfaol owncloud a través dun sistema de cronjob unna vez por minuto.",
+"Sharing" => "Compartindo",
+"Enable Share API" => "Activar o API para compartir",
+"Allow apps to use the Share API" => "Permitir que os aplicativos empreguen o API para compartir",
+"Allow links" => "Permitir ligazóns",
+"Allow users to share items to the public with links" => "Permitir que os usuarios compartan elementos ao público con ligazóns",
+"Allow resharing" => "Permitir compartir",
+"Allow users to share items shared with them again" => "Permitir que os usuarios compartan de novo os elementos compartidos con eles",
+"Allow users to share with anyone" => "Permitir que os usuarios compartan con calquera",
+"Allow users to only share with users in their groups" => "Permitir que os usuarios compartan só cos usuarios dos seus grupos",
+"Security" => "Seguranza",
+"Enforce HTTPS" => "Forzar HTTPS",
+"Enforces the clients to connect to ownCloud via an encrypted connection." => "Forzar que os clientes se conecten a ownCloud empregando unha conexión cifrada",
+"Please connect to this ownCloud instance via HTTPS to enable or disable the SSL enforcement." => "Conectese a esta instancia ownCloud empregando HTTPS para activar ou desactivar o forzado de SSL.",
+"Log" => "Rexistro",
+"Log level" => "Nivel de rexistro",
+"More" => "Máis",
+"Version" => "Versión",
+"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Desenvolvido pola <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunidade ownCloud</a>, o <a href=\"https://github.com/owncloud\" target=\"_blank\">código fonte</a> está baixo a licenza <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
 "Add your App" => "Engada o seu aplicativo",
 "More Apps" => "Máis aplicativos",
 "Select an App" => "Escolla un aplicativo",
@@ -30,18 +80,19 @@
 "Forum" => "Foro",
 "Bugtracker" => "Seguemento de fallos",
 "Commercial Support" => "Asistencia comercial",
-"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Te en uso <strong>%s</strong> do total dispoñíbel de <strong>%s</strong>",
-"Clients" => "Clientes",
-"Download Desktop Clients" => "Descargar clientes para escritorio",
-"Download Android Client" => "Descargar clientes para Android",
-"Download iOS Client" => "Descargar clientes ra iOS",
+"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Ten en uso <strong>%s</strong> do total dispoñíbel de <strong>%s</strong>",
+"Get the apps to sync your files" => "Obteña os aplicativos para sincronizar os seus ficheiros",
+"Show First Run Wizard again" => "Amosar o axudante da primeira execución outra vez",
 "Password" => "Contrasinal",
 "Your password was changed" => "O seu contrasinal foi cambiado",
 "Unable to change your password" => "Non é posíbel cambiar o seu contrasinal",
 "Current password" => "Contrasinal actual",
 "New password" => "Novo contrasinal",
-"show" => "amosar",
 "Change password" => "Cambiar o contrasinal",
+"Display Name" => "Amosar o nome",
+"Your display name was changed" => "O seu nome visíbel foi cambiado",
+"Unable to change your display name" => "Non é posíbel cambiar o seu nome visíbel",
+"Change display name" => "Cambiar o nome visíbel",
 "Email" => "Correo",
 "Your email address" => "O seu enderezo de correo",
 "Fill in an email address to enable password recovery" => "Escriba un enderezo de correo para activar a recuperación do contrasinal",
@@ -49,15 +100,13 @@
 "Help translate" => "Axude na tradución",
 "WebDAV" => "WebDAV",
 "Use this address to connect to your ownCloud in your file manager" => "Utilice este enderezo para conectarse ao seu ownCloud co administrador de ficheiros",
-"Version" => "Versión",
-"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Desenvolvido pola <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunidade ownCloud</a>, o <a href=\"https://github.com/owncloud\" target=\"_blank\">código fonte</a> está baixo a licenza <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
-"Groups" => "Grupos",
+"Login Name" => "Nome de acceso",
 "Create" => "Crear",
 "Default Storage" => "Almacenamento predeterminado",
 "Unlimited" => "Sen límites",
 "Other" => "Outro",
-"Group Admin" => "Grupo Admin",
 "Storage" => "Almacenamento",
-"Default" => "Predeterminado",
-"Delete" => "Eliminar"
+"change display name" => "cambiar o nome visíbel",
+"set new password" => "estabelecer un novo contrasinal",
+"Default" => "Predeterminado"
 );
diff --git a/settings/l10n/he.php b/settings/l10n/he.php
index be776d4fa2e..196dc4d146f 100644
--- a/settings/l10n/he.php
+++ b/settings/l10n/he.php
@@ -17,7 +17,16 @@
 "Enable" => "הפעל",
 "Error" => "שגיאה",
 "Saving..." => "שומר..",
+"undo" => "ביטול",
+"Groups" => "קבוצות",
+"Group Admin" => "מנהל הקבוצה",
+"Delete" => "מחיקה",
 "__language_name__" => "עברית",
+"Security Warning" => "אזהרת אבטחה",
+"Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "יתכן שתיקיית הנתונים והקבצים שלך נגישים דרך האינטרנט. קובץ ה־‎.htaccess שמסופק על ידי ownCloud כנראה אינו עובד. אנו ממליצים בחום להגדיר את שרת האינטרנט שלך בדרך שבה תיקיית הנתונים לא תהיה זמינה עוד או להעביר את תיקיית הנתונים מחוץ לספריית העל של שרת האינטרנט.",
+"More" => "יותר",
+"Version" => "גרסא",
+"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "פותח על די <a href=\"http://ownCloud.org/contact\" target=\"_blank\">קהילתownCloud</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">קוד המקור</a> מוגן ברישיון <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
 "Add your App" => "הוספת היישום שלך",
 "More Apps" => "יישומים נוספים",
 "Select an App" => "בחירת יישום",
@@ -30,16 +39,12 @@
 "Forum" => "פורום",
 "Commercial Support" => "תמיכה בתשלום",
 "You have used <strong>%s</strong> of the available <strong>%s</strong>" => "השתמשת ב־<strong>%s</strong> מתוך <strong>%s</strong> הזמינים לך",
-"Clients" => "לקוחות",
-"Download Desktop Clients" => "הורד לתוכנה למחשב",
-"Download Android Client" => "הורד תוכנה לאנדרואיד",
-"Download iOS Client" => "הורד תוכנה לiOS",
+"Get the apps to sync your files" => "השג את האפליקציות על מנת לסנכרן את הקבצים שלך",
 "Password" => "ססמה",
 "Your password was changed" => "הססמה שלך הוחלפה",
 "Unable to change your password" => "לא ניתן לשנות את הססמה שלך",
 "Current password" => "ססמה נוכחית",
 "New password" => "ססמה חדשה",
-"show" => "הצגה",
 "Change password" => "שינוי ססמה",
 "Email" => "דוא״ל",
 "Your email address" => "כתובת הדוא״ל שלך",
@@ -47,11 +52,6 @@
 "Language" => "פה",
 "Help translate" => "עזרה בתרגום",
 "Use this address to connect to your ownCloud in your file manager" => "השתמש בכתובת זאת על מנת להתחבר אל ownCloud דרך סייר קבצים.",
-"Version" => "גרסא",
-"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "פותח על די <a href=\"http://ownCloud.org/contact\" target=\"_blank\">קהילתownCloud</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">קוד המקור</a> מוגן ברישיון <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
-"Groups" => "קבוצות",
 "Create" => "יצירה",
-"Other" => "אחר",
-"Group Admin" => "מנהל הקבוצה",
-"Delete" => "מחיקה"
+"Other" => "אחר"
 );
diff --git a/settings/l10n/hr.php b/settings/l10n/hr.php
index f55cdcc687a..013cce38908 100644
--- a/settings/l10n/hr.php
+++ b/settings/l10n/hr.php
@@ -9,25 +9,25 @@
 "Enable" => "Uključi",
 "Error" => "Greška",
 "Saving..." => "Spremanje...",
+"deleted" => "izbrisano",
+"undo" => "vrati",
+"Groups" => "Grupe",
+"Group Admin" => "Grupa Admin",
+"Delete" => "Obriši",
 "__language_name__" => "__ime_jezika__",
 "Add your App" => "Dodajte vašu aplikaciju",
 "Select an App" => "Odaberite Aplikaciju",
 "See application page at apps.owncloud.com" => "Pogledajte stranicu s aplikacijama na apps.owncloud.com",
-"Clients" => "Klijenti",
 "Password" => "Lozinka",
 "Unable to change your password" => "Nemoguće promijeniti lozinku",
 "Current password" => "Trenutna lozinka",
 "New password" => "Nova lozinka",
-"show" => "prikaz",
 "Change password" => "Izmjena lozinke",
 "Email" => "e-mail adresa",
 "Your email address" => "Vaša e-mail adresa",
 "Fill in an email address to enable password recovery" => "Ispunite vase e-mail adresa kako bi se omogućilo oporavak lozinke",
 "Language" => "Jezik",
 "Help translate" => "Pomoć prevesti",
-"Groups" => "Grupe",
 "Create" => "Izradi",
-"Other" => "ostali",
-"Group Admin" => "Grupa Admin",
-"Delete" => "Obriši"
+"Other" => "ostali"
 );
diff --git a/settings/l10n/hu_HU.php b/settings/l10n/hu_HU.php
index 23d6c3f5f78..4d5f9e0dbce 100644
--- a/settings/l10n/hu_HU.php
+++ b/settings/l10n/hu_HU.php
@@ -1,6 +1,7 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "Nem tölthető le a lista az App Store-ból",
 "Authentication error" => "Azonosítási hiba",
+"Unable to change display name" => "Nem sikerült megváltoztatni a megjelenítési nevet",
 "Group already exists" => "A csoport már létezik",
 "Unable to add group" => "A csoport nem hozható létre",
 "Could not enable app. " => "A program nem aktiválható.",
@@ -13,11 +14,60 @@
 "Admins can't remove themself from the admin group" => "Adminisztrátorok nem távolíthatják el magukat az admin csoportból.",
 "Unable to add user to group %s" => "A felhasználó nem adható hozzá ehhez a csoporthoz: %s",
 "Unable to remove user from group %s" => "A felhasználó nem távolítható el ebből a csoportból: %s",
+"Couldn't update app." => "A program frissítése nem sikerült.",
+"Update to {appversion}" => "Frissítés erre a verzióra: {appversion}",
 "Disable" => "Letiltás",
 "Enable" => "Engedélyezés",
+"Please wait...." => "Kérem várjon...",
+"Updating...." => "Frissítés folyamatban...",
+"Error while updating app" => "Hiba történt a programfrissítés közben",
 "Error" => "Hiba",
+"Updated" => "Frissítve",
 "Saving..." => "Mentés...",
+"deleted" => "törölve",
+"undo" => "visszavonás",
+"Unable to remove user" => "A felhasználót nem sikerült eltávolítáni",
+"Groups" => "Csoportok",
+"Group Admin" => "Csoportadminisztrátor",
+"Delete" => "Törlés",
+"add group" => "csoport hozzáadása",
+"A valid username must be provided" => "Érvényes felhasználónevet kell megadnia",
+"Error creating user" => "A felhasználó nem hozható létre",
+"A valid password must be provided" => "Érvényes jelszót kell megadnia",
 "__language_name__" => "__language_name__",
+"Security Warning" => "Biztonsági figyelmeztetés",
+"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." => "Az adatkönytára és az itt levő fájlok valószínűleg elérhetők az internetről. Az ownCloud által beillesztett .htaccess fájl nem működik. Nagyon fontos, hogy a webszervert úgy konfigurálja, hogy az adatkönyvtár nem legyen közvetlenül kívülről elérhető, vagy az adatkönyvtárt tegye a webszerver dokumentumfáján kívülre.",
+"Setup Warning" => "A beállítással kapcsolatos figyelmeztetés",
+"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Az Ön webkiszolgálója nincs megfelelően beállítva az állományok szinkronizálásához, mert a WebDAV-elérés úgy tűnik, nem működik.",
+"Please double check the <a href='%s'>installation guides</a>." => "Kérjük tüzetesen tanulmányozza át a <a href='%s'>telepítési útmutatót</a>.",
+"Module 'fileinfo' missing" => "A 'fileinfo' modul hiányzik",
+"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "A 'fileinfo' PHP modul hiányzik. Erősen javasolt ennek a modulnak az telepítése, ha az ember jó eredményt szeretne a MIME-típusok felismerésében.",
+"Locale not working" => "A nyelvi lokalizáció nem működik",
+"This ownCloud server can't set system locale to %s. This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support %s." => "Ezen az ownCloud kiszolgálón nem használható a %s nyelvi beállítás. Ez azt jelenti, hogy a fájlnevekben gond lehet bizonyos karakterekkel. Nyomatékosan ajánlott, hogy telepítse a szükséges csomagokat annak érdekében, hogy a rendszer támogassa a %s beállítást.",
+"Internet connection not working" => "Az internet kapcsolat nem működik",
+"This ownCloud server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features of ownCloud." => "Az ownCloud kiszolgálónak nincs internet kapcsolata. Ez azt jelenti, hogy bizonyos dolgok nem fognak működni, pl. külső tárolók csatolása, programfrissítésekről való értesítések, vagy külső fejlesztői modulok telepítése. Lehet, hogy az állományok távolról történő elérése, ill. az email értesítések sem fog működni. Javasoljuk, hogy engedélyezze az internet kapcsolatot a kiszolgáló számára, ha az ownCloud összes szolgáltatását szeretné használni.",
+"Cron" => "Ütemezett feladatok",
+"Execute one task with each page loaded" => "Egy-egy feladat végrehajtása minden alkalommal, amikor egy weboldalt letöltenek",
+"cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "A cron.php webcron szolgáltatásként van regisztrálva. Hívja meg az owncloud könyvtárban levő cron.php állományt http-n keresztül percenként egyszer.",
+"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "A rendszer cron szolgáltatásának használata. Hívja meg az owncloud könyvtárban levő  cron.php állományt percenként egyszer a rendszer cron szolgáltatásának segítségével.",
+"Sharing" => "Megosztás",
+"Enable Share API" => "A megosztás API-jának engedélyezése",
+"Allow apps to use the Share API" => "Lehetővé teszi, hogy a programmodulok is használhassák a megosztást",
+"Allow links" => "Linkek engedélyezése",
+"Allow users to share items to the public with links" => "Lehetővé teszi, hogy a felhasználók linkek segítségével külsősökkel is megoszthassák az adataikat",
+"Allow resharing" => "A továbbosztás engedélyezése",
+"Allow users to share items shared with them again" => "Lehetővé teszi, hogy a felhasználók a velük megosztott állományokat megosszák egy további, harmadik féllel",
+"Allow users to share with anyone" => "A felhasználók bárkivel megoszthatják állományaikat",
+"Allow users to only share with users in their groups" => "A felhasználók csak olyanokkal oszthatják meg állományaikat, akikkel közös csoportban vannak",
+"Security" => "Biztonság",
+"Enforce HTTPS" => "Kötelező HTTPS",
+"Enforces the clients to connect to ownCloud via an encrypted connection." => "Kötelezővé teszi, hogy a böngészőprogramok titkosított csatornán kapcsolódjanak az ownCloud szolgáltatáshoz.",
+"Please connect to this ownCloud instance via HTTPS to enable or disable the SSL enforcement." => "Kérjük, hogy HTTPS protokollt használjon, ha be vagy ki  akarja kapcsolni a kötelező SSL beállítást.",
+"Log" => "Naplózás",
+"Log level" => "Naplózási szint",
+"More" => "Több",
+"Version" => "Verzió",
+"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "A programot az <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud közösség</a> fejleszti. A <a href=\"https://github.com/owncloud\" target=\"_blank\">forráskód</a> az <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> feltételei mellett használható föl.",
 "Add your App" => "Az alkalmazás hozzáadása",
 "More Apps" => "További alkalmazások",
 "Select an App" => "Válasszon egy alkalmazást",
@@ -31,17 +81,18 @@
 "Bugtracker" => "Hibabejelentések",
 "Commercial Support" => "Megvásárolható támogatás",
 "You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Az Ön tárterület-felhasználása jelenleg: <strong>%s</strong>. Maximálisan ennyi áll rendelkezésére: <strong>%s</strong>",
-"Clients" => "Kliensek",
-"Download Desktop Clients" => "Desktop kliensprogramok letöltése",
-"Download Android Client" => "Android kliens letöltése",
-"Download iOS Client" => "iOS kliens letöltése",
+"Get the apps to sync your files" => "Töltse le az állományok szinkronizációjához szükséges programokat",
+"Show First Run Wizard again" => "Nézzük meg újra az első bejelentkezéskori segítséget!",
 "Password" => "Jelszó",
 "Your password was changed" => "A jelszava megváltozott",
 "Unable to change your password" => "A jelszó nem változtatható meg",
 "Current password" => "A jelenlegi jelszó",
 "New password" => "Az új jelszó",
-"show" => "lássam",
 "Change password" => "A jelszó megváltoztatása",
+"Display Name" => "A megjelenített név",
+"Your display name was changed" => "Az Ön megjelenítési neve megváltozott",
+"Unable to change your display name" => "Nem sikerült megváltoztatni az Ön megjelenítési nevét",
+"Change display name" => "A megjelenítési név módosítása",
 "Email" => "Email",
 "Your email address" => "Az Ön email címe",
 "Fill in an email address to enable password recovery" => "Adja meg az email címét, hogy jelszó-emlékeztetőt kérhessen, ha elfelejtette a jelszavát!",
@@ -49,15 +100,13 @@
 "Help translate" => "Segítsen a fordításban!",
 "WebDAV" => "WebDAV",
 "Use this address to connect to your ownCloud in your file manager" => "Ennek a címnek a megadásával a WebDAV-protokollon keresztül saját gépének fájlkezelőjével is is elérheti az állományait.",
-"Version" => "Verzió",
-"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "A programot az <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud közösség</a> fejleszti. A <a href=\"https://github.com/owncloud\" target=\"_blank\">forráskód</a> az <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> feltételei mellett használható föl.",
-"Groups" => "Csoportok",
+"Login Name" => "Bejelentkezési név",
 "Create" => "Létrehozás",
 "Default Storage" => "Alapértelmezett tárhely",
 "Unlimited" => "Korlátlan",
 "Other" => "Más",
-"Group Admin" => "Csoportadminisztrátor",
 "Storage" => "Tárhely",
-"Default" => "Alapértelmezett",
-"Delete" => "Törlés"
+"change display name" => "a megjelenített név módosítása",
+"set new password" => "új jelszó beállítása",
+"Default" => "Alapértelmezett"
 );
diff --git a/settings/l10n/hy.php b/settings/l10n/hy.php
new file mode 100644
index 00000000000..9a9e46085ef
--- /dev/null
+++ b/settings/l10n/hy.php
@@ -0,0 +1,4 @@
+<?php $TRANSLATIONS = array(
+"Delete" => "Ջնջել",
+"Other" => "Այլ"
+);
diff --git a/settings/l10n/ia.php b/settings/l10n/ia.php
index fe26eea5e28..6e7feaf378c 100644
--- a/settings/l10n/ia.php
+++ b/settings/l10n/ia.php
@@ -1,23 +1,21 @@
 <?php $TRANSLATIONS = array(
 "Language changed" => "Linguage cambiate",
 "Invalid request" => "Requesta invalide",
+"Groups" => "Gruppos",
+"Delete" => "Deler",
 "__language_name__" => "Interlingua",
 "Add your App" => "Adder tu application",
 "Select an App" => "Selectionar un app",
 "Update" => "Actualisar",
-"Clients" => "Clientes",
 "Password" => "Contrasigno",
 "Unable to change your password" => "Non pote cambiar tu contrasigno",
 "Current password" => "Contrasigno currente",
 "New password" => "Nove contrasigno",
-"show" => "monstrar",
 "Change password" => "Cambiar contrasigno",
 "Email" => "E-posta",
 "Your email address" => "Tu adresse de e-posta",
 "Language" => "Linguage",
 "Help translate" => "Adjuta a traducer",
-"Groups" => "Gruppos",
 "Create" => "Crear",
-"Other" => "Altere",
-"Delete" => "Deler"
+"Other" => "Altere"
 );
diff --git a/settings/l10n/id.php b/settings/l10n/id.php
index 181450e58ba..7f53a50b248 100644
--- a/settings/l10n/id.php
+++ b/settings/l10n/id.php
@@ -8,26 +8,29 @@
 "Enable" => "Aktifkan",
 "Error" => "kesalahan",
 "Saving..." => "Menyimpan...",
+"deleted" => "dihapus",
+"undo" => "batal dikerjakan",
+"Groups" => "Group",
+"Group Admin" => "Admin Grup",
+"Delete" => "Hapus",
 "__language_name__" => "__language_name__",
+"Security Warning" => "peringatan keamanan",
+"More" => "lagi",
 "Add your App" => "Tambahkan App anda",
 "Select an App" => "Pilih satu aplikasi",
 "See application page at apps.owncloud.com" => "Lihat halaman aplikasi di apps.owncloud.com",
 "Update" => "Pembaruan",
-"Clients" => "Klien",
+"Get the apps to sync your files" => "Dapatkan aplikasi untuk sinkronisasi berkas anda",
 "Password" => "Password",
 "Unable to change your password" => "Tidak dapat merubah password anda",
 "Current password" => "Password saat ini",
 "New password" => "kata kunci baru",
-"show" => "perlihatkan",
 "Change password" => "Rubah password",
 "Email" => "Email",
 "Your email address" => "Alamat email anda",
 "Fill in an email address to enable password recovery" => "Masukkan alamat email untuk mengaktifkan pemulihan password",
 "Language" => "Bahasa",
 "Help translate" => "Bantu menerjemahkan",
-"Groups" => "Group",
 "Create" => "Buat",
-"Other" => "Lain-lain",
-"Group Admin" => "Admin Grup",
-"Delete" => "Hapus"
+"Other" => "Lain-lain"
 );
diff --git a/settings/l10n/is.php b/settings/l10n/is.php
index 75f46a01925..e5c6e9f6347 100644
--- a/settings/l10n/is.php
+++ b/settings/l10n/is.php
@@ -17,7 +17,16 @@
 "Enable" => "Virkja",
 "Error" => "Villa",
 "Saving..." => "Er að vista ...",
+"undo" => "afturkalla",
+"Groups" => "Hópar",
+"Group Admin" => "Hópstjóri",
+"Delete" => "Eyða",
 "__language_name__" => "__nafn_tungumáls__",
+"Security Warning" => "Öryggis aðvörun",
+"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." => "Gagnamappan þín er að öllum líkindum aðgengileg frá internetinu. Skráin .htaccess sem fylgir með ownCloud er ekki að virka. Við mælum eindregið með því að þú stillir vefþjóninn þannig að gagnamappan verði ekki aðgengileg frá internetinu eða færir hana út fyrir vefrótina.",
+"More" => "Meira",
+"Version" => "Útgáfa",
+"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Þróað af <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud samfélaginu</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">forrita kóðinn</a> er skráðu með <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
 "Add your App" => "Bæta við forriti",
 "More Apps" => "Fleiri forrit",
 "Select an App" => "Veldu forrit",
@@ -31,16 +40,11 @@
 "Bugtracker" => "Villubókhald",
 "Commercial Support" => "Borgaður stuðningur",
 "You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Þú hefur notað <strong>%s</strong> af tiltæku <strong>%s</strong>",
-"Clients" => "Notendahugbúnaður",
-"Download Desktop Clients" => "Hlaða niður notendahugbúnaði",
-"Download Android Client" => "Hlaða niður Andoid hugbúnaði",
-"Download iOS Client" => "Hlaða niður iOS hugbúnaði",
 "Password" => "Lykilorð",
 "Your password was changed" => "Lykilorði þínu hefur verið breytt",
 "Unable to change your password" => "Ekki tókst að breyta lykilorðinu þínu",
 "Current password" => "Núverandi lykilorð",
 "New password" => "Nýtt lykilorð",
-"show" => "sýna",
 "Change password" => "Breyta lykilorði",
 "Email" => "Netfang",
 "Your email address" => "Netfangið þitt",
@@ -49,15 +53,10 @@
 "Help translate" => "Hjálpa við þýðingu",
 "WebDAV" => "WebDAV",
 "Use this address to connect to your ownCloud in your file manager" => "Notaðu þessa vefslóð til að tengjast ownCloud svæðinu þínu",
-"Version" => "Útgáfa",
-"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Þróað af <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud samfélaginu</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">forrita kóðinn</a> er skráðu með <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
-"Groups" => "Hópar",
 "Create" => "Búa til",
 "Default Storage" => "Sjálfgefin gagnageymsla",
 "Unlimited" => "Ótakmarkað",
 "Other" => "Annað",
-"Group Admin" => "Hópstjóri",
 "Storage" => "gagnapláss",
-"Default" => "Sjálfgefið",
-"Delete" => "Eyða"
+"Default" => "Sjálfgefið"
 );
diff --git a/settings/l10n/it.php b/settings/l10n/it.php
index 7f860f69edc..699ded137a6 100644
--- a/settings/l10n/it.php
+++ b/settings/l10n/it.php
@@ -24,7 +24,50 @@
 "Error" => "Errore",
 "Updated" => "Aggiornato",
 "Saving..." => "Salvataggio in corso...",
+"deleted" => "eliminati",
+"undo" => "annulla",
+"Unable to remove user" => "Impossibile rimuovere l'utente",
+"Groups" => "Gruppi",
+"Group Admin" => "Gruppi amministrati",
+"Delete" => "Elimina",
+"add group" => "aggiungi gruppo",
+"A valid username must be provided" => "Deve essere fornito un nome utente valido",
+"Error creating user" => "Errore durante la creazione dell'utente",
+"A valid password must be provided" => "Deve essere fornita una password valida",
 "__language_name__" => "Italiano",
+"Security Warning" => "Avviso di sicurezza",
+"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.",
+"Setup Warning" => "Avviso di configurazione",
+"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Il tuo server web non è configurato correttamente per consentire la sincronizzazione dei file poiché l'interfaccia WebDAV sembra essere danneggiata.",
+"Please double check the <a href='%s'>installation guides</a>." => "Leggi attentamente le <a href='%s'>guide d'installazione</a>.",
+"Module 'fileinfo' missing" => "Modulo 'fileinfo' mancante",
+"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "Il modulo PHP 'fileinfo' non è presente. Consigliamo vivamente di abilitare questo modulo per ottenere risultati migliori con il rilevamento dei tipi MIME.",
+"Locale not working" => "Locale non funzionante",
+"This ownCloud server can't set system locale to %s. This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support %s." => "Questo server ownCloud non può impostare la localizzazione a %s. Ciò significa che potrebbero esserci problemi con alcuni caratteri nei nomi dei file. Consigliamo vivamente di installare i pacchetti richiesti sul sistema per supportare %s.",
+"Internet connection not working" => "Concessione Internet non funzionante",
+"This ownCloud server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features of ownCloud." => "Questo server ownCloud non ha una connessione a Internet funzionante. Ciò significa che alcune delle funzionalità come il montaggio di archivi esterni, le notifiche degli aggiornamenti o l'installazione di applicazioni di terze parti non funzioneranno. Anche l'accesso remoto ai file e l'invio di email di notifica potrebbero non funzionare. Ti suggeriamo di abilitare la connessione a Internet del server se desideri disporre di tutte le funzionalità di ownCloud.",
+"Cron" => "Cron",
+"Execute one task with each page loaded" => "Esegui un'operazione con ogni pagina caricata",
+"cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "cron.php è registrato su un sevizio webcron. Invoca la pagina cron.php nella radice di ownCloud ogni minuto, tramite http.",
+"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "Utilizza il servizio cron di sistema. Invoca il file cron.php nella cartella di ownCloud tramite un job ogni minuto.",
+"Sharing" => "Condivisione",
+"Enable Share API" => "Abilita API di condivisione",
+"Allow apps to use the Share API" => "Consenti alle applicazioni di utilizzare le API di condivisione",
+"Allow links" => "Consenti collegamenti",
+"Allow users to share items to the public with links" => "Consenti agli utenti di condividere pubblicamente elementi tramite collegamenti",
+"Allow resharing" => "Consenti la ri-condivisione",
+"Allow users to share items shared with them again" => "Consenti agli utenti di condividere a loro volta elementi condivisi da altri",
+"Allow users to share with anyone" => "Consenti agli utenti di condividere con chiunque",
+"Allow users to only share with users in their groups" => "Consenti agli utenti di condividere solo con utenti dei loro gruppi",
+"Security" => "Protezione",
+"Enforce HTTPS" => "Forza HTTPS",
+"Enforces the clients to connect to ownCloud via an encrypted connection." => "Obbliga i client a connettersi a ownCloud tramite una confessione cifrata.",
+"Please connect to this ownCloud instance via HTTPS to enable or disable the SSL enforcement." => "Connettiti a questa istanza di ownCloud tramite HTTPS per abilitare o disabilitare la protezione SSL.",
+"Log" => "Log",
+"Log level" => "Livello di log",
+"More" => "Più",
+"Version" => "Versione",
+"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Sviluppato dalla <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunità di ownCloud</a>, il <a href=\"https://github.com/owncloud\" target=\"_blank\">codice sorgente</a> è rilasciato nei termini della licenza <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",
@@ -38,16 +81,13 @@
 "Bugtracker" => "Sistema di tracciamento bug",
 "Commercial Support" => "Supporto commerciale",
 "You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Hai utilizzato <strong>%s</strong> dei <strong>%s</strong> disponibili",
-"Clients" => "Client",
-"Download Desktop Clients" => "Scarica client desktop",
-"Download Android Client" => "Scarica client Android",
-"Download iOS Client" => "Scarica client iOS",
+"Get the apps to sync your files" => "Scarica le applicazioni per sincronizzare i tuoi file",
+"Show First Run Wizard again" => "Mostra nuovamente la procedura di primo avvio",
 "Password" => "Password",
 "Your password was changed" => "La tua password è cambiata",
 "Unable to change your password" => "Modifica password non riuscita",
 "Current password" => "Password attuale",
 "New password" => "Nuova password",
-"show" => "mostra",
 "Change password" => "Modifica password",
 "Display Name" => "Nome visualizzato",
 "Your display name was changed" => "Il tuo nome visualizzato è stato cambiato",
@@ -60,18 +100,13 @@
 "Help translate" => "Migliora la traduzione",
 "WebDAV" => "WebDAV",
 "Use this address to connect to your ownCloud in your file manager" => "Usa questo indirizzo per connetterti al tuo ownCloud dal tuo gestore file",
-"Version" => "Versione",
-"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Sviluppato dalla <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunità di ownCloud</a>, il <a href=\"https://github.com/owncloud\" target=\"_blank\">codice sorgente</a> è licenziato nei termini della <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
 "Login Name" => "Nome utente",
-"Groups" => "Gruppi",
 "Create" => "Crea",
 "Default Storage" => "Archiviazione predefinita",
 "Unlimited" => "Illimitata",
 "Other" => "Altro",
-"Group Admin" => "Gruppi amministrati",
 "Storage" => "Archiviazione",
 "change display name" => "cambia il nome visualizzato",
 "set new password" => "imposta una nuova password",
-"Default" => "Predefinito",
-"Delete" => "Elimina"
+"Default" => "Predefinito"
 );
diff --git a/settings/l10n/ja_JP.php b/settings/l10n/ja_JP.php
index d255b670337..181656bd392 100644
--- a/settings/l10n/ja_JP.php
+++ b/settings/l10n/ja_JP.php
@@ -24,7 +24,50 @@
 "Error" => "エラー",
 "Updated" => "更新済み",
 "Saving..." => "保存中...",
+"deleted" => "削除",
+"undo" => "元に戻す",
+"Unable to remove user" => "ユーザを削除出来ません",
+"Groups" => "グループ",
+"Group Admin" => "グループ管理者",
+"Delete" => "削除",
+"add group" => "グループを追加",
+"A valid username must be provided" => "有効なユーザ名を指定する必要があります",
+"Error creating user" => "ユーザ作成エラー",
+"A valid password must be provided" => "有効なパスワードを指定する必要があります",
 "__language_name__" => "Japanese (日本語)",
+"Security Warning" => "セキュリティ警告",
+"Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "データディレクトリとファイルが恐らくインターネットからアクセスできるようになっています。ownCloudが提供する .htaccessファイルが機能していません。データディレクトリを全くアクセスできないようにするか、データディレクトリをウェブサーバのドキュメントルートの外に置くようにウェブサーバを設定することを強くお勧めします。 ",
+"Setup Warning" => "セットアップ警告",
+"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "WebDAVインタフェースが動作していないと考えられるため、あなたのWEBサーバはまだファイルの同期を許可するように適切な設定がされていません。",
+"Please double check the <a href='%s'>installation guides</a>." => "<a href='%s'>インストールガイド</a>をよく確認してください。",
+"Module 'fileinfo' missing" => "モジュール 'fileinfo' が見つかりません",
+"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "PHP のモジュール 'fileinfo' が見つかりません。mimeタイプの検出を精度良く行うために、このモジュールを有効にすることを強くお勧めします。",
+"Locale not working" => "ロケールが動作していません",
+"This ownCloud server can't set system locale to %s. This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support %s." => "この ownCloud サーバは、システムロケールを %s に設定できません。これは、ファイル名の特定の文字で問題が発生する可能性があることを意味しています。%s をサポートするために、システムに必要なパッケージをインストールすることを強く推奨します。",
+"Internet connection not working" => "インターネット接続が動作していません",
+"This ownCloud server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features of ownCloud." => "この ownCloud サーバには有効なインターネット接続がありません。これは、外部ストレージのマウント、更新の通知、サードパーティ製アプリのインストール、のようないくつかの機能が動作しないことを意味しています。リモートからファイルにアクセスしたり、通知メールを送信したりすることもできません。全ての機能を利用するためには、このサーバのインターネット接続を有効にすることを推奨します。",
+"Cron" => "Cron",
+"Execute one task with each page loaded" => "各ページの読み込み時にタスクを実行する",
+"cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "cron.php は webcron サービスに登録されています。owncloud のルートにある cron.php のページを http 経由で1分に1回呼び出して下さい。",
+"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "システムの cron サービスを利用する。システムの cronjob を通して1分に1回 owncloud 内の cron.php ファイルを呼び出して下さい。",
+"Sharing" => "共有",
+"Enable Share API" => "共有APIを有効にする",
+"Allow apps to use the Share API" => "アプリからの共有APIの利用を許可する",
+"Allow links" => "リンクを許可する",
+"Allow users to share items to the public with links" => "リンクによりアイテムを公開することを許可する",
+"Allow resharing" => "再共有を許可する",
+"Allow users to share items shared with them again" => "ユーザが共有しているアイテムの再共有を許可する",
+"Allow users to share with anyone" => "ユーザが誰とでも共有することを許可する",
+"Allow users to only share with users in their groups" => "ユーザにグループ内のユーザとのみ共有を許可する",
+"Security" => "セキュリティ",
+"Enforce HTTPS" => "常にHTTPSを使用する",
+"Enforces the clients to connect to ownCloud via an encrypted connection." => "クライアントからownCloudへの接続を常に暗号化する",
+"Please connect to this ownCloud instance via HTTPS to enable or disable the SSL enforcement." => "常にSSL接続を有効／無効にするために、HTTPS経由でこの ownCloud に接続して下さい。",
+"Log" => "ログ",
+"Log level" => "ログレベル",
+"More" => "詳細",
+"Version" => "バージョン",
+"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "<a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>により開発されています、<a href=\"https://github.com/owncloud\" target=\"_blank\">ソースコード</a>ライセンスは、<a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> ライセンスにより提供されています。",
 "Add your App" => "アプリを追加",
 "More Apps" => "さらにアプリを表示",
 "Select an App" => "アプリを選択してください",
@@ -38,16 +81,13 @@
 "Bugtracker" => "バグトラッカー",
 "Commercial Support" => "コマーシャルサポート",
 "You have used <strong>%s</strong> of the available <strong>%s</strong>" => "現在、<strong>%s</strong> / <strong>%s</strong> を利用しています",
-"Clients" => "顧客",
-"Download Desktop Clients" => "デスクトップクライアントをダウンロード",
-"Download Android Client" => "Androidクライアントをダウンロード",
-"Download iOS Client" => "iOSクライアントをダウンロード",
+"Get the apps to sync your files" => "あなたのファイルを同期するためのアプリを取得",
+"Show First Run Wizard again" => "初回実行ウィザードを再度表示する",
 "Password" => "パスワード",
 "Your password was changed" => "パスワードを変更しました",
 "Unable to change your password" => "パスワードを変更することができません",
 "Current password" => "現在のパスワード",
 "New password" => "新しいパスワード",
-"show" => "表示",
 "Change password" => "パスワードを変更",
 "Display Name" => "表示名",
 "Your display name was changed" => "あなたの表示名を変更しました",
@@ -60,18 +100,13 @@
 "Help translate" => "翻訳に協力する",
 "WebDAV" => "WebDAV",
 "Use this address to connect to your ownCloud in your file manager" => "ファイルマネージャでownCloudに接続する際はこのアドレスを利用してください",
-"Version" => "バージョン",
-"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "<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> ライセンスにより提供されています。",
 "Login Name" => "ログイン名",
-"Groups" => "グループ",
 "Create" => "作成",
 "Default Storage" => "デフォルトストレージ",
 "Unlimited" => "無制限",
 "Other" => "その他",
-"Group Admin" => "グループ管理者",
 "Storage" => "ストレージ",
 "change display name" => "表示名を変更",
 "set new password" => "新しいパスワードを設定",
-"Default" => "デフォルト",
-"Delete" => "削除"
+"Default" => "デフォルト"
 );
diff --git a/settings/l10n/ka.php b/settings/l10n/ka.php
new file mode 100644
index 00000000000..63425e555b0
--- /dev/null
+++ b/settings/l10n/ka.php
@@ -0,0 +1,3 @@
+<?php $TRANSLATIONS = array(
+"Password" => "პაროლი"
+);
diff --git a/settings/l10n/ka_GE.php b/settings/l10n/ka_GE.php
index 0fc42d42728..27699d3f980 100644
--- a/settings/l10n/ka_GE.php
+++ b/settings/l10n/ka_GE.php
@@ -16,29 +16,29 @@
 "Enable" => "ჩართვა",
 "Error" => "შეცდომა",
 "Saving..." => "შენახვა...",
+"undo" => "დაბრუნება",
+"Groups" => "ჯგუფი",
+"Group Admin" => "ჯგუფის ადმინისტრატორი",
+"Delete" => "წაშლა",
 "__language_name__" => "__language_name__",
+"Security Warning" => "უსაფრთხოების გაფრთხილება",
 "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>",
 "Update" => "განახლება",
-"Clients" => "კლიენტები",
 "Password" => "პაროლი",
 "Your password was changed" => "თქვენი პაროლი შეიცვალა",
 "Unable to change your password" => "თქვენი პაროლი არ შეიცვალა",
 "Current password" => "მიმდინარე პაროლი",
 "New password" => "ახალი პაროლი",
-"show" => "გამოაჩინე",
 "Change password" => "პაროლის შეცვლა",
 "Email" => "იმეილი",
 "Your email address" => "თქვენი იმეილ მისამართი",
 "Fill in an email address to enable password recovery" => "შეავსეთ იმეილ მისამართის ველი პაროლის აღსადგენად",
 "Language" => "ენა",
 "Help translate" => "თარგმნის დახმარება",
-"Groups" => "ჯგუფი",
 "Create" => "შექმნა",
-"Other" => "სხვა",
-"Group Admin" => "ჯგუფის ადმინისტრატორი",
-"Delete" => "წაშლა"
+"Other" => "სხვა"
 );
diff --git a/settings/l10n/ko.php b/settings/l10n/ko.php
index a542b35feec..fb6f7e6228b 100644
--- a/settings/l10n/ko.php
+++ b/settings/l10n/ko.php
@@ -17,7 +17,17 @@
 "Enable" => "활성화",
 "Error" => "오류",
 "Saving..." => "저장 중...",
+"deleted" => "삭제",
+"undo" => "실행 취소",
+"Groups" => "그룹",
+"Group Admin" => "그룹 관리자",
+"Delete" => "삭제",
 "__language_name__" => "한국어",
+"Security Warning" => "보안 경고",
+"Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "데이터 디렉터리와 파일을 인터넷에서 접근할 수 있는 것 같습니다. ownCloud에서 제공한 .htaccess 파일이 작동하지 않습니다. 웹 서버를 다시 설정하여 데이터 디렉터리에 접근할 수 없도록 하거나 문서 루트 바깥쪽으로 옮기는 것을 추천합니다.",
+"More" => "더 중요함",
+"Version" => "버전",
+"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "<a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud 커뮤니티</a>에 의해서 개발되었습니다. <a href=\"https://github.com/owncloud\" target=\"_blank\">원본 코드</a>는 <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>에 따라 사용이 허가됩니다.",
 "Add your App" => "앱 추가",
 "More Apps" => "더 많은 앱",
 "Select an App" => "앱 선택",
@@ -31,16 +41,12 @@
 "Bugtracker" => "버그 트래커",
 "Commercial Support" => "상업용 지원",
 "You have used <strong>%s</strong> of the available <strong>%s</strong>" => "현재 공간 <strong>%s</strong>/<strong>%s</strong>을(를) 사용 중입니다",
-"Clients" => "클라이언트",
-"Download Desktop Clients" => "데스크톱 클라이언트 다운로드",
-"Download Android Client" => "안드로이드 클라이언트 다운로드",
-"Download iOS Client" => "iOS 클라이언트 다운로드",
+"Show First Run Wizard again" => "첫 실행 마법사 다시 보이기",
 "Password" => "암호",
 "Your password was changed" => "암호가 변경되었습니다",
 "Unable to change your password" => "암호를 변경할 수 없음",
 "Current password" => "현재 암호",
 "New password" => "새 암호",
-"show" => "보이기",
 "Change password" => "암호 변경",
 "Display Name" => "표시 이름",
 "Email" => "이메일",
@@ -50,18 +56,13 @@
 "Help translate" => "번역 돕기",
 "WebDAV" => "WebDAV",
 "Use this address to connect to your ownCloud in your file manager" => "파일 관리자에서 ownCloud에 접속하려면 이 주소를 사용하십시오.",
-"Version" => "버전",
-"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "<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>에 따라 사용이 허가됩니다.",
 "Login Name" => "로그인 이름",
-"Groups" => "그룹",
 "Create" => "만들기",
 "Default Storage" => "기본 저장소",
 "Unlimited" => "무제한",
 "Other" => "기타",
-"Group Admin" => "그룹 관리자",
 "Storage" => "저장소",
 "change display name" => "표시 이름 변경",
 "set new password" => "새 암호 설정",
-"Default" => "기본값",
-"Delete" => "삭제"
+"Default" => "기본값"
 );
diff --git a/settings/l10n/lb.php b/settings/l10n/lb.php
index 5ef88f27891..793ae3d4dcd 100644
--- a/settings/l10n/lb.php
+++ b/settings/l10n/lb.php
@@ -9,25 +9,26 @@
 "Enable" => "Aschalten",
 "Error" => "Fehler",
 "Saving..." => "Speicheren...",
+"deleted" => "geläscht",
+"undo" => "réckgängeg man",
+"Groups" => "Gruppen",
+"Group Admin" => "Gruppen Admin",
+"Delete" => "Läschen",
 "__language_name__" => "__language_name__",
+"Security Warning" => "Sécherheets Warnung",
 "Add your App" => "Setz deng App bei",
 "Select an App" => "Wiel eng Applikatioun aus",
 "See application page at apps.owncloud.com" => "Kuck dir d'Applicatioun's Säit op apps.owncloud.com un",
-"Clients" => "Clienten",
 "Password" => "Passwuert",
 "Unable to change your password" => "Konnt däin Passwuert net änneren",
 "Current password" => "Momentan 't Passwuert",
 "New password" => "Neit Passwuert",
-"show" => "weisen",
 "Change password" => "Passwuert änneren",
 "Email" => "Email",
 "Your email address" => "Deng Email Adress",
 "Fill in an email address to enable password recovery" => "Gëff eng Email Adress an fir d'Passwuert recovery ze erlaben",
 "Language" => "Sprooch",
 "Help translate" => "Hëllef iwwersetzen",
-"Groups" => "Gruppen",
 "Create" => "Erstellen",
-"Other" => "Aner",
-"Group Admin" => "Gruppen Admin",
-"Delete" => "Läschen"
+"Other" => "Aner"
 );
diff --git a/settings/l10n/lt_LT.php b/settings/l10n/lt_LT.php
index e514e7f7758..177ce10dddb 100644
--- a/settings/l10n/lt_LT.php
+++ b/settings/l10n/lt_LT.php
@@ -10,27 +10,29 @@
 "Enable" => "Įjungti",
 "Error" => "Klaida",
 "Saving..." => "Saugoma..",
+"undo" => "anuliuoti",
+"Groups" => "Grupės",
+"Delete" => "Ištrinti",
 "__language_name__" => "Kalba",
+"Security Warning" => "Saugumo pranešimas",
+"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." => "Jūsų duomenų aplankalas ir Jūsų failai turbūt yra pasiekiami per internetą. Failas .htaccess, kuris duodamas, neveikia. Mes rekomenduojame susitvarkyti savo nustatymsu taip, kad failai nebūtų pasiekiami per internetą, arba persikelti juos kitur.",
+"More" => "Daugiau",
 "Add your App" => "Pridėti programėlę",
 "More Apps" => "Daugiau aplikacijų",
 "Select an App" => "Pasirinkite programą",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>- autorius<span class=\"author\"></span>",
 "Update" => "Atnaujinti",
-"Clients" => "Klientai",
 "Password" => "Slaptažodis",
 "Your password was changed" => "Jūsų slaptažodis buvo pakeistas",
 "Unable to change your password" => "Neįmanoma pakeisti slaptažodžio",
 "Current password" => "Dabartinis slaptažodis",
 "New password" => "Naujas slaptažodis",
-"show" => "rodyti",
 "Change password" => "Pakeisti slaptažodį",
 "Email" => "El. paštas",
 "Your email address" => "Jūsų el. pašto adresas",
 "Fill in an email address to enable password recovery" => "Pamiršto slaptažodžio atkūrimui įveskite savo el. pašto adresą",
 "Language" => "Kalba",
 "Help translate" => "Padėkite išversti",
-"Groups" => "Grupės",
 "Create" => "Sukurti",
-"Other" => "Kita",
-"Delete" => "Ištrinti"
+"Other" => "Kita"
 );
diff --git a/settings/l10n/lv.php b/settings/l10n/lv.php
index 03977206f77..d5a29d84cb9 100644
--- a/settings/l10n/lv.php
+++ b/settings/l10n/lv.php
@@ -24,7 +24,50 @@
 "Error" => "Kļūda",
 "Updated" => "Atjaunināta",
 "Saving..." => "Saglabā...",
+"deleted" => "izdzests",
+"undo" => "atsaukt",
+"Unable to remove user" => "Nevar izņemt lietotāju",
+"Groups" => "Grupas",
+"Group Admin" => "Grupas administrators",
+"Delete" => "Dzēst",
+"add group" => "pievienot grupu",
+"A valid username must be provided" => "Jānorāda derīgs lietotājvārds",
+"Error creating user" => "Kļūda, veidojot lietotāju",
+"A valid password must be provided" => "Jānorāda derīga parole",
 "__language_name__" => "__valodas_nosaukums__",
+"Security Warning" => "Brīdinājums par drošību",
+"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." => "Jūsu datu direktorija un datnes visdrīzāk ir pieejamas no interneta. ownCloud nodrošinātā .htaccess datne nedarbojas. Mēs iesakām konfigurēt serveri tā, lai datu direktorija vairs nebūtu pieejama, vai arī pārvietojiet datu direktoriju ārpus tīmekļa servera dokumentu saknes.",
+"Setup Warning" => "Iestatīšanas brīdinājums",
+"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Jūsu serveris vēl nav pareizi iestatīts, lai ļautu sinhronizēt datnes, jo izskatās, ka WebDAV saskarne ir salauzta.",
+"Please double check the <a href='%s'>installation guides</a>." => "Lūdzu, vēlreiz pārbaudiet <a href='%s'>instalēšanas palīdzību</a>.",
+"Module 'fileinfo' missing" => "Trūkst modulis “fileinfo”",
+"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "Trūkst PHP modulis “fileinfo”. Mēs iesakām to aktivēt, lai pēc iespējas labāk noteiktu mime tipus.",
+"Locale not working" => "Lokāle nestrādā",
+"This ownCloud server can't set system locale to %s. This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support %s." => "Šis ownCloud serveris nevar iestatīt sistēmas lokāli uz %s. Tas nozīmē, ka varētu būt problēmas ar noteiktām rakstzīmēm datņu nosaukumos. Mēs iesakām instalēt vajadzīgās pakotnes savā sistēmā %s atbalstam.",
+"Internet connection not working" => "Interneta savienojums nedarbojas",
+"This ownCloud server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features of ownCloud." => "Šim ownCloud serverim nav strādājoša interneta savienojuma. Tas nozīmē, ka dažas no šīm iespējām, piemēram, ārējas krātuves montēšana, paziņošana par atjauninājumiem vai trešās puses programmatūras instalēšana nestrādā. Varētu nestrādāt attālināta piekļuve pie datnēm un paziņojumu e-pasta vēstuļu sūtīšana. Mēs iesakām aktivēt interneta savienojumu šim serverim, ja vēlaties visas ownCloud iespējas.",
+"Cron" => "Cron",
+"Execute one task with each page loaded" => "Izpildīt vienu uzdevumu ar katru ielādēto lapu",
+"cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "cron.php ir reģistrēts webcron servisā. Izsauciet cron.php lapu ownCloud saknē caur http reizi sekundē.",
+"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "Izmantot sistēmas cron servisu. Izsauciet cron.php datni ownCloud mapē caur sistēmas cornjob reizi minūtē.",
+"Sharing" => "Dalīšanās",
+"Enable Share API" => "Aktivēt koplietošanas API",
+"Allow apps to use the Share API" => "Ļauj lietotnēm izmantot koplietošanas API",
+"Allow links" => "Atļaut saites",
+"Allow users to share items to the public with links" => "Ļaut lietotājiem publiski dalīties ar vienumiem, izmantojot saites",
+"Allow resharing" => "Atļaut atkārtotu koplietošanu",
+"Allow users to share items shared with them again" => "Ļaut lietotājiem dalīties ar vienumiem atkārtoti",
+"Allow users to share with anyone" => "Ļaut lietotājiem dalīties ar visiem",
+"Allow users to only share with users in their groups" => "Ļaut lietotājiem dalīties ar lietotājiem to grupās",
+"Security" => "Drošība",
+"Enforce HTTPS" => "Uzspiest HTTPS",
+"Enforces the clients to connect to ownCloud via an encrypted connection." => "Piespiež klientus savienoties ar ownCloud caur šifrētu savienojumu.",
+"Please connect to this ownCloud instance via HTTPS to enable or disable the SSL enforcement." => "Lūdzu, savienojieties ar šo ownCloud pakalpojumu caur HTTPS, lai aktivētu vai deaktivētu SSL piemērošanu.",
+"Log" => "Žurnāls",
+"Log level" => "Žurnāla līmenis",
+"More" => "Vairāk",
+"Version" => "Versija",
+"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Izstrādājusi<a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud kopiena</a>,<a href=\"https://github.com/owncloud\" target=\"_blank\">pirmkodu</a>kurš ir licencēts zem <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
 "Add your App" => "Pievieno savu lietotni",
 "More Apps" => "Vairāk lietotņu",
 "Select an App" => "Izvēlies lietotni",
@@ -38,16 +81,13 @@
 "Bugtracker" => "Kļūdu sekotājs",
 "Commercial Support" => "Komerciālais atbalsts",
 "You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Jūs lietojat <strong>%s</strong> no pieejamajiem <strong>%s</strong>",
-"Clients" => "Klienti",
-"Download Desktop Clients" => "Lejupielādēt darbvirsmas klientus",
-"Download Android Client" => "Lejupielādēt Android klientu",
-"Download iOS Client" => "Lejupielādēt iOS klientu",
+"Get the apps to sync your files" => "Saņem lietotnes, lai sinhronizētu savas datnes",
+"Show First Run Wizard again" => "Vēlreiz rādīt pirmās palaišanas vedni",
 "Password" => "Parole",
 "Your password was changed" => "Jūru parole tika nomainīta",
 "Unable to change your password" => "Nevar nomainīt jūsu paroli",
 "Current password" => "Pašreizējā parole",
 "New password" => "Jauna parole",
-"show" => "parādīt",
 "Change password" => "Mainīt paroli",
 "Display Name" => "Redzamais vārds",
 "Your display name was changed" => "Jūsu redzamais vārds tika mainīts",
@@ -60,18 +100,13 @@
 "Help translate" => "Palīdzi tulkot",
 "WebDAV" => "WebDAV",
 "Use this address to connect to your ownCloud in your file manager" => "Izmanto šo adresi, lai, izmantojot datņu pārvaldnieku, savienotos ar savu ownCloud",
-"Version" => "Versija",
-"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Izstrādājusi<a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud kopiena</a>,<a href=\"https://github.com/owncloud\" target=\"_blank\">pirmkodu</a>kurš ir licencēts zem <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
 "Login Name" => "Ierakstīšanās vārds",
-"Groups" => "Grupas",
 "Create" => "Izveidot",
 "Default Storage" => "Noklusējuma krātuve",
 "Unlimited" => "Neierobežota",
 "Other" => "Cits",
-"Group Admin" => "Grupas administrators",
 "Storage" => "Krātuve",
 "change display name" => "mainīt redzamo vārdu",
 "set new password" => "iestatīt jaunu paroli",
-"Default" => "Noklusējuma",
-"Delete" => "Dzēst"
+"Default" => "Noklusējuma"
 );
diff --git a/settings/l10n/mk.php b/settings/l10n/mk.php
index aba63bc0575..1994c2ab67e 100644
--- a/settings/l10n/mk.php
+++ b/settings/l10n/mk.php
@@ -17,7 +17,16 @@
 "Enable" => "Овозможи",
 "Error" => "Грешка",
 "Saving..." => "Снимам...",
+"undo" => "врати",
+"Groups" => "Групи",
+"Group Admin" => "Администратор на група",
+"Delete" => "Избриши",
 "__language_name__" => "__language_name__",
+"Security Warning" => "Безбедносно предупредување",
+"Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Вашата папка со податоци и датотеките е најверојатно достапна од интернет. .htaccess датотеката што ја овозможува ownCloud не фунционира. Силно препорачуваме да го исконфигурирате вашиот сервер за вашата папка со податоци не е достапна преку интернетт или преместете ја надвор од коренот на веб серверот.",
+"More" => "Повеќе",
+"Version" => "Верзија",
+"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Развој од <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud заедницата</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">изворниот код</a> е лиценциран со<a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
 "Add your App" => "Додадете ја Вашата апликација",
 "More Apps" => "Повеќе аппликации",
 "Select an App" => "Избери аппликација",
@@ -30,16 +39,11 @@
 "Forum" => "Форум",
 "Commercial Support" => "Комерцијална подршка",
 "You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Имате искористено <strong>%s</strong> од достапните <strong>%s</strong>",
-"Clients" => "Клиенти",
-"Download Desktop Clients" => "Преземи клиенти за десктоп",
-"Download Android Client" => "Преземи клиент за Андроид",
-"Download iOS Client" => "Преземи iOS клиент",
 "Password" => "Лозинка",
 "Your password was changed" => "Вашата лозинка беше променета.",
 "Unable to change your password" => "Вашата лозинка неможе да се смени",
 "Current password" => "Моментална лозинка",
 "New password" => "Нова лозинка",
-"show" => "прикажи",
 "Change password" => "Смени лозинка",
 "Email" => "Е-пошта",
 "Your email address" => "Вашата адреса за е-пошта",
@@ -48,11 +52,6 @@
 "Help translate" => "Помогни во преводот",
 "WebDAV" => "WebDAV",
 "Use this address to connect to your ownCloud in your file manager" => "Користете ја оваа адреса да ",
-"Version" => "Верзија",
-"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Развој од <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud заедницата</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">изворниот код</a> е лиценциран со<a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
-"Groups" => "Групи",
 "Create" => "Создај",
-"Other" => "Останато",
-"Group Admin" => "Администратор на група",
-"Delete" => "Избриши"
+"Other" => "Останато"
 );
diff --git a/settings/l10n/ms_MY.php b/settings/l10n/ms_MY.php
index 95c1d01e3b5..a0022d5ba31 100644
--- a/settings/l10n/ms_MY.php
+++ b/settings/l10n/ms_MY.php
@@ -8,25 +8,25 @@
 "Enable" => "Aktif",
 "Error" => "Ralat",
 "Saving..." => "Simpan...",
+"deleted" => "dihapus",
+"Groups" => "Kumpulan",
+"Delete" => "Padam",
 "__language_name__" => "_nama_bahasa_",
+"Security Warning" => "Amaran keselamatan",
 "Add your App" => "Tambah apps anda",
 "Select an App" => "Pilih aplikasi",
 "See application page at apps.owncloud.com" => "Lihat halaman applikasi di apps.owncloud.com",
 "Update" => "Kemaskini",
-"Clients" => "klien",
 "Password" => "Kata laluan ",
 "Unable to change your password" => "Gagal mengubah kata laluan anda ",
 "Current password" => "Kata laluan semasa",
 "New password" => "Kata laluan baru",
-"show" => "Papar",
 "Change password" => "Ubah kata laluan",
 "Email" => "Emel",
 "Your email address" => "Alamat emel anda",
 "Fill in an email address to enable password recovery" => "Isi alamat emel anda untuk membolehkan pemulihan kata laluan",
 "Language" => "Bahasa",
 "Help translate" => "Bantu terjemah",
-"Groups" => "Kumpulan",
 "Create" => "Buat",
-"Other" => "Lain",
-"Delete" => "Padam"
+"Other" => "Lain"
 );
diff --git a/settings/l10n/my_MM.php b/settings/l10n/my_MM.php
new file mode 100644
index 00000000000..d12c9bcf036
--- /dev/null
+++ b/settings/l10n/my_MM.php
@@ -0,0 +1,7 @@
+<?php $TRANSLATIONS = array(
+"Authentication error" => "ခွင့်ပြုချက်မအောင်မြင်",
+"Invalid request" => "တောင်းဆိုချက်မမှန်ကန်ပါ",
+"Security Warning" => "လုံခြုံရေးသတိပေးချက်",
+"Password" => "စကားဝှက်",
+"New password" => "စကားဝှက်အသစ်"
+);
diff --git a/settings/l10n/nb_NO.php b/settings/l10n/nb_NO.php
index caf0a551863..708e78bf4b8 100644
--- a/settings/l10n/nb_NO.php
+++ b/settings/l10n/nb_NO.php
@@ -16,7 +16,15 @@
 "Enable" => "Slå på",
 "Error" => "Feil",
 "Saving..." => "Lagrer...",
+"deleted" => "slettet",
+"undo" => "angre",
+"Groups" => "Grupper",
+"Group Admin" => "Gruppeadministrator",
+"Delete" => "Slett",
 "__language_name__" => "__language_name__",
+"Security Warning" => "Sikkerhetsadvarsel",
+"More" => "Mer",
+"Version" => "Versjon",
 "Add your App" => "Legg til din App",
 "More Apps" => "Flere Apps",
 "Select an App" => "Velg en app",
@@ -26,16 +34,11 @@
 "Administrator Documentation" => "Administratordokumentasjon",
 "Commercial Support" => "Kommersiell støtte",
 "You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Du har brukt <strong>%s</strong> av tilgjengelig <strong>%s</strong>",
-"Clients" => "Klienter",
-"Download Desktop Clients" => "Last ned skrivebordsklienter",
-"Download Android Client" => "Last ned Android-klient",
-"Download iOS Client" => "Last ned iOS-klient",
 "Password" => "Passord",
 "Your password was changed" => "Passord har blitt endret",
 "Unable to change your password" => "Kunne ikke endre passordet ditt",
 "Current password" => "Nåværende passord",
 "New password" => "Nytt passord",
-"show" => "vis",
 "Change password" => "Endre passord",
 "Email" => "E-post",
 "Your email address" => "Din e-postadresse",
@@ -43,10 +46,6 @@
 "Language" => "Språk",
 "Help translate" => "Bidra til oversettelsen",
 "WebDAV" => "WebDAV",
-"Version" => "Versjon",
-"Groups" => "Grupper",
 "Create" => "Opprett",
-"Other" => "Annet",
-"Group Admin" => "Gruppeadministrator",
-"Delete" => "Slett"
+"Other" => "Annet"
 );
diff --git a/settings/l10n/nl.php b/settings/l10n/nl.php
index 6c256b9388d..249bf63cd38 100644
--- a/settings/l10n/nl.php
+++ b/settings/l10n/nl.php
@@ -24,7 +24,49 @@
 "Error" => "Fout",
 "Updated" => "Bijgewerkt",
 "Saving..." => "Aan het bewaren.....",
+"deleted" => "verwijderd",
+"undo" => "ongedaan maken",
+"Unable to remove user" => "Kon gebruiker niet verwijderen",
+"Groups" => "Groepen",
+"Group Admin" => "Groep beheerder",
+"Delete" => "verwijderen",
+"add group" => "toevoegen groep",
+"A valid username must be provided" => "Er moet een geldige gebruikersnaam worden opgegeven",
+"Error creating user" => "Fout bij aanmaken gebruiker",
+"A valid password must be provided" => "Er moet een geldig wachtwoord worden opgegeven",
 "__language_name__" => "Nederlands",
+"Security Warning" => "Beveiligingswaarschuwing",
+"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." => "Uw data is waarschijnlijk toegankelijk vanaf net internet. Het  .htaccess bestand dat ownCloud levert werkt niet goed. U wordt aangeraden om de configuratie van uw webserver zodanig aan te passen dat de data folders niet meer publiekelijk toegankelijk zijn. U kunt ook de data folder verplaatsen naar een folder buiten de webserver document folder.",
+"Setup Warning" => "Instellingswaarschuwing",
+"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Uw webserver is nog niet goed ingesteld voor bestandssynchronisatie omdat de WebDAV interface verbroken lijkt.",
+"Please double check the <a href='%s'>installation guides</a>." => "Conntroleer de <a href='%s'>installatie handleiding</a> goed.",
+"Module 'fileinfo' missing" => "Module 'fileinfo' ontbreekt",
+"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "De PHP module 'fileinfo' ontbreekt. We adviseren met klem om deze module te activeren om de beste resultaten te bereiken voor mime-type detectie.",
+"Locale not working" => "Taalbestand werkt niet",
+"Internet connection not working" => "Internet verbinding werkt niet",
+"This ownCloud server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features of ownCloud." => "Deze ownCloud server heeft geen actieve internet verbinding. dat betekent dat sommige functies, zoals aankoppelen van externe opslag, notificaties over updates of installatie van apps van 3e partijen niet werken. Ook het benaderen van bestanden vanaf een remote locatie en het versturen van notificatie emails kan mislukken. We adviseren om de internet verbinding voor deze server in te schakelen als u alle functies van ownCloud wilt gebruiken.",
+"Cron" => "Cron",
+"Execute one task with each page loaded" => "Bij laden van elke pagina één taak uitvoeren",
+"cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "cron.php is geregistreerd bij een webcron service. Roep eens per minuut de cron.php pagina aan over http in de ownCloud root.",
+"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "Gebruik de systems cron service. Roep eens per minuut de cron.php file in de ownCloud map via een systeem cronjob.",
+"Sharing" => "Delen",
+"Enable Share API" => "Activeren Share API",
+"Allow apps to use the Share API" => "Apps toestaan de Share API te gebruiken",
+"Allow links" => "Toestaan links",
+"Allow users to share items to the public with links" => "Toestaan dat gebruikers objecten met links delen met anderen",
+"Allow resharing" => "Toestaan opnieuw delen",
+"Allow users to share items shared with them again" => "Toestaan dat gebruikers objecten die anderen met hun gedeeld hebben zelf ook weer delen met anderen",
+"Allow users to share with anyone" => "Toestaan dat gebruikers met iedereen delen",
+"Allow users to only share with users in their groups" => "Instellen dat gebruikers alleen met leden binnen hun groepen delen",
+"Security" => "Beveiliging",
+"Enforce HTTPS" => "Afdwingen HTTPS",
+"Enforces the clients to connect to ownCloud via an encrypted connection." => "Afdwingen dat de clients alleen via versleutelde verbinding contact maken met ownCloud.",
+"Please connect to this ownCloud instance via HTTPS to enable or disable the SSL enforcement." => "Maak via HTTPS verbinding met deze ownCloud inrichting om het afdwingen van gebruik van SSL te activeren of deactiveren.",
+"Log" => "Log",
+"Log level" => "Log niveau",
+"More" => "Meer",
+"Version" => "Versie",
+"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Ontwikkeld door de <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud gemeenschap</a>, de <a href=\"https://github.com/owncloud\" target=\"_blank\">bron code</a> is gelicenseerd onder de <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
 "Add your App" => "App toevoegen",
 "More Apps" => "Meer apps",
 "Select an App" => "Selecteer een app",
@@ -38,16 +80,13 @@
 "Bugtracker" => "Bugtracker",
 "Commercial Support" => "Commerciële ondersteuning",
 "You have used <strong>%s</strong> of the available <strong>%s</strong>" => "U heeft <strong>%s</strong> van de <strong>%s</strong>  beschikbaren gebruikt",
-"Clients" => "Klanten",
-"Download Desktop Clients" => "Download Desktop Clients",
-"Download Android Client" => "Download Android Client",
-"Download iOS Client" => "Download iOS Client",
+"Get the apps to sync your files" => "Download de apps om bestanden te synchen",
+"Show First Run Wizard again" => "Toon de Eerste start Wizard opnieuw",
 "Password" => "Wachtwoord",
 "Your password was changed" => "Je wachtwoord is veranderd",
 "Unable to change your password" => "Niet in staat om uw wachtwoord te wijzigen",
 "Current password" => "Huidig wachtwoord",
 "New password" => "Nieuw wachtwoord",
-"show" => "weergeven",
 "Change password" => "Wijzig wachtwoord",
 "Display Name" => "Weergavenaam",
 "Your display name was changed" => "Uw weergavenaam is gewijzigd",
@@ -60,18 +99,13 @@
 "Help translate" => "Help met vertalen",
 "WebDAV" => "WebDAV",
 "Use this address to connect to your ownCloud in your file manager" => "Gebruik dit adres om te verbinden met uw ownCloud in uw bestandsbeheer",
-"Version" => "Versie",
-"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Ontwikkeld door de <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud gemeenschap</a>, de <a href=\"https://github.com/owncloud\" target=\"_blank\">bron code</a> is gelicenseerd onder de <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
 "Login Name" => "Inlognaam",
-"Groups" => "Groepen",
 "Create" => "Creëer",
 "Default Storage" => "Default opslag",
 "Unlimited" => "Ongelimiteerd",
 "Other" => "Andere",
-"Group Admin" => "Groep beheerder",
 "Storage" => "Opslag",
 "change display name" => "wijzig weergavenaam",
 "set new password" => "Instellen nieuw wachtwoord",
-"Default" => "Default",
-"Delete" => "verwijderen"
+"Default" => "Default"
 );
diff --git a/settings/l10n/nn_NO.php b/settings/l10n/nn_NO.php
index 8faa2d02caa..cee3ecaeac4 100644
--- a/settings/l10n/nn_NO.php
+++ b/settings/l10n/nn_NO.php
@@ -8,23 +8,21 @@
 "Disable" => "Slå av",
 "Enable" => "Slå på",
 "Error" => "Feil",
+"Groups" => "Grupper",
+"Delete" => "Slett",
 "__language_name__" => "Nynorsk",
 "Select an App" => "Vel ein applikasjon",
 "Update" => "Oppdater",
-"Clients" => "Klientar",
 "Password" => "Passord",
 "Unable to change your password" => "Klarte ikkje å endra passordet",
 "Current password" => "Passord",
 "New password" => "Nytt passord",
-"show" => "vis",
 "Change password" => "Endra passord",
 "Email" => "Epost",
 "Your email address" => "Din epost addresse",
 "Fill in an email address to enable password recovery" => "Fyll inn din e-post addresse for og kunne motta passord tilbakestilling",
 "Language" => "Språk",
 "Help translate" => "Hjelp oss å oversett",
-"Groups" => "Grupper",
 "Create" => "Lag",
-"Other" => "Anna",
-"Delete" => "Slett"
+"Other" => "Anna"
 );
diff --git a/settings/l10n/oc.php b/settings/l10n/oc.php
index 9accb3acbab..589ccb09bd4 100644
--- a/settings/l10n/oc.php
+++ b/settings/l10n/oc.php
@@ -16,27 +16,28 @@
 "Enable" => "Activa",
 "Error" => "Error",
 "Saving..." => "Enregistra...",
+"deleted" => "escafat",
+"undo" => "defar",
+"Groups" => "Grops",
+"Group Admin" => "Grop Admin",
+"Delete" => "Escafa",
 "__language_name__" => "__language_name__",
+"Security Warning" => "Avertiment de securitat",
 "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>",
-"Clients" => "Practica",
 "Password" => "Senhal",
 "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",
-"Groups" => "Grops",
 "Create" => "Crea",
-"Other" => "Autres",
-"Group Admin" => "Grop Admin",
-"Delete" => "Escafa"
+"Other" => "Autres"
 );
diff --git a/settings/l10n/pl.php b/settings/l10n/pl.php
index a06b39e7bd2..012ee1d6a6f 100644
--- a/settings/l10n/pl.php
+++ b/settings/l10n/pl.php
@@ -1,63 +1,112 @@
 <?php $TRANSLATIONS = array(
-"Unable to load list from App Store" => "Nie mogę załadować listy aplikacji",
+"Unable to load list from App Store" => "Nie można wczytać listy aplikacji",
 "Authentication error" => "Błąd uwierzytelniania",
+"Unable to change display name" => "Nie można zmienić wyświetlanej nazwy",
 "Group already exists" => "Grupa już istnieje",
 "Unable to add group" => "Nie można dodać grupy",
 "Could not enable app. " => "Nie można włączyć aplikacji.",
-"Email saved" => "Email zapisany",
-"Invalid email" => "Niepoprawny email",
+"Email saved" => "E-mail zapisany",
+"Invalid email" => "Nieprawidłowy e-mail",
 "Unable to delete group" => "Nie można usunąć grupy",
 "Unable to delete user" => "Nie można usunąć użytkownika",
-"Language changed" => "Język zmieniony",
+"Language changed" => "Zmieniono język",
 "Invalid request" => "Nieprawidłowe żądanie",
-"Admins can't remove themself from the admin group" => "Administratorzy nie mogą usunąć się sami z grupy administratorów.",
+"Admins can't remove themself from the admin group" => "Administratorzy nie mogą usunąć siebie samych z grupy administratorów",
 "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",
+"Couldn't update app." => "Nie można uaktualnić aplikacji.",
+"Update to {appversion}" => "Aktualizacja do {appversion}",
 "Disable" => "Wyłącz",
 "Enable" => "Włącz",
+"Please wait...." => "Proszę czekać...",
+"Updating...." => "Aktualizacja w toku...",
+"Error while updating app" => "Błąd podczas aktualizacji aplikacji",
 "Error" => "Błąd",
+"Updated" => "Zaktualizowano",
 "Saving..." => "Zapisywanie...",
-"__language_name__" => "Polski",
-"Add your App" => "Dodaj aplikacje",
+"deleted" => "usunięto",
+"undo" => "cofnij",
+"Unable to remove user" => "Nie można usunąć użytkownika",
+"Groups" => "Grupy",
+"Group Admin" => "Administrator grupy",
+"Delete" => "Usuń",
+"add group" => "dodaj grupę",
+"A valid username must be provided" => "Należy podać prawidłową nazwę użytkownika",
+"Error creating user" => "Błąd podczas tworzenia użytkownika",
+"A valid password must be provided" => "Należy podać prawidłowe hasło",
+"__language_name__" => "polski",
+"Security Warning" => "Ostrzeżenie o zabezpieczeniach",
+"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." => "Katalog danych i twoje pliki są prawdopodobnie dostępne z Internetu. Plik .htaccess dostarczony przez ownCloud nie działa. Zalecamy skonfigurowanie serwera internetowego w taki sposób, aby katalog z danymi nie był dostępny lub przeniesienie katalogu z danymi poza katalog główny serwera internetowego.",
+"Setup Warning" => "Ostrzeżenia konfiguracji",
+"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Serwer internetowy nie jest jeszcze poprawnie skonfigurowany, aby umożliwić synchronizację plików, ponieważ interfejs WebDAV wydaje się być uszkodzony.",
+"Please double check the <a href='%s'>installation guides</a>." => "Sprawdź ponownie <a href='%s'>przewodniki instalacji</a>.",
+"Module 'fileinfo' missing" => "Brak modułu „fileinfo”",
+"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "Brak modułu PHP „fileinfo”. Zalecamy włączenie tego modułu, aby uzyskać najlepsze wyniki podczas wykrywania typów MIME.",
+"Locale not working" => "Lokalizacja nie działa",
+"This ownCloud server can't set system locale to %s. This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support %s." => "Ten serwer ownCloud nie może włączyć ustawień regionalnych %s. Może to oznaczać, że wystąpiły problemy z niektórymi znakami w nazwach plików. Zalecamy instalację wymaganych pakietów na tym systemie w celu wsparcia %s.",
+"Internet connection not working" => "Połączenie internetowe nie działa",
+"This ownCloud server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features of ownCloud." => "Ten serwer OwnCloud nie ma działającego połączenia z Internetem. Oznacza to, że niektóre z funkcji, takich jak montowanie zewnętrznych zasobów, powiadomienia o aktualizacji lub instalacja dodatkowych aplikacji nie będą działać. Dostęp do plików z zewnątrz i wysyłanie powiadomień e-mail może również nie działać. Sugerujemy, aby włączyć połączenie internetowe dla tego serwera, jeśli chcesz korzystać ze wszystkich funkcji ownCloud.",
+"Cron" => "Cron",
+"Execute one task with each page loaded" => "Wykonuj jedno zadanie wraz z każdą wczytaną stroną",
+"cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "cron.php jest zarejestrowany w usłudze webcron. Przywołaj stronę cron.php w katalogu głównym ownCloud raz na minutę przez http.",
+"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "Użyj systemowej usługi cron. Przywołaj plik cron.php z katalogu ownCloud przez systemowy cronjob raz na minutę.",
+"Sharing" => "Udostępnianie",
+"Enable Share API" => "Włącz API udostępniania",
+"Allow apps to use the Share API" => "Zezwalaj aplikacjom na korzystanie z API udostępniania",
+"Allow links" => "Zezwalaj na odnośniki",
+"Allow users to share items to the public with links" => "Zezwalaj użytkownikom na publiczne współdzielenie zasobów za pomocą odnośników",
+"Allow resharing" => "Zezwalaj na ponowne udostępnianie",
+"Allow users to share items shared with them again" => "Zezwalaj użytkownikom na ponowne współdzielenie zasobów już z nimi współdzielonych",
+"Allow users to share with anyone" => "Zezwalaj użytkownikom na współdzielenie z kimkolwiek",
+"Allow users to only share with users in their groups" => "Zezwalaj użytkownikom współdzielić z użytkownikami ze swoich grup",
+"Security" => "Bezpieczeństwo",
+"Enforce HTTPS" => "Wymuś HTTPS",
+"Enforces the clients to connect to ownCloud via an encrypted connection." => "Wymusza na klientach na łączenie się ownCloud za pośrednictwem połączenia szyfrowanego.",
+"Please connect to this ownCloud instance via HTTPS to enable or disable the SSL enforcement." => "Proszę połącz się do tej instancji ownCloud za pośrednictwem protokołu HTTPS, aby włączyć lub wyłączyć stosowanie protokołu SSL.",
+"Log" => "Logi",
+"Log level" => "Poziom logów",
+"More" => "Więcej",
+"Version" => "Wersja",
+"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Stworzone przez <a href=\"http://ownCloud.org/contact\" target=\"_blank\">społeczność ownCloud</a>, <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 swoją aplikację",
 "More Apps" => "Więcej aplikacji",
-"Select an App" => "Zaznacz aplikacje",
+"Select an App" => "Zaznacz aplikację",
 "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>",
 "Update" => "Zaktualizuj",
 "User Documentation" => "Dokumentacja użytkownika",
-"Administrator Documentation" => "Dokumentacja Administratora",
-"Online Documentation" => "Dokumentacja Online",
+"Administrator Documentation" => "Dokumentacja administratora",
+"Online Documentation" => "Dokumentacja online",
 "Forum" => "Forum",
 "Bugtracker" => "Zgłaszanie błędów",
 "Commercial Support" => "Wsparcie komercyjne",
-"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Korzystasz z <strong>%s</strong> z dostępnych <strong>%s</strong>",
-"Clients" => "Klienci",
-"Download Desktop Clients" => "Pobierz klienta dla Komputera",
-"Download Android Client" => "Pobierz klienta dla Androida",
-"Download iOS Client" => "Pobierz klienta dla iOS",
+"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Wykorzystujesz <strong>%s</strong> z dostępnych <strong>%s</strong>",
+"Get the apps to sync your files" => "Pobierz aplikacje żeby synchronizować swoje pliki",
+"Show First Run Wizard again" => "Uruchom ponownie kreatora pierwszego uruchomienia",
 "Password" => "Hasło",
 "Your password was changed" => "Twoje hasło zostało zmienione",
 "Unable to change your password" => "Nie można zmienić hasła",
 "Current password" => "Bieżące hasło",
 "New password" => "Nowe hasło",
-"show" => "Wyświetlanie",
 "Change password" => "Zmień hasło",
+"Display Name" => "Wyświetlana nazwa",
+"Your display name was changed" => "Twoja nazwa wyświetlana została zmieniona",
+"Unable to change your display name" => "Nie można zmienić twojej wyświetlanej nazwy",
+"Change display name" => "Zmień wyświetlaną nazwę",
 "Email" => "E-mail",
-"Your email address" => "Adres e-mail użytkownika",
-"Fill in an email address to enable password recovery" => "Proszę wprowadzić adres e-mail, aby uzyskać możliwość odzyskania hasła",
+"Your email address" => "Twój adres e-mail",
+"Fill in an email address to enable password recovery" => "Podaj adres e-mail, aby uzyskać możliwość odzyskania hasła",
 "Language" => "Język",
 "Help translate" => "Pomóż w tłumaczeniu",
 "WebDAV" => "WebDAV",
 "Use this address to connect to your ownCloud in your file manager" => "Użyj tego adresu aby podłączyć zasób ownCloud w menedżerze plików",
-"Version" => "Wersja",
-"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Stworzone przez <a href=\"http://ownCloud.org/contact\" target=\"_blank\"> społeczność ownCloud</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">kod źródłowy</a> na licencji <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
-"Groups" => "Grupy",
+"Login Name" => "Login",
 "Create" => "Utwórz",
-"Default Storage" => "Domyślny magazyn",
+"Default Storage" => "Magazyn domyślny",
 "Unlimited" => "Bez limitu",
 "Other" => "Inne",
-"Group Admin" => "Grupa Admin",
 "Storage" => "Magazyn",
-"Default" => "Domyślny",
-"Delete" => "Usuń"
+"change display name" => "zmień wyświetlaną nazwę",
+"set new password" => "ustaw nowe hasło",
+"Default" => "Domyślny"
 );
diff --git a/settings/l10n/pt_BR.php b/settings/l10n/pt_BR.php
index 5a8281446db..98cac0fd612 100644
--- a/settings/l10n/pt_BR.php
+++ b/settings/l10n/pt_BR.php
@@ -1,6 +1,7 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "Não foi possível carregar lista da App Store",
 "Authentication error" => "Erro de autenticação",
+"Unable to change display name" => "Impossível alterar nome de exibição",
 "Group already exists" => "Grupo já existe",
 "Unable to add group" => "Não foi possível adicionar grupo",
 "Could not enable app. " => "Não foi possível habilitar aplicativo.",
@@ -13,11 +14,60 @@
 "Admins can't remove themself from the admin group" => "Admins não podem se remover do grupo admin",
 "Unable to add user to group %s" => "Não foi possível adicionar usuário ao grupo %s",
 "Unable to remove user from group %s" => "Não foi possível remover usuário do grupo %s",
+"Couldn't update app." => "Não foi possível atualizar o app.",
+"Update to {appversion}" => "Atualizar para {appversion}",
 "Disable" => "Desabilitar",
 "Enable" => "Habilitar",
+"Please wait...." => "Por favor, aguarde...",
+"Updating...." => "Atualizando...",
+"Error while updating app" => "Erro ao atualizar aplicativo",
 "Error" => "Erro",
+"Updated" => "Atualizado",
 "Saving..." => "Guardando...",
+"deleted" => "excluído",
+"undo" => "desfazer",
+"Unable to remove user" => "Impossível remover usuário",
+"Groups" => "Grupos",
+"Group Admin" => "Grupo Administrativo",
+"Delete" => "Excluir",
+"add group" => "adicionar grupo",
+"A valid username must be provided" => "Forneça um nome de usuário válido",
+"Error creating user" => "Erro ao criar usuário",
+"A valid password must be provided" => "Forneça uma senha válida",
 "__language_name__" => "Português (Brasil)",
+"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." => "Seu diretório de dados e seus arquivos estão, provavelmente, acessíveis a partir da internet. O .htaccess que o ownCloud fornece não está funcionando. Nós sugerimos que você configure o seu servidor web de uma forma que o diretório de dados esteja mais acessível ou que você mova o diretório de dados para fora da raiz do servidor web.",
+"Setup Warning" => "Aviso de Configuração",
+"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Seu servidor web não está configurado corretamente para permitir sincronização de arquivos porque a interface WebDAV parece estar quebrada.",
+"Please double check the <a href='%s'>installation guides</a>." => "Por favor, confira os <a href='%s'>guias de instalação</a>.",
+"Module 'fileinfo' missing" => "Módulo 'fileinfo' faltando",
+"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "O módulo PHP 'fileinfo' está faltando. Recomendamos que ative este módulo para obter uma melhor detecção do tipo de mídia (mime-type).",
+"Locale not working" => "Localização não funcionando",
+"This ownCloud server can't set system locale to %s. This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support %s." => "Este servidor ownCloud não pode configurar a localização do sistema para %s.  Isto significa que pode haver problema com alguns caracteres nos nomes de arquivos.  Nós recomendamos fortemente que você instale os pacotes requeridos em seu sistema para suportar %s.",
+"Internet connection not working" => "Sem conexão com a internet",
+"This ownCloud server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features of ownCloud." => "Este servidor ownCloud não tem conexão com a internet. Isto significa que alguns dos recursos como montar armazenamento externo, notificar atualizações ou instalar aplicativos de terceiros não funcionam. Acesso remoto a arquivos e envio de e-mails de notificação podem também não funcionar. Sugerimos que habilite a conexão com a internet neste servidor se quiser usufruir de todos os recursos do ownCloud.",
+"Cron" => "Cron",
+"Execute one task with each page loaded" => "Execute uma tarefa com cada página carregada",
+"cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "cron.php está registrado no serviço webcron. Chame a página cron.php na raíz do owncloud a cada minuto por http.",
+"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "Usar serviço de cron do sistema. Chama o arquivo cron.php na pasta owncloud via cronjob do sistema a cada minuto.",
+"Sharing" => "Compartilhamento",
+"Enable Share API" => "Habilitar API de Compartilhamento",
+"Allow apps to use the Share API" => "Permitir que aplicativos usem a API de Compartilhamento",
+"Allow links" => "Permitir links",
+"Allow users to share items to the public with links" => "Permitir que usuários compartilhem itens com o público usando links",
+"Allow resharing" => "Permitir recompartilhamento",
+"Allow users to share items shared with them again" => "Permitir que usuários compartilhem novamente itens compartilhados com eles",
+"Allow users to share with anyone" => "Permitir que usuários compartilhem com qualquer um",
+"Allow users to only share with users in their groups" => "Permitir que usuários compartilhem somente com usuários em seus grupos",
+"Security" => "Segurança",
+"Enforce HTTPS" => "Forçar HTTPS",
+"Enforces the clients to connect to ownCloud via an encrypted connection." => "Força o cliente a conectar-se ao ownCloud por uma conexão criptografada.",
+"Please connect to this ownCloud instance via HTTPS to enable or disable the SSL enforcement." => "Por favor, conecte-se a esta instância do ownCloud via HTTPS para habilitar ou desabilitar 'Forçar SSL'.",
+"Log" => "Registro",
+"Log level" => "Nível de registro",
+"More" => "Mais",
+"Version" => "Versão",
+"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Desenvolvido pela <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunidade ownCloud</a>, o <a href=\"https://github.com/owncloud\" target=\"_blank\">código fonte</a> está licenciado sob <a 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 um Aplicativo",
@@ -28,20 +78,21 @@
 "Administrator Documentation" => "Documentação de Administrador",
 "Online Documentation" => "Documentação Online",
 "Forum" => "Fórum",
+"Bugtracker" => "Rastreador de Bugs",
 "Commercial Support" => "Suporte Comercial",
 "You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Você usou <strong>%s</strong> do seu espaço de <strong>%s</strong>",
-"Clients" => "Clientes",
-"Download Desktop Clients" => "Baixar Clientes Desktop",
-"Download Android Client" => "Baixar Cliente Android",
-"Download iOS Client" => "Baixar Cliente iOS",
+"Get the apps to sync your files" => "Faça com que os apps sincronize seus arquivos",
+"Show First Run Wizard again" => "Mostrar este Assistente de novo",
 "Password" => "Senha",
 "Your password was changed" => "Sua senha foi alterada",
 "Unable to change your password" => "Não é possivel alterar a sua senha",
 "Current password" => "Senha atual",
 "New password" => "Nova senha",
-"show" => "mostrar",
 "Change password" => "Alterar senha",
 "Display Name" => "Nome de Exibição",
+"Your display name was changed" => "Seu nome de exibição foi alterado",
+"Unable to change your display name" => "Impossível alterar seu nome de exibição",
+"Change display name" => "Alterar nome de exibição",
 "Email" => "E-mail",
 "Your email address" => "Seu endereço de e-mail",
 "Fill in an email address to enable password recovery" => "Preencha um endereço de e-mail para habilitar a recuperação de senha",
@@ -49,16 +100,13 @@
 "Help translate" => "Ajude a traduzir",
 "WebDAV" => "WebDAV",
 "Use this address to connect to your ownCloud in your file manager" => "Usar este endereço para conectar-se ao seu ownCloud no seu gerenciador de arquivos",
-"Version" => "Versão",
-"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Desenvolvido pela <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunidade ownCloud</a>, o <a href=\"https://github.com/owncloud\" target=\"_blank\">código fonte</a> está licenciado sob <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
 "Login Name" => "Nome de Login",
-"Groups" => "Grupos",
 "Create" => "Criar",
 "Default Storage" => "Armazenamento Padrão",
 "Unlimited" => "Ilimitado",
 "Other" => "Outro",
-"Group Admin" => "Grupo Administrativo",
 "Storage" => "Armazenamento",
-"Default" => "Padrão",
-"Delete" => "Apagar"
+"change display name" => "alterar nome de exibição",
+"set new password" => "definir nova senha",
+"Default" => "Padrão"
 );
diff --git a/settings/l10n/pt_PT.php b/settings/l10n/pt_PT.php
index 03982fd5e8e..e685da4498f 100644
--- a/settings/l10n/pt_PT.php
+++ b/settings/l10n/pt_PT.php
@@ -1,6 +1,7 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "Incapaz de carregar a lista da App Store",
 "Authentication error" => "Erro de autenticação",
+"Unable to change display name" => "Não foi possível alterar o nome",
 "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.",
@@ -23,7 +24,49 @@
 "Error" => "Erro",
 "Updated" => "Actualizado",
 "Saving..." => "A guardar...",
+"deleted" => "apagado",
+"undo" => "desfazer",
+"Unable to remove user" => "Não foi possível remover o utilizador",
+"Groups" => "Grupos",
+"Group Admin" => "Grupo Administrador",
+"Delete" => "Apagar",
+"add group" => "Adicionar grupo",
+"A valid username must be provided" => "Um nome de utilizador válido deve ser fornecido",
+"Error creating user" => "Erro a criar utilizador",
+"A valid password must be provided" => "Uma password válida deve ser fornecida",
 "__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.",
+"Setup Warning" => "Aviso de setup",
+"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "O seu servidor web não está configurado correctamente para autorizar sincronização de ficheiros, pois o interface WebDAV parece estar com problemas.",
+"Please double check the <a href='%s'>installation guides</a>." => "Por favor verifique <a href='%s'>installation guides</a>.",
+"Module 'fileinfo' missing" => "Falta o módulo 'fileinfo'",
+"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "O Módulo PHP 'fileinfo' não se encontra instalado/activado. É fortemente recomendado que active este módulo para obter os melhores resultado com a detecção dos tipos de mime.",
+"Locale not working" => "Internacionalização não está a funcionar",
+"Internet connection not working" => "A ligação à internet não está a funcionar",
+"This ownCloud server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features of ownCloud." => "Este servidor ownCloud não tem uma ligação de internet funcional. Isto significa que algumas funcionalidades como o acesso a locais externos (dropbox, gdrive, etc), notificações sobre actualizções, ou a instalação de aplicações não irá funcionar. Sugerimos que active uma ligação à internet se pretende obter todas as funcionalidades do ownCloud.",
+"Cron" => "Cron",
+"Execute one task with each page loaded" => "Executar uma tarefa com cada página carregada",
+"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 como um serviço webcron. Aceda a pagina cron.php que se encontra na raiz do ownCloud uma vez por minuto utilizando o seu browser.",
+"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. Aceda a pagina cron.php que se encontra na raiz do ownCloud uma vez por minuto utilizando o seu browser.",
+"Sharing" => "Partilha",
+"Enable Share API" => "Activar a API de partilha",
+"Allow apps to use the Share API" => "Permitir que os utilizadores usem a API de partilha",
+"Allow links" => "Permitir links",
+"Allow users to share items to the public with links" => "Permitir que os utilizadores partilhem itens com o público utilizando um link.",
+"Allow resharing" => "Permitir repartilha",
+"Allow users to share items shared with them again" => "Permitir que os utilizadores partilhem itens partilhados com eles",
+"Allow users to share with anyone" => "Permitir que os utilizadores partilhem com todos",
+"Allow users to only share with users in their groups" => "Permitir que os utilizadores partilhem somente com utilizadores do seu grupo",
+"Security" => "Segurança",
+"Enforce HTTPS" => "Forçar HTTPS",
+"Enforces the clients to connect to ownCloud via an encrypted connection." => "Forçar clientes a ligar através de uma ligação encriptada",
+"Please connect to this ownCloud instance via HTTPS to enable or disable the SSL enforcement." => "Por favor ligue-se ao ownCloud através de uma ligação HTTPS para ligar/desligar o forçar da ligação por SSL",
+"Log" => "Registo",
+"Log level" => "Nível do registo",
+"More" => "Mais",
+"Version" => "Versão",
+"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Desenvolvido pela <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunidade ownCloud</a>, o<a href=\"https://github.com/owncloud\" target=\"_blank\">código fonte</a> está licenciado sob a <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
 "Add your App" => "Adicione a sua aplicação",
 "More Apps" => "Mais Aplicações",
 "Select an App" => "Selecione uma aplicação",
@@ -37,18 +80,18 @@
 "Bugtracker" => "Bugtracker",
 "Commercial Support" => "Suporte Comercial",
 "You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Usou <strong>%s</strong> do disponivel <strong>%s</strong>",
-"Clients" => "Clientes",
-"Download Desktop Clients" => "Transferir os clientes de sincronização",
-"Download Android Client" => "Transferir o cliente android",
-"Download iOS Client" => "Transferir o cliente iOS",
+"Get the apps to sync your files" => "Obtenha as aplicações para sincronizar os seus ficheiros",
+"Show First Run Wizard again" => "Mostrar novamente Wizard de Arranque Inicial",
 "Password" => "Palavra-chave",
 "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 actual",
 "New password" => "Nova palavra-chave",
-"show" => "mostrar",
 "Change password" => "Alterar palavra-chave",
 "Display Name" => "Nome público",
+"Your display name was changed" => "O seu nome foi alterado",
+"Unable to change your display name" => "Não foi possível alterar o seu nome",
+"Change display name" => "Alterar nome",
 "Email" => "endereço de email",
 "Your email address" => "O seu endereço de email",
 "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",
@@ -56,18 +99,13 @@
 "Help translate" => "Ajude a traduzir",
 "WebDAV" => "WebDAV",
 "Use this address to connect to your ownCloud in your file manager" => "Use este endereço no seu gestor de ficheiros para ligar à sua ownCloud",
-"Version" => "Versão",
-"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Desenvolvido pela <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunidade ownCloud</a>, o<a href=\"https://github.com/owncloud\" target=\"_blank\">código fonte</a> está licenciado sob a <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
 "Login Name" => "Nome de utilizador",
-"Groups" => "Grupos",
 "Create" => "Criar",
 "Default Storage" => "Armazenamento Padrão",
 "Unlimited" => "Ilimitado",
 "Other" => "Outro",
-"Group Admin" => "Grupo Administrador",
 "Storage" => "Armazenamento",
 "change display name" => "modificar nome exibido",
 "set new password" => "definir nova palavra-passe",
-"Default" => "Padrão",
-"Delete" => "Apagar"
+"Default" => "Padrão"
 );
diff --git a/settings/l10n/ro.php b/settings/l10n/ro.php
index dcc55a843dc..99265e30574 100644
--- a/settings/l10n/ro.php
+++ b/settings/l10n/ro.php
@@ -17,7 +17,17 @@
 "Enable" => "Activați",
 "Error" => "Eroare",
 "Saving..." => "Salvez...",
+"deleted" => "șters",
+"undo" => "Anulează ultima acțiune",
+"Groups" => "Grupuri",
+"Group Admin" => "Grupul Admin ",
+"Delete" => "Șterge",
 "__language_name__" => "_language_name_",
+"Security Warning" => "Avertisment de securitate",
+"Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Directorul tău de date și fișierele tale probabil sunt accesibile prin internet. Fișierul .htaccess oferit de ownCloud nu funcționează. Îți recomandăm să configurezi server-ul tău web într-un mod în care directorul de date să nu mai fie accesibil sau mută directorul de date în afara directorului root al server-ului web.",
+"More" => "Mai mult",
+"Version" => "Versiunea",
+"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Dezvoltat de the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunitatea ownCloud</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">codul sursă</a> este licențiat sub <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
 "Add your App" => "Adaugă aplicația ta",
 "More Apps" => "Mai multe aplicații",
 "Select an App" => "Selectează o aplicație",
@@ -31,16 +41,11 @@
 "Bugtracker" => "Urmărire bug-uri",
 "Commercial Support" => "Suport comercial",
 "You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Ați utilizat <strong>%s</strong> din <strong>%s</strong> disponibile",
-"Clients" => "Clienți",
-"Download Desktop Clients" => "Descarcă client desktop",
-"Download Android Client" => "Descarcă client Android",
-"Download iOS Client" => "Descarcă client iOS",
 "Password" => "Parolă",
 "Your password was changed" => "Parola a fost modificată",
 "Unable to change your password" => "Imposibil de-ați schimbat parola",
 "Current password" => "Parola curentă",
 "New password" => "Noua parolă",
-"show" => "afișează",
 "Change password" => "Schimbă parola",
 "Email" => "Email",
 "Your email address" => "Adresa ta de email",
@@ -49,15 +54,10 @@
 "Help translate" => "Ajută la traducere",
 "WebDAV" => "WebDAV",
 "Use this address to connect to your ownCloud in your file manager" => "Folosește această adresă pentru a conecta ownCloud cu managerul de fișiere",
-"Version" => "Versiunea",
-"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Dezvoltat de the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunitatea ownCloud</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">codul sursă</a> este licențiat sub <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
-"Groups" => "Grupuri",
 "Create" => "Crează",
 "Default Storage" => "Stocare implicită",
 "Unlimited" => "Nelimitată",
 "Other" => "Altele",
-"Group Admin" => "Grupul Admin ",
 "Storage" => "Stocare",
-"Default" => "Implicită",
-"Delete" => "Șterge"
+"Default" => "Implicită"
 );
diff --git a/settings/l10n/ru.php b/settings/l10n/ru.php
index 4c01951c508..56dd597966e 100644
--- a/settings/l10n/ru.php
+++ b/settings/l10n/ru.php
@@ -24,7 +24,50 @@
 "Error" => "Ошибка",
 "Updated" => "Обновлено",
 "Saving..." => "Сохранение...",
+"deleted" => "удален",
+"undo" => "отмена",
+"Unable to remove user" => "Невозможно удалить пользователя",
+"Groups" => "Группы",
+"Group Admin" => "Группа Администраторы",
+"Delete" => "Удалить",
+"add group" => "добавить группу",
+"A valid username must be provided" => "Предоставте подходящее имя пользователя",
+"Error creating user" => "Ошибка создания пользователя",
+"A valid password must be provided" => "Предоставте подходящий пароль",
 "__language_name__" => "Русский ",
+"Security Warning" => "Предупреждение безопасности",
+"Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Ваши каталоги данных и файлы, вероятно, доступны из Интернета. Файл .htaccess, предоставляемый ownCloud, не работает. Мы настоятельно рекомендуем Вам настроить вебсервер таким образом, чтобы каталоги данных больше не были доступны, или переместить их за пределы корневого каталога документов веб-сервера.",
+"Setup Warning" => "Предупреждение установки",
+"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Ваш веб сервер до сих пор не настроен правильно для возможности синхронизации файлов, похоже что проблема в неисправности интерфейса WebDAV.",
+"Please double check the <a href='%s'>installation guides</a>." => "Пожалуйста, дважды просмотрите <a href='%s'>инструкции по установке</a>.",
+"Module 'fileinfo' missing" => "Модуль 'fileinfo' потерян",
+"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "PHP модуль 'fileinfo' потерян. Мы настоятельно рекомендуем включить этот модуль для получения лучших результатов в mime-типе обнаружения.",
+"Locale not working" => "Локализация не работает",
+"This ownCloud server can't set system locale to %s. This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support %s." => "Этот сервер ownCloud не может установить язык системы на %s. Это означает, что могут быть проблемы с некоторыми символами в именах файлов. Мы настоятельно рекомендуем установить необходимые пакеты в вашей системе для поддержки %s.",
+"Internet connection not working" => "Интернет соединение не работает",
+"This ownCloud server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features of ownCloud." => "Этот сервер ownCloud не имеет ни одного рабочего интернет соединения. Это значит, что некоторые возможности, такие как монтаж внешних носителей, уведомления о обновлениях или установки 3го рода приложений,не работают.",
+"Cron" => "Демон",
+"Execute one task with each page loaded" => "Выполнять одно задание с каждой загруженной страницей",
+"cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "cron.php зарегистрирован на webcron сервисе. Вызов страницы cron.php в корне owncloud раз в минуту через http.",
+"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "Использование системной службы cron. Вызов файла cron.php в папке owncloud через систему cronjob раз в минуту.",
+"Sharing" => "Общий доступ",
+"Enable Share API" => "Включить API общего доступа",
+"Allow apps to use the Share API" => "Позволить программам использовать API общего доступа",
+"Allow links" => "Разрешить ссылки",
+"Allow users to share items to the public with links" => "Разрешить пользователям открывать в общий доступ эллементы с публичной ссылкой",
+"Allow resharing" => "Разрешить переоткрытие общего доступа",
+"Allow users to share items shared with them again" => "Позволить пользователям открывать общий доступ к эллементам уже открытым в общий доступ",
+"Allow users to share with anyone" => "Разрешить пользователя делать общий доступ любому",
+"Allow users to only share with users in their groups" => "Разрешить пользователям делать общий доступ только для пользователей их групп",
+"Security" => "Безопасность",
+"Enforce HTTPS" => "Принудить к HTTPS",
+"Enforces the clients to connect to ownCloud via an encrypted connection." => "Принудить клиентов подключаться к ownCloud через шифрованное подключение.",
+"Please connect to this ownCloud instance via HTTPS to enable or disable the SSL enforcement." => "Пожалуйста, подключитесь к этому экземпляру ownCloud через HTTPS для включения или отключения SSL принуждения.",
+"Log" => "Лог",
+"Log level" => "Уровень лога",
+"More" => "Больше",
+"Version" => "Версия",
+"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Разрабатывается <a href=\"http://ownCloud.org/contact\" target=\"_blank\">сообществом ownCloud</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">исходный код</a> доступен под лицензией <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
 "Add your App" => "Добавить приложение",
 "More Apps" => "Больше приложений",
 "Select an App" => "Выберите приложение",
@@ -38,16 +81,13 @@
 "Bugtracker" => "Bugtracker",
 "Commercial Support" => "Коммерческая поддержка",
 "You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Вы использовали <strong>%s</strong> из доступных <strong>%s</strong>",
-"Clients" => "Клиенты",
-"Download Desktop Clients" => "Загрузка приложений для компьютера",
-"Download Android Client" => "Загрузка Android-приложения",
-"Download iOS Client" => "Загрузка iOS-приложения",
+"Get the apps to sync your files" => "Получить приложения для синхронизации ваших файлов",
+"Show First Run Wizard again" => "Показать помощник настройки",
 "Password" => "Пароль",
 "Your password was changed" => "Ваш пароль изменён",
 "Unable to change your password" => "Невозможно сменить пароль",
 "Current password" => "Текущий пароль",
 "New password" => "Новый пароль",
-"show" => "показать",
 "Change password" => "Сменить пароль",
 "Display Name" => "Отображаемое имя",
 "Your display name was changed" => "Ваше отображаемое имя было изменено",
@@ -60,18 +100,13 @@
 "Help translate" => "Помочь с переводом",
 "WebDAV" => "WebDAV",
 "Use this address to connect to your ownCloud in your file manager" => "Используйте этот URL для подключения файлового менеджера к Вашему хранилищу",
-"Version" => "Версия",
-"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Разрабатывается <a href=\"http://ownCloud.org/contact\" target=\"_blank\">сообществом ownCloud</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">исходный код</a> доступен под лицензией <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
 "Login Name" => "Имя пользователя",
-"Groups" => "Группы",
 "Create" => "Создать",
 "Default Storage" => "Хранилище по-умолчанию",
 "Unlimited" => "Неограниченно",
 "Other" => "Другое",
-"Group Admin" => "Группа Администраторы",
 "Storage" => "Хранилище",
 "change display name" => "изменить отображаемое имя",
 "set new password" => "установить новый пароль",
-"Default" => "По-умолчанию",
-"Delete" => "Удалить"
+"Default" => "По-умолчанию"
 );
diff --git a/settings/l10n/ru_RU.php b/settings/l10n/ru_RU.php
index 7dde545e2ed..46897eda84a 100644
--- a/settings/l10n/ru_RU.php
+++ b/settings/l10n/ru_RU.php
@@ -17,7 +17,19 @@
 "Enable" => "Включить",
 "Error" => "Ошибка",
 "Saving..." => "Сохранение",
+"deleted" => "удалено",
+"undo" => "отменить действие",
+"Groups" => "Группы",
+"Group Admin" => "Группа Admin",
+"Delete" => "Удалить",
 "__language_name__" => "__язык_имя__",
+"Security Warning" => "Предупреждение системы безопасности",
+"Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Ваши каталоги данных и файлы, вероятно, доступны из Интернета. Файл .htaccess, предоставляемый ownCloud, не работает. Мы настоятельно рекомендуем Вам настроить вебсервер таким образом, чтобы каталоги данных больше не были доступны, или переместить их за пределы корневого каталога документов веб-сервера.",
+"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Ваш веб сервер ещё не достаточно точно настроен для возможности синхронизации, т.к. похоже, что интерфейс WebDAV сломан.",
+"Please double check the <a href='%s'>installation guides</a>." => "Пожалуйста проверте дважды <a href='%s'>гиды по установке</a>.",
+"More" => "Подробнее",
+"Version" => "Версия",
+"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Разработанный <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
 "Add your App" => "Добавить Ваше приложение",
 "More Apps" => "Больше приложений",
 "Select an App" => "Выбрать приложение",
@@ -31,16 +43,12 @@
 "Bugtracker" => "Отслеживание ошибок",
 "Commercial Support" => "Коммерческая поддержка",
 "You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Вы использовали <strong>%s</strong> из возможных <strong>%s</strong>",
-"Clients" => "Клиенты",
-"Download Desktop Clients" => "Загрузка десктопных клиентов",
-"Download Android Client" => "Загрузить клиент под Android ",
-"Download iOS Client" => "Загрузить клиент под iOS ",
+"Show First Run Wizard again" => "Вновь показать помощника первоначальной настройки",
 "Password" => "Пароль",
 "Your password was changed" => "Ваш пароль был изменен",
 "Unable to change your password" => "Невозможно изменить Ваш пароль",
 "Current password" => "Текущий пароль",
 "New password" => "Новый пароль",
-"show" => "показать",
 "Change password" => "Изменить пароль",
 "Email" => "Электронная почта",
 "Your email address" => "Адрес Вашей электронной почты",
@@ -49,16 +57,11 @@
 "Help translate" => "Помогите перевести",
 "WebDAV" => "WebDAV",
 "Use this address to connect to your ownCloud in your file manager" => "Используйте этот адрес для подключения к ownCloud в Вашем файловом менеджере",
-"Version" => "Версия",
-"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Разработанный <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>.",
-"Groups" => "Группы",
 "Create" => "Создать",
 "Default Storage" => "Хранилище по умолчанию",
 "Unlimited" => "Неограниченный",
 "Other" => "Другой",
-"Group Admin" => "Группа Admin",
 "Storage" => "Хранилище",
 "set new password" => "назначить новый пароль",
-"Default" => "По умолчанию",
-"Delete" => "Удалить"
+"Default" => "По умолчанию"
 );
diff --git a/settings/l10n/si_LK.php b/settings/l10n/si_LK.php
index b2613290f91..6946b41d40c 100644
--- a/settings/l10n/si_LK.php
+++ b/settings/l10n/si_LK.php
@@ -15,27 +15,29 @@
 "Enable" => "ක්‍රියත්මක කරන්න",
 "Error" => "දෝෂයක්",
 "Saving..." => "සුරැකෙමින් පවතී...",
+"undo" => "නිෂ්ප්‍රභ කරන්න",
+"Groups" => "සමූහය",
+"Group Admin" => "කාණ්ඩ පරිපාලක",
+"Delete" => "මකා දමනවා",
+"Security Warning" => "ආරක්ෂක නිවේදනයක්",
+"Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "ඔබගේ දත්ත ඩිරෙක්ටරිය හා ගොනුවලට අන්තර්ජාලයෙන් පිවිසිය හැක. ownCloud සපයා ඇති .htaccess ගොනුව ක්‍රියාකරන්නේ නැත. අපි තරයේ කියා සිටිනුයේ නම්, මෙම දත්ත හා ගොනු එසේ පිවිසීමට නොහැකි වන ලෙස ඔබේ වෙබ් සේවාදායකයා  වින්‍යාස කරන ලෙස හෝ එම ඩිරෙක්ටරිය වෙබ් මූලයෙන් පිටතට ගෙනයන ලෙසය.",
+"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>, 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" => "යෙදුමක් තොරන්න",
 "Update" => "යාවත්කාල කිරීම",
-"Clients" => "සේවාලාභීන්",
 "Password" => "මුරපදය",
 "Your password was changed" => "ඔබගේ මුර පදය වෙනස් කෙරුණි",
 "Unable to change your password" => "මුර පදය වෙනස් කළ නොහැකි විය",
 "Current password" => "වත්මන් මුරපදය",
 "New password" => "නව මුරපදය",
-"show" => "ප්‍රදර්ශනය කිරීම",
 "Change password" => "මුරපදය වෙනස් කිරීම",
 "Email" => "විද්‍යුත් තැපෑල",
 "Your email address" => "ඔබගේ විද්‍යුත් තැපෑල",
 "Fill in an email address to enable password recovery" => "මුරපද ප්‍රතිස්ථාපනය සඳහා විද්‍යුත් තැපැල් විස්තර ලබා දෙන්න",
 "Language" => "භාෂාව",
 "Help translate" => "පරිවර්ථන සහය",
-"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "නිපදන ලද්දේ <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud සමාජයෙන්</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">මුල් කේතය </a>ලයිසන්ස් කර ඇත්තේ <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> යටතේ.",
-"Groups" => "සමූහය",
 "Create" => "තනන්න",
-"Other" => "වෙනත්",
-"Group Admin" => "කාණ්ඩ පරිපාලක",
-"Delete" => "මකා දමනවා"
+"Other" => "වෙනත්"
 );
diff --git a/settings/l10n/sk_SK.php b/settings/l10n/sk_SK.php
index 162e4d3d014..609c949f8ec 100644
--- a/settings/l10n/sk_SK.php
+++ b/settings/l10n/sk_SK.php
@@ -1,6 +1,7 @@
 <?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",
+"Unable to change display name" => "Nemožno zmeniť zobrazované meno",
 "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.",
@@ -11,7 +12,7 @@
 "Language changed" => "Jazyk zmenený",
 "Invalid request" => "Neplatná požiadavka",
 "Admins can't remove themself from the admin group" => "Administrátori nesmú odstrániť sami seba zo skupiny admin",
-"Unable to add user to group %s" => "Nie je možné pridať užívateľa do skupiny %s",
+"Unable to add user to group %s" => "Nie je možné pridať používateľa do skupiny %s",
 "Unable to remove user from group %s" => "Nie je možné odstrániť používateľa zo skupiny %s",
 "Couldn't update app." => "Nemožno aktualizovať aplikáciu.",
 "Update to {appversion}" => "Aktualizovať na {appversion}",
@@ -19,11 +20,54 @@
 "Enable" => "Povoliť",
 "Please wait...." => "Čakajte prosím...",
 "Updating...." => "Aktualizujem...",
-"Error while updating app" => "hyba pri aktualizácii aplikácie",
+"Error while updating app" => "chyba pri aktualizácii aplikácie",
 "Error" => "Chyba",
 "Updated" => "Aktualizované",
 "Saving..." => "Ukladám...",
+"deleted" => "zmazané",
+"undo" => "vrátiť",
+"Unable to remove user" => "Nemožno odobrať používateľa",
+"Groups" => "Skupiny",
+"Group Admin" => "Správca skupiny",
+"Delete" => "Odstrániť",
+"add group" => "pridať skupinu",
+"A valid username must be provided" => "Musíte zadať platné používateľské meno",
+"Error creating user" => "Chyba pri vytváraní používateľa",
+"A valid password must be provided" => "Musíte zadať platné heslo",
 "__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.",
+"Setup Warning" => "Nastavenia oznámení",
+"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Váš webový server nie je správne nastavený na synchronizáciu, pretože rozhranie WebDAV je poškodené.",
+"Please double check the <a href='%s'>installation guides</a>." => "Prosím skontrolujte <a href='%s'>inštalačnú príručku</a>.",
+"Module 'fileinfo' missing" => "Chýba modul 'fileinfo'",
+"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "Chýba modul 'fileinfo'. Dôrazne doporučujeme ho povoliť pre dosiahnutie najlepších výsledkov zisťovania mime-typu.",
+"Locale not working" => "Lokalizácia nefunguje",
+"This ownCloud server can't set system locale to %s. This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support %s." => "Tento server ownCloud nemôže nastaviť národné prostredie systému na %s. To znamená, že by mohli byť problémy s niektorými znakmi v názvoch súborov. Veľmi odporúčame nainštalovať požadované balíky na podporu %s.",
+"Internet connection not working" => "Pripojenie na internet nefunguje",
+"This ownCloud server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features of ownCloud." => "Tento server ownCloud nemá funkčné pripojenie k internetu. To znamená, že niektoré z funkcií, ako je pripojenie externého úložiska, oznámenia o aktualizáciách či inštalácia aplikácií tretích strán nefungujú. Prístup k súborom zo vzdialených miest a odosielanie oznamovacích e-mailov tiež nemusí fungovať. Odporúčame pripojiť tento server  k internetu, ak chcete využívať všetky vlastnosti ownCloud.",
+"Cron" => "Cron",
+"Execute one task with each page loaded" => "Vykonať jednu úlohu s každým načítaní stránky",
+"cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "cron.php je registrovaná u služby webcron. Zavolá cron.php stránku v koreňovom priečinku owncloud raz za minútu cez protokol HTTP.",
+"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. Zavolať cron.php v priečinku owncloud cez systémovú úlohu raz za minútu",
+"Sharing" => "Zdieľanie",
+"Enable Share API" => "Povoliť API zdieľania",
+"Allow apps to use the Share API" => "Povoliť aplikáciám používať API na zdieľanie",
+"Allow links" => "Povoliť odkazy",
+"Allow users to share items to the public with links" => "Povoliť používateľom zdieľať položky pre verejnosť cez odkazy",
+"Allow resharing" => "Povoliť zdieľanie ďalej",
+"Allow users to share items shared with them again" => "Povoliť používateľom ďalej zdieľať zdieľané položky",
+"Allow users to share with anyone" => "Povoliť používateľom zdieľať s kýmkoľvek",
+"Allow users to only share with users in their groups" => "Povoliť používateľom zdieľať len s používateľmi v ich skupinách",
+"Security" => "Zabezpečenie",
+"Enforce HTTPS" => "Vynútiť HTTPS",
+"Enforces the clients to connect to ownCloud via an encrypted connection." => "Vynúti pripojovanie klientov ownCloud cez šifrované pripojenie.",
+"Please connect to this ownCloud instance via HTTPS to enable or disable the SSL enforcement." => "Pripojte sa k tejto inštancii ownCloud cez HTTPS pre povolenie alebo zakázanie vynútenia SSL.",
+"Log" => "Záznam",
+"Log level" => "Úroveň záznamu",
+"More" => "Viac",
+"Version" => "Verzia",
+"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Vyvinuté <a href=\"http://ownCloud.org/contact\" target=\"_blank\">komunitou ownCloud</a>,<a href=\"https://github.com/owncloud\" target=\"_blank\">zdrojový kód</a> je licencovaný pod <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
 "Add your App" => "Pridať vašu aplikáciu",
 "More Apps" => "Viac aplikácií",
 "Select an App" => "Vyberte aplikáciu",
@@ -31,24 +75,24 @@
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licencované <span class=\"author\"></span>",
 "Update" => "Aktualizovať",
 "User Documentation" => "Príručka používateľa",
-"Administrator Documentation" => "Príručka správcu",
+"Administrator Documentation" => "Príručka administrátora",
 "Online Documentation" => "Online príručka",
 "Forum" => "Fórum",
 "Bugtracker" => "Bugtracker",
 "Commercial Support" => "Komerčná podpora",
 "You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Použili ste <strong>%s</strong> z <strong>%s</strong> dostupných ",
-"Clients" => "Klienti",
-"Download Desktop Clients" => "Stiahnuť desktopového klienta",
-"Download Android Client" => "Stiahnuť Android klienta",
-"Download iOS Client" => "Stiahnuť iOS klienta",
+"Get the apps to sync your files" => "Získať aplikácie na synchronizáciu Vašich súborov",
+"Show First Run Wizard again" => "Znovu zobraziť sprievodcu prvým spustením",
 "Password" => "Heslo",
 "Your password was changed" => "Heslo bolo zmenené",
 "Unable to change your password" => "Nie je možné zmeniť vaše heslo",
 "Current password" => "Aktuálne heslo",
 "New password" => "Nové heslo",
-"show" => "zobraziť",
 "Change password" => "Zmeniť heslo",
 "Display Name" => "Zobrazované meno",
+"Your display name was changed" => "Vaše zobrazované meno bolo zmenené",
+"Unable to change your display name" => "Nemožno zmeniť Vaše zobrazované meno",
+"Change display name" => "Zmeniť zobrazované meno",
 "Email" => "Email",
 "Your email address" => "Vaša emailová adresa",
 "Fill in an email address to enable password recovery" => "Vyplňte emailovú adresu pre aktivovanie obnovy hesla",
@@ -56,18 +100,13 @@
 "Help translate" => "Pomôcť s prekladom",
 "WebDAV" => "WebDAV",
 "Use this address to connect to your ownCloud in your file manager" => "Použite túto adresu pre pripojenie vášho ownCloud k súborovému správcovi",
-"Version" => "Verzia",
-"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Vyvinuté <a href=\"http://ownCloud.org/contact\" target=\"_blank\">komunitou ownCloud</a>,<a href=\"https://github.com/owncloud\" target=\"_blank\">zdrojový kód</a> je licencovaný pod <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
 "Login Name" => "Prihlasovacie meno",
-"Groups" => "Skupiny",
 "Create" => "Vytvoriť",
 "Default Storage" => "Predvolené úložisko",
 "Unlimited" => "Nelimitované",
 "Other" => "Iné",
-"Group Admin" => "Správca skupiny",
 "Storage" => "Úložisko",
 "change display name" => "zmeniť zobrazované meno",
 "set new password" => "nastaviť nové heslo",
-"Default" => "Predvolené",
-"Delete" => "Odstrániť"
+"Default" => "Predvolené"
 );
diff --git a/settings/l10n/sl.php b/settings/l10n/sl.php
index 8f4fb9435e8..249591ab471 100644
--- a/settings/l10n/sl.php
+++ b/settings/l10n/sl.php
@@ -17,7 +17,17 @@
 "Enable" => "Omogoči",
 "Error" => "Napaka",
 "Saving..." => "Poteka shranjevanje ...",
+"deleted" => "izbrisano",
+"undo" => "razveljavi",
+"Groups" => "Skupine",
+"Group Admin" => "Skrbnik skupine",
+"Delete" => "Izbriši",
 "__language_name__" => "__ime_jezika__",
+"Security Warning" => "Varnostno opozorilo",
+"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." => "Trenutno je dostop do podatkovne mape in datotek najverjetneje omogočen vsem uporabnikom na omrežju. Datoteka .htaccess, vključena v ownCloud namreč ni omogočena. Močno priporočamo nastavitev spletnega strežnika tako, da mapa podatkov ne bo javno dostopna ali pa, da jo prestavite ven iz korenske mape spletnega strežnika.",
+"More" => "Več",
+"Version" => "Različica",
+"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Programski paket razvija <a href=\"http://ownCloud.org/contact\" target=\"_blank\">skupnost ownCloud</a>. <a href=\"https://github.com/owncloud\" target=\"_blank\">Izvorna koda</a> je objavljena pod pogoji dovoljenja <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Splošno javno dovoljenje Affero\">AGPL</abbr></a>.",
 "Add your App" => "Dodaj program",
 "More Apps" => "Več programov",
 "Select an App" => "Izberite program",
@@ -31,16 +41,12 @@
 "Bugtracker" => "Sistem za sledenje napakam",
 "Commercial Support" => "Komercialna podpora",
 "You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Uporabljate <strong>%s</strong> od razpoložljivih <strong>%s</strong>",
-"Clients" => "Stranka",
-"Download Desktop Clients" => "Prenesi namizne odjemalce",
-"Download Android Client" => "Prenesi Android odjemalec",
-"Download iOS Client" => "Prenesi iOS odjemalec",
+"Get the apps to sync your files" => "Pridobi programe za usklajevanje datotek",
 "Password" => "Geslo",
 "Your password was changed" => "Vaše geslo je spremenjeno",
 "Unable to change your password" => "Gesla ni mogoče spremeniti.",
 "Current password" => "Trenutno geslo",
 "New password" => "Novo geslo",
-"show" => "pokaži",
 "Change password" => "Spremeni geslo",
 "Email" => "Elektronska pošta",
 "Your email address" => "Vaš elektronski poštni naslov",
@@ -49,15 +55,10 @@
 "Help translate" => "Pomagajte pri prevajanju",
 "WebDAV" => "WebDAV",
 "Use this address to connect to your ownCloud in your file manager" => "Uporabite ta naslov za povezavo do ownCloud v vašem upravljalniku datotek.",
-"Version" => "Različica",
-"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Programski paket razvija <a href=\"http://ownCloud.org/contact\" target=\"_blank\">skupnost ownCloud</a>. <a href=\"https://github.com/owncloud\" target=\"_blank\">Izvorna koda</a> je objavljena pod pogoji dovoljenja <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Splošno javno dovoljenje Affero\">AGPL</abbr></a>.",
-"Groups" => "Skupine",
 "Create" => "Ustvari",
 "Default Storage" => "Privzeta shramba",
 "Unlimited" => "Neomejeno",
 "Other" => "Drugo",
-"Group Admin" => "Skrbnik skupine",
 "Storage" => "Shramba",
-"Default" => "Privzeto",
-"Delete" => "Izbriši"
+"Default" => "Privzeto"
 );
diff --git a/settings/l10n/sr.php b/settings/l10n/sr.php
index 1b12a0178dd..460fab121a0 100644
--- a/settings/l10n/sr.php
+++ b/settings/l10n/sr.php
@@ -17,7 +17,14 @@
 "Enable" => "Укључи",
 "Error" => "Грешка",
 "Saving..." => "Чување у току...",
+"undo" => "опозови",
+"Groups" => "Групе",
+"Group Admin" => "Управник групе",
+"Delete" => "Обриши",
 "__language_name__" => "__language_name__",
+"Security Warning" => "Сигурносно упозорење",
+"Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Тренутно су ваши подаци и датотеке доступне са интернета. Датотека .htaccess коју је обезбедио пакет ownCloud не функционише. Саветујемо вам да подесите веб сервер тако да директоријум са подацима не буде изложен или да га преместите изван коренског директоријума веб сервера.",
+"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Развијају <a href=\"http://ownCloud.org/contact\" target=\"_blank\">Оунклауд (ownCloud) заједница</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">изворни код</a> је издат под <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Аферо Јавном Лиценцом (Affero General Public License)\">АГПЛ лиценцом</abbr></a>.",
 "Add your App" => "Додајте ваш програм",
 "More Apps" => "Више програма",
 "Select an App" => "Изаберите програм",
@@ -25,23 +32,18 @@
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-лиценцирао <span class=\"author\"></span>",
 "Update" => "Ажурирај",
 "You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Искористили сте <strong>%s</strong> од дозвољених <strong>%s</strong>",
-"Clients" => "Клијенти",
+"Show First Run Wizard again" => "Поново прикажи чаробњак за прво покретање",
 "Password" => "Лозинка",
 "Your password was changed" => "Лозинка је промењена",
 "Unable to change your password" => "Не могу да изменим вашу лозинку",
 "Current password" => "Тренутна лозинка",
 "New password" => "Нова лозинка",
-"show" => "прикажи",
 "Change password" => "Измени лозинку",
 "Email" => "Е-пошта",
 "Your email address" => "Ваша адреса е-поште",
 "Fill in an email address to enable password recovery" => "Ун",
 "Language" => "Језик",
 "Help translate" => " Помозите у превођењу",
-"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Развијају <a href=\"http://ownCloud.org/contact\" target=\"_blank\">Оунклауд (ownCloud) заједница</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">изворни код</a> је издат под <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Аферо Јавном Лиценцом (Affero General Public License)\">АГПЛ лиценцом</abbr></a>.",
-"Groups" => "Групе",
 "Create" => "Направи",
-"Other" => "Друго",
-"Group Admin" => "Управник групе",
-"Delete" => "Обриши"
+"Other" => "Друго"
 );
diff --git a/settings/l10n/sr@latin.php b/settings/l10n/sr@latin.php
index 942594eb028..96190507d53 100644
--- a/settings/l10n/sr@latin.php
+++ b/settings/l10n/sr@latin.php
@@ -2,18 +2,16 @@
 "Authentication error" => "Greška pri autentifikaciji",
 "Language changed" => "Jezik je izmenjen",
 "Invalid request" => "Neispravan zahtev",
+"Groups" => "Grupe",
+"Delete" => "Obriši",
 "Select an App" => "Izaberite program",
-"Clients" => "Klijenti",
 "Password" => "Lozinka",
 "Unable to change your password" => "Ne mogu da izmenim vašu lozinku",
 "Current password" => "Trenutna lozinka",
 "New password" => "Nova lozinka",
-"show" => "prikaži",
 "Change password" => "Izmeni lozinku",
 "Email" => "E-mail",
 "Language" => "Jezik",
-"Groups" => "Grupe",
 "Create" => "Napravi",
-"Other" => "Drugo",
-"Delete" => "Obriši"
+"Other" => "Drugo"
 );
diff --git a/settings/l10n/sv.php b/settings/l10n/sv.php
index fb8c7854e9b..0e1723a9373 100644
--- a/settings/l10n/sv.php
+++ b/settings/l10n/sv.php
@@ -1,6 +1,7 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "Kan inte ladda listan från App Store",
 "Authentication error" => "Autentiseringsfel",
+"Unable to change display name" => "Kan inte ändra visningsnamn",
 "Group already exists" => "Gruppen finns redan",
 "Unable to add group" => "Kan inte lägga till grupp",
 "Could not enable app. " => "Kunde inte aktivera appen.",
@@ -23,7 +24,19 @@
 "Error" => "Fel",
 "Updated" => "Uppdaterad",
 "Saving..." => "Sparar...",
+"deleted" => "raderad",
+"undo" => "ångra",
+"Groups" => "Grupper",
+"Group Admin" => "Gruppadministratör",
+"Delete" => "Radera",
 "__language_name__" => "__language_name__",
+"Security Warning" => "Säkerhetsvarning",
+"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." => "Din datakatalog och dina filer är förmodligen tillgängliga från Internet. Den .htaccess-fil som ownCloud tillhandahåller fungerar inte. Vi rekommenderar starkt att du konfigurerar webbservern så att datakatalogen inte längre är tillgänglig eller att du flyttar datakatalogen utanför webbserverns dokument-root.",
+"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Din webbserver är inte korrekt konfigurerad för att tillåta filsynkronisering eftersom WebDAV inte verkar fungera.",
+"Please double check the <a href='%s'>installation guides</a>." => "Var god kontrollera <a href='%s'>installationsguiden</a>.",
+"More" => "Mer",
+"Version" => "Version",
+"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Utvecklad av <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud kommunity</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">källkoden</a> är licenserad under <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
 "Add your App" => "Lägg till din applikation",
 "More Apps" => "Fler Appar",
 "Select an App" => "Välj en App",
@@ -37,18 +50,17 @@
 "Bugtracker" => "Bugtracker",
 "Commercial Support" => "Kommersiell support",
 "You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Du har använt <strong>%s</strong> av tillgängliga <strong>%s</strong>",
-"Clients" => "Kunder",
-"Download Desktop Clients" => "Ladda ner skrivbordsklienter",
-"Download Android Client" => "Ladda ner klient för Android",
-"Download iOS Client" => "Ladda ner klient för iOS",
+"Show First Run Wizard again" => "Visa Första uppstarts-guiden igen",
 "Password" => "Lösenord",
 "Your password was changed" => "Ditt lösenord har ändrats",
 "Unable to change your password" => "Kunde inte ändra ditt lösenord",
 "Current password" => "Nuvarande lösenord",
 "New password" => "Nytt lösenord",
-"show" => "visa",
 "Change password" => "Ändra lösenord",
 "Display Name" => "Visat namn",
+"Your display name was changed" => "Ditt visningsnamn har ändrats",
+"Unable to change your display name" => "Kan inte ändra ditt visningsnamn",
+"Change display name" => "Ändra visningsnamn",
 "Email" => "E-post",
 "Your email address" => "Din e-postadress",
 "Fill in an email address to enable password recovery" => "Fyll i en e-postadress för att aktivera återställning av lösenord",
@@ -56,18 +68,13 @@
 "Help translate" => "Hjälp att översätta",
 "WebDAV" => "WebDAV",
 "Use this address to connect to your ownCloud in your file manager" => "Använd denna adress för att ansluta till ownCloud i din filhanterare",
-"Version" => "Version",
-"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Utvecklad av <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud kommunity</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">källkoden</a> är licenserad under <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
 "Login Name" => "Inloggningsnamn",
-"Groups" => "Grupper",
 "Create" => "Skapa",
 "Default Storage" => "Förvald lagring",
 "Unlimited" => "Obegränsad",
 "Other" => "Annat",
-"Group Admin" => "Gruppadministratör",
 "Storage" => "Lagring",
 "change display name" => "ändra visat namn",
 "set new password" => "ange nytt lösenord",
-"Default" => "Förvald",
-"Delete" => "Radera"
+"Default" => "Förvald"
 );
diff --git a/settings/l10n/ta_LK.php b/settings/l10n/ta_LK.php
index 5e94df0dfb2..0bb29158fd2 100644
--- a/settings/l10n/ta_LK.php
+++ b/settings/l10n/ta_LK.php
@@ -16,7 +16,15 @@
 "Enable" => "செயலற்றதாக்குக",
 "Error" => "வழு",
 "Saving..." => "இயலுமைப்படுத்துக",
+"undo" => "முன் செயல் நீக்கம் ",
+"Groups" => "குழுக்கள்",
+"Group Admin" => "குழு நிர்வாகி",
+"Delete" => "அழிக்க",
 "__language_name__" => "_மொழி_பெயர்_",
+"Security Warning" => "பாதுகாப்பு எச்சரிக்கை",
+"Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "உங்களுடைய தரவு அடைவு மற்றும் உங்களுடைய கோப்புக்களை பெரும்பாலும் இணையத்தினூடாக அணுகலாம். ownCloud இனால் வழங்கப்படுகின்ற .htaccess கோப்பு வேலை செய்யவில்லை. தரவு அடைவை நீண்ட நேரத்திற்கு அணுகக்கூடியதாக உங்களுடைய வலைய சேவையகத்தை தகவமைக்குமாறு நாங்கள் உறுதியாக கூறுகிறோம் அல்லது தரவு அடைவை வலைய சேவையக மூல ஆவணத்திலிருந்து வெளியே அகற்றுக.  ",
+"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>." => "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>.",
 "Add your App" => "உங்களுடைய செயலியை சேர்க்க",
 "More Apps" => "மேலதிக செயலிகள்",
 "Select an App" => "செயலி ஒன்றை தெரிவுசெய்க",
@@ -24,23 +32,17 @@
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"அனுமதிப்பத்திரம்\"></span>-அனுமதி பெற்ற <span class=\"ஆசிரியர்\"></span>",
 "Update" => "இற்றைப்படுத்தல்",
 "You have used <strong>%s</strong> of the available <strong>%s</strong>" => "நீங்கள் <strong>%s</strong> இலுள்ள <strong>%s</strong>பயன்படுத்தியுள்ளீர்கள்",
-"Clients" => "வாடிக்கையாளர்கள்",
 "Password" => "கடவுச்சொல்",
 "Your password was changed" => "உங்களுடைய கடவுச்சொல் மாற்றப்பட்டுள்ளது",
 "Unable to change your password" => "உங்களுடைய கடவுச்சொல்லை மாற்றமுடியாது",
 "Current password" => "தற்போதைய கடவுச்சொல்",
 "New password" => "புதிய கடவுச்சொல்",
-"show" => "காட்டு",
 "Change password" => "கடவுச்சொல்லை மாற்றுக",
 "Email" => "மின்னஞ்சல்",
 "Your email address" => "உங்களுடைய மின்னஞ்சல் முகவரி",
 "Fill in an email address to enable password recovery" => "கடவுச்சொல் மீள் பெறுவதை இயலுமைப்படுத்துவதற்கு மின்னஞ்சல் முகவரியை இயலுமைப்படுத்துக",
 "Language" => "மொழி",
 "Help translate" => "மொழிபெயர்க்க உதவி",
-"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
-"Groups" => "குழுக்கள்",
 "Create" => "உருவாக்குக",
-"Other" => "மற்றவை",
-"Group Admin" => "குழு நிர்வாகி",
-"Delete" => "அழிக்க"
+"Other" => "மற்றவை"
 );
diff --git a/settings/l10n/th_TH.php b/settings/l10n/th_TH.php
index 309dbc2657c..fd623655f83 100644
--- a/settings/l10n/th_TH.php
+++ b/settings/l10n/th_TH.php
@@ -23,7 +23,17 @@
 "Error" => "ข้อผิดพลาด",
 "Updated" => "อัพเดทแล้ว",
 "Saving..." => "กำลังบันทึุกข้อมูล...",
+"deleted" => "ลบแล้ว",
+"undo" => "เลิกทำ",
+"Groups" => "กลุ่ม",
+"Group Admin" => "ผู้ดูแลกลุ่ม",
+"Delete" => "ลบ",
 "__language_name__" => "ภาษาไทย",
+"Security Warning" => "คำเตือนเกี่ยวกับความปลอดภัย",
+"Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "ไดเร็กทอรี่ข้อมูลและไฟล์ของคุณสามารถเข้าถึงได้จากอินเทอร์เน็ต ไฟล์ .htaccess ที่ ownCloud มีให้ไม่สามารถทำงานได้อย่างเหมาะสม เราขอแนะนำให้คุณกำหนดค่าเว็บเซิร์ฟเวอร์ใหม่ในรูปแบบที่ไดเร็กทอรี่เก็บข้อมูลไม่สามารถเข้าถึงได้อีกต่อไป หรือคุณได้ย้ายไดเร็กทอรี่ที่ใช้เก็บข้อมูลไปอยู่ภายนอกตำแหน่ง root ของเว็บเซิร์ฟเวอร์แล้ว",
+"More" => "มาก",
+"Version" => "รุ่น",
+"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "พัฒนาโดย the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ชุมชนผู้ใช้งาน ownCloud</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">ซอร์สโค้ด</a>อยู่ภายใต้สัญญาอนุญาตของ <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
 "Add your App" => "เพิ่มแอปของคุณ",
 "More Apps" => "แอปฯอื่นเพิ่มเติม",
 "Select an App" => "เลือก App",
@@ -37,16 +47,12 @@
 "Bugtracker" => "Bugtracker",
 "Commercial Support" => "บริการลูกค้าแบบเสียค่าใช้จ่าย",
 "You have used <strong>%s</strong> of the available <strong>%s</strong>" => "คุณได้ใช้งานไปแล้ว <strong>%s</strong> จากจำนวนที่สามารถใช้ได้ <strong>%s</strong>",
-"Clients" => "ลูกค้า",
-"Download Desktop Clients" => "ดาวน์โหลดโปรแกรมไคลเอนต์สำหรับเครื่องเดสก์ท็อป",
-"Download Android Client" => "ดาวน์โหลดโปรแกรมไคลเอนต์สำหรับแอนดรอยด์",
-"Download iOS Client" => "ดาวน์โหลดโปรแกรมไคลเอนต์สำหรับ iOS",
+"Show First Run Wizard again" => "แสดงหน้าจอวิซาร์ดนำทางครั้งแรกอีกครั้ง",
 "Password" => "รหัสผ่าน",
 "Your password was changed" => "รหัสผ่านของคุณถูกเปลี่ยนแล้ว",
 "Unable to change your password" => "ไม่สามารถเปลี่ยนรหัสผ่านของคุณได้",
 "Current password" => "รหัสผ่านปัจจุบัน",
 "New password" => "รหัสผ่านใหม่",
-"show" => "แสดง",
 "Change password" => "เปลี่ยนรหัสผ่าน",
 "Display Name" => "ชื่อที่ต้องการแสดง",
 "Email" => "อีเมล์",
@@ -56,18 +62,13 @@
 "Help translate" => "ช่วยกันแปล",
 "WebDAV" => "WebDAV",
 "Use this address to connect to your ownCloud in your file manager" => "ใช้ที่อยู่นี้เพื่อเชื่อมต่อกับ ownCloud ในโปรแกรมจัดการไฟล์ของคุณ",
-"Version" => "รุ่น",
-"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "พัฒนาโดย the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ชุมชนผู้ใช้งาน ownCloud</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">ซอร์สโค้ด</a>อยู่ภายใต้สัญญาอนุญาตของ <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
 "Login Name" => "ชื่อที่ใช้สำหรับเข้าสู่ระบบ",
-"Groups" => "กลุ่ม",
 "Create" => "สร้าง",
 "Default Storage" => "พื้นที่จำกัดข้อมูลเริ่มต้น",
 "Unlimited" => "ไม่จำกัดจำนวน",
 "Other" => "อื่นๆ",
-"Group Admin" => "ผู้ดูแลกลุ่ม",
 "Storage" => "พื้นที่จัดเก็บข้อมูล",
 "change display name" => "เปลี่ยนชื่อที่ต้องการให้แสดง",
 "set new password" => "ตั้งค่ารหัสผ่านใหม่",
-"Default" => "ค่าเริ่มต้น",
-"Delete" => "ลบ"
+"Default" => "ค่าเริ่มต้น"
 );
diff --git a/settings/l10n/tr.php b/settings/l10n/tr.php
index db55491612e..dd70366557f 100644
--- a/settings/l10n/tr.php
+++ b/settings/l10n/tr.php
@@ -1,6 +1,7 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "App Store'dan liste yüklenemiyor",
 "Authentication error" => "Eşleşme hata",
+"Unable to change display name" => "Ekran adı değiştirilemiyor",
 "Group already exists" => "Grup zaten mevcut",
 "Unable to add group" => "Gruba eklenemiyor",
 "Could not enable app. " => "Uygulama devreye alınamadı",
@@ -10,16 +11,45 @@
 "Unable to delete user" => "Kullanıcı silinemiyor",
 "Language changed" => "Dil değiştirildi",
 "Invalid request" => "Geçersiz istek",
+"Admins can't remove themself from the admin group" => "Yöneticiler kendilerini yönetici grubundan kaldıramaz",
 "Unable to add user to group %s" => "Kullanıcı %s grubuna eklenemiyor",
+"Unable to remove user from group %s" => "%s grubundan kullanıcı kaldırılamıyor",
+"Couldn't update app." => "Uygulama güncellenemedi.",
+"Update to {appversion}" => "{appversion} Güncelle",
 "Disable" => "Etkin değil",
 "Enable" => "Etkin",
+"Please wait...." => "Lütfen bekleyin....",
+"Updating...." => "Güncelleniyor....",
+"Error while updating app" => "Uygulama güncellenirken hata",
 "Error" => "Hata",
+"Updated" => "Güncellendi",
 "Saving..." => "Kaydediliyor...",
+"deleted" => "silindi",
+"undo" => "geri al",
+"Unable to remove user" => "Kullanıcı kaldırılamıyor",
+"Groups" => "Gruplar",
+"Group Admin" => "Yönetici Grubu ",
+"Delete" => "Sil",
+"add group" => "grup ekle",
+"A valid username must be provided" => "Geçerli bir kullanıcı adı mutlaka sağlanmalı",
+"Error creating user" => "Kullanıcı oluşturulurken hata",
+"A valid password must be provided" => "Geçerli bir parola mutlaka sağlanmalı",
 "__language_name__" => "__dil_adı__",
+"Security Warning" => "Güvenlik Uyarisi",
+"Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "data dizininiz ve dosyalarınız büyük ihtimalle internet üzerinden erişilebilir. Owncloud tarafından sağlanan .htaccess  dosyası çalışmıyor. Web sunucunuzu yapılandırarak data dizinine erişimi kapatmanızı veya data dizinini web sunucu döküman dizini dışına almanızı şiddetle tavsiye ederiz.",
+"Setup Warning" => "Kurulum Uyarısı",
+"Module 'fileinfo' missing" => "Modül 'fileinfo' kayıp",
+"Allow resharing" => "Paylaşıma izin ver",
+"Security" => "Güvenlik",
+"Log" => "Kayıtlar",
+"More" => "Daha fazla",
+"Version" => "Sürüm",
+"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Geliştirilen Taraf<a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is altında lisanslanmıştır <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
 "Add your App" => "Uygulamanı Ekle",
-"More Apps" => "Daha fazla App",
+"More Apps" => "Daha fazla uygulama",
 "Select an App" => "Bir uygulama seçin",
 "See application page at apps.owncloud.com" => "Uygulamanın sayfasına apps.owncloud.com adresinden bakın ",
+"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-lisanslayan <span class=\"author\"></span>",
 "Update" => "Güncelleme",
 "User Documentation" => "Kullanıcı Belgelendirmesi",
 "Administrator Documentation" => "Yönetici Belgelendirmesi",
@@ -27,28 +57,32 @@
 "Forum" => "Forum",
 "Bugtracker" => "Hata Takip Sistemi",
 "Commercial Support" => "Ticari Destek",
-"Clients" => "Müşteriler",
-"Download Desktop Clients" => "Masaüstü İstemcilerini İndir",
-"Download Android Client" => "Android İstemcisini İndir",
-"Download iOS Client" => "iOS İstemcisini İndir",
+"Get the apps to sync your files" => "Dosyalarınızı senkronize etmek için uygulamayı indirin",
+"Show First Run Wizard again" => "İlk Çalıştırma Sihirbazını yeniden göster",
 "Password" => "Parola",
 "Your password was changed" => "Şifreniz değiştirildi",
 "Unable to change your password" => "Parolanız değiştirilemiyor",
 "Current password" => "Mevcut parola",
 "New password" => "Yeni parola",
-"show" => "göster",
 "Change password" => "Parola değiştir",
+"Display Name" => "Ekran Adı",
+"Your display name was changed" => "Ekran adınız değiştirildi",
+"Unable to change your display name" => "Ekran adınız değiştirilemiyor",
+"Change display name" => "Ekran adını değiştir",
 "Email" => "Eposta",
 "Your email address" => "Eposta adresiniz",
 "Fill in an email address to enable password recovery" => "Parola sıfırlamayı aktifleştirmek için eposta adresi girin",
 "Language" => "Dil",
 "Help translate" => "Çevirilere yardım edin",
 "WebDAV" => "WebDAV",
-"Version" => "Sürüm",
-"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Geliştirilen Taraf<a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is altında lisanslanmıştır <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
-"Groups" => "Gruplar",
+"Use this address to connect to your ownCloud in your file manager" => "Bu adresi kullanarak ownCloud 'unuza dosya yöneticinizde bağlanın",
+"Login Name" => "Giriş Adı",
 "Create" => "Oluştur",
+"Default Storage" => "Varsayılan Depolama",
+"Unlimited" => "Limitsiz",
 "Other" => "Diğer",
-"Group Admin" => "Yönetici Grubu ",
-"Delete" => "Sil"
+"Storage" => "Depolama",
+"change display name" => "ekran adını değiştir",
+"set new password" => "yeni parola belirle",
+"Default" => "Varsayılan"
 );
diff --git a/settings/l10n/uk.php b/settings/l10n/uk.php
index 7186b2684eb..e37a919b314 100644
--- a/settings/l10n/uk.php
+++ b/settings/l10n/uk.php
@@ -24,7 +24,49 @@
 "Error" => "Помилка",
 "Updated" => "Оновлено",
 "Saving..." => "Зберігаю...",
+"deleted" => "видалені",
+"undo" => "відмінити",
+"Unable to remove user" => "Неможливо видалити користувача",
+"Groups" => "Групи",
+"Group Admin" => "Адміністратор групи",
+"Delete" => "Видалити",
+"add group" => "додати групу",
+"A valid username must be provided" => "Потрібно задати вірне ім'я користувача",
+"Error creating user" => "Помилка при створенні користувача",
+"A valid password must be provided" => "Потрібно задати вірний пароль",
 "__language_name__" => "__language_name__",
+"Security Warning" => "Попередження про небезпеку",
+"Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Ваш каталог з даними та Ваші файли можливо доступні з Інтернету. Файл .htaccess, наданий з ownCloud, не працює. Ми наполегливо рекомендуємо Вам налаштувати свій веб-сервер таким чином, щоб каталог data більше не був доступний, або перемістити каталог data за межі кореневого каталогу документів веб-сервера.",
+"Setup Warning" => "Попередження при Налаштуванні",
+"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Ваш Web-сервер ще не налаштований належним чином для того, щоб дозволити синхронізацію файлів, через те що інтерфейс WebDAV, здається, зламаний.",
+"Please double check the <a href='%s'>installation guides</a>." => "Будь ласка, перевірте <a href='%s'>інструкції по встановленню</a>.",
+"Module 'fileinfo' missing" => "Модуль 'fileinfo' відсутній",
+"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "PHP модуль 'fileinfo' відсутній. Ми наполегливо рекомендуємо увімкнути цей модуль, щоб отримати кращі результати при виявленні MIME-типів.",
+"Locale not working" => "Локалізація не працює",
+"Internet connection not working" => "Інтернет-з'єднання не працює",
+"This ownCloud server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features of ownCloud." => "Цей сервер ownCloud не має під'єднання до Інтернету. Це означає, що деякі функції, такі як монтування зовнішніх накопичувачів, повідомлення про оновлення або встановлення допоміжних програм не працюють. Доступ до файлів ​​віддалено та відправка повідомлень електронною поштою також може не працювати. Ми пропонуємо увімкнути під'єднання до Інтернету для даного сервера, якщо ви хочете мати всі можливості ownCloud.",
+"Cron" => "Cron",
+"Execute one task with each page loaded" => "Виконати одне завдання для кожної завантаженої сторінки ",
+"cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "cron.php зареєстрований в службі webcron. Викликає cron.php сторінку в кореневому каталозі owncloud кожну хвилину по http.",
+"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "Використовується системний cron сервіс. Виклик cron.php файла з owncloud теки за допомогою системного cronjob раз на хвилину.",
+"Sharing" => "Спільний доступ",
+"Enable Share API" => "Увімкнути API спільного доступу",
+"Allow apps to use the Share API" => "Дозволити програмам використовувати API спільного доступу",
+"Allow links" => "Дозволити посилання",
+"Allow users to share items to the public with links" => "Дозволити користувачам відкривати спільний доступ до елементів за допомогою посилань",
+"Allow resharing" => "Дозволити перевідкривати спільний доступ",
+"Allow users to share items shared with them again" => "Дозволити користувачам знову відкривати спільний доступ до елементів, які вже відкриті для доступу",
+"Allow users to share with anyone" => "Дозволити користувачам відкривати спільний доступ для всіх",
+"Allow users to only share with users in their groups" => "Дозволити користувачам відкривати спільний доступ лише для користувачів з їхньої групи",
+"Security" => "Безпека",
+"Enforce HTTPS" => "Примусове застосування HTTPS",
+"Enforces the clients to connect to ownCloud via an encrypted connection." => "Зобов'язати клієнтів під'єднуватись до ownCloud через шифроване з'єднання.",
+"Please connect to this ownCloud instance via HTTPS to enable or disable the SSL enforcement." => "Будь ласка, під'єднайтесь до цього ownCloud за допомогою HTTPS, щоб увімкнути або вимкнути використання SSL.",
+"Log" => "Протокол",
+"Log level" => "Рівень протоколювання",
+"More" => "Більше",
+"Version" => "Версія",
+"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Розроблено <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud громадою</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">вихідний код</a> має ліцензію <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
 "Add your App" => "Додати свою програму",
 "More Apps" => "Більше програм",
 "Select an App" => "Вибрати додаток",
@@ -38,16 +80,13 @@
 "Bugtracker" => "БагТрекер",
 "Commercial Support" => "Комерційна підтримка",
 "You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Ви використали <strong>%s</strong> із доступних <strong>%s</strong>",
-"Clients" => "Клієнти",
-"Download Desktop Clients" => "Завантажити клієнт для ПК",
-"Download Android Client" => "Завантажити клієнт для Android",
-"Download iOS Client" => "Завантажити клієнт для iOS",
+"Get the apps to sync your files" => "Отримати додатки для синхронізації ваших файлів",
+"Show First Run Wizard again" => "Показувати Майстер Налаштувань знову",
 "Password" => "Пароль",
 "Your password was changed" => "Ваш пароль змінено",
 "Unable to change your password" => "Не вдалося змінити Ваш пароль",
 "Current password" => "Поточний пароль",
 "New password" => "Новий пароль",
-"show" => "показати",
 "Change password" => "Змінити пароль",
 "Display Name" => "Показати Ім'я",
 "Your display name was changed" => "Ваше ім'я було змінене",
@@ -60,18 +99,13 @@
 "Help translate" => "Допомогти з перекладом",
 "WebDAV" => "WebDAV",
 "Use this address to connect to your ownCloud in your file manager" => "Використовуйте цю адресу для під'єднання до вашого ownCloud у вашому файловому менеджері",
-"Version" => "Версія",
-"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Розроблено <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>.",
 "Login Name" => "Ім'я Логіну",
-"Groups" => "Групи",
 "Create" => "Створити",
 "Default Storage" => "сховище за замовчуванням",
 "Unlimited" => "Необмежено",
 "Other" => "Інше",
-"Group Admin" => "Адміністратор групи",
 "Storage" => "Сховище",
 "change display name" => "змінити зображене ім'я",
 "set new password" => "встановити новий пароль",
-"Default" => "За замовчуванням",
-"Delete" => "Видалити"
+"Default" => "За замовчуванням"
 );
diff --git a/settings/l10n/ur_PK.php b/settings/l10n/ur_PK.php
new file mode 100644
index 00000000000..1adacafdff8
--- /dev/null
+++ b/settings/l10n/ur_PK.php
@@ -0,0 +1,4 @@
+<?php $TRANSLATIONS = array(
+"Password" => "پاسورڈ",
+"New password" => "نیا پاسورڈ"
+);
diff --git a/settings/l10n/vi.php b/settings/l10n/vi.php
index a7682e7ed0e..8a843f58ed8 100644
--- a/settings/l10n/vi.php
+++ b/settings/l10n/vi.php
@@ -1,6 +1,7 @@
 <?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",
+"Unable to change display name" => "Không thể thay đổi tên hiển thị",
 "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.",
@@ -13,35 +14,66 @@
 "Admins can't remove themself from the admin group" => "Quản trị viên không thể loại bỏ chính họ khỏi nhóm quản lý",
 "Unable to add user to group %s" => "Không thể thêm người dùng vào nhóm %s",
 "Unable to remove user from group %s" => "Không thể xóa người dùng từ nhóm %s",
+"Couldn't update app." => "Không thể cập nhật ứng dụng",
+"Update to {appversion}" => "Cập nhật lên {appversion}",
 "Disable" => "Tắt",
 "Enable" => "Bật",
+"Please wait...." => "Xin hãy đợi...",
+"Updating...." => "Đang cập nhật...",
+"Error while updating app" => "Lỗi khi cập nhật ứng dụng",
 "Error" => "Lỗi",
+"Updated" => "Đã cập nhật",
 "Saving..." => "Đang tiến hành lưu ...",
+"deleted" => "đã xóa",
+"undo" => "lùi lại",
+"Groups" => "Nhóm",
+"Group Admin" => "Nhóm quản trị",
+"Delete" => "Xóa",
 "__language_name__" => "__Ngôn ngữ___",
+"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ừ mạng. Tập tin .htaccess do ownCloud cung cấp không hoạt động. Chúng tôi đề nghị bạn nên cấu hình lại máy chủ web để thư mục dữ liệu không còn bị truy cập hoặc bạn nên di chuyển thư mục dữ liệu ra bên ngoài thư mục gốc của máy chủ.",
+"More" => "hơn",
+"Version" => "Phiên bả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 nhiều ứng dụng hơn 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>",
 "Update" => "Cập nhật",
+"User Documentation" => "Tài liệu người sử dụng",
+"Administrator Documentation" => "Tài liệu quản trị",
+"Online Documentation" => "Tài liệu trực tuyến",
+"Forum" => "Diễn đàn",
+"Bugtracker" => "Hệ ghi nhận lỗi",
+"Commercial Support" => "Hỗ trợ có phí",
 "You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Bạn đã sử dụng <strong>%s </ strong> có sẵn <strong> %s </ strong>",
-"Clients" => "Khách hàng",
+"Get the apps to sync your files" => "Nhận ứng dụng để đồng bộ file của bạn",
+"Show First Run Wizard again" => "Hiện lại việc chạy đồ thuật khởi đầu",
 "Password" => "Mật khẩu",
 "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 ",
-"show" => "Hiện",
 "Change password" => "Đổi mật khẩu",
+"Display Name" => "Tên hiển thị",
+"Your display name was changed" => "Tên hiển thị của bạn đã được thay đổi",
+"Unable to change your display name" => "Không thể thay đổi tên hiển thị của bạn",
+"Change display name" => "Thay đổi tên hiển thị",
 "Email" => "Email",
 "Your email address" => "Email của bạn",
 "Fill in an email address to enable password recovery" => "Nhập địa chỉ email của bạn để khôi phục lại mật khẩu",
 "Language" => "Ngôn ngữ",
 "Help translate" => "Hỗ trợ dịch thuật",
-"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Được phát triển bởi <a href=\"http://ownCloud.org/contact\" target=\"_blank\">cộng đồng ownCloud</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">mã nguồn </a> đã được cấp phép theo chuẩn <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
-"Groups" => "Nhóm",
+"WebDAV" => "WebDAV",
+"Use this address to connect to your ownCloud in your file manager" => "Sử dụng địa chỉ này để kết nối ownCloud của bạn trong trình quản lý file của bạn",
+"Login Name" => "Tên đăng nhập",
 "Create" => "Tạo",
+"Default Storage" => "Bộ nhớ mặc định",
+"Unlimited" => "Không giới hạn",
 "Other" => "Khác",
-"Group Admin" => "Nhóm quản trị",
-"Delete" => "Xóa"
+"Storage" => "Bộ nhớ",
+"change display name" => "Thay đổi tên hiển thị",
+"set new password" => "đặt mật khẩu mới",
+"Default" => "Mặc định"
 );
diff --git a/settings/l10n/zh_CN.GB2312.php b/settings/l10n/zh_CN.GB2312.php
index c7d73ae2ded..fcb479dd827 100644
--- a/settings/l10n/zh_CN.GB2312.php
+++ b/settings/l10n/zh_CN.GB2312.php
@@ -16,30 +16,33 @@
 "Enable" => "启用",
 "Error" => "出错",
 "Saving..." => "保存中...",
+"deleted" => "删除",
+"undo" => "撤销",
+"Groups" => "组",
+"Group Admin" => "群组管理员",
+"Delete" => "删除",
 "__language_name__" => "Chinese",
+"Security Warning" => "安全警告",
+"Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "您的数据文件夹和您的文件或许能够从互联网访问。ownCloud 提供的 .htaccesss 文件未其作用。我们强烈建议您配置网络服务器以使数据文件夹不能从互联网访问，或将移动数据文件夹移出网络服务器文档根目录。",
+"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>",
 "Update" => "更新",
-"Clients" => "客户",
 "Password" => "密码",
 "Your password was changed" => "您的密码以变更",
 "Unable to change your password" => "不能改变你的密码",
 "Current password" => "现在的密码",
 "New password" => "新密码",
-"show" => "展示",
 "Change password" => "改变密码",
 "Email" => "Email",
 "Your email address" => "你的email地址",
 "Fill in an email address to enable password recovery" => "输入一个邮箱地址以激活密码恢复功能",
 "Language" => "语言",
 "Help translate" => "帮助翻译",
-"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "由 <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud 社区</a>开发，<a href=\"https://github.com/owncloud\" target=\"_blank\">s源代码</a> 以 <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> 许可协议发布。",
-"Groups" => "组",
 "Create" => "新建",
-"Other" => "其他的",
-"Group Admin" => "群组管理员",
-"Delete" => "删除"
+"Other" => "其他的"
 );
diff --git a/settings/l10n/zh_CN.php b/settings/l10n/zh_CN.php
index 40c571a8763..226ffb58bc7 100644
--- a/settings/l10n/zh_CN.php
+++ b/settings/l10n/zh_CN.php
@@ -17,7 +17,17 @@
 "Enable" => "启用",
 "Error" => "错误",
 "Saving..." => "正在保存",
+"deleted" => "已经删除",
+"undo" => "撤销",
+"Groups" => "组",
+"Group Admin" => "组管理员",
+"Delete" => "删除",
 "__language_name__" => "简体中文",
+"Security Warning" => "安全警告",
+"Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "您的数据文件夹和文件可由互联网访问。OwnCloud提供的.htaccess文件未生效。我们强烈建议您配置服务器，以使数据文件夹不可被访问，或者将数据文件夹移到web服务器根目录以外。",
+"More" => "更多",
+"Version" => "版本",
+"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "由<a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud社区</a>开发，  <a href=\"https://github.com/owncloud\" target=\"_blank\">源代码</a>在<a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>许可证下发布。",
 "Add your App" => "添加应用",
 "More Apps" => "更多应用",
 "Select an App" => "选择一个应用",
@@ -31,16 +41,12 @@
 "Bugtracker" => "问题跟踪器",
 "Commercial Support" => "商业支持",
 "You have used <strong>%s</strong> of the available <strong>%s</strong>" => "你已使用 <strong>%s</strong>，有效空间 <strong>%s</strong>",
-"Clients" => "客户",
-"Download Desktop Clients" => "下载桌面客户端",
-"Download Android Client" => "下载 Android 客户端",
-"Download iOS Client" => "下载 iOS 客户端",
+"Get the apps to sync your files" => "安装应用进行文件同步",
 "Password" => "密码",
 "Your password was changed" => "密码已修改",
 "Unable to change your password" => "无法修改密码",
 "Current password" => "当前密码",
 "New password" => "新密码",
-"show" => "显示",
 "Change password" => "修改密码",
 "Email" => "电子邮件",
 "Your email address" => "您的电子邮件",
@@ -49,15 +55,10 @@
 "Help translate" => "帮助翻译",
 "WebDAV" => "WebDAV",
 "Use this address to connect to your ownCloud in your file manager" => "用该地址来连接文件管理器中的 ownCloud",
-"Version" => "版本",
-"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "由<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>许可证下发布。",
-"Groups" => "组",
 "Create" => "创建",
 "Default Storage" => "默认存储",
 "Unlimited" => "无限",
 "Other" => "其它",
-"Group Admin" => "组管理员",
 "Storage" => "存储",
-"Default" => "默认",
-"Delete" => "删除"
+"Default" => "默认"
 );
diff --git a/settings/l10n/zh_TW.php b/settings/l10n/zh_TW.php
index ecff21604f3..0b9d2d3d023 100644
--- a/settings/l10n/zh_TW.php
+++ b/settings/l10n/zh_TW.php
@@ -1,6 +1,7 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "無法從 App Store 讀取清單",
 "Authentication error" => "認證錯誤",
+"Unable to change display name" => "無法更改顯示名稱",
 "Group already exists" => "群組已存在",
 "Unable to add group" => "群組增加失敗",
 "Could not enable app. " => "未能啟動此app",
@@ -23,7 +24,21 @@
 "Error" => "錯誤",
 "Updated" => "已更新",
 "Saving..." => "儲存中...",
+"deleted" => "已刪除",
+"undo" => "復原",
+"Unable to remove user" => "無法刪除用戶",
+"Groups" => "群組",
+"Group Admin" => "群組 管理員",
+"Delete" => "刪除",
+"add group" => "新增群組",
 "__language_name__" => "__語言_名稱__",
+"Security Warning" => "安全性警告",
+"Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "您的資料目錄 (Data Directory) 和檔案可能可以由網際網路上面公開存取。Owncloud 所提供的 .htaccess 設定檔並未生效，我們強烈建議您設定您的網頁伺服器以防止資料目錄被公開存取，或將您的資料目錄移出網頁伺服器的 document root 。",
+"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "您的網頁伺服器尚未被正確設定來進行檔案同步，因為您的 WebDAV 界面似乎無法使用。",
+"Please double check the <a href='%s'>installation guides</a>." => "請參考<a href='%s'>安裝指南</a>。",
+"More" => "更多",
+"Version" => "版本",
+"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "由<a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud 社區</a>開發，<a href=\"https://github.com/owncloud\" target=\"_blank\">源代碼</a>在<a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>許可證下發布。",
 "Add your App" => "添加你的 App",
 "More Apps" => "更多Apps",
 "Select an App" => "選擇一個應用程式",
@@ -37,18 +52,17 @@
 "Bugtracker" => "Bugtracker",
 "Commercial Support" => "商用支援",
 "You have used <strong>%s</strong> of the available <strong>%s</strong>" => "您已經使用了 <strong>%s</strong> ，目前可用空間為 <strong>%s</strong>",
-"Clients" => "客戶",
-"Download Desktop Clients" => "下載桌面客戶端",
-"Download Android Client" => "下載 Android 客戶端",
-"Download iOS Client" => "下載 iOS 客戶端",
+"Show First Run Wizard again" => "再次顯示首次使用精靈",
 "Password" => "密碼",
 "Your password was changed" => "你的密碼已更改",
 "Unable to change your password" => "無法變更你的密碼",
 "Current password" => "目前密碼",
 "New password" => "新密碼",
-"show" => "顯示",
 "Change password" => "變更密碼",
 "Display Name" => "顯示名稱",
+"Your display name was changed" => "已更改顯示名稱",
+"Unable to change your display name" => "無法更改您的顯示名稱",
+"Change display name" => "更改顯示名稱",
 "Email" => "電子郵件",
 "Your email address" => "你的電子郵件信箱",
 "Fill in an email address to enable password recovery" => "請填入電子郵件信箱以便回復密碼",
@@ -56,18 +70,13 @@
 "Help translate" => "幫助翻譯",
 "WebDAV" => "WebDAV",
 "Use this address to connect to your ownCloud in your file manager" => "在您的檔案管理員中使用這個地址來連線到 ownCloud",
-"Version" => "版本",
-"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "由<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>許可證下發布。",
 "Login Name" => "登入名稱",
-"Groups" => "群組",
 "Create" => "創造",
 "Default Storage" => "預設儲存區",
 "Unlimited" => "無限制",
 "Other" => "其他",
-"Group Admin" => "群組 管理員",
 "Storage" => "儲存區",
 "change display name" => "修改顯示名稱",
 "set new password" => "設定新密碼",
-"Default" => "預設",
-"Delete" => "刪除"
+"Default" => "預設"
 );
diff --git a/settings/languageCodes.php b/settings/languageCodes.php
index 71655800856..c25fbb434a7 100644
--- a/settings/languageCodes.php
+++ b/settings/languageCodes.php
@@ -50,6 +50,21 @@ return array(
 'lv'=>'Latviešu',
 'mk'=>'македонски',
 'uk'=>'Українська',
-'vi'=>'tiếng việt',
+'vi'=>'Tiếng Việt',
 'zh_TW'=>'臺灣話',
+'af_ZA'=> 'Afrikaans',
+'bn_BD'=>'Bengali',
+'ta_LK'=>'தமிழ்',
+'zh_HK'=>'Chinese (Hong Kong)',
+'oc'=>'Occitan (post 1500)',
+'is'=>'Icelandic',
+'pl_PL'=>'Polski',
+'ka_GE'=>'Georgian for Georgia',
+'ku_IQ'=>'Kurdish Iraq',
+'ru_RU'=>'Русский язык',
+'si_LK'=>'Sinhala',
+'be'=>'Belarusian',
+'ka'=>'Kartuli (Georgian)',
+'my_MM'=>'Burmese - MYANMAR ',
+'ur_PK'	=>'Urdu (Pakistan)'
 );
diff --git a/settings/oauth.php b/settings/oauth.php
deleted file mode 100644
index 8dba9b33a53..00000000000
--- a/settings/oauth.php
+++ /dev/null
@@ -1,98 +0,0 @@
-<?php
-/**
- * Copyright (c) 2012, Tom Needham <tom@owncloud.com>
- * This file is licensed under the Affero General Public License version 3 or later.
- * See the COPYING-README file.
- */
-
-require_once('../lib/base.php');
-// Logic
-$operation = isset($_GET['operation']) ? $_GET['operation'] : '';
-$server = OC_OAuth_server::init();
-
-switch($operation){
-	
-	case 'register':
-
-		// Here external apps can register with an ownCloud
-		if(empty($_GET['name']) || empty($_GET['url'])){
-			// Invalid request
-			echo 401;
-		} else {
-			$callbacksuccess = empty($_GET['callback_success']) ? null : $_GET['callback_success'];
-			$callbackfail = empty($_GET['callback_fail']) ? null : $_GET['callback_fail'];
-			$consumer = OC_OAuth_Server::register_consumer($_GET['name'], $_GET['url'], $callbacksuccess, $callbackfail);
-			
-			echo 'Registered consumer successfully! </br></br>Key: ' . $consumer->key . '</br>Secret: ' . $consumer->secret;
-		}
-	break;
-	
-	case 'request_token':
-		
-		try {
-			$request = OAuthRequest::from_request();
-			$token = $server->get_request_token($request);
-			echo $token;
-		} catch (OAuthException $exception) {
-			OC_Log::write('OC_OAuth_Server', $exception->getMessage(), OC_LOG::ERROR);
-			echo $exception->getMessage();
-		}
-	
-	break;
-	case 'authorise';
-	
-		OC_API::checkLoggedIn();
-		// Example
-		$consumer = array(
-			'name' => 'Firefox Bookmark Sync',
-			'scopes' => array('ookmarks'),
-		);
-		
-		// Check that the scopes are real and installed
-		$apps = OC_App::getEnabledApps();
-		$notfound = array();
-		foreach($consumer['scopes'] as $requiredapp){
-			// App scopes are in this format: app_$appname
-			$requiredapp = end(explode('_', $requiredapp));
-			if(!in_array($requiredapp, $apps)){
-				$notfound[] = $requiredapp;
-			}
-		}
-		if(!empty($notfound)){
-			// We need more apps :( Show error
-			if(count($notfound)==1){
-				$message = 'requires that you have an extra app installed on your ownCloud. Please contact your ownCloud administrator and ask them to install the app below.';
-			} else {
-				$message = 'requires that you have some extra apps installed on your ownCloud. Please contract your ownCloud administrator and ask them to install the apps below.';
-			}
-			$t = new OC_Template('settings', 'oauth-required-apps', 'guest');
-			OC_Util::addStyle('settings', 'oauth');
-			$t->assign('requiredapps', $notfound);
-			$t->assign('consumer', $consumer);
-			$t->assign('message', $message);
-			$t->printPage();
-		} else {
-			$t = new OC_Template('settings', 'oauth', 'guest');
-			OC_Util::addStyle('settings', 'oauth');
-			$t->assign('consumer', $consumer);
-			$t->printPage();
-		}
-	break;
-	
-	case 'access_token';
-		try {
-			$request = OAuthRequest::from_request();
-			$token = $server->fetch_access_token($request);
-			echo $token;
-		} catch (OAuthException $exception) {
-			OC_Log::write('OC_OAuth_Server', $exception->getMessage(), OC_LOG::ERROR);
-			echo $exception->getMessage();
-		}
-		
-	break;
-	default:
-		// Something went wrong, we need an operation!
-		OC_Response::setStatus(400);
-	break;
-	
-}
diff --git a/settings/personal.php b/settings/personal.php
index c2df8db1ccc..9bbc66c9b7f 100644
--- a/settings/personal.php
+++ b/settings/personal.php
@@ -19,26 +19,36 @@ $storageInfo=OC_Helper::getStorageInfo();
 
 $email=OC_Preferences::getValue(OC_User::getUser(), 'settings', 'email', '');
 
-$lang=OC_Preferences::getValue( OC_User::getUser(), 'core', 'lang', OC_L10N::findLanguage() );
+$userLang=OC_Preferences::getValue( OC_User::getUser(), 'core', 'lang', OC_L10N::findLanguage() );
 $languageCodes=OC_L10N::findAvailableLanguages();
-sort ($languageCodes);
-
-//put the current language in the front
-unset($languageCodes[array_search($lang, $languageCodes)]);
-array_unshift($languageCodes, $lang);
 
 $languageNames=include 'languageCodes.php';
 $languages=array();
 foreach($languageCodes as $lang) {
 	$l=OC_L10N::get('settings', $lang);
 	if(substr($l->t('__language_name__'), 0, 1)!='_') {//first check if the language name is in the translation file
-		$languages[]=array('code'=>$lang, 'name'=>$l->t('__language_name__'));
+		$ln=array('code'=>$lang, 'name'=> (string)$l->t('__language_name__'));
 	}elseif(isset($languageNames[$lang])) {
-		$languages[]=array('code'=>$lang, 'name'=>$languageNames[$lang]);
+		$ln=array('code'=>$lang, 'name'=>$languageNames[$lang]);
 	}else{//fallback to language code
-		$languages[]=array('code'=>$lang, 'name'=>$lang);
+		$ln=array('code'=>$lang, 'name'=>$lang);
+	}
+
+	if ($lang === $userLang) {
+		$userLang = $ln;
+	} else {
+		$languages[]=$ln;
 	}
 }
+
+// sort now by displayed language not the iso-code
+usort( $languages, function ($a, $b) {
+	return strcmp($a['name'], $b['name']);
+});
+
+//put the current language in the front
+array_unshift($languages, $userLang);
+
 //links to clients
 $clients = array(
 	'desktop' => OC_Config::getValue('customclient_desktop', 'http://owncloud.org/sync-clients/'),
diff --git a/settings/routes.php b/settings/routes.php
index 0a8af0dde2b..b20119b5803 100644
--- a/settings/routes.php
+++ b/settings/routes.php
@@ -39,8 +39,8 @@ $this->create('settings_ajax_removegroup', '/settings/ajax/removegroup.php')
 	->actionInclude('settings/ajax/removegroup.php');
 $this->create('settings_ajax_changepassword', '/settings/ajax/changepassword.php')
 	->actionInclude('settings/ajax/changepassword.php');
-$this->create('settings_ajax_changedisplayname', '/settings/ajax/changedisplayname.php')

-->actionInclude('settings/ajax/changedisplayname.php');
+$this->create('settings_ajax_changedisplayname', '/settings/ajax/changedisplayname.php')
+	->actionInclude('settings/ajax/changedisplayname.php');
 // personel
 $this->create('settings_ajax_lostpassword', '/settings/ajax/lostpassword.php')
 	->actionInclude('settings/ajax/lostpassword.php');
diff --git a/settings/templates/admin.php b/settings/templates/admin.php
index 9a9a691dcbf..dd5e89b8f82 100644
--- a/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@ -12,10 +12,25 @@ $levels = array('Debug', 'Info', 'Warning', 'Error', 'Fatal');
 if (!$_['htaccessworking']) {
 	?>
 <fieldset class="personalblock">
-	<legend><strong><?php echo $l->t('Security Warning');?></strong></legend>
+	<legend><strong><?php p($l->t('Security Warning'));?></strong></legend>
 
 	<span class="securitywarning">
-		<?php echo $l->t('Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root.'); ?>
+		<?php p($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
+}
+
+// is WebDAV working ?
+if (!$_['isWebDavWorking']) {
+	?>
+<fieldset class="personalblock">
+	<legend><strong><?php p($l->t('Setup Warning'));?></strong></legend>
+
+	<span class="securitywarning">
+		<?php p($l->t('Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken.')); ?>
+		<?php print_unescaped($l->t('Please double check the <a href=\'%s\'>installation guides</a>.', 'http://doc.owncloud.org/server/5.0/admin_manual/installation.html')); ?>
 	</span>
 
 </fieldset>
@@ -26,23 +41,27 @@ if (!$_['htaccessworking']) {
 if (!$_['has_fileinfo']) {
 	?>
 <fieldset class="personalblock">
-	<legend><strong><?php echo $l->t('Module \'fileinfo\' missing');?></strong></legend>
+	<legend><strong><?php p($l->t('Module \'fileinfo\' missing'));?></strong></legend>
 
 		<span class="connectionwarning">
-		<?php echo $l->t('The PHP module \'fileinfo\' is missing. We strongly recommend to enable this module to get best results with mime-type detection.'); ?>
+		<?php p($l->t('The PHP module \'fileinfo\' is missing. We strongly recommend to enable this module to get best results with mime-type detection.')); ?>
 	</span>
 
 </fieldset>
 <?php
 }
 
+// is locale working ?
 if (!$_['islocaleworking']) {
 	?>
 <fieldset class="personalblock">
-	<legend><strong><?php echo $l->t('Locale not working');?></strong></legend>
+	<legend><strong><?php p($l->t('Locale not working'));?></strong></legend>
 
 		<span class="connectionwarning">
-		<?php echo $l->t('This ownCloud server can\'t set system locale to "en_US.UTF-8". This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support en_US.UTF-8.'); ?>
+		<?php
+			$locales = 'en_US.UTF-8/en_US.UTF8';
+			p($l->t('This ownCloud server can\'t set system locale to %s. This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support %s.', array($locales, $locales)));
+			?>
 	</span>
 
 </fieldset>
@@ -53,10 +72,10 @@ if (!$_['islocaleworking']) {
 if (!$_['internetconnectionworking']) {
 	?>
 <fieldset class="personalblock">
-	<legend><strong><?php echo $l->t('Internet connection not working');?></strong></legend>
+	<legend><strong><?php p($l->t('Internet connection not working'));?></strong></legend>
 
 		<span class="connectionwarning">
-		<?php echo $l->t('This ownCloud server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features of ownCloud.'); ?>
+		<?php p($l->t('This ownCloud server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features of ownCloud.')); ?>
 	</span>
 
 </fieldset>
@@ -65,106 +84,106 @@ if (!$_['internetconnectionworking']) {
 ?>
 
 <?php foreach ($_['forms'] as $form) {
-	echo $form;
+	print_unescaped($form);
 }
 ;?>
 
 <fieldset class="personalblock" id="backgroundjobs">
-	<legend><strong><?php echo $l->t('Cron');?></strong></legend>
+	<legend><strong><?php p($l->t('Cron'));?></strong></legend>
 	<table class="nostyle">
 		<tr>
 			<td>
 				<input type="radio" name="mode" value="ajax"
 					   id="backgroundjobs_ajax" <?php if ($_['backgroundjobs_mode'] == "ajax") {
-					echo 'checked="checked"';
+					print_unescaped('checked="checked"');
 				} ?>>
 				<label for="backgroundjobs_ajax">AJAX</label><br/>
-				<em><?php echo $l->t("Execute one task with each page loaded"); ?></em>
+				<em><?php p($l->t("Execute one task with each page loaded")); ?></em>
 			</td>
 		</tr>
 		<tr>
 			<td>
 				<input type="radio" name="mode" value="webcron"
 					   id="backgroundjobs_webcron" <?php if ($_['backgroundjobs_mode'] == "webcron") {
-					echo 'checked="checked"';
+					print_unescaped('checked="checked"');
 				} ?>>
 				<label for="backgroundjobs_webcron">Webcron</label><br/>
-				<em><?php echo $l->t("cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http."); ?></em>
+				<em><?php p($l->t("cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http.")); ?></em>
 			</td>
 		</tr>
 		<tr>
 			<td>
 				<input type="radio" name="mode" value="cron"
 					   id="backgroundjobs_cron" <?php if ($_['backgroundjobs_mode'] == "cron") {
-					echo 'checked="checked"';
+					print_unescaped('checked="checked"');
 				} ?>>
 				<label for="backgroundjobs_cron">Cron</label><br/>
-				<em><?php echo $l->t("Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute."); ?></em>
+				<em><?php p($l->t("Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute.")); ?></em>
 			</td>
 		</tr>
 	</table>
 </fieldset>
 
 <fieldset class="personalblock" id="shareAPI">
-	<legend><strong><?php echo $l->t('Sharing');?></strong></legend>
+	<legend><strong><?php p($l->t('Sharing'));?></strong></legend>
 	<table class="shareAPI nostyle">
 		<tr>
 			<td id="enable">
 				<input type="checkbox" name="shareapi_enabled" id="shareAPIEnabled"
-					   value="1" <?php if ($_['shareAPIEnabled'] == 'yes') echo 'checked="checked"'; ?> />
-				<label for="shareAPIEnabled"><?php echo $l->t('Enable Share API');?></label><br/>
-				<em><?php echo $l->t('Allow apps to use the Share API'); ?></em>
+					   value="1" <?php if ($_['shareAPIEnabled'] == 'yes') print_unescaped('checked="checked"'); ?> />
+				<label for="shareAPIEnabled"><?php p($l->t('Enable Share API'));?></label><br/>
+				<em><?php p($l->t('Allow apps to use the Share API')); ?></em>
 			</td>
 		</tr>
 		<tr>
-			<td <?php if ($_['shareAPIEnabled'] == 'no') echo 'style="display:none"';?>>
+			<td <?php if ($_['shareAPIEnabled'] == 'no') print_unescaped('style="display:none"');?>>
 				<input type="checkbox" name="shareapi_allow_links" id="allowLinks"
-					   value="1" <?php if ($_['allowLinks'] == 'yes') echo 'checked="checked"'; ?> />
-				<label for="allowLinks"><?php echo $l->t('Allow links');?></label><br/>
-				<em><?php echo $l->t('Allow users to share items to the public with links'); ?></em>
+					   value="1" <?php if ($_['allowLinks'] == 'yes') print_unescaped('checked="checked"'); ?> />
+				<label for="allowLinks"><?php p($l->t('Allow links'));?></label><br/>
+				<em><?php p($l->t('Allow users to share items to the public with links')); ?></em>
 			</td>
 		</tr>
 		<tr>
-			<td <?php if ($_['shareAPIEnabled'] == 'no') echo 'style="display:none"';?>>
+			<td <?php if ($_['shareAPIEnabled'] == 'no') print_unescaped('style="display:none"');?>>
 				<input type="checkbox" name="shareapi_allow_resharing" id="allowResharing"
-					   value="1" <?php if ($_['allowResharing'] == 'yes') echo 'checked="checked"'; ?> />
-				<label for="allowResharing"><?php echo $l->t('Allow resharing');?></label><br/>
-				<em><?php echo $l->t('Allow users to share items shared with them again'); ?></em>
+					   value="1" <?php if ($_['allowResharing'] == 'yes') print_unescaped('checked="checked"'); ?> />
+				<label for="allowResharing"><?php p($l->t('Allow resharing'));?></label><br/>
+				<em><?php p($l->t('Allow users to share items shared with them again')); ?></em>
 			</td>
 		</tr>
 		<tr>
-			<td <?php if ($_['shareAPIEnabled'] == 'no') echo 'style="display:none"';?>>
+			<td <?php if ($_['shareAPIEnabled'] == 'no') print_unescaped('style="display:none"');?>>
 				<input type="radio" name="shareapi_share_policy" id="sharePolicyGlobal"
-					   value="global" <?php if ($_['sharePolicy'] == 'global') echo 'checked="checked"'; ?> />
-				<label for="sharePolicyGlobal"><?php echo $l->t('Allow users to share with anyone'); ?></label><br/>
+					   value="global" <?php if ($_['sharePolicy'] == 'global') print_unescaped('checked="checked"'); ?> />
+				<label for="sharePolicyGlobal"><?php p($l->t('Allow users to share with anyone')); ?></label><br/>
 				<input type="radio" name="shareapi_share_policy" id="sharePolicyGroupsOnly"
-					   value="groups_only" <?php if ($_['sharePolicy'] == 'groups_only') echo 'checked="checked"'; ?> />
-				<label for="sharePolicyGroupsOnly"><?php echo $l->t('Allow users to only share with users in their groups');?></label><br/>
+					   value="groups_only" <?php if ($_['sharePolicy'] == 'groups_only') print_unescaped('checked="checked"'); ?> />
+				<label for="sharePolicyGroupsOnly"><?php p($l->t('Allow users to only share with users in their groups'));?></label><br/>
 			</td>
 		</tr>
 	</table>
 </fieldset>
 
 <fieldset class="personalblock" id="security">
-	<legend><strong><?php echo $l->t('Security');?></strong></legend>
+	<legend><strong><?php p($l->t('Security'));?></strong></legend>
 	<table class="nostyle">
 		<tr>
 			<td id="enable">
 				<input type="checkbox" name="forcessl"  id="enforceHTTPSEnabled"
 					<?php if ($_['enforceHTTPSEnabled']) {
-						echo 'checked="checked" ';
-						echo 'value="false"';
+						print_unescaped('checked="checked" ');
+						print_unescaped('value="false"');
 					}  else {
-						echo 'value="true"';
+						print_unescaped('value="true"');
 					}
 					?>
-					<?php if (!$_['isConnectedViaHTTPS']) echo 'disabled'; ?> />
-				<label for="forcessl"><?php echo $l->t('Enforce HTTPS');?></label><br/>
-				<em><?php echo $l->t('Enforces the clients to connect to ownCloud via an encrypted connection.'); ?></em>
+					<?php if (!$_['isConnectedViaHTTPS']) p('disabled'); ?> />
+				<label for="forcessl"><?php p($l->t('Enforce HTTPS'));?></label><br/>
+				<em><?php p($l->t('Enforces the clients to connect to ownCloud via an encrypted connection.')); ?></em>
 				<?php if (!$_['isConnectedViaHTTPS']) {
-					echo "<br/><em>";
-					echo $l->t('Please connect to this ownCloud instance via HTTPS to enable or disable the SSL enforcement.');
-					echo "</em>";
+					print_unescaped("<br/><em>");
+					p($l->t('Please connect to this ownCloud instance via HTTPS to enable or disable the SSL enforcement.'));
+					print_unescaped("</em>");
 				}
 				?>
 			</td>
@@ -173,12 +192,12 @@ if (!$_['internetconnectionworking']) {
 </fieldset>
 
 <fieldset class="personalblock">
-	<legend><strong><?php echo $l->t('Log');?></strong></legend>
-	<?php echo $l->t('Log level');?> <select name='loglevel' id='loglevel'>
-	<option value='<?php echo $_['loglevel']?>'><?php echo $levels[$_['loglevel']]?></option>
+	<legend><strong><?php p($l->t('Log'));?></strong></legend>
+	<?php p($l->t('Log level'));?> <select name='loglevel' id='loglevel'>
+	<option value='<?php p($_['loglevel'])?>'><?php p($levels[$_['loglevel']])?></option>
 	<?php for ($i = 0; $i < 5; $i++):
 	if ($i != $_['loglevel']):?>
-		<option value='<?php echo $i?>'><?php echo $levels[$i]?></option>
+		<option value='<?php p($i)?>'><?php p($levels[$i])?></option>
 		<?php endif;
 endfor;?>
 </select>
@@ -186,31 +205,31 @@ endfor;?>
 		<?php foreach ($_['entries'] as $entry): ?>
 		<tr>
 			<td>
-				<?php echo $levels[$entry->level];?>
+				<?php p($levels[$entry->level]);?>
 			</td>
 			<td>
-				<?php echo $entry->app;?>
+				<?php p($entry->app);?>
 			</td>
 			<td>
-				<?php echo $entry->message;?>
+				<?php p($entry->message);?>
 			</td>
 			<td>
-				<?php echo OC_Util::formatDate($entry->time);?>
+				<?php p(OC_Util::formatDate($entry->time));?>
 			</td>
 		</tr>
 		<?php endforeach;?>
 	</table>
 	<?php if ($_['entriesremain']): ?>
-	<input id='moreLog' type='button' value='<?php echo $l->t('More');?>...'>
+	<input id='moreLog' type='button' value='<?php p($l->t('More'));?>...'>
 	<?php endif; ?>
 
 </fieldset>
 
 
 <fieldset class="personalblock">
-	<legend><strong><?php echo $l->t('Version');?></strong></legend>
-	<strong>ownCloud</strong> <?php echo(OC_Util::getVersionString()); ?> <?php echo(OC_Util::getEditionString()); ?>
-	(<?php echo(OC_Updater::ShowUpdatingHint()); ?>)<br/>
-	<?php echo $l->t('Developed by the <a href="http://ownCloud.org/contact" target="_blank">ownCloud community</a>, the <a href="https://github.com/owncloud" target="_blank">source code</a> is licensed under the <a href="http://www.gnu.org/licenses/agpl-3.0.html" target="_blank"><abbr title="Affero General Public License">AGPL</abbr></a>.'); ?>
+	<legend><strong><?php p($l->t('Version'));?></strong></legend>
+	<strong>ownCloud</strong> <?php p(OC_Util::getVersionString()); ?> <?php p(OC_Util::getEditionString()); ?>
+	(<?php p(OC_Updater::ShowUpdatingHint()); ?>)<br/>
+	<?php print_unescaped($l->t('Developed by the <a href="http://ownCloud.org/contact" target="_blank">ownCloud community</a>, the <a href="https://github.com/owncloud" target="_blank">source code</a> is licensed under the <a href="http://www.gnu.org/licenses/agpl-3.0.html" target="_blank"><abbr title="Affero General Public License">AGPL</abbr></a>.')); ?>
 </fieldset>
 
diff --git a/settings/templates/apps.php b/settings/templates/apps.php
index ed1232ac322..d3639cbab34 100644
--- a/settings/templates/apps.php
+++ b/settings/templates/apps.php
@@ -3,31 +3,38 @@
  * This file is licensed under the Affero General Public License version 3 or later.
  * See the COPYING-README file.
  */?>
- <script type="text/javascript" src="<?php echo OC_Helper::linkToRoute('apps_custom');?>?appid=<?php echo $_['appid']; ?>"></script>
- <script type="text/javascript" src="<?php echo OC_Helper::linkTo('settings/js', 'apps.js');?>"></script>
+ <script type="text/javascript"
+	src="<?php print_unescaped(OC_Helper::linkToRoute('apps_custom'));?>?appid=<?php p($_['appid']); ?>"></script>
+ <script type="text/javascript" src="<?php print_unescaped(OC_Helper::linkTo('settings/js', 'apps.js'));?>"></script>
 
 <div id="controls">
-	<a class="button" target="_blank" href="http://owncloud.org/dev"><?php echo $l->t('Add your App');?></a>
-	<a class="button" target="_blank" href="http://apps.owncloud.com"><?php echo $l->t('More Apps');?></a>
+	<a class="button" target="_blank" href="http://owncloud.org/dev"><?php p($l->t('Add your App'));?></a>
+	<a class="button" target="_blank" href="http://apps.owncloud.com"><?php p($l->t('More Apps'));?></a>
 </div>
 <ul id="leftcontent" class="applist hascontrols">
 	<?php foreach($_['apps'] as $app):?>
-	<li <?php if($app['active']) echo 'class="active"'?> data-id="<?php echo $app['id'] ?>" <?php if ( isset( $app['ocs_id'] ) ) { echo "data-id-ocs=\"{$app['ocs_id']}\""; } ?>
-		data-type="<?php echo $app['internal'] ? 'internal' : 'external' ?>" data-installed="1">
-		<a class="app<?php if(!$app['internal']) echo ' externalapp' ?>" href="?appid=<?php echo $app['id'] ?>"><?php echo htmlentities($app['name']) ?></a>
-		<?php  if(!$app['internal']) echo '<small class="'.$app['internalclass'].' list">'.$app['internallabel'].'</small>' ?>
+	<li <?php if($app['active']) print_unescaped('class="active"')?> data-id="<?php p($app['id']) ?>"
+		<?php if ( isset( $app['ocs_id'] ) ) { print_unescaped("data-id-ocs=\"{".OC_Util::sanitizeHTML($app['ocs_id'])."}\""); } ?>
+			data-type="<?php p($app['internal'] ? 'internal' : 'external') ?>" data-installed="1">
+		<a class="app<?php if(!$app['internal']) p(' externalapp') ?>"
+			href="?appid=<?php p($app['id']) ?>"><?php p($app['name']) ?></a>
+		<?php  if(!$app['internal'])
+			print_unescaped('<small class="'.OC_Util::sanitizeHTML($app['internalclass']).' list">'.OC_Util::sanitizeHTML($app['internallabel']).'</small>') ?>
 	</li>
 	<?php endforeach;?>
 </ul>
 <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>
+	<h3><strong><span class="name"><?php p($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>
-	<p class="license hidden"><?php echo $l->t('<span class="licence"></span>-licensed by <span class="author"></span>');?></p>
+	<p class="appslink hidden"><a href="#" target="_blank"><?php
+		p($l->t('See application page at apps.owncloud.com'));?></a></p>
+	<p class="license hidden"><?php
+		print_unescaped($l->t('<span class="licence"></span>-licensed by <span class="author"></span>'));?></p>
 	<input class="enable hidden" type="submit" />
-	<input class="update hidden" type="submit" value="<?php echo($l->t('Update')); ?>" />
+	<input class="update hidden" type="submit" value="<?php p($l->t('Update')); ?>" />
 	</div>
 </div>
diff --git a/settings/templates/help.php b/settings/templates/help.php
index 7383fdcf56a..3739d220e6e 100644
--- a/settings/templates/help.php
+++ b/settings/templates/help.php
@@ -1,14 +1,21 @@
 <div id="controls">
 	<?php if($_['admin']) { ?>
-		<a class="button newquestion <?php echo($_['style1']); ?>" href="<?php echo($_['url1']); ?>"><?php echo $l->t( 'User Documentation' ); ?></a>
-		<a class="button newquestion <?php echo($_['style2']); ?>" href="<?php echo($_['url2']); ?>"><?php echo $l->t( 'Administrator Documentation' ); ?></a>
+		<a class="button newquestion <?php p($_['style1']); ?>"
+			href="<?php print_unescaped($_['url1']); ?>"><?php p($l->t( 'User Documentation' )); ?></a>
+		<a class="button newquestion <?php p($_['style2']); ?>"
+			href="<?php print_unescaped($_['url2']); ?>"><?php p($l->t( 'Administrator Documentation' )); ?></a>
 	<?php } ?>
-	<a class="button newquestion" href="http://owncloud.org/support" target="_blank"><?php echo $l->t( 'Online Documentation' ); ?></a>
-	<a class="button newquestion" href="http://forum.owncloud.org" target="_blank"><?php echo $l->t( 'Forum' ); ?></a>
+	<a class="button newquestion" href="http://owncloud.org/support" target="_blank"><?php
+		p($l->t( 'Online Documentation' )); ?></a>
+	<a class="button newquestion" href="http://forum.owncloud.org" target="_blank"><?php
+		p($l->t( 'Forum' )); ?></a>
 	<?php if($_['admin']) { ?>
-		<a class="button newquestion" href="https://github.com/owncloud/core/issues" target="_blank"><?php echo $l->t( 'Bugtracker' ); ?></a>
+		<a class="button newquestion" href="https://github.com/owncloud/core/blob/master/CONTRIBUTING.md" target="_blank"><?php
+			p($l->t( 'Bugtracker' )); ?></a>
 	<?php } ?>
-	<a class="button newquestion" href="http://owncloud.com" target="_blank"><?php echo $l->t( 'Commercial Support' ); ?></a>
+	<a class="button newquestion" href="http://owncloud.com" target="_blank"><?php
+		p($l->t( 'Commercial Support' )); ?></a>
+</div>
+<div class="help-includes">
+	<iframe src="<?php print_unescaped($_['url']); ?>" class="help-iframe">abc</iframe>
 </div>
-<br /><br />
-<iframe src="<?php echo($_['url']); ?>" width="100%" id="ifm" ></iframe>
\ No newline at end of file
diff --git a/settings/templates/oauth-required-apps.php b/settings/templates/oauth-required-apps.php
index d4fce54c59c..3660f423423 100644
--- a/settings/templates/oauth-required-apps.php
+++ b/settings/templates/oauth-required-apps.php
@@ -6,14 +6,14 @@
  */
 ?>
 <div id="oauth-request" class="guest-container">
-	<p><strong><?php echo $_['consumer']['name'].'</strong> '.$_['message']; ?></p>
+	<p><strong><?php print_unescaped(OC_Util::sanitizeHTML($_['consumer']['name']).'</strong> '.OC_Util::sanitizeHTML($_['message'])); ?></p>
 	<ul>
 		<?php
 		// Foreach requested scope
 		foreach($_['requiredapps'] as $requiredapp){
-			echo '<li>'.$requiredapp.'</li>';
+			print_unescaped('<li>'.OC_Util::sanitizeHTML($requiredapp).'</li>');
 		}
 		?>
 	</ul>
-	<a href="<?php echo OC::$WEBROOT; ?>" id="back-home" class="button">Back to ownCloud</a>
+	<a href="<?php print_unescaped(OC::$WEBROOT); ?>" id="back-home" class="button">Back to ownCloud</a>
 </div>
diff --git a/settings/templates/oauth.php b/settings/templates/oauth.php
deleted file mode 100644
index 053a8aee6d3..00000000000
--- a/settings/templates/oauth.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-/**
- * Copyright (c) 2012, Tom Needham <tom@owncloud.com>
- * This file is licensed under the Affero General Public License version 3 or later.
- * See the COPYING-README file.
- */
-?>
-<div id="oauth-request" class="guest-container">
-	<p><strong><?php echo $_['consumer']['name']; ?></strong> is requesting your permission to read, write, modify and delete data from the following apps:</p>
-	<ul>
-		<?php
-		// Foreach requested scope
-		foreach($_['consumer']['scopes'] as $app){
-			echo '<li>'.$app.'</li>';
-		}
-		?>
-	</ul>
-	<a href="#" class="button">Allow</a>
-	<a href="#" class="button">Disallow</a>
-</div>
diff --git a/settings/templates/personal.php b/settings/templates/personal.php
index 398e65c0086..f3fd3f1010d 100644
--- a/settings/templates/personal.php
+++ b/settings/templates/personal.php
@@ -4,28 +4,43 @@
  * See the COPYING-README file.
  */?>
 
-<div id="quota" class="personalblock"><div style="width:<?php echo $_['usage_relative'];?>%;">
-	<p id="quotatext"><?php echo $l->t('You have used <strong>%s</strong> of the available <strong>%s</strong>', array($_['usage'], $_['total_space']));?></p>
+<div id="quota" class="personalblock"><div style="width:<?php p($_['usage_relative']);?>%;">
+	<p id="quotatext"><?php print_unescaped($l->t('You have used <strong>%s</strong> of the available <strong>%s</strong>',
+		array($_['usage'], $_['total_space'])));?></p>
 </div></div>
 
-<fieldset class="personalblock">
-	<legend><strong><?php echo $l->t('Clients');?></strong></legend>
-	<a class="button" href="<?php echo $_['clients']['desktop']; ?>" target="_blank"><?php echo $l->t('Download Desktop Clients');?></a>
-	<a class="button" href="<?php echo $_['clients']['android']; ?>" target="_blank"><?php echo $l->t('Download Android Client');?></a>
-	<a class="button" href="<?php echo $_['clients']['ios']; ?>" target="_blank"><?php echo $l->t('Download iOS Client');?></a>
-</fieldset>
+
+
+<div class="clientsbox">
+	<h2><?php p($l->t('Get the apps to sync your files'));?></h2>
+	<a href="<?php p($_['clients']['desktop']); ?>" target="_blank">
+		<img src="<?php print_unescaped(OCP\Util::imagePath('core', 'desktopapp.png')); ?>" />
+	</a>
+	<a href="<?php p($_['clients']['android']); ?>" target="_blank">
+		<img src="<?php print_unescaped(OCP\Util::imagePath('core', 'googleplay.png')); ?>" />
+	</a>
+	<a href="<?php p($_['clients']['ios']); ?>" target="_blank">
+		<img src="<?php print_unescaped(OCP\Util::imagePath('core', 'appstore.png')); ?>" />
+	</a>
+	<?php if(OC_APP::isEnabled('firstrunwizard')) {?>
+	<center><a class="button" href="#" id="showWizard"><?php p($l->t('Show First Run Wizard again'));?></a></center>
+	<?php }?>
+</div>
+
+
 
 <?php
 if($_['passwordChangeSupported']) {
 ?>
 <form id="passwordform">
 	<fieldset class="personalblock">
-		<legend><strong><?php echo $l->t('Password');?></strong></legend>
+		<legend><strong><?php p($l->t('Password'));?></strong></legend>
 		<div id="passwordchanged"><?php echo $l->t('Your password was changed');?></div>
 		<div id="passworderror"><?php echo $l->t('Unable to change your password');?></div>
 		<input type="password" id="pass1" name="oldpassword" placeholder="<?php echo $l->t('Current password');?>" />
-		<input type="password" id="pass2" name="password" placeholder="<?php echo $l->t('New password');?>" data-typetoggle="#show" />
-		<input type="checkbox" id="show" name="show" /><label for="show"> <?php echo $l->t('show');?></label>
+		<input type="password" id="pass2" name="password"
+			placeholder="<?php echo $l->t('New password');?>" data-typetoggle="#personal-show" />
+		<input type="checkbox" id="personal-show" name="show" /><label for="personal-show"></label>
 		<input id="passwordbutton" type="submit" value="<?php echo $l->t('Change password');?>" />
 	</fieldset>
 </form>
@@ -39,11 +54,11 @@ if($_['displayNameChangeSupported']) {
 <form id="displaynameform">
 	<fieldset class="personalblock">
 		<legend><strong><?php echo $l->t('Display Name');?></strong></legend>
-		<div id="displaynamechanged"><?php echo $l->t('Your display name was changed');?></div>
-		<div id="displaynameerror"><?php echo $l->t('Unable to change your display name');?></div>
-		<input type="text" id="displayName" name="displayName" value="<?php echo $_['displayName']?>" />
-		<input type="hidden" id="oldDisplayName" name="oldDisplayName" value="<?php echo $_['displayName']?>" />
-		<input id="displaynamebutton" type="submit" value="<?php echo $l->t('Change display name');?>" />
+		<div id="displaynamechanged"><?php p($l->t('Your display name was changed'));?></div>
+		<div id="displaynameerror"><?php p($l->t('Unable to change your display name'));?></div>
+		<input type="text" id="displayName" name="displayName" value="<?php p($_['displayName'])?>" />
+		<input type="hidden" id="oldDisplayName" name="oldDisplayName" value="<?php p($_['displayName'])?>" />
+		<input id="displaynamebutton" type="submit" value="<?php p($l->t('Change display name'));?>" />
 	</fieldset>
 </form>
 <?php
@@ -52,39 +67,42 @@ if($_['displayNameChangeSupported']) {
 
 <form id="lostpassword">
 	<fieldset class="personalblock">
-		<legend><strong><?php echo $l->t('Email');?></strong></legend>
-		<input type="text" name="email" id="email" value="<?php echo $_['email']; ?>" placeholder="<?php echo $l->t('Your email address');?>" /><span class="msg"></span><br />
-		<em><?php echo $l->t('Fill in an email address to enable password recovery');?></em>
+		<legend><strong><?php p($l->t('Email'));?></strong></legend>
+		<input type="text" name="email" id="email" value="<?php p($_['email']); ?>"
+			placeholder="<?php p($l->t('Your email address'));?>" /><span class="msg"></span><br />
+		<em><?php p($l->t('Fill in an email address to enable password recovery'));?></em>
 	</fieldset>
 </form>
 
 <form>
 	<fieldset class="personalblock">
-		<legend><strong><?php echo $l->t('Language');?></strong></legend>
-		<select id="languageinput" class="chzen-select" name="lang" data-placeholder="<?php echo $l->t('Language');?>">
+		<legend><strong><?php p($l->t('Language'));?></strong></legend>
+		<select id="languageinput" class="chzen-select" name="lang" data-placeholder="<?php p($l->t('Language'));?>">
 		<?php foreach($_['languages'] as $language):?>
-			<option value="<?php echo $language['code'];?>"><?php echo $language['name'];?></option>
+			<option value="<?php p($language['code']);?>"><?php p($language['name']);?></option>
 		<?php endforeach;?>
 		</select>
-		<a href="https://www.transifex.net/projects/p/owncloud/team/<?php echo $_['languages'][0]['code'];?>/" target="_blank"><em><?php echo $l->t('Help translate');?></em></a>
+		<a href="https://www.transifex.net/projects/p/owncloud/team/<?php p($_['languages'][0]['code']);?>/"
+			target="_blank"><em><?php p($l->t('Help translate'));?></em></a>
 	</fieldset>
 </form>
 
 <fieldset class="personalblock">
-	<legend><strong><?php echo $l->t('WebDAV');?></strong></legend>
-	<code><?php echo OC_Helper::linkToRemote('webdav'); ?></code><br />
-	<em><?php echo $l->t('Use this address to connect to your ownCloud in your file manager');?></em>
+	<legend><strong><?php p($l->t('WebDAV'));?></strong></legend>
+	<code><?php print_unescaped(OC_Helper::linkToRemote('webdav')); ?></code><br />
+	<em><?php p($l->t('Use this address to connect to your ownCloud in your file manager'));?></em>
 </fieldset>
 
 <?php foreach($_['forms'] as $form) {
-	echo $form;
+	print_unescaped($form);
 };?>
 
 
 <fieldset class="personalblock">
-	<legend><strong><?php echo $l->t('Version');?></strong></legend>
-	<strong>ownCloud</strong> <?php echo(OC_Util::getVersionString()); ?> <?php echo(OC_Util::getEditionString()); ?> <br />
-	<?php echo $l->t('Developed by the <a href="http://ownCloud.org/contact" target="_blank">ownCloud community</a>, the <a href="https://github.com/owncloud" target="_blank">source code</a> is licensed under the <a href="http://www.gnu.org/licenses/agpl-3.0.html" target="_blank"><abbr title="Affero General Public License">AGPL</abbr></a>.'); ?>
+	<legend><strong><?php p($l->t('Version'));?></strong></legend>
+	<strong>ownCloud</strong> <?php p(OC_Util::getVersionString()); ?>
+	<?php p(OC_Util::getEditionString()); ?> <br />
+	<?php print_unescaped($l->t('Developed by the <a href="http://ownCloud.org/contact" target="_blank">ownCloud community</a>, the <a href="https://github.com/owncloud" target="_blank">source code</a> is licensed under the <a href="http://www.gnu.org/licenses/agpl-3.0.html" target="_blank"><abbr title="Affero General Public License">AGPL</abbr></a>.')); ?>
 </fieldset>
 
 
diff --git a/settings/templates/settings.php b/settings/templates/settings.php
index de8092eeaff..48b4e6b3234 100644
--- a/settings/templates/settings.php
+++ b/settings/templates/settings.php
@@ -5,5 +5,5 @@
  */?>
 
 <?php foreach($_['forms'] as $form) {
-	echo $form;
+	print_unescaped($form);
 };
diff --git a/settings/templates/users.php b/settings/templates/users.php
index b3cab526947..deffe168323 100644
--- a/settings/templates/users.php
+++ b/settings/templates/users.php
@@ -14,101 +14,99 @@ unset($items['admin']);
 $_['subadmingroups'] = array_flip($items);
 ?>
 
-<script type="text/javascript" src="<?php echo OC_Helper::linkToRoute('isadmin');?>"></script>
+<script type="text/javascript" src="<?php print_unescaped(OC_Helper::linkToRoute('isadmin'));?>"></script>
 
 <div id="controls">
 	<form id="newuser" autocomplete="off">
-		<input id="newusername" type="text" placeholder="<?php echo $l->t('Login Name')?>" /> <input
+		<input id="newusername" type="text" placeholder="<?php p($l->t('Login Name'))?>" /> <input
 			type="password" id="newuserpassword"
-			placeholder="<?php echo $l->t('Password')?>" /> <select
+			placeholder="<?php p($l->t('Password'))?>" /> <select
 			class="groupsselect"
 			id="newusergroups" data-placeholder="groups"
-			title="<?php echo $l->t('Groups')?>" multiple="multiple">
+			title="<?php p($l->t('Groups'))?>" multiple="multiple">
 			<?php foreach($_["groups"] as $group): ?>
-			<option value="<?php echo $group['name'];?>">
-				<?php echo $group['name'];?>
+			<option value="<?php p($group['name']);?>">
+				<?php p($group['name']);?>
 			</option>
 			<?php endforeach;?>
-		</select> <input type="submit" value="<?php echo $l->t('Create')?>" />
+		</select> <input type="submit" value="<?php p($l->t('Create'))?>" />
 	</form>
 	<div class="quota">
-		<span><?php echo $l->t('Default Storage');?></span>
-		<div class="quota-select-wrapper">
+		<span><?php p($l->t('Default Storage'));?></span>
 			<?php if((bool) $_['isadmin']): ?>
 			<select class='quota'>
 				<option
-					<?php if($_['default_quota']=='none') echo 'selected="selected"';?>
+					<?php if($_['default_quota']=='none') print_unescaped('selected="selected"');?>
 						value='none'>
-					<?php echo $l->t('Unlimited');?>
+					<?php p($l->t('Unlimited'));?>
 				</option>
 				<?php foreach($_['quota_preset'] as $preset):?>
 				<?php if($preset!='default'):?>
 				<option
-				<?php if($_['default_quota']==$preset) echo 'selected="selected"';?>
-					value='<?php echo $preset;?>'>
-					<?php echo $preset;?>
+				<?php if($_['default_quota']==$preset) print_unescaped('selected="selected"');?>
+					value='<?php p($preset);?>'>
+					<?php p($preset);?>
 				</option>
 				<?php endif;?>
 				<?php endforeach;?>
 				<?php if($_['defaultQuotaIsUserDefined']):?>
 				<option selected="selected"
-					value='<?php echo $_['default_quota'];?>'>
-					<?php echo $_['default_quota'];?>
+					value='<?php p($_['default_quota']);?>'>
+					<?php p($_['default_quota']);?>
 				</option>
 				<?php endif;?>
 				<option value='other'>
-					<?php echo $l->t('Other');?>
+					<?php p($l->t('Other'));?>
 					...
 				</option>
-			</select> <input class='quota-other'/>
+			</select>
 			<?php endif; ?>
 			<?php if((bool) !$_['isadmin']): ?>
 				<select class='quota' disabled="disabled">
 					<option selected="selected">
-				<?php echo $_['default_quota'];?>
+				<?php p($_['default_quota']);?>
 					</option>
 				</select>
 			<?php endif; ?>
-		</div>
 	</div>
 </div>
 
-<table class="hascontrols" data-groups="<?php echo implode(', ', $allGroups);?>">
+<table class="hascontrols" data-groups="<?php p(implode(', ', $allGroups));?>">
 	<thead>
 		<tr>
-			<th id='headerName'><?php echo $l->t('Login Name')?></th>
-			<th id="headerDisplayName"><?php echo $l->t( 'Display Name' ); ?></th>
-			<th id="headerPassword"><?php echo $l->t( 'Password' ); ?></th>
-			<th id="headerGroups"><?php echo $l->t( 'Groups' ); ?></th>
+			<th id='headerName'><?php p($l->t('Login Name'))?></th>
+			<th id="headerDisplayName"><?php p($l->t( 'Display Name' )); ?></th>
+			<th id="headerPassword"><?php p($l->t( 'Password' )); ?></th>
+			<th id="headerGroups"><?php p($l->t( 'Groups' )); ?></th>
 			<?php if(is_array($_['subadmins']) || $_['subadmins']): ?>
-			<th id="headerSubAdmins"><?php echo $l->t('Group Admin'); ?></th>
+			<th id="headerSubAdmins"><?php p($l->t('Group Admin')); ?></th>
 			<?php endif;?>
-			<th id="headerQuota"><?php echo $l->t('Storage'); ?></th>
+			<th id="headerQuota"><?php p($l->t('Storage')); ?></th>
 			<th id="headerRemove">&nbsp;</th>
 		</tr>
 	</thead>
 	<tbody>
 		<?php foreach($_["users"] as $user): ?>
-		<tr data-uid="<?php echo $user["name"] ?>"
-			data-displayName="<?php echo $user["displayName"] ?>">
-			<td class="name"><?php echo $user["name"]; ?></td>
-			<td class="displayName"><span><?php echo $user["displayName"]; ?></span> <img class="svg action"
-				src="<?php echo image_path('core', 'actions/rename.svg')?>"
-				alt="<?php echo $l->t("change display name")?>" title="<?php echo $l->t("change display name")?>"/>
+		<tr data-uid="<?php p($user["name"]) ?>"
+			data-displayName="<?php p($user["displayName"]) ?>">
+			<td class="name"><?php p($user["name"]); ?></td>
+			<td class="displayName"><span><?php p($user["displayName"]); ?></span> <img class="svg action"
+				src="<?php p(image_path('core', 'actions/rename.svg'))?>"
+				alt="<?php p($l->t("change display name"))?>" title="<?php p($l->t("change display name"))?>"/>
 			</td>
 			<td class="password"><span>●●●●●●●</span> <img class="svg action"
-				src="<?php echo image_path('core', 'actions/rename.svg')?>"
-				alt="<?php echo $l->t("set new password")?>" title="<?php echo $l->t("set new password")?>"/>
+				src="<?php print_unescaped(image_path('core', 'actions/rename.svg'))?>"
+				alt="<?php p($l->t("set new password"))?>" title="<?php p($l->t("set new password"))?>"/>
 			</td>
 			<td class="groups"><select
 				class="groupsselect"
-				data-username="<?php echo $user['name'] ;?>"
-				data-user-groups="<?php echo $user['groups'] ;?>"
-				data-placeholder="groups" title="<?php echo $l->t('Groups')?>"
+				data-username="<?php p($user['name']) ;?>"
+				data-user-groups="<?php p($user['groups']) ;?>"
+				data-placeholder="groups" title="<?php p($l->t('Groups'))?>"
 				multiple="multiple">
 					<?php foreach($_["groups"] as $group): ?>
-					<option value="<?php echo $group['name'];?>">
-						<?php echo $group['name'];?>
+					<option value="<?php p($group['name']);?>">
+						<?php p($group['name']);?>
 					</option>
 					<?php endforeach;?>
 			</select>
@@ -116,54 +114,52 @@ $_['subadmingroups'] = array_flip($items);
 			<?php if(is_array($_['subadmins']) || $_['subadmins']): ?>
 			<td class="subadmins"><select
 				class="subadminsselect"
-				data-username="<?php echo $user['name'] ;?>"
-				data-subadmin="<?php echo $user['subadmin'] ;?>"
-				data-placeholder="subadmins" title="<?php echo $l->t('Group Admin')?>"
+				data-username="<?php p($user['name']) ;?>"
+				data-subadmin="<?php p($user['subadmin']);?>"
+				data-placeholder="subadmins" title="<?php p($l->t('Group Admin'))?>"
 				multiple="multiple">
 					<?php foreach($_["subadmingroups"] as $group): ?>
-					<option value="<?php echo $group;?>">
-						<?php echo $group;?>
+					<option value="<?php p($group);?>">
+						<?php p($group);?>
 					</option>
 					<?php endforeach;?>
 			</select>
 			</td>
 			<?php endif;?>
 			<td class="quota">
-				<div class="quota-select-wrapper">
-					<select class='quota-user'>
-						<option
-							<?php if($user['quota']=='default') echo 'selected="selected"';?>
-								value='default'>
-							<?php echo $l->t('Default');?>
-						</option>
-						<option
-						<?php if($user['quota']=='none') echo 'selected="selected"';?>
-								value='none'>
-							<?php echo $l->t('Unlimited');?>
-						</option>
-						<?php foreach($_['quota_preset'] as $preset):?>
-						<option
-						<?php if($user['quota']==$preset) echo 'selected="selected"';?>
-							value='<?php echo $preset;?>'>
-							<?php echo $preset;?>
-						</option>
-						<?php endforeach;?>
-						<?php if($user['isQuotaUserDefined']):?>
-						<option selected="selected" value='<?php echo $user['quota'];?>'>
-							<?php echo $user['quota'];?>
-						</option>
-						<?php endif;?>
-						<option value='other'>
-							<?php echo $l->t('Other');?>
-							...
-						</option>
-					</select> <input class='quota-other'/>
-				</div>
+				<select class='quota-user'>
+					<option
+						<?php if($user['quota']=='default') print_unescaped('selected="selected"');?>
+							value='default'>
+						<?php p($l->t('Default'));?>
+					</option>
+					<option
+					<?php if($user['quota']=='none') print_unescaped('selected="selected"');?>
+							value='none'>
+						<?php p($l->t('Unlimited'));?>
+					</option>
+					<?php foreach($_['quota_preset'] as $preset):?>
+					<option
+					<?php if($user['quota']==$preset) print_unescaped('selected="selected"');?>
+						value='<?php p($preset);?>'>
+						<?php p($preset);?>
+					</option>
+					<?php endforeach;?>
+					<?php if($user['isQuotaUserDefined']):?>
+					<option selected="selected" value='<?php p($user['quota']);?>'>
+						<?php p($user['quota']);?>
+					</option>
+					<?php endif;?>
+					<option value='other' data-new>
+						<?php p($l->t('Other'));?>
+						...
+					</option>
+				</select>
 			</td>
 			<td class="remove">
 				<?php if($user['name']!=OC_User::getUser()):?>
-					<a href="#" class="action delete" original-title="<?php echo $l->t('Delete')?>">
-						<img src="<?php echo image_path('core', 'actions/delete.svg') ?>" />
+					<a href="#" class="action delete" original-title="<?php p($l->t('Delete'))?>">
+						<img src="<?php print_unescaped(image_path('core', 'actions/delete.svg')) ?>" class="svg" />
 					</a>
 				<?php endif;?>
 			</td>
diff --git a/settings/users.php b/settings/users.php
index ab7a7aed734..94e6d0a9a10 100644
--- a/settings/users.php
+++ b/settings/users.php
@@ -11,6 +11,7 @@ OC_App::loadApps();
 // We have some javascript foo!
 OC_Util::addScript( 'settings', 'users' );
 OC_Util::addScript( 'core', 'multiselect' );
+OC_Util::addScript( 'core', 'singleselect' );
 OC_Util::addScript('core', 'jquery.inview');
 OC_Util::addStyle( 'settings', 'settings' );
 OC_App::setActiveNavigationEntry( 'core_users' );
@@ -39,12 +40,14 @@ foreach($quotaPreset as &$preset) {
 $quotaPreset=array_diff($quotaPreset, array('default', 'none'));
 
 $defaultQuota=OC_Appconfig::getValue('files', 'default_quota', 'none');
-$defaultQuotaIsUserDefined=array_search($defaultQuota, $quotaPreset)===false && array_search($defaultQuota, array('none', 'default'))===false;
+$defaultQuotaIsUserDefined=array_search($defaultQuota, $quotaPreset)===false
+	&& array_search($defaultQuota, array('none', 'default'))===false;
 
 // load users and quota
 foreach($accessibleusers as $uid => $displayName) {
 	$quota=OC_Preferences::getValue($uid, 'files', 'quota', 'default');
-	$isQuotaUserDefined=array_search($quota, $quotaPreset)===false && array_search($quota, array('none', 'default'))===false;
+	$isQuotaUserDefined=array_search($quota, $quotaPreset)===false
+		&& array_search($quota, array('none', 'default'))===false;
 
 	$name = $displayName;
 	if ( $displayName != $uid ) {