Merge branch 'master' into ocs_api

Conflicts:
	l10n/templates/core.pot
	l10n/templates/files.pot
	l10n/templates/files_encryption.pot
	l10n/templates/files_external.pot
	l10n/templates/files_sharing.pot
	l10n/templates/files_versions.pot
	l10n/templates/lib.pot
	l10n/templates/settings.pot
	l10n/templates/user_ldap.pot
	l10n/templates/user_webdavauth.pot

67 files changed, 1226 insertions, 1221 deletions

diff --git a/settings/admin.php b/settings/admin.php
index 0cf449ef2ba..04905391138 100755
--- a/settings/admin.php
+++ b/settings/admin.php
@@ -30,6 +30,7 @@ $tmpl->assign('entries', $entries);
 $tmpl->assign('entriesremain', $entriesremain);
 $tmpl->assign('htaccessworking', $htaccessworking);
 $tmpl->assign('internetconnectionworking', OC_Util::isinternetconnectionworking());
+$tmpl->assign('islocaleworking', OC_Util::issetlocaleworking());
 $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'));
diff --git a/settings/css/settings.css b/settings/css/settings.css
index 560862fa12f..4d0f6efd2c8 100644
--- a/settings/css/settings.css
+++ b/settings/css/settings.css
@@ -39,7 +39,7 @@ div.quota-select-wrapper { position: relative; }
 select.quota { position:absolute; left:0; top:0; width:10em; }
 select.quota-user { position:relative; left:0; top:0; width:10em; }
 input.quota-other { display:none; position:absolute; left:0.1em; top:0.1em; width:7em; border:none; box-shadow:none; }
