X-Git-Url: http://git.sourceforge.jp/view?a=blobdiff_plain;f=Resource_eng%2FFFFTP-eng.rc;h=d031279dc32f4cc9c2ffc06749a7e8937424cfaf;hb=663728dfaea4b4e0da170722b4046764e01555dc;hp=4a8a85bfd7182dcda05aab6c7beae7c906284f84;hpb=54e22287e55f2b2a890a8fdda61bb128be5f787f;p=ffftp%2Fffftp.git

diff --git a/Resource_eng/FFFTP-eng.rc b/Resource_eng/FFFTP-eng.rc
index 4a8a85b..d031279 100644
--- a/Resource_eng/FFFTP-eng.rc
+++ b/Resource_eng/FFFTP-eng.rc
@@ -73,6 +73,7 @@ main_toolbar_bmp        BITMAP                  "toolbar1.bmp"
 remote_toolbar_bmp      BITMAP                  "main_too.bmp"
 dirattr_bmp             BITMAP                  "list_bmp.bmp"
 hlist_bmp               BITMAP                  "bitmap1.bmp"
+dirattr16_bmp           BITMAP                  "list_16.bmp"
 
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -219,6 +220,7 @@ BEGIN
         MENUITEM "URL to clipboard",            MENU_URL_COPY
         MENUITEM "Download all",                MENU_DOWNLOAD_ALL
         MENUITEM "Upload all",                  MENU_UPLOAD_ALL
+        MENUITEM "Switch OSS<->GUARDIAN",       MENU_SWITCH_OSS
     END
 END
 
@@ -231,13 +233,13 @@ END
 about_dlg DIALOGEX 0, 0, 315, 317
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "About FFFTP"
-FONT 9, "MS Sans Serif", 0, 0, 0x0
+FONT 9, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     DEFPUSHBUTTON   "OK",IDOK,132,296,50,14
     ICON            ffftp,-1,7,4,20,20
-    CTEXT           "FFFTP  Ver 1.99",-1,110,11,90,8
+    CTEXT           "FFFTP  Ver 1.98e",-1,110,11,90,8
     CTEXT           "FFFTP is freeware",-1,7,281,301,8
-    CTEXT           "Copyright(C) 1997-2010 Sota && cooperators\nCopyright (C) 2011 FFFTP Project (Hiromichi Matsushima, Suguru Kawamoto, IWAMOTO Kouichi, vitamin0x, unarist, Asami, fortran90, tomo1192)",-1,7,25,301,44
+    CTEXT           "Copyright(C) 1997-2010 Sota && cooperators\nCopyright (C) 2011-2012 FFFTP Project (Hiromichi Matsushima, Suguru Kawamoto, IWAMOTO Kouichi, vitamin0x, unarist, Asami, fortran90, tomo1192, Yuji Tanaka, Moriguchi Hirokazu)",-1,7,25,301,44
     CTEXT           "",ABOUT_JRE,7,93,301,8
     EDITTEXT        ABOUT_URL,7,76,301,12,ES_CENTER | ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER
     CTEXT           "OLE D&&D by Yutaka Hirata-san, nakka-san\nIn site file mover by Hirata-san\nAny issues by miau-san\nMaster Password by Gengen-san\nAES encryption by Moca-san\n\nI had cooperation of many other one.",-1,7,142,301,59
@@ -247,27 +249,27 @@ END
 
 transfer_dlg DIALOG  0, 0, 199, 91
 STYLE DS_SETFONT | DS_MODALFRAME | WS_MINIMIZEBOX | WS_CAPTION | WS_SYSMENU
-FONT 9, "MS Sans Serif"
+FONT 9, "MS Shell Dlg"
 BEGIN
     PUSHBUTTON      "Cancel this File",IDCANCEL,7,73,62,14
     PUSHBUTTON      "Cancel from Next",TRANS_STOP_NEXT,78,73,62,14
     PUSHBUTTON      "Cancel All",TRANS_STOP_ALL,150,73,42,14
-    LTEXT           "Host :",-1,7,5,27,8
+    LTEXT           "Host:",-1,7,5,27,8
     LTEXT           "",TRANS_REMOTE,45,5,147,8,SS_NOPREFIX
-    LTEXT           "Local :",-1,7,18,27,8
+    LTEXT           "Local:",-1,7,18,27,8
     LTEXT           "",TRANS_LOCAL,45,18,147,8,SS_NOPREFIX
-    LTEXT           "Status :",-1,7,44,27,8
+    LTEXT           "Status:",-1,7,44,27,8
     LTEXT           "",TRANS_STATUS,45,44,147,8
     CONTROL         "Progress1",TRANS_TIME_BAR,"msctls_progress32",0x0,7,58,185,9
-    LTEXT           "Mode :",-1,7,31,27,8
+    LTEXT           "Mode:",-1,7,31,27,8
     LTEXT           "",TRANS_MODE,45,31,51,8
-    LTEXT           "Kanji Code :",-1,98,31,39,8
+    LTEXT           "Kanji Code:",-1,98,31,39,8
     LTEXT           "",TRANS_KANJI,140,31,52,8
 END
 
 rename_dlg DIALOG  0, 0, 187, 69
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-FONT 9, "MS Sans Serif"
+FONT 9, "MS Shell Dlg"
 BEGIN
     EDITTEXT        RENAME_NEW,7,34,173,12,ES_AUTOHSCROLL
     DEFPUSHBUTTON   "OK",IDOK,9,51,50,14
@@ -279,7 +281,7 @@ END
 
 delete_dlg DIALOG  0, 0, 209, 55
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-FONT 9, "MS Sans Serif"
+FONT 9, "MS Shell Dlg"
 BEGIN
     DEFPUSHBUTTON   "&Delete",IDOK,7,37,45,14
     PUSHBUTTON      "&Cancel",DELETE_NO,57,37,44,14
@@ -292,7 +294,7 @@ END
 hostlist_dlg DIALOG  0, 0, 222, 120
 STYLE DS_LOCALEDIT | DS_SETFONT | WS_POPUP | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME
 CAPTION "Host List"
-FONT 9, "MS Sans Serif"
+FONT 9, "MS Shell Dlg"
 BEGIN
     CONTROL         "Tree1",HOST_LIST,"SysTreeView32",TVS_HASLINES | TVS_DISABLEDRAGDROP | TVS_SHOWSELALWAYS | TVS_FULLROWSELECT | WS_BORDER | WS_TABSTOP,7,6,152,89
     DEFPUSHBUTTON   "&Connect",IDOK,27,102,50,14
@@ -310,7 +312,7 @@ END
 
 hset_main_dlg DIALOG  0, 0, 207, 155
 STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
-FONT 9, "MS Sans Serif"
+FONT 9, "MS Shell Dlg"
 BEGIN
     LTEXT           "Profile &Name",-1,7,7,94,8
     EDITTEXT        HSET_HOST,7,17,94,12,ES_AUTOHSCROLL
@@ -334,7 +336,7 @@ END
 FILEOPENORD_1 DIALOG  109, 35, 165, 134
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Open"
-FONT 9, "MS Sans Serif"
+FONT 9, "MS Shell Dlg"
 BEGIN
     LTEXT           "&Folder",-1,7,6,92,9
     LISTBOX         lst2,7,32,92,68,LBS_SORT | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_VSCROLL | WS_TABSTOP
