Ros-diffs April 2018

ros-diffs@reactos.org

26 participants
247 discussions

by Alexander Shaposhnikov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3261bbb7b95e60b9ce2d5… commit 3261bbb7b95e60b9ce2d5dd23342a8b91659e6af Author: Alexander Shaposhnikov <sanchaez(a)reactos.org> AuthorDate: Mon Apr 2 23:51:35 2018 +0300 Commit: Alexander Shaposhnikov <sanchaez(a)reactos.org> CommitDate: Mon Apr 2 23:55:05 2018 +0300 [RAPPS] Fix FTP downloads --- base/applications/rapps/loaddlg.cpp | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/base/applications/rapps/loaddlg.cpp b/base/applications/rapps/loaddlg.cpp index 5c8d6c217f..d8f659b219 100644 --- a/base/applications/rapps/loaddlg.cpp +++ b/base/applications/rapps/loaddlg.cpp @@ -719,15 +719,6 @@ DWORD WINAPI CDownloadManager::ThreadFunc(LPVOID param) goto end; } - if (!HttpQueryInfoW(hFile, HTTP_QUERY_STATUS_CODE | HTTP_QUERY_FLAG_NUMBER, &dwStatus, &dwStatusLen, NULL)) - goto end; - - if (dwStatus != HTTP_STATUS_OK) - { - MessageBox_LoadString(hMainWnd, IDS_UNABLE_TO_DOWNLOAD); - goto end; - } - dwStatusLen = sizeof(dwStatus); memset(&urlComponents, 0, sizeof(urlComponents)); @@ -745,10 +736,25 @@ DWORD WINAPI CDownloadManager::ThreadFunc(LPVOID param) dwContentLen = 0; if (urlComponents.nScheme == INTERNET_SCHEME_HTTP || urlComponents.nScheme == INTERNET_SCHEME_HTTPS) - HttpQueryInfoW(hFile, HTTP_QUERY_CONTENT_LENGTH | HTTP_QUERY_FLAG_NUMBER, &dwContentLen, &dwStatusLen, 0); + { + // query connection + if (!HttpQueryInfoW(hFile, HTTP_QUERY_STATUS_CODE | HTTP_QUERY_FLAG_NUMBER, &dwStatus, &dwStatusLen, NULL)) + goto end; + + if (dwStatus != HTTP_STATUS_OK) + { + MessageBox_LoadString(hMainWnd, IDS_UNABLE_TO_DOWNLOAD); + goto end; + } + + // query content length + HttpQueryInfoW(hFile, HTTP_QUERY_CONTENT_LENGTH | HTTP_QUERY_FLAG_NUMBER, &dwContentLen, &dwStatusLen, NULL); + } if (urlComponents.nScheme == INTERNET_SCHEME_FTP) + { dwContentLen = FtpGetFileSize(hFile, &dwStatus); + } if (!dwContentLen) {

6 years, 8 months

01/01: [EXPLORER] Handle WM_CONTEXTMENU message in CNotifyToolbar and BN_CLICKED notification in CSysPagerWnd.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4127024b0d7ef28e041fa… commit 4127024b0d7ef28e041fa61896b3eadcafd2fe36 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Mon Apr 2 21:06:09 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Apr 2 21:13:35 2018 +0200 [EXPLORER] Handle WM_CONTEXTMENU message in CNotifyToolbar and BN_CLICKED notification in CSysPagerWnd. With these, we generate the WM_CONTEXTMENU and NIN_(KEY)SELECT shell icon notifications that applications expect when they handle shell notification icons with uVersion >= 3. This fixes in particular the previously unresponsive icon of KVIrc 4.x, and more generally *all* the notifiation icons of Qt applications. CORE-10605 #resolve --- base/shell/explorer/syspager.cpp | 110 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 105 insertions(+), 5 deletions(-) diff --git a/base/shell/explorer/syspager.cpp b/base/shell/explorer/syspager.cpp index 5340ba4921..1755ebedde 100644 --- a/base/shell/explorer/syspager.cpp +++ b/base/shell/explorer/syspager.cpp @@ -165,12 +165,14 @@ public: bool SendNotifyCallback(InternalIconData* notifyItem, UINT uMsg); private: + LRESULT OnCtxMenu(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); VOID SendMouseEvent(IN WORD wIndex, IN UINT uMsg, IN WPARAM wParam); LRESULT OnMouseEvent(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnTooltipShow(INT uCode, LPNMHDR hdr, BOOL& bHandled); public: BEGIN_MSG_MAP(CNotifyToolbar) + MESSAGE_HANDLER(WM_CONTEXTMENU, OnCtxMenu) MESSAGE_RANGE_HANDLER(WM_MOUSEFIRST, WM_MOUSELAST, OnMouseEvent) NOTIFY_CODE_HANDLER(TTN_SHOW, OnTooltipShow) END_MSG_MAP() @@ -201,6 +203,7 @@ public: LRESULT OnDestroy(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnGetInfoTip(INT uCode, LPNMHDR hdr, BOOL& bHandled); LRESULT OnCustomDraw(INT uCode, LPNMHDR hdr, BOOL& bHandled); + LRESULT OnCommand(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnSize(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnCtxMenu(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnBalloonPop(UINT uCode, LPNMHDR hdr, BOOL& bHandled); @@ -240,6 +243,7 @@ public: MESSAGE_HANDLER(WM_CREATE, OnCreate) MESSAGE_HANDLER(WM_DESTROY, OnDestroy) MESSAGE_HANDLER(WM_ERASEBKGND, OnEraseBackground) + MESSAGE_HANDLER(WM_COMMAND, OnCommand) MESSAGE_HANDLER(WM_SIZE, OnSize) MESSAGE_HANDLER(WM_CONTEXTMENU, OnCtxMenu) MESSAGE_HANDLER(WM_TIMER, OnTimer) @@ -1015,6 +1019,54 @@ VOID CNotifyToolbar::ResizeImagelist() SetButtonSize(GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON)); } +LRESULT CNotifyToolbar::OnCtxMenu(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) +{ + bHandled = FALSE; + + /* + * WM_CONTEXTMENU message can be generated either by the mouse, + * in which case lParam encodes the mouse coordinates where the + * user right-clicked the mouse, or can be generated by (Shift-)F10 + * keyboard press, in which case lParam equals -1. + */ + INT iBtn = GetHotItem(); + if (iBtn < 0) + return 0; + + InternalIconData* notifyItem = GetItemData(iBtn); + + if (!::IsWindow(notifyItem->hWnd)) + return 0; + + if (notifyItem->uVersionCopy >= NOTIFYICON_VERSION) + { + /* Transmit the WM_CONTEXTMENU message if the notification icon supports it */ + ::SendNotifyMessage(notifyItem->hWnd, + notifyItem->uCallbackMessage, + notifyItem->uID, + WM_CONTEXTMENU); + } + else if (lParam == -1) + { + /* + * Otherwise, and only if the WM_CONTEXTMENU message was generated + * from the keyboard, simulate right-click mouse messages. This is + * not needed if the message came from the mouse because in this + * case the right-click mouse messages were already sent together. + */ + ::SendNotifyMessage(notifyItem->hWnd, + notifyItem->uCallbackMessage, + notifyItem->uID, + WM_RBUTTONDOWN); + ::SendNotifyMessage(notifyItem->hWnd, + notifyItem->uCallbackMessage, + notifyItem->uID, + WM_RBUTTONUP); + } + + return 0; +} + bool CNotifyToolbar::SendNotifyCallback(InternalIconData* notifyItem, UINT uMsg) { if (!::IsWindow(notifyItem->hWnd)) @@ -1045,10 +1097,10 @@ bool CNotifyToolbar::SendNotifyCallback(InternalIconData* notifyItem, UINT uMsg) } else { - SendMessage(notifyItem->hWnd, - notifyItem->uCallbackMessage, - notifyItem->uID, - uMsg); + ::SendMessage(notifyItem->hWnd, + notifyItem->uCallbackMessage, + notifyItem->uID, + uMsg); } return false; } @@ -1087,7 +1139,6 @@ VOID CNotifyToolbar::SendMouseEvent(IN WORD wIndex, IN UINT uMsg, IN WPARAM wPar LRESULT CNotifyToolbar::OnMouseEvent(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { POINT pt = { GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam) }; - INT iBtn = HitTest(&pt); if (iBtn >= 0) @@ -1376,6 +1427,55 @@ LRESULT CSysPagerWnd::OnCustomDraw(INT uCode, LPNMHDR hdr, BOOL& bHandled) return TRUE; } +LRESULT CSysPagerWnd::OnCommand(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) +{ + bHandled = FALSE; + + /* Handles the BN_CLICKED notifications sent by the CNotifyToolbar member */ + if (HIWORD(wParam) != BN_CLICKED) + return 0; + + INT iBtn = LOWORD(wParam); + if (iBtn < 0) + return 0; + + InternalIconData* notifyItem = Toolbar.GetItemData(iBtn); + + if (!::IsWindow(notifyItem->hWnd)) + return 0; + + // TODO: Improve keyboard handling by looking whether one presses + // on ENTER, etc..., which roughly translates into "double-clicking". + + if (notifyItem->uVersionCopy >= NOTIFYICON_VERSION) + { + /* Use new-style notifications if the notification icon supports them */ + ::SendNotifyMessage(notifyItem->hWnd, + notifyItem->uCallbackMessage, + notifyItem->uID, + NIN_SELECT); // TODO: Distinguish with NIN_KEYSELECT + } + else if (lParam == -1) + { + /* + * Otherwise, and only if the icon was selected via the keyboard, + * simulate right-click mouse messages. This is not needed if the + * selection was done by mouse because in this case the mouse + * messages were already sent. + */ + ::SendNotifyMessage(notifyItem->hWnd, + notifyItem->uCallbackMessage, + notifyItem->uID, + WM_LBUTTONDOWN); // TODO: Distinguish with double-click WM_LBUTTONDBLCLK + ::SendNotifyMessage(notifyItem->hWnd, + notifyItem->uCallbackMessage, + notifyItem->uID, + WM_LBUTTONUP); + } + + return 0; +} + LRESULT CSysPagerWnd::OnSize(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { LRESULT Ret = TRUE;

6 years, 8 months

01/01: [RAPPS] Update rapps .cab download link

by Alexander Shaposhnikov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bb819f1528f078a9ac7b9… commit bb819f1528f078a9ac7b91c32e058e1d05f05052 Author: Alexander Shaposhnikov <sanchaez(a)reactos.org> AuthorDate: Mon Apr 2 21:00:10 2018 +0300 Commit: Alexander Shaposhnikov <sanchaez(a)reactos.org> CommitDate: Mon Apr 2 22:11:11 2018 +0300 [RAPPS] Update rapps .cab download link This replaces old link to svn.reactos.org with rapps.reactos.org which is a new stable location for RAPPS database and future community website. That said, svn.reactos.org link will be kept for some time. TODO: make this a configurable value. CORE-14351 --- base/applications/rapps/include/defines.h | 2 +- base/applications/rapps/loaddlg.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/base/applications/rapps/include/defines.h b/base/applications/rapps/include/defines.h index 31feb26828..921391c5c7 100644 --- a/base/applications/rapps/include/defines.h +++ b/base/applications/rapps/include/defines.h @@ -29,7 +29,7 @@ #include "resource.h" #include "winmain.h" -#define APPLICATION_DATABASE_URL L"https://svn.reactos.org/packages/rappmgr.cab" +#define APPLICATION_DATABASE_URL L"https://rapps.reactos.org/rappmgr.cab" #define MAX_STR_LEN 256 enum AppsCategories diff --git a/base/applications/rapps/loaddlg.cpp b/base/applications/rapps/loaddlg.cpp index 30aa4a2f3c..5c8d6c217f 100644 --- a/base/applications/rapps/loaddlg.cpp +++ b/base/applications/rapps/loaddlg.cpp @@ -48,7 +48,7 @@ #ifdef USE_CERT_PINNING #define CERT_ISSUER_INFO "US\r\nLet's Encrypt\r\nLet's Encrypt Authority X3" -#define CERT_SUBJECT_INFO "svn.reactos.org" +#define CERT_SUBJECT_INFO "rapps.reactos.org" #endif enum DownloadStatus

6 years, 8 months

01/01: [WINLOGON] Fix shutdown timeout format string for long timeout

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3318d8d5be273f92f77bd… commit 3318d8d5be273f92f77bda4debd8b9cfa25ea599 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Mon Apr 2 18:52:47 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Mon Apr 2 19:09:13 2018 +0200 [WINLOGON] Fix shutdown timeout format string for long timeout - Use the "%d days" format for timeouts longer than a day. - Fail if timeout is 10 years or longer. - TODO: Replace format strings by resources. German WinXP uses "%d days" instead of "%d Tage". We can do better! ;-) --- base/system/winlogon/shutdown.c | 31 +++++++++++++++++++++++-------- 1 file changed, 23 insertions(+), 8 deletions(-) diff --git a/base/system/winlogon/shutdown.c b/base/system/winlogon/shutdown.c index d09368664a..42452ca067 100644 --- a/base/system/winlogon/shutdown.c +++ b/base/system/winlogon/shutdown.c @@ -16,6 +16,8 @@ /* DEFINES *******************************************************************/ #define SHUTDOWN_TIMER_ID 2000 +#define SECONDS_PER_DAY 86400 +#define SECONDS_PER_DECADE 315360000 /* STRUCTS *******************************************************************/ @@ -46,16 +48,25 @@ OnTimer( HWND hwndDlg, PSYS_SHUTDOWN_PARAMS pShutdownParams) { - WCHAR szBuffer[10]; - INT iSeconds, iMinutes, iHours; + WCHAR szBuffer[12]; + INT iSeconds, iMinutes, iHours, iDays; - iSeconds = (INT)pShutdownParams->dwTimeout; - iHours = iSeconds / 3600; - iSeconds -= iHours * 3600; - iMinutes = iSeconds / 60; - iSeconds -= iMinutes * 60; + if (pShutdownParams->dwTimeout < SECONDS_PER_DAY) + { + iSeconds = (INT)pShutdownParams->dwTimeout; + iHours = iSeconds / 3600; + iSeconds -= iHours * 3600; + iMinutes = iSeconds / 60; + iSeconds -= iMinutes * 60; + + swprintf(szBuffer, L"%02d:%02d:%02d", iHours, iMinutes, iSeconds); + } + else + { + iDays = (INT)(pShutdownParams->dwTimeout / SECONDS_PER_DAY); + swprintf(szBuffer, L"%d days", iDays); + } - swprintf(szBuffer, L"%02d:%02d:%02d", iHours, iMinutes, iSeconds); SetDlgItemTextW(hwndDlg, IDC_SYSSHUTDOWNTIMELEFT, szBuffer); if (pShutdownParams->dwTimeout == 0) @@ -185,6 +196,10 @@ StartSystemShutdown( { HANDLE hThread; + /* Fail if the timeout is 10 years or more */ + if (dwTimeout >= SECONDS_PER_DECADE) + return ERROR_INVALID_PARAMETER; + if (_InterlockedCompareExchange8((volatile char*)&g_ShutdownParams.bShuttingDown, TRUE, FALSE) == TRUE) return ERROR_SHUTDOWN_IN_PROGRESS;

6 years, 8 months

01/01: [TRACERT] Use ConUtils lib and update de-DE.rc CORE-14265