-div.quota>span { position:absolute; right:0em; white-space:nowrap; top: 0.7em }
+div.quota>span { position:absolute; right:0; white-space:nowrap; top:.7em; color:#888; text-shadow:0 1px 0 #fff; }
 select.quota.active { background: #fff; }
 
 /* APPS */
@@ -68,3 +68,6 @@ 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; }
+
+/* HELP */
+.pressed {background-color:#DDD;}
diff --git a/settings/help.php b/settings/help.php
index 69a5ec9c146..cd3d615425c 100644
--- a/settings/help.php
+++ b/settings/help.php
@@ -12,15 +12,25 @@ OC_App::loadApps();
 OC_Util::addStyle( "settings", "settings" );
 OC_App::setActiveNavigationEntry( "help" );
 
-$pagesize=7;
-if(isset($_GET['page'])) $page=$_GET['page']; else $page=0;
-$kbe=OC_OCSClient::getKnownledgebaseEntries($page, $pagesize);
-$totalitems=$kbe['totalitems'];
-unset($kbe['totalitems']);
-$pagecount=ceil($totalitems/$pagesize);
+
+if(isset($_GET['mode']) and $_GET['mode']=='admin') {
+	$url=OC_Helper::linkToAbsolute( 'core', 'doc/admin' );
+	$style1='';
+	$style2=' pressed';
+}else{
+	$url=OC_Helper::linkToAbsolute( 'core', 'doc/user' );
+	$style1=' pressed';
+	$style2='';
+}
+
+$url1=OC_Helper::linkToRoute( "settings_help" ).'?mode=user';
+$url2=OC_Helper::linkToRoute( "settings_help" ).'?mode=admin';
 
 $tmpl = new OC_Template( "settings", "help", "user" );
-$tmpl->assign( "kbe", $kbe );
-$tmpl->assign( "pagecount", $pagecount );
-$tmpl->assign( "page", $page );
+$tmpl->assign( "admin", OC_Group::inGroup(OC_User::getUser(), 'admin') );
+$tmpl->assign( "url", $url );
+$tmpl->assign( "url1", $url1 );
+$tmpl->assign( "url2", $url2 );
+$tmpl->assign( "style1", $style1 );
+$tmpl->assign( "style2", $style2 );
 $tmpl->printPage();
diff --git a/settings/js/users.js b/settings/js/users.js
index f148a43a480..b0e30feb80c 100644
--- a/settings/js/users.js
+++ b/settings/js/users.js
@@ -4,405 +4,413 @@
  * See the COPYING-README file.
  */
 
-var UserList={
-	useUndo:true,
-	
-	/**
-	 * @brief Initiate user deletion process in UI
-	 * @param string uid the user ID to be deleted
-	 *
-	 * Does not actually delete the user; it sets them for
-	 * deletion when the current page is unloaded, at which point 
-	 * finishDelete() completes the process. This allows for 'undo'.
-	 */
-	do_delete:function( uid ) {
-		if (typeof UserList.deleteUid !== 'undefined') {
-			//Already a user in the undo queue
-			UserList.finishDelete(null);
-		}
-		UserList.deleteUid = uid;
-		
-		// Set undo flag
-		UserList.deleteCanceled = false;
-		
-		// Provide user with option to undo
-		$('#notification').html(t('users', 'deleted')+' '+uid+'<span class="undo">'+t('users', 'undo')+'</span>');
-		$('#notification').data('deleteuser',true);
-		$('#notification').fadeIn();
-	},
-	
-	/**
-	 * @brief Delete a user via ajax
-	 * @param bool ready whether to use ready() upon completion
-	 *
-	 * Executes deletion via ajax of user identified by property deleteUid 
-	 * if 'undo' has not been used.  Completes the user deletion procedure 
-	 * and reflects success in UI.
-	 */
-	finishDelete:function( ready ){
-		
-		// Check deletion has not been undone
-		if( !UserList.deleteCanceled && UserList.deleteUid ){
-			
-			// Delete user via ajax
-			$.ajax({
-				type: 'POST',
-				url: OC.filePath('settings', 'ajax', 'removeuser.php'),
-				async: false,
-				data: { username: UserList.deleteUid },
-				success: function(result) {
-					if (result.status == 'success') {
-						// Remove undo option, & remove user from table
-						$('#notification').fadeOut();
-						$('tr').filterAttr('data-uid', UserList.deleteUid).remove();
-						UserList.deleteCanceled = true;
-						if (ready) {
-							ready();
-						}
-					} else {
-						oc.dialogs.alert(result.data.message, t('settings', 'Unable to remove user'));
-					}
-				}
-			});
-		}
-	},
+var UserList = {
+    useUndo:true,
 
-	add:function(username, groups, subadmin, quota, sort) {
-		var tr = $('tbody tr').first().clone();
-		tr.attr('data-uid', username);
-		tr.find('td.name').text(username);
-		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') + '">').attr('data-username', username).attr('data-user-groups', groups).attr('data-subadmin', subadmin);
-			tr.find('td.subadmins').empty();
-		}
-		var allGroups = String($('#content table').attr('data-groups')).split(', ');
-		$.each(allGroups, function(i, group) {
-			groupsSelect.append($('<option value="'+group+'">'+group+'</option>'));
-			if (typeof subadminSelect !== 'undefined' && group != 'admin') {
-				subadminSelect.append($('<option value="'+group+'">'+group+'</option>'));
-			}
-		});
-		tr.find('td.groups').append(groupsSelect);
-		UserList.applyMultiplySelect(groupsSelect);
-		if (tr.find('td.subadmins').length > 0) {
-			tr.find('td.subadmins').append(subadminSelect);
-			UserList.applyMultiplySelect(subadminSelect);
-		}
-		if (tr.find('td.remove img').length == 0 && OC.currentUser != username) {
-			var rm_img = $('<img>', {
-				class: 'svg action',
-				src: OC.imagePath('core','actions/delete'),
-				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();
-		}
-		var quotaSelect = tr.find('select.quota-user');
-		if (quota == 'default') {
-			quotaSelect.find('option').attr('selected', null);
-			quotaSelect.find('option').first().attr('selected', 'selected');
-			quotaSelect.data('previous', 'default');
-		} else {
-			if (quotaSelect.find('option[value="'+quota+'"]').length > 0) {
-				quotaSelect.find('option[value="'+quota+'"]').attr('selected', 'selected');
-			} else {
-				quotaSelect.append('<option value="'+quota+'" selected="selected">'+quota+'</option>');
-			}
-		}
-		var added = false;
-		if (sort) {
-			username = username.toLowerCase();
-			$('tbody tr').each(function() {
-				if (username < $(this).attr('data-uid').toLowerCase()) {
-					$(tr).insertBefore($(this));
-					added = true;
-					return false;
-				}
-			});
-		} 
-		if (!added) {
-			$(tr).appendTo('tbody');
-		}
-		return tr;
-	},
+    /**
+     * @brief Initiate user deletion process in UI
+     * @param string uid the user ID to be deleted
+     *
+     * Does not actually delete the user; it sets them for
+     * deletion when the current page is unloaded, at which point
+     * finishDelete() completes the process. This allows for 'undo'.
+     */
+    do_delete:function (uid) {
+        if (typeof UserList.deleteUid !== 'undefined') {
+            //Already a user in the undo queue
+            UserList.finishDelete(null);
+        }
+        UserList.deleteUid = uid;
 
-	update:function() {
-		if (typeof UserList.offset === 'undefined') {
-			UserList.offset = $('tbody tr').length;
-		}
-		$.get(OC.Router.generate('settings_ajax_userlist', { offset: UserList.offset }), function(result) {
-			if (result.status === 'success') {
-				$.each(result.data, function(index, user) {
-					var tr = UserList.add(user.name, user.groups, user.subadmin, user.quota, false);
-					UserList.offset++;
-					if (index == 9) {
-						$(tr).bind('inview', function(event, isInView, visiblePartX, visiblePartY) {
-							$(this).unbind(event);
-							UserList.update();
-						});
-					}
-				});
-			}
-		});
-	},
+        // Set undo flag
+        UserList.deleteCanceled = false;
 
-	applyMultiplySelect:function(element) {
-		var checked=[];
-		var user=element.attr('data-username');
-		if($(element).attr('class') == 'groupsselect'){
-			if(element.data('userGroups')){
-				checked=String(element.data('userGroups')).split(', ');
-			}
-			if(user){
-				var checkHandeler=function(group){
-					if(user==OC.currentUser && group=='admin'){
-						return false;
-					}
-					if(!isadmin && checked.length == 1 && checked[0] == group){
-						return false;
-					}
-					$.post(
-						OC.filePath('settings','ajax','togglegroups.php'),
-						{
-							username:user,
-							group:group
-						},
-						function(){}
-					);
-				};
-			}else{
-				checkHandeler=false;
-			}
-			var addGroup = function(group) {
-				$('select[multiple]').each(function(index, element) {
-					if ($(element).find('option[value="'+group +'"]').length == 0) {
-						$(element).append('<option value="'+group+'">'+group+'</option>');
-					}
-				})
-			};
-			var label;
-			if(isadmin){
-				label = t('core', 'add group');
-			}else{
-				label = null;
-			}
-			element.multiSelect({
-				createCallback:addGroup,
-				createText:label,
-				checked:checked,
-				oncheck:checkHandeler,
-				onuncheck:checkHandeler,
-				minWidth: 100,
-			});
-		}
-		if($(element).attr('class') == 'subadminsselect'){
-			if(element.data('subadmin')){
-				checked=String(element.data('subadmin')).split(', ');
-			}
-			var checkHandeler=function(group){
-				if(group=='admin'){
-					return false;
-				}
-				$.post(
-					OC.filePath('settings','ajax','togglesubadmins.php'),
-					{
-						username:user,
-						group:group
-					},
-					function(){}
-				);
-			};
-			
-			var addSubAdmin = function(group) {
-				$('select[multiple]').each(function(index, element) {
-					if ($(element).find('option[value="'+group +'"]').length == 0) {
-						$(element).append('<option value="'+group+'">'+group+'</option>');
-					}
-				})
-			};
-			element.multiSelect({
-				createCallback:addSubAdmin,
-				createText:null,
-				checked:checked,
-				oncheck:checkHandeler,
-				onuncheck:checkHandeler,
-				minWidth: 100,
-			});
-		}
-	}
+        // Provide user with option to undo
+        $('#notification').html(t('users', 'deleted') + ' ' + uid + '<span class="undo">' + t('users', 'undo') + '</span>');
+        $('#notification').data('deleteuser', true);
+        $('#notification').fadeIn();
+    },
+
+    /**
+     * @brief Delete a user via ajax
+     * @param bool ready whether to use ready() upon completion
+     *
+     * Executes deletion via ajax of user identified by property deleteUid
+     * if 'undo' has not been used.  Completes the user deletion procedure
+     * and reflects success in UI.
+     */
+    finishDelete:function (ready) {
+
+        // Check deletion has not been undone
+        if (!UserList.deleteCanceled && UserList.deleteUid) {
+
+            // Delete user via ajax
+            $.ajax({
+                type:'POST',
+                url:OC.filePath('settings', 'ajax', 'removeuser.php'),
+                async:false,
+                data:{ username:UserList.deleteUid },
+                success:function (result) {
+                    if (result.status == 'success') {
+                        // Remove undo option, & remove user from table
+                        $('#notification').fadeOut();
+                        $('tr').filterAttr('data-uid', UserList.deleteUid).remove();
+                        UserList.deleteCanceled = true;
+                        if (ready) {
+                            ready();
+                        }
+                    } else {
+                        oc.dialogs.alert(result.data.message, t('settings', 'Unable to remove user'));
+                    }
+                }
+            });
+        }
+    },
+
+    add:function (username, groups, subadmin, quota, sort) {
+        var tr = $('tbody tr').first().clone();
+        tr.attr('data-uid', username);
+        tr.find('td.name').text(username);
+        var groupsSelect = $('<select multiple="multiple" class="groupsselect" data-placehoder="Groups" title="' + t('settings', 'Groups') + '"></select>').attr('data-username', username).attr('data-user-groups', groups);
+        tr.find('td.groups').empty();
+        if (tr.find('td.subadmins').length > 0) {
+            var subadminSelect = $('<select multiple="multiple" class="subadminsselect" data-placehoder="subadmins" title="' + t('settings', 'Group Admin') + '">').attr('data-username', username).attr('data-user-groups', groups).attr('data-subadmin', subadmin);
+            tr.find('td.subadmins').empty();
+        }
+        var allGroups = String($('#content table').attr('data-groups')).split(', ');
+        $.each(allGroups, function (i, group) {
+            groupsSelect.append($('<option value="' + group + '">' + group + '</option>'));
+            if (typeof subadminSelect !== 'undefined' && group != 'admin') {
+                subadminSelect.append($('<option value="' + group + '">' + group + '</option>'));
+            }
+        });
+        tr.find('td.groups').append(groupsSelect);
+        UserList.applyMultiplySelect(groupsSelect);
+        if (tr.find('td.subadmins').length > 0) {
+            tr.find('td.subadmins').append(subadminSelect);
+            UserList.applyMultiplySelect(subadminSelect);
+        }
+        if (tr.find('td.remove img').length == 0 && OC.currentUser != username) {
+            var rm_img = $('<img>', {
+                class:'svg action',
+                src:OC.imagePath('core', 'actions/delete')
+            });
+            var rm_link = $('<a>', { class:'action delete', href:'#', 'original-title':t('settings', 'Delete')}).append(rm_img);
+            tr.find('td.remove').append(rm_link);
+        } else if (OC.currentUser == username) {
+            tr.find('td.remove a').remove();
+        }
+        var quotaSelect = tr.find('select.quota-user');
+        if (quota == 'default') {
+            quotaSelect.find('option').attr('selected', null);
+            quotaSelect.find('option').first().attr('selected', 'selected');
+            quotaSelect.data('previous', 'default');
+        } else {
+            if (quotaSelect.find('option[value="' + quota + '"]').length > 0) {
+                quotaSelect.find('option[value="' + quota + '"]').attr('selected', 'selected');
+            } else {
+                quotaSelect.append('<option value="' + quota + '" selected="selected">' + quota + '</option>');
+            }
+        }
+        var added = false;
+        if (sort) {
+            username = username.toLowerCase();
+            $('tbody tr').each(function () {
+                if (username < $(this).attr('data-uid').toLowerCase()) {
+                    $(tr).insertBefore($(this));
+                    added = true;
+                    return false;
+                }
+            });
+        }
+        if (!added) {
+            $(tr).appendTo('tbody');
+        }
+        return tr;
+    },
+
+    update:function () {
+        if (typeof UserList.offset === 'undefined') {
+            UserList.offset = $('tbody tr').length;
+        }
+        $.get(OC.Router.generate('settings_ajax_userlist', { offset:UserList.offset }), function (result) {
+            if (result.status === 'success') {
+                $.each(result.data, function (index, user) {
+                    var tr = UserList.add(user.name, user.groups, user.subadmin, user.quota, false);
+                    UserList.offset++;
+                    if (index == 9) {
+                        $(tr).bind('inview', function (event, isInView, visiblePartX, visiblePartY) {
+                            $(this).unbind(event);
+                            UserList.update();
+                        });
+                    }
+                });
+            }
+        });
+    },
+
+    applyMultiplySelect:function (element) {
+        var checked = [];
+        var user = element.attr('data-username');
+        if ($(element).attr('class') == 'groupsselect') {
+            if (element.data('userGroups')) {
+                checked = String(element.data('userGroups')).split(', ');
+            }
+            if (user) {
+                var checkHandeler = function (group) {
+                    if (user == OC.currentUser && group == 'admin') {
+                        return false;
+                    }
+                    if (!isadmin && checked.length == 1 && checked[0] == group) {
+                        return false;
+                    }
+                    $.post(
+                        OC.filePath('settings', 'ajax', 'togglegroups.php'),
+                        {
+                            username:user,
+                            group:group
+                        },
+                        function () {
+                        }
+                    );
+                };
+            } else {
+                checkHandeler = false;
+            }
+            var addGroup = function (group) {
+                $('select[multiple]').each(function (index, element) {
+                    if ($(element).find('option[value="' + group + '"]').length == 0) {
+                        $(element).append('<option value="' + group + '">' + group + '</option>');
+                    }
+                })
+            };
+            var label;
+            if (isadmin) {
+                label = t('settings', 'add group');
+            } else {
+                label = null;
+            }
+            element.multiSelect({
+                createCallback:addGroup,
+                createText:label,
+                checked:checked,
+                oncheck:checkHandeler,
+                onuncheck:checkHandeler,
+                minWidth:100,
+            });
+        }
+        if ($(element).attr('class') == 'subadminsselect') {
+            if (element.data('subadmin')) {
+                checked = String(element.data('subadmin')).split(', ');
+            }
+            var checkHandeler = function (group) {
+                if (group == 'admin') {
+                    return false;
+                }
+                $.post(
+                    OC.filePath('settings', 'ajax', 'togglesubadmins.php'),
+                    {
+                        username:user,
+                        group:group
+                    },
+                    function () {
+                    }
+                );
+            };
+
+            var addSubAdmin = function (group) {
+                $('select[multiple]').each(function (index, element) {
+                    if ($(element).find('option[value="' + group + '"]').length == 0) {
+                        $(element).append('<option value="' + group + '">' + group + '</option>');
+                    }
+                })
+            };
+            element.multiSelect({
+                createCallback:addSubAdmin,
+                createText:null,
+                checked:checked,
+                oncheck:checkHandeler,
+                onuncheck:checkHandeler,
+                minWidth:100,
+            });
+        }
+    }
 }
 
-$(document).ready(function(){
+$(document).ready(function () {
+
+    $('tbody tr:last').bind('inview', function (event, isInView, visiblePartX, visiblePartY) {
+        UserList.update();
+    });
+
+    function setQuota(uid, quota, ready) {
+        $.post(
+            OC.filePath('settings', 'ajax', 'setquota.php'),
+            {username:uid, quota:quota},
+            function (result) {
+                if (ready) {
+                    ready(result.data.quota);
+                }
+            }
+        );
+    }
+
+
+    $('select[multiple]').each(function (index, element) {
+        UserList.applyMultiplySelect($(element));
+    });
+
+    $('td.remove>a').live('click', function (event) {
+        var row = $(this).parent().parent();
+        var uid = $(row).attr('data-uid');
+        $(row).hide();
+        // Call function for handling delete/undo
+        UserList.do_delete(uid);
+    });
+
+    $('td.password>img').live('click', function (event) {
+        event.stopPropagation();
+        var img = $(this);
+        var uid = img.parent().parent().attr('data-uid');
+        var input = $('<input type="password">');
+        img.css('display', 'none');
+        img.parent().children('span').replaceWith(input);
+        input.focus();
+        input.keypress(function (event) {
+            if (event.keyCode == 13) {
+                if ($(this).val().length > 0) {
+                    $.post(
+                        OC.filePath('settings', 'ajax', 'changepassword.php'),
+                        {username:uid, password:$(this).val()},
+                        function (result) {
+                        }
+                    );
+                    input.blur();
+                } else {
+                    input.blur();
+                }
+            }
+        });
+        input.blur(function () {
+            $(this).replaceWith($('<span>●●●●●●●</span>'));
+            img.css('display', '');
+        });
+    });
+    $('td.password').live('click', function (event) {
+        $(this).children('img').click();
+    });
+
+    $('select.quota, select.quota-user').live('change', function () {
+        var select = $(this);
+        var uid = $(this).parent().parent().parent().attr('data-uid');
+        var quota = $(this).val();
+        var other = $(this).next();
+        if (quota != 'other') {
+            other.hide();
+            select.data('previous', quota);
+            setQuota(uid, quota);
+        } else {
+            other.show();
+            select.addClass('active');
+            other.focus();
+        }
+    });
+    $('select.quota, select.quota-user').each(function (i, select) {
+        $(select).data('previous', $(select).val());
+    })
+
+    $('input.quota-other').live('change', function () {
+        var uid = $(this).parent().parent().parent().attr('data-uid');
+        var quota = $(this).val();
+        var select = $(this).prev();
+        var other = $(this);
+        if (quota) {
+            setQuota(uid, quota, function (quota) {
+                select.children().attr('selected', null);
+                var existingOption = select.children().filter(function (i, option) {
+                    return ($(option).val() == quota);
+                });
+                if (existingOption.length) {
+                    existingOption.attr('selected', 'selected');
+                } else {
+                    var option = $('<option/>');
+                    option.attr('selected', 'selected').attr('value', quota).text(quota);
+                    select.children().last().before(option);
+                }
+                select.val(quota);
+                select.removeClass('active');
+                other.val(null);
+                other.hide();
+            });
+        } else {
+            var previous = select.data('previous');
+            select.children().attr('selected', null);
+            select.children().each(function (i, option) {
+                if ($(option).val() == previous) {
+                    $(option).attr('selected', 'selected');
+                }
+            });
+            select.removeClass('active');
+            other.hide();
+        }
+    });
 
-	$('tbody tr:last').bind('inview', function(event, isInView, visiblePartX, visiblePartY) {
-		UserList.update();
-	});
+    $('input.quota-other').live('blur', function () {
+        $(this).change();
+    })
 
-	function setQuota(uid,quota,ready){
-		$.post(
-			OC.filePath('settings','ajax','setquota.php'),
-			{username:uid,quota:quota},
-			function(result){
-				if(ready){
-					ready(result.data.quota);
-				}
-			}
-		);
-	}
-	
-	
-	$('select[multiple]').each(function(index,element){
-		UserList.applyMultiplySelect($(element));
-	});
-	
-	$('td.remove>a').live('click',function(event){
-		var row = $(this).parent().parent();
-		var uid = $(row).attr('data-uid');
-		$(row).hide();
-		// Call function for handling delete/undo
-		UserList.do_delete(uid);
-	});
-	
-	$('td.password>img').live('click',function(event){
-		event.stopPropagation();
-		var img=$(this);
-		var uid=img.parent().parent().attr('data-uid');
-		var input=$('<input type="password">');
-		img.css('display','none');
-		img.parent().children('span').replaceWith(input);
-		input.focus();
-		input.keypress(function(event) {
-			if(event.keyCode == 13) {
-				if($(this).val().length>0){
-					$.post(
-						OC.filePath('settings','ajax','changepassword.php'),
-						{username:uid,password:$(this).val()},
-						function(result){}
-					);
-					input.blur();
-				}else{
-					input.blur();
-				}
-			}
-		});
-		input.blur(function(){
-			$(this).replaceWith($('<span>●●●●●●●</span>'));
-			img.css('display','');
-		});
-	});
-	$('td.password').live('click',function(event){
-		$(this).children('img').click();
-	});
-	
-	$('select.quota, select.quota-user').live('change',function(){
-		var select=$(this);
-		var uid=$(this).parent().parent().parent().attr('data-uid');
-		var quota=$(this).val();
-		var other=$(this).next();
-		if(quota!='other'){
-			other.hide();
-			select.data('previous',quota);
-			setQuota(uid,quota);
-		}else{
-			other.show();
-			select.addClass('active');
-			other.focus();
-		}
-	});
-	$('select.quota, select.quota-user').each(function(i,select){
-		$(select).data('previous',$(select).val());
-	})
-	
-	$('input.quota-other').live('change',function(){
-		var uid=$(this).parent().parent().parent().attr('data-uid');
-		var quota=$(this).val();
-		var select=$(this).prev();
-		var other=$(this);
-		if(quota){
-			setQuota(uid,quota,function(quota){
-				select.children().attr('selected',null);
-				var existingOption=select.children().filter(function(i,option){
-					return ($(option).val()==quota);
-				});
-				if(existingOption.length){
-					existingOption.attr('selected','selected');
-				}else{
-					var option=$('<option/>');
-					option.attr('selected','selected').attr('value',quota).text(quota);
-					select.children().last().before(option);
-				}
-				select.val(quota);
-				select.removeClass('active');
-				other.val(null);
-				other.hide();
-			});
-		}else{
-			var previous=select.data('previous');
-			select.children().attr('selected',null);
-			select.children().each(function(i,option){
-				if($(option).val()==previous){
-					$(option).attr('selected','selected');
-				}
-			});
-			select.removeClass('active');
-			other.hide();
-		}
-	});
-	
-	$('input.quota-other').live('blur',function(){
-		$(this).change();
-	})
-	
-	$('#newuser').submit(function(event){
-		event.preventDefault();
-		var username=$('#newusername').val();
-		var password=$('#newuserpassword').val();
-		if($('#content table tbody tr').filterAttr('data-uid',username).length>0){
-			OC.dialogs.alert('The username is already being used', 'Error creating user');
-			return;
-		}
-		if($.trim(username) == '') {
-			OC.dialogs.alert('A valid username must be provided', 'Error creating user');
-			return false;
-		}
-		if($.trim(password) == '') {
-			OC.dialogs.alert('A valid password must be provided', 'Error creating user');
-			return false;
-		}
-		var groups=$('#newusergroups').prev().children('div').data('settings').checked;
-		$('#newuser').get(0).reset();
-		$.post(
-			OC.filePath('settings','ajax','createuser.php'),
-			{
-				username:username,
-				password:password,
-				groups:groups,
-			},
-			function(result){
-				if(result.status!='success'){
-					OC.dialogs.alert(result.data.message, 'Error creating user');
-				} else {
-					UserList.add(username, result.data.groups, null, 'default', true);
-				}
-			}
-		);
-	});
-	// Handle undo notifications
-	$('#notification').hide();
-	$('#notification .undo').live('click', function() {
-		if($('#notification').data('deleteuser')) {
-			$('tbody tr').filterAttr('data-uid', UserList.deleteUid).show();
-			UserList.deleteCanceled=true;
-		}
-		$('#notification').fadeOut();
-	});
-	UserList.useUndo=('onbeforeunload' in window)
-	$(window).bind('beforeunload', function (){
-		UserList.finishDelete(null);
-	});
+    $('#newuser').submit(function (event) {
+        event.preventDefault();
+        var username = $('#newusername').val();
+        var password = $('#newuserpassword').val();
+        if ($('#content table tbody tr').filterAttr('data-uid', username).length > 0) {
+            OC.dialogs.alert(
+                t('settings', 'The username is already being used'),
+                t('settings', 'Error creating user'));
+            return;
+        }
+        if ($.trim(username) == '') {
+            OC.dialogs.alert(
+                t('settings', 'A valid username must be provided'),
+                t('settings', 'Error creating user'));
+            return false;
+        }
+        if ($.trim(password) == '') {
+            OC.dialogs.alert(
+                t('settings', 'A valid password must be provided'),
+                t('settings', 'Error creating user'));
+            return false;
+        }
+        var groups = $('#newusergroups').prev().children('div').data('settings').checked;
+        $('#newuser').get(0).reset();
+        $.post(
+            OC.filePath('settings', 'ajax', 'createuser.php'),
+            {
+                username:username,
+                password:password,
+                groups:groups,
+            },
+            function (result) {
+                if (result.status != 'success') {
+                    OC.dialogs.alert(result.data.message,
+                        t('settings', 'Error creating user'));
+                } else {
+                    UserList.add(username, result.data.groups, null, 'default', true);
+                }
+            }
+        );
+    });
+    // Handle undo notifications
+    $('#notification').hide();
+    $('#notification .undo').live('click', function () {
+        if ($('#notification').data('deleteuser')) {
+            $('tbody tr').filterAttr('data-uid', UserList.deleteUid).show();
+            UserList.deleteCanceled = true;
+        }
+        $('#notification').fadeOut();
+    });
+    UserList.useUndo = ('onbeforeunload' in window)
+    $(window).bind('beforeunload', function () {
+        UserList.finishDelete(null);
+    });
 });
diff --git a/settings/l10n/ar.php b/settings/l10n/ar.php
index 662e69bbfc5..d16e6ad10ea 100644
--- a/settings/l10n/ar.php
+++ b/settings/l10n/ar.php
@@ -1,17 +1,41 @@
 <?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" => "تم تغيير اللغة",
+"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" => "إختر تطبيقاً",
-"Documentation" => "التوثيق",
-"Ask a question" => "إسأل سؤال",
-"Problems connecting to help database." => "الاتصال بقاعدة بيانات المساعدة لم يتم بنجاح",
-"Go there manually." => "إذهب هنالك بنفسك",
-"Answer" => "الجواب",
-"Download" => "انزال",
+"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>",
+"User Documentation" => "كتاب توثيق المستخدم",
+"Administrator Documentation" => "كتاب توثيق المدير",
+"Online Documentation" => "توثيق متوفر على الشبكة",
+"Forum" => "منتدى",
+"Bugtracker" => "تعقب علة",
+"Commercial Support" => "دعم تجاري",
+"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "تم إستهلاك <strong>%s</strong> من المتوفر <strong>%s</strong>",
+"Clients" => "الزبائن",
+"Download Desktop Clients" => "تحميل عملاء سطح المكتب",
+"Download Android Client" => "تحميل عميل آندرويد",
+"Download iOS Client" => "تحميل عميل آي أو أس",
+"Password" => "كلمات السر",
+"Your password was changed" => "لقد تم تغيير كلمة السر",
 "Unable to change your password" => "لم يتم تعديل كلمة السر بنجاح",
 "Current password" => "كلمات السر الحالية",
 "New password" => "كلمات سر جديدة",
@@ -22,12 +46,14 @@
 "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 داخل نظام الملفات ",
+"WebDAV" => "WebDAV",
+"Use this address to connect to your ownCloud in your file manager" => "إستخدم هذا العنوان للإتصال بـ ownCloud في مدير الملفات",
+"Version" => "إصدار",
+"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "طوّر من قبل <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud مجتمع</a>, الـ <a href=\"https://github.com/owncloud\" target=\"_blank\">النص المصدري</a> مرخص بموجب <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">رخصة أفيرو العمومية</abbr></a>.",
 "Name" => "الاسم",
-"Password" => "كلمات السر",
 "Groups" => "مجموعات",
 "Create" => "انشئ",
 "Other" => "شيء آخر",
-"Quota" => "حصه",
+"Group Admin" => "مدير المجموعة",
 "Delete" => "حذف"
 );
diff --git a/settings/l10n/bg_BG.php b/settings/l10n/bg_BG.php
index 5a2d882581f..89066d2baa9 100644
--- a/settings/l10n/bg_BG.php
+++ b/settings/l10n/bg_BG.php
@@ -9,12 +9,8 @@
 "Enable" => "Включване",
 "Saving..." => "Записване...",
 "Select an App" => "Изберете програма",
-"Documentation" => "Документация",
-"Ask a question" => "Задайте въпрос",
-"Problems connecting to help database." => "Проблеми при свързване с помощната база",
-"Go there manually." => "Отидете ръчно.",
-"Answer" => "Отговор",
-"Download" => "Изтегляне",
+"Clients" => "Клиенти",
+"Password" => "Парола",
 "Unable to change your password" => "Невъзможна промяна на паролата",
 "Current password" => "Текуща парола",
 "New password" => "Нова парола",
@@ -25,13 +21,9 @@
 "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 във файловия мениджър",
 "Name" => "Име",
-"Password" => "Парола",
 "Groups" => "Групи",
 "Create" => "Ново",
-"Default Quota" => "Квота по подразбиране",
 "Other" => "Друго",
-"Quota" => "Квота",
 "Delete" => "Изтриване"
 );
diff --git a/settings/l10n/ca.php b/settings/l10n/ca.php
index eff84e12de7..6a354211254 100644
--- a/settings/l10n/ca.php
+++ b/settings/l10n/ca.php
@@ -23,15 +23,18 @@
 "Select an App" => "Seleccioneu una aplicació",
 "See application page at apps.owncloud.com" => "Mireu la pàgina d'aplicacions a apps.owncloud.com",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-propietat de <span class=\"author\"></span>",
-"Documentation" => "Documentació",
-"Managing Big Files" => "Gestió de fitxers grans",
-"Ask a question" => "Feu una pregunta",
-"Problems connecting to help database." => "Problemes per connectar amb la base de dades d'ajuda.",
-"Go there manually." => "Vés-hi manualment.",
-"Answer" => "Resposta",
+"User Documentation" => "Documentació d'usuari",
+"Administrator Documentation" => "Documentació d'administrador",
+"Online Documentation" => "Documentació en línia",
+"Forum" => "Fòrum",
+"Bugtracker" => "Seguiment d'errors",
+"Commercial Support" => "Suport comercial",
 "You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Heu utilitzat <strong>%s</strong> d'un total disponible de <strong>%s</strong>",
-"Desktop and Mobile Syncing Clients" => "Clients de sincronització d'escriptori i de mòbil",
-"Download" => "Baixada",
+"Clients" => "Clients",
+"Download Desktop Clients" => "Baixa clients d'escriptori",
+"Download Android Client" => " Baixa el client per Android",
+"Download iOS Client" => "Baixa el client per iOS",
+"Password" => "Contrasenya",
 "Your password was changed" => "La seva contrasenya s'ha canviat",
 "Unable to change your password" => "No s'ha pogut canviar la contrasenya",
 "Current password" => "Contrasenya actual",
@@ -43,15 +46,14 @@
 "Fill in an email address to enable password recovery" => "Ompliu el correu electrònic per activar la recuperació de contrasenya",
 "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",
+"WebDAV" => "WebDAV",
+"Use this address to connect to your ownCloud in your file manager" => "Useu aquesta adreça per connectar amb ownCloud des del gestor de fitxers",
+"Version" => "Versió",
 "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Desenvolupat per la <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunitat ownCloud</a>, el <a href=\"https://github.com/owncloud\" target=\"_blank\">codi font</a> té llicència <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
 "Name" => "Nom",
-"Password" => "Contrasenya",
 "Groups" => "Grups",
 "Create" => "Crea",
-"Default Quota" => "Quota per defecte",
 "Other" => "Altre",
 "Group Admin" => "Grup Admin",
-"Quota" => "Quota",
 "Delete" => "Suprimeix"
 );
diff --git a/settings/l10n/cs_CZ.php b/settings/l10n/cs_CZ.php
index ee30583b046..d86376d5672 100644
--- a/settings/l10n/cs_CZ.php
+++ b/settings/l10n/cs_CZ.php
@@ -23,15 +23,18 @@
 "Select an App" => "Vyberte aplikaci",
 "See application page at apps.owncloud.com" => "Více na stránce s aplikacemi na apps.owncloud.com",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licencováno <span class=\"author\"></span>",
-"Documentation" => "Dokumentace",
-"Managing Big Files" => "Správa velkých souborů",
-"Ask a question" => "Zeptat se",
-"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ěď",
+"User Documentation" => "Uživatelská dokumentace",
+"Administrator Documentation" => "Dokumentace správce",
+"Online Documentation" => "Online dokumentace",
+"Forum" => "Fórum",
+"Bugtracker" => "Bugtracker",
+"Commercial Support" => "Placená podpora",
 "You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Používáte <strong>%s</strong> z <strong>%s</strong> dostupných",
-"Desktop and Mobile Syncing Clients" => "Klienti pro synchronizaci",
-"Download" => "Stáhnout",
+"Clients" => "Klienti",
+"Download Desktop Clients" => "Stáhnout klienty pro počítač",
+"Download Android Client" => "Stáhnout klienta pro android",
+"Download iOS Client" => "Stáhnout klienta pro iOS",
+"Password" => "Heslo",
 "Your password was changed" => "Vaše heslo bylo změněno",
 "Unable to change your password" => "Vaše heslo nelze změnit",
 "Current password" => "Současné heslo",
@@ -43,15 +46,18 @@
 "Fill in an email address to enable password recovery" => "Pro povolení změny hesla vyplňte adresu e-mailu",
 "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ů",
+"WebDAV" => "WebDAV",
+"Use this address to connect to your ownCloud in your file manager" => "Použijte tuto adresu pro připojení k vašemu ownCloud skrze správce souborů",
+"Version" => "Verze",
 "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Vyvinuto <a href=\"http://ownCloud.org/contact\" target=\"_blank\">komunitou ownCloud</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">zdrojový kód</a> je licencován pod <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
 "Name" => "Jméno",
-"Password" => "Heslo",
 "Groups" => "Skupiny",
 "Create" => "Vytvořit",
-"Default Quota" => "Výchozí kvóta",
+"Default Storage" => "Výchozí úložiště",
+"Unlimited" => "Neomezeně",
 "Other" => "Jiná",
 "Group Admin" => "Správa skupiny",
-"Quota" => "Kvóta",
+"Storage" => "Úložiště",
+"Default" => "Výchozí",
 "Delete" => "Smazat"
 );
diff --git a/settings/l10n/da.php b/settings/l10n/da.php
index 3d82f6e4a0b..2300b98a2bf 100644
--- a/settings/l10n/da.php
+++ b/settings/l10n/da.php
@@ -11,6 +11,7 @@
 "Authentication error" => "Adgangsfejl",
 "Unable to delete user" => "Bruger kan ikke slettes",
 "Language changed" => "Sprog ændret",
+"Admins can't remove themself from the admin group" => "Administratorer kan ikke fjerne dem selv fra admin gruppen",
 "Unable to add user to group %s" => "Brugeren kan ikke tilføjes til gruppen %s",
 "Unable to remove user from group %s" => "Brugeren kan ikke fjernes fra gruppen %s",
 "Disable" => "Deaktiver",
@@ -22,14 +23,18 @@
 "Select an App" => "Vælg en App",
 "See application page at apps.owncloud.com" => "Se applikationens side på apps.owncloud.com",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licenseret af <span class=\"author\"></span>",
-"Documentation" => "Dokumentation",
-"Managing Big Files" => "Håndter store filer",
-"Ask a question" => "Stil et spørgsmål",
-"Problems connecting to help database." => "Problemer med at forbinde til hjælpe-databasen.",
-"Go there manually." => "Gå derhen manuelt.",
-"Answer" => "Svar",
-"Desktop and Mobile Syncing Clients" => "Synkroniserings programmer for desktop og mobil",
-"Download" => "Download",
+"User Documentation" => "Brugerdokumentation",
+"Administrator Documentation" => "Administrator Dokumentation",
+"Online Documentation" => "Online dokumentation",
+"Forum" => "Forum",
+"Bugtracker" => "Bugtracker",
+"Commercial Support" => "Kommerciel support",
+"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Du har brugt <strong>%s</strong> af den tilgængelige <strong>%s</strong>",
+"Clients" => "Klienter",
+"Download Desktop Clients" => "Hent Desktop Klienter",
+"Download Android Client" => "Hent Android Klient",
+"Download iOS Client" => "Hent iOS Klient",
+"Password" => "Kodeord",
 "Your password was changed" => "Din adgangskode blev ændret",
 "Unable to change your password" => "Ude af stand til at ændre dit kodeord",
 "Current password" => "Nuværende adgangskode",
@@ -41,15 +46,14 @@
 "Fill in an email address to enable password recovery" => "Indtast en emailadresse for at kunne få påmindelse om adgangskode",
 "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",
+"WebDAV" => "WebDAV",
+"Use this address to connect to your ownCloud in your file manager" => "Brug denne adresse til at oprette forbindelse til din ownCloud i din filstyring",
+"Version" => "Version",
 "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Udviklet af <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownClouds community</a>, og <a href=\"https://github.com/owncloud\" target=\"_blank\">kildekoden</a> er underlagt licensen <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
 "Name" => "Navn",
-"Password" => "Kodeord",
 "Groups" => "Grupper",
 "Create" => "Ny",
-"Default Quota" => "Standard kvote",
 "Other" => "Andet",
 "Group Admin" => "Gruppe Administrator",
-"Quota" => "Kvote",
 "Delete" => "Slet"
 );
diff --git a/settings/l10n/de.php b/settings/l10n/de.php
index 33de45a9225..6434d23a5ba 100644
--- a/settings/l10n/de.php
+++ b/settings/l10n/de.php
@@ -23,15 +23,18 @@
 "Select an App" => "Wähle eine Anwendung aus",
 "See application page at apps.owncloud.com" => "Weitere Anwendungen findest Du auf apps.owncloud.com",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-lizenziert von <span class=\"author\"></span>",
-"Documentation" => "Dokumentation",
-"Managing Big Files" => "Große Dateien verwalten",
-"Ask a question" => "Stelle eine Frage",
-"Problems connecting to help database." => "Probleme bei der Verbindung zur Hilfe-Datenbank.",
-"Go there manually." => "Datenbank direkt besuchen.",
-"Answer" => "Antwort",
+"User Documentation" => "Dokumentation für Benutzer",
+"Administrator Documentation" => "Dokumentation für Administratoren",
+"Online Documentation" => "Online-Dokumentation",
+"Forum" => "Forum",
+"Bugtracker" => "Bugtracker",
+"Commercial Support" => "Kommerzieller Support",
 "You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Du verwendest <strong>%s</strong> der verfügbaren <strong>%s<strong>",
-"Desktop and Mobile Syncing Clients" => "Desktop- und mobile Clients für die Synchronisation",
-"Download" => "Download",
+"Clients" => "Kunden",
+"Download Desktop Clients" => "Desktop-Client herunterladen",
+"Download Android Client" => "Android-Client herunterladen",
+"Download iOS Client" => "iOS-Client herunterladen",
+"Password" => "Passwort",
 "Your password was changed" => "Dein Passwort wurde geändert.",
 "Unable to change your password" => "Passwort konnte nicht geändert werden",
 "Current password" => "Aktuelles Passwort",
@@ -43,15 +46,18 @@
 "Fill in an email address to enable password recovery" => "Trage eine E-Mail-Adresse ein, um die Passwort-Wiederherstellung zu aktivieren.",
 "Language" => "Sprache",
 "Help translate" => "Hilf bei der Übersetzung",
-"use this address to connect to your ownCloud in your file manager" => "Verwende diese Adresse, um Deine ownCloud mit Deinem Dateimanager zu verbinden.",
+"WebDAV" => "WebDAV",
+"Use this address to connect to your ownCloud in your file manager" => "Verwende diese Adresse, um Deinen Dateimanager mit Deiner ownCloud zu verbinden",
+"Version" => "Version",
 "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Entwickelt von der <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud-Community</a>, der <a href=\"https://github.com/owncloud\" target=\"_blank\">Quellcode</a> ist unter der <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> lizenziert.",
 "Name" => "Name",
-"Password" => "Passwort",
 "Groups" => "Gruppen",
 "Create" => "Anlegen",
-"Default Quota" => "Standard-Quota",
+"Default Storage" => "Standard-Speicher",
+"Unlimited" => "Unbegrenzt",
 "Other" => "Andere",
 "Group Admin" => "Gruppenadministrator",
-"Quota" => "Quota",
+"Storage" => "Speicher",
+"Default" => "Standard",
 "Delete" => "Löschen"
 );
