Merge branch 'stable-3.1' into '5629'

# Conflicts:
#   install/sql/README.txt

Author: Till Brehm

interface/web/admin/form/remote_user.tform.php

@@ -45,7 +45,7 @@
 	}
 }
 
-$form["title"]    = "Remote user";
+$form["title"]    = "remote_user_txt";
 $form["description"]  = "";
 $form["name"]    = "remote_user";
 $form["action"]   = "remote_user_edit.php";
@@ -63,7 +63,7 @@
 $form["auth_preset"]["perm_other"] = ''; //r = read, i = insert, u = update, d = delete
 
 $form["tabs"]['remote_user'] = array (
-	'title'  => "Remote User",
+	'title'  => "remote_user_txt",
 	'width'  => 100,
 	'template'  => "templates/remote_user_edit.htm",
 	'fields'  => array (

interface/web/admin/form/server_config.tform.php

@@ -33,7 +33,7 @@
 
  */
 
-$form["title"] = "Server Config";
+$form["title"] = "server_config";
 $form["description"] = "";
 $form["name"] = "server_config";
 $form["action"] = "server_config_edit.php";
@@ -2028,4 +2028,4 @@
 	$form['tabs']['mail']['fields']['content_filter']['default'] = 'amavisd';
 	unset($form['tabs']['mail']['fields']['content_filter']['value']['rspamd']);
 	unset($form['tabs']['mail']['fields']['rspamd_password']);
-}*/
+}*/

interface/web/admin/form/users.tform.php

@@ -60,7 +60,7 @@
 
 */
 
-$form['title']   = 'Users';
+$form['title']   = 'users_txt';
 //$form['description']  = 'Form to edit systemusers.';
 $form['name']   = 'users';
 $form['action']  = 'users_edit.php';
@@ -129,7 +129,7 @@
 }
 
 $form['tabs']['users'] = array (
-	'title'  => 'Users',
+	'title'  => 'users_txt',
 	'width'  => 80,
 	'template'  => 'templates/users_user_edit.htm',
 	'fields'  => array (

interface/web/admin/lib/lang/ar_remote_user.lng

@@ -1,4 +1,5 @@
 <?php
+$wb['remote_user_txt'] = 'Remote User'
 $wb['username_txt'] = 'Username';
 $wb['password_txt'] = 'Password';
 $wb['function_txt'] = 'Functions';

interface/web/admin/lib/lang/ar_server_config.lng

@@ -1,4 +1,5 @@
 <?php
+$wb['server_config'] = 'Server Config';
 $wb['jailkit_chroot_home_txt'] = 'Jailkit chroot home';
 $wb['jailkit_chroot_app_sections_txt'] = 'Jailkit chroot app sections';
 $wb['jailkit_chroot_app_programs_txt'] = 'Jailkit chrooted applications';

interface/web/admin/lib/lang/ar_users.lng

@@ -1,4 +1,5 @@
 <?php
+$wb['users_txt'] = 'Users';
 $wb['username_txt'] = 'Username';
 $wb['username_err'] = 'The username is too long or contains invalid characters.';
 $wb['username_empty'] = 'The username is empty.';

interface/web/admin/lib/lang/bg_remote_user.lng

@@ -1,4 +1,5 @@
 <?php
+$wb['remote_user_txt'] = 'Remote User'
 $wb['username_txt'] = 'Потребителско име';
 $wb['password_txt'] = 'Парола';
 $wb['function_txt'] = 'Функции';

interface/web/admin/lib/lang/bg_server_config.lng

@@ -1,4 +1,5 @@
 <?php
+$wb['server_config'] = 'Server Config';
 $wb['jailkit_chroot_home_txt'] = 'Jailkit chroot home';
 $wb['jailkit_chroot_app_sections_txt'] = 'Jailkit chroot app sections';
 $wb['jailkit_chroot_app_programs_txt'] = 'Jailkit chrooted applications';

interface/web/admin/lib/lang/bg_users.lng

@@ -1,4 +1,5 @@
 <?php
+$wb['users_txt'] = 'Users';
 $wb['username_txt'] = 'Потребителско име';
 $wb['username_err'] = 'Потребителското име е твърде дълго или съдържа непозволени символи.';
 $wb['username_empty'] = 'Полето с потребителското име е празно.';

interface/web/admin/lib/lang/br_remote_user.lng

@@ -1,4 +1,5 @@
 <?php
+$wb['remote_user_txt'] = 'Remote User'
 $wb['username_txt'] = 'Usuário';
 $wb['password_txt'] = 'Senha';
 $wb['function_txt'] = 'Funções';