Oops.
Sorry about that.
Here it is again.
Cheers,
Vik
---
On Wednesday 17 December 2003 18:40, Michael Stefaniuc wrote:
> could you please resubmit your diff using the unified output format? See
> http://www.winehq.org/site/sending_patches for details.
---- Original Message ----
Hi,
May last patch had some wrong font names for Japanese resource files.
The correct name for MS UI Gothic is 'Gothic' in English, and not 'Gothic'
in Japanese.
Changelog
+ fixed MS UI Gothic Font names in:
dlls/commdlg/cdlg_Ja.rc
dlls/user/resources/user32_Ja.rc
Cheers,
Vik
diff -rNu wine/dlls/commdlg/cdlg_Ja.rc wine.ja/dlls/commdlg/cdlg_Ja.rc
--- wine/dlls/commdlg/cdlg_Ja.rc 2003-12-12 15:38:35.000000000 +0900
+++ wine.ja/dlls/commdlg/cdlg_Ja.rc 2003-12-17 11:55:45.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 UI ?S?V?b?N"
+FONT 9, "MS UI Gothic"
{
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 UI ?S?V?b?N"
+FONT 9, "MS UI Gothic"
{
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 UI ?S?V?b?N"
+FONT 9, "MS UI Gothic"
{
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 UI ?S?V?b?N"
+FONT 9, "MS UI Gothic"
{
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 UI ?S?V?b?N"
+FONT 9, "MS UI Gothic"
{
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 UI ?S?V?b?N"
+FONT 9, "MS UI Gothic"
{
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 UI ?S?V?b?N"
+FONT 9, "MS UI Gothic"
{
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 UI ?S?V?b?N"
+FONT 9, "MS UI Gothic"
{
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 UI ?S?V?b?N"
+FONT 9, "MS UI Gothic"
{
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 UI ?S?V?b?N"
+FONT 9, "MS UI Gothic"
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 UI ?S?V?b?N"
+FONT 9, "MS UI Gothic"
{
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 -rNu wine/dlls/user/resources/user32_Ja.rc wine.ja/dlls/user/resources/user32_Ja.rc
--- wine/dlls/user/resources/user32_Ja.rc 2003-12-12 15:38:36.000000000 +0900
+++ wine.ja/dlls/user/resources/user32_Ja.rc 2003-12-17 11:55:45.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 UI ?S?V?b?N"
+FONT 9, "MS UI Gothic"
BEGIN
ICON "", 1088, 8, 20, 16, 16, WS_CHILD | WS_VISIBLE
LTEXT "", 100, 32, 4, 176, 48, WS_CHILD | WS_VISIBLE | WS_GROUP