@@ -352,18 +354,18 @@ BEGIN
     LTEXT           "",stc1,9,18,88,8
 END
 
-opt_user_dlg DIALOG  0, 0, 211, 139
+opt_user_dlg DIALOG  0, 0, 211, 155
 STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
-FONT 9, "MS Sans Serif"
+FONT 9, "MS Shell Dlg"
 BEGIN
     LTEXT           "&Mail address",-1,7,7,59,8
     EDITTEXT        USER_ADRS,7,18,196,12,ES_AUTOHSCROLL
     LTEXT           "This address is used for the anonymous FTP password.",-1,28,36,169,18,SS_SUNKEN
 END
 
-opt_tool_dlg DIALOG  0, 0, 211, 139
+opt_tool_dlg DIALOG  0, 0, 211, 155
 STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
-FONT 9, "MS Sans Serif"
+FONT 9, "MS Shell Dlg"
 BEGIN
     LTEXT           "Viewer &1",-1,7,7,39,8
     EDITTEXT        TOOL_EDITOR1,7,18,183,12,ES_AUTOHSCROLL
@@ -381,9 +383,9 @@ END
 chmod_dlg DIALOG  0, 0, 171, 109
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Permission"
-FONT 9, "MS Sans Serif"
+FONT 9, "MS Shell Dlg"
 BEGIN
-    LTEXT           "Current Permission :",-1,61,74,61,8
+    LTEXT           "Current Permission:",-1,61,74,61,8
     EDITTEXT        PERM_NOW,124,72,25,12,ES_AUTOHSCROLL | ES_NUMBER
     GROUPBOX        "Owner",-1,7,7,48,58
     CONTROL         "Read",PERM_O_READ,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,21,31,10
@@ -406,7 +408,7 @@ END
 sort_dlg DIALOG  0, 0, 187, 197
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Sort"
-FONT 9, "MS Sans Serif"
+FONT 9, "MS Shell Dlg"
 BEGIN
     GROUPBOX        "Local",-1,7,7,81,150
     GROUPBOX        "&File",-1,10,17,74,80,WS_GROUP
@@ -438,7 +440,7 @@ END
 
 mkdir_dlg DIALOG  0, 0, 187, 58
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-FONT 9, "MS Sans Serif"
+FONT 9, "MS Shell Dlg"
 BEGIN
     EDITTEXT        INP_INPSTR,7,21,173,12,ES_AUTOHSCROLL
     DEFPUSHBUTTON   "OK",IDOK,36,40,50,14
@@ -447,9 +449,9 @@ BEGIN
     LTEXT           "Enter new folder name:",-1,7,7,160,8
 END
 
-opt_misc_dlg DIALOG  0, 0, 211, 139
+opt_misc_dlg DIALOG  0, 0, 211, 155
 STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
-FONT 9, "MS Sans Serif"
+FONT 9, "MS Shell Dlg"
 BEGIN
     CONTROL         "&Save window position",MISC_WINPOS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,7,173,10
     CONTROL         "&Cache file list (activate on next start)",MISC_CACHE,
@@ -471,7 +473,7 @@ END
 hostname_dlg DIALOG  0, 0, 187, 93
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION
 CAPTION "Quick Connect"
-FONT 9, "MS Sans Serif"
+FONT 9, "MS Shell Dlg"
 BEGIN
     LTEXT           "&Host Name/Address",-1,7,6,130,8
     COMBOBOX        QHOST_HOST,7,16,173,86,CBS_DROPDOWN | CBS_AUTOHSCROLL | CBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
@@ -488,7 +490,7 @@ END
 passwd_dlg DIALOG  0, 0, 187, 43
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION
 CAPTION "Password/Pass phrase"
-FONT 9, "MS Sans Serif"
+FONT 9, "MS Shell Dlg"
 BEGIN
     EDITTEXT        INP_INPSTR,7,7,173,12,ES_PASSWORD | ES_AUTOHSCROLL
     DEFPUSHBUTTON   "OK",IDOK,36,25,50,14
@@ -499,7 +501,7 @@ END
 newmasterpasswd_dlg DIALOGEX 0, 0, 187, 43
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION
 CAPTION "Enter new master password twice"
-FONT 9, "MS Sans Serif", 0, 0, 0x0
+FONT 9, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     EDITTEXT        INP_INPSTR,7,7,173,12,ES_PASSWORD | ES_AUTOHSCROLL
     DEFPUSHBUTTON   "OK",IDOK,25,25,43,14
@@ -511,7 +513,7 @@ END
 username_dlg DIALOG  0, 0, 187, 58
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "User Name"
-FONT 9, "MS Sans Serif"
+FONT 9, "MS Shell Dlg"
 BEGIN
     EDITTEXT        INP_INPSTR,7,7,173,12,ES_AUTOHSCROLL
     CONTROL         "Anonymous(&A)",INP_ANONYMOUS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,25,73,10
@@ -522,7 +524,7 @@ END
 chdir_dlg DIALOG  0, 0, 187, 43
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION
 CAPTION "Folder"
-FONT 9, "MS Sans Serif"
+FONT 9, "MS Shell Dlg"
 BEGIN
     EDITTEXT        INP_INPSTR,7,7,173,12,ES_AUTOHSCROLL
     DEFPUSHBUTTON   "OK",IDOK,36,25,50,14
@@ -533,7 +535,7 @@ END
 exit_dlg DIALOG  0, 0, 143, 64
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION
 CAPTION "Exit"
-FONT 9, "MS Sans Serif"
+FONT 9, "MS Shell Dlg"
 BEGIN
     DEFPUSHBUTTON   "Cancel",IDCANCEL,14,46,50,14
     PUSHBUTTON      "Force Exit",IDOK,78,46,50,14
@@ -543,16 +545,16 @@ END
 forcepasschange_dlg DIALOG  0, 0, 211, 64
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION
 CAPTION "Force reset of master password"
-FONT 9, "MS Sans Serif"
+FONT 9, "MS Shell Dlg"
 BEGIN
     LTEXT           "All the registered FTP passwords will be invalidated if you forcely set a new master password.\r\nAre you sure you want to set a new password?",-1,7,7,196,36
     DEFPUSHBUTTON   "Yes",IDOK,48,42,50,14
     PUSHBUTTON      "No",IDCANCEL,112,42,50,14
 END
 
-opt_trmode2_dlg DIALOG  0, 0, 211, 139
+opt_trmode2_dlg DIALOG  0, 0, 211, 155
 STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
-FONT 9, "MS Sans Serif"
+FONT 9, "MS Shell Dlg"
 BEGIN
     GROUPBOX        "Filename",-1,7,7,196,69
     CONTROL         "Convert to &lowercase",TRMODE2_LOWER,"Button",BS_AUTORADIOBUTTON | WS_GROUP,13,18,143,10
@@ -561,16 +563,16 @@ BEGIN
     LTEXT           "&Timeout",-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           "(0 to 300sec: 0=No timeout)",-1,45,94,107,8
