Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/02: [MPR] Sync with Wine Staging 3.17. CORE-15127
by Pierre Schweitzer 08 Dec '18

08 Dec '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e02f3356b160ab002a862… commit e02f3356b160ab002a86240d8ffa0471a4b2a28f Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Dec 8 11:42:23 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat Dec 8 11:42:23 2018 +0100 [MPR] Sync with Wine Staging 3.17. CORE-15127 --- dll/win32/mpr/wnet.c | 8 ++++---- media/doc/README.WINE | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dll/win32/mpr/wnet.c b/dll/win32/mpr/wnet.c index bc492c2afe..09d144e595 100644 --- a/dll/win32/mpr/wnet.c +++ b/dll/win32/mpr/wnet.c @@ -139,9 +139,8 @@ static void _tryLoadProvider(PCWSTR provider) HKEY hKey; TRACE("%s\n", debugstr_w(provider)); - snprintfW(serviceName, sizeof(serviceName) / sizeof(WCHAR), serviceFmt, - servicePrefix, provider); - serviceName[sizeof(serviceName) / sizeof(WCHAR) - 1] = '\0'; + snprintfW(serviceName, ARRAY_SIZE(serviceName), serviceFmt, servicePrefix, provider); + serviceName[ARRAY_SIZE(serviceName) - 1] = '\0'; if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, serviceName, 0, KEY_READ, &hKey) == ERROR_SUCCESS) { @@ -2373,7 +2372,7 @@ DWORD WINAPI WNetGetConnectionA( LPCSTR lpLocalName, if (wideLocalName) { WCHAR wideRemoteStatic[MAX_PATH]; - DWORD wideRemoteSize = sizeof(wideRemoteStatic) / sizeof(WCHAR); + DWORD wideRemoteSize = ARRAY_SIZE(wideRemoteStatic); MultiByteToWideChar(CP_ACP, 0, lpLocalName, -1, wideLocalName, len); @@ -2659,6 +2658,7 @@ DWORD WINAPI WNetGetUniversalNameW ( LPCWSTR lpLocalPath, DWORD dwInfoLevel, size = sizeof(*info) + (lstrlenW(lpLocalPath) + 1) * sizeof(WCHAR); if (*lpBufferSize < size) { + *lpBufferSize = size; err = WN_MORE_DATA; break; } diff --git a/media/doc/README.WINE b/media/doc/README.WINE index 262dd5743b..03609ea0f7 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -98,7 +98,7 @@ reactos/dll/win32/mciwave # Synced to WineStaging-3.3 reactos/dll/win32/mgmtapi # Synced to WineStaging-3.3 reactos/dll/win32/mlang # Synced to WineStaging-3.3 reactos/dll/win32/mmdevapi # Synced to WineStaging-3.3 -reactos/dll/win32/mpr # Synced to WineStaging-3.3 +reactos/dll/win32/mpr # Synced to WineStaging-3.17 reactos/dll/win32/mprapi # Synced to WineStaging-3.3 reactos/dll/win32/msacm32 # Synced to WineStaging-3.3 reactos/dll/win32/msacm32.drv # Synced to WineStaging-3.3

1 0

[reactos] 02/02: [MPR] Import Wine commit: 773ff2e83b0547540639c6d4aeb9f817b621fb2f Implement support for deleting persistent connections.
by Pierre Schweitzer 06 Dec '18

06 Dec '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bcad6700ec7d0e98cfe0f… commit bcad6700ec7d0e98cfe0f1c27cc8addb161beb21 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Thu Dec 6 22:44:43 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Thu Dec 6 22:44:43 2018 +0100 [MPR] Import Wine commit: 773ff2e83b0547540639c6d4aeb9f817b621fb2f Implement support for deleting persistent connections. --- dll/win32/mpr/wnet.c | 26 ++++++-------------------- 1 file changed, 6 insertions(+), 20 deletions(-) diff --git a/dll/win32/mpr/wnet.c b/dll/win32/mpr/wnet.c index b16ec98165..bc492c2afe 100644 --- a/dll/win32/mpr/wnet.c +++ b/dll/win32/mpr/wnet.c @@ -2298,37 +2298,23 @@ DWORD WINAPI WNetCancelConnection2W( LPCWSTR lpName, DWORD dwFlags, BOOL fForce } } } -#ifdef __REACTOS__ - if (dwFlags & CONNECT_UPDATE_PROFILE) + if (ret == WN_SUCCESS && dwFlags & CONNECT_UPDATE_PROFILE) { HKEY user_profile; - WCHAR *coma = strchrW(lpName, ':'); - if (coma && RegOpenCurrentUser(KEY_ALL_ACCESS, &user_profile) == ERROR_SUCCESS) + /* FIXME: Only remove it if that's a drive letter */ + if (isalphaW(lpName[0]) && lpName[1] == ':' && + RegOpenCurrentUser(KEY_ALL_ACCESS, &user_profile) == ERROR_SUCCESS) { - WCHAR *subkey; - DWORD len; - - len = (ULONG_PTR)coma - (ULONG_PTR)lpName + sizeof(L"Network\\"); - subkey = HeapAlloc(GetProcessHeap(), 0, len); - if (subkey) - { - strcpyW(subkey, L"Network\\"); - memcpy(subkey + (sizeof(L"Network\\") / sizeof(WCHAR)) - 1, lpName, (ULONG_PTR)coma - (ULONG_PTR)lpName); - subkey[len / sizeof(WCHAR) - 1] = 0; + WCHAR subkey[10] = {'N', 'e', 't', 'w', 'o', 'r', 'k', '\\', lpName[0], 0}; - TRACE("Removing: %S\n", subkey); - - RegDeleteKeyW(user_profile, subkey); - HeapFree(GetProcessHeap(), 0, subkey); - } + RegDeleteKeyW(user_profile, subkey); RegCloseKey(user_profile); } } -#endif return ret; }

1 0

[reactos] 01/02: [MPR] Import Wine commit: 23a232fce8899a24e76207518175235b7b0f00cd Implement support for making connections persistent.
by Pierre Schweitzer 06 Dec '18

06 Dec '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3e8ec64489b934b770200… commit 3e8ec64489b934b77020068d794f56510d9e9b7a Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Thu Dec 6 22:42:46 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Thu Dec 6 22:42:46 2018 +0100 [MPR] Import Wine commit: 23a232fce8899a24e76207518175235b7b0f00cd Implement support for making connections persistent. --- dll/win32/mpr/wnet.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/dll/win32/mpr/wnet.c b/dll/win32/mpr/wnet.c index 6c9d7cd631..b16ec98165 100644 --- a/dll/win32/mpr/wnet.c +++ b/dll/win32/mpr/wnet.c @@ -2012,6 +2012,9 @@ static DWORD wnet_use_provider( struct use_connection_context *ctxt, NETRESOURCE return ret; } +static const WCHAR providerType[] = { 'P','r','o','v','i','d','e','r','T','y','p','e',0 }; +static const WCHAR userName[] = { 'U','s','e','r','N','a','m','e',0 }; + static DWORD wnet_use_connection( struct use_connection_context *ctxt ) { WNetProvider *provider; @@ -2068,7 +2071,6 @@ static DWORD wnet_use_connection( struct use_connection_context *ctxt ) } } -#ifdef __REACTOS__ if (ret == WN_SUCCESS && ctxt->flags & CONNECT_UPDATE_PROFILE) { HKEY user_profile; @@ -2084,26 +2086,26 @@ static DWORD wnet_use_connection( struct use_connection_context *ctxt ) HKEY network; WCHAR subkey[10] = {'N', 'e', 't', 'w', 'o', 'r', 'k', '\\', netres.lpLocalName[0], 0}; - if (RegCreateKeyExW(user_profile, subkey, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_ALL_ACCESS, NULL, &network, NULL) == ERROR_SUCCESS) + if (RegCreateKeyExW(user_profile, subkey, 0, NULL, REG_OPTION_NON_VOLATILE, + KEY_ALL_ACCESS, NULL, &network, NULL) == ERROR_SUCCESS) { DWORD dword_arg = RESOURCETYPE_DISK; DWORD len = (strlenW(provider->name) + 1) * sizeof(WCHAR); + static const WCHAR empty[1] = {0}; - RegSetValueExW(network, L"ConnectionType", 0, REG_DWORD, (const BYTE *)&dword_arg, sizeof(DWORD)); - RegSetValueExW(network, L"ProviderName", 0, REG_SZ, (const BYTE *)provider->name, len); - dword_arg = provider->dwNetType; - RegSetValueExW(network, L"ProviderType", 0, REG_DWORD, (const BYTE *)&dword_arg, sizeof(DWORD)); + RegSetValueExW(network, connectionType, 0, REG_DWORD, (const BYTE *)&dword_arg, sizeof(DWORD)); + RegSetValueExW(network, providerName, 0, REG_SZ, (const BYTE *)provider->name, len); + RegSetValueExW(network, providerType, 0, REG_DWORD, (const BYTE *)&provider->dwNetType, sizeof(DWORD)); len = (strlenW(netres.lpRemoteName) + 1) * sizeof(WCHAR); - RegSetValueExW(network, L"RemotePath", 0, REG_SZ, (const BYTE *)netres.lpRemoteName, len); - len = 0; - RegSetValueExW(network, L"UserName", 0, REG_SZ, (const BYTE *)netres.lpRemoteName, len); + RegSetValueExW(network, remotePath, 0, REG_SZ, (const BYTE *)netres.lpRemoteName, len); + len = sizeof(empty); + RegSetValueExW(network, userName, 0, REG_SZ, (const BYTE *)empty, len); RegCloseKey(network); } RegCloseKey(user_profile); } } -#endif return ret; }

1 0

[reactos] 01/01: [DHCPSVC] Properly stub DhcpRequestParams() This will avoid crash upon Google Chrome start.
by Pierre Schweitzer 06 Dec '18

06 Dec '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f57b1d02d4e9f274f517c… commit f57b1d02d4e9f274f517c2eea2133cc202373eb9 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Thu Dec 6 22:24:47 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Thu Dec 6 22:26:10 2018 +0100 [DHCPSVC] Properly stub DhcpRequestParams() This will avoid crash upon Google Chrome start. CORE-15422 --- base/services/dhcpcsvc/dhcpcsvc.c | 15 +++++++++++++++ base/services/dhcpcsvc/dhcpcsvc.spec | 2 +- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/base/services/dhcpcsvc/dhcpcsvc.c b/base/services/dhcpcsvc/dhcpcsvc.c index bfd3dbf6a5..e1f131c6c5 100644 --- a/base/services/dhcpcsvc/dhcpcsvc.c +++ b/base/services/dhcpcsvc/dhcpcsvc.c @@ -255,6 +255,21 @@ DhcpNotifyConfigChange(LPWSTR ServerName, return 0; } +DWORD APIENTRY +DhcpRequestParams(DWORD Flags, + PVOID Reserved, + LPWSTR AdapterName, + LPDHCPCAPI_CLASSID ClassId, + DHCPCAPI_PARAMS_ARRAY SendParams, + DHCPCAPI_PARAMS_ARRAY RecdParams, + LPBYTE Buffer, + LPDWORD pSize, + LPWSTR RequestIdStr) +{ + UNIMPLEMENTED; + return 0; +} + /*! * Get DHCP info for an adapter * diff --git a/base/services/dhcpcsvc/dhcpcsvc.spec b/base/services/dhcpcsvc/dhcpcsvc.spec index b9f95712bb..277184ebcd 100644 --- a/base/services/dhcpcsvc/dhcpcsvc.spec +++ b/base/services/dhcpcsvc/dhcpcsvc.spec @@ -32,7 +32,7 @@ @ stdcall DhcpRenewIpAddressLease(long) @ stub DhcpRenewIpAddressLeaseEx @ stub DhcpRequestOptions -@ stub DhcpRequestParams +@ stdcall DhcpRequestParams(long ptr ptr ptr long ptr long ptr ptr ptr ptr) @ stdcall DhcpStaticRefreshParams(long long long) @ stub DhcpUndoRequestParams @ stub McastApiCleanup

1 0

[reactos] 01/01: [DOXYGEN] Enable EXTERNAL_SEARCH, because this seems to be the most sophisticated Doxygen search feature and the PHP-based search isn't compatible with PHP7 yet.
by Colin Finck 06 Dec '18

06 Dec '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cb8429d76a1710d68a3b6… commit cb8429d76a1710d68a3b6c29e3f87ebe71579869 Author: Colin Finck <colin(a)reactos.org> AuthorDate: Thu Dec 6 15:13:40 2018 +0100 Commit: Colin Finck <colin(a)reactos.org> CommitDate: Thu Dec 6 15:13:40 2018 +0100 [DOXYGEN] Enable EXTERNAL_SEARCH, because this seems to be the most sophisticated Doxygen search feature and the PHP-based search isn't compatible with PHP7 yet. --- Doxyfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Doxyfile b/Doxyfile index b79fed8cb8..74dd35fc27 100644 --- a/Doxyfile +++ b/Doxyfile @@ -1578,7 +1578,7 @@ SERVER_BASED_SEARCH = YES # The default value is: NO. # This tag requires that the tag SEARCHENGINE is set to YES. -EXTERNAL_SEARCH = NO +EXTERNAL_SEARCH = YES # The SEARCHENGINE_URL should point to a search engine hosted by a web server # which will return the search results when EXTERNAL_SEARCH is enabled. @@ -1589,7 +1589,7 @@ EXTERNAL_SEARCH = NO # Searching" for details. # This tag requires that the tag SEARCHENGINE is set to YES. -SEARCHENGINE_URL = +SEARCHENGINE_URL = https://doxygen.reactos.org/doxysearch.cgi # When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the unindexed # search data is written to a file for indexing by an external tool. With the

1 0

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

