- [DEV-171] added support of notification escalations on frontend side (Artem)

git-svn-id: svn://svn.zabbix.com/trunk@5740 97f52cf1-0a1b-0410-bd0e-c28be96e8082

1 files changed, 96 insertions, 82 deletions

diff --git a/frontends/php/include/locales/en_gb.inc.php b/frontends/php/include/locales/en_gb.inc.php
index 2e41c62e..48434392 100644
--- a/frontends/php/include/locales/en_gb.inc.php
+++ b/frontends/php/include/locales/en_gb.inc.php
@@ -214,30 +214,36 @@
 	'S_BULK_ACKNOWLEDGE'=>			'Bulk acknowledge',
 
 //	actionconf.php
+	'S_AT_MOMENT'=>						'At moment',
+	'S_INFINITY'=>						'Infinity',
+	'S_RECOVERY_MESSAGE'=>				'Recovery message',
 	'S_CONFIGURATION_OF_ACTIONS'=>		'Configuration of actions',
 	'S_CONFIGURATION_OF_ACTIONS_BIG'=>	'CONFIGURATION OF ACTIONS',
-	'S_FILTER_HOST_GROUP'=>			'Filter: Host group',
-	'S_FILTER_HOST'=>			'Filter: Host',
-	'S_FILTER_TRIGGER'=>			'Filter: Trigger',
-	'S_FILTER_TRIGGER_NAME'=>		'Filter: Trigger name',
+	'S_FILTER_HOST_GROUP'=>				'Filter: Host group',
+	'S_FILTER_HOST'=>					'Filter: Host',
+	'S_FILTER_TRIGGER'=>				'Filter: Trigger',
+	'S_FILTER_TRIGGER_NAME'=>			'Filter: Trigger name',
 	'S_FILTER_TRIGGER_SEVERITY'=>		'Filter: Trigger severity',
 	'S_FILTER_WHEN_TRIGGER_BECOMES'=>	'Filter: When trigger becomes',
-	'S_OPERATION_TYPE'=>			'Operation type',
-	'S_SEND_MESSAGE'=>			'Send message',
-	'S_REMOTE_COMMAND'=>			'Remote command',
-	'S_REMOTE_COMMANDS'=>			'Remote commands',
-	'S_FILTER'=>				'Filter',
-	'S_FILTER_TYPE'=>			'Filter type',
-	'S_TRIGGER_NAME'=>			'Trigger name',
+	'S_OPERATION_TYPE'=>				'Operation type',
+	'S_SEND_MESSAGE'=>					'Send message',
+	'S_REMOTE_COMMAND'=>				'Remote command',
+	'S_REMOTE_COMMANDS'=>				'Remote commands',
+	'S_FILTER'=>					'Filter',
+	'S_FILTER_TYPE'=>				'Filter type',
+	'S_TRIGGER_NAME'=>				'Trigger name',
 	'S_TRIGGER_SEVERITY'=>			'Trigger severity',
-	'S_TRIGGER_VALUE'=>			'Trigger value',
-	'S_TIME_PERIOD'=>			'Time period',
+	'S_TRIGGER_VALUE'=>				'Trigger value',
+	'S_TIME_PERIOD'=>				'Time period',
 	'S_MAX_VALUE_SMALL'=>		'max value',
 	'S_MIN_VALUE_SMALL'=>		'min value',
-	'S_TRIGGER_DESCRIPTION'=>		'Trigger description',
+	'S_TRIGGER_DESCRIPTION'=>	'Trigger description',
+	'S_ACTION_CONDITIONS'=>		'Action conditions',
+	'S_OPERATION_CONDITION'=>	'Operation condition',
 	'S_CONDITIONS'=>			'Conditions',
 	'S_CONDITION'=>				'Condition',
 	'S_NEW_CONDITION'=>			'New condition',
+	'S_ACTION_OPERATIONS'=>		'Action operations',
 	'S_OPERATIONS'=>			'Operations',
 	'S_OPERATION'=>				'Operation',
 	'S_NEW_OPERATION'=>			'New operation',
@@ -246,19 +252,20 @@
 	'S_ACTIONS_DELETED'=>			'Actions deleted',
 	'S_CANNOT_DELETE_ACTIONS'=>		'Cannot delete actions',
 	'S_NO_OPERATIONS_DEFINED'=>		'No operations defined',
