[setup - the official Cygwin setup program] branch master, updated. release_2.925-6-g2727119a

[setup - the official Cygwin setup program] branch master, updated. release_2.925-6-g2727119a

[Jon Turney]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain, Size: 15152 bytes --]




https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/setup.git;h=2727119a05e25540eda061c3a7c0607d99ecd83c

commit 2727119a05e25540eda061c3a7c0607d99ecd83c
Author: Xiang Heng Wei <yylteam@hotmail.com>
Date:   Sat Dec 3 12:12:23 2022 +0100

    Translated using Weblate (Chinese (Simplified))
    
    Currently translated at 100.0% (284 of 284 strings)
    
    Translation: cygwin-setup/cygwin-setup
    Translate-URL: https://hosted.weblate.org/projects/cygwin-setup/cygwin-setup/zh_Hans/


Diff:
---
 po/zh_Hans/res.po  | 120 +++++++++++++++++++++++++++++------------------------
 res/zh_Hans/res.rc |   2 +-
 2 files changed, 67 insertions(+), 55 deletions(-)

diff --git a/po/zh_Hans/res.po b/po/zh_Hans/res.po
index dd310f18..b927fea6 100644
--- a/po/zh_Hans/res.po
+++ b/po/zh_Hans/res.po
@@ -67,16 +67,18 @@ msgstr "选择是否在安装时禁用病毒扫描程序。"
 msgid ""
 "Some Antivirus programs, notably McAfee, cause a blue screen on Windows XP "
 "computers during installation of Cygwin."
-msgstr "某些防病毒程序（尤其是 McAfee）会在安装 Cygwin 期间导致 Windows XP "
-"计算机出现蓝屏。"
+msgstr ""
+"某些防病毒程序（尤其是 McAfee）会在安装 Cygwin 期间导致 Windows XP 计算机出现"
+"蓝屏。"
 
 #: DIALOG.IDD_VIRUS.LTEXT.IDC_STATIC
 msgid ""
 "One that may be a problem has been detected. Cygwin setup can disable this "
 "during the installation process, and re-enable it when the install is "
 "complete."
-msgstr "已检测到一个可能存在的问题。 Cygwin "
-"安装程序可以在安装过程中禁用它，并在安装完成后重新启用它。"
+msgstr ""
+"已检测到一个可能存在的问题。 Cygwin 安装程序可以在安装过程中禁用它，并在安装"
+"完成后重新启用它。"
 
 #: DIALOG.IDD_LOCAL_DIR.CAPTION
 msgid "Cygwin Setup - Select Local Package Directory"
@@ -90,8 +92,9 @@ msgstr "选择本地软件包目录"
 msgid ""
 "Select a directory where you want Setup to store the installation files it "
 "downloads.  The directory will be created if it does not already exist."
-msgstr "选择希望安装程序存储其下载的安装文件的目录。 "
-"如果该目录尚不存在，则将创建该目录。"
+msgstr ""
+"选择希望安装程序存储其下载的安装文件的目录。 如果该目录尚不存在，则将创建该目"
+"录。"
 
 #: DIALOG.IDD_LOCAL_DIR.LTEXT.IDC_LOCAL_DIR_INSTALL_DESC
 msgid ""
@@ -215,8 +218,7 @@ msgid "Select Your Internet Connection"
 msgstr "选择您的互联网连接"
 
 #: DIALOG.IDD_INSTATUS.CAPTION
-msgctxt "DIALOG.IDD_INSTATUS.CAPTION"
-"DIALOG.IDD_INSTATUS.CAPTION"
+msgctxt "DIALOG.IDD_INSTATUS.CAPTIONDIALOG.IDD_INSTATUS.CAPTION"
 msgid "Cygwin Setup"
 msgstr "Cygwin 安装程序"
 
@@ -234,8 +236,9 @@ msgid "(FILE)"
 msgstr "（文件）"
 
 #: DIALOG.IDD_INSTATUS.CONTROL.IDC_INS_DISKFULL
