****************** svn log for these revisions (locale file only)
------------------------------------------------------------------------
r24351 | slava | 2011-12-28 14:35:00 +0200 (Wed, 28 Dec 2011) | 1 line
..F....... [ZBX-3219] Translating script error to human language
------------------------------------------------------------------------
****************** svn diff for these revisions (locale file only)
Index: branches/1.8/frontends/php/include/locales/en_gb.inc.php
===================================================================
--- branches/1.8/frontends/php/include/locales/en_gb.inc.php (revision 24349)
+++ branches/1.8/frontends/php/include/locales/en_gb.inc.php (revision 24355)
@@ -1910,9 +1910,13 @@
'S_TOOLS'=> 'Tools',
'S_RESULT'=> 'Result',
'S_CLOSE'=> 'Close',
+ 'S_SCRIPT_ERROR_BIG'=> 'Possible reasons: 1. incorrect server IP/DNS in the "zabbix.conf.php"; 2. security environment like SELinux is blocking connection; 3. Zabbix server daemon not running.',
'S_DELETE_SELECTED_SCRIPTS_Q'=> 'Delete selected scripts?',
-
- 'S_SCRIPT_ERROR'=> 'SCRIPT ERROR',
+ 'S_NOT_RUN' => 'Connection to Zabbix server "%s" refused. Possible reasons: 1. Incorrect server IP/DNS in the "zabbix.conf.php"; 2. Security environment (for example, SELinux) is blocking the connection; 3. Zabbix server daemon not running; 4. Firewall is blocking TCP connection.',
+ 'S_IP_NOT_AVAILABLE' => 'Zabbix server "%s" can not be reached. Possible reasons: 1. Incorrect server IP/DNS in the "zabbix.conf.php"; 2. Incorrect network configuration.',
+ 'S_TIME_OUT' => 'Connection to Zabbix server "%s" timed out. Possible reasons: 1. Incorrect server IP/DNS in the "zabbix.conf.php"; 2. Firewall is blocking TCP connection.',
+ 'S_WRONG_DNS' => 'Connection to Zabbix server "%s" faileds. Possible reasons: 1. Incorrect server IP/DNS in the "zabbix.conf.php"; 2. Incorrect DNS server configuration.',
+ 'S_SCRIPT_ERROR'=> 'Cannot connect to the trapper port of zabbix server daemon, but it should be available to run the script.',
'S_SCRIPT_ERROR_DESCRIPTION'=> 'Error Description',
'S_SCRIPT_SEND_ERROR'=> 'Can\'t send command, check connection',
'S_SCRIPT_READ_ERROR'=> 'Can\'t read script response, check connection',
@@ -2477,7 +2481,7 @@
// class.cbuttonqmessage.php
'S_ARE_YOU_SURE_YOU_WANT_TO_PERFORM_THIS_ACTION' => 'Are you sure you want perform this action?',
- 'S_INCORRECT_VALUE_FOR_SETMESSAGE' => 'Incorrect value for setMessage(): "%s".',
+ 'S_INCORRECT_VALUE_FOR_SETMESSAGE' => 'Incorrect value for setMessage(): "%s%s".',
// class.citemkey.php
'S_KEY_CANNOT_BE_EMPTY' => 'Key cannot be empty.',