Merge branch 'master' into 'master'

Master

See merge request !203

install/tpl/system.ini.master

@@ -40,6 +40,7 @@ use_domain_module=n
 new_domain_html=Please contact our support to create a new domain for you.
 
 [misc]
+company_name=
 dashboard_atom_url_admin=http://www.ispconfig.org/atom
 dashboard_atom_url_reseller=http://www.ispconfig.org/atom
 dashboard_atom_url_client=http://www.ispconfig.org/atom

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

@@ -460,6 +460,12 @@ $form["tabs"]['misc'] = array (
 		//#################################
 		// Begin Datatable fields
 		//#################################
+		'company_name' => array (
+			'datatype' => 'VARCHAR',
+			'formtype' => 'TEXT',
+			'default' => '',
+			'value'  => ''
+		),
 		'dashboard_atom_url_admin' => array (
 			'datatype' => 'VARCHAR',
 			'formtype' => 'TEXT',

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

@@ -71,4 +71,5 @@ $wb['session_allow_endless_txt'] = 'Enable \\"stay logged in\\"';
 $wb['No'] = 'No';
 $wb['min_password_length_txt'] = 'Minimum password length';
 $wb['min_password_strength_txt'] = 'Minimum password strength';
+$wb["company_name_txt"] = "Company Name for the page title";
 ?>

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

@@ -71,4 +71,5 @@ $wb['session_allow_endless_txt'] = 'Enable \\"stay logged in\\"';
 $wb['No'] = 'No';
 $wb['min_password_length_txt'] = 'Minimum password length';
 $wb['min_password_strength_txt'] = 'Minimum password strength';
+$wb["company_name_txt"] = "Company Name for the page title";
 ?>

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

@@ -71,4 +71,5 @@ $wb['session_allow_endless_txt'] = 'Enable \\"stay logged in\\"';
 $wb['No'] = 'No';
 $wb['min_password_length_txt'] = 'Minimum password length';
 $wb['min_password_strength_txt'] = 'Minimum password strength';
+$wb["company_name_txt"] = "Company Name for the page title";
 ?>

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

@@ -71,5 +71,6 @@ $wb['session_allow_endless_txt'] = 'Povolit - zůstat přihlášen';
 $wb['No'] = 'Ne';
 $wb['min_password_length_txt'] = 'Minimální délka hesla';
 $wb['min_password_strength_txt'] = 'Minimální síla hesla';
+$wb["company_name_txt"] = "Company Name for the page title";
 ?>
 

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

@@ -72,4 +72,5 @@ $wb['session_allow_endless_txt'] = '"Eingeloggt bleiben" aktivieren';
 $wb['No'] = 'Nein';
 $wb['min_password_length_txt'] = 'Minimale Passwortlänge';
 $wb['min_password_strength_txt'] = 'Minimale Passwortstärke';
+$wb["company_name_txt"] = "Firmenname fuer den Seitentitel";
 ?>

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

@@ -71,4 +71,5 @@ $wb['session_allow_endless_txt'] = 'Enable \\"stay logged in\\"';
 $wb['No'] = 'No';
 $wb['min_password_length_txt'] = 'Minimum password length';
 $wb['min_password_strength_txt'] = 'Minimum password strength';
+$wb["company_name_txt"] = "Company Name for the page title";
 ?>

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

@@ -79,4 +79,5 @@ $wb["default_webserver_txt"] = 'Default Webserver';
 $wb["default_dnsserver_txt"] = 'Default DNS Server';
 $wb["default_slave_dnsserver_txt"] = 'Default Secondary DNS Server';
 $wb["default_dbserver_txt"] = 'Default Database Server';
+$wb["company_name_txt"] = "Company Name for the page title";
 ?>

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

@@ -76,4 +76,5 @@ $wb['default_webserver_txt'] = 'Servidor web por defecto';
 $wb['default_dnsserver_txt'] = 'Servidor DNS por defecto';
 $wb['default_slave_dnsserver_txt'] = 'Servidor DNS secundario por defecto';
 $wb['default_dbserver_txt'] = 'Servidor de bases de datos por defecto';
+$wb["company_name_txt"] = "Company Name for the page title";
 ?>

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

@@ -71,4 +71,5 @@ $wb['session_allow_endless_txt'] = 'Enable \\"stay logged in\\"';
 $wb['No'] = 'No';
 $wb['min_password_length_txt'] = 'Minimum password length';
 $wb['min_password_strength_txt'] = 'Minimum password strength';
+$wb["company_name_txt"] = "Company Name for the page title";
 ?>

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

@@ -71,4 +71,5 @@ $wb['session_allow_endless_txt'] = 'Enable \\"stay logged in\\"';
 $wb['No'] = 'No';
 $wb['min_password_length_txt'] = 'Minimum password length';
 $wb['min_password_strength_txt'] = 'Minimum password strength';
+$wb["company_name_txt"] = "Company Name for the page title";
 ?>

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

@@ -71,6 +71,7 @@ $wb['session_allow_endless_txt'] = 'Enable \\"stay logged in\\"';
 $wb['No'] = 'No';
 $wb['min_password_length_txt'] = 'Minimum password length';
 $wb['min_password_strength_txt'] = 'Minimum password strength';
+$wb["company_name_txt"] = "Company Name for the page title";
 ?>
 
 

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

@@ -71,4 +71,5 @@ $wb['session_allow_endless_txt'] = 'Enable \\"stay logged in\\"';
 $wb['No'] = 'No';
 $wb['min_password_length_txt'] = 'Minimum password length';
 $wb['min_password_strength_txt'] = 'Minimum password strength';
+$wb["company_name_txt"] = "Company Name for the page title";
 ?>

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

@@ -71,4 +71,5 @@ $wb['session_allow_endless_txt'] = 'Enable \\"stay logged in\\"';
 $wb['No'] = 'No';
 $wb['min_password_length_txt'] = 'Minimum password length';
 $wb['min_password_strength_txt'] = 'Minimum password strength';
+$wb["company_name_txt"] = "Company Name for the page title";
 ?>

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

@@ -71,4 +71,5 @@ $wb['session_allow_endless_txt'] = 'Enable \\"stay logged in\\"';
 $wb['No'] = 'No';
 $wb['min_password_length_txt'] = 'Minimum password length';
 $wb['min_password_strength_txt'] = 'Minimum password strength';
+$wb["company_name_txt"] = "Company Name for the page title";
 ?>

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

@@ -71,4 +71,5 @@ $wb['session_allow_endless_txt'] = 'Enable \\"stay logged in\\"';
 $wb['No'] = 'No';
 $wb['min_password_length_txt'] = 'Minimum password length';
 $wb['min_password_strength_txt'] = 'Minimum password strength';
+$wb["company_name_txt"] = "Company Name for the page title";
 ?>

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

@@ -74,4 +74,5 @@ $wb['session_allow_endless_txt'] = 'Enable \\"stay logged in\\"';
 $wb['No'] = 'No';
 $wb['min_password_length_txt'] = 'Minimum password length';
 $wb['min_password_strength_txt'] = 'Minimum password strength';
+$wb["company_name_txt"] = "Company Name for the page title";
 ?>

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

@@ -71,4 +71,5 @@ $wb['session_allow_endless_txt'] = 'Enable \\"stay logged in\\"';
 $wb['No'] = 'No';
 $wb['min_password_length_txt'] = 'Minimum password length';
 $wb['min_password_strength_txt'] = 'Minimum password strength';
+$wb["company_name_txt"] = "Company Name for the page title";
 ?>

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

@@ -71,4 +71,5 @@ $wb['session_allow_endless_txt'] = 'Enable \\"stay logged in\\"';
 $wb['No'] = 'No';
 $wb['min_password_length_txt'] = 'Minimum password length';
 $wb['min_password_strength_txt'] = 'Minimum password strength';
+$wb["company_name_txt"] = "Company Name for the page title";
 ?>