From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2201) id 36B97385B515; Thu, 16 Nov 2023 14:22:46 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 36B97385B515 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1700144566; bh=dMi0yo/PcOguXWYbuFN7wHoyIP3g6KTcFKjlN2fvDA4=; h=To:Subject:Date:From:From; b=qf1b28ZligoKwhXd43Rhr9pMy03vDZlwG64+PZ1EsDa2ZaAwRvzPDMs5HC1pthdGZ Zry+F/lFU7lmfeVRrk55y0G3ln02h031mkHxTwzpK92PZVpDj3lM4vbAwe7VB2KilT R7NzyZydsirT7Ryl7izvEeOXu4UT/d6xNPa45Sn0= To: cygwin-apps-cvs@sourceware.org Subject: [setup - the official Cygwin setup program] branch master, updated. release_2.927-8-gb97ee0c2 X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: cfc01ee74bfb22caf25fdf97c590ecf0f934e1ed X-Git-Newrev: b97ee0c2c871bce3f72b6439c8aae6b12dfd8268 Message-Id: <20231116142246.36B97385B515@sourceware.org> Date: Thu, 16 Nov 2023 14:22:45 +0000 (GMT) From: Jon Turney List-Id: https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/setup.git;h=b97ee0c2c871bce3f72b6439c8aae6b12dfd8268 commit b97ee0c2c871bce3f72b6439c8aae6b12dfd8268 Author: Jon Turney Date: Wed Nov 15 16:50:05 2023 +0000 Do post-build steps in separate directories Do post-build steps in separate directories. This lets us keep the uncompressed executable around to upload separately, for when problems occur running the UPX compressed executable. (These steps are still missing any build avoidance, but hopefully that's not a big problem, as we generally only run them when making a release) https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/setup.git;h=fc033fabb3ff163fccf15e8bd31a316b39a26825 commit fc033fabb3ff163fccf15e8bd31a316b39a26825 Author: Jon Turney Date: Thu Nov 16 14:18:06 2023 +0000 Regenerate resources with updated translation https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/setup.git;h=2a6379c4163168ac5bb46868e0f20fbea338f764 commit 2a6379c4163168ac5bb46868e0f20fbea338f764 Author: Xiang Heng Wei Date: Mon Oct 30 14:30:38 2023 +0000 Translated using Weblate (Chinese (Simplified)) Currently translated at 100.0% (287 of 287 strings) Translation: cygwin-setup/cygwin-setup Translate-URL: https://hosted.weblate.org/projects/cygwin-setup/cygwin-setup/zh_Hans/ https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/setup.git;h=8bc458963046f22cee7c6530a667038375ae3978 commit 8bc458963046f22cee7c6530a667038375ae3978 Author: Xiang Heng Wei Date: Fri Oct 27 04:40:44 2023 +0000 Translated using Weblate (Chinese (Simplified)) Currently translated at 100.0% (287 of 287 strings) Translation: cygwin-setup/cygwin-setup Translate-URL: https://hosted.weblate.org/projects/cygwin-setup/cygwin-setup/zh_Hans/ https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/setup.git;h=4a88fee92188a9f2883347e1c8950638bdea6783 commit 4a88fee92188a9f2883347e1c8950638bdea6783 Author: Xiang Heng Wei Date: Wed Oct 25 14:33:54 2023 +0000 Translated using Weblate (Chinese (Simplified)) Currently translated at 100.0% (287 of 287 strings) Translation: cygwin-setup/cygwin-setup Translate-URL: https://hosted.weblate.org/projects/cygwin-setup/cygwin-setup/zh_Hans/ https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/setup.git;h=ba0a425421f22ce17c9ec493070a0f8f96d99211 commit ba0a425421f22ce17c9ec493070a0f8f96d99211 Author: Oğuz Ersen Date: Sat Oct 14 10:06:35 2023 +0000 Translated using Weblate (Turkish) Currently translated at 100.0% (287 of 287 strings) Translation: cygwin-setup/cygwin-setup Translate-URL: https://hosted.weblate.org/projects/cygwin-setup/cygwin-setup/tr/ https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/setup.git;h=6203a83a5fc873b6418081f6b4141408432892a8 commit 6203a83a5fc873b6418081f6b4141408432892a8 Author: Hosted Weblate Date: Thu Oct 12 23:01:36 2023 +0200 Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Translation: cygwin-setup/cygwin-setup Translate-URL: https://hosted.weblate.org/projects/cygwin-setup/cygwin-setup/ https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/setup.git;h=2ed8c970242a94b197c800bb07bac3ce4de81192 commit 2ed8c970242a94b197c800bb07bac3ce4de81192 Author: Jon Turney Date: Thu Oct 12 15:48:26 2023 +0000 Translated using Weblate (Portuguese (Brazil)) Currently translated at 12.1% (35 of 287 strings) Translation: cygwin-setup/cygwin-setup Translate-URL: https://hosted.weblate.org/projects/cygwin-setup/cygwin-setup/pt_BR/ Diff: --- Makefile.am | 25 +++++++++++------- po/ar/res.po | 39 ++++++++++++++-------------- po/de/res.po | 12 ++++----- po/fr/res.po | 13 ++++++---- po/ja/res.po | 53 ++++++++++++++++++++----------------- po/pl/res.po | 23 ++++++++++------- po/pt_BR/res.po | 10 +++---- po/sk/res.po | 4 +-- po/tr/res.po | 15 ++++++----- po/zh_Hans/res.po | 76 ++++++++++++++++++++++++++++-------------------------- res/de/res.rc | 2 +- res/tr/res.rc | 4 +-- res/zh_Hans/res.rc | 28 ++++++++++---------- 13 files changed, 164 insertions(+), 140 deletions(-) diff --git a/Makefile.am b/Makefile.am index fac60ee9..1c6168d6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -294,7 +294,7 @@ po2rc: cd $(srcdir) && \ for l in $(LINGUAS) ; do \ ./langopts $$l >/dev/null && \ - mkdir -p res/$$l/ && \ + $(MKDIR_P) res/$$l/ && \ po2rc -t res/en/res.rc --charset-output=utf-8 $$(./langopts $$l) po/$$l/res.po res/$$l/res.rc && \ d2u -q res/$$l/res.rc ; \ done @@ -312,33 +312,38 @@ setup-src: echo $$ver-src.tar.xz; exec rm -f $$ver # optional: strip and compress executable -.PHONY: strip upx +.PHONY: strip upx release upload strip: all - $(OBJCOPY) --add-gnu-debuglink=/dev/null --only-keep-debug setup$(EXEEXT) setup.dbg - $(OBJCOPY) --strip-all setup$(EXEEXT) - $(OBJCOPY) --add-gnu-debuglink=setup.dbg setup$(EXEEXT) setup$(EXEEXT) + @$(MKDIR_P) stripped + $(OBJCOPY) --add-gnu-debuglink=/dev/null --only-keep-debug setup$(EXEEXT) stripped/setup.dbg + $(OBJCOPY) --strip-all setup$(EXEEXT) stripped/setup$(EXEEXT) + $(OBJCOPY) --add-gnu-debuglink=stripped/setup.dbg stripped/setup$(EXEEXT) stripped/setup$(EXEEXT) CLEANFILES += setup.dbg upx: strip @if [ -e `which upx` ]; then\ - upx --best --lzma setup$(EXEEXT) ;\ + $(MKDIR_P) upx ;\ + rm -f upx/setup$(EXEEXT) ;\ + upx --best --lzma stripped/setup$(EXEEXT) -o upx/setup$(EXEEXT) ;\ else \ echo "UPX doesn't seem to be installed, cannot compress setup$(EXEEXT)." ;\ fi release: upx - cp setup.dbg setup-${VER}.${ARCH}.dbg - cp setup${EXEEXT} setup-${VER}.${ARCH}${EXEEXT} + @$(MKDIR_P) release + cp stripped/setup.dbg release/setup-${VER}.${ARCH}.dbg + cp stripped/setup${EXEEXT} release/setup-uncompressed-${VER}.${ARCH}${EXEEXT} + cp upx/setup${EXEEXT} release/setup-${VER}.${ARCH}${EXEEXT} UPLOAD_HOST=cygwin-admin@cygwin.com UPLOAD_PATH=/www/sourceware/htdocs/cygwin/setup SIGN_KEYS="--enable-dsa2 --personal-digest-preferences=sha256 -u 1A698DE9E2E56300" upload: release - scp setup-${VER}.$(ARCH).exe setup-${VER}.$(ARCH).dbg ${UPLOAD_HOST}:${UPLOAD_PATH} + cd release ; scp setup-${VER}.$(ARCH).exe setup-${VER}.$(ARCH).dbg setup-uncompressed-${VER}.${ARCH}${EXEEXT} ${UPLOAD_HOST}:${UPLOAD_PATH} ssh ${UPLOAD_HOST} gpg --batch ${SIGN_KEYS} --detach-sign ${UPLOAD_PATH}/setup-${VER}.$(ARCH).exe clean-local: - rm -f setup*${EXEEXT} setup*.dbg + rm -rf stripped upx release diff --git a/po/ar/res.po b/po/ar/res.po index da0b656e..b9ab539f 100644 --- a/po/ar/res.po +++ b/po/ar/res.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-04-14 13:51+0100\n" +"POT-Creation-Date: 2023-10-11 16:30+0100\n" "PO-Revision-Date: 2023-07-02 13:02+0000\n" "Last-Translator: mohammadA \n" "Language-Team: Arabic \n" "Language-Team: German \n" "Language-Team: French \n" "Language-Team: Japanese \n" "Language-Team: Polish \n" +"POT-Creation-Date: 2023-10-11 16:30+0100\n" +"PO-Revision-Date: 2023-10-12 16:04+0000\n" +"Last-Translator: Jon Turney \n" "Language-Team: Portuguese (Brazil) \n" "Language: pt_BR\n" @@ -147,7 +147,7 @@ msgstr "Instalar para" #: DIALOG.IDD_ROOT.CONTROL.IDC_ROOT_SYSTEM msgid "&All Users (RECOMMENDED)" -msgstr "Todos os usuários (RECOMENDADO)" +msgstr "&Todos os usuários (RECOMENDADO)" #: DIALOG.IDD_ROOT.CONTROL.IDC_ROOT_USER msgid "Just &Me" @@ -1333,7 +1333,7 @@ msgid "URL or absolute path of extra public key file (RFC4880 format)" msgstr "" #: STRINGTABLE.IDS_HELPTEXT_QUIET_MODE -msgid "Unattended setup mode" +msgid "Unattended setup mode (unattended, noinput, hidden)" msgstr "" #: STRINGTABLE.IDS_HELPTEXT_REMOVE_CATEGORIES diff --git a/po/sk/res.po b/po/sk/res.po index e4199cb7..348a5e03 100644 --- a/po/sk/res.po +++ b/po/sk/res.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-04-14 13:51+0100\n" +"POT-Creation-Date: 2023-10-11 16:30+0100\n" "PO-Revision-Date: 2023-04-18 04:49+0000\n" "Last-Translator: Jan Riha \n" "Language-Team: Slovak \n" "Language-Team: Turkish \n" @@ -14,7 +14,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Accelerator-Marker: &\n" -"X-Generator: Weblate 4.17\n" +"X-Generator: Weblate 5.1-dev\n" "X-Merge-On: location\n" #: DIALOG.IDD_SOURCE.CAPTION @@ -1482,12 +1482,12 @@ msgid "URL or absolute path of extra public key file (RFC4880 format)" msgstr "Ek ortak anahtar dosyasının URL'si veya mutlak yolu (RFC4880 biçimi)" #: STRINGTABLE.IDS_HELPTEXT_QUIET_MODE -msgid "Unattended setup mode" -msgstr "Etkileşimsiz kurulum modu" +msgid "Unattended setup mode (unattended, noinput, hidden)" +msgstr "Etkileşimsiz kurulum modu (etkileşimsiz, girdi yok, gizli)" #: STRINGTABLE.IDS_HELPTEXT_REMOVE_CATEGORIES msgid "Specify categories to uninstall" -msgstr "Kurulacak kategorileri belirt" +msgstr "Kaldırılacak kategorileri belirt" #: STRINGTABLE.IDS_HELPTEXT_REMOVE_PACKAGES msgid "Specify packages to uninstall" @@ -1533,6 +1533,9 @@ msgstr "Sürümü göster" msgid "When elevating, wait for elevated child process" msgstr "Yetkilendirirken, yetkilendirilen alt işlemi bekle" +#~ msgid "Unattended setup mode" +#~ msgstr "Etkileşimsiz kurulum modu" + #~ msgid "" #~ "Cygwin support for 32-bit Windows is deprecated, and will be removed in " #~ "the next major version" diff --git a/po/zh_Hans/res.po b/po/zh_Hans/res.po index 2e179eaa..c52a8b5f 100644 --- a/po/zh_Hans/res.po +++ b/po/zh_Hans/res.po @@ -3,8 +3,8 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-04-14 13:51+0100\n" -"PO-Revision-Date: 2023-09-09 14:58+0000\n" +"POT-Creation-Date: 2023-10-11 16:30+0100\n" +"PO-Revision-Date: 2023-10-31 15:00+0000\n" "Last-Translator: Xiang Heng Wei \n" "Language-Team: Chinese (Simplified) \n" @@ -14,7 +14,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" "X-Accelerator-Marker: &\n" -"X-Generator: Weblate 5.0.1-dev\n" +"X-Generator: Weblate 5.2-dev\n" "X-Merge-On: location\n" #: DIALOG.IDD_SOURCE.CAPTION @@ -354,11 +354,11 @@ 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" "您将来可以随时运行此程序，以根据需要添加、删除或升级软件包。" @@ -619,26 +619,23 @@ 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 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 msgctxt "DIALOG.IDD_FILE_INUSE.PUSHBUTTON.IDIGNORE" @@ -659,8 +656,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 "" @@ -729,7 +727,7 @@ msgid "" "This setup is version %s, but setup.ini claims version %s is available.\n" "You might want to upgrade to get the latest features and bug fixes." msgstr "" -"此安装程序是版本 %s，但 setup.ini 声称版本 %s 可用。\n" +"此安装程序的版本是 %s，但 setup.ini 声称版本 %s 已经可用。\n" "您可能想要升级以获得最新的功能和错误修复。" #: STRINGTABLE.IDS_DOWNLOAD_INCOMPLETE @@ -762,7 +760,7 @@ msgid "" "Do you want to skip this package ?" msgstr "" "%s\n" -"您想跳过这个软件包吗？" +"是否跳过此软件包？" #: STRINGTABLE.IDS_UNCAUGHT_EXCEPTION msgid "" @@ -845,18 +843,19 @@ msgstr "" "\n" "完整：显示所有软件包。\n" "\n" -"待定：仅显示即将安装、删除或升级的包。这告诉您按“下一步”时将发生什么变化。\n" +"待定：仅显示即将安装、删除或升级的软件包。这告诉您按“下一步”时将发生什么变化" +"。\n" "\n" "最新：显示不需要执行任何操作的已安装软件包，因为它们已经处于所需版本。\n" "\n" -"未安装：显示当前未安装且尚未选择安装的包。\n" +"未安装：显示当前未安装且尚未选择安装的软件包。\n" "\n" -"已选择：显示已选择的已安装软件包，但未作为依赖项安装。\n" +"已选择：显示已选择的，但未作为依赖项安装已安装软件包。\n" "\n" -"可卸载的：显示已选择且可以安全删除的已安装软件包。没有其他已安装或选定的软件" -"包依赖于这些软件包。\n" +"可卸载的：显示已选择且可以安全卸载的已安装软件包。其他已安装或选定的软件包不" +"再依赖于这些软件包。\n" "\n" -"不需要的：显示现在可以安全删除的自动安装的软件包。其他已安装或选定的软件包不" +"不需要的：显示现在可以安全卸载的自动安装的软件包。其他已安装或选定的软件包不" "再依赖于这些软件包。" #: STRINGTABLE.IDS_HIDEOBS_TOOLTIP @@ -879,7 +878,7 @@ msgstr "" #: STRINGTABLE.IDS_CRYPTO_ERROR msgid "Internal Error: gcrypt library error %d %s" -msgstr "内部错误： gcrypt 库错误 %d %s" +msgstr "内部错误：gcrypt 库错误 %d %s" #: STRINGTABLE.IDS_SEARCH_TOOLTIP msgid "Search for this string in package names." @@ -915,7 +914,7 @@ msgstr "将安装移交给提权的子进程。" #: STRINGTABLE.IDS_INSTALLEDB_VERSION msgid "Unknown INSTALLED.DB version" -msgstr "未知的 INSTALLED.DB 版本" +msgstr "INSTALLED.DB 版本未知" #: STRINGTABLE.IDS_NO_MIRROR_LST msgid "Could not download mirror sites list" @@ -1091,8 +1090,8 @@ msgstr "" "\n" "文件正在使用中或发生了其他错误。\n" "\n" -"请结束所有 Cygwin 进程并选择\"\"重试\"\"，或选择\"\"继续\"\"以继续" -"（文件将在重启后更新）。\n" +"请结束所有 Cygwin 进程并选择\"\"重试\"\"，或选择\"\"继续\"\"以继续（文件将在" +"重启后更新）。\n" #: STRINGTABLE.IDS_INSTALL_OLD_CYGWIN msgid "" @@ -1100,7 +1099,7 @@ msgid "" "%s\n" "Delete?" msgstr "" -"在这里发现了旧版本的 cygwin1.dll：\n" +"在此处发现了旧版 cygwin1.dll：\n" "%s\n" "是否删除？" @@ -1292,7 +1291,7 @@ msgstr "允许旧的、不受支持的 Windows 版本" #: STRINGTABLE.IDS_HELPTEXT_ARCH msgid "Architecture to install (x86_64 or x86)" -msgstr "要安装的体系结构（x86_64 或 x86）" +msgstr "要安装的体系结构（选项：x86_64 或 x86）" #: STRINGTABLE.IDS_HELPTEXT_CATEGORIES msgid "Specify categories to install" @@ -1301,7 +1300,7 @@ msgstr "指定要安装的类别" #: STRINGTABLE.IDS_HELPTEXT_COMPACTOS msgid "" "Compress installed files with Compact OS (xpress4k, xpress8k, xpress16k, lzx)" -msgstr "使用 Compact OS（xpress4k、xpress8k、xpress16k、lzx）压缩已安装的文件" +msgstr "使用 Compact OS 压缩已安装的文件（选项：xpress4k、xpress8k、xpress16k、lzx）" #: STRINGTABLE.IDS_HELPTEXT_DELETE_ORPHANS msgid "Remove orphaned packages" @@ -1357,7 +1356,7 @@ msgstr "从本地目录安装时跳过包可用性检查（要求本地目录是 #: STRINGTABLE.IDS_HELPTEXT_NO_ADMIN msgid "Do not check for and enforce running as Administrator" -msgstr "不检查并强制以管理员身份运行" +msgstr "不检查也不强制以管理员身份运行" #: STRINGTABLE.IDS_HELPTEXT_NO_DESKTOP msgid "Disable creation of desktop shortcut" @@ -1420,8 +1419,8 @@ msgid "URL or absolute path of extra public key file (RFC4880 format)" msgstr "额外公钥文件的 URL 或绝对路径（RFC4880 格式）" #: STRINGTABLE.IDS_HELPTEXT_QUIET_MODE -msgid "Unattended setup mode" -msgstr "无人值守安装模式" +msgid "Unattended setup mode (unattended, noinput, hidden)" +msgstr "无人值守安装模式（选项：unattended、noinput、hidden）" #: STRINGTABLE.IDS_HELPTEXT_REMOVE_CATEGORIES msgid "Specify categories to uninstall" @@ -1445,7 +1444,7 @@ msgstr "下载站点的网址、路径或 UNC 路径" #: STRINGTABLE.IDS_HELPTEXT_SYMLINK_TYPE msgid "Symlink type (lnk, native, sys, wsl)" -msgstr "符号链接类型（lnk，本机，系统，wsl）" +msgstr "符号链接类型（选项：lnk、native、sys、wsl）" #: STRINGTABLE.IDS_HELPTEXT_UNTRUSTED_KEYS msgid "Use untrusted saved extra keys" @@ -1471,6 +1470,9 @@ msgstr "显示版本" msgid "When elevating, wait for elevated child process" msgstr "在提权时，等待提权的子进程" +#~ msgid "Unattended setup mode" +#~ msgstr "无人值守安装模式" + #~ msgid "" #~ "Cygwin support for 32-bit Windows is deprecated, and will be removed in " #~ "the next major version" diff --git a/res/de/res.rc b/res/de/res.rc index f3a0e31e..c96d2d62 100644 --- a/res/de/res.rc +++ b/res/de/res.rc @@ -509,7 +509,7 @@ BEGIN IDS_HELPTEXT_PRUNE_INSTALL "Prune the installation to only the requested packages" IDS_HELPTEXT_PUBKEY "URL or absolute path of extra public key file (RFC4880 format)" - IDS_HELPTEXT_QUIET_MODE "Unattended setup mode" + IDS_HELPTEXT_QUIET_MODE "Unattended setup mode (unattended, noinput, hidden)" IDS_HELPTEXT_REMOVE_CATEGORIES "Zu deinstallierende Kategorien angeben" IDS_HELPTEXT_REMOVE_PACKAGES diff --git a/res/tr/res.rc b/res/tr/res.rc index 6178a61f..fc3c27d0 100644 --- a/res/tr/res.rc +++ b/res/tr/res.rc @@ -509,9 +509,9 @@ BEGIN IDS_HELPTEXT_PRUNE_INSTALL "Kurulumu yalnızca istenen paketlerle sınırla" IDS_HELPTEXT_PUBKEY "Ek ortak anahtar dosyasının URL'si veya mutlak yolu (RFC4880 biçimi)" - IDS_HELPTEXT_QUIET_MODE "Etkileşimsiz kurulum modu" + IDS_HELPTEXT_QUIET_MODE "Etkileşimsiz kurulum modu (etkileşimsiz, girdi yok, gizli)" IDS_HELPTEXT_REMOVE_CATEGORIES - "Kurulacak kategorileri belirt" + "Kaldırılacak kategorileri belirt" IDS_HELPTEXT_REMOVE_PACKAGES "Kaldırılacak paketleri belirt" IDS_HELPTEXT_ROOT "Kök kurulum dizini" diff --git a/res/zh_Hans/res.rc b/res/zh_Hans/res.rc index 5bcb1909..5a3873f8 100644 --- a/res/zh_Hans/res.rc +++ b/res/zh_Hans/res.rc @@ -306,9 +306,9 @@ BEGIN LTEXT "无法解压缩",IDC_FILE_INUSE_MSG,33,10,234,8,SS_PATHELLIPSIS LTEXT "以下进程正在使用该文件：",IDC_STATIC,33,28,234,8 EDITTEXT IDC_FILE_INUSE_EDIT,33,40,234,32,WS_VSCROLL | ES_LEFT | ES_MULTILINE | ES_READONLY | ES_AUTOVSCROLL | NOT WS_TABSTOP - LTEXT "选择“重试”以重试，选择“结束”以停止进程并重试，或选择“继续”以继续（文件将在重启后更新）。",IDC_FILE_INUSE_HELP_0,33,80,234,24,NOT WS_GROUP - LTEXT "选择“重试”以重试，选择“终止”以终止进程并重试，或选择“继续”以继续（文件将在重新启动后更新）。",IDC_FILE_INUSE_HELP_1,33,80,234,24,NOT WS_GROUP - LTEXT "选择“重试”以重试，选择“终止”以强制终止所有进程并重试，或选择“继续”以继续（文件将在重启后更新）。",IDC_FILE_INUSE_HELP_2,33,80,234,24,NOT WS_GROUP + LTEXT "选择“重试”以重试，选择“结束进程”以结束进程并重试，或选择“继续”以继续（文件将在重启后更新）。",IDC_FILE_INUSE_HELP_0,33,80,234,24,NOT WS_GROUP + LTEXT "选择“重试”以重试，选择“终止进程”以终止进程并重试，或选择“继续”以继续（文件将在重启后更新）。",IDC_FILE_INUSE_HELP_1,33,80,234,24,NOT WS_GROUP + LTEXT "选择“重试”以重试，选择“终止进程”以强制终止所有进程并重试，或选择“继续”以继续（文件将在重启后更新）。",IDC_FILE_INUSE_HELP_2,33,80,234,24,NOT WS_GROUP PUSHBUTTON "重试(&R)",IDIGNORE,45,112,55,15 DEFPUSHBUTTON "结束进程(&S)",IDRETRY,111,112,55,15 PUSHBUTTON "继续(&C)",IDCONTINUE,177,112,55,15 @@ -335,7 +335,7 @@ BEGIN IDS_NOLOGFILE "无法打开日志文件 %s 进行写入" IDS_UNINSTALL_COMPLETE "卸载完成。" IDS_ERR_CHDIR "无法将目录更改为 %s： %s [%.8x]" - IDS_OLD_SETUP_VERSION "此安装程序是版本 %s，但 setup.ini 声称版本 %s 可用。\n您可能想要升级以获得最新的功能和错误修复。" + IDS_OLD_SETUP_VERSION "此安装程序的版本是 %s，但 setup.ini 声称版本 %s 已经可用。\n您可能想要升级以获得最新的功能和错误修复。" IDS_DOWNLOAD_INCOMPLETE "下载不完整。是否重试？" IDS_DOWNLOAD_INCOMPLETE_EXIT "下载不完整。 查看 %s 以了解详细信息" @@ -343,7 +343,7 @@ BEGIN IDS_INSTALL_INCOMPLETE "安装未完成。查看 %s 以了解详细信息" IDS_CORRUPT_PACKAGE "软件包 %s 具有损坏的本地副本，请删除并重试。" IDS_QUERY_CORRUPT "文件 %s 已损坏。是否删除它并再次下载？" - IDS_SKIP_PACKAGE "%s\n您想跳过这个软件包吗？" + IDS_SKIP_PACKAGE "%s\n是否跳过此软件包？" IDS_UNCAUGHT_EXCEPTION "致命错误：未捕获的异常\n线程： %s\n类型： %s\n消息： %s" IDS_UNCAUGHT_EXCEPTION_WITH_ERRNO "致命错误：未捕获的异常\n线程： %s\n类型： %s\n消息： %s\n应用错误编号： %d" @@ -351,16 +351,16 @@ BEGIN IDS_TRUSTCURR_TOOLTIP "将所有软件包设置为可用的最佳版本（推荐）。" IDS_TRUSTSYNC_TOOLTIP "将所有软件包设置为软件包存储库中可用的版本，必要时降级。" IDS_TRUSTEXP_TOOLTIP "启用测试版软件包。" - IDS_VIEWBUTTON_TOOLTIP "选择软件包视图。这决定了下面显示哪些软件包。\n\n类别：按软件包类别分组。单击“+”展开。\n\n完整：显示所有软件包。\n\n待定：仅显示即将安装、删除或升级的包。这告诉您按“下一步”时将发生什么变化。\n\n最新：显示不需要执行任何操作的已安装软件包，因为它们已经处于所需版本。\n\n未安装：显示当前未安装且尚未选择安装的包。\n\n已选择：显示已选择的已安装软件包，但未作为依赖项安装。\n\n可卸载的：显示已选择且可以安全删除的已安装软件包。没有其他已安装或选定的软件包依赖于这些软件包。\n\n不需要的：显示现在可以安全删除的自动安装的软件包。其他已安装或选定的软件包不再依赖于这些软件包。" + IDS_VIEWBUTTON_TOOLTIP "选择软件包视图。这决定了下面显示哪些软件包。\n\n类别：按软件包类别分组。单击“+”展开。\n\n完整：显示所有软件包。\n\n待定：仅显示即将安装、删除或升级的软件包。这告诉您按“下一步”时将发生什么变化。\n\n最新：显示不需要执行任何操作的已安装软件包，因为它们已经处于所需版本。\n\n未安装：显示当前未安装且尚未选择安装的软件包。\n\n已选择：显示已选择的，但未作为依赖项安装已安装软件包。\n\n可卸载的：显示已选择且可以安全卸载的已安装软件包。其他已安装或选定的软件包不再依赖于这些软件包。\n\n不需要的：显示现在可以安全卸载的自动安装的软件包。其他已安装或选定的软件包不再依赖于这些软件包。" IDS_HIDEOBS_TOOLTIP "如果选中，安装程序将隐藏名称以“_”开头的类别中的软件包。 此类软件包通常是已删除或重命名的软件包的空占位符，或者是自动处理的基础结构软件包。" IDS_SIG_INVALID "镜像错误：Setup.ini 签名 %s（来自 %s）验证失败。\n镜像可能已损坏？ Setup.ini 被拒绝。" - IDS_CRYPTO_ERROR "内部错误： gcrypt 库错误 %d %s" + IDS_CRYPTO_ERROR "内部错误：gcrypt 库错误 %d %s" IDS_SEARCH_TOOLTIP "在软件包名称中搜索此字符串。" IDS_MAYBE_MKDIR "目录 %s 不存在，是否创建它？" IDS_CANT_MKDIR "无法创建目录 %s，抱歉。（驱动器是已满还是只读？）" IDS_NO_LOCALDIR "找不到本地软件包目录 %s。\n您仍然可以删除已安装的\n软件包，但不会有任何要安装的内容。\n\n点击“确定”，如果这是你想要的\n或“取消”以选择其他目录。" IDS_ELEVATED "将安装移交给提权的子进程。" - IDS_INSTALLEDB_VERSION "未知的 INSTALLED.DB 版本" + IDS_INSTALLEDB_VERSION "INSTALLED.DB 版本未知" IDS_NO_MIRROR_LST "无法下载镜像站点列表" IDS_PROGRESS_PROGRESS "进度：" IDS_PROGRESS_PACKAGE "软件包：" @@ -404,7 +404,7 @@ BEGIN IDS_MBOX_CAPTION "Cygwin 安装程序" IDS_EXTRACTION_FAILED "无法解压缩 /%s -- 损坏的软件包？" IDS_EXTRACTION_INUSE "无法解压缩 /%s -- 写入文件时出错\n\n文件正在使用中或发生了其他错误。\n\n请结束所有 Cygwin 进程并选择""重试""，或选择""继续""以继续（文件将在重启后更新）。\n" - IDS_INSTALL_OLD_CYGWIN "在这里发现了旧版本的 cygwin1.dll：\n%s\n是否删除？" + IDS_INSTALL_OLD_CYGWIN "在此处发现了旧版 cygwin1.dll：\n%s\n是否删除？" IDS_INSTALL_DELETE_OLD_CYGWIN_FAILED "无法删除文件 %s。\nDLL 是否正由另一个应用程序使用？\n您应该尽早删除旧版本的 cygwin1.dll。" IDS_SHELLLINK_FAILED "CoCreateInstance 失败，错误为 0x%x。\n安装程序将无法在“开始”菜单或桌面上创建 Cygwin 图标。" @@ -461,9 +461,9 @@ BEGIN IDS_HELPTEXT_ALLOW_TEST "考虑标记为测试版的软件包版本" IDS_HELPTEXT_ALLOW_UNSUPPORTED_WINDOWS "允许旧的、不受支持的 Windows 版本" - IDS_HELPTEXT_ARCH "要安装的体系结构（x86_64 或 x86）" + IDS_HELPTEXT_ARCH "要安装的体系结构（选项：x86_64 或 x86）" IDS_HELPTEXT_CATEGORIES "指定要安装的类别" - IDS_HELPTEXT_COMPACTOS "使用 Compact OS（xpress4k、xpress8k、xpress16k、lzx）压缩已安装的文件" + IDS_HELPTEXT_COMPACTOS "使用 Compact OS 压缩已安装的文件（选项：xpress4k、xpress8k、xpress16k、lzx）" IDS_HELPTEXT_DELETE_ORPHANS "删除孤立的软件包" IDS_HELPTEXT_DISABLE_ANTIVIRUS @@ -485,7 +485,7 @@ BEGIN "本地软件包目录" IDS_HELPTEXT_MIRROR_MODE "从本地目录安装时跳过包可用性检查（要求本地目录是干净的镜像！）" - IDS_HELPTEXT_NO_ADMIN "不检查并强制以管理员身份运行" + IDS_HELPTEXT_NO_ADMIN "不检查也不强制以管理员身份运行" IDS_HELPTEXT_NO_DESKTOP "禁用桌面快捷方式的创建" IDS_HELPTEXT_NO_REPLACEONREBOOT "禁用在下次重新启动时替换正在使用的文件" @@ -509,7 +509,7 @@ BEGIN IDS_HELPTEXT_PRUNE_INSTALL "删减安装，只保留所需的软件包" IDS_HELPTEXT_PUBKEY "额外公钥文件的 URL 或绝对路径（RFC4880 格式）" - IDS_HELPTEXT_QUIET_MODE "无人值守安装模式" + IDS_HELPTEXT_QUIET_MODE "无人值守安装模式（选项：unattended、noinput、hidden）" IDS_HELPTEXT_REMOVE_CATEGORIES "指定要卸载的类别" IDS_HELPTEXT_REMOVE_PACKAGES @@ -519,7 +519,7 @@ BEGIN "s-expr 格式的额外 DSA 公钥" IDS_HELPTEXT_SITE "下载站点的网址、路径或 UNC 路径" IDS_HELPTEXT_SYMLINK_TYPE - "符号链接类型（lnk，本机，系统，wsl）" + "符号链接类型（选项：lnk、native、sys、wsl）" IDS_HELPTEXT_UNTRUSTED_KEYS "使用不受信任的已保存额外密钥" IDS_HELPTEXT_UPGRADE_ALSO