From 387d3929686b944ff77adaa64fecb02e2aa26796 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Thu, 05 Jan 2012 11:38:15 -0500
Subject: [PATCH] Added redirect option R=301,L for subdomain, aliasdomain and website on apache servers.

---
 interface/web/admin/lib/lang/en_server_config.lng |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/interface/web/admin/lib/lang/en_server_config.lng b/interface/web/admin/lib/lang/en_server_config.lng
index ec91e01..b128c67 100644
--- a/interface/web/admin/lib/lang/en_server_config.lng
+++ b/interface/web/admin/lib/lang/en_server_config.lng
@@ -144,10 +144,14 @@
 $wb["php_fpm_socket_dir_txt"] = 'PHP-FPM socket directory';
 $wb["php_fpm_socket_dir_error_empty"] = 'PHP-FPM socket directory is empty.';
 $wb["try_rescue_txt"] = 'Enable service monitoring and restart on failure';
-$wb["do_not_try_rescue_apache_txt"] = 'Disable apache monitoring';
+$wb["do_not_try_rescue_httpd_txt"] = 'Disable HTTPD monitoring';
 $wb["do_not_try_rescue_mysql_txt"] = 'Disable MySQL monitoring';
 $wb["do_not_try_rescue_mail_txt"] = 'Disable Email monitoring';
-$wb["rescue_description_txt"] = '<b>Information:</b> If you want to shut down mysql you have to select the "Disable MySQL monitor" checkbox and then wait 2-3 minutes.<br>if you do not wait 2-3 minutes, rescue will try to restart mysql!';
+$wb["rescue_description_txt"] = '<b>Information:</b> If you want to shut down mysql you have to select the "Disable MySQL monitor" checkbox and then wait 2-3 minutes.<br>If you do not wait 2-3 minutes, rescue will try to restart mysql!';
 $wb["enable_sni_txt"] = 'Enable SNI';
+$wb["set_folder_permissions_on_update_txt"] = 'Set folder permissions on update';
+$wb["add_web_users_to_sshusers_group_txt"] = 'Add web users to -sshusers- group';
+$wb["connect_userid_to_webid_txt"] = 'Connect Linux userid to webid';
+$wb["connect_userid_to_webid_start_txt"] = 'Start ID for userid/webid connect';
 
 ?>
\ No newline at end of file

--
Gitblit v1.9.1