06 Dec '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=93ac724b47b166b612230… commit 93ac724b47b166b6122305fbe0c1c7d95a357533 Author: Luo Yufan <njlyf2011(a)hotmail.com> AuthorDate: Thu Dec 6 21:52:38 2018 +0800 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Dec 6 14:52:38 2018 +0100 [TRANSLATION] Update Simplified Chinese translation. (#1099) Update Simplified Chinese translation for BROWSEUI, INETCPL and SYSDM. --- dll/cpl/inetcpl/lang/zh-CN.rc | 4 ++-- dll/cpl/sysdm/lang/zh-CN.rc | 18 +++++++++--------- dll/win32/browseui/lang/zh-CN.rc | 8 ++++---- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/dll/cpl/inetcpl/lang/zh-CN.rc b/dll/cpl/inetcpl/lang/zh-CN.rc index 824a0bddf2..1f205da8fd 100644 --- a/dll/cpl/inetcpl/lang/zh-CN.rc +++ b/dll/cpl/inetcpl/lang/zh-CN.rc @@ -20,7 +20,7 @@ */ /* Simplified Chinese translation by Henry Tang Ih 2015 (henrytang2(a)hotmail.com) */ -/* Improved by Luo Yufan 2018 (njlyf2011(a)hotmail.com) */ +/* Translation has been changed by Luo Yufan 2018 (njlyf2011(a)hotmail.com) */ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED @@ -52,7 +52,7 @@ BEGIN PUSHBUTTON "默认页(&D)", IDC_HOME_DEFAULT, 144, 42, 80, 14 PUSHBUTTON "空白页(&B)", IDC_HOME_BLANK, 230, 42, 80, 14 GROUPBOX "浏览历史记录", IDC_STATIC, 4, 66, 312, 42 - LTEXT "您可以删除缓存的页面、小型文字檔案和其他数据。", + LTEXT "您可以删除缓存的页面、 Cookie 和其他数据。", IDC_STATIC, 10, 76, 300, 10 PUSHBUTTON "删除文件...(&F)", IDC_HISTORY_DELETE, 144, 90, 80, 14 PUSHBUTTON "设置...(&S)", IDC_HISTORY_SETTINGS, 230, 90, 80, 14 diff --git a/dll/cpl/sysdm/lang/zh-CN.rc b/dll/cpl/sysdm/lang/zh-CN.rc index 4dbe284a90..5bd6298ecf 100644 --- a/dll/cpl/sysdm/lang/zh-CN.rc +++ b/dll/cpl/sysdm/lang/zh-CN.rc @@ -57,8 +57,8 @@ BEGIN GROUPBOX "用户配置文件", IDC_STATIC, 6, 75, 244, 48 LTEXT "与登录有关的桌面设置", IDC_STATIC, 16, 88, 228, 20 PUSHBUTTON "设置", IDC_USERPROFILE, 194, 103, 50, 15 - GROUPBOX "启动和故障恢复", IDC_STATIC, 6, 131, 244, 52 - LTEXT "启动和故障恢复选项指定计算机如何启动并设定系统失败时所需要采取的动作。", IDC_STATIC, 16, 144, 228, 19 + GROUPBOX "启动和恢复选项", IDC_STATIC, 6, 131, 244, 52 + LTEXT "启动和恢复选项告诉您的计算机如何启动以及如果错误导致计算机停止该怎么办。", IDC_STATIC, 16, 144, 228, 19 PUSHBUTTON "设置", IDC_STAREC, 194, 162, 50, 15 PUSHBUTTON "系统设置", IDC_SYSSETTINGS, 6, 192, 80, 15 PUSHBUTTON "环境变量", IDC_ENVVAR, 88, 192, 80, 15 @@ -82,7 +82,7 @@ CAPTION "硬件配置文件" FONT 9, "宋体" BEGIN ICON IDI_HARDPROF, IDC_STATIC, 8, 11, 18, 20, SS_ICON - LTEXT "可以为不同的硬件配置创建硬件配置文件。在启动时，可以选择希望使用的配置文件。", IDC_STATIC, 46, 11, 188, 25 + LTEXT "可以为不同的硬件配置设置硬件配置文件。启动时，您可以选择要使用的配置文件。", IDC_STATIC, 46, 11, 188, 25 LTEXT "可用的硬件配置文件:", IDC_STATIC, 8, 41, 120, 8 LISTBOX IDC_HRDPROFLSTBOX, 8, 52, 215, 54, LBS_NOTIFY PUSHBUTTON "", IDC_HRDPROFUP, 232, 59, 15, 14, BS_ICON | WS_DISABLED @@ -106,7 +106,7 @@ END IDD_HARDWAREPROFILE DIALOGEX 0, 0, 212, 188 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "常规" -FONT 8, "宋体" +FONT 9, "宋体" BEGIN ICON IDI_HARDPROF, IDC_STATIC, 10, 10, 18, 20, SS_ICON LTEXT "", IDC_HWPPROP_PROFILE, 48, 16, 150, 8 @@ -116,9 +116,9 @@ BEGIN LTEXT "", IDC_HWPPROP_SERIAL, 64, 55, 135, 8 GROUPBOX "", IDC_STATIC, 10, 69, 192, 61 AUTOCHECKBOX "这是一台便携式计算机(&P)", IDC_HWPPROP_PORTABLE, 17, 68, 115, 10, WS_GROUP | WS_TABSTOP - AUTORADIOBUTTON "插接状态是未知(&S)", IDC_HWPPROP_UNKNOWN, 22, 85, 160, 10, WS_GROUP | WS_TABSTOP - AUTORADIOBUTTON "计算机被插接(&D)", IDC_HWPPROP_DOCKED, 22, 97, 160, 10 - AUTORADIOBUTTON "计算机未插接(&U)", IDC_HWPPROP_UNDOCKED, 22, 109, 160, 10 + AUTORADIOBUTTON "对接状态未知(&S)", IDC_HWPPROP_UNKNOWN, 22, 85, 160, 10, WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "计算机已对接(&D)", IDC_HWPPROP_DOCKED, 22, 97, 160, 10 + AUTORADIOBUTTON "计算机未对接(&U)", IDC_HWPPROP_UNDOCKED, 22, 109, 160, 10 GROUPBOX "硬件配置文件选择", IDC_STATIC, 10, 138, 192, 42 AUTOCHECKBOX "当电脑启动时作为一个选项始终包含此配置文件(&I)", IDC_HWPPROP_INCLUDE, 17, 150, 164, 20, WS_GROUP | WS_TABSTOP | BS_MULTILINE END @@ -155,14 +155,14 @@ CAPTION "用户配置文件" FONT 9, "宋体" BEGIN ICON IDI_USERPROF, IDC_STATIC, 6, 11, 16, 16, SS_ICON - LTEXT "用户配置文件保存桌面设置和其他与您的用户帐户有关的信息。可在您使用的每台计算机上创建不同的配置文件，或选定一个漫游配置文件用在您使用的每台计算机上。", IDC_STATIC, 40, 11, 211, 35 + LTEXT "用户配置文件包含桌面设置和与您的登录相关的其他信息。可以在您使用的每台计算机上创建不同的配置文件，也可以在您使用的每台计算机上选择相同的漫游配置文件。", IDC_STATIC, 40, 11, 211, 35 LTEXT "储存在本机上的配置文件:", IDC_STATIC, 16, 51, 204, 9 CONTROL "", IDC_USERPROFILE_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 6, 66, 244, 85, WS_EX_CLIENTEDGE PUSHBUTTON "更改类型", IDC_USERPROFILE_CHANGE, 90, 155, 50, 15 PUSHBUTTON "删除", IDC_USERPROFILE_DELETE, 145, 155, 50, 15 PUSHBUTTON "复制到", IDC_USERPROFILE_COPY, 200, 155, 50, 15 - CONTROL "要创建一个新的用户帐户，在控制面板中打开<A>用户帐户</A> 。", + CONTROL "若要创建一个新的用户帐户，请在控制面板中打开<A>用户帐户</A> 。", IDC_USERACCOUNT_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 7, 175, 245, 18 DEFPUSHBUTTON "确定", IDOK, 134, 198, 54, 15 PUSHBUTTON "取消", IDCANCEL, 196, 198, 54, 15 diff --git a/dll/win32/browseui/lang/zh-CN.rc b/dll/win32/browseui/lang/zh-CN.rc index ec590dec55..966ad73633 100644 --- a/dll/win32/browseui/lang/zh-CN.rc +++ b/dll/win32/browseui/lang/zh-CN.rc @@ -17,7 +17,7 @@ */ /* Simplified Chinese translation by Henry Tang Ih 2015 (henrytang2(a)hotmail.com) */ -/* Improved by Luo Yufan (njlyf2011(a)hotmail.com) */ +/* Translation has been changed by Luo Yufan 2018 (njlyf2011(a)hotmail.com) */ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED @@ -220,7 +220,7 @@ END STRINGTABLE BEGIN - 9250 "显示程序信息、版本号和版权信息。" + 9250 "显示程序信息、版本号和版权信息。" 9252 "显示调试信息。" END @@ -273,7 +273,7 @@ END STRINGTABLE BEGIN IDS_NOTEXTLABELS "没有文本标签" - IDS_SELECTIVETEXTONRIGHT "右侧选择性文本" + IDS_SELECTIVETEXTONRIGHT "右边的选择性文字" END STRINGTABLE @@ -311,7 +311,7 @@ END STRINGTABLE BEGIN - IDS_STANDARD_TOOLBAR, "|返回|前进|向上|搜索|文件夹|移动到|复制到|删除|撤消|视图|停止|刷新|首页|映射磁盘|断开连接|收藏夹|历史|全屏幕|属性|剪下|复制|贴下|文件夹选项||" + IDS_STANDARD_TOOLBAR, "|返回|前进|向上|搜索|文件夹|移动到|复制到|删除|撤消|视图|停止|刷新|首页|映射磁盘|断开连接|收藏夹|历史|全屏幕|属性|剪切|复制|粘贴|文件夹选项||" END STRINGTABLE

1 0

[reactos] 01/01: [WIN32SS][FONT] Add some assertions (#1098)
by Katayama Hirofumi MZ 06 Dec '18

06 Dec '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e90954304d09bc71dd935… commit e90954304d09bc71dd9354e5714bbc8e5a3f3a2e Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Dec 6 12:47:02 2018 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Dec 6 12:47:02 2018 +0900 [WIN32SS][FONT] Add some assertions (#1098) --- win32ss/gdi/ntgdi/font.c | 6 +++++- win32ss/gdi/ntgdi/freetype.c | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/win32ss/gdi/ntgdi/font.c b/win32ss/gdi/ntgdi/font.c index ecf16c6baf..d106e57ac0 100644 --- a/win32ss/gdi/ntgdi/font.c +++ b/win32ss/gdi/ntgdi/font.c @@ -293,7 +293,10 @@ FASTCALL FontGetObject(PTEXTOBJ plfont, ULONG cjBuffer, PVOID pvBuffer) { ULONG cjMaxSize; - ENUMLOGFONTEXDVW *plf = &plfont->logfont; + ENUMLOGFONTEXDVW *plf; + + ASSERT(plfont); + plf = &plfont->logfont; if (!(plfont->fl & TEXTOBJECT_INIT)) { @@ -1081,6 +1084,7 @@ NtGdiGetRealizationInfo( } pdcattr = pDc->pdcattr; pTextObj = RealizeFontInit(pdcattr->hlfntNew); + ASSERT(pTextObj != NULL); pFontGdi = ObjToGDI(pTextObj->Font, FONT); TEXTOBJ_UnlockText(pTextObj); DC_UnlockDc(pDc); diff --git a/win32ss/gdi/ntgdi/freetype.c b/win32ss/gdi/ntgdi/freetype.c index d6aafb5679..fb823d48d1 100644 --- a/win32ss/gdi/ntgdi/freetype.c +++ b/win32ss/gdi/ntgdi/freetype.c @@ -1631,6 +1631,7 @@ TextIntCreateFontIndirect(CONST LPLOGFONTW lf, HFONT *NewFont) PLFONT plfont; LOGFONTW *plf; + ASSERT(lf); plfont = LFONT_AllocFontWithHandle(); if (!plfont) {

1 0

[reactos] 01/01: [WIN32SS][FONT] Improve FamilyUnknown Penalty (#1097)
by Katayama Hirofumi MZ 06 Dec '18

06 Dec '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=93757884c1eb393a9a05f… commit 93757884c1eb393a9a05fe1fcffe04f2ed601fac Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Dec 6 09:32:02 2018 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Dec 6 09:32:02 2018 +0900 [WIN32SS][FONT] Improve FamilyUnknown Penalty (#1097) CORE-15419 --- win32ss/gdi/ntgdi/freetype.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/win32ss/gdi/ntgdi/freetype.c b/win32ss/gdi/ntgdi/freetype.c index e07606ab52..d6aafb5679 100644 --- a/win32ss/gdi/ntgdi/freetype.c +++ b/win32ss/gdi/ntgdi/freetype.c @@ -4581,12 +4581,13 @@ GetFontPenalty(const LOGFONTW * LogFont, /* Requested a family, but the candidate's family is different. */ GOT_PENALTY("Family", 9000); } - if ((TM->tmPitchAndFamily & 0xF0) == FF_DONTCARE) - { - /* FamilyUnknown Penalty 8000 */ - /* Requested a family, but the candidate has no family. */ - GOT_PENALTY("FamilyUnknown", 8000); - } + } + + if ((TM->tmPitchAndFamily & 0xF0) == FF_DONTCARE) + { + /* FamilyUnknown Penalty 8000 */ + /* Requested a family, but the candidate has no family. */ + GOT_PENALTY("FamilyUnknown", 8000); } /* Is the candidate a non-vector font? */

1 0

[reactos] 01/01: [DOXYGEN] Update Doxyfile for Doxygen 1.8.13, the version we are going to use from now on.
by Colin Finck 05 Dec '18

