OSDN > 開発者 >

amalsyah1 > 作業部屋 > Osdn > コミット

amalsyah1

Fork

Fork元: amalsyah1 / ffftp

R/O
HTTP
SSH
HTTPS

コミット

コミットメタ情報

リビジョン	ad3b10e51a7979c545702209fa574c62e41253f7 (tree)
日時	2011-09-13 12:14:29
作者	s_kawamoto <s_kawamoto@user...>
コミッター	s_kawamoto

ログメッセージ

This version may be nearly stable.
Fix bugs of UTF-8 to UTF-16 API bridge.
Fix definition of calling convention for OpenSSL.
Apply most patches from ticket #26185.
Fix settings of project files.
Fix bugs on FFFTP_English Debug build.

変更サマリ

modified: FFFTP.exe (diff)
modified: FFFTP.vc90.vcproj (diff)
modified: FFFTP.vcproj (diff)
add: FFFTP_Eng_Release/FFFTP.exe (diff)
modified: FFFTP_English.vc90.vcproj (diff)
modified: FFFTP_English.vcproj (diff)
add: Release/FFFTP.exe (diff)
modified: Resource/FFFTP.APS (diff)
modified: Resource/FFFTP.rc (diff)
modified: Resource_eng/FFFTP-eng.aps (diff)
modified: Resource_eng/FFFTP-eng.rc (diff)
modified: main.c (diff)
modified: mbswrapper.c (diff)
modified: socketwrapper.c (diff)

差分

Binary files a/FFFTP.exe and b/FFFTP.exe differ

--- a/FFFTP.vc90.vcproj

+++ b/FFFTP.vc90.vcproj

		@@ -16,8 +16,8 @@
16	16	<Configurations>
17	17	<Configuration
18	18	Name="Debug\|Win32"
19		- OutputDirectory="."
20		- IntermediateDirectory=".\debug"
	19	+ OutputDirectory=".\Debug"
	20	+ IntermediateDirectory=".\Debug"
21	21	ConfigurationType="1"
22	22	InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"
23	23	UseOfMFC="0"

		@@ -41,7 +41,7 @@
41	41	MkTypLibCompatible="true"
42	42	SuppressStartupBanner="true"
43	43	TargetEnvironment="1"
44		- TypeLibraryName="./FFFTP.tlb"
	44	+ TypeLibraryName=".\Debug\FFFTP.tlb"
45	45	/>
46	46	<Tool
47	47	Name="VCCLCompilerTool"

		@@ -49,10 +49,10 @@
49	49	AdditionalIncludeDirectories="Resource"
50	50	PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS,_WIN32_IE=0x300,_CRT_SECURE_NO_WARNINGS"
51	51	RuntimeLibrary="1"
52		- PrecompiledHeaderFile=".\debug/FFFTP.pch"
53		- AssemblerListingLocation=".\debug/"
54		- ObjectFile=".\debug/"
55		- ProgramDataBaseFileName=".\debug/"
	52	+ PrecompiledHeaderFile=".\Debug\FFFTP.pch"
	53	+ AssemblerListingLocation=".\Debug\"
	54	+ ObjectFile=".\Debug\"
	55	+ ProgramDataBaseFileName=".\Debug\"
56	56	WarningLevel="3"
57	57	SuppressStartupBanner="true"
58	58	DebugInformationFormat="4"

		@@ -72,11 +72,12 @@
72	72	Name="VCLinkerTool"
73	73	AdditionalOptions="/MACHINE:I386"
74	74	AdditionalDependencies="wsock32.lib comctl32.lib winmm.lib htmlhelp.lib"
75		- OutputFile="./FFFTP.exe"
	75	+ OutputFile=".\Debug\FFFTP.exe"
76	76	LinkIncremental="2"
77	77	SuppressStartupBanner="true"
	78	+ GenerateManifest="false"
78	79	GenerateDebugInformation="true"
79		- ProgramDatabaseFile="./FFFTP.pdb"
	80	+ ProgramDatabaseFile=".\Debug\FFFTP.pdb"
80	81	SubSystem="2"
81	82	RandomizedBaseAddress="1"
82	83	DataExecutionPrevention="0"

		@@ -105,7 +106,7 @@
105	106	</Configuration>
106	107	<Configuration
107	108	Name="Release\|Win32"
108		- OutputDirectory="."
	109	+ OutputDirectory=".\Release"
109	110	IntermediateDirectory=".\Release"
110	111	ConfigurationType="1"
111	112	InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"

		@@ -130,7 +131,7 @@
130	131	MkTypLibCompatible="true"
131	132	SuppressStartupBanner="true"
132	133	TargetEnvironment="1"
133		- TypeLibraryName="./FFFTP.tlb"
	134	+ TypeLibraryName=".\Release\FFFTP.tlb"
134	135	/>
135	136	<Tool
136	137	Name="VCCLCompilerTool"

		@@ -140,10 +141,10 @@
140	141	StringPooling="true"
141	142	RuntimeLibrary="0"
142	143	EnableFunctionLevelLinking="true"
143		- PrecompiledHeaderFile=".\Release/FFFTP.pch"
144		- AssemblerListingLocation=".\Release/"
145		- ObjectFile=".\Release/"
146		- ProgramDataBaseFileName=".\Release/"
	144	+ PrecompiledHeaderFile=".\Release\FFFTP.pch"
	145	+ AssemblerListingLocation=".\Release\"
	146	+ ObjectFile=".\Release\"
	147	+ ProgramDataBaseFileName=".\Release\"
147	148	WarningLevel="3"
148	149	SuppressStartupBanner="true"
149	150	DebugInformationFormat="0"

		@@ -163,11 +164,11 @@
163	164	Name="VCLinkerTool"
164	165	AdditionalOptions="/MACHINE:I386"
165	166	AdditionalDependencies="wsock32.lib comctl32.lib winmm.lib RASAPI32.LIB htmlhelp.lib"
166		- OutputFile="./FFFTP.exe"
	167	+ OutputFile=".\Release\FFFTP.exe"
167	168	LinkIncremental="1"
168	169	SuppressStartupBanner="true"
169		- GenerateDebugInformation="false"
170		- ProgramDatabaseFile="./FFFTP.pdb"
	170	+ GenerateManifest="false"
	171	+ ProgramDatabaseFile=".\Release\FFFTP.pdb"
171	172	SubSystem="2"
172	173	RandomizedBaseAddress="1"
173	174	DataExecutionPrevention="0"

		@@ -405,10 +406,6 @@
405	406	>
406	407	</File>
407	408	<File
408		- RelativePath=".\Resource\ico00001.ico"
409		- >
410		- </File>
411		- <File
412	409	RelativePath=".\Resource\icon1.ico"
413	410	>
414	411	</File>

--- a/FFFTP.vcproj

+++ b/FFFTP.vcproj

		@@ -15,8 +15,8 @@
15	15	<Configurations>
16	16	<Configuration
17	17	Name="Debug\|Win32"
18		- OutputDirectory="."
19		- IntermediateDirectory=".\debug"
	18	+ OutputDirectory=".\Debug"
	19	+ IntermediateDirectory=".\Debug"
20	20	ConfigurationType="1"
21	21	InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"
22	22	UseOfMFC="0"

		@@ -40,7 +40,7 @@
40	40	MkTypLibCompatible="true"
41	41	SuppressStartupBanner="true"
42	42	TargetEnvironment="1"
43		- TypeLibraryName="./FFFTP.tlb"
	43	+ TypeLibraryName=".\Debug\FFFTP.tlb"
44	44	/>
45	45	<Tool
46	46	Name="VCCLCompilerTool"

		@@ -48,10 +48,10 @@
48	48	AdditionalIncludeDirectories="Resource"
49	49	PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS,_WIN32_IE=0x300,_CRT_SECURE_NO_WARNINGS"
50	50	RuntimeLibrary="1"
51		- PrecompiledHeaderFile=".\debug/FFFTP.pch"
52		- AssemblerListingLocation=".\debug/"
53		- ObjectFile=".\debug/"
54		- ProgramDataBaseFileName=".\debug/"
	51	+ PrecompiledHeaderFile=".\Debug\FFFTP.pch"
	52	+ AssemblerListingLocation=".\Debug\"
	53	+ ObjectFile=".\Debug\"
	54	+ ProgramDataBaseFileName=".\Debug\"
55	55	WarningLevel="3"
56	56	SuppressStartupBanner="true"
57	57	DebugInformationFormat="4"

		@@ -71,11 +71,12 @@
71	71	Name="VCLinkerTool"
72	72	AdditionalOptions="/MACHINE:I386"
73	73	AdditionalDependencies="wsock32.lib comctl32.lib winmm.lib htmlhelp.lib"
74		- OutputFile="./FFFTP.exe"
	74	+ OutputFile=".\Debug\FFFTP.exe"
75	75	LinkIncremental="2"
76	76	SuppressStartupBanner="true"
	77	+ GenerateManifest="false"
77	78	GenerateDebugInformation="true"
78		- ProgramDatabaseFile="./FFFTP.pdb"
	79	+ ProgramDatabaseFile=".\Debug\FFFTP.pdb"
79	80	SubSystem="2"
80	81	/>
81	82	<Tool

		@@ -105,7 +106,7 @@
105	106	</Configuration>
106	107	<Configuration
107	108	Name="Release\|Win32"
108		- OutputDirectory="."
	109	+ OutputDirectory=".\Release"
109	110	IntermediateDirectory=".\Release"
110	111	ConfigurationType="1"
111	112	InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"

		@@ -130,7 +131,7 @@
130	131	MkTypLibCompatible="true"
131	132	SuppressStartupBanner="true"
132	133	TargetEnvironment="1"
133		- TypeLibraryName="./FFFTP.tlb"
	134	+ TypeLibraryName=".\Release\FFFTP.tlb"
134	135	/>
135	136	<Tool
136	137	Name="VCCLCompilerTool"

		@@ -140,10 +141,10 @@
140	141	StringPooling="true"
141	142	RuntimeLibrary="0"
142	143	EnableFunctionLevelLinking="true"
143		- PrecompiledHeaderFile=".\Release/FFFTP.pch"
144		- AssemblerListingLocation=".\Release/"
145		- ObjectFile=".\Release/"
146		- ProgramDataBaseFileName=".\Release/"
	144	+ PrecompiledHeaderFile=".\Release\FFFTP.pch"
	145	+ AssemblerListingLocation=".\Release\"
	146	+ ObjectFile=".\Release\"
	147	+ ProgramDataBaseFileName=".\Release\"
147	148	WarningLevel="3"
148	149	SuppressStartupBanner="true"
149	150	DebugInformationFormat="0"

		@@ -163,11 +164,11 @@
163	164	Name="VCLinkerTool"
164	165	AdditionalOptions="/MACHINE:I386"
165	166	AdditionalDependencies="wsock32.lib comctl32.lib winmm.lib RASAPI32.LIB htmlhelp.lib"
166		- OutputFile="./FFFTP.exe"
	167	+ OutputFile=".\Release\FFFTP.exe"
167	168	LinkIncremental="1"
168	169	SuppressStartupBanner="true"
169		- GenerateDebugInformation="false"
170		- ProgramDatabaseFile="./FFFTP.pdb"
	170	+ GenerateManifest="false"
	171	+ ProgramDatabaseFile=".\Release\FFFTP.pdb"
171	172	SubSystem="2"
172	173	/>
173	174	<Tool

		@@ -406,10 +407,6 @@
406	407	>
407	408	</File>
408	409	<File
409		- RelativePath=".\Resource\ico00001.ico"
410		- >
411		- </File>
412		- <File
413	410	RelativePath=".\Resource\icon1.ico"
414	411	>
415	412	</File>

Binary files /dev/null and b/FFFTP_Eng_Release/FFFTP.exe differ

--- a/FFFTP_English.vc90.vcproj

+++ b/FFFTP_English.vc90.vcproj

		@@ -16,9 +16,9 @@
16	16	</ToolFiles>
17	17	<Configurations>
18	18	<Configuration
19		- Name="Release\|Win32"
20		- OutputDirectory=".\FFFTP_Eng_Release"
21		- IntermediateDirectory=".\FFFTP_Eng_Release"
	19	+ Name="Debug\|Win32"
	20	+ OutputDirectory=".\FFFTP_Eng_Debug"
	21	+ IntermediateDirectory=".\FFFTP_Eng_Debug"
22	22	ConfigurationType="1"
23	23	InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"
24	24	UseOfMFC="0"

		@@ -38,33 +38,33 @@
38	38	/>
39	39	<Tool
40	40	Name="VCMIDLTool"
41		- PreprocessorDefinitions="NDEBUG"
	41	+ PreprocessorDefinitions="_DEBUG"
42	42	MkTypLibCompatible="true"
43	43	SuppressStartupBanner="true"
44	44	TargetEnvironment="1"
45		- TypeLibraryName=".\FFFTP_Eng_Release/FFFTP_English.tlb"
	45	+ TypeLibraryName=".\FFFTP_Eng_Debug\FFFTP_English.tlb"
46	46	/>
47	47	<Tool
48	48	Name="VCCLCompilerTool"
49		- InlineFunctionExpansion="1"
	49	+ Optimization="0"
50	50	AdditionalIncludeDirectories="Resource_eng"
51		- PreprocessorDefinitions="WIN32,NDEBUG,_WINDOWS,_WIN32_IE=0x300,_CRT_SECURE_NO_WARNINGS,ENGLISH"
52		- StringPooling="true"
53		- RuntimeLibrary="0"
54		- EnableFunctionLevelLinking="true"
55		- PrecompiledHeaderFile=".\FFFTP_Eng_Release/FFFTP_English.pch"
56		- AssemblerListingLocation=".\FFFTP_Eng_Release/"
57		- ObjectFile=".\FFFTP_Eng_Release/"
58		- ProgramDataBaseFileName=".\FFFTP_Eng_Release/"
	51	+ PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS,_WIN32_IE=0x300,_CRT_SECURE_NO_WARNINGS,ENGLISH"
	52	+ BasicRuntimeChecks="3"
	53	+ RuntimeLibrary="1"
	54	+ PrecompiledHeaderFile=".\FFFTP_Eng_Debug\FFFTP_English.pch"
	55	+ AssemblerListingLocation=".\FFFTP_Eng_Debug\"
	56	+ ObjectFile=".\FFFTP_Eng_Debug\"
	57	+ ProgramDataBaseFileName=".\FFFTP_Eng_Debug\"
59	58	WarningLevel="3"
60	59	SuppressStartupBanner="true"
	60	+ DebugInformationFormat="4"
61	61	/>
62	62	<Tool
63	63	Name="VCManagedResourceCompilerTool"
64	64	/>
65	65	<Tool
66	66	Name="VCResourceCompilerTool"
67		- PreprocessorDefinitions="NDEBUG"
	67	+ PreprocessorDefinitions="_DEBUG"
68	68	Culture="1033"
69	69	/>
70	70	<Tool

		@@ -74,10 +74,12 @@
74	74	Name="VCLinkerTool"
75	75	AdditionalOptions="/MACHINE:I386"
76	76	AdditionalDependencies="wsock32.lib comctl32.lib winmm.lib htmlhelp.lib"
77		- OutputFile="FFFTP_Eng_Release/FFFTP.exe"
78		- LinkIncremental="1"
	77	+ OutputFile=".\FFFTP_Eng_Debug\FFFTP.exe"
	78	+ LinkIncremental="2"
79	79	SuppressStartupBanner="true"
80		- ProgramDatabaseFile=".\FFFTP_Eng_Release/FFFTP.pdb"
	80	+ GenerateManifest="false"
	81	+ GenerateDebugInformation="true"
	82	+ ProgramDatabaseFile=".\FFFTP_Eng_Debug\FFFTP.pdb"
81	83	SubSystem="2"
82	84	RandomizedBaseAddress="1"
83	85	DataExecutionPrevention="0"

		@@ -105,9 +107,9 @@
105	107	/>
106	108	</Configuration>
107	109	<Configuration
108		- Name="Debug\|Win32"
109		- OutputDirectory=".\FFFTP_Eng_Debug"
110		- IntermediateDirectory=".\FFFTP_Eng_Debug"
	110	+ Name="Release\|Win32"
	111	+ OutputDirectory=".\FFFTP_Eng_Release"
	112	+ IntermediateDirectory=".\FFFTP_Eng_Release"
111	113	ConfigurationType="1"
112	114	InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"
113	115	UseOfMFC="0"

		@@ -127,33 +129,33 @@
127	129	/>
128	130	<Tool
129	131	Name="VCMIDLTool"
130		- PreprocessorDefinitions="_DEBUG"
	132	+ PreprocessorDefinitions="NDEBUG"
131	133	MkTypLibCompatible="true"
132	134	SuppressStartupBanner="true"
133	135	TargetEnvironment="1"
134		- TypeLibraryName=".\FFFTP_Eng_Debug/FFFTP_English.tlb"
	136	+ TypeLibraryName=".\FFFTP_Eng_Release\FFFTP_English.tlb"
135	137	/>
136	138	<Tool
137	139	Name="VCCLCompilerTool"
138		- Optimization="0"
	140	+ InlineFunctionExpansion="1"
139	141	AdditionalIncludeDirectories="Resource_eng"
140		- PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS,_WIN32_IE=0x300,_CRT_SECURE_NO_WARNINGS,ENGLISH"
141		- BasicRuntimeChecks="3"
142		- RuntimeLibrary="1"
143		- PrecompiledHeaderFile=".\FFFTP_Eng_Debug/FFFTP_English.pch"
144		- AssemblerListingLocation=".\FFFTP_Eng_Debug/"
145		- ObjectFile=".\FFFTP_Eng_Debug/"
146		- ProgramDataBaseFileName=".\FFFTP_Eng_Debug/"
	142	+ PreprocessorDefinitions="WIN32,NDEBUG,_WINDOWS,_WIN32_IE=0x300,_CRT_SECURE_NO_WARNINGS,ENGLISH"
	143	+ StringPooling="true"
	144	+ RuntimeLibrary="0"
	145	+ EnableFunctionLevelLinking="true"
	146	+ PrecompiledHeaderFile=".\FFFTP_Eng_Release\FFFTP_English.pch"
	147	+ AssemblerListingLocation=".\FFFTP_Eng_Release\"
	148	+ ObjectFile=".\FFFTP_Eng_Release\"
	149	+ ProgramDataBaseFileName=".\FFFTP_Eng_Release\"
147	150	WarningLevel="3"
148	151	SuppressStartupBanner="true"
149		- DebugInformationFormat="4"
150	152	/>
151	153	<Tool
152	154	Name="VCManagedResourceCompilerTool"
153	155	/>
154	156	<Tool
155	157	Name="VCResourceCompilerTool"
156		- PreprocessorDefinitions="_DEBUG"
	158	+ PreprocessorDefinitions="NDEBUG"
157	159	Culture="1033"
158	160	/>
159	161	<Tool

		@@ -163,11 +165,11 @@
163	165	Name="VCLinkerTool"
164	166	AdditionalOptions="/MACHINE:I386"
165	167	AdditionalDependencies="wsock32.lib comctl32.lib winmm.lib htmlhelp.lib"
166		- OutputFile="FFFTP_Eng_Debug/FFFTP.exe"
167		- LinkIncremental="2"
	168	+ OutputFile=".\FFFTP_Eng_Release\FFFTP.exe"
	169	+ LinkIncremental="1"
168	170	SuppressStartupBanner="true"
169		- GenerateDebugInformation="true"
170		- ProgramDatabaseFile=".\FFFTP_Eng_Debug/FFFTP.pdb"
	171	+ GenerateManifest="false"
	172	+ ProgramDatabaseFile=".\FFFTP_Eng_Release\FFFTP.pdb"
171	173	SubSystem="2"
172	174	RandomizedBaseAddress="1"
173	175	DataExecutionPrevention="0"

--- a/FFFTP_English.vcproj

+++ b/FFFTP_English.vcproj

		@@ -15,9 +15,9 @@
15	15	</ToolFiles>
16	16	<Configurations>
17	17	<Configuration
18		- Name="Release\|Win32"
19		- OutputDirectory=".\FFFTP_Eng_Release"
20		- IntermediateDirectory=".\FFFTP_Eng_Release"
	18	+ Name="Debug\|Win32"
	19	+ OutputDirectory=".\FFFTP_Eng_Debug"
	20	+ IntermediateDirectory=".\FFFTP_Eng_Debug"
21	21	ConfigurationType="1"
22	22	InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"
23	23	UseOfMFC="0"

		@@ -37,33 +37,33 @@
37	37	/>
38	38	<Tool
39	39	Name="VCMIDLTool"
40		- PreprocessorDefinitions="NDEBUG"
	40	+ PreprocessorDefinitions="_DEBUG"
41	41	MkTypLibCompatible="true"
42	42	SuppressStartupBanner="true"
43	43	TargetEnvironment="1"
44		- TypeLibraryName=".\FFFTP_Eng_Release/FFFTP_English.tlb"
	44	+ TypeLibraryName=".\FFFTP_Eng_Debug\FFFTP_English.tlb"
45	45	/>
46	46	<Tool
47	47	Name="VCCLCompilerTool"
48		- InlineFunctionExpansion="1"
	48	+ Optimization="0"
49	49	AdditionalIncludeDirectories="Resource_eng"
50		- PreprocessorDefinitions="WIN32,NDEBUG,_WINDOWS,_WIN32_IE=0x300,_CRT_SECURE_NO_WARNINGS,ENGLISH"
51		- StringPooling="true"
52		- RuntimeLibrary="0"
53		- EnableFunctionLevelLinking="true"
54		- PrecompiledHeaderFile=".\FFFTP_Eng_Release/FFFTP_English.pch"
55		- AssemblerListingLocation=".\FFFTP_Eng_Release/"
56		- ObjectFile=".\FFFTP_Eng_Release/"
57		- ProgramDataBaseFileName=".\FFFTP_Eng_Release/"
	50	+ PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS,_WIN32_IE=0x300,_CRT_SECURE_NO_WARNINGS,ENGLISH"
	51	+ BasicRuntimeChecks="3"
	52	+ RuntimeLibrary="1"
	53	+ PrecompiledHeaderFile=".\FFFTP_Eng_Debug\FFFTP_English.pch"
	54	+ AssemblerListingLocation=".\FFFTP_Eng_Debug\"
	55	+ ObjectFile=".\FFFTP_Eng_Debug\"
	56	+ ProgramDataBaseFileName=".\FFFTP_Eng_Debug\"
58	57	WarningLevel="3"
59	58	SuppressStartupBanner="true"
	59	+ DebugInformationFormat="4"
60	60	/>
61	61	<Tool
62	62	Name="VCManagedResourceCompilerTool"
63	63	/>
64	64	<Tool
65	65	Name="VCResourceCompilerTool"
66		- PreprocessorDefinitions="NDEBUG"
	66	+ PreprocessorDefinitions="_DEBUG"
67	67	Culture="1033"
68	68	/>
69	69	<Tool

		@@ -73,10 +73,12 @@
73	73	Name="VCLinkerTool"
74	74	AdditionalOptions="/MACHINE:I386"
75	75	AdditionalDependencies="wsock32.lib comctl32.lib winmm.lib htmlhelp.lib"
76		- OutputFile="FFFTP_Eng_Release/FFFTP.exe"
77		- LinkIncremental="1"
	76	+ OutputFile=".\FFFTP_Eng_Debug\FFFTP.exe"
	77	+ LinkIncremental="2"
78	78	SuppressStartupBanner="true"
79		- ProgramDatabaseFile=".\FFFTP_Eng_Release/FFFTP.pdb"
	79	+ GenerateManifest="false"
	80	+ GenerateDebugInformation="true"
	81	+ ProgramDatabaseFile=".\FFFTP_Eng_Debug\FFFTP.pdb"
80	82	SubSystem="2"
81	83	/>
82	84	<Tool

		@@ -105,9 +107,9 @@
105	107	/>
106	108	</Configuration>
107	109	<Configuration
108		- Name="Debug\|Win32"
109		- OutputDirectory=".\FFFTP_Eng_Debug"
110		- IntermediateDirectory=".\FFFTP_Eng_Debug"
	110	+ Name="Release\|Win32"
	111	+ OutputDirectory=".\FFFTP_Eng_Release"
	112	+ IntermediateDirectory=".\FFFTP_Eng_Release"
111	113	ConfigurationType="1"
112	114	InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"
113	115	UseOfMFC="0"

		@@ -127,33 +129,33 @@
127	129	/>
128	130	<Tool
129	131	Name="VCMIDLTool"
130		- PreprocessorDefinitions="_DEBUG"
	132	+ PreprocessorDefinitions="NDEBUG"
131	133	MkTypLibCompatible="true"
132	134	SuppressStartupBanner="true"
133	135	TargetEnvironment="1"
134		- TypeLibraryName=".\FFFTP_Eng_Debug/FFFTP_English.tlb"
	136	+ TypeLibraryName=".\FFFTP_Eng_Release\FFFTP_English.tlb"
135	137	/>
136	138	<Tool
137	139	Name="VCCLCompilerTool"
138		- Optimization="0"
	140	+ InlineFunctionExpansion="1"
139	141	AdditionalIncludeDirectories="Resource_eng"
140		- PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS,_WIN32_IE=0x300,_CRT_SECURE_NO_WARNINGS,ENGLISH"
141		- BasicRuntimeChecks="3"
142		- RuntimeLibrary="1"
143		- PrecompiledHeaderFile=".\FFFTP_Eng_Debug/FFFTP_English.pch"
144		- AssemblerListingLocation=".\FFFTP_Eng_Debug/"
145		- ObjectFile=".\FFFTP_Eng_Debug/"
146		- ProgramDataBaseFileName=".\FFFTP_Eng_Debug/"
	142	+ PreprocessorDefinitions="WIN32,NDEBUG,_WINDOWS,_WIN32_IE=0x300,_CRT_SECURE_NO_WARNINGS,ENGLISH"
	143	+ StringPooling="true"
	144	+ RuntimeLibrary="0"
	145	+ EnableFunctionLevelLinking="true"
	146	+ PrecompiledHeaderFile=".\FFFTP_Eng_Release\FFFTP_English.pch"
	147	+ AssemblerListingLocation=".\FFFTP_Eng_Release\"
	148	+ ObjectFile=".\FFFTP_Eng_Release\"
	149	+ ProgramDataBaseFileName=".\FFFTP_Eng_Release\"
147	150	WarningLevel="3"
148	151	SuppressStartupBanner="true"
149		- DebugInformationFormat="4"
150	152	/>
151	153	<Tool
152	154	Name="VCManagedResourceCompilerTool"
153	155	/>
154	156	<Tool
155	157	Name="VCResourceCompilerTool"
156		- PreprocessorDefinitions="_DEBUG"
	158	+ PreprocessorDefinitions="NDEBUG"
157	159	Culture="1033"
158	160	/>
159	161	<Tool

		@@ -163,11 +165,11 @@
163	165	Name="VCLinkerTool"
164	166	AdditionalOptions="/MACHINE:I386"
165	167	AdditionalDependencies="wsock32.lib comctl32.lib winmm.lib htmlhelp.lib"
166		- OutputFile="FFFTP_Eng_Debug/FFFTP.exe"
167		- LinkIncremental="2"
	168	+ OutputFile=".\FFFTP_Eng_Release\FFFTP.exe"
	169	+ LinkIncremental="1"
168	170	SuppressStartupBanner="true"
169		- GenerateDebugInformation="true"
170		- ProgramDatabaseFile=".\FFFTP_Eng_Debug/FFFTP.pdb"
	171	+ GenerateManifest="false"
	172	+ ProgramDatabaseFile=".\FFFTP_Eng_Release\FFFTP.pdb"
171	173	SubSystem="2"
172	174	/>
173	175	<Tool

Binary files /dev/null and b/Release/FFFTP.exe differ

Binary files a/Resource/FFFTP.APS and b/Resource/FFFTP.APS differ

--- a/Resource/FFFTP.rc

+++ b/Resource/FFFTP.rc

		@@ -1965,6 +1965,14 @@ BEGIN
1965	1965	TOPMARGIN, 7
1966	1966	BOTTOMMARGIN, 50
1967	1967	END
	1968	+
	1969	+ hset_crypt_dlg, DIALOG
	1970	+ BEGIN
	1971	+ LEFTMARGIN, 7
	1972	+ RIGHTMARGIN, 200
	1973	+ TOPMARGIN, 7
	1974	+ BOTTOMMARGIN, 132
	1975	+ END
1968	1976	END
1969	1977	#endif // APSTUDIO_INVOKED
1970	1978

Binary files a/Resource_eng/FFFTP-eng.aps and b/Resource_eng/FFFTP-eng.aps differ

--- a/Resource_eng/FFFTP-eng.rc

+++ b/Resource_eng/FFFTP-eng.rc

		@@ -13,107 +13,221 @@
13	13	#undef APSTUDIO_READONLY_SYMBOLS
14	14
15	15	/////////////////////////////////////////////////////////////////////////////
16		-// ú{ê resources
	16	+// pê (Ä) resources
17	17
18		-#if !defined(AFX_RESOURCE_DLL) \|\| defined(AFX_TARG_JPN)
	18	+#if !defined(AFX_RESOURCE_DLL) \|\| defined(AFX_TARG_ENU)
19	19	#ifdef _WIN32
20		-LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT
21		-#pragma code_page(932)
	20	+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
	21	+#pragma code_page(1252)
22	22	#endif //_WIN32
23	23
	24	+#ifdef APSTUDIO_INVOKED
24	25	/////////////////////////////////////////////////////////////////////////////
25	26	//
26		-// Dialog
	27	+// TEXTINCLUDE
27	28	//
28	29
29		-IDD_OLEDRAG DIALOGEX 0, 0, 30, 13
30		-STYLE DS_SETFONT \| DS_MODALFRAME \| WS_POPUP \| WS_CAPTION \| WS_SYSMENU
31		-CAPTION "Transfering"
32		-FONT 9, "lr oSVbN", 400, 0, 0x80
	30	+1 TEXTINCLUDE
	31	+BEGIN
	32	+ "resource.h\0"
	33	+END
	34	+
	35	+2 TEXTINCLUDE
33	36	BEGIN
	37	+ "#include ""afxres.h""\r\n"
	38	+ "\0"
	39	+END
	40	+
	41	+3 TEXTINCLUDE
	42	+BEGIN
	43	+ "\r\n"
	44	+ "\0"
34	45	END
35	46
	47	+#endif // APSTUDIO_INVOKED
	48	+
36	49
37	50	/////////////////////////////////////////////////////////////////////////////
38	51	//
39		-// DESIGNINFO
	52	+// RT_MANIFEST
40	53	//
41	54
42		-#ifdef APSTUDIO_INVOKED
43		-GUIDELINES DESIGNINFO
44		-BEGIN
45		- IDD_OLEDRAG, DIALOG
46		- BEGIN
47		- LEFTMARGIN, 7
48		- RIGHTMARGIN, 23
49		- TOPMARGIN, 7
50		- BOTTOMMARGIN, 6
51		- END
52		-END
53		-#endif // APSTUDIO_INVOKED
	55	+1 RT_MANIFEST "ffftp.exe.manifest"
54	56
55		-#endif // ú{ê resources
56	57	/////////////////////////////////////////////////////////////////////////////
	58	+//
	59	+// Icon
	60	+//
57	61
	62	+// Icon with lowest ID value placed first to ensure application icon
	63	+// remains consistent on all systems.
	64	+ffftp ICON "icon1.ico"
	65	+notify ICON "icon2.ico"
58	66
59	67	/////////////////////////////////////////////////////////////////////////////
60		-// pê (Ä) resources
	68	+//
	69	+// Bitmap
	70	+//
61	71
62		-#if !defined(AFX_RESOURCE_DLL) \|\| defined(AFX_TARG_ENU)
63		-#ifdef _WIN32
64		-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
65		-#pragma code_page(1252)
66		-#endif //_WIN32
	72	+main_toolbar_bmp BITMAP "toolbar1.bmp"
	73	+remote_toolbar_bmp BITMAP "main_too.bmp"
	74	+dirattr_bmp BITMAP "list_bmp.bmp"
	75	+hlist_bmp BITMAP "bitmap1.bmp"
