diff --git a/doc/Makefile.am b/doc/Makefile.am
index eb261895..7eaa41f9 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,31 +1,31 @@
 # Makefile.am - Documentation for GnuPG 4 Windows Makefile.
 # Copyright (C) 2005 g10 Code GmbH
 #
 # This file is part of GPG4Win.
 #
 # GPG4Win is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version.
 #
 # GPG4Win is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 
 EXTRA_DIST = nsi-mode.el pkg-copyright.txt beta-warning.txt HACKING\
 	     README.ar.txt README.de.txt README.en.txt README.es.txt \
-	     README.fr.txt README.ru.txt README.pt.txt \
+	     README.fr.txt README.ru.txt README.pt.txt README.zh.txt \
 	     HOWTO-SMIME.en.txt HOWTO-SMIME.de.txt
 
 if BUILD_MANUALS
 manual = manual
 else
 manual =
 endif
 
 SUBDIRS = logo $(manual)
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 7916c29f..635fb986 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1,472 +1,486 @@
 # zh_CN Translation for Gpg4Win Installer.
 # Copyright (C) 2015 Free Software Foundation, Inc.
 # This file is distributed under the same license as the Gpg4Win package.
 # Mingye Wang <arthur200126@gmail.com>, 2015.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: Gpg4Win Installer\n"
 "Report-Msgid-Bugs-To: gpg4win-devel@wald.intevation.org\n"
-"PO-Revision-Date: 2015-08-09 21:10+0800\n"
-"Last-Translator: Mingye Wang (Arthur2e5) <arthur200126@gmail.com>\n"
+"PO-Revision-Date: 2021-01-01 23:29+0800\n"
+"Last-Translator: bobwxc <bobwxc@yeah.net>\n"
 "Language-Team: \n"
 "Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.8.4\n"
+"X-Generator: Poedit 2.2.1\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 msgctxt "T_AlreadyRunning"
 msgid "An instance of this installer is already running."
 msgstr "该安装程序的一个实例已经在运行。"
 
 msgctxt "T_WelcomeTitleGpg4win"
 msgid "Welcome to the installation of Gpg4win"
-msgstr "欢迎来到 Gpg4win 安装程序。"
+msgstr "欢迎来到 Gpg4win 安装程序"
 
 msgctxt "T_AboutGpg4win"
 msgid ""
 "Gpg4win is an installer package for Windows for EMail and file encryption "
 "using the core component GnuPG for Windows. Both relevant cryptography "
 "standards are supported, OpenPGP and S/MIME. Gpg4win and the software "
 "included with Gpg4win is Free Software."
 msgstr ""
 "Gpg4win 是一个适用于 Windows 的文件和电子邮件加密工具软件包，通过核心组件 "
 "GnuPG 的 Windows 版本达成目标。这个过程中涉及的两种密码学标准，OpenPGP 和 S/"
 "MIME 都在这里提供支持。本软件安装包及其内容均为自由软件。"
 
 msgctxt "T_AboutGpg4winVersion"
 msgid "This is Gpg4win version ${VERSION}"
 msgstr "Gpg4win，版本 ${VERSION}"
 
 msgctxt "T_AboutGpg4winFileVersion"
 msgid "file version ${PROD_VERSION}"
 msgstr "文件版本 ${PROD_VERSION}"
 
 msgctxt "T_AboutGpg4winReleaseDate"
 msgid "Release date ${_BUILD_ISODATE}"
 msgstr "发布日期 ${_BUILD_ISODATE}"
 
 msgctxt "T_WelcomeTitleGpg4winSrc"
 msgid "Welcome to the installation of the Gpg4win sources"
 msgstr "欢迎来到 Gpg4win 源码安装"
 
-#, fuzzy
 msgctxt "T_AboutGpg4winSrc"
 msgid ""
 "Gpg4win is an installer package for Windows for EMail and file encryption "
 "using the core component GnuPG for Windows. Both relevant cryptography "
 "standards are supported, OpenPGP and S/MIME. Gpg4win and the software "
 "included with Gpg4win are Free Software."
 msgstr ""
 "Gpg4win 是一个适用于 Windows 的文件和电子邮件加密工具软件包，通过核心组件 "
