From 559b657f9fc6a5374de9b7b1caf20abd4e308d76 Mon Sep 17 00:00:00 2001 From: Marius Cramer <m.cramer@pixcept.de> Date: Mon, 13 Oct 2014 06:38:11 -0400 Subject: [PATCH] Merge branch 'master' into 'master' --- interface/web/admin/lib/lang/fr_system_config.lng | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/interface/web/admin/lib/lang/fr_system_config.lng b/interface/web/admin/lib/lang/fr_system_config.lng index 9abcd05..778068d 100644 --- a/interface/web/admin/lib/lang/fr_system_config.lng +++ b/interface/web/admin/lib/lang/fr_system_config.lng @@ -39,8 +39,10 @@ $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'; -- Gitblit v1.9.1