67	76
68	77	/////////////////////////////////////////////////////////////////////////////
69	78	//
70		-// Dialog
	79	+// Menu
71	80	//
72	81
73		-down_exist_dlg DIALOG 0, 0, 234, 109
74		-STYLE DS_SETFONT \| DS_MODALFRAME \| DS_SETFOREGROUND \| WS_POPUP \| WS_CAPTION
75		-CAPTION "Download"
76		-FONT 9, "MS Sans Serif"
	82	+main_menu MENU
77	83	BEGIN
78		- CONTROL "&Overwrite existing file",DOWN_EXIST_OVW,"Button",BS_AUTORADIOBUTTON \| WS_GROUP,7,39,99,10
79		- CONTROL "Overwrite if download file is &newer",DOWN_EXIST_NEW,
80		- "Button",BS_AUTORADIOBUTTON,7,51,123,10
81		- CONTROL "&Resume",DOWN_EXIST_RESUME,"Button",BS_AUTORADIOBUTTON,7,63,99,10
82		- CONTROL "&Skip",DOWN_EXIST_IGNORE,"Button",BS_AUTORADIOBUTTON,7,75,99,10
83		- LTEXT "To download with a different name, modify the filename and click Overwrite existing file.",-1,133,38,94,39
84		- DEFPUSHBUTTON "OK",IDOK,13,91,50,14,WS_GROUP
85		- PUSHBUTTON "&Do All",IDOK_ALL,68,91,50,14
86		- PUSHBUTTON "&Cancel All",IDCANCEL,123,91,50,14
87		- PUSHBUTTON "&Help",9,178,91,41,14
88		- LTEXT "Filename already exists on local disk. Download?",-1,7,7,184,8
89		- EDITTEXT DOWN_EXIST_NAME,7,20,220,12,ES_AUTOHSCROLL
	84	+ POPUP "&File"
	85	+ BEGIN
	86	+ MENUITEM "&Connect...\tCtrl+C", MENU_CONNECT
	87	+ MENUITEM "&Quick Connect...\tCtrl+Q", MENU_QUICK
	88	+ MENUITEM "&Disconnect", MENU_DISCONNECT
	89	+ MENUITEM SEPARATOR
	90	+ MENUITEM "&Host Setting...", MENU_SET_CONNECT
	91	+ POPUP "&Settings"
	92	+ BEGIN
	93	+ MENUITEM "Import Settings from &WS_FTP.INI...", MENU_IMPORT_WS
	94	+ MENUITEM "&Save Settings to File...", MENU_REGSAVE
	95	+ MENUITEM "&Load Settings from File...", MENU_REGLOAD
	96	+ MENUITEM "Change &Master password...", MENU_CHANGEPASSWD
	97	+ MENUITEM SEPARATOR
	98	+ MENUITEM "Clear All Settings...", MENU_REGINIT
	99	+ END
	100	+ MENUITEM SEPARATOR
	101	+ MENUITEM "E&xit", MENU_EXIT
	102	+ END
	103	+ POPUP "&Commands"
	104	+ BEGIN
	105	+ MENUITEM "&Download\tCtrl+D", MENU_DOWNLOAD
	106	+ MENUITEM "&Upload\tCtrl+U", MENU_UPLOAD
	107	+ MENUITEM "D&ownload As...", MENU_DOWNLOAD_AS
	108	+ MENUITEM "U&pload As...", MENU_UPLOAD_AS
	109	+ MENUITEM "Change &Filename && Download...", MENU_DOWNLOAD_NAME
	110	+ MENUITEM "Download &as File", MENU_DOWNLOAD_AS_FILE
	111	+ MENUITEM SEPARATOR
	112	+ MENUITEM "&Mirror Upload...\tCtrl+Shift+U", MENU_MIRROR_UPLOAD
	113	+ MENUITEM "File &size...", MENU_FILESIZE
	114	+ MENUITEM "Mirror Down&load...\tCtrl+Shift+D", MENU_MIRROR_DOWNLOAD
	115	+ MENUITEM SEPARATOR
	116	+ MENUITEM "D&elete\tDel", MENU_DELETE
	117	+ MENUITEM "&Rename...\tCtrl+N", MENU_RENAME
	118	+ MENUITEM "Permissio&ns...\tCtrl+T", MENU_CHMOD
	119	+ MENUITEM "Ne&w Folder...\tCtrl+K", MENU_MKDIR
	120	+ MENUITEM "Specify &command...", MENU_SOMECMD
	121	+ MENUITEM SEPARATOR
	122	+ MENUITEM "Synchronize Folder Mo&vement", MENU_SYNC
	123	+ END
	124	+ POPUP "&Bookmarks"
	125	+ BEGIN
	126	+ MENUITEM "Add &Host folder", MENU_BMARK_ADD
	127	+ MENUITEM "Add &Local folder", MENU_BMARK_ADD_LOCAL
	128	+ MENUITEM "Add &Both Host && Local folders", MENU_BMARK_ADD_BOTH
	129	+ MENUITEM "&Edit Bookmarks...\tCtrl+B", MENU_BMARK_EDIT
	130	+ MENUITEM SEPARATOR
	131	+ END
	132	+ POPUP "&View"
	133	+ BEGIN
	134	+ MENUITEM "F&ilter...\tCtrl+Y", MENU_FILTER
	135	+ MENUITEM SEPARATOR
	136	+ MENUITEM "&Find...\tCtrl+F", MENU_FIND
	137	+ MENUITEM "Find &Next\tF3", MENU_FINDNEXT
	138	+ MENUITEM SEPARATOR
	139	+ MENUITEM "&Select...\tCtrl+S", MENU_SELECT
	140	+ MENUITEM "Select &All/None\tCtrl+A", MENU_SELECT_ALL
	141	+ MENUITEM SEPARATOR
	142	+ POPUP "Displa&y"
	143	+ BEGIN
	144	+ MENUITEM "&List", MENU_LIST
	145	+ MENUITEM "&Details", MENU_REPORT
	146	+ END
	147	+ MENUITEM "S&ort...", MENU_SORT
	148	+ MENUITEM "Display files with leading &dot", MENU_DOTFILE
	149	+ MENUITEM SEPARATOR
	150	+ MENUITEM "Display File &List in Viewer", MENU_DIRINFO
	151	+ MENUITEM "Display Lo&g in Viewer", MENU_TASKINFO
	152	+ MENUITEM SEPARATOR
	153	+ MENUITEM "&Refresh\tF5", MENU_REFRESH
	154	+ END
	155	+ POPUP "&Tools"
	156	+ BEGIN
	157	+ MENUITEM "&One-Time Password Calculation...", MENU_OTPCALC
	158	+ END
	159	+ POPUP "&Options"
	160	+ BEGIN
	161	+ MENUITEM "&Settings...", MENU_OPTION
	162	+ END
	163	+ POPUP "&Help"
	164	+ BEGIN
	165	+ MENUITEM "&Contents\tF1", MENU_HELP
	166	+ MENUITEM "&Q&&A (Connect to Internet)", MENU_HELP_TROUBLE
	167	+ MENUITEM SEPARATOR
	168	+ MENUITEM "&About FFFTP...", MENU_ABOUT
	169	+ END
90	170	END
91	171
92		-chmod_dlg DIALOG 0, 0, 171, 109
93		-STYLE DS_SETFONT \| DS_MODALFRAME \| WS_POPUP \| WS_CAPTION \| WS_SYSMENU
94		-CAPTION "Permission"
95		-FONT 9, "MS Sans Serif"
	172	+dummy_menu MENU
96	173	BEGIN
97		- LTEXT "Current Permission :",-1,61,74,61,8
98		- EDITTEXT PERM_NOW,124,72,25,12,ES_AUTOHSCROLL \| ES_NUMBER
99		- GROUPBOX "Owner",-1,7,7,48,58
100		- CONTROL "Read",PERM_O_READ,"Button",BS_AUTOCHECKBOX \| WS_TABSTOP,12,21,31,10
101		- CONTROL "Write",PERM_O_WRITE,"Button",BS_AUTOCHECKBOX \| WS_TABSTOP,12,35,31,10
102		- CONTROL "Execute",PERM_O_EXEC,"Button",BS_AUTOCHECKBOX \| WS_TABSTOP,12,50,39,10
103		- GROUPBOX "Group",-1,61,7,48,58
104		- CONTROL "Read",PERM_G_READ,"Button",BS_AUTOCHECKBOX \| WS_TABSTOP,66,21,31,10
105		- CONTROL "Write",PERM_G_WRITE,"Button",BS_AUTOCHECKBOX \| WS_TABSTOP,66,35,31,10
106		- CONTROL "Execute",PERM_G_EXEC,"Button",BS_AUTOCHECKBOX \| WS_TABSTOP,66,49,39,10
107		- GROUPBOX "Others",-1,116,8,48,58
108		- CONTROL "Read",PERM_A_READ,"Button",BS_AUTOCHECKBOX \| WS_TABSTOP,120,22,31,10
109		- CONTROL "Write",PERM_A_WRITE,"Button",BS_AUTOCHECKBOX \| WS_TABSTOP,120,36,31,10
110		- CONTROL "Execute",PERM_A_EXEC,"Button",BS_AUTOCHECKBOX \| WS_TABSTOP,120,51,39,10
111		- CONTROL "",-1,"Static",SS_BLACKFRAME,57,69,106,18
112		- DEFPUSHBUTTON "OK",IDOK,7,92,48,14
113		- PUSHBUTTON "Cancel",IDCANCEL,61,92,48,14
114		- PUSHBUTTON "Help",9,116,92,48,14
	174	+ POPUP "dummy"
	175	+ BEGIN
	176	+ MENUITEM "Go up (host)", MENU_REMOTE_UPDIR
	177	+ MENUITEM "Go up (local)", MENU_LOCAL_UPDIR
	178	+ MENUITEM "Go up (both)", MENU_UPDIR
	179	+ MENUITEM "COMBO_LOCAL", COMBO_LOCAL
	180	+ MENUITEM "COMBO REMOTE", COMBO_REMOTE
	181	+ MENUITEM "Text Mode", MENU_TEXT
	182	+ MENUITEM "Binary Mode", MENU_BINARY
	183	+ MENUITEM "Auto Mode", MENU_AUTO
	184	+ MENUITEM "Refresh (local)", REFRESH_LOCAL
	185	+ MENUITEM "Refresh (remote)", REFRESH_REMOTE
	186	+ MENUITEM "CHDIR(remote)", MENU_REMOTE_CHDIR
	187	+ MENUITEM "CHDIR(local)", MENU_LOCAL_CHDIR
	188	+ MENUITEM "KANJI EUC", MENU_KNJ_EUC
	189	+ MENUITEM "KANJI JIS", MENU_KNJ_JIS
	190	+ MENUITEM "KANJI NONE", MENU_KNJ_NONE
	191	+ MENUITEM "Double click", MENU_DCLICK
	192	+ MENUITEM "Kana henkan", MENU_KANACNV
	193	+ MENUITEM "Open 1", MENU_OPEN1
	194	+ MENUITEM "Open 2", MENU_OPEN2
	195	+ MENUITEM "Open 3", MENU_OPEN3
	196	+ MENUITEM "Connect", MENU_CONNECT_NUM
	197	+ MENUITEM "HIst 1", MENU_HIST_1
	198	+ MENUITEM "Hist 2", MENU_HIST_2
	199	+ MENUITEM "Hist 3", MENU_HIST_3
	200	+ MENUITEM "Hist 4", MENU_HIST_4
	201	+ MENUITEM "Hist 5", MENU_HIST_5
	202	+ MENUITEM "Hist 6", MENU_HIST_6
	203	+ MENUITEM "Hist 7", MENU_HIST_7
	204	+ MENUITEM "Hist 8", MENU_HIST_8
	205	+ MENUITEM "Hist 9", MENU_HIST_9
	206	+ MENUITEM "Hist 10 ", MENU_HIST_10
	207	+ MENUITEM "Hist 11", MENU_HIST_11
	208	+ MENUITEM "Hist 12", MENU_HIST_12
	209	+ MENUITEM "Hist 13", MENU_HIST_13
	210	+ MENUITEM "Hist 14", MENU_HIST_14
	211	+ MENUITEM "Hist 15", MENU_HIST_15
	212	+ MENUITEM "Hist 16", MENU_HIST_16
	213	+ MENUITEM "Hist 17", MENU_HIST_17
	214	+ MENUITEM "Hist 18", MENU_HIST_18
	215	+ MENUITEM "Hist 19", MENU_HIST_19
	216	+ MENUITEM "Hist 20", MENU_HIST_20
	217	+ MENUITEM "Auto exit", MENU_AUTO_EXIT
	218	+ MENUITEM "Stop", MENU_ABORT
	219	+ MENUITEM "URL to clipboard", MENU_URL_COPY
	220	+ MENUITEM "Download all", MENU_DOWNLOAD_ALL
	221	+ MENUITEM "Upload all", MENU_UPLOAD_ALL
	222	+ END
115	223	END
116	224
	225	+
	226	+/////////////////////////////////////////////////////////////////////////////
	227	+//
	228	+// Dialog
	229	+//
	230	+
117	231	about_dlg DIALOGEX 0, 0, 195, 209
118	232	STYLE DS_SETFONT \| DS_MODALFRAME \| WS_POPUP \| WS_CAPTION \| WS_SYSMENU
119	233	CAPTION "About FFFTP"

		@@ -130,63 +244,48 @@ BEGIN
130	244	CTEXT "AES program code :\nCopyright (c) 1998-2008, Brian Gladman, Worcester, UK.\nAll rights reserved.",-1,7,74,181,27
131	245	END
132	246
133		-bmark_dlg DIALOG 0, 0, 222, 109
134		-STYLE DS_SETFONT \| WS_POPUP \| WS_CLIPCHILDREN \| WS_CAPTION \| WS_SYSMENU \| WS_THICKFRAME
135		-CAPTION "Bookmarks"
	247	+transfer_dlg DIALOG 0, 0, 199, 91
	248	+STYLE DS_SETFONT \| DS_MODALFRAME \| WS_MINIMIZEBOX \| WS_CAPTION \| WS_SYSMENU
136	249	FONT 9, "MS Sans Serif"
137	250	BEGIN
138		- LISTBOX BMARK_LIST,7,7,152,75,LBS_NOINTEGRALHEIGHT \| WS_VSCROLL \| WS_TABSTOP
139		- DEFPUSHBUTTON "&Close",IDOK,91,90,50,14
140		- PUSHBUTTON "Chan&ge",BMARK_JUMP,27,90,50,14
141		- PUSHBUTTON "&New...",BMARK_NEW,165,7,50,14
142		- PUSHBUTTON "&Modify...",BMARK_SET,165,26,50,14
143		- PUSHBUTTON "&Delete...",BMARK_DEL,165,45,50,14
144		- PUSHBUTTON "U&p",BMARK_UP,165,65,23,14
145		- PUSHBUTTON "Do&wn",BMARK_DOWN,192,65,23,14
146		- SCROLLBAR BMARK_SIZEGRIP,212,96,10,13,SBS_BOTTOMALIGN \| SBS_VERT \| SBS_SIZEGRIP
147		- PUSHBUTTON "&Help",9,165,90,50,14
	251	+ PUSHBUTTON "Cancel this File",IDCANCEL,7,73,62,14
	252	+ PUSHBUTTON "Cancel from Next",TRANS_STOP_NEXT,78,73,62,14
	253	+ PUSHBUTTON "Cancel All",TRANS_STOP_ALL,150,73,42,14
	254	+ LTEXT "Host :",-1,7,5,27,8
	255	+ LTEXT "",TRANS_REMOTE,45,5,147,8,SS_NOPREFIX
	256	+ LTEXT "Local :",-1,7,18,27,8
	257	+ LTEXT "",TRANS_LOCAL,45,18,147,8,SS_NOPREFIX
	258	+ LTEXT "Status :",-1,7,44,27,8
	259	+ LTEXT "",TRANS_STATUS,45,44,147,8
	260	+ CONTROL "Progress1",TRANS_TIME_BAR,"msctls_progress32",0x0,7,58,185,9
	261	+ LTEXT "Mode :",-1,7,31,27,8
	262	+ LTEXT "",TRANS_MODE,45,31,51,8
	263	+ LTEXT "Kanji Code :",-1,98,31,39,8
	264	+ LTEXT "",TRANS_KANJI,140,31,52,8
148	265	END
149	266
150		-def_attr_dlg DIALOG 0, 0, 123, 69
	267	+rename_dlg DIALOG 0, 0, 187, 69
151	268	STYLE DS_SETFONT \| DS_MODALFRAME \| WS_POPUP \| WS_CAPTION \| WS_SYSMENU
152		-CAPTION "Default Permission"
153	269	FONT 9, "MS Sans Serif"
154	270	BEGIN
155		- LTEXT "&Filename",-1,7,7,49,8
156		- EDITTEXT DEFATTR_FNAME,7,18,47,12,ES_AUTOHSCROLL
157		- LTEXT "->",-1,58,20,8,8
158		- LTEXT "&Permission",-1,71,7,40,8
159		- EDITTEXT DEFATTR_ATTR,71,18,31,12,ES_AUTOHSCROLL \| ES_NUMBER
160		- PUSHBUTTON "...",DEFATTR_ATTR_BR,102,18,13,12
161		- LTEXT "(example: 644)",-1,53,35,51,8
162		- DEFPUSHBUTTON "OK",IDOK,7,48,50,14
163		- PUSHBUTTON "Cancel",IDCANCEL,66,48,50,14
	271	+ EDITTEXT RENAME_NEW,7,34,173,12,ES_AUTOHSCROLL
	272	+ DEFPUSHBUTTON "OK",IDOK,9,51,50,14
	273	+ PUSHBUTTON "Cancel",IDCANCEL,68,51,50,14
	274	+ PUSHBUTTON "&Stop",RENAME_STOP,128,51,50,14
	275	+ LTEXT "",RENAME_TEXT,7,21,173,8,SS_NOPREFIX
	276	+ LTEXT "Enter new name",-1,7,7,133,8
164	277	END
165	278
166		-opt_fire_dlg DIALOG 0, 0, 211, 139
167		-STYLE DS_SETFONT \| WS_CHILD \| WS_DISABLED \| WS_CAPTION
	279	+delete_dlg DIALOG 0, 0, 209, 55
	280	+STYLE DS_SETFONT \| DS_MODALFRAME \| WS_POPUP \| WS_CAPTION \| WS_SYSMENU
168	281	FONT 9, "MS Sans Serif"
169	282	BEGIN
170		- LTEXT "Firewall &Type",-1,7,7,90,8
171		- COMBOBOX FIRE_TYPE,7,16,197,104,CBS_DROPDOWNLIST \| CBS_NOINTEGRALHEIGHT \| WS_VSCROLL \| WS_TABSTOP
172		- LTEXT "Firewall &Hostname",-1,7,32,80,8
173		- EDITTEXT FIRE_HOST,7,42,150,12,ES_AUTOHSCROLL
174		- LTEXT "&Port",-1,168,32,36,8
175		- EDITTEXT FIRE_PORT,169,41,35,12,ES_AUTOHSCROLL \| ES_NUMBER
176		- LTEXT "Firewall &Username",-1,7,56,72,8
177		- EDITTEXT FIRE_USER,7,65,70,12,ES_AUTOHSCROLL
178		- LTEXT "Firewall P&assword",-1,81,56,70,8
179		- EDITTEXT FIRE_PASS,81,65,70,12,ES_PASSWORD \| ES_AUTOHSCROLL
180		- LTEXT "&Security",-1,7,80,63,8
181		- COMBOBOX FIRE_SECURITY,7,89,57,75,CBS_DROPDOWNLIST \| CBS_NOINTEGRALHEIGHT \| WS_VSCROLL \| WS_TABSTOP
182		- CONTROL "Use SOCKS se&rver to search for hosts",FIRE_RESOLV,
183		- "Button",BS_AUTOCHECKBOX \| WS_GROUP \| WS_TABSTOP,71,83,139,10
184		- CONTROL "Use l&owercase OPEN/SITE commands",FIRE_LOWER,"Button",BS_AUTOCHECKBOX \| WS_GROUP \| WS_TABSTOP,71,96,139,10
185		- CONTROL "Us&e the firewall for undefined hosts",FIRE_USEIT,
186		- "Button",BS_AUTOCHECKBOX \| WS_GROUP \| WS_TABSTOP,7,109,197,10
187		- CONTROL "Use PAS&V mode for undefined hosts",FIRE_PASV,"Button",BS_AUTOCHECKBOX \| WS_GROUP \| WS_TABSTOP,7,122,197,10
188		- LTEXT "Replace @ by",-1,154,55,50,8
189		- EDITTEXT FIRE_DELIMIT,154,65,35,12,ES_AUTOHSCROLL
	283	+ DEFPUSHBUTTON "&Delete",IDOK,7,37,45,14
	284	+ PUSHBUTTON "&Cancel",DELETE_NO,57,37,44,14
	285	+ PUSHBUTTON "Delete &All",DELETE_ALL,107,37,45,14
	286	+ PUSHBUTTON "Ca&ncel All",IDCANCEL,157,37,45,14
	287	+ LTEXT "",DELETE_TEXT,7,19,195,8,SS_NOPREFIX
	288	+ LTEXT "Delete following file?",-1,7,7,167,8
190	289	END
191	290
192	291	hostlist_dlg DIALOG 0, 0, 222, 120

		@@ -208,96 +307,6 @@ BEGIN
208	307	PUSHBUTTON "Help",9,165,102,50,14
209	308	END
210	309
211		-hostname_dlg DIALOG 0, 0, 187, 93
212		-STYLE DS_SETFONT \| DS_MODALFRAME \| WS_POPUP \| WS_CAPTION
213		-CAPTION "Quick Connect"
214		-FONT 9, "MS Sans Serif"
215		-BEGIN
216		- LTEXT "&Host Name/Address",-1,7,6,130,8
217		- COMBOBOX QHOST_HOST,7,16,173,86,CBS_DROPDOWN \| CBS_AUTOHSCROLL \| CBS_NOINTEGRALHEIGHT \| WS_VSCROLL \| WS_TABSTOP
218		- LTEXT "&Username",-1,7,34,57,8
219		- EDITTEXT QHOST_USER,7,44,80,12,ES_AUTOHSCROLL
220		- LTEXT "&Password/Phrase",-1,99,34,87,8
221		- EDITTEXT QHOST_PASS,99,44,80,12,ES_PASSWORD \| ES_AUTOHSCROLL
222		- CONTROL "Use &Firewall",QHOST_FWALL,"Button",BS_AUTOCHECKBOX \| WS_TABSTOP,7,61,75,10
223		- CONTROL "Use PAS&V mode",QHOST_PASV,"Button",BS_AUTOCHECKBOX \| WS_TABSTOP,84,61,83,10
224		- DEFPUSHBUTTON "OK",IDOK,36,75,50,14
225		- PUSHBUTTON "Cancel",IDCANCEL,101,75,50,14
226		-END
227		-
228		-hset_adv2_dlg DIALOG 0, 0, 207, 139
229		-STYLE DS_SETFONT \| WS_CHILD \| WS_DISABLED \| WS_CAPTION
230		-FONT 9, "MS Sans Serif"
231		-BEGIN
232		- CONTROL "Use &LIST command to get file list",HSET_LISTCMD,"Button",BS_AUTOCHECKBOX \| WS_GROUP \| WS_TABSTOP,7,7,131,10
233		- CONTROL "Use &NLST -R for high-speed recursive search",HSET_NLST_R,
234		- "Button",BS_AUTOCHECKBOX \| WS_TABSTOP,7,21,167,10
235		- CONTROL "&Do not use full path to access files",HSET_FULLPATH,
236		- "Button",BS_AUTOCHECKBOX \| WS_TABSTOP,7,35,148,10
237		- LTEXT "&Permissions Change Command",-1,7,51,110,8
238		- EDITTEXT HSET_CHMOD_CMD,7,61,62,12,ES_AUTOHSCROLL
239		- PUSHBUTTON "Default",HSET_CHMOD_NOR,70,61,28,13
240		- LTEXT "&Host Type",-1,7,80,69,8
241		- COMBOBOX HSET_HOSTTYPE,7,90,71,75,CBS_DROPDOWNLIST \| WS_VSCROLL \| WS_TABSTOP
242		- LTEXT "NLST &Filename/Option",-1,7,109,89,8
243		- EDITTEXT HSET_LS_FNAME,7,119,62,12,ES_AUTOHSCROLL
244		- PUSHBUTTON "Delault",HSET_LS_FNAME_NOR,70,119,28,13
245		-END
246		-
247		-hset_adv_dlg DIALOG 0, 0, 207, 139
248		-STYLE DS_SETFONT \| WS_CHILD \| WS_DISABLED \| WS_CAPTION
249		-FONT 9, "MS Sans Serif"
250		-BEGIN
251		- CONTROL "Use &Firewall",HSET_FIREWALL,"Button",BS_AUTOCHECKBOX \| WS_GROUP \| WS_TABSTOP,7,7,92,10
252		- CONTROL "Use PAS&V mode",HSET_PASV,"Button",BS_AUTOCHECKBOX \| WS_GROUP \| WS_TABSTOP,7,22,92,10
253		- CONTROL "S&ync. folder movement",HSET_SYNCMOVE,"Button",BS_AUTOCHECKBOX \| WS_TABSTOP,7,37,93,10
254		- LTEXT "&Port",-1,7,56,54,8
255		- EDITTEXT HSET_PORT,7,66,22,12,ES_AUTOHSCROLL \| ES_NUMBER
256		- PUSHBUTTON "Default",HSET_PORT_NOR,30,66,28,13
257		- LTEXT "&Account",-1,7,87,65,8
258		- EDITTEXT HSET_ACCOUNT,7,97,62,12,ES_AUTOHSCROLL
259		- LTEXT "Host &Timezone",-1,103,7,81,8
260		- COMBOBOX HSET_TIMEZONE,103,17,83,102,CBS_DROPDOWNLIST \| WS_VSCROLL \| WS_TABSTOP
261		- LTEXT "&Security",-1,103,35,72,8
262		- COMBOBOX HSET_SECURITY,103,45,83,75,CBS_DROPDOWNLIST \| CBS_NOINTEGRALHEIGHT \| WS_VSCROLL \| WS_TABSTOP
263		- LTEXT "&Commands After Connection",-1,103,65,97,8
264		- EDITTEXT HSET_INITCMD,103,76,92,30,ES_MULTILINE \| ES_AUTOVSCROLL \| ES_AUTOHSCROLL \| ES_WANTRETURN
265		-END
266		-
267		-hset_code_dlg DIALOGEX 0, 0, 207, 139
268		-STYLE DS_SETFONT \| WS_CHILD \| WS_DISABLED \| WS_CAPTION
269		-FONT 9, "MS Sans Serif", 0, 0, 0x0
270		-BEGIN
271		- GROUPBOX "&Japanese Kanji Code",-1,7,7,98,94,WS_GROUP
272		- CONTROL "No conversion",HSET_NO_CNV,"Button",BS_AUTORADIOBUTTON \| WS_GROUP,12,21,91,10
273		- CONTROL "Shift_JIS",HSET_SJIS_CNV,"Button",BS_AUTORADIOBUTTON,12,33,81,10
274		- CONTROL "JIS",HSET_JIS_CNV,"Button",BS_AUTORADIOBUTTON,12,45,41,10
275		- CONTROL "EUC",HSET_EUC_CNV,"Button",BS_AUTORADIOBUTTON,12,57,41,10
276		- CONTROL "UTF-8N",HSET_UTF8N_CNV,"Button",BS_AUTORADIOBUTTON,12,69,41,10
277		- CONTROL "Hankaku to Zenkaku",HSET_HANCNV,"Button",BS_AUTOCHECKBOX \| WS_GROUP \| WS_TABSTOP,12,96,90,10
278		- GROUPBOX "&Filename Kanji Code",-1,107,7,97,116,WS_GROUP
279		- CONTROL "Automatic",HSET_FN_AUTO_CNV,"Button",BS_AUTORADIOBUTTON \| WS_GROUP,114,21,65,10
280		- CONTROL "Shift_JIS",HSET_FN_SJIS_CNV,"Button",BS_AUTORADIOBUTTON \| WS_GROUP,111,33,65,10
281		- CONTROL "JIS",HSET_FN_JIS_CNV,"Button",BS_AUTORADIOBUTTON,111,45,70,10
282		- CONTROL "EUC",HSET_FN_EUC_CNV,"Button",BS_AUTORADIOBUTTON,111,57,41,10
283		- CONTROL "Samba-HEX",HSET_FN_SMH_CNV,"Button",BS_AUTORADIOBUTTON,111,69,66,10
284		- CONTROL "Samba-CAP",HSET_FN_SMC_CNV,"Button",BS_AUTORADIOBUTTON,111,81,64,10
285		- CONTROL "UTF-8N",HSET_FN_UTF8N_CNV,"Button",BS_AUTORADIOBUTTON,111,93,63,10
286		- CONTROL "Hankaku to Zenkaku",HSET_FN_HANCNV,"Button",BS_AUTOCHECKBOX \| WS_GROUP \| WS_TABSTOP,111,108,91,10
287		-END
288		-
289		-hset_dialup_dlg DIALOG 0, 0, 207, 139
290		-STYLE DS_SETFONT \| WS_CHILD \| WS_DISABLED \| WS_CAPTION
291		-FONT 9, "MS Sans Serif"
292		-BEGIN
293		- CONTROL "&Use Dialup Connection",HSET_DIALUP,"Button",BS_AUTOCHECKBOX \| WS_TABSTOP,7,7,110,10
294		- LTEXT "&Dialup Setting",-1,19,23,97,8
295		- COMBOBOX HSET_DIALENTRY,19,33,181,101,CBS_DROPDOWNLIST \| CBS_SORT \| CBS_NOINTEGRALHEIGHT \| WS_VSCROLL \| WS_TABSTOP
296		- CONTROL "&Reconnect if another dialup is active",HSET_DIALUSETHIS,
297		- "Button",BS_AUTOCHECKBOX \| WS_TABSTOP,19,53,181,10
298		- CONTROL "&Notify before reconnecting",HSET_DIALNOTIFY,"Button",BS_AUTOCHECKBOX \| WS_TABSTOP,31,67,116,10
299		-END
300		-
301	310	hset_main_dlg DIALOG 0, 0, 207, 139
302	311	STYLE DS_SETFONT \| WS_CHILD \| WS_DISABLED \| WS_CAPTION
303	312	FONT 9, "MS Sans Serif"

		@@ -321,115 +330,120 @@ BEGIN
321	330	"Button",BS_AUTOCHECKBOX \| WS_TABSTOP,7,122,193,10
322	331	END
323	332
324		-account_dlg DIALOG 0, 0, 187, 42
325		-STYLE DS_SETFONT \| DS_MODALFRAME \| WS_POPUP \| WS_CAPTION
326		-CAPTION "Account"
327		-FONT 9, "MS Sans Serif"
328		-BEGIN
329		- EDITTEXT INP_INPSTR,7,7,173,12,ES_AUTOHSCROLL
330		- DEFPUSHBUTTON "OK",IDOK,36,24,50,14
331		- PUSHBUTTON "Cancel",IDCANCEL,101,24,50,14
332		- CONTROL "",INP_ANONYMOUS,"Button",BS_AUTOCHECKBOX \| NOT WS_VISIBLE \| WS_DISABLED \| WS_TABSTOP,164,30,16,8
333		-END
334		-
335		-chdir_br_dlg DIALOG 0, 0, 187, 43
336		-STYLE DS_SETFONT \| DS_MODALFRAME \| WS_POPUP \| WS_CAPTION
337		-CAPTION "Folder"
338		-FONT 9, "MS Sans Serif"
339		-BEGIN
340		- EDITTEXT INP_INPSTR,7,8,159,12,ES_AUTOHSCROLL
341		- PUSHBUTTON "...",INP_BROUSE,167,7,13,14
342		- DEFPUSHBUTTON "OK",IDOK,36,25,50,14
343		- PUSHBUTTON "Cancel",IDCANCEL,101,25,50,14
344		-END
345		-
346		-bmark_edit_dlg DIALOG 0, 0, 187, 83
347		-STYLE DS_SETFONT \| DS_MODALFRAME \| WS_POPUP \| WS_CAPTION \| WS_SYSMENU
348		-CAPTION "Bookmark"
349		-FONT 9, "MS Sans Serif"
350		-BEGIN
351		- LTEXT "&Local Folder",-1,7,7,173,8
352		- EDITTEXT BEDIT_LOCAL,7,17,173,12,ES_AUTOHSCROLL
353		- LTEXT "&Host Folder",-1,7,37,173,8
354		- EDITTEXT BEDIT_REMOTE,7,47,173,12,ES_AUTOHSCROLL
355		- DEFPUSHBUTTON "OK",IDOK,36,65,50,14
356		- PUSHBUTTON "Cancel",IDCANCEL,101,65,50,14
357		-END
358		-
359		-chdir_dlg DIALOG 0, 0, 187, 43
360		-STYLE DS_SETFONT \| DS_MODALFRAME \| WS_POPUP \| WS_CAPTION
361		-CAPTION "Folder"
362		-FONT 9, "MS Sans Serif"
363		-BEGIN
364		- EDITTEXT INP_INPSTR,7,7,173,12,ES_AUTOHSCROLL
365		- DEFPUSHBUTTON "OK",IDOK,36,25,50,14
366		- PUSHBUTTON "Cancel",IDCANCEL,101,25,50,14
367		- CONTROL "",INP_ANONYMOUS,"Button",BS_AUTOCHECKBOX \| NOT WS_VISIBLE \| WS_DISABLED \| WS_TABSTOP,164,31,16,8
368		-END
369		-
370		-cwderr_dlg DIALOG 0, 0, 155, 57
	333	+FILEOPENORD_1 DIALOG 109, 35, 165, 134
