Ros-diffs November 2015

ros-diffs@reactos.org

14 participants
457 discussions

[hbelusca] 70204: [IPCONFIG]: Fix word lost in translation.
by hbelusca＠svn.reactos.org 29 Nov '15

29 Nov '15

Author: hbelusca Date: Sun Nov 29 17:49:43 2015 New Revision: 70204 URL: http://svn.reactos.org/svn/reactos?rev=70204&view=rev Log: [IPCONFIG]: Fix word lost in translation. Modified: trunk/reactos/base/applications/network/ipconfig/lang/ru-RU.rc Modified: trunk/reactos/base/applications/network/ipconfig/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/ipconfig/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/ipconfig/lang/ru-RU.rc [iso-8859-1] Sun Nov 29 17:49:43 2015 @@ -34,7 +34,7 @@ \n\ ÐÐ´Ðµ\n\ Ð°Ð´Ð°Ð¿ÑÐµÑ ÐÐ°Ð·Ð²Ð°Ð½Ð¸Ðµ Ð¿Ð¾Ð´ÐºÐ»ÑÑÐµÐ½Ð¸Ñ (Ð¼Ð¾Ð¶Ð½Ð¾ Ð¸ÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÑ Ð·Ð½Ð°ÐºÐ¸\n\ - Ð¿Ð¾Ð´ÑÑÐ°Ð½Ð¾Ð²ÐºÐ¸ * and ?, ÑÐ¼. Ð¿ÑÐ¸Ð¼ÐµÑÑ)\n\ + Ð¿Ð¾Ð´ÑÑÐ°Ð½Ð¾Ð²ÐºÐ¸ * Ð¸ ?, ÑÐ¼. Ð¿ÑÐ¸Ð¼ÐµÑÑ)\n\ \n\ ÐÐ°ÑÐ°Ð¼ÐµÑÑÑ:\n\ /? ÐÑÐ²Ð¾Ð´ Ð´Ð°Ð½Ð½Ð¾Ð³Ð¾ ÑÐ¿ÑÐ°Ð²Ð¾ÑÐ½Ð¾Ð³Ð¾ ÑÐ¾Ð¾Ð±ÑÐµÐ½Ð¸Ñ.\n\

1 0

[akhaldi] 70203: [WIN32K] This looks more like a normal trace to me. Jim, please review. CORE-9604 CORE-5272
by akhaldi＠svn.reactos.org 29 Nov '15

29 Nov '15

Author: akhaldi Date: Sun Nov 29 17:45:09 2015 New Revision: 70203 URL: http://svn.reactos.org/svn/reactos?rev=70203&view=rev Log: [WIN32K] This looks more like a normal trace to me. Jim, please review. CORE-9604 CORE-5272 Modified: trunk/reactos/win32ss/user/ntuser/misc.c Modified: trunk/reactos/win32ss/user/ntuser/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/misc.c… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/misc.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/misc.c [iso-8859-1] Sun Nov 29 17:45:09 2015 @@ -228,7 +228,7 @@ { PUSER_SENT_MESSAGE Message = ((PTHREADINFO)PsGetCurrentThreadWin32Thread())->pusmCurrent; - ERR("THREADSTATE_INSENDMESSAGE\n"); + TRACE("THREADSTATE_INSENDMESSAGE\n"); ret = ISMEX_NOSEND; if (Message)

1 0

[akhaldi] 70202: [TRANSLATIONS] Russian translation update by Kudratov Olimjon. CORE-10589
by akhaldi＠svn.reactos.org 29 Nov '15

29 Nov '15

