Zabbix English locale changed for trunk

8 views

Skip to first unread message

ric...@nakts.net

unread,

Jan 24, 2012, 5:13:18 AM1/24/12

to zabbix_tr...@googlegroups.com

Zabbix English locale changed between revision 24982 and 24986

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

------------------------------------------------------------------------
r24986 | pavels | 2012-01-24 11:51:52 +0200 (Tue, 24 Jan 2012) | 6 lines

..F....... [ZBXNEXT-1066] removed the "Monotoring - Hosts" page
..F....... [ZBXNEXT-1066] remade the "Search" page layout
..F....... [ZBXNEXT-1066] added the host pop up menu to the "Event", "Event details", "Trigger status" and "Overview" pages
..F....... [ZBXNEXT-1066] added the "Host screens" link to all of the host pop up menus
..F....... [ZBXNEXT-1066] moved some of the JS code to init.js
..F....... [ZBXNEXT-1066] added gettext translation support for JS
------------------------------------------------------------------------

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

Index: trunk/frontends/php/include/locales/en_gb.inc.php
===================================================================
--- trunk/frontends/php/include/locales/en_gb.inc.php (revision 24982)
+++ trunk/frontends/php/include/locales/en_gb.inc.php (revision 24986)
@@ -225,10 +225,8 @@

// Latest values
'S_NO_PERMISSIONS'=> _('No permissions to referred object or it does not exist!'),
- 'S_LATEST_DATA_BIG'=> _('LATEST DATA'),
'S_ALL_S'=> _('All'),
'S_ALL_SMALL'=> _('all'),
- 'S_MINUS_OTHER_MINUS'=> _('- other -'),
'S_NOT_SELECTED_SMALL'=> _('not selected'),
'S_GRAPH'=> _('Graph'),

@@ -452,7 +450,6 @@
'S_MODE'=> _('Mode'),
'S_COPY'=> _('Copy'),
'S_HISTORY_CLEARING_CAN_TAKE_A_LONG_TIME_CONTINUE_Q'=> _('History clearing can take a long time. Continue?'),
- 'S_SEARCH'=> _('Search'),
'S_ORIGINAL'=> _('Original'),
'S_NEW_FLEXIBLE_INTERVAL'=> _('New flexible interval'),
'S_FLEXIBLE_INTERVALS'=> _('Flexible intervals (sec)'),
@@ -493,7 +490,6 @@
'S_GRAPH_PROTOTYPES_OF_BIG' => _('GRAPH PROTOTYPES OF'),

// events.php
- 'S_LATEST_EVENTS'=> _('Latest events'),
'S_HISTORY_OF_EVENTS_BIG'=> _('HISTORY OF EVENTS'),
'S_NO_EVENTS_FOUND'=> _('No events found'),
'S_EVENTS_DATE_FORMAT'=> _('d M Y H:i:s'),
@@ -503,17 +499,11 @@
// events.inc.php
'S_EVENTS_TRIGGERS_EVENTS_HISTORY_LIST_DATE_FORMAT'=> _('d M Y H:i:s'),

-// latest.php
- 'S_LAST_CHECK'=> _('Last check'),
- 'S_LAST_VALUE'=> _('Last value'),
- 'S_LATEST_ITEMS_TRIGGERS_DATE_FORMAT'=> _('d M Y H:i:s'),
-
// sysmap.php
'S_HIDDEN'=> _('Hidden'),
'S_SHOWN'=> _('Shown'),
'S_URLS'=> _('URLs'),
'S_LABEL'=> _('Label'),
- 'S_GO_TO'=> _('Go to'),
'S_X'=> _('X'),
'S_CONFIGURATION_OF_NETWORK_MAPS'=> _('Configuration of network maps'),
'S_NO_IMAGES' => 'You need to have at least one image uploaded to create map element. Images can be uploaded in Administration->General->Images section.',
@@ -677,7 +667,6 @@
'S_REPORTS_BAR_REPORT_DATE_FORMAT'=> _('d M Y H:i:s'),

// screenconf.php
- 'S_SCREENS'=> _('Screens'),
'S_SCREEN'=> _('Screen'),
'S_CONFIGURATION_OF_SCREENS_BIG'=> _('CONFIGURATION OF SCREENS'),
'S_CONFIGURATION_OF_SCREENS'=> _('Configuration of screens'),
@@ -744,7 +733,6 @@
'S_MIDDLE'=> _('Middle'),

// screens.php
- 'S_SCREENS_BIG'=> _('SCREENS'),
'S_HOST_SCREENS'=> _('Host screens'),

