Zabbix English locale changed for branches/1.8

3 views

Skip to first unread message

ric...@nakts.net

unread,

Nov 6, 2011, 4:13:16 PM11/6/11

to zabbix_tr...@googlegroups.com

Zabbix English locale changed between revision 22994 and 23000

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

------------------------------------------------------------------------
r22996 | rich | 2011-11-06 22:18:22 +0200 (Sun, 06 Nov 2011) | 1 line

- [ZBX-2504] clarify what kind of a group it is for host group replacing and creation
------------------------------------------------------------------------

****************** 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 22994)
+++ branches/1.8/frontends/php/include/locales/en_gb.inc.php (revision 23000)
@@ -794,28 +794,28 @@
'S_EVERY_DAY_S'=> 'Every day(s)',
'S_EVERY_WEEK_S'=> 'Every week(s)',

- 'S_FIRST'=> 'First',
- 'S_SECOND'=> 'Second',
- 'S_THIRD'=> 'Third',
- 'S_FOURTH'=> 'Fourth',
+ 'S_FIRST'=> 'First',
+ 'S_SECOND'=> 'Second',
+ 'S_THIRD'=> 'Third',
+ 'S_FOURTH'=> 'Fourth',

- 'S_AT'=> 'At',
+ 'S_AT'=> 'At',

- 'S_JANUARY'=> 'January',
- 'S_FEBRUARY'=> 'February',
- 'S_MARCH'=> 'March',
- 'S_APRIL'=> 'April',
- 'S_MAY'=> 'May',
- 'S_JUNE'=> 'June',
- 'S_JULY'=> 'July',
- 'S_AUGUST'=> 'August',
- 'S_SEPTEMBER'=> 'September',
- 'S_OCTOBER'=> 'October',
- 'S_NOVEMBER'=> 'November',
- 'S_DECEMBER'=> 'December',
+ 'S_JANUARY'=> 'January',
+ 'S_FEBRUARY'=> 'February',
+ 'S_MARCH'=> 'March',
+ 'S_APRIL'=> 'April',
+ 'S_MAY'=> 'May',
+ 'S_JUNE'=> 'June',
+ 'S_JULY'=> 'July',
+ 'S_AUGUST'=> 'August',
+ 'S_SEPTEMBER'=> 'September',
+ 'S_OCTOBER'=> 'October',
+ 'S_NOVEMBER'=> 'November',
+ 'S_DECEMBER'=> 'December',

- 'S_INCORRECT_MAINTENANCE_PERIOD'=> 'Incorrect maintenance period',
- 'S_INCORRECT_MAINTENANCE_DATE'=> 'Incorrect maintenance date',
+ 'S_INCORRECT_MAINTENANCE_PERIOD'=> 'Incorrect maintenance period',
+ 'S_INCORRECT_MAINTENANCE_DATE'=> 'Incorrect maintenance date',
'S_INCORRECT_MAINTENANCE_DAY_PERIOD'=> 'Incorrect maintenance day period',
'S_INCORRECT_MAINTENANCE_WEEK_PERIOD'=> 'Incorrect maintenance week period',
'S_INCORRECT_MAINTENANCE_MONTH_PERIOD'=> 'Incorrect maintenance month period',
@@ -823,129 +823,130 @@

// hostgroups.php
'S_CONFIGURATION_OF_GROUPS'=> 'CONFIGURATION OF HOST GROUPS',
- 'S_DELETE_SELECTED_GROUP'=> 'Delete selected group?',
+ 'S_DELETE_SELECTED_GROUP'=> 'Delete selected group?',
'S_ENABLE_SELECTED_HOST_GROUPS'=> 'Enable selected Host Groups?',
'S_DISABLE_SELECTED_HOST_GROUPS'=> 'Disable selected Host Groups?',
'S_DELETE_SELECTED_HOST_GROUPS'=> 'Delete selected Host Groups?',
'S_DELETE_SELECTED_GROUPS'=> 'Delete selected groups',