by Joachim Henze

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3d66048b162fe35002404… commit 3d66048b162fe350024045e50a1852b1f4bd1516 Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Mon Apr 2 18:10:31 2018 +0200 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Mon Apr 2 18:10:31 2018 +0200 [TRACERT] Use ConUtils lib and update de-DE.rc CORE-14265 Most likely this also improves formerly unprintable characters for fr-FR, it-IT, ro-RO, ru-RU, zh-CN. --- base/applications/network/tracert/CMakeLists.txt | 4 ++- base/applications/network/tracert/lang/de-DE.rc | 41 +++++++++++++----------- base/applications/network/tracert/tracert.cpp | 10 ++++-- 3 files changed, 34 insertions(+), 21 deletions(-) diff --git a/base/applications/network/tracert/CMakeLists.txt b/base/applications/network/tracert/CMakeLists.txt index 132f7fc6de..f1a3a58389 100644 --- a/base/applications/network/tracert/CMakeLists.txt +++ b/base/applications/network/tracert/CMakeLists.txt @@ -1,5 +1,7 @@ +include_directories(${REACTOS_SOURCE_DIR}/sdk/lib/conutils) add_executable(tracert tracert.cpp tracert.rc) set_module_type(tracert win32cui UNICODE) -add_importlibs(tracert ws2_32 iphlpapi user32 msvcrt kernel32 ntdll) +target_link_libraries(tracert conutils ${PSEH_LIB}) +add_importlibs(tracert ws2_32 iphlpapi msvcrt kernel32 ntdll) add_cd_file(TARGET tracert DESTINATION reactos/system32 FOR all) diff --git a/base/applications/network/tracert/lang/de-DE.rc b/base/applications/network/tracert/lang/de-DE.rc index dae8fce082..220d3a01d4 100644 --- a/base/applications/network/tracert/lang/de-DE.rc +++ b/base/applications/network/tracert/lang/de-DE.rc @@ -1,26 +1,31 @@ +/* + * FILE: base/applications/network/tracert/de-DE.rc + * PURPOSE: German translations for ReactOS Tracert Command + * TRANSLATORS: reactosfanboy <Joachim.Henze(a)reactos.org> + */ LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL STRINGTABLE BEGIN IDS_USAGE "\r\n\ -Usage: tracert [-d] [-h maximum_hops] [-j host-list] [-w timeout] target_name \r\n\r\n\ -Options:\r\n\ - -d Do not resolve addresses to hostnames.\r\n\ - -h maximum_hops Maximum number of hops to search for target.\r\n\ - -j host-list Loose source route along host-list.\r\n\ - -w timeout Wait timeout milliseconds for each reply.\r\n\ - -4 Force using IPv4.\r\n\ - -6 Force using IPv6.\r\n\ +Syntax: tracert [-d] [-h maximum_hops] [-j Hostliste] [-w Zeitlimit] Zielname \r\n\r\n\ +Optionen:\r\n\ + -d Adressen nicht in Hostnamen auflösen.\r\n\ + -h maximum_hops Maximale Sprunganzahl bei Zielsuche.\r\n\ + -j Hostliste 'Loose Source Route' gemäß Hostliste.\r\n\ + -w Zeitlimit Zeitlimit in Millisekunden für eine Antwort.\r\n\ + -4 erzwingt IPv4.\r\n\ + -6 erzwingt IPv6.\r\n\ \r\n" - IDS_INVALID_OPTION "%1 is not a valid command option.\r\n" - IDS_TRACE_INFO "\r\nTracing route to %1 [%2]\r\nover a maximum of %3!u! hops:\r\n\r\n" - IDS_TRACE_COMPLETE "\r\nTrace complete.\r\n" - IDS_UNABLE_RESOLVE "Unable to resolve target system name %1.\r\n" + IDS_INVALID_OPTION "%1 ist keine gültige Befehlsoption.\r\n" + IDS_TRACE_INFO "\r\nRoutenverfolgung zu %1 [%2]\r\nüber maximal %3!u! Hops:\r\n\r\n" + IDS_TRACE_COMPLETE "\r\nRoutenverfolgung beendet.\r\n" + IDS_UNABLE_RESOLVE "Der Zielname %1 konnte nicht aufgelöst werden.\r\n" - IDS_GEN_FAILURE "General failure.\r\n" - IDS_TRANSMIT_FAILED "Transmit failed. (Error %1!u!)\r\n" + IDS_GEN_FAILURE "Allgemeiner Fehler.\r\n" + IDS_TRANSMIT_FAILED "Übertragungsfehler. (Fehler %1!u!)\r\n" IDS_HOP_COUNT "%1!3lu! %0\r\n" IDS_HOP_TIME "%1!4lu! ms %0\r\n" @@ -29,9 +34,9 @@ Options:\r\n\ IDS_HOP_RES_INFO "%1 [%2]" IDS_HOP_IP_INFO "%1" IDS_LINEBREAK "\r\n" - IDS_REQ_TIMED_OUT "Request timed out.\r\n" - IDS_HOP_RESPONSE " reports: " - IDS_DEST_HOST_UNREACHABLE "Destination host unreachable.\r\n" - IDS_DEST_NET_UNREACHABLE "Destination network unreachable.\r\n" + IDS_REQ_TIMED_OUT "Zeitüberschreitung der Anforderung.\r\n" + IDS_HOP_RESPONSE " Antwort: " + IDS_DEST_HOST_UNREACHABLE "Zielhost nicht erreichbar.\r\n" + IDS_DEST_NET_UNREACHABLE "Zielnetz nicht erreichbar.\r\n" END diff --git a/base/applications/network/tracert/tracert.cpp b/base/applications/network/tracert/tracert.cpp index 1b52d56650..d90a78a52a 100644 --- a/base/applications/network/tracert/tracert.cpp +++ b/base/applications/network/tracert/tracert.cpp @@ -8,15 +8,16 @@ */ #ifdef __REACTOS__ +#define USE_CONUTILS #define WIN32_NO_STATUS #include <stdarg.h> #include <windef.h> #include <winbase.h> #include <winuser.h> #define _INC_WINDOWS -#include <stdio.h> #include <stdlib.h> #include <winsock2.h> +#include <conutils.h> #else #include <winsock2.h> #include <Windows.h> @@ -144,7 +145,7 @@ OutputText( return Ret; } #else -#define OutputText(Id, ...) ConResPrintf(StdOut, Id, __VA_ARGS__) +#define OutputText(Id, ...) ConResMsgPrintfEx(StdOut, NULL, 0, Id, MAKELANGID(LANG_NEUTRAL, SUBLANG_NEUTRAL), ##__VA_ARGS__) #endif //USE_CONUTILS static @@ -554,6 +555,11 @@ ParseCmdline(int argc, wchar_t *argv[]) EXTERN_C int wmain(int argc, wchar_t *argv[]) { +#ifdef USE_CONUTILS + /* Initialize the Console Standard Streams */ + ConInitStdStreams(); +#endif + Info.ResolveAddresses = true; Info.MaxHops = 30; Info.Timeout = 4000;

6 years, 8 months

01/01: [EXPLORER] Add missing 'break' statements. Spotted by mudhead. CORE-14518

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2f108ac8a87d460af611b… commit 2f108ac8a87d460af611b443a581718bfd507a6e Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Mon Apr 2 16:12:25 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Apr 2 16:12:25 2018 +0200 [EXPLORER] Add missing 'break' statements. Spotted by mudhead. CORE-14518 --- base/shell/explorer/syspager.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/base/shell/explorer/syspager.cpp b/base/shell/explorer/syspager.cpp index fa2aa73b36..5340ba4921 100644 --- a/base/shell/explorer/syspager.cpp +++ b/base/shell/explorer/syspager.cpp @@ -1283,9 +1283,11 @@ BOOL CSysPagerWnd::NotifyIcon(DWORD dwMessage, _In_ CONST NOTIFYICONDATA *iconDa (void)AddIconToWatcher(iconData); } break; + case NIM_MODIFY: ret = Toolbar.UpdateButton(iconData); break; + case NIM_DELETE: ret = Toolbar.RemoveButton(iconData); if (ret == TRUE) @@ -1293,11 +1295,16 @@ BOOL CSysPagerWnd::NotifyIcon(DWORD dwMessage, _In_ CONST NOTIFYICONDATA *iconDa (void)RemoveIconFromWatcher(iconData); } break; + case NIM_SETFOCUS: Toolbar.SetFocus(); ret = TRUE; + break; + case NIM_SETVERSION: ret = Toolbar.SwitchVersion(iconData); + break; + default: TRACE("NotifyIcon received with unknown code %d.\n", dwMessage); return FALSE;

6 years, 8 months