-msgctxt "DIALOG.IDD_INSTATUS.CONTROL.IDC_INS_DISKFULL"
-"DIALOG.IDD_INSTATUS.CONTROL.IDC_INS_DISKFULL"
+msgctxt ""
+"DIALOG.IDD_INSTATUS.CONTROL.IDC_INS_DISKFULLDIALOG.IDD_INSTATUS.CONTROL."
+"IDC_INS_DISKFULL"
 msgid "Progress1"
 msgstr "进度一"
 
@@ -279,8 +282,8 @@ msgid "Proxy &User ID"
 msgstr "代理用户 ID(&U)"
 
 #: DIALOG.IDD_PROXY_AUTH.LTEXT.IDC_STATIC
-msgctxt "DIALOG.IDD_PROXY_AUTH.LTEXT.IDC_STATIC"
-"DIALOG.IDD_PROXY_AUTH.LTEXT.IDC_STATIC"
+msgctxt ""
+"DIALOG.IDD_PROXY_AUTH.LTEXT.IDC_STATICDIALOG.IDD_PROXY_AUTH.LTEXT.IDC_STATIC"
 msgid "&Password"
 msgstr "密码(&P)"
 
@@ -289,15 +292,16 @@ msgid "Proxy Authorization Required"
 msgstr "需要代理授权"
 
 #: DIALOG.IDD_PROXY_AUTH.DEFPUSHBUTTON.IDOK
-msgctxt "DIALOG.IDD_PROXY_AUTH.DEFPUSHBUTTON.IDOK"
-"DIALOG.IDD_PROXY_AUTH.DEFPUSHBUTTON.IDOK"
+msgctxt ""
+"DIALOG.IDD_PROXY_AUTH.DEFPUSHBUTTON.IDOKDIALOG.IDD_PROXY_AUTH.DEFPUSHBUTTON."
+"IDOK"
 msgid "&OK"
 msgstr "确定(&O)"
 
 #: DIALOG.IDD_PROXY_AUTH.PUSHBUTTON.IDCANCEL
-msgctxt "DIALOG.IDD_PROXY_AUTH.PUSHBUTTON.IDCANCEL"
-"DIALOG.IDD_PROXY_AUTH.PUSHBUTTON.IDCANCEL"
-"DIALOG.IDD_PROXY_AUTH.PUSHBUTTON.IDCANCEL"
+msgctxt ""
+"DIALOG.IDD_PROXY_AUTH.PUSHBUTTON.IDCANCELDIALOG.IDD_PROXY_AUTH.PUSHBUTTON."
+"IDCANCELDIALOG.IDD_PROXY_AUTH.PUSHBUTTON.IDCANCEL"
 msgid "Cancel"
 msgstr "取消"
 
@@ -350,14 +354,13 @@ msgid ""
 "You can always run this program at any time in the future to add, remove, or "
 "upgrade packages as necessary."
 msgstr ""
-"此安装程序用于 Cygwin "
-"环境的初始安装以及所有后续更新。以下页面将指导您完成安装。\n"
+"此安装程序用于 Cygwin 环境的初始安装以及所有后续更新。以下页面将指导您完成安"
+"装。\n"
 "\n"
-"请注意，默认情况下，我们只安装一组基本的软件包。Cygwin "
-"提供了大量涵盖各种用途的软件包。\n"
+"请注意，默认情况下，我们只安装一组基本的软件包。Cygwin 提供了大量涵盖各种用途"
+"的软件包。\n"
 "\n"
 "您将来可以随时运行此程序，以根据需要添加、删除或升级软件包。\n"
-"\n"
 
 #: DIALOG.IDD_DESKTOP.CAPTION
 msgid "Cygwin Setup - Installation Status and Create Icons"
