diff options
| -rw-r--r-- | chrome/app/chrome_dll_resource.h | 1 | ||||
| -rw-r--r-- | chrome/app/resources/locale_settings_he.xtb | 4 | ||||
| -rw-r--r-- | chrome/browser/browser.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/character_encoding.cc | 10 | ||||
| -rw-r--r-- | chrome/browser/encoding_menu_controller_delegate.cc | 1 |
5 files changed, 12 insertions, 6 deletions
diff --git a/chrome/app/chrome_dll_resource.h b/chrome/app/chrome_dll_resource.h index 7b70101..ec823a5 100644 --- a/chrome/app/chrome_dll_resource.h +++ b/chrome/app/chrome_dll_resource.h @@ -122,6 +122,7 @@ #define IDC_ENCODING_ISO88598 35040 #define IDC_ENCODING_WINDOWS1255 35041 #define IDC_ENCODING_WINDOWS1258 35042 +#define IDC_ENCODING_ISO88598I 35043 // Clipboard commands #define IDC_CUT 36000 diff --git a/chrome/app/resources/locale_settings_he.xtb b/chrome/app/resources/locale_settings_he.xtb index f14f418..68c3f76 100644 --- a/chrome/app/resources/locale_settings_he.xtb +++ b/chrome/app/resources/locale_settings_he.xtb @@ -25,7 +25,7 @@ <translation id="IDS_CLEARDATA_DIALOG_HEIGHT_LINES">15.5</translation> <translation id="IDS_IMPORT_DIALOG_WIDTH_CHARS">60</translation> <translation id="IDS_IMPORT_DIALOG_HEIGHT_LINES">14</translation> -<translation id="IDS_ABOUT_DIALOG_WIDTH_CHARS">83</translation> +<translation id="IDS_ABOUT_DIALOG_WIDTH_CHARS">70</translation> <translation id="IDS_ABOUT_DIALOG_MINIMUM_HEIGHT_LINES">4</translation> <translation id="IDS_FONTSLANG_DIALOG_WIDTH_CHARS">97</translation> <translation id="IDS_FONTSLANG_DIALOG_HEIGHT_LINES">26</translation> @@ -50,7 +50,7 @@ <translation id="IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES">8</translation> <translation id="IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS">93</translation> <translation id="IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES">12</translation> -<translation id="IDS_STATIC_ENCODING_LIST">ISO-8859-8,windows-1255,ISO-8859-1</translation> +<translation id="IDS_STATIC_ENCODING_LIST">windows-1255,ISO-8859-8-I,ISO-8859-8,ISO-8859-1</translation> <translation id="IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS">150</translation> <translation id="IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES">40</translation> <translation id="IDS_DOWNLOAD_BIG_PROGRESS_SIZE">52</translation> diff --git a/chrome/browser/browser.cc b/chrome/browser/browser.cc index 81067b0..4e28196 100644 --- a/chrome/browser/browser.cc +++ b/chrome/browser/browser.cc @@ -1175,6 +1175,7 @@ void Browser::ExecuteCommand(int id) { case IDC_ENCODING_ISO88596: case IDC_ENCODING_WINDOWS1256: case IDC_ENCODING_ISO88598: + case IDC_ENCODING_ISO88598I: case IDC_ENCODING_WINDOWS1255: case IDC_ENCODING_WINDOWS1258: OverrideEncoding(id); break; @@ -1986,6 +1987,7 @@ void Browser::InitCommandState() { command_updater_.UpdateCommandEnabled(IDC_ENCODING_ISO88596, true); command_updater_.UpdateCommandEnabled(IDC_ENCODING_WINDOWS1256, true); command_updater_.UpdateCommandEnabled(IDC_ENCODING_ISO88598, true); + command_updater_.UpdateCommandEnabled(IDC_ENCODING_ISO88598I, true); command_updater_.UpdateCommandEnabled(IDC_ENCODING_WINDOWS1255, true); command_updater_.UpdateCommandEnabled(IDC_ENCODING_WINDOWS1258, true); diff --git a/chrome/browser/character_encoding.cc b/chrome/browser/character_encoding.cc index 74086fc..035d6e1 100644 --- a/chrome/browser/character_encoding.cc +++ b/chrome/browser/character_encoding.cc @@ -53,10 +53,11 @@ static CanonicalEncodingData canonical_encoding_names[] = { { IDC_ENCODING_ISO88597, L"ISO-8859-7", IDS_ENCODING_GREEK }, { IDC_ENCODING_WINDOWS1253, L"windows-1253", IDS_ENCODING_GREEK }, { IDC_ENCODING_WINDOWS1254, L"windows-1254", IDS_ENCODING_TURKISH }, - { IDC_ENCODING_ISO88596, L"ISO-8859-6", IDS_ENCODING_ARABIC }, { IDC_ENCODING_WINDOWS1256, L"windows-1256", IDS_ENCODING_ARABIC }, - { IDC_ENCODING_ISO88598, L"ISO-8859-8", IDS_ENCODING_HEBREW }, + { IDC_ENCODING_ISO88596, L"ISO-8859-6", IDS_ENCODING_ARABIC }, { IDC_ENCODING_WINDOWS1255, L"windows-1255", IDS_ENCODING_HEBREW }, + { IDC_ENCODING_ISO88598I, L"ISO-8859-8-I", IDS_ENCODING_HEBREW }, + { IDC_ENCODING_ISO88598, L"ISO-8859-8", IDS_ENCODING_HEBREW }, { IDC_ENCODING_WINDOWS1258, L"windows-1258", IDS_ENCODING_VIETNAMESE }, { IDC_ENCODING_ISO88594, L"ISO-8859-4", IDS_ENCODING_BALTIC }, { IDC_ENCODING_ISO885913, L"ISO-8859-13", IDS_ENCODING_BALTIC }, @@ -156,10 +157,11 @@ const int default_encoding_menus[] = { IDC_ENCODING_ISO88597, IDC_ENCODING_WINDOWS1253, IDC_ENCODING_WINDOWS1254, - IDC_ENCODING_ISO88596, IDC_ENCODING_WINDOWS1256, - IDC_ENCODING_ISO88598, + IDC_ENCODING_ISO88596, IDC_ENCODING_WINDOWS1255, + IDC_ENCODING_ISO88598I, + IDC_ENCODING_ISO88598, IDC_ENCODING_WINDOWS1258, IDC_ENCODING_ISO88594, IDC_ENCODING_ISO885913, diff --git a/chrome/browser/encoding_menu_controller_delegate.cc b/chrome/browser/encoding_menu_controller_delegate.cc index 9f3daeb..d40c110 100644 --- a/chrome/browser/encoding_menu_controller_delegate.cc +++ b/chrome/browser/encoding_menu_controller_delegate.cc @@ -69,6 +69,7 @@ bool EncodingMenuControllerDelegate::IsItemChecked(int id) const { case IDC_ENCODING_ISO88596: case IDC_ENCODING_WINDOWS1256: case IDC_ENCODING_ISO88598: + case IDC_ENCODING_ISO88598I: case IDC_ENCODING_WINDOWS1255: case IDC_ENCODING_WINDOWS1258: return (!encoding.empty() && encoding == |