diff -urN --exclude-from=exclude.lst ultravnc-orig/UltraVNC Project Root/UltraVNC/vncviewer/japanese/japanese.vcproj ultravnc/UltraVNC Project Root/UltraVNC/vncviewer/japanese/japanese.vcproj
--- ultravnc-orig/UltraVNC Project Root/UltraVNC/vncviewer/japanese/japanese.vcproj	2008-02-18 23:05:23.812500000 +0900
+++ ultravnc/UltraVNC Project Root/UltraVNC/vncviewer/japanese/japanese.vcproj	2008-03-01 20:51:09.250000000 +0900
@@ -322,6 +322,14 @@
 				>
 			</File>
 			<File
+				RelativePath=".\res\l1.bmp"
+				>
+			</File>
+			<File
+				RelativePath=".\res\l2.bmp"
+				>
+			</File>
+			<File
 				RelativePath="res\stat\maximizeup.bmp"
 				>
 			</File>
diff -urN --exclude-from=exclude.lst ultravnc-orig/UltraVNC Project Root/UltraVNC/vncviewer/japanese/res/resource.h ultravnc/UltraVNC Project Root/UltraVNC/vncviewer/japanese/res/resource.h
--- ultravnc-orig/UltraVNC Project Root/UltraVNC/vncviewer/japanese/res/resource.h	2008-02-18 23:05:23.718750000 +0900
+++ ultravnc/UltraVNC Project Root/UltraVNC/vncviewer/japanese/res/resource.h	2008-03-01 21:11:32.968750000 +0900
@@ -1,5 +1,5 @@
 //{{NO_DEPENDENCIES}}
-// Microsoft Developer Studio generated include file.
+// Microsoft Visual C++ generated include file.
 // Used by vncviewer.rc
 //
 #define IDR_MANIFEST                    1
@@ -205,6 +205,7 @@
 #define IDC_CUSTOM1                     1156
 #define IDC_CUSTOM2                     1157
 #define IDC_CUSTOM3                     1158
+#define IDC_JAPKEYBOARD                 1159
 #define IDC_ENCODING_BASE               1999
 #define IDC_RAWRADIO                    2000
 #define IDC_RRERADIO                    2002
diff -urN --exclude-from=exclude.lst ultravnc-orig/UltraVNC Project Root/UltraVNC/vncviewer/japanese/res/vncviewer.rc ultravnc/UltraVNC Project Root/UltraVNC/vncviewer/japanese/res/vncviewer.rc
--- ultravnc-orig/UltraVNC Project Root/UltraVNC/vncviewer/japanese/res/vncviewer.rc	2008-03-01 20:27:06.328125000 +0900
+++ ultravnc/UltraVNC Project Root/UltraVNC/vncviewer/japanese/res/vncviewer.rc	2008-03-01 21:22:07.781250000 +0900
@@ -79,7 +79,7 @@
 // Dialog
 //
 
-IDD_OPTIONDIALOG DIALOGEX 0, 0, 323, 217
+IDD_OPTIONDIALOG DIALOGEX 0, 0, 323, 227
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "�Ú‘±ƒIƒvƒVƒ‡ƒ“"
 FONT 9, "‚l‚r ‚oƒSƒVƒbƒN", 0, 0, 0x1
@@ -138,46 +138,48 @@
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,188,126,10
     CONTROL         "ƒNƒŠƒbƒvƒ{�[ƒh“]‘—‚ð�s‚í‚È‚¢",IDC_DISABLECLIPBOARD,
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,199,102,10
-    GROUPBOX        "ƒ}ƒEƒXƒ{ƒ^ƒ“",IDC_STATIC,159,2,159,37
+    GROUPBOX        "ƒ}ƒEƒXƒ{ƒ^ƒ“‚ÆƒL�[ƒ{�[ƒh",IDC_STATIC,159,2,159,47
     CONTROL         "�¶‰E“¯Žž‰Ÿ‚µ‚Å’†ƒNƒŠƒbƒN‚Æ‚µ‚Äˆµ‚¤",IDC_EMULATECHECK,
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,166,15,118,10
     CONTROL         "‰Eƒ{ƒ^ƒ“‚Æ’†ƒ{ƒ^ƒ“‚ð“ü‚ê‘Ö‚¦‚é",ID_SESSION_SWAPMOUSE,
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,166,26,107,10
-    GROUPBOX        "ƒ}ƒEƒXƒJ�[ƒ\ƒ‹",IDC_STATIC,159,41,159,47
+    CONTROL         "“ú–{ŒêƒL�[ƒ{�[ƒh",IDC_JAPKEYBOARD,"Button",
+                    BS_AUTOCHECKBOX | WS_TABSTOP,166,35,68,10
+    GROUPBOX        "ƒ}ƒEƒXƒJ�[ƒ\ƒ‹",IDC_STATIC,159,51,159,47
     CONTROL         "ƒ��[ƒJƒ‹‚ÌƒJ�[ƒ\ƒ‹‚ð•\Ž¦‚·‚é",IDC_CSHAPE_ENABLE_RADIO,
                     "Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,165,