-"GnuPG 的 Windows 版本达成目标。这个过程中涉及的两种密码学标准，OpenPGP 和 S/"
-"MIME 都在这里提供支持。本软件安装包及其内容均为自由软件。"
+"GnuPG 的 Windows 版本达成目标。同时支持 OpenPGP 和 S/MIME 这两种密码学标准。"
+"本软件安装包及其内容均为自由软件。"
 
 msgctxt "T_AboutGpg4winSrcVersion"
 msgid "This is Gpg4win version ${VERSION}"
 msgstr "Gpg4win，版本 ${VERSION}"
 
 msgctxt "T_AboutGpg4winSrcFileVersion"
 msgid "file version ${PROD_VERSION}"
 msgstr "文件版本 ${PROD_VERSION}"
 
-#, fuzzy
 msgctxt "T_AboutGpg4winSrcReleaseDate"
 msgid "release date ${_BUILD_ISODATE}"
 msgstr "发布日期 ${_BUILD_ISODATE}"
 
 msgctxt "T_RunKleopatra"
 msgid "Run Kleopatra"
-msgstr ""
+msgstr "运行 Kleopatra"
 
 msgctxt "T_RunGPA"
 msgid "Run GPA"
-msgstr ""
+msgstr "运行 GPA"
 
 msgctxt "T_LangCode"
 msgid "en"
 msgstr "zh_CN"
 
-#, fuzzy
 msgctxt "T_GPLHeader"
 msgid ""
 "This software is licensed under the terms of the GNU General Public License "
 "(GNU GPL)."
 msgstr "此软件依照 GNU 通用公共许可证（GPL）的条款授权。"
 
 msgctxt "T_GPLShort"
 msgid ""
 "In short: You are allowed to run this software for any purpose. You may "
 "distribute it as long as you give the recipients the same rights you have "
 "received."
 msgstr ""
 "总而言之：你可以为了任何目的运行本软件。你可以随意将此软件分发给他人，只要你"
 "给予他们与你所获得的相同的权利。"
 
 msgctxt "T_MoreInfo"
 msgid "Go to Gpg4win's webpage"
-msgstr ""
+msgstr "浏览 Gpg4win 的网页"
 
 msgctxt "T_MoreInfoURL"
 msgid "https://www.gpg4win.org"
 msgstr "https://www.gpg4win.org"
 
 msgctxt "T_ShowReadme"
 msgid "Show the README file"
-msgstr "显示 README 文件"
+msgstr "显示 README 说明文件"
 
 msgctxt "T_NoKeyManager"
 msgid "No key manager has been installed, thus we can't run one now."
 msgstr "没有安装任何密钥管理器，因此无法启动密钥管理器。"
 
 msgctxt "DESC_Menu_manuals"
 msgid "Documentation"
 msgstr "文档"
 
 msgctxt "DESC_Menu_uninstall"
 msgid "Uninstall"
 msgstr "卸载"
 
 msgctxt "DESC_Desktop_manuals"
 msgid "Gpg4win Documentation"
 msgstr "Gpg4win 文档"
 
 msgctxt "T_InstallOptions"
 msgid "Install Options"
 msgstr "安装选项"
 
 msgctxt "T_InstallOptLinks"
 msgid "Start links"
 msgstr "开始菜单快捷方式"
 
 msgctxt "T_InstOptLabelA"
 msgid "Please select where Gpg4win shall install links:"
 msgstr "请选择 Gpg4win 安装快捷方式的位置："
 
 msgctxt "T_InstOptLabelB"
 msgid "(Only programs will be linked into the quick launch bar.)"
-msgstr "（只有程序会被加入快速启动栏）。"
+msgstr "（只有程序会被加入快速启动栏）"
 
 msgctxt "T_InstOptFieldA"
 msgid "Start Menu"
 msgstr "开始菜单"
 
 msgctxt "T_InstOptFieldB"
 msgid "Desktop"
 msgstr "桌面"
 
 msgctxt "T_InstOptFieldC"
 msgid "Quick Launch Bar"
 msgstr "快速启动栏"
 
 msgctxt "T_FoundExistingVersion"
 msgid ""
 "Version $R1 has already been installed.\n"
 "Do you want to overwrite it with version ${VERSION}?"
 msgstr ""
-"版本 $R1 已被安装。\n"
-"你希望用版本 ${VERSION} 覆盖它吗？"
+"已安装 $R1 版本。\n"
+"你希望用 ${VERSION} 版本覆盖它吗？"
 
 msgctxt "T_FoundExistingOldVersion"
 msgid ""
 "An old version $R1 has already been installed.  It is strongly recommended "
 "to deinstall previous versions on major upgrades.\n"
 "Do you want to continue installing Gpg4win ${VERSION} anyway?"
 msgstr ""
 "旧版本 $R1 已被安装。我们强烈建议在重大升级时先卸载旧版。\n"