Author: akhaldi Date: Sun Nov 29 17:08:13 2015 New Revision: 70202 URL: http://svn.reactos.org/svn/reactos?rev=70202&view=rev Log: [TRANSLATIONS] Russian translation update by Kudratov Olimjon. CORE-10589 Added: trunk/reactos/base/applications/cmdutils/clip/lang/ru-RU.rc (with props) Modified: trunk/reactos/base/applications/cmdutils/clip/clip.rc trunk/reactos/base/applications/msconfig_new/lang/ru-RU.rc trunk/reactos/base/applications/network/ipconfig/lang/ru-RU.rc trunk/reactos/base/applications/network/ping/lang/ru-RU.rc trunk/reactos/base/applications/network/wlanconf/lang/ru-RU.rc trunk/reactos/base/applications/notepad/lang/ru-RU.rc trunk/reactos/base/applications/rapps/lang/ru-RU.rc trunk/reactos/base/applications/sndrec32/lang/ru-RU.rc trunk/reactos/base/applications/taskmgr/lang/ru-RU.rc trunk/reactos/base/applications/winhlp32/lang/Ru.rc trunk/reactos/base/shell/explorer/lang/ru-RU.rc trunk/reactos/dll/cpl/intl/lang/ru-RU.rc trunk/reactos/dll/cpl/usrmgr/lang/ru-RU.rc trunk/reactos/dll/win32/browseui/lang/ru-RU.rc trunk/reactos/dll/win32/devmgr/lang/ru-RU.rc trunk/reactos/dll/win32/shell32/lang/ru-RU.rc trunk/reactos/dll/win32/shimgvw/lang/ru-RU.rc trunk/reactos/subsystems/mvdm/ntvdm/lang/ru-RU.rc Modified: trunk/reactos/base/applications/cmdutils/clip/clip.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/clip/clip.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/clip/clip.rc [iso-8859-1] Sun Nov 29 17:08:13 2015 @@ -19,3 +19,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/clip/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/clip/lang/ru-RU.rc (added) +++ trunk/reactos/base/applications/cmdutils/clip/lang/ru-RU.rc [iso-8859-1] Sun Nov 29 17:08:13 2015 @@ -0,0 +1,11 @@ +/* Russian language resource file by Kudratov Olimjon (olim98(a)bk.ru) */ + +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + IDS_USAGE "\nÐÐ²ÐµÐ´Ð¸ÑÐµ ""CLIP /?"" Ð´Ð»Ñ Ð¿Ð¾Ð»ÑÑÐµÐ½Ð¸Ñ ÑÐ¿ÑÐ°Ð²ÐºÐ¸ Ð¿Ð¾ Ð¸ÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°Ð½Ð¸Ñ.\n" + IDS_HELP "\nÐÐµÑÐµÐ½Ð°Ð¿ÑÐ°Ð²Ð»ÑÐµÑ Ð²ÑÐ²Ð¾Ð´ Ð¾Ñ ÑÑÐ¸Ð»Ð¸Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð½Ð¾Ð¹ ÑÑÑÐ¾ÐºÐ¸ Ð² Ð±ÑÑÐµÑ Ð¾Ð±Ð¼ÐµÐ½Ð°.\n\n\ +CLIP [/?]\n\n\ + /? ÐÑÐ²Ð¾Ð´ ÑÐ¿ÑÐ°Ð²ÐºÐ¸ Ð¿Ð¾ Ð¸ÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°Ð½Ð¸Ñ..\n" +END Propchange: trunk/reactos/base/applications/cmdutils/clip/lang/ru-RU.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/msconfig_new/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig_new/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig_new/lang/ru-RU.rc [iso-8859-1] Sun Nov 29 17:08:13 2015 @@ -1,14 +1,14 @@ -/* Russian language resource file (Dmitry Chapyshev, 2007-06IDC_STATIC0) */ +/* Russian language resource file by Dmitry Chapyshev, 2007-06 and Kudratov Olimjon (olim98(a)bk.ru) */ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT IDD_ABOUTBOX DIALOGEX 0, 0, 229, 98 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "About the System Configuration Program" +CAPTION "Ð Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ðµ ÐÐ¾Ð½ÑÐ¸Ð³ÑÑÐ°ÑÐ¸Ñ ÑÐ¸ÑÑÐµÐ¼Ñ" FONT 8, "MS Shell Dlg" BEGIN ICON IDI_APPICON, IDC_STATIC, 14, 14, 20, 20 - LTEXT "System Configuration Program\nVersion 1.0", IDC_STATIC, 42, 14, 182, 17, SS_NOPREFIX + LTEXT "ÐÐ¾Ð½ÑÐ¸Ð³ÑÑÐ°ÑÐ¸Ñ ÑÐ¸ÑÑÐµÐ¼Ñ\nÐÐµÑÑÐ¸Ñ 1.0", IDC_STATIC, 42, 14, 182, 17, SS_NOPREFIX // "Copyright (C) ReactOS Team 2005-"COPYRIGHT_YEAR"\n" LTEXT "Copyright (C) ReactOS Team 2005-2015\n\ Christoph von Wittich (Christoph(a)ApiViewer.de)\n\ @@ -30,9 +30,9 @@ CONTROL "ÐÐ±ÑÐ°Ð±Ð°ÑÑÐ²Ð°ÑÑ ÑÐ°Ð¹Ð» &WIN.INI", IDC_CBX_WIN_INI, "Button", BS_AUTO3STATE | WS_TABSTOP, 35, 98, 316, 10 CONTROL "&ÐÐ°Ð³ÑÑÐ¶Ð°ÑÑ ÑÐ¸ÑÑÐµÐ¼Ð½ÑÐµ ÑÐ»ÑÐ¶Ð±Ñ", IDC_CBX_LOAD_SYSTEM_SERVICES, "Button", BS_AUTO3STATE | WS_TABSTOP, 35, 110, 316, 10 CONTROL "Ð&Ð°Ð³ÑÑÐ¶Ð°ÑÑ ÑÐ»ÐµÐ¼ÐµÐ½ÑÑ Ð°Ð²ÑÐ¾Ð·Ð°Ð³ÑÑÐ·ÐºÐ¸", IDC_CBX_LOAD_STARTUP_ITEMS, "Button", BS_AUTO3STATE | WS_TABSTOP, 35, 122, 316, 10 - CONTROL "&Use original boot configuration", IDC_CBX_USE_ORIGINAL_BOOTCFG, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 35, 134, 316, 10 - PUSHBUTTON "Laun&ch System Restore", IDC_BTN_SYSTEM_RESTORE_START, 146, 156, 124, 14 - PUSHBUTTON "&Expand File...", IDC_BTN_FILE_EXTRACTION, 275, 156, 85, 14 + CONTROL "&ÐÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÑ Ð¾ÑÐ¸Ð³Ð¸Ð½Ð°Ð»ÑÐ½ÑÑ ÐºÐ¾Ð½ÑÐ¸Ð³ÑÑÐ°ÑÐ¸Ñ Ð·Ð°Ð³ÑÑÐ·ÐºÐ¸", IDC_CBX_USE_ORIGINAL_BOOTCFG, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 35, 134, 316, 10 + PUSHBUTTON "ÐÐ°Ð¿ÑÑÑÐ¸ÑÑ &Ð²Ð¾ÑÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ðµ ÑÐ¸ÑÑÐµÐ¼Ñ", IDC_BTN_SYSTEM_RESTORE_START, 146, 156, 124, 14 + PUSHBUTTON "&Ð Ð°ÑÐ¿Ð°ÐºÐ¾Ð²Ð°ÑÑ ÑÐ°Ð¹Ð»...", IDC_BTN_FILE_EXTRACTION, 275, 156, 85, 14 GROUPBOX "ÐÐ°ÑÐ¸Ð°Ð½ÑÑ Ð·Ð°Ð¿ÑÑÐºÐ°", IDC_STATIC, 5, 5, 356, 145 LTEXT "ÐÐ°Ð³ÑÑÐ·ÐºÐ° Ð²ÑÐµÑ Ð´ÑÐ°Ð¹Ð²ÐµÑÐ¾Ð² ÑÑÑÑÐ¾Ð¹ÑÑÐ² Ð¸ Ð·Ð°Ð¿ÑÑÐº Ð²ÑÐµÑ ÑÐ»ÑÐ¶Ð±", IDC_STATIC, 25, 30, 322, 10 LTEXT "ÐÐ°Ð³ÑÑÐ·ÐºÐ° ÑÐ¾Ð»ÑÐºÐ¾ Ð¾ÑÐ½Ð¾Ð²Ð½ÑÑ Ð´ÑÐ°Ð¹Ð²ÐµÑÐ¾Ð² Ð¸ Ð·Ð°Ð¿ÑÑÐº Ð¾ÑÐ½Ð¾Ð²Ð½ÑÑ ÑÐ»ÑÐ¶Ð±", IDC_STATIC, 25, 58, 322, 10 @@ -53,7 +53,7 @@ PUSHBUTTON "&ÐÐ·Ð¼ÐµÐ½Ð¸ÑÑ", IDC_BTN_SYSTEM_EDIT, 295, 137, 66, 14 PUSHBUTTON "ÐÐº&Ð»ÑÑÐ¸ÑÑ Ð²ÑÐµ", IDC_BTN_SYSTEM_ENABLE_ALL, 153, 156, 66, 14 PUSHBUTTON "Ð&ÑÐºÐ»ÑÑÐ¸ÑÑ Ð²ÑÐµ", IDC_BTN_SYSTEM_DISABLE_ALL, 224, 156, 66, 14 - PUSHBUTTON "Delete", IDC_BTN_SYSTEM_DELETE, 295, 156, 66, 14 + PUSHBUTTON "Ð£Ð´Ð°Ð»Ð¸ÑÑ", IDC_BTN_SYSTEM_DELETE, 295, 156, 66, 14 END IDD_FREELDR_PAGE DIALOGEX 0, 0, 366, 175 @@ -62,29 +62,29 @@ FONT 8, "MS Shell Dlg" BEGIN LISTBOX IDC_LIST_BOX, 5, 5, 356, 61, LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP - PUSHBUTTON "&Check All Boot Paths", IDC_BTN_CHECK_BOOT_PATH, 5, 68, 72, 14 - PUSHBUTTON "&Set as Default", IDC_BTN_SET_DEFAULT_BOOT, 82, 68, 66, 14 - PUSHBUTTON "Move &Up", IDC_BTN_MOVE_UP_BOOT_OPTION, 153, 68, 66, 14 - PUSHBUTTON "Move &Down", IDC_BTN_MOVE_DOWN_BOOT_OPTION, 224, 68, 66, 14 - GROUPBOX "Boot Options", IDC_STATIC, 5, 84, 285, 86 + PUSHBUTTON "&ÐÑÐ¾Ð²ÐµÑÐ¸ÑÑ Ð²ÑÐµ Ð¿ÑÑÐ¸ Ð·Ð°Ð³ÑÑÐ·ÐºÐ¸", IDC_BTN_CHECK_BOOT_PATH, 5, 68, 72, 14 + PUSHBUTTON "&ÐÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÑ Ð¿Ð¾ ÑÐ¼Ð¾Ð»ÑÐ°Ð½Ð¸Ñ", IDC_BTN_SET_DEFAULT_BOOT, 82, 68, 66, 14 + PUSHBUTTON "&ÐÐ°Ð²ÐµÑÑ", IDC_BTN_MOVE_UP_BOOT_OPTION, 153, 68, 66, 14 + PUSHBUTTON "&ÐÐ½Ð¸Ð·", IDC_BTN_MOVE_DOWN_BOOT_OPTION, 224, 68, 66, 14 + GROUPBOX "ÐÐ°ÑÐ°Ð¼ÐµÑÑÑ Ð·Ð°Ð³ÑÑÐ·ÐºÐ¸", IDC_STATIC, 5, 84, 285, 86 GROUPBOX "", IDC_STATIC, 10, 97, 143, 68 - CHECKBOX "Safe boot (/SA&FEBOOT)", IDC_CBX_SAFE_BOOT, 15, 97, 121, 10 - CONTROL "Minimal (&MINIMAL)", IDC_RADIO1, "Button", BS_AUTORADIOBUTTON, 15, 110, 133, 10 - CONTROL "Other environment\n(M&INIMAL (ALTERNATESHELL))", IDC_RADIO4, + CHECKBOX "ÐÐµÐ·Ð¾Ð¿Ð°ÑÐ½ÑÐ¹ ÑÐµÐ¶Ð¸Ð¼ (/SA&FEBOOT)", IDC_CBX_SAFE_BOOT, 15, 97, 121, 10 + CONTROL "ÐÐ¸Ð½Ð¸Ð¼Ð°Ð»ÑÐ½ÑÐ¹ (&MINIMAL)", IDC_RADIO1, "Button", BS_AUTORADIOBUTTON, 15, 110, 133, 10 + CONTROL "ÐÑÑÐ³Ð°Ñ Ð¾Ð±Ð¾Ð»Ð¾ÑÐºÐ°\n(M&INIMAL (ALTERNATESHELL))", IDC_RADIO4, "Button", BS_AUTORADIOBUTTON | BS_MULTILINE, 15, 121, 133, 17 - CONTROL "Repair ActiveDirectory (DSRE&PAIR)", IDC_RADIO3, "Button", BS_AUTORADIOBUTTON, 15, 139, 133, 10 - CONTROL "Network (NET&WORK)", IDC_RADIO2, "Button", BS_AUTORADIOBUTTON, 15, 150, 133, 10 - CHECKBOX "No GUI boot\n(/&NOGUIBOOT)", IDC_CBX_NO_GUI_BOOT, 158, 91, 127, 17, BS_MULTILINE - CHECKBOX "Boot log (/&BOOTLOG)", IDC_CBX_BOOT_LOG, 158, 110, 127, 12 - CHECKBOX "Base video (/BAS&EVIDEO)", IDC_CBX_BASE_VIDEO, 158, 124, 127, 12 - CHECKBOX "OS boot information (/S&OS)", IDC_CBX_SOS, 158, 138, 127, 12 - PUSHBUTTON "Ad&vanced Options...", IDC_BTN_ADVANCED_OPTIONS, 207, 151, 78, 14 - LTEXT "&Timeout:", IDC_STATIC, 296, 91, 32, 10 + CONTROL "ÐÐ¾ÑÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ðµ ActiveDirectory (DSRE&PAIR)", IDC_RADIO3, "Button", BS_AUTORADIOBUTTON, 15, 139, 133, 10 + CONTROL "Ð¡ÐµÑÑ (NET&WORK)", IDC_RADIO2, "Button", BS_AUTORADIOBUTTON, 15, 150, 133, 10 + CHECKBOX "ÐÐµÐ· GUI\n(/&NOGUIBOOT)", IDC_CBX_NO_GUI_BOOT, 158, 91, 127, 17, BS_MULTILINE + CHECKBOX "ÐÑÑÐ½Ð°Ð» Ð·Ð°Ð³ÑÑÐ·ÐºÐ¸ (/&BOOTLOG)", IDC_CBX_BOOT_LOG, 158, 110, 127, 12 + CHECKBOX "ÐÐ°Ð·Ð¾Ð²Ð¾Ðµ Ð²Ð¸Ð´ÐµÐ¾ (/BAS&EVIDEO)", IDC_CBX_BASE_VIDEO, 158, 124, 127, 12 + CHECKBOX "ÐÐ½ÑÐ¾ÑÐ¼Ð°ÑÐ¸Ñ Ð¾Ð± ÐÐ¡ (/S&OS)", IDC_CBX_SOS, 158, 138, 127, 12 + PUSHBUTTON "ÐÐ¾Ð¿Ð¾&Ð»Ð½Ð¸ÑÐµÐ»ÑÐ½ÑÐµ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÑ...", IDC_BTN_ADVANCED_OPTIONS, 207, 151, 78, 14 + LTEXT "&Ð¢Ð°Ð¹Ð¼Ð°ÑÑ:", IDC_STATIC, 296, 91, 32, 10 EDITTEXT IDC_TXT_BOOT_TIMEOUT, 295, 102, 33, 12, ES_RIGHT | ES_NUMBER - LTEXT "seconds", IDC_STATIC, 330, 104, 31, 10 - CONTROL "Make &all boot settings permanent", 292, + LTEXT "ÑÐµÐº.", IDC_STATIC, 330, 104, 31, 10 + CONTROL "Ð¡Ð´ÐµÐ»Ð°ÑÑ ÑÑÐ¸ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÑ Ð·Ð°Ð³ÑÑÐ·ÐºÐ¸ &Ð¿Ð¾ÑÑÐ¾ÑÐ½Ð½ÑÐ¼Ð¸", 292, "Button", BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE | WS_TABSTOP, 295, 121, 66, 49 - PUSHBUTTON "&Delete", IDC_BTN_DELETE, 295, 68, 66, 14 + PUSHBUTTON "&Ð£Ð´Ð°Ð»Ð¸ÑÑ", IDC_BTN_DELETE, 295, 68, 66, 14 END IDD_SERVICES_PAGE DIALOGEX 0, 0, 366, 175 @@ -95,9 +95,9 @@ CONTROL "List1", IDC_SERVICES_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 5, 5, 356, 129 PUSHBUTTON "&ÐÐºÐ»ÑÑÐ¸ÑÑ Ð²ÑÐµ", IDC_BTN_SERVICES_ACTIVATE, 224, 156, 66, 14 PUSHBUTTON "Ð&ÑÐºÐ»ÑÑÐ¸ÑÑ Ð²ÑÐµ", IDC_BTN_SERVICES_DEACTIVATE, 295, 156, 66, 14 - CONTROL "&Hide all %s services", IDC_CBX_SERVICES_MASK_PROPRIETARY_SVCS, + CONTROL "&ÐÐµ Ð¾ÑÐ¾Ð±ÑÐ°Ð¶Ð°ÑÑ ÑÐ»ÑÐ¶Ð±Ñ %s", IDC_CBX_SERVICES_MASK_PROPRIETARY_SVCS, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 5, 158, 203, 12 - LTEXT "Please note that some secure %s services may not be disabled.", IDC_STATIC_SERVICES_WARNING, 5, 138, 220, 17 + LTEXT "ÐÐµÐºÐ¾ÑÐ¾ÑÑÐµ ÑÐ»ÑÐ¶Ð±Ñ Ð±ÐµÐ·Ð¾Ð¿Ð°ÑÐ½Ð¾ÑÑÐ¸ %s Ð½Ðµ Ð¼Ð¾Ð³ÑÑ Ð±ÑÑÑ Ð¾ÑÐºÐ»ÑÑÐµÐ½Ñ.", IDC_STATIC_SERVICES_WARNING, 5, 138, 220, 17 END IDD_STARTUP_PAGE DIALOGEX 0, 0, 362, 175 @@ -118,8 +118,8 @@ CONTROL "List1", IDC_TOOLS_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 5, 5, 356, 118 EDITTEXT IDC_TOOLS_CMDLINE, 5, 139, 356, 14, ES_READONLY PUSHBUTTON "&ÐÐ°Ð¿ÑÑÐº", IDC_BTN_RUN, 311, 156, 50, 14 - CONTROL "&Advanced Options", IDC_CBX_TOOLS_ADVOPT, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 5, 158, 134, 12 - LTEXT "Selected &Command:", IDC_STATIC, 5, 127, 128, 10 + CONTROL "ÐÐ¾Ð¿Ð¾&Ð»Ð½Ð¸ÑÐµÐ»ÑÐ½ÑÐµ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÑ", IDC_CBX_TOOLS_ADVOPT, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 5, 158, 134, 12 + LTEXT "ÐÑÐ±ÑÐ°Ð½Ð½Ð°Ñ &ÐºÐ¾Ð¼Ð°Ð½Ð´Ð°:", IDC_STATIC, 5, 127, 128, 10 END IDD_FILE_EXTRACT_DIALOG DIALOGEX 0, 0, 353, 117 @@ -134,29 +134,29 @@ LTEXT "&Restore from:", IDC_STATIC, 7, 55, 93, 10 COMBOBOX IDC_DRP_CAB_FILE, 103, 53, 158, 56, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Browse &From...", IDC_BTN_BROWSE_CAB_FILES, 264, 51, 82, 14 - LTEXT "&Save files in:", IDC_STATIC, 7, 76, 93, 10 + LTEXT "&Ð¡Ð¾ÑÑÐ°Ð½Ð¸ÑÑ Ð²:", IDC_STATIC, 7, 76, 93, 10 COMBOBOX IDC_DRP_DEST_DIR, 103, 74, 158, 42, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Browse &To...", IDC_BTN_BROWSE_DIRS, 264, 72, 82, 14 - DEFPUSHBUTTON "Expand", IDOK, 179, 96, 82, 14 - PUSHBUTTON "Cancel", IDCANCEL, 264, 96, 82, 14 + DEFPUSHBUTTON "Ð Ð°ÑÐ¿Ð°ÐºÐ¾Ð²Ð°ÑÑ", IDOK, 179, 96, 82, 14 + PUSHBUTTON "ÐÑÐ¼ÐµÐ½Ð°", IDCANCEL, 264, 96, 82, 14 END IDD_FIND_DIALOG DIALOGEX 30, 73, 236, 75 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Find" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "&Find what:", IDC_STATIC, 4, 8, 42, 10, NOT WS_GROUP +CAPTION "ÐÐ°Ð¹ÑÐ¸" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Ð§Ñ&Ð¾:", IDC_STATIC, 4, 8, 42, 10, NOT WS_GROUP EDITTEXT IDC_TXT_FIND_TEXT, 47, 7, 128, 12, ES_AUTOHSCROLL | WS_GROUP - CONTROL "Match &whole word only", IDC_CBX_FIND_WHOLE_WORD_ONLY, + CONTROL "Ð¢Ð¾Ð»ÑÐºÐ¾ &ÑÐµÐ»ÑÐµ ÑÐ»Ð¾Ð²Ð°", IDC_CBX_FIND_WHOLE_WORD_ONLY, "Button", BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP, 4, 26, 100, 12 - CONTROL "Match &case", IDC_CBX_FIND_MATCH_CASE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 4, 42, 100, 12 - GROUPBOX "Direction", IDC_STATIC, 107, 26, 68, 28 - CONTROL "&Up", IDC_RB_FIND_UP, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 111, 38, 28, 12 - CONTROL "&Down", IDC_RB_FIND_DOWN, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 143, 38, 28, 12 - DEFPUSHBUTTON "Find &Next", IDOK, 182, 5, 50, 14, WS_GROUP - PUSHBUTTON "Cancel", IDCANCEL, 182, 23, 50, 14, WS_GROUP - CONTROL "&Search from the beginning (Direction: Down) or end (Direction: Up)", IDC_CBX_FIND_FROM_BEGINNING, + CONTROL "Ð¡ Ñ&ÑÐµÑÐ¾Ð¼ ÑÐµÐ³Ð¸ÑÑÑÐ°", IDC_CBX_FIND_MATCH_CASE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 4, 42, 100, 12 + GROUPBOX "ÐÐ°Ð¿ÑÐ°Ð²Ð»ÐµÐ½Ð¸Ðµ", IDC_STATIC, 107, 26, 68, 28 + CONTROL "Ð&Ð²ÐµÑÑ", IDC_RB_FIND_UP, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 111, 38, 28, 12 + CONTROL "Ð&Ð½Ð¸Ð·", IDC_RB_FIND_DOWN, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 143, 38, 28, 12 + DEFPUSHBUTTON "&ÐÐ°Ð¹ÑÐ¸ Ð´Ð°Ð»ÐµÐµ", IDOK, 182, 5, 50, 14, WS_GROUP + PUSHBUTTON "ÐÑÐ¼ÐµÐ½Ð°", IDCANCEL, 182, 23, 50, 14, WS_GROUP + CONTROL "&ÐÑÐºÐ°ÑÑ Ñ Ð½Ð°ÑÐ°Ð»Ð° (ÐÐ°Ð¿ÑÐ°Ð²Ð»ÐµÐ½Ð¸Ðµ: ÐÐ½Ð¸Ð·) Ð¸Ð»Ð¸ Ñ ÐºÐ¾Ð½ÑÐ° (ÐÐ°Ð¿ÑÐ°Ð²Ð»ÐµÐ½Ð¸Ðµ: ÐÐ²ÐµÑÑ)", IDC_CBX_FIND_FROM_BEGINNING, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 4, 58, 231, 12 END @@ -191,8 +191,8 @@ FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "OK", IDOK, 180, 41, 50, 14 - LTEXT "Essential services cannot be disabled. Doing so might prevent %s from running on your computer.", IDC_STATIC_REQSVCSDIS_INFO, 7, 7, 223, 28 - CONTROL "&Don't show this message in the future", IDC_CBX_REQSVCSDIS_NO_MSG_ANYMORE, + LTEXT "ÐÐ°Ð¶Ð½ÑÐµ ÑÐ»ÑÐ¶Ð±Ñ Ð½Ðµ Ð¼Ð¾Ð³ÑÑ Ð±ÑÑÑ Ð¾ÑÐºÐ»ÑÑÐµÐ½Ñ. ÐÑÐ¾ Ð¼Ð¾Ð¶ÐµÑ Ð¿ÑÐ¸Ð²ÐµÑÑÐ¸ Ðº Ð½ÐµÑÐ°Ð±Ð¾ÑÐ¾ÑÐ¿Ð¾ÑÐ±Ð½Ð¾ÑÑÐ¸ %s Ð½Ð° ÑÑÐ¾Ð¼ ÐºÐ¾Ð¿Ð¼ÑÑÑÐµÑÐµ.", IDC_STATIC_REQSVCSDIS_INFO, 7, 7, 223, 28 + CONTROL "ÐÐµ &Ð¾ÑÐ¾Ð±ÑÐ°Ð¶Ð°ÑÑ ÑÑÐ¾ ÑÐ¾Ð¾Ð±ÑÐµÐ½Ð¸Ðµ ÑÐ½Ð¾Ð²Ð°", IDC_CBX_REQSVCSDIS_NO_MSG_ANYMORE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 42, 154, 13 END @@ -200,13 +200,13 @@ BEGIN IDS_MSCONFIG "ÐÐ°ÑÑÑÐ¾Ð¹ÐºÐ¸ ÑÐ¸ÑÑÐµÐ¼Ñ" IDS_MSCONFIG_2 "ÐÐ¾Ð½ÑÐ¸Ð³ÑÑÐ°ÑÐ¸Ñ ÑÐ¸ÑÑÐµÐ¼Ñ" - IDS_ABOUT "&About...\tShift+F1" + IDS_ABOUT "&Ð Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ðµ...\tShift+F1" END STRINGTABLE BEGIN IDS_YES "ÐÐ°" - IDS_NO "No" + IDS_NO "ÐÐµÑ" IDS_UNKNOWN "ÐÐµÐ¸Ð·Ð²ÐµÑÑÐ½ÑÐ¹" END @@ -221,12 +221,12 @@ IDS_SERVICES_COLUMN_REQ "ÐÐ°Ð·Ð¾Ð²Ð°Ñ" IDS_SERVICES_COLUMN_VENDOR "ÐÐ·Ð³Ð¾ÑÐ¾Ð²Ð¸ÑÐµÐ»Ñ" IDS_SERVICES_COLUMN_STATUS "Ð¡Ð¾ÑÑÐ¾ÑÐ½Ð¸Ðµ" - IDS_SERVICES_COLUMN_DATEDISABLED "Date Disabled" -END - -STRINGTABLE -BEGIN - IDS_TOOLS_COLUMN_NAME "Tool Name" + IDS_SERVICES_COLUMN_DATEDISABLED "ÐÐ°ÑÐ° Ð¾ÑÐºÐ»ÑÑÐµÐ½Ð¸Ñ" +END + +STRINGTABLE +BEGIN + IDS_TOOLS_COLUMN_NAME "ÐÐ°Ð·Ð²Ð°Ð½Ð¸Ðµ ÑÑÐ¸Ð»Ð¸ÑÑ" IDS_TOOLS_COLUMN_DESCR "ÐÐ¿Ð¸ÑÐ°Ð½Ð¸Ðµ" IDS_TOOLS_COLUMN_STANDARD "Standard" IDS_STARTUP_COLUMN_ELEMENT "ÐÐ»ÐµÐ¼ÐµÐ½Ñ" Modified: trunk/reactos/base/applications/network/ipconfig/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/ipconfig/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/ipconfig/lang/ru-RU.rc [iso-8859-1] Sun Nov 29 17:08:13 2015 @@ -4,11 +4,11 @@ STRINGTABLE BEGIN - IDS_BCAST "Broadcast" - IDS_P2P "Peer To Peer" - IDS_MIXED "Mixed" - IDS_HYBRID "Hybrid" - IDS_UNKNOWN "unknown" + IDS_BCAST "Ð¨Ð¸ÑÐ¾ÐºÐ¾Ð²ÐµÑÐ°ÑÐµÐ»ÑÐ½ÑÐ¹" + IDS_P2P "ÐÐ´Ð½Ð¾ÑÐ°Ð½Ð³Ð¾Ð²ÑÐ¹" + IDS_MIXED "Ð¡Ð¼ÐµÑÐ°Ð½Ð½ÑÐ¹" + IDS_HYBRID "ÐÐ¸Ð±ÑÐ¸Ð´Ð½ÑÐ¹" + IDS_UNKNOWN "Ð½ÐµÐ¸Ð·Ð²ÐµÑÑÐ½ÑÐ¹" END STRINGTABLE @@ -26,44 +26,46 @@ BEGIN /* Please keep the spacing/formatting as per En.rc when translating */ IDS_USAGE - "\nÐÐ¡ÐÐÐÐ¬ÐÐÐÐÐÐÐ:\n \ - ipconfig [/? | /all | /renew [Ð°Ð´Ð°Ð¿ÑÐµÑ] | /release [Ð°Ð´Ð°Ð¿ÑÐµÑ] |\n \ - /flushdns | /displaydns | /registerdns |\n \ - /showclassid Ð°Ð´Ð°Ð¿ÑÐµÑ |\n \ - /setclassid Ð°Ð´Ð°Ð¿ÑÐµÑ [ÑÑÑÐ°Ð½Ð°Ð²Ð»Ð¸Ð²Ð°ÐµÐ¼ÑÐ¹_ÐºÐ¾Ð´_ÐºÐ»Ð°ÑÑÐ°_dhcp] ]\n \ - \n \ - ÐÐ´Ðµ\n \ - Ð°Ð´Ð°Ð¿ÑÐµÑ ÐÐ°Ð·Ð²Ð°Ð½Ð¸Ðµ Ð¿Ð¾Ð´ÐºÐ»ÑÑÐµÐ½Ð¸Ñ\n \ - (* - Ð»ÑÐ±Ð¾Ðµ ÐºÐ¾Ð»Ð¸ÑÐµÑÑÐ²Ð¾ Ð·Ð½Ð°ÐºÐ¾Ð², ? - Ð¾Ð´Ð¸Ð½ Ð»ÑÐ±Ð¾Ð¹ Ð·Ð½Ð°Ðº, ÑÐ¼. Ð¿ÑÐ¸Ð¼ÐµÑÑ)\n \ - \n \ - ÐÐ»ÑÑÐ¸:\n \ - /? ÐÑÐ¾Ð±ÑÐ°Ð·Ð¸ÑÑ ÑÑÐ¾ ÑÐ¿ÑÐ°Ð²Ð¾ÑÐ½Ð¾Ðµ ÑÐ¾Ð¾Ð±ÑÐµÐ½Ð¸Ðµ.\n \ - /all ÐÑÐ¾Ð±ÑÐ°Ð·Ð¸ÑÑ Ð¿Ð¾Ð»Ð½ÑÑ Ð¸Ð½ÑÐ¾ÑÐ¼Ð°ÑÐ¸Ñ Ð¾ Ð½Ð°ÑÑÑÐ¾Ð¹ÐºÐµ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÐ¾Ð².\n \ - /release ÐÑÐ²Ð¾Ð±Ð¾Ð´Ð¸ÑÑ IP-Ð°Ð´ÑÐµÑ Ð´Ð»Ñ ÑÐºÐ°Ð·Ð°Ð½Ð½Ð¾Ð³Ð¾ Ð°Ð´Ð°Ð¿ÑÐµÑÐ°.\n \ - /renew ÐÐ±Ð½Ð¾Ð²Ð¸ÑÑ IP-Ð°Ð´ÑÐµÑ Ð´Ð»Ñ ÑÐºÐ°Ð·Ð°Ð½Ð½Ð¾Ð³Ð¾ Ð°Ð´Ð°Ð¿ÑÐµÑÐ°.\n \ - /flushdns ÐÑÐ¸ÑÑÐ¸ÑÑ ÐºÐµÑ ÑÐ°Ð·ÑÐµÑÐµÐ½Ð¸Ð¹ DNS.\n \ - /registerdns ÐÐ±Ð½Ð¾Ð²Ð¸ÑÑ Ð²ÑÐµ DHCP-Ð°ÑÐµÐ½Ð´Ñ Ð¸ Ð¿ÐµÑÐµÑÐµÐ³Ð¸ÑÑÑÐ¸ÑÐ¾Ð²Ð°ÑÑ DNS-Ð¸Ð¼ÐµÐ½Ð°.\n \ - /displaydns ÐÑÐ¾Ð±ÑÐ°Ð·Ð¸ÑÑ ÑÐ¾Ð´ÐµÑÐ¶Ð¸Ð¼Ð¾Ðµ ÐºÐµÑÐ° ÑÐ°Ð·ÑÐµÑÐµÐ½Ð¸Ð¹ DNS.\n \ - /showclassid ÐÑÐ¾Ð±ÑÐ°Ð·Ð¸ÑÑ Ð²ÑÐµ Ð´Ð¾Ð¿ÑÑÑÐ¸Ð¼ÑÐµ Ð´Ð»Ñ ÑÑÐ¾Ð³Ð¾ Ð°Ð´Ð°Ð¿ÑÐµÑÐ° ÐºÐ¾Ð´Ñ (IDs) DHCP-ÐºÐ»Ð°ÑÑÐ¾Ð².\n \ - /setclassid ÐÐ·Ð¼ÐµÐ½Ð¸ÑÑ ÐºÐ¾Ð´ (ID) DHCP-ÐºÐ»Ð°ÑÑÐ°.\n \ - \n \ - ÐÐ¾ ÑÐ¼Ð¾Ð»ÑÐ°Ð½Ð¸Ñ Ð¾ÑÐ¾Ð±ÑÐ°Ð¶Ð°ÐµÑÑÑ ÑÐ¾Ð»ÑÐºÐ¾ IP-Ð°Ð´ÑÐµÑ, Ð¼Ð°ÑÐºÐ° Ð¿Ð¾Ð´ÑÐµÑÐ¸ Ð¸ ÑÑÐ°Ð½Ð´Ð°ÑÑÐ½ÑÐ¹ ÑÐ»ÑÐ·\n \ - Ð´Ð»Ñ ÐºÐ°Ð¶Ð´Ð¾Ð³Ð¾ Ð¿Ð¾Ð´ÐºÐ»ÑÑÐµÐ½Ð½Ð¾Ð³Ð¾ Ð°Ð´Ð°Ð¿ÑÐµÑÐ°, Ð´Ð»Ñ ÐºÐ¾ÑÐ¾ÑÐ¾Ð³Ð¾ Ð²ÑÐ¿Ð¾Ð»Ð½ÐµÐ½Ð° Ð¿ÑÐ¸Ð²ÑÐ·ÐºÐ° Ñ TCP/IP.\n \ - \n \ - ÐÐ»Ñ ÐºÐ»ÑÑÐµÐ¹ Release Ð¸ Renew, ÐµÑÐ»Ð¸ Ð½Ðµ ÑÐºÐ°Ð·Ð°Ð½Ð¾ Ð¸Ð¼Ñ Ð°Ð´Ð°Ð¿ÑÐµÑÐ°, Ð±ÑÐ´ÐµÑ Ð¾ÑÐ²Ð¾Ð±Ð¾Ð¶Ð´ÐµÐ½ Ð¸Ð»Ð¸\n \ - Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½ IP-Ð°Ð´ÑÐµÑ, Ð²ÑÐ´Ð°Ð½Ð½ÑÐ¹ Ð´Ð»Ñ Ð²ÑÐµÑ Ð°Ð´Ð°Ð¿ÑÐµÑÐ¾Ð², Ð´Ð»Ñ ÐºÐ¾ÑÐ¾ÑÑÑ ÑÑÑÐµÑÑÐ²ÑÑÑ\n \ - Ð¿ÑÐ¸Ð²ÑÐ·ÐºÐ¸ Ñ TCP/IP.\n \ - \n \ - ÐÐ»Ñ ÐºÐ»ÑÑÐ° Setclassid, ÐµÑÐ»Ð¸ Ð½Ðµ ÑÐºÐ°Ð·Ð°Ð½ ÐºÐ¾Ð´ ÐºÐ»Ð°ÑÑÐ° (ID), ÑÑÑÐµÑÑÐ²ÑÑÑÐ¸Ð¹ ÐºÐ¾Ð´ ÐºÐ»Ð°ÑÑÐ° Ð±ÑÐ´ÐµÑ ÑÐ´Ð°Ð»ÐµÐ½.\n \ - \n \ - ÐÑÐ¸Ð¼ÐµÑÑ:\n \ - > ipconfig ... ÐÑÐ¾Ð±ÑÐ°Ð¶Ð°ÐµÑ ÐºÑÐ°ÑÐºÑÑ Ð¸Ð½ÑÐ¾ÑÐ¼Ð°ÑÐ¸Ñ.\n \ - > ipconfig /all ... ÐÑÐ¾Ð±ÑÐ°Ð¶Ð°ÐµÑ Ð¿Ð¾Ð»Ð½ÑÑ Ð¸Ð½ÑÐ¾ÑÐ¼Ð°ÑÐ¸Ñ\n \ - > ipconfig /renew ... ÐÐ±Ð½Ð¾Ð²Ð»ÑÐµÑ ÑÐ²ÐµÐ´ÐµÐ½Ð¸Ñ Ð´Ð»Ñ Ð²ÑÐµÑ Ð°Ð´Ð°Ð¿ÑÐµÑÐ¾Ð²\n \ - > ipconfig /renew EL* ... ÐÐ±Ð½Ð¾Ð²Ð»ÑÐµÑ ÑÐ²ÐµÐ´ÐµÐ½Ð¸Ñ Ð´Ð»Ñ Ð°Ð´Ð°Ð¿ÑÐµÑÐ¾Ð²,\n \ - Ð½Ð°ÑÐ¸Ð½Ð°ÑÑÐ¸ÑÑÑ Ñ EL\n \ - > ipconfig /release *Con* ... ÐÑÐ²Ð¾Ð±Ð¾Ð¶Ð´Ð°ÐµÑ IP-Ð°Ð´ÑÐµÑ Ð´Ð»Ñ Ð²ÑÐµÑ Ð°Ð´Ð°Ð¿ÑÐµÑÐ¾Ð²,\n \ - Ð¸Ð¼ÐµÐ½Ð° ÐºÐ¾ÑÐ¾ÑÑÑ ÑÐ´Ð¾Ð²Ð»ÐµÑÐ²Ð¾ÑÑÑÑ Ð·Ð°Ð¿ÑÐ¾ÑÑ:\n \ - ""ÐÐ¾Ð´ÐºÐ»ÑÑÐµÐ½Ð¸Ðµ Ð¿Ð¾ Ð»Ð¾ÐºÐ°Ð»ÑÐ½Ð¾Ð¹ ÑÐµÑÐ¸ 1"" Ð¸Ð»Ð¸\n \ - ""ÐÐ¾Ð´ÐºÐ»ÑÑÐµÐ½Ð¸Ðµ Ð¿Ð¾ Ð»Ð¾ÐºÐ°Ð»ÑÐ½Ð¾Ð¹ ÑÐµÑÐ¸ 2""\n" + "\nÐÐ¡ÐÐÐÐ¬ÐÐÐÐÐÐÐ:\n\ + ipconfig [/? | /all | /renew [Ð°Ð´Ð°Ð¿ÑÐµÑ] | /release [Ð°Ð´Ð°Ð¿ÑÐµÑ] |\n\ + /flushdns | /displaydns | /registerdns |\n\ + /showclassid Ð°Ð´Ð°Ð¿ÑÐµÑ |\n\ + /setclassid Ð°Ð´Ð°Ð¿ÑÐµÑ [ÑÑÑÐ°Ð½Ð°Ð²Ð»Ð¸Ð²Ð°ÐµÐ¼ÑÐ¹_ÐºÐ¾Ð´_ÐºÐ»Ð°ÑÑÐ°_dhcp] ]\n\ + \n\ + ÐÐ´Ðµ\n\ + Ð°Ð´Ð°Ð¿ÑÐµÑ ÐÐ°Ð·Ð²Ð°Ð½Ð¸Ðµ Ð¿Ð¾Ð´ÐºÐ»ÑÑÐµÐ½Ð¸Ñ (Ð¼Ð¾Ð¶Ð½Ð¾ Ð¸ÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÑ Ð·Ð½Ð°ÐºÐ¸\n\ + Ð¿Ð¾Ð´ÑÑÐ°Ð½Ð¾Ð²ÐºÐ¸ * and ?, ÑÐ¼. Ð¿ÑÐ¸Ð¼ÐµÑÑ)\n\ + \n\ + ÐÐ°ÑÐ°Ð¼ÐµÑÑÑ:\n\ + /? ÐÑÐ²Ð¾Ð´ Ð´Ð°Ð½Ð½Ð¾Ð³Ð¾ ÑÐ¿ÑÐ°Ð²Ð¾ÑÐ½Ð¾Ð³Ð¾ ÑÐ¾Ð¾Ð±ÑÐµÐ½Ð¸Ñ.\n\ + /all ÐÑÐ²Ð¾Ð´ Ð¿Ð¾Ð´ÑÐ¾Ð±Ð½ÑÑ ÑÐ²ÐµÐ´ÐµÐ½Ð¸Ð¹ Ð¾ ÐºÐ¾Ð½ÑÐ¸Ð³ÑÑÐ°ÑÐ¸Ð¸.\n\ + /release ÐÑÐ²Ð¾Ð±Ð¾Ð¶Ð´ÐµÐ½Ð¸Ðµ Ð°Ð´ÑÐµÑÐ° IPv4 Ð´Ð»Ñ ÑÐºÐ°Ð·Ð°Ð½Ð½Ð¾Ð³Ð¾ Ð°Ð´Ð°Ð¿ÑÐµÑÐ°.\n\ + /renew ÐÐ±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ðµ Ð°Ð´ÑÐµÑÐ° IPv4 Ð´Ð»Ñ ÑÐºÐ°Ð·Ð°Ð½Ð½Ð¾Ð³Ð¾ Ð°Ð´Ð°Ð¿ÑÐµÑÐ°.\n\ + /flushdns ÐÑÐ¸ÑÑÐºÐ° ÐºÑÑÐ° ÑÐ¾Ð¿Ð¾ÑÑÐ°Ð²Ð¸ÑÐµÐ»Ñ DNS.\n\ + /registerdns ÐÐ±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ðµ Ð²ÑÐµÑ DHCP-Ð°ÑÐµÐ½Ð´ Ð¸ Ð¿ÐµÑÐµÑÐµÐ³Ð¸ÑÑÑÐ°ÑÐ¸Ñ DNS-Ð¸Ð¼ÐµÐ½.\n\ + /displaydns ÐÑÐ¾Ð±ÑÐ°Ð¶ÐµÐ½Ð¸Ðµ ÑÐ¾Ð´ÐµÑÐ¶Ð¸Ð¼Ð¾Ð³Ð¾ ÐºÑÑÐ° ÑÐ¾Ð¿Ð¾ÑÑÐ°Ð²Ð¸ÑÐµÐ»Ñ DNS.\n\ + /showclassid ÐÑÐ¾Ð±ÑÐ°Ð¶ÐµÐ½Ð¸Ðµ Ð²ÑÐµÑ Ð´Ð¾Ð¿ÑÑÑÐ¸Ð¼ÑÑ Ð´Ð»Ñ ÑÑÐ¾Ð³Ð¾ Ð°Ð´Ð°Ð¿ÑÐµÑÐ°\n\ + Ð¸Ð´ÐµÐ½ÑÐ¸ÑÐ¸ÐºÐ°ÑÐ¾ÑÐ¾Ð² ÐºÐ»Ð°ÑÑÐ¾Ð² DHCP.\n\ + /setclassid ÐÐ·Ð¼ÐµÐ½ÐµÐ½Ð¸Ðµ Ð¸Ð´ÐµÐ½ÑÐ¸ÑÐ¸ÐºÐ°ÑÐ¾ÑÐ° ÐºÐ»Ð°ÑÑÐ° DHCP.\n\ + \n\ + ÐÐ¾ ÑÐ¼Ð¾Ð»ÑÐ°Ð½Ð¸Ñ Ð¾ÑÐ¾Ð±ÑÐ°Ð¶Ð°ÐµÑÑÑ ÑÐ¾Ð»ÑÐºÐ¾ IP-Ð°Ð´ÑÐµÑ, Ð¼Ð°ÑÐºÐ° Ð¿Ð¾Ð´ÑÐµÑÐ¸ Ð¸ ÑÑÐ°Ð½Ð´Ð°ÑÑÐ½ÑÐ¹\n\ + ÑÐ»ÑÐ· Ð´Ð»Ñ ÐºÐ°Ð¶Ð´Ð¾Ð³Ð¾ Ð°Ð´Ð°Ð¿ÑÐµÑÐ°, Ð´Ð»Ñ ÐºÐ¾ÑÐ¾ÑÐ¾Ð³Ð¾ Ð²ÑÐ¿Ð¾Ð»Ð½ÐµÐ½Ð° Ð¿ÑÐ¸Ð²ÑÐ·ÐºÐ° Ðº TCP/IP.\n\ + \n\ + ÐÑÐ»Ð¸ Ð´Ð»Ñ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÐ¾Ð² Release Ð¸ Renew Ð½Ðµ ÑÐºÐ°Ð·Ð°Ð½Ð¾ Ð¸Ð¼Ñ Ð°Ð´Ð°Ð¿ÑÐµÑÐ°, ÑÐ¾ Ð°ÑÐµÐ½Ð´Ð°\n\ + IP-Ð°Ð´ÑÐµÑÐ° Ð´Ð»Ñ Ð²ÑÐµÑ Ð°Ð´Ð°Ð¿ÑÐµÑÐ¾Ð², Ð´Ð»Ñ ÐºÐ¾ÑÐ¾ÑÑÑ ÑÑÑÐµÑÑÐ²ÑÑÑ Ð¿ÑÐ¸Ð²ÑÐ·ÐºÐ¸ Ðº TCP/IP,\n\ + Ð±ÑÐ´ÐµÑ Ð¾ÑÐ²Ð¾Ð±Ð¾Ð¶Ð´ÐµÐ½Ð° Ð¸Ð»Ð¸ Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð°.\n\ + \n\ + ÐÑÐ»Ð¸ Ð´Ð»Ñ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÐ° SetClassid Ð½Ðµ ÑÐºÐ°Ð·Ð°Ð½ Ð¸Ð´ÐµÐ½ÑÐ¸ÑÐ¸ÐºÐ°ÑÐ¾Ñ ÐºÐ»Ð°ÑÑÐ°, ÑÐ¾\n\ + ÑÑÑÐµÑÑÐ²ÑÑÑÐ¸Ð¹ Ð¸Ð´ÐµÐ½ÑÐ¸ÑÐ¸ÐºÐ°ÑÐ¾Ñ ÐºÐ»Ð°ÑÑÐ° Ð±ÑÐ´ÐµÑ ÑÐ´Ð°Ð»ÐµÐ½.\n\ + \n\ + ÐÑÐ¸Ð¼ÐµÑÑ:\n\ + > ipconfig ... ÐÑÐ²Ð¾Ð´ ÑÐ²ÐµÐ´ÐµÐ½Ð¸Ð¹\n\ + > ipconfig /all ... ÐÑÐ²Ð¾Ð´ Ð¿Ð¾Ð´ÑÐ¾Ð±Ð½ÑÑ ÑÐ²ÐµÐ´ÐµÐ½Ð¸Ð¹\n\ + > ipconfig /renew ... ÐÐ±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ðµ Ð°Ð´ÑÐµÑÐ¾Ð² Ð²ÑÐµÑ Ð°Ð´Ð°Ð¿ÑÐµÑÐ¾Ð²\n\ + > ipconfig /renew EL* ... ÐÐ±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ðµ Ð°Ð´ÑÐµÑÐ¾Ð² Ð´Ð»Ñ Ð²ÑÐµÑ Ð°Ð´Ð°Ð¿ÑÐµÑÐ¾Ð²,\n\ + Ð¸Ð¼Ñ ÐºÐ¾ÑÐ¾ÑÑÑ Ð½Ð°ÑÐ¸Ð½Ð°ÐµÑÑÑ Ñ ""EL""\n\ + > ipconfig /release *Con* ... ÐÑÐ²Ð¾Ð±Ð¾Ð¶Ð´ÐµÐ½Ð¸Ðµ Ð°Ð´ÑÐµÑÐ¾Ð² Ð´Ð»Ñ Ð²ÑÐµÑ Ð°Ð´Ð°Ð¿ÑÐµÑÐ¾Ð²\n\ + Ñ ÑÐ¾Ð¾ÑÐ²ÐµÑÑÑÐ²ÑÑÑÐ¸Ð¼ Ð¸Ð¼ÐµÐ½ÐµÐ¼, Ð½Ð°Ð¿ÑÐ¸Ð¼ÐµÑ:\n\ + ""Local Area Connection 1"" Ð¸Ð»Ð¸\n\ + ""Local Area Connection 2""\n" END Modified: trunk/reactos/base/applications/network/ping/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/ping/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/ping/lang/ru-RU.rc [iso-8859-1] Sun Nov 29 17:08:13 2015 @@ -2,13 +2,13 @@ STRINGTABLE BEGIN - IDS_USAGE "\nÐÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°Ð½Ð¸Ðµ: ping [-t] [-n <ÑÐ¸ÑÐ»Ð¾>] [-l <ÑÐ°Ð·Ð¼ÐµÑ>] [-w <ÑÐ°Ð¹Ð¼-Ð°ÑÑ>] ÐºÐ¾Ð½ÐµÑÐ½ÑÐ¹_ÑÐ·ÐµÐ»\n\n\ + IDS_USAGE "\nÐÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°Ð½Ð¸Ðµ:\n ping [-t] [-n <ÑÐ¸ÑÐ»Ð¾>] [-l <ÑÐ°Ð·Ð¼ÐµÑ>] [-w <ÑÐ°Ð¹Ð¼-Ð°ÑÑ>] ÐºÐ¾Ð½ÐµÑÐ½ÑÐ¹_ÑÐ·ÐµÐ»\n\n\ ÐÐ°ÑÐ°Ð¼ÐµÑÑÑ:\n\ - -t ÐÑÐ¾Ð²ÐµÑÐºÐ° ÑÐ²ÑÐ·Ð¸ Ñ ÑÐºÐ°Ð·Ð°Ð½Ð½ÑÐ¼ ÑÐ·Ð»Ð¾Ð¼ Ð´Ð¾ Ð¿ÑÐµÐºÑÐ°ÑÐµÐ½Ð¸Ñ.\n\ - ÐÐ»Ñ Ð¿ÑÐµÐºÑÐ°ÑÐµÐ½Ð¸Ñ Ð½Ð°Ð¶Ð¼Ð¸ÑÐµ CTRL+C.\n\ + -t ÐÑÐ¾Ð²ÐµÑÐºÐ° ÑÐ²ÑÐ·Ð¸ Ñ ÑÐºÐ°Ð·Ð°Ð½Ð½ÑÐ¼ ÑÐ·Ð»Ð¾Ð¼ Ð´Ð¾ Ð¿ÑÐµÐºÑÐ°ÑÐµÐ½Ð¸Ñ.\n\ + ÐÐ»Ñ Ð¿ÑÐµÐºÑÐ°ÑÐµÐ½Ð¸Ñ Ð½Ð°Ð¶Ð¼Ð¸ÑÐµ CTRL+C.\n\ -n <ÑÐ¸ÑÐ»Ð¾> Ð§Ð¸ÑÐ»Ð¾ Ð¾ÑÐ¿ÑÐ°Ð²Ð»ÑÐµÐ¼ÑÑ Ð·Ð°Ð¿ÑÐ¾ÑÐ¾Ð² ÑÑÐ°.\n\ - -l <ÑÐ°Ð·Ð¼ÐµÑ> Ð Ð°Ð·Ð¼ÐµÑ Ð±ÑÑÐµÑÐ° Ð¾ÑÐ¿ÑÐ°Ð²ÐºÐ¸.\n\ - -w <ÑÐ°Ð¹Ð¼-Ð°ÑÑ> Ð¢Ð°Ð¹Ð¼-Ð°ÑÑ Ð´Ð»Ñ ÐºÐ°Ð¶Ð´Ð¾Ð³Ð¾ Ð¾ÑÐ²ÐµÑÐ° (Ð² Ð¼Ð¸Ð»Ð»Ð¸ÑÐµÐºÑÐ½Ð´Ð°Ñ)\n\n\0" + -l <ÑÐ°Ð·Ð¼ÐµÑ> Ð Ð°Ð·Ð¼ÐµÑ Ð±ÑÑÐµÑÐ° Ð¾ÑÐ¿ÑÐ°Ð²ÐºÐ¸.\n\ + -w <ÑÐ°Ð¹Ð¼-Ð°ÑÑ> Ð¢Ð°Ð¹Ð¼-Ð°ÑÑ Ð´Ð»Ñ ÐºÐ°Ð¶Ð´Ð¾Ð³Ð¾ Ð¾ÑÐ²ÐµÑÐ° (Ð² Ð¼Ð¸Ð»Ð»Ð¸ÑÐµÐºÑÐ½Ð´Ð°Ñ)\n\n\0" IDS_PING_WITH_BYTES "\nÐÐ±Ð¼ÐµÐ½ Ð¿Ð°ÐºÐµÑÐ°Ð¼Ð¸ Ñ %1 [%2] Ð¿Ð¾ %3!d! Ð±Ð°Ð¹ÑÐ° Ð´Ð°Ð½Ð½ÑÑ:\n\n\0" IDS_PING_STATISTICS "\nÐ¡ÑÐ°ÑÐ¸ÑÑÐ¸ÐºÐ° Ping Ð´Ð»Ñ %1:\n\0" Modified: trunk/reactos/base/applications/network/wlanconf/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/wlanconf/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/wlanconf/lang/ru-RU.rc [iso-8859-1] Sun Nov 29 17:08:13 2015 @@ -1,16 +1,16 @@ /* Russian translation by Kudratov Olimjon, 2014.09.25 */ + LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT STRINGTABLE BEGIN IDS_USAGE "\nÐÐ°ÑÑÑÐ¾Ð¹ÑÐµ WLAN Ð°Ð´Ð°Ð¿ÑÐµÑ.\n\n\ WLANCONF [-c SSID [-w WEP] [-a]] [-d] [-s]\n\n\ -\t-c SSID\t\tÐÐ¾Ð´ÐºÐ»ÑÑÐ°ÐµÑÑÑ Ðº ÑÐºÐ°Ð·Ð°Ð½Ð½Ð¾Ð¼Ñ SSID,\n\ +\t-c SSID\t\tÐÐ¾Ð´ÐºÐ»ÑÑÐµÐ½Ð¸Ðµ Ðº ÑÐºÐ°Ð·Ð°Ð½Ð½Ð¾Ð¼Ñ SSID.\n\ \t-w WEP\t\tÐÐ°Ð´Ð°ÐµÑ WEP ÐºÐ»ÑÑ Ð´Ð»Ñ Ð¸ÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°Ð½Ð¸Ñ.\n\ -\t-a\t\tÐ£ÐºÐ°Ð·ÑÐ²Ð°ÐµÑ ÑÐµÐ»ÐµÐ²ÑÑ ÑÐµÑÑ is ad-hoc\n\ -\t-d\t\tÐÑÐºÐ»ÑÑÐ°ÐµÑÑÑ Ð¾Ñ ÑÐµÐºÑÑÐµÐ¹ ÑÐ¾ÑÐºÐ¸ Ð´Ð¾ÑÑÑÐ¿Ð°.\n\ -\t-s\t\tÐ¡ÐºÐ°Ð½Ð¸ÑÑÐµÑ Ð¸ Ð¾ÑÐ¾Ð±ÑÐ°Ð¶Ð°ÐµÑ ÑÐ¿Ð¸ÑÐ¾Ðº ÑÐ¾ÑÐµÐº Ð´Ð¾ÑÑÑÐ¿Ð°\n\ -\t\t\tÐ² Ð¾Ð±Ð»Ð°ÑÑÐ¸.\n\n\ +\t-a\t\tÐ£ÐºÐ°Ð·Ð°Ð½Ð¸Ðµ ÑÐµÐ»ÐµÐ²Ð¾Ð¹ ÑÐµÑÐ¸ ÐºÐ°Ðº ad-hoc\n\ +\t-d\t\tÐÑÐºÐ»ÑÑÐµÐ½Ð¸Ðµ Ð¾Ñ ÑÐµÐºÑÑÐµÐ¹ ÑÐ¾ÑÐºÐ¸ Ð´Ð¾ÑÑÑÐ¿Ð°.\n\ +\t-s\t\tÐÑÐ¾Ð±ÑÐ°Ð¶ÐµÐ½Ð¸Ðµ ÑÐ¿Ð¸ÑÐºÐ° ÑÐ¾ÑÐµÐº Ð´Ð¾ÑÑÑÐ¿Ð°.\n\n\ ÐÑÐ¸ Ð¾ÑÑÑÑÑÑÐ²Ð¸Ð¸ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÐ¾Ð² Ð¾ÑÐ¾Ð±ÑÐ°Ð¶Ð°ÐµÑ Ð¸Ð½ÑÐ¾ÑÐ¼Ð°ÑÐ¸Ñ Ð¾ ÑÐµÐºÑÑÐµÐ¼ WLAN ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ð¸\n" IDS_NO_NETWORK "ÐÐµ Ð½Ð°Ð¹Ð´ÐµÐ½Ð¾ ÑÐµÑÐµÐ¹ Ð² Ð¾Ð±Ð»Ð°ÑÑÐ¸\n" IDS_NO_WLAN_ADAPTER "ÐÐµ Ð½Ð°Ð¹Ð´ÐµÐ½ WLAN Ð°Ð´Ð°Ð¿ÑÐµÑ Ð² ÑÐ¸ÑÑÐµÐ¼Ðµ\n" @@ -18,7 +18,7 @@ IDS_WLAN_DISCONNECT "\nWLAN Ð¾ÑÐºÐ»ÑÑÐµÐ½\n" IDS_MSG_WEP_ENABLED "WEP Ð²ÐºÐ»ÑÑÐµÐ½: %s\n" IDS_MSG_NETWORK_MODE "Ð ÐµÐ¶Ð¸Ð¼ ÑÐµÑÐ¸: %s\n" - IDS_MSG_CURRENT_WIRELESS "\nÐ¢ÐµÐºÑÑÐ°Ñ Ð¸Ð½ÑÐ¾ÑÐ¼Ð°ÑÐ¸Ñ ÐºÐ¾Ð½ÑÐ¸Ð³ÑÑÐ°ÑÐ¸Ð¸ Ð±ÐµÑÐ¿ÑÐ¾Ð²Ð¾Ð´Ð½Ð¾Ð¹ ÑÐµÑÐ¸:\n\n" + IDS_MSG_CURRENT_WIRELESS "\nÐÐ½ÑÐ¾ÑÐ¼Ð°ÑÐ¸Ñ Ð¾ ÑÐµÐºÑÑÐµÐ¹ ÐºÐ¾Ð½ÑÐ¸Ð³ÑÑÐ°ÑÐ¸Ð¸ Ð±ÐµÑÐ¿ÑÐ¾Ð²Ð¾Ð´Ð½Ð¾Ð¹ ÑÐµÑÐ¸:\n\n" IDS_MSG_ENCRYPTED "ÐÐ°ÑÐ¸ÑÑÐ¾Ð²Ð°Ð½Ð¾: %s\n" IDS_MSG_NETWORK_TYPE "Ð¢Ð¸Ð¿ ÑÐµÑÐ¸: %s\n" IDS_MSG_RSSI "RSSI: %i dBm\n" Modified: trunk/reactos/base/applications/notepad/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/lang/ru-RU.rc [iso-8859-1] Sun Nov 29 17:08:13 2015 @@ -62,7 +62,7 @@ BEGIN MENUITEM "&Ð¡Ð¾Ð´ÐµÑÐ¶Ð°Ð½Ð¸Ðµ", CMD_HELP_CONTENTS MENUITEM SEPARATOR - MENUITEM "&Ð Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ðµ", CMD_ABOUT + MENUITEM "&Ð Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ðµ...", CMD_ABOUT MENUITEM "&Ð¡Ð²ÐµÐ´ÐµÐ½Ð¸Ñ...", CMD_HELP_ABOUT_NOTEPAD END END @@ -113,7 +113,7 @@ COMBOBOX ID_ENCODING, 54, 0, 156, 80, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP LTEXT "ÐÐ¾Ð´Ð¸ÑÐ¾Ð²ÐºÐ°:", 0x155, 5, 2, 41, 12 COMBOBOX ID_EOLN, 54, 18, 156, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "ÐÐ¾Ð½ÐµÑ ÑÑÑÐ¾ÐºÐ¸:", 0x156, 5, 20, 50, 12 + LTEXT "Ð¤Ð¾ÑÐ¼Ð°Ñ ÐºÐ¾Ð½ÑÐ° ÑÑÑÐ¾ÐºÐ¸:", 0x156, 5, 20, 50, 12 END /* Dialog 'Go To' */ @@ -182,5 +182,5 @@ STRING_LINE_COLUMN "Ð¡ÑÑÐ¾ÐºÐ° %d, ÑÑÐ¾Ð»Ð±ÐµÑ %d" STRING_PRINTERROR "ÐÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ ÑÐ°ÑÐ¿ÐµÑÐ°ÑÐ°ÑÑ ÑÐ°Ð¹Ð» '%s'.\n\nÐÑÐ¾Ð²ÐµÑÑÑÐµ, Ð²ÐºÐ»ÑÑÐµÐ½ Ð»Ð¸ Ð¿ÑÐ¸Ð½ÑÐµÑ, Ð¸ Ð½Ð°ÑÑÑÐ¾ÐµÐ½ Ð»Ð¸ Ð¾Ð½ Ð¿ÑÐ°Ð²Ð¸Ð»ÑÐ½Ð¾." - STRING_TEXT_DOCUMENT "Text Document" + STRING_TEXT_DOCUMENT "Ð¢ÐµÐºÑÑÐ¾Ð²ÑÐ¹ Ð´Ð¾ÐºÑÐ¼ÐµÐ½Ñ" END Modified: trunk/reactos/base/applications/rapps/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/ru-RU.rc [iso-8859-1] Sun Nov 29 17:08:13 2015 @@ -23,7 +23,7 @@ POPUP "Ð¡Ð¿ÑÐ°Ð²ÐºÐ°" BEGIN MENUITEM "Ð¡Ð¾Ð´ÐµÑÐ¶Ð°Ð½Ð¸Ðµ\tF1", ID_HELP, GRAYED - MENUITEM "Ð Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ðµ", ID_ABOUT + MENUITEM "Ð Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ðµ...", ID_ABOUT END END @@ -66,12 +66,12 @@ EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | ES_AUTOHSCROLL PUSHBUTTON "Ð&ÑÐ±ÑÐ°ÑÑ", IDC_CHOOSE, 187, 85, 50, 14 AUTOCHECKBOX "&Ð£Ð´Ð°Ð»ÑÑÑ Ð¸Ð½ÑÑÐ°Ð»Ð»ÑÑÐ¾ÑÑ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼ Ð¿Ð¾ÑÐ»Ðµ ÑÑÑÐ°Ð½Ð¾Ð²ÐºÐ¸", IDC_DEL_AFTER_INSTALL, 16, 100, 218, 12 - GROUPBOX "Proxy", -1, 4, 116, 240, 76 - CONTROL "System proxy settings", IDC_PROXY_DEFAULT, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 130, 210, 10 - CONTROL "Direct (No proxy)", IDC_NO_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 145, 210, 10 - CONTROL "Proxy", IDC_USE_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 160, 74, 10 + GROUPBOX "ÐÑÐ¾ÐºÑÐ¸", -1, 4, 116, 240, 76 + CONTROL "Ð¡Ð¸ÑÑÐµÐ¼Ð½ÑÐµ Ð½Ð°ÑÑÑÐ¾Ð¹ÐºÐ¸ Ð¿ÑÐ¾ÐºÑÐ¸", IDC_PROXY_DEFAULT, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 130, 210, 10 + CONTROL "ÐÐµÐ· Ð¿ÑÐ¾ÐºÑÐ¸", IDC_NO_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 145, 210, 10 + CONTROL "ÐÑÐ¾ÐºÑÐ¸", IDC_USE_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 160, 74, 10 EDITTEXT IDC_PROXY_SERVER, 90, 160, 147, 12, ES_AUTOHSCROLL | WS_DISABLED - LTEXT "No proxy for", -1, 27, 175, 64, 10 + LTEXT "ÐÑÐºÐ»ÑÑÐµÐ½Ð¸Ñ", -1, 27, 175, 64, 10 EDITTEXT IDC_NO_PROXY_FOR, 90, 175, 147, 12, ES_AUTOHSCROLL | WS_DISABLED PUSHBUTTON "ÐÐ¾ ÑÐ¼Ð¾Ð»ÑÐ°Ð½Ð¸Ñ", IDC_DEFAULT_SETTINGS, 8, 195, 60, 14 PUSHBUTTON "OK", IDOK, 116, 195, 60, 14 @@ -141,7 +141,7 @@ IDS_INFO_UPDATEINFO "\nÐÐ½ÑÐ¾ÑÐ¼Ð°ÑÐ¸Ñ Ð¾Ð± Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸ÑÑ: " IDS_INFO_INFOABOUT "\nÐÐ½ÑÐ¾ÑÐ¼Ð°ÑÐ¸Ñ Ð¾ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ðµ: " IDS_INFO_COMMENTS "\nÐÐ¾Ð¼Ð¼ÐµÐ½ÑÐ°ÑÐ¸Ð¸: " - IDS_INFO_INSTLOCATION "\nÐ£ÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¾ Ð²: " + IDS_INFO_INSTLOCATION "\nÐÑÑÑ ÑÑÑÐ°Ð½Ð¾Ð²ÐºÐ¸: " IDS_INFO_INSTALLSRC "\nÐÑÑÐ¾ÑÐ½Ð¸Ðº ÑÑÑÐ°Ð½Ð¾Ð²ÐºÐ¸: " IDS_INFO_UNINSTALLSTR "\nÐ¡ÑÑÐ¾ÐºÐ° Ð´Ð»Ñ ÑÐ´Ð°Ð»ÐµÐ½Ð¸Ñ: " IDS_INFO_MODIFYPATH "\nÐ¡ÑÑÐ¾ÐºÐ° Ð´Ð»Ñ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ: " @@ -192,12 +192,12 @@ IDS_UPDATES "ÐÐ±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ" IDS_APPLICATIONS "ÐÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ" IDS_CHOOSE_FOLDER_TEXT "ÐÑÐ±ÐµÑÐ¸ÑÐµ Ð¿Ð°Ð¿ÐºÑ, ÐºÐ¾ÑÐ¾ÑÐ°Ñ Ð±ÑÐ´ÐµÑ Ð¸ÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÑÑÑ Ð´Ð»Ñ Ð·Ð°Ð³ÑÑÐ·ÐºÐ¸ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼:" - IDS_CHOOSE_FOLDER_ERROR "ÐÑ ÑÐºÐ°Ð·Ð°Ð»Ð¸ Ð½ÐµÑÑÑÐµÑÑÐ²ÑÑÑÑÑ Ð¿Ð°Ð¿ÐºÑ!" + IDS_CHOOSE_FOLDER_ERROR "Ð£ÐºÐ°Ð·Ð°Ð½Ð½Ð°Ñ Ð²Ð°Ð¼Ð¸ Ð¿Ð°Ð¿ÐºÐ° Ð½Ðµ ÑÑÑÐµÑÑÐ²ÑÐµÑ. Ð¡Ð¾Ð·Ð´Ð°ÑÑ?" IDS_APP_REG_REMOVE "ÐÑ Ð´ÐµÐ¹ÑÑÐ²Ð¸ÑÐµÐ»ÑÐ½Ð¾ ÑÐ¾ÑÐ¸ÑÐµ ÑÐ´Ð°Ð»Ð¸ÑÑ Ð´Ð°Ð½Ð½ÑÐµ Ð¾Ð± ÑÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ð¾Ð¹ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ðµ Ð¸Ð· ÑÐµÐµÑÑÑÐ°?" IDS_INFORMATION "ÐÐ½ÑÐ¾ÑÐ¼Ð°ÑÐ¸Ñ" - IDS_UNABLE_TO_DOWNLOAD "Unable to download the package! Address not found!" + IDS_UNABLE_TO_DOWNLOAD "ÐÐµ ÑÐ´Ð°Ð»Ð¾ÑÑ ÑÐºÐ°ÑÐ°ÑÑ Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ! ÐÐµ Ð½Ð°Ð¹Ð´ÐµÐ½ Ð°Ð´ÑÐµÑ!" IDS_UNABLE_TO_REMOVE "ÐÐµ ÑÐ´Ð°Ð»Ð¾ÑÑ ÑÐ´Ð°Ð»Ð¸ÑÑ Ð´Ð°Ð½Ð½ÑÐµ Ð¾ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ðµ Ð¸Ð· ÑÐµÐµÑÑÑÐ°!" - IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed." - IDS_INTEG_CHECK_TITLE "Verifying package integrity..." - IDS_INTEG_CHECK_FAIL "The package did not pass the integrity check, it may have been corrupted or tampered with during downloading. Running the software is not recommended." -END + IDS_CERT_DOES_NOT_MATCH "ÐÑÐ¸Ð±ÐºÐ° Ð¿ÑÐ¾Ð²ÐµÑÐºÐ¸ SSL ÑÐµÑÑÐ¸ÑÐ¸ÐºÐ°ÑÐ°." + IDS_INTEG_CHECK_TITLE "ÐÑÐ¾Ð²ÐµÑÐºÐ° ÑÐµÐ»Ð¾ÑÑÐ½Ð¾ÑÑÐ¸ Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ..." + IDS_INTEG_CHECK_FAIL "ÐÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ Ð½Ðµ Ð¿ÑÐ¾ÑÐ»Ð¾ Ð¿ÑÐ¾Ð²ÐµÑÐºÑ ÑÐµÐ»Ð¾ÑÑÐ½Ð¾ÑÑÐ¸, Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð¾Ð½Ð¾ Ð±ÑÐ»Ð¾ Ð¿Ð¾Ð²ÑÐµÐ¶Ð´ÐµÐ½Ð¾ Ð¸Ð»Ð¸ Ð¿Ð¾Ð´Ð¼ÐµÐ½ÐµÐ½Ð¾. ÐÐ°Ð¿ÑÑÐº Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ Ð½Ðµ ÑÐµÐºÐ¾Ð¼ÐµÐ½Ð´ÑÐµÑÑÑ." +END Modified: trunk/reactos/base/applications/sndrec32/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… ============================================================================== --- trunk/reactos/base/applications/sndrec32/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndrec32/lang/ru-RU.rc [iso-8859-1] Sun Nov 29 17:08:13 2015 @@ -8,11 +8,11 @@ IDD_ABOUTBOX DIALOGEX 0, 0, 196, 75 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "ÐÐ½ÑÐ¾ÑÐ¼Ð°ÑÐ¸Ñ Ð¾ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ðµ ""ÐÐ²ÑÐºÐ¾Ð·Ð°Ð¿Ð¸ÑÑ Ð´Ð»Ñ ReactOS"" " +CAPTION "ÐÐ½ÑÐ¾ÑÐ¼Ð°ÑÐ¸Ñ Ð¾ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ðµ ""ÐÐ²ÑÐºÐ¾Ð·Ð°Ð¿Ð¸ÑÑ Ð´Ð»Ñ ReactOS""" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN ICON IDI_SNDREC32, -1, 19, 14, 21, 20 - LTEXT "ÐÐ²ÑÐºÐ¾Ð·Ð°Ð¿Ð¸ÑÑ Ð´Ð»Ñ ReactOS, Ð²ÐµÑÑÐ¸Ñ 1.0", IDC_STATIC, 56, 16, 114, 8, SS_NOPREFIX + LTEXT "ÐÐ²ÑÐºÐ¾Ð·Ð°Ð¿Ð¸ÑÑ Ð´Ð»Ñ ReactOS, Ð²ÐµÑÑÐ¸Ñ 1.0", IDC_STATIC, 56, 16, 134, 8, SS_NOPREFIX LTEXT "Copyright (C) 2009", IDC_STATIC, 56, 25, 114, 8 DEFPUSHBUTTON "OK", IDOK, 139, 54, 50, 14, WS_GROUP END @@ -55,7 +55,7 @@ MENUITEM "ÐÐ¾Ð±Ð°Ð²Ð¸ÑÑ &ÑÑÐ¾", ID_EFFECTS_ECHO MENUITEM "Ð&Ð±ÑÐ°ÑÐ¸ÑÑ", ID_EFFECTS_REVERSE END - POPUP "&?" + POPUP "&Ð¡Ð¿ÑÐ°Ð²ÐºÐ°" BEGIN MENUITEM "&Ð Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ðµ...", ID_ABOUT END Modified: trunk/reactos/base/applications/taskmgr/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/ru-RU.rc [iso-8859-1] Sun Nov 29 17:08:13 2015 @@ -64,7 +64,7 @@ BEGIN MENUITEM "&ÐÑÐ·Ð¾Ð² ÑÐ¿ÑÐ°Ð²ÐºÐ¸", ID_HELP_TOPICS MENUITEM SEPARATOR - MENUITEM "&Ð Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ðµ", ID_HELP_ABOUT + MENUITEM "&Ð Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ðµ...", ID_HELP_ABOUT END END @@ -220,9 +220,9 @@ LTEXT "ÐÐµÐ²ÑÐ³ÑÑÐ¶Ð°ÐµÐ¼Ð°Ñ", IDS_KERNEL_MEMORY_NONPAGED, 137, 193, 80, 8 EDITTEXT IDC_KERNEL_MEMORY_TOTAL, 195, 174, 41, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_KERNEL_MEMORY_PAGED, 195, 184, 48, 8, ES_RIGHT | ES_READONLY | - ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_KERNEL_MEMORY_NONPAGED, 195, 194, 48, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_KERNEL_MEMORY_PAGED, 195, 184, 41, 8, ES_RIGHT | ES_READONLY | + ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP + EDITTEXT IDC_KERNEL_MEMORY_NONPAGED, 195, 194, 41, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP GROUPBOX "Ð¥ÑÐ¾Ð½Ð¾Ð»Ð¾Ð³Ð¸Ñ Ð·Ð°Ð³ÑÑÐ·ÐºÐ¸ Ð¦Ð", IDC_CPU_USAGE_HISTORY_FRAME, 74, 5, 168, 54, 0, WS_EX_TRANSPARENT GROUPBOX "Ð¥ÑÐ¾Ð½Ð¾Ð»Ð¾Ð³Ð¸Ñ Ð¸ÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°Ð½Ð¸Ñ ÑÐ°Ð¹Ð»Ð° Ð¿Ð¾Ð´ÐºÐ°ÑÐºÐ¸", IDC_MEMORY_USAGE_HISTORY_FRAME, 74, 63, 168, 54, 0, WS_EX_TRANSPARENT Modified: trunk/reactos/base/applications/winhlp32/lang/Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/lang/Ru.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lang/Ru.rc [iso-8859-1] Sun Nov 29 17:08:13 2015 @@ -28,7 +28,7 @@ POPUP "&Ð¤Ð°Ð¹Ð»" { MENUITEM "&ÐÑÐºÑÑÑÑ", MNID_FILE_OPEN MENUITEM SEPARATOR - MENUITEM "&ÐÐµÑÐ°ÑÐ°ÑÑ", MNID_FILE_PRINT + MENUITEM "&ÐÐµÑÐ°ÑÑ...", MNID_FILE_PRINT MENUITEM "ÐÐ°ÑÑÑÐ¾Ð¹ÐºÐ° &Ð¿ÑÐ¸Ð½ÑÐµÑÐ°...", MNID_FILE_SETUP MENUITEM SEPARATOR MENUITEM "&ÐÑÑÐ¾Ð´", MNID_FILE_EXIT Modified: trunk/reactos/base/shell/explorer/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/lang/r… ============================================================================== --- trunk/reactos/base/shell/explorer/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/lang/ru-RU.rc [iso-8859-1] Sun Nov 29 17:08:13 2015 @@ -76,10 +76,10 @@ AUTOCHECKBOX "&ÐÐ¾Ð²ÐµÑÑ Ð´ÑÑÐ³Ð¸Ñ Ð¾ÐºÐ¾Ð½", IDC_TASKBARPROP_ONTOP, 13, 71, 200, 10 AUTOCHECKBOX "&ÐÑÑÐ¿Ð¿Ð¸ÑÐ¾Ð²Ð°ÑÑ ÑÑÐ¾Ð¶Ð¸Ðµ ÐºÐ½Ð¾Ð¿ÐºÐ¸", IDC_TASKBARPROP_GROUP, 13, 84, 200, 10 AUTOCHECKBOX "ÐÑÐ¾Ð±ÑÐ°Ð¶Ð°ÑÑ Ð¿Ð°Ð½ÐµÐ»Ñ &Ð±ÑÑÑÑÐ¾Ð³Ð¾ Ð·Ð°Ð¿ÑÑÐºÐ°", IDC_TASKBARPROP_SHOWQL, 13, 97, 200, 10 - GROUPBOX "Notification area", IDC_STATIC, 6, 114, 240, 98 + GROUPBOX "ÐÐ°Ð½ÐµÐ»Ñ ÑÐ²ÐµÐ´Ð¾Ð¼Ð»ÐµÐ½Ð¸Ð¹", IDC_STATIC, 6, 114, 240, 98 CONTROL "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN,13, 126, 223, 28 AUTOCHECKBOX "&Ð§Ð°ÑÑ", IDC_TASKBARPROP_CLOCK, 13, 153, 80, 10 - AUTOCHECKBOX "Show seconds", IDC_TASKBARPROP_SECONDS, 120, 153, 80, 10, WS_DISABLED + AUTOCHECKBOX "ÐÑÐ¾Ð±ÑÐ°Ð¶Ð°ÑÑ ÑÐµÐºÑÐ½Ð´Ñ", IDC_TASKBARPROP_SECONDS, 120, 153, 80, 10, WS_DISABLED LTEXT "ÐÐ¾Ð¶Ð½Ð¾ Ð¸Ð·Ð±ÐµÐ¶Ð°ÑÑ Ð·Ð°Ð³ÑÐ¾Ð¼Ð¾Ð¶Ð´ÐµÐ½Ð¸Ñ Ð¾Ð±Ð»Ð°ÑÑÐ¸ ÑÐ²ÐµÐ´Ð¾Ð¼Ð»ÐµÐ½Ð¸Ð¹, ÑÐºÑÑÐ²Ð°Ñ Ð·Ð½Ð°ÑÐºÐ¸, ÐºÐ¾ÑÐ¾ÑÑÐµ Ð´Ð°Ð²Ð½Ð¾ Ð½Ðµ Ð¸ÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°Ð»Ð¸ÑÑ.", IDC_STATIC, 13, 169, 223, 16 AUTOCHECKBOX "&Ð¡ÐºÑÑÐ²Ð°ÑÑ Ð½ÐµÐ¸ÑÐ¿Ð¾Ð»ÑÐ·ÑÐµÐ¼ÑÐµ Ð·Ð½Ð°ÑÐºÐ¸", IDC_TASKBARPROP_HIDEICONS, 13, 191, 125, 10 PUSHBUTTON "&ÐÐ°ÑÑÑÐ¾Ð¸ÑÑ...", IDC_TASKBARPROP_ICONCUST, 188, 191, 50, 14 Modified: trunk/reactos/dll/cpl/intl/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/ru-RU.rc… ============================================================================== --- trunk/reactos/dll/cpl/intl/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/lang/ru-RU.rc [iso-8859-1] Sun Nov 29 17:08:13 2015 @@ -32,7 +32,7 @@ FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Ð¯Ð·ÑÐºÐ¸ Ð¸ ÑÐ»ÑÐ¶Ð±Ñ ÑÐµÐºÑÑÐ¾Ð²Ð¾Ð³Ð¾ Ð²Ð²Ð¾Ð´Ð°", -1, 5, 5, 234, 52 - LTEXT "Ð§ÑÐ¾Ð±Ñ Ð¿ÑÐ¾ÑÐ¼Ð¾ÑÑÐµÑÑ Ð¸Ð»Ð¸ Ð¸Ð·Ð¼ÐµÐ½Ð¸ÑÑ ÑÐ·ÑÐº Ð¸Ð»Ð¸ Ð¼ÐµÑÐ¾Ð´ Ð²Ð²Ð¾Ð´Ð° ÑÐµÐºÑÑÐ°, Ð½Ð°Ð¶Ð¼Ð¸ÑÐµ ÐºÐ½Ð¾Ð¿ÐºÑ ""ÐÐ¾Ð´ÑÐ¾Ð±Ð½ÐµÐµ""", -1, 12, 15, 220, 18 + LTEXT "Ð§ÑÐ¾Ð±Ñ Ð¿ÑÐ¾ÑÐ¼Ð¾ÑÑÐµÑÑ Ð¸Ð»Ð¸ Ð¸Ð·Ð¼ÐµÐ½Ð¸ÑÑ ÑÐ·ÑÐº Ð¸Ð»Ð¸ Ð¼ÐµÑÐ¾Ð´ Ð²Ð²Ð¾Ð´Ð° ÑÐµÐºÑÑÐ°, Ð½Ð°Ð¶Ð¼Ð¸ÑÐµ ÐºÐ½Ð¾Ð¿ÐºÑ ""ÐÐ¾Ð´ÑÐ¾Ð±Ð½ÐµÐµ"".", -1, 12, 15, 220, 18 PUSHBUTTON "&ÐÐ¾Ð´ÑÐ¾Ð±Ð½ÐµÐµ...", IDC_DETAIL_BUTTON, 177, 34, 54, 14 GROUPBOX "ÐÐ¾Ð¿Ð¾Ð»Ð½Ð¸ÑÐµÐ»ÑÐ½Ð°Ñ ÑÐ·ÑÐºÐ¾Ð²Ð°Ñ Ð¿Ð¾Ð´Ð´ÐµÑÐ¶ÐºÐ°", -1, 5, 61, 234, 90 LTEXT "ÐÐ¾Ð´Ð´ÐµÑÐ¶ÐºÐ° Ð±Ð¾Ð»ÑÑÐ¸Ð½ÑÑÐ²Ð° ÑÐ·ÑÐºÐ¾Ð² ÑÑÑÐ°Ð½Ð°Ð²Ð»Ð¸Ð²Ð°ÐµÑÑÑ Ð¿Ð¾ ÑÐ¼Ð¾Ð»ÑÐ°Ð½Ð¸Ñ. Ð§ÑÐ¾Ð±Ñ ÑÑÑÐ°Ð½Ð¾Ð²Ð¸ÑÑ Ð´Ð¾Ð¿Ð¾Ð»Ð½Ð¸ÑÐµÐ»ÑÐ½ÑÑ Ð¿Ð¾Ð´Ð´ÐµÑÐ¶ÐºÑ ÑÐ·ÑÐºÐ¾Ð² Ñ Ð¾ÑÐ¾Ð±ÑÐ¼Ð¸ ÑÐ¿Ð¾ÑÐ¾Ð±Ð°Ð¼Ð¸ Ð¿Ð¸ÑÑÐ¼Ð°, ÑÑÑÐ°Ð½Ð¾Ð²Ð¸ÑÐµ ÑÐ¾Ð¾ÑÐ²ÐµÑÑÑÐ²ÑÑÑÐ¸Ðµ ÑÐ»Ð°Ð¶ÐºÐ¸.", -1, 12, 72, 220, 32 @@ -61,9 +61,9 @@ FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "ÐÐ±ÑÐ°Ð·ÑÑ", -1, 7, 7, 230, 53, WS_CHILD | WS_VISIBLE - LTEXT "ÐÐ¾Ð»Ð¾Ð¶.:", -1, 13, 21, 31, 10, WS_CHILD | WS_VISIBLE | WS_GROUP - EDITTEXT IDC_NUMBERSPOSSAMPLE, 43, 19, 72, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP | NOT WS_TABSTOP - LTEXT "ÐÑÑÐ¸Ñ.:", -1, 123, 21, 31, 10, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "ÐÐ¾Ð»Ð¾Ð¶.:", -1, 13, 21, 30, 10, WS_CHILD | WS_VISIBLE | WS_GROUP + EDITTEXT IDC_NUMBERSPOSSAMPLE, 44, 19, 72, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP | NOT WS_TABSTOP + LTEXT "ÐÑÑÐ¸Ñ.:", -1, 123, 21, 30, 10, WS_CHILD | WS_VISIBLE | WS_GROUP EDITTEXT IDC_NUMBERSNEGSAMPLE, 154, 19, 72, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP | NOT WS_TABSTOP LTEXT "&Ð Ð°Ð·Ð´ÐµÐ». ÑÐµÐ»Ð¾Ð¹ Ð¸ Ð´ÑÐ¾Ð±Ð½Ð¾Ð¹ ÑÐ°ÑÑÐ¸:", -1, 8, 67, 125, 10, WS_CHILD | WS_VISIBLE | WS_GROUP COMBOBOX IDC_NUMBERDSYMBOL, 137, 65, 100, 83, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL @@ -91,11 +91,11 @@ FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "ÐÐ±ÑÐ°Ð·ÑÑ", -1, 7, 7, 230, 33, WS_CHILD | WS_VISIBLE - LTEXT "ÐÐ¾Ð»Ð¾Ð¶.:", -1, 13, 21, 31, 10, WS_CHILD | WS_VISIBLE | WS_GROUP - EDITTEXT IDC_CURRENCYPOSSAMPLE, 43, 19, 72, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP | NOT WS_TABSTOP - LTEXT "ÐÑÑÐ¸Ñ.:", -1, 123, 21, 31, 10, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "ÐÐ¾Ð»Ð¾Ð¶.:", -1, 13, 21, 30, 10, WS_CHILD | WS_VISIBLE | WS_GROUP + EDITTEXT IDC_CURRENCYPOSSAMPLE, 44, 19, 72, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP | NOT WS_TABSTOP + LTEXT "ÐÑÑÐ¸Ñ.:", -1, 123, 21, 30, 10, WS_CHILD | WS_VISIBLE | WS_GROUP EDITTEXT IDC_CURRENCYNEGSAMPLE, 154, 19, 72, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP | NOT WS_TABSTOP - LTEXT "Ð&Ð±Ð¾Ð·Ð½Ð°ÑÐµÐ½Ð¸Ðµ Ð´ÐµÐ½ÐµÐ¶Ð½Ð¾Ð¹ ÐµÐ´ÐµÐ½Ð¸ÑÑ:", -1, 8, 51, 125, 10, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Ð&Ð±Ð¾Ð·Ð½Ð°ÑÐµÐ½Ð¸Ðµ Ð´ÐµÐ½ÐµÐ¶Ð½Ð¾Ð¹ ÐµÐ´Ð¸Ð½Ð¸ÑÑ:", -1, 8, 51, 125, 10, WS_CHILD | WS_VISIBLE | WS_GROUP COMBOBOX IDC_CURRENCYSYMBOL, 134, 49, 100, 83, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL LTEXT "Ð¤Ð¾ÑÐ¼Ð°Ñ &Ð¿Ð¾Ð»Ð¾Ð¶. Ð´ÐµÐ½ÐµÐ¶Ð½ÑÑ ÑÑÐ¼Ð¼:", -1, 8, 68, 125, 10, WS_CHILD | WS_VISIBLE | WS_GROUP COMBOBOX IDC_CURRENCYPOSVALUE, 134, 66, 100, 83, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL @@ -130,10 +130,9 @@ GROUPBOX "", -1, 7, 140, 230, 80, WS_VISIBLE LTEXT "ÐÐ±Ð¾Ð·Ð½Ð°ÑÐµÐ½Ð¸Ðµ ÑÐ¾ÑÐ¼Ð°ÑÐ° Ð²ÑÐµÐ¼ÐµÐ½Ð¸\n\n\ h = ÑÐ°Ñ m = Ð¼Ð¸Ð½ÑÑÐ° s = ÑÐµÐºÑÐ½Ð´Ð° t = AM Ð¸Ð»Ð¸ PM\n\n\ -h = 12-ÑÐ°ÑÐ¾Ð²Ð¾Ð¹ ÑÐ¾ÑÐ¼Ð°Ñ ÑÑÑÐ¾Ðº\n\ -H = 24-ÑÐ°ÑÐ¾Ð²Ð¾Ð¹ ÑÐ¾ÑÐ¼Ð°Ñ ÑÑÑÐ¾Ðº\n\ +h/H = 12/24-ÑÐ°ÑÐ¾Ð²Ð¾Ð¹ ÑÐ¾ÑÐ¼Ð°Ñ ÑÑÑÐ¾Ðº\n\ hh, mm, ss = Ñ Ð²ÑÐ²Ð¾Ð´Ð¾Ð¼ Ð½ÑÐ»ÐµÐ¹ Ð² Ð½Ð°ÑÐ°Ð»Ðµ\n\ -h, m, s = Ð±ÐµÐ· Ð²ÑÐ²Ð¾Ð´Ð° Ð½ÑÐ»ÐµÐ¹", -1, 13, 150, 214, 50, WS_CHILD | WS_VISIBLE | WS_GROUP +h, m, s = Ð±ÐµÐ· Ð²ÑÐ²Ð¾Ð´Ð° Ð½ÑÐ»ÐµÐ¹", -1, 13, 150, 214, 60, WS_CHILD | WS_VISIBLE | WS_GROUP END IDD_DATEPAGE DIALOGEX 0, 0, 246, 234 @@ -184,8 +183,8 @@ BEGIN IDS_CUSTOMIZE_TITLE "ÐÐ°ÑÑÑÐ¾Ð¹ÐºÐ° ÑÐµÐ³Ð¸Ð¾Ð½Ð°Ð»ÑÐ½ÑÑ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÐ¾Ð²" IDS_SPAIN "ÐÑÐ¿Ð°Ð½ÑÐºÐ¸Ð¹ (ÐÑÐ¿Ð°Ð½Ð¸Ñ)" - IDS_METRIC "Metric" - IDS_IMPERIAL "Imperial" + IDS_METRIC "ÐÐµÑÑÐ¸ÑÐµÑÐºÐ°Ñ" + IDS_IMPERIAL "ÐÐ¼ÐµÑÐ¸ÐºÐ°Ð½ÑÐºÐ°Ñ" END STRINGTABLE @@ -196,10 +195,10 @@ STRINGTABLE BEGIN - IDS_APPLY_DEFAULT_TITLE "Change default settings" - IDS_APPLY_DEFAULT_TEXT "The settings will be applied to the default user account.\n\n\ -These changes apply to the logon screen and new user accounts.\n\ -The computer must be rebooted, in order to apply the changes to some system services." + IDS_APPLY_DEFAULT_TITLE "ÐÐ·Ð¼ÐµÐ½Ð¸ÑÑ ÑÑÐ°Ð½Ð´Ð°ÑÑÐ½ÑÐµ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÑ" + IDS_APPLY_DEFAULT_TEXT "ÐÐ°ÑÐ°Ð¼ÐµÑÑÑ Ð±ÑÐ´ÑÑ Ð¿ÑÐ¸Ð¼ÐµÐ½ÐµÐ½Ñ Ðº ÑÑÐ°Ð½Ð´Ð°ÑÑÐ½Ð¾Ð¹ ÑÑÐµÑÐ½Ð¾Ð¹ Ð·Ð°Ð¿Ð¸ÑÐ¸.\n\n\ +ÐÑÐ¸ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð±ÑÐ´ÑÑ Ð¿ÑÐ¸Ð¼ÐµÐ½ÐµÐ½Ñ Ðº ÑÐºÑÐ°Ð½Ñ Ð¿ÑÐ¸Ð²ÐµÑÑÑÐ²Ð¸Ñ Ð¸ Ðº Ð½Ð¾Ð²ÑÐ¼ ÑÑÐµÑÐ½ÑÐ¼ Ð·Ð°Ð¿Ð¸ÑÑÐ¼.\n\ +ÐÐ¾Ð¼Ð¿ÑÑÑÐµÑ Ð´Ð¾Ð»Ð¶ÐµÐ½ Ð±ÑÑÑ Ð¿ÐµÑÐµÐ·Ð°Ð³ÑÑÐ¶ÐµÐ½, Ð´Ð»Ñ Ð¿ÑÐ¸Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ð¹ Ðº Ð½ÐµÐºÐ¾ÑÐ¾ÑÑÐ¼ ÑÐ»ÑÐ¶Ð±Ð°Ð¼ ÐÐ¡." END STRINGTABLE @@ -216,4 +215,3 @@ IDS_ERROR_NLS_CODE_REG "ÐÑÐ¾Ð±Ð»ÐµÐ¼Ð° Ð¾ÑÐºÑÑÑÐ¸Ñ ÐºÐ»ÑÑÐ°: HKLM\\SYSTEM\\CurrentControlSet\\Control\\NLS\\CodePage" IDS_ERROR_INPUT_DLL "ÐÐµ ÑÐ´Ð°ÐµÑÑÑ Ð·Ð°Ð¿ÑÑÑÐ¸ÑÑ input.dll" END - Modified: trunk/reactos/dll/cpl/usrmgr/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/lang/ru-RU.… ============================================================================== --- trunk/reactos/dll/cpl/usrmgr/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/usrmgr/lang/ru-RU.rc [iso-8859-1] Sun Nov 29 17:08:13 2015 @@ -12,7 +12,7 @@ PUSHBUTTON "ÐÐ¾Ð±Ð°Ð²Ð¸ÑÑ...", IDC_USERS_ADD, 87, 98, 50, 14 PUSHBUTTON "Ð£Ð´Ð°Ð»Ð¸ÑÑ", IDC_USERS_REMOVE, 141, 98, 50, 14 PUSHBUTTON "Ð¡Ð²Ð¾Ð¹ÑÑÐ²Ð°", IDC_USERS_PROPERTIES, 195, 98, 50, 14 - AUTOCHECKBOX "Ð¢ÑÐµÐ±ÑÐµÑÑÑ Ð¸Ð¼Ñ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ Ð¸ Ð¿Ð°ÑÐ¾Ð»Ñ Ð¿ÑÐ¸ Ð·Ð°Ð³ÑÑÐ·ÐºÐµ ÑÐ¸ÑÑÐµÐ¼Ñ.", IDC_USERS_STARTUP_REQUIRE, 10, 118, 200, 14, WS_DISABLED + AUTOCHECKBOX "Ð¢ÑÐµÐ±ÑÐµÑÑÑ Ð¸Ð¼Ñ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ Ð¸ Ð¿Ð°ÑÐ¾Ð»Ñ Ð¿ÑÐ¸ Ð·Ð°Ð³ÑÑÐ·ÐºÐµ ÑÐ¸ÑÑÐµÐ¼Ñ", IDC_USERS_STARTUP_REQUIRE, 10, 118, 220, 14, WS_DISABLED PUSHBUTTON "Ð¡Ð±ÑÐ¾ÑÐ¸ÑÑ Ð¿Ð°ÑÐ¾Ð»Ñ", IDC_USERS_RESET, 165, 200, 80, 14, WS_DISABLED END @@ -76,12 +76,12 @@ LTEXT "Ð¡ÑÐµÐ½Ð°ÑÐ¸Ð¹ Ð²ÑÐ¾Ð´Ð°:", -1, 16, 40, 80, 8 EDITTEXT IDC_USER_PROFILE_SCRIPT, 88, 37, 150, 13, ES_AUTOHSCROLL GROUPBOX "ÐÐ¾Ð¼Ð°ÑÐ½ÑÑ Ð¿Ð°Ð¿ÐºÐ°", -1, 7, 68, 238, 54 - AUTORADIOBUTTON "ÐÐ¾ÐºÐ°Ð»ÑÐ½ÑÐ¹ Ð¿ÑÑÑ:", IDC_USER_PROFILE_LOCAL, 16, 83, 80, 10 + AUTORADIOBUTTON "ÐÐ¾ÐºÐ°Ð»ÑÐ½ÑÐ¹ Ð¿ÑÑÑ:", IDC_USER_PROFILE_LOCAL, 16, 83, 70, 10 AUTORADIOBUTTON "ÐÐ¾Ð´ÐºÐ»ÑÑÐ¸ÑÑ:", IDC_USER_PROFILE_REMOTE, 16, 100, 60, 10 EDITTEXT IDC_USER_PROFILE_LOCAL_PATH, 88, 81, 150, 13, ES_AUTOHSCROLL COMBOBOX IDC_USER_PROFILE_DRIVE, 78, 99, 26, 153, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL - LTEXT "Ð½Ð°:", -1, 112, 101, 12, 8 + LTEXT "Ðº:", -1, 112, 101, 12, 8 EDITTEXT IDC_USER_PROFILE_REMOTE_PATH, 130, 99, 108, 13, ES_AUTOHSCROLL END Modified: trunk/reactos/dll/win32/browseui/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/lang/ru… ============================================================================== --- trunk/reactos/dll/win32/browseui/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/lang/ru-RU.rc [iso-8859-1] Sun Nov 29 17:08:13 2015 @@ -267,8 +267,8 @@ STRINGTABLE BEGIN - IDS_BACK "Back to %s" - IDS_FORWARD "Forward to %s" + IDS_BACK "ÐÐ°Ð·Ð°Ð´ Ð½Ð° ""%s""" + IDS_FORWARD "ÐÐ¿ÐµÑÐµÐ´ Ð½Ð° ""%s""" END STRINGTABLE Modified: trunk/reactos/dll/win32/devmgr/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/ru-R… ============================================================================== --- trunk/reactos/dll/win32/devmgr/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/lang/ru-RU.rc [iso-8859-1] Sun Nov 29 17:08:13 2015 @@ -25,7 +25,7 @@ IDS_UPDATEDRV "Ð&Ð±Ð½Ð¾Ð²Ð¸ÑÑ Ð´ÑÐ°Ð¹Ð²ÐµÑ..." IDS_REBOOT "ÐÐµÑ&ÐµÐ·Ð°Ð³ÑÑÐ·Ð¸ÑÑ ÐºÐ¾Ð¼Ð¿ÑÑÑÐµÑ..." IDS_NOTAVAILABLE "ÐÐµÐ´Ð¾ÑÑÑÐ¿Ð½Ð¾" - IDS_NOTDIGITALLYSIGNED "ÐÐµÑ ÑÐ¸ÑÑÐ¾Ð²Ð¾Ð¹ Ð¿Ð¾Ð´Ð¿Ð¸ÑÐ¸" + IDS_NOTDIGITALLYSIGNED "Ð¦Ð¸ÑÑÐ¾Ð²Ð°Ñ Ð¿Ð¾Ð´Ð¿Ð¸ÑÑ Ð¾ÑÑÑÑÑÑÐ²ÑÐµÑ" IDS_NODRIVERS "Ð¤Ð°Ð¹Ð»Ñ Ð´ÑÐ°Ð¹Ð²ÐµÑÐ¾Ð² Ð´Ð»Ñ ÑÑÐ¾Ð³Ð¾ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð° Ð½Ðµ ÑÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ñ Ð¸Ð»Ð¸ Ð½Ðµ Ð±ÑÐ»Ð¸ Ð·Ð°Ð³ÑÑÐ¶ÐµÐ½Ñ." IDS_RESOURCE_COLUMN "Ð¢Ð¸Ð¿ ÑÐµÑÑÑÑÐ°" IDS_SETTING_COLUMN "ÐÐ°ÑÑÑÐ¾Ð¹ÐºÐ¸" @@ -253,12 +253,12 @@ MENUITEM "Action", IDC_ACTIONMENU POPUP "View" BEGIN - MENUITEM "Devices by type", IDC_DEVBYTYPE - MENUITEM "Devices by connection", IDC_DEVBYCONN - MENUITEM "Resources by type", IDC_RESBYTYPE, GRAYED - MENUITEM "Resources by connection", IDC_RESBYCONN, GRAYED + MENUITEM "&Ð£ÑÑÑÐ¾Ð¹ÑÑÐ²Ð° Ð¿Ð¾ ÑÐ¸Ð¿Ñ", IDC_DEVBYTYPE + MENUITEM "Ð£ÑÑÑÐ¾Ð¹ÑÑÐ²Ð° Ð¿Ð¾ Ð¿Ð¾Ð´&ÐºÐ»ÑÑÐµÐ½Ð¸Ñ", IDC_DEVBYCONN + MENUITEM "&Ð ÐµÑÑÑÑÑ Ð¿Ð¾ ÑÐ¸Ð¿Ñ", IDC_RESBYTYPE, GRAYED + MENUITEM "Ð ÐµÑÑÑÑÑ Ð¿Ð¾ Ð¿Ð¾Ð´Ðº&Ð»ÑÑÐµÐ½Ð¸Ñ", IDC_RESBYCONN, GRAYED MENUITEM SEPARATOR - MENUITEM "Show hidden devices", IDC_SHOWHIDDEN + MENUITEM "ÐÐ¾ÐºÐ°Ð·Ð°ÑÑ &ÑÐºÑÑÑÑÐµ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð°", IDC_SHOWHIDDEN END POPUP "Help" BEGIN @@ -269,50 +269,50 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_APPNAME "ReactOS Device Manager" - IDS_CONFIRM_DISABLE "Disabling this device will cause it to stop functioning.\r\nDo you really want to disable it?" - IDS_CONFIRM_UNINSTALL "Warning: You are about to uninstall this device from your system.\r\nDo you want to continue?" + IDS_APPNAME "ÐÐ¸ÑÐ¿ÐµÑÑÐµÑ ÑÑÑÑÐ¾Ð¹ÑÑÐ² ReactOS" + IDS_CONFIRM_DISABLE "ÐÑÐºÐ»ÑÑÐµÐ½Ð¸Ðµ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð° Ð¾Ð·Ð½Ð°ÑÐ°ÐµÑ, ÑÑÐ¾ Ð¾Ð½Ð¾ Ð¿ÐµÑÐµÑÑÐ°Ð½ÐµÑ ÑÐ°Ð±Ð¾ÑÐ°ÑÑ. ÐÑÐºÐ»ÑÑÐ¸ÑÑ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð¾?" + IDS_CONFIRM_UNINSTALL "ÐÑÐµÐ´ÑÐ¿ÑÐµÐ¶Ð´ÐµÐ½Ð¸Ðµ: Ð¡ÐµÐ¹ÑÐ°Ñ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð¾ Ð±ÑÐ´ÐµÑ ÑÐ´Ð°Ð»ÐµÐ½Ð¾ Ð¸Ð· ÑÐ¸ÑÑÐµÐ¼Ñ.\r\nÐÑ ÑÐ¾ÑÐ¸ÑÐµ Ð¿ÑÐ¾Ð´Ð¾Ð»Ð¶Ð¸ÑÑ?" END STRINGTABLE DISCARDABLE BEGIN - IDS_MENU_UPDATE "Update driver software..." - IDS_MENU_ENABLE "Enable" - IDS_MENU_DISABLE "Disable" - IDS_MENU_UNINSTALL "Uninstall" - IDS_MENU_SCAN "Scan for hardware changes" - IDS_MENU_ADD "Add hardware" - IDS_MENU_PROPERTIES "Properties" + IDS_MENU_UPDATE "&ÐÐ±Ð½Ð¾Ð²Ð¸ÑÑ Ð´ÑÐ°Ð¹Ð²ÐµÑ..." + IDS_MENU_ENABLE "&ÐÐºÐ»ÑÑÐ¸ÑÑ" + IDS_MENU_DISABLE "&ÐÑÐºÐ»ÑÑÐ¸ÑÑ" + IDS_MENU_UNINSTALL "&Ð£Ð´Ð°Ð»Ð¸ÑÑ" + IDS_MENU_SCAN "Ð&Ð±Ð½Ð¾Ð²Ð¸ÑÑ ÐºÐ¾Ð½ÑÐ¸Ð³ÑÑÐ°ÑÐ¸Ñ Ð¾Ð±Ð¾ÑÑÐ´Ð¾Ð²Ð°Ð½Ð¸Ñ" + IDS_MENU_ADD "&ÐÐ¾Ð±Ð°Ð²Ð¸ÑÑ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð¾" + IDS_MENU_PROPERTIES "&Ð¡Ð²Ð¾Ð¹ÑÑÐ²Ð°" END STRINGTABLE DISCARDABLE BEGIN - IDS_TOOLTIP_PROPERTIES "Properties" - IDS_TOOLTIP_SCAN "Scan for hardware changes" - IDS_TOOLTIP_ENABLE "Enable" - IDS_TOOLTIP_DISABLE "Disable" - IDS_TOOLTIP_UPDATE "Update Driver Software" - IDS_TOOLTIP_UNINSTALL "Uninstall" + IDS_TOOLTIP_PROPERTIES "Ð¡Ð²Ð¾Ð¹ÑÑÐ²Ð°" + IDS_TOOLTIP_SCAN "ÐÐ±Ð½Ð¾Ð²Ð¸ÑÑ ÐºÐ¾Ð½ÑÐ¸Ð³ÑÑÐ°ÑÐ¸Ñ Ð¾Ð±Ð¾ÑÑÐ´Ð¾Ð²Ð°Ð½Ð¸Ñ" + IDS_TOOLTIP_ENABLE "ÐÐºÐ»ÑÑÐ¸ÑÑ" + IDS_TOOLTIP_DISABLE "ÐÑÐºÐ»ÑÑÐ¸ÑÑ" + IDS_TOOLTIP_UPDATE "ÐÐ±Ð½Ð¾Ð²Ð¸ÑÑ Ð´ÑÐ°Ð¹Ð²ÐµÑ" + IDS_TOOLTIP_UNINSTALL "Ð£Ð´Ð°Ð»Ð¸ÑÑ" END /* Hints */ STRINGTABLE DISCARDABLE BEGIN IDS_HINT_BLANK " " - IDS_HINT_PROPERTIES " Open property dialog for the current selection." - IDS_HINT_SCAN " Scan for changed or new plug and play devices." - IDS_HINT_ENABLE " Enables the selected device." - IDS_HINT_DISABLE " Disables the selected device." - IDS_HINT_UPDATE " Launches the Update Driver Software wizard for the selected device." - IDS_HINT_UNINSTALL " Uninstalls the driver for the selected device." - IDS_HINT_ADD " Adds a legacy (non-Plug and Play) device to the computer." - IDS_HINT_ABOUT " About ReactOS Device Manager." - IDS_HINT_EXIT " Exits the program." - - IDS_HINT_DEV_BY_TYPE " Displays devices by hardware type." - IDS_HINT_DEV_BY_CONN " Displays devices by connection." - IDS_HINT_RES_BY_TYPE " Displays resources by type." - IDS_HINT_RES_BY_CONN " Displays resources by connection type." - IDS_HINT_SHOW_HIDDEN " Displays legacy devices and devices that are no longer installed." + IDS_HINT_PROPERTIES " ÐÑÐºÑÑÑÐ¸Ðµ ÑÑÑÐ°Ð½Ð¸ÑÑ ÑÐ²Ð¾Ð¹ÑÑÐ² Ð´Ð»Ñ Ð²ÑÐ´ÐµÐ»ÐµÐ½Ð½Ð¾Ð³Ð¾ Ð¾Ð±ÑÐµÐºÑÐ°." + IDS_HINT_SCAN " ÐÑÐ¾Ð²ÐµÑÐºÐ° Ð½Ð° Ð½Ð°Ð»Ð¸ÑÐ¸Ðµ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ð¹ Ð¸Ð»Ð¸ Ð½Ð¾Ð²ÑÑ ÑÑÑÑÐ¾Ð¹ÑÑÐ² Plug and Play." + IDS_HINT_ENABLE " ÐÐºÐ»ÑÑÐµÐ½Ð¸Ðµ Ð²ÑÐ±ÑÐ°Ð½Ð½Ð¾Ð³Ð¾ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð°." + IDS_HINT_DISABLE " ÐÑÐºÐ»ÑÑÐµÐ½Ð¸Ðµ Ð²ÑÐ±ÑÐ°Ð½Ð½Ð¾Ð³Ð¾ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð°." + IDS_HINT_UPDATE " ÐÐ°Ð¿ÑÑÐº Ð¼Ð°ÑÑÐµÑÐ° Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ð´ÑÐ°Ð¹Ð²ÐµÑÐ¾Ð² Ð´Ð»Ñ Ð²ÑÐ´ÐµÐ»ÐµÐ½Ð½Ð¾Ð³Ð¾ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð°." + IDS_HINT_UNINSTALL " Ð£Ð´Ð°Ð»ÐµÐ½Ð¸Ðµ Ð´ÑÐ°Ð¹Ð²ÐµÑÐ° Ð´Ð»Ñ Ð²ÑÐ±ÑÐ°Ð½Ð½Ð¾Ð³Ð¾ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð°." + IDS_HINT_ADD " ÐÐ¾Ð±Ð°Ð²Ð¸ÑÑ ÑÑÐ°ÑÐ¾Ðµ (Ð½Ðµ Plug-and-Play) ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð¾ Ð½Ð° ÑÑÐ¾Ñ ÐºÐ¾Ð¼Ð¿ÑÑÑÐµÑ." + IDS_HINT_ABOUT " Ð Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ðµ ÐÐ¸ÑÐ¿ÐµÑÑÐµÑ ÑÑÑÑÐ¾Ð¹ÑÑÐ² ReactOS." + IDS_HINT_EXIT " ÐÑÑÐ¾Ð´ Ð¸Ð· Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ñ." + + IDS_HINT_DEV_BY_TYPE " ÐÐ¾ÐºÐ°Ð·ÑÐ²Ð°ÐµÑ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð°, Ð¾ÑÑÐ¾ÑÑÐ¸ÑÐ¾Ð²Ð°Ð½Ð½ÑÐµ Ð¿Ð¾ ÑÐ¸Ð¿Ñ Ð¾Ð±Ð¾ÑÑÐ´Ð¾Ð²Ð°Ð½Ð¸Ñ." + IDS_HINT_DEV_BY_CONN " ÐÐ¾ÐºÐ°Ð·ÑÐ²Ð°ÐµÑ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð°, Ð¾ÑÑÐ¾ÑÑÐ¸ÑÐ¾Ð²Ð°Ð½Ð½ÑÐµ Ð¿Ð¾ Ð¿Ð¾Ð´ÐºÐ»ÑÑÐµÐ½Ð¸Ñ." + IDS_HINT_RES_BY_TYPE " ÐÐ¾ÐºÐ°Ð·ÑÐ²Ð°ÐµÑ ÑÐµÑÑÑÑÑ, Ð¾ÑÑÐ¾ÑÑÐ¸ÑÐ¾Ð²Ð°Ð½Ð½ÑÐµ Ð¿Ð¾ ÑÐ¸Ð¿Ñ." + IDS_HINT_RES_BY_CONN " ÐÐ¾ÐºÐ°Ð·ÑÐ²Ð°ÐµÑ ÑÐµÑÑÑÑÑ, Ð¾ÑÑÐ¾ÑÑÐ¸ÑÐ¾Ð²Ð°Ð½Ð½ÑÐµ Ð¿Ð¾ Ð¿Ð¾Ð´ÐºÐ»ÑÑÐµÐ½Ð¸Ñ." + IDS_HINT_SHOW_HIDDEN " ÐÐ¾ÐºÐ°Ð·ÑÐ²Ð°ÐµÑ ÑÐ´Ð°Ð»ÐµÐ½Ð½ÑÐµ Ð¸Ð· ÑÐ¸ÑÑÐµÐ¼Ñ Ð¸ ÑÑÑÐ°ÑÐµÐ²ÑÐ¸Ðµ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð°." IDS_HINT_SYS_RESTORE " Restores this window to normal size." IDS_HINT_SYS_MOVE " Moves this window." 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] Sun Nov 29 17:08:13 2015 @@ -133,7 +133,7 @@ LTEXT ")", IDC_STATIC, 153, 65, 5, 10 LTEXT "Copyright 1998-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 - LTEXT " ReactOS Team\0", IDC_STATIC, 105, 75, 53, 10 + LTEXT " ÐÐ¾Ð¼Ð°Ð½Ð´Ð° ReactOS\0", IDC_STATIC, 105, 75, 60, 10 LTEXT "", IDC_ABOUT_OTHERSTUFF, 35, 90, 180, 20 LTEXT "ÐÐ°Ð½Ð½Ð°Ñ Ð²ÐµÑÑÐ¸Ñ ReactOS Ð·Ð°ÑÐµÐ³Ð¸ÑÑÑÐ¸ÑÐ¾Ð²Ð°Ð½Ð° Ð½Ð°:", IDC_STATIC, 35, 115, 180, 10 LTEXT "", IDC_ABOUT_REG_USERNAME, 45, 125, 180, 10 @@ -753,7 +753,7 @@ IDS_NEWFOLDER "ÐÐ¾Ð²Ð°Ñ Ð¿Ð°Ð¿ÐºÐ°" IDS_DRIVE_FIXED "ÐÐ¾ÐºÐ°Ð»ÑÐ½ÑÐ¹ Ð´Ð¸ÑÐº" - IDS_DRIVE_CDROM "CD Ð¿ÑÐ¸Ð²Ð¾Ð´" + IDS_DRIVE_CDROM "CD-Ð´Ð¸ÑÐºÐ¾Ð²Ð¾Ð´" IDS_DRIVE_NETWORK "Ð¡ÐµÑÐµÐ²Ð¾Ð¹ Ð´Ð¸ÑÐº" IDS_DRIVE_FLOPPY "3.5 Floppy" IDS_DRIVE_REMOVABLE "Ð¡ÑÐµÐ¼Ð½ÑÐ¹ Ð´Ð¸ÑÐº" @@ -782,7 +782,7 @@ IDS_BAT_FILE "ÐÐ°ÐºÐµÑÐ½ÑÐ¹ ÑÐ°Ð¹Ð» ReactOS" IDS_CMD_FILE "ÐÐ¾Ð¼Ð°Ð½Ð´Ð½ÑÐ¹ ÑÐºÑÐ¸Ð¿Ñ ReactOS" IDS_COM_FILE "ÐÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ DOS" - IDS_CPL_FILE "ÐÐ¿Ð¿Ð»ÐµÑ Ð¿Ð°Ð½ÐµÐ»Ð¸ ÑÐ¿ÑÐ°Ð²Ð»ÐµÐ½Ð¸Ñ" + IDS_CPL_FILE "ÐÐ»ÐµÐ¼ÐµÐ½Ñ Ð¿Ð°Ð½ÐµÐ»Ð¸ ÑÐ¿ÑÐ°Ð²Ð»ÐµÐ½Ð¸Ñ" IDS_CUR_FILE "ÐÑÑÑÐ¾Ñ" IDS_DLL_FILE "Ð Ð°ÑÑÐ¸ÑÐµÐ½Ð¸Ðµ Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ" IDS_DRV_FILE "ÐÑÐ°Ð¹Ð²ÐµÑ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð°" @@ -791,11 +791,11 @@ IDS_TTF_FILE "Ð¤Ð°Ð¹Ð» ÑÑÐ¸ÑÑÐ° TrueType" IDS_OTF_FILE "Ð¤Ð°Ð¹Ð» ÑÑÐ¸ÑÑÐ° OpenType" IDS_HLP_FILE "Ð¤Ð°Ð¹Ð» ÑÐ¿ÑÐ°Ð²ÐºÐ¸" - IDS_ICO_FILE "Icon" + IDS_ICO_FILE "ÐÐ½Ð°ÑÐ¾Ðº" IDS_INI_FILE "Ð¤Ð°Ð¹Ð» ÐºÐ¾Ð½ÑÐ¸Ð³ÑÑÐ°ÑÐ¸Ð¸" IDS_LNK_FILE "Ð¯ÑÐ»ÑÐº" - IDS_PIF_FILE "NT VDM Program Information File" - IDS_SCR_FILE "Screen Saver" + IDS_PIF_FILE "ÐÐ½ÑÐ¾ÑÐ¼Ð°ÑÐ¸Ñ Ð¾ Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ð¸ NT VDM" + IDS_SCR_FILE "ÐÐ°ÑÑÐ°Ð²ÐºÐ°" IDS_SYS_FILE "Ð¡Ð¸ÑÑÐµÐ¼Ð½ÑÐ¹ ÑÐ°Ð¹Ð»" IDS_VXD_FILE "ÐÑÐ°Ð¹Ð²ÐµÑ Ð²Ð¸ÑÑÑÐ°Ð»ÑÐ½Ð¾Ð³Ð¾ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð°" @@ -825,6 +825,6 @@ IDS_EXE_DESCRIPTION "ÐÐ¿Ð¸ÑÐ°Ð½Ð¸Ðµ:" IDS_MENU_EMPTY "(Ð¿ÑÑÑÐ¾)" - IDS_OBJECTS "%d Objects" - IDS_OBJECTS_SELECTED "%d Objects Selected" -END + IDS_OBJECTS "ÐÐ»ÐµÐ¼ÐµÐ½ÑÐ¾Ð²: %d" + IDS_OBJECTS_SELECTED "ÐÑÐ±ÑÐ°Ð½Ð¾ ÑÐ»ÐµÐ¼ÐµÐ½ÑÐ¾Ð²: %d" +END Modified: trunk/reactos/dll/win32/shimgvw/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shimgvw/lang/ru-… ============================================================================== --- trunk/reactos/dll/win32/shimgvw/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shimgvw/lang/ru-RU.rc [iso-8859-1] Sun Nov 29 17:08:13 2015 @@ -18,11 +18,11 @@ STRINGTABLE BEGIN - // IDS_EMF_FILE "EMF Image" - IDS_GIF_FILE "GIF Image" - IDS_JPG_FILE "JPEG Image" - IDS_BMP_FILE "Bitmap Image" - IDS_PNG_FILE "PNG Image" - // IDS_TIF_FILE "TIF Image" - // IDS_WMF_FILE "WMF Image" + // IDS_EMF_FILE "EMF Ð¸Ð·Ð¾Ð±ÑÐ°Ð¶ÐµÐ½Ð¸Ðµ" + IDS_GIF_FILE "GIF Ð¸Ð·Ð¾Ð±ÑÐ°Ð¶ÐµÐ½Ð¸Ðµ" + IDS_JPG_FILE "JPEG Ð¸Ð·Ð¾Ð±ÑÐ°Ð¶ÐµÐ½Ð¸Ðµ" + IDS_BMP_FILE "Bitmap Ð¸Ð·Ð¾Ð±ÑÐ°Ð¶ÐµÐ½Ð¸Ðµ" + IDS_PNG_FILE "PNG Ð¸Ð·Ð¾Ð±ÑÐ°Ð¶ÐµÐ½Ð¸Ðµ" + // IDS_TIF_FILE "TIF Ð¸Ð·Ð¾Ð±ÑÐ°Ð¶ÐµÐ½Ð¸Ðµ" + // IDS_WMF_FILE "WMF Ð¸Ð·Ð¾Ð±ÑÐ°Ð¶ÐµÐ½Ð¸Ðµ" END Modified: trunk/reactos/subsystems/mvdm/ntvdm/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/lang… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/lang/ru-RU.rc [iso-8859-1] Sun Nov 29 17:08:13 2015 @@ -2,8 +2,8 @@ STRINGTABLE BEGIN - IDS_CAPTURE_MOUSE, "&Capture Mouse Pointer" - IDS_RELEASE_MOUSE, "&Release Mouse Pointer" + IDS_CAPTURE_MOUSE, "&ÐÐ°ÑÐ²Ð°ÑÐ¸ÑÑ ÑÐºÐ°Ð·Ð°ÑÐµÐ»Ñ Ð¼ÑÑÐ¸" + IDS_RELEASE_MOUSE, "&ÐÑÐ¿ÑÑÑÐ¸ÑÑ ÑÐºÐ°Ð·Ð°ÑÐµÐ»Ñ Ð¼ÑÑÐ¸" IDS_VDM_MENU , "ReactOS &VDM" END @@ -11,12 +11,12 @@ BEGIN IDS_VDM_DUMPMEM_TXT , "ÐÐ°Ð¼Ð¿ Ð¿Ð°Ð¼ÑÑÐ¸ (&Ð¢ÐµÐºÑÑÐ¾Ð²ÑÐ¹)" IDS_VDM_DUMPMEM_BIN , "ÐÐ°Ð¼Ð¿ Ð¿Ð°Ð¼ÑÑÐ¸ (&ÐÐ¸Ð½Ð°ÑÐ½ÑÐ¹)" - IDS_VDM_MOUNT_FLOPPY, "Insert a floppy in drive %d <%s>..." - IDS_VDM_EJECT_FLOPPY, "Eject floppy from drive %d" + IDS_VDM_MOUNT_FLOPPY, "ÐÑÑÐ°Ð²Ð¸ÑÑ Ð´Ð¸ÑÐºÐµÑÑ Ð² Ð¿ÑÐ¸Ð²Ð¾Ð´ %d <%s>..." + IDS_VDM_EJECT_FLOPPY, "ÐÐ·Ð²Ð»ÐµÑÑ Ð´Ð¸ÑÐºÐµÑÑ Ð¸Ð· Ð¿ÑÐ¸Ð²Ð¾Ð´Ð° %d" IDS_VDM_QUIT , "&ÐÑÐ¹ÑÐ¸ Ð¸Ð· ReactOS VDM" END STRINGTABLE BEGIN - IDS_NO_MEDIA, "No media" + IDS_NO_MEDIA, "ÐÐµÑ Ð¼ÐµÐ´Ð¸Ð°" END

