diff options
| author | alex <alex@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2007-08-25 05:31:56 +0000 |
|---|---|---|
| committer | alex <alex@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2007-08-25 05:31:56 +0000 |
| commit | 788f7d989d2f4bf772e8e5d259755cd4e9972e37 (patch) | |
| tree | 762f89b5c172bc5bc32440aae96b8fa0768efcbe | |
| parent | 0cb6656a50b2e99f7f3fb63345e0c707f5427f6e (diff) | |
- minor grammar fixes (Alexei)
[svn merge -r4664:4667 svn://svn.zabbix.com/branches/1.4]
git-svn-id: svn://svn.zabbix.com/trunk@4669 97f52cf1-0a1b-0410-bd0e-c28be96e8082
| -rw-r--r-- | ChangeLog | 1 | ||||
| -rw-r--r-- | create/data/data.sql | 6 | ||||
| -rw-r--r-- | frontends/php/include/locales/en_gb.inc.php | 6 |
3 files changed, 7 insertions, 6 deletions
@@ -13,6 +13,7 @@ Changes for 1.5: Changes for 1.4.3: + - minor grammar fixes (Alexei) - fixed compilation of ZABBIX agent under Mac OS/X (Alexei) - fixed memory leak when processing non-existant trapper item (Alexei) - fixed unefficient SQL in browsing of events (Alexei) diff --git a/create/data/data.sql b/create/data/data.sql index 1420e79b..7aa0bf18 100644 --- a/create/data/data.sql +++ b/create/data/data.sql @@ -297,7 +297,7 @@ INSERT INTO `hosts_groups` VALUES (12,10024,1); -- -insert into help_items values (3,'icmpping','Checks if server accessible by ICMP ping 0 - ICMP ping fails 1 - ICMP ping successful One of zabbix_server processes performs ICMP pings once per PingerFrequency seconds.'); +insert into help_items values (3,'icmpping','Checks if server is accessible by ICMP ping 0 - ICMP ping fails 1 - ICMP ping successful One of zabbix_server processes performs ICMP pings once per PingerFrequency seconds.'); insert into help_items values (3,'icmppingsec','Return ICMP ping response time Number of seconds Example: 0.02'); insert into help_items values (3,'ftp<,port>','Checks if FTP server is running and accepting connections 0 - FTP server is down 1 - FTP server is running'); insert into help_items values (3,'http<,port>','Checks if HTTP (WEB) server is running and accepting connections 0 - HTTP server is down 1 - HTTP server is running'); @@ -324,11 +324,11 @@ insert into help_items values (5,'zabbix[queue]','Number of items in the queue') insert into help_items values (5,'zabbix[trends]','Number of values stored in table TRENDS'); insert into help_items values (5,'zabbix[triggers]','Number of triggers in ZABBIX database'); -insert into help_items values (8,'grpfunc(<Group>,<Key>,<func>,<param>)','Aggregate checks does not require any agent running on a host being monitored. ZABBIX server collects aggregate information by doing direct database queries. See ZABBIX Manual.'); +insert into help_items values (8,'grpfunc(<Group>,<Key>,<func>,<param>)','Aggregate checks do not require any agent running on a host being monitored. ZABBIX server collects aggregate information by doing direct database queries. See ZABBIX Manual.'); insert into help_items values(0,'agent.ping','Check the agent usability. Always return 1. Can be used as a TCP ping.'); insert into help_items values(0,'agent.version','Version of zabbix_agent(d) running on monitored host. String value. Example of returned value: 1.1'); -insert into help_items values(0,'kernel.maxfiles','Maximum number of opened file supported by OS.'); +insert into help_items values(0,'kernel.maxfiles','Maximum number of opened files supported by OS.'); insert into help_items values(0,'kernel.maxproc','Maximum number of processes supported by OS.'); insert into help_items values(0,'net.if.collisions[if]','Out-of-window collision. Collisions count.'); insert into help_items values(0,'net.if.in[if <,mode>]','Network interfice input statistic. Integer value. If mode is missing bytes is used.'); diff --git a/frontends/php/include/locales/en_gb.inc.php b/frontends/php/include/locales/en_gb.inc.php index 17b5ed13..6f2deca4 100644 --- a/frontends/php/include/locales/en_gb.inc.php +++ b/frontends/php/include/locales/en_gb.inc.php @@ -474,7 +474,7 @@ 'S_COMPARE'=> 'Compare', // Footer - 'S_ZABBIX_VER'=> 'ZABBIX 1.4', + 'S_ZABBIX_VER'=> 'ZABBIX 1.5', 'S_COPYRIGHT_BY'=> 'Copyright 2001-2007 by ', 'S_CONNECTED_AS'=> 'Connected as', 'S_SIA_ZABBIX'=> 'SIA Zabbix', @@ -1034,9 +1034,9 @@ 'S_STYLE'=> 'Style', 'S_VERTICAL'=> 'Vertical', - 'S_HORISONTAL'=> 'Horisontal', + 'S_HORISONTAL'=> 'Horizontal', - 'S_HORISONTAL_ALIGN'=> 'Horisontal align', + 'S_HORISONTAL_ALIGN'=> 'Horizontal align', 'S_LEFT'=> 'Left', 'S_CENTER'=> 'Center', 'S_RIGHT'=> 'Right', |