提交修改

dZ8Lx9OwX · May 25, 2024 · 6ff7b7d · 6ff7b7d
1 parent e1e4444
commit 6ff7b7d
Show file tree

Hide file tree

Showing 17 changed files with 211 additions and 173 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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"