1 0

[akhaldi] 70201: [ADVAPI32] Apply Wine commit 985e226 by Hans Leidekker: Support parsing mandatory label ACE strings. CORE-10536
by akhaldi＠svn.reactos.org 29 Nov '15

29 Nov '15

Author: akhaldi Date: Sun Nov 29 16:50:05 2015 New Revision: 70201 URL: http://svn.reactos.org/svn/reactos?rev=70201&view=rev Log: [ADVAPI32] Apply Wine commit 985e226 by Hans Leidekker: Support parsing mandatory label ACE strings. CORE-10536 Modified: trunk/reactos/dll/win32/advapi32/wine/security.c Modified: trunk/reactos/dll/win32/advapi32/wine/security.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/wine/se… ============================================================================== --- trunk/reactos/dll/win32/advapi32/wine/security.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/wine/security.c [iso-8859-1] Sun Nov 29 16:50:05 2015 @@ -122,6 +122,10 @@ static const SID sidWorld = { SID_REVISION, 1, { SECURITY_WORLD_SID_AUTHORITY} , { SECURITY_WORLD_RID } }; +static const WCHAR SDDL_NO_READ_UP[] = {'N','R',0}; +static const WCHAR SDDL_NO_WRITE_UP[] = {'N','W',0}; +static const WCHAR SDDL_NO_EXECUTE_UP[] = {'N','X',0}; + /* * ACE types */ @@ -131,6 +135,7 @@ static const WCHAR SDDL_OBJECT_ACCESS_DENIED[] = {'O','D',0}; static const WCHAR SDDL_AUDIT[] = {'A','U',0}; static const WCHAR SDDL_ALARM[] = {'A','L',0}; +static const WCHAR SDDL_MANDATORY_LABEL[] = {'M','L',0}; static const WCHAR SDDL_OBJECT_AUDIT[] = {'O','U',0}; static const WCHAR SDDL_OBJECT_ALARM[] = {'O','L',0}; @@ -2246,6 +2251,7 @@ { SDDL_AUDIT, SYSTEM_AUDIT_ACE_TYPE }, { SDDL_ACCESS_ALLOWED, ACCESS_ALLOWED_ACE_TYPE }, { SDDL_ACCESS_DENIED, ACCESS_DENIED_ACE_TYPE }, + { SDDL_MANDATORY_LABEL,SYSTEM_MANDATORY_LABEL_ACE_TYPE }, /* { SDDL_OBJECT_ACCESS_ALLOWED, ACCESS_ALLOWED_OBJECT_ACE_TYPE }, { SDDL_OBJECT_ACCESS_DENIED, ACCESS_DENIED_OBJECT_ACE_TYPE }, @@ -2356,6 +2362,10 @@ { SDDL_KEY_READ, KEY_READ }, { SDDL_KEY_WRITE, KEY_WRITE }, { SDDL_KEY_EXECUTE, KEY_EXECUTE }, + + { SDDL_NO_READ_UP, SYSTEM_MANDATORY_LABEL_NO_READ_UP }, + { SDDL_NO_WRITE_UP, SYSTEM_MANDATORY_LABEL_NO_WRITE_UP }, + { SDDL_NO_EXECUTE_UP, SYSTEM_MANDATORY_LABEL_NO_EXECUTE_UP }, { NULL, 0 }, };