371	334	STYLE DS_SETFONT \| DS_MODALFRAME \| WS_POPUP \| WS_CAPTION \| WS_SYSMENU
372		-CAPTION "Error"
	335	+CAPTION "Open"
373	336	FONT 9, "MS Sans Serif"
374	337	BEGIN
375		- PUSHBUTTON "STOP",IDCANCEL,51,36,50,14
376		- CTEXT "Cannot move to subfolder.",-1,7,7,141,8
377		- CTEXT "Stop processing.",-1,7,20,141,8
	338	+ LTEXT "&Folder",-1,7,6,92,9
	339	+ LISTBOX lst2,7,32,92,68,LBS_SORT \| LBS_OWNERDRAWFIXED \| LBS_HASSTRINGS \| LBS_DISABLENOSCROLL \| WS_VSCROLL \| WS_TABSTOP
	340	+ LTEXT "&Drive",stc4,7,104,92,9
	341	+ COMBOBOX cmb2,7,114,92,68,CBS_DROPDOWNLIST \| CBS_OWNERDRAWFIXED \| CBS_AUTOHSCROLL \| CBS_SORT \| CBS_HASSTRINGS \| WS_BORDER \| WS_VSCROLL \| WS_TABSTOP
	342	+ DEFPUSHBUTTON "OK",IDOK,105,6,50,14,WS_GROUP
	343	+ PUSHBUTTON "Cancel",IDCANCEL,105,24,50,14,WS_GROUP
	344	+ PUSHBUTTON "&Help",psh15,105,46,50,14,WS_GROUP
	345	+ CONTROL "&Read Only",chx1,"Button",BS_AUTOCHECKBOX \| WS_GROUP \| WS_TABSTOP,105,68,50,12
	346	+ LISTBOX lst1,102,99,20,20,LBS_SORT \| LBS_OWNERDRAWFIXED \| LBS_HASSTRINGS \| LBS_DISABLENOSCROLL \| NOT WS_VISIBLE \| WS_VSCROLL
	347	+ LTEXT "File &Name:",stc3,121,83,12,10,NOT WS_VISIBLE
	348	+ EDITTEXT edt1,104,83,12,12,ES_AUTOHSCROLL \| ES_OEMCONVERT \| NOT WS_VISIBLE \| NOT WS_TABSTOP
	349	+ LTEXT "List Files of &Type:",stc2,127,99,12,9,NOT WS_VISIBLE
	350	+ COMBOBOX cmb1,107,115,16,36,CBS_DROPDOWNLIST \| CBS_AUTOHSCROLL \| NOT WS_VISIBLE \| WS_BORDER \| WS_VSCROLL
	351	+ LTEXT "",stc1,9,18,88,8
378	352	END
379	353
380		-delete_dlg DIALOG 0, 0, 209, 55
381		-STYLE DS_SETFONT \| DS_MODALFRAME \| WS_POPUP \| WS_CAPTION \| WS_SYSMENU
	354	+opt_user_dlg DIALOG 0, 0, 211, 139
	355	+STYLE DS_SETFONT \| WS_CHILD \| WS_DISABLED \| WS_CAPTION
382	356	FONT 9, "MS Sans Serif"
383	357	BEGIN
384		- DEFPUSHBUTTON "&Delete",IDOK,7,37,45,14
385		- PUSHBUTTON "&Cancel",DELETE_NO,57,37,44,14
386		- PUSHBUTTON "Delete &All",DELETE_ALL,107,37,45,14
387		- PUSHBUTTON "Ca&ncel All",IDCANCEL,157,37,45,14
388		- LTEXT "",DELETE_TEXT,7,19,195,8,SS_NOPREFIX
389		- LTEXT "Delete following file?",-1,7,7,167,8
	358	+ LTEXT "&Mail address",-1,7,7,59,8
	359	+ EDITTEXT USER_ADRS,7,18,196,12,ES_AUTOHSCROLL
	360	+ LTEXT "This address is used for the anonymous FTP password.",-1,28,36,169,18,SS_SUNKEN
390	361	END
391	362
392		-dial_dlg DIALOG 0, 0, 159, 37
393		-STYLE DS_SETFONT \| DS_MODALFRAME \| WS_POPUP \| WS_CAPTION
	363	+opt_tool_dlg DIALOG 0, 0, 211, 139
	364	+STYLE DS_SETFONT \| WS_CHILD \| WS_DISABLED \| WS_CAPTION
394	365	FONT 9, "MS Sans Serif"
395	366	BEGIN
396		- DEFPUSHBUTTON "Cancel",IDCANCEL,54,19,50,14
397		- CTEXT "",DIAL_STATUS,7,6,145,8,SS_NOPREFIX
	367	+ LTEXT "Viewer &1",-1,7,7,39,8
	368	+ EDITTEXT TOOL_EDITOR1,7,18,183,12,ES_AUTOHSCROLL
	369	+ PUSHBUTTON "...",TOOL_EDITOR1_BR,191,18,12,13
	370	+ LTEXT "Viewer &2",-1,7,63,39,8
	371	+ EDITTEXT TOOL_EDITOR2,7,74,183,12,ES_AUTOHSCROLL
	372	+ PUSHBUTTON "...",TOOL_EDITOR2_BR,191,74,12,13
	373	+ LTEXT "Viewer &3",-1,7,93,39,8
	374	+ EDITTEXT TOOL_EDITOR3,7,104,183,12,ES_AUTOHSCROLL
	375	+ PUSHBUTTON "...",TOOL_EDITOR3_BR,191,104,12,13
	376	+ LTEXT "Unassociated files will be opened in Viewer 1.",-1,19,33,184,27,SS_SUNKEN
	377	+ LTEXT "Use Viewer 2 and 3 by right-clicking with the mouse.",-1,14,124,184,8
398	378	END
399	379
400		-dial_password_dlg DIALOG 0, 0, 171, 85
401		-STYLE DS_SETFONT \| DS_MODALFRAME \| WS_POPUP \| WS_CAPTION
	380	+chmod_dlg DIALOG 0, 0, 171, 109
	381	+STYLE DS_SETFONT \| DS_MODALFRAME \| WS_POPUP \| WS_CAPTION \| WS_SYSMENU
	382	+CAPTION "Permission"
402	383	FONT 9, "MS Sans Serif"
403	384	BEGIN
404		- LTEXT "Enter Username and Password for Dialup",-1,7,4,157,9
405		- RTEXT "&Username",-1,14,23,45,8
406		- EDITTEXT RASPASS_USER,62,19,95,14,ES_AUTOHSCROLL
407		- RTEXT "&Password",-1,14,43,45,8
408		- EDITTEXT RASPASS_PASS,62,41,95,14,ES_PASSWORD \| ES_AUTOHSCROLL
409		- DEFPUSHBUTTON "OK",IDOK,24,63,50,14
410		- PUSHBUTTON "Cancel",IDCANCEL,96,63,50,14
	385	+ LTEXT "Current Permission :",-1,61,74,61,8
	386	+ EDITTEXT PERM_NOW,124,72,25,12,ES_AUTOHSCROLL \| ES_NUMBER
	387	+ GROUPBOX "Owner",-1,7,7,48,58
	388	+ CONTROL "Read",PERM_O_READ,"Button",BS_AUTOCHECKBOX \| WS_TABSTOP,12,21,31,10
	389	+ CONTROL "Write",PERM_O_WRITE,"Button",BS_AUTOCHECKBOX \| WS_TABSTOP,12,35,31,10
	390	+ CONTROL "Execute",PERM_O_EXEC,"Button",BS_AUTOCHECKBOX \| WS_TABSTOP,12,50,39,10
	391	+ GROUPBOX "Group",-1,61,7,48,58
	392	+ CONTROL "Read",PERM_G_READ,"Button",BS_AUTOCHECKBOX \| WS_TABSTOP,66,21,31,10
	393	+ CONTROL "Write",PERM_G_WRITE,"Button",BS_AUTOCHECKBOX \| WS_TABSTOP,66,35,31,10
	394	+ CONTROL "Execute",PERM_G_EXEC,"Button",BS_AUTOCHECKBOX \| WS_TABSTOP,66,49,39,10
	395	+ GROUPBOX "Others",-1,116,8,48,58
	396	+ CONTROL "Read",PERM_A_READ,"Button",BS_AUTOCHECKBOX \| WS_TABSTOP,120,22,31,10
	397	+ CONTROL "Write",PERM_A_WRITE,"Button",BS_AUTOCHECKBOX \| WS_TABSTOP,120,36,31,10
	398	+ CONTROL "Execute",PERM_A_EXEC,"Button",BS_AUTOCHECKBOX \| WS_TABSTOP,120,51,39,10
	399	+ CONTROL "",-1,"Static",SS_BLACKFRAME,57,69,106,18
	400	+ DEFPUSHBUTTON "OK",IDOK,7,92,48,14
	401	+ PUSHBUTTON "Cancel",IDCANCEL,61,92,48,14
	402	+ PUSHBUTTON "Help",9,116,92,48,14
411	403	END
412	404
413		-diskfull_dlg DIALOG 0, 0, 159, 42
414		-STYLE DS_SETFONT \| DS_MODALFRAME \| WS_POPUP \| WS_CAPTION
415		-CAPTION "FFFTP:Error"
	405	+sort_dlg DIALOG 0, 0, 187, 197
	406	+STYLE DS_SETFONT \| DS_MODALFRAME \| WS_POPUP \| WS_CAPTION \| WS_SYSMENU
	407	+CAPTION "Sort"
416	408	FONT 9, "MS Sans Serif"
417	409	BEGIN
418		- DEFPUSHBUTTON "Cencal this File",IDOK,13,24,66,14
419		- PUSHBUTTON "Cencel All",IDCANCEL,95,24,50,14
420		- CTEXT "Disk is full",-1,7,6,145,10
	410	+ GROUPBOX "Local",-1,7,7,81,150
	411	+ GROUPBOX "&File",-1,10,17,74,80,WS_GROUP
	412	+ CONTROL "Name order",SORT_LFILE_NAME,"Button",BS_AUTORADIOBUTTON \| WS_GROUP,15,30,66,10
	413	+ CONTROL "Extension order",SORT_LFILE_EXT,"Button",BS_AUTORADIOBUTTON,15,42,66,10
	414	+ CONTROL "Size order",SORT_LFILE_SIZE,"Button",BS_AUTORADIOBUTTON,15,55,66,10
	415	+ CONTROL "Date order",SORT_LFILE_DATE,"Button",BS_AUTORADIOBUTTON,15,68,66,10
	416	+ CONTROL "Reverse",SORT_LFILE_REV,"Button",BS_AUTOCHECKBOX \| WS_GROUP \| WS_TABSTOP,15,81,66,10
	417	+ GROUPBOX "F&older",-1,10,100,74,52,WS_GROUP
	418	+ CONTROL "Name order",SORT_LDIR_NAME,"Button",BS_AUTORADIOBUTTON \| WS_GROUP,15,112,66,10
	419	+ CONTROL "Date order",SORT_LDIR_DATE,"Button",BS_AUTORADIOBUTTON,15,124,66,10
	420	+ CONTROL "Reverse",SORT_LDIR_REV,"Button",BS_AUTOCHECKBOX \| WS_GROUP \| WS_TABSTOP,15,137,66,10
	421	+ GROUPBOX "Host",-1,98,7,82,150
	422	+ GROUPBOX "F&ile",-1,102,17,74,80,WS_GROUP
	423	+ CONTROL "Name order",SORT_RFILE_NAME,"Button",BS_AUTORADIOBUTTON \| WS_GROUP,107,30,66,10
	424	+ CONTROL "Extension order",SORT_RFILE_EXT,"Button",BS_AUTORADIOBUTTON,107,42,66,10
	425	+ CONTROL "Size order",SORT_RFILE_SIZE,"Button",BS_AUTORADIOBUTTON,107,55,66,10
	426	+ CONTROL "Date order",SORT_RFILE_DATE,"Button",BS_AUTORADIOBUTTON,107,68,66,10
	427	+ CONTROL "Reverse",SORT_RFILE_REV,"Button",BS_AUTOCHECKBOX \| WS_GROUP \| WS_TABSTOP,107,81,66,10
	428	+ GROUPBOX "Fo&lder",-1,102,100,74,52,WS_GROUP
	429	+ CONTROL "Name order",SORT_RDIR_NAME,"Button",BS_AUTORADIOBUTTON \| WS_GROUP,107,112,66,10
	430	+ CONTROL "Extention order",SORT_RDIR_DATE,"Button",BS_AUTORADIOBUTTON,107,124,66,10
	431	+ CONTROL "Reverse",SORT_RDIR_REV,"Button",BS_AUTOCHECKBOX \| WS_GROUP \| WS_TABSTOP,107,137,66,10
	432	+ CONTROL "Save sort setting on each host",SORT_SAVEHOST,"Button",BS_AUTOCHECKBOX \| WS_TABSTOP,7,164,156,10
	433	+ DEFPUSHBUTTON "OK",IDOK,11,179,50,14
	434	+ PUSHBUTTON "Cancel",IDCANCEL,69,179,50,14
	435	+ PUSHBUTTON "Help",9,127,179,50,14
421	436	END
422	437
423		-downerr_dlg DIALOGEX 0, 0, 159, 65
424		-STYLE DS_SETFONT \| DS_MODALFRAME \| DS_SETFOREGROUND \| WS_POPUP \| WS_CAPTION
425		-CAPTION "FFFTP:Error"
426		-FONT 9, "MS Sans Serif", 0, 0, 0x1
	438	+mkdir_dlg DIALOG 0, 0, 187, 58
	439	+STYLE DS_SETFONT \| DS_MODALFRAME \| WS_POPUP \| WS_CAPTION \| WS_SYSMENU
	440	+FONT 9, "MS Sans Serif"
427	441	BEGIN
428		- DEFPUSHBUTTON "Cancel this File",IDOK,7,47,82,14
429		- PUSHBUTTON "Cancel All",IDCANCEL,102,47,50,14
430		- LTEXT "Cannot download following file :",-1,7,4,138,10
431		- LTEXT "",UPDOWN_ERR_FNAME,7,16,145,8,SS_NOPREFIX
432		- EDITTEXT UPDOWN_ERR_MSG,7,29,145,12,ES_AUTOHSCROLL \| ES_READONLY \| NOT WS_BORDER,WS_EX_STATICEDGE
	442	+ EDITTEXT INP_INPSTR,7,21,173,12,ES_AUTOHSCROLL
	443	+ DEFPUSHBUTTON "OK",IDOK,36,40,50,14
	444	+ PUSHBUTTON "Cancel",IDCANCEL,102,40,50,14
	445	+ CONTROL "",INP_ANONYMOUS,"Button",BS_AUTOCHECKBOX \| NOT WS_VISIBLE \| WS_DISABLED \| WS_TABSTOP,167,40,13,10
	446	+ LTEXT "Enter new folder name:",-1,7,7,160,8
433	447	END
434	448
435	449	opt_misc_dlg DIALOG 0, 0, 211, 139

		@@ -453,15 +467,66 @@ BEGIN
453	467	CONTROL "Debug",MISC_DEBUG,"Button",BS_AUTOCHECKBOX \| WS_TABSTOP,168,123,40,10
454	468	END
455	469
456		-downname_dlg DIALOG 0, 0, 187, 42
	470	+hostname_dlg DIALOG 0, 0, 187, 93
457	471	STYLE DS_SETFONT \| DS_MODALFRAME \| WS_POPUP \| WS_CAPTION
458		-CAPTION "Download File"
	472	+CAPTION "Quick Connect"
459	473	FONT 9, "MS Sans Serif"
460	474	BEGIN
461		- EDITTEXT INP_INPSTR,7,6,173,12,ES_AUTOHSCROLL
462		- DEFPUSHBUTTON "OK",IDOK,36,24,50,14
463		- PUSHBUTTON "Cancel",IDCANCEL,101,24,50,14
464		- CONTROL "",INP_ANONYMOUS,"Button",BS_AUTOCHECKBOX \| NOT WS_VISIBLE \| WS_DISABLED \| WS_TABSTOP,164,30,16,8
	475	+ LTEXT "&Host Name/Address",-1,7,6,130,8
	476	+ COMBOBOX QHOST_HOST,7,16,173,86,CBS_DROPDOWN \| CBS_AUTOHSCROLL \| CBS_NOINTEGRALHEIGHT \| WS_VSCROLL \| WS_TABSTOP
	477	+ LTEXT "&Username",-1,7,34,57,8
	478	+ EDITTEXT QHOST_USER,7,44,80,12,ES_AUTOHSCROLL
	479	+ LTEXT "&Password/Phrase",-1,99,34,87,8
	480	+ EDITTEXT QHOST_PASS,99,44,80,12,ES_PASSWORD \| ES_AUTOHSCROLL
	481	+ CONTROL "Use &Firewall",QHOST_FWALL,"Button",BS_AUTOCHECKBOX \| WS_TABSTOP,7,61,75,10
	482	+ CONTROL "Use PAS&V mode",QHOST_PASV,"Button",BS_AUTOCHECKBOX \| WS_TABSTOP,84,61,83,10
	483	+ DEFPUSHBUTTON "OK",IDOK,36,75,50,14
	484	+ PUSHBUTTON "Cancel",IDCANCEL,101,75,50,14
	485	+END
	486	+
	487	+passwd_dlg DIALOG 0, 0, 187, 43
	488	+STYLE DS_SETFONT \| DS_MODALFRAME \| WS_POPUP \| WS_CAPTION
	489	+CAPTION "Password/Pass phrase"
	490	+FONT 9, "MS Sans Serif"
	491	+BEGIN
	492	+ EDITTEXT INP_INPSTR,7,7,173,12,ES_PASSWORD \| ES_AUTOHSCROLL
	493	+ DEFPUSHBUTTON "OK",IDOK,36,25,50,14
	494	+ PUSHBUTTON "Cancel",IDCANCEL,101,25,50,14
	495	+ CONTROL "",INP_ANONYMOUS,"Button",BS_AUTOCHECKBOX \| NOT WS_VISIBLE \| WS_DISABLED \| WS_TABSTOP,164,31,16,8
	496	+END
	497	+
	498	+newmasterpasswd_dlg DIALOGEX 0, 0, 187, 43
	499	+STYLE DS_SETFONT \| DS_MODALFRAME \| WS_POPUP \| WS_CAPTION
	500	+CAPTION "Enter new master password"
	501	+FONT 9, "MS Sans Serif", 0, 0, 0x0
	502	+BEGIN
	503	+ EDITTEXT INP_INPSTR,7,7,173,12,ES_AUTOHSCROLL
	504	+ DEFPUSHBUTTON "OK",IDOK,25,25,43,14
	505	+ PUSHBUTTON "Cancel",IDCANCEL,72,25,43,14
	506	+ CONTROL "",INP_ANONYMOUS,"Button",BS_AUTOCHECKBOX \| NOT WS_VISIBLE \| WS_DISABLED \| WS_TABSTOP,172,31,8,8
	507	+ PUSHBUTTON "Help",IDHELP,118,25,43,14
	508	+END
	509	+
	510	+username_dlg DIALOG 0, 0, 187, 58
	511	+STYLE DS_SETFONT \| DS_MODALFRAME \| WS_POPUP \| WS_CAPTION \| WS_SYSMENU
	512	+CAPTION "User Name"
	513	+FONT 9, "MS Sans Serif"
	514	+BEGIN
	515	+ EDITTEXT INP_INPSTR,7,7,173,12,ES_AUTOHSCROLL
	516	+ CONTROL "Anonymous(&A)",INP_ANONYMOUS,"Button",BS_AUTOCHECKBOX \| WS_TABSTOP,14,25,73,10
	517	+ DEFPUSHBUTTON "OK",IDOK,36,40,50,14
	518	+ PUSHBUTTON "Cancel",IDCANCEL,101,40,50,14
	519	+END
	520	+
	521	+chdir_dlg DIALOG 0, 0, 187, 43
	522	+STYLE DS_SETFONT \| DS_MODALFRAME \| WS_POPUP \| WS_CAPTION
	523	+CAPTION "Folder"
	524	+FONT 9, "MS Sans Serif"
	525	+BEGIN
	526	+ EDITTEXT INP_INPSTR,7,7,173,12,ES_AUTOHSCROLL
	527	+ DEFPUSHBUTTON "OK",IDOK,36,25,50,14
	528	+ PUSHBUTTON "Cancel",IDCANCEL,101,25,50,14
	529	+ CONTROL "",INP_ANONYMOUS,"Button",BS_AUTOCHECKBOX \| NOT WS_VISIBLE \| WS_DISABLED \| WS_TABSTOP,164,31,16,8
465	530	END
466	531
467	532	exit_dlg DIALOG 0, 0, 143, 64

		@@ -474,62 +539,125 @@ BEGIN
474	539	LTEXT "File transfer is now in progress.\n\nPlease quit FFFTP after the file transfer done.",-1,7,7,129,35
475	540	END
476	541
477		-FILEOPENORD_1 DIALOG 109, 35, 165, 134
478		-STYLE DS_SETFONT \| DS_MODALFRAME \| WS_POPUP \| WS_CAPTION \| WS_SYSMENU
479		-CAPTION "Open"
	542	+forcepasschange_dlg DIALOG 0, 0, 211, 64
	543	+STYLE DS_SETFONT \| DS_MODALFRAME \| WS_POPUP \| WS_CAPTION
	544	+CAPTION "Force reset of master password"
480	545	FONT 9, "MS Sans Serif"
481	546	BEGIN
482		- LTEXT "&Folder",-1,7,6,92,9
483		- LISTBOX lst2,7,32,92,68,LBS_SORT \| LBS_OWNERDRAWFIXED \| LBS_HASSTRINGS \| LBS_DISABLENOSCROLL \| WS_VSCROLL \| WS_TABSTOP
484		- LTEXT "&Drive",stc4,7,104,92,9
485		- COMBOBOX cmb2,7,114,92,68,CBS_DROPDOWNLIST \| CBS_OWNERDRAWFIXED \| CBS_AUTOHSCROLL \| CBS_SORT \| CBS_HASSTRINGS \| WS_BORDER \| WS_VSCROLL \| WS_TABSTOP
486		- DEFPUSHBUTTON "OK",IDOK,105,6,50,14,WS_GROUP
487		- PUSHBUTTON "Cancel",IDCANCEL,105,24,50,14,WS_GROUP
488		- PUSHBUTTON "&Help",psh15,105,46,50,14,WS_GROUP
489		- CONTROL "&Read Only",chx1,"Button",BS_AUTOCHECKBOX \| WS_GROUP \| WS_TABSTOP,105,68,50,12
490		- LISTBOX lst1,102,99,20,20,LBS_SORT \| LBS_OWNERDRAWFIXED \| LBS_HASSTRINGS \| LBS_DISABLENOSCROLL \| NOT WS_VISIBLE \| WS_VSCROLL
491		- LTEXT "File &Name:",stc3,121,83,12,10,NOT WS_VISIBLE
492		- EDITTEXT edt1,104,83,12,12,ES_AUTOHSCROLL \| ES_OEMCONVERT \| NOT WS_VISIBLE \| NOT WS_TABSTOP
493		- LTEXT "List Files of &Type:",stc2,127,99,12,9,NOT WS_VISIBLE
494		- COMBOBOX cmb1,107,115,16,36,CBS_DROPDOWNLIST \| CBS_AUTOHSCROLL \| NOT WS_VISIBLE \| WS_BORDER \| WS_VSCROLL
495		- LTEXT "",stc1,9,18,88,8
	547	+ 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
	548	+ DEFPUSHBUTTON "Yes",IDOK,48,42,50,14
	549	+ PUSHBUTTON "No",IDCANCEL,112,42,50,14
496	550	END
497	551
498		-filesize_dlg DIALOG 0, 0, 131, 76
499		-STYLE DS_SETFONT \| DS_MODALFRAME \| WS_POPUP \| WS_CAPTION \| WS_SYSMENU
500		-CAPTION "File Size"
	552	+opt_trmode2_dlg DIALOG 0, 0, 211, 139
	553	+STYLE DS_SETFONT \| WS_CHILD \| WS_DISABLED \| WS_CAPTION
501	554	FONT 9, "MS Sans Serif"
502	555	BEGIN
503		- DEFPUSHBUTTON "OK",IDOK,42,55,50,14
504		- CTEXT "",FSIZE_SIZE,7,18,117,8
505		- CTEXT "",FSIZE_TITLE,7,7,117,8
506		- CTEXT "Including all files in subfolder.",-1,7,30,117,19,SS_CENTERIMAGE \| SS_SUNKEN
	556	+ GROUPBOX "Filename",-1,7,7,196,69
	557	+ CONTROL "Convert to &lowercase",TRMODE2_LOWER,"Button",BS_AUTORADIOBUTTON \| WS_GROUP,13,18,143,10
	558	+ CONTROL "Convert to &uppercase",TRMODE2_UPPER,"Button",BS_AUTORADIOBUTTON,13,30,143,10
	559	+ CONTROL "&No conversion",TRMODE2_NOCNV,"Button",BS_AUTORADIOBUTTON,13,42,143,10
	560	+ LTEXT "&Timeout",-1,7,80,131,8
	561	+ EDITTEXT TRMODE2_TIMEOUT,7,90,26,14,ES_AUTOHSCROLL \| ES_NUMBER
	562	+ CONTROL "Spin1",TRMODE2_TIMEOUT_SPN,"msctls_updown32",UDS_SETBUDDYINT \| UDS_AUTOBUDDY \| UDS_ARROWKEYS \| UDS_NOTHOUSANDS,33,90,9,14
	563	+ LTEXT "(0 to 300sec: 0=No timeout)",-1,45,94,107,8
	564	+ LTEXT "&Default local folder",-1,7,108,196,8
	565	+ EDITTEXT TRMODE2_LOCAL,7,118,182,12,ES_AUTOHSCROLL
	566	+ PUSHBUTTON "...",TRMODE2_LOCAL_BR,190,118,13,13
	567	+ LTEXT "Mirror Upload/Download settings are on the Mirror tab.",-1,18,56,181,17,SS_SUNKEN
507	568	END
508	569
509		-filesize_notify_dlg DIALOG 0, 0, 155, 70
510		-STYLE DS_SETFONT \| DS_MODALFRAME \| WS_POPUP \| WS_CAPTION \| WS_SYSMENU
511		-CAPTION "File Size"
	570	+opt_notify_dlg DIALOGEX 0, 0, 211, 139
	571	+STYLE DS_SETFONT \| WS_CHILD \| WS_DISABLED \| WS_CAPTION
	572	+FONT 9, "MS Sans Serif", 0, 0, 0x0
	573	+BEGIN
	574	+ GROUPBOX "If File Already Exists",-1,7,7,196,67,WS_GROUP
	575	+ GROUPBOX "Download",-1,11,20,188,24,WS_GROUP
	576	+ CONTROL "&Overwrite",NOTIFY_D_OVW,"Button",BS_AUTORADIOBUTTON \| WS_GROUP,19,30,50,10
	577	+ CONTROL "&Confirm",NOTIFY_D_DLG,"Button",BS_AUTORADIOBUTTON,80,30,94,10
	578	+ GROUPBOX "Upload",-1,11,47,188,23,WS_GROUP
	579	+ CONTROL "O&verwrite",NOTIFY_U_OVW,"Button",BS_AUTORADIOBUTTON \| WS_GROUP,19,57,48,10
	580	+ CONTROL "Co&nfirm",NOTIFY_U_DLG,"Button",BS_AUTORADIOBUTTON,80,57,106,10
	581	+ GROUPBOX "On Double-click",-1,7,78,196,23,WS_GROUP
	582	+ CONTROL "O&pen",NOTIFY_OPEN,"Button",BS_AUTORADIOBUTTON \| WS_GROUP,19,88,53,10
	583	+ CONTROL "Down&load",NOTIFY_DOWNLOAD,"Button",BS_AUTORADIOBUTTON,80,88,102,10
	584	+ GROUPBOX "In Server File Move function",-1,7,106,196,26,WS_GROUP
	585	+ CONTROL "No Confirm",NOTIFY_M_NODLG,"Button",BS_AUTORADIOBUTTON \| WS_GROUP,19,118,56,10
	586	+ CONTROL "Confirm",NOTIFY_M_DLG,"Button",BS_AUTORADIOBUTTON,80,118,56,10
	587	+ CONTROL "Disable",NOTIFY_M_DISABLE,"Button",BS_AUTORADIOBUTTON,141,118,56,10
	588	+END
	589	+
	590	+bmark_dlg DIALOG 0, 0, 222, 109
	591	+STYLE DS_SETFONT \| WS_POPUP \| WS_CLIPCHILDREN \| WS_CAPTION \| WS_SYSMENU \| WS_THICKFRAME
	592	+CAPTION "Bookmarks"
	593	+FONT 9, "MS Sans Serif"
	594	+BEGIN
	595	+ LISTBOX BMARK_LIST,7,7,152,75,LBS_NOINTEGRALHEIGHT \| WS_VSCROLL \| WS_TABSTOP
	596	+ DEFPUSHBUTTON "&Close",IDOK,91,90,50,14
	597	+ PUSHBUTTON "Chan&ge",BMARK_JUMP,27,90,50,14
	598	+ PUSHBUTTON "&New...",BMARK_NEW,165,7,50,14
	599	+ PUSHBUTTON "&Modify...",BMARK_SET,165,26,50,14
	600	+ PUSHBUTTON "&Delete...",BMARK_DEL,165,45,50,14
	601	+ PUSHBUTTON "U&p",BMARK_UP,165,65,23,14
	602	+ PUSHBUTTON "Do&wn",BMARK_DOWN,192,65,23,14
	603	+ SCROLLBAR BMARK_SIZEGRIP,212,96,10,13,SBS_BOTTOMALIGN \| SBS_VERT \| SBS_SIZEGRIP
	604	+ PUSHBUTTON "&Help",9,165,90,50,14
	605	+END
	606	+
	607	+opt_fire_dlg DIALOG 0, 0, 211, 139
	608	+STYLE DS_SETFONT \| WS_CHILD \| WS_DISABLED \| WS_CAPTION
	609	+FONT 9, "MS Sans Serif"
	610	+BEGIN
	611	+ LTEXT "Firewall &Type",-1,7,7,90,8
	612	+ COMBOBOX FIRE_TYPE,7,16,197,104,CBS_DROPDOWNLIST \| CBS_NOINTEGRALHEIGHT \| WS_VSCROLL \| WS_TABSTOP
	613	+ LTEXT "Firewall &Hostname",-1,7,32,80,8
	614	+ EDITTEXT FIRE_HOST,7,42,150,12,ES_AUTOHSCROLL
	615	+ LTEXT "&Port",-1,168,32,36,8
	616	+ EDITTEXT FIRE_PORT,169,41,35,12,ES_AUTOHSCROLL \| ES_NUMBER
	617	+ LTEXT "Firewall &Username",-1,7,56,72,8
	618	+ EDITTEXT FIRE_USER,7,65,70,12,ES_AUTOHSCROLL
	619	+ LTEXT "Firewall P&assword",-1,81,56,70,8
	620	+ EDITTEXT FIRE_PASS,81,65,70,12,ES_PASSWORD \| ES_AUTOHSCROLL
	621	+ LTEXT "&Security",-1,7,80,63,8
	622	+ COMBOBOX FIRE_SECURITY,7,89,57,75,CBS_DROPDOWNLIST \| CBS_NOINTEGRALHEIGHT \| WS_VSCROLL \| WS_TABSTOP
	623	+ CONTROL "Use SOCKS se&rver to search for hosts",FIRE_RESOLV,
	624	+ "Button",BS_AUTOCHECKBOX \| WS_GROUP \| WS_TABSTOP,71,83,139,10
	625	+ CONTROL "Use l&owercase OPEN/SITE commands",FIRE_LOWER,"Button",BS_AUTOCHECKBOX \| WS_GROUP \| WS_TABSTOP,71,96,139,10
	626	+ CONTROL "Us&e the firewall for undefined hosts",FIRE_USEIT,
	627	+ "Button",BS_AUTOCHECKBOX \| WS_GROUP \| WS_TABSTOP,7,109,197,10
	628	+ CONTROL "Use PAS&V mode for undefined hosts",FIRE_PASV,"Button",BS_AUTOCHECKBOX \| WS_GROUP \| WS_TABSTOP,7,122,197,10
	629	+ LTEXT "Replace @ by",-1,154,55,50,8
	630	+ EDITTEXT FIRE_DELIMIT,154,65,35,12,ES_AUTOHSCROLL
	631	+END
	632	+
	633	+hset_adv_dlg DIALOG 0, 0, 207, 139
	634	+STYLE DS_SETFONT \| WS_CHILD \| WS_DISABLED \| WS_CAPTION
512	635	FONT 9, "MS Sans Serif"
513	636	BEGIN
514		- DEFPUSHBUTTON "OK",IDOK,23,49,50,14
515		- PUSHBUTTON "Cancel",IDCANCEL,82,49,50,14
516		- CONTROL "&Calcualte only the selected files.",FSNOTIFY_SEL_ONLY,
517		- "Button",BS_AUTOCHECKBOX \| WS_TABSTOP,7,33,141,10
518		- CTEXT "",FSNOTIFY_TITLE,7,7,142,8
519		- CTEXT "( This may take a few minutes. )",FSNOTIFY_TITLE,7,19,141,8
	637	+ CONTROL "Use &Firewall",HSET_FIREWALL,"Button",BS_AUTOCHECKBOX \| WS_GROUP \| WS_TABSTOP,7,7,92,10
	638	+ CONTROL "Use PAS&V mode",HSET_PASV,"Button",BS_AUTOCHECKBOX \| WS_GROUP \| WS_TABSTOP,7,22,92,10
	639	+ CONTROL "S&ync. folder movement",HSET_SYNCMOVE,"Button",BS_AUTOCHECKBOX \| WS_TABSTOP,7,37,93,10
	640	+ LTEXT "&Port",-1,7,56,54,8
	641	+ EDITTEXT HSET_PORT,7,66,22,12,ES_AUTOHSCROLL \| ES_NUMBER
	642	+ PUSHBUTTON "Default",HSET_PORT_NOR,30,66,28,13
	643	+ LTEXT "&Account",-1,7,87,65,8
	644	+ EDITTEXT HSET_ACCOUNT,7,97,62,12,ES_AUTOHSCROLL
	645	+ LTEXT "Host &Timezone",-1,103,7,81,8
	646	+ COMBOBOX HSET_TIMEZONE,103,17,83,102,CBS_DROPDOWNLIST \| WS_VSCROLL \| WS_TABSTOP
	647	+ LTEXT "&Security",-1,103,35,72,8
	648	+ COMBOBOX HSET_SECURITY,103,45,83,75,CBS_DROPDOWNLIST \| CBS_NOINTEGRALHEIGHT \| WS_VSCROLL \| WS_TABSTOP
	649	+ LTEXT "&Commands After Connection",-1,103,65,97,8
	650	+ EDITTEXT HSET_INITCMD,103,76,92,30,ES_MULTILINE \| ES_AUTOVSCROLL \| ES_AUTOHSCROLL \| ES_WANTRETURN
520	651	END
521	652
522		-filter_dlg DIALOG 0, 0, 187, 79
	653	+diskfull_dlg DIALOG 0, 0, 159, 42
523	654	STYLE DS_SETFONT \| DS_MODALFRAME \| WS_POPUP \| WS_CAPTION
524		-CAPTION "Filter"
	655	+CAPTION "FFFTP:Error"
525	656	FONT 9, "MS Sans Serif"
526	657	BEGIN
527		- 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
528		- EDITTEXT FILTER_STR,7,8,147,12,ES_AUTOHSCROLL
529		- DEFPUSHBUTTON "OK",IDOK,7,61,41,14
530		- PUSHBUTTON "All",FILTER_NOR,51,61,41,14
531		- PUSHBUTTON "Cancel",IDCANCEL,95,61,41,14
532		- PUSHBUTTON "Help",9,139,61,41,14
	658	+ DEFPUSHBUTTON "Cencal this File",IDOK,13,24,66,14
	659	+ PUSHBUTTON "Cencel All",IDCANCEL,95,24,50,14
	660	+ CTEXT "Disk is full",-1,7,6,145,10
533	661	END
534	662
535	663	find_dlg DIALOG 0, 0, 187, 56

		@@ -542,122 +670,204 @@ BEGIN
542	670	PUSHBUTTON "Cancel",IDCANCEL,101,38,50,14
543	671	END
544	672
545		-forcerename_dlg DIALOG 0, 0, 187, 67
546		-STYLE DS_SETFONT \| DS_MODALFRAME \| WS_POPUP \| WS_CAPTION
547		-CAPTION "Download"
	673	+mailadrs_dlg DIALOG 0, 0, 187, 89
	674	+STYLE DS_SETFONT \| DS_MODALFRAME \| DS_CENTER \| WS_POPUP \| WS_CAPTION
	675	+CAPTION "FFFTP"
548	676	FONT 9, "MS Sans Serif"
549	677	BEGIN
550		- EDITTEXT INP_INPSTR,7,29,173,12,ES_AUTOHSCROLL
551		- DEFPUSHBUTTON "OK",IDOK,31,49,50,14
552		- PUSHBUTTON "Cancel",IDCANCEL,104,49,50,14
553		- LTEXT "Invalid character specified in filename.\nRename the file.",IDC_STATIC,7,7,173,16
554		- CONTROL "",INP_ANONYMOUS,"Button",BS_AUTOCHECKBOX \| NOT WS_VISIBLE \| WS_DISABLED \| WS_TABSTOP,172,55,8,8
	678	+ EDITTEXT INP_INPSTR,7,7,173,12,ES_AUTOHSCROLL
	679	+ DEFPUSHBUTTON "OK",IDOK,13,71,50,14
	680	+ PUSHBUTTON "Cancel",IDCANCEL,68,71,50,14
	681	+ PUSHBUTTON "Help",9,123,71,50,14
	682	+ CONTROL "",INP_ANONYMOUS,"Button",BS_AUTOCHECKBOX \| NOT WS_VISIBLE \| WS_DISABLED \| WS_TABSTOP,172,61,8,8
	683	+ LTEXT "Enter ypur mail address.\nThis address is used for the anonymous FTP password.",-1,16,25,164,26
	684	+ LTEXT "You can reenter mail address at the Option dialog.",-1,16,54,164,10
555	685	END
556	686
557		-fname_in_dlg DIALOG 0, 0, 86, 44
558		-STYLE DS_SETFONT \| DS_MODALFRAME \| WS_POPUP \| WS_CAPTION \| WS_SYSMENU
	687	+opt_sound_dlg DIALOG 0, 0, 211, 139
	688	+STYLE DS_SETFONT \| WS_CHILD \| WS_DISABLED \| WS_CAPTION
559	689	FONT 9, "MS Sans Serif"
560	690	BEGIN
561		- EDITTEXT INP_INPSTR,7,7,72,12,ES_AUTOHSCROLL
562		- DEFPUSHBUTTON "OK",IDOK,7,26,33,14
563		- PUSHBUTTON "Cancel",IDCANCEL,46,26,33,14
564		- CONTROL "",INP_ANONYMOUS,"Button",BS_AUTOCHECKBOX \| NOT WS_VISIBLE \| WS_DISABLED \| WS_TABSTOP,71,23,8,10
	691	+ CONTROL "Play *.wav file at successful &connection",SOUND_CONNECT,
	692	+ "Button",BS_AUTOCHECKBOX \| WS_TABSTOP,7,9,196,10
	693	+ EDITTEXT SOUND_CONNECT_WAV,31,22,116,12,ES_AUTOHSCROLL
	694	+ PUSHBUTTON "...",SOUND_CONNECT_BR,148,21,13,13
	695	+ PUSHBUTTON "Test",SOUND_CONNECT_TEST,166,21,37,13
	696	+ CONTROL "Play *.wav file when &transfer is complete",SOUND_TRANS,
	697	+ "Button",BS_AUTOCHECKBOX \| WS_TABSTOP,7,42,196,10
	698	+ EDITTEXT SOUND_TRANS_WAV,31,55,116,12,ES_AUTOHSCROLL
	699	+ PUSHBUTTON "...",SOUND_TRANS_BR,148,55,13,13
	700	+ PUSHBUTTON "Test",SOUND_TRANS_TEST,166,55,37,13
	701	+ CONTROL "Play *.wav file at &error",SOUND_ERROR,"Button",BS_AUTOCHECKBOX \| WS_TABSTOP,7,75,196,10
	702	+ EDITTEXT SOUND_ERROR_WAV,31,88,116,12,ES_AUTOHSCROLL
	703	+ PUSHBUTTON "...",SOUND_ERROR_BR,148,88,13,13
	704	+ PUSHBUTTON "Test",SOUND_ERROR_TEST,166,88,37,13
565	705	END
566	706
567		-group_dlg DIALOG 0, 0, 187, 42
568		-STYLE DS_SETFONT \| DS_MODALFRAME \| WS_POPUP \| WS_CAPTION
569		-CAPTION "Group Name"
	707	+downerr_dlg DIALOGEX 0, 0, 159, 65
	708	+STYLE DS_SETFONT \| DS_MODALFRAME \| DS_SETFOREGROUND \| WS_POPUP \| WS_CAPTION
	709	+CAPTION "FFFTP:Error"
	710	+FONT 9, "MS Sans Serif", 0, 0, 0x1
	711	+BEGIN
	712	+ DEFPUSHBUTTON "Cancel this File",IDOK,7,47,82,14
	713	+ PUSHBUTTON "Cancel All",IDCANCEL,102,47,50,14
	714	+ LTEXT "Cannot download following file :",-1,7,4,138,10
	715	+ LTEXT "",UPDOWN_ERR_FNAME,7,16,145,8,SS_NOPREFIX
	716	+ EDITTEXT UPDOWN_ERR_MSG,7,29,145,12,ES_AUTOHSCROLL \| ES_READONLY \| NOT WS_BORDER,WS_EX_STATICEDGE
	717	+END
	718	+
	719	+uperr_dlg DIALOGEX 0, 0, 159, 67
	720	+STYLE DS_SETFONT \| DS_MODALFRAME \| DS_SETFOREGROUND \| WS_POPUP \| WS_CAPTION
	721	+CAPTION "FFFTP:Error"
	722	+FONT 9, "MS Sans Serif", 0, 0, 0x1
	723	+BEGIN
	724	+ DEFPUSHBUTTON "Cancel this File",IDOK,7,49,82,14
	725	+ PUSHBUTTON "Cancel All",IDCANCEL,102,49,50,14
	726	+ LTEXT "Cannot upload following file.",-1,7,4,137,10
	727	+ LTEXT "",UPDOWN_ERR_FNAME,7,17,145,8,SS_NOPREFIX
	728	+ EDITTEXT UPDOWN_ERR_MSG,7,32,153,12,ES_AUTOHSCROLL \| ES_READONLY \| NOT WS_BORDER,WS_EX_STATICEDGE
	729	+END
	730	+
	731	+hset_code_dlg DIALOGEX 0, 0, 207, 139
	732	+STYLE DS_SETFONT \| WS_CHILD \| WS_DISABLED \| WS_CAPTION
	733	+FONT 9, "MS Sans Serif", 0, 0, 0x0
	734	+BEGIN
	735	+ GROUPBOX "&Japanese Kanji Code",-1,7,7,98,94,WS_GROUP
	736	+ CONTROL "No conversion",HSET_NO_CNV,"Button",BS_AUTORADIOBUTTON \| WS_GROUP,12,21,91,10
	737	+ CONTROL "Shift_JIS",HSET_SJIS_CNV,"Button",BS_AUTORADIOBUTTON,12,33,81,10
	738	+ CONTROL "JIS",HSET_JIS_CNV,"Button",BS_AUTORADIOBUTTON,12,45,41,10
	739	+ CONTROL "EUC",HSET_EUC_CNV,"Button",BS_AUTORADIOBUTTON,12,57,41,10
	740	+ CONTROL "UTF-8N",HSET_UTF8N_CNV,"Button",BS_AUTORADIOBUTTON,12,69,41,10
	741	+ CONTROL "Hankaku to Zenkaku",HSET_HANCNV,"Button",BS_AUTOCHECKBOX \| WS_GROUP \| WS_TABSTOP,12,96,90,10
	742	+ GROUPBOX "&Filename Kanji Code",-1,107,7,97,116,WS_GROUP
	743	+ CONTROL "Automatic",HSET_FN_AUTO_CNV,"Button",BS_AUTORADIOBUTTON \| WS_GROUP,114,21,65,10
	744	+ CONTROL "Shift_JIS",HSET_FN_SJIS_CNV,"Button",BS_AUTORADIOBUTTON \| WS_GROUP,111,33,65,10
	745	+ CONTROL "JIS",HSET_FN_JIS_CNV,"Button",BS_AUTORADIOBUTTON,111,45,70,10
	746	+ CONTROL "EUC",HSET_FN_EUC_CNV,"Button",BS_AUTORADIOBUTTON,111,57,41,10
	747	+ CONTROL "Samba-HEX",HSET_FN_SMH_CNV,"Button",BS_AUTORADIOBUTTON,111,69,66,10
	748	+ CONTROL "Samba-CAP",HSET_FN_SMC_CNV,"Button",BS_AUTORADIOBUTTON,111,81,64,10
	749	+ CONTROL "UTF-8N",HSET_FN_UTF8N_CNV,"Button",BS_AUTORADIOBUTTON,111,93,63,10
	750	+ CONTROL "Hankaku to Zenkaku",HSET_FN_HANCNV,"Button",BS_AUTOCHECKBOX \| WS_GROUP \| WS_TABSTOP,111,108,91,10
	751	+END
	752	+
	753	+opt_trmode1_dlg DIALOG 0, 0, 211, 139
	754	+STYLE DS_SETFONT \| WS_CHILD \| WS_DISABLED \| WS_CAPTION
570	755	FONT 9, "MS Sans Serif"
571	756	BEGIN
572		- EDITTEXT INP_INPSTR,7,7,173,12,ES_AUTOHSCROLL
573		- DEFPUSHBUTTON "OK",IDOK,36,24,50,14
574		- PUSHBUTTON "Cancel",IDCANCEL,101,24,50,14
575		- CONTROL "",INP_ANONYMOUS,"Button",BS_AUTOCHECKBOX \| NOT WS_VISIBLE \| WS_DISABLED \| WS_TABSTOP,164,30,16,8
	757	+ GROUPBOX "Transfer mode",-1,7,7,93,56
	758	+ CONTROL "Always &ASCII mode",TRMODE_ASCII,"Button",BS_AUTORADIOBUTTON \| WS_GROUP,13,19,85,10
	759	+ CONTROL "Always &BINARY mode",TRMODE_BIN,"Button",BS_AUTORADIOBUTTON,13,33,84,10
	760	+ CONTROL "&Filename dependent",TRMODE_AUTO,"Button",BS_AUTORADIOBUTTON,13,47,78,10
	761	+ GROUPBOX "ASCII mode Filenames",-1,104,7,99,84,WS_GROUP
	762	+ LISTBOX TRMODE_EXT_LIST,109,19,53,67,LBS_NOINTEGRALHEIGHT \| WS_VSCROLL \| WS_TABSTOP
	763	+ PUSHBUTTON "A&dd...",TRMODE_ADD,167,19,31,14
	764	+ PUSHBUTTON "Delete",TRMODE_DEL,167,38,31,14
	765	+ CONTROL "&Remove EOF for ASCII mode upload",TRMODE_EOF,"Button",BS_AUTOCHECKBOX \| WS_TABSTOP,7,94,196,10
	766	+ CONTROL "Re&tain file date/time on download",TRMODE_TIME,"Button",BS_AUTOCHECKBOX \| WS_TABSTOP,7,108,196,10
	767	+ LTEXT "->",-1,98,49,8,8
	768	+ CONTROL "Truncate filename before &semicolon on download",TRMODE_SEMICOLON,
	769	+ "Button",BS_AUTOCHECKBOX \| WS_TABSTOP,7,122,196,10
576	770	END
577	771
578		-hostconnect_dlg DIALOG 0, 0, 166, 106
579		-STYLE DS_LOCALEDIT \| DS_SETFONT \| WS_POPUP \| WS_CLIPCHILDREN \| WS_CAPTION \| WS_SYSMENU \| WS_THICKFRAME
580		-CAPTION "Host List"
	772	+up_exist_dlg DIALOG 0, 0, 234, 119
	773	+STYLE DS_SETFONT \| DS_MODALFRAME \| DS_SETFOREGROUND \| WS_POPUP \| WS_CAPTION
	774	+CAPTION "Upload"
581	775	FONT 9, "MS Sans Serif"
582	776	BEGIN
583		- CONTROL "Tree1",HOST_LIST,"SysTreeView32",TVS_HASLINES \| TVS_DISABLEDRAGDROP \| TVS_SHOWSELALWAYS \| TVS_FULLROWSELECT \| WS_BORDER \| WS_TABSTOP,7,6,152,75
584		- DEFPUSHBUTTON "&Connect",IDOK,20,88,50,14
585		- PUSHBUTTON "Cl&ose",IDCANCEL,96,88,50,14
586		- SCROLLBAR HOST_SIZEGRIP,156,92,10,13,SBS_BOTTOMALIGN \| SBS_VERT \| SBS_SIZEGRIP
587		- PUSHBUTTON "?????(&N)...",HOST_NEW,153,88,6,14,NOT WS_VISIBLE \| WS_DISABLED
588		- PUSHBUTTON "????????(&G)...",HOST_FOLDER,153,88,6,14,NOT WS_VISIBLE \| WS_DISABLED
589		- PUSHBUTTON "????(&M)...",HOST_SET,153,88,6,14,NOT WS_VISIBLE \| WS_DISABLED
590		- PUSHBUTTON "???(&C)",HOST_COPY,153,88,6,14,NOT WS_VISIBLE \| WS_DISABLED
591		- PUSHBUTTON "??(&D)...",HOST_DEL,153,88,6,14,NOT WS_VISIBLE \| WS_DISABLED
592		- PUSHBUTTON "?",HOST_UP,153,88,6,14,NOT WS_VISIBLE \| WS_DISABLED
593		- PUSHBUTTON "?",HOST_DOWN,153,88,6,14,NOT WS_VISIBLE \| WS_DISABLED
	777	+ CONTROL "&Overwrite existing file",UP_EXIST_OVW,"Button",BS_AUTORADIOBUTTON \| WS_GROUP,8,38,99,10
	778	+ CONTROL "Overwrite if upload file is &newer",UP_EXIST_NEW,"Button",BS_AUTORADIOBUTTON,7,50,118,10
	779	+ CONTROL "&Resume",UP_EXIST_RESUME,"Button",BS_AUTORADIOBUTTON,7,62,99,10
	780	+ CONTROL "Rename &by the host",UP_EXIST_UNIQUE,"Button",BS_AUTORADIOBUTTON,7,74,99,10
	781	+ CONTROL "&Skip",UP_EXIST_IGNORE,"Button",BS_AUTORADIOBUTTON,7,86,99,10
	782	+ LTEXT "To upload with a different name, modify the filename and click Overwrite existing file.",-1,129,39,98,41
	783	+ DEFPUSHBUTTON "OK",IDOK,13,101,50,14,WS_GROUP
	784	+ PUSHBUTTON "&Do All",IDOK_ALL,68,101,50,14
	785	+ PUSHBUTTON "&Cancel All",IDCANCEL,123,101,50,14
	786	+ PUSHBUTTON "&Help",9,178,101,41,14
	787	+ LTEXT "Filename already exists on host. Upload?",-1,7,7,184,8
	788	+ EDITTEXT UP_EXIST_NAME,7,20,220,12,ES_AUTOHSCROLL
594	789	END
595	790
596		-hostdel_dlg DIALOG 0, 0, 134, 39
	791	+reginit_dlg DIALOG 0, 0, 155, 83
597	792	STYLE DS_SETFONT \| DS_MODALFRAME \| WS_POPUP \| WS_CAPTION
598		-CAPTION "Delete Host"
	793	+CAPTION "Erase All Settings"
599	794	FONT 9, "MS Sans Serif"
600	795	BEGIN
601		- DEFPUSHBUTTON "&Yes",IDOK,11,21,50,14
602		- PUSHBUTTON "&No",IDCANCEL,73,21,50,14
603		- LTEXT "Delete this host?",-1,7,6,120,10
	796	+ DEFPUSHBUTTON "No",IDCANCEL,41,45,71,31
	797	+ PUSHBUTTON "Yes",IDOK,125,62,23,14,NOT WS_TABSTOP
	798	+ LTEXT "Erase ALL settings including Host settings.",-1,7,7,141,17
	799	+ CTEXT "Are you sure?",-1,7,29,141,8
604	800	END
605	801
606		-groupdel_dlg DIALOG 0, 0, 135, 47
	802	+updown_as_dlg DIALOG 0, 0, 187, 69
607	803	STYLE DS_SETFONT \| DS_MODALFRAME \| WS_POPUP \| WS_CAPTION
608		-CAPTION "Delete Group"
609	804	FONT 9, "MS Sans Serif"
610	805	BEGIN
611		- DEFPUSHBUTTON "&Yes",IDOK,11,29,50,14
612		- PUSHBUTTON "&No",IDCANCEL,73,29,50,14
613		- LTEXT "Delete this group and all hosts in the group?",-1,7,6,121,18
	806	+ EDITTEXT UPDOWNAS_NEW,7,34,173,12,ES_AUTOHSCROLL
	807	+ DEFPUSHBUTTON "OK",IDOK,35,51,50,14
	808	+ PUSHBUTTON "Cancel",UPDOWNAS_STOP,101,51,50,14
	809	+ LTEXT "",UPDOWNAS_TEXT,7,21,173,8,SS_NOPREFIX
	810	+ LTEXT "Enter new name",-1,7,7,133,8
614	811	END
615	812
616		-mailadrs_dlg DIALOG 0, 0, 187, 89
617		-STYLE DS_SETFONT \| DS_MODALFRAME \| DS_CENTER \| WS_POPUP \| WS_CAPTION
618		-CAPTION "FFFTP"
	813	+re_passwd_dlg DIALOG 0, 0, 187, 62
	814	+STYLE DS_SETFONT \| DS_MODALFRAME \| WS_POPUP \| WS_CAPTION
	815	+CAPTION "Password"
619	816	FONT 9, "MS Sans Serif"
620	817	BEGIN
621		- EDITTEXT INP_INPSTR,7,7,173,12,ES_AUTOHSCROLL
622		- DEFPUSHBUTTON "OK",IDOK,13,71,50,14
623		- PUSHBUTTON "Cancel",IDCANCEL,68,71,50,14
624		- PUSHBUTTON "Help",9,123,71,50,14
625		- CONTROL "",INP_ANONYMOUS,"Button",BS_AUTOCHECKBOX \| NOT WS_VISIBLE \| WS_DISABLED \| WS_TABSTOP,172,61,8,8
626		- LTEXT "Enter ypur mail address.\nThis address is used for the anonymous FTP password.",-1,16,25,164,26
627		- LTEXT "You can reenter mail address at the Option dialog.",-1,16,54,164,10
	818	+ EDITTEXT INP_INPSTR,7,27,173,12,ES_PASSWORD \| ES_AUTOHSCROLL
	819	+ DEFPUSHBUTTON "OK",IDOK,36,44,50,14
	820	+ PUSHBUTTON "Cancel",IDCANCEL,101,44,50,14
	821	+ CONTROL "",INP_ANONYMOUS,"Button",BS_AUTOCHECKBOX \| NOT WS_VISIBLE \| WS_DISABLED \| WS_TABSTOP,164,50,16,8
	822	+ LTEXT "Cannot login.\nEnter correct password.",-1,7,7,173,19
628	823	END
629	824
630		-mirror_down_dlg DIALOG 0, 0, 215, 155
	825	+savepass_dlg DIALOG 0, 0, 146, 50
631	826	STYLE DS_SETFONT \| DS_MODALFRAME \| WS_POPUP \| WS_CAPTION
632		-CAPTION "Mirroring Download"
	827	+CAPTION "Save Password"
633	828	FONT 9, "MS Sans Serif"
634	829	BEGIN
635		- DEFPUSHBUTTON "&Display Transfer Files",MIRRORUP_DISP,9,134,85,14
636		- PUSHBUTTON "Cancel",IDCANCEL,106,134,50,14
637		- PUSHBUTTON "Help",9,168,134,36,14
638		- LTEXT "",-1,7,19,201,78,SS_SUNKEN \| NOT WS_GROUP
639		- LTEXT "The following processes are required:\n\n Copy some files from the host to the local disk.\n\n Delete some files from the local disk.",-1,35,26,166,64
640		- CTEXT "Mirror Download",-1,7,7,201,8
641		- CTEXT "* DOWNLOAD *",-1,7,105,201,8
642		- LTEXT "Confirm?",-1,42,121,166,8
643		- ICON notify,-1,12,34,20,20
	830	+ LTEXT "Save correct password to host setting?",-1,7,7,132,17
	831	+ DEFPUSHBUTTON "Yes",IDOK,17,29,50,14
	832	+ PUSHBUTTON "No",IDCANCEL,78,29,50,14
644	833	END
645	834
646		-mirror_notify_dlg DIALOG 0, 0, 174, 171
647		-STYLE DS_LOCALEDIT \| DS_SETFONT \| WS_POPUP \| WS_CLIPCHILDREN \| WS_CAPTION \| WS_SYSMENU \| WS_THICKFRAME
648		-CAPTION "Mirror Upload"
	835	+sel_local_dlg DIALOG 0, 0, 187, 106
	836	+STYLE DS_SETFONT \| DS_MODALFRAME \| WS_POPUP \| WS_CAPTION \| WS_SYSMENU
	837	+CAPTION "Select File (Local)"
649	838	FONT 9, "MS Sans Serif"
650	839	BEGIN
651		- LTEXT "Copy/Delete following files",-1,7,6,160,8
652		- LISTBOX MIRROR_LIST,7,16,160,78,LBS_NOINTEGRALHEIGHT \| LBS_EXTENDEDSEL \| WS_VSCROLL \| WS_TABSTOP
653		- DEFPUSHBUTTON "Start Now",IDOK,7,153,50,14
654		- PUSHBUTTON "Cancel",IDCANCEL,62,153,50,14
655		- SCROLLBAR MIRROR_SIZEGRIP,164,158,10,13,SBS_BOTTOMALIGN \| SBS_VERT \| SBS_SIZEGRIP
656		- PUSHBUTTON "Help",9,117,153,50,14
657		- PUSHBUTTON "Remove from List",MIRROR_DEL,111,96,56,14,NOT WS_TABSTOP
658		- LTEXT "",MIRROR_COPYNUM,7,115,160,8
659		- LTEXT "",MIRROR_MAKENUM,7,126,160,8
660		- LTEXT "",MIRROR_DELNUM,7,137,160,8
	840	+ LTEXT "&File to select",-1,7,7,109,8
	841	+ EDITTEXT SEL_FNAME,7,17,173,12,ES_AUTOHSCROLL
	842	+ CONTROL "&Regular expression",SEL_REGEXP,"Button",BS_AUTOCHECKBOX \| WS_TABSTOP,7,34,160,10
	843	+ CONTROL "Do not select if the host file is &newer.",SEL_NOOLD,
	844	+ "Button",BS_AUTOCHECKBOX \| WS_TABSTOP,7,47,160,10
	845	+ CONTROL "Do not select if the host file is &older.",SEL_NONEW,
	846	+ "Button",BS_AUTOCHECKBOX \| WS_TABSTOP,7,60,160,10
	847	+ CONTROL "Do not select if the same file &resides in the host.",SEL_NOEXIST,
	848	+ "Button",BS_AUTOCHECKBOX \| WS_TABSTOP,7,73,160,10
	849	+ DEFPUSHBUTTON "OK",IDOK,10,88,50,14
	850	+ PUSHBUTTON "Cancel",IDCANCEL,68,88,50,14
	851	+ PUSHBUTTON "Help",9,126,88,50,14
	852	+END
	853	+
	854	+sel_remote_dlg DIALOG 0, 0, 187, 106
	855	+STYLE DS_SETFONT \| DS_MODALFRAME \| WS_POPUP \| WS_CAPTION \| WS_SYSMENU
	856	+CAPTION "Select File (Host)"
	857	+FONT 9, "MS Sans Serif"
	858	+BEGIN
	859	+ LTEXT "&File to select",-1,7,7,109,8
	860	+ EDITTEXT SEL_FNAME,7,17,173,12,ES_AUTOHSCROLL
	861	+ CONTROL "&Regular expression",SEL_REGEXP,"Button",BS_AUTOCHECKBOX \| WS_TABSTOP,7,34,160,10
	862	+ CONTROL "Do not select if the local file is &newer.",SEL_NOOLD,
	863	+ "Button",BS_AUTOCHECKBOX \| WS_TABSTOP,7,47,160,10
	864	+ CONTROL "Do not select if the local file is &older.",SEL_NONEW,
	865	+ "Button",BS_AUTOCHECKBOX \| WS_TABSTOP,7,60,160,10
	866	+ CONTROL "Do not select if the same file &resides in the local.",SEL_NOEXIST,
	867	+ "Button",BS_AUTOCHECKBOX \| WS_TABSTOP,7,73,160,10
	868	+ DEFPUSHBUTTON "OK",IDOK,10,88,50,14
	869	+ PUSHBUTTON "Cancel",IDCANCEL,68,88,50,14
	870	+ PUSHBUTTON "Help",9,126,88,50,14
661	871	END
662	872
663	873	mirror_up_dlg DIALOG 0, 0, 215, 135

		@@ -676,43 +886,60 @@ BEGIN
676	886	ICON notify,-1,12,46,20,20
677	887	END
678	888
679		-mirrordown_notify_dlg DIALOG 0, 0, 174, 171
680		-STYLE DS_LOCALEDIT \| DS_SETFONT \| WS_POPUP \| WS_CLIPCHILDREN \| WS_CAPTION \| WS_SYSMENU \| WS_THICKFRAME
681		-CAPTION "Mirror Download"
	889	+account_dlg DIALOG 0, 0, 187, 42
	890	+STYLE DS_SETFONT \| DS_MODALFRAME \| WS_POPUP \| WS_CAPTION
	891	+CAPTION "Account"
