diff --git a/dlls/commdlg/cdlg_Ja.rc b/dlls/commdlg/cdlg_Ja.rc
new file mode 100644
index 0000000000000000000000000000000000000000..746921106b5b7fede9ddfceb96012ceb446add14
--- /dev/null
+++ b/dlls/commdlg/cdlg_Ja.rc
@@ -0,0 +1,318 @@
+LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT
+
+OPEN_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "ファイルを開く"
+FONT 8, "System"
+{
+ LTEXT "ファイル名(&N):", 1090, 6, 6, 76, 9
+ EDITTEXT 1152, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP
+ LISTBOX 1120, 6, 32, 90, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
+ LTEXT "ディレクトリ(&D):", -1, 110, 6, 92, 9
+ LTEXT "", 1088, 110, 18, 92, 9, SS_NOPREFIX | WS_GROUP
+ LISTBOX 1121, 110, 32, 92, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
+ LTEXT "ファイルの種類(&T):", 1089, 6, 104, 90, 9
+ COMBOBOX 1136, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ LTEXT "ドライブ(&V):", 1091, 110, 104, 92, 9
+ COMBOBOX 1137, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ DEFPUSHBUTTON "OK", 1, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "キャンセル", 2, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "ヘルプ(&H)", 1038, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP
+ CHECKBOX "上書き禁止(&R)", 1040, 208, 68, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+}
+
+
+SAVE_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "名前をつけて保存"
+FONT 8, "System"
+{
+ LTEXT "ファイル名(&N):", 1090, 6, 6, 76, 9
+ EDITTEXT 1152, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP
+ LISTBOX 1120, 6, 32, 90, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
+ LTEXT "ディレクトリ(&D):", -1, 110, 6, 92, 9
+ LTEXT "", 1088, 110, 18, 92, 9, SS_NOPREFIX | WS_GROUP
+ LISTBOX 1121, 110, 32, 92, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
+ LTEXT "ファイルの種類(&T):", 1089, 6, 104, 90, 9
+ COMBOBOX 1136, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ LTEXT "ドライブ(&V):", 1091, 110, 104, 92, 9
+ COMBOBOX 1137, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ DEFPUSHBUTTON "OK", 1, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "キャンセル", 2, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "ヘルプ(&H)", 1038, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP
+ CHECKBOX "上書き禁止(&R)", 1040, 208, 68, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+}
+
+
+PRINT DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 264, 134
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "印刷"
+FONT 8, "System"
+{
+ LTEXT "使用するプリンタ:", 1088, 6, 6, 40, 9
+ LTEXT "通常使うプリンタ", 1089, 60, 6, 150, 9
+ GROUPBOX "印刷範囲の選択", 1072, 6, 30, 160, 65, BS_GROUPBOX
+ RADIOBUTTON "全ページ(&A)", 1056, 16, 45, 60, 12
+ RADIOBUTTON "選択した部分(&E)", 1057, 16, 60, 60, 12
+ RADIOBUTTON "ページ指定(&P)", 1058, 16, 75, 60, 12
+ DEFPUSHBUTTON "OK", 1, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "キャンセル", 2, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "プリンタの設定(&S)", 1024, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP
+ LTEXT "ページから(&F):", 1090, 60, 80, 30, 9
+ LTEXT "ページまで(&T):", 1091, 120, 80, 30, 9
+ LTEXT "印字品質(&Q):", 1092, 6, 100, 76, 9
+ COMBOBOX 1136, 80, 100, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ CHECKBOX "ファイルへ出力(&L)", 1040, 20, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+ CHECKBOX "Condensed", 1041, 160, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+}
+
+
+PRINT_SETUP DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 264, 134
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "プリンタの設定"
+FONT 8, "System"
+{
+ GROUPBOX "プリンタの選択", 1072, 6, 10, 180, 65, BS_GROUPBOX
+ RADIOBUTTON "通常使うプリンタ(&D)", 1056, 16, 20, 80, 12
+ LTEXT "(通常使うプリンタが設定されていません)", 1088, 35, 35, 120, 9
+ RADIOBUTTON "その他のプリンタ(&P)", 1057, 16, 50, 80, 12
+ COMBOBOX 1136, 35, 65, 149, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ DEFPUSHBUTTON "OK", 1, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "キャンセル", 2, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&Setup", 1024, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP
+ GROUPBOX "印刷の向き", 1073, 6, 85, 100, 50, BS_GROUPBOX
+ RADIOBUTTON "縦(&R)", 1058, 50, 100, 40, 12
+ RADIOBUTTON "横(&L)", 1059, 50, 115, 40, 12
+ ICON "LANDSCAP", 1097, 10, 95, 32, 32
+ ICON "PORTRAIT", 1098, 10, 95, 32, 32
+ GROUPBOX "用紙の選択", 1074, 120, 85, 180, 50, BS_GROUPBOX
+ LTEXT "用紙サイズ(&Z)", 1089, 130, 95, 30, 9
+ LTEXT "給紙方法(&S)", 1090, 130, 110, 30, 9
+ COMBOBOX 1137, 155, 95, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ COMBOBOX 1138, 155, 110, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+}
+
+
+CHOOSE_FONT DIALOG DISCARDABLE  13, 54, 264, 147
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "フォントの指定"
+FONT 8, "System"
+{
+    LTEXT           "フォント名(&F):",1088 ,6,3,40,9
+    COMBOBOX        1136 ,6,13,94,54,  CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL |
+                    CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE
+    LTEXT           "スタイル(&Y):",1089 ,108,3,44,9
+    COMBOBOX        1137,108,13,64,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL |
+                    WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE
+    LTEXT           "サイズ(&S):",1090,179,3,30,9
+    COMBOBOX        1138,179,13,32,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL |
+                    WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE | CBS_SORT
+    DEFPUSHBUTTON   "OK",IDOK,218,6,40,14,WS_GROUP
+    PUSHBUTTON      "キャンセル",IDCANCEL,218,23,40,14,WS_GROUP
+    PUSHBUTTON      "文字飾り(&A)", 1026,218,40,40,14,WS_GROUP
+    PUSHBUTTON      "ヘルプ(&H)" , 1038,218,57,40,14,WS_GROUP
+    GROUPBOX        "文字飾り",1072,6,72,84,34,WS_GROUP
+    CHECKBOX	    "取り消し線(&K)", 1040, 10,82,50,10, BS_AUTOCHECKBOX | WS_TABSTOP
+    CHECKBOX 	    "下線(&U)", 1041, 10,94,50,10, BS_AUTOCHECKBOX 
+    LTEXT           "色(&C):", 1091 ,6,110,30,9
+    COMBOBOX        1139,6,120,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS |
+		    CBS_AUTOHSCROLL |  WS_BORDER | WS_VSCROLL | WS_TABSTOP
+    GROUPBOX        "サンプル",1073,98,72,160,49,WS_GROUP
+    CTEXT           "AaBbYyZz",1093,104,81,149,37,SS_NOPREFIX | WS_VISIBLE
+}
+
+
+CHOOSE_COLOR DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 300, 200
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "色の設定"
+FONT 8, "System"
+{
+ LTEXT "基本色(&B):",   1088, 4,    4,  140, 10
+ LTEXT "作成した色(&C):",  1089, 4,   106, 140, 10
+ LTEXT "色 |",  1090, 150, 151,  48, 10
+ LTEXT   "赤(&R):", 726 /*1094*/,249,126,24,10
+ EDITTEXT 706, 275,124,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ LTEXT   "緑(&G):",727/*1095*/,249,140,24,10
+ EDITTEXT 707, 275,138,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ LTEXT   "青(&B):",728 /*1096*/,249,154,24,10
+ EDITTEXT 708, 275,152,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ LTEXT  "色合い(&U):" ,723 /*1091*/,202,126,22,10
+ EDITTEXT 703, 226,124,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ LTEXT  "鮮やかさ(&S):" ,724 /*1092*/,202,140,22,10
+ EDITTEXT 704, 226,138,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ LTEXT  "明るさ(&L):" ,725 /*1093*/,202,154,22,10
+ EDITTEXT 705, 226,152,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ CONTROL "" ,720,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,14,140,86
+ CONTROL "" ,721,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,116,140,28
+ CONTROL "" ,710,"STATIC",WS_BORDER|SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,4,118,116
+ CONTROL "" ,702,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 278,4,8,116
+ CONTROL "" ,709,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,124,40,26
+ DEFPUSHBUTTON "OK",  1,  4, 166, 44, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "キャンセル", 2, 52, 166, 44, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "ヘルプ(&H)", 1038,100,166, 44, 14
+ PUSHBUTTON "追加(&A)",    712/*1024*/, 152, 166, 142, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "色の作成(&D)...", 719/*1025*/,   4, 150, 142, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON  "&i",713,300,200,4,14   /* just a dummy:  'i' is  like  &i  in "sol&id"  */
+}
+
+
+FINDDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 236, 62
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "文字列の検索"
+FONT 8, "System"
+{
+ LTEXT "検索する文字列(&N):", -1, 4, 8, 42, 8
+ EDITTEXT 1152, 47, 7, 128, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
+ CHECKBOX "単語単位で検索(&W)", 1040, 4, 26, 100, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+ CHECKBOX "大文字と小文字を区別する(&C)", 1041, 4, 42, 64, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+ GROUPBOX "検索する方向", 1072, 107, 26, 68, 28
+ CONTROL "上へ向かって(&U)", 1056, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 111, 38, 20, 12
+ CONTROL "下へ向かって(&D)", 1057, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 138, 38, 30, 12
+ 
+ DEFPUSHBUTTON "次を検索(&F)", IDOK, 182, 5, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "キャンセル", 2, IDCANCEL, 23, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "ヘルプ(&H)", pshHelp, 182, 45, 50, 14, WS_GROUP | WS_TABSTOP
+}
+
+
+REPLACEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 230, 94
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "文字列の置換"
+FONT 8, "System"
+{
+ LTEXT "置換前の文字列(&N):", -1, 4, 9, 48, 8
+ EDITTEXT 1152, 54, 7, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
+ LTEXT "置換後の文字列(&P):", -1, 4, 26, 48, 8
+ EDITTEXT 1153, 54, 24, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
+ CHECKBOX "単語単位で検索(&W)", 1040, 5, 46, 104, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+ CHECKBOX "大文字と小文字を区別する(&C)", 1041, 5, 62, 59, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+ 
+ DEFPUSHBUTTON "次を検索(&F)", IDOK, 174, 4, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "置換して次に(&R)", psh1, 174, 21, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "すべてを置換(&A)", psh2, 174, 38, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "キャンセル", IDCANCEL, 174, 55, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "ヘルプ(&H)", pshHelp, 174, 75, 50, 14, WS_GROUP | WS_TABSTOP
+}
+
+
+PRINT32 DIALOG LOADONCALL MOVEABLE DISCARDABLE  32, 32, 288, 186
+STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU |
+      DS_CONTEXTHELP | DS_3DLOOK
+CAPTION "印刷"
+FONT 8, "System"
+{
+    DEFPUSHBUTTON   "OK",     IDOK,     180,164, 48,14, WS_GROUP | BS_DEFPUSHBUTTON
+    PUSHBUTTON      "キャンセル", IDCANCEL, 232,164, 48,14, WS_GROUP
+    PUSHBUTTON      "ヘルプ(&H)",  pshHelp,  50, 161, 48,14, WS_GROUP
+
+    GROUPBOX        "プリンタ",        grp4,   8,  4, 272,84, WS_GROUP
+    CONTROL         "ファイルへ出力(&L)", chx1, "Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,212,70,64,12
+    PUSHBUTTON      "プロパティ(&P)",    psh2, 212, 17,  60,14, WS_GROUP
+    LTEXT           "プリンタ名(&N):",         stc6,  16, 20,  36,8
+    COMBOBOX                          cmb4,  52, 18, 152,152,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP
+    LTEXT           "状態:",        stc8,  16, 36,  36,10, SS_NOPREFIX
+    LTEXT           "Dummy State",    stc12, 52, 36, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
+    LTEXT           "種類:",          stc7,  16, 48,  36,10, SS_NOPREFIX
+    LTEXT           "Dummy Type",     stc11, 52, 48, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
+    LTEXT           "場所:",         stc10, 16, 60,  36,10, SS_NOPREFIX
+    LTEXT           "Dummy Location", stc14, 52, 60, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
+    LTEXT           "コメント:",       stc9,  16, 72,  36,10, SS_NOPREFIX
+    LTEXT           "Dummy Remark",   stc13, 52, 72, 152,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
+
+    GROUPBOX        "印刷部数",         grp2, 160, 92, 120,64, WS_GROUP
+    LTEXT           "部数(&C):",stc5,168,108,68,8
+    ICON            "",               ico3, 162,124,  76,24, WS_GROUP | SS_CENTERIMAGE
+    CONTROL         "部単位で印刷(&O)",       chx2,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,240,130,36,12
+    EDITTEXT                          edt3, 240,106,  32,12, WS_GROUP | ES_NUMBER
+
+    GROUPBOX        "印刷範囲",    grp1,   8,92,  144,64, WS_GROUP
+    CONTROL         "すべて(&A)",           rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,106,64,12
+    CONTROL         "ページ指定(&G)",         rad3,"Button",BS_AUTORADIOBUTTON,16,122,36,12
+    CONTROL         "選択した部分(&S)",     rad2,"Button",BS_AUTORADIOBUTTON,16,138,64,12
+    EDITTEXT                          edt1,  74,122,  26,12, WS_GROUP | ES_NUMBER
+    EDITTEXT                          edt2, 118,122,  26,12, WS_GROUP | ES_NUMBER
+    RTEXT           "ページから(&F)",         stc2,  52,124,  20,8
+    RTEXT           "ページまで(&T)",           stc3, 100,124,  16,8
+}
+
+PRINT32_SETUP DIALOG LOADONCALL MOVEABLE DISCARDABLE  32, 32, 288, 178
+STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU |
+      DS_CONTEXTHELP | DS_3DLOOK
+CAPTION "印刷の設定"
+FONT 8, "System"
+BEGIN
+    DEFPUSHBUTTON   "OK",IDOK,180,156,48,14,WS_GROUP
+    PUSHBUTTON      "Cancel",IDCANCEL,232,156,48,14
+/*    PUSHBUTTON      "Network...", psh5, 284,156,48,14 */
+
+    GROUPBOX        "プリンタ",        grp4,   8,  4, 272,84, WS_GROUP
+    PUSHBUTTON      "プロパティ(&P)",    psh2, 212, 17,  60,14, WS_GROUP
+    LTEXT           "プリンタ名(&N):",         stc6,  16, 20,  36,8
+    COMBOBOX                          cmb1,  52, 18, 152,152,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP
+    LTEXT           "状態:",        stc8,  16, 36,  36,10, SS_NOPREFIX
+    LTEXT           "Dummy State",    stc12, 52, 36, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
+    LTEXT           "種類:",          stc7,  16, 48,  36,10, SS_NOPREFIX
+    LTEXT           "Dummy Type",     stc11, 52, 48, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
+    LTEXT           "場所:",         stc10, 16, 60,  36,10, SS_NOPREFIX
+    LTEXT           "Dummy Location", stc14, 52, 60, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
+    LTEXT           "コメント:",       stc9,  16, 72,  36,10, SS_NOPREFIX
+    LTEXT           "Dummy Remark",   stc13, 52, 72, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
+
+    GROUPBOX        "用紙",          grp2,   8, 92, 164,56, WS_GROUP
+    LTEXT           "用紙サイズ(&Z):",         stc2,  16,108,  36, 8
+    COMBOBOX                          cmb2,  52,106, 112,112,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP
+    LTEXT           "&Source:",       stc3,  16,128,  36, 8
+    COMBOBOX                          cmb3,  52,126, 112,112,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP
+    
+    GROUPBOX        "印刷方向",    grp1, 180, 92, 100,56, WS_GROUP
+    ICON            "",               ico1, 195,112,  18,20, WS_GROUP
+    CONTROL         "縦(&O)",      rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP |WS_TABSTOP,224,106,52,12
+    CONTROL         "横(&A)",     rad2,"Button",BS_AUTORADIOBUTTON,224,126,52,12
+END
+
+
+NEWFILEOPENORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 280, 164
+STYLE DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "ファイルを開く"
+FONT 8, "System"
+{
+    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
+
+    LTEXT	"" , IDC_TOOLBARSTATIC, 188, 2, 82, 17, NOT WS_GROUP | NOT WS_VISIBLE
+    LISTBOX	IDC_SHELLSTATIC,4,20,272,85, LBS_SORT | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_HSCROLL | NOT WS_VISIBLE
+    
+    LTEXT	"ファイル名(&N):",IDC_FILENAMESTATIC,5,112,48,8, SS_NOTIFY
+    EDITTEXT	IDC_FILENAME,56,110,153,12,ES_AUTOHSCROLL
+    
+    LTEXT	"ファイルの種類(&T):",IDC_FILETYPESTATIC,5,128,52,8, SS_NOTIFY
+    COMBOBOX	IDC_FILETYPE,56,126,153,53,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP
+
+    CONTROL	"読み取り専用ファイルとして開く(&R)",IDC_OPENREADONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,54,145,100,10
+
+    DEFPUSHBUTTON	"開く(&O)",		 IDOK,222,110,50,14
+    PUSHBUTTON		"キャンセル",		 IDCANCEL,222,128,50,14
+    PUSHBUTTON		"ヘルプ(&H)",		 pshHelp,222,145,50,14
+}
+
+STRINGTABLE DISCARDABLE 
+{
+    IDS_ABOUTBOX            "&About FolderPicker Test"
+    IDS_DOCUMENTFOLDERS     "Document Folders"
+    IDS_PERSONAL            "My Documents"
+    IDS_FAVORITES           "お気に入り"
+    IDS_PATH                "System Path"
+    IDS_DESKTOP             "デスクトップ"
+    IDS_FONTS               "Fonts"
+    IDS_MYCOMPUTER          "マイ コンピュータ"
+}
+
+STRINGTABLE DISCARDABLE 
+{
+    IDS_SYSTEMFOLDERS       "System Folders"
+    IDS_LOCALHARDRIVES      "Local Hard Drives"
+    IDS_FILENOTFOUND        "ファイルが見つかりません。"
+    IDS_VERIFYFILE          "ファイル名を確認してください。"
+    IDS_CREATEFILE          "このファイルは存在しません。\n作成しますか?"
+}
+
diff --git a/dlls/commdlg/rsrc.rc b/dlls/commdlg/rsrc.rc
index c63171e8c7201936271cc8df2e0892b49685f599..2ec5d9b1ca84107a22207d463f7941faff8865a9 100644
--- a/dlls/commdlg/rsrc.rc
+++ b/dlls/commdlg/rsrc.rc
@@ -43,3 +43,4 @@
 #include "cdlg_Ru.rc"
 #include "cdlg_Sv.rc"
 #include "cdlg_Wa.rc"
