From 6ff7b7de29f53594305d15eccc097b7d47960dc0 Mon Sep 17 00:00:00 2001 From: dZ8Lx9OwX Date: Sun, 26 May 2024 00:16:35 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- xorg-server/hw/xwin/InitOutput.c | 4 +- xorg-server/hw/xwin/XWin.rc | 54 ++++----- xorg-server/hw/xwin/windialogs.c | 6 +- xorg-server/hw/xwin/winerror.c | 12 +- xorg-server/hw/xwin/winprocarg.c | 8 +- .../hw/xwin/xlaunch/resources/dialog.rc | 8 +- .../hw/xwin/xlaunch/resources/resources.rc | 37 ++++++ .../hw/xwin/xlaunch/resources/strings.rc | 106 +++++++++--------- xorg-server/installer/noadmin.patch | 40 +++---- xorg-server/installer/vcxsrv-64-debug.nsi | 22 ++-- xorg-server/installer/vcxsrv-64.nsi | 22 ++-- xorg-server/installer/vcxsrv-debug.nsi | 18 +-- xorg-server/installer/vcxsrv.nsi | 22 ++-- xorg-server/makefile | 1 - xorg-server/os/connection.c | 2 +- xorg-server/os/log.c | 6 +- xorg-server/system.XWinrc | 16 +-- 17 files changed, 211 insertions(+), 173 deletions(-) diff --git a/xorg-server/hw/xwin/InitOutput.c b/xorg-server/hw/xwin/InitOutput.c index 7a2d8e7029..08bd9121c2 100644 --- a/xorg-server/hw/xwin/InitOutput.c +++ b/xorg-server/hw/xwin/InitOutput.c @@ -934,9 +934,9 @@ ddxUseMsg(void) /* Notify user where UseMsg text can be found. */ if (!g_fNoHelpMessageBox) - winMessageBoxF("The " PROJECT_NAME " help text has been printed to " + winMessageBoxF("关于 " PROJECT_NAME " 的帮助文本已打印到 " "%s.\n" - "Please open %s to read the help text.\n", + "请打开 %s 文档查看帮助信息.\n", MB_ICONINFORMATION, g_pszLogFile, g_pszLogFile); } diff --git a/xorg-server/hw/xwin/XWin.rc b/xorg-server/hw/xwin/XWin.rc index d2998c9341..d91b0a6557 100644 --- a/xorg-server/hw/xwin/XWin.rc +++ b/xorg-server/hw/xwin/XWin.rc @@ -36,8 +36,8 @@ #define VER_FILEVERSION 21,1,13 #define VER_FILEVERSION_STR "21.1.13" -#define VER_PRODUCTVERSION 21,1,13 -#define VER_PRODUCTVERSION_STR "21.1.13" +#define VER_PRODUCTVERSION 21,1,13.1 +#define VER_PRODUCTVERSION_STR "21.1.13.1" VS_VERSION_INFO VERSIONINFO FILEVERSION VER_FILEVERSION @@ -46,14 +46,14 @@ FILETYPE VFT_APP BEGIN BLOCK "StringFileInfo" BEGIN - BLOCK "040904E4" + BLOCK "080904B0" BEGIN - VALUE "FileDescription", "VcXsrv windows xserver\0" + VALUE "FileDescription", "cnVcXsrv Windows Xserver\0" VALUE "FileVersion", VER_FILEVERSION_STR"\0" VALUE "InternalName", "VcXsrv\0" VALUE "LegalCopyright", "https://github.com/marchaesen\0" VALUE "OriginalFilename", "vcxsrv.exe\0" - VALUE "ProductName", "VcXsrv\0" + VALUE "ProductName", "cnVcXsrv\0" VALUE "ProductVersion", VER_PRODUCTVERSION_STR"\0" END END @@ -66,7 +66,7 @@ BEGIN /* For example, a file might have values "0x409,1252" indicating that it */ /* supports English language (0x409) in the Windows ANSI codepage (1252). */ - VALUE "Translation", 0x409, 1252 + VALUE "Translation", 0x809, 1200 END END @@ -77,14 +77,16 @@ END /* About */ ABOUT_BOX DIALOGEX 32, 32, 260, 95 STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE | WS_TABSTOP | DS_CENTERMOUSE -CAPTION "About "XVENDORNAMESHORT +CAPTION "关于 "XVENDORNAMESHORT" " FONT 8, "MS Shell Dlg 2" BEGIN CONTROL IDI_XWIN, IDC_STATIC, "Static", SS_ICON, 8, 8, 32, 32 LTEXT "VcXsrv X Server ", IDC_STATIC, 36, 8, 220, 8 LTEXT "https://github.com/marchaesen/vcxsrv", IDC_STATIC, 36, 18, 220, 8 - LTEXT "Version "VER_PRODUCTVERSION_STR" (18 May 2024)", IDC_STATIC, 36, 28, 220, 8 - DEFPUSHBUTTON "OK", IDOK, 105, 60, 50, 15 + LTEXT "版本： "VER_FILEVERSION_STR" (18 May 2024)", IDC_STATIC, 36, 28, 220, 8 + LTEXT "cnVcXsrv @ https://github.com/dZ8Lx9OwX/cnVcXsrv", IDC_STATIC, 36, 38, 220, 8 + LTEXT "版本： "VER_PRODUCTVERSION_STR" [ 2024-05-24 ]", IDC_STATIC, 36, 48, 220, 8 + DEFPUSHBUTTON "确定", IDOK, 105, 60, 50, 15 END @@ -95,10 +97,10 @@ STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE | DS_CENTERMOUSE FONT 8, "MS Shell Dlg 2" CAPTION XVENDORNAMESHORT BEGIN - DEFPUSHBUTTON "Dismiss", IDOK, 66, 80, 50, 14 + DEFPUSHBUTTON "断开连接", IDOK, 66, 80, 50, 14 CTEXT XVENDORNAMESHORT, IDC_STATIC, 40, 12, 100, 8 - CTEXT "Disruptive screen configuration change.", IDC_STATIC, 7, 40, 166, 8 - CTEXT "Restore previous resolution to use "XVENDORNAMESHORT".", IDC_STATIC, 7, 52, 166, 8 + CTEXT "显示中断,配置已更改.", IDC_STATIC, 7, 40, 166, 8 + CTEXT "恢复以前的设置以便使用."XVENDORNAMESHORT".", IDC_STATIC, 7, 52, 166, 8 END @@ -107,25 +109,25 @@ END EXIT_DIALOG DIALOGEX 32, 32, 180, 78 STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE | WS_TABSTOP | DS_CENTERMOUSE FONT 8, "MS Shell Dlg 2" -CAPTION "Exit "XVENDORNAMESHORT"?" +CAPTION "退出 "XVENDORNAMESHORT"?" BEGIN - PUSHBUTTON "E&xit", IDOK, 55, 56, 30, 14 - DEFPUSHBUTTON "&Cancel", IDCANCEL, 95, 56, 30, 14 - CTEXT "E&xiting will close all screens running on this display.", IDC_STATIC, 7, 12, 166, 8 - CTEXT "No information about connected clients available.", IDC_CLIENTS_CONNECTED, 7, 24, 166, 8 - CTEXT "Proceed with shutdown of this display/server?", IDC_STATIC, 7, 36, 166, 8 + PUSHBUTTON "退出", IDOK, 55, 56, 30, 14 + DEFPUSHBUTTON "取消", IDCANCEL, 95, 56, 30, 14 + CTEXT "退出将关闭当前会话上运行的所有显示.", IDC_STATIC, 7, 12, 166, 8 + CTEXT "没有关于连接客户端的信息.", IDC_CLIENTS_CONNECTED, 7, 24, 166, 8 + CTEXT "继续关闭此显示/服务器？？", IDC_STATIC, 7, 36, 166, 8 END /* Xdmcp host selection dialog */ XDMCP_HOSTS DIALOGEX 32, 32, 260, 156 STYLE DS_SETFONT | DS_CENTERMOUSE | WS_POPUP | WS_VISIBLE | WS_CAPTION EXSTYLE WS_EX_NOPARENTNOTIFY -CAPTION "Select host to connect to" +CAPTION "选择要连接的主机" FONT 8, "MS Shell Dlg 2", 0, 0, 0x1 BEGIN - DEFPUSHBUTTON "Connect",IDOK,61,132,50,15 + DEFPUSHBUTTON "连接",IDOK,61,132,50,15 LISTBOX IDC_HOSTLIST,7,7,245,113,LBS_SORT | LBS_NOINTEGRALHEIGHT | LBS_NOTIFY | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Cancel",IDCANCEL,147,134,50,14 + PUSHBUTTON "取消",IDCANCEL,147,134,50,14 END /* @@ -136,12 +138,12 @@ IDM_TRAYICON_MENU MENU BEGIN POPUP "TRAYICON_MENU" BEGIN - MENUITEM "&Hide Root Window", ID_APP_HIDE_ROOT - MENUITEM "Clipboard may use &PRIMARY selection", ID_APP_MONITOR_PRIMARY - MENUITEM "Gather &Windows", ID_APP_GATHER_WINDOWS - MENUITEM "&About...", ID_APP_ABOUT + MENUITEM "隐藏根窗口", ID_APP_HIDE_ROOT + MENUITEM "剪贴板使用 PRIMARY 选择", ID_APP_MONITOR_PRIMARY + MENUITEM "显示窗口", ID_APP_GATHER_WINDOWS + MENUITEM "关于...", ID_APP_ABOUT MENUITEM SEPARATOR - MENUITEM "E&xit...", ID_APP_EXIT + MENUITEM "退出...", ID_APP_EXIT END END diff --git a/xorg-server/hw/xwin/windialogs.c b/xorg-server/hw/xwin/windialogs.c index 28226f688d..8c6ac6f77f 100644 --- a/xorg-server/hw/xwin/windialogs.c +++ b/xorg-server/hw/xwin/windialogs.c @@ -291,7 +291,7 @@ winDisplayExitDialog (winPrivScreenPtr pScreenPriv) (WPARAM) GetDlgItem(g_hDlgExit, IDCANCEL), TRUE); } -#define CONNECTED_CLIENTS_FORMAT "There %s currently %d client%s connected." +#define CONNECTED_CLIENTS_FORMAT "当前%s %d 个客户端连接%s." /* * Exit dialog window procedure @@ -315,9 +315,9 @@ winExitDlgProc(HWND hDialog, UINT message, WPARAM wParam, LPARAM lParam) /* Format the connected clients string */ if (asprintf(&pszConnectedClients, CONNECTED_CLIENTS_FORMAT, - (s_pScreenPriv->iConnectedClients == 1) ? "is" : "are", + (s_pScreenPriv->iConnectedClients == 1) ? "仅有" : "存在", s_pScreenPriv->iConnectedClients, - (s_pScreenPriv->iConnectedClients == 1) ? "" : "s") == -1) + (s_pScreenPriv->iConnectedClients == 1) ? "" : "") == -1) return TRUE; /* Set the number of connected clients */ diff --git a/xorg-server/hw/xwin/winerror.c b/xorg-server/hw/xwin/winerror.c index 840501a2b2..b16123a6d4 100644 --- a/xorg-server/hw/xwin/winerror.c +++ b/xorg-server/hw/xwin/winerror.c @@ -87,9 +87,9 @@ OsVendorFatalError(const char *f, va_list args) } } - winMessageBoxF("A fatal error has occurred and " PROJECT_NAME " will now exit.\n\n" + winMessageBoxF("发生致命错误,并且 " PROJECT_NAME " 现在将退出.\n\n" "%s\n\n" - "Please open %s for more information.\n", + "请查看 %s \n以了解更多信息.\n", MB_ICONERROR, g_FatalErrorMessage, (g_pszLogFile ? g_pszLogFile : "the logfile")); @@ -118,11 +118,11 @@ winMessageBoxF(const char *pszError, UINT uType, ...) #define MESSAGEBOXF \ "%s\n" \ - "Vendor: %s\n" \ - "Release: %d.%d.%d.%d\n" \ - "Contact: %s\n" \ + "供应商： %s\n" \ + "版本： %d.%d.%d.%d\n" \ + "链接： %s\n" \ "%s\n\n" \ - "XWin was started with the following command-line:\n\n" \ + "XWin 使用以下命令行启动：\n\n" \ "%s\n" size = asprintf(&pszMsgBox, MESSAGEBOXF, diff --git a/xorg-server/hw/xwin/winprocarg.c b/xorg-server/hw/xwin/winprocarg.c index 47d4b75f60..e7cec17db3 100644 --- a/xorg-server/hw/xwin/winprocarg.c +++ b/xorg-server/hw/xwin/winprocarg.c @@ -1237,9 +1237,9 @@ winLogVersionInfo(void) return; s_fBeenHere = TRUE; - ErrorF("Welcome to the VcXsrv X Server\n"); - ErrorF("Vendor: %s\n", XVENDORNAME); - ErrorF("Release: %d.%d.%d.%d\n\n", XORG_VERSION_MAJOR, + ErrorF("欢迎使用 VcXsrv X Server\n"); + ErrorF("供应商： %s\n", XVENDORNAME); + ErrorF("发行版： %d.%d.%d.%d\n\n", XORG_VERSION_MAJOR, XORG_VERSION_MINOR, XORG_VERSION_PATCH, XORG_VERSION_SNAP); #ifdef HAVE_SYS_UTSNAME_H { @@ -1254,6 +1254,6 @@ winLogVersionInfo(void) winOS(); if (strlen(BUILDERSTRING)) ErrorF("%s\n", BUILDERSTRING); - ErrorF("Contact: %s\n", BUILDERADDR); + ErrorF("联系方式： %s\n", BUILDERADDR); ErrorF("\n"); } diff --git a/xorg-server/hw/xwin/xlaunch/resources/dialog.rc b/xorg-server/hw/xwin/xlaunch/resources/dialog.rc index a12c8853fb..46940626be 100644 --- a/xorg-server/hw/xwin/xlaunch/resources/dialog.rc +++ b/xorg-server/hw/xwin/xlaunch/resources/dialog.rc @@ -141,13 +141,13 @@ END IDD_PROMPT DIALOGEX 32, 32, 260, 115 STYLE DS_SHELLFONT | DS_CENTERMOUSE | WS_POPUP | WS_VISIBLE | WS_CAPTION EXSTYLE WS_EX_NOPARENTNOTIFY -CAPTION "Input requested?" +CAPTION "请求输入？？？" FONT 8, "MS Shell Dlg 2", 0, 0, 0x1 BEGIN EDITTEXT IDC_INPUT,7,67,245,12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL | ES_PASSWORD EDITTEXT IDC_PROMPT_DESC,7,7,245,50, WS_BORDER | WS_TABSTOP | WS_VSCROLL | ES_READONLY | ES_MULTILINE - AUTOCHECKBOX "Show Characters", IDC_PASSWORD, 7,77,245,12, WS_TABSTOP - DEFPUSHBUTTON "OK",IDOK,61,95,50,15, WS_TABSTOP - PUSHBUTTON "Cancel",IDCANCEL,147,95,50,14, WS_TABSTOP + AUTOCHECKBOX "显示字符", IDC_PASSWORD, 7,77,245,12, WS_TABSTOP + DEFPUSHBUTTON "确认",IDOK,61,95,50,15, WS_TABSTOP + PUSHBUTTON "取消",IDCANCEL,147,95,50,14, WS_TABSTOP END diff --git a/xorg-server/hw/xwin/xlaunch/resources/resources.rc b/xorg-server/hw/xwin/xlaunch/resources/resources.rc index 76d2c80d9b..488421d402 100644 --- a/xorg-server/hw/xwin/xlaunch/resources/resources.rc +++ b/xorg-server/hw/xwin/xlaunch/resources/resources.rc @@ -29,6 +29,43 @@ #include "images.rc" #include "dialog.rc" +#define VER_FILEVERSION 21,1,13 +#define VER_FILEVERSION_STR "21.1.13" + +#define VER_PRODUCTVERSION 21,1,13.1 +#define VER_PRODUCTVERSION_STR "21.1.13.1" + +VS_VERSION_INFO VERSIONINFO +FILEVERSION VER_FILEVERSION +PRODUCTVERSION VER_PRODUCTVERSION +FILETYPE VFT_APP +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "080904B0" + BEGIN + VALUE "FileDescription", "cnVcXsrv 配置启动工具\0" + VALUE "FileVersion", VER_FILEVERSION_STR"\0" + VALUE "InternalName", "XLaunch\0" + VALUE "LegalCopyright", "https://github.com/marchaesen\0" + VALUE "OriginalFilename", "xlaunch.exe\0" + VALUE "ProductName", "cnVcXsrv\0" + VALUE "ProductVersion", VER_PRODUCTVERSION_STR"\0" + END + END + BLOCK "VarFileInfo" + BEGIN + /* The following line should only be modified for localized versions. */ + /* It consists of any number of WORD,WORD pairs, with each pair */ + /* describing a language,codepage combination supported by the file. */ + /* */ + /* For example, a file might have values "0x409,1252" indicating that it */ + /* supports English language (0x409) in the Windows ANSI codepage (1252). */ + + VALUE "Translation", 0x809, 1200 + END +END + IDI_XLAUNCH ICON "..\\..\\X.ico" 1 24 "manifest.xml" diff --git a/xorg-server/hw/xwin/xlaunch/resources/strings.rc b/xorg-server/hw/xwin/xlaunch/resources/strings.rc index 5d72952bc8..ede324f71d 100644 --- a/xorg-server/hw/xwin/xlaunch/resources/strings.rc +++ b/xorg-server/hw/xwin/xlaunch/resources/strings.rc @@ -24,78 +24,78 @@ * use or other dealings in this Software without prior written authorization. */ -#define STR_CAPTION_DISPLAY "Display settings" -#define STR_MULTIWINDOW "Multiple windows" -#define STR_FULLSCREEN "Fullscreen" -#define STR_WINDOWED "One large window" -#define STR_NODECORATION "One window without titlebar" -#define STR_DISPLAY_DESC "Display number" -#define STR_DISPLAY_EXTRA_DESC "(Specify -1 to let vcxsrv automatically choose one)" +#define STR_CAPTION_DISPLAY "显示设置" +#define STR_MULTIWINDOW "多窗口模式" +#define STR_FULLSCREEN "全屏模式" +#define STR_WINDOWED "单窗口模式" +#define STR_NODECORATION "单窗口模式\n[无标题栏]" +#define STR_DISPLAY_DESC "显示编号：" +#define STR_DISPLAY_EXTRA_DESC "[设置为 -1 VcXsrv 将自动选择]" -#define STR_CAPTION_CLIENTS "Client startup" -#define STR_CLIENT_NONE "Start no client" -#define STR_CLIENT_NONE_DESC "This will just start the xserver. You will be able to start local clients later." -#define STR_CLIENT "Start a program" -#define STR_CLIENT_DESC "This will start a local or remote program which will connect to the xserver. You will be able to start local clients later too. Remote programs are started using SSH." -#define STR_XDMCP "Open session via XDMCP" -#define STR_XDMCP_DESC "This will start a remote XDMCP session. Starting local clients later is limited. This option is not available with the ""Multiple windows"" mode." +#define STR_CAPTION_CLIENTS "客户端启动设置" +#define STR_CLIENT_NONE "不启动客户端程序" +#define STR_CLIENT_NONE_DESC "这将只启动 X Server, 稍后您可以根据自己的需求启动客户端程序." +#define STR_CLIENT "自定义客户端程序" +#define STR_CLIENT_DESC "这将启动指定的本地或远程客户端程序, 该程序将连接到 X Server.\n稍后您也可以启动其它客户端程序, 远程程序通过SSH启动." +#define STR_XDMCP "通过 XDMCP 打开会话" +#define STR_XDMCP_DESC "这将启动远程 XDMCP 会话, 稍后启动本地客户端程序是受到限制的.\n此选项在【多窗口模式】下不可用." -#define STR_CAPTION_PROGRAM "Start program" -#define STR_CLIENT_PROGRAM_DESC "Local program" -#define STR_CLIENT_LOCAL "Start program on this computer" -#define STR_CLIENT_REMOTE "Start program on remote computer" -#define STR_CLIENT_PASSWORD_DESC "Password" -#define STR_CLIENT_HOST_DESC "Connect to computer" -#define STR_CLIENT_USER_DESC "Login as user" +#define STR_CAPTION_PROGRAM "自定义客户端程序" +#define STR_CLIENT_PROGRAM_DESC "本地程序：" +#define STR_CLIENT_LOCAL "在本地计算机上启动程序" +#define STR_CLIENT_REMOTE "在远程服务器上启动程序" +#define STR_CLIENT_PASSWORD_DESC "密 码：" +#define STR_CLIENT_HOST_DESC "连接远端：" +#define STR_CLIENT_USER_DESC "登录用户：" -#define STR_CLIENT_REMOTEPROGRAM_DESC "Remote program" -#define STR_CLIENT_PRIVATEKEY_DESC "Private key (putty format)" +#define STR_CLIENT_REMOTEPROGRAM_DESC "远端程序：" +#define STR_CLIENT_PRIVATEKEY_DESC "密钥KEY [PuTTY 格式]" -#define STR_CAPTION_XDMCP "XDMCP settings" -#define STR_XDMCP_QUERY "Connect to host" -#define STR_XDMCP_INDIRECT "Use indirect connect" -#define STR_XDMCP_BROADCAST "Search for hosts (broadcast)" -#define STR_XDMCP_QUERY_DESC "Some XDMCP servers must be configured to allow remote connections. Please check the documentation about configuring XDMCP servers." +#define STR_CAPTION_XDMCP "XDMCP 连接设置" +#define STR_XDMCP_QUERY "连接主机：" +#define STR_XDMCP_INDIRECT "使用间接连接" +#define STR_XDMCP_BROADCAST "搜索主机 [广播]" +#define STR_XDMCP_QUERY_DESC "某些XDMCP服务器必须配置为允许远程连接. 请查看有关配置XDMCP服务器的文档." -#define STR_CAPTION_FONTPATH "Fontpath settings" +#define STR_CAPTION_FONTPATH "设置字体路径" -#define STR_CAPTION_EXTRA "Extra settings" -#define STR_CLIPBOARD "Clipboard" -#define STR_CLIPBOARD_DESC "Start the integrated clipboard manager" -#define STR_CLIPBOARDPRIMARY "Primary Selection" -#define STR_CLIPBOARDPRIMARY_DESC "Also map the PRIMARY selection to the windows clipboard." -#define STR_WGL "Native opengl" -#define STR_WGL_DESC "Use the native windows opengl library (wgl). Make sure to export the LIBGL_ALWAYS_INDIRECT environment variable. In WSL also export export LIBGL_ALWAYS_SOFTWARE=true" -#define STR_EXTRA_PARAMS_DESC "Additional parameters for VcXsrv" +#define STR_CAPTION_EXTRA "额外的设置" +#define STR_CLIPBOARD "剪贴板" +#define STR_CLIPBOARD_DESC "启动集成的剪贴板管理器" +#define STR_CLIPBOARDPRIMARY "主选区域" +#define STR_CLIPBOARDPRIMARY_DESC "将 PRIMARY 选择映射到 Windows 剪贴板." +#define STR_WGL "本地硬件加速 OpenGL 渲染" +#define STR_WGL_DESC "使用本机 Windows OpenGL(WGL) 接口.\n确保设置 LIBGL_ALWAYS_INDIRECT 环境变量.\n在WSL中, 也可以设置 export LIBGL_ALWAYS_SOFTWARE=true." +#define STR_EXTRA_PARAMS_DESC "VcXsrv 的其它参数：" -#define STR_DISABLEAC "Disable access control" -#define STR_DISABLEAC_DESC "Use this when you want vcxsrv to accept connections from all clients." +#define STR_DISABLEAC "禁用访问控制" +#define STR_DISABLEAC_DESC "当您希望 VcXsrv 接受来自所有客户端的连接时, 请使用此选项." -#define STR_XDMCP_TERMINATE "Terminate on server reset." +#define STR_XDMCP_TERMINATE "断开 XDMCP 连接时, 关闭 X Server." -#define STR_CAPTION_FINISH "Finish configuration" -#define STR_FINISH_DESC "Configuration is complete. Click Finish to start VcXsrv." -#define STR_FINISH_SAVE_DESC "You may also save the configuration for later use." -#define STR_FINISH_SAVE "Save configuration" +#define STR_CAPTION_FINISH "完成配置" +#define STR_FINISH_DESC "配置已完成, 单击【完成】将启动 VcXsrv." +#define STR_FINISH_SAVE_DESC "您也可以保存配置以备后用." +#define STR_FINISH_SAVE "保存配置..." -#define STR_DISPLAY_TITLE "Select display settings" -#define STR_DISPLAY_SUBTITLE "Choose how VcXsrv display programs" -#define STR_CLIENTS_TITLE "Select how to start clients" +#define STR_DISPLAY_TITLE "请选择显示模式" +#define STR_DISPLAY_SUBTITLE "这里将设置 VcXsrv 程序使用的显示方式" +#define STR_CLIENTS_TITLE "请选择如何启动客户端程序" #define STR_CLIENTS_SUBTITLE "" -#define STR_PROGRAM_TITLE "Specify the program to start" +#define STR_PROGRAM_TITLE "请指定要启动的客户端程序" #define STR_PROGRAM_SUBTITLE "" -#define STR_XDMCP_TITLE "Configure a remote XDMCP connection" +#define STR_XDMCP_TITLE "配置 XDMCP 远程连接会话" #define STR_XDMCP_SUBTITLE "" -#define STR_FONTPATH_TITLE "Define font locations" +#define STR_FONTPATH_TITLE "自定义字体位置" #define STR_FONTPATH_SUBTITLE "" -#define STR_FINISH_TITLE "Configuration complete" +#define STR_FINISH_TITLE "请选择后续操作" #define STR_FINISH_SUBTITLE "" -#define STR_EXTRA_TITLE "Extra settings" +#define STR_EXTRA_TITLE "其它可选的设置" #define STR_EXTRA_SUBTITLE "" -#define STR_SAVE_TITLE "Save configuration" +#define STR_SAVE_TITLE "保存配置" #define STR_SAVE_FILETITLE "Filename" #define STR_SAVE_FILTER "Xlaunch Files (*.xlaunch)%*.xlaunch%%" diff --git a/xorg-server/installer/noadmin.patch b/xorg-server/installer/noadmin.patch index a22913aefd..84e496942a 100644 --- a/xorg-server/installer/noadmin.patch +++ b/xorg-server/installer/noadmin.patch @@ -6,8 +6,8 @@ index 1f1f3f20cf..7a3b39eead 100644 Name "${NAME}" ; The file to write --OutFile "vcxsrv-64-debug.${VERSION}.installer.exe" -+OutFile "vcxsrv-64-debug.${VERSION}.installer.noadmin.exe" +-OutFile "cnVcXsrv-64-debug.${VERSION}.installer.exe" ++OutFile "cnVcXsrv-64-debug.${VERSION}.installer.noadmin.exe" ; The default installation directory -InstallDir $programfiles64\VcXsrv @@ -15,9 +15,9 @@ index 1f1f3f20cf..7a3b39eead 100644 SetCompressor /SOLID lzma -@@ -45,8 +45,8 @@ VIAddVersionKey /LANG=${LANG_ENGLISH} "FileDescription" "VcXsrv windows xserver" - VIAddVersionKey /LANG=${LANG_ENGLISH} "FileVersion" "${VERSION}" - VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductVersion" "${VERSION}" +@@ -45,8 +45,8 @@ VIAddVersionKey /LANG=${LANG_SimpChinese} "FileDescription" "VcXsrv windows xserver" + VIAddVersionKey /LANG=${LANG_SimpChinese} "FileVersion" "${VERSION}" + VIAddVersionKey /LANG=${LANG_SimpChinese} "ProductVersion" "${VERSION}" -; Request application privileges for Windows Vista -RequestExecutionLevel admin @@ -79,8 +79,8 @@ index eed77b32ee..5b2529f5bc 100644 Name "${NAME}" ; The file to write --OutFile "vcxsrv-64.${VERSION}.installer.exe" -+OutFile "vcxsrv-64.${VERSION}.installer.noadmin.exe" +-OutFile "cnVcXsrv-64.${VERSION}.installer.exe" ++OutFile "cnVcXsrv-64.${VERSION}.installer.noadmin.exe" ; The default installation directory -InstallDir $programfiles64\VcXsrv @@ -88,9 +88,9 @@ index eed77b32ee..5b2529f5bc 100644 SetCompressor /SOLID lzma -@@ -46,8 +46,8 @@ VIAddVersionKey /LANG=${LANG_ENGLISH} "FileDescription" "VcXsrv windows xserver" - VIAddVersionKey /LANG=${LANG_ENGLISH} "FileVersion" "${VERSION}" - VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductVersion" "${VERSION}" +@@ -46,8 +46,8 @@ VIAddVersionKey /LANG=${LANG_SimpChinese} "FileDescription" "VcXsrv windows xserver" + VIAddVersionKey /LANG=${LANG_SimpChinese} "FileVersion" "${VERSION}" + VIAddVersionKey /LANG=${LANG_SimpChinese} "ProductVersion" "${VERSION}" -; Request application privileges for Windows Vista -RequestExecutionLevel admin @@ -152,8 +152,8 @@ index 151c59d912..5345bb6a50 100644 Name "${NAME}" ; The file to write --OutFile "vcxsrv-debug.${VERSION}.installer.exe" -+OutFile "vcxsrv-debug.${VERSION}.installer.noadmin.exe" +-OutFile "cnVcXsrv-debug.${VERSION}.installer.exe" ++OutFile "cnVcXsrv-debug.${VERSION}.installer.noadmin.exe" ; The default installation directory -InstallDir $PROGRAMFILES32\VcXsrv @@ -161,9 +161,9 @@ index 151c59d912..5345bb6a50 100644 SetCompressor /SOLID lzma -@@ -42,8 +42,8 @@ VIAddVersionKey /LANG=${LANG_ENGLISH} "FileDescription" "VcXsrv windows xserver" - VIAddVersionKey /LANG=${LANG_ENGLISH} "FileVersion" "${VERSION}" - VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductVersion" "${VERSION}" +@@ -42,8 +42,8 @@ VIAddVersionKey /LANG=${LANG_SimpChinese} "FileDescription" "VcXsrv windows xserver" + VIAddVersionKey /LANG=${LANG_SimpChinese} "FileVersion" "${VERSION}" + VIAddVersionKey /LANG=${LANG_SimpChinese} "ProductVersion" "${VERSION}" -; Request application privileges for Windows Vista -RequestExecutionLevel admin @@ -180,8 +180,8 @@ index 6ccd469a4f..911552ff9e 100644 Name "${NAME}" ; The file to write --OutFile "vcxsrv.${VERSION}.installer.exe" -+OutFile "vcxsrv.${VERSION}.installer.noadmin.exe" +-OutFile "cnVcXsrv.${VERSION}.installer.exe" ++OutFile "cnVcXsrv.${VERSION}.installer.noadmin.exe" ; The default installation directory -InstallDir $PROGRAMFILES32\VcXsrv @@ -189,9 +189,9 @@ index 6ccd469a4f..911552ff9e 100644 SetCompressor /SOLID lzma -@@ -46,8 +46,8 @@ VIAddVersionKey /LANG=${LANG_ENGLISH} "FileDescription" "VcXsrv windows xserver" - VIAddVersionKey /LANG=${LANG_ENGLISH} "FileVersion" "${VERSION}" - VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductVersion" "${VERSION}" +@@ -46,8 +46,8 @@ VIAddVersionKey /LANG=${LANG_SimpChinese} "FileDescription" "VcXsrv windows xserver" + VIAddVersionKey /LANG=${LANG_SimpChinese} "FileVersion" "${VERSION}" + VIAddVersionKey /LANG=${LANG_SimpChinese} "ProductVersion" "${VERSION}" -; Request application privileges for Windows Vista -RequestExecutionLevel admin diff --git a/xorg-server/installer/vcxsrv-64-debug.nsi b/xorg-server/installer/vcxsrv-64-debug.nsi index b346bce45a..839c6b5abc 100644 --- a/xorg-server/installer/vcxsrv-64-debug.nsi +++ b/xorg-server/installer/vcxsrv-64-debug.nsi @@ -17,16 +17,16 @@ */ ;-------------------------------- !include "FileFunc.nsh" -!define NAME "VcXsrv" -!define VERSION "21.1.13.0" +!define NAME "cnVcXsrv" +!define VERSION "21.1.13.1" !define UNINSTALL_PUBLISHER "${NAME}" -!define UNINSTALL_URL "https://github.com/marchaesen/vcxsrv" +!define UNINSTALL_URL "https://github.com/dZ8Lx9OwX/cnVcXsrv" ; The name of the installer Name "${NAME}" ; The file to write -OutFile "vcxsrv-64-debug.${VERSION}.installer.exe" +OutFile "cnVcXsrv-64-debug.${VERSION}.installer.exe" ; The default installation directory InstallDir $programfiles64\VcXsrv @@ -37,13 +37,13 @@ SetCompressor /SOLID lzma ; overwrite the old one automatically) InstallDirRegKey HKLM SOFTWARE\VcXsrv "Install_Dir_64" -LoadLanguageFile "${NSISDIR}\Contrib\Language files\English.nlf" +LoadLanguageFile "${NSISDIR}\Contrib\Language files\SimpChinese.nlf" VIProductVersion "${VERSION}" -VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductName" "${NAME}" -VIAddVersionKey /LANG=${LANG_ENGLISH} "FileDescription" "VcXsrv windows xserver" -VIAddVersionKey /LANG=${LANG_ENGLISH} "FileVersion" "${VERSION}" -VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductVersion" "${VERSION}" +VIAddVersionKey /LANG=${LANG_SimpChinese} "ProductName" "${NAME}" +VIAddVersionKey /LANG=${LANG_SimpChinese} "FileDescription" "VcXsrv windows xserver" +VIAddVersionKey /LANG=${LANG_SimpChinese} "FileVersion" "${VERSION}" +VIAddVersionKey /LANG=${LANG_SimpChinese} "ProductVersion" "${VERSION}" ; Request application privileges for Windows Vista RequestExecutionLevel admin @@ -120,7 +120,7 @@ Section "VcXsrv debug exe and dlls" File "..\font-dirs" File "..\.Xdefaults" File "..\hw\xwin\xlaunch\obj64\debug\xlaunch.exe" - File "..\..\tools\plink\obj64\debug\plink.exe" +; File "..\..\tools\plink\obj64\debug\plink.exe" File "..\..\mesalib\src\obj64\debug\swrast_dri.dll" File "..\hw\xwin\swrastwgl_dri\obj64\debug\swrastwgl_dri.dll" File "..\..\dxtn\obj64\debug\dxtn.dll" @@ -271,7 +271,7 @@ Section "Uninstall" Delete "$INSTDIR\font-dirs" Delete "$INSTDIR\.Xdefaults" Delete "$INSTDIR\xlaunch.exe" - Delete "$INSTDIR\plink.exe" +; Delete "$INSTDIR\plink.exe" Delete "$INSTDIR\swrast_dri.dll" Delete "$INSTDIR\dxtn.dll" Delete "$INSTDIR\swrastwgl_dri.dll" diff --git a/xorg-server/installer/vcxsrv-64.nsi b/xorg-server/installer/vcxsrv-64.nsi index c213f54153..b0adf3cf4e 100644 --- a/xorg-server/installer/vcxsrv-64.nsi +++ b/xorg-server/installer/vcxsrv-64.nsi @@ -18,16 +18,16 @@ ;-------------------------------- !include "FileFunc.nsh" -!define NAME "VcXsrv" -!define VERSION "21.1.13.0" +!define NAME "cnVcXsrv" +!define VERSION "21.1.13.1" !define UNINSTALL_PUBLISHER "${NAME}" -!define UNINSTALL_URL "https://github.com/marchaesen/vcxsrv" +!define UNINSTALL_URL "https://github.com/dZ8Lx9OwX/cnVcXsrv" ; The name of the installer Name "${NAME}" ; The file to write -OutFile "vcxsrv-64.${VERSION}.installer.exe" +OutFile "cnVcXsrv-64.${VERSION}.installer.exe" ; The default installation directory InstallDir $programfiles64\VcXsrv @@ -38,13 +38,13 @@ SetCompressor /SOLID lzma ; overwrite the old one automatically) InstallDirRegKey HKLM SOFTWARE\VcXsrv "Install_Dir_64" -LoadLanguageFile "${NSISDIR}\Contrib\Language files\English.nlf" +LoadLanguageFile "${NSISDIR}\Contrib\Language files\SimpChinese.nlf" VIProductVersion "${VERSION}" -VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductName" "${NAME}" -VIAddVersionKey /LANG=${LANG_ENGLISH} "FileDescription" "VcXsrv windows xserver" -VIAddVersionKey /LANG=${LANG_ENGLISH} "FileVersion" "${VERSION}" -VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductVersion" "${VERSION}" +VIAddVersionKey /LANG=${LANG_SimpChinese} "ProductName" "${NAME}" +VIAddVersionKey /LANG=${LANG_SimpChinese} "FileDescription" "VcXsrv windows xserver" +VIAddVersionKey /LANG=${LANG_SimpChinese} "FileVersion" "${VERSION}" +VIAddVersionKey /LANG=${LANG_SimpChinese} "ProductVersion" "${VERSION}" ; Request application privileges for Windows Vista RequestExecutionLevel admin @@ -121,7 +121,7 @@ Section "VcXsrv (required)" File "..\font-dirs" File "..\.Xdefaults" File "..\hw\xwin\xlaunch\obj64\release\xlaunch.exe" - File "..\..\tools\plink\obj64\release\plink.exe" +; File "..\..\tools\plink\obj64\release\plink.exe" File "..\..\mesalib\src\obj64\release\swrast_dri.dll" File "..\hw\xwin\swrastwgl_dri\obj64\release\swrastwgl_dri.dll" File "..\..\dxtn\obj64\release\dxtn.dll" @@ -272,7 +272,7 @@ Section "Uninstall" Delete "$INSTDIR\font-dirs" Delete "$INSTDIR\.Xdefaults" Delete "$INSTDIR\xlaunch.exe" - Delete "$INSTDIR\plink.exe" +; Delete "$INSTDIR\plink.exe" Delete "$INSTDIR\swrast_dri.dll" Delete "$INSTDIR\dxtn.dll" Delete "$INSTDIR\swrastwgl_dri.dll" diff --git a/xorg-server/installer/vcxsrv-debug.nsi b/xorg-server/installer/vcxsrv-debug.nsi index 4bdaebc662..8eecd2bd33 100644 --- a/xorg-server/installer/vcxsrv-debug.nsi +++ b/xorg-server/installer/vcxsrv-debug.nsi @@ -16,14 +16,14 @@ * along with vcxsrv. If not, see . */ ;-------------------------------- -!define NAME "VcXsrv" -!define VERSION "21.1.13.0" +!define NAME "cnVcXsrv" +!define VERSION "21.1.13.1" ; The name of the installer Name "${NAME}" ; The file to write -OutFile "vcxsrv-debug.${VERSION}.installer.exe" +OutFile "cnVcXsrv-debug.${VERSION}.installer.exe" ; The default installation directory InstallDir $PROGRAMFILES32\VcXsrv @@ -34,13 +34,13 @@ SetCompressor /SOLID lzma ; overwrite the old one automatically) InstallDirRegKey HKLM SOFTWARE\VcXsrv "Install_Dir" -LoadLanguageFile "${NSISDIR}\Contrib\Language files\English.nlf" +LoadLanguageFile "${NSISDIR}\Contrib\Language files\SimpChinese.nlf" VIProductVersion "${VERSION}" -VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductName" "${NAME}" -VIAddVersionKey /LANG=${LANG_ENGLISH} "FileDescription" "VcXsrv windows xserver" -VIAddVersionKey /LANG=${LANG_ENGLISH} "FileVersion" "${VERSION}" -VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductVersion" "${VERSION}" +VIAddVersionKey /LANG=${LANG_SimpChinese} "ProductName" "${NAME}" +VIAddVersionKey /LANG=${LANG_SimpChinese} "FileDescription" "VcXsrv windows xserver" +VIAddVersionKey /LANG=${LANG_SimpChinese} "FileVersion" "${VERSION}" +VIAddVersionKey /LANG=${LANG_SimpChinese} "ProductVersion" "${VERSION}" ; Request application privileges for Windows Vista RequestExecutionLevel admin @@ -96,7 +96,7 @@ Section "VcXsrv debug exe and dlls" File "..\..\apps\xclock\obj\debug\xclock.exe" File "..\..\apps\xwininfo\obj\debug\xwininfo.exe" File "..\hw\xwin\xlaunch\obj\debug\xlaunch.exe" - File "..\..\tools\plink\obj\debug\plink.exe" +; File "..\..\tools\plink\obj\debug\plink.exe" File "..\..\mesalib\src\obj\debug\swrast_dri.dll" File "..\hw\xwin\swrastwgl_dri\obj\debug\swrastwgl_dri.dll" File "..\..\dxtn\obj\debug\dxtn.dll" diff --git a/xorg-server/installer/vcxsrv.nsi b/xorg-server/installer/vcxsrv.nsi index 3d6d1d4086..a9e126a9bc 100644 --- a/xorg-server/installer/vcxsrv.nsi +++ b/xorg-server/installer/vcxsrv.nsi @@ -18,16 +18,16 @@ ;-------------------------------- !include "FileFunc.nsh" -!define NAME "VcXsrv" -!define VERSION "21.1.13.0" +!define NAME "cnVcXsrv" +!define VERSION "21.1.13.1" !define UNINSTALL_PUBLISHER "${NAME}" -!define UNINSTALL_URL "https://github.com/marchaesen/vcxsrv" +!define UNINSTALL_URL "https://github.com/dZ8Lx9OwX/cnVcXsrv" ; The name of the installer Name "${NAME}" ; The file to write -OutFile "vcxsrv.${VERSION}.installer.exe" +OutFile "cnVcXsrv.${VERSION}.installer.exe" ; The default installation directory InstallDir $PROGRAMFILES32\VcXsrv @@ -38,13 +38,13 @@ SetCompressor /SOLID lzma ; overwrite the old one automatically) InstallDirRegKey HKLM SOFTWARE\VcXsrv "Install_Dir" -LoadLanguageFile "${NSISDIR}\Contrib\Language files\English.nlf" +LoadLanguageFile "${NSISDIR}\Contrib\Language files\SimpChinese.nlf" VIProductVersion "${VERSION}" -VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductName" "${NAME}" -VIAddVersionKey /LANG=${LANG_ENGLISH} "FileDescription" "VcXsrv windows xserver" -VIAddVersionKey /LANG=${LANG_ENGLISH} "FileVersion" "${VERSION}" -VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductVersion" "${VERSION}" +VIAddVersionKey /LANG=${LANG_SimpChinese} "ProductName" "${NAME}" +VIAddVersionKey /LANG=${LANG_SimpChinese} "FileDescription" "VcXsrv windows xserver" +VIAddVersionKey /LANG=${LANG_SimpChinese} "FileVersion" "${VERSION}" +VIAddVersionKey /LANG=${LANG_SimpChinese} "ProductVersion" "${VERSION}" ; Request application privileges for Windows Vista RequestExecutionLevel admin @@ -119,7 +119,7 @@ Section "VcXsrv (required)" File "..\font-dirs" File "..\.Xdefaults" File "..\hw\xwin\xlaunch\obj\release\xlaunch.exe" - File "..\..\tools\plink\obj\release\plink.exe" +; File "..\..\tools\plink\obj\release\plink.exe" File "..\..\mesalib\src\obj\release\swrast_dri.dll" File "..\hw\xwin\swrastwgl_dri\obj\release\swrastwgl_dri.dll" File "..\..\dxtn\obj\release\dxtn.dll" @@ -261,7 +261,7 @@ Section "Uninstall" Delete "$INSTDIR\font-dirs" Delete "$INSTDIR\.Xdefaults" Delete "$INSTDIR\xlaunch.exe" - Delete "$INSTDIR\plink.exe" +; Delete "$INSTDIR\plink.exe" Delete "$INSTDIR\swrast_dri.dll" Delete "$INSTDIR\dxtn.dll" Delete "$INSTDIR\swrastwgl_dri.dll" diff --git a/xorg-server/makefile b/xorg-server/makefile index fa28e5e537..47da43e2f0 100644 --- a/xorg-server/makefile +++ b/xorg-server/makefile @@ -80,7 +80,6 @@ EXTRASTOBUILD = \ ..\apps\xhost\$(NOSERVOBJDIR)\xhost.exe \ ..\apps\xrdb\$(NOSERVOBJDIR)\xrdb.exe \ ..\apps\xauth\$(NOSERVOBJDIR)\xauth.exe \ - ..\tools\plink\$(NOSERVOBJDIR)\plink.exe \ hw\xwin\swrastwgl_dri\$(NOSERVOBJDIR)\swrastwgl_dri.dll \ ..\dxtn\$(NOSERVOBJDIR)\dxtn.dll diff --git a/xorg-server/os/connection.c b/xorg-server/os/connection.c index ed41a73054..50259ded69 100644 --- a/xorg-server/os/connection.c +++ b/xorg-server/os/connection.c @@ -322,7 +322,7 @@ CreateWellKnownSockets(void) if (ListenTransCount == 0 && !NoListenAll) FatalError - ("Cannot establish any listening sockets - Make sure an X server isn't already running"); + ("无法建立任何监听套接字 - 请确保 X Server 尚未运行！"); #if !defined(WIN32) OsSignal(SIGPIPE, SIG_IGN); diff --git a/xorg-server/os/log.c b/xorg-server/os/log.c index 21e1a4989f..44eb609c48 100644 --- a/xorg-server/os/log.c +++ b/xorg-server/os/log.c @@ -229,7 +229,7 @@ LogFilePrep(const char *fname, const char *backup, const char *idstring) } if (rename(logFileName, oldLog) == -1) { - ErrorF("Cannot move old log file \"%s\" to \"%s\"\n", + ErrorF("无法移动旧的日志文件 \"%s\" 到 \"%s\"\n", logFileName, oldLog); } free(oldLog); @@ -991,9 +991,9 @@ FatalError(const char *f, ...) static Bool beenhere = FALSE; if (beenhere) - ErrorFSigSafe("\nFatalError re-entered, aborting\n"); + ErrorFSigSafe("\n重复输入致命错误, 中止\n"); else - ErrorFSigSafe("\nFatal server error:\n"); + ErrorFSigSafe("\n服务器致命错误:\n"); va_start(args, f); diff --git a/xorg-server/system.XWinrc b/xorg-server/system.XWinrc index 548d14b038..193b8ec951 100644 --- a/xorg-server/system.XWinrc +++ b/xorg-server/system.XWinrc @@ -80,28 +80,28 @@ // Make some menus... menu apps { - xcalc exec "xcalc" - xclock exec "xclock" - xwininfo exec "xwininfo -pause" + exec "xcalc" + ʱ exec "xclock" + XWinϢ exec "xwininfo -pause" } menu root { // Comments fit here, too... - "Reload system.XWinrc" RELOAD - "Applications" menu apps + "¼system.XWinrc" RELOAD + "Ӧó" menu apps Separator - "Show log" exec "notepad %logfile%" + "ʾ־" exec "notepad %logfile%" Separator } menu aot { Separator - "Always on Top" alwaysontop + "ʼö" alwaysontop } menu xtermspecial { "Emacs" exec "emacs" - "Always on Top" alwaysontop + "ʼö" alwaysontop Separator }