+    LTEXT           "(0 to 300sec; 0=No timeout)",-1,45,94,107,8
     LTEXT           "&Default local folder",-1,7,108,196,8
     EDITTEXT        TRMODE2_LOCAL,7,118,182,12,ES_AUTOHSCROLL
     PUSHBUTTON      "...",TRMODE2_LOCAL_BR,190,118,13,13
     LTEXT           "Mirror Upload/Download settings are on the Mirror tab.",-1,18,56,181,17,SS_SUNKEN
 END
 
-opt_notify_dlg DIALOGEX 0, 0, 211, 139
+opt_notify_dlg DIALOGEX 0, 0, 211, 155
 STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
-FONT 9, "MS Sans Serif", 0, 0, 0x0
+FONT 9, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     GROUPBOX        "If File Already Exists",-1,7,7,196,67,WS_GROUP
     GROUPBOX        "Download",-1,11,20,188,24,WS_GROUP
@@ -591,7 +593,7 @@ END
 bmark_dlg DIALOG  0, 0, 222, 109
 STYLE DS_SETFONT | WS_POPUP | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME
 CAPTION "Bookmarks"
-FONT 9, "MS Sans Serif"
+FONT 9, "MS Shell Dlg"
 BEGIN
     LISTBOX         BMARK_LIST,7,7,152,75,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
     DEFPUSHBUTTON   "&Close",IDOK,91,90,50,14
@@ -605,9 +607,9 @@ BEGIN
     PUSHBUTTON      "&Help",9,165,90,50,14
 END
 
-opt_fire_dlg DIALOG  0, 0, 211, 139
+opt_fire_dlg DIALOG  0, 0, 211, 155
 STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
-FONT 9, "MS Sans Serif"
+FONT 9, "MS Shell Dlg"
 BEGIN
     LTEXT           "Firewall &Type",-1,7,7,90,8
     COMBOBOX        FIRE_TYPE,7,16,197,104,CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
@@ -633,7 +635,7 @@ END
 
 hset_adv_dlg DIALOG  0, 0, 207, 155
 STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
-FONT 9, "MS Sans Serif"
+FONT 9, "MS Shell Dlg"
 BEGIN
     CONTROL         "Use &Firewall",HSET_FIREWALL,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,7,7,92,10
     CONTROL         "Use PAS&V mode",HSET_PASV,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,7,22,92,10
@@ -655,8 +657,8 @@ END
 
 diskfull_dlg DIALOG  0, 0, 159, 42
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION
-CAPTION "FFFTP:Error"
-FONT 9, "MS Sans Serif"
+CAPTION "FFFTP: Error"
+FONT 9, "MS Shell Dlg"
 BEGIN
     DEFPUSHBUTTON   "Cencal this File",IDOK,13,24,66,14
     PUSHBUTTON      "Cencel All",IDCANCEL,95,24,50,14
@@ -665,7 +667,7 @@ END
 
 find_dlg DIALOG  0, 0, 187, 56
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-FONT 9, "MS Sans Serif"
+FONT 9, "MS Shell Dlg"
 BEGIN
     EDITTEXT        INP_INPSTR,7,7,173,12,ES_AUTOHSCROLL
     CONTROL         "Regular Expression",INP_ANONYMOUS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,24,121,10
@@ -676,7 +678,7 @@ END
 mailadrs_dlg DIALOG  0, 0, 187, 89
 STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION
 CAPTION "FFFTP"
-FONT 9, "MS Sans Serif"
+FONT 9, "MS Shell Dlg"
 BEGIN
     EDITTEXT        INP_INPSTR,7,7,173,12,ES_AUTOHSCROLL
     DEFPUSHBUTTON   "OK",IDOK,13,71,50,14
@@ -687,9 +689,9 @@ BEGIN
     LTEXT           "You can reenter mail address at the Option dialog.",-1,16,54,164,10
 END
 
-opt_sound_dlg DIALOG  0, 0, 211, 139
+opt_sound_dlg DIALOG  0, 0, 211, 155
 STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
-FONT 9, "MS Sans Serif"
+FONT 9, "MS Shell Dlg"
 BEGIN
     CONTROL         "Play *.wav file at successful &connection",SOUND_CONNECT,
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,9,196,10
@@ -707,33 +709,43 @@ BEGIN
     PUSHBUTTON      "Test",SOUND_ERROR_TEST,166,88,37,13
 END
 
-downerr_dlg DIALOGEX 0, 0, 159, 65
+downerr_dlg DIALOG  0, 0, 223, 103
 STYLE DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | WS_POPUP | WS_CAPTION
-CAPTION "FFFTP:Error"
-FONT 9, "MS Sans Serif", 0, 0, 0x1
-BEGIN
-    DEFPUSHBUTTON   "Cancel this File",IDOK,7,47,82,14
-    PUSHBUTTON      "Cancel All",IDCANCEL,102,47,50,14
-    LTEXT           "Cannot download following file :",-1,7,4,138,10
-    LTEXT           "",UPDOWN_ERR_FNAME,7,16,145,8,SS_NOPREFIX
-    EDITTEXT        UPDOWN_ERR_MSG,7,29,145,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER,WS_EX_STATICEDGE
-END
-
-uperr_dlg DIALOGEX 0, 0, 159, 67
+CAPTION "FFFTP: Error"
+FONT 9, "MS Shell Dlg"
+BEGIN
+    CONTROL         "&Overwrite later",DOWN_EXIST_OVW,"Button",BS_AUTORADIOBUTTON | WS_GROUP,7,46,99,10
+    CONTROL         "&Resume later",DOWN_EXIST_RESUME,"Button",BS_AUTORADIOBUTTON,7,58,99,10
+    CONTROL         "&Skip",DOWN_EXIST_IGNORE,"Button",BS_AUTORADIOBUTTON,7,70,99,10
+    DEFPUSHBUTTON   "OK",IDOK,8,85,50,14,WS_GROUP
+    PUSHBUTTON      "&Do All",IDOK_ALL,63,85,50,14
+    PUSHBUTTON      "&Cancel All",IDCANCEL,118,85,50,14
+    PUSHBUTTON      "&Help",9,173,85,41,14
+    LTEXT           "Cannot download following file:",-1,7,4,184,10
+    LTEXT           "",UPDOWN_ERR_FNAME,7,16,184,8,SS_NOPREFIX
+    EDITTEXT        UPDOWN_ERR_MSG,7,28,209,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER,WS_EX_STATICEDGE
+END
+
+uperr_dlg DIALOG  0, 0, 223, 103
 STYLE DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | WS_POPUP | WS_CAPTION
-CAPTION "FFFTP:Error"
-FONT 9, "MS Sans Serif", 0, 0, 0x1
+CAPTION "FFFTP: Error"
+FONT 9, "MS Shell Dlg"
 BEGIN
-    DEFPUSHBUTTON   "Cancel this File",IDOK,7,49,82,14
-    PUSHBUTTON      "Cancel All",IDCANCEL,102,49,50,14
-    LTEXT           "Cannot upload following file.",-1,7,4,137,10
-    LTEXT           "",UPDOWN_ERR_FNAME,7,17,145,8,SS_NOPREFIX
-    EDITTEXT        UPDOWN_ERR_MSG,7,32,153,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER,WS_EX_STATICEDGE
+    CONTROL         "&Overwrite later",DOWN_EXIST_OVW,"Button",BS_AUTORADIOBUTTON | WS_GROUP,7,46,99,10
+    CONTROL         "&Resume later",DOWN_EXIST_RESUME,"Button",BS_AUTORADIOBUTTON,7,58,99,10
+    CONTROL         "&Skip",DOWN_EXIST_IGNORE,"Button",BS_AUTORADIOBUTTON,7,70,99,10
+    DEFPUSHBUTTON   "OK",IDOK,8,85,50,14,WS_GROUP
+    PUSHBUTTON      "&Do All",IDOK_ALL,63,85,50,14
+    PUSHBUTTON      "&Cancel All",IDCANCEL,118,85,50,14
+    PUSHBUTTON      "&Help",9,173,85,41,14
+    LTEXT           "Cannot upload following file:",-1,7,4,184,10
+    LTEXT           "",UPDOWN_ERR_FNAME,7,16,184,8,SS_NOPREFIX
+    EDITTEXT        UPDOWN_ERR_MSG,7,28,209,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER,WS_EX_STATICEDGE
 END
 
 hset_code_dlg DIALOGEX 0, 0, 207, 155
 STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
-FONT 9, "MS Sans Serif", 0, 0, 0x0
+FONT 9, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     GROUPBOX        "&Japanese Kanji Code",-1,7,7,98,106,WS_GROUP
     CONTROL         "No conversion",HSET_NO_CNV,"Button",BS_AUTORADIOBUTTON | WS_GROUP,12,21,91,10
@@ -754,29 +766,31 @@ BEGIN
     CONTROL         "Hankaku to Zenkaku",HSET_FN_HANCNV,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,111,108,91,10
 END
 
-opt_trmode1_dlg DIALOG  0, 0, 211, 139
+opt_trmode1_dlg DIALOG  0, 0, 211, 155
 STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
-FONT 9, "MS Sans Serif"
+FONT 9, "MS Shell Dlg"
 BEGIN
     GROUPBOX        "Transfer mode",-1,7,7,93,56
     CONTROL         "Always &ASCII mode",TRMODE_ASCII,"Button",BS_AUTORADIOBUTTON | WS_GROUP,13,19,85,10
     CONTROL         "Always &BINARY mode",TRMODE_BIN,"Button",BS_AUTORADIOBUTTON,13,33,84,10
     CONTROL         "&Filename dependent",TRMODE_AUTO,"Button",BS_AUTORADIOBUTTON,13,47,78,10
+    LTEXT           "->",-1,98,49,8,8
     GROUPBOX        "ASCII mode Filenames",-1,104,7,99,84,WS_GROUP
     LISTBOX         TRMODE_EXT_LIST,109,19,53,67,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
     PUSHBUTTON      "A&dd...",TRMODE_ADD,167,19,31,14
     PUSHBUTTON      "Delete",TRMODE_DEL,167,38,31,14
     CONTROL         "&Remove EOF for ASCII mode upload",TRMODE_EOF,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,94,196,10
-    CONTROL         "Re&tain file date/time on download",TRMODE_TIME,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,108,196,10
-    LTEXT           "->",-1,98,49,8,8
+    CONTROL         "Retain file date/&time on download",TRMODE_TIME,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,108,196,10
     CONTROL         "Truncate filename before &semicolon on download",TRMODE_SEMICOLON,
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,122,196,10
+    CONTROL         "Create &directory at file transfer with renaming",TRMODE_MAKEDIR,
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,136,196,10
 END
 
 up_exist_dlg DIALOG  0, 0, 234, 119
 STYLE DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | WS_POPUP | WS_CAPTION
 CAPTION "Upload"
-FONT 9, "MS Sans Serif"
+FONT 9, "MS Shell Dlg"
 BEGIN
     CONTROL         "&Overwrite existing file",UP_EXIST_OVW,"Button",BS_AUTORADIOBUTTON | WS_GROUP,8,38,99,10
     CONTROL         "Overwrite if upload file is &newer",UP_EXIST_NEW,"Button",BS_AUTORADIOBUTTON,7,50,118,10
@@ -795,7 +809,7 @@ END
 reginit_dlg DIALOG  0, 0, 155, 83
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION
 CAPTION "Erase All Settings"
-FONT 9, "MS Sans Serif"
+FONT 9, "MS Shell Dlg"
 BEGIN
     DEFPUSHBUTTON   "No",IDCANCEL,41,45,71,31
     PUSHBUTTON      "Yes",IDOK,125,62,23,14,NOT WS_TABSTOP
@@ -805,7 +819,7 @@ END
 
 updown_as_dlg DIALOG  0, 0, 187, 69
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION
-FONT 9, "MS Sans Serif"
+FONT 9, "MS Shell Dlg"
 BEGIN
     EDITTEXT        UPDOWNAS_NEW,7,34,173,12,ES_AUTOHSCROLL
     DEFPUSHBUTTON   "OK",IDOK,35,51,50,14
@@ -817,7 +831,7 @@ END
 re_passwd_dlg DIALOG  0, 0, 187, 62
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION
 CAPTION "Password"
-FONT 9, "MS Sans Serif"
+FONT 9, "MS Shell Dlg"
 BEGIN
     EDITTEXT        INP_INPSTR,7,27,173,12,ES_PASSWORD | ES_AUTOHSCROLL
     DEFPUSHBUTTON   "OK",IDOK,36,44,50,14
@@ -829,7 +843,7 @@ END
 savepass_dlg DIALOG  0, 0, 146, 50
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION
 CAPTION "Save Password"
-FONT 9, "MS Sans Serif"
+FONT 9, "MS Shell Dlg"
 BEGIN
     LTEXT           "Save correct password to host setting?",-1,7,7,132,17
     DEFPUSHBUTTON   "Yes",IDOK,17,29,50,14
@@ -839,7 +853,7 @@ END
 sel_local_dlg DIALOG  0, 0, 187, 106
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Select File (Local)"
-FONT 9, "MS Sans Serif"
+FONT 9, "MS Shell Dlg"
 BEGIN
     LTEXT           "&File to select",-1,7,7,109,8
     EDITTEXT        SEL_FNAME,7,17,173,12,ES_AUTOHSCROLL
@@ -858,7 +872,7 @@ END
 sel_remote_dlg DIALOG  0, 0, 187, 106
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Select File (Host)"
-FONT 9, "MS Sans Serif"
+FONT 9, "MS Shell Dlg"
 BEGIN
     LTEXT           "&File to select",-1,7,7,109,8
     EDITTEXT        SEL_FNAME,7,17,173,12,ES_AUTOHSCROLL
@@ -877,7 +891,7 @@ END
 mirror_up_dlg DIALOG  0, 0, 215, 135
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION
 CAPTION "Mirror Upload"
-FONT 9, "MS Sans Serif"
+FONT 9, "MS Shell Dlg"
 BEGIN
     DEFPUSHBUTTON   "Display Transfer Files",MIRRORUP_DISP,54,114,82,14
     PUSHBUTTON      "Start Now",IDOK,7,114,43,14
