File zabbix-1.8.3-locale-en_US.patch of Package zabbix

diff -ru zabbix-1.8.3.orig/frontends/php/include/locales/cn_zh.inc.php zabbix-1.8.3/frontends/php/include/locales/cn_zh.inc.php
--- zabbix-1.8.3.orig/frontends/php/include/locales/cn_zh.inc.php	2010-08-16 01:19:32.000000000 -0700
+++ zabbix-1.8.3/frontends/php/include/locales/cn_zh.inc.php	2010-09-02 14:48:49.578342442 -0700
@@ -1550,6 +1550,7 @@
 	'S_LANGUAGE'=>			'Language',
 	'S_THEME'=>			'Theme',
 	'S_ENGLISH_GB'=>			'英语 (GB)',
+	'S_ENGLISH_US'=>			'英语 (US)',
 	'S_FRENCH_FR'=>			'法语 (FR)',
 	'S_GERMAN_DE'=>			'德语 (DE)',
 	'S_ITALIAN_IT'=>			'意大利语 (IT)',
diff -ru zabbix-1.8.3.orig/frontends/php/include/locales/de_de.inc.php zabbix-1.8.3/frontends/php/include/locales/de_de.inc.php
--- zabbix-1.8.3.orig/frontends/php/include/locales/de_de.inc.php	2010-08-16 01:19:32.000000000 -0700
+++ zabbix-1.8.3/frontends/php/include/locales/de_de.inc.php	2010-09-02 14:45:52.395592168 -0700
@@ -1604,6 +1604,7 @@
 	'S_LANGUAGE'=>			'Sprache',
 	'S_THEME'=>			'Theme',
 	'S_ENGLISH_GB'=>			'Englisch (GB)',
+	'S_ENGLISH_US'=>			'Englisch (US)',
 	'S_FRENCH_FR'=>			'Französisch (FR)',
 	'S_GERMAN_DE'=>			'Deutsch (DE)',
 	'S_ITALIAN_IT'=>			'Italienisch (IT)',
diff -ru zabbix-1.8.3.orig/frontends/php/include/locales/en_gb.inc.php zabbix-1.8.3/frontends/php/include/locales/en_gb.inc.php
--- zabbix-1.8.3.orig/frontends/php/include/locales/en_gb.inc.php	2010-08-16 01:19:32.000000000 -0700
+++ zabbix-1.8.3/frontends/php/include/locales/en_gb.inc.php	2010-09-02 14:45:52.396592027 -0700
@@ -1954,6 +1954,7 @@
 	'S_LANGUAGE'=>				'Language',
 	'S_THEME'=>					'Theme',
 	'S_ENGLISH_GB'=>			'English (GB)',
+	'S_ENGLISH_US'=>			'English (US)',
 	'S_FRENCH_FR'=>				'French (FR)',
 	'S_GERMAN_DE'=>				'German (DE)',
 	'S_ITALIAN_IT'=>			'Italian (IT)',
@@ -2196,7 +2197,7 @@
 	'S_IS_NOT_A_COLOUR_SMALL'=>			'is not a colour',
 	'S_IS_MANDATORY_SMALL'=>			'is mandatory',
 	'S_MUST_BE_MISSING_SMALL'=>			'must be missing',
-	'S_OPERATION_CANNOT_PERFORMED_UNAUTH_REQUEST'=>	'Operation cannot be performed due to unauthorized request',
+	'S_OPERATION_CANNOT_PERFORMED_UNAUTH_REQUEST'=>	'Operation cannot be performed due to unauthorised request',
 	'S_INCORRECT_VALUE_FOR'=>			'Incorrect value for',
 
 //	triggers.inc.php
