Skip to content

Commit 5334f6a

Browse files
author
Till Brehm
committed
Merge branch 'patch-show-alias-sub-domains' into 'stable-3.1'
Show alias sub domains See merge request ispconfig/ispconfig3!1072
2 parents be8697b + e186515 commit 5334f6a

27 files changed

+39
-1
lines changed

interface/web/sites/lib/lang/ar_web_vhost_domain.lng

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -181,6 +181,7 @@ $wb["backup_format_tar_7z_lzma_txt"] = 'tar + 7z (LZMA)';
181181
$wb["backup_format_tar_7z_lzma2_txt"] = 'tar + 7z (LZMA2)';
182182
$wb["backup_format_tar_7z_ppmd_txt"] = 'tar + 7z (PPMd)';
183183
$wb["backup_format_tar_7z_bzip2_txt"] = 'tar + 7z (BZip2)';
184+
$wb['dependent_domains_txt'] = 'Dependent sub- / aliasdomains';
184185
$wb['error_ipv4_change_forbidden'] = 'The IP cannot be changed. Please contact your administrator if you want to change the IPv4 address.';
185186
$wb['error_ipv6_change_forbidden'] = 'The IP cannot be changed. Please contact your administrator if you want to change the IPv6 address.';
186187
$wb['error_domain_change_forbidden'] = 'The domain name cannot be changed. Please contact your administrator if you want to change the domain name.';

interface/web/sites/lib/lang/bg_web_vhost_domain.lng

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -181,6 +181,7 @@ $wb["backup_format_tar_7z_lzma_txt"] = 'tar + 7z (LZMA)';
181181
$wb["backup_format_tar_7z_lzma2_txt"] = 'tar + 7z (LZMA2)';
182182
$wb["backup_format_tar_7z_ppmd_txt"] = 'tar + 7z (PPMd)';
183183
$wb["backup_format_tar_7z_bzip2_txt"] = 'tar + 7z (BZip2)';
184+
$wb['dependent_domains_txt'] = 'Dependent sub- / aliasdomains';
184185
$wb['error_ipv4_change_forbidden'] = 'The IP cannot be changed. Please contact your administrator if you want to change the IPv4 address.';
185186
$wb['error_ipv6_change_forbidden'] = 'The IP cannot be changed. Please contact your administrator if you want to change the IPv6 address.';
186187
$wb['error_domain_change_forbidden'] = 'The domain name cannot be changed. Please contact your administrator if you want to change the domain name.';

interface/web/sites/lib/lang/br_web_vhost_domain.lng

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -186,6 +186,7 @@ $wb["backup_format_tar_7z_lzma_txt"] = 'tar + 7z (LZMA)';
186186
$wb["backup_format_tar_7z_lzma2_txt"] = 'tar + 7z (LZMA2)';
187187
$wb["backup_format_tar_7z_ppmd_txt"] = 'tar + 7z (PPMd)';
188188
$wb["backup_format_tar_7z_bzip2_txt"] = 'tar + 7z (BZip2)';
189+
$wb['dependent_domains_txt'] = 'Dependent sub- / aliasdomains';
189190
$wb['error_ipv4_change_forbidden'] = 'The IP cannot be changed. Please contact your administrator if you want to change the IPv4 address.';
190191
$wb['error_ipv6_change_forbidden'] = 'The IP cannot be changed. Please contact your administrator if you want to change the IPv6 address.';
191192
$wb['error_domain_change_forbidden'] = 'The domain name cannot be changed. Please contact your administrator if you want to change the domain name.';

interface/web/sites/lib/lang/ca_web_vhost_domain.lng

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -181,6 +181,7 @@ $wb["backup_format_tar_7z_lzma_txt"] = 'tar + 7z (LZMA)';
181181
$wb["backup_format_tar_7z_lzma2_txt"] = 'tar + 7z (LZMA2)';
182182
$wb["backup_format_tar_7z_ppmd_txt"] = 'tar + 7z (PPMd)';
183183
$wb["backup_format_tar_7z_bzip2_txt"] = 'tar + 7z (BZip2)';
184+
$wb['dependent_domains_txt'] = 'Dependent sub- / aliasdomains';
184185
$wb['error_ipv4_change_forbidden'] = 'The IP cannot be changed. Please contact your administrator if you want to change the IPv4 address.';
185186
$wb['error_ipv6_change_forbidden'] = 'The IP cannot be changed. Please contact your administrator if you want to change the IPv6 address.';
186187
$wb['error_domain_change_forbidden'] = 'The domain name cannot be changed. Please contact your administrator if you want to change the domain name.';

interface/web/sites/lib/lang/cz_web_vhost_domain.lng

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -181,6 +181,7 @@ $wb["backup_format_tar_7z_lzma_txt"] = 'tar + 7z (LZMA)';
181181
$wb["backup_format_tar_7z_lzma2_txt"] = 'tar + 7z (LZMA2)';
182182
$wb["backup_format_tar_7z_ppmd_txt"] = 'tar + 7z (PPMd)';
183183
$wb["backup_format_tar_7z_bzip2_txt"] = 'tar + 7z (BZip2)';
184+
$wb['dependent_domains_txt'] = 'Dependent sub- / aliasdomains';
184185
$wb['error_ipv4_change_forbidden'] = 'The IP cannot be changed. Please contact your administrator if you want to change the IPv4 address.';
185186
$wb['error_ipv6_change_forbidden'] = 'The IP cannot be changed. Please contact your administrator if you want to change the IPv6 address.';
186187
$wb['error_domain_change_forbidden'] = 'The domain name cannot be changed. Please contact your administrator if you want to change the domain name.';