@@ -893,7 +907,7 @@ END
 account_dlg DIALOG  0, 0, 187, 42
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION
 CAPTION "Account"
-FONT 9, "MS Sans Serif"
+FONT 9, "MS Shell Dlg"
 BEGIN
     EDITTEXT        INP_INPSTR,7,7,173,12,ES_AUTOHSCROLL
     DEFPUSHBUTTON   "OK",IDOK,36,24,50,14
@@ -901,9 +915,9 @@ BEGIN
     CONTROL         "",INP_ANONYMOUS,"Button",BS_AUTOCHECKBOX | NOT WS_VISIBLE | WS_DISABLED | WS_TABSTOP,164,30,16,8
 END
 
-opt_mirror_dlg DIALOG  0, 0, 211, 139
+opt_mirror_dlg DIALOG  0, 0, 211, 155
 STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
-FONT 9, "MS Sans Serif"
+FONT 9, "MS Shell Dlg"
 BEGIN
     GROUPBOX        "Files Not Transferred",-1,7,7,95,85,WS_GROUP
     LISTBOX         MIRROR_NOTRN_LIST,12,20,50,69,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
@@ -925,7 +939,7 @@ END
 somecmd_dlg DIALOG  0, 0, 187, 61
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION
 CAPTION "Specify Command"
-FONT 9, "MS Sans Serif"
+FONT 9, "MS Shell Dlg"
 BEGIN
     EDITTEXT        INP_INPSTR,7,7,173,12,ES_AUTOHSCROLL
     DEFPUSHBUTTON   "OK",IDOK,10,43,50,14
@@ -938,7 +952,7 @@ END
 downname_dlg DIALOG  0, 0, 187, 42
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION
 CAPTION "Download File"
-FONT 9, "MS Sans Serif"
+FONT 9, "MS Shell Dlg"
 BEGIN
     EDITTEXT        INP_INPSTR,7,6,173,12,ES_AUTOHSCROLL
     DEFPUSHBUTTON   "OK",IDOK,36,24,50,14
@@ -946,9 +960,9 @@ BEGIN
     CONTROL         "",INP_ANONYMOUS,"Button",BS_AUTOCHECKBOX | NOT WS_VISIBLE | WS_DISABLED | WS_TABSTOP,164,30,16,8
 END
 
-opt_connect_dlg DIALOG  0, 0, 211, 139
+opt_connect_dlg DIALOG  0, 0, 211, 155
 STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
-FONT 9, "MS Sans Serif"
+FONT 9, "MS Shell Dlg"
 BEGIN
     CONTROL         "&Display Host List dialog at startup",CONNECT_CONNECT,
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,7,173,10
@@ -974,7 +988,7 @@ END
 rasnotify_dlg DIALOG  0, 0, 158, 46
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION
 CAPTION "FFFTP"
-FONT 9, "MS Sans Serif"
+FONT 9, "MS Shell Dlg"
 BEGIN
     DEFPUSHBUTTON   "Yes",IDOK,23,25,50,14
     PUSHBUTTON      "No",IDCANCEL,86,25,50,14
@@ -984,7 +998,7 @@ END
 filesize_dlg DIALOG  0, 0, 131, 76
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "File Size"
-FONT 9, "MS Sans Serif"
+FONT 9, "MS Shell Dlg"
 BEGIN
     DEFPUSHBUTTON   "OK",IDOK,42,55,50,14
     CTEXT           "",FSIZE_SIZE,7,18,117,8
@@ -995,7 +1009,7 @@ END
 filesize_notify_dlg DIALOG  0, 0, 155, 70
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "File Size"
-FONT 9, "MS Sans Serif"
+FONT 9, "MS Shell Dlg"
 BEGIN
     DEFPUSHBUTTON   "OK",IDOK,23,49,50,14
     PUSHBUTTON      "Cancel",IDCANCEL,82,49,50,14
@@ -1007,36 +1021,38 @@ END
 
 hset_adv2_dlg DIALOG  0, 0, 207, 155
 STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
-FONT 9, "MS Sans Serif"
+FONT 9, "MS Shell Dlg"
 BEGIN
     CONTROL         "Use &LIST command to get file list",HSET_LISTCMD,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,7,7,131,10
-    CONTROL         "Use &NLST -R for high-speed recursive search",HSET_NLST_R,
+    CONTROL         "Use &MLSD command to get file list if possible",HSET_MLSDCMD,
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,21,167,10
+    CONTROL         "Use &NLST -R for high-speed recursive search",HSET_NLST_R,
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,35,167,10
     CONTROL         "&Do not use full path to access files",HSET_FULLPATH,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,35,148,10
-    LTEXT           "&Permissions Change Command",-1,7,51,110,8
-    EDITTEXT        HSET_CHMOD_CMD,7,61,62,12,ES_AUTOHSCROLL
-    PUSHBUTTON      "Default",HSET_CHMOD_NOR,70,61,28,13
-    LTEXT           "&Host Type",-1,7,80,69,8
-    COMBOBOX        HSET_HOSTTYPE,7,90,71,75,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT           "NLST &Filename/Option",-1,7,109,89,8
-    EDITTEXT        HSET_LS_FNAME,7,119,62,12,ES_AUTOHSCROLL
-    PUSHBUTTON      "Delault",HSET_LS_FNAME_NOR,70,119,28,13
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,49,148,10
+    LTEXT           "&Permissions Change Command",-1,7,65,110,8
+    EDITTEXT        HSET_CHMOD_CMD,7,75,62,12,ES_AUTOHSCROLL
+    PUSHBUTTON      "Default",HSET_CHMOD_NOR,70,75,28,13
+    LTEXT           "&Host Type",-1,7,94,69,8
+    COMBOBOX        HSET_HOSTTYPE,7,104,71,75,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT           "NLST &Filename/Option",-1,7,123,89,8
+    EDITTEXT        HSET_LS_FNAME,7,133,62,12,ES_AUTOHSCROLL
+    PUSHBUTTON      "Delault",HSET_LS_FNAME_NOR,70,133,28,13
 END
 
 cwderr_dlg DIALOG  0, 0, 155, 57
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Error"
-FONT 9, "MS Sans Serif"
+FONT 9, "MS Shell Dlg"
 BEGIN
     PUSHBUTTON      "STOP",IDCANCEL,51,36,50,14
     CTEXT           "Cannot move to subfolder.",-1,7,7,141,8
     CTEXT           "Stop processing.",-1,7,20,141,8
 END
 
-opt_trmode3_dlg DIALOG  0, 0, 211, 139
+opt_trmode3_dlg DIALOG  0, 0, 211, 155
 STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
-FONT 9, "MS Sans Serif"
+FONT 9, "MS Shell Dlg"
 BEGIN
     CONTROL         "List1",TRMODE3_LIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,13,20,78,78
     PUSHBUTTON      "&Add",TRMODE3_ADD,95,20,31,14
@@ -1051,7 +1067,7 @@ END
 def_attr_dlg DIALOG  0, 0, 123, 69
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Default Permission"
-FONT 9, "MS Sans Serif"
+FONT 9, "MS Shell Dlg"
 BEGIN
     LTEXT           "&Filename",-1,7,7,49,8
     EDITTEXT        DEFATTR_FNAME,7,18,47,12,ES_AUTOHSCROLL
@@ -1066,7 +1082,7 @@ END
 
 fname_in_dlg DIALOG  0, 0, 86, 44
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-FONT 9, "MS Sans Serif"
+FONT 9, "MS Shell Dlg"
 BEGIN
     EDITTEXT        INP_INPSTR,7,7,72,12,ES_AUTOHSCROLL
     DEFPUSHBUTTON   "OK",IDOK,7,26,33,14
@@ -1077,7 +1093,7 @@ END
 otp_notify_dlg DIALOG  0, 0, 141, 60
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION
 CAPTION "One-time Password"
-FONT 9, "MS Sans Serif"
+FONT 9, "MS Shell Dlg"
 BEGIN
     DEFPUSHBUTTON   "OK",IDOK,45,39,50,14
     LTEXT           "Sequence number becomes less than 10. Please change sequence.",-1,7,7,127,24
@@ -1086,7 +1102,7 @@ END
 otp_calc_dlg DIALOG  0, 0, 187, 104
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Generate One-time Password"
-FONT 9, "MS Sans Serif"
+FONT 9, "MS Shell Dlg"
 BEGIN
     RTEXT           "&Challenge",-1,7,10,50,8
     EDITTEXT        OTPCALC_KEY,61,7,119,12,ES_AUTOHSCROLL
@@ -1106,7 +1122,7 @@ END
 mirror_notify_dlg DIALOG  0, 0, 174, 171
 STYLE DS_LOCALEDIT | DS_SETFONT | WS_POPUP | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME
 CAPTION "Mirror Upload"
-FONT 9, "MS Sans Serif"
+FONT 9, "MS Shell Dlg"
 BEGIN
     LTEXT           "Copy/Delete following files",-1,7,6,160,8
     LISTBOX         MIRROR_LIST,7,16,160,78,LBS_NOINTEGRALHEIGHT | LBS_EXTENDEDSEL | WS_VSCROLL | WS_TABSTOP
@@ -1123,7 +1139,7 @@ END
 mirrordown_notify_dlg DIALOG  0, 0, 174, 171
 STYLE DS_LOCALEDIT | DS_SETFONT | WS_POPUP | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME
 CAPTION "Mirror Download"
-FONT 9, "MS Sans Serif"
+FONT 9, "MS Shell Dlg"
 BEGIN
     LTEXT           "Copy/Delete following files",-1,7,6,92,8
     LISTBOX         MIRROR_LIST,7,16,160,78,LBS_NOINTEGRALHEIGHT | LBS_EXTENDEDSEL | WS_VSCROLL | WS_TABSTOP
@@ -1140,7 +1156,7 @@ END
 mirror_down_dlg DIALOG  0, 0, 215, 155
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION
 CAPTION "Mirroring Download"
-FONT 9, "MS Sans Serif"
+FONT 9, "MS Shell Dlg"
 BEGIN
     DEFPUSHBUTTON   "&Display Transfer Files",MIRRORUP_DISP,9,134,85,14
     PUSHBUTTON      "Cancel",IDCANCEL,106,134,50,14
@@ -1156,7 +1172,7 @@ END
 chdir_br_dlg DIALOG  0, 0, 187, 43
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION
 CAPTION "Folder"
-FONT 9, "MS Sans Serif"
+FONT 9, "MS Shell Dlg"
 BEGIN
     EDITTEXT        INP_INPSTR,7,8,159,12,ES_AUTOHSCROLL
     PUSHBUTTON      "...",INP_BROUSE,167,7,13,14
@@ -1167,7 +1183,7 @@ END
 filter_dlg DIALOG  0, 0, 187, 79
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION
 CAPTION "Filter"
-FONT 9, "MS Sans Serif"
+FONT 9, "MS Shell Dlg"
 BEGIN
     LTEXT           "Use semicolons to delineate multiple filters.\n (Example *.txt;*.log)\nFile transfer is also affected by this filter setting.",-1,13,29,167,27
     EDITTEXT        FILTER_STR,7,8,147,12,ES_AUTOHSCROLL
@@ -1180,7 +1196,7 @@ END
 group_dlg DIALOG  0, 0, 187, 42
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION
 CAPTION "Group Name"
-FONT 9, "MS Sans Serif"
+FONT 9, "MS Shell Dlg"
 BEGIN
     EDITTEXT        INP_INPSTR,7,7,173,12,ES_AUTOHSCROLL
     DEFPUSHBUTTON   "OK",IDOK,36,24,50,14
@@ -1191,7 +1207,7 @@ END
 hostdel_dlg DIALOG  0, 0, 134, 39
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION
 CAPTION "Delete Host"
-FONT 9, "MS Sans Serif"
+FONT 9, "MS Shell Dlg"
 BEGIN
     DEFPUSHBUTTON   "&Yes",IDOK,11,21,50,14
     PUSHBUTTON      "&No",IDCANCEL,73,21,50,14
@@ -1201,7 +1217,7 @@ END
 groupdel_dlg DIALOG  0, 0, 135, 47
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION
 CAPTION "Delete Group"
-FONT 9, "MS Sans Serif"
+FONT 9, "MS Shell Dlg"
 BEGIN
     DEFPUSHBUTTON   "&Yes",IDOK,11,29,50,14
     PUSHBUTTON      "&No",IDCANCEL,73,29,50,14
@@ -1211,7 +1227,7 @@ END
 hostconnect_dlg DIALOG  0, 0, 166, 106
 STYLE DS_LOCALEDIT | DS_SETFONT | WS_POPUP | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME
 CAPTION "Host List"
-FONT 9, "MS Sans Serif"
+FONT 9, "MS Shell Dlg"
 BEGIN
     CONTROL         "Tree1",HOST_LIST,"SysTreeView32",TVS_HASLINES | TVS_DISABLEDRAGDROP | TVS_SHOWSELALWAYS | TVS_FULLROWSELECT | WS_BORDER | WS_TABSTOP,7,6,152,75
     DEFPUSHBUTTON   "&Connect",IDOK,20,88,50,14
@@ -1228,8 +1244,8 @@ END
 
 noresume_dlg DIALOG  0, 0, 191, 47
 STYLE DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | WS_POPUP | WS_CAPTION
-CAPTION "FFFTP:Error"
-FONT 9, "MS Sans Serif"
+CAPTION "FFFTP: Error"
+FONT 9, "MS Shell Dlg"
 BEGIN
     DEFPUSHBUTTON   "Yes",IDOK,10,29,45,14
     PUSHBUTTON      "Cancel This File",IDCANCEL,65,29,59,14
@@ -1240,7 +1256,7 @@ END
 forcerename_dlg DIALOG  0, 0, 187, 67
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION
 CAPTION "Download"
-FONT 9, "MS Sans Serif"
+FONT 9, "MS Shell Dlg"
 BEGIN
     EDITTEXT        INP_INPSTR,7,29,173,12,ES_AUTOHSCROLL
     DEFPUSHBUTTON   "OK",IDOK,31,49,50,14
@@ -1251,7 +1267,7 @@ END
 
 hset_dialup_dlg DIALOG  0, 0, 207, 155
 STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