-"你无论如何都要继续安装 Gpg4win ${VERSION} 吗？"
+"你仍然要继续安装 Gpg4win ${VERSION} 吗？"
 
 msgctxt "T_UninstallingOldVersion"
 msgid "Uninstalling Gpg4win-"
-msgstr ""
+msgstr "正在卸载 Gpg4win-"
 
 msgctxt "T_FoundOldSeeManual"
 msgid ""
 "Please see the Gpg4win user manual to learn how to migrate existing keys "
 "from other GnuPG based installations to Gpg4win."
 msgstr "请参考 Gpg4win 用户手册来获取从其他基于 GnuPG 的安装导入密钥的方法。"
 
 msgctxt "T_FoundOldGnuPP"
 msgid ""
 "An old installation of GnuPP (GNU Privacy Project) has been detected.  That "
 "software is not maintained anymore and thus should be removed.\n"
 "\n"
 "Do you want to continue installing Gpg4win and take care of the old "
 "installation later?"
 msgstr ""
 "老程序 GnuPP (GNU Privacy Project) 已被安装。此软件已不被维护，应该移除。\n"
 "\n"
 "你希望继续安装 Gpg4win，过会再来处理这个老程序吗？"
 
 msgctxt "T_FoundOldGnuPT"
 msgid ""
 "An installation of GnuPT has been detected.  This may cause problems when "
 "used along with Gpg4win.\n"
 "\n"
 "Do you want to continue installing Gpg4win?"
 msgstr ""
 "GnuPT 已被安装，可能和 Gpg4win 互相干扰。\n"
 "\n"
 "你确定要继续安装 Gpg4win 吗？"
 
 msgctxt "T_FoundOldWinPTSF"
 msgid ""
 "An old installation of the Sourceforge hosted WinPT has been detected.  That "
 "software is not maintained anymore and should be removed.\n"
 "\n"
 "Do you want to continue installing Gpg4win and take care of the old "
 "installation later?"
 msgstr ""
 "SourceForge 上的旧版 WinPT 已被安装。此软件已不被维护，应该移除。\n"
 "\n"
 "你希望继续安装 Gpg4win，过会再来处理这个老程序吗？"
 
 msgctxt "T_FoundOldGnuPack"
 msgid ""
 "An installation of GnuPG-Pack has been detected. You need to uninstall it "
 "before you can continue with Gpg4win installation.\n"
 "\n"
 "The installation will be aborted now!"
 msgstr ""
 "GnuPG-Pack 已被安装。你要先卸载它才能继续安装 Gpg4win。\n"
 "\n"
 "安装将立刻停止！"
 
 msgctxt "T_BetaWarning"
 msgid ""
 "Note: This is a BETA version of Gpg4win.\n"
 "\n"
 "Beta versions are only intended for testing and shall not be used in a "
 "production environment."
 msgstr ""
 "提示：此版本 Gpg4win 是 BETA 版。\n"
 "\n"
 "Beta 版本用于测试，不应在生产环境使用。"
 
 msgctxt "T_AdminWanted"
 msgid ""
 "Warning: It is recommended to install Gpg4win system-wide with administrator "
 "rights.\n"
 "\n"
 "Do you want to continue installing Gpg4win without administrator rights?"
 msgstr ""
+"警告：建议在系统范围内安装具有管理员权限的 Gpg4win。\n"
+"\n"
+"是否要在没有管理员权限的情况下继续安装 Gpg4win？"
 
 msgctxt "T_CloseOtherApps"
 msgid ""
 "Please make sure that other applications are not running. In particular you "
 "should close Outlook and all Explorer windows.  Gpg4win will try to install "
 "anyway but a reboot will be required then."
 msgstr ""
 "请确保其他程序，尤其是 Outlook 和 Windows 资源管理器窗口，已经关闭。Gpg4win "