-	'S_NEW'=>				'New',
-	'S_ADD_HOST'=>				'Add host',
-	'S_REMOVE_HOST'=>			'Remove host',
+	'S_NEW'=>						'New',
+	'S_ADD_HOST'=>					'Add host',
+	'S_REMOVE_HOST'=>				'Remove host',
 	'S_LINK_TO_TEMPLATE'=>				'Link to template',
 	'S_CANNOT_LINK_TO_TEMPLATE'=>		'CAnnot link to template',
 	'S_UNLINK_FROM_TEMPLATE'=>			'Unlink from template',
 	'S_CANNOT_UNLINK_FROM_TEMPLATE'=>	'Cannot unlink from template',
-	'S_HOST_TEMPLATE'=>			'Host template',
+	'S_HOST_TEMPLATE'=>					'Host template',
+	'S_EVENT_ACKNOWLEDGED'=>			'Event acknowledged',
 
 	'S_INCORRECT_TRIGGER'=>			'Incorrect trigger',
 	'S_INCORRECT_HOST'=>			'Incorrect host',
 	'S_INCORRECT_PERIOD'=>			'Incorrect period',
-	'S_INCORRECT_IP'=>			'Incorrect ip',
+	'S_INCORRECT_IP'=>				'Incorrect ip',
 	'S_INCORRECT_DISCOVERY_CHECK'=>		'Incorrect discovery check',
 	'S_INCORRECT_PORT'=>			'Incorrect port',
 	'S_INCORRECT_DISCOVERY_STATUS'=>	'Incorrect discovery status',
@@ -268,69 +275,73 @@
 	'S_INCORRECT_USER'=>			'Incorrect user',
 
 //	actions.php
-	'S_ACTIONS'=>				'Actions',
-	'S_ACTIONS_BIG'=>			'ACTIONS',
-	'S_ACTION_ADDED'=>			'Action added',
+	'S_ACTIONS'=>					'Actions',
+	'S_ACTIONS_BIG'=>				'ACTIONS',
+	'S_ACTION_ADDED'=>				'Action added',
 	'S_CANNOT_ADD_ACTION'=>			'Cannot add action',
 	'S_ACTION_UPDATED'=>			'Action updated',
 	'S_CANNOT_UPDATE_ACTION'=>		'Cannot update action',
 	'S_ACTION_DELETED'=>			'Action deleted',
 	'S_CANNOT_DELETE_ACTION'=>		'Cannot delete action',
-	'S_SCOPE'=>				'Scope',
+	'S_SCOPE'=>						'Scope',
 	'S_SEND_MESSAGE_TO'=>			'Send message to',
 	'S_RUN_REMOTE_COMMANDS'=>		'Run remote commands',
-	'S_WHEN_TRIGGER'=>			'When trigger',
-	'S_DELAY'=>				'Delay',
-	'S_SUBJECT'=>				'Subject',
-	'S_ON'=>				'ON',
-	'S_OFF'=>				'OFF',
+	'S_WHEN_TRIGGER'=>				'When trigger',
+	'S_DELAY'=>						'Delay',
+	'S_SUBJECT'=>					'Subject',
+	'S_RECOVERY_MESSAGE'=>					'Recovery message',
+	'S_RECOVERY_SUBJECT'=>					'Recovery subject',
+	'S_DEFAULT_MESSAGE'=>					'Default message',
+	'S_DEFAULT_SUBJECT'=>					'Default subject',
+	'S_MESSAGE'=>					'Message',	
+	'S_ON'=>						'ON',
+	'S_OFF'=>						'OFF',
 	'S_NO_ACTIONS_DEFINED'=>		'No actions defined',