05 Dec '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9eb82c499f8fe2bdd40f9… commit 9eb82c499f8fe2bdd40f9fd3528e1b0dfeb927a1 Author: Colin Finck <colin(a)reactos.org> AuthorDate: Wed Dec 5 19:38:14 2018 +0100 Commit: Colin Finck <colin(a)reactos.org> CommitDate: Wed Dec 5 19:38:14 2018 +0100 [DOXYGEN] Update Doxyfile for Doxygen 1.8.13, the version we are going to use from now on. Not much has changed, several options were added, but left at their default values. However, if search problems persist after Doxygen 1.8.13 generated the documentation for the first time, we can play around with EXTERNAL_SEARCH. --- Doxyfile | 452 ++++++++++++++++++++++++++++++++++++++++++--------------------- 1 file changed, 300 insertions(+), 152 deletions(-) diff --git a/Doxyfile b/Doxyfile index 6fff952979..b79fed8cb8 100644 --- a/Doxyfile +++ b/Doxyfile @@ -1,4 +1,4 @@ -# Doxyfile 1.8.6 +# Doxyfile 1.8.13 # This file describes the settings to be used by the documentation system # doxygen (www.doxygen.org) for a project. @@ -47,10 +47,10 @@ PROJECT_NAME = "ReactOS" PROJECT_BRIEF = -# With the PROJECT_LOGO tag one can specify an logo or icon that is included in -# the documentation. The maximum height of the logo should not exceed 55 pixels -# and the maximum width should not exceed 200 pixels. Doxygen will copy the logo -# to the output directory. +# With the PROJECT_LOGO tag one can specify a logo or an icon that is included +# in the documentation. The maximum height of the logo should not exceed 55 +# pixels and the maximum width should not exceed 200 pixels. Doxygen will copy +# the logo to the output directory. PROJECT_LOGO = @@ -61,7 +61,7 @@ PROJECT_LOGO = OUTPUT_DIRECTORY = "Doxygen" -# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create 4096 sub- +# If the CREATE_SUBDIRS tag is set to YES then doxygen will create 4096 sub- # directories (in 2 levels) under the output directory of each output format and # will distribute the generated files over these directories. Enabling this # option can be useful when feeding doxygen a huge amount of source files, where @@ -71,6 +71,14 @@ OUTPUT_DIRECTORY = "Doxygen" CREATE_SUBDIRS = YES +# If the ALLOW_UNICODE_NAMES tag is set to YES, doxygen will allow non-ASCII +# characters to appear in the names of generated files. If set to NO, non-ASCII +# characters will be escaped, for example _xE3_x81_x84 will be used for Unicode +# U+3044. +# The default value is: NO. + +ALLOW_UNICODE_NAMES = NO + # The OUTPUT_LANGUAGE tag is used to specify the language in which all # documentation generated by doxygen is written. Doxygen will use this # information to generate all constant output in the proper language. @@ -86,14 +94,14 @@ CREATE_SUBDIRS = YES OUTPUT_LANGUAGE = English -# If the BRIEF_MEMBER_DESC tag is set to YES doxygen will include brief member +# If the BRIEF_MEMBER_DESC tag is set to YES, doxygen will include brief member # descriptions after the members that are listed in the file and class # documentation (similar to Javadoc). Set to NO to disable this. # The default value is: YES. BRIEF_MEMBER_DESC = YES -# If the REPEAT_BRIEF tag is set to YES doxygen will prepend the brief +# If the REPEAT_BRIEF tag is set to YES, doxygen will prepend the brief # description of a member or function before the detailed description # # Note: If both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the @@ -111,7 +119,17 @@ REPEAT_BRIEF = YES # the entity):The $name class, The $name widget, The $name file, is, provides, # specifies, contains, represents, a, an and the. -ABBREVIATE_BRIEF = +ABBREVIATE_BRIEF = "The $name class" \ + "The $name widget" \ + "The $name file" \ + is \ + provides \ + specifies \ + contains \ + represents \ + a \ + an \ + the # If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then # doxygen will generate a detailed section even if there is only a brief @@ -128,7 +146,7 @@ ALWAYS_DETAILED_SEC = NO INLINE_INHERITED_MEMB = NO -# If the FULL_PATH_NAMES tag is set to YES doxygen will prepend the full path +# If the FULL_PATH_NAMES tag is set to YES, doxygen will prepend the full path # before files name in the file list and in the header files. If set to NO the # shortest path that makes the file name unique will be used # The default value is: YES. @@ -198,9 +216,9 @@ MULTILINE_CPP_IS_BRIEF = NO INHERIT_DOCS = YES -# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce a -# new page for each member. If set to NO, the documentation of a member will be -# part of the file/class/namespace that contains it. +# If the SEPARATE_MEMBER_PAGES tag is set to YES then doxygen will produce a new +# page for each member. If set to NO, the documentation of a member will be part +# of the file/class/namespace that contains it. # The default value is: NO. SEPARATE_MEMBER_PAGES = NO @@ -262,11 +280,14 @@ OPTIMIZE_OUTPUT_VHDL = NO # extension. Doxygen has a built-in mapping, but you can override or extend it # using this tag. The format is ext=language, where ext is a file extension, and # language is one of the parsers supported by doxygen: IDL, Java, Javascript, -# C#, C, C++, D, PHP, Objective-C, Python, Fortran, VHDL. For instance to make -# doxygen treat .inc files as Fortran files (default is PHP), and .f files as C -# (default is Fortran), use: inc=Fortran f=C. +# C#, C, C++, D, PHP, Objective-C, Python, Fortran (fixed format Fortran: +# FortranFixed, free formatted Fortran: FortranFree, unknown formatted Fortran: +# Fortran. In the later case the parser tries to guess whether the code is fixed +# or free formatted code, this is the default for Fortran type files), VHDL. For +# instance to make doxygen treat .inc files as Fortran files (default is PHP), +# and .f files as C (default is Fortran), use: inc=Fortran f=C. # -# Note For files without extension you can use no_extension as a placeholder. +# Note: For files without extension you can use no_extension as a placeholder. # # Note that for custom extensions you also need to set FILE_PATTERNS otherwise # the files are not read by doxygen. @@ -283,10 +304,19 @@ EXTENSION_MAPPING = MARKDOWN_SUPPORT = YES +# When the TOC_INCLUDE_HEADINGS tag is set to a non-zero value, all headings up +# to that level are automatically included in the table of contents, even if +# they do not have an id attribute. +# Note: This feature currently applies only to Markdown headings. +# Minimum value: 0, maximum value: 99, default value: 0. +# This tag requires that the tag MARKDOWN_SUPPORT is set to YES. + +TOC_INCLUDE_HEADINGS = 0 + # When enabled doxygen tries to link words that correspond to documented # classes, or namespaces to their corresponding documentation. Such a link can -# be prevented in individual cases by by putting a % sign in front of the word -# or globally by setting AUTOLINK_SUPPORT to NO. +# be prevented in individual cases by putting a % sign in front of the word or +# globally by setting AUTOLINK_SUPPORT to NO. # The default value is: YES. AUTOLINK_SUPPORT = YES @@ -326,13 +356,20 @@ SIP_SUPPORT = NO IDL_PROPERTY_SUPPORT = YES # If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC -# tag is set to YES, then doxygen will reuse the documentation of the first +# tag is set to YES then doxygen will reuse the documentation of the first # member in the group (if any) for the other members of the group. By default # all members of a group must be documented explicitly. # The default value is: NO. DISTRIBUTE_GROUP_DOC = NO +# If one adds a struct or class to a group and this option is enabled, then also +# any nested class or struct is added to the same group. By default this option +# is disabled and one has to add nested compounds explicitly via \ingroup. +# The default value is: NO. + +GROUP_NESTED_COMPOUNDS = NO + # Set the SUBGROUPING tag to YES to allow class member groups of the same type # (for instance a group of public functions) to be put as a subgroup of that # type (e.g. under the Public Functions section). Set it to NO to prevent @@ -391,7 +428,7 @@ LOOKUP_CACHE_SIZE = 0 # Build related configuration options #--------------------------------------------------------------------------- -# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in +# If the EXTRACT_ALL tag is set to YES, doxygen will assume all entities in # documentation are documented, even if no documentation was available. Private # class members and static file members will be hidden unless the # EXTRACT_PRIVATE respectively EXTRACT_STATIC tags are set to YES. @@ -401,35 +438,35 @@ LOOKUP_CACHE_SIZE = 0 EXTRACT_ALL = YES -# If the EXTRACT_PRIVATE tag is set to YES all private members of a class will +# If the EXTRACT_PRIVATE tag is set to YES, all private members of a class will # be included in the documentation. # The default value is: NO. EXTRACT_PRIVATE = YES -# If the EXTRACT_PACKAGE tag is set to YES all members with package or internal +# If the EXTRACT_PACKAGE tag is set to YES, all members with package or internal # scope will be included in the documentation. # The default value is: NO. EXTRACT_PACKAGE = YES -# If the EXTRACT_STATIC tag is set to YES all static members of a file will be +# If the EXTRACT_STATIC tag is set to YES, all static members of a file will be # included in the documentation. # The default value is: NO. EXTRACT_STATIC = YES -# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) defined -# locally in source files will be included in the documentation. If set to NO +# If the EXTRACT_LOCAL_CLASSES tag is set to YES, classes (and structs) defined +# locally in source files will be included in the documentation. If set to NO, # only classes defined in header files are included. Does not have any effect # for Java sources. # The default value is: YES. EXTRACT_LOCAL_CLASSES = YES -# This flag is only useful for Objective-C code. When set to YES local methods, +# This flag is only useful for Objective-C code. If set to YES, local methods, # which are defined in the implementation section but not in the interface are -# included in the documentation. If set to NO only methods in the interface are +# included in the documentation. If set to NO, only methods in the interface are # included. # The default value is: NO. @@ -454,21 +491,21 @@ HIDE_UNDOC_MEMBERS = NO # If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all # undocumented classes that are normally visible in the class hierarchy. If set -# to NO these classes will be included in the various overviews. This option has -# no effect if EXTRACT_ALL is enabled. +# to NO, these classes will be included in the various overviews. This option +# has no effect if EXTRACT_ALL is enabled. # The default value is: NO. HIDE_UNDOC_CLASSES = NO # If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend -# (class|struct|union) declarations. If set to NO these declarations will be +# (class|struct|union) declarations. If set to NO, these declarations will be # included in the documentation. # The default value is: NO. HIDE_FRIEND_COMPOUNDS = NO # If the HIDE_IN_BODY_DOCS tag is set to YES, doxygen will hide any -# documentation blocks found inside the body of a function. If set to NO these +# documentation blocks found inside the body of a function. If set to NO, these # blocks will be appended to the function's detailed documentation block. # The default value is: NO. @@ -482,7 +519,7 @@ HIDE_IN_BODY_DOCS = NO INTERNAL_DOCS = NO # If the CASE_SENSE_NAMES tag is set to NO then doxygen will only generate file -# names in lower-case letters. If set to YES upper-case letters are also +# names in lower-case letters. If set to YES, upper-case letters are also # allowed. This is useful if you have classes or files whose names only differ # in case and if your file system supports case sensitive file names. Windows # and Mac users are advised to set this option to NO. @@ -491,12 +528,19 @@ INTERNAL_DOCS = NO CASE_SENSE_NAMES = YES # If the HIDE_SCOPE_NAMES tag is set to NO then doxygen will show members with -# their full class and namespace scopes in the documentation. If set to YES the +# their full class and namespace scopes in the documentation. If set to YES, the # scope will be hidden. # The default value is: NO. HIDE_SCOPE_NAMES = NO +# If the HIDE_COMPOUND_REFERENCE tag is set to NO (default) then doxygen will +# append additional text to a page's title, such as Class Reference. If set to +# YES the compound reference will be hidden. +# The default value is: NO. + +HIDE_COMPOUND_REFERENCE= NO + # If the SHOW_INCLUDE_FILES tag is set to YES then doxygen will put a list of # the files that are included by a file in the documentation of that file. # The default value is: YES. @@ -524,14 +568,14 @@ INLINE_INFO = YES # If the SORT_MEMBER_DOCS tag is set to YES then doxygen will sort the # (detailed) documentation of file and class members alphabetically by member -# name. If set to NO the members will appear in declaration order. +# name. If set to NO, the members will appear in declaration order. # The default value is: YES. SORT_MEMBER_DOCS = YES # If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the brief # descriptions of file, namespace and class members alphabetically by member -# name. If set to NO the members will appear in declaration order. Note that +# name. If set to NO, the members will appear in declaration order. Note that # this will also influence the order of the classes in the class list. # The default value is: NO. @@ -576,27 +620,25 @@ SORT_BY_SCOPE_NAME = NO STRICT_PROTO_MATCHING = NO -# The GENERATE_TODOLIST tag can be used to enable ( YES) or disable ( NO) the -# todo list. This list is created by putting \todo commands in the -# documentation. +# The GENERATE_TODOLIST tag can be used to enable (YES) or disable (NO) the todo +# list. This list is created by putting \todo commands in the documentation. # The default value is: YES. GENERATE_TODOLIST = YES -# The GENERATE_TESTLIST tag can be used to enable ( YES) or disable ( NO) the -# test list. This list is created by putting \test commands in the -# documentation. +# The GENERATE_TESTLIST tag can be used to enable (YES) or disable (NO) the test +# list. This list is created by putting \test commands in the documentation. # The default value is: YES. GENERATE_TESTLIST = YES -# The GENERATE_BUGLIST tag can be used to enable ( YES) or disable ( NO) the bug +# The GENERATE_BUGLIST tag can be used to enable (YES) or disable (NO) the bug # list. This list is created by putting \bug commands in the documentation. # The default value is: YES. GENERATE_BUGLIST = YES -# The GENERATE_DEPRECATEDLIST tag can be used to enable ( YES) or disable ( NO) +# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or disable (NO) # the deprecated list. This list is created by putting \deprecated commands in # the documentation. # The default value is: YES. @@ -621,8 +663,8 @@ ENABLED_SECTIONS = MAX_INITIALIZER_LINES = 30 # Set the SHOW_USED_FILES tag to NO to disable the list of files generated at -# the bottom of the documentation of classes and structs. If set to YES the list -# will mention the files that were used to generate the documentation. +# the bottom of the documentation of classes and structs. If set to YES, the +# list will mention the files that were used to generate the documentation. # The default value is: YES. SHOW_USED_FILES = YES @@ -670,8 +712,7 @@ LAYOUT_FILE = # to be installed. See also http://en.wikipedia.org/wiki/BibTeX for more info. # For LaTeX the style of the bibliography can be controlled using # LATEX_BIB_STYLE. To use this feature you need bibtex and perl available in the -# search path. Do not use file names with spaces, bibtex cannot handle them. See -# also \cite for info how to create references. +# search path. See also \cite for info how to create references. CITE_BIB_FILES = @@ -687,20 +728,20 @@ CITE_BIB_FILES = QUIET = NO # The WARNINGS tag can be used to turn on/off the warning messages that are -# generated to standard error ( stderr) by doxygen. If WARNINGS is set to YES +# generated to standard error (stderr) by doxygen. If WARNINGS is set to YES # this implies that the warnings are on. # # Tip: Turn warnings on while writing the documentation. # The default value is: YES. -WARNINGS = NO +WARNINGS = YES -# If the WARN_IF_UNDOCUMENTED tag is set to YES, then doxygen will generate +# If the WARN_IF_UNDOCUMENTED tag is set to YES then doxygen will generate # warnings for undocumented members. If EXTRACT_ALL is set to YES then this flag # will automatically be disabled. # The default value is: YES. -WARN_IF_UNDOCUMENTED = NO +WARN_IF_UNDOCUMENTED = YES # If the WARN_IF_DOC_ERROR tag is set to YES, doxygen will generate warnings for # potential errors in the documentation, such as not documenting some parameters @@ -712,12 +753,18 @@ WARN_IF_DOC_ERROR = YES # This WARN_NO_PARAMDOC option can be enabled to get warnings for functions that # are documented, but have no documentation for their parameters or return -# value. If set to NO doxygen will only warn about wrong or incomplete parameter -# documentation, but not about the absence of documentation. +# value. If set to NO, doxygen will only warn about wrong or incomplete +# parameter documentation, but not about the absence of documentation. # The default value is: NO. WARN_NO_PARAMDOC = NO +# If the WARN_AS_ERROR tag is set to YES then doxygen will immediately stop when +# a warning is encountered. +# The default value is: NO. + +WARN_AS_ERROR = NO + # The WARN_FORMAT tag determines the format of the warning messages that doxygen # can produce. The string should contain the $file, $line, and $text tags, which # will be replaced by the file and line number from which the warning originated @@ -741,7 +788,7 @@ WARN_LOGFILE = # The INPUT tag is used to specify the files and/or directories that contain # documented source files. You may enter file names like myfile.cpp or # directories like /usr/src/myproject. Separate the files or directories with -# spaces. +# spaces. See also FILE_PATTERNS and EXTENSION_MAPPING # Note: If this tag is empty the current directory is searched. INPUT = @@ -757,12 +804,17 @@ INPUT_ENCODING = UTF-8 # If the value of the INPUT tag contains directories, you can use the # FILE_PATTERNS tag to specify one or more wildcard patterns (like *.cpp and -# *.h) to filter out the source-files in the directories. If left blank the -# following patterns are tested:*.c, *.cc, *.cxx, *.cpp, *.c++, *.java, *.ii, -# *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h, *.hh, *.hxx, *.hpp, -# *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc, *.m, *.markdown, -# *.md, *.mm, *.dox, *.py, *.f90, *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf, -# *.qsf, *.as and *.js. +# *.h) to filter out the source-files in the directories. +# +# Note that for custom extensions or not directly supported extensions you also +# need to set EXTENSION_MAPPING for the extension otherwise the files are not +# read by doxygen. +# +# If left blank the following patterns are tested:*.c, *.cc, *.cxx, *.cpp, +# *.c++, *.java, *.ii, *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h, +# *.hh, *.hxx, *.hpp, *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc, +# *.m, *.markdown, *.md, *.mm, *.dox, *.py, *.pyw, *.f90, *.f95, *.f03, *.f08, +# *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf and *.qsf. FILE_PATTERNS = *.c *.cc *.cxx *.cpp *.h *.hh *.hxx *.hpp *.idl @@ -795,7 +847,7 @@ EXCLUDE_SYMLINKS = NO # Note that the wildcards are matched against the file with absolute path, so to # exclude all test directories for example use the pattern */test/* -EXCLUDE_PATTERNS = */.svn/* +EXCLUDE_PATTERNS = */.git/* # The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names # (namespaces, classes, functions, etc.) that should be excluded from the @@ -819,7 +871,7 @@ EXAMPLE_PATH = # *.h) to filter out the source-files in the directories. If left blank all # files are included. -EXAMPLE_PATTERNS = +EXAMPLE_PATTERNS = * # If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be # searched for input files to be used with the \include or \dontinclude commands @@ -848,6 +900,10 @@ IMAGE_PATH = # Note that the filter must not add or remove lines; it is applied before the # code is scanned, but not when the output code is generated. If lines are added # or removed, the anchors will not be placed correctly. +# +# Note that for custom extensions or not directly supported extensions you also +# need to set EXTENSION_MAPPING for the extension otherwise the files are not +# properly processed by doxygen. INPUT_FILTER = @@ -857,11 +913,15 @@ INPUT_FILTER = # (like *.cpp=my_cpp_filter). See INPUT_FILTER for further information on how # filters are used. If the FILTER_PATTERNS tag is empty or if none of the # patterns match the file name, INPUT_FILTER is applied. +# +# Note that for custom extensions or not directly supported extensions you also +# need to set EXTENSION_MAPPING for the extension otherwise the files are not +# properly processed by doxygen. FILTER_PATTERNS = # If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using -# INPUT_FILTER ) will also be used to filter the input files that are used for +# INPUT_FILTER) will also be used to filter the input files that are used for # producing the source files to browse (i.e. when SOURCE_BROWSER is set to YES). # The default value is: NO. @@ -921,7 +981,7 @@ REFERENCED_BY_RELATION = YES REFERENCES_RELATION = NO # If the REFERENCES_LINK_SOURCE tag is set to YES and SOURCE_BROWSER tag is set -# to YES, then the hyperlinks from functions in REFERENCES_RELATION and +# to YES then the hyperlinks from functions in REFERENCES_RELATION and # REFERENCED_BY_RELATION lists will link to the source code. Otherwise they will # link to the documentation. # The default value is: YES. @@ -968,6 +1028,25 @@ USE_HTAGS = NO VERBATIM_HEADERS = YES +# If the CLANG_ASSISTED_PARSING tag is set to YES then doxygen will use the +# clang parser (see: http://clang.llvm.org/) for more accurate parsing at the +# cost of reduced performance. This can be particularly helpful with template +# rich C++ code for which doxygen's built-in parser lacks the necessary type +# information. +# Note: The availability of this option depends on whether or not doxygen was +# generated with the -Duse-libclang=ON option for CMake. +# The default value is: NO. + +CLANG_ASSISTED_PARSING = NO + +# If clang assisted parsing is enabled you can provide the compiler with command +# line options that you would normally use when invoking the compiler. Note that +# the include paths will already be set by doxygen for the files and directories +# specified with INPUT and INCLUDE_PATH. +# This tag requires that the tag CLANG_ASSISTED_PARSING is set to YES. + +CLANG_OPTIONS = + #--------------------------------------------------------------------------- # Configuration options related to the alphabetical class index #--------------------------------------------------------------------------- @@ -998,7 +1077,7 @@ IGNORE_PREFIX = # Configuration options related to the HTML output #--------------------------------------------------------------------------- -# If the GENERATE_HTML tag is set to YES doxygen will generate HTML output +# If the GENERATE_HTML tag is set to YES, doxygen will generate HTML output # The default value is: YES. GENERATE_HTML = YES @@ -1060,13 +1139,15 @@ HTML_FOOTER = HTML_STYLESHEET = -# The HTML_EXTRA_STYLESHEET tag can be used to specify an additional user- -# defined cascading style sheet that is included after the standard style sheets +# The HTML_EXTRA_STYLESHEET tag can be used to specify additional user-defined +# cascading style sheets that are included after the standard style sheets # created by doxygen. Using this option one can overrule certain style aspects. # This is preferred over using HTML_STYLESHEET since it does not replace the -# standard style sheet and is therefor more robust against future updates. -# Doxygen will copy the style sheet file to the output directory. For an example -# see the documentation. +# standard style sheet and is therefore more robust against future updates. +# Doxygen will copy the style sheet files to the output directory. +# Note: The order of the extra style sheet files is of importance (e.g. the last +# style sheet in the list overrules the setting of the previous ones in the +# list). For an example see the documentation. # This tag requires that the tag GENERATE_HTML is set to YES. HTML_EXTRA_STYLESHEET = @@ -1082,7 +1163,7 @@ HTML_EXTRA_STYLESHEET = HTML_EXTRA_FILES = # The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen -# will adjust the colors in the stylesheet and background images according to +# will adjust the colors in the style sheet and background images according to # this color. Hue is specified as an angle on a colorwheel, see # http://en.wikipedia.org/wiki/Hue for more information. For instance the value # 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300 @@ -1113,8 +1194,9 @@ HTML_COLORSTYLE_GAMMA = 80 # If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML # page will contain the date and time when the page was generated. Setting this -# to NO can help when comparing the output of multiple runs. -# The default value is: YES. +# to YES can help to show when doxygen was last run and thus if the +# documentation is up to date. +# The default value is: NO. # This tag requires that the tag GENERATE_HTML is set to YES. HTML_TIMESTAMP = YES @@ -1210,28 +1292,29 @@ GENERATE_HTMLHELP = NO CHM_FILE = # The HHC_LOCATION tag can be used to specify the location (absolute path -# including file name) of the HTML help compiler ( hhc.exe). If non-empty +# including file name) of the HTML help compiler (hhc.exe). If non-empty, # doxygen will try to run the HTML help compiler on the generated index.hhp. # The file has to be specified with full path. # This tag requires that the tag GENERATE_HTMLHELP is set to YES. HHC_LOCATION = -# The GENERATE_CHI flag controls if a separate .chi index file is generated ( -# YES) or that it should be included in the master .chm file ( NO). +# The GENERATE_CHI flag controls if a separate .chi index file is generated +# (YES) or that it should be included in the master .chm file (NO). # The default value is: NO. # This tag requires that the tag GENERATE_HTMLHELP is set to YES. GENERATE_CHI = NO -# The CHM_INDEX_ENCODING is used to encode HtmlHelp index ( hhk), content ( hhc) +# The CHM_INDEX_ENCODING is used to encode HtmlHelp index (hhk), content (hhc) # and project file content. # This tag requires that the tag GENERATE_HTMLHELP is set to YES. CHM_INDEX_ENCODING = -# The BINARY_TOC flag controls whether a binary table of contents is generated ( -# YES) or a normal table of contents ( NO) in the .chm file. +# The BINARY_TOC flag controls whether a binary table of contents is generated +# (YES) or a normal table of contents (NO) in the .chm file. Furthermore it +# enables the Previous and Next buttons. # The default value is: NO. # This tag requires that the tag GENERATE_HTMLHELP is set to YES. @@ -1344,7 +1427,7 @@ DISABLE_INDEX = NO # index structure (just like the one that is generated for HTML Help). For this # to work a browser that supports JavaScript, DHTML, CSS and frames is required # (i.e. any modern browser). Windows users are probably better off using the -# HTML help feature. Via custom stylesheets (see HTML_EXTRA_STYLESHEET) one can +# HTML help feature. Via custom style sheets (see HTML_EXTRA_STYLESHEET) one can # further fine-tune the look of the index. As an example, the default style # sheet generated by doxygen has an example that shows how to put an image at # the root of the tree instead of the PROJECT_NAME. Since the tree basically has @@ -1372,7 +1455,7 @@ ENUM_VALUES_PER_LINE = 4 TREEVIEW_WIDTH = 250 -# When the EXT_LINKS_IN_WINDOW option is set to YES doxygen will open links to +# If the EXT_LINKS_IN_WINDOW option is set to YES, doxygen will open links to # external symbols imported via tag files in a separate window. # The default value is: NO. # This tag requires that the tag GENERATE_HTML is set to YES. @@ -1401,7 +1484,7 @@ FORMULA_TRANSPARENT = YES # Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see # http://www.mathjax.org) which uses client side Javascript for the rendering -# instead of using prerendered bitmaps. Use this if you do not have LaTeX +# instead of using pre-rendered bitmaps. Use this if you do not have LaTeX # installed or if you want to formulas look prettier in the HTML output. When # enabled you may also need to install MathJax separately and configure the path # to it using the MATHJAX_RELPATH option. @@ -1471,11 +1554,11 @@ SEARCHENGINE = YES # When the SERVER_BASED_SEARCH tag is enabled the search engine will be # implemented using a web server instead of a web client using Javascript. There -# are two flavours of web server based searching depending on the -# EXTERNAL_SEARCH setting. When disabled, doxygen will generate a PHP script for -# searching and an index file used by the script. When EXTERNAL_SEARCH is -# enabled the indexing and searching needs to be provided by external tools. See -# the section "External Indexing and Searching" for details. +# are two flavors of web server based searching depending on the EXTERNAL_SEARCH +# setting. When disabled, doxygen will generate a PHP script for searching and +# an index file used by the script. When EXTERNAL_SEARCH is enabled the indexing +# and searching needs to be provided by external tools. See the section +# "External Indexing and Searching" for details. # The default value is: NO. # This tag requires that the tag SEARCHENGINE is set to YES. @@ -1487,7 +1570,7 @@ SERVER_BASED_SEARCH = YES # external search engine pointed to by the SEARCHENGINE_URL option to obtain the # search results. # -# Doxygen ships with an example indexer ( doxyindexer) and search engine +# Doxygen ships with an example indexer (doxyindexer) and search engine # (doxysearch.cgi) which are based on the open source search engine library # Xapian (see: http://xapian.org/). # @@ -1500,7 +1583,7 @@ EXTERNAL_SEARCH = NO # The SEARCHENGINE_URL should point to a search engine hosted by a web server # which will return the search results when EXTERNAL_SEARCH is enabled. # -# Doxygen ships with an example indexer ( doxyindexer) and search engine +# Doxygen ships with an example indexer (doxyindexer) and search engine # (doxysearch.cgi) which are based on the open source search engine library # Xapian (see: http://xapian.org/). See the section "External Indexing and # Searching" for details. @@ -1538,7 +1621,7 @@ EXTRA_SEARCH_MAPPINGS = # Configuration options related to the LaTeX output #--------------------------------------------------------------------------- -# If the GENERATE_LATEX tag is set to YES doxygen will generate LaTeX output. +# If the GENERATE_LATEX tag is set to YES, doxygen will generate LaTeX output. # The default value is: YES. GENERATE_LATEX = NO @@ -1569,7 +1652,7 @@ LATEX_CMD_NAME = latex MAKEINDEX_CMD_NAME = makeindex -# If the COMPACT_LATEX tag is set to YES doxygen generates more compact LaTeX +# If the COMPACT_LATEX tag is set to YES, doxygen generates more compact LaTeX # documents. This may be useful for small projects and may help to save some # trees in general. # The default value is: NO. @@ -1587,9 +1670,12 @@ COMPACT_LATEX = NO PAPER_TYPE = a4 # The EXTRA_PACKAGES tag can be used to specify one or more LaTeX package names -# that should be included in the LaTeX output. To get the times font for -# instance you can specify -# EXTRA_PACKAGES=times +# that should be included in the LaTeX output. The package can be specified just +# by its name or with the correct syntax as to be used with the LaTeX +# \usepackage command. To get the times font for instance you can specify : +# EXTRA_PACKAGES=times or EXTRA_PACKAGES={times} +# To use the option intlimits with the amsmath package you can specify: +# EXTRA_PACKAGES=[intlimits]{amsmath} # If left blank no extra packages will be included. # This tag requires that the tag GENERATE_LATEX is set to YES. @@ -1603,23 +1689,36 @@ EXTRA_PACKAGES = # # Note: Only use a user-defined header if you know what you are doing! The # following commands have a special meaning inside the header: $title, -# $datetime, $date, $doxygenversion, $projectname, $projectnumber. Doxygen will -# replace them by respectively the title of the page, the current date and time, -# only the current date, the version number of doxygen, the project name (see -# PROJECT_NAME), or the project number (see PROJECT_NUMBER). +# $datetime, $date, $doxygenversion, $projectname, $projectnumber, +# $projectbrief, $projectlogo. Doxygen will replace $title with the empty +# string, for the replacement values of the other commands the user is referred +# to HTML_HEADER. # This tag requires that the tag GENERATE_LATEX is set to YES. LATEX_HEADER = # The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for the # generated LaTeX document. The footer should contain everything after the last -# chapter. If it is left blank doxygen will generate a standard footer. +# chapter. If it is left blank doxygen will generate a standard footer. See +# LATEX_HEADER for more information on how to generate a default footer and what +# special commands can be used inside the footer. # # Note: Only use a user-defined footer if you know what you are doing! # This tag requires that the tag GENERATE_LATEX is set to YES. LATEX_FOOTER = +# The LATEX_EXTRA_STYLESHEET tag can be used to specify additional user-defined +# LaTeX style sheets that are included after the standard style sheets created +# by doxygen. Using this option one can overrule certain style aspects. Doxygen +# will copy the style sheet files to the output directory. +# Note: The order of the extra style sheet files is of importance (e.g. the last +# style sheet in the list overrules the setting of the previous ones in the +# list). +# This tag requires that the tag GENERATE_LATEX is set to YES. + +LATEX_EXTRA_STYLESHEET = + # The LATEX_EXTRA_FILES tag can be used to specify one or more extra images or # other source files which should be copied to the LATEX_OUTPUT output # directory. Note that the files will be copied as-is; there are no commands or @@ -1637,8 +1736,8 @@ LATEX_EXTRA_FILES = PDF_HYPERLINKS = YES -# If the LATEX_PDFLATEX tag is set to YES, doxygen will use pdflatex to generate -# the PDF file directly from the LaTeX files. Set this option to YES to get a +# If the USE_PDFLATEX tag is set to YES, doxygen will use pdflatex to generate +# the PDF file directly from the LaTeX files. Set this option to YES, to get a # higher quality PDF documentation. # The default value is: YES. # This tag requires that the tag GENERATE_LATEX is set to YES. @@ -1679,11 +1778,19 @@ LATEX_SOURCE_CODE = NO LATEX_BIB_STYLE = plain +# If the LATEX_TIMESTAMP tag is set to YES then the footer of each generated +# page will contain the date and time when the page was generated. Setting this +# to NO can help when comparing the output of multiple runs. +# The default value is: NO. +# This tag requires that the tag GENERATE_LATEX is set to YES. + +LATEX_TIMESTAMP = NO + #--------------------------------------------------------------------------- # Configuration options related to the RTF output #--------------------------------------------------------------------------- -# If the GENERATE_RTF tag is set to YES doxygen will generate RTF output. The +# If the GENERATE_RTF tag is set to YES, doxygen will generate RTF output. The # RTF output is optimized for Word 97 and may not look too pretty with other RTF # readers/editors. # The default value is: NO. @@ -1698,7 +1805,7 @@ GENERATE_RTF = NO RTF_OUTPUT = rtf -# If the COMPACT_RTF tag is set to YES doxygen generates more compact RTF +# If the COMPACT_RTF tag is set to YES, doxygen generates more compact RTF # documents. This may be useful for small projects and may help to save some # trees in general. # The default value is: NO. @@ -1735,11 +1842,21 @@ RTF_STYLESHEET_FILE = RTF_EXTENSIONS_FILE = +# If the RTF_SOURCE_CODE tag is set to YES then doxygen will include source code +# with syntax highlighting in the RTF output. +# +# Note that which sources are shown also depends on other settings such as +# SOURCE_BROWSER. +# The default value is: NO. +# This tag requires that the tag GENERATE_RTF is set to YES. + +RTF_SOURCE_CODE = NO + #--------------------------------------------------------------------------- # Configuration options related to the man page output #--------------------------------------------------------------------------- -# If the GENERATE_MAN tag is set to YES doxygen will generate man pages for +# If the GENERATE_MAN tag is set to YES, doxygen will generate man pages for # classes and files. # The default value is: NO. @@ -1763,6 +1880,13 @@ MAN_OUTPUT = man MAN_EXTENSION = .3 +# The MAN_SUBDIR tag determines the name of the directory created within +# MAN_OUTPUT in which the man pages are placed. If defaults to man followed by +# MAN_EXTENSION with the initial . removed. +# This tag requires that the tag GENERATE_MAN is set to YES. + +MAN_SUBDIR = + # If the MAN_LINKS tag is set to YES and doxygen generates man output, then it # will generate one additional man file for each entity documented in the real # man page(s). These additional files only source the real man page, but without @@ -1776,7 +1900,7 @@ MAN_LINKS = NO # Configuration options related to the XML output #--------------------------------------------------------------------------- -# If the GENERATE_XML tag is set to YES doxygen will generate an XML file that +# If the GENERATE_XML tag is set to YES, doxygen will generate an XML file that # captures the structure of the code including all documentation. # The default value is: NO. @@ -1790,19 +1914,7 @@ GENERATE_XML = NO XML_OUTPUT = xml -# The XML_SCHEMA tag can be used to specify a XML schema, which can be used by a -# validating XML parser to check the syntax of the XML files. -# This tag requires that the tag GENERATE_XML is set to YES. - -XML_SCHEMA = - -# The XML_DTD tag can be used to specify a XML DTD, which can be used by a -# validating XML parser to check the syntax of the XML files. -# This tag requires that the tag GENERATE_XML is set to YES. - -XML_DTD = - -# If the XML_PROGRAMLISTING tag is set to YES doxygen will dump the program +# If the XML_PROGRAMLISTING tag is set to YES, doxygen will dump the program # listings (including syntax highlighting and cross-referencing information) to # the XML output. Note that enabling this will significantly increase the size # of the XML output. @@ -1815,7 +1927,7 @@ XML_PROGRAMLISTING = YES # Configuration options related to the DOCBOOK output #--------------------------------------------------------------------------- -# If the GENERATE_DOCBOOK tag is set to YES doxygen will generate Docbook files +# If the GENERATE_DOCBOOK tag is set to YES, doxygen will generate Docbook files # that can be used to generate PDF. # The default value is: NO. @@ -1829,14 +1941,23 @@ GENERATE_DOCBOOK = NO DOCBOOK_OUTPUT = docbook +# If the DOCBOOK_PROGRAMLISTING tag is set to YES, doxygen will include the +# program listings (including syntax highlighting and cross-referencing +# information) to the DOCBOOK output. Note that enabling this will significantly +# increase the size of the DOCBOOK output. +# The default value is: NO. +# This tag requires that the tag GENERATE_DOCBOOK is set to YES. + +DOCBOOK_PROGRAMLISTING = NO + #--------------------------------------------------------------------------- # Configuration options for the AutoGen Definitions output #--------------------------------------------------------------------------- -# If the GENERATE_AUTOGEN_DEF tag is set to YES doxygen will generate an AutoGen -# Definitions (see http://autogen.sf.net) file that captures the structure of -# the code including all documentation. Note that this feature is still -# experimental and incomplete at the moment. +# If the GENERATE_AUTOGEN_DEF tag is set to YES, doxygen will generate an +# AutoGen Definitions (see http://autogen.sf.net) file that captures the +# structure of the code including all documentation. Note that this feature is +# still experimental and incomplete at the moment. # The default value is: NO. GENERATE_AUTOGEN_DEF = NO @@ -1845,7 +1966,7 @@ GENERATE_AUTOGEN_DEF = NO # Configuration options related to the Perl module output #--------------------------------------------------------------------------- -# If the GENERATE_PERLMOD tag is set to YES doxygen will generate a Perl module +# If the GENERATE_PERLMOD tag is set to YES, doxygen will generate a Perl module # file that captures the structure of the code including all documentation. # # Note that this feature is still experimental and incomplete at the moment. @@ -1853,7 +1974,7 @@ GENERATE_AUTOGEN_DEF = NO GENERATE_PERLMOD = NO -# If the PERLMOD_LATEX tag is set to YES doxygen will generate the necessary +# If the PERLMOD_LATEX tag is set to YES, doxygen will generate the necessary # Makefile rules, Perl scripts and LaTeX code to be able to generate PDF and DVI # output from the Perl module output. # The default value is: NO. @@ -1861,9 +1982,9 @@ GENERATE_PERLMOD = NO PERLMOD_LATEX = NO -# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be nicely +# If the PERLMOD_PRETTY tag is set to YES, the Perl module output will be nicely # formatted so it can be parsed by a human reader. This is useful if you want to -# understand what is going on. On the other hand, if this tag is set to NO the +# understand what is going on. On the other hand, if this tag is set to NO, the # size of the Perl module output will be much smaller and Perl will parse it # just the same. # The default value is: YES. @@ -1883,14 +2004,14 @@ PERLMOD_MAKEVAR_PREFIX = # Configuration options related to the preprocessor #--------------------------------------------------------------------------- -# If the ENABLE_PREPROCESSING tag is set to YES doxygen will evaluate all +# If the ENABLE_PREPROCESSING tag is set to YES, doxygen will evaluate all # C-preprocessor directives found in the sources and include files. # The default value is: YES. ENABLE_PREPROCESSING = YES -# If the MACRO_EXPANSION tag is set to YES doxygen will expand all macro names -# in the source code. If set to NO only conditional compilation will be +# If the MACRO_EXPANSION tag is set to YES, doxygen will expand all macro names +# in the source code. If set to NO, only conditional compilation will be # performed. Macro expansion can be done in a controlled way by setting # EXPAND_ONLY_PREDEF to YES. # The default value is: NO. @@ -1906,7 +2027,7 @@ MACRO_EXPANSION = NO EXPAND_ONLY_PREDEF = NO -# If the SEARCH_INCLUDES tag is set to YES the includes files in the +# If the SEARCH_INCLUDES tag is set to YES, the include files in the # INCLUDE_PATH will be searched if a #include is found. # The default value is: YES. # This tag requires that the tag ENABLE_PREPROCESSING is set to YES. @@ -1948,9 +2069,9 @@ PREDEFINED = EXPAND_AS_DEFINED = # If the SKIP_FUNCTION_MACROS tag is set to YES then doxygen's preprocessor will -# remove all refrences to function-like macros that are alone on a line, have an -# all uppercase name, and do not end with a semicolon. Such function macros are -# typically used for boiler-plate code, and will confuse the parser if not +# remove all references to function-like macros that are alone on a line, have +# an all uppercase name, and do not end with a semicolon. Such function macros +# are typically used for boiler-plate code, and will confuse the parser if not # removed. # The default value is: YES. # This tag requires that the tag ENABLE_PREPROCESSING is set to YES. @@ -1970,7 +2091,7 @@ SKIP_FUNCTION_MACROS = YES # where loc1 and loc2 can be relative or absolute paths or URLs. See the # section "Linking to external documentation" for more information about the use # of tag files. -# Note: Each tag file must have an unique name (where the name does NOT include +# Note: Each tag file must have a unique name (where the name does NOT include # the path). If a tag file is not located in the directory in which doxygen is # run, you must also specify the path to the tagfile here. @@ -1982,20 +2103,21 @@ TAGFILES = GENERATE_TAGFILE = -# If the ALLEXTERNALS tag is set to YES all external class will be listed in the -# class index. If set to NO only the inherited external classes will be listed. +# If the ALLEXTERNALS tag is set to YES, all external class will be listed in +# the class index. If set to NO, only the inherited external classes will be +# listed. # The default value is: NO. ALLEXTERNALS = NO -# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed in -# the modules index. If set to NO, only the current project's groups will be +# If the EXTERNAL_GROUPS tag is set to YES, all external groups will be listed +# in the modules index. If set to NO, only the current project's groups will be # listed. # The default value is: YES. EXTERNAL_GROUPS = YES -# If the EXTERNAL_PAGES tag is set to YES all external pages will be listed in +# If the EXTERNAL_PAGES tag is set to YES, all external pages will be listed in # the related pages index. If set to NO, only the current project's pages will # be listed. # The default value is: YES. @@ -2012,7 +2134,7 @@ PERL_PATH = /usr/bin/perl # Configuration options related to the dot tool #--------------------------------------------------------------------------- -# If the CLASS_DIAGRAMS tag is set to YES doxygen will generate a class diagram +# If the CLASS_DIAGRAMS tag is set to YES, doxygen will generate a class diagram # (in HTML and LaTeX) for classes with base or super classes. Setting the tag to # NO turns the diagrams off. Note that this option also works with HAVE_DOT # disabled, but it is recommended to install and use dot, since it yields more @@ -2037,7 +2159,7 @@ MSCGEN_PATH = DIA_PATH = -# If set to YES, the inheritance and collaboration graphs will hide inheritance +# If set to YES the inheritance and collaboration graphs will hide inheritance # and usage relations if the target is undocumented or is not a class. # The default value is: YES. @@ -2048,7 +2170,7 @@ HIDE_UNDOC_RELATIONS = YES # http://www.graphviz.org/), a graph visualization toolkit from AT&T and Lucent # Bell Labs. The other options in this section have no effect if this option is # set to NO -# The default value is: NO. +# The default value is: YES. HAVE_DOT = YES @@ -2062,7 +2184,7 @@ HAVE_DOT = YES DOT_NUM_THREADS = 1 -# When you want a differently looking font n the dot files that doxygen +# When you want a differently looking font in the dot files that doxygen # generates you can specify the font name using DOT_FONTNAME. You need to make # sure dot is able to find the font, which can be done by putting it in a # standard location or by setting the DOTFONTPATH environment variable or by @@ -2110,7 +2232,7 @@ COLLABORATION_GRAPH = YES GROUP_GRAPHS = YES -# If the UML_LOOK tag is set to YES doxygen will generate inheritance and +# If the UML_LOOK tag is set to YES, doxygen will generate inheritance and # collaboration diagrams in a style similar to the OMG's Unified Modeling # Language. # The default value is: NO. @@ -2162,7 +2284,8 @@ INCLUDED_BY_GRAPH = YES # # Note that enabling this option will significantly increase the time of a run. # So in most cases it will be better to enable call graphs for selected -# functions only using the \callgraph command. +# functions only using the \callgraph command. Disabling a call graph can be +# accomplished by means of the command \hidecallgraph. # The default value is: NO. # This tag requires that the tag HAVE_DOT is set to YES. @@ -2173,7 +2296,8 @@ CALL_GRAPH = NO # # Note that enabling this option will significantly increase the time of a run. # So in most cases it will be better to enable caller graphs for selected -# functions only using the \callergraph command. +# functions only using the \callergraph command. Disabling a caller graph can be +# accomplished by means of the command \hidecallergraph. # The default value is: NO. # This tag requires that the tag HAVE_DOT is set to YES. @@ -2196,11 +2320,17 @@ GRAPHICAL_HIERARCHY = YES DIRECTORY_GRAPH = YES # The DOT_IMAGE_FORMAT tag can be used to set the image format of the images -# generated by dot. +# generated by dot. For an explanation of the image formats see the section +# output formats in the documentation of the dot tool (Graphviz (see: +# http://www.graphviz.org/)). # Note: If you choose svg you need to set HTML_FILE_EXTENSION to xhtml in order # to make the SVG files visible in IE 9+ (other browsers do not have this # requirement). -# Possible values are: png, jpg, gif and svg. +# Possible values are: png, png:cairo, png:cairo:cairo, png:cairo:gd, png:gd, +# png:gd:gd, jpg, jpg:cairo, jpg:cairo:gd, jpg:gd, jpg:gd:gd, gif, gif:cairo, +# gif:cairo:gd, gif:gd, gif:gd:gd, svg, png:gd, png:gd:gd, png:cairo, +# png:cairo:gd, png:cairo:cairo, png:cairo:gdiplus, png:gdiplus and +# png:gdiplus:gdiplus. # The default value is: png. # This tag requires that the tag HAVE_DOT is set to YES. @@ -2243,6 +2373,24 @@ MSCFILE_DIRS = DIAFILE_DIRS = +# When using plantuml, the PLANTUML_JAR_PATH tag should be used to specify the +# path where java can find the plantuml.jar file. If left blank, it is assumed +# PlantUML is not used or called during a preprocessing step. Doxygen will +# generate a warning when it encounters a \startuml command in this case and +# will not generate output for the diagram. + +PLANTUML_JAR_PATH = + +# When using plantuml, the PLANTUML_CFG_FILE tag can be used to specify a +# configuration file for plantuml. + +PLANTUML_CFG_FILE = + +# When using plantuml, the specified paths are searched for files specified by +# the !include statement in a plantuml block. + +PLANTUML_INCLUDE_PATH = + # The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of nodes # that will be shown in the graph. If the number of nodes in a graph becomes # larger than this value, doxygen will truncate the graph, which is visualized @@ -2279,7 +2427,7 @@ MAX_DOT_GRAPH_DEPTH = 0 DOT_TRANSPARENT = NO -# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output +# Set the DOT_MULTI_TARGETS tag to YES to allow dot to generate multiple output # files in one run (i.e. multiple -o and -T options on the command line). This # makes dot run faster, but since only newer versions of dot (>1.8.10) support # this, this feature is disabled by default. @@ -2296,7 +2444,7 @@ DOT_MULTI_TARGETS = YES GENERATE_LEGEND = YES -# If the DOT_CLEANUP tag is set to YES doxygen will remove the intermediate dot +# If the DOT_CLEANUP tag is set to YES, doxygen will remove the intermediate dot # files that are used to generate the various graphs. # The default value is: YES. # This tag requires that the tag HAVE_DOT is set to YES.

1 0

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

05 Dec '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=39a478d17ba011b87c8e7… commit 39a478d17ba011b87c8e756fde6e7b9dfe0641f1 Author: Luo Yufan <njlyf2011(a)hotmail.com> AuthorDate: Wed Dec 5 23:50:05 2018 +0800 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Dec 5 16:50:05 2018 +0100 [TRANSLATION] Update Simplified Chinese translation. (#1096) --- base/applications/msconfig_new/lang/zh-CN.rc | 6 +++--- base/applications/mspaint/lang/zh-CN.rc | 4 ++-- base/applications/network/ping/lang/zh-CN.rc | 16 ++++++++-------- base/applications/notepad/lang/zh-CN.rc | 8 +++++--- base/applications/rapps/lang/zh-CN.rc | 6 +++--- base/shell/explorer/lang/zh-CN.rc | 12 ++++++------ base/system/winlogon/lang/zh-CN.rc | 6 +++--- boot/freeldr/fdebug/lang/zh-CN.rc | 2 +- dll/cpl/sysdm/lang/zh-CN.rc | 14 +++++++------- dll/shellext/netshell/lang/zh-CN.rc | 24 ++++++++++++------------ dll/win32/devmgr/lang/zh-CN.rc | 4 ++-- dll/win32/syssetup/lang/zh-CN.rc | 12 ++++++------ media/inf/shortcuts.inf | 8 ++++---- media/themes/lautus.msstyles/lang/zh-CN.rc | 8 ++++---- media/themes/modern.msstyles/lang/zh-CN.rc | 16 ++++++++-------- 15 files changed, 74 insertions(+), 72 deletions(-) diff --git a/base/applications/msconfig_new/lang/zh-CN.rc b/base/applications/msconfig_new/lang/zh-CN.rc index ecab57f3ae..e2fc1ec1e9 100644 --- a/base/applications/msconfig_new/lang/zh-CN.rc +++ b/base/applications/msconfig_new/lang/zh-CN.rc @@ -9,11 +9,11 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED IDD_ABOUTBOX DIALOGEX 0, 0, 229, 98 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "关于系统配置实用程序" +CAPTION "关于系统配置程序" FONT 9, "宋体" BEGIN ICON IDI_APPICON, IDC_STATIC, 14, 14, 20, 20 - LTEXT "系统配置实用程序\n版本 1.0", IDC_STATIC, 42, 14, 182, 17, SS_NOPREFIX + LTEXT "系统配置程序\n版本 1.0", IDC_STATIC, 42, 14, 182, 17, SS_NOPREFIX // "Copyright (C) ReactOS Team 2005-"COPYRIGHT_YEAR"\n" LTEXT "版权所有 (C) ReactOS Team 2005-2015\n\ Christoph von Wittich (Christoph(a)ApiViewer.de)\n\ @@ -40,7 +40,7 @@ BEGIN PUSHBUTTON "展开文件(&E)...", IDC_BTN_FILE_EXTRACTION, 275, 156, 85, 14 GROUPBOX "启动选择", IDC_STATIC, 5, 5, 356, 145 LTEXT "加载所有设备驱动程序和服务", IDC_STATIC, 25, 30, 322, 10 - LTEXT "仅加载基本设备驱动程序和服务", IDC_STATIC, 25, 58, 322, 10 + LTEXT "仅加载基本的设备驱动程序和服务", IDC_STATIC, 25, 58, 322, 10 END IDD_SYSTEM_PAGE DIALOGEX 0, 0, 366, 175 diff --git a/base/applications/mspaint/lang/zh-CN.rc b/base/applications/mspaint/lang/zh-CN.rc index 719f97a805..1cdd838bf2 100644 --- a/base/applications/mspaint/lang/zh-CN.rc +++ b/base/applications/mspaint/lang/zh-CN.rc @@ -37,7 +37,7 @@ BEGIN POPUP "编辑(&E)" BEGIN MENUITEM "撤销(&U)\tCtrl+Z", IDM_EDITUNDO - MENUITEM "重做(&R)\tCtrl+Y", IDM_EDITREDO + MENUITEM "重来(&R)\tCtrl+Y", IDM_EDITREDO MENUITEM SEPARATOR MENUITEM "剪切(&T)\tCtrl+X", IDM_EDITCUT MENUITEM "复制(&C)\tCtrl+C", IDM_EDITCOPY @@ -95,7 +95,7 @@ BEGIN BEGIN MENUITEM "帮助主题(&H)", IDM_HELPHELPTOPICS MENUITEM SEPARATOR - MENUITEM "信息(&I)", IDM_HELPINFO + MENUITEM "系统信息(&I)", IDM_HELPINFO END END diff --git a/base/applications/network/ping/lang/zh-CN.rc b/base/applications/network/ping/lang/zh-CN.rc index 206c4be6d5..9df0e3c62a 100644 --- a/base/applications/network/ping/lang/zh-CN.rc +++ b/base/applications/network/ping/lang/zh-CN.rc @@ -12,10 +12,10 @@ BEGIN 用法: ping [-t] [-a] [-n count] [-l size] [-f] [-i TTL] [-v TOS]\n\ [-w timeout] [-4] [-6] target\n\ \n\ -Options:\n\ - -t Ping 指定的主机，直到停止。\n\ - 若要查看统计信息并继续操作，请键入 Control-Break；\n\ - 若要停止，请键入 Control-C。\n\ +选项:\n\ + -t Ping 指定的主机直到停止为止。\n\ + 若要查看统计信息并继续操作，请按 Control-Break；\n\ + 若要停止，请按 Control-C。\n\ -a 将地址解析为主机名。\n\ -n count 要发送的回显请求数。\n\ -l size 发送缓冲区大小。\n\ @@ -38,7 +38,7 @@ Options:\n\ IDS_BAD_PARAMETER "错误的参数 %s。\n" IDS_BAD_VALUE "选项 %s 的值有误，有效范围从 %u 到 %u。\n" IDS_WRONG_FAMILY "选项 %s 只支持 %s。\n" - IDS_UNKNOWN_HOST "Ping 请求找不到主机 %s. 请检查该名称，然后重试。\n" + IDS_UNKNOWN_HOST "Ping 无法找到主机 %s. 请检查该名称，然后重试。\n" IDS_PINGING_ADDRESS "\nPinging %s " IDS_PINGING_HOSTNAME "\nPinging %s [%s] " IDS_SOURCE_ADDRESS "从 %s %s" @@ -48,11 +48,11 @@ Options:\n\ IDS_REPLY_TIME_MS "时间=%lums " IDS_REPLY_TIME_0MS "时间<1ms " IDS_REPLY_TTL "TTL=%d\n" - IDS_REPLY_STATUS "回显返回 %lu。\n" + IDS_REPLY_STATUS "回显已返回 %lu。\n" IDS_DEST_HOST_UNREACHABLE "目标主机不可达。\n" IDS_DEST_NET_UNREACHABLE "目标网络不可达。\n" - IDS_REQUEST_TIMED_OUT "请求超时。\n" - IDS_TTL_EXPIRED "TTL 再传输中过期。\n" + IDS_REQUEST_TIMED_OUT "请求已过期。\n" + IDS_TTL_EXPIRED "TTL 在传输途中过期。\n" IDS_TRANSMIT_FAILED "PING: 传输失败。(Error %u)\n" IDS_STATISTICS "\n\ diff --git a/base/applications/notepad/lang/zh-CN.rc b/base/applications/notepad/lang/zh-CN.rc index e255bb2d6e..b09b2daa41 100644 --- a/base/applications/notepad/lang/zh-CN.rc +++ b/base/applications/notepad/lang/zh-CN.rc @@ -1,3 +1,5 @@ +/* Translation has been changed by Luo Yufan on 2018-12-05 (njlyf2011(a)hotmail.com) */ + LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED ID_ACCEL ACCELERATORS @@ -63,7 +65,7 @@ BEGIN MENUITEM "内容(&C)", CMD_HELP_CONTENTS MENUITEM SEPARATOR MENUITEM "关于(&A)", CMD_ABOUT - MENUITEM "信息(&O)...", CMD_HELP_ABOUT_NOTEPAD + MENUITEM "系统信息(&O)...", CMD_HELP_ABOUT_NOTEPAD END END @@ -133,7 +135,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "关于 ReactOS 记事本" FONT 9, "宋体" BEGIN - CONTROL "ReactOS 记事本 v1.0\r\n版权 1997,98 Marcel Baur\r\n版权 2000 Mike McCormack\r\n版权 2002 Sylvain Petreolle\r\n版权 2002 Andriy Palamarchuk\r\n", -1, "Static", SS_LEFTNOWORDWRAP | WS_GROUP, 46, 7, 232, 39 + CONTROL "ReactOS 记事本 v1.0\r\n版权所有 1997,98 Marcel Baur\r\n版权所有 2000 Mike McCormack\r\n版权所有 2002 Sylvain Petreolle\r\n版权所有 2002 Andriy Palamarchuk\r\n", -1, "Static", SS_LEFTNOWORDWRAP | WS_GROUP, 46, 7, 232, 39 CONTROL " ", -1, "Static", 0x50000000, 8, 48, 272, 11 DEFPUSHBUTTON "关闭", IDOK, 114, 149, 44, 15, WS_GROUP ICON IDI_NPICON, -1, 12, 9, 20, 30 @@ -142,7 +144,7 @@ END STRINGTABLE BEGIN - STRING_LICENSE "此程序是免费软件;您可以依据由自由软件基金会发布的 GNU 通用公共许可的条款将它重新分发和/或修改;许可协议的版本 2，或 (以您的选择) 任何后续的版本。\r\n\r\n此程序因为希望有所用途而被分发，但没有任何担保。没有甚至对适销性或特定用途的默示保证。请参阅 GNU 通用公共许可证有关更多详细信息。\r\n\r\n您应该已经收到一份 GNU 通用公共许可证以及这一计划; 如果没有，请写信给自由软件基金会, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA." + STRING_LICENSE "本程序为自由软件; 您可以根据自由软件基金会发布的 GNU 通用公共许可证许可证的第 2 版，或（根据您的选择）任何更高版本的条款进行重新分发和修改它。\r\n\r\n本程序的发布是希望它有用，但没有任何担保; 甚至没有适销性或特定用途适用性的暗示保证。有关详细信息，请参阅 GNU 通用公共许可证。\r\n\r\n您应该已收到 GNU 通用公共许可证的副本以及本程序; 如果没有，请写信给 the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA。" END STRINGTABLE diff --git a/base/applications/rapps/lang/zh-CN.rc b/base/applications/rapps/lang/zh-CN.rc index 9d452ae1f7..40ec00756d 100644 --- a/base/applications/rapps/lang/zh-CN.rc +++ b/base/applications/rapps/lang/zh-CN.rc @@ -1,5 +1,5 @@ /* Translated by Song Fuchang (0xfc) <sfc_0(a)yahoo.com.cn> */ -/* Imporved by Li Keqing <auroracloud4096(a)gmail.com> */ +/* Imporved by Li Keqing <auroracloud4096(a)gmail.com>, Luo Yufan (njlyf2011(a)hotmail.com) */ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED IDR_MAINMENU MENU @@ -67,7 +67,7 @@ BEGIN LTEXT "下载文件夹: ", -1, 16, 75, 100, 9 EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | ES_AUTOHSCROLL PUSHBUTTON "选择(&C)", IDC_CHOOSE, 187, 85, 50, 14 - AUTOCHECKBOX "在安装完程序后删除安装程序(&D)", IDC_DEL_AFTER_INSTALL, 16, 100, 218, 12 + AUTOCHECKBOX "在安装程序完成后删除安装程序(&D)", IDC_DEL_AFTER_INSTALL, 16, 100, 218, 12 GROUPBOX "代理服务器", -1, 4, 116, 240, 76 CONTROL "使用系统代理设置", IDC_PROXY_DEFAULT, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 130, 210, 10 CONTROL "直连 (无代理）", IDC_NO_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 145, 210, 10 @@ -213,7 +213,7 @@ BEGIN IDS_SELECT_ALL "全选/全反选" IDS_INSTALL_SELECTED "安装已选中的" IDS_SELECTEDFORINST "选中以安装" - IDS_MISMATCH_CERT_INFO "使用的证书是未知的:\n主题: %s\n发行方: %s\n您是否仍然想继续？" + IDS_MISMATCH_CERT_INFO "所使用的证书未知:\n主题: %s\n发行方: %s\n您是否仍然想继续？" END STRINGTABLE diff --git a/base/shell/explorer/lang/zh-CN.rc b/base/shell/explorer/lang/zh-CN.rc index 25cdb9ea14..0873deaca6 100644 --- a/base/shell/explorer/lang/zh-CN.rc +++ b/base/shell/explorer/lang/zh-CN.rc @@ -112,7 +112,7 @@ EXSTYLE WS_EX_CONTEXTHELP CAPTION "自定义通知" FONT 9, "宋体" BEGIN - LTEXT "ReactOS 显示图标为活跃和紧急通知，并隐藏不活动的。您可以更改此行为下面列表中的项目。", IDC_STATIC, 6, 6, 220, 30 + LTEXT "ReactOS 显示活动和紧急通知的图标，并隐藏不活动的通知。您可以更改以下列表中的项目的此行为。", IDC_STATIC, 6, 6, 220, 30 LTEXT "选择一个项目，然后选择它的通知行为:", IDC_STATIC, 6, 40, 220, 10 CONTROL "", IDC_NOTIFICATION_LIST, "SysListView32", WS_CLIPSIBLINGS | WS_BORDER | 0x00008005, 6, 50, 220, 128 COMBOBOX IDC_NOTIFICATION_BEHAVIOUR, 103, 178, 78, 200, CBS_DROPDOWNLIST | NOT WS_VISIBLE | WS_CLIPSIBLINGS @@ -128,7 +128,7 @@ FONT 9, "宋体" BEGIN 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 @@ -144,13 +144,13 @@ 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 PUSHBUTTON "重命名(&R)", IDC_FILE_RENAME, 159, 60, 50, 14 LTEXT "", IDC_STATIC, 7, 51, 258, 1, NOT WS_GROUP - AUTOCHECKBOX "不执行此检查启动时(&D)", IDC_NOTCHECK, 7, 62, 139, 10 + 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 END @@ -161,7 +161,7 @@ CAPTION "高级" FONT 9, "宋体" BEGIN GROUPBOX "开始菜单设置 ", IDC_STATIC, 7, 7, 238, 42 - AUTOCHECKBOX "与我的鼠标上他们暂停时打开子菜单(&O)", IDC_AUTOOPEN, 14, 21, 224, 10 + 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 @@ -206,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/base/system/winlogon/lang/zh-CN.rc b/base/system/winlogon/lang/zh-CN.rc index dbdc737742..4ede506c99 100644 --- a/base/system/winlogon/lang/zh-CN.rc +++ b/base/system/winlogon/lang/zh-CN.rc @@ -15,10 +15,10 @@ END IDD_GINALOADFAILED DIALOGEX 58, 83, 231, 119 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "用户界面失败" +CAPTION "用户界面加载失败" FONT 9, "宋体" BEGIN - LTEXT "加载登录用户界面的 DLL 文件 %s 失败。", IDC_GINALOADFAILED, 39, 16, 156, 24 + LTEXT "加载登录用户界面的 DLL 文件 %s 启动失败。", IDC_GINALOADFAILED, 39, 16, 156, 24 LTEXT "请与系统管理员联系，以替换 DLL 文件，或还原初始的 DLL。", IDC_GINALOADFAILEDCONTACT, 39, 53, 151, 25 DEFPUSHBUTTON "重新启动(&R)", 1, 80, 91, 68, 14 END @@ -29,7 +29,7 @@ CAPTION "关机" FONT 9, "宋体" BEGIN ICON IDI_WARNING, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20 - LTEXT "系统关机指令已经下达。请保存您的工作内容并注销此次会话。系统关机时，一切未保存的工作内容将会丢失。", -1, 38, 7, 135, 40 + LTEXT "已启动系统关闭。请保存所有工作并终止会话。系统关闭时，所有未保存的工作都将丢失。", -1, 38, 7, 135, 40 LTEXT "系统将在以下时间内关机：", -1, 38, 50, 90, 8 LTEXT "00:00:00", IDC_SYSSHUTDOWNTIMELEFT, 132, 50, 41, 8 LTEXT "附加信息：", -1, 38, 65, 135, 8 diff --git a/boot/freeldr/fdebug/lang/zh-CN.rc b/boot/freeldr/fdebug/lang/zh-CN.rc index 6351f6f095..96a2f9cff8 100644 --- a/boot/freeldr/fdebug/lang/zh-CN.rc +++ b/boot/freeldr/fdebug/lang/zh-CN.rc @@ -82,5 +82,5 @@ END STRINGTABLE BEGIN - IDS_LICENSE "本程序为自由软件; 您可以根据自由软件基金会发布的 GNU 通用公共许可证第 2 版或您选择的更高版本中的条款重新分发或修改它\r\n\r\n本程序之所以分发是希望其有用，但不提供任何担保。有关详细信息，请参阅 GNU 通用公共许可证。\r\n\r\n您应该伴随此程序收到了 GPL 许可证的副本，如果没有，请写信给 Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA。" + IDS_LICENSE "本程序为自由软件; 您可以根据自由软件基金会发布的 GNU 通用公共许可证许可证的第 2 版，或（根据您的选择）任何更高版本的条款进行重新分发和修改它。\r\n\r\n本程序的发布是希望它有用，但没有任何担保; 甚至没有适销性或特定用途适用性的暗示保证。有关详细信息，请参阅 GNU 通用公共许可证。\r\n\r\n您应该已收到 GNU 通用公共许可证的副本以及本程序; 如果没有，请写信给 the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA。" END diff --git a/dll/cpl/sysdm/lang/zh-CN.rc b/dll/cpl/sysdm/lang/zh-CN.rc index 8b6597de28..4dbe284a90 100644 --- a/dll/cpl/sysdm/lang/zh-CN.rc +++ b/dll/cpl/sysdm/lang/zh-CN.rc @@ -1,5 +1,5 @@ /* Simplified Chinese translation by Jingjing Fu (jingjingf AT 188.com) 2009-05-02 */ -/* Improved by Luo Yufan (njlyf2011(a)hotmail.com) */ +/* Translation has been changed by Luo Yufan (njlyf2011(a)hotmail.com) */ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED @@ -33,7 +33,7 @@ FONT 9, "宋体", 0, 0, 0x0 BEGIN GROUPBOX "设备管理器", IDC_STATIC, 6, 7, 244, 61 ICON IDI_DEVMGR, IDC_STATIC, 12, 18, 23, 21, SS_ICON - LTEXT "设备管理器列出所有安装在计算机上的硬件设备。请使用设备管理器来更改设备的属性。", IDC_STATIC, 42, 18, 204, 24 + LTEXT "设备管理器列出了计算机上安装的所有硬件设备。使用“设备管理器”可以更改任何设备的属性。", IDC_STATIC, 42, 18, 204, 24 PUSHBUTTON "设备管理器(&D)...", IDC_HARDWARE_DEVICE_MANAGER, 154, 48, 90, 15 GROUPBOX "添加硬件向导", IDC_STATIC, 6, 79, 244, 61 ICON IDI_ADDHW, IDC_STATIC, 12, 90, 23, 21, SS_ICON @@ -41,7 +41,7 @@ BEGIN PUSHBUTTON "添加硬件向导(&H)", IDC_HARDWARE_WIZARD, 154, 120, 90, 15 GROUPBOX "硬件配置文件", IDC_STATIC, 6, 149, 244, 61 ICON IDI_HARDPROF, IDC_STATIC, 12, 160, 23, 21, SS_ICON - LTEXT "硬件配置文件向您提供建立和保存不同硬件配置的方法。", IDC_STATIC, 42, 160, 204, 24 + LTEXT "硬件配置文件为您提供了一种设置和存储不同硬件配置的方法。", IDC_STATIC, 42, 160, 204, 24 PUSHBUTTON "硬件配置文件(&W)...", IDC_HARDWARE_PROFILE, 154, 190, 90, 15 END @@ -50,12 +50,12 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "高级" FONT 9, "宋体", 0, 0, 0x0 BEGIN - LTEXT "要进行大多数改动，您必须作为管理员登录。", IDC_STATIC, 12, 5, 236, 8 + LTEXT "大多数这些设置都需要管理员权限。", IDC_STATIC, 12, 5, 236, 8 GROUPBOX "性能", IDC_STATIC, 6, 18, 244, 50 - LTEXT "性能选项控制应用程序如何使用内存。这将会影响到计算机运行速度。", IDC_STATIC, 16, 29, 228, 17 + LTEXT "性能选项控制应用程序如何使用内存，这会影响计算机的运行速度。", IDC_STATIC, 16, 29, 228, 17 PUSHBUTTON "设置", IDC_PERFOR, 194, 48, 50, 15 GROUPBOX "用户配置文件", IDC_STATIC, 6, 75, 244, 48 - LTEXT "与您登录相关的桌面设置", IDC_STATIC, 16, 88, 228, 20 + LTEXT "与登录有关的桌面设置", IDC_STATIC, 16, 88, 228, 20 PUSHBUTTON "设置", IDC_USERPROFILE, 194, 103, 50, 15 GROUPBOX "启动和故障恢复", IDC_STATIC, 6, 131, 244, 52 LTEXT "启动和故障恢复选项指定计算机如何启动并设定系统失败时所需要采取的动作。", IDC_STATIC, 16, 144, 228, 19 @@ -71,7 +71,7 @@ CAPTION "系统设置" FONT 9, "宋体", 0, 0, 0x1 BEGIN GROUPBOX "版本信息", IDC_STATIC, 6, 3, 210, 73 - LTEXT "ReactOS 作为服务器操作系统而被构建，并如此被报告。选中此框可更改（仅对于应用程序有效）。", IDC_STATIC, 15, 15, 183, 41 + LTEXT "ReactOS 作为服务器操作系统被构建，并如此被报告。选中此框可更改（仅对于应用程序有效）。", IDC_STATIC, 15, 15, 183, 41 CONTROL "报告为工作站(&R)", IDC_REPORTASWORKSTATION, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 16, 57, 190, 10 PUSHBUTTON "确定", IDOK, 166, 83, 50, 14 END diff --git a/dll/shellext/netshell/lang/zh-CN.rc b/dll/shellext/netshell/lang/zh-CN.rc index 79f41bd0a0..0a9dff8f10 100644 --- a/dll/shellext/netshell/lang/zh-CN.rc +++ b/dll/shellext/netshell/lang/zh-CN.rc @@ -18,7 +18,7 @@ BEGIN LTEXT "连接时使用:", -1, 9, 9, 217, 8 EDITTEXT IDC_NETCARDNAME, 9, 21, 230, 12, WS_BORDER | WS_TABSTOP | ES_READONLY PUSHBUTTON "配置(&C)", IDC_CONFIGURE, 189, 38, 50, 14 - LTEXT "此连接使用选中的组件:", -1, 9, 59, 217, 8 + LTEXT "选中的组件由此连接使用:", -1, 9, 59, 217, 8 PUSHBUTTON "安装(&I)", IDC_INSTALL, 9, 130, 65, 14, WS_DISABLED | WS_TABSTOP PUSHBUTTON "卸载(&U)", IDC_UNINSTALL, 90, 130, 65, 14, WS_DISABLED | WS_TABSTOP PUSHBUTTON "属性(&P)", IDC_PROPERTIES, 174, 130, 65, 14 @@ -60,7 +60,7 @@ END IDD_LAN_NETSTATUSADVANCED DIALOGEX 0, 0, 200, 180 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "维持" +CAPTION "支持" FONT 9, "宋体" BEGIN GROUPBOX "连接状态", -1, 9, 8, 190, 88, BS_GROUPBOX @@ -91,11 +91,11 @@ CAPTION "ReactOS 安装程序" FONT 9, "宋体" BEGIN ICON IDI_NET_SETUP, IDC_STATIC, 21, 10, 20, 20 - LTEXT "选择使用典型设置还是自定义设置:", IDC_STATIC, 53, 7, 240, 20 + LTEXT "请选择使用典型设置还是自定义设置:", IDC_STATIC, 53, 7, 240, 20 AUTORADIOBUTTON "典型设置", IDC_NETWORK_TYPICAL, 53, 27, 253, 20, WS_TABSTOP | WS_GROUP AUTORADIOBUTTON "自定义设置", IDC_NETWORK_CUSTOM, 53, 72, 253, 20, WS_TABSTOP - LTEXT "使用 “ReactOS 网络客户端”、“ReactOS 网络的文件和打印共享”和自动寻址的 TCP/IP 传输协议来创建网络连接。", IDC_STATIC, 65, 45, 240, 30 - LTEXT "允许手动配置网络组件。", IDC_STATIC, 65, 90, 243, 20 + LTEXT "使用 ReactOS 网络客户端，ReactOS 网络的文件和打印共享以及具有自动寻址功能的 TCP/IP 传输协议创建网络连接。", IDC_STATIC, 65, 45, 240, 30 + LTEXT "允许您手动配置网络组件。", IDC_STATIC, 65, 90, 243, 20 END IDD_NETWORKCOMPONENTPAGE DIALOGEX 0, 0, 317, 143 @@ -118,13 +118,13 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "ReactOS 安装程序" FONT 9, "宋体" BEGIN - LTEXT "您想让这个计算机成为域成员吗?\n\ -(您可能需要从网络管理员那里获得该信息。)", IDC_STATIC, 33, 2, 263, 50 - AUTORADIOBUTTON "不,这台计算机将成为工作组成员。", IDC_SELECT_WORKGROUP, 33, 32, 253, 20, WS_TABSTOP | WS_GROUP - AUTORADIOBUTTON "是,这台计算机将成为域成员。", IDC_SELECT_DOMAIN, 33, 47, 253, 20, WS_TABSTOP + LTEXT "您是否希望此计算机成为域的成员？\n\ +(您可以从网络管理员处获取此信息。)", IDC_STATIC, 33, 2, 263, 50 + AUTORADIOBUTTON "不，这台计算机将成为工作组的一部分。", IDC_SELECT_WORKGROUP, 33, 32, 253, 20, WS_TABSTOP | WS_GROUP + AUTORADIOBUTTON "是的，这台计算机将成为域的一部分。", IDC_SELECT_DOMAIN, 33, 47, 253, 20, WS_TABSTOP LTEXT "工作组或域名称:", IDC_STATIC, 33, 72, 126, 14 EDITTEXT IDC_DOMAIN_NAME, 33, 82, 126, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "注意: 如果您的计算机选择不成为网络的一部分,您将没有权限加入域,如果您不知道应该选择什么,那么请现在加入工作组。这些选项可以在以后更改。", IDC_STATIC, 33, 107, 263, 50 + LTEXT "注意：如果此计算机不是网络的一部分，您没有足够的权限加入域，或者您不知道要输入什么，那么现在就选择工作组。这些选项可以在以后更改。", IDC_STATIC, 33, 107, 263, 50 END STRINGTABLE @@ -134,7 +134,7 @@ BEGIN IDS_SUBNET_MASK "子网掩码" IDS_DEF_GATEWAY "默认网关" IDS_DHCP_SERVER "DHCP 服务器" - IDS_LEASE_OBTAINED "获得了租约" + IDS_LEASE_OBTAINED "已获得租约" IDS_LEASE_EXPIRES "租约过期" IDS_DNS_SERVERS "DNS 服务器" IDS_WINS_SERVERS "WINS 服务器" @@ -175,7 +175,7 @@ END STRINGTABLE BEGIN IDS_NETWORKSETTINGSTITLE "网络设置" - IDS_NETWORKSETTINGSSUBTITLE "安装用于连接其他网络、计算机和 Internet 的网络软件。 " + IDS_NETWORKSETTINGSSUBTITLE "安装用于连接其他网络、计算机和 Internet 的网络软件。" IDS_NETWORKCOMPONENTTITLE "网络组件" IDS_NETWORKCOMPONENTSUBTITLE "确定计算机上使用的网络组件。若要添加新组件，请单击“安装”。" IDS_NETWORKDOMAINTITLE "工作组或计算机域" diff --git a/dll/win32/devmgr/lang/zh-CN.rc b/dll/win32/devmgr/lang/zh-CN.rc index 9af8f4addc..3cd8c4701a 100644 --- a/dll/win32/devmgr/lang/zh-CN.rc +++ b/dll/win32/devmgr/lang/zh-CN.rc @@ -1,5 +1,5 @@ /* Simplified 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_SIMPLIFIED STRINGTABLE @@ -253,7 +253,7 @@ BEGIN BEGIN MENUITEM "关闭(&X)", IDC_EXIT END - MENUITEM "行动", IDC_ACTIONMENU + MENUITEM "操作", IDC_ACTIONMENU POPUP "视图" BEGIN MENUITEM "按类型设备", IDC_DEVBYTYPE diff --git a/dll/win32/syssetup/lang/zh-CN.rc b/dll/win32/syssetup/lang/zh-CN.rc index 48c6e84d5b..12ddbc5e50 100644 --- a/dll/win32/syssetup/lang/zh-CN.rc +++ b/dll/win32/syssetup/lang/zh-CN.rc @@ -60,19 +60,19 @@ CAPTION "ReactOS 安装程序 " FONT 9, "宋体" BEGIN ICON IDI_ICON4, IDC_STATIC, 21, 7, 20, 20 - LTEXT "系统区域用于设置应用使用的语言，用户区域用于设置数值，货币，日期的显示方式 ", IDC_STATIC, 53, 7, 253, 20 + LTEXT "系统区域设置应与您要使用的应用程序的语言相匹配。用户区域设置控制数字，货币和日期的显示方式。", IDC_STATIC, 53, 7, 253, 20 LTEXT "", IDC_LOCALETEXT, 53, 29, 250, 16 - LTEXT "要更改系统和用户的区域设置，请单击 “自定义” 。", IDC_STATIC, 53, 60, 184, 8 + LTEXT "想要更改系统和用户的区域设置，请单击 “自定义” 。", IDC_STATIC, 53, 60, 184, 8 PUSHBUTTON "自定义(&C)...", IDC_CUSTOMLOCALE, 245, 57, 50, 14 LTEXT "“文字输入语言”让您使用多种输入方法和设备用\r\n许多不同的语言输入文字。", IDC_STATIC, 53, 86, 253, 20 LTEXT "", IDC_LAYOUTTEXT, 53, 100, 250, 16 - LTEXT "要查看或改变当前配置，请单击“自定义”。", IDC_STATIC, 53, 124, 184, 8 + LTEXT "想要查看或改变当前配置，请单击“自定义”。", IDC_STATIC, 53, 124, 184, 8 PUSHBUTTON "自定义(&U)...", IDC_CUSTOMLAYOUT, 245, 120, 50, 14 END IDD_DATETIMEPAGE 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 ICON IDI_ICON3, IDC_STATIC, 21, 10, 20, 20 @@ -81,7 +81,7 @@ BEGIN CONTROL "", IDC_TIMEPICKER, "SysDateTimePick32", DTS_TIMEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 200, 17, 54, 14 LTEXT "时间区域", IDC_STATIC, 53, 42, 253, 8 COMBOBOX IDC_TIMEZONELIST, 53, 52, 201, 93, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL - AUTOCHECKBOX "夏时制自动调整时间(&D)", IDC_AUTODAYLIGHT, 53, 124, 201, 10 + AUTOCHECKBOX "夏令时自动调整时间(&D)", IDC_AUTODAYLIGHT, 53, 124, 201, 10 END IDD_THEMEPAGE DIALOGEX 0, 0, 317, 143 @@ -89,7 +89,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "ReactOS 安装程序" FONT 9, "宋体" BEGIN - PUSHBUTTON "磊灿", IDC_THEMEDSTYLE, 18,7,130,130, BS_AUTORADIOBUTTON|BS_PUSHLIKE + PUSHBUTTON "Lautus", IDC_THEMEDSTYLE, 18,7,130,130, BS_AUTORADIOBUTTON|BS_PUSHLIKE PUSHBUTTON "经典主题", IDC_CLASSICSTYLE, 175,7,130,130, BS_AUTORADIOBUTTON|BS_PUSHLIKE END diff --git a/media/inf/shortcuts.inf b/media/inf/shortcuts.inf index fc4443c9d8..3f416df53c 100644 --- a/media/inf/shortcuts.inf +++ b/media/inf/shortcuts.inf @@ -1479,14 +1479,14 @@ EXPLORER_TITLE=ReactOS 资源管理器 EXPLORER_DESC=ReactOS 资源管理器 RAPPS_TITLE=ReactOS 应用程序管理器 RAPPS_TITLE_SHORT=应用程序管理器 -RAPPS_DESC=下载并安装其他应用程序 +RAPPS_DESC=下载并安装其它应用程序 SERVMAN_TITLE=服务 SERVMAN_DESC=服务 DEVMGMT_TITLE=设备管理器 DEVMGMT_DESC=设备管理器 EVENTVWR_TITLE=事件查看器 EVENTVWR_DESC=启动事件查看器 -MSCONFIG_TITLE=系统配置 +MSCONFIG_TITLE=系统配置程序 MSCONFIG_DESC=启动系统配置程序 CALC_TITLE=计算器 CALC_DESC=计算器 @@ -1512,8 +1512,8 @@ MAGNIFY_TITLE=放大镜 MAGNIFY_DESC=放大镜 OSK_TITLE=屏幕键盘 OSK_DESC=启动屏幕键盘 -MPLAY_TITLE=多媒体播放器 -MPLAY_DESC=启动多媒体播放器 +MPLAY_TITLE=媒体播放器 +MPLAY_DESC=启动媒体播放器 SNDVOL_TITLE=音量控制 SNDVOL_DESC=启动音量控制 SNDREC32_TITLE=录音机 diff --git a/media/themes/lautus.msstyles/lang/zh-CN.rc b/media/themes/lautus.msstyles/lang/zh-CN.rc index 1e154943ab..8bf9130954 100644 --- a/media/themes/lautus.msstyles/lang/zh-CN.rc +++ b/media/themes/lautus.msstyles/lang/zh-CN.rc @@ -5,12 +5,12 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED STRINGTABLE { -1000, "亚特" +1000, "Ater" } STRINGTABLE { -2000, "磊灿亚特" +2000, "Lautus Ater" } STRINGTABLE @@ -29,12 +29,12 @@ STRINGTABLE STRINGTABLE { -5000, "磊灿" +5000, "Lautus" 5001, "视觉样式" 5002, "ReactOS 基金会" 5003, "Pisarz, 基于 Luna Inspirat 项目" 5004, "基于 GNU/GPL 2.0，于 2011 年发行" 5005, "http://www.reactos.org" 5006, "版本 1.0" -5007, "ReactOS 的视觉样式" +5007, "ReactOS 视觉样式" } \ No newline at end of file diff --git a/media/themes/modern.msstyles/lang/zh-CN.rc b/media/themes/modern.msstyles/lang/zh-CN.rc index 96d9348078..adc995191b 100644 --- a/media/themes/modern.msstyles/lang/zh-CN.rc +++ b/media/themes/modern.msstyles/lang/zh-CN.rc @@ -1,18 +1,18 @@ /* Simplified Chinese translation by Henry Tang Ih 2015 (henrytang2(a)hotmail.com) */ -/* Improved by Luo Yufan (njlyf2011(a)hotmail.com) */ +/* Translation has been changed by Luo Yufan 2018 (njlyf2011(a)hotmail.com) */ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED STRINGTABLE { -1000, "亚白" -1001, "黑暗" +1000, "亮色" +1001, "深色" } STRINGTABLE { -2000, "???" -2001, "???" +2000, "Modern（亮色）" +2001, "Modern（深色）" } STRINGTABLE @@ -31,12 +31,12 @@ STRINGTABLE STRINGTABLE { -5000, "现在" +5000, "Modern" 5001, "视觉样式" 5002, "ReactOS 基金会" -5003, "Polar, 基于 Win10 项目" +5003, "Polar, 基于 Win10 的项目" 5004, "基于 GNU/GPL 3.0，于 2018 年发行" 5005, "http://www.reactos.org" 5006, "版本 1.0" -5007, "ReactOS 的视觉样式" +5007, "ReactOS 视觉样式" }

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