682	892	FONT 9, "MS Sans Serif"
683	893	BEGIN
684		- LTEXT "Copy/Delete following files",-1,7,6,92,8
685		- LISTBOX MIRROR_LIST,7,16,160,78,LBS_NOINTEGRALHEIGHT \| LBS_EXTENDEDSEL \| WS_VSCROLL \| WS_TABSTOP
686		- DEFPUSHBUTTON "Start Now",IDOK,7,153,50,14
687		- PUSHBUTTON "Cancel",IDCANCEL,62,153,50,14
688		- SCROLLBAR MIRROR_SIZEGRIP,164,158,10,13,SBS_BOTTOMALIGN \| SBS_VERT \| SBS_SIZEGRIP
689		- PUSHBUTTON "Help",9,117,153,50,14
690		- PUSHBUTTON "Remove from List",MIRROR_DEL,111,96,56,14,NOT WS_TABSTOP
691		- LTEXT "",MIRROR_COPYNUM,7,115,160,8
692		- LTEXT "",MIRROR_MAKENUM,7,126,160,8
693		- LTEXT "",MIRROR_DELNUM,7,137,160,8
	894	+ EDITTEXT INP_INPSTR,7,7,173,12,ES_AUTOHSCROLL
	895	+ DEFPUSHBUTTON "OK",IDOK,36,24,50,14
	896	+ PUSHBUTTON "Cancel",IDCANCEL,101,24,50,14
	897	+ CONTROL "",INP_ANONYMOUS,"Button",BS_AUTOCHECKBOX \| NOT WS_VISIBLE \| WS_DISABLED \| WS_TABSTOP,164,30,16,8
694	898	END
695	899
696		-mkdir_dlg DIALOG 0, 0, 187, 58
697		-STYLE DS_SETFONT \| DS_MODALFRAME \| WS_POPUP \| WS_CAPTION \| WS_SYSMENU
	900	+opt_mirror_dlg DIALOG 0, 0, 211, 139
	901	+STYLE DS_SETFONT \| WS_CHILD \| WS_DISABLED \| WS_CAPTION
698	902	FONT 9, "MS Sans Serif"
699	903	BEGIN
700		- EDITTEXT INP_INPSTR,7,21,173,12,ES_AUTOHSCROLL
701		- DEFPUSHBUTTON "OK",IDOK,36,40,50,14
702		- PUSHBUTTON "Cancel",IDCANCEL,102,40,50,14
703		- CONTROL "",INP_ANONYMOUS,"Button",BS_AUTOCHECKBOX \| NOT WS_VISIBLE \| WS_DISABLED \| WS_TABSTOP,167,40,13,10
704		- LTEXT "Enter new folder name:",-1,7,7,160,8
	904	+ GROUPBOX "Files Not Transferred",-1,7,7,95,85,WS_GROUP
	905	+ LISTBOX MIRROR_NOTRN_LIST,12,20,50,69,LBS_NOINTEGRALHEIGHT \| WS_VSCROLL \| WS_TABSTOP
	906	+ PUSHBUTTON "Add...",MIRROR_NOTRN_ADD,66,20,31,14
	907	+ PUSHBUTTON "Delete",MIRROR_NOTRN_DEL,66,37,31,14
	908	+ LTEXT "Folder names are also OK",-1,65,56,33,33,SS_SUNKEN
	909	+ GROUPBOX "Files Not Deleted",-1,108,7,95,86,WS_GROUP
	910	+ LISTBOX MIRROR_NODEL_LIST,113,20,50,69,LBS_NOINTEGRALHEIGHT \| WS_VSCROLL \| WS_TABSTOP
	911	+ PUSHBUTTON "Add...",MIRROR_NODEL_ADD,167,20,31,14
	912	+ PUSHBUTTON "Delete...",MIRROR_NODEL_DEL,167,37,31,14
	913	+ LTEXT "Folder names are also OK",-1,166,56,33,33,SS_SUNKEN
	914	+ CONTROL "&Convert filenames to lowercase",MIRROR_LOW,"Button",BS_AUTOCHECKBOX \| WS_TABSTOP,7,97,174,10
	915	+ CONTROL "Confirm deletions during Mirror &Upload",MIRROR_UPDEL_NOTIFY,
	916	+ "Button",BS_AUTOCHECKBOX \| WS_TABSTOP,7,111,174,10
	917	+ CONTROL "Confirm deletions during Mirror &Download",MIRROR_DOWNDEL_NOTIFY,
	918	+ "Button",BS_AUTOCHECKBOX \| WS_TABSTOP,7,125,174,10
705	919	END
706	920
707		-noresume_dlg DIALOG 0, 0, 191, 47
708		-STYLE DS_SETFONT \| DS_MODALFRAME \| DS_SETFOREGROUND \| WS_POPUP \| WS_CAPTION
709		-CAPTION "FFFTP:Error"
	921	+somecmd_dlg DIALOG 0, 0, 187, 61
	922	+STYLE DS_SETFONT \| DS_MODALFRAME \| WS_POPUP \| WS_CAPTION
	923	+CAPTION "Specify Command"
710	924	FONT 9, "MS Sans Serif"
711	925	BEGIN
712		- DEFPUSHBUTTON "Yes",IDOK,10,29,45,14
713		- PUSHBUTTON "Cancel This File",IDCANCEL,65,29,59,14
714		- PUSHBUTTON "Cancel All",RESUME_CANCEL_ALL,134,29,45,14
715		- LTEXT "This host doesn't support Resume command.\nOverwrite existing file?",-1,7,4,177,17
	926	+ EDITTEXT INP_INPSTR,7,7,173,12,ES_AUTOHSCROLL
	927	+ DEFPUSHBUTTON "OK",IDOK,10,43,50,14
	928	+ PUSHBUTTON "Cancel",IDCANCEL,68,43,50,14
	929	+ PUSHBUTTON "Help",9,126,43,50,14
	930	+ LTEXT "Some commands cannot be specified here. See help for details.",-1,7,24,173,15
	931	+ CONTROL "",INP_ANONYMOUS,"Button",BS_AUTOCHECKBOX \| NOT WS_VISIBLE \| WS_DISABLED \| WS_TABSTOP,171,30,9,8
	932	+END
	933	+
	934	+downname_dlg DIALOG 0, 0, 187, 42
	935	+STYLE DS_SETFONT \| DS_MODALFRAME \| WS_POPUP \| WS_CAPTION
	936	+CAPTION "Download File"
	937	+FONT 9, "MS Sans Serif"
	938	+BEGIN
	939	+ EDITTEXT INP_INPSTR,7,6,173,12,ES_AUTOHSCROLL
	940	+ DEFPUSHBUTTON "OK",IDOK,36,24,50,14
	941	+ PUSHBUTTON "Cancel",IDCANCEL,101,24,50,14
	942	+ CONTROL "",INP_ANONYMOUS,"Button",BS_AUTOCHECKBOX \| NOT WS_VISIBLE \| WS_DISABLED \| WS_TABSTOP,164,30,16,8
716	943	END
717	944
718	945	opt_connect_dlg DIALOG 0, 0, 211, 139

		@@ -740,165 +967,116 @@ BEGIN
740	967	"Button",BS_AUTOCHECKBOX \| WS_TABSTOP,7,122,173,10
741	968	END
742	969
743		-opt_disp_dlg DIALOG 0, 0, 211, 139
744		-STYLE DS_SETFONT \| WS_CHILD \| WS_DISABLED \| WS_CAPTION
	970	+rasnotify_dlg DIALOG 0, 0, 158, 46
	971	+STYLE DS_SETFONT \| DS_MODALFRAME \| WS_POPUP \| WS_CAPTION
	972	+CAPTION "FFFTP"
745	973	FONT 9, "MS Sans Serif"
746	974	BEGIN
747		- PUSHBUTTON "&Change",DISP_FONT_BR,167,7,36,14,WS_GROUP
748		- LTEXT "",-1,7,7,159,14,SS_NOPREFIX \| SS_SUNKEN
749		- LTEXT "Font :",-1,9,11,29,8
750		- LTEXT "",DISP_FONT,40,11,123,8,SS_NOPREFIX
751		- CONTROL "Do not display &hidden files/folders",DISP_HIDE,"Button",BS_AUTOCHECKBOX \| WS_TABSTOP,7,30,172,10
752		- LTEXT "If this box is checked, hidden files/folders are not transferred during Mirror operations.",-1,29,44,167,27,SS_SUNKEN
753		- CONTROL "&Display drives in the file list",DISP_DRIVE,"Button",BS_AUTOCHECKBOX \| WS_TABSTOP,7,76,172,10
	975	+ DEFPUSHBUTTON "Yes",IDOK,23,25,50,14
	976	+ PUSHBUTTON "No",IDCANCEL,86,25,50,14
	977	+ CTEXT "Disconnect dialup?",-1,7,7,144,8
754	978	END
755	979
756		-opt_mirror_dlg DIALOG 0, 0, 211, 139
757		-STYLE DS_SETFONT \| WS_CHILD \| WS_DISABLED \| WS_CAPTION
	980	+filesize_dlg DIALOG 0, 0, 131, 76
	981	+STYLE DS_SETFONT \| DS_MODALFRAME \| WS_POPUP \| WS_CAPTION \| WS_SYSMENU
	982	+CAPTION "File Size"
758	983	FONT 9, "MS Sans Serif"
759	984	BEGIN
760		- GROUPBOX "Files Not Transferred",-1,7,7,95,85,WS_GROUP
761		- LISTBOX MIRROR_NOTRN_LIST,12,20,50,69,LBS_NOINTEGRALHEIGHT \| WS_VSCROLL \| WS_TABSTOP
762		- PUSHBUTTON "Add...",MIRROR_NOTRN_ADD,66,20,31,14
763		- PUSHBUTTON "Delete",MIRROR_NOTRN_DEL,66,37,31,14
764		- LTEXT "Folder names are also OK",-1,65,56,33,33,SS_SUNKEN
765		- GROUPBOX "Files Not Deleted",-1,108,7,95,86,WS_GROUP
766		- LISTBOX MIRROR_NODEL_LIST,113,20,50,69,LBS_NOINTEGRALHEIGHT \| WS_VSCROLL \| WS_TABSTOP
767		- PUSHBUTTON "Add...",MIRROR_NODEL_ADD,167,20,31,14
768		- PUSHBUTTON "Delete...",MIRROR_NODEL_DEL,167,37,31,14
769		- LTEXT "Folder names are also OK",-1,166,56,33,33,SS_SUNKEN
770		- CONTROL "&Convert filenames to lowercase",MIRROR_LOW,"Button",BS_AUTOCHECKBOX \| WS_TABSTOP,7,97,174,10
771		- CONTROL "Confirm deletions during Mirror &Upload",MIRROR_UPDEL_NOTIFY,
772		- "Button",BS_AUTOCHECKBOX \| WS_TABSTOP,7,111,174,10
773		- CONTROL "Confirm deletions during Mirror &Download",MIRROR_DOWNDEL_NOTIFY,
774		- "Button",BS_AUTOCHECKBOX \| WS_TABSTOP,7,125,174,10
775		-END
776		-
777		-opt_notify_dlg DIALOGEX 0, 0, 211, 139
778		-STYLE DS_SETFONT \| WS_CHILD \| WS_DISABLED \| WS_CAPTION
779		-FONT 9, "MS Sans Serif", 0, 0, 0x0
780		-BEGIN
781		- GROUPBOX "If File Already Exists",-1,7,7,196,67,WS_GROUP
782		- GROUPBOX "Download",-1,11,20,188,24,WS_GROUP
783		- CONTROL "&Overwrite",NOTIFY_D_OVW,"Button",BS_AUTORADIOBUTTON \| WS_GROUP,19,30,50,10
784		- CONTROL "&Confirm",NOTIFY_D_DLG,"Button",BS_AUTORADIOBUTTON,80,30,94,10
785		- GROUPBOX "Upload",-1,11,47,188,23,WS_GROUP
786		- CONTROL "O&verwrite",NOTIFY_U_OVW,"Button",BS_AUTORADIOBUTTON \| WS_GROUP,19,57,48,10
787		- CONTROL "Co&nfirm",NOTIFY_U_DLG,"Button",BS_AUTORADIOBUTTON,80,57,106,10
788		- GROUPBOX "On Double-click",-1,7,78,196,23,WS_GROUP
789		- CONTROL "O&pen",NOTIFY_OPEN,"Button",BS_AUTORADIOBUTTON \| WS_GROUP,19,88,53,10
790		- CONTROL "Down&load",NOTIFY_DOWNLOAD,"Button",BS_AUTORADIOBUTTON,80,88,102,10
791		- GROUPBOX "In Server File Move function",-1,7,106,196,26,WS_GROUP
792		- CONTROL "No Confirm",NOTIFY_M_NODLG,"Button",BS_AUTORADIOBUTTON \| WS_GROUP,19,118,56,10
793		- CONTROL "Confirm",NOTIFY_M_DLG,"Button",BS_AUTORADIOBUTTON,80,118,56,10
794		- CONTROL "Disable",NOTIFY_M_DISABLE,"Button",BS_AUTORADIOBUTTON,141,118,56,10
	985	+ DEFPUSHBUTTON "OK",IDOK,42,55,50,14
	986	+ CTEXT "",FSIZE_SIZE,7,18,117,8
	987	+ CTEXT "",FSIZE_TITLE,7,7,117,8
	988	+ CTEXT "Including all files in subfolder.",-1,7,30,117,19,SS_CENTERIMAGE \| SS_SUNKEN
795	989	END
796	990
797		-opt_sound_dlg DIALOG 0, 0, 211, 139
798		-STYLE DS_SETFONT \| WS_CHILD \| WS_DISABLED \| WS_CAPTION
	991	+filesize_notify_dlg DIALOG 0, 0, 155, 70
	992	+STYLE DS_SETFONT \| DS_MODALFRAME \| WS_POPUP \| WS_CAPTION \| WS_SYSMENU
	993	+CAPTION "File Size"
799	994	FONT 9, "MS Sans Serif"
800	995	BEGIN
801		- CONTROL "Play *.wav file at successful &connection",SOUND_CONNECT,
802		- "Button",BS_AUTOCHECKBOX \| WS_TABSTOP,7,9,196,10
803		- EDITTEXT SOUND_CONNECT_WAV,31,22,116,12,ES_AUTOHSCROLL
804		- PUSHBUTTON "...",SOUND_CONNECT_BR,148,21,13,13
805		- PUSHBUTTON "Test",SOUND_CONNECT_TEST,166,21,37,13
806		- CONTROL "Play *.wav file when &transfer is complete",SOUND_TRANS,
807		- "Button",BS_AUTOCHECKBOX \| WS_TABSTOP,7,42,196,10
808		- EDITTEXT SOUND_TRANS_WAV,31,55,116,12,ES_AUTOHSCROLL
809		- PUSHBUTTON "...",SOUND_TRANS_BR,148,55,13,13
810		- PUSHBUTTON "Test",SOUND_TRANS_TEST,166,55,37,13
811		- CONTROL "Play *.wav file at &error",SOUND_ERROR,"Button",BS_AUTOCHECKBOX \| WS_TABSTOP,7,75,196,10
812		- EDITTEXT SOUND_ERROR_WAV,31,88,116,12,ES_AUTOHSCROLL
813		- PUSHBUTTON "...",SOUND_ERROR_BR,148,88,13,13
814		- PUSHBUTTON "Test",SOUND_ERROR_TEST,166,88,37,13
	996	+ DEFPUSHBUTTON "OK",IDOK,23,49,50,14
	997	+ PUSHBUTTON "Cancel",IDCANCEL,82,49,50,14
	998	+ CONTROL "&Calcualte only the selected files.",FSNOTIFY_SEL_ONLY,
	999	+ "Button",BS_AUTOCHECKBOX \| WS_TABSTOP,7,33,141,10
	1000	+ CTEXT "",FSNOTIFY_TITLE,7,7,142,8
	1001	+ CTEXT "( This may take a few minutes. )",FSNOTIFY_TITLE,7,19,141,8
815	1002	END
816	1003
817		-opt_tool_dlg DIALOG 0, 0, 211, 139
	1004	+hset_adv2_dlg DIALOG 0, 0, 207, 139
818	1005	STYLE DS_SETFONT \| WS_CHILD \| WS_DISABLED \| WS_CAPTION
819	1006	FONT 9, "MS Sans Serif"
820	1007	BEGIN
821		- LTEXT "Viewer &1",-1,7,7,39,8
822		- EDITTEXT TOOL_EDITOR1,7,18,183,12,ES_AUTOHSCROLL
823		- PUSHBUTTON "...",TOOL_EDITOR1_BR,191,18,12,13
824		- LTEXT "Viewer &2",-1,7,63,39,8
825		- EDITTEXT TOOL_EDITOR2,7,74,183,12,ES_AUTOHSCROLL
826		- PUSHBUTTON "...",TOOL_EDITOR2_BR,191,74,12,13
827		- LTEXT "Viewer &3",-1,7,93,39,8
828		- EDITTEXT TOOL_EDITOR3,7,104,183,12,ES_AUTOHSCROLL
829		- PUSHBUTTON "...",TOOL_EDITOR3_BR,191,104,12,13
830		- LTEXT "Unassociated files will be opened in Viewer 1.",-1,19,33,184,27,SS_SUNKEN
831		- LTEXT "Use Viewer 2 and 3 by right-clicking with the mouse.",-1,14,124,184,8
	1008	+ CONTROL "Use &LIST command to get file list",HSET_LISTCMD,"Button",BS_AUTOCHECKBOX \| WS_GROUP \| WS_TABSTOP,7,7,131,10
	1009	+ CONTROL "Use &NLST -R for high-speed recursive search",HSET_NLST_R,
	1010	+ "Button",BS_AUTOCHECKBOX \| WS_TABSTOP,7,21,167,10
	1011	+ CONTROL "&Do not use full path to access files",HSET_FULLPATH,
	1012	+ "Button",BS_AUTOCHECKBOX \| WS_TABSTOP,7,35,148,10
	1013	+ LTEXT "&Permissions Change Command",-1,7,51,110,8
	1014	+ EDITTEXT HSET_CHMOD_CMD,7,61,62,12,ES_AUTOHSCROLL
	1015	+ PUSHBUTTON "Default",HSET_CHMOD_NOR,70,61,28,13
	1016	+ LTEXT "&Host Type",-1,7,80,69,8
	1017	+ COMBOBOX HSET_HOSTTYPE,7,90,71,75,CBS_DROPDOWNLIST \| WS_VSCROLL \| WS_TABSTOP
	1018	+ LTEXT "NLST &Filename/Option",-1,7,109,89,8
	1019	+ EDITTEXT HSET_LS_FNAME,7,119,62,12,ES_AUTOHSCROLL
	1020	+ PUSHBUTTON "Delault",HSET_LS_FNAME_NOR,70,119,28,13
832	1021	END
833	1022
834		-opt_trmode1_dlg DIALOG 0, 0, 211, 139
835		-STYLE DS_SETFONT \| WS_CHILD \| WS_DISABLED \| WS_CAPTION
	1023	+cwderr_dlg DIALOG 0, 0, 155, 57
	1024	+STYLE DS_SETFONT \| DS_MODALFRAME \| WS_POPUP \| WS_CAPTION \| WS_SYSMENU
	1025	+CAPTION "Error"
836	1026	FONT 9, "MS Sans Serif"
837	1027	BEGIN
838		- GROUPBOX "Transfer mode",-1,7,7,93,56
839		- CONTROL "Always &ASCII mode",TRMODE_ASCII,"Button",BS_AUTORADIOBUTTON \| WS_GROUP,13,19,85,10
840		- CONTROL "Always &BINARY mode",TRMODE_BIN,"Button",BS_AUTORADIOBUTTON,13,33,84,10
841		- CONTROL "&Filename dependent",TRMODE_AUTO,"Button",BS_AUTORADIOBUTTON,13,47,78,10
842		- GROUPBOX "ASCII mode Filenames",-1,104,7,99,84,WS_GROUP
843		- LISTBOX TRMODE_EXT_LIST,109,19,53,67,LBS_NOINTEGRALHEIGHT \| WS_VSCROLL \| WS_TABSTOP
844		- PUSHBUTTON "A&dd...",TRMODE_ADD,167,19,31,14
845		- PUSHBUTTON "Delete",TRMODE_DEL,167,38,31,14
846		- CONTROL "&Remove EOF for ASCII mode upload",TRMODE_EOF,"Button",BS_AUTOCHECKBOX \| WS_TABSTOP,7,94,196,10
847		- CONTROL "Re&tain file date/time on download",TRMODE_TIME,"Button",BS_AUTOCHECKBOX \| WS_TABSTOP,7,108,196,10
848		- LTEXT "->",-1,98,49,8,8
849		- CONTROL "Truncate filename before &semicolon on download",TRMODE_SEMICOLON,
850		- "Button",BS_AUTOCHECKBOX \| WS_TABSTOP,7,122,196,10
	1028	+ PUSHBUTTON "STOP",IDCANCEL,51,36,50,14
	1029	+ CTEXT "Cannot move to subfolder.",-1,7,7,141,8
	1030	+ CTEXT "Stop processing.",-1,7,20,141,8
851	1031	END
852	1032
853		-forcepasschange_dlg DIALOG 0, 0, 211, 64
854		-STYLE DS_SETFONT \| DS_MODALFRAME \| WS_POPUP \| WS_CAPTION
855		-CAPTION "Force reset of master password"
	1033	+opt_trmode3_dlg DIALOG 0, 0, 211, 139
	1034	+STYLE DS_SETFONT \| WS_CHILD \| WS_DISABLED \| WS_CAPTION
856	1035	FONT 9, "MS Sans Serif"
857	1036	BEGIN
858		- 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
859		- DEFPUSHBUTTON "Yes",IDOK,48,42,50,14
860		- PUSHBUTTON "No",IDCANCEL,112,42,50,14
	1037	+ CONTROL "List1",TRMODE3_LIST,"SysListView32",LVS_REPORT \| LVS_SINGLESEL \| LVS_NOSORTHEADER \| WS_BORDER \| WS_TABSTOP,13,20,78,78
	1038	+ PUSHBUTTON "&Add",TRMODE3_ADD,95,20,31,14
	1039	+ PUSHBUTTON "Delete",TRMODE3_DEL,95,38,31,14
	1040	+ GROUPBOX "Default Upload File Permission",-1,7,7,124,96
	1041	+ CONTROL "Set default upload &folder permission",TRMODE3_FOLDER,
	1042	+ "Button",BS_AUTOCHECKBOX \| WS_TABSTOP,7,109,182,10
	1043	+ EDITTEXT TRMODE3_FOLDER_ATTR,60,123,29,12,ES_AUTOHSCROLL \| ES_NUMBER
	1044	+ LTEXT "Permission",-1,23,123,33,8
861	1045	END
862	1046
863		-opt_trmode2_dlg DIALOG 0, 0, 211, 139
864		-STYLE DS_SETFONT \| WS_CHILD \| WS_DISABLED \| WS_CAPTION
	1047	+def_attr_dlg DIALOG 0, 0, 123, 69
	1048	+STYLE DS_SETFONT \| DS_MODALFRAME \| WS_POPUP \| WS_CAPTION \| WS_SYSMENU
	1049	+CAPTION "Default Permission"
865	1050	FONT 9, "MS Sans Serif"
866	1051	BEGIN
867		- GROUPBOX "Filename",-1,7,7,196,69
868		- CONTROL "Convert to &lowercase",TRMODE2_LOWER,"Button",BS_AUTORADIOBUTTON \| WS_GROUP,13,18,143,10
869		- CONTROL "Convert to &uppercase",TRMODE2_UPPER,"Button",BS_AUTORADIOBUTTON,13,30,143,10
870		- CONTROL "&No conversion",TRMODE2_NOCNV,"Button",BS_AUTORADIOBUTTON,13,42,143,10
871		- LTEXT "&Timeout",-1,7,80,131,8
872		- EDITTEXT TRMODE2_TIMEOUT,7,90,26,14,ES_AUTOHSCROLL \| ES_NUMBER
873		- CONTROL "Spin1",TRMODE2_TIMEOUT_SPN,"msctls_updown32",UDS_SETBUDDYINT \| UDS_AUTOBUDDY \| UDS_ARROWKEYS \| UDS_NOTHOUSANDS,33,90,9,14
874		- LTEXT "(0 to 300sec: 0=No timeout)",-1,45,94,107,8
875		- LTEXT "&Default local folder",-1,7,108,196,8
876		- EDITTEXT TRMODE2_LOCAL,7,118,182,12,ES_AUTOHSCROLL
877		- PUSHBUTTON "...",TRMODE2_LOCAL_BR,190,118,13,13
878		- LTEXT "Mirror Upload/Download settings are on the Mirror tab.",-1,18,56,181,17,SS_SUNKEN
	1052	+ LTEXT "&Filename",-1,7,7,49,8
	1053	+ EDITTEXT DEFATTR_FNAME,7,18,47,12,ES_AUTOHSCROLL
	1054	+ LTEXT "->",-1,58,20,8,8
	1055	+ LTEXT "&Permission",-1,71,7,40,8
	1056	+ EDITTEXT DEFATTR_ATTR,71,18,31,12,ES_AUTOHSCROLL \| ES_NUMBER
	1057	+ PUSHBUTTON "...",DEFATTR_ATTR_BR,102,18,13,12
	1058	+ LTEXT "(example: 644)",-1,53,35,51,8
	1059	+ DEFPUSHBUTTON "OK",IDOK,7,48,50,14
	1060	+ PUSHBUTTON "Cancel",IDCANCEL,66,48,50,14
879	1061	END
880	1062
881		-opt_trmode3_dlg DIALOG 0, 0, 211, 139
882		-STYLE DS_SETFONT \| WS_CHILD \| WS_DISABLED \| WS_CAPTION
	1063	+fname_in_dlg DIALOG 0, 0, 86, 44
	1064	+STYLE DS_SETFONT \| DS_MODALFRAME \| WS_POPUP \| WS_CAPTION \| WS_SYSMENU
883	1065	FONT 9, "MS Sans Serif"
884	1066	BEGIN
885		- CONTROL "List1",TRMODE3_LIST,"SysListView32",LVS_REPORT \| LVS_SINGLESEL \| LVS_NOSORTHEADER \| WS_BORDER \| WS_TABSTOP,13,20,78,78
886		- PUSHBUTTON "&Add",TRMODE3_ADD,95,20,31,14
887		- PUSHBUTTON "Delete",TRMODE3_DEL,95,38,31,14
888		- GROUPBOX "Default Upload File Permission",-1,7,7,124,96
889		- CONTROL "Set default upload &folder permission",TRMODE3_FOLDER,
890		- "Button",BS_AUTOCHECKBOX \| WS_TABSTOP,7,109,182,10
891		- EDITTEXT TRMODE3_FOLDER_ATTR,60,123,29,12,ES_AUTOHSCROLL \| ES_NUMBER
892		- LTEXT "Permission",-1,23,123,33,8
	1067	+ EDITTEXT INP_INPSTR,7,7,72,12,ES_AUTOHSCROLL
	1068	+ DEFPUSHBUTTON "OK",IDOK,7,26,33,14
	1069	+ PUSHBUTTON "Cancel",IDCANCEL,46,26,33,14
	1070	+ CONTROL "",INP_ANONYMOUS,"Button",BS_AUTOCHECKBOX \| NOT WS_VISIBLE \| WS_DISABLED \| WS_TABSTOP,71,23,8,10
893	1071	END
894	1072
895		-opt_user_dlg DIALOG 0, 0, 211, 139
896		-STYLE DS_SETFONT \| WS_CHILD \| WS_DISABLED \| WS_CAPTION
	1073	+otp_notify_dlg DIALOG 0, 0, 141, 60
	1074	+STYLE DS_SETFONT \| DS_MODALFRAME \| WS_POPUP \| WS_CAPTION
	1075	+CAPTION "One-time Password"
897	1076	FONT 9, "MS Sans Serif"
898	1077	BEGIN
899		- LTEXT "&Mail address",-1,7,7,59,8
900		- EDITTEXT USER_ADRS,7,18,196,12,ES_AUTOHSCROLL
901		- LTEXT "This address is used for the anonymous FTP password.",-1,28,36,169,18,SS_SUNKEN
	1078	+ DEFPUSHBUTTON "OK",IDOK,45,39,50,14
	1079	+ LTEXT "Sequence number becomes less than 10. Please change sequence.",-1,7,7,127,24
902	1080	END
903	1081
904	1082	otp_calc_dlg DIALOG 0, 0, 187, 104

		@@ -921,264 +1099,251 @@ BEGIN
921	1099	PUSHBUTTON "Help",9,126,83,50,14
922	1100	END
923	1101
924		-otp_notify_dlg DIALOG 0, 0, 141, 60
925		-STYLE DS_SETFONT \| DS_MODALFRAME \| WS_POPUP \| WS_CAPTION
926		-CAPTION "One-time Password"
	1102	+mirror_notify_dlg DIALOG 0, 0, 174, 171
	1103	+STYLE DS_LOCALEDIT \| DS_SETFONT \| WS_POPUP \| WS_CLIPCHILDREN \| WS_CAPTION \| WS_SYSMENU \| WS_THICKFRAME
	1104	+CAPTION "Mirror Upload"
927	1105	FONT 9, "MS Sans Serif"
928	1106	BEGIN
929		- DEFPUSHBUTTON "OK",IDOK,45,39,50,14
930		- LTEXT "Sequence number becomes less than 10. Please change sequence.",-1,7,7,127,24
	1107	+ LTEXT "Copy/Delete following files",-1,7,6,160,8
	1108	+ LISTBOX MIRROR_LIST,7,16,160,78,LBS_NOINTEGRALHEIGHT \| LBS_EXTENDEDSEL \| WS_VSCROLL \| WS_TABSTOP
	1109	+ DEFPUSHBUTTON "Start Now",IDOK,7,153,50,14
	1110	+ PUSHBUTTON "Cancel",IDCANCEL,62,153,50,14
	1111	+ SCROLLBAR MIRROR_SIZEGRIP,164,158,10,13,SBS_BOTTOMALIGN \| SBS_VERT \| SBS_SIZEGRIP
	1112	+ PUSHBUTTON "Help",9,117,153,50,14
	1113	+ PUSHBUTTON "Remove from List",MIRROR_DEL,111,96,56,14,NOT WS_TABSTOP
	1114	+ LTEXT "",MIRROR_COPYNUM,7,115,160,8
	1115	+ LTEXT "",MIRROR_MAKENUM,7,126,160,8
	1116	+ LTEXT "",MIRROR_DELNUM,7,137,160,8
931	1117	END
932	1118
933		-passwd_dlg DIALOG 0, 0, 187, 43
934		-STYLE DS_SETFONT \| DS_MODALFRAME \| WS_POPUP \| WS_CAPTION
935		-CAPTION "Password/Pass phrase"
	1119	+mirrordown_notify_dlg DIALOG 0, 0, 174, 171
	1120	+STYLE DS_LOCALEDIT \| DS_SETFONT \| WS_POPUP \| WS_CLIPCHILDREN \| WS_CAPTION \| WS_SYSMENU \| WS_THICKFRAME
	1121	+CAPTION "Mirror Download"
936	1122	FONT 9, "MS Sans Serif"
937	1123	BEGIN
938		- EDITTEXT INP_INPSTR,7,7,173,12,ES_PASSWORD \| ES_AUTOHSCROLL
939		- DEFPUSHBUTTON "OK",IDOK,36,25,50,14
940		- PUSHBUTTON "Cancel",IDCANCEL,101,25,50,14
941		- CONTROL "",INP_ANONYMOUS,"Button",BS_AUTOCHECKBOX \| NOT WS_VISIBLE \| WS_DISABLED \| WS_TABSTOP,164,31,16,8
	1124	+ LTEXT "Copy/Delete following files",-1,7,6,92,8
	1125	+ LISTBOX MIRROR_LIST,7,16,160,78,LBS_NOINTEGRALHEIGHT \| LBS_EXTENDEDSEL \| WS_VSCROLL \| WS_TABSTOP
	1126	+ DEFPUSHBUTTON "Start Now",IDOK,7,153,50,14
	1127	+ PUSHBUTTON "Cancel",IDCANCEL,62,153,50,14
	1128	+ SCROLLBAR MIRROR_SIZEGRIP,164,158,10,13,SBS_BOTTOMALIGN \| SBS_VERT \| SBS_SIZEGRIP
	1129	+ PUSHBUTTON "Help",9,117,153,50,14
	1130	+ PUSHBUTTON "Remove from List",MIRROR_DEL,111,96,56,14,NOT WS_TABSTOP
	1131	+ LTEXT "",MIRROR_COPYNUM,7,115,160,8
	1132	+ LTEXT "",MIRROR_MAKENUM,7,126,160,8
	1133	+ LTEXT "",MIRROR_DELNUM,7,137,160,8