-                    52,144,10
+                    62,144,10
     CONTROL         "ƒŠƒ‚�[ƒg‚ÌƒJ�[ƒ\ƒ‹‚ð•\Ž¦‚·‚é",IDC_CSHAPE_DISABLE_RADIO,
-                    "Button",BS_AUTORADIOBUTTON,165,63,103,10
+                    "Button",BS_AUTORADIOBUTTON,165,73,103,10
     CONTROL         "ƒJ�[ƒ\ƒ‹‚ð•\Ž¦‚µ‚È‚¢",IDC_CSHAPE_IGNORE_RADIO,"Button",
-                    BS_AUTORADIOBUTTON,165,74,78,10
-    GROUPBOX        "•\Ž¦",IDC_STATIC,159,90,159,77
+                    BS_AUTORADIOBUTTON,165,84,78,10
+    GROUPBOX        "•\Ž¦",IDC_STATIC,159,100,159,77
     CONTROL         "ƒc�[ƒ‹ƒo�[‚ð•\Ž¦‚·‚é",IDC_SHOWTOOLBAR,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,166,102,81,10
+                    BS_AUTOCHECKBOX | WS_TABSTOP,166,112,81,10
     CONTROL         "•\Ž¦‚Ì‚Ý�iƒŠƒ‚�[ƒg‘€�ì‚ð�s‚í‚È‚¢�j",IDC_VIEWONLY,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,166,113,119,10
+                    BS_AUTOCHECKBOX | WS_TABSTOP,166,123,119,10
     CONTROL         "‘S‰æ–Ê•\Ž¦",IDC_FULLSCREEN,"Button",BS_AUTOCHECKBOX | 
-                    WS_TABSTOP,166,125,50,10
-    LTEXT           "ƒrƒ…�[ƒA•\Ž¦”{—¦�F",IDC_STATIC,165,139,56,8
+                    WS_TABSTOP,166,135,50,10
+    LTEXT           "ƒrƒ…�[ƒA•\Ž¦”{—¦�F",IDC_STATIC,165,149,56,8
     CONTROL         "Ž©“®",IDC_SCALING,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,
-                    222,138,30,10
-    COMBOBOX        IDC_SCALE_CB,272,137,30,117,CBS_DROPDOWN | 
+                    222,148,30,10
+    COMBOBOX        IDC_SCALE_CB,272,147,30,117,CBS_DROPDOWN | 
                     CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
-    LTEXT           "ƒT�[ƒo‰æ–Ê•\Ž¦”{—¦�F",IDC_STATIC,165,152,80,8
-    EDITTEXT        IDC_SERVER_SCALE,272,152,14,12,ES_AUTOHSCROLL
-    DEFPUSHBUTTON   "OK",IDOK,210,199,50,14
-    PUSHBUTTON      "ƒLƒƒƒ“ƒZƒ‹",IDCANCEL,265,199,50,14
-    EDITTEXT        IDC_SCALE_NUM,276,102,15,12,ES_AUTOHSCROLL | ES_NUMBER | 
+    LTEXT           "ƒT�[ƒo‰æ–Ê•\Ž¦”{—¦�F",IDC_STATIC,165,162,80,8
+    EDITTEXT        IDC_SERVER_SCALE,272,162,14,12,ES_AUTOHSCROLL
+    DEFPUSHBUTTON   "OK",IDOK,210,209,50,14
+    PUSHBUTTON      "ƒLƒƒƒ“ƒZƒ‹",IDCANCEL,265,209,50,14
+    EDITTEXT        IDC_SCALE_NUM,276,112,15,12,ES_AUTOHSCROLL | ES_NUMBER | 
                     NOT WS_VISIBLE
-    CTEXT           "%",IDC_STATIC,303,140,8,8,0,WS_EX_TRANSPARENT
-    EDITTEXT        IDC_SCALE_DEN,294,102,14,12,ES_AUTOHSCROLL | ES_NUMBER | 
+    CTEXT           "%",IDC_STATIC,303,150,8,8,0,WS_EX_TRANSPARENT
+    EDITTEXT        IDC_SCALE_DEN,294,112,14,12,ES_AUTOHSCROLL | ES_NUMBER | 
                     NOT WS_VISIBLE