1 0

[akhaldi] 70200: [RTL] Partially sync wait.c with Wine Staging 1.7.55. By Samuel Serapión. CORE-10536 CORE-10577
by akhaldi＠svn.reactos.org 29 Nov '15

29 Nov '15

Author: akhaldi Date: Sun Nov 29 16:35:51 2015 New Revision: 70200 URL: http://svn.reactos.org/svn/reactos?rev=70200&view=rev Log: [RTL] Partially sync wait.c with Wine Staging 1.7.55. By Samuel Serapión. CORE-10536 CORE-10577 Modified: trunk/reactos/lib/rtl/wait.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/lib/rtl/wait.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/wait.c?rev=70200&r… ============================================================================== --- trunk/reactos/lib/rtl/wait.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/wait.c [iso-8859-1] Sun Nov 29 16:35:51 2015 @@ -44,7 +44,7 @@ { PRTLP_WAIT Wait = (PRTLP_WAIT) Arg; NTSTATUS Status; - BOOLEAN alertable = (Wait->Flags & WT_EXECUTEINIOTHREAD) ? TRUE : FALSE; + BOOLEAN alertable = (Wait->Flags & WT_EXECUTEINIOTHREAD) != 0; HANDLE handles[2] = { Wait->Object, Wait->CancelEvent }; LARGE_INTEGER timeout; HANDLE completion_event; @@ -84,7 +84,7 @@ if (Wait->Flags & WT_EXECUTEONLYONCE) break; } - else + else if (Status != STATUS_USER_APC) break; } @@ -157,7 +157,7 @@ Status = NtCreateEvent( &Wait->CancelEvent, EVENT_ALL_ACCESS, NULL, - TRUE, + NotificationEvent, FALSE ); if (Status != STATUS_SUCCESS) @@ -166,9 +166,12 @@ return Status; } + Flags = Flags & (WT_EXECUTEINIOTHREAD | WT_EXECUTEINPERSISTENTTHREAD | + WT_EXECUTELONGFUNCTION | WT_TRANSFER_IMPERSONATION); + Status = RtlQueueWorkItem( Wait_thread_proc, Wait, - Flags & ~WT_EXECUTEONLYONCE ); + Flags ); if (Status != STATUS_SUCCESS) { @@ -214,7 +217,7 @@ Status = NtCreateEvent( &CompletionEvent, EVENT_ALL_ACCESS, NULL, - TRUE, + NotificationEvent, FALSE ); if (Status != STATUS_SUCCESS) Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sun Nov 29 16:35:51 2015 @@ -254,6 +254,7 @@ reactos/lib/rtl/actctx.c # Partly synced with WineStaging-1.7.55 reactos/lib/rtl/timerqueue.c # Partly synced with WineStaging-1.7.55 +reactos/lib/rtl/wait.c # Partly synced with WineStaging-1.7.55 advapi32 - reactos/dll/win32/advapi32/wine/cred.c # Synced to WineStaging-1.7.55