-"无论如何都会继续尝试安装，但不关闭的话系统稍后将需要重启。"
+"仍然会继续尝试安装，但不关闭的话系统稍后将需要重启。"
 
 msgctxt "T_ShuttingDownWinPT"
 msgid "Trying to shutdown a possible running instance of WinPT."
 msgstr "尝试停止一个可能运行着的 WinPT 实例。"
 
 msgctxt "T_FoundOldClaws"
 msgid ""
 "An old version of Claws Mail was found in your Installation directory.\n"
 "Please note that Claws Mail is no longer bundled with Gpg4win and is now "
 "available as a standalone package.\n"
 "You should uninstall Claws Mail now, and if you wish to continue to use it, "
 "install an up-to-date version from:\n"
 "http://www.claws-mail.org/win32\n"
 "\n"
 "Uninstall Claws Mail from Gpg4win now?"
 msgstr ""
+"在您的安装目录中发现了旧版本的 Claws Mail。\n"
+"请注意，Claws Mail 不再与 Gpg4win 捆绑，现作为一个独立的软件提供。\n"
+"您需要先卸载此 Claws Mail，如果要继续使用，请从以下位置安装最新版本：\n"
+"http://www.claws-mail.org/win32\n"
+"\n"
+"是否立即卸载 Claws Mail 以安装 Gpg4win？"
 
 msgctxt "T_WinisDeprecated"
 msgid ""
 "Windows Versions before Windows 7 are no longer maintained by Gpg4win.\n"
 "Support for them may be removed in a future version.\n"
 "\n"
 "Kleopatra is disabled."
 msgstr ""
+"Gpg4win 不再维护 Windows 7 之前的 Windows 版本。\n"
+"且在将来的版本中可能会移除对它们的支持。\n"
+"\n"
+"Kleopatra 已禁用。"
 
 msgctxt "T_UPDATE_STR"
 msgid "Updating Version"
-msgstr ""
+msgstr "正在升级版本"
 
 msgctxt "T_Installing_GnuPG"
 msgid "Installing GnuPG"
-msgstr ""
+msgstr "正在安装 GnuPG"
 
-#, fuzzy
 msgctxt "DESC_SEC_gnupg_w32"
 msgid "GNU Privacy Guard"
-msgstr "GNU 隐私卫士"
+msgstr "GNU 隐私卫士 (GPG)"
 
 msgctxt "T_Gpg_Install_failed"
 msgid ""
 "Failed to install GnuPG.\n"
 "Gpg4win will not work properly without GnuPG.\n"
 "Please download and install the simple installer for GnuPG from:\n"
 "\n"
 "https://gnupg.org/download"
 msgstr ""
+"无法安装 GnuPG。\n"
+"没有 GnuPG ，Gpg4win 将无法正常工作。\n"
+"请从以下位置下载并安装 GnuPG 程序：\n"
+"\n"
+"https://gnupg.org/download"
 
 msgctxt "DESC_SEC_gpa"
 msgid "GNU Privacy Assistant"
-msgstr "GNU 隐私助理"
+msgstr "GNU 隐私助理 (GPA)"
 
 msgctxt "DESC_Menu_gpa"
 msgid "Run the GNU Privacy Assistant key management tool."
 msgstr "运行 GNU 隐私助理密钥管理工具。"
 
 msgctxt "DESC_Menu_gpg4win_readme"
 msgid "General information on Gpg4win"
 msgstr "Gpg4win 基本信息"
 
 msgctxt "DESC_Menu_gpg4win_howtosmime"
 msgid "Instruction to configure S/MIME"
 msgstr "S/MIME 配置指南"
 
 msgctxt "DESC_Menu_gnupg_faq"
 msgid "Show the Frequently Asked Questions document for GnuPG"
-msgstr "显示 GnuPG 的 FAQ 文档"
+msgstr "显示 GnuPG 的 FAQ 问答文档"
 
 msgctxt "T_GpgEX_RegFailed"
 msgid "Warning: Registration of the GpgEX plugin failed."
 msgstr "警告：GpgEX 插件注册失败。"
 
 msgctxt "DESC_SEC_gpgex"
 msgid "GnuPG Shell Extension"
-msgstr "GnuPG 壳拓展"
+msgstr "GnuPG Shell拓展"
 
 msgctxt "T_GpgOL_RegFailed"
 msgid "Warning: Registration of the GpgOL Outlook plugin failed."
 msgstr "警告：GpgOL Outlook 插件注册失败。"
 
 # Better if as-is.
 msgctxt "DESC_SEC_gpgol"
 msgid "GnuPG for Outlook"