diff --git a/settings/l10n/de_DE.php b/settings/l10n/de_DE.php
index 9db7cb93c36..10914350d74 100644
--- a/settings/l10n/de_DE.php
+++ b/settings/l10n/de_DE.php
@@ -23,15 +23,18 @@
 "Select an App" => "Wählen Sie eine Anwendung aus",
 "See application page at apps.owncloud.com" => "Weitere Anwendungen finden Sie auf apps.owncloud.com",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-lizenziert von <span class=\"author\"></span>",
-"Documentation" => "Dokumentation",
-"Managing Big Files" => "Große Dateien verwalten",
-"Ask a question" => "Stellen Sie eine Frage",
-"Problems connecting to help database." => "Probleme bei der Verbindung zur Hilfe-Datenbank.",
-"Go there manually." => "Datenbank direkt besuchen.",
-"Answer" => "Antwort",
+"User Documentation" => "Dokumentation für Benutzer",
+"Administrator Documentation" => "Dokumentation für Administratoren",
+"Online Documentation" => "Online-Dokumentation",
+"Forum" => "Forum",
+"Bugtracker" => "Bugtracker",
+"Commercial Support" => "Kommerzieller Support",
 "You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Sie verwenden <strong>%s</strong> der verfügbaren <strong>%s</strong>",
-"Desktop and Mobile Syncing Clients" => "Desktop- und mobile Clients für die Synchronisation",
-"Download" => "Download",
+"Clients" => "Kunden",
+"Download Desktop Clients" => "Desktop-Client herunterladen",
+"Download Android Client" => "Android-Client herunterladen",
+"Download iOS Client" => "iOS-Client herunterladen",
+"Password" => "Passwort",
 "Your password was changed" => "Ihr Passwort wurde geändert.",
 "Unable to change your password" => "Das Passwort konnte nicht geändert werden",
 "Current password" => "Aktuelles Passwort",
@@ -43,15 +46,18 @@
 "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" => "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.",
+"WebDAV" => "WebDAV",
+"Use this address to connect to your ownCloud in your file manager" => "Verwenden Sie diese Adresse, um Ihren Dateimanager mit Ihrer ownCloud zu verbinden",
+"Version" => "Version",
+"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Entwickelt von der <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud-Community</a>. Der <a href=\"https://github.com/owncloud\" target=\"_blank\">Quellcode</a> ist unter der <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> lizenziert.",
 "Name" => "Name",
-"Password" => "Passwort",
 "Groups" => "Gruppen",
 "Create" => "Anlegen",
-"Default Quota" => "Standard-Quota",
+"Default Storage" => "Standard-Speicher",
+"Unlimited" => "Unbegrenzt",
 "Other" => "Andere",
 "Group Admin" => "Gruppenadministrator",
-"Quota" => "Quota",
+"Storage" => "Speicher",
+"Default" => "Standard",
 "Delete" => "Löschen"
 );
diff --git a/settings/l10n/el.php b/settings/l10n/el.php
index ac62453886c..1ecd2e269ff 100644
--- a/settings/l10n/el.php
+++ b/settings/l10n/el.php
@@ -23,15 +23,18 @@
 "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" => "Απάντηση",
+"User Documentation" => "Τεκμηρίωση Χρήστη",
+"Administrator Documentation" => "Τεκμηρίωση Διαχειριστή",
+"Online Documentation" => "Τεκμηρίωση στο Διαδίκτυο",
+"Forum" => "Φόρουμ",
+"Bugtracker" => "Bugtracker",
+"Commercial Support" => "Εμπορική Υποστήριξη",
 "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" => "Λήψη",
+"Clients" => "Πελάτες",
+"Download Desktop Clients" => "Λήψη Προγραμμάτων για Σταθερούς Υπολογιστές",
+"Download Android Client" => "Λήψη Προγράμματος Android",
+"Download iOS Client" => "Λήψη Προγράμματος iOS",
+"Password" => "Συνθηματικό",
 "Your password was changed" => "Το συνθηματικό σας έχει αλλάξει",
 "Unable to change your password" => "Δεν ήταν δυνατή η αλλαγή του κωδικού πρόσβασης",
 "Current password" => "Τρέχων συνθηματικό",
@@ -43,15 +46,14 @@
 "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 σας από το διαχειριστή αρχείων σας",
+"WebDAV" => "WebDAV",
+"Use this address to connect to your ownCloud in your file manager" => "Χρήση αυτής της διεύθυνσης για σύνδεση στο ownCloud με τον διαχειριστή αρχείων σας",
+"Version" => "Έκδοση",
 "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Αναπτύχθηκε από την <a href=\"http://ownCloud.org/contact\" target=\"_blank\">κοινότητα ownCloud</a>, ο <a href=\"https://github.com/owncloud\" target=\"_blank\">πηγαίος κώδικας</a> είναι υπό άδεια χρήσης <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
 "Name" => "Όνομα",
-"Password" => "Συνθηματικό",
 "Groups" => "Ομάδες",
 "Create" => "Δημιουργία",
-"Default Quota" => "Προεπιλεγμένο Όριο",
 "Other" => "Άλλα",
 "Group Admin" => "Ομάδα Διαχειριστών",
-"Quota" => "Σύνολο Χώρου",
 "Delete" => "Διαγραφή"
 );
diff --git a/settings/l10n/eo.php b/settings/l10n/eo.php
index e686868e67c..4f8d58b1bb7 100644
--- a/settings/l10n/eo.php
+++ b/settings/l10n/eo.php
@@ -23,15 +23,9 @@
 "Select an App" => "Elekti aplikaĵon",
 "See application page at apps.owncloud.com" => "Vidu la paĝon pri aplikaĵoj ĉe apps.owncloud.com",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"</span>-permesilhavigita de <span class=\"author\"></span>",
-"Documentation" => "Dokumentaro",
-"Managing Big Files" => "Administrante grandajn dosierojn",
-"Ask a question" => "Faru demandon",
-"Problems connecting to help database." => "Problemoj okazis dum konektado al la helpa datumbazo.",
-"Go there manually." => "Iri tien mane.",
-"Answer" => "Respondi",
 "You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Vi uzas <strong>%s</strong> el la haveblaj <strong>%s</strong>",
-"Desktop and Mobile Syncing Clients" => "Labortablaj kaj porteblaj sinkronigoklientoj",
-"Download" => "Elŝuti",
+"Clients" => "Klientoj",
+"Password" => "Pasvorto",
 "Your password was changed" => "Via pasvorto ŝanĝiĝis",
 "Unable to change your password" => "Ne eblis ŝanĝi vian pasvorton",
 "Current password" => "Nuna pasvorto",
@@ -43,15 +37,11 @@
 "Fill in an email address to enable password recovery" => "Enigu retpoŝtadreson por kapabligi pasvortan restaŭron",
 "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",
 "Create" => "Krei",
-"Default Quota" => "Defaŭlta kvoto",
 "Other" => "Alia",
 "Group Admin" => "Grupadministranto",
-"Quota" => "Kvoto",
 "Delete" => "Forigi"
 );
diff --git a/settings/l10n/es.php b/settings/l10n/es.php
index 39f88ac4ea2..bd7d2866601 100644
--- a/settings/l10n/es.php
+++ b/settings/l10n/es.php
@@ -23,15 +23,18 @@
 "Select an App" => "Seleccionar una aplicación",
 "See application page at apps.owncloud.com" => "Echa un vistazo a la web de aplicaciones apps.owncloud.com",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licenciado por <span class=\"author\"></span>",
-"Documentation" => "Documentación",
-"Managing Big Files" => "Administra archivos grandes",
-"Ask a question" => "Hacer una pregunta",
-"Problems connecting to help database." => "Problemas al conectar con la base de datos de ayuda.",
-"Go there manually." => "Ir manualmente",
-"Answer" => "Respuesta",
+"User Documentation" => "Documentación del usuario",
+"Administrator Documentation" => "Documentación del adminsitrador",
+"Online Documentation" => "Documentación en linea",
+"Forum" => "Foro",
+"Bugtracker" => "Rastreador de Bugs",
+"Commercial Support" => "Soporte Comercial",
 "You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Ha usado <strong>%s</strong> de <strong>%s</strong> disponibles",
-"Desktop and Mobile Syncing Clients" => "Clientes de sincronización móviles y de escritorio",
-"Download" => "Descargar",
+"Clients" => "Clientes",
+"Download Desktop Clients" => "Descargar clientes de escritorio",
+"Download Android Client" => "Descargar cliente para android",
+"Download iOS Client" => "Descargar cliente para iOS",
+"Password" => "Contraseña",
 "Your password was changed" => "Su contraseña ha sido cambiada",
 "Unable to change your password" => "No se ha podido cambiar tu contraseña",
 "Current password" => "Contraseña actual",
@@ -43,15 +46,18 @@
 "Fill in an email address to enable password recovery" => "Escribe una dirección de correo electrónico para restablecer la contraseña",
 "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",
+"WebDAV" => "WebDAV",
+"Use this address to connect to your ownCloud in your file manager" => "Use esta dirección para conectarse a su cuenta de ownCloud en el administrador de archivos",
+"Version" => "Version",
 "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Desarrollado por la <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunidad ownCloud</a>, el <a href=\"https://github.com/owncloud\" target=\"_blank\">código fuente</a> está bajo licencia <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
 "Name" => "Nombre",
-"Password" => "Contraseña",
 "Groups" => "Grupos",
 "Create" => "Crear",
-"Default Quota" => "Cuota predeterminada",
+"Default Storage" => "Almacenamiento Predeterminado",
+"Unlimited" => "Ilimitado",
 "Other" => "Otro",
 "Group Admin" => "Grupo admin",
-"Quota" => "Cuota",
+"Storage" => "Alamacenamiento",
+"Default" => "Predeterminado",
 "Delete" => "Eliminar"
 );
diff --git a/settings/l10n/es_AR.php b/settings/l10n/es_AR.php
index ebbce841a8e..03f6c5593d4 100644
--- a/settings/l10n/es_AR.php
+++ b/settings/l10n/es_AR.php
@@ -23,15 +23,18 @@
 "Select an App" => "Seleccionar una aplicación",
 "See application page at apps.owncloud.com" => "Mirá la web de aplicaciones apps.owncloud.com",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licenciado por <span class=\"author\">",
-"Documentation" => "Documentación",
-"Managing Big Files" => "Administrar archivos grandes",
-"Ask a question" => "Hacer una pregunta",
-"Problems connecting to help database." => "Problemas al conectar con la base de datos de ayuda.",
-"Go there manually." => "Ir de forma manual",
-"Answer" => "Respuesta",
+"User Documentation" => "Documentación de Usuario",
+"Administrator Documentation" => "Documentación de Administrador",
+"Online Documentation" => "Documentación en linea",
+"Forum" => "Foro",
+"Bugtracker" => "Informar errores",
+"Commercial Support" => "Soporte comercial",
 "You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Usaste  <strong>%s</strong>  de los  <strong>%s</strong>  disponibles",
-"Desktop and Mobile Syncing Clients" => "Clientes de sincronización para celulares, tablets y de escritorio",
-"Download" => "Descargar",
+"Clients" => "Clientes",
+"Download Desktop Clients" => "Descargar clientes de escritorio",
+"Download Android Client" => "Descargar cliente de Android",
+"Download iOS Client" => "Descargar cliente de iOS",
+"Password" => "Contraseña",
 "Your password was changed" => "Tu contraseña fue cambiada",
 "Unable to change your password" => "No fue posible cambiar tu contraseña",
 "Current password" => "Contraseña actual",
@@ -43,15 +46,18 @@
 "Fill in an email address to enable password recovery" => "Escribí una dirección de correo electrónico para restablecer la contraseña",
 "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",
+"WebDAV" => "WebDAV",
+"Use this address to connect to your ownCloud in your file manager" => "Utiliza esta dirección para conectarte con ownCloud en tu Administrador de Archivos",
+"Version" => "Versión",
 "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Desarrollado por la <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunidad ownCloud</a>, el <a href=\"https://github.com/owncloud\" target=\"_blank\">código fuente</a> está bajo licencia <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
 "Name" => "Nombre",
-"Password" => "Contraseña",
 "Groups" => "Grupos",
 "Create" => "Crear",
-"Default Quota" => "Cuota predeterminada",
+"Default Storage" => "Almacenamiento Predeterminado",
+"Unlimited" => "Ilimitado",
 "Other" => "Otro",
 "Group Admin" => "Grupo Administrador",
-"Quota" => "Cuota",
+"Storage" => "Almacenamiento",
+"Default" => "Predeterminado",
 "Delete" => "Borrar"
 );
diff --git a/settings/l10n/et_EE.php b/settings/l10n/et_EE.php
index 17fd60b9490..fdf9e35dfe2 100644
--- a/settings/l10n/et_EE.php
+++ b/settings/l10n/et_EE.php
@@ -22,14 +22,8 @@
 "Select an App" => "Vali programm",
 "See application page at apps.owncloud.com" => "Vaata rakenduste lehte aadressil apps.owncloud.com",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-litsenseeritud <span class=\"author\"></span>",
-"Documentation" => "Dokumentatsioon",
-"Managing Big Files" => "Suurte failide haldamine",
-"Ask a question" => "Küsi küsimus",
-"Problems connecting to help database." => "Probleemid abiinfo andmebaasiga ühendumisel.",
-"Go there manually." => "Mine sinna käsitsi.",
-"Answer" => "Vasta",
-"Desktop and Mobile Syncing Clients" => "Töölaua ja mobiiliga sünkroniseerimise rakendused",
-"Download" => "Lae alla",
+"Clients" => "Kliendid",
+"Password" => "Parool",
 "Your password was changed" => "Sinu parooli on muudetud",
 "Unable to change your password" => "Sa ei saa oma parooli muuta",
 "Current password" => "Praegune parool",
@@ -41,14 +35,10 @@
 "Fill in an email address to enable password recovery" => "Parooli taastamise sisse lülitamiseks sisesta e-posti aadress",
 "Language" => "Keel",
 "Help translate" => "Aita tõlkida",
-"use this address to connect to your ownCloud in your file manager" => "kasuta seda aadressi oma ownCloudiga ühendamiseks failihalduriga",
 "Name" => "Nimi",
-"Password" => "Parool",
 "Groups" => "Grupid",
 "Create" => "Lisa",
-"Default Quota" => "Vaikimisi kvoot",
 "Other" => "Muu",
 "Group Admin" => "Grupi admin",
-"Quota" => "Mahupiir",
 "Delete" => "Kustuta"
 );
diff --git a/settings/l10n/eu.php b/settings/l10n/eu.php
index 7d79c79ced3..bcf80da33c1 100644
--- a/settings/l10n/eu.php
+++ b/settings/l10n/eu.php
@@ -23,15 +23,18 @@
 "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>",
-"Documentation" => "Dokumentazioa",
-"Managing Big Files" => "Fitxategi handien kudeaketa",
-"Ask a question" => "Egin galdera bat",
-"Problems connecting to help database." => "Arazoak daude laguntza datubasera konektatzeko.",
-"Go there manually." => "Joan hara eskuz.",
-"Answer" => "Erantzun",
+"User Documentation" => "Erabiltzaile dokumentazioa",
+"Administrator Documentation" => "Administradore dokumentazioa",
+"Online Documentation" => "Online dokumentazioa",
+"Forum" => "Foroa",
+"Bugtracker" => "Bugtracker",
+"Commercial Support" => "Babes komertziala",
 "You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Dagoeneko <strong>%s</strong> erabili duzu eskuragarri duzun <strong>%s</strong>etatik",
-"Desktop and Mobile Syncing Clients" => "Mahaigain eta mugikorren sinkronizazio bezeroak",
-"Download" => "Deskargatu",
+"Clients" => "Bezeroak",
+"Download Desktop Clients" => "Deskargatu mahaigainerako bezeroak",
+"Download Android Client" => "Deskargatu Android bezeroa",
+"Download iOS Client" => "Deskargatu iOS bezeroa",
+"Password" => "Pasahitza",
 "Your password was changed" => "Zere pasahitza aldatu da",
 "Unable to change your password" => "Ezin izan da zure pasahitza aldatu",
 "Current password" => "Uneko pasahitza",
@@ -43,15 +46,14 @@
 "Fill in an email address to enable password recovery" => "Idatz ezazu e-posta bat pasahitza berreskuratu ahal izateko",
 "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",
+"WebDAV" => "WebDAV",
+"Use this address to connect to your ownCloud in your file manager" => "Erabili helbide hau zure fitxategi kudeatzailean zure ownCloudera konektatzeko",
+"Version" => "Bertsioa",
 "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "<a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud komunitateak</a> garatuta, <a href=\"https://github.com/owncloud\" target=\"_blank\">itubruru kodea</a><a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr> lizentziarekin banatzen da</a>.",
 "Name" => "Izena",
-"Password" => "Pasahitza",
 "Groups" => "Taldeak",
 "Create" => "Sortu",
-"Default Quota" => "Kuota lehentsia",
 "Other" => "Besteak",
 "Group Admin" => "Talde administradorea",
-"Quota" => "Kuota",
 "Delete" => "Ezabatu"
 );
diff --git a/settings/l10n/fa.php b/settings/l10n/fa.php
index 3dcb770c730..293a50ff291 100644
--- a/settings/l10n/fa.php
+++ b/settings/l10n/fa.php
@@ -13,14 +13,8 @@
 "Add your App" => "برنامه خود را بیافزایید",
 "Select an App" => "یک برنامه انتخاب کنید",
 "See application page at apps.owncloud.com" => "صفحه این اٌپ را در apps.owncloud.com ببینید",
-"Documentation" => "مستندات",
-"Managing Big Files" => "مدیریت پرونده های بزرگ",
-"Ask a question" => "یک سوال بپرسید",
-"Problems connecting to help database." => "مشکلاتی برای وصل شدن به پایگاه داده کمکی",
-"Go there manually." => "بروید آنجا به صورت دستی",
-"Answer" => "پاسخ",
-"Desktop and Mobile Syncing Clients" => " ابزار مدیریت با دسکتاپ و موبایل",
-"Download" => "بارگیری",
+"Clients" => "مشتریان",
+"Password" => "گذرواژه",
 "Your password was changed" => "رمز عبور شما تغییر یافت",
 "Unable to change your password" => "ناتوان در تغییر گذرواژه",
 "Current password" => "گذرواژه کنونی",
@@ -32,13 +26,9 @@
 "Fill in an email address to enable password recovery" => "پست الکترونیکی را پرکنید  تا بازیابی گذرواژه فعال شود",
 "Language" => "زبان",
 "Help translate" => "به ترجمه آن کمک کنید",
-"use this address to connect to your ownCloud in your file manager" => "از این نشانی برای وصل شدن به ابرهایتان در مدیرپرونده استفاده کنید",
 "Name" => "نام",
-"Password" => "گذرواژه",
 "Groups" => "گروه ها",
 "Create" => "ایجاد کردن",
-"Default Quota" => "سهم پیش فرض",
 "Other" => "سایر",
-"Quota" => "سهم",
 "Delete" => "پاک کردن"
 );
diff --git a/settings/l10n/fi_FI.php b/settings/l10n/fi_FI.php
index d68ed8ebaae..5700f86036f 100644
--- a/settings/l10n/fi_FI.php
+++ b/settings/l10n/fi_FI.php
@@ -23,15 +23,18 @@
 "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." => "Siirry sinne itse.",
-"Answer" => "Vastaus",
+"User Documentation" => "Käyttäjäohjeistus",
+"Administrator Documentation" => "Ylläpito-ohjeistus",
+"Online Documentation" => "Verkko-ohjeistus",
+"Forum" => "Keskustelupalsta",
+"Bugtracker" => "Ohjelmistovirheiden jäljitys",
+"Commercial Support" => "Kaupallinen tuki",
 "You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Käytössäsi on <strong>%s</strong>/<strong>%s</strong>",
-"Desktop and Mobile Syncing Clients" => "Tietokoneen ja mobiililaitteiden synkronointisovellukset",
-"Download" => "Lataa",
+"Clients" => "Asiakkaat",
+"Download Desktop Clients" => "Lataa työpöytäsovelluksia",
+"Download Android Client" => "Lataa Android-sovellus",
+"Download iOS Client" => "Lataa iOS-sovellus",
+"Password" => "Salasana",
 "Your password was changed" => "Salasanasi vaihdettiin",
 "Unable to change your password" => "Salasanaasi ei voitu vaihtaa",
 "Current password" => "Nykyinen salasana",
@@ -43,15 +46,14 @@
 "Fill in an email address to enable password recovery" => "Anna sähköpostiosoitteesi, jotta unohdettu salasana on mahdollista palauttaa",
 "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",
+"WebDAV" => "WebDAV",
+"Use this address to connect to your ownCloud in your file manager" => "Käytä tätä osoitetta yhdistäessäsi ownCloudiisi tiedostonhallintaa käyttäen",
+"Version" => "Versio",
 "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Kehityksestä on vastannut <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud-yhteisö</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">lähdekoodi</a> on julkaistu lisenssin <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> alaisena.",
 "Name" => "Nimi",
-"Password" => "Salasana",
 "Groups" => "Ryhmät",
 "Create" => "Luo",
-"Default Quota" => "Oletuskiintiö",
 "Other" => "Muu",
 "Group Admin" => "Ryhmän ylläpitäjä",
-"Quota" => "Kiintiö",
 "Delete" => "Poista"
 );
diff --git a/settings/l10n/fr.php b/settings/l10n/fr.php
index 8e5169fe0f3..a8367ef458d 100644
--- a/settings/l10n/fr.php
+++ b/settings/l10n/fr.php
@@ -23,15 +23,18 @@
 "Select an App" => "Sélectionner une Application",
 "See application page at apps.owncloud.com" => "Voir la page des applications à l'url apps.owncloud.com",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "Distribué sous licence <span class=\"licence\"></span>, par <span class=\"author\"></span>",
-"Documentation" => "Documentation",
-"Managing Big Files" => "Gérer les gros fichiers",
-"Ask a question" => "Poser une question",
-"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",
+"User Documentation" => "Documentation utilisateur",
+"Administrator Documentation" => "Documentation administrateur",
+"Online Documentation" => "Documentation en ligne",
+"Forum" => "Forum",
+"Bugtracker" => "Suivi de bugs",
+"Commercial Support" => "Support commercial",
 "You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Vous avez utilisé <strong>%s</strong> des <strong>%s<strong> disponibles",
-"Desktop and Mobile Syncing Clients" => "Clients de synchronisation Mobile et Ordinateur",
-"Download" => "Télécharger",
+"Clients" => "Clients",
+"Download Desktop Clients" => "Télécharger des clients de bureau",
+"Download Android Client" => "Télécharger le client Android",
+"Download iOS Client" => "Télécharger le client iOS",
+"Password" => "Mot de passe",
 "Your password was changed" => "Votre mot de passe a été changé",
 "Unable to change your password" => "Impossible de changer votre mot de passe",
 "Current password" => "Mot de passe actuel",
@@ -43,15 +46,18 @@
 "Fill in an email address to enable password recovery" => "Entrez votre adresse e-mail pour permettre la réinitialisation du mot de passe",
 "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",
+"WebDAV" => "WebDAV",
+"Use this address to connect to your ownCloud in your file manager" => "Utiliser cette adresse pour vous connecter à ownCloud dans votre gestionnaire de fichiers",
+"Version" => "Version",
 "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Développé par la <a href=\"http://ownCloud.org/contact\" target=\"_blank\">communauté ownCloud</a>, le <a href=\"https://github.com/owncloud\" target=\"_blank\">code source</a> est publié sous license <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
 "Name" => "Nom",
-"Password" => "Mot de passe",
 "Groups" => "Groupes",
 "Create" => "Créer",
-"Default Quota" => "Quota par défaut",
+"Default Storage" => "Support de stockage par défaut",
+"Unlimited" => "Illimité",
 "Other" => "Autre",
 "Group Admin" => "Groupe Admin",
-"Quota" => "Quota",
+"Storage" => "Support de stockage",
+"Default" => "Défaut",
 "Delete" => "Supprimer"
 );
diff --git a/settings/l10n/gl.php b/settings/l10n/gl.php
index 1cde895d0d9..2853b6fed7d 100644
--- a/settings/l10n/gl.php
+++ b/settings/l10n/gl.php
@@ -23,15 +23,9 @@
 "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",
+"Clients" => "Clientes",
+"Password" => "Contrasinal",
 "Your password was changed" => "O seu contrasinal foi cambiado",
 "Unable to change your password" => "Incapaz de trocar o seu contrasinal",
 "Current password" => "Contrasinal actual",
@@ -43,15 +37,11 @@
 "Fill in an email address to enable password recovery" => "Escriba un enderezo de correo electrónico para habilitar a recuperación do contrasinal",
 "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" => "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 f82cc83d9f7..1d7a91ee523 100644
--- a/settings/l10n/he.php
+++ b/settings/l10n/he.php
@@ -23,15 +23,17 @@
 "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" => "מענה",
+"User Documentation" => "תיעוד משתמש",
+"Administrator Documentation" => "תיעוד מנהלים",
+"Online Documentation" => "תיעוד מקוון",
+"Forum" => "פורום",
+"Commercial Support" => "תמיכה בתשלום",
 "You have used <strong>%s</strong> of the available <strong>%s</strong>" => "השתמשת ב־<strong>%s</strong> מתוך <strong>%s</strong> הזמינים לך",
-"Desktop and Mobile Syncing Clients" => "לקוחות סנכרון למחשב שולחני ולנייד",
-"Download" => "הורדה",
+"Clients" => "לקוחות",
+"Download Desktop Clients" => "הורד לתוכנה למחשב",
+"Download Android Client" => "הורד תוכנה לאנדרואיד",
+"Download iOS Client" => "הורד תוכנה לiOS",
+"Password" => "ססמה",
 "Your password was changed" => "הססמה שלך הוחלפה",
 "Unable to change your password" => "לא ניתן לשנות את הססמה שלך",
 "Current password" => "ססמה נוכחית",
@@ -43,15 +45,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" => "השתמש בכתובת זו כדי להתחבר ל־ownCloude שלך ממנהל הקבצים",
+"Use this address to connect to your ownCloud in your file manager" => "השתמש בכתובת זאת על מנת להתחבר אל ownCloud דרך סייר קבצים.",
+"Version" => "גרסא",
 "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "פותח על די <a href=\"http://ownCloud.org/contact\" target=\"_blank\">קהילתownCloud</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">קוד המקור</a> מוגן ברישיון <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
 "Name" => "שם",
-"Password" => "ססמה",
 "Groups" => "קבוצות",
 "Create" => "יצירה",
-"Default Quota" => "מכסת בררת המחדל",
 "Other" => "אחר",
 "Group Admin" => "מנהל הקבוצה",
-"Quota" => "מכסה",
 "Delete" => "מחיקה"
 );
diff --git a/settings/l10n/hi.php b/settings/l10n/hi.php
index 645b991a912..034ededf5f9 100644
--- a/settings/l10n/hi.php
+++ b/settings/l10n/hi.php
@@ -1,4 +1,4 @@
 <?php $TRANSLATIONS = array(
-"New password" => "नया पासवर्ड",
-"Password" => "पासवर्ड"
+"Password" => "पासवर्ड",
+"New password" => "नया पासवर्ड"
 );
diff --git a/settings/l10n/hr.php b/settings/l10n/hr.php
index 7f2fefb90d5..b6f7133f13f 100644
--- a/settings/l10n/hr.php
+++ b/settings/l10n/hr.php
@@ -13,14 +13,8 @@
 "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",
-"Documentation" => "dokumentacija",
-"Managing Big Files" => "Upravljanje velikih datoteka",
-"Ask a question" => "Postavite pitanje",
-"Problems connecting to help database." => "Problem pri spajanju na bazu podataka pomoći",
-"Go there manually." => "Idite tamo ručno.",
-"Answer" => "Odgovor",
-"Desktop and Mobile Syncing Clients" => "Desktop i Mobile sinkronizaciji klijenti",
-"Download" => "preuzimanje",
+"Clients" => "Klijenti",
+"Password" => "Lozinka",
 "Unable to change your password" => "Nemoguće promijeniti lozinku",
 "Current password" => "Trenutna lozinka",
 "New password" => "Nova lozinka",
@@ -31,14 +25,10 @@
 "Fill in an email address to enable password recovery" => "Ispunite vase e-mail adresa kako bi se omogućilo oporavak lozinke",
 "Language" => "Jezik",
 "Help translate" => "Pomoć prevesti",
-"use this address to connect to your ownCloud in your file manager" => "koristite ovu adresu za spajanje na Cloud u vašem upravitelju datoteka",
 "Name" => "Ime",
-"Password" => "Lozinka",
 "Groups" => "Grupe",
 "Create" => "Izradi",
-"Default Quota" => "standardni kvota",
 "Other" => "ostali",
 "Group Admin" => "Grupa Admin",
-"Quota" => "kvota",
 "Delete" => "Obriši"
 );
diff --git a/settings/l10n/hu_HU.php b/settings/l10n/hu_HU.php
index e587f7107ae..5fdc11e44f9 100644
--- a/settings/l10n/hu_HU.php
+++ b/settings/l10n/hu_HU.php
@@ -1,43 +1,59 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "Nem tölthető le a lista az App Store-ból",
+"Group already exists" => "A csoport már létezik",
+"Unable to add group" => "A csoport nem hozható létre",
+"Could not enable app. " => "A program nem aktiválható.",
 "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",
+"Unable to delete group" => "A csoport nem törölhető",
+"Authentication error" => "Azonosítási hiba",
+"Unable to delete user" => "A felhasználó nem törölhető",
 "Language changed" => "A nyelv megváltozott",
+"Admins can't remove themself from the admin group" => "Adminisztrátorok nem távolíthatják el magukat az admin csoportból.",
+"Unable to add user to group %s" => "A felhasználó nem adható hozzá ehhez a csoporthoz: %s",
+"Unable to remove user from group %s" => "A felhasználó nem távolítható el ebből a csoportból: %s",
 "Disable" => "Letiltás",
 "Enable" => "Engedélyezés",
 "Saving..." => "Mentés...",
 "__language_name__" => "__language_name__",
-"Add your App" => "App hozzáadása",
-"Select an App" => "Egy App kiválasztása",
+"Add your App" => "Az alkalmazás hozzáadása",
+"More Apps" => "További alkalmazások",
+"Select an App" => "Válasszon egy alkalmazást",
 "See application page at apps.owncloud.com" => "Lásd apps.owncloud.com, alkalmazások oldal",
-"Documentation" => "Dokumentáció",
-"Managing Big Files" => "Nagy fájlok kezelése",
-"Ask a question" => "Tégy fel egy kérdést",
-"Problems connecting to help database." => "Sikertelen csatlakozás a Súgó adatbázishoz",
-"Go there manually." => "Menj oda kézzel",
-"Answer" => "Válasz",
-"Desktop and Mobile Syncing Clients" => "Asztali- és mobilkliensek kezelése",
-"Download" => "Letöltés",
-"Unable to change your password" => "Nem lehet megváltoztatni a jelszavad",
-"Current password" => "Jelenlegi jelszó",
-"New password" => "Új jelszó",
-"show" => "Mutat",
-"Change password" => "Jelszó megváltoztatása",
+"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-a jogtuladonos <span class=\"author\"></span>",
+"User Documentation" => "Felhasználói leírás",
+"Administrator Documentation" => "Üzemeltetői leírás",
+"Online Documentation" => "Online leírás",
+"Forum" => "Fórum",
+"Bugtracker" => "Hibabejelentések",
+"Commercial Support" => "Megvásárolható támogatás",
+"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Az Ön tárterület-felhasználása jelenleg: <strong>%s</strong>. Maximálisan ennyi áll rendelkezésére: <strong>%s</strong>",
+"Clients" => "Kliensek",
+"Download Desktop Clients" => "Desktop kliensprogramok letöltése",
+"Download Android Client" => "Android kliens letöltése",
+"Download iOS Client" => "iOS kliens letöltése",
+"Password" => "Jelszó",
+"Your password was changed" => "A jelszava megváltozott",
+"Unable to change your password" => "A jelszó nem változtatható meg",
+"Current password" => "A jelenlegi jelszó",
+"New password" => "Az új jelszó",
+"show" => "lássam",
+"Change password" => "A jelszó megváltoztatása",
 "Email" => "Email",
-"Your email address" => "Email címed",
-"Fill in an email address to enable password recovery" => "Töltsd ki az email címet, hogy engedélyezhesd a jelszó-visszaállítást",
+"Your email address" => "Az Ön email címe",
+"Fill in an email address to enable password recovery" => "Adja meg az email címét, hogy jelszó-emlékeztetőt kérhessen, ha elfelejtette a jelszavát!",
 "Language" => "Nyelv",
-"Help translate" => "Segíts lefordítani!",
-"use this address to connect to your ownCloud in your file manager" => "Használd ezt a címet hogy csatlakozz a saját ownCloud rendszeredhez a fájlkezelődben",
+"Help translate" => "Segítsen a fordításban!",
+"WebDAV" => "WebDAV",
+"Use this address to connect to your ownCloud in your file manager" => "Ennek a címnek a megadásával a WebDAV-protokollon keresztül saját gépének fájlkezelőjével is is elérheti az állományait.",
+"Version" => "Verzió",
+"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "A programot az <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud közösség</a> fejleszti. A <a href=\"https://github.com/owncloud\" target=\"_blank\">forráskód</a> az <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> feltételei mellett használható föl.",
 "Name" => "Név",
-"Password" => "Jelszó",
 "Groups" => "Csoportok",
 "Create" => "Létrehozás",
-"Default Quota" => "Alapértelmezett kvóta",
-"Other" => "Egyéb",
-"Quota" => "Kvóta",
+"Other" => "Más",
+"Group Admin" => "Csoportadminisztrátor",
 "Delete" => "Törlés"
 );
diff --git a/settings/l10n/ia.php b/settings/l10n/ia.php
index c5f4e7eaf24..d5057275d2b 100644
--- a/settings/l10n/ia.php
+++ b/settings/l10n/ia.php
@@ -5,10 +5,8 @@
 "__language_name__" => "Interlingua",
 "Add your App" => "Adder tu application",
 "Select an App" => "Selectionar un app",
-"Documentation" => "Documentation",
-"Ask a question" => "Facer un question",
-"Answer" => "Responsa",
-"Download" => "Discargar",
+"Clients" => "Clientes",
+"Password" => "Contrasigno",
 "Unable to change your password" => "Non pote cambiar tu contrasigno",
 "Current password" => "Contrasigno currente",
 "New password" => "Nove contrasigno",
@@ -18,13 +16,9 @@
 "Your email address" => "Tu adresse de e-posta",
 "Language" => "Linguage",
 "Help translate" => "Adjuta a traducer",
-"use this address to connect to your ownCloud in your file manager" => "usa iste addresse pro connecter a tu ownCloud in tu administrator de files",
 "Name" => "Nomine",
-"Password" => "Contrasigno",
 "Groups" => "Gruppos",
 "Create" => "Crear",
-"Default Quota" => "Quota predeterminate",
 "Other" => "Altere",
-"Quota" => "Quota",
 "Delete" => "Deler"
 );
diff --git a/settings/l10n/id.php b/settings/l10n/id.php
index ad89a4659d0..575b0a233dd 100644
--- a/settings/l10n/id.php
+++ b/settings/l10n/id.php
@@ -12,14 +12,8 @@
 "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",
-"Documentation" => "Dokumentasi",
-"Managing Big Files" => "Mengelola berkas besar",
-"Ask a question" => "Ajukan pertanyaan",
-"Problems connecting to help database." => "Bermasalah saat menghubungi database bantuan.",
-"Go there manually." => "Pergi kesana secara manual.",
-"Answer" => "Jawab",
-"Desktop and Mobile Syncing Clients" => "Klien sync Desktop dan Mobile",
-"Download" => "Unduh",
+"Clients" => "Klien",
+"Password" => "Password",
 "Unable to change your password" => "Tidak dapat merubah password anda",
 "Current password" => "Password saat ini",
 "New password" => "kata kunci baru",
@@ -30,14 +24,10 @@
 "Fill in an email address to enable password recovery" => "Masukkan alamat email untuk mengaktifkan pemulihan password",
 "Language" => "Bahasa",
 "Help translate" => "Bantu menerjemahkan",
-"use this address to connect to your ownCloud in your file manager" => "gunakan alamat ini untuk terhubung dengan ownCloud anda dalam file manager anda",
 "Name" => "Nama",
-"Password" => "Password",
 "Groups" => "Group",
 "Create" => "Buat",
-"Default Quota" => "Kuota default",
 "Other" => "Lain-lain",
 "Group Admin" => "Admin Grup",
-"Quota" => "Quota",
 "Delete" => "Hapus"
 );
diff --git a/settings/l10n/is.php b/settings/l10n/is.php
new file mode 100644
index 00000000000..2056dfc5b72
--- /dev/null
+++ b/settings/l10n/is.php
@@ -0,0 +1,62 @@
+<?php $TRANSLATIONS = array(
+"Unable to load list from App Store" => "Ekki tókst að hlaða lista frá forrita síðu",
+"Group already exists" => "Hópur er þegar til",
+"Unable to add group" => "Ekki tókst að bæta við hóp",
+"Could not enable app. " => "Gat ekki virkjað forrit",
+"Email saved" => "Netfang vistað",
+"Invalid email" => "Ógilt netfang",
+"OpenID Changed" => "OpenID breytt",
+"Invalid request" => "Ógild fyrirspurn",
+"Unable to delete group" => "Ekki tókst að eyða hóp",
+"Authentication error" => "Villa við auðkenningu",
+"Unable to delete user" => "Ekki tókst að eyða notenda",
+"Language changed" => "Tungumáli breytt",
+"Admins can't remove themself from the admin group" => "Stjórnendur geta ekki fjarlægt sjálfa sig úr stjórnendahóp",
+"Unable to add user to group %s" => "Ekki tókst að bæta notenda við hópinn %s",
+"Unable to remove user from group %s" => "Ekki tókst að fjarlægja notanda úr hópnum %s",
+"Disable" => "Gera óvirkt",
+"Enable" => "Virkja",
+"Saving..." => "Er að vista ...",
+"__language_name__" => "__nafn_tungumáls__",
+"Add your App" => "Bæta við forriti",
+"More Apps" => "Fleiri forrit",
+"Select an App" => "Veldu forrit",
+"See application page at apps.owncloud.com" => "Skoða forrita síðuna hjá apps.owncloud.com",
+"User Documentation" => "Notenda handbók",
+"Administrator Documentation" => "Stjórnenda handbók",
+"Online Documentation" => "Handbók á netinu",
+"Forum" => "Vefspjall",
+"Bugtracker" => "Villubókhald",
+"Commercial Support" => "Borgaður stuðningur",
+"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Þú hefur notað <strong>%s</strong> af tiltæku <strong>%s</strong>",
+"Clients" => "Notendahugbúnaður",
+"Download Desktop Clients" => "Hlaða niður notendahugbúnaði",
+"Download Android Client" => "Hlaða niður Andoid hugbúnaði",
+"Download iOS Client" => "Hlaða niður iOS hugbúnaði",
+"Password" => "Lykilorð",
+"Your password was changed" => "Lykilorði þínu hefur verið breytt",
+"Unable to change your password" => "Ekki tókst að breyta lykilorðinu þínu",
+"Current password" => "Núverandi lykilorð",
+"New password" => "Nýtt lykilorð",
+"show" => "sýna",
+"Change password" => "Breyta lykilorði",
+"Email" => "Netfang",
+"Your email address" => "Netfangið þitt",
+"Fill in an email address to enable password recovery" => "Sláðu inn netfangið þitt til að virkja endurheimt á lykilorði",
+"Language" => "Tungumál",
+"Help translate" => "Hjálpa við þýðingu",
+"WebDAV" => "WebDAV",
+"Use this address to connect to your ownCloud in your file manager" => "Notaðu þessa vefslóð til að tengjast ownCloud svæðinu þínu",
+"Version" => "Útgáfa",
+"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Þróað af <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud samfélaginu</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">forrita kóðinn</a> er skráðu með <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+"Name" => "Nafn",
+"Groups" => "Hópar",
+"Create" => "Búa til",
+"Default Storage" => "Sjálfgefin gagnageymsla",
+"Unlimited" => "Ótakmarkað",
+"Other" => "Annað",
+"Group Admin" => "Hópa stjóri",
+"Storage" => "gagnapláss",
+"Default" => "Sjálfgefið",
+"Delete" => "Eyða"
+);
diff --git a/settings/l10n/it.php b/settings/l10n/it.php
index fa24156b589..043f1a2db9d 100644
--- a/settings/l10n/it.php
+++ b/settings/l10n/it.php
@@ -23,15 +23,18 @@
 "Select an App" => "Seleziona un'applicazione",
 "See application page at apps.owncloud.com" => "Vedere la pagina dell'applicazione su apps.owncloud.com",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licenziato da <span class=\"author\"></span>",
-"Documentation" => "Documentazione",
-"Managing Big Files" => "Gestione file grandi",
-"Ask a question" => "Fai una domanda",
-"Problems connecting to help database." => "Problemi di connessione al database di supporto.",
-"Go there manually." => "Raggiungilo manualmente.",
-"Answer" => "Risposta",
+"User Documentation" => "Documentazione utente",
+"Administrator Documentation" => "Documentazione amministratore",
+"Online Documentation" => "Documentazione in linea",
+"Forum" => "Forum",
+"Bugtracker" => "Sistema di tracciamento bug",
+"Commercial Support" => "Supporto commerciale",
 "You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Hai utilizzato <strong>%s</strong> dei <strong>%s</strong> disponibili",
-"Desktop and Mobile Syncing Clients" => "Client di sincronizzazione desktop e mobile",
-"Download" => "Scaricamento",
+"Clients" => "Client",
+"Download Desktop Clients" => "Scarica client desktop",
+"Download Android Client" => "Scarica client Android",
+"Download iOS Client" => "Scarica client iOS",
+"Password" => "Password",
 "Your password was changed" => "La tua password è cambiata",
 "Unable to change your password" => "Modifica password non riuscita",
 "Current password" => "Password attuale",
@@ -43,15 +46,18 @@
 "Fill in an email address to enable password recovery" => "Inserisci il tuo indirizzo email per abilitare il recupero della password",
 "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",
+"WebDAV" => "WebDAV",
+"Use this address to connect to your ownCloud in your file manager" => "Usa questo indirizzo per connetterti al tuo ownCloud dal tuo gestore file",
+"Version" => "Versione",
 "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Sviluppato dalla <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunità di ownCloud</a>, il <a href=\"https://github.com/owncloud\" target=\"_blank\">codice sorgente</a> è licenziato nei termini della <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
 "Name" => "Nome",
-"Password" => "Password",
 "Groups" => "Gruppi",
 "Create" => "Crea",
-"Default Quota" => "Quota predefinita",
+"Default Storage" => "Archiviazione predefinita",
+"Unlimited" => "Illimitata",
 "Other" => "Altro",
 "Group Admin" => "Gruppo di amministrazione",
-"Quota" => "Quote",
+"Storage" => "Archiviazione",
+"Default" => "Predefinito",
 "Delete" => "Elimina"
 );
diff --git a/settings/l10n/ja_JP.php b/settings/l10n/ja_JP.php
index 098cce843d7..29c38827566 100644
--- a/settings/l10n/ja_JP.php
+++ b/settings/l10n/ja_JP.php
@@ -23,15 +23,18 @@
 "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" => "解答",
+"User Documentation" => "ユーザドキュメント",
+"Administrator Documentation" => "管理者ドキュメント",
+"Online Documentation" => "オンラインドキュメント",
+"Forum" => "フォーラム",
+"Bugtracker" => "バグトラッカー",
+"Commercial Support" => "コマーシャルサポート",
 "You have used <strong>%s</strong> of the available <strong>%s</strong>" => "現在、<strong>%s</strong> / <strong>%s</strong> を利用しています",
-"Desktop and Mobile Syncing Clients" => "デスクトップおよびモバイル用の同期クライアント",
-"Download" => "ダウンロード",
+"Clients" => "顧客",
+"Download Desktop Clients" => "デスクトップクライアントをダウンロード",
+"Download Android Client" => "Androidクライアントをダウンロード",
+"Download iOS Client" => "iOSクライアントをダウンロード",
+"Password" => "パスワード",
 "Your password was changed" => "パスワードを変更しました",
 "Unable to change your password" => "パスワードを変更することができません",
 "Current password" => "現在のパスワード",
@@ -43,15 +46,14 @@
 "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に接続する際は、このアドレスを使用してください",
+"WebDAV" => "WebDAV",
+"Use this address to connect to your ownCloud in your file manager" => "ファイルマネージャでownCloudに接続する際はこのアドレスを利用してください",
+"Version" => "バージョン",
 "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "<a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>により開発されています、<a href=\"https://github.com/owncloud\" target=\"_blank\">ソースコード</a>ライセンスは、<a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> ライセンスにより提供されています。",
 "Name" => "名前",
-"Password" => "パスワード",
 "Groups" => "グループ",
 "Create" => "作成",
-"Default Quota" => "デフォルトのクォータサイズ",
 "Other" => "その他",
 "Group Admin" => "グループ管理者",
-"Quota" => "クオータ",
 "Delete" => "削除"
 );
diff --git a/settings/l10n/ka_GE.php b/settings/l10n/ka_GE.php
index d3ad88fe95f..a9d994f87c6 100644
--- a/settings/l10n/ka_GE.php
+++ b/settings/l10n/ka_GE.php
@@ -22,14 +22,8 @@
 "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" => "დესკტოპ და მობილური კლიენტების სინქრონიზაცია",
-"Download" => "ჩამოტვირთვა",
+"Clients" => "კლიენტები",
+"Password" => "პაროლი",
 "Your password was changed" => "თქვენი პაროლი შეიცვალა",
 "Unable to change your password" => "თქვენი პაროლი არ შეიცვალა",
 "Current password" => "მიმდინარე პაროლი",
@@ -41,14 +35,10 @@
 "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–თან დასაკავშირებლად შენს ფაილმენეჯერში",
 "Name" => "სახელი",
-"Password" => "პაროლი",
 "Groups" => "ჯგუფი",
 "Create" => "შექმნა",
-"Default Quota" => "საწყისი ქვოტა",
 "Other" => "სხვა",
 "Group Admin" => "ჯგუფის ადმინისტრატორი",
-"Quota" => "ქვოტა",
 "Delete" => "წაშლა"
 );
diff --git a/settings/l10n/ko.php b/settings/l10n/ko.php
index 7e9ba19a8fd..6556e1b93b8 100644
--- a/settings/l10n/ko.php
+++ b/settings/l10n/ko.php
@@ -23,15 +23,9 @@
 "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" => "다운로드",
+"Clients" => "고객",
+"Password" => "암호",
 "Your password was changed" => "암호가 변경되었습니다",
 "Unable to change your password" => "암호를 변경할 수 없음",
 "Current password" => "현재 암호",
@@ -43,15 +37,11 @@
 "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/ku_IQ.php b/settings/l10n/ku_IQ.php
index b4bdf2a6ced..6a4996e8252 100644
--- a/settings/l10n/ku_IQ.php
+++ b/settings/l10n/ku_IQ.php
@@ -1,10 +1,8 @@
 <?php $TRANSLATIONS = array(
 "Enable" => "چالاککردن",
 "Saving..." => "پاشکه‌وتده‌کات...",
-"Documentation" => "به‌ڵگه‌نامه",
-"Download" => "داگرتن",
+"Password" => "وشەی تێپەربو",
 "New password" => "وشەی نهێنی نوێ",
 "Email" => "ئیمه‌یل",
-"Name" => "ناو",
-"Password" => "وشەی تێپەربو"
+"Name" => "ناو"
 );
diff --git a/settings/l10n/lb.php b/settings/l10n/lb.php
index 440b81d44c9..db09bdc1280 100644
--- a/settings/l10n/lb.php
+++ b/settings/l10n/lb.php
@@ -13,14 +13,8 @@
 "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",
-"Documentation" => "Dokumentatioun",
-"Managing Big Files" => "Grouss Fichieren verwalten",
-"Ask a question" => "Stell eng Fro",
-"Problems connecting to help database." => "Problemer sinn opgetrueden beim Versuch sech un d'Hëllef Datebank ze verbannen.",
-"Go there manually." => "Gei manuell dohinner.",
-"Answer" => "Äntwert",
-"Desktop and Mobile Syncing Clients" => "Desktop an Mobile Syncing Clienten",
-"Download" => "Download",
+"Clients" => "Clienten",
+"Password" => "Passwuert",
 "Unable to change your password" => "Konnt däin Passwuert net änneren",
 "Current password" => "Momentan 't Passwuert",
 "New password" => "Neit Passwuert",
@@ -31,14 +25,10 @@
 "Fill in an email address to enable password recovery" => "Gëff eng Email Adress an fir d'Passwuert recovery ze erlaben",
 "Language" => "Sprooch",
 "Help translate" => "Hëllef iwwersetzen",
-"use this address to connect to your ownCloud in your file manager" => "benotz dës Adress fir dech un deng ownCloud iwwert däin Datei Manager ze verbannen",
 "Name" => "Numm",
-"Password" => "Passwuert",
 "Groups" => "Gruppen",
 "Create" => "Erstellen",
-"Default Quota" => "Standard Quota",
 "Other" => "Aner",
 "Group Admin" => "Gruppen Admin",
-"Quota" => "Quota",
 "Delete" => "Läschen"
 );
diff --git a/settings/l10n/lt_LT.php b/settings/l10n/lt_LT.php
index 6399b5b1b49..0430fface00 100644
--- a/settings/l10n/lt_LT.php
+++ b/settings/l10n/lt_LT.php
@@ -15,11 +15,8 @@
 "More Apps" => "Daugiau aplikacijų",
 "Select an App" => "Pasirinkite programą",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>- autorius<span class=\"author\"></span>",
-"Documentation" => "Dokumentacija",
-"Ask a question" => "Užduoti klausimą",
-"Problems connecting to help database." => "Problemos jungiantis prie duomenų bazės",
-"Answer" => "Atsakyti",
-"Download" => "Atsisiųsti",
+"Clients" => "Klientai",
+"Password" => "Slaptažodis",
 "Your password was changed" => "Jūsų slaptažodis buvo pakeistas",
 "Unable to change your password" => "Neįmanoma pakeisti slaptažodžio",
 "Current password" => "Dabartinis slaptažodis",
@@ -31,13 +28,9 @@
 "Fill in an email address to enable password recovery" => "Pamiršto slaptažodžio atkūrimui įveskite savo el. pašto adresą",
 "Language" => "Kalba",
 "Help translate" => "Padėkite išversti",
-"use this address to connect to your ownCloud in your file manager" => "naudokite šį adresą, jei norite pasiekti savo ownCloud per failų tvarkyklę",
 "Name" => "Vardas",
-"Password" => "Slaptažodis",
 "Groups" => "Grupės",
 "Create" => "Sukurti",
-"Default Quota" => "Numatytoji kvota",
 "Other" => "Kita",
-"Quota" => "Limitas",
 "Delete" => "Ištrinti"
 );
diff --git a/settings/l10n/lv.php b/settings/l10n/lv.php
index 13f4483f1d2..5ae9be48e4f 100644
--- a/settings/l10n/lv.php
+++ b/settings/l10n/lv.php
@@ -22,15 +22,8 @@
 "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",
+"Password" => "Parole",
 "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",
@@ -42,15 +35,11 @@
 "Fill in an email address to enable password recovery" => "Ievadiet epasta adresi, lai vēlak būtu iespēja atgūt paroli, ja būs nepieciešamība",
 "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",
 "Create" => "Izveidot",
-"Default Quota" => "Apjoms pēc noklusējuma",
 "Other" => "Cits",
 "Group Admin" => "Grupas administrators",
-"Quota" => "Apjoms",
 "Delete" => "Izdzēst"
 );
diff --git a/settings/l10n/mk.php b/settings/l10n/mk.php
index 8594825fdd6..4c5f7bf549b 100644
--- a/settings/l10n/mk.php
+++ b/settings/l10n/mk.php
@@ -1,24 +1,40 @@
 <?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",
-"Documentation" => "Документација",
-"Managing Big Files" => "Управување со големи датотеки",
-"Ask a question" => "Постави прашање",
-"Problems connecting to help database." => "Проблем при поврзување со базата за помош",
-"Go there manually." => "Оди таму рачно.",
-"Answer" => "Одговор",
-"Desktop and Mobile Syncing Clients" => "Десктоп и мобилник клиенти за синхронизирање",
-"Download" => "Преземање",
+"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-лиценцирано од <span class=\"author\"></span>",
+"User Documentation" => "Корисничка документација",
+"Administrator Documentation" => "Администраторска документација",
+"Online Documentation" => "Документација на интернет",
+"Forum" => "Форум",
+"Commercial Support" => "Комерцијална подршка",
+"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Имате искористено <strong>%s</strong> од достапните <strong>%s</strong>",
+"Clients" => "Клиенти",
+"Download Desktop Clients" => "Преземи клиенти за десктоп",
+"Download Android Client" => "Преземи клиент за Андроид",
+"Download iOS Client" => "Преземи iOS клиент",
+"Password" => "Лозинка",
+"Your password was changed" => "Вашата лозинка беше променета.",
 "Unable to change your password" => "Вашата лозинка неможе да се смени",
 "Current password" => "Моментална лозинка",
 "New password" => "Нова лозинка",
@@ -29,13 +45,14 @@
 "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",
+"WebDAV" => "WebDAV",
+"Use this address to connect to your ownCloud in your file manager" => "Користете ја оваа адреса да ",
+"Version" => "Верзија",
+"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Развој од <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud заедницата</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">изворниот код</a> е лиценциран со<a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
 "Name" => "Име",
-"Password" => "Лозинка",
 "Groups" => "Групи",
 "Create" => "Создај",
-"Default Quota" => "Предефинирана квота",
 "Other" => "Останато",
-"Quota" => "Квота",
+"Group Admin" => "Администратор на група",
 "Delete" => "Избриши"
 );
diff --git a/settings/l10n/ms_MY.php b/settings/l10n/ms_MY.php
index 5de247110bb..27eb4c2df9f 100644
--- a/settings/l10n/ms_MY.php
+++ b/settings/l10n/ms_MY.php
@@ -12,14 +12,8 @@
 "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",
-"Documentation" => "Dokumentasi",
-"Managing Big Files" => "Mengurus Fail Besar",
-"Ask a question" => "Tanya soalan",
-"Problems connecting to help database." => "Masalah menghubung untuk membantu pengkalan data",
-"Go there manually." => "Pergi ke sana secara manual",
-"Answer" => "Jawapan",
-"Desktop and Mobile Syncing Clients" => "Klien Selarian untuk Desktop dan Mobile",
-"Download" => "Muat turun",
+"Clients" => "klien",
+"Password" => "Kata laluan ",
 "Unable to change your password" => "Gagal mengubah kata laluan anda ",
 "Current password" => "Kata laluan semasa",
 "New password" => "Kata laluan baru",
@@ -30,13 +24,9 @@
 "Fill in an email address to enable password recovery" => "Isi alamat emel anda untuk membolehkan pemulihan kata laluan",
 "Language" => "Bahasa",
 "Help translate" => "Bantu terjemah",
-"use this address to connect to your ownCloud in your file manager" => "guna alamat ini untuk menyambung owncloud anda dalam pengurus fail anda",
 "Name" => "Nama",
-"Password" => "Kata laluan ",
 "Groups" => "Kumpulan",
 "Create" => "Buat",
-"Default Quota" => "Kuota Lalai",
 "Other" => "Lain",
-"Quota" => "Kuota",
 "Delete" => "Padam"
 );
diff --git a/settings/l10n/nb_NO.php b/settings/l10n/nb_NO.php
index 23618fc3024..24a6085b024 100644
--- a/settings/l10n/nb_NO.php
+++ b/settings/l10n/nb_NO.php
@@ -21,14 +21,15 @@
 "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",
-"Managing Big Files" => "Håndtere store filer",
-"Ask a question" => "Still et spørsmål",
-"Problems connecting to help database." => "Problemer med å koble til hjelp-databasen",
-"Go there manually." => "Gå dit manuelt",
-"Answer" => "Svar",
-"Desktop and Mobile Syncing Clients" => "Klienter for datamaskiner og mobile enheter",
-"Download" => "Last ned",
+"User Documentation" => "Brukerdokumentasjon",
+"Administrator Documentation" => "Administratordokumentasjon",
+"Commercial Support" => "Kommersiell støtte",
+"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Du har brukt <strong>%s</strong> av tilgjengelig <strong>%s</strong>",
+"Clients" => "Klienter",
+"Download Desktop Clients" => "Last ned skrivebordsklienter",
+"Download Android Client" => "Last ned Android-klient",
+"Download iOS Client" => "Last ned iOS-klient",
+"Password" => "Passord",
 "Your password was changed" => "Passord har blitt endret",
 "Unable to change your password" => "Kunne ikke endre passordet ditt",
 "Current password" => "Nåværende passord",
@@ -40,14 +41,12 @@
 "Fill in an email address to enable password recovery" => "Oppi epostadressen du vil tilbakestille passordet for",
 "Language" => "Språk",
 "Help translate" => "Bidra til oversettelsen",
-"use this address to connect to your ownCloud in your file manager" => "bruk denne adressen for å koble til din ownCloud gjennom filhåndtereren",
+"WebDAV" => "WebDAV",
+"Version" => "Versjon",
 "Name" => "Navn",
-"Password" => "Passord",
 "Groups" => "Grupper",
 "Create" => "Opprett",
-"Default Quota" => "Standard Kvote",
 "Other" => "Annet",
 "Group Admin" => "Gruppeadministrator",
-"Quota" => "Kvote",
 "Delete" => "Slett"
 );
diff --git a/settings/l10n/nl.php b/settings/l10n/nl.php
index f419ecf74ed..583c044ba47 100644
--- a/settings/l10n/nl.php
+++ b/settings/l10n/nl.php
@@ -23,15 +23,18 @@
 "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" => "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",
+"User Documentation" => "Gebruikersdocumentatie",
+"Administrator Documentation" => "Beheerdersdocumentatie",
+"Online Documentation" => "Online documentatie",
+"Forum" => "Forum",
+"Bugtracker" => "Bugtracker",
+"Commercial Support" => "Commerciële ondersteuning",
 "You have used <strong>%s</strong> of the available <strong>%s</strong>" => "U heeft <strong>%s</strong> van de <strong>%s</strong>  beschikbaren gebruikt",
-"Desktop and Mobile Syncing Clients" => "Desktop en mobiele synchronisatie applicaties",
-"Download" => "Download",
+"Clients" => "Klanten",
+"Download Desktop Clients" => "Download Desktop Clients",
+"Download Android Client" => "Download Android Client",
+"Download iOS Client" => "Download iOS Client",
+"Password" => "Wachtwoord",
 "Your password was changed" => "Je wachtwoord is veranderd",
 "Unable to change your password" => "Niet in staat om uw wachtwoord te wijzigen",
 "Current password" => "Huidig wachtwoord",
@@ -43,15 +46,14 @@
 "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 het bovenstaande adres om verbinding te maken met ownCloud in uw bestandbeheerprogramma",
+"WebDAV" => "WebDAV",
+"Use this address to connect to your ownCloud in your file manager" => "Gebruik dit adres om te verbinden met uw ownCloud in uw bestandsbeheer",
+"Version" => "Versie",
 "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Ontwikkeld door de <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud gemeenschap</a>, de <a href=\"https://github.com/owncloud\" target=\"_blank\">bron code</a> is gelicenseerd onder de <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
 "Name" => "Naam",
-"Password" => "Wachtwoord",
 "Groups" => "Groepen",
 "Create" => "Creëer",
-"Default Quota" => "Standaard limiet",
 "Other" => "Andere",
 "Group Admin" => "Groep beheerder",
-"Quota" => "Limieten",
 "Delete" => "verwijderen"
 );
diff --git a/settings/l10n/nn_NO.php b/settings/l10n/nn_NO.php
index 5f9d7605cc6..9f54fc9ee5f 100644
--- a/settings/l10n/nn_NO.php
+++ b/settings/l10n/nn_NO.php
@@ -10,11 +10,8 @@
 "Enable" => "Slå på",
 "__language_name__" => "Nynorsk",
 "Select an App" => "Vel ein applikasjon",
-"Ask a question" => "Spør om noko",
-"Problems connecting to help database." => "Problem ved tilkopling til hjelpedatabasen.",
-"Go there manually." => "Gå der på eigen hand.",
-"Answer" => "Svar",
-"Download" => "Last ned",
+"Clients" => "Klientar",
+"Password" => "Passord",
 "Unable to change your password" => "Klarte ikkje å endra passordet",
 "Current password" => "Passord",
 "New password" => "Nytt passord",
@@ -25,12 +22,9 @@
 "Fill in an email address to enable password recovery" => "Fyll inn din e-post addresse for og kunne motta passord tilbakestilling",
 "Language" => "Språk",
 "Help translate" => "Hjelp oss å oversett",
-"use this address to connect to your ownCloud in your file manager" => "bruk denne adressa for å kopla til ownCloud i filhandsamaren din",
 "Name" => "Namn",
-"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 f16f5cc91ae..358b44bbec3 100644
--- a/settings/l10n/oc.php
+++ b/settings/l10n/oc.php
@@ -21,13 +21,8 @@
 "Select an App" => "Selecciona una applicacion",
 "See application page at apps.owncloud.com" => "Agacha la pagina d'applications en cò de apps.owncloud.com",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licençiat per <span class=\"author\"></span>",
-"Documentation" => "Documentacion",
-"Managing Big Files" => "Al bailejar de fichièrs pesucasses",
-"Ask a question" => "Respond a una question",
-"Problems connecting to help database." => "Problemas al connectar de la basa de donadas d'ajuda",
-"Go there manually." => "Vas çai manualament",
-"Answer" => "Responsa",
-"Download" => "Avalcarga",
+"Clients" => "Practica",
+"Password" => "Senhal",
 "Your password was changed" => "Ton senhal a cambiat",
 "Unable to change your password" => "Pas possible de cambiar ton senhal",
 "Current password" => "Senhal en cors",
@@ -39,14 +34,10 @@
 "Fill in an email address to enable password recovery" => "Emplena una adreiça de corrièl per permetre lo mandadís del senhal perdut",
 "Language" => "Lenga",
 "Help translate" => "Ajuda a la revirada",
-"use this address to connect to your ownCloud in your file manager" => "utiliza aquela adreiça per te connectar al ownCloud amb ton explorator de fichièrs",
 "Name" => "Nom",
-"Password" => "Senhal",
 "Groups" => "Grops",
 "Create" => "Crea",
-"Default Quota" => "Quota per defaut",
 "Other" => "Autres",
 "Group Admin" => "Grop Admin",
-"Quota" => "Quota",
 "Delete" => "Escafa"
 );
diff --git a/settings/l10n/pl.php b/settings/l10n/pl.php
index e17e3c00e53..1008726d36e 100644
--- a/settings/l10n/pl.php
+++ b/settings/l10n/pl.php
@@ -23,15 +23,9 @@
 "Select an App" => "Zaznacz aplikacje",
 "See application page at apps.owncloud.com" => "Zobacz stronę aplikacji na apps.owncloud.com",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licencjonowane przez <span class=\"author\"></span>",
-"Documentation" => "Dokumentacja",
-"Managing Big Files" => "Zarządzanie dużymi plikami",
-"Ask a question" => "Zadaj pytanie",
-"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>" => "Korzystasz z <strong>%s</strong> z dostępnych <strong>%s</strong>",
-"Desktop and Mobile Syncing Clients" => "Klienci synchronizacji",
-"Download" => "Ściągnij",
+"Clients" => "Klienci",
+"Password" => "Hasło",
 "Your password was changed" => "Twoje hasło zostało zmienione",
 "Unable to change your password" => "Nie można zmienić hasła",
 "Current password" => "Bieżące hasło",
@@ -43,15 +37,11 @@
 "Fill in an email address to enable password recovery" => "Proszę wprowadzić adres e-mail, aby uzyskać możliwość odzyskania hasła",
 "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",
 "Create" => "Utwórz",
-"Default Quota" => "Domyślny udział",
 "Other" => "Inne",
 "Group Admin" => "Grupa Admin",
-"Quota" => "Udział",
 "Delete" => "Usuń"
 );
diff --git a/settings/l10n/pt_BR.php b/settings/l10n/pt_BR.php
index d09e867f7f2..a731d142ce3 100644
--- a/settings/l10n/pt_BR.php
+++ b/settings/l10n/pt_BR.php
@@ -23,15 +23,9 @@
 "Select an App" => "Selecione uma Aplicação",
 "See application page at apps.owncloud.com" => "Ver página do aplicativo em apps.owncloud.com",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licenciado por <span class=\"author\"></span>",
-"Documentation" => "Documentação",
-"Managing Big Files" => "Gerênciando Arquivos Grandes",
-"Ask a question" => "Faça uma pergunta",
-"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 seu espaço de <strong>%s</strong>",
-"Desktop and Mobile Syncing Clients" => "Sincronizando Desktop e Mobile",
-"Download" => "Download",
+"Clients" => "Clientes",
+"Password" => "Senha",
 "Your password was changed" => "Sua senha foi alterada",
 "Unable to change your password" => "Não é possivel alterar a sua senha",
 "Current password" => "Senha atual",
@@ -43,15 +37,11 @@
 "Fill in an email address to enable password recovery" => "Preencha um endereço de email para habilitar a recuperação de senha",
 "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",
 "Create" => "Criar",
-"Default Quota" => "Quota Padrão",
 "Other" => "Outro",
 "Group Admin" => "Grupo Administrativo",
-"Quota" => "Cota",
 "Delete" => "Apagar"
 );
diff --git a/settings/l10n/pt_PT.php b/settings/l10n/pt_PT.php
index 96d9ac67ac4..1cfa991464f 100644
--- a/settings/l10n/pt_PT.php
+++ b/settings/l10n/pt_PT.php
@@ -23,15 +23,18 @@
 "Select an App" => "Selecione uma aplicação",
 "See application page at apps.owncloud.com" => "Ver a página da aplicação em apps.owncloud.com",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licenciado por <span class=\"author\"></span>",
-"Documentation" => "Documentação",
-"Managing Big Files" => "Gestão de ficheiros grandes",
-"Ask a question" => "Coloque uma questão",
-"Problems connecting to help database." => "Problemas ao ligar à base de dados de ajuda",
-"Go there manually." => "Vá lá manualmente",
-"Answer" => "Resposta",
+"User Documentation" => "Documentação de Utilizador",
+"Administrator Documentation" => "Documentação de administrador.",
+"Online Documentation" => "Documentação Online",
+"Forum" => "Fórum",
+"Bugtracker" => "Bugtracker",
+"Commercial Support" => "Suporte Comercial",
 "You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Usou <strong>%s</strong> do disponivel <strong>%s</strong>",
-"Desktop and Mobile Syncing Clients" => "Clientes de sincronização desktop e móvel",
-"Download" => "Transferir",
+"Clients" => "Clientes",
+"Download Desktop Clients" => "Transferir os clientes de sincronização",
+"Download Android Client" => "Transferir o cliente android",
+"Download iOS Client" => "Transferir o cliente iOS",
+"Password" => "Palavra-chave",
 "Your password was changed" => "A sua palavra-passe foi alterada",
 "Unable to change your password" => "Não foi possivel alterar a sua palavra-chave",
 "Current password" => "Palavra-chave actual",
@@ -43,15 +46,14 @@
 "Fill in an email address to enable password recovery" => "Preencha com o seu endereço de email para ativar a recuperação da palavra-chave",
 "Language" => "Idioma",
 "Help translate" => "Ajude a traduzir",
-"use this address to connect to your ownCloud in your file manager" => "utilize este endereço para ligar ao seu ownCloud através do seu gestor de ficheiros",
+"WebDAV" => "WebDAV",
+"Use this address to connect to your ownCloud in your file manager" => "Use este endereço no seu gestor de ficheiros para ligar à sua ownCloud",
+"Version" => "Versão",
 "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Desenvolvido pela <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunidade ownCloud</a>, o<a href=\"https://github.com/owncloud\" target=\"_blank\">código fonte</a> está licenciado sob a <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
 "Name" => "Nome",
-"Password" => "Palavra-chave",
 "Groups" => "Grupos",
 "Create" => "Criar",
-"Default Quota" => "Quota por padrão",
 "Other" => "Outro",
 "Group Admin" => "Grupo Administrador",
-"Quota" => "Quota",
 "Delete" => "Apagar"
 );
diff --git a/settings/l10n/ro.php b/settings/l10n/ro.php
index deabed6f803..4c8b1ac420a 100644
--- a/settings/l10n/ro.php
+++ b/settings/l10n/ro.php
@@ -21,14 +21,8 @@
 "Select an App" => "Selectează o aplicație",
 "See application page at apps.owncloud.com" => "Vizualizează pagina applicației pe apps.owncloud.com",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licențiat <span class=\"author\"></span>",
-"Documentation" => "Documetație",
-"Managing Big Files" => "Gestionînd fișiere mari",
-"Ask a question" => "Întreabă",
-"Problems connecting to help database." => "Probleme de conectare la baza de date.",
-"Go there manually." => "Pe cale manuală.",
-"Answer" => "Răspuns",
-"Desktop and Mobile Syncing Clients" => "Clienți de sincronizare pentru telefon mobil și desktop",
-"Download" => "Descărcări",
+"Clients" => "Clienți",
+"Password" => "Parolă",
 "Your password was changed" => "Parola a fost modificată",
 "Unable to change your password" => "Imposibil de-ați schimbat parola",
 "Current password" => "Parola curentă",
@@ -40,15 +34,11 @@
 "Fill in an email address to enable password recovery" => "Completează o adresă de mail pentru a-ți putea recupera parola",
 "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",
 "Create" => "Crează",
-"Default Quota" => "Cotă implicită",
 "Other" => "Altele",
 "Group Admin" => "Grupul Admin ",
-"Quota" => "Cotă",
 "Delete" => "Șterge"
 );
diff --git a/settings/l10n/ru.php b/settings/l10n/ru.php
index 4853f6fc2d1..48965f9a684 100644
--- a/settings/l10n/ru.php
+++ b/settings/l10n/ru.php
@@ -23,15 +23,13 @@
 "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" => "Ответ",
+"Forum" => "Форум",
 "You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Вы использовали <strong>%s</strong> из доступных <strong>%s</strong>",
-"Desktop and Mobile Syncing Clients" => "Клиенты синхронизации для рабочих станций и мобильных устройств",
-"Download" => "Загрузка",
+"Clients" => "Клиенты",
+"Download Desktop Clients" => "Загрузка приложений для компьютера",
+"Download Android Client" => "Загрузка Android-приложения",
+"Download iOS Client" => "Загрузка iOS-приложения",
+"Password" => "Пароль",
 "Your password was changed" => "Ваш пароль изменён",
 "Unable to change your password" => "Невозможно сменить пароль",
 "Current password" => "Текущий пароль",
@@ -43,15 +41,14 @@
 "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 в вашем файловом менеджере",
+"WebDAV" => "WebDAV",
+"Use this address to connect to your ownCloud in your file manager" => "Используйте этот URL для подключения файлового менеджера к Вашему хранилищу",
+"Version" => "Версия",
 "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Разрабатывается <a href=\"http://ownCloud.org/contact\" target=\"_blank\">сообществом ownCloud</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">исходный код</a> доступен под лицензией <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
 "Name" => "Имя",
-"Password" => "Пароль",
 "Groups" => "Группы",
 "Create" => "Создать",
-"Default Quota" => "Квота по умолчанию",
 "Other" => "Другое",
 "Group Admin" => "Группа Администраторы",
-"Quota" => "Квота",
 "Delete" => "Удалить"
 );
diff --git a/settings/l10n/ru_RU.php b/settings/l10n/ru_RU.php
index 83eb603ba3d..38b736a5c18 100644
--- a/settings/l10n/ru_RU.php
+++ b/settings/l10n/ru_RU.php
@@ -11,6 +11,7 @@
 "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" => "Отключить",
@@ -22,15 +23,17 @@
 "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" => "Ответ",
+"User Documentation" => "Документация пользователя",
+"Administrator Documentation" => "Документация администратора",
+"Online Documentation" => "Документация online",
+"Forum" => "Форум",
+"Bugtracker" => "Отслеживание ошибок",
+"Commercial Support" => "Коммерческая поддержка",
 "You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Вы использовали <strong>%s</strong> из возможных <strong>%s</strong>",
-"Desktop and Mobile Syncing Clients" => "Клиенты синхронизации настольной и мобильной систем",
-"Download" => "Загрузка",
+"Clients" => "Клиенты",
+"Download Android Client" => "Загрузить клиент под Android ",
+"Download iOS Client" => "Загрузить клиент под iOS ",
+"Password" => "Пароль",
 "Your password was changed" => "Ваш пароль был изменен",
 "Unable to change your password" => "Невозможно изменить Ваш пароль",
 "Current password" => "Текущий пароль",
@@ -42,15 +45,14 @@
 "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 в файловом менеджере",
+"WebDAV" => "WebDAV",
+"Use this address to connect to your ownCloud in your file manager" => "Используйте этот адрес для подключения к ownCloud в Вашем файловом менеджере",
+"Version" => "Версия",
 "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Разработанный <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
 "Name" => "Имя",
-"Password" => "Пароль",
 "Groups" => "Группы",
 "Create" => "Создать",
-"Default Quota" => "Квота по умолчанию",
 "Other" => "Другой",
 "Group Admin" => "Группа Admin",
-"Quota" => "квота",
 "Delete" => "Удалить"
 );
diff --git a/settings/l10n/si_LK.php b/settings/l10n/si_LK.php
index 13bd1762d42..4f4834921e9 100644
--- a/settings/l10n/si_LK.php
+++ b/settings/l10n/si_LK.php
@@ -18,13 +18,8 @@
 "Add your App" => "යෙදුමක් එක් කිරීම",
 "More Apps" => "තවත් යෙදුම්",
 "Select an App" => "යෙදුමක් තොරන්න",
-"Documentation" => "ලේඛන",
-"Managing Big Files" => "විශාල ගොනු කළමණාකරනය",
-"Ask a question" => "ප්‍රශ්ණයක් අසන්න",
-"Problems connecting to help database." => "උදව් දත්ත ගබඩාව හා සම්බන්ධවීමේදී ගැටළු ඇතිවිය.",
-"Go there manually." => "ස්වශක්තියෙන් එතැනට යන්න",
-"Answer" => "පිළිතුර",
-"Download" => "භාගත කරන්න",
+"Clients" => "සේවාලාභීන්",
+"Password" => "මුරපදය",
 "Your password was changed" => "ඔබගේ මුර පදය වෙනස් කෙරුණි",
 "Unable to change your password" => "මුර පදය වෙනස් කළ නොහැකි විය",
 "Current password" => "වත්මන් මුරපදය",
@@ -36,15 +31,11 @@
 "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" => "තනන්න",
-"Default Quota" => "සාමාන්‍ය සලාකය",
 "Other" => "වෙනත්",
 "Group Admin" => "කාණ්ඩ පරිපාලක",
-"Quota" => "සලාකය",
 "Delete" => "මකා දමනවා"
 );
diff --git a/settings/l10n/sk_SK.php b/settings/l10n/sk_SK.php
index 179cbe250b5..c3cf84f1fe8 100644
--- a/settings/l10n/sk_SK.php
+++ b/settings/l10n/sk_SK.php
@@ -23,15 +23,9 @@
 "Select an App" => "Vyberte aplikáciu",
 "See application page at apps.owncloud.com" => "Pozrite si stránku aplikácií na apps.owncloud.com",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licencované <span class=\"author\"></span>",
-"Documentation" => "Dokumentácia",
-"Managing Big Files" => "Správa veľkých súborov",
-"Ask a question" => "Opýtať sa otázku",
-"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> z <strong>%s</strong> dostupných ",
-"Desktop and Mobile Syncing Clients" => "Klienti pre synchronizáciu",
-"Download" => "Stiahnúť",
+"Clients" => "Klienti",
+"Password" => "Heslo",
 "Your password was changed" => "Heslo bolo zmenené",
 "Unable to change your password" => "Nie je možné zmeniť vaše heslo",
 "Current password" => "Aktuálne heslo",
@@ -43,15 +37,11 @@
 "Fill in an email address to enable password recovery" => "Vyplňte emailovú adresu pre aktivovanie obnovy hesla",
 "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",
 "Create" => "Vytvoriť",
-"Default Quota" => "Predvolená kvóta",
 "Other" => "Iné",
 "Group Admin" => "Správca skupiny",
-"Quota" => "Kvóta",
 "Delete" => "Odstrániť"
 );
diff --git a/settings/l10n/sl.php b/settings/l10n/sl.php
index b65a7ad641d..ce12b4e3e22 100644
--- a/settings/l10n/sl.php
+++ b/settings/l10n/sl.php
@@ -23,15 +23,9 @@
 "Select an App" => "Izberite program",
 "See application page at apps.owncloud.com" => "Obiščite spletno stran programa na apps.owncloud.com",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-z dovoljenjem s strani <span class=\"author\"></span>",
-"Documentation" => "Dokumentacija",
-"Managing Big Files" => "Upravljanje velikih datotek",
-"Ask a question" => "Zastavi vprašanje",
-"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>" => "Uporabljate <strong>%s</strong> od razpoložljivih <strong>%s</strong>",
-"Desktop and Mobile Syncing Clients" => "Namizni in mobilni odjemalci za usklajevanje",
-"Download" => "Prejmi",
+"Clients" => "Stranka",
+"Password" => "Geslo",
 "Your password was changed" => "Vaše geslo je spremenjeno",
 "Unable to change your password" => "Gesla ni mogoče spremeniti.",
 "Current password" => "Trenutno geslo",
@@ -43,15 +37,11 @@
 "Fill in an email address to enable password recovery" => "Vpišite vaš elektronski naslov in s tem omogočite obnovitev gesla",
 "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",
 "Create" => "Ustvari",
-"Default Quota" => "Privzeta količinska omejitev",
 "Other" => "Drugo",
 "Group Admin" => "Skrbnik skupine",
-"Quota" => "Količinska omejitev",
 "Delete" => "Izbriši"
 );
diff --git a/settings/l10n/sr.php b/settings/l10n/sr.php
index 924d6a07b39..9fb495a9ebb 100644
--- a/settings/l10n/sr.php
+++ b/settings/l10n/sr.php
@@ -23,15 +23,9 @@
 "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" => "Преузимање",
+"Clients" => "Клијенти",
+"Password" => "Лозинка",
 "Your password was changed" => "Лозинка је промењена",
 "Unable to change your password" => "Не могу да изменим вашу лозинку",
 "Current password" => "Тренутна лозинка",
@@ -43,15 +37,11 @@
 "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 13d3190df8b..9ee84bc255a 100644
--- a/settings/l10n/sr@latin.php
+++ b/settings/l10n/sr@latin.php
@@ -4,11 +4,8 @@
 "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",
+"Clients" => "Klijenti",
+"Password" => "Lozinka",
 "Unable to change your password" => "Ne mogu da izmenim vašu lozinku",
 "Current password" => "Trenutna lozinka",
 "New password" => "Nova lozinka",
@@ -16,9 +13,7 @@
 "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",
diff --git a/settings/l10n/sv.php b/settings/l10n/sv.php
index c829e0376b7..681db2099a1 100644
--- a/settings/l10n/sv.php
+++ b/settings/l10n/sv.php
@@ -23,15 +23,18 @@
 "Select an App" => "Välj en App",
 "See application page at apps.owncloud.com" => "Se programsida på apps.owncloud.com",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licensierad av <span class=\"author\"></span>",