1 0

[akhaldi] 70199: [MBEDTLS] Update to v2.2.0. By Ismael Ferreras Morezuelas. CORE-10561
by akhaldi＠svn.reactos.org 29 Nov '15

29 Nov '15

Author: akhaldi Date: Sun Nov 29 16:30:45 2015 New Revision: 70199 URL: http://svn.reactos.org/svn/reactos?rev=70199&view=rev Log: [MBEDTLS] Update to v2.2.0. By Ismael Ferreras Morezuelas. CORE-10561 Added: trunk/reactos/dll/3rdparty/mbedtls/ecjpake.c (with props) trunk/reactos/include/reactos/libs/mbedtls/ecjpake.h (with props) Modified: trunk/reactos/dll/3rdparty/mbedtls/asn1write.c trunk/reactos/dll/3rdparty/mbedtls/bignum.c trunk/reactos/dll/3rdparty/mbedtls/ecp.c trunk/reactos/dll/3rdparty/mbedtls/oid.c trunk/reactos/dll/3rdparty/mbedtls/pkparse.c trunk/reactos/dll/3rdparty/mbedtls/pkwrite.c trunk/reactos/dll/3rdparty/mbedtls/rsa.c trunk/reactos/dll/3rdparty/mbedtls/ssl_ciphersuites.c trunk/reactos/dll/3rdparty/mbedtls/ssl_cli.c trunk/reactos/dll/3rdparty/mbedtls/ssl_srv.c trunk/reactos/dll/3rdparty/mbedtls/ssl_tls.c trunk/reactos/dll/3rdparty/mbedtls/version_features.c trunk/reactos/dll/3rdparty/mbedtls/x509_create.c trunk/reactos/dll/3rdparty/mbedtls/x509_crt.c trunk/reactos/include/reactos/libs/mbedtls/bn_mul.h trunk/reactos/include/reactos/libs/mbedtls/check_config.h trunk/reactos/include/reactos/libs/mbedtls/config.h trunk/reactos/include/reactos/libs/mbedtls/ecp.h trunk/reactos/include/reactos/libs/mbedtls/pk.h trunk/reactos/include/reactos/libs/mbedtls/ssl.h trunk/reactos/include/reactos/libs/mbedtls/ssl_cache.h trunk/reactos/include/reactos/libs/mbedtls/ssl_ciphersuites.h trunk/reactos/include/reactos/libs/mbedtls/ssl_internal.h trunk/reactos/include/reactos/libs/mbedtls/version.h trunk/reactos/include/reactos/libs/mbedtls/x509_crt.h trunk/reactos/media/doc/3rd Party Files.txt [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/3rdparty/mbedtls/asn1write.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mbedtls/asn1w… Modified: trunk/reactos/dll/3rdparty/mbedtls/bignum.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mbedtls/bignu… Added: trunk/reactos/dll/3rdparty/mbedtls/ecjpake.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mbedtls/ecjpa… Modified: trunk/reactos/dll/3rdparty/mbedtls/ecp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mbedtls/ecp.c… Modified: trunk/reactos/dll/3rdparty/mbedtls/oid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mbedtls/oid.c… Modified: trunk/reactos/dll/3rdparty/mbedtls/pkparse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mbedtls/pkpar… Modified: trunk/reactos/dll/3rdparty/mbedtls/pkwrite.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mbedtls/pkwri… Modified: trunk/reactos/dll/3rdparty/mbedtls/rsa.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mbedtls/rsa.c… Modified: trunk/reactos/dll/3rdparty/mbedtls/ssl_ciphersuites.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mbedtls/ssl_c… Modified: trunk/reactos/dll/3rdparty/mbedtls/ssl_cli.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mbedtls/ssl_c… Modified: trunk/reactos/dll/3rdparty/mbedtls/ssl_srv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mbedtls/ssl_s… Modified: trunk/reactos/dll/3rdparty/mbedtls/ssl_tls.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mbedtls/ssl_t… Modified: trunk/reactos/dll/3rdparty/mbedtls/version_features.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mbedtls/versi… Modified: trunk/reactos/dll/3rdparty/mbedtls/x509_create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mbedtls/x509_… Modified: trunk/reactos/dll/3rdparty/mbedtls/x509_crt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mbedtls/x509_… Modified: trunk/reactos/include/reactos/libs/mbedtls/bn_mul.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/mbedt… Modified: trunk/reactos/include/reactos/libs/mbedtls/check_config.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/mbedt… Modified: trunk/reactos/include/reactos/libs/mbedtls/config.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/mbedt… Added: trunk/reactos/include/reactos/libs/mbedtls/ecjpake.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/mbedt… Modified: trunk/reactos/include/reactos/libs/mbedtls/ecp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/mbedt… Modified: trunk/reactos/include/reactos/libs/mbedtls/pk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/mbedt… Modified: trunk/reactos/include/reactos/libs/mbedtls/ssl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/mbedt… Modified: trunk/reactos/include/reactos/libs/mbedtls/ssl_cache.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/mbedt… Modified: trunk/reactos/include/reactos/libs/mbedtls/ssl_ciphersuites.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/mbedt… Modified: trunk/reactos/include/reactos/libs/mbedtls/ssl_internal.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/mbedt… Modified: trunk/reactos/include/reactos/libs/mbedtls/version.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/mbedt… Modified: trunk/reactos/include/reactos/libs/mbedtls/x509_crt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/mbedt… Modified: trunk/reactos/media/doc/3rd Party Files.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/3rd%20Party%20Fi…

