Commit: 39f0540ffea6b6efa919f16d0560442496af180d - ffftp (git)

FFFTPのソースコードです。

Commit MetaInfo

• Revision: 39f0540ffea6b6efa919f16d0560442496af180d (tree)
• Zeit: 2012-01-16 22:11:55
• Autor: s_kawamoto <s_kawamoto@user...>
• Commiter: s_kawamoto

Log Message

Merge commit '54fbba48345efc266d90204375d464738a31c3ba' into test

Ändern Zusammenfassung

• modified: Resource/FFFTP.rc
• modified: mesg-jpn.h
• modified: mesg-jpn.old.h

Diff

--- a/Resource/FFFTP.rc
+++ b/Resource/FFFTP.rc
@@ -189,10 +189,10 @@ BEGIN
         MENUITEM "KANJI JIS",                   MENU_KNJ_JIS
         MENUITEM "KANJI NONE",                  MENU_KNJ_NONE
         MENUITEM "ƒ_ƒuƒ‹ƒNƒŠƒbƒN",                     MENU_DCLICK
-        MENUITEM "”¼Šp‚©‚È•ÏŠ·",                      MENU_KANACNV
-        MENUITEM "ŠJ‚­‚P",                         MENU_OPEN1
-        MENUITEM "ŠJ‚­‚Q",                         MENU_OPEN2
-        MENUITEM "ŠJ‚­‚R",                         MENU_OPEN3
+        MENUITEM "”¼ŠpƒJƒi•ÏŠ·",                      MENU_KANACNV
+        MENUITEM "ŠJ‚­1",                         MENU_OPEN1
+        MENUITEM "ŠJ‚­2",                         MENU_OPEN2
+        MENUITEM "ŠJ‚­3",                         MENU_OPEN3
         MENUITEM "Ú‘±i”ԍ†Žw’èj",                    MENU_CONNECT_NUM
         MENUITEM "ƒqƒXƒgƒŠ1",                       MENU_HIST_1
         MENUITEM "ƒqƒXƒgƒŠ2",                       MENU_HIST_2
@@ -253,16 +253,16 @@ BEGIN
     PUSHBUTTON      "‚±‚̃tƒ@ƒCƒ‹‚𒆎~",IDCANCEL,7,73,74,14
     PUSHBUTTON      "ŽŸˆÈ~’†Ž~",TRANS_STOP_NEXT,93,73,46,14
     PUSHBUTTON      "‘S‚Ä’†Ž~",TRANS_STOP_ALL,150,73,42,14
-    LTEXT           "ƒzƒXƒgF",-1,7,5,40,8
+    LTEXT           "ƒzƒXƒg:",-1,7,5,40,8
     LTEXT           "",TRANS_REMOTE,45,5,147,8,SS_NOPREFIX
-    LTEXT           "ƒ[ƒJƒ‹F",-1,7,18,40,8
+    LTEXT           "ƒ[ƒJƒ‹:",-1,7,18,40,8
     LTEXT           "",TRANS_LOCAL,45,18,147,8,SS_NOPREFIX
-    LTEXT           "ó‹µF",-1,7,44,40,8
+    LTEXT           "ó‹µ:",-1,7,44,40,8
     LTEXT           "",TRANS_STATUS,45,44,147,8
     CONTROL         "Progress1",TRANS_TIME_BAR,"msctls_progress32",0x0,7,58,185,9
-    LTEXT           "“]‘—ƒ‚[ƒhF",-1,7,31,40,8
+    LTEXT           "“]‘—ƒ‚[ƒh:",-1,7,31,40,8
     LTEXT           "",TRANS_MODE,45,31,48,8
-    LTEXT           "ƒR[ƒh•ÏŠ·F",-1,98,31,39,8
+    LTEXT           "ƒR[ƒh•ÏŠ·:",-1,98,31,39,8
     LTEXT           "",TRANS_KANJI,136,31,56,8
 END
 
@@ -290,7 +290,7 @@ BEGIN
     LTEXT           "‚ðíœ‚µ‚Ü‚·‚©H",-1,17,21,167,8
 END
 
-hostlist_dlg DIALOG  0, 0, 222, 120
+hostlist_dlg DIALOG  0, 0, 232, 120
 STYLE DS_LOCALEDIT | DS_SETFONT | WS_POPUP | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME
 CAPTION "ƒzƒXƒgˆê——"
 FONT 9, "MS Shell Dlg"
@@ -298,15 +298,15 @@ BEGIN
     CONTROL         "Tree1",HOST_LIST,"SysTreeView32",TVS_HASLINES | TVS_DISABLEDRAGDROP | TVS_SHOWSELALWAYS | TVS_FULLROWSELECT | WS_BORDER | WS_TABSTOP,7,6,152,89
     DEFPUSHBUTTON   "Ú‘±(&S)",IDOK,27,102,50,14
     PUSHBUTTON      "•Â‚¶‚é(&O)",IDCANCEL,91,102,50,14
