Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [TRANSLATION] Update Chinese translation. (#1187)
by Luo Yufan 25 Dec '18

25 Dec '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0a3f6f3b47a2c315092a3… commit 0a3f6f3b47a2c315092a3522b90d38de1cc6317d Author: Luo Yufan <njlyf2011(a)hotmail.com> AuthorDate: Tue Dec 25 16:28:36 2018 +0800 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Tue Dec 25 17:28:36 2018 +0900 [TRANSLATION] Update Chinese translation. (#1187) [REG][REACTOS][EXPLORER][APPWIZ][CONSOLE][INETCPL][INPUT] [INTL][OPENGLCFG][TIMEDATE][DEVCPUX][COMCTL32][COMDLG32] [MSGINA][NETCFGX][NETID][SETUPAPI][SHELL32][SYSSETUP] Update Simplified and Traditional Chinese translations. --- base/applications/cmdutils/reg/lang/zh-TW.rc | 2 +- base/setup/reactos/lang/zh-TW.rc | 61 ++++++++++++++-------------- base/shell/explorer/lang/zh-TW.rc | 31 +++++++------- dll/cpl/appwiz/lang/zh-TW.rc | 2 +- dll/cpl/console/lang/zh-TW.rc | 4 +- dll/cpl/inetcpl/lang/zh-TW.rc | 4 +- dll/cpl/input/lang/zh-TW.rc | 4 +- dll/cpl/intl/lang/zh-CN.rc | 3 +- dll/cpl/intl/lang/zh-TW.rc | 19 +++++---- dll/cpl/openglcfg/lang/zh-CN.rc | 2 +- dll/cpl/timedate/lang/zh-TW.rc | 2 +- dll/shellext/devcpux/lang/zh-TW.rc | 23 +++++++++++ dll/shellext/devcpux/processor.rc | 6 +++ dll/win32/comctl32/lang/comctl_Tw.rc | 18 ++++---- dll/win32/comdlg32/lang/cdlg_Zh.rc | 2 +- dll/win32/msgina/lang/zh-TW.rc | 26 ++++++------ dll/win32/netcfgx/lang/zh-TW.rc | 2 +- dll/win32/netid/lang/zh-TW.rc | 53 ++++++++++++------------ dll/win32/setupapi/lang/zh-TW.rc | 2 +- dll/win32/shell32/lang/zh-TW.rc | 22 +++++----- dll/win32/syssetup/lang/zh-TW.rc | 6 +-- 21 files changed, 164 insertions(+), 130 deletions(-) diff --git a/base/applications/cmdutils/reg/lang/zh-TW.rc b/base/applications/cmdutils/reg/lang/zh-TW.rc index 1ff58c1a08..1dbd4d0f34 100644 --- a/base/applications/cmdutils/reg/lang/zh-TW.rc +++ b/base/applications/cmdutils/reg/lang/zh-TW.rc @@ -11,7 +11,7 @@ STRINGTABLE STRING_SUCCESS, "操作已成功完成\n" STRING_INVALID_KEY, "錯誤: 無效的金鑰名稱\n" STRING_INVALID_CMDLINE, "錯誤: 無效的命令列參數\n" - STRING_NO_REMOTE, "錯誤: 無法訪問遠端計算機\n" + STRING_NO_REMOTE, "錯誤: 無法訪問遠端電腦\n" STRING_CANNOT_FIND, "錯誤: 系統是無法找到指定的註冊表項或值\n" STRING_UNSUPPORTED_TYPE, "錯誤: 不支援的類型\n" STRING_MISSING_INTEGER, "reg: The option [/d] must be followed by a valid integer\n" diff --git a/base/setup/reactos/lang/zh-TW.rc b/base/setup/reactos/lang/zh-TW.rc index 5f6ede0e50..aad01086b1 100644 --- a/base/setup/reactos/lang/zh-TW.rc +++ b/base/setup/reactos/lang/zh-TW.rc @@ -1,32 +1,33 @@ /* Traditional Chinese translation by Henry Tang Ih 2016 (henrytang2(a)hotmail.com) */ +/* Translation has been changed by Luo Yufan (njlyf2011(a)hotmail.com) */ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL IDD_STARTPAGE DIALOGEX 0, 0, 317, 193 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "ReactOS 安裝" +CAPTION "ReactOS 安裝程式" FONT 9, "新細明體" BEGIN - LTEXT "歡迎使用 ReactOS 安裝嚮導", IDC_STARTTITLE, 115, 8, 195, 24 - LTEXT "您不能直接從此CD安裝 ReactOS！請重新啟動並從CD引導您的電腦以便安裝 ReactOS。", IDC_STATIC, 115, 40, 195, 100 - LTEXT "點選完成退出安裝。", IDC_STATIC, 115, 169, 195, 17 + LTEXT "歡迎使用 ReactOS 安裝程式精靈", IDC_STARTTITLE, 115, 8, 195, 24 + LTEXT "您不能直接從此 CD 安裝 ReactOS！請重新啟動並從 CD 啟動您的電腦以便安裝 ReactOS。", IDC_STATIC, 115, 40, 195, 100 + LTEXT "點選完成退出安裝程式。", IDC_STATIC, 115, 169, 195, 17 END IDD_TYPEPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "ReactOS 安裝" +CAPTION "ReactOS 安裝程式" FONT 9, "新細明體" BEGIN AUTORADIOBUTTON "安裝 ReactOS", IDC_INSTALL, 7, 7, 277, 10, WS_GROUP | WS_TABSTOP - LTEXT "安裝 ReactOS 的新副本。此選項沒有儲存你的檔案、設定和程式。你可以對磁碟和分區進行更改。", IDC_INSTALLTEXT, 18, 18, 269, 25, NOT WS_GROUP + LTEXT "安裝 ReactOS 的新副本。此選項沒有儲存你的檔案、設定和程式。你可以對磁碟和磁碟區進行更改。", IDC_INSTALLTEXT, 18, 18, 269, 25, NOT WS_GROUP AUTORADIOBUTTON "修復或更新已安裝的 ReactOS", IDC_UPDATE, 7, 50, 277, 10 - LTEXT "更新或修復 ReactOS 安裝的副本。此選項會儲存您的檔案、設定和程式。如果 ReactOS 已經安裝在此計算機上, 此選項才能使用的。", IDC_UPDATETEXT, 18, 61, 269, 30, NOT WS_GROUP + LTEXT "更新或修復 ReactOS 安裝程式的副本。此選項會儲存您的檔案、設定和程式。如果 ReactOS 已經安裝在此電腦上, 此選項才能使用的。", IDC_UPDATETEXT, 18, 61, 269, 30, NOT WS_GROUP LTEXT "點選下一步安裝裝置。", IDC_STATIC, 7, 128, 297, 8 END IDD_UPDATEREPAIRPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "ReactOS 安裝" +CAPTION "ReactOS 安裝程式" FONT 8, "MS Shell Dlg" BEGIN LTEXT "The ReactOS Setup can upgrade one of the available ReactOS installations listed below, or, if a ReactOS installation is damaged, the Setup program can attempt to repair it.", IDC_STATIC, 6, 6, 300, 18 @@ -37,38 +38,38 @@ END IDD_DEVICEPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "ReactOS 安裝" +CAPTION "ReactOS 安裝程式" FONT 9, "新細明體" BEGIN - LTEXT "計算機:", IDC_STATIC, 20, 15, 80, 10 + LTEXT "電腦:", IDC_STATIC, 20, 15, 80, 10 CONTROL "", IDC_COMPUTER, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 15, 180, 80 LTEXT "顯示:", IDC_STATIC, 20, 35, 80, 10 CONTROL "", IDC_DISPLAY, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 35, 180, 80 LTEXT "鍵盤:", IDC_STATIC, 20, 55, 80, 10 CONTROL "", IDC_KEYBOARD, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 55, 180, 80 - LTEXT "點選下一步設定安裝驅動器。", IDC_STATIC, 7, 128, 297, 8 + LTEXT "點選下一步設定安裝的磁碟機。", IDC_STATIC, 7, 128, 297, 8 END IDD_DRIVEPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "ReactOS 安裝" +CAPTION "ReactOS 安裝程式" FONT 9, "新細明體" BEGIN CONTROL "", IDC_PARTITION, "SysTreeList32", WS_BORDER | WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112 PUSHBUTTON "建立(&C)", IDC_PARTCREATE, 7, 122, 50, 15 PUSHBUTTON "刪除(&D)", IDC_PARTDELETE, 63, 122, 50, 15 PUSHBUTTON "驅動器(&r)", IDC_DEVICEDRIVER, 174, 122, 50, 15, WS_DISABLED - PUSHBUTTON "高階選項(&A)...", IDC_PARTMOREOPTS, 230, 122, 80, 15 + PUSHBUTTON "進階選項(&A)...", IDC_PARTMOREOPTS, 230, 122, 80, 15 // LTEXT "點選下一步檢查安裝概要。", IDC_STATIC, 10, 180, 277, 20 END IDD_PARTITION DIALOGEX 0, 0, 145, 90 STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION -CAPTION "建立分區" +CAPTION "建立磁碟區" FONT 9, "新細明體" BEGIN CONTROL "", IDC_UPDOWN1, "msctls_updown32", WS_VISIBLE, 104, 22, 9, 13 - CONTROL "建立並格式化分區", IDC_STATIC, "Button", BS_GROUPBOX, 7, 5, 129, 57 + CONTROL "建立並格式化磁碟區", IDC_STATIC, "Button", BS_GROUPBOX, 7, 5, 129, 57 LTEXT "大小:", IDC_STATIC, 13, 24, 27, 9 EDITTEXT IDC_PARTSIZE, 58, 22, 47, 13, WS_VISIBLE | WS_TABSTOP LTEXT "GB", IDC_UNIT, 117, 24, 14, 9 @@ -80,7 +81,7 @@ END IDD_BOOTOPTIONS DIALOGEX 0, 0, 305, 116 STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION -CAPTION "高階分區設定" +CAPTION "進階磁碟區設定" FONT 9, "新細明體" BEGIN CONTROL "安裝資料夾", IDC_STATIC, "Button", BS_GROUPBOX, 4, 1, 298, 30 @@ -95,7 +96,7 @@ END IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "ReactOS 安裝" +CAPTION "ReactOS 安裝程式" FONT 9, "新細明體" BEGIN LTEXT "Installation type:", IDC_STATIC, 18, 5, 74, 11 @@ -121,7 +122,7 @@ END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "ReactOS 安裝" +CAPTION "ReactOS 安裝程式" FONT 9, "新細明體" BEGIN LTEXT "安裝檔案...", IDC_ACTIVITY, 20, 50, 277, 10 @@ -131,7 +132,7 @@ END IDD_RESTARTPAGE DIALOGEX 0, 0, 317, 193 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "ReactOS 安裝完成" +CAPTION "ReactOS 安裝程式完成" FONT 9, "新細明體" BEGIN LTEXT "Completing the ReactOS Setup Wizard", IDC_FINISHTITLE, 115, 8, 195, 24 @@ -143,29 +144,29 @@ END STRINGTABLE BEGIN - IDS_TYPETITLE "ReactOS 安裝" + IDS_TYPETITLE "ReactOS 安裝程式" IDS_TYPESUBTITLE "選擇安裝類型。" IDS_DEVICETITLE "設定基本裝置。" IDS_DEVICESUBTITLE "指定顯示和鍵盤設定。" - IDS_DRIVETITLE "設定安裝分區和系統資料夾" - IDS_DRIVESUBTITLE "設定安裝分區，系統資料夾和載入程式。" - IDS_PROCESSTITLE "設定分區，複製檔案並安裝系統" - IDS_PROCESSSUBTITLE "建立並格式化分區，複製檔案，安裝並設定載入程式" + IDS_DRIVETITLE "設定安裝磁碟區和系統資料夾" + IDS_DRIVESUBTITLE "設定安裝磁碟區，系統資料夾和載入程式。" + IDS_PROCESSTITLE "設定磁碟區，複製檔案並安裝系統" + IDS_PROCESSSUBTITLE "建立並格式化磁碟區，複製檔案，安裝並設定載入程式" IDS_RESTARTTITLE "第一階段安裝完成" IDS_RESTARTSUBTITLE "第一階段安裝已經完成，重新啟動進行第二階段安裝" IDS_SUMMARYTITLE "安裝概要" IDS_SUMMARYSUBTITLE "正是安裝前列出安裝屬性以供檢查" - IDS_ABORTSETUP "ReactOS 未在您的電腦上安裝完成。如果您現在退出安裝程式，您需要在一次運行安裝程式來安裝 ReactOS。確定退出？" + IDS_ABORTSETUP "ReactOS 未在您的電腦上安裝完成。如果您現在退出安裝程式，您需要在一次執行安裝程式來安裝 ReactOS。確定退出？" IDS_ABORTSETUP2 "終止安裝？" IDS_NO_TXTSETUP_SIF "無法找到 'txtsetup.sif'。\n安裝程式無法繼續。" - IDS_CAPTION "ReactOS 安裝" + IDS_CAPTION "ReactOS 安裝程式" END STRINGTABLE BEGIN - IDS_INSTALLATION_NAME "Name" - IDS_INSTALLATION_PATH "Installation Path" - IDS_INSTALLATION_VENDOR "Vendor Name" + IDS_INSTALLATION_NAME "名稱" + IDS_INSTALLATION_PATH "安裝路徑" + IDS_INSTALLATION_VENDOR "廠商名稱" END STRINGTABLE @@ -173,5 +174,5 @@ BEGIN IDS_PARTITION_NAME "名稱" IDS_PARTITION_TYPE "類型" IDS_PARTITION_SIZE "大小" - IDS_PARTITION_STATUS "Status" + IDS_PARTITION_STATUS "狀態" END diff --git a/base/shell/explorer/lang/zh-TW.rc b/base/shell/explorer/lang/zh-TW.rc index 84390ad32c..563a0a34fc 100644 --- a/base/shell/explorer/lang/zh-TW.rc +++ b/base/shell/explorer/lang/zh-TW.rc @@ -4,6 +4,7 @@ * FILE: base/shell/explorer/lang/zh-TW.rc * PURPOSE: Traditional Chinese Language File for ReactOS Explorer * TRANSLATOR: 2015-04-27 Alvin Wong <alvinhochun [at] gmail [dot] com> + * 2018-12-25 Luo Yufan <njlyf2011 [at] hotmail [dot] com> */ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL @@ -122,28 +123,28 @@ END IDD_CLASSICSTART_CUSTOMIZE DIALOGEX 0, 0, 232, 240, 0 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME -CAPTION "自定義經典開始選單" +CAPTION "自訂經典開始功能表" FONT 9, "新細明體" BEGIN - GROUPBOX "開始選單", IDC_STATIC, 8, 7, 218, 114 + GROUPBOX "開始功能表", IDC_STATIC, 8, 7, 218, 114 ICON IDI_STARTMENU2, IDC_STATIC, 19, 17, 20, 20 - LTEXT "你可以通過添加或移除項自定義開始選單。", IDC_STATIC, 48, 17, 108, 39 + LTEXT "你可以通過添加或移除項自訂開始功能表。", IDC_STATIC, 48, 17, 108, 39 PUSHBUTTON "添加...(&D)", IDC_CLASSICSTART_ADD, 162, 18, 53, 14 PUSHBUTTON "刪除...(&R)", IDC_CLASSICSTART_REMOVE, 162, 33, 53, 14 PUSHBUTTON "高階(&V)", IDC_CLASSICSTART_ADVANCED, 162, 49, 53, 14 PUSHBUTTON "排序(&S)", IDC_CLASSICSTART_SORT, 162, 65, 53, 14 ICON IDI_RECYCLEBIN, IDC_STATIC, 20, 85, 20, 20 - LTEXT "要刪除最近訪問過的檔案、程式和網站點記錄，單擊清除。", IDC_STATIC, 49, 85, 108, 33 + LTEXT "要刪除最近訪問過的檔案、程式和網站點記錄，點選清除。", IDC_STATIC, 49, 85, 108, 33 PUSHBUTTON "清除(&C)", IDC_CLASSICSTART_CLEAR, 162, 94, 53, 14 - LTEXT "開始選單中的高階的選項:(&T)", IDC_STATIC, 8, 129, 150, 8 - CONTROL "開始選單設定(&T)", IDC_CLASSICSTART_SETTINGS, "SysTreeView32", WS_BORDER | 0x00000001, 8, 139, 218, 72, WS_EX_CLIENTEDGE + LTEXT "開始功能表中的高階的選項:(&T)", IDC_STATIC, 8, 129, 150, 8 + CONTROL "開始功能表設定(&T)", IDC_CLASSICSTART_SETTINGS, "SysTreeView32", WS_BORDER | 0x00000001, 8, 139, 218, 72, WS_EX_CLIENTEDGE DEFPUSHBUTTON "確定", IDOK, 122, 220, 50, 14 PUSHBUTTON "取消", IDCANCEL, 176, 220, 50, 14 END IDD_FILENAME_WARNING DIALOGEX 0, 0, 272, 81, 0 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUPWINDOW | WS_DLGFRAME -CAPTION "檔名稱警告" +CAPTION "檔案名稱警告" FONT 9, "新細明體" BEGIN DEFPUSHBUTTON "忽略(&I)", IDIGNORE, 215, 60, 50, 14 @@ -151,7 +152,7 @@ BEGIN LTEXT "", IDC_STATIC, 7, 51, 258, 1, NOT WS_GROUP AUTOCHECKBOX "不執行此檢查啟動時(&D)", IDC_NOTCHECK, 7, 62, 139, 10 ICON 32515, IDC_STATIC, 7, 7, 21, 20 - LTEXT "有是一個檔案或資料夾在您的計算機被稱為 %s 這可能會導致某些應用程式不能夠正確。重新命名為 %s 將解決這個問題。您想現在重新命名它?", IDC_STATIC, 34, 7, 224, 37 + LTEXT "有是一個檔案或資料夾在您的電腦中被稱為 %s 這可能會導致某些應用程式不能夠正確。重新命名為 %s 將解決這個問題。您想現在重新命名它?", IDC_STATIC, 34, 7, 224, 37 END IDD_MODERNSTART_ADVANCED DIALOGEX 0, 0, 251, 198, 0 @@ -159,11 +160,11 @@ STYLE DS_SETFONT | WS_CAPTION | WS_CHILD | WS_DISABLED CAPTION "高階" FONT 9, "新細明體" BEGIN - GROUPBOX "開始選單設定 ", IDC_STATIC, 7, 7, 238, 42 + GROUPBOX "開始功能表設定 ", IDC_STATIC, 7, 7, 238, 42 AUTOCHECKBOX "與我的滑鼠上他們暫停時開啟子選單(&O)", IDC_AUTOOPEN, 14, 21, 224, 10 AUTOCHECKBOX "突出顯示新安裝的程式(&N)", IDC_HIGHLIGHT, 14, 35, 224, 10 - LTEXT "開始選單項:(&M)", IDC_STATIC, 7, 53, 238, 8 - CONTROL "開始選單設定(&T)", IDC_ITEMS, "SysTreeView32", WS_BORDER | 0x00000001, 7, 63, 238, 67, WS_EX_CLIENTEDGE + LTEXT "開始功能表項:(&M)", IDC_STATIC, 7, 53, 238, 8 + CONTROL "開始功能表設定(&T)", IDC_ITEMS, "SysTreeView32", WS_BORDER | 0x00000001, 7, 63, 238, 67, WS_EX_CLIENTEDGE GROUPBOX "最近使用的檔案 ", IDC_STATIC, 7, 133, 238, 56 LTEXT "選擇此選項來提供對您最近開啟的檔案的快速訪問。清除此列表並不會刪除檔案。", IDC_STATIC, 14, 144, 224, 21 AUTOCHECKBOX "列出我最近開啟的檔案(&R)", IDC_RECENTLY, 14, 168, 147, 10 @@ -181,12 +182,12 @@ BEGIN AUTORADIOBUTTON "大圖示(&L)", IDC_CHOOSELARGE, 43, 25, 53, 10 AUTORADIOBUTTON "小圖示(&S)", IDC_CHOOSESMALL, 177, 25, 51, 10, NOT WS_TABSTOP GROUPBOX "程式 ", IDC_STATIC, 7, 49, 238, 70 - LTEXT "開始選單包含您最常使用的程式的快捷方式。清除快捷方式的列表並不會刪除程式。", IDC_STATIC, 14, 63, 224, 20 - LTEXT "開始選單上的程式的數目:(&N)", IDC_STATIC, 14, 86, 112, 8 + LTEXT "開始功能表包含您最常使用的程式的快捷方式。清除快捷方式的列表並不會刪除程式。", IDC_STATIC, 14, 63, 224, 20 + LTEXT "開始功能表上的程式的數目:(&N)", IDC_STATIC, 14, 86, 112, 8 EDITTEXT IDC_NUMBEROFPROGRAMS, 133, 84, 27, 12, ES_LEFT | ES_RIGHT | ES_NUMBER CONTROL "", IDC_NUMBERUPDOWN, "msctls_updown32", WS_BORDER | 0x000000B6, 160, 84, 11, 12 PUSHBUTTON "清除列表(&C)", IDC_CLEARLIST, 182, 98, 57, 14 - GROUPBOX "在開始選單上顯示 ", IDC_STATIC, 7, 126, 238, 63 + GROUPBOX "在開始功能表上顯示 ", IDC_STATIC, 7, 126, 238, 63 AUTOCHECKBOX "網際網路:(&I)", IDC_SHOWINTERNET, 14, 140, 42, 10 COMBOBOX IDC_INTERNETDEFAULTAPP, 98, 138, 140, 200, CBS_DROPDOWNLIST | WS_VSCROLL AUTOCHECKBOX "電子郵件:(&E)", IDC_SHOWEMAIL, 14, 157, 37, 10 @@ -205,5 +206,5 @@ END STRINGTABLE BEGIN IDS_TASKBAR_STARTMENU_PROP_CAPTION "工作列及開始功能表" - IDS_RESTORE_ALL "&Show Open Windows" + IDS_RESTORE_ALL "顯示開啟的視窗(&S)" END diff --git a/dll/cpl/appwiz/lang/zh-TW.rc b/dll/cpl/appwiz/lang/zh-TW.rc index d3090e83a6..02c360daa9 100644 --- a/dll/cpl/appwiz/lang/zh-TW.rc +++ b/dll/cpl/appwiz/lang/zh-TW.rc @@ -31,7 +31,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "新建快捷方式" FONT 9, "新細明體", 0, 0, 0x0 BEGIN - LTEXT "此嚮導幫助您創建本地或網路程式、檔案、目錄、計算機或Internet地址的快捷方式。", -1, 120, 15, 200, 30 + LTEXT "此精靈幫助您創建本地或網路程式、檔案、目錄、計算機或Internet地址的快捷方式。", -1, 120, 15, 200, 30 LTEXT "輸入項目位置：", -1, 120, 50, 120, 10 EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT PUSHBUTTON "瀏覽...", IDC_SHORTCUT_BROWSE, 272, 65, 55, 15, ES_LEFT diff --git a/dll/cpl/console/lang/zh-TW.rc b/dll/cpl/console/lang/zh-TW.rc index dadcc5ae9c..98f0889401 100644 --- a/dll/cpl/console/lang/zh-TW.rc +++ b/dll/cpl/console/lang/zh-TW.rc @@ -13,7 +13,7 @@ BEGIN AUTORADIOBUTTON "大(&L)", IDC_RADIO_LARGE_CURSOR, 15, 60, 90, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP GROUPBOX "顯示選項", IDC_STATIC, 133, 7, 112, 70, WS_CHILD | WS_VISIBLE | WS_GROUP AUTORADIOBUTTON "視窗(&W)", IDC_RADIO_DISPLAY_WINDOW, 142, 20, 70, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP - AUTORADIOBUTTON "全屏顯示(&F)", IDC_RADIO_DISPLAY_FULL, 142, 40, 70, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP + AUTORADIOBUTTON "全螢幕顯示(&F)", IDC_RADIO_DISPLAY_FULL, 142, 40, 70, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP GROUPBOX "命令記錄", IDC_STATIC, 7, 85, 120, 77, WS_CHILD | WS_VISIBLE | WS_GROUP LTEXT "緩衝區大小(&B):", IDC_STATIC, 14, 101, 70, 12 EDITTEXT IDC_EDIT_BUFFER_SIZE, 90, 97, 30, 15, ES_RIGHT | ES_NUMBER | WS_GROUP @@ -56,7 +56,7 @@ END IDD_PROPPAGELAYOUT DIALOGEX 0, 0, 253, 220 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION -CAPTION "佈局" +CAPTION "版面" FONT 9, "新細明體" BEGIN LTEXT "視窗預覽：", IDC_STATIC, 7, 7, 115, 10 diff --git a/dll/cpl/inetcpl/lang/zh-TW.rc b/dll/cpl/inetcpl/lang/zh-TW.rc index 22c0454c02..c059b030fb 100644 --- a/dll/cpl/inetcpl/lang/zh-TW.rc +++ b/dll/cpl/inetcpl/lang/zh-TW.rc @@ -28,7 +28,7 @@ BEGIN IDS_CPL_NAME "網際網路設定" IDS_CPL_INFO "配置 Wine 網際網路瀏覽器和相關的設定" IDS_SEC_SETTINGS "區域的安全設定: " - IDS_SEC_LEVEL0 "自定義" + IDS_SEC_LEVEL0 "自訂" IDS_SEC_LEVEL1 "非常低" IDS_SEC_LEVEL2 "低" IDS_SEC_LEVEL3 "中等" @@ -67,7 +67,7 @@ BEGIN AUTOCHECKBOX "網際網路臨時檔案\n快取的網站頁面、影象和證書的副本。", IDC_DELETE_TEMP_FILES, 10, 8, 230, 40, BS_TOP | BS_MULTILINE - AUTOCHECKBOX "小型文字檔案\n通過網站在您的計算機上儲存檔案存儲使用者首選項和登入資訊。", + AUTOCHECKBOX "Cookie\n通過網站在您的電腦上儲存檔案存儲使用者首選項和登入資訊。", IDC_DELETE_COOKIES, 10, 48, 230, 40, BS_TOP | BS_MULTILINE AUTOCHECKBOX "歷史記錄\n您進入的網站的列表。", IDC_DELETE_HISTORY, 10, 88, 230, 40, BS_TOP | BS_MULTILINE diff --git a/dll/cpl/input/lang/zh-TW.rc b/dll/cpl/input/lang/zh-TW.rc index 8cbd9378e7..09266166f4 100644 --- a/dll/cpl/input/lang/zh-TW.rc +++ b/dll/cpl/input/lang/zh-TW.rc @@ -93,11 +93,11 @@ END STRINGTABLE BEGIN IDS_CPLSYSTEMNAME "文字服務和輸入語言" - IDS_CPLSYSTEMDESCRIPTION "自定義語言的文字輸入設定" + IDS_CPLSYSTEMDESCRIPTION "自訂語言的文字輸入設定" IDS_KEYBOARD "鍵盤" IDS_NONE "(無)" IDS_UNKNOWN "(未知)" - IDS_RESTART "現在就重新啟動計算機嗎?" + IDS_RESTART "現在就重新啟動電腦嗎?" IDS_WHATS_THIS "這是什麼?" IDS_LANGUAGE "語言" IDS_LAYOUT "鍵盤佈局" diff --git a/dll/cpl/intl/lang/zh-CN.rc b/dll/cpl/intl/lang/zh-CN.rc index 2cb05a1c0f..db0d7d5040 100644 --- a/dll/cpl/intl/lang/zh-CN.rc +++ b/dll/cpl/intl/lang/zh-CN.rc @@ -1,4 +1,5 @@ /* Simplified Chinese translation by Jingjing Fu (jingjingf AT 188.com) 2009-05-02 */ +/* Translation has been changed by Luo Yufan 2018 (njlyf2011(a)hotmail.com) */ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED @@ -8,7 +9,7 @@ CAPTION "区域选项" FONT 9, "宋体" BEGIN GROUPBOX "标准和格式", -1, 5, 5, 234, 162 - LTEXT "这个选项影响到某些程序如何格式化数字、货币、时间和日期。", -1, 14, 17, 220, 25 + LTEXT "这个选项将会影响一些程序的数字、货币、日期和时间格式。", -1, 14, 17, 220, 25 LTEXT "选择一个与其首选项匹配的项或单击“自定义”选择您自己的格式(&S):", -1, 14, 37, 220, 22 COMBOBOX IDC_LANGUAGELIST, 14, 56, 160, 160, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL PUSHBUTTON "自定义(&Z)...", IDC_SETUP_BUTTON, 178, 56, 52, 13 diff --git a/dll/cpl/intl/lang/zh-TW.rc b/dll/cpl/intl/lang/zh-TW.rc index eb9aebd244..e1abafd0e3 100644 --- a/dll/cpl/intl/lang/zh-TW.rc +++ b/dll/cpl/intl/lang/zh-TW.rc @@ -1,17 +1,18 @@ /* Traditional Chinese translation by Henry Tang Ih 2016 (henrytang2(a)hotmail.com) */ +/* Translation has been changed by Luo Yufan 2018 (njlyf2011(a)hotmail.com) */ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL IDD_GENERALPAGE DIALOGEX 0, 0, 246, 230 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "區域選項" +CAPTION "地區選項" FONT 9, "新細明體" BEGIN GROUPBOX "標準和格式", -1, 5, 5, 234, 162 - LTEXT "這個選項影響到某些程式如何格式化數字、貨幣、時間和日期。", -1, 14, 17, 220, 25 - LTEXT "選擇一個與其首選項匹配的項或單擊“自定義”選擇您自己的格式(&S):", -1, 14, 37, 220, 22 + LTEXT "這個選項將會影響一些程式的數字、貨幣、日期和時間格式。", -1, 14, 17, 220, 25 + LTEXT "選擇一個與其首選項匹配的項或點選 [自訂] 選擇您自己的格式(&S):", -1, 14, 37, 220, 22 COMBOBOX IDC_LANGUAGELIST, 14, 56, 160, 160, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL - PUSHBUTTON "自定義(&Z)...", IDC_SETUP_BUTTON, 178, 56, 52, 13 + PUSHBUTTON "自訂(&Z)...", IDC_SETUP_BUTTON, 178, 56, 52, 13 LTEXT "示例", -1, 14, 73, 70, 10 LTEXT "數字:", -1, 16, 86, 48, 10 LTEXT "貨幣:", -1, 16, 101, 48, 10 @@ -34,7 +35,7 @@ CAPTION "語言" FONT 9, "新細明體" BEGIN GROUPBOX "文字服務和輸入語言", -1, 5, 5, 234, 52 - LTEXT "要檢視用來輸入文字的語言和方法，請單擊“詳細資訊”。", -1, 12, 15, 220, 18 + LTEXT "要檢視用來輸入文字的語言和方法，請點選 [詳細資訊]。", -1, 12, 15, 220, 18 PUSHBUTTON "詳細資訊(&T)...", IDC_DETAIL_BUTTON, 177, 34, 54, 14 GROUPBOX "附加的語言支援", -1, 5, 62, 234, 82 LTEXT "大多數語言都會在默認情況下得到安裝。要安裝其他語言，選擇下面相應的覈取方塊。", -1, 12, 72, 220, 18 @@ -49,7 +50,7 @@ FONT 9, "新細明體" BEGIN GROUPBOX "非 Unicode 程式的語言", -1, 5, 5, 234, 90 COMBOBOX IDC_LANGUAGE_COMBO, 14, 75, 217, 160, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT - LTEXT "這個設定啟動某些非 Unicode 程式以便用母語顯示選單和對話。這不會影響到 Unicode 的程式，但是會應用在這臺計算機上的所有使用者。", -1, 14, 18, 223, 33 + LTEXT "這個設定啟動某些非 Unicode 程式以便用母語顯示選單和對話。這不會影響到 Unicode 的程式，但是會應用在這臺電腦上的所有使用者。", -1, 14, 18, 223, 33 LTEXT "選擇一種語言，使之與您想使用的非 Unicode 程式的語言版本相匹配(&S):", -1, 14, 55, 223, 18 GROUPBOX "內碼表轉換表(&C)", -1, 5, 101, 234, 88 CONTROL "", IDC_CONV_TABLES, "SysListView32", LVS_REPORT | LVS_SORTASCENDING | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP, 14, 114, 217, 70 @@ -184,7 +185,7 @@ END STRINGTABLE BEGIN - IDS_CUSTOMIZE_TITLE "自定義區域選項" + IDS_CUSTOMIZE_TITLE "自訂地區選項" IDS_SPAIN "西班牙語 (西班牙)" IDS_METRIC "公制" IDS_IMPERIAL "帝國" @@ -192,7 +193,7 @@ END STRINGTABLE BEGIN - IDS_CPLNAME "區域選項" + IDS_CPLNAME "地區選項" IDS_CPLDESCRIPTION "選擇語言、數字、貨幣、時間和日期的顯示設定。" END @@ -201,7 +202,7 @@ BEGIN IDS_APPLY_DEFAULT_TITLE "更改默認設定" IDS_APPLY_DEFAULT_TEXT "設定將應用於默認的使用者帳戶。\n\n\ 這些更改應用到登入螢幕和新使用者帳戶。\n\ -必須重新啟動計算機，以便將更改應用於一些系統服務。" +必須重新啟動電腦，以便將更改用於一些系統服套務。" END STRINGTABLE diff --git a/dll/cpl/openglcfg/lang/zh-CN.rc b/dll/cpl/openglcfg/lang/zh-CN.rc index 09991d7668..590bb49ae7 100644 --- a/dll/cpl/openglcfg/lang/zh-CN.rc +++ b/dll/cpl/openglcfg/lang/zh-CN.rc @@ -15,7 +15,7 @@ BEGIN GROUPBOX "调试", -1, 5, 125, 230, 90 LTEXT "调试频道:", -1, 15, 142, 65, 10 COMBOBOX IDC_DEBUG_OUTPUT, 80, 140, 135, 10, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST - LTEXT "启用或启用来自 opengl32 的调试输出。\n\n警告: 选择 ""Set"" or ""Clear"" 将会覆盖当前 DEBUGCHANNEL 环境变量的内容！", -1, 15, 165, 210, 40 + LTEXT "启用或禁用来自 opengl32 的调试输出。\n\n警告: 选择 ""Set"" or ""Clear"" 将会覆盖当前 DEBUGCHANNEL 环境变量的内容！", -1, 15, 165, 210, 40 END STRINGTABLE diff --git a/dll/cpl/timedate/lang/zh-TW.rc b/dll/cpl/timedate/lang/zh-TW.rc index 125212cfe0..cc83b9e7f3 100644 --- a/dll/cpl/timedate/lang/zh-TW.rc +++ b/dll/cpl/timedate/lang/zh-TW.rc @@ -48,7 +48,7 @@ END STRINGTABLE BEGIN IDS_CPLNAME "日期和時間" - IDS_CPLDESCRIPTION "請為您的計算機設置日期、時間和時區信息" + IDS_CPLDESCRIPTION "請為您的電腦設置日期、時間和時區信息" IDS_TIMEZONETEXT "當前時區: %s" IDS_TIMEZONEINVALID "無效的" IDS_TIMEZONEUNKNOWN "未知" diff --git a/dll/shellext/devcpux/lang/zh-TW.rc b/dll/shellext/devcpux/lang/zh-TW.rc new file mode 100644 index 0000000000..32ca35952d --- /dev/null +++ b/dll/shellext/devcpux/lang/zh-TW.rc @@ -0,0 +1,23 @@ +/* Translated by Luo Yufan (njlyf2011(a)hotmail.oom) on 2018-12-24 */ + +LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL + +DLG_PROCESSORINFO DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | WS_POPUP | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME +CAPTION "處理器" +FONT 9, "新細明體" +BEGIN + LTEXT "功能:", -1, 7, 23, 50, 8 + LTEXT "test", IDC_FEATURES, 57, 23, 181, 8 + LTEXT "型號:", -1, 7, 38, 50, 8 + LTEXT "test", IDC_MODEL, 57, 38, 181, 8 + LTEXT "步進:", -1, 7, 53, 50, 51 + LTEXT "test", IDC_STEPPING, 57, 53, 181, 8 + LTEXT "核心速度:", -1, 7, 68, 50, 8 + LTEXT "test", IDC_CORESPEED, 57, 68, 181, 8 +END + +STRINGTABLE +BEGIN + IDS_MEGAHERTZ "%ld MHz" +END diff --git a/dll/shellext/devcpux/processor.rc b/dll/shellext/devcpux/processor.rc index 96aae37b4e..5f23c3f47e 100644 --- a/dll/shellext/devcpux/processor.rc +++ b/dll/shellext/devcpux/processor.rc @@ -24,3 +24,9 @@ #ifdef LANGUAGE_RU_RU #include "lang/ru-RU.rc" #endif +#ifdef LANGUAGE_ZH_CN + #include "lang/zh-CN.rc" +#endif +#ifdef LANGUAGE_ZH_TW + #include "lang/zh-TW.rc" +#endif diff --git a/dll/win32/comctl32/lang/comctl_Tw.rc b/dll/win32/comctl32/lang/comctl_Tw.rc index 74a6e78d6b..2b62111be4 100644 --- a/dll/win32/comctl32/lang/comctl_Tw.rc +++ b/dll/win32/comctl32/lang/comctl_Tw.rc @@ -44,18 +44,18 @@ STRINGTABLE STRINGTABLE { - IDS_BUTTON_YES "&Yes" - IDS_BUTTON_NO "&No" - IDS_BUTTON_RETRY "&Retry" - IDS_BUTTON_OK "OK" - IDS_BUTTON_CANCEL "Cancel" - IDS_BUTTON_CLOSE "&Close" + IDS_BUTTON_YES "是(&Y)" + IDS_BUTTON_NO "否(&N)" + IDS_BUTTON_RETRY "重試(&R)" + IDS_BUTTON_OK "確定" + IDS_BUTTON_CANCEL "取消" + IDS_BUTTON_CLOSE "關閉(&C)" } IDD_PROPSHEET DIALOGEX 0, 0, 220, 140 STYLE DS_SHELLFONT | DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE CAPTION "%s內容" -FONT 9, "MS Shell Dlg" +FONT 9, "新細明體" BEGIN DEFPUSHBUTTON "確定", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP PUSHBUTTON "取消", IDCANCEL,58,122,50,14 @@ -68,7 +68,7 @@ END IDD_WIZARD DIALOGEX 0, 0, 290, 159 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE CAPTION "精靈" -FONT 9, "MS Shell Dlg" +FONT 9, "新細明體" BEGIN PUSHBUTTON "< 上一步(&B)", IDC_BACK_BUTTON,56,138,55,14 DEFPUSHBUTTON "下一步(&N) >", IDC_NEXT_BUTTON,111,138,55,14 @@ -84,7 +84,7 @@ END IDD_TBCUSTOMIZE DIALOGEX 10, 20, 395, 125 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "自訂工具列" -FONT 9, "MS Shell Dlg" +FONT 9, "新細明體" BEGIN DEFPUSHBUTTON "關閉(&C)", IDCANCEL,320,6,70,14 PUSHBUTTON "重設(&E)", IDC_RESET_BTN,320,23,70,14 diff --git a/dll/win32/comdlg32/lang/cdlg_Zh.rc b/dll/win32/comdlg32/lang/cdlg_Zh.rc index 6f1df3ba03..beba121290 100644 --- a/dll/win32/comdlg32/lang/cdlg_Zh.rc +++ b/dll/win32/comdlg32/lang/cdlg_Zh.rc @@ -496,7 +496,7 @@ FONT 9, "宋体" CONTROL "以只读方式打开(&R)", IDC_OPENREADONLY, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 123, 218, 150, 10 DEFPUSHBUTTON "打开(&O)", IDOK, 310, 180, 54, 14 - PUSHBUTTON "取消 ", IDCANCEL, 310, 198, 54, 14 + PUSHBUTTON "取消", IDCANCEL, 310, 198, 54, 14 PUSHBUTTON "帮助(&H)", pshHelp, 310, 215, 54, 14 } diff --git a/dll/win32/msgina/lang/zh-TW.rc b/dll/win32/msgina/lang/zh-TW.rc index c5b4e1e83d..cc8d59a750 100644 --- a/dll/win32/msgina/lang/zh-TW.rc +++ b/dll/win32/msgina/lang/zh-TW.rc @@ -48,7 +48,7 @@ BEGIN LTEXT "<Message>", IDC_SECURITY_MESSAGE, 15, 62, 245, 18 LTEXT "<Logon date>", IDC_SECURITY_LOGONDATE, 15, 83, 245, 8 CTEXT "你想要做什麼?", IDC_STATIC, 10, 108, 255, 8 - PUSHBUTTON "鎖定計算機", IDC_SECURITY_LOCK, 7, 124, 80, 14 + PUSHBUTTON "鎖定電腦", IDC_SECURITY_LOCK, 7, 124, 80, 14 PUSHBUTTON "登出...", IDC_SECURITY_LOGOFF, 98, 124, 80, 14 PUSHBUTTON "關閉...", IDC_SECURITY_SHUTDOWN, 188, 124, 80, 14 PUSHBUTTON "更改密碼...", IDC_SECURITY_CHANGEPWD, 7, 143, 80, 14 @@ -58,24 +58,24 @@ END IDD_LOCKED DIALOGEX 0, 0, 275, 121 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP -CAPTION "鎖定計算機" +CAPTION "鎖定電腦" FONT 9, "新細明體", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 ICON IDI_LOCKICON, IDC_STATIC, 7, 59, 20, 20 - LTEXT "此計算機正在使用中，已被鎖定。", IDC_STATIC, 36, 61, 232, 8 + LTEXT "此電腦正在使用中，已被鎖定。", IDC_STATIC, 36, 61, 232, 8 LTEXT "<Message>", IDC_LOCKED_MESSAGE, 37, 75, 231, 26 - LTEXT "按 Ctrl-Alt-Del 鍵解鎖此計算機。", IDC_STATIC, 36, 106, 232, 8 + LTEXT "按 Ctrl-Alt-Del 鍵解鎖此電腦。", IDC_STATIC, 36, 106, 232, 8 END IDD_UNLOCK DIALOGEX 0, 0, 275, 179 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP -CAPTION "解除鎖定計算機" +CAPTION "解除鎖定電腦" FONT 9, "新細明體", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 ICON IDI_LOCKICON, IDC_STATIC, 7, 59, 20, 20 - LTEXT "此計算機正在使用中，已被鎖定。", IDC_STATIC, 36, 61, 232, 8 + LTEXT "此電腦正在使用中，已被鎖定。", IDC_STATIC, 36, 61, 232, 8 LTEXT "<Message>", IDC_UNLOCK_MESSAGE, 36, 75, 232, 26 LTEXT "使用者名稱:", IDC_STATIC, 36, 107, 40, 8 EDITTEXT IDC_UNLOCK_USERNAME, 84, 104, 119, 14, ES_AUTOHSCROLL @@ -123,7 +123,7 @@ FONT 9, "新細明體" BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 ICON IDI_SHUTDOWN, IDC_STATIC, 9, 57, 21, 20, WS_GROUP - LTEXT "你想讓計算機做什麼?(&W)", IDC_STATIC, 39, 57, 167, 10 + LTEXT "你想讓電腦做什麼?(&W)", IDC_STATIC, 39, 57, 167, 10 COMBOBOX IDC_SHUTDOWN_ACTION, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27 DEFPUSHBUTTON "確定", IDOK, 143, 122, 55, 14, WS_GROUP @@ -142,7 +142,7 @@ FONT 9, "新細明體" BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 ICON IDI_SHUTDOWN, IDC_STATIC, 9, 57, 21, 20, WS_GROUP - LTEXT "你想讓計算機做什麼?(&W)", IDC_STATIC, 39, 57, 167, 10 + LTEXT "你想讓電腦做什麼?(&W)", IDC_STATIC, 39, 57, 167, 10 COMBOBOX IDC_SHUTDOWN_ACTION, 39, 70, 190, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 190, 27 GROUPBOX "Shutdown Event Tracker", IDC_STATIC, 9, 122, 257, 146 @@ -181,17 +181,17 @@ END STRINGTABLE BEGIN IDS_LOGGEDOUTSAS "歡迎!" - IDS_LOCKEDSAS "計算機當前已鎖定。" + IDS_LOCKEDSAS "電腦當前已鎖定。" IDS_PRESSCTRLALTDELETE "按 Control+Alt+Delete 登入。" IDS_ASKFORUSER "使用者名稱: " IDS_ASKFORPASSWORD "密碼: " IDS_FORCELOGOFF "這將登出當前使用者，並丟失未儲存的所有資料。要繼續嗎?" - IDS_LOCKMSG "只有 %s 或系統管理員可以解除計算機鎖定。" + IDS_LOCKMSG "只有 %s 或系統管理員可以解除電腦鎖定。" IDS_LOGONMSG "您登入為 %s。" IDS_LOGONDATE "登入日期: %s %s" - IDS_COMPUTERLOCKED "鎖定計算機" + IDS_COMPUTERLOCKED "鎖定電腦" IDS_LOCKEDWRONGPASSWORD "密碼是錯誤的。請再次輸入您的密碼。在密碼中的字母必須使用正確的大小寫。" - IDS_LOCKEDWRONGUSER "這臺計算機被鎖定。只有 %s\\%s 或者管理員可以解除計算機鎖定。" + IDS_LOCKEDWRONGUSER "這臺電腦被鎖定。只有 %s\\%s 或者管理員可以解除電腦鎖定。" IDS_CHANGEPWDTITLE "更改密碼" IDS_NONMATCHINGPASSWORDS "您鍵入的密碼不匹配。在這兩個文字框中鍵入相同的密碼。" IDS_PASSWORDCHANGED "您的密碼已更改。" @@ -216,6 +216,6 @@ BEGIN IDS_SHUTDOWN_SHUTDOWN_DESC "結束當前會話並關閉系統，這樣您可以安全地關閉電源。" IDS_SHUTDOWN_RESTART_DESC "結束當前會話並重新引導系統。" IDS_SHUTDOWN_SLEEP_DESC "使系統處於睡眠模式。" - IDS_SHUTDOWN_HIBERNATE_DESC "儲存當前會話並關閉計算機。" + IDS_SHUTDOWN_HIBERNATE_DESC "儲存當前會話並關閉電腦。" END diff --git a/dll/win32/netcfgx/lang/zh-TW.rc b/dll/win32/netcfgx/lang/zh-TW.rc index 7aa4838f2c..498a613e14 100644 --- a/dll/win32/netcfgx/lang/zh-TW.rc +++ b/dll/win32/netcfgx/lang/zh-TW.rc @@ -38,7 +38,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION CAPTION "備用配置" FONT 9, "新細明體" BEGIN - LTEXT "如果此計算機使用多個網路，輸入下面的備用 IP 設定", -1, 9, 9, 220, 20 + LTEXT "如果這台電腦使用多個網路，輸入下面的備用 IP 設定", -1, 9, 9, 220, 20 CONTROL "自動專用 IP 地址(&T)", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 40, 210, 12 GROUPBOX "", -1, 9, 55, 228, 80, BS_GROUPBOX CONTROL "使用者配置(&S)", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 55, 70, 12 diff --git a/dll/win32/netid/lang/zh-TW.rc b/dll/win32/netid/lang/zh-TW.rc index 97fa7727e4..e076fc0fa7 100644 --- a/dll/win32/netid/lang/zh-TW.rc +++ b/dll/win32/netid/lang/zh-TW.rc @@ -1,43 +1,44 @@ /* Traditional Chinese translation by Henry Tang Ih 2016 (henrytang2(a)hotmail.com) */ +/* Translation has been changed by Luo Yufan (njlyf2011(a)hotmail.com) */ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL IDD_PROPPAGECOMPUTER DIALOGEX 0, 0, 256, 218 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "計算機名稱" +CAPTION "電腦名稱" FONT 9, "新細明體" BEGIN ICON IDI_COMPNAME, IDC_STATIC, 4, 3, 26, 24, SS_ICON - LTEXT "ReactOS 使用以下資訊來標識您的計算機在網路上。", IDC_STATIC, 40, 5, 204, 20 - LTEXT "計算機描述:", IDC_STATIC, 6, 40, 90, 9 + LTEXT "ReactOS 使用以下資訊來標識您在網路上的電腦。", IDC_STATIC, 40, 5, 204, 20 + LTEXT "電腦描述:", IDC_STATIC, 6, 40, 90, 9 EDITTEXT IDC_COMPDESC, 98, 38, 146, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP - LTEXT "完整的計算機名稱:", IDC_STATIC, 6, 68, 85, 9 + LTEXT "完整的電腦名稱:", IDC_STATIC, 6, 68, 85, 9 EDITTEXT IDC_COMPUTERNAME, 98, 68, 144, 12, ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "工作組:", IDC_WORKGROUPDOMAIN, 6, 84, 64, 9 + LTEXT "工作群組:", IDC_WORKGROUPDOMAIN, 6, 84, 64, 9 EDITTEXT IDC_WORKGROUPDOMAIN_NAME, 98, 84, 144, 12, ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "要使用網路識別嚮導去加入域並創建本地使用者，請單擊""網路 ID"".", IDC_STATIC, 6, 113, 172, 24 + LTEXT "要使用網路識別精靈去加入域並建立本地使用者，請點選 [網路 ID]。", IDC_STATIC, 6, 113, 172, 24 PUSHBUTTON "網路 ID...(&N)", IDC_NETWORK_ID, 190, 114, 58, 15 - LTEXT "若要重新命名此計算機或加入域，請單擊""更改""。", IDC_STATIC, 6, 149, 170, 17 + LTEXT "若要重新命名此電腦或加入域，請點選 [更改]。", IDC_STATIC, 6, 149, 170, 17 PUSHBUTTON "更改...(&C)", IDC_NETWORK_PROPERTY, 190, 149, 58, 15 - LTEXT "注意: 只有管理員纔可以更改此計算機的標識。", IDC_STATIC, 6, 179, 300, 9 + LTEXT "注意: 只有管理員才可以更改此電腦的標識。", IDC_STATIC, 6, 179, 300, 9 END IDD_PROPPAGECOMPNAMECHENGE DIALOGEX 0, 0, 232, 222 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_CAPTION -CAPTION "計算機名稱更改" +CAPTION "電腦名稱更改" FONT 9, "新細明體" BEGIN LTEXT "(此處顯示訊息)", 1017, 7, 5, 218, 30 - LTEXT "計算機名稱:(&C)", -1, 7, 41, 219, 8 + LTEXT "電腦名稱:(&C)", -1, 7, 41, 219, 8 EDITTEXT 1002, 7, 53, 218, 14, ES_AUTOHSCROLL | ES_OEMCONVERT - LTEXT "完整的計算機名稱:", 1016, 7, 72, 218, 10 + LTEXT "完整的電腦名稱:", 1016, 7, 72, 218, 10 EDITTEXT 1001, 7, 82, 219, 14, ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP PUSHBUTTON "更多...(&M)", 1003, 150, 102, 75, 14 GROUPBOX "成員", 1018, 7, 119, 219, 73 AUTORADIOBUTTON "域:(&D)", 1008, 17, 132, 192, 10, WS_GROUP - AUTORADIOBUTTON "工作組:(&W)", 1004, 17, 161, 191, 10 + AUTORADIOBUTTON "工作群組:(&W)", 1004, 17, 161, 191, 10 EDITTEXT 116, 28, 144, 181, 14, ES_AUTOHSCROLL | WS_GROUP - PUSHBUTTON "找我的域名(&F)", 1010, 7, 203, 109, 14, NOT WS_VISIBLE | WS_DISABLED + PUSHBUTTON "查找我的域名(&F)", 1010, 7, 203, 109, 14, NOT WS_VISIBLE | WS_DISABLED EDITTEXT 1007, 28, 172, 181, 14, ES_UPPERCASE | ES_AUTOHSCROLL | ES_OEMCONVERT DEFPUSHBUTTON "確定", 1, 121, 203, 50, 14, WS_GROUP PUSHBUTTON "取消", 2, 176, 203, 50, 14 @@ -45,17 +46,17 @@ END IDD_PROPPAGEDNSANDNETBIOS DIALOGEX 0, 0, 266, 125 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_CAPTION -CAPTION "DNS 字尾和 NetBIOS 計算機名" +CAPTION "DNS 字尾和 NetBIOS 電腦名" FONT 9, "新細明體" BEGIN - LTEXT "此計算機的主 DNS 字尾:(&P)", -1, 7, 5, 253, 8 + LTEXT "此電腦的主 DNS 字尾(&P):", -1, 7, 5, 253, 8 EDITTEXT 1011, 7, 17, 252, 14, ES_AUTOHSCROLL AUTOCHECKBOX "域成員身份變化時，更改主 DNS 字尾(&C)", 115, 11, 39, 250, 10 - LTEXT "計算機的 NetBIOS 名稱:(&N)", -1, 7, 57, 148, 8 + LTEXT "電腦的 NetBIOS 名稱(&N):", -1, 7, 57, 148, 8 EDITTEXT 1013, 7, 69, 150, 14, ES_UPPERCASE | ES_AUTOHSCROLL | ES_READONLY DEFPUSHBUTTON "確定", 1, 153, 104, 50, 14 PUSHBUTTON "取消", 2, 209, 104, 50, 14 - LTEXT "此名稱用於與較舊的計算機和服務互操作性。", 13, 7, 88, 253, 8 + LTEXT "此名稱用於與較舊的電腦和服務互操作性。", 13, 7, 88, 253, 8 END STRINGTABLE @@ -63,21 +64,21 @@ BEGIN 1 "* 未知 *" 2 "WORKGROUP" 3 "嘗試讀取域成員身份資訊時出現以下錯誤:" - 4 "計算機名稱更改" - 5 "工作組:" + 4 "電腦名稱更改" + 5 "工作群組:" 6 "域:" - 22 "歡迎到 %1 工作組。" + 22 "歡迎到 %1 工作群組。" 23 "歡迎到域 %1。" - 24 "您必須重新啟動該計算機以使更改生效。" - 25 "您可以更改名稱和這臺計算機的會員。更改可能會影響對網路資源的訪問。" - 1021 "注意: 只有管理員纔可以更改此計算機的標識。" - 1022 "注意: 不能更改計算機的標識，因為:" - 1030 "新的計算機名稱 ""%s"" 包含不允許使用的字元。不允許使用的字元包括 ` ~ ! @ # $ %% ^ & * ( ) = + _ [ ] { } \\ | ; : ' "" , . < > / and ?" + 24 "您必須重新啟動該電腦以使更改生效。" + 25 "您可以更改名稱和這臺電腦的會員。更改可能會影響對網路資源的訪問。" + 1021 "注意: 只有管理員纔可以更改此電腦的標識。" + 1022 "注意: 不能更改電腦的標識，因為:" + 1030 "新的電腦名稱 ""%s"" 包含不允許使用的字元。不允許使用的字元包括 ` ~ ! @ # $ %% ^ & * ( ) = + _ [ ] { } \\ | ; : ' "" , . < > / and ?" /* Windows allows using these characters, although it displays a warning message. Forbidding the use of these characters means incompatibility with Windows. */ 3210 "詳細資訊(&D) >>" 3220 "<< 詳細資訊(&D)" 4000 "資訊" - 4001 "不能設定新計算機名稱!" + 4001 "不能設定新電腦名稱!" END diff --git a/dll/win32/setupapi/lang/zh-TW.rc b/dll/win32/setupapi/lang/zh-TW.rc index 16e892c3de..4e6ac8f967 100644 --- a/dll/win32/setupapi/lang/zh-TW.rc +++ b/dll/win32/setupapi/lang/zh-TW.rc @@ -39,7 +39,7 @@ END STRINGTABLE BEGIN - IDS_QUERY_REBOOT_TEXT "您的計算機需要重新啟動才能完成安裝。您要繼續嗎？" + IDS_QUERY_REBOOT_TEXT "您的電腦需要重新啟動才能完成安裝。您要繼續嗎？" IDS_QUERY_REBOOT_CAPTION "重新啟動" IDS_INF_FILE "安裝程式資訊" END diff --git a/dll/win32/shell32/lang/zh-TW.rc b/dll/win32/shell32/lang/zh-TW.rc index 1bdb548457..30ca5829fb 100644 --- a/dll/win32/shell32/lang/zh-TW.rc +++ b/dll/win32/shell32/lang/zh-TW.rc @@ -924,12 +924,12 @@ BEGIN IDS_FONTS "字型" IDS_INSTALLNEWFONT "安裝新字型..." - IDS_DEFAULT_CLUSTER_SIZE "Default allocation size" - IDS_COPY_OF "Copy of" + IDS_DEFAULT_CLUSTER_SIZE "預設配置大小" + IDS_COPY_OF "複製" - IDS_SHLEXEC_NOASSOC "There is no ReactOS program configured to open this type of file." + IDS_SHLEXEC_NOASSOC "沒有為 ReactOS 設定關聯的程式以開啟這種類型的檔案。" - IDS_FILE_DETAILS "Details for '%s' extension" + IDS_FILE_DETAILS "有關副檔名 '%s' 的詳細資料" IDS_FILE_DETAILSADV "Files with extension '%s' are of type '%s'. To change settings that affect all '%s' files, click Advanced." IDS_FILE_TYPES "檔案類型" IDS_COLUMN_EXTENSION "副檔名" @@ -942,7 +942,7 @@ BEGIN IDS_UNKNOWN_APP "未知應用程式" IDS_EXE_DESCRIPTION "描述:" - IDS_MENU_EMPTY "(Empty)" + IDS_MENU_EMPTY "(空的)" IDS_OBJECTS "%d 個物件" IDS_OBJECTS_SELECTED "已選擇 %d 個物件" @@ -966,12 +966,12 @@ BEGIN IDS_ADVANCED_SHOW_COMP_COLOR "Show encrypted or compressed NTFS files in color" IDS_ADVANCED_SHOW_INFO_TIP "Show pop-up description for folder and desktop items" - IDS_NEWEXT_ADVANCED_LEFT "<< Ad&vanced" - IDS_NEWEXT_ADVANCED_RIGHT "Ad&vanced >>" - IDS_NEWEXT_NEW "<New>" - IDS_NEWEXT_SPECIFY_EXT "You must specify an extension." - IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to un-associate %s with %s and create a new File Type for it?" - IDS_NEWEXT_EXT_IN_USE "Extension is in use" + IDS_NEWEXT_ADVANCED_LEFT "<< 進階(&V)" + IDS_NEWEXT_ADVANCED_RIGHT "進階(&V) >>" + IDS_NEWEXT_NEW "<新增>" + IDS_NEWEXT_SPECIFY_EXT "您必須指定一個副檔名。" + IDS_NEWEXT_ALREADY_ASSOC "副檔名 %s 已經與檔案類型 %s 關聯。是否要將 %s 與 %s 取消關聯並為其建立新的檔案類型？" + IDS_NEWEXT_EXT_IN_USE "副檔名正在被使用" IDS_REMOVE_EXT "If you remove a registered file name extension, you will not be able to open files with this extension by double-clicking their icons.\n\nAre you sure you want to remove this extension?" IDS_SPECIFY_ACTION "You must specify an action." diff --git a/dll/win32/syssetup/lang/zh-TW.rc b/dll/win32/syssetup/lang/zh-TW.rc index ee3fb748c8..e590cadcaa 100644 --- a/dll/win32/syssetup/lang/zh-TW.rc +++ b/dll/win32/syssetup/lang/zh-TW.rc @@ -130,9 +130,9 @@ CAPTION "ReactOS 安裝程式已完成" FONT 9, "新細明體" BEGIN LTEXT "已經完成 ReactOS 安裝程式。", IDC_FINISHTITLE, 115, 8, 195, 24 - LTEXT "ReactOS 安裝程序已順利完成。\n\n要重新啓動計算機，請點選 [完成]。", IDC_STATIC, 115, 40, 195, 100 + LTEXT "ReactOS 安裝程式已順利完成。\n\n要重新啓動電腦，請點選 [完成]。", IDC_STATIC, 115, 40, 195, 100 CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 115, 138, 188, 12 - LTEXT "如果光碟機裏有光碟，請將其取出要重新啓動計算機，請按 [完成]。", IDC_STATIC, 115, 169, 195, 17 + LTEXT "如果光碟機裏有光碟，請將其取出要重新啓動電腦，請按 [完成]。", IDC_STATIC, 115, 169, 195, 17 END IDD_GPL DIALOGEX 0, 0, 333, 230 @@ -176,7 +176,7 @@ BEGIN IDS_ACKTITLE "致謝" IDS_ACKSUBTITLE "ReactOS 所依賴的開源項目及其許可證信息" IDS_OWNERTITLE "自訂您的軟體" - IDS_OWNERSUBTITLE "安裝程序將使用您提供的個人信息，自訂您的 ReactOS 軟體。" + IDS_OWNERSUBTITLE "安裝程式將使用您提供的個人信息，自訂您的 ReactOS 軟體。" IDS_COMPUTERTITLE "電腦名稱和系統管理員密碼" IDS_COMPUTERSUBTITLE "您必須提供電腦名稱和管理員密碼。" IDS_LOCALETITLE "地區設定"

1 0

[reactos] 01/01: [MC] Fix the build
by Eric Kohl 24 Dec '18

24 Dec '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9703a42a6e8f1de5d56c0… commit 9703a42a6e8f1de5d56c092b9d8be794340539c5 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Mon Dec 24 18:19:58 2018 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Mon Dec 24 18:19:58 2018 +0100 [MC] Fix the build --- sdk/include/reactos/mc/net_msg.mc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sdk/include/reactos/mc/net_msg.mc b/sdk/include/reactos/mc/net_msg.mc index 2051dc2aa0..5e7b14deb5 100644 --- a/sdk/include/reactos/mc/net_msg.mc +++ b/sdk/include/reactos/mc/net_msg.mc @@ -1,9 +1,9 @@ -; Romanian translation by Ștefan Fulea (stefan dot fulea at mail dot com) -; Russian translation by Kudratov Olimjon (olim98(a)bk.ru) -; Spanish translation by Ismael Ferreras Morezuelas <2014-11-07> -; Turkish translation by 2015 Erdem Ersoy (eersoy93) (erdemersoy [at] erdemersoy [dot] net) -; Simplified Chinese translation by Henry Tang Ih 2016 (henrytang2(a)hotmail.com) -; Traditional Chinese translation by Henry Tang Ih 2016 (henrytang2(a)hotmail.com) +;// Romanian translation by Ștefan Fulea (stefan dot fulea at mail dot com) +;// Russian translation by Kudratov Olimjon (olim98(a)bk.ru) +;// Spanish translation by Ismael Ferreras Morezuelas <2014-11-07> +;// Turkish translation by 2015 Erdem Ersoy (eersoy93) (erdemersoy [at] erdemersoy [dot] net) +;// Simplified Chinese translation by Henry Tang Ih 2016 (henrytang2(a)hotmail.com) +;// Traditional Chinese translation by Henry Tang Ih 2016 (henrytang2(a)hotmail.com) MessageIdTypedef=DWORD

1 0

[reactos] 01/01: [MC] Fix build issue?
by Eric Kohl 24 Dec '18

24 Dec '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f0d096838bc3bfbfac151… commit f0d096838bc3bfbfac1517fa49bb892cbc11a56d Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Mon Dec 24 18:10:38 2018 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Mon Dec 24 18:10:38 2018 +0100 [MC] Fix build issue? --- sdk/include/reactos/mc/net_msg.mc | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/sdk/include/reactos/mc/net_msg.mc b/sdk/include/reactos/mc/net_msg.mc index dfe476baac..2051dc2aa0 100644 --- a/sdk/include/reactos/mc/net_msg.mc +++ b/sdk/include/reactos/mc/net_msg.mc @@ -1,11 +1,10 @@ -;/* -; * Romanian translation by Ștefan Fulea (stefan dot fulea at mail dot com) -; * Russian translation by Kudratov Olimjon (olim98(a)bk.ru) -; * Spanish translation by Ismael Ferreras Morezuelas <2014-11-07> -; * Turkish translation by 2015 Erdem Ersoy (eersoy93) (erdemersoy [at] erdemersoy [dot] net) -; * Simplified Chinese translation by Henry Tang Ih 2016 (henrytang2(a)hotmail.com) -; * Traditional Chinese translation by Henry Tang Ih 2016 (henrytang2(a)hotmail.com) -; */ +; Romanian translation by Ștefan Fulea (stefan dot fulea at mail dot com) +; Russian translation by Kudratov Olimjon (olim98(a)bk.ru) +; Spanish translation by Ismael Ferreras Morezuelas <2014-11-07> +; Turkish translation by 2015 Erdem Ersoy (eersoy93) (erdemersoy [at] erdemersoy [dot] net) +; Simplified Chinese translation by Henry Tang Ih 2016 (henrytang2(a)hotmail.com) +; Traditional Chinese translation by Henry Tang Ih 2016 (henrytang2(a)hotmail.com) + MessageIdTypedef=DWORD SeverityNames=(Success=0x0:STATUS_SEVERITY_SUCCESS

1 0

[reactos] 01/01: Fix the build
by Eric Kohl 24 Dec '18

24 Dec '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=69ff796168e0121ed1570… commit 69ff796168e0121ed15708b0c77809de4a917eeb Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Mon Dec 24 17:03:00 2018 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Mon Dec 24 17:03:00 2018 +0100 Fix the build --- base/applications/network/net/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/applications/network/net/CMakeLists.txt b/base/applications/network/net/CMakeLists.txt index 06313f7386..9139a9aaf9 100644 --- a/base/applications/network/net/CMakeLists.txt +++ b/base/applications/network/net/CMakeLists.txt @@ -10,6 +10,7 @@ list(APPEND SOURCE cmdConfig.c cmdContinue.c cmdGroup.c + cmdHelp.c cmdHelpMsg.c cmdLocalGroup.c cmdPause.c @@ -18,7 +19,6 @@ list(APPEND SOURCE cmdStop.c cmdUse.c cmdUser.c - help.c net.h) add_executable(net ${SOURCE} net.rc)

1 0

[reactos] 01/01: [NET] Add (incomplete) COMPUTER command and rename help.c to cmdHelp.c.
by Eric Kohl 24 Dec '18

24 Dec '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7a27dc8a55463b0d77327… commit 7a27dc8a55463b0d77327bd28e506778085d9ba4 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Mon Dec 24 14:39:26 2018 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Mon Dec 24 14:39:26 2018 +0100 [NET] Add (incomplete) COMPUTER command and rename help.c to cmdHelp.c. --- base/applications/network/net/CMakeLists.txt | 1 + base/applications/network/net/cmdComputer.c | 103 +++++++++++++++++++++ .../applications/network/net/{help.c => cmdHelp.c} | 2 +- base/applications/network/net/main.c | 2 +- base/applications/network/net/net.h | 1 + 5 files changed, 107 insertions(+), 2 deletions(-) diff --git a/base/applications/network/net/CMakeLists.txt b/base/applications/network/net/CMakeLists.txt index cee4e856d3..06313f7386 100644 --- a/base/applications/network/net/CMakeLists.txt +++ b/base/applications/network/net/CMakeLists.txt @@ -6,6 +6,7 @@ include_directories(${REACTOS_SOURCE_DIR}/sdk/lib/conutils) list(APPEND SOURCE main.c cmdAccounts.c + cmdComputer.c cmdConfig.c cmdContinue.c cmdGroup.c diff --git a/base/applications/network/net/cmdComputer.c b/base/applications/network/net/cmdComputer.c new file mode 100644 index 0000000000..c094885361 --- /dev/null +++ b/base/applications/network/net/cmdComputer.c @@ -0,0 +1,103 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS net command + * FILE: base/applications/network/net/cmdComputer.c + * PROGRAMMERS: Eric Kohl <eric.kohl(a)reactos.org> + */ + +#include "net.h" + +INT +cmdComputer( + INT argc, + WCHAR **argv) +{ + INT i, result = 0; + BOOL bAdd = FALSE; + BOOL bDelete = FALSE; + PWSTR pComputerName = NULL; +/* + OSVERSIONINFOEX VersionInfo; + + VersionInfo.dwOSVersionInfoSize = sizeof(VersionInfo); + if (!GetVersionEx((LPOSVERSIONINFO)&VersionInfo)) + { + PrintErrorMessage(GetLastError()); + return 1; + } + + if (VersionInfo.wProductType != VER_NT_DOMAIN_CONTROLLER) + { + PrintErrorMessage(3515); + return 1; + } +*/ + + i = 2; + if (argc > 2 && argv[i][0] != L'\\' && argv[i][1] != L'\\') + { + pComputerName = argv[i]; + i++; + } + + for (; i < argc; i++) + { + if (_wcsicmp(argv[i], L"help") == 0) + { + /* Print short syntax help */ + ConResPuts(StdOut, IDS_GENERIC_SYNTAX); + PrintNetMessage(MSG_COMPUTER_SYNTAX); + return 0; + } + + if (_wcsicmp(argv[i], L"/help") == 0) + { + /* Print full help text*/ + ConResPuts(StdOut, IDS_GENERIC_SYNTAX); + PrintNetMessage(MSG_COMPUTER_SYNTAX); + PrintNetMessage(MSG_COMPUTER_HELP); + return 0; + } + + if (_wcsicmp(argv[i], L"/add") == 0) + { + bAdd = TRUE; + continue; + } + else if (_wcsicmp(argv[i], L"/del") == 0) + { + bDelete = TRUE; + continue; + } + else + { + PrintErrorMessage(3506/*, argv[i]*/); + return 1; + } + } + + if (pComputerName == NULL || + (bAdd == FALSE && bDelete == FALSE) || + (bAdd == TRUE && bDelete == TRUE)) + { + ConResPuts(StdOut, IDS_GENERIC_SYNTAX); + PrintNetMessage(MSG_COMPUTER_SYNTAX); + return 1; + } + + if (bAdd) + { + printf("Add %S (not implemented yet)\n", pComputerName); + } + else if (bDelete) + { + printf("Delete %S (not implemented yet)\n", pComputerName); + } + + if (result == 0) + PrintErrorMessage(ERROR_SUCCESS); + + return result; +} + +/* EOF */ diff --git a/base/applications/network/net/help.c b/base/applications/network/net/cmdHelp.c similarity index 98% rename from base/applications/network/net/help.c rename to base/applications/network/net/cmdHelp.c index 01b67a6572..716009ed59 100644 --- a/base/applications/network/net/help.c +++ b/base/applications/network/net/cmdHelp.c @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS net command - * FILE: base/applications/network/net/help.c + * FILE: base/applications/network/net/cmdHelp.c * PURPOSE: * * PROGRAMMERS: Magnus Olsen (greatlord(a)reactos.org) diff --git a/base/applications/network/net/main.c b/base/applications/network/net/main.c index 02c2b4579e..579ea4c10c 100644 --- a/base/applications/network/net/main.c +++ b/base/applications/network/net/main.c @@ -21,7 +21,7 @@ typedef struct _COMMAND COMMAND cmds[] = { {L"accounts", cmdAccounts}, - {L"computer", unimplemented}, + {L"computer", cmdComputer}, {L"config", cmdConfig}, {L"continue", cmdContinue}, {L"file", unimplemented}, diff --git a/base/applications/network/net/net.h b/base/applications/network/net/net.h index de61f92f39..d4845232eb 100644 --- a/base/applications/network/net/net.h +++ b/base/applications/network/net/net.h @@ -57,6 +57,7 @@ VOID help(VOID); INT unimplemented(INT argc, WCHAR **argv); INT cmdAccounts(INT argc, WCHAR **argv); +INT cmdComputer(INT argc, WCHAR **argv); INT cmdConfig(INT argc, WCHAR **argv); INT cmdContinue(INT argc, WCHAR **argv); INT cmdGroup(INT argc, WCHAR **argv);

1 0

[reactos] 02/02: [COMDLG32] Update Simplified Chinese translation.
by Luo Yufan 24 Dec '18

24 Dec '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c4118adf809a690568081… commit c4118adf809a6905680814a600cf2bf97c53ee7a Author: Luo Yufan <njlyf2011(a)hotmail.com> AuthorDate: Mon Dec 24 17:34:01 2018 +0800 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Dec 24 12:00:29 2018 +0100 [COMDLG32] Update Simplified Chinese translation. --- dll/win32/comdlg32/lang/cdlg_Zh.rc | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/dll/win32/comdlg32/lang/cdlg_Zh.rc b/dll/win32/comdlg32/lang/cdlg_Zh.rc index 3effcfa829..6f1df3ba03 100644 --- a/dll/win32/comdlg32/lang/cdlg_Zh.rc +++ b/dll/win32/comdlg32/lang/cdlg_Zh.rc @@ -18,6 +18,8 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + + /* Translation has been changed by Luo Yufan in 2018 (njlyf2011(a)hotmail.com) */ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED @@ -138,7 +140,7 @@ STRINGTABLE IDS_SAVE_AS "另存为" IDS_OPEN_FILE "打开文件" IDS_SELECT_FOLDER "选择文件夹" - IDS_FONT_SIZE_INPUT "Font size has to be a number." + IDS_FONT_SIZE_INPUT "字体大小应为一个数字。" } /* @@ -474,28 +476,28 @@ FONT 9, "宋体" NEWFILEOPENV2ORD DIALOG 0, 0, 370, 237 STYLE DS_MODALFRAME | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_CLIPCHILDREN -CAPTION "Open" -FONT 8, "MS Shell Dlg" +CAPTION "打开" +FONT 9, "宋体" { - LTEXT "Look &in:", IDC_LOOKINSTATIC, 28, 6, 43, 8, SS_NOTIFY + LTEXT "查找(&I):", IDC_LOOKINSTATIC, 28, 6, 43, 8, SS_NOTIFY COMBOBOX IDC_LOOKIN, 64, 3, 150, 100, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP LTEXT "" , IDC_TOOLBARSTATIC, 209, 2, 102, 17, NOT WS_GROUP | NOT WS_VISIBLE CONTROL "", IDC_TOOLBARPLACES, "ToolbarWindow32", 0x800 | CCS_NORESIZE | CCS_TOP | CCS_NOPARENTALIGN | CCS_NODIVIDER, 4, 20, 55, 208 LISTBOX IDC_SHELLSTATIC, 64, 20, 300, 155, LBS_SORT | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_HSCROLL | NOT WS_VISIBLE - LTEXT "File &name:", IDC_FILENAMESTATIC, 65, 182, 56, 16, SS_NOTIFY + LTEXT "文件名(&N):", IDC_FILENAMESTATIC, 65, 182, 56, 16, SS_NOTIFY EDITTEXT IDC_FILENAME, 123, 180, 180, 12, ES_AUTOHSCROLL CONTROL "", cmb13, "ComboBoxEx32", CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP, 123, 180, 180, 150 - LTEXT "Files of &type:", IDC_FILETYPESTATIC, 65, 200, 56, 16, SS_NOTIFY + LTEXT "文件类型(&T):", IDC_FILETYPESTATIC, 65, 200, 56, 16, SS_NOTIFY COMBOBOX IDC_FILETYPE, 123, 198, 180, 53, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - CONTROL "Open as &read-only", IDC_OPENREADONLY, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 123, 218, 150, 10 + CONTROL "以只读方式打开(&R)", IDC_OPENREADONLY, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 123, 218, 150, 10 - DEFPUSHBUTTON "&Open", IDOK, 310, 180, 54, 14 - PUSHBUTTON "Cancel", IDCANCEL, 310, 198, 54, 14 - PUSHBUTTON "&Help", pshHelp, 310, 215, 54, 14 + DEFPUSHBUTTON "打开(&O)", IDOK, 310, 180, 54, 14 + PUSHBUTTON "取消 ", IDCANCEL, 310, 198, 54, 14 + PUSHBUTTON "帮助(&H)", pshHelp, 310, 215, 54, 14 } NEWFILEOPENV3ORD DIALOG 0, 0, 440, 300

1 0

[reactos] 01/02: [COMCTL32] Update Simplified Chinese translation.
by Luo Yufan 24 Dec '18

24 Dec '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=098c69679f59f2ef0c1fa… commit 098c69679f59f2ef0c1fa2cd3cb9ca23bdfd8151 Author: Luo Yufan <njlyf2011(a)hotmail.com> AuthorDate: Mon Dec 24 00:21:54 2018 +0800 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Dec 24 12:00:29 2018 +0100 [COMCTL32] Update Simplified Chinese translation. --- dll/win32/comctl32/lang/comctl_Zh.rc | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dll/win32/comctl32/lang/comctl_Zh.rc b/dll/win32/comctl32/lang/comctl_Zh.rc index d19e362729..766139c54a 100644 --- a/dll/win32/comctl32/lang/comctl_Zh.rc +++ b/dll/win32/comctl32/lang/comctl_Zh.rc @@ -44,17 +44,17 @@ STRINGTABLE STRINGTABLE { - IDS_BUTTON_YES "&Yes" - IDS_BUTTON_NO "&No" - IDS_BUTTON_RETRY "&Retry" - IDS_BUTTON_OK "OK" - IDS_BUTTON_CANCEL "Cancel" - IDS_BUTTON_CLOSE "&Close" + IDS_BUTTON_YES "是(&Y)" + IDS_BUTTON_NO "否(&N)" + IDS_BUTTON_RETRY "重试(&R)" + IDS_BUTTON_OK "确定" + IDS_BUTTON_CANCEL "取消" + IDS_BUTTON_CLOSE "关闭(&C)" } IDD_PROPSHEET DIALOGEX 0, 0, 220, 140 STYLE DS_SHELLFONT | DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "属性 %s" +CAPTION "%s属性" FONT 9, "宋体" BEGIN DEFPUSHBUTTON "确定", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP

1 0

[reactos] 02/02: [NET] Move TIME, USE, USER, VIEW and NET command syntax and help texts into a message table and add the translators names to the message file.
by Eric Kohl 24 Dec '18

24 Dec '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4e28e6549097f359867f5… commit 4e28e6549097f359867f5272858c56aa29146879 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Mon Dec 24 11:48:23 2018 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Mon Dec 24 11:48:23 2018 +0100 [NET] Move TIME, USE, USER, VIEW and NET command syntax and help texts into a message table and add the translators names to the message file. --- base/applications/network/net/cmdUser.c | 30 +-- base/applications/network/net/help.c | 16 +- base/applications/network/net/lang/en-US.rc | 15 -- base/applications/network/net/lang/es-ES.rc | 14 -- base/applications/network/net/lang/pl-PL.rc | 15 -- base/applications/network/net/lang/ro-RO.rc | 14 -- base/applications/network/net/lang/ru-RU.rc | 14 -- base/applications/network/net/lang/tr-TR.rc | 14 -- base/applications/network/net/lang/zh-CN.rc | 14 -- base/applications/network/net/lang/zh-TW.rc | 14 -- base/applications/network/net/main.c | 2 +- base/applications/network/net/resource.h | 10 - sdk/include/reactos/mc/net_msg.mc | 341 ++++++++++++++++++++++++++++ 13 files changed, 365 insertions(+), 148 deletions(-) diff --git a/base/applications/network/net/cmdUser.c b/base/applications/network/net/cmdUser.c index f50c7904e5..238baaa3cf 100644 --- a/base/applications/network/net/cmdUser.c +++ b/base/applications/network/net/cmdUser.c @@ -636,19 +636,6 @@ cmdUser( BOOL bPasswordAllocated = FALSE; NET_API_STATUS Status; - if (argc == 2) - { - Status = EnumerateUsers(); - ConPrintf(StdOut, L"Status: %lu\n", Status); - return 0; - } - else if (argc == 3) - { - Status = DisplayUser(argv[2]); - ConPrintf(StdOut, L"Status: %lu\n", Status); - return 0; - } - i = 2; if (argv[i][0] != L'/') { @@ -668,7 +655,7 @@ cmdUser( { if (_wcsicmp(argv[j], L"/help") == 0) { - ConResPuts(StdOut, IDS_USER_HELP); + PrintNetMessage(MSG_USER_HELP); return 0; } else if (_wcsicmp(argv[j], L"/add") == 0) @@ -694,6 +681,19 @@ cmdUser( } } + if (lpUserName == NULL && lpPassword == NULL) + { + Status = EnumerateUsers(); + ConPrintf(StdOut, L"Status: %lu\n", Status); + return 0; + } + else if (lpUserName != NULL && lpPassword == NULL) + { + Status = DisplayUser(lpUserName); + ConPrintf(StdOut, L"Status: %lu\n", Status); + return 0; + } + if (bAdd && bDelete) { result = 1; @@ -923,7 +923,7 @@ done: if (result != 0) { ConResPuts(StdOut, IDS_GENERIC_SYNTAX); - ConResPuts(StdOut, IDS_USER_SYNTAX); + PrintNetMessage(MSG_USER_SYNTAX); } return result; diff --git a/base/applications/network/net/help.c b/base/applications/network/net/help.c index 6d248d22f5..01b67a6572 100644 --- a/base/applications/network/net/help.c +++ b/base/applications/network/net/help.c @@ -155,29 +155,29 @@ INT cmdHelp(INT argc, WCHAR **argv) if (_wcsicmp(argv[2], L"TIME") == 0) { - ConResPuts(StdOut, IDS_TIME_SYNTAX); - ConResPuts(StdOut, IDS_TIME_HELP); + PrintNetMessage(MSG_TIME_SYNTAX); + PrintNetMessage(MSG_TIME_HELP); return 0; } if (_wcsicmp(argv[2], L"USE") == 0) { - ConResPuts(StdOut, IDS_USE_SYNTAX); - ConResPuts(StdOut, IDS_USE_HELP); + PrintNetMessage(MSG_USE_SYNTAX); + PrintNetMessage(MSG_USE_HELP); return 0; } if (_wcsicmp(argv[2], L"USER") == 0) { - ConResPuts(StdOut, IDS_USER_SYNTAX); - ConResPuts(StdOut, IDS_USER_HELP); + PrintNetMessage(MSG_USER_SYNTAX); + PrintNetMessage(MSG_USER_HELP); return 0; } if (_wcsicmp(argv[2], L"VIEW") == 0) { - ConResPuts(StdOut, IDS_VIEW_SYNTAX); - ConResPuts(StdOut, IDS_VIEW_HELP); + PrintNetMessage(MSG_VIEW_SYNTAX); + PrintNetMessage(MSG_VIEW_HELP); return 0; } diff --git a/base/applications/network/net/lang/en-US.rc b/base/applications/network/net/lang/en-US.rc index 786d153758..506027b1b7 100644 --- a/base/applications/network/net/lang/en-US.rc +++ b/base/applications/network/net/lang/en-US.rc @@ -2,21 +2,6 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US STRINGTABLE BEGIN - IDS_TIME_SYNTAX "NET TIME ...\n\n" - IDS_TIME_HELP "TIME\n...\n\n" - IDS_USE_SYNTAX "NET USE ...\n\n" - IDS_USE_HELP "USE\n...\n\n" - IDS_USER_SYNTAX "NET USER [username [password | *] [options]] [/DOMAIN]\n\ - username {password | *} /ADD [options] [/DOMAIN]\n\ - username [/DELETE] [/DOMAIN]\n\n" - IDS_USER_HELP "USER\n...\n\n" - IDS_VIEW_SYNTAX "NET VIEW ...\n\n" - IDS_VIEW_HELP "VIEW\n...\n\n" - - IDS_NET_SYNTAX "NET [ ACCOUNTS | COMPUTER | CONFIG | CONTINUE | FILE | GROUP | HELP |\n\ - HELPMSG | LOCALGROUP | NAME | PAUSE | PRINT | SEND | SESSION |\n\ - SHARE | START | STATISTICS | STOP | TIME | USE | USER | VIEW ]\n" - IDS_ACCOUNTS_FORCE_LOGOFF "Force logoff after" IDS_ACCOUNTS_LOGOFF_SECONDS "%lu seconds" IDS_ACCOUNTS_MIN_PW_AGE "Minimum password age (in days)" diff --git a/base/applications/network/net/lang/es-ES.rc b/base/applications/network/net/lang/es-ES.rc index e3ceadf8a5..e39ea9767e 100644 --- a/base/applications/network/net/lang/es-ES.rc +++ b/base/applications/network/net/lang/es-ES.rc @@ -5,20 +5,6 @@ LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL STRINGTABLE BEGIN - IDS_TIME_SYNTAX "NET TIME ...\n\n" - IDS_TIME_HELP "TIME\n...\n\n" - IDS_USE_SYNTAX "NET USE ...\n\n" - IDS_USE_HELP "USE\n...\n\n" - IDS_USER_SYNTAX "NET USER [usuario [contraseña | *] [opciones]] [/DOMAIN]\n\ - usuario {contraseña | *} /ADD [opciones] [/DOMAIN]\n\ - usuario [/DELETE] [/DOMAIN]\n\n" - IDS_USER_HELP "USER\n...\n\n" - IDS_VIEW_SYNTAX "NET VIEW ...\n\n" - IDS_VIEW_HELP "VIEW\n...\n\n" - IDS_NET_SYNTAX "NET [ ACCOUNTS | COMPUTER | CONFIG | CONTINUE | FILE | GROUP | HELP |\n\ - HELPMSG | LOCALGROUP | NAME | PAUSE | PRINT | SEND | SESSION |\n\ - SHARE | START | STATISTICS | STOP | TIME | USE | USER | VIEW ]\n" - IDS_ACCOUNTS_FORCE_LOGOFF "Forzar cierre de sesión tras" IDS_ACCOUNTS_LOGOFF_SECONDS "%lu segundos" IDS_ACCOUNTS_MIN_PW_AGE "Validez mínima de contraseña (en días)" diff --git a/base/applications/network/net/lang/pl-PL.rc b/base/applications/network/net/lang/pl-PL.rc index 6780dcfa01..4ea9dd4828 100644 --- a/base/applications/network/net/lang/pl-PL.rc +++ b/base/applications/network/net/lang/pl-PL.rc @@ -1,21 +1,6 @@ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT STRINGTABLE BEGIN - IDS_TIME_SYNTAX "NET TIME ...\n\n" - IDS_TIME_HELP "TIME\n...\n\n" - IDS_USE_SYNTAX "NET USE ...\n\n" - IDS_USE_HELP "USE\n...\n\n" - IDS_USER_SYNTAX "NET USER [nazwa_użytkownika [hasło | *] [opcje]] [/DOMAIN]\n\ - nazwa_użytkownika {hasło | *} /ADD [opcje] [/DOMAIN]\n\ - nazwa_użytkownika [/DELETE] [/DOMAIN]\n\n" - IDS_USER_HELP "USER\n...\n\n" - IDS_VIEW_SYNTAX "NET VIEW ...\n\n" - IDS_VIEW_HELP "VIEW\n...\n\n" - - IDS_NET_SYNTAX "NET [ ACCOUNTS | COMPUTER | CONFIG | CONTINUE | FILE | GROUP | HELP |\n\ - HELPMSG | LOCALGROUP | NAME | PAUSE | PRINT | SEND | SESSION |\n\ - SHARE | START | STATISTICS | STOP | TIME | USE | USER | VIEW ]\n" - IDS_ACCOUNTS_FORCE_LOGOFF "Wymuś wylogowanie po upływie" IDS_ACCOUNTS_LOGOFF_SECONDS "%lu sekund" IDS_ACCOUNTS_MIN_PW_AGE "Minimalny okres ważności hasła (dni)" diff --git a/base/applications/network/net/lang/ro-RO.rc b/base/applications/network/net/lang/ro-RO.rc index 1f42b72a30..ad1eb5d04f 100644 --- a/base/applications/network/net/lang/ro-RO.rc +++ b/base/applications/network/net/lang/ro-RO.rc @@ -8,20 +8,6 @@ LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL STRINGTABLE BEGIN - IDS_TIME_SYNTAX "NET TIME ...\n\n" - IDS_TIME_HELP "TIME\n...\n\n" - IDS_USE_SYNTAX "NET USE ...\n\n" - IDS_USE_HELP "USE\n...\n\n" - IDS_USER_SYNTAX "NET USER [nume-utilizator [parolă | *] [opțiuni]] [/DOMAIN]\n\ - nume-utilizator {parolă | *} /ADD [opțiuni] [/DOMAIN]\n\ - nume-utilizator [/DELETE] [/DOMAIN]\n\n" - IDS_USER_HELP "USER\n...\n\n" - IDS_VIEW_SYNTAX "NET VIEW ...\n\n" - IDS_VIEW_HELP "VIEW\n...\n\n" - IDS_NET_SYNTAX "NET [ ACCOUNTS | COMPUTER | CONFIG | CONTINUE | FILE | GROUP | HELP |\n\ - HELPMSG | LOCALGROUP | NAME | PAUSE | PRINT | SEND | SESSION |\n\ - SHARE | START | STATISTICS | STOP | TIME | USE | USER | VIEW ]\n" - IDS_ACCOUNTS_FORCE_LOGOFF "Forțează deautentificarea după" IDS_ACCOUNTS_LOGOFF_SECONDS "%lu secunde" IDS_ACCOUNTS_MIN_PW_AGE "Vârsta minimă a parolei (în zile)" diff --git a/base/applications/network/net/lang/ru-RU.rc b/base/applications/network/net/lang/ru-RU.rc index 51c3931df6..90a255ae7e 100644 --- a/base/applications/network/net/lang/ru-RU.rc +++ b/base/applications/network/net/lang/ru-RU.rc @@ -4,20 +4,6 @@ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT STRINGTABLE BEGIN - IDS_TIME_SYNTAX "NET TIME ...\n\n" - IDS_TIME_HELP "TIME\n...\n\n" - IDS_USE_SYNTAX "NET USE ...\n\n" - IDS_USE_HELP "USE\n...\n\n" - IDS_USER_SYNTAX "NET USER [имя_пользователя [пароль | *] [параметры]] [/DOMAIN]\n\ - имя_пользователя {пароль | *} /ADD [параметры] [/DOMAIN]\n\ - имя_пользователя [/DELETE] [/DOMAIN]\n\n" - IDS_USER_HELP "USER\n...\n\n" - IDS_VIEW_SYNTAX "NET VIEW ...\n\n" - IDS_VIEW_HELP "VIEW\n...\n\n" - IDS_NET_SYNTAX "NET [ ACCOUNTS | COMPUTER | CONFIG | CONTINUE | FILE | GROUP | HELP |\n\ - HELPMSG | LOCALGROUP | NAME | PAUSE | PRINT | SEND | SESSION |\n\ - SHARE | START | STATISTICS | STOP | TIME | USE | USER | VIEW ]\n" - IDS_ACCOUNTS_FORCE_LOGOFF "Принудительный выход через" IDS_ACCOUNTS_LOGOFF_SECONDS "%lu секунд" IDS_ACCOUNTS_MIN_PW_AGE "Минимальный срок действия пароля (дней)" diff --git a/base/applications/network/net/lang/tr-TR.rc b/base/applications/network/net/lang/tr-TR.rc index 01b0d7ef3f..aef7a7227e 100644 --- a/base/applications/network/net/lang/tr-TR.rc +++ b/base/applications/network/net/lang/tr-TR.rc @@ -4,20 +4,6 @@ LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT STRINGTABLE BEGIN - IDS_TIME_SYNTAX "NET TIME ...\n\n" - IDS_TIME_HELP "TIME\n...\n\n" - IDS_USE_SYNTAX "NET USE ...\n\n" - IDS_USE_HELP "USE\n...\n\n" - IDS_USER_SYNTAX "NET USER [kullanıcı adı [şifre | *] [seçenekler]] [/DOMAIN]\n\ - kullanıcı adı {şifre | *} /ADD [seçenekler] [/DOMAIN]\n\ - kullanıcı adı [/DELETE] [/DOMAIN]\n\n" - IDS_USER_HELP "USER\n...\n\n" - IDS_VIEW_SYNTAX "NET VIEW ...\n\n" - IDS_VIEW_HELP "VIEW\n...\n\n" - IDS_NET_SYNTAX "NET [ ACCOUNTS | COMPUTER | CONFIG | CONTINUE | FILE | GROUP | HELP |\n\ - HELPMSG | LOCALGROUP | NAME | PAUSE | PRINT | SEND | SESSION |\n\ - SHARE | START | STATISTICS | STOP | TIME | USE | USER | VIEW ]\n" - IDS_ACCOUNTS_FORCE_LOGOFF "Sonra oturum kapatmaya zorla" IDS_ACCOUNTS_LOGOFF_SECONDS "%lu sâniye" IDS_ACCOUNTS_MIN_PW_AGE "En az şifre yaşı (gün)" diff --git a/base/applications/network/net/lang/zh-CN.rc b/base/applications/network/net/lang/zh-CN.rc index ec91e650a1..96c8aae7e1 100644 --- a/base/applications/network/net/lang/zh-CN.rc +++ b/base/applications/network/net/lang/zh-CN.rc @@ -4,20 +4,6 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED STRINGTABLE BEGIN - IDS_TIME_SYNTAX "NET TIME ...\n\n" - IDS_TIME_HELP "TIME\n...\n\n" - IDS_USE_SYNTAX "NET USE ...\n\n" - IDS_USE_HELP "USE\n...\n\n" - IDS_USER_SYNTAX "NET USER [username [password | *] [options]] [/DOMAIN]\n\ - username {password | *} /ADD [options] [/DOMAIN]\n\ - username [/DELETE] [/DOMAIN]\n\n" - IDS_USER_HELP "USER\n...\n\n" - IDS_VIEW_SYNTAX "NET VIEW ...\n\n" - IDS_VIEW_HELP "VIEW\n...\n\n" - IDS_NET_SYNTAX "NET [ ACCOUNTS | COMPUTER | CONFIG | CONTINUE | FILE | GROUP | HELP |\n\ - HELPMSG | LOCALGROUP | NAME | PAUSE | PRINT | SEND | SESSION |\n\ - SHARE | START | STATISTICS | STOP | TIME | USE | USER | VIEW ]\n" - IDS_ACCOUNTS_FORCE_LOGOFF "强制注销后" IDS_ACCOUNTS_LOGOFF_SECONDS "%lu 秒" IDS_ACCOUNTS_MIN_PW_AGE "密码最短使用期限 (以天为单位)" diff --git a/base/applications/network/net/lang/zh-TW.rc b/base/applications/network/net/lang/zh-TW.rc index c0de71ae1e..fba20506b9 100644 --- a/base/applications/network/net/lang/zh-TW.rc +++ b/base/applications/network/net/lang/zh-TW.rc @@ -4,20 +4,6 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL STRINGTABLE BEGIN - IDS_TIME_SYNTAX "NET TIME ...\n\n" - IDS_TIME_HELP "TIME\n...\n\n" - IDS_USE_SYNTAX "NET USE ...\n\n" - IDS_USE_HELP "USE\n...\n\n" - IDS_USER_SYNTAX "NET USER [使用者名 [密碼 | *] [選項]] [/DOMAIN]\n\ - 使用者名 {密碼 | *} /ADD [選項] [/DOMAIN]\n\ - 使用者名 [/DELETE] [/DOMAIN]\n\n" - IDS_USER_HELP "USER\n...\n\n" - IDS_VIEW_SYNTAX "NET VIEW ...\n\n" - IDS_VIEW_HELP "VIEW\n...\n\n" - IDS_NET_SYNTAX "NET [ ACCOUNTS | COMPUTER | CONFIG | CONTINUE | FILE | GROUP | HELP |\n\ - HELPMSG | LOCALGROUP | NAME | PAUSE | PRINT | SEND | SESSION |\n\ - SHARE | START | STATISTICS | STOP | TIME | USE | USER | VIEW ]\n" - IDS_ACCOUNTS_FORCE_LOGOFF "強制登出後" IDS_ACCOUNTS_LOGOFF_SECONDS "%lu 秒" IDS_ACCOUNTS_MIN_PW_AGE "密碼最短使用期限 (以天)" diff --git a/base/applications/network/net/main.c b/base/applications/network/net/main.c index 883ee2ef2b..02c2b4579e 100644 --- a/base/applications/network/net/main.c +++ b/base/applications/network/net/main.c @@ -246,7 +246,7 @@ int wmain(int argc, WCHAR **argv) done: if (bRun == FALSE) - ConResPuts(StdOut, IDS_NET_SYNTAX); + PrintNetMessage(MSG_NET_SYNTAX); if (hModuleNetMsg != NULL) FreeLibrary(hModuleNetMsg); diff --git a/base/applications/network/net/resource.h b/base/applications/network/net/resource.h index 2cd9cd9bc9..ec2cab3cc2 100644 --- a/base/applications/network/net/resource.h +++ b/base/applications/network/net/resource.h @@ -1,15 +1,5 @@ #pragma once -#define IDS_TIME_SYNTAX 174 -#define IDS_TIME_HELP 175 -#define IDS_USE_SYNTAX 176 -#define IDS_USE_HELP 177 -#define IDS_USER_SYNTAX 178 -#define IDS_USER_HELP 179 -#define IDS_VIEW_SYNTAX 180 -#define IDS_VIEW_HELP 181 -#define IDS_NET_SYNTAX 182 - #define IDS_ACCOUNTS_FORCE_LOGOFF 200 #define IDS_ACCOUNTS_LOGOFF_SECONDS 201 #define IDS_ACCOUNTS_MIN_PW_AGE 202 diff --git a/sdk/include/reactos/mc/net_msg.mc b/sdk/include/reactos/mc/net_msg.mc index 4ee5c19a76..dfe476baac 100644 --- a/sdk/include/reactos/mc/net_msg.mc +++ b/sdk/include/reactos/mc/net_msg.mc @@ -1,3 +1,11 @@ +;/* +; * Romanian translation by Ștefan Fulea (stefan dot fulea at mail dot com) +; * Russian translation by Kudratov Olimjon (olim98(a)bk.ru) +; * Spanish translation by Ismael Ferreras Morezuelas <2014-11-07> +; * Turkish translation by 2015 Erdem Ersoy (eersoy93) (erdemersoy [at] erdemersoy [dot] net) +; * Simplified Chinese translation by Henry Tang Ih 2016 (henrytang2(a)hotmail.com) +; * Traditional Chinese translation by Henry Tang Ih 2016 (henrytang2(a)hotmail.com) +; */ MessageIdTypedef=DWORD SeverityNames=(Success=0x0:STATUS_SEVERITY_SUCCESS @@ -2436,3 +2444,336 @@ using. Also, some services are dependent on others. Stopping one service can stop others. Some services cannot be stopped. . + +MessageId=10038 +SymbolicName=MSG_TIME_SYNTAX +Severity=Success +Facility=System +Language=English +NET TIME ... +. +Language=Polish +NET TIME ... +. +Language=Romanian +NET TIME ... +. +Language=Russian +NET TIME ... +. +Language=Spanish +NET TIME ... +. +Language=Turkish +NET TIME ... +. +Language=Chinese +NET TIME ... +. +Language=Taiwanese +NET TIME ... +. + + +MessageId=10039 +SymbolicName=MSG_TIME_HELP +Severity=Success +Facility=System +Language=English +TIME +... +. +Language=Polish +TIME +... +. +Language=Romanian +TIME +... +. +Language=Russian +TIME +... +. +Language=Spanish +TIME +... +. +Language=Turkish +TIME +... +. +Language=Chinese +TIME +... +. +Language=Taiwanese +TIME +... +. + + +MessageId=10040 +SymbolicName=MSG_USE_SYNTAX +Severity=Success +Facility=System +Language=English +NET USE ... +. +Language=Polish +NET USE ... +. +Language=Romanian +NET USE ... +. +Language=Russian +NET USE ... +. +Language=Spanish +NET USE ... +. +Language=Turkish +NET USE ... +. +Language=Chinese +NET USE ... +. +Language=Taiwanese +NET USE ... +. + + +MessageId=10041 +SymbolicName=MSG_USE_HELP +Severity=Success +Facility=System +Language=English +USE +... +. +Language=Polish +USE +... +. +Language=Romanian +USE +... +. +Language=Russian +USE +... +. +Language=Spanish +USE +... +. +Language=Turkish +USE +... +. +Language=Chinese +USE +... +. +Language=Taiwanese +USE +... +. + + +MessageId=10042 +SymbolicName=MSG_USER_SYNTAX +Severity=Success +Facility=System +Language=English +NET USER [username [password | *] [options]] [/DOMAIN] + username {password | *} /ADD [options] [/DOMAIN] + username [/DELETE] [/DOMAIN] +. +Language=Polish +NET USER [nazwa_użytkownika [hasło | *] [opcje]] [/DOMAIN] + nazwa_użytkownika {hasło | *} /ADD [opcje] [/DOMAIN] + nazwa_użytkownika [/DELETE] [/DOMAIN] +. +Language=Romanian +NET USER [nume-utilizator [parolă | *] [opțiuni]] [/DOMAIN] + nume-utilizator {parolă | *} /ADD [opțiuni] [/DOMAIN] + nume-utilizator [/DELETE] [/DOMAIN] +. +Language=Russian +NET USER [имя_пользователя [пароль | *] [параметры]] [/DOMAIN] + имя_пользователя {пароль | *} /ADD [параметры] [/DOMAIN] + имя_пользователя [/DELETE] [/DOMAIN] +. +Language=Spanish +NET USER [usuario [contraseña | *] [opciones]] [/DOMAIN] + usuario {contraseña | *} /ADD [opciones] [/DOMAIN] + usuario [/DELETE] [/DOMAIN] +. +Language=Turkish +NET USER [kullanıcı adı [şifre | *] [seçenekler]] [/DOMAIN] + kullanıcı adı {şifre | *} /ADD [seçenekler] [/DOMAIN] + kullanıcı adı [/DELETE] [/DOMAIN] +. +Language=Chinese +NET USER [username [password | *] [options]] [/DOMAIN] + username {password | *} /ADD [options] [/DOMAIN] + username [/DELETE] [/DOMAIN] +. +Language=Taiwanese +NET USER [使用者名 [密碼 | *] [選項]] [/DOMAIN] + 使用者名 {密碼 | *} /ADD [選項] [/DOMAIN] + 使用者名 [/DELETE] [/DOMAIN] +. + + +MessageId=10043 +SymbolicName=MSG_USER_HELP +Severity=Success +Facility=System +Language=English +USER +... +. +Language=Polish +USER +... +. +Language=Romanian +USER +... +. +Language=Russian +USER +... +. +Language=Spanish +USER +... +. +Language=Turkish +USER +... +. +Language=Chinese +USER +... +. +Language=Taiwanese +USER +... +. + + +MessageId=10044 +SymbolicName=MSG_VIEW_SYNTAX +Severity=Success +Facility=System +Language=English +NET VIEW ... +. +Language=Polish +NET VIEW ... +. +Language=Romanian +NET VIEW ... +. +Language=Russian +NET VIEW ... +. +Language=Spanish +NET VIEW ... +. +Language=Turkish +NET VIEW ... +. +Language=Chinese +NET VIEW ... +. +Language=Taiwanese +NET VIEW ... +. + + +MessageId=10045 +SymbolicName=MSG_VIEW_HELP +Severity=Success +Facility=System +Language=English +VIEW +... +. +Language=Polish +VIEW +... +. +Language=Romanian +VIEW +... +. +Language=Russian +VIEW +... +. +Language=Spanish +VIEW +... +. +Language=Turkish +VIEW +... +. +Language=Chinese +VIEW +... +. +Language=Taiwanese +VIEW +... +. + + +MessageId=10046 +SymbolicName=MSG_NET_SYNTAX +Severity=Success +Facility=System +Language=English +NET [ ACCOUNTS | COMPUTER | CONFIG | CONTINUE | FILE | GROUP | HELP | + HELPMSG | LOCALGROUP | NAME | PAUSE | PRINT | SEND | SESSION | + SHARE | START | STATISTICS | STOP | TIME | USE | USER | VIEW ] +. +Language=Polish +NET [ ACCOUNTS | COMPUTER | CONFIG | CONTINUE | FILE | GROUP | HELP | + HELPMSG | LOCALGROUP | NAME | PAUSE | PRINT | SEND | SESSION | + SHARE | START | STATISTICS | STOP | TIME | USE | USER | VIEW ] +. +Language=Romanian +NET [ ACCOUNTS | COMPUTER | CONFIG | CONTINUE | FILE | GROUP | HELP | + HELPMSG | LOCALGROUP | NAME | PAUSE | PRINT | SEND | SESSION | + SHARE | START | STATISTICS | STOP | TIME | USE | USER | VIEW ] +. +Language=Russian +NET [ ACCOUNTS | COMPUTER | CONFIG | CONTINUE | FILE | GROUP | HELP | + HELPMSG | LOCALGROUP | NAME | PAUSE | PRINT | SEND | SESSION | + SHARE | START | STATISTICS | STOP | TIME | USE | USER | VIEW ] +. +Language=Spanish +NET [ ACCOUNTS | COMPUTER | CONFIG | CONTINUE | FILE | GROUP | HELP | + HELPMSG | LOCALGROUP | NAME | PAUSE | PRINT | SEND | SESSION | + SHARE | START | STATISTICS | STOP | TIME | USE | USER | VIEW ] +. +Language=Turkish +NET [ ACCOUNTS | COMPUTER | CONFIG | CONTINUE | FILE | GROUP | HELP | + HELPMSG | LOCALGROUP | NAME | PAUSE | PRINT | SEND | SESSION | + SHARE | START | STATISTICS | STOP | TIME | USE | USER | VIEW ] +. +Language=Chinese +NET [ ACCOUNTS | COMPUTER | CONFIG | CONTINUE | FILE | GROUP | HELP | + HELPMSG | LOCALGROUP | NAME | PAUSE | PRINT | SEND | SESSION | + SHARE | START | STATISTICS | STOP | TIME | USE | USER | VIEW ] +. +Language=Taiwanese +NET [ ACCOUNTS | COMPUTER | CONFIG | CONTINUE | FILE | GROUP | HELP | + HELPMSG | LOCALGROUP | NAME | PAUSE | PRINT | SEND | SESSION | + SHARE | START | STATISTICS | STOP | TIME | USE | USER | VIEW ] +.

1 0

[reactos] 01/02: [NET] Move START, STATISTICS and STOP command syntax and help texts into a message table.
by Eric Kohl 24 Dec '18

24 Dec '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4984e1b8104bee1cd5867… commit 4984e1b8104bee1cd5867fb08919ed4ade81b79e Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Mon Dec 24 10:20:44 2018 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Mon Dec 24 10:20:44 2018 +0100 [NET] Move START, STATISTICS and STOP command syntax and help texts into a message table. --- base/applications/network/net/cmdStart.c | 8 +- base/applications/network/net/cmdStatistics.c | 7 +- base/applications/network/net/cmdStop.c | 8 +- base/applications/network/net/help.c | 17 +- base/applications/network/net/lang/en-US.rc | 19 -- base/applications/network/net/lang/es-ES.rc | 18 -- base/applications/network/net/lang/pl-PL.rc | 19 -- base/applications/network/net/lang/ro-RO.rc | 18 -- base/applications/network/net/lang/ru-RU.rc | 18 -- base/applications/network/net/lang/tr-TR.rc | 18 -- base/applications/network/net/lang/zh-CN.rc | 18 -- base/applications/network/net/lang/zh-TW.rc | 18 -- base/applications/network/net/resource.h | 11 - sdk/include/reactos/mc/net_msg.mc | 316 ++++++++++++++++++++++++++ 14 files changed, 331 insertions(+), 182 deletions(-) diff --git a/base/applications/network/net/cmdStart.c b/base/applications/network/net/cmdStart.c index 00847c5ce3..082fa79d1d 100644 --- a/base/applications/network/net/cmdStart.c +++ b/base/applications/network/net/cmdStart.c @@ -57,7 +57,7 @@ EnumerateRunningServices(VOID) &dwServiceCount, &dwResumeHandle)) { - ConPuts(StdOut, L"The following services hav been started:\n\n"); + ConPuts(StdOut, L"The following services have been started:\n\n"); for (i = 0; i < dwServiceCount; i++) { @@ -174,10 +174,8 @@ cmdStart(INT argc, WCHAR **argv) if (_wcsicmp(argv[i], L"/help") == 0) { ConResPuts(StdOut, IDS_GENERIC_SYNTAX); - ConResPuts(StdOut, IDS_START_SYNTAX); - ConResPuts(StdOut, IDS_START_HELP_1); - ConResPuts(StdOut, IDS_START_HELP_2); - ConResPuts(StdOut, IDS_START_HELP_3); + PrintNetMessage(MSG_START_SYNTAX); + PrintNetMessage(MSG_START_HELP); return 1; } } diff --git a/base/applications/network/net/cmdStatistics.c b/base/applications/network/net/cmdStatistics.c index 652445ace4..7c69fcdf9d 100644 --- a/base/applications/network/net/cmdStatistics.c +++ b/base/applications/network/net/cmdStatistics.c @@ -265,7 +265,7 @@ cmdStatistics( { /* Print short syntax help */ ConResPuts(StdOut, IDS_GENERIC_SYNTAX); - ConResPuts(StdOut, IDS_STATISTICS_SYNTAX); + PrintNetMessage(MSG_STATISTICS_SYNTAX); return 0; } @@ -273,9 +273,8 @@ cmdStatistics( { /* Print full help text*/ ConResPuts(StdOut, IDS_GENERIC_SYNTAX); - ConResPuts(StdOut, IDS_STATISTICS_SYNTAX); - ConResPuts(StdOut, IDS_STATISTICS_HELP_1); - ConResPuts(StdOut, IDS_STATISTICS_HELP_2); + PrintNetMessage(MSG_STATISTICS_SYNTAX); + PrintNetMessage(MSG_STATISTICS_HELP); return 0; } } diff --git a/base/applications/network/net/cmdStop.c b/base/applications/network/net/cmdStop.c index 48e857a5a0..dbb0cdd023 100644 --- a/base/applications/network/net/cmdStop.c +++ b/base/applications/network/net/cmdStop.c @@ -21,7 +21,7 @@ INT cmdStop(INT argc, WCHAR **argv) if (argc != 3) { ConResPuts(StdOut, IDS_GENERIC_SYNTAX); - ConResPuts(StdOut, IDS_STOP_SYNTAX); + PrintNetMessage(MSG_STOP_SYNTAX); return 1; } @@ -30,10 +30,8 @@ INT cmdStop(INT argc, WCHAR **argv) if (_wcsicmp(argv[i], L"/help") == 0) { ConResPuts(StdOut, IDS_GENERIC_SYNTAX); - ConResPuts(StdOut, IDS_STOP_SYNTAX); - ConResPuts(StdOut, IDS_STOP_HELP_1); - ConResPuts(StdOut, IDS_STOP_HELP_2); - ConResPuts(StdOut, IDS_STOP_HELP_3); + PrintNetMessage(MSG_STOP_SYNTAX); + PrintNetMessage(MSG_STOP_HELP); return 1; } } diff --git a/base/applications/network/net/help.c b/base/applications/network/net/help.c index d509594a37..6d248d22f5 100644 --- a/base/applications/network/net/help.c +++ b/base/applications/network/net/help.c @@ -134,27 +134,22 @@ INT cmdHelp(INT argc, WCHAR **argv) if (_wcsicmp(argv[2], L"START") == 0) { - ConResPuts(StdOut, IDS_START_SYNTAX); - ConResPuts(StdOut, IDS_START_HELP_1); - ConResPuts(StdOut, IDS_START_HELP_2); - ConResPuts(StdOut, IDS_START_HELP_3); + PrintNetMessage(MSG_START_SYNTAX); + PrintNetMessage(MSG_START_HELP); return 0; } if (_wcsicmp(argv[2], L"STATISTICS") == 0) { - ConResPuts(StdOut, IDS_STATISTICS_SYNTAX); - ConResPuts(StdOut, IDS_STATISTICS_HELP_1); - ConResPuts(StdOut, IDS_STATISTICS_HELP_2); + PrintNetMessage(MSG_STATISTICS_SYNTAX); + PrintNetMessage(MSG_STATISTICS_HELP); return 0; } if (_wcsicmp(argv[2], L"STOP") == 0) { - ConResPuts(StdOut, IDS_STOP_SYNTAX); - ConResPuts(StdOut, IDS_STOP_HELP_1); - ConResPuts(StdOut, IDS_STOP_HELP_2); - ConResPuts(StdOut, IDS_STOP_HELP_3); + PrintNetMessage(MSG_STOP_SYNTAX); + PrintNetMessage(MSG_STOP_HELP); return 0; } diff --git a/base/applications/network/net/lang/en-US.rc b/base/applications/network/net/lang/en-US.rc index cd8f368158..786d153758 100644 --- a/base/applications/network/net/lang/en-US.rc +++ b/base/applications/network/net/lang/en-US.rc @@ -2,25 +2,6 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US STRINGTABLE BEGIN - IDS_START_SYNTAX "NET START [service]\n\n" - IDS_START_HELP_1 "NET START starts services or lists running services.\n\n" - IDS_START_HELP_2 "service The name of the service to be started.\n\n" - IDS_START_HELP_3 "When typed at the command prompt, service name of two words or more must\n\ -be enclosed in quotation marks. For example, NET START ""NET LOGON""\n\ -starts the net logon service.\n\n" - IDS_STATISTICS_SYNTAX "NET STATISTICS [SERVER | WORKSTATION]\n\n" - IDS_STATISTICS_HELP_1 "NET STATISTICS displays the statisticslog for the local Workstation or\n\ -Server service. Used without parameters, NET STATISTICS displays\n\ -the services for which statistics are available.\n\n" - IDS_STATISTICS_HELP_2 "SERVER Displays the Server service statistics.\n\ -WORKSTATION Displays the Workstation service statistics.\n\n" - - IDS_STOP_SYNTAX "NET STOP service\n\n" - IDS_STOP_HELP_1 "NET STOP stops services.\n\n" - IDS_STOP_HELP_2 "service The name of the service to be stopped.\n\n" - IDS_STOP_HELP_3 "Stopping a service cancels any network connection the service is\n\ -using. Also, some services are dependent on others. Stopping one\n\ -service can stop others. Some services cannot be stopped.\n\n" IDS_TIME_SYNTAX "NET TIME ...\n\n" IDS_TIME_HELP "TIME\n...\n\n" IDS_USE_SYNTAX "NET USE ...\n\n" diff --git a/base/applications/network/net/lang/es-ES.rc b/base/applications/network/net/lang/es-ES.rc index 39950eb2b6..e3ceadf8a5 100644 --- a/base/applications/network/net/lang/es-ES.rc +++ b/base/applications/network/net/lang/es-ES.rc @@ -5,24 +5,6 @@ LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL STRINGTABLE BEGIN - IDS_START_SYNTAX "NET START [service]\n\n" - IDS_START_HELP_1 "NET START starts services or lists running services.\n\n" - IDS_START_HELP_2 "service The name of the service to be started.\n\n" - IDS_START_HELP_3 "When typed at the command prompt, service name of two words or more must\n\ -be enclosed in quotation marks. For example, NET START ""NET LOGON""\n\ -starts the net logon service.\n\n" - IDS_STATISTICS_SYNTAX "NET STATISTICS [SERVER | WORKSTATION]\n\n" - IDS_STATISTICS_HELP_1 "NET STATISTICS displays the statisticslog for the local Workstation or\n\ -Server service. Used without parameters, NET STATISTICS displays\n\ -the services for which statistics are available.\n\n" - IDS_STATISTICS_HELP_2 "SERVER Displays the Server service statistics.\n\ -WORKSTATION Displays the Workstation service statistics.\n\n" - IDS_STOP_SYNTAX "NET STOP <nombre del servicio>\n\n" - IDS_STOP_HELP_1 "NET STOP stops services.\n\n" - IDS_STOP_HELP_2 "service The name of the service to be stopped.\n\n" - IDS_STOP_HELP_3 "Stopping a service cancels any network connection the service is\n\ -using. Also, some services are dependent on others. Stopping one\n\ -service can stop others. Some services cannot be stopped.\n\n" IDS_TIME_SYNTAX "NET TIME ...\n\n" IDS_TIME_HELP "TIME\n...\n\n" IDS_USE_SYNTAX "NET USE ...\n\n" diff --git a/base/applications/network/net/lang/pl-PL.rc b/base/applications/network/net/lang/pl-PL.rc index b41750401a..6780dcfa01 100644 --- a/base/applications/network/net/lang/pl-PL.rc +++ b/base/applications/network/net/lang/pl-PL.rc @@ -1,25 +1,6 @@ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT STRINGTABLE BEGIN - IDS_START_SYNTAX "NET START [usługa]\n\n" - IDS_START_HELP_1 "NET START uruchamia usługi lub wyświetla uruchomione usługi.\n\n" - IDS_START_HELP_2 "usługa Nazwa uruchamianej usługi.\n\n" - IDS_START_HELP_3 "Nazwy usług mające dwa lub więcej słów wpisywane w.\n\ -wierszu polecenia muszą być ujęte w cudzysłów. Przykładowo,\n\ -NET START ""NET LOGON"" uruchamia usługę logowania w sieci.\n\n" - IDS_STATISTICS_SYNTAX "NET STATISTICS [SERVER | WORKSTATION]\n\n" - IDS_STATISTICS_HELP_1 "NET STATISTICS wyświetla dziennik statystyki dla lokalnej usługi\n\ -Stacja robocza lub Serwer. Użyte bez parametrów, NET STATISTICS wyświetla\n\ -usługi dla których statystyka jest dostępna.\n\n" - IDS_STATISTICS_HELP_2 "SERVER Wyświetla statystykę usługi Serwer.\n\ -WORKSTATION Wyświetla statystykę usługi Stacja robocza.\n\n" - - IDS_STOP_SYNTAX "NET STOP usługa\n\n" - IDS_STOP_HELP_1 "NET STOP zatrzymuje usługi.\n\n" - IDS_STOP_HELP_2 "usługa Nazwa zatrzymywanej usługi.\n\n" - IDS_STOP_HELP_3 "Zatrzymanie usługi rozłącza wszystkie połączenia sieciowe\n\ -używane przez usługę. Niektóre usługi zależą od innych. Zatrzymanie jednej\n\ -może też zatrzymać inne. Niektóre usługi nie mogą być zatrzymane.\n\n" IDS_TIME_SYNTAX "NET TIME ...\n\n" IDS_TIME_HELP "TIME\n...\n\n" IDS_USE_SYNTAX "NET USE ...\n\n" diff --git a/base/applications/network/net/lang/ro-RO.rc b/base/applications/network/net/lang/ro-RO.rc index 563cc9635a..1f42b72a30 100644 --- a/base/applications/network/net/lang/ro-RO.rc +++ b/base/applications/network/net/lang/ro-RO.rc @@ -8,24 +8,6 @@ LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL STRINGTABLE BEGIN - IDS_START_SYNTAX "NET START [service]\n\n" - IDS_START_HELP_1 "NET START starts services or lists running services.\n\n" - IDS_START_HELP_2 "service The name of the service to be started.\n\n" - IDS_START_HELP_3 "When typed at the command prompt, service name of two words or more must\n\ -be enclosed in quotation marks. For example, NET START ""NET LOGON""\n\ -starts the net logon service.\n\n" - IDS_STATISTICS_SYNTAX "NET STATISTICS [SERVER | WORKSTATION]\n\n" - IDS_STATISTICS_HELP_1 "NET STATISTICS displays the statisticslog for the local Workstation or\n\ -Server service. Used without parameters, NET STATISTICS displays\n\ -the services for which statistics are available.\n\n" - IDS_STATISTICS_HELP_2 "SERVER Displays the Server service statistics.\n\ -WORKSTATION Displays the Workstation service statistics.\n\n" - IDS_STOP_SYNTAX "NET STOP <nume serviciu>\n\n" - IDS_STOP_HELP_1 "NET STOP stops services.\n\n" - IDS_STOP_HELP_2 "service The name of the service to be stopped.\n\n" - IDS_STOP_HELP_3 "Stopping a service cancels any network connection the service is\n\ -using. Also, some services are dependent on others. Stopping one\n\ -service can stop others. Some services cannot be stopped.\n\n" IDS_TIME_SYNTAX "NET TIME ...\n\n" IDS_TIME_HELP "TIME\n...\n\n" IDS_USE_SYNTAX "NET USE ...\n\n" diff --git a/base/applications/network/net/lang/ru-RU.rc b/base/applications/network/net/lang/ru-RU.rc index 4e260e89ed..51c3931df6 100644 --- a/base/applications/network/net/lang/ru-RU.rc +++ b/base/applications/network/net/lang/ru-RU.rc @@ -4,24 +4,6 @@ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT STRINGTABLE BEGIN - IDS_START_SYNTAX "NET START [service]\n\n" - IDS_START_HELP_1 "NET START starts services or lists running services.\n\n" - IDS_START_HELP_2 "service The name of the service to be started.\n\n" - IDS_START_HELP_3 "When typed at the command prompt, service name of two words or more must\n\ -be enclosed in quotation marks. For example, NET START ""NET LOGON""\n\ -starts the net logon service.\n\n" - IDS_STATISTICS_SYNTAX "NET STATISTICS [SERVER | WORKSTATION]\n\n" - IDS_STATISTICS_HELP_1 "NET STATISTICS displays the statisticslog for the local Workstation or\n\ -Server service. Used without parameters, NET STATISTICS displays\n\ -the services for which statistics are available.\n\n" - IDS_STATISTICS_HELP_2 "SERVER Displays the Server service statistics.\n\ -WORKSTATION Displays the Workstation service statistics.\n\n" - IDS_STOP_SYNTAX "NET STOP <имя_службы>\n\n" - IDS_STOP_HELP_1 "NET STOP stops services.\n\n" - IDS_STOP_HELP_2 "service The name of the service to be stopped.\n\n" - IDS_STOP_HELP_3 "Stopping a service cancels any network connection the service is\n\ -using. Also, some services are dependent on others. Stopping one\n\ -service can stop others. Some services cannot be stopped.\n\n" IDS_TIME_SYNTAX "NET TIME ...\n\n" IDS_TIME_HELP "TIME\n...\n\n" IDS_USE_SYNTAX "NET USE ...\n\n" diff --git a/base/applications/network/net/lang/tr-TR.rc b/base/applications/network/net/lang/tr-TR.rc index 20d8d3198c..01b0d7ef3f 100644 --- a/base/applications/network/net/lang/tr-TR.rc +++ b/base/applications/network/net/lang/tr-TR.rc @@ -4,24 +4,6 @@ LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT STRINGTABLE BEGIN - IDS_START_SYNTAX "NET START [service]\n\n" - IDS_START_HELP_1 "NET START starts services or lists running services.\n\n" - IDS_START_HELP_2 "service The name of the service to be started.\n\n" - IDS_START_HELP_3 "When typed at the command prompt, service name of two words or more must\n\ -be enclosed in quotation marks. For example, NET START ""NET LOGON""\n\ -starts the net logon service.\n\n" - IDS_STATISTICS_SYNTAX "NET STATISTICS [SERVER | WORKSTATION]\n\n" - IDS_STATISTICS_HELP_1 "NET STATISTICS displays the statisticslog for the local Workstation or\n\ -Server service. Used without parameters, NET STATISTICS displays\n\ -the services for which statistics are available.\n\n" - IDS_STATISTICS_HELP_2 "SERVER Displays the Server service statistics.\n\ -WORKSTATION Displays the Workstation service statistics.\n\n" - IDS_STOP_SYNTAX "NET STOP <Hizmet Adı>\n\n" - IDS_STOP_HELP_1 "NET STOP stops services.\n\n" - IDS_STOP_HELP_2 "service The name of the service to be stopped.\n\n" - IDS_STOP_HELP_3 "Stopping a service cancels any network connection the service is\n\ -using. Also, some services are dependent on others. Stopping one\n\ -service can stop others. Some services cannot be stopped.\n\n" IDS_TIME_SYNTAX "NET TIME ...\n\n" IDS_TIME_HELP "TIME\n...\n\n" IDS_USE_SYNTAX "NET USE ...\n\n" diff --git a/base/applications/network/net/lang/zh-CN.rc b/base/applications/network/net/lang/zh-CN.rc index c8b4cee23d..ec91e650a1 100644 --- a/base/applications/network/net/lang/zh-CN.rc +++ b/base/applications/network/net/lang/zh-CN.rc @@ -4,24 +4,6 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED STRINGTABLE BEGIN - IDS_START_SYNTAX "NET START [service]\n\n" - IDS_START_HELP_1 "NET START starts services or lists running services.\n\n" - IDS_START_HELP_2 "service The name of the service to be started.\n\n" - IDS_START_HELP_3 "When typed at the command prompt, service name of two words or more must\n\ -be enclosed in quotation marks. For example, NET START ""NET LOGON""\n\ -starts the net logon service.\n\n" - IDS_STATISTICS_SYNTAX "NET STATISTICS [SERVER | WORKSTATION]\n\n" - IDS_STATISTICS_HELP_1 "NET STATISTICS displays the statisticslog for the local Workstation or\n\ -Server service. Used without parameters, NET STATISTICS displays\n\ -the services for which statistics are available.\n\n" - IDS_STATISTICS_HELP_2 "SERVER Displays the Server service statistics.\n\ -WORKSTATION Displays the Workstation service statistics.\n\n" - IDS_STOP_SYNTAX "NET STOP service\n\n" - IDS_STOP_HELP_1 "NET STOP stops services.\n\n" - IDS_STOP_HELP_2 "service The name of the service to be stopped.\n\n" - IDS_STOP_HELP_3 "Stopping a service cancels any network connection the service is\n\ -using. Also, some services are dependent on others. Stopping one\n\ -service can stop others. Some services cannot be stopped.\n\n" IDS_TIME_SYNTAX "NET TIME ...\n\n" IDS_TIME_HELP "TIME\n...\n\n" IDS_USE_SYNTAX "NET USE ...\n\n" diff --git a/base/applications/network/net/lang/zh-TW.rc b/base/applications/network/net/lang/zh-TW.rc index 09f5b2c155..c0de71ae1e 100644 --- a/base/applications/network/net/lang/zh-TW.rc +++ b/base/applications/network/net/lang/zh-TW.rc @@ -4,24 +4,6 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL STRINGTABLE BEGIN - IDS_START_SYNTAX "NET START [service]\n\n" - IDS_START_HELP_1 "NET START starts services or lists running services.\n\n" - IDS_START_HELP_2 "service The name of the service to be started.\n\n" - IDS_START_HELP_3 "When typed at the command prompt, service name of two words or more must\n\ -be enclosed in quotation marks. For example, NET START ""NET LOGON""\n\ -starts the net logon service.\n\n" - IDS_STATISTICS_SYNTAX "NET STATISTICS [SERVER | WORKSTATION]\n\n" - IDS_STATISTICS_HELP_1 "NET STATISTICS displays the statisticslog for the local Workstation or\n\ -Server service. Used without parameters, NET STATISTICS displays\n\ -the services for which statistics are available.\n\n" - IDS_STATISTICS_HELP_2 "SERVER Displays the Server service statistics.\n\ -WORKSTATION Displays the Workstation service statistics.\n\n" - IDS_STOP_SYNTAX "NET STOP <服務名稱>\n\n" - IDS_STOP_HELP_1 "NET STOP stops services.\n\n" - IDS_STOP_HELP_2 "service The name of the service to be stopped.\n\n" - IDS_STOP_HELP_3 "Stopping a service cancels any network connection the service is\n\ -using. Also, some services are dependent on others. Stopping one\n\ -service can stop others. Some services cannot be stopped.\n\n" IDS_TIME_SYNTAX "NET TIME ...\n\n" IDS_TIME_HELP "TIME\n...\n\n" IDS_USE_SYNTAX "NET USE ...\n\n" diff --git a/base/applications/network/net/resource.h b/base/applications/network/net/resource.h index 93bea7b079..2cd9cd9bc9 100644 --- a/base/applications/network/net/resource.h +++ b/base/applications/network/net/resource.h @@ -1,16 +1,5 @@ #pragma once -#define IDS_START_SYNTAX 163 -#define IDS_START_HELP_1 164 -#define IDS_START_HELP_2 165 -#define IDS_START_HELP_3 166 -#define IDS_STATISTICS_SYNTAX 167 -#define IDS_STATISTICS_HELP_1 168 -#define IDS_STATISTICS_HELP_2 169 -#define IDS_STOP_SYNTAX 170 -#define IDS_STOP_HELP_1 171 -#define IDS_STOP_HELP_2 172 -#define IDS_STOP_HELP_3 173 #define IDS_TIME_SYNTAX 174 #define IDS_TIME_HELP 175 #define IDS_USE_SYNTAX 176 diff --git a/sdk/include/reactos/mc/net_msg.mc b/sdk/include/reactos/mc/net_msg.mc index dbeb3a126c..4ee5c19a76 100644 --- a/sdk/include/reactos/mc/net_msg.mc +++ b/sdk/include/reactos/mc/net_msg.mc @@ -2120,3 +2120,319 @@ SHARE ... . + +MessageId=10032 +SymbolicName=MSG_START_SYNTAX +Severity=Success +Facility=System +Language=English +NET START [service] +. +Language=Polish +NET START [usługa] +. +Language=Romanian +NET START [service] +. +Language=Russian +NET START [service] +. +Language=Spanish +NET START [service] +. +Language=Turkish +NET START [service] +. +Language=Chinese +NET START [service] +. +Language=Taiwanese +NET START [service] +. + + +MessageId=10033 +SymbolicName=MSG_START_HELP +Severity=Success +Facility=System +Language=English +NET START starts services or lists running services. + +service The name of the service to be started. + +When typed at the command prompt, service name of two words or more must +be enclosed in quotation marks. For example, NET START "NET LOGON" +starts the net logon service. +. +Language=Polish +NET START uruchamia usługi lub wyświetla uruchomione usługi. + +usługa Nazwa uruchamianej usługi. + +Nazwy usług mające dwa lub więcej słów wpisywane w. +wierszu polecenia muszą być ujęte w cudzysłów. Przykładowo, +NET START "NET LOGON" uruchamia usługę logowania w sieci. +. +Language=Romanian +NET START starts services or lists running services. + +service The name of the service to be started. + +When typed at the command prompt, service name of two words or more must +be enclosed in quotation marks. For example, NET START "NET LOGON" +starts the net logon service. +. +Language=Russian +NET START starts services or lists running services. + +service The name of the service to be started. + +When typed at the command prompt, service name of two words or more must +be enclosed in quotation marks. For example, NET START "NET LOGON" +starts the net logon service. +. +Language=Spanish +NET START starts services or lists running services. + +service The name of the service to be started. + +When typed at the command prompt, service name of two words or more must +be enclosed in quotation marks. For example, NET START "NET LOGON" +starts the net logon service. +. +Language=Turkish +NET START starts services or lists running services. + +service The name of the service to be started. + +When typed at the command prompt, service name of two words or more must +be enclosed in quotation marks. For example, NET START "NET LOGON" +starts the net logon service. +. +Language=Chinese +NET START starts services or lists running services. + +service The name of the service to be started. + +When typed at the command prompt, service name of two words or more must +be enclosed in quotation marks. For example, NET START "NET LOGON" +starts the net logon service. +. +Language=Taiwanese +NET START starts services or lists running services. + +service The name of the service to be started. + +When typed at the command prompt, service name of two words or more must +be enclosed in quotation marks. For example, NET START "NET LOGON" +starts the net logon service. +. + + +MessageId=10034 +SymbolicName=MSG_STATISTICS_SYNTAX +Severity=Success +Facility=System +Language=English +NET STATISTICS [SERVER | WORKSTATION] +. +Language=Polish +NET STATISTICS [SERVER | WORKSTATION] +. +Language=Romanian +NET STATISTICS [SERVER | WORKSTATION] +. +Language=Russian +NET STATISTICS [SERVER | WORKSTATION] +. +Language=Spanish +NET STATISTICS [SERVER | WORKSTATION] +. +Language=Turkish +NET STATISTICS [SERVER | WORKSTATION] +. +Language=Chinese +NET STATISTICS [SERVER | WORKSTATION] +. +Language=Taiwanese +NET STATISTICS [SERVER | WORKSTATION] +. + + +MessageId=10035 +SymbolicName=MSG_STATISTICS_HELP +Severity=Success +Facility=System +Language=English +NET STATISTICS displays the statisticslog for the local Workstation or +Server service. Used without parameters, NET STATISTICS displays +the services for which statistics are available. + +SERVER Displays the Server service statistics. +WORKSTATION Displays the Workstation service statistics. +. +Language=Polish +NET STATISTICS wyświetla dziennik statystyki dla lokalnej usługi +Stacja robocza lub Serwer. Użyte bez parametrów, NET STATISTICS wyświetla +usługi dla których statystyka jest dostępna. + +SERVER Wyświetla statystykę usługi Serwer. +WORKSTATION Wyświetla statystykę usługi Stacja robocza. +. +Language=Romanian +NET STATISTICS displays the statisticslog for the local Workstation or +Server service. Used without parameters, NET STATISTICS displays +the services for which statistics are available. + +SERVER Displays the Server service statistics. +WORKSTATION Displays the Workstation service statistics. +. +Language=Russian +NET STATISTICS displays the statisticslog for the local Workstation or +Server service. Used without parameters, NET STATISTICS displays +the services for which statistics are available. + +SERVER Displays the Server service statistics. +WORKSTATION Displays the Workstation service statistics. +. +Language=Spanish +NET STATISTICS displays the statisticslog for the local Workstation or +Server service. Used without parameters, NET STATISTICS displays +the services for which statistics are available. + +SERVER Displays the Server service statistics. +WORKSTATION Displays the Workstation service statistics. +. +Language=Turkish +NET STATISTICS displays the statisticslog for the local Workstation or +Server service. Used without parameters, NET STATISTICS displays +the services for which statistics are available. + +SERVER Displays the Server service statistics. +WORKSTATION Displays the Workstation service statistics. +. +Language=Chinese +NET STATISTICS displays the statisticslog for the local Workstation or +Server service. Used without parameters, NET STATISTICS displays +the services for which statistics are available. + +SERVER Displays the Server service statistics. +WORKSTATION Displays the Workstation service statistics. +. +Language=Taiwanese +NET STATISTICS displays the statisticslog for the local Workstation or +Server service. Used without parameters, NET STATISTICS displays +the services for which statistics are available. + +SERVER Displays the Server service statistics. +WORKSTATION Displays the Workstation service statistics. +. + + +MessageId=10036 +SymbolicName=MSG_STOP_SYNTAX +Severity=Success +Facility=System +Language=English +NET STOP service +. +Language=Polish +NET STOP usługa +. +Language=Romanian +NET STOP <nume serviciu> +. +Language=Russian +NET STOP <имя_службы> +. +Language=Spanish +NET STOP <nombre del servicio> +. +Language=Turkish +NET STOP <Hizmet Adı> +. +Language=Chinese +NET STOP service +. +Language=Taiwanese +NET STOP <服務名稱> +. + + +MessageId=10037 +SymbolicName=MSG_STOP_HELP +Severity=Success +Facility=System +Language=English +NET STOP stops services. + +service The name of the service to be stopped. + +Stopping a service cancels any network connection the service is +using. Also, some services are dependent on others. Stopping one +service can stop others. Some services cannot be stopped. +. +Language=Polish +NET STOP zatrzymuje usługi. + +usługa Nazwa zatrzymywanej usługi. + +Zatrzymanie usługi rozłącza wszystkie połączenia sieciowe +używane przez usługę. Niektóre usługi zależą od innych. Zatrzymanie jednej +może też zatrzymać inne. Niektóre usługi nie mogą być zatrzymane. +. +Language=Romanian +NET STOP stops services. + +service The name of the service to be stopped. + +Stopping a service cancels any network connection the service is +using. Also, some services are dependent on others. Stopping one +service can stop others. Some services cannot be stopped. +. +Language=Russian +NET STOP stops services. + +service The name of the service to be stopped. + +Stopping a service cancels any network connection the service is +using. Also, some services are dependent on others. Stopping one +service can stop others. Some services cannot be stopped. +. +Language=Spanish +NET STOP stops services. + +service The name of the service to be stopped. + +Stopping a service cancels any network connection the service is +using. Also, some services are dependent on others. Stopping one +service can stop others. Some services cannot be stopped. +. +Language=Turkish +NET STOP stops services. + +service The name of the service to be stopped. + +Stopping a service cancels any network connection the service is +using. Also, some services are dependent on others. Stopping one +service can stop others. Some services cannot be stopped. +. +Language=Chinese +NET STOP stops services. + +service The name of the service to be stopped. + +Stopping a service cancels any network connection the service is +using. Also, some services are dependent on others. Stopping one +service can stop others. Some services cannot be stopped. +. +Language=Taiwanese +NET STOP stops services. + +service The name of the service to be stopped. + +Stopping a service cancels any network connection the service is +using. Also, some services are dependent on others. Stopping one +service can stop others. Some services cannot be stopped. +. +

1 0

[reactos] 02/02: [NET] Move PAUSE, PRINT, SEND, SESSION and SHARE command syntax and help texts into a message table.
by Eric Kohl 24 Dec '18

24 Dec '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=01af56140c8c8983de5d4… commit 01af56140c8c8983de5d43a523fa21320a616afa Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Mon Dec 24 01:25:30 2018 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Mon Dec 24 01:25:30 2018 +0100 [NET] Move PAUSE, PRINT, SEND, SESSION and SHARE command syntax and help texts into a message table. --- base/applications/network/net/cmdPause.c | 7 +- base/applications/network/net/help.c | 21 +- base/applications/network/net/lang/en-US.rc | 11 - base/applications/network/net/lang/es-ES.rc | 11 - base/applications/network/net/lang/pl-PL.rc | 11 - base/applications/network/net/lang/ro-RO.rc | 11 - base/applications/network/net/lang/ru-RU.rc | 11 - base/applications/network/net/lang/tr-TR.rc | 11 - base/applications/network/net/lang/zh-CN.rc | 11 - base/applications/network/net/lang/zh-TW.rc | 11 - base/applications/network/net/resource.h | 11 - sdk/include/reactos/mc/net_msg.mc | 348 ++++++++++++++++++++++++++++ 12 files changed, 361 insertions(+), 114 deletions(-) diff --git a/base/applications/network/net/cmdPause.c b/base/applications/network/net/cmdPause.c index 05e07b884f..afd583595c 100644 --- a/base/applications/network/net/cmdPause.c +++ b/base/applications/network/net/cmdPause.c @@ -20,7 +20,7 @@ INT cmdPause(INT argc, WCHAR **argv) if (argc != 3) { ConResPuts(StdOut, IDS_GENERIC_SYNTAX); - ConResPuts(StdOut, IDS_PAUSE_SYNTAX); + PrintNetMessage(MSG_PAUSE_SYNTAX); return 1; } @@ -29,9 +29,8 @@ INT cmdPause(INT argc, WCHAR **argv) if (_wcsicmp(argv[i], L"/help") == 0) { ConResPuts(StdOut, IDS_GENERIC_SYNTAX); - ConResPuts(StdOut, IDS_PAUSE_SYNTAX); - ConResPuts(StdOut, IDS_PAUSE_HELP_1); - ConResPuts(StdOut, IDS_PAUSE_HELP_2); + PrintNetMessage(MSG_PAUSE_SYNTAX); + PrintNetMessage(MSG_PAUSE_HELP); return 1; } } diff --git a/base/applications/network/net/help.c b/base/applications/network/net/help.c index ae36e3d536..d509594a37 100644 --- a/base/applications/network/net/help.c +++ b/base/applications/network/net/help.c @@ -99,37 +99,36 @@ INT cmdHelp(INT argc, WCHAR **argv) if (_wcsicmp(argv[2], L"PAUSE") == 0) { - ConResPuts(StdOut, IDS_PAUSE_SYNTAX); - ConResPuts(StdOut, IDS_PAUSE_HELP_1); - ConResPuts(StdOut, IDS_PAUSE_HELP_2); + PrintNetMessage(MSG_PAUSE_SYNTAX); + PrintNetMessage(MSG_PAUSE_HELP); return 0; } if (_wcsicmp(argv[2], L"PRINT") == 0) { - ConResPuts(StdOut, IDS_PRINT_SYNTAX); - ConResPuts(StdOut, IDS_PRINT_HELP); + PrintNetMessage(MSG_PRINT_SYNTAX); + PrintNetMessage(MSG_PRINT_HELP); return 0; } if (_wcsicmp(argv[2], L"SEND") == 0) { - ConResPuts(StdOut, IDS_SEND_SYNTAX); - ConResPuts(StdOut, IDS_SEND_HELP); + PrintNetMessage(MSG_SEND_SYNTAX); + PrintNetMessage(MSG_SEND_HELP); return 0; } if (_wcsicmp(argv[2], L"SESSION") == 0) { - ConResPuts(StdOut, IDS_SESSION_SYNTAX); - ConResPuts(StdOut, IDS_SESSION_HELP); + PrintNetMessage(MSG_SESSION_SYNTAX); + PrintNetMessage(MSG_SESSION_HELP); return 0; } if (_wcsicmp(argv[2], L"SHARE") == 0) { - ConResPuts(StdOut, IDS_SHARE_SYNTAX); - ConResPuts(StdOut, IDS_SHARE_HELP); + PrintNetMessage(MSG_SHARE_SYNTAX); + PrintNetMessage(MSG_SHARE_HELP); return 0; } diff --git a/base/applications/network/net/lang/en-US.rc b/base/applications/network/net/lang/en-US.rc index b9c6eed84c..cd8f368158 100644 --- a/base/applications/network/net/lang/en-US.rc +++ b/base/applications/network/net/lang/en-US.rc @@ -2,17 +2,6 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US STRINGTABLE BEGIN - IDS_PRINT_SYNTAX "NET PRINT ...\n\n" - IDS_PRINT_HELP "PRINT\n...\n\n" - IDS_PAUSE_SYNTAX "NET PAUSE service\n\n" - IDS_PAUSE_HELP_1 "NET PAUSE suspends a service. Pausing a service puts it on hold.\n\n" - IDS_PAUSE_HELP_2 "service The name of the service to be paused.\n\n" - IDS_SEND_SYNTAX "NET SEND ...\n\n" - IDS_SEND_HELP "SEND\n...\n\n" - IDS_SESSION_SYNTAX "NET SESSION ...\n\n" - IDS_SESSION_HELP "SESSION\n...\n\n" - IDS_SHARE_SYNTAX "NET SHARE ...\n\n" - IDS_SHARE_HELP "SHARE\n...\n\n" IDS_START_SYNTAX "NET START [service]\n\n" IDS_START_HELP_1 "NET START starts services or lists running services.\n\n" IDS_START_HELP_2 "service The name of the service to be started.\n\n" diff --git a/base/applications/network/net/lang/es-ES.rc b/base/applications/network/net/lang/es-ES.rc index 1baf4f450c..39950eb2b6 100644 --- a/base/applications/network/net/lang/es-ES.rc +++ b/base/applications/network/net/lang/es-ES.rc @@ -5,17 +5,6 @@ LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL STRINGTABLE BEGIN - IDS_PRINT_SYNTAX "NET PRINT ...\n\n" - IDS_PRINT_HELP "PRINT\n...\n\n" - IDS_PAUSE_SYNTAX "NET PAUSE <nombre del servicio>\n\n" - IDS_PAUSE_HELP_1 "NET PAUSE suspends a service. Pausing a service puts it on hold.\n\n" - IDS_PAUSE_HELP_2 "service The name of the service to be paused.\n\n" - IDS_SEND_SYNTAX "NET SEND ...\n\n" - IDS_SEND_HELP "SEND\n...\n\n" - IDS_SESSION_SYNTAX "NET SESSION ...\n\n" - IDS_SESSION_HELP "SESSION\n...\n\n" - IDS_SHARE_SYNTAX "NET SHARE ...\n\n" - IDS_SHARE_HELP "SHARE\n...\n\n" IDS_START_SYNTAX "NET START [service]\n\n" IDS_START_HELP_1 "NET START starts services or lists running services.\n\n" IDS_START_HELP_2 "service The name of the service to be started.\n\n" diff --git a/base/applications/network/net/lang/pl-PL.rc b/base/applications/network/net/lang/pl-PL.rc index 5b220b6a33..b41750401a 100644 --- a/base/applications/network/net/lang/pl-PL.rc +++ b/base/applications/network/net/lang/pl-PL.rc @@ -1,17 +1,6 @@ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT STRINGTABLE BEGIN - IDS_PRINT_SYNTAX "NET PRINT ...\n\n" - IDS_PRINT_HELP "PRINT\n...\n\n" - IDS_PAUSE_SYNTAX "NET PAUSE usługa\n\n" - IDS_PAUSE_HELP_1 "NET PAUSE wstrzymuje usługę.\n\n" - IDS_PAUSE_HELP_2 "usługa Nazwa wstrzymywanej usługi.\n\n" - IDS_SEND_SYNTAX "NET SEND ...\n\n" - IDS_SEND_HELP "SEND\n...\n\n" - IDS_SESSION_SYNTAX "NET SESSION ...\n\n" - IDS_SESSION_HELP "SESSION\n...\n\n" - IDS_SHARE_SYNTAX "NET SHARE ...\n\n" - IDS_SHARE_HELP "SHARE\n...\n\n" IDS_START_SYNTAX "NET START [usługa]\n\n" IDS_START_HELP_1 "NET START uruchamia usługi lub wyświetla uruchomione usługi.\n\n" IDS_START_HELP_2 "usługa Nazwa uruchamianej usługi.\n\n" diff --git a/base/applications/network/net/lang/ro-RO.rc b/base/applications/network/net/lang/ro-RO.rc index d492608b3d..563cc9635a 100644 --- a/base/applications/network/net/lang/ro-RO.rc +++ b/base/applications/network/net/lang/ro-RO.rc @@ -8,17 +8,6 @@ LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL STRINGTABLE BEGIN - IDS_PRINT_SYNTAX "NET PRINT ...\n\n" - IDS_PRINT_HELP "PRINT\n...\n\n" - IDS_PAUSE_SYNTAX "NET PAUSE <nume serviciu>\n\n" - IDS_PAUSE_HELP_1 "NET PAUSE suspends a service. Pausing a service puts it on hold.\n\n" - IDS_PAUSE_HELP_2 "service The name of the service to be paused.\n\n" - IDS_SEND_SYNTAX "NET SEND ...\n\n" - IDS_SEND_HELP "SEND\n...\n\n" - IDS_SESSION_SYNTAX "NET SESSION ...\n\n" - IDS_SESSION_HELP "SESSION\n...\n\n" - IDS_SHARE_SYNTAX "NET SHARE ...\n\n" - IDS_SHARE_HELP "SHARE\n...\n\n" IDS_START_SYNTAX "NET START [service]\n\n" IDS_START_HELP_1 "NET START starts services or lists running services.\n\n" IDS_START_HELP_2 "service The name of the service to be started.\n\n" diff --git a/base/applications/network/net/lang/ru-RU.rc b/base/applications/network/net/lang/ru-RU.rc index e52cc2a30f..4e260e89ed 100644 --- a/base/applications/network/net/lang/ru-RU.rc +++ b/base/applications/network/net/lang/ru-RU.rc @@ -4,17 +4,6 @@ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT STRINGTABLE BEGIN - IDS_PRINT_SYNTAX "NET PRINT ...\n\n" - IDS_PRINT_HELP "PRINT\n...\n\n" - IDS_PAUSE_SYNTAX "NET PAUSE <имя_службы>\n\n" - IDS_PAUSE_HELP_1 "NET PAUSE suspends a service. Pausing a service puts it on hold.\n\n" - IDS_PAUSE_HELP_2 "service The name of the service to be paused.\n\n" - IDS_SEND_SYNTAX "NET SEND ...\n\n" - IDS_SEND_HELP "SEND\n...\n\n" - IDS_SESSION_SYNTAX "NET SESSION ...\n\n" - IDS_SESSION_HELP "SESSION\n...\n\n" - IDS_SHARE_SYNTAX "NET SHARE ...\n\n" - IDS_SHARE_HELP "SHARE\n...\n\n" IDS_START_SYNTAX "NET START [service]\n\n" IDS_START_HELP_1 "NET START starts services or lists running services.\n\n" IDS_START_HELP_2 "service The name of the service to be started.\n\n" diff --git a/base/applications/network/net/lang/tr-TR.rc b/base/applications/network/net/lang/tr-TR.rc index 215df1ed0f..20d8d3198c 100644 --- a/base/applications/network/net/lang/tr-TR.rc +++ b/base/applications/network/net/lang/tr-TR.rc @@ -4,17 +4,6 @@ LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT STRINGTABLE BEGIN - IDS_PRINT_SYNTAX "NET PRINT ...\n\n" - IDS_PRINT_HELP "PRINT\n...\n\n" - IDS_PAUSE_SYNTAX "NET PAUSE service\n\n" - IDS_PAUSE_HELP_1 "NET PAUSE suspends a service. Pausing a service puts it on hold.\n\n" - IDS_PAUSE_HELP_2 "service The name of the service to be paused.\n\n" - IDS_SEND_SYNTAX "NET SEND ...\n\n" - IDS_SEND_HELP "SEND\n...\n\n" - IDS_SESSION_SYNTAX "NET SESSION ...\n\n" - IDS_SESSION_HELP "SESSION\n...\n\n" - IDS_SHARE_SYNTAX "NET SHARE ...\n\n" - IDS_SHARE_HELP "SHARE\n...\n\n" IDS_START_SYNTAX "NET START [service]\n\n" IDS_START_HELP_1 "NET START starts services or lists running services.\n\n" IDS_START_HELP_2 "service The name of the service to be started.\n\n" diff --git a/base/applications/network/net/lang/zh-CN.rc b/base/applications/network/net/lang/zh-CN.rc index 5bc5bdf5a0..c8b4cee23d 100644 --- a/base/applications/network/net/lang/zh-CN.rc +++ b/base/applications/network/net/lang/zh-CN.rc @@ -4,17 +4,6 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED STRINGTABLE BEGIN - IDS_PRINT_SYNTAX "NET PRINT ...\n\n" - IDS_PRINT_HELP "PRINT\n...\n\n" - IDS_PAUSE_SYNTAX "NET PAUSE service\n\n" - IDS_PAUSE_HELP_1 "NET PAUSE suspends a service. Pausing a service puts it on hold.\n\n" - IDS_PAUSE_HELP_2 "service The name of the service to be paused.\n\n" - IDS_SEND_SYNTAX "NET SEND ...\n\n" - IDS_SEND_HELP "SEND\n...\n\n" - IDS_SESSION_SYNTAX "NET SESSION ...\n\n" - IDS_SESSION_HELP "SESSION\n...\n\n" - IDS_SHARE_SYNTAX "NET SHARE ...\n\n" - IDS_SHARE_HELP "SHARE\n...\n\n" IDS_START_SYNTAX "NET START [service]\n\n" IDS_START_HELP_1 "NET START starts services or lists running services.\n\n" IDS_START_HELP_2 "service The name of the service to be started.\n\n" diff --git a/base/applications/network/net/lang/zh-TW.rc b/base/applications/network/net/lang/zh-TW.rc index f3232457df..09f5b2c155 100644 --- a/base/applications/network/net/lang/zh-TW.rc +++ b/base/applications/network/net/lang/zh-TW.rc @@ -4,17 +4,6 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL STRINGTABLE BEGIN - IDS_PRINT_SYNTAX "NET PRINT ...\n\n" - IDS_PRINT_HELP "PRINT\n...\n\n" - IDS_PAUSE_SYNTAX "NET PAUSE <服務名稱>\n\n" - IDS_PAUSE_HELP_1 "NET PAUSE suspends a service. Pausing a service puts it on hold.\n\n" - IDS_PAUSE_HELP_2 "service The name of the service to be paused.\n\n" - IDS_SEND_SYNTAX "NET SEND ...\n\n" - IDS_SEND_HELP "SEND\n...\n\n" - IDS_SESSION_SYNTAX "NET SESSION ...\n\n" - IDS_SESSION_HELP "SESSION\n...\n\n" - IDS_SHARE_SYNTAX "NET SHARE ...\n\n" - IDS_SHARE_HELP "SHARE\n...\n\n" IDS_START_SYNTAX "NET START [service]\n\n" IDS_START_HELP_1 "NET START starts services or lists running services.\n\n" IDS_START_HELP_2 "service The name of the service to be started.\n\n" diff --git a/base/applications/network/net/resource.h b/base/applications/network/net/resource.h index 888494f4b8..93bea7b079 100644 --- a/base/applications/network/net/resource.h +++ b/base/applications/network/net/resource.h @@ -1,16 +1,5 @@ #pragma once -#define IDS_PAUSE_SYNTAX 152 -#define IDS_PAUSE_HELP_1 153 -#define IDS_PAUSE_HELP_2 154 -#define IDS_PRINT_SYNTAX 155 -#define IDS_PRINT_HELP 156 -#define IDS_SEND_SYNTAX 157 -#define IDS_SEND_HELP 158 -#define IDS_SESSION_SYNTAX 159 -#define IDS_SESSION_HELP 160 -#define IDS_SHARE_SYNTAX 161 -#define IDS_SHARE_HELP 162 #define IDS_START_SYNTAX 163 #define IDS_START_HELP_1 164 #define IDS_START_HELP_2 165 diff --git a/sdk/include/reactos/mc/net_msg.mc b/sdk/include/reactos/mc/net_msg.mc index 8b61d17a55..dbeb3a126c 100644 --- a/sdk/include/reactos/mc/net_msg.mc +++ b/sdk/include/reactos/mc/net_msg.mc @@ -1772,3 +1772,351 @@ Language=Taiwanese NAME ... . + + +MessageId=10022 +SymbolicName=MSG_PAUSE_SYNTAX +Severity=Success +Facility=System +Language=English +NET PAUSE service +. +Language=Polish +NET PAUSE usługa +. +Language=Romanian +NET PAUSE <nume serviciu> +. +Language=Russian +NET PAUSE <имя_службы> +. +Language=Spanish +NET PAUSE <nombre del servicio> +. +Language=Turkish +NET PAUSE service +. +Language=Chinese +NET PAUSE service +. +Language=Taiwanese +NET PAUSE <服務名稱> +. + + +MessageId=10023 +SymbolicName=MSG_PAUSE_HELP +Severity=Success +Facility=System +Language=English +NET PAUSE suspends a service. Pausing a service puts it on hold. + +service The name of the service to be paused. +. +Language=Polish +NET PAUSE wstrzymuje usługę. + +usługa Nazwa wstrzymywanej usługi. +. +Language=Romanian +NET PAUSE suspends a service. Pausing a service puts it on hold. + +service The name of the service to be paused. +. +Language=Russian +NET PAUSE suspends a service. Pausing a service puts it on hold. + +service The name of the service to be paused. +. +Language=Spanish +NET PAUSE suspends a service. Pausing a service puts it on hold. +service The name of the service to be paused. +. +Language=Turkish +NET PAUSE suspends a service. Pausing a service puts it on hold. + +service The name of the service to be paused. +. +Language=Chinese +NET PAUSE suspends a service. Pausing a service puts it on hold. + +service The name of the service to be paused. +. +Language=Taiwanese +NET PAUSE suspends a service. Pausing a service puts it on hold. + +service The name of the service to be paused. +. + + +MessageId=10024 +SymbolicName=MSG_PRINT_SYNTAX +Severity=Success +Facility=System +Language=English +NET PRINT ... +. +Language=Polish +NET PRINT ... +. +Language=Romanian +NET PRINT ... +. +Language=Russian +NET PRINT ... +. +Language=Spanish +NET PRINT ... +. +Language=Turkish +NET PRINT ... +. +Language=Chinese +NET PRINT ... +. +Language=Taiwanese +NET PRINT ... +. + + +MessageId=10025 +SymbolicName=MSG_PRINT_HELP +Severity=Success +Facility=System +Language=English +PRINT +... +. +Language=Polish +PRINT +... +. +Language=Romanian +PRINT +... +. +Language=Russian +PRINT +... +. +Language=Spanish +PRINT +... +. +Language=Turkish +PRINT +... +. +Language=Chinese +PRINT +... +. +Language=Taiwanese +PRINT +... +. + + +MessageId=10026 +SymbolicName=MSG_SEND_SYNTAX +Severity=Success +Facility=System +Language=English +NET SEND ... +. +Language=Polish +NET SEND ... +. +Language=Romanian +NET SEND ... +. +Language=Russian +NET SEND ... +. +Language=Spanish +NET SEND ... +. +Language=Turkish +NET SEND ... +. +Language=Chinese +NET SEND ... +. +Language=Taiwanese +NET SEND ... +. + + +MessageId=10027 +SymbolicName=MSG_SEND_HELP +Severity=Success +Facility=System +Language=English +SEND +... +. +Language=Polish +SEND +... +. +Language=Romanian +SEND +... +. +Language=Russian +SEND +... +. +Language=Spanish +SEND +... +. +Language=Turkish +SEND +... +. +Language=Chinese +SEND +... +. +Language=Taiwanese +SEND +... +. + + +MessageId=10028 +SymbolicName=MSG_SESSION_SYNTAX +Severity=Success +Facility=System +Language=English +NET SESSION ... +. +Language=Polish +NET SESSION ... +. +Language=Romanian +NET SESSION ... +. +Language=Russian +NET SESSION ... +. +Language=Spanish +NET SESSION ... +. +Language=Turkish +NET SESSION ... +. +Language=Chinese +NET SESSION ... +. +Language=Taiwanese +NET SESSION ... +. + + +MessageId=10029 +SymbolicName=MSG_SESSION_HELP +Severity=Success +Facility=System +Language=English +SESSION +... +. +Language=Polish +SESSION +... +. +Language=Romanian +SESSION +... +. +Language=Russian +SESSION +... +. +Language=Spanish +SESSION +... +. +Language=Turkish +SESSION +... +. +Language=Chinese +SESSION +... +. +Language=Taiwanese +SESSION +... +. + + +MessageId=10030 +SymbolicName=MSG_SHARE_SYNTAX +Severity=Success +Facility=System +Language=English +NET SHARE ... +. +Language=Polish +NET SHARE ... +. +Language=Romanian +NET SHARE ... +. +Language=Russian +NET SHARE ... +. +Language=Spanish +NET SHARE ... +. +Language=Turkish +NET SHARE ... +. +Language=Chinese +NET SHARE ... +. +Language=Taiwanese +NET SHARE ... +. + + +MessageId=10031 +SymbolicName=MSG_SHARE_HELP +Severity=Success +Facility=System +Language=English +SHARE +... +. +Language=Polish +SHARE +... +. +Language=Romanian +SHARE +... +. +Language=Russian +SHARE +... +. +Language=Spanish +SHARE +... +. +Language=Turkish +SHARE +... +. +Language=Chinese +SHARE +... +. +Language=Taiwanese +SHARE +... +. +

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs