From 3669b3c10e2ead466165be34fa28078e59703567 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Fri, 24 Jan 2014 06:29:11 -0500
Subject: [PATCH] Merged subdomain and aliasdomain files to childdomain
---
interface/web/sites/lib/lang/fr_web_childdomain_list.lng | 7
interface/web/sites/lib/lang/hr_web_childdomain.lng | 88
interface/web/sites/web_aliasdomain_edit.php | 187 ---
interface/web/sites/lib/module.conf.php | 4
interface/web/sites/lib/lang/en_web_childdomain_list.lng | 7
interface/web/sites/lib/lang/fi_web_childdomain_list.lng | 9
interface/web/sites/lib/lang/br_web_childdomain.lng | 90
interface/web/sites/lib/lang/de_web_childdomain_list.lng | 9
interface/web/sites/lib/lang/en_web_childdomain.lng | 38
interface/web/sites/lib/lang/es_web_childdomain.lng | 92
interface/web/sites/lib/lang/ru_web_childdomain_list.lng | 7
interface/web/sites/lib/lang/ja_web_childdomain_list.lng | 7
interface/web/sites/web_aliasdomain_list.php | 52
interface/web/sites/lib/lang/tr_web_childdomain_list.lng | 7
interface/web/sites/lib/lang/se_web_childdomain_list.lng | 7
interface/web/sites/lib/lang/de_web_childdomain.lng | 62
interface/web/sites/lib/lang/ar_web_childdomain.lng | 38
interface/web/sites/lib/lang/bg_web_childdomain.lng | 66
interface/web/sites/lib/lang/ro_web_childdomain_list.lng | 7
interface/web/sites/web_subdomain_edit.php | 196 ---
interface/web/sites/list/web_childdomain.list.php | 8
interface/web/sites/web_childdomain_del.php | 58 +
interface/web/admin/lib/lang/nl_system_config.lng | 2
interface/web/sites/lib/lang/es_web_childdomain_list.lng | 7
interface/web/sites/lib/lang/ja_web_childdomain.lng | 86
interface/web/sites/templates/web_childdomain_list.htm | 20
interface/web/sites/lib/lang/pl_web_childdomain.lng | 70
interface/web/sites/lib/lang/pl_web_childdomain_list.lng | 7
interface/web/sites/lib/lang/br_web_childdomain_list.lng | 7
interface/web/sites/lib/lang/bg_web_childdomain_list.lng | 7
interface/web/sites/lib/lang/sk_web_childdomain.lng | 88
interface/web/sites/lib/lang/cz_web_childdomain.lng | 81
interface/web/sites/lib/lang/el_web_childdomain.lng | 60
interface/web/sites/lib/lang/ro_web_childdomain.lng | 60
interface/web/sites/web_childdomain_list.php | 73 +
interface/web/sites/lib/lang/ru_web_childdomain.lng | 80
interface/web/sites/lib/lang/tr_web_childdomain.lng | 90
interface/web/sites/lib/lang/fr_web_childdomain.lng | 84
interface/web/sites/lib/lang/hu_web_childdomain_list.lng | 9
interface/web/sites/web_subdomain_list.php | 53
interface/web/sites/web_subdomain_del.php | 49
interface/web/sites/lib/lang/hr_web_childdomain_list.lng | 7
interface/web/sites/lib/lang/cz_web_childdomain_list.lng | 8
interface/web/sites/lib/lang/nl_web_childdomain_list.lng | 7
interface/web/sites/lib/lang/it_web_childdomain_list.lng | 15
interface/web/sites/web_childdomain_edit.php | 243 ++++
interface/web/sites/lib/lang/nl_web_childdomain.lng | 84
interface/web/sites/lib/lang/id_web_childdomain.lng | 84
interface/web/sites/lib/lang/it_web_childdomain.lng | 62
interface/web/sites/templates/web_childdomain_advanced.htm | 8
interface/web/sites/lib/lang/pt_web_childdomain.lng | 90
/dev/null | 81 -
interface/web/sites/lib/lang/el_web_childdomain_list.lng | 7
interface/web/sites/lib/lang/ar_web_childdomain_list.lng | 7
interface/web/sites/lib/lang/se_web_childdomain.lng | 40
interface/web/sites/templates/web_childdomain_edit.htm | 50
interface/web/sites/lib/lang/sk_web_childdomain_list.lng | 9
interface/web/sites/lib/lang/hu_web_childdomain.lng | 90
interface/web/sites/lib/lang/pt_web_childdomain_list.lng | 7
interface/web/sites/form/web_childdomain.tform.php | 58
interface/web/sites/web_aliasdomain_del.php | 49
interface/web/sites/lib/lang/fi_web_childdomain.lng | 92
interface/web/sites/lib/lang/id_web_childdomain_list.lng | 7
63 files changed, 1,489 insertions(+), 1,595 deletions(-)
diff --git a/interface/web/admin/lib/lang/nl_system_config.lng b/interface/web/admin/lib/lang/nl_system_config.lng
index 766ead2..59c4a3b 100644
--- a/interface/web/admin/lib/lang/nl_system_config.lng
+++ b/interface/web/admin/lib/lang/nl_system_config.lng
@@ -18,7 +18,7 @@
$wb['mailboxlist_webmail_link_txt'] = 'Link naar webmail in Mailbox lijst';
$wb['mailbox_show_autoresponder_tab_txt'] = 'Toon Autoresponder tabblad in Mailbox detail';
$wb['mailbox_show_mail_filter_tab_txt'] = 'Toon Mail Filter tabblad in Mailbox detail';
-$wb['mailbox_show_custom_rules_tab_txt'] 'Toon Custom Rules tabblad in Mailbox detail';
+$wb['mailbox_show_custom_rules_tab_txt'] = 'Toon Custom Rules tabblad in Mailbox detail';
$wb['webmail_url_txt'] = 'Webmail URL';
$wb['phpmyadmin_url_txt'] = 'PHPMyAdmin URL';
$wb['use_domain_module_txt'] = 'Gebruik de domein-module om nieuwe domeinen toe te voegen';
diff --git a/interface/web/sites/form/web_aliasdomain.tform.php b/interface/web/sites/form/web_childdomain.tform.php
similarity index 87%
rename from interface/web/sites/form/web_aliasdomain.tform.php
rename to interface/web/sites/form/web_childdomain.tform.php
index 35762ef..1081a23 100644
--- a/interface/web/sites/form/web_aliasdomain.tform.php
+++ b/interface/web/sites/form/web_childdomain.tform.php
@@ -37,16 +37,18 @@
*/
+$childdomain_type = 'aliasdomain';
+if(isset($_SESSION['s']['var']['childdomain_type']) && $_SESSION['s']['var']['childdomain_type'] == 'subdomain') $childdomain_type = 'subdomain';
-$form["title"] = "Web Aliasdomain";
+$form["title"] = ($childdomain_type == 'subdomain' ? "Subdomain" : 'Web Aliasdomain');
$form["description"] = "";
-$form["name"] = "web_aliasdomain";
-$form["action"] = "web_aliasdomain_edit.php";
+$form["name"] = "web_childdomain";
+$form["action"] = "web_childdomain_edit.php";
$form["db_table"] = "web_domain";
$form["db_table_idx"] = "domain_id";
$form["db_history"] = "yes";
$form["tab_default"] = "domain";
-$form["list_default"] = "web_aliasdomain_list.php";
+$form["list_default"] = "web_childdomain_list.php";
$form["auth"] = 'yes'; // yes / no
$form["auth_preset"]["userid"] = 0; // 0 = id of the user, > 0 id must match with id of current user
@@ -58,7 +60,7 @@
$form["tabs"]['domain'] = array (
'title' => "Domain",
'width' => 100,
- 'template' => "templates/web_aliasdomain_edit.htm",
+ 'template' => "templates/web_childdomain_edit.htm",
'fields' => array (
//#################################
// Begin Datatable fields
@@ -86,7 +88,7 @@
),
'validators' => array ( 0 => array ( 'type' => 'CUSTOM',
'class' => 'validate_domain',
- 'function' => 'alias_domain',
+ 'function' => ($childdomain_type == 'subdomain' ? 'sub_domain' : 'alias_domain'),
'errmsg'=> 'domain_error_regex'),
),
'default' => '',
@@ -110,7 +112,8 @@
'keyfield'=> 'domain_id',
'valuefield'=> 'parent_domain'
),
- 'value' => ''
+ 'value' => '',
+ 'searchable' => 2
),
'redirect_type' => array (
'datatype' => 'VARCHAR',
@@ -130,23 +133,6 @@
'width' => '30',
'maxlength' => '255'
),
- 'subdomain' => array (
- 'datatype' => 'VARCHAR',
- 'formtype' => 'SELECT',
- 'default' => 'www',
- 'validators' => array ( 0 => array ( 'type' => 'CUSTOM',
- 'class' => 'validate_domain',
- 'function' => 'web_domain_autosub',
- 'errmsg'=> 'domain_error_autosub'),
- ),
- 'value' => array('none' => 'none_txt', 'www' => 'www.', '*' => '*.')
- ),
- 'seo_redirect' => array (
- 'datatype' => 'VARCHAR',
- 'formtype' => 'SELECT',
- 'default' => '',
- 'value' => array('' => 'no_redirect_txt', 'non_www_to_www' => 'domain.tld => www.domain.tld', 'www_to_non_www' => 'www.domain.tld => domain.tld', '*_domain_tld_to_domain_tld' => '*.doman.tld => domain.tld', '*_domain_tld_to_www_domain_tld' => '*.domain.tld => www.domain.tld', '*_to_domain_tld' => '* => domain.tld', '*_to_www_domain_tld' => '* => www.domain.tld')
- ),
'active' => array (
'datatype' => 'VARCHAR',
'formtype' => 'CHECKBOX',
@@ -159,12 +145,34 @@
)
);
+if($childdomain_type == 'aliasdomain') {
+ // additional fields for alias domains
+ $form["tabs"]['domain']['fields']['subdomain'] = array (
+ 'datatype' => 'VARCHAR',
+ 'formtype' => 'SELECT',
+ 'default' => 'www',
+ 'validators' => array ( 0 => array ( 'type' => 'CUSTOM',
+ 'class' => 'validate_domain',
+ 'function' => 'web_domain_autosub',
+ 'errmsg'=> 'domain_error_autosub'),
+ ),
+ 'value' => array('none' => 'none_txt', 'www' => 'www.', '*' => '*.')
+ );
+ $form["tabs"]['domain']['fields']['seo_redirect'] = array (
+ 'datatype' => 'VARCHAR',
+ 'formtype' => 'SELECT',
+ 'default' => '',
+ 'value' => array('' => 'no_redirect_txt', 'non_www_to_www' => 'domain.tld => www.domain.tld', 'www_to_non_www' => 'www.domain.tld => domain.tld', '*_domain_tld_to_domain_tld' => '*.doman.tld => domain.tld', '*_domain_tld_to_www_domain_tld' => '*.domain.tld => www.domain.tld', '*_to_domain_tld' => '* => domain.tld', '*_to_www_domain_tld' => '* => www.domain.tld')
+ );
+
+}
+
if($_SESSION["s"]["user"]["typ"] == 'admin') {
$form["tabs"]['advanced'] = array (
'title' => "Options",
'width' => 100,
- 'template' => "templates/web_aliasdomain_advanced.htm",
+ 'template' => "templates/web_childdomain_advanced.htm",
'readonly' => false,
'fields' => array (
//#################################
diff --git a/interface/web/sites/form/web_subdomain.tform.php b/interface/web/sites/form/web_subdomain.tform.php
deleted file mode 100644
index b79c46a..0000000
--- a/interface/web/sites/form/web_subdomain.tform.php
+++ /dev/null
@@ -1,174 +0,0 @@
-<?php
-
-/*
- Form Definition
-
- Tabledefinition
-
- Datatypes:
- - INTEGER (Forces the input to Int)
- - DOUBLE
- - CURRENCY (Formats the values to currency notation)
- - VARCHAR (no format check, maxlength: 255)
- - TEXT (no format check)
- - DATE (Dateformat, automatic conversion to timestamps)
-
- Formtype:
- - TEXT (Textfield)
- - TEXTAREA (Textarea)
- - PASSWORD (Password textfield, input is not shown when edited)
- - SELECT (Select option field)
- - RADIO
- - CHECKBOX
- - CHECKBOXARRAY
- - FILE
-
- VALUE:
- - Wert oder Array
-
- Hint:
- The ID field of the database table is not part of the datafield definition.
- The ID field must be always auto incement (int or bigint).
-
- Search:
- - searchable = 1 or searchable = 2 include the field in the search
- - searchable = 1: this field will be the title of the search result
- - searchable = 2: this field will be included in the description of the search result
-
-
-*/
-
-$form["title"] = "Subdomain";
-$form["description"] = "";
-$form["name"] = "web_subdomain";
-$form["action"] = "web_subdomain_edit.php";
-$form["db_table"] = "web_domain";
-$form["db_table_idx"] = "domain_id";
-$form["db_history"] = "yes";
-$form["tab_default"] = "domain";
-$form["list_default"] = "web_subdomain_list.php";
-$form["auth"] = 'yes'; // yes / no
-
-$form["auth_preset"]["userid"] = 0; // 0 = id of the user, > 0 id must match with id of current user
-$form["auth_preset"]["groupid"] = 0; // 0 = default groupid of the user, > 0 id must match with groupid of current user
-$form["auth_preset"]["perm_user"] = 'riud'; //r = read, i = insert, u = update, d = delete
-$form["auth_preset"]["perm_group"] = 'riud'; //r = read, i = insert, u = update, d = delete
-$form["auth_preset"]["perm_other"] = ''; //r = read, i = insert, u = update, d = delete
-
-$form["tabs"]['domain'] = array (
- 'title' => "Domain",
- 'width' => 100,
- 'template' => "templates/web_subdomain_edit.htm",
- 'fields' => array (
- //#################################
- // Begin Datatable fields
- //#################################
- 'server_id' => array (
- 'datatype' => 'INTEGER',
- 'formtype' => 'SELECT',
- 'default' => '',
- 'datasource' => array ( 'type' => 'SQL',
- 'querystring' => 'SELECT server_id,server_name FROM server WHERE mirror_server_id = 0 AND {AUTHSQL} ORDER BY server_name',
- 'keyfield'=> 'server_id',
- 'valuefield'=> 'server_name'
- ),
- 'value' => ''
- ),
- 'domain' => array (
- 'datatype' => 'VARCHAR',
- 'formtype' => 'TEXT',
- 'filters' => array( 0 => array( 'event' => 'SAVE',
- 'type' => 'IDNTOASCII'),
- 1 => array( 'event' => 'SHOW',
- 'type' => 'IDNTOUTF8'),
- 2 => array( 'event' => 'SAVE',
- 'type' => 'TOLOWER')
- ),
- 'validators' => array ( 0 => array ( 'type' => 'CUSTOM',
- 'class' => 'validate_domain',
- 'function' => 'sub_domain',
- 'errmsg'=> 'domain_error_regex'),
- ),
- 'default' => '',
- 'value' => '',
- 'width' => '30',
- 'maxlength' => '255',
- 'searchable' => 1
- ),
- 'type' => array (
- 'datatype' => 'VARCHAR',
- 'formtype' => 'SELECT',
- 'default' => 'y',
- 'value' => array('vhost' => 'Site', 'alias' => 'Alias', 'subdomain' => 'Subdomain')
- ),
- 'parent_domain_id' => array (
- 'datatype' => 'INTEGER',
- 'formtype' => 'SELECT',
- 'default' => '',
- 'datasource' => array ( 'type' => 'SQL',
- 'querystring' => "SELECT web_domain.domain_id, CONCAT(web_domain.domain, ' :: ', server.server_name) AS parent_domain FROM web_domain, server WHERE web_domain.type = 'vhost' AND web_domain.server_id = server.server_id AND {AUTHSQL::web_domain} ORDER BY web_domain.domain",
- 'keyfield'=> 'domain_id',
- 'valuefield'=> 'parent_domain'
- ),
- 'value' => '',
- 'searchable' => 2
- ),
- 'redirect_type' => array (
- 'datatype' => 'VARCHAR',
- 'formtype' => 'SELECT',
- 'default' => 'y',
- 'value' => array('' => 'no_redirect_txt', 'no' => 'no_flag_txt', 'R' => 'R', 'L' => 'L', 'R,L' => 'R,L', 'R=301,L' => 'R=301,L', 'last' => 'last', 'break' => 'break', 'redirect' => 'redirect', 'permanent' => 'permanent', 'proxy' => 'proxy')
- ),
- 'redirect_path' => array (
- 'datatype' => 'VARCHAR',
- 'formtype' => 'TEXT',
- 'validators' => array ( 0 => array ( 'type' => 'REGEX',
- 'regex' => '@^(([\.]{0})|((ftp|https?)://([-\w\.]+)+(:\d+)?(/([\w/_\.\-\,\+\?\~!:%]*(\?\S+)?)?)?)|(\[scheme\]://([-\w\.]+)+(:\d+)?(/([\w/_\.\-\,\+\?\~!:%]*(\?\S+)?)?)?)|(/(?!.*\.\.)[\w/_\.\-]{1,255}/))$@',
- 'errmsg'=> 'redirect_error_regex'),
- ),
- 'default' => '',
- 'value' => '',
- 'width' => '30',
- 'maxlength' => '255'
- ),
- 'active' => array (
- 'datatype' => 'VARCHAR',
- 'formtype' => 'CHECKBOX',
- 'default' => 'y',
- 'value' => array(0 => 'n', 1 => 'y')
- ),
- //#################################
- // ENDE Datatable fields
- //#################################
- )
-);
-
-if($_SESSION["s"]["user"]["typ"] == 'admin') {
-
- $form["tabs"]['advanced'] = array (
- 'title' => "Options",
- 'width' => 100,
- 'template' => "templates/web_subdomain_advanced.htm",
- 'readonly' => false,
- 'fields' => array (
- //#################################
- // Begin Datatable fields
- //#################################
- 'proxy_directives' => array (
- 'datatype' => 'TEXT',
- 'formtype' => 'TEXT',
- 'default' => '',
- 'value' => '',
- 'width' => '30',
- 'maxlength' => '255'
- ),
- //#################################
- // ENDE Datatable fields
- //#################################
- )
- );
-
-}
-
-
-?>
diff --git a/interface/web/sites/lib/lang/ar_web_aliasdomain.lng b/interface/web/sites/lib/lang/ar_web_childdomain.lng
similarity index 94%
copy from interface/web/sites/lib/lang/ar_web_aliasdomain.lng
copy to interface/web/sites/lib/lang/ar_web_childdomain.lng
index 4149c71..85aef91 100644
--- a/interface/web/sites/lib/lang/ar_web_aliasdomain.lng
+++ b/interface/web/sites/lib/lang/ar_web_childdomain.lng
@@ -1,20 +1,15 @@
<?php
-$wb['domain_txt'] = 'Aliasdomain';
-$wb['backup_interval_txt'] = 'Backup interval';
-$wb['backup_copies_txt'] = 'Number of backup copies';
$wb['ssl_state_txt'] = 'State';
$wb['ssl_locality_txt'] = 'Locality';
$wb['ssl_organisation_txt'] = 'Organisation';
$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
$wb['ssl_country_txt'] = 'Country';
-$wb['ssl_key_txt'] = 'SSL Key';
$wb['ssl_request_txt'] = 'SSL Request';
$wb['ssl_cert_txt'] = 'SSL Certificate';
$wb['ssl_bundle_txt'] = 'SSL Bundle';
$wb['ssl_action_txt'] = 'SSL Action';
-$wb['ssl_domain_txt'] = 'SSL Domain';
$wb['server_id_txt'] = 'Server';
-$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
+$wb['domain_txt'] = 'Domain';
$wb['type_txt'] = 'Type';
$wb['parent_domain_id_txt'] = 'Parent Website';
$wb['redirect_type_txt'] = 'Redirect Type';
@@ -23,15 +18,12 @@
$wb['document_root_txt'] = 'Documentroot';
$wb['system_user_txt'] = 'Linux User';
$wb['system_group_txt'] = 'Linux Group';
-$wb['ip_address_txt'] = 'IPv4-Address';
-$wb['ipv6_address_txt'] = 'IPv6-Address';
+$wb['ip_address_txt'] = 'IP-Address';
$wb['vhost_type_txt'] = 'VHost Type';
$wb['hd_quota_txt'] = 'Harddisk Quota';
-$wb['traffic_quota_txt'] = 'Traffic Quota';
+$wb['traffic_quota_txt'] = 'Traffic Quaota';
$wb['cgi_txt'] = 'CGI';
$wb['ssi_txt'] = 'SSI';
-$wb['errordocs_txt'] = 'Own Error-Documents';
-$wb['subdomain_txt'] = 'Auto-Subdomain';
$wb['ssl_txt'] = 'SSL';
$wb['suexec_txt'] = 'SuEXEC';
$wb['php_txt'] = 'PHP';
@@ -39,10 +31,26 @@
$wb['limit_web_domain_txt'] = 'The max. number of web domains for your account is reached.';
$wb['limit_web_aliasdomain_txt'] = 'The max. number of aliasdomains for your account is reached.';
$wb['limit_web_subdomain_txt'] = 'The max. number of web subdomains for your account is reached.';
-$wb['apache_directives_txt'] = 'Apache Directives';
+$wb['apache_directives_txt'] = 'Apache directives';
$wb['domain_error_empty'] = 'Domain is empty.';
$wb['domain_error_unique'] = 'There is already a website or sub / aliasdomain with this domain name.';
$wb['domain_error_regex'] = 'Domain name invalid.';
+$wb['host_txt'] = 'Host';
+$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
+$wb['no_redirect_txt'] = 'No redirect';
+$wb['no_flag_txt'] = 'No flag';
+$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
+$wb['proxy_directives_txt'] = 'Proxy Directives';
+$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
+$wb['error_proxy_requires_url'] = 'Redirect Type \"proxy\" requires a URL as the redirect path.';
+$wb['backup_interval_txt'] = 'Backup interval';
+$wb['backup_copies_txt'] = 'Number of backup copies';
+$wb['ssl_key_txt'] = 'SSL Key';
+$wb['ssl_domain_txt'] = 'SSL Domain';
+$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
+$wb['ipv6_address_txt'] = 'IPv6-Address';
+$wb['errordocs_txt'] = 'Own Error-Documents';
+$wb['subdomain_txt'] = 'Auto-Subdomain';
$wb['domain_error_autosub'] = 'There is already a subdomain with these settings.';
$wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
$wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
@@ -62,7 +70,6 @@
$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
$wb['limit_traffic_quota_free_txt'] = 'Max. available Traffic Quota';
-$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
$wb['php_open_basedir_txt'] = 'PHP open_basedir';
$wb['traffic_quota_exceeded_txt'] = 'Traffic quota exceeded';
$wb['ruby_txt'] = 'Ruby';
@@ -71,8 +78,6 @@
$wb['custom_php_ini_txt'] = 'Custom php.ini settings';
$wb['none_txt'] = 'None';
$wb['disabled_txt'] = 'Disabled';
-$wb['no_redirect_txt'] = 'No redirect';
-$wb['no_flag_txt'] = 'No flag';
$wb['save_certificate_txt'] = 'Save certificate';
$wb['create_certificate_txt'] = 'Create certificate';
$wb['delete_certificate_txt'] = 'Delete certificate';
@@ -109,7 +114,6 @@
$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
-$wb['proxy_directives_txt'] = 'Proxy Directives';
-$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
$wb['Domain'] = 'Aliasdomain';
+
?>
diff --git a/interface/web/sites/lib/lang/ar_web_aliasdomain_list.lng b/interface/web/sites/lib/lang/ar_web_childdomain_list.lng
similarity index 74%
rename from interface/web/sites/lib/lang/ar_web_aliasdomain_list.lng
rename to interface/web/sites/lib/lang/ar_web_childdomain_list.lng
index 8ea34c4..95a3b5f 100644
--- a/interface/web/sites/lib/lang/ar_web_aliasdomain_list.lng
+++ b/interface/web/sites/lib/lang/ar_web_childdomain_list.lng
@@ -1,14 +1,15 @@
<?php
-$wb['list_head_txt'] = 'Aliasdomain';
+$wb['list_head_txt'] = 'Subdomains';
$wb['active_txt'] = 'Active';
$wb['server_id_txt'] = 'Server';
$wb['parent_domain_id_txt'] = 'Website';
-$wb['domain_txt'] = 'Aliasdomain';
-$wb['add_new_record_txt'] = 'Add new aliasdomain';
+$wb['domain_txt'] = 'Subdomain';
+$wb['add_new_record_txt'] = 'Add new subdomain';
$wb['domain_error_empty'] = 'Domain is empty.';
$wb['domain_error_unique'] = 'Domain must be unique.';
$wb['domain_error_regex'] = 'Domain name invalid.';
$wb['no_redirect_txt'] = 'No redirect';
$wb['no_flag_txt'] = 'No flag';
$wb['none_txt'] = 'None';
+
?>
diff --git a/interface/web/sites/lib/lang/ar_web_subdomain.lng b/interface/web/sites/lib/lang/ar_web_subdomain.lng
deleted file mode 100644
index fc21378..0000000
--- a/interface/web/sites/lib/lang/ar_web_subdomain.lng
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-$wb['ssl_state_txt'] = 'State';
-$wb['ssl_locality_txt'] = 'Locality';
-$wb['ssl_organisation_txt'] = 'Organisation';
-$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
-$wb['ssl_country_txt'] = 'Country';
-$wb['ssl_request_txt'] = 'SSL Request';
-$wb['ssl_cert_txt'] = 'SSL Certificate';
-$wb['ssl_bundle_txt'] = 'SSL Bundle';
-$wb['ssl_action_txt'] = 'SSL Action';
-$wb['server_id_txt'] = 'Server';
-$wb['domain_txt'] = 'Domain';
-$wb['type_txt'] = 'Type';
-$wb['parent_domain_id_txt'] = 'Parent Website';
-$wb['redirect_type_txt'] = 'Redirect Type';
-$wb['redirect_path_txt'] = 'Redirect Path';
-$wb['active_txt'] = 'Active';
-$wb['document_root_txt'] = 'Documentroot';
-$wb['system_user_txt'] = 'Linux User';
-$wb['system_group_txt'] = 'Linux Group';
-$wb['ip_address_txt'] = 'IP-Address';
-$wb['vhost_type_txt'] = 'VHost Type';
-$wb['hd_quota_txt'] = 'Harddisk Quota';
-$wb['traffic_quota_txt'] = 'Traffic Quaota';
-$wb['cgi_txt'] = 'CGI';
-$wb['ssi_txt'] = 'SSI';
-$wb['ssl_txt'] = 'SSL';
-$wb['suexec_txt'] = 'SuEXEC';
-$wb['php_txt'] = 'PHP';
-$wb['client_txt'] = 'Client';
-$wb['limit_web_domain_txt'] = 'The max. number of web domains for your account is reached.';
-$wb['limit_web_aliasdomain_txt'] = 'The max. number of aliasdomains for your account is reached.';
-$wb['limit_web_subdomain_txt'] = 'The max. number of web subdomains for your account is reached.';
-$wb['apache_directives_txt'] = 'Apache directives';
-$wb['domain_error_empty'] = 'Domain is empty.';
-$wb['domain_error_unique'] = 'There is already a website or sub / aliasdomain with this domain name.';
-$wb['domain_error_regex'] = 'Domain name invalid.';
-$wb['host_txt'] = 'Host';
-$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
-$wb['no_redirect_txt'] = 'No redirect';
-$wb['no_flag_txt'] = 'No flag';
-$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
-$wb['proxy_directives_txt'] = 'Proxy Directives';
-$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
-$wb['error_proxy_requires_url'] = 'Redirect Type \\"proxy\\" requires a URL as the redirect path.';
-?>
diff --git a/interface/web/sites/lib/lang/ar_web_subdomain_list.lng b/interface/web/sites/lib/lang/ar_web_subdomain_list.lng
deleted file mode 100644
index 1c16bcd..0000000
--- a/interface/web/sites/lib/lang/ar_web_subdomain_list.lng
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Subdomains';
-$wb['active_txt'] = 'Active';
-$wb['server_id_txt'] = 'Server';
-$wb['parent_domain_id_txt'] = 'Website';
-$wb['domain_txt'] = 'Subdomain';
-$wb['add_new_record_txt'] = 'Add new subdomain';
-?>
diff --git a/interface/web/sites/lib/lang/bg_web_aliasdomain.lng b/interface/web/sites/lib/lang/bg_web_aliasdomain.lng
deleted file mode 100644
index 4149c71..0000000
--- a/interface/web/sites/lib/lang/bg_web_aliasdomain.lng
+++ /dev/null
@@ -1,115 +0,0 @@
-<?php
-$wb['domain_txt'] = 'Aliasdomain';
-$wb['backup_interval_txt'] = 'Backup interval';
-$wb['backup_copies_txt'] = 'Number of backup copies';
-$wb['ssl_state_txt'] = 'State';
-$wb['ssl_locality_txt'] = 'Locality';
-$wb['ssl_organisation_txt'] = 'Organisation';
-$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
-$wb['ssl_country_txt'] = 'Country';
-$wb['ssl_key_txt'] = 'SSL Key';
-$wb['ssl_request_txt'] = 'SSL Request';
-$wb['ssl_cert_txt'] = 'SSL Certificate';
-$wb['ssl_bundle_txt'] = 'SSL Bundle';
-$wb['ssl_action_txt'] = 'SSL Action';
-$wb['ssl_domain_txt'] = 'SSL Domain';
-$wb['server_id_txt'] = 'Server';
-$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
-$wb['type_txt'] = 'Type';
-$wb['parent_domain_id_txt'] = 'Parent Website';
-$wb['redirect_type_txt'] = 'Redirect Type';
-$wb['redirect_path_txt'] = 'Redirect Path';
-$wb['active_txt'] = 'Active';
-$wb['document_root_txt'] = 'Documentroot';
-$wb['system_user_txt'] = 'Linux User';
-$wb['system_group_txt'] = 'Linux Group';
-$wb['ip_address_txt'] = 'IPv4-Address';
-$wb['ipv6_address_txt'] = 'IPv6-Address';
-$wb['vhost_type_txt'] = 'VHost Type';
-$wb['hd_quota_txt'] = 'Harddisk Quota';
-$wb['traffic_quota_txt'] = 'Traffic Quota';
-$wb['cgi_txt'] = 'CGI';
-$wb['ssi_txt'] = 'SSI';
-$wb['errordocs_txt'] = 'Own Error-Documents';
-$wb['subdomain_txt'] = 'Auto-Subdomain';
-$wb['ssl_txt'] = 'SSL';
-$wb['suexec_txt'] = 'SuEXEC';
-$wb['php_txt'] = 'PHP';
-$wb['client_txt'] = 'Client';
-$wb['limit_web_domain_txt'] = 'The max. number of web domains for your account is reached.';
-$wb['limit_web_aliasdomain_txt'] = 'The max. number of aliasdomains for your account is reached.';
-$wb['limit_web_subdomain_txt'] = 'The max. number of web subdomains for your account is reached.';
-$wb['apache_directives_txt'] = 'Apache Directives';
-$wb['domain_error_empty'] = 'Domain is empty.';
-$wb['domain_error_unique'] = 'There is already a website or sub / aliasdomain with this domain name.';
-$wb['domain_error_regex'] = 'Domain name invalid.';
-$wb['domain_error_autosub'] = 'There is already a subdomain with these settings.';
-$wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
-$wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
-$wb['error_ssl_state_empty'] = 'SSL State is empty.';
-$wb['error_ssl_locality_empty'] = 'SSL Locality is empty.';
-$wb['error_ssl_organisation_empty'] = 'SSL Organisation is empty.';
-$wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.';
-$wb['error_ssl_country_empty'] = 'SSL Country is empty.';
-$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
-$wb['client_group_id_txt'] = 'Client';
-$wb['stats_password_txt'] = 'Set Webstatistics password';
-$wb['allow_override_txt'] = 'Apache AllowOverride';
-$wb['limit_web_quota_free_txt'] = 'Max. available Harddisk Quota';
-$wb['ssl_state_error_regex'] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_locality_error_regex'] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_organisation_error_regex'] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
-$wb['limit_traffic_quota_free_txt'] = 'Max. available Traffic Quota';
-$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
-$wb['php_open_basedir_txt'] = 'PHP open_basedir';
-$wb['traffic_quota_exceeded_txt'] = 'Traffic quota exceeded';
-$wb['ruby_txt'] = 'Ruby';
-$wb['stats_user_txt'] = 'Webstatistics username';
-$wb['stats_type_txt'] = 'Webstatistics program';
-$wb['custom_php_ini_txt'] = 'Custom php.ini settings';
-$wb['none_txt'] = 'None';
-$wb['disabled_txt'] = 'Disabled';
-$wb['no_redirect_txt'] = 'No redirect';
-$wb['no_flag_txt'] = 'No flag';
-$wb['save_certificate_txt'] = 'Save certificate';
-$wb['create_certificate_txt'] = 'Create certificate';
-$wb['delete_certificate_txt'] = 'Delete certificate';
-$wb['nginx_directives_txt'] = 'nginx Directives';
-$wb['seo_redirect_txt'] = 'SEO Redirect';
-$wb['non_www_to_www_txt'] = 'Non-www -> www';
-$wb['www_to_non_www_txt'] = 'www -> non-www';
-$wb['php_fpm_use_socket_txt'] = 'Use Socket For PHP-FPM';
-$wb['error_no_sni_txt'] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
-$wb['python_txt'] = 'Python';
-$wb['perl_txt'] = 'Perl';
-$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
-$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
-$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
-$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
-$wb['error_php_fpm_pm_settings_txt'] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children >= pm.max_spare_servers >= pm.start_servers >= pm.min_spare_servers > 0';
-$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive integer value.';
-$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
-$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
-$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
-$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
-$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
-$wb['fastcgi_php_version_txt'] = 'PHP Version';
-$wb['pm_txt'] = 'PHP-FPM Process Manager';
-$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
-$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
-$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
-$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
-$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
-$wb['generate_password_txt'] = 'Generate Password';
-$wb['repeat_password_txt'] = 'Repeat Password';
-$wb['password_mismatch_txt'] = 'The passwords do not match.';
-$wb['password_match_txt'] = 'The passwords do match.';
-$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
-$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
-$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
-$wb['proxy_directives_txt'] = 'Proxy Directives';
-$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
-$wb['Domain'] = 'Aliasdomain';
-?>
diff --git a/interface/web/sites/lib/lang/ar_web_aliasdomain.lng b/interface/web/sites/lib/lang/bg_web_childdomain.lng
similarity index 78%
copy from interface/web/sites/lib/lang/ar_web_aliasdomain.lng
copy to interface/web/sites/lib/lang/bg_web_childdomain.lng
index 4149c71..4ff2ccb 100644
--- a/interface/web/sites/lib/lang/ar_web_aliasdomain.lng
+++ b/interface/web/sites/lib/lang/bg_web_childdomain.lng
@@ -1,48 +1,56 @@
<?php
-$wb['domain_txt'] = 'Aliasdomain';
-$wb['backup_interval_txt'] = 'Backup interval';
-$wb['backup_copies_txt'] = 'Number of backup copies';
$wb['ssl_state_txt'] = 'State';
$wb['ssl_locality_txt'] = 'Locality';
-$wb['ssl_organisation_txt'] = 'Organisation';
+$wb['ssl_organisation_txt'] = 'Организация';
$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
-$wb['ssl_country_txt'] = 'Country';
-$wb['ssl_key_txt'] = 'SSL Key';
+$wb['ssl_country_txt'] = 'Държава';
$wb['ssl_request_txt'] = 'SSL Request';
$wb['ssl_cert_txt'] = 'SSL Certificate';
$wb['ssl_bundle_txt'] = 'SSL Bundle';
$wb['ssl_action_txt'] = 'SSL Action';
-$wb['ssl_domain_txt'] = 'SSL Domain';
-$wb['server_id_txt'] = 'Server';
-$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
-$wb['type_txt'] = 'Type';
+$wb['server_id_txt'] = 'Сървър';
+$wb['domain_txt'] = 'Домейн';
+$wb['type_txt'] = 'Тип';
$wb['parent_domain_id_txt'] = 'Parent Website';
$wb['redirect_type_txt'] = 'Redirect Type';
$wb['redirect_path_txt'] = 'Redirect Path';
-$wb['active_txt'] = 'Active';
+$wb['active_txt'] = 'Активен';
$wb['document_root_txt'] = 'Documentroot';
-$wb['system_user_txt'] = 'Linux User';
-$wb['system_group_txt'] = 'Linux Group';
-$wb['ip_address_txt'] = 'IPv4-Address';
-$wb['ipv6_address_txt'] = 'IPv6-Address';
+$wb['system_user_txt'] = 'Linux потребител';
+$wb['system_group_txt'] = 'Linux група';
+$wb['ip_address_txt'] = 'IP адрес';
$wb['vhost_type_txt'] = 'VHost Type';
$wb['hd_quota_txt'] = 'Harddisk Quota';
-$wb['traffic_quota_txt'] = 'Traffic Quota';
+$wb['traffic_quota_txt'] = 'Трафик квота';
$wb['cgi_txt'] = 'CGI';
$wb['ssi_txt'] = 'SSI';
-$wb['errordocs_txt'] = 'Own Error-Documents';
-$wb['subdomain_txt'] = 'Auto-Subdomain';
$wb['ssl_txt'] = 'SSL';
$wb['suexec_txt'] = 'SuEXEC';
$wb['php_txt'] = 'PHP';
-$wb['client_txt'] = 'Client';
-$wb['limit_web_domain_txt'] = 'The max. number of web domains for your account is reached.';
-$wb['limit_web_aliasdomain_txt'] = 'The max. number of aliasdomains for your account is reached.';
-$wb['limit_web_subdomain_txt'] = 'The max. number of web subdomains for your account is reached.';
-$wb['apache_directives_txt'] = 'Apache Directives';
-$wb['domain_error_empty'] = 'Domain is empty.';
-$wb['domain_error_unique'] = 'There is already a website or sub / aliasdomain with this domain name.';
-$wb['domain_error_regex'] = 'Domain name invalid.';
+$wb['client_txt'] = 'Клиент';
+$wb['limit_web_domain_txt'] = 'Достигнат е максималният разрешен брой домейни.';
+$wb['limit_web_aliasdomain_txt'] = 'Достигнат е максималният разрешен брой aliasdomains.';
+$wb['limit_web_subdomain_txt'] = 'Достигнат е максималният разрешен брой поддомейни.';
+$wb['apache_directives_txt'] = 'Apache директиви';
+$wb['domain_error_empty'] = 'Не е посочен домейн.';
+$wb['domain_error_unique'] = 'Вече съществува такъв домейн.';
+$wb['domain_error_regex'] = 'Невалидно име на домейн.';
+$wb['host_txt'] = 'Host';
+$wb['redirect_error_regex'] = 'Грешен път за редирект. Валидният адрес трябва да бъде примерно: /test/ or http://www.domain.tld/test/';
+$wb['no_redirect_txt'] = 'Без редирект';
+$wb['no_flag_txt'] = 'No flag';
+$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
+$wb['proxy_directives_txt'] = 'Proxy Directives';
+$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
+$wb['error_proxy_requires_url'] = 'Redirect Type \"proxy\" requires a URL as the redirect path.';
+$wb['backup_interval_txt'] = 'Backup interval';
+$wb['backup_copies_txt'] = 'Number of backup copies';
+$wb['ssl_key_txt'] = 'SSL Key';
+$wb['ssl_domain_txt'] = 'SSL Domain';
+$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
+$wb['ipv6_address_txt'] = 'IPv6-Address';
+$wb['errordocs_txt'] = 'Own Error-Documents';
+$wb['subdomain_txt'] = 'Auto-Subdomain';
$wb['domain_error_autosub'] = 'There is already a subdomain with these settings.';
$wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
$wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
@@ -62,7 +70,6 @@
$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
$wb['limit_traffic_quota_free_txt'] = 'Max. available Traffic Quota';
-$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
$wb['php_open_basedir_txt'] = 'PHP open_basedir';
$wb['traffic_quota_exceeded_txt'] = 'Traffic quota exceeded';
$wb['ruby_txt'] = 'Ruby';
@@ -71,8 +78,6 @@
$wb['custom_php_ini_txt'] = 'Custom php.ini settings';
$wb['none_txt'] = 'None';
$wb['disabled_txt'] = 'Disabled';
-$wb['no_redirect_txt'] = 'No redirect';
-$wb['no_flag_txt'] = 'No flag';
$wb['save_certificate_txt'] = 'Save certificate';
$wb['create_certificate_txt'] = 'Create certificate';
$wb['delete_certificate_txt'] = 'Delete certificate';
@@ -109,7 +114,6 @@
$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
-$wb['proxy_directives_txt'] = 'Proxy Directives';
-$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
$wb['Domain'] = 'Aliasdomain';
+
?>
diff --git a/interface/web/sites/lib/lang/bg_web_aliasdomain_list.lng b/interface/web/sites/lib/lang/bg_web_childdomain_list.lng
similarity index 75%
rename from interface/web/sites/lib/lang/bg_web_aliasdomain_list.lng
rename to interface/web/sites/lib/lang/bg_web_childdomain_list.lng
index 975d75e..5c9d215 100644
--- a/interface/web/sites/lib/lang/bg_web_aliasdomain_list.lng
+++ b/interface/web/sites/lib/lang/bg_web_childdomain_list.lng
@@ -1,14 +1,15 @@
<?php
-$wb['list_head_txt'] = 'Aliasdomain';
+$wb['list_head_txt'] = 'Поддомейни';
$wb['active_txt'] = 'Активен';
$wb['server_id_txt'] = 'Сървър';
$wb['parent_domain_id_txt'] = 'Сайт';
-$wb['domain_txt'] = 'Aliasdomain';
-$wb['add_new_record_txt'] = 'Нов aliasdomain';
+$wb['domain_txt'] = 'Поддомейн';
+$wb['add_new_record_txt'] = 'Нов поддомейн';
$wb['domain_error_empty'] = 'Не е посочен домейн.';
$wb['domain_error_unique'] = 'Домейнът вече съществува.';
$wb['domain_error_regex'] = 'Невалдно име на домейн.';
$wb['no_redirect_txt'] = 'No redirect';
$wb['no_flag_txt'] = 'No flag';
$wb['none_txt'] = 'None';
+
?>
diff --git a/interface/web/sites/lib/lang/bg_web_subdomain.lng b/interface/web/sites/lib/lang/bg_web_subdomain.lng
deleted file mode 100644
index 3beb3d2..0000000
--- a/interface/web/sites/lib/lang/bg_web_subdomain.lng
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-$wb['ssl_state_txt'] = 'State';
-$wb['ssl_locality_txt'] = 'Locality';
-$wb['ssl_organisation_txt'] = 'Организация';
-$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
-$wb['ssl_country_txt'] = 'Държава';
-$wb['ssl_request_txt'] = 'SSL Request';
-$wb['ssl_cert_txt'] = 'SSL Certificate';
-$wb['ssl_bundle_txt'] = 'SSL Bundle';
-$wb['ssl_action_txt'] = 'SSL Action';
-$wb['server_id_txt'] = 'Сървър';
-$wb['domain_txt'] = 'Домейн';
-$wb['type_txt'] = 'Тип';
-$wb['parent_domain_id_txt'] = 'Parent Website';
-$wb['redirect_type_txt'] = 'Redirect Type';
-$wb['redirect_path_txt'] = 'Redirect Path';
-$wb['active_txt'] = 'Активен';
-$wb['document_root_txt'] = 'Documentroot';
-$wb['system_user_txt'] = 'Linux потребител';
-$wb['system_group_txt'] = 'Linux група';
-$wb['ip_address_txt'] = 'IP адрес';
-$wb['vhost_type_txt'] = 'VHost Type';
-$wb['hd_quota_txt'] = 'Harddisk Quota';
-$wb['traffic_quota_txt'] = 'Трафик квота';
-$wb['cgi_txt'] = 'CGI';
-$wb['ssi_txt'] = 'SSI';
-$wb['ssl_txt'] = 'SSL';
-$wb['suexec_txt'] = 'SuEXEC';
-$wb['php_txt'] = 'PHP';
-$wb['client_txt'] = 'Клиент';
-$wb['limit_web_domain_txt'] = 'Достигнат е максималният разрешен брой домейни.';
-$wb['limit_web_aliasdomain_txt'] = 'Достигнат е максималният разрешен брой aliasdomains.';
-$wb['limit_web_subdomain_txt'] = 'Достигнат е максималният разрешен брой поддомейни.';
-$wb['apache_directives_txt'] = 'Apache директиви';
-$wb['domain_error_empty'] = 'Не е посочен домейн.';
-$wb['domain_error_unique'] = 'Вече съществува такъв домейн.';
-$wb['domain_error_regex'] = 'Невалидно име на домейн.';
-$wb['host_txt'] = 'Host';
-$wb['redirect_error_regex'] = 'Грешен път за редирект. Валидният адрес трябва да бъде примерно: /test/ or http://www.domain.tld/test/';
-$wb['no_redirect_txt'] = 'Без редирект';
-$wb['no_flag_txt'] = 'No flag';
-$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
-$wb['proxy_directives_txt'] = 'Proxy Directives';
-$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
-$wb['error_proxy_requires_url'] = 'Redirect Type \\"proxy\\" requires a URL as the redirect path.';
-?>
diff --git a/interface/web/sites/lib/lang/bg_web_subdomain_list.lng b/interface/web/sites/lib/lang/bg_web_subdomain_list.lng
deleted file mode 100644
index d08e405..0000000
--- a/interface/web/sites/lib/lang/bg_web_subdomain_list.lng
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Поддомейни';
-$wb['active_txt'] = 'Активен';
-$wb['server_id_txt'] = 'Сървър';
-$wb['parent_domain_id_txt'] = 'Сайт';
-$wb['domain_txt'] = 'Поддомейн';
-$wb['add_new_record_txt'] = 'Нов поддомейн';
-?>
diff --git a/interface/web/sites/lib/lang/br_web_aliasdomain.lng b/interface/web/sites/lib/lang/br_web_aliasdomain.lng
deleted file mode 100644
index 4149c71..0000000
--- a/interface/web/sites/lib/lang/br_web_aliasdomain.lng
+++ /dev/null
@@ -1,115 +0,0 @@
-<?php
-$wb['domain_txt'] = 'Aliasdomain';
-$wb['backup_interval_txt'] = 'Backup interval';
-$wb['backup_copies_txt'] = 'Number of backup copies';
-$wb['ssl_state_txt'] = 'State';
-$wb['ssl_locality_txt'] = 'Locality';
-$wb['ssl_organisation_txt'] = 'Organisation';
-$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
-$wb['ssl_country_txt'] = 'Country';
-$wb['ssl_key_txt'] = 'SSL Key';
-$wb['ssl_request_txt'] = 'SSL Request';
-$wb['ssl_cert_txt'] = 'SSL Certificate';
-$wb['ssl_bundle_txt'] = 'SSL Bundle';
-$wb['ssl_action_txt'] = 'SSL Action';
-$wb['ssl_domain_txt'] = 'SSL Domain';
-$wb['server_id_txt'] = 'Server';
-$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
-$wb['type_txt'] = 'Type';
-$wb['parent_domain_id_txt'] = 'Parent Website';
-$wb['redirect_type_txt'] = 'Redirect Type';
-$wb['redirect_path_txt'] = 'Redirect Path';
-$wb['active_txt'] = 'Active';
-$wb['document_root_txt'] = 'Documentroot';
-$wb['system_user_txt'] = 'Linux User';
-$wb['system_group_txt'] = 'Linux Group';
-$wb['ip_address_txt'] = 'IPv4-Address';
-$wb['ipv6_address_txt'] = 'IPv6-Address';
-$wb['vhost_type_txt'] = 'VHost Type';
-$wb['hd_quota_txt'] = 'Harddisk Quota';
-$wb['traffic_quota_txt'] = 'Traffic Quota';
-$wb['cgi_txt'] = 'CGI';
-$wb['ssi_txt'] = 'SSI';
-$wb['errordocs_txt'] = 'Own Error-Documents';
-$wb['subdomain_txt'] = 'Auto-Subdomain';
-$wb['ssl_txt'] = 'SSL';
-$wb['suexec_txt'] = 'SuEXEC';
-$wb['php_txt'] = 'PHP';
-$wb['client_txt'] = 'Client';
-$wb['limit_web_domain_txt'] = 'The max. number of web domains for your account is reached.';
-$wb['limit_web_aliasdomain_txt'] = 'The max. number of aliasdomains for your account is reached.';
-$wb['limit_web_subdomain_txt'] = 'The max. number of web subdomains for your account is reached.';
-$wb['apache_directives_txt'] = 'Apache Directives';
-$wb['domain_error_empty'] = 'Domain is empty.';
-$wb['domain_error_unique'] = 'There is already a website or sub / aliasdomain with this domain name.';
-$wb['domain_error_regex'] = 'Domain name invalid.';
-$wb['domain_error_autosub'] = 'There is already a subdomain with these settings.';
-$wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
-$wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
-$wb['error_ssl_state_empty'] = 'SSL State is empty.';
-$wb['error_ssl_locality_empty'] = 'SSL Locality is empty.';
-$wb['error_ssl_organisation_empty'] = 'SSL Organisation is empty.';
-$wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.';
-$wb['error_ssl_country_empty'] = 'SSL Country is empty.';
-$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
-$wb['client_group_id_txt'] = 'Client';
-$wb['stats_password_txt'] = 'Set Webstatistics password';
-$wb['allow_override_txt'] = 'Apache AllowOverride';
-$wb['limit_web_quota_free_txt'] = 'Max. available Harddisk Quota';
-$wb['ssl_state_error_regex'] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_locality_error_regex'] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_organisation_error_regex'] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
-$wb['limit_traffic_quota_free_txt'] = 'Max. available Traffic Quota';
-$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
-$wb['php_open_basedir_txt'] = 'PHP open_basedir';
-$wb['traffic_quota_exceeded_txt'] = 'Traffic quota exceeded';
-$wb['ruby_txt'] = 'Ruby';
-$wb['stats_user_txt'] = 'Webstatistics username';
-$wb['stats_type_txt'] = 'Webstatistics program';
-$wb['custom_php_ini_txt'] = 'Custom php.ini settings';
-$wb['none_txt'] = 'None';
-$wb['disabled_txt'] = 'Disabled';
-$wb['no_redirect_txt'] = 'No redirect';
-$wb['no_flag_txt'] = 'No flag';
-$wb['save_certificate_txt'] = 'Save certificate';
-$wb['create_certificate_txt'] = 'Create certificate';
-$wb['delete_certificate_txt'] = 'Delete certificate';
-$wb['nginx_directives_txt'] = 'nginx Directives';
-$wb['seo_redirect_txt'] = 'SEO Redirect';
-$wb['non_www_to_www_txt'] = 'Non-www -> www';
-$wb['www_to_non_www_txt'] = 'www -> non-www';
-$wb['php_fpm_use_socket_txt'] = 'Use Socket For PHP-FPM';
-$wb['error_no_sni_txt'] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
-$wb['python_txt'] = 'Python';
-$wb['perl_txt'] = 'Perl';
-$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
-$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
-$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
-$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
-$wb['error_php_fpm_pm_settings_txt'] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children >= pm.max_spare_servers >= pm.start_servers >= pm.min_spare_servers > 0';
-$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive integer value.';
-$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
-$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
-$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
-$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
-$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
-$wb['fastcgi_php_version_txt'] = 'PHP Version';
-$wb['pm_txt'] = 'PHP-FPM Process Manager';
-$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
-$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
-$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
-$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
-$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
-$wb['generate_password_txt'] = 'Generate Password';
-$wb['repeat_password_txt'] = 'Repeat Password';
-$wb['password_mismatch_txt'] = 'The passwords do not match.';
-$wb['password_match_txt'] = 'The passwords do match.';
-$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
-$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
-$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
-$wb['proxy_directives_txt'] = 'Proxy Directives';
-$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
-$wb['Domain'] = 'Aliasdomain';
-?>
diff --git a/interface/web/sites/lib/lang/ar_web_aliasdomain.lng b/interface/web/sites/lib/lang/br_web_childdomain.lng
similarity index 74%
copy from interface/web/sites/lib/lang/ar_web_aliasdomain.lng
copy to interface/web/sites/lib/lang/br_web_childdomain.lng
index 4149c71..07a1f3f 100644
--- a/interface/web/sites/lib/lang/ar_web_aliasdomain.lng
+++ b/interface/web/sites/lib/lang/br_web_childdomain.lng
@@ -1,48 +1,56 @@
<?php
-$wb['domain_txt'] = 'Aliasdomain';
-$wb['backup_interval_txt'] = 'Backup interval';
-$wb['backup_copies_txt'] = 'Number of backup copies';
-$wb['ssl_state_txt'] = 'State';
-$wb['ssl_locality_txt'] = 'Locality';
-$wb['ssl_organisation_txt'] = 'Organisation';
-$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
-$wb['ssl_country_txt'] = 'Country';
-$wb['ssl_key_txt'] = 'SSL Key';
-$wb['ssl_request_txt'] = 'SSL Request';
-$wb['ssl_cert_txt'] = 'SSL Certificate';
-$wb['ssl_bundle_txt'] = 'SSL Bundle';
-$wb['ssl_action_txt'] = 'SSL Action';
-$wb['ssl_domain_txt'] = 'SSL Domain';
-$wb['server_id_txt'] = 'Server';
-$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
-$wb['type_txt'] = 'Type';
-$wb['parent_domain_id_txt'] = 'Parent Website';
-$wb['redirect_type_txt'] = 'Redirect Type';
-$wb['redirect_path_txt'] = 'Redirect Path';
-$wb['active_txt'] = 'Active';
+$wb['ssl_state_txt'] = 'Estado';
+$wb['ssl_locality_txt'] = 'Localidade';
+$wb['ssl_organisation_txt'] = 'Empresa';
+$wb['ssl_organisation_unit_txt'] = 'Departamento';
+$wb['ssl_country_txt'] = 'País';
+$wb['ssl_request_txt'] = 'Requisição SSL';
+$wb['ssl_cert_txt'] = 'Certificado SSL';
+$wb['ssl_bundle_txt'] = 'Pacote SSL';
+$wb['ssl_action_txt'] = 'Ação SSL';
+$wb['server_id_txt'] = 'Servidor';
+$wb['domain_txt'] = 'Domínio';
+$wb['type_txt'] = 'Tipo';
+$wb['parent_domain_id_txt'] = 'Site Parente';
+$wb['redirect_type_txt'] = 'Tipo do Redirecionamento';
+$wb['redirect_path_txt'] = 'Caminho do Redirecionamento';
+$wb['active_txt'] = 'Ativo';
$wb['document_root_txt'] = 'Documentroot';
-$wb['system_user_txt'] = 'Linux User';
-$wb['system_group_txt'] = 'Linux Group';
-$wb['ip_address_txt'] = 'IPv4-Address';
-$wb['ipv6_address_txt'] = 'IPv6-Address';
-$wb['vhost_type_txt'] = 'VHost Type';
-$wb['hd_quota_txt'] = 'Harddisk Quota';
-$wb['traffic_quota_txt'] = 'Traffic Quota';
+$wb['system_user_txt'] = 'Usuário no Linux';
+$wb['system_group_txt'] = 'Grupo no Linux';
+$wb['ip_address_txt'] = 'Endereço-IP';
+$wb['vhost_type_txt'] = 'Tipo de VHost';
+$wb['hd_quota_txt'] = 'Cota de Disco';
+$wb['traffic_quota_txt'] = 'Cota de Tráfico';
$wb['cgi_txt'] = 'CGI';
$wb['ssi_txt'] = 'SSI';
-$wb['errordocs_txt'] = 'Own Error-Documents';
-$wb['subdomain_txt'] = 'Auto-Subdomain';
$wb['ssl_txt'] = 'SSL';
$wb['suexec_txt'] = 'SuEXEC';
$wb['php_txt'] = 'PHP';
-$wb['client_txt'] = 'Client';
-$wb['limit_web_domain_txt'] = 'The max. number of web domains for your account is reached.';
-$wb['limit_web_aliasdomain_txt'] = 'The max. number of aliasdomains for your account is reached.';
-$wb['limit_web_subdomain_txt'] = 'The max. number of web subdomains for your account is reached.';
-$wb['apache_directives_txt'] = 'Apache Directives';
-$wb['domain_error_empty'] = 'Domain is empty.';
-$wb['domain_error_unique'] = 'There is already a website or sub / aliasdomain with this domain name.';
-$wb['domain_error_regex'] = 'Domain name invalid.';
+$wb['client_txt'] = 'Cliente';
+$wb['limit_web_domain_txt'] = 'O número máximo de domínios web para esta conta foi atingido.';
+$wb['limit_web_aliasdomain_txt'] = 'O número máximo de aliases para esta conta foi atingido.';
+$wb['limit_web_subdomain_txt'] = 'O número máximo de sub-domínios para esta conta foi atingido.';
+$wb['apache_directives_txt'] = 'Diretivas apache';
+$wb['domain_error_empty'] = 'Domínio em branco.';
+$wb['domain_error_unique'] = 'Já existe alias ou sub-domínio com este nome.';
+$wb['domain_error_regex'] = 'Nome de domínio inválido.';
+$wb['host_txt'] = 'Host';
+$wb['redirect_error_regex'] = 'Caminho de redirecionamento inválido. Exemplo de caminho válido: /test/ ou http://www.dominio.ext/test/';
+$wb['no_redirect_txt'] = 'No redirect';
+$wb['no_flag_txt'] = 'No flag';
+$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
+$wb['proxy_directives_txt'] = 'Proxy Directives';
+$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
+$wb['error_proxy_requires_url'] = 'Redirect Type \"proxy\" requires a URL as the redirect path.';
+$wb['backup_interval_txt'] = 'Backup interval';
+$wb['backup_copies_txt'] = 'Number of backup copies';
+$wb['ssl_key_txt'] = 'SSL Key';
+$wb['ssl_domain_txt'] = 'SSL Domain';
+$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
+$wb['ipv6_address_txt'] = 'IPv6-Address';
+$wb['errordocs_txt'] = 'Own Error-Documents';
+$wb['subdomain_txt'] = 'Auto-Subdomain';
$wb['domain_error_autosub'] = 'There is already a subdomain with these settings.';
$wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
$wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
@@ -62,7 +70,6 @@
$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
$wb['limit_traffic_quota_free_txt'] = 'Max. available Traffic Quota';
-$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
$wb['php_open_basedir_txt'] = 'PHP open_basedir';
$wb['traffic_quota_exceeded_txt'] = 'Traffic quota exceeded';
$wb['ruby_txt'] = 'Ruby';
@@ -71,8 +78,6 @@
$wb['custom_php_ini_txt'] = 'Custom php.ini settings';
$wb['none_txt'] = 'None';
$wb['disabled_txt'] = 'Disabled';
-$wb['no_redirect_txt'] = 'No redirect';
-$wb['no_flag_txt'] = 'No flag';
$wb['save_certificate_txt'] = 'Save certificate';
$wb['create_certificate_txt'] = 'Create certificate';
$wb['delete_certificate_txt'] = 'Delete certificate';
@@ -109,7 +114,6 @@
$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
-$wb['proxy_directives_txt'] = 'Proxy Directives';
-$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
$wb['Domain'] = 'Aliasdomain';
+
?>
diff --git a/interface/web/sites/lib/lang/br_web_aliasdomain_list.lng b/interface/web/sites/lib/lang/br_web_childdomain_list.lng
similarity index 73%
rename from interface/web/sites/lib/lang/br_web_aliasdomain_list.lng
rename to interface/web/sites/lib/lang/br_web_childdomain_list.lng
index d75bddd..b0e962b 100644
--- a/interface/web/sites/lib/lang/br_web_aliasdomain_list.lng
+++ b/interface/web/sites/lib/lang/br_web_childdomain_list.lng
@@ -1,14 +1,15 @@
<?php
-$wb['list_head_txt'] = 'Domínio Alias';
+$wb['list_head_txt'] = 'Sub-domínios';
$wb['active_txt'] = 'Ativo';
$wb['server_id_txt'] = 'Servidor';
$wb['parent_domain_id_txt'] = 'Website';
-$wb['domain_txt'] = 'Domínio Alias';
-$wb['add_new_record_txt'] = 'Adcionar novo domínio alias';
+$wb['domain_txt'] = 'Sub-domínio';
+$wb['add_new_record_txt'] = 'Adcionar um novo sub-domínio';
$wb['domain_error_empty'] = 'Domínio em branco.';
$wb['domain_error_unique'] = 'O domínio deve ser único.';
$wb['domain_error_regex'] = 'Nome de domínio inválido.';
$wb['no_redirect_txt'] = 'No redirect';
$wb['no_flag_txt'] = 'No flag';
$wb['none_txt'] = 'Em Branco';
+
?>
diff --git a/interface/web/sites/lib/lang/br_web_subdomain.lng b/interface/web/sites/lib/lang/br_web_subdomain.lng
deleted file mode 100644
index 340735a..0000000
--- a/interface/web/sites/lib/lang/br_web_subdomain.lng
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-$wb['ssl_state_txt'] = 'Estado';
-$wb['ssl_locality_txt'] = 'Localidade';
-$wb['ssl_organisation_txt'] = 'Empresa';
-$wb['ssl_organisation_unit_txt'] = 'Departamento';
-$wb['ssl_country_txt'] = 'País';
-$wb['ssl_request_txt'] = 'Requisição SSL';
-$wb['ssl_cert_txt'] = 'Certificado SSL';
-$wb['ssl_bundle_txt'] = 'Pacote SSL';
-$wb['ssl_action_txt'] = 'Ação SSL';
-$wb['server_id_txt'] = 'Servidor';
-$wb['domain_txt'] = 'Domínio';
-$wb['type_txt'] = 'Tipo';
-$wb['parent_domain_id_txt'] = 'Site Parente';
-$wb['redirect_type_txt'] = 'Tipo do Redirecionamento';
-$wb['redirect_path_txt'] = 'Caminho do Redirecionamento';
-$wb['active_txt'] = 'Ativo';
-$wb['document_root_txt'] = 'Documentroot';
-$wb['system_user_txt'] = 'Usuário no Linux';
-$wb['system_group_txt'] = 'Grupo no Linux';
-$wb['ip_address_txt'] = 'Endereço-IP';
-$wb['vhost_type_txt'] = 'Tipo de VHost';
-$wb['hd_quota_txt'] = 'Cota de Disco';
-$wb['traffic_quota_txt'] = 'Cota de Tráfico';
-$wb['cgi_txt'] = 'CGI';
-$wb['ssi_txt'] = 'SSI';
-$wb['ssl_txt'] = 'SSL';
-$wb['suexec_txt'] = 'SuEXEC';
-$wb['php_txt'] = 'PHP';
-$wb['client_txt'] = 'Cliente';
-$wb['limit_web_domain_txt'] = 'O número máximo de domínios web para esta conta foi atingido.';
-$wb['limit_web_aliasdomain_txt'] = 'O número máximo de aliases para esta conta foi atingido.';
-$wb['limit_web_subdomain_txt'] = 'O número máximo de sub-domínios para esta conta foi atingido.';
-$wb['apache_directives_txt'] = 'Diretivas apache';
-$wb['domain_error_empty'] = 'Domínio em branco.';
-$wb['domain_error_unique'] = 'Já existe alias ou sub-domínio com este nome.';
-$wb['domain_error_regex'] = 'Nome de domínio inválido.';
-$wb['host_txt'] = 'Host';
-$wb['redirect_error_regex'] = 'Caminho de redirecionamento inválido. Exemplo de caminho válido: /test/ ou http://www.dominio.ext/test/';
-$wb['no_redirect_txt'] = 'No redirect';
-$wb['no_flag_txt'] = 'No flag';
-$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
-$wb['proxy_directives_txt'] = 'Proxy Directives';
-$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
-$wb['error_proxy_requires_url'] = 'Redirect Type \\"proxy\\" requires a URL as the redirect path.';
-?>
diff --git a/interface/web/sites/lib/lang/br_web_subdomain_list.lng b/interface/web/sites/lib/lang/br_web_subdomain_list.lng
deleted file mode 100644
index 8351167..0000000
--- a/interface/web/sites/lib/lang/br_web_subdomain_list.lng
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Sub-domínios';
-$wb['active_txt'] = 'Ativo';
-$wb['server_id_txt'] = 'Servidor';
-$wb['parent_domain_id_txt'] = 'Website';
-$wb['domain_txt'] = 'Sub-domínio';
-$wb['add_new_record_txt'] = 'Adcionar um novo sub-domínio';
-?>
diff --git a/interface/web/sites/lib/lang/cz_web_aliasdomain.lng b/interface/web/sites/lib/lang/cz_web_childdomain.lng
similarity index 75%
rename from interface/web/sites/lib/lang/cz_web_aliasdomain.lng
rename to interface/web/sites/lib/lang/cz_web_childdomain.lng
index c82c428..e91309f 100644
--- a/interface/web/sites/lib/lang/cz_web_aliasdomain.lng
+++ b/interface/web/sites/lib/lang/cz_web_childdomain.lng
@@ -1,48 +1,56 @@
<?php
-$wb['domain_txt'] = 'Aliasdomain';
-$wb['backup_interval_txt'] = 'Interval zálohování';
-$wb['backup_copies_txt'] = 'Počet kopií zálohy';
-$wb['ssl_state_txt'] = 'State';
-$wb['ssl_locality_txt'] = 'Locality';
-$wb['ssl_organisation_txt'] = 'Organisation';
-$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
-$wb['ssl_country_txt'] = 'Country';
-$wb['ssl_key_txt'] = 'SSL Key';
-$wb['ssl_request_txt'] = 'SSL Request';
-$wb['ssl_cert_txt'] = 'SSL Certificate';
-$wb['ssl_bundle_txt'] = 'SSL Bundle';
-$wb['ssl_action_txt'] = 'SSL Action';
-$wb['ssl_domain_txt'] = 'SSL Domain';
+$wb['ssl_state_txt'] = 'Stát';
+$wb['ssl_locality_txt'] = 'Lokalita';
+$wb['ssl_organisation_txt'] = 'Organizace';
+$wb['ssl_organisation_unit_txt'] = 'Organizační jednotka';
+$wb['ssl_country_txt'] = 'Země';
+$wb['ssl_request_txt'] = 'SSL požadavek';
+$wb['ssl_cert_txt'] = 'SSL certifikát';
+$wb['ssl_bundle_txt'] = 'SSL bundle';
+$wb['ssl_action_txt'] = 'SSL akce';
$wb['server_id_txt'] = 'Server';
-$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
-$wb['type_txt'] = 'Type';
-$wb['parent_domain_id_txt'] = 'Parent Website';
+$wb['domain_txt'] = 'Doména';
+$wb['type_txt'] = 'Typ';
+$wb['parent_domain_id_txt'] = 'Rodičovská web stránka';
$wb['redirect_type_txt'] = 'Typ přesměrování';
$wb['redirect_path_txt'] = 'Cesta přesměrování';
$wb['active_txt'] = 'Aktivní';
-$wb['document_root_txt'] = 'Documentroot';
-$wb['system_user_txt'] = 'Linux User';
-$wb['system_group_txt'] = 'Linux Group';
-$wb['ip_address_txt'] = 'IPv4-Address';
-$wb['ipv6_address_txt'] = 'IPv6-Address';
-$wb['vhost_type_txt'] = 'VHost Type';
-$wb['hd_quota_txt'] = 'Harddisk Quota';
-$wb['traffic_quota_txt'] = 'Traffic Quota';
+$wb['document_root_txt'] = 'Kořenový adresář dokumentů';
+$wb['system_user_txt'] = 'Linuxový uživatel';
+$wb['system_group_txt'] = 'Linuxová skupina';
+$wb['ip_address_txt'] = 'IP adresa';
+$wb['vhost_type_txt'] = 'VHost typ';
+$wb['hd_quota_txt'] = 'Disková kvóta';
+$wb['traffic_quota_txt'] = 'Přenosová kvóta';
$wb['cgi_txt'] = 'CGI';
$wb['ssi_txt'] = 'SSI';
-$wb['errordocs_txt'] = 'Own Error-Documents';
-$wb['subdomain_txt'] = 'Auto-Subdomain';
$wb['ssl_txt'] = 'SSL';
$wb['suexec_txt'] = 'SuEXEC';
$wb['php_txt'] = 'PHP';
-$wb['client_txt'] = 'Client';
-$wb['limit_web_domain_txt'] = 'The max. number of web domains for your account is reached.';
-$wb['limit_web_aliasdomain_txt'] = 'The max. number of aliasdomains for your account is reached.';
-$wb['limit_web_subdomain_txt'] = 'The max. number of web subdomains for your account is reached.';
-$wb['apache_directives_txt'] = 'Apache Directives';
+$wb['client_txt'] = 'Klient';
+$wb['limit_web_domain_txt'] = 'Dosažen maximální počet web domén pro Váš účet.';
+$wb['limit_web_aliasdomain_txt'] = 'Dosažen maximální počet alias domén pro Váš účet.';
+$wb['limit_web_subdomain_txt'] = 'Dosažen maximální počet subdomén pro Váš účet.';
+$wb['apache_directives_txt'] = 'Apache direktivy';
$wb['domain_error_empty'] = 'Doména je prázdná.';
-$wb['domain_error_unique'] = 'Webové stránky nebo sub-doména / alias-domény již existuje s tímto doménovým jménem.';
+$wb['domain_error_unique'] = 'Webová stránka nebo sub / alias doména s tímto doménovým jménem již existuje.';
$wb['domain_error_regex'] = 'Neplatné doménové jméno.';
+$wb['host_txt'] = 'Host';
+$wb['redirect_error_regex'] = 'Neplatná cesta přesměrování. Platné přesměrování je například: /test/ nebo http://www.domain.tld/test/';
+$wb['no_redirect_txt'] = 'Žádné přesměrování';
+$wb['no_flag_txt'] = 'Žádný příznak';
+$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
+$wb['proxy_directives_txt'] = 'Proxy Directives';
+$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
+$wb['error_proxy_requires_url'] = 'Redirect Type \"proxy\" requires a URL as the redirect path.';
+$wb['backup_interval_txt'] = 'Interval zálohování';
+$wb['backup_copies_txt'] = 'Počet kopií zálohy';
+$wb['ssl_key_txt'] = 'SSL Key';
+$wb['ssl_domain_txt'] = 'SSL Domain';
+$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
+$wb['ipv6_address_txt'] = 'IPv6-Address';
+$wb['errordocs_txt'] = 'Own Error-Documents';
+$wb['subdomain_txt'] = 'Auto-Subdomain';
$wb['domain_error_autosub'] = 'There is already a subdomain with these settings.';
$wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
$wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
@@ -62,7 +70,6 @@
$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
$wb['limit_traffic_quota_free_txt'] = 'Max. available Traffic Quota';
-$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
$wb['php_open_basedir_txt'] = 'PHP open_basedir';
$wb['traffic_quota_exceeded_txt'] = 'Traffic quota exceeded';
$wb['ruby_txt'] = 'Ruby';
@@ -71,8 +78,6 @@
$wb['custom_php_ini_txt'] = 'Custom php.ini settings';
$wb['none_txt'] = 'None';
$wb['disabled_txt'] = 'Disabled';
-$wb['no_redirect_txt'] = 'No redirect';
-$wb['no_flag_txt'] = 'No flag';
$wb['save_certificate_txt'] = 'Save certificate';
$wb['create_certificate_txt'] = 'Create certificate';
$wb['delete_certificate_txt'] = 'Delete certificate';
@@ -109,8 +114,6 @@
$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
-$wb['proxy_directives_txt'] = 'Proxy Directives';
-$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
$wb['Domain'] = 'Aliasdomain';
-?>
+?>
diff --git a/interface/web/sites/lib/lang/cz_web_aliasdomain_list.lng b/interface/web/sites/lib/lang/cz_web_childdomain_list.lng
similarity index 76%
rename from interface/web/sites/lib/lang/cz_web_aliasdomain_list.lng
rename to interface/web/sites/lib/lang/cz_web_childdomain_list.lng
index a3ae2a9..323e565 100644
--- a/interface/web/sites/lib/lang/cz_web_aliasdomain_list.lng
+++ b/interface/web/sites/lib/lang/cz_web_childdomain_list.lng
@@ -1,15 +1,15 @@
<?php
-$wb['list_head_txt'] = 'Alias doména';
+$wb['list_head_txt'] = 'Subdomény';
$wb['active_txt'] = 'Aktivní';
$wb['server_id_txt'] = 'Server';
$wb['parent_domain_id_txt'] = 'Webová stránka';
-$wb['domain_txt'] = 'Alias doména';
-$wb['add_new_record_txt'] = 'Přidat alias doménu';
+$wb['domain_txt'] = 'Subdoména';
+$wb['add_new_record_txt'] = 'Přidat subdoménu';
$wb['domain_error_empty'] = 'Doména je prázdná.';
$wb['domain_error_unique'] = 'Doména musí být unkátní.';
$wb['domain_error_regex'] = 'Doménové jméno je chybné.';
$wb['no_redirect_txt'] = 'Žádné přesměrování';
$wb['no_flag_txt'] = 'Žádný příznak';
$wb['none_txt'] = 'Žádná';
-?>
+?>
diff --git a/interface/web/sites/lib/lang/cz_web_subdomain.lng b/interface/web/sites/lib/lang/cz_web_subdomain.lng
deleted file mode 100644
index b40c927..0000000
--- a/interface/web/sites/lib/lang/cz_web_subdomain.lng
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-$wb['ssl_state_txt'] = 'Stát';
-$wb['ssl_locality_txt'] = 'Lokalita';
-$wb['ssl_organisation_txt'] = 'Organizace';
-$wb['ssl_organisation_unit_txt'] = 'Organizační jednotka';
-$wb['ssl_country_txt'] = 'Země';
-$wb['ssl_request_txt'] = 'SSL požadavek';
-$wb['ssl_cert_txt'] = 'SSL certifikát';
-$wb['ssl_bundle_txt'] = 'SSL bundle';
-$wb['ssl_action_txt'] = 'SSL akce';
-$wb['server_id_txt'] = 'Server';
-$wb['domain_txt'] = 'Doména';
-$wb['type_txt'] = 'Typ';
-$wb['parent_domain_id_txt'] = 'Rodičovská web stránka';
-$wb['redirect_type_txt'] = 'Typ přesměrování';
-$wb['redirect_path_txt'] = 'Cesta přesměrování';
-$wb['active_txt'] = 'Aktivní';
-$wb['document_root_txt'] = 'Kořenový adresář dokumentů';
-$wb['system_user_txt'] = 'Linuxový uživatel';
-$wb['system_group_txt'] = 'Linuxová skupina';
-$wb['ip_address_txt'] = 'IP adresa';
-$wb['vhost_type_txt'] = 'VHost typ';
-$wb['hd_quota_txt'] = 'Disková kvóta';
-$wb['traffic_quota_txt'] = 'Přenosová kvóta';
-$wb['cgi_txt'] = 'CGI';
-$wb['ssi_txt'] = 'SSI';
-$wb['ssl_txt'] = 'SSL';
-$wb['suexec_txt'] = 'SuEXEC';
-$wb['php_txt'] = 'PHP';
-$wb['client_txt'] = 'Klient';
-$wb['limit_web_domain_txt'] = 'Dosažen maximální počet web domén pro Váš účet.';
-$wb['limit_web_aliasdomain_txt'] = 'Dosažen maximální počet alias domén pro Váš účet.';
-$wb['limit_web_subdomain_txt'] = 'Dosažen maximální počet subdomén pro Váš účet.';
-$wb['apache_directives_txt'] = 'Apache direktivy';
-$wb['domain_error_empty'] = 'Doména je prázdná.';
-$wb['domain_error_unique'] = 'Webová stránka nebo sub / alias doména s tímto doménovým jménem již existuje.';
-$wb['domain_error_regex'] = 'Neplatné doménové jméno.';
-$wb['host_txt'] = 'Host';
-$wb['redirect_error_regex'] = 'Neplatná cesta přesměrování. Platné přesměrování je například: /test/ nebo http://www.domain.tld/test/';
-$wb['no_redirect_txt'] = 'Žádné přesměrování';
-$wb['no_flag_txt'] = 'Žádný příznak';
-$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
-$wb['proxy_directives_txt'] = 'Proxy Directives';
-$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
-$wb['error_proxy_requires_url'] = 'Redirect Type \\"proxy\\" requires a URL as the redirect path.';
-?>
-
diff --git a/interface/web/sites/lib/lang/cz_web_subdomain_list.lng b/interface/web/sites/lib/lang/cz_web_subdomain_list.lng
deleted file mode 100644
index d1ad283..0000000
--- a/interface/web/sites/lib/lang/cz_web_subdomain_list.lng
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Subdomény';
-$wb['active_txt'] = 'Aktivní';
-$wb['server_id_txt'] = 'Server';
-$wb['parent_domain_id_txt'] = 'Webová stránka';
-$wb['domain_txt'] = 'Subdoména';
-$wb['add_new_record_txt'] = 'Přidat subdoménu';
-?>
-
diff --git a/interface/web/sites/lib/lang/de_web_aliasdomain.lng b/interface/web/sites/lib/lang/de_web_childdomain.lng
similarity index 83%
rename from interface/web/sites/lib/lang/de_web_aliasdomain.lng
rename to interface/web/sites/lib/lang/de_web_childdomain.lng
index 5889b17..435beae 100644
--- a/interface/web/sites/lib/lang/de_web_aliasdomain.lng
+++ b/interface/web/sites/lib/lang/de_web_childdomain.lng
@@ -1,48 +1,56 @@
<?php
-$wb['domain_txt'] = 'Aliasdomain';
-$wb['backup_interval_txt'] = 'Backup-Intervall';
-$wb['backup_copies_txt'] = 'Anzahl der Backups';
$wb['ssl_state_txt'] = 'Bundesland';
$wb['ssl_locality_txt'] = 'Ort';
$wb['ssl_organisation_txt'] = 'Firma';
$wb['ssl_organisation_unit_txt'] = 'Abteilung';
$wb['ssl_country_txt'] = 'Land';
-$wb['ssl_key_txt'] = 'SSL-Schlüssel';
-$wb['ssl_request_txt'] = 'SSL-Anfrage';
-$wb['ssl_cert_txt'] = 'SSL-Zertifikat';
-$wb['ssl_bundle_txt'] = 'SSL-Bundle';
-$wb['ssl_action_txt'] = 'SSL-Aktion';
-$wb['ssl_domain_txt'] = 'SSL-Domain';
+$wb['ssl_request_txt'] = 'SSL Anfrage';
+$wb['ssl_cert_txt'] = 'SSL Zertifikat';
+$wb['ssl_bundle_txt'] = 'SSL Bundle';
+$wb['ssl_action_txt'] = 'SSL Aktion';
$wb['server_id_txt'] = 'Server';
-$wb['web_folder_error_regex'] = 'Ungültige Ordnerangabe. Bitte geben Sie keinen Schrägstrich ein.';
+$wb['domain_txt'] = 'Domain';
$wb['type_txt'] = 'Typ';
-$wb['parent_domain_id_txt'] = 'Hauptwebseite';
+$wb['parent_domain_id_txt'] = 'Zugehörige Webseite';
$wb['redirect_type_txt'] = 'Weiterleitungstyp';
$wb['redirect_path_txt'] = 'Weiterleitungsziel';
$wb['active_txt'] = 'Aktiv';
$wb['document_root_txt'] = 'Documentroot';
-$wb['system_user_txt'] = 'System-Benutzer';
-$wb['system_group_txt'] = 'System-Gruppe';
-$wb['ip_address_txt'] = 'IPv4-Adresse';
-$wb['ipv6_address_txt'] = 'IPv6-Adresse';
+$wb['system_user_txt'] = 'Linux-Benutzer';
+$wb['system_group_txt'] = 'Linux-Gruppe';
+$wb['ip_address_txt'] = 'IP-Adresse';
$wb['vhost_type_txt'] = 'vHost-Typ';
-$wb['hd_quota_txt'] = 'Speicherplatz-Beschränkung';
-$wb['traffic_quota_txt'] = 'Datentransfer-Beschränkung';
+$wb['hd_quota_txt'] = 'Festplatten-Quota';
+$wb['traffic_quota_txt'] = 'Traffic-Quota';
$wb['cgi_txt'] = 'CGI';
$wb['ssi_txt'] = 'SSI';
-$wb['errordocs_txt'] = 'Eigene Fehlerseiten';
-$wb['subdomain_txt'] = 'Automatische Subdomain';
$wb['ssl_txt'] = 'SSL';
$wb['suexec_txt'] = 'SuEXEC';
$wb['php_txt'] = 'PHP';
$wb['client_txt'] = 'Kunde';
-$wb['limit_web_domain_txt'] = 'Die max. Anzahl an Webdomains für Ihr Konto ist erreicht.';
-$wb['limit_web_aliasdomain_txt'] = 'Die max. Anzahl an Aliasdomains für Ihr Konto ist erreicht.';
-$wb['limit_web_subdomain_txt'] = 'Die max. Anzahl an Web Subdomains für Ihr Konto ist erreicht.';
+$wb['limit_web_domain_txt'] = 'Die max. Anzahl an Webdomains für Ihr Konto wurde erreicht.';
+$wb['limit_web_aliasdomain_txt'] = 'Die max. Anzahl an Aliasdomains für Ihr Konto wurde erreicht.';
+$wb['limit_web_subdomain_txt'] = 'Die max. Anzahl an Web-Subdomains für Ihr Konto wurde erreicht.';
$wb['apache_directives_txt'] = 'Apache-Direktiven';
$wb['domain_error_empty'] = 'Domain ist leer.';
-$wb['domain_error_unique'] = 'Es existiert bereits eine Webseite oder Sub- Aliasdomain mit diesem Domain-Namen.';
-$wb['domain_error_regex'] = 'Domain-Name ungültig.';
+$wb['domain_error_unique'] = 'Domain muss eindeutig sein.';
+$wb['domain_error_regex'] = 'Domain-Name ist ungültig.';
+$wb['domain_error_wildcard'] = 'Wildcard Subdomains sind nicht erlaubt.';
+$wb['host_txt'] = 'Host';
+$wb['redirect_error_regex'] = 'Ungültiger Redirect-Pfad. Gültige Pfade sind beispielsweise: /test/ oder http://www.domain.tld/test/';
+$wb['no_redirect_txt'] = 'Kein Redirect';
+$wb['no_flag_txt'] = 'Kein Flag';
+$wb['proxy_directives_txt'] = 'Proxy-Direktiven';
+$wb['available_proxy_directive_snippets_txt'] = 'Verfügbare Proxy Direktiven Schnipsel:';
+$wb['error_proxy_requires_url'] = 'Weiterleitungstyp \"proxy\" erfordert eine URL als Weiterleitungspfad.';
+$wb['backup_interval_txt'] = 'Backup-Intervall';
+$wb['backup_copies_txt'] = 'Anzahl der Backups';
+$wb['ssl_key_txt'] = 'SSL-Schlüssel';
+$wb['ssl_domain_txt'] = 'SSL-Domain';
+$wb['web_folder_error_regex'] = 'Ungültige Ordnerangabe. Bitte geben Sie keinen Schrägstrich ein.';
+$wb['ipv6_address_txt'] = 'IPv6-Adresse';
+$wb['errordocs_txt'] = 'Eigene Fehlerseiten';
+$wb['subdomain_txt'] = 'Automatische Subdomain';
$wb['domain_error_autosub'] = 'Es existiert bereits eine Subdomain mit diesen Einstellungen.';
$wb['hd_quota_error_empty'] = 'Speicherplatz-Beschränkung ist 0 oder leer.';
$wb['traffic_quota_error_empty'] = 'Datentransfer-Beschränkung ist leer.';
@@ -62,7 +70,6 @@
$wb['ssl_organistaion_unit_error_regex'] = 'Ungültige SSL-Abteilung. Mögliche Zeichen sind: a-z, 0-9 and .,-_';
$wb['ssl_country_error_regex'] = 'Ungültiges SSL-Land. Mögliche Zeichen sind: A-Z';
$wb['limit_traffic_quota_free_txt'] = 'Max. verfügbarer Datentransfer';
-$wb['redirect_error_regex'] = 'Ungültiges Weiterleitungsziel. Gültige Weiterleitungsziele sind zum Beispiel: /test/ oder http://www.domain.tld/test/';
$wb['php_open_basedir_txt'] = 'PHP open_basedir';
$wb['traffic_quota_exceeded_txt'] = 'Datentransfervolumen überschritten';
$wb['ruby_txt'] = 'Ruby';
@@ -71,8 +78,6 @@
$wb['custom_php_ini_txt'] = 'Benutzerdefinierte php.ini-Einstellungen';
$wb['none_txt'] = 'Keine';
$wb['disabled_txt'] = 'Deaktiviert';
-$wb['no_redirect_txt'] = 'Keine Weiterleitung';
-$wb['no_flag_txt'] = 'Kein Flag';
$wb['save_certificate_txt'] = 'Zertifikat speichern';
$wb['create_certificate_txt'] = 'Zertifikat erstellen';
$wb['delete_certificate_txt'] = 'Zertifikat löschen';
@@ -109,7 +114,6 @@
$wb['available_php_directive_snippets_txt'] = 'Verfügbare PHP-Direktiven-Schnipsel:';
$wb['available_apache_directive_snippets_txt'] = 'Verfügbare Apache-Direktiven-Schnipsel:';
$wb['available_nginx_directive_snippets_txt'] = 'Verfügbare nginx-Direktiven-Schnipsel:';
-$wb['proxy_directives_txt'] = 'Proxy-Direktiven';
-$wb['available_proxy_directive_snippets_txt'] = 'Verfügbare Proxy-Direktiven-Schnipsel:';
$wb['Domain'] = 'Aliasdomain';
+
?>
diff --git a/interface/web/sites/lib/lang/de_web_aliasdomain_list.lng b/interface/web/sites/lib/lang/de_web_childdomain_list.lng
similarity index 67%
rename from interface/web/sites/lib/lang/de_web_aliasdomain_list.lng
rename to interface/web/sites/lib/lang/de_web_childdomain_list.lng
index 2f47883..836bf8f 100644
--- a/interface/web/sites/lib/lang/de_web_aliasdomain_list.lng
+++ b/interface/web/sites/lib/lang/de_web_childdomain_list.lng
@@ -1,14 +1,15 @@
<?php
-$wb['list_head_txt'] = 'Aliasdomain';
+$wb['list_head_txt'] = 'Subdomains';
$wb['active_txt'] = 'Aktiv';
$wb['server_id_txt'] = 'Server';
-$wb['parent_domain_id_txt'] = 'Domain';
-$wb['domain_txt'] = 'Aliasdomain';
-$wb['add_new_record_txt'] = 'Neue Aliasdomain hinzufügen';
+$wb['parent_domain_id_txt'] = 'Webseite';
+$wb['domain_txt'] = 'Subdomain';
+$wb['add_new_record_txt'] = 'Neue Subdomain hinzufügen';
$wb['domain_error_empty'] = 'Domain ist leer.';
$wb['domain_error_unique'] = 'Domain muss eindeutig sein.';
$wb['domain_error_regex'] = 'Domain Name ist ungültig.';
$wb['no_redirect_txt'] = 'Keine Weiterleitung';
$wb['no_flag_txt'] = 'Keine Optionen';
$wb['none_txt'] = 'Keine';
+
?>
diff --git a/interface/web/sites/lib/lang/de_web_subdomain.lng b/interface/web/sites/lib/lang/de_web_subdomain.lng
deleted file mode 100644
index 5c23f08..0000000
--- a/interface/web/sites/lib/lang/de_web_subdomain.lng
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-$wb['ssl_state_txt'] = 'Bundesland';
-$wb['ssl_locality_txt'] = 'Ort';
-$wb['ssl_organisation_txt'] = 'Firma';
-$wb['ssl_organisation_unit_txt'] = 'Abteilung';
-$wb['ssl_country_txt'] = 'Land';
-$wb['ssl_request_txt'] = 'SSL Anfrage';
-$wb['ssl_cert_txt'] = 'SSL Zertifikat';
-$wb['ssl_bundle_txt'] = 'SSL Bundle';
-$wb['ssl_action_txt'] = 'SSL Aktion';
-$wb['server_id_txt'] = 'Server';
-$wb['domain_txt'] = 'Domain';
-$wb['type_txt'] = 'Typ';
-$wb['parent_domain_id_txt'] = 'Zugehörige Webseite';
-$wb['redirect_type_txt'] = 'Weiterleitungstyp';
-$wb['redirect_path_txt'] = 'Weiterleitungsziel';
-$wb['active_txt'] = 'Aktiv';
-$wb['document_root_txt'] = 'Documentroot';
-$wb['system_user_txt'] = 'Linux-Benutzer';
-$wb['system_group_txt'] = 'Linux-Gruppe';
-$wb['ip_address_txt'] = 'IP-Adresse';
-$wb['vhost_type_txt'] = 'vHost-Typ';
-$wb['hd_quota_txt'] = 'Festplatten-Quota';
-$wb['traffic_quota_txt'] = 'Traffic-Quota';
-$wb['cgi_txt'] = 'CGI';
-$wb['ssi_txt'] = 'SSI';
-$wb['ssl_txt'] = 'SSL';
-$wb['suexec_txt'] = 'SuEXEC';
-$wb['php_txt'] = 'PHP';
-$wb['client_txt'] = 'Kunde';
-$wb['limit_web_domain_txt'] = 'Die max. Anzahl an Webdomains für Ihr Konto wurde erreicht.';
-$wb['limit_web_aliasdomain_txt'] = 'Die max. Anzahl an Aliasdomains für Ihr Konto wurde erreicht.';
-$wb['limit_web_subdomain_txt'] = 'Die max. Anzahl an Web-Subdomains für Ihr Konto wurde erreicht.';
-$wb['apache_directives_txt'] = 'Apache-Direktiven';
-$wb['domain_error_empty'] = 'Domain ist leer.';
-$wb['domain_error_unique'] = 'Domain muss eindeutig sein.';
-$wb['domain_error_regex'] = 'Domain-Name ist ungültig.';
-$wb['domain_error_wildcard'] = 'Wildcard Subdomains sind nicht erlaubt.';
-$wb['host_txt'] = 'Host';
-$wb['redirect_error_regex'] = 'Ungültiger Redirect-Pfad. Gültige Pfade sind beispielsweise: /test/ oder http://www.domain.tld/test/';
-$wb['no_redirect_txt'] = 'Kein Redirect';
-$wb['no_flag_txt'] = 'Kein Flag';
-$wb['proxy_directives_txt'] = 'Proxy-Direktiven';
-$wb['available_proxy_directive_snippets_txt'] = 'Verfügbare Proxy Direktiven Schnipsel:';
-$wb['error_proxy_requires_url'] = 'Weiterleitungstyp \\"proxy\\" erfordert eine URL als Weiterleitungspfad.';
-?>
diff --git a/interface/web/sites/lib/lang/de_web_subdomain_list.lng b/interface/web/sites/lib/lang/de_web_subdomain_list.lng
deleted file mode 100644
index 042b9f0..0000000
--- a/interface/web/sites/lib/lang/de_web_subdomain_list.lng
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Subdomains';
-$wb['active_txt'] = 'Aktiv';
-$wb['server_id_txt'] = 'Server';
-$wb['parent_domain_id_txt'] = 'Webseite';
-$wb['domain_txt'] = 'Subdomain';
-$wb['add_new_record_txt'] = 'Neue Subdomain hinzufügen';
-?>
diff --git a/interface/web/sites/lib/lang/el_web_aliasdomain.lng b/interface/web/sites/lib/lang/el_web_childdomain.lng
similarity index 83%
rename from interface/web/sites/lib/lang/el_web_aliasdomain.lng
rename to interface/web/sites/lib/lang/el_web_childdomain.lng
index ba8c690..b573872 100644
--- a/interface/web/sites/lib/lang/el_web_aliasdomain.lng
+++ b/interface/web/sites/lib/lang/el_web_childdomain.lng
@@ -1,48 +1,56 @@
<?php
-$wb['domain_txt'] = 'Ψευδώνυμο domain';
-$wb['backup_interval_txt'] = 'Χρονικό διάστημα Αντιγράφων Ασφαλείας';
-$wb['backup_copies_txt'] = 'Πλήθος Αντιγράφων Ασφαλείας';
-$wb['ssl_state_txt'] = 'Κατάσταση';
+$wb['ssl_state_txt'] = 'Περιφέρεια';
$wb['ssl_locality_txt'] = 'Τοποθεσία';
$wb['ssl_organisation_txt'] = 'Οργανισμός';
-$wb['ssl_organisation_unit_txt'] = 'Τμήμα Οργανισμού';
+$wb['ssl_organisation_unit_txt'] = 'Τμήμα οργανισμού';
$wb['ssl_country_txt'] = 'Χώρα';
-$wb['ssl_key_txt'] = 'SSL Key';
$wb['ssl_request_txt'] = 'SSL Request';
$wb['ssl_cert_txt'] = 'SSL Certificate';
$wb['ssl_bundle_txt'] = 'SSL Bundle';
$wb['ssl_action_txt'] = 'SSL Action';
-$wb['ssl_domain_txt'] = 'SSL Domain';
$wb['server_id_txt'] = 'Server';
-$wb['web_folder_error_regex'] = 'Εισάγατε μη έγκυρο φάκελο. Μην εισάγετε την κάθετο.';
+$wb['domain_txt'] = 'Domain';
$wb['type_txt'] = 'Τύπος';
$wb['parent_domain_id_txt'] = 'Γονικό Website';
-$wb['redirect_type_txt'] = 'Τύπος Ανακατεύθυνσης';
-$wb['redirect_path_txt'] = 'Διαδρομή Ανακατεύθυνσης';
-$wb['active_txt'] = 'Ενεργό';
-$wb['document_root_txt'] = 'Documentroot';
-$wb['system_user_txt'] = 'Χρήστης Linux';
+$wb['redirect_type_txt'] = 'Τύπος ανακατεύθυνσης';
+$wb['redirect_path_txt'] = 'Διαδρομή ανακατεύθυνσης';
+$wb['active_txt'] = 'Ενεργή';
+$wb['document_root_txt'] = 'Ριζικός φάκελος';
+$wb['system_user_txt'] = 'Όνομα χρήστη Linux';
$wb['system_group_txt'] = 'Ομάδα Linux';
-$wb['ip_address_txt'] = 'Διεύθυνση IPv4';
-$wb['ipv6_address_txt'] = 'Διεύθυνση IPv6';
+$wb['ip_address_txt'] = 'Διεύθυνση IP';
$wb['vhost_type_txt'] = 'Τύπος VHost';
$wb['hd_quota_txt'] = 'Όριο αποθηκευτικού χώρου';
$wb['traffic_quota_txt'] = 'Όριο μεταφοράς δεδομένων';
$wb['cgi_txt'] = 'CGI';
$wb['ssi_txt'] = 'SSI';
-$wb['errordocs_txt'] = 'Προσωπικά έγγραφα σφάλματος';
-$wb['subdomain_txt'] = 'Αυτόματο-Subdomain';
$wb['ssl_txt'] = 'SSL';
$wb['suexec_txt'] = 'SuEXEC';
$wb['php_txt'] = 'PHP';
$wb['client_txt'] = 'Πελάτης';
-$wb['limit_web_domain_txt'] = 'Έχετε φτάσει το μέγιστο πλήθος των web domains για τον λογαριασμό σας.';
-$wb['limit_web_aliasdomain_txt'] = 'Έχετε φτάσει το μέγιστο πλήθος των ψευδωνύμων domains για τον λογαριασμό σας.';
-$wb['limit_web_subdomain_txt'] = 'Έχετε φτάσει το μέγιστο πλήθος των web subdomains για τον λογαριασμό σας.';
-$wb['apache_directives_txt'] = 'Apache Directives';
+$wb['limit_web_domain_txt'] = 'Έχετε φτάσει το μέγιστο πλήθος των web domains του λογαριασμού σας.';
+$wb['limit_web_aliasdomain_txt'] = 'Έχετε φτάσει το μέγιστο πλήθος των aliasdomains του λογαριασμού σας.';
+$wb['limit_web_subdomain_txt'] = 'Έχετε φτάσει το μέγιστο πλήθος των web subdomains του λογαριασμού σας.';
+$wb['apache_directives_txt'] = 'Apache directives';
$wb['domain_error_empty'] = 'Το Domain δεν έχει οριστεί.';
-$wb['domain_error_unique'] = 'Υπάρχει ήδη ένα website ή ένα sub / aliasdomain με αυτό το όνομα domain.';
-$wb['domain_error_regex'] = 'Μη έγκυρο Domain.';
+$wb['domain_error_unique'] = 'Υπάρχει ήδη ένα website ή sub / aliasdomain με αυτό το όνομα.';
+$wb['domain_error_regex'] = 'Το όνομα του Domain δεν είναι έγκυρο.';
+$wb['host_txt'] = 'Host';
+$wb['redirect_error_regex'] = 'Η διαδρομή ανακατεύθυνσης δεν είναι έγκυρη. Έγκυρες διαδρομές είναι για παράδειγμα οι: /test/ ή http://www.domain.tld/test/';
+$wb['no_redirect_txt'] = 'Χωρίς Ανακατεύθυνση';
+$wb['no_flag_txt'] = 'Χωρίς Σημαία';
+$wb['domain_error_wildcard'] = 'Wildcard subdomains δεν επιτρέπονται.';
+$wb['proxy_directives_txt'] = 'Proxy Directives';
+$wb['available_proxy_directive_snippets_txt'] = 'Διαθέσιμα Proxy Directive Snippets:';
+$wb['error_proxy_requires_url'] = 'Ο τύπος ανακατεύθυνσης \"proxy\" απαιτεί ένα URL ως μονοπάτι ανακατεύθυνσης.';
+$wb['backup_interval_txt'] = 'Χρονικό διάστημα Αντιγράφων Ασφαλείας';
+$wb['backup_copies_txt'] = 'Πλήθος Αντιγράφων Ασφαλείας';
+$wb['ssl_key_txt'] = 'SSL Key';
+$wb['ssl_domain_txt'] = 'SSL Domain';
+$wb['web_folder_error_regex'] = 'Εισάγατε μη έγκυρο φάκελο. Μην εισάγετε την κάθετο.';
+$wb['ipv6_address_txt'] = 'Διεύθυνση IPv6';
+$wb['errordocs_txt'] = 'Προσωπικά έγγραφα σφάλματος';
+$wb['subdomain_txt'] = 'Αυτόματο-Subdomain';
$wb['domain_error_autosub'] = 'Υπάρχει ήδη ένα subdomain με αυτές τις ρυθμίσεις.';
$wb['hd_quota_error_empty'] = 'Το όριο αποθηκευτικού χώρου είναι 0 ή δεν έχει οριστεί.';
$wb['traffic_quota_error_empty'] = 'Το όριο μεταφοράς δεδομένων δεν έχει οριστεί.';
@@ -62,7 +70,6 @@
$wb['ssl_organistaion_unit_error_regex'] = 'Άκυρη μονάδα οργανισμού SSL. Έγκυροι χαρακτήρες: a-z, 0-9 and .,-_';
$wb['ssl_country_error_regex'] = 'Άκυρη Χώρα SSL. Έγκυροι χαρακτήρες: A-Z';
$wb['limit_traffic_quota_free_txt'] = 'Μέγιστο Όριο μεταφοράς δεδομένων';
-$wb['redirect_error_regex'] = 'Μη έγκυρη διαδρομή ανακατεύθυνσης. Έγκυρες τιμές είναι: /test/ ή http://www.domain.tld/test/';
$wb['php_open_basedir_txt'] = 'PHP open_basedir';
$wb['traffic_quota_exceeded_txt'] = 'Ξεπεράστηκε το όριο μεταφοράς δεδομένων';
$wb['ruby_txt'] = 'Ruby';
@@ -71,8 +78,6 @@
$wb['custom_php_ini_txt'] = 'Προσαρμοσμένες ρυθμίσεις php.ini';
$wb['none_txt'] = 'Κανένα';
$wb['disabled_txt'] = 'Απενεργοπ.';
-$wb['no_redirect_txt'] = 'Χωρίς Ανακατεύθυνση';
-$wb['no_flag_txt'] = 'Χωρίς Σημαία';
$wb['save_certificate_txt'] = 'Αποθήκευση Πιστοποιητικού';
$wb['create_certificate_txt'] = 'Δημιουργία Πιστοποιητικού';
$wb['delete_certificate_txt'] = 'Διαγραφή Πιστοποιητικού';
@@ -109,7 +114,6 @@
$wb['available_php_directive_snippets_txt'] = 'Διαθέσιμα PHP Directive Snippets:';
$wb['available_apache_directive_snippets_txt'] = 'Διαθέσιμα Apache Directive Snippets:';
$wb['available_nginx_directive_snippets_txt'] = 'Διαθέσιμα nginx Directive Snippets:';
-$wb['proxy_directives_txt'] = 'Proxy Directives';
-$wb['available_proxy_directive_snippets_txt'] = 'Διαθέσιμα Proxy Directive Snippets:';
$wb['Domain'] = 'Ψευδώνυμο domain';
+
?>
diff --git a/interface/web/sites/lib/lang/el_web_aliasdomain_list.lng b/interface/web/sites/lib/lang/el_web_childdomain_list.lng
similarity index 75%
rename from interface/web/sites/lib/lang/el_web_aliasdomain_list.lng
rename to interface/web/sites/lib/lang/el_web_childdomain_list.lng
index 6ea60e8..1d0a54b 100644
--- a/interface/web/sites/lib/lang/el_web_aliasdomain_list.lng
+++ b/interface/web/sites/lib/lang/el_web_childdomain_list.lng
@@ -1,14 +1,15 @@
<?php
-$wb['list_head_txt'] = 'Ψευδώνυμο domain';
+$wb['list_head_txt'] = 'Subdomains';
$wb['active_txt'] = 'Ενεργό';
$wb['server_id_txt'] = 'Server';
$wb['parent_domain_id_txt'] = 'Website';
-$wb['domain_txt'] = 'Ψευδώνυμο domain';
-$wb['add_new_record_txt'] = 'Νέο ψευδωνύμο domain';
+$wb['domain_txt'] = 'Subdomain';
+$wb['add_new_record_txt'] = 'Νέο subdomain';
$wb['domain_error_empty'] = 'Το Domain δεν έχει οριστεί.';
$wb['domain_error_unique'] = 'Το Domain πρέπει να είναι μοναδικό.';
$wb['domain_error_regex'] = 'Το όνομα Domain δεν είναι έγκυρο.';
$wb['no_redirect_txt'] = 'Χωρίς Ανακατεύθυνση';
$wb['no_flag_txt'] = 'Χωρίς σημαία';
$wb['none_txt'] = 'Κανένα';
+
?>
diff --git a/interface/web/sites/lib/lang/el_web_subdomain.lng b/interface/web/sites/lib/lang/el_web_subdomain.lng
deleted file mode 100644
index 6183fba..0000000
--- a/interface/web/sites/lib/lang/el_web_subdomain.lng
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-$wb['ssl_state_txt'] = 'Περιφέρεια';
-$wb['ssl_locality_txt'] = 'Τοποθεσία';
-$wb['ssl_organisation_txt'] = 'Οργανισμός';
-$wb['ssl_organisation_unit_txt'] = 'Τμήμα οργανισμού';
-$wb['ssl_country_txt'] = 'Χώρα';
-$wb['ssl_request_txt'] = 'SSL Request';
-$wb['ssl_cert_txt'] = 'SSL Certificate';
-$wb['ssl_bundle_txt'] = 'SSL Bundle';
-$wb['ssl_action_txt'] = 'SSL Action';
-$wb['server_id_txt'] = 'Server';
-$wb['domain_txt'] = 'Domain';
-$wb['type_txt'] = 'Τύπος';
-$wb['parent_domain_id_txt'] = 'Γονικό Website';
-$wb['redirect_type_txt'] = 'Τύπος ανακατεύθυνσης';
-$wb['redirect_path_txt'] = 'Διαδρομή ανακατεύθυνσης';
-$wb['active_txt'] = 'Ενεργή';
-$wb['document_root_txt'] = 'Ριζικός φάκελος';
-$wb['system_user_txt'] = 'Όνομα χρήστη Linux';
-$wb['system_group_txt'] = 'Ομάδα Linux';
-$wb['ip_address_txt'] = 'Διεύθυνση IP';
-$wb['vhost_type_txt'] = 'Τύπος VHost';
-$wb['hd_quota_txt'] = 'Όριο αποθηκευτικού χώρου';
-$wb['traffic_quota_txt'] = 'Όριο μεταφοράς δεδομένων';
-$wb['cgi_txt'] = 'CGI';
-$wb['ssi_txt'] = 'SSI';
-$wb['ssl_txt'] = 'SSL';
-$wb['suexec_txt'] = 'SuEXEC';
-$wb['php_txt'] = 'PHP';
-$wb['client_txt'] = 'Πελάτης';
-$wb['limit_web_domain_txt'] = 'Έχετε φτάσει το μέγιστο πλήθος των web domains του λογαριασμού σας.';
-$wb['limit_web_aliasdomain_txt'] = 'Έχετε φτάσει το μέγιστο πλήθος των aliasdomains του λογαριασμού σας.';
-$wb['limit_web_subdomain_txt'] = 'Έχετε φτάσει το μέγιστο πλήθος των web subdomains του λογαριασμού σας.';
-$wb['apache_directives_txt'] = 'Apache directives';
-$wb['domain_error_empty'] = 'Το Domain δεν έχει οριστεί.';
-$wb['domain_error_unique'] = 'Υπάρχει ήδη ένα website ή sub / aliasdomain με αυτό το όνομα.';
-$wb['domain_error_regex'] = 'Το όνομα του Domain δεν είναι έγκυρο.';
-$wb['host_txt'] = 'Host';
-$wb['redirect_error_regex'] = 'Η διαδρομή ανακατεύθυνσης δεν είναι έγκυρη. Έγκυρες διαδρομές είναι για παράδειγμα οι: /test/ ή http://www.domain.tld/test/';
-$wb['no_redirect_txt'] = 'Χωρίς Ανακατεύθυνση';
-$wb['no_flag_txt'] = 'Χωρίς Σημαία';
-$wb['domain_error_wildcard'] = 'Wildcard subdomains δεν επιτρέπονται.';
-$wb['proxy_directives_txt'] = 'Proxy Directives';
-$wb['available_proxy_directive_snippets_txt'] = 'Διαθέσιμα Proxy Directive Snippets:';
-$wb['error_proxy_requires_url'] = 'Ο τύπος ανακατεύθυνσης \\"proxy\\" απαιτεί ένα URL ως μονοπάτι ανακατεύθυνσης.';
-?>
diff --git a/interface/web/sites/lib/lang/el_web_subdomain_list.lng b/interface/web/sites/lib/lang/el_web_subdomain_list.lng
deleted file mode 100644
index a4426cf..0000000
--- a/interface/web/sites/lib/lang/el_web_subdomain_list.lng
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Subdomains';
-$wb['active_txt'] = 'Ενεργό';
-$wb['server_id_txt'] = 'Server';
-$wb['parent_domain_id_txt'] = 'Website';
-$wb['domain_txt'] = 'Subdomain';
-$wb['add_new_record_txt'] = 'Νέο subdomain';
-?>
diff --git a/interface/web/sites/lib/lang/en_web_aliasdomain.lng b/interface/web/sites/lib/lang/en_web_aliasdomain.lng
deleted file mode 100644
index eeae677..0000000
--- a/interface/web/sites/lib/lang/en_web_aliasdomain.lng
+++ /dev/null
@@ -1,115 +0,0 @@
-<?php
-$wb['domain_txt'] = 'Aliasdomain';
-$wb["backup_interval_txt"] = 'Backup interval';
-$wb["backup_copies_txt"] = 'Number of backup copies';
-$wb["ssl_state_txt"] = 'State';
-$wb["ssl_locality_txt"] = 'Locality';
-$wb["ssl_organisation_txt"] = 'Organisation';
-$wb["ssl_organisation_unit_txt"] = 'Organisation Unit';
-$wb["ssl_country_txt"] = 'Country';
-$wb["ssl_key_txt"] = 'SSL Key';
-$wb["ssl_request_txt"] = 'SSL Request';
-$wb["ssl_cert_txt"] = 'SSL Certificate';
-$wb["ssl_bundle_txt"] = 'SSL Bundle';
-$wb["ssl_action_txt"] = 'SSL Action';
-$wb["ssl_domain_txt"] = 'SSL Domain';
-$wb["server_id_txt"] = 'Server';
-$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
-$wb["type_txt"] = 'Type';
-$wb["parent_domain_id_txt"] = 'Parent Website';
-$wb["redirect_type_txt"] = 'Redirect Type';
-$wb["redirect_path_txt"] = 'Redirect Path';
-$wb["active_txt"] = 'Active';
-$wb["document_root_txt"] = 'Documentroot';
-$wb["system_user_txt"] = 'Linux User';
-$wb["system_group_txt"] = 'Linux Group';
-$wb["ip_address_txt"] = 'IPv4-Address';
-$wb["ipv6_address_txt"] = 'IPv6-Address';
-$wb["vhost_type_txt"] = 'VHost Type';
-$wb["hd_quota_txt"] = 'Harddisk Quota';
-$wb["traffic_quota_txt"] = 'Traffic Quota';
-$wb["cgi_txt"] = 'CGI';
-$wb["ssi_txt"] = 'SSI';
-$wb["errordocs_txt"] = 'Own Error-Documents';
-$wb["subdomain_txt"] = 'Auto-Subdomain';
-$wb["ssl_txt"] = 'SSL';
-$wb["suexec_txt"] = 'SuEXEC';
-$wb["php_txt"] = 'PHP';
-$wb["client_txt"] = 'Client';
-$wb["limit_web_domain_txt"] = 'The max. number of web domains for your account is reached.';
-$wb["limit_web_aliasdomain_txt"] = 'The max. number of aliasdomains for your account is reached.';
-$wb["limit_web_subdomain_txt"] = 'The max. number of web subdomains for your account is reached.';
-$wb["apache_directives_txt"] = 'Apache Directives';
-$wb["domain_error_empty"] = 'Domain is empty.';
-$wb["domain_error_unique"] = 'There is already a website or sub / aliasdomain with this domain name.';
-$wb["domain_error_regex"] = 'Domain name invalid.';
-$wb["domain_error_autosub"] = 'There is already a subdomain with these settings.';
-$wb["hd_quota_error_empty"] = 'Harddisk quota is 0 or empty.';
-$wb["traffic_quota_error_empty"] = 'Traffic quota is empty.';
-$wb["error_ssl_state_empty"] = 'SSL State is empty.';
-$wb["error_ssl_locality_empty"] = 'SSL Locality is empty.';
-$wb["error_ssl_organisation_empty"] = 'SSL Organisation is empty.';
-$wb["error_ssl_organisation_unit_empty"] = 'SSL Organisation Unit is empty.';
-$wb["error_ssl_country_empty"] = 'SSL Country is empty.';
-$wb["error_ssl_cert_empty"] = 'SSL Certificate field is empty';
-$wb["client_group_id_txt"] = 'Client';
-$wb["stats_password_txt"] = 'Set Webstatistics password';
-$wb["allow_override_txt"] = 'Apache AllowOverride';
-$wb["limit_web_quota_free_txt"] = 'Max. available Harddisk Quota';
-$wb["ssl_state_error_regex"] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_';
-$wb["ssl_locality_error_regex"] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_';
-$wb["ssl_organisation_error_regex"] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_';
-$wb["ssl_organistaion_unit_error_regex"] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
-$wb["ssl_country_error_regex"] = 'Invalid SSL Country. Valid characters are: A-Z';
-$wb["limit_traffic_quota_free_txt"] = 'Max. available Traffic Quota';
-$wb["redirect_error_regex"] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
-$wb["php_open_basedir_txt"] = 'PHP open_basedir';
-$wb["traffic_quota_exceeded_txt"] = 'Traffic quota exceeded';
-$wb["ruby_txt"] = 'Ruby';
-$wb["stats_user_txt"] = 'Webstatistics username';
-$wb["stats_type_txt"] = 'Webstatistics program';
-$wb["custom_php_ini_txt"] = 'Custom php.ini settings';
-$wb['none_txt'] = 'None';
-$wb['disabled_txt'] = 'Disabled';
-$wb['no_redirect_txt'] = 'No redirect';
-$wb['no_flag_txt'] = 'No flag';
-$wb['save_certificate_txt'] = 'Save certificate';
-$wb['create_certificate_txt'] = 'Create certificate';
-$wb['delete_certificate_txt'] = 'Delete certificate';
-$wb["nginx_directives_txt"] = 'nginx Directives';
-$wb["seo_redirect_txt"] = 'SEO Redirect';
-$wb["non_www_to_www_txt"] = 'Non-www -> www';
-$wb["www_to_non_www_txt"] = 'www -> non-www';
-$wb["php_fpm_use_socket_txt"] = 'Use Socket For PHP-FPM';
-$wb["error_no_sni_txt"] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
-$wb["python_txt"] = 'Python';
-$wb["perl_txt"] = 'Perl';
-$wb["pm_max_children_txt"] = 'PHP-FPM pm.max_children';
-$wb["pm_start_servers_txt"] = 'PHP-FPM pm.start_servers';
-$wb["pm_min_spare_servers_txt"] = 'PHP-FPM pm.min_spare_servers';
-$wb["pm_max_spare_servers_txt"] = 'PHP-FPM pm.max_spare_servers';
-$wb["error_php_fpm_pm_settings_txt"] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children >= pm.max_spare_servers >= pm.start_servers >= pm.min_spare_servers > 0';
-$wb["pm_max_children_error_regex"] = 'PHP-FPM pm.max_children must be a positive integer value.';
-$wb["pm_start_servers_error_regex"] = 'PHP-FPM pm.start_servers must be a positive integer value.';
-$wb["pm_min_spare_servers_error_regex"] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
-$wb["pm_max_spare_servers_error_regex"] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
-$wb["hd_quota_error_regex"] = 'Harddisk quota is invalid.';
-$wb["traffic_quota_error_regex"] = 'Traffic quota is invalid.';
-$wb["fastcgi_php_version_txt"] = 'PHP Version';
-$wb["pm_txt"] = 'PHP-FPM Process Manager';
-$wb["pm_process_idle_timeout_txt"] = 'PHP-FPM pm.process_idle_timeout';
-$wb["pm_max_requests_txt"] = 'PHP-FPM pm.max_requests';
-$wb["pm_process_idle_timeout_error_regex"] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
-$wb["pm_max_requests_error_regex"] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
-$wb["pm_ondemand_hint_txt"] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
-$wb['generate_password_txt'] = 'Generate Password';
-$wb['repeat_password_txt'] = 'Repeat Password';
-$wb['password_mismatch_txt'] = 'The passwords do not match.';
-$wb['password_match_txt'] = 'The passwords do match.';
-$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
-$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
-$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
-$wb['proxy_directives_txt'] = 'Proxy Directives';
-$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
-$wb['Domain'] = 'Aliasdomain';
-?>
diff --git a/interface/web/sites/lib/lang/en_web_aliasdomain_list.lng b/interface/web/sites/lib/lang/en_web_aliasdomain_list.lng
deleted file mode 100644
index 0635583..0000000
--- a/interface/web/sites/lib/lang/en_web_aliasdomain_list.lng
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-$wb["list_head_txt"] = 'Aliasdomain';
-$wb["active_txt"] = 'Active';
-$wb["server_id_txt"] = 'Server';
-$wb["parent_domain_id_txt"] = 'Website';
-$wb["domain_txt"] = 'Aliasdomain';
-$wb["add_new_record_txt"] = 'Add new aliasdomain';
-$wb["domain_error_empty"] = 'Domain is empty.';
-$wb["domain_error_unique"] = 'Domain must be unique.';
-$wb["domain_error_regex"] = 'Domain name invalid.';
-$wb['no_redirect_txt'] = 'No redirect';
-$wb['no_flag_txt'] = 'No flag';
-$wb['none_txt'] = 'None';
-?>
diff --git a/interface/web/sites/lib/lang/ar_web_aliasdomain.lng b/interface/web/sites/lib/lang/en_web_childdomain.lng
similarity index 94%
rename from interface/web/sites/lib/lang/ar_web_aliasdomain.lng
rename to interface/web/sites/lib/lang/en_web_childdomain.lng
index 4149c71..43c8929 100644
--- a/interface/web/sites/lib/lang/ar_web_aliasdomain.lng
+++ b/interface/web/sites/lib/lang/en_web_childdomain.lng
@@ -1,20 +1,15 @@
<?php
-$wb['domain_txt'] = 'Aliasdomain';
-$wb['backup_interval_txt'] = 'Backup interval';
-$wb['backup_copies_txt'] = 'Number of backup copies';
$wb['ssl_state_txt'] = 'State';
$wb['ssl_locality_txt'] = 'Locality';
$wb['ssl_organisation_txt'] = 'Organisation';
$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
$wb['ssl_country_txt'] = 'Country';
-$wb['ssl_key_txt'] = 'SSL Key';
$wb['ssl_request_txt'] = 'SSL Request';
$wb['ssl_cert_txt'] = 'SSL Certificate';
$wb['ssl_bundle_txt'] = 'SSL Bundle';
$wb['ssl_action_txt'] = 'SSL Action';
-$wb['ssl_domain_txt'] = 'SSL Domain';
$wb['server_id_txt'] = 'Server';
-$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
+$wb['domain_txt'] = 'Domain';
$wb['type_txt'] = 'Type';
$wb['parent_domain_id_txt'] = 'Parent Website';
$wb['redirect_type_txt'] = 'Redirect Type';
@@ -23,15 +18,12 @@
$wb['document_root_txt'] = 'Documentroot';
$wb['system_user_txt'] = 'Linux User';
$wb['system_group_txt'] = 'Linux Group';
-$wb['ip_address_txt'] = 'IPv4-Address';
-$wb['ipv6_address_txt'] = 'IPv6-Address';
+$wb['ip_address_txt'] = 'IP-Address';
$wb['vhost_type_txt'] = 'VHost Type';
$wb['hd_quota_txt'] = 'Harddisk Quota';
-$wb['traffic_quota_txt'] = 'Traffic Quota';
+$wb['traffic_quota_txt'] = 'Traffic Quaota';
$wb['cgi_txt'] = 'CGI';
$wb['ssi_txt'] = 'SSI';
-$wb['errordocs_txt'] = 'Own Error-Documents';
-$wb['subdomain_txt'] = 'Auto-Subdomain';
$wb['ssl_txt'] = 'SSL';
$wb['suexec_txt'] = 'SuEXEC';
$wb['php_txt'] = 'PHP';
@@ -39,10 +31,26 @@
$wb['limit_web_domain_txt'] = 'The max. number of web domains for your account is reached.';
$wb['limit_web_aliasdomain_txt'] = 'The max. number of aliasdomains for your account is reached.';
$wb['limit_web_subdomain_txt'] = 'The max. number of web subdomains for your account is reached.';
-$wb['apache_directives_txt'] = 'Apache Directives';
+$wb['apache_directives_txt'] = 'Apache directives';
$wb['domain_error_empty'] = 'Domain is empty.';
$wb['domain_error_unique'] = 'There is already a website or sub / aliasdomain with this domain name.';
$wb['domain_error_regex'] = 'Domain name invalid.';
+$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
+$wb['host_txt'] = 'Host';
+$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
+$wb['no_redirect_txt'] = 'No redirect';
+$wb['no_flag_txt'] = 'No flag';
+$wb['proxy_directives_txt'] = 'Proxy Directives';
+$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
+$wb['error_proxy_requires_url'] = 'Redirect Type "proxy" requires a URL as the redirect path.';
+$wb['backup_interval_txt'] = 'Backup interval';
+$wb['backup_copies_txt'] = 'Number of backup copies';
+$wb['ssl_key_txt'] = 'SSL Key';
+$wb['ssl_domain_txt'] = 'SSL Domain';
+$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
+$wb['ipv6_address_txt'] = 'IPv6-Address';
+$wb['errordocs_txt'] = 'Own Error-Documents';
+$wb['subdomain_txt'] = 'Auto-Subdomain';
$wb['domain_error_autosub'] = 'There is already a subdomain with these settings.';
$wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
$wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
@@ -62,7 +70,6 @@
$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
$wb['limit_traffic_quota_free_txt'] = 'Max. available Traffic Quota';
-$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
$wb['php_open_basedir_txt'] = 'PHP open_basedir';
$wb['traffic_quota_exceeded_txt'] = 'Traffic quota exceeded';
$wb['ruby_txt'] = 'Ruby';
@@ -71,8 +78,6 @@
$wb['custom_php_ini_txt'] = 'Custom php.ini settings';
$wb['none_txt'] = 'None';
$wb['disabled_txt'] = 'Disabled';
-$wb['no_redirect_txt'] = 'No redirect';
-$wb['no_flag_txt'] = 'No flag';
$wb['save_certificate_txt'] = 'Save certificate';
$wb['create_certificate_txt'] = 'Create certificate';
$wb['delete_certificate_txt'] = 'Delete certificate';
@@ -109,7 +114,6 @@
$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
-$wb['proxy_directives_txt'] = 'Proxy Directives';
-$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
$wb['Domain'] = 'Aliasdomain';
+
?>
diff --git a/interface/web/sites/lib/lang/ar_web_aliasdomain_list.lng b/interface/web/sites/lib/lang/en_web_childdomain_list.lng
similarity index 74%
copy from interface/web/sites/lib/lang/ar_web_aliasdomain_list.lng
copy to interface/web/sites/lib/lang/en_web_childdomain_list.lng
index 8ea34c4..95a3b5f 100644
--- a/interface/web/sites/lib/lang/ar_web_aliasdomain_list.lng
+++ b/interface/web/sites/lib/lang/en_web_childdomain_list.lng
@@ -1,14 +1,15 @@
<?php
-$wb['list_head_txt'] = 'Aliasdomain';
+$wb['list_head_txt'] = 'Subdomains';
$wb['active_txt'] = 'Active';
$wb['server_id_txt'] = 'Server';
$wb['parent_domain_id_txt'] = 'Website';
-$wb['domain_txt'] = 'Aliasdomain';
-$wb['add_new_record_txt'] = 'Add new aliasdomain';
+$wb['domain_txt'] = 'Subdomain';
+$wb['add_new_record_txt'] = 'Add new subdomain';
$wb['domain_error_empty'] = 'Domain is empty.';
$wb['domain_error_unique'] = 'Domain must be unique.';
$wb['domain_error_regex'] = 'Domain name invalid.';
$wb['no_redirect_txt'] = 'No redirect';
$wb['no_flag_txt'] = 'No flag';
$wb['none_txt'] = 'None';
+
?>
diff --git a/interface/web/sites/lib/lang/en_web_subdomain.lng b/interface/web/sites/lib/lang/en_web_subdomain.lng
deleted file mode 100644
index cd1c1fb..0000000
--- a/interface/web/sites/lib/lang/en_web_subdomain.lng
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-$wb["ssl_state_txt"] = 'State';
-$wb["ssl_locality_txt"] = 'Locality';
-$wb["ssl_organisation_txt"] = 'Organisation';
-$wb["ssl_organisation_unit_txt"] = 'Organisation Unit';
-$wb["ssl_country_txt"] = 'Country';
-$wb["ssl_request_txt"] = 'SSL Request';
-$wb["ssl_cert_txt"] = 'SSL Certificate';
-$wb["ssl_bundle_txt"] = 'SSL Bundle';
-$wb["ssl_action_txt"] = 'SSL Action';
-$wb["server_id_txt"] = 'Server';
-$wb["domain_txt"] = 'Domain';
-$wb["type_txt"] = 'Type';
-$wb["parent_domain_id_txt"] = 'Parent Website';
-$wb["redirect_type_txt"] = 'Redirect Type';
-$wb["redirect_path_txt"] = 'Redirect Path';
-$wb["active_txt"] = 'Active';
-$wb["document_root_txt"] = 'Documentroot';
-$wb["system_user_txt"] = 'Linux User';
-$wb["system_group_txt"] = 'Linux Group';
-$wb["ip_address_txt"] = 'IP-Address';
-$wb["vhost_type_txt"] = 'VHost Type';
-$wb["hd_quota_txt"] = 'Harddisk Quota';
-$wb["traffic_quota_txt"] = 'Traffic Quaota';
-$wb["cgi_txt"] = 'CGI';
-$wb["ssi_txt"] = 'SSI';
-$wb["ssl_txt"] = 'SSL';
-$wb["suexec_txt"] = 'SuEXEC';
-$wb["php_txt"] = 'PHP';
-$wb["client_txt"] = 'Client';
-$wb["limit_web_domain_txt"] = 'The max. number of web domains for your account is reached.';
-$wb["limit_web_aliasdomain_txt"] = 'The max. number of aliasdomains for your account is reached.';
-$wb["limit_web_subdomain_txt"] = 'The max. number of web subdomains for your account is reached.';
-$wb["apache_directives_txt"] = 'Apache directives';
-$wb["domain_error_empty"] = 'Domain is empty.';
-$wb["domain_error_unique"] = 'There is already a website or sub / aliasdomain with this domain name.';
-$wb["domain_error_regex"] = 'Domain name invalid.';
-$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
-$wb["host_txt"] = 'Host';
-$wb["redirect_error_regex"] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
-$wb['no_redirect_txt'] = 'No redirect';
-$wb['no_flag_txt'] = 'No flag';
-$wb['proxy_directives_txt'] = 'Proxy Directives';
-$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
-$wb['error_proxy_requires_url'] = 'Redirect Type "proxy" requires a URL as the redirect path.';
-?>
diff --git a/interface/web/sites/lib/lang/en_web_subdomain_list.lng b/interface/web/sites/lib/lang/en_web_subdomain_list.lng
deleted file mode 100644
index 8273dbd..0000000
--- a/interface/web/sites/lib/lang/en_web_subdomain_list.lng
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$wb["list_head_txt"] = 'Subdomains';
-$wb["active_txt"] = 'Active';
-$wb["server_id_txt"] = 'Server';
-$wb["parent_domain_id_txt"] = 'Website';
-$wb["domain_txt"] = 'Subdomain';
-$wb["add_new_record_txt"] = 'Add new subdomain';
-?>
\ No newline at end of file
diff --git a/interface/web/sites/lib/lang/es_web_aliasdomain.lng b/interface/web/sites/lib/lang/es_web_aliasdomain.lng
deleted file mode 100644
index 4149c71..0000000
--- a/interface/web/sites/lib/lang/es_web_aliasdomain.lng
+++ /dev/null
@@ -1,115 +0,0 @@
-<?php
-$wb['domain_txt'] = 'Aliasdomain';
-$wb['backup_interval_txt'] = 'Backup interval';
-$wb['backup_copies_txt'] = 'Number of backup copies';
-$wb['ssl_state_txt'] = 'State';
-$wb['ssl_locality_txt'] = 'Locality';
-$wb['ssl_organisation_txt'] = 'Organisation';
-$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
-$wb['ssl_country_txt'] = 'Country';
-$wb['ssl_key_txt'] = 'SSL Key';
-$wb['ssl_request_txt'] = 'SSL Request';
-$wb['ssl_cert_txt'] = 'SSL Certificate';
-$wb['ssl_bundle_txt'] = 'SSL Bundle';
-$wb['ssl_action_txt'] = 'SSL Action';
-$wb['ssl_domain_txt'] = 'SSL Domain';
-$wb['server_id_txt'] = 'Server';
-$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
-$wb['type_txt'] = 'Type';
-$wb['parent_domain_id_txt'] = 'Parent Website';
-$wb['redirect_type_txt'] = 'Redirect Type';
-$wb['redirect_path_txt'] = 'Redirect Path';
-$wb['active_txt'] = 'Active';
-$wb['document_root_txt'] = 'Documentroot';
-$wb['system_user_txt'] = 'Linux User';
-$wb['system_group_txt'] = 'Linux Group';
-$wb['ip_address_txt'] = 'IPv4-Address';
-$wb['ipv6_address_txt'] = 'IPv6-Address';
-$wb['vhost_type_txt'] = 'VHost Type';
-$wb['hd_quota_txt'] = 'Harddisk Quota';
-$wb['traffic_quota_txt'] = 'Traffic Quota';
-$wb['cgi_txt'] = 'CGI';
-$wb['ssi_txt'] = 'SSI';
-$wb['errordocs_txt'] = 'Own Error-Documents';
-$wb['subdomain_txt'] = 'Auto-Subdomain';
-$wb['ssl_txt'] = 'SSL';
-$wb['suexec_txt'] = 'SuEXEC';
-$wb['php_txt'] = 'PHP';
-$wb['client_txt'] = 'Client';
-$wb['limit_web_domain_txt'] = 'The max. number of web domains for your account is reached.';
-$wb['limit_web_aliasdomain_txt'] = 'The max. number of aliasdomains for your account is reached.';
-$wb['limit_web_subdomain_txt'] = 'The max. number of web subdomains for your account is reached.';
-$wb['apache_directives_txt'] = 'Apache Directives';
-$wb['domain_error_empty'] = 'Domain is empty.';
-$wb['domain_error_unique'] = 'There is already a website or sub / aliasdomain with this domain name.';
-$wb['domain_error_regex'] = 'Domain name invalid.';
-$wb['domain_error_autosub'] = 'There is already a subdomain with these settings.';
-$wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
-$wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
-$wb['error_ssl_state_empty'] = 'SSL State is empty.';
-$wb['error_ssl_locality_empty'] = 'SSL Locality is empty.';
-$wb['error_ssl_organisation_empty'] = 'SSL Organisation is empty.';
-$wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.';
-$wb['error_ssl_country_empty'] = 'SSL Country is empty.';
-$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
-$wb['client_group_id_txt'] = 'Client';
-$wb['stats_password_txt'] = 'Set Webstatistics password';
-$wb['allow_override_txt'] = 'Apache AllowOverride';
-$wb['limit_web_quota_free_txt'] = 'Max. available Harddisk Quota';
-$wb['ssl_state_error_regex'] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_locality_error_regex'] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_organisation_error_regex'] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
-$wb['limit_traffic_quota_free_txt'] = 'Max. available Traffic Quota';
-$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
-$wb['php_open_basedir_txt'] = 'PHP open_basedir';
-$wb['traffic_quota_exceeded_txt'] = 'Traffic quota exceeded';
-$wb['ruby_txt'] = 'Ruby';
-$wb['stats_user_txt'] = 'Webstatistics username';
-$wb['stats_type_txt'] = 'Webstatistics program';
-$wb['custom_php_ini_txt'] = 'Custom php.ini settings';
-$wb['none_txt'] = 'None';
-$wb['disabled_txt'] = 'Disabled';
-$wb['no_redirect_txt'] = 'No redirect';
-$wb['no_flag_txt'] = 'No flag';
-$wb['save_certificate_txt'] = 'Save certificate';
-$wb['create_certificate_txt'] = 'Create certificate';
-$wb['delete_certificate_txt'] = 'Delete certificate';
-$wb['nginx_directives_txt'] = 'nginx Directives';
-$wb['seo_redirect_txt'] = 'SEO Redirect';
-$wb['non_www_to_www_txt'] = 'Non-www -> www';
-$wb['www_to_non_www_txt'] = 'www -> non-www';
-$wb['php_fpm_use_socket_txt'] = 'Use Socket For PHP-FPM';
-$wb['error_no_sni_txt'] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
-$wb['python_txt'] = 'Python';
-$wb['perl_txt'] = 'Perl';
-$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
-$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
-$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
-$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
-$wb['error_php_fpm_pm_settings_txt'] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children >= pm.max_spare_servers >= pm.start_servers >= pm.min_spare_servers > 0';
-$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive integer value.';
-$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
-$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
-$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
-$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
-$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
-$wb['fastcgi_php_version_txt'] = 'PHP Version';
-$wb['pm_txt'] = 'PHP-FPM Process Manager';
-$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
-$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
-$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
-$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
-$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
-$wb['generate_password_txt'] = 'Generate Password';
-$wb['repeat_password_txt'] = 'Repeat Password';
-$wb['password_mismatch_txt'] = 'The passwords do not match.';
-$wb['password_match_txt'] = 'The passwords do match.';
-$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
-$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
-$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
-$wb['proxy_directives_txt'] = 'Proxy Directives';
-$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
-$wb['Domain'] = 'Aliasdomain';
-?>
diff --git a/interface/web/sites/lib/lang/ar_web_aliasdomain.lng b/interface/web/sites/lib/lang/es_web_childdomain.lng
similarity index 72%
copy from interface/web/sites/lib/lang/ar_web_aliasdomain.lng
copy to interface/web/sites/lib/lang/es_web_childdomain.lng
index 4149c71..1619da9 100644
--- a/interface/web/sites/lib/lang/ar_web_aliasdomain.lng
+++ b/interface/web/sites/lib/lang/es_web_childdomain.lng
@@ -1,48 +1,56 @@
<?php
-$wb['domain_txt'] = 'Aliasdomain';
-$wb['backup_interval_txt'] = 'Backup interval';
-$wb['backup_copies_txt'] = 'Number of backup copies';
-$wb['ssl_state_txt'] = 'State';
-$wb['ssl_locality_txt'] = 'Locality';
-$wb['ssl_organisation_txt'] = 'Organisation';
-$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
-$wb['ssl_country_txt'] = 'Country';
-$wb['ssl_key_txt'] = 'SSL Key';
-$wb['ssl_request_txt'] = 'SSL Request';
-$wb['ssl_cert_txt'] = 'SSL Certificate';
-$wb['ssl_bundle_txt'] = 'SSL Bundle';
-$wb['ssl_action_txt'] = 'SSL Action';
-$wb['ssl_domain_txt'] = 'SSL Domain';
-$wb['server_id_txt'] = 'Server';
-$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
-$wb['type_txt'] = 'Type';
-$wb['parent_domain_id_txt'] = 'Parent Website';
-$wb['redirect_type_txt'] = 'Redirect Type';
-$wb['redirect_path_txt'] = 'Redirect Path';
-$wb['active_txt'] = 'Active';
-$wb['document_root_txt'] = 'Documentroot';
-$wb['system_user_txt'] = 'Linux User';
-$wb['system_group_txt'] = 'Linux Group';
-$wb['ip_address_txt'] = 'IPv4-Address';
-$wb['ipv6_address_txt'] = 'IPv6-Address';
-$wb['vhost_type_txt'] = 'VHost Type';
-$wb['hd_quota_txt'] = 'Harddisk Quota';
-$wb['traffic_quota_txt'] = 'Traffic Quota';
+$wb['ssl_state_txt'] = 'Estado o provincia';
+$wb['ssl_locality_txt'] = 'Localidad';
+$wb['ssl_organisation_txt'] = 'Organización';
+$wb['ssl_organisation_unit_txt'] = 'Unidad de la organización';
+$wb['ssl_country_txt'] = 'País';
+$wb['ssl_request_txt'] = 'Solicitud SSL';
+$wb['ssl_cert_txt'] = 'Certificado SSL';
+$wb['ssl_bundle_txt'] = 'Paquete SSL (Bundle)';
+$wb['ssl_action_txt'] = 'Acción SSL';
+$wb['server_id_txt'] = 'Servidor';
+$wb['domain_txt'] = 'Dominio';
+$wb['type_txt'] = 'Tipo';
+$wb['parent_domain_id_txt'] = 'Sitio web padre';
+$wb['redirect_type_txt'] = 'Tipo de redirección';
+$wb['redirect_path_txt'] = 'Ruta de redirección';
+$wb['active_txt'] = 'Activar';
+$wb['document_root_txt'] = 'DocumentRoot';
+$wb['system_user_txt'] = 'Usuario Linux';
+$wb['system_group_txt'] = 'Grupo Linux';
+$wb['ip_address_txt'] = 'Dirección IP';
+$wb['vhost_type_txt'] = 'Tipo VHost';
+$wb['hd_quota_txt'] = 'Cuota de disco duro';
+$wb['traffic_quota_txt'] = 'Cuota de tráfico web';
$wb['cgi_txt'] = 'CGI';
$wb['ssi_txt'] = 'SSI';
-$wb['errordocs_txt'] = 'Own Error-Documents';
-$wb['subdomain_txt'] = 'Auto-Subdomain';
$wb['ssl_txt'] = 'SSL';
$wb['suexec_txt'] = 'SuEXEC';
$wb['php_txt'] = 'PHP';
-$wb['client_txt'] = 'Client';
-$wb['limit_web_domain_txt'] = 'The max. number of web domains for your account is reached.';
-$wb['limit_web_aliasdomain_txt'] = 'The max. number of aliasdomains for your account is reached.';
-$wb['limit_web_subdomain_txt'] = 'The max. number of web subdomains for your account is reached.';
-$wb['apache_directives_txt'] = 'Apache Directives';
-$wb['domain_error_empty'] = 'Domain is empty.';
-$wb['domain_error_unique'] = 'There is already a website or sub / aliasdomain with this domain name.';
-$wb['domain_error_regex'] = 'Domain name invalid.';
+$wb['client_txt'] = 'Cliente';
+$wb['limit_web_domain_txt'] = 'Se ha alcanzado el número máximo de dominios web de su cuenta.';
+$wb['limit_web_aliasdomain_txt'] = 'Se ha alcanzado el número máximo de alias de dominio de su cuenta.';
+$wb['limit_web_subdomain_txt'] = 'Se ha alcanzado el número máximo de subdominios de su cuenta.';
+$wb['apache_directives_txt'] = 'Directivas de Apache';
+$wb['domain_error_empty'] = 'El dominio está vacío.';
+$wb['domain_error_unique'] = 'El dominio debe ser único.';
+$wb['domain_error_regex'] = 'El nombre de dominio no es válido.';
+$wb['host_txt'] = 'Alojamiento';
+$wb['redirect_error_regex'] = 'Redirección no válida ruta. Redirecciones válidos son por ejemplo: /test/ or http://www.domain.tld/test/';
+$wb['no_redirect_txt'] = 'No redirigir';
+$wb['no_flag_txt'] = 'No flag';
+$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
+$wb['proxy_directives_txt'] = 'Proxy Directives';
+$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
+$wb['error_proxy_requires_url'] = 'Redirect Type \"proxy\" requires a URL as the redirect path.';
+$wb['backup_interval_txt'] = 'Backup interval';
+$wb['backup_copies_txt'] = 'Number of backup copies';
+$wb['ssl_key_txt'] = 'SSL Key';
+$wb['ssl_domain_txt'] = 'SSL Domain';
+$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
+$wb['ipv6_address_txt'] = 'IPv6-Address';
+$wb['errordocs_txt'] = 'Own Error-Documents';
+$wb['subdomain_txt'] = 'Auto-Subdomain';
$wb['domain_error_autosub'] = 'There is already a subdomain with these settings.';
$wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
$wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
@@ -62,7 +70,6 @@
$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
$wb['limit_traffic_quota_free_txt'] = 'Max. available Traffic Quota';
-$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
$wb['php_open_basedir_txt'] = 'PHP open_basedir';
$wb['traffic_quota_exceeded_txt'] = 'Traffic quota exceeded';
$wb['ruby_txt'] = 'Ruby';
@@ -71,8 +78,6 @@
$wb['custom_php_ini_txt'] = 'Custom php.ini settings';
$wb['none_txt'] = 'None';
$wb['disabled_txt'] = 'Disabled';
-$wb['no_redirect_txt'] = 'No redirect';
-$wb['no_flag_txt'] = 'No flag';
$wb['save_certificate_txt'] = 'Save certificate';
$wb['create_certificate_txt'] = 'Create certificate';
$wb['delete_certificate_txt'] = 'Delete certificate';
@@ -109,7 +114,6 @@
$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
-$wb['proxy_directives_txt'] = 'Proxy Directives';
-$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
$wb['Domain'] = 'Aliasdomain';
+
?>
diff --git a/interface/web/sites/lib/lang/es_web_aliasdomain_list.lng b/interface/web/sites/lib/lang/es_web_childdomain_list.lng
similarity index 73%
rename from interface/web/sites/lib/lang/es_web_aliasdomain_list.lng
rename to interface/web/sites/lib/lang/es_web_childdomain_list.lng
index ba9cf8e..2f9a171 100644
--- a/interface/web/sites/lib/lang/es_web_aliasdomain_list.lng
+++ b/interface/web/sites/lib/lang/es_web_childdomain_list.lng
@@ -1,14 +1,15 @@
<?php
-$wb['list_head_txt'] = 'Alias de dominio';
+$wb['list_head_txt'] = 'Subdominio';
$wb['active_txt'] = 'Activar';
$wb['server_id_txt'] = 'Servidor';
$wb['parent_domain_id_txt'] = 'Sitio web';
-$wb['domain_txt'] = 'Alias de dominio';
-$wb['add_new_record_txt'] = 'Añadir nuevo alias de dominio';
+$wb['domain_txt'] = 'Subdominio';
+$wb['add_new_record_txt'] = 'Añadir nuevo subdominio';
$wb['domain_error_empty'] = 'El dominio está vacío';
$wb['domain_error_unique'] = 'El domino debe ser único';
$wb['domain_error_regex'] = 'El nombre de dominio no es válido';
$wb['no_redirect_txt'] = 'No redirigir';
$wb['no_flag_txt'] = 'No flag';
$wb['none_txt'] = 'Ninguno';
+
?>
diff --git a/interface/web/sites/lib/lang/es_web_subdomain.lng b/interface/web/sites/lib/lang/es_web_subdomain.lng
deleted file mode 100644
index 1fa75e5..0000000
--- a/interface/web/sites/lib/lang/es_web_subdomain.lng
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-$wb['ssl_state_txt'] = 'Estado o provincia';
-$wb['ssl_locality_txt'] = 'Localidad';
-$wb['ssl_organisation_txt'] = 'Organización';
-$wb['ssl_organisation_unit_txt'] = 'Unidad de la organización';
-$wb['ssl_country_txt'] = 'País';
-$wb['ssl_request_txt'] = 'Solicitud SSL';
-$wb['ssl_cert_txt'] = 'Certificado SSL';
-$wb['ssl_bundle_txt'] = 'Paquete SSL (Bundle)';
-$wb['ssl_action_txt'] = 'Acción SSL';
-$wb['server_id_txt'] = 'Servidor';
-$wb['domain_txt'] = 'Dominio';
-$wb['type_txt'] = 'Tipo';
-$wb['parent_domain_id_txt'] = 'Sitio web padre';
-$wb['redirect_type_txt'] = 'Tipo de redirección';
-$wb['redirect_path_txt'] = 'Ruta de redirección';
-$wb['active_txt'] = 'Activar';
-$wb['document_root_txt'] = 'DocumentRoot';
-$wb['system_user_txt'] = 'Usuario Linux';
-$wb['system_group_txt'] = 'Grupo Linux';
-$wb['ip_address_txt'] = 'Dirección IP';
-$wb['vhost_type_txt'] = 'Tipo VHost';
-$wb['hd_quota_txt'] = 'Cuota de disco duro';
-$wb['traffic_quota_txt'] = 'Cuota de tráfico web';
-$wb['cgi_txt'] = 'CGI';
-$wb['ssi_txt'] = 'SSI';
-$wb['ssl_txt'] = 'SSL';
-$wb['suexec_txt'] = 'SuEXEC';
-$wb['php_txt'] = 'PHP';
-$wb['client_txt'] = 'Cliente';
-$wb['limit_web_domain_txt'] = 'Se ha alcanzado el número máximo de dominios web de su cuenta.';
-$wb['limit_web_aliasdomain_txt'] = 'Se ha alcanzado el número máximo de alias de dominio de su cuenta.';
-$wb['limit_web_subdomain_txt'] = 'Se ha alcanzado el número máximo de subdominios de su cuenta.';
-$wb['apache_directives_txt'] = 'Directivas de Apache';
-$wb['domain_error_empty'] = 'El dominio está vacío.';
-$wb['domain_error_unique'] = 'El dominio debe ser único.';
-$wb['domain_error_regex'] = 'El nombre de dominio no es válido.';
-$wb['host_txt'] = 'Alojamiento';
-$wb['redirect_error_regex'] = 'Redirección no válida ruta. Redirecciones válidos son por ejemplo: /test/ or http://www.domain.tld/test/';
-$wb['no_redirect_txt'] = 'No redirigir';
-$wb['no_flag_txt'] = 'No flag';
-$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
-$wb['proxy_directives_txt'] = 'Proxy Directives';
-$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
-$wb['error_proxy_requires_url'] = 'Redirect Type \\"proxy\\" requires a URL as the redirect path.';
-?>
diff --git a/interface/web/sites/lib/lang/es_web_subdomain_list.lng b/interface/web/sites/lib/lang/es_web_subdomain_list.lng
deleted file mode 100644
index 2b3afa5..0000000
--- a/interface/web/sites/lib/lang/es_web_subdomain_list.lng
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Subdominio';
-$wb['active_txt'] = 'Activar';
-$wb['server_id_txt'] = 'Servidor';
-$wb['parent_domain_id_txt'] = 'Sitio web';
-$wb['domain_txt'] = 'Subdominio';
-$wb['add_new_record_txt'] = 'Añadir nuevo subdominio';
-?>
diff --git a/interface/web/sites/lib/lang/fi_web_aliasdomain.lng b/interface/web/sites/lib/lang/fi_web_aliasdomain.lng
deleted file mode 100644
index 4149c71..0000000
--- a/interface/web/sites/lib/lang/fi_web_aliasdomain.lng
+++ /dev/null
@@ -1,115 +0,0 @@
-<?php
-$wb['domain_txt'] = 'Aliasdomain';
-$wb['backup_interval_txt'] = 'Backup interval';
-$wb['backup_copies_txt'] = 'Number of backup copies';
-$wb['ssl_state_txt'] = 'State';
-$wb['ssl_locality_txt'] = 'Locality';
-$wb['ssl_organisation_txt'] = 'Organisation';
-$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
-$wb['ssl_country_txt'] = 'Country';
-$wb['ssl_key_txt'] = 'SSL Key';
-$wb['ssl_request_txt'] = 'SSL Request';
-$wb['ssl_cert_txt'] = 'SSL Certificate';
-$wb['ssl_bundle_txt'] = 'SSL Bundle';
-$wb['ssl_action_txt'] = 'SSL Action';
-$wb['ssl_domain_txt'] = 'SSL Domain';
-$wb['server_id_txt'] = 'Server';
-$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
-$wb['type_txt'] = 'Type';
-$wb['parent_domain_id_txt'] = 'Parent Website';
-$wb['redirect_type_txt'] = 'Redirect Type';
-$wb['redirect_path_txt'] = 'Redirect Path';
-$wb['active_txt'] = 'Active';
-$wb['document_root_txt'] = 'Documentroot';
-$wb['system_user_txt'] = 'Linux User';
-$wb['system_group_txt'] = 'Linux Group';
-$wb['ip_address_txt'] = 'IPv4-Address';
-$wb['ipv6_address_txt'] = 'IPv6-Address';
-$wb['vhost_type_txt'] = 'VHost Type';
-$wb['hd_quota_txt'] = 'Harddisk Quota';
-$wb['traffic_quota_txt'] = 'Traffic Quota';
-$wb['cgi_txt'] = 'CGI';
-$wb['ssi_txt'] = 'SSI';
-$wb['errordocs_txt'] = 'Own Error-Documents';
-$wb['subdomain_txt'] = 'Auto-Subdomain';
-$wb['ssl_txt'] = 'SSL';
-$wb['suexec_txt'] = 'SuEXEC';
-$wb['php_txt'] = 'PHP';
-$wb['client_txt'] = 'Client';
-$wb['limit_web_domain_txt'] = 'The max. number of web domains for your account is reached.';
-$wb['limit_web_aliasdomain_txt'] = 'The max. number of aliasdomains for your account is reached.';
-$wb['limit_web_subdomain_txt'] = 'The max. number of web subdomains for your account is reached.';
-$wb['apache_directives_txt'] = 'Apache Directives';
-$wb['domain_error_empty'] = 'Domain is empty.';
-$wb['domain_error_unique'] = 'There is already a website or sub / aliasdomain with this domain name.';
-$wb['domain_error_regex'] = 'Domain name invalid.';
-$wb['domain_error_autosub'] = 'There is already a subdomain with these settings.';
-$wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
-$wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
-$wb['error_ssl_state_empty'] = 'SSL State is empty.';
-$wb['error_ssl_locality_empty'] = 'SSL Locality is empty.';
-$wb['error_ssl_organisation_empty'] = 'SSL Organisation is empty.';
-$wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.';
-$wb['error_ssl_country_empty'] = 'SSL Country is empty.';
-$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
-$wb['client_group_id_txt'] = 'Client';
-$wb['stats_password_txt'] = 'Set Webstatistics password';
-$wb['allow_override_txt'] = 'Apache AllowOverride';
-$wb['limit_web_quota_free_txt'] = 'Max. available Harddisk Quota';
-$wb['ssl_state_error_regex'] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_locality_error_regex'] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_organisation_error_regex'] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
-$wb['limit_traffic_quota_free_txt'] = 'Max. available Traffic Quota';
-$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
-$wb['php_open_basedir_txt'] = 'PHP open_basedir';
-$wb['traffic_quota_exceeded_txt'] = 'Traffic quota exceeded';
-$wb['ruby_txt'] = 'Ruby';
-$wb['stats_user_txt'] = 'Webstatistics username';
-$wb['stats_type_txt'] = 'Webstatistics program';
-$wb['custom_php_ini_txt'] = 'Custom php.ini settings';
-$wb['none_txt'] = 'None';
-$wb['disabled_txt'] = 'Disabled';
-$wb['no_redirect_txt'] = 'No redirect';
-$wb['no_flag_txt'] = 'No flag';
-$wb['save_certificate_txt'] = 'Save certificate';
-$wb['create_certificate_txt'] = 'Create certificate';
-$wb['delete_certificate_txt'] = 'Delete certificate';
-$wb['nginx_directives_txt'] = 'nginx Directives';
-$wb['seo_redirect_txt'] = 'SEO Redirect';
-$wb['non_www_to_www_txt'] = 'Non-www -> www';
-$wb['www_to_non_www_txt'] = 'www -> non-www';
-$wb['php_fpm_use_socket_txt'] = 'Use Socket For PHP-FPM';
-$wb['error_no_sni_txt'] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
-$wb['python_txt'] = 'Python';
-$wb['perl_txt'] = 'Perl';
-$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
-$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
-$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
-$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
-$wb['error_php_fpm_pm_settings_txt'] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children >= pm.max_spare_servers >= pm.start_servers >= pm.min_spare_servers > 0';
-$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive integer value.';
-$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
-$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
-$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
-$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
-$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
-$wb['fastcgi_php_version_txt'] = 'PHP Version';
-$wb['pm_txt'] = 'PHP-FPM Process Manager';
-$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
-$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
-$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
-$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
-$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
-$wb['generate_password_txt'] = 'Generate Password';
-$wb['repeat_password_txt'] = 'Repeat Password';
-$wb['password_mismatch_txt'] = 'The passwords do not match.';
-$wb['password_match_txt'] = 'The passwords do match.';
-$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
-$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
-$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
-$wb['proxy_directives_txt'] = 'Proxy Directives';
-$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
-$wb['Domain'] = 'Aliasdomain';
-?>
diff --git a/interface/web/sites/lib/lang/ar_web_aliasdomain.lng b/interface/web/sites/lib/lang/fi_web_childdomain.lng
old mode 100644
new mode 100755
similarity index 73%
copy from interface/web/sites/lib/lang/ar_web_aliasdomain.lng
copy to interface/web/sites/lib/lang/fi_web_childdomain.lng
index 4149c71..6da7297
--- a/interface/web/sites/lib/lang/ar_web_aliasdomain.lng
+++ b/interface/web/sites/lib/lang/fi_web_childdomain.lng
@@ -1,48 +1,56 @@
<?php
-$wb['domain_txt'] = 'Aliasdomain';
-$wb['backup_interval_txt'] = 'Backup interval';
-$wb['backup_copies_txt'] = 'Number of backup copies';
-$wb['ssl_state_txt'] = 'State';
-$wb['ssl_locality_txt'] = 'Locality';
-$wb['ssl_organisation_txt'] = 'Organisation';
-$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
-$wb['ssl_country_txt'] = 'Country';
-$wb['ssl_key_txt'] = 'SSL Key';
-$wb['ssl_request_txt'] = 'SSL Request';
-$wb['ssl_cert_txt'] = 'SSL Certificate';
-$wb['ssl_bundle_txt'] = 'SSL Bundle';
-$wb['ssl_action_txt'] = 'SSL Action';
-$wb['ssl_domain_txt'] = 'SSL Domain';
-$wb['server_id_txt'] = 'Server';
-$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
-$wb['type_txt'] = 'Type';
-$wb['parent_domain_id_txt'] = 'Parent Website';
-$wb['redirect_type_txt'] = 'Redirect Type';
-$wb['redirect_path_txt'] = 'Redirect Path';
-$wb['active_txt'] = 'Active';
-$wb['document_root_txt'] = 'Documentroot';
-$wb['system_user_txt'] = 'Linux User';
-$wb['system_group_txt'] = 'Linux Group';
-$wb['ip_address_txt'] = 'IPv4-Address';
-$wb['ipv6_address_txt'] = 'IPv6-Address';
-$wb['vhost_type_txt'] = 'VHost Type';
-$wb['hd_quota_txt'] = 'Harddisk Quota';
-$wb['traffic_quota_txt'] = 'Traffic Quota';
+$wb['ssl_state_txt'] = 'Lääni';
+$wb['ssl_locality_txt'] = 'Lokaali';
+$wb['ssl_organisation_txt'] = 'Organisaatio';
+$wb['ssl_organisation_unit_txt'] = 'Organisaatoyksikkö';
+$wb['ssl_country_txt'] = 'Maa';
+$wb['ssl_request_txt'] = 'SSL-pyyntö';
+$wb['ssl_cert_txt'] = 'SSL-sertifikaatti';
+$wb['ssl_bundle_txt'] = 'SSL-paketti';
+$wb['ssl_action_txt'] = 'SSL-toiminto';
+$wb['server_id_txt'] = 'Palvelin';
+$wb['domain_txt'] = 'Verkkotunnus';
+$wb['type_txt'] = 'Tyyppi';
+$wb['parent_domain_id_txt'] = 'Pääsivu';
+$wb['redirect_type_txt'] = 'Edelleenohjauksen tyyppi';
+$wb['redirect_path_txt'] = 'Edelleenohjausosoite';
+$wb['active_txt'] = 'Käytössä';
+$wb['document_root_txt'] = 'Dokumentikansio';
+$wb['system_user_txt'] = 'Linux-käyttäjä';
+$wb['system_group_txt'] = 'Käyttäjäryhmä';
+$wb['ip_address_txt'] = 'IP-osoite';
+$wb['vhost_type_txt'] = 'Virtuaali-isännän tyyppi';
+$wb['hd_quota_txt'] = 'Levytila';
+$wb['traffic_quota_txt'] = 'Liikenneraja';
$wb['cgi_txt'] = 'CGI';
$wb['ssi_txt'] = 'SSI';
-$wb['errordocs_txt'] = 'Own Error-Documents';
-$wb['subdomain_txt'] = 'Auto-Subdomain';
$wb['ssl_txt'] = 'SSL';
$wb['suexec_txt'] = 'SuEXEC';
$wb['php_txt'] = 'PHP';
-$wb['client_txt'] = 'Client';
-$wb['limit_web_domain_txt'] = 'The max. number of web domains for your account is reached.';
-$wb['limit_web_aliasdomain_txt'] = 'The max. number of aliasdomains for your account is reached.';
-$wb['limit_web_subdomain_txt'] = 'The max. number of web subdomains for your account is reached.';
-$wb['apache_directives_txt'] = 'Apache Directives';
-$wb['domain_error_empty'] = 'Domain is empty.';
-$wb['domain_error_unique'] = 'There is already a website or sub / aliasdomain with this domain name.';
-$wb['domain_error_regex'] = 'Domain name invalid.';
+$wb['client_txt'] = 'Asiakas';
+$wb['limit_web_domain_txt'] = 'Käytttäjätunnuksella on jo sallittu määrä verkkotunnuksia.';
+$wb['limit_web_aliasdomain_txt'] = 'Käytttäjätunnuksella on jo sallittu määrä aliasverkkotunnuksia.';
+$wb['limit_web_subdomain_txt'] = 'Käytttäjätunnuksella on jo sallittu määrä aliverkkotunnuksia.';
+$wb['apache_directives_txt'] = 'Apachen direktiivit';
+$wb['domain_error_empty'] = 'Verkkotunnus-kenttä on tyhjä.';
+$wb['domain_error_unique'] = 'Tämä verkkotunnus on jo olemassa.';
+$wb['domain_error_regex'] = 'Verkkotunnus on vääränlainen.';
+$wb['host_txt'] = 'Isäntäkone';
+$wb['redirect_error_regex'] = 'VIrheellinen edelleenohjausosoite. Kelvollisia ovat esimerkiksi: /testi/ tai http://www.domain.tld/testi/';
+$wb['no_redirect_txt'] = 'No redirect';
+$wb['no_flag_txt'] = 'No flag';
+$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
+$wb['proxy_directives_txt'] = 'Proxy Directives';
+$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
+$wb['error_proxy_requires_url'] = 'Redirect Type \"proxy\" requires a URL as the redirect path.';
+$wb['backup_interval_txt'] = 'Backup interval';
+$wb['backup_copies_txt'] = 'Number of backup copies';
+$wb['ssl_key_txt'] = 'SSL Key';
+$wb['ssl_domain_txt'] = 'SSL Domain';
+$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
+$wb['ipv6_address_txt'] = 'IPv6-Address';
+$wb['errordocs_txt'] = 'Own Error-Documents';
+$wb['subdomain_txt'] = 'Auto-Subdomain';
$wb['domain_error_autosub'] = 'There is already a subdomain with these settings.';
$wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
$wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
@@ -62,7 +70,6 @@
$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
$wb['limit_traffic_quota_free_txt'] = 'Max. available Traffic Quota';
-$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
$wb['php_open_basedir_txt'] = 'PHP open_basedir';
$wb['traffic_quota_exceeded_txt'] = 'Traffic quota exceeded';
$wb['ruby_txt'] = 'Ruby';
@@ -71,8 +78,6 @@
$wb['custom_php_ini_txt'] = 'Custom php.ini settings';
$wb['none_txt'] = 'None';
$wb['disabled_txt'] = 'Disabled';
-$wb['no_redirect_txt'] = 'No redirect';
-$wb['no_flag_txt'] = 'No flag';
$wb['save_certificate_txt'] = 'Save certificate';
$wb['create_certificate_txt'] = 'Create certificate';
$wb['delete_certificate_txt'] = 'Delete certificate';
@@ -109,7 +114,6 @@
$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
-$wb['proxy_directives_txt'] = 'Proxy Directives';
-$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
$wb['Domain'] = 'Aliasdomain';
+
?>
diff --git a/interface/web/sites/lib/lang/fi_web_aliasdomain_list.lng b/interface/web/sites/lib/lang/fi_web_childdomain_list.lng
similarity index 66%
rename from interface/web/sites/lib/lang/fi_web_aliasdomain_list.lng
rename to interface/web/sites/lib/lang/fi_web_childdomain_list.lng
index 623b06f..97b62c6 100755
--- a/interface/web/sites/lib/lang/fi_web_aliasdomain_list.lng
+++ b/interface/web/sites/lib/lang/fi_web_childdomain_list.lng
@@ -1,14 +1,15 @@
<?php
-$wb['list_head_txt'] = 'Aliasverkkotunnus';
+$wb['list_head_txt'] = 'Aliverkkotunnukset';
$wb['active_txt'] = 'Käytössä';
$wb['server_id_txt'] = 'Palvelin';
-$wb['parent_domain_id_txt'] = 'Sivusto';
-$wb['domain_txt'] = 'Aliasverkkotunnus';
-$wb['add_new_record_txt'] = 'Lisää uusi aliasverkkotunnus';
+$wb['parent_domain_id_txt'] = 'Pääverkkotunnus';
+$wb['domain_txt'] = 'Aliverkkotunnus';
+$wb['add_new_record_txt'] = 'Lisää uusi aliverkkotunnus';
$wb['domain_error_empty'] = 'Aliasverkkotunnus on tyhjä.';
$wb['domain_error_unique'] = 'Tämä aliasverkkotunnus on jo olemassa.';
$wb['domain_error_regex'] = 'Aliasverkkotunnus on vääränlainen.';
$wb['no_redirect_txt'] = 'No redirect';
$wb['no_flag_txt'] = 'No flag';
$wb['none_txt'] = 'None';
+
?>
diff --git a/interface/web/sites/lib/lang/fi_web_subdomain.lng b/interface/web/sites/lib/lang/fi_web_subdomain.lng
deleted file mode 100755
index b2003f0..0000000
--- a/interface/web/sites/lib/lang/fi_web_subdomain.lng
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-$wb['ssl_state_txt'] = 'Lääni';
-$wb['ssl_locality_txt'] = 'Lokaali';
-$wb['ssl_organisation_txt'] = 'Organisaatio';
-$wb['ssl_organisation_unit_txt'] = 'Organisaatoyksikkö';
-$wb['ssl_country_txt'] = 'Maa';
-$wb['ssl_request_txt'] = 'SSL-pyyntö';
-$wb['ssl_cert_txt'] = 'SSL-sertifikaatti';
-$wb['ssl_bundle_txt'] = 'SSL-paketti';
-$wb['ssl_action_txt'] = 'SSL-toiminto';
-$wb['server_id_txt'] = 'Palvelin';
-$wb['domain_txt'] = 'Verkkotunnus';
-$wb['type_txt'] = 'Tyyppi';
-$wb['parent_domain_id_txt'] = 'Pääsivu';
-$wb['redirect_type_txt'] = 'Edelleenohjauksen tyyppi';
-$wb['redirect_path_txt'] = 'Edelleenohjausosoite';
-$wb['active_txt'] = 'Käytössä';
-$wb['document_root_txt'] = 'Dokumentikansio';
-$wb['system_user_txt'] = 'Linux-käyttäjä';
-$wb['system_group_txt'] = 'Käyttäjäryhmä';
-$wb['ip_address_txt'] = 'IP-osoite';
-$wb['vhost_type_txt'] = 'Virtuaali-isännän tyyppi';
-$wb['hd_quota_txt'] = 'Levytila';
-$wb['traffic_quota_txt'] = 'Liikenneraja';
-$wb['cgi_txt'] = 'CGI';
-$wb['ssi_txt'] = 'SSI';
-$wb['ssl_txt'] = 'SSL';
-$wb['suexec_txt'] = 'SuEXEC';
-$wb['php_txt'] = 'PHP';
-$wb['client_txt'] = 'Asiakas';
-$wb['limit_web_domain_txt'] = 'Käytttäjätunnuksella on jo sallittu määrä verkkotunnuksia.';
-$wb['limit_web_aliasdomain_txt'] = 'Käytttäjätunnuksella on jo sallittu määrä aliasverkkotunnuksia.';
-$wb['limit_web_subdomain_txt'] = 'Käytttäjätunnuksella on jo sallittu määrä aliverkkotunnuksia.';
-$wb['apache_directives_txt'] = 'Apachen direktiivit';
-$wb['domain_error_empty'] = 'Verkkotunnus-kenttä on tyhjä.';
-$wb['domain_error_unique'] = 'Tämä verkkotunnus on jo olemassa.';
-$wb['domain_error_regex'] = 'Verkkotunnus on vääränlainen.';
-$wb['host_txt'] = 'Isäntäkone';
-$wb['redirect_error_regex'] = 'VIrheellinen edelleenohjausosoite. Kelvollisia ovat esimerkiksi: /testi/ tai http://www.domain.tld/testi/';
-$wb['no_redirect_txt'] = 'No redirect';
-$wb['no_flag_txt'] = 'No flag';
-$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
-$wb['proxy_directives_txt'] = 'Proxy Directives';
-$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
-$wb['error_proxy_requires_url'] = 'Redirect Type \\"proxy\\" requires a URL as the redirect path.';
-?>
diff --git a/interface/web/sites/lib/lang/fi_web_subdomain_list.lng b/interface/web/sites/lib/lang/fi_web_subdomain_list.lng
deleted file mode 100755
index 31fb170..0000000
--- a/interface/web/sites/lib/lang/fi_web_subdomain_list.lng
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Aliverkkotunnukset';
-$wb['active_txt'] = 'Käytössä';
-$wb['server_id_txt'] = 'Palvelin';
-$wb['parent_domain_id_txt'] = 'Pääverkkotunnus';
-$wb['domain_txt'] = 'Aliverkkotunnus';
-$wb['add_new_record_txt'] = 'Lisää uusi aliverkkotunnus';
-?>
diff --git a/interface/web/sites/lib/lang/fr_web_aliasdomain.lng b/interface/web/sites/lib/lang/fr_web_aliasdomain.lng
deleted file mode 100644
index 4149c71..0000000
--- a/interface/web/sites/lib/lang/fr_web_aliasdomain.lng
+++ /dev/null
@@ -1,115 +0,0 @@
-<?php
-$wb['domain_txt'] = 'Aliasdomain';
-$wb['backup_interval_txt'] = 'Backup interval';
-$wb['backup_copies_txt'] = 'Number of backup copies';
-$wb['ssl_state_txt'] = 'State';
-$wb['ssl_locality_txt'] = 'Locality';
-$wb['ssl_organisation_txt'] = 'Organisation';
-$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
-$wb['ssl_country_txt'] = 'Country';
-$wb['ssl_key_txt'] = 'SSL Key';
-$wb['ssl_request_txt'] = 'SSL Request';
-$wb['ssl_cert_txt'] = 'SSL Certificate';
-$wb['ssl_bundle_txt'] = 'SSL Bundle';
-$wb['ssl_action_txt'] = 'SSL Action';
-$wb['ssl_domain_txt'] = 'SSL Domain';
-$wb['server_id_txt'] = 'Server';
-$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
-$wb['type_txt'] = 'Type';
-$wb['parent_domain_id_txt'] = 'Parent Website';
-$wb['redirect_type_txt'] = 'Redirect Type';
-$wb['redirect_path_txt'] = 'Redirect Path';
-$wb['active_txt'] = 'Active';
-$wb['document_root_txt'] = 'Documentroot';
-$wb['system_user_txt'] = 'Linux User';
-$wb['system_group_txt'] = 'Linux Group';
-$wb['ip_address_txt'] = 'IPv4-Address';
-$wb['ipv6_address_txt'] = 'IPv6-Address';
-$wb['vhost_type_txt'] = 'VHost Type';
-$wb['hd_quota_txt'] = 'Harddisk Quota';
-$wb['traffic_quota_txt'] = 'Traffic Quota';
-$wb['cgi_txt'] = 'CGI';
-$wb['ssi_txt'] = 'SSI';
-$wb['errordocs_txt'] = 'Own Error-Documents';
-$wb['subdomain_txt'] = 'Auto-Subdomain';
-$wb['ssl_txt'] = 'SSL';
-$wb['suexec_txt'] = 'SuEXEC';
-$wb['php_txt'] = 'PHP';
-$wb['client_txt'] = 'Client';
-$wb['limit_web_domain_txt'] = 'The max. number of web domains for your account is reached.';
-$wb['limit_web_aliasdomain_txt'] = 'The max. number of aliasdomains for your account is reached.';
-$wb['limit_web_subdomain_txt'] = 'The max. number of web subdomains for your account is reached.';
-$wb['apache_directives_txt'] = 'Apache Directives';
-$wb['domain_error_empty'] = 'Domain is empty.';
-$wb['domain_error_unique'] = 'There is already a website or sub / aliasdomain with this domain name.';
-$wb['domain_error_regex'] = 'Domain name invalid.';
-$wb['domain_error_autosub'] = 'There is already a subdomain with these settings.';
-$wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
-$wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
-$wb['error_ssl_state_empty'] = 'SSL State is empty.';
-$wb['error_ssl_locality_empty'] = 'SSL Locality is empty.';
-$wb['error_ssl_organisation_empty'] = 'SSL Organisation is empty.';
-$wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.';
-$wb['error_ssl_country_empty'] = 'SSL Country is empty.';
-$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
-$wb['client_group_id_txt'] = 'Client';
-$wb['stats_password_txt'] = 'Set Webstatistics password';
-$wb['allow_override_txt'] = 'Apache AllowOverride';
-$wb['limit_web_quota_free_txt'] = 'Max. available Harddisk Quota';
-$wb['ssl_state_error_regex'] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_locality_error_regex'] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_organisation_error_regex'] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
-$wb['limit_traffic_quota_free_txt'] = 'Max. available Traffic Quota';
-$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
-$wb['php_open_basedir_txt'] = 'PHP open_basedir';
-$wb['traffic_quota_exceeded_txt'] = 'Traffic quota exceeded';
-$wb['ruby_txt'] = 'Ruby';
-$wb['stats_user_txt'] = 'Webstatistics username';
-$wb['stats_type_txt'] = 'Webstatistics program';
-$wb['custom_php_ini_txt'] = 'Custom php.ini settings';
-$wb['none_txt'] = 'None';
-$wb['disabled_txt'] = 'Disabled';
-$wb['no_redirect_txt'] = 'No redirect';
-$wb['no_flag_txt'] = 'No flag';
-$wb['save_certificate_txt'] = 'Save certificate';
-$wb['create_certificate_txt'] = 'Create certificate';
-$wb['delete_certificate_txt'] = 'Delete certificate';
-$wb['nginx_directives_txt'] = 'nginx Directives';
-$wb['seo_redirect_txt'] = 'SEO Redirect';
-$wb['non_www_to_www_txt'] = 'Non-www -> www';
-$wb['www_to_non_www_txt'] = 'www -> non-www';
-$wb['php_fpm_use_socket_txt'] = 'Use Socket For PHP-FPM';
-$wb['error_no_sni_txt'] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
-$wb['python_txt'] = 'Python';
-$wb['perl_txt'] = 'Perl';
-$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
-$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
-$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
-$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
-$wb['error_php_fpm_pm_settings_txt'] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children >= pm.max_spare_servers >= pm.start_servers >= pm.min_spare_servers > 0';
-$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive integer value.';
-$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
-$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
-$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
-$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
-$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
-$wb['fastcgi_php_version_txt'] = 'PHP Version';
-$wb['pm_txt'] = 'PHP-FPM Process Manager';
-$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
-$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
-$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
-$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
-$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
-$wb['generate_password_txt'] = 'Generate Password';
-$wb['repeat_password_txt'] = 'Repeat Password';
-$wb['password_mismatch_txt'] = 'The passwords do not match.';
-$wb['password_match_txt'] = 'The passwords do match.';
-$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
-$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
-$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
-$wb['proxy_directives_txt'] = 'Proxy Directives';
-$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
-$wb['Domain'] = 'Aliasdomain';
-?>
diff --git a/interface/web/sites/lib/lang/ar_web_aliasdomain.lng b/interface/web/sites/lib/lang/fr_web_childdomain.lng
similarity index 74%
copy from interface/web/sites/lib/lang/ar_web_aliasdomain.lng
copy to interface/web/sites/lib/lang/fr_web_childdomain.lng
index 4149c71..3811620 100644
--- a/interface/web/sites/lib/lang/ar_web_aliasdomain.lng
+++ b/interface/web/sites/lib/lang/fr_web_childdomain.lng
@@ -1,48 +1,56 @@
<?php
-$wb['domain_txt'] = 'Aliasdomain';
-$wb['backup_interval_txt'] = 'Backup interval';
-$wb['backup_copies_txt'] = 'Number of backup copies';
-$wb['ssl_state_txt'] = 'State';
-$wb['ssl_locality_txt'] = 'Locality';
+$wb['ssl_state_txt'] = 'Pays';
+$wb['ssl_locality_txt'] = 'Lieu';
$wb['ssl_organisation_txt'] = 'Organisation';
-$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
-$wb['ssl_country_txt'] = 'Country';
-$wb['ssl_key_txt'] = 'SSL Key';
-$wb['ssl_request_txt'] = 'SSL Request';
-$wb['ssl_cert_txt'] = 'SSL Certificate';
+$wb['ssl_organisation_unit_txt'] = 'Unité dorganisation';
+$wb['ssl_country_txt'] = 'Pays';
+$wb['ssl_request_txt'] = 'Requête SSL';
+$wb['ssl_cert_txt'] = 'Certificat SSL';
$wb['ssl_bundle_txt'] = 'SSL Bundle';
-$wb['ssl_action_txt'] = 'SSL Action';
-$wb['ssl_domain_txt'] = 'SSL Domain';
-$wb['server_id_txt'] = 'Server';
-$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
+$wb['ssl_action_txt'] = 'Action SSL';
+$wb['server_id_txt'] = 'Serveur';
+$wb['domain_txt'] = 'Domaine';
$wb['type_txt'] = 'Type';
-$wb['parent_domain_id_txt'] = 'Parent Website';
-$wb['redirect_type_txt'] = 'Redirect Type';
-$wb['redirect_path_txt'] = 'Redirect Path';
-$wb['active_txt'] = 'Active';
-$wb['document_root_txt'] = 'Documentroot';
-$wb['system_user_txt'] = 'Linux User';
-$wb['system_group_txt'] = 'Linux Group';
-$wb['ip_address_txt'] = 'IPv4-Address';
-$wb['ipv6_address_txt'] = 'IPv6-Address';
-$wb['vhost_type_txt'] = 'VHost Type';
-$wb['hd_quota_txt'] = 'Harddisk Quota';
-$wb['traffic_quota_txt'] = 'Traffic Quota';
+$wb['parent_domain_id_txt'] = 'Site web parent';
+$wb['redirect_type_txt'] = 'Type de redirection';
+$wb['redirect_path_txt'] = 'Chemin de redirection';
+$wb['active_txt'] = 'Actif';
+$wb['document_root_txt'] = 'Racine du document';
+$wb['system_user_txt'] = 'Utilisateur Linux';
+$wb['system_group_txt'] = 'Groupe Linux';
+$wb['ip_address_txt'] = 'Adresse IP';
+$wb['vhost_type_txt'] = 'Type de VHost';
+$wb['hd_quota_txt'] = 'Quota disque';
$wb['cgi_txt'] = 'CGI';
$wb['ssi_txt'] = 'SSI';
-$wb['errordocs_txt'] = 'Own Error-Documents';
-$wb['subdomain_txt'] = 'Auto-Subdomain';
$wb['ssl_txt'] = 'SSL';
$wb['suexec_txt'] = 'SuEXEC';
$wb['php_txt'] = 'PHP';
$wb['client_txt'] = 'Client';
-$wb['limit_web_domain_txt'] = 'The max. number of web domains for your account is reached.';
-$wb['limit_web_aliasdomain_txt'] = 'The max. number of aliasdomains for your account is reached.';
-$wb['limit_web_subdomain_txt'] = 'The max. number of web subdomains for your account is reached.';
-$wb['apache_directives_txt'] = 'Apache Directives';
-$wb['domain_error_empty'] = 'Domain is empty.';
-$wb['domain_error_unique'] = 'There is already a website or sub / aliasdomain with this domain name.';
-$wb['domain_error_regex'] = 'Domain name invalid.';
+$wb['limit_web_domain_txt'] = 'Le nombre maximum de noms de domaine pour votre compte a été atteint.';
+$wb['limit_web_aliasdomain_txt'] = 'Le nombre maximum d\'alias de domaine pour votre compte a été atteint.';
+$wb['limit_web_subdomain_txt'] = 'Le nombre maximum de sous-domaines pour votre compte a été atteint.';
+$wb['apache_directives_txt'] = 'Directives Apache';
+$wb['domain_error_empty'] = 'Le nom de domaine est vide.';
+$wb['domain_error_unique'] = 'Le nom de domaine doit être unique.';
+$wb['domain_error_regex'] = 'Le nom de domaine est invalide.';
+$wb['host_txt'] = 'Hôte';
+$wb['traffic_quota_txt'] = 'Quota de trafic';
+$wb['redirect_error_regex'] = 'Chemin de redirection invalide. Exemples de redirections valides: /test/ ou http://www.domain.tld/test/';
+$wb['no_redirect_txt'] = 'Aucune redirecton';
+$wb['no_flag_txt'] = 'Aucun flag';
+$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
+$wb['proxy_directives_txt'] = 'Proxy Directives';
+$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
+$wb['error_proxy_requires_url'] = 'Redirect Type \"proxy\" requires a URL as the redirect path.';
+$wb['backup_interval_txt'] = 'Backup interval';
+$wb['backup_copies_txt'] = 'Number of backup copies';
+$wb['ssl_key_txt'] = 'SSL Key';
+$wb['ssl_domain_txt'] = 'SSL Domain';
+$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
+$wb['ipv6_address_txt'] = 'IPv6-Address';
+$wb['errordocs_txt'] = 'Own Error-Documents';
+$wb['subdomain_txt'] = 'Auto-Subdomain';
$wb['domain_error_autosub'] = 'There is already a subdomain with these settings.';
$wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
$wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
@@ -62,7 +70,6 @@
$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
$wb['limit_traffic_quota_free_txt'] = 'Max. available Traffic Quota';
-$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
$wb['php_open_basedir_txt'] = 'PHP open_basedir';
$wb['traffic_quota_exceeded_txt'] = 'Traffic quota exceeded';
$wb['ruby_txt'] = 'Ruby';
@@ -71,8 +78,6 @@
$wb['custom_php_ini_txt'] = 'Custom php.ini settings';
$wb['none_txt'] = 'None';
$wb['disabled_txt'] = 'Disabled';
-$wb['no_redirect_txt'] = 'No redirect';
-$wb['no_flag_txt'] = 'No flag';
$wb['save_certificate_txt'] = 'Save certificate';
$wb['create_certificate_txt'] = 'Create certificate';
$wb['delete_certificate_txt'] = 'Delete certificate';
@@ -109,7 +114,6 @@
$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
-$wb['proxy_directives_txt'] = 'Proxy Directives';
-$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
$wb['Domain'] = 'Aliasdomain';
+
?>
diff --git a/interface/web/sites/lib/lang/fr_web_aliasdomain_list.lng b/interface/web/sites/lib/lang/fr_web_childdomain_list.lng
similarity index 75%
rename from interface/web/sites/lib/lang/fr_web_aliasdomain_list.lng
rename to interface/web/sites/lib/lang/fr_web_childdomain_list.lng
index 5837931..4f8768b 100644
--- a/interface/web/sites/lib/lang/fr_web_aliasdomain_list.lng
+++ b/interface/web/sites/lib/lang/fr_web_childdomain_list.lng
@@ -1,14 +1,15 @@
<?php
-$wb['list_head_txt'] = 'Alias de domaine';
+$wb['list_head_txt'] = 'Sous-domaines';
$wb['active_txt'] = 'Actif';
$wb['server_id_txt'] = 'Serveur';
$wb['parent_domain_id_txt'] = 'Site web';
-$wb['domain_txt'] = 'Alias de domaine';
-$wb['add_new_record_txt'] = 'Nouvel alias de domaine';
+$wb['domain_txt'] = 'Sous-domaine';
+$wb['add_new_record_txt'] = 'Nouveau sous-domaine';
$wb['domain_error_empty'] = 'Le nom de domaine est vide.';
$wb['domain_error_unique'] = 'Le nom de domaine doit être unique.';
$wb['domain_error_regex'] = 'Le nom de domaine est invalide.';
$wb['no_redirect_txt'] = 'Aucune redirection';
$wb['no_flag_txt'] = 'Aucun flag';
$wb['none_txt'] = 'Aucun';
+
?>
diff --git a/interface/web/sites/lib/lang/fr_web_subdomain.lng b/interface/web/sites/lib/lang/fr_web_subdomain.lng
deleted file mode 100644
index e28106f..0000000
--- a/interface/web/sites/lib/lang/fr_web_subdomain.lng
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-$wb['ssl_state_txt'] = 'Pays';
-$wb['ssl_locality_txt'] = 'Lieu';
-$wb['ssl_organisation_txt'] = 'Organisation';
-$wb['ssl_organisation_unit_txt'] = 'Unité dorganisation';
-$wb['ssl_country_txt'] = 'Pays';
-$wb['ssl_request_txt'] = 'Requête SSL';
-$wb['ssl_cert_txt'] = 'Certificat SSL';
-$wb['ssl_bundle_txt'] = 'SSL Bundle';
-$wb['ssl_action_txt'] = 'Action SSL';
-$wb['server_id_txt'] = 'Serveur';
-$wb['domain_txt'] = 'Domaine';
-$wb['type_txt'] = 'Type';
-$wb['parent_domain_id_txt'] = 'Site web parent';
-$wb['redirect_type_txt'] = 'Type de redirection';
-$wb['redirect_path_txt'] = 'Chemin de redirection';
-$wb['active_txt'] = 'Actif';
-$wb['document_root_txt'] = 'Racine du document';
-$wb['system_user_txt'] = 'Utilisateur Linux';
-$wb['system_group_txt'] = 'Groupe Linux';
-$wb['ip_address_txt'] = 'Adresse IP';
-$wb['vhost_type_txt'] = 'Type de VHost';
-$wb['hd_quota_txt'] = 'Quota disque';
-$wb['cgi_txt'] = 'CGI';
-$wb['ssi_txt'] = 'SSI';
-$wb['ssl_txt'] = 'SSL';
-$wb['suexec_txt'] = 'SuEXEC';
-$wb['php_txt'] = 'PHP';
-$wb['client_txt'] = 'Client';
-$wb['limit_web_domain_txt'] = 'Le nombre maximum de noms de domaine pour votre compte a été atteint.';
-$wb['limit_web_aliasdomain_txt'] = 'Le nombre maximum d\'alias de domaine pour votre compte a été atteint.';
-$wb['limit_web_subdomain_txt'] = 'Le nombre maximum de sous-domaines pour votre compte a été atteint.';
-$wb['apache_directives_txt'] = 'Directives Apache';
-$wb['domain_error_empty'] = 'Le nom de domaine est vide.';
-$wb['domain_error_unique'] = 'Le nom de domaine doit être unique.';
-$wb['domain_error_regex'] = 'Le nom de domaine est invalide.';
-$wb['host_txt'] = 'Hôte';
-$wb['traffic_quota_txt'] = 'Quota de trafic';
-$wb['redirect_error_regex'] = 'Chemin de redirection invalide. Exemples de redirections valides: /test/ ou http://www.domain.tld/test/';
-$wb['no_redirect_txt'] = 'Aucune redirecton';
-$wb['no_flag_txt'] = 'Aucun flag';
-$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
-$wb['proxy_directives_txt'] = 'Proxy Directives';
-$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
-$wb['error_proxy_requires_url'] = 'Redirect Type \\"proxy\\" requires a URL as the redirect path.';
-?>
diff --git a/interface/web/sites/lib/lang/fr_web_subdomain_list.lng b/interface/web/sites/lib/lang/fr_web_subdomain_list.lng
deleted file mode 100644
index 9bfbd30..0000000
--- a/interface/web/sites/lib/lang/fr_web_subdomain_list.lng
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Sous-domaines';
-$wb['active_txt'] = 'Actif';
-$wb['server_id_txt'] = 'Serveur';
-$wb['parent_domain_id_txt'] = 'Site web';
-$wb['domain_txt'] = 'Sous-domaine';
-$wb['add_new_record_txt'] = 'Nouveau sous-domaine';
-?>
diff --git a/interface/web/sites/lib/lang/hr_web_aliasdomain.lng b/interface/web/sites/lib/lang/hr_web_aliasdomain.lng
deleted file mode 100644
index 4149c71..0000000
--- a/interface/web/sites/lib/lang/hr_web_aliasdomain.lng
+++ /dev/null
@@ -1,115 +0,0 @@
-<?php
-$wb['domain_txt'] = 'Aliasdomain';
-$wb['backup_interval_txt'] = 'Backup interval';
-$wb['backup_copies_txt'] = 'Number of backup copies';
-$wb['ssl_state_txt'] = 'State';
-$wb['ssl_locality_txt'] = 'Locality';
-$wb['ssl_organisation_txt'] = 'Organisation';
-$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
-$wb['ssl_country_txt'] = 'Country';
-$wb['ssl_key_txt'] = 'SSL Key';
-$wb['ssl_request_txt'] = 'SSL Request';
-$wb['ssl_cert_txt'] = 'SSL Certificate';
-$wb['ssl_bundle_txt'] = 'SSL Bundle';
-$wb['ssl_action_txt'] = 'SSL Action';
-$wb['ssl_domain_txt'] = 'SSL Domain';
-$wb['server_id_txt'] = 'Server';
-$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
-$wb['type_txt'] = 'Type';
-$wb['parent_domain_id_txt'] = 'Parent Website';
-$wb['redirect_type_txt'] = 'Redirect Type';
-$wb['redirect_path_txt'] = 'Redirect Path';
-$wb['active_txt'] = 'Active';
-$wb['document_root_txt'] = 'Documentroot';
-$wb['system_user_txt'] = 'Linux User';
-$wb['system_group_txt'] = 'Linux Group';
-$wb['ip_address_txt'] = 'IPv4-Address';
-$wb['ipv6_address_txt'] = 'IPv6-Address';
-$wb['vhost_type_txt'] = 'VHost Type';
-$wb['hd_quota_txt'] = 'Harddisk Quota';
-$wb['traffic_quota_txt'] = 'Traffic Quota';
-$wb['cgi_txt'] = 'CGI';
-$wb['ssi_txt'] = 'SSI';
-$wb['errordocs_txt'] = 'Own Error-Documents';
-$wb['subdomain_txt'] = 'Auto-Subdomain';
-$wb['ssl_txt'] = 'SSL';
-$wb['suexec_txt'] = 'SuEXEC';
-$wb['php_txt'] = 'PHP';
-$wb['client_txt'] = 'Client';
-$wb['limit_web_domain_txt'] = 'The max. number of web domains for your account is reached.';
-$wb['limit_web_aliasdomain_txt'] = 'The max. number of aliasdomains for your account is reached.';
-$wb['limit_web_subdomain_txt'] = 'The max. number of web subdomains for your account is reached.';
-$wb['apache_directives_txt'] = 'Apache Directives';
-$wb['domain_error_empty'] = 'Domain is empty.';
-$wb['domain_error_unique'] = 'There is already a website or sub / aliasdomain with this domain name.';
-$wb['domain_error_regex'] = 'Domain name invalid.';
-$wb['domain_error_autosub'] = 'There is already a subdomain with these settings.';
-$wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
-$wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
-$wb['error_ssl_state_empty'] = 'SSL State is empty.';
-$wb['error_ssl_locality_empty'] = 'SSL Locality is empty.';
-$wb['error_ssl_organisation_empty'] = 'SSL Organisation is empty.';
-$wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.';
-$wb['error_ssl_country_empty'] = 'SSL Country is empty.';
-$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
-$wb['client_group_id_txt'] = 'Client';
-$wb['stats_password_txt'] = 'Set Webstatistics password';
-$wb['allow_override_txt'] = 'Apache AllowOverride';
-$wb['limit_web_quota_free_txt'] = 'Max. available Harddisk Quota';
-$wb['ssl_state_error_regex'] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_locality_error_regex'] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_organisation_error_regex'] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
-$wb['limit_traffic_quota_free_txt'] = 'Max. available Traffic Quota';
-$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
-$wb['php_open_basedir_txt'] = 'PHP open_basedir';
-$wb['traffic_quota_exceeded_txt'] = 'Traffic quota exceeded';
-$wb['ruby_txt'] = 'Ruby';
-$wb['stats_user_txt'] = 'Webstatistics username';
-$wb['stats_type_txt'] = 'Webstatistics program';
-$wb['custom_php_ini_txt'] = 'Custom php.ini settings';
-$wb['none_txt'] = 'None';
-$wb['disabled_txt'] = 'Disabled';
-$wb['no_redirect_txt'] = 'No redirect';
-$wb['no_flag_txt'] = 'No flag';
-$wb['save_certificate_txt'] = 'Save certificate';
-$wb['create_certificate_txt'] = 'Create certificate';
-$wb['delete_certificate_txt'] = 'Delete certificate';
-$wb['nginx_directives_txt'] = 'nginx Directives';
-$wb['seo_redirect_txt'] = 'SEO Redirect';
-$wb['non_www_to_www_txt'] = 'Non-www -> www';
-$wb['www_to_non_www_txt'] = 'www -> non-www';
-$wb['php_fpm_use_socket_txt'] = 'Use Socket For PHP-FPM';
-$wb['error_no_sni_txt'] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
-$wb['python_txt'] = 'Python';
-$wb['perl_txt'] = 'Perl';
-$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
-$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
-$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
-$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
-$wb['error_php_fpm_pm_settings_txt'] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children >= pm.max_spare_servers >= pm.start_servers >= pm.min_spare_servers > 0';
-$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive integer value.';
-$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
-$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
-$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
-$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
-$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
-$wb['fastcgi_php_version_txt'] = 'PHP Version';
-$wb['pm_txt'] = 'PHP-FPM Process Manager';
-$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
-$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
-$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
-$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
-$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
-$wb['generate_password_txt'] = 'Generate Password';
-$wb['repeat_password_txt'] = 'Repeat Password';
-$wb['password_mismatch_txt'] = 'The passwords do not match.';
-$wb['password_match_txt'] = 'The passwords do match.';
-$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
-$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
-$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
-$wb['proxy_directives_txt'] = 'Proxy Directives';
-$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
-$wb['Domain'] = 'Aliasdomain';
-?>
diff --git a/interface/web/sites/lib/lang/ar_web_aliasdomain.lng b/interface/web/sites/lib/lang/hr_web_childdomain.lng
similarity index 74%
copy from interface/web/sites/lib/lang/ar_web_aliasdomain.lng
copy to interface/web/sites/lib/lang/hr_web_childdomain.lng
index 4149c71..6866b6f 100644
--- a/interface/web/sites/lib/lang/ar_web_aliasdomain.lng
+++ b/interface/web/sites/lib/lang/hr_web_childdomain.lng
@@ -1,48 +1,56 @@
<?php
-$wb['domain_txt'] = 'Aliasdomain';
-$wb['backup_interval_txt'] = 'Backup interval';
-$wb['backup_copies_txt'] = 'Number of backup copies';
-$wb['ssl_state_txt'] = 'State';
-$wb['ssl_locality_txt'] = 'Locality';
-$wb['ssl_organisation_txt'] = 'Organisation';
-$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
-$wb['ssl_country_txt'] = 'Country';
-$wb['ssl_key_txt'] = 'SSL Key';
-$wb['ssl_request_txt'] = 'SSL Request';
-$wb['ssl_cert_txt'] = 'SSL Certificate';
-$wb['ssl_bundle_txt'] = 'SSL Bundle';
-$wb['ssl_action_txt'] = 'SSL Action';
-$wb['ssl_domain_txt'] = 'SSL Domain';
+$wb['ssl_state_txt'] = 'Županija';
+$wb['ssl_locality_txt'] = 'Lokacija';
+$wb['ssl_organisation_txt'] = 'Organizacija';
+$wb['ssl_organisation_unit_txt'] = 'Organizacijski dio';
+$wb['ssl_country_txt'] = 'Država';
+$wb['ssl_request_txt'] = 'SSL zahtjev';
+$wb['ssl_cert_txt'] = 'SSL certifikat';
+$wb['ssl_bundle_txt'] = 'SSL paket';
+$wb['ssl_action_txt'] = 'SSL akcija';
$wb['server_id_txt'] = 'Server';
-$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
-$wb['type_txt'] = 'Type';
-$wb['parent_domain_id_txt'] = 'Parent Website';
-$wb['redirect_type_txt'] = 'Redirect Type';
-$wb['redirect_path_txt'] = 'Redirect Path';
-$wb['active_txt'] = 'Active';
+$wb['domain_txt'] = 'Domena';
+$wb['type_txt'] = 'Vrsta';
+$wb['parent_domain_id_txt'] = 'Početna web stranica';
+$wb['redirect_type_txt'] = 'Vrsta redirekcije';
+$wb['redirect_path_txt'] = 'Redirekcijska putanja';
+$wb['active_txt'] = 'Aktivno';
$wb['document_root_txt'] = 'Documentroot';
-$wb['system_user_txt'] = 'Linux User';
-$wb['system_group_txt'] = 'Linux Group';
-$wb['ip_address_txt'] = 'IPv4-Address';
-$wb['ipv6_address_txt'] = 'IPv6-Address';
-$wb['vhost_type_txt'] = 'VHost Type';
-$wb['hd_quota_txt'] = 'Harddisk Quota';
-$wb['traffic_quota_txt'] = 'Traffic Quota';
+$wb['system_user_txt'] = 'Linux korisnik';
+$wb['system_group_txt'] = 'Linux grupa';
+$wb['ip_address_txt'] = 'IP adresa';
+$wb['vhost_type_txt'] = 'Vrsta VHosta';
+$wb['hd_quota_txt'] = 'Kvota diska';
+$wb['traffic_quota_txt'] = 'Promet web stranice';
$wb['cgi_txt'] = 'CGI';
$wb['ssi_txt'] = 'SSI';
-$wb['errordocs_txt'] = 'Own Error-Documents';
-$wb['subdomain_txt'] = 'Auto-Subdomain';
$wb['ssl_txt'] = 'SSL';
$wb['suexec_txt'] = 'SuEXEC';
$wb['php_txt'] = 'PHP';
-$wb['client_txt'] = 'Client';
-$wb['limit_web_domain_txt'] = 'The max. number of web domains for your account is reached.';
-$wb['limit_web_aliasdomain_txt'] = 'The max. number of aliasdomains for your account is reached.';
-$wb['limit_web_subdomain_txt'] = 'The max. number of web subdomains for your account is reached.';
-$wb['apache_directives_txt'] = 'Apache Directives';
-$wb['domain_error_empty'] = 'Domain is empty.';
-$wb['domain_error_unique'] = 'There is already a website or sub / aliasdomain with this domain name.';
-$wb['domain_error_regex'] = 'Domain name invalid.';
+$wb['client_txt'] = 'Klijent';
+$wb['limit_web_domain_txt'] = 'Iskorišten je maksimalan broj domena.';
+$wb['limit_web_aliasdomain_txt'] = 'Iskorišten je maksimalan broj alias domena.';
+$wb['limit_web_subdomain_txt'] = 'Iskorišten je maksimalan broj poddomena.';
+$wb['apache_directives_txt'] = 'Apache direktive';
+$wb['domain_error_empty'] = 'Naziv domene je prazan.';
+$wb['domain_error_unique'] = 'Već postoji web stranica ili poddomena / alias sa nazivom te domene.';
+$wb['domain_error_regex'] = 'Naziv domene je neispravan.';
+$wb['host_txt'] = 'Host';
+$wb['redirect_error_regex'] = 'Neispravna putanja redirekcije. Ispravne redirekcije su npr.: /test/ ili http://www.domena.tld/test/';
+$wb['no_redirect_txt'] = 'Bez redirekcije';
+$wb['no_flag_txt'] = 'Bez markiranja';
+$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
+$wb['proxy_directives_txt'] = 'Proxy Directives';
+$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
+$wb['error_proxy_requires_url'] = 'Redirect Type \"proxy\" requires a URL as the redirect path.';
+$wb['backup_interval_txt'] = 'Backup interval';
+$wb['backup_copies_txt'] = 'Number of backup copies';
+$wb['ssl_key_txt'] = 'SSL Key';
+$wb['ssl_domain_txt'] = 'SSL Domain';
+$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
+$wb['ipv6_address_txt'] = 'IPv6-Address';
+$wb['errordocs_txt'] = 'Own Error-Documents';
+$wb['subdomain_txt'] = 'Auto-Subdomain';
$wb['domain_error_autosub'] = 'There is already a subdomain with these settings.';
$wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
$wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
@@ -62,7 +70,6 @@
$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
$wb['limit_traffic_quota_free_txt'] = 'Max. available Traffic Quota';
-$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
$wb['php_open_basedir_txt'] = 'PHP open_basedir';
$wb['traffic_quota_exceeded_txt'] = 'Traffic quota exceeded';
$wb['ruby_txt'] = 'Ruby';
@@ -71,8 +78,6 @@
$wb['custom_php_ini_txt'] = 'Custom php.ini settings';
$wb['none_txt'] = 'None';
$wb['disabled_txt'] = 'Disabled';
-$wb['no_redirect_txt'] = 'No redirect';
-$wb['no_flag_txt'] = 'No flag';
$wb['save_certificate_txt'] = 'Save certificate';
$wb['create_certificate_txt'] = 'Create certificate';
$wb['delete_certificate_txt'] = 'Delete certificate';
@@ -109,7 +114,6 @@
$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
-$wb['proxy_directives_txt'] = 'Proxy Directives';
-$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
$wb['Domain'] = 'Aliasdomain';
+
?>
diff --git a/interface/web/sites/lib/lang/hr_web_aliasdomain_list.lng b/interface/web/sites/lib/lang/hr_web_childdomain_list.lng
similarity index 75%
rename from interface/web/sites/lib/lang/hr_web_aliasdomain_list.lng
rename to interface/web/sites/lib/lang/hr_web_childdomain_list.lng
index 0b45aff..c8a344b 100644
--- a/interface/web/sites/lib/lang/hr_web_aliasdomain_list.lng
+++ b/interface/web/sites/lib/lang/hr_web_childdomain_list.lng
@@ -1,14 +1,15 @@
<?php
-$wb['list_head_txt'] = 'Alias domena';
+$wb['list_head_txt'] = 'Poddomene';
$wb['active_txt'] = 'Aktivno';
$wb['server_id_txt'] = 'Server';
$wb['parent_domain_id_txt'] = 'Web stranica';
-$wb['domain_txt'] = 'Alias domena';
-$wb['add_new_record_txt'] = 'Dodaj novu alias domenu';
+$wb['domain_txt'] = 'Poddomena';
+$wb['add_new_record_txt'] = 'Dodaj novu poddomenu';
$wb['domain_error_empty'] = 'Domena nije upisana.';
$wb['domain_error_unique'] = 'Domena mora biti unikatna.';
$wb['domain_error_regex'] = 'Nazive domene nije ispravan.';
$wb['no_redirect_txt'] = 'Bez redirekcije';
$wb['no_flag_txt'] = 'Bez označavanja';
$wb['none_txt'] = 'Ništa';
+
?>
diff --git a/interface/web/sites/lib/lang/hr_web_subdomain.lng b/interface/web/sites/lib/lang/hr_web_subdomain.lng
deleted file mode 100644
index 5ea6fff..0000000
--- a/interface/web/sites/lib/lang/hr_web_subdomain.lng
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-$wb['ssl_state_txt'] = 'Županija';
-$wb['ssl_locality_txt'] = 'Lokacija';
-$wb['ssl_organisation_txt'] = 'Organizacija';
-$wb['ssl_organisation_unit_txt'] = 'Organizacijski dio';
-$wb['ssl_country_txt'] = 'Država';
-$wb['ssl_request_txt'] = 'SSL zahtjev';
-$wb['ssl_cert_txt'] = 'SSL certifikat';
-$wb['ssl_bundle_txt'] = 'SSL paket';
-$wb['ssl_action_txt'] = 'SSL akcija';
-$wb['server_id_txt'] = 'Server';
-$wb['domain_txt'] = 'Domena';
-$wb['type_txt'] = 'Vrsta';
-$wb['parent_domain_id_txt'] = 'Početna web stranica';
-$wb['redirect_type_txt'] = 'Vrsta redirekcije';
-$wb['redirect_path_txt'] = 'Redirekcijska putanja';
-$wb['active_txt'] = 'Aktivno';
-$wb['document_root_txt'] = 'Documentroot';
-$wb['system_user_txt'] = 'Linux korisnik';
-$wb['system_group_txt'] = 'Linux grupa';
-$wb['ip_address_txt'] = 'IP adresa';
-$wb['vhost_type_txt'] = 'Vrsta VHosta';
-$wb['hd_quota_txt'] = 'Kvota diska';
-$wb['traffic_quota_txt'] = 'Promet web stranice';
-$wb['cgi_txt'] = 'CGI';
-$wb['ssi_txt'] = 'SSI';
-$wb['ssl_txt'] = 'SSL';
-$wb['suexec_txt'] = 'SuEXEC';
-$wb['php_txt'] = 'PHP';
-$wb['client_txt'] = 'Klijent';
-$wb['limit_web_domain_txt'] = 'Iskorišten je maksimalan broj domena.';
-$wb['limit_web_aliasdomain_txt'] = 'Iskorišten je maksimalan broj alias domena.';
-$wb['limit_web_subdomain_txt'] = 'Iskorišten je maksimalan broj poddomena.';
-$wb['apache_directives_txt'] = 'Apache direktive';
-$wb['domain_error_empty'] = 'Naziv domene je prazan.';
-$wb['domain_error_unique'] = 'Već postoji web stranica ili poddomena / alias sa nazivom te domene.';
-$wb['domain_error_regex'] = 'Naziv domene je neispravan.';
-$wb['host_txt'] = 'Host';
-$wb['redirect_error_regex'] = 'Neispravna putanja redirekcije. Ispravne redirekcije su npr.: /test/ ili http://www.domena.tld/test/';
-$wb['no_redirect_txt'] = 'Bez redirekcije';
-$wb['no_flag_txt'] = 'Bez markiranja';
-$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
-$wb['proxy_directives_txt'] = 'Proxy Directives';
-$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
-$wb['error_proxy_requires_url'] = 'Redirect Type \\"proxy\\" requires a URL as the redirect path.';
-?>
diff --git a/interface/web/sites/lib/lang/hr_web_subdomain_list.lng b/interface/web/sites/lib/lang/hr_web_subdomain_list.lng
deleted file mode 100644
index 942454e..0000000
--- a/interface/web/sites/lib/lang/hr_web_subdomain_list.lng
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Poddomene';
-$wb['active_txt'] = 'Aktivno';
-$wb['server_id_txt'] = 'Server';
-$wb['parent_domain_id_txt'] = 'Web stranica';
-$wb['domain_txt'] = 'Poddomena';
-$wb['add_new_record_txt'] = 'Dodaj novu poddomenu';
-?>
diff --git a/interface/web/sites/lib/lang/hu_web_aliasdomain.lng b/interface/web/sites/lib/lang/hu_web_aliasdomain.lng
deleted file mode 100644
index 4149c71..0000000
--- a/interface/web/sites/lib/lang/hu_web_aliasdomain.lng
+++ /dev/null
@@ -1,115 +0,0 @@
-<?php
-$wb['domain_txt'] = 'Aliasdomain';
-$wb['backup_interval_txt'] = 'Backup interval';
-$wb['backup_copies_txt'] = 'Number of backup copies';
-$wb['ssl_state_txt'] = 'State';
-$wb['ssl_locality_txt'] = 'Locality';
-$wb['ssl_organisation_txt'] = 'Organisation';
-$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
-$wb['ssl_country_txt'] = 'Country';
-$wb['ssl_key_txt'] = 'SSL Key';
-$wb['ssl_request_txt'] = 'SSL Request';
-$wb['ssl_cert_txt'] = 'SSL Certificate';
-$wb['ssl_bundle_txt'] = 'SSL Bundle';
-$wb['ssl_action_txt'] = 'SSL Action';
-$wb['ssl_domain_txt'] = 'SSL Domain';
-$wb['server_id_txt'] = 'Server';
-$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
-$wb['type_txt'] = 'Type';
-$wb['parent_domain_id_txt'] = 'Parent Website';
-$wb['redirect_type_txt'] = 'Redirect Type';
-$wb['redirect_path_txt'] = 'Redirect Path';
-$wb['active_txt'] = 'Active';
-$wb['document_root_txt'] = 'Documentroot';
-$wb['system_user_txt'] = 'Linux User';
-$wb['system_group_txt'] = 'Linux Group';
-$wb['ip_address_txt'] = 'IPv4-Address';
-$wb['ipv6_address_txt'] = 'IPv6-Address';
-$wb['vhost_type_txt'] = 'VHost Type';
-$wb['hd_quota_txt'] = 'Harddisk Quota';
-$wb['traffic_quota_txt'] = 'Traffic Quota';
-$wb['cgi_txt'] = 'CGI';
-$wb['ssi_txt'] = 'SSI';
-$wb['errordocs_txt'] = 'Own Error-Documents';
-$wb['subdomain_txt'] = 'Auto-Subdomain';
-$wb['ssl_txt'] = 'SSL';
-$wb['suexec_txt'] = 'SuEXEC';
-$wb['php_txt'] = 'PHP';
-$wb['client_txt'] = 'Client';
-$wb['limit_web_domain_txt'] = 'The max. number of web domains for your account is reached.';
-$wb['limit_web_aliasdomain_txt'] = 'The max. number of aliasdomains for your account is reached.';
-$wb['limit_web_subdomain_txt'] = 'The max. number of web subdomains for your account is reached.';
-$wb['apache_directives_txt'] = 'Apache Directives';
-$wb['domain_error_empty'] = 'Domain is empty.';
-$wb['domain_error_unique'] = 'There is already a website or sub / aliasdomain with this domain name.';
-$wb['domain_error_regex'] = 'Domain name invalid.';
-$wb['domain_error_autosub'] = 'There is already a subdomain with these settings.';
-$wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
-$wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
-$wb['error_ssl_state_empty'] = 'SSL State is empty.';
-$wb['error_ssl_locality_empty'] = 'SSL Locality is empty.';
-$wb['error_ssl_organisation_empty'] = 'SSL Organisation is empty.';
-$wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.';
-$wb['error_ssl_country_empty'] = 'SSL Country is empty.';
-$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
-$wb['client_group_id_txt'] = 'Client';
-$wb['stats_password_txt'] = 'Set Webstatistics password';
-$wb['allow_override_txt'] = 'Apache AllowOverride';
-$wb['limit_web_quota_free_txt'] = 'Max. available Harddisk Quota';
-$wb['ssl_state_error_regex'] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_locality_error_regex'] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_organisation_error_regex'] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
-$wb['limit_traffic_quota_free_txt'] = 'Max. available Traffic Quota';
-$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
-$wb['php_open_basedir_txt'] = 'PHP open_basedir';
-$wb['traffic_quota_exceeded_txt'] = 'Traffic quota exceeded';
-$wb['ruby_txt'] = 'Ruby';
-$wb['stats_user_txt'] = 'Webstatistics username';
-$wb['stats_type_txt'] = 'Webstatistics program';
-$wb['custom_php_ini_txt'] = 'Custom php.ini settings';
-$wb['none_txt'] = 'None';
-$wb['disabled_txt'] = 'Disabled';
-$wb['no_redirect_txt'] = 'No redirect';
-$wb['no_flag_txt'] = 'No flag';
-$wb['save_certificate_txt'] = 'Save certificate';
-$wb['create_certificate_txt'] = 'Create certificate';
-$wb['delete_certificate_txt'] = 'Delete certificate';
-$wb['nginx_directives_txt'] = 'nginx Directives';
-$wb['seo_redirect_txt'] = 'SEO Redirect';
-$wb['non_www_to_www_txt'] = 'Non-www -> www';
-$wb['www_to_non_www_txt'] = 'www -> non-www';
-$wb['php_fpm_use_socket_txt'] = 'Use Socket For PHP-FPM';
-$wb['error_no_sni_txt'] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
-$wb['python_txt'] = 'Python';
-$wb['perl_txt'] = 'Perl';
-$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
-$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
-$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
-$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
-$wb['error_php_fpm_pm_settings_txt'] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children >= pm.max_spare_servers >= pm.start_servers >= pm.min_spare_servers > 0';
-$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive integer value.';
-$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
-$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
-$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
-$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
-$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
-$wb['fastcgi_php_version_txt'] = 'PHP Version';
-$wb['pm_txt'] = 'PHP-FPM Process Manager';
-$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
-$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
-$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
-$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
-$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
-$wb['generate_password_txt'] = 'Generate Password';
-$wb['repeat_password_txt'] = 'Repeat Password';
-$wb['password_mismatch_txt'] = 'The passwords do not match.';
-$wb['password_match_txt'] = 'The passwords do match.';
-$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
-$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
-$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
-$wb['proxy_directives_txt'] = 'Proxy Directives';
-$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
-$wb['Domain'] = 'Aliasdomain';
-?>
diff --git a/interface/web/sites/lib/lang/ar_web_aliasdomain.lng b/interface/web/sites/lib/lang/hu_web_childdomain.lng
similarity index 76%
copy from interface/web/sites/lib/lang/ar_web_aliasdomain.lng
copy to interface/web/sites/lib/lang/hu_web_childdomain.lng
index 4149c71..c156b2e 100644
--- a/interface/web/sites/lib/lang/ar_web_aliasdomain.lng
+++ b/interface/web/sites/lib/lang/hu_web_childdomain.lng
@@ -1,48 +1,56 @@
<?php
-$wb['domain_txt'] = 'Aliasdomain';
-$wb['backup_interval_txt'] = 'Backup interval';
-$wb['backup_copies_txt'] = 'Number of backup copies';
-$wb['ssl_state_txt'] = 'State';
-$wb['ssl_locality_txt'] = 'Locality';
-$wb['ssl_organisation_txt'] = 'Organisation';
-$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
-$wb['ssl_country_txt'] = 'Country';
-$wb['ssl_key_txt'] = 'SSL Key';
-$wb['ssl_request_txt'] = 'SSL Request';
-$wb['ssl_cert_txt'] = 'SSL Certificate';
-$wb['ssl_bundle_txt'] = 'SSL Bundle';
-$wb['ssl_action_txt'] = 'SSL Action';
-$wb['ssl_domain_txt'] = 'SSL Domain';
-$wb['server_id_txt'] = 'Server';
-$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
-$wb['type_txt'] = 'Type';
-$wb['parent_domain_id_txt'] = 'Parent Website';
-$wb['redirect_type_txt'] = 'Redirect Type';
-$wb['redirect_path_txt'] = 'Redirect Path';
-$wb['active_txt'] = 'Active';
+$wb['ssl_state_txt'] = 'Megye';
+$wb['ssl_locality_txt'] = 'Város';
+$wb['ssl_organisation_txt'] = 'Cég';
+$wb['ssl_organisation_unit_txt'] = 'Osztály';
+$wb['ssl_country_txt'] = 'Ország';
+$wb['ssl_request_txt'] = 'SSL Kérés';
+$wb['ssl_cert_txt'] = 'SSL Tanúsítvány';
+$wb['ssl_bundle_txt'] = 'SSL Csomag';
+$wb['ssl_action_txt'] = 'SSL Akció';
+$wb['server_id_txt'] = 'Szrver';
+$wb['domain_txt'] = 'Domain';
+$wb['type_txt'] = 'Típus';
+$wb['parent_domain_id_txt'] = 'Szülő webhely';
+$wb['redirect_type_txt'] = 'Átirányítás típusa';
+$wb['redirect_path_txt'] = 'Az Átirányitás útvonala';
+$wb['active_txt'] = 'Aktív';
$wb['document_root_txt'] = 'Documentroot';
-$wb['system_user_txt'] = 'Linux User';
-$wb['system_group_txt'] = 'Linux Group';
-$wb['ip_address_txt'] = 'IPv4-Address';
-$wb['ipv6_address_txt'] = 'IPv6-Address';
-$wb['vhost_type_txt'] = 'VHost Type';
-$wb['hd_quota_txt'] = 'Harddisk Quota';
-$wb['traffic_quota_txt'] = 'Traffic Quota';
+$wb['system_user_txt'] = 'Linux Felhasználó';
+$wb['system_group_txt'] = 'Linux Csoport';
+$wb['ip_address_txt'] = 'IP-cím';
+$wb['vhost_type_txt'] = 'VHost Típus';
+$wb['hd_quota_txt'] = 'Tárhely Kvóta';
+$wb['traffic_quota_txt'] = 'Forgalom Kvóta';
$wb['cgi_txt'] = 'CGI';
$wb['ssi_txt'] = 'SSI';
-$wb['errordocs_txt'] = 'Own Error-Documents';
-$wb['subdomain_txt'] = 'Auto-Subdomain';
$wb['ssl_txt'] = 'SSL';
$wb['suexec_txt'] = 'SuEXEC';
$wb['php_txt'] = 'PHP';
-$wb['client_txt'] = 'Client';
-$wb['limit_web_domain_txt'] = 'The max. number of web domains for your account is reached.';
-$wb['limit_web_aliasdomain_txt'] = 'The max. number of aliasdomains for your account is reached.';
-$wb['limit_web_subdomain_txt'] = 'The max. number of web subdomains for your account is reached.';
-$wb['apache_directives_txt'] = 'Apache Directives';
-$wb['domain_error_empty'] = 'Domain is empty.';
-$wb['domain_error_unique'] = 'There is already a website or sub / aliasdomain with this domain name.';
-$wb['domain_error_regex'] = 'Domain name invalid.';
+$wb['client_txt'] = 'Ügyfél';
+$wb['limit_web_domain_txt'] = 'Nincs több weboldal lehetőség.';
+$wb['limit_web_aliasdomain_txt'] = 'Nincs több aliasdomain lehetőség';
+$wb['limit_web_subdomain_txt'] = 'Nincs több aldomain lehetőség.';
+$wb['apache_directives_txt'] = 'Apache direktivák';
+$wb['domain_error_empty'] = 'A Domain üres';
+$wb['domain_error_unique'] = 'A Domain már foglalt.';
+$wb['domain_error_regex'] = 'A Domain név érvénytelen';
+$wb['host_txt'] = 'Állomás';
+$wb['no_redirect_txt'] = 'Nincs átirányítás';
+$wb['no_flag_txt'] = 'No flag';
+$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
+$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
+$wb['proxy_directives_txt'] = 'Proxy Directives';
+$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
+$wb['error_proxy_requires_url'] = 'Redirect Type \"proxy\" requires a URL as the redirect path.';
+$wb['backup_interval_txt'] = 'Backup interval';
+$wb['backup_copies_txt'] = 'Number of backup copies';
+$wb['ssl_key_txt'] = 'SSL Key';
+$wb['ssl_domain_txt'] = 'SSL Domain';
+$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
+$wb['ipv6_address_txt'] = 'IPv6-Address';
+$wb['errordocs_txt'] = 'Own Error-Documents';
+$wb['subdomain_txt'] = 'Auto-Subdomain';
$wb['domain_error_autosub'] = 'There is already a subdomain with these settings.';
$wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
$wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
@@ -62,7 +70,6 @@
$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
$wb['limit_traffic_quota_free_txt'] = 'Max. available Traffic Quota';
-$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
$wb['php_open_basedir_txt'] = 'PHP open_basedir';
$wb['traffic_quota_exceeded_txt'] = 'Traffic quota exceeded';
$wb['ruby_txt'] = 'Ruby';
@@ -71,8 +78,6 @@
$wb['custom_php_ini_txt'] = 'Custom php.ini settings';
$wb['none_txt'] = 'None';
$wb['disabled_txt'] = 'Disabled';
-$wb['no_redirect_txt'] = 'No redirect';
-$wb['no_flag_txt'] = 'No flag';
$wb['save_certificate_txt'] = 'Save certificate';
$wb['create_certificate_txt'] = 'Create certificate';
$wb['delete_certificate_txt'] = 'Delete certificate';
@@ -109,7 +114,6 @@
$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
-$wb['proxy_directives_txt'] = 'Proxy Directives';
-$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
$wb['Domain'] = 'Aliasdomain';
+
?>
diff --git a/interface/web/sites/lib/lang/hu_web_aliasdomain_list.lng b/interface/web/sites/lib/lang/hu_web_childdomain_list.lng
similarity index 66%
rename from interface/web/sites/lib/lang/hu_web_aliasdomain_list.lng
rename to interface/web/sites/lib/lang/hu_web_childdomain_list.lng
index 955316b..e40ed1e 100644
--- a/interface/web/sites/lib/lang/hu_web_aliasdomain_list.lng
+++ b/interface/web/sites/lib/lang/hu_web_childdomain_list.lng
@@ -1,14 +1,15 @@
<?php
-$wb['list_head_txt'] = 'Aliasdomain';
+$wb['list_head_txt'] = 'Aldomainek';
$wb['active_txt'] = 'Aktív';
$wb['server_id_txt'] = 'Szerver';
-$wb['parent_domain_id_txt'] = 'Webhely';
-$wb['domain_txt'] = 'Aliasdomain';
-$wb['add_new_record_txt'] = 'Új Aliasdomain';
+$wb['parent_domain_id_txt'] = 'Weboldal';
+$wb['domain_txt'] = 'aldomain';
+$wb['add_new_record_txt'] = 'Új Aldomain';
$wb['domain_error_empty'] = 'Domain üres';
$wb['domain_error_unique'] = 'Domain már foglalt.';
$wb['domain_error_regex'] = 'Domain név hibás.';
$wb['no_redirect_txt'] = 'No redirect';
$wb['no_flag_txt'] = 'No flag';
$wb['none_txt'] = 'None';
+
?>
diff --git a/interface/web/sites/lib/lang/hu_web_subdomain.lng b/interface/web/sites/lib/lang/hu_web_subdomain.lng
deleted file mode 100644
index b629c3f..0000000
--- a/interface/web/sites/lib/lang/hu_web_subdomain.lng
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-$wb['ssl_state_txt'] = 'Megye';
-$wb['ssl_locality_txt'] = 'Város';
-$wb['ssl_organisation_txt'] = 'Cég';
-$wb['ssl_organisation_unit_txt'] = 'Osztály';
-$wb['ssl_country_txt'] = 'Ország';
-$wb['ssl_request_txt'] = 'SSL Kérés';
-$wb['ssl_cert_txt'] = 'SSL Tanúsítvány';
-$wb['ssl_bundle_txt'] = 'SSL Csomag';
-$wb['ssl_action_txt'] = 'SSL Akció';
-$wb['server_id_txt'] = 'Szrver';
-$wb['domain_txt'] = 'Domain';
-$wb['type_txt'] = 'Típus';
-$wb['parent_domain_id_txt'] = 'Szülő webhely';
-$wb['redirect_type_txt'] = 'Átirányítás típusa';
-$wb['redirect_path_txt'] = 'Az Átirányitás útvonala';
-$wb['active_txt'] = 'Aktív';
-$wb['document_root_txt'] = 'Documentroot';
-$wb['system_user_txt'] = 'Linux Felhasználó';
-$wb['system_group_txt'] = 'Linux Csoport';
-$wb['ip_address_txt'] = 'IP-cím';
-$wb['vhost_type_txt'] = 'VHost Típus';
-$wb['hd_quota_txt'] = 'Tárhely Kvóta';
-$wb['traffic_quota_txt'] = 'Forgalom Kvóta';
-$wb['cgi_txt'] = 'CGI';
-$wb['ssi_txt'] = 'SSI';
-$wb['ssl_txt'] = 'SSL';
-$wb['suexec_txt'] = 'SuEXEC';
-$wb['php_txt'] = 'PHP';
-$wb['client_txt'] = 'Ügyfél';
-$wb['limit_web_domain_txt'] = 'Nincs több weboldal lehetőség.';
-$wb['limit_web_aliasdomain_txt'] = 'Nincs több aliasdomain lehetőség';
-$wb['limit_web_subdomain_txt'] = 'Nincs több aldomain lehetőség.';
-$wb['apache_directives_txt'] = 'Apache direktivák';
-$wb['domain_error_empty'] = 'A Domain üres';
-$wb['domain_error_unique'] = 'A Domain már foglalt.';
-$wb['domain_error_regex'] = 'A Domain név érvénytelen';
-$wb['host_txt'] = 'Állomás';
-$wb['no_redirect_txt'] = 'Nincs átirányítás';
-$wb['no_flag_txt'] = 'No flag';
-$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
-$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
-$wb['proxy_directives_txt'] = 'Proxy Directives';
-$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
-$wb['error_proxy_requires_url'] = 'Redirect Type \\"proxy\\" requires a URL as the redirect path.';
-?>
diff --git a/interface/web/sites/lib/lang/hu_web_subdomain_list.lng b/interface/web/sites/lib/lang/hu_web_subdomain_list.lng
deleted file mode 100644
index 65aade6..0000000
--- a/interface/web/sites/lib/lang/hu_web_subdomain_list.lng
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Aldomainek';
-$wb['active_txt'] = 'Aktív';
-$wb['server_id_txt'] = 'Szerver';
-$wb['parent_domain_id_txt'] = 'Weboldal';
-$wb['domain_txt'] = 'aldomain';
-$wb['add_new_record_txt'] = 'Új Aldomain';
-?>
diff --git a/interface/web/sites/lib/lang/id_web_aliasdomain.lng b/interface/web/sites/lib/lang/id_web_aliasdomain.lng
deleted file mode 100644
index 4149c71..0000000
--- a/interface/web/sites/lib/lang/id_web_aliasdomain.lng
+++ /dev/null
@@ -1,115 +0,0 @@
-<?php
-$wb['domain_txt'] = 'Aliasdomain';
-$wb['backup_interval_txt'] = 'Backup interval';
-$wb['backup_copies_txt'] = 'Number of backup copies';
-$wb['ssl_state_txt'] = 'State';
-$wb['ssl_locality_txt'] = 'Locality';
-$wb['ssl_organisation_txt'] = 'Organisation';
-$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
-$wb['ssl_country_txt'] = 'Country';
-$wb['ssl_key_txt'] = 'SSL Key';
-$wb['ssl_request_txt'] = 'SSL Request';
-$wb['ssl_cert_txt'] = 'SSL Certificate';
-$wb['ssl_bundle_txt'] = 'SSL Bundle';
-$wb['ssl_action_txt'] = 'SSL Action';
-$wb['ssl_domain_txt'] = 'SSL Domain';
-$wb['server_id_txt'] = 'Server';
-$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
-$wb['type_txt'] = 'Type';
-$wb['parent_domain_id_txt'] = 'Parent Website';
-$wb['redirect_type_txt'] = 'Redirect Type';
-$wb['redirect_path_txt'] = 'Redirect Path';
-$wb['active_txt'] = 'Active';
-$wb['document_root_txt'] = 'Documentroot';
-$wb['system_user_txt'] = 'Linux User';
-$wb['system_group_txt'] = 'Linux Group';
-$wb['ip_address_txt'] = 'IPv4-Address';
-$wb['ipv6_address_txt'] = 'IPv6-Address';
-$wb['vhost_type_txt'] = 'VHost Type';
-$wb['hd_quota_txt'] = 'Harddisk Quota';
-$wb['traffic_quota_txt'] = 'Traffic Quota';
-$wb['cgi_txt'] = 'CGI';
-$wb['ssi_txt'] = 'SSI';
-$wb['errordocs_txt'] = 'Own Error-Documents';
-$wb['subdomain_txt'] = 'Auto-Subdomain';
-$wb['ssl_txt'] = 'SSL';
-$wb['suexec_txt'] = 'SuEXEC';
-$wb['php_txt'] = 'PHP';
-$wb['client_txt'] = 'Client';
-$wb['limit_web_domain_txt'] = 'The max. number of web domains for your account is reached.';
-$wb['limit_web_aliasdomain_txt'] = 'The max. number of aliasdomains for your account is reached.';
-$wb['limit_web_subdomain_txt'] = 'The max. number of web subdomains for your account is reached.';
-$wb['apache_directives_txt'] = 'Apache Directives';
-$wb['domain_error_empty'] = 'Domain is empty.';
-$wb['domain_error_unique'] = 'There is already a website or sub / aliasdomain with this domain name.';
-$wb['domain_error_regex'] = 'Domain name invalid.';
-$wb['domain_error_autosub'] = 'There is already a subdomain with these settings.';
-$wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
-$wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
-$wb['error_ssl_state_empty'] = 'SSL State is empty.';
-$wb['error_ssl_locality_empty'] = 'SSL Locality is empty.';
-$wb['error_ssl_organisation_empty'] = 'SSL Organisation is empty.';
-$wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.';
-$wb['error_ssl_country_empty'] = 'SSL Country is empty.';
-$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
-$wb['client_group_id_txt'] = 'Client';
-$wb['stats_password_txt'] = 'Set Webstatistics password';
-$wb['allow_override_txt'] = 'Apache AllowOverride';
-$wb['limit_web_quota_free_txt'] = 'Max. available Harddisk Quota';
-$wb['ssl_state_error_regex'] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_locality_error_regex'] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_organisation_error_regex'] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
-$wb['limit_traffic_quota_free_txt'] = 'Max. available Traffic Quota';
-$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
-$wb['php_open_basedir_txt'] = 'PHP open_basedir';
-$wb['traffic_quota_exceeded_txt'] = 'Traffic quota exceeded';
-$wb['ruby_txt'] = 'Ruby';
-$wb['stats_user_txt'] = 'Webstatistics username';
-$wb['stats_type_txt'] = 'Webstatistics program';
-$wb['custom_php_ini_txt'] = 'Custom php.ini settings';
-$wb['none_txt'] = 'None';
-$wb['disabled_txt'] = 'Disabled';
-$wb['no_redirect_txt'] = 'No redirect';
-$wb['no_flag_txt'] = 'No flag';
-$wb['save_certificate_txt'] = 'Save certificate';
-$wb['create_certificate_txt'] = 'Create certificate';
-$wb['delete_certificate_txt'] = 'Delete certificate';
-$wb['nginx_directives_txt'] = 'nginx Directives';
-$wb['seo_redirect_txt'] = 'SEO Redirect';
-$wb['non_www_to_www_txt'] = 'Non-www -> www';
-$wb['www_to_non_www_txt'] = 'www -> non-www';
-$wb['php_fpm_use_socket_txt'] = 'Use Socket For PHP-FPM';
-$wb['error_no_sni_txt'] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
-$wb['python_txt'] = 'Python';
-$wb['perl_txt'] = 'Perl';
-$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
-$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
-$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
-$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
-$wb['error_php_fpm_pm_settings_txt'] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children >= pm.max_spare_servers >= pm.start_servers >= pm.min_spare_servers > 0';
-$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive integer value.';
-$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
-$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
-$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
-$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
-$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
-$wb['fastcgi_php_version_txt'] = 'PHP Version';
-$wb['pm_txt'] = 'PHP-FPM Process Manager';
-$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
-$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
-$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
-$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
-$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
-$wb['generate_password_txt'] = 'Generate Password';
-$wb['repeat_password_txt'] = 'Repeat Password';
-$wb['password_mismatch_txt'] = 'The passwords do not match.';
-$wb['password_match_txt'] = 'The passwords do match.';
-$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
-$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
-$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
-$wb['proxy_directives_txt'] = 'Proxy Directives';
-$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
-$wb['Domain'] = 'Aliasdomain';
-?>
diff --git a/interface/web/sites/lib/lang/ar_web_aliasdomain.lng b/interface/web/sites/lib/lang/id_web_childdomain.lng
similarity index 76%
copy from interface/web/sites/lib/lang/ar_web_aliasdomain.lng
copy to interface/web/sites/lib/lang/id_web_childdomain.lng
index 4149c71..91abd0a 100644
--- a/interface/web/sites/lib/lang/ar_web_aliasdomain.lng
+++ b/interface/web/sites/lib/lang/id_web_childdomain.lng
@@ -1,48 +1,56 @@
<?php
-$wb['domain_txt'] = 'Aliasdomain';
-$wb['backup_interval_txt'] = 'Backup interval';
-$wb['backup_copies_txt'] = 'Number of backup copies';
-$wb['ssl_state_txt'] = 'State';
-$wb['ssl_locality_txt'] = 'Locality';
-$wb['ssl_organisation_txt'] = 'Organisation';
-$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
-$wb['ssl_country_txt'] = 'Country';
-$wb['ssl_key_txt'] = 'SSL Key';
+$wb['ssl_state_txt'] = 'Negara Bagian';
+$wb['ssl_locality_txt'] = 'Daerah';
+$wb['ssl_organisation_txt'] = 'Organisasi';
+$wb['ssl_organisation_unit_txt'] = 'Unit Organisasi';
+$wb['ssl_country_txt'] = 'Negara';
$wb['ssl_request_txt'] = 'SSL Request';
-$wb['ssl_cert_txt'] = 'SSL Certificate';
+$wb['ssl_cert_txt'] = 'Sertifikat SSL';
$wb['ssl_bundle_txt'] = 'SSL Bundle';
$wb['ssl_action_txt'] = 'SSL Action';
-$wb['ssl_domain_txt'] = 'SSL Domain';
$wb['server_id_txt'] = 'Server';
-$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
-$wb['type_txt'] = 'Type';
-$wb['parent_domain_id_txt'] = 'Parent Website';
-$wb['redirect_type_txt'] = 'Redirect Type';
-$wb['redirect_path_txt'] = 'Redirect Path';
-$wb['active_txt'] = 'Active';
-$wb['document_root_txt'] = 'Documentroot';
-$wb['system_user_txt'] = 'Linux User';
-$wb['system_group_txt'] = 'Linux Group';
-$wb['ip_address_txt'] = 'IPv4-Address';
-$wb['ipv6_address_txt'] = 'IPv6-Address';
-$wb['vhost_type_txt'] = 'VHost Type';
-$wb['hd_quota_txt'] = 'Harddisk Quota';
-$wb['traffic_quota_txt'] = 'Traffic Quota';
+$wb['domain_txt'] = 'Domain';
+$wb['type_txt'] = 'Tipe';
+$wb['parent_domain_id_txt'] = 'Situs Web Induk';
+$wb['redirect_type_txt'] = 'Tipe Pengalihan';
+$wb['redirect_path_txt'] = 'Path Pengalihan';
+$wb['active_txt'] = 'Aktif';
+$wb['document_root_txt'] = 'Root Dokumen';
+$wb['system_user_txt'] = 'Pengguna Linux';
+$wb['system_group_txt'] = 'Grup Linux';
+$wb['ip_address_txt'] = 'Alamat IP';
+$wb['vhost_type_txt'] = 'Tipe VHost';
+$wb['hd_quota_txt'] = 'Kuota Harddisk';
+$wb['traffic_quota_txt'] = 'Kuota Trafik';
$wb['cgi_txt'] = 'CGI';
$wb['ssi_txt'] = 'SSI';
-$wb['errordocs_txt'] = 'Own Error-Documents';
-$wb['subdomain_txt'] = 'Auto-Subdomain';
$wb['ssl_txt'] = 'SSL';
$wb['suexec_txt'] = 'SuEXEC';
$wb['php_txt'] = 'PHP';
-$wb['client_txt'] = 'Client';
-$wb['limit_web_domain_txt'] = 'The max. number of web domains for your account is reached.';
-$wb['limit_web_aliasdomain_txt'] = 'The max. number of aliasdomains for your account is reached.';
-$wb['limit_web_subdomain_txt'] = 'The max. number of web subdomains for your account is reached.';
-$wb['apache_directives_txt'] = 'Apache Directives';
-$wb['domain_error_empty'] = 'Domain is empty.';
-$wb['domain_error_unique'] = 'There is already a website or sub / aliasdomain with this domain name.';
-$wb['domain_error_regex'] = 'Domain name invalid.';
+$wb['client_txt'] = 'Klien';
+$wb['limit_web_domain_txt'] = 'Jumlah maks domain web untuk akun Anda telah tercapai.';
+$wb['limit_web_aliasdomain_txt'] = 'Jumlah maks aliasdomain untuk akun Anda telah tercapai.';
+$wb['limit_web_subdomain_txt'] = 'Jumlah maks subdomain web untuk akun Anda telah tercapai.';
+$wb['apache_directives_txt'] = 'Perintah-perintah Apache';
+$wb['domain_error_empty'] = 'Domain kosong.';
+$wb['domain_error_unique'] = 'Sudah ada situs web atau sub / aliasdomain pada nama domain ini.';
+$wb['domain_error_regex'] = 'Nama Domain tidak valid.';
+$wb['host_txt'] = 'Host';
+$wb['redirect_error_regex'] = 'Path pengalihan tidak valid. Contoh pengalihan yang valid: /test/ or http://www.domain.tld/test/';
+$wb['no_redirect_txt'] = 'No redirect';
+$wb['no_flag_txt'] = 'No flag';
+$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
+$wb['proxy_directives_txt'] = 'Proxy Directives';
+$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
+$wb['error_proxy_requires_url'] = 'Redirect Type \"proxy\" requires a URL as the redirect path.';
+$wb['backup_interval_txt'] = 'Backup interval';
+$wb['backup_copies_txt'] = 'Number of backup copies';
+$wb['ssl_key_txt'] = 'SSL Key';
+$wb['ssl_domain_txt'] = 'SSL Domain';
+$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
+$wb['ipv6_address_txt'] = 'IPv6-Address';
+$wb['errordocs_txt'] = 'Own Error-Documents';
+$wb['subdomain_txt'] = 'Auto-Subdomain';
$wb['domain_error_autosub'] = 'There is already a subdomain with these settings.';
$wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
$wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
@@ -62,7 +70,6 @@
$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
$wb['limit_traffic_quota_free_txt'] = 'Max. available Traffic Quota';
-$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
$wb['php_open_basedir_txt'] = 'PHP open_basedir';
$wb['traffic_quota_exceeded_txt'] = 'Traffic quota exceeded';
$wb['ruby_txt'] = 'Ruby';
@@ -71,8 +78,6 @@
$wb['custom_php_ini_txt'] = 'Custom php.ini settings';
$wb['none_txt'] = 'None';
$wb['disabled_txt'] = 'Disabled';
-$wb['no_redirect_txt'] = 'No redirect';
-$wb['no_flag_txt'] = 'No flag';
$wb['save_certificate_txt'] = 'Save certificate';
$wb['create_certificate_txt'] = 'Create certificate';
$wb['delete_certificate_txt'] = 'Delete certificate';
@@ -109,7 +114,6 @@
$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
-$wb['proxy_directives_txt'] = 'Proxy Directives';
-$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
$wb['Domain'] = 'Aliasdomain';
+
?>
diff --git a/interface/web/sites/lib/lang/id_web_aliasdomain_list.lng b/interface/web/sites/lib/lang/id_web_childdomain_list.lng
similarity index 73%
rename from interface/web/sites/lib/lang/id_web_aliasdomain_list.lng
rename to interface/web/sites/lib/lang/id_web_childdomain_list.lng
index e28071c..2720519 100644
--- a/interface/web/sites/lib/lang/id_web_aliasdomain_list.lng
+++ b/interface/web/sites/lib/lang/id_web_childdomain_list.lng
@@ -1,14 +1,15 @@
<?php
-$wb['list_head_txt'] = 'Alias Domain';
+$wb['list_head_txt'] = 'Subdomain';
$wb['active_txt'] = 'Aktif';
$wb['server_id_txt'] = 'Server';
$wb['parent_domain_id_txt'] = 'Situs Web';
-$wb['domain_txt'] = 'Alias Domain';
-$wb['add_new_record_txt'] = 'Tambah Alias Domain Baru';
+$wb['domain_txt'] = 'Subdomain';
+$wb['add_new_record_txt'] = 'Tambah Subdomain Baru';
$wb['domain_error_empty'] = 'Domain kosong.';
$wb['domain_error_unique'] = 'Domain harus unik.';
$wb['domain_error_regex'] = 'Nama Domain tidak valid.';
$wb['no_redirect_txt'] = 'No redirect';
$wb['no_flag_txt'] = 'No flag';
$wb['none_txt'] = 'None';
+
?>
diff --git a/interface/web/sites/lib/lang/id_web_subdomain.lng b/interface/web/sites/lib/lang/id_web_subdomain.lng
deleted file mode 100644
index 79672f6..0000000
--- a/interface/web/sites/lib/lang/id_web_subdomain.lng
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-$wb['ssl_state_txt'] = 'Negara Bagian';
-$wb['ssl_locality_txt'] = 'Daerah';
-$wb['ssl_organisation_txt'] = 'Organisasi';
-$wb['ssl_organisation_unit_txt'] = 'Unit Organisasi';
-$wb['ssl_country_txt'] = 'Negara';
-$wb['ssl_request_txt'] = 'SSL Request';
-$wb['ssl_cert_txt'] = 'Sertifikat SSL';
-$wb['ssl_bundle_txt'] = 'SSL Bundle';
-$wb['ssl_action_txt'] = 'SSL Action';
-$wb['server_id_txt'] = 'Server';
-$wb['domain_txt'] = 'Domain';
-$wb['type_txt'] = 'Tipe';
-$wb['parent_domain_id_txt'] = 'Situs Web Induk';
-$wb['redirect_type_txt'] = 'Tipe Pengalihan';
-$wb['redirect_path_txt'] = 'Path Pengalihan';
-$wb['active_txt'] = 'Aktif';
-$wb['document_root_txt'] = 'Root Dokumen';
-$wb['system_user_txt'] = 'Pengguna Linux';
-$wb['system_group_txt'] = 'Grup Linux';
-$wb['ip_address_txt'] = 'Alamat IP';
-$wb['vhost_type_txt'] = 'Tipe VHost';
-$wb['hd_quota_txt'] = 'Kuota Harddisk';
-$wb['traffic_quota_txt'] = 'Kuota Trafik';
-$wb['cgi_txt'] = 'CGI';
-$wb['ssi_txt'] = 'SSI';
-$wb['ssl_txt'] = 'SSL';
-$wb['suexec_txt'] = 'SuEXEC';
-$wb['php_txt'] = 'PHP';
-$wb['client_txt'] = 'Klien';
-$wb['limit_web_domain_txt'] = 'Jumlah maks domain web untuk akun Anda telah tercapai.';
-$wb['limit_web_aliasdomain_txt'] = 'Jumlah maks aliasdomain untuk akun Anda telah tercapai.';
-$wb['limit_web_subdomain_txt'] = 'Jumlah maks subdomain web untuk akun Anda telah tercapai.';
-$wb['apache_directives_txt'] = 'Perintah-perintah Apache';
-$wb['domain_error_empty'] = 'Domain kosong.';
-$wb['domain_error_unique'] = 'Sudah ada situs web atau sub / aliasdomain pada nama domain ini.';
-$wb['domain_error_regex'] = 'Nama Domain tidak valid.';
-$wb['host_txt'] = 'Host';
-$wb['redirect_error_regex'] = 'Path pengalihan tidak valid. Contoh pengalihan yang valid: /test/ or http://www.domain.tld/test/';
-$wb['no_redirect_txt'] = 'No redirect';
-$wb['no_flag_txt'] = 'No flag';
-$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
-$wb['proxy_directives_txt'] = 'Proxy Directives';
-$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
-$wb['error_proxy_requires_url'] = 'Redirect Type \\"proxy\\" requires a URL as the redirect path.';
-?>
diff --git a/interface/web/sites/lib/lang/id_web_subdomain_list.lng b/interface/web/sites/lib/lang/id_web_subdomain_list.lng
deleted file mode 100644
index a231bc7..0000000
--- a/interface/web/sites/lib/lang/id_web_subdomain_list.lng
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Subdomain';
-$wb['active_txt'] = 'Aktif';
-$wb['server_id_txt'] = 'Server';
-$wb['parent_domain_id_txt'] = 'Situs Web';
-$wb['domain_txt'] = 'Subdomain';
-$wb['add_new_record_txt'] = 'Tambah Subdomain Baru';
-?>
diff --git a/interface/web/sites/lib/lang/it_web_aliasdomain.lng b/interface/web/sites/lib/lang/it_web_aliasdomain.lng
deleted file mode 100644
index 4149c71..0000000
--- a/interface/web/sites/lib/lang/it_web_aliasdomain.lng
+++ /dev/null
@@ -1,115 +0,0 @@
-<?php
-$wb['domain_txt'] = 'Aliasdomain';
-$wb['backup_interval_txt'] = 'Backup interval';
-$wb['backup_copies_txt'] = 'Number of backup copies';
-$wb['ssl_state_txt'] = 'State';
-$wb['ssl_locality_txt'] = 'Locality';
-$wb['ssl_organisation_txt'] = 'Organisation';
-$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
-$wb['ssl_country_txt'] = 'Country';
-$wb['ssl_key_txt'] = 'SSL Key';
-$wb['ssl_request_txt'] = 'SSL Request';
-$wb['ssl_cert_txt'] = 'SSL Certificate';
-$wb['ssl_bundle_txt'] = 'SSL Bundle';
-$wb['ssl_action_txt'] = 'SSL Action';
-$wb['ssl_domain_txt'] = 'SSL Domain';
-$wb['server_id_txt'] = 'Server';
-$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
-$wb['type_txt'] = 'Type';
-$wb['parent_domain_id_txt'] = 'Parent Website';
-$wb['redirect_type_txt'] = 'Redirect Type';
-$wb['redirect_path_txt'] = 'Redirect Path';
-$wb['active_txt'] = 'Active';
-$wb['document_root_txt'] = 'Documentroot';
-$wb['system_user_txt'] = 'Linux User';
-$wb['system_group_txt'] = 'Linux Group';
-$wb['ip_address_txt'] = 'IPv4-Address';
-$wb['ipv6_address_txt'] = 'IPv6-Address';
-$wb['vhost_type_txt'] = 'VHost Type';
-$wb['hd_quota_txt'] = 'Harddisk Quota';
-$wb['traffic_quota_txt'] = 'Traffic Quota';
-$wb['cgi_txt'] = 'CGI';
-$wb['ssi_txt'] = 'SSI';
-$wb['errordocs_txt'] = 'Own Error-Documents';
-$wb['subdomain_txt'] = 'Auto-Subdomain';
-$wb['ssl_txt'] = 'SSL';
-$wb['suexec_txt'] = 'SuEXEC';
-$wb['php_txt'] = 'PHP';
-$wb['client_txt'] = 'Client';
-$wb['limit_web_domain_txt'] = 'The max. number of web domains for your account is reached.';
-$wb['limit_web_aliasdomain_txt'] = 'The max. number of aliasdomains for your account is reached.';
-$wb['limit_web_subdomain_txt'] = 'The max. number of web subdomains for your account is reached.';
-$wb['apache_directives_txt'] = 'Apache Directives';
-$wb['domain_error_empty'] = 'Domain is empty.';
-$wb['domain_error_unique'] = 'There is already a website or sub / aliasdomain with this domain name.';
-$wb['domain_error_regex'] = 'Domain name invalid.';
-$wb['domain_error_autosub'] = 'There is already a subdomain with these settings.';
-$wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
-$wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
-$wb['error_ssl_state_empty'] = 'SSL State is empty.';
-$wb['error_ssl_locality_empty'] = 'SSL Locality is empty.';
-$wb['error_ssl_organisation_empty'] = 'SSL Organisation is empty.';
-$wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.';
-$wb['error_ssl_country_empty'] = 'SSL Country is empty.';
-$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
-$wb['client_group_id_txt'] = 'Client';
-$wb['stats_password_txt'] = 'Set Webstatistics password';
-$wb['allow_override_txt'] = 'Apache AllowOverride';
-$wb['limit_web_quota_free_txt'] = 'Max. available Harddisk Quota';
-$wb['ssl_state_error_regex'] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_locality_error_regex'] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_organisation_error_regex'] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
-$wb['limit_traffic_quota_free_txt'] = 'Max. available Traffic Quota';
-$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
-$wb['php_open_basedir_txt'] = 'PHP open_basedir';
-$wb['traffic_quota_exceeded_txt'] = 'Traffic quota exceeded';
-$wb['ruby_txt'] = 'Ruby';
-$wb['stats_user_txt'] = 'Webstatistics username';
-$wb['stats_type_txt'] = 'Webstatistics program';
-$wb['custom_php_ini_txt'] = 'Custom php.ini settings';
-$wb['none_txt'] = 'None';
-$wb['disabled_txt'] = 'Disabled';
-$wb['no_redirect_txt'] = 'No redirect';
-$wb['no_flag_txt'] = 'No flag';
-$wb['save_certificate_txt'] = 'Save certificate';
-$wb['create_certificate_txt'] = 'Create certificate';
-$wb['delete_certificate_txt'] = 'Delete certificate';
-$wb['nginx_directives_txt'] = 'nginx Directives';
-$wb['seo_redirect_txt'] = 'SEO Redirect';
-$wb['non_www_to_www_txt'] = 'Non-www -> www';
-$wb['www_to_non_www_txt'] = 'www -> non-www';
-$wb['php_fpm_use_socket_txt'] = 'Use Socket For PHP-FPM';
-$wb['error_no_sni_txt'] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
-$wb['python_txt'] = 'Python';
-$wb['perl_txt'] = 'Perl';
-$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
-$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
-$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
-$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
-$wb['error_php_fpm_pm_settings_txt'] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children >= pm.max_spare_servers >= pm.start_servers >= pm.min_spare_servers > 0';
-$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive integer value.';
-$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
-$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
-$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
-$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
-$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
-$wb['fastcgi_php_version_txt'] = 'PHP Version';
-$wb['pm_txt'] = 'PHP-FPM Process Manager';
-$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
-$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
-$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
-$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
-$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
-$wb['generate_password_txt'] = 'Generate Password';
-$wb['repeat_password_txt'] = 'Repeat Password';
-$wb['password_mismatch_txt'] = 'The passwords do not match.';
-$wb['password_match_txt'] = 'The passwords do match.';
-$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
-$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
-$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
-$wb['proxy_directives_txt'] = 'Proxy Directives';
-$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
-$wb['Domain'] = 'Aliasdomain';
-?>
diff --git a/interface/web/sites/lib/lang/it_web_aliasdomain_list.lng b/interface/web/sites/lib/lang/it_web_aliasdomain_list.lng
deleted file mode 100644
index 8ea34c4..0000000
--- a/interface/web/sites/lib/lang/it_web_aliasdomain_list.lng
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Aliasdomain';
-$wb['active_txt'] = 'Active';
-$wb['server_id_txt'] = 'Server';
-$wb['parent_domain_id_txt'] = 'Website';
-$wb['domain_txt'] = 'Aliasdomain';
-$wb['add_new_record_txt'] = 'Add new aliasdomain';
-$wb['domain_error_empty'] = 'Domain is empty.';
-$wb['domain_error_unique'] = 'Domain must be unique.';
-$wb['domain_error_regex'] = 'Domain name invalid.';
-$wb['no_redirect_txt'] = 'No redirect';
-$wb['no_flag_txt'] = 'No flag';
-$wb['none_txt'] = 'None';
-?>
diff --git a/interface/web/sites/lib/lang/ar_web_aliasdomain.lng b/interface/web/sites/lib/lang/it_web_childdomain.lng
similarity index 87%
copy from interface/web/sites/lib/lang/ar_web_aliasdomain.lng
copy to interface/web/sites/lib/lang/it_web_childdomain.lng
index 4149c71..3a54ad3 100644
--- a/interface/web/sites/lib/lang/ar_web_aliasdomain.lng
+++ b/interface/web/sites/lib/lang/it_web_childdomain.lng
@@ -1,48 +1,56 @@
<?php
-$wb['domain_txt'] = 'Aliasdomain';
-$wb['backup_interval_txt'] = 'Backup interval';
-$wb['backup_copies_txt'] = 'Number of backup copies';
-$wb['ssl_state_txt'] = 'State';
+$wb['ssl_state_txt'] = 'Stato';
$wb['ssl_locality_txt'] = 'Locality';
-$wb['ssl_organisation_txt'] = 'Organisation';
+$wb['ssl_organisation_txt'] = 'Organizzazione';
$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
$wb['ssl_country_txt'] = 'Country';
-$wb['ssl_key_txt'] = 'SSL Key';
$wb['ssl_request_txt'] = 'SSL Request';
$wb['ssl_cert_txt'] = 'SSL Certificate';
$wb['ssl_bundle_txt'] = 'SSL Bundle';
$wb['ssl_action_txt'] = 'SSL Action';
-$wb['ssl_domain_txt'] = 'SSL Domain';
$wb['server_id_txt'] = 'Server';
-$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
-$wb['type_txt'] = 'Type';
+$wb['domain_txt'] = 'Dominio';
+$wb['type_txt'] = 'Tipo';
$wb['parent_domain_id_txt'] = 'Parent Website';
-$wb['redirect_type_txt'] = 'Redirect Type';
-$wb['redirect_path_txt'] = 'Redirect Path';
-$wb['active_txt'] = 'Active';
+$wb['redirect_type_txt'] = 'Tipo Redirect';
+$wb['redirect_path_txt'] = 'Percorso Redirect';
+$wb['active_txt'] = 'Attivo';
$wb['document_root_txt'] = 'Documentroot';
-$wb['system_user_txt'] = 'Linux User';
-$wb['system_group_txt'] = 'Linux Group';
-$wb['ip_address_txt'] = 'IPv4-Address';
-$wb['ipv6_address_txt'] = 'IPv6-Address';
-$wb['vhost_type_txt'] = 'VHost Type';
-$wb['hd_quota_txt'] = 'Harddisk Quota';
-$wb['traffic_quota_txt'] = 'Traffic Quota';
+$wb['system_user_txt'] = 'Utente Linux';
+$wb['system_group_txt'] = 'Gruppo Linux';
+$wb['ip_address_txt'] = 'Indirizzo IP';
+$wb['vhost_type_txt'] = 'Tipo VHost';
+$wb['hd_quota_txt'] = 'Quota Harddisk';
+$wb['traffic_quota_txt'] = 'Quota Traffico';
$wb['cgi_txt'] = 'CGI';
$wb['ssi_txt'] = 'SSI';
-$wb['errordocs_txt'] = 'Own Error-Documents';
-$wb['subdomain_txt'] = 'Auto-Subdomain';
$wb['ssl_txt'] = 'SSL';
$wb['suexec_txt'] = 'SuEXEC';
$wb['php_txt'] = 'PHP';
-$wb['client_txt'] = 'Client';
+$wb['client_txt'] = 'Cliente';
$wb['limit_web_domain_txt'] = 'The max. number of web domains for your account is reached.';
$wb['limit_web_aliasdomain_txt'] = 'The max. number of aliasdomains for your account is reached.';
$wb['limit_web_subdomain_txt'] = 'The max. number of web subdomains for your account is reached.';
-$wb['apache_directives_txt'] = 'Apache Directives';
+$wb['apache_directives_txt'] = 'Direttive Apache';
$wb['domain_error_empty'] = 'Domain is empty.';
-$wb['domain_error_unique'] = 'There is already a website or sub / aliasdomain with this domain name.';
+$wb['domain_error_unique'] = 'Domain must be unique.';
$wb['domain_error_regex'] = 'Domain name invalid.';
+$wb['host_txt'] = 'Host';
+$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
+$wb['no_redirect_txt'] = 'No redirect';
+$wb['no_flag_txt'] = 'No flag';
+$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
+$wb['proxy_directives_txt'] = 'Proxy Directives';
+$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
+$wb['error_proxy_requires_url'] = 'Redirect Type \"proxy\" requires a URL as the redirect path.';
+$wb['backup_interval_txt'] = 'Backup interval';
+$wb['backup_copies_txt'] = 'Number of backup copies';
+$wb['ssl_key_txt'] = 'SSL Key';
+$wb['ssl_domain_txt'] = 'SSL Domain';
+$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
+$wb['ipv6_address_txt'] = 'IPv6-Address';
+$wb['errordocs_txt'] = 'Own Error-Documents';
+$wb['subdomain_txt'] = 'Auto-Subdomain';
$wb['domain_error_autosub'] = 'There is already a subdomain with these settings.';
$wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
$wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
@@ -62,7 +70,6 @@
$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
$wb['limit_traffic_quota_free_txt'] = 'Max. available Traffic Quota';
-$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
$wb['php_open_basedir_txt'] = 'PHP open_basedir';
$wb['traffic_quota_exceeded_txt'] = 'Traffic quota exceeded';
$wb['ruby_txt'] = 'Ruby';
@@ -71,8 +78,6 @@
$wb['custom_php_ini_txt'] = 'Custom php.ini settings';
$wb['none_txt'] = 'None';
$wb['disabled_txt'] = 'Disabled';
-$wb['no_redirect_txt'] = 'No redirect';
-$wb['no_flag_txt'] = 'No flag';
$wb['save_certificate_txt'] = 'Save certificate';
$wb['create_certificate_txt'] = 'Create certificate';
$wb['delete_certificate_txt'] = 'Delete certificate';
@@ -109,7 +114,6 @@
$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
-$wb['proxy_directives_txt'] = 'Proxy Directives';
-$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
$wb['Domain'] = 'Aliasdomain';
+
?>
diff --git a/interface/web/sites/lib/lang/it_web_childdomain_list.lng b/interface/web/sites/lib/lang/it_web_childdomain_list.lng
new file mode 100644
index 0000000..7d5ab04
--- /dev/null
+++ b/interface/web/sites/lib/lang/it_web_childdomain_list.lng
@@ -0,0 +1,15 @@
+<?php
+$wb['list_head_txt'] = 'Sottodomini';
+$wb['active_txt'] = 'Attivo';
+$wb['server_id_txt'] = 'Server';
+$wb['parent_domain_id_txt'] = 'Sito';
+$wb['domain_txt'] = 'Sottodominio';
+$wb['add_new_record_txt'] = 'Aggiungi nuovo sottodominio';
+$wb['domain_error_empty'] = 'Domain is empty.';
+$wb['domain_error_unique'] = 'Domain must be unique.';
+$wb['domain_error_regex'] = 'Domain name invalid.';
+$wb['no_redirect_txt'] = 'No redirect';
+$wb['no_flag_txt'] = 'No flag';
+$wb['none_txt'] = 'None';
+
+?>
diff --git a/interface/web/sites/lib/lang/it_web_subdomain.lng b/interface/web/sites/lib/lang/it_web_subdomain.lng
deleted file mode 100644
index 9069194..0000000
--- a/interface/web/sites/lib/lang/it_web_subdomain.lng
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-$wb['ssl_state_txt'] = 'Stato';
-$wb['ssl_locality_txt'] = 'Locality';
-$wb['ssl_organisation_txt'] = 'Organizzazione';
-$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
-$wb['ssl_country_txt'] = 'Country';
-$wb['ssl_request_txt'] = 'SSL Request';
-$wb['ssl_cert_txt'] = 'SSL Certificate';
-$wb['ssl_bundle_txt'] = 'SSL Bundle';
-$wb['ssl_action_txt'] = 'SSL Action';
-$wb['server_id_txt'] = 'Server';
-$wb['domain_txt'] = 'Dominio';
-$wb['type_txt'] = 'Tipo';
-$wb['parent_domain_id_txt'] = 'Parent Website';
-$wb['redirect_type_txt'] = 'Tipo Redirect';
-$wb['redirect_path_txt'] = 'Percorso Redirect';
-$wb['active_txt'] = 'Attivo';
-$wb['document_root_txt'] = 'Documentroot';
-$wb['system_user_txt'] = 'Utente Linux';
-$wb['system_group_txt'] = 'Gruppo Linux';
-$wb['ip_address_txt'] = 'Indirizzo IP';
-$wb['vhost_type_txt'] = 'Tipo VHost';
-$wb['hd_quota_txt'] = 'Quota Harddisk';
-$wb['traffic_quota_txt'] = 'Quota Traffico';
-$wb['cgi_txt'] = 'CGI';
-$wb['ssi_txt'] = 'SSI';
-$wb['ssl_txt'] = 'SSL';
-$wb['suexec_txt'] = 'SuEXEC';
-$wb['php_txt'] = 'PHP';
-$wb['client_txt'] = 'Cliente';
-$wb['limit_web_domain_txt'] = 'The max. number of web domains for your account is reached.';
-$wb['limit_web_aliasdomain_txt'] = 'The max. number of aliasdomains for your account is reached.';
-$wb['limit_web_subdomain_txt'] = 'The max. number of web subdomains for your account is reached.';
-$wb['apache_directives_txt'] = 'Direttive Apache';
-$wb['domain_error_empty'] = 'Domain is empty.';
-$wb['domain_error_unique'] = 'Domain must be unique.';
-$wb['domain_error_regex'] = 'Domain name invalid.';
-$wb['host_txt'] = 'Host';
-$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
-$wb['no_redirect_txt'] = 'No redirect';
-$wb['no_flag_txt'] = 'No flag';
-$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
-$wb['proxy_directives_txt'] = 'Proxy Directives';
-$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
-$wb['error_proxy_requires_url'] = 'Redirect Type \\"proxy\\" requires a URL as the redirect path.';
-?>
diff --git a/interface/web/sites/lib/lang/it_web_subdomain_list.lng b/interface/web/sites/lib/lang/it_web_subdomain_list.lng
deleted file mode 100644
index 5ba43b0..0000000
--- a/interface/web/sites/lib/lang/it_web_subdomain_list.lng
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Sottodomini';
-$wb['active_txt'] = 'Attivo';
-$wb['server_id_txt'] = 'Server';
-$wb['parent_domain_id_txt'] = 'Sito';
-$wb['domain_txt'] = 'Sottodominio';
-$wb['add_new_record_txt'] = 'Aggiungi nuovo sottodominio';
-?>
diff --git a/interface/web/sites/lib/lang/ja_web_aliasdomain.lng b/interface/web/sites/lib/lang/ja_web_aliasdomain.lng
deleted file mode 100644
index 4149c71..0000000
--- a/interface/web/sites/lib/lang/ja_web_aliasdomain.lng
+++ /dev/null
@@ -1,115 +0,0 @@
-<?php
-$wb['domain_txt'] = 'Aliasdomain';
-$wb['backup_interval_txt'] = 'Backup interval';
-$wb['backup_copies_txt'] = 'Number of backup copies';
-$wb['ssl_state_txt'] = 'State';
-$wb['ssl_locality_txt'] = 'Locality';
-$wb['ssl_organisation_txt'] = 'Organisation';
-$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
-$wb['ssl_country_txt'] = 'Country';
-$wb['ssl_key_txt'] = 'SSL Key';
-$wb['ssl_request_txt'] = 'SSL Request';
-$wb['ssl_cert_txt'] = 'SSL Certificate';
-$wb['ssl_bundle_txt'] = 'SSL Bundle';
-$wb['ssl_action_txt'] = 'SSL Action';
-$wb['ssl_domain_txt'] = 'SSL Domain';
-$wb['server_id_txt'] = 'Server';
-$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
-$wb['type_txt'] = 'Type';
-$wb['parent_domain_id_txt'] = 'Parent Website';
-$wb['redirect_type_txt'] = 'Redirect Type';
-$wb['redirect_path_txt'] = 'Redirect Path';
-$wb['active_txt'] = 'Active';
-$wb['document_root_txt'] = 'Documentroot';
-$wb['system_user_txt'] = 'Linux User';
-$wb['system_group_txt'] = 'Linux Group';
-$wb['ip_address_txt'] = 'IPv4-Address';
-$wb['ipv6_address_txt'] = 'IPv6-Address';
-$wb['vhost_type_txt'] = 'VHost Type';
-$wb['hd_quota_txt'] = 'Harddisk Quota';
-$wb['traffic_quota_txt'] = 'Traffic Quota';
-$wb['cgi_txt'] = 'CGI';
-$wb['ssi_txt'] = 'SSI';
-$wb['errordocs_txt'] = 'Own Error-Documents';
-$wb['subdomain_txt'] = 'Auto-Subdomain';
-$wb['ssl_txt'] = 'SSL';
-$wb['suexec_txt'] = 'SuEXEC';
-$wb['php_txt'] = 'PHP';
-$wb['client_txt'] = 'Client';
-$wb['limit_web_domain_txt'] = 'The max. number of web domains for your account is reached.';
-$wb['limit_web_aliasdomain_txt'] = 'The max. number of aliasdomains for your account is reached.';
-$wb['limit_web_subdomain_txt'] = 'The max. number of web subdomains for your account is reached.';
-$wb['apache_directives_txt'] = 'Apache Directives';
-$wb['domain_error_empty'] = 'Domain is empty.';
-$wb['domain_error_unique'] = 'There is already a website or sub / aliasdomain with this domain name.';
-$wb['domain_error_regex'] = 'Domain name invalid.';
-$wb['domain_error_autosub'] = 'There is already a subdomain with these settings.';
-$wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
-$wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
-$wb['error_ssl_state_empty'] = 'SSL State is empty.';
-$wb['error_ssl_locality_empty'] = 'SSL Locality is empty.';
-$wb['error_ssl_organisation_empty'] = 'SSL Organisation is empty.';
-$wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.';
-$wb['error_ssl_country_empty'] = 'SSL Country is empty.';
-$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
-$wb['client_group_id_txt'] = 'Client';
-$wb['stats_password_txt'] = 'Set Webstatistics password';
-$wb['allow_override_txt'] = 'Apache AllowOverride';
-$wb['limit_web_quota_free_txt'] = 'Max. available Harddisk Quota';
-$wb['ssl_state_error_regex'] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_locality_error_regex'] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_organisation_error_regex'] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
-$wb['limit_traffic_quota_free_txt'] = 'Max. available Traffic Quota';
-$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
-$wb['php_open_basedir_txt'] = 'PHP open_basedir';
-$wb['traffic_quota_exceeded_txt'] = 'Traffic quota exceeded';
-$wb['ruby_txt'] = 'Ruby';
-$wb['stats_user_txt'] = 'Webstatistics username';
-$wb['stats_type_txt'] = 'Webstatistics program';
-$wb['custom_php_ini_txt'] = 'Custom php.ini settings';
-$wb['none_txt'] = 'None';
-$wb['disabled_txt'] = 'Disabled';
-$wb['no_redirect_txt'] = 'No redirect';
-$wb['no_flag_txt'] = 'No flag';
-$wb['save_certificate_txt'] = 'Save certificate';
-$wb['create_certificate_txt'] = 'Create certificate';
-$wb['delete_certificate_txt'] = 'Delete certificate';
-$wb['nginx_directives_txt'] = 'nginx Directives';
-$wb['seo_redirect_txt'] = 'SEO Redirect';
-$wb['non_www_to_www_txt'] = 'Non-www -> www';
-$wb['www_to_non_www_txt'] = 'www -> non-www';
-$wb['php_fpm_use_socket_txt'] = 'Use Socket For PHP-FPM';
-$wb['error_no_sni_txt'] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
-$wb['python_txt'] = 'Python';
-$wb['perl_txt'] = 'Perl';
-$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
-$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
-$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
-$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
-$wb['error_php_fpm_pm_settings_txt'] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children >= pm.max_spare_servers >= pm.start_servers >= pm.min_spare_servers > 0';
-$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive integer value.';
-$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
-$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
-$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
-$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
-$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
-$wb['fastcgi_php_version_txt'] = 'PHP Version';
-$wb['pm_txt'] = 'PHP-FPM Process Manager';
-$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
-$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
-$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
-$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
-$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
-$wb['generate_password_txt'] = 'Generate Password';
-$wb['repeat_password_txt'] = 'Repeat Password';
-$wb['password_mismatch_txt'] = 'The passwords do not match.';
-$wb['password_match_txt'] = 'The passwords do match.';
-$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
-$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
-$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
-$wb['proxy_directives_txt'] = 'Proxy Directives';
-$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
-$wb['Domain'] = 'Aliasdomain';
-?>
diff --git a/interface/web/sites/lib/lang/ar_web_aliasdomain.lng b/interface/web/sites/lib/lang/ja_web_childdomain.lng
similarity index 74%
copy from interface/web/sites/lib/lang/ar_web_aliasdomain.lng
copy to interface/web/sites/lib/lang/ja_web_childdomain.lng
index 4149c71..6745122 100644
--- a/interface/web/sites/lib/lang/ar_web_aliasdomain.lng
+++ b/interface/web/sites/lib/lang/ja_web_childdomain.lng
@@ -1,48 +1,56 @@
<?php
-$wb['domain_txt'] = 'Aliasdomain';
-$wb['backup_interval_txt'] = 'Backup interval';
-$wb['backup_copies_txt'] = 'Number of backup copies';
-$wb['ssl_state_txt'] = 'State';
-$wb['ssl_locality_txt'] = 'Locality';
-$wb['ssl_organisation_txt'] = 'Organisation';
-$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
-$wb['ssl_country_txt'] = 'Country';
-$wb['ssl_key_txt'] = 'SSL Key';
-$wb['ssl_request_txt'] = 'SSL Request';
+$wb['ssl_state_txt'] = 'State（都道府県）';
+$wb['ssl_locality_txt'] = 'Locality（地域）';
+$wb['ssl_organisation_txt'] = 'Organisation（組織）';
+$wb['ssl_organisation_unit_txt'] = 'Organisation Unit（部署）';
+$wb['ssl_country_txt'] = 'Country（国）';
+$wb['ssl_request_txt'] = 'SSL CSR';
$wb['ssl_cert_txt'] = 'SSL Certificate';
-$wb['ssl_bundle_txt'] = 'SSL Bundle';
-$wb['ssl_action_txt'] = 'SSL Action';
-$wb['ssl_domain_txt'] = 'SSL Domain';
-$wb['server_id_txt'] = 'Server';
-$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
-$wb['type_txt'] = 'Type';
+$wb['ssl_bundle_txt'] = 'Chainファイル';
+$wb['ssl_action_txt'] = 'SSL 証明書の操作';
+$wb['server_id_txt'] = 'サーバー';
+$wb['domain_txt'] = 'ドメイン';
+$wb['type_txt'] = '種別';
$wb['parent_domain_id_txt'] = 'Parent Website';
-$wb['redirect_type_txt'] = 'Redirect Type';
-$wb['redirect_path_txt'] = 'Redirect Path';
-$wb['active_txt'] = 'Active';
-$wb['document_root_txt'] = 'Documentroot';
-$wb['system_user_txt'] = 'Linux User';
-$wb['system_group_txt'] = 'Linux Group';
-$wb['ip_address_txt'] = 'IPv4-Address';
-$wb['ipv6_address_txt'] = 'IPv6-Address';
+$wb['redirect_type_txt'] = 'リダイレクトの方式';
+$wb['redirect_path_txt'] = 'リダイレクト先';
+$wb['active_txt'] = '有効';
+$wb['document_root_txt'] = 'ドキュメントルート';
+$wb['system_user_txt'] = 'Linuxユーザー';
+$wb['system_group_txt'] = 'Linuxグループ';
+$wb['ip_address_txt'] = 'IPアドレス';
$wb['vhost_type_txt'] = 'VHost Type';
-$wb['hd_quota_txt'] = 'Harddisk Quota';
-$wb['traffic_quota_txt'] = 'Traffic Quota';
+$wb['hd_quota_txt'] = 'ディスクの容量';
+$wb['traffic_quota_txt'] = 'トラフィックの許容量';
$wb['cgi_txt'] = 'CGI';
$wb['ssi_txt'] = 'SSI';
-$wb['errordocs_txt'] = 'Own Error-Documents';
-$wb['subdomain_txt'] = 'Auto-Subdomain';
$wb['ssl_txt'] = 'SSL';
$wb['suexec_txt'] = 'SuEXEC';
$wb['php_txt'] = 'PHP';
-$wb['client_txt'] = 'Client';
-$wb['limit_web_domain_txt'] = 'The max. number of web domains for your account is reached.';
-$wb['limit_web_aliasdomain_txt'] = 'The max. number of aliasdomains for your account is reached.';
-$wb['limit_web_subdomain_txt'] = 'The max. number of web subdomains for your account is reached.';
-$wb['apache_directives_txt'] = 'Apache Directives';
-$wb['domain_error_empty'] = 'Domain is empty.';
-$wb['domain_error_unique'] = 'There is already a website or sub / aliasdomain with this domain name.';
-$wb['domain_error_regex'] = 'Domain name invalid.';
+$wb['client_txt'] = 'クライアント';
+$wb['limit_web_domain_txt'] = 'ウェブドメインが最大数に達したため、これ以上追加できません。';
+$wb['limit_web_aliasdomain_txt'] = 'エイリアスドメインが最大数に達した為、これ以上追加できません。';
+$wb['limit_web_subdomain_txt'] = 'ウェブサブドメインが最大数に達しました。';
+$wb['apache_directives_txt'] = 'Apache ディレクティブ';
+$wb['domain_error_empty'] = 'ドメインを指定してください';
+$wb['domain_error_unique'] = '同名のサブドメインまたはエイリアスドメインが存在します。';
+$wb['domain_error_regex'] = 'ドメイン名が不正です。';
+$wb['host_txt'] = 'ホスト';
+$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
+$wb['no_redirect_txt'] = 'No redirect';
+$wb['no_flag_txt'] = 'No flag';
+$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
+$wb['proxy_directives_txt'] = 'Proxy Directives';
+$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
+$wb['error_proxy_requires_url'] = 'Redirect Type \"proxy\" requires a URL as the redirect path.';
+$wb['backup_interval_txt'] = 'Backup interval';
+$wb['backup_copies_txt'] = 'Number of backup copies';
+$wb['ssl_key_txt'] = 'SSL Key';
+$wb['ssl_domain_txt'] = 'SSL Domain';
+$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
+$wb['ipv6_address_txt'] = 'IPv6-Address';
+$wb['errordocs_txt'] = 'Own Error-Documents';
+$wb['subdomain_txt'] = 'Auto-Subdomain';
$wb['domain_error_autosub'] = 'There is already a subdomain with these settings.';
$wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
$wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
@@ -62,7 +70,6 @@
$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
$wb['limit_traffic_quota_free_txt'] = 'Max. available Traffic Quota';
-$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
$wb['php_open_basedir_txt'] = 'PHP open_basedir';
$wb['traffic_quota_exceeded_txt'] = 'Traffic quota exceeded';
$wb['ruby_txt'] = 'Ruby';
@@ -71,8 +78,6 @@
$wb['custom_php_ini_txt'] = 'Custom php.ini settings';
$wb['none_txt'] = 'None';
$wb['disabled_txt'] = 'Disabled';
-$wb['no_redirect_txt'] = 'No redirect';
-$wb['no_flag_txt'] = 'No flag';
$wb['save_certificate_txt'] = 'Save certificate';
$wb['create_certificate_txt'] = 'Create certificate';
$wb['delete_certificate_txt'] = 'Delete certificate';
@@ -109,7 +114,6 @@
$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
-$wb['proxy_directives_txt'] = 'Proxy Directives';
-$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
$wb['Domain'] = 'Aliasdomain';
+
?>
diff --git a/interface/web/sites/lib/lang/ja_web_aliasdomain_list.lng b/interface/web/sites/lib/lang/ja_web_childdomain_list.lng
similarity index 73%
rename from interface/web/sites/lib/lang/ja_web_aliasdomain_list.lng
rename to interface/web/sites/lib/lang/ja_web_childdomain_list.lng
index 1111302..ebc1fd6 100644
--- a/interface/web/sites/lib/lang/ja_web_aliasdomain_list.lng
+++ b/interface/web/sites/lib/lang/ja_web_childdomain_list.lng
@@ -1,14 +1,15 @@
<?php
-$wb['list_head_txt'] = 'エイリアスドメイン';
+$wb['list_head_txt'] = 'サブドメイン';
$wb['active_txt'] = '有効';
$wb['server_id_txt'] = 'サーバー';
$wb['parent_domain_id_txt'] = 'ウェブサイト';
-$wb['domain_txt'] = 'エイリアスドメイン';
-$wb['add_new_record_txt'] = 'エイリアスドメインを追加する';
+$wb['domain_txt'] = 'サブドメイン';
+$wb['add_new_record_txt'] = 'サブドメインを追加する';
$wb['domain_error_empty'] = 'ドメインを指定してください';
$wb['domain_error_unique'] = '既に登録済みのドメイン名です。別の名前に変更してください。';
$wb['domain_error_regex'] = 'ドメイン名が不正です。';
$wb['no_redirect_txt'] = 'No redirect';
$wb['no_flag_txt'] = 'No flag';
$wb['none_txt'] = 'None';
+
?>
diff --git a/interface/web/sites/lib/lang/ja_web_subdomain.lng b/interface/web/sites/lib/lang/ja_web_subdomain.lng
deleted file mode 100644
index 7c0d55c..0000000
--- a/interface/web/sites/lib/lang/ja_web_subdomain.lng
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-$wb['ssl_state_txt'] = 'State（都道府県）';
-$wb['ssl_locality_txt'] = 'Locality（地域）';
-$wb['ssl_organisation_txt'] = 'Organisation（組織）';
-$wb['ssl_organisation_unit_txt'] = 'Organisation Unit（部署）';
-$wb['ssl_country_txt'] = 'Country（国）';
-$wb['ssl_request_txt'] = 'SSL CSR';
-$wb['ssl_cert_txt'] = 'SSL Certificate';
-$wb['ssl_bundle_txt'] = 'Chainファイル';
-$wb['ssl_action_txt'] = 'SSL 証明書の操作';
-$wb['server_id_txt'] = 'サーバー';
-$wb['domain_txt'] = 'ドメイン';
-$wb['type_txt'] = '種別';
-$wb['parent_domain_id_txt'] = 'Parent Website';
-$wb['redirect_type_txt'] = 'リダイレクトの方式';
-$wb['redirect_path_txt'] = 'リダイレクト先';
-$wb['active_txt'] = '有効';
-$wb['document_root_txt'] = 'ドキュメントルート';
-$wb['system_user_txt'] = 'Linuxユーザー';
-$wb['system_group_txt'] = 'Linuxグループ';
-$wb['ip_address_txt'] = 'IPアドレス';
-$wb['vhost_type_txt'] = 'VHost Type';
-$wb['hd_quota_txt'] = 'ディスクの容量';
-$wb['traffic_quota_txt'] = 'トラフィックの許容量';
-$wb['cgi_txt'] = 'CGI';
-$wb['ssi_txt'] = 'SSI';
-$wb['ssl_txt'] = 'SSL';
-$wb['suexec_txt'] = 'SuEXEC';
-$wb['php_txt'] = 'PHP';
-$wb['client_txt'] = 'クライアント';
-$wb['limit_web_domain_txt'] = 'ウェブドメインが最大数に達したため、これ以上追加できません。';
-$wb['limit_web_aliasdomain_txt'] = 'エイリアスドメインが最大数に達した為、これ以上追加できません。';
-$wb['limit_web_subdomain_txt'] = 'ウェブサブドメインが最大数に達しました。';
-$wb['apache_directives_txt'] = 'Apache ディレクティブ';
-$wb['domain_error_empty'] = 'ドメインを指定してください';
-$wb['domain_error_unique'] = '同名のサブドメインまたはエイリアスドメインが存在します。';
-$wb['domain_error_regex'] = 'ドメイン名が不正です。';
-$wb['host_txt'] = 'ホスト';
-$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
-$wb['no_redirect_txt'] = 'No redirect';
-$wb['no_flag_txt'] = 'No flag';
-$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
-$wb['proxy_directives_txt'] = 'Proxy Directives';
-$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
-$wb['error_proxy_requires_url'] = 'Redirect Type \\"proxy\\" requires a URL as the redirect path.';
-?>
diff --git a/interface/web/sites/lib/lang/ja_web_subdomain_list.lng b/interface/web/sites/lib/lang/ja_web_subdomain_list.lng
deleted file mode 100644
index dc91127..0000000
--- a/interface/web/sites/lib/lang/ja_web_subdomain_list.lng
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'サブドメイン';
-$wb['active_txt'] = '有効';
-$wb['server_id_txt'] = 'サーバー';
-$wb['parent_domain_id_txt'] = 'ウェブサイト';
-$wb['domain_txt'] = 'サブドメイン';
-$wb['add_new_record_txt'] = 'サブドメインを追加する';
-?>
diff --git a/interface/web/sites/lib/lang/nl_web_aliasdomain.lng b/interface/web/sites/lib/lang/nl_web_aliasdomain.lng
deleted file mode 100644
index 4149c71..0000000
--- a/interface/web/sites/lib/lang/nl_web_aliasdomain.lng
+++ /dev/null
@@ -1,115 +0,0 @@
-<?php
-$wb['domain_txt'] = 'Aliasdomain';
-$wb['backup_interval_txt'] = 'Backup interval';
-$wb['backup_copies_txt'] = 'Number of backup copies';
-$wb['ssl_state_txt'] = 'State';
-$wb['ssl_locality_txt'] = 'Locality';
-$wb['ssl_organisation_txt'] = 'Organisation';
-$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
-$wb['ssl_country_txt'] = 'Country';
-$wb['ssl_key_txt'] = 'SSL Key';
-$wb['ssl_request_txt'] = 'SSL Request';
-$wb['ssl_cert_txt'] = 'SSL Certificate';
-$wb['ssl_bundle_txt'] = 'SSL Bundle';
-$wb['ssl_action_txt'] = 'SSL Action';
-$wb['ssl_domain_txt'] = 'SSL Domain';
-$wb['server_id_txt'] = 'Server';
-$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
-$wb['type_txt'] = 'Type';
-$wb['parent_domain_id_txt'] = 'Parent Website';
-$wb['redirect_type_txt'] = 'Redirect Type';
-$wb['redirect_path_txt'] = 'Redirect Path';
-$wb['active_txt'] = 'Active';
-$wb['document_root_txt'] = 'Documentroot';
-$wb['system_user_txt'] = 'Linux User';
-$wb['system_group_txt'] = 'Linux Group';
-$wb['ip_address_txt'] = 'IPv4-Address';
-$wb['ipv6_address_txt'] = 'IPv6-Address';
-$wb['vhost_type_txt'] = 'VHost Type';
-$wb['hd_quota_txt'] = 'Harddisk Quota';
-$wb['traffic_quota_txt'] = 'Traffic Quota';
-$wb['cgi_txt'] = 'CGI';
-$wb['ssi_txt'] = 'SSI';
-$wb['errordocs_txt'] = 'Own Error-Documents';
-$wb['subdomain_txt'] = 'Auto-Subdomain';
-$wb['ssl_txt'] = 'SSL';
-$wb['suexec_txt'] = 'SuEXEC';
-$wb['php_txt'] = 'PHP';
-$wb['client_txt'] = 'Client';
-$wb['limit_web_domain_txt'] = 'The max. number of web domains for your account is reached.';
-$wb['limit_web_aliasdomain_txt'] = 'The max. number of aliasdomains for your account is reached.';
-$wb['limit_web_subdomain_txt'] = 'The max. number of web subdomains for your account is reached.';
-$wb['apache_directives_txt'] = 'Apache Directives';
-$wb['domain_error_empty'] = 'Domain is empty.';
-$wb['domain_error_unique'] = 'There is already a website or sub / aliasdomain with this domain name.';
-$wb['domain_error_regex'] = 'Domain name invalid.';
-$wb['domain_error_autosub'] = 'There is already a subdomain with these settings.';
-$wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
-$wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
-$wb['error_ssl_state_empty'] = 'SSL State is empty.';
-$wb['error_ssl_locality_empty'] = 'SSL Locality is empty.';
-$wb['error_ssl_organisation_empty'] = 'SSL Organisation is empty.';
-$wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.';
-$wb['error_ssl_country_empty'] = 'SSL Country is empty.';
-$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
-$wb['client_group_id_txt'] = 'Client';
-$wb['stats_password_txt'] = 'Set Webstatistics password';
-$wb['allow_override_txt'] = 'Apache AllowOverride';
-$wb['limit_web_quota_free_txt'] = 'Max. available Harddisk Quota';
-$wb['ssl_state_error_regex'] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_locality_error_regex'] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_organisation_error_regex'] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
-$wb['limit_traffic_quota_free_txt'] = 'Max. available Traffic Quota';
-$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
-$wb['php_open_basedir_txt'] = 'PHP open_basedir';
-$wb['traffic_quota_exceeded_txt'] = 'Traffic quota exceeded';
-$wb['ruby_txt'] = 'Ruby';
-$wb['stats_user_txt'] = 'Webstatistics username';
-$wb['stats_type_txt'] = 'Webstatistics program';
-$wb['custom_php_ini_txt'] = 'Custom php.ini settings';
-$wb['none_txt'] = 'None';
-$wb['disabled_txt'] = 'Disabled';
-$wb['no_redirect_txt'] = 'No redirect';
-$wb['no_flag_txt'] = 'No flag';
-$wb['save_certificate_txt'] = 'Save certificate';
-$wb['create_certificate_txt'] = 'Create certificate';
-$wb['delete_certificate_txt'] = 'Delete certificate';
-$wb['nginx_directives_txt'] = 'nginx Directives';
-$wb['seo_redirect_txt'] = 'SEO Redirect';
-$wb['non_www_to_www_txt'] = 'Non-www -> www';
-$wb['www_to_non_www_txt'] = 'www -> non-www';
-$wb['php_fpm_use_socket_txt'] = 'Use Socket For PHP-FPM';
-$wb['error_no_sni_txt'] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
-$wb['python_txt'] = 'Python';
-$wb['perl_txt'] = 'Perl';
-$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
-$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
-$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
-$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
-$wb['error_php_fpm_pm_settings_txt'] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children >= pm.max_spare_servers >= pm.start_servers >= pm.min_spare_servers > 0';
-$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive integer value.';
-$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
-$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
-$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
-$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
-$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
-$wb['fastcgi_php_version_txt'] = 'PHP Version';
-$wb['pm_txt'] = 'PHP-FPM Process Manager';
-$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
-$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
-$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
-$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
-$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
-$wb['generate_password_txt'] = 'Generate Password';
-$wb['repeat_password_txt'] = 'Repeat Password';
-$wb['password_mismatch_txt'] = 'The passwords do not match.';
-$wb['password_match_txt'] = 'The passwords do match.';
-$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
-$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
-$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
-$wb['proxy_directives_txt'] = 'Proxy Directives';
-$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
-$wb['Domain'] = 'Aliasdomain';
-?>
diff --git a/interface/web/sites/lib/lang/ar_web_aliasdomain.lng b/interface/web/sites/lib/lang/nl_web_childdomain.lng
similarity index 76%
copy from interface/web/sites/lib/lang/ar_web_aliasdomain.lng
copy to interface/web/sites/lib/lang/nl_web_childdomain.lng
index 4149c71..cb9965d 100644
--- a/interface/web/sites/lib/lang/ar_web_aliasdomain.lng
+++ b/interface/web/sites/lib/lang/nl_web_childdomain.lng
@@ -1,48 +1,56 @@
<?php
-$wb['domain_txt'] = 'Aliasdomain';
-$wb['backup_interval_txt'] = 'Backup interval';
-$wb['backup_copies_txt'] = 'Number of backup copies';
-$wb['ssl_state_txt'] = 'State';
-$wb['ssl_locality_txt'] = 'Locality';
-$wb['ssl_organisation_txt'] = 'Organisation';
-$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
-$wb['ssl_country_txt'] = 'Country';
-$wb['ssl_key_txt'] = 'SSL Key';
+$wb['ssl_state_txt'] = 'Provincie/staat';
+$wb['ssl_locality_txt'] = 'Plaatsnaam';
+$wb['ssl_organisation_txt'] = 'Organisatie';
+$wb['ssl_organisation_unit_txt'] = 'Organisatie afdeling';
+$wb['ssl_country_txt'] = 'Land';
$wb['ssl_request_txt'] = 'SSL Request';
-$wb['ssl_cert_txt'] = 'SSL Certificate';
-$wb['ssl_bundle_txt'] = 'SSL Bundle';
-$wb['ssl_action_txt'] = 'SSL Action';
-$wb['ssl_domain_txt'] = 'SSL Domain';
+$wb['ssl_cert_txt'] = 'SSL Certificaat';
+$wb['ssl_bundle_txt'] = 'SSL Bundel';
+$wb['ssl_action_txt'] = 'SSL Actie';
$wb['server_id_txt'] = 'Server';
-$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
+$wb['domain_txt'] = 'Domein';
$wb['type_txt'] = 'Type';
-$wb['parent_domain_id_txt'] = 'Parent Website';
-$wb['redirect_type_txt'] = 'Redirect Type';
-$wb['redirect_path_txt'] = 'Redirect Path';
-$wb['active_txt'] = 'Active';
+$wb['parent_domain_id_txt'] = 'Parent website';
+$wb['redirect_type_txt'] = 'Redirect type';
+$wb['redirect_path_txt'] = 'Redirect pad';
+$wb['active_txt'] = 'Actief';
$wb['document_root_txt'] = 'Documentroot';
-$wb['system_user_txt'] = 'Linux User';
-$wb['system_group_txt'] = 'Linux Group';
-$wb['ip_address_txt'] = 'IPv4-Address';
-$wb['ipv6_address_txt'] = 'IPv6-Address';
-$wb['vhost_type_txt'] = 'VHost Type';
-$wb['hd_quota_txt'] = 'Harddisk Quota';
-$wb['traffic_quota_txt'] = 'Traffic Quota';
+$wb['system_user_txt'] = 'Linux gebruiker';
+$wb['system_group_txt'] = 'Linux groep';
+$wb['ip_address_txt'] = 'IP-adres';
+$wb['vhost_type_txt'] = 'VHost type';
+$wb['hd_quota_txt'] = 'Harddisk quota';
+$wb['traffic_quota_txt'] = 'Traffic quota';
$wb['cgi_txt'] = 'CGI';
$wb['ssi_txt'] = 'SSI';
-$wb['errordocs_txt'] = 'Own Error-Documents';
-$wb['subdomain_txt'] = 'Auto-Subdomain';
$wb['ssl_txt'] = 'SSL';
$wb['suexec_txt'] = 'SuEXEC';
$wb['php_txt'] = 'PHP';
-$wb['client_txt'] = 'Client';
-$wb['limit_web_domain_txt'] = 'The max. number of web domains for your account is reached.';
-$wb['limit_web_aliasdomain_txt'] = 'The max. number of aliasdomains for your account is reached.';
-$wb['limit_web_subdomain_txt'] = 'The max. number of web subdomains for your account is reached.';
-$wb['apache_directives_txt'] = 'Apache Directives';
-$wb['domain_error_empty'] = 'Domain is empty.';
-$wb['domain_error_unique'] = 'There is already a website or sub / aliasdomain with this domain name.';
-$wb['domain_error_regex'] = 'Domain name invalid.';
+$wb['client_txt'] = 'Klant';
+$wb['limit_web_domain_txt'] = 'Het max. aantal web domeinen voor uw account is bereikt.';
+$wb['limit_web_aliasdomain_txt'] = 'Het max. aantal aliasdomeinen voor uw account is bereikt.';
+$wb['limit_web_subdomain_txt'] = 'Het max. aantal web subdomeinen voor uw account is bereikt.';
+$wb['apache_directives_txt'] = 'Apache directives';
+$wb['domain_error_empty'] = 'Domein is niet ingvuld.';
+$wb['domain_error_unique'] = 'Er is al eenwebsite of sub / aliasdomein met deze domeinnaam.';
+$wb['domain_error_regex'] = 'Domainnaam ongeldig.';
+$wb['host_txt'] = 'Host';
+$wb['redirect_error_regex'] = 'Ongeldig redirect pad. Geldige redirects zijn bijvoorbeeld: /test/ or http://www.domain.tld/test/';
+$wb['no_redirect_txt'] = 'No redirect';
+$wb['no_flag_txt'] = 'No flag';
+$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
+$wb['proxy_directives_txt'] = 'Proxy Directives';
+$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
+$wb['error_proxy_requires_url'] = 'Redirect Type \"proxy\" requires a URL as the redirect path.';
+$wb['backup_interval_txt'] = 'Backup interval';
+$wb['backup_copies_txt'] = 'Number of backup copies';
+$wb['ssl_key_txt'] = 'SSL Key';
+$wb['ssl_domain_txt'] = 'SSL Domain';
+$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
+$wb['ipv6_address_txt'] = 'IPv6-Address';
+$wb['errordocs_txt'] = 'Own Error-Documents';
+$wb['subdomain_txt'] = 'Auto-Subdomain';
$wb['domain_error_autosub'] = 'There is already a subdomain with these settings.';
$wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
$wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
@@ -62,7 +70,6 @@
$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
$wb['limit_traffic_quota_free_txt'] = 'Max. available Traffic Quota';
-$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
$wb['php_open_basedir_txt'] = 'PHP open_basedir';
$wb['traffic_quota_exceeded_txt'] = 'Traffic quota exceeded';
$wb['ruby_txt'] = 'Ruby';
@@ -71,8 +78,6 @@
$wb['custom_php_ini_txt'] = 'Custom php.ini settings';
$wb['none_txt'] = 'None';
$wb['disabled_txt'] = 'Disabled';
-$wb['no_redirect_txt'] = 'No redirect';
-$wb['no_flag_txt'] = 'No flag';
$wb['save_certificate_txt'] = 'Save certificate';
$wb['create_certificate_txt'] = 'Create certificate';
$wb['delete_certificate_txt'] = 'Delete certificate';
@@ -109,7 +114,6 @@
$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
-$wb['proxy_directives_txt'] = 'Proxy Directives';
-$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
$wb['Domain'] = 'Aliasdomain';
+
?>
diff --git a/interface/web/sites/lib/lang/nl_web_aliasdomain_list.lng b/interface/web/sites/lib/lang/nl_web_childdomain_list.lng
similarity index 73%
rename from interface/web/sites/lib/lang/nl_web_aliasdomain_list.lng
rename to interface/web/sites/lib/lang/nl_web_childdomain_list.lng
index 4d713a4..1b05bfe 100644
--- a/interface/web/sites/lib/lang/nl_web_aliasdomain_list.lng
+++ b/interface/web/sites/lib/lang/nl_web_childdomain_list.lng
@@ -1,14 +1,15 @@
<?php
-$wb['list_head_txt'] = 'Aliasdomein';
+$wb['list_head_txt'] = 'Subdomeinen';
$wb['active_txt'] = 'Actief';
$wb['server_id_txt'] = 'Server';
$wb['parent_domain_id_txt'] = 'Website';
-$wb['domain_txt'] = 'Aliasdomein';
-$wb['add_new_record_txt'] = 'Toevoegen nieuw aliasdomein';
+$wb['domain_txt'] = 'Subdomein';
+$wb['add_new_record_txt'] = 'Toevoegen nieuw subdomein';
$wb['domain_error_empty'] = 'Domein is niet ingvuld.';
$wb['domain_error_unique'] = 'Domein moet uniek zijn.';
$wb['domain_error_regex'] = 'Domeinnaam ongeldig.';
$wb['no_redirect_txt'] = 'No redirect';
$wb['no_flag_txt'] = 'No flag';
$wb['none_txt'] = 'None';
+
?>
diff --git a/interface/web/sites/lib/lang/nl_web_subdomain.lng b/interface/web/sites/lib/lang/nl_web_subdomain.lng
deleted file mode 100644
index 2fea491..0000000
--- a/interface/web/sites/lib/lang/nl_web_subdomain.lng
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-$wb['ssl_state_txt'] = 'Provincie/staat';
-$wb['ssl_locality_txt'] = 'Plaatsnaam';
-$wb['ssl_organisation_txt'] = 'Organisatie';
-$wb['ssl_organisation_unit_txt'] = 'Organisatie afdeling';
-$wb['ssl_country_txt'] = 'Land';
-$wb['ssl_request_txt'] = 'SSL Request';
-$wb['ssl_cert_txt'] = 'SSL Certificaat';
-$wb['ssl_bundle_txt'] = 'SSL Bundel';
-$wb['ssl_action_txt'] = 'SSL Actie';
-$wb['server_id_txt'] = 'Server';
-$wb['domain_txt'] = 'Domein';
-$wb['type_txt'] = 'Type';
-$wb['parent_domain_id_txt'] = 'Parent website';
-$wb['redirect_type_txt'] = 'Redirect type';
-$wb['redirect_path_txt'] = 'Redirect pad';
-$wb['active_txt'] = 'Actief';
-$wb['document_root_txt'] = 'Documentroot';
-$wb['system_user_txt'] = 'Linux gebruiker';
-$wb['system_group_txt'] = 'Linux groep';
-$wb['ip_address_txt'] = 'IP-adres';
-$wb['vhost_type_txt'] = 'VHost type';
-$wb['hd_quota_txt'] = 'Harddisk quota';
-$wb['traffic_quota_txt'] = 'Traffic quota';
-$wb['cgi_txt'] = 'CGI';
-$wb['ssi_txt'] = 'SSI';
-$wb['ssl_txt'] = 'SSL';
-$wb['suexec_txt'] = 'SuEXEC';
-$wb['php_txt'] = 'PHP';
-$wb['client_txt'] = 'Klant';
-$wb['limit_web_domain_txt'] = 'Het max. aantal web domeinen voor uw account is bereikt.';
-$wb['limit_web_aliasdomain_txt'] = 'Het max. aantal aliasdomeinen voor uw account is bereikt.';
-$wb['limit_web_subdomain_txt'] = 'Het max. aantal web subdomeinen voor uw account is bereikt.';
-$wb['apache_directives_txt'] = 'Apache directives';
-$wb['domain_error_empty'] = 'Domein is niet ingvuld.';
-$wb['domain_error_unique'] = 'Er is al eenwebsite of sub / aliasdomein met deze domeinnaam.';
-$wb['domain_error_regex'] = 'Domainnaam ongeldig.';
-$wb['host_txt'] = 'Host';
-$wb['redirect_error_regex'] = 'Ongeldig redirect pad. Geldige redirects zijn bijvoorbeeld: /test/ or http://www.domain.tld/test/';
-$wb['no_redirect_txt'] = 'No redirect';
-$wb['no_flag_txt'] = 'No flag';
-$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
-$wb['proxy_directives_txt'] = 'Proxy Directives';
-$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
-$wb['error_proxy_requires_url'] = 'Redirect Type \\"proxy\\" requires a URL as the redirect path.';
-?>
diff --git a/interface/web/sites/lib/lang/nl_web_subdomain_list.lng b/interface/web/sites/lib/lang/nl_web_subdomain_list.lng
deleted file mode 100644
index fbba7b9..0000000
--- a/interface/web/sites/lib/lang/nl_web_subdomain_list.lng
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Subdomeinen';
-$wb['active_txt'] = 'Actief';
-$wb['server_id_txt'] = 'Server';
-$wb['parent_domain_id_txt'] = 'Website';
-$wb['domain_txt'] = 'Subdomein';
-$wb['add_new_record_txt'] = 'Toevoegen nieuw subdomein';
-?>
diff --git a/interface/web/sites/lib/lang/pl_web_aliasdomain.lng b/interface/web/sites/lib/lang/pl_web_childdomain.lng
similarity index 79%
rename from interface/web/sites/lib/lang/pl_web_aliasdomain.lng
rename to interface/web/sites/lib/lang/pl_web_childdomain.lng
index 19cd691..286a38a 100644
--- a/interface/web/sites/lib/lang/pl_web_aliasdomain.lng
+++ b/interface/web/sites/lib/lang/pl_web_childdomain.lng
@@ -1,48 +1,56 @@
<?php
-$wb['domain_txt'] = 'Alias domeny';
-$wb['backup_interval_txt'] = 'Częstotliwość tworzenia kopii zapasowych';
-$wb['backup_copies_txt'] = 'Liczba kopii';
-$wb['ssl_state_txt'] = 'Województwo';
+$wb['ssl_state_txt'] = 'Stan';
$wb['ssl_locality_txt'] = 'Lokalizacja';
$wb['ssl_organisation_txt'] = 'Organizacja';
$wb['ssl_organisation_unit_txt'] = 'Jednostka organizacji';
-$wb['ssl_country_txt'] = 'Kraj';
-$wb['ssl_key_txt'] = 'Klucz SSL';
+$wb['ssl_country_txt'] = 'Państwo';
$wb['ssl_request_txt'] = 'Żądanie SSL';
$wb['ssl_cert_txt'] = 'Certyfikat SSL';
-$wb['ssl_bundle_txt'] = 'Paczka SSL (bundle)';
+$wb['ssl_bundle_txt'] = 'Paczka SSL';
$wb['ssl_action_txt'] = 'Akcja SSL';
-$wb['ssl_domain_txt'] = 'Domena SSL';
$wb['server_id_txt'] = 'Serwer';
-$wb['web_folder_error_regex'] = 'Wpisano nieprawidłowy folder. Proszę nie wpisywać znaku slash: /';
-$wb['type_txt'] = 'Rodzaj';
-$wb['parent_domain_id_txt'] = 'Strona macierzysta';
-$wb['redirect_type_txt'] = 'Rodzaj przekierowania';
+$wb['domain_txt'] = 'Domena';
+$wb['type_txt'] = 'Typ';
+$wb['parent_domain_id_txt'] = 'Macierzysta strona www';
+$wb['redirect_type_txt'] = 'Typ przekierowania';
$wb['redirect_path_txt'] = 'Ścieżka przekierowania';
$wb['active_txt'] = 'Aktywny';
-$wb['document_root_txt'] = 'Document root';
-$wb['system_user_txt'] = 'Użytkownik systemowy';
-$wb['system_group_txt'] = 'Grupa systemowa';
-$wb['ip_address_txt'] = 'Adres IPv4';
-$wb['ipv6_address_txt'] = 'Adres IPv6';
-$wb['vhost_type_txt'] = 'Rodzaj VHosta';
-$wb['hd_quota_txt'] = 'Limit dysku';
-$wb['traffic_quota_txt'] = 'Limit transferu';
+$wb['document_root_txt'] = 'Główny katalog';
+$wb['system_user_txt'] = 'Użytkownik Linuksa';
+$wb['system_group_txt'] = 'Grupa Linux';
+$wb['ip_address_txt'] = 'Adres IP';
+$wb['vhost_type_txt'] = 'Typ wirtualnego hosta';
+$wb['hd_quota_txt'] = 'Limit twardego dysku';
+$wb['traffic_quota_txt'] = 'Limit ruchu na serwerze';
$wb['cgi_txt'] = 'CGI';
$wb['ssi_txt'] = 'SSI';
-$wb['errordocs_txt'] = 'Własne strony błędów';
-$wb['subdomain_txt'] = 'Automatyczna subdomena';
$wb['ssl_txt'] = 'SSL';
$wb['suexec_txt'] = 'SuEXEC';
$wb['php_txt'] = 'PHP';
$wb['client_txt'] = 'Klient';
-$wb['limit_web_domain_txt'] = 'Maks. liczba domen web dla Twojego konta została już osiągnięta.';
-$wb['limit_web_aliasdomain_txt'] = 'Maks. liczba aliasów domen dla Twojego konta została już osiągnięta.';
-$wb['limit_web_subdomain_txt'] = 'Maks. liczba subdomen dla Twojego konta została już osiągnięta.';
+$wb['limit_web_domain_txt'] = 'Maksymalna ilość domen dla Twojego konta została przekroczona.';
+$wb['limit_web_aliasdomain_txt'] = 'Maksymalna ilość aliasów dla Twojego konta została przekroczona.';
+$wb['limit_web_subdomain_txt'] = 'Maksymalna ilość subdomen dla Twojego konta została przekroczona.';
$wb['apache_directives_txt'] = 'Dyrektywy Apache';
-$wb['domain_error_empty'] = 'Pole domena jest puste';
-$wb['domain_error_unique'] = 'Istnieje już strona z tą nazwą domeny/poddomeny.';
-$wb['domain_error_regex'] = 'Nazwa domeny jest pusta';
+$wb['domain_error_empty'] = 'Domena jest pusta.';
+$wb['domain_error_unique'] = 'Istnieje już domena, alias lub subdomena o podanej nazwie.';
+$wb['domain_error_regex'] = 'Nazwa domeny jest nieprawidłowa.';
+$wb['host_txt'] = 'Serwer';
+$wb['redirect_error_regex'] = 'Nieprawidłowa ścieżka przekierowania. Poprawne przekierowanie to np.: /test/ lub http://www.domain.tld/test/';
+$wb['no_redirect_txt'] = 'Bez przekierowania';
+$wb['no_flag_txt'] = 'Bez flagi';
+$wb['domain_error_wildcard'] = 'Subdomeny typu wildcard nie są dozwolone';
+$wb['proxy_directives_txt'] = 'Dyrektywy Proxy';
+$wb['available_proxy_directive_snippets_txt'] = 'Dostępne konfiguracje dodatkowe Proxy';
+$wb['error_proxy_requires_url'] = 'Rodzaj przekierowania ';
+$wb['backup_interval_txt'] = 'Częstotliwość tworzenia kopii zapasowych';
+$wb['backup_copies_txt'] = 'Liczba kopii';
+$wb['ssl_key_txt'] = 'Klucz SSL';
+$wb['ssl_domain_txt'] = 'Domena SSL';
+$wb['web_folder_error_regex'] = 'Wpisano nieprawidłowy folder. Proszę nie wpisywać znaku slash: /';
+$wb['ipv6_address_txt'] = 'Adres IPv6';
+$wb['errordocs_txt'] = 'Własne strony błędów';
+$wb['subdomain_txt'] = 'Automatyczna subdomena';
$wb['domain_error_autosub'] = 'Istnieje już subdomena z tymi ustawieniami.';
$wb['hd_quota_error_empty'] = 'Limit dysku jest pusty lub wynosi 0.';
$wb['traffic_quota_error_empty'] = 'Limit transferu jest pusty.';
@@ -62,7 +70,6 @@
$wb['ssl_organistaion_unit_error_regex'] = 'Nieprawidłowa jednostka SSL. Dozwolone znaki to: a-z, 0-9 i .,-_';
$wb['ssl_country_error_regex'] = 'Nieprawidłowy kraj SSL. Dozwolone znaki to: A-Z';
$wb['limit_traffic_quota_free_txt'] = 'Maks. dostępny limit transferu';
-$wb['redirect_error_regex'] = 'Nieprawidłowa ścieżka przekierowania. Przykładowe prawidłowe przekierowania: /test/ lub http://www.domena.pl/test/';
$wb['php_open_basedir_txt'] = 'PHP open_basedir';
$wb['traffic_quota_exceeded_txt'] = 'Limit transferu został przekroczony';
$wb['ruby_txt'] = 'Ruby';
@@ -71,8 +78,6 @@
$wb['custom_php_ini_txt'] = 'Własne ustawienia php.ini';
$wb['none_txt'] = 'Brak';
$wb['disabled_txt'] = 'Wyłączone';
-$wb['no_redirect_txt'] = 'Bez przekierowania';
-$wb['no_flag_txt'] = 'Bez flagi';
$wb['save_certificate_txt'] = 'Zapisz certyfikat';
$wb['create_certificate_txt'] = 'Utwórz certyfikat';
$wb['delete_certificate_txt'] = 'Usuń certyfikat';
@@ -109,7 +114,6 @@
$wb['available_php_directive_snippets_txt'] = 'Dostępne zestawy dyrektyw PHP:';
$wb['available_apache_directive_snippets_txt'] = 'Dostępne zestawy dyrektyw Apache:';
$wb['available_nginx_directive_snippets_txt'] = 'Dostępne zestawy dyrektyw nginx:';
-$wb['proxy_directives_txt'] = 'Dyrektywny Proxy';
-$wb['available_proxy_directive_snippets_txt'] = 'Dostępne zestawy dyrektyw Proxy:';
$wb['Domain'] = 'Alias domeny';
+
?>
diff --git a/interface/web/sites/lib/lang/pl_web_aliasdomain_list.lng b/interface/web/sites/lib/lang/pl_web_childdomain_list.lng
similarity index 75%
rename from interface/web/sites/lib/lang/pl_web_aliasdomain_list.lng
rename to interface/web/sites/lib/lang/pl_web_childdomain_list.lng
index 5bdd8e8..8c01887 100644
--- a/interface/web/sites/lib/lang/pl_web_aliasdomain_list.lng
+++ b/interface/web/sites/lib/lang/pl_web_childdomain_list.lng
@@ -1,14 +1,15 @@
<?php
-$wb['list_head_txt'] = 'Alias domeny';
+$wb['list_head_txt'] = 'Subdomeny';
$wb['active_txt'] = 'Aktywny';
$wb['server_id_txt'] = 'Serwer';
$wb['parent_domain_id_txt'] = 'Strona www';
-$wb['domain_txt'] = 'Alias domeny';
-$wb['add_new_record_txt'] = 'Dodaj nowy alias domeny';
+$wb['domain_txt'] = 'Subdomena';
+$wb['add_new_record_txt'] = 'Dodaj nową subdomene';
$wb['domain_error_empty'] = 'Domena jest pusta.';
$wb['domain_error_unique'] = 'Domena musi być unikatowa.';
$wb['domain_error_regex'] = 'Nazwa domeny ma niepoprawny format.';
$wb['no_redirect_txt'] = 'Bez przekierowania';
$wb['no_flag_txt'] = 'Bez flagi';
$wb['none_txt'] = 'Brak';
+
?>
diff --git a/interface/web/sites/lib/lang/pl_web_subdomain.lng b/interface/web/sites/lib/lang/pl_web_subdomain.lng
deleted file mode 100644
index def9efb..0000000
--- a/interface/web/sites/lib/lang/pl_web_subdomain.lng
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-$wb['ssl_state_txt'] = 'Stan';
-$wb['ssl_locality_txt'] = 'Lokalizacja';
-$wb['ssl_organisation_txt'] = 'Organizacja';
-$wb['ssl_organisation_unit_txt'] = 'Jednostka organizacji';
-$wb['ssl_country_txt'] = 'Państwo';
-$wb['ssl_request_txt'] = 'Żądanie SSL';
-$wb['ssl_cert_txt'] = 'Certyfikat SSL';
-$wb['ssl_bundle_txt'] = 'Paczka SSL';
-$wb['ssl_action_txt'] = 'Akcja SSL';
-$wb['server_id_txt'] = 'Serwer';
-$wb['domain_txt'] = 'Domena';
-$wb['type_txt'] = 'Typ';
-$wb['parent_domain_id_txt'] = 'Macierzysta strona www';
-$wb['redirect_type_txt'] = 'Typ przekierowania';
-$wb['redirect_path_txt'] = 'Ścieżka przekierowania';
-$wb['active_txt'] = 'Aktywny';
-$wb['document_root_txt'] = 'Główny katalog';
-$wb['system_user_txt'] = 'Użytkownik Linuksa';
-$wb['system_group_txt'] = 'Grupa Linux';
-$wb['ip_address_txt'] = 'Adres IP';
-$wb['vhost_type_txt'] = 'Typ wirtualnego hosta';
-$wb['hd_quota_txt'] = 'Limit twardego dysku';
-$wb['traffic_quota_txt'] = 'Limit ruchu na serwerze';
-$wb['cgi_txt'] = 'CGI';
-$wb['ssi_txt'] = 'SSI';
-$wb['ssl_txt'] = 'SSL';
-$wb['suexec_txt'] = 'SuEXEC';
-$wb['php_txt'] = 'PHP';
-$wb['client_txt'] = 'Klient';
-$wb['limit_web_domain_txt'] = 'Maksymalna ilość domen dla Twojego konta została przekroczona.';
-$wb['limit_web_aliasdomain_txt'] = 'Maksymalna ilość aliasów dla Twojego konta została przekroczona.';
-$wb['limit_web_subdomain_txt'] = 'Maksymalna ilość subdomen dla Twojego konta została przekroczona.';
-$wb['apache_directives_txt'] = 'Dyrektywy Apache';
-$wb['domain_error_empty'] = 'Domena jest pusta.';
-$wb['domain_error_unique'] = 'Istnieje już domena, alias lub subdomena o podanej nazwie.';
-$wb['domain_error_regex'] = 'Nazwa domeny jest nieprawidłowa.';
-$wb['host_txt'] = 'Serwer';
-$wb['redirect_error_regex'] = 'Nieprawidłowa ścieżka przekierowania. Poprawne przekierowanie to np.: /test/ lub http://www.domain.tld/test/';
-$wb['no_redirect_txt'] = 'Bez przekierowania';
-$wb['no_flag_txt'] = 'Bez flagi';
-$wb['domain_error_wildcard'] = 'Subdomeny typu wildcard nie są dozwolone';
-$wb['proxy_directives_txt'] = 'Dyrektywy Proxy';
-$wb['available_proxy_directive_snippets_txt'] = 'Dostępne konfiguracje dodatkowe Proxy';
-$wb['error_proxy_requires_url'] = 'Rodzaj przekierowania ';
-?>
diff --git a/interface/web/sites/lib/lang/pl_web_subdomain_list.lng b/interface/web/sites/lib/lang/pl_web_subdomain_list.lng
deleted file mode 100644
index 9ccb0a3..0000000
--- a/interface/web/sites/lib/lang/pl_web_subdomain_list.lng
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Subdomeny';
-$wb['active_txt'] = 'Aktywny';
-$wb['server_id_txt'] = 'Serwer';
-$wb['parent_domain_id_txt'] = 'Strona www';
-$wb['domain_txt'] = 'Subdomena';
-$wb['add_new_record_txt'] = 'Dodaj nową subdomene';
-?>
diff --git a/interface/web/sites/lib/lang/pt_web_aliasdomain.lng b/interface/web/sites/lib/lang/pt_web_aliasdomain.lng
deleted file mode 100644
index 4149c71..0000000
--- a/interface/web/sites/lib/lang/pt_web_aliasdomain.lng
+++ /dev/null
@@ -1,115 +0,0 @@
-<?php
-$wb['domain_txt'] = 'Aliasdomain';
-$wb['backup_interval_txt'] = 'Backup interval';
-$wb['backup_copies_txt'] = 'Number of backup copies';
-$wb['ssl_state_txt'] = 'State';
-$wb['ssl_locality_txt'] = 'Locality';
-$wb['ssl_organisation_txt'] = 'Organisation';
-$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
-$wb['ssl_country_txt'] = 'Country';
-$wb['ssl_key_txt'] = 'SSL Key';
-$wb['ssl_request_txt'] = 'SSL Request';
-$wb['ssl_cert_txt'] = 'SSL Certificate';
-$wb['ssl_bundle_txt'] = 'SSL Bundle';
-$wb['ssl_action_txt'] = 'SSL Action';
-$wb['ssl_domain_txt'] = 'SSL Domain';
-$wb['server_id_txt'] = 'Server';
-$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
-$wb['type_txt'] = 'Type';
-$wb['parent_domain_id_txt'] = 'Parent Website';
-$wb['redirect_type_txt'] = 'Redirect Type';
-$wb['redirect_path_txt'] = 'Redirect Path';
-$wb['active_txt'] = 'Active';
-$wb['document_root_txt'] = 'Documentroot';
-$wb['system_user_txt'] = 'Linux User';
-$wb['system_group_txt'] = 'Linux Group';
-$wb['ip_address_txt'] = 'IPv4-Address';
-$wb['ipv6_address_txt'] = 'IPv6-Address';
-$wb['vhost_type_txt'] = 'VHost Type';
-$wb['hd_quota_txt'] = 'Harddisk Quota';
-$wb['traffic_quota_txt'] = 'Traffic Quota';
-$wb['cgi_txt'] = 'CGI';
-$wb['ssi_txt'] = 'SSI';
-$wb['errordocs_txt'] = 'Own Error-Documents';
-$wb['subdomain_txt'] = 'Auto-Subdomain';
-$wb['ssl_txt'] = 'SSL';
-$wb['suexec_txt'] = 'SuEXEC';
-$wb['php_txt'] = 'PHP';
-$wb['client_txt'] = 'Client';
-$wb['limit_web_domain_txt'] = 'The max. number of web domains for your account is reached.';
-$wb['limit_web_aliasdomain_txt'] = 'The max. number of aliasdomains for your account is reached.';
-$wb['limit_web_subdomain_txt'] = 'The max. number of web subdomains for your account is reached.';
-$wb['apache_directives_txt'] = 'Apache Directives';
-$wb['domain_error_empty'] = 'Domain is empty.';
-$wb['domain_error_unique'] = 'There is already a website or sub / aliasdomain with this domain name.';
-$wb['domain_error_regex'] = 'Domain name invalid.';
-$wb['domain_error_autosub'] = 'There is already a subdomain with these settings.';
-$wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
-$wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
-$wb['error_ssl_state_empty'] = 'SSL State is empty.';
-$wb['error_ssl_locality_empty'] = 'SSL Locality is empty.';
-$wb['error_ssl_organisation_empty'] = 'SSL Organisation is empty.';
-$wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.';
-$wb['error_ssl_country_empty'] = 'SSL Country is empty.';
-$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
-$wb['client_group_id_txt'] = 'Client';
-$wb['stats_password_txt'] = 'Set Webstatistics password';
-$wb['allow_override_txt'] = 'Apache AllowOverride';
-$wb['limit_web_quota_free_txt'] = 'Max. available Harddisk Quota';
-$wb['ssl_state_error_regex'] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_locality_error_regex'] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_organisation_error_regex'] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
-$wb['limit_traffic_quota_free_txt'] = 'Max. available Traffic Quota';
-$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
-$wb['php_open_basedir_txt'] = 'PHP open_basedir';
-$wb['traffic_quota_exceeded_txt'] = 'Traffic quota exceeded';
-$wb['ruby_txt'] = 'Ruby';
-$wb['stats_user_txt'] = 'Webstatistics username';
-$wb['stats_type_txt'] = 'Webstatistics program';
-$wb['custom_php_ini_txt'] = 'Custom php.ini settings';
-$wb['none_txt'] = 'None';
-$wb['disabled_txt'] = 'Disabled';
-$wb['no_redirect_txt'] = 'No redirect';
-$wb['no_flag_txt'] = 'No flag';
-$wb['save_certificate_txt'] = 'Save certificate';
-$wb['create_certificate_txt'] = 'Create certificate';
-$wb['delete_certificate_txt'] = 'Delete certificate';
-$wb['nginx_directives_txt'] = 'nginx Directives';
-$wb['seo_redirect_txt'] = 'SEO Redirect';
-$wb['non_www_to_www_txt'] = 'Non-www -> www';
-$wb['www_to_non_www_txt'] = 'www -> non-www';
-$wb['php_fpm_use_socket_txt'] = 'Use Socket For PHP-FPM';
-$wb['error_no_sni_txt'] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
-$wb['python_txt'] = 'Python';
-$wb['perl_txt'] = 'Perl';
-$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
-$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
-$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
-$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
-$wb['error_php_fpm_pm_settings_txt'] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children >= pm.max_spare_servers >= pm.start_servers >= pm.min_spare_servers > 0';
-$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive integer value.';
-$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
-$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
-$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
-$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
-$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
-$wb['fastcgi_php_version_txt'] = 'PHP Version';
-$wb['pm_txt'] = 'PHP-FPM Process Manager';
-$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
-$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
-$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
-$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
-$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
-$wb['generate_password_txt'] = 'Generate Password';
-$wb['repeat_password_txt'] = 'Repeat Password';
-$wb['password_mismatch_txt'] = 'The passwords do not match.';
-$wb['password_match_txt'] = 'The passwords do match.';
-$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
-$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
-$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
-$wb['proxy_directives_txt'] = 'Proxy Directives';
-$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
-$wb['Domain'] = 'Aliasdomain';
-?>
diff --git a/interface/web/sites/lib/lang/ar_web_aliasdomain.lng b/interface/web/sites/lib/lang/pt_web_childdomain.lng
similarity index 74%
copy from interface/web/sites/lib/lang/ar_web_aliasdomain.lng
copy to interface/web/sites/lib/lang/pt_web_childdomain.lng
index 4149c71..5e436bf 100644
--- a/interface/web/sites/lib/lang/ar_web_aliasdomain.lng
+++ b/interface/web/sites/lib/lang/pt_web_childdomain.lng
@@ -1,48 +1,56 @@
<?php
-$wb['domain_txt'] = 'Aliasdomain';
-$wb['backup_interval_txt'] = 'Backup interval';
-$wb['backup_copies_txt'] = 'Number of backup copies';
-$wb['ssl_state_txt'] = 'State';
-$wb['ssl_locality_txt'] = 'Locality';
-$wb['ssl_organisation_txt'] = 'Organisation';
-$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
-$wb['ssl_country_txt'] = 'Country';
-$wb['ssl_key_txt'] = 'SSL Key';
-$wb['ssl_request_txt'] = 'SSL Request';
-$wb['ssl_cert_txt'] = 'SSL Certificate';
-$wb['ssl_bundle_txt'] = 'SSL Bundle';
-$wb['ssl_action_txt'] = 'SSL Action';
-$wb['ssl_domain_txt'] = 'SSL Domain';
-$wb['server_id_txt'] = 'Server';
-$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
-$wb['type_txt'] = 'Type';
-$wb['parent_domain_id_txt'] = 'Parent Website';
-$wb['redirect_type_txt'] = 'Redirect Type';
-$wb['redirect_path_txt'] = 'Redirect Path';
-$wb['active_txt'] = 'Active';
+$wb['ssl_state_txt'] = 'Estado';
+$wb['ssl_locality_txt'] = 'Localidade';
+$wb['ssl_organisation_txt'] = 'Empresa';
+$wb['ssl_organisation_unit_txt'] = 'Departamento';
+$wb['ssl_country_txt'] = 'País';
+$wb['ssl_request_txt'] = 'Requisição SSL';
+$wb['ssl_cert_txt'] = 'Certificado SSL';
+$wb['ssl_bundle_txt'] = 'Pacote SSL';
+$wb['ssl_action_txt'] = 'Acção SSL';
+$wb['server_id_txt'] = 'Servidor';
+$wb['domain_txt'] = 'Domínio';
+$wb['type_txt'] = 'Tipo';
+$wb['parent_domain_id_txt'] = 'Site Parente';
+$wb['redirect_type_txt'] = 'Tipo do Redireccionamento';
+$wb['redirect_path_txt'] = 'Pasta do Redireccionamento';
+$wb['active_txt'] = 'Activo';
$wb['document_root_txt'] = 'Documentroot';
-$wb['system_user_txt'] = 'Linux User';
-$wb['system_group_txt'] = 'Linux Group';
-$wb['ip_address_txt'] = 'IPv4-Address';
-$wb['ipv6_address_txt'] = 'IPv6-Address';
-$wb['vhost_type_txt'] = 'VHost Type';
-$wb['hd_quota_txt'] = 'Harddisk Quota';
-$wb['traffic_quota_txt'] = 'Traffic Quota';
+$wb['system_user_txt'] = 'Utilizador no Linux';
+$wb['system_group_txt'] = 'Grupo no Linux';
+$wb['ip_address_txt'] = 'Endereço-IP';
+$wb['vhost_type_txt'] = 'Tipo de VHost';
+$wb['hd_quota_txt'] = 'Cota de Disco';
+$wb['traffic_quota_txt'] = 'Cota de Tráfico';
$wb['cgi_txt'] = 'CGI';
$wb['ssi_txt'] = 'SSI';
-$wb['errordocs_txt'] = 'Own Error-Documents';
-$wb['subdomain_txt'] = 'Auto-Subdomain';
$wb['ssl_txt'] = 'SSL';
$wb['suexec_txt'] = 'SuEXEC';
$wb['php_txt'] = 'PHP';
-$wb['client_txt'] = 'Client';
-$wb['limit_web_domain_txt'] = 'The max. number of web domains for your account is reached.';
-$wb['limit_web_aliasdomain_txt'] = 'The max. number of aliasdomains for your account is reached.';
-$wb['limit_web_subdomain_txt'] = 'The max. number of web subdomains for your account is reached.';
-$wb['apache_directives_txt'] = 'Apache Directives';
-$wb['domain_error_empty'] = 'Domain is empty.';
-$wb['domain_error_unique'] = 'There is already a website or sub / aliasdomain with this domain name.';
-$wb['domain_error_regex'] = 'Domain name invalid.';
+$wb['client_txt'] = 'Cliente';
+$wb['limit_web_domain_txt'] = 'O número máximo de domínios web para esta conta foi atingido.';
+$wb['limit_web_aliasdomain_txt'] = 'O número máximo de aliases para esta conta foi atingido.';
+$wb['limit_web_subdomain_txt'] = 'O número máximo de sub-domínios para esta conta foi atingido.';
+$wb['apache_directives_txt'] = 'Directivas apache';
+$wb['domain_error_empty'] = 'Domínio em branco.';
+$wb['domain_error_unique'] = 'Já existe um alias ou sub-domínio com este nome.';
+$wb['domain_error_regex'] = 'Nome de domínio inválido.';
+$wb['host_txt'] = 'Host';
+$wb['redirect_error_regex'] = 'Pasta de redireccionamento inválida. Exemplos de redireccionamentos válidos: /test/ or http://www.dominio.pt/test/';
+$wb['no_redirect_txt'] = 'No redirect';
+$wb['no_flag_txt'] = 'No flag';
+$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
+$wb['proxy_directives_txt'] = 'Proxy Directives';
+$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
+$wb['error_proxy_requires_url'] = 'Redirect Type \"proxy\" requires a URL as the redirect path.';
+$wb['backup_interval_txt'] = 'Backup interval';
+$wb['backup_copies_txt'] = 'Number of backup copies';
+$wb['ssl_key_txt'] = 'SSL Key';
+$wb['ssl_domain_txt'] = 'SSL Domain';
+$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
+$wb['ipv6_address_txt'] = 'IPv6-Address';
+$wb['errordocs_txt'] = 'Own Error-Documents';
+$wb['subdomain_txt'] = 'Auto-Subdomain';
$wb['domain_error_autosub'] = 'There is already a subdomain with these settings.';
$wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
$wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
@@ -62,7 +70,6 @@
$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
$wb['limit_traffic_quota_free_txt'] = 'Max. available Traffic Quota';
-$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
$wb['php_open_basedir_txt'] = 'PHP open_basedir';
$wb['traffic_quota_exceeded_txt'] = 'Traffic quota exceeded';
$wb['ruby_txt'] = 'Ruby';
@@ -71,8 +78,6 @@
$wb['custom_php_ini_txt'] = 'Custom php.ini settings';
$wb['none_txt'] = 'None';
$wb['disabled_txt'] = 'Disabled';
-$wb['no_redirect_txt'] = 'No redirect';
-$wb['no_flag_txt'] = 'No flag';
$wb['save_certificate_txt'] = 'Save certificate';
$wb['create_certificate_txt'] = 'Create certificate';
$wb['delete_certificate_txt'] = 'Delete certificate';
@@ -109,7 +114,6 @@
$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
-$wb['proxy_directives_txt'] = 'Proxy Directives';
-$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
$wb['Domain'] = 'Aliasdomain';
+
?>
diff --git a/interface/web/sites/lib/lang/pt_web_aliasdomain_list.lng b/interface/web/sites/lib/lang/pt_web_childdomain_list.lng
similarity index 73%
rename from interface/web/sites/lib/lang/pt_web_aliasdomain_list.lng
rename to interface/web/sites/lib/lang/pt_web_childdomain_list.lng
index 435305c..f959385 100644
--- a/interface/web/sites/lib/lang/pt_web_aliasdomain_list.lng
+++ b/interface/web/sites/lib/lang/pt_web_childdomain_list.lng
@@ -1,14 +1,15 @@
<?php
-$wb['list_head_txt'] = 'Domínio Alias';
+$wb['list_head_txt'] = 'Sub-domínios';
$wb['active_txt'] = 'Activo';
$wb['server_id_txt'] = 'Servidor';
$wb['parent_domain_id_txt'] = 'Website';
-$wb['domain_txt'] = 'Domínio Alias';
-$wb['add_new_record_txt'] = 'Adicionar Alias de Domínio';
+$wb['domain_txt'] = 'Sub-domínio';
+$wb['add_new_record_txt'] = 'Adicionar um novo sub-domínio';
$wb['domain_error_empty'] = 'Domínio em branco.';
$wb['domain_error_unique'] = 'O domínio deve ser único.';
$wb['domain_error_regex'] = 'Nome de domínio inválido.';
$wb['no_redirect_txt'] = 'No redirect';
$wb['no_flag_txt'] = 'No flag';
$wb['none_txt'] = 'None';
+
?>
diff --git a/interface/web/sites/lib/lang/pt_web_subdomain.lng b/interface/web/sites/lib/lang/pt_web_subdomain.lng
deleted file mode 100644
index 570badc..0000000
--- a/interface/web/sites/lib/lang/pt_web_subdomain.lng
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-$wb['ssl_state_txt'] = 'Estado';
-$wb['ssl_locality_txt'] = 'Localidade';
-$wb['ssl_organisation_txt'] = 'Empresa';
-$wb['ssl_organisation_unit_txt'] = 'Departamento';
-$wb['ssl_country_txt'] = 'País';
-$wb['ssl_request_txt'] = 'Requisição SSL';
-$wb['ssl_cert_txt'] = 'Certificado SSL';
-$wb['ssl_bundle_txt'] = 'Pacote SSL';
-$wb['ssl_action_txt'] = 'Acção SSL';
-$wb['server_id_txt'] = 'Servidor';
-$wb['domain_txt'] = 'Domínio';
-$wb['type_txt'] = 'Tipo';
-$wb['parent_domain_id_txt'] = 'Site Parente';
-$wb['redirect_type_txt'] = 'Tipo do Redireccionamento';
-$wb['redirect_path_txt'] = 'Pasta do Redireccionamento';
-$wb['active_txt'] = 'Activo';
-$wb['document_root_txt'] = 'Documentroot';
-$wb['system_user_txt'] = 'Utilizador no Linux';
-$wb['system_group_txt'] = 'Grupo no Linux';
-$wb['ip_address_txt'] = 'Endereço-IP';
-$wb['vhost_type_txt'] = 'Tipo de VHost';
-$wb['hd_quota_txt'] = 'Cota de Disco';
-$wb['traffic_quota_txt'] = 'Cota de Tráfico';
-$wb['cgi_txt'] = 'CGI';
-$wb['ssi_txt'] = 'SSI';
-$wb['ssl_txt'] = 'SSL';
-$wb['suexec_txt'] = 'SuEXEC';
-$wb['php_txt'] = 'PHP';
-$wb['client_txt'] = 'Cliente';
-$wb['limit_web_domain_txt'] = 'O número máximo de domínios web para esta conta foi atingido.';
-$wb['limit_web_aliasdomain_txt'] = 'O número máximo de aliases para esta conta foi atingido.';
-$wb['limit_web_subdomain_txt'] = 'O número máximo de sub-domínios para esta conta foi atingido.';
-$wb['apache_directives_txt'] = 'Directivas apache';
-$wb['domain_error_empty'] = 'Domínio em branco.';
-$wb['domain_error_unique'] = 'Já existe um alias ou sub-domínio com este nome.';
-$wb['domain_error_regex'] = 'Nome de domínio inválido.';
-$wb['host_txt'] = 'Host';
-$wb['redirect_error_regex'] = 'Pasta de redireccionamento inválida. Exemplos de redireccionamentos válidos: /test/ or http://www.dominio.pt/test/';
-$wb['no_redirect_txt'] = 'No redirect';
-$wb['no_flag_txt'] = 'No flag';
-$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
-$wb['proxy_directives_txt'] = 'Proxy Directives';
-$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
-$wb['error_proxy_requires_url'] = 'Redirect Type \\"proxy\\" requires a URL as the redirect path.';
-?>
diff --git a/interface/web/sites/lib/lang/pt_web_subdomain_list.lng b/interface/web/sites/lib/lang/pt_web_subdomain_list.lng
deleted file mode 100644
index 37fa572..0000000
--- a/interface/web/sites/lib/lang/pt_web_subdomain_list.lng
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Sub-domínios';
-$wb['active_txt'] = 'Activo';
-$wb['server_id_txt'] = 'Servidor';
-$wb['parent_domain_id_txt'] = 'Website';
-$wb['domain_txt'] = 'Sub-domínio';
-$wb['add_new_record_txt'] = 'Adicionar um novo sub-domínio';
-?>
diff --git a/interface/web/sites/lib/lang/ro_web_aliasdomain.lng b/interface/web/sites/lib/lang/ro_web_aliasdomain.lng
deleted file mode 100644
index 4149c71..0000000
--- a/interface/web/sites/lib/lang/ro_web_aliasdomain.lng
+++ /dev/null
@@ -1,115 +0,0 @@
-<?php
-$wb['domain_txt'] = 'Aliasdomain';
-$wb['backup_interval_txt'] = 'Backup interval';
-$wb['backup_copies_txt'] = 'Number of backup copies';
-$wb['ssl_state_txt'] = 'State';
-$wb['ssl_locality_txt'] = 'Locality';
-$wb['ssl_organisation_txt'] = 'Organisation';
-$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
-$wb['ssl_country_txt'] = 'Country';
-$wb['ssl_key_txt'] = 'SSL Key';
-$wb['ssl_request_txt'] = 'SSL Request';
-$wb['ssl_cert_txt'] = 'SSL Certificate';
-$wb['ssl_bundle_txt'] = 'SSL Bundle';
-$wb['ssl_action_txt'] = 'SSL Action';
-$wb['ssl_domain_txt'] = 'SSL Domain';
-$wb['server_id_txt'] = 'Server';
-$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
-$wb['type_txt'] = 'Type';
-$wb['parent_domain_id_txt'] = 'Parent Website';
-$wb['redirect_type_txt'] = 'Redirect Type';
-$wb['redirect_path_txt'] = 'Redirect Path';
-$wb['active_txt'] = 'Active';
-$wb['document_root_txt'] = 'Documentroot';
-$wb['system_user_txt'] = 'Linux User';
-$wb['system_group_txt'] = 'Linux Group';
-$wb['ip_address_txt'] = 'IPv4-Address';
-$wb['ipv6_address_txt'] = 'IPv6-Address';
-$wb['vhost_type_txt'] = 'VHost Type';
-$wb['hd_quota_txt'] = 'Harddisk Quota';
-$wb['traffic_quota_txt'] = 'Traffic Quota';
-$wb['cgi_txt'] = 'CGI';
-$wb['ssi_txt'] = 'SSI';
-$wb['errordocs_txt'] = 'Own Error-Documents';
-$wb['subdomain_txt'] = 'Auto-Subdomain';
-$wb['ssl_txt'] = 'SSL';
-$wb['suexec_txt'] = 'SuEXEC';
-$wb['php_txt'] = 'PHP';
-$wb['client_txt'] = 'Client';
-$wb['limit_web_domain_txt'] = 'The max. number of web domains for your account is reached.';
-$wb['limit_web_aliasdomain_txt'] = 'The max. number of aliasdomains for your account is reached.';
-$wb['limit_web_subdomain_txt'] = 'The max. number of web subdomains for your account is reached.';
-$wb['apache_directives_txt'] = 'Apache Directives';
-$wb['domain_error_empty'] = 'Domain is empty.';
-$wb['domain_error_unique'] = 'There is already a website or sub / aliasdomain with this domain name.';
-$wb['domain_error_regex'] = 'Domain name invalid.';
-$wb['domain_error_autosub'] = 'There is already a subdomain with these settings.';
-$wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
-$wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
-$wb['error_ssl_state_empty'] = 'SSL State is empty.';
-$wb['error_ssl_locality_empty'] = 'SSL Locality is empty.';
-$wb['error_ssl_organisation_empty'] = 'SSL Organisation is empty.';
-$wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.';
-$wb['error_ssl_country_empty'] = 'SSL Country is empty.';
-$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
-$wb['client_group_id_txt'] = 'Client';
-$wb['stats_password_txt'] = 'Set Webstatistics password';
-$wb['allow_override_txt'] = 'Apache AllowOverride';
-$wb['limit_web_quota_free_txt'] = 'Max. available Harddisk Quota';
-$wb['ssl_state_error_regex'] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_locality_error_regex'] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_organisation_error_regex'] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
-$wb['limit_traffic_quota_free_txt'] = 'Max. available Traffic Quota';
-$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
-$wb['php_open_basedir_txt'] = 'PHP open_basedir';
-$wb['traffic_quota_exceeded_txt'] = 'Traffic quota exceeded';
-$wb['ruby_txt'] = 'Ruby';
-$wb['stats_user_txt'] = 'Webstatistics username';
-$wb['stats_type_txt'] = 'Webstatistics program';
-$wb['custom_php_ini_txt'] = 'Custom php.ini settings';
-$wb['none_txt'] = 'None';
-$wb['disabled_txt'] = 'Disabled';
-$wb['no_redirect_txt'] = 'No redirect';
-$wb['no_flag_txt'] = 'No flag';
-$wb['save_certificate_txt'] = 'Save certificate';
-$wb['create_certificate_txt'] = 'Create certificate';
-$wb['delete_certificate_txt'] = 'Delete certificate';
-$wb['nginx_directives_txt'] = 'nginx Directives';
-$wb['seo_redirect_txt'] = 'SEO Redirect';
-$wb['non_www_to_www_txt'] = 'Non-www -> www';
-$wb['www_to_non_www_txt'] = 'www -> non-www';
-$wb['php_fpm_use_socket_txt'] = 'Use Socket For PHP-FPM';
-$wb['error_no_sni_txt'] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
-$wb['python_txt'] = 'Python';
-$wb['perl_txt'] = 'Perl';
-$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
-$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
-$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
-$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
-$wb['error_php_fpm_pm_settings_txt'] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children >= pm.max_spare_servers >= pm.start_servers >= pm.min_spare_servers > 0';
-$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive integer value.';
-$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
-$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
-$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
-$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
-$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
-$wb['fastcgi_php_version_txt'] = 'PHP Version';
-$wb['pm_txt'] = 'PHP-FPM Process Manager';
-$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
-$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
-$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
-$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
-$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
-$wb['generate_password_txt'] = 'Generate Password';
-$wb['repeat_password_txt'] = 'Repeat Password';
-$wb['password_mismatch_txt'] = 'The passwords do not match.';
-$wb['password_match_txt'] = 'The passwords do match.';
-$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
-$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
-$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
-$wb['proxy_directives_txt'] = 'Proxy Directives';
-$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
-$wb['Domain'] = 'Aliasdomain';
-?>
diff --git a/interface/web/sites/lib/lang/ar_web_aliasdomain.lng b/interface/web/sites/lib/lang/ro_web_childdomain.lng
similarity index 86%
copy from interface/web/sites/lib/lang/ar_web_aliasdomain.lng
copy to interface/web/sites/lib/lang/ro_web_childdomain.lng
index 4149c71..2f9fc74 100644
--- a/interface/web/sites/lib/lang/ar_web_aliasdomain.lng
+++ b/interface/web/sites/lib/lang/ro_web_childdomain.lng
@@ -1,20 +1,15 @@
<?php
-$wb['domain_txt'] = 'Aliasdomain';
-$wb['backup_interval_txt'] = 'Backup interval';
-$wb['backup_copies_txt'] = 'Number of backup copies';
-$wb['ssl_state_txt'] = 'State';
-$wb['ssl_locality_txt'] = 'Locality';
+$wb['ssl_state_txt'] = 'Judet';
+$wb['ssl_locality_txt'] = 'Localitate';
$wb['ssl_organisation_txt'] = 'Organisation';
$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
-$wb['ssl_country_txt'] = 'Country';
-$wb['ssl_key_txt'] = 'SSL Key';
-$wb['ssl_request_txt'] = 'SSL Request';
-$wb['ssl_cert_txt'] = 'SSL Certificate';
-$wb['ssl_bundle_txt'] = 'SSL Bundle';
+$wb['ssl_country_txt'] = 'Tara';
+$wb['ssl_request_txt'] = 'SSL Cerere';
+$wb['ssl_cert_txt'] = 'SSL Certificat';
+$wb['ssl_bundle_txt'] = 'SSL Bundle (pachet)';
$wb['ssl_action_txt'] = 'SSL Action';
-$wb['ssl_domain_txt'] = 'SSL Domain';
$wb['server_id_txt'] = 'Server';
-$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
+$wb['domain_txt'] = 'Domain';
$wb['type_txt'] = 'Type';
$wb['parent_domain_id_txt'] = 'Parent Website';
$wb['redirect_type_txt'] = 'Redirect Type';
@@ -23,26 +18,39 @@
$wb['document_root_txt'] = 'Documentroot';
$wb['system_user_txt'] = 'Linux User';
$wb['system_group_txt'] = 'Linux Group';
-$wb['ip_address_txt'] = 'IPv4-Address';
-$wb['ipv6_address_txt'] = 'IPv6-Address';
+$wb['ip_address_txt'] = 'IP-Address';
$wb['vhost_type_txt'] = 'VHost Type';
$wb['hd_quota_txt'] = 'Harddisk Quota';
-$wb['traffic_quota_txt'] = 'Traffic Quota';
+$wb['traffic_quota_txt'] = 'Traffic Quaota';
$wb['cgi_txt'] = 'CGI';
$wb['ssi_txt'] = 'SSI';
-$wb['errordocs_txt'] = 'Own Error-Documents';
-$wb['subdomain_txt'] = 'Auto-Subdomain';
$wb['ssl_txt'] = 'SSL';
$wb['suexec_txt'] = 'SuEXEC';
$wb['php_txt'] = 'PHP';
$wb['client_txt'] = 'Client';
-$wb['limit_web_domain_txt'] = 'The max. number of web domains for your account is reached.';
-$wb['limit_web_aliasdomain_txt'] = 'The max. number of aliasdomains for your account is reached.';
-$wb['limit_web_subdomain_txt'] = 'The max. number of web subdomains for your account is reached.';
-$wb['apache_directives_txt'] = 'Apache Directives';
-$wb['domain_error_empty'] = 'Domain is empty.';
-$wb['domain_error_unique'] = 'There is already a website or sub / aliasdomain with this domain name.';
+$wb['limit_web_domain_txt'] = 'numarul maxim de web domnii a fost atins';
+$wb['limit_web_aliasdomain_txt'] = 'Numarul maxim de alias domain a fost atins';
+$wb['limit_web_subdomain_txt'] = 'numarul maxim de subdomenii a fost atins';
+$wb['apache_directives_txt'] = 'Apache directives';
+$wb['domain_error_empty'] = 'Domain necompletat';
+$wb['domain_error_unique'] = 'exista deja un domeniu sau subdomeniu asemanator';
$wb['domain_error_regex'] = 'Domain name invalid.';
+$wb['host_txt'] = 'Host';
+$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
+$wb['no_redirect_txt'] = 'No redirect';
+$wb['no_flag_txt'] = 'No flag';
+$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
+$wb['proxy_directives_txt'] = 'Proxy Directives';
+$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
+$wb['error_proxy_requires_url'] = 'Redirect Type \"proxy\" requires a URL as the redirect path.';
+$wb['backup_interval_txt'] = 'Backup interval';
+$wb['backup_copies_txt'] = 'Number of backup copies';
+$wb['ssl_key_txt'] = 'SSL Key';
+$wb['ssl_domain_txt'] = 'SSL Domain';
+$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
+$wb['ipv6_address_txt'] = 'IPv6-Address';
+$wb['errordocs_txt'] = 'Own Error-Documents';
+$wb['subdomain_txt'] = 'Auto-Subdomain';
$wb['domain_error_autosub'] = 'There is already a subdomain with these settings.';
$wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
$wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
@@ -62,7 +70,6 @@
$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
$wb['limit_traffic_quota_free_txt'] = 'Max. available Traffic Quota';
-$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
$wb['php_open_basedir_txt'] = 'PHP open_basedir';
$wb['traffic_quota_exceeded_txt'] = 'Traffic quota exceeded';
$wb['ruby_txt'] = 'Ruby';
@@ -71,8 +78,6 @@
$wb['custom_php_ini_txt'] = 'Custom php.ini settings';
$wb['none_txt'] = 'None';
$wb['disabled_txt'] = 'Disabled';
-$wb['no_redirect_txt'] = 'No redirect';
-$wb['no_flag_txt'] = 'No flag';
$wb['save_certificate_txt'] = 'Save certificate';
$wb['create_certificate_txt'] = 'Create certificate';
$wb['delete_certificate_txt'] = 'Delete certificate';
@@ -109,7 +114,6 @@
$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
-$wb['proxy_directives_txt'] = 'Proxy Directives';
-$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
$wb['Domain'] = 'Aliasdomain';
+
?>
diff --git a/interface/web/sites/lib/lang/ro_web_aliasdomain_list.lng b/interface/web/sites/lib/lang/ro_web_childdomain_list.lng
similarity index 73%
rename from interface/web/sites/lib/lang/ro_web_aliasdomain_list.lng
rename to interface/web/sites/lib/lang/ro_web_childdomain_list.lng
index e83de5b..ad66cbf 100644
--- a/interface/web/sites/lib/lang/ro_web_aliasdomain_list.lng
+++ b/interface/web/sites/lib/lang/ro_web_childdomain_list.lng
@@ -1,14 +1,15 @@
<?php
-$wb['list_head_txt'] = 'Aliasdomain';
+$wb['list_head_txt'] = 'Subdomenii';
$wb['active_txt'] = 'Active';
$wb['server_id_txt'] = 'Server';
$wb['parent_domain_id_txt'] = 'Website';
-$wb['domain_txt'] = 'Aliasdomain';
-$wb['add_new_record_txt'] = 'Adauga un nou aliasdomain';
+$wb['domain_txt'] = 'Subdomeniu';
+$wb['add_new_record_txt'] = 'Adauga un nou subdomeniu';
$wb['domain_error_empty'] = 'Domain necompletat';
$wb['domain_error_unique'] = 'Domain trebuie sa fie unic';
$wb['domain_error_regex'] = 'Domain nume invalid.';
$wb['no_redirect_txt'] = 'No redirect';
$wb['no_flag_txt'] = 'No flag';
$wb['none_txt'] = 'None';
+
?>
diff --git a/interface/web/sites/lib/lang/ro_web_subdomain.lng b/interface/web/sites/lib/lang/ro_web_subdomain.lng
deleted file mode 100644
index 614f886..0000000
--- a/interface/web/sites/lib/lang/ro_web_subdomain.lng
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-$wb['ssl_state_txt'] = 'Judet';
-$wb['ssl_locality_txt'] = 'Localitate';
-$wb['ssl_organisation_txt'] = 'Organisation';
-$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
-$wb['ssl_country_txt'] = 'Tara';
-$wb['ssl_request_txt'] = 'SSL Cerere';
-$wb['ssl_cert_txt'] = 'SSL Certificat';
-$wb['ssl_bundle_txt'] = 'SSL Bundle (pachet)';
-$wb['ssl_action_txt'] = 'SSL Action';
-$wb['server_id_txt'] = 'Server';
-$wb['domain_txt'] = 'Domain';
-$wb['type_txt'] = 'Type';
-$wb['parent_domain_id_txt'] = 'Parent Website';
-$wb['redirect_type_txt'] = 'Redirect Type';
-$wb['redirect_path_txt'] = 'Redirect Path';
-$wb['active_txt'] = 'Active';
-$wb['document_root_txt'] = 'Documentroot';
-$wb['system_user_txt'] = 'Linux User';
-$wb['system_group_txt'] = 'Linux Group';
-$wb['ip_address_txt'] = 'IP-Address';
-$wb['vhost_type_txt'] = 'VHost Type';
-$wb['hd_quota_txt'] = 'Harddisk Quota';
-$wb['traffic_quota_txt'] = 'Traffic Quaota';
-$wb['cgi_txt'] = 'CGI';
-$wb['ssi_txt'] = 'SSI';
-$wb['ssl_txt'] = 'SSL';
-$wb['suexec_txt'] = 'SuEXEC';
-$wb['php_txt'] = 'PHP';
-$wb['client_txt'] = 'Client';
-$wb['limit_web_domain_txt'] = 'numarul maxim de web domnii a fost atins';
-$wb['limit_web_aliasdomain_txt'] = 'Numarul maxim de alias domain a fost atins';
-$wb['limit_web_subdomain_txt'] = 'numarul maxim de subdomenii a fost atins';
-$wb['apache_directives_txt'] = 'Apache directives';
-$wb['domain_error_empty'] = 'Domain necompletat';
-$wb['domain_error_unique'] = 'exista deja un domeniu sau subdomeniu asemanator';
-$wb['domain_error_regex'] = 'Domain name invalid.';
-$wb['host_txt'] = 'Host';
-$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
-$wb['no_redirect_txt'] = 'No redirect';
-$wb['no_flag_txt'] = 'No flag';
-$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
-$wb['proxy_directives_txt'] = 'Proxy Directives';
-$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
-$wb['error_proxy_requires_url'] = 'Redirect Type \\"proxy\\" requires a URL as the redirect path.';
-?>
diff --git a/interface/web/sites/lib/lang/ro_web_subdomain_list.lng b/interface/web/sites/lib/lang/ro_web_subdomain_list.lng
deleted file mode 100644
index 445ec6c..0000000
--- a/interface/web/sites/lib/lang/ro_web_subdomain_list.lng
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Subdomenii';
-$wb['active_txt'] = 'Active';
-$wb['server_id_txt'] = 'Server';
-$wb['parent_domain_id_txt'] = 'Website';
-$wb['domain_txt'] = 'Subdomeniu';
-$wb['add_new_record_txt'] = 'Adauga un nou subdomeniu';
-?>
diff --git a/interface/web/sites/lib/lang/ru_web_aliasdomain.lng b/interface/web/sites/lib/lang/ru_web_aliasdomain.lng
deleted file mode 100644
index 4149c71..0000000
--- a/interface/web/sites/lib/lang/ru_web_aliasdomain.lng
+++ /dev/null
@@ -1,115 +0,0 @@
-<?php
-$wb['domain_txt'] = 'Aliasdomain';
-$wb['backup_interval_txt'] = 'Backup interval';
-$wb['backup_copies_txt'] = 'Number of backup copies';
-$wb['ssl_state_txt'] = 'State';
-$wb['ssl_locality_txt'] = 'Locality';
-$wb['ssl_organisation_txt'] = 'Organisation';
-$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
-$wb['ssl_country_txt'] = 'Country';
-$wb['ssl_key_txt'] = 'SSL Key';
-$wb['ssl_request_txt'] = 'SSL Request';
-$wb['ssl_cert_txt'] = 'SSL Certificate';
-$wb['ssl_bundle_txt'] = 'SSL Bundle';
-$wb['ssl_action_txt'] = 'SSL Action';
-$wb['ssl_domain_txt'] = 'SSL Domain';
-$wb['server_id_txt'] = 'Server';
-$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
-$wb['type_txt'] = 'Type';
-$wb['parent_domain_id_txt'] = 'Parent Website';
-$wb['redirect_type_txt'] = 'Redirect Type';
-$wb['redirect_path_txt'] = 'Redirect Path';
-$wb['active_txt'] = 'Active';
-$wb['document_root_txt'] = 'Documentroot';
-$wb['system_user_txt'] = 'Linux User';
-$wb['system_group_txt'] = 'Linux Group';
-$wb['ip_address_txt'] = 'IPv4-Address';
-$wb['ipv6_address_txt'] = 'IPv6-Address';
-$wb['vhost_type_txt'] = 'VHost Type';
-$wb['hd_quota_txt'] = 'Harddisk Quota';
-$wb['traffic_quota_txt'] = 'Traffic Quota';
-$wb['cgi_txt'] = 'CGI';
-$wb['ssi_txt'] = 'SSI';
-$wb['errordocs_txt'] = 'Own Error-Documents';
-$wb['subdomain_txt'] = 'Auto-Subdomain';
-$wb['ssl_txt'] = 'SSL';
-$wb['suexec_txt'] = 'SuEXEC';
-$wb['php_txt'] = 'PHP';
-$wb['client_txt'] = 'Client';
-$wb['limit_web_domain_txt'] = 'The max. number of web domains for your account is reached.';
-$wb['limit_web_aliasdomain_txt'] = 'The max. number of aliasdomains for your account is reached.';
-$wb['limit_web_subdomain_txt'] = 'The max. number of web subdomains for your account is reached.';
-$wb['apache_directives_txt'] = 'Apache Directives';
-$wb['domain_error_empty'] = 'Domain is empty.';
-$wb['domain_error_unique'] = 'There is already a website or sub / aliasdomain with this domain name.';
-$wb['domain_error_regex'] = 'Domain name invalid.';
-$wb['domain_error_autosub'] = 'There is already a subdomain with these settings.';
-$wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
-$wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
-$wb['error_ssl_state_empty'] = 'SSL State is empty.';
-$wb['error_ssl_locality_empty'] = 'SSL Locality is empty.';
-$wb['error_ssl_organisation_empty'] = 'SSL Organisation is empty.';
-$wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.';
-$wb['error_ssl_country_empty'] = 'SSL Country is empty.';
-$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
-$wb['client_group_id_txt'] = 'Client';
-$wb['stats_password_txt'] = 'Set Webstatistics password';
-$wb['allow_override_txt'] = 'Apache AllowOverride';
-$wb['limit_web_quota_free_txt'] = 'Max. available Harddisk Quota';
-$wb['ssl_state_error_regex'] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_locality_error_regex'] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_organisation_error_regex'] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
-$wb['limit_traffic_quota_free_txt'] = 'Max. available Traffic Quota';
-$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
-$wb['php_open_basedir_txt'] = 'PHP open_basedir';
-$wb['traffic_quota_exceeded_txt'] = 'Traffic quota exceeded';
-$wb['ruby_txt'] = 'Ruby';
-$wb['stats_user_txt'] = 'Webstatistics username';
-$wb['stats_type_txt'] = 'Webstatistics program';
-$wb['custom_php_ini_txt'] = 'Custom php.ini settings';
-$wb['none_txt'] = 'None';
-$wb['disabled_txt'] = 'Disabled';
-$wb['no_redirect_txt'] = 'No redirect';
-$wb['no_flag_txt'] = 'No flag';
-$wb['save_certificate_txt'] = 'Save certificate';
-$wb['create_certificate_txt'] = 'Create certificate';
-$wb['delete_certificate_txt'] = 'Delete certificate';
-$wb['nginx_directives_txt'] = 'nginx Directives';
-$wb['seo_redirect_txt'] = 'SEO Redirect';
-$wb['non_www_to_www_txt'] = 'Non-www -> www';
-$wb['www_to_non_www_txt'] = 'www -> non-www';
-$wb['php_fpm_use_socket_txt'] = 'Use Socket For PHP-FPM';
-$wb['error_no_sni_txt'] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
-$wb['python_txt'] = 'Python';
-$wb['perl_txt'] = 'Perl';
-$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
-$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
-$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
-$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
-$wb['error_php_fpm_pm_settings_txt'] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children >= pm.max_spare_servers >= pm.start_servers >= pm.min_spare_servers > 0';
-$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive integer value.';
-$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
-$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
-$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
-$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
-$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
-$wb['fastcgi_php_version_txt'] = 'PHP Version';
-$wb['pm_txt'] = 'PHP-FPM Process Manager';
-$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
-$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
-$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
-$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
-$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
-$wb['generate_password_txt'] = 'Generate Password';
-$wb['repeat_password_txt'] = 'Repeat Password';
-$wb['password_mismatch_txt'] = 'The passwords do not match.';
-$wb['password_match_txt'] = 'The passwords do match.';
-$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
-$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
-$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
-$wb['proxy_directives_txt'] = 'Proxy Directives';
-$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
-$wb['Domain'] = 'Aliasdomain';
-?>
diff --git a/interface/web/sites/lib/lang/ar_web_aliasdomain.lng b/interface/web/sites/lib/lang/ru_web_childdomain.lng
similarity index 77%
copy from interface/web/sites/lib/lang/ar_web_aliasdomain.lng
copy to interface/web/sites/lib/lang/ru_web_childdomain.lng
index 4149c71..78668f2 100644
--- a/interface/web/sites/lib/lang/ar_web_aliasdomain.lng
+++ b/interface/web/sites/lib/lang/ru_web_childdomain.lng
@@ -1,48 +1,56 @@
<?php
-$wb['domain_txt'] = 'Aliasdomain';
-$wb['backup_interval_txt'] = 'Backup interval';
-$wb['backup_copies_txt'] = 'Number of backup copies';
-$wb['ssl_state_txt'] = 'State';
+$wb['ssl_state_txt'] = 'Область/край';
$wb['ssl_locality_txt'] = 'Locality';
-$wb['ssl_organisation_txt'] = 'Organisation';
+$wb['ssl_organisation_txt'] = 'Организация';
$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
-$wb['ssl_country_txt'] = 'Country';
-$wb['ssl_key_txt'] = 'SSL Key';
-$wb['ssl_request_txt'] = 'SSL Request';
+$wb['ssl_country_txt'] = 'Страна';
+$wb['ssl_request_txt'] = 'Запрос SSL';
$wb['ssl_cert_txt'] = 'SSL Certificate';
$wb['ssl_bundle_txt'] = 'SSL Bundle';
$wb['ssl_action_txt'] = 'SSL Action';
-$wb['ssl_domain_txt'] = 'SSL Domain';
-$wb['server_id_txt'] = 'Server';
-$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
-$wb['type_txt'] = 'Type';
-$wb['parent_domain_id_txt'] = 'Parent Website';
-$wb['redirect_type_txt'] = 'Redirect Type';
-$wb['redirect_path_txt'] = 'Redirect Path';
-$wb['active_txt'] = 'Active';
+$wb['server_id_txt'] = 'Сервер';
+$wb['domain_txt'] = 'Домен';
+$wb['type_txt'] = 'Тип';
+$wb['parent_domain_id_txt'] = 'Родительский Web-сайт';
+$wb['redirect_type_txt'] = 'Т';
+$wb['redirect_path_txt'] = 'Путь редиректа';
+$wb['active_txt'] = 'Активен?';
$wb['document_root_txt'] = 'Documentroot';
-$wb['system_user_txt'] = 'Linux User';
-$wb['system_group_txt'] = 'Linux Group';
-$wb['ip_address_txt'] = 'IPv4-Address';
-$wb['ipv6_address_txt'] = 'IPv6-Address';
-$wb['vhost_type_txt'] = 'VHost Type';
-$wb['hd_quota_txt'] = 'Harddisk Quota';
-$wb['traffic_quota_txt'] = 'Traffic Quota';
+$wb['system_user_txt'] = 'Пользователь Linux';
+$wb['system_group_txt'] = 'Группа Linux';
+$wb['ip_address_txt'] = 'IP-адрес';
+$wb['vhost_type_txt'] = 'VHost Тип';
+$wb['hd_quota_txt'] = 'Квота HDD';
+$wb['traffic_quota_txt'] = 'Квота трафика';
$wb['cgi_txt'] = 'CGI';
$wb['ssi_txt'] = 'SSI';
-$wb['errordocs_txt'] = 'Own Error-Documents';
-$wb['subdomain_txt'] = 'Auto-Subdomain';
$wb['ssl_txt'] = 'SSL';
$wb['suexec_txt'] = 'SuEXEC';
$wb['php_txt'] = 'PHP';
-$wb['client_txt'] = 'Client';
-$wb['limit_web_domain_txt'] = 'The max. number of web domains for your account is reached.';
-$wb['limit_web_aliasdomain_txt'] = 'The max. number of aliasdomains for your account is reached.';
-$wb['limit_web_subdomain_txt'] = 'The max. number of web subdomains for your account is reached.';
-$wb['apache_directives_txt'] = 'Apache Directives';
-$wb['domain_error_empty'] = 'Domain is empty.';
-$wb['domain_error_unique'] = 'There is already a website or sub / aliasdomain with this domain name.';
-$wb['domain_error_regex'] = 'Domain name invalid.';
+$wb['client_txt'] = 'Клиент';
+$wb['limit_web_domain_txt'] = 'Максимальное число веб доменов достигнуто.';
+$wb['limit_web_aliasdomain_txt'] = 'Максимальное число веб алиасов достигнуто.';
+$wb['limit_web_subdomain_txt'] = 'Максимальное число веб субдоменов достигнуто.';
+$wb['apache_directives_txt'] = 'Директивы Apache';
+$wb['domain_error_empty'] = 'Домен пустой.';
+$wb['domain_error_unique'] = 'Домен должен быть уникальным.';
+$wb['domain_error_regex'] = 'Имя домена неправильно.';
+$wb['host_txt'] = 'Хост';
+$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
+$wb['no_redirect_txt'] = 'No redirect';
+$wb['no_flag_txt'] = 'No flag';
+$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
+$wb['proxy_directives_txt'] = 'Proxy Directives';
+$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
+$wb['error_proxy_requires_url'] = 'Redirect Type \"proxy\" requires a URL as the redirect path.';
+$wb['backup_interval_txt'] = 'Backup interval';
+$wb['backup_copies_txt'] = 'Number of backup copies';
+$wb['ssl_key_txt'] = 'SSL Key';
+$wb['ssl_domain_txt'] = 'SSL Domain';
+$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
+$wb['ipv6_address_txt'] = 'IPv6-Address';
+$wb['errordocs_txt'] = 'Own Error-Documents';
+$wb['subdomain_txt'] = 'Auto-Subdomain';
$wb['domain_error_autosub'] = 'There is already a subdomain with these settings.';
$wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
$wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
@@ -62,7 +70,6 @@
$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
$wb['limit_traffic_quota_free_txt'] = 'Max. available Traffic Quota';
-$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
$wb['php_open_basedir_txt'] = 'PHP open_basedir';
$wb['traffic_quota_exceeded_txt'] = 'Traffic quota exceeded';
$wb['ruby_txt'] = 'Ruby';
@@ -71,8 +78,6 @@
$wb['custom_php_ini_txt'] = 'Custom php.ini settings';
$wb['none_txt'] = 'None';
$wb['disabled_txt'] = 'Disabled';
-$wb['no_redirect_txt'] = 'No redirect';
-$wb['no_flag_txt'] = 'No flag';
$wb['save_certificate_txt'] = 'Save certificate';
$wb['create_certificate_txt'] = 'Create certificate';
$wb['delete_certificate_txt'] = 'Delete certificate';
@@ -109,7 +114,6 @@
$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
-$wb['proxy_directives_txt'] = 'Proxy Directives';
-$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
$wb['Domain'] = 'Aliasdomain';
+
?>
diff --git a/interface/web/sites/lib/lang/ru_web_aliasdomain_list.lng b/interface/web/sites/lib/lang/ru_web_childdomain_list.lng
similarity index 71%
rename from interface/web/sites/lib/lang/ru_web_aliasdomain_list.lng
rename to interface/web/sites/lib/lang/ru_web_childdomain_list.lng
index 70b449b..6ff710b 100644
--- a/interface/web/sites/lib/lang/ru_web_aliasdomain_list.lng
+++ b/interface/web/sites/lib/lang/ru_web_childdomain_list.lng
@@ -1,14 +1,15 @@
<?php
-$wb['list_head_txt'] = 'Доменные алиасы';
+$wb['list_head_txt'] = 'Субдомены';
$wb['active_txt'] = 'Активен?';
$wb['server_id_txt'] = 'Сервер';
$wb['parent_domain_id_txt'] = 'Web-сайт';
-$wb['domain_txt'] = 'Доменный алиас';
-$wb['add_new_record_txt'] = 'Добавить новый алиас';
+$wb['domain_txt'] = 'Субдомен';
+$wb['add_new_record_txt'] = 'Добавить новый Субдомен';
$wb['domain_error_empty'] = 'Домен пустой.';
$wb['domain_error_unique'] = 'Домен должен быть уникальным.';
$wb['domain_error_regex'] = 'Имя домена неправильно.';
$wb['no_redirect_txt'] = 'No redirect';
$wb['no_flag_txt'] = 'No flag';
$wb['none_txt'] = 'None';
+
?>
diff --git a/interface/web/sites/lib/lang/ru_web_subdomain.lng b/interface/web/sites/lib/lang/ru_web_subdomain.lng
deleted file mode 100644
index 8972c6e..0000000
--- a/interface/web/sites/lib/lang/ru_web_subdomain.lng
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-$wb['ssl_state_txt'] = 'Область/край';
-$wb['ssl_locality_txt'] = 'Locality';
-$wb['ssl_organisation_txt'] = 'Организация';
-$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
-$wb['ssl_country_txt'] = 'Страна';
-$wb['ssl_request_txt'] = 'Запрос SSL';
-$wb['ssl_cert_txt'] = 'SSL Certificate';
-$wb['ssl_bundle_txt'] = 'SSL Bundle';
-$wb['ssl_action_txt'] = 'SSL Action';
-$wb['server_id_txt'] = 'Сервер';
-$wb['domain_txt'] = 'Домен';
-$wb['type_txt'] = 'Тип';
-$wb['parent_domain_id_txt'] = 'Родительский Web-сайт';
-$wb['redirect_type_txt'] = 'Т';
-$wb['redirect_path_txt'] = 'Путь редиректа';
-$wb['active_txt'] = 'Активен?';
-$wb['document_root_txt'] = 'Documentroot';
-$wb['system_user_txt'] = 'Пользователь Linux';
-$wb['system_group_txt'] = 'Группа Linux';
-$wb['ip_address_txt'] = 'IP-адрес';
-$wb['vhost_type_txt'] = 'VHost Тип';
-$wb['hd_quota_txt'] = 'Квота HDD';
-$wb['traffic_quota_txt'] = 'Квота трафика';
-$wb['cgi_txt'] = 'CGI';
-$wb['ssi_txt'] = 'SSI';
-$wb['ssl_txt'] = 'SSL';
-$wb['suexec_txt'] = 'SuEXEC';
-$wb['php_txt'] = 'PHP';
-$wb['client_txt'] = 'Клиент';
-$wb['limit_web_domain_txt'] = 'Максимальное число веб доменов достигнуто.';
-$wb['limit_web_aliasdomain_txt'] = 'Максимальное число веб алиасов достигнуто.';
-$wb['limit_web_subdomain_txt'] = 'Максимальное число веб субдоменов достигнуто.';
-$wb['apache_directives_txt'] = 'Директивы Apache';
-$wb['domain_error_empty'] = 'Домен пустой.';
-$wb['domain_error_unique'] = 'Домен должен быть уникальным.';
-$wb['domain_error_regex'] = 'Имя домена неправильно.';
-$wb['host_txt'] = 'Хост';
-$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
-$wb['no_redirect_txt'] = 'No redirect';
-$wb['no_flag_txt'] = 'No flag';
-$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
-$wb['proxy_directives_txt'] = 'Proxy Directives';
-$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
-$wb['error_proxy_requires_url'] = 'Redirect Type \\"proxy\\" requires a URL as the redirect path.';
-?>
diff --git a/interface/web/sites/lib/lang/ru_web_subdomain_list.lng b/interface/web/sites/lib/lang/ru_web_subdomain_list.lng
deleted file mode 100644
index 86b42c6..0000000
--- a/interface/web/sites/lib/lang/ru_web_subdomain_list.lng
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Субдомены';
-$wb['active_txt'] = 'Активен?';
-$wb['server_id_txt'] = 'Сервер';
-$wb['parent_domain_id_txt'] = 'Web-сайт';
-$wb['domain_txt'] = 'Субдомен';
-$wb['add_new_record_txt'] = 'Добавить новый Субдомен';
-?>
diff --git a/interface/web/sites/lib/lang/se_web_aliasdomain.lng b/interface/web/sites/lib/lang/se_web_aliasdomain.lng
deleted file mode 100644
index 4149c71..0000000
--- a/interface/web/sites/lib/lang/se_web_aliasdomain.lng
+++ /dev/null
@@ -1,115 +0,0 @@
-<?php
-$wb['domain_txt'] = 'Aliasdomain';
-$wb['backup_interval_txt'] = 'Backup interval';
-$wb['backup_copies_txt'] = 'Number of backup copies';
-$wb['ssl_state_txt'] = 'State';
-$wb['ssl_locality_txt'] = 'Locality';
-$wb['ssl_organisation_txt'] = 'Organisation';
-$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
-$wb['ssl_country_txt'] = 'Country';
-$wb['ssl_key_txt'] = 'SSL Key';
-$wb['ssl_request_txt'] = 'SSL Request';
-$wb['ssl_cert_txt'] = 'SSL Certificate';
-$wb['ssl_bundle_txt'] = 'SSL Bundle';
-$wb['ssl_action_txt'] = 'SSL Action';
-$wb['ssl_domain_txt'] = 'SSL Domain';
-$wb['server_id_txt'] = 'Server';
-$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
-$wb['type_txt'] = 'Type';
-$wb['parent_domain_id_txt'] = 'Parent Website';
-$wb['redirect_type_txt'] = 'Redirect Type';
-$wb['redirect_path_txt'] = 'Redirect Path';
-$wb['active_txt'] = 'Active';
-$wb['document_root_txt'] = 'Documentroot';
-$wb['system_user_txt'] = 'Linux User';
-$wb['system_group_txt'] = 'Linux Group';
-$wb['ip_address_txt'] = 'IPv4-Address';
-$wb['ipv6_address_txt'] = 'IPv6-Address';
-$wb['vhost_type_txt'] = 'VHost Type';
-$wb['hd_quota_txt'] = 'Harddisk Quota';
-$wb['traffic_quota_txt'] = 'Traffic Quota';
-$wb['cgi_txt'] = 'CGI';
-$wb['ssi_txt'] = 'SSI';
-$wb['errordocs_txt'] = 'Own Error-Documents';
-$wb['subdomain_txt'] = 'Auto-Subdomain';
-$wb['ssl_txt'] = 'SSL';
-$wb['suexec_txt'] = 'SuEXEC';
-$wb['php_txt'] = 'PHP';
-$wb['client_txt'] = 'Client';
-$wb['limit_web_domain_txt'] = 'The max. number of web domains for your account is reached.';
-$wb['limit_web_aliasdomain_txt'] = 'The max. number of aliasdomains for your account is reached.';
-$wb['limit_web_subdomain_txt'] = 'The max. number of web subdomains for your account is reached.';
-$wb['apache_directives_txt'] = 'Apache Directives';
-$wb['domain_error_empty'] = 'Domain is empty.';
-$wb['domain_error_unique'] = 'There is already a website or sub / aliasdomain with this domain name.';
-$wb['domain_error_regex'] = 'Domain name invalid.';
-$wb['domain_error_autosub'] = 'There is already a subdomain with these settings.';
-$wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
-$wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
-$wb['error_ssl_state_empty'] = 'SSL State is empty.';
-$wb['error_ssl_locality_empty'] = 'SSL Locality is empty.';
-$wb['error_ssl_organisation_empty'] = 'SSL Organisation is empty.';
-$wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.';
-$wb['error_ssl_country_empty'] = 'SSL Country is empty.';
-$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
-$wb['client_group_id_txt'] = 'Client';
-$wb['stats_password_txt'] = 'Set Webstatistics password';
-$wb['allow_override_txt'] = 'Apache AllowOverride';
-$wb['limit_web_quota_free_txt'] = 'Max. available Harddisk Quota';
-$wb['ssl_state_error_regex'] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_locality_error_regex'] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_organisation_error_regex'] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
-$wb['limit_traffic_quota_free_txt'] = 'Max. available Traffic Quota';
-$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
-$wb['php_open_basedir_txt'] = 'PHP open_basedir';
-$wb['traffic_quota_exceeded_txt'] = 'Traffic quota exceeded';
-$wb['ruby_txt'] = 'Ruby';
-$wb['stats_user_txt'] = 'Webstatistics username';
-$wb['stats_type_txt'] = 'Webstatistics program';
-$wb['custom_php_ini_txt'] = 'Custom php.ini settings';
-$wb['none_txt'] = 'None';
-$wb['disabled_txt'] = 'Disabled';
-$wb['no_redirect_txt'] = 'No redirect';
-$wb['no_flag_txt'] = 'No flag';
-$wb['save_certificate_txt'] = 'Save certificate';
-$wb['create_certificate_txt'] = 'Create certificate';
-$wb['delete_certificate_txt'] = 'Delete certificate';
-$wb['nginx_directives_txt'] = 'nginx Directives';
-$wb['seo_redirect_txt'] = 'SEO Redirect';
-$wb['non_www_to_www_txt'] = 'Non-www -> www';
-$wb['www_to_non_www_txt'] = 'www -> non-www';
-$wb['php_fpm_use_socket_txt'] = 'Use Socket For PHP-FPM';
-$wb['error_no_sni_txt'] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
-$wb['python_txt'] = 'Python';
-$wb['perl_txt'] = 'Perl';
-$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
-$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
-$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
-$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
-$wb['error_php_fpm_pm_settings_txt'] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children >= pm.max_spare_servers >= pm.start_servers >= pm.min_spare_servers > 0';
-$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive integer value.';
-$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
-$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
-$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
-$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
-$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
-$wb['fastcgi_php_version_txt'] = 'PHP Version';
-$wb['pm_txt'] = 'PHP-FPM Process Manager';
-$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
-$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
-$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
-$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
-$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
-$wb['generate_password_txt'] = 'Generate Password';
-$wb['repeat_password_txt'] = 'Repeat Password';
-$wb['password_mismatch_txt'] = 'The passwords do not match.';
-$wb['password_match_txt'] = 'The passwords do match.';
-$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
-$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
-$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
-$wb['proxy_directives_txt'] = 'Proxy Directives';
-$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
-$wb['Domain'] = 'Aliasdomain';
-?>
diff --git a/interface/web/sites/lib/lang/se_web_aliasdomain_list.lng b/interface/web/sites/lib/lang/se_web_aliasdomain_list.lng
deleted file mode 100644
index 8ea34c4..0000000
--- a/interface/web/sites/lib/lang/se_web_aliasdomain_list.lng
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Aliasdomain';
-$wb['active_txt'] = 'Active';
-$wb['server_id_txt'] = 'Server';
-$wb['parent_domain_id_txt'] = 'Website';
-$wb['domain_txt'] = 'Aliasdomain';
-$wb['add_new_record_txt'] = 'Add new aliasdomain';
-$wb['domain_error_empty'] = 'Domain is empty.';
-$wb['domain_error_unique'] = 'Domain must be unique.';
-$wb['domain_error_regex'] = 'Domain name invalid.';
-$wb['no_redirect_txt'] = 'No redirect';
-$wb['no_flag_txt'] = 'No flag';
-$wb['none_txt'] = 'None';
-?>
diff --git a/interface/web/sites/lib/lang/ar_web_aliasdomain.lng b/interface/web/sites/lib/lang/se_web_childdomain.lng
similarity index 93%
copy from interface/web/sites/lib/lang/ar_web_aliasdomain.lng
copy to interface/web/sites/lib/lang/se_web_childdomain.lng
index 4149c71..1d38d2a 100644
--- a/interface/web/sites/lib/lang/ar_web_aliasdomain.lng
+++ b/interface/web/sites/lib/lang/se_web_childdomain.lng
@@ -1,20 +1,15 @@
<?php
-$wb['domain_txt'] = 'Aliasdomain';
-$wb['backup_interval_txt'] = 'Backup interval';
-$wb['backup_copies_txt'] = 'Number of backup copies';
$wb['ssl_state_txt'] = 'State';
$wb['ssl_locality_txt'] = 'Locality';
$wb['ssl_organisation_txt'] = 'Organisation';
$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
$wb['ssl_country_txt'] = 'Country';
-$wb['ssl_key_txt'] = 'SSL Key';
$wb['ssl_request_txt'] = 'SSL Request';
$wb['ssl_cert_txt'] = 'SSL Certificate';
$wb['ssl_bundle_txt'] = 'SSL Bundle';
$wb['ssl_action_txt'] = 'SSL Action';
-$wb['ssl_domain_txt'] = 'SSL Domain';
$wb['server_id_txt'] = 'Server';
-$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
+$wb['domain_txt'] = 'Domain';
$wb['type_txt'] = 'Type';
$wb['parent_domain_id_txt'] = 'Parent Website';
$wb['redirect_type_txt'] = 'Redirect Type';
@@ -23,15 +18,12 @@
$wb['document_root_txt'] = 'Documentroot';
$wb['system_user_txt'] = 'Linux User';
$wb['system_group_txt'] = 'Linux Group';
-$wb['ip_address_txt'] = 'IPv4-Address';
-$wb['ipv6_address_txt'] = 'IPv6-Address';
+$wb['ip_address_txt'] = 'IP-Address';
$wb['vhost_type_txt'] = 'VHost Type';
$wb['hd_quota_txt'] = 'Harddisk Quota';
-$wb['traffic_quota_txt'] = 'Traffic Quota';
+$wb['traffic_quota_txt'] = 'Traffic Quaota';
$wb['cgi_txt'] = 'CGI';
$wb['ssi_txt'] = 'SSI';
-$wb['errordocs_txt'] = 'Own Error-Documents';
-$wb['subdomain_txt'] = 'Auto-Subdomain';
$wb['ssl_txt'] = 'SSL';
$wb['suexec_txt'] = 'SuEXEC';
$wb['php_txt'] = 'PHP';
@@ -39,10 +31,26 @@
$wb['limit_web_domain_txt'] = 'The max. number of web domains for your account is reached.';
$wb['limit_web_aliasdomain_txt'] = 'The max. number of aliasdomains for your account is reached.';
$wb['limit_web_subdomain_txt'] = 'The max. number of web subdomains for your account is reached.';
-$wb['apache_directives_txt'] = 'Apache Directives';
+$wb['apache_directives_txt'] = 'Apache directives';
$wb['domain_error_empty'] = 'Domain is empty.';
-$wb['domain_error_unique'] = 'There is already a website or sub / aliasdomain with this domain name.';
+$wb['domain_error_unique'] = 'Domain must be unique.';
$wb['domain_error_regex'] = 'Domain name invalid.';
+$wb['host_txt'] = 'Host';
+$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
+$wb['no_redirect_txt'] = 'No redirect';
+$wb['no_flag_txt'] = 'No flag';
+$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
+$wb['proxy_directives_txt'] = 'Proxy Directives';
+$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
+$wb['error_proxy_requires_url'] = 'Redirect Type \"proxy\" requires a URL as the redirect path.';
+$wb['backup_interval_txt'] = 'Backup interval';
+$wb['backup_copies_txt'] = 'Number of backup copies';
+$wb['ssl_key_txt'] = 'SSL Key';
+$wb['ssl_domain_txt'] = 'SSL Domain';
+$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
+$wb['ipv6_address_txt'] = 'IPv6-Address';
+$wb['errordocs_txt'] = 'Own Error-Documents';
+$wb['subdomain_txt'] = 'Auto-Subdomain';
$wb['domain_error_autosub'] = 'There is already a subdomain with these settings.';
$wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
$wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
@@ -62,7 +70,6 @@
$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
$wb['limit_traffic_quota_free_txt'] = 'Max. available Traffic Quota';
-$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
$wb['php_open_basedir_txt'] = 'PHP open_basedir';
$wb['traffic_quota_exceeded_txt'] = 'Traffic quota exceeded';
$wb['ruby_txt'] = 'Ruby';
@@ -71,8 +78,6 @@
$wb['custom_php_ini_txt'] = 'Custom php.ini settings';
$wb['none_txt'] = 'None';
$wb['disabled_txt'] = 'Disabled';
-$wb['no_redirect_txt'] = 'No redirect';
-$wb['no_flag_txt'] = 'No flag';
$wb['save_certificate_txt'] = 'Save certificate';
$wb['create_certificate_txt'] = 'Create certificate';
$wb['delete_certificate_txt'] = 'Delete certificate';
@@ -109,7 +114,6 @@
$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
-$wb['proxy_directives_txt'] = 'Proxy Directives';
-$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
$wb['Domain'] = 'Aliasdomain';
+
?>
diff --git a/interface/web/sites/lib/lang/ar_web_aliasdomain_list.lng b/interface/web/sites/lib/lang/se_web_childdomain_list.lng
similarity index 74%
copy from interface/web/sites/lib/lang/ar_web_aliasdomain_list.lng
copy to interface/web/sites/lib/lang/se_web_childdomain_list.lng
index 8ea34c4..95a3b5f 100644
--- a/interface/web/sites/lib/lang/ar_web_aliasdomain_list.lng
+++ b/interface/web/sites/lib/lang/se_web_childdomain_list.lng
@@ -1,14 +1,15 @@
<?php
-$wb['list_head_txt'] = 'Aliasdomain';
+$wb['list_head_txt'] = 'Subdomains';
$wb['active_txt'] = 'Active';
$wb['server_id_txt'] = 'Server';
$wb['parent_domain_id_txt'] = 'Website';
-$wb['domain_txt'] = 'Aliasdomain';
-$wb['add_new_record_txt'] = 'Add new aliasdomain';
+$wb['domain_txt'] = 'Subdomain';
+$wb['add_new_record_txt'] = 'Add new subdomain';
$wb['domain_error_empty'] = 'Domain is empty.';
$wb['domain_error_unique'] = 'Domain must be unique.';
$wb['domain_error_regex'] = 'Domain name invalid.';
$wb['no_redirect_txt'] = 'No redirect';
$wb['no_flag_txt'] = 'No flag';
$wb['none_txt'] = 'None';
+
?>
diff --git a/interface/web/sites/lib/lang/se_web_subdomain.lng b/interface/web/sites/lib/lang/se_web_subdomain.lng
deleted file mode 100644
index d86c166..0000000
--- a/interface/web/sites/lib/lang/se_web_subdomain.lng
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-$wb['ssl_state_txt'] = 'State';
-$wb['ssl_locality_txt'] = 'Locality';
-$wb['ssl_organisation_txt'] = 'Organisation';
-$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
-$wb['ssl_country_txt'] = 'Country';
-$wb['ssl_request_txt'] = 'SSL Request';
-$wb['ssl_cert_txt'] = 'SSL Certificate';
-$wb['ssl_bundle_txt'] = 'SSL Bundle';
-$wb['ssl_action_txt'] = 'SSL Action';
-$wb['server_id_txt'] = 'Server';
-$wb['domain_txt'] = 'Domain';
-$wb['type_txt'] = 'Type';
-$wb['parent_domain_id_txt'] = 'Parent Website';
-$wb['redirect_type_txt'] = 'Redirect Type';
-$wb['redirect_path_txt'] = 'Redirect Path';
-$wb['active_txt'] = 'Active';
-$wb['document_root_txt'] = 'Documentroot';
-$wb['system_user_txt'] = 'Linux User';
-$wb['system_group_txt'] = 'Linux Group';
-$wb['ip_address_txt'] = 'IP-Address';
-$wb['vhost_type_txt'] = 'VHost Type';
-$wb['hd_quota_txt'] = 'Harddisk Quota';
-$wb['traffic_quota_txt'] = 'Traffic Quaota';
-$wb['cgi_txt'] = 'CGI';
-$wb['ssi_txt'] = 'SSI';
-$wb['ssl_txt'] = 'SSL';
-$wb['suexec_txt'] = 'SuEXEC';
-$wb['php_txt'] = 'PHP';
-$wb['client_txt'] = 'Client';
-$wb['limit_web_domain_txt'] = 'The max. number of web domains for your account is reached.';
-$wb['limit_web_aliasdomain_txt'] = 'The max. number of aliasdomains for your account is reached.';
-$wb['limit_web_subdomain_txt'] = 'The max. number of web subdomains for your account is reached.';
-$wb['apache_directives_txt'] = 'Apache directives';
-$wb['domain_error_empty'] = 'Domain is empty.';
-$wb['domain_error_unique'] = 'Domain must be unique.';
-$wb['domain_error_regex'] = 'Domain name invalid.';
-$wb['host_txt'] = 'Host';
-$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
-$wb['no_redirect_txt'] = 'No redirect';
-$wb['no_flag_txt'] = 'No flag';
-$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
-$wb['proxy_directives_txt'] = 'Proxy Directives';
-$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
-$wb['error_proxy_requires_url'] = 'Redirect Type \\"proxy\\" requires a URL as the redirect path.';
-?>
diff --git a/interface/web/sites/lib/lang/se_web_subdomain_list.lng b/interface/web/sites/lib/lang/se_web_subdomain_list.lng
deleted file mode 100644
index 1c16bcd..0000000
--- a/interface/web/sites/lib/lang/se_web_subdomain_list.lng
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Subdomains';
-$wb['active_txt'] = 'Active';
-$wb['server_id_txt'] = 'Server';
-$wb['parent_domain_id_txt'] = 'Website';
-$wb['domain_txt'] = 'Subdomain';
-$wb['add_new_record_txt'] = 'Add new subdomain';
-?>
diff --git a/interface/web/sites/lib/lang/sk_web_aliasdomain.lng b/interface/web/sites/lib/lang/sk_web_aliasdomain.lng
deleted file mode 100644
index 4149c71..0000000
--- a/interface/web/sites/lib/lang/sk_web_aliasdomain.lng
+++ /dev/null
@@ -1,115 +0,0 @@
-<?php
-$wb['domain_txt'] = 'Aliasdomain';
-$wb['backup_interval_txt'] = 'Backup interval';
-$wb['backup_copies_txt'] = 'Number of backup copies';
-$wb['ssl_state_txt'] = 'State';
-$wb['ssl_locality_txt'] = 'Locality';
-$wb['ssl_organisation_txt'] = 'Organisation';
-$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
-$wb['ssl_country_txt'] = 'Country';
-$wb['ssl_key_txt'] = 'SSL Key';
-$wb['ssl_request_txt'] = 'SSL Request';
-$wb['ssl_cert_txt'] = 'SSL Certificate';
-$wb['ssl_bundle_txt'] = 'SSL Bundle';
-$wb['ssl_action_txt'] = 'SSL Action';
-$wb['ssl_domain_txt'] = 'SSL Domain';
-$wb['server_id_txt'] = 'Server';
-$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
-$wb['type_txt'] = 'Type';
-$wb['parent_domain_id_txt'] = 'Parent Website';
-$wb['redirect_type_txt'] = 'Redirect Type';
-$wb['redirect_path_txt'] = 'Redirect Path';
-$wb['active_txt'] = 'Active';
-$wb['document_root_txt'] = 'Documentroot';
-$wb['system_user_txt'] = 'Linux User';
-$wb['system_group_txt'] = 'Linux Group';
-$wb['ip_address_txt'] = 'IPv4-Address';
-$wb['ipv6_address_txt'] = 'IPv6-Address';
-$wb['vhost_type_txt'] = 'VHost Type';
-$wb['hd_quota_txt'] = 'Harddisk Quota';
-$wb['traffic_quota_txt'] = 'Traffic Quota';
-$wb['cgi_txt'] = 'CGI';
-$wb['ssi_txt'] = 'SSI';
-$wb['errordocs_txt'] = 'Own Error-Documents';
-$wb['subdomain_txt'] = 'Auto-Subdomain';
-$wb['ssl_txt'] = 'SSL';
-$wb['suexec_txt'] = 'SuEXEC';
-$wb['php_txt'] = 'PHP';
-$wb['client_txt'] = 'Client';
-$wb['limit_web_domain_txt'] = 'The max. number of web domains for your account is reached.';
-$wb['limit_web_aliasdomain_txt'] = 'The max. number of aliasdomains for your account is reached.';
-$wb['limit_web_subdomain_txt'] = 'The max. number of web subdomains for your account is reached.';
-$wb['apache_directives_txt'] = 'Apache Directives';
-$wb['domain_error_empty'] = 'Domain is empty.';
-$wb['domain_error_unique'] = 'There is already a website or sub / aliasdomain with this domain name.';
-$wb['domain_error_regex'] = 'Domain name invalid.';
-$wb['domain_error_autosub'] = 'There is already a subdomain with these settings.';
-$wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
-$wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
-$wb['error_ssl_state_empty'] = 'SSL State is empty.';
-$wb['error_ssl_locality_empty'] = 'SSL Locality is empty.';
-$wb['error_ssl_organisation_empty'] = 'SSL Organisation is empty.';
-$wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.';
-$wb['error_ssl_country_empty'] = 'SSL Country is empty.';
-$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
-$wb['client_group_id_txt'] = 'Client';
-$wb['stats_password_txt'] = 'Set Webstatistics password';
-$wb['allow_override_txt'] = 'Apache AllowOverride';
-$wb['limit_web_quota_free_txt'] = 'Max. available Harddisk Quota';
-$wb['ssl_state_error_regex'] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_locality_error_regex'] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_organisation_error_regex'] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
-$wb['limit_traffic_quota_free_txt'] = 'Max. available Traffic Quota';
-$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
-$wb['php_open_basedir_txt'] = 'PHP open_basedir';
-$wb['traffic_quota_exceeded_txt'] = 'Traffic quota exceeded';
-$wb['ruby_txt'] = 'Ruby';
-$wb['stats_user_txt'] = 'Webstatistics username';
-$wb['stats_type_txt'] = 'Webstatistics program';
-$wb['custom_php_ini_txt'] = 'Custom php.ini settings';
-$wb['none_txt'] = 'None';
-$wb['disabled_txt'] = 'Disabled';
-$wb['no_redirect_txt'] = 'No redirect';
-$wb['no_flag_txt'] = 'No flag';
-$wb['save_certificate_txt'] = 'Save certificate';
-$wb['create_certificate_txt'] = 'Create certificate';
-$wb['delete_certificate_txt'] = 'Delete certificate';
-$wb['nginx_directives_txt'] = 'nginx Directives';
-$wb['seo_redirect_txt'] = 'SEO Redirect';
-$wb['non_www_to_www_txt'] = 'Non-www -> www';
-$wb['www_to_non_www_txt'] = 'www -> non-www';
-$wb['php_fpm_use_socket_txt'] = 'Use Socket For PHP-FPM';
-$wb['error_no_sni_txt'] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
-$wb['python_txt'] = 'Python';
-$wb['perl_txt'] = 'Perl';
-$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
-$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
-$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
-$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
-$wb['error_php_fpm_pm_settings_txt'] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children >= pm.max_spare_servers >= pm.start_servers >= pm.min_spare_servers > 0';
-$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive integer value.';
-$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
-$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
-$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
-$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
-$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
-$wb['fastcgi_php_version_txt'] = 'PHP Version';
-$wb['pm_txt'] = 'PHP-FPM Process Manager';
-$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
-$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
-$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
-$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
-$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
-$wb['generate_password_txt'] = 'Generate Password';
-$wb['repeat_password_txt'] = 'Repeat Password';
-$wb['password_mismatch_txt'] = 'The passwords do not match.';
-$wb['password_match_txt'] = 'The passwords do match.';
-$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
-$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
-$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
-$wb['proxy_directives_txt'] = 'Proxy Directives';
-$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
-$wb['Domain'] = 'Aliasdomain';
-?>
diff --git a/interface/web/sites/lib/lang/ar_web_aliasdomain.lng b/interface/web/sites/lib/lang/sk_web_childdomain.lng
similarity index 76%
copy from interface/web/sites/lib/lang/ar_web_aliasdomain.lng
copy to interface/web/sites/lib/lang/sk_web_childdomain.lng
index 4149c71..d550c36 100644
--- a/interface/web/sites/lib/lang/ar_web_aliasdomain.lng
+++ b/interface/web/sites/lib/lang/sk_web_childdomain.lng
@@ -1,48 +1,56 @@
<?php
-$wb['domain_txt'] = 'Aliasdomain';
-$wb['backup_interval_txt'] = 'Backup interval';
-$wb['backup_copies_txt'] = 'Number of backup copies';
-$wb['ssl_state_txt'] = 'State';
-$wb['ssl_locality_txt'] = 'Locality';
-$wb['ssl_organisation_txt'] = 'Organisation';
-$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
-$wb['ssl_country_txt'] = 'Country';
-$wb['ssl_key_txt'] = 'SSL Key';
-$wb['ssl_request_txt'] = 'SSL Request';
-$wb['ssl_cert_txt'] = 'SSL Certificate';
+$wb['ssl_state_txt'] = 'Štát';
+$wb['ssl_locality_txt'] = 'Lokalita';
+$wb['ssl_organisation_txt'] = 'Organizácia';
+$wb['ssl_organisation_unit_txt'] = 'Organizačné zložky';
+$wb['ssl_country_txt'] = 'Krajina';
+$wb['ssl_request_txt'] = 'SSL Požiadavka';
+$wb['ssl_cert_txt'] = 'SSL Certifikát';
$wb['ssl_bundle_txt'] = 'SSL Bundle';
-$wb['ssl_action_txt'] = 'SSL Action';
-$wb['ssl_domain_txt'] = 'SSL Domain';
+$wb['ssl_action_txt'] = 'SSL Akcia';
$wb['server_id_txt'] = 'Server';
-$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
-$wb['type_txt'] = 'Type';
-$wb['parent_domain_id_txt'] = 'Parent Website';
-$wb['redirect_type_txt'] = 'Redirect Type';
-$wb['redirect_path_txt'] = 'Redirect Path';
-$wb['active_txt'] = 'Active';
-$wb['document_root_txt'] = 'Documentroot';
-$wb['system_user_txt'] = 'Linux User';
-$wb['system_group_txt'] = 'Linux Group';
-$wb['ip_address_txt'] = 'IPv4-Address';
-$wb['ipv6_address_txt'] = 'IPv6-Address';
-$wb['vhost_type_txt'] = 'VHost Type';
-$wb['hd_quota_txt'] = 'Harddisk Quota';
-$wb['traffic_quota_txt'] = 'Traffic Quota';
+$wb['domain_txt'] = 'Doména';
+$wb['type_txt'] = 'Typ';
+$wb['parent_domain_id_txt'] = 'Materská webová stránka';
+$wb['redirect_type_txt'] = 'Typ presmerovanie';
+$wb['redirect_path_txt'] = 'Cesta presmerovania';
+$wb['active_txt'] = 'Aktívne';
+$wb['document_root_txt'] = 'DocumentRoot';
+$wb['system_user_txt'] = 'Linuxový uživateľ';
+$wb['system_group_txt'] = 'Linuxová skupina';
+$wb['ip_address_txt'] = 'IP Adresa';
+$wb['vhost_type_txt'] = 'VHost Typ';
+$wb['hd_quota_txt'] = 'Harddisk Kvóta';
+$wb['traffic_quota_txt'] = 'Kvóta Vyťaženia';
$wb['cgi_txt'] = 'CGI';
$wb['ssi_txt'] = 'SSI';
-$wb['errordocs_txt'] = 'Own Error-Documents';
-$wb['subdomain_txt'] = 'Auto-Subdomain';
$wb['ssl_txt'] = 'SSL';
$wb['suexec_txt'] = 'SuEXEC';
$wb['php_txt'] = 'PHP';
-$wb['client_txt'] = 'Client';
-$wb['limit_web_domain_txt'] = 'The max. number of web domains for your account is reached.';
-$wb['limit_web_aliasdomain_txt'] = 'The max. number of aliasdomains for your account is reached.';
-$wb['limit_web_subdomain_txt'] = 'The max. number of web subdomains for your account is reached.';
-$wb['apache_directives_txt'] = 'Apache Directives';
-$wb['domain_error_empty'] = 'Domain is empty.';
-$wb['domain_error_unique'] = 'There is already a website or sub / aliasdomain with this domain name.';
-$wb['domain_error_regex'] = 'Domain name invalid.';
+$wb['client_txt'] = 'Klient';
+$wb['limit_web_domain_txt'] = 'Max. počet internetových domén pre Váš účet je dosiahnutý.';
+$wb['limit_web_aliasdomain_txt'] = 'Max. alias domén pre Váš účet je dosiahnutý.';
+$wb['limit_web_subdomain_txt'] = 'Max. počet webových subdomén pre Váš účet je dosiahnutý.';
+$wb['apache_directives_txt'] = 'Apache smerníce';
+$wb['domain_error_empty'] = 'Doména je prázdna.';
+$wb['domain_error_unique'] = 'Existuje už webová stránka alebo sub / alias doména k tejto doméne.';
+$wb['domain_error_regex'] = 'Doménové meno neplatné.';
+$wb['host_txt'] = 'Host';
+$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
+$wb['no_redirect_txt'] = 'No redirect';
+$wb['no_flag_txt'] = 'No flag';
+$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
+$wb['proxy_directives_txt'] = 'Proxy Directives';
+$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
+$wb['error_proxy_requires_url'] = 'Redirect Type \"proxy\" requires a URL as the redirect path.';
+$wb['backup_interval_txt'] = 'Backup interval';
+$wb['backup_copies_txt'] = 'Number of backup copies';
+$wb['ssl_key_txt'] = 'SSL Key';
+$wb['ssl_domain_txt'] = 'SSL Domain';
+$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
+$wb['ipv6_address_txt'] = 'IPv6-Address';
+$wb['errordocs_txt'] = 'Own Error-Documents';
+$wb['subdomain_txt'] = 'Auto-Subdomain';
$wb['domain_error_autosub'] = 'There is already a subdomain with these settings.';
$wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
$wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
@@ -62,7 +70,6 @@
$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
$wb['limit_traffic_quota_free_txt'] = 'Max. available Traffic Quota';
-$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
$wb['php_open_basedir_txt'] = 'PHP open_basedir';
$wb['traffic_quota_exceeded_txt'] = 'Traffic quota exceeded';
$wb['ruby_txt'] = 'Ruby';
@@ -71,8 +78,6 @@
$wb['custom_php_ini_txt'] = 'Custom php.ini settings';
$wb['none_txt'] = 'None';
$wb['disabled_txt'] = 'Disabled';
-$wb['no_redirect_txt'] = 'No redirect';
-$wb['no_flag_txt'] = 'No flag';
$wb['save_certificate_txt'] = 'Save certificate';
$wb['create_certificate_txt'] = 'Create certificate';
$wb['delete_certificate_txt'] = 'Delete certificate';
@@ -109,7 +114,6 @@
$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
-$wb['proxy_directives_txt'] = 'Proxy Directives';
-$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
$wb['Domain'] = 'Aliasdomain';
+
?>
diff --git a/interface/web/sites/lib/lang/sk_web_aliasdomain_list.lng b/interface/web/sites/lib/lang/sk_web_childdomain_list.lng
similarity index 65%
rename from interface/web/sites/lib/lang/sk_web_aliasdomain_list.lng
rename to interface/web/sites/lib/lang/sk_web_childdomain_list.lng
index 635213c..87db149 100644
--- a/interface/web/sites/lib/lang/sk_web_aliasdomain_list.lng
+++ b/interface/web/sites/lib/lang/sk_web_childdomain_list.lng
@@ -1,14 +1,15 @@
<?php
-$wb['list_head_txt'] = 'Alias doména';
+$wb['list_head_txt'] = 'Subdomény';
$wb['active_txt'] = 'Aktívne';
$wb['server_id_txt'] = 'Server';
-$wb['parent_domain_id_txt'] = 'Webstránky';
-$wb['domain_txt'] = 'Alias doména';
-$wb['add_new_record_txt'] = 'Pridať novú alias doménu';
+$wb['parent_domain_id_txt'] = 'Webstránka';
+$wb['domain_txt'] = 'Subdoména';
+$wb['add_new_record_txt'] = 'Pridať novú subdoménu';
$wb['domain_error_empty'] = 'Doména je prázdna.';
$wb['domain_error_unique'] = 'Doména musí byť unikátna.';
$wb['domain_error_regex'] = 'Doménové meno neplatné.';
$wb['no_redirect_txt'] = 'No redirect';
$wb['no_flag_txt'] = 'No flag';
$wb['none_txt'] = 'None';
+
?>
diff --git a/interface/web/sites/lib/lang/sk_web_subdomain.lng b/interface/web/sites/lib/lang/sk_web_subdomain.lng
deleted file mode 100644
index aa0a1b6..0000000
--- a/interface/web/sites/lib/lang/sk_web_subdomain.lng
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-$wb['ssl_state_txt'] = 'Štát';
-$wb['ssl_locality_txt'] = 'Lokalita';
-$wb['ssl_organisation_txt'] = 'Organizácia';
-$wb['ssl_organisation_unit_txt'] = 'Organizačné zložky';
-$wb['ssl_country_txt'] = 'Krajina';
-$wb['ssl_request_txt'] = 'SSL Požiadavka';
-$wb['ssl_cert_txt'] = 'SSL Certifikát';
-$wb['ssl_bundle_txt'] = 'SSL Bundle';
-$wb['ssl_action_txt'] = 'SSL Akcia';
-$wb['server_id_txt'] = 'Server';
-$wb['domain_txt'] = 'Doména';
-$wb['type_txt'] = 'Typ';
-$wb['parent_domain_id_txt'] = 'Materská webová stránka';
-$wb['redirect_type_txt'] = 'Typ presmerovanie';
-$wb['redirect_path_txt'] = 'Cesta presmerovania';
-$wb['active_txt'] = 'Aktívne';
-$wb['document_root_txt'] = 'DocumentRoot';
-$wb['system_user_txt'] = 'Linuxový uživateľ';
-$wb['system_group_txt'] = 'Linuxová skupina';
-$wb['ip_address_txt'] = 'IP Adresa';
-$wb['vhost_type_txt'] = 'VHost Typ';
-$wb['hd_quota_txt'] = 'Harddisk Kvóta';
-$wb['traffic_quota_txt'] = 'Kvóta Vyťaženia';
-$wb['cgi_txt'] = 'CGI';
-$wb['ssi_txt'] = 'SSI';
-$wb['ssl_txt'] = 'SSL';
-$wb['suexec_txt'] = 'SuEXEC';
-$wb['php_txt'] = 'PHP';
-$wb['client_txt'] = 'Klient';
-$wb['limit_web_domain_txt'] = 'Max. počet internetových domén pre Váš účet je dosiahnutý.';
-$wb['limit_web_aliasdomain_txt'] = 'Max. alias domén pre Váš účet je dosiahnutý.';
-$wb['limit_web_subdomain_txt'] = 'Max. počet webových subdomén pre Váš účet je dosiahnutý.';
-$wb['apache_directives_txt'] = 'Apache smerníce';
-$wb['domain_error_empty'] = 'Doména je prázdna.';
-$wb['domain_error_unique'] = 'Existuje už webová stránka alebo sub / alias doména k tejto doméne.';
-$wb['domain_error_regex'] = 'Doménové meno neplatné.';
-$wb['host_txt'] = 'Host';
-$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
-$wb['no_redirect_txt'] = 'No redirect';
-$wb['no_flag_txt'] = 'No flag';
-$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
-$wb['proxy_directives_txt'] = 'Proxy Directives';
-$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
-$wb['error_proxy_requires_url'] = 'Redirect Type \\"proxy\\" requires a URL as the redirect path.';
-?>
diff --git a/interface/web/sites/lib/lang/sk_web_subdomain_list.lng b/interface/web/sites/lib/lang/sk_web_subdomain_list.lng
deleted file mode 100644
index 5b4a3a5..0000000
--- a/interface/web/sites/lib/lang/sk_web_subdomain_list.lng
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Subdomény';
-$wb['active_txt'] = 'Aktívne';
-$wb['server_id_txt'] = 'Server';
-$wb['parent_domain_id_txt'] = 'Webstránka';
-$wb['domain_txt'] = 'Subdoména';
-$wb['add_new_record_txt'] = 'Pridať novú subdoménu';
-?>
diff --git a/interface/web/sites/lib/lang/tr_web_aliasdomain.lng b/interface/web/sites/lib/lang/tr_web_aliasdomain.lng
deleted file mode 100644
index 4149c71..0000000
--- a/interface/web/sites/lib/lang/tr_web_aliasdomain.lng
+++ /dev/null
@@ -1,115 +0,0 @@
-<?php
-$wb['domain_txt'] = 'Aliasdomain';
-$wb['backup_interval_txt'] = 'Backup interval';
-$wb['backup_copies_txt'] = 'Number of backup copies';
-$wb['ssl_state_txt'] = 'State';
-$wb['ssl_locality_txt'] = 'Locality';
-$wb['ssl_organisation_txt'] = 'Organisation';
-$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
-$wb['ssl_country_txt'] = 'Country';
-$wb['ssl_key_txt'] = 'SSL Key';
-$wb['ssl_request_txt'] = 'SSL Request';
-$wb['ssl_cert_txt'] = 'SSL Certificate';
-$wb['ssl_bundle_txt'] = 'SSL Bundle';
-$wb['ssl_action_txt'] = 'SSL Action';
-$wb['ssl_domain_txt'] = 'SSL Domain';
-$wb['server_id_txt'] = 'Server';
-$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
-$wb['type_txt'] = 'Type';
-$wb['parent_domain_id_txt'] = 'Parent Website';
-$wb['redirect_type_txt'] = 'Redirect Type';
-$wb['redirect_path_txt'] = 'Redirect Path';
-$wb['active_txt'] = 'Active';
-$wb['document_root_txt'] = 'Documentroot';
-$wb['system_user_txt'] = 'Linux User';
-$wb['system_group_txt'] = 'Linux Group';
-$wb['ip_address_txt'] = 'IPv4-Address';
-$wb['ipv6_address_txt'] = 'IPv6-Address';
-$wb['vhost_type_txt'] = 'VHost Type';
-$wb['hd_quota_txt'] = 'Harddisk Quota';
-$wb['traffic_quota_txt'] = 'Traffic Quota';
-$wb['cgi_txt'] = 'CGI';
-$wb['ssi_txt'] = 'SSI';
-$wb['errordocs_txt'] = 'Own Error-Documents';
-$wb['subdomain_txt'] = 'Auto-Subdomain';
-$wb['ssl_txt'] = 'SSL';
-$wb['suexec_txt'] = 'SuEXEC';
-$wb['php_txt'] = 'PHP';
-$wb['client_txt'] = 'Client';
-$wb['limit_web_domain_txt'] = 'The max. number of web domains for your account is reached.';
-$wb['limit_web_aliasdomain_txt'] = 'The max. number of aliasdomains for your account is reached.';
-$wb['limit_web_subdomain_txt'] = 'The max. number of web subdomains for your account is reached.';
-$wb['apache_directives_txt'] = 'Apache Directives';
-$wb['domain_error_empty'] = 'Domain is empty.';
-$wb['domain_error_unique'] = 'There is already a website or sub / aliasdomain with this domain name.';
-$wb['domain_error_regex'] = 'Domain name invalid.';
-$wb['domain_error_autosub'] = 'There is already a subdomain with these settings.';
-$wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
-$wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
-$wb['error_ssl_state_empty'] = 'SSL State is empty.';
-$wb['error_ssl_locality_empty'] = 'SSL Locality is empty.';
-$wb['error_ssl_organisation_empty'] = 'SSL Organisation is empty.';
-$wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.';
-$wb['error_ssl_country_empty'] = 'SSL Country is empty.';
-$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
-$wb['client_group_id_txt'] = 'Client';
-$wb['stats_password_txt'] = 'Set Webstatistics password';
-$wb['allow_override_txt'] = 'Apache AllowOverride';
-$wb['limit_web_quota_free_txt'] = 'Max. available Harddisk Quota';
-$wb['ssl_state_error_regex'] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_locality_error_regex'] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_organisation_error_regex'] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
-$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
-$wb['limit_traffic_quota_free_txt'] = 'Max. available Traffic Quota';
-$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
-$wb['php_open_basedir_txt'] = 'PHP open_basedir';
-$wb['traffic_quota_exceeded_txt'] = 'Traffic quota exceeded';
-$wb['ruby_txt'] = 'Ruby';
-$wb['stats_user_txt'] = 'Webstatistics username';
-$wb['stats_type_txt'] = 'Webstatistics program';
-$wb['custom_php_ini_txt'] = 'Custom php.ini settings';
-$wb['none_txt'] = 'None';
-$wb['disabled_txt'] = 'Disabled';
-$wb['no_redirect_txt'] = 'No redirect';
-$wb['no_flag_txt'] = 'No flag';
-$wb['save_certificate_txt'] = 'Save certificate';
-$wb['create_certificate_txt'] = 'Create certificate';
-$wb['delete_certificate_txt'] = 'Delete certificate';
-$wb['nginx_directives_txt'] = 'nginx Directives';
-$wb['seo_redirect_txt'] = 'SEO Redirect';
-$wb['non_www_to_www_txt'] = 'Non-www -> www';
-$wb['www_to_non_www_txt'] = 'www -> non-www';
-$wb['php_fpm_use_socket_txt'] = 'Use Socket For PHP-FPM';
-$wb['error_no_sni_txt'] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
-$wb['python_txt'] = 'Python';
-$wb['perl_txt'] = 'Perl';
-$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
-$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
-$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
-$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
-$wb['error_php_fpm_pm_settings_txt'] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children >= pm.max_spare_servers >= pm.start_servers >= pm.min_spare_servers > 0';
-$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive integer value.';
-$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
-$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
-$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
-$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
-$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
-$wb['fastcgi_php_version_txt'] = 'PHP Version';
-$wb['pm_txt'] = 'PHP-FPM Process Manager';
-$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
-$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
-$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
-$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
-$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
-$wb['generate_password_txt'] = 'Generate Password';
-$wb['repeat_password_txt'] = 'Repeat Password';
-$wb['password_mismatch_txt'] = 'The passwords do not match.';
-$wb['password_match_txt'] = 'The passwords do match.';
-$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
-$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
-$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
-$wb['proxy_directives_txt'] = 'Proxy Directives';
-$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
-$wb['Domain'] = 'Aliasdomain';
-?>
diff --git a/interface/web/sites/lib/lang/ar_web_aliasdomain.lng b/interface/web/sites/lib/lang/tr_web_childdomain.lng
similarity index 74%
copy from interface/web/sites/lib/lang/ar_web_aliasdomain.lng
copy to interface/web/sites/lib/lang/tr_web_childdomain.lng
index 4149c71..56a020f 100644
--- a/interface/web/sites/lib/lang/ar_web_aliasdomain.lng
+++ b/interface/web/sites/lib/lang/tr_web_childdomain.lng
@@ -1,48 +1,56 @@
<?php
-$wb['domain_txt'] = 'Aliasdomain';
-$wb['backup_interval_txt'] = 'Backup interval';
-$wb['backup_copies_txt'] = 'Number of backup copies';
-$wb['ssl_state_txt'] = 'State';
-$wb['ssl_locality_txt'] = 'Locality';
-$wb['ssl_organisation_txt'] = 'Organisation';
-$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
-$wb['ssl_country_txt'] = 'Country';
-$wb['ssl_key_txt'] = 'SSL Key';
-$wb['ssl_request_txt'] = 'SSL Request';
-$wb['ssl_cert_txt'] = 'SSL Certificate';
-$wb['ssl_bundle_txt'] = 'SSL Bundle';
-$wb['ssl_action_txt'] = 'SSL Action';
-$wb['ssl_domain_txt'] = 'SSL Domain';
-$wb['server_id_txt'] = 'Server';
-$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
-$wb['type_txt'] = 'Type';
-$wb['parent_domain_id_txt'] = 'Parent Website';
-$wb['redirect_type_txt'] = 'Redirect Type';
-$wb['redirect_path_txt'] = 'Redirect Path';
-$wb['active_txt'] = 'Active';
+$wb['ssl_state_txt'] = 'Mevki';
+$wb['ssl_locality_txt'] = 'Semt';
+$wb['ssl_organisation_txt'] = 'Organizasyon';
+$wb['ssl_organisation_unit_txt'] = 'Organizasyon Unitesi';
+$wb['ssl_country_txt'] = 'Ülke';
+$wb['ssl_request_txt'] = 'SSL İsteği';
+$wb['ssl_cert_txt'] = 'SSL Sertifikası';
+$wb['ssl_bundle_txt'] = 'SSL Yığını';
+$wb['ssl_action_txt'] = 'SSL Eylemi';
+$wb['server_id_txt'] = 'Sunucu';
+$wb['domain_txt'] = 'Domain';
+$wb['type_txt'] = 'Çeşit';
+$wb['parent_domain_id_txt'] = 'Ana Website';
+$wb['redirect_type_txt'] = 'Yönlendirme Çeşidi';
+$wb['redirect_path_txt'] = 'Yönlendirme Yolu';
+$wb['active_txt'] = 'Aktif';
$wb['document_root_txt'] = 'Documentroot';
-$wb['system_user_txt'] = 'Linux User';
-$wb['system_group_txt'] = 'Linux Group';
-$wb['ip_address_txt'] = 'IPv4-Address';
-$wb['ipv6_address_txt'] = 'IPv6-Address';
-$wb['vhost_type_txt'] = 'VHost Type';
-$wb['hd_quota_txt'] = 'Harddisk Quota';
-$wb['traffic_quota_txt'] = 'Traffic Quota';
+$wb['system_user_txt'] = 'Linux Kullanıcısı';
+$wb['system_group_txt'] = 'Linux Grubu';
+$wb['ip_address_txt'] = 'IP Adresleri';
+$wb['vhost_type_txt'] = 'VHost Çeşidi';
+$wb['hd_quota_txt'] = 'Harddisk Kotası';
+$wb['traffic_quota_txt'] = 'Trafik Kotası';
$wb['cgi_txt'] = 'CGI';
$wb['ssi_txt'] = 'SSI';
-$wb['errordocs_txt'] = 'Own Error-Documents';
-$wb['subdomain_txt'] = 'Auto-Subdomain';
$wb['ssl_txt'] = 'SSL';
$wb['suexec_txt'] = 'SuEXEC';
$wb['php_txt'] = 'PHP';
-$wb['client_txt'] = 'Client';
-$wb['limit_web_domain_txt'] = 'The max. number of web domains for your account is reached.';
-$wb['limit_web_aliasdomain_txt'] = 'The max. number of aliasdomains for your account is reached.';
-$wb['limit_web_subdomain_txt'] = 'The max. number of web subdomains for your account is reached.';
-$wb['apache_directives_txt'] = 'Apache Directives';
-$wb['domain_error_empty'] = 'Domain is empty.';
-$wb['domain_error_unique'] = 'There is already a website or sub / aliasdomain with this domain name.';
-$wb['domain_error_regex'] = 'Domain name invalid.';
+$wb['client_txt'] = 'Müşteri';
+$wb['limit_web_domain_txt'] = 'Hesabınızdaki max. web domaini sayısına ulaştınız.';
+$wb['limit_web_aliasdomain_txt'] = 'Hesabınızdaki max. aliasdomain sayısına ulaştınız.';
+$wb['limit_web_subdomain_txt'] = 'Hesabınızdaki max. web subdomain sayısına ulaştınız.';
+$wb['apache_directives_txt'] = 'Apache direktifleri';
+$wb['domain_error_empty'] = 'Domain boş.';
+$wb['domain_error_unique'] = 'Bu isimde websitesi veya sub / aliasdomain zaten var.';
+$wb['domain_error_regex'] = 'Domain ismi geçersiz.';
+$wb['host_txt'] = 'Host';
+$wb['redirect_error_regex'] = 'Geçersiz yönlendirme yolu. Geçerli yönlendirmeler örneğin: /test/ veya http://www.domain.tld/test/';
+$wb['no_redirect_txt'] = 'No redirect';
+$wb['no_flag_txt'] = 'No flag';
+$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
+$wb['proxy_directives_txt'] = 'Proxy Directives';
+$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
+$wb['error_proxy_requires_url'] = 'Redirect Type \"proxy\" requires a URL as the redirect path.';
+$wb['backup_interval_txt'] = 'Backup interval';
+$wb['backup_copies_txt'] = 'Number of backup copies';
+$wb['ssl_key_txt'] = 'SSL Key';
+$wb['ssl_domain_txt'] = 'SSL Domain';
+$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
+$wb['ipv6_address_txt'] = 'IPv6-Address';
+$wb['errordocs_txt'] = 'Own Error-Documents';
+$wb['subdomain_txt'] = 'Auto-Subdomain';
$wb['domain_error_autosub'] = 'There is already a subdomain with these settings.';
$wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
$wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
@@ -62,7 +70,6 @@
$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
$wb['limit_traffic_quota_free_txt'] = 'Max. available Traffic Quota';
-$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
$wb['php_open_basedir_txt'] = 'PHP open_basedir';
$wb['traffic_quota_exceeded_txt'] = 'Traffic quota exceeded';
$wb['ruby_txt'] = 'Ruby';
@@ -71,8 +78,6 @@
$wb['custom_php_ini_txt'] = 'Custom php.ini settings';
$wb['none_txt'] = 'None';
$wb['disabled_txt'] = 'Disabled';
-$wb['no_redirect_txt'] = 'No redirect';
-$wb['no_flag_txt'] = 'No flag';
$wb['save_certificate_txt'] = 'Save certificate';
$wb['create_certificate_txt'] = 'Create certificate';
$wb['delete_certificate_txt'] = 'Delete certificate';
@@ -109,7 +114,6 @@
$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
-$wb['proxy_directives_txt'] = 'Proxy Directives';
-$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
$wb['Domain'] = 'Aliasdomain';
+
?>
diff --git a/interface/web/sites/lib/lang/tr_web_aliasdomain_list.lng b/interface/web/sites/lib/lang/tr_web_childdomain_list.lng
similarity index 74%
rename from interface/web/sites/lib/lang/tr_web_aliasdomain_list.lng
rename to interface/web/sites/lib/lang/tr_web_childdomain_list.lng
index fdb496d..0c6a6af 100644
--- a/interface/web/sites/lib/lang/tr_web_aliasdomain_list.lng
+++ b/interface/web/sites/lib/lang/tr_web_childdomain_list.lng
@@ -1,14 +1,15 @@
<?php
-$wb['list_head_txt'] = 'Aliasdomain';
+$wb['list_head_txt'] = 'Subdomainler';
$wb['active_txt'] = 'Aktif';
$wb['server_id_txt'] = 'Sunucu';
$wb['parent_domain_id_txt'] = 'Websitesi';
-$wb['domain_txt'] = 'Aliasdomain';
-$wb['add_new_record_txt'] = 'Yeni Aliasdomain';
+$wb['domain_txt'] = 'Subdomain';
+$wb['add_new_record_txt'] = 'Yeni Subdomain';
$wb['domain_error_empty'] = 'Domain boş.';
$wb['domain_error_unique'] = 'Bu Domain zaten var.';
$wb['domain_error_regex'] = 'Geçersiz Domain.';
$wb['no_redirect_txt'] = 'No redirect';
$wb['no_flag_txt'] = 'No flag';
$wb['none_txt'] = 'None';
+
?>
diff --git a/interface/web/sites/lib/lang/tr_web_subdomain.lng b/interface/web/sites/lib/lang/tr_web_subdomain.lng
deleted file mode 100644
index c0191cf..0000000
--- a/interface/web/sites/lib/lang/tr_web_subdomain.lng
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-$wb['ssl_state_txt'] = 'Mevki';
-$wb['ssl_locality_txt'] = 'Semt';
-$wb['ssl_organisation_txt'] = 'Organizasyon';
-$wb['ssl_organisation_unit_txt'] = 'Organizasyon Unitesi';
-$wb['ssl_country_txt'] = 'Ülke';
-$wb['ssl_request_txt'] = 'SSL İsteği';
-$wb['ssl_cert_txt'] = 'SSL Sertifikası';
-$wb['ssl_bundle_txt'] = 'SSL Yığını';
-$wb['ssl_action_txt'] = 'SSL Eylemi';
-$wb['server_id_txt'] = 'Sunucu';
-$wb['domain_txt'] = 'Domain';
-$wb['type_txt'] = 'Çeşit';
-$wb['parent_domain_id_txt'] = 'Ana Website';
-$wb['redirect_type_txt'] = 'Yönlendirme Çeşidi';
-$wb['redirect_path_txt'] = 'Yönlendirme Yolu';
-$wb['active_txt'] = 'Aktif';
-$wb['document_root_txt'] = 'Documentroot';
-$wb['system_user_txt'] = 'Linux Kullanıcısı';
-$wb['system_group_txt'] = 'Linux Grubu';
-$wb['ip_address_txt'] = 'IP Adresleri';
-$wb['vhost_type_txt'] = 'VHost Çeşidi';
-$wb['hd_quota_txt'] = 'Harddisk Kotası';
-$wb['traffic_quota_txt'] = 'Trafik Kotası';
-$wb['cgi_txt'] = 'CGI';
-$wb['ssi_txt'] = 'SSI';
-$wb['ssl_txt'] = 'SSL';
-$wb['suexec_txt'] = 'SuEXEC';
-$wb['php_txt'] = 'PHP';
-$wb['client_txt'] = 'Müşteri';
-$wb['limit_web_domain_txt'] = 'Hesabınızdaki max. web domaini sayısına ulaştınız.';
-$wb['limit_web_aliasdomain_txt'] = 'Hesabınızdaki max. aliasdomain sayısına ulaştınız.';
-$wb['limit_web_subdomain_txt'] = 'Hesabınızdaki max. web subdomain sayısına ulaştınız.';
-$wb['apache_directives_txt'] = 'Apache direktifleri';
-$wb['domain_error_empty'] = 'Domain boş.';
-$wb['domain_error_unique'] = 'Bu isimde websitesi veya sub / aliasdomain zaten var.';
-$wb['domain_error_regex'] = 'Domain ismi geçersiz.';
-$wb['host_txt'] = 'Host';
-$wb['redirect_error_regex'] = 'Geçersiz yönlendirme yolu. Geçerli yönlendirmeler örneğin: /test/ veya http://www.domain.tld/test/';
-$wb['no_redirect_txt'] = 'No redirect';
-$wb['no_flag_txt'] = 'No flag';
-$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
-$wb['proxy_directives_txt'] = 'Proxy Directives';
-$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
-$wb['error_proxy_requires_url'] = 'Redirect Type \\"proxy\\" requires a URL as the redirect path.';
-?>
diff --git a/interface/web/sites/lib/lang/tr_web_subdomain_list.lng b/interface/web/sites/lib/lang/tr_web_subdomain_list.lng
deleted file mode 100644
index 44b7bbe..0000000
--- a/interface/web/sites/lib/lang/tr_web_subdomain_list.lng
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Subdomainler';
-$wb['active_txt'] = 'Aktif';
-$wb['server_id_txt'] = 'Sunucu';
-$wb['parent_domain_id_txt'] = 'Websitesi';
-$wb['domain_txt'] = 'Subdomain';
-$wb['add_new_record_txt'] = 'Yeni Subdomain';
-?>
diff --git a/interface/web/sites/lib/module.conf.php b/interface/web/sites/lib/module.conf.php
index 7bb6f8e..c79f3ee 100644
--- a/interface/web/sites/lib/module.conf.php
+++ b/interface/web/sites/lib/module.conf.php
@@ -23,7 +23,7 @@
{
$items[] = array( 'title' => "Subdomain",
'target' => 'content',
- 'link' => 'sites/web_subdomain_list.php',
+ 'link' => 'sites/web_childdomain_list.php?type=subdomain',
'html_id' => 'subdomain_list');
// read web config
@@ -41,7 +41,7 @@
{
$items[] = array( 'title' => "Aliasdomain",
'target' => 'content',
- 'link' => 'sites/web_aliasdomain_list.php',
+ 'link' => 'sites/web_childdomain_list.php?type=aliasdomain',
'html_id' => 'aliasdomain_list');
}
diff --git a/interface/web/sites/list/web_aliasdomain.list.php b/interface/web/sites/list/web_childdomain.list.php
similarity index 91%
rename from interface/web/sites/list/web_aliasdomain.list.php
rename to interface/web/sites/list/web_childdomain.list.php
index 713cfc0..4916738 100644
--- a/interface/web/sites/list/web_aliasdomain.list.php
+++ b/interface/web/sites/list/web_childdomain.list.php
@@ -13,7 +13,7 @@
// Name of the list
-$liste["name"] = "web_aliasdomain";
+$liste["name"] = "web_childdomain";
// Database table
$liste["table"] = "web_domain";
@@ -28,13 +28,13 @@
$liste["records_per_page"] = "15";
// Script File of the list
-$liste["file"] = "web_aliasdomain_list.php";
+$liste["file"] = "web_childdomain_list.php";
// Script file of the edit form
-$liste["edit_file"] = "web_aliasdomain_edit.php";
+$liste["edit_file"] = "web_childdomain_edit.php";
// Script File of the delete script
-$liste["delete_file"] = "web_aliasdomain_del.php";
+$liste["delete_file"] = "web_childdomain_del.php";
// Paging Template
$liste["paging_tpl"] = "templates/paging.tpl.htm";
diff --git a/interface/web/sites/list/web_subdomain.list.php b/interface/web/sites/list/web_subdomain.list.php
deleted file mode 100644
index 2a47d77..0000000
--- a/interface/web/sites/list/web_subdomain.list.php
+++ /dev/null
@@ -1,105 +0,0 @@
-<?php
-
-/*
- Datatypes:
- - INTEGER
- - DOUBLE
- - CURRENCY
- - VARCHAR
- - TEXT
- - DATE
-*/
-
-
-
-// Name of the list
-$liste["name"] = "web_subdomain";
-
-// Database table
-$liste["table"] = "web_domain";
-
-// Index index field of the database table
-$liste["table_idx"] = "domain_id";
-
-// Search Field Prefix
-$liste["search_prefix"] = "search_";
-
-// Records per page
-$liste["records_per_page"] = "15";
-
-// Script File of the list
-$liste["file"] = "web_subdomain_list.php";
-
-// Script file of the edit form
-$liste["edit_file"] = "web_subdomain_edit.php";
-
-// Script File of the delete script
-$liste["delete_file"] = "web_subdomain_del.php";
-
-// Paging Template
-$liste["paging_tpl"] = "templates/paging.tpl.htm";
-
-// Enable auth
-$liste["auth"] = "yes";
-
-
-/*****************************************************
-* Suchfelder
-*****************************************************/
-
-
-$liste["item"][] = array( 'field' => "active",
- 'datatype' => "VARCHAR",
- 'formtype' => "SELECT",
- 'op' => "=",
- 'prefix' => "",
- 'suffix' => "",
- 'width' => "",
- 'value' => array('y' => "<div id=\"ir-Yes\" class=\"swap\"><span>Yes</span></div>", 'n' => "<div class=\"swap\" id=\"ir-No\"><span>No</span></div>"));
-
-
-$liste["item"][] = array( 'field' => "server_id",
- 'datatype' => "VARCHAR",
- 'formtype' => "SELECT",
- 'op' => "like",
- 'prefix' => "%",
- 'suffix' => "%",
- 'datasource' => array ( 'type' => 'SQL',
- 'querystring' => 'SELECT server_id,server_name FROM server WHERE {AUTHSQL} ORDER BY server_name',
- 'keyfield'=> 'server_id',
- 'valuefield'=> 'server_name'
- ),
- 'width' => "",
- 'value' => "");
-
-$liste["item"][] = array( 'field' => "parent_domain_id",
- 'datatype' => "VARCHAR",
- 'filters' => array( 0 => array( 'event' => 'SHOW',
- 'type' => 'IDNTOUTF8')
- ),
- 'formtype' => "SELECT",
- 'op' => "=",
- 'prefix' => "",
- 'suffix' => "",
- 'datasource' => array ( 'type' => 'SQL',
- 'querystring' => "SELECT domain_id,domain FROM web_domain WHERE type = 'vhost' AND {AUTHSQL} ORDER BY domain",
- 'keyfield'=> 'domain_id',
- 'valuefield'=> 'domain'
- ),
- 'width' => "",
- 'value' => "");
-
-$liste["item"][] = array( 'field' => "domain",
- 'datatype' => "VARCHAR",
- 'filters' => array( 0 => array( 'event' => 'SHOW',
- 'type' => 'IDNTOUTF8')
- ),
- 'formtype' => "TEXT",
- 'op' => "like",
- 'prefix' => "%",
- 'suffix' => "%",
- 'width' => "",
- 'value' => "");
-
-
-?>
diff --git a/interface/web/sites/templates/web_aliasdomain_advanced.htm b/interface/web/sites/templates/web_childdomain_advanced.htm
similarity index 90%
rename from interface/web/sites/templates/web_aliasdomain_advanced.htm
rename to interface/web/sites/templates/web_childdomain_advanced.htm
index 4c605ca..d2704ed 100644
--- a/interface/web/sites/templates/web_aliasdomain_advanced.htm
+++ b/interface/web/sites/templates/web_childdomain_advanced.htm
@@ -1,7 +1,7 @@
<h2><tmpl_var name="list_head_txt"></h2>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_web_domain">
+<div class="panel panel_web_childdomain">
<div class="pnl_formsarea">
<fieldset class="inlineLabels"><legend>Options</legend>
@@ -14,8 +14,8 @@
<input type="hidden" name="id" value="{tmpl_var name='id'}">
<div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','sites/web_aliasdomain_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('sites/web_aliasdomain_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+ <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','sites/web_childdomain_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+ <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('sites/web_childdomain_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
</div>
</div>
@@ -34,4 +34,4 @@
});
}
-</script>
\ No newline at end of file
+</script>
diff --git a/interface/web/sites/templates/web_aliasdomain_edit.htm b/interface/web/sites/templates/web_childdomain_edit.htm
similarity index 78%
rename from interface/web/sites/templates/web_aliasdomain_edit.htm
rename to interface/web/sites/templates/web_childdomain_edit.htm
index 66c2c40..b0e0ebd 100644
--- a/interface/web/sites/templates/web_aliasdomain_edit.htm
+++ b/interface/web/sites/templates/web_childdomain_edit.htm
@@ -1,26 +1,53 @@
<h2><tmpl_var name="list_head_txt"></h2>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_web_domain">
+<div class="panel panel_web_childdomain">
<div class="pnl_formsarea">
<fieldset class="inlineLabels">
+ <tmpl_if name="childdomain_type" value="subdomain">
+ <tmpl_if name="domain_option">
<div class="ctrlHolder">
- <label for="domain">{tmpl_var name='domain_txt'}</label>
+ <label for="parent_domain_id">{tmpl_var name='parent_domain_id_txt'}</label>
+ <select id="parent_domain_id" name="parent_domain_id" class="selectInput formLengthHalf">{tmpl_var name='parent_domain_id'}</select>
+ </div>
+ </tmpl_if>
+ <div class="ctrlHolder">
+ <label for="domain">{tmpl_var name='host_txt'}</label>
+ <input name="domain" id="domain" value="{tmpl_var name='domain'}" size="30" maxlength="255" type="text" class="textInput formLengthHalf" />
+ </div>
+ <tmpl_if name="domain_option">
+ <div class="ctrlHolder">
+ <label for="sel_domain">{tmpl_var name='domain_txt'}</label>
+ <select name="sel_domain" id="sel_domain" class="selectInput">
+ {tmpl_var name='domain_option'}
+ </select>
+ </div>
+ <tmpl_else>
+ <div class="ctrlHolder">
+ <label for="parent_domain_id">{tmpl_var name='domain_txt'}</label>
+ <select id="parent_domain_id" name="parent_domain_id" class="selectInput formLengthHalf">{tmpl_var name='parent_domain_id'}</select>
+ </div>
+ </tmpl_if>
+ <tmpl_else>
+ <div class="ctrlHolder">
<tmpl_if name="domain_option">
+ <label for="domain">{tmpl_var name='domain_txt'}</label>
<select name="domain" id="domain" class="selectInput">
{tmpl_var name='domain_option'}
</select>
- <tmpl_else>
- <input name="domain" id="domain" value="{tmpl_var name='domain'}" size="30" maxlength="255" type="text" class="textInput" />
+ <tmpl_else>
+ <label for="domain">{tmpl_var name='domain_txt'}</label>
+ <input name="domain" id="domain" value="{tmpl_var name='domain'}" size="30" maxlength="255" type="text" class="textInput" />
</tmpl_if>
</div>
<div class="ctrlHolder">
<label for="parent_domain_id">{tmpl_var name='parent_domain_id_txt'}</label>
- <select name="parent_domain_id" id="parent_domain_id" class="selectInput">
+ <select id="parent_domain_id" name="parent_domain_id" class="selectInput">
{tmpl_var name='parent_domain_id'}
</select>
</div>
+ </tmpl_if>
<div class="ctrlHolder">
<label for="redirect_type">{tmpl_var name='redirect_type_txt'}</label>
<select name="redirect_type" id="redirect_type" class="selectInput formLengthHalf">
@@ -31,6 +58,7 @@
<label for="redirect_path">{tmpl_var name='redirect_path_txt'}</label>
<input name="redirect_path" id="redirect_path" value="{tmpl_var name='redirect_path'}" size="30" maxlength="255" type="text" class="textInput" />
</div>
+ <tmpl_if name="childdomain_type" value="aliasdomain">
<div class="ctrlHolder">
<label for="subdomain">{tmpl_var name='subdomain_txt'}</label>
<select name="subdomain" id="subdomain" class="selectInput formLengthHalf">
@@ -43,6 +71,7 @@
{tmpl_var name='seo_redirect'}
</select>
</div>
+ </tmpl_if>
<div class="ctrlHolder">
<p class="label">{tmpl_var name='active_txt'}</p>
<div class="multiField">
@@ -54,17 +83,17 @@
<input type="hidden" name="id" value="{tmpl_var name='id'}">
<div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','sites/web_aliasdomain_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('sites/web_aliasdomain_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+ <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','sites/web_childdomain_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+ <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('sites/web_childdomain_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
</div>
</div>
-
+
</div>
<script language="JavaScript" type="text/javascript">
var webId = jQuery('#parent_domain_id').val();
var serverId;
getServerId(webId);
-
+
jQuery('#parent_domain_id').change(function(){
webId = $(this).val();
getServerId(webId);
@@ -82,7 +111,7 @@
jQuery('.tabbox_tabs ul li:last').hide();
}
});
-
+
function getServerId(webId){
jQuery.getJSON('sites/ajax_get_json.php'+ '?' + Math.round(new Date().getTime()), {web_id : webId, type : "getserverid"}, function(data) {
serverId = data.serverid;
@@ -144,5 +173,4 @@
}
});
}
-
</script>
\ No newline at end of file
diff --git a/interface/web/sites/templates/web_aliasdomain_list.htm b/interface/web/sites/templates/web_childdomain_list.htm
similarity index 84%
rename from interface/web/sites/templates/web_aliasdomain_list.htm
rename to interface/web/sites/templates/web_childdomain_list.htm
index e85eed6..0895769 100644
--- a/interface/web/sites/templates/web_aliasdomain_list.htm
+++ b/interface/web/sites/templates/web_childdomain_list.htm
@@ -1,9 +1,9 @@
<h2><tmpl_var name="list_head_txt"></h2>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_list_web_aliasdomain">
+<div class="panel panel_list_web_childdomain">
- <div class="pnl_listsarea">
+ <div class="pnl_toolsarea">
<tmpl_if name='datalog_changes_count' op='>' value='0'>
<div>
<div class="systemmonitor-state state-info">
@@ -22,7 +22,7 @@
</tmpl_if>
<fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
<div class="buttons">
- <button class="button iconstxt icoAdd" type="button" onclick="loadContent('sites/web_aliasdomain_edit.php');">
+ <button class="button iconstxt icoAdd" type="button" onclick="loadContent('sites/web_childdomain_edit.php?type={tmpl_var name='childdomain_type'}');">
<span>{tmpl_var name="add_new_record_txt"}</span>
</button>
</div>
@@ -46,19 +46,19 @@
<td class="tbl_col_parent_domain_id"><select name="search_parent_domain_id">{tmpl_var name='search_parent_domain_id'}</select></td>
<td class="tbl_col_domain"><input type="text" name="search_domain" value="{tmpl_var name='search_domain'}" /></td>
<td class="tbl_col_buttons">
- <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','sites/web_aliasdomain_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
+ <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','sites/web_childdomain_list.php?type={tmpl_var name="childdomain_type"}');"><span>{tmpl_var name="filter_txt"}</span></button>
</td>
</tr>
</thead>
<tbody>
<tmpl_loop name="records">
<tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
- <td class="tbl_col_active"><a href="#" onclick="loadContent('sites/web_aliasdomain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
- <td class="tbl_col_server_id"><a href="#" onclick="loadContent('sites/web_aliasdomain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
- <td class="tbl_col_parent_domain_id"><a href="#" onclick="loadContent('sites/web_aliasdomain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="parent_domain_id"}</a></td>
- <td class="tbl_col_domain"><a href="#" onclick="loadContent('sites/web_aliasdomain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="domain"}</a></td>
+ <td class="tbl_col_active"><a href="#" onclick="loadContent('sites/web_childdomain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
+ <td class="tbl_col_server_id"><a href="#" onclick="loadContent('sites/web_childdomain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
+ <td class="tbl_col_parent_domain_id"><a href="#" onclick="loadContent('sites/web_childdomain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="parent_domain_id"}</a></td>
+ <td class="tbl_col_domain"><a href="#" onclick="loadContent('sites/web_childdomain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="domain"}</a></td>
<td class="tbl_col_buttons">
- <a class="button icons16 icoDelete" href="javascript: del_record('sites/web_aliasdomain_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+ <a class="button icons16 icoDelete" href="javascript: del_record('sites/web_childdomain_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
</td>
</tr>
</tmpl_loop>
@@ -70,7 +70,7 @@
</tbody>
<tfoot>
<tr>
- <td class="tbl_footer tbl_paging" colspan="5"><tmpl_var name="paging"></td>
+ <td class="tbl_footer tbl_paging" colspan="5"><tmpl_var name="paging"></td>
</tr>
</tfoot>
</table>
diff --git a/interface/web/sites/templates/web_subdomain_advanced.htm b/interface/web/sites/templates/web_subdomain_advanced.htm
deleted file mode 100644
index 3924362..0000000
--- a/interface/web/sites/templates/web_subdomain_advanced.htm
+++ /dev/null
@@ -1,37 +0,0 @@
-<h2><tmpl_var name="list_head_txt"></h2>
-<p><tmpl_var name="list_desc_txt"></p>
-
-<div class="panel panel_web_subdomain">
-
- <div class="pnl_formsarea">
- <fieldset class="inlineLabels"><legend>Options</legend>
- <div class="ctrlHolder proxy">
- <label for="proxy_directives">{tmpl_var name='proxy_directives_txt'}</label>
- <textarea name="proxy_directives" id="proxy_directives" rows='10' cols='50' style="width:400px;">{tmpl_var name='proxy_directives'}</textarea> <b>{tmpl_var name="available_proxy_directive_snippets_txt"}</b><br><br> {tmpl_var name="proxy_directive_snippets_txt"}
- </div>
- </fieldset>
-
- <input type="hidden" name="id" value="{tmpl_var name='id'}">
-
- <div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','sites/web_subdomain_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('sites/web_subdomain_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
- </div>
- </div>
-
-</div>
-<script language="JavaScript" type="text/javascript">
- var webId = jQuery('input[name="id"]').val();
- adjustForm();
-
- function adjustForm(){
- jQuery.getJSON('sites/ajax_get_json.php'+ '?' + Math.round(new Date().getTime()), {web_id : webId, type : "getredirecttype"}, function(data) {
- if(data.redirecttype == "proxy"){
- jQuery('.proxy').show();
- } else {
- jQuery('.proxy').hide();
- }
- });
- }
-
-</script>
diff --git a/interface/web/sites/templates/web_subdomain_edit.htm b/interface/web/sites/templates/web_subdomain_edit.htm
deleted file mode 100644
index a8abb21..0000000
--- a/interface/web/sites/templates/web_subdomain_edit.htm
+++ /dev/null
@@ -1,144 +0,0 @@
-<h2><tmpl_var name="list_head_txt"></h2>
-<p><tmpl_var name="list_desc_txt"></p>
-
-<div class="panel panel_web_subdomain">
-
- <div class="pnl_formsarea">
- <fieldset class="inlineLabels">
- <tmpl_if name="domain_option">
- <div class="ctrlHolder">
- <label for="parent_domain_id">{tmpl_var name='parent_domain_id_txt'}</label>
- <select id="parent_domain_id" name="parent_domain_id" class="selectInput formLengthHalf">{tmpl_var name='parent_domain_id'}</select>
- </div>
- </tmpl_if>
- <div class="ctrlHolder">
- <label for="domain">{tmpl_var name='host_txt'}</label>
- <input name="domain" id="domain" value="{tmpl_var name='domain'}" size="30" maxlength="255" type="text" class="textInput formLengthHalf" />
- </div>
- <tmpl_if name="domain_option">
- <div class="ctrlHolder">
- <label for="sel_domain">{tmpl_var name='domain_txt'}</label>
- <select name="sel_domain" id="sel_domain" class="selectInput">
- {tmpl_var name='domain_option'}
- </select>
- </div>
- <tmpl_else>
- <div class="ctrlHolder">
- <label for="parent_domain_id">{tmpl_var name='domain_txt'}</label>
- <select id="parent_domain_id" name="parent_domain_id" class="selectInput formLengthHalf">{tmpl_var name='parent_domain_id'}</select>
- </div>
- </tmpl_if>
- <div class="ctrlHolder">
- <label for="redirect_type">{tmpl_var name='redirect_type_txt'}</label>
- <select name="redirect_type" id="redirect_type" class="selectInput formLengthHalf">
- {tmpl_var name='redirect_type'}
- </select>
- </div>
- <div class="ctrlHolder">
- <label for="redirect_path">{tmpl_var name='redirect_path_txt'}</label>
- <input name="redirect_path" id="redirect_path" value="{tmpl_var name='redirect_path'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='active_txt'}</p>
- <div class="multiField">
- {tmpl_var name='active'}
- </div>
- </div>
- </fieldset>
-
- <input type="hidden" name="id" value="{tmpl_var name='id'}">
-
- <div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','sites/web_subdomain_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('sites/web_subdomain_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
- </div>
- </div>
-
-</div>
-<script language="JavaScript" type="text/javascript">
- //var webId = jQuery('input[name="id"]').val();
- var webId = jQuery('#parent_domain_id').val();
- var serverId;
- getServerId(webId);
-
- jQuery('#parent_domain_id').change(function(){
- webId = $(this).val();
- getServerId(webId);
- });
-
- if(jQuery('#redirect_type').val() == 'proxy'){
- jQuery('.tabbox_tabs ul li:last').show();
- } else {
- jQuery('.tabbox_tabs ul li:last').hide();
- }
- jQuery('#redirect_type').change(function(){
- if(jQuery(this).val() == 'proxy'){
- jQuery('.tabbox_tabs ul li:last').show();
- } else {
- jQuery('.tabbox_tabs ul li:last').hide();
- }
- });
-
- function getServerId(webId){
- jQuery.getJSON('sites/ajax_get_json.php'+ '?' + Math.round(new Date().getTime()), {web_id : webId, type : "getserverid"}, function(data) {
- serverId = data.serverid;
- adjustForm(serverId);
- });
- }
-
- function adjustForm(serverId){
- jQuery.getJSON('sites/ajax_get_json.php'+ '?' + Math.round(new Date().getTime()), {server_id : serverId, type : "getservertype"}, function(data) {
- var selected = jQuery('#redirect_type').val();
- if(data.servertype == "nginx"){
- jQuery("#redirect_type option[value='R']").attr('disabled','disabled');
- jQuery('#redirect_type option[value="L"]').attr('disabled','disabled');
- jQuery('#redirect_type option[value="R,L"]').attr('disabled','disabled');
- jQuery('#redirect_type option[value="R=301,L"]').attr('disabled','disabled');
-
- jQuery("#redirect_type option[value='R']").hide();
- jQuery('#redirect_type option[value="L"]').hide();
- jQuery('#redirect_type option[value="R,L"]').hide();
- jQuery('#redirect_type option[value="R=301,L"]').hide();
-
- jQuery('#redirect_type option[value="last"]').show();
- jQuery('#redirect_type option[value="break"]').show();
- jQuery('#redirect_type option[value="redirect"]').show();
- jQuery('#redirect_type option[value="permanent"]').show();
- jQuery('#redirect_type option[value="proxy"]').show();
-
- jQuery('#redirect_type option[value="last"]').attr('disabled',false);
- jQuery('#redirect_type option[value="break"]').attr('disabled',false);
- jQuery('#redirect_type option[value="redirect"]').attr('disabled',false);
- jQuery('#redirect_type option[value="permanent"]').attr('disabled',false);
- jQuery('#redirect_type option[value="proxy"]').attr('disabled',false);
-
- if(selected != "no" && selected != "" && selected != "last" && selected != "break" && selected != "redirect" && selected != "permanent" && selected != "proxy") jQuery('#redirect_type option[value="no"]').attr('selected', 'selected');
- } else {
- jQuery('#redirect_type option[value="last"]').attr('disabled','disabled');
- jQuery('#redirect_type option[value="break"]').attr('disabled','disabled');
- jQuery('#redirect_type option[value="redirect"]').attr('disabled','disabled');
- jQuery('#redirect_type option[value="permanent"]').attr('disabled','disabled');
- jQuery('#redirect_type option[value="proxy"]').attr('disabled','disabled');
-
- jQuery('#redirect_type option[value="last"]').hide();
- jQuery('#redirect_type option[value="break"]').hide();
- jQuery('#redirect_type option[value="redirect"]').hide();
- jQuery('#redirect_type option[value="permanent"]').hide();
- jQuery('#redirect_type option[value="proxy"]').hide();
-
- jQuery('#redirect_type option[value="R"]').show();
- jQuery('#redirect_type option[value="L"]').show();
- jQuery('#redirect_type option[value="R,L"]').show();
- jQuery('#redirect_type option[value="R=301,L"]').show();
-
- jQuery('#redirect_type option[value="R"]').attr('disabled',false);
- jQuery('#redirect_type option[value="L"]').attr('disabled',false);
- jQuery('#redirect_type option[value="R,L"]').attr('disabled',false);
- jQuery('#redirect_type option[value="R=301,L"]').attr('disabled',false);
-
- if(selected != "no" && selected != "" && selected != "R" && selected != "L" && selected != "R,L" && selected != "R=301,L") jQuery('#redirect_type option[value="no"]').attr('selected', 'selected');
- }
- });
- }
-
-</script>
\ No newline at end of file
diff --git a/interface/web/sites/templates/web_subdomain_list.htm b/interface/web/sites/templates/web_subdomain_list.htm
deleted file mode 100644
index cf3f874..0000000
--- a/interface/web/sites/templates/web_subdomain_list.htm
+++ /dev/null
@@ -1,81 +0,0 @@
-<h2><tmpl_var name="list_head_txt"></h2>
-<p><tmpl_var name="list_desc_txt"></p>
-
-<div class="panel panel_list_web_subdomain">
-
- <div class="pnl_toolsarea">
- <tmpl_if name='datalog_changes_count' op='>' value='0'>
- <div>
- <div class="systemmonitor-state state-info">
- <div class="status"></div>
- <div class="statusMsg">
- {tmpl_var name="datalog_changes_txt"}
- <ul>
- <tmpl_loop name="datalog_changes">
- <li><strong>{tmpl_var name="text"}:</strong> {tmpl_var name="count"}</li>
- </tmpl_loop>
- </ul>
- {tmpl_var name="datalog_changes_end_txt"}
- </div>
- </div><br />
- </div>
- </tmpl_if>
- <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
- <div class="buttons">
- <button class="button iconstxt icoAdd" type="button" onclick="loadContent('sites/web_subdomain_edit.php');">
- <span>{tmpl_var name="add_new_record_txt"}</span>
- </button>
- </div>
- </fieldset>
- </div>
-
- <div class="pnl_listarea">
- <fieldset><legend><tmpl_var name="list_head_txt"></legend>
- <table class="list">
- <thead>
- <tr class="caption">
- <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
- <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
- <th class="tbl_col_parent_domain_id" scope="col"><tmpl_var name="parent_domain_id_txt"></th>
- <th class="tbl_col_domain" scope="col"><tmpl_var name="domain_txt"></th>
- <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
- </tr>
- <tr class="filter">
- <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
- <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
- <td class="tbl_col_parent_domain_id"><select name="search_parent_domain_id">{tmpl_var name='search_parent_domain_id'}</select></td>
- <td class="tbl_col_domain"><input type="text" name="search_domain" value="{tmpl_var name='search_domain'}" /></td>
- <td class="tbl_col_buttons">
- <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','sites/web_subdomain_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
- </td>
- </tr>
- </thead>
- <tbody>
- <tmpl_loop name="records">
- <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
- <td class="tbl_col_active"><a href="#" onclick="loadContent('sites/web_subdomain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
- <td class="tbl_col_server_id"><a href="#" onclick="loadContent('sites/web_subdomain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
- <td class="tbl_col_parent_domain_id"><a href="#" onclick="loadContent('sites/web_subdomain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="parent_domain_id"}</a></td>
- <td class="tbl_col_domain"><a href="#" onclick="loadContent('sites/web_subdomain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="domain"}</a></td>
- <td class="tbl_col_buttons">
- <a class="button icons16 icoDelete" href="javascript: del_record('sites/web_subdomain_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
- </td>
- </tr>
- </tmpl_loop>
- <tmpl_unless name="records">
- <tr class="tbl_row_noresults tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
- <td colspan="5">{tmpl_var name='globalsearch_noresults_text_txt'}</td>
- </tr>
- </tmpl_unless>
- </tbody>
-
- <tfoot>
- <tr>
- <td class="tbl_footer tbl_paging" colspan="5"><tmpl_var name="paging"></td>
- </tr>
- </tfoot>
- </table>
- </fieldset>
- </div>
-
-</div>
\ No newline at end of file
diff --git a/interface/web/sites/web_aliasdomain_del.php b/interface/web/sites/web_aliasdomain_del.php
index 6793eba..d9a4228 100644
--- a/interface/web/sites/web_aliasdomain_del.php
+++ b/interface/web/sites/web_aliasdomain_del.php
@@ -1,51 +1,6 @@
<?php
-/*
-Copyright (c) 2007, Till Brehm, projektfarm Gmbh
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
- * Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
- * Neither the name of ISPConfig nor the names of its contributors
- may be used to endorse or promote products derived from this software without
- specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
-INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
-EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-/******************************************
-* Begin Form configuration
-******************************************/
-
-$list_def_file = "list/web_aliasdomain.list.php";
-$tform_def_file = "form/web_aliasdomain.tform.php";
-
-/******************************************
-* End Form configuration
-******************************************/
-
-require_once '../../lib/config.inc.php';
-require_once '../../lib/app.inc.php';
-
-//* Check permissions for module
-$app->auth->check_module_permissions('sites');
-
-$app->uses("tform_actions");
-$app->tform_actions->onDelete();
+/* this file is no longer used. */
+die();
?>
diff --git a/interface/web/sites/web_aliasdomain_edit.php b/interface/web/sites/web_aliasdomain_edit.php
index 0edb274..d9a4228 100644
--- a/interface/web/sites/web_aliasdomain_edit.php
+++ b/interface/web/sites/web_aliasdomain_edit.php
@@ -1,189 +1,6 @@
<?php
-/*
-Copyright (c) 2007, Till Brehm, projektfarm Gmbh
-All rights reserved.
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
- * Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
- * Neither the name of ISPConfig nor the names of its contributors
- may be used to endorse or promote products derived from this software without
- specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
-INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
-EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-
-/******************************************
-* Begin Form configuration
-******************************************/
-
-$tform_def_file = "form/web_aliasdomain.tform.php";
-
-/******************************************
-* End Form configuration
-******************************************/
-
-require_once '../../lib/config.inc.php';
-require_once '../../lib/app.inc.php';
-
-//* Check permissions for module
-$app->auth->check_module_permissions('sites');
-
-// Loading classes
-$app->uses('tpl,tform,tform_actions,tools_sites');
-$app->load('tform_actions');
-
-class page_action extends tform_actions {
-
- var $parent_domain_record;
-
- function onShowNew() {
- global $app, $conf;
-
- // we will check only users, not admins
- if($_SESSION["s"]["user"]["typ"] == 'user') {
- if(!$app->tform->checkClientLimit('limit_web_aliasdomain', "type = 'alias'")) {
- $app->error($app->tform->wordbook["limit_web_aliasdomain_txt"]);
- }
- if(!$app->tform->checkResellerLimit('limit_web_aliasdomain', "type = 'alias'")) {
- $app->error('Reseller: '.$app->tform->wordbook["limit_web_aliasdomain_txt"]);
- }
- }
-
- parent::onShowNew();
- }
-
- function onShowEnd() {
- global $app, $conf;
-
- /*
- * Now we have to check, if we should use the domain-module to select the domain
- * or not
- */
- $app->uses('ini_parser,getconf');
- $settings = $app->getconf->get_global_config('domains');
- if ($settings['use_domain_module'] == 'y') {
- /*
- * The domain-module is in use.
- */
- $domains = $app->tools_sites->getDomainModuleDomains();
- $domain_select = '';
- if(is_array($domains) && sizeof($domains) > 0) {
- /* We have domains in the list, so create the drop-down-list */
- foreach( $domains as $domain) {
- $domain_select .= "<option value=" . $domain['domain_id'] ;
- if ($domain['domain'] == $this->dataRecord["domain"]) {
- $domain_select .= " selected";
- }
- $domain_select .= ">" . $app->functions->idn_decode($domain['domain']) . "</option>\r\n";
- }
- }
- else {
- /*
- * We have no domains in the domain-list. This means, we can not add ANY new domain.
- * To avoid, that the variable "domain_option" is empty and so the user can
- * free enter a domain, we have to create a empty option!
- */
- $domain_select .= "<option value=''></option>\r\n";
- }
- $app->tpl->setVar("domain_option", $domain_select);
- }
-
- if($_SESSION["s"]["user"]["typ"] == 'admin') {
- // Directive Snippets
- $proxy_directive_snippets = $app->db->queryAllRecords("SELECT * FROM directive_snippets WHERE type = 'proxy' AND active = 'y'");
- $proxy_directive_snippets_txt = '';
- if(is_array($proxy_directive_snippets) && !empty($proxy_directive_snippets)){
- foreach($proxy_directive_snippets as $proxy_directive_snippet){
- $proxy_directive_snippets_txt .= '<a href="javascript:void(0);" class="addPlaceholderContent">['.$proxy_directive_snippet['name'].']<pre class="addPlaceholderContent" style="display:none;">'.$proxy_directive_snippet['snippet'].'</pre></a> ';
- }
- }
- if($proxy_directive_snippets_txt == '') $proxy_directive_snippets_txt = '------';
- $app->tpl->setVar("proxy_directive_snippets_txt", $proxy_directive_snippets_txt);
- }
-
- parent::onShowEnd();
-
- }
-
- function onSubmit() {
- global $app, $conf;
-
- // Get the record of the parent domain
- $parent_domain = $app->db->queryOneRecord("SELECT * FROM web_domain WHERE domain_id = ".$app->functions->intval(@$this->dataRecord["parent_domain_id"]) . " AND ".$app->tform->getAuthSQL('r'));
- if(!$parent_domain || $parent_domain['domain_id'] != @$this->dataRecord['parent_domain_id']) $app->tform->errorMessage .= $app->tform->lng("no_domain_perm");
- /* check if the domain module is used - and check if the selected domain can be used! */
- $app->uses('ini_parser,getconf');
- $settings = $app->getconf->get_global_config('domains');
- if ($settings['use_domain_module'] == 'y') {
- $domain_check = $app->tools_sites->checkDomainModuleDomain($this->dataRecord['domain']);
- if(!$domain_check) {
- // invalid domain selected
- $app->tform->errorMessage .= $app->tform->lng("domain_error_empty")."<br />";
- } else {
- $this->dataRecord['domain'] = $domain_check;
- }
- }
-
- // nginx: if redirect type is proxy and redirect path is no URL, display error
- if($this->dataRecord["redirect_type"] == 'proxy' && substr($this->dataRecord['redirect_path'], 0, 1) == '/'){
- $app->tform->errorMessage .= $app->tform->lng("error_proxy_requires_url")."<br />";
- }
-
- // Set a few fixed values
- $this->dataRecord["type"] = 'alias';
- $this->dataRecord["server_id"] = $parent_domain["server_id"];
-
- $this->parent_domain_record = $parent_domain;
-
- //* make sure that the domain is lowercase
- if(isset($this->dataRecord["domain"])) $this->dataRecord["domain"] = strtolower($this->dataRecord["domain"]);
-
- parent::onSubmit();
- }
-
- function onAfterInsert() {
- global $app, $conf;
-
- $app->db->query('UPDATE web_domain SET sys_groupid = ? WHERE domain_id = ?', $this->parent_domain_record['sys_groupid'], $this->id);
-
- }
-
- function onAfterUpdate() {
- global $app, $conf;
-
- //* Check if parent domain has been changed
- if($this->dataRecord['parent_domain_id'] != $this->oldDataRecord['parent_domain_id']) {
-
- //* Update the domain owner
- $app->db->query('UPDATE web_domain SET sys_groupid = ? WHERE domain_id = ?', $this->parent_domain_record['sys_groupid'], $this->id);
-
- //* Update the old website, so that the vhost alias gets removed
- //* We force the update by inserting a transaction record without changes manually.
- $old_website = $app->db->queryOneRecord('SELECT * FROM web_domain WHERE domain_id = '.$app->functions->intval($this->oldDataRecord['domain_id']));
- $app->db->datalogSave('web_domain', 'UPDATE', 'domain_id', $app->functions->intval($this->oldDataRecord['parent_domain_id']), $old_website, $old_website, true);
- }
-
- }
-
-}
-
-$page = new page_action;
-$page->onLoad();
+/* this file is no longer used. */
+die();
?>
diff --git a/interface/web/sites/web_aliasdomain_list.php b/interface/web/sites/web_aliasdomain_list.php
index e99e0ce..8c64454 100644
--- a/interface/web/sites/web_aliasdomain_list.php
+++ b/interface/web/sites/web_aliasdomain_list.php
@@ -1,55 +1,7 @@
<?php
-/*
-Copyright (c) 2007, Till Brehm, projektfarm Gmbh
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
- * Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
- * Neither the name of ISPConfig nor the names of its contributors
- may be used to endorse or promote products derived from this software without
- specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
-INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
-EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-require_once '../../lib/config.inc.php';
-require_once '../../lib/app.inc.php';
-
-/******************************************
-* Begin Form configuration
-******************************************/
-
-$list_def_file = "list/web_aliasdomain.list.php";
-
-/******************************************
-* End Form configuration
-******************************************/
-
-//* Check permissions for module
-$app->auth->check_module_permissions('sites');
-
-$app->uses('listform_actions');
-
-// Limit the results to alias domains
-$app->listform_actions->SQLExtWhere = "web_domain.type = 'alias'";
-$app->listform_actions->SQLOrderBy = 'ORDER BY web_domain.domain';
-$app->listform_actions->onLoad();
+/* this file is no longer used. */
+die();
?>
diff --git a/interface/web/sites/web_childdomain_del.php b/interface/web/sites/web_childdomain_del.php
new file mode 100644
index 0000000..e1bdaec
--- /dev/null
+++ b/interface/web/sites/web_childdomain_del.php
@@ -0,0 +1,58 @@
+<?php
+
+/*
+Copyright (c) 2007, Till Brehm, projektfarm Gmbh
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+ * Redistributions of source code must retain the above copyright notice,
+ this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following disclaimer in the documentation
+ and/or other materials provided with the distribution.
+ * Neither the name of ISPConfig nor the names of its contributors
+ may be used to endorse or promote products derived from this software without
+ specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+/******************************************
+* Begin Form configuration
+******************************************/
+
+$list_def_file = "list/web_childdomain.list.php";
+$tform_def_file = "form/web_childdomain.tform.php";
+
+/******************************************
+* End Form configuration
+******************************************/
+
+require_once '../../lib/config.inc.php';
+require_once '../../lib/app.inc.php';
+
+//* Check permissions for module
+$app->auth->check_module_permissions('sites');
+
+//* Get and set the child domain type - store in session
+$show_type = 'aliasdomain';
+if(isset($_GET['type']) && $_GET['type'] == 'subdomain') $show_type = 'subdomain';
+elseif(!isset($_GET['type']) && isset($_SESSION['s']['var']['childdomain_type']) && $_SESSION['s']['var']['childdomain_type'] == 'subdomain') $show_type = 'subdomain';
+
+$_SESSION['s']['var']['childdomain_type'] = $show_type;
+
+$app->uses("tform_actions");
+$app->tform_actions->onDelete();
+
+?>
diff --git a/interface/web/sites/web_childdomain_edit.php b/interface/web/sites/web_childdomain_edit.php
new file mode 100644
index 0000000..627623a
--- /dev/null
+++ b/interface/web/sites/web_childdomain_edit.php
@@ -0,0 +1,243 @@
+<?php
+/*
+Copyright (c) 2007, Till Brehm, projektfarm Gmbh
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+ * Redistributions of source code must retain the above copyright notice,
+ this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following disclaimer in the documentation
+ and/or other materials provided with the distribution.
+ * Neither the name of ISPConfig nor the names of its contributors
+ may be used to endorse or promote products derived from this software without
+ specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+
+/******************************************
+* Begin Form configuration
+******************************************/
+
+$tform_def_file = "form/web_childdomain.tform.php";
+
+/******************************************
+* End Form configuration
+******************************************/
+
+require_once '../../lib/config.inc.php';
+require_once '../../lib/app.inc.php';
+
+//* Check permissions for module
+$app->auth->check_module_permissions('sites');
+
+// Loading classes
+$app->uses('tpl,tform,tform_actions,tools_sites');
+$app->load('tform_actions');
+
+class page_action extends tform_actions {
+
+ var $parent_domain_record;
+ var $_childdomain_type;
+
+ function onLoad() {
+ //* Get and set the child domain type - store in session
+ $show_type = 'aliasdomain';
+ if(isset($_GET['type']) && $_GET['type'] == 'subdomain') $show_type = 'subdomain';
+ elseif(!isset($_GET['type']) && isset($_SESSION['s']['var']['childdomain_type']) && $_SESSION['s']['var']['childdomain_type'] == 'subdomain') $show_type = 'subdomain';
+
+ $_SESSION['s']['var']['childdomain_type'] = $show_type;
+ $this->_childdomain_type = $show_type;
+
+ parent::onLoad();
+ }
+
+ function onShowNew() {
+ global $app, $conf;
+
+ // we will check only users, not admins
+ if($_SESSION["s"]["user"]["typ"] == 'user') {
+ if($this->_childdomain_type == 'subdomain') {
+ if(!$app->tform->checkClientLimit('limit_web_subdomain', "(type = 'subdomain' OR type = 'vhostsubdomain')")) {
+ $app->error($app->tform->wordbook["limit_web_subdomain_txt"]);
+ }
+ if(!$app->tform->checkResellerLimit('limit_web_subdomain', "(type = 'subdomain' OR type = 'vhostsubdomain')")) {
+ $app->error('Reseller: '.$app->tform->wordbook["limit_web_subdomain_txt"]);
+ }
+ } else {
+ if(!$app->tform->checkClientLimit('limit_web_aliasdomain', "(type = 'alias' OR type = 'vhostalias')")) {
+ $app->error($app->tform->wordbook["limit_web_aliasdomain_txt"]);
+ }
+ if(!$app->tform->checkResellerLimit('limit_web_aliasdomain', "type = 'alias'")) {
+ $app->error('Reseller: '.$app->tform->wordbook["limit_web_aliasdomain_txt"]);
+ }
+ }
+ }
+
+ $app->tpl->setVar('childdomain_type', $this->_childdomain_type);
+
+ parent::onShowNew();
+ }
+
+ function onShowEnd() {
+ global $app, $conf;
+
+ /*
+ * Now we have to check, if we should use the domain-module to select the domain
+ * or not
+ */
+ $app->uses('ini_parser,getconf');
+ $settings = $app->getconf->get_global_config('domains');
+ if ($settings['use_domain_module'] == 'y') {
+ /*
+ * The domain-module is in use.
+ */
+ $domains = $app->tools_sites->getDomainModuleDomains();
+ $domain_select = '';
+ $selected_domain = '';
+ if(is_array($domains) && sizeof($domains) > 0) {
+ /* We have domains in the list, so create the drop-down-list */
+ foreach( $domains as $domain) {
+ $domain_select .= "<option value=" . $domain['domain_id'] ;
+ if ($this->_childdomain_type == 'subdomain' && '.' . $domain['domain'] == substr($this->dataRecord["domain"], -strlen($domain['domain']) - 1)) {
+ $domain_select .= " selected";
+ $selected_domain = $domain['domain'];
+ } elseif($this->_childdomain_type == 'aliasdomain' && $domain['domain'] == $this->dataRecord["domain"]) {
+ $domain_select .= " selected";
+ }
+ $domain_select .= ">" . $app->functions->idn_decode($domain['domain']) . "</option>\r\n";
+ }
+ }
+ else {
+ /*
+ * We have no domains in the domain-list. This means, we can not add ANY new domain.
+ * To avoid, that the variable "domain_option" is empty and so the user can
+ * free enter a domain, we have to create a empty option!
+ */
+ $domain_select .= "<option value=''></option>\r\n";
+ }
+ $app->tpl->setVar("domain_option", $domain_select);
+ if($this->_childdomain_type == 'subdomain') {
+ $this->dataRecord['domain'] = substr($this->dataRecord["domain"], 0, strlen($this->dataRecord['domain']) - strlen($selected_domain) - 1);
+ }
+ } else {
+ if($this->_childdomain_type == 'subdomain') {
+ // Get the record of the parent domain
+ $parent_domain = $app->db->queryOneRecord("select * FROM web_domain WHERE domain_id = ".$app->functions->intval(@$this->dataRecord["parent_domain_id"]));
+
+ // remove the parent domain part of the domain name before we show it in the text field.
+ $this->dataRecord["domain"] = str_replace('.'.$parent_domain["domain"], '', $this->dataRecord["domain"]);
+ }
+ }
+ if($this->_childdomain_type == 'subdomain') $app->tpl->setVar("domain", $this->dataRecord["domain"]);
+
+ if($_SESSION["s"]["user"]["typ"] == 'admin') {
+ // Directive Snippets
+ $proxy_directive_snippets = $app->db->queryAllRecords("SELECT * FROM directive_snippets WHERE type = 'proxy' AND active = 'y'");
+ $proxy_directive_snippets_txt = '';
+ if(is_array($proxy_directive_snippets) && !empty($proxy_directive_snippets)){
+ foreach($proxy_directive_snippets as $proxy_directive_snippet){
+ $proxy_directive_snippets_txt .= '<a href="javascript:void(0);" class="addPlaceholderContent">['.$proxy_directive_snippet['name'].']<pre class="addPlaceholderContent" style="display:none;">'.$proxy_directive_snippet['snippet'].'</pre></a> ';
+ }
+ }
+ if($proxy_directive_snippets_txt == '') $proxy_directive_snippets_txt = '------';
+ $app->tpl->setVar("proxy_directive_snippets_txt", $proxy_directive_snippets_txt);
+ }
+
+ $app->tpl->setVar('childdomain_type', $this->_childdomain_type);
+
+ parent::onShowEnd();
+
+ }
+
+ function onSubmit() {
+ global $app, $conf;
+
+ // Get the record of the parent domain
+ $parent_domain = $app->db->queryOneRecord("SELECT * FROM web_domain WHERE domain_id = ".$app->functions->intval(@$this->dataRecord["parent_domain_id"]) . " AND ".$app->tform->getAuthSQL('r'));
+ if(!$parent_domain || $parent_domain['domain_id'] != @$this->dataRecord['parent_domain_id']) $app->tform->errorMessage .= $app->tform->lng("no_domain_perm");
+ /* check if the domain module is used - and check if the selected domain can be used! */
+ $app->uses('ini_parser,getconf');
+ $settings = $app->getconf->get_global_config('domains');
+ if ($settings['use_domain_module'] == 'y') {
+ // get the record of the domain module domain
+ if($this->_childdomain_type == 'subdomain') {
+ $domain = $app->tools_sites->checkDomainModuleDomain($this->dataRecord['sel_domain']);
+ if(!$domain) {
+ $app->tform->errorMessage .= $app->tform->lng("domain_error_empty")."<br />";
+ } else {
+ $this->dataRecord['domain'] = $this->dataRecord['domain'] . '.' . $domain;
+ }
+ } else {
+ $domain_check = $app->tools_sites->checkDomainModuleDomain($this->dataRecord['domain']);
+ if(!$domain_check) {
+ // invalid domain selected
+ $app->tform->errorMessage .= $app->tform->lng("domain_error_empty")."<br />";
+ } else {
+ $this->dataRecord['domain'] = $domain_check;
+ }
+ }
+ } else {
+ if($this->_childdomain_type == 'subdomain') $this->dataRecord["domain"] = $this->dataRecord["domain"].'.'.$parent_domain["domain"];
+ }
+
+ // nginx: if redirect type is proxy and redirect path is no URL, display error
+ if($this->dataRecord["redirect_type"] == 'proxy' && substr($this->dataRecord['redirect_path'], 0, 1) == '/'){
+ $app->tform->errorMessage .= $app->tform->lng("error_proxy_requires_url")."<br />";
+ }
+
+ // Set a few fixed values
+ $this->dataRecord["type"] = ($this->_childdomain_type == 'subdomain' ? 'subdomain' : 'alias');
+ $this->dataRecord["server_id"] = $parent_domain["server_id"];
+
+ $this->parent_domain_record = $parent_domain;
+
+ //* make sure that the domain is lowercase
+ if(isset($this->dataRecord["domain"])) $this->dataRecord["domain"] = strtolower($this->dataRecord["domain"]);
+
+ parent::onSubmit();
+ }
+
+ function onAfterInsert() {
+ global $app, $conf;
+
+ $app->db->query('UPDATE web_domain SET sys_groupid = ? WHERE domain_id = ?', $this->parent_domain_record['sys_groupid'], $this->id);
+
+ }
+
+ function onAfterUpdate() {
+ global $app, $conf;
+
+ //* Check if parent domain has been changed
+ if($this->dataRecord['parent_domain_id'] != $this->oldDataRecord['parent_domain_id']) {
+
+ //* Update the domain owner
+ $app->db->query('UPDATE web_domain SET sys_groupid = ? WHERE domain_id = ?', $this->parent_domain_record['sys_groupid'], $this->id);
+
+ //* Update the old website, so that the vhost alias gets removed
+ //* We force the update by inserting a transaction record without changes manually.
+ $old_website = $app->db->queryOneRecord('SELECT * FROM web_domain WHERE domain_id = '.$app->functions->intval($this->oldDataRecord['domain_id']));
+ $app->db->datalogSave('web_domain', 'UPDATE', 'domain_id', $app->functions->intval($this->oldDataRecord['parent_domain_id']), $old_website, $old_website, true);
+ }
+
+ }
+
+}
+
+$page = new page_action;
+$page->onLoad();
+
+?>
diff --git a/interface/web/sites/web_childdomain_list.php b/interface/web/sites/web_childdomain_list.php
new file mode 100644
index 0000000..a4e953c
--- /dev/null
+++ b/interface/web/sites/web_childdomain_list.php
@@ -0,0 +1,73 @@
+<?php
+
+/*
+Copyright (c) 2007, Till Brehm, projektfarm Gmbh
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+ * Redistributions of source code must retain the above copyright notice,
+ this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following disclaimer in the documentation
+ and/or other materials provided with the distribution.
+ * Neither the name of ISPConfig nor the names of its contributors
+ may be used to endorse or promote products derived from this software without
+ specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+require_once '../../lib/config.inc.php';
+require_once '../../lib/app.inc.php';
+
+/******************************************
+* Begin Form configuration
+******************************************/
+
+$list_def_file = "list/web_childdomain.list.php";
+
+/******************************************
+* End Form configuration
+******************************************/
+
+//* Check permissions for module
+$app->auth->check_module_permissions('sites');
+
+$app->uses('listform_actions');
+
+//* Get and set the child domain type - store in session
+$show_type = 'aliasdomain';
+if(isset($_GET['type']) && $_GET['type'] == 'subdomain') $show_type = 'subdomain';
+elseif(!isset($_GET['type']) && isset($_SESSION['s']['var']['childdomain_type']) && $_SESSION['s']['var']['childdomain_type'] == 'subdomain') $show_type = 'subdomain';
+
+$_SESSION['s']['var']['childdomain_type'] = $show_type;
+
+class list_action extends listform_actions {
+ function onShow() {
+ global $app;
+ $app->tpl->setVar('childdomain_type', $_SESSION['s']['var']['childdomain_type']);
+
+ parent::onShow();
+ }
+}
+
+
+$list = new list_action;
+// Limit the results to alias domains
+$list->SQLExtWhere = "web_domain.type = '" . ($show_type == 'subdomain' ? 'subdomain' : 'alias') . "'";
+$list->SQLOrderBy = 'ORDER BY web_domain.domain';
+$list->onLoad();
+
+
+?>
diff --git a/interface/web/sites/web_subdomain_del.php b/interface/web/sites/web_subdomain_del.php
index 18e7e52..d9a4228 100644
--- a/interface/web/sites/web_subdomain_del.php
+++ b/interface/web/sites/web_subdomain_del.php
@@ -1,51 +1,6 @@
<?php
-/*
-Copyright (c) 2007, Till Brehm, projektfarm Gmbh
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
- * Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
- * Neither the name of ISPConfig nor the names of its contributors
- may be used to endorse or promote products derived from this software without
- specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
-INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
-EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-/******************************************
-* Begin Form configuration
-******************************************/
-
-$list_def_file = "list/web_subdomain.list.php";
-$tform_def_file = "form/web_subdomain.tform.php";
-
-/******************************************
-* End Form configuration
-******************************************/
-
-require_once '../../lib/config.inc.php';
-require_once '../../lib/app.inc.php';
-
-//* Check permissions for module
-$app->auth->check_module_permissions('sites');
-
-$app->uses("tform_actions");
-$app->tform_actions->onDelete();
+/* this file is no longer used. */
+die();
?>
diff --git a/interface/web/sites/web_subdomain_edit.php b/interface/web/sites/web_subdomain_edit.php
index 0d485c4..d9a4228 100644
--- a/interface/web/sites/web_subdomain_edit.php
+++ b/interface/web/sites/web_subdomain_edit.php
@@ -1,198 +1,6 @@
<?php
-/*
-Copyright (c) 2007, Till Brehm, projektfarm Gmbh
-All rights reserved.
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
- * Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
- * Neither the name of ISPConfig nor the names of its contributors
- may be used to endorse or promote products derived from this software without
- specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
-INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
-EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-
-/******************************************
-* Begin Form configuration
-******************************************/
-
-$tform_def_file = "form/web_subdomain.tform.php";
-
-/******************************************
-* End Form configuration
-******************************************/
-
-require_once '../../lib/config.inc.php';
-require_once '../../lib/app.inc.php';
-
-//* Check permissions for module
-$app->auth->check_module_permissions('sites');
-
-// Loading classes
-$app->uses('tpl,tform,tform_actions,tools_sites');
-$app->load('tform_actions');
-
-class page_action extends tform_actions {
-
- var $parent_domain_record;
-
- function onShowNew() {
- global $app, $conf;
-
- // we will check only users, not admins
- if($_SESSION["s"]["user"]["typ"] == 'user') {
- if(!$app->tform->checkClientLimit('limit_web_subdomain', "(type = 'subdomain' OR type = 'vhostsubdomain')")) {
- $app->error($app->tform->wordbook["limit_web_subdomain_txt"]);
- }
- if(!$app->tform->checkResellerLimit('limit_web_subdomain', "(type = 'subdomain' OR type = 'vhostsubdomain')")) {
- $app->error('Reseller: '.$app->tform->wordbook["limit_web_subdomain_txt"]);
- }
- }
-
- parent::onShowNew();
- }
-
- function onShowEnd() {
- global $app, $conf;
-
- $app->uses('ini_parser,getconf');
- $settings = $app->getconf->get_global_config('domains');
- if ($settings['use_domain_module'] == 'y') {
- /*
- * The domain-module is in use.
- */
- $domains = $app->tools_sites->getDomainModuleDomains();
- $domain_select = '';
- $selected_domain = '';
- if(is_array($domains) && sizeof($domains) > 0) {
- /* We have domains in the list, so create the drop-down-list */
- foreach( $domains as $domain) {
- $domain_select .= "<option value=" . $domain['domain_id'] ;
- if ('.' . $domain['domain'] == substr($this->dataRecord["domain"], -strlen($domain['domain']) - 1)) {
- $domain_select .= " selected";
- $selected_domain = $domain['domain'];
- }
- $domain_select .= ">" . $app->functions->idn_decode($domain['domain']) . "</option>\r\n";
- }
- }
- else {
- /*
- * We have no domains in the domain-list. This means, we can not add ANY new domain.
- * To avoid, that the variable "domain_option" is empty and so the user can
- * free enter a domain, we have to create a empty option!
- */
- $domain_select .= "<option value=''></option>\r\n";
- }
- $app->tpl->setVar("domain_option", $domain_select);
- $this->dataRecord['domain'] = substr($this->dataRecord["domain"], 0, strlen($this->dataRecord['domain']) - strlen($selected_domain) - 1);
- } else {
-
- // Get the record of the parent domain
- $parent_domain = $app->db->queryOneRecord("select * FROM web_domain WHERE domain_id = ".$app->functions->intval(@$this->dataRecord["parent_domain_id"]));
-
- // remove the parent domain part of the domain name before we show it in the text field.
- $this->dataRecord["domain"] = str_replace('.'.$parent_domain["domain"], '', $this->dataRecord["domain"]);
- }
- $app->tpl->setVar("domain", $this->dataRecord["domain"]);
-
- if($_SESSION["s"]["user"]["typ"] == 'admin') {
- // Directive Snippets
- $proxy_directive_snippets = $app->db->queryAllRecords("SELECT * FROM directive_snippets WHERE type = 'proxy' AND active = 'y'");
- $proxy_directive_snippets_txt = '';
- if(is_array($proxy_directive_snippets) && !empty($proxy_directive_snippets)){
- foreach($proxy_directive_snippets as $proxy_directive_snippet){
- $proxy_directive_snippets_txt .= '<a href="javascript:void(0);" class="addPlaceholderContent">['.$proxy_directive_snippet['name'].']<pre class="addPlaceholderContent" style="display:none;">'.$proxy_directive_snippet['snippet'].'</pre></a> ';
- }
- }
- if($proxy_directive_snippets_txt == '') $proxy_directive_snippets_txt = '------';
- $app->tpl->setVar("proxy_directive_snippets_txt", $proxy_directive_snippets_txt);
- }
-
- parent::onShowEnd();
-
- }
-
- function onSubmit() {
- global $app, $conf;
-
- // Get the record of the parent domain
- $parent_domain = $app->db->queryOneRecord("SELECT * FROM web_domain WHERE domain_id = ".$app->functions->intval(@$this->dataRecord["parent_domain_id"]) . " AND ".$app->tform->getAuthSQL('r'));
- if(!$parent_domain || $parent_domain['domain_id'] != @$this->dataRecord['parent_domain_id']) $app->tform->errorMessage .= $app->tform->lng("no_domain_perm");
- /* check if the domain module is used - and check if the selected domain can be used! */
- $app->uses('ini_parser,getconf');
- $settings = $app->getconf->get_global_config('domains');
- if ($settings['use_domain_module'] == 'y') {
- // get the record of the domain module domain
- $domain = $app->tools_sites->checkDomainModuleDomain($this->dataRecord['sel_domain']);
- if(!$domain) {
- $app->tform->errorMessage .= $app->tform->lng("domain_error_empty")."<br />";
- } else {
- $this->dataRecord['domain'] = $this->dataRecord['domain'] . '.' . $domain;
- }
- } else {
- $this->dataRecord["domain"] = $this->dataRecord["domain"].'.'.$parent_domain["domain"];
- }
-
- // nginx: if redirect type is proxy and redirect path is no URL, display error
- if($this->dataRecord["redirect_type"] == 'proxy' && substr($this->dataRecord['redirect_path'], 0, 1) == '/'){
- $app->tform->errorMessage .= $app->tform->lng("error_proxy_requires_url")."<br />";
- }
-
- // Set a few fixed values
- $this->dataRecord["type"] = 'subdomain';
- $this->dataRecord["server_id"] = $parent_domain["server_id"];
-
- $this->parent_domain_record = $parent_domain;
-
- //* make sure that the domain is lowercase
- if(isset($this->dataRecord["domain"])) $this->dataRecord["domain"] = strtolower($this->dataRecord["domain"]);
-
- parent::onSubmit();
- }
-
- function onAfterInsert() {
- global $app, $conf;
-
- $app->db->query('UPDATE web_domain SET sys_groupid = '.$app->functions->intval($this->parent_domain_record['sys_groupid']).' WHERE domain_id = '.$this->id);
-
- }
-
- function onAfterUpdate() {
- global $app, $conf;
-
- //* Check if parent domain has been changed
- if($this->dataRecord['parent_domain_id'] != $this->oldDataRecord['parent_domain_id']) {
-
- //* Update the domain owner
- $app->db->query('UPDATE web_domain SET sys_groupid = '.$app->functions->intval($this->parent_domain_record['sys_groupid']).' WHERE domain_id = '.$this->id);
-
- //* Update the old website, so that the vhost alias gets removed
- //* We force the update by inserting a transaction record without changes manually.
- $old_website = $app->db->queryOneRecord('SELECT * FROM web_domain WHERE domain_id = '.$app->functions->intval($this->oldDataRecord['domain_id']));
- $app->db->datalogSave('web_domain', 'UPDATE', 'domain_id', $app->functions->intval($this->oldDataRecord['parent_domain_id']), $old_website, $old_website, true);
- }
-
- }
-
-}
-
-$page = new page_action;
-$page->onLoad();
+/* this file is no longer used. */
+die();
?>
diff --git a/interface/web/sites/web_subdomain_list.php b/interface/web/sites/web_subdomain_list.php
index 716511e..d9a4228 100644
--- a/interface/web/sites/web_subdomain_list.php
+++ b/interface/web/sites/web_subdomain_list.php
@@ -1,55 +1,6 @@
<?php
-/*
-Copyright (c) 2007, Till Brehm, projektfarm Gmbh
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
- * Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
- * Neither the name of ISPConfig nor the names of its contributors
- may be used to endorse or promote products derived from this software without
- specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
-INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
-EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-require_once '../../lib/config.inc.php';
-require_once '../../lib/app.inc.php';
-
-/******************************************
-* Begin Form configuration
-******************************************/
-
-$list_def_file = "list/web_subdomain.list.php";
-
-/******************************************
-* End Form configuration
-******************************************/
-
-//* Check permissions for module
-$app->auth->check_module_permissions('sites');
-
-$app->uses('listform_actions');
-
-// Limit the results to alias domains
-$app->listform_actions->SQLExtWhere = "web_domain.type = 'subdomain'";
-$app->listform_actions->SQLOrderBy = 'ORDER BY web_domain.domain';
-$app->listform_actions->onLoad();
-
+/* this file is no longer used. */
+die();
?>
--
Gitblit v1.9.1