diff -ru zabbix-1.8.3.orig/frontends/php/include/locales/en_us.inc.php zabbix-1.8.3/frontends/php/include/locales/en_us.inc.php
--- zabbix-1.8.3.orig/frontends/php/include/locales/en_us.inc.php	2010-09-02 15:14:38.308470273 -0700
+++ zabbix-1.8.3/frontends/php/include/locales/en_us.inc.php	2010-09-02 15:12:36.413467204 -0700
@@ -23,9 +23,9 @@
 
 	$TRANSLATION=array(
 
-	'S_DATE_FORMAT_YMDHMS'=>		'd M Y H:i:s',
-	'S_DATE_FORMAT_YMD'=>			'd M Y',
-	'S_TIMELINE_DATE_FORMAT'=>		'd.M',
+	'S_DATE_FORMAT_YMDHMS'=>		'M d Y H:i:s',
+	'S_DATE_FORMAT_YMD'=>			'M d Y',
+	'S_TIMELINE_DATE_FORMAT'=>		'M d',
 	'S_HTML_CHARSET'=>			'UTF-8',
 
 	'S_YEAR_SHORT'=>			'y',
@@ -84,7 +84,7 @@
 	'S_ACTIVATE_SELECTED_HOSTS'=>		'Activate selected hosts',
 	'S_DISABLE_SELECTED_HOSTS'=>		'Disable selected hosts',
 	'S_DELETE_SELECTED'=>			'Delete selected',
-	'S_COPY_SELECTED_TO'=>			'Copy selected to ...',
+	'S_COPY_SELECTED_TO'=>			'Copy selected to...',
 
 //	dicoveryconf.php
 	'S_HOST_IP'=>				'Host IP',
@@ -149,10 +149,10 @@
 	'S_INCORRECT_IP_RANGE'=>		'Incorrect IP range.',
 
 //	auditacts.php
-	'S_AUDITACTS_DESCRIPTION_DATE_FORMAT'=>	'd M Y H:i:s',
+	'S_AUDITACTS_DESCRIPTION_DATE_FORMAT'=>	'M d Y H:i:s',
 
 //	auditlogs.php
-	'S_AUDITLOGS_RECORD_DATE_FORMAT'=>	'd M Y H:i:s',
+	'S_AUDITLOGS_RECORD_DATE_FORMAT'=>	'M d Y H:i:s',
 
 //	httpdetails.php
 	'S_DETAILS_OF_SCENARIO'=>		'Details of scenario',
@@ -173,8 +173,8 @@
 	'S_STATUS_OF_WEB_MONITORING'=>		'Status of Web monitoring',
 	'S_STATUS_OF_WEB_MONITORING_BIG'=>	'STATUS OF WEB MONITORING',
 	'S_STATE'=>				'State',
-	'S_WEB_SCENARIO_DATE_FORMAT'=>		'd M Y H:i:s',
-	'S_WEB_SCENARIO_IDLE_DATE_FORMAT'=>	'd M Y H:i:s',
+	'S_WEB_SCENARIO_DATE_FORMAT'=>		'M d Y H:i:s',
+	'S_WEB_SCENARIO_IDLE_DATE_FORMAT'=>	'M d Y H:i:s',
 
 //	httpconf.php
 	'S_SORT'=>					'Sort',
@@ -207,10 +207,10 @@
 	'S_REQUIRED'=>					'Required',
 	'S_STEP_OF_SCENARIO'=>				'Step of scenario',
 	'S_BASIC_AUTHENTICATION'=>			'Basic authentication',
-	'S_ENABLE_SELECTED_WEB_SCENARIOS_Q'=>		'Enable selected WEB scenarios?',
-	'S_DISABLE_SELECTED_WEB_SCENARIOS_Q'=>		'Disable selected WEB scenarios?',
-	'S_DELETE_HISTORY_SELECTED_WEB_SCENARIOS_Q'=>	'Delete history of selected WEB scenarios?',
-	'S_DELETE_SELECTED_WEB_SCENARIOS_Q'=>		'Delete selected WEB scenarios?',
+	'S_ENABLE_SELECTED_WEB_SCENARIOS_Q'=>		'Enable selected Web scenarios?',
+	'S_DISABLE_SELECTED_WEB_SCENARIOS_Q'=>		'Disable selected Web scenarios?',
+	'S_DELETE_HISTORY_SELECTED_WEB_SCENARIOS_Q'=>	'Delete history of selected Web scenarios?',
+	'S_DELETE_SELECTED_WEB_SCENARIOS_Q'=>		'Delete selected Web scenarios?',
 
 //	exp_imp.php
 	'S_ELEMENT'=>				'Element',
@@ -257,8 +257,8 @@
 	'S_REQUIRE_MB_STRING_MODULE'=>		'Multibyte String module required to run FrontEnd',
 
 //	actions.inc.php
-	'S_HISTORY_OF_ACTIONS_DATE_FORMAT'=>	'd M Y H:i:s',
-	'S_EVENT_ACTION_MESSAGES_DATE_FORMAT'=>	'd M Y H:i:s',
+	'S_HISTORY_OF_ACTIONS_DATE_FORMAT'=>	'M d Y H:i:s',
+	'S_EVENT_ACTION_MESSAGES_DATE_FORMAT'=>	'M d Y H:i:s',
 	'S_EVENT_ACTION_CMDS_DATE_FORMAT'=>	'Y.M.d H:i:s',
 
 //	node.php
@@ -289,10 +289,10 @@
 	'S_CANNOT_ACKNOWLEDGE_EVENT'=>		'Cannot acknowledge event',
 	'S_SYS_BULK_ACKNOWLEDGE'=>		'----[BULK ACKNOWLEDGE]----',
 	'S_BULK_ACKNOWLEDGE'=>			'Bulk acknowledge',
-	'S_ACKNOWLEDGE_DATE_FORMAT'=>		'd M Y H:i:s',
+	'S_ACKNOWLEDGE_DATE_FORMAT'=>		'M d Y H:i:s',
 
 //	acknow.inc.php
-	'S_ACKNOWINC_BY_EVENTS_DATE_FORMAT'=>	'd M Y H:i:s',
+	'S_ACKNOWINC_BY_EVENTS_DATE_FORMAT'=>	'M d Y H:i:s',
 
 //	actionconf.php
 	'S_IMMEDIATELY'=>			'Immediately',
@@ -336,7 +336,7 @@
 	'S_HOST_TEMPLATE'=>			'Host template',
 	'S_EVENT_ACKNOWLEDGED'=>		'Event acknowledged',
 	'S_SEND_ONLY_TO'=>			'Send only to',
-	'S_USER_MEDIAS'=>			'User medias',
+	'S_USER_MEDIAS'=>			'User media',
 	'S_DISCOVERY_CHECK'=>			'Discovery check',
 	'S_DISCOVERED_OBJECT'=>			'Discovered object',
 	'S_DEVICE'=>				'Device',
@@ -451,15 +451,15 @@
 //	class.cchart.php
 	'S_CCHARTS_TIMELINE_HOURS_FORMAT'=>			'H:i',
 	'S_CCHARTS_TIMELINE_DAYS_FORMAT'=>			'D',
-	'S_CCHARTS_TIMELINE_MONTHDAYS_FORMAT'=>			'd.m',
-	'S_CCHARTS_TIMELINE_START_DATE_FORMAT'=>		'd.m H:i',
-	'S_CCHARTS_TIMELINE_END_DATE_FORMAT'=>			'd.m H:i',
+	'S_CCHARTS_TIMELINE_MONTHDAYS_FORMAT'=>			'm/d',
+	'S_CCHARTS_TIMELINE_START_DATE_FORMAT'=>		'm/d H:i',
+	'S_CCHARTS_TIMELINE_END_DATE_FORMAT'=>			'm/d H:i',
 	'S_CCHARTS_TIMELINE_MAINPERIOD_HOURS_FORMAT'=>		'H:i',
-	'S_CCHARTS_TIMELINE_MAINPERIOD_FULL_DAY_TIME_FORMAT'=>	'd.m H:i',
-	'S_CCHARTS_TIMELINE_MAINPERIOD_MONTHDAYS_FORMAT'=>	'd.m',
+	'S_CCHARTS_TIMELINE_MAINPERIOD_FULL_DAY_TIME_FORMAT'=>	'm/d H:i',
+	'S_CCHARTS_TIMELINE_MAINPERIOD_MONTHDAYS_FORMAT'=>	'm/d',
 
 //	class.cuser.php
-	'S_CUSER_ERROR_DATE_FORMAT'=>				'd.m.Y H:i',
+	'S_CUSER_ERROR_DATE_FORMAT'=>				'm/d/Y H:i',
 
 // Colours
 
@@ -629,7 +629,7 @@
 	'S_SWITCHING_LDAP'=>			'Switching LDAP authentication will reset all current sessions! Continue?',
 
 //	Latest values
-	'S_NO_PERMISSIONS'=>			'No permissions !',
+	'S_NO_PERMISSIONS'=>			'No permissions!',
 	'S_LATEST_DATA_BIG'=>			'LATEST DATA',
 	'S_ALL_S'=>						'All',
 	'S_ALL_SMALL'=>					'all',
@@ -640,7 +640,7 @@
 
 //	Footer
 	'S_ZABBIX'=>				'Zabbix',
-	'S_COPYRIGHT_BY'=>			'Copyright 2001-2010 by',
+	'S_COPYRIGHT_BY'=>			'Copyright © 2001-2010',
 	'S_CONNECTED_AS'=>			'Connected as',
 	'S_NOT_CONNECTED'=>			'Not connected',
 	'S_SIA_ZABBIX'=>			'SIA Zabbix',
@@ -654,7 +654,7 @@
 	'S_ITEM_DOES_NOT_EXIST'=>	'Item does not exist',
 	'S_SORT_BY'=>				'Sort by',
 	'S_PARAMETER'=>				'Parameter',
-	'S_COLOR'=>					'Colour',
+	'S_COLOR'=>					'Color',
 	'S_UP'=>					'Up',
 	'S_DOWN'=>					'Down',
 	'S_NEW_ITEM_FOR_THE_GRAPH'=>		'New item for the graph',
@@ -1193,7 +1193,7 @@
 	'S_HISTORY_OF_EVENTS_BIG'=>		'HISTORY OF EVENTS',
 	'S_NO_EVENTS_FOUND'=>			'No events found',
 	'S_EVENTS_SINCE'=>			'Events since',
-	'S_EVENTS_DATE_FORMAT'=>		'd M Y H:i:s',
+	'S_EVENTS_DATE_FORMAT'=>		'M d Y H:i:s',
 	'S_EVENTS_DISCOVERY_TIME_FORMAT'=>	'Y.M.d H:i:s',
 	'S_EVENTS_ACTION_TIME_FORMAT'=>		'Y.M.d H:i:s',
 	'S_UP_BIG'=>		'UP',
@@ -1204,13 +1204,13 @@
 //	events.inc.php
 	'S_EVENTS_EVENT_DETAILS_DATE_FORMAT'=>			'Y.M.d H:i:s',
 	'S_EVENTS_SMALL_EVENT_LIST_DATE_FORMAT'=>		'Y.M.d H:i:s',
-	'S_EVENTS_POPUP_EVENT_LIST_DATE_FORMAT'=>		'd M Y H:i:s',
+	'S_EVENTS_POPUP_EVENT_LIST_DATE_FORMAT'=>		'M d Y H:i:s',
 	'S_EVENTS_TRIGGERS_EVENTS_HISTORY_LIST_DATE_FORMAT'=>	'Y.M.d 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',
+	'S_LATEST_ITEMS_TRIGGERS_DATE_FORMAT'=>	'M d Y H:i:s',
 
 //	sysmap.php
 	'S_HIDDEN'=>			'Hidden',
@@ -1258,7 +1258,7 @@
 	'S_ICON_HIGHLIGHTING'=>			'Icon highlighting',
 	'S_LINK_INDICATORS'=>			'Link indicators',
 	'S_TYPE_OK'=>					'Type (OK)',
-	'S_COLOR_OK'=>					'Colour (OK)',
+	'S_COLOR_OK'=>					'Color (OK)',
 	'S_USE_ADVANCED_ICONS'=>		'Use advanced icons',
 	'S_DELETE_SELECTED_MAPS_Q'=>		'Delete selected maps?',
 	'S_MAP_ADDED'=>					'Network map added',
@@ -1313,7 +1313,7 @@
 	'S_ELEMENT_NAME'=>		'Element name',
 	'S_STATUS_ONLY'=>		'Status only',
 	'S_NOTHING'=>			'Nothing',
-	'S_MAPS_DATE_FORMAT'=>           'm.d.Y H:i:s',
+	'S_MAPS_DATE_FORMAT'=>           'm/d/Y H:i:s',
 
 //	media.php
 	'S_CONFIGURATION_OF_MEDIA_TYPES_BIG'=>	'CONFIGURATION OF MEDIA TYPES',
@@ -1339,8 +1339,8 @@
 	'S_WITHOUT_PROBLEMS' =>				'Without problems',
 	'S_WITH_PROBLEMS' =>				'With problems',
 	'S_LAST_20_ISSUES'=>			'Last 20 issues',
-	'S_FAVOURITE'=>				'Favourite',
-	'S_FAVOURITES'=>			'Favourites',
+	'S_FAVOURITE'=>				'Favorite',
+	'S_FAVOURITES'=>			'Favorites',
 	'S_EVERY'=>				'Every',
 	'S_MENU'=>				'Menu',
 	'S_RESET'=>				'Reset',
@@ -1392,7 +1392,7 @@
 	'S_MORE_THAN_10_MINUTES'=>		'More than 10 minutes',
 	'S_TRUNCATED'=>				'Truncated',
 	'S_DELAYED_BY'=>			'Delayed by',
-	'S_QUEUE_NODES_DATE_FORMAT'=>		'd M Y H:i:s',
+	'S_QUEUE_NODES_DATE_FORMAT'=>		'M d Y H:i:s',
 
 //	report1.php
 	'S_REPORT_BIG'=>			'REPORT',
@@ -1430,18 +1430,18 @@
 	'S_CHART4_HEADER_TITLE_PART2'=>		'(year',
 	'S_CHART4_HEADER_TITLE_PART3'=>		')',
 	'S_CHART4_HEADER_DATE_FORMAT'=>		'Y',
-	'S_CHART4_TIMELINE_DATE_FORMAT'=>	'd.M',
+	'S_CHART4_TIMELINE_DATE_FORMAT'=>	'M d',
 
 //	chart5.php
 	'S_CHART5_HEADER_TITLE_PART1'=>		'',
 	'S_CHART5_HEADER_TITLE_PART2'=>		'(year',
 	'S_CHART5_HEADER_TITLE_PART3'=>		')',
 	'S_CHART5_HEADER_DATE_FORMAT'=>		'Y',
-	'S_CHART5_TIMELINE_DATE_FORMAT'=>	'd.M',
+	'S_CHART5_TIMELINE_DATE_FORMAT'=>	'M d',
 
 //	chart_bar.php
-	'S_CHARTBAR_HOURLY_DATE_FORMAT'=>		'Y.m.d H:i',
-	'S_CHARTBAR_DAILY_DATE_FORMAT'=>		'Y.m.d',
+	'S_CHARTBAR_HOURLY_DATE_FORMAT'=>		'Y-m-d H:i',
+	'S_CHARTBAR_DAILY_DATE_FORMAT'=>		'Y-m-d',
 
 //	report3.php
 	'S_IT_SERVICES_AVAILABILITY_REPORT'=>		'IT services availability report',
@@ -1471,13 +1471,13 @@
 	'S_YEARLY'=>					'Yearly',
 	'S_REPORT3_ANNUALLY_DATE_FORMAT'=>		'Y',
 	'S_REPORT3_MONTHLY_DATE_FORMAT'=>		'M Y',
-	'S_REPORT3_DAILY_DATE_FORMAT'=>			'd M Y',
-	'S_REPORT3_WEEKLY_DATE_FORMAT'=>		'd M Y H:i',
+	'S_REPORT3_DAILY_DATE_FORMAT'=>			'M d Y',
+	'S_REPORT3_WEEKLY_DATE_FORMAT'=>		'M d Y H:i',
 
 //	services_form.php
 	'S_SERVICES_UPTIME_DATE_FORMAT'=>		'l H:i',
 	'S_SERVICES_DOWNTIME_DATE_FORMAT'=>		'l H:i',
-	'S_SERVICES_ONETIME_DOWNTIME_DATE_FORMAT'=>	'd M Y H:i',
+	'S_SERVICES_ONETIME_DOWNTIME_DATE_FORMAT'=>	'M d Y H:i',
 	'S_ADD_SMALL'=>								'add',
 
 //	locales.php
@@ -1499,8 +1499,8 @@
 	'S_IT_NOTIFICATIONS'=>			'Notification report',
 	'S_REPORT4_ANNUALLY_DATE_FORMAT'=>	'Y',
 	'S_REPORT4_MONTHLY_DATE_FORMAT'=>	'M Y',
-	'S_REPORT4_DAILY_DATE_FORMAT'=>		'd M Y',
-	'S_REPORT4_WEEKLY_DATE_FORMAT'=>	'd M Y H:i',
+	'S_REPORT4_DAILY_DATE_FORMAT'=>		'M d Y',
+	'S_REPORT4_WEEKLY_DATE_FORMAT'=>	'M d Y H:i',
 
 //	report5.php
 	'S_TRIGGERS_TOP_100'=>			'Most busy triggers top 100',
@@ -1524,7 +1524,7 @@
 	'S_BRIGHTEN'=>				'Brighten',
 
 //	reports.inc.php
-	'S_REPORTS_BAR_REPORT_DATE_FORMAT'=>	'd M Y H:i:s',
+	'S_REPORTS_BAR_REPORT_DATE_FORMAT'=>	'M d Y H:i:s',
 
 //	screenconf.php
 	'S_SCREENS'=>				'Screens',
@@ -2002,13 +2002,13 @@
 	'S_CANNOT_SWITCH_HOSTS'=>		'You can not switch hosts for current selection',
 
 //	popup_period.php
-	'S_POPUP_PERIOD_CAPTION_DATE_FORMAT'=>	'd M Y H:i:s',
+	'S_POPUP_PERIOD_CAPTION_DATE_FORMAT'=>	'M d Y H:i:s',
 
 //	blocks.inc.php
 	'S_BLOCKS_SYSTEM_SUMMARY_TIME_FORMAT'=>		'H:i:s',
 	'S_BLOCKS_HOSTSTAT_SUMMARY_TIME_FORMAT'=>	'H:i:s',
 	'S_BLOCKS_ZBX_STATUS_TIME_FORMAT'=>		'H:i:s',
-	'S_BLOCKS_LATEST_ISSUES_DATE_FORMAT'=>		'd M Y H:i:s',
+	'S_BLOCKS_LATEST_ISSUES_DATE_FORMAT'=>		'M d Y H:i:s',
 	'S_BLOCKS_LATEST_ISSUES_TIME_FORMAT'=>		'H:i:s',
 	'S_BLOCKS_WEBMON_TIME_FORMAT'=>			'H:i:s',
 	'S_BLOCKS_DISCOVERY_STATUS_TIME_FORMAT'=>	'H:i:s',
@@ -2105,7 +2105,7 @@
 	'S_ZETTA'=>		'Zetta',
 	'S_Y'=>			'Y',
 	'S_YOTTA'=>		'Yotta',
-	'S_FUNCT_UNIXTIMESTAMP_DATE_FORMAT'=>	'Y.m.d H:i:s',
+	'S_FUNCT_UNIXTIMESTAMP_DATE_FORMAT'=>	'Y-m-d H:i:s',
 
 //	forms.inc.php
 	'S_DELETE_SELECTED_USER_Q'=>		'Delete selected user?',
@@ -2191,9 +2191,9 @@
 	'S_IS_NOT_INTEGER_SMALL'=>			'is not integer',
 	'S_IS_NOT_DOUBLE_SMALL'=>			'is not double',
 	'S_IS_NOT_STRING_SMALL'=>			'is not string',
-	'S_CONTAINS_MULTIBYTE_CHARS_SMALL'=>		'contains Multibyte chars',
+	'S_CONTAINS_MULTIBYTE_CHARS_SMALL'=>		'contains multibyte chars',
 	'S_MULTIBYTE_CHARS_ARE_RESTRICTED_SMALL'=>	'multibyte chars are restricted',
-	'S_IS_NOT_A_COLOUR_SMALL'=>			'is not a colour',
+	'S_IS_NOT_A_COLOUR_SMALL'=>			'is not a color',
 	'S_IS_MANDATORY_SMALL'=>			'is mandatory',
 	'S_MUST_BE_MISSING_SMALL'=>			'must be missing',
 	'S_OPERATION_CANNOT_PERFORMED_UNAUTH_REQUEST'=>	'Operation cannot be performed due to unauthorized request',
@@ -2249,7 +2249,7 @@
 	'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_PLAIN_TEXT_DATE_FORMAT'=>		'd M Y H:i:s',
+	'S_SCREENS_PLAIN_TEXT_DATE_FORMAT'=>		'M d Y H:i:s',
 	'S_SCREENS_TRIGGER_FORM_DATE_FORMAT'=>		'[H:i:s]',
 
 //	graphs.inc.php
@@ -2275,7 +2275,7 @@
 	'S_OF_EVERY_SMALL'=>			'of every',
 	'S_WEEKS_SMALL'=>			'weeks',
 	'S_WEEK_SMALL'=>			'week',
-	'S_MAINTENANCES_SCHEDULE_DATE_FORMAT'=>	'd M Y',
+	'S_MAINTENANCES_SCHEDULE_DATE_FORMAT'=>	'M d Y',
 
 //	services.inc.php
 	'S_SERVICE_CANNOT_BE_PARENT_AND_CHILD_AT_THE_SAME_TIME'=>	'Service cannot be parent and child at the same time.',
@@ -2292,7 +2292,7 @@
 	'S_COULD_NOT_SAVE_IMAGE'=>		'Could not save image!',
 	'S_EXECUTE_SQL_ERROR'=>			'Execute SQL error',
 	'S_PARSE_SQL_ERROR'=>			'Parse SQL error',
-	'S_IMAGE_SIZE_MUST_BE_LESS_THAN_MB'=>	'Image size must be less than 1MB',
+	'S_IMAGE_SIZE_MUST_BE_LESS_THAN_MB'=>	'Image size must be less than 1 MB',
 	'S_SELECT_IMAGE_TO_DOWNLOAD'=>		'Select image to download',
 	'S_INCORRECT_IMAGE'=>			'Incorrect Image',
 
@@ -2302,7 +2302,7 @@
 	'S_INCORRECT_NODE_TYPE'=>				'Incorrect node type',
 	'S_NODE_WITH_SAME_ID_ALREADY_EXISTS'=>			'Node with same ID already exists',
 	'S_UNABLE_TO_REMOVE_LOCAL_NODE'=>			'Unable to remove local node',
-	'S_DATABASE_STILL_CONTAINS_DATA_RELATED_DELETED_NODE'=>	'Please be aware that database still contains data related to the deleted Node',
+	'S_DATABASE_STILL_CONTAINS_DATA_RELATED_DELETED_NODE'=>	'Please be aware that the database still contains data related to the deleted Node',
 
 //     requirements.inc.php
 	'S_PHP_VERSION' => 'PHP version',
@@ -2352,12 +2352,12 @@
 	'S_CUSER_ERROR_ONLY_SUPER_ADMIN_CAN_CREATE_USERS'=>		'Only Super Admins can create Users',
 	'S_CUSER_ERROR_ONLY_SUPER_ADMIN_CAN_UPDATE_USERS'=>		'Only Super Admins can update Users',
 	'S_CUSER_ERROR_ONLY_SUPER_ADMIN_CAN_DELETE_USERS'=>		'Only Super Admins can delete Users',
-	'S_CUSER_ERROR_ONLY_ADMIN_CAN_ADD_USER_MEDIAS'=>	'Only Zabbix Admins can add user Medias',
-	'S_CUSER_ERROR_ONLY_ADMIN_CAN_REMOVE_USER_MEDIAS'=>	'Only Zabbix Admins can remove user Medias',
-	'S_CUSER_ERROR_ONLY_ADMIN_CAN_CHANGE_USER_MEDIAS'=>	'Only Zabbix Admins can change user Medias',
-	'S_CUSER_ERROR_CANT_DELETE_USER_MEDIAS'=>		'Can\'t delete user medias',
-	'S_CUSER_ERROR_CANT_UPDATE_USER_MEDIAS'=>		'Can\'t update user medias',
-	'S_CUSER_ERROR_CANT_INSERT_USER_MEDIAS'=>		'Can\'t insert user medias',
+	'S_CUSER_ERROR_ONLY_ADMIN_CAN_ADD_USER_MEDIAS'=>	'Only Zabbix Admins can add user Media',
+	'S_CUSER_ERROR_ONLY_ADMIN_CAN_REMOVE_USER_MEDIAS'=>	'Only Zabbix Admins can remove user Media',
+	'S_CUSER_ERROR_ONLY_ADMIN_CAN_CHANGE_USER_MEDIAS'=>	'Only Zabbix Admins can change user Media',
+	'S_CUSER_ERROR_CANT_DELETE_USER_MEDIAS'=>		'Can\'t delete user media',
+	'S_CUSER_ERROR_CANT_UPDATE_USER_MEDIAS'=>		'Can\'t update user media',
+	'S_CUSER_ERROR_CANT_INSERT_USER_MEDIAS'=>		'Can\'t insert user media',
 	'S_CUSER_ERROR_WRONG_FIELD_FOR_USER'=>			'Wrong fields for user',
 	'S_CUSER_ERROR_USER_EXISTS_FIRST_PART'=>		'User [',
 	'S_CUSER_ERROR_USER_EXISTS_SECOND_PART'=>		'] already exists',
@@ -2376,8 +2376,8 @@
 	'S_CMEDIATYPE_ERROR_CANT_DELETE_MEDIATYPES'=>		'Can\'t delete media types',
 	'S_CMEDIATYPE_ERROR_CANT_UPDATE_MEDIATYPES'=>		'Can\'t update media types',
 	'S_CMEDIATYPE_ERROR_CANT_INSERT_MEDIATYPES'=>		'Can\'t insert media types',
-	'S_MEDIATYPE_ALREADY_EXISTS'=>				'Mediatype already exists:',
-	'S_MEDIATYPE_USED_BY_ACTIONS'=>	'Mediatypes used by action:',
+	'S_MEDIATYPE_ALREADY_EXISTS'=>				'Media type already exists:',
+	'S_MEDIATYPE_USED_BY_ACTIONS'=>	'Media types used by action:',
 	'S_CMEDIATYPE_ERROR_ONLY_SUPER_ADMIN_CAN_CREATE_MEDIATYPES'=>'Only Super Admins can create media types',
 	'S_CMEDIATYPE_ERROR_ONLY_SUPER_ADMIN_CAN_UPDATE_MEDIATYPES'=>'Only Super Admins can update media types',
 	'S_CMEDIATYPE_ERROR_ONLY_SUPER_ADMIN_CAN_DELETE_MEDIATYPES'=>'Only Super Admins can delete media types',
diff -ru zabbix-1.8.3.orig/frontends/php/include/locales/fr_fr.inc.php zabbix-1.8.3/frontends/php/include/locales/fr_fr.inc.php
--- zabbix-1.8.3.orig/frontends/php/include/locales/fr_fr.inc.php	2010-08-16 01:19:32.000000000 -0700
+++ zabbix-1.8.3/frontends/php/include/locales/fr_fr.inc.php	2010-09-02 14:45:52.397592006 -0700
@@ -1729,6 +1729,7 @@
 	'S_LANGUAGE'=>			'Langue',
 	'S_THEME'=>			'Thème',
 	'S_ENGLISH_GB'=>			'Anglais (GB)',
+	'S_ENGLISH_US'=>			'Anglais (US)',
 	'S_FRENCH_FR'=>			'Français (FR)',
 	'S_GERMAN_DE'=>			'Allemand (DE)',
 	'S_ITALIAN_IT'=>			'Italien (IT)',
diff -ru zabbix-1.8.3.orig/frontends/php/include/locales/hu_hu.inc.php zabbix-1.8.3/frontends/php/include/locales/hu_hu.inc.php
--- zabbix-1.8.3.orig/frontends/php/include/locales/hu_hu.inc.php	2010-08-16 01:19:32.000000000 -0700
+++ zabbix-1.8.3/frontends/php/include/locales/hu_hu.inc.php	2010-09-02 14:45:52.398591962 -0700
@@ -1547,6 +1547,7 @@
 	'S_LANGUAGE'=>			'Nyelv',
 	'S_THEME'=>			'Téma',
 	'S_ENGLISH_GB'=>			'Angol (GB)',
+	'S_ENGLISH_US'=>			'Angol (US)',
 	'S_FRENCH_FR'=>			'Francia (FR)',
 	'S_GERMAN_DE'=>			'Német (DE)',
 	'S_ITALIAN_IT'=>			'Olasz (IT)',
diff -ru zabbix-1.8.3.orig/frontends/php/include/locales/it_it.inc.php zabbix-1.8.3/frontends/php/include/locales/it_it.inc.php
--- zabbix-1.8.3.orig/frontends/php/include/locales/it_it.inc.php	2010-08-16 01:19:32.000000000 -0700
+++ zabbix-1.8.3/frontends/php/include/locales/it_it.inc.php	2010-09-02 14:45:52.398591962 -0700
@@ -409,6 +409,7 @@
 	'S_USER_PROFILE'=>			'Profilo utente',
 	'S_LANGUAGE'=>			'Lingua',
 	'S_ENGLISH_GB'=>			'Inglese (GB)',
+	'S_ENGLISH_US'=>			'Inglese (US)',
 	'S_FRENCH_FR'=>			'Francese (FR)',
 	'S_GERMAN_DE'=>			'Tedesco (DE)',
 	'S_ITALIAN_IT'=>			'Italiano (IT)',
diff -ru zabbix-1.8.3.orig/frontends/php/include/locales/ja_jp.inc.php zabbix-1.8.3/frontends/php/include/locales/ja_jp.inc.php
--- zabbix-1.8.3.orig/frontends/php/include/locales/ja_jp.inc.php	2010-08-16 01:19:32.000000000 -0700
+++ zabbix-1.8.3/frontends/php/include/locales/ja_jp.inc.php	2010-09-02 14:45:52.399342940 -0700
@@ -1729,6 +1729,7 @@
 	'S_LANGUAGE'=>			'言語',
 	'S_THEME'=>			'テーマ',
 	'S_ENGLISH_GB'=>			'英語 (GB)',
+	'S_ENGLISH_US'=>			'英語 (US)',
 	'S_FRENCH_FR'=>			'フランス語 (FR)',
 	'S_GERMAN_DE'=>			'ドイツ語 (DE)',
 	'S_ITALIAN_IT'=>			'イタリア語 (IT)',
diff -ru zabbix-1.8.3.orig/frontends/php/include/locales/ko_kr.inc.php zabbix-1.8.3/frontends/php/include/locales/ko_kr.inc.php
--- zabbix-1.8.3.orig/frontends/php/include/locales/ko_kr.inc.php	2010-08-16 01:19:32.000000000 -0700
+++ zabbix-1.8.3/frontends/php/include/locales/ko_kr.inc.php	2010-09-02 14:45:52.399342940 -0700
@@ -994,6 +994,7 @@
 	'S_USER_PROFILE'=>			'사용자 프로파일',
 	'S_LANGUAGE'=>				'언어',
 	'S_ENGLISH_GB'=>			'영어 (GB)',
+	'S_ENGLISH_US'=>			'영어 (US)',
 	'S_FRENCH_FR'=>				'프랑스어 (FR)',
 	'S_GERMAN_DE'=>				'독일어 (DE)',
 	'S_ITALIAN_IT'=>			'이탈리아어 (IT)',
diff -ru zabbix-1.8.3.orig/frontends/php/include/locales/lv_lv.inc.php zabbix-1.8.3/frontends/php/include/locales/lv_lv.inc.php
--- zabbix-1.8.3.orig/frontends/php/include/locales/lv_lv.inc.php	2010-08-16 01:19:32.000000000 -0700
+++ zabbix-1.8.3/frontends/php/include/locales/lv_lv.inc.php	2010-09-02 14:49:27.897039100 -0700
@@ -319,6 +319,7 @@
 	'S_USER_PROFILE'=>			'Lietotāja profils',
 	'S_LANGUAGE'=>			'Valoda',
 	'S_ENGLISH_GB'=>			'Angļu (GB)',
+	'S_ENGLISH_GB'=>			'Angļu (US)',
 	'S_FRENCH_FR'=>			'Franču (FR)',
 	'S_GERMAN_DE'=>			'Vācu (DE)',
 	'S_ITALIAN_IT'=>			'Itāļu (IT)',
diff -ru zabbix-1.8.3.orig/frontends/php/include/locales/nl_nl.inc.php zabbix-1.8.3/frontends/php/include/locales/nl_nl.inc.php
--- zabbix-1.8.3.orig/frontends/php/include/locales/nl_nl.inc.php	2010-08-16 01:19:32.000000000 -0700
+++ zabbix-1.8.3/frontends/php/include/locales/nl_nl.inc.php	2010-09-02 14:45:52.400467279 -0700
@@ -581,6 +581,7 @@
 	'S_USER_PROFILE'=>			'Gebruikers profiel',
 	'S_LANGUAGE'=>			'Taal',
 	'S_ENGLISH_GB'=>			'English (GB)',
+	'S_ENGLISH_US'=>			'English (US)',
 	'S_FRENCH_FR'=>			'French (FR)',
 	'S_GERMAN_DE'=>			'German (DE)',
 	'S_ITALIAN_IT'=>			'Italian (IT)',
diff -ru zabbix-1.8.3.orig/frontends/php/include/locales/pl_pl.inc.php zabbix-1.8.3/frontends/php/include/locales/pl_pl.inc.php
--- zabbix-1.8.3.orig/frontends/php/include/locales/pl_pl.inc.php	2010-08-16 01:19:32.000000000 -0700
+++ zabbix-1.8.3/frontends/php/include/locales/pl_pl.inc.php	2010-09-02 14:45:52.400467279 -0700
@@ -1149,6 +1149,7 @@
 	'S_LANGUAGE'=>					'Język',
 	'S_THEME'=>					'Motyw',
 	'S_ENGLISH_GB'=>				'Angielski (GB)',
+	'S_ENGLISH_US'=>				'Angielski (US)',
 	'S_FRENCH_FR'=>					'Francuski (FR)',
 	'S_GERMAN_DE'=>					'Niemiecki (DE)',
 	'S_ITALIAN_IT'=>				'Włoski (IT)',
diff -ru zabbix-1.8.3.orig/frontends/php/include/locales/pt_br.inc.php zabbix-1.8.3/frontends/php/include/locales/pt_br.inc.php
--- zabbix-1.8.3.orig/frontends/php/include/locales/pt_br.inc.php	2010-08-16 01:19:32.000000000 -0700
+++ zabbix-1.8.3/frontends/php/include/locales/pt_br.inc.php	2010-09-02 14:45:52.401467174 -0700
@@ -1724,6 +1724,7 @@
 	'S_LANGUAGE'=>			'Língua',
 	'S_THEME'=>			'Tema',
 	'S_ENGLISH_GB'=>			'Inglês (GB)',
+	'S_ENGLISH_US'=>			'Inglês (US)',
 	'S_FRENCH_FR'=>			'Francês (FR)',
 	'S_GERMAN_DE'=>			'Alemão (DE)',
 	'S_ITALIAN_IT'=>			'Italiano (IT)',
diff -ru zabbix-1.8.3.orig/frontends/php/include/locales/ru_ru.inc.php zabbix-1.8.3/frontends/php/include/locales/ru_ru.inc.php
--- zabbix-1.8.3.orig/frontends/php/include/locales/ru_ru.inc.php	2010-08-16 01:19:32.000000000 -0700
+++ zabbix-1.8.3/frontends/php/include/locales/ru_ru.inc.php	2010-09-02 14:45:52.401467174 -0700
@@ -1729,6 +1729,7 @@
 	'S_LANGUAGE'=>			'Язык',
 	'S_THEME'=>			'Тема',
 	'S_ENGLISH_GB'=>			'English (GB)',
+	'S_ENGLISH_US'=>			'English (US)',
 	'S_FRENCH_FR'=>			'French (FR)',
 	'S_GERMAN_DE'=>			'German (DE)',
 	'S_ITALIAN_IT'=>			'Italian (IT)',
diff -ru zabbix-1.8.3.orig/frontends/php/include/locales/sp_sp.inc.php zabbix-1.8.3/frontends/php/include/locales/sp_sp.inc.php
--- zabbix-1.8.3.orig/frontends/php/include/locales/sp_sp.inc.php	2010-08-16 01:19:32.000000000 -0700
+++ zabbix-1.8.3/frontends/php/include/locales/sp_sp.inc.php	2010-09-02 14:45:52.402467139 -0700
@@ -856,6 +856,7 @@
 	'S_USER_PROFILE'=>			'Perfil de usuario',
 	'S_LANGUAGE'=>			'Idioma',
 	'S_ENGLISH_GB'=>			'Inglés (GB)',
+	'S_ENGLISH_US'=>			'Inglés (US)',
 	'S_FRENCH_FR'=>			'Francés (FR)',
 	'S_GERMAN_DE'=>			'Alemán(DE)',
 	'S_ITALIAN_IT'=>			'Italiano (IT)',
diff -ru zabbix-1.8.3.orig/frontends/php/include/locales/sv_se.inc.php zabbix-1.8.3/frontends/php/include/locales/sv_se.inc.php
--- zabbix-1.8.3.orig/frontends/php/include/locales/sv_se.inc.php	2010-08-16 01:19:32.000000000 -0700
+++ zabbix-1.8.3/frontends/php/include/locales/sv_se.inc.php	2010-09-02 14:45:52.402467139 -0700
@@ -582,6 +582,7 @@
 	'S_USER_PROFILE'=>			'Användarprofil',
 	'S_LANGUAGE'=>			'Språk',
 	'S_ENGLISH_GB'=>			'Engelska (GB)',
+	'S_ENGLISH_US'=>			'Engelska (US)',
 	'S_FRENCH_FR'=>			'Franska (FR)',
 	'S_GERMAN_DE'=>			'Tyska (DE)',
 	'S_ITALIAN_IT'=>			'Italienska (IT)',
diff -ru zabbix-1.8.3.orig/frontends/php/include/locales/ua_ua.inc.php zabbix-1.8.3/frontends/php/include/locales/ua_ua.inc.php
--- zabbix-1.8.3.orig/frontends/php/include/locales/ua_ua.inc.php	2010-08-16 01:19:32.000000000 -0700
+++ zabbix-1.8.3/frontends/php/include/locales/ua_ua.inc.php	2010-09-02 14:50:16.042342419 -0700
@@ -1733,6 +1733,7 @@
 	'S_LANGUAGE'=>			'Мова',
 	'S_THEME'=>			'Тема інтерфейсу',
 	'S_ENGLISH_GB'=>			'Англійська (GB)',
+	'S_ENGLISH_GB'=>			'Англійська (US)',
 	'S_FRENCH_FR'=>			'Французька (FR)',
 	'S_GERMAN_DE'=>			'Німецька (DE)',
 	'S_ITALIAN_IT'=>			'Італійська (IT)',
diff -ru zabbix-1.8.3.orig/frontends/php/include/locales.inc.php zabbix-1.8.3/frontends/php/include/locales.inc.php
--- zabbix-1.8.3.orig/frontends/php/include/locales.inc.php	2010-08-16 01:19:33.000000000 -0700
+++ zabbix-1.8.3/frontends/php/include/locales.inc.php	2010-09-02 14:45:52.394469897 -0700
@@ -65,6 +65,7 @@
 		'cn_zh'=>  S_CHINESE_CN,
 		'cs_cz'=>  S_CZECH_CZ,
 		'nl_nl'=>  S_DUTCH_NL,
+		'en_us'=>  S_ENGLISH_US,
 		'fr_fr'=>  S_FRENCH_FR,
 		'de_de'=>  S_GERMAN_DE,
 		'hu_hu'=>  S_HUNGARIAN_HU,