-    LTEXT           "1  /",IDC_STATIC,253,153,12,8
-    LTEXT           "by",IDC_STATIC,259,139,10,8,NOT WS_VISIBLE
+    LTEXT           "1  /",IDC_STATIC,253,163,12,8
+    LTEXT           "by",IDC_STATIC,259,149,10,8,NOT WS_VISIBLE
     CONTROL         "ƒXƒ|ƒ“ƒT�[�L��‚ð•\Ž¦‚µ‚È‚¢",IDC_CHECK1,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,160,185,149,10
-    EDITTEXT        IDC_SERVER_RECON,159,170,16,12,ES_AUTOHSCROLL
-    LTEXT           "‰ñ �Ä�Ú‘±‚ðŽŽ�s‚·‚é",IDC_STATIC,180,171,143,11
+                    BS_AUTOCHECKBOX | WS_TABSTOP,160,195,149,10
+    EDITTEXT        IDC_SERVER_RECON,159,180,16,12,ES_AUTOHSCROLL
+    LTEXT           "‰ñ �Ä�Ú‘±‚ðŽŽ�s‚·‚é",IDC_STATIC,180,181,143,11
 END
 
 IDD_FILETRANSFER_DLG DIALOGEX 0, 0, 491, 247
@@ -426,7 +428,7 @@
     LTEXT           "",IDC_STATIC_SPLIT,3,124,300,8,SS_NOTIFY
 END
 
-IDD_APP_ABOUT DIALOG DISCARDABLE  0, 0, 290, 134
+IDD_APP_ABOUT DIALOG DISCARDABLE  0, 0, 290, 153
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "VNCƒrƒ…�[ƒA‚Ìƒo�[ƒWƒ‡ƒ“�î•ñ"
 FONT 9, "‚l‚r ‚oƒSƒVƒbƒN"
@@ -434,7 +436,7 @@
     DEFPUSHBUTTON   "OK",IDOK,6,111,62,14
     CONTROL         156,IDC_STATIC,"Static",SS_BITMAP | SS_CENTERIMAGE | 
                     SS_SUNKEN,8,7,62,54
-    LTEXT           "UltraVNC Win32 ƒrƒ…�[ƒA 1.0.4 RC13",IDC_STATIC,86,
+    LTEXT           "UltraVNC Win32 ƒrƒ…�[ƒA 1.0.4 RC14",IDC_STATIC,86,
                     6,151,8
     LTEXT           "Copyright(C) 2002-2005 Ultr@VNC Team\nCopyright(C) 2001-2002 Sam - eSVNC \nCopyright(C) 1999-2002 Rudi D. V. - VdaccVNC \nCopyright(C) 1999-2002 Const. Kaplinsky - TightVNC \nCopyright(C) 2002 RealVNC Ltd. - RealVNC\n",
                     IDC_STATIC,86,30,200,40
@@ -444,6 +446,8 @@
                     IDC_STATIC,86,70,204,32
     LTEXT           "Copyright(C) 1990-2002 Info-ZIP\nCopyright(C) 1996-2002 Markus Franz Xaver Johannes Oberhumer - Mini LZO library",
                     IDC_STATIC,86,102,198,24
+    LTEXT           "‚³‚ç‚È‚é�î•ñ‚ÆƒŠƒ“ƒN‚Í‰º‹LƒTƒCƒg‚Å\nhttp://ultravnc.sf.net",
+                    IDC_STATIC,86,133,197,19
 END
 
 IDD_FTCONFIRM_DLG DIALOG DISCARDABLE  0, 0, 178, 86
@@ -637,8 +641,8 @@
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,0,4,901
- PRODUCTVERSION 1,0,4,901
+ FILEVERSION 1,0,4,914
+ PRODUCTVERSION 1,0,4,914
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x2dL
@@ -656,15 +660,15 @@
             VALUE "Comments", "UltraVNC Viewer\0"
             VALUE "CompanyName", "UltraVNC\0"
             VALUE "FileDescription", "VNCViewer\0"
-            VALUE "FileVersion", "1.0.4 RC9 - jp1\0"
+            VALUE "FileVersion", "1.0.4 RC14\0"
             VALUE "InternalName", "VNCViewer\0"
-            VALUE "LegalCopyright", "Copyright(C) 2002-2006 UltraVNC team members\0"
+            VALUE "LegalCopyright", "Copyright(C) 2008 UltraVNC team members\0"
             VALUE "LegalTrademarks", "\0"
             VALUE "OriginalFilename", "VNCViewer.exe\0"