-msgstr ""
+msgstr "Outlook 的 GnuPG"
 
 msgctxt "DESC_SEC_gpgme_browser"
 msgid ""
 "Register GnuPG as native messaging service e.g. for the Mailvelope extension."
-msgstr ""
+msgstr "将 GnuPG 注册为本机消息服务，用于例如 MailDevelope 扩展。"
 
 msgctxt "DESC_SEC_kleopatra"
 msgid "Keymanager for OpenPGP and X.509 and common crypto dialogs."
-msgstr "OpenPGP 和 X.509 密钥管理器和常用加解密窗口。"
+msgstr "OpenPGP 和 X.509 密钥管理器和通用加解密窗口。"
 
 msgctxt "DESC_Menu_kleopatra"
 msgid "Run the Kleopatra key management tool."
 msgstr "运行 Kleopatra 密钥管理工具。"
 
 msgctxt "T_File_Type_gpg_Name"
 msgid "OpenPGP Binary File"
-msgstr ""
+msgstr "OpenPGP 二进制文件"
 
 msgctxt "T_File_Type_asc_Name"
 msgid "OpenPGP Text File"
-msgstr ""
+msgstr "OpenPGP 文本文件"
 
 msgctxt "T_File_Type_sig_Name"
 msgid "OpenPGP Signature"
-msgstr ""
+msgstr "OpenPGP 签名"
 
 msgctxt "T_File_Type_pgp_key_Name"
 msgid "OpenPGP Certificate File"
-msgstr ""
+msgstr "OpenPGP 证书文件"
 
 msgctxt "T_File_Type_pem_Name"
 msgid "CMS (S/MIME) File"
-msgstr ""
+msgstr "CMS (S/MIME) 文件"
 
 msgctxt "T_File_Type_x509_Name"
 msgid "X509 Certificate File"
-msgstr ""
+msgstr "X.509 证书文件"
 
 msgctxt "T_File_Type_x509_info_tip"
 msgid "Certificate for CMS (S/MIME)."
-msgstr ""
+msgstr "CMS (S/MIME) 证书。"
 
 msgctxt "T_File_Type_info_tip"
 msgid "This can be encrypted data, a signature or a certificate."
-msgstr ""
+msgstr "这可能是加密数据、签名或证书。"
 
 msgctxt "T_File_Type_sig_info_tip"
 msgid "A cryptographic signature to verify the authenticity of another file."
-msgstr ""
+msgstr "验证另一个文件真实性的加密签名。"
 
 msgctxt "T_File_Type_pgp_key_info_tip"
 msgid "Certificate for OpenPGP."
-msgstr ""
+msgstr "OpenPGP 证书。"
 
 #~ msgctxt "T_MoreInfo"
 #~ msgid "Click here for the project's homepage"
 #~ msgstr "点击此处访问项目首页"
 
 #~ msgctxt "DESC_Name_compendium"
 #~ msgid "Gpg4win Compendium"
 #~ msgstr "Gpg4win 使用纲要"
 
 #~ msgctxt "DESC_SEC_compendium"
 #~ msgid "The Gpg4win documentation (English and German)"
 #~ msgstr "Gpg4win 文档（英语和德语）"
 
 #~ msgctxt "DESC_Name_compendium_de_pdf"
 #~ msgid "Gpg4win Compendium (pdf, German)"
 #~ msgstr "Gpg4win 使用纲要（PDF，德语）"
 
 #~ msgctxt "DESC_Name_compendium_en_pdf"
 #~ msgid "Gpg4win Compendium (pdf, English)"
 #~ msgstr "Gpg4win 使用纲要（PDF，英语）"
 
 #~ msgctxt "DESC_Name_compendium_de_html"
 #~ msgid "Gpg4win Compendium (html, German)"
 #~ msgstr "Gpg4win 使用纲要（HTML，德语）"
 
 #~ msgctxt "DESC_Name_compendium_en_html"
 #~ msgid "Gpg4win Compendium (html, English)"
 #~ msgstr "Gpg4win 使用纲要（HTML，英语）"
 
 #~ msgctxt "DESC_Menu_compendium_de_pdf"
 #~ msgid "Show the Gpg4win Compendium (pdf, German)"
 #~ msgstr "显示 Gpg4win 使用纲要（PDF，德语）"
 
 #~ msgctxt "DESC_Menu_compendium_en_pdf"
 #~ msgid "Show the Gpg4win Compendium (pdf, English)"
 #~ msgstr "显示 Gpg4win 使用纲要（PDF，英语）"
 
 #~ msgctxt "T_AdminNeeded"
 #~ msgid ""
 #~ "Warning: Administrator permissions required for a successful installation"
 #~ msgstr "警告：需要管理员权限才能成功安装。"
 
 #~ msgctxt "T_RunKeyManager"
 #~ msgid "Run the key manager"
 #~ msgstr "运行密钥管理器"
 
 #~ msgctxt "T_FoundExistingVersionB"
 #~ msgid ""
 #~ "A version of Gpg4Win has already been installed on the system. There will "
 #~ "be no problem installing and thus overwriting this Version.\n"
 #~ "\n"
 #~ "Do you want to continue installing Gpg4win?"
 #~ msgstr ""
 #~ "一个版本的 Gpg4Win 已经在此系统上安装。继续覆盖安装那个版本不会有任何问"
 #~ "题。\n"
 #~ "\n"
 #~ "你想要继续安装 Gpg4win 吗？"
 
 #~ msgctxt "T_ShuttingDownDirMngr"
 #~ msgid "Trying to shutdown a possible running instance of DirMngr."
 #~ msgstr "尝试停止一个可能运行着的 DirMngr 实例。"
 
 #~ msgctxt "T_SetDefaultClient"
 #~ msgid "Do you want to make Claws Mail your default mail client?"
 #~ msgstr "你想把 Claws Mail 设置为你的默认邮件客户端吗？"
 
 #~ msgctxt "DESC_Menu_claws_mail"
 #~ msgid "Run the Claws mailprogram."
 #~ msgstr "运行 Claws Mail 程序。"
 
 #~ msgctxt "DESC_Menu_claws_mail_pdf"
 #~ msgid "Show the online manual of Claws Mail"
 #~ msgstr "显示 Claws Mail 在线手册。"