+#include "cdlg_Ja.rc"
diff --git a/dlls/shell32/shell32_Ja.rc b/dlls/shell32/shell32_Ja.rc
new file mode 100644
index 0000000000000000000000000000000000000000..582b0198663be65f3fd8987fd51ccbabe5afc292
--- /dev/null
+++ b/dlls/shell32/shell32_Ja.rc
@@ -0,0 +1,105 @@
+LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT
+
+MENU_001 MENU DISCARDABLE
+BEGIN
+	MENUITEM "大きなアイコン(&G)",	FCIDM_SHVIEW_BIGICON
+	MENUITEM "小さなアイコン(&M)",	FCIDM_SHVIEW_SMALLICON
+	MENUITEM "一覧(&L)",		FCIDM_SHVIEW_LISTVIEW
+	MENUITEM "詳細(&D)",		FCIDM_SHVIEW_REPORTVIEW
+END
+
+MENU_002 MENU DISCARDABLE
+BEGIN
+	POPUP""
+	BEGIN
+	  POPUP "表\示(&V)"
+	  BEGIN
+	    MENUITEM "大きいアイコン(&G)",	FCIDM_SHVIEW_BIGICON
+	    MENUITEM "小さいアイコン(&M)",	FCIDM_SHVIEW_SMALLICON
+	    MENUITEM "一覧(&L)",		FCIDM_SHVIEW_LISTVIEW
+	    MENUITEM "詳細(&D)",	FCIDM_SHVIEW_REPORTVIEW
+	  END
+	  MENUITEM SEPARATOR
+	  POPUP "アイコンの整列(&I)"
+	  BEGIN
+	    MENUITEM "名前順(&N)",	0x30	/* column 0 */
+	    MENUITEM "種類順(&T)",	0x32	/* column 2 */
+	    MENUITEM "サイズ順(&S)",	0x31	/* ... */
+	    MENUITEM "日付順(&D)",	0x33
+	    MENUITEM SEPARATOR
+	    MENUITEM "アイコンの自動整列(&A)",	FCIDM_SHVIEW_AUTOARRANGE
+	  END
+	  MENUITEM "等間隔に整列",	FCIDM_SHVIEW_SNAPTOGRID
+	  MENUITEM SEPARATOR
+	  MENUITEM "貼\り付け",		FCIDM_SHVIEW_INSERT
+	  MENUITEM "ショートカットの貼\り付け",	FCIDM_SHVIEW_INSERTLINK
+	  POPUP "新規作成"
+	  BEGIN
+	    MENUITEM "新規フォルダ(&F)",	0x7053
+	    MENUITEM "新規ショートカット(&L)",	0x7052
+	    MENUITEM SEPARATOR	
+	  END
+	  MENUITEM "プロパティ",		FCIDM_SHVIEW_PROPERTIES
+	END
+END
+
+MENU_SHV_FILE MENU DISCARDABLE
+BEGIN
+	POPUP""
+	BEGIN
+	  MENUITEM "切り取り(&U)",		FCIDM_SHVIEW_CUT
+	  MENUITEM "コピー(&C)",	FCIDM_SHVIEW_COPY
+	  MENUITEM SEPARATOR
+	  MENUITEM "ショートカットの作成(&L)",	0x7051
+	  MENUITEM "削除(&D)",	FCIDM_SHVIEW_DELETE
+	  MENUITEM "名前の変更(&R)",	0x7050
+	  MENUITEM SEPARATOR
+	  MENUITEM "プロパティ(&P)",	FCIDM_SHVIEW_PROPERTIES
+	END
+END
+
+/*
+	special folders
+*/
+STRINGTABLE DISCARDABLE
+{
+	IDS_DESKTOP		"デスクトップ"
+	IDS_MYCOMPUTER		"マイコンピュータ"
+}
+
+/*
+	context menus
+*/
+STRINGTABLE DISCARDABLE
+{
+	IDS_VIEW_LARGE		"大きいアイコン(&G)"
+	IDS_VIEW_SMALL		"小さいアイコン(&M)"
+	IDS_VIEW_LIST		"一覧(&L)"
+	IDS_VIEW_DETAILS	"詳細(&D)"
+	IDS_SELECT		"選択"
+	IDS_OPEN		"開く"
+}
+
+SHELL_ABOUT_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 210, 152
+STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "%s について"
+FONT 10, "System"
+{
+ DEFPUSHBUTTON "OK", IDOK, 153, 130, 50, 12
+ LISTBOX 99, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER
+ ICON "", 1088, 189, 10, 14, 16
+ LTEXT "", 100, 8, 10, 137, 33
+ LTEXT "Wine was brought to you by:", 98, 8, 55, 137, 10
+}
+
+/*	columns in the shellview	*/
+STRINGTABLE DISCARDABLE
+BEGIN
+	IDS_SHV_COLUMN1		"名前"
+	IDS_SHV_COLUMN2		"サイズ"
+	IDS_SHV_COLUMN3		"ファイルの種類"
+	IDS_SHV_COLUMN4		"更新日時"
+	IDS_SHV_COLUMN5		"属性"
+	IDS_SHV_COLUMN6		"合計サイズ"
+	IDS_SHV_COLUMN7		"空き容量"
+END
diff --git a/dlls/shell32/shres.rc b/dlls/shell32/shres.rc
index d5b683345f82f03c80a1b1d8bdd28cecf9189b26..5919af351dff8b2beb3a4e37095af4e5851659cb 100644
--- a/dlls/shell32/shres.rc
+++ b/dlls/shell32/shres.rc
@@ -1324,3 +1324,4 @@ END
 #include "shell32_Ru.rc"
 #include "shell32_Sv.rc"
 #include "shell32_Wa.rc"