-	'S_SINGLE_USER'=>			'Single user',
-	'S_USER_GROUP'=>			'User group',
-	'S_GROUP'=>				'Group',
-	'S_USER'=>				'User',
-	'S_ON_OR_OFF'=>				'ON or OFF',
-	'S_DELAY_BETWEEN_MESSAGES_IN_SEC'=>	'Delay between messages (in sec)',
-	'S_DELAY_BETWEEN_EXECUTIONS_IN_SEC'=>			'Delay between executions (in sec)',
-	'S_MESSAGE'=>				'Message',
-	'S_THIS_TRIGGER_ONLY'=>			'This trigger only',
-	'S_ALL_TRIGGERS_OF_THIS_HOST'=>		'All triggers of this host',
-	'S_ALL_TRIGGERS'=>			'All triggers',
-	'S_USE_IF_TRIGGER_SEVERITY'=>		'Use if trigger\'s severity equal or more than',
-	'S_NOT_CLASSIFIED'=>			'Not classified',
-	'S_INFORMATION'=>			'Information',
-	'S_WARNING'=>				'Warning',
-	'S_AVERAGE'=>				'Average',
-	'S_HIGH'=>				'High',
-	'S_DISASTER'=>				'Disaster',
-	'S_AND_OR_BIG'=>			'AND / OR',
-	'S_AND_BIG'=>				'AND',
-	'S_AND'=>				'and',
-	'S_AND_SYMB'=>			'&',
-	'S_OR_BIG'=>				'OR',
-	'S_OR'=>				'or',
-	'S_TYPE_OF_CALCULATION'=>		'Type of calculation',
-	'S_CREATE_ACTION'=>			'Create Action',
+	'S_SINGLE_USER'=>				'Single user',
+	'S_USER_GROUP'=>				'User group',
+	'S_GROUP'=>						'Group',
+	'S_USER'=>						'User',
+	'S_ON_OR_OFF'=>					'ON or OFF',
+	'S_DELAY_BETWEEN_MESSAGES_IN_SEC'=>		'Delay between messages (in sec)',
+	'S_DELAY_BETWEEN_EXECUTIONS_IN_SEC'=>	'Delay between executions (in sec)',
+	'S_THIS_TRIGGER_ONLY'=>					'This trigger only',
+	'S_ALL_TRIGGERS_OF_THIS_HOST'=>			'All triggers of this host',
+	'S_ALL_TRIGGERS'=>						'All triggers',
+	'S_USE_IF_TRIGGER_SEVERITY'=>			'Use if trigger\'s severity equal or more than',
+	'S_NOT_CLASSIFIED'=>					'Not classified',
+	'S_INFORMATION'=>					'Information',
+	'S_WARNING'=>						'Warning',
+	'S_AVERAGE'=>						'Average',
+	'S_HIGH'=>							'High',
+	'S_DISASTER'=>						'Disaster',
+	'S_AND_OR_BIG'=>					'AND / OR',
+	'S_AND_BIG'=>						'AND',
+	'S_AND'=>							'and',
+	'S_AND_SYMB'=>						'&',
+	'S_OR_BIG'=>						'OR',
+	'S_OR'=>							'or',
+	'S_TYPE_OF_CALCULATION'=>			'Type of calculation',
+	'S_CREATE_ACTION'=>					'Create Action',
 	'S_ENABLE_SELECTED_ACTIONS_Q'=>		'Enable selected actions?',
 	'S_DISABLE_SELECTED_ACTIONS_Q'=>	'Disable selected actions?',
 	'S_DELETE_SELECTED_ACTIONS_Q'=>		'Delete selected actions?',
 	'S_DELETE_SELECTED_ACTION_Q'=>		'Delete selected action?',
-	'S_LIKE_SMALL'=>			'like',
+	'S_LIKE_SMALL'=>				'like',
 	'S_NOT_LIKE_SMALL'=>			'not like',
-	'S_IN_SMALL'=>				'in',
-	'S_NOT_IN_SMALL'=>			'not in',
-	'S_RETRIES_LEFT'=>			'Retries left',
+	'S_IN_SMALL'=>					'in',
+	'S_NOT_IN_SMALL'=>				'not in',
+	'S_RETRIES_LEFT'=>				'Retries left',
 
 //	alarms.php
-	'S_ALARMS'=>				'Alarms',
-	'S_ALARMS_SMALL'=>			'Alarms',
-	'S_ALARMS_BIG'=>			'ALARMS',
+	'S_ALARMS'=>					'Alarms',
+	'S_ALARMS_SMALL'=>				'Alarms',
+	'S_ALARMS_BIG'=>				'ALARMS',
 	'S_SHOW_ONLY_LAST_100'=>		'Show only last 100',
 	'S_SHOW_ALL'=>				'Show all',
-	'S_TIME'=>				'Time',
+	'S_TIME'=>					'Time',
 	'S_STATUS'=>				'Status',
 	'S_DURATION'=>				'Duration',
-	'S_SUM'=>				'Sum',
+	'S_SUM'=>					'Sum',
 	'S_TRUE_BIG'=>				'TRUE',
 	'S_FALSE_BIG'=>				'FALSE',
 	'S_DISABLED_BIG'=>			'DISABLED',
@@ -338,35 +349,35 @@
 
 //	actions.php
 	'S_HISTORY_OF_ACTIONS_BIG'=>		'HISTORY OF ACTIONS',