// services.php
@@ -765,7 +753,6 @@
'S_ENABLED'=> _('Enabled'),
'S_DISABLE'=> _('Disable'),
'S_ENABLE'=> _('Enable'),
- 'S_CHANGE'=> _('Change'),
'S_URL'=> _('URL'),
'S_INSERT'=> _('Insert'),
'S_TIME_SHIFT'=> _('Time shift'),
@@ -783,7 +770,6 @@
'S_ADD'=> _('Add'),

// tr_status.php
- 'S_STATUS_OF_TRIGGERS'=> _('Status of triggers'),
'S_STATUS_OF_TRIGGERS_BIG'=> _('STATUS OF TRIGGERS'),
'S_STATUS_OF_HOSTGROUP_TRIGGERS'=> _('Status of hostgroup triggers'),
'S_STATUS_OF_HOST_TRIGGERS'=> _('Status of host triggers'),
@@ -859,12 +845,7 @@
'S_HOST_INVENTORY_OVERVIEW'=> _('Host inventory overview'),

// search.php
- 'S_EDIT_HOSTS'=> _('Edit hosts'),
- 'S_SEARCH_BIG'=> _('SEARCH'),
'S_GO'=> _('Go'),
- 'S_FOUND_SMALL'=> _('found'),
- 'S_DISPLAYING'=> _('Displaying'),
- 'S_SEARCH_PATTERN_EMPTY'=> _('Search pattern is empty'),

// popup.php
'S_CAPTION'=> _('Caption'),
@@ -930,9 +911,6 @@
'S_TEMPLATE_WITH_APPLICATION'=> _('Template with application'),
'S_ALREADY_LINKED_TO_HOST_SMALL'=> _('already linked to host'),

-// maps.inc.php
- 'S_SUBMAP'=> _('Submap'),
-
// screens.inc.php
'S_DELETE_IT_Q'=> _('Delete it?'),
'S_THIS_SCREEN_ROW_NOT_EMPTY'=> _('This screen-row is not empty'),
@@ -968,7 +946,6 @@
'S_REPORT'=> _('Report'),
'S_REPORTS'=> _('Reports'),
'S_LOGOUT'=> _('Logout'),
- 'S_LATEST_DATA'=> _('Latest data'),

// Errors
'S_NO_PERMISSION'=> _('You do not have permission to perform this operation'),

ric...@nakts.net

unread,

Jan 26, 2012, 10:13:16 AM1/26/12

to zabbix_tr...@googlegroups.com

Zabbix English locale changed between revision 25038 and 25040

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

------------------------------------------------------------------------
r25039 | pavels | 2012-01-26 17:02:35 +0200 (Thu, 26 Jan 2012) | 4 lines

..F....... [ZBX-4558] added audit logging when udpating and creating triggers
A.F....... [ZBX-4558] fixed deleting child template triggers when moving a trigger to a template
A......... [ZBX-4558] fixed child template trigger attributes being reset when updating a template trigger
..F....... [ZBX-4558] fixed trigger form "type" field value being inverted
------------------------------------------------------------------------

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

'S_MODE'=> _('Mode'),

- 'S_COPY'=> _('Copy'),

'S_HISTORY_CLEARING_CAN_TAKE_A_LONG_TIME_CONTINUE_Q'=> _('History clearing can take a long time. Continue?'),

'S_ORIGINAL'=> _('Original'),
'S_NEW_FLEXIBLE_INTERVAL'=> _('New flexible interval'),

@@ -496,9 +484,6 @@
'S_EVENTS_DISCOVERY_TIME_FORMAT'=> _('d M Y H:i:s'),
'S_EVENTS_ACTION_TIME_FORMAT'=> _('d M Y H:i:s'),

-// events.inc.php
- 'S_EVENTS_TRIGGERS_EVENTS_HISTORY_LIST_DATE_FORMAT'=> _('d M Y H:i:s'),

-
// sysmap.php
'S_HIDDEN'=> _('Hidden'),
'S_SHOWN'=> _('Shown'),

@@ -681,18 +666,13 @@
'S_DELETE_SCREEN_Q'=> _('Delete screen?'),
'S_RESOURCE'=> _('Resource'),
'S_NO_RESOURCES_DEFINED'=> _('No resources defined.'),
- 'S_SIMPLE_GRAPH'=> _('Simple graph'),
'S_SIMPLE_GRAPHS'=> _('Simple graphs'),
'S_HISTORY_AND_SIMPLE_GRAPHS'=> _('History and simple graphs'),
- 'S_GRAPH_NAME'=> _('Graph name'),
'S_WIDTH'=> _('Width'),
'S_HEIGHT'=> _('Height'),
'S_CREATE_SCREEN'=> _('Create screen'),
'S_EDIT'=> _('Edit'),
- 'S_DYNAMIC_ITEM'=> _('Dynamic item'),
'S_DIMENSION_COLS_ROWS'=> _('Dimension (cols x rows)'),
- 'S_SLIDES'=> _('Slides'),
- 'S_SHOW_TEXT_AS_HTML'=> _('Show text as HTML'),