+#include "shell32_Ja.rc"
diff --git a/include/options.h b/include/options.h
index 7a7396d001fb15ba8cbaaf4fd2b2e05eb455693b..97b220406244b742af52070f8b01a1353889fd09 100644
--- a/include/options.h
+++ b/include/options.h
@@ -40,7 +40,8 @@ typedef enum
     LANG_Ga,  /* Irish Gaelic */
     LANG_Gd,  /* Scots Gaelic */
     LANG_Gv,  /* Manx Gaelic */
-    LANG_Kw   /* Cornish */
+    LANG_Kw,  /* Cornish */
+    LANG_Ja   /* Japanese */
 } WINE_LANGUAGE;
 
 typedef struct
diff --git a/misc/main.c b/misc/main.c
index 526f942caf5de89a309da0218f0e862266e553d5..467fa85d7735824da034a34a6115dc33717f7eb2 100644
--- a/misc/main.c
+++ b/misc/main.c
@@ -82,6 +82,7 @@ const WINE_LANGUAGE_DEF Languages[] =
     {"Kw",0x0491},	/* LANG_Kw */
     {"Cy",0x0492},	/* LANG_Cy */
     {"Br",0x0493},	/* LANG_Br  */
+    {"Ja",0x0411},	/* LANG_Ja */
     {NULL,0}
 };
 