-            VALUE "PrivateBuild", "With Japanized patch based on 1.0.2-jp2\0"
+            VALUE "PrivateBuild", "beta104\0"
             VALUE "ProductName", "UltraVNC VNCViewer\0"
-            VALUE "ProductVersion", "1.0.4 RC9 - jp1\0"
-            VALUE "SpecialBuild", "With Japanized path based on 1.0.2-jp2\0"
+            VALUE "ProductVersion", "1.0.4 RC14\0"
+            VALUE "SpecialBuild", "beta104\0"
         END
     END
     BLOCK "VarFileInfo"
diff -urN --exclude-from=exclude.lst ultravnc-orig/UltraVNC Project Root/UltraVNC/winvnc/japanese/resource.h ultravnc/UltraVNC Project Root/UltraVNC/winvnc/japanese/resource.h
--- ultravnc-orig/UltraVNC Project Root/UltraVNC/winvnc/japanese/resource.h	2008-02-18 23:05:18.734375000 +0900
+++ ultravnc/UltraVNC Project Root/UltraVNC/winvnc/japanese/resource.h	2008-03-01 21:48:09.593750000 +0900
@@ -175,6 +175,7 @@
 #define IDC_CUSTOM1                     1119
 #define IDC_WWW2                        1120
 #define IDC_WWW3                        1121
+#define IDC_JAP_INPUTS                  1122
 #define IDC_Path1                       1132
 #define IDC_Path2                       1133
 #define IDC_Path3                       1134
diff -urN --exclude-from=exclude.lst ultravnc-orig/UltraVNC Project Root/UltraVNC/winvnc/japanese/winvnc.rc ultravnc/UltraVNC Project Root/UltraVNC/winvnc/japanese/winvnc.rc
--- ultravnc-orig/UltraVNC Project Root/UltraVNC/winvnc/japanese/winvnc.rc	2008-02-18 23:05:18.687500000 +0900
+++ ultravnc/UltraVNC Project Root/UltraVNC/winvnc/japanese/winvnc.rc	2008-03-01 22:13:37.546875000 +0900
@@ -88,35 +88,26 @@
     PUSHBUTTON      "ƒ`ƒƒƒbƒg",IDC_TEXTCHAT_B,106,35,50,22,BS_MULTILINE
 END
 
-IDD_ABOUT DIALOGEX 0, 0, 282, 199
+IDD_ABOUT DIALOGEX 0, 0, 282, 159
 STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "WinVNC‚Ìƒo�[ƒWƒ‡ƒ“�î•ñ"
 FONT 9, "‚l‚r ‚oƒSƒVƒbƒN"
 BEGIN
-    DEFPUSHBUTTON   "OK",IDOK,7,174,54,16
+    DEFPUSHBUTTON   "OK",IDOK,7,134,54,16
     CONTROL         139,IDC_VNCLOGO,"Static",SS_BITMAP | SS_CENTERIMAGE | 
                     SS_SUNKEN,7,5,53,46,WS_EX_TRANSPARENT
-    LTEXT           "UltraVNC Win32 ƒT�[ƒo 1.0.4 RC9 - jp1",
+    LTEXT           "UltraVNC Win32 ƒT�[ƒo 1.0.4 RC14",
                     IDC_VERSION,73,5,147,8
     LTEXT           "Copyright(C) 2002-2005 Ultr@VNC Team\nCopyright(C) 2001-2002 Sam - eSVNC \nCopyright(C) 1999-2002 Rudi D. V. - VdaccVNC \nCopyright(C) 2001 Harakan Software - PalmVNC\nCopyright(C) 1999-2002 Const. Kaplinsky - TightVNC \n",
                     IDC_NAME,73,27,202,40
-    LTEXT           "UltraVNC�iƒIƒŠƒWƒiƒ‹‚Ì‰pŒê”Å�j‚ÌŒöŽ®ƒTƒCƒg�F",IDC_WWW,
-                    74,135,135,8
+    LTEXT           "‚³‚ç‚È‚é�î•ñ‚ÆƒŠƒ“ƒN‚Í‰º‹LƒTƒCƒg‚Å\nhttp://ultravnc.sf.net/",IDC_WWW,
+                    74,135,135,18
     LTEXT           "�ì�¬“ú�F",IDC_BUILDTEXT,74,16,25,8
     LTEXT           "BuildTime",IDC_BUILDTIME,102,16,173,8
     LTEXT           "Copyright(C) 2002 RealVNC Ltd. - RealVNC\nCopyright(C) 1999-2002 Tridia Corporation - TridiaVNC \nCopyright(C) 1994-2001 AT&&T Laboratories Cambridge/Olivetti Research Ltd. - VNC",
                     IDC_STATIC,73,67,203,32
     LTEXT           "Copyright(C) 1990-2002 Info-ZIP\nCopyright(C) 1996-2002 Markus Franz Xaver Johannes Oberhumer - Mini LZO library",
                     IDC_STATIC,73,99,200,24