942	1134	END
943	1135
944		-newmasterpasswd_dlg DIALOGEX 0, 0, 187, 43
	1136	+mirror_down_dlg DIALOG 0, 0, 215, 155
945	1137	STYLE DS_SETFONT \| DS_MODALFRAME \| WS_POPUP \| WS_CAPTION
946		-CAPTION "Enter new master password"
947		-FONT 9, "MS Sans Serif", 0, 0, 0x0
	1138	+CAPTION "Mirroring Download"
	1139	+FONT 9, "MS Sans Serif"
948	1140	BEGIN
949		- EDITTEXT INP_INPSTR,7,7,173,12,ES_AUTOHSCROLL
950		- DEFPUSHBUTTON "OK",IDOK,25,25,43,14
951		- PUSHBUTTON "Cancel",IDCANCEL,72,25,43,14
952		- CONTROL "",INP_ANONYMOUS,"Button",BS_AUTOCHECKBOX \| NOT WS_VISIBLE \| WS_DISABLED \| WS_TABSTOP,172,31,8,8
953		- PUSHBUTTON "Help",IDHELP,118,25,43,14
	1141	+ DEFPUSHBUTTON "&Display Transfer Files",MIRRORUP_DISP,9,134,85,14
	1142	+ PUSHBUTTON "Cancel",IDCANCEL,106,134,50,14
	1143	+ PUSHBUTTON "Help",9,168,134,36,14
	1144	+ LTEXT "",-1,7,19,201,78,SS_SUNKEN \| NOT WS_GROUP
	1145	+ LTEXT "The following processes are required:\n\n Copy some files from the host to the local disk.\n\n Delete some files from the local disk.",-1,35,26,166,64
	1146	+ CTEXT "Mirror Download",-1,7,7,201,8
	1147	+ CTEXT "* DOWNLOAD *",-1,7,105,201,8
	1148	+ LTEXT "Confirm?",-1,42,121,166,8
	1149	+ ICON notify,-1,12,34,20,20
954	1150	END
955	1151
956		-rasnotify_dlg DIALOG 0, 0, 158, 46
	1152	+chdir_br_dlg DIALOG 0, 0, 187, 43
957	1153	STYLE DS_SETFONT \| DS_MODALFRAME \| WS_POPUP \| WS_CAPTION
958		-CAPTION "FFFTP"
	1154	+CAPTION "Folder"
959	1155	FONT 9, "MS Sans Serif"
960	1156	BEGIN
961		- DEFPUSHBUTTON "Yes",IDOK,23,25,50,14
962		- PUSHBUTTON "No",IDCANCEL,86,25,50,14
963		- CTEXT "Disconnect dialup?",-1,7,7,144,8
	1157	+ EDITTEXT INP_INPSTR,7,8,159,12,ES_AUTOHSCROLL
	1158	+ PUSHBUTTON "...",INP_BROUSE,167,7,13,14
	1159	+ DEFPUSHBUTTON "OK",IDOK,36,25,50,14
	1160	+ PUSHBUTTON "Cancel",IDCANCEL,101,25,50,14
964	1161	END
965	1162
966		-rasreconnect_dlg DIALOG 0, 0, 159, 67
	1163	+filter_dlg DIALOG 0, 0, 187, 79
967	1164	STYLE DS_SETFONT \| DS_MODALFRAME \| WS_POPUP \| WS_CAPTION
968		-CAPTION "FFFTP"
	1165	+CAPTION "Filter"
969	1166	FONT 9, "MS Sans Serif"
970	1167	BEGIN
971		- DEFPUSHBUTTON "Yes",IDOK,16,46,50,14
972		- PUSHBUTTON "Keep Connection",IDCANCEL,76,46,66,14
973		- LTEXT "Disconnect current connection and reconnect dialup?",-1,7,7,145,16
	1168	+ 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
	1169	+ EDITTEXT FILTER_STR,7,8,147,12,ES_AUTOHSCROLL
	1170	+ DEFPUSHBUTTON "OK",IDOK,7,61,41,14
	1171	+ PUSHBUTTON "All",FILTER_NOR,51,61,41,14
	1172	+ PUSHBUTTON "Cancel",IDCANCEL,95,61,41,14
	1173	+ PUSHBUTTON "Help",9,139,61,41,14
974	1174	END
975	1175
976		-re_passwd_dlg DIALOG 0, 0, 187, 62
	1176	+group_dlg DIALOG 0, 0, 187, 42
977	1177	STYLE DS_SETFONT \| DS_MODALFRAME \| WS_POPUP \| WS_CAPTION
978		-CAPTION "Password"
	1178	+CAPTION "Group Name"
979	1179	FONT 9, "MS Sans Serif"
980	1180	BEGIN
981		- EDITTEXT INP_INPSTR,7,27,173,12,ES_PASSWORD \| ES_AUTOHSCROLL
982		- DEFPUSHBUTTON "OK",IDOK,36,44,50,14
983		- PUSHBUTTON "Cancel",IDCANCEL,101,44,50,14
984		- CONTROL "",INP_ANONYMOUS,"Button",BS_AUTOCHECKBOX \| NOT WS_VISIBLE \| WS_DISABLED \| WS_TABSTOP,164,50,16,8
985		- LTEXT "Cannot login.\nEnter correct password.",-1,7,7,173,19
	1181	+ EDITTEXT INP_INPSTR,7,7,173,12,ES_AUTOHSCROLL
	1182	+ DEFPUSHBUTTON "OK",IDOK,36,24,50,14
	1183	+ PUSHBUTTON "Cancel",IDCANCEL,101,24,50,14
	1184	+ CONTROL "",INP_ANONYMOUS,"Button",BS_AUTOCHECKBOX \| NOT WS_VISIBLE \| WS_DISABLED \| WS_TABSTOP,164,30,16,8
986	1185	END
987	1186
988		-reginit_dlg DIALOG 0, 0, 155, 83
	1187	+hostdel_dlg DIALOG 0, 0, 134, 39
989	1188	STYLE DS_SETFONT \| DS_MODALFRAME \| WS_POPUP \| WS_CAPTION
990		-CAPTION "Erase All Settings"
	1189	+CAPTION "Delete Host"
991	1190	FONT 9, "MS Sans Serif"
992	1191	BEGIN
993		- DEFPUSHBUTTON "No",IDCANCEL,41,45,71,31
994		- PUSHBUTTON "Yes",IDOK,125,62,23,14,NOT WS_TABSTOP
995		- LTEXT "Erase ALL settings including Host settings.",-1,7,7,141,17
996		- CTEXT "Are you sure?",-1,7,29,141,8
	1192	+ DEFPUSHBUTTON "&Yes",IDOK,11,21,50,14
	1193	+ PUSHBUTTON "&No",IDCANCEL,73,21,50,14
	1194	+ LTEXT "Delete this host?",-1,7,6,120,10
997	1195	END
998	1196
999		-rename_dlg DIALOG 0, 0, 187, 69
1000		-STYLE DS_SETFONT \| DS_MODALFRAME \| WS_POPUP \| WS_CAPTION \| WS_SYSMENU
	1197	+groupdel_dlg DIALOG 0, 0, 135, 47
	1198	+STYLE DS_SETFONT \| DS_MODALFRAME \| WS_POPUP \| WS_CAPTION
	1199	+CAPTION "Delete Group"
1001	1200	FONT 9, "MS Sans Serif"
1002	1201	BEGIN
1003		- EDITTEXT RENAME_NEW,7,34,173,12,ES_AUTOHSCROLL
1004		- DEFPUSHBUTTON "OK",IDOK,9,51,50,14
1005		- PUSHBUTTON "Cancel",IDCANCEL,68,51,50,14
1006		- PUSHBUTTON "&Stop",RENAME_STOP,128,51,50,14
1007		- LTEXT "",RENAME_TEXT,7,21,173,8,SS_NOPREFIX
1008		- LTEXT "Enter new name",-1,7,7,133,8
	1202	+ DEFPUSHBUTTON "&Yes",IDOK,11,29,50,14
	1203	+ PUSHBUTTON "&No",IDCANCEL,73,29,50,14
	1204	+ LTEXT "Delete this group and all hosts in the group?",-1,7,6,121,18
1009	1205	END
1010	1206
1011		-savepass_dlg DIALOG 0, 0, 146, 50
1012		-STYLE DS_SETFONT \| DS_MODALFRAME \| WS_POPUP \| WS_CAPTION
1013		-CAPTION "Save Password"
	1207	+hostconnect_dlg DIALOG 0, 0, 166, 106
	1208	+STYLE DS_LOCALEDIT \| DS_SETFONT \| WS_POPUP \| WS_CLIPCHILDREN \| WS_CAPTION \| WS_SYSMENU \| WS_THICKFRAME
	1209	+CAPTION "Host List"
1014	1210	FONT 9, "MS Sans Serif"
1015	1211	BEGIN
1016		- LTEXT "Save correct password to host setting?",-1,7,7,132,17
1017		- DEFPUSHBUTTON "Yes",IDOK,17,29,50,14
1018		- PUSHBUTTON "No",IDCANCEL,78,29,50,14
	1212	+ CONTROL "Tree1",HOST_LIST,"SysTreeView32",TVS_HASLINES \| TVS_DISABLEDRAGDROP \| TVS_SHOWSELALWAYS \| TVS_FULLROWSELECT \| WS_BORDER \| WS_TABSTOP,7,6,152,75
	1213	+ DEFPUSHBUTTON "&Connect",IDOK,20,88,50,14
	1214	+ PUSHBUTTON "Cl&ose",IDCANCEL,96,88,50,14
	1215	+ SCROLLBAR HOST_SIZEGRIP,156,92,10,13,SBS_BOTTOMALIGN \| SBS_VERT \| SBS_SIZEGRIP
	1216	+ PUSHBUTTON "&New Host...",HOST_NEW,153,88,6,14,NOT WS_VISIBLE \| WS_DISABLED
	1217	+ PUSHBUTTON "New &Group...",HOST_FOLDER,153,88,6,14,NOT WS_VISIBLE \| WS_DISABLED
	1218	+ PUSHBUTTON "&Modify Settings...",HOST_SET,153,88,6,14,NOT WS_VISIBLE \| WS_DISABLED
	1219	+ PUSHBUTTON "&Copy",HOST_COPY,153,88,6,14,NOT WS_VISIBLE \| WS_DISABLED
	1220	+ PUSHBUTTON "&Delete...",HOST_DEL,153,88,6,14,NOT WS_VISIBLE \| WS_DISABLED
	1221	+ PUSHBUTTON "Up",HOST_UP,153,88,6,14,NOT WS_VISIBLE \| WS_DISABLED
	1222	+ PUSHBUTTON "Down",HOST_DOWN,153,88,6,14,NOT WS_VISIBLE \| WS_DISABLED
1019	1223	END
1020	1224
1021		-sel_local_dlg DIALOG 0, 0, 187, 106
1022		-STYLE DS_SETFONT \| DS_MODALFRAME \| WS_POPUP \| WS_CAPTION \| WS_SYSMENU
1023		-CAPTION "Select File (Local)"
	1225	+noresume_dlg DIALOG 0, 0, 191, 47
	1226	+STYLE DS_SETFONT \| DS_MODALFRAME \| DS_SETFOREGROUND \| WS_POPUP \| WS_CAPTION
	1227	+CAPTION "FFFTP:Error"
1024	1228	FONT 9, "MS Sans Serif"
1025	1229	BEGIN
1026		- LTEXT "&File to select",-1,7,7,109,8
1027		- EDITTEXT SEL_FNAME,7,17,173,12,ES_AUTOHSCROLL
1028		- CONTROL "&Regular expression",SEL_REGEXP,"Button",BS_AUTOCHECKBOX \| WS_TABSTOP,7,34,160,10
1029		- CONTROL "Do not select if the host file is &newer.",SEL_NOOLD,
1030		- "Button",BS_AUTOCHECKBOX \| WS_TABSTOP,7,47,160,10
1031		- CONTROL "Do not select if the host file is &older.",SEL_NONEW,
1032		- "Button",BS_AUTOCHECKBOX \| WS_TABSTOP,7,60,160,10
1033		- CONTROL "Do not select if the same file &resides in the host.",SEL_NOEXIST,
1034		- "Button",BS_AUTOCHECKBOX \| WS_TABSTOP,7,73,160,10
1035		- DEFPUSHBUTTON "OK",IDOK,10,88,50,14
1036		- PUSHBUTTON "Cancel",IDCANCEL,68,88,50,14
1037		- PUSHBUTTON "Help",9,126,88,50,14
	1230	+ DEFPUSHBUTTON "Yes",IDOK,10,29,45,14
	1231	+ PUSHBUTTON "Cancel This File",IDCANCEL,65,29,59,14
	1232	+ PUSHBUTTON "Cancel All",RESUME_CANCEL_ALL,134,29,45,14
	1233	+ LTEXT "This host doesn't support Resume command.\nOverwrite existing file?",-1,7,4,177,17
1038	1234	END
1039	1235
1040		-sel_remote_dlg DIALOG 0, 0, 187, 106
1041		-STYLE DS_SETFONT \| DS_MODALFRAME \| WS_POPUP \| WS_CAPTION \| WS_SYSMENU
1042		-CAPTION "Select File (Host)"
	1236	+forcerename_dlg DIALOG 0, 0, 187, 67
	1237	+STYLE DS_SETFONT \| DS_MODALFRAME \| WS_POPUP \| WS_CAPTION
	1238	+CAPTION "Download"
1043	1239	FONT 9, "MS Sans Serif"
1044	1240	BEGIN
1045		- LTEXT "&File to select",-1,7,7,109,8
1046		- EDITTEXT SEL_FNAME,7,17,173,12,ES_AUTOHSCROLL
1047		- CONTROL "&Regular expression",SEL_REGEXP,"Button",BS_AUTOCHECKBOX \| WS_TABSTOP,7,34,160,10
1048		- CONTROL "Do not select if the local file is &newer.",SEL_NOOLD,
1049		- "Button",BS_AUTOCHECKBOX \| WS_TABSTOP,7,47,160,10
1050		- CONTROL "Do not select if the local file is &older.",SEL_NONEW,
1051		- "Button",BS_AUTOCHECKBOX \| WS_TABSTOP,7,60,160,10
1052		- CONTROL "Do not select if the same file &resides in the local.",SEL_NOEXIST,
1053		- "Button",BS_AUTOCHECKBOX \| WS_TABSTOP,7,73,160,10
1054		- DEFPUSHBUTTON "OK",IDOK,10,88,50,14
1055		- PUSHBUTTON "Cancel",IDCANCEL,68,88,50,14
1056		- PUSHBUTTON "Help",9,126,88,50,14
	1241	+ EDITTEXT INP_INPSTR,7,29,173,12,ES_AUTOHSCROLL
	1242	+ DEFPUSHBUTTON "OK",IDOK,31,49,50,14
	1243	+ PUSHBUTTON "Cancel",IDCANCEL,104,49,50,14
	1244	+ LTEXT "Invalid character specified in filename.\nRename the file.",IDC_STATIC,7,7,173,16
	1245	+ CONTROL "",INP_ANONYMOUS,"Button",BS_AUTOCHECKBOX \| NOT WS_VISIBLE \| WS_DISABLED \| WS_TABSTOP,172,55,8,8
1057	1246	END
1058	1247
1059		-somecmd_dlg DIALOG 0, 0, 187, 61
1060		-STYLE DS_SETFONT \| DS_MODALFRAME \| WS_POPUP \| WS_CAPTION
1061		-CAPTION "Specify Command"
	1248	+hset_dialup_dlg DIALOG 0, 0, 207, 139
	1249	+STYLE DS_SETFONT \| WS_CHILD \| WS_DISABLED \| WS_CAPTION
1062	1250	FONT 9, "MS Sans Serif"
1063	1251	BEGIN
1064		- EDITTEXT INP_INPSTR,7,7,173,12,ES_AUTOHSCROLL
1065		- DEFPUSHBUTTON "OK",IDOK,10,43,50,14
1066		- PUSHBUTTON "Cancel",IDCANCEL,68,43,50,14
1067		- PUSHBUTTON "Help",9,126,43,50,14
1068		- LTEXT "Some commands cannot be specified here. See help for details.",-1,7,24,173,15
1069		- CONTROL "",INP_ANONYMOUS,"Button",BS_AUTOCHECKBOX \| NOT WS_VISIBLE \| WS_DISABLED \| WS_TABSTOP,171,30,9,8
	1252	+ CONTROL "&Use Dialup Connection",HSET_DIALUP,"Button",BS_AUTOCHECKBOX \| WS_TABSTOP,7,7,110,10
	1253	+ LTEXT "&Dialup Setting",-1,19,23,97,8
	1254	+ COMBOBOX HSET_DIALENTRY,19,33,181,101,CBS_DROPDOWNLIST \| CBS_SORT \| CBS_NOINTEGRALHEIGHT \| WS_VSCROLL \| WS_TABSTOP
	1255	+ CONTROL "&Reconnect if another dialup is active",HSET_DIALUSETHIS,
	1256	+ "Button",BS_AUTOCHECKBOX \| WS_TABSTOP,19,53,181,10
	1257	+ CONTROL "&Notify before reconnecting",HSET_DIALNOTIFY,"Button",BS_AUTOCHECKBOX \| WS_TABSTOP,31,67,116,10
1070	1258	END
1071	1259
1072		-sort_dlg DIALOG 0, 0, 187, 197
1073		-STYLE DS_SETFONT \| DS_MODALFRAME \| WS_POPUP \| WS_CAPTION \| WS_SYSMENU
1074		-CAPTION "Sort"
	1260	+rasreconnect_dlg DIALOG 0, 0, 159, 67
	1261	+STYLE DS_SETFONT \| DS_MODALFRAME \| WS_POPUP \| WS_CAPTION
	1262	+CAPTION "FFFTP"
1075	1263	FONT 9, "MS Sans Serif"
1076	1264	BEGIN
1077		- GROUPBOX "Local",-1,7,7,81,150
1078		- GROUPBOX "&File",-1,10,17,74,80,WS_GROUP
1079		- CONTROL "Name order",SORT_LFILE_NAME,"Button",BS_AUTORADIOBUTTON \| WS_GROUP,15,30,66,10
1080		- CONTROL "Extension order",SORT_LFILE_EXT,"Button",BS_AUTORADIOBUTTON,15,42,66,10
1081		- CONTROL "Size order",SORT_LFILE_SIZE,"Button",BS_AUTORADIOBUTTON,15,55,66,10
1082		- CONTROL "Date order",SORT_LFILE_DATE,"Button",BS_AUTORADIOBUTTON,15,68,66,10
1083		- CONTROL "Reverse",SORT_LFILE_REV,"Button",BS_AUTOCHECKBOX \| WS_GROUP \| WS_TABSTOP,15,81,66,10
1084		- GROUPBOX "F&older",-1,10,100,74,52,WS_GROUP
1085		- CONTROL "Name order",SORT_LDIR_NAME,"Button",BS_AUTORADIOBUTTON \| WS_GROUP,15,112,66,10
1086		- CONTROL "Date order",SORT_LDIR_DATE,"Button",BS_AUTORADIOBUTTON,15,124,66,10
1087		- CONTROL "Reverse",SORT_LDIR_REV,"Button",BS_AUTOCHECKBOX \| WS_GROUP \| WS_TABSTOP,15,137,66,10
1088		- GROUPBOX "Host",-1,98,7,82,150
1089		- GROUPBOX "F&ile",-1,102,17,74,80,WS_GROUP
1090		- CONTROL "Name order",SORT_RFILE_NAME,"Button",BS_AUTORADIOBUTTON \| WS_GROUP,107,30,66,10
1091		- CONTROL "Extension order",SORT_RFILE_EXT,"Button",BS_AUTORADIOBUTTON,107,42,66,10
1092		- CONTROL "Size order",SORT_RFILE_SIZE,"Button",BS_AUTORADIOBUTTON,107,55,66,10
1093		- CONTROL "Date order",SORT_RFILE_DATE,"Button",BS_AUTORADIOBUTTON,107,68,66,10
1094		- CONTROL "Reverse",SORT_RFILE_REV,"Button",BS_AUTOCHECKBOX \| WS_GROUP \| WS_TABSTOP,107,81,66,10
1095		- GROUPBOX "Fo&lder",-1,102,100,74,52,WS_GROUP
1096		- CONTROL "Name order",SORT_RDIR_NAME,"Button",BS_AUTORADIOBUTTON \| WS_GROUP,107,112,66,10
1097		- CONTROL "Extention order",SORT_RDIR_DATE,"Button",BS_AUTORADIOBUTTON,107,124,66,10
1098		- CONTROL "Reverse",SORT_RDIR_REV,"Button",BS_AUTOCHECKBOX \| WS_GROUP \| WS_TABSTOP,107,137,66,10
1099		- CONTROL "Save sort setting on each host",SORT_SAVEHOST,"Button",BS_AUTOCHECKBOX \| WS_TABSTOP,7,164,156,10
1100		- DEFPUSHBUTTON "OK",IDOK,11,179,50,14
1101		- PUSHBUTTON "Cancel",IDCANCEL,69,179,50,14
1102		- PUSHBUTTON "Help",9,127,179,50,14
	1265	+ DEFPUSHBUTTON "Yes",IDOK,16,46,50,14
	1266	+ PUSHBUTTON "Keep Connection",IDCANCEL,76,46,66,14
	1267	+ LTEXT "Disconnect current connection and reconnect dialup?",-1,7,7,145,16
1103	1268	END
1104	1269
1105		-transfer_dlg DIALOG 0, 0, 199, 91
1106		-STYLE DS_SETFONT \| DS_MODALFRAME \| WS_MINIMIZEBOX \| WS_CAPTION \| WS_SYSMENU
	1270	+dial_dlg DIALOG 0, 0, 159, 37
	1271	+STYLE DS_SETFONT \| DS_MODALFRAME \| WS_POPUP \| WS_CAPTION
1107	1272	FONT 9, "MS Sans Serif"
1108	1273	BEGIN
1109		- PUSHBUTTON "Cancel this File",IDCANCEL,7,73,62,14
1110		- PUSHBUTTON "Cancel from Next",TRANS_STOP_NEXT,78,73,62,14
1111		- PUSHBUTTON "Cancel All",TRANS_STOP_ALL,150,73,42,14
1112		- LTEXT "Host :",-1,7,5,27,8
1113		- LTEXT "",TRANS_REMOTE,45,5,147,8,SS_NOPREFIX
1114		- LTEXT "Local :",-1,7,18,27,8
1115		- LTEXT "",TRANS_LOCAL,45,18,147,8,SS_NOPREFIX
1116		- LTEXT "Status :",-1,7,44,27,8
1117		- LTEXT "",TRANS_STATUS,45,44,147,8
1118		- CONTROL "Progress1",TRANS_TIME_BAR,"msctls_progress32",0x0,7,58,185,9
1119		- LTEXT "Mode :",-1,7,31,27,8
1120		- LTEXT "",TRANS_MODE,45,31,51,8
1121		- LTEXT "Kanji Code :",-1,98,31,39,8
1122		- LTEXT "",TRANS_KANJI,140,31,52,8
	1274	+ DEFPUSHBUTTON "Cancel",IDCANCEL,54,19,50,14
	1275	+ CTEXT "",DIAL_STATUS,7,6,145,8,SS_NOPREFIX
1123	1276	END
1124	1277
1125		-up_exist_dlg DIALOG 0, 0, 234, 119
1126		-STYLE DS_SETFONT \| DS_MODALFRAME \| DS_SETFOREGROUND \| WS_POPUP \| WS_CAPTION
1127		-CAPTION "Upload"
	1278	+dial_password_dlg DIALOG 0, 0, 171, 85
	1279	+STYLE DS_SETFONT \| DS_MODALFRAME \| WS_POPUP \| WS_CAPTION
1128	1280	FONT 9, "MS Sans Serif"
1129	1281	BEGIN
1130		- CONTROL "&Overwrite existing file",UP_EXIST_OVW,"Button",BS_AUTORADIOBUTTON \| WS_GROUP,8,38,99,10
1131		- CONTROL "Overwrite if upload file is &newer",UP_EXIST_NEW,"Button",BS_AUTORADIOBUTTON,7,50,118,10
1132		- CONTROL "&Resume",UP_EXIST_RESUME,"Button",BS_AUTORADIOBUTTON,7,62,99,10
1133		- CONTROL "Rename &by the host",UP_EXIST_UNIQUE,"Button",BS_AUTORADIOBUTTON,7,74,99,10
1134		- CONTROL "&Skip",UP_EXIST_IGNORE,"Button",BS_AUTORADIOBUTTON,7,86,99,10
1135		- LTEXT "To upload with a different name, modify the filename and click Overwrite existing file.",-1,129,39,98,41
1136		- DEFPUSHBUTTON "OK",IDOK,13,101,50,14,WS_GROUP
1137		- PUSHBUTTON "&Do All",IDOK_ALL,68,101,50,14
1138		- PUSHBUTTON "&Cancel All",IDCANCEL,123,101,50,14
1139		- PUSHBUTTON "&Help",9,178,101,41,14
1140		- LTEXT "Filename already exists on host. Upload?",-1,7,7,184,8
1141		- EDITTEXT UP_EXIST_NAME,7,20,220,12,ES_AUTOHSCROLL
	1282	+ LTEXT "Enter Username and Password for Dialup",-1,7,4,157,9
	1283	+ RTEXT "&Username",-1,14,23,45,8
	1284	+ EDITTEXT RASPASS_USER,62,19,95,14,ES_AUTOHSCROLL
	1285	+ RTEXT "&Password",-1,14,43,45,8
	1286	+ EDITTEXT RASPASS_PASS,62,41,95,14,ES_PASSWORD \| ES_AUTOHSCROLL
	1287	+ DEFPUSHBUTTON "OK",IDOK,24,63,50,14
	1288	+ PUSHBUTTON "Cancel",IDCANCEL,96,63,50,14
1142	1289	END
1143	1290
1144		-updown_as_dlg DIALOG 0, 0, 187, 69
1145		-STYLE DS_SETFONT \| DS_MODALFRAME \| WS_POPUP \| WS_CAPTION
	1291	+opt_disp_dlg DIALOG 0, 0, 211, 139
	1292	+STYLE DS_SETFONT \| WS_CHILD \| WS_DISABLED \| WS_CAPTION
1146	1293	FONT 9, "MS Sans Serif"
1147	1294	BEGIN
1148		- EDITTEXT UPDOWNAS_NEW,7,34,173,12,ES_AUTOHSCROLL
1149		- DEFPUSHBUTTON "OK",IDOK,35,51,50,14
1150		- PUSHBUTTON "Cancel",UPDOWNAS_STOP,101,51,50,14
1151		- LTEXT "",UPDOWNAS_TEXT,7,21,173,8,SS_NOPREFIX
1152		- LTEXT "Enter new name",-1,7,7,133,8
	1295	+ PUSHBUTTON "&Change",DISP_FONT_BR,167,7,36,14,WS_GROUP
	1296	+ LTEXT "",-1,7,7,159,14,SS_NOPREFIX \| SS_SUNKEN
	1297	+ LTEXT "Font :",-1,9,11,29,8
	1298	+ LTEXT "",DISP_FONT,40,11,123,8,SS_NOPREFIX
	1299	+ CONTROL "Do not display &hidden files/folders",DISP_HIDE,"Button",BS_AUTOCHECKBOX \| WS_TABSTOP,7,30,172,10
	1300	+ LTEXT "If this box is checked, hidden files/folders are not transferred during Mirror operations.",-1,29,44,167,27,SS_SUNKEN
	1301	+ CONTROL "&Display drives in the file list",DISP_DRIVE,"Button",BS_AUTOCHECKBOX \| WS_TABSTOP,7,76,172,10
1153	1302	END
1154	1303
1155		-uperr_dlg DIALOGEX 0, 0, 159, 67
	1304	+bmark_edit_dlg DIALOG 0, 0, 187, 83
	1305	+STYLE DS_SETFONT \| DS_MODALFRAME \| WS_POPUP \| WS_CAPTION \| WS_SYSMENU
	1306	+CAPTION "Bookmark"
	1307	+FONT 9, "MS Sans Serif"
	1308	+BEGIN
	1309	+ LTEXT "&Local Folder",-1,7,7,173,8
	1310	+ EDITTEXT BEDIT_LOCAL,7,17,173,12,ES_AUTOHSCROLL
	1311	+ LTEXT "&Host Folder",-1,7,37,173,8
	1312	+ EDITTEXT BEDIT_REMOTE,7,47,173,12,ES_AUTOHSCROLL
	1313	+ DEFPUSHBUTTON "OK",IDOK,36,65,50,14
	1314	+ PUSHBUTTON "Cancel",IDCANCEL,101,65,50,14
	1315	+END
	1316	+
	1317	+down_exist_dlg DIALOG 0, 0, 234, 109
1156	1318	STYLE DS_SETFONT \| DS_MODALFRAME \| DS_SETFOREGROUND \| WS_POPUP \| WS_CAPTION
1157		-CAPTION "FFFTP:Error"
1158		-FONT 9, "MS Sans Serif", 0, 0, 0x1
	1319	+CAPTION "Download"
	1320	+FONT 9, "MS Sans Serif"
1159	1321	BEGIN
1160		- DEFPUSHBUTTON "Cancel this File",IDOK,7,49,82,14
1161		- PUSHBUTTON "Cancel All",IDCANCEL,102,49,50,14
1162		- LTEXT "Cannot upload following file.",-1,7,4,137,10
1163		- LTEXT "",UPDOWN_ERR_FNAME,7,17,145,8,SS_NOPREFIX
1164		- EDITTEXT UPDOWN_ERR_MSG,7,32,153,12,ES_AUTOHSCROLL \| ES_READONLY \| NOT WS_BORDER,WS_EX_STATICEDGE
	1322	+ CONTROL "&Overwrite existing file",DOWN_EXIST_OVW,"Button",BS_AUTORADIOBUTTON \| WS_GROUP,7,39,99,10
	1323	+ CONTROL "Overwrite if download file is &newer",DOWN_EXIST_NEW,
	1324	+ "Button",BS_AUTORADIOBUTTON,7,51,123,10
	1325	+ CONTROL "&Resume",DOWN_EXIST_RESUME,"Button",BS_AUTORADIOBUTTON,7,63,99,10
	1326	+ CONTROL "&Skip",DOWN_EXIST_IGNORE,"Button",BS_AUTORADIOBUTTON,7,75,99,10
	1327	+ LTEXT "To download with a different name, modify the filename and click Overwrite existing file.",-1,133,38,94,39
	1328	+ DEFPUSHBUTTON "OK",IDOK,13,91,50,14,WS_GROUP
	1329	+ PUSHBUTTON "&Do All",IDOK_ALL,68,91,50,14
	1330	+ PUSHBUTTON "&Cancel All",IDCANCEL,123,91,50,14
	1331	+ PUSHBUTTON "&Help",9,178,91,41,14
	1332	+ LTEXT "Filename already exists on local disk. Download?",-1,7,7,184,8
	1333	+ EDITTEXT DOWN_EXIST_NAME,7,20,220,12,ES_AUTOHSCROLL
1165	1334	END
1166	1335
1167		-username_dlg DIALOG 0, 0, 187, 58
	1336	+IDD_OLEDRAG DIALOGEX 0, 0, 30, 13
1168	1337	STYLE DS_SETFONT \| DS_MODALFRAME \| WS_POPUP \| WS_CAPTION \| WS_SYSMENU
1169		-CAPTION "User Name"
1170		-FONT 9, "MS Sans Serif"
	1338	+CAPTION "Transfering"
	1339	+FONT 9, "MS Sans Serif", 0, 0, 0x1