-    PUSHBUTTON      "V‹KƒzƒXƒg(&N)...",HOST_NEW,165,6,50,14
-    PUSHBUTTON      "V‹K¸ÞÙ°Ìß(&G)...",HOST_FOLDER,165,22,50,14
-    PUSHBUTTON      "Ý’è•ÏX(&M)...",HOST_SET,165,38,50,14
-    PUSHBUTTON      "ƒRƒs[(&C)",HOST_COPY,165,54,50,14
-    PUSHBUTTON      "íœ(&D)...",HOST_DEL,165,70,50,14
+    PUSHBUTTON      "V‹KƒzƒXƒg(&N)...",HOST_NEW,165,6,60,14
+    PUSHBUTTON      "V‹KƒOƒ‹[ƒv(&G)...",HOST_FOLDER,165,22,60,14
+    PUSHBUTTON      "Ý’è•ÏX(&M)...",HOST_SET,165,38,60,14
+    PUSHBUTTON      "ƒRƒs[(&C)",HOST_COPY,165,54,60,14
+    PUSHBUTTON      "íœ(&D)...",HOST_DEL,165,70,60,14
     PUSHBUTTON      "ª",HOST_UP,165,86,14,14
     PUSHBUTTON      "«",HOST_DOWN,184,86,14,14
-    SCROLLBAR       HOST_SIZEGRIP,212,106,10,13,SBS_BOTTOMALIGN | SBS_VERT | SBS_SIZEGRIP
-    PUSHBUTTON      "ƒwƒ‹ƒv",9,165,102,50,14
+    SCROLLBAR       HOST_SIZEGRIP,222,106,10,13,SBS_BOTTOMALIGN | SBS_VERT | SBS_SIZEGRIP
+    PUSHBUTTON      "ƒwƒ‹ƒv",9,165,102,60,14
 END
 
 hset_main_dlg DIALOG  0, 0, 207, 155
@@ -327,7 +327,7 @@ BEGIN
     PUSHBUTTON      "...",HSET_LOCAL_BR,145,73,12,14
     LTEXT           "ƒzƒXƒg‚̏‰ŠúƒtƒHƒ‹ƒ_(&R)",-1,7,91,94,8
     EDITTEXT        HSET_REMOTE,7,101,137,12,ES_AUTOHSCROLL
-    PUSHBUTTON      "Œ»Ý‚ÌÌ«ÙÀÞ",HSET_REMOTE_CUR,145,101,55,14
+    PUSHBUTTON      "Œ»Ý‚̃tƒHƒ‹ƒ_",HSET_REMOTE_CUR,145,101,55,14
     CONTROL         "ÅŒã‚ɃAƒNƒZƒX‚µ‚½ƒtƒHƒ‹ƒ_‚ðŽŸ‰ñ‚̏‰ŠúƒtƒHƒ‹ƒ_‚Æ‚·‚é(&F)",HSET_LASTDIR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,122,193,10
 END
 
@@ -365,17 +365,17 @@ opt_tool_dlg DIALOG  0, 0, 211, 139
 STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 FONT 9, "MS Shell Dlg"
 BEGIN
-    LTEXT           "ƒrƒ…[ƒ‚P(&1)",-1,7,7,39,8
+    LTEXT           "ƒrƒ…[ƒ1(&1)",-1,7,7,39,8
     EDITTEXT        TOOL_EDITOR1,7,18,183,12,ES_AUTOHSCROLL
     PUSHBUTTON      "...",TOOL_EDITOR1_BR,191,18,12,13
-    LTEXT           "ƒrƒ…[ƒ‚Q(&2)",-1,7,63,39,8
+    LTEXT           "ƒrƒ…[ƒ2(&2)",-1,7,63,39,8
     EDITTEXT        TOOL_EDITOR2,7,74,183,12,ES_AUTOHSCROLL
     PUSHBUTTON      "...",TOOL_EDITOR2_BR,191,74,12,13
-    LTEXT           "ƒrƒ…[ƒ‚R(&3)",-1,7,93,39,8
+    LTEXT           "ƒrƒ…[ƒ3(&3)",-1,7,93,39,8
     EDITTEXT        TOOL_EDITOR3,7,104,183,12,ES_AUTOHSCROLL
     PUSHBUTTON      "...",TOOL_EDITOR3_BR,191,104,12,13
-    LTEXT           "ƒrƒ…[ƒ‚P‚́AƒAƒvƒŠƒP[ƒVƒ‡ƒ“‚ÉŠÖ˜A‚¯‚ç‚ê‚Ä‚¢‚È‚¢ƒtƒ@ƒCƒ‹‚ðuŠJ‚­v‚ÅŠJ‚­‚Æ‚«‚É‚àŽg—p‚µ‚Ü‚·B\n‚Ü‚½Auƒtƒ@ƒCƒ‹ˆê——î•ñ‚̏ڍו\Ž¦v‚Å‚àŽg—p‚µ‚Ü‚·B",-1,19,33,184,27,SS_SUNKEN
-    LTEXT           "ƒrƒ…[ƒ‚QA‚R‚̓}ƒEƒX‰Eƒ{ƒ^ƒ“ƒNƒŠƒbƒN‚ÅŽg—p‚Å‚«‚Ü‚·B",-1,14,124,184,8
+    LTEXT           "ƒrƒ…[ƒ1‚́AƒAƒvƒŠƒP[ƒVƒ‡ƒ“‚ÉŠÖ˜A‚¯‚ç‚ê‚Ä‚¢‚È‚¢ƒtƒ@ƒCƒ‹‚ðuŠJ‚­v‚ÅŠJ‚­‚Æ‚«‚É‚àŽg—p‚µ‚Ü‚·B\n‚Ü‚½Auƒtƒ@ƒCƒ‹ˆê——î•ñ‚̏ڍו\Ž¦v‚Å‚àŽg—p‚µ‚Ü‚·B",-1,19,33,184,27,SS_SUNKEN
+    LTEXT           "ƒrƒ…[ƒ2A3‚̓}ƒEƒX‰Eƒ{ƒ^ƒ“ƒNƒŠƒbƒN‚ÅŽg—p‚Å‚«‚Ü‚·B",-1,14,124,184,8
 END
 
 chmod_dlg DIALOG  0, 0, 171, 109
