Hello,
I'm sending this on behalf of the Japanese community.
The Font changes are in there because the UI font for Japanese is not MS P
Gothic, but MS UI Gothic (thus the name....)
ChangeLog:
Vik Kumar <vik@xxxxxxxxxx>
+dlls/comctl32/comctl_Ja.rc
Added Japanese translation.
+dlls/commdlg/cdlg_Ja.rc, dlls/user/resources/user32_Ja.rc, objects/gdiobj.c
Font changes from MS P Gothic to MS UI Gothic
+dlls/kernel/locale.c
Added eucJP in charset_entry
Let me know if I should split them up into 3 smaller patches, or if it is good
as is...
Cheers
Vik
diff -urN wine/dlls/comctl32/comctl_Ja.rc wine.ja/dlls/comctl32/comctl_Ja.rc
--- wine/dlls/comctl32/comctl_Ja.rc 1970-01-01 09:00:00.000000000 +0900
+++ wine.ja/dlls/comctl32/comctl_Ja.rc 2003-12-10 14:28:11.000000000 +0900
@@ -0,0 +1,86 @@
+/*
+ * Copyright 2003 Hajime Segawa
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT
+
+IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
+CAPTION "Properties for "
+FONT 9, "MS UI Gothic"
+BEGIN
+ DEFPUSHBUTTON "OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP
+ PUSHBUTTON "?L?????Z??", IDCANCEL,58,122,50,14
+ PUSHBUTTON "?K?p(&A)", IDC_APPLY_BUTTON,112,122,50,14,WS_DISABLED
+ PUSHBUTTON "?w???v", IDHELP,166,122,50,14,WS_TABSTOP|WS_GROUP
+ CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP,4,4,212,114
+END
+
+
+IDD_WIZARD DIALOG DISCARDABLE 0, 0, 290, 159
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
+CAPTION "Wizard"
+FONT 9, "MS UI Gothic"
+BEGIN
+ DEFPUSHBUTTON "?®?¹", IDC_FINISH_BUTTON,121,138,50,14
+ DEFPUSHBUTTON "?i?Þ(&N) >", IDC_NEXT_BUTTON,121,138,50,14
+ PUSHBUTTON "< ?ß?é(&B)", IDC_BACK_BUTTON,71,138,50,14
+ PUSHBUTTON "?L?????Z??", IDCANCEL,178,138,50,14
+ PUSHBUTTON "?w???v", IDHELP,235,138,50,14,WS_GROUP
+ LTEXT "", IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN
+ CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS | WS_DISABLED,7,7,258,5
+END
+
+
+IDD_TBCUSTOMIZE DIALOG DISCARDABLE 10, 20, 357, 125
+STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Customize Toolbar"
+FONT 9, "MS UI Gothic"
+BEGIN
+ DEFPUSHBUTTON "?Â?¶?é(&C)", IDCANCEL,308,6,44,14
+ PUSHBUTTON "???Z?b?g(R&)", IDC_RESET_BTN,308,23,44,14
+ PUSHBUTTON "?w???v(&H)", IDC_HELP_BTN,308,40,44,14
+ PUSHBUTTON "?ã?Ö (&U)", IDC_MOVEUP_BTN,308,74,44,14
+ PUSHBUTTON "?º?Ö (&D)", IDC_MOVEDN_BTN,308,91,44,14
+ LTEXT "A&vailable buttons:", -1,4,5,84,10
+ LISTBOX IDC_AVAILBTN_LBOX,4,17,120,100, LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
+ PUSHBUTTON "?Ç?Á(&A) ->", IDOK, 131, 42, 44, 14
+ PUSHBUTTON "<- ?í??(&R)", IDC_REMOVE_BTN,131,62,44,14
+ LTEXT "&Toolbar buttons:", -1,182,5,78,10
+ LISTBOX IDC_TOOLBARBTN_LBOX, 182,17,120,100,LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
+END
+
+STRINGTABLE DISCARDABLE
+{
+ IDS_CLOSE "Close"
+}
+
+STRINGTABLE DISCARDABLE
+{
+ IDM_TODAY "Today:"
+ IDM_GOTODAY "Go to today"
+}
+
+STRINGTABLE DISCARDABLE
+{
+ IDS_SEPARATOR "Separator"
+}
+
+STRINGTABLE DISCARDABLE
+{
+ HKY_NONE "None"
+}
diff -urN wine/dlls/comctl32/rsrc.rc wine.ja/dlls/comctl32/rsrc.rc
--- wine/dlls/comctl32/rsrc.rc 2003-12-06 15:37:29.000000000 +0900
+++ wine.ja/dlls/comctl32/rsrc.rc 2003-12-10 12:36:46.000000000 +0900
@@ -1061,6 +1061,7 @@
#include "comctl_Es.rc"
#include "comctl_Fr.rc"
#include "comctl_It.rc"
+#include "comctl_Ja.rc"
#include "comctl_Ko.rc"
#include "comctl_Nl.rc"
#include "comctl_Pl.rc"
diff -urN wine/dlls/commdlg/cdlg_Ja.rc wine.ja/dlls/commdlg/cdlg_Ja.rc
--- wine/dlls/commdlg/cdlg_Ja.rc 2003-12-06 15:37:29.000000000 +0900
+++ wine.ja/dlls/commdlg/cdlg_Ja.rc 2003-12-10 13:25:31.000000000 +0900
@@ -25,7 +25,7 @@
OPEN_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "?t?@?C???ð?J?"
-FONT 8, "?l?r ?o?S?V?b?N"
+FONT 8, "?l?r UI ?S?V?b?N"
{
LTEXT "?t?@?C???¼(&N):", 1090, 6, 6, 76, 9
EDITTEXT 1152, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP
@@ -47,7 +47,7 @@
SAVE_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "?¼?O?ð?Â?¯?Ä?Û?¶"
-FONT 8, "?l?r ?o?S?V?b?N"
+FONT 8, "?l?r UI ?S?V?b?N"
{
LTEXT "?t?@?C???¼(&N):", 1090, 6, 6, 76, 9
EDITTEXT 1152, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP
@@ -69,7 +69,7 @@
PRINT DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 264, 134
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "?ó?ü"
-FONT 8, "?l?r ?o?S?V?b?N"
+FONT 8, "?l?r UI ?S?V?b?N"
{
LTEXT "?g?p?·?éÌßØÝÀ:", 1088, 6, 6, 40, 9
LTEXT "?Ê?í?g?¤ÌßØÝÀ", 1089, 60, 6, 150, 9
@@ -92,7 +92,7 @@
PRINT_SETUP DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 264, 134
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "?v?????^?Ì?Ý?è"
-FONT 8, "?l?r ?o?S?V?b?N"
+FONT 8, "?l?r UI ?S?V?b?N"
{
GROUPBOX "?v?????^?Ì?I?ð", 1072, 6, 10, 180, 65, BS_GROUPBOX
RADIOBUTTON "?Ê?í?g?¤?v?????^(&D)", 1056, 16, 20, 80, 12
@@ -118,7 +118,7 @@
CHOOSE_FONT DIALOG DISCARDABLE 13, 54, 264, 147
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "?t?H???g?Ì?w?è"
-FONT 8, "?l?r ?o?S?V?b?N"
+FONT 8, "?l?r UI ?S?V?b?N"
{
LTEXT "Ì«ÝÄ?¼(&F):",1088 ,6,3,40,9
COMBOBOX 1136 ,6,13,94,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL |
@@ -150,7 +150,7 @@
CHOOSE_COLOR DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 300, 185
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "?F?Ì?Ý?è"
-FONT 8, "?l?r ?o?S?V?b?N"
+FONT 8, "?l?r UI ?S?V?b?N"
{
LTEXT "?î?{?F(&B):", 1088, 4, 4, 140, 10
LTEXT "?ì?¬?µ?½?F(&C):", 1089, 4, 106, 140, 10
@@ -184,7 +184,7 @@
FINDDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 236, 62
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "?¶???ñ?Ì???õ"
-FONT 8, "?l?r ?o?S?V?b?N"
+FONT 8, "?l?r UI ?S?V?b?N"
{
LTEXT "???õ?·?é?¶???ñ(&N):", -1, 4, 8, 42, 8
EDITTEXT 1152, 47, 7, 128, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
@@ -203,7 +203,7 @@
REPLACEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 230, 94
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "?¶???ñ?Ì?u?·"
-FONT 8, "?l?r ?o?S?V?b?N"
+FONT 8, "?l?r UI ?S?V?b?N"
{
LTEXT "?u?·?O?Ì?¶???ñ(&N):", -1, 4, 9, 48, 8
EDITTEXT 1152, 54, 7, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
@@ -224,7 +224,7 @@
STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU |
DS_CONTEXTHELP | DS_3DLOOK
CAPTION "?ó?ü"
-FONT 8, "?l?r ?o?S?V?b?N"
+FONT 8, "?l?r UI ?S?V?b?N"
{
DEFPUSHBUTTON "OK", IDOK, 180,164, 48,14, WS_GROUP | BS_DEFPUSHBUTTON
PUSHBUTTON "·¬Ý¾Ù", IDCANCEL, 232,164, 48,14, WS_GROUP
@@ -264,7 +264,7 @@
STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU |
DS_CONTEXTHELP | DS_3DLOOK
CAPTION "?ó?ü?Ì?Ý?è"
-FONT 8, "?l?r ?o?S?V?b?N"
+FONT 8, "?l?r UI ?S?V?b?N"
BEGIN
DEFPUSHBUTTON "OK",IDOK,180,156,48,14,WS_GROUP
PUSHBUTTON "Cancel",IDCANCEL,232,156,48,14
@@ -298,7 +298,7 @@
NEWFILEOPENORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 280, 164
STYLE DS_MODALFRAME | DS_CONTEXTHELP | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_CLIPCHILDREN
CAPTION "̧²Ù?ð?J?"
-FONT 8, "?l?r ?o?S?V?b?N"
+FONT 8, "?l?r UI ?S?V?b?N"
{
LTEXT "̧²Ù?Ì?ê??(&I):",IDC_LOOKINSTATIC,5,6,52,8, SS_NOTIFY
COMBOBOX IDC_LOOKIN,56,3,132,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
diff -urN wine/dlls/kernel/locale.c wine.ja/dlls/kernel/locale.c
--- wine/dlls/kernel/locale.c 2003-12-06 15:37:29.000000000 +0900
+++ wine.ja/dlls/kernel/locale.c 2003-12-10 13:22:03.000000000 +0900
@@ -71,6 +71,7 @@
{ "CP1256", 1256 },
{ "CP1257", 1257 },
{ "CP1258", 1258 },
+ { "eucJP", 20932 },
{ "IBM037", 37 },
{ "IBM1026", 1026 },
{ "IBM424", 424 },
diff -urN wine/dlls/user/resources/user32_Ja.rc wine.ja/dlls/user/resources/user32_Ja.rc
--- wine/dlls/user/resources/user32_Ja.rc 2002-06-01 11:55:50.000000000 +0900
+++ wine.ja/dlls/user/resources/user32_Ja.rc 2003-12-10 12:38:41.000000000 +0900
@@ -51,7 +51,7 @@
MSGBOX DIALOG 100, 80, 216, 168
STYLE DS_SYSMODAL | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-FONT 8, "?l?r ?o?S?V?b?N"
+FONT 8, "?l?r UI ?S?V?b?N"
BEGIN
ICON "", 1088, 8, 20, 16, 16, WS_CHILD | WS_VISIBLE
LTEXT "", 100, 32, 4, 176, 48, WS_CHILD | WS_VISIBLE | WS_GROUP
diff -urN wine/objects/gdiobj.c wine.ja/objects/gdiobj.c
--- wine/objects/gdiobj.c 2003-11-25 14:03:09.000000000 +0900
+++ wine.ja/objects/gdiobj.c 2003-12-10 13:27:32.000000000 +0900
@@ -354,7 +354,7 @@
{ /* DefaultGuiFont */
-11, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, SHIFTJIS_CHARSET,
0, 0, DEFAULT_QUALITY, VARIABLE_PITCH | FF_SWISS,
- {'M','S',' ','P','G','o','t','h','i','c','\0'}
+ {'M','S',' ','U','I',' ','G','o','t','h','i','c','\0'}
},
},
{ GB2312_CHARSET,
