Merge master into ocs_api, fix conflicts.

93 files changed, 589 insertions, 834 deletions

diff --git a/settings/admin.php b/settings/admin.php
index a36f2190386..0cf449ef2ba 100755
--- a/settings/admin.php
+++ b/settings/admin.php
@@ -5,8 +5,8 @@
  * See the COPYING-README file.
  */
 
-require_once '../lib/base.php';
 OC_Util::checkAdminUser();
+OC_App::loadApps();
 
 OC_Util::addStyle( "settings", "settings" );
 OC_Util::addScript( "settings", "admin" );
@@ -20,22 +20,23 @@ $htaccessworking=OC_Util::ishtaccessworking();
 $entries=OC_Log_Owncloud::getEntries(3);
 $entriesremain=(count(OC_Log_Owncloud::getEntries(4)) > 3)?true:false;
 
-function compareEntries($a,$b) {
+function compareEntries($a, $b) {
 	return $b->time - $a->time;
 }
 usort($entries, 'compareEntries');
 
-$tmpl->assign('loglevel',OC_Config::getValue( "loglevel", 2 ));
-$tmpl->assign('entries',$entries);
+$tmpl->assign('loglevel', OC_Config::getValue( "loglevel", 2 ));
+$tmpl->assign('entries', $entries);
 $tmpl->assign('entriesremain', $entriesremain);
-$tmpl->assign('htaccessworking',$htaccessworking);
+$tmpl->assign('htaccessworking', $htaccessworking);
+$tmpl->assign('internetconnectionworking', OC_Util::isinternetconnectionworking());
 $tmpl->assign('backgroundjobs_mode', OC_Appconfig::getValue('core', 'backgroundjobs_mode', 'ajax'));
 $tmpl->assign('shareAPIEnabled', OC_Appconfig::getValue('core', 'shareapi_enabled', 'yes'));
 $tmpl->assign('allowLinks', OC_Appconfig::getValue('core', 'shareapi_allow_links', 'yes'));
 $tmpl->assign('allowResharing', OC_Appconfig::getValue('core', 'shareapi_allow_resharing', 'yes'));
 $tmpl->assign('sharePolicy', OC_Appconfig::getValue('core', 'shareapi_share_policy', 'global'));
-$tmpl->assign('forms',array());
+$tmpl->assign('forms', array());
 foreach($forms as $form) {
-	$tmpl->append('forms',$form);
+	$tmpl->append('forms', $form);
 }
 $tmpl->printPage();
diff --git a/settings/ajax/apps/ocs.php b/settings/ajax/apps/ocs.php
index fb78cc89248..1ffba26ad1d 100644
--- a/settings/ajax/apps/ocs.php
+++ b/settings/ajax/apps/ocs.php
@@ -6,9 +6,6 @@
  * See the COPYING-README file.
  */
 
-// Init owncloud
-require_once '../../../lib/base.php';
-
 OC_JSON::checkAdminUser();
 
 $l = OC_L10N::get('settings');
@@ -43,7 +40,7 @@ if(is_array($catagoryNames)) {
 
 		if(!$local) {
 			if($app['preview']=='') {
-				$pre='trans.png';
+				$pre=OC_Helper::imagePath('settings', 'trans.png');
 			} else {
 				$pre=$app['preview'];
 			}
diff --git a/settings/ajax/changepassword.php b/settings/ajax/changepassword.php
index 12d3b67037a..b2db2611518 100644
--- a/settings/ajax/changepassword.php
+++ b/settings/ajax/changepassword.php
@@ -1,8 +1,5 @@
 <?php
 
-// Init owncloud
-require_once '../../lib/base.php';
-
 // Check if we are a user
 OCP\JSON::callCheck();
 OC_JSON::checkLoggedIn();
@@ -19,8 +16,7 @@ if(OC_SubAdmin::isUserAccessible(OC_User::getUser(), $username)) {
 	$userstatus = 'subadmin';
 }
 if(OC_User::getUser() === $username) {
-	if (OC_User::checkPassword($username, $oldPassword))
-	{
+	if (OC_User::checkPassword($username, $oldPassword)) {
 		$userstatus = 'user';
 	}  else {
 		if (!OC_Util::isUserVerified()) {
diff --git a/settings/ajax/creategroup.php b/settings/ajax/creategroup.php
index 431b449a811..0a79527c219 100644
--- a/settings/ajax/creategroup.php
+++ b/settings/ajax/creategroup.php
@@ -1,7 +1,5 @@
 <?php
 
-// Init owncloud
-require_once '../../lib/base.php';
 OCP\JSON::callCheck();
 OC_JSON::checkAdminUser();
 
diff --git a/settings/ajax/createuser.php b/settings/ajax/createuser.php
index b3e5c23de54..addae78517a 100644
--- a/settings/ajax/createuser.php
+++ b/settings/ajax/createuser.php
@@ -1,7 +1,5 @@
 <?php
 
-// Init owncloud
-require_once '../../lib/base.php';
 OCP\JSON::callCheck();
 OC_JSON::checkSubAdminUser();
 
@@ -31,23 +29,26 @@ $username = $_POST["username"];
 $password = $_POST["password"];
 
 // Does the group exist?
-if( in_array( $username, OC_User::getUsers())) {
+if(OC_User::userExists($username)) {
 	OC_JSON::error(array("data" => array( "message" => "User already exists" )));
 	exit();
 }
 
 // Return Success story
 try {
-	OC_User::createUser($username, $password);
+	if (!OC_User::createUser($username, $password)) {
+		OC_JSON::error(array('data' => array( 'message' => 'User creation failed for '.$username )));
+		exit();
+	}
 	foreach( $groups as $i ) {
 		if(!OC_Group::groupExists($i)) {
 			OC_Group::createGroup($i);
 		}
 		OC_Group::addToGroup( $username, $i );
 	}
-	OC_JSON::success(array("data" => 
-				array( 
-					"username" => $username, 
+	OC_JSON::success(array("data" =>
+				array(
+					"username" => $username,
 					"groups" => implode( ", ", OC_Group::getUserGroups( $username )))));
 } catch (Exception $exception) {
 	OC_JSON::error(array("data" => array( "message" => $exception->getMessage())));
diff --git a/settings/ajax/disableapp.php b/settings/ajax/disableapp.php
index 977a536af21..a39b06b9c7d 100644
--- a/settings/ajax/disableapp.php
+++ b/settings/ajax/disableapp.php
@@ -1,6 +1,4 @@
 <?php
-// Init owncloud
-require_once '../../lib/base.php';
 OC_JSON::checkAdminUser();
 OCP\JSON::callCheck();
 OC_JSON::setContentTypeHeader();
diff --git a/settings/ajax/enableapp.php b/settings/ajax/enableapp.php
index c3b3491db93..f4d5c53adef 100644
--- a/settings/ajax/enableapp.php
+++ b/settings/ajax/enableapp.php
@@ -1,7 +1,5 @@
 <?php
 
-// Init owncloud
-require_once '../../lib/base.php';
 OC_JSON::checkAdminUser();
 OCP\JSON::callCheck();
 OC_JSON::setContentTypeHeader();
diff --git a/settings/ajax/getlog.php b/settings/ajax/getlog.php
index 9b9240f8253..043124fa175 100644
--- a/settings/ajax/getlog.php
+++ b/settings/ajax/getlog.php
@@ -5,15 +5,12 @@
  * See the COPYING-README file.
  */
 
-// Init owncloud
-require_once '../../lib/base.php';
-
 OC_JSON::checkAdminUser();
 
 $count=(isset($_GET['count']))?$_GET['count']:50;
 $offset=(isset($_GET['offset']))?$_GET['offset']:0;
 
-$entries=OC_Log_Owncloud::getEntries($count,$offset);
+$entries=OC_Log_Owncloud::getEntries($count, $offset);
 OC_JSON::success(array(
-	"data" => OC_Util::sanitizeHTML($entries), 
+	"data" => OC_Util::sanitizeHTML($entries),
 	"remain"=>(count(OC_Log_Owncloud::getEntries(1, $offset + $offset)) != 0) ? true : false));
diff --git a/settings/ajax/lostpassword.php b/settings/ajax/lostpassword.php
index 2a40ba09a8a..b5f47bbceab 100644
--- a/settings/ajax/lostpassword.php
+++ b/settings/ajax/lostpassword.php
@@ -1,7 +1,5 @@
 <?php
 
-// Init owncloud
-require_once '../../lib/base.php';
 OC_JSON::checkLoggedIn();
 OCP\JSON::callCheck();
 
diff --git a/settings/ajax/navigationdetect.php b/settings/ajax/navigationdetect.php
new file mode 100644
index 00000000000..93acb50dc20
--- /dev/null
+++ b/settings/ajax/navigationdetect.php
@@ -0,0 +1,18 @@
+<?php
+
+OC_Util::checkAdminUser();
+OCP\JSON::callCheck();
+
+$app = $_GET['app'];
+
+//load the one app and see what it adds to the navigation
+OC_App::loadApp($app);
+
+$navigation = OC_App::getNavigation();
+
+$navIds = array();
+foreach ($navigation as $nav) {
+	$navIds[] = $nav['id'];
+}
+
+OCP\JSON::success(array('nav_ids' => array_values($navIds), 'nav_entries' => $navigation));
diff --git a/settings/ajax/openid.php b/settings/ajax/openid.php
index ecec085383c..23c43c3c48e 100644
--- a/settings/ajax/openid.php
+++ b/settings/ajax/openid.php
@@ -1,8 +1,5 @@
 <?php
 
-// Init owncloud
-require_once '../../lib/base.php';
-
 $l=OC_L10N::get('settings');
 
 OC_JSON::checkLoggedIn();
diff --git a/settings/ajax/removegroup.php b/settings/ajax/removegroup.php
index 33e1a514c88..798d7916e61 100644
--- a/settings/ajax/removegroup.php
+++ b/settings/ajax/removegroup.php
@@ -1,8 +1,5 @@
 <?php
 
-// Init owncloud
-require_once '../../lib/base.php';
-
 OC_JSON::checkAdminUser();
 OCP\JSON::callCheck();
 
diff --git a/settings/ajax/removeuser.php b/settings/ajax/removeuser.php
index 1e3cd2993b0..9ffb32a0b23 100644
--- a/settings/ajax/removeuser.php
+++ b/settings/ajax/removeuser.php
@@ -1,8 +1,5 @@
 <?php
 
-// Init owncloud
-require_once '../../lib/base.php';
-
 OC_JSON::checkSubAdminUser();
 OCP\JSON::callCheck();
 
@@ -25,4 +22,4 @@ if( OC_User::deleteUser( $username )) {
 }
 else{
 	OC_JSON::error(array("data" => array( "message" => $l->t("Unable to delete user") )));
-}
\ No newline at end of file
+}
diff --git a/settings/ajax/setlanguage.php b/settings/ajax/setlanguage.php
index 42eea7a96fd..aebb1b31b6f 100644
--- a/settings/ajax/setlanguage.php
+++ b/settings/ajax/setlanguage.php
@@ -1,8 +1,5 @@
 <?php
 
-// Init owncloud
-require_once '../../lib/base.php';
-
 $l=OC_L10N::get('settings');
 
 OC_JSON::checkLoggedIn();
diff --git a/settings/ajax/setloglevel.php b/settings/ajax/setloglevel.php
index 982899e106a..542219f86c6 100644
--- a/settings/ajax/setloglevel.php
+++ b/settings/ajax/setloglevel.php
@@ -5,7 +5,6 @@
  * See the COPYING-README file.
  */
 
-require_once '../../lib/base.php';
 OC_Util::checkAdminUser();
 OCP\JSON::callCheck();
 
diff --git a/settings/ajax/setquota.php b/settings/ajax/setquota.php
index 2352ae9e427..845f8ea408c 100644
--- a/settings/ajax/setquota.php
+++ b/settings/ajax/setquota.php
@@ -5,9 +5,6 @@
  * See the COPYING-README file.
  */
 
-// Init owncloud
-require_once '../../lib/base.php';
-
 OC_JSON::checkSubAdminUser();
 OCP\JSON::callCheck();
 
@@ -39,5 +36,5 @@ if($username) {
 	}
 	OC_Appconfig::setValue('files', 'default_quota', $quota);
 }
-OC_JSON::success(array("data" => array( "username" => $username ,'quota' => $quota)));
+OC_JSON::success(array("data" => array( "username" => $username , 'quota' => $quota)));
 
diff --git a/settings/ajax/togglegroups.php b/settings/ajax/togglegroups.php
index 65747968c17..f82ece4aee1 100644
--- a/settings/ajax/togglegroups.php
+++ b/settings/ajax/togglegroups.php
@@ -1,14 +1,17 @@
 <?php
 
-// Init owncloud
-require_once '../../lib/base.php';
-
 OC_JSON::checkSubAdminUser();
 OCP\JSON::callCheck();
 
 $success = true;
 $username = $_POST["username"];
-$group = OC_Util::sanitizeHTML($_POST["group"]);
+$group = $_POST["group"];
+
+if($username == OC_User::getUser() && $group == "admin" &&  OC_Group::inGroup($username, 'admin')){
+	$l = OC_L10N::get('core');
+	OC_JSON::error(array( 'data' => array( 'message' => $l->t('Admins can\'t remove themself from the admin group'))));
+	exit();
+}
 
 if(!OC_Group::inGroup(OC_User::getUser(), 'admin') && (!OC_SubAdmin::isUserAccessible(OC_User::getUser(), $username) || !OC_SubAdmin::isGroupAccessible(OC_User::getUser(), $group))) {
 	$l = OC_L10N::get('core');
diff --git a/settings/ajax/togglesubadmins.php b/settings/ajax/togglesubadmins.php
index 5f7126dca34..a99e805f69d 100644
--- a/settings/ajax/togglesubadmins.php
+++ b/settings/ajax/togglesubadmins.php
@@ -1,13 +1,10 @@
 <?php
 
-// Init owncloud
-require_once '../../lib/base.php';
-
 OC_JSON::checkAdminUser();
 OCP\JSON::callCheck();
 
 $username = $_POST["username"];
-$group = OC_Util::sanitizeHTML($_POST["group"]);
+$group = $_POST["group"];
 
 // Toggle group
 if(OC_SubAdmin::isSubAdminofGroup($username, $group)) {
@@ -16,4 +13,4 @@ if(OC_SubAdmin::isSubAdminofGroup($username, $group)) {
 	OC_SubAdmin::createSubAdmin($username, $group);
 }
 
-OC_JSON::success();
\ No newline at end of file
+OC_JSON::success();
diff --git a/settings/ajax/userlist.php b/settings/ajax/userlist.php
index 840b6d72dc7..eaeade60a39 100644
--- a/settings/ajax/userlist.php
+++ b/settings/ajax/userlist.php
@@ -20,8 +20,6 @@
  *
  */
 
-require_once '../../lib/base.php';
-
 OC_JSON::callCheck();
 OC_JSON::checkSubAdminUser();
 if (isset($_GET['offset'])) {
@@ -34,9 +32,9 @@ if (OC_Group::inGroup(OC_User::getUser(), 'admin')) {
 	$batch = OC_User::getUsers('', 10, $offset);
 	foreach ($batch as $user) {
 		$users[] = array(
-			'name' => $user, 
-			'groups' => join(', ', OC_Group::getUserGroups($user)), 
-			'subadmin' => join(', ', OC_SubAdmin::getSubAdminsGroups($user)), 
+			'name' => $user,
+			'groups' => join(', ', OC_Group::getUserGroups($user)),
+			'subadmin' => join(', ', OC_SubAdmin::getSubAdminsGroups($user)),
 			'quota' => OC_Preferences::getValue($user, 'files', 'quota', 'default'));
 	}
 } else {
@@ -44,9 +42,9 @@ if (OC_Group::inGroup(OC_User::getUser(), 'admin')) {
 	$batch = OC_Group::usersInGroups($groups, '', 10, $offset);
 	foreach ($batch as $user) {
 		$users[] = array(
-			'name' => $user, 
-			'groups' => join(', ', OC_Group::getUserGroups($user)), 
+			'name' => $user,
+			'groups' => join(', ', OC_Group::getUserGroups($user)),
 			'quota' => OC_Preferences::getValue($user, 'files', 'quota', 'default'));
 	}
 }
-OC_JSON::success(array('data' => $users));
\ No newline at end of file
+OC_JSON::success(array('data' => $users));
diff --git a/settings/apps.php b/settings/apps.php
index a1c1bf6aa53..99a3094399d 100644
--- a/settings/apps.php
+++ b/settings/apps.php
@@ -21,8 +21,8 @@
 *
 */
 
-require_once '../lib/base.php';
 OC_Util::checkAdminUser();
+OC_App::loadApps();
 
 // Load the files we need
 OC_Util::addStyle( "settings", "settings" );
@@ -77,7 +77,7 @@ foreach ( $installedApps as $app ) {
 		
 		}
 		
-		$info['preview'] = 'trans.png';
+		$info['preview'] = OC_Helper::imagePath('settings', 'trans.png');
 		
 		$info['version'] = OC_App::getAppVersion($app);
 		
@@ -95,11 +95,11 @@ if ( $remoteApps ) {
 
 		foreach ( $remoteApps AS $key => $remote ) {
 		
-			if ( 
+			if (
 			$app['name'] == $remote['name']
-			// To set duplicate detection to use OCS ID instead of string name, 
-			// enable this code, remove the line of code above, 
-			// and add <ocs_id>[ID]</ocs_id> to info.xml of each 3rd party app: 
+			// To set duplicate detection to use OCS ID instead of string name,
+			// enable this code, remove the line of code above,
+			// and add <ocs_id>[ID]</ocs_id> to info.xml of each 3rd party app:
 			// OR $app['ocs_id'] == $remote['ocs_id']
 			) {
 				
diff --git a/settings/css/settings.css b/settings/css/settings.css
index f5ee2124f0f..560862fa12f 100644
--- a/settings/css/settings.css
+++ b/settings/css/settings.css
@@ -65,5 +65,6 @@ span.version { margin-left:1em; margin-right:1em; color:#555; }
 
 /* ADMIN */
 span.securitywarning {color:#C33; font-weight:bold; }
+span.connectionwarning {color:#933; font-weight:bold; }
 input[type=radio] { width:1em; }
 table.shareAPI td { padding-bottom: 0.8em; }
diff --git a/settings/help.php b/settings/help.php
index 9157308dd57..69a5ec9c146 100644
--- a/settings/help.php
+++ b/settings/help.php
@@ -5,9 +5,8 @@
  * See the COPYING-README file.
  */
 
-require_once '../lib/base.php';
 OC_Util::checkLoggedIn();
-
+OC_App::loadApps();
 
 // Load the files we need
 OC_Util::addStyle( "settings", "settings" );
diff --git a/settings/trans.png b/settings/img/trans.png
index ef57510d530..ef57510d530 100644
--- a/settings/trans.png
+++ b/settings/img/trans.png
diff --git a/settings/js/apps.js b/settings/js/apps.js
index e45abf9b3dd..c4c36b4bb12 100644
--- a/settings/js/apps.js
+++ b/settings/js/apps.js
@@ -91,7 +91,7 @@ OC.Settings.Apps = OC.Settings.Apps || {
 		return app;
 	},
 	removeNavigation: function(appid){
-		$.getJSON(OC.filePath('core','ajax','navigationdetect.php'), {app: appid}).done(function(response){
+		$.getJSON(OC.filePath('settings', 'ajax', 'navigationdetect.php'), {app: appid}).done(function(response){
 			if(response.status === 'success'){
 				var navIds=response.nav_ids;
 				for(var i=0; i< navIds.length; i++){
@@ -101,7 +101,7 @@ OC.Settings.Apps = OC.Settings.Apps || {
 		});
 	},
 	addNavigation: function(appid){
-		$.getJSON(OC.filePath('core','ajax','navigationdetect.php'), {app: appid}).done(function(response){
+		$.getJSON(OC.filePath('settings', 'ajax', 'navigationdetect.php'), {app: appid}).done(function(response){
 			if(response.status === 'success'){
 				var navEntries=response.nav_entries;
 				for(var i=0; i< navEntries.length; i++){
diff --git a/settings/js/users.js b/settings/js/users.js
index 20bd94993bc..f2ce69cf311 100644
--- a/settings/js/users.js
+++ b/settings/js/users.js
@@ -16,7 +16,10 @@ var UserList={
 	 * 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
@@ -26,7 +29,6 @@ var UserList={
 		$('#notification').html(t('users', 'deleted')+' '+uid+'<span class="undo">'+t('users', 'undo')+'</span>');
 		$('#notification').data('deleteuser',true);
 		$('#notification').fadeIn();
-			
 	},
 	
 	/**
@@ -54,10 +56,11 @@ var UserList={
 						$('#notification').fadeOut();
 						$('tr').filterAttr('data-uid', UserList.deleteUid).remove();
 						UserList.deleteCanceled = true;
-						UserList.deleteFiles = null;
 						if (ready) {
 							ready();
 						}
+					} else {
+						oc.dialogs.alert(result.data.message, t('settings', 'Unable to remove user'));
 					}
 				}
 			});
@@ -66,20 +69,15 @@ var UserList={
 
 	add:function(username, groups, subadmin, quota, sort) {
 		var tr = $('tbody tr').first().clone();
-		tr.data('uid', username);
+		tr.attr('data-uid', username);
 		tr.find('td.name').text(username);
-		var groupsSelect = $('<select multiple="multiple" class="groupsselect" data-placehoder="Groups" title="Groups">');
-		groupsSelect.data('username', username);
-		groupsSelect.data('userGroups', groups);
+		var groupsSelect = $('<select multiple="multiple" class="groupsselect" data-placehoder="Groups" title="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('files', 'Group Admin') + '">');
-			subadminSelect.data('username', username);
-			subadminSelect.data('userGroups', groups);
-			subadminSelect.data('subadmin', subadmin);
+			var subadminSelect = $('<select multiple="multiple" class="subadminsselect" data-placehoder="subadmins" title="' + t('files', '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').data('groups')).split(', ');
+		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') {
@@ -93,7 +91,14 @@ var UserList={
 			UserList.applyMultiplySelect(subadminSelect);
 		}
 		if (tr.find('td.remove img').length == 0 && OC.currentUser != username) {
-			tr.find('td.remove').append($('<img alt="Delete" title="'+t('settings','Delete')+'" class="svg action" src="'+OC.imagePath('core','actions/delete')+'"/>'));
+			var rm_img = $('<img>', {
+				class: 'svg action',
+				src: OC.imagePath('core','actions/delete'),
+				alt: t('settings','Delete'),
+				title: t('settings','Delete')
+			});
+			var rm_link = $('<a>', { class: 'action delete', href: '#'}).append(rm_img);
+			tr.find('td.remove').append(rm_link);
 		} else if (OC.currentUser == username) {
 			tr.find('td.remove a').remove();
 		}
@@ -113,7 +118,7 @@ var UserList={
 		if (sort) {
 			username = username.toLowerCase();
 			$('tbody tr').each(function() {
-				if (username < $(this).data('uid').toLowerCase()) {
+				if (username < $(this).attr('data-uid').toLowerCase()) {
 					$(tr).insertBefore($(this));
 					added = true;
 					return false;
@@ -130,7 +135,7 @@ var UserList={
 		if (typeof UserList.offset === 'undefined') {
 			UserList.offset = $('tbody tr').length;
 		}
-		$.get(OC.filePath('settings', 'ajax', 'userlist.php'), { offset: UserList.offset }, function(result) {
+		$.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);
@@ -148,7 +153,7 @@ var UserList={
 
 	applyMultiplySelect:function(element) {
 		var checked=[];
-		var user=element.data('username');
+		var user=element.attr('data-username');
 		if($(element).attr('class') == 'groupsselect'){
 			if(element.data('userGroups')){
 				checked=String(element.data('userGroups')).split(', ');
@@ -257,7 +262,7 @@ $(document).ready(function(){
 	
 	$('td.remove>a').live('click',function(event){
 		var row = $(this).parent().parent();
-		var uid = $(row).data('uid');
+		var uid = $(row).attr('data-uid');
 		$(row).hide();
 		// Call function for handling delete/undo
 		UserList.do_delete(uid);
@@ -266,7 +271,7 @@ $(document).ready(function(){
 	$('td.password>img').live('click',function(event){
 		event.stopPropagation();
 		var img=$(this);
-		var uid=img.parent().parent().data('uid');
+		var uid=img.parent().parent().attr('data-uid');
 		var input=$('<input type="password">');
 		img.css('display','none');
 		img.parent().children('span').replaceWith(input);
@@ -296,7 +301,7 @@ $(document).ready(function(){
 	
 	$('select.quota, select.quota-user').live('change',function(){
 		var select=$(this);
-		var uid=$(this).parent().parent().parent().data('uid');
+		var uid=$(this).parent().parent().parent().attr('data-uid');
 		var quota=$(this).val();
 		var other=$(this).next();
 		if(quota!='other'){
@@ -314,7 +319,7 @@ $(document).ready(function(){
 	})
 	
 	$('input.quota-other').live('change',function(){
-		var uid=$(this).parent().parent().parent().data('uid');
+		var uid=$(this).parent().parent().parent().attr('data-uid');
 		var quota=$(this).val();
 		var select=$(this).prev();
 		var other=$(this);
@@ -391,13 +396,8 @@ $(document).ready(function(){
 	$('#notification').hide();
 	$('#notification .undo').live('click', function() {
 		if($('#notification').data('deleteuser')) {
-			$('tbody tr').each(function(index, row) {
-				if ($(row).data('uid') == UserList.deleteUid) {
-					$(row).show();
-				}
-			});
+			$('tbody tr').filterAttr('data-uid', UserList.deleteUid).show();
 			UserList.deleteCanceled=true;
-			UserList.deleteFiles=null;
 		}
 		$('#notification').fadeOut();
 	});
diff --git a/settings/l10n/ar.php b/settings/l10n/ar.php
index 36cad27d3a3..662e69bbfc5 100644
--- a/settings/l10n/ar.php
+++ b/settings/l10n/ar.php
@@ -1,13 +1,17 @@
 <?php $TRANSLATIONS = array(
 "OpenID Changed" => "تم تغيير ال OpenID",
 "Invalid request" => "طلبك غير مفهوم",
+"Authentication error" => "لم يتم التأكد من الشخصية بنجاح",
 "Language changed" => "تم تغيير اللغة",
+"Saving..." => "حفظ",
 "__language_name__" => "__language_name__",
 "Select an App" => "إختر تطبيقاً",
+"Documentation" => "التوثيق",
 "Ask a question" => "إسأل سؤال",
 "Problems connecting to help database." => "الاتصال بقاعدة بيانات المساعدة لم يتم بنجاح",
 "Go there manually." => "إذهب هنالك بنفسك",
 "Answer" => "الجواب",
+"Download" => "انزال",
 "Unable to change your password" => "لم يتم تعديل كلمة السر بنجاح",
 "Current password" => "كلمات السر الحالية",
 "New password" => "كلمات سر جديدة",
@@ -23,6 +27,7 @@
 "Password" => "كلمات السر",
 "Groups" => "مجموعات",
 "Create" => "انشئ",
+"Other" => "شيء آخر",
 "Quota" => "حصه",
 "Delete" => "حذف"
 );
diff --git a/settings/l10n/bg_BG.php b/settings/l10n/bg_BG.php
index 6a46348b300..5a2d882581f 100644
--- a/settings/l10n/bg_BG.php
+++ b/settings/l10n/bg_BG.php
@@ -3,6 +3,7 @@
 "Invalid email" => "Неправилна е-поща",
 "OpenID Changed" => "OpenID е сменено",
 "Invalid request" => "Невалидна заявка",
+"Authentication error" => "Проблем с идентификацията",
 "Language changed" => "Езика е сменен",
 "Disable" => "Изключване",
 "Enable" => "Включване",
@@ -30,6 +31,7 @@
 "Groups" => "Групи",
 "Create" => "Ново",
 "Default Quota" => "Квота по подразбиране",
+"Other" => "Друго",
 "Quota" => "Квота",
 "Delete" => "Изтриване"
 );
diff --git a/settings/l10n/ca.php b/settings/l10n/ca.php
index 16660fb07d3..eff84e12de7 100644
--- a/settings/l10n/ca.php
+++ b/settings/l10n/ca.php
@@ -1,6 +1,5 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "No s'ha pogut carregar la llista des de l'App Store",
-"Authentication error" => "Error d'autenticació",
 "Group already exists" => "El grup ja existeix",
 "Unable to add group" => "No es pot afegir el grup",
 "Could not enable app. " => "No s'ha pogut activar l'apliació",
@@ -9,32 +8,16 @@
 "OpenID Changed" => "OpenID ha canviat",
 "Invalid request" => "Sol.licitud no vàlida",
 "Unable to delete group" => "No es pot eliminar el grup",
+"Authentication error" => "Error d'autenticació",
 "Unable to delete user" => "No es pot eliminar l'usuari",
 "Language changed" => "S'ha canviat l'idioma",
+"Admins can't remove themself from the admin group" => "Els administradors no es poden eliminar del grup admin",
 "Unable to add user to group %s" => "No es pot afegir l'usuari al grup %s",
 "Unable to remove user from group %s" => "No es pot eliminar l'usuari del grup %s",
 "Disable" => "Desactiva",
 "Enable" => "Activa",
 "Saving..." => "S'està desant...",
 "__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 vostres fitxersprobablement són accessibles des d'Internet. La fitxer .htaccess que ownCloud proporciona no funciona. Us recomanem que configureu el servidor web de tal manera que la carpeta de dades no sigui accessible o que moveu la carpeta de dades fora de l'arrel de documents del servidor web.",
-"Cron" => "Cron",
-"Execute one task with each page loaded" => "Executar una tasca de 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à registrat en un servei webcron. Feu una crida a la pàgina cron.php a l'arrel de 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." => "Utilitzeu el sistema de servei cron. Cridar el arxiu cron.php de la carpeta owncloud cada minut utilitzant el sistema de tasques cron.",
-"Sharing" => "Compartir",
-"Enable Share API" => "Activa l'API de compartir",
-"Allow apps to use the Share API" => "Permet que les aplicacions usin 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 comparir elements ja compartits amb ells",
-"Allow users to share with anyone" => "Permet als usuaris compartir amb qualsevol",
-"Allow users to only share with users in their groups" => "Permet als usuaris compartir només amb usuaris del seu grup",
-"Log" => "Registre",
-"More" => "Més",
-"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Desenvolupat per la <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunitat ownCloud</a>, el <a href=\"https://github.com/owncloud\" target=\"_blank\">codi font</a> té llicència <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
 "Add your App" => "Afegiu la vostra aplicació",
 "More Apps" => "Més aplicacions",
 "Select an App" => "Seleccioneu una aplicació",
@@ -46,7 +29,7 @@
 "Problems connecting to help database." => "Problemes per connectar amb la base de dades d'ajuda.",
 "Go there manually." => "Vés-hi manualment.",
 "Answer" => "Resposta",
-"You have used <strong>%s</strong> of the available <strong>%s<strong>" => "Ha utilitzat <strong>%s</strong> de la <strong>%s</strong> disponible",
+"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>",
 "Desktop and Mobile Syncing Clients" => "Clients de sincronització d'escriptori i de mòbil",
 "Download" => "Baixada",
 "Your password was changed" => "La seva contrasenya s'ha canviat",
@@ -61,6 +44,7 @@
 "Language" => "Idioma",
 "Help translate" => "Ajudeu-nos amb la traducció",
 "use this address to connect to your ownCloud in your file manager" => "useu aquesta adreça per connectar-vos a ownCloud des del gestor de fitxers",
+"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>.",
 "Name" => "Nom",
 "Password" => "Contrasenya",
 "Groups" => "Grups",
diff --git a/settings/l10n/cs_CZ.php b/settings/l10n/cs_CZ.php
index c0f7ebd8686..ee30583b046 100644
--- a/settings/l10n/cs_CZ.php
+++ b/settings/l10n/cs_CZ.php
@@ -1,6 +1,5 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "Nelze načíst seznam z App Store",
-"Authentication error" => "Chyba ověření",
 "Group already exists" => "Skupina již existuje",
 "Unable to add group" => "Nelze přidat skupinu",
 "Could not enable app. " => "Nelze povolit aplikaci.",
@@ -9,32 +8,16 @@
 "OpenID Changed" => "OpenID změněno",
 "Invalid request" => "Neplatný požadavek",
 "Unable to delete group" => "Nelze smazat skupinu",
+"Authentication error" => "Chyba ověření",
 "Unable to delete user" => "Nelze smazat uživatele",
 "Language changed" => "Jazyk byl změněn",
+"Admins can't remove themself from the admin group" => "Správci se nemohou odebrat sami ze skupiny správců",
 "Unable to add user to group %s" => "Nelze přidat uživatele do skupiny %s",
 "Unable to remove user from group %s" => "Nelze odstranit uživatele ze skupiny %s",
 "Disable" => "Zakázat",
 "Enable" => "Povolit",
 "Saving..." => "Ukládám...",
 "__language_name__" => "Česky",
-"Security Warning" => "Bezpečnostní varová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 soubory jsou pravděpodobně přístupné z internetu. Soubor .htacces, který ownCloud poskytuje nefunguje. Doporučujeme Vám abyste nastavili Váš webový server tak, aby nebylo možno přistupovat do adresáře s daty, nebo přesunuli adresář dat mimo kořenovou složku dokumentů webového serveru.",
-"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",
-"Log" => "Záznam",
-"More" => "Více",
-"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Vyvinuto <a href=\"http://ownCloud.org/contact\" target=\"_blank\">komunitou ownCloud</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">zdrojový kód</a> je licencován pod <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
 "Add your App" => "Přidat Vaší aplikaci",
 "More Apps" => "Více aplikací",
 "Select an App" => "Vyberte aplikaci",
@@ -46,7 +29,7 @@
 "Problems connecting to help database." => "Problémy s připojením k databázi s nápovědou.",
 "Go there manually." => "Přejít ručně.",
 "Answer" => "Odpověď",
-"You have used <strong>%s</strong> of the available <strong>%s<strong>" => "Použili jste <strong>%s</strong> z dostupných <strong>%s<strong>",
+"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Používáte <strong>%s</strong> z <strong>%s</strong> dostupných",
 "Desktop and Mobile Syncing Clients" => "Klienti pro synchronizaci",
 "Download" => "Stáhnout",
 "Your password was changed" => "Vaše heslo bylo změněno",
@@ -61,6 +44,7 @@
 "Language" => "Jazyk",
 "Help translate" => "Pomoci s překladem",
 "use this address to connect to your ownCloud in your file manager" => "tuto adresu použijte pro připojení k ownCloud ve Vašem správci souborů",
+"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>.",
 "Name" => "Jméno",
 "Password" => "Heslo",
 "Groups" => "Skupiny",
diff --git a/settings/l10n/da.php b/settings/l10n/da.php
index f93d7b6cd11..3d82f6e4a0b 100644
--- a/settings/l10n/da.php
+++ b/settings/l10n/da.php
@@ -1,6 +1,5 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "Kunne ikke indlæse listen fra App Store",
-"Authentication error" => "Adgangsfejl",
 "Group already exists" => "Gruppen findes allerede",
 "Unable to add group" => "Gruppen kan ikke oprettes",
 "Could not enable app. " => "Applikationen kunne ikke aktiveres.",
@@ -9,6 +8,7 @@
 "OpenID Changed" => "OpenID ændret",
 "Invalid request" => "Ugyldig forespørgsel",
 "Unable to delete group" => "Gruppen kan ikke slettes",
+"Authentication error" => "Adgangsfejl",
 "Unable to delete user" => "Bruger kan ikke slettes",
 "Language changed" => "Sprog ændret",
 "Unable to add user to group %s" => "Brugeren kan ikke tilføjes til gruppen %s",
@@ -17,24 +17,6 @@
 "Enable" => "Aktiver",
 "Saving..." => "Gemmer...",
 "__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 datamappe og dine filer er formentligt tilgængelige fra internettet.\n.htaccess-filen, som ownCloud leverer, fungerer ikke. Vi anbefaler stærkt, at du opsætter din server på en måde, så datamappen ikke længere er direkte tilgængelig, eller at du flytter datamappen udenfor serverens tilgængelige rodfilsystem.",
-"Cron" => "Cron",
-"Execute one task with each page loaded" => "Udfør en opgave med hver side indlæst",
-"cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "cron.php er registreret hos en webcron-tjeneste. Kald cron.php-siden i ownClouds rodmappe en gang i minuttet over http.",
-"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "vend systemets cron-tjeneste. Kald cron.php-filen i ownCloud-mappen ved hjælp af systemets cronjob en gang i minuttet.",
-"Sharing" => "Deling",
-"Enable Share API" => "Aktiver dele API",
-"Allow apps to use the Share API" => "Tillad apps a bruge dele APIen",
-"Allow links" => "Tillad links",
-"Allow users to share items to the public with links" => "Tillad brugere at dele elementer med offentligheden med links",
-"Allow resharing" => "Tillad gendeling",
-"Allow users to share items shared with them again" => "Tillad brugere at dele elementer, som er blevet delt med dem, videre til andre",
-"Allow users to share with anyone" => "Tillad brugere at dele med hvem som helst",
-"Allow users to only share with users in their groups" => "Tillad kun deling med brugere i brugerens egen gruppe",
-"Log" => "Log",
-"More" => "Mere",
-"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Udviklet af <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownClouds community</a>, og <a href=\"https://github.com/owncloud\" target=\"_blank\">kildekoden</a> er underlagt licensen <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
 "Add your App" => "Tilføj din App",
 "More Apps" => "Flere Apps",
 "Select an App" => "Vælg en App",
@@ -46,7 +28,6 @@
 "Problems connecting to help database." => "Problemer med at forbinde til hjælpe-databasen.",
 "Go there manually." => "Gå derhen manuelt.",
 "Answer" => "Svar",
-"You have used <strong>%s</strong> of the available <strong>%s<strong>" => "Du har brugt <strong>%s</strong> af de tilgængelige <strong>%s<strong>",
 "Desktop and Mobile Syncing Clients" => "Synkroniserings programmer for desktop og mobil",
 "Download" => "Download",
 "Your password was changed" => "Din adgangskode blev ændret",
@@ -61,6 +42,7 @@
 "Language" => "Sprog",
 "Help translate" => "Hjælp med oversættelsen",
 "use this address to connect to your ownCloud in your file manager" => "benyt denne adresse til at forbinde til din ownCloud i din filbrowser",
+"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>.",
 "Name" => "Navn",
 "Password" => "Kodeord",
 "Groups" => "Grupper",
diff --git a/settings/l10n/de.php b/settings/l10n/de.php
index f010739d2c3..33de45a9225 100644
--- a/settings/l10n/de.php
+++ b/settings/l10n/de.php
@@ -11,30 +11,13 @@
 "Authentication error" => "Fehler bei der Anmeldung",
 "Unable to delete user" => "Benutzer konnte nicht gelöscht werden",
 "Language changed" => "Sprache geändert",
+"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",
 "Disable" => "Deaktivieren",
 "Enable" => "Aktivieren",
 "Saving..." => "Speichern...",
 "__language_name__" => "Deutsch (Persönlich)",
-"Security Warning" => "Sicherheitshinweis",
-"Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Dein Datenverzeichnis ist möglicherweise aus dem Internet erreichbar. Die .htaccess-Datei von ownCloud funktioniert nicht. Wir raten Dir dringend, dass Du Deinen Webserver dahingehend konfigurieren, dass Dein Datenverzeichnis nicht länger aus dem Internet erreichbar ist, oder Du verschiebst das Datenverzeichnis außerhalb des Wurzelverzeichnisses des Webservers.",
-"Cron" => "Cron-Jobs",
-"Execute one task with each page loaded" => "Führe eine Aufgabe bei jeder geladenen Seite aus.",
-"cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "cron.php ist bei einem Webcron-Dienst registriert. Ruf die Seite cron.php im ownCloud-Root minütlich per HTTP auf.",
-"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "Benutze den System-Crondienst. Bitte ruf die cron.php im ownCloud-Ordner über einen System-Cronjob minütlich auf.",
-"Sharing" => "Freigabe",
-"Enable Share API" => "Freigabe-API aktivieren",
-"Allow apps to use the Share API" => "Erlaubt Anwendungen, die Freigabe-API zu nutzen",
-"Allow links" => "Links erlauben",
-"Allow users to share items to the public with links" => "Erlaube Nutzern, Dateien mithilfe von Links öffentlich zu teilen",
-"Allow resharing" => "Erneutes Teilen erlauben",
-"Allow users to share items shared with them again" => "Erlaubt Nutzern, Dateien die mit ihnen geteilt wurden, erneut zu teilen",
-"Allow users to share with anyone" => "Erlaubt Nutzern mit jedem zu Teilen",
-"Allow users to only share with users in their groups" => "Erlaubt Nutzern nur das Teilen in ihrer Gruppe",
-"Log" => "Log",
-"More" => "Mehr",
-"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Entwickelt von der <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud-Community</a>, der <a href=\"https://github.com/owncloud\" target=\"_blank\">Quellcode</a> ist unter der <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> lizenziert.",
 "Add your App" => "Füge Deine Anwendung hinzu",
 "More Apps" => "Weitere Anwendungen",
 "Select an App" => "Wähle eine Anwendung aus",
@@ -46,7 +29,7 @@
 "Problems connecting to help database." => "Probleme bei der Verbindung zur Hilfe-Datenbank.",
 "Go there manually." => "Datenbank direkt besuchen.",
 "Answer" => "Antwort",
-"You have used <strong>%s</strong> of the available <strong>%s<strong>" => "Du verwendest <strong>%s</strong> der verfügbaren <strong>%s<strong>",
+"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Du verwendest <strong>%s</strong> der verfügbaren <strong>%s<strong>",
 "Desktop and Mobile Syncing Clients" => "Desktop- und mobile Clients für die Synchronisation",
 "Download" => "Download",
 "Your password was changed" => "Dein Passwort wurde geändert.",
@@ -61,6 +44,7 @@
 "Language" => "Sprache",
 "Help translate" => "Hilf bei der Übersetzung",
 "use this address to connect to your ownCloud in your file manager" => "Verwende diese Adresse, um Deine ownCloud mit Deinem Dateimanager zu verbinden.",
+"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.",
 "Name" => "Name",
 "Password" => "Passwort",
 "Groups" => "Gruppen",
diff --git a/settings/l10n/de_DE.php b/settings/l10n/de_DE.php
index 100cbfd113f..9db7cb93c36 100644
--- a/settings/l10n/de_DE.php
+++ b/settings/l10n/de_DE.php
@@ -1,40 +1,23 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "Die Liste der Anwendungen im Store konnte nicht geladen werden.",
-"Group already exists" => "Gruppe existiert bereits",
-"Unable to add group" => "Gruppe konnte nicht angelegt werden",
-"Could not enable app. " => "App konnte nicht aktiviert werden.",
-"Email saved" => "E-Mail Adresse gespeichert",
-"Invalid email" => "Ungültige E-Mail Adresse",
+"Group already exists" => "Die Gruppe existiert bereits",
+"Unable to add group" => "Die Gruppe konnte nicht angelegt werden",
+"Could not enable app. " => "Die Anwendung konnte nicht aktiviert werden.",
+"Email saved" => "E-Mail-Adresse gespeichert",
+"Invalid email" => "Ungültige E-Mail-Adresse",
 "OpenID Changed" => "OpenID geändert",
 "Invalid request" => "Ungültige Anfrage",
-"Unable to delete group" => "Gruppe konnte nicht gelöscht werden",
+"Unable to delete group" => "Die Gruppe konnte nicht gelöscht werden",
 "Authentication error" => "Fehler bei der Anmeldung",
-"Unable to delete user" => "Benutzer konnte nicht gelöscht werden",
+"Unable to delete user" => "Der Benutzer konnte nicht gelöscht werden",
 "Language changed" => "Sprache geändert",
+"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",
 "Disable" => "Deaktivieren",
 "Enable" => "Aktivieren",
 "Saving..." => "Speichern...",
-"__language_name__" => "Deutsch (Förmlich)",
-"Security Warning" => "Sicherheitshinweis",
-"Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Ihr Datenverzeichnis ist möglicher Weise aus dem Internet erreichbar. Die .htaccess-Datei von ownCloud funktioniert nicht. Wir raten Ihnen dringend, dass Sie Ihren Webserver dahingehend konfigurieren, dass Ihr Datenverzeichnis nicht länger aus dem Internet erreichbar ist, oder Sie verschieben das Datenverzeichnis außerhalb des Wurzelverzeichnisses des Webservers.",
-"Cron" => "Cron-Jobs",
-"Execute one task with each page loaded" => "Führt eine Aufgabe bei jeder geladenen Seite aus.",
-"cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "cron.php ist bei einem Webcron-Dienst registriert. Ruf die Seite cron.php im ownCloud-Root minütlich per HTTP auf.",
-"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "Verwenden Sie den System-Crondienst. Bitte rufen Sie die cron.php im ownCloud-Ordner über einen System-Cronjob minütlich auf.",
-"Sharing" => "Freigabe",
-"Enable Share API" => "Freigabe-API aktivieren",
-"Allow apps to use the Share API" => "Erlaubt Anwendungen, die Freigabe-API zu nutzen",
-"Allow links" => "Links erlauben",
-"Allow users to share items to the public with links" => "Erlaube Nutzern, Dateien mithilfe von Links öffentlich zu teilen",
-"Allow resharing" => "Erneutes Teilen erlauben",
-"Allow users to share items shared with them again" => "Erlaubt Nutzern, Dateien die mit ihnen geteilt wurden, erneut zu teilen",
-"Allow users to share with anyone" => "Erlaubet Nutzern mit jedem zu Teilen",
-"Allow users to only share with users in their groups" => "Erlaubet Nutzern nur das Teilen in ihrer Gruppe",
-"Log" => "Log",
-"More" => "Mehr",
-"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Entwickelt von der <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud-Community</a>, der <a href=\"https://github.com/owncloud\" target=\"_blank\">Quellcode</a> ist unter der <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> lizenziert.",
+"__language_name__" => "Deutsch (Förmlich: Sie)",
 "Add your App" => "Fügen Sie Ihre Anwendung hinzu",
 "More Apps" => "Weitere Anwendungen",
 "Select an App" => "Wählen Sie eine Anwendung aus",
@@ -46,11 +29,11 @@
 "Problems connecting to help database." => "Probleme bei der Verbindung zur Hilfe-Datenbank.",
 "Go there manually." => "Datenbank direkt besuchen.",
 "Answer" => "Antwort",
-"You have used <strong>%s</strong> of the available <strong>%s<strong>" => "Sie verwenden <strong>%s</strong> der verfügbaren <strong>%s<strong>",
+"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Sie verwenden <strong>%s</strong> der verfügbaren <strong>%s</strong>",
 "Desktop and Mobile Syncing Clients" => "Desktop- und mobile Clients für die Synchronisation",
 "Download" => "Download",
 "Your password was changed" => "Ihr Passwort wurde geändert.",
-"Unable to change your password" => "Passwort konnte nicht geändert werden",
+"Unable to change your password" => "Das Passwort konnte nicht geändert werden",
 "Current password" => "Aktuelles Passwort",
 "New password" => "Neues Passwort",
 "show" => "zeigen",
@@ -59,8 +42,9 @@
 "Your email address" => "Ihre E-Mail-Adresse",
 "Fill in an email address to enable password recovery" => "Bitte tragen Sie eine E-Mail-Adresse ein, um die Passwort-Wiederherstellung zu aktivieren.",
 "Language" => "Sprache",
-"Help translate" => "Hilf bei der Übersetzung",
+"Help translate" => "Helfen Sie bei der Übersetzung",
 "use this address to connect to your ownCloud in your file manager" => "Benutzen Sie diese Adresse, um Ihre ownCloud mit Ihrem Dateimanager zu verbinden.",
+"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.",
 "Name" => "Name",
 "Password" => "Passwort",
 "Groups" => "Gruppen",
diff --git a/settings/l10n/el.php b/settings/l10n/el.php
index bf74d0bde21..ac62453886c 100644
--- a/settings/l10n/el.php
+++ b/settings/l10n/el.php
@@ -1,6 +1,5 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "Σφάλμα στην φόρτωση της λίστας από το App Store",
-"Authentication error" => "Σφάλμα πιστοποίησης",
 "Group already exists" => "Η ομάδα υπάρχει ήδη",
 "Unable to add group" => "Αδυναμία προσθήκης ομάδας",
 "Could not enable app. " => "Αδυναμία ενεργοποίησης εφαρμογής ",
@@ -9,32 +8,16 @@
 "OpenID Changed" => "Το OpenID άλλαξε",
 "Invalid request" => "Μη έγκυρο αίτημα",
 "Unable to delete group" => "Αδυναμία διαγραφής ομάδας",
+"Authentication error" => "Σφάλμα πιστοποίησης",
 "Unable to delete user" => "Αδυναμία διαγραφής χρήστη",
 "Language changed" => "Η γλώσσα άλλαξε",
+"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",
 "Disable" => "Απενεργοποίηση",
 "Enable" => "Ενεργοποίηση",
 "Saving..." => "Αποθήκευση...",
 "__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, δεν λειτουργεί. Σας συνιστούμε να ρυθμίσετε τον εξυπηρετητή σας έτσι ώστε ο κατάλογος δεδομένων να μην είναι πλεον προσβάσιμος ή μετακινήστε τον κατάλογο δεδομένων εκτός του καταλόγου document του εξυπηρετητή σας.",
-"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" => "Να επιτρέπεται ο διαμοιρασμός μόνο με χρήστες της ίδιας ομάδας",
-"Log" => "Αρχείο καταγραφής",
-"More" => "Περισσότερα",
-"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Αναπτύχθηκε από την <a href=\"http://ownCloud.org/contact\" target=\"_blank\">κοινότητα ownCloud</a>, ο <a href=\"https://github.com/owncloud\" target=\"_blank\">πηγαίος κώδικας</a> είναι υπό άδεια χρήσης <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
 "Add your App" => "Πρόσθεστε τη Δικιά σας Εφαρμογή",
 "More Apps" => "Περισσότερες Εφαρμογές",
 "Select an App" => "Επιλέξτε μια Εφαρμογή",
@@ -46,7 +29,7 @@
 "Problems connecting to help database." => "Προβλήματα κατά τη σύνδεση με τη βάση δεδομένων βοήθειας.",
 "Go there manually." => "Χειροκίνητη μετάβαση.",
 "Answer" => "Απάντηση",
-"You have used <strong>%s</strong> of the available <strong>%s<strong>" => "Έχετε χρησιμοποιήσει <strong>%s</strong> από τα διαθέσιμα <strong>%s<strong>",
+"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Χρησιμοποιήσατε <strong>%s</strong> από διαθέσιμα <strong>%s</strong>",
 "Desktop and Mobile Syncing Clients" => "Πελάτες συγχρονισμού για Desktop και Mobile",
 "Download" => "Λήψη",
 "Your password was changed" => "Το συνθηματικό σας έχει αλλάξει",
@@ -61,6 +44,7 @@
 "Language" => "Γλώσσα",
 "Help translate" => "Βοηθήστε στη μετάφραση",
 "use this address to connect to your ownCloud in your file manager" => "χρησιμοποιήστε αυτήν τη διεύθυνση για να συνδεθείτε στο 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\">AGPL</abbr></a>.",
 "Name" => "Όνομα",
 "Password" => "Συνθηματικό",
 "Groups" => "Ομάδες",
diff --git a/settings/l10n/eo.php b/settings/l10n/eo.php
index 2c8263d292f..e686868e67c 100644
--- a/settings/l10n/eo.php
+++ b/settings/l10n/eo.php
@@ -1,6 +1,5 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "Ne eblis ŝargi liston el aplikaĵovendejo",
-"Authentication error" => "Aŭtentiga eraro",
 "Group already exists" => "La grupo jam ekzistas",
 "Unable to add group" => "Ne eblis aldoni la grupon",
 "Could not enable app. " => "Ne eblis kapabligi la aplikaĵon.",
@@ -9,27 +8,16 @@
 "OpenID Changed" => "La agordo de OpenID estas ŝanĝita",
 "Invalid request" => "Nevalida peto",
 "Unable to delete group" => "Ne eblis forigi la grupon",
+"Authentication error" => "Aŭtentiga eraro",
 "Unable to delete user" => "Ne eblis forigi la uzanton",
 "Language changed" => "La lingvo estas ŝanĝita",
+"Admins can't remove themself from the admin group" => "Administrantoj ne povas forigi sin mem el la administra grupo.",
 "Unable to add user to group %s" => "Ne eblis aldoni la uzanton al la grupo %s",
 "Unable to remove user from group %s" => "Ne eblis forigi la uzantan el la grupo %s",
 "Disable" => "Malkapabligi",
 "Enable" => "Kapabligi",
 "Saving..." => "Konservante...",
 "__language_name__" => "Esperanto",
-"Security Warning" => "Sekureca averto",
-"Cron" => "Cron",
-"Sharing" => "Kunhavigo",
-"Enable Share API" => "Kapabligi API-on por Kunhavigo",
-"Allow apps to use the Share API" => "Kapabligi aplikaĵojn uzi la API-on pri Kunhavigo",
-"Allow links" => "Kapabligi ligilojn",
-"Allow users to share items to the public with links" => "Kapabligi uzantojn kunhavigi erojn kun la publiko perligile",
-"Allow resharing" => "Kapabligi rekunhavigon",
-"Allow users to share items shared with them again" => "Kapabligi uzantojn rekunhavigi erojn kunhavigitajn kun ili",
-"Allow users to share with anyone" => "Kapabligi uzantojn kunhavigi kun ĉiu ajn",
-"Allow users to only share with users in their groups" => "Kapabligi uzantojn nur kunhavigi kun uzantoj el siaj grupoj",
-"Log" => "Protokolo",
-"More" => "Pli",
 "Add your App" => "Aldonu vian aplikaĵon",
 "More Apps" => "Pli da aplikaĵoj",
 "Select an App" => "Elekti aplikaĵon",
@@ -41,7 +29,7 @@
 "Problems connecting to help database." => "Problemoj okazis dum konektado al la helpa datumbazo.",
 "Go there manually." => "Iri tien mane.",
 "Answer" => "Respondi",
-"You have used <strong>%s</strong> of the available <strong>%s<strong>" => "Vi uzas <strong>%s</strong> el la haveblaj <strong>%s</strong>",
+"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Vi uzas <strong>%s</strong> el la haveblaj <strong>%s</strong>",
 "Desktop and Mobile Syncing Clients" => "Labortablaj kaj porteblaj sinkronigoklientoj",
 "Download" => "Elŝuti",
 "Your password was changed" => "Via pasvorto ŝanĝiĝis",
@@ -56,6 +44,7 @@
 "Language" => "Lingvo",
 "Help translate" => "Helpu traduki",
 "use this address to connect to your ownCloud in your file manager" => "uzu ĉi tiun adreson por konektiĝi al via ownCloud per via dosieradministrilo",
+"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>.",
 "Name" => "Nomo",
 "Password" => "Pasvorto",
 "Groups" => "Grupoj",
diff --git a/settings/l10n/es.php b/settings/l10n/es.php
index 9a578fa6368..39f88ac4ea2 100644
--- a/settings/l10n/es.php
+++ b/settings/l10n/es.php
@@ -1,6 +1,5 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "Imposible cargar la lista desde el App Store",
-"Authentication error" => "Error de autenticación",
 "Group already exists" => "El grupo ya existe",
 "Unable to add group" => "No se pudo añadir el grupo",
 "Could not enable app. " => "No puedo habilitar la app.",
@@ -9,32 +8,16 @@
 "OpenID Changed" => "OpenID cambiado",
 "Invalid request" => "Solicitud no válida",
 "Unable to delete group" => "No se pudo eliminar el grupo",
+"Authentication error" => "Error de autenticación",
 "Unable to delete user" => "No se pudo eliminar el usuario",
 "Language changed" => "Idioma cambiado",
+"Admins can't remove themself from the admin group" => "Los administradores no se pueden eliminar a ellos mismos del grupo de administrador",
 "Unable to add user to group %s" => "Imposible añadir el usuario al grupo %s",
 "Unable to remove user from group %s" => "Imposible eliminar al usuario del grupo %s",
 "Disable" => "Desactivar",
 "Enable" => "Activar",
 "Saving..." => "Guardando...",
 "__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." => "El directorio de datos -data- y sus archivos probablemente son accesibles desde internet. El archivo .htaccess que provee ownCloud no está funcionando. Recomendamos fuertemente que configure su servidor web de forma que el directorio de datos ya no sea accesible o mueva el directorio de datos fuera de la raíz de documentos del servidor web.",
-"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 está registrado como un servicio del webcron. Llama a la página de cron.php en la raíz de owncloud cada minuto sobre http.",
-"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "Usar el servicio de cron del sitema. Llame al fichero cron.php en la carpeta de owncloud via servidor cronjob cada minuto.",
-"Sharing" => "Compartir",
-"Enable Share API" => "Activar API de compartición",
-"Allow apps to use the Share API" => "Permitir a las aplicaciones usar 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 públicamente con enlaces",
-"Allow resharing" => "Permitir re-compartir",
-"Allow users to share items shared with them again" => "Permitir a los usuarios compartir elementos compartidos con ellos de nuevo",
-"Allow users to share with anyone" => "Permitir a los usuarios compartir con cualquiera",
-"Allow users to only share with users in their groups" => "Permitir a los usuarios compartir con usuarios en sus grupos",
-"Log" => "Registro",
-"More" => "Más",
-"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Desarrollado por la <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunidad ownCloud</a>, el <a href=\"https://github.com/owncloud\" target=\"_blank\">código fuente</a> está bajo licencia <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
 "Add your App" => "Añade tu aplicación",
 "More Apps" => "Más aplicaciones",
 "Select an App" => "Seleccionar una aplicación",
@@ -46,7 +29,7 @@
 "Problems connecting to help database." => "Problemas al conectar con la base de datos de ayuda.",
 "Go there manually." => "Ir manualmente",
 "Answer" => "Respuesta",
-"You have used <strong>%s</strong> of the available <strong>%s<strong>" => "Ha usado <strong>%s</strong> de <strong>%s<strong> disponible",
+"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Ha usado <strong>%s</strong> de <strong>%s</strong> disponibles",
 "Desktop and Mobile Syncing Clients" => "Clientes de sincronización móviles y de escritorio",
 "Download" => "Descargar",
 "Your password was changed" => "Su contraseña ha sido cambiada",
@@ -61,6 +44,7 @@
 "Language" => "Idioma",
 "Help translate" => "Ayúdanos a traducir",
 "use this address to connect to your ownCloud in your file manager" => "utiliza esta dirección para conectar a tu ownCloud desde tu gestor de archivos",
+"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>.",
 "Name" => "Nombre",
 "Password" => "Contraseña",
 "Groups" => "Grupos",
diff --git a/settings/l10n/es_AR.php b/settings/l10n/es_AR.php
index ee6ecceb139..ebbce841a8e 100644
--- a/settings/l10n/es_AR.php
+++ b/settings/l10n/es_AR.php
@@ -11,30 +11,13 @@
 "Authentication error" => "Error al autenticar",
 "Unable to delete user" => "No fue posible eliminar el usuario",
 "Language changed" => "Idioma cambiado",
+"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",
 "Disable" => "Desactivar",
 "Enable" => "Activar",
 "Saving..." => "Guardando...",
 "__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." => "El directorio de datos -data- y los archivos que contiene, probablemente son accesibles desde internet. El archivo .htaccess que provee ownCloud no está funcionando. Recomendamos fuertemente que configures su servidor web de forma que el directorio de datos ya no sea accesible o que muevas el directorio de datos fuera de la raíz de documentos del servidor web.",
-"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 está registrado como un servicio del webcron. Esto carga la página de cron.php en la raíz de ownCloud cada minuto sobre http.",
-"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "Usar el servicio de cron del sistema. Esto carga  el archivo cron.php en la carpeta de ownCloud via servidor cronjob cada minuto.",
-"Sharing" => "Compartir",
-"Enable Share API" => "Activar API de compartición",
-"Allow apps to use the Share API" => "Permitir a las aplicaciones usar 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 públicamente con enlaces",
-"Allow resharing" => "Permitir re-compartir",
-"Allow users to share items shared with them again" => "Permitir a los usuarios compartir elementos ya compartidos",
-"Allow users to share with anyone" => "Permitir a los usuarios compartir con cualquiera",
-"Allow users to only share with users in their groups" => "Permitir a los usuarios compartir con usuarios en sus grupos",
-"Log" => "Registro",
-"More" => "Más",
-"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Desarrollado por la <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunidad ownCloud</a>, el <a href=\"https://github.com/owncloud\" target=\"_blank\">código fuente</a> está bajo licencia <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
 "Add your App" => "Añadí tu aplicación",
 "More Apps" => "Más aplicaciones",
 "Select an App" => "Seleccionar una aplicación",
@@ -46,7 +29,7 @@
 "Problems connecting to help database." => "Problemas al conectar con la base de datos de ayuda.",
 "Go there manually." => "Ir de forma manual",
 "Answer" => "Respuesta",
-"You have used <strong>%s</strong> of the available <strong>%s<strong>" => "Usaste <strong>%s</strong> de <strong>%s<strong> disponible",
+"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Usaste  <strong>%s</strong>  de los  <strong>%s</strong>  disponibles",
 "Desktop and Mobile Syncing Clients" => "Clientes de sincronización para celulares, tablets y de escritorio",
 "Download" => "Descargar",
 "Your password was changed" => "Tu contraseña fue cambiada",
@@ -61,13 +44,14 @@
 "Language" => "Idioma",
 "Help translate" => "Ayudanos a traducir",
 "use this address to connect to your ownCloud in your file manager" => "usá esta dirección para conectarte a tu ownCloud desde tu gestor de archivos",
+"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>.",
 "Name" => "Nombre",
 "Password" => "Contraseña",
 "Groups" => "Grupos",
 "Create" => "Crear",
 "Default Quota" => "Cuota predeterminada",
 "Other" => "Otro",
-"Group Admin" => "Grupo admin",
+"Group Admin" => "Grupo Administrador",
 "Quota" => "Cuota",
 "Delete" => "Borrar"
 );
diff --git a/settings/l10n/et_EE.php b/settings/l10n/et_EE.php
index 8c36f08fbb7..17fd60b9490 100644
--- a/settings/l10n/et_EE.php
+++ b/settings/l10n/et_EE.php
@@ -17,19 +17,6 @@
 "Enable" => "Lülita sisse",
 "Saving..." => "Salvestamine...",
 "__language_name__" => "Eesti",
-"Security Warning" => "Turvahoiatus",
-"Cron" => "Ajastatud töö",
-"Sharing" => "Jagamine",
-"Enable Share API" => "Luba jagamise API",
-"Allow apps to use the Share API" => "Luba rakendustel kasutada jagamise API-t",
-"Allow links" => "Luba linke",
-"Allow users to share items to the public with links" => "Luba kasutajatel jagada kirjeid avalike linkidega",
-"Allow resharing" => "Luba edasijagamine",
-"Allow users to share items shared with them again" => "Luba kasutajatel jagada edasi kirjeid, mida on neile jagatud",
-"Allow users to share with anyone" => "Luba kasutajatel kõigiga jagada",
-"Allow users to only share with users in their groups" => "Luba kasutajatel jagada kirjeid ainult nende grupi liikmetele, millesse nad ise kuuluvad",
-"Log" => "Logi",
-"More" => "Veel",
 "Add your App" => "Lisa oma rakendus",
 "More Apps" => "Veel rakendusi",
 "Select an App" => "Vali programm",
diff --git a/settings/l10n/eu.php b/settings/l10n/eu.php
index 4320b8ae693..7d79c79ced3 100644
--- a/settings/l10n/eu.php
+++ b/settings/l10n/eu.php
@@ -1,6 +1,5 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "Ezin izan da App Dendatik zerrenda kargatu",
-"Authentication error" => "Autentifikazio errorea",
 "Group already exists" => "Taldea dagoeneko existitzenda",
 "Unable to add group" => "Ezin izan da taldea gehitu",
 "Could not enable app. " => "Ezin izan da aplikazioa gaitu.",
@@ -9,33 +8,18 @@
 "OpenID Changed" => "OpenID aldatuta",
 "Invalid request" => "Baliogabeko eskaria",
 "Unable to delete group" => "Ezin izan da taldea ezabatu",
+"Authentication error" => "Autentifikazio errorea",
 "Unable to delete user" => "Ezin izan da erabiltzailea ezabatu",
 "Language changed" => "Hizkuntza aldatuta",
+"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",
 "Disable" => "Ez-gaitu",
 "Enable" => "Gaitu",
 "Saving..." => "Gordetzen...",
 "__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.",
-"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 Partekatze APIa",
-"Allow apps to use the Share API" => "Baimendu aplikazioak Partekatze APIa erabiltzeko",
-"Allow links" => "Baimendu loturak",
-"Allow users to share items to the public with links" => "Baimendu erabiltzaileak loturen bidez fitxategiak publikoki partekatzen",
-"Allow resharing" => "Baimendu birpartekatzea",
-"Allow users to share items shared with them again" => "Baimendu erabiltzaileak haiekin partekatutako fitxategiak berriz ere partekatzen",
-"Allow users to share with anyone" => "Baimendu erabiltzaileak edonorekin partekatzen",
-"Allow users to only share with users in their groups" => "Baimendu erabiltzaileak bakarrik bere taldeko erabiltzaileekin partekatzen",
-"Log" => "Egunkaria",
-"More" => "Gehiago",
-"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",
 "See application page at apps.owncloud.com" => "Ikusi programen orria apps.owncloud.com en",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-lizentziatua <span class=\"author\"></span>",
@@ -45,7 +29,7 @@
 "Problems connecting to help database." => "Arazoak daude laguntza datubasera konektatzeko.",
 "Go there manually." => "Joan hara eskuz.",
 "Answer" => "Erantzun",
-"You have used <strong>%s</strong> of the available <strong>%s<strong>" => "Eskuragarri dituzun <strong>%s</strong>etik <strong>%s</strong> erabili duzu",
+"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Dagoeneko <strong>%s</strong> erabili duzu eskuragarri duzun <strong>%s</strong>etatik",
 "Desktop and Mobile Syncing Clients" => "Mahaigain eta mugikorren sinkronizazio bezeroak",
 "Download" => "Deskargatu",
 "Your password was changed" => "Zere pasahitza aldatu da",
@@ -60,6 +44,7 @@
 "Language" => "Hizkuntza",
 "Help translate" => "Lagundu itzultzen",
 "use this address to connect to your ownCloud in your file manager" => "erabili helbide hau zure fitxategi kudeatzailean zure ownCloudera konektatzeko",
+"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>.",
 "Name" => "Izena",
 "Password" => "Pasahitza",
 "Groups" => "Taldeak",
diff --git a/settings/l10n/fa.php b/settings/l10n/fa.php
index d8a49cc440b..3dcb770c730 100644
--- a/settings/l10n/fa.php
+++ b/settings/l10n/fa.php
@@ -1,16 +1,15 @@
 <?php $TRANSLATIONS = array(
+"Unable to load list from App Store" => "قادر به بارگذاری لیست از فروشگاه اپ نیستم",
 "Email saved" => "ایمیل ذخیره شد",
 "Invalid email" => "ایمیل غیر قابل قبول",
 "OpenID Changed" => "OpenID تغییر کرد",
 "Invalid request" => "درخواست غیر قابل قبول",
+"Authentication error" => "خطا در اعتبار سنجی",
 "Language changed" => "زبان تغییر کرد",
 "Disable" => "غیرفعال",
 "Enable" => "فعال",
 "Saving..." => "درحال ذخیره ...",
 "__language_name__" => "__language_name__",
-"Security Warning" => "اخطار امنیتی",
-"Log" => "کارنامه",
-"More" => "بیشتر",
 "Add your App" => "برنامه خود را بیافزایید",
 "Select an App" => "یک برنامه انتخاب کنید",
 "See application page at apps.owncloud.com" => "صفحه این اٌپ را در apps.owncloud.com ببینید",
@@ -22,6 +21,7 @@
 "Answer" => "پاسخ",
 "Desktop and Mobile Syncing Clients" => " ابزار مدیریت با دسکتاپ و موبایل",
 "Download" => "بارگیری",
+"Your password was changed" => "رمز عبور شما تغییر یافت",
 "Unable to change your password" => "ناتوان در تغییر گذرواژه",
 "Current password" => "گذرواژه کنونی",
 "New password" => "گذرواژه جدید",
diff --git a/settings/l10n/fi_FI.php b/settings/l10n/fi_FI.php
index dcd1bef95d7..d68ed8ebaae 100644
--- a/settings/l10n/fi_FI.php
+++ b/settings/l10n/fi_FI.php
@@ -11,39 +11,25 @@
 "Authentication error" => "Todennusvirhe",
 "Unable to delete user" => "Käyttäjän poisto epäonnistui",
 "Language changed" => "Kieli on vaihdettu",
+"Admins can't remove themself from the admin group" => "Ylläpitäjät eivät poistaa omia tunnuksiaan ylläpitäjien ryhmästä",
 "Unable to add user to group %s" => "Käyttäjän tai ryhmän %s lisääminen ei onnistu",
 "Unable to remove user from group %s" => "Käyttäjän poistaminen ryhmästä %s ei onnistu",
 "Disable" => "Poista käytöstä",
 "Enable" => "Käytä",
 "Saving..." => "Tallennetaan...",
 "__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.",
-"Cron" => "Cron",
-"Sharing" => "Jakaminen",
-"Enable Share API" => "Ota käyttöön jaon ohjelmoitirajapinta (Share API)",
-"Allow apps to use the Share API" => "Salli sovellusten käyttää jaon ohjelmointirajapintaa (Share API)",
-"Allow links" => "Salli linkit",
-"Allow users to share items to the public with links" => "Salli käyttäjien jakaa kohteita julkisesti linkkejä käyttäen",
-"Allow resharing" => "Salli uudelleenjako",
-"Allow users to share items shared with them again" => "Salli käyttäjien jakaa heille itselleen jaettuja tietoja edelleen",
-"Allow users to share with anyone" => "Salli käyttäjien jakaa kohteita kenen tahansa kanssa",
-"Allow users to only share with users in their groups" => "Salli käyttäjien jakaa kohteita vain omien ryhmien jäsenten kesken",
-"Log" => "Loki",
-"More" => "Lisää",
-"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ää ohjelmasi",
+"Add your App" => "Lisää sovelluksesi",
 "More Apps" => "Lisää sovelluksia",
-"Select an App" => "Valitse ohjelma",
+"Select an App" => "Valitse sovellus",
 "See application page at apps.owncloud.com" => "Katso sovellussivu osoitteessa apps.owncloud.com",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-lisensoija <span class=\"author\"></span>",
 "Documentation" => "Dokumentaatio",
 "Managing Big Files" => "Suurten tiedostojen hallinta",
 "Ask a question" => "Kysy jotain",
 "Problems connecting to help database." => "Virhe yhdistettäessä tietokantaan.",
-"Go there manually." => "Ohje löytyy sieltä.",
+"Go there manually." => "Siirry sinne itse.",
 "Answer" => "Vastaus",
-"You have used <strong>%s</strong> of the available <strong>%s<strong>" => "Käytössäsi on <strong>%s</strong>/<strong>%s<strong>",
+"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Käytössäsi on <strong>%s</strong>/<strong>%s</strong>",
 "Desktop and Mobile Syncing Clients" => "Tietokoneen ja mobiililaitteiden synkronointisovellukset",
 "Download" => "Lataa",
 "Your password was changed" => "Salasanasi vaihdettiin",
@@ -58,6 +44,7 @@
 "Language" => "Kieli",
 "Help translate" => "Auta kääntämisessä",
 "use this address to connect to your ownCloud in your file manager" => "voit yhdistää tiedostonhallintasovelluksellasi ownCloudiin käyttämällä tätä osoitetta",
+"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.",
 "Name" => "Nimi",
 "Password" => "Salasana",
 "Groups" => "Ryhmät",
diff --git a/settings/l10n/fr.php b/settings/l10n/fr.php
index 3a7bf0749bf..8e5169fe0f3 100644
--- a/settings/l10n/fr.php
+++ b/settings/l10n/fr.php
@@ -11,30 +11,13 @@
 "Authentication error" => "Erreur d'authentification",
 "Unable to delete user" => "Impossible de supprimer l'utilisateur",
 "Language changed" => "Langue changée",
+"Admins can't remove themself from the admin group" => "Les administrateurs ne peuvent pas se retirer eux-mêmes du groupe admin",
 "Unable to add user to group %s" => "Impossible d'ajouter l'utilisateur au groupe %s",
 "Unable to remove user from group %s" => "Impossible de supprimer l'utilisateur du groupe %s",
 "Disable" => "Désactiver",
 "Enable" => "Activer",
 "Saving..." => "Sauvegarde...",
 "__language_name__" => "Français",
-"Security Warning" => "Alertes 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 répertoire de données et vos fichiers sont probablement accessibles depuis internet. Le fichier .htaccess fourni avec ownCloud ne fonctionne pas. Nous vous recommandons vivement de configurer votre serveur web de façon à ce que ce répertoire ne soit plus accessible, ou bien de déplacer le répertoire de données à l'extérieur de la racine du serveur web.",
-"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 du contenu public avec des liens",
-"Allow resharing" => "Autoriser le re-partage",
-"Allow users to share items shared with them again" => "Autoriser les utilisateurs à partager des éléments déjà partagés entre 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 à ne partager qu'avec les utilisateurs dans leurs groupes",
-"Log" => "Journaux",
-"More" => "Plus",
-"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Développé par la <a href=\"http://ownCloud.org/contact\" target=\"_blank\">communauté ownCloud</a>, le <a href=\"https://github.com/owncloud\" target=\"_blank\">code source</a> est publié sous license <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
 "Add your App" => "Ajoutez votre application",
 "More Apps" => "Plus d'applications…",
 "Select an App" => "Sélectionner une Application",
@@ -46,7 +29,7 @@
 "Problems connecting to help database." => "Problème de connexion à la base de données d'aide.",
 "Go there manually." => "S'y rendre manuellement.",
 "Answer" => "Réponse",
-"You have used <strong>%s</strong> of the available <strong>%s<strong>" => "Vous avez utilisé <strong>%s</strong> des <strong>%s<strong> disponibles",
+"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Vous avez utilisé <strong>%s</strong> des <strong>%s<strong> disponibles",
 "Desktop and Mobile Syncing Clients" => "Clients de synchronisation Mobile et Ordinateur",
 "Download" => "Télécharger",
 "Your password was changed" => "Votre mot de passe a été changé",
@@ -61,6 +44,7 @@
 "Language" => "Langue",
 "Help translate" => "Aidez à traduire",
 "use this address to connect to your ownCloud in your file manager" => "utilisez cette adresse pour vous connecter à votre ownCloud depuis un explorateur de fichiers",
+"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>.",
 "Name" => "Nom",
 "Password" => "Mot de passe",
 "Groups" => "Groupes",
diff --git a/settings/l10n/gl.php b/settings/l10n/gl.php
index a0fe0989149..1cde895d0d9 100644
--- a/settings/l10n/gl.php
+++ b/settings/l10n/gl.php
@@ -1,30 +1,38 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "Non se puido cargar a lista desde a App Store",
-"Authentication error" => "Erro na autenticación",
+"Group already exists" => "O grupo xa existe",
+"Unable to add group" => "Non se pode engadir o grupo",
+"Could not enable app. " => "Con se puido activar o aplicativo.",
 "Email saved" => "Correo electrónico gardado",
 "Invalid email" => "correo electrónico non válido",
 "OpenID Changed" => "Mudou o OpenID",
 "Invalid request" => "Petición incorrecta",
+"Unable to delete group" => "Non se pode eliminar o grupo.",
+"Authentication error" => "Erro na autenticación",
+"Unable to delete user" => "Non se pode eliminar o usuario",
 "Language changed" => "O idioma mudou",
-"Disable" => "Deshabilitar",
-"Enable" => "Habilitar",
+"Admins can't remove themself from the admin group" => "Os administradores non se pode eliminar a si mesmos do grupo admin",
+"Unable to add user to group %s" => "Non se puido engadir o usuario ao grupo %s",
+"Unable to remove user from group %s" => "Non se puido eliminar o usuario do grupo %s",
+"Disable" => "Desactivar",
+"Enable" => "Activar",
 "Saving..." => "Gardando...",
 "__language_name__" => "Galego",
-"Security Warning" => "Aviso de seguridade",
-"Cron" => "Cron",
-"Log" => "Conectar",
-"More" => "Máis",
 "Add your App" => "Engade o teu aplicativo",
+"More Apps" => "Máis aplicativos",
 "Select an App" => "Escolla un Aplicativo",
 "See application page at apps.owncloud.com" => "Vexa a páxina do aplicativo en apps.owncloud.com",
+"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licenciado por<span class=\"author\"></span>",
 "Documentation" => "Documentación",
 "Managing Big Files" => "Xestionar Grandes Ficheiros",
 "Ask a question" => "Pregunte",
 "Problems connecting to help database." => "Problemas conectando coa base de datos de axuda",
 "Go there manually." => "Ir manualmente.",
 "Answer" => "Resposta",
+"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Tes usados <strong>%s</strong> do total dispoñíbel de <strong>%s</strong>",
 "Desktop and Mobile Syncing Clients" => "Cliente de sincronización de escritorio e móbil",
 "Download" => "Descargar",
+"Your password was changed" => "O seu contrasinal foi cambiado",
 "Unable to change your password" => "Incapaz de trocar o seu contrasinal",
 "Current password" => "Contrasinal actual",
 "New password" => "Novo contrasinal",
@@ -36,12 +44,14 @@
 "Language" => "Idioma",
 "Help translate" => "Axude na tradución",
 "use this address to connect to your ownCloud in your file manager" => "utilice este enderezo para conectar ao seu ownCloud no xestor de ficheiros",
+"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>.",
 "Name" => "Nome",
 "Password" => "Contrasinal",
 "Groups" => "Grupos",
 "Create" => "Crear",
-"Default Quota" => "Cuota por omisión",
+"Default Quota" => "Cota por omisión",
 "Other" => "Outro",
+"Group Admin" => "Grupo Admin",
 "Quota" => "Cota",
 "Delete" => "Borrar"
 );
diff --git a/settings/l10n/he.php b/settings/l10n/he.php
index bb98a876b82..f82cc83d9f7 100644
--- a/settings/l10n/he.php
+++ b/settings/l10n/he.php
@@ -1,26 +1,38 @@
 <?php $TRANSLATIONS = array(
+"Unable to load list from App Store" => "לא ניתן לטעון רשימה מה־App Store",
+"Group already exists" => "הקבוצה כבר קיימת",
+"Unable to add group" => "לא ניתן להוסיף קבוצה",
+"Could not enable app. " => "לא ניתן להפעיל את היישום",
 "Email saved" => "הדוא״ל נשמר",
 "Invalid email" => "דוא״ל לא חוקי",
 "OpenID Changed" => "OpenID השתנה",
 "Invalid request" => "בקשה לא חוקית",
+"Unable to delete group" => "לא ניתן למחוק את הקבוצה",
+"Authentication error" => "שגיאת הזדהות",
+"Unable to delete user" => "לא ניתן למחוק את המשתמש",
 "Language changed" => "שפה השתנתה",
+"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",
 "Disable" => "בטל",
 "Enable" => "הפעל",
 "Saving..." => "שומר..",
 "__language_name__" => "עברית",
-"Log" => "יומן",
-"More" => "עוד",
 "Add your App" => "הוספת היישום שלך",
+"More Apps" => "יישומים נוספים",
 "Select an App" => "בחירת יישום",
 "See application page at apps.owncloud.com" => "צפה בעמוד הישום ב apps.owncloud.com",
+"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "ברישיון <span class=\"licence\"></span>לטובת <span class=\"author\"></span>",
 "Documentation" => "תיעוד",
 "Managing Big Files" => "ניהול קבצים גדולים",
 "Ask a question" => "שאל שאלה",
 "Problems connecting to help database." => "בעיות בהתחברות לבסיס נתוני העזרה",
 "Go there manually." => "גש לשם באופן ידני",
 "Answer" => "מענה",
+"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "השתמשת ב־<strong>%s</strong> מתוך <strong>%s</strong> הזמינים לך",
 "Desktop and Mobile Syncing Clients" => "לקוחות סנכרון למחשב שולחני ולנייד",
 "Download" => "הורדה",
+"Your password was changed" => "הססמה שלך הוחלפה",
 "Unable to change your password" => "לא ניתן לשנות את הססמה שלך",
 "Current password" => "ססמה נוכחית",
 "New password" => "ססמה חדשה",
@@ -32,12 +44,14 @@
 "Language" => "פה",
 "Help translate" => "עזרה בתרגום",
 "use this address to connect to your ownCloud in your file manager" => "השתמש בכתובת זו כדי להתחבר ל־ownCloude שלך ממנהל הקבצים",
+"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>.",
 "Name" => "שם",
 "Password" => "ססמה",
 "Groups" => "קבוצות",
 "Create" => "יצירה",
 "Default Quota" => "מכסת בררת המחדל",
 "Other" => "אחר",
+"Group Admin" => "מנהל הקבוצה",
 "Quota" => "מכסה",
 "Delete" => "מחיקה"
 );
diff --git a/settings/l10n/hi.php b/settings/l10n/hi.php
new file mode 100644
index 00000000000..645b991a912
--- /dev/null
+++ b/settings/l10n/hi.php
@@ -0,0 +1,4 @@
+<?php $TRANSLATIONS = array(
+"New password" => "नया पासवर्ड",
+"Password" => "पासवर्ड"
+);
diff --git a/settings/l10n/hr.php b/settings/l10n/hr.php
index 587974c8c76..7f2fefb90d5 100644
--- a/settings/l10n/hr.php
+++ b/settings/l10n/hr.php
@@ -1,18 +1,15 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "Nemogićnost učitavanja liste sa Apps Stora",
-"Authentication error" => "Greška kod autorizacije",
 "Email saved" => "Email spremljen",
 "Invalid email" => "Neispravan email",
 "OpenID Changed" => "OpenID promijenjen",
 "Invalid request" => "Neispravan zahtjev",
+"Authentication error" => "Greška kod autorizacije",
 "Language changed" => "Jezik promijenjen",
 "Disable" => "Isključi",
 "Enable" => "Uključi",
 "Saving..." => "Spremanje...",
 "__language_name__" => "__ime_jezika__",
-"Cron" => "Cron",
-"Log" => "dnevnik",
-"More" => "više",
 "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",
diff --git a/settings/l10n/hu_HU.php b/settings/l10n/hu_HU.php
index e58a0b6c199..e587f7107ae 100644
--- a/settings/l10n/hu_HU.php
+++ b/settings/l10n/hu_HU.php
@@ -1,18 +1,15 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "Nem tölthető le a lista az App Store-ból",
-"Authentication error" => "Hitelesítési hiba",
 "Email saved" => "Email mentve",
 "Invalid email" => "Hibás email",
 "OpenID Changed" => "OpenID megváltozott",
 "Invalid request" => "Érvénytelen kérés",
+"Authentication error" => "Hitelesítési hiba",
 "Language changed" => "A nyelv megváltozott",
 "Disable" => "Letiltás",
 "Enable" => "Engedélyezés",
 "Saving..." => "Mentés...",
 "__language_name__" => "__language_name__",
-"Security Warning" => "Biztonsági figyelmeztetés",
-"Log" => "Napló",
-"More" => "Tovább",
 "Add your App" => "App hozzáadása",
 "Select an App" => "Egy App kiválasztása",
 "See application page at apps.owncloud.com" => "Lásd apps.owncloud.com, alkalmazások oldal",
diff --git a/settings/l10n/ia.php b/settings/l10n/ia.php
index 398a59da135..c5f4e7eaf24 100644
--- a/settings/l10n/ia.php
+++ b/settings/l10n/ia.php
@@ -3,8 +3,6 @@
 "Invalid request" => "Requesta invalide",
 "Language changed" => "Linguage cambiate",
 "__language_name__" => "Interlingua",
-"Log" => "Registro",
-"More" => "Plus",
 "Add your App" => "Adder tu application",
 "Select an App" => "Selectionar un app",
 "Documentation" => "Documentation",
diff --git a/settings/l10n/id.php b/settings/l10n/id.php
index 552c00c1728..ad89a4659d0 100644
--- a/settings/l10n/id.php
+++ b/settings/l10n/id.php
@@ -9,11 +9,6 @@
 "Enable" => "Aktifkan",
 "Saving..." => "Menyimpan...",
 "__language_name__" => "__language_name__",
-"Security Warning" => "Peringatan Keamanan",
-"Allow apps to use the Share API" => "perbolehkan aplikasi untuk menggunakan berbagi API",
-"Allow links" => "perbolehkan link",
-"Log" => "Log",
-"More" => "Lebih",
 "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",
diff --git a/settings/l10n/it.php b/settings/l10n/it.php
index 0fc32c0b931..fa24156b589 100644
--- a/settings/l10n/it.php
+++ b/settings/l10n/it.php
@@ -1,6 +1,5 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "Impossibile caricare l'elenco dall'App Store",
-"Authentication error" => "Errore di autenticazione",
 "Group already exists" => "Il gruppo esiste già",
 "Unable to add group" => "Impossibile aggiungere il gruppo",
 "Could not enable app. " => "Impossibile abilitare l'applicazione.",
@@ -9,32 +8,16 @@
 "OpenID Changed" => "OpenID modificato",
 "Invalid request" => "Richiesta non valida",
 "Unable to delete group" => "Impossibile eliminare il gruppo",
+"Authentication error" => "Errore di autenticazione",
 "Unable to delete user" => "Impossibile eliminare l'utente",
 "Language changed" => "Lingua modificata",
+"Admins can't remove themself from the admin group" => "Gli amministratori non possono rimuovere se stessi dal gruppo di amministrazione",
 "Unable to add user to group %s" => "Impossibile aggiungere l'utente al gruppo %s",
 "Unable to remove user from group %s" => "Impossibile rimuovere l'utente dal gruppo %s",
 "Disable" => "Disabilita",
 "Enable" => "Abilita",
 "Saving..." => "Salvataggio in corso...",
 "__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.\nIl file .htaccess fornito da ownCloud non funziona. Ti consigliamo vivamente di configurare il server web in modo che la cartella dei dati non sia più accessibile e spostare la cartella fuori dalla radice del server web.",
-"Cron" => "Cron",
-"Execute one task with each page loaded" => "Esegui un'operazione per 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 servizio webcron. Chiama la pagina cron.php nella radice di owncloud ogni minuto su http.",
-"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "Usa il servizio cron di sistema. Chiama il file cron.php nella cartella di owncloud tramite una pianificazione del cron di sistema 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 elementi al pubblico con collegamenti",
-"Allow resharing" => "Consenti la ri-condivisione",
-"Allow users to share items shared with them again" => "Consenti agli utenti di condividere elementi già condivisi",
-"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 con gli utenti del proprio gruppo",
-"Log" => "Registro",
-"More" => "Altro",
-"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Sviluppato dalla <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunità di ownCloud</a>, il <a href=\"https://github.com/owncloud\" target=\"_blank\">codice sorgente</a> è licenziato nei termini della <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
 "Add your App" => "Aggiungi la tua applicazione",
 "More Apps" => "Altre applicazioni",
 "Select an App" => "Seleziona un'applicazione",
@@ -46,7 +29,7 @@
 "Problems connecting to help database." => "Problemi di connessione al database di supporto.",
 "Go there manually." => "Raggiungilo manualmente.",
 "Answer" => "Risposta",
-"You have used <strong>%s</strong> of the available <strong>%s<strong>" => "Hai utilizzato <strong>%s</strong> dei <strong>%s<strong> disponibili",
+"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Hai utilizzato <strong>%s</strong> dei <strong>%s</strong> disponibili",
 "Desktop and Mobile Syncing Clients" => "Client di sincronizzazione desktop e mobile",
 "Download" => "Scaricamento",
 "Your password was changed" => "La tua password è cambiata",
@@ -61,6 +44,7 @@
 "Language" => "Lingua",
 "Help translate" => "Migliora la traduzione",
 "use this address to connect to your ownCloud in your file manager" => "usa questo indirizzo per connetterti al tuo ownCloud dal gestore file",
+"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>.",
 "Name" => "Nome",
 "Password" => "Password",
 "Groups" => "Gruppi",
diff --git a/settings/l10n/ja_JP.php b/settings/l10n/ja_JP.php
index 96bb4ba785e..098cce843d7 100644
--- a/settings/l10n/ja_JP.php
+++ b/settings/l10n/ja_JP.php
@@ -11,30 +11,13 @@
 "Authentication error" => "認証エラー",
 "Unable to delete user" => "ユーザを削除できません",
 "Language changed" => "言語が変更されました",
+"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 から削除できません",
 "Disable" => "無効",
 "Enable" => "有効",
 "Saving..." => "保存中...",
 "__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ファイルが機能していません。データディレクトリを全くアクセスできないようにするか、データディレクトリをウェブサーバのドキュメントルートの外に置くようにウェブサーバを設定することを強くお勧めします。",
-"Cron" => "cron(自動定期実行)",
-"Execute one task with each page loaded" => "各ページの読み込み時にタスクを1つ実行する",
-"cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "cron.php は webcron サービスとして登録されています。HTTP経由で1分間に1回の頻度で owncloud のルートページ内の cron.php ページを呼び出します。",
-"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "システムのcronサービスを利用する。1分に1回の頻度でシステムのcronジョブによりowncloudフォルダ内のcron.phpファイルを呼び出してください。",
-"Sharing" => "共有中",
-"Enable Share API" => "Share APIを有効にする",
-"Allow apps to use the Share API" => "Share APIの使用をアプリケーションに許可する",
-"Allow links" => "URLリンクによる共有を許可する",
-"Allow users to share items to the public with links" => "ユーザーにURLリンクによるアイテム共有を許可する",
-"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" => "ユーザーがグループ内の人とのみ共有できるようにする",
-"Log" => "ログ",
-"More" => "もっと",
-"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "<a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>により開発されています、<a href=\"https://github.com/owncloud\" target=\"_blank\">ソースコード</a>ライセンスは、<a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> ライセンスにより提供されています。",
 "Add your App" => "アプリを追加",
 "More Apps" => "さらにアプリを表示",
 "Select an App" => "アプリを選択してください",
@@ -46,7 +29,7 @@
 "Problems connecting to help database." => "ヘルプデータベースへの接続時に問題が発生しました",
 "Go there manually." => "手動で移動してください。",
 "Answer" => "解答",
-"You have used <strong>%s</strong> of the available <strong>%s<strong>" => "現在､ <strong>%s</strong> / <strong>%s<strong> を利用しています",
+"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "現在、<strong>%s</strong> / <strong>%s</strong> を利用しています",
 "Desktop and Mobile Syncing Clients" => "デスクトップおよびモバイル用の同期クライアント",
 "Download" => "ダウンロード",
 "Your password was changed" => "パスワードを変更しました",
@@ -61,6 +44,7 @@
 "Language" => "言語",
 "Help translate" => "翻訳に協力する",
 "use this address to connect to your ownCloud in your file manager" => "ファイルマネージャーであなたの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 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> ライセンスにより提供されています。",
 "Name" => "名前",
 "Password" => "パスワード",
 "Groups" => "グループ",
diff --git a/settings/l10n/ka_GE.php b/settings/l10n/ka_GE.php
index d1d9c767069..d3ad88fe95f 100644
--- a/settings/l10n/ka_GE.php
+++ b/settings/l10n/ka_GE.php
@@ -17,21 +17,6 @@
 "Enable" => "ჩართვა",
 "Saving..." => "შენახვა...",
 "__language_name__" => "__language_name__",
-"Security Warning" => "უსაფრთხოების გაფრთხილება",
-"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 servisad. Call the cron.php page in the owncloud root once a minute over http.",
-"Sharing" => "გაზიარება",
-"Enable Share API" => "Share API–ის ჩართვა",
-"Allow apps to use the Share API" => "დაუშვი აპლიკაციების უფლება  Share API –ზე",
-"Allow links" => "ლინკების დაშვება",
-"Allow users to share items to the public with links" => "მიეცი მომხმარებლებს უფლება რომ გააზიაროს ელემენტები საჯაროდ ლინკებით",
-"Allow resharing" => "გადაზიარების დაშვება",
-"Allow users to share items shared with them again" => "მიეცით მომხმარებლებს უფლება რომ გააზიაროს მისთვის დაზიარებული",
-"Allow users to share with anyone" => "მიეცით უფლება მომხმარებლებს გააზიაროს ყველასთვის",
-"Allow users to only share with users in their groups" => "მიეცით უფლება მომხმარებლებს რომ გააზიაროს მხოლოდ თავიანთი ჯგუფისთვის",
-"Log" => "ლოგი",
-"More" => "უფრო მეტი",
 "Add your App" => "დაამატე შენი აპლიკაცია",
 "More Apps" => "უფრო მეტი აპლიკაციები",
 "Select an App" => "აირჩიეთ აპლიკაცია",
@@ -43,7 +28,6 @@
 "Problems connecting to help database." => "დახმარების ბაზასთან წვდომის პრობლემა",
 "Go there manually." => "წადი იქ შენით.",
 "Answer" => "პასუხი",
-"You have used <strong>%s</strong> of the available <strong>%s<strong>" => "თქვენ გამოყენებული გაქვთ <strong>%s</strong> –ი –<strong>%s<strong>–დან",
 "Desktop and Mobile Syncing Clients" => "დესკტოპ და მობილური კლიენტების სინქრონიზაცია",
 "Download" => "ჩამოტვირთვა",
 "Your password was changed" => "თქვენი პაროლი შეიცვალა",
diff --git a/settings/l10n/ko.php b/settings/l10n/ko.php
index b2c00808967..7e9ba19a8fd 100644
--- a/settings/l10n/ko.php
+++ b/settings/l10n/ko.php
@@ -1,47 +1,56 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "앱 스토어에서 목록을 가져올 수 없습니다",
-"Authentication error" => "인증 오류",
-"Email saved" => "이메일 저장",
-"Invalid email" => "잘못된 이메일",
+"Group already exists" => "그룹이 이미 존재합니다.",
+"Unable to add group" => "그룹을 추가할 수 없습니다.",
+"Could not enable app. " => "앱을 활성화할 수 없습니다.",
+"Email saved" => "이메일 저장됨",
+"Invalid email" => "잘못된 이메일 주소",
 "OpenID Changed" => "OpenID 변경됨",
 "Invalid request" => "잘못된 요청",
+"Unable to delete group" => "그룹을 삭제할 수 없습니다.",
+"Authentication error" => "인증 오류",
+"Unable to delete user" => "사용자를 삭제할 수 없습니다.",
 "Language changed" => "언어가 변경되었습니다",
+"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에서 사용자를 삭제할 수 없습니다.",
 "Disable" => "비활성화",
 "Enable" => "활성화",
-"Saving..." => "저장...",
+"Saving..." => "저장 중...",
 "__language_name__" => "한국어",
-"Security Warning" => "보안 경고",
-"Cron" => "크론",
-"Log" => "로그",
-"More" => "더",
 "Add your App" => "앱 추가",
-"Select an App" => "프로그램 선택",
-"See application page at apps.owncloud.com" => "application page at apps.owncloud.com을 보시오.",
+"More Apps" => "더 많은 앱",
+"Select an App" => "앱 선택",
+"See application page at apps.owncloud.com" => "apps.owncloud.com에 있는 앱 페이지를 참고하십시오",
+"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-라이선스 보유자 <span class=\"author\"></span>",
 "Documentation" => "문서",
 "Managing Big Files" => "큰 파일 관리",
 "Ask a question" => "질문하기",
 "Problems connecting to help database." => "데이터베이스에 연결하는 데 문제가 발생하였습니다.",
 "Go there manually." => "직접 갈 수 있습니다.",
 "Answer" => "대답",
-"Desktop and Mobile Syncing Clients" => "데스크탑 및 모바일 동기화 클라이언트",
+"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "현재 공간 <strong>%s</strong>/<strong>%s</strong>을(를) 사용 중입니다",
+"Desktop and Mobile Syncing Clients" => "데스크톱 및 모바일 동기화 클라이언트",
 "Download" => "다운로드",
+"Your password was changed" => "암호가 변경되었습니다",
 "Unable to change your password" => "암호를 변경할 수 없음",
 "Current password" => "현재 암호",
 "New password" => "새 암호",
 "show" => "보이기",
 "Change password" => "암호 변경",
-"Email" => "전자 우편",
-"Your email address" => "전자 우편 주소",
-"Fill in an email address to enable password recovery" => "암호 찾기 기능을 사용하려면 전자 우편 주소를 입력하십시오.",
+"Email" => "이메일",
+"Your email address" => "이메일 주소",
+"Fill in an email address to enable password recovery" => "암호 찾기 기능을 사용하려면 이메일 주소를 입력하십시오.",
 "Language" => "언어",
 "Help translate" => "번역 돕기",
 "use this address to connect to your ownCloud in your file manager" => "파일 관리자에서 내 ownCloud에 연결할 때 이 주소를 사용하십시오",
+"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>에 따라 사용이 허가됩니다.",
 "Name" => "이름",
 "Password" => "암호",
 "Groups" => "그룹",
 "Create" => "만들기",
 "Default Quota" => "기본 할당량",
-"Other" => "다른",
+"Other" => "기타",
 "Group Admin" => "그룹 관리자",
 "Quota" => "할당량",
 "Delete" => "삭제"
diff --git a/settings/l10n/ku_IQ.php b/settings/l10n/ku_IQ.php
new file mode 100644
index 00000000000..b4bdf2a6ced
--- /dev/null
+++ b/settings/l10n/ku_IQ.php
@@ -0,0 +1,10 @@
+<?php $TRANSLATIONS = array(
+"Enable" => "چالاککردن",
+"Saving..." => "پاشکه‌وتده‌کات...",
+"Documentation" => "به‌ڵگه‌نامه",
+"Download" => "داگرتن",
+"New password" => "وشەی نهێنی نوێ",
+"Email" => "ئیمه‌یل",
+"Name" => "ناو",
+"Password" => "وشەی تێپەربو"
+);
diff --git a/settings/l10n/lb.php b/settings/l10n/lb.php
index abad102bb59..440b81d44c9 100644
--- a/settings/l10n/lb.php
+++ b/settings/l10n/lb.php
@@ -1,25 +1,15 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "Konnt Lescht net vum App Store lueden",
-"Authentication error" => "Authentifikatioun's Fehler",
 "Email saved" => "E-mail gespäichert",
 "Invalid email" => "Ongülteg e-mail",
 "OpenID Changed" => "OpenID huet geännert",
 "Invalid request" => "Ongülteg Requête",
+"Authentication error" => "Authentifikatioun's Fehler",
 "Language changed" => "Sprooch huet geännert",
 "Disable" => "Ofschalten",
 "Enable" => "Aschalten",
 "Saving..." => "Speicheren...",
 "__language_name__" => "__language_name__",
-"Security Warning" => "Sécherheets Warnung",
-"Cron" => "Cron",
-"Enable Share API" => "Share API aschalten",
-"Allow apps to use the Share API" => "Erlab Apps d'Share API ze benotzen",
-"Allow links" => "Links erlaben",
-"Allow resharing" => "Resharing erlaben",
-"Allow users to share with anyone" => "Useren erlaben mat egal wiem ze sharen",
-"Allow users to only share with users in their groups" => "Useren nëmmen erlaben mat Useren aus hirer Grupp ze sharen",
-"Log" => "Log",
-"More" => "Méi",
 "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",
diff --git a/settings/l10n/lt_LT.php b/settings/l10n/lt_LT.php
index 95b999e29ee..6399b5b1b49 100644
--- a/settings/l10n/lt_LT.php
+++ b/settings/l10n/lt_LT.php
@@ -5,16 +5,12 @@
 "Invalid email" => "Netinkamas el. paštas",
 "OpenID Changed" => "OpenID pakeistas",
 "Invalid request" => "Klaidinga užklausa",
+"Authentication error" => "Autentikacijos klaida",
 "Language changed" => "Kalba pakeista",
 "Disable" => "Išjungti",
 "Enable" => "Įjungti",
 "Saving..." => "Saugoma..",
 "__language_name__" => "Kalba",
-"Security Warning" => "Saugumo įspėjimas",
-"Cron" => "Cron",
-"Sharing" => "Dalijimasis",
-"Log" => "Žurnalas",
-"More" => "Daugiau",
 "Add your App" => "Pridėti programėlę",
 "More Apps" => "Daugiau aplikacijų",
 "Select an App" => "Pasirinkite programą",
@@ -23,7 +19,6 @@
 "Ask a question" => "Užduoti klausimą",
 "Problems connecting to help database." => "Problemos jungiantis prie duomenų bazės",
 "Answer" => "Atsakyti",
-"You have used <strong>%s</strong> of the available <strong>%s<strong>" => "Jūs panaudojote <strong>%s</strong> iš galimų <strong>%s<strong>",
 "Download" => "Atsisiųsti",
 "Your password was changed" => "Jūsų slaptažodis buvo pakeistas",
 "Unable to change your password" => "Neįmanoma pakeisti slaptažodžio",
diff --git a/settings/l10n/lv.php b/settings/l10n/lv.php
index 829cda0f917..13f4483f1d2 100644
--- a/settings/l10n/lv.php
+++ b/settings/l10n/lv.php
@@ -1,30 +1,37 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "Nebija iespējams lejuplādēt sarakstu no aplikāciju veikala",
-"Authentication error" => "Ielogošanās kļūme",
+"Group already exists" => "Grupa jau eksistē",
+"Unable to add group" => "Nevar pievienot grupu",
+"Could not enable app. " => "Nevar ieslēgt aplikāciju.",
 "Email saved" => "Epasts tika saglabāts",
 "Invalid email" => "Nepareizs epasts",
 "OpenID Changed" => "OpenID nomainīts",
 "Invalid request" => "Nepareizs vaicājums",
+"Unable to delete group" => "Nevar izdzēst grupu",
+"Authentication error" => "Ielogošanās kļūme",
+"Unable to delete user" => "Nevar izdzēst lietotāju",
 "Language changed" => "Valoda tika nomainīta",
+"Unable to add user to group %s" => "Nevar pievienot lietotāju grupai %s",
+"Unable to remove user from group %s" => "Nevar noņemt lietotāju no grupas %s",
 "Disable" => "Atvienot",
 "Enable" => "Pievienot",
 "Saving..." => "Saglabā...",
 "__language_name__" => "__valodas_nosaukums__",
-"Security Warning" => "Brīdinājums par drošību",
-"Cron" => "Cron",
-"Log" => "Log",
-"More" => "Vairāk",
 "Add your App" => "Pievieno savu aplikāciju",
+"More Apps" => "Vairāk aplikāciju",
 "Select an App" => "Izvēlies aplikāciju",
 "See application page at apps.owncloud.com" => "Apskatie aplikāciju lapu - apps.owncloud.com",
+"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licencēts no <span class=\"author\"></span>",
 "Documentation" => "Dokumentācija",
 "Managing Big Files" => "Rīkoties ar apjomīgiem failiem",
 "Ask a question" => "Uzdod jautajumu",
 "Problems connecting to help database." => "Problēmas ar datubāzes savienojumu",
 "Go there manually." => "Nokļūt tur pašrocīgi",
 "Answer" => "Atbildēt",
+"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Jūs lietojat <strong>%s</strong> no pieejamajiem <strong>%s</strong>",
 "Desktop and Mobile Syncing Clients" => "Desktop un mobīlo ierīču sinhronizācijas rīks",
 "Download" => "Lejuplādēt",
+"Your password was changed" => "Jūru parole tika nomainīta",
 "Unable to change your password" => "Nav iespējams nomainīt jūsu paroli",
 "Current password" => "Pašreizējā parole",
 "New password" => "Jauna parole",
@@ -36,6 +43,7 @@
 "Language" => "Valoda",
 "Help translate" => "Palīdzi tulkot",
 "use this address to connect to your ownCloud in your file manager" => "izmanto šo adresi lai ielogotos ownCloud no sava failu pārlūka",
+"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>.",
 "Name" => "Vārds",
 "Password" => "Parole",
 "Groups" => "Grupas",
diff --git a/settings/l10n/mk.php b/settings/l10n/mk.php
index 78d05660e71..8594825fdd6 100644
--- a/settings/l10n/mk.php
+++ b/settings/l10n/mk.php
@@ -8,8 +8,6 @@
 "Enable" => "Овозможи",
 "Saving..." => "Снимам...",
 "__language_name__" => "__language_name__",
-"Log" => "Записник",
-"More" => "Повеќе",
 "Add your App" => "Додадете ја Вашата апликација",
 "Select an App" => "Избери аппликација",
 "See application page at apps.owncloud.com" => "Види ја страницата со апликации на apps.owncloud.com",
diff --git a/settings/l10n/ms_MY.php b/settings/l10n/ms_MY.php
index 18719989462..5de247110bb 100644
--- a/settings/l10n/ms_MY.php
+++ b/settings/l10n/ms_MY.php
@@ -1,17 +1,14 @@
 <?php $TRANSLATIONS = array(
-"Authentication error" => "Ralat pengesahan",
 "Email saved" => "Emel disimpan",
 "Invalid email" => "Emel tidak sah",
 "OpenID Changed" => "OpenID diubah",
 "Invalid request" => "Permintaan tidak sah",
+"Authentication error" => "Ralat pengesahan",
 "Language changed" => "Bahasa diubah",
 "Disable" => "Nyahaktif",
 "Enable" => "Aktif",
 "Saving..." => "Simpan...",
 "__language_name__" => "_nama_bahasa_",
-"Security Warning" => "Amaran keselamatan",
-"Log" => "Log",
-"More" => "Lanjutan",
 "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",
diff --git a/settings/l10n/nb_NO.php b/settings/l10n/nb_NO.php
index daeb1b78e7f..23618fc3024 100644
--- a/settings/l10n/nb_NO.php
+++ b/settings/l10n/nb_NO.php
@@ -1,20 +1,24 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "Lasting av liste fra App Store feilet.",
-"Authentication error" => "Autentikasjonsfeil",
+"Group already exists" => "Gruppen finnes allerede",
+"Unable to add group" => "Kan ikke legge til gruppe",
+"Could not enable app. " => "Kan ikke aktivere app.",
 "Email saved" => "Epost lagret",
 "Invalid email" => "Ugyldig epost",
 "OpenID Changed" => "OpenID endret",
 "Invalid request" => "Ugyldig forespørsel",
+"Unable to delete group" => "Kan ikke slette gruppe",
+"Authentication error" => "Autentikasjonsfeil",
+"Unable to delete user" => "Kan ikke slette bruker",
 "Language changed" => "Språk endret",
+"Unable to add user to group %s" => "Kan ikke legge bruker til gruppen %s",
+"Unable to remove user from group %s" => "Kan ikke slette bruker fra gruppen %s",
 "Disable" => "Slå avBehandle ",
 "Enable" => "Slå på",
 "Saving..." => "Lagrer...",
 "__language_name__" => "__language_name__",
-"Security Warning" => "Sikkerhetsadvarsel",
-"Cron" => "Cron",
-"Log" => "Logg",
-"More" => "Mer",
 "Add your App" => "Legg til din App",
+"More Apps" => "Flere Apps",
 "Select an App" => "Velg en app",
 "See application page at apps.owncloud.com" => "Se applikasjonens side på apps.owncloud.org",
 "Documentation" => "Dokumentasjon",
@@ -25,6 +29,7 @@
 "Answer" => "Svar",
 "Desktop and Mobile Syncing Clients" => "Klienter for datamaskiner og mobile enheter",
 "Download" => "Last ned",
+"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",
diff --git a/settings/l10n/nl.php b/settings/l10n/nl.php
index d24c4f04ad1..f419ecf74ed 100644
--- a/settings/l10n/nl.php
+++ b/settings/l10n/nl.php
@@ -1,6 +1,5 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "Kan de lijst niet van de App store laden",
-"Authentication error" => "Authenticatie fout",
 "Group already exists" => "Groep bestaat al",
 "Unable to add group" => "Niet in staat om groep toe te voegen",
 "Could not enable app. " => "Kan de app. niet activeren",
@@ -9,45 +8,29 @@
 "OpenID Changed" => "OpenID is aangepast",
 "Invalid request" => "Ongeldig verzoek",
 "Unable to delete group" => "Niet in staat om groep te verwijderen",
+"Authentication error" => "Authenticatie fout",
 "Unable to delete user" => "Niet in staat om gebruiker te verwijderen",
 "Language changed" => "Taal aangepast",
+"Admins can't remove themself from the admin group" => "Admins kunnen zichzelf niet uit de admin groep verwijderen",
 "Unable to add user to group %s" => "Niet in staat om gebruiker toe te voegen aan groep %s",
 "Unable to remove user from group %s" => "Niet in staat om gebruiker te verwijderen uit groep %s",
 "Disable" => "Uitschakelen",
 "Enable" => "Inschakelen",
 "Saving..." => "Aan het bewaren.....",
 "__language_name__" => "Nederlands",
-"Security Warning" => "Veiligheidswaarschuwing",
-"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 folder en uw bestanden zijn hoogst waarschijnlijk vanaf het internet bereikbaar.  Het .htaccess bestand dat ownCloud meelevert werkt niet.  Het is ten zeerste aangeraden om uw webserver zodanig te configureren, dat de data folder niet bereikbaar is vanaf het internet of verplaatst uw data folder naar een locatie buiten de webserver document root.",
-"Cron" => "Cron",
-"Execute one task with each page loaded" => "Voer één taak uit met elke pagina die wordt geladen",
-"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 bij een webcron dienst geregistreerd.  Roep de cron.php pagina in de owncloud root via http één maal per minuut op.",
-"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "Gebruik de systeem cron dienst.  Gebruik, eens per minuut, het bestand cron.php in de owncloud map via de systeem cronjob.",
-"Sharing" => "Delen",
-"Enable Share API" => "Zet de Deel API aan",
-"Allow apps to use the Share API" => "Sta apps toe om de Deel API te gebruiken",
-"Allow links" => "Sta links toe",
-"Allow users to share items to the public with links" => "Sta gebruikers toe om items via links publiekelijk te maken",
-"Allow resharing" => "Sta verder delen toe",
-"Allow users to share items shared with them again" => "Sta gebruikers toe om items nogmaals te delen",
-"Allow users to share with anyone" => "Sta gebruikers toe om met iedereen te delen",
-"Allow users to only share with users in their groups" => "Sta gebruikers toe om alleen met gebruikers in hun groepen te delen",
-"Log" => "Log",
-"More" => "Meer",
-"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Ontwikkeld door de <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud gemeenschap</a>, de <a href=\"https://github.com/owncloud\" target=\"_blank\">bron code</a> is gelicenseerd onder de <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
-"Add your App" => "Voeg je App toe",
+"Add your App" => "App toevoegen",
 "More Apps" => "Meer apps",
 "Select an App" => "Selecteer een app",
 "See application page at apps.owncloud.com" => "Zie de applicatiepagina op apps.owncloud.com",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-Gelicenseerd door <span class=\"author\"></span>",
 "Documentation" => "Documentatie",
-"Managing Big Files" => "Onderhoud van grote bestanden",
+"Managing Big Files" => "Instellingen voor grote bestanden",
 "Ask a question" => "Stel een vraag",
 "Problems connecting to help database." => "Problemen bij het verbinden met de helpdatabank.",
 "Go there manually." => "Ga er zelf heen.",
 "Answer" => "Beantwoord",
-"You have used <strong>%s</strong> of the available <strong>%s<strong>" => "Je hebt <strong>%s</strong> gebruikt van de beschikbare <strong>%s<strong>",
-"Desktop and Mobile Syncing Clients" => "Desktop en mobiele synchronisatie apparaten",
+"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "U heeft <strong>%s</strong> van de <strong>%s</strong>  beschikbaren gebruikt",
+"Desktop and Mobile Syncing Clients" => "Desktop en mobiele synchronisatie applicaties",
 "Download" => "Download",
 "Your password was changed" => "Je wachtwoord is veranderd",
 "Unable to change your password" => "Niet in staat om uw wachtwoord te wijzigen",
@@ -55,12 +38,13 @@
 "New password" => "Nieuw wachtwoord",
 "show" => "weergeven",
 "Change password" => "Wijzig wachtwoord",
-"Email" => "mailadres",
-"Your email address" => "Jouw mailadres",
-"Fill in an email address to enable password recovery" => "Vul een mailadres in om je wachtwoord te kunnen herstellen",
+"Email" => "E-mailadres",
+"Your email address" => "Uw e-mailadres",
+"Fill in an email address to enable password recovery" => "Vul een e-mailadres in om wachtwoord reset uit te kunnen voeren",
 "Language" => "Taal",
 "Help translate" => "Help met vertalen",
-"use this address to connect to your ownCloud in your file manager" => "gebruik dit adres om verbinding te maken met ownCloud in uw bestandsbeheerprogramma",
+"use this address to connect to your ownCloud in your file manager" => "Gebruik het bovenstaande adres om verbinding te maken met ownCloud in uw bestandbeheerprogramma",
+"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>.",
 "Name" => "Naam",
 "Password" => "Wachtwoord",
 "Groups" => "Groepen",
diff --git a/settings/l10n/nn_NO.php b/settings/l10n/nn_NO.php
index d712f749bbf..5f9d7605cc6 100644
--- a/settings/l10n/nn_NO.php
+++ b/settings/l10n/nn_NO.php
@@ -1,10 +1,10 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "Klarer ikkje å laste inn liste fra App Store",
-"Authentication error" => "Feil i autentisering",
 "Email saved" => "E-postadresse lagra",
 "Invalid email" => "Ugyldig e-postadresse",
 "OpenID Changed" => "OpenID endra",
 "Invalid request" => "Ugyldig førespurnad",
+"Authentication error" => "Feil i autentisering",
 "Language changed" => "Språk endra",
 "Disable" => "Slå av",
 "Enable" => "Slå på",
@@ -14,6 +14,7 @@
 "Problems connecting to help database." => "Problem ved tilkopling til hjelpedatabasen.",
 "Go there manually." => "Gå der på eigen hand.",
 "Answer" => "Svar",
+"Download" => "Last ned",
 "Unable to change your password" => "Klarte ikkje å endra passordet",
 "Current password" => "Passord",
 "New password" => "Nytt passord",
@@ -29,6 +30,7 @@
 "Password" => "Passord",
 "Groups" => "Grupper",
 "Create" => "Lag",
+"Other" => "Anna",
 "Quota" => "Kvote",
 "Delete" => "Slett"
 );
diff --git a/settings/l10n/oc.php b/settings/l10n/oc.php
index 28835df95c1..f16f5cc91ae 100644
--- a/settings/l10n/oc.php
+++ b/settings/l10n/oc.php
@@ -1,6 +1,5 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "Pas possible de cargar la tièra dempuèi App Store",
-"Authentication error" => "Error d'autentificacion",
 "Group already exists" => "Lo grop existís ja",
 "Unable to add group" => "Pas capable d'apondre  un grop",
 "Could not enable app. " => "Pòt pas activar app. ",
@@ -9,6 +8,7 @@
 "OpenID Changed" => "OpenID cambiat",
 "Invalid request" => "Demanda invalida",
 "Unable to delete group" => "Pas capable d'escafar un grop",
+"Authentication error" => "Error d'autentificacion",
 "Unable to delete user" => "Pas capable d'escafar un usancièr",
 "Language changed" => "Lengas cambiadas",
 "Unable to add user to group %s" => "Pas capable d'apondre un usancièr al grop %s",
@@ -17,14 +17,6 @@
 "Enable" => "Activa",
 "Saving..." => "Enregistra...",
 "__language_name__" => "__language_name__",
-"Security Warning" => "Avertiment de securitat",
-"Cron" => "Cron",
-"Execute one task with each page loaded" => "Executa un prètfach amb cada pagina cargada",
-"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "Utiliza lo servici cron de ton sistèm operatiu. Executa lo fichièr cron.php dins lo dorsier owncloud tras cronjob del sistèm cada minuta.",
-"Sharing" => "Al partejar",
-"Enable Share API" => "Activa API partejada",
-"Log" => "Jornal",
-"More" => "Mai d'aquò",
 "Add your App" => "Ajusta ton App",
 "Select an App" => "Selecciona una applicacion",
 "See application page at apps.owncloud.com" => "Agacha la pagina d'applications en cò de apps.owncloud.com",
@@ -35,7 +27,6 @@
 "Problems connecting to help database." => "Problemas al connectar de la basa de donadas d'ajuda",
 "Go there manually." => "Vas çai manualament",
 "Answer" => "Responsa",
-"You have used <strong>%s</strong> of the available <strong>%s<strong>" => "As utilizat <strong>%s</strong> dels <strong>%s<strong> disponibles",
 "Download" => "Avalcarga",
 "Your password was changed" => "Ton senhal a cambiat",
 "Unable to change your password" => "Pas possible de cambiar ton senhal",
diff --git a/settings/l10n/pl.php b/settings/l10n/pl.php
index 5ea1f022c66..e17e3c00e53 100644
--- a/settings/l10n/pl.php
+++ b/settings/l10n/pl.php
@@ -1,6 +1,5 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "Nie mogę załadować listy aplikacji",
-"Authentication error" => "Błąd uwierzytelniania",
 "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.",
@@ -9,32 +8,16 @@
 "OpenID Changed" => "Zmieniono OpenID",
 "Invalid request" => "Nieprawidłowe żądanie",
 "Unable to delete group" => "Nie można usunąć grupy",
+"Authentication error" => "Błąd uwierzytelniania",
 "Unable to delete user" => "Nie można usunąć użytkownika",
 "Language changed" => "Język zmieniony",
+"Admins can't remove themself from the admin group" => "Administratorzy nie mogą usunąć się sami 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",
 "Disable" => "Wyłącz",
 "Enable" => "Włącz",
 "Saving..." => "Zapisywanie...",
 "__language_name__" => "Polski",
-"Security Warning" => "Ostrzeżenia bezpieczeństwa",
-"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." => "Twój katalog danych i pliki są prawdopodobnie dostępne z Internetu. Plik .htaccess, który dostarcza ownCloud nie działa. Sugerujemy, aby skonfigurować serwer WWW w taki sposób, aby katalog danych nie był dostępny lub przenieść katalog danych poza główny katalog serwera WWW.",
-"Cron" => "Cron",
-"Execute one task with each page loaded" => "Wykonanie jednego zadania z każdej strony wczytywania",
-"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 minute przez http.",
-"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "Użyj usługi systemowej cron. Przywołaj plik cron.php z katalogu owncloud przez systemowe cronjob raz na minute.",
-"Sharing" => "Udostępnianij",
-"Enable Share API" => "Włącz udostępniane API",
-"Allow apps to use the Share API" => "Zezwalaj aplikacjom na używanie API",
-"Allow links" => "Zezwalaj na łącza",
-"Allow users to share items to the public with links" => "Zezwalaj użytkownikom na puliczne współdzielenie elementów za pomocą linków",
-"Allow resharing" => "Zezwól na ponowne udostępnianie",
-"Allow users to share items shared with them again" => "Zezwalaj użytkownikom na ponowne współdzielenie elementów już z nimi współdzilonych",
-"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",
-"Log" => "Log",
-"More" => "Więcej",
-"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Stwirzone przez <a href=\"http://ownCloud.org/contact\" target=\"_blank\"> społeczność ownCloud</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">kod źródłowy</a> na licencji <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
 "Add your App" => "Dodaj aplikacje",
 "More Apps" => "Więcej aplikacji",
 "Select an App" => "Zaznacz aplikacje",
@@ -46,7 +29,7 @@
 "Problems connecting to help database." => "Problem z połączeniem z bazą danych.",
 "Go there manually." => "Przejdź na stronę ręcznie.",
 "Answer" => "Odpowiedź",
-"You have used <strong>%s</strong> of the available <strong>%s<strong>" => "Używasz <strong>%s</strong> z dostępnych <strong>%s</strong>",
+"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Korzystasz z <strong>%s</strong> z dostępnych <strong>%s</strong>",
 "Desktop and Mobile Syncing Clients" => "Klienci synchronizacji",
 "Download" => "Ściągnij",
 "Your password was changed" => "Twoje hasło zostało zmienione",
@@ -61,6 +44,7 @@
 "Language" => "Język",
 "Help translate" => "Pomóż w tłumaczeniu",
 "use this address to connect to your ownCloud in your file manager" => "Proszę użyć tego adresu, aby uzyskać dostęp do usługi ownCloud w menedżerze plików.",
+"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Stwirzone przez <a href=\"http://ownCloud.org/contact\" target=\"_blank\"> społeczność ownCloud</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">kod źródłowy</a> na licencji <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
 "Name" => "Nazwa",
 "Password" => "Hasło",
 "Groups" => "Grupy",
diff --git a/settings/l10n/pl_PL.php b/settings/l10n/pl_PL.php
new file mode 100644
index 00000000000..ab81cb23465
--- /dev/null
+++ b/settings/l10n/pl_PL.php
@@ -0,0 +1,3 @@
+<?php $TRANSLATIONS = array(
+"Email" => "Email"
+);
diff --git a/settings/l10n/pt_BR.php b/settings/l10n/pt_BR.php
index 7ca5160d9a8..d09e867f7f2 100644
--- a/settings/l10n/pt_BR.php
+++ b/settings/l10n/pt_BR.php
@@ -1,6 +1,5 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "Não foi possivel carregar lista da App Store",
-"Authentication error" => "erro de autenticação",
 "Group already exists" => "Grupo já existe",
 "Unable to add group" => "Não foi possivel adicionar grupo",
 "Could not enable app. " => "Não pôde habilitar aplicação",
@@ -9,32 +8,16 @@
 "OpenID Changed" => "Mudou OpenID",
 "Invalid request" => "Pedido inválido",
 "Unable to delete group" => "Não foi possivel remover grupo",
+"Authentication error" => "erro de autenticação",
 "Unable to delete user" => "Não foi possivel remover usuário",
 "Language changed" => "Mudou Idioma",
+"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 possivel adicionar usuário ao grupo %s",
 "Unable to remove user from group %s" => "Não foi possivel remover usuário ao grupo %s",
 "Disable" => "Desabilitado",
 "Enable" => "Habilitado",
 "Saving..." => "Gravando...",
 "__language_name__" => "Português",
-"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.",
-"Cron" => "Cron",
-"Execute one task with each page loaded" => "Executa 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. Chama a página cron.php na raíz do owncloud uma vez por minuto via http.",
-"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "Usa o serviço cron do sistema. Chama o arquivo cron.php na pasta do owncloud através do cronjob do sistema uma vez a cada minuto.",
-"Sharing" => "Compartilhamento",
-"Enable Share API" => "Habilitar API de Compartilhamento",
-"Allow apps to use the Share API" => "Permitir aplicações a usar a API de Compartilhamento",
-"Allow links" => "Permitir links",
-"Allow users to share items to the public with links" => "Permitir usuários a compartilhar itens para o público com links",
-"Allow resharing" => "Permitir re-compartilhamento",
-"Allow users to share items shared with them again" => "Permitir usuário a compartilhar itens compartilhados com eles novamente",
-"Allow users to share with anyone" => "Permitir usuários a compartilhar com qualquer um",
-"Allow users to only share with users in their groups" => "Permitir usuários a somente compartilhar com usuários em seus respectivos grupos",
-"Log" => "Log",
-"More" => "Mais",
-"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Desenvolvido pela <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunidade ownCloud</a>, o <a href=\"https://github.com/owncloud\" target=\"_blank\">código fonte</a> está licenciado sob <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
 "Add your App" => "Adicione seu Aplicativo",
 "More Apps" => "Mais Apps",
 "Select an App" => "Selecione uma Aplicação",
@@ -46,7 +29,7 @@
 "Problems connecting to help database." => "Problemas ao conectar na base de dados.",
 "Go there manually." => "Ir manualmente.",
 "Answer" => "Resposta",
-"You have used <strong>%s</strong> of the available <strong>%s<strong>" => "Você usou <strong>%s</strong> do espaço disponível de <strong>%s</strong> ",
+"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>",
 "Desktop and Mobile Syncing Clients" => "Sincronizando Desktop e Mobile",
 "Download" => "Download",
 "Your password was changed" => "Sua senha foi alterada",
@@ -61,6 +44,7 @@
 "Language" => "Idioma",
 "Help translate" => "Ajude a traduzir",
 "use this address to connect to your ownCloud in your file manager" => "use este endereço para se conectar ao seu ownCloud no seu gerenciador de arquvos",
+"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>.",
 "Name" => "Nome",
 "Password" => "Senha",
 "Groups" => "Grupos",
diff --git a/settings/l10n/pt_PT.php b/settings/l10n/pt_PT.php
index a5eb8c399be..96d9ac67ac4 100644
--- a/settings/l10n/pt_PT.php
+++ b/settings/l10n/pt_PT.php
@@ -1,6 +1,5 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "Incapaz de carregar a lista da App Store",
-"Authentication error" => "Erro de autenticação",
 "Group already exists" => "O grupo já existe",
 "Unable to add group" => "Impossível acrescentar o grupo",
 "Could not enable app. " => "Não foi possível activar a app.",
@@ -9,32 +8,16 @@
 "OpenID Changed" => "OpenID alterado",
 "Invalid request" => "Pedido inválido",
 "Unable to delete group" => "Impossível apagar grupo",
+"Authentication error" => "Erro de autenticação",
 "Unable to delete user" => "Impossível apagar utilizador",
 "Language changed" => "Idioma alterado",
+"Admins can't remove themself from the admin group" => "Os administradores não se podem remover a eles mesmos do grupo admin.",
 "Unable to add user to group %s" => "Impossível acrescentar utilizador ao grupo %s",
 "Unable to remove user from group %s" => "Impossível apagar utilizador do grupo %s",
 "Disable" => "Desactivar",
 "Enable" => "Activar",
 "Saving..." => "A guardar...",
 "__language_name__" => "__language_name__",
-"Security Warning" => "Aviso de Segurança",
-"Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "A sua pasta com os dados e os seus ficheiros estão provavelmente acessíveis a partir das internet. Sugerimos veementemente que configure o seu servidor web de maneira a que a pasta com os dados deixe de ficar acessível, ou mova a pasta com os dados para fora da raiz de documentos do servidor web.",
-"Cron" => "Cron",
-"Execute one task with each page loaded" => "Executar uma tarefa ao carregar cada página",
-"cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "cron.php está registado num serviço webcron. Chame a página cron.php na raiz owncloud por http uma vez por minuto.",
-"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "Usar o serviço cron do sistema. Chame a página cron.php na pasta owncloud via um cronjob do sistema uma vez por minuto.",
-"Sharing" => "Partilhando",
-"Enable Share API" => "Activar API de partilha",
-"Allow apps to use the Share API" => "Permitir que as aplicações usem a API de partilha",
-"Allow links" => "Permitir ligações",
-"Allow users to share items to the public with links" => "Permitir que os utilizadores partilhem itens com o público com ligações",
-"Allow resharing" => "Permitir voltar a partilhar",
-"Allow users to share items shared with them again" => "Permitir que os utilizadores partilhem itens que foram partilhados com eles",
-"Allow users to share with anyone" => "Permitir que os utilizadores partilhem com toda a gente",
-"Allow users to only share with users in their groups" => "Permitir que os utilizadores apenas partilhem com utilizadores do seu grupo",
-"Log" => "Log",
-"More" => "Mais",
-"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Desenvolvido pela <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunidade ownCloud</a>, o<a href=\"https://github.com/owncloud\" target=\"_blank\">código fonte</a> está licenciado sob a <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
 "Add your App" => "Adicione a sua aplicação",
 "More Apps" => "Mais Aplicações",
 "Select an App" => "Selecione uma aplicação",
@@ -46,7 +29,7 @@
 "Problems connecting to help database." => "Problemas ao ligar à base de dados de ajuda",
 "Go there manually." => "Vá lá manualmente",
 "Answer" => "Resposta",
-"You have used <strong>%s</strong> of the available <strong>%s<strong>" => "Usou <strong>%s</strong> dos <strong>%s<strong> disponíveis.",
+"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Usou <strong>%s</strong> do disponivel <strong>%s</strong>",
 "Desktop and Mobile Syncing Clients" => "Clientes de sincronização desktop e móvel",
 "Download" => "Transferir",
 "Your password was changed" => "A sua palavra-passe foi alterada",
@@ -61,6 +44,7 @@
 "Language" => "Idioma",
 "Help translate" => "Ajude a traduzir",
 "use this address to connect to your ownCloud in your file manager" => "utilize este endereço para ligar ao seu ownCloud através do seu gestor de ficheiros",
+"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>.",
 "Name" => "Nome",
 "Password" => "Palavra-chave",
 "Groups" => "Grupos",
diff --git a/settings/l10n/ro.php b/settings/l10n/ro.php
index ee0d804716b..deabed6f803 100644
--- a/settings/l10n/ro.php
+++ b/settings/l10n/ro.php
@@ -1,6 +1,5 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "Imposibil de încărcat lista din App Store",
-"Authentication error" => "Eroare de autentificare",
 "Group already exists" => "Grupul există deja",
 "Unable to add group" => "Nu s-a putut adăuga grupul",
 "Could not enable app. " => "Nu s-a putut activa aplicația.",
@@ -9,6 +8,7 @@
 "OpenID Changed" => "OpenID schimbat",
 "Invalid request" => "Cerere eronată",
 "Unable to delete group" => "Nu s-a putut șterge grupul",
+"Authentication error" => "Eroare de autentificare",
 "Unable to delete user" => "Nu s-a putut șterge utilizatorul",
 "Language changed" => "Limba a fost schimbată",
 "Unable to add user to group %s" => "Nu s-a putut adăuga utilizatorul la grupul %s",
@@ -17,24 +17,6 @@
 "Enable" => "Activați",
 "Saving..." => "Salvez...",
 "__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.",
-"Cron" => "Cron",
-"Execute one task with each page loaded" => "Execută o sarcină la fiecare pagină încărcată",
-"cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "cron.php este înregistrat în serviciul webcron. Accesează pagina cron.php din root-ul owncloud odată pe minut prin http.",
-"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "Folosește serviciul cron al sistemului. Accesează fișierul cron.php din directorul owncloud printr-un cronjob de sistem odată la fiecare minut.",
-"Sharing" => "Partajare",
-"Enable Share API" => "Activare API partajare",
-"Allow apps to use the Share API" => "Permite aplicațiilor să folosească API-ul de partajare",
-"Allow links" => "Pemite legături",
-"Allow users to share items to the public with links" => "Permite utilizatorilor să partajeze fișiere în mod public prin legături",
-"Allow resharing" => "Permite repartajarea",
-"Allow users to share items shared with them again" => "Permite utilizatorilor să repartajeze fișiere partajate cu ei",
-"Allow users to share with anyone" => "Permite utilizatorilor să partajeze cu oricine",
-"Allow users to only share with users in their groups" => "Permite utilizatorilor să partajeze doar cu utilizatori din același grup",
-"Log" => "Jurnal de activitate",
-"More" => "Mai mult",
-"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",
 "Select an App" => "Selectează o aplicație",
 "See application page at apps.owncloud.com" => "Vizualizează pagina applicației pe apps.owncloud.com",
@@ -45,7 +27,6 @@
 "Problems connecting to help database." => "Probleme de conectare la baza de date.",
 "Go there manually." => "Pe cale manuală.",
 "Answer" => "Răspuns",
-"You have used <strong>%s</strong> of the available <strong>%s<strong>" => "Ai utilizat <strong>%s</strong> din <strong>%s<strong> spațiu disponibil",
 "Desktop and Mobile Syncing Clients" => "Clienți de sincronizare pentru telefon mobil și desktop",
 "Download" => "Descărcări",
 "Your password was changed" => "Parola a fost modificată",
@@ -60,6 +41,7 @@
 "Language" => "Limba",
 "Help translate" => "Ajută la traducere",
 "use this address to connect to your ownCloud in your file manager" => "folosește această adresă pentru a te conecta la managerul tău de fișiere din 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>." => "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>.",
 "Name" => "Nume",
 "Password" => "Parolă",
 "Groups" => "Grupuri",
diff --git a/settings/l10n/ru.php b/settings/l10n/ru.php
index 33d378cdf38..4853f6fc2d1 100644
--- a/settings/l10n/ru.php
+++ b/settings/l10n/ru.php
@@ -11,30 +11,13 @@
 "Authentication error" => "Ошибка авторизации",
 "Unable to delete user" => "Невозможно удалить пользователя",
 "Language changed" => "Язык изменён",
+"Admins can't remove themself from the admin group" => "Администратор не может удалить сам себя из группы admin",
 "Unable to add user to group %s" => "Невозможно добавить пользователя в группу %s",
 "Unable to remove user from group %s" => "Невозможно удалить пользователя из группы %s",
 "Disable" => "Выключить",
 "Enable" => "Включить",
 "Saving..." => "Сохранение...",
 "__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 и ваши файлы в нем доступны из интернета. Предоставляемый ownCloud файл htaccess не работает. Настоятельно рекомендуем настроить сервер таким образом, чтобы закрыть доступ к каталогу data или вынести каталог data за пределы корневого каталога веб-сервера.",
-"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" => "Ограничить публикацию группами пользователя",
-"Log" => "Журнал",
-"More" => "Ещё",
-"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Разрабатывается <a href=\"http://ownCloud.org/contact\" target=\"_blank\">сообществом ownCloud</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">исходный код</a> доступен под лицензией <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
 "Add your App" => "Добавить приложение",
 "More Apps" => "Больше приложений",
 "Select an App" => "Выберите приложение",
@@ -46,7 +29,7 @@
 "Problems connecting to help database." => "Проблема соединения с базой данных помощи.",
 "Go there manually." => "Войти самостоятельно.",
 "Answer" => "Ответ",
-"You have used <strong>%s</strong> of the available <strong>%s<strong>" => "Вы использовали <strong>%s</strong> из доступных <strong>%s<strong>",
+"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Вы использовали <strong>%s</strong> из доступных <strong>%s</strong>",
 "Desktop and Mobile Syncing Clients" => "Клиенты синхронизации для рабочих станций и мобильных устройств",
 "Download" => "Загрузка",
 "Your password was changed" => "Ваш пароль изменён",
@@ -61,6 +44,7 @@
 "Language" => "Язык",
 "Help translate" => "Помочь с переводом",
 "use this address to connect to your ownCloud in your file manager" => "используйте данный адрес для подключения к 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\">AGPL</abbr></a>.",
 "Name" => "Имя",
 "Password" => "Пароль",
 "Groups" => "Группы",
diff --git a/settings/l10n/ru_RU.php b/settings/l10n/ru_RU.php
index 48190a68455..83eb603ba3d 100644
--- a/settings/l10n/ru_RU.php
+++ b/settings/l10n/ru_RU.php
@@ -17,24 +17,6 @@
 "Enable" => "Включить",
 "Saving..." => "Сохранение",
 "__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, не работает. Мы настоятельно рекомендуем Вам настроить сервер таким образом, чтобы каталог данных был бы больше не доступен, или переместить каталог данных за пределы корневой папки веб-сервера.",
-"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" => "Разрешить приложениям использовать Share 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" => "Разрешить пользователям разделение только с пользователями в их группах",
-"Log" => "Вход",
-"More" => "Подробнее",
-"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Разработанный <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
 "Add your App" => "Добавить Ваше приложение",
 "More Apps" => "Больше приложений",
 "Select an App" => "Выбрать приложение",
@@ -46,7 +28,7 @@
 "Problems connecting to help database." => "Проблемы, связанные с разделом Помощь базы данных",
 "Go there manually." => "Сделать вручную.",
 "Answer" => "Ответ",
-"You have used <strong>%s</strong> of the available <strong>%s<strong>" => "Вы использовали <strong>%s</strong> из доступных<strong>%s<strong>",
+"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Вы использовали <strong>%s</strong> из возможных <strong>%s</strong>",
 "Desktop and Mobile Syncing Clients" => "Клиенты синхронизации настольной и мобильной систем",
 "Download" => "Загрузка",
 "Your password was changed" => "Ваш пароль был изменен",
@@ -61,6 +43,7 @@
 "Language" => "Язык",
 "Help translate" => "Помогите перевести",
 "use this address to connect to your ownCloud in your file manager" => "Используйте этот адрес для соединения с Вашим 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 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>.",
 "Name" => "Имя",
 "Password" => "Пароль",
 "Groups" => "Группы",
diff --git a/settings/l10n/si_LK.php b/settings/l10n/si_LK.php
index ecd2403c293..13bd1762d42 100644
--- a/settings/l10n/si_LK.php
+++ b/settings/l10n/si_LK.php
@@ -2,8 +2,12 @@
 "Group already exists" => "කණ්ඩායම දැනටමත් තිබේ",
 "Unable to add group" => "කාණඩයක් එක් කළ නොහැකි විය",
 "Could not enable app. " => "යෙදුම සක්‍රීය කළ නොහැකි විය.",
+"Email saved" => "වි-තැපෑල සුරකින ලදී",
+"Invalid email" => "අවලංගු වි-තැපෑල",
+"OpenID Changed" => "විවෘත හැඳුනුම නැතහොත් OpenID වෙනස්විය.",
 "Invalid request" => "අවලංගු අයදුම",
 "Unable to delete group" => "කණ්ඩායම මැකීමට නොහැක",
+"Authentication error" => "සත්‍යාපන දෝෂයක්",
 "Unable to delete user" => "පරිශීලකයා මැකීමට නොහැක",
 "Language changed" => "භාෂාව ාවනස් කිරීම",
 "Unable to add user to group %s" => "පරිශීලකයා %s කණ්ඩායමට එකතු කළ නොහැක",
@@ -11,14 +15,6 @@
 "Disable" => "අක්‍රිය කරන්න",
 "Enable" => "ක්‍රියත්මක කරන්න",
 "Saving..." => "සුරැකෙමින් පවතී...",
-"Sharing" => "හුවමාරු කිරීම",
-"Allow 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" => "තම කණ්ඩායමේ අයෙකු හා පමණක් හුවමාරුවට අවසර දෙමි",
-"Log" => "ලඝුව",
-"More" => "තවත්",
 "Add your App" => "යෙදුමක් එක් කිරීම",
 "More Apps" => "තවත් යෙදුම්",
 "Select an App" => "යෙදුමක් තොරන්න",
@@ -26,12 +22,12 @@
 "Managing Big Files" => "විශාල ගොනු කළමණාකරනය",
 "Ask a question" => "ප්‍රශ්ණයක් අසන්න",
 "Problems connecting to help database." => "උදව් දත්ත ගබඩාව හා සම්බන්ධවීමේදී ගැටළු ඇතිවිය.",
+"Go there manually." => "ස්වශක්තියෙන් එතැනට යන්න",
 "Answer" => "පිළිතුර",
-"You have used <strong>%s</strong> of the available <strong>%s<strong>" => "ඔබ  <strong>%s</strong>ක් භාවිතා කර ඇත. මුළු ප්‍රමාණය  <strong>%s</strong>කි",
 "Download" => "භාගත කරන්න",
 "Your password was changed" => "ඔබගේ මුර පදය වෙනස් කෙරුණි",
 "Unable to change your password" => "මුර පදය වෙනස් කළ නොහැකි විය",
-"Current password" => "නූතන මුරපදය",
+"Current password" => "වත්මන් මුරපදය",
 "New password" => "නව මුරපදය",
 "show" => "ප්‍රදර්ශනය කිරීම",
 "Change password" => "මුරපදය වෙනස් කිරීම",
@@ -40,10 +36,13 @@
 "Fill in an email address to enable password recovery" => "මුරපද ප්‍රතිස්ථාපනය සඳහා විද්‍යුත් තැපැල් විස්තර ලබා දෙන්න",
 "Language" => "භාෂාව",
 "Help translate" => "පරිවර්ථන සහය",
+"use this address to connect to your ownCloud in your file manager" => "ඔබගේ ගොනු කළමනාකරු ownCloudයට සම්බන්ධ කිරීමට මෙම ලිපිනය භාවිතා කරන්න",
+"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> යටතේ.",
 "Name" => "නාමය",
 "Password" => "මුරපදය",
 "Groups" => "සමූහය",
-"Create" => "තනනවා",
+"Create" => "තනන්න",
+"Default Quota" => "සාමාන්‍ය සලාකය",
 "Other" => "වෙනත්",
 "Group Admin" => "කාණ්ඩ පරිපාලක",
 "Quota" => "සලාකය",
diff --git a/settings/l10n/sk_SK.php b/settings/l10n/sk_SK.php
index 8309c0f12c7..179cbe250b5 100644
--- a/settings/l10n/sk_SK.php
+++ b/settings/l10n/sk_SK.php
@@ -11,30 +11,13 @@
 "Authentication error" => "Chyba pri autentifikácii",
 "Unable to delete user" => "Nie je možné odstrániť používateľa",
 "Language changed" => "Jazyk zmenený",
+"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 remove user from group %s" => "Nie je možné odstrániť používateľa zo skupiny %s",
 "Disable" => "Zakázať",
 "Enable" => "Povoliť",
 "Saving..." => "Ukladám...",
 "__language_name__" => "Slovensky",
-"Security Warning" => "Bezpečnostné varovanie",
-"Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Váš priečinok s dátami a vaše súbory sú pravdepodobne dostupné z internetu. .htaccess súbor dodávaný s inštaláciou ownCloud nespĺňa úlohu. Dôrazne vám doporučujeme nakonfigurovať webserver takým spôsobom, aby dáta v priečinku neboli verejné, alebo presuňte dáta mimo štruktúry priečinkov webservera.",
-"Cron" => "Cron",
-"Execute one task with each page loaded" => "Vykonať jednu úlohu každým nahraním 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 zaregistrovaný v službe webcron. Tá zavolá stránku cron.php v koreňovom adresári owncloud každú minútu cez 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. Každú minútu bude spustený súbor cron.php v priečinku owncloud pomocou systémového programu cronjob.",
-"Sharing" => "Zdieľanie",
-"Enable Share API" => "Zapnúť API zdieľania",
-"Allow apps to use the Share API" => "Povoliť aplikáciam používať API pre zdieľanie",
-"Allow links" => "Povoliť odkazy",
-"Allow users to share items to the public with links" => "Povoliť používateľom zdieľať obsah pomocou verejných odkazov",
-"Allow resharing" => "Povoliť opakované zdieľanie",
-"Allow users to share items shared with them again" => "Povoliť zdieľanie zdielaného obsahu iného užívateľa",
-"Allow users to share with anyone" => "Povoliť používateľom zdieľať s každým",
-"Allow users to only share with users in their groups" => "Povoliť používateľom zdieľanie iba s používateľmi ich vlastnej skupiny",
-"Log" => "Záznam",
-"More" => "Viac",
-"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",
@@ -46,7 +29,7 @@
 "Problems connecting to help database." => "Problémy s pripojením na databázu pomocníka.",
 "Go there manually." => "Prejsť tam ručne.",
 "Answer" => "Odpoveď",
-"You have used <strong>%s</strong> of the available <strong>%s<strong>" => "Použili ste <strong>%s</strong> dostupného <strong>%s<strong>",
+"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Použili ste <strong>%s</strong> z <strong>%s</strong> dostupných ",
 "Desktop and Mobile Syncing Clients" => "Klienti pre synchronizáciu",
 "Download" => "Stiahnúť",
 "Your password was changed" => "Heslo bolo zmenené",
@@ -61,6 +44,7 @@
 "Language" => "Jazyk",
 "Help translate" => "Pomôcť s prekladom",
 "use this address to connect to your ownCloud in your file manager" => "použite túto adresu pre spojenie s vaším ownCloud v správcovi súborov",
+"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>.",
 "Name" => "Meno",
 "Password" => "Heslo",
 "Groups" => "Skupiny",
diff --git a/settings/l10n/sl.php b/settings/l10n/sl.php
index 1aa5de80596..b65a7ad641d 100644
--- a/settings/l10n/sl.php
+++ b/settings/l10n/sl.php
@@ -11,30 +11,13 @@
 "Authentication error" => "Napaka overitve",
 "Unable to delete user" => "Ni mogoče izbrisati uporabnika",
 "Language changed" => "Jezik je bil spremenjen",
+"Admins can't remove themself from the admin group" => "Administratorji sebe ne morejo odstraniti iz skupine admin",
 "Unable to add user to group %s" => "Uporabnika ni mogoče dodati k skupini %s",
 "Unable to remove user from group %s" => "Uporabnika ni mogoče odstraniti iz skupine %s",
 "Disable" => "Onemogoči",
 "Enable" => "Omogoči",
 "Saving..." => "Poteka shranjevanje ...",
 "__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.",
-"Cron" => "Periodično opravilo",
-"Execute one task with each page loaded" => "Izvede eno opravilo z vsako naloženo stranjo.",
-"cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "Datoteka cron.php je prijavljena pri enem izmed ponudnikov spletnih storitev za periodična opravila. Preko protokola HTTP pokličite datoteko cron.php, ki se nahaja v ownCloud korenski mapi, enkrat na minuto.",
-"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "Uporabi sistemske storitve za periodična opravila. Preko sistema povežite datoteko cron.php, ki se nahaja v korenski mapi ownCloud , enkrat na minuto.",
-"Sharing" => "Souporaba",
-"Enable Share API" => "Omogoči vmesnik souporabe",
-"Allow apps to use the Share API" => "Programom dovoli uporabo vmesnika souporabe",
-"Allow links" => "Dovoli povezave",
-"Allow users to share items to the public with links" => "Uporabnikom dovoli souporabo z javnimi povezavami",
-"Allow resharing" => "Dovoli nadaljnjo souporabo",
-"Allow users to share items shared with them again" => "Uporabnikom dovoli nadaljnjo souporabo",
-"Allow users to share with anyone" => "Uporabnikom dovoli souporabo s komerkoli",
-"Allow users to only share with users in their groups" => "Uporabnikom dovoli souporabo le znotraj njihove skupine",
-"Log" => "Dnevnik",
-"More" => "Več",
-"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",
@@ -46,7 +29,7 @@
 "Problems connecting to help database." => "Težave med povezovanjem s podatkovno zbirko pomoči.",
 "Go there manually." => "Ustvari povezavo ročno.",
 "Answer" => "Odgovor",
-"You have used <strong>%s</strong> of the available <strong>%s<strong>" => "Uporabili ste <strong>%s</strong> od razpoložljivih <strong>%s<strong>",
+"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Uporabljate <strong>%s</strong> od razpoložljivih <strong>%s</strong>",
 "Desktop and Mobile Syncing Clients" => "Namizni in mobilni odjemalci za usklajevanje",
 "Download" => "Prejmi",
 "Your password was changed" => "Vaše geslo je spremenjeno",
@@ -61,6 +44,7 @@
 "Language" => "Jezik",
 "Help translate" => "Pomagajte pri prevajanju",
 "use this address to connect to your ownCloud in your file manager" => "Uporabite ta naslov za povezavo do ownCloud v upravljalniku datotek.",
+"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>.",
 "Name" => "Ime",
 "Password" => "Geslo",
 "Groups" => "Skupine",
diff --git a/settings/l10n/sr.php b/settings/l10n/sr.php
index 3fc1cd8c1ec..924d6a07b39 100644
--- a/settings/l10n/sr.php
+++ b/settings/l10n/sr.php
@@ -1,12 +1,38 @@
 <?php $TRANSLATIONS = array(
+"Unable to load list from App Store" => "Грешка приликом учитавања списка из Складишта Програма",
+"Group already exists" => "Група већ постоји",
+"Unable to add group" => "Не могу да додам групу",
+"Could not enable app. " => "Не могу да укључим програм",
+"Email saved" => "Е-порука сачувана",
+"Invalid email" => "Неисправна е-адреса",
 "OpenID Changed" => "OpenID је измењен",
 "Invalid request" => "Неисправан захтев",
-"Language changed" => "Језик је измењен",
+"Unable to delete group" => "Не могу да уклоним групу",
+"Authentication error" => "Грешка при аутентификацији",
+"Unable to delete user" => "Не могу да уклоним корисника",
+"Language changed" => "Језик је промењен",
+"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",
+"Disable" => "Искључи",
+"Enable" => "Укључи",
+"Saving..." => "Чување у току...",
+"__language_name__" => "__language_name__",
+"Add your App" => "Додајте ваш програм",
+"More Apps" => "Више програма",
 "Select an App" => "Изаберите програм",
+"See application page at apps.owncloud.com" => "Погледајте страницу са програмима на apps.owncloud.com",
+"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-лиценцирао <span class=\"author\"></span>",
+"Documentation" => "Документација",
+"Managing Big Files" => "Управљање великим датотекама",
 "Ask a question" => "Поставите питање",
 "Problems connecting to help database." => "Проблем у повезивању са базом помоћи",
 "Go there manually." => "Отиђите тамо ручно.",
 "Answer" => "Одговор",
+"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Искористили сте <strong>%s</strong> од дозвољених <strong>%s</strong>",
+"Desktop and Mobile Syncing Clients" => "Стони и мобилни клијенти за усклађивање",
+"Download" => "Преузимање",
+"Your password was changed" => "Лозинка је промењена",
 "Unable to change your password" => "Не могу да изменим вашу лозинку",
 "Current password" => "Тренутна лозинка",
 "New password" => "Нова лозинка",
@@ -14,12 +40,18 @@
 "Change password" => "Измени лозинку",
 "Email" => "Е-пошта",
 "Your email address" => "Ваша адреса е-поште",
+"Fill in an email address to enable password recovery" => "Ун",
 "Language" => "Језик",
 "Help translate" => " Помозите у превођењу",
 "use this address to connect to your ownCloud in your file manager" => "користите ову адресу да би се повезали на ownCloud путем менаџњера фајлова",
+"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>.",
 "Name" => "Име",
 "Password" => "Лозинка",
 "Groups" => "Групе",
 "Create" => "Направи",
+"Default Quota" => "Подразумевано ограничење",
+"Other" => "Друго",
+"Group Admin" => "Управник групе",
+"Quota" => "Ограничење",
 "Delete" => "Обриши"
 );
diff --git a/settings/l10n/sr@latin.php b/settings/l10n/sr@latin.php
index 5a85856979d..13d3190df8b 100644
--- a/settings/l10n/sr@latin.php
+++ b/settings/l10n/sr@latin.php
@@ -1,22 +1,26 @@
 <?php $TRANSLATIONS = array(
 "OpenID Changed" => "OpenID je izmenjen",
 "Invalid request" => "Neispravan zahtev",
+"Authentication error" => "Greška pri autentifikaciji",
 "Language changed" => "Jezik je izmenjen",
 "Select an App" => "Izaberite program",
 "Ask a question" => "Postavite pitanje",
 "Problems connecting to help database." => "Problem u povezivanju sa bazom pomoći",
 "Go there manually." => "Otiđite tamo ručno.",
 "Answer" => "Odgovor",
+"Download" => "Preuzmi",
 "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",
 "use this address to connect to your ownCloud in your file manager" => "koristite ovu adresu da bi se povezali na ownCloud putem menadžnjera fajlova",
 "Name" => "Ime",
 "Password" => "Lozinka",
 "Groups" => "Grupe",
 "Create" => "Napravi",
+"Other" => "Drugo",
 "Delete" => "Obriši"
 );
diff --git a/settings/l10n/sv.php b/settings/l10n/sv.php
index 17d33896423..c829e0376b7 100644
--- a/settings/l10n/sv.php
+++ b/settings/l10n/sv.php
@@ -1,6 +1,5 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "Kan inte ladda listan från App Store",
-"Authentication error" => "Autentiseringsfel",
 "Group already exists" => "Gruppen finns redan",
 "Unable to add group" => "Kan inte lägga till grupp",
 "Could not enable app. " => "Kunde inte aktivera appen.",
@@ -9,32 +8,16 @@
 "OpenID Changed" => "OpenID ändrat",
 "Invalid request" => "Ogiltig begäran",
 "Unable to delete group" => "Kan inte radera grupp",
+"Authentication error" => "Autentiseringsfel",
 "Unable to delete user" => "Kan inte radera användare",
 "Language changed" => "Språk ändrades",
+"Admins can't remove themself from the admin group" => "Administratörer kan inte ta bort sig själva från admingruppen",
 "Unable to add user to group %s" => "Kan inte lägga till användare i gruppen %s",
 "Unable to remove user from group %s" => "Kan inte radera användare från gruppen %s",
 "Disable" => "Deaktivera",
 "Enable" => "Aktivera",
 "Saving..." => "Sparar...",
 "__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 datamapp och dina filer kan möjligen vara nåbara från internet. Filen .htaccess som ownCloud tillhandahåller fungerar inte. Vi rekommenderar starkt att du ställer in din webbserver på ett sätt så att datamappen inte är nåbar. Alternativt att ni flyttar datamappen utanför webbservern.",
-"Cron" => "Cron",
-"Execute one task with each page loaded" => "Exekvera en uppgift vid varje sidladdning",
-"cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "cron.php är registrerad som en webcron-tjänst. Anropa cron.php sidan i ownCloud en gång i minuten över HTTP.",
-"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "Använd system-tjänsten cron. Anropa filen cron.php i ownCloud-mappen via ett cronjobb varje minut.",
-"Sharing" => "Dela",
-"Enable Share API" => "Aktivera delat API",
-"Allow apps to use the Share API" => "Tillåt applikationer att använda delat API",
-"Allow links" => "Tillåt länkar",
-"Allow users to share items to the public with links" => "Tillåt delning till allmänheten via publika länkar",
-"Allow resharing" => "Tillåt dela vidare",
-"Allow users to share items shared with them again" => "Tillåt användare att dela vidare filer som delats med dom",
-"Allow users to share with anyone" => "Tillåt delning med alla",
-"Allow users to only share with users in their groups" => "Tillåt bara delning med användare i egna grupper",
-"Log" => "Logg",
-"More" => "Mera",
-"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Utvecklad av <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud kommunity</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">källkoden</a> är licenserad under <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
 "Add your App" => "Lägg till din applikation",
 "More Apps" => "Fler Appar",
 "Select an App" => "Välj en App",
@@ -46,7 +29,7 @@
 "Problems connecting to help database." => "Problem med att ansluta till hjälpdatabasen.",
 "Go there manually." => "Gå dit manuellt.",
 "Answer" => "Svar",
-"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>",
+"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>",
 "Desktop and Mobile Syncing Clients" => "Synkroniseringsklienter för dator och mobil",
 "Download" => "Ladda ner",
 "Your password was changed" => "Ditt lösenord har ändrats",
@@ -61,6 +44,7 @@
 "Language" => "Språk",
 "Help translate" => "Hjälp att översätta",
 "use this address to connect to your ownCloud in your file manager" => "använd denna adress för att ansluta ownCloud till din filhanterare",
+"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>.",
 "Name" => "Namn",
 "Password" => "Lösenord",
 "Groups" => "Grupper",
diff --git a/settings/l10n/ta_LK.php b/settings/l10n/ta_LK.php
new file mode 100644
index 00000000000..c0189a5bdaf
--- /dev/null
+++ b/settings/l10n/ta_LK.php
@@ -0,0 +1,56 @@
+<?php $TRANSLATIONS = array(
+"Unable to load list from App Store" => "செயலி சேமிப்பிலிருந்து பட்டியலை ஏற்றமுடியாதுள்ளது",
+"Group already exists" => "குழு ஏற்கனவே உள்ளது",
+"Unable to add group" => "குழுவை சேர்க்க முடியாது",
+"Could not enable app. " => "செயலியை இயலுமைப்படுத்த முடியாது",
+"Email saved" => "மின்னஞ்சல் சேமிக்கப்பட்டது",
+"Invalid email" => "செல்லுபடியற்ற மின்னஞ்சல்",
+"OpenID Changed" => "OpenID மாற்றப்பட்டது",
+"Invalid request" => "செல்லுபடியற்ற வேண்டுகோள்",
+"Unable to delete group" => "குழுவை நீக்க முடியாது",
+"Authentication error" => "அத்தாட்சிப்படுத்தலில் வழு",
+"Unable to delete user" => "பயனாளரை நீக்க முடியாது",
+"Language changed" => "மொழி மாற்றப்பட்டது",
+"Unable to add user to group %s" => "குழு %s இல் பயனாளரை சேர்க்க முடியாது",
+"Unable to remove user from group %s" => "குழு %s இலிருந்து பயனாளரை நீக்கமுடியாது",
+"Disable" => "இயலுமைப்ப",
+"Enable" => "செயலற்றதாக்குக",
+"Saving..." => "இயலுமைப்படுத்துக",
+"__language_name__" => "_மொழி_பெயர்_",
+"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=\"அனுமதிப்பத்திரம்\"></span>-அனுமதி பெற்ற <span class=\"ஆசிரியர்\"></span>",
+"Documentation" => "ஆவணமாக்கல்",
+"Managing Big Files" => "பெரிய கோப்புகளை முகாமைப்படுத்தல்",
+"Ask a question" => "வினா ஒன்றை கேட்க",
+"Problems connecting to help database." => "தரவுதளத்தை இணைக்கும் உதவியில் பிரச்சினைகள்",
+"Go there manually." => "கைமுறையாக அங்கு செல்க",
+"Answer" => "விடை",
+"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "நீங்கள் <strong>%s</strong> இலுள்ள <strong>%s</strong>பயன்படுத்தியுள்ளீர்கள்",
+"Desktop and Mobile Syncing Clients" => "desktop மற்றும் Mobile ஒத்திசைவு சேவைப் பயனாளர்",
+"Download" => "பதிவிறக்குக",
+"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" => "மொழிபெயர்க்க உதவி",
+"use this address to connect to your ownCloud in your file manager" => "உங்களுடைய கோப்பு முகாமையில் உள்ள உங்களுடைய 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>." => "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>.",
+"Name" => "பெயர்",
+"Password" => "கடவுச்சொல்",
+"Groups" => "குழுக்கள்",
+"Create" => "உருவாக்குக",
+"Default Quota" => "பொது இருப்பு பங்கு",
+"Other" => "மற்றவை",
+"Group Admin" => "குழு நிர்வாகி",
+"Quota" => "பங்கு",
+"Delete" => "அழிக்க"
+);
diff --git a/settings/l10n/th_TH.php b/settings/l10n/th_TH.php
index 0b2d1ecfb54..3431fedac0a 100644
--- a/settings/l10n/th_TH.php
+++ b/settings/l10n/th_TH.php
@@ -1,6 +1,5 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "ไม่สามารถโหลดรายการจาก App Store ได้",
-"Authentication error" => "เกิดข้อผิดพลาดเกี่ยวกับสิทธิ์การเข้าใช้งาน",
 "Group already exists" => "มีกลุ่มดังกล่าวอยู่ในระบบอยู่แล้ว",
 "Unable to add group" => "ไม่สามารถเพิ่มกลุ่มได้",
 "Could not enable app. " => "ไม่สามารถเปิดใช้งานแอปได้",
@@ -9,6 +8,7 @@
 "OpenID Changed" => "เปลี่ยนชื่อบัญชี OpenID แล้ว",
 "Invalid request" => "คำร้องขอไม่ถูกต้อง",
 "Unable to delete group" => "ไม่สามารถลบกลุ่มได้",
+"Authentication error" => "เกิดข้อผิดพลาดเกี่ยวกับสิทธิ์การเข้าใช้งาน",
 "Unable to delete user" => "ไม่สามารถลบผู้ใช้งานได้",
 "Language changed" => "เปลี่ยนภาษาเรียบร้อยแล้ว",
 "Unable to add user to group %s" => "ไม่สามารถเพิ่มผู้ใช้งานเข้าไปที่กลุ่ม %s ได้",
@@ -17,24 +17,6 @@
 "Enable" => "เปิดใช้งาน",
 "Saving..." => "กำลังบันทึุกข้อมูล...",
 "__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 ของเว็บเซิร์ฟเวอร์แล้ว",
-"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" => "อนุญาตให้ผู้ใช้งานแชร์ข้อมูลได้เฉพาะกับผู้ใช้งานที่อยู่ในกลุ่มเดียวกันเท่านั้น",
-"Log" => "บันทึกการเปลี่ยนแปลง",
-"More" => "เพิ่มเติม",
-"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "พัฒนาโดย the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ชุมชนผู้ใช้งาน ownCloud</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">ซอร์สโค้ด</a>อยู่ภายใต้สัญญาอนุญาตของ <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
 "Add your App" => "เพิ่มแอปของคุณ",
 "More Apps" => "แอปฯอื่นเพิ่มเติม",
 "Select an App" => "เลือก App",
@@ -46,7 +28,7 @@
 "Problems connecting to help database." => "เกิดปัญหาในการเชื่อมต่อกับฐานข้อมูลช่วยเหลือ",
 "Go there manually." => "ไปที่นั่นด้วยตนเอง",
 "Answer" => "คำตอบ",
-"You have used <strong>%s</strong> of the available <strong>%s<strong>" => "คุณได้ใช้ <strong>%s</strong> จากที่สามารถใช้ได้ <strong>%s<strong>",
+"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "คุณได้ใช้งานไปแล้ว <strong>%s</strong> จากจำนวนที่สามารถใช้ได้ <strong>%s</strong>",
 "Desktop and Mobile Syncing Clients" => "โปรแกรมเชื่อมข้อมูลไฟล์สำหรับเครื่องเดสก์ท็อปและมือถือ",
 "Download" => "ดาวน์โหลด",
 "Your password was changed" => "รหัสผ่านของคุณถูกเปลี่ยนแล้ว",
@@ -61,6 +43,7 @@
 "Language" => "ภาษา",
 "Help translate" => "ช่วยกันแปล",
 "use this address to connect to your ownCloud in your file manager" => "ใช้ที่อยู่นี้ในการเชื่อมต่อกับบัญชี 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>." => "พัฒนาโดย 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>.",
 "Name" => "ชื่อ",
 "Password" => "รหัสผ่าน",
 "Groups" => "กลุ่ม",
diff --git a/settings/l10n/tr.php b/settings/l10n/tr.php
index 31486c7776a..1e301e8d323 100644
--- a/settings/l10n/tr.php
+++ b/settings/l10n/tr.php
@@ -1,18 +1,23 @@
 <?php $TRANSLATIONS = array(
-"Authentication error" => "Eşleşme hata",
+"Unable to load list from App Store" => "App Store'dan liste yüklenemiyor",
+"Group already exists" => "Grup zaten mevcut",
+"Unable to add group" => "Gruba eklenemiyor",
+"Could not enable app. " => "Uygulama devreye alınamadı",
 "Email saved" => "Eposta kaydedildi",
 "Invalid email" => "Geçersiz eposta",
 "OpenID Changed" => "OpenID Değiştirildi",
 "Invalid request" => "Geçersiz istek",
+"Unable to delete group" => "Grup silinemiyor",
+"Authentication error" => "Eşleşme hata",
+"Unable to delete user" => "Kullanıcı silinemiyor",
 "Language changed" => "Dil değiştirildi",
+"Unable to add user to group %s" => "Kullanıcı %s grubuna eklenemiyor",
 "Disable" => "Etkin değil",
 "Enable" => "Etkin",
 "Saving..." => "Kaydediliyor...",
 "__language_name__" => "__dil_adı__",
-"Security Warning" => "Güvenlik Uyarisi",
-"Log" => "Günlük",
-"More" => "Devamı",
 "Add your App" => "Uygulamanı Ekle",
+"More Apps" => "Daha fazla App",
 "Select an App" => "Bir uygulama seçin",
 "See application page at apps.owncloud.com" => "Uygulamanın sayfasına apps.owncloud.com adresinden bakın ",
 "Documentation" => "Dökümantasyon",
@@ -23,6 +28,7 @@
 "Answer" => "Cevap",
 "Desktop and Mobile Syncing Clients" => "Masaüstü ve Mobil Senkron İstemcileri",
 "Download" => "İndir",
+"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",
@@ -34,12 +40,14 @@
 "Language" => "Dil",
 "Help translate" => "Çevirilere yardım edin",
 "use this address to connect to your ownCloud in your file manager" => "bu adresi kullanarak ownCloud unuza dosya yöneticinizle bağlanı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>." => "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>.",
 "Name" => "Ad",
 "Password" => "Parola",
 "Groups" => "Gruplar",
 "Create" => "Oluştur",
 "Default Quota" => "Varsayılan Kota",
 "Other" => "Diğer",
+"Group Admin" => "Yönetici Grubu ",
 "Quota" => "Kota",
 "Delete" => "Sil"
 );
diff --git a/settings/l10n/uk.php b/settings/l10n/uk.php
index 82b6881dfc1..d1a0d6d9091 100644
--- a/settings/l10n/uk.php
+++ b/settings/l10n/uk.php
@@ -1,18 +1,57 @@
 <?php $TRANSLATIONS = array(
+"Unable to load list from App Store" => "Не вдалося завантажити список з App Store",
+"Group already exists" => "Група вже існує",
+"Unable to add group" => "Не вдалося додати групу",
+"Could not enable app. " => "Не вдалося активувати програму. ",
+"Email saved" => "Адресу збережено",
+"Invalid email" => "Невірна адреса",
 "OpenID Changed" => "OpenID змінено",
 "Invalid request" => "Помилковий запит",
+"Unable to delete group" => "Не вдалося видалити групу",
+"Authentication error" => "Помилка автентифікації",
+"Unable to delete user" => "Не вдалося видалити користувача",
 "Language changed" => "Мова змінена",
+"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",
+"Disable" => "Вимкнути",
+"Enable" => "Включити",
+"Saving..." => "Зберігаю...",
+"__language_name__" => "__language_name__",
+"Add your App" => "Додати свою програму",
+"More Apps" => "Більше програм",
 "Select an App" => "Вибрати додаток",
+"See application page at apps.owncloud.com" => "Перегляньте сторінку програм на apps.owncloud.com",
+"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>",
+"Documentation" => "Документація",
+"Managing Big Files" => "Управління великими файлами",
 "Ask a question" => "Запитати",
 "Problems connecting to help database." => "Проблема при з'єднані з базою допомоги",
+"Go there manually." => "Перейти вручну.",
+"Answer" => "Відповідь",
+"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Ви використали <strong>%s</strong> із доступних <strong>%s</strong>",
+"Desktop and Mobile Syncing Clients" => "Настільні та мобільні клієнти синхронізації",
+"Download" => "Завантажити",
+"Your password was changed" => "Ваш пароль змінено",
+"Unable to change your password" => "Не вдалося змінити Ваш пароль",
 "Current password" => "Поточний пароль",
 "New password" => "Новий пароль",
 "show" => "показати",
 "Change password" => "Змінити пароль",
+"Email" => "Ел.пошта",
+"Your email address" => "Ваша адреса електронної пошти",
+"Fill in an email address to enable password recovery" => "Введіть адресу електронної пошти для відновлення паролю",
 "Language" => "Мова",
+"Help translate" => "Допомогти з перекладом",
+"use this address to connect to your ownCloud in your file manager" => "використовувати цю адресу для з'єднання з ownCloud у Вашому файловому менеджері",
+"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>.",
 "Name" => "Ім'я",
 "Password" => "Пароль",
 "Groups" => "Групи",
 "Create" => "Створити",
+"Default Quota" => "Квота за замовчуванням",
+"Other" => "Інше",
+"Group Admin" => "Адміністратор групи",
+"Quota" => "Квота",
 "Delete" => "Видалити"
 );
diff --git a/settings/l10n/vi.php b/settings/l10n/vi.php
index 7486f7f8d14..7857b0509e6 100644
--- a/settings/l10n/vi.php
+++ b/settings/l10n/vi.php
@@ -11,42 +11,25 @@
 "Authentication error" => "Lỗi xác thực",
 "Unable to delete user" => "Không thể xóa người dùng",
 "Language changed" => "Ngôn ngữ đã được thay đổi",
+"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",
-"Disable" => "Vô hiệu",
-"Enable" => "Cho phép",
+"Disable" => "Tắt",
+"Enable" => "Bật",
 "Saving..." => "Đang tiến hành lưu ...",
 "__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ừ internet. Tập tin .htaccess của ownCloud cung cấp không hoạt động. Chúng tôi đề nghị bạn nên cấu hình lại máy chủ webserver của bạn để thư mục dữ liệu không  còn bị truy cập hoặc bạn di chuyển thư mục dữ liệu ra bên ngoài thư mục gốc của máy chủ.",
-"Cron" => "Cron",
-"Execute one task with each page loaded" => "Thực thi tác vụ mỗi khi trang được tải",
-"cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "cron.php đã được đăng ký tại một dịch vụ webcron. Gọi trang cron.php mỗi phút một lần thông qua giao thức http.",
-"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "Sử dụng dịch vụ cron của hệ thống. Gọi tệp tin cron.php mỗi phút một lần.",
-"Sharing" => "Chia sẻ",
-"Enable Share API" => "Bật chia sẻ API",
-"Allow apps to use the Share API" => "Cho phép các ứng dụng sử dụng chia sẻ API",
-"Allow links" => "Cho phép liên kết",
-"Allow users to share items to the public with links" => "Cho phép người dùng chia sẻ công khai các mục bằng các liên kết",
-"Allow resharing" => "Cho phép chia sẻ lại",
-"Allow users to share items shared with them again" => "Cho phép người dùng chia sẻ lại những mục đã được chia sẻ",
-"Allow users to share with anyone" => "Cho phép người dùng chia sẻ với bất cứ ai",
-"Allow users to only share with users in their groups" => "Chỉ cho phép người dùng chia sẻ với những người dùng trong nhóm của họ",
-"Log" => "Log",
-"More" => "nhiều hơn",
-"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Được phát triển bởi <a href=\"http://ownCloud.org/contact\" target=\"_blank\">cộng đồng ownCloud</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">mã nguồn </a> đã được cấp phép theo chuẩn <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
 "Add your App" => "Thêm ứng dụng của bạn",
 "More Apps" => "Nhiều ứng dụng hơn",
 "Select an App" => "Chọn một ứng dụng",
-"See application page at apps.owncloud.com" => "Xem ứng dụng tại apps.owncloud.com",
+"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>",
 "Documentation" => "Tài liệu",
 "Managing Big Files" => "Quản lý tập tin lớn",
 "Ask a question" => "Đặt câu hỏi",
 "Problems connecting to help database." => "Vấn đề kết nối đến cơ sở dữ liệu.",
-"Go there manually." => "Đến bằng thủ công",
+"Go there manually." => "Đến bằng thủ công.",
 "Answer" => "trả lời",
-"You have used <strong>%s</strong> of the available <strong>%s<strong>" => "Bạn đã sử dụng <strong>%s</strong> trong <strong>%s</strong> được phép.",
+"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>",
 "Desktop and Mobile Syncing Clients" => "Đồng bộ dữ liệu",
 "Download" => "Tải về",
 "Your password was changed" => "Mật khẩu của bạn đã được thay đổi.",
@@ -59,8 +42,9 @@
 "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" => "Dịch ",
+"Help translate" => "Hỗ trợ dịch thuật",
 "use this address to connect to your ownCloud in your file manager" => "sử dụng địa chỉ này để kết nối với ownCloud của bạn trong quản lý tập tin ",
+"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>.",
 "Name" => "Tên",
 "Password" => "Mật khẩu",
 "Groups" => "Nhóm",
diff --git a/settings/l10n/zh_CN.GB2312.php b/settings/l10n/zh_CN.GB2312.php
index ea4d00bfcd3..4784ff7ff9d 100644
--- a/settings/l10n/zh_CN.GB2312.php
+++ b/settings/l10n/zh_CN.GB2312.php
@@ -17,24 +17,6 @@
 "Enable" => "启用",
 "Saving..." => "保存中...",
 "__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 提供的 .htaccess 文件未工作。我们强烈建议您配置您的网络服务器，让数据文件夹不能访问，或将数据文件夹移出网络服务器文档根目录。",
-"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 根用户将通过 http 协议每分钟调用一次 cron.php。",
-"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "使用系统 cron 服务。通过系统 cronjob 每分钟调用一次 owncloud 文件夹下的 cron.php",
-"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" => "只允许用户与群组内用户分享",
-"Log" => "日志",
-"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" => "选择一个程序",
@@ -46,7 +28,6 @@
 "Problems connecting to help database." => "连接到帮助数据库时的问题",
 "Go there manually." => "收到转到.",
 "Answer" => "回答",
-"You have used <strong>%s</strong> of the available <strong>%s<strong>" => "您已使用了 <strong>%s</strong>，总可用 <strong>%s<strong>",
 "Desktop and Mobile Syncing Clients" => "桌面和移动同步客户端",
 "Download" => "下载",
 "Your password was changed" => "您的密码以变更",
@@ -61,6 +42,7 @@
 "Language" => "语言",
 "Help translate" => "帮助翻译",
 "use this address to connect to your ownCloud in your file manager" => "使用这个地址和你的文件管理器连接到你的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\">s源代码</a> 以 <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> 许可协议发布。",
 "Name" => "名字",
 "Password" => "密码",
 "Groups" => "组",
diff --git a/settings/l10n/zh_CN.php b/settings/l10n/zh_CN.php
index 3425beec8b6..87c8172d6fa 100644
--- a/settings/l10n/zh_CN.php
+++ b/settings/l10n/zh_CN.php
@@ -11,30 +11,13 @@
 "Authentication error" => "认证错误",
 "Unable to delete user" => "无法删除用户",
 "Language changed" => "语言已修改",
+"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中移除用户",
 "Disable" => "禁用",
 "Enable" => "启用",
 "Saving..." => "正在保存",
 "__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服务器根目录以外。",
-"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已被注册到网络定时任务服务。通过http每分钟调用owncloud根目录的cron.php网页。",
-"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "使用系统定时任务服务。每分钟通过系统定时任务调用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" => "允许用户只向同组用户共享",
-"Log" => "日志",
-"More" => "更多",
-"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "由<a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud社区</a>开发，  <a href=\"https://github.com/owncloud\" target=\"_blank\">源代码</a>在<a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>许可证下发布。",
 "Add your App" => "添加应用",
 "More Apps" => "更多应用",
 "Select an App" => "选择一个应用",
@@ -46,7 +29,7 @@
 "Problems connecting to help database." => "连接帮助数据库错误 ",
 "Go there manually." => "手动访问",
 "Answer" => "回答",
-"You have used <strong>%s</strong> of the available <strong>%s<strong>" => "您已使用空间: <strong>%s</strong>，总空间: <strong>%s</strong>",
+"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "你已使用 <strong>%s</strong>，有效空间 <strong>%s</strong>",
 "Desktop and Mobile Syncing Clients" => "桌面和移动设备同步客户端",
 "Download" => "下载",
 "Your password was changed" => "密码已修改",
@@ -61,6 +44,7 @@
 "Language" => "语言",
 "Help translate" => "帮助翻译",
 "use this address to connect to your ownCloud in your file manager" => "您可在文件管理器中使用该地址连接到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\">AGPL</abbr></a>许可证下发布。",
 "Name" => "名称",
 "Password" => "密码",
 "Groups" => "组",
diff --git a/settings/l10n/zh_TW.php b/settings/l10n/zh_TW.php
index ccf67cef035..7de5ee5f54d 100644
--- a/settings/l10n/zh_TW.php
+++ b/settings/l10n/zh_TW.php
@@ -1,42 +1,38 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "無法從 App Store 讀取清單",
-"Authentication error" => "認證錯誤",
 "Group already exists" => "群組已存在",
 "Unable to add group" => "群組增加失敗",
+"Could not enable app. " => "未能啟動此app",
 "Email saved" => "Email已儲存",
 "Invalid email" => "無效的email",
 "OpenID Changed" => "OpenID 已變更",
 "Invalid request" => "無效請求",
 "Unable to delete group" => "群組刪除錯誤",
+"Authentication error" => "認證錯誤",
 "Unable to delete user" => "使用者刪除錯誤",
 "Language changed" => "語言已變更",
+"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錯誤",
 "Disable" => "停用",
 "Enable" => "啟用",
 "Saving..." => "儲存中...",
 "__language_name__" => "__語言_名稱__",
-"Security Warning" => "安全性警告",
-"Cron" => "定期執行",
-"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" => "僅允許使用者在群組內分享",
-"Log" => "紀錄",
-"More" => "更多",
 "Add your App" => "添加你的 App",
+"More Apps" => "更多Apps",
 "Select an App" => "選擇一個應用程式",
 "See application page at apps.owncloud.com" => "查看應用程式頁面於 apps.owncloud.com",
+"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-核准: <span class=\"author\"></span>",
 "Documentation" => "文件",
 "Managing Big Files" => "管理大檔案",
 "Ask a question" => "提問",
-"Problems connecting to help database." => "連接到求助資料庫發生問題",
+"Problems connecting to help database." => "連接到求助資料庫時發生問題",
 "Go there manually." => "手動前往",
 "Answer" => "答案",
+"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "您已經使用了 <strong>%s</strong> ，目前可用空間為 <strong>%s</strong>",
 "Desktop and Mobile Syncing Clients" => "桌機與手機同步客戶端",
 "Download" => "下載",
+"Your password was changed" => "你的密碼已更改",
 "Unable to change your password" => "無法變更你的密碼",
 "Current password" => "目前密碼",
 "New password" => "新密碼",
@@ -48,6 +44,7 @@
 "Language" => "語言",
 "Help translate" => "幫助翻譯",
 "use this address to connect to your ownCloud in your file manager" => "使用這個位址去連接到你的私有雲檔案管理員",
+"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>許可證下發布。",
 "Name" => "名稱",
 "Password" => "密碼",
 "Groups" => "群組",
diff --git a/settings/languageCodes.php b/settings/languageCodes.php
index 221aa13cf6a..71655800856 100644
--- a/settings/languageCodes.php
+++ b/settings/languageCodes.php
@@ -3,7 +3,7 @@
  * This file is licensed under the Affero General Public License version 3 or later.
  * See the COPYING-README file.
  */
- 
+
 return array(
 'bg_BG'=>'български език',
 'ca'=>'Català',
diff --git a/settings/personal.php b/settings/personal.php
index 2031edd8df8..47dbcc53ebc 100644
--- a/settings/personal.php
+++ b/settings/personal.php
@@ -5,8 +5,8 @@
  * See the COPYING-README file.
  */
 
-require_once '../lib/base.php';
 OC_Util::checkLoggedIn();
+OC_App::loadApps();
 
 // Highlight navigation entry
 OC_Util::addScript( 'settings', 'personal' );
@@ -40,11 +40,11 @@ $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__'));
+		$languages[]=array('code'=>$lang, 'name'=>$l->t('__language_name__'));
 	}elseif(isset($languageNames[$lang])) {
-		$languages[]=array('code'=>$lang,'name'=>$languageNames[$lang]);
+		$languages[]=array('code'=>$lang, 'name'=>$languageNames[$lang]);
 	}else{//fallback to language code
-		$languages[]=array('code'=>$lang,'name'=>$lang);
+		$languages[]=array('code'=>$lang, 'name'=>$lang);
 	}
 }
 
diff --git a/settings/routes.php b/settings/routes.php
new file mode 100644
index 00000000000..8239fe005db
--- /dev/null
+++ b/settings/routes.php
@@ -0,0 +1,64 @@
+<?php
+/**
+ * Copyright (c) 2012 Bart Visscher <bartv@thisnet.nl>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+// Settings pages
+$this->create('settings_help', '/settings/help')
+	->actionInclude('settings/help.php');
+$this->create('settings_personal', '/settings/personal')
+	->actionInclude('settings/personal.php');
+$this->create('settings_settings', '/settings')
+	->actionInclude('settings/settings.php');
+$this->create('settings_users', '/settings/users')
+	->actionInclude('settings/users.php');
+$this->create('settings_apps', '/settings/apps')
+	->actionInclude('settings/apps.php');
+$this->create('settings_admin', '/settings/admin')
+	->actionInclude('settings/admin.php');
+// Settings ajax actions
+// users
+$this->create('settings_ajax_userlist', '/settings/ajax/userlist')
+	->actionInclude('settings/ajax/userlist.php');
+$this->create('settings_ajax_createuser', '/settings/ajax/createuser.php')
+	->actionInclude('settings/ajax/createuser.php');
+$this->create('settings_ajax_removeuser', '/settings/ajax/removeuser.php')
+	->actionInclude('settings/ajax/removeuser.php');
+$this->create('settings_ajax_setquota', '/settings/ajax/setquota.php')
+	->actionInclude('settings/ajax/setquota.php');
+$this->create('settings_ajax_creategroup', '/settings/ajax/creategroup.php')
+	->actionInclude('settings/ajax/creategroup.php');
+$this->create('settings_ajax_togglegroups', '/settings/ajax/togglegroups.php')
+	->actionInclude('settings/ajax/togglegroups.php');
+$this->create('settings_ajax_togglesubadmins', '/settings/ajax/togglesubadmins.php')
+	->actionInclude('settings/ajax/togglesubadmins.php');
+$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');
+// personel
+$this->create('settings_ajax_lostpassword', '/settings/ajax/lostpassword.php')
+	->actionInclude('settings/ajax/lostpassword.php');
+$this->create('settings_ajax_setlanguage', '/settings/ajax/setlanguage.php')
+	->actionInclude('settings/ajax/setlanguage.php');
+// apps
+$this->create('settings_ajax_apps_ocs', '/settings/ajax/apps/ocs.php')
+	->actionInclude('settings/ajax/apps/ocs.php');
+$this->create('settings_ajax_enableapp', '/settings/ajax/enableapp.php')
+	->actionInclude('settings/ajax/enableapp.php');
+$this->create('settings_ajax_disableapp', '/settings/ajax/disableapp.php')
+	->actionInclude('settings/ajax/disableapp.php');
+$this->create('settings_ajax_navigationdetect', '/settings/ajax/navigationdetect.php')
+	->actionInclude('settings/ajax/navigationdetect.php');
+// admin
+$this->create('settings_ajax_getlog', '/settings/ajax/getlog.php')
+	->actionInclude('settings/ajax/getlog.php');
+$this->create('settings_ajax_setloglevel', '/settings/ajax/setloglevel.php')
+	->actionInclude('settings/ajax/setloglevel.php');
+
+// apps/user_openid
+$this->create('settings_ajax_openid', '/settings/ajax/openid.php')
+	->actionInclude('settings/ajax/openid.php');
diff --git a/settings/settings.php b/settings/settings.php
index 68c07ff60f0..add94b5b011 100644
--- a/settings/settings.php
+++ b/settings/settings.php
@@ -5,9 +5,9 @@
  * See the COPYING-README file.
  */
 
-require_once '../lib/base.php';
 OC_Util::checkLoggedIn();
 OC_Util::verifyUser();
+OC_App::loadApps();
 
 OC_Util::addStyle( 'settings', 'settings' );
 OC_App::setActiveNavigationEntry( 'settings' );
diff --git a/settings/templates/admin.php b/settings/templates/admin.php
index 35f34489fec..9c4ee0bf680 100644
--- a/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@ -3,7 +3,7 @@
  * This file is licensed under the Affero General Public License version 3 or later.
  * See the COPYING-README file.
  */
-$levels=array('Debug','Info','Warning','Error','Fatal');
+$levels=array('Debug','Info','Warning','Error', 'Fatal');
 ?>
 
 <?php
@@ -22,6 +22,20 @@ if(!$_['htaccessworking']) {
 }
 ?>
 
+<?php
+if(!$_['internetconnectionworking']) {
+?>
+<fieldset class="personalblock">
+        <legend><strong><?php echo $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.'); ?>
+    </span>
+
+</fieldset>
+<?php
+}
+?>
 
 <?php foreach($_['forms'] as $form) {
 	echo $form;
diff --git a/settings/templates/apps.php b/settings/templates/apps.php
index 1e9598de1e3..38e2af8a51a 100644
--- a/settings/templates/apps.php
+++ b/settings/templates/apps.php
@@ -16,7 +16,7 @@
 		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>
 		<script type="application/javascript">
-			appData_<?php echo $app['id'] ?>=<?php OC_JSON::encodedPrint($app,false) ?>;
+			appData_<?php echo $app['id'] ?>=<?php OC_JSON::encodedPrint($app, false) ?>;
 		</script>
 		<?php  if(!$app['internal']) echo '<small class="externalapp list">3rd party</small>' ?>
 	</li>
diff --git a/settings/templates/help.php b/settings/templates/help.php
index b2a78ff8512..75201a86a9f 100644
--- a/settings/templates/help.php
+++ b/settings/templates/help.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /**
  * 2012 Frank Karlitschek frank@owncloud.org
  * This file is licensed under the Affero General Public License version 3 or later.
@@ -12,13 +12,12 @@
 	<?php
 		$url=OC_Helper::linkTo( "settings", "help.php" ).'?page=';
 		$pageNavi=OC_Util::getPageNavi($_['pagecount'], $_['page'], $url);
-		if($pageNavi)
-		{
+		if($pageNavi) {
 			$pageNavi->printPage();
 		}
 	?>
 </diV>
-<?php if(is_null($_["kbe"])):?>
+<?php if(!is_array($_["kbe"]) || !count($_["kbe"])):?>
 	<div class="helpblock">
 		<p><?php echo $l->t('Problems connecting to help database.');?></p>
 		<p><a href="http://apps.owncloud.com/kb"><?php echo $l->t('Go there manually.');?></a></p>
diff --git a/settings/templates/personal.php b/settings/templates/personal.php
index 55ff24b4223..d02bcdd7ea5 100644
--- a/settings/templates/personal.php
+++ b/settings/templates/personal.php
@@ -5,7 +5,7 @@
  */?>
 
 <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>
+	<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></div>
 
 <div class="personalblock">
@@ -56,4 +56,9 @@
 };?>
 
 
+<p class="personalblock">
+	<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>.'); ?>
+</p>
+
 
diff --git a/settings/templates/users.php b/settings/templates/users.php
index eef9b291357..de7e50da8f3 100644
--- a/settings/templates/users.php
+++ b/settings/templates/users.php
@@ -142,7 +142,7 @@ var isadmin = <?php echo $_['isadmin']?'true':'false'; ?>;
 				</div>
 			</td>
 			<td class="remove">
-				<?php if($user['name']!=OC_User::getUser()):?> 
+				<?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>
diff --git a/settings/users.php b/settings/users.php
index e76505cc78d..93a259f1cd8 100644
--- a/settings/users.php
+++ b/settings/users.php
@@ -5,8 +5,8 @@
  * See the COPYING-README file.
  */
 
-require_once '../lib/base.php';
 OC_Util::checkSubAdminUser();
+OC_App::loadApps();
 
 // We have some javascript foo!
 OC_Util::addScript( 'settings', 'users' );
@@ -31,7 +31,7 @@ if($isadmin) {
 
 foreach($accessibleusers as $i) {
 	$users[] = array(
-		"name" => $i, 
+		"name" => $i,
 		"groups" => join( ", ", /*array_intersect(*/OC_Group::getUserGroups($i)/*, OC_SubAdmin::getSubAdminsGroups(OC_User::getUser()))*/),
 		'quota'=>OC_Preferences::getValue($i, 'files', 'quota', 'default'),
 		'subadmin'=>implode(', ', OC_SubAdmin::getSubAdminsGroups($i)));
@@ -42,7 +42,7 @@ foreach( $accessiblegroups as $i ) {
 	$groups[] = array( "name" => $i );
 }
 $quotaPreset=OC_Appconfig::getValue('files', 'quota_preset', 'default,none,1 GB, 5 GB, 10 GB');
-$quotaPreset=explode(',',$quotaPreset);
+$quotaPreset=explode(',', $quotaPreset);
 foreach($quotaPreset as &$preset) {
 	$preset=trim($preset);
 }
@@ -57,4 +57,4 @@ $tmpl->assign( 'subadmins', $subadmins);
 $tmpl->assign( 'numofgroups', count($accessiblegroups));
 $tmpl->assign( 'quota_preset', $quotaPreset);
 $tmpl->assign( 'default_quota', $defaultQuota);
-$tmpl->printPage();
\ No newline at end of file
+$tmpl->printPage();