@@ -453,7 +453,7 @@ FONT 9, "MS Shell Dlg"
 BEGIN
     CONTROL         "ƒEƒCƒ“ƒhƒEˆÊ’u‚ð•Û‘¶‚·‚é(&W)",MISC_WINPOS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,7,173,10
     CONTROL         "ƒtƒ@ƒCƒ‹ˆê——‚ðƒLƒƒƒbƒVƒ…‚·‚éiŽŸ‰ñ‹N“®Žž‚©‚çj(&L)",MISC_CACHE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,23,196,10
-    LTEXT           "ƒLƒƒƒbƒVƒ…ƒoƒbƒtƒ@‚̐”(&B)F",IDC_STATIC,23,37,91,8
+    LTEXT           "ƒLƒƒƒbƒVƒ…ƒoƒbƒtƒ@‚̐”(&B):",IDC_STATIC,23,37,91,8
     EDITTEXT        MISC_BUFNUM,115,35,24,14,ES_AUTOHSCROLL | ES_NUMBER
     CONTROL         "Spin1",MISC_BUFNUM_SPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_AUTOBUDDY | UDS_ARROWKEYS,139,35,9,14
     LTEXT           "(1`99)",IDC_STATIC,152,39,28,8
@@ -559,7 +559,7 @@ BEGIN
     LTEXT           "ƒlƒbƒgƒ[ƒNƒ^ƒCƒ€ƒAƒEƒgŽžŠÔ(&T)",-1,7,80,131,8
     EDITTEXT        TRMODE2_TIMEOUT,7,90,26,14,ES_AUTOHSCROLL | ES_NUMBER
     CONTROL         "Spin1",TRMODE2_TIMEOUT_SPN,"msctls_updown32",UDS_SETBUDDYINT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS,33,90,9,14
-    LTEXT           "i0`300•bF 0=ƒ^ƒCƒ€ƒAƒEƒg‚È‚µj",-1,45,94,107,8
+    LTEXT           "i0`300•b; 0=ƒ^ƒCƒ€ƒAƒEƒg‚È‚µj",-1,45,94,107,8
     LTEXT           "ƒfƒtƒHƒ‹ƒg‚̃[ƒJƒ‹ƒtƒHƒ‹ƒ_(&D)",-1,7,108,196,8
     EDITTEXT        TRMODE2_LOCAL,7,118,182,12,ES_AUTOHSCROLL
     PUSHBUTTON      "...",TRMODE2_LOCAL_BR,190,118,13,13
@@ -651,7 +651,7 @@ END
 
 diskfull_dlg DIALOG  0, 0, 159, 42
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION
-CAPTION "FFFTPFƒGƒ‰["
+CAPTION "FFFTP: ƒGƒ‰["
 FONT 9, "MS Shell Dlg"
 BEGIN
     DEFPUSHBUTTON   "‚±‚̃tƒ@ƒCƒ‹‚𒆎~",IDOK,7,24,82,14
@@ -703,7 +703,7 @@ END
 
 downerr_dlg DIALOG  0, 0, 223, 103
 STYLE DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | WS_POPUP | WS_CAPTION
-CAPTION "FFFTPFƒGƒ‰["
+CAPTION "FFFTP: ƒGƒ‰["
 FONT 9, "MS Shell Dlg"
 BEGIN
     CONTROL         "Œã‚ŏ㏑‚«(&O)",DOWN_EXIST_OVW,"Button",BS_AUTORADIOBUTTON | WS_GROUP,7,46,99,10
@@ -720,7 +720,7 @@ END
 
 uperr_dlg DIALOG  0, 0, 223, 103
 STYLE DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | WS_POPUP | WS_CAPTION
-CAPTION "FFFTPFƒGƒ‰["
+CAPTION "FFFTP: ƒGƒ‰["
 FONT 9, "MS Shell Dlg"
 BEGIN
     CONTROL         "Œã‚ŏ㏑‚«(&O)",DOWN_EXIST_OVW,"Button",BS_AUTORADIOBUTTON | WS_GROUP,7,46,99,10
@@ -1047,7 +1047,7 @@ BEGIN
     LTEXT           "‘®«(&A)",-1,71,7,40,8
     EDITTEXT        DEFATTR_ATTR,71,18,31,12,ES_AUTOHSCROLL | ES_NUMBER
     PUSHBUTTON      "...",DEFATTR_ATTR_BR,102,18,13,12
-    LTEXT           "(—áF 644)",-1,72,35,28,8
+    LTEXT           "(—á: 644)",-1,72,35,28,8
     DEFPUSHBUTTON   "OK",IDOK,7,48,50,14
     PUSHBUTTON      "ƒLƒƒƒ“ƒZƒ‹",IDCANCEL,66,48,50,14
 END
@@ -1058,7 +1058,7 @@ FONT 9, "MS Shell Dlg"
 BEGIN
     EDITTEXT        INP_INPSTR,7,7,72,12,ES_AUTOHSCROLL
     DEFPUSHBUTTON   "OK",IDOK,7,26,33,14