diff --git a/src/inst-gpg4win.nsi b/src/inst-gpg4win.nsi
index 7510b3d6..6b2175d3 100644
--- a/src/inst-gpg4win.nsi
+++ b/src/inst-gpg4win.nsi
@@ -1,147 +1,147 @@
 # inst-gpg4win.nsi - Hidden section for common files. -*- coding: latin-1; -*-
 # Copyright (C) 2006 g10 Code GmbH
 #
 # This file is part of GPG4Win.
 #
 # GPG4Win is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version.
 #
 # GPG4Win is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 
 
 # This is the very first section installed.
 Section "-gpg4win" SEC_gpg4win
 !ifdef SOURCES
   SetOutPath "$INSTDIR"
   File "${BUILD_DIR}/../gpg4win-${VERSION}.tar.bz2"
 !else
   Call KillOtherAppsOrWarn
   StrCpy $is_update "0"
 
 # BEGIN MSI IGNORE
 #  For MSI we ignore this.
 
 # Start the slideshow.
   SetDetailsPrint none
 
   SetOutPath "$PLUGINSDIR\Slides"
   File "${BUILD_DIR}/slideshow/slide1-gpgol.png"
   File "${BUILD_DIR}/slideshow/slide2-gpgex.png"
   #File "${BUILD_DIR}/slideshow/slide3-kleopatra.png"
   File "${BUILD_DIR}/slideshow/slide4-summary.png"
   File "${BUILD_DIR}/slideshow/slides.dat"
   g4wihelp::slide_show /NOUNLOAD /CCOLOR=0x000000 "/auto=$PLUGINSDIR\Slides\slides.dat" /FIT=WIDTH
   SetDetailsPrint both
   SetOutPath "$INSTDIR"
 # END MSI IGNORE
 
 # Uninstall an old version if found.
   ClearErrors
   ReadRegStr $0 SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\GPG4Win" "DisplayVersion"
   IfErrors skip_uninst 0
   StrCmp $0 "" skip_uninst
   DetailPrint  "$(T_UninstallingOldVersion)$0"
   ReadRegStr $0 SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\GPG4Win" "UninstallString"
   IfErrors skip_uninst 0
   ReadRegStr $1 SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\GPG4Win" "InstallLocation"
   IfErrors skip_uninst 0
 
   ExecWait '$0 /S /UPDATE=1 _?=$1'
 # Deleting here does not work?
   StrCpy $is_update "1"
   Delete /REBOOTOK "$1\gpg4win-uninstall.exe"
   RmDir "$1"
   SetOutPath "$INSTDIR\share\gpg4win"
 
 skip_uninst:
   SetOutPath "$INSTDIR\share\gpg4win"
 
   File "${BUILD_DIR}/README.en.txt"
   File "${BUILD_DIR}/README.de.txt"
 # BEGIN MSI IGNORE
   File /oname=README.ar.txt "${BUILD_DIR}/README.en.txt"
   File /oname=README.cz.txt "${BUILD_DIR}/README.en.txt"
   File /oname=README.es.txt "${BUILD_DIR}/README.en.txt"
   File /oname=README.fr.txt "${BUILD_DIR}/README.en.txt"
   File /oname=README.it.txt "${BUILD_DIR}/README.en.txt"
   File /oname=README.no.txt "${BUILD_DIR}/README.en.txt"
   File /oname=README.pt.txt "${BUILD_DIR}/README.en.txt"
   File /oname=README.ru.txt "${BUILD_DIR}/README.en.txt"