1 0

[akhaldi] 70198: [ADVAPI32] Apply Wine commit 4f3acf3 by Michael Müller: Add initial implementation for GetWindowsAccountDomainSid. CORE-10536
by akhaldi＠svn.reactos.org 28 Nov '15

28 Nov '15

Author: akhaldi Date: Sat Nov 28 21:47:43 2015 New Revision: 70198 URL: http://svn.reactos.org/svn/reactos?rev=70198&view=rev Log: [ADVAPI32] Apply Wine commit 4f3acf3 by Michael Müller: Add initial implementation for GetWindowsAccountDomainSid. CORE-10536 Modified: trunk/reactos/dll/win32/advapi32/wine/security.c Modified: trunk/reactos/dll/win32/advapi32/wine/security.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/wine/se… ============================================================================== --- trunk/reactos/dll/win32/advapi32/wine/security.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/wine/security.c [iso-8859-1] Sat Nov 28 21:47:43 2015 @@ -3645,17 +3645,50 @@ return r; } -/* - * @unimplemented - */ -BOOL -WINAPI -GetWindowsAccountDomainSid(IN PSID pSid, - OUT PSID ppDomainSid, - IN OUT DWORD* cbSid) -{ - UNIMPLEMENTED; - return FALSE; +/****************************************************************************** + * GetWindowsAccountDomainSid [ADVAPI32.@] + */ +BOOL WINAPI GetWindowsAccountDomainSid( PSID sid, PSID domain_sid, DWORD *size ) +{ + SID_IDENTIFIER_AUTHORITY domain_ident = { SECURITY_NT_AUTHORITY }; + DWORD required_size; + int i; + + FIXME( "(%p %p %p): semi-stub\n", sid, domain_sid, size ); + + if (!sid || !IsValidSid( sid )) + { + SetLastError( ERROR_INVALID_SID ); + return FALSE; + } + + if (!size) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return FALSE; + } + + if (*GetSidSubAuthorityCount( sid ) < 4) + { + SetLastError( ERROR_INVALID_SID ); + return FALSE; + } + + required_size = GetSidLengthRequired( 4 ); + if (*size < required_size || !domain_sid) + { + *size = required_size; + SetLastError( domain_sid ? ERROR_INSUFFICIENT_BUFFER : + ERROR_INVALID_PARAMETER ); + return FALSE; + } + + InitializeSid( domain_sid, &domain_ident, 4 ); + for (i = 0; i < 4; i++) + *GetSidSubAuthority( domain_sid, i ) = *GetSidSubAuthority( sid, i ); + + *size = required_size; + return TRUE; } /*