01/01: [WINLOGON] Fix some dialog control dimensions.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2da4999011fb491805817… commit 2da4999011fb491805817e2eff22fe5fedf072be Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Mon Apr 2 01:23:19 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Apr 2 15:05:25 2018 +0200 [WINLOGON] Fix some dialog control dimensions. --- base/system/winlogon/lang/cs-CZ.rc | 4 ++-- base/system/winlogon/lang/el-GR.rc | 4 ++-- base/system/winlogon/lang/fr-FR.rc | 6 +++--- base/system/winlogon/lang/he-IL.rc | 2 +- base/system/winlogon/lang/hu-HU.rc | 2 +- base/system/winlogon/lang/id-ID.rc | 2 +- base/system/winlogon/lang/ms-MY.rc | 4 ++-- base/system/winlogon/lang/pl-PL.rc | 4 ++-- base/system/winlogon/lang/pt-BR.rc | 2 +- base/system/winlogon/lang/ro-RO.rc | 2 +- base/system/winlogon/lang/ru-RU.rc | 4 ++-- base/system/winlogon/lang/sk-SK.rc | 2 +- base/system/winlogon/lang/sq-AL.rc | 2 +- base/system/winlogon/lang/tr-TR.rc | 2 +- base/system/winlogon/lang/uk-UA.rc | 2 +- 15 files changed, 22 insertions(+), 22 deletions(-) diff --git a/base/system/winlogon/lang/cs-CZ.rc b/base/system/winlogon/lang/cs-CZ.rc index a5aee95484..0647df4545 100644 --- a/base/system/winlogon/lang/cs-CZ.rc +++ b/base/system/winlogon/lang/cs-CZ.rc @@ -5,9 +5,9 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPT CAPTION "Vypnutí počítače" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Nyní můžete Váš počítač bez obav vypnout.", IDC_SHUTDOWNCOMPUTER, 31, 13, 132, 8 + LTEXT "Nyní můžete Váš počítač bez obav vypnout.", IDC_SHUTDOWNCOMPUTER, 31, 6, 132, 18 ICON IDI_WINLOGON, IDC_SHTDOWNICON, 6, 7, 18, 20 - DEFPUSHBUTTON "&Restartovat", IDC_BTNSHTDOWNCOMPUTER, 62, 32, 40, 14 + DEFPUSHBUTTON "&Restartovat", IDC_BTNSHTDOWNCOMPUTER, 58, 32, 48, 14 END IDD_GINALOADFAILED DIALOGEX 58, 83, 231, 119 diff --git a/base/system/winlogon/lang/el-GR.rc b/base/system/winlogon/lang/el-GR.rc index f1b6eee22d..c1fa72745a 100644 --- a/base/system/winlogon/lang/el-GR.rc +++ b/base/system/winlogon/lang/el-GR.rc @@ -5,9 +5,9 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPT CAPTION "Τερματισμός Υπολογιστή" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Τώρα είναι ασφαλές να κλείσετε τον υπολογιστή σας.", IDC_SHUTDOWNCOMPUTER, 31, 13, 132, 8 + LTEXT "Τώρα είναι ασφαλές να κλείσετε τον υπολογιστή σας.", IDC_SHUTDOWNCOMPUTER, 31, 6, 132, 18 ICON IDI_WINLOGON, IDC_SHTDOWNICON, 6, 7, 18, 20 - DEFPUSHBUTTON "&Επανεκκίνηση", IDC_BTNSHTDOWNCOMPUTER, 62, 32, 40, 14 + DEFPUSHBUTTON "&Επανεκκίνηση", IDC_BTNSHTDOWNCOMPUTER, 58, 32, 48, 14 END IDD_GINALOADFAILED DIALOGEX 58, 83, 231, 119 diff --git a/base/system/winlogon/lang/fr-FR.rc b/base/system/winlogon/lang/fr-FR.rc index e9cba337c9..b1f9b92512 100644 --- a/base/system/winlogon/lang/fr-FR.rc +++ b/base/system/winlogon/lang/fr-FR.rc @@ -7,9 +7,9 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPT CAPTION "Arrêter l'ordinateur" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Vous pouvez maintenant éteindre votre ordinateur en toute sécurité", IDC_SHUTDOWNCOMPUTER, 31, 13, 132, 8 + LTEXT "Vous pouvez maintenant éteindre votre ordinateur en toute sécurité.", IDC_SHUTDOWNCOMPUTER, 31, 6, 132, 18 ICON IDI_WINLOGON, IDC_SHTDOWNICON, 6, 7, 18, 20 - DEFPUSHBUTTON "&Redémarrer", IDC_BTNSHTDOWNCOMPUTER, 62, 32, 40, 14 + DEFPUSHBUTTON "&Redémarrer", IDC_BTNSHTDOWNCOMPUTER, 58, 32, 48, 14 END IDD_GINALOADFAILED DIALOGEX 58, 83, 231, 119 @@ -17,7 +17,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPT CAPTION "Échec de l'interface utilisateur" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Le chargement du DLL %s de l'interface utilisateur a échoué", IDC_GINALOADFAILED, 39, 16, 156, 24 + LTEXT "Le chargement du DLL %s de l'interface utilisateur a échoué.", IDC_GINALOADFAILED, 39, 16, 156, 24 LTEXT "Contactez votre administrateur système pour remplacer la DLL, ou restaurez la DLL originale.", IDC_GINALOADFAILEDCONTACT, 39, 53, 151, 25 DEFPUSHBUTTON "&Redémarrer", 1, 80, 91, 68, 14 END diff --git a/base/system/winlogon/lang/he-IL.rc b/base/system/winlogon/lang/he-IL.rc index ebf4b2fb14..d4f3785850 100644 --- a/base/system/winlogon/lang/he-IL.rc +++ b/base/system/winlogon/lang/he-IL.rc @@ -19,7 +19,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "ספריית הקישור הדינאמי %s של ממשק ההתחברות נכשלה להטען.", IDC_GINALOADFAILED, 39, 16, 156, 24 LTEXT "פנה אל מנהל המערכת שלך כדי להחליף את הDLL, או תשחזר את הDLL המקורי.", IDC_GINALOADFAILEDCONTACT, 39, 53, 151, 25 - DEFPUSHBUTTON "הפעל מחדש", 1, 59, 32, 49, 14 + DEFPUSHBUTTON "הפעל מחדש", 1, 80, 91, 68, 14 END IDD_SYSSHUTDOWN DIALOGEX 50, 50, 180, 140 diff --git a/base/system/winlogon/lang/hu-HU.rc b/base/system/winlogon/lang/hu-HU.rc index c0c8974e8a..ef62ded49e 100644 --- a/base/system/winlogon/lang/hu-HU.rc +++ b/base/system/winlogon/lang/hu-HU.rc @@ -9,7 +9,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Mostmár biztonságos a gép kikapcsolása.", IDC_SHUTDOWNCOMPUTER, 31, 13, 132, 8 ICON IDI_WINLOGON, IDC_SHTDOWNICON, 6, 7, 18, 20 - DEFPUSHBUTTON "&Újraindítás", IDC_BTNSHTDOWNCOMPUTER, 62, 32, 40, 14 + DEFPUSHBUTTON "&Újraindítás", IDC_BTNSHTDOWNCOMPUTER, 60, 32, 44, 14 END IDD_GINALOADFAILED DIALOGEX 58, 83, 231, 119 diff --git a/base/system/winlogon/lang/id-ID.rc b/base/system/winlogon/lang/id-ID.rc index 9cc54d5632..129140fff3 100644 --- a/base/system/winlogon/lang/id-ID.rc +++ b/base/system/winlogon/lang/id-ID.rc @@ -7,7 +7,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPT CAPTION "Matikan Komputer" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Sekarang aman untuk mematikan komputer anda.", IDC_SHUTDOWNCOMPUTER, 31, 13, 132, 8 + LTEXT "Sekarang aman untuk mematikan komputer anda.", IDC_SHUTDOWNCOMPUTER, 31, 6, 132, 18 ICON IDI_WINLOGON, IDC_SHTDOWNICON, 6, 7, 18, 20 DEFPUSHBUTTON "&Mulai Lagi", IDC_BTNSHTDOWNCOMPUTER, 62, 32, 40, 14 END diff --git a/base/system/winlogon/lang/ms-MY.rc b/base/system/winlogon/lang/ms-MY.rc index fa4cca5d5f..2d2bfff416 100644 --- a/base/system/winlogon/lang/ms-MY.rc +++ b/base/system/winlogon/lang/ms-MY.rc @@ -7,9 +7,9 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPT CAPTION "Memadam komputer" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Kini, adalah selamat untuk memadamkan komputer anda.", IDC_SHUTDOWNCOMPUTER, 31, 13, 132, 8 + LTEXT "Kini, adalah selamat untuk memadamkan komputer anda.", IDC_SHUTDOWNCOMPUTER, 31, 6, 132, 18 ICON IDI_WINLOGON, IDC_SHTDOWNICON, 6, 7, 18, 20 - DEFPUSHBUTTON "Mula semula(&R)", IDC_BTNSHTDOWNCOMPUTER, 62, 32, 40, 14 + DEFPUSHBUTTON "Mula semula(&R)", IDC_BTNSHTDOWNCOMPUTER, 52, 32, 60, 14 END IDD_GINALOADFAILED DIALOGEX 58, 83, 231, 119 diff --git a/base/system/winlogon/lang/pl-PL.rc b/base/system/winlogon/lang/pl-PL.rc index 2c3f93c311..ae112f0944 100644 --- a/base/system/winlogon/lang/pl-PL.rc +++ b/base/system/winlogon/lang/pl-PL.rc @@ -12,9 +12,9 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPT CAPTION "Wyłączanie komputera" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Możesz teraz bezpiecznie wyłączyć komputer.", IDC_SHUTDOWNCOMPUTER, 31, 13, 132, 8 + LTEXT "Możesz teraz bezpiecznie wyłączyć komputer.", IDC_SHUTDOWNCOMPUTER, 31, 6, 132, 18 ICON IDI_WINLOGON, IDC_SHTDOWNICON, 6, 7, 18, 20 - DEFPUSHBUTTON "&Uruchom ponownie", IDC_BTNSHTDOWNCOMPUTER, 62, 32, 40, 14 + DEFPUSHBUTTON "&Uruchom ponownie", IDC_BTNSHTDOWNCOMPUTER, 48, 32, 68, 14 END IDD_GINALOADFAILED DIALOGEX 58, 83, 231, 119 diff --git a/base/system/winlogon/lang/pt-BR.rc b/base/system/winlogon/lang/pt-BR.rc index 346887795c..7715d3242c 100644 --- a/base/system/winlogon/lang/pt-BR.rc +++ b/base/system/winlogon/lang/pt-BR.rc @@ -7,7 +7,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPT CAPTION "Desligar Computador" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "O seu computador pode ser desligado com segurança.", IDC_SHUTDOWNCOMPUTER, 31, 13, 132, 8 + LTEXT "O seu computador pode ser desligado com segurança.", IDC_SHUTDOWNCOMPUTER, 31, 6, 132, 18 ICON IDI_WINLOGON, IDC_SHTDOWNICON, 6, 7, 18, 20 DEFPUSHBUTTON "&Restart", IDC_BTNSHTDOWNCOMPUTER, 62, 32, 40, 14 END diff --git a/base/system/winlogon/lang/ro-RO.rc b/base/system/winlogon/lang/ro-RO.rc index f7684533d0..ae51afc224 100644 --- a/base/system/winlogon/lang/ro-RO.rc +++ b/base/system/winlogon/lang/ro-RO.rc @@ -14,7 +14,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPT CAPTION "Oprire calculator" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Acum puteți închide calculatorul în siguranță.", IDC_SHUTDOWNCOMPUTER, 31, 13, 132, 8 + LTEXT "Acum puteți închide calculatorul în siguranță.", IDC_SHUTDOWNCOMPUTER, 31, 6, 132, 18 ICON IDI_WINLOGON, IDC_SHTDOWNICON, 6, 7, 18, 20 DEFPUSHBUTTON "&Repornire", IDC_BTNSHTDOWNCOMPUTER, 62, 32, 40, 14 END diff --git a/base/system/winlogon/lang/ru-RU.rc b/base/system/winlogon/lang/ru-RU.rc index 479b0dd062..e38d1ff591 100644 --- a/base/system/winlogon/lang/ru-RU.rc +++ b/base/system/winlogon/lang/ru-RU.rc @@ -5,9 +5,9 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPT CAPTION "Выключение компьютера" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Теперь можно безопасно выключить компьютер.", IDC_SHUTDOWNCOMPUTER, 31, 13, 132, 8 + LTEXT "Теперь можно безопасно выключить компьютер.", IDC_SHUTDOWNCOMPUTER, 31, 6, 132, 18 ICON IDI_WINLOGON, IDC_SHTDOWNICON, 6, 7, 18, 20 - DEFPUSHBUTTON "&Перезагрузка", IDC_BTNSHTDOWNCOMPUTER, 62, 32, 40, 14 + DEFPUSHBUTTON "&Перезагрузка", IDC_BTNSHTDOWNCOMPUTER, 52, 32, 60, 14 END IDD_GINALOADFAILED DIALOGEX 58, 83, 231, 119 diff --git a/base/system/winlogon/lang/sk-SK.rc b/base/system/winlogon/lang/sk-SK.rc index 036ef00272..59447f5e04 100644 --- a/base/system/winlogon/lang/sk-SK.rc +++ b/base/system/winlogon/lang/sk-SK.rc @@ -12,7 +12,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Teraz môžete počítač bezpečne vypnúť.", IDC_SHUTDOWNCOMPUTER, 31, 13, 132, 8 ICON IDI_WINLOGON, IDC_SHTDOWNICON, 6, 7, 18, 20 - DEFPUSHBUTTON "&Reštartovať", IDC_BTNSHTDOWNCOMPUTER, 62, 32, 40, 14 + DEFPUSHBUTTON "&Reštartovať", IDC_BTNSHTDOWNCOMPUTER, 58, 32, 48, 14 END IDD_GINALOADFAILED DIALOGEX 58, 83, 231, 119 diff --git a/base/system/winlogon/lang/sq-AL.rc b/base/system/winlogon/lang/sq-AL.rc index e0c19673f6..699ec03d25 100644 --- a/base/system/winlogon/lang/sq-AL.rc +++ b/base/system/winlogon/lang/sq-AL.rc @@ -9,7 +9,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPT CAPTION "Fik kompjuterin" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Tani është e sigurt për të fikur kompjuterin tuaj.", IDC_SHUTDOWNCOMPUTER, 31, 13, 132, 8 + LTEXT "Tani është e sigurt për të fikur kompjuterin tuaj.", IDC_SHUTDOWNCOMPUTER, 31, 6, 132, 18 ICON IDI_WINLOGON, IDC_SHTDOWNICON, 6, 7, 18, 20 DEFPUSHBUTTON "&Rifillo", IDC_BTNSHTDOWNCOMPUTER, 62, 32, 40, 14 END diff --git a/base/system/winlogon/lang/tr-TR.rc b/base/system/winlogon/lang/tr-TR.rc index 9c82dffd4c..2a3119823f 100644 --- a/base/system/winlogon/lang/tr-TR.rc +++ b/base/system/winlogon/lang/tr-TR.rc @@ -9,7 +9,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Şimdi bilgisayarınızı kapatmak güvenlidir.", IDC_SHUTDOWNCOMPUTER, 31, 13, 132, 8 ICON IDI_WINLOGON, IDC_SHTDOWNICON, 6, 7, 18, 20 - DEFPUSHBUTTON "&Yeniden Başlat", IDC_BTNSHTDOWNCOMPUTER, 62, 32, 40, 14 + DEFPUSHBUTTON "&Yeniden Başlat", IDC_BTNSHTDOWNCOMPUTER, 54, 32, 56, 14 END IDD_GINALOADFAILED DIALOGEX 58, 83, 231, 119 diff --git a/base/system/winlogon/lang/uk-UA.rc b/base/system/winlogon/lang/uk-UA.rc index dc2c39b084..d88737ca63 100644 --- a/base/system/winlogon/lang/uk-UA.rc +++ b/base/system/winlogon/lang/uk-UA.rc @@ -7,7 +7,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Тепер можна вимкнути комп'ютер.", IDC_SHUTDOWNCOMPUTER, 31, 13, 132, 8 ICON IDI_WINLOGON, IDC_SHTDOWNICON, 6, 7, 18, 20 - DEFPUSHBUTTON "&Перезавантаження", IDC_BTNSHTDOWNCOMPUTER, 62, 32, 40, 14 + DEFPUSHBUTTON "&Перезавантаження", IDC_BTNSHTDOWNCOMPUTER, 52, 32, 60, 14 END IDD_GINALOADFAILED DIALOGEX 58, 83, 231, 119

6 years, 8 months