-    PUSHBUTTON      "·¬Ý¾Ù",IDCANCEL,46,26,33,14
+    PUSHBUTTON      "ƒLƒƒƒ“ƒZƒ‹",IDCANCEL,46,26,33,14
     CONTROL         "",INP_ANONYMOUS,"Button",BS_AUTOCHECKBOX | NOT WS_VISIBLE | WS_DISABLED | WS_TABSTOP,71,23,8,10
 END
 
@@ -1158,7 +1158,7 @@ CAPTION "
 FONT 9, "MS Shell Dlg"
 BEGIN
     EDITTEXT        FILTER_STR,7,8,147,12,ES_AUTOHSCROLL
-    LTEXT           "•¡”‚̃tƒBƒ‹ƒ^‚ðŽw’è‚·‚é‚Æ‚«‚̓Zƒ~ƒRƒƒ“‚Å‹æØ‚Á‚Ä‚­‚¾‚³‚¢Bi¨ *.txtG*.logj\nƒtƒBƒ‹ƒ^‚̐ݒè‚̓tƒ@ƒCƒ‹‚Ì“]‘—‚É‚à‰e‹¿‚µ‚Ü‚·B",-1,13,29,167,27
+    LTEXT           "•¡”‚̃tƒBƒ‹ƒ^‚ðŽw’è‚·‚é‚Æ‚«‚̓Zƒ~ƒRƒƒ“‚Å‹æØ‚Á‚Ä‚­‚¾‚³‚¢Bi¨ *.txt;*.logj\nƒtƒBƒ‹ƒ^‚̐ݒè‚̓tƒ@ƒCƒ‹‚Ì“]‘—‚É‚à‰e‹¿‚µ‚Ü‚·B",-1,13,29,167,27
     DEFPUSHBUTTON   "OK",IDOK,7,61,41,14
     PUSHBUTTON      "‘S•\Ž¦",FILTER_NOR,51,61,41,14
     PUSHBUTTON      "ƒLƒƒƒ“ƒZƒ‹",IDCANCEL,95,61,41,14
@@ -1206,7 +1206,7 @@ BEGIN
     PUSHBUTTON      "•Â‚¶‚é(&O)",IDCANCEL,96,88,50,14
     SCROLLBAR       HOST_SIZEGRIP,156,92,10,13,SBS_BOTTOMALIGN | SBS_VERT | SBS_SIZEGRIP
     PUSHBUTTON      "V‹KƒzƒXƒg(&N)...",HOST_NEW,153,88,6,14,NOT WS_VISIBLE | WS_DISABLED
-    PUSHBUTTON      "V‹K¸ÞÙ°Ìß(&G)...",HOST_FOLDER,153,88,6,14,NOT WS_VISIBLE | WS_DISABLED
+    PUSHBUTTON      "V‹KƒOƒ‹[ƒv(&G)...",HOST_FOLDER,153,88,6,14,NOT WS_VISIBLE | WS_DISABLED
     PUSHBUTTON      "Ý’è•ÏX(&M)...",HOST_SET,153,88,6,14,NOT WS_VISIBLE | WS_DISABLED
     PUSHBUTTON      "ƒRƒs[(&C)",HOST_COPY,153,88,6,14,NOT WS_VISIBLE | WS_DISABLED
     PUSHBUTTON      "íœ(&D)...",HOST_DEL,153,88,6,14,NOT WS_VISIBLE | WS_DISABLED
@@ -1216,7 +1216,7 @@ END
 
 noresume_dlg DIALOG  0, 0, 191, 47
 STYLE DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | WS_POPUP | WS_CAPTION
-CAPTION "FFFTPFƒGƒ‰["
+CAPTION "FFFTP: ƒGƒ‰["
 FONT 9, "MS Shell Dlg"
 BEGIN
     DEFPUSHBUTTON   "‚Í‚¢",IDOK,7,29,45,14
@@ -1286,7 +1286,7 @@ FONT 9, "MS Shell Dlg"
 BEGIN
     PUSHBUTTON      "•ÏX(&F)",DISP_FONT_BR,167,7,36,14,WS_GROUP
     LTEXT           "",-1,7,8,159,14,SS_NOPREFIX | SS_SUNKEN
-    LTEXT           "ƒtƒHƒ“ƒgF",-1,9,11,29,8
+    LTEXT           "ƒtƒHƒ“ƒg:",-1,9,11,29,8
     LTEXT           "",DISP_FONT,40,11,123,8
     CONTROL         "‰B‚µ‘®«‚̃tƒ@ƒCƒ‹AƒtƒHƒ‹ƒ_‚Í•\Ž¦‚µ‚È‚¢(&H)",DISP_HIDE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,30,172,10
     LTEXT           "‰B‚µ‘®«‚̃tƒ@ƒCƒ‹‚ð•\Ž¦‚µ‚È‚¢‚悤‚É‚·‚é‚ƁAƒ~ƒ‰[ƒŠƒ“ƒOƒAƒbƒvƒ[ƒh‚Å‚à‰B‚µ‘®«‚̃tƒ@ƒCƒ‹‚̓Aƒbƒvƒ[ƒh‚µ‚È‚¢‚悤‚É‚È‚è‚Ü‚·B",-1,29,44,167,27,SS_SUNKEN
@@ -1383,7 +1383,7 @@ BEGIN
     LTEXT           "Ú‘±ˆÛŽ—pƒRƒ}ƒ“ƒhŽüŠú",-1,7,44,84,8
     EDITTEXT        HSET_NOOP_INTERVAL,92,42,17,12,ES_AUTOHSCROLL | ES_NUMBER
     CONTROL         "Spin1",HSET_NOOP_INTERVAL_SPN,"msctls_updown32",UDS_SETBUDDYINT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS,109,41,9,14