-FONT 9, "MS Sans Serif"
+FONT 9, "MS Shell Dlg"
 BEGIN
     CONTROL         "&Use Dialup Connection",HSET_DIALUP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,7,110,10
     LTEXT           "&Dialup Setting",-1,19,23,97,8
@@ -1264,7 +1280,7 @@ END
 rasreconnect_dlg DIALOG  0, 0, 159, 67
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION
 CAPTION "FFFTP"
-FONT 9, "MS Sans Serif"
+FONT 9, "MS Shell Dlg"
 BEGIN
     DEFPUSHBUTTON   "Yes",IDOK,16,46,50,14
     PUSHBUTTON      "Keep Connection",IDCANCEL,76,46,66,14
@@ -1273,7 +1289,7 @@ END
 
 dial_dlg DIALOG  0, 0, 159, 37
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION
-FONT 9, "MS Sans Serif"
+FONT 9, "MS Shell Dlg"
 BEGIN
     DEFPUSHBUTTON   "Cancel",IDCANCEL,54,19,50,14
     CTEXT           "",DIAL_STATUS,7,6,145,8,SS_NOPREFIX
@@ -1281,7 +1297,7 @@ END
 
 dial_password_dlg DIALOG  0, 0, 171, 85
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION
-FONT 9, "MS Sans Serif"
+FONT 9, "MS Shell Dlg"
 BEGIN
     LTEXT           "Enter Username and Password for Dialup",-1,7,4,157,9
     RTEXT           "&Username",-1,14,23,45,8
@@ -1292,23 +1308,24 @@ BEGIN
     PUSHBUTTON      "Cancel",IDCANCEL,96,63,50,14
 END
 
-opt_disp_dlg DIALOG  0, 0, 211, 139
+opt_disp_dlg DIALOG  0, 0, 211, 155
 STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
-FONT 9, "MS Sans Serif"
+FONT 9, "MS Shell Dlg"
 BEGIN
     PUSHBUTTON      "&Change",DISP_FONT_BR,167,7,36,14,WS_GROUP
     LTEXT           "",-1,7,7,159,14,SS_NOPREFIX | SS_SUNKEN
-    LTEXT           "Font :",-1,9,11,29,8
+    LTEXT           "Font:",-1,9,11,29,8
     LTEXT           "",DISP_FONT,40,11,123,8,SS_NOPREFIX
     CONTROL         "Do not display &hidden files/folders",DISP_HIDE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,30,172,10
     LTEXT           "If this box is checked, hidden files/folders are not transferred during Mirror operations.",-1,29,44,167,27,SS_SUNKEN
     CONTROL         "&Display drives in the file list",DISP_DRIVE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,76,172,10
+    CONTROL         "Display &icons in the file list",DISP_ICON,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,90,172,10
 END
 
 bmark_edit_dlg DIALOG  0, 0, 187, 83
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Bookmark"
-FONT 9, "MS Sans Serif"
+FONT 9, "MS Shell Dlg"
 BEGIN
     LTEXT           "&Local Folder",-1,7,7,173,8
     EDITTEXT        BEDIT_LOCAL,7,17,173,12,ES_AUTOHSCROLL
@@ -1321,7 +1338,7 @@ END
 down_exist_dlg DIALOG  0, 0, 234, 109
 STYLE DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | WS_POPUP | WS_CAPTION
 CAPTION "Download"
-FONT 9, "MS Sans Serif"
+FONT 9, "MS Shell Dlg"
 BEGIN
     CONTROL         "&Overwrite existing file",DOWN_EXIST_OVW,"Button",BS_AUTORADIOBUTTON | WS_GROUP,7,39,99,10
     CONTROL         "Overwrite if download file is &newer",DOWN_EXIST_NEW,
@@ -1340,14 +1357,14 @@ END
 IDD_OLEDRAG DIALOGEX 0, 0, 30, 13
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Transfering"
-FONT 9, "MS Sans Serif", 0, 0, 0x1
+FONT 9, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
 END
 
 move_notify_dlg DIALOGEX 0, 0, 201, 82
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Move Files/Folders"
-FONT 9, "MS Sans Serif", 0, 0, 0x1
+FONT 9, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
     DEFPUSHBUTTON   "Yes",IDOK,44,61,50,14
     PUSHBUTTON      "No",IDCANCEL,107,61,50,14
@@ -1360,7 +1377,7 @@ END
 masterpasswd_dlg DIALOGEX 65535, 65535, 187, 56
 STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION
 CAPTION "FFFTP"
-FONT 9, "MS Sans Serif", 0, 0, 0x1
+FONT 9, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
     LTEXT           "Enter master password",-1,7,7,153,8
     EDITTEXT        INP_INPSTR,7,19,173,12,ES_PASSWORD | ES_AUTOHSCROLL
@@ -1372,7 +1389,7 @@ END
 
 hset_crypt_dlg DIALOG  0, 0, 207, 155
 STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
-FONT 9, "MS Sans Serif"
+FONT 9, "MS Shell Dlg"
 BEGIN
     CONTROL         "Allow to connect without encryption",HSET_NO_ENCRYPTION,
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,7,148,10
@@ -1386,39 +1403,55 @@ END
 
 hset_adv3_dlg DIALOG  0, 0, 207, 155
 STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
-FONT 9, "MS Sans Serif"
+FONT 9, "MS Shell Dlg"
 BEGIN
     LTEXT           "Max Connections",-1,7,10,64,8
     EDITTEXT        HSET_THREAD_COUNT,72,8,17,12,ES_AUTOHSCROLL | ES_NUMBER
     CONTROL         "Spin1",HSET_THREAD_COUNT_SPN,"msctls_updown32",UDS_SETBUDDYINT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS,89,7,9,14
     LTEXT           "(1 to 4 threads)",-1,102,10,53,8
-    CONTROL         "Reuse socket of the main window",HSET_REUSE_SOCKET,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,27,131,10
+    CONTROL         "Reuse socket of the main window",HSET_REUSE_SOCKET,
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,27,131,10
     LTEXT           "Command for Keep Alive",-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 to 300sec: 0=Never)",-1,122,44,76,8
+    LTEXT           "(0 to 300sec; 0=Never)",-1,122,44,76,8
+    LTEXT           "When transfer errors",-1,7,61,81,8
+    COMBOBOX        HSET_ERROR_MODE,7,71,71,75,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
 END
 
-savecrypt_dlg DIALOG  0, 0, 146, 50
+savecrypt_dlg DIALOG  0, 0, 146, 62
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION
 CAPTION "Save Encryption Status"
-FONT 9, "MS Sans Serif"
+FONT 9, "MS Shell Dlg"
 BEGIN
-    LTEXT           "Save current encryption status?",-1,7,7,132,17
-    DEFPUSHBUTTON   "Yes",IDOK,17,29,50,14
-    PUSHBUTTON      "No",IDCANCEL,78,29,50,14
+    LTEXT           "Save current encryption status?\r\nChoose 'Yes' not to attempt to use the other encryption methods.",-1,7,7,132,29
+    DEFPUSHBUTTON   "Yes",IDOK,17,41,50,14
+    PUSHBUTTON      "No",IDCANCEL,78,41,50,14
 END
 
 updatesslroot_dlg DIALOG  0, 0, 211, 64
 STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION
 CAPTION "Update SSL Root certificate"