01/01: [NET] Reorganize and improve the help texts (3/X) - Add help texts for the START and STOP commands. - Add text for the CONFIG command.

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=925176af71d07cea2bbdc… commit 925176af71d07cea2bbdc9a547d9fb87462dfa04 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Mon Apr 2 14:53:12 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Mon Apr 2 14:53:39 2018 +0200 [NET] Reorganize and improve the help texts (3/X) - Add help texts for the START and STOP commands. - Add text for the CONFIG command. --- base/applications/network/net/cmdConfig.c | 8 ++--- base/applications/network/net/cmdStart.c | 6 +++- base/applications/network/net/cmdStop.c | 6 +++- base/applications/network/net/help.c | 8 +++-- base/applications/network/net/lang/en-US.rc | 19 ++++++++--- base/applications/network/net/lang/es-ES.rc | 16 ++++++++-- base/applications/network/net/lang/ro-RO.rc | 16 ++++++++-- base/applications/network/net/lang/ru-RU.rc | 16 ++++++++-- base/applications/network/net/lang/tr-TR.rc | 18 ++++++++--- base/applications/network/net/lang/zh-CN.rc | 20 +++++++++--- base/applications/network/net/lang/zh-TW.rc | 16 ++++++++-- base/applications/network/net/resource.h | 49 ++++++++++++++++------------- 12 files changed, 142 insertions(+), 56 deletions(-) diff --git a/base/applications/network/net/cmdConfig.c b/base/applications/network/net/cmdConfig.c index e01b2d19c7..bc84a877af 100644 --- a/base/applications/network/net/cmdConfig.c +++ b/base/applications/network/net/cmdConfig.c @@ -70,9 +70,6 @@ done: if (ServerInfo != NULL) NetApiBufferFree(ServerInfo); - if (Status == NERR_Success) - ConResPuts(StdOut, IDS_ERROR_NO_ERROR); - return 0; } @@ -161,8 +158,11 @@ cmdConfig( } else { - + ConResPuts(StdOut, IDS_CONFIG_TEXT); } + if (result == 0) + ConResPuts(StdOut, IDS_ERROR_NO_ERROR); + return result; } \ No newline at end of file diff --git a/base/applications/network/net/cmdStart.c b/base/applications/network/net/cmdStart.c index 9bb9451149..00847c5ce3 100644 --- a/base/applications/network/net/cmdStart.c +++ b/base/applications/network/net/cmdStart.c @@ -173,7 +173,11 @@ cmdStart(INT argc, WCHAR **argv) { if (_wcsicmp(argv[i], L"/help") == 0) { - ConResPuts(StdOut, IDS_START_HELP); + ConResPuts(StdOut, IDS_GENERIC_SYNTAX); + ConResPuts(StdOut, IDS_START_SYNTAX); + ConResPuts(StdOut, IDS_START_HELP_1); + ConResPuts(StdOut, IDS_START_HELP_2); + ConResPuts(StdOut, IDS_START_HELP_3); return 1; } } diff --git a/base/applications/network/net/cmdStop.c b/base/applications/network/net/cmdStop.c index 27d2897569..48e857a5a0 100644 --- a/base/applications/network/net/cmdStop.c +++ b/base/applications/network/net/cmdStop.c @@ -29,7 +29,11 @@ INT cmdStop(INT argc, WCHAR **argv) { if (_wcsicmp(argv[i], L"/help") == 0) { - ConResPuts(StdOut, IDS_STOP_HELP); + ConResPuts(StdOut, IDS_GENERIC_SYNTAX); + ConResPuts(StdOut, IDS_STOP_SYNTAX); + ConResPuts(StdOut, IDS_STOP_HELP_1); + ConResPuts(StdOut, IDS_STOP_HELP_2); + ConResPuts(StdOut, IDS_STOP_HELP_3); return 1; } } diff --git a/base/applications/network/net/help.c b/base/applications/network/net/help.c index 9a2bb471b7..f354ee4f40 100644 --- a/base/applications/network/net/help.c +++ b/base/applications/network/net/help.c @@ -153,7 +153,9 @@ INT cmdHelp(INT argc, WCHAR **argv) if (_wcsicmp(argv[2], L"START") == 0) { ConResPuts(StdOut, IDS_START_SYNTAX); - ConResPuts(StdOut, IDS_START_HELP); + ConResPuts(StdOut, IDS_START_HELP_1); + ConResPuts(StdOut, IDS_START_HELP_2); + ConResPuts(StdOut, IDS_START_HELP_3); return 0; } @@ -167,7 +169,9 @@ INT cmdHelp(INT argc, WCHAR **argv) if (_wcsicmp(argv[2], L"STOP") == 0) { ConResPuts(StdOut, IDS_STOP_SYNTAX); - ConResPuts(StdOut, IDS_STOP_HELP); + ConResPuts(StdOut, IDS_STOP_HELP_1); + ConResPuts(StdOut, IDS_STOP_HELP_2); + ConResPuts(StdOut, IDS_STOP_HELP_3); return 0; } diff --git a/base/applications/network/net/lang/en-US.rc b/base/applications/network/net/lang/en-US.rc index 7b09a2e222..23d498a194 100644 --- a/base/applications/network/net/lang/en-US.rc +++ b/base/applications/network/net/lang/en-US.rc @@ -113,19 +113,26 @@ message and suggested actions you can take to solve the problem.\n\n" IDS_PAUSE_SYNTAX "NET PAUSE service\n\n" IDS_PAUSE_HELP_1 "NET PAUSE suspends a service. Pausing a service puts it on hold.\n\n" IDS_PAUSE_HELP_2 "service The name of the service to be paused.\n\n" - IDS_SEND_SYNTAX "NET SEND ...\n\n" IDS_SEND_HELP "SEND\n...\n\n" IDS_SESSION_SYNTAX "NET SESSION ...\n\n" IDS_SESSION_HELP "SESSION\n...\n\n" IDS_SHARE_SYNTAX "NET SHARE ...\n\n" IDS_SHARE_HELP "SHARE\n...\n\n" - IDS_START_SYNTAX "NET START <Service name>\n\n" - IDS_START_HELP "START\n...\n\n" + IDS_START_SYNTAX "NET START [service]\n\n" + IDS_START_HELP_1 "NET START starts services or lists running services.\n\n" + IDS_START_HELP_2 "service The name of the service to be started.\n\n" + IDS_START_HELP_3 "When typed at the command prompt, service name of two words or more must\n\ +be enclosed in quotation marks. For example, NET START ""NET LOGON""\n\ +starts the net logon service.\n\n" IDS_STATISTICS_SYNTAX "NET STATISTICS ...\n\n" IDS_STATISTICS_HELP "STATISTICS\n...\n\n" - IDS_STOP_SYNTAX "NET STOP <Service name>\n\n" - IDS_STOP_HELP "STOP\n...\n\n" + IDS_STOP_SYNTAX "NET STOP service\n\n" + IDS_STOP_HELP_1 "NET STOP stops services.\n\n" + IDS_STOP_HELP_2 "service The name of the service to be stopped.\n\n" + IDS_STOP_HELP_3 "Stopping a service cancels any network connection the service is\n\ +using. Also, some services are dependent on others. Stopping one\n\ +service can stop others. Some services cannot be stopped.\n\n" IDS_TIME_SYNTAX "NET TIME ...\n\n" IDS_TIME_HELP "TIME\n...\n\n" IDS_USE_SYNTAX "NET USE ...\n\n" @@ -156,6 +163,8 @@ message and suggested actions you can take to solve the problem.\n\n" IDS_ACCOUNTS_STANDALONE_SERVER "Standalone server" IDS_ACCOUNTS_WORKSTATION "Workstation" + IDS_CONFIG_TEXT "The following running services can be controlled:\n\n\ + Server\n Workstation\n\n" IDS_CONFIG_SERVER_NAME "Server Name" IDS_CONFIG_SERVER_COMMENT "Server Comment" IDS_CONFIG_SERVER_VERSION "Software version" diff --git a/base/applications/network/net/lang/es-ES.rc b/base/applications/network/net/lang/es-ES.rc index 983d6c75a0..718250baa1 100644 --- a/base/applications/network/net/lang/es-ES.rc +++ b/base/applications/network/net/lang/es-ES.rc @@ -122,12 +122,20 @@ message and suggested actions you can take to solve the problem.\n\n" IDS_SESSION_HELP "SESSION\n...\n\n" IDS_SHARE_SYNTAX "NET SHARE ...\n\n" IDS_SHARE_HELP "SHARE\n...\n\n" - IDS_START_SYNTAX "NET START ...\n\n" - IDS_START_HELP "START\n...\n\n" + IDS_START_SYNTAX "NET START [service]\n\n" + IDS_START_HELP_1 "NET START starts services or lists running services.\n\n" + IDS_START_HELP_2 "service The name of the service to be started.\n\n" + IDS_START_HELP_3 "When typed at the command prompt, service name of two words or more must\n\ +be enclosed in quotation marks. For example, NET START ""NET LOGON""\n\ +starts the net logon service.\n\n" IDS_STATISTICS_SYNTAX "NET STATISTICS ...\n\n" IDS_STATISTICS_HELP "STATISTICS\n...\n\n" IDS_STOP_SYNTAX "NET STOP <nombre del servicio>\n\n" - IDS_STOP_HELP "STOP\n...\n\n" + IDS_STOP_HELP_1 "NET STOP stops services.\n\n" + IDS_STOP_HELP_2 "service The name of the service to be stopped.\n\n" + IDS_STOP_HELP_3 "Stopping a service cancels any network connection the service is\n\ +using. Also, some services are dependent on others. Stopping one\n\ +service can stop others. Some services cannot be stopped.\n\n" IDS_TIME_SYNTAX "NET TIME ...\n\n" IDS_TIME_HELP "TIME\n...\n\n" IDS_USE_SYNTAX "NET USE ...\n\n" @@ -157,6 +165,8 @@ message and suggested actions you can take to solve the problem.\n\n" IDS_ACCOUNTS_STANDALONE_SERVER "Servidor independiente" IDS_ACCOUNTS_WORKSTATION "Estación de trabajo" + IDS_CONFIG_TEXT "The following running services can be controlled:\n\n\ + Server\n Workstation\n\n" IDS_CONFIG_SERVER_NAME "Server Name" IDS_CONFIG_SERVER_COMMENT "Server Comment" IDS_CONFIG_SERVER_VERSION "Software version" diff --git a/base/applications/network/net/lang/ro-RO.rc b/base/applications/network/net/lang/ro-RO.rc index 2756723a29..eae85bcd36 100644 --- a/base/applications/network/net/lang/ro-RO.rc +++ b/base/applications/network/net/lang/ro-RO.rc @@ -125,12 +125,20 @@ message and suggested actions you can take to solve the problem.\n\n" IDS_SESSION_HELP "SESSION\n...\n\n" IDS_SHARE_SYNTAX "NET SHARE ...\n\n" IDS_SHARE_HELP "SHARE\n...\n\n" - IDS_START_SYNTAX "NET START ...\n\n" - IDS_START_HELP "START\n...\n\n" + IDS_START_SYNTAX "NET START [service]\n\n" + IDS_START_HELP_1 "NET START starts services or lists running services.\n\n" + IDS_START_HELP_2 "service The name of the service to be started.\n\n" + IDS_START_HELP_3 "When typed at the command prompt, service name of two words or more must\n\ +be enclosed in quotation marks. For example, NET START ""NET LOGON""\n\ +starts the net logon service.\n\n" IDS_STATISTICS_SYNTAX "NET STATISTICS ...\n\n" IDS_STATISTICS_HELP "STATISTICS\n...\n\n" IDS_STOP_SYNTAX "NET STOP <nume serviciu>\n\n" - IDS_STOP_HELP "STOP\n...\n\n" + IDS_STOP_HELP_1 "NET STOP stops services.\n\n" + IDS_STOP_HELP_2 "service The name of the service to be stopped.\n\n" + IDS_STOP_HELP_3 "Stopping a service cancels any network connection the service is\n\ +using. Also, some services are dependent on others. Stopping one\n\ +service can stop others. Some services cannot be stopped.\n\n" IDS_TIME_SYNTAX "NET TIME ...\n\n" IDS_TIME_HELP "TIME\n...\n\n" IDS_USE_SYNTAX "NET USE ...\n\n" @@ -160,6 +168,8 @@ message and suggested actions you can take to solve the problem.\n\n" IDS_ACCOUNTS_STANDALONE_SERVER "Server de sine stătător" IDS_ACCOUNTS_WORKSTATION "Stație de lucru" + IDS_CONFIG_TEXT "The following running services can be controlled:\n\n\ + Server\n Workstation\n\n" IDS_CONFIG_SERVER_NAME "Server Name" IDS_CONFIG_SERVER_COMMENT "Server Comment" IDS_CONFIG_SERVER_VERSION "Software version" diff --git a/base/applications/network/net/lang/ru-RU.rc b/base/applications/network/net/lang/ru-RU.rc index 4c9a969481..7466edaf34 100644 --- a/base/applications/network/net/lang/ru-RU.rc +++ b/base/applications/network/net/lang/ru-RU.rc @@ -121,12 +121,20 @@ message and suggested actions you can take to solve the problem.\n\n" IDS_SESSION_HELP "SESSION\n...\n\n" IDS_SHARE_SYNTAX "NET SHARE ...\n\n" IDS_SHARE_HELP "SHARE\n...\n\n" - IDS_START_SYNTAX "NET START ...\n\n" - IDS_START_HELP "START\n...\n\n" + IDS_START_SYNTAX "NET START [service]\n\n" + IDS_START_HELP_1 "NET START starts services or lists running services.\n\n" + IDS_START_HELP_2 "service The name of the service to be started.\n\n" + IDS_START_HELP_3 "When typed at the command prompt, service name of two words or more must\n\ +be enclosed in quotation marks. For example, NET START ""NET LOGON""\n\ +starts the net logon service.\n\n" IDS_STATISTICS_SYNTAX "NET STATISTICS ...\n\n" IDS_STATISTICS_HELP "STATISTICS\n...\n\n" IDS_STOP_SYNTAX "NET STOP <имя_службы>\n\n" - IDS_STOP_HELP "STOP\n...\n\n" + IDS_STOP_HELP_1 "NET STOP stops services.\n\n" + IDS_STOP_HELP_2 "service The name of the service to be stopped.\n\n" + IDS_STOP_HELP_3 "Stopping a service cancels any network connection the service is\n\ +using. Also, some services are dependent on others. Stopping one\n\ +service can stop others. Some services cannot be stopped.\n\n" IDS_TIME_SYNTAX "NET TIME ...\n\n" IDS_TIME_HELP "TIME\n...\n\n" IDS_USE_SYNTAX "NET USE ...\n\n" @@ -156,6 +164,8 @@ message and suggested actions you can take to solve the problem.\n\n" IDS_ACCOUNTS_STANDALONE_SERVER "Автономный сервер" IDS_ACCOUNTS_WORKSTATION "Рабочая станция" + IDS_CONFIG_TEXT "The following running services can be controlled:\n\n\ + Server\n Workstation\n\n" IDS_CONFIG_SERVER_NAME "Server Name" IDS_CONFIG_SERVER_COMMENT "Server Comment" IDS_CONFIG_SERVER_VERSION "Software version" diff --git a/base/applications/network/net/lang/tr-TR.rc b/base/applications/network/net/lang/tr-TR.rc index 3600d809d4..2fd0e2f4d7 100644 --- a/base/applications/network/net/lang/tr-TR.rc +++ b/base/applications/network/net/lang/tr-TR.rc @@ -112,7 +112,7 @@ message and suggested actions you can take to solve the problem.\n\n" IDS_NAME_HELP "NAME\n...\n\n" IDS_PRINT_SYNTAX "NET PRINT ...\n\n" IDS_PRINT_HELP "PRINT\n...\n\n" - IDS_PAUSE_SYNTAX "NET PAUSE <Hizmet Adı>\n\n" + IDS_PAUSE_SYNTAX "NET PAUSE service\n\n" IDS_PAUSE_HELP_1 "NET PAUSE suspends a service. Pausing a service puts it on hold.\n\n" IDS_PAUSE_HELP_2 "service The name of the service to be paused.\n\n" IDS_SEND_SYNTAX "NET SEND ...\n\n" @@ -121,12 +121,20 @@ message and suggested actions you can take to solve the problem.\n\n" IDS_SESSION_HELP "SESSION\n...\n\n" IDS_SHARE_SYNTAX "NET SHARE ...\n\n" IDS_SHARE_HELP "SHARE\n...\n\n" - IDS_START_SYNTAX "NET START <Hizmet Adı>\n\n" - IDS_START_HELP "START\n...\n\n" + IDS_START_SYNTAX "NET START [service]\n\n" + IDS_START_HELP_1 "NET START starts services or lists running services.\n\n" + IDS_START_HELP_2 "service The name of the service to be started.\n\n" + IDS_START_HELP_3 "When typed at the command prompt, service name of two words or more must\n\ +be enclosed in quotation marks. For example, NET START ""NET LOGON""\n\ +starts the net logon service.\n\n" IDS_STATISTICS_SYNTAX "NET STATISTICS ...\n\n" IDS_STATISTICS_HELP "STATISTICS\n...\n\n" IDS_STOP_SYNTAX "NET STOP <Hizmet Adı>\n\n" - IDS_STOP_HELP "STOP\n...\n\n" + IDS_STOP_HELP_1 "NET STOP stops services.\n\n" + IDS_STOP_HELP_2 "service The name of the service to be stopped.\n\n" + IDS_STOP_HELP_3 "Stopping a service cancels any network connection the service is\n\ +using. Also, some services are dependent on others. Stopping one\n\ +service can stop others. Some services cannot be stopped.\n\n" IDS_TIME_SYNTAX "NET TIME ...\n\n" IDS_TIME_HELP "TIME\n...\n\n" IDS_USE_SYNTAX "NET USE ...\n\n" @@ -156,6 +164,8 @@ message and suggested actions you can take to solve the problem.\n\n" IDS_ACCOUNTS_STANDALONE_SERVER "Bağımsız sunucu" IDS_ACCOUNTS_WORKSTATION "İş istasyonu" + IDS_CONFIG_TEXT "The following running services can be controlled:\n\n\ + Server\n Workstation\n\n" IDS_CONFIG_SERVER_NAME "Server Name" IDS_CONFIG_SERVER_COMMENT "Server Comment" IDS_CONFIG_SERVER_VERSION "Software version" diff --git a/base/applications/network/net/lang/zh-CN.rc b/base/applications/network/net/lang/zh-CN.rc index 783254ba9a..471b102b13 100644 --- a/base/applications/network/net/lang/zh-CN.rc +++ b/base/applications/network/net/lang/zh-CN.rc @@ -112,7 +112,7 @@ message and suggested actions you can take to solve the problem.\n\n" IDS_NAME_HELP "NAME\n...\n\n" IDS_PRINT_SYNTAX "NET PRINT ...\n\n" IDS_PRINT_HELP "PRINT\n...\n\n" - IDS_PAUSE_SYNTAX "NET PAUSE <Service Name>\n\n" + IDS_PAUSE_SYNTAX "NET PAUSE service\n\n" IDS_PAUSE_HELP_1 "NET PAUSE suspends a service. Pausing a service puts it on hold.\n\n" IDS_PAUSE_HELP_2 "service The name of the service to be paused.\n\n" IDS_SEND_SYNTAX "NET SEND ...\n\n" @@ -121,12 +121,20 @@ message and suggested actions you can take to solve the problem.\n\n" IDS_SESSION_HELP "SESSION\n...\n\n" IDS_SHARE_SYNTAX "NET SHARE ...\n\n" IDS_SHARE_HELP "SHARE\n...\n\n" - IDS_START_SYNTAX "NET START <Service name>\n\n" - IDS_START_HELP "START\n...\n\n" + IDS_START_SYNTAX "NET START [service]\n\n" + IDS_START_HELP_1 "NET START starts services or lists running services.\n\n" + IDS_START_HELP_2 "service The name of the service to be started.\n\n" + IDS_START_HELP_3 "When typed at the command prompt, service name of two words or more must\n\ +be enclosed in quotation marks. For example, NET START ""NET LOGON""\n\ +starts the net logon service.\n\n" IDS_STATISTICS_SYNTAX "NET STATISTICS ...\n\n" IDS_STATISTICS_HELP "STATISTICS\n...\n\n" - IDS_STOP_SYNTAX "NET STOP <Service name>\n\n" - IDS_STOP_HELP "STOP\n...\n\n" + IDS_STOP_SYNTAX "NET STOP service\n\n" + IDS_STOP_HELP_1 "NET STOP stops services.\n\n" + IDS_STOP_HELP_2 "service The name of the service to be stopped.\n\n" + IDS_STOP_HELP_3 "Stopping a service cancels any network connection the service is\n\ +using. Also, some services are dependent on others. Stopping one\n\ +service can stop others. Some services cannot be stopped.\n\n" IDS_TIME_SYNTAX "NET TIME ...\n\n" IDS_TIME_HELP "TIME\n...\n\n" IDS_USE_SYNTAX "NET USE ...\n\n" @@ -156,6 +164,8 @@ message and suggested actions you can take to solve the problem.\n\n" IDS_ACCOUNTS_STANDALONE_SERVER "独立服务器" IDS_ACCOUNTS_WORKSTATION "工作站" + IDS_CONFIG_TEXT "The following running services can be controlled:\n\n\ + Server\n Workstation\n\n" IDS_CONFIG_SERVER_NAME "Server Name" IDS_CONFIG_SERVER_COMMENT "Server Comment" IDS_CONFIG_SERVER_VERSION "Software version" diff --git a/base/applications/network/net/lang/zh-TW.rc b/base/applications/network/net/lang/zh-TW.rc index e6848264ce..0eba14dc92 100644 --- a/base/applications/network/net/lang/zh-TW.rc +++ b/base/applications/network/net/lang/zh-TW.rc @@ -121,12 +121,20 @@ message and suggested actions you can take to solve the problem.\n\n" IDS_SESSION_HELP "SESSION\n...\n\n" IDS_SHARE_SYNTAX "NET SHARE ...\n\n" IDS_SHARE_HELP "SHARE\n...\n\n" - IDS_START_SYNTAX "NET START <服務名稱>\n\n" - IDS_START_HELP "START\n...\n\n" + IDS_START_SYNTAX "NET START [service]\n\n" + IDS_START_HELP_1 "NET START starts services or lists running services.\n\n" + IDS_START_HELP_2 "service The name of the service to be started.\n\n" + IDS_START_HELP_3 "When typed at the command prompt, service name of two words or more must\n\ +be enclosed in quotation marks. For example, NET START ""NET LOGON""\n\ +starts the net logon service.\n\n" IDS_STATISTICS_SYNTAX "NET STATISTICS ...\n\n" IDS_STATISTICS_HELP "STATISTICS\n...\n\n" IDS_STOP_SYNTAX "NET STOP <服務名稱>\n\n" - IDS_STOP_HELP "STOP\n...\n\n" + IDS_STOP_HELP_1 "NET STOP stops services.\n\n" + IDS_STOP_HELP_2 "service The name of the service to be stopped.\n\n" + IDS_STOP_HELP_3 "Stopping a service cancels any network connection the service is\n\ +using. Also, some services are dependent on others. Stopping one\n\ +service can stop others. Some services cannot be stopped.\n\n" IDS_TIME_SYNTAX "NET TIME ...\n\n" IDS_TIME_HELP "TIME\n...\n\n" IDS_USE_SYNTAX "NET USE ...\n\n" @@ -156,6 +164,8 @@ message and suggested actions you can take to solve the problem.\n\n" IDS_ACCOUNTS_STANDALONE_SERVER "獨立伺服器" IDS_ACCOUNTS_WORKSTATION "工作站" + IDS_CONFIG_TEXT "The following running services can be controlled:\n\n\ + Server\n Workstation\n\n" IDS_CONFIG_SERVER_NAME "Server Name" IDS_CONFIG_SERVER_COMMENT "Server Comment" IDS_CONFIG_SERVER_VERSION "Software version" diff --git a/base/applications/network/net/resource.h b/base/applications/network/net/resource.h index 187ae2b76d..10e01d1906 100644 --- a/base/applications/network/net/resource.h +++ b/base/applications/network/net/resource.h @@ -52,20 +52,24 @@ #define IDS_SHARE_SYNTAX 149 #define IDS_SHARE_HELP 150 #define IDS_START_SYNTAX 151 -#define IDS_START_HELP 152 -#define IDS_STATISTICS_SYNTAX 153 -#define IDS_STATISTICS_HELP 154 -#define IDS_STOP_SYNTAX 155 -#define IDS_STOP_HELP 156 -#define IDS_TIME_SYNTAX 157 -#define IDS_TIME_HELP 158 -#define IDS_USE_SYNTAX 159 -#define IDS_USE_HELP 160 -#define IDS_USER_SYNTAX 161 -#define IDS_USER_HELP 162 -#define IDS_VIEW_SYNTAX 163 -#define IDS_VIEW_HELP 164 -#define IDS_NET_SYNTAX 165 +#define IDS_START_HELP_1 152 +#define IDS_START_HELP_2 153 +#define IDS_START_HELP_3 154 +#define IDS_STATISTICS_SYNTAX 155 +#define IDS_STATISTICS_HELP 156 +#define IDS_STOP_SYNTAX 157 +#define IDS_STOP_HELP_1 158 +#define IDS_STOP_HELP_2 159 +#define IDS_STOP_HELP_3 160 +#define IDS_TIME_SYNTAX 161 +#define IDS_TIME_HELP 162 +#define IDS_USE_SYNTAX 163 +#define IDS_USE_HELP 164 +#define IDS_USER_SYNTAX 165 +#define IDS_USER_HELP 166 +#define IDS_VIEW_SYNTAX 167 +#define IDS_VIEW_HELP 168 +#define IDS_NET_SYNTAX 169 #define IDS_ACCOUNTS_FORCE_LOGOFF 200 #define IDS_ACCOUNTS_LOGOFF_SECONDS 201 @@ -82,14 +86,15 @@ #define IDS_ACCOUNTS_STANDALONE_SERVER 212 #define IDS_ACCOUNTS_WORKSTATION 213 -#define IDS_CONFIG_SERVER_NAME 230 -#define IDS_CONFIG_SERVER_COMMENT 231 -#define IDS_CONFIG_SERVER_VERSION 232 -#define IDS_CONFIG_SERVER_ACTIVE 233 -#define IDS_CONFIG_SERVER_HIDDEN 234 -#define IDS_CONFIG_SERVER_USERS 235 -#define IDS_CONFIG_SERVER_FILES 236 -#define IDS_CONFIG_SERVER_IDLE 237 +#define IDS_CONFIG_TEXT 230 +#define IDS_CONFIG_SERVER_NAME 231 +#define IDS_CONFIG_SERVER_COMMENT 232 +#define IDS_CONFIG_SERVER_VERSION 233 +#define IDS_CONFIG_SERVER_ACTIVE 234 +#define IDS_CONFIG_SERVER_HIDDEN 235 +#define IDS_CONFIG_SERVER_USERS 236 +#define IDS_CONFIG_SERVER_FILES 237 +#define IDS_CONFIG_SERVER_IDLE 238 #define IDS_LOCALGROUP_ALIASES 300

