Replace UTF-8N to UTF-8 (UTF-8N is obscure and identical to UTF-8 in this case).

Correct spelling mistakes.

diff --git a/FFFTP_Eng_Release/FFFTP.exe b/FFFTP_Eng_Release/FFFTP.exe
index 54d0242..c145448 100644 (file)
Binary files a/FFFTP_Eng_Release/FFFTP.exe and b/FFFTP_Eng_Release/FFFTP.exe differ

diff --git a/Package/FFFTP.CHM b/Package/FFFTP.CHM
index 596562f..f6d126a 100644 (file)
Binary files a/Package/FFFTP.CHM and b/Package/FFFTP.CHM differ

diff --git a/Package/FFFTP.exe b/Package/FFFTP.exe
index aebffdd..ae401f9 100644 (file)
Binary files a/Package/FFFTP.exe and b/Package/FFFTP.exe differ

diff --git a/Package/history.txt b/Package/history.txt
index f97a520..baa6ffd 100644 (file)
--- a/Package/history.txt
+++ b/Package/history.txt
@@ -23,7 +23,7 @@
 \81@\88È\91O\82Ì\83o\81[\83W\83\87\83\93\82Ì\96³\95Ï\8a·\82ÍShift_JIS\82ð\8e¦\82µ\82Ä\82¢\82Ü\82·\81B\81j
 
 \81EUnicode\88Ë\91¶\95¶\8e\9a\81i\92\86\8d\91\8cê\82È\82Ç\81j\82ð\8aÜ\82Þ\83t\83@\83C\83\8b\96¼\82ð\88µ\82¦\82é\82æ\82¤\82É\82È\82è\82Ü\82µ\82½\81B
-\81@\82»\82Ì\8dÛ\83z\83X\83g\82Ì\83t\83@\83C\83\8b\96¼\82Ì\8a¿\8e\9a\83R\81[\83h\82ÍUTF-8N\82É\90Ý\92è\82³\82ê\82Ä\82¢\82é\95K\97v\82ª\82 \82è\82Ü\82·\81B
+\81@\82»\82Ì\8dÛ\83z\83X\83g\82Ì\83t\83@\83C\83\8b\96¼\82Ì\8a¿\8e\9a\83R\81[\83h\82ÍUTF-8\82É\90Ý\92è\82³\82ê\82Ä\82¢\82é\95K\97v\82ª\82 \82è\82Ü\82·\81B
 
 \81E\83t\83@\83C\83\8b\88ê\97\97\82Ì\83L\83\83\83b\83V\83\85\82Í\8aù\92è\82Å\96³\8cø\89»\82³\82ê\82Ü\82µ\82½\81B
 \81@\81i\88È\91O\82Ì\83o\81[\83W\83\87\83\93\82Ì\90Ý\92è\82ª\8ec\82Á\82Ä\82¢\82é\8fê\8d\87\82Í\82»\82Ì\90Ý\92è\82ª\93K\97p\82³\82ê\82Ü\82·\81B\81j
@@ -34,6 +34,8 @@
 \81@\88Ã\8d\86\89»\82³\82ê\82½\8fó\91Ô\82Å\91\97\8eó\90M\82³\82ê\82Ü\82·\81B
 \81@\82±\82Ì\8b@\94\\82ð\8eg\97p\82·\82é\82É\82Í\95Ê\93rOpenSSL\82ª\83C\83\93\83X\83g\81[\83\8b\82³\82ê\82Ä\82¢\82é\95K\97v\82ª\82 \82è\82Ü\82·\81B
 
+\81EUTF-8N\82Æ\82¢\82¤\96¼\8fÌ\82ðUTF-8\82É\93\9d\88ê\82µ\82½\81B\81i\82±\82Ì\8fê\8d\87UTF-8\82Æ\93¯\8b`\82Ì\82½\82ß\81j
+
 \81¡Ver 1.97b
 
 \81E\83z\83X\83g\91¤\82©\82ç\83G\83N\83X\83v\83\8d\81[\83\89\82É\83h\83\89\83b\83O\81\95\83h\83\8d\83b\83v\82µ\82½\8e\9e\81A\83t\83@\83C\83\8b\82â\83t\83H\83\8b\83_\82ð

diff --git a/Release/FFFTP.exe b/Release/FFFTP.exe
index aebffdd..ae401f9 100644 (file)
Binary files a/Release/FFFTP.exe and b/Release/FFFTP.exe differ

diff --git a/Resource/FFFTP.APS b/Resource/FFFTP.APS
index 71b75ea..d5fd2eb 100644 (file)
Binary files a/Resource/FFFTP.APS and b/Resource/FFFTP.APS differ

diff --git a/Resource/FFFTP.rc b/Resource/FFFTP.rc
index d14aa41..af6bc89 100644 (file)
--- a/Resource/FFFTP.rc
+++ b/Resource/FFFTP.rc
@@ -731,7 +731,7 @@ BEGIN
     CONTROL         "Shift_JIS",HSET_SJIS_CNV,"Button",BS_AUTORADIOBUTTON,12,33,81,10\r
     CONTROL         "JIS",HSET_JIS_CNV,"Button",BS_AUTORADIOBUTTON,12,45,41,10\r
     CONTROL         "EUC",HSET_EUC_CNV,"Button",BS_AUTORADIOBUTTON,12,57,41,10\r
-    CONTROL         "UTF-8N",HSET_UTF8N_CNV,"Button",BS_AUTORADIOBUTTON,12,69,41,10\r
+    CONTROL         "UTF-8",HSET_UTF8N_CNV,"Button",BS_AUTORADIOBUTTON,12,69,41,10\r
     CONTROL         "\94¼\8ap\83J\83i\82ð\91S\8ap\82É\95Ï\8a·",HSET_HANCNV,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,12,86,87,10\r
     GROUPBOX        "\83t\83@\83C\83\8b\96¼\82Ì\8a¿\8e\9a\83R\81[\83h(&N)",-1,110,7,90,115,WS_GROUP\r
     CONTROL         "\8e©\93®",HSET_FN_AUTO_CNV,"Button",BS_AUTORADIOBUTTON | WS_GROUP,114,21,65,10\r
@@ -740,7 +740,7 @@ BEGIN
     CONTROL         "EUC",HSET_FN_EUC_CNV,"Button",BS_AUTORADIOBUTTON,114,57,41,10\r
     CONTROL         "Samba-HEX",HSET_FN_SMH_CNV,"Button",BS_AUTORADIOBUTTON,114,69,66,10\r
     CONTROL         "Samba-CAP",HSET_FN_SMC_CNV,"Button",BS_AUTORADIOBUTTON,114,81,64,10\r
-    CONTROL         "UTF-8N",HSET_FN_UTF8N_CNV,"Button",BS_AUTORADIOBUTTON,114,93,41,10\r
+    CONTROL         "UTF-8",HSET_FN_UTF8N_CNV,"Button",BS_AUTORADIOBUTTON,114,93,41,10\r
     CONTROL         "\94¼\8ap\83J\83i\82ð\91S\8ap\82É\95Ï\8a·",HSET_FN_HANCNV,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,114,107,81,10\r
 END\r
 \r
@@ -1347,7 +1347,7 @@ STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 FONT 9, "\82l\82r \82o\83S\83V\83b\83N"\r
 BEGIN\r
     CONTROL         "FTPS (Explicit)\82Å\90Ú\91±",HSET_FTPES,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,7,7,148,10\r
-    CONTROL         "FTPS (Inplicit)\82Å\90Ú\91±",HSET_FTPIS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,21,148,10\r
+    CONTROL         "FTPS (Implicit)\82Å\90Ú\91±",HSET_FTPIS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,21,148,10\r
     CONTROL         "SFTP\82Å\90Ú\91±",HSET_SFTP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,35,148,10\r
 END\r
 \r

diff --git a/Resource_eng/FFFTP-eng.aps b/Resource_eng/FFFTP-eng.aps
index f62f29b..8baa85e 100644 (file)
Binary files a/Resource_eng/FFFTP-eng.aps and b/Resource_eng/FFFTP-eng.aps differ

diff --git a/Resource_eng/FFFTP-eng.rc b/Resource_eng/FFFTP-eng.rc
index 61ebb3a..06f5ca9 100644 (file)
--- a/Resource_eng/FFFTP-eng.rc
+++ b/Resource_eng/FFFTP-eng.rc
@@ -738,7 +738,7 @@ BEGIN
     CONTROL         "Shift_JIS",HSET_SJIS_CNV,"Button",BS_AUTORADIOBUTTON,12,33,81,10\r
     CONTROL         "JIS",HSET_JIS_CNV,"Button",BS_AUTORADIOBUTTON,12,45,41,10\r
     CONTROL         "EUC",HSET_EUC_CNV,"Button",BS_AUTORADIOBUTTON,12,57,41,10\r
-    CONTROL         "UTF-8N",HSET_UTF8N_CNV,"Button",BS_AUTORADIOBUTTON,12,69,41,10\r
+    CONTROL         "UTF-8",HSET_UTF8N_CNV,"Button",BS_AUTORADIOBUTTON,12,69,41,10\r
     CONTROL         "Hankaku to Zenkaku",HSET_HANCNV,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,12,96,90,10\r
     GROUPBOX        "&Filename Kanji Code",-1,107,7,97,116,WS_GROUP\r
     CONTROL         "Automatic",HSET_FN_AUTO_CNV,"Button",BS_AUTORADIOBUTTON | WS_GROUP,114,21,65,10\r
@@ -747,7 +747,7 @@ BEGIN
     CONTROL         "EUC",HSET_FN_EUC_CNV,"Button",BS_AUTORADIOBUTTON,111,57,41,10\r
     CONTROL         "Samba-HEX",HSET_FN_SMH_CNV,"Button",BS_AUTORADIOBUTTON,111,69,66,10\r
     CONTROL         "Samba-CAP",HSET_FN_SMC_CNV,"Button",BS_AUTORADIOBUTTON,111,81,64,10\r
-    CONTROL         "UTF-8N",HSET_FN_UTF8N_CNV,"Button",BS_AUTORADIOBUTTON,111,93,63,10\r
+    CONTROL         "UTF-8",HSET_FN_UTF8N_CNV,"Button",BS_AUTORADIOBUTTON,111,93,63,10\r
     CONTROL         "Hankaku to Zenkaku",HSET_FN_HANCNV,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,111,108,91,10\r
 END\r
 \r
@@ -1372,7 +1372,7 @@ STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 FONT 9, "MS Sans Serif"\r
 BEGIN\r
     CONTROL         "Connect with FTPS (Explicit)",HSET_FTPES,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,7,7,148,10\r
-    CONTROL         "Connect with FTPS (Inplicit)",HSET_FTPIS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,21,148,10\r
+    CONTROL         "Connect with FTPS (Implicit)",HSET_FTPIS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,21,148,10\r
     CONTROL         "Connect with SFTP",HSET_SFTP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,35,148,10\r
 END\r
 \r

diff --git a/codecnv.c b/codecnv.c
index 13d6b91..6399b7d 100644 (file)
--- a/codecnv.c
+++ b/codecnv.c
@@ -1466,8 +1466,8 @@ static int CheckOnEUC(uchar *Pos, uchar *Btm)
 }\r
 \r
 \r
-// UTF-8N\91Î\89\9e \82±\82±\82©\82ç\81«\r
-/*----- UTF-8N\8a¿\8e\9a\83R\81[\83h\82ðSHIFT-JIS\8a¿\8e\9a\83R\81[\83h\82É\95Ï\8a· ------------------------------\r
+// UTF-8\91Î\89\9e \82±\82±\82©\82ç\81«\r
+/*----- UTF-8\8a¿\8e\9a\83R\81[\83h\82ðSHIFT-JIS\8a¿\8e\9a\83R\81[\83h\82É\95Ï\8a· ------------------------------\r
 *\r
 *      Parameter\r
 *              CODECONVINFO *cInfo : \8a¿\8e\9a\83R\81[\83h\95Ï\8a·\8fî\95ñ\r
@@ -1614,7 +1614,7 @@ int ConvUTF8NtoSJIS(CODECONVINFO *cInfo)
        return(Continue);\r
 }\r
 \r
-/*----- SHIFT-JIS\8a¿\8e\9a\83R\81[\83h\82ðUTF-8N\8a¿\8e\9a\83R\81[\83h\82É\95Ï\8a· ------------------------------\r
+/*----- SHIFT-JIS\8a¿\8e\9a\83R\81[\83h\82ðUTF-8\8a¿\8e\9a\83R\81[\83h\82É\95Ï\8a· ------------------------------\r
 *\r
 *      Parameter\r
 *              CODECONVINFO *cInfo : \8a¿\8e\9a\83R\81[\83h\95Ï\8a·\8fî\95ñ\r
@@ -1785,7 +1785,7 @@ int ConvSJIStoUTF8N(CODECONVINFO *cInfo)
 \r
        return(Continue);\r
 }\r
-// UTF-8N\91Î\89\9e \82±\82±\82Ü\82Å\81ª\r
+// UTF-8\91Î\89\9e \82±\82±\82Ü\82Å\81ª\r
 \r
 \r
 /*----- IBM\8ag\92£\8a¿\8e\9a\82ðNEC\91I\92èIBM\8ag\92£\8a¿\8e\9a\93\99\82É\95Ï\8a· -------------------------------\r

diff --git a/common.h b/common.h
index d52071d..9acd714 100644 (file)
--- a/common.h
+++ b/common.h
@@ -678,7 +678,7 @@ LIST_UNIX_70
 #define KANJI_EUC              2               /* EUC */\r
 #define KANJI_SMB_HEX  3               /* Samba-HEX */\r
 #define KANJI_SMB_CAP  4               /* Samba-CAP */\r
-#define KANJI_UTF8N            5               /* UTF-8N */\r
+#define KANJI_UTF8N            5               /* UTF-8 */\r
 \r
 #define KANJI_NOCNV            -1              /* \8a¿\8e\9a\83R\81[\83h\95Ï\8a·\82È\82µ */\r
 \r
@@ -1484,12 +1484,12 @@ int FlushRestData(CODECONVINFO *cInfo);
 int ConvEUCtoSJIS(CODECONVINFO *cInfo);\r
 int ConvJIStoSJIS(CODECONVINFO *cInfo);\r
 int ConvSMBtoSJIS(CODECONVINFO *cInfo);\r
-int ConvUTF8NtoSJIS(CODECONVINFO *cInfo); // UTF-8N\91Î\89\9e\r
+int ConvUTF8NtoSJIS(CODECONVINFO *cInfo); // UTF-8\91Î\89\9e\r
 int ConvSJIStoEUC(CODECONVINFO *cInfo);\r
 int ConvSJIStoJIS(CODECONVINFO *cInfo);\r
 int ConvSJIStoSMB_HEX(CODECONVINFO *cInfo);\r
 int ConvSJIStoSMB_CAP(CODECONVINFO *cInfo);\r
-int ConvSJIStoUTF8N(CODECONVINFO *cInfo); // UTF-8N\91Î\89\9e\r
+int ConvSJIStoUTF8N(CODECONVINFO *cInfo); // UTF-8\91Î\89\9e\r
 void ConvAutoToSJIS(char *Text, int Pref);\r
 int CheckKanjiCode(char *Text, int Size, int Pref);\r
 \r

diff --git a/history.txt b/history.txt
index badcb2c..0f7b18f 100644 (file)
--- a/history.txt
+++ b/history.txt
@@ -23,7 +23,7 @@
 \81@\88È\91O\82Ì\83o\81[\83W\83\87\83\93\82Ì\96³\95Ï\8a·\82ÍShift_JIS\82ð\8e¦\82µ\82Ä\82¢\82Ü\82·\81B\81j\r
 \r
 \81EUnicode\88Ë\91¶\95¶\8e\9a\81i\92\86\8d\91\8cê\82È\82Ç\81j\82ð\8aÜ\82Þ\83t\83@\83C\83\8b\96¼\82ð\88µ\82¦\82é\82æ\82¤\82É\82È\82è\82Ü\82µ\82½\81B\r
-\81@\82»\82Ì\8dÛ\83z\83X\83g\82Ì\83t\83@\83C\83\8b\96¼\82Ì\8a¿\8e\9a\83R\81[\83h\82ÍUTF-8N\82É\90Ý\92è\82³\82ê\82Ä\82¢\82é\95K\97v\82ª\82 \82è\82Ü\82·\81B\r
+\81@\82»\82Ì\8dÛ\83z\83X\83g\82Ì\83t\83@\83C\83\8b\96¼\82Ì\8a¿\8e\9a\83R\81[\83h\82ÍUTF-8\82É\90Ý\92è\82³\82ê\82Ä\82¢\82é\95K\97v\82ª\82 \82è\82Ü\82·\81B\r
 \r
 \81E\83t\83@\83C\83\8b\88ê\97\97\82Ì\83L\83\83\83b\83V\83\85\82Í\8aù\92è\82Å\96³\8cø\89»\82³\82ê\82Ü\82µ\82½\81B\r
 \81@\81i\88È\91O\82Ì\83o\81[\83W\83\87\83\93\82Ì\90Ý\92è\82ª\8ec\82Á\82Ä\82¢\82é\8fê\8d\87\82Í\82»\82Ì\90Ý\92è\82ª\93K\97p\82³\82ê\82Ü\82·\81B\81j\r
@@ -34,6 +34,8 @@
 \81@\88Ã\8d\86\89»\82³\82ê\82½\8fó\91Ô\82Å\91\97\8eó\90M\82³\82ê\82Ü\82·\81B\r
 \81@\82±\82Ì\8b@\94\\82ð\8eg\97p\82·\82é\82É\82Í\95Ê\93rOpenSSL\82ª\83C\83\93\83X\83g\81[\83\8b\82³\82ê\82Ä\82¢\82é\95K\97v\82ª\82 \82è\82Ü\82·\81B\r
 \r
+\81EUTF-8N\82Æ\82¢\82¤\96¼\8fÌ\82ðUTF-8\82É\93\9d\88ê\82µ\82½\81B\81i\82±\82Ì\8fê\8d\87UTF-8\82Æ\93¯\8b`\82Ì\82½\82ß\81j\r
+\r
 \81¡Ver 1.97b\r
 \r
 \81E\83z\83X\83g\91¤\82©\82ç\83G\83N\83X\83v\83\8d\81[\83\89\82É\83h\83\89\83b\83O\81\95\83h\83\8d\83b\83v\82µ\82½\8e\9e\81A\83t\83@\83C\83\8b\82â\83t\83H\83\8b\83_\82ð\r

diff --git a/hostman.c b/hostman.c
index 1e1c298..a3aa94d 100644 (file)
--- a/hostman.c
+++ b/hostman.c
@@ -1835,7 +1835,7 @@ static BOOL CALLBACK CodeSettingProc(HWND hDlg, UINT iMessage, WPARAM wParam, LP
                { HSET_FN_EUC_CNV, KANJI_EUC },\r
                { HSET_FN_SMH_CNV, KANJI_SMB_HEX },\r
                { HSET_FN_SMC_CNV, KANJI_SMB_CAP },\r
-               { HSET_FN_UTF8N_CNV, KANJI_UTF8N }              // UTF-8N\91Î\89\9e\r
+               { HSET_FN_UTF8N_CNV, KANJI_UTF8N }              // UTF-8\91Î\89\9e\r
        };\r
        #define NAMEKANJIBUTTONS        (sizeof(NameKanjiButton)/sizeof(RADIOBUTTON))\r
 \r
@@ -1893,7 +1893,7 @@ static BOOL CALLBACK CodeSettingProc(HWND hDlg, UINT iMessage, WPARAM wParam, LP
                                case HSET_FN_SJIS_CNV :\r
                                case HSET_FN_SMH_CNV :\r
                                case HSET_FN_SMC_CNV :\r
-                               case HSET_FN_UTF8N_CNV :        // UTF-8N\91Î\89\9e\r
+                               case HSET_FN_UTF8N_CNV :        // UTF-8\91Î\89\9e\r
                                        EnableWindow(GetDlgItem(hDlg, HSET_FN_HANCNV), FALSE);\r
                                        break;\r
                        }\r

diff --git a/htmlhelp/FFFTP.CHM b/htmlhelp/FFFTP.CHM
index 596562f..f6d126a 100644 (file)
Binary files a/htmlhelp/FFFTP.CHM and b/htmlhelp/FFFTP.CHM differ

diff --git a/htmlhelp/HTML/H0000030.HTM b/htmlhelp/HTML/H0000030.HTM
index 450cade..b3bc66a 100644 (file)
--- a/htmlhelp/HTML/H0000030.HTM
+++ b/htmlhelp/HTML/H0000030.HTM
@@ -5,13 +5,13 @@
 <BODY>\r
 <P><IMG src="..\pic\dlg_hset_code.png"></P>\r
 <P><STRONG>\81¡\83z\83X\83g\82Ì\8a¿\8e\9a\83R\81[\83h</STRONG></P>\r
-<P>\83z\83X\83g\91¤\82Ì\8a¿\8e\9a\83R\81[\83h\82ð\90Ý\92è\82µ\82Ü\82·\81B<BR>\83\8d\81[\83J\83\8b\91¤\82Ì\8a¿\8e\9a\83R\81[\83h\82Í\83c\81[\83\8b\83o\81[\82æ\82è Shift_JIS\81AEUC\81AJIS\81AUTF-8N \82©\82ç\91I\91ð\82Å\82«\82Ü\82·\81B<BR>\83A\83X\83L\81[\83\82\81[\83h\82Å\83t\83@\83C\83\8b\82ð\93]\91\97\82·\82é\82Æ\82«\81A\8a¿\8e\9a\83R\81[\83h\82ð\95Ï\8a·\82µ\82Ä\93]\91\97\82µ\82Ü\82·\81B<BR>\83o\83C\83i\83\8a\83\82\81[\83h\82Å\83t\83@\83C\83\8b\82ð\93]\91\97\82·\82é\82Æ\82«\82Í\81A\8a¿\8e\9a\83R\81[\83h\82Ì\95Ï\8a·\82Í\8ds\82¢\82Ü\82¹\82ñ\81B</P>\r
+<P>\83z\83X\83g\91¤\82Ì\8a¿\8e\9a\83R\81[\83h\82ð\90Ý\92è\82µ\82Ü\82·\81B<BR>\83\8d\81[\83J\83\8b\91¤\82Ì\8a¿\8e\9a\83R\81[\83h\82Í\83c\81[\83\8b\83o\81[\82æ\82è Shift_JIS\81AEUC\81AJIS\81AUTF-8 \82©\82ç\91I\91ð\82Å\82«\82Ü\82·\81B<BR>\83A\83X\83L\81[\83\82\81[\83h\82Å\83t\83@\83C\83\8b\82ð\93]\91\97\82·\82é\82Æ\82«\81A\8a¿\8e\9a\83R\81[\83h\82ð\95Ï\8a·\82µ\82Ä\93]\91\97\82µ\82Ü\82·\81B<BR>\83o\83C\83i\83\8a\83\82\81[\83h\82Å\83t\83@\83C\83\8b\82ð\93]\91\97\82·\82é\82Æ\82«\82Í\81A\8a¿\8e\9a\83R\81[\83h\82Ì\95Ï\8a·\82Í\8ds\82¢\82Ü\82¹\82ñ\81B</P>\r
 <P>JIS\83R\81[\83h\82Ì\8fÚ\8d×\82Í<A href="H0000054.HTM">JIS\8a¿\8e\9a\83R\81[\83h\82É\82Â\82¢\82Ä</A>\82ð\8c©\82Ä\82­\82¾\82³\82¢\81B</P>\r
 <P><STRONG>\81¡\94¼\8ap\83J\83i\82ð\91S\8ap\82É\95Ï\8a·</STRONG></P>\r
 <P>\83z\83X\83g\82Ì\8a¿\8e\9a\83R\81[\83h\82ª Shift_JIS\81AEUC\81AJIS \82Ì\8fê\8d\87\82É\81A\94¼\8ap\83J\83i\82ð\91S\8ap\82É\95Ï\8a·\82µ\82Ü\82·\81B<BR>Shift_JIS\81AEUC\81AJIS\88È\8aO\82Ì\8e\9e\82Í\81A\94¼\8ap\83J\83i\82Ì\82Ü\82Ü\82É\82È\82è\82Ü\82·\81B</P>\r
 <P>JIS\83R\81[\83h\82Ì\8fÚ\8d×\82Í<A href="H0000054.HTM">JIS\8a¿\8e\9a\83R\81[\83h\82É\82Â\82¢\82Ä</A>\82ð\8c©\82Ä\82­\82¾\82³\82¢\81B</P>\r
 <P><STRONG>\81¡\83t\83@\83C\83\8b\96¼\82Ì\8a¿\8e\9a\83R\81[\83h</STRONG></P>\r
-<P>\83z\83X\83g\91¤\82Ì\83t\83@\83C\83\8b\96¼\82Ì\8a¿\8e\9a\83R\81[\83h\82ð\90Ý\92è\82µ\82Ü\82·\81B<BR>\8c»\8dÝ\82Í\8e©\93®\82ð\91I\91ð\82·\82é\82Æ\83z\83X\83g\91¤\82Ì\83t\83@\83C\83\8b\96¼\82Ì\8a¿\8e\9a\83R\81[\83h\82ð UTF-8N \82Æ\82Ý\82È\82µ\82Ü\82·\81B<BR>\8fÚ\82µ\82­\82Í\81A<A \r
+<P>\83z\83X\83g\91¤\82Ì\83t\83@\83C\83\8b\96¼\82Ì\8a¿\8e\9a\83R\81[\83h\82ð\90Ý\92è\82µ\82Ü\82·\81B<BR>\8c»\8dÝ\82Í\8e©\93®\82ð\91I\91ð\82·\82é\82Æ\83z\83X\83g\91¤\82Ì\83t\83@\83C\83\8b\96¼\82Ì\8a¿\8e\9a\83R\81[\83h\82ð UTF-8 \82Æ\82Ý\82È\82µ\82Ü\82·\81B<BR>\8fÚ\82µ\82­\82Í\81A<A \r
 href="H0000055.HTM">\8a¿\8e\9a\82Ì\83t\83@\83C\83\8b\96¼\82É\82Â\82¢\82Ä</A>\82ð\8c©\82Ä\82­\82¾\82³\82¢\81B</P>\r
 <P><STRONG>\81¡\94¼\8ap\83J\83i\82ð\91S\8ap\82É\95Ï\8a·</STRONG></P>\r
 <P>\83z\83X\83g\82Ì\83t\83@\83C\83\8b\96¼\82Ì\8a¿\8e\9a\83R\81[\83h\82ª Shift_JIS\81AEUC\81AJIS \r

diff --git a/htmlhelp/HTML/H0000065.HTM b/htmlhelp/HTML/H0000065.HTM
index 42012f7..678d791 100644 (file)
--- a/htmlhelp/HTML/H0000065.HTM
+++ b/htmlhelp/HTML/H0000065.HTM
@@ -8,7 +8,7 @@ color=#ff0000>
 <P><IMG src="..\pic\dlg_hset_crypt.png"></P>
 <P><STRONG>\81¡FTPS (Explicit)\82Å\90Ú\91±</STRONG></P>
 <P>FTP over Explicit SSL/TLS\82ð\8eg\97p\82µ\82Ä\83z\83X\83g\82Æ\82Ì\83\86\81[\83U\81[\94F\8fØ\82¨\82æ\82Ñ\83t\83@\83C\83\8b\93]\91\97\82ð\8ds\82¢\82Ü\82·\81B<BR>\8eg\97p\82·\82é\82É\82Í\95Ê\93rOpenSSL\82ª\83C\83\93\83X\83g\81[\83\8b\82³\82ê\82Ä\82¢\82é\95K\97v\82ª\82 \82è\82Ü\82·\81B</P>
-<P><STRONG>\81¡FTPS (Inplicit)\82Å\90Ú\91±</STRONG></P>
+<P><STRONG>\81¡FTPS (Implicit)\82Å\90Ú\91±</STRONG></P>
 <P>\8c»\8dÝ\82Í\96¢\8eÀ\91\95\82Ì\82½\82ß\8eg\97p\82Å\82«\82Ü\82¹\82ñ\81B</P>
 <P><STRONG>\81¡SFTP\82Å\90Ú\91±</STRONG></P>
 <P>\8c»\8dÝ\82Í\96¢\8eÀ\91\95\82Ì\82½\82ß\8eg\97p\82Å\82«\82Ü\82¹\82ñ\81B</P>

diff --git a/htmlhelp/pic/dlg_hset_code.png b/htmlhelp/pic/dlg_hset_code.png
index 4f2538c..9b6b160 100644 (file)
Binary files a/htmlhelp/pic/dlg_hset_code.png and b/htmlhelp/pic/dlg_hset_code.png differ

diff --git a/htmlhelp/pic/dlg_hset_crypt.png b/htmlhelp/pic/dlg_hset_crypt.png
index 4cdef35..67aa8ea 100644 (file)
Binary files a/htmlhelp/pic/dlg_hset_crypt.png and b/htmlhelp/pic/dlg_hset_crypt.png differ

diff --git a/mesg-eng.h b/mesg-eng.h
index f3fa824..ee9acde 100644 (file)
--- a/mesg-eng.h
+++ b/mesg-eng.h
@@ -303,17 +303,17 @@
 #define MSGJPN303              "Master password has been changed."\r
 #define MSGJPN304              "Speecified master password is not correct.\r\nAre you sure you want to re-enter?\r\nNo memorized FTP password is available if you choose 'NO'"\r
 #define MSGJPN305              "Shift_JIS"\r
-#define MSGJPN306              "UTF-8N"\r
+#define MSGJPN306              "UTF-8"\r
 #define MSGJPN307              "Shift_JIS Kanji Code"\r
-#define MSGJPN308              "UTF-8N Kanji Code"\r
+#define MSGJPN308              "UTF-8 Kanji Code"\r
 #define MSGJPN309              "Shift_JIS Kanji Code (Local)"\r
 #define MSGJPN310              "EUC Kanji Code (Local)"\r
 #define MSGJPN311              "JIS Kanji Code (Local)"\r
-#define MSGJPN312              "UTF-8N Kanji Code (Local)"\r
+#define MSGJPN312              "UTF-8 Kanji Code (Local)"\r
 #define MSGJPN313              "Encryption"\r
 #define MSGJPN314              "Communication is not encrypted.\r\nPassword and other data may be intercepted by a third party."\r
 #define MSGJPN315              "Using FTP over Explicit SSL/TLS (FTPES)."\r
-#define MSGJPN316              "Using FTP over Inplicit SSL/TLS (FTPIS)."\r
+#define MSGJPN316              "Using FTP over Implicit SSL/TLS (FTPIS)."\r
 #define MSGJPN317              "Using SSH FTP (SFTP)."\r
 #define MSGJPN318              "OpenSSL is loaded."\r
 #define MSGJPN319              "OpenSSL is not installed.\r\nCommunication will not be encrypted."\r

diff --git a/mesg-eng.old.h b/mesg-eng.old.h
index 7ca33c0..537fbad 100644 (file)
--- a/mesg-eng.old.h
+++ b/mesg-eng.old.h
@@ -303,17 +303,17 @@
 #define MSGJPN303              "Master password has been changed."
 #define MSGJPN304              "Speecified master password is not correct.\r\nAre you sure you want to re-enter?\r\nNo memorized FTP password is available if you choose 'NO'"
 #define MSGJPN305              "Shift_JIS"
-#define MSGJPN306              "UTF-8N"
+#define MSGJPN306              "UTF-8"
 #define MSGJPN307              "Shift_JIS Kanji Code"
-#define MSGJPN308              "UTF-8N Kanji Code"
+#define MSGJPN308              "UTF-8 Kanji Code"
 #define MSGJPN309              "Shift_JIS Kanji Code (Local)"
 #define MSGJPN310              "EUC Kanji Code (Local)"
 #define MSGJPN311              "JIS Kanji Code (Local)"
-#define MSGJPN312              "UTF-8N Kanji Code (Local)"
+#define MSGJPN312              "UTF-8 Kanji Code (Local)"
 #define MSGJPN313              "Encryption"
 #define MSGJPN314              "Communication is not encrypted.\r\nPassword and other data may be intercepted by a third party."
 #define MSGJPN315              "Using FTP over Explicit SSL/TLS (FTPES)."
-#define MSGJPN316              "Using FTP over Inplicit SSL/TLS (FTPIS)."
+#define MSGJPN316              "Using FTP over Implicit SSL/TLS (FTPIS)."
 #define MSGJPN317              "Using SSH FTP (SFTP)."
 #define MSGJPN318              "OpenSSL is loaded."
 #define MSGJPN319              "OpenSSL is not installed.\r\nCommunication will not be encrypted."

diff --git a/mesg-jpn.h b/mesg-jpn.h
index df2baa4..6e23e2e 100644 (file)
--- a/mesg-jpn.h
+++ b/mesg-jpn.h
@@ -303,17 +303,17 @@
 #define MSGJPN303              "\xE3\x83\x9E\xE3\x82\xB9\xE3\x82\xBF\xE3\x83\xBC\xE3\x83\x91\xE3\x82\xB9\xE3\x83\xAF\xE3\x83\xBC\xE3\x83\x89\xE3\x82\x92\xE5\xA4\x89\xE6\x9B\xB4\xE3\x81\x97\xE3\x81\xBE\xE3\x81\x97\xE3\x81\x9F"\r
 #define MSGJPN304              "\xE6\x8C\x87\xE5\xAE\x9A\xE3\x81\x95\xE3\x82\x8C\xE3\x81\x9F\xE3\x83\x9E\xE3\x82\xB9\xE3\x82\xBF\xE3\x83\xBC\xE3\x83\x91\xE3\x82\xB9\xE3\x83\xAF\xE3\x83\xBC\xE3\x83\x89\xE3\x81\x8C\xE7\x99\xBB\xE9\x8C\xB2\xE3\x81\x95\xE3\x82\x8C\xE3\x81\x9F\xE3\x82\x82\xE3\x81\xAE\xE3\x81\xA8\xE4\xB8\x80\xE8\x87\xB4\xE3\x81\x97\xE3\x81\xBE\xE3\x81\x9B\xE3\x82\x93\xEF\xBC\x8E\r\n\xE5\x86\x8D\xE5\xBA\xA6\xE5\x85\xA5\xE5\x8A\x9B\xE3\x81\x97\xE3\x81\xBE\xE3\x81\x99\xE3\x81\x8B\xEF\xBC\x9F\r\n\xE3\x80\x8C\xE3\x81\x84\xE3\x81\x84\xE3\x81\x88\xE3\x80\x8D\xE3\x82\x92\xE9\x81\xB8\xE3\x81\xB6\xE3\x81\xA8\xE8\xA8\x98\xE6\x86\xB6\xE3\x81\x95\xE3\x82\x8C\xE3\x81\x9F\x46TP\xE3\x83\x91\xE3\x82\xB9\xE3\x83\xAF\xE3\x83\xBC\xE3\x83\x89\xE3\x81\xAF\xE5\x88\xA9\xE7\x94\xA8\xE3\x81\xA7\xE3\x81\x8D\xE3\x81\xBE\xE3\x81\x9B\xE3\x82\x93\xEF\xBC\x8E"\r
 #define MSGJPN305              "Shift_JIS"\r
-#define MSGJPN306              "UTF-8N"\r
+#define MSGJPN306              "UTF-8"\r
 #define MSGJPN307              "\xE3\x83\x9B\xE3\x82\xB9\xE3\x83\x88\xE3\x81\xAE\xE6\xBC\xA2\xE5\xAD\x97\xE3\x82\xB3\xE3\x83\xBC\xE3\x83\x89\xE3\x81\xAFShift_JIS"\r
-#define MSGJPN308              "\xE3\x83\x9B\xE3\x82\xB9\xE3\x83\x88\xE3\x81\xAE\xE6\xBC\xA2\xE5\xAD\x97\xE3\x82\xB3\xE3\x83\xBC\xE3\x83\x89\xE3\x81\xAFUTF-8N"\r
+#define MSGJPN308              "\xE3\x83\x9B\xE3\x82\xB9\xE3\x83\x88\xE3\x81\xAE\xE6\xBC\xA2\xE5\xAD\x97\xE3\x82\xB3\xE3\x83\xBC\xE3\x83\x89\xE3\x81\xAFUTF-8"\r
 #define MSGJPN309              "\xE3\x83\xAD\xE3\x83\xBC\xE3\x82\xAB\xE3\x83\xAB\xE3\x81\xAE\xE6\xBC\xA2\xE5\xAD\x97\xE3\x82\xB3\xE3\x83\xBC\xE3\x83\x89\xE3\x81\xAFShift_JIS"\r
 #define MSGJPN310              "\xE3\x83\xAD\xE3\x83\xBC\xE3\x82\xAB\xE3\x83\xAB\xE3\x81\xAE\xE6\xBC\xA2\xE5\xAD\x97\xE3\x82\xB3\xE3\x83\xBC\xE3\x83\x89\xE3\x81\xAF\x45UC"\r
 #define MSGJPN311              "\xE3\x83\xAD\xE3\x83\xBC\xE3\x82\xAB\xE3\x83\xAB\xE3\x81\xAE\xE6\xBC\xA2\xE5\xAD\x97\xE3\x82\xB3\xE3\x83\xBC\xE3\x83\x89\xE3\x81\xAFJIS"\r
-#define MSGJPN312              "\xE3\x83\xAD\xE3\x83\xBC\xE3\x82\xAB\xE3\x83\xAB\xE3\x81\xAE\xE6\xBC\xA2\xE5\xAD\x97\xE3\x82\xB3\xE3\x83\xBC\xE3\x83\x89\xE3\x81\xAFUTF-8N"\r
+#define MSGJPN312              "\xE3\x83\xAD\xE3\x83\xBC\xE3\x82\xAB\xE3\x83\xAB\xE3\x81\xAE\xE6\xBC\xA2\xE5\xAD\x97\xE3\x82\xB3\xE3\x83\xBC\xE3\x83\x89\xE3\x81\xAFUTF-8"\r
 #define MSGJPN313              "\xE6\x9A\x97\xE5\x8F\xB7\xE5\x8C\x96"\r
 #define MSGJPN314              "\xE9\x80\x9A\xE4\xBF\xA1\xE3\x81\xAF\xE6\x9A\x97\xE5\x8F\xB7\xE5\x8C\x96\xE3\x81\x95\xE3\x82\x8C\xE3\x81\xA6\xE3\x81\x84\xE3\x81\xBE\xE3\x81\x9B\xE3\x82\x93.\r\n\xE7\xAC\xAC\xE4\xB8\x89\xE8\x80\x85\xE3\x81\xAB\xE3\x83\x91\xE3\x82\xB9\xE3\x83\xAF\xE3\x83\xBC\xE3\x83\x89\xE3\x81\x8A\xE3\x82\x88\xE3\x81\xB3\xE5\x86\x85\xE5\xAE\xB9\xE3\x82\x92\xE5\x82\x8D\xE5\x8F\x97\xE3\x81\x95\xE3\x82\x8C\xE3\x82\x8B\xE5\x8F\xAF\xE8\x83\xBD\xE6\x80\xA7\xE3\x81\x8C\xE3\x81\x82\xE3\x82\x8A\xE3\x81\xBE\xE3\x81\x99."\r
 #define MSGJPN315              "FTP over Explicit SSL/TLS (FTPES)\xE3\x82\x92\xE4\xBD\xBF\xE7\x94\xA8\xE3\x81\x97\xE3\x81\xBE\xE3\x81\x99."\r
-#define MSGJPN316              "FTP over Inplicit SSL/TLS (FTPIS)\xE3\x82\x92\xE4\xBD\xBF\xE7\x94\xA8\xE3\x81\x97\xE3\x81\xBE\xE3\x81\x99."\r
+#define MSGJPN316              "FTP over Implicit SSL/TLS (FTPIS)\xE3\x82\x92\xE4\xBD\xBF\xE7\x94\xA8\xE3\x81\x97\xE3\x81\xBE\xE3\x81\x99."\r
 #define MSGJPN317              "SSH FTP (SFTP)\xE3\x82\x92\xE4\xBD\xBF\xE7\x94\xA8\xE3\x81\x97\xE3\x81\xBE\xE3\x81\x99."\r
 #define MSGJPN318              "OpenSSL\xE3\x81\x8C\xE8\xAA\xAD\xE3\x81\xBF\xE8\xBE\xBC\xE3\x81\xBE\xE3\x82\x8C\xE3\x81\xBE\xE3\x81\x97\xE3\x81\x9F."\r
 #define MSGJPN319              "OpenSSL\xE3\x81\x8C\xE3\x82\xA4\xE3\x83\xB3\xE3\x82\xB9\xE3\x83\x88\xE3\x83\xBC\xE3\x83\xAB\xE3\x81\x95\xE3\x82\x8C\xE3\x81\xA6\xE3\x81\x84\xE3\x81\xBE\xE3\x81\x9B\xE3\x82\x93.\r\n\xE9\x80\x9A\xE4\xBF\xA1\xE3\x81\xAE\xE6\x9A\x97\xE5\x8F\xB7\xE5\x8C\x96\xE3\x81\xAF\xE8\xA1\x8C\xE3\x82\x8F\xE3\x82\x8C\xE3\x81\xBE\xE3\x81\x9B\xE3\x82\x93."\r

diff --git a/mesg-jpn.old.h b/mesg-jpn.old.h
index 159c38e..275e937 100644 (file)
--- a/mesg-jpn.old.h
+++ b/mesg-jpn.old.h
@@ -303,17 +303,17 @@
 #define MSGJPN303              "\83}\83X\83^\81[\83p\83X\83\8f\81[\83h\82ð\95Ï\8dX\82µ\82Ü\82µ\82½"
 #define MSGJPN304              "\8ew\92è\82³\82ê\82½\83}\83X\83^\81[\83p\83X\83\8f\81[\83h\82ª\93o\98^\82³\82ê\82½\82à\82Ì\82Æ\88ê\92v\82µ\82Ü\82¹\82ñ\81D\r\n\8dÄ\93x\93ü\97Í\82µ\82Ü\82·\82©\81H\r\n\81u\82¢\82¢\82¦\81v\82ð\91I\82Ô\82Æ\8bL\89¯\82³\82ê\82½FTP\83p\83X\83\8f\81[\83h\82Í\97\98\97p\82Å\82«\82Ü\82¹\82ñ\81D"
 #define MSGJPN305              "Shift_JIS"
-#define MSGJPN306              "UTF-8N"
+#define MSGJPN306              "UTF-8"
 #define MSGJPN307              "\83z\83X\83g\82Ì\8a¿\8e\9a\83R\81[\83h\82ÍShift_JIS"
-#define MSGJPN308              "\83z\83X\83g\82Ì\8a¿\8e\9a\83R\81[\83h\82ÍUTF-8N"
+#define MSGJPN308              "\83z\83X\83g\82Ì\8a¿\8e\9a\83R\81[\83h\82ÍUTF-8"
 #define MSGJPN309              "\83\8d\81[\83J\83\8b\82Ì\8a¿\8e\9a\83R\81[\83h\82ÍShift_JIS"
 #define MSGJPN310              "\83\8d\81[\83J\83\8b\82Ì\8a¿\8e\9a\83R\81[\83h\82ÍEUC"
 #define MSGJPN311              "\83\8d\81[\83J\83\8b\82Ì\8a¿\8e\9a\83R\81[\83h\82ÍJIS"
-#define MSGJPN312              "\83\8d\81[\83J\83\8b\82Ì\8a¿\8e\9a\83R\81[\83h\82ÍUTF-8N"
+#define MSGJPN312              "\83\8d\81[\83J\83\8b\82Ì\8a¿\8e\9a\83R\81[\83h\82ÍUTF-8"
 #define MSGJPN313              "\88Ã\8d\86\89»"
 #define MSGJPN314              "\92Ê\90M\82Í\88Ã\8d\86\89»\82³\82ê\82Ä\82¢\82Ü\82¹\82ñ.\r\n\91æ\8eO\8eÒ\82É\83p\83X\83\8f\81[\83h\82¨\82æ\82Ñ\93à\97e\82ð\96T\8eó\82³\82ê\82é\89Â\94\\90«\82ª\82 \82è\82Ü\82·."
 #define MSGJPN315              "FTP over Explicit SSL/TLS (FTPES)\82ð\8eg\97p\82µ\82Ü\82·."
-#define MSGJPN316              "FTP over Inplicit SSL/TLS (FTPIS)\82ð\8eg\97p\82µ\82Ü\82·."
+#define MSGJPN316              "FTP over Implicit SSL/TLS (FTPIS)\82ð\8eg\97p\82µ\82Ü\82·."
 #define MSGJPN317              "SSH FTP (SFTP)\82ð\8eg\97p\82µ\82Ü\82·."
 #define MSGJPN318              "OpenSSL\82ª\93Ç\82Ý\8d\9e\82Ü\82ê\82Ü\82µ\82½."
 #define MSGJPN319              "OpenSSL\82ª\83C\83\93\83X\83g\81[\83\8b\82³\82ê\82Ä\82¢\82Ü\82¹\82ñ.\r\n\92Ê\90M\82Ì\88Ã\8d\86\89»\82Í\8ds\82í\82ê\82Ü\82¹\82ñ."