-"Documentation" => "Dokumentation",
-"Managing Big Files" => "Hantering av stora filer",
-"Ask a question" => "Ställ en fråga",
-"Problems connecting to help database." => "Problem med att ansluta till hjälpdatabasen.",
-"Go there manually." => "Gå dit manuellt.",
-"Answer" => "Svar",
+"User Documentation" => "Användardokumentation",
+"Administrator Documentation" => "Administratördokumentation",
+"Online Documentation" => "Onlinedokumentation",
+"Forum" => "Forum",
+"Bugtracker" => "Bugtracker",
+"Commercial Support" => "Kommersiell support",
 "You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Du har använt <strong>%s</strong> av tillgängliga <strong>%s</strong>",
-"Desktop and Mobile Syncing Clients" => "Synkroniseringsklienter för dator och mobil",
-"Download" => "Ladda ner",
+"Clients" => "Kunder",
+"Download Desktop Clients" => "Ladda ner skrivbordsklienter",
+"Download Android Client" => "Ladda ner klient för Android",
+"Download iOS Client" => "Ladda ner klient för iOS",
+"Password" => "Lösenord",
 "Your password was changed" => "Ditt lösenord har ändrats",
 "Unable to change your password" => "Kunde inte ändra ditt lösenord",
 "Current password" => "Nuvarande lösenord",
@@ -43,15 +46,18 @@
 "Fill in an email address to enable password recovery" => "Fyll i en e-postadress för att aktivera återställning av lösenord",
 "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",
+"WebDAV" => "WebDAV",
+"Use this address to connect to your ownCloud in your file manager" => "Använd denna adress för att ansluta till ownCloud i din filhanterare",
+"Version" => "Version",
 "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Utvecklad av <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud kommunity</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">källkoden</a> är licenserad under <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
 "Name" => "Namn",
-"Password" => "Lösenord",
 "Groups" => "Grupper",
 "Create" => "Skapa",
-"Default Quota" => "Förvald datakvot",
+"Default Storage" => "Förvald lagring",
+"Unlimited" => "Obegränsad",
 "Other" => "Annat",
 "Group Admin" => "Gruppadministratör",
-"Quota" => "Kvot",
+"Storage" => "Lagring",
+"Default" => "Förvald",
 "Delete" => "Radera"
 );
diff --git a/settings/l10n/ta_LK.php b/settings/l10n/ta_LK.php
index c0189a5bdaf..3b3b1f8dddf 100644
--- a/settings/l10n/ta_LK.php
+++ b/settings/l10n/ta_LK.php
@@ -22,15 +22,9 @@
 "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" => "பதிவிறக்குக",
+"Clients" => "வாடிக்கையாளர்கள்",
+"Password" => "கடவுச்சொல்",
 "Your password was changed" => "உங்களுடைய கடவுச்சொல் மாற்றப்பட்டுள்ளது",
 "Unable to change your password" => "உங்களுடைய கடவுச்சொல்லை மாற்றமுடியாது",
 "Current password" => "தற்போதைய கடவுச்சொல்",
@@ -42,15 +36,11 @@
 "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 3431fedac0a..558af48df14 100644
--- a/settings/l10n/th_TH.php
+++ b/settings/l10n/th_TH.php
@@ -22,15 +22,9 @@
 "Select an App" => "เลือก App",
 "See application page at apps.owncloud.com" => "ดูหน้าแอพพลิเคชั่นที่ apps.owncloud.com",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-ลิขสิทธิ์การใช้งานโดย <span class=\"author\"></span>",
-"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" => "ดาวน์โหลด",
+"Clients" => "ลูกค้า",
+"Password" => "รหัสผ่าน",
 "Your password was changed" => "รหัสผ่านของคุณถูกเปลี่ยนแล้ว",
 "Unable to change your password" => "ไม่สามารถเปลี่ยนรหัสผ่านของคุณได้",
 "Current password" => "รหัสผ่านปัจจุบัน",
@@ -42,15 +36,11 @@
 "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>." => "พัฒนาโดย 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" => "กลุ่ม",
 "Create" => "สร้าง",
-"Default Quota" => "โควต้าที่กำหนดไว้เริ่มต้น",
 "Other" => "อื่นๆ",
 "Group Admin" => "ผู้ดูแลกลุ่ม",
-"Quota" => "พื้นที่",
 "Delete" => "ลบ"
 );
diff --git a/settings/l10n/tr.php b/settings/l10n/tr.php
index 1e301e8d323..295dbfab584 100644
--- a/settings/l10n/tr.php
+++ b/settings/l10n/tr.php
@@ -20,14 +20,17 @@
 "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",
-"Managing Big Files" => "Büyük Dosyaların Yönetimi",
-"Ask a question" => "Bir soru sorun",
-"Problems connecting to help database." => "Yardım veritabanına bağlanmada sorunlar var.",
-"Go there manually." => "Oraya elle gidin.",
-"Answer" => "Cevap",
-"Desktop and Mobile Syncing Clients" => "Masaüstü ve Mobil Senkron İstemcileri",
-"Download" => "İndir",
+"User Documentation" => "Kullanıcı Belgelendirmesi",
+"Administrator Documentation" => "Yönetici Belgelendirmesi",
+"Online Documentation" => "Çevrimiçi Belgelendirme",
+"Forum" => "Forum",
+"Bugtracker" => "Hata Takip Sistemi",
+"Commercial Support" => "Ticari Destek",
+"Clients" => "Müşteriler",
+"Download Desktop Clients" => "Masaüstü İstemcilerini İndir",
+"Download Android Client" => "Android İstemcisini İndir",
+"Download iOS Client" => "iOS İstemcisini İndir",
+"Password" => "Parola",
 "Your password was changed" => "Şifreniz değiştirildi",
 "Unable to change your password" => "Parolanız değiştirilemiyor",
 "Current password" => "Mevcut parola",
@@ -39,15 +42,13 @@
 "Fill in an email address to enable password recovery" => "Parola sıfırlamayı aktifleştirmek için eposta adresi girin",
 "Language" => "Dil",
 "Help translate" => "Çevirilere yardım edin",
-"use this address to connect to your ownCloud in your file manager" => "bu adresi kullanarak ownCloud unuza dosya yöneticinizle bağlanın",
+"WebDAV" => "WebDAV",
+"Version" => "Sürüm",
 "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Geliştirilen Taraf<a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is altında lisanslanmıştır <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
 "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 d1a0d6d9091..d6a9e9fa491 100644
--- a/settings/l10n/uk.php
+++ b/settings/l10n/uk.php
@@ -23,15 +23,18 @@
 "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" => "Відповідь",
+"User Documentation" => "Документація Користувача",
+"Administrator Documentation" => "Документація Адміністратора",
+"Online Documentation" => "Он-Лайн Документація",
+"Forum" => "Форум",
+"Bugtracker" => "БагТрекер",
+"Commercial Support" => "Комерційна підтримка",
 "You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Ви використали <strong>%s</strong> із доступних <strong>%s</strong>",
-"Desktop and Mobile Syncing Clients" => "Настільні та мобільні клієнти синхронізації",
-"Download" => "Завантажити",
+"Clients" => "Клієнти",
+"Download Desktop Clients" => "Завантажити клієнт для ПК",
+"Download Android Client" => "Завантажити клієнт для Android",
+"Download iOS Client" => "Завантажити клієнт для iOS",
+"Password" => "Пароль",
 "Your password was changed" => "Ваш пароль змінено",
 "Unable to change your password" => "Не вдалося змінити Ваш пароль",
 "Current password" => "Поточний пароль",
@@ -43,15 +46,14 @@
 "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 у Вашому файловому менеджері",
+"WebDAV" => "WebDAV",
+"Use this address to connect to your ownCloud in your file manager" => "Використовуйте цю адресу для під'єднання до вашого ownCloud у вашому файловому менеджері",
+"Version" => "Версія",
 "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Розроблено <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud громадою</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">вихідний код</a> має ліцензію <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
 "Name" => "Ім'я",
-"Password" => "Пароль",
 "Groups" => "Групи",
 "Create" => "Створити",
-"Default Quota" => "Квота за замовчуванням",
 "Other" => "Інше",
 "Group Admin" => "Адміністратор групи",
-"Quota" => "Квота",
 "Delete" => "Видалити"
 );
diff --git a/settings/l10n/vi.php b/settings/l10n/vi.php
index 7857b0509e6..9651bee1124 100644
--- a/settings/l10n/vi.php
+++ b/settings/l10n/vi.php
@@ -23,15 +23,9 @@
 "Select an App" => "Chọn một ứng dụng",
 "See application page at apps.owncloud.com" => "Xem nhiều ứng dụng hơn tại apps.owncloud.com",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-Giấy phép được cấp bởi  <span class=\"author\"></span>",
-"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.",
-"Answer" => "trả lời",
 "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ề",
+"Clients" => "Khách hàng",
+"Password" => "Mật khẩu",
 "Your password was changed" => "Mật khẩu của bạn đã được thay đổi.",
 "Unable to change your password" => "Không thể đổi mật khẩu",
 "Current password" => "Mật khẩu cũ",
@@ -43,15 +37,11 @@
 "Fill in an email address to enable password recovery" => "Nhập địa chỉ email của bạn để khôi phục lại mật khẩu",
 "Language" => "Ngôn ngữ",
 "Help translate" => "Hỗ trợ dịch thuật",
-"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",
 "Create" => "Tạo",
-"Default Quota" => "Hạn ngạch mặt định",
 "Other" => "Khác",
 "Group Admin" => "Nhóm quản trị",
-"Quota" => "Hạn ngạch",
 "Delete" => "Xóa"
 );
diff --git a/settings/l10n/zh_CN.GB2312.php b/settings/l10n/zh_CN.GB2312.php
index 4784ff7ff9d..6afcc1ecd56 100644
--- a/settings/l10n/zh_CN.GB2312.php
+++ b/settings/l10n/zh_CN.GB2312.php
@@ -22,14 +22,8 @@
 "Select an App" => "选择一个程序",
 "See application page at apps.owncloud.com" => "在owncloud.com上查看应用程序",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>授权协议 <span class=\"author\"></span>",
-"Documentation" => "文档",
-"Managing Big Files" => "管理大文件",
-"Ask a question" => "提一个问题",
-"Problems connecting to help database." => "连接到帮助数据库时的问题",
-"Go there manually." => "收到转到.",
-"Answer" => "回答",
-"Desktop and Mobile Syncing Clients" => "桌面和移动同步客户端",
-"Download" => "下载",
+"Clients" => "客户",
+"Password" => "密码",
 "Your password was changed" => "您的密码以变更",
 "Unable to change your password" => "不能改变你的密码",
 "Current password" => "现在的密码",
@@ -41,15 +35,11 @@
 "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\">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" => "组",
 "Create" => "新建",
-"Default Quota" => "默认限额",
 "Other" => "其他的",
 "Group Admin" => "群组管理员",
-"Quota" => "限额",
 "Delete" => "删除"
 );
diff --git a/settings/l10n/zh_CN.php b/settings/l10n/zh_CN.php
index 87c8172d6fa..00e51d211c4 100644
--- a/settings/l10n/zh_CN.php
+++ b/settings/l10n/zh_CN.php
@@ -23,15 +23,18 @@
 "Select an App" => "选择一个应用",
 "See application page at apps.owncloud.com" => "查看在 app.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" => "回答",
+"User Documentation" => "用户文档",
+"Administrator Documentation" => "管理员文档",
+"Online Documentation" => "在线文档",
+"Forum" => "论坛",
+"Bugtracker" => "问题跟踪器",
+"Commercial Support" => "商业支持",
 "You have used <strong>%s</strong> of the available <strong>%s</strong>" => "你已使用 <strong>%s</strong>，有效空间 <strong>%s</strong>",
-"Desktop and Mobile Syncing Clients" => "桌面和移动设备同步客户端",
-"Download" => "下载",
+"Clients" => "客户",
+"Download Desktop Clients" => "下载桌面客户端",
+"Download Android Client" => "下载 Android 客户端",
+"Download iOS Client" => "下载 iOS 客户端",
+"Password" => "密码",
 "Your password was changed" => "密码已修改",
 "Unable to change your password" => "无法修改密码",
 "Current password" => "当前密码",
@@ -43,15 +46,14 @@
 "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",
+"WebDAV" => "WebDAV",
+"Use this address to connect to your ownCloud in your file manager" => "用该地址来连接文件管理器中的 ownCloud",
+"Version" => "版本",
 "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "由<a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud社区</a>开发，  <a href=\"https://github.com/owncloud\" target=\"_blank\">源代码</a>在<a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>许可证下发布。",
 "Name" => "名称",
-"Password" => "密码",
 "Groups" => "组",
 "Create" => "创建",
-"Default Quota" => "默认配额",
 "Other" => "其它",
 "Group Admin" => "组管理员",
-"Quota" => "配额",
 "Delete" => "删除"
 );
diff --git a/settings/l10n/zh_TW.php b/settings/l10n/zh_TW.php
index 7de5ee5f54d..d25ae4e149c 100644
--- a/settings/l10n/zh_TW.php
+++ b/settings/l10n/zh_TW.php
@@ -23,15 +23,9 @@
 "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" => "下載",
+"Clients" => "客戶",
+"Password" => "密碼",
 "Your password was changed" => "你的密碼已更改",
 "Unable to change your password" => "無法變更你的密碼",
 "Current password" => "目前密碼",
@@ -43,15 +37,11 @@
 "Fill in an email address to enable password recovery" => "請填入電子郵件信箱以便回復密碼",
 "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" => "群組",
 "Create" => "創造",
-"Default Quota" => "預設容量限制",
 "Other" => "其他",
 "Group Admin" => "群組 管理員",
-"Quota" => "容量限制",
 "Delete" => "刪除"
 );
diff --git a/settings/templates/admin.php b/settings/templates/admin.php
index 9c4ee0bf680..26335063d4b 100644
--- a/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@ -3,30 +3,44 @@
  * 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
 