'S_IMPORT_SCREEN'=> _('Import screen'),

@@ -703,33 +683,14 @@
// screenedit.php
'S_MAP'=> _('Map'),
'S_AS_PLAIN_TEXT'=> _('As plain text'),
- 'S_PLAIN_TEXT'=> _('Plain text'),
- 'S_COLUMN_SPAN'=> _('Column span'),
- 'S_ROW_SPAN'=> _('Row span'),
- 'S_SHOW_LINES'=> _('Show lines'),
'S_HOSTS_INFO'=> _('Hosts info'),
'S_TRIGGERS_INFO'=> _('Triggers info'),
'S_SERVER_INFO'=> _('Server info'),
- 'S_CLOCK'=> _('Clock'),
- 'S_TRIGGERS_OVERVIEW'=> _('Triggers overview'),
- 'S_DATA_OVERVIEW'=> _('Data overview'),
- 'S_HISTORY_OF_ACTIONS'=> _('History of actions'),
- 'S_HISTORY_OF_EVENTS'=> _('History of events'),

- 'S_TIME_TYPE'=> _('Time type'),
- 'S_SERVER_TIME'=> _('Server time'),
'S_LOCAL_TIME'=> _('Local time'),
- 'S_HOST_TIME'=> _('Host time'),

- 'S_STYLE'=> _('Style'),
- 'S_VERTICAL'=> _('Vertical'),
- 'S_HORIZONTAL'=> _('Horizontal'),
-
- 'S_HORIZONTAL_ALIGN'=> _('Horizontal align'),
- 'S_CENTRE'=> _('Centre'),
'S_RIGHT'=> _('Right'),

- 'S_VERTICAL_ALIGN'=> _('Vertical align'),

'S_MIDDLE'=> _('Middle'),

// screens.php

@@ -754,12 +715,8 @@

'S_DISABLE'=> _('Disable'),
'S_ENABLE'=> _('Enable'),

'S_URL'=> _('URL'),

- 'S_INSERT'=> _('Insert'),

'S_TIME_SHIFT'=> _('Time shift'),

- 'S_INCORRECT_DEPENDENCY'=> _('Incorrect dependency'),
'S_INSERT_MACRO'=> _('Insert macro'),
- 'S_MASS_UPDATE_SELECTED_TRIGGERS_Q'=> _('Mass update selected triggers?'),
- 'S_COPY_SELECTED_TRIGGERS_Q'=> _('Copy selected triggers?'),
'S_TRIGGER_LOG_FORM'=> _('Trigger form'),

// tr_comments.php
@@ -771,8 +728,6 @@

// tr_status.php

'S_STATUS_OF_TRIGGERS_BIG'=> _('STATUS OF TRIGGERS'),

- 'S_STATUS_OF_HOSTGROUP_TRIGGERS'=> _('Status of hostgroup triggers'),
- 'S_STATUS_OF_HOST_TRIGGERS'=> _('Status of host triggers'),
'S_SHOW_DETAILS'=> _('Show details'),
'S_FILTER_BY_NAME'=> _('Filter by name'),
'S_ACK'=> _('Ack'),
@@ -811,7 +766,6 @@
'S_SCRIPT_BYTES_LIMIT_ERROR'=> _('Defined in "include/defines.inc.php" constant ZBX_SCRIPT_BYTES_LIMIT read bytes limit is reached. You can try to increase this value'),
'S_SCRIPT_ERROR_EMPTY_RESPONSE'=> _('Empty response received'),

- '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_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.'),
@@ -911,12 +865,6 @@

'S_TEMPLATE_WITH_APPLICATION'=> _('Template with application'),
'S_ALREADY_LINKED_TO_HOST_SMALL'=> _('already linked to host'),

-// screens.inc.php
- 'S_DELETE_IT_Q'=> _('Delete it?'),
- 'S_THIS_SCREEN_ROW_NOT_EMPTY'=> _('This screen-row is not empty'),
- 'S_THIS_SCREEN_COLUMN_NOT_EMPTY'=> _('This screen-column is not empty'),
- 'S_SCREENS_TRIGGER_FORM_DATE_FORMAT'=> _('[H:i:s]'),
-
// graphs.inc.php
'S_NO_GRAPH_WITH'=> _('No graph item with'),
'S_MISSING_ITEMS_FOR_GRAPH'=> _('Missing items for graph'),

Reply all

Reply to author

Forward

0 new messages