-FONT 9, "MS Sans Serif"
+FONT 9, "MS Shell Dlg"
 BEGIN
     LTEXT           "Modified SSL Root certificate was detected.If you did not update it manually, it might be tampered with by malwares.\r\nUse the modified certificate?",-1,7,7,196,36
     DEFPUSHBUTTON   "No",IDCANCEL,112,42,50,14
     PUSHBUTTON      "Yes",IDOK,48,42,50,14
 END
 
+updown_as_with_ext_dlg DIALOGEX 0, 0, 187, 89
+STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION
+FONT 9, "MS Shell Dlg", 0, 0, 0x0
+BEGIN
+    EDITTEXT        UPDOWNAS_NEW,7,34,173,12,ES_AUTOHSCROLL
+    LTEXT           "",UPDOWNAS_TEXT,7,7,173,8,SS_NOPREFIX
+    LTEXT           "Enter new name",-1,15,20,133,8
+    LTEXT           "File Code",-1,10,51,44,8
+    EDITTEXT        UPDOWNAS_FILECODE,55,49,21,12,ES_CENTER | ES_AUTOHSCROLL | ES_NUMBER
+    DEFPUSHBUTTON   "OK",IDOK,35,66,50,14
+    PUSHBUTTON      "Cancel",UPDOWNAS_STOP,101,66,50,14
+END
+
 
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -1481,7 +1514,7 @@ BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 204
         TOPMARGIN, 7
-        BOTTOMMARGIN, 134
+        BOTTOMMARGIN, 148
     END
 
     opt_tool_dlg, DIALOG
@@ -1489,7 +1522,7 @@ BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 204
         TOPMARGIN, 7
-        BOTTOMMARGIN, 132
+        BOTTOMMARGIN, 148
     END
 
     chmod_dlg, DIALOG
@@ -1521,7 +1554,7 @@ BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 204
         TOPMARGIN, 7
-        BOTTOMMARGIN, 132
+        BOTTOMMARGIN, 148
     END
 
     hostname_dlg, DIALOG
@@ -1584,7 +1617,7 @@ BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 204
         TOPMARGIN, 7
-        BOTTOMMARGIN, 135
+        BOTTOMMARGIN, 148
     END
 
     opt_notify_dlg, DIALOG
@@ -1592,7 +1625,7 @@ BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 204
         TOPMARGIN, 7
-        BOTTOMMARGIN, 132
+        BOTTOMMARGIN, 148
     END
 
     bmark_dlg, DIALOG
@@ -1608,7 +1641,7 @@ BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 204
         TOPMARGIN, 7
-        BOTTOMMARGIN, 132
+        BOTTOMMARGIN, 148
     END
 
     hset_adv_dlg, DIALOG
@@ -1648,23 +1681,23 @@ BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 204
         TOPMARGIN, 7
-        BOTTOMMARGIN, 132
+        BOTTOMMARGIN, 148
     END
 
     downerr_dlg, DIALOG
     BEGIN
         LEFTMARGIN, 7
-        RIGHTMARGIN, 152
-        TOPMARGIN, 4
-        BOTTOMMARGIN, 61
+        RIGHTMARGIN, 216
+        TOPMARGIN, 7
+        BOTTOMMARGIN, 99
     END
 
     uperr_dlg, DIALOG
     BEGIN
         LEFTMARGIN, 7
-        RIGHTMARGIN, 152
-        TOPMARGIN, 4
-        BOTTOMMARGIN, 63
+        RIGHTMARGIN, 216
+        TOPMARGIN, 7
+        BOTTOMMARGIN, 99
     END
 
     hset_code_dlg, DIALOG
@@ -1680,7 +1713,7 @@ BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 204
         TOPMARGIN, 7
-        BOTTOMMARGIN, 135
+        BOTTOMMARGIN, 148
     END
 
     up_exist_dlg, DIALOG
@@ -1760,7 +1793,7 @@ BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 204
         TOPMARGIN, 7
-        BOTTOMMARGIN, 135
+        BOTTOMMARGIN, 148
     END
 
     somecmd_dlg, DIALOG
@@ -1784,7 +1817,7 @@ BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 204
         TOPMARGIN, 7
-        BOTTOMMARGIN, 132
+        BOTTOMMARGIN, 148
     END
 
     rasnotify_dlg, DIALOG
@@ -1832,7 +1865,7 @@ BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 204
         TOPMARGIN, 7
-        BOTTOMMARGIN, 135
+        BOTTOMMARGIN, 148
     END
 
     def_attr_dlg, DIALOG
@@ -1992,7 +2025,7 @@ BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 204
         TOPMARGIN, 7
-        BOTTOMMARGIN, 132
+        BOTTOMMARGIN, 148
     END
 
     bmark_edit_dlg, DIALOG
@@ -2053,7 +2086,7 @@ BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 139
         TOPMARGIN, 7
-        BOTTOMMARGIN, 43
+        BOTTOMMARGIN, 55
     END
 
     updatesslroot_dlg, DIALOG
@@ -2063,6 +2096,14 @@ BEGIN
         TOPMARGIN, 7
         BOTTOMMARGIN, 43
     END
+
+    updown_as_with_ext_dlg, DIALOG
+    BEGIN
+        LEFTMARGIN, 7
+        RIGHTMARGIN, 180
+        TOPMARGIN, 7
+        BOTTOMMARGIN, 87
+    END
 END
 #endif    // APSTUDIO_INVOKED
 
@@ -2083,8 +2124,8 @@ nodrop_csr              CURSOR                  "nodrop_c.cur"
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,99,0,0
- PRODUCTVERSION 1,99,0,0
+ FILEVERSION 1,98,5,0
+ PRODUCTVERSION 1,98,5,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -2102,12 +2143,12 @@ BEGIN
             VALUE "Comments", "This software is Free Software"
             VALUE "CompanyName", " Sota"
             VALUE "FileDescription", "FFFTP"
-            VALUE "FileVersion", "1, 99, 0, 0"
+            VALUE "FileVersion", "1, 98, 5, 0"
             VALUE "InternalName", "FFFTP"
-            VALUE "LegalCopyright", "Copyright (C) 1997-2010 Sota & cooperators\nCopyright (C) 2011 FFFTP Project (Hiromichi Matsushima, Suguru Kawamoto, IWAMOTO Kouichi, vitamin0x, unarist, Asami, fortran90, tomo1192)."
+            VALUE "LegalCopyright", "Copyright (C) 1997-2010 Sota & cooperators\nCopyright (C) 2011-2012 FFFTP Project (Hiromichi Matsushima, Suguru Kawamoto, IWAMOTO Kouichi, vitamin0x, unarist, Asami, fortran90, tomo1192, Yuji Tanaka, Moriguchi Hirokazu)."
             VALUE "OriginalFilename", "FFFTP.exe"
             VALUE "ProductName", "FFFTP"
-            VALUE "ProductVersion", "1, 99, 0, 0"
+            VALUE "ProductVersion", "1, 98, 5, 0"
         END
     END
     BLOCK "VarFileInfo"