// hosts.php
- 'S_IMPORT_TEMPLATE'=> 'Import Template',
- 'S_IMPORT_HOST'=> 'Import Host',
- 'S_MACROS'=> 'Macros',
- 'S_MACRO'=> 'Macro',
- 'S_WRONG_MACRO'=> 'Wrong macro',
- 'S_MACRO_TOO_LONG'=> 'Macro name is too long, should not exceed 64 chars.',
- 'S_MACRO_VALUE_TOO_LONG'=> 'Macro value is too long, should not exceed 255 chars.',
- 'S_EMPTY_MACRO_VALUE'=> 'Empty macro value',
- 'S_DUPLICATED_MACRO_FOUND'=> 'More than one macro with same name found:',
- 'S_MACROS_UPDATED'=> 'Macros updated',
- 'S_CANNOT_UPDATE_MACROS'=> 'Cannot update macros',
- 'S_CANNOT_ADD_MACRO'=> 'Cannot add macro',
- 'S_HOST_LIST'=> 'Hosts list',
- 'S_OTHER_GROUPS' => 'Other groups',
- 'S_IN_GROUPS' => 'In groups',
- 'S_IN'=> 'In',
- 'S_APPLICATION'=> 'Application',
- 'S_APPLICATIONS'=> 'Applications',
- 'S_APPLICATIONS_BIG'=> 'APPLICATIONS',
- 'S_CREATE_APPLICATION'=> 'Create application',
- 'S_APPLICATION_UPDATED'=> 'Application updated',
- 'S_CANNOT_UPDATE_APPLICATION'=> 'Cannot update application',
- 'S_APPLICATION_ADDED'=> 'Application added',
- 'S_CANNOT_ADD_APPLICATION'=> 'Cannot add application',
- 'S_APPLICATION_DELETED'=> 'Application deleted',
- 'S_CANNOT_DELETE_APPLICATION'=> 'Cannot delete application',
- 'S_NO_APPLICATIONS_DEFINED'=> 'No applications defined',
- 'S_NO_TEMPLATES_LINKED'=> 'No templates linked',
- 'S_HOSTS'=> 'Hosts',
- 'S_ITEMS'=> 'Items',
- 'S_ITEMS_BIG'=> 'ITEMS',
- 'S_TRIGGERS'=> 'Triggers',
- 'S_GRAPHS'=> 'Graphs',
- 'S_HOST_ADDED'=> 'Host added',
- 'S_CANNOT_ADD_HOST'=> 'Cannot add host',
- 'S_ITEMS_COPIED'=> 'Items copied',
- 'S_CANNOT_COPY_ITEMS'=> 'Cannot copy items',
- 'S_HOST_UPDATED'=> 'Host updated',
- 'S_CANNOT_UPDATE_HOST'=> 'Cannot update host',
- 'S_CANNOT_UPDATE'=> 'Cannot update',
- 'S_HOST_STATUS_UPDATED'=> 'Host status updated',
- 'S_CANNOT_UPDATE_HOST_STATUS'=> 'Cannot update host status',
- 'S_HOST_DELETED'=> 'Host deleted',
- 'S_CANNOT_DELETE_HOST'=> 'Cannot delete host',
- 'S_CONFIGURATION_OF_HOSTS'=> 'CONFIGURATION OF HOSTS',
- 'S_CONFIGURATION_OF_TEMPLATES'=> 'CONFIGURATION OF TEMPLATES',
- 'S_CONFIGURATION_OF_APPLICATIONS'=> 'CONFIGURATION OF APPLICATIONS',
+ 'S_IMPORT_TEMPLATE'=> 'Import Template',
+ 'S_IMPORT_HOST'=> 'Import Host',
+ 'S_MACROS'=> 'Macros',
+ 'S_MACRO'=> 'Macro',
+ 'S_WRONG_MACRO'=> 'Wrong macro',
+ 'S_MACRO_TOO_LONG'=> 'Macro name is too long, should not exceed 64 chars.',
+ 'S_MACRO_VALUE_TOO_LONG'=> 'Macro value is too long, should not exceed 255 chars.',
+ 'S_EMPTY_MACRO_VALUE'=> 'Empty macro value',
+ 'S_DUPLICATED_MACRO_FOUND'=> 'More than one macro with same name found:',
+ 'S_MACROS_UPDATED'=> 'Macros updated',
+ 'S_CANNOT_UPDATE_MACROS'=> 'Cannot update macros',
+ 'S_CANNOT_ADD_MACRO'=> 'Cannot add macro',
+ 'S_HOST_LIST'=> 'Hosts list',
+ 'S_OTHER_GROUPS'=> 'Other groups',
+ 'S_IN_GROUPS'=> 'In groups',
+ 'S_IN'=> 'In',
+ 'S_APPLICATION'=> 'Application',
+ 'S_APPLICATIONS'=> 'Applications',
+ 'S_APPLICATIONS_BIG'=> 'APPLICATIONS',
+ 'S_CREATE_APPLICATION'=> 'Create application',
+ 'S_APPLICATION_UPDATED'=> 'Application updated',
+ 'S_CANNOT_UPDATE_APPLICATION'=> 'Cannot update application',
+ 'S_APPLICATION_ADDED'=> 'Application added',
+ 'S_CANNOT_ADD_APPLICATION'=> 'Cannot add application',
+ 'S_APPLICATION_DELETED'=> 'Application deleted',
+ 'S_CANNOT_DELETE_APPLICATION'=> 'Cannot delete application',
+ 'S_NO_APPLICATIONS_DEFINED'=> 'No applications defined',
+ 'S_NO_TEMPLATES_LINKED'=> 'No templates linked',
+ 'S_HOSTS'=> 'Hosts',
+ 'S_ITEMS'=> 'Items',
+ 'S_ITEMS_BIG'=> 'ITEMS',
+ 'S_TRIGGERS'=> 'Triggers',
+ 'S_GRAPHS'=> 'Graphs',
+ 'S_HOST_ADDED'=> 'Host added',
+ 'S_CANNOT_ADD_HOST'=> 'Cannot add host',
+ 'S_ITEMS_COPIED'=> 'Items copied',
+ 'S_CANNOT_COPY_ITEMS'=> 'Cannot copy items',
+ 'S_HOST_UPDATED'=> 'Host updated',
+ 'S_CANNOT_UPDATE_HOST'=> 'Cannot update host',
+ 'S_CANNOT_UPDATE'=> 'Cannot update',
+ 'S_HOST_STATUS_UPDATED'=> 'Host status updated',
+ 'S_CANNOT_UPDATE_HOST_STATUS'=> 'Cannot update host status',
+ 'S_HOST_DELETED'=> 'Host deleted',
+ 'S_CANNOT_DELETE_HOST'=> 'Cannot delete host',
+ 'S_CONFIGURATION_OF_HOSTS'=> 'CONFIGURATION OF HOSTS',
+ 'S_CONFIGURATION_OF_TEMPLATES'=> 'CONFIGURATION OF TEMPLATES',
+ 'S_CONFIGURATION_OF_APPLICATIONS'=> 'CONFIGURATION OF APPLICATIONS',
'S_CONFIGURATION_OF_MAINTENANCE_PERIODS'=> 'CONFIGURATION OF MAINTENANCE PERIODS',
- 'S_HOST_GROUPS_BIG'=> 'HOST GROUPS',
- 'S_NO_HOST_GROUPS_DEFINED'=> 'No host groups defined',
- 'S_NO_HOSTS_DEFINED'=> 'No hosts defined',
- 'S_NO_TEMPLATES_DEFINED'=> 'No templates defined',
- 'S_NO_PROXIES_DEFINED'=> 'No proxies defined',
- 'S_HOSTS_BIG'=> 'HOSTS',
- 'S_HOST'=> 'Host',
- 'S_CONNECT_TO'=> 'Connect to',
- 'S_DNS'=> 'DNS',
- 'S_IP'=> 'IP',
- 'S_PORT'=> 'Port',
- 'S_AGENT_PORT'=> 'Zabbix agent port',
- 'S_MONITORED'=> 'Monitored',
- 'S_NOT_MONITORED'=> 'Not monitored',
- 'S_TEMPLATE'=> 'Template',
- 'S_DELETED'=> 'Deleted',
- 'S_UNKNOWN'=> 'Unknown',
- 'S_GROUPS'=> 'Groups',
- 'S_REPLACE_GROUPS'=> 'Replace groups',
- 'S_MINUS_ALL_GROUPS_MINUS'=> '- all groups -',
- 'S_ALL_GROUPS'=> 'All groups',
- 'S_NO_GROUPS_DEFINED'=> 'No groups defined',
- 'S_NEW_GROUP'=> 'New group',
- 'S_DNS_NAME'=> 'DNS name',
- 'S_IP_ADDRESS'=> 'IP address',
- 'S_LINK_ADDITIONAL_TEMPLATES'=> 'Link additional templates',
- 'S_RELINK_TEMPLATES'=> 'Replace linked templates',
- 'S_USEIPMI'=> 'Use IPMI',
- 'S_IPMI_IP_ADDRESS'=> 'IPMI IP address',
- 'S_IPMI_PORT'=> 'IPMI port',
- 'S_IPMI_AUTHTYPE'=> 'IPMI authentication algorithm',
- 'S_AUTHTYPE_DEFAULT'=> 'Default',
- 'S_AUTHTYPE_NONE'=> 'None',
- 'S_AUTHTYPE_MD2'=> 'MD2',
- 'S_AUTHTYPE_MD5'=> 'MD5',
- 'S_AUTHTYPE_STRAIGHT'=> 'Straight',
- 'S_AUTHTYPE_OEM'=> 'OEM',
- 'S_AUTHTYPE_RMCP_PLUS'=> 'RMCP+',
- 'S_IPMI_PRIVILEGE'=> 'IPMI privilege level',
- 'S_PRIVILEGE_CALLBACK'=> 'Callback',
- 'S_PRIVILEGE_USER'=> 'User',
- 'S_PRIVILEGE_OPERATOR'=> 'Operator',
- 'S_PRIVILEGE_ADMIN'=> 'Admin',
- 'S_PRIVILEGE_OEM'=> 'OEM',
- 'S_IPMI_USERNAME'=> 'IPMI username',
- 'S_IPMI_PASSWORD'=> 'IPMI password',
- 'S_USE_PROFILE'=> 'Use profile',
- 'S_DELETE_SELECTED_HOST_Q'=> 'Delete selected host?',
+ 'S_HOST_GROUPS_BIG'=> 'HOST GROUPS',
+ 'S_NO_HOST_GROUPS_DEFINED'=> 'No host groups defined',
+ 'S_NO_HOSTS_DEFINED'=> 'No hosts defined',
+ 'S_NO_TEMPLATES_DEFINED'=> 'No templates defined',
+ 'S_NO_PROXIES_DEFINED'=> 'No proxies defined',
+ 'S_HOSTS_BIG'=> 'HOSTS',
+ 'S_HOST'=> 'Host',
+ 'S_CONNECT_TO'=> 'Connect to',
+ 'S_DNS'=> 'DNS',
+ 'S_IP'=> 'IP',
+ 'S_PORT'=> 'Port',
+ 'S_AGENT_PORT'=> 'Zabbix agent port',
+ 'S_MONITORED'=> 'Monitored',
+ 'S_NOT_MONITORED'=> 'Not monitored',
+ 'S_TEMPLATE'=> 'Template',
+ 'S_DELETED'=> 'Deleted',
+ 'S_UNKNOWN'=> 'Unknown',
+ 'S_GROUPS'=> 'Groups',
+ 'S_REPLACE_HOST_GROUPS'=> 'Replace host groups',
+ 'S_MINUS_ALL_GROUPS_MINUS'=> '- all groups -',
+ 'S_ALL_GROUPS'=> 'All groups',
+ 'S_NO_GROUPS_DEFINED'=> 'No groups defined',
+ 'S_NEW_GROUP'=> 'New group',
+ 'S_NEW_HOST_GROUP'=> 'New host group',
+ 'S_DNS_NAME'=> 'DNS name',
+ 'S_IP_ADDRESS'=> 'IP address',
+ 'S_LINK_ADDITIONAL_TEMPLATES'=> 'Link additional templates',
+ 'S_RELINK_TEMPLATES'=> 'Replace linked templates',
+ 'S_USEIPMI'=> 'Use IPMI',
+ 'S_IPMI_IP_ADDRESS'=> 'IPMI IP address',
+ 'S_IPMI_PORT'=> 'IPMI port',
+ 'S_IPMI_AUTHTYPE'=> 'IPMI authentication algorithm',
+ 'S_AUTHTYPE_DEFAULT'=> 'Default',
+ 'S_AUTHTYPE_NONE'=> 'None',
+ 'S_AUTHTYPE_MD2'=> 'MD2',
+ 'S_AUTHTYPE_MD5'=> 'MD5',
+ 'S_AUTHTYPE_STRAIGHT'=> 'Straight',
+ 'S_AUTHTYPE_OEM'=> 'OEM',
+ 'S_AUTHTYPE_RMCP_PLUS'=> 'RMCP+',
+ 'S_IPMI_PRIVILEGE'=> 'IPMI privilege level',
+ 'S_PRIVILEGE_CALLBACK'=> 'Callback',
+ 'S_PRIVILEGE_USER'=> 'User',
+ 'S_PRIVILEGE_OPERATOR'=> 'Operator',
+ 'S_PRIVILEGE_ADMIN'=> 'Admin',
+ 'S_PRIVILEGE_OEM'=> 'OEM',
+ 'S_IPMI_USERNAME'=> 'IPMI username',
+ 'S_IPMI_PASSWORD'=> 'IPMI password',
+ 'S_USE_PROFILE'=> 'Use profile',
+ 'S_DELETE_SELECTED_HOST_Q'=> 'Delete selected host?',
'S_DELETE_SELECTED_WITH_LINKED_ELEMENTS'=> 'Delete selected with linked elements',
- 'S_GROUP_NAME'=> 'Group name',
- 'S_HOST_GROUP'=> 'Host group',
- 'S_HOST_GROUPS'=> 'Host groups',
- 'S_UPDATE'=> 'Update',
- 'S_AVAILABILITY'=> 'Availability',
- 'S_AVAILABLE'=> 'Available',
- 'S_NOT_AVAILABLE'=> 'Not available',
- 'S_PROXIES'=> 'Proxies',
- 'S_PROXIES_BIG'=> 'PROXIES',
- 'S_PROXY'=> 'Proxy',
- 'S_CREATE_PROXY'=> 'Create Proxy',
- 'S_PROXY_NAME'=> 'Proxy name',
- 'S_LASTSEEN_AGE'=> 'Last seen (age)',
- 'S_EMPTY_INPUT_PARAMETER'=> 'Empty input parameter',
- 'S_ENABLE_SELECTED_HOSTS'=> 'Enable selected hosts?',
- 'S_DISABLE_SELECTED_HOSTS_Q'=> 'Disable selected hosts?',
- 'S_DELETE_SELECTED_HOSTS_Q'=> 'Delete selected hosts?',
- 'S_UPDATED_STATUS_OF_HOST' => 'Updated status of host',
- 'S_CLEAR_WHEN_UNLINKING' => 'Clear when unlinking',
+ 'S_GROUP_NAME'=> 'Group name',
+ 'S_HOST_GROUP'=> 'Host group',
+ 'S_HOST_GROUPS'=> 'Host groups',
+ 'S_UPDATE'=> 'Update',
+ 'S_AVAILABILITY'=> 'Availability',
+ 'S_AVAILABLE'=> 'Available',
+ 'S_NOT_AVAILABLE'=> 'Not available',
+ 'S_PROXIES'=> 'Proxies',
+ 'S_PROXIES_BIG'=> 'PROXIES',
+ 'S_PROXY'=> 'Proxy',
+ 'S_CREATE_PROXY'=> 'Create Proxy',
+ 'S_PROXY_NAME'=> 'Proxy name',
+ 'S_LASTSEEN_AGE'=> 'Last seen (age)',
+ 'S_EMPTY_INPUT_PARAMETER'=> 'Empty input parameter',
+ 'S_ENABLE_SELECTED_HOSTS'=> 'Enable selected hosts?',
+ 'S_DISABLE_SELECTED_HOSTS_Q'=> 'Disable selected hosts?',
+ 'S_DELETE_SELECTED_HOSTS_Q'=> 'Delete selected hosts?',
+ 'S_UPDATED_STATUS_OF_HOST'=> 'Updated status of host',
+ 'S_CLEAR_WHEN_UNLINKING'=> 'Clear when unlinking',

// templates.php
'S_TEMPLATE_LIST'=> 'Templates list',

ric...@nakts.net

unread,

Nov 9, 2011, 4:13:16 AM11/9/11

to zabbix_tr...@googlegroups.com

Zabbix English locale changed between revision 23060 and 23063

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

------------------------------------------------------------------------
r23063 | vedmak | 2011-11-09 10:49:31 +0200 (Wed, 09 Nov 2011) | 1 line

- [ZBX-4326] api now return error when try create incorrect host profile field
------------------------------------------------------------------------