-    LTEXT           "(0`300•bF 0=–³Œø)",-1,122,44,76,8
+    LTEXT           "(0`300•b; 0=–³Œø)",-1,122,44,76,8
     LTEXT           "“]‘—ƒGƒ‰[Žž‚̏ˆ—",-1,7,61,81,8
     COMBOBOX        HSET_ERROR_MODE,7,71,71,75,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
 END

--- a/mesg-jpn.h
+++ b/mesg-jpn.h
@@ -49,12 +49,12 @@
 #define MSGJPN049		"\xE3\x83\x95\xE3\x82\xA1\xE3\x82\xA4\xE3\x83\xAB\xE4\xB8\x80\xE8\xA6\xA7\xE3\x81\xAE\xE5\x8F\x96\xE5\xBE\x97\xE3\x81\xAB\xE5\xA4\xB1\xE6\x95\x97\xE3\x81\x97\xE3\x81\xBE\xE3\x81\x97\xE3\x81\x9F."
 #define MSGJPN050		"\xE6\xA4\x9C\xE7\xB4\xA2\xEF\xBC\x88\xE3\x83\xAD\xE3\x83\xBC\xE3\x82\xAB\xE3\x83\xAB\xEF\xBC\x89"
 #define MSGJPN051		"\xE6\xA4\x9C\xE7\xB4\xA2\xEF\xBC\x88\xE3\x83\x9B\xE3\x82\xB9\xE3\x83\x88\xEF\xBC\x89"
-#define MSGJPN052		"\xE5\x89\x8A\xE9\x99\xA4\xEF\xBC\x9A %s"
-#define MSGJPN053		"\xE4\xBD\x9C\xE6\x88\x90\xEF\xBC\x9A %s"
-#define MSGJPN054		"\xE8\xBB\xA2\xE9\x80\x81\xEF\xBC\x9A %s"
-#define MSGJPN055		"\xE5\x89\x8A\xE9\x99\xA4\xEF\xBC\x9A %s"
-#define MSGJPN056		"\xE4\xBD\x9C\xE6\x88\x90\xEF\xBC\x9A %s"
-#define MSGJPN057		"\xE8\xBB\xA2\xE9\x80\x81\xEF\xBC\x9A %s"
+#define MSGJPN052		"\xE5\x89\x8A\xE9\x99\xA4: %s"
+#define MSGJPN053		"\xE4\xBD\x9C\xE6\x88\x90: %s"
+#define MSGJPN054		"\xE8\xBB\xA2\xE9\x80\x81: %s"
+#define MSGJPN055		"\xE5\x89\x8A\xE9\x99\xA4: %s"
+#define MSGJPN056		"\xE4\xBD\x9C\xE6\x88\x90: %s"
+#define MSGJPN057		"\xE8\xBB\xA2\xE9\x80\x81: %s"
 #define MSGJPN058		"%d\xE5\x80\x8B\xE3\x81\xAE\xE3\x83\x95\xE3\x82\xA1\xE3\x82\xA4\xE3\x83\xAB\xE3\x82\x92\xE8\xBB\xA2\xE9\x80\x81\xE3\x81\x97\xE3\x81\xBE\xE3\x81\x99."
 #define MSGJPN059		"\xE8\xBB\xA2\xE9\x80\x81\xE3\x81\x99\xE3\x82\x8B\xE3\x83\x95\xE3\x82\xA1\xE3\x82\xA4\xE3\x83\xAB\xE3\x81\xAF\xE3\x81\x82\xE3\x82\x8A\xE3\x81\xBE\xE3\x81\x9B\xE3\x82\x93."
 #define MSGJPN060		"%d\xE5\x80\x8B\xE3\x81\xAE\xE3\x83\x95\xE3\x82\xA9\xE3\x83\xAB\xE3\x83\x80\xE3\x82\x92\xE4\xBD\x9C\xE6\x88\x90\xE3\x81\x97\xE3\x81\xBE\xE3\x81\x99."
@@ -184,9 +184,9 @@
 #define MSGJPN184		"JRE32.DLL Ver %x.%x (C) \xE5\xB1\xB1\xE7\x94\xB0\xE5\x92\x8C\xE5\xA4\xAB\xE3\x81\x95\xE3\x82\x93"
 #define MSGJPN185		"\xE3\x83\x95\xE3\x82\xA9\xE3\x83\xAB\xE3\x83\x80\xE3\x82\x92\xE9\x81\xB8\xE6\x8A\x9E\xE3\x81\x97\xE3\x81\xA6\xE3\x81\x8F\xE3\x81\xA0\xE3\x81\x95\xE3\x81\x84"
 #define MSGJPN186		"\xE3\x83\xA6\xE3\x83\xBC\xE3\x82\xB6"
-#define MSGJPN187		"\xE8\xBB\xA2\xE9\x80\x81\xEF\xBC\x91"
-#define MSGJPN188		"\xE8\xBB\xA2\xE9\x80\x81\xEF\xBC\x92"
-#define MSGJPN189		"\xE8\xBB\xA2\xE9\x80\x81\xEF\xBC\x93"
+#define MSGJPN187		"\xE8\xBB\xA2\xE9\x80\x81\x31"
+#define MSGJPN188		"\xE8\xBB\xA2\xE9\x80\x81\x32"
+#define MSGJPN189		"\xE8\xBB\xA2\xE9\x80\x81\x33"
 #define MSGJPN190		"\xE3\x83\x9F\xE3\x83\xA9\xE3\x83\xBC\xE3\x83\xAA\xE3\x83\xB3\xE3\x82\xB0"
 #define MSGJPN191		"\xE6\x93\x8D\xE4\xBD\x9C"
 #define MSGJPN192		"\xE8\xA1\xA8\xE7\xA4\xBA"