6 years, 8 months

01/01: [TRANSLATION][SERVMAN] Italian translation update (#463)

by Bișoc George

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b51b99e7667e6b7f26ba5… commit b51b99e7667e6b7f26ba5e72d82818c48787cc7f Author: Bișoc George <fraizeraust99(a)gmail.com> AuthorDate: Mon Apr 2 13:57:10 2018 +0200 Commit: Robert Naumann <gonzomdx(a)gmail.com> CommitDate: Mon Apr 2 13:57:10 2018 +0200 [TRANSLATION][SERVMAN] Italian translation update (#463) * [SERVMAN] Italian update translation * [SERVMAN] Small grammatical typo fixed * [SERVMAN] Word replaced - "Accedi" would be more convenient than "Accedere" --- base/applications/mscutils/servman/lang/it-IT.rc | 64 ++++++++++++------------ 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/base/applications/mscutils/servman/lang/it-IT.rc b/base/applications/mscutils/servman/lang/it-IT.rc index bd87ad6bcf..d91a459c02 100644 --- a/base/applications/mscutils/servman/lang/it-IT.rc +++ b/base/applications/mscutils/servman/lang/it-IT.rc @@ -103,56 +103,56 @@ BEGIN LTEXT "Puoi indicarei parametri in uso quando il servizio è avviato da qui.", IDC_STATIC, 6, 177, 240, 15 LTEXT "Parametri di avvio:", IDC_STATIC, 6, 200, 58, 11 EDITTEXT IDC_START_PARAM, 68, 199, 178, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "Edit", IDC_EDIT, 192, 215, 54, 15, WS_DISABLED + PUSHBUTTON "Edita", IDC_EDIT, 192, 215, 54, 15, WS_DISABLED END IDD_LOGON DIALOGEX 6, 6, 253, 232 -CAPTION "Log On" +CAPTION "Accedere" FONT 8, "MS Shell Dlg", 0, 0 STYLE DS_SHELLFONT | WS_BORDER | WS_VISIBLE | WS_DLGFRAME | WS_SYSMENU | WS_GROUP | WS_TABSTOP BEGIN - LTEXT "Log on as:", IDC_STATIC, 7, 7, 238, 8 - AUTORADIOBUTTON "&Local System account", IDC_LOGON_SYSTEMACCOUNT, 7, 22, 238, 10, BS_TOP | BS_MULTILINE | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP - AUTORADIOBUTTON "&This account:", IDC_LOGON_THISACCOUNT, 7, 52, 60, 10, BS_TOP | BS_MULTILINE | WS_CHILD | WS_VISIBLE - AUTOCHECKBOX "Allo&w service to interact with desktop", IDC_LOGON_INTERACTIVE, 18, 34, 227, 10, WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP | BS_TOP | BS_MULTILINE + LTEXT "Accedi come:", IDC_STATIC, 7, 7, 238, 8 + AUTORADIOBUTTON "&Account di sistema locale", IDC_LOGON_SYSTEMACCOUNT, 7, 22, 238, 10, BS_TOP | BS_MULTILINE | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "&Questo account:", IDC_LOGON_THISACCOUNT, 7, 52, 60, 10, BS_TOP | BS_MULTILINE | WS_CHILD | WS_VISIBLE + AUTOCHECKBOX "Consen&ti al servizio di interagire con il desktop", IDC_LOGON_INTERACTIVE, 18, 34, 227, 10, WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP | BS_TOP | BS_MULTILINE EDITTEXT IDC_LOGON_ACCOUNTNAME, 72, 50, 103, 14, ES_LEFT | ES_AUTOHSCROLL | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_GROUP | WS_TABSTOP - PUSHBUTTON "&Browse...", IDC_LOGON_SEARCH, 185, 50, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "&Esplora...", IDC_LOGON_SEARCH, 185, 50, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP LTEXT "&Password:", IDC_LOGON_PW1TEXT, 18, 71, 33, 8, WS_CHILD | WS_VISIBLE | WS_DISABLED | WS_GROUP EDITTEXT IDC_LOGON_PASSWORD1, 72, 68, 104, 14, ES_LEFT | ES_PASSWORD | ES_AUTOHSCROLL | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP - LTEXT "&Confirm password:", IDC_LOGON_PW2TEXT, 18, 84, 47, 18, WS_CHILD | WS_VISIBLE | WS_DISABLED | WS_GROUP + LTEXT "&Conferma password:", IDC_LOGON_PW2TEXT, 18, 84, 47, 18, WS_CHILD | WS_VISIBLE | WS_DISABLED | WS_GROUP EDITTEXT IDC_LOGON_PASSWORD2, 72, 86, 104, 14, ES_LEFT | ES_PASSWORD | ES_AUTOHSCROLL | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP - LTEXT "You can enable or disable this service for the hardware profiles listed below:", IDC_STATIC, 7, 114, 210, 8, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Puoi abilitare o disabilitare questo servizio per i profili hardware elencate sotto:", IDC_STATIC, 7, 114, 210, 8, WS_CHILD | WS_VISIBLE | WS_GROUP CONTROL "", IDC_LOGON_HWPROFILE, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_GROUP | WS_TABSTOP, 7, 124, 238, 65 - PUSHBUTTON "&Enable", IDC_LOGON_HWENABLE, 116, 197, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_DISABLED - PUSHBUTTON "&Disable", IDC_LOGON_HWDISABLE, 185, 197, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_DISABLED + PUSHBUTTON "&Abilita", IDC_LOGON_HWENABLE, 116, 197, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_DISABLED + PUSHBUTTON "&Disabilita", IDC_LOGON_HWDISABLE, 185, 197, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_DISABLED END IDD_RECOVERY DIALOGEX 6, 6, 253, 232 -CAPTION "Recovery" +CAPTION "Recupero" FONT 8, "MS Shell Dlg", 0, 0 STYLE DS_SHELLFONT | WS_BORDER | WS_VISIBLE | WS_DLGFRAME | WS_SYSMENU | WS_GROUP | WS_TABSTOP BEGIN - LTEXT "Select the computer's response if this service fails.", IDC_STATIC, 7, 7, 238, 8 - LTEXT "&First failure:", IDC_STATIC, 7, 24, 92, 8 + LTEXT "Seleziona la risposta del computer se questo servizio fallisce.", IDC_STATIC, 7, 7, 238, 8 + LTEXT "&Primo errore:", IDC_STATIC, 7, 24, 92, 8 COMBOBOX IDC_FIRST_FAILURE, 104, 22, 141, 147, WS_CHILD | WS_VISIBLE | WS_TABSTOP | CBS_DROPDOWNLIST - LTEXT "&Second failure:", IDC_STATIC, 7, 41, 92, 8 + LTEXT "&Secondo errore:", IDC_STATIC, 7, 41, 92, 8 COMBOBOX IDC_SECOND_FAILURE, 104, 39, 141, 147, WS_CHILD | WS_VISIBLE | WS_TABSTOP | CBS_DROPDOWNLIST - LTEXT "Subsequent failures:", IDC_STATIC, 7, 58, 92, 8 + LTEXT "Errori successivi:", IDC_STATIC, 7, 58, 92, 8 COMBOBOX IDC_SUBSEQUENT_FAILURES, 104, 56, 141, 147, WS_CHILD | WS_VISIBLE | WS_TABSTOP | CBS_DROPDOWNLIST - LTEXT "Reset fail c&ounter after:", IDC_STATIC, 7, 75, 72, 8 + LTEXT "Ripristina il c&ontatore di errore dopo:", IDC_STATIC, 7, 75, 72, 8 EDITTEXT IDC_RESET_TIME, 104, 73, 40, 13, WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP | ES_LEFT | ES_AUTOHSCROLL | ES_NUMBER - LTEXT "days", IDC_STATIC, 150, 75, 95, 8 - LTEXT "Restart ser&vice after:", IDC_RESTART_TEXT1, 7, 92, 92, 8 + LTEXT "giorni", IDC_STATIC, 150, 75, 95, 8 + LTEXT "Riavvia il ser&vizio dopo:", IDC_RESTART_TEXT1, 7, 92, 92, 8 EDITTEXT IDC_RESTART_TIME, 104, 90, 40, 13, WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP | ES_LEFT | ES_AUTOHSCROLL | ES_NUMBER - LTEXT "minutes", IDC_RESTART_TEXT2, 150, 92, 95, 8 - GROUPBOX "Run program", IDC_RUN_GROUPBOX, 7, 108, 238, 80 - LTEXT "&Program:", IDC_RUN_TEXT1, 14, 121, 168, 8 + LTEXT "minuti", IDC_RESTART_TEXT2, 150, 92, 95, 8 + GROUPBOX "Avvia un programma", IDC_RUN_GROUPBOX, 7, 108, 238, 80 + LTEXT "&Programma:", IDC_RUN_TEXT1, 14, 121, 168, 8 EDITTEXT IDC_PROGRAM, 14, 131, 165, 14 - PUSHBUTTON "&Browse...", IDC_BROWSE_PROGRAM, 180, 131, 58, 14 - LTEXT "&Command line parameters:", IDC_RUN_TEXT2, 14, 155, 108, 8 + PUSHBUTTON "&Esplora...", IDC_BROWSE_PROGRAM, 180, 131, 58, 14 + LTEXT "&Parametri di riga di comando:", IDC_RUN_TEXT2, 14, 155, 108, 8 EDITTEXT IDC_PARAMETERS, 128, 152, 110, 14 - AUTOCHECKBOX "Append fail count to &end of command line (/fail=%1%)", IDC_ADD_FAILCOUNT, 14, 171, 219, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP | BS_TOP | BS_MULTILINE - PUSHBUTTON "&Restart Computer Options...", IDC_RESTART_OPTIONS, 116, 197, 129, 14 + AUTOCHECKBOX "Aggiungi il conteggio degli errori alla &fine della riga di comando (/fail=%1%)", IDC_ADD_FAILCOUNT, 14, 171, 219, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP | BS_TOP | BS_MULTILINE + PUSHBUTTON "&Opzioni Riavviamento Computer...", IDC_RESTART_OPTIONS, 116, 197, 129, 14 END IDD_DLG_DEPEND DIALOGEX 6, 6, 253, 225 @@ -336,14 +336,14 @@ END STRINGTABLE BEGIN - IDS_NO_ACTION "Take no action" - IDS_RESTART_SERVICE "Restart the Service" - IDS_RUN_PROGRAM "Run a Program" - IDS_RESTART_COMPUTER "Restart the Computer" + IDS_NO_ACTION "Non agire" + IDS_RESTART_SERVICE "Riavvia il Servizio" + IDS_RUN_PROGRAM "Avvia un Programma" + IDS_RESTART_COMPUTER "Riavvia il Computer" END STRINGTABLE BEGIN - IDS_NOT_SAME_PASSWORD "The Passwords are not the same!" - IDS_INVALID_PASSWORD "Enter a valid Password!" + IDS_NOT_SAME_PASSWORD "Le Password non sono uguali!" + IDS_INVALID_PASSWORD "Inserisci una Password valida!" END

6 years, 8 months

01/01: [WINLOGON] System shutdown dialog clean-up - Replace the winlogon icon by the warning icon. - Add more space for the main text. - Move the shutdown time into a separate line to ensure it is always fully visible. - Add more space for the shutdown message and keep the message empty by default. - Clean up the resource IDs.

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9a6d4bf0c5b6ddebd1a7f… commit 9a6d4bf0c5b6ddebd1a7f66012d0c3170dc249b2 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Mon Apr 2 13:33:41 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Mon Apr 2 13:33:41 2018 +0200 [WINLOGON] System shutdown dialog clean-up - Replace the winlogon icon by the warning icon. - Add more space for the main text. - Move the shutdown time into a separate line to ensure it is always fully visible. - Add more space for the shutdown message and keep the message empty by default. - Clean up the resource IDs. --- base/system/winlogon/lang/bg-BG.rc | 12 +++++++----- base/system/winlogon/lang/cs-CZ.rc | 12 +++++++----- base/system/winlogon/lang/de-DE.rc | 12 +++++++----- base/system/winlogon/lang/el-GR.rc | 12 +++++++----- base/system/winlogon/lang/en-US.rc | 12 +++++++----- base/system/winlogon/lang/es-ES.rc | 12 +++++++----- base/system/winlogon/lang/fr-FR.rc | 12 +++++++----- base/system/winlogon/lang/he-IL.rc | 12 +++++++----- base/system/winlogon/lang/hu-HU.rc | 12 +++++++----- base/system/winlogon/lang/id-ID.rc | 12 +++++++----- base/system/winlogon/lang/it-IT.rc | 12 +++++++----- base/system/winlogon/lang/ja-JP.rc | 12 +++++++----- base/system/winlogon/lang/lt-LT.rc | 12 +++++++----- base/system/winlogon/lang/ms-MY.rc | 12 +++++++----- base/system/winlogon/lang/nl-NL.rc | 12 +++++++----- base/system/winlogon/lang/no-NO.rc | 12 +++++++----- base/system/winlogon/lang/pl-PL.rc | 12 +++++++----- base/system/winlogon/lang/pt-BR.rc | 12 +++++++----- base/system/winlogon/lang/ro-RO.rc | 12 +++++++----- base/system/winlogon/lang/ru-RU.rc | 12 +++++++----- base/system/winlogon/lang/sk-SK.rc | 12 +++++++----- base/system/winlogon/lang/sq-AL.rc | 12 +++++++----- base/system/winlogon/lang/sv-SE.rc | 12 +++++++----- base/system/winlogon/lang/tr-TR.rc | 12 +++++++----- base/system/winlogon/lang/uk-UA.rc | 12 +++++++----- base/system/winlogon/lang/zh-CN.rc | 12 +++++++----- base/system/winlogon/lang/zh-TW.rc | 12 +++++++----- base/system/winlogon/resource.h | 23 ++++++++++------------- base/system/winlogon/shutdown.c | 4 ++-- 29 files changed, 201 insertions(+), 150 deletions(-) diff --git a/base/system/winlogon/lang/bg-BG.rc b/base/system/winlogon/lang/bg-BG.rc index 310842acfc..c4909af9af 100644 --- a/base/system/winlogon/lang/bg-BG.rc +++ b/base/system/winlogon/lang/bg-BG.rc @@ -20,15 +20,17 @@ BEGIN DEFPUSHBUTTON "Пре&запуск", 1, 80, 91, 68, 14 END -IDD_SYSSHUTDOWN DIALOGEX 50, 50, 162, 100 +IDD_SYSSHUTDOWN DIALOGEX 50, 50, 180, 140 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_CAPTION | WS_POPUP CAPTION "System Shutdown" FONT 8, "MS Shell Dlg" BEGIN - ICON IDI_WINLOGON, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20 - LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down in:", IDC_SYSSHUTDOWNMSG, 38, 7, 124, 31 - LTEXT "", IDC_SHUTDOWNTIMELEFT, 38, 38, 124, 14 - LTEXT "No shutdown comment given.", IDC_SHUTDOWNCOMMENT, 38, 52, 124, 55 + ICON IDI_WARNING, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20 + LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down.", -1, 38, 7, 135, 40 + LTEXT "The system shuts down in:", -1, 38, 50, 90, 8 + LTEXT "00:00:00", IDC_SYSSHUTDOWNTIMELEFT, 132, 50, 41, 8 + LTEXT "Message:", -1, 38, 65, 135, 8 + LTEXT "", IDC_SYSSHUTDOWNMESSAGE, 38, 75, 135, 58 END STRINGTABLE diff --git a/base/system/winlogon/lang/cs-CZ.rc b/base/system/winlogon/lang/cs-CZ.rc index 503c231227..a5aee95484 100644 --- a/base/system/winlogon/lang/cs-CZ.rc +++ b/base/system/winlogon/lang/cs-CZ.rc @@ -20,15 +20,17 @@ BEGIN DEFPUSHBUTTON "&Restart", 1, 80, 91, 68, 14 END -IDD_SYSSHUTDOWN DIALOGEX 50, 50, 162, 100 +IDD_SYSSHUTDOWN DIALOGEX 50, 50, 180, 140 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_CAPTION | WS_POPUP CAPTION "System Shutdown" FONT 8, "MS Shell Dlg" BEGIN - ICON IDI_WINLOGON, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20 - LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down in:", IDC_SYSSHUTDOWNMSG, 38, 7, 124, 31 - LTEXT "", IDC_SHUTDOWNTIMELEFT, 38, 38, 124, 14 - LTEXT "No shutdown comment given.", IDC_SHUTDOWNCOMMENT, 38, 52, 124, 55 + ICON IDI_WARNING, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20 + LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down.", -1, 38, 7, 135, 40 + LTEXT "The system shuts down in:", -1, 38, 50, 90, 8 + LTEXT "00:00:00", IDC_SYSSHUTDOWNTIMELEFT, 132, 50, 41, 8 + LTEXT "Message:", -1, 38, 65, 135, 8 + LTEXT "", IDC_SYSSHUTDOWNMESSAGE, 38, 75, 135, 58 END STRINGTABLE diff --git a/base/system/winlogon/lang/de-DE.rc b/base/system/winlogon/lang/de-DE.rc index cf698c6e40..0c6065a3e8 100644 --- a/base/system/winlogon/lang/de-DE.rc +++ b/base/system/winlogon/lang/de-DE.rc @@ -22,15 +22,17 @@ BEGIN DEFPUSHBUTTON "Neusta&rt", 1, 80, 91, 68, 14 END -IDD_SYSSHUTDOWN DIALOGEX 50, 50, 162, 100 +IDD_SYSSHUTDOWN DIALOGEX 50, 50, 180, 140 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_CAPTION | WS_POPUP CAPTION "System Shutdown" FONT 8, "MS Shell Dlg" BEGIN - ICON IDI_WINLOGON, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20 - LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down in:", IDC_SYSSHUTDOWNMSG, 38, 7, 124, 31 - LTEXT "", IDC_SHUTDOWNTIMELEFT, 38, 38, 124, 14 - LTEXT "No shutdown comment given.", IDC_SHUTDOWNCOMMENT, 38, 52, 124, 55 + ICON IDI_WARNING, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20 + LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down.", -1, 38, 7, 135, 40 + LTEXT "The system shuts down in:", -1, 38, 50, 90, 8 + LTEXT "00:00:00", IDC_SYSSHUTDOWNTIMELEFT, 132, 50, 41, 8 + LTEXT "Message:", -1, 38, 65, 135, 8 + LTEXT "", IDC_SYSSHUTDOWNMESSAGE, 38, 75, 135, 58 END STRINGTABLE diff --git a/base/system/winlogon/lang/el-GR.rc b/base/system/winlogon/lang/el-GR.rc index d4663ce8c4..f1b6eee22d 100644 --- a/base/system/winlogon/lang/el-GR.rc +++ b/base/system/winlogon/lang/el-GR.rc @@ -20,15 +20,17 @@ BEGIN DEFPUSHBUTTON "&Restart", 1, 80, 91, 68, 14 END -IDD_SYSSHUTDOWN DIALOGEX 50, 50, 162, 100 +IDD_SYSSHUTDOWN DIALOGEX 50, 50, 180, 140 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_CAPTION | WS_POPUP CAPTION "System Shutdown" FONT 8, "MS Shell Dlg" BEGIN - ICON IDI_WINLOGON, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20 - LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down in:", IDC_SYSSHUTDOWNMSG, 38, 7, 124, 31 - LTEXT "", IDC_SHUTDOWNTIMELEFT, 38, 38, 124, 14 - LTEXT "No shutdown comment given.", IDC_SHUTDOWNCOMMENT, 38, 52, 124, 55 + ICON IDI_WARNING, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20 + LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down.", -1, 38, 7, 135, 40 + LTEXT "The system shuts down in:", -1, 38, 50, 90, 8 + LTEXT "00:00:00", IDC_SYSSHUTDOWNTIMELEFT, 132, 50, 41, 8 + LTEXT "Message:", -1, 38, 65, 135, 8 + LTEXT "", IDC_SYSSHUTDOWNMESSAGE, 38, 75, 135, 58 END STRINGTABLE diff --git a/base/system/winlogon/lang/en-US.rc b/base/system/winlogon/lang/en-US.rc index 2369394828..1fa1c71d8b 100644 --- a/base/system/winlogon/lang/en-US.rc +++ b/base/system/winlogon/lang/en-US.rc @@ -20,15 +20,17 @@ BEGIN DEFPUSHBUTTON "&Restart", 1, 80, 91, 68, 14 END -IDD_SYSSHUTDOWN DIALOGEX 50, 50, 162, 100 +IDD_SYSSHUTDOWN DIALOGEX 50, 50, 180, 140 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_CAPTION | WS_POPUP CAPTION "System Shutdown" FONT 8, "MS Shell Dlg" BEGIN - ICON IDI_WINLOGON, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20 - LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down in:", IDC_SYSSHUTDOWNMSG, 38, 7, 124, 31 - LTEXT "", IDC_SHUTDOWNTIMELEFT, 38, 38, 124, 14 - LTEXT "No shutdown comment given.", IDC_SHUTDOWNCOMMENT, 38, 52, 124, 55 + ICON IDI_WARNING, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20 + LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down.", -1, 38, 7, 135, 40 + LTEXT "The system shuts down in:", -1, 38, 50, 90, 8 + LTEXT "00:00:00", IDC_SYSSHUTDOWNTIMELEFT, 132, 50, 41, 8 + LTEXT "Message:", -1, 38, 65, 135, 8 + LTEXT "", IDC_SYSSHUTDOWNMESSAGE, 38, 75, 135, 58 END STRINGTABLE diff --git a/base/system/winlogon/lang/es-ES.rc b/base/system/winlogon/lang/es-ES.rc index 60e4334411..772184ebe3 100644 --- a/base/system/winlogon/lang/es-ES.rc +++ b/base/system/winlogon/lang/es-ES.rc @@ -22,15 +22,17 @@ BEGIN DEFPUSHBUTTON "&Reiniciar", 1, 80, 91, 68, 14 END -IDD_SYSSHUTDOWN DIALOGEX 50, 50, 162, 100 +IDD_SYSSHUTDOWN DIALOGEX 50, 50, 180, 140 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_CAPTION | WS_POPUP CAPTION "System Shutdown" FONT 8, "MS Shell Dlg" BEGIN - ICON IDI_WINLOGON, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20 - LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down in:", IDC_SYSSHUTDOWNMSG, 38, 7, 124, 31 - LTEXT "", IDC_SHUTDOWNTIMELEFT, 38, 38, 124, 14 - LTEXT "No shutdown comment given.", IDC_SHUTDOWNCOMMENT, 38, 52, 124, 55 + ICON IDI_WARNING, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20 + LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down.", -1, 38, 7, 135, 40 + LTEXT "The system shuts down in:", -1, 38, 50, 90, 8 + LTEXT "00:00:00", IDC_SYSSHUTDOWNTIMELEFT, 132, 50, 41, 8 + LTEXT "Message:", -1, 38, 65, 135, 8 + LTEXT "", IDC_SYSSHUTDOWNMESSAGE, 38, 75, 135, 58 END STRINGTABLE diff --git a/base/system/winlogon/lang/fr-FR.rc b/base/system/winlogon/lang/fr-FR.rc index eab9d4b572..e9cba337c9 100644 --- a/base/system/winlogon/lang/fr-FR.rc +++ b/base/system/winlogon/lang/fr-FR.rc @@ -22,15 +22,17 @@ BEGIN DEFPUSHBUTTON "&Redémarrer", 1, 80, 91, 68, 14 END -IDD_SYSSHUTDOWN DIALOGEX 50, 50, 162, 100 +IDD_SYSSHUTDOWN DIALOGEX 50, 50, 180, 140 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_CAPTION | WS_POPUP CAPTION "System Shutdown" FONT 8, "MS Shell Dlg" BEGIN - ICON IDI_WINLOGON, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20 - LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down in:", IDC_SYSSHUTDOWNMSG, 38, 7, 124, 31 - LTEXT "", IDC_SHUTDOWNTIMELEFT, 38, 38, 124, 14 - LTEXT "No shutdown comment given.", IDC_SHUTDOWNCOMMENT, 38, 52, 124, 55 + ICON IDI_WARNING, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20 + LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down.", -1, 38, 7, 135, 40 + LTEXT "The system shuts down in:", -1, 38, 50, 90, 8 + LTEXT "00:00:00", IDC_SYSSHUTDOWNTIMELEFT, 132, 50, 41, 8 + LTEXT "Message:", -1, 38, 65, 135, 8 + LTEXT "", IDC_SYSSHUTDOWNMESSAGE, 38, 75, 135, 58 END STRINGTABLE diff --git a/base/system/winlogon/lang/he-IL.rc b/base/system/winlogon/lang/he-IL.rc index 0b900ec96c..ebf4b2fb14 100644 --- a/base/system/winlogon/lang/he-IL.rc +++ b/base/system/winlogon/lang/he-IL.rc @@ -22,15 +22,17 @@ BEGIN DEFPUSHBUTTON "הפעל מחדש", 1, 59, 32, 49, 14 END -IDD_SYSSHUTDOWN DIALOGEX 50, 50, 162, 100 +IDD_SYSSHUTDOWN DIALOGEX 50, 50, 180, 140 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_CAPTION | WS_POPUP CAPTION "System Shutdown" FONT 8, "MS Shell Dlg" BEGIN - ICON IDI_WINLOGON, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20 - LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down in:", IDC_SYSSHUTDOWNMSG, 38, 7, 124, 31 - LTEXT "", IDC_SHUTDOWNTIMELEFT, 38, 38, 124, 14 - LTEXT "No shutdown comment given.", IDC_SHUTDOWNCOMMENT, 38, 52, 124, 55 + ICON IDI_WARNING, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20 + LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down.", -1, 38, 7, 135, 40 + LTEXT "The system shuts down in:", -1, 38, 50, 90, 8 + LTEXT "00:00:00", IDC_SYSSHUTDOWNTIMELEFT, 132, 50, 41, 8 + LTEXT "Message:", -1, 38, 65, 135, 8 + LTEXT "", IDC_SYSSHUTDOWNMESSAGE, 38, 75, 135, 58 END STRINGTABLE diff --git a/base/system/winlogon/lang/hu-HU.rc b/base/system/winlogon/lang/hu-HU.rc index 14c127a362..c0c8974e8a 100644 --- a/base/system/winlogon/lang/hu-HU.rc +++ b/base/system/winlogon/lang/hu-HU.rc @@ -22,15 +22,17 @@ BEGIN DEFPUSHBUTTON "&Újraindítás", 1, 80, 91, 68, 14 END -IDD_SYSSHUTDOWN DIALOGEX 50, 50, 162, 100 +IDD_SYSSHUTDOWN DIALOGEX 50, 50, 180, 140 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_CAPTION | WS_POPUP CAPTION "System Shutdown" FONT 8, "MS Shell Dlg" BEGIN - ICON IDI_WINLOGON, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20 - LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down in:", IDC_SYSSHUTDOWNMSG, 38, 7, 124, 31 - LTEXT "", IDC_SHUTDOWNTIMELEFT, 38, 38, 124, 14 - LTEXT "No shutdown comment given.", IDC_SHUTDOWNCOMMENT, 38, 52, 124, 55 + ICON IDI_WARNING, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20 + LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down.", -1, 38, 7, 135, 40 + LTEXT "The system shuts down in:", -1, 38, 50, 90, 8 + LTEXT "00:00:00", IDC_SYSSHUTDOWNTIMELEFT, 132, 50, 41, 8 + LTEXT "Message:", -1, 38, 65, 135, 8 + LTEXT "", IDC_SYSSHUTDOWNMESSAGE, 38, 75, 135, 58 END STRINGTABLE diff --git a/base/system/winlogon/lang/id-ID.rc b/base/system/winlogon/lang/id-ID.rc index c8fec2c143..9cc54d5632 100644 --- a/base/system/winlogon/lang/id-ID.rc +++ b/base/system/winlogon/lang/id-ID.rc @@ -22,15 +22,17 @@ BEGIN DEFPUSHBUTTON "&Mulai Lagi", 1, 80, 91, 68, 14 END -IDD_SYSSHUTDOWN DIALOGEX 50, 50, 162, 100 +IDD_SYSSHUTDOWN DIALOGEX 50, 50, 180, 140 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_CAPTION | WS_POPUP CAPTION "System Shutdown" FONT 8, "MS Shell Dlg" BEGIN - ICON IDI_WINLOGON, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20 - LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down in:", IDC_SYSSHUTDOWNMSG, 38, 7, 124, 31 - LTEXT "", IDC_SHUTDOWNTIMELEFT, 38, 38, 124, 14 - LTEXT "No shutdown comment given.", IDC_SHUTDOWNCOMMENT, 38, 52, 124, 55 + ICON IDI_WARNING, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20 + LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down.", -1, 38, 7, 135, 40 + LTEXT "The system shuts down in:", -1, 38, 50, 90, 8 + LTEXT "00:00:00", IDC_SYSSHUTDOWNTIMELEFT, 132, 50, 41, 8 + LTEXT "Message:", -1, 38, 65, 135, 8 + LTEXT "", IDC_SYSSHUTDOWNMESSAGE, 38, 75, 135, 58 END STRINGTABLE diff --git a/base/system/winlogon/lang/it-IT.rc b/base/system/winlogon/lang/it-IT.rc index f16f126013..dc2ab0d8ee 100644 --- a/base/system/winlogon/lang/it-IT.rc +++ b/base/system/winlogon/lang/it-IT.rc @@ -20,15 +20,17 @@ BEGIN DEFPUSHBUTTON "&Riavvio", 1, 80, 91, 68, 14 END -IDD_SYSSHUTDOWN DIALOGEX 50, 50, 162, 100 +IDD_SYSSHUTDOWN DIALOGEX 50, 50, 180, 140 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_CAPTION | WS_POPUP CAPTION "System Shutdown" FONT 8, "MS Shell Dlg" BEGIN - ICON IDI_WINLOGON, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20 - LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down in:", IDC_SYSSHUTDOWNMSG, 38, 7, 124, 31 - LTEXT "", IDC_SHUTDOWNTIMELEFT, 38, 38, 124, 14 - LTEXT "No shutdown comment given.", IDC_SHUTDOWNCOMMENT, 38, 52, 124, 55 + ICON IDI_WARNING, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20 + LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down.", -1, 38, 7, 135, 40 + LTEXT "The system shuts down in:", -1, 38, 50, 90, 8 + LTEXT "00:00:00", IDC_SYSSHUTDOWNTIMELEFT, 132, 50, 41, 8 + LTEXT "Message:", -1, 38, 65, 135, 8 + LTEXT "", IDC_SYSSHUTDOWNMESSAGE, 38, 75, 135, 58 END STRINGTABLE diff --git a/base/system/winlogon/lang/ja-JP.rc b/base/system/winlogon/lang/ja-JP.rc index fd586f3d22..30eeb77fb2 100644 --- a/base/system/winlogon/lang/ja-JP.rc +++ b/base/system/winlogon/lang/ja-JP.rc @@ -20,15 +20,17 @@ BEGIN DEFPUSHBUTTON "再起動(&R)", 1, 80, 91, 68, 14 END -IDD_SYSSHUTDOWN DIALOGEX 50, 50, 162, 100 +IDD_SYSSHUTDOWN DIALOGEX 50, 50, 180, 140 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_CAPTION | WS_POPUP CAPTION "System Shutdown" FONT 8, "MS Shell Dlg" BEGIN - ICON IDI_WINLOGON, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20 - LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down in:", IDC_SYSSHUTDOWNMSG, 38, 7, 124, 31 - LTEXT "", IDC_SHUTDOWNTIMELEFT, 38, 38, 124, 14 - LTEXT "No shutdown comment given.", IDC_SHUTDOWNCOMMENT, 38, 52, 124, 55 + ICON IDI_WARNING, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20 + LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down.", -1, 38, 7, 135, 40 + LTEXT "The system shuts down in:", -1, 38, 50, 90, 8 + LTEXT "00:00:00", IDC_SYSSHUTDOWNTIMELEFT, 132, 50, 41, 8 + LTEXT "Message:", -1, 38, 65, 135, 8 + LTEXT "", IDC_SYSSHUTDOWNMESSAGE, 38, 75, 135, 58 END STRINGTABLE diff --git a/base/system/winlogon/lang/lt-LT.rc b/base/system/winlogon/lang/lt-LT.rc index dd4ea23200..6aba0931c6 100644 --- a/base/system/winlogon/lang/lt-LT.rc +++ b/base/system/winlogon/lang/lt-LT.rc @@ -22,15 +22,17 @@ BEGIN DEFPUSHBUTTON "&Perkrauti", 1, 80, 91, 68, 14 END -IDD_SYSSHUTDOWN DIALOGEX 50, 50, 162, 100 +IDD_SYSSHUTDOWN DIALOGEX 50, 50, 180, 140 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_CAPTION | WS_POPUP CAPTION "System Shutdown" FONT 8, "MS Shell Dlg" BEGIN - ICON IDI_WINLOGON, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20 - LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down in:", IDC_SYSSHUTDOWNMSG, 38, 7, 124, 31 - LTEXT "", IDC_SHUTDOWNTIMELEFT, 38, 38, 124, 14 - LTEXT "No shutdown comment given.", IDC_SHUTDOWNCOMMENT, 38, 52, 124, 55 + ICON IDI_WARNING, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20 + LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down.", -1, 38, 7, 135, 40 + LTEXT "The system shuts down in:", -1, 38, 50, 90, 8 + LTEXT "00:00:00", IDC_SYSSHUTDOWNTIMELEFT, 132, 50, 41, 8 + LTEXT "Message:", -1, 38, 65, 135, 8 + LTEXT "", IDC_SYSSHUTDOWNMESSAGE, 38, 75, 135, 58 END STRINGTABLE diff --git a/base/system/winlogon/lang/ms-MY.rc b/base/system/winlogon/lang/ms-MY.rc index b2a1ec4cc1..fa4cca5d5f 100644 --- a/base/system/winlogon/lang/ms-MY.rc +++ b/base/system/winlogon/lang/ms-MY.rc @@ -22,15 +22,17 @@ BEGIN DEFPUSHBUTTON "Mula semula(&R)", 1, 80, 91, 68, 14 END -IDD_SYSSHUTDOWN DIALOGEX 50, 50, 162, 100 +IDD_SYSSHUTDOWN DIALOGEX 50, 50, 180, 140 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_CAPTION | WS_POPUP CAPTION "System Shutdown" FONT 8, "MS Shell Dlg" BEGIN - ICON IDI_WINLOGON, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20 - LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down in:", IDC_SYSSHUTDOWNMSG, 38, 7, 124, 31 - LTEXT "", IDC_SHUTDOWNTIMELEFT, 38, 38, 124, 14 - LTEXT "No shutdown comment given.", IDC_SHUTDOWNCOMMENT, 38, 52, 124, 55 + ICON IDI_WARNING, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20 + LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down.", -1, 38, 7, 135, 40 + LTEXT "The system shuts down in:", -1, 38, 50, 90, 8 + LTEXT "00:00:00", IDC_SYSSHUTDOWNTIMELEFT, 132, 50, 41, 8 + LTEXT "Message:", -1, 38, 65, 135, 8 + LTEXT "", IDC_SYSSHUTDOWNMESSAGE, 38, 75, 135, 58 END STRINGTABLE diff --git a/base/system/winlogon/lang/nl-NL.rc b/base/system/winlogon/lang/nl-NL.rc index 53967ff4ba..fa28236f5c 100644 --- a/base/system/winlogon/lang/nl-NL.rc +++ b/base/system/winlogon/lang/nl-NL.rc @@ -20,15 +20,17 @@ BEGIN DEFPUSHBUTTON "&Restart", 1, 80, 91, 68, 14 END -IDD_SYSSHUTDOWN DIALOGEX 50, 50, 162, 100 +IDD_SYSSHUTDOWN DIALOGEX 50, 50, 180, 140 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_CAPTION | WS_POPUP CAPTION "System Shutdown" FONT 8, "MS Shell Dlg" BEGIN - ICON IDI_WINLOGON, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20 - LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down in:", IDC_SYSSHUTDOWNMSG, 38, 7, 124, 31 - LTEXT "", IDC_SHUTDOWNTIMELEFT, 38, 38, 124, 14 - LTEXT "No shutdown comment given.", IDC_SHUTDOWNCOMMENT, 38, 52, 124, 55 + ICON IDI_WARNING, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20 + LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down.", -1, 38, 7, 135, 40 + LTEXT "The system shuts down in:", -1, 38, 50, 90, 8 + LTEXT "00:00:00", IDC_SYSSHUTDOWNTIMELEFT, 132, 50, 41, 8 + LTEXT "Message:", -1, 38, 65, 135, 8 + LTEXT "", IDC_SYSSHUTDOWNMESSAGE, 38, 75, 135, 58 END STRINGTABLE diff --git a/base/system/winlogon/lang/no-NO.rc b/base/system/winlogon/lang/no-NO.rc index 799df12b59..0f7ef7e4b3 100644 --- a/base/system/winlogon/lang/no-NO.rc +++ b/base/system/winlogon/lang/no-NO.rc @@ -20,15 +20,17 @@ BEGIN DEFPUSHBUTTON "&Restart", 1, 80, 91, 68, 14 END -IDD_SYSSHUTDOWN DIALOGEX 50, 50, 162, 100 +IDD_SYSSHUTDOWN DIALOGEX 50, 50, 180, 140 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_CAPTION | WS_POPUP CAPTION "System Shutdown" FONT 8, "MS Shell Dlg" BEGIN - ICON IDI_WINLOGON, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20 - LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down in:", IDC_SYSSHUTDOWNMSG, 38, 7, 124, 31 - LTEXT "", IDC_SHUTDOWNTIMELEFT, 38, 38, 124, 14 - LTEXT "No shutdown comment given.", IDC_SHUTDOWNCOMMENT, 38, 52, 124, 55 + ICON IDI_WARNING, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20 + LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down.", -1, 38, 7, 135, 40 + LTEXT "The system shuts down in:", -1, 38, 50, 90, 8 + LTEXT "00:00:00", IDC_SYSSHUTDOWNTIMELEFT, 132, 50, 41, 8 + LTEXT "Message:", -1, 38, 65, 135, 8 + LTEXT "", IDC_SYSSHUTDOWNMESSAGE, 38, 75, 135, 58 END STRINGTABLE diff --git a/base/system/winlogon/lang/pl-PL.rc b/base/system/winlogon/lang/pl-PL.rc index a4a8f2c65c..2c3f93c311 100644 --- a/base/system/winlogon/lang/pl-PL.rc +++ b/base/system/winlogon/lang/pl-PL.rc @@ -27,15 +27,17 @@ BEGIN DEFPUSHBUTTON "&Uruchom ponownie", 1, 80, 91, 68, 14 END -IDD_SYSSHUTDOWN DIALOGEX 50, 50, 162, 100 +IDD_SYSSHUTDOWN DIALOGEX 50, 50, 180, 140 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_CAPTION | WS_POPUP CAPTION "System Shutdown" FONT 8, "MS Shell Dlg" BEGIN - ICON IDI_WINLOGON, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20 - LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down in:", IDC_SYSSHUTDOWNMSG, 38, 7, 124, 31 - LTEXT "", IDC_SHUTDOWNTIMELEFT, 38, 38, 124, 14 - LTEXT "No shutdown comment given.", IDC_SHUTDOWNCOMMENT, 38, 52, 124, 55 + ICON IDI_WARNING, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20 + LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down.", -1, 38, 7, 135, 40 + LTEXT "The system shuts down in:", -1, 38, 50, 90, 8 + LTEXT "00:00:00", IDC_SYSSHUTDOWNTIMELEFT, 132, 50, 41, 8 + LTEXT "Message:", -1, 38, 65, 135, 8 + LTEXT "", IDC_SYSSHUTDOWNMESSAGE, 38, 75, 135, 58 END STRINGTABLE diff --git a/base/system/winlogon/lang/pt-BR.rc b/base/system/winlogon/lang/pt-BR.rc index 58e107b261..346887795c 100644 --- a/base/system/winlogon/lang/pt-BR.rc +++ b/base/system/winlogon/lang/pt-BR.rc @@ -22,15 +22,17 @@ BEGIN DEFPUSHBUTTON "&Reiniciar", 1, 80, 91, 68, 14 END -IDD_SYSSHUTDOWN DIALOGEX 50, 50, 162, 100 +IDD_SYSSHUTDOWN DIALOGEX 50, 50, 180, 140 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_CAPTION | WS_POPUP CAPTION "System Shutdown" FONT 8, "MS Shell Dlg" BEGIN - ICON IDI_WINLOGON, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20 - LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down in:", IDC_SYSSHUTDOWNMSG, 38, 7, 124, 31 - LTEXT "", IDC_SHUTDOWNTIMELEFT, 38, 38, 124, 14 - LTEXT "No shutdown comment given.", IDC_SHUTDOWNCOMMENT, 38, 52, 124, 55 + ICON IDI_WARNING, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20 + LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down.", -1, 38, 7, 135, 40 + LTEXT "The system shuts down in:", -1, 38, 50, 90, 8 + LTEXT "00:00:00", IDC_SYSSHUTDOWNTIMELEFT, 132, 50, 41, 8 + LTEXT "Message:", -1, 38, 65, 135, 8 + LTEXT "", IDC_SYSSHUTDOWNMESSAGE, 38, 75, 135, 58 END STRINGTABLE diff --git a/base/system/winlogon/lang/ro-RO.rc b/base/system/winlogon/lang/ro-RO.rc index edad82edf6..f7684533d0 100644 --- a/base/system/winlogon/lang/ro-RO.rc +++ b/base/system/winlogon/lang/ro-RO.rc @@ -29,15 +29,17 @@ BEGIN DEFPUSHBUTTON "&Repornire", 1, 80, 91, 68, 14 END -IDD_SYSSHUTDOWN DIALOGEX 50, 50, 162, 100 +IDD_SYSSHUTDOWN DIALOGEX 50, 50, 180, 140 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_CAPTION | WS_POPUP CAPTION "System Shutdown" FONT 8, "MS Shell Dlg" BEGIN - ICON IDI_WINLOGON, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20 - LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down in:", IDC_SYSSHUTDOWNMSG, 38, 7, 124, 31 - LTEXT "", IDC_SHUTDOWNTIMELEFT, 38, 38, 124, 14 - LTEXT "No shutdown comment given.", IDC_SHUTDOWNCOMMENT, 38, 52, 124, 55 + ICON IDI_WARNING, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20 + LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down.", -1, 38, 7, 135, 40 + LTEXT "The system shuts down in:", -1, 38, 50, 90, 8 + LTEXT "00:00:00", IDC_SYSSHUTDOWNTIMELEFT, 132, 50, 41, 8 + LTEXT "Message:", -1, 38, 65, 135, 8 + LTEXT "", IDC_SYSSHUTDOWNMESSAGE, 38, 75, 135, 58 END STRINGTABLE diff --git a/base/system/winlogon/lang/ru-RU.rc b/base/system/winlogon/lang/ru-RU.rc index efa60bec94..479b0dd062 100644 --- a/base/system/winlogon/lang/ru-RU.rc +++ b/base/system/winlogon/lang/ru-RU.rc @@ -20,15 +20,17 @@ BEGIN DEFPUSHBUTTON "&Перезагрузка", 1, 80, 91, 68, 14 END -IDD_SYSSHUTDOWN DIALOGEX 50, 50, 162, 100 +IDD_SYSSHUTDOWN DIALOGEX 50, 50, 180, 140 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_CAPTION | WS_POPUP CAPTION "System Shutdown" FONT 8, "MS Shell Dlg" BEGIN - ICON IDI_WINLOGON, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20 - LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down in:", IDC_SYSSHUTDOWNMSG, 38, 7, 124, 31 - LTEXT "", IDC_SHUTDOWNTIMELEFT, 38, 38, 124, 14 - LTEXT "No shutdown comment given.", IDC_SHUTDOWNCOMMENT, 38, 52, 124, 55 + ICON IDI_WARNING, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20 + LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down.", -1, 38, 7, 135, 40 + LTEXT "The system shuts down in:", -1, 38, 50, 90, 8 + LTEXT "00:00:00", IDC_SYSSHUTDOWNTIMELEFT, 132, 50, 41, 8 + LTEXT "Message:", -1, 38, 65, 135, 8 + LTEXT "", IDC_SYSSHUTDOWNMESSAGE, 38, 75, 135, 58 END STRINGTABLE diff --git a/base/system/winlogon/lang/sk-SK.rc b/base/system/winlogon/lang/sk-SK.rc index ced0100fd4..036ef00272 100644 --- a/base/system/winlogon/lang/sk-SK.rc +++ b/base/system/winlogon/lang/sk-SK.rc @@ -25,15 +25,17 @@ BEGIN DEFPUSHBUTTON "&Reštartovať", 1, 80, 91, 68, 14 END -IDD_SYSSHUTDOWN DIALOGEX 50, 50, 162, 100 +IDD_SYSSHUTDOWN DIALOGEX 50, 50, 180, 140 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_CAPTION | WS_POPUP CAPTION "System Shutdown" FONT 8, "MS Shell Dlg" BEGIN - ICON IDI_WINLOGON, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20 - LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down in:", IDC_SYSSHUTDOWNMSG, 38, 7, 124, 31 - LTEXT "", IDC_SHUTDOWNTIMELEFT, 38, 38, 124, 14 - LTEXT "No shutdown comment given.", IDC_SHUTDOWNCOMMENT, 38, 52, 124, 55 + ICON IDI_WARNING, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20 + LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down.", -1, 38, 7, 135, 40 + LTEXT "The system shuts down in:", -1, 38, 50, 90, 8 + LTEXT "00:00:00", IDC_SYSSHUTDOWNTIMELEFT, 132, 50, 41, 8 + LTEXT "Message:", -1, 38, 65, 135, 8 + LTEXT "", IDC_SYSSHUTDOWNMESSAGE, 38, 75, 135, 58 END STRINGTABLE diff --git a/base/system/winlogon/lang/sq-AL.rc b/base/system/winlogon/lang/sq-AL.rc index de8b6046f2..e0c19673f6 100644 --- a/base/system/winlogon/lang/sq-AL.rc +++ b/base/system/winlogon/lang/sq-AL.rc @@ -24,15 +24,17 @@ BEGIN DEFPUSHBUTTON "&Rifillo", 1, 80, 91, 68, 14 END -IDD_SYSSHUTDOWN DIALOGEX 50, 50, 162, 100 +IDD_SYSSHUTDOWN DIALOGEX 50, 50, 180, 140 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_CAPTION | WS_POPUP CAPTION "System Shutdown" FONT 8, "MS Shell Dlg" BEGIN - ICON IDI_WINLOGON, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20 - LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down in:", IDC_SYSSHUTDOWNMSG, 38, 7, 124, 31 - LTEXT "", IDC_SHUTDOWNTIMELEFT, 38, 38, 124, 14 - LTEXT "No shutdown comment given.", IDC_SHUTDOWNCOMMENT, 38, 52, 124, 55 + ICON IDI_WARNING, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20 + LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down.", -1, 38, 7, 135, 40 + LTEXT "The system shuts down in:", -1, 38, 50, 90, 8 + LTEXT "00:00:00", IDC_SYSSHUTDOWNTIMELEFT, 132, 50, 41, 8 + LTEXT "Message:", -1, 38, 65, 135, 8 + LTEXT "", IDC_SYSSHUTDOWNMESSAGE, 38, 75, 135, 58 END STRINGTABLE diff --git a/base/system/winlogon/lang/sv-SE.rc b/base/system/winlogon/lang/sv-SE.rc index 92aa469aa3..6f1c3e42d6 100644 --- a/base/system/winlogon/lang/sv-SE.rc +++ b/base/system/winlogon/lang/sv-SE.rc @@ -22,15 +22,17 @@ BEGIN DEFPUSHBUTTON "&Starta om", 1, 80, 91, 68, 14 END -IDD_SYSSHUTDOWN DIALOGEX 50, 50, 162, 100 +IDD_SYSSHUTDOWN DIALOGEX 50, 50, 180, 140 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_CAPTION | WS_POPUP CAPTION "System Shutdown" FONT 8, "MS Shell Dlg" BEGIN - ICON IDI_WINLOGON, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20 - LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down in:", IDC_SYSSHUTDOWNMSG, 38, 7, 124, 31 - LTEXT "", IDC_SHUTDOWNTIMELEFT, 38, 38, 124, 14 - LTEXT "No shutdown comment given.", IDC_SHUTDOWNCOMMENT, 38, 52, 124, 55 + ICON IDI_WARNING, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20 + LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down.", -1, 38, 7, 135, 40 + LTEXT "The system shuts down in:", -1, 38, 50, 90, 8 + LTEXT "00:00:00", IDC_SYSSHUTDOWNTIMELEFT, 132, 50, 41, 8 + LTEXT "Message:", -1, 38, 65, 135, 8 + LTEXT "", IDC_SYSSHUTDOWNMESSAGE, 38, 75, 135, 58 END STRINGTABLE diff --git a/base/system/winlogon/lang/tr-TR.rc b/base/system/winlogon/lang/tr-TR.rc index 2019d7a9b4..9c82dffd4c 100644 --- a/base/system/winlogon/lang/tr-TR.rc +++ b/base/system/winlogon/lang/tr-TR.rc @@ -22,15 +22,17 @@ BEGIN DEFPUSHBUTTON "&Yeniden Başlat", 1, 80, 91, 68, 14 END -IDD_SYSSHUTDOWN DIALOGEX 50, 50, 162, 100 +IDD_SYSSHUTDOWN DIALOGEX 50, 50, 180, 140 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_CAPTION | WS_POPUP CAPTION "System Shutdown" FONT 8, "MS Shell Dlg" BEGIN - ICON IDI_WINLOGON, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20 - LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down in:", IDC_SYSSHUTDOWNMSG, 38, 7, 124, 31 - LTEXT "", IDC_SHUTDOWNTIMELEFT, 38, 38, 124, 14 - LTEXT "No shutdown comment given.", IDC_SHUTDOWNCOMMENT, 38, 52, 124, 55 + ICON IDI_WARNING, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20 + LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down.", -1, 38, 7, 135, 40 + LTEXT "The system shuts down in:", -1, 38, 50, 90, 8 + LTEXT "00:00:00", IDC_SYSSHUTDOWNTIMELEFT, 132, 50, 41, 8 + LTEXT "Message:", -1, 38, 65, 135, 8 + LTEXT "", IDC_SYSSHUTDOWNMESSAGE, 38, 75, 135, 58 END STRINGTABLE diff --git a/base/system/winlogon/lang/uk-UA.rc b/base/system/winlogon/lang/uk-UA.rc index 3022a35e0b..dc2c39b084 100644 --- a/base/system/winlogon/lang/uk-UA.rc +++ b/base/system/winlogon/lang/uk-UA.rc @@ -20,15 +20,17 @@ BEGIN DEFPUSHBUTTON "&Перезавантаження", 1, 80, 91, 68, 14 END -IDD_SYSSHUTDOWN DIALOGEX 50, 50, 162, 100 +IDD_SYSSHUTDOWN DIALOGEX 50, 50, 180, 140 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_CAPTION | WS_POPUP CAPTION "System Shutdown" FONT 8, "MS Shell Dlg" BEGIN - ICON IDI_WINLOGON, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20 - LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down in:", IDC_SYSSHUTDOWNMSG, 38, 7, 124, 31 - LTEXT "", IDC_SHUTDOWNTIMELEFT, 38, 38, 124, 14 - LTEXT "No shutdown comment given.", IDC_SHUTDOWNCOMMENT, 38, 52, 124, 55 + ICON IDI_WARNING, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20 + LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down.", -1, 38, 7, 135, 40 + LTEXT "The system shuts down in:", -1, 38, 50, 90, 8 + LTEXT "00:00:00", IDC_SYSSHUTDOWNTIMELEFT, 132, 50, 41, 8 + LTEXT "Message:", -1, 38, 65, 135, 8 + LTEXT "", IDC_SYSSHUTDOWNMESSAGE, 38, 75, 135, 58 END STRINGTABLE diff --git a/base/system/winlogon/lang/zh-CN.rc b/base/system/winlogon/lang/zh-CN.rc index 16683df9ed..346dc27fc2 100644 --- a/base/system/winlogon/lang/zh-CN.rc +++ b/base/system/winlogon/lang/zh-CN.rc @@ -23,15 +23,17 @@ BEGIN DEFPUSHBUTTON "重新启动(&R)", 1, 80, 91, 68, 14 END -IDD_SYSSHUTDOWN DIALOGEX 50, 50, 162, 100 +IDD_SYSSHUTDOWN DIALOGEX 50, 50, 180, 140 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_CAPTION | WS_POPUP CAPTION "System Shutdown" FONT 8, "MS Shell Dlg" BEGIN - ICON IDI_WINLOGON, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20 - LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down in:", IDC_SYSSHUTDOWNMSG, 38, 7, 124, 31 - LTEXT "", IDC_SHUTDOWNTIMELEFT, 38, 38, 124, 14 - LTEXT "No shutdown comment given.", IDC_SHUTDOWNCOMMENT, 38, 52, 124, 55 + ICON IDI_WARNING, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20 + LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down.", -1, 38, 7, 135, 40 + LTEXT "The system shuts down in:", -1, 38, 50, 90, 8 + LTEXT "00:00:00", IDC_SYSSHUTDOWNTIMELEFT, 132, 50, 41, 8 + LTEXT "Message:", -1, 38, 65, 135, 8 + LTEXT "", IDC_SYSSHUTDOWNMESSAGE, 38, 75, 135, 58 END STRINGTABLE diff --git a/base/system/winlogon/lang/zh-TW.rc b/base/system/winlogon/lang/zh-TW.rc index 1b6a15dfee..580707a5c3 100644 --- a/base/system/winlogon/lang/zh-TW.rc +++ b/base/system/winlogon/lang/zh-TW.rc @@ -22,15 +22,17 @@ BEGIN DEFPUSHBUTTON "重新啟動(&R)", 1, 80, 91, 68, 14 END -IDD_SYSSHUTDOWN DIALOGEX 50, 50, 162, 100 +IDD_SYSSHUTDOWN DIALOGEX 50, 50, 180, 140 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_CAPTION | WS_POPUP CAPTION "System Shutdown" FONT 8, "MS Shell Dlg" BEGIN - ICON IDI_WINLOGON, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20 - LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down in:", IDC_SYSSHUTDOWNMSG, 38, 7, 124, 31 - LTEXT "", IDC_SHUTDOWNTIMELEFT, 38, 38, 124, 14 - LTEXT "No shutdown comment given.", IDC_SHUTDOWNCOMMENT, 38, 52, 124, 55 + ICON IDI_WARNING, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20 + LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down.", -1, 38, 7, 135, 40 + LTEXT "The system shuts down in:", -1, 38, 50, 90, 8 + LTEXT "00:00:00", IDC_SYSSHUTDOWNTIMELEFT, 132, 50, 41, 8 + LTEXT "Message:", -1, 38, 65, 135, 8 + LTEXT "", IDC_SYSSHUTDOWNMESSAGE, 38, 75, 135, 58 END STRINGTABLE diff --git a/base/system/winlogon/resource.h b/base/system/winlogon/resource.h index ac5150876c..41037647d1 100644 --- a/base/system/winlogon/resource.h +++ b/base/system/winlogon/resource.h @@ -1,25 +1,22 @@ #pragma once -/* Dialogs */ -#define IDD_SYSSHUTDOWN 500 -#define IDD_GINALOADFAILED 400 -#define IDD_SHUTDOWNCOMPUTER 300 - /* Icons */ #define IDI_WINLOGON 4 -/* Controls */ -#define IDC_SYSSHUTDOWNMSG 501 -#define IDC_SHUTDOWNTIMELEFT 502 -#define IDC_SHUTDOWNCOMMENT 503 -#define IDC_SYSSHUTDOWNICON 504 +/* Dialogs */ +#define IDD_SHUTDOWNCOMPUTER 300 +#define IDC_SHTDOWNICON 301 +#define IDC_SHUTDOWNCOMPUTER 302 +#define IDC_BTNSHTDOWNCOMPUTER 303 +#define IDD_GINALOADFAILED 400 #define IDC_GINALOADFAILED 401 #define IDC_GINALOADFAILEDCONTACT 402 -#define IDC_SHUTDOWNCOMPUTER 302 -#define IDC_BTNSHTDOWNCOMPUTER 305 -#define IDC_SHTDOWNICON 102 +#define IDD_SYSSHUTDOWN 500 +#define IDC_SYSSHUTDOWNICON 501 +#define IDC_SYSSHUTDOWNTIMELEFT 502 +#define IDC_SYSSHUTDOWNMESSAGE 503 /* Strings */ #define IDS_PREPARENETWORKCONNECTIONS 1675 diff --git a/base/system/winlogon/shutdown.c b/base/system/winlogon/shutdown.c index 8a8a0c9fbd..d09368664a 100644 --- a/base/system/winlogon/shutdown.c +++ b/base/system/winlogon/shutdown.c @@ -56,7 +56,7 @@ OnTimer( iSeconds -= iMinutes * 60; swprintf(szBuffer, L"%02d:%02d:%02d", iHours, iMinutes, iSeconds); - SetDlgItemTextW(hwndDlg, IDC_SHUTDOWNTIMELEFT, szBuffer); + SetDlgItemTextW(hwndDlg, IDC_SYSSHUTDOWNTIMELEFT, szBuffer); if (pShutdownParams->dwTimeout == 0) { @@ -94,7 +94,7 @@ ShutdownDialogProc( if (pShutdownParams->pszMessage) { SetDlgItemTextW(hwndDlg, - IDC_SHUTDOWNCOMMENT, + IDC_SYSSHUTDOWNMESSAGE, pShutdownParams->pszMessage); }

6 years, 8 months

← Newer
1
...
18
19
20
21
22
23
24
25
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs April 2018