From 829b76b1e4a511eae1d74e126c0a9e4d457f9f68 Mon Sep 17 00:00:00 2001
From: xaver <xaver@ispconfig3>
Date: Thu, 22 Mar 2012 23:24:01 -0400
Subject: [PATCH] simplepie php 5.4 fix

---
 interface/web/admin/lib/lang/en_server_config.lng |   15 +++++++++++----
 1 files changed, 11 insertions(+), 4 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..4cce275 100644
--- a/interface/web/admin/lib/lang/en_server_config.lng
+++ b/interface/web/admin/lib/lang/en_server_config.lng
@@ -87,7 +87,9 @@
 $wb["CA_path_txt"] = 'CA Path';
 $wb["CA_pass_txt"] = 'CA passphrase';
 $wb["fastcgi_config_syntax_txt"] = 'FastCGI config syntax';
-$wb["backup_dir_ftpread_txt"] = 'Backup dir. readable for website FTP users.';
+$wb["backup_mode_txt"] = 'Backup mode';
+$wb["backup_mode_userzip"] = 'Backup web files owned by web user as zip';
+$wb["backup_mode_rootgz"] = 'Backup all files in web directory as root user';
 $wb["server_type_txt"] = 'Server Type';
 $wb["nginx_vhost_conf_dir_txt"] = 'Nginx Vhost config dir';
 $wb["nginx_vhost_conf_enabled_dir_txt"] = 'Nginx Vhost config enabled dir';
@@ -144,10 +146,15 @@
 $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';
+$wb["realtime_blackhole_list_txt"] = 'Real-time Blackhole List';
+$wb["realtime_blackhole_list_note_txt"] = '(Separate RBL\'s with commas)';
 ?>
\ No newline at end of file

--
Gitblit v1.9.1