@@ -215,7 +215,7 @@
 #define MSGJPN215		"OTP MD5"
 #define MSGJPN216		"OTP SHA-1"
 #define MSGJPN217		"\xE3\x83\x93\xE3\x83\xA5\xE3\x83\xBC\xE3\x83\xAF\xE3\x81\xAE\xE9\x81\xB8\xE6\x8A\x9E"
-#define MSGJPN218		"\xE5\xAE\x9F\xE8\xA1\x8C\xE3\x83\x95\xE3\x82\xA1\xE3\x82\xA4\xE3\x83\xAB\0*.exe;*.com;*.bat\0\xE5\x85\xA8\xE3\x81\xA6\xE3\x81\xAEﾌｧｲﾙ\0*\0"
+#define MSGJPN218		"\xE5\xAE\x9F\xE8\xA1\x8C\xE3\x83\x95\xE3\x82\xA1\xE3\x82\xA4\xE3\x83\xAB\0*.exe;*.com;*.bat\0\xE5\x85\xA8\xE3\x81\xA6\xE3\x81\xAE\xE3\x83\x95\xE3\x82\xA1\xE3\x82\xA4\xE3\x83\xAB\0*\0"
 #define MSGJPN219		"Wave\xE3\x83\x95\xE3\x82\xA1\xE3\x82\xA4\xE3\x83\xAB"
 #define MSGJPN220		"\xE3\x83\x80\xE3\x82\xA4\xE3\x82\xA2\xE3\x83\xAB\xE3\x82\xA2\xE3\x83\x83\xE3\x83\x97\xE3\x82\x92\xE5\x88\x87\xE6\x96\xAD\xE3\x81\x97\xE3\x81\xA6\xE3\x81\x84\xE3\x81\xBE\xE3\x81\x99."
 #define MSGJPN221		"\xE3\x83\x80\xE3\x82\xA4\xE3\x82\xA2\xE3\x83\xAB\xE3\x82\xA2\xE3\x83\x83\xE3\x83\x97\xE3\x81\xA7\xE6\x8E\xA5\xE7\xB6\x9A\xE3\x81\x97\xE3\x81\xA6\xE3\x81\x84\xE3\x81\xBE\xE3\x81\x99."
@@ -248,9 +248,9 @@
 #define MSGJPN248		"\xE3\x83\xAD\xE3\x83\xBC\xE3\x82\xAB\xE3\x83\xAB\xE7\xA9\xBA %s"
 #define MSGJPN249		"\xE8\xBB\xA2\xE9\x80\x81\xE5\xBE\x85\xE3\x81\xA1\xE3\x83\x95\xE3\x82\xA1\xE3\x82\xA4\xE3\x83\xAB%d\xE5\x80\x8B"
 #define MSGJPN250		"\xE5\x8F\x97\xE4\xBF\xA1\xE4\xB8\xAD %s"
-#define MSGJPN251		"Err\xEF\xBC\x9A\xE3\x82\xB7\xE3\x83\xBC\xE3\x83\x89\xE6\x96\x87\xE5\xAD\x97\xE5\x88\x97"
-#define MSGJPN252		"Err\xEF\xBC\x9A\xE3\x82\xB7\xE3\x83\xBC\xE3\x83\x89\xE6\x96\x87\xE5\xAD\x97\xE5\x88\x97"
-#define MSGJPN253		"Err\xEF\xBC\x9A\xE3\x82\xB7\xE3\x83\xBC\xE3\x82\xB1\xE3\x83\xB3\xE3\x82\xB9\xE7\x95\xAA\xE5\x8F\xB7"
+#define MSGJPN251		"Err: \xE3\x82\xB7\xE3\x83\xBC\xE3\x83\x89\xE6\x96\x87\xE5\xAD\x97\xE5\x88\x97"
+#define MSGJPN252		"Err: \xE3\x82\xB7\xE3\x83\xBC\xE3\x83\x89\xE6\x96\x87\xE5\xAD\x97\xE5\x88\x97"
+#define MSGJPN253		"Err: \xE3\x82\xB7\xE3\x83\xBC\xE3\x82\xB1\xE3\x83\xB3\xE3\x82\xB9\xE7\x95\xAA\xE5\x8F\xB7"
 #define MSGJPN254		"MS Shell Dlg"
 #define MSGJPN255		"\xE3\x82\xA2\xE3\x83\x83\xE3\x83\x97\xE3\x83\xAD\xE3\x83\xBC\xE3\x83\x89(&U)"
 #define MSGJPN256		"\xE5\x90\x8D\xE5\x89\x8D\xE3\x82\x92\xE5\xA4\x89\xE3\x81\x88\xE3\x81\xA6\xE3\x82\xA2\xE3\x83\x83\xE3\x83\x97\xE3\x83\xAD\xE3\x83\xBC\xE3\x83\x89(&P)..."
@@ -273,14 +273,14 @@
 #define MSGJPN273		"\xE6\x9C\x80\xE6\x96\xB0\xE3\x81\xAE\xE6\x83\x85\xE5\xA0\xB1\xE3\x81\xAB\xE6\x9B\xB4\xE6\x96\xB0(&F)"
 #define MSGJPN274		"\xE9\x96\x8B\xE3\x81\x8F(&O)"
 #define MSGJPN275		"%s\xE3\x81\xA7\xE9\x96\x8B\xE3\x81\x8F(&%d)"