-	'S_LATEST_ACTIONS'=>			'Latest actions',
-	'S_ALERTS_BIG'=>			'ALERTS',
-	'S_TYPE'=>				'Type',
+	'S_LATEST_ACTIONS'=>				'Latest actions',
+	'S_ALERTS_BIG'=>					'ALERTS',
+	'S_TYPE'=>					'Type',
 	'S_RECIPIENTS'=>			'Recipient(s)',
-	'S_RECIPIENT'=>			'Recipient',
-	'S_ERROR'=>				'Error',
-	'S_SENT'=>				'sent',
+	'S_RECIPIENT'=>				'Recipient',
+	'S_ERROR'=>					'Error',
+	'S_SENT'=>					'sent',
 	'S_NOT_SENT'=>				'not sent',
 	'S_NO_ACTIONS_FOUND'=>			'No actions found',
-	'S_SHOW_NEXT_100'=>			'Show next 100',
+	'S_SHOW_NEXT_100'=>				'Show next 100',
 	'S_SHOW_PREVIOUS_100'=>			'Show previous 100',
 
 //	charts.php
-	'S_CUSTOM_GRAPHS'=>			'Custom graphs',
-	'S_GRAPHS_BIG'=>			'GRAPHS',
+	'S_CUSTOM_GRAPHS'=>				'Custom graphs',
+	'S_GRAPHS_BIG'=>				'GRAPHS',
 	'S_NO_GRAPHS_TO_DISPLAY'=>		'No graphs to display',
 	'S_SELECT_GRAPH_TO_DISPLAY'=>		'Select graph to display',
-	'S_PERIOD'=>				'Period',
-	'S_1H'=>				'1h',
-	'S_2H'=>				'2h',
-	'S_4H'=>				'4h',
-	'S_8H'=>				'8h',
-	'S_12H'=>				'12h',
-	'S_24H'=>				'24h',
+	'S_PERIOD'=>						'Period',
+	'S_1H'=>					'1h',
+	'S_2H'=>					'2h',
+	'S_4H'=>					'4h',
+	'S_8H'=>					'8h',
+	'S_12H'=>					'12h',
+	'S_24H'=>					'24h',
 	'S_WEEK_SMALL'=>			'week',
 	'S_MONTH_SMALL'=>			'month',
 	'S_YEAR_SMALL'=>			'year',
 	'S_KEEP_PERIOD'=>			'Keep period',
-	'S_ON_C'=>				'On',
+	'S_ON_C'=>					'On',
 	'S_OFF_C'=>				'Off',
 	'S_MOVE'=>				'Move',
 	'S_NAVIGATE'=>				'Navigate',
@@ -599,6 +610,7 @@
 
 //	history.php
 	'S_SECONDS_SMALL'=>				'seconds',
+	'S_SEC_SMALL'=>					'sec',
 	'S_TILL_SMALL'=>				'till',
 	'S_SELECT_ROWS_WITH_VALUE_LIKE'=>'Select rows with value like',
 	'S_SHOWING_HISTORY_OF'=>		'Showing history of',
@@ -1048,8 +1060,9 @@
 	'S_IT_SERVICES_AVAILABILITY_REPORT'=>	'IT services availability report',
 	'S_IT_SERVICES_AVAILABILITY_REPORT_BIG'=>	'IT SERVICES AVAILABILITY REPORT',
 	'S_FROM'=>				'From',
-	'S_FROM_SMALL'=>			'from',
+	'S_FROM_SMALL'=>		'from',
 	'S_TILL'=>				'Till',
+	'S_TO'=>				'To',
 	'S_OK'=>				'Ok',
 	'S_PROBLEMS'=>				'Problems',
 	'S_PERCENTAGE'=>			'Percentage',
@@ -1340,6 +1353,7 @@
 	'S_COMMENTS'=>					'Comments',
 	'S_ACKNOWLEDGED'=>				'Acknowledged',
 	'S_ACK'=>						'Ack',
+	'S_NOT_ACK'=>					'Not Ack',
 	'S_NEVER'=>						'Never',
 
 //	users.php
@@ -1347,7 +1361,7 @@
 	'S_ZABBIX_ADMIN'=>			'ZABBIX Admin',
 	'S_SUPER_ADMIN'=>			'ZABBIX Super Admin',
 	'S_USER_TYPE'=>				'User type',
-	'S_USERS'=>				'Users',
+	'S_USERS'=>					'Users',
 	'S_USER_ADDED'=>			'User added',
 	'S_CANNOT'=>					'Cannot',
 	'S_CANNOT_ADD_USER'=>			'Cannot add user',