interface/web/sites/lib/lang/de_web_vhost_domain.lng

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -181,6 +181,7 @@ $wb["backup_format_tar_7z_lzma_txt"] = 'tar + 7z (LZMA)';
181181
$wb["backup_format_tar_7z_lzma2_txt"] = 'tar + 7z (LZMA2)';
182182
$wb["backup_format_tar_7z_ppmd_txt"] = 'tar + 7z (PPMd)';
183183
$wb["backup_format_tar_7z_bzip2_txt"] = 'tar + 7z (BZip2)';
184+
$wb['dependent_domains_txt'] = 'Dependent sub- / aliasdomains';
184185
$wb['error_ipv4_change_forbidden'] = 'The IP cannot be changed. Please contact your administrator if you want to change the IPv4 address.';
185186
$wb['error_ipv6_change_forbidden'] = 'The IP cannot be changed. Please contact your administrator if you want to change the IPv6 address.';
186187
$wb['error_domain_change_forbidden'] = 'The domain name cannot be changed. Please contact your administrator if you want to change the domain name.';

interface/web/sites/lib/lang/dk_web_vhost_domain.lng

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -181,6 +181,7 @@ $wb["backup_format_tar_7z_lzma_txt"] = 'tar + 7z (LZMA)';
181181
$wb["backup_format_tar_7z_lzma2_txt"] = 'tar + 7z (LZMA2)';
182182
$wb["backup_format_tar_7z_ppmd_txt"] = 'tar + 7z (PPMd)';
183183
$wb["backup_format_tar_7z_bzip2_txt"] = 'tar + 7z (BZip2)';
184+
$wb['dependent_domains_txt'] = 'Dependent sub- / aliasdomains';
184185
$wb['error_ipv4_change_forbidden'] = 'The IP cannot be changed. Please contact your administrator if you want to change the IPv4 address.';
185186
$wb['error_ipv6_change_forbidden'] = 'The IP cannot be changed. Please contact your administrator if you want to change the IPv6 address.';
186187
$wb['error_domain_change_forbidden'] = 'The domain name cannot be changed. Please contact your administrator if you want to change the domain name.';

interface/web/sites/lib/lang/el_web_vhost_domain.lng

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -181,6 +181,7 @@ $wb["backup_format_tar_7z_lzma_txt"] = 'tar + 7z (LZMA)';
181181
$wb["backup_format_tar_7z_lzma2_txt"] = 'tar + 7z (LZMA2)';
182182
$wb["backup_format_tar_7z_ppmd_txt"] = 'tar + 7z (PPMd)';
183183
$wb["backup_format_tar_7z_bzip2_txt"] = 'tar + 7z (BZip2)';
184+
$wb['dependent_domains_txt'] = 'Dependent sub- / aliasdomains';
184185
$wb['error_ipv4_change_forbidden'] = 'The IP cannot be changed. Please contact your administrator if you want to change the IPv4 address.';
185186
$wb['error_ipv6_change_forbidden'] = 'The IP cannot be changed. Please contact your administrator if you want to change the IPv6 address.';
186187
$wb['error_domain_change_forbidden'] = 'The domain name cannot be changed. Please contact your administrator if you want to change the domain name.';

interface/web/sites/lib/lang/en_web_vhost_domain.lng

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,7 @@ $wb['https_port_error_regex'] = 'HTTPS Port invalid.';
158158
$wb['enable_pagespeed_txt'] = 'Enable PageSpeed';
159159
$wb['log_retention_txt'] = 'Logfiles retention time';
160160
$wb['log_retention_error_regex'] = 'Retention time in days (allowed values: min. 0 - max. 9999)';
161+
$wb['dependent_domains_txt'] = 'Dependent sub- / aliasdomains';
161162
$wb['limit_web_quota_not_0_txt'] = 'Harddisk Quota cannot be set to 0.';
162163
$wb['proxy_protocol_txt'] = 'Enable PROXY Protocol';
163164
$wb["backup_format_web_txt"] = 'Backup format for web files';

interface/web/sites/lib/lang/es_web_vhost_domain.lng

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -181,6 +181,7 @@ $wb["backup_format_tar_7z_lzma_txt"] = 'tar + 7z (LZMA)';
181181
$wb["backup_format_tar_7z_lzma2_txt"] = 'tar + 7z (LZMA2)';
182182
$wb["backup_format_tar_7z_ppmd_txt"] = 'tar + 7z (PPMd)';
183183
$wb["backup_format_tar_7z_bzip2_txt"] = 'tar + 7z (BZip2)';
184+
$wb['dependent_domains_txt'] = 'Dependent sub- / aliasdomains';
184185
$wb['error_ipv4_change_forbidden'] = 'The IP cannot be changed. Please contact your administrator if you want to change the IPv4 address.';
185186
$wb['error_ipv6_change_forbidden'] = 'The IP cannot be changed. Please contact your administrator if you want to change the IPv6 address.';
186187
$wb['error_domain_change_forbidden'] = 'The domain name cannot be changed. Please contact your administrator if you want to change the domain name.';

0 commit comments

Comments
 (0)