-  File /oname=README.zh_CN.txt "${BUILD_DIR}/README.en.txt"
-  File /oname=README.zh_TW.txt "${BUILD_DIR}/README.en.txt"
+  File /oname=README.zh_CN.txt "${BUILD_DIR}/README.zh.txt"
+  File /oname=README.zh_TW.txt "${BUILD_DIR}/README.zh.txt"
 # END MSI IGNORE
 
   File "${BUILD_DIR}/HOWTO-SMIME.en.txt"
   File "${BUILD_DIR}/HOWTO-SMIME.de.txt"
 
   File "${BUILD_DIR}/versioninfo.txt"
 
   # Write a version file.
   DetailPrint "Opening VERSION file for writing"
   FileOpen $0 "$INSTDIR\VERSION" w
   FileWrite $0 "${PRETTY_PACKAGE}-${VERSION}$\r$\n"
   FileClose $0
   DetailPrint "VERSION closed"
 
 # BEGIN MSI IGNORE
 
   # Register the install directory for Gpg4win suite.
   WriteRegStr SHCTX "Software\Gpg4win" "Install Directory" $INSTDIR
   DetailPrint "Saved install directory in the registry"
 
 # END MSI IGNORE
 
   # We used to determine the language using a Registry entry.
   # Although we don't want to delete the user's Lang Registry Setting
   # because he might have have selected a different language than his
   # default.  We delete the global Lang of the installation.
   DeleteRegValue SHCTX "Software\GNU\GnuPG" "Lang"
   DetailPrint "Deleted obsolete Lang entry"
 
   # This old key is required for GPGee.  Please do not use in new
   # applications.
   # Note: We don't use it anymore so that gpgme decides what gpg to use
   #       For the new gpg4win we actually use gpg2.exe.
   #       To cope with old installations we actually remove this value.
   #       However we can only remove the SHCTX version not those set by
   #       the user under HKCU.
   #WriteRegStr SHCTX "Software\GNU\GnuPG" "gpgProgram" "$INSTDIR\gpg.exe"
   DeleteRegValue SHCTX "Software\GNU\GnuPG" "gpgProgram"
   DetailPrint "Deleted obsolete gpgProgram value"
 
   # Install gpg4win included tools
   SetOutPath "$INSTDIR\bin"
   File "${BUILD_DIR}/sha1sum.exe"
   SetOutPath "$INSTDIR\bin"
   File "${BUILD_DIR}/sha256sum.exe"
   File "${BUILD_DIR}/md5sum.exe"
   File "${BUILD_DIR}/mkportable.exe"
 
   # Install the mingw32 runtime libraries.  They are stored in the
   # build directory with a different suffix, so that makensis does not
   # list symbol names.
   File /oname=libstdc++-6.dll     "${BUILD_DIR}/libstdc++-6.dll-x"
   File /oname=libgcc_s_sjlj-1.dll "${BUILD_DIR}/libgcc_s_sjlj-1.dll-x"
   File /oname=libwinpthread-1.dll "${BUILD_DIR}/libwinpthread-1.dll-x"
 
 !endif
 
 SectionEnd
 
 LangString DESC_Menu_gpg4win_readme ${LANG_ENGLISH} \
    "General information on Gpg4win"
 
 LangString DESC_Menu_gpg4win_howtosmime ${LANG_ENGLISH} \
    "Instruction to configure S/MIME"
 
 LangString DESC_Menu_gnupg_faq ${LANG_ENGLISH} \
    "Show the Frequently Asked Questions document for GnuPG"