1171	1340	BEGIN
1172		- EDITTEXT INP_INPSTR,7,7,173,12,ES_AUTOHSCROLL
1173		- CONTROL "Anonymous(&A)",INP_ANONYMOUS,"Button",BS_AUTOCHECKBOX \| WS_TABSTOP,14,25,73,10
1174		- DEFPUSHBUTTON "OK",IDOK,36,40,50,14
1175		- PUSHBUTTON "Cancel",IDCANCEL,101,40,50,14
1176	1341	END
1177	1342
1178	1343	move_notify_dlg DIALOGEX 0, 0, 201, 82
1179	1344	STYLE DS_SETFONT \| DS_MODALFRAME \| WS_POPUP \| WS_CAPTION \| WS_SYSMENU
1180	1345	CAPTION "Move Files/Folders"
1181		-FONT 9, "MS Sans Serif", 400, 0, 0x0
	1346	+FONT 9, "MS Sans Serif", 0, 0, 0x1
1182	1347	BEGIN
1183	1348	DEFPUSHBUTTON "Yes",IDOK,44,61,50,14
1184	1349	PUSHBUTTON "No",IDCANCEL,107,61,50,14

		@@ -1191,7 +1356,7 @@ END
1191	1356	masterpasswd_dlg DIALOGEX 65535, 65535, 187, 56
1192	1357	STYLE DS_SETFONT \| DS_MODALFRAME \| DS_CENTER \| WS_POPUP \| WS_CAPTION
1193	1358	CAPTION "FFFTP"
1194		-FONT 9, "lr oSVbN", 0, 0, 0x0
	1359	+FONT 9, "MS Sans Serif", 0, 0, 0x1
1195	1360	BEGIN
1196	1361	LTEXT "Enter master password",-1,7,7,153,8
1197	1362	EDITTEXT INP_INPSTR,7,19,173,12,ES_PASSWORD \| ES_AUTOHSCROLL

		@@ -1203,7 +1368,7 @@ END
1203	1368
1204	1369	hset_crypt_dlg DIALOG 0, 0, 207, 139
1205	1370	STYLE DS_SETFONT \| WS_CHILD \| WS_DISABLED \| WS_CAPTION
1206		-FONT 9, "lr oSVbN"
	1371	+FONT 9, "MS Sans Serif"
1207	1372	BEGIN
1208	1373	CONTROL "Connect with FTPS (Explicit)",HSET_FTPES,"Button",BS_AUTOCHECKBOX \| WS_GROUP \| WS_TABSTOP,7,7,148,10
1209	1374	CONTROL "Connect with FTPS (Inplicit)",HSET_FTPIS,"Button",BS_AUTOCHECKBOX \| WS_TABSTOP,7,21,148,10

		@@ -1219,22 +1384,6 @@ END
1219	1384	#ifdef APSTUDIO_INVOKED
1220	1385	GUIDELINES DESIGNINFO
1221	1386	BEGIN
1222		- down_exist_dlg, DIALOG
1223		- BEGIN
1224		- LEFTMARGIN, 7
1225		- RIGHTMARGIN, 227
1226		- TOPMARGIN, 7
1227		- BOTTOMMARGIN, 105
1228		- END
1229		-
1230		- chmod_dlg, DIALOG
1231		- BEGIN
1232		- LEFTMARGIN, 7
1233		- RIGHTMARGIN, 164
1234		- TOPMARGIN, 7
1235		- BOTTOMMARGIN, 106
1236		- END
1237		-
1238	1387	about_dlg, DIALOG
1239	1388	BEGIN
1240	1389	LEFTMARGIN, 7

		@@ -1243,28 +1392,28 @@ BEGIN
1243	1392	BOTTOMMARGIN, 202
1244	1393	END
1245	1394
1246		- bmark_dlg, DIALOG
	1395	+ transfer_dlg, DIALOG
1247	1396	BEGIN
1248	1397	LEFTMARGIN, 7
1249		- RIGHTMARGIN, 215
1250		- TOPMARGIN, 7
1251		- BOTTOMMARGIN, 104
	1398	+ RIGHTMARGIN, 192
	1399	+ TOPMARGIN, 5
	1400	+ BOTTOMMARGIN, 87
1252	1401	END
1253	1402
1254		- def_attr_dlg, DIALOG
	1403	+ rename_dlg, DIALOG
1255	1404	BEGIN
1256	1405	LEFTMARGIN, 7
1257		- RIGHTMARGIN, 116
	1406	+ RIGHTMARGIN, 180
1258	1407	TOPMARGIN, 7
1259		- BOTTOMMARGIN, 62
	1408	+ BOTTOMMARGIN, 65
1260	1409	END
1261	1410
1262		- opt_fire_dlg, DIALOG
	1411	+ delete_dlg, DIALOG
1263	1412	BEGIN
1264	1413	LEFTMARGIN, 7
1265		- RIGHTMARGIN, 204
	1414	+ RIGHTMARGIN, 202
1266	1415	TOPMARGIN, 7
1267		- BOTTOMMARGIN, 132
	1416	+ BOTTOMMARGIN, 51
1268	1417	END
1269	1418
1270	1419	hostlist_dlg, DIALOG

		@@ -1275,62 +1424,78 @@ BEGIN
1275	1424	BOTTOMMARGIN, 116
1276	1425	END
1277	1426
1278		- hostname_dlg, DIALOG
	1427	+ hset_main_dlg, DIALOG
1279	1428	BEGIN
1280	1429	LEFTMARGIN, 7
1281		- TOPMARGIN, 6
1282		- BOTTOMMARGIN, 89
	1430	+ RIGHTMARGIN, 200
	1431	+ TOPMARGIN, 7
	1432	+ BOTTOMMARGIN, 132
1283	1433	END
1284	1434
1285		- hset_adv2_dlg, DIALOG
	1435	+ opt_user_dlg, DIALOG
1286	1436	BEGIN
1287	1437	LEFTMARGIN, 7
1288		- RIGHTMARGIN, 200
	1438	+ RIGHTMARGIN, 204
1289	1439	TOPMARGIN, 7
1290		- BOTTOMMARGIN, 132
	1440	+ BOTTOMMARGIN, 134
1291	1441	END
1292	1442
1293		- hset_adv_dlg, DIALOG
	1443	+ opt_tool_dlg, DIALOG
1294	1444	BEGIN
1295	1445	LEFTMARGIN, 7
1296		- RIGHTMARGIN, 200
	1446	+ RIGHTMARGIN, 204
1297	1447	TOPMARGIN, 7
1298	1448	BOTTOMMARGIN, 132
1299	1449	END
1300	1450
1301		- hset_code_dlg, DIALOG
	1451	+ chmod_dlg, DIALOG
1302	1452	BEGIN
1303	1453	LEFTMARGIN, 7
1304		- RIGHTMARGIN, 204
	1454	+ RIGHTMARGIN, 164
1305	1455	TOPMARGIN, 7
1306		- BOTTOMMARGIN, 132
	1456	+ BOTTOMMARGIN, 106
1307	1457	END
1308	1458
1309		- hset_dialup_dlg, DIALOG
	1459	+ sort_dlg, DIALOG
1310	1460	BEGIN
1311	1461	LEFTMARGIN, 7
1312		- RIGHTMARGIN, 200
	1462	+ RIGHTMARGIN, 180
1313	1463	TOPMARGIN, 7
1314		- BOTTOMMARGIN, 132
	1464	+ BOTTOMMARGIN, 193
1315	1465	END
1316	1466
1317		- hset_main_dlg, DIALOG
	1467	+ mkdir_dlg, DIALOG
1318	1468	BEGIN
1319	1469	LEFTMARGIN, 7
1320		- RIGHTMARGIN, 200
	1470	+ RIGHTMARGIN, 180
	1471	+ TOPMARGIN, 7
	1472	+ BOTTOMMARGIN, 54
	1473	+ END
	1474	+
	1475	+ opt_misc_dlg, DIALOG
	1476	+ BEGIN
	1477	+ LEFTMARGIN, 7
	1478	+ RIGHTMARGIN, 204
1321	1479	TOPMARGIN, 7
1322	1480	BOTTOMMARGIN, 132
1323	1481	END
1324	1482
1325		- account_dlg, DIALOG
	1483	+ hostname_dlg, DIALOG
	1484	+ BEGIN
	1485	+ LEFTMARGIN, 7
	1486	+ TOPMARGIN, 6
	1487	+ BOTTOMMARGIN, 89
	1488	+ END
	1489	+
	1490	+ passwd_dlg, DIALOG
1326	1491	BEGIN
1327	1492	LEFTMARGIN, 7
1328	1493	RIGHTMARGIN, 180
1329	1494	TOPMARGIN, 7
1330		- BOTTOMMARGIN, 38
	1495	+ BOTTOMMARGIN, 39
1331	1496	END
1332	1497
1333		- chdir_br_dlg, DIALOG
	1498	+ newmasterpasswd_dlg, DIALOG
1334	1499	BEGIN
1335	1500	LEFTMARGIN, 7
1336	1501	RIGHTMARGIN, 180

		@@ -1338,12 +1503,12 @@ BEGIN
1338	1503	BOTTOMMARGIN, 39
1339	1504	END
1340	1505
1341		- bmark_edit_dlg, DIALOG
	1506	+ username_dlg, DIALOG
1342	1507	BEGIN
1343	1508	LEFTMARGIN, 7
1344	1509	RIGHTMARGIN, 180
1345	1510	TOPMARGIN, 7
1346		- BOTTOMMARGIN, 79
	1511	+ BOTTOMMARGIN, 54
1347	1512	END
1348	1513
1349	1514	chdir_dlg, DIALOG

		@@ -1354,212 +1519,220 @@ BEGIN
1354	1519	BOTTOMMARGIN, 39
1355	1520	END
1356	1521
1357		- cwderr_dlg, DIALOG
	1522	+ exit_dlg, DIALOG
1358	1523	BEGIN
1359	1524	LEFTMARGIN, 7
1360		- RIGHTMARGIN, 148
	1525	+ RIGHTMARGIN, 136
1361	1526	TOPMARGIN, 7
1362		- BOTTOMMARGIN, 50
	1527	+ BOTTOMMARGIN, 60
1363	1528	END
1364	1529
1365		- delete_dlg, DIALOG
	1530	+ forcepasschange_dlg, DIALOG
1366	1531	BEGIN
1367	1532	LEFTMARGIN, 7
1368		- RIGHTMARGIN, 202
	1533	+ RIGHTMARGIN, 139
1369	1534	TOPMARGIN, 7
1370		- BOTTOMMARGIN, 51
	1535	+ BOTTOMMARGIN, 43
1371	1536	END
1372	1537
1373		- dial_dlg, DIALOG
	1538	+ opt_trmode2_dlg, DIALOG
1374	1539	BEGIN
1375	1540	LEFTMARGIN, 7
1376		- RIGHTMARGIN, 152
1377		- TOPMARGIN, 4
1378		- BOTTOMMARGIN, 33
	1541	+ RIGHTMARGIN, 204
	1542	+ TOPMARGIN, 7
	1543	+ BOTTOMMARGIN, 135
1379	1544	END
1380	1545
1381		- dial_password_dlg, DIALOG
	1546	+ opt_notify_dlg, DIALOG
1382	1547	BEGIN
1383	1548	LEFTMARGIN, 7
1384		- RIGHTMARGIN, 164
1385		- TOPMARGIN, 4
1386		- BOTTOMMARGIN, 78
	1549	+ RIGHTMARGIN, 204
	1550	+ TOPMARGIN, 7
	1551	+ BOTTOMMARGIN, 132
1387	1552	END
1388	1553
1389		- diskfull_dlg, DIALOG
	1554	+ bmark_dlg, DIALOG
1390	1555	BEGIN
1391	1556	LEFTMARGIN, 7
1392		- RIGHTMARGIN, 152
1393		- TOPMARGIN, 4
1394		- BOTTOMMARGIN, 38
	1557	+ RIGHTMARGIN, 215
	1558	+ TOPMARGIN, 7
	1559	+ BOTTOMMARGIN, 104
	1560	+ END
	1561	+
	1562	+ opt_fire_dlg, DIALOG
	1563	+ BEGIN
	1564	+ LEFTMARGIN, 7
	1565	+ RIGHTMARGIN, 204
	1566	+ TOPMARGIN, 7
	1567	+ BOTTOMMARGIN, 132
	1568	+ END
	1569	+
	1570	+ hset_adv_dlg, DIALOG
	1571	+ BEGIN
	1572	+ LEFTMARGIN, 7
	1573	+ RIGHTMARGIN, 200
	1574	+ TOPMARGIN, 7
	1575	+ BOTTOMMARGIN, 132
1395	1576	END
1396	1577
1397		- downerr_dlg, DIALOG
	1578	+ diskfull_dlg, DIALOG
1398	1579	BEGIN
1399	1580	LEFTMARGIN, 7
1400	1581	RIGHTMARGIN, 152
1401	1582	TOPMARGIN, 4
1402		- BOTTOMMARGIN, 61
	1583	+ BOTTOMMARGIN, 38
1403	1584	END
1404	1585
1405		- opt_misc_dlg, DIALOG
	1586	+ find_dlg, DIALOG
1406	1587	BEGIN
1407	1588	LEFTMARGIN, 7
1408		- RIGHTMARGIN, 204
	1589	+ RIGHTMARGIN, 180
1409	1590	TOPMARGIN, 7
1410		- BOTTOMMARGIN, 132
	1591	+ BOTTOMMARGIN, 52
1411	1592	END
1412	1593
1413		- downname_dlg, DIALOG
	1594	+ mailadrs_dlg, DIALOG
1414	1595	BEGIN
1415	1596	LEFTMARGIN, 7
1416	1597	RIGHTMARGIN, 180
1417		- TOPMARGIN, 6
1418		- BOTTOMMARGIN, 38
	1598	+ TOPMARGIN, 7
	1599	+ BOTTOMMARGIN, 85
1419	1600	END
1420	1601
1421		- exit_dlg, DIALOG
	1602	+ opt_sound_dlg, DIALOG
1422	1603	BEGIN
1423	1604	LEFTMARGIN, 7
1424		- RIGHTMARGIN, 136
	1605	+ RIGHTMARGIN, 204
1425	1606	TOPMARGIN, 7
1426		- BOTTOMMARGIN, 60
	1607	+ BOTTOMMARGIN, 132
1427	1608	END
1428	1609
1429		- filesize_dlg, DIALOG
	1610	+ downerr_dlg, DIALOG
1430	1611	BEGIN
1431	1612	LEFTMARGIN, 7
1432		- RIGHTMARGIN, 124
1433		- TOPMARGIN, 7
1434		- BOTTOMMARGIN, 69
	1613	+ RIGHTMARGIN, 152
	1614	+ TOPMARGIN, 4
	1615	+ BOTTOMMARGIN, 61
1435	1616	END
1436	1617
1437		- filesize_notify_dlg, DIALOG
	1618	+ uperr_dlg, DIALOG
1438	1619	BEGIN
1439	1620	LEFTMARGIN, 7
1440		- RIGHTMARGIN, 148
1441		- TOPMARGIN, 7
	1621	+ RIGHTMARGIN, 152
	1622	+ TOPMARGIN, 4
1442	1623	BOTTOMMARGIN, 63
1443	1624	END
1444	1625
1445		- filter_dlg, DIALOG
	1626	+ hset_code_dlg, DIALOG
1446	1627	BEGIN
1447	1628	LEFTMARGIN, 7
1448		- RIGHTMARGIN, 180
	1629	+ RIGHTMARGIN, 204
1449	1630	TOPMARGIN, 7
1450		- BOTTOMMARGIN, 75
	1631	+ BOTTOMMARGIN, 132
1451	1632	END
1452	1633
1453		- find_dlg, DIALOG
	1634	+ opt_trmode1_dlg, DIALOG
1454	1635	BEGIN
1455	1636	LEFTMARGIN, 7
1456		- RIGHTMARGIN, 180
	1637	+ RIGHTMARGIN, 204
1457	1638	TOPMARGIN, 7
1458		- BOTTOMMARGIN, 52
	1639	+ BOTTOMMARGIN, 135
1459	1640	END
1460	1641
1461		- forcerename_dlg, DIALOG
	1642	+ up_exist_dlg, DIALOG
1462	1643	BEGIN
1463	1644	LEFTMARGIN, 7
1464		- RIGHTMARGIN, 180
	1645	+ RIGHTMARGIN, 227
1465	1646	TOPMARGIN, 7
1466		- BOTTOMMARGIN, 63
	1647	+ BOTTOMMARGIN, 115
1467	1648	END
1468	1649
1469		- fname_in_dlg, DIALOG
	1650	+ reginit_dlg, DIALOG
1470	1651	BEGIN
1471	1652	LEFTMARGIN, 7
1472		- RIGHTMARGIN, 79
	1653	+ RIGHTMARGIN, 148
1473	1654	TOPMARGIN, 7
1474		- BOTTOMMARGIN, 40
	1655	+ BOTTOMMARGIN, 76
1475	1656	END
1476	1657
1477		- group_dlg, DIALOG
	1658	+ updown_as_dlg, DIALOG
1478	1659	BEGIN
1479	1660	LEFTMARGIN, 7
1480	1661	RIGHTMARGIN, 180
1481	1662	TOPMARGIN, 7
1482		- BOTTOMMARGIN, 38
1483		- END
1484		-
1485		- hostconnect_dlg, DIALOG
1486		- BEGIN
1487		- LEFTMARGIN, 7
1488		- RIGHTMARGIN, 159
1489		- TOPMARGIN, 6
1490		- BOTTOMMARGIN, 102
	1663	+ BOTTOMMARGIN, 65
1491	1664	END
1492	1665
1493		- hostdel_dlg, DIALOG
	1666	+ re_passwd_dlg, DIALOG
1494	1667	BEGIN
1495	1668	LEFTMARGIN, 7
1496		- RIGHTMARGIN, 127
1497		- TOPMARGIN, 4
1498		- BOTTOMMARGIN, 35
	1669	+ RIGHTMARGIN, 180
	1670	+ TOPMARGIN, 7
	1671	+ BOTTOMMARGIN, 58
1499	1672	END
1500	1673
1501		- groupdel_dlg, DIALOG
	1674	+ savepass_dlg, DIALOG
1502	1675	BEGIN
1503	1676	LEFTMARGIN, 7
1504		- RIGHTMARGIN, 128
1505		- TOPMARGIN, 4
	1677	+ RIGHTMARGIN, 139
	1678	+ TOPMARGIN, 7
1506	1679	BOTTOMMARGIN, 43
1507	1680	END
1508	1681
1509		- mailadrs_dlg, DIALOG
	1682	+ sel_local_dlg, DIALOG
1510	1683	BEGIN
1511	1684	LEFTMARGIN, 7
1512	1685	RIGHTMARGIN, 180
1513	1686	TOPMARGIN, 7
1514		- BOTTOMMARGIN, 85
	1687	+ BOTTOMMARGIN, 102
1515	1688	END
1516	1689
1517		- mirror_down_dlg, DIALOG
	1690	+ sel_remote_dlg, DIALOG
1518	1691	BEGIN
1519	1692	LEFTMARGIN, 7
1520		- RIGHTMARGIN, 208
	1693	+ RIGHTMARGIN, 180
1521	1694	TOPMARGIN, 7
1522		- BOTTOMMARGIN, 148
	1695	+ BOTTOMMARGIN, 102
1523	1696	END
1524	1697
1525		- mirror_notify_dlg, DIALOG
	1698	+ mirror_up_dlg, DIALOG
1526	1699	BEGIN
1527	1700	LEFTMARGIN, 7
1528		- RIGHTMARGIN, 167
1529		- TOPMARGIN, 6
1530		- BOTTOMMARGIN, 167
	1701	+ RIGHTMARGIN, 208
	1702	+ TOPMARGIN, 7
	1703	+ BOTTOMMARGIN, 128
1531	1704	END
1532	1705
1533		- mirror_up_dlg, DIALOG
	1706	+ account_dlg, DIALOG
1534	1707	BEGIN
1535	1708	LEFTMARGIN, 7
1536		- RIGHTMARGIN, 208
	1709	+ RIGHTMARGIN, 180
1537	1710	TOPMARGIN, 7
1538		- BOTTOMMARGIN, 128
	1711	+ BOTTOMMARGIN, 38
1539	1712	END
1540	1713
1541		- mirrordown_notify_dlg, DIALOG
	1714	+ opt_mirror_dlg, DIALOG
1542	1715	BEGIN
1543	1716	LEFTMARGIN, 7
1544		- RIGHTMARGIN, 167
1545		- TOPMARGIN, 6
1546		- BOTTOMMARGIN, 167
	1717	+ RIGHTMARGIN, 204
	1718	+ TOPMARGIN, 7
	1719	+ BOTTOMMARGIN, 135
1547	1720	END
1548	1721
1549		- mkdir_dlg, DIALOG
	1722	+ somecmd_dlg, DIALOG
1550	1723	BEGIN
1551	1724	LEFTMARGIN, 7
1552	1725	RIGHTMARGIN, 180
1553	1726	TOPMARGIN, 7
1554		- BOTTOMMARGIN, 54
	1727	+ BOTTOMMARGIN, 57
1555	1728	END
1556	1729
1557		- noresume_dlg, DIALOG
	1730	+ downname_dlg, DIALOG
1558	1731	BEGIN
1559	1732	LEFTMARGIN, 7
1560		- RIGHTMARGIN, 184
1561		- TOPMARGIN, 4
1562		- BOTTOMMARGIN, 43
	1733	+ RIGHTMARGIN, 180
	1734	+ TOPMARGIN, 6
	1735	+ BOTTOMMARGIN, 38
1563	1736	END
1564	1737
1565	1738	opt_connect_dlg, DIALOG

		@@ -1570,47 +1743,47 @@ BEGIN
1570	1743	BOTTOMMARGIN, 132
1571	1744	END
1572	1745
1573		- opt_disp_dlg, DIALOG
	1746	+ rasnotify_dlg, DIALOG
1574	1747	BEGIN
1575	1748	LEFTMARGIN, 7
1576		- RIGHTMARGIN, 204
	1749	+ RIGHTMARGIN, 151
1577	1750	TOPMARGIN, 7
1578		- BOTTOMMARGIN, 132
	1751	+ BOTTOMMARGIN, 39
1579	1752	END
1580	1753
1581		- opt_mirror_dlg, DIALOG
	1754	+ filesize_dlg, DIALOG
1582	1755	BEGIN
1583	1756	LEFTMARGIN, 7
1584		- RIGHTMARGIN, 204
	1757	+ RIGHTMARGIN, 124
1585	1758	TOPMARGIN, 7
1586		- BOTTOMMARGIN, 135
	1759	+ BOTTOMMARGIN, 69
1587	1760	END
1588	1761
1589		- opt_notify_dlg, DIALOG
	1762	+ filesize_notify_dlg, DIALOG
1590	1763	BEGIN
1591	1764	LEFTMARGIN, 7
1592		- RIGHTMARGIN, 204
	1765	+ RIGHTMARGIN, 148
1593	1766	TOPMARGIN, 7
1594		- BOTTOMMARGIN, 132
	1767	+ BOTTOMMARGIN, 63
1595	1768	END
1596	1769
1597		- opt_sound_dlg, DIALOG
	1770	+ hset_adv2_dlg, DIALOG
1598	1771	BEGIN
1599	1772	LEFTMARGIN, 7
1600		- RIGHTMARGIN, 204
	1773	+ RIGHTMARGIN, 200
1601	1774	TOPMARGIN, 7
1602	1775	BOTTOMMARGIN, 132
1603	1776	END
1604	1777
1605		- opt_tool_dlg, DIALOG
	1778	+ cwderr_dlg, DIALOG
1606	1779	BEGIN
1607	1780	LEFTMARGIN, 7
1608		- RIGHTMARGIN, 204
	1781	+ RIGHTMARGIN, 148
1609	1782	TOPMARGIN, 7
1610		- BOTTOMMARGIN, 132
	1783	+ BOTTOMMARGIN, 50
1611	1784	END
1612	1785
1613		- opt_trmode1_dlg, DIALOG
	1786	+ opt_trmode3_dlg, DIALOG
1614	1787	BEGIN
1615	1788	LEFTMARGIN, 7
1616	1789	RIGHTMARGIN, 204

		@@ -1618,63 +1791,63 @@ BEGIN
1618	1791	BOTTOMMARGIN, 135
1619	1792	END
1620	1793
1621		- forcepasschange_dlg, DIALOG
	1794	+ def_attr_dlg, DIALOG
1622	1795	BEGIN
1623	1796	LEFTMARGIN, 7
1624		- RIGHTMARGIN, 139
	1797	+ RIGHTMARGIN, 116
1625	1798	TOPMARGIN, 7
1626		- BOTTOMMARGIN, 43
	1799	+ BOTTOMMARGIN, 62
1627	1800	END
1628	1801
1629		- opt_trmode2_dlg, DIALOG
	1802	+ fname_in_dlg, DIALOG
1630	1803	BEGIN
1631	1804	LEFTMARGIN, 7
1632		- RIGHTMARGIN, 204
	1805	+ RIGHTMARGIN, 79
1633	1806	TOPMARGIN, 7
1634		- BOTTOMMARGIN, 135
	1807	+ BOTTOMMARGIN, 40
1635	1808	END
1636	1809
1637		- opt_trmode3_dlg, DIALOG
	1810	+ otp_notify_dlg, DIALOG
1638	1811	BEGIN
1639	1812	LEFTMARGIN, 7
1640		- RIGHTMARGIN, 204
	1813	+ RIGHTMARGIN, 134
1641	1814	TOPMARGIN, 7
1642		- BOTTOMMARGIN, 135
	1815	+ BOTTOMMARGIN, 53
1643	1816	END
1644	1817
1645		- opt_user_dlg, DIALOG
	1818	+ otp_calc_dlg, DIALOG
1646	1819	BEGIN
1647	1820	LEFTMARGIN, 7
1648		- RIGHTMARGIN, 204
	1821	+ RIGHTMARGIN, 180
1649	1822	TOPMARGIN, 7
1650		- BOTTOMMARGIN, 134
	1823	+ BOTTOMMARGIN, 97
1651	1824	END
1652	1825
1653		- otp_calc_dlg, DIALOG
	1826	+ mirror_notify_dlg, DIALOG
1654	1827	BEGIN
1655	1828	LEFTMARGIN, 7
1656		- RIGHTMARGIN, 180
1657		- TOPMARGIN, 7
1658		- BOTTOMMARGIN, 97
	1829	+ RIGHTMARGIN, 167
	1830	+ TOPMARGIN, 6
	1831	+ BOTTOMMARGIN, 167
1659	1832	END
1660	1833
1661		- otp_notify_dlg, DIALOG
	1834	+ mirrordown_notify_dlg, DIALOG
1662	1835	BEGIN
1663	1836	LEFTMARGIN, 7
1664		- RIGHTMARGIN, 134
1665		- TOPMARGIN, 7
1666		- BOTTOMMARGIN, 53
	1837	+ RIGHTMARGIN, 167
	1838	+ TOPMARGIN, 6
	1839	+ BOTTOMMARGIN, 167
1667	1840	END
1668	1841
1669		- passwd_dlg, DIALOG
	1842	+ mirror_down_dlg, DIALOG
1670	1843	BEGIN
1671	1844	LEFTMARGIN, 7
1672		- RIGHTMARGIN, 180
	1845	+ RIGHTMARGIN, 208
1673	1846	TOPMARGIN, 7
1674		- BOTTOMMARGIN, 39
	1847	+ BOTTOMMARGIN, 148
1675	1848	END
1676	1849
1677		- newmasterpasswd_dlg, DIALOG
	1850	+ chdir_br_dlg, DIALOG
1678	1851	BEGIN
1679	1852	LEFTMARGIN, 7
1680	1853	RIGHTMARGIN, 180

		@@ -1682,124 +1855,124 @@ BEGIN
1682	1855	BOTTOMMARGIN, 39
1683	1856	END
1684	1857
1685		- rasnotify_dlg, DIALOG
	1858	+ filter_dlg, DIALOG
1686	1859	BEGIN
1687	1860	LEFTMARGIN, 7
1688		- RIGHTMARGIN, 151
	1861	+ RIGHTMARGIN, 180
1689	1862	TOPMARGIN, 7
1690		- BOTTOMMARGIN, 39
	1863	+ BOTTOMMARGIN, 75
1691	1864	END
1692	1865
1693		- rasreconnect_dlg, DIALOG
	1866	+ group_dlg, DIALOG
1694	1867	BEGIN
1695	1868	LEFTMARGIN, 7
1696		- RIGHTMARGIN, 152
	1869	+ RIGHTMARGIN, 180
1697	1870	TOPMARGIN, 7
1698		- BOTTOMMARGIN, 60
	1871	+ BOTTOMMARGIN, 38
1699	1872	END
1700	1873
1701		- re_passwd_dlg, DIALOG
	1874	+ hostdel_dlg, DIALOG
1702	1875	BEGIN
1703	1876	LEFTMARGIN, 7
1704		- RIGHTMARGIN, 180
1705		- TOPMARGIN, 7
1706		- BOTTOMMARGIN, 58
	1877	+ RIGHTMARGIN, 127
	1878	+ TOPMARGIN, 4
	1879	+ BOTTOMMARGIN, 35
1707	1880	END
1708	1881
1709		- reginit_dlg, DIALOG
	1882	+ groupdel_dlg, DIALOG
1710	1883	BEGIN
1711	1884	LEFTMARGIN, 7
1712		- RIGHTMARGIN, 148
1713		- TOPMARGIN, 7
1714		- BOTTOMMARGIN, 76
	1885	+ RIGHTMARGIN, 128
	1886	+ TOPMARGIN, 4
	1887	+ BOTTOMMARGIN, 43
1715	1888	END
1716	1889
1717		- rename_dlg, DIALOG
	1890	+ hostconnect_dlg, DIALOG
1718	1891	BEGIN
1719	1892	LEFTMARGIN, 7
1720		- RIGHTMARGIN, 180
1721		- TOPMARGIN, 7
1722		- BOTTOMMARGIN, 65
	1893	+ RIGHTMARGIN, 159
	1894	+ TOPMARGIN, 6
	1895	+ BOTTOMMARGIN, 102
1723	1896	END
1724	1897
1725		- savepass_dlg, DIALOG
	1898	+ noresume_dlg, DIALOG
1726	1899	BEGIN
1727	1900	LEFTMARGIN, 7
1728		- RIGHTMARGIN, 139
1729		- TOPMARGIN, 7
	1901	+ RIGHTMARGIN, 184
	1902	+ TOPMARGIN, 4
1730	1903	BOTTOMMARGIN, 43
1731	1904	END
1732	1905
1733		- sel_local_dlg, DIALOG
	1906	+ forcerename_dlg, DIALOG
1734	1907	BEGIN
1735	1908	LEFTMARGIN, 7
1736	1909	RIGHTMARGIN, 180
1737	1910	TOPMARGIN, 7
1738		- BOTTOMMARGIN, 102
	1911	+ BOTTOMMARGIN, 63
1739	1912	END
1740	1913
1741		- sel_remote_dlg, DIALOG
	1914	+ hset_dialup_dlg, DIALOG
1742	1915	BEGIN
1743	1916	LEFTMARGIN, 7
1744		- RIGHTMARGIN, 180
	1917	+ RIGHTMARGIN, 200
1745	1918	TOPMARGIN, 7
1746		- BOTTOMMARGIN, 102
	1919	+ BOTTOMMARGIN, 132
1747	1920	END
1748	1921
1749		- somecmd_dlg, DIALOG
	1922	+ rasreconnect_dlg, DIALOG
1750	1923	BEGIN
1751	1924	LEFTMARGIN, 7
1752		- RIGHTMARGIN, 180
	1925	+ RIGHTMARGIN, 152
1753	1926	TOPMARGIN, 7
1754		- BOTTOMMARGIN, 57
	1927	+ BOTTOMMARGIN, 60
1755	1928	END
1756	1929
1757		- sort_dlg, DIALOG
	1930	+ dial_dlg, DIALOG
1758	1931	BEGIN
1759	1932	LEFTMARGIN, 7
1760		- RIGHTMARGIN, 180
1761		- TOPMARGIN, 7
1762		- BOTTOMMARGIN, 193
	1933	+ RIGHTMARGIN, 152
	1934	+ TOPMARGIN, 4
	1935	+ BOTTOMMARGIN, 33
