From dedf5feaa2cf3072e90ac2bf2ef3885facd2e1a6 Mon Sep 17 00:00:00 2001 From: Florian Schaal <florian@schaal-24.de> Date: Sun, 20 Dec 2015 04:39:34 -0500 Subject: [PATCH] Merge branch 'master' of http://git.ispconfig.org/ispconfig/ispconfig3 --- interface/web/admin/lib/lang/it_system_config.lng | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/interface/web/admin/lib/lang/it_system_config.lng b/interface/web/admin/lib/lang/it_system_config.lng index 12e1130..172568d 100644 --- a/interface/web/admin/lib/lang/it_system_config.lng +++ b/interface/web/admin/lib/lang/it_system_config.lng @@ -39,13 +39,16 @@ $wb['tab_change_discard_txt'] = 'Discard changes on tab change'; $wb['tab_change_warning_txt'] = 'Tab change warning'; $wb['tab_change_warning_note_txt'] = 'Show a warning on tab change in edit forms if any data has been altered by the user.'; -$wb['vhost_subdomains_txt'] = 'Create Subdomains as web site'; +$wb['vhost_subdomains_txt'] = 'Create subdomains as web site'; $wb['vhost_subdomains_note_txt'] = 'You cannot disable this as long as vhost subdomains exist in the system!'; +$wb['vhost_aliasdomains_txt'] = 'Create aliasdomains as web site'; +$wb['vhost_aliasdomains_note_txt'] = 'You cannot disable this as long as vhost aliasdomains exist in the system!'; $wb['phpmyadmin_url_error_regex'] = 'Invalid phpmyadmin URL'; $wb['use_combobox_txt'] = 'Use jQuery UI Combobox'; $wb['use_loadindicator_txt'] = 'Use Load Indicator'; $wb['f5_to_reload_js_txt'] = 'If you change this, you might have to press F5 to make the browser reload JavaScript libraries or empty your browser cache.'; $wb['client_username_web_check_disabled_txt'] = 'Disable client username check for the word \'web\'.'; +$wb['backups_include_into_web_quota_txt'] = 'Include backup files into web quota.'; $wb['mailbox_show_autoresponder_tab_txt'] = 'Show autoresponder tab in mail account details'; $wb['mailbox_show_mail_filter_tab_txt'] = 'Show mail filter tab in mail account details'; $wb['mailbox_show_custom_rules_tab_txt'] = 'Show custom mailfilter tab in mail account details'; @@ -68,4 +71,9 @@ $wb['No'] = 'No'; $wb['min_password_length_txt'] = 'Minimum password length'; $wb['min_password_strength_txt'] = 'Minimum password strength'; +$wb["company_name_txt"] = "Company Name for the page title"; +$wb["reseller_can_use_options_txt"] = "Reseller can use the option-tab for websites"; +$wb["custom_login_text_txt"] = "Custom Text on Login-Page"; +$wb["custom_login_link_txt"] = "Custom Link on Login-Page"; +$wb["login_link_error_regex"] = "Invalid Link for Custom Login"; ?> -- Gitblit v1.9.1