-#define MSGJPN276		"WS_FTP.INI\0ws_ftp.ini\0\xE5\x85\xA8\xE3\x81\xA6\xE3\x81\xAEﾌｧｲﾙ\0*\0"
+#define MSGJPN276		"WS_FTP.INI\0ws_ftp.ini\0\xE5\x85\xA8\xE3\x81\xA6\xE3\x81\xAE\xE3\x83\x95\xE3\x82\xA1\xE3\x82\xA4\xE3\x83\xAB\0*\0"
 #define MSGJPN277		"Wave\xE3\x83\x95\xE3\x82\xA1\xE3\x82\xA4\xE3\x83\xAB\0*.wav\0\xE5\x85\xA8\xE3\x81\xA6\xE3\x81\xAE\xE3\x83\x95\xE3\x82\xA1\xE3\x82\xA4\xE3\x83\xAB\0*\0"
-#define MSGJPN278		"\xE7\x90\x86\xE7\x94\xB1\xEF\xBC\x9A%s"
+#define MSGJPN278		"\xE7\x90\x86\xE7\x94\xB1: %s"
 #define MSGJPN279		"Listen\xE3\x82\xBD\xE3\x82\xB1\xE3\x83\x83\xE3\x83\x88\xE3\x81\x8C\xE5\x8F\x96\xE5\xBE\x97\xE3\x81\xA7\xE3\x81\x8D\xE3\x81\xBE\xE3\x81\x9B\xE3\x82\x93"
 #define MSGJPN280		"Data\xE3\x82\xBD\xE3\x82\xB1\xE3\x83\x83\xE3\x83\x88\xE3\x81\x8C\xE5\x8F\x96\xE5\xBE\x97\xE3\x81\xA7\xE3\x81\x8D\xE3\x81\xBE\xE3\x81\x9B\xE3\x82\x93"
 #define MSGJPN281		"PASV\xE3\x83\xA2\xE3\x83\xBC\xE3\x83\x89\xE3\x81\xA7\xE6\x8E\xA5\xE7\xB6\x9A\xE3\x81\xA7\xE3\x81\x8D\xE3\x81\xBE\xE3\x81\x9B\xE3\x82\x93"
 #define MSGJPN282		"INI\xE3\x83\x95\xE3\x82\xA1\xE3\x82\xA4\xE3\x83\xAB\xE5\x90\x8D\xE3\x81\x8C\xE6\x8C\x87\xE5\xAE\x9A\xE3\x81\x95\xE3\x82\x8C\xE3\x81\xA6\xE3\x81\x84\xE3\x81\xBE\xE3\x81\x9B\xE3\x82\x93"
-#define MSGJPN283		"INI\xE3\x83\x95\xE3\x82\xA1\xE3\x82\xA4\xE3\x83\xAB\xE6\x8C\x87\xE5\xAE\x9A\xEF\xBC\x9A"
+#define MSGJPN283		"INI\xE3\x83\x95\xE3\x82\xA1\xE3\x82\xA4\xE3\x83\xAB\xE6\x8C\x87\xE5\xAE\x9A: "
 #define MSGJPN284		"http://sourceforge.jp/projects/ffftp/"
 #define MSGJPN285		"\xE3\x83\xAC\xE3\x82\xB8\xE3\x82\xB9\xE3\x83\x88\xE3\x83\xAA\xE3\x82\xA8\xE3\x83\x87\xE3\x82\xA3\xE3\x82\xBF\xE3\x81\x8C\xE8\xB5\xB7\xE5\x8B\x95\xE3\x81\xA7\xE3\x81\x8D\xE3\x81\xBE\xE3\x81\x9B\xE3\x82\x93\xE3\x81\xA7\xE3\x81\x97\xE3\x81\x9F"
 #define MSGJPN286		"\xE8\xA8\xAD\xE5\xAE\x9A\xE3\x83\x95\xE3\x82\xA1\xE3\x82\xA4\xE3\x83\xAB\xE3\x81\xAE\xE4\xBF\x9D\xE5\xAD\x98"

--- a/mesg-jpn.old.h
+++ b/mesg-jpn.old.h
@@ -49,12 +49,12 @@
 #define MSGJPN049		"ƒtƒ@ƒCƒ‹ˆê——‚̎擾‚ÉŽ¸”s‚µ‚Ü‚µ‚½."
 #define MSGJPN050		"ŒŸõiƒ[ƒJƒ‹j"
 #define MSGJPN051		"ŒŸõiƒzƒXƒgj"
-#define MSGJPN052		"íœF %s"
-#define MSGJPN053		"ì¬F %s"
-#define MSGJPN054		"“]‘—F %s"
-#define MSGJPN055		"íœF %s"
-#define MSGJPN056		"ì¬F %s"
-#define MSGJPN057		"“]‘—F %s"
+#define MSGJPN052		"íœ: %s"
+#define MSGJPN053		"ì¬: %s"
+#define MSGJPN054		"“]‘—: %s"
+#define MSGJPN055		"íœ: %s"
+#define MSGJPN056		"ì¬: %s"
+#define MSGJPN057		"“]‘—: %s"
 #define MSGJPN058		"%dŒÂ‚̃tƒ@ƒCƒ‹‚ð“]‘—‚µ‚Ü‚·."
 #define MSGJPN059		"“]‘—‚·‚éƒtƒ@ƒCƒ‹‚Í‚ ‚è‚Ü‚¹‚ñ."
 #define MSGJPN060		"%dŒÂ‚̃tƒHƒ‹ƒ_‚ðì¬‚µ‚Ü‚·."