-    CONTROL         "http://ultravnc.sf.net/|http://ultravnc.sf.net/",
-                    IDC_STATIC,"LinkLabel",WS_TABSTOP,74,143,93,8
-    LTEXT           "ƒx�[ƒX‚É‚µ‚½“ú–{Œê”Å‚ÌŒöŠJƒTƒCƒg�F",IDC_STATIC,74,157,160,8
-    CONTROL         "http://kp774.com/|http://kp774.com/",IDC_STATIC,
-                    "LinkLabel",WS_TABSTOP,74,165,54,8
-    LTEXT           "SVN Rev. 169 ‚É“K—p�F",
-                    IDC_STATIC,74,177,165,8
-    CONTROL         "http://yak.myhome.cx/junks/|http://yak.myhome.cx/junks/",IDC_WWW3,"LinkLabel",
-                    WS_TABSTOP,74,185,160,8
 END
 
 IDD_OUTGOING_CONN DIALOG DISCARDABLE  0, 0, 246, 87
@@ -256,6 +247,8 @@
                     BS_AUTOCHECKBOX | WS_TABSTOP,148,71,87,10
     CONTROL         "ƒT�[ƒo‚Å‚Ì‘€�ì‚ð–³Œø",IDC_DISABLE_LOCAL_INPUTS,"Button",
                     BS_AUTOCHECKBOX | WS_TABSTOP,148,91,96,10
+//    CONTROL         "“ú–{ŒêƒL�[",IDC_JAP_INPUTS,"Button",
+//                    BS_AUTOCHECKBOX | WS_TABSTOP,148,103,96,10
     GROUPBOX        "�Ú‘±—v‹�‚ðŽó‚¯‚½‚Æ‚«‚Ì–â‚¢�‡‚í‚¹",IDC_STATIC,250,3,136,
                     53,BS_LEFT
     CONTROL         "–â‚¢�‡‚í‚¹ƒEƒBƒ“ƒhƒE‚ð•\Ž¦‚·‚é",IDQUERY,"Button",
@@ -442,8 +435,8 @@
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,0,4,901
- PRODUCTVERSION 1,0,4,901
+ FILEVERSION 1,0,4,914
+ PRODUCTVERSION 1,0,4,914
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x2DL
@@ -461,15 +454,15 @@
             VALUE "Comments", "UltraVNC - ƒŠƒ‚�[ƒgƒRƒ“ƒgƒ��[ƒ‹‚ð‚·‚×‚Ä‚É\0"
             VALUE "CompanyName", "UltraVNC\0"
             VALUE "FileDescription", "VNC ƒT�[ƒo for Win32\0"
-            VALUE "FileVersion", "1.0.4 RC9 - jp1\0"
+            VALUE "FileVersion", "1.0.4 RC14\0"
             VALUE "InternalName", "WinVNC\0"
-            VALUE "LegalCopyright", "Copyright(C) 2002-2005 UltraVNC ƒ`�[ƒ€\nTranslated by NANASI(KANTAN PROJECT)\0"
+            VALUE "LegalCopyright", "Copyright(C) 2008 UltraVNC ƒ`�[ƒ€\nTranslated by NANASI(KANTAN PROJECT)\0"
             VALUE "LegalTrademarks", "VNC\0"
             VALUE "OriginalFilename", "WinVNC.exe\0"
-            VALUE "PrivateBuild", "“ú–{Œê”Å(1.0.2-jp2ƒx�[ƒX)\0"
+            VALUE "PrivateBuild", "Beta test for 104\0"
             VALUE "ProductName", "UltraVNC “ú–{Œê”Å\0"
-            VALUE "ProductVersion", "1.0.4 RC9 - jp1\0"
-            VALUE "SpecialBuild", "“ú–{Œê”Å(1.0.2-jp2ƒx�[ƒX)\0"
+            VALUE "ProductVersion", "1.0.4 RC14\0"
+            VALUE "SpecialBuild", "Beta test for 104\0"
         END
     END
     BLOCK "VarFileInfo"
