From 39fab06dfae1e0218a1bb3aa48a381586dfaea6d Mon Sep 17 00:00:00 2001 From: Falko Timme <ft@falkotimme.com> Date: Sat, 13 Dec 2014 16:18:41 -0500 Subject: [PATCH] Merge branch 'develop' into 'master' --- interface/web/admin/lib/lang/se_system_config.lng | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/interface/web/admin/lib/lang/se_system_config.lng b/interface/web/admin/lib/lang/se_system_config.lng index 7e96181..97850cd 100644 --- a/interface/web/admin/lib/lang/se_system_config.lng +++ b/interface/web/admin/lib/lang/se_system_config.lng @@ -39,6 +39,8 @@ $wb['tab_change_discard_txt'] = 'Kasta ändringar vid byte av flik'; $wb['tab_change_warning_txt'] = 'Varning vid byte av flik'; $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_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['vhost_subdomains_txt'] = 'Skapa underdomäner som en egen sajt'; $wb['vhost_subdomains_note_txt'] = 'You cannot disable this as long as vhost subdomains exist in the system!'; $wb['phpmyadmin_url_error_regex'] = 'Ogiltig adress till PHPMyAdmin'; @@ -64,7 +66,7 @@ $wb['customer_no_start_txt'] = 'Kundnummer startvärde'; $wb['customer_no_counter_txt'] = 'Kundnummer räknare'; $wb['session_timeout_txt'] = 'Session timeout (minuter)'; -$wb['session_allow_endless_txt'] = 'Aktivera \"håll mig inloggad\"'; +$wb['session_allow_endless_txt'] = 'Aktivera \\"håll mig inloggad\\"'; $wb['No'] = 'Nej'; $wb['min_password_length_txt'] = 'Minsta lösenordslängd'; $wb['min_password_strength_txt'] = 'Minsta lösenordsstyrka'; -- Gitblit v1.9.1