-if(!$_['htaccessworking']) {
-?>
+// is htaccess working ?
+if (!$_['htaccessworking']) {
+    ?>
 <fieldset class="personalblock">
-	<legend><strong><?php echo $l->t('Security Warning');?></strong></legend>
+    <legend><strong><?php echo $l->t('Security Warning');?></strong></legend>
 
 	<span class="securitywarning">
         <?php echo $l->t('Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root.'); ?>
     </span>
-	
-</fieldset>	
-<?php	
+
+</fieldset>
+<?php
 }
-?>
 
+// is locale working ?
+if (!$_['islocaleworking']) {
+    ?>
+<fieldset class="personalblock">
+    <legend><strong><?php echo $l->t('Locale not working');?></strong></legend>
+
+        <span class="connectionwarning">
+        <?php echo $l->t('This ownCloud server can\'t set system locale to "en_US.UTF-8". This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support en_US.UTF-8.'); ?>
+    </span>
+
+</fieldset>
 <?php
-if(!$_['internetconnectionworking']) {
-?>
+}
+
+// is internet connection working ?
+if (!$_['internetconnectionworking']) {
+    ?>
 <fieldset class="personalblock">
-        <legend><strong><?php echo $l->t('Internet connection not working');?></strong></legend>
+    <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.'); ?>
@@ -37,104 +51,126 @@ if(!$_['internetconnectionworking']) {
 }
 ?>
 
-<?php foreach($_['forms'] as $form) {
-	echo $form;
-};?>
+<?php foreach ($_['forms'] as $form) {
+    echo $form;
+}
+;?>
 
 <fieldset class="personalblock" id="backgroundjobs">
-	<legend><strong><?php echo $l->t('Cron');?></strong></legend>
-	<table class="nostyle">
-		<tr>
-			<td>
-				<input type="radio" name="mode" value="ajax" id="backgroundjobs_ajax" <?php if( $_['backgroundjobs_mode'] == "ajax" ) { echo 'checked="checked"'; } ?>>
-				<label for="backgroundjobs_ajax">AJAX</label><br />
-				<em><?php echo $l->t("Execute one task with each page loaded"); ?></em>
-			</td>
-		</tr><tr>
-			<td>
-				<input type="radio" name="mode" value="webcron" id="backgroundjobs_webcron" <?php if( $_['backgroundjobs_mode'] == "webcron" ) { echo 'checked="checked"'; } ?>>
-				<label for="backgroundjobs_webcron">Webcron</label><br />
-				<em><?php echo $l->t("cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http."); ?></em>
-			</td>
-		</tr><tr>
-			<td>
-				<input type="radio" name="mode" value="cron" id="backgroundjobs_cron" <?php if( $_['backgroundjobs_mode'] == "cron" ) { echo 'checked="checked"'; } ?>>
-				<label for="backgroundjobs_cron">Cron</label><br />
-				<em><?php echo $l->t("Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute."); ?></em>
-			</td>
-		</tr>
-	</table>
+    <legend><strong><?php echo $l->t('Cron');?></strong></legend>
+    <table class="nostyle">
+        <tr>
+            <td>
+                <input type="radio" name="mode" value="ajax"
+                       id="backgroundjobs_ajax" <?php if ($_['backgroundjobs_mode'] == "ajax") {
+                    echo 'checked="checked"';
+                } ?>>
+                <label for="backgroundjobs_ajax">AJAX</label><br/>
+                <em><?php echo $l->t("Execute one task with each page loaded"); ?></em>
+            </td>
+        </tr>
+        <tr>
+            <td>
+                <input type="radio" name="mode" value="webcron"
+                       id="backgroundjobs_webcron" <?php if ($_['backgroundjobs_mode'] == "webcron") {
+                    echo 'checked="checked"';
+                } ?>>
+                <label for="backgroundjobs_webcron">Webcron</label><br/>
+                <em><?php echo $l->t("cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http."); ?></em>
+            </td>
+        </tr>
+        <tr>
+            <td>
+                <input type="radio" name="mode" value="cron"
+                       id="backgroundjobs_cron" <?php if ($_['backgroundjobs_mode'] == "cron") {
+                    echo 'checked="checked"';
+                } ?>>
+                <label for="backgroundjobs_cron">Cron</label><br/>
+                <em><?php echo $l->t("Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute."); ?></em>
+            </td>
+        </tr>
+    </table>
 </fieldset>
 
 <fieldset class="personalblock" id="shareAPI">
-	<legend><strong><?php echo $l->t('Sharing');?></strong></legend>
-	<table class="shareAPI nostyle">
-		<tr>
-			<td id="enable">
-				<input type="checkbox" name="shareapi_enabled" id="shareAPIEnabled" value="1" <?php if ($_['shareAPIEnabled'] == 'yes') echo 'checked="checked"'; ?> />
-				<label for="shareAPIEnabled"><?php echo $l->t('Enable Share API');?></label><br />
-				<em><?php echo $l->t('Allow apps to use the Share API'); ?></em>
-			</td>
-		</tr><tr>
-			<td <?php if ($_['shareAPIEnabled'] == 'no') echo 'style="display:none"';?>>
-				<input type="checkbox" name="shareapi_allow_links" id="allowLinks" value="1" <?php if ($_['allowLinks'] == 'yes') echo 'checked="checked"'; ?> />
-				<label for="allowLinks"><?php echo $l->t('Allow links');?></label><br />
-				<em><?php echo $l->t('Allow users to share items to the public with links'); ?></em>
-			</td>
-		</tr><tr>
-			<td <?php if ($_['shareAPIEnabled'] == 'no') echo 'style="display:none"';?>>
-				<input type="checkbox" name="shareapi_allow_resharing" id="allowResharing" value="1" <?php if ($_['allowResharing'] == 'yes') echo 'checked="checked"'; ?> />
-				<label for="allowResharing"><?php echo $l->t('Allow resharing');?></label><br />
-				<em><?php echo $l->t('Allow users to share items shared with them again'); ?></em>
-			</td>
-		</tr><tr>
-			<td <?php if ($_['shareAPIEnabled'] == 'no') echo 'style="display:none"';?>>
-				<input type="radio" name="shareapi_share_policy" id="sharePolicyGlobal" value="global" <?php if ($_['sharePolicy'] == 'global') echo 'checked="checked"'; ?> />
-				<label for="sharePolicyGlobal"><?php echo $l->t('Allow users to share with anyone'); ?></label><br />
-				<input type="radio" name="shareapi_share_policy" id="sharePolicyGroupsOnly" value="groups_only" <?php if ($_['sharePolicy'] == 'groups_only') echo 'checked="checked"'; ?> />
-				<label for="sharePolicyGroupsOnly"><?php echo $l->t('Allow users to only share with users in their groups');?></label><br />
-			</td>
-		</tr>
-	</table>
+    <legend><strong><?php echo $l->t('Sharing');?></strong></legend>
+    <table class="shareAPI nostyle">
+        <tr>
+            <td id="enable">
+                <input type="checkbox" name="shareapi_enabled" id="shareAPIEnabled"
+                       value="1" <?php if ($_['shareAPIEnabled'] == 'yes') echo 'checked="checked"'; ?> />
+                <label for="shareAPIEnabled"><?php echo $l->t('Enable Share API');?></label><br/>
+                <em><?php echo $l->t('Allow apps to use the Share API'); ?></em>
+            </td>
+        </tr>
+        <tr>
+            <td <?php if ($_['shareAPIEnabled'] == 'no') echo 'style="display:none"';?>>
+                <input type="checkbox" name="shareapi_allow_links" id="allowLinks"
+                       value="1" <?php if ($_['allowLinks'] == 'yes') echo 'checked="checked"'; ?> />
+                <label for="allowLinks"><?php echo $l->t('Allow links');?></label><br/>
+                <em><?php echo $l->t('Allow users to share items to the public with links'); ?></em>
+            </td>
+        </tr>
+        <tr>
+            <td <?php if ($_['shareAPIEnabled'] == 'no') echo 'style="display:none"';?>>
+                <input type="checkbox" name="shareapi_allow_resharing" id="allowResharing"
+                       value="1" <?php if ($_['allowResharing'] == 'yes') echo 'checked="checked"'; ?> />
+                <label for="allowResharing"><?php echo $l->t('Allow resharing');?></label><br/>
+                <em><?php echo $l->t('Allow users to share items shared with them again'); ?></em>
+            </td>
+        </tr>
+        <tr>
+            <td <?php if ($_['shareAPIEnabled'] == 'no') echo 'style="display:none"';?>>
+                <input type="radio" name="shareapi_share_policy" id="sharePolicyGlobal"
+                       value="global" <?php if ($_['sharePolicy'] == 'global') echo 'checked="checked"'; ?> />
+                <label for="sharePolicyGlobal"><?php echo $l->t('Allow users to share with anyone'); ?></label><br/>
+                <input type="radio" name="shareapi_share_policy" id="sharePolicyGroupsOnly"
+                       value="groups_only" <?php if ($_['sharePolicy'] == 'groups_only') echo 'checked="checked"'; ?> />
+                <label for="sharePolicyGroupsOnly"><?php echo $l->t('Allow users to only share with users in their groups');?></label><br/>
+            </td>
+        </tr>
+    </table>
 </fieldset>
 
 <fieldset class="personalblock">
-	<legend><strong><?php echo $l->t('Log');?></strong></legend>
-	Log level: <select name='loglevel' id='loglevel'>
-		<option value='<?php echo $_['loglevel']?>'><?php echo $levels[$_['loglevel']]?></option>
-		<?php for($i=0;$i<5;$i++):
-			if($i!=$_['loglevel']):?>
-				<option value='<?php echo $i?>'><?php echo $levels[$i]?></option>
-			<?php endif;
-		endfor;?>
-	</select>
-	<table id='log'>
-	<?php foreach($_['entries'] as $entry):?>
-		<tr>
-			<td>
-				<?php echo $levels[$entry->level];?>
-			</td>
-			<td>
-				<?php echo $entry->app;?>
-			</td>
-			<td>
-				<?php echo $entry->message;?>
-			</td>
-			<td>
-				<?php echo OC_Util::formatDate($entry->time);?>
-			</td>
-		</tr>
-	<?php endforeach;?>
-</table>
-<?php if($_['entriesremain']): ?>
-<input id='moreLog' type='button' value='<?php echo $l->t('More');?>...'></input>
-<?php endif; ?>
+    <legend><strong><?php echo $l->t('Log');?></strong></legend>
+    <?php echo $l->t('Log level');?> <select name='loglevel' id='loglevel'>
+    <option value='<?php echo $_['loglevel']?>'><?php echo $levels[$_['loglevel']]?></option>
+    <?php for ($i = 0; $i < 5; $i++):
+    if ($i != $_['loglevel']):?>
+        <option value='<?php echo $i?>'><?php echo $levels[$i]?></option>
+        <?php endif;
+endfor;?>
+</select>
+    <table id='log'>
+        <?php foreach ($_['entries'] as $entry): ?>
+        <tr>
+            <td>
+                <?php echo $levels[$entry->level];?>
+            </td>
+            <td>
+                <?php echo $entry->app;?>
+            </td>
+            <td>
+                <?php echo $entry->message;?>
+            </td>
+            <td>
+                <?php echo OC_Util::formatDate($entry->time);?>
+            </td>
+        </tr>
+        <?php endforeach;?>
+    </table>
+    <?php if ($_['entriesremain']): ?>
+    <input id='moreLog' type='button' value='<?php echo $l->t('More');?>...'></input>
+    <?php endif; ?>
 
 </fieldset>
 
 
-<p class="personalblock">
-	<strong>ownCloud</strong> <?php echo(OC_Util::getVersionString()); ?> <?php echo(OC_Util::getEditionString()); ?> (<?php echo(OC_Updater::ShowUpdatingHint()); ?>)<br />
+<fieldset class="personalblock">
+    <legend><strong><?php echo $l->t('Version');?></strong></legend>
+    <strong>ownCloud</strong> <?php echo(OC_Util::getVersionString()); ?> <?php echo(OC_Util::getEditionString()); ?>
+    (<?php echo(OC_Updater::ShowUpdatingHint()); ?>)<br/>
     <?php echo $l->t('Developed by the <a href="http://ownCloud.org/contact" target="_blank">ownCloud community</a>, the <a href="https://github.com/owncloud" target="_blank">source code</a> is licensed under the <a href="http://www.gnu.org/licenses/agpl-3.0.html" target="_blank"><abbr title="Affero General Public License">AGPL</abbr></a>.'); ?>
-</p>
+</fieldset>
 
diff --git a/settings/templates/help.php b/settings/templates/help.php
index 75201a86a9f..b697905f7ef 100644
--- a/settings/templates/help.php
+++ b/settings/templates/help.php
@@ -1,34 +1,35 @@
-<?php
-/**
- * 2012 Frank Karlitschek frank@owncloud.org
- * This file is licensed under the Affero General Public License version 3 or later.
- * See the COPYING-README file.
- */?>
-
 <div id="controls">
-	<a class="button newquestion" href="http://owncloud.org/support" target="_blank"><?php echo $l->t( 'Documentation' ); ?></a>
-	<a class="button newquestion" href="http://owncloud.org/support/big-files" target="_blank"><?php echo $l->t( 'Managing Big Files' ); ?></a>
-	<a class="button newquestion" href="http://apps.owncloud.com/knowledgebase/editquestion.php?action=new" target="_blank"><?php echo $l->t( 'Ask a question' ); ?></a>
-	<?php
-		$url=OC_Helper::linkTo( "settings", "help.php" ).'?page=';
-		$pageNavi=OC_Util::getPageNavi($_['pagecount'], $_['page'], $url);
-		if($pageNavi) {
-			$pageNavi->printPage();
-		}
-	?>
-</diV>
-<?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>
-	</div>
-<?php else:?>
-	<?php foreach($_["kbe"] as $kb): ?>
-	<div class="helpblock">
-		<?php if($kb["preview1"] <> "") echo('<img class="preview" src="'.$kb["preview1"].'" />'); ?>
-		<?php if($kb['detailpage']<>'') echo('<p><a target="_blank" href="'.$kb['detailpage'].'"><strong>'.$kb["name"].'</strong></a></p>');?>
-		<p><?php echo $kb['description'];?></p>
-		<?php if($kb['answer']<>'') echo('<p><strong>'.$l->t('Answer').':</strong><p>'.$kb['answer'].'</p>');?>
-	</div>
-	<?php endforeach;
-endif?>
+        <?php if($_['admin']) { ?>
+		<a class="button newquestion <?php echo($_['style1']); ?>" href="<?php echo($_['url1']); ?>"><?php echo $l->t( 'User Documentation' ); ?></a>
+   	     	<a class="button newquestion <?php echo($_['style2']); ?>" href="<?php echo($_['url2']); ?>"><?php echo $l->t( 'Administrator Documentation' ); ?></a>
+	<?php } ?>
+        <a class="button newquestion" href="http://owncloud.org/support" target="_blank"><?php echo $l->t( 'Online Documentation' ); ?></a>
+        <a class="button newquestion" href="http://forum.owncloud.org" target="_blank"><?php echo $l->t( 'Forum' ); ?></a>
+        <?php if($_['admin']) { ?>
+		<a class="button newquestion" href="https://github.com/owncloud/core/issues" target="_blank"><?php echo $l->t( 'Bugtracker' ); ?></a>
+	<?php } ?>
+        <a class="button newquestion" href="http://owncloud.com" target="_blank"><?php echo $l->t( 'Commercial Support' ); ?></a>
+</div>
+<br /><br />
+<iframe src="<?php echo($_['url']); ?>" width="100%" id="ifm" ></iframe>
+
+
+<script language="JavaScript">
+<!--
+
+function pageY(elem) {
+    return elem.offsetParent ? (elem.offsetTop + pageY(elem.offsetParent)) : elem.offsetTop;
+}
+var buffer = 5; //scroll bar buffer
+function resizeIframe() {
+    var height = document.documentElement.clientHeight;
+    height -= pageY(document.getElementById('ifm'))+ buffer ;
+    height = (height < 0) ? 0 : height;
+    document.getElementById('ifm').style.height = height + 'px';
+}
+
+document.getElementById('ifm').onload=resizeIframe;
+window.onresize = resizeIframe;
+
+//-->
+</script>
diff --git a/settings/templates/personal.php b/settings/templates/personal.php
index d02bcdd7ea5..35eb0ef5e9a 100644
--- a/settings/templates/personal.php
+++ b/settings/templates/personal.php
@@ -8,26 +8,29 @@
 	<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">
-	<?php echo $l->t('Desktop and Mobile Syncing Clients');?>
-	<a class="button" href="http://owncloud.org/sync-clients/" target="_blank"><?php echo $l->t('Download');?></a>
-</div>
+<fieldset class="personalblock">
+	<legend><strong><?php echo $l->t('Clients');?></strong></legend>
+	<a class="button" href="http://owncloud.org/sync-clients/" target="_blank"><?php echo $l->t('Download Desktop Clients');?></a>
+	<a class="button" href="https://play.google.com/store/apps/details?id=com.owncloud.android" target="_blank"><?php echo $l->t('Download Android Client');?></a>
+	<a class="button" href="https://itunes.apple.com/us/app/owncloud/id543672169?mt=8" target="_blank"><?php echo $l->t('Download iOS Client');?></a>
+</fieldset>
 
 
 <form id="passwordform">
 	<fieldset class="personalblock">
+		<legend><strong><?php echo $l->t('Password');?></strong></legend>
 		<div id="passwordchanged"><?php echo $l->t('Your password was changed');?></div>
 		<div id="passworderror"><?php echo $l->t('Unable to change your password');?></div>
 		<input type="password" id="pass1" name="oldpassword" placeholder="<?php echo $l->t('Current password');?>" />
 		<input type="password" id="pass2" name="password" placeholder="<?php echo $l->t('New password');?>" data-typetoggle="#show" />
-		<input type="checkbox" id="show" name="show" /><label for="show"><?php echo $l->t('show');?></label>
+		<input type="checkbox" id="show" name="show" /><label for="show"> <?php echo $l->t('show');?></label>
 		<input id="passwordbutton" type="submit" value="<?php echo $l->t('Change password');?>" />
 	</fieldset>
 </form>
 
 <form id="lostpassword">
 	<fieldset class="personalblock">
-		<label for="email"><strong><?php echo $l->t('Email');?></strong></label>
+		<legend><strong><?php echo $l->t('Email');?></strong></legend>
 		<input type="text" name="email" id="email" value="<?php echo $_['email']; ?>" placeholder="<?php echo $l->t('Your email address');?>" /><span class="msg"></span><br />
 		<em><?php echo $l->t('Fill in an email address to enable password recovery');?></em>
 	</fieldset>
@@ -35,7 +38,7 @@
 
 <form>
 	<fieldset class="personalblock">
-		<label for="languageinput"><strong><?php echo $l->t('Language');?></strong></label>
+		<legend><strong><?php echo $l->t('Language');?></strong></legend>
 		<select id="languageinput" class="chzen-select" name="lang" data-placeholder="<?php echo $l->t('Language');?>">
 		<?php foreach($_['languages'] as $language):?>
 			<option value="<?php echo $language['code'];?>"><?php echo $language['name'];?></option>
@@ -45,20 +48,21 @@
 	</fieldset>
 </form>
 
-<p class="personalblock">
-	<strong>WebDAV</strong>
+<fieldset class="personalblock">
+	<legend><strong><?php echo $l->t('WebDAV');?></strong></legend>
 	<code><?php echo OC_Helper::linkToRemote('webdav'); ?></code><br />
-	<em><?php echo $l->t('use this address to connect to your ownCloud in your file manager');?></em>
-</p>
+	<em><?php echo $l->t('Use this address to connect to your ownCloud in your file manager');?></em>
+</fieldset>
 
 <?php foreach($_['forms'] as $form) {
 	echo $form;
 };?>
 
 
-<p class="personalblock">
+<fieldset class="personalblock">
+	<legend><strong><?php echo $l->t('Version');?></strong></legend>
 	<strong>ownCloud</strong> <?php echo(OC_Util::getVersionString()); ?> <?php echo(OC_Util::getEditionString()); ?> <br />
     <?php echo $l->t('Developed by the <a href="http://ownCloud.org/contact" target="_blank">ownCloud community</a>, the <a href="https://github.com/owncloud" target="_blank">source code</a> is licensed under the <a href="http://www.gnu.org/licenses/agpl-3.0.html" target="_blank"><abbr title="Affero General Public License">AGPL</abbr></a>.'); ?>
-</p>
+</fieldset>
 
 
diff --git a/settings/templates/users.php b/settings/templates/users.php
index de7e50da8f3..e8bf9edf604 100644
--- a/settings/templates/users.php
+++ b/settings/templates/users.php
@@ -32,10 +32,15 @@ var isadmin = <?php echo $_['isadmin']?'true':'false'; ?>;
 		</select> <input type="submit" value="<?php echo $l->t('Create')?>" />
 	</form>
 	<div class="quota">
-		<span><?php echo $l->t('Default Quota');?>:</span>
+		<span><?php echo $l->t('Default Storage');?></span>
 		<div class="quota-select-wrapper">
 			<?php if((bool) $_['isadmin']): ?>
 			<select class='quota'>
+                <option
+                    <?php if($_['default_quota']=='none') echo 'selected="selected"';?>
+                        value='none'>
+                    <?php echo $l->t('Unlimited');?>
+                </option>
 				<?php foreach($_['quota_preset'] as $preset):?>
 				<?php if($preset!='default'):?>
 				<option
@@ -45,7 +50,7 @@ var isadmin = <?php echo $_['isadmin']?'true':'false'; ?>;
 				</option>
 				<?php endif;?>
 				<?php endforeach;?>
-				<?php if(array_search($_['default_quota'], $_['quota_preset'])===false):?>
+				<?php if($_['defaultQuotaIsUserDefined']):?>
 				<option selected="selected"
 					value='<?php echo $_['default_quota'];?>'>
 					<?php echo $_['default_quota'];?>
@@ -55,7 +60,7 @@ var isadmin = <?php echo $_['isadmin']?'true':'false'; ?>;
 					<?php echo $l->t('Other');?>
 					...
 				</option>
-			</select> <input class='quota-other'></input>
+			</select> <input class='quota-other'/>
 			<?php endif; ?>
 			<?php if((bool) !$_['isadmin']): ?>
 				<select class='quota' disabled="disabled">
@@ -79,7 +84,7 @@ var isadmin = <?php echo $_['isadmin']?'true':'false'; ?>;
 			<?php if(is_array($_['subadmins']) || $_['subadmins']): ?>
 			<th id="headerSubAdmins"><?php echo $l->t('Group Admin'); ?></th>
 			<?php endif;?>
-			<th id="headerQuota"><?php echo $l->t( 'Quota' ); ?></th>
+			<th id="headerQuota"><?php echo $l->t('Storage'); ?></th>
 			<th id="headerRemove">&nbsp;</th>
 		</tr>
 	</thead>
@@ -122,6 +127,16 @@ var isadmin = <?php echo $_['isadmin']?'true':'false'; ?>;
 			<td class="quota">
 				<div class="quota-select-wrapper">
 					<select class='quota-user'>
+                        <option
+                            <?php if($user['quota']=='default') echo 'selected="selected"';?>
+                                value='default'>
+                            <?php echo $l->t('Default');?>
+                        </option>
+                        <option
+                        <?php if($user['quota']=='none') echo 'selected="selected"';?>
+                                value='none'>
+                            <?php echo $l->t('Unlimited');?>
+                        </option>
 						<?php foreach($_['quota_preset'] as $preset):?>
 						<option
 						<?php if($user['quota']==$preset) echo 'selected="selected"';?>
@@ -129,7 +144,7 @@ var isadmin = <?php echo $_['isadmin']?'true':'false'; ?>;
 							<?php echo $preset;?>
 						</option>
 						<?php endforeach;?>
-						<?php if(array_search($user['quota'], $_['quota_preset'])===false):?>
+						<?php if($user['isQuotaUserDefined']):?>
 						<option selected="selected" value='<?php echo $user['quota'];?>'>
 							<?php echo $user['quota'];?>
 						</option>
@@ -138,7 +153,7 @@ var isadmin = <?php echo $_['isadmin']?'true':'false'; ?>;
 							<?php echo $l->t('Other');?>
 							...
 						</option>
-					</select> <input class='quota-other'></input>
+					</select> <input class='quota-other'/>
 				</div>
 			</td>
 			<td class="remove">
@@ -151,4 +166,4 @@ var isadmin = <?php echo $_['isadmin']?'true':'false'; ?>;
 		</tr>
 		<?php endforeach; ?>
 	</tbody>
-</table>
\ No newline at end of file
+</table>
diff --git a/settings/users.php b/settings/users.php
index 93a259f1cd8..07a7620d3c0 100644
--- a/settings/users.php
+++ b/settings/users.php
@@ -29,11 +29,27 @@ if($isadmin) {
 	$subadmins = false;
 }
 
+// load preset quotas
+$quotaPreset=OC_Appconfig::getValue('files', 'quota_preset', '1 GB, 5 GB, 10 GB');
+$quotaPreset=explode(',', $quotaPreset);
+foreach($quotaPreset as &$preset) {
+    $preset=trim($preset);
+}
+$quotaPreset=array_diff($quotaPreset, array('default', 'none'));
+
+$defaultQuota=OC_Appconfig::getValue('files', 'default_quota', 'none');
+$defaultQuotaIsUserDefined=array_search($defaultQuota, $quotaPreset)===false && array_search($defaultQuota, array('none', 'default'))===false;
+
+// load users and quota
 foreach($accessibleusers as $i) {
+    $quota=OC_Preferences::getValue($i, 'files', 'quota', 'default');
+    $isQuotaUserDefined=array_search($quota, $quotaPreset)===false && array_search($quota, array('none', 'default'))===false;
+
 	$users[] = array(
 		"name" => $i,
 		"groups" => join( ", ", /*array_intersect(*/OC_Group::getUserGroups($i)/*, OC_SubAdmin::getSubAdminsGroups(OC_User::getUser()))*/),
-		'quota'=>OC_Preferences::getValue($i, 'files', 'quota', 'default'),
+        'quota'=>$quota,
+        'isQuotaUserDefined'=>$isQuotaUserDefined,
 		'subadmin'=>implode(', ', OC_SubAdmin::getSubAdminsGroups($i)));
 }
 
@@ -41,20 +57,14 @@ foreach( $accessiblegroups as $i ) {
 	// Do some more work here soon
 	$groups[] = array( "name" => $i );
 }
-$quotaPreset=OC_Appconfig::getValue('files', 'quota_preset', 'default,none,1 GB, 5 GB, 10 GB');
-$quotaPreset=explode(',', $quotaPreset);
-foreach($quotaPreset as &$preset) {
-	$preset=trim($preset);
-}
-
-$defaultQuota=OC_Appconfig::getValue('files', 'default_quota', 'none');
 
 $tmpl = new OC_Template( "settings", "users", "user" );
-$tmpl->assign( "users", $users );
-$tmpl->assign( "groups", $groups );
+$tmpl->assign( 'users', $users );
+$tmpl->assign( 'groups', $groups );
 $tmpl->assign( 'isadmin', (int) $isadmin);
 $tmpl->assign( 'subadmins', $subadmins);
 $tmpl->assign( 'numofgroups', count($accessiblegroups));
 $tmpl->assign( 'quota_preset', $quotaPreset);
 $tmpl->assign( 'default_quota', $defaultQuota);
+$tmpl->assign( 'defaultQuotaIsUserDefined', $defaultQuotaIsUserDefined);
 $tmpl->printPage();