@@ -512,12 +515,12 @@ msgstr "警告："
 #: DIALOG.IDD_DROPPED.LTEXT.IDC_STATIC
 msgid ""
 "One or more mirrors you have selected is/are not on the list of official "
-"Cygwin mirrors any more. It/They may be out of date or missing some packages."
-"\n"
+"Cygwin mirrors any more. It/They may be out of date or missing some "
+"packages.\n"
 "This affects the following mirror(s):"
 msgstr ""
-"您选择的一个或多个镜像不再在官方 Cygwin "
-"镜像列表中。它/它们可能已过时或缺少某些软件包。\n"
+"您选择的一个或多个镜像不再在官方 Cygwin 镜像列表中。它/它们可能已过时或缺少某"
+"些软件包。\n"
 "这会影响以下镜像："
 
 #: DIALOG.IDD_DROPPED.LTEXT.IDC_STATIC
@@ -556,8 +559,9 @@ msgid ""
 "Select 'Retry' to retry the download, 'Back' to return to the package "
 "selection page, 'Continue' to go on anyway (NOT RECOMMENDED), or 'Cancel' to "
 "exit."
-msgstr "选择“重试”以重试下载，“返回”以返回软件包选择页面，“继续”以继续（不推荐），或“"
-"取消”以退出。"
+msgstr ""
+"选择“重试”以重试下载，“返回”以返回软件包选择页面，“继续”以继续（不推荐），"
+"或“取消”以退出。"
 
 #: DIALOG.IDD_DOWNLOAD_ERROR.DEFPUSHBUTTON.IDRETRY
 msgctxt "DIALOG.IDD_DOWNLOAD_ERROR.DEFPUSHBUTTON.IDRETRY"
@@ -590,8 +594,9 @@ msgstr "安装后操作错误"
 msgid ""
 "These do not necessarily mean that affected packages will fail to function "
 "properly, but please check /var/log/setup.log.full and report any problems."
-msgstr "这些并不一定意味着受影响的软件包将无法正常运行，但请检查 /var/log/"
-"setup.log.full 并报告任何问题。"
+msgstr ""
+"这些并不一定意味着受影响的软件包将无法正常运行，但请检查 /var/log/setup.log."
+"full 并报告任何问题。"
 
 #: DIALOG.IDD_FILE_INUSE.CAPTION
 msgid "In-use file detected"
@@ -610,14 +615,16 @@ msgstr "以下进程正在使用该文件："
 msgid ""
 "Select 'Retry' to retry, select 'Stop' to stop processes and retry, or "
 "select 'Continue' to go on anyway (the file will be updated after a reboot)."
-msgstr "选择“重试”以重试，选择“结束”以停止进程并重试，或选择“继续”以继续（文件将在重"
+msgstr ""
+"选择“重试”以重试，选择“结束”以停止进程并重试，或选择“继续”以继续（文件将在重"
 "启后更新）。"
 
 #: DIALOG.IDD_FILE_INUSE.LTEXT.IDC_FILE_INUSE_HELP_1
 msgid ""
 "Select 'Retry' to retry, select 'Kill' to kill processes and retry, or "
 "select 'Continue' to go on anyway (the file will be updated after a reboot)."
-msgstr "选择“重试”以重试，选择“终止”以终止进程并重试，或选择“继续”以继续（文件将在重"
+msgstr ""
+"选择“重试”以重试，选择“终止”以终止进程并重试，或选择“继续”以继续（文件将在重"
 "新启动后更新）。"
 
 #: DIALOG.IDD_FILE_INUSE.LTEXT.IDC_FILE_INUSE_HELP_2
@@ -625,7 +632,8 @@ msgid ""
 "Select 'Retry' to retry, select 'Kill' to forcibly kill all processes and "
 "retry, or select 'Continue' to go on anyway (the file will be updated after "
 "a reboot)."
