Index: base/applications/charmap/charmap.c =================================================================== --- base/applications/charmap/charmap.c (revision 58557) +++ base/applications/charmap/charmap.c (working copy) @@ -388,9 +388,18 @@ WPARAM wParam, LPARAM lParam) { + UINT i; + CHAR szBuf[128]; + switch(Message) { case WM_INITDIALOG: + for (i = IDS_CS_UNICODE; i <= IDS_CS_WIN_TRADITIONAL_CHINESE; i++) + { + LoadStringA(hInstance, i, szBuf, 128); + SendDlgItemMessageA(hDlg, IDC_COMBO_CHARSET, CB_ADDSTRING, 0, (LPARAM)szBuf); + } + SendDlgItemMessageA(hDlg, IDC_COMBO_CHARSET, CB_SETCURSEL, 0, 0); return TRUE; default: Index: base/applications/charmap/lang/en-US.rc =================================================================== --- base/applications/charmap/lang/en-US.rc (revision 58557) +++ base/applications/charmap/lang/en-US.rc (working copy) @@ -20,9 +20,9 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Charset:",IDC_STATIC,8,8,48,8 - COMBOBOX IDC_COMBO_CHARSET,72,4,116,80,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_COMBO_CHARSET,72,4,116,200,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "Group by:",IDC_STATIC,8,28,50,8 - COMBOBOX IDC_COMBO_GROUPBY,72,24,116,80,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_COMBO_GROUPBY,72,24,116,200,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Search",IDC_BUTTON_SEARCH,200,44,50,14 EDITTEXT IDC_EDIT_SEARCH,72,44,116,14,ES_AUTOHSCROLL LTEXT "Search for:",IDC_STATIC,8,48,42,8 @@ -46,4 +46,30 @@ IDS_LICENSE "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA." IDS_ABOUT "A&bout..." IDS_TITLE "Character Map" + + IDS_CS_UNICODE "Unicode" + IDS_CS_DOS_ARABIC "DOS: Arabic" + IDS_CS_DOS_GREEK "DOS: Greek" + IDS_CS_DOS_CYRILLIC "DOS: Cyrillic" + IDS_CS_DOS_CYRILLIC_II "DOS: Cyrillic II" + IDS_CS_DOS_TURKISH "DOS: Turkish" + IDS_CS_DOS_BALTIC "DOS: Baltic" + IDS_CS_DOS_HEBREW "DOS: Hebrew" + IDS_CS_DOS_ENGLISH_US "DOS: English (US)" + IDS_CS_DOS_WESTERN_EUROPEAN "DOS: Western European" + IDS_CS_DOS_CENTRAL_EUROPEAN "DOS: Central European" + IDS_CS_WIN_ARABIC "Windows: Arabic" + IDS_CS_WIN_GREEK "Windows: Greek" + IDS_CS_WIN_CYRILLIC "Windows: Cyrillic" + IDS_CS_WIN_THAI "Windows: Thai" + IDS_CS_WIN_TURKISH "Windows: Turkish" + IDS_CS_WIN_BALTIC "Windows: Baltic" + IDS_CS_WIN_VIETNAMESE "Windows: Vietnamese" + IDS_CS_WIN_HEBREW "Windows: Hebrew" + IDS_CS_WIN_EUROPEAN "Windows: European" + IDS_CS_WIN_SIMPLIFIED_CHINESE "Windows: Simplified Chinese" + IDS_CS_WIN_KOREAN "Windows: Korean" + IDS_CS_WIN_CENTRAL_EUROPEAN "Windows: Central European" + IDS_CS_WIN_JAPANESE "Windows: Japanese" + IDS_CS_WIN_TRADITIONAL_CHINESE "Windows: Traditional Chinese" END Index: base/applications/charmap/lang/ja-JP.rc =================================================================== --- base/applications/charmap/lang/ja-JP.rc (revision 58557) +++ base/applications/charmap/lang/ja-JP.rc (working copy) @@ -20,9 +20,9 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Charset:",IDC_STATIC,8,8,48,8 - COMBOBOX IDC_COMBO_CHARSET,72,4,116,80,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_COMBO_CHARSET,72,4,116,200,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "Group by:",IDC_STATIC,8,28,50,8 - COMBOBOX IDC_COMBO_GROUPBY,72,24,116,80,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_COMBO_GROUPBY,72,24,116,200,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Search",IDC_BUTTON_SEARCH,200,44,50,14 EDITTEXT IDC_EDIT_SEARCH,72,44,116,14,ES_AUTOHSCROLL LTEXT "Search for:",IDC_STATIC,8,48,42,8 @@ -46,4 +46,30 @@ IDS_LICENSE "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA." IDS_ABOUT "バージョン情報(&B)..." IDS_TITLE "Character Map" + + IDS_CS_UNICODE "Unicode" + IDS_CS_DOS_ARABIC "DOS: アラビア語" + IDS_CS_DOS_GREEK "DOS: ギリシャ語" + IDS_CS_DOS_CYRILLIC "DOS: キリル言語" + IDS_CS_DOS_CYRILLIC_II "DOS: キリル言語 II" + IDS_CS_DOS_TURKISH "DOS: トルコ語" + IDS_CS_DOS_BALTIC "DOS: バルト言語" + IDS_CS_DOS_HEBREW "DOS: ヘブライ語" + IDS_CS_DOS_ENGLISH_US "DOS: 英語（US）" + IDS_CS_DOS_WESTERN_EUROPEAN "DOS: 西ヨーロッパ言語" + IDS_CS_DOS_CENTRAL_EUROPEAN "DOS: 中央ヨーロッパ言語" + IDS_CS_WIN_ARABIC "Windows: アラビア語" + IDS_CS_WIN_GREEK "Windows: ギリシャ語" + IDS_CS_WIN_CYRILLIC "Windows: キリル言語" + IDS_CS_WIN_THAI "Windows: タイ語" + IDS_CS_WIN_TURKISH "Windows: トルコ語" + IDS_CS_WIN_BALTIC "Windows: バルト言語" + IDS_CS_WIN_VIETNAMESE "Windows: ベトナム語" + IDS_CS_WIN_HEBREW "Windows: ヘブライ語" + IDS_CS_WIN_EUROPEAN "Windows: 欧文" + IDS_CS_WIN_SIMPLIFIED_CHINESE "Windows: 簡体字中国語" + IDS_CS_WIN_KOREAN "Windows: 韓国語" + IDS_CS_WIN_CENTRAL_EUROPEAN "Windows: 中央ヨーロッパ言語" + IDS_CS_WIN_JAPANESE "Windows: 日本語" + IDS_CS_WIN_TRADITIONAL_CHINESE "Windows: 繁体字中国語" END Index: base/applications/charmap/resource.h =================================================================== --- base/applications/charmap/resource.h (revision 58557) +++ base/applications/charmap/resource.h (working copy) @@ -28,3 +28,29 @@ #define IDS_LICENSE 1010 #define IDS_ABOUT 1011 #define IDS_TITLE 1012 + +#define IDS_CS_UNICODE 2000 +#define IDS_CS_DOS_ARABIC 2001 +#define IDS_CS_DOS_GREEK 2002 +#define IDS_CS_DOS_CYRILLIC 2003 +#define IDS_CS_DOS_CYRILLIC_II 2004 +#define IDS_CS_DOS_TURKISH 2005 +#define IDS_CS_DOS_BALTIC 2006 +#define IDS_CS_DOS_HEBREW 2007 +#define IDS_CS_DOS_ENGLISH_US 2008 +#define IDS_CS_DOS_WESTERN_EUROPEAN 2009 +#define IDS_CS_DOS_CENTRAL_EUROPEAN 2010 +#define IDS_CS_WIN_ARABIC 2011 +#define IDS_CS_WIN_GREEK 2012 +#define IDS_CS_WIN_CYRILLIC 2013 +#define IDS_CS_WIN_THAI 2014 +#define IDS_CS_WIN_TURKISH 2015 +#define IDS_CS_WIN_BALTIC 2016 +#define IDS_CS_WIN_VIETNAMESE 2017 +#define IDS_CS_WIN_HEBREW 2018 +#define IDS_CS_WIN_EUROPEAN 2019 +#define IDS_CS_WIN_SIMPLIFIED_CHINESE 2020 +#define IDS_CS_WIN_KOREAN 2021 +#define IDS_CS_WIN_CENTRAL_EUROPEAN 2022 +#define IDS_CS_WIN_JAPANESE 2023 +#define IDS_CS_WIN_TRADITIONAL_CHINESE 2024