1 0

[akhaldi] 70197: [ADVAPI32] Apply Wine commit d2f0bc2 by Dmitry Timoshkov: Add CreatePrivateObjectSecurityWithMultipleInheritance semi-stub. CORE-10536
by akhaldi＠svn.reactos.org 28 Nov '15

28 Nov '15

Author: akhaldi Date: Sat Nov 28 21:33:49 2015 New Revision: 70197 URL: http://svn.reactos.org/svn/reactos?rev=70197&view=rev Log: [ADVAPI32] Apply Wine commit d2f0bc2 by Dmitry Timoshkov: Add CreatePrivateObjectSecurityWithMultipleInheritance semi-stub. CORE-10536 Modified: trunk/reactos/dll/win32/advapi32/sec/misc.c Modified: trunk/reactos/dll/win32/advapi32/sec/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/mis… ============================================================================== --- trunk/reactos/dll/win32/advapi32/sec/misc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/sec/misc.c [iso-8859-1] Sat Nov 28 21:33:49 2015 @@ -1396,8 +1396,8 @@ HANDLE Token, PGENERIC_MAPPING GenericMapping) { - FIXME("%s() not implemented!\n", __FUNCTION__); - return FALSE; + FIXME("%s() semi-stub\n", __FUNCTION__); + return CreatePrivateObjectSecurity(ParentDescriptor, CreatorDescriptor, NewDescriptor, IsContainerObject, Token, GenericMapping); }

1 0

[akhaldi] 70196: [README.WINE] Mark some advapi32 related entries as synced with Wine Staging 1.7.55. CORE-10536
by akhaldi＠svn.reactos.org 28 Nov '15

28 Nov '15

Author: akhaldi Date: Sat Nov 28 21:23:21 2015 New Revision: 70196 URL: http://svn.reactos.org/svn/reactos?rev=70196&view=rev Log: [README.WINE] Mark some advapi32 related entries as synced with Wine Staging 1.7.55. CORE-10536 Modified: trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sat Nov 28 21:23:21 2015 @@ -256,10 +256,10 @@ reactos/lib/rtl/timerqueue.c # Partly synced with WineStaging-1.7.55 advapi32 - - reactos/dll/win32/advapi32/wine/cred.c # Synced to WineStaging-1.7.37 + reactos/dll/win32/advapi32/wine/cred.c # Synced to WineStaging-1.7.55 reactos/dll/win32/advapi32/wine/crypt.c # Synced to WineStaging-1.7.55 - reactos/dll/win32/advapi32/wine/crypt_des.c # Synced to WineStaging-1.7.37 - reactos/dll/win32/advapi32/wine/crypt_lmhash.c # Synced to WineStaging-1.7.37 + reactos/dll/win32/advapi32/wine/crypt_des.c # Synced to WineStaging-1.7.55 + reactos/dll/win32/advapi32/wine/crypt_lmhash.c # Synced to WineStaging-1.7.55 reactos/dll/win32/advapi32/wine/security.c # Out of Sync gdi32 -

1 0

[akhaldi] 70195: [ADVAPI32] Sync crypt.c with Wine Staging 1.7.55 and update the exports list accordingly. CORE-10536
by akhaldi＠svn.reactos.org 28 Nov '15

28 Nov '15

Author: akhaldi Date: Sat Nov 28 21:21:52 2015 New Revision: 70195 URL: http://svn.reactos.org/svn/reactos?rev=70195&view=rev Log: [ADVAPI32] Sync crypt.c with Wine Staging 1.7.55 and update the exports list accordingly. CORE-10536 Modified: trunk/reactos/dll/win32/advapi32/advapi32.spec trunk/reactos/dll/win32/advapi32/wine/crypt.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/advapi32/advapi32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/advapi3… ============================================================================== --- trunk/reactos/dll/win32/advapi32/advapi32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/advapi32.spec [iso-8859-1] Sat Nov 28 21:21:52 2015 @@ -59,7 +59,7 @@ 59 stdcall ClearEventLogA(long str) 60 stdcall ClearEventLogW(long wstr) 61 stub CloseCodeAuthzLevel -62 stub CloseEncryptedFileRaw +62 stdcall CloseEncryptedFileRaw(ptr) 63 stdcall CloseEventLog(long) 64 stdcall CloseServiceHandle(long) 65 stub CloseTrace Modified: trunk/reactos/dll/win32/advapi32/wine/crypt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/wine/cr… ============================================================================== --- trunk/reactos/dll/win32/advapi32/wine/crypt.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/wine/crypt.c [iso-8859-1] Sat Nov 28 21:21:52 2015 @@ -294,6 +294,23 @@ } } + +/****************************************************************************** + * CloseEncryptedFileRaw (ADVAPI32.@) + * + * Close encrypted files + * + * PARAMS + * context [I] pointer to the context + * RETURNS + * Success: ERROR_SUCCESS + * Failure: NTSTATUS error code + */ +void WINAPI CloseEncryptedFileRaw(PVOID context) +{ + FIXME("(%p): stub\n", context); +} + /****************************************************************************** * CryptAcquireContextW (ADVAPI32.@) * @@ -306,7 +323,7 @@ * dwProvType [I] Crypto provider type to get a handle. * dwFlags [I] flags for the operation * - * RETURNS + * RETURNS * TRUE on success, FALSE on failure. */ BOOL WINAPI CryptAcquireContextW (HCRYPTPROV *phProv, LPCWSTR pszContainer, @@ -330,7 +347,7 @@ SetLastError(NTE_BAD_PROV_TYPE); return FALSE; } - + if (!phProv) { SetLastError(ERROR_INVALID_PARAMETER); @@ -566,7 +583,7 @@ */ BOOL WINAPI CryptContextAddRef (HCRYPTPROV hProv, DWORD *pdwReserved, DWORD dwFlags) { - PCRYPTPROV pProv = (PCRYPTPROV)hProv; + PCRYPTPROV pProv = (PCRYPTPROV)hProv; TRACE("(0x%lx, %p, %08x)\n", hProv, pdwReserved, dwFlags); @@ -619,7 +636,7 @@ } pProv->refcount--; - if (pProv->refcount <= 0) + if (pProv->refcount <= 0) { ret = pProv->pFuncs->pCPReleaseContext(pProv->hPrivate, dwFlags); pProv->dwMagic = 0; @@ -1127,10 +1144,10 @@ { DWORD numkeys; WCHAR *provNameW; - + RegQueryInfoKeyW(hKey, NULL, NULL, NULL, &numkeys, pcbProvName, NULL, NULL, NULL, NULL, NULL, NULL); - + if (!(provNameW = CRYPT_Alloc(*pcbProvName * sizeof(WCHAR)))) { SetLastError(ERROR_NOT_ENOUGH_MEMORY); @@ -1152,7 +1169,7 @@ DWORD size = sizeof(DWORD); DWORD result; HKEY subkey; - + result = RegEnumKeyW(hKey, dwIndex, pszProvName, *pcbProvName / sizeof(WCHAR)); if (result) { @@ -1296,7 +1313,7 @@ *pdwProvType += (*(--ch) - '0') * 10; *pdwProvType += (*(--ch) - '0') * 100; CRYPT_Free(keyname); - + result = RegQueryValueExW(hSubkey, typenameW, NULL, &dwType, (LPBYTE)pszTypeName, pcbTypeName); if (result) { @@ -1349,7 +1366,7 @@ /****************************************************************************** * CryptExportKey (ADVAPI32.@) - * + * * Exports a cryptographic key from a CSP. * * PARAMS @@ -1490,8 +1507,8 @@ return FALSE; } CRYPT_Free(keyname); - - result = RegQueryValueExW(hKey, nameW, NULL, NULL, (LPBYTE)pszProvName, pcbProvName); + + result = RegQueryValueExW(hKey, nameW, NULL, NULL, (LPBYTE)pszProvName, pcbProvName); RegCloseKey(hKey); if (result) @@ -1500,10 +1517,10 @@ SetLastError(NTE_PROV_TYPE_ENTRY_BAD); else SetLastError(result); - - return FALSE; - } - + + return FALSE; + } + return TRUE; } @@ -1751,7 +1768,7 @@ * * Compute the cryptographic hash of a session key object. * - * PARAMS + * PARAMS * hHash [I] Handle to the hash object. * hKey [I] Handle to the key to be hashed. * dwFlags [I] Can be CRYPT_LITTLE_ENDIAN. @@ -1866,7 +1883,7 @@ PCRYPTHASH hash = (PCRYPTHASH)hHash; PCRYPTPROV prov; - TRACE("(0x%lx, %d, %s, %08x, %p, %p)\n", + TRACE("(0x%lx, %d, %s, %08x, %p, %p)\n", hHash, dwKeySpec, debugstr_w(sDescription), dwFlags, pbSignature, pdwSigLen); if (!hash) @@ -1897,7 +1914,7 @@ LPWSTR wsDescription; BOOL result; - TRACE("(0x%lx, %d, %s, %08x, %p, %p)\n", + TRACE("(0x%lx, %d, %s, %08x, %p, %p)\n", hHash, dwKeySpec, debugstr_a(sDescription), dwFlags, pbSignature, pdwSigLen); CRYPT_ANSIToUnicode(sDescription, &wsDescription, -1); @@ -2058,7 +2075,7 @@ return FALSE; } CRYPT_Free(keyname); - + if (dwFlags & CRYPT_DELETE_DEFAULT) { RegDeleteValueW(hTypeKey, nameW); @@ -2080,7 +2097,7 @@ return FALSE; } CRYPT_Free(keyname); - + if (RegSetValueExW(hTypeKey, nameW, 0, REG_SZ, (const BYTE *)pszProvName, (strlenW(pszProvName) + 1)*sizeof(WCHAR))) { @@ -2088,7 +2105,7 @@ RegCloseKey(hProvKey); return FALSE; } - + RegCloseKey(hProvKey); } RegCloseKey(hTypeKey); @@ -2184,7 +2201,7 @@ * RETURNS * Success: TRUE * Failure: FALSE - * + * * NOTES * Because of security flaws sDescription should not be used and should thus be * NULL. It is supported only for compatibility with Microsoft's Cryptographic @@ -2207,7 +2224,7 @@ SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } - + prov = hash->pProvider; return prov->pFuncs->pCPVerifySignature(prov->hPrivate, hash->hPrivate, pbSignature, dwSigLen, key->hPrivate, sDescription, dwFlags); @@ -2288,7 +2305,8 @@ dev_random = open("/dev/urandom", O_RDONLY); if (dev_random != -1) { - if (read(dev_random, pbBuffer, dwLen) == (ssize_t)dwLen) + if (!IsBadWritePtr( pbBuffer, dwLen ) && + read(dev_random, pbBuffer, dwLen) == (ssize_t)dwLen) { close(dev_random); return TRUE; @@ -2299,8 +2317,8 @@ FIXME("couldn't open /dev/urandom\n"); SetLastError(NTE_FAIL); return FALSE; -} - +} + /* These functions have nearly identical prototypes to CryptProtectMemory and CryptUnprotectMemory, in crypt32.dll. @@ -2315,10 +2333,10 @@ * memory [I/O] Pointer to memory to encrypt. * length [I] Length of region to encrypt in bytes. * flags [I] Control whether other processes are able to decrypt the memory. - * RTL_ENCRYPT_OPTION_SAME_PROCESS - * RTL_ENCRYPT_OPTION_CROSS_PROCESS + * RTL_ENCRYPT_OPTION_SAME_PROCESS + * RTL_ENCRYPT_OPTION_CROSS_PROCESS * RTL_ENCRYPT_OPTION_SAME_LOGON - * + * * RETURNS * Success: STATUS_SUCCESS * Failure: NTSTATUS error code Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sat Nov 28 21:21:52 2015 @@ -257,7 +257,7 @@ advapi32 - reactos/dll/win32/advapi32/wine/cred.c # Synced to WineStaging-1.7.37 - reactos/dll/win32/advapi32/wine/crypt.c # Synced to Wine-1.7.27 + reactos/dll/win32/advapi32/wine/crypt.c # Synced to WineStaging-1.7.55 reactos/dll/win32/advapi32/wine/crypt_des.c # Synced to WineStaging-1.7.37 reactos/dll/win32/advapi32/wine/crypt_lmhash.c # Synced to WineStaging-1.7.37 reactos/dll/win32/advapi32/wine/security.c # Out of Sync

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2015