From 2d2cdd9f8042275d00268f88d26822f5eb68b2e4 Mon Sep 17 00:00:00 2001 From: Larry Li Date: Mon, 17 Oct 2022 22:22:55 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E5=92=8C=E7=BB=9F=E4=B8=80?= =?UTF-8?q?=E6=9C=AF=E8=AF=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config.c | 58 ++++++++++++++++++++-------------------- pscp.c | 6 ++--- psftp.c | 6 ++--- windows/config.c | 6 ++--- windows/console.c | 4 +-- windows/dialog.c | 6 ++--- windows/pageant.rc | 4 +-- windows/plink.c | 2 +- windows/putty-common.rc2 | 14 +++++----- windows/putty.c | 2 +- windows/puttygen.c | 2 +- 11 files changed, 55 insertions(+), 55 deletions(-) diff --git a/config.c b/config.c index e291150f..6961001e 100644 --- a/config.c +++ b/config.c @@ -2052,13 +2052,13 @@ void setup_config_box(struct controlbox *b, bool midsession, ctrl_radiobuttons(s, "发生响铃时动作(B)：", 'b', 1, HELPCTX(bell_style), conf_radiobutton_handler, I(CONF_beep), - "无 (禁止响铃)", I(BELL_DISABLED), + "无 (禁用响铃)", I(BELL_DISABLED), "使用系统默认警告声音", I(BELL_DEFAULT), "可视响铃 (闪动窗口)", I(BELL_VISUAL), NULL); s = ctrl_getset(b, "终端/响铃", "overload", "设置重复响铃处理"); - ctrl_checkbox(s, "大量重复响铃时临时禁止响铃(D)", 'd', + ctrl_checkbox(s, "大量重复响铃时临时禁用响铃(D)", 'd', HELPCTX(bell_overload), conf_checkbox_handler, I(CONF_bellovl)); ctrl_editbox(s, "重复响铃最少数目(M)：", 'm', 20, @@ -2068,9 +2068,9 @@ void setup_config_box(struct controlbox *b, bool midsession, HELPCTX(bell_overload), conf_editbox_handler, I(CONF_bellovl_t), I(-TICKSPERSEC)); - ctrl_text(s, "响铃将在被禁止一段时间后重新被允许。", + ctrl_text(s, "响铃将在被禁用一段时间后重新被启用。", HELPCTX(bell_overload)); - ctrl_editbox(s, "被禁止响铃的时间(秒)(S)：", 's', 20, + ctrl_editbox(s, "被禁用响铃的时间(秒)(S)：", 's', 20, HELPCTX(bell_overload), conf_editbox_handler, I(CONF_bellovl_s), I(-TICKSPERSEC)); @@ -2079,26 +2079,26 @@ void setup_config_box(struct controlbox *b, bool midsession, * The Terminal/Features panel. */ ctrl_settitle(b, "终端/特性", - "允许或禁止高级终端特性"); + "启禁用高级终端特性"); s = ctrl_getset(b, "终端/特性", "main", NULL); - ctrl_checkbox(s, "禁止应用光标键模式(U)", 'u', + ctrl_checkbox(s, "禁用应用光标键模式(U)", 'u', HELPCTX(features_application), conf_checkbox_handler, I(CONF_no_applic_c)); - ctrl_checkbox(s, "禁止应用小键盘模式(K)", 'k', + ctrl_checkbox(s, "禁用应用小键盘模式(K)", 'k', HELPCTX(features_application), conf_checkbox_handler, I(CONF_no_applic_k)); - ctrl_checkbox(s, "禁止 xterm 类型鼠标报告", 'x', + ctrl_checkbox(s, "禁用 xterm 类型鼠标报告", 'x', HELPCTX(features_mouse), conf_checkbox_handler, I(CONF_no_mouse_rep)); - ctrl_checkbox(s, "禁止改变远程控制终端大小(S)", 's', + ctrl_checkbox(s, "禁用改变远程控制终端大小(S)", 's', HELPCTX(features_resize), conf_checkbox_handler, I(CONF_no_remote_resize)); - ctrl_checkbox(s, "禁止切换终端屏幕(W)", 'w', + ctrl_checkbox(s, "禁用切换终端屏幕(W)", 'w', HELPCTX(features_altscreen), conf_checkbox_handler, I(CONF_no_alt_screen)); - ctrl_checkbox(s, "禁止改变远程控制窗口标题(T)", 't', + ctrl_checkbox(s, "禁用改变远程控制窗口标题(T)", 't', HELPCTX(features_retitle), conf_checkbox_handler, I(CONF_no_remote_wintitle)); @@ -2109,20 +2109,20 @@ void setup_config_box(struct controlbox *b, bool midsession, "无", I(TITLE_NONE), "空字符串", I(TITLE_EMPTY), "窗口标题", I(TITLE_REAL), NULL); - ctrl_checkbox(s, "禁止远程控制清除回滚(E)", 'e', + ctrl_checkbox(s, "禁用远程控制清除回滚(E)", 'e', HELPCTX(features_clearscroll), conf_checkbox_handler, I(CONF_no_remote_clearscroll)); - ctrl_checkbox(s, "禁止服务器发送 ^? 时破坏性回退删除(B)",'b', + ctrl_checkbox(s, "禁用服务器发送 ^? 时破坏性回退删除(B)",'b', HELPCTX(features_dbackspace), conf_checkbox_handler, I(CONF_no_dbackspace)); - ctrl_checkbox(s, "禁止远程控制字符集设置(R)", + ctrl_checkbox(s, "禁用远程控制字符集设置(R)", 'r', HELPCTX(features_charset), conf_checkbox_handler, I(CONF_no_remote_charset)); - ctrl_checkbox(s, "禁止修整阿拉伯文本(L)", + ctrl_checkbox(s, "禁用修整阿拉伯文本(L)", 'l', HELPCTX(features_arabicshaping), conf_checkbox_handler, I(CONF_no_arabicshaping)); - ctrl_checkbox(s, "禁止双向文本显示(D)", + ctrl_checkbox(s, "禁用双向文本显示(D)", 'd', HELPCTX(features_bidi), conf_checkbox_handler, I(CONF_no_bidi)); @@ -2302,7 +2302,7 @@ void setup_config_box(struct controlbox *b, bool midsession, s = ctrl_getset(b, "窗口/选择", "paste", "设置从剪贴板粘贴文本到终端"); - ctrl_checkbox(s, "允许粘贴文本含有控制字符", + ctrl_checkbox(s, "启用粘贴含有控制字符的文本", NO_SHORTCUT, HELPCTX(selection_pastectrl), conf_checkbox_handler, I(CONF_paste_controls)); @@ -2344,13 +2344,13 @@ void setup_config_box(struct controlbox *b, bool midsession, s = ctrl_getset(b, "窗口/颜色", "general", "颜色使用常规设置"); - ctrl_checkbox(s, "允许终端指定 ANSI 颜色", 'i', + ctrl_checkbox(s, "启用终端指定 ANSI 颜色", 'i', HELPCTX(colours_ansi), conf_checkbox_handler, I(CONF_ansi_colour)); - ctrl_checkbox(s, "允许终端使用 xterm 256 色模式", '2', + ctrl_checkbox(s, "启用终端使用 xterm 256 色模式", '2', HELPCTX(colours_xterm256), conf_checkbox_handler, I(CONF_xterm_256_colour)); - ctrl_checkbox(s, "允许终端使用 24 位色", '4', + ctrl_checkbox(s, "启用终端使用 24 位色", '4', HELPCTX(colours_truecolour), conf_checkbox_handler, I(CONF_true_colour)); ctrl_radiobuttons(s, "粗体文字表现(B)：", 'b', 3, @@ -2407,11 +2407,11 @@ void setup_config_box(struct controlbox *b, bool midsession, if (!midsession) { s = ctrl_getset(b, "连接", "tcp", "底层 TCP 连接选项"); - ctrl_checkbox(s, "禁止 Nagle 算法(TCP_NODELAY 参数)", + ctrl_checkbox(s, "禁用 Nagle 算法(TCP_NODELAY 参数)", 'n', HELPCTX(connection_nodelay), conf_checkbox_handler, I(CONF_tcp_nodelay)); - ctrl_checkbox(s, "允许 TCP 保持活动连接(SO_KEEPALIVE 参数)", + ctrl_checkbox(s, "启用 TCP 保持活动连接(SO_KEEPALIVE 参数)", 'p', HELPCTX(connection_tcpkeepalive), conf_checkbox_handler, I(CONF_tcp_keepalives)); @@ -2656,7 +2656,7 @@ void setup_config_box(struct controlbox *b, bool midsession, conf_checkbox_handler, I(CONF_ssh_connection_sharing)); - ctrl_text(s, "共享连接中允许角色：", + ctrl_text(s, "共享连接中启用角色：", HELPCTX(ssh_share)); ctrl_checkbox(s, "上游 (连接到真实服务器)(U)", 'u', HELPCTX(ssh_share), @@ -2802,7 +2802,7 @@ void setup_config_box(struct controlbox *b, bool midsession, cipherlist_handler, P(NULL)); c->listbox.height = 6; - ctrl_checkbox(s, "允许 SSH-2 兼容使用单一 DES 算法(I)", 'i', + ctrl_checkbox(s, "启用 SSH-2 兼容使用单一 DES 算法(I)", 'i', HELPCTX(ssh_ciphers), conf_checkbox_handler, I(CONF_ssh2_des_cbc)); @@ -2847,10 +2847,10 @@ void setup_config_box(struct controlbox *b, bool midsession, s = ctrl_getset(b, "连接/SSH/认证", "params", "认证参数"); - ctrl_checkbox(s, "允许代理转发(F)", 'f', + ctrl_checkbox(s, "启用代理转发(F)", 'f', HELPCTX(ssh_auth_agentfwd), conf_checkbox_handler, I(CONF_agentfwd)); - ctrl_checkbox(s, "允许尝试在 SSH-2 中修改用户名", NO_SHORTCUT, + ctrl_checkbox(s, "启用尝试在 SSH-2 中修改用户名", NO_SHORTCUT, HELPCTX(ssh_auth_changeuser), conf_checkbox_handler, I(CONF_change_username)); @@ -2873,12 +2873,12 @@ void setup_config_box(struct controlbox *b, bool midsession, conf_checkbox_handler, I(CONF_try_gssapi_auth)); - ctrl_checkbox(s, "允许 GSSAPI 密钥交换，只限于 SSH-2(K)", + ctrl_checkbox(s, "启用 GSSAPI 密钥交换，只限于 SSH-2(K)", 'k', HELPCTX(ssh_gssapi), conf_checkbox_handler, I(CONF_try_gssapi_kex)); - ctrl_checkbox(s, "允许 GSSAPI 凭据委托(L)", 'l', + ctrl_checkbox(s, "启用 GSSAPI 凭据委托(L)", 'l', HELPCTX(ssh_gssapi_delegation), conf_checkbox_handler, I(CONF_gssapifwd)); @@ -2981,7 +2981,7 @@ void setup_config_box(struct controlbox *b, bool midsession, "SSH X11 转发设置"); s = ctrl_getset(b, "连接/SSH/X11", "x11", "X11 转发"); - ctrl_checkbox(s, "允许 X11 转发(E)", 'e', + ctrl_checkbox(s, "启用 X11 转发(E)", 'e', HELPCTX(ssh_tunnels_x11), conf_checkbox_handler,I(CONF_x11_forward)); ctrl_editbox(s, "X 显示位置：", 'x', 50, diff --git a/pscp.c b/pscp.c index d030d8c3..0043e813 100644 --- a/pscp.c +++ b/pscp.c @@ -2206,7 +2206,7 @@ static void usage(void) printf(" -ssh -ssh-connection\n"); printf(" 强制使用特定的 SSH 协议变体\n"); printf(" -4 -6 强制使用 IPv4 或 IPv6 版本\n"); - printf(" -C 允许压缩\n"); + printf(" -C 启用压缩\n"); printf(" -i 密钥 认证使用的密钥文件\n"); printf(" -noagent 禁用 Pageant 认证代理\n"); printf(" -agent 启用 Pageant 认证代理\n"); @@ -2214,11 +2214,11 @@ static void usage(void) printf(" 断开过于迅速的 SSH 认证连接\n"); printf(" -hostkey 密钥ID\n"); printf(" 手动指定主机密钥(可能重复)\n"); - printf(" -batch 禁止所有交互提示\n"); + printf(" -batch 禁用所有交互提示\n"); printf(" -no-sanitise-stderr 不删除标准错误中控制字符\n"); printf(" -proxycmd 命令\n"); printf(" 使用 '命令' 作为本地代理\n"); - printf(" -unsafe 允许服务端通配符(危险操作)\n"); + printf(" -unsafe 启用服务端通配符(危险操作)\n"); printf(" -sftp 强制使用 SFTP 协议\n"); printf(" -scp 强制使用 SCP 协议\n"); printf(" -sshlog 文件\n"); diff --git a/psftp.c b/psftp.c index 835fb673..0e37ddd1 100644 --- a/psftp.c +++ b/psftp.c @@ -2540,15 +2540,15 @@ static void usage(void) printf(" -ssh -ssh-connection\n"); printf(" 强制使用特定的 SSH 协议变体\n"); printf(" -4 -6 强制使用 IPv4 或 IPv6 版本\n"); - printf(" -C 允许压缩\n"); + printf(" -C 启用压缩\n"); printf(" -i 密钥 认证使用的密钥文件\n"); - printf(" -noagent 禁止 Pageant 认证代理\n"); + printf(" -noagent 禁用 Pageant 认证代理\n"); printf(" -agent 启用 Pageant 认证代理\n"); printf(" -no-trivial-auth\n"); printf(" 断开过于迅速的 SSH 认证连接\n"); printf(" -hostkey 密钥ID\n"); printf(" 手工指定主机密钥指纹 (可能是重复的)\n"); - printf(" -batch 禁止所有交互提示\n"); + printf(" -batch 禁用所有交互提示\n"); printf(" -no-sanitise-stderr 不删除标准错误中控制字符\n"); printf(" -proxycmd 命令\n"); printf(" 使用 '命令' 作为本地代理\n"); diff --git a/windows/config.c b/windows/config.c index 59c1fa9a..5fa9bda7 100644 --- a/windows/config.c +++ b/windows/config.c @@ -171,7 +171,7 @@ void win_setup_config_box(struct controlbox *b, HWND *hwndp, bool has_help, HELPCTX(bell_taskbar), conf_radiobutton_handler, I(CONF_beep_ind), - "禁止", I(B_IND_DISABLED), + "禁用", I(B_IND_DISABLED), "闪烁", I(B_IND_FLASH), "反显", I(B_IND_STEADY), NULL); @@ -189,7 +189,7 @@ void win_setup_config_box(struct controlbox *b, HWND *hwndp, bool has_help, */ s = ctrl_getset(b, "窗口/外观", "font", "字体设置"); - ctrl_checkbox(s, "允许选择可变间距字体", NO_SHORTCUT, + ctrl_checkbox(s, "启用可变间距字体", NO_SHORTCUT, HELPCTX(appearance_font), variable_pitch_handler, I(0)); ctrl_radiobuttons(s, "字体品质(Q)：", 'q', 2, HELPCTX(appearance_font), @@ -328,7 +328,7 @@ void win_setup_config_box(struct controlbox *b, HWND *hwndp, bool has_help, "改变行列数", I(RESIZE_TERM), "改变字体大小", I(RESIZE_FONT), "只在最大化时改变字体大小", I(RESIZE_EITHER), - "完全禁止大小改变", I(RESIZE_DISABLED), NULL); + "完全禁用窗口大小改变", I(RESIZE_DISABLED), NULL); } /* diff --git a/windows/console.c b/windows/console.c index 1e328258..96ce15f1 100644 --- a/windows/console.c +++ b/windows/console.c @@ -239,10 +239,10 @@ int console_askappend(LogPolicy *lp, Filename *filename, "会话日志文件 \"%.*s\" 已经存在。\n" "可以使用新会话日志覆盖旧文件，\n" "或者在旧日志文件结尾增加新日志，\n" - "或在此会话中禁止日志记录。\n" + "或在此会话中禁用日志记录。\n" "输入 \"y\" 覆盖为新文件，\n" "\"n\" 附加到旧文件，\n" - "或者直接回车禁止日志记录。\n" + "或者直接回车禁用日志记录。\n" "擦除日志文件？ (y/n, 回车取消日志记录) "; static const char msgtemplate_batch[] = diff --git a/windows/dialog.c b/windows/dialog.c index af67163c..5609a8f4 100644 --- a/windows/dialog.c +++ b/windows/dialog.c @@ -1103,9 +1103,9 @@ static int win_gui_askappend(LogPolicy *lp, Filename *filename, "会话日志文件 \"%.*s\" 已经存在。\n" "可以使用新会话日志覆盖旧文件，\n" "或者在旧日志文件结尾增加新日志，\n" - "或在此会话中禁止日志记录。\n" - "点击是覆盖为新文件，否附加到旧文件，\n" - "或者点击取消禁止日志记录。"; + "或在此会话中禁用日志记录。\n" + "点击“是”覆盖为新文件，“否”附加到旧文件，\n" + "或者点击“取消”禁用日志记录。"; char *message; char *mbtitle; int mbret; diff --git a/windows/pageant.rc b/windows/pageant.rc index c579ac3b..af3d1b98 100644 --- a/windows/pageant.rc +++ b/windows/pageant.rc @@ -35,9 +35,9 @@ BEGIN CTEXT "有 Pageant 客户端想要使用以下加密密钥：", IDC_PASSPHRASE_STATIC1, 10, 6, 230, 8 CTEXT "", IDC_PASSPHRASE_FINGERPRINT, 10, 16, 230, 8 - CTEXT "确定是您本人操作，请点击此框获取", + CTEXT "如果确定是本人操作，请点击此框获取输入焦点后，", IDC_PASSPHRASE_STATIC2, 10, 26, 230, 8 - CTEXT "输入焦点后，输入密码以解密密钥。", + CTEXT "输入密码以解密密钥。", IDC_PASSPHRASE_STATIC3, 10, 34, 230, 8 EDITTEXT IDC_PASSPHRASE_EDITBOX, 10, 44, 230, 12, ES_PASSWORD | ES_AUTOHSCROLL diff --git a/windows/plink.c b/windows/plink.c index 40dbd2c9..4d66463c 100644 --- a/windows/plink.c +++ b/windows/plink.c @@ -157,7 +157,7 @@ static void usage(void) printf(" -t -T 启禁用 pty 分配\n"); printf(" -1 -2 强制使用 SSH 协议版本\n"); printf(" -4 -6 强制使用 IPv4 或 IPv6 版本\n"); - printf(" -C 允许压缩\n"); + printf(" -C 启用压缩\n"); printf(" -i 密钥 认证使用的密钥文件\n"); printf(" -noagent 禁用 Pageant 认证代理\n"); printf(" -agent 启用 Pageant 认证代理\n"); diff --git a/windows/putty-common.rc2 b/windows/putty-common.rc2 index 8e6e5d8b..3c9acf7b 100644 --- a/windows/putty-common.rc2 +++ b/windows/putty-common.rc2 @@ -65,11 +65,11 @@ BEGIN LTEXT "该服务器密钥未缓存:", 100, 40, 20, 300, 8 LTEXT "不能保证该服务器是能够正确访问的计算机。", 101, 40, 40, 300, 8 LTEXT "该服务器的 {KEYTYPE} 密钥指纹为:", 102, 40, 52, 300, 8 - LTEXT "如果信任该主机，请点击 ""接受"" 增加密钥到 {APPNAME} 缓存中，", 103, 40, 72, 300, 8 + LTEXT "如果信任该主机，请点击“接受”增加密钥到 {APPNAME} 缓存中，", 103, 40, 72, 300, 8 LTEXT "并继续连接。", 104, 40, 80, 300, 8 LTEXT "如果仅仅只希望进行本次连接，而不将密钥储存，", 105, 40, 92, 300, 8 - LTEXT "请点击 ""只连接一次""。", 106, 40, 100, 300, 8 - LTEXT "如果不信任该主机，请点击 ""取消"" 放弃此连接。", 107, 40, 112, 300, 8 + LTEXT "请点击“只连接一次”。", 106, 40, 100, 300, 8 + LTEXT "如果不信任该主机，请点击“取消”放弃此连接。", 107, 40, 112, 300, 8 ICON "", IDC_HK_ICON, 10, 18, 0, 0 @@ -97,11 +97,11 @@ BEGIN LTEXT "", 103, 40, 72, 300, 8 LTEXT "新的 {KEYTYPE} 密钥指纹为:", 104, 40, 84, 300, 8 LTEXT "如果确信该密钥被更新并同意接受新的密钥，", 105, 40, 104, 300, 8 - LTEXT "请点击 ""接受"" 更新 {APPNAME} 缓存并继续连接。", 106, 40, 112, 300, 8 + LTEXT "请点击“接受”更新 {APPNAME} 缓存并继续连接。", 106, 40, 112, 300, 8 LTEXT "如果仅仅只希望继续本次连接，而不更新系统缓存，", 107, 40, 124, 300, 8 - LTEXT "请点击 ""只连接一次""。", 108, 40, 132, 300, 8 - LTEXT "如果希望完全放弃本次连接，请点击 ""取消""。", 109, 40, 144, 300, 8 - LTEXT "点击 ""取消"" 是**唯一**可以保证的安全选择。", 110, 40, 152, 300, 8 + LTEXT "请点击“只连接一次”。", 108, 40, 132, 300, 8 + LTEXT "如果希望完全放弃本次连接，请点击“取消”。", 109, 40, 144, 300, 8 + LTEXT "点击“取消”是**唯一**可以保证的安全选择。", 110, 40, 152, 300, 8 ICON "", IDC_HK_ICON, 10, 16, 0, 0 diff --git a/windows/putty.c b/windows/putty.c index 2304e37c..16a08701 100644 --- a/windows/putty.c +++ b/windows/putty.c @@ -77,7 +77,7 @@ void gui_term_process_cmdline(Conf *conf, char *cmdline) "种子文件。（这只会影响到当前\n" "登录的用户。）\n" "\n" - "此操作将会摧毁你保存的会话。\n" + "此操作将会摧毁保存的会话。\n" "真的确定要继续么？", appname); s2 = dupprintf("%s 警告", appname); diff --git a/windows/puttygen.c b/windows/puttygen.c index c2d3089b..e5aed512 100644 --- a/windows/puttygen.c +++ b/windows/puttygen.c @@ -718,7 +718,7 @@ void old_keyfile_warning(void) "性。未来版本的 %s 可能会停止支持\n" "此私钥格式，建议将其转换为新的格式。\n" "\n" - "一旦密钥被载入到 PuTTYgen，你可以简\n" + "一旦密钥被载入到 PuTTYgen，可以简\n" "单的使用保存文件来进行转换。"; MessageBox(NULL, message, mbtitle, MB_OK);