-msgstr "选择“重试”以重试，选择“终止”以强制终止所有进程并重试，或选择“继续”以继续（文"
+msgstr ""
+"选择“重试”以重试，选择“终止”以强制终止所有进程并重试，或选择“继续”以继续（文"
 "件将在重启后更新）。"
 
 #: DIALOG.IDD_FILE_INUSE.PUSHBUTTON.IDIGNORE
@@ -647,8 +655,9 @@ msgid ""
 "Warning: we recommend you do not use the root of your hard drive as the "
 "cygwin root, to prevent possible conflicts with other programs.  Proceed "
 "anyway?"
-msgstr "警告：我们强烈建议您不要将硬盘驱动器的根目录用作 cygwin "
-"根目录，以防止与其他程序发生冲突。是否继续？"
+msgstr ""
+"警告：我们强烈建议您不要将硬盘驱动器的根目录用作 cygwin 根目录，以防止与其他"
+"程序发生冲突。是否继续？"
 
 #: STRINGTABLE.IDS_ROOT_SPACE
 msgid ""
@@ -682,8 +691,9 @@ msgstr "安装完成"
 msgid ""
 "In-use files have been replaced. You need to reboot as soon as possible to "
 "activate the new versions. Cygwin may operate incorrectly until you reboot."
-msgstr "正在使用的文件已被替换。您需要尽快重新启动才能激活新版本。Cygwin "
-"可能会错误地运行，直到您重新启动。"
+msgstr ""
+"正在使用的文件已被替换。您需要尽快重新启动才能激活新版本。Cygwin 可能会错误地"
+"运行，直到您重新启动。"
 
 #: STRINGTABLE.IDS_ERR_OPEN_READ
 msgid "Can't open %s for reading: %s"
@@ -781,8 +791,9 @@ msgstr ""
 msgid ""
 "Sets all packages to their currently installed version.  This is equivalent "
 "to telling setup not to make any changes to any package."
-msgstr "将所有软件包设置为其当前安装的版本。 "
-"这相当于告诉安装程序不要对任何软件包进行任何更改。"
+msgstr ""
+"将所有软件包设置为其当前安装的版本。 这相当于告诉安装程序不要对任何软件包进行"
+"任何更改。"
 
 #: STRINGTABLE.IDS_TRUSTCURR_TOOLTIP
 msgid "Sets all packages to the best version available (RECOMMENDED)."
@@ -839,11 +850,11 @@ msgstr ""
 "\n"
 "已选择：显示已选择的已安装包，但未作为依赖项安装。\n"
 "\n"
-"可卸载的：显示已选择且可以安全删除的已安装软件包。 "
-"没有其他已安装或选定的软件包依赖于这些软件包。\n"
+"可卸载的：显示已选择且可以安全删除的已安装软件包。 没有其他已安装或选定的软件"
+"包依赖于这些软件包。\n"
 "\n"
-"不需要的：显示现在可以安全删除的自动安装的软件包。 "
-"其他已安装或选定的软件包不再依赖于这些软件包。"
+"不需要的：显示现在可以安全删除的自动安装的软件包。 其他已安装或选定的软件包不"
+"再依赖于这些软件包。"
 
 #: STRINGTABLE.IDS_HIDEOBS_TOOLTIP
 msgid ""
@@ -851,7 +862,8 @@ msgid ""
 "with '_'.  Such packages are usually empty placeholders for packages that "
 "have been removed or renamed, or are infrastructure packages that are "
 "handled automatically."
-msgstr "如果选中，安装程序将隐藏名称以“_”开头的类别中的软件包。 此类软件包通常是已删"
+msgstr ""
+"如果选中，安装程序将隐藏名称以“_”开头的类别中的软件包。 此类软件包通常是已删"
 "除或重命名的软件包的空占位符，或者是自动处理的基础结构软件包。"
 
 #: STRINGTABLE.IDS_SIG_INVALID
@@ -1069,15 +1081,15 @@ msgid ""
 "\n"
 "The file is in use or some other error occurred.\n"
 "\n"