@@ -126,7 +127,7 @@ static const char szUsage[] =
   "    -failreadonly   Read only files may not be opened in write mode\n"
   "    -help           Show this help message\n"
   "    -language xx    Set the language (one of Br,Ca,Cs,Cy,Da,De,En,Eo,Es,Fi,Fr,Ga,Gd,Gv\n"
-  "                    Hu,It,Ko,Kw,Nl,No,Pl,Pt,Sv,Ru,Wa)\n"
+  "                    Hu,It,Ja,Ko,Kw,Nl,No,Pl,Pt,Sv,Ru,Wa)\n"
   "    -managed        Allow the window manager to manage created windows\n"
   "    -name name      Set the application name\n"
   "    -nodga          Disable XFree86 DGA extensions\n"
diff --git a/resources/.cvsignore b/resources/.cvsignore
index 70e2c8bdd0bd19a5edb92764e8995e2a9fc532da..1b2f9d38b85b7f6932dc3860689815634ddd30df 100644
--- a/resources/.cvsignore
+++ b/resources/.cvsignore
@@ -1,21 +1,2 @@
 Makefile
-sysres_Ca.s
-sysres_Cs.s
-sysres_Da.s
-sysres_De.s
-sysres_En.s
-sysres_Eo.s
-sysres_Es.s
-sysres_Fi.s
-sysres_Fr.s
-sysres_Hu.s
-sysres_It.s
-sysres_Ko.s
-sysres_Nl.s
-sysres_No.s
-sysres_Pl.s
-sysres_Pt.s
-sysres_Ru.s
-sysres_Sv.s
-sysres_Wa.s
 user32.s