@@ -184,9 +184,9 @@
 #define MSGJPN184		"JRE32.DLL Ver %x.%x (C) ŽR“c˜a•v‚³‚ñ"
 #define MSGJPN185		"ƒtƒHƒ‹ƒ_‚ð‘I‘ð‚µ‚Ä‚­‚¾‚³‚¢"
 #define MSGJPN186		"ƒ†[ƒU"
-#define MSGJPN187		"“]‘—‚P"
-#define MSGJPN188		"“]‘—‚Q"
-#define MSGJPN189		"“]‘—‚R"
+#define MSGJPN187		"“]‘—1"
+#define MSGJPN188		"“]‘—2"
+#define MSGJPN189		"“]‘—3"
 #define MSGJPN190		"ƒ~ƒ‰[ƒŠƒ“ƒO"
 #define MSGJPN191		"‘€ì"
 #define MSGJPN192		"•\Ž¦"
@@ -215,7 +215,7 @@
 #define MSGJPN215		"OTP MD5"
 #define MSGJPN216		"OTP SHA-1"
 #define MSGJPN217		"ƒrƒ…[ƒ‚Ì‘I‘ð"
-#define MSGJPN218		"ŽÀsƒtƒ@ƒCƒ‹\0*.exe;*.com;*.bat\0‘S‚Ä‚Ì̧²Ù\0*\0"
+#define MSGJPN218		"ŽÀsƒtƒ@ƒCƒ‹\0*.exe;*.com;*.bat\0‘S‚Ẵtƒ@ƒCƒ‹\0*\0"
 #define MSGJPN219		"Waveƒtƒ@ƒCƒ‹"
 #define MSGJPN220		"ƒ_ƒCƒAƒ‹ƒAƒbƒv‚ðØ’f‚µ‚Ä‚¢‚Ü‚·."
 #define MSGJPN221		"ƒ_ƒCƒAƒ‹ƒAƒbƒv‚Őڑ±‚µ‚Ä‚¢‚Ü‚·."
@@ -248,9 +248,9 @@
 #define MSGJPN248		"ƒ[ƒJƒ‹‹ó %s"
 #define MSGJPN249		"“]‘—‘Ò‚¿ƒtƒ@ƒCƒ‹%dŒÂ"
 #define MSGJPN250		"ŽóM’† %s"
-#define MSGJPN251		"ErrFƒV[ƒh•¶Žš—ñ"
-#define MSGJPN252		"ErrFƒV[ƒh•¶Žš—ñ"
-#define MSGJPN253		"ErrFƒV[ƒPƒ“ƒX”ԍ†"
+#define MSGJPN251		"Err: ƒV[ƒh•¶Žš—ñ"
+#define MSGJPN252		"Err: ƒV[ƒh•¶Žš—ñ"
+#define MSGJPN253		"Err: ƒV[ƒPƒ“ƒX”ԍ†"
 #define MSGJPN254		"MS Shell Dlg"
 #define MSGJPN255		"ƒAƒbƒvƒ[ƒh(&U)"
 #define MSGJPN256		"–¼‘O‚ð•Ï‚¦‚ăAƒbƒvƒ[ƒh(&P)..."
@@ -273,14 +273,14 @@
 #define MSGJPN273		"ÅV‚̏î•ñ‚ɍXV(&F)"
 #define MSGJPN274		"ŠJ‚­(&O)"
 #define MSGJPN275		"%s‚ÅŠJ‚­(&%d)"
-#define MSGJPN276		"WS_FTP.INI\0ws_ftp.ini\0‘S‚Ä‚Ì̧²Ù\0*\0"
+#define MSGJPN276		"WS_FTP.INI\0ws_ftp.ini\0‘S‚Ẵtƒ@ƒCƒ‹\0*\0"
 #define MSGJPN277		"Waveƒtƒ@ƒCƒ‹\0*.wav\0‘S‚Ẵtƒ@ƒCƒ‹\0*\0"
-#define MSGJPN278		"——RF%s"
+#define MSGJPN278		"——R: %s"
 #define MSGJPN279		"Listenƒ\ƒPƒbƒg‚ªŽæ“¾‚Å‚«‚Ü‚¹‚ñ"
 #define MSGJPN280		"Dataƒ\ƒPƒbƒg‚ªŽæ“¾‚Å‚«‚Ü‚¹‚ñ"
 #define MSGJPN281		"PASVƒ‚[ƒh‚Őڑ±‚Å‚«‚Ü‚¹‚ñ"
 #define MSGJPN282		"INIƒtƒ@ƒCƒ‹–¼‚ªŽw’肳‚ê‚Ä‚¢‚Ü‚¹‚ñ"
-#define MSGJPN283		"INIƒtƒ@ƒCƒ‹Žw’èF"
+#define MSGJPN283		"INIƒtƒ@ƒCƒ‹Žw’è: "
 #define MSGJPN284		"http://sourceforge.jp/projects/ffftp/"
 #define MSGJPN285		"ƒŒƒWƒXƒgƒŠƒGƒfƒBƒ^‚ª‹N“®‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½"
 #define MSGJPN286		"Ý’èƒtƒ@ƒCƒ‹‚Ì•Û‘¶"