Ros-diffs December 2014

ros-diffs@reactos.org

17 participants
387 discussions

[dquintana] 65804: [EXPLORER] * Improve an older change that I commited by mistake, with the improvbements based on a patch by Giannis. * In Windows, fixes the taskbar having a size grip with the t...
by dquintana＠svn.reactos.org 23 Dec '14

23 Dec '14

Author: dquintana Date: Tue Dec 23 01:31:36 2014 New Revision: 65804 URL: http://svn.reactos.org/svn/reactos?rev=65804&view=rev Log: [EXPLORER] * Improve an older change that I commited by mistake, with the improvbements based on a patch by Giannis. * In Windows, fixes the taskbar having a size grip with the taskbar is themed and locked. * In ReactOS, the size grip never seems to disappear, contrary to Giannis' concerns in the issue. * Because of the above, I decided to commit the changes, and let the sizing edge inconsistency be a followup to the issue. CORE-6966 #resolve #comment A modified version of the patch was commited in r65804. Thanks. Modified: trunk/reactos/base/shell/explorer/traywnd.cpp Modified: trunk/reactos/base/shell/explorer/traywnd.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/traywn… ============================================================================== --- trunk/reactos/base/shell/explorer/traywnd.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/traywnd.cpp [iso-8859-1] Tue Dec 23 01:31:36 2014 @@ -1435,7 +1435,7 @@ else m_Theme = NULL; - if (m_Theme) + if (Locked && m_Theme) { SetWindowStyle(m_hWnd, WS_THICKFRAME | WS_BORDER, 0); } @@ -1443,6 +1443,7 @@ { SetWindowStyle(m_hWnd, WS_THICKFRAME | WS_BORDER, WS_THICKFRAME | WS_BORDER); } + SetWindowPos(NULL, 0, 0, 0, 0, SWP_FRAMECHANGED | SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER | SWP_NOOWNERZORDER); return TRUE; } @@ -1787,9 +1788,8 @@ BOOL STDMETHODCALLTYPE Lock(IN BOOL bLock) { - BOOL bPrevLock; - - bPrevLock = Locked; + BOOL bPrevLock = Locked; + if (Locked != bLock) { Locked = bLock; @@ -1800,8 +1800,20 @@ { /* Reset?? */ Locked = bPrevLock; + return bPrevLock; } } + + if (Locked && m_Theme) + { + SetWindowStyle(m_hWnd, WS_THICKFRAME | WS_BORDER, 0); + } + else + { + SetWindowStyle(m_hWnd, WS_THICKFRAME | WS_BORDER, WS_THICKFRAME | WS_BORDER); + } + SetWindowPos(NULL, 0, 0, 0, 0, SWP_FRAMECHANGED | SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER | SWP_NOOWNERZORDER); + } return bPrevLock;

1 0

[dquintana] 65803: [EXPLORER] * Handle WM_CONTEXTMENU in the notification area so it does not spread upwards to the taskbar window. * In theory, only one of the two handlers would be necessary, and...
by dquintana＠svn.reactos.org 23 Dec '14

23 Dec '14

Author: dquintana Date: Tue Dec 23 01:13:05 2014 New Revision: 65803 URL: http://svn.reactos.org/svn/reactos?rev=65803&view=rev Log: [EXPLORER] * Handle WM_CONTEXTMENU in the notification area so it does not spread upwards to the taskbar window. * In theory, only one of the two handlers would be necessary, and it is true when testing in Windows, but in ReactOS, the handler in CSysPagerWnd was not enough. This may be worth a look by the win32k experts to see if it's a bug, or Windows was correcting my error. CORE-8870 #resolve #comment Should be fixed in r65803. Thanks for reporting. Modified: trunk/reactos/base/shell/explorer/trayntfy.cpp Modified: trunk/reactos/base/shell/explorer/trayntfy.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/traynt… ============================================================================== --- trunk/reactos/base/shell/explorer/trayntfy.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/trayntfy.cpp [iso-8859-1] Tue Dec 23 01:13:05 2014 @@ -533,12 +533,19 @@ return Ret; } + LRESULT OnCtxMenu(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) + { + bHandled = TRUE; + return 0; + } + DECLARE_WND_CLASS_EX(szSysPagerWndClass, CS_DBLCLKS, COLOR_3DFACE) BEGIN_MSG_MAP(CTaskSwitchWnd) MESSAGE_HANDLER(WM_CREATE, OnCreate) MESSAGE_HANDLER(WM_ERASEBKGND, OnEraseBackground) MESSAGE_HANDLER(WM_SIZE, OnSize) + MESSAGE_HANDLER(WM_CONTEXTMENU, OnCtxMenu) NOTIFY_CODE_HANDLER(TBN_GETINFOTIPW, OnGetInfoTip) NOTIFY_CODE_HANDLER(NM_CUSTOMDRAW, OnCustomDraw) END_MSG_MAP() @@ -1529,6 +1536,12 @@ return FALSE; } + LRESULT OnCtxMenu(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) + { + bHandled = TRUE; + return 0; + } + DECLARE_WND_CLASS_EX(szTrayNotifyWndClass, CS_DBLCLKS, COLOR_3DFACE) BEGIN_MSG_MAP(CTaskSwitchWnd) @@ -1539,6 +1552,7 @@ MESSAGE_HANDLER(WM_NCHITTEST, OnNcHitTest) MESSAGE_HANDLER(WM_NOTIFY, OnNotify) MESSAGE_HANDLER(WM_SETFONT, OnSetFont) + MESSAGE_HANDLER(WM_CONTEXTMENU, OnCtxMenu) // FIXME: This handler is not necessary in Windows MESSAGE_HANDLER(TNWM_GETMINIMUMSIZE, OnGetMinimumSize) MESSAGE_HANDLER(TNWM_UPDATETIME, OnUpdateTime) MESSAGE_HANDLER(TNWM_SHOWCLOCK, OnShowClock)

1 0

[spetreolle] 65802: [WHOAMI] Fix warning into the russian file.
by spetreolle＠svn.reactos.org 22 Dec '14

22 Dec '14

Author: spetreolle Date: Mon Dec 22 23:44:25 2014 New Revision: 65802 URL: http://svn.reactos.org/svn/reactos?rev=65802&view=rev Log: [WHOAMI] Fix warning into the russian file. Modified: trunk/reactos/base/applications/cmdutils/whoami/lang/ru-RU.rc Modified: trunk/reactos/base/applications/cmdutils/whoami/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/whoami/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/whoami/lang/ru-RU.rc [iso-8859-1] Mon Dec 22 23:44:25 2014 @@ -41,7 +41,7 @@ IDS_ERROR_NH_LIST "ÐÐ¨ÐÐÐÐ: ÐÐ°ÑÐ°Ð¼ÐµÑÑ /NH Ð½ÐµÐ»ÑÐ·Ñ Ð¸ÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÑ Ñ ÑÐ¾ÑÐ¼Ð°ÑÐ¾Ð¼ LIST.\nÐÐ²ÐµÐ´Ð¸ÑÐµ ""WHOAMI /?"" Ð´Ð»Ñ Ð¿Ð¾Ð»ÑÑÐµÐ½Ð¸Ñ ÑÐ¿ÑÐ°Ð²ÐºÐ¸ Ð¿Ð¾ Ð¸ÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°Ð½Ð¸Ñ.\n" IDS_HELP "ÐÐ¿Ð¸ÑÐ°Ð½Ð¸Ðµ:\n\ ÐÑÐ¾Ð±ÑÐ°Ð¶Ð°ÐµÑ Ð¸Ð½ÑÐ¾ÑÐ¼Ð°ÑÐ¸Ñ Ð¾Ð± Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ðµ, Ð³ÑÑÐ¿Ð¿Ðµ Ð¸ Ð¿ÑÐ¸Ð²Ð¸Ð»ÐµÐ³Ð¸ÑÑ Ð´Ð»Ñ Ð»Ð¾ÐºÐ°Ð»ÑÐ½Ð¾ Ð²Ð¾ÑÐµÐ´ÑÐ¸Ñ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»ÐµÐ¹.\n\ - ÐÑÐ»Ð¸ Ð½Ðµ ÑÐºÐ°Ð·Ð°Ð½Ð¾ Ð°ÑÐ³ÑÐ¼ÐµÐ½ÑÐ¾Ð², ÑÐ¾ Ð¾ÑÐ¾Ð±ÑÐ°Ð¶Ð°ÐµÑ ÑÐµÐºÑÑÐ¸Ð¹ Ð´Ð¾Ð¼ÐµÐ½ Ð¸ ÑÐµÐºÑÑÐµÐ³Ð¾ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ (Ð´Ð¾Ð¼ÐµÐ½\Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ).\n\ + ÐÑÐ»Ð¸ Ð½Ðµ ÑÐºÐ°Ð·Ð°Ð½Ð¾ Ð°ÑÐ³ÑÐ¼ÐµÐ½ÑÐ¾Ð², ÑÐ¾ Ð¾ÑÐ¾Ð±ÑÐ°Ð¶Ð°ÐµÑ ÑÐµÐºÑÑÐ¸Ð¹ Ð´Ð¾Ð¼ÐµÐ½ Ð¸ ÑÐµÐºÑÑÐµÐ³Ð¾ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ (Ð´Ð¾Ð¼ÐµÐ½/Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ).\n\ \n\ ÐÐ¾ÑÑÑÐ¿Ð½ÑÐµ ÑÐ¾ÑÐ¼Ð°ÑÑ Ð´Ð»Ñ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÐ° '/fo' - 'csv', 'list' Ð¸ 'table'.\n\ ÐÑÐ¿Ð¾Ð»ÑÐ·ÑÐ¹ÑÐµ '/nh' ÑÑÐ¾Ð±Ñ ÑÐºÑÑÑÑ Ð·Ð°Ð³Ð¾Ð»Ð¾Ð²ÐºÐ¸. ÐÐ¾ ÑÐ¼Ð¾Ð»ÑÐ°Ð½Ð¸Ñ Ð´Ð°Ð½Ð½ÑÐµ Ð¾ÑÐ¾Ð±ÑÐ°Ð¶Ð°ÑÑÑÑ Ð² ÑÐ°Ð±Ð»Ð¸ÑÐµ.\n\

1 0

[pschweitzer] 65801: [FASTFAT] So far, totally disable VPB swapout on dismount. It appears to have brought more issues than it actually solves. A more accurate implementation will be required. CORE...
by pschweitzer＠svn.reactos.org 22 Dec '14

22 Dec '14

Author: pschweitzer Date: Mon Dec 22 23:00:22 2014 New Revision: 65801 URL: http://svn.reactos.org/svn/reactos?rev=65801&view=rev Log: [FASTFAT] So far, totally disable VPB swapout on dismount. It appears to have brought more issues than it actually solves. A more accurate implementation will be required. CORE-8928 #comment Can you please retry with r65801 Modified: trunk/reactos/drivers/filesystems/fastfat/vfat.h Modified: trunk/reactos/drivers/filesystems/fastfat/vfat.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/vfat.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/vfat.h [iso-8859-1] Mon Dec 22 23:00:22 2014 @@ -7,8 +7,10 @@ #include <pseh/pseh2.h> #define USE_ROS_CC_AND_FS +#if 0 #ifndef _MSC_VER #define ENABLE_SWAPOUT +#endif #endif #define ROUND_DOWN(n, align) \

1 0

[pschweitzer] 65800: [SHELL32] Update French translation
by pschweitzer＠svn.reactos.org 22 Dec '14

22 Dec '14

Author: pschweitzer Date: Mon Dec 22 22:55:07 2014 New Revision: 65800 URL: http://svn.reactos.org/svn/reactos?rev=65800&view=rev Log: [SHELL32] Update French translation Modified: trunk/reactos/dll/win32/shell32/lang/fr-FR.rc Modified: trunk/reactos/dll/win32/shell32/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/fr-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/fr-FR.rc [iso-8859-1] Mon Dec 22 22:55:07 2014 @@ -44,18 +44,18 @@ /* menubar EDIT menu */ MENU_003 MENU BEGIN - MENUITEM "&Undo\tCtrl+Z", FCIDM_SHVIEW_UNDO + MENUITEM "&Annuler\tCtrl+Z", FCIDM_SHVIEW_UNDO MENUITEM SEPARATOR - MENUITEM "Cu&t\tCtrl+X", FCIDM_SHVIEW_CUT - MENUITEM "&Copy\tCtrl+C", FCIDM_SHVIEW_COPY - MENUITEM "&Paste\tCtrl+V", FCIDM_SHVIEW_INSERT - MENUITEM "Paste &shortcut", FCIDM_SHVIEW_INSERTLINK + MENUITEM "C&ouper\tCtrl+X", FCIDM_SHVIEW_CUT + MENUITEM "&Copier\tCtrl+C", FCIDM_SHVIEW_COPY + MENUITEM "Co&ller\tCtrl+V", FCIDM_SHVIEW_INSERT + MENUITEM "CrÃ©er un &lien", FCIDM_SHVIEW_INSERTLINK MENUITEM SEPARATOR - MENUITEM "Copy to &folder...", FCIDM_SHVIEW_COPYTO - MENUITEM "Mo&ve to folder...", FCIDM_SHVIEW_MOVETO + MENUITEM "Copier vers le &dossier...", FCIDM_SHVIEW_COPYTO + MENUITEM "&DÃ©placer vers le dossier...", FCIDM_SHVIEW_MOVETO MENUITEM SEPARATOR - MENUITEM "Select &all\tCtrl+A", FCIDM_SHVIEW_SELECTALL - MENUITEM "&Invert Selection", FCIDM_SHVIEW_INVERTSELECTION + MENUITEM "&Tout sÃ©lectionner\tCtrl+A", FCIDM_SHVIEW_SELECTALL + MENUITEM "&Inverser la sÃ©lection", FCIDM_SHVIEW_INVERTSELECTION END /* shellview item menu */ @@ -813,5 +813,5 @@ IDS_UNKNOWN_APP "Application inconnue" IDS_EXE_DESCRIPTION "Description :" - IDS_MENU_EMPTY "(Empty)" -END + IDS_MENU_EMPTY "(Vide)" +END