1763	1936	END
1764	1937
1765		- transfer_dlg, DIALOG
	1938	+ dial_password_dlg, DIALOG
1766	1939	BEGIN
1767	1940	LEFTMARGIN, 7
1768		- RIGHTMARGIN, 192
1769		- TOPMARGIN, 5
1770		- BOTTOMMARGIN, 87
	1941	+ RIGHTMARGIN, 164
	1942	+ TOPMARGIN, 4
	1943	+ BOTTOMMARGIN, 78
1771	1944	END
1772	1945
1773		- up_exist_dlg, DIALOG
	1946	+ opt_disp_dlg, DIALOG
1774	1947	BEGIN
1775	1948	LEFTMARGIN, 7
1776		- RIGHTMARGIN, 227
	1949	+ RIGHTMARGIN, 204
1777	1950	TOPMARGIN, 7
1778		- BOTTOMMARGIN, 115
	1951	+ BOTTOMMARGIN, 132
1779	1952	END
1780	1953
1781		- updown_as_dlg, DIALOG
	1954	+ bmark_edit_dlg, DIALOG
1782	1955	BEGIN
1783	1956	LEFTMARGIN, 7
1784	1957	RIGHTMARGIN, 180
1785	1958	TOPMARGIN, 7
1786		- BOTTOMMARGIN, 65
	1959	+ BOTTOMMARGIN, 79
1787	1960	END
1788	1961
1789		- uperr_dlg, DIALOG
	1962	+ down_exist_dlg, DIALOG
1790	1963	BEGIN
1791	1964	LEFTMARGIN, 7
1792		- RIGHTMARGIN, 152
1793		- TOPMARGIN, 4
1794		- BOTTOMMARGIN, 63
	1965	+ RIGHTMARGIN, 227
	1966	+ TOPMARGIN, 7
	1967	+ BOTTOMMARGIN, 105
1795	1968	END
1796	1969
1797		- username_dlg, DIALOG
	1970	+ IDD_OLEDRAG, DIALOG
1798	1971	BEGIN
1799	1972	LEFTMARGIN, 7
1800		- RIGHTMARGIN, 180
	1973	+ RIGHTMARGIN, 23
1801	1974	TOPMARGIN, 7
1802		- BOTTOMMARGIN, 54
	1975	+ BOTTOMMARGIN, 6
1803	1976	END
1804	1977
1805	1978	move_notify_dlg, DIALOG

		@@ -1814,210 +1987,16 @@ BEGIN
1814	1987	BEGIN
1815	1988	BOTTOMMARGIN, 50
1816	1989	END
1817		-END
1818		-#endif // APSTUDIO_INVOKED
1819		-
1820		-
1821		-#ifdef APSTUDIO_INVOKED
1822		-/////////////////////////////////////////////////////////////////////////////
1823		-//
1824		-// TEXTINCLUDE
1825		-//
1826		-
1827		-1 TEXTINCLUDE
1828		-BEGIN
1829		- "resource.h\0"
1830		-END
1831		-
1832		-2 TEXTINCLUDE
1833		-BEGIN
1834		- "#include ""afxres.h""\r\n"
1835		- "\0"
1836		-END
1837		-
1838		-3 TEXTINCLUDE
1839		-BEGIN
1840		- "\r\n"
1841		- "\0"
1842		-END
1843		-
1844		-#endif // APSTUDIO_INVOKED
1845		-
1846		-
1847		-/////////////////////////////////////////////////////////////////////////////
1848		-//
1849		-// RT_MANIFEST
1850		-//
1851		-
1852		-1 RT_MANIFEST "ffftp.exe.manifest"
1853		-
1854		-/////////////////////////////////////////////////////////////////////////////
1855		-//
1856		-// Icon
1857		-//
1858		-
1859		-// Icon with lowest ID value placed first to ensure application icon
1860		-// remains consistent on all systems.
1861		-ffftp ICON "icon1.ico"
1862		-notify ICON "icon2.ico"
1863		-
1864		-/////////////////////////////////////////////////////////////////////////////
1865		-//
1866		-// Bitmap
1867		-//
1868		-
1869		-main_toolbar_bmp BITMAP "toolbar1.bmp"
1870		-remote_toolbar_bmp BITMAP "main_too.bmp"
1871		-dirattr_bmp BITMAP "list_bmp.bmp"
1872		-hlist_bmp BITMAP "bitmap1.bmp"
1873		-
1874		-/////////////////////////////////////////////////////////////////////////////
1875		-//
1876		-// Menu
1877		-//
1878		-
1879		-main_menu MENU
1880		-BEGIN
1881		- POPUP "&File"
1882		- BEGIN
1883		- MENUITEM "&Connect...\tCtrl+C", MENU_CONNECT
1884		- MENUITEM "&Quick Connect...\tCtrl+Q", MENU_QUICK
1885		- MENUITEM "&Disconnect", MENU_DISCONNECT
1886		- MENUITEM SEPARATOR
1887		- MENUITEM "&Host Setting...", MENU_SET_CONNECT
1888		- POPUP "&Settings"
1889		- BEGIN
1890		- MENUITEM "Import Settings from &WS_FTP.INI...", MENU_IMPORT_WS
1891		- MENUITEM "&Save Settings to File...", MENU_REGSAVE
1892		- MENUITEM "&Load Settings from File...", MENU_REGLOAD
1893		- MENUITEM "Change &Master password...", MENU_CHANGEPASSWD
1894		- MENUITEM SEPARATOR
1895		- MENUITEM "Clear All Settings...", MENU_REGINIT
1896		- END
1897		- MENUITEM SEPARATOR
1898		- MENUITEM "E&xit", MENU_EXIT
1899		- END
1900		- POPUP "&Commands"
1901		- BEGIN
1902		- MENUITEM "&Download\tCtrl+D", MENU_DOWNLOAD
1903		- MENUITEM "&Upload\tCtrl+U", MENU_UPLOAD
1904		- MENUITEM "D&ownload As...", MENU_DOWNLOAD_AS
1905		- MENUITEM "U&pload As...", MENU_UPLOAD_AS
1906		- MENUITEM "Change &Filename && Download...", MENU_DOWNLOAD_NAME
1907		- MENUITEM "Download &as File", MENU_DOWNLOAD_AS_FILE
1908		- MENUITEM SEPARATOR
1909		- MENUITEM "&Mirror Upload...\tCtrl+Shift+U", MENU_MIRROR_UPLOAD
1910		- MENUITEM "File &size...", MENU_FILESIZE
1911		- MENUITEM "Mirror Down&load...\tCtrl+Shift+D", MENU_MIRROR_DOWNLOAD
1912		- MENUITEM SEPARATOR
1913		- MENUITEM "D&elete\tDel", MENU_DELETE
1914		- MENUITEM "&Rename...\tCtrl+N", MENU_RENAME
1915		- MENUITEM "Permissio&ns...\tCtrl+T", MENU_CHMOD
1916		- MENUITEM "Ne&w Folder...\tCtrl+K", MENU_MKDIR
1917		- MENUITEM "Specify &command...", MENU_SOMECMD
1918		- MENUITEM SEPARATOR
1919		- MENUITEM "Synchronize Folder Mo&vement", MENU_SYNC
1920		- END
1921		- POPUP "&Bookmarks"
1922		- BEGIN
1923		- MENUITEM "Add &Host folder", MENU_BMARK_ADD
1924		- MENUITEM "Add &Local folder", MENU_BMARK_ADD_LOCAL
1925		- MENUITEM "Add &Both Host && Local folders", MENU_BMARK_ADD_BOTH
1926		- MENUITEM "&Edit Bookmarks...\tCtrl+B", MENU_BMARK_EDIT
1927		- MENUITEM SEPARATOR
1928		- END
1929		- POPUP "&View"
1930		- BEGIN
1931		- MENUITEM "F&ilter...\tCtrl+Y", MENU_FILTER
1932		- MENUITEM SEPARATOR
1933		- MENUITEM "&Find...\tCtrl+F", MENU_FIND
1934		- MENUITEM "Find &Next\tF3", MENU_FINDNEXT
1935		- MENUITEM SEPARATOR
1936		- MENUITEM "&Select...\tCtrl+S", MENU_SELECT
1937		- MENUITEM "Select &All/None\tCtrl+A", MENU_SELECT_ALL
1938		- MENUITEM SEPARATOR
1939		- POPUP "Displa&y"
1940		- BEGIN
1941		- MENUITEM "&List", MENU_LIST
1942		- MENUITEM "&Details", MENU_REPORT
1943		- END
1944		- MENUITEM "S&ort...", MENU_SORT
1945		- MENUITEM "Display files with leading &dot", MENU_DOTFILE
1946		- MENUITEM SEPARATOR
1947		- MENUITEM "Display File &List in Viewer", MENU_DIRINFO
1948		- MENUITEM "Display Lo&g in Viewer", MENU_TASKINFO
1949		- MENUITEM SEPARATOR
1950		- MENUITEM "&Refresh\tF5", MENU_REFRESH
1951		- END
1952		- POPUP "&Tools"
1953		- BEGIN
1954		- MENUITEM "&One-Time Password Calculation...", MENU_OTPCALC
1955		- END
1956		- POPUP "&Options"
1957		- BEGIN
1958		- MENUITEM "&Settings...", MENU_OPTION
1959		- END
1960		- POPUP "&Help"
1961		- BEGIN
1962		- MENUITEM "&Contents\tF1", MENU_HELP
1963		- MENUITEM "&Q&&A (Connect to Internet)", MENU_HELP_TROUBLE
1964		- MENUITEM SEPARATOR
1965		- MENUITEM "&About FFFTP...", MENU_ABOUT
1966		- END
1967		-END
1968	1990
1969		-dummy_menu MENU
1970		-BEGIN
1971		- POPUP "dummy"
	1991	+ hset_crypt_dlg, DIALOG
1972	1992	BEGIN
1973		- MENUITEM "Go up (host)", MENU_REMOTE_UPDIR
1974		- MENUITEM "Go up (local)", MENU_LOCAL_UPDIR
1975		- MENUITEM "Go up (both)", MENU_UPDIR
1976		- MENUITEM "COMBO_LOCAL", COMBO_LOCAL
1977		- MENUITEM "COMBO REMOTE", COMBO_REMOTE
1978		- MENUITEM "Text Mode", MENU_TEXT
1979		- MENUITEM "Binary Mode", MENU_BINARY
1980		- MENUITEM "Auto Mode", MENU_AUTO
1981		- MENUITEM "Refresh (local)", REFRESH_LOCAL
1982		- MENUITEM "Refresh (remote)", REFRESH_REMOTE
1983		- MENUITEM "CHDIR(remote)", MENU_REMOTE_CHDIR
1984		- MENUITEM "CHDIR(local)", MENU_LOCAL_CHDIR
1985		- MENUITEM "KANJI EUC", MENU_KNJ_EUC
1986		- MENUITEM "KANJI JIS", MENU_KNJ_JIS
1987		- MENUITEM "KANJI NONE", MENU_KNJ_NONE
1988		- MENUITEM "Double click", MENU_DCLICK
1989		- MENUITEM "Kana henkan", MENU_KANACNV
1990		- MENUITEM "Open 1", MENU_OPEN1
1991		- MENUITEM "Open 2", MENU_OPEN2
1992		- MENUITEM "Open 3", MENU_OPEN3
1993		- MENUITEM "Connect", MENU_CONNECT_NUM
1994		- MENUITEM "HIst 1", MENU_HIST_1
1995		- MENUITEM "Hist 2", MENU_HIST_2
1996		- MENUITEM "Hist 3", MENU_HIST_3
1997		- MENUITEM "Hist 4", MENU_HIST_4
1998		- MENUITEM "Hist 5", MENU_HIST_5
1999		- MENUITEM "Hist 6", MENU_HIST_6
2000		- MENUITEM "Hist 7", MENU_HIST_7
2001		- MENUITEM "Hist 8", MENU_HIST_8
2002		- MENUITEM "Hist 9", MENU_HIST_9
2003		- MENUITEM "Hist 10 ", MENU_HIST_10
2004		- MENUITEM "Hist 11", MENU_HIST_11
2005		- MENUITEM "Hist 12", MENU_HIST_12
2006		- MENUITEM "Hist 13", MENU_HIST_13
2007		- MENUITEM "Hist 14", MENU_HIST_14
2008		- MENUITEM "Hist 15", MENU_HIST_15
2009		- MENUITEM "Hist 16", MENU_HIST_16
2010		- MENUITEM "Hist 17", MENU_HIST_17
2011		- MENUITEM "Hist 18", MENU_HIST_18
2012		- MENUITEM "Hist 19", MENU_HIST_19
2013		- MENUITEM "Hist 20", MENU_HIST_20
2014		- MENUITEM "Auto exit", MENU_AUTO_EXIT
2015		- MENUITEM "Stop", MENU_ABORT
2016		- MENUITEM "URL to clipboard", MENU_URL_COPY
2017		- MENUITEM "Download all", MENU_DOWNLOAD_ALL
2018		- MENUITEM "Upload all", MENU_UPLOAD_ALL
	1993	+ LEFTMARGIN, 7
	1994	+ RIGHTMARGIN, 200
	1995	+ TOPMARGIN, 7
	1996	+ BOTTOMMARGIN, 132
2019	1997	END
2020	1998	END
	1999	+#endif // APSTUDIO_INVOKED
2021	2000
2022	2001
2023	2002	/////////////////////////////////////////////////////////////////////////////

--- a/main.c

+++ b/main.c

		@@ -535,7 +535,13 @@ static int MakeAllWindows(int cmdShow)
535	535	WinPosX = CW_USEDEFAULT;
536	536	WinPosY = 0;
537	537	}
538		- hWndFtp = CreateWindow(FtpClassStr, "FFFTP",
	538	+ // UTF-8Î
	539	+ // [U[è`ÌNXÍftHgÌWNDPROCªShift_JISêpÌ½ß
	540	+// hWndFtp = CreateWindow(FtpClassStr, "FFFTP",
	541	+// WS_OVERLAPPEDWINDOW \| WS_CLIPCHILDREN \| WS_CLIPSIBLINGS,
	542	+// WinPosX, WinPosY, WinWidth, WinHeight,
	543	+// HWND_DESKTOP, 0, hInstFtp, NULL);
	544	+ hWndFtp = CreateWindowA(FtpClassStr, "FFFTP",
539	545	WS_OVERLAPPEDWINDOW \| WS_CLIPCHILDREN \| WS_CLIPSIBLINGS,
540	546	WinPosX, WinPosY, WinWidth, WinHeight,
541	547	HWND_DESKTOP, 0, hInstFtp, NULL);

--- a/mbswrapper.c

+++ b/mbswrapper.c

		@@ -24,7 +24,7 @@
24	24	int MtoW(LPWSTR pDst, int size, LPCSTR pSrc, int count)
25	25	{
26	26	if(pSrc < (LPCSTR)0x00010000 \|\| pSrc == (LPCSTR)~0)
27		- return pSrc;
	27	+ return 0;
28	28	if(pDst)
29	29	return MultiByteToWideChar(CP_UTF8, 0, pSrc, count, pDst, size);
30	30	return MultiByteToWideChar(CP_UTF8, 0, pSrc, count, NULL, 0);

		@@ -34,7 +34,7 @@ int MtoW(LPWSTR pDst, int size, LPCSTR pSrc, int count)
34	34	int WtoM(LPSTR pDst, int size, LPCWSTR pSrc, int count)
35	35	{
36	36	if(pSrc < (LPCWSTR)0x00010000 \|\| pSrc == (LPCWSTR)~0)
37		- return pSrc;
	37	+ return 0;
38	38	if(pDst)
39	39	return WideCharToMultiByte(CP_UTF8, 0, pSrc, count, pDst, size, NULL, NULL);
40	40	return WideCharToMultiByte(CP_UTF8, 0, pSrc, count, NULL, 0, NULL, NULL);

		@@ -44,7 +44,7 @@ int WtoM(LPSTR pDst, int size, LPCWSTR pSrc, int count)
44	44	int WtoA(LPSTR pDst, int size, LPCWSTR pSrc, int count)
45	45	{
46	46	if(pSrc < (LPCWSTR)0x00010000 \|\| pSrc == (LPCWSTR)~0)
47		- return pSrc;
	47	+ return 0;
48	48	if(pDst)
49	49	return WideCharToMultiByte(CP_ACP, 0, pSrc, count, pDst, size, NULL, NULL);
50	50	return WideCharToMultiByte(CP_ACP, 0, pSrc, count, NULL, 0, NULL, NULL);

		@@ -112,6 +112,60 @@ size_t GetMultiStringLengthW(LPCWSTR lpString)
112	112	return i;
113	113	}
114	114
	115	+// NULLæØè}`oCg¶ñ©çCh¶ñÖÏ·
	116	+int MtoWMultiString(LPWSTR pDst, int size, LPCSTR pSrc)
	117	+{
	118	+ int i;
	119	+ if(pSrc < (LPCSTR)0x00010000 \|\| pSrc == (LPCSTR)~0)
	120	+ return 0;
	121	+ if(!pDst)
	122	+ return GetMultiStringLengthM(pSrc);
	123	+ i = 0;
	124	+ while(*pSrc != '\0')
	125	+ {
	126	+ i += MultiByteToWideChar(CP_UTF8, 0, pSrc, -1, pDst + i, size - i - 1);
	127	+ pSrc += strlen(pSrc) + 1;
	128	+ }
	129	+ pDst[i] = L'\0';
	130	+ return i;
	131	+}
	132	+
	133	+// NULLæØèCh¶ñ©ç}`oCg¶ñÖÏ·
	134	+int WtoMMultiString(LPSTR pDst, int size, LPCWSTR pSrc)
	135	+{
	136	+ int i;
	137	+ if(pSrc < (LPCWSTR)0x00010000 \|\| pSrc == (LPCWSTR)~0)
	138	+ return 0;
	139	+ if(!pDst)
	140	+ return GetMultiStringLengthW(pSrc);
	141	+ i = 0;
	142	+ while(*pSrc != L'\0')
	143	+ {
	144	+ i += WideCharToMultiByte(CP_UTF8, 0, pSrc, -1, pDst + i, size - i - 1, NULL, NULL);
	145	+ pSrc += wcslen(pSrc) + 1;
	146	+ }
	147	+ pDst[i] = '\0';
	148	+ return i;
	149	+}
	150	+
	151	+// NULLæØèCh¶ñ©ç}`oCg¶ñÖÏ·
	152	+int WtoAMultiString(LPSTR pDst, int size, LPCWSTR pSrc)
	153	+{
	154	+ int i;
	155	+ if(pSrc < (LPCWSTR)0x00010000 \|\| pSrc == (LPCWSTR)~0)
	156	+ return 0;
	157	+ if(!pDst)
	158	+ return GetMultiStringLengthW(pSrc);
	159	+ i = 0;
	160	+ while(*pSrc != L'\0')
	161	+ {
	162	+ i += WideCharToMultiByte(CP_ACP, 0, pSrc, -1, pDst + i, size - i - 1, NULL, NULL);
	163	+ pSrc += wcslen(pSrc) + 1;
	164	+ }
	165	+ pDst[i] = '\0';
	166	+ return i;
	167	+}
	168	+
115	169	// }`oCg¶ñpÌðmÛ
116	170	char* AllocateStringM(int size)
117	171	{

		@@ -353,7 +407,7 @@ DWORD GetLogicalDriveStringsM(DWORD nBufferLength, LPSTR lpBuffer)
353	407	START_ROUTINE
354	408	pw0 = AllocateStringW(nBufferLength * 4);
355	409	GetLogicalDriveStringsW(nBufferLength * 4, pw0);
356		- WtoM(lpBuffer, nBufferLength, pw0, -1);
	410	+ WtoMMultiString(lpBuffer, nBufferLength, pw0);
357	411	r = TerminateStringM(lpBuffer, nBufferLength);
358	412	END_ROUTINE
359	413	FreeDuplicatedString(pw0);

		@@ -362,7 +416,7 @@ END_ROUTINE
362	416
363	417	ATOM RegisterClassExM(CONST WNDCLASSEXA * v0)
364	418	{
365		- LRESULT r = 0;
	419	+ ATOM r = 0;
366	420	START_ROUTINE
367	421	// WNDPROCªShift_JISpÅ é½ß
368	422	r = RegisterClassExA(v0);

		@@ -561,10 +615,13 @@ START_ROUTINE
561	615	wLVItem.iSubItem = pmLVItem->iSubItem;
562	616	wLVItem.state = pmLVItem->state;
563	617	wLVItem.stateMask = pmLVItem->stateMask;
564		- Size = pmLVItem->cchTextMax * 4;
565		- pw0 = AllocateStringW(Size);
566		- wLVItem.pszText = pw0;
567		- wLVItem.cchTextMax = Size;
	618	+ if(pmLVItem->mask & LVIF_TEXT)
	619	+ {
	620	+ Size = pmLVItem->cchTextMax * 4;
	621	+ pw0 = AllocateStringW(Size);
	622	+ wLVItem.pszText = pw0;
	623	+ wLVItem.cchTextMax = Size;
	624	+ }
568	625	wLVItem.iImage = pmLVItem->iImage;
569	626	wLVItem.lParam = pmLVItem->lParam;
570	627	wLVItem.iIndent = pmLVItem->iIndent;

		@@ -574,8 +631,11 @@ START_ROUTINE
574	631	pmLVItem->iSubItem = wLVItem.iSubItem;
575	632	pmLVItem->state = wLVItem.state;
576	633	pmLVItem->stateMask = wLVItem.stateMask;
577		- WtoM(pmLVItem->pszText, pmLVItem->cchTextMax, wLVItem.pszText, -1);
578		- TerminateStringM(pmLVItem->pszText, pmLVItem->cchTextMax);
	634	+ if(pmLVItem->mask & LVIF_TEXT)
	635	+ {
	636	+ WtoM(pmLVItem->pszText, pmLVItem->cchTextMax, wLVItem.pszText, -1);
	637	+ TerminateStringM(pmLVItem->pszText, pmLVItem->cchTextMax);
	638	+ }
579	639	pmLVItem->iImage = wLVItem.iImage;
580	640	pmLVItem->lParam = wLVItem.lParam;
581	641	pmLVItem->iIndent = wLVItem.iIndent;

		@@ -587,10 +647,13 @@ START_ROUTINE
587	647	wLVItem.iSubItem = pmLVItem->iSubItem;
588	648	wLVItem.state = pmLVItem->state;
589	649	wLVItem.stateMask = pmLVItem->stateMask;
590		- pw0 = DuplicateMtoW(pmLVItem->pszText, -1);
591		- wLVItem.pszText = pw0;
592		- // TODO: cchTextMaxÌmF
593		- wLVItem.cchTextMax = pmLVItem->cchTextMax;
	650	+ if(pmLVItem->mask & LVIF_TEXT)
	651	+ {
	652	+ pw0 = DuplicateMtoW(pmLVItem->pszText, -1);
	653	+ wLVItem.pszText = pw0;
	654	+ // TODO: cchTextMaxÌmF
	655	+ wLVItem.cchTextMax = pmLVItem->cchTextMax;
	656	+ }
594	657	wLVItem.iImage = pmLVItem->iImage;
595	658	wLVItem.lParam = pmLVItem->lParam;
596	659	wLVItem.iIndent = pmLVItem->iIndent;

		@@ -603,10 +666,13 @@ START_ROUTINE
603	666	wLVItem.iSubItem = pmLVItem->iSubItem;
604	667	wLVItem.state = pmLVItem->state;
605	668	wLVItem.stateMask = pmLVItem->stateMask;
606		- pw0 = DuplicateMtoW(pmLVItem->pszText, -1);
607		- wLVItem.pszText = pw0;
608		- // TODO: cchTextMaxÌmF
609		- wLVItem.cchTextMax = pmLVItem->cchTextMax;
	669	+ if(pmLVItem->mask & LVIF_TEXT)
	670	+ {
	671	+ pw0 = DuplicateMtoW(pmLVItem->pszText, -1);
	672	+ wLVItem.pszText = pw0;
	673	+ // TODO: cchTextMaxÌmF
	674	+ wLVItem.cchTextMax = pmLVItem->cchTextMax;
	675	+ }
610	676	wLVItem.iImage = pmLVItem->iImage;
611	677	wLVItem.lParam = pmLVItem->lParam;
612	678	wLVItem.iIndent = pmLVItem->iIndent;

		@@ -615,8 +681,11 @@ START_ROUTINE
615	681	case LVM_FINDITEMA:
616	682	pmLVFindInfo = (LVFINDINFOA*)lParam;
617	683	wLVFindInfo.flags = pmLVFindInfo->flags;
618		- pw0 = DuplicateMtoW(pmLVFindInfo->psz, -1);
619		- wLVFindInfo.psz = pw0;
	684	+ if(pmLVFindInfo->flags & (LVFI_STRING \| LVFI_PARTIAL))
	685	+ {
	686	+ pw0 = DuplicateMtoW(pmLVFindInfo->psz, -1);
	687	+ wLVFindInfo.psz = pw0;
	688	+ }
620	689	wLVFindInfo.lParam = pmLVFindInfo->lParam;
621	690	wLVFindInfo.pt = pmLVFindInfo->pt;
622	691	wLVFindInfo.vkDirection = pmLVFindInfo->vkDirection;

		@@ -628,9 +697,12 @@ START_ROUTINE
628	697	wLVColumn.fmt = pmLVColumn->fmt;
629	698	wLVColumn.cx = pmLVColumn->cx;
630	699	Size = pmLVColumn->cchTextMax * 4;
631		- pw0 = AllocateStringW(Size);
632		- wLVColumn.pszText = pw0;
633		- wLVColumn.cchTextMax = Size;
	700	+ if(pmLVColumn->mask & LVCF_TEXT)
	701	+ {
	702	+ pw0 = AllocateStringW(Size);
	703	+ wLVColumn.pszText = pw0;
	704	+ wLVColumn.cchTextMax = Size;
	705	+ }
634	706	wLVColumn.iSubItem = pmLVColumn->iSubItem;
635	707	wLVColumn.iImage = pmLVColumn->iImage;
636	708	wLVColumn.iOrder = pmLVColumn->iOrder;

		@@ -638,8 +710,11 @@ START_ROUTINE
638	710	pmLVColumn->mask = wLVColumn.mask;
639	711	pmLVColumn->fmt = wLVColumn.fmt;
640	712	pmLVColumn->cx = wLVColumn.cx;
641		- WtoM(pmLVColumn->pszText, pmLVColumn->cchTextMax, wLVColumn.pszText, -1);
642		- TerminateStringM(pmLVColumn->pszText, pmLVColumn->cchTextMax);
	713	+ if(pmLVColumn->mask & LVCF_TEXT)
	714	+ {
	715	+ WtoM(pmLVColumn->pszText, pmLVColumn->cchTextMax, wLVColumn.pszText, -1);
	716	+ TerminateStringM(pmLVColumn->pszText, pmLVColumn->cchTextMax);
	717	+ }
643	718	pmLVColumn->iSubItem = wLVColumn.iSubItem;
644	719	pmLVColumn->iImage = wLVColumn.iImage;
645	720	pmLVColumn->iOrder = wLVColumn.iOrder;

		@@ -649,10 +724,13 @@ START_ROUTINE
649	724	wLVColumn.mask = pmLVColumn->mask;
650	725	wLVColumn.fmt = pmLVColumn->fmt;
651	726	wLVColumn.cx = pmLVColumn->cx;
652		- pw0 = DuplicateMtoW(pmLVColumn->pszText, -1);
653		- wLVColumn.pszText = pw0;
654		- // TODO: cchTextMaxÌmF
655		- wLVColumn.cchTextMax = pmLVColumn->cchTextMax;
	727	+ if(pmLVColumn->mask & LVCF_TEXT)
	728	+ {
	729	+ pw0 = DuplicateMtoW(pmLVColumn->pszText, -1);
	730	+ wLVColumn.pszText = pw0;
	731	+ // TODO: cchTextMaxÌmF
	732	+ wLVColumn.cchTextMax = pmLVColumn->cchTextMax;
	733	+ }
656	734	wLVColumn.iSubItem = pmLVColumn->iSubItem;
657	735	wLVColumn.iImage = pmLVColumn->iImage;
658	736	wLVColumn.iOrder = pmLVColumn->iOrder;

		@@ -752,7 +830,7 @@ UINT DragQueryFileM(HDROP hDrop, UINT iFile, LPSTR lpszFile, UINT cch)
752	830	wchar_t* pw0 = NULL;
753	831	START_ROUTINE
754	832	if(iFile == (UINT)-1)
755		- r = DragQueryFileW(hDrop, iFile, lpszFile, cch);
	833	+ r = DragQueryFileW(hDrop, iFile, (LPWSTR)lpszFile, cch);
756	834	else
757	835	{
758	836	pw0 = AllocateStringW(cch * 4);

		@@ -1560,7 +1638,6 @@ size_t _mbslenM(const unsigned char * _Str)
1560	1638	{
1561	1639	size_t r = 0;
1562	1640	wchar_t* pw0 = NULL;
1563		- wchar_t* wr;
1564	1641	START_ROUTINE
1565	1642	pw0 = DuplicateMtoW(_Str, -1);
1566	1643	r = wcslen(pw0);

--- a/socketwrapper.c

+++ b/socketwrapper.c

		@@ -11,22 +11,22 @@
11	11
12	12	#include "socketwrapper.h"
13	13
14		-typedef void (__stdcall* _SSL_load_error_strings)();
15		-typedef int (__stdcall* _SSL_library_init)();
16		-typedef SSL_METHOD* (__stdcall* _SSLv23_method)();
17		-typedef SSL_CTX* (__stdcall* _SSL_CTX_new)(SSL_METHOD*);
18		-typedef void (__stdcall* _SSL_CTX_free)(SSL_CTX*);
19		-typedef SSL* (__stdcall* _SSL_new)(SSL_CTX*);
20		-typedef void (__stdcall* _SSL_free)(SSL*);
21		-typedef int (__stdcall* _SSL_shutdown)(SSL*);
22		-typedef int (__stdcall* _SSL_get_fd)(SSL*);
23		-typedef int (__stdcall* _SSL_set_fd)(SSL*, int);
24		-typedef int (__stdcall* _SSL_accept)(SSL*);
25		-typedef int (__stdcall* _SSL_connect)(SSL*);
26		-typedef int (__stdcall* _SSL_write)(SSL, const void, int);
27		-typedef int (__stdcall* _SSL_peek)(SSL, void, int);
28		-typedef int (__stdcall* _SSL_read)(SSL, void, int);
29		-typedef int (__stdcall* _SSL_get_error)(SSL*, int);
	14	+typedef void (__cdecl* _SSL_load_error_strings)();
	15	+typedef int (__cdecl* _SSL_library_init)();
	16	+typedef SSL_METHOD* (__cdecl* _SSLv23_method)();
	17	+typedef SSL_CTX* (__cdecl* _SSL_CTX_new)(SSL_METHOD*);
	18	+typedef void (__cdecl* _SSL_CTX_free)(SSL_CTX*);
	19	+typedef SSL* (__cdecl* _SSL_new)(SSL_CTX*);
	20	+typedef void (__cdecl* _SSL_free)(SSL*);
	21	+typedef int (__cdecl* _SSL_shutdown)(SSL*);
	22	+typedef int (__cdecl* _SSL_get_fd)(SSL*);
	23	+typedef int (__cdecl* _SSL_set_fd)(SSL*, int);
	24	+typedef int (__cdecl* _SSL_accept)(SSL*);
	25	+typedef int (__cdecl* _SSL_connect)(SSL*);
	26	+typedef int (__cdecl* _SSL_write)(SSL, const void, int);
	27	+typedef int (__cdecl* _SSL_peek)(SSL, void, int);
	28	+typedef int (__cdecl* _SSL_read)(SSL, void, int);
	29	+typedef int (__cdecl* _SSL_get_error)(SSL*, int);
30	30
31	31	_SSL_load_error_strings pSSL_load_error_strings;
32	32	_SSL_library_init pSSL_library_init;

ffftp.http://sabah.net/ Fork

コミット

タグ

よく使われているワード(クリックで追加)

コミットメタ情報

ログメッセージ

変更サマリ

差分

ffftp.http://sabah.net/
Fork