Zabbix English locale changed for branches/1.8

[ric...@nakts.net]

Zabbix English locale changed between revision 27083 and 27086

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

------------------------------------------------------------------------
r27086 | pavels | 2012-04-25 10:14:33 +0300 (Wed, 25 Apr 2012) | 1 line

..F....... [ZBX-4849] implemented a check that a trigger expression doesn't use items from both hosts and templates at the same time
------------------------------------------------------------------------

****************** 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 27083)
+++ branches/1.8/frontends/php/include/locales/en_gb.inc.php (revision 27086)
@@ -2220,6 +2220,8 @@
'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_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',
'S_TO_HOST_SMALL'=> 'to host',