diff --git a/resources/sysres_Ja.rc b/resources/sysres_Ja.rc
new file mode 100644
index 0000000000000000000000000000000000000000..6d9e0e5261dbda7510f68f92f8632fec8cfb8313
--- /dev/null
+++ b/resources/sysres_Ja.rc
@@ -0,0 +1,46 @@
+LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT
+
+SYSMENU MENU LOADONCALL MOVEABLE DISCARDABLE
+{
+ MENUITEM "元のサイズに戻す(&R)", 61728
+ MENUITEM "移動(&M)", 61456
+ MENUITEM "サイズ変更(&S)", 61440
+ MENUITEM "アイコン化(&N)", 61472
+ MENUITEM "最大表\示(&X)", 61488
+ MENUITEM SEPARATOR
+ MENUITEM "閉じる(&C)\tAlt-F4", 61536
+ MENUITEM SEPARATOR
+ MENUITEM "アプリケーションの切り替え(&W)...\tCtrl-Esc", 61744
+ MENUITEM SEPARATOR
+ MENUITEM "Wineについて(&A) ...", 61761
+ MENUITEM "ログに手がかりを残す(&P)", 61762
+}
+
+EDITMENU MENU LOADONCALL MOVEABLE DISCARDABLE
+{
+        POPUP "" 
+        BEGIN
+                MENUITEM "元に戻す(&U)", EM_UNDO
+                MENUITEM SEPARATOR
+                MENUITEM "切り取り(&T)", WM_CUT
+                MENUITEM "コピー(&C)", WM_COPY
+                MENUITEM "貼\り付け(&P)", WM_PASTE
+                MENUITEM "削除(&D)", WM_CLEAR
+                MENUITEM SEPARATOR
+                MENUITEM "選択(&A)", EM_SETSEL
+        END
+}
+
+MSGBOX DIALOG 100, 80, 216, 168
+STYLE DS_SYSMODAL | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+BEGIN
+        ICON "", 1088, 8, 20, 16, 16, WS_CHILD | WS_VISIBLE
+        LTEXT "", 100, 32, 4, 176, 48, WS_CHILD | WS_VISIBLE | WS_GROUP
+        PUSHBUTTON "OK", 1, 16, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+        PUSHBUTTON "キャンセル", 2, 64, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+        PUSHBUTTON "中止(&A)", 3, 112, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+        PUSHBUTTON "再試行(&R)", 4, 160, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+        PUSHBUTTON "無視(&I)", 5, 208, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+        PUSHBUTTON "はい(&Y)", 6, 256, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+        PUSHBUTTON "いいえ(&N)", 7, 304, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+END
diff --git a/resources/user32.rc b/resources/user32.rc
index ec08da70fbd8861efd1d202924b694046caebc95..34c34118356276cd88274ab6d4475ccf60447e20 100644
--- a/resources/user32.rc
+++ b/resources/user32.rc
@@ -41,3 +41,4 @@
 #include "sysres_Ru.rc"
 #include "sysres_Sv.rc"
 #include "sysres_Wa.rc"
+#include "sysres_Ja.rc"