Zabbix English locale changed for branches/1.8

[ric...@nakts.net]

Zabbix English locale changed between revision 31951 and 31957

****************** svn log for these revisions (locale file only)

------------------------------------------------------------------------
r31955 | sasha | 2012-12-07 11:57:46 +0200 (Fri, 07 Dec 2012) | 11 lines

A.F....... [DEV-522] new trigger expression parser
..F....... [ZBX-3754] fixed "Undefined variable" in the trigger expression constructor
..F....... [ZBX-3038] fixed the trigger expression constructor to parse expressions created in log wizard
..F....... [ZBX-2793] added possibility to add macros without an item in the trigger expression
..F....... [ZBX-5896] fixed inserting OR condition the trigger expression constructor
A.F....... [ZBX-5833] fixed inserting a macro in the trigger expression constructor
..F....... [ZBX-4695] added support of simple check keys with user macros in the trigger expression
..F....... [ZBX-5884] improved the trigger expression constructor to work with parentheses
A.F....... [ZBX-5814] fixed an incorrect error message when saving an illegal trigger expression
A.F....... [ZBX-4247] fixed processing of trigger expression if item key contains another trigger expression string
..F....... [ZBX-2640] fixed some issues when creating and editing log triggers
------------------------------------------------------------------------

****************** 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 31951)
+++ branches/1.8/frontends/php/include/locales/en_gb.inc.php (revision 31957)
@@ -2220,7 +2220,7 @@
'S_NOT_FLOAT_OR_MACRO_OR_COUNTER_FOR_FUNCTION_SMALL'=> 'is not a float or counter or macro for function',
'S_ITEM_KEY_MUST_BE_USED_IN_TRIGGER_EXPRESSION'=> 'An item key must be used in trigger expression',
'S_INCORRECT_TRIGGER_EXPRESSION'=> 'Incorrect trigger expression',
- 'S_TRIGGER_EXPRESSION_CANT_MIX_TEMPLATES_HOSTS' => 'Incorrect trigger expression. Trigger expression elements cannot not belong to a template and a host simultaneously.',
+ 'S_TRIGGER_EXPRESSION_CANT_MIX_TEMPLATES_HOSTS' => 'Incorrect trigger expression. Trigger expression elements cannot belong to a template and a host simultaneously.',
'S_TRIGGER_BELONGS_TO_TEMPLATES_WITH_DIFFERENT_LINKS' => 'Trigger belongs to templates with different linkages.',
'S_YOU_CAN_NOT_USE_TEMPLATE_HOSTS_MIXED_EXPR'=> 'You can not use template hosts in mixed expressions.',
'S_ADDED_TRIGGER'=> 'Added new trigger',