-"Please stop all Cygwin processes and select \"\"Retry\"\", or select \""
-"\"Continue\"\" to go on anyway (the file will be updated after a reboot).\n"
+"Please stop all Cygwin processes and select \"\"Retry\"\", or select "
+"\"\"Continue\"\" to go on anyway (the file will be updated after a reboot).\n"
 msgstr ""
 "无法解压缩 /%s -- 写入文件时出错\n"
 "\n"
 "文件正在使用中或发生了其他错误。\n"
 "\n"
-"请停止所有 Cygwin "
-"进程并选择“重试”，或选择“继续”以继续（文件将在重新启动后更新）。\n"
+"请停止所有 Cygwin 进程并选择“重试”，或选择“继续”以继续（文件将在重新启动后更"
+"新）。\n"
 
 #: STRINGTABLE.IDS_INSTALL_OLD_CYGWIN
 msgid ""
@@ -1160,11 +1172,11 @@ msgid ""
 msgstr ""
 "目标 CPU 不匹配\n"
 "\n"
-"您正在尝试将 %s 位版本的 Cygwin 安装到包含 %s 位版本的 Cygwin 的目录中。 "
-"继续这样做会破坏现有安装。\n"
+"您正在尝试将 %s 位版本的 Cygwin 安装到包含 %s 位版本的 Cygwin 的目录中。 继续"
+"这样做会破坏现有安装。\n"
 "\n"
-"运行 setup-%s.exe 以更新 Cygwin 的现有 %s 位安装，或为 %s "
-"位安装选择其他目录。"
+"运行 setup-%s.exe 以更新 Cygwin 的现有 %s 位安装，或为 %s 位安装选择其他目"
+"录。"
 
 #: STRINGTABLE.IDS_GET_SITELIST_ERROR
 msgid ""
@@ -1334,8 +1346,8 @@ msgstr "本地软件包目录"
 
 #: STRINGTABLE.IDS_HELPTEXT_MIRROR_MODE
 msgid ""
-"Skip package availability check when installing from local directory ("
-"requires local directory to be clean mirror!)"
+"Skip package availability check when installing from local directory "
+"(requires local directory to be clean mirror!)"
 msgstr "从本地目录安装时跳过包可用性检查（要求本地目录是干净的镜像！）"
 
 #: STRINGTABLE.IDS_HELPTEXT_NO_ADMIN
diff --git a/res/zh_Hans/res.rc b/res/zh_Hans/res.rc
index aefae49b..2dbe3b31 100644
--- a/res/zh_Hans/res.rc
+++ b/res/zh_Hans/res.rc
@@ -168,7 +168,7 @@ CAPTION "Cygwin 安装程序"
 FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT           "Cygwin 网络版安装程序",IDC_STATIC_WELCOME_TITLE,115,1,195,24
-    LTEXT           "此安装程序用于 Cygwin 环境的初始安装以及所有后续更新。以下页面将指导您完成安装。\n\n请注意，默认情况下，我们只安装一组基本的软件包。Cygwin 提供了大量涵盖各种用途的软件包。\n\n您将来可以随时运行此程序，以根据需要添加、删除或升级软件包。\n\n",IDC_SPLASH_TEXT,115,25,195,90
+    LTEXT           "此安装程序用于 Cygwin 环境的初始安装以及所有后续更新。以下页面将指导您完成安装。\n\n请注意，默认情况下，我们只安装一组基本的软件包。Cygwin 提供了大量涵盖各种用途的软件包。\n\n您将来可以随时运行此程序，以根据需要添加、删除或升级软件包。\n",IDC_SPLASH_TEXT,115,25,195,90
     ICON            IDI_CYGWIN,IDC_SPLASH_ICON,4,6,0,0,SS_ICON | SS_REALSIZEIMAGE
     LTEXT           "",IDC_VERSION,115,127,195,10
     LTEXT           "",IDC_SPLASH_COPYR,115,140,195,8