1 0

[hbelusca] 65799: In absence of patchbot, let's test patch directly on... trunk!! Yeah!! Let's break trunk! (or not, we'll see...) [USER32][USERSRV][WIN32K] - Flag CSRSS threads as such. - Each tim...
by hbelusca＠svn.reactos.org 22 Dec '14

22 Dec '14

Author: hbelusca Date: Mon Dec 22 21:23:00 2014 New Revision: 65799 URL: http://svn.reactos.org/svn/reactos?rev=65799&view=rev Log: In absence of patchbot, let's test patch directly on... trunk!! Yeah!! Let's break trunk! (or not, we'll see...) [USER32][USERSRV][WIN32K] - Flag CSRSS threads as such. - Each time a win32 thread is "created" (or a win32k system call is done) a PsConvertToGuiThread call is done, that makes a Win32ThreadCallout which calls UserCreateThreadInfo. We should call back ClientThreadSetup to set client-side info. - Introduce a ClientThreadSetupHelper function to try to understand what happens when doing direct calls to ClientThreadSetup and via win32k callbacks. - Reenable CSR call in user32::DllMain but add shame hacks in Init(..) to force NtUserProcessConnect callbacks (yet they should not be done there): see the code comment associated for more details. - Temporarily disable ClientThreadSetupHelper call in ClientThreadSetup because it makes things fail, like console input thread failing and so on... - ... and in ClientThreadSetupHelper, some correct code is commented out because it currently breaks other things (like menu initialization etc...), and HACKS ARE ADDED!! (see especially the "if (gpsi)" one, that should not exist, but if removed we fail sometimes in MenuInit because gpsi becomes NULL for some reason, if some other code that makes redundant calls to NtUserProcessConnect, is uncommented). To sum up I tried to scaffold the thing as it should be, but with disabled code to not break everything. CORE-8949 #comment Revision 65799 committed the patch v1. Modified: trunk/reactos/win32ss/user/ntuser/main.c trunk/reactos/win32ss/user/ntuser/ntuser.c trunk/reactos/win32ss/user/user32/misc/dllmain.c trunk/reactos/win32ss/user/winsrv/usersrv/init.c Modified: trunk/reactos/win32ss/user/ntuser/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/main.c… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/main.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/main.c [iso-8859-1] Mon Dec 22 21:23:00 2014 @@ -385,12 +385,19 @@ Status = STATUS_NO_MEMORY; goto error; } + ptiCurrent->KeyboardLayout = W32kGetDefaultKeyLayout(); if (ptiCurrent->KeyboardLayout) UserReferenceObject(ptiCurrent->KeyboardLayout); + ptiCurrent->TIF_flags &= ~TIF_INCLEANUP; - if (Process == gpepCSRSS) /* If this thread is owned by CSRSS, mark it as such */ - ptiCurrent->TIF_flags |= TIF_CSRSSTHREAD; + + /* CSRSS threads have some special features */ + if (Process == gpepCSRSS) + ptiCurrent->TIF_flags = TIF_CSRSSTHREAD | TIF_DONTATTACHQUEUE; + + // FIXME: Flag SYSTEM threads with... TIF_SYSTEMTHREAD !! + ptiCurrent->pcti = &ptiCurrent->cti; /* Initialize the CLIENTINFO */ @@ -475,7 +482,7 @@ } } - /* mark the thread as fully initialized */ + /* Mark the thread as fully initialized */ ptiCurrent->TIF_flags |= TIF_GUITHREADINITIALIZED; if (!(ptiCurrent->ppi->W32PF_flags & (W32PF_ALLOWFOREGROUNDACTIVATE | W32PF_APPSTARTING)) && @@ -484,7 +491,26 @@ ptiCurrent->TIF_flags |= TIF_ALLOWFOREGROUNDACTIVATE; } ptiCurrent->pClientInfo->dwTIFlags = ptiCurrent->TIF_flags; - TRACE_CH(UserThread,"UserCreateW32Thread pti 0x%p\n",ptiCurrent); + + /* Last things to do only if we are not a SYSTEM or CSRSS thread */ + if (!(ptiCurrent->TIF_flags & (TIF_SYSTEMTHREAD | TIF_CSRSSTHREAD))) + { + /* Callback to User32 Client Thread Setup */ + TRACE_CH(UserThread,"Call co_IntClientThreadSetup...\n"); + Status = co_IntClientThreadSetup(); + if (!NT_SUCCESS(Status)) + { + ERR_CH(UserThread,"ClientThreadSetup failed with Status 0x%08lx\n", Status); + goto error; + } + TRACE_CH(UserThread,"co_IntClientThreadSetup succeeded!\n"); + } + else + { + TRACE_CH(UserThread,"co_IntClientThreadSetup cannot be called...\n"); + } + + TRACE_CH(UserThread,"UserCreateW32Thread pti 0x%p\n", ptiCurrent); return STATUS_SUCCESS; error: Modified: trunk/reactos/win32ss/user/ntuser/ntuser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/ntuser… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/ntuser.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/ntuser.c [iso-8859-1] Mon Dec 22 21:23:00 2014 @@ -128,10 +128,6 @@ Status = UserCreateThreadInfo(PsGetCurrentThread()); if (!NT_SUCCESS(Status)) return Status; -// Callback to User32 Client Thread Setup - - co_IntClientThreadSetup(); - // } // Set Global SERVERINFO Error flags. // Load Resources. Modified: trunk/reactos/win32ss/user/user32/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/misc/d… ============================================================================== --- trunk/reactos/win32ss/user/user32/misc/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/misc/dllmain.c [iso-8859-1] Mon Dec 22 21:23:00 2014 @@ -17,6 +17,7 @@ ULONG_PTR g_ulSharedDelta; BOOLEAN gfLogonProcess = FALSE; BOOLEAN gfServerProcess = FALSE; +BOOLEAN gfFirstThread = TRUE; HICON hIconSmWindows = NULL, hIconWindows = NULL; WCHAR szAppInit[KEY_LENGTH]; @@ -203,9 +204,119 @@ User32DeliverUserAPC, }; + + +VOID +WINAPI +GdiProcessSetup(VOID); + +BOOL +WINAPI +ClientThreadSetupHelper(BOOL IsCallback) +{ + /* + * Normally we are called by win32k so the win32 thread pointers + * should be valid as they are set in win32k::UserCreateThreadInfo. + */ + PCLIENTINFO ClientInfo = GetWin32ClientInfo(); + BOOLEAN IsFirstThread = _InterlockedExchange8((PCHAR)&gfFirstThread, FALSE); + + TRACE("In ClientThreadSetup(IsCallback == %s, gfServerProcess = %s, IsFirstThread = %s)\n", + IsCallback ? "TRUE" : "FALSE", gfServerProcess ? "TRUE" : "FALSE", IsFirstThread ? "TRUE" : "FALSE"); + + if (IsFirstThread) + GdiProcessSetup(); + + /* Check for already initialized thread, and bail out if so */ + if (ClientInfo->CI_flags & CI_INITTHREAD) + { + ERR("ClientThreadSetup: Thread already initialized.\n"); + return FALSE; + } + + /* + * CSRSS couldn't use user32::DllMain CSR server-to-server call to connect + * to win32k. So it is delayed to a manually-call to ClientThreadSetup. + * Also this needs to be done only for the first thread (since the connection + * is per-process). + */ + // if (gfServerProcess && IsFirstThread) // Disabling this test is a HACK!! + { + NTSTATUS Status; + USERCONNECT UserCon; + + RtlZeroMemory(&UserCon, sizeof(UserCon)); + + /* Minimal setup of the connect info structure */ + UserCon.ulVersion = USER_VERSION; + + /* Connect to win32k */ + Status = NtUserProcessConnect(NtCurrentProcess(), + &UserCon, + sizeof(UserCon)); + if (!NT_SUCCESS(Status)) return FALSE; + + /* Retrieve data */ + g_ppi = ClientInfo->ppi; // Snapshot PI, used as pointer only! + g_ulSharedDelta = UserCon.siClient.ulSharedDelta; + gpsi = SharedPtrToUser(UserCon.siClient.psi); + gHandleTable = SharedPtrToUser(UserCon.siClient.aheList); + gHandleEntries = SharedPtrToUser(gHandleTable->handles); + + // ERR("1 SI 0x%x : HT 0x%x : D 0x%x\n", UserCon.siClient.psi, UserCon.siClient.aheList, g_ulSharedDelta); + } + + TRACE("Checkpoint (register PFN)\n"); + if (!RegisterClientPFN()) + { + TRACE("RegisterClientPFN failed\n"); + return FALSE; + } + + /* Mark this thread as initialized */ + ClientInfo->CI_flags |= CI_INITTHREAD; + + /* Initialization that should be done once per process */ + if (IsFirstThread) + { + TRACE("Checkpoint (Allocating TLS)\n"); + + /* Allocate an index for user32 thread local data */ + User32TlsIndex = TlsAlloc(); + if (User32TlsIndex == TLS_OUT_OF_INDEXES) + return FALSE; + + // HAAAAAAAAAACK!!!!!! + // ASSERT(gpsi); + if (!gpsi) ERR("AAAAAAAAAAAHHHHHHHHHHHHHH!!!!!!!! gpsi == NULL !!!!\n"); + if (gpsi) + { + TRACE("Checkpoint (MessageInit)\n"); + + if (MessageInit()) + { + TRACE("Checkpoint (MenuInit)\n"); + if (MenuInit()) + { + TRACE("Checkpoint initialization done OK\n"); + InitializeCriticalSection(&U32AccelCacheLock); + LoadAppInitDlls(); + return TRUE; + } + MessageCleanup(); + } + + TlsFree(User32TlsIndex); + return FALSE; + } + } + + return TRUE; +} + /* -* @unimplemented -*/ + * @implemented + */ BOOL WINAPI ClientThreadSetup(VOID) @@ -221,7 +332,7 @@ // However, all the other calls are made as normal, and WINSRV.DLL loads // USER32.dll, the DllMain runs, and eventually the first NtUser system call is // made which initializes Win32k (and initializes the thread, but as mentioned - // above, the thread is marked as TIF_CSRSSTHREAD. + // above, the thread is marked as TIF_CSRSSTHREAD). // // In the DllMain of User32, there is also a CsrClientConnectToServer call to // server 2 (winsrv). When this is done from CSRSS, the "InServer" flag is set, @@ -241,73 +352,74 @@ // continue as normal. // - // GetConnected(); - - UNIMPLEMENTED; + // return ClientThreadSetupHelper(FALSE); // Disabling this call is a HACK!! return TRUE; } BOOL -Init(VOID) -{ - NTSTATUS Status; - USERCONNECT UserCon; - - TRACE("user32::Init()\n"); - - /* Set PEB data */ +Init(PUSERCONNECT UserCon /*PUSERSRV_API_CONNECTINFO*/) +{ + NTSTATUS Status = STATUS_SUCCESS; + + TRACE("user32::Init(0x%p) -->\n", UserCon); + + RtlInitializeCriticalSection(&gcsUserApiHook); + + /* Initialize callback table in PEB data */ NtCurrentPeb()->KernelCallbackTable = apfnDispatch; NtCurrentPeb()->PostProcessInitRoutine = NULL; - /* Minimal setup of the connect info structure */ - UserCon.ulVersion = USER_VERSION; - - /* Connect to win32k */ - Status = NtUserProcessConnect(NtCurrentProcess(), - &UserCon, - sizeof(UserCon)); - if (!NT_SUCCESS(Status)) return FALSE; - - /* Retrieve data */ - g_ppi = GetWin32ClientInfo()->ppi; // Snapshot PI, used as pointer only! - g_ulSharedDelta = UserCon.siClient.ulSharedDelta; - gpsi = SharedPtrToUser(UserCon.siClient.psi); - gHandleTable = SharedPtrToUser(UserCon.siClient.aheList); - gHandleEntries = SharedPtrToUser(gHandleTable->handles); - - RtlInitializeCriticalSection(&gcsUserApiHook); - - //ERR("1 SI 0x%x : HT 0x%x : D 0x%x\n", UserCon.siClient.psi, UserCon.siClient.aheList, g_ulSharedDelta); - - /* Allocate an index for user32 thread local data */ - User32TlsIndex = TlsAlloc(); - if (User32TlsIndex == TLS_OUT_OF_INDEXES) - return FALSE; - - if (MessageInit()) - { - if (MenuInit()) + /* + * Retrieve data from the connect info structure if the initializing + * process is not CSRSS. In case it is, this will be done from inside + * ClientThreadSetup. + */ + // if (!gfServerProcess) // Disabling this test is a HACK!! + { + // FIXME: HACK!! We should fixup for the NtUserProcessConnect fixups + // because it was made in the context of CSRSS process and not ours!! + // So... as long as we don't fix that, we need to redo again a call + // to NtUserProcessConnect... How perverse is that?! { - InitializeCriticalSection(&U32AccelCacheLock); - LoadAppInitDlls(); - return TRUE; + RtlZeroMemory(UserCon, sizeof(*UserCon)); + + /* Minimal setup of the connect info structure */ + UserCon->ulVersion = USER_VERSION; + + ERR("HACK: Hackish NtUserProcessConnect call!!\n"); + /* Connect to win32k */ + Status = NtUserProcessConnect(NtCurrentProcess(), + UserCon, + sizeof(*UserCon)); + if (!NT_SUCCESS(Status)) return FALSE; } - MessageCleanup(); - } - - TlsFree(User32TlsIndex); - return FALSE; + + // + // We continue as we should do... + // + + /* Retrieve data */ + g_ppi = GetWin32ClientInfo()->ppi; // Snapshot PI, used as pointer only! + g_ulSharedDelta = UserCon->siClient.ulSharedDelta; + gpsi = SharedPtrToUser(UserCon->siClient.psi); + gHandleTable = SharedPtrToUser(UserCon->siClient.aheList); + gHandleEntries = SharedPtrToUser(gHandleTable->handles); + } + + TRACE("<-- user32::Init()\n"); + + return NT_SUCCESS(Status); } VOID Cleanup(VOID) { + UnloadAppInitDlls(); DeleteCriticalSection(&U32AccelCacheLock); MenuCleanup(); MessageCleanup(); + TlsFree(User32TlsIndex); DeleteFrameBrushes(); - UnloadAppInitDlls(); - TlsFree(User32TlsIndex); } INT WINAPI @@ -321,8 +433,6 @@ case DLL_PROCESS_ATTACH: { -#if 0 - #define WIN_OBJ_DIR L"\\Windows" #define SESSION_DIR L"\\Sessions" @@ -335,8 +445,12 @@ PPEB Peb = NtCurrentPeb(); ULONG SessionId = Peb->SessionId; // gSessionId + TRACE("user32::DllMain\n"); + /* Don't bother us for each thread */ DisableThreadLibraryCalls(hInstanceDll); + + RtlZeroMemory(&ConnectInfo, sizeof(ConnectInfo)); /* Minimal setup of the connect info structure */ ConnectInfo.ulVersion = USER_VERSION; @@ -357,6 +471,8 @@ WIN_OBJ_DIR); } + TRACE("Checkpoint (call CSR)\n"); + /* Connect to the USER Server */ Status = CsrClientConnectToServer(SessionDir, USERSRV_SERVERDLL_INDEX, @@ -369,16 +485,13 @@ return FALSE; } -#else - gfServerProcess = FALSE; -#endif + TRACE("Checkpoint (CSR called)\n"); User32Instance = hInstanceDll; - if (!RegisterClientPFN()) - return FALSE; - - if (!Init()) + /* Finish initialization */ + TRACE("Checkpoint (call Init)\n"); + if (!Init(&ConnectInfo)) return FALSE; break; @@ -398,44 +511,13 @@ return GdiDllInitialize(hInstanceDll, dwReason, reserved); } -// FIXME: This function IS A BIIG HACK!! -VOID -FASTCALL -GetConnected(VOID) -{ - NTSTATUS Status; - USERCONNECT UserCon; - - TRACE("user32::GetConnected()\n"); - - if ((PTHREADINFO)NtCurrentTeb()->Win32ThreadInfo == NULL) - NtUserGetThreadState(THREADSTATE_GETTHREADINFO); - - if (gpsi && g_ppi) return; - - /* Minimal setup of the connect info structure */ - UserCon.ulVersion = USER_VERSION; - - /* Connect to win32k */ - Status = NtUserProcessConnect(NtCurrentProcess(), - &UserCon, - sizeof(UserCon)); - if (!NT_SUCCESS(Status)) return; - - /* Retrieve data */ - g_ppi = GetWin32ClientInfo()->ppi; // Snapshot PI, used as pointer only! - g_ulSharedDelta = UserCon.siClient.ulSharedDelta; - gpsi = SharedPtrToUser(UserCon.siClient.psi); - gHandleTable = SharedPtrToUser(UserCon.siClient.aheList); - gHandleEntries = SharedPtrToUser(gHandleTable->handles); -} - NTSTATUS WINAPI User32CallClientThreadSetupFromKernel(PVOID Arguments, ULONG ArgumentLength) { - TRACE("ClientThreadSetup\n"); - ClientThreadSetup(); + TRACE("User32CallClientThreadSetupFromKernel -->\n"); + ClientThreadSetupHelper(TRUE); + TRACE("<-- User32CallClientThreadSetupFromKernel\n"); return ZwCallbackReturn(NULL, 0, STATUS_SUCCESS); } Modified: trunk/reactos/win32ss/user/winsrv/usersrv/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/usersr… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/usersrv/init.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/usersrv/init.c [iso-8859-1] Mon Dec 22 21:23:00 2014 @@ -147,7 +147,7 @@ // PUSERCONNECT PUSERSRV_API_CONNECTINFO ConnectInfo = (PUSERSRV_API_CONNECTINFO)ConnectionInfo; - DPRINT1("UserClientConnect\n"); + DPRINT("UserClientConnect\n"); /* Check if we don't have an API port yet */ if (CsrApiPort == NULL)

1 0

[hbelusca] 65798: [USERSRV] - Reenable UserClientConnect callback, it's not the problematic code that made bots to fail at 3rd stage and caused r65716 to be committed. - Put the system threads hack...
by hbelusca＠svn.reactos.org 22 Dec '14

22 Dec '14

Author: hbelusca Date: Mon Dec 22 19:50:00 2014 New Revision: 65798 URL: http://svn.reactos.org/svn/reactos?rev=65798&view=rev Log: [USERSRV] - Reenable UserClientConnect callback, it's not the problematic code that made bots to fail at 3rd stage and caused r65716 to be committed. - Put the system threads hack *after* having called NtUserInitialize (that really initializes user-kernel interface with win32k), and not before. Modified: trunk/reactos/win32ss/user/winsrv/usersrv/init.c Modified: trunk/reactos/win32ss/user/winsrv/usersrv/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/usersr… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/usersrv/init.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/usersrv/init.c [iso-8859-1] Mon Dec 22 19:50:00 2014 @@ -191,12 +191,7 @@ CSR_SERVER_DLL_INIT(UserServerDllInitialization) { -/*** From win32csr... ***/ - HANDLE ServerThread; - CLIENT_ID ClientId; NTSTATUS Status; - UINT i; -/*** END - From win32csr... ***/ /* Initialize the memory */ UserServerHeap = RtlGetProcessHeap(); @@ -210,36 +205,12 @@ LoadedServerDll->NameTable = UserServerApiNameTable; #endif LoadedServerDll->SizeOfProcessData = 0; -#if 0 LoadedServerDll->ConnectCallback = UserClientConnect; -#else - LoadedServerDll->ConnectCallback = NULL; -#endif LoadedServerDll->DisconnectCallback = NULL; LoadedServerDll->HardErrorCallback = UserServerHardError; LoadedServerDll->ShutdownProcessCallback = UserClientShutdown; UserServerDllInstance = LoadedServerDll->ServerHandle; - -/*** From win32csr... See r54125 ***/ - /* Start the Raw Input Thread and the Desktop Thread */ - for (i = 0; i < 2; ++i) - { - Status = RtlCreateUserThread(NtCurrentProcess(), - NULL, TRUE, 0, 0, 0, - CreateSystemThreads, - (PVOID)i, &ServerThread, &ClientId); - if (NT_SUCCESS(Status)) - { - NtResumeThread(ServerThread, NULL); - NtClose(ServerThread); - } - else - { - DPRINT1("Cannot start Raw Input Thread!\n"); - } - } -/*** END - From win32csr... ***/ /* Create the power request event */ Status = NtCreateEvent(&ghPowerRequestEvent, @@ -278,6 +249,32 @@ return Status; } +/*** From win32csr... See r54125 ***/ + { + HANDLE ServerThread; + CLIENT_ID ClientId; + UINT i; + + /* Start the Raw Input Thread and the Desktop Thread */ + for (i = 0; i < 2; ++i) + { + Status = RtlCreateUserThread(NtCurrentProcess(), + NULL, TRUE, 0, 0, 0, + CreateSystemThreads, + (PVOID)i, &ServerThread, &ClientId); + if (NT_SUCCESS(Status)) + { + NtResumeThread(ServerThread, NULL); + NtClose(ServerThread); + } + else + { + DPRINT1("Cannot start Raw Input Thread!\n"); + } + } + } +/*** END - From win32csr... ***/ + /* All done */ return STATUS_SUCCESS; }

1 0

[hbelusca] 65797: [GDI32] - Call NtGdiInit before initializing ourselves (ok, in ROS NtGdiInit does nothing interesting, but still do it to be call-compatible with win2k3 so everything initializes ...
by hbelusca＠svn.reactos.org 22 Dec '14

22 Dec '14

Author: hbelusca Date: Mon Dec 22 19:44:59 2014 New Revision: 65797 URL: http://svn.reactos.org/svn/reactos?rev=65797&view=rev Log: [GDI32] - Call NtGdiInit before initializing ourselves (ok, in ROS NtGdiInit does nothing interesting, but still do it to be call-compatible with win2k3 so everything initializes as it should). - Do some cleanup on process detach. Modified: trunk/reactos/win32ss/gdi/gdi32/main/dllmain.c Modified: trunk/reactos/win32ss/gdi/gdi32/main/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/main/dll… ============================================================================== --- trunk/reactos/win32ss/gdi/gdi32/main/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/gdi32/main/dllmain.c [iso-8859-1] Mon Dec 22 19:44:59 2014 @@ -18,7 +18,7 @@ */ BOOL WINAPI -DllMain ( +DllMain( HANDLE hDll, DWORD dwReason, LPVOID lpReserved) @@ -38,7 +38,7 @@ VOID WINAPI -GdiProcessSetup (VOID) +GdiProcessSetup(VOID) { hProcessHeap = GetProcessHeap(); @@ -53,36 +53,62 @@ InitializeCriticalSection(&gcsClientObjLinks); } +VOID +WINAPI +GdiProcessShutdown(VOID) +{ + DeleteCriticalSection(&gcsClientObjLinks); + RtlDeleteCriticalSection(&semLocal); +} + /* * @implemented */ BOOL WINAPI -GdiDllInitialize ( +GdiDllInitialize( HANDLE hDll, DWORD dwReason, LPVOID lpReserved) { switch (dwReason) { - case DLL_PROCESS_ATTACH: - GdiProcessSetup (); - break; + case DLL_PROCESS_ATTACH: + { + /* Don't bother us for each thread */ + // DisableThreadLibraryCalls(hDll); - case DLL_THREAD_ATTACH: - NtCurrentTeb()->GdiTebBatch.Offset = 0; - NtCurrentTeb()->GdiBatchCount = 0; - break; + /* Initialize the kernel part of GDI first */ + if (!NtGdiInit()) return FALSE; - default: - return FALSE; + /* Now initialize ourselves */ + GdiProcessSetup(); + break; + } + + case DLL_THREAD_ATTACH: + { + NtCurrentTeb()->GdiTebBatch.Offset = 0; + NtCurrentTeb()->GdiBatchCount = 0; + break; + } + + case DLL_PROCESS_DETACH: + { + /* Cleanup */ + GdiProcessShutdown(); + return TRUE; + } + + default: + return FALSE; } - // Very simple, the list will fill itself as it is needed. - if(!SetStockObjects) + /* Very simple, the list will fill itself as it is needed */ + if (!SetStockObjects) { - RtlZeroMemory( &stock_objects, NB_STOCK_OBJECTS); //Assume Ros is dirty. + RtlZeroMemory(&stock_objects, NB_STOCK_OBJECTS); // Assume ROS is dirty SetStockObjects = TRUE; }

1 0

[akhaldi] 65796: [SNDREC32] Update Chinese (zh-CN) translation. By Henry Tang Ih. CORE-8933
by akhaldi＠svn.reactos.org 22 Dec '14

22 Dec '14

Author: akhaldi Date: Mon Dec 22 19:29:44 2014 New Revision: 65796 URL: http://svn.reactos.org/svn/reactos?rev=65796&view=rev Log: [SNDREC32] Update Chinese (zh-CN) translation. By Henry Tang Ih. CORE-8933 Modified: trunk/reactos/base/applications/sndrec32/lang/zh-CN.rc Modified: trunk/reactos/base/applications/sndrec32/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… ============================================================================== --- trunk/reactos/base/applications/sndrec32/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndrec32/lang/zh-CN.rc [iso-8859-1] Mon Dec 22 19:29:44 2014 @@ -27,37 +27,37 @@ MENUITEM "æå¼...", ID_FILE_OPEN MENUITEM "ä¿å", ID_FILE_SAVE, GRAYED MENUITEM "å¦åä¸º...", ID_FILE_SAVEAS, GRAYED - MENUITEM "Restore...", ID_FILE_RESTORE, GRAYED - MENUITEM "Properties", ID_FILE_PROPERTIES + MENUITEM "æ¢å¤...", ID_FILE_RESTORE, GRAYED + MENUITEM "å±æ§", ID_FILE_PROPERTIES MENUITEM SEPARATOR MENUITEM "éåº", ID_FILE_EXIT END - POPUP "&Edit" + POPUP "&ç¼è¾(&E)" BEGIN - MENUITEM "&Copy", ID_EDIT_COPY - MENUITEM "&Paste Insert", ID_EDIT_PASTE, GRAYED - MENUITEM "Paste Mi&x", ID_EDIT_PASTEMIX, GRAYED + MENUITEM "å¤å¶(&C)", ID_EDIT_COPY + MENUITEM "ç²è´´æå¥(&P)", ID_EDIT_PASTE, GRAYED + MENUITEM "ç²è´´æ··å(&X)", ID_EDIT_PASTEMIX, GRAYED MENUITEM SEPARATOR - MENUITEM "&Insert File...", ID_EDIT_INSERTFILE - MENUITEM "&Mix with File...", ID_EDIT_MIXFILE + MENUITEM "æå¥æä»¶...(&I)", ID_EDIT_INSERTFILE + MENUITEM "æ··åæä»¶...(&M)", ID_EDIT_MIXFILE MENUITEM SEPARATOR - MENUITEM "Delete &Before Current Position",ID_EDIT_DELETEBEFORE, GRAYED - MENUITEM "Delete &After Current Position",ID_EDIT_DELETEAFTER, GRAYED + MENUITEM "å é¤å¨å½åä½ç½®ä¹å(&B)",ID_EDIT_DELETEBEFORE, GRAYED + MENUITEM "å é¤å¨å½åä½ç½®ä¹å(&A)",ID_EDIT_DELETEAFTER, GRAYED MENUITEM SEPARATOR - MENUITEM "A&udio Properties", ID_EDIT_AUDIOPROPS + MENUITEM "é³é¢å±æ§(&U)", ID_EDIT_AUDIOPROPS END - POPUP "Effect&s" + POPUP "ææ(&S)" BEGIN - MENUITEM "&Increase Volume (by 25%)", ID_EFFECTS_INCVOL - MENUITEM "&Decrease Volume", ID_EFFECTS_DECVOL + MENUITEM "å¢å é³é(25%)(&I)", ID_EFFECTS_INCVOL + MENUITEM "åå°é³é(&D)", ID_EFFECTS_DECVOL MENUITEM SEPARATOR - MENUITEM "&Increase Speed (by 100%)", ID_EFFECTS_INCSPD - MENUITEM "&Decrease Speed", ID_EFFECTS_DECSPD + MENUITEM "å¢å éåº¦ (100%)(&I)", ID_EFFECTS_INCSPD + MENUITEM "åå°éåº¦(&D)", ID_EFFECTS_DECSPD MENUITEM SEPARATOR - MENUITEM "&Add Echo", ID_EFFECTS_ECHO - MENUITEM "&Reverse", ID_EFFECTS_REVERSE + MENUITEM "æ·»å åé³(&A)", ID_EFFECTS_ECHO + MENUITEM "åé(&R)", ID_EFFECTS_REVERSE END - POPUP "å¸®å©" + POPUP "å¸®å©(&?)" BEGIN MENUITEM "å³äº...", ID_ABOUT END

1 0

[akhaldi] 65795: [TRANSLATIONS] Russian translation update by Kudratov Olimjon. CORE-8947
by akhaldi＠svn.reactos.org 22 Dec '14

22 Dec '14

Author: akhaldi Date: Mon Dec 22 19:10:42 2014 New Revision: 65795 URL: http://svn.reactos.org/svn/reactos?rev=65795&view=rev Log: [TRANSLATIONS] Russian translation update by Kudratov Olimjon. CORE-8947 Added: trunk/reactos/base/applications/cmdutils/tree/lang/ru-RU.rc (with props) trunk/reactos/base/applications/cmdutils/whoami/lang/ru-RU.rc (with props) Modified: trunk/reactos/base/applications/cmdutils/tree/tree.rc trunk/reactos/base/applications/cmdutils/whoami/whoami.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/ru-RU.rc trunk/reactos/base/applications/network/net/lang/ru-RU.rc trunk/reactos/base/applications/osk/lang/ru-RU.rc trunk/reactos/base/setup/reactos/lang/ru-RU.rc trunk/reactos/dll/cpl/sysdm/lang/ru-RU.rc trunk/reactos/dll/win32/shell32/lang/ru-RU.rc trunk/reactos/dll/win32/syssetup/lang/ru-RU.rc trunk/reactos/dll/win32/userenv/lang/ru-RU.rc Added: trunk/reactos/base/applications/cmdutils/tree/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/tree/lang/ru-RU.rc (added) +++ trunk/reactos/base/applications/cmdutils/tree/lang/ru-RU.rc [iso-8859-1] Mon Dec 22 19:10:42 2014 @@ -0,0 +1,14 @@ +/* Russian translation by Kudratov Olimjon (olim98(a)bk.ru) */ + +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + IDS_USAGE "ÐÑÐ°ÑÐ¸ÑÐµÑÐºÐ¾Ðµ Ð¿ÑÐµÐ´ÑÑÐ°Ð²Ð»ÐµÐ½Ð¸Ðµ ÑÑÑÑÐºÑÑÑÑ Ð¿Ð°Ð¿Ð¾Ðº Ð¸Ð»Ð¸ Ð¿ÑÑÐ¸.\n\n\ +TREE [Ð´Ð¸ÑÐº:][Ð¿ÑÑÑ] [/F] [/A]\n\n\ +\t/F ÐÑÐ²Ð¾Ð´ Ð¸Ð¼ÐµÐ½ ÑÐ°Ð¹Ð»Ð¾Ð² Ð² ÐºÐ°Ð¶Ð´Ð¾Ð¹ Ð¿Ð°Ð¿ÐºÐµ.\n\ +\t/A ÐÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÑ ÑÐ¸Ð¼Ð²Ð¾Ð»Ñ ASCII Ð²Ð¼ÐµÑÑÐ¾ ÑÐ¸Ð¼Ð²Ð¾Ð»Ð¾Ð² Ð½Ð°ÑÐ¸Ð¾Ð½Ð°Ð»ÑÐ½ÑÑ Ð°Ð»ÑÐ°Ð²Ð¸ÑÐ¾Ð²..\n" + IDS_NO_SUBDIRECTORIES "ÐÐ¾Ð´Ð¿Ð°Ð¿ÐºÐ¸ Ð¾ÑÑÑÑÑÑÐ²ÑÑÑ" + IDS_FOLDER_PATH "Ð¡ÑÑÑÐºÑÑÑÐ° Ð¿Ð°Ð¿Ð¾Ðº\n" + IDS_VOL_SERIAL "Ð¡ÐµÑÐ¸Ð¹Ð½ÑÐ¹ Ð½Ð¾Ð¼ÐµÑ ÑÐ¾Ð¼Ð° %x:%x\n" +END Propchange: trunk/reactos/base/applications/cmdutils/tree/lang/ru-RU.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/cmdutils/tree/tree.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/tree/tree.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/tree/tree.rc [iso-8859-1] Mon Dec 22 19:10:42 2014 @@ -20,3 +20,6 @@ #ifdef LANGUAGE_FR_FR #include "lang/fr-FR.rc" #endif +#ifdef LANGUAGE_RU_RU + #include "lang/ru-RU.rc" +#endif Added: trunk/reactos/base/applications/cmdutils/whoami/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/whoami/lang/ru-RU.rc (added) +++ trunk/reactos/base/applications/cmdutils/whoami/lang/ru-RU.rc [iso-8859-1] Mon Dec 22 19:10:42 2014 @@ -0,0 +1,58 @@ +/* Russian language resource file by Kudratov Olimjon (olim98(a)bk.ru) */ + +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + IDS_USER_HEADER "Ð¡Ð²ÐµÐ´ÐµÐ½Ð¸Ñ Ð¾ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ðµ" + IDS_GROU_HEADER "Ð¡Ð²ÐµÐ´ÐµÐ½Ð¸Ñ Ð¾ Ð³ÑÑÐ¿Ð¿Ð°Ñ" + IDS_PRIV_HEADER "Ð¡Ð²ÐµÐ´ÐµÐ½Ð¸Ñ Ð¾ Ð¿ÑÐ¸Ð²Ð¸Ð»ÐµÐ³Ð¸ÑÑ" + IDS_COL_USER_NAME "ÐÐ¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ" + IDS_COL_GROUP_NAME "ÐÑÑÐ¿Ð¿Ð°" + IDS_COL_TYPE "Ð¢Ð¸Ð¿" + IDS_COL_SID "SID" + IDS_COL_ATTRIB "ÐÑÑÐ¸Ð±ÑÑÑ" + IDS_COL_PRIV_NAME "ÐÐ¼Ñ Ð¿ÑÐ¸Ð²Ð¸Ð»ÐµÐ³Ð¸Ð¸" + IDS_COL_DESCRIPTION "ÐÐ¿Ð¸ÑÐ°Ð½Ð¸Ðµ" + IDS_COL_STATE "Ð¡Ð¾ÑÑÐ¾ÑÐ½Ð¸Ðµ" + IDS_TP_WELL_KNOWN_GROUP "Ð¥Ð¾ÑÐ¾ÑÐ¾ Ð¸Ð·Ð²ÐµÑÑÐ½Ð°Ñ Ð³ÑÑÐ¿Ð¿Ð°" + IDS_TP_ALIAS "ÐÑÐµÐ²Ð´Ð¾Ð½Ð¸Ð¼" + IDS_TP_LABEL "ÐÐµÑÐºÐ°" + + /* [!] important note from the programmer: the program tries to remove + the last ', ' after concatenating, so keep than in mind when translating. + + you can test your translation of these attributes by using 'whoami /groups' */ + + IDS_ATTR_GROUP_MANDATORY "ÐÐ±ÑÐ·Ð°ÑÐµÐ»ÑÐ½Ð°Ñ Ð³ÑÑÐ¿Ð¿Ð°, " + IDS_ATTR_GROUP_ENABLED_BY_DEFAULT "ÐÐºÐ»ÑÑÐµÐ½Ð° Ð¿Ð¾ ÑÐ¼Ð¾Ð»ÑÐ°Ð½Ð¸Ñ, " + IDS_ATTR_GROUP_ENABLED "ÐÐºÐ»ÑÑÐµÐ½Ð½Ð°Ñ Ð³ÑÑÐ¿Ð¿Ð°, " + IDS_ATTR_GROUP_OWNER "ÐÐ»Ð°Ð´ÐµÐ»ÐµÑ Ð³ÑÑÐ¿Ð¿Ñ, " + IDS_UNKNOWN_DESCRIPTION "???" + IDS_STATE_ENABLED "ÐÐºÐ»ÑÑÐµÐ½" + IDS_STATE_DISABLED "ÐÑÐºÐ»ÑÑÐµÐ½" + IDS_ERROR_UPN "ÐÐ¨ÐÐÐÐ: ÐÐµ ÑÐ´Ð°ÐµÑÑÑ Ð¿Ð¾Ð»ÑÑÐ¸ÑÑ Ð¸Ð¼Ñ ÑÑÐ°ÑÑÐ½Ð¸ÐºÐ°-Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ (UPN), Ð¿Ð¾ÑÐºÐ¾Ð»ÑÐºÑ ÑÐµÐºÑÑÐ¸Ð¹\nÐ²Ð¾ÑÐµÐ´ÑÐ¸Ð¹ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ Ð½Ðµ ÑÐ²Ð»ÑÐµÑÑÑ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»ÐµÐ¼ Ð´Ð¾Ð¼ÐµÐ½Ð°.\n" + IDS_ERROR_FQDN "ÐÐ¨ÐÐÐÐ: ÐÐµ ÑÐ´Ð°ÐµÑÑÑ Ð¿Ð¾Ð»ÑÑÐ¸ÑÑ Ð¿Ð¾Ð»Ð½Ð¾Ðµ Ð´Ð¾Ð¼ÐµÐ½Ð½Ð¾Ðµ Ð¸Ð¼Ñ (FQDN), Ð¿Ð¾ÑÐºÐ¾Ð»ÑÐºÑ ÑÐµÐºÑÑÐ¸Ð¹\nÐ²Ð¾ÑÐµÐ´ÑÐ¸Ð¹ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ Ð½Ðµ ÑÐ²Ð»ÑÐµÑÑÑ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»ÐµÐ¼ Ð´Ð¾Ð¼ÐµÐ½Ð°.\n" + IDS_ERROR_VALUEXPECTED "ÐÐ¨ÐÐÐÐ: Ð£ÐºÐ°Ð·Ð°Ð½ Ð½ÐµÐ´Ð¾Ð¿ÑÑÑÐ¸Ð¼ÑÐ¹ ÑÐ¾ÑÐ¼Ð°Ñ (/FO).\nÐÐ²ÐµÐ´Ð¸ÑÐµ ""WHOAMI /?"" Ð´Ð»Ñ Ð¿Ð¾Ð»ÑÑÐµÐ½Ð¸Ñ ÑÐ¿ÑÐ°Ð²ÐºÐ¸ Ð¿Ð¾ Ð¸ÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°Ð½Ð¸Ñ.\n" + IDS_ERROR_VALUENOTALLOWED "ÐÐ¨ÐÐÐÐ: ÐÐµÐ²ÐµÑÐ½ÑÐ¹ ÑÐ¸Ð½ÑÐ°ÐºÑÐ¸Ñ. ÐÐ½Ð°ÑÐµÐ½Ð¸Ðµ '%s' Ð·Ð°Ð¿ÑÐµÑÐµÐ½Ð¾ Ð´Ð»Ñ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÐ° '/fo'.\nÐÐ²ÐµÐ´Ð¸ÑÐµ ""WHOAMI /?"" Ð´Ð»Ñ Ð¿Ð¾Ð»ÑÑÐµÐ½Ð¸Ñ ÑÐ¿ÑÐ°Ð²ÐºÐ¸ Ð¿Ð¾ Ð¸ÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°Ð½Ð¸Ñ.\n" + IDS_ERROR_1TIMES "ÐÐ¨ÐÐÐÐ: ÐÐµÐ²ÐµÑÐ½ÑÐ¹ ÑÐ¸Ð½ÑÐ°ÐºÑÐ¸Ñ. ÐÐ°Ð¿ÑÐµÑÐµÐ½Ð¾ Ð¸ÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÑ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑ '%s' Ð±Ð¾Ð»ÐµÐµ '1' ÑÐ°Ð·(Ð°).\nÐÐ²ÐµÐ´Ð¸ÑÐµ ""WHOAMI /?"" Ð´Ð»Ñ Ð¿Ð¾Ð»ÑÑÐµÐ½Ð¸Ñ ÑÐ¿ÑÐ°Ð²ÐºÐ¸ Ð¿Ð¾ Ð¸ÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°Ð½Ð¸Ñ.\n" + IDS_ERROR_INVALIDSYNTAX "ÐÐ¨ÐÐÐÐ: Ð¡Ð¸Ð½ÑÐ°ÐºÑÐ¸ÑÐµÑÐºÐ°Ñ Ð¾ÑÐ¸Ð±ÐºÐ°. \nÐÐ²ÐµÐ´Ð¸ÑÐµ ""WHOAMI /?"" Ð´Ð»Ñ Ð¿Ð¾Ð»ÑÑÐµÐ½Ð¸Ñ ÑÐ¿ÑÐ°Ð²ÐºÐ¸ Ð¿Ð¾ Ð¸ÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°Ð½Ð¸Ñ.\n" + IDS_ERROR_INVALIDARG "ÐÐ¨ÐÐÐÐ: ÐÐµÐ¿ÑÐ°Ð²Ð¸Ð»ÑÐ½ÑÐ¹ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑ Ð¸Ð»Ð¸ Ð°ÑÐ³ÑÐ¼ÐµÐ½Ñ - '%s'.\nÐÐ²ÐµÐ´Ð¸ÑÐµ ""WHOAMI /?"" Ð´Ð»Ñ Ð¿Ð¾Ð»ÑÑÐµÐ½Ð¸Ñ ÑÐ¿ÑÐ°Ð²ÐºÐ¸ Ð¿Ð¾ Ð¸ÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°Ð½Ð¸Ñ.\n" + IDS_ERROR_NH_LIST "ÐÐ¨ÐÐÐÐ: ÐÐ°ÑÐ°Ð¼ÐµÑÑ /NH Ð½ÐµÐ»ÑÐ·Ñ Ð¸ÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÑ Ñ ÑÐ¾ÑÐ¼Ð°ÑÐ¾Ð¼ LIST.\nÐÐ²ÐµÐ´Ð¸ÑÐµ ""WHOAMI /?"" Ð´Ð»Ñ Ð¿Ð¾Ð»ÑÑÐµÐ½Ð¸Ñ ÑÐ¿ÑÐ°Ð²ÐºÐ¸ Ð¿Ð¾ Ð¸ÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°Ð½Ð¸Ñ.\n" + IDS_HELP "ÐÐ¿Ð¸ÑÐ°Ð½Ð¸Ðµ:\n\ + ÐÑÐ¾Ð±ÑÐ°Ð¶Ð°ÐµÑ Ð¸Ð½ÑÐ¾ÑÐ¼Ð°ÑÐ¸Ñ Ð¾Ð± Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ðµ, Ð³ÑÑÐ¿Ð¿Ðµ Ð¸ Ð¿ÑÐ¸Ð²Ð¸Ð»ÐµÐ³Ð¸ÑÑ Ð´Ð»Ñ Ð»Ð¾ÐºÐ°Ð»ÑÐ½Ð¾ Ð²Ð¾ÑÐµÐ´ÑÐ¸Ñ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»ÐµÐ¹.\n\ + ÐÑÐ»Ð¸ Ð½Ðµ ÑÐºÐ°Ð·Ð°Ð½Ð¾ Ð°ÑÐ³ÑÐ¼ÐµÐ½ÑÐ¾Ð², ÑÐ¾ Ð¾ÑÐ¾Ð±ÑÐ°Ð¶Ð°ÐµÑ ÑÐµÐºÑÑÐ¸Ð¹ Ð´Ð¾Ð¼ÐµÐ½ Ð¸ ÑÐµÐºÑÑÐµÐ³Ð¾ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ (Ð´Ð¾Ð¼ÐµÐ½\Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ).\n\ +\n\ + ÐÐ¾ÑÑÑÐ¿Ð½ÑÐµ ÑÐ¾ÑÐ¼Ð°ÑÑ Ð´Ð»Ñ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÐ° '/fo' - 'csv', 'list' Ð¸ 'table'.\n\ + ÐÑÐ¿Ð¾Ð»ÑÐ·ÑÐ¹ÑÐµ '/nh' ÑÑÐ¾Ð±Ñ ÑÐºÑÑÑÑ Ð·Ð°Ð³Ð¾Ð»Ð¾Ð²ÐºÐ¸. ÐÐ¾ ÑÐ¼Ð¾Ð»ÑÐ°Ð½Ð¸Ñ Ð´Ð°Ð½Ð½ÑÐµ Ð¾ÑÐ¾Ð±ÑÐ°Ð¶Ð°ÑÑÑÑ Ð² ÑÐ°Ð±Ð»Ð¸ÑÐµ.\n\ +\n\ +Ð¡Ð¸Ð½ÑÐ°ÐºÑÐ¸Ñ:\n\ + whoami [/upn | /fqdn | /logonid] \n\ + whoami {[/user] [/groups] [/priv]} [/fo <ÑÐ¾ÑÐ¼Ð°Ñ>] [/nh] \n\ + whoami /all [/fo <ÑÐ¾ÑÐ¼Ð°Ñ>] [/nh] \n\ +\n\ +ÐÑÐ¸Ð¼ÐµÑÑ:\n\ + whoami /groups /priv /nh /fo csv \n\ + whoami /logonid \n\ + whoami \n" +END Propchange: trunk/reactos/base/applications/cmdutils/whoami/lang/ru-RU.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/cmdutils/whoami/whoami.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/whoami/whoami.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/whoami/whoami.rc [iso-8859-1] Mon Dec 22 19:10:42 2014 @@ -7,7 +7,6 @@ #define REACTOS_STR_FILE_DESCRIPTION "whoami: display information about logged-on users" #define REACTOS_STR_INTERNAL_NAME "whoami" #define REACTOS_STR_ORIGINAL_FILENAME "whoami.exe" -#define REACTOS_STR_COMPANY_NAME "Ismael Ferreras Morezuelas" #include <reactos/version.rc> @@ -23,3 +22,6 @@ #ifdef LANGUAGE_ES_ES #include "lang/es-ES.rc" #endif +#ifdef LANGUAGE_RU_RU + #include "lang/ru-RU.rc" +#endif Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/ru-RU.rc [iso-8859-1] Mon Dec 22 19:10:42 2014 @@ -121,15 +121,15 @@ STRINGTABLE BEGIN - IDS_COPY "Event Type: %s\n\ -Event Source: %s\n\ -Event Category: %s\n\ -Event ID: %s\n\ -Date: %s\n\ -Time: %s\n\ -User: %s\n\ -Computer: %s\n\ -Description:\n%s" + IDS_COPY "Ð¢Ð¸Ð¿ ÑÐ¾Ð±ÑÑÐ¸Ñ: %s\n\ +ÐÑÑÐ¾ÑÐ½Ð¸Ðº ÑÐ¾Ð±ÑÑÐ¸Ñ: %s\n\ +ÐÐ°ÑÐµÐ³Ð¾ÑÐ¸Ñ ÑÐ¾Ð±ÑÑÐ¸Ñ: %s\n\ +ID ÑÐ¾Ð±ÑÑÐ¸Ñ: %s\n\ +ÐÐ°ÑÐ°: %s\n\ +ÐÑÐµÐ¼Ñ: %s\n\ +ÐÐ¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ: %s\n\ +ÐÐ¾Ð¼Ð¿ÑÑÑÐµÑ: %s\n\ +ÐÐ¿Ð¸ÑÐ°Ð½Ð¸Ðµ:\n%s" END STRINGTABLE Modified: trunk/reactos/base/applications/network/net/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/net/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/net/lang/ru-RU.rc [iso-8859-1] Mon Dec 22 19:10:42 2014 @@ -67,59 +67,59 @@ HELPMSG | LOCALGROUP | NAME | PAUSE | PRINT | SEND | SESSION |\n\ SHARE | START | STATISTICS | STOP | TIME | USE | NET USER | VIEW ]\n" - IDS_ACCOUNTS_FORCE_LOGOFF "Force logoff after" - IDS_ACCOUNTS_LOGOFF_SECONDS "%lu seconds" - IDS_ACCOUNTS_MIN_PW_AGE "Minimum password age (in days)" - IDS_ACCOUNTS_MAX_PW_AGE "Maximum password age (in days)" - IDS_ACCOUNTS_MIN_PW_LENGTH "Minimum password length" - IDS_ACCOUNTS_PW_HIST_LENGTH "Password history length" - IDS_ACCOUNTS_LOCKOUT_THRESHOLD "Lockout threshold" - IDS_ACCOUNTS_LOCKOUT_DURATION "Lockout duration (in minutes)" - IDS_ACCOUNTS_LOCKOUT_WINDOW "Lockout observation window (in minutes)" - IDS_ACCOUNTS_COMPUTER_ROLE "Computer role" - IDS_ACCOUNTS_PRIMARY_SERVER "Primary server" - IDS_ACCOUNTS_BACKUP_SERVER "Backup server" - IDS_ACCOUNTS_STANDALONE_SERVER "Standalone server" - IDS_ACCOUNTS_WORKSTATION "Workstation" + IDS_ACCOUNTS_FORCE_LOGOFF "ÐÑÐ¸Ð½ÑÐ´Ð¸ÑÐµÐ»ÑÐ½ÑÐ¹ Ð²ÑÑÐ¾Ð´ ÑÐµÑÐµÐ·" + IDS_ACCOUNTS_LOGOFF_SECONDS "%lu ÑÐµÐºÑÐ½Ð´" + IDS_ACCOUNTS_MIN_PW_AGE "ÐÐ¸Ð½Ð¸Ð¼Ð°Ð»ÑÐ½ÑÐ¹ ÑÑÐ¾Ðº Ð´ÐµÐ¹ÑÑÐ²Ð¸Ñ Ð¿Ð°ÑÐ¾Ð»Ñ (Ð´Ð½ÐµÐ¹)" + IDS_ACCOUNTS_MAX_PW_AGE "ÐÐ°ÐºÑÐ¸Ð¼Ð°Ð»ÑÐ½ÑÐ¹ ÑÑÐ¾Ðº Ð´ÐµÐ¹ÑÑÐ²Ð¸Ñ Ð¿Ð°ÑÐ¾Ð»Ñ (Ð´Ð½ÐµÐ¹)" + IDS_ACCOUNTS_MIN_PW_LENGTH "ÐÐ¸Ð½Ð¸Ð¼Ð°Ð»ÑÐ½Ð°Ñ Ð´Ð»Ð¸Ð½Ð° Ð¿Ð°ÑÐ¾Ð»Ñ" + IDS_ACCOUNTS_PW_HIST_LENGTH "ÐÐ»Ð¸Ð½Ð° Ð¸ÑÑÐ¾ÑÐ¸Ð¸ Ð¿Ð°ÑÐ¾Ð»ÐµÐ¹" + IDS_ACCOUNTS_LOCKOUT_THRESHOLD "ÐÐ»Ð¾ÐºÐ¸ÑÐ¾Ð²ÐºÐ° Ð¿Ð¾ÑÐ»Ðµ Ð¾ÑÐ¸Ð±Ð¾Ðº Ð²Ð²Ð¾Ð´Ð° Ð¿Ð°ÑÐ¾Ð»Ñ" + IDS_ACCOUNTS_LOCKOUT_DURATION "ÐÐ»Ð¸ÑÐµÐ»ÑÐ½Ð¾ÑÑÑ Ð±Ð»Ð¾ÐºÐ¸ÑÐ¾Ð²ÐºÐ¸ (Ð¼Ð¸Ð½ÑÑ)" + IDS_ACCOUNTS_LOCKOUT_WINDOW "Ð¡Ð±ÑÐ¾Ñ ÑÑÐµÑÑÐ¸ÐºÐ° Ð±Ð»Ð¾ÐºÐ¸ÑÐ¾Ð²Ð¾Ðº ÑÐµÑÐµÐ· (Ð¼Ð¸Ð½ÑÑ)" + IDS_ACCOUNTS_COMPUTER_ROLE "Ð Ð¾Ð»Ñ ÐºÐ¾Ð¼Ð¿ÑÑÑÐµÑÐ°" + IDS_ACCOUNTS_PRIMARY_SERVER "ÐÑÐ½Ð¾Ð²Ð½Ð¾Ð¹ ÑÐµÑÐ²ÐµÑ" + IDS_ACCOUNTS_BACKUP_SERVER "Ð ÐµÐ·ÐµÑÐ²Ð½ÑÐ¹ ÑÐµÑÐ²ÐµÑ" + IDS_ACCOUNTS_STANDALONE_SERVER "ÐÐ²ÑÐ¾Ð½Ð¾Ð¼Ð½ÑÐ¹ ÑÐµÑÐ²ÐµÑ" + IDS_ACCOUNTS_WORKSTATION "Ð Ð°Ð±Ð¾ÑÐ°Ñ ÑÑÐ°Ð½ÑÐ¸Ñ" - IDS_LOCALGROUP_ALIASES "Aliases for \\\\%s" - IDS_LOCALGROUP_ALIAS_NAME "Alias name" - IDS_LOCALGROUP_COMMENT "Comment" - IDS_LOCALGROUP_MEMBERS "Members" + IDS_LOCALGROUP_ALIASES "ÐÑÐµÐ²Ð´Ð¾Ð½Ð¸Ð¼Ñ Ð´Ð»Ñ \\\\%s" + IDS_LOCALGROUP_ALIAS_NAME "ÐÐ¼Ñ Ð¿ÑÐµÐ²Ð´Ð¾Ð½Ð¸Ð¼Ð°" + IDS_LOCALGROUP_COMMENT "ÐÐ¾Ð¼Ð¼ÐµÐ½ÑÐ°ÑÐ¸Ð¹" + IDS_LOCALGROUP_MEMBERS "Ð§Ð»ÐµÐ½Ñ" - IDS_USER_ACCOUNTS "User accounts for \\\\%s" - IDS_USER_NAME "User name" - IDS_USER_FULL_NAME "Full name" - IDS_USER_COMMENT "Comment" - IDS_USER_USER_COMMENT "User comment" - IDS_USER_COUNTRY_CODE "Country code" - IDS_USER_ACCOUNT_ACTIVE "Account active" - IDS_USER_ACCOUNT_EXPIRES "Account expires" - IDS_USER_PW_LAST_SET "Password last set" - IDS_USER_PW_EXPIRES "Password expires" - IDS_USER_PW_CHANGEABLE "Password changeable" - IDS_USER_PW_REQUIRED "Password required" - IDS_USER_CHANGE_PW "User may change password" - IDS_USER_WORKSTATIONS "Workstations allowed" - IDS_USER_LOGON_SCRIPT "Logon script" - IDS_USER_PROFILE "User profile" - IDS_USER_HOME_DIR "Home directory" - IDS_USER_LAST_LOGON "Last logon" - IDS_USER_LOGON_HOURS "Logon hours allowed" - IDS_USER_LOCAL_GROUPS "Local group memberships" - IDS_USER_GLOBAL_GROUPS "Global group memberships" + IDS_USER_ACCOUNTS "Ð£ÑÐµÑÐ½ÑÐµ Ð·Ð°Ð¿Ð¸ÑÐ¸ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»ÐµÐ¹ Ð´Ð»Ñ \\\\%s" + IDS_USER_NAME "ÐÐ¼Ñ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ" + IDS_USER_FULL_NAME "ÐÐ¾Ð»Ð½Ð¾Ðµ Ð¸Ð¼Ñ" + IDS_USER_COMMENT "ÐÐ¾Ð¼Ð¼ÐµÐ½ÑÐ°ÑÐ¸Ð¹" + IDS_USER_USER_COMMENT "ÐÐ¾Ð¼Ð¼ÐµÐ½ÑÐ°ÑÐ¸Ð¹ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ" + IDS_USER_COUNTRY_CODE "ÐÐ¾Ð´ ÑÑÑÐ°Ð½Ñ" + IDS_USER_ACCOUNT_ACTIVE "Ð£ÑÐµÑÐ½Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑ Ð°ÐºÑÐ¸Ð²Ð½Ð°" + IDS_USER_ACCOUNT_EXPIRES "Ð£ÑÐµÑÐ½Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑ Ð¿ÑÐ¾ÑÑÐ¾ÑÐµÐ½Ð°" + IDS_USER_PW_LAST_SET "ÐÐ¾ÑÐ»ÐµÐ´Ð½Ð¸Ð¹ Ð¿Ð°ÑÐ¾Ð»Ñ Ð·Ð°Ð´Ð°Ð½" + IDS_USER_PW_EXPIRES "ÐÐµÐ¹ÑÑÐ²Ð¸Ðµ Ð¿Ð°ÑÐ¾Ð»Ñ Ð·Ð°Ð²ÐµÑÑÐ°ÐµÑÑÑ" + IDS_USER_PW_CHANGEABLE "ÐÐ°ÑÐ¾Ð»Ñ Ð´Ð¾Ð¿ÑÑÐºÐ°ÐµÑ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ðµ" + IDS_USER_PW_REQUIRED "Ð¢ÑÐµÐ±ÑÐµÑÑÑ Ð¿Ð°ÑÐ¾Ð»Ñ" + IDS_USER_CHANGE_PW "ÐÐ¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ Ð¼Ð¾Ð¶ÐµÑ Ð¸Ð·Ð¼ÐµÐ½Ð¸ÑÑ Ð¿Ð°ÑÐ¾Ð»Ñ" + IDS_USER_WORKSTATIONS "Ð Ð°Ð·ÑÐµÑÐµÐ½Ð½ÑÐµ ÑÐ°Ð±Ð¾ÑÐ¸Ðµ ÑÑÐ°Ð½ÑÐ¸Ð¸" + IDS_USER_LOGON_SCRIPT "Ð¡ÑÐµÐ½Ð°ÑÐ¸Ð¹ Ð²ÑÐ¾Ð´Ð°" + IDS_USER_PROFILE "ÐÐ¾Ð½ÑÐ¸Ð³ÑÑÐ°ÑÐ¸Ñ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ" + IDS_USER_HOME_DIR "ÐÑÐ½Ð¾Ð²Ð½Ð¾Ð¹ ÐºÐ°ÑÐ°Ð»Ð¾Ð³" + IDS_USER_LAST_LOGON "ÐÐ¾ÑÐ»ÐµÐ´Ð½Ð¸Ð¹ Ð²ÑÐ¾Ð´" + IDS_USER_LOGON_HOURS "Ð Ð°Ð·ÑÐµÑÐµÐ½Ð½ÑÐµ ÑÐ°ÑÑ Ð²ÑÐ¾Ð´Ð°" + IDS_USER_LOCAL_GROUPS "Ð§Ð»ÐµÐ½ÑÑÐ²Ð¾ Ð² Ð»Ð¾ÐºÐ°Ð»ÑÐ½ÑÑ Ð³ÑÑÐ¿Ð¿Ð°Ñ" + IDS_USER_GLOBAL_GROUPS "Ð§Ð»ÐµÐ½ÑÑÐ²Ð¾ Ð² Ð³Ð»Ð¾Ð±Ð°Ð»ÑÐ½ÑÑ Ð³ÑÑÐ¿Ð¿Ð°Ñ" - IDS_USER_ENTER_PASSWORD1 "Enter a new password for the user: " - IDS_USER_ENTER_PASSWORD2 "Enter the password again: " - IDS_USER_NO_PASSWORD_MATCH "The passwords do not match!" + IDS_USER_ENTER_PASSWORD1 "ÐÐ²ÐµÐ´Ð¸ÑÐµ Ð¿Ð°ÑÐ¾Ð»Ñ Ð´Ð»Ñ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ: " + IDS_USER_ENTER_PASSWORD2 "ÐÐ¾Ð²ÑÐ¾ÑÐ¸ÑÐµ Ð²Ð²Ð¾Ð´ Ð¿Ð°ÑÐ¾Ð»Ñ Ð´Ð»Ñ Ð¿Ð¾Ð´ÑÐ²ÐµÑÐ¶Ð´ÐµÐ½Ð¸Ñ: " + IDS_USER_NO_PASSWORD_MATCH "ÐÐ°ÑÐ¾Ð»Ð¸ Ð½Ðµ ÑÐ¾Ð²Ð¿Ð°Ð´Ð°ÑÑ!" - IDS_GENERIC_YES "Yes" - IDS_GENERIC_NO "No" - IDS_GENERIC_NEVER "Never" - IDS_GENERIC_NONE "None" - IDS_GENERIC_ALL "All" - IDS_GENERIC_LOCKED "Locked" + IDS_GENERIC_YES "ÐÐ°" + IDS_GENERIC_NO "ÐÐµÑ" + IDS_GENERIC_NEVER "ÐÐ¸ÐºÐ¾Ð³Ð´Ð°" + IDS_GENERIC_NONE "ÐÐµÑ" + IDS_GENERIC_ALL "ÐÑÐµ" + IDS_GENERIC_LOCKED "ÐÐ°Ð±Ð»Ð¾ÐºÐ¸ÑÐ¾Ð²Ð°Ð½Ð¾" - IDS_ERROR_OPTION_NOT_SUPPORTED "The %s option is not supported yet.\n" - IDS_ERROR_INVALID_OPTION_VALUE "You entered an invalid value for the %s option.\n" + IDS_ERROR_OPTION_NOT_SUPPORTED "ÐÐ¿ÑÐ¸Ñ %s Ð² Ð´Ð°Ð½Ð½ÑÐ¹ Ð¼Ð¾Ð¼ÐµÐ½Ñ Ð½Ðµ Ð¿Ð¾Ð´Ð´ÐµÑÐ¶Ð¸Ð²Ð°ÐµÑÑÑ.\n" + IDS_ERROR_INVALID_OPTION_VALUE "ÐÑ Ð²Ð²ÐµÐ»Ð¸ Ð½ÐµÐ²ÐµÑÐ½ÑÐ¹ Ð´Ð°Ð½Ð½ÑÐµ Ð´Ð»Ñ Ð´Ð°Ð½Ð½Ð¾Ð¹ Ð¾Ð¿ÑÐ¸Ð¸ %s.\n" END Modified: trunk/reactos/base/applications/osk/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/osk/lang… ============================================================================== --- trunk/reactos/base/applications/osk/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/osk/lang/ru-RU.rc [iso-8859-1] Mon Dec 22 19:10:42 2014 @@ -1,5 +1,5 @@ /* - * PROJECT: ReactOS Kernel + * PROJECT: ReactOS On-Screen Keyboard * LICENSE: GPL - See COPYING in the top level directory * FILE: base/applications/osk/lang/ru-RU.rc * PURPOSE: On screen keyboard (Russian resources) @@ -9,7 +9,7 @@ LANGUAGE LANG_RUSSIAN, SUBLANG_NEUTRAL MAIN_DIALOG DIALOGEX DISCARDABLE 0, 0, 608, 164 -CAPTION "ÐÐ»Ð°Ð²Ð¸Ð°ÑÑÑÐ° Ð²Ð¸Ð·ÑÐ°Ð»ÑÐ½ÑÐ¹" +CAPTION "ÐÐºÑÐ°Ð½Ð½Ð°Ñ ÐºÐ»Ð°Ð²Ð¸Ð°ÑÑÑÐ°" FONT 8, "MS Shell Dlg" EXSTYLE WS_EX_TOPMOST | WS_EX_TOOLWINDOW | WS_EX_NOACTIVATE BEGIN Modified: trunk/reactos/base/setup/reactos/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/ru… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/ru-RU.rc [iso-8859-1] Mon Dec 22 19:10:42 2014 @@ -140,8 +140,8 @@ IDS_PROCESSSUBTITLE "Ð¡Ð¾Ð·Ð´Ð°Ð½Ð¸Ðµ ÑÐ°Ð·Ð´ÐµÐ»Ð° Ð½Ð° Ð´Ð¸ÑÐºÐµ, ÐºÐ¾Ð¿Ð¸ÑÐ¾Ð²Ð°Ð½Ð¸Ðµ ÑÐ°Ð¹Ð»Ð¾Ð², ÑÑÑÐ°Ð½Ð¾Ð²ÐºÐ° Ð·Ð°Ð³ÑÑÐ·ÑÐ¸ÐºÐ°" IDS_RESTARTTITLE "ÐÐµÑÐ²ÑÐ¹ ÑÑÐ°Ð¿ ÑÑÑÐ°Ð½Ð¾Ð²ÐºÐ¸ Ð·Ð°ÐºÐ¾Ð½ÑÐµÐ½" IDS_RESTARTSUBTITLE "ÐÐµÑÐ²ÑÐ¹ ÑÑÐ°Ð¿ Ð·Ð°ÐºÐ¾Ð½ÑÐµÐ½, Ð´Ð»Ñ Ð¿ÑÐ¾Ð´Ð¾Ð»Ð¶ÐµÐ½Ð¸Ñ ÑÑÐµÐ±ÑÐµÑÑÑ Ð¿ÐµÑÐµÐ·Ð°Ð³ÑÑÐ·ÐºÐ°" - IDS_SUMMARYTITLE "Installation Summary" - IDS_SUMMARYSUBTITLE "List installation properties to check before apply to the installation device" + IDS_SUMMARYTITLE "Ð¡Ð²Ð¾Ð´ÐºÐ°" + IDS_SUMMARYSUBTITLE "ÐÑÐ¾Ð²ÐµÑÑÑÐµ ÑÐ¿Ð¸ÑÐ¾Ðº Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÐ¾Ð² Ð¿ÐµÑÐµÐ´ Ð½Ð°ÑÐ°Ð»Ð¾Ð¼ ÑÑÑÐ°Ð½Ð¾Ð²ÐºÐ¸" IDS_ABORTSETUP "ReactOS ÑÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½ Ð½Ð° ÐºÐ¾Ð¼Ð¿ÑÑÑÐµÑ Ð½Ðµ Ð¿Ð¾Ð»Ð½Ð¾ÑÑÑÑ. ÐÑÐ»Ð¸ Ð²Ñ Ð·Ð°ÐºÑÐ¾ÐµÑÐµ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ñ ÑÑÑÐ°Ð½Ð¾Ð²ÐºÐ¸ ÑÐµÐ¹ÑÐ°Ñ, Ð² Ð´Ð°Ð»ÑÐ½ÐµÐ¹ÑÐµÐ¼ Ð²Ð°Ð¼ Ð¿ÑÐ¸Ð´ÐµÑÑÑ Ð¿Ð¾Ð²ÑÐ¾ÑÐ¸ÑÑ ÑÑÑÐ°Ð½Ð¾Ð²ÐºÑ ReactOS. ÐÑ ÑÐ²ÐµÑÐµÐ½Ñ, ÑÑÐ¾ Ð½ÐµÐ¾Ð±ÑÐ¾Ð´Ð¸Ð¼Ð¾ Ð¿ÑÐµÑÐ²Ð°ÑÑ ÑÑÑÐ°Ð½Ð¾Ð²ÐºÑ?" IDS_ABORTSETUP2 "ÐÑÐµÑÐ²Ð°ÑÑ ÑÑÑÐ°Ð½Ð¾Ð²ÐºÑ?" END Modified: trunk/reactos/dll/cpl/sysdm/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/ru-RU.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/ru-RU.rc [iso-8859-1] Mon Dec 22 19:10:42 2014 @@ -103,9 +103,9 @@ CAPTION "ÐÐ¾Ð¿Ð¸Ñ ÐÑÐ¾ÑÐ¸Ð»Ñ" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Ð¸Ð·:", IDC_STATIC, 5, 10, 20, 8 + LTEXT "ÐÐ·:", IDC_STATIC, 5, 10, 20, 8 LTEXT "", IDC_COPYPROFILEFROM, 30, 10, 160, 10 - LTEXT "Ð²:", IDC_STATIC, 5, 30, 20, 8 + LTEXT "Ð:", IDC_STATIC, 5, 30, 20, 8 EDITTEXT IDC_COPYPROFILETO, 30, 30, 160, 12 DEFPUSHBUTTON "&ÐÐ", IDOK, 199, 9, 50, 14 PUSHBUTTON "ÐÑÐ¼ÐµÐ½Ð°", IDCANCEL, 199, 30, 50, 14 @@ -116,9 +116,9 @@ CAPTION "ÐÐµÑÐµÐ¸Ð¼ÐµÐ½Ð¾Ð²Ð°ÑÑ Ð¿ÑÐ¾ÑÐ¸Ð»Ñ" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "ÐÐ:", IDC_STATIC, 5, 10, 20, 8 + LTEXT "ÐÐ·:", IDC_STATIC, 5, 10, 20, 8 LTEXT "", IDC_RENPROFEDITFROM, 30, 10, 160, 10 - LTEXT "Ð²:", IDC_STATIC, 5, 30, 20, 8 + LTEXT "Ð:", IDC_STATIC, 5, 30, 20, 8 EDITTEXT IDC_RENPROFEDITTO, 30, 30, 160, 12 DEFPUSHBUTTON "OK", IDOK, 199, 9, 50, 14 PUSHBUTTON "ÐÑÐ¼ÐµÐ½Ð°", IDCANCEL, 199, 30, 50, 14 @@ -145,7 +145,7 @@ IDD_STARTUPRECOVERY DIALOGEX 6, 18, 252, 280 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "ÐÐ°Ð³ÑÑÐ·ÐºÐ° Ð¸ Ð²Ð¾ÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ðµ" +CAPTION "ÐÐ°Ð³ÑÑÐ·ÐºÐ° Ð¸ Ð²Ð¾ÑÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ðµ" FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "ÐÐ°Ð³ÑÑÐ·ÐºÐ° Ð¾Ð¿ÐµÑÐ°ÑÐ¸Ð¾Ð½Ð½Ð¾Ð¹ ÑÐ¸ÑÑÐµÐ¼Ñ", IDC_STATIC, 7, 12, 238, 95 @@ -156,7 +156,7 @@ CONTROL "", IDC_STRRECLISTUPDWN, "msctls_updown32", UDS_WRAP | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | WS_CHILD | WS_VISIBLE, 0, 0, 8, 13 LTEXT "ÑÐµÐºÑÐ½Ð´", IDC_STATIC, 213, 56, 25, 8 - AUTOCHECKBOX "ÐÑÐ¾Ð±ÑÐ°Ð¶Ð°ÑÑ &Ð²Ð°ÑÐ¸Ð°Ð½ÑÑ Ð²Ð¾ÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ:", IDC_STRRECREC, 14, 70, 163, 8 + AUTOCHECKBOX "ÐÑÐ¾Ð±ÑÐ°Ð¶Ð°ÑÑ &Ð²Ð°ÑÐ¸Ð°Ð½ÑÑ Ð²Ð¾ÑÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ:", IDC_STRRECREC, 14, 70, 163, 8 EDITTEXT IDC_STRRECRECEDIT, 179, 68, 30, 12, ES_NUMBER CONTROL "", IDC_STRRECRECUPDWN, "msctls_updown32", UDS_WRAP | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | WS_CHILD | WS_VISIBLE, 0, 0, 8, 13 @@ -210,7 +210,7 @@ IDD_ENVIRONMENT_VARIABLES DIALOGEX 6, 18, 252, 245 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "ÐÐµÑÐµÐ¼Ð½Ð½ÑÐµ ÑÑÐµÐ´Ñ" +CAPTION "ÐÐµÑÐµÐ¼ÐµÐ½Ð½ÑÐµ ÑÑÐµÐ´Ñ" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "ÐÐµÑÐµÐ¼ÐµÐ½Ð½ÑÐµ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ", IDC_STATIC, 7, 12, 238, 100 @@ -262,7 +262,7 @@ IDS_VARIABLE "ÐÐµÑÐµÐ¼ÐµÐ½Ð½Ð°Ñ" IDS_VALUE "ÐÐ½Ð°ÑÐµÐ½Ð¸Ðµ" IDS_NO_DUMP "(Ð½ÐµÑ)" - IDS_MINI_DUMP "ÐÐ°Ð»ÑÐ¹ Ð´Ð°Ð¼Ð¿(64ÐÐ±)" + IDS_MINI_DUMP "ÐÐ°Ð»ÑÐ¹ Ð´Ð°Ð¼Ð¿ (64ÐÐ±)" IDS_KERNEL_DUMP "ÐÐ°Ð¼Ð¿ ÑÐ´ÑÐ°" IDS_FULL_DUMP "ÐÐ¾Ð»Ð½ÑÐ¹ Ð´Ð°Ð¼Ð¿" IDS_USERPROFILE_NAME "ÐÐ¼Ñ" @@ -277,6 +277,6 @@ IDS_WARNMAXIMUMRANGE "ÐÐ°ÐºÑÐ¸Ð¼Ð°Ð»ÑÐ½ÑÐ¹ ÑÐ°Ð·Ð¼ÐµÑ ÑÐ°Ð¹Ð»Ð° Ð¿Ð¾Ð´ÐºÐ°ÑÐºÐ¸ Ð´Ð¾Ð»Ð¶ÐµÐ½ Ð±ÑÑÑ Ð½Ðµ Ð¼ÐµÐ½ÑÑÐµ, ÑÐµÐ¼ Ð½Ð°ÑÐ°Ð»ÑÐ½ÑÐ¹ ÑÐ°Ð·Ð¼ÐµÑ, ÐºÐ¾ÑÐ¾ÑÑÐ¹ Ð½Ðµ Ð´Ð¾Ð»Ð¶ÐµÐ½ Ð¿ÑÐµÐ²ÑÑÐ°ÑÑ ÑÐ²Ð¾Ð±Ð¾Ð´Ð½Ð¾Ð³Ð¾ Ð¼ÐµÑÑÐ° Ð½Ð° Ð²ÑÐ±ÑÐ°Ð½Ð½Ð¾Ð¼ Ð´Ð¸ÑÐºÐµ." IDS_PAGEFILE_NONE "none" IDS_PAGEFILE_SYSTEM "system managed" - IDS_INFOREBOOT "You have to reboot the computer, in order to apply the changes." + IDS_INFOREBOOT "ÐÐµÐ¾Ð±ÑÐ¾Ð´Ð¸Ð¼Ð¾ Ð¿ÐµÑÐµÐ·Ð°Ð³ÑÑÐ·Ð¸ÑÑ ÐºÐ¾Ð¼Ð¿ÑÑÑÐµÑ Ð´Ð»Ñ Ð¿ÑÐ¸Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ð¹." IDS_DEVS "\nÐÐ¾Ð¼Ð°Ð½Ð´Ð° ReactOS\n\nÐÐ¾Ð¾ÑÐ´Ð¸Ð½Ð°ÑÐ¾Ñ Ð¿ÑÐ¾ÐµÐºÑÐ°\n\nÐÐ»ÐµÐºÑÐµÐ¹ ÐÑÐ°Ð³Ð¸Ð½\n\nÐÐ¾Ð»Ð»ÐµÐºÑÐ¸Ð² ÑÐ°Ð·ÑÐ°Ð±Ð¾ÑÑÐ¸ÐºÐ¾Ð²\n\nÐÐ»ÐµÐºÑÐµÐ¹ ÐÑÐ°Ð³Ð¸Ð½\nÐÐ½Ð´ÑÑ ÐÑÐ¸Ð½Ð²ÑÐ´\nÐÐ½Ð´ÑÐµÐ¹ ÐÐ¾ÑÐ¾ÑÐ°ÐµÐ²\nÐÑÑ ÐÐµÑÐºÑ\nÐÑÐ¸ÑÑÐ¾Ñ ÑÐ¾Ð½ ÐÐ¸ÑÑÐ¸Ñ\nÐÐ¾Ð»Ð¸Ð½ Ð¤Ð¸Ð½Ðº\nÐÐ°Ð½Ð¸ÑÐ»Ñ Ð Ð°Ð¹Ð¼ÐµÑ\nÐÐ¼Ð¸ÑÑÐ¸Ð¹ Ð§Ð°Ð¿ÑÑÐµÐ²\nÐÑÐ¸Ðº ÐÐ¾Ð»Ñ\nÐÐµÐ´ ÐÑÑÑÐ¸\nÐÑÐµÐ³Ð¾Ñ ÐÑÑÐ½Ð¼Ð°Ñ\nÐÑÐ²Ðµ ÐÐ¾ÑÑÐ¸Ð½Ð¾\nÐÐ¶ÐµÐ¹Ð¼Ñ Ð¢ÑÐ±Ð¾Ñ\nÐÐ¶ÐµÑÑÑÐ¸ ÐÐ¾ÑÐ»Ð°Ð½\nÐÐ¾ÑÐ°Ð½Ð½ÐµÑ ÐÐ½Ð´ÐµÑÐ²Ð°Ð»ÑÐ´\nKamil HornÃÄek\nKJK::ÐÐ¸Ð¿ÐµÑÐ¸Ð¾Ð½\nÐÐ°Ð°ÑÑÐµÐ½ ÐÐ¾ÑÐ¼Ð°\nÐÐ°Ð³Ð½ÑÑ ÐÐ»ÑÐµÐ½\nÐÐ°ÑÐº ÐÐ¸ÑÐ»Ð°ÑÑ\nÐÐ°ÑÑÐ¸Ð°Ñ ÐÑÐ¿ÑÐµÑ\nÐÐ°Ð¹Ðº ÐÐ¾ÑÐ´ÐµÐ»Ð»\nÐÐ¸ÑÐµÑ ÐÐ°ÑÐ´\nÐÑÐµÑ Ð¨Ð²ÐµÐ¹ÑÐµÑ\nÐ¡Ð°Ð²ÐµÐ»Ð¸Ð¹ Ð¢ÑÐµÑÑÑÐºÐ¾Ð²\nÐ¡ÑÐµÑÐ°Ð½ ÐÐ¸Ð½ÑÐ±ÐµÑÐ³\nÐ¡Ð¸Ð»ÑÐ²ÐµÐ¹Ð½ ÐÐµÑÑÐµÐ¾Ð»Ñ\nÐ¢Ð¾Ð¼Ð°Ñ ÐÐ»ÑÐ¼ÐµÐ»Ñ\nÐ¢Ð¸Ð¼Ð¾ ÐÑÐ¾Ð¹ÑÐµÑ\n\nÐÐ»ÐµÐºÑ ÐÐ¾Ð½ÐµÑÐºÑ\nÐ¤Ð¸Ð»Ð¸Ð¿ ÐÐ°Ð²Ð°ÑÐ°\nÐÑÐ½Ð½Ð°Ñ ÐÐ°Ð»ÑÐ½ÐµÑ\nÐÐ°ÑÑÐ¸Ð½ Ð¤ÑÐºÑ\nÐ Ð¾Ð¹Ñ ÐÐ¸ÑÑÐµÐ»Ð» III\nÐÑÑÐ½Ð´Ð¾Ð½ Ð¢ÑÑÐ½ÐµÑ\nÐÑÐ°Ð¹Ð°Ð½ ÐÐ°Ð»Ð¼ÐµÑ\nÐÐ°ÑÐ¿ÐµÑ Ð¥Ð¾ÑÐ½ÑÑÑÑÐ¿\nÐÑÐ²Ð¸Ð´ ÐÐµÐ»Ñ\nÐÐ¼Ð°Ð½ÑÑÐ»Ñ ÐÐ»Ð¸Ð±ÐµÑÑÐ¸\nÐÐµ Ð²Ð°Ð½ ÐÐµÐ»ÑÐ´Ð¾ÑÐ¿\nÐÑÐµÐ³Ð¾Ñ ÐÐ½Ð¸Ñ\nÐÐ¶ÐµÐ¹ÑÐ¾Ð½ Ð¤Ð¸Ð»Ð±Ð¸\nÐÐµÐ½Ñ ÐÐ¾Ð»Ð»Ð¸Ð½\nÐÐ¸ÑÐ°ÑÐ»Ñ ÐÐ¸ÑÑ\nÐÐ°ÑÐ°Ð½ ÐÑÐ´Ñ\nÐ Ð¾Ð±ÐµÑÑ ÐÐ¸ÐºÐµÐ½ÑÐ¾Ð½\nÐ ÐµÐºÑ ÐÐ¶Ð¾Ð»Ð»Ð¸ÑÑ\nVizzini\n\nÐ ÐµÐ»Ð¸Ð·-Ð¸Ð½Ð¶ÐµÐ½ÐµÑÑ\n\nÐÐ¾Ð»Ð¸Ð½ Ð¤Ð¸Ð½Ðº\nÐ¦Ð·ÑÐ»ÑÐ½ ÐÑÐ¾\n\nÐ Ð°Ð·ÑÐ°Ð±Ð¾ÑÐºÐ° Ð²ÐµÐ±-ÑÐ°Ð¹ÑÐ°\n\nÐÐ¾Ð»Ð¸Ð½ Ð¤Ð¸Ð½Ðº\nÐ¯Ð½ ÐÐ»ÑÐ¼ÐºÐ²Ð¸ÑÑ ÐÐ¸Ð½Ð°Ð½Ð´ÐµÑ\nÐÐ»ÐµÐ¼ÐµÐ½Ñ Ð¤ÑÐ¸Ð´Ð»\nÐ¦Ð·ÑÐ»ÑÐ½ ÐÑÐ¾\n\nÐÑÐ°ÑÐ¸ÑÐµÑÐºÐ¸Ð¹ Ð´Ð¸Ð·Ð°Ð¹Ð½\n\nMindflyer\nWierd_W\n\nÐÐ»Ð°Ð³Ð¾Ð´Ð°ÑÐ½Ð¾ÑÑÐ¸\n\nÐ²ÑÐµÐ¼ ÑÑÐ°ÑÑÐ½Ð¸ÐºÐ°Ð¼ Ð¿ÑÐ¾ÐµÐºÑÐ°\nÐÐ¾Ð¼Ð°Ð½Ð´Ðµ Wine\n\n" END Modified: trunk/reactos/dll/win32/shell32/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ru-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ru-RU.rc [iso-8859-1] Mon Dec 22 19:10:42 2014 @@ -726,8 +726,8 @@ IDS_RECENT "ÐÐµÐ´Ð°Ð²Ð½ÐµÐµ" IDS_SENDTO "ÐÑÐ¿ÑÐ°Ð²Ð¸ÑÑ" IDS_STARTMENU "ÐÐ»Ð°Ð²Ð½Ð¾Ðµ Ð¼ÐµÐ½Ñ" - IDS_MYMUSIC "ÐÐ¾Ñ Ð¼ÑÐ·ÑÐºÐ°" - IDS_MYVIDEO "ÐÐ¾Ð¸ Ð²Ð¸Ð´ÐµÐ¾Ð·Ð°Ð¿Ð¸ÑÐ¸" + IDS_MYMUSIC "ÐÐ¾Ð¸ Ð´Ð¾ÐºÑÐ¼ÐµÐ½ÑÑ\\ÐÐ¾Ñ Ð¼ÑÐ·ÑÐºÐ°" + IDS_MYVIDEO "ÐÐ¾Ð¸ Ð´Ð¾ÐºÑÐ¼ÐµÐ½ÑÑ\\ÐÐ¾Ð¸ Ð²Ð¸Ð´ÐµÐ¾Ð·Ð°Ð¿Ð¸ÑÐ¸" IDS_DESKTOPDIRECTORY "Ð Ð°Ð±Ð¾ÑÐ¸Ð¹ ÑÑÐ¾Ð»" IDS_NETHOOD "Ð¡ÐµÑÐµÐ²Ð¾Ðµ Ð¾ÐºÑÑÐ¶ÐµÐ½Ð¸Ðµ" IDS_TEMPLATES "Ð¨Ð°Ð±Ð»Ð¾Ð½Ñ" @@ -738,7 +738,7 @@ IDS_COOKIES "Cookies" IDS_HISTORY "Local Settings\\History" IDS_PROGRAM_FILES "Program Files" - IDS_MYPICTURES "ÐÐ¾Ð¸ ÑÐ¸ÑÑÐ½ÐºÐ¸" + IDS_MYPICTURES "ÐÐ¾Ð¸ Ð´Ð¾ÐºÑÐ¼ÐµÐ½ÑÑ\\ÐÐ¾Ð¸ ÑÐ¸ÑÑÐ½ÐºÐ¸" IDS_PROGRAM_FILES_COMMON "Program Files\\Common Files" IDS_COMMON_DOCUMENTS "ÐÐ±ÑÐ¸Ðµ Ð´Ð¾ÐºÑÐ¼ÐµÐ½ÑÑ" IDS_ADMINTOOLS "ÐÐ»Ð°Ð²Ð½Ð¾Ðµ Ð¼ÐµÐ½Ñ\\ÐÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ñ\\ÐÐ´Ð¼Ð¸Ð½Ð¸ÑÑÑÐ¸ÑÐ¾Ð²Ð°Ð½Ð¸Ðµ" Modified: trunk/reactos/dll/win32/syssetup/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/ru… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/ru-RU.rc [iso-8859-1] Mon Dec 22 19:10:42 2014 @@ -47,7 +47,7 @@ LTEXT "&ÐÐ¼Ñ ÐºÐ¾Ð¼Ð¿ÑÑÑÐµÑÐ°:", IDC_STATIC, 54, 38, 75, 8 EDITTEXT IDC_COMPUTERNAME, 165, 35, 148, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL | ES_UPPERCASE ICON IDI_ICON5, IDC_STATIC, 21, 57, 20, 20 - LTEXT "ÐÑÐ¸ ÑÑÑÐ°Ð½Ð¾Ð²ÐºÐµ Ð±ÑÐ´ÐµÑ ÑÐ¾Ð·Ð´Ð°Ð½ Ð¿ÑÐ¾ÑÐ¸Ð»Ñ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ Ñ Ð¸Ð¼ÐµÐ½ÐµÐ¼ Administrator ÐÑ Ð¼Ð¾Ð¶ÐµÑÐµ Ð¸ÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÑ ÑÑÐ¾Ñ Ð¿ÑÐ¾ÑÐ¸Ð»Ñ, ÐµÑÐ»Ð¸ Ð²Ð°Ð¼ Ð½ÑÐ¶Ð½Ð¾ Ð¿Ð¾Ð»ÑÑÐ¸ÑÑ Ð¿ÑÐ°Ð²Ð° Ð°Ð´Ð¼Ð¸Ð½Ð¸ÑÑÑÐ°ÑÐ¾ÑÐ°.", IDC_STATIC, 54, 57, 250, 25 + LTEXT "ÐÑÐ¸ ÑÑÑÐ°Ð½Ð¾Ð²ÐºÐµ Ð±ÑÐ´ÐµÑ ÑÐ¾Ð·Ð´Ð°Ð½ Ð¿ÑÐ¾ÑÐ¸Ð»Ñ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ Ñ Ð¸Ð¼ÐµÐ½ÐµÐ¼ Administrator. ÐÑ Ð¼Ð¾Ð¶ÐµÑÐµ Ð¸ÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÑ ÑÑÐ¾Ñ Ð¿ÑÐ¾ÑÐ¸Ð»Ñ, ÐµÑÐ»Ð¸ Ð²Ð°Ð¼ Ð½ÑÐ¶Ð½Ð¾ Ð¿Ð¾Ð»ÑÑÐ¸ÑÑ Ð¿ÑÐ°Ð²Ð° Ð°Ð´Ð¼Ð¸Ð½Ð¸ÑÑÑÐ°ÑÐ¾ÑÐ°.", IDC_STATIC, 54, 57, 250, 25 LTEXT "ÐÐ²ÐµÐ´Ð¸ÑÐµ Ð¿Ð°ÑÐ¾Ð»Ñ Ð°Ð´Ð¼Ð¸Ð½Ð¸ÑÑÑÐ°ÑÐ¾ÑÐ° (Ð½Ðµ Ð±Ð¾Ð»ÐµÐµ 127 ÑÐ¸Ð¼Ð²Ð¾Ð»Ð¾Ð²).", IDC_STATIC, 54, 87, 250, 8 LTEXT "&ÐÐ°ÑÐ¾Ð»Ñ Ð°Ð´Ð¼Ð¸Ð½Ð¸ÑÑÑÐ°ÑÐ¾ÑÐ°:", IDC_STATIC, 54, 104, 96, 8 EDITTEXT IDC_ADMINPASSWORD1, 165, 101, 148, 14, WS_VISIBLE | WS_TABSTOP | ES_PASSWORD Modified: trunk/reactos/dll/win32/userenv/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/lang/ru-… ============================================================================== --- trunk/reactos/dll/win32/userenv/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/userenv/lang/ru-RU.rc [iso-8859-1] Mon Dec 22 19:10:42 2014 @@ -8,17 +8,17 @@ IDS_FAVORITES "ÐÐ·Ð±ÑÐ°Ð½Ð½Ð¾Ðµ" IDS_STARTMENU "ÐÐ»Ð°Ð²Ð½Ð¾Ðµ Ð¼ÐµÐ½Ñ" IDS_PROGRAMS "ÐÐ»Ð°Ð²Ð½Ð¾Ðµ Ð¼ÐµÐ½Ñ\\ÐÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ñ" - IDS_ADMINTOOLS "ÐÐ»Ð°Ð²Ð½Ð¾Ðµ Ð¼ÐµÐ½Ñ\\ÐÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ñ\\Ð¡Ð»ÑÐ¶ÐµÐ±Ð½ÑÐµ" + IDS_ADMINTOOLS "ÐÐ»Ð°Ð²Ð½Ð¾Ðµ Ð¼ÐµÐ½Ñ\\ÐÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ñ\\ÐÐ´Ð¼Ð¸Ð½Ð¸ÑÑÑÐ¸ÑÐ¾Ð²Ð°Ð½Ð¸Ðµ" IDS_STARTUP "ÐÐ»Ð°Ð²Ð½Ð¾Ðµ Ð¼ÐµÐ½Ñ\\ÐÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ñ\\ÐÐ²ÑÐ¾Ð·Ð°Ð¿ÑÑÐº" IDS_MYDOCUMENTS "ÐÐ¾Ð¸ Ð´Ð¾ÐºÑÐ¼ÐµÐ½ÑÑ" IDS_MYPICTURES "ÐÐ¾Ð¸ Ð´Ð¾ÐºÑÐ¼ÐµÐ½ÑÑ\\ÐÐ¾Ð¸ ÑÐ¸ÑÑÐ½ÐºÐ¸" IDS_MYMUSIC "ÐÐ¾Ð¸ Ð´Ð¾ÐºÑÐ¼ÐµÐ½ÑÑ\\ÐÐ¾Ñ Ð¼ÑÐ·ÑÐºÐ°" IDS_MYVIDEOS "ÐÐ¾Ð¸ Ð´Ð¾ÐºÑÐ¼ÐµÐ½ÑÑ\\ÐÐ¾Ð¸ Ð²Ð¸Ð´ÐµÐ¾Ð·Ð°Ð¿Ð¸ÑÐ¸" IDS_TEMPLATES "Ð¨Ð°Ð±Ð»Ð¾Ð½Ñ" - IDS_RECENT "Recent" + IDS_RECENT "ÐÐµÐ´Ð°Ð²Ð½ÐµÐµ" IDS_SENDTO "ÐÑÐ¿ÑÐ°Ð²Ð¸ÑÑ" - IDS_PRINTHOOD "PrintHood" - IDS_NETHOOD "NetHood" + IDS_PRINTHOOD "ÐÑÐ¸Ð½ÑÐµÑÑ" + IDS_NETHOOD "Ð¡ÐµÑÐµÐ²Ð¾Ðµ Ð¾ÐºÑÑÐ¶ÐµÐ½Ð¸Ðµ" IDS_LOCALSETTINGS "Local Settings" IDS_LOCALAPPDATA "Local Settings\\Application Data" IDS_TEMP "Local Settings\\Temp"

1 0

← Newer
1
...
10
11
12
13
14
15
16
...
39
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs December 2014