Ros-diffs September 2014

ros-diffs@reactos.org

16 participants
413 discussions

[hbelusca] 64350: [NTVDM]: Reorganize code.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Sep 27 19:16:55 2014 New Revision: 64350 URL: http://svn.reactos.org/svn/reactos?rev=64350&view=rev Log: [NTVDM]: Reorganize code. Modified: trunk/reactos/subsystems/ntvdm/hardware/speaker.c Modified: trunk/reactos/subsystems/ntvdm/hardware/speaker.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/hardware/… ============================================================================== --- trunk/reactos/subsystems/ntvdm/hardware/speaker.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/hardware/speaker.c [iso-8859-1] Sat Sep 27 19:16:55 2014 @@ -34,6 +34,31 @@ /* PUBLIC FUNCTIONS ***********************************************************/ +VOID PlaySound(DWORD Frequency, + DWORD Duration) +{ + /* Adapted from kernel32:Beep() */ + + IO_STATUS_BLOCK IoStatusBlock; + BEEP_SET_PARAMETERS BeepSetParameters; + + /* Set beep data */ + BeepSetParameters.Frequency = Frequency; + BeepSetParameters.Duration = Duration; + + /* Send the beep */ + NtDeviceIoControlFile(hBeep, + NULL, + NULL, + NULL, + &IoStatusBlock, + IOCTL_BEEP_SET, + &BeepSetParameters, + sizeof(BeepSetParameters), + NULL, + 0); +} + VOID SpeakerChange(VOID) { BYTE Port61hState = IOReadB(CONTROL_SYSTEM_PORT61H); @@ -42,15 +67,14 @@ if (PitChannel2 && IsConnectedToPITChannel2 && SpeakerDataOn) { - /* Start beeping - Adapted from kernel32:Beep() */ - NTSTATUS Status; - IO_STATUS_BLOCK IoStatusBlock; - BEEP_SET_PARAMETERS BeepSetParameters; + /* Start beeping */ + + DWORD Frequency, Duration; DWORD PitChannel2ReloadValue = PitChannel2->ReloadValue; if (PitChannel2ReloadValue == 0) PitChannel2ReloadValue = 65536; - DPRINT("(1) PitChannel2(Bcd = %s, Mode = %d ; ReloadValue = %d)\n", PitChannel2->Bcd ? "true" : "false", PitChannel2->Mode, PitChannel2ReloadValue); + DPRINT("(1) PitChannel2(Mode = %d ; ReloadValue = %d)\n", PitChannel2->Mode, PitChannel2ReloadValue); if (OldMode == PitChannel2->Mode && OldReloadValue == PitChannel2ReloadValue) return; @@ -58,63 +82,21 @@ OldMode = PitChannel2->Mode; OldReloadValue = PitChannel2ReloadValue; - DPRINT("(2) PitChannel2(Bcd = %s, Mode = %d ; ReloadValue = %d)\n", PitChannel2->Bcd ? "true" : "false", PitChannel2->Mode, PitChannel2ReloadValue); + DPRINT("(2) PitChannel2(Mode = %d ; ReloadValue = %d)\n", PitChannel2->Mode, PitChannel2ReloadValue); - /* Set beep data */ - BeepSetParameters.Frequency = (PIT_BASE_FREQUENCY / PitChannel2ReloadValue); - BeepSetParameters.Duration = INFINITE; + Frequency = (PIT_BASE_FREQUENCY / PitChannel2ReloadValue); + Duration = INFINITE; - /* Send the beep */ - Status = NtDeviceIoControlFile(hBeep, - NULL, - NULL, - NULL, - &IoStatusBlock, - IOCTL_BEEP_SET, - &BeepSetParameters, - sizeof(BeepSetParameters), - NULL, - 0); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Beep (%lu, %lu) failed, Status 0x%08lx\n", - BeepSetParameters.Frequency, - BeepSetParameters.Duration, - Status); - } + PlaySound(Frequency, Duration); } else { /* Stop beeping */ - NTSTATUS Status; - IO_STATUS_BLOCK IoStatusBlock; - BEEP_SET_PARAMETERS BeepSetParameters; OldMode = 0; OldReloadValue = 0; - /* Set beep data */ - BeepSetParameters.Frequency = 0x00; - BeepSetParameters.Duration = 0x00; - - /* Send the beep */ - Status = NtDeviceIoControlFile(hBeep, - NULL, - NULL, - NULL, - &IoStatusBlock, - IOCTL_BEEP_SET, - &BeepSetParameters, - sizeof(BeepSetParameters), - NULL, - 0); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Beep (%lu, %lu) failed, Status 0x%08lx\n", - BeepSetParameters.Frequency, - BeepSetParameters.Duration, - Status); - } + PlaySound(0x00, 0x00); } } @@ -126,11 +108,6 @@ IO_STATUS_BLOCK IoStatusBlock; /* Adapted from kernel32:Beep() */ - - // - // On TS systems, we need to Load Winsta.dll and call WinstationBeepOpen - // after doing a GetProcAddress for it - // /* Open the device */ RtlInitUnicodeString(&BeepDevice, L"\\Device\\Beep");

11 years, 1 month

[akhaldi] 64349: [TRANSLATIONS] * Russian translation update by Kudratov Olimjon. CORE-8495 #comment Committed in r64349. Thanks!

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Sep 27 19:13:32 2014 New Revision: 64349 URL: http://svn.reactos.org/svn/reactos?rev=64349&view=rev Log: [TRANSLATIONS] * Russian translation update by Kudratov Olimjon. CORE-8495 #comment Committed in r64349. Thanks! Modified: trunk/reactos/base/applications/cmdutils/help/lang/ru-RU.rc trunk/reactos/base/applications/mspaint/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/regedit/lang/ru-RU.rc trunk/reactos/dll/cpl/console/lang/ru-RU.rc trunk/reactos/dll/cpl/usrmgr/lang/ru-RU.rc trunk/reactos/dll/win32/comctl32/lang/comctl_Ru.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Ru.rc trunk/reactos/dll/win32/devmgr/lang/ru-RU.rc trunk/reactos/dll/win32/msgina/lang/ru-RU.rc trunk/reactos/dll/win32/msvfw32/lang/msvfw32_Ru.rc trunk/reactos/dll/win32/oledlg/lang/oledlg_Ru.rc trunk/reactos/dll/win32/rasdlg/lang/ru-RU.rc trunk/reactos/dll/win32/serialui/lang/ru-RU.rc trunk/reactos/dll/win32/syssetup/lang/ru-RU.rc trunk/reactos/dll/win32/winmm/lang/winmm_Ru.rc trunk/reactos/dll/win32/wldap32/lang/wldap32_Ru.rc trunk/reactos/win32ss/user/user32/lang/ru-RU.rc trunk/reactos/win32ss/user/winsrv/usersrv/lang/ru-RU.rc Modified: trunk/reactos/base/applications/cmdutils/help/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/help/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/help/lang/ru-RU.rc [iso-8859-1] Sat Sep 27 19:13:32 2014 @@ -1,4 +1,4 @@ -/* +ï»¿/* * Russian language file by Andrey Korotaev (unC0Rr(a)inbox.ru) and Aleksey Bragin (aleksey(a)reactos.com) * Copyright 2005 */ @@ -12,12 +12,12 @@ STRINGTABLE BEGIN - IDS_USAGE "Provides Help information for ReactOS commands.\n\n\ -HELP [command]\n\n\ - command - Display help information for this command.\n" + IDS_USAGE "ÐÑÐµÐ´Ð¾ÑÑÐ°Ð²Ð»ÑÐµÑ Ð¸Ð½ÑÐ¾ÑÐ¼Ð°ÑÐ¸Ñ Ð´Ð»Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´ ReactOS.\n\n\ +HELP [ÐºÐ¾Ð¼Ð°Ð½Ð´Ð°]\n\n\ + ÐºÐ¾Ð¼Ð°Ð½Ð´Ð° - ÐÑÐ¾Ð±ÑÐ°Ð¶Ð°ÐµÑ Ð¸Ð½ÑÐ¾ÑÐ¼Ð°ÑÐ¸Ñ Ð´Ð»Ñ ÑÑÐ¾Ð¹ ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ.\n" IDS_HELP1 "Ð¡Ð¿Ð¸ÑÐ¾Ðº Ð²ÑÐµÑ Ð´Ð¾ÑÑÑÐ¿Ð½ÑÑ ÐºÐ¾Ð¼Ð°Ð½Ð´ Ñ ÐºÐ¾ÑÐ¾ÑÐºÐ¸Ð¼ Ð¾Ð¿Ð¸ÑÐ°Ð½Ð¸ÐµÐ¼\n\n\ - help ÐºÐ¾Ð¼Ð°Ð½Ð´Ð°\n\ - ÐºÐ¾Ð¼Ð°Ð½Ð´Ð° /? ÐÑÐ²Ð¾Ð´Ð¸Ñ Ð¿Ð¾Ð´ÑÐ¾Ð±Ð½ÑÑ Ð¸Ð½ÑÐ¾ÑÐ¼Ð°ÑÐ¸Ñ Ð¾ ÐºÐ¾Ð¼Ð°Ð½Ð´Ðµ\n\n\ +HELP [ÐºÐ¾Ð¼Ð°Ð½Ð´Ð°]\n\ +ÐºÐ¾Ð¼Ð°Ð½Ð´Ð° /? ÐÑÐ²Ð¾Ð´Ð¸Ñ Ð¿Ð¾Ð´ÑÐ¾Ð±Ð½ÑÑ Ð¸Ð½ÑÐ¾ÑÐ¼Ð°ÑÐ¸Ñ Ð¾ ÐºÐ¾Ð¼Ð°Ð½Ð´Ðµ\n\n\ ? Ð¡Ð¿Ð¸ÑÐ¾Ðº Ð²ÑÐµÑ Ð´Ð¾ÑÑÑÐ¿Ð½ÑÑ ÐºÐ¾Ð¼Ð°Ð½Ð´ Ð±ÐµÐ· Ð¾Ð¿Ð¸ÑÐ°Ð½Ð¸Ñ.\n\ ALIAS ÐÑÐ²Ð¾Ð´, ÑÑÑÐ°Ð½Ð¾Ð²ÐºÐ° Ð¸Ð»Ð¸ ÑÐ´Ð°Ð»ÐµÐ½Ð¸Ðµ Ð¿ÑÐµÐ²Ð´Ð¾Ð½Ð¸Ð¼Ð¾Ð².\n\ ATTRIB ÐÑÐ¾Ð±ÑÐ°Ð¶ÐµÐ½Ð¸Ðµ Ð¸ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ðµ Ð°ÑÑÐ¸Ð±ÑÑÐ¾Ð² ÑÐ°Ð¹Ð»Ð¾Ð².\n\ @@ -25,7 +25,8 @@ CALL ÐÑÐ·Ð¾Ð² Ð¾Ð´Ð½Ð¾Ð³Ð¾ Ð¿Ð°ÐºÐµÑÐ½Ð¾Ð³Ð¾ ÑÐ°Ð¹Ð»Ð° Ð¸Ð· Ð´ÑÑÐ³Ð¾Ð³Ð¾.\n\ CD ÐÑÐ²Ð¾Ð´ Ð¸Ð¼ÐµÐ½Ð¸ Ð»Ð¸Ð±Ð¾ ÑÐ¼ÐµÐ½Ð° ÑÐµÐºÑÑÐµÐ¹ Ð¿Ð°Ð¿ÐºÐ¸.\n\ CHCP ÐÑÐ²Ð¾Ð´ Ð»Ð¸Ð±Ð¾ ÑÑÑÐ°Ð½Ð¾Ð²ÐºÐ° Ð°ÐºÑÐ¸Ð²Ð½Ð¾Ð¹ ÐºÐ¾Ð´Ð¾Ð²Ð¾Ð¹ ÑÑÑÐ°Ð½Ð¸ÑÑ.\n\ -CHOICE ÐÐ´ÐµÑ, Ð¿Ð¾ÐºÐ° Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ Ð½Ðµ Ð²ÑÐ±ÐµÑÐµÑ Ð¾Ð´Ð¸Ð½ Ð¸Ð· ÑÐºÐ°Ð·Ð°Ð½Ð½ÑÑ Ð² ÑÐ¿Ð¸ÑÐºÐµ ÑÐ¸Ð¼Ð²Ð¾Ð»Ð¾Ð².\n\ +CHOICE ÐÐ´ÐµÑ, Ð¿Ð¾ÐºÐ° Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ Ð½Ðµ Ð²ÑÐ±ÐµÑÐµÑ Ð¾Ð´Ð¸Ð½ Ð¸Ð· ÑÐºÐ°Ð·Ð°Ð½Ð½ÑÑ\n\ + Ð² ÑÐ¿Ð¸ÑÐºÐµ ÑÐ¸Ð¼Ð²Ð¾Ð»Ð¾Ð².\n\ CLS ÐÑÐ¸ÑÑÐºÐ° ÑÐºÑÐ°Ð½Ð°.\n\ CMD ÐÐ°Ð¿ÑÑÐº ÐµÑÐµ Ð¾Ð´Ð½Ð¾Ð³Ð¾ Ð¸Ð½ÑÐµÑÐ¿ÑÐµÑÐ°ÑÐ¾ÑÐ° ÐºÐ¾Ð¼Ð°Ð½Ð´Ð½ÑÑ ÑÑÑÐ¾Ðº ReactOS.\n\ COLOR Ð£ÑÑÐ°Ð½Ð¾Ð²ÐºÐ° ÑÐ²ÐµÑÐ¾Ð² Ð¿ÐµÑÐµÐ´Ð½ÐµÐ³Ð¾ Ð¿Ð»Ð°Ð½Ð° Ð¸ ÑÐ¾Ð½Ð°, Ð¸ÑÐ¿Ð¾Ð»ÑÐ·ÑÐµÐ¼ÑÑ Ð¿Ð¾ ÑÐ¼Ð¾Ð»ÑÐ°Ð½Ð¸Ñ.\n\ @@ -45,7 +46,7 @@ LABEL Ð¡Ð¾Ð·Ð´Ð°Ð½Ð¸Ðµ, Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ðµ Ð¸ ÑÐ´Ð°Ð»ÐµÐ½Ð¸Ðµ Ð¼ÐµÑÐ¾Ðº ÑÐ¾Ð¼Ð° Ð´Ð»Ñ Ð´Ð¸ÑÐºÐ¾Ð².\n\ MD Ð¡Ð¾Ð·Ð´Ð°Ð½Ð¸Ðµ Ð¿Ð°Ð¿ÐºÐ¸.\n\ MKDIR Ð¡Ð¾Ð·Ð´Ð°Ð½Ð¸Ðµ Ð¿Ð°Ð¿ÐºÐ¸.\n\ -MKLINK CÐ¾Ð·Ð´Ð°Ð½Ð¸Ðµ ÑÐ¸Ð¼Ð²Ð¾Ð»Ð¸ÑÐµÑÐºÐ¸Ñ Ð¸ Ð¶ÐµÑÑÐºÐ¸Ñ ÑÑÑÐ»Ð¾Ðº.\n\ +MKLINK Ð¡Ð¾Ð·Ð´Ð°Ð½Ð¸Ðµ ÑÐ¸Ð¼Ð²Ð¾Ð»Ð¸ÑÐµÑÐºÐ¸Ñ Ð¸ Ð¶ÐµÑÑÐºÐ¸Ñ ÑÑÑÐ»Ð¾Ðº.\n\ MOVE ÐÐµÑÐµÐ¼ÐµÑÐµÐ½Ð¸Ðµ Ð¾Ð´Ð½Ð¾Ð³Ð¾ Ð¸Ð»Ð¸ Ð½ÐµÑÐºÐ¾Ð»ÑÐºÐ¸Ñ ÑÐ°Ð¹Ð»Ð¾Ð² Ð¸Ð· Ð¾Ð´Ð½Ð¾Ð¹ Ð¿Ð°Ð¿ÐºÐ¸ Ð² Ð´ÑÑÐ³ÑÑ.\n\ PATH ÐÑÐ¾Ð±ÑÐ°Ð¶Ð°ÐµÑ Ð¸Ð»Ð¸ ÑÑÑÐ°Ð½Ð°Ð²Ð»Ð¸Ð²Ð°ÐµÑ Ð¿ÑÑÑ Ð¿Ð¾Ð¸ÑÐºÐ° Ð¸ÑÐ¿Ð¾Ð»Ð½ÑÐµÐ¼ÑÑ ÑÐ°Ð¹Ð»Ð¾Ð².\n\ PAUSE ÐÑÐ¸Ð¾ÑÑÐ°Ð½Ð°Ð²Ð»Ð¸Ð²Ð°ÐµÑ Ð²ÑÐ¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ðµ Ð¿Ð°ÐºÐµÑÐ½Ð¾Ð³Ð¾ ÑÐ°Ð¹Ð»Ð° Ð¸ Ð²ÑÐ²Ð¾Ð´Ð¸Ñ ÑÐ¾Ð¾Ð±ÑÐµÐ½Ð¸Ðµ.\n\ @@ -57,10 +58,11 @@ REM ÐÐ¾Ð¼ÐµÑÐ°ÐµÑ ÐºÐ¾Ð¼Ð¼ÐµÐ½ÑÐ°ÑÐ¸Ð¸ Ð² Ð¿Ð°ÐºÐµÑÐ½ÑÐµ ÑÐ°Ð¹Ð»Ñ.\n\ REN ÐÐµÑÐµÐ¸Ð¼ÐµÐ½Ð¾Ð²ÑÐ²Ð°ÐµÑ ÑÐ°Ð¹Ð»Ñ Ð¸Ð»Ð¸ Ð¿Ð°Ð¿ÐºÐ¸.\n\ RENAME ÐÐµÑÐµÐ¸Ð¼ÐµÐ½Ð¾Ð²ÑÐ²Ð°ÐµÑ ÑÐ°Ð¹Ð»Ñ Ð¸Ð»Ð¸ Ð¿Ð°Ð¿ÐºÐ¸.\n\ -RMDIR Ð£Ð´Ð°Ð»ÐµÐ½Ð¸Ðµ Ð¿Ð°Ð¿ÐºÐ¸.\n\ +RMDIR Ð£Ð´Ð°Ð»ÑÐµÑ Ð¿Ð°Ð¿ÐºÑ.\n\ SCREEN ÐÐµÑÐµÐ¼ÐµÑÐµÐ½Ð¸Ðµ ÐºÑÑÑÐ¾ÑÐ° Ð¸ Ð²ÑÐ²Ð¾Ð´ ÑÐµÐºÑÑÐ°.\n\ SET ÐÐ¾ÐºÐ°Ð·ÑÐ²Ð°ÐµÑ, ÑÑÑÐ°Ð½Ð°Ð²Ð»Ð¸Ð²Ð°ÐµÑ Ð¸ ÑÐ´Ð°Ð»ÑÐµÑ Ð¿ÐµÑÐµÐ¼ÐµÐ½Ð½ÑÐµ ÑÑÐµÐ´Ñ ReactOS.\n\ -SHIFT ÐÐ·Ð¼ÐµÐ½ÐµÐ½Ð¸Ðµ Ð¿Ð¾Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ (ÑÐ´Ð²Ð¸Ð³) Ð¿Ð¾Ð´ÑÑÐ°Ð²Ð»ÑÐµÐ¼ÑÑ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÐ¾Ð² Ð´Ð»Ñ Ð¿Ð°ÐºÐµÑÐ½Ð¾Ð³Ð¾ ÑÐ°Ð¹Ð»Ð°.\n" +SHIFT ÐÐ·Ð¼ÐµÐ½ÐµÐ½Ð¸Ðµ Ð¿Ð¾Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ (ÑÐ´Ð²Ð¸Ð³) Ð¿Ð¾Ð´ÑÑÐ°Ð²Ð»ÑÐµÐ¼ÑÑ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÐ¾Ð² Ð´Ð»Ñ\n\ + Ð¿Ð°ÐºÐµÑÐ½Ð¾Ð³Ð¾ ÑÐ°Ð¹Ð»Ð°.\n" IDS_HELP2 "START ÐÑÐ¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ðµ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ñ Ð¸Ð»Ð¸ ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ Ð² Ð¾ÑÐ´ÐµÐ»ÑÐ½Ð¾Ð¼ Ð¾ÐºÐ½Ðµ.\n\ TIME ÐÑÐ²Ð¾Ð´ Ð¸ ÑÑÑÐ°Ð½Ð¾Ð²ÐºÐ° ÑÐ¸ÑÑÐµÐ¼Ð½Ð¾Ð³Ð¾ Ð²ÑÐµÐ¼ÐµÐ½Ð¸.\n\ TIMER Ð¡ÐµÐºÑÐ½Ð´Ð¾Ð¼ÐµÑ.\n\ Modified: trunk/reactos/base/applications/mspaint/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/lang/ru-RU.rc [iso-8859-1] Sat Sep 27 19:13:32 2014 @@ -72,7 +72,7 @@ MENUITEM "ÐÐ¾Ð´ÐµÑÐ½Ð¸Ð·Ð¸ÑÐ¾Ð²Ð°Ð½Ð½ÑÐ¹ Ð²Ð¸Ð´", IDM_COLORSMODERNPALETTE MENUITEM "Ð¡ÑÐ°ÑÑÐ¹ Ð²Ð¸Ð´", IDM_COLORSOLDPALETTE END - POPUP "&?" + POPUP "&Ð¡Ð¿ÑÐ°Ð²ÐºÐ°" BEGIN MENUITEM "&ÐÑÐ·Ð¾Ð² ÑÐ¿ÑÐ°Ð²ÐºÐ¸", IDM_HELPHELPTOPICS MENUITEM SEPARATOR @@ -180,7 +180,7 @@ IDS_INFOTITLE "Paint Ð´Ð»Ñ ReactOS" IDS_INFOTEXT "Paint Ð´Ð»Ñ ReactOS ÑÐ°ÑÐ¿ÑÐ¾ÑÑÑÐ°Ð½ÑÐµÑÑÑ Ð¿Ð¾Ð´ Ð»Ð¸ÑÐµÐ½Ð·Ð¸ÐµÐ¹ GNU Lesser General Public License (LGPL, ÑÐ¼. www.gnu.org)" IDS_SAVEPROMPTTEXT "Ð¡Ð¾ÑÑÐ°Ð½Ð¸ÑÑ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð² %s?" - IDS_DEFAULTFILENAME "ÐÐµÐ·_Ð¸Ð¼ÐµÐ½Ð¸.bmp" + IDS_DEFAULTFILENAME "ÐÐµÐ·ÑÐ¼ÑÐ½Ð½ÑÐ¹.bmp" IDS_MINIATURETITLE "ÐÑÐºÐ¸Ð·" IDS_TOOLTIP1 "ÐÑÐ´ÐµÐ»ÐµÐ½Ð¸Ðµ Ð¿ÑÐ¾Ð¸Ð·Ð²Ð¾Ð»ÑÐ½Ð¾Ð¹ Ð¾Ð±Ð»Ð°ÑÑÐ¸" IDS_TOOLTIP2 "ÐÑÐ´ÐµÐ»ÐµÐ½Ð¸Ðµ" 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] Sat Sep 27 19:13:32 2014 @@ -15,11 +15,11 @@ BEGIN IDS_OTHER "ÐÑÑÐ³Ð¾Ð¹ ÑÐ¸Ð¿ Ð°Ð´Ð°Ð¿ÑÐµÑÐ°" IDS_ETH "Ethernet Ð°Ð´Ð°Ð¿ÑÐµÑ" - IDS_TOKEN "Token Ring Ð°Ð´Ð°Ð¿ÑÐµÑ" - IDS_FDDI "FDDI Ð°Ð´Ð°Ð¿ÑÐµÑ" - IDS_PPP "PPP Ð°Ð´Ð°Ð¿ÑÐµÑ" - IDS_LOOP "Loopback Ð°Ð´Ð°Ð¿ÑÐµÑ" - IDS_SLIP "SLIP Ð°Ð´Ð°Ð¿ÑÐµÑ" + IDS_TOKEN "ÐÐ´Ð°Ð¿ÑÐµÑ Token Ring" + IDS_FDDI "ÐÐ´Ð°Ð¿ÑÐµÑ FDDI" + IDS_PPP "ÐÐ´Ð°Ð¿ÑÐµÑ PPP" + IDS_LOOP "ÐÐ´Ð°Ð¿ÑÐµÑ Ð·Ð°Ð¼ÑÐºÐ°Ð½Ð¸Ñ Ð½Ð° ÑÐµÐ±Ñ" + IDS_SLIP "ÐÐ´Ð°Ð¿ÑÐµÑ SLIP" END STRINGTABLE @@ -37,7 +37,7 @@ (* - Ð»ÑÐ±Ð¾Ðµ ÐºÐ¾Ð»Ð¸ÑÐµÑÑÐ²Ð¾ Ð·Ð½Ð°ÐºÐ¾Ð², ? - Ð¾Ð´Ð¸Ð½ Ð»ÑÐ±Ð¾Ð¹ Ð·Ð½Ð°Ðº, ÑÐ¼. Ð¿ÑÐ¸Ð¼ÐµÑÑ)\n \ \n \ ÐÐ»ÑÑÐ¸:\n \ - /? ÐÐ±Ð¾Ð±ÑÐ°Ð·Ð¸ÑÑ ÑÑÐ¾ ÑÐ¿ÑÐ°Ð²Ð¾ÑÐ½Ð¾Ðµ ÑÐ¾Ð¾Ð±ÑÐµÐ½Ð¸Ðµ.\n \ + /? ÐÑÐ¾Ð±ÑÐ°Ð·Ð¸ÑÑ ÑÑÐ¾ ÑÐ¿ÑÐ°Ð²Ð¾ÑÐ½Ð¾Ðµ ÑÐ¾Ð¾Ð±ÑÐµÐ½Ð¸Ðµ.\n \ /all ÐÑÐ¾Ð±ÑÐ°Ð·Ð¸ÑÑ Ð¿Ð¾Ð»Ð½ÑÑ Ð¸Ð½ÑÐ¾ÑÐ¼Ð°ÑÐ¸Ñ Ð¾ Ð½Ð°ÑÑÑÐ¾Ð¹ÐºÐµ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÐ¾Ð².\n \ /release ÐÑÐ²Ð¾Ð±Ð¾Ð´Ð¸ÑÑ IP-Ð°Ð´ÑÐµÑ Ð´Ð»Ñ ÑÐºÐ°Ð·Ð°Ð½Ð½Ð¾Ð³Ð¾ Ð°Ð´Ð°Ð¿ÑÐµÑÐ°.\n \ /renew ÐÐ±Ð½Ð¾Ð²Ð¸ÑÑ IP-Ð°Ð´ÑÐµÑ Ð´Ð»Ñ ÑÐºÐ°Ð·Ð°Ð½Ð½Ð¾Ð³Ð¾ Ð°Ð´Ð°Ð¿ÑÐµÑÐ°.\n \ 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] Sat Sep 27 19:13:32 2014 @@ -10,18 +10,18 @@ -l <ÑÐ°Ð·Ð¼ÐµÑ> Ð Ð°Ð·Ð¼ÐµÑ Ð±ÑÑÐµÑÐ° Ð¾ÑÐ¿ÑÐ°Ð²ÐºÐ¸.\n\ -w <ÑÐ°Ð¹Ð¼-Ð°ÑÑ> Ð¢Ð°Ð¹Ð¼-Ð°ÑÑ Ð´Ð»Ñ ÐºÐ°Ð¶Ð´Ð¾Ð³Ð¾ Ð¾ÑÐ²ÐµÑÐ° (Ð² Ð¼Ð¸Ð»Ð»Ð¸ÑÐµÐºÑÐ½Ð´Ð°Ñ)\n\n\0" - IDS_PING_WITH_BYTES "\nPinging %1 [%2] with %3!d! bytes of data:\n\n\0" + IDS_PING_WITH_BYTES "\nÐÐ±Ð¼ÐµÐ½ Ð¿Ð°ÐºÐµÑÐ°Ð¼Ð¸ Ñ %1 [%2] Ð¿Ð¾ %3!d! Ð±Ð°Ð¹ÑÐ° Ð´Ð°Ð½Ð½ÑÑ:\n\n\0" IDS_PING_STATISTICS "\nÐ¡ÑÐ°ÑÐ¸ÑÑÐ¸ÐºÐ° Ping Ð´Ð»Ñ %1:\n\0" IDS_PACKETS_SENT_RECEIVED_LOST " ÐÐ°ÐºÐµÑÐ¾Ð²: Ð¾ÑÐ¿ÑÐ°Ð²Ð»ÐµÐ½Ð¾ = %1!d!, Ð¿Ð¾Ð»ÑÑÐµÐ½Ð¾ = %2!d!, Ð¿Ð¾ÑÐµÑÑÐ½Ð¾ = %3!d! (%4!d!%% Ð¿Ð¾ÑÐµÑÑ),\n\0" IDS_APPROXIMATE_ROUND_TRIP "ÐÑÐ¸Ð±Ð»Ð¸Ð·Ð¸ÑÐµÐ»ÑÐ½Ð¾Ðµ Ð²ÑÐµÐ¼Ñ Ð¿ÑÐ¸ÐµÐ¼Ð°-Ð¿ÐµÑÐµÐ´Ð°ÑÐ¸ Ð² Ð¼Ñ:\n\0" IDS_MIN_MAX_AVERAGE " ÐÐ¸Ð½Ð¸Ð¼Ð°Ð»ÑÐ½Ð¾Ðµ = %1, ÐÐ°ÐºÑÐ¸Ð¼Ð°Ð»ÑÐ½Ð¾Ðµ = %2, Ð¡ÑÐµÐ´Ð½ÐµÐµ = %3\n\0" - IDS_NOT_ENOUGH_RESOURCES "Not enough free resources available.\n\0" + IDS_NOT_ENOUGH_RESOURCES "ÐÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð²ÑÐ´ÐµÐ»Ð¸ÑÑ ÑÑÐµÐ±ÑÐµÐ¼ÑÑ Ð¿Ð°Ð¼ÑÑÑ.\n\0" IDS_UNKNOWN_HOST "Unknown host %1.\n\0" IDS_SETSOCKOPT_FAILED "setsockopt failed (%1!d!).\n\0" - IDS_COULD_NOT_CREATE_SOCKET "Could not create socket (#%1!d!).\n\0" - IDS_COULD_NOT_INIT_WINSOCK "Could not initialize winsock dll.\n\0" + IDS_COULD_NOT_CREATE_SOCKET "ÐÐµ ÑÐ´Ð°Ð»Ð¾ÑÑ ÑÐ¾Ð·Ð´Ð°ÑÑ ÑÐ¾ÐºÐµÑ (#%1!d!).\n\0" + IDS_COULD_NOT_INIT_WINSOCK "ÐÐµ ÑÐ´Ð°ÐµÑÑÑ Ð¸Ð½Ð¸ÑÐ¸Ð°Ð»Ð¸Ð·Ð¸ÑÐ¾Ð²Ð°ÑÑ Ð¸Ð½ÑÐµÑÑÐµÐ¹Ñ ReactOS Sockets.\n\0" IDS_DEST_MUST_BE_SPECIFIED "ÐÐµÐ¾Ð±ÑÐ¾Ð´Ð¸Ð¼Ð¾ ÑÐºÐ°Ð·Ð°ÑÑ Ð°Ð´ÑÐµÑ IP.\n\0" - IDS_BAD_PARAMETER "Bad parameter %1.\n\0" + IDS_BAD_PARAMETER "ÐÐµÐ²ÐµÑÐ½ÑÐ¹ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑ %1.\n\0" IDS_BAD_OPTION_FORMAT "Bad option format %1.\n\0" IDS_BAD_OPTION "Bad option %1.\n\0" IDS_BAD_VALUE_OPTION_L "ÐÐµÐ´Ð¾Ð¿ÑÑÑÐ¸Ð¼Ð¾Ðµ Ð·Ð½Ð°ÑÐµÐ½Ð¸Ðµ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÐ° -l, Ð´Ð¾Ð¿ÑÑÑÐ¸Ð¼ÑÐ¹ Ð´Ð¸Ð°Ð¿Ð°Ð·Ð¾Ð½ Ñ 0 Ð¿Ð¾ %1!d!.\n\0" Modified: trunk/reactos/base/applications/regedit/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/ru-RU.rc [iso-8859-1] Sat Sep 27 19:13:32 2014 @@ -37,7 +37,7 @@ MENUITEM "&ÐÐ¾Ð´ÐºÐ»ÑÑÐ¸ÑÑ ÑÐµÑÐµÐ²Ð¾Ð¹ ÑÐµÐµÑÑÑ...", ID_REGISTRY_CONNECTNETWORKREGISTRY MENUITEM "&ÐÑÐºÐ»ÑÑÐ¸ÑÑ ÑÐµÑÐµÐ²Ð¾Ð¹ ÑÐµÐµÑÑÑ...", ID_REGISTRY_DISCONNECTNETWORKREGISTRY, GRAYED MENUITEM SEPARATOR - MENUITEM "&ÐÐµÑÐ°ÑÐ°Ñ\tCtrl+P", ID_REGISTRY_PRINT, GRAYED + MENUITEM "&ÐÐµÑÐ°ÑÑ\tCtrl+P", ID_REGISTRY_PRINT, GRAYED MENUITEM SEPARATOR MENUITEM "Ð&ÑÑÐ¾Ð´", ID_REGISTRY_EXIT END @@ -230,7 +230,7 @@ LTEXT "ÐÐ¾ÑÑ:", IDC_STATIC, 10, 134, 38, 8 CONTROL "", IDC_PORT_LIST, "SysListView32", LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 10, 144, 261, 31 - LTEXT "ÐÐ°Ð½Ð½Ð½ÑÐµ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð°:", IDC_STATIC, 10, 177, 80, 8 + LTEXT "ÐÐ°Ð½Ð½ÑÐµ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð°:", IDC_STATIC, 10, 177, 80, 8 CONTROL "", IDC_DEVICE_LIST, "SysListView32", LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 10, 188, 261, 31 GROUPBOX "ÐÐ°Ð·Ð½Ð°ÑÐµÐ½Ð¸Ðµ", IDC_STATIC, 10, 219, 125, 39 Modified: trunk/reactos/dll/cpl/console/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/lang/ru-RU… ============================================================================== --- trunk/reactos/dll/cpl/console/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/console/lang/ru-RU.rc [iso-8859-1] Sat Sep 27 19:13:32 2014 @@ -23,7 +23,7 @@ EDITTEXT IDC_EDIT_NUM_BUFFER, 90, 120, 30, 15, ES_RIGHT | ES_NUMBER | WS_GROUP CONTROL "", IDC_UPDOWN_NUM_BUFFER, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 119, 120, 12, 15 - CHECKBOX "&Ð£Ð±Ð¸ÑÐ°ÑÑ ÑÑÐ°ÑÑÐµ ÑÐºÐ·ÐµÐ¼Ð»ÑÑÑ", IDC_CHECK_DISCARD_DUPLICATES, 12, 140, 110, 15 + CHECKBOX "&Ð£Ð±Ð¸ÑÐ°ÑÑ ÑÑÐ°ÑÑÐµ ÑÐºÐ·ÐµÐ¼Ð¿Ð»ÑÑÑ", IDC_CHECK_DISCARD_DUPLICATES, 12, 140, 110, 15 GROUPBOX "Ð ÐµÐ´Ð°ÐºÑÐ¸ÑÐ¾Ð²Ð°Ð½Ð¸Ðµ", -1, 133, 85, 112, 77, BS_GROUPBOX | WS_CHILD | WS_VISIBLE | WS_GROUP CHECKBOX "&ÐÑÑÑÑÐ¾Ðµ ÑÐµÐ´Ð°ÐºÑÐ¸ÑÐ¾Ð²Ð°Ð½Ð¸Ðµ", IDC_CHECK_QUICK_EDIT, 140, 97, 102, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP CHECKBOX "&Ð ÐµÐ¶Ð¸Ð¼ Ð²ÑÑÐ°Ð²ÐºÐ¸", IDC_CHECK_INSERT_MODE, 140, 113, 76, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP @@ -43,8 +43,8 @@ LISTBOX IDC_LBOX_FONTTYPE, 10, 120, 110, 40, LBS_SORT | LBS_HASSTRINGS | WS_VSCROLL GROUPBOX "", IDC_GROUPBOX_FONT_NAME, 6, 156, 241, 50 CONTROL "", IDC_STATIC_SELECT_FONT_PREVIEW, "Static", SS_OWNERDRAW | SS_SUNKEN, 16, 165, 95, 35 - LTEXT "ÐÐ°Ð¶Ð´ÑÐ¹ ÑÐ¸Ð¼Ð²Ð¾Ð»:", -1, 124, 166, 75, 10 - LTEXT "ÑÐ¸ÑÐ¾ÐºÐ¸Ðµ Ð¿Ð¸ÐºÑÐµÐ»Ñ Ð½Ð° ÑÐºÑÐ°Ð½Ðµ\nÐ²ÑÑÐ¾ÐºÐ¸Ðµ Ð¿Ð¸ÐºÑÐµÐ»Ñ Ð½Ð° ÑÐºÑÐ°Ð½Ðµ", -1, 136, 180, 101, 20 + LTEXT "Ð Ð°Ð·Ð¼ÐµÑ Ð·Ð½Ð°ÐºÐ¾Ð²:", -1, 124, 166, 75, 10 + LTEXT "Ð¨Ð¸ÑÐ¸Ð½Ð° (Ð¿Ð¸ÐºÑÐµÐ»Ð¸):\nÐÑÑÐ¾ÑÐ° (Ð¿Ð¸ÐºÑÐµÐ»Ð¸):", -1, 136, 180, 101, 20 LTEXT "", IDC_FONT_SIZE_X, 120, 180, 10, 10 LTEXT "", IDC_FONT_SIZE_Y, 120, 188, 10, 10 END @@ -99,7 +99,7 @@ WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 48, 112, 10 CONTROL "Ð&ÑÐ¿Ð»ÑÐ²Ð°ÑÑÐ¸Ð¹ ÑÐ¾Ð½", IDC_RADIO_POPUP_BACKGROUND, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 67, 112, 10 - GROUPBOX "Selected Color Components", -1, 129, 7, 118, 73 + GROUPBOX "ÐÑÐ±ÑÐ°Ð½Ð½ÑÐµ ÑÐ²ÐµÑÐ° ÐºÐ¾Ð¼Ð¿Ð¾Ð½ÐµÐ½ÑÐ¾Ð²", -1, 129, 7, 118, 73 LTEXT "&ÐÑÐ°ÑÐ½ÑÐ¹:", -1, 140, 25, 48, 10 EDITTEXT IDC_EDIT_COLOR_RED, 210, 22, 30, 14, ES_RIGHT | ES_NUMBER | WS_GROUP CONTROL "", IDC_UPDOWN_COLOR_RED, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | @@ -128,9 +128,9 @@ CONTROL "", IDC_STATIC_COLOR14, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 199, 90, 12, 12 CONTROL "", IDC_STATIC_COLOR15, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 213, 90, 12, 12 CONTROL "", IDC_STATIC_COLOR16, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 227, 90, 12, 12 - GROUPBOX "Preview (Screen)", -1, 7, 111, 240, 40 + GROUPBOX "ÐÑÐµÐ´Ð¿ÑÐ¾ÑÐ¼Ð¾ÑÑ (ÐÐºÑÐ°Ð½)", -1, 7, 111, 240, 40 CONTROL "", IDC_STATIC_SCREEN_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 124, 224, 20 - GROUPBOX "Preview (Popup)", -1, 7, 162, 240, 40 + GROUPBOX "ÐÑÐµÐ´Ð¿ÑÐ¾ÑÐ¼Ð¾ÑÑ (ÐÐºÐ½Ð¾)", -1, 7, 162, 240, 40 CONTROL "", IDC_STATIC_POPUP_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 176, 224, 20 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] Sat Sep 27 19:13:32 2014 @@ -11,7 +11,7 @@ LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 7, 7, 238, 85, WS_EX_CLIENTEDGE PUSHBUTTON "ÐÐ¾Ð±Ð°Ð²Ð¸ÑÑ...", IDC_USERS_ADD, 87, 98, 50, 14 PUSHBUTTON "Ð£Ð´Ð°Ð»Ð¸ÑÑ", IDC_USERS_REMOVE, 141, 98, 50, 14 - PUSHBUTTON "Ð¡Ð²Ð¾Ð¸ÑÑÐ²Ð°", IDC_USERS_PROPERTIES, 195, 98, 50, 14 + PUSHBUTTON "Ð¡Ð²Ð¾Ð¹ÑÑÐ²Ð°", IDC_USERS_PROPERTIES, 195, 98, 50, 14 AUTOCHECKBOX "Ð¢ÑÐµÐ±ÑÐµÑÑÑ Ð¸Ð¼Ñ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ Ð¸ Ð¿Ð°ÑÐ¾Ð»Ñ Ð¿ÑÐ¸ Ð·Ð°Ð³ÑÑÐ·ÐºÐµ ÑÐ¸ÑÑÐµÐ¼Ñ.", IDC_USERS_STARTUP_REQUIRE, 10, 118, 200, 14, WS_DISABLED PUSHBUTTON "Ð¡Ð±ÑÐ¾ÑÐ¸ÑÑ Ð¿Ð°ÑÐ¾Ð»Ñ", IDC_USERS_RESET, 165, 200, 80, 14, WS_DISABLED END @@ -25,7 +25,7 @@ LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 7, 7, 238, 85, WS_EX_CLIENTEDGE PUSHBUTTON "ÐÐ¾Ð±Ð°Ð²Ð¸ÑÑ...", IDC_GROUPS_ADD, 87, 98, 50, 14 PUSHBUTTON "Ð£Ð´Ð°Ð»Ð¸ÑÑ", IDC_GROUPS_REMOVE, 141, 98, 50, 14 - PUSHBUTTON "Ð¡Ð²Ð¾Ð¸ÑÑÐ²Ð°", IDC_GROUPS_PROPERTIES, 195, 98, 50, 14 + PUSHBUTTON "Ð¡Ð²Ð¾Ð¹ÑÑÐ²Ð°", IDC_GROUPS_PROPERTIES, 195, 98, 50, 14 END IDD_EXTRA DIALOGEX 0, 0, 252, 223 @@ -33,7 +33,7 @@ CAPTION "ÐÐ¾Ð¿Ð¾Ð»Ð½Ð¸ÑÐµÐ»ÑÐ½Ð¾" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "ÐÑÐ¾ Ð¼ÐµÑÑÐ¾ Ð¿ÑÐµÐ´Ð½Ð°Ð¼ÐµÑÐµÐ½Ð¾ Ð¾ÑÑÐ°Ð²Ð»ÐµÐ½Ð¾ Ð½ÐµÐ·Ð°Ð¿Ð¾Ð»Ð½ÐµÐ½Ð½ÑÐ¼", IDC_STATIC, 66, 90, 112, 8 + LTEXT "ÐÑÐ¾ Ð¼ÐµÑÑÐ¾ Ð¿ÑÐµÐ´Ð½Ð°Ð¼ÐµÑÐµÐ½Ð½Ð¾ Ð¾ÑÑÐ°Ð²Ð»ÐµÐ½Ð¾ Ð½ÐµÐ·Ð°Ð¿Ð¾Ð»Ð½ÐµÐ½Ð½ÑÐ¼", IDC_STATIC, 66, 90, 112, 8 END IDD_USER_GENERAL DIALOGEX 0, 0, 252, 223 Modified: trunk/reactos/dll/win32/comctl32/lang/comctl_Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/lang/co… ============================================================================== --- trunk/reactos/dll/win32/comctl32/lang/comctl_Ru.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/lang/comctl_Ru.rc [iso-8859-1] Sat Sep 27 19:13:32 2014 @@ -29,7 +29,7 @@ STRINGTABLE { IDM_TODAY "Ð¡ÐµÐ³Ð¾Ð´Ð½Ñ:" - IDM_GOTODAY "Ð¢ÐµÐºÑÑÐ°Ñ Ð´Ð°ÑÐ°" + IDM_GOTODAY "Ð ÑÐµÐ³Ð¾Ð´Ð½ÑÑÐ½ÐµÐ¹ Ð´Ð°ÑÐµ" } STRINGTABLE @@ -77,14 +77,14 @@ FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "&ÐÐ°ÐºÑÑÑÑ", IDCANCEL,320,6,70,14 - PUSHBUTTON "Ð¡&Ð±ÑÐ¾ÑÐ¸ÑÑ", IDC_RESET_BTN,320,23,70,14 + PUSHBUTTON "Ð¡&Ð±ÑÐ¾Ñ", IDC_RESET_BTN,320,23,70,14 PUSHBUTTON "&Ð¡Ð¿ÑÐ°Ð²ÐºÐ°", IDC_HELP_BTN,320,40,70,14 PUSHBUTTON "ÐÐµÑÐµÐ¼ÐµÑÑÐ¸ÑÑ Ð²Ð²&ÐµÑÑ", IDC_MOVEUP_BTN,320,74,70,14 PUSHBUTTON "ÐÐµÑÐµÐ¼ÐµÑÑÐ¸ÑÑ &Ð²Ð½Ð¸Ð·", IDC_MOVEDN_BTN,320,91,70,14 LTEXT "ÐÐ¾ÑÑÑÐ¿Ð½ÑÐµ &ÐºÐ½Ð¾Ð¿ÐºÐ¸:", -1,4,5,120,10 LISTBOX IDC_AVAILBTN_LBOX,5,17,120,100, LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP - PUSHBUTTON "&ÐÐ¾Ð±Ð°Ð²Ð¸ÑÑ ->", IDOK, 132, 42, 55, 14 - PUSHBUTTON "<- &Ð£Ð´Ð°Ð»Ð¸ÑÑ", IDC_REMOVE_BTN,132,62,55,14 + PUSHBUTTON "&ÐÐ¾Ð±Ð°Ð²Ð¸ÑÑ >", IDOK, 132, 42, 55, 14 + PUSHBUTTON "< &Ð£Ð´Ð°Ð»Ð¸ÑÑ", IDC_REMOVE_BTN,132,62,55,14 LTEXT "ÐÐ½Ð¾Ð¿ÐºÐ¸ &Ð¿Ð°Ð½ÐµÐ»Ð¸ Ð¸Ð½ÑÑÑÑÐ¼ÐµÐ½ÑÐ¾Ð²:", -1,194,5,120,10 LISTBOX IDC_TOOLBARBTN_LBOX, 194,17,120,100,LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP END Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/lang/cdlg_Ru.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/lang/cdlg_Ru.rc [iso-8859-1] Sat Sep 27 19:13:32 2014 @@ -34,7 +34,7 @@ / : < > |" IDS_PATHNOTEXISTING "ÐÑÑÑ Ð½Ðµ ÑÑÑÐµÑÑÐ²ÑÐµÑ" IDS_FILENOTEXISTING "Ð¤Ð°Ð¹Ð» Ð½Ðµ ÑÑÑÐµÑÑÐ²ÑÐµÑ" - IDS_INVALID_FOLDERNAME "The selection contains a non-folder object" + IDS_INVALID_FOLDERNAME "ÐÑÐ±Ð¾Ñ ÑÐ¾Ð´ÐµÑÐ¶Ð¸Ñ Ð¾Ð±ÑÐµÐºÑ Ð½Ðµ ÑÐ²Ð»ÑÑÑÐ¸Ð¹ÑÑ Ð¿Ð°Ð¿ÐºÐ¾Ð¹" } STRINGTABLE @@ -69,8 +69,8 @@ PD32_DEFAULT_PRINTER "ÐÑÐ¸Ð½ÑÐµÑ Ð¿Ð¾ ÑÐ¼Ð¾Ð»ÑÐ°Ð½Ð¸Ñ; " PD32_NR_OF_DOCUMENTS_IN_QUEUE "ÐÐ¾ÐºÑÐ¼ÐµÐ½ÑÐ¾Ð² Ð² Ð¾ÑÐµÑÐµÐ´Ð¸: %d" - PD32_MARGINS_IN_INCHES "ÐÑÐ°Ð½Ð¸ÑÑ [Ð´ÑÐ¹Ð¼Ñ)" - PD32_MARGINS_IN_MILLIMETERS "ÐÑÐ°Ð½Ð¸ÑÑ [Ð¼Ð¼]" + PD32_MARGINS_IN_INCHES "ÐÐ¾Ð»Ñ (Ð´ÑÐ¹Ð¼Ñ)" + PD32_MARGINS_IN_MILLIMETERS "ÐÐ¾Ð»Ñ (Ð¼Ð¼)" PD32_MILLIMETERS "Ð¼Ð¼" PD32_PRINTER_STATUS_READY "ÐÐ¾ÑÐ¾Ð²Ð¾" @@ -95,7 +95,7 @@ PD32_PRINTER_STATUS_NO_TONER "ÐÐµÑ ÑÐ¾Ð½ÐµÑÐ°; " PD32_PRINTER_STATUS_PAGE_PUNT "Ð¡ÑÑÐ°Ð½Ð¸ÑÐ° Ð½Ðµ Ð½Ð°Ð¿ÐµÑÐ°ÑÐ°Ð½Ð°; " PD32_PRINTER_STATUS_USER_INTERVENTION "ÐÑÐµÑÐ²Ð°Ð½Ð¾ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»ÐµÐ¼; " - PD32_PRINTER_STATUS_OUT_OF_MEMORY "ÐÐ°Ð»Ð¾ Ð¿Ð°Ð¼ÑÑÐ¸; " + PD32_PRINTER_STATUS_OUT_OF_MEMORY "ÐÐµÐ´Ð¾ÑÑÐ°ÑÐ¾ÑÐ½Ð¾ Ð¿Ð°Ð¼ÑÑÐ¸; " PD32_PRINTER_STATUS_DOOR_OPEN "ÐÑÑÑÐºÐ° Ð¿ÑÐ¸Ð½ÑÐµÑÐ° Ð¾ÑÐºÑÑÑÐ°; " PD32_PRINTER_STATUS_SERVER_UNKNOWN "ÐÐµÐ¸Ð·Ð²ÐµÑÑÐ½ÑÐ¹ Ð¿ÑÐ¸Ð½Ñ-ÑÐµÑÐ²ÐµÑ; " PD32_PRINTER_STATUS_POWER_SAVE "Ð ÐµÐ¶Ð¸Ð¼ ÑÐºÐ¾Ð½Ð¾Ð¼Ð¸Ð¸ ÑÐ½ÐµÑÐ³Ð¸Ð¸; " @@ -112,19 +112,19 @@ STRINGTABLE /* Color names */ { IDS_COLOR_BLACK "Ð§ÑÑÐ½ÑÐ¹" - IDS_COLOR_MAROON "Ð¢ÑÐ¼Ð½Ð¾-Ð±Ð¾ÑÐ´Ð¾Ð²ÑÐ¹" + IDS_COLOR_MAROON "ÐÐ°Ð»Ð¸Ð½Ð¾Ð²ÑÐ¹" IDS_COLOR_GREEN "ÐÐµÐ»ÑÐ½ÑÐ¹" IDS_COLOR_OLIVE "ÐÐ»Ð¸Ð²ÐºÐ¾Ð²ÑÐ¹" IDS_COLOR_NAVY "Ð¢ÑÐ¼Ð½Ð¾-ÑÐ¸Ð½Ð¸Ð¹" - IDS_COLOR_PURPLE "ÐÑÑÐ¿ÑÑÐ½ÑÐ¹" - IDS_COLOR_TEAL "ÐÐ¾ÑÑÐºÐ¾Ð¹ Ð²Ð¾Ð»Ð½Ñ" + IDS_COLOR_PURPLE "Ð¡Ð¸ÑÐµÐ½ÐµÐ²ÑÐ¹" + IDS_COLOR_TEAL "ÐÐ¸ÑÑÐ·Ð¾Ð²ÑÐ¹" IDS_COLOR_GRAY "Ð¡ÐµÑÑÐ¹" IDS_COLOR_SILVER "Ð¡ÐµÑÐµÐ±ÑÑÐ½ÑÐ¹" IDS_COLOR_RED "ÐÑÐ°ÑÐ½ÑÐ¹" IDS_COLOR_LIME "ÐÐ¸Ð¼Ð¾Ð½Ð½ÑÐ¹" IDS_COLOR_YELLOW "ÐÑÐ»ÑÑÐ¹" IDS_COLOR_BLUE "Ð¡Ð¸Ð½Ð¸Ð¹" - IDS_COLOR_FUCHSIA "Ð¯ÑÐºÐ¾-ÑÐ¾Ð·Ð¾Ð²ÑÐ¹" + IDS_COLOR_FUCHSIA "Ð Ð¾Ð·Ð¾Ð²ÑÐ¹" IDS_COLOR_AQUA "ÐÐ¾Ð»ÑÐ±Ð¾Ð¹" IDS_COLOR_WHITE "ÐÐµÐ»ÑÐ¹" } @@ -137,7 +137,7 @@ IDS_SAVE "Ð¡Ð¾ÑÑÐ°Ð½Ð¸ÑÑ" IDS_SAVE_AS "Ð¡Ð¾ÑÑÐ°Ð½Ð¸ÑÑ ÐºÐ°Ðº" IDS_OPEN_FILE "ÐÑÐºÑÑÑÑ ÑÐ°Ð¹Ð»" - IDS_SELECT_FOLDER "Select Folder" + IDS_SELECT_FOLDER "ÐÑÐ±ÑÐ°ÑÑ Ð¿Ð°Ð¿ÐºÑ" } /* @@ -387,9 +387,9 @@ CAPTION "ÐÐ°ÑÑÑÐ¾Ð¹ÐºÐ° Ð¿ÑÐ¸Ð½ÑÐµÑÐ°" FONT 8, "MS Shell Dlg" BEGIN - DEFPUSHBUTTON "ÐÐ",IDOK,176,156,50,14,WS_GROUP - PUSHBUTTON "ÐÑÐ¼ÐµÐ½Ð°",IDCANCEL,230,156,50,14 -/* PUSHBUTTON "Network...", psh5, 284,156,48,14 */ + DEFPUSHBUTTON "ÐÐ", IDOK, 176, 156, 50, 14, WS_GROUP + PUSHBUTTON "ÐÑÐ¼ÐµÐ½Ð°", IDCANCEL, 230, 156, 50, 14 +/* PUSHBUTTON "Ð¡ÐµÑÑ...", psh5, 284, 156, 48, 14 */ GROUPBOX "ÐÑÐ¸Ð½ÑÐµÑ", grp4, 8, 4, 272,84, WS_GROUP PUSHBUTTON "&Ð¡Ð²Ð¾Ð¹ÑÑÐ²Ð°", psh2, 212, 17, 60,14, WS_GROUP 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] Sat Sep 27 19:13:32 2014 @@ -27,7 +27,7 @@ IDS_NODRIVERS "Ð¤Ð°Ð¹Ð»Ñ Ð´ÑÐ°Ð¹Ð²ÐµÑÐ¾Ð² Ð´Ð»Ñ ÑÑÐ¾Ð³Ð¾ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð° Ð½Ðµ ÑÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ñ Ð¸Ð»Ð¸ Ð½Ðµ Ð±ÑÐ»Ð¸ Ð·Ð°Ð³ÑÑÐ¶ÐµÐ½Ñ." IDS_RESOURCE_COLUMN "Resource type" IDS_SETTING_COLUMN "Setting" - IDS_RESOURCE_MEMORY_RANGE "Memory range" + IDS_RESOURCE_MEMORY_RANGE "ÐÐ°Ð¼ÑÑÑ" IDS_RESOURCE_INTERRUPT "IRQ" IDS_RESOURCE_DMA "DMA" IDS_RESOURCE_PORT "E/A range" @@ -40,10 +40,10 @@ IDS_DEV_NOT_CONFIGURED "ÐÑÐ¾ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð¾ ÐµÑÐµ Ð½Ðµ Ð½Ð°ÑÑÑÐ¾ÐµÐ½Ð¾." IDS_DEV_DEVLOADER_FAILED "ReactOS could not load the driver for this device because the computer is reporting two %1 bus types." IDS_DEV_DEVLOADER_FAILED2 "The %1 device loader(s) for this device could not load the device driver." - IDS_DEV_OUT_OF_MEMORY "The driver for this device may be bad, or your system may be running low on memory or other resources." - IDS_DEV_ENTRY_IS_WRONG_TYPE "This device is not working properly because one of its drivers may be bad, or your registry may be bad." - IDS_DEV_LACKED_ARBITRATOR "The driver for this device requested a resource that ReactOS does not know how to handle." - IDS_DEV_BOOT_CONFIG_CONFLICT "Another device is using the resources this device needs." + IDS_DEV_OUT_OF_MEMORY "ÐÑÐ°Ð¹Ð²ÐµÑ Ð´Ð»Ñ Ð´Ð°Ð½Ð½Ð¾Ð³Ð¾ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð° Ð¼Ð¾Ð¶ÐµÑ Ð±ÑÑÑ Ð¿Ð¾Ð²ÑÐµÐ¶Ð´ÐµÐ½, Ð¸Ð»Ð¸ Ð² ÑÐ¸ÑÑÐµÐ¼Ðµ Ð½ÐµÐ´Ð¾ÑÑÐ°ÑÐ¾ÑÐ½Ð¾ Ð¿Ð°Ð¼ÑÑÐ¸ Ð¸Ð»Ð¸ Ð¸Ð½ÑÑ ÑÐµÑÑÑÑÐ¾Ð²." + IDS_DEV_ENTRY_IS_WRONG_TYPE "ÐÑÐ¾ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð¾ ÑÐ°Ð±Ð¾ÑÐ°ÐµÑ Ð½ÐµÐ¿ÑÐ°Ð²Ð¸Ð»ÑÐ½Ð¾. ÐÐ´Ð¸Ð½ Ð¸Ð· Ð´ÑÐ°Ð¹Ð²ÐµÑÐ¾Ð² Ð¸Ð»Ð¸ ÑÐµÐµÑÑÑ ÑÐ¸ÑÑÐµÐ¼Ñ Ð¿Ð¾Ð²ÑÐµÐ¶Ð´ÐµÐ½." + IDS_DEV_LACKED_ARBITRATOR "ÐÑÐ°Ð¹Ð²ÐµÑ Ð´Ð°Ð½Ð½Ð¾Ð³Ð¾ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð° ÑÑÐµÐ±ÑÐµÑ ÑÐµÑÑÑÑÐ¾Ð², ÐºÐ¾ÑÐ¾ÑÑÐµ Ð½Ðµ Ð¼Ð¾Ð³ÑÑ Ð¿Ð¾Ð´Ð´ÐµÑÐ¶Ð¸Ð²Ð°ÑÑÑÑ ReactOS." + IDS_DEV_BOOT_CONFIG_CONFLICT "ÐÐ¾Ð½ÑÐ¸Ð³ÑÑÐ°ÑÐ¸Ñ Ð·Ð°Ð³ÑÑÐ·ÐºÐ¸ Ð´Ð»Ñ ÑÑÐ¾Ð³Ð¾ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð° ÐºÐ¾Ð½ÑÐ»Ð¸ÐºÑÑÐµÑ Ñ Ð´ÑÑÐ³Ð¸Ð¼Ð¸ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð°Ð¼Ð¸." IDS_DEV_FAILED_FILTER "ÐÑÐ°Ð¹Ð²ÐµÑÑ Ð´Ð»Ñ ÑÑÐ¾Ð³Ð¾ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð° Ð´Ð¾Ð»Ð¶Ð½Ñ Ð±ÑÑÑ Ð¿ÐµÑÐµÑÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ñ." IDS_DEV_DEVLOADER_NOT_FOUND "This device is not working properly because ReactOS cannot load the file %1 that loads the drivers for the device." IDS_DEV_DEVLOADER_NOT_FOUND2 "This device is not working properly because the file %1 that loads the drivers for this device is bad." @@ -118,7 +118,7 @@ IDS_PROP_CLASSCOINSTALLER "Ð¡Ð¾ÑÑÑÐ°Ð½Ð¾Ð²ÑÐ¸ÐºÐ¸ ÐºÐ»Ð°ÑÑÐ¾Ð²" IDS_PROP_DEVICECOINSTALLER "Ð¡Ð¾ÑÑÑÐ°Ð½Ð¾Ð²ÑÐ¸ÐºÐ¸ ÑÑÑÑÐ¾Ð¹ÑÑÐ²" IDS_PROP_FIRMWAREREVISION "ÐÐ¸ÐºÑÐ¾Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ð°" - IDS_PROP_CURRENTPOWERSTATE "Ð¢ÐµÐºÑÑÐµÐµ ÑÐ¾ÑÑÐ¾ÑÐ½Ð¸Ðµ ÑÐ»ÐµÐºÑÑÐ¾Ð¿Ð¸ÑÐ°Ð½Ð¸Ñ" + IDS_PROP_CURRENTPOWERSTATE "Ð¢ÐµÐºÑÑÐµÐµ ÑÐ¾ÑÑÐ¾ÑÐ½Ð¸Ðµ ÑÐ»ÐµÐºÑÑÐ¾Ð¿Ð¸ÑÐ°Ð½Ð¸Ñ" IDS_PROP_POWERCAPABILITIES "ÐÐ¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ÑÑÐ¸ ÑÐ»ÐµÐºÑÑÐ¾Ð¿Ð¸ÑÐ°Ð½Ð¸Ñ" IDS_PROP_POWERSTATEMAPPINGS "Ð¡Ð¾Ð¿Ð¾ÑÑÐ°Ð²Ð»ÐµÐ½Ð¸Ñ ÑÐ½ÐµÑÐ³Ð¾ÑÐ±ÐµÑÐµÐ¶ÐµÐ½Ð¸Ñ" END Modified: trunk/reactos/dll/win32/msgina/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/ru-R… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/ru-RU.rc [iso-8859-1] Sat Sep 27 19:13:32 2014 @@ -123,7 +123,7 @@ BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 ICON IDI_SHELL_SHUTDOWN, IDI_SHELL_SHUTDOWN, 9, 57, 21, 20, WS_GROUP - LTEXT "&ÐÑÐ±ÐµÑÐ¸ÑÐµ Ð¶ÐµÐ»Ð°ÐµÐ¼Ð¾Ðµ Ð´ÐµÐ¹ÑÑÐ²Ð¸Ðµ.", IDC_STATIC, 39, 57, 167, 10 + LTEXT "&ÐÑÐ±ÐµÑÐ¸ÑÐµ Ð¶ÐµÐ»Ð°ÐµÐ¼Ð¾Ðµ Ð´ÐµÐ¹ÑÑÐ²Ð¸Ðµ:", IDC_STATIC, 39, 57, 167, 10 COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27 DEFPUSHBUTTON "OK", IDOK, 143, 122, 55, 14, WS_GROUP @@ -152,15 +152,15 @@ IDS_LOGONDATE "ÐÐ°ÑÐ° Ð²ÑÐ¾Ð´Ð°: %s %s" IDS_COMPUTERLOCKED "ÐÐ¾Ð¼Ð¿ÑÑÑÐµÑ Ð·Ð°Ð±Ð»Ð¾ÐºÐ¸ÑÐ¾Ð²Ð°Ð½" IDS_LOCKEDWRONGPASSWORD "ÐÐµÐ²ÐµÑÐ½ÑÐ¹ Ð¿Ð°ÑÐ¾Ð»Ñ. ÐÐ¾Ð¶Ð°Ð»ÑÐ¹ÑÑÐ°, Ð²Ð²ÐµÐ´Ð¸ÑÐµ Ð¿Ð°ÑÐ¾Ð»Ñ ÐµÑÐµ ÑÐ°Ð·. Ð¡Ð¸Ð¼Ð²Ð¾Ð»Ñ Ð² Ð¿Ð°ÑÐ¾Ð»Ðµ Ð²Ð²Ð¾Ð´ÑÑÑÑ Ñ ÑÑÐµÑÐ¾Ð¼ ÑÐµÐ³Ð¸ÑÑÑÐ°." - IDS_LOCKEDWRONGUSER "This computer is locked. Only %s\\%s or an Administrator can unlock this computer." + IDS_LOCKEDWRONGUSER "ÐÑÐ¾Ñ ÐºÐ¾Ð¼Ð¿ÑÑÑÐµÑ ÑÐµÐ¹ÑÐ°Ñ Ð·Ð°Ð±Ð»Ð¾ÐºÐ¸ÑÐ¾Ð²Ð°Ð½. Ð¢Ð¾Ð»ÑÐºÐ¾ %s\\%s Ð¸Ð»Ð¸ ÐÐ´Ð¼Ð¸Ð½Ð¸ÑÑÑÐ°ÑÐ¾Ñ Ð¼Ð¾Ð³ÑÑ ÑÐ°Ð·Ð±Ð»Ð¾ÐºÐ¸ÑÐ¾Ð²Ð°ÑÑ ÑÑÐ¾Ñ ÐºÐ¾Ð¼Ð¿ÑÑÑÐµÑ." IDS_CHANGEPWDTITLE "Ð¡Ð¼ÐµÐ½Ð¸ÑÑ Ð¿Ð°ÑÐ¾Ð»Ñ" - IDS_NONMATCHINGPASSWORDS "ÐÐ²ÐµÐ´ÐµÐ½Ð½ÑÐµ Ð¿Ð°ÑÐ¾Ð»Ð¸ Ð½ÐµÑÐ¾Ð²Ð¿Ð°Ð´Ð°ÑÑ. ÐÐ²ÐµÐ´Ð¸ÑÐµ Ð¿Ð°ÑÐ¾Ð»Ñ Ð² Ð¾Ð±Ð° Ð¿Ð¾Ð»Ñ" + IDS_NONMATCHINGPASSWORDS "ÐÐ²ÐµÐ´ÐµÐ½Ð½ÑÐµ Ð¿Ð°ÑÐ¾Ð»Ð¸ Ð½Ðµ ÑÐ¾Ð²Ð¿Ð°Ð´Ð°ÑÑ. ÐÐ²ÐµÐ´Ð¸ÑÐµ Ð¿Ð°ÑÐ¾Ð»Ñ Ð² Ð¾Ð±Ð° Ð¿Ð¾Ð»Ñ" IDS_PASSWORDCHANGED "ÐÐ°Ñ Ð¿Ð°ÑÐ¾Ð»Ñ Ð±ÑÐ» Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½." IDS_LOGONTITLE "Logon Message" - IDS_LOGONWRONGUSERORPWD "Ð¡Ð¸ÑÑÐµÐ¼Ðµ Ð½Ðµ ÑÐ´Ð°ÐµÑÑÑ Ð²Ð¾Ð¹ÑÐ¸ Ð². ÐÑÐ¾Ð²ÐµÑÑÑÐµ Ð¿ÑÐ°Ð²Ð¸Ð»ÑÐ½Ð¾ÑÑÑ Ð¸Ð¼ÐµÐ½Ð¸ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ Ð¸ Ð´Ð¾Ð¼ÐµÐ½Ð° Ð¸ Ð¿Ð¾Ð²ÑÐ¾ÑÐ¸ÑÐµ Ð²Ð²Ð¾Ð´. ÐÐ°ÑÐ¾Ð»Ð¸ Ð²Ð²Ð¾Ð´ÑÑÑÑ Ñ ÑÑÐµÑÐ¾Ð¼ ÑÐµÐ³Ð¸ÑÑÑÐ°" + IDS_LOGONWRONGUSERORPWD "Ð¡Ð¸ÑÑÐµÐ¼Ðµ Ð½Ðµ ÑÐ´Ð°ÐµÑÑÑ Ð²Ð¾Ð¹ÑÐ¸. ÐÑÐ¾Ð²ÐµÑÑÑÐµ Ð¿ÑÐ°Ð²Ð¸Ð»ÑÐ½Ð¾ÑÑÑ Ð¸Ð¼ÐµÐ½Ð¸ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ Ð¸ Ð´Ð¾Ð¼ÐµÐ½Ð° Ð¸ Ð¿Ð¾Ð²ÑÐ¾ÑÐ¸ÑÐµ Ð²Ð²Ð¾Ð´. ÐÐ°ÑÐ¾Ð»Ð¸ Ð²Ð²Ð¾Ð´ÑÑÑÑ Ñ ÑÑÐµÑÐ¾Ð¼ ÑÐµÐ³Ð¸ÑÑÑÐ°" IDS_LOGONUSERDISABLED "ÐÐ°Ñ Ð°ÐºÐºÐ°ÑÐ½Ñ Ð¾ÑÐºÐ»ÑÑÐµÐ½. ÐÐ¾Ð¶Ð°Ð»ÑÐ¹ÑÑÐ°, Ð¾Ð±ÑÐ°ÑÐ¸ÑÐµÑÑ Ðº ÑÐ¸ÑÑÐµÐ¼Ð½Ð¾Ð¼Ñ Ð°Ð´Ð¼Ð¸Ð½Ð¸ÑÑÑÐ°ÑÐ¾ÑÑ." - IDS_PASSWORDMUSTCHANGE "You are required to change your password at first logon." - IDS_PASSWORDEXPIRED "Your password has expired and must be changed." + IDS_PASSWORDMUSTCHANGE "ÐÑ Ð´Ð¾Ð»Ð¶Ð½Ñ ÑÐ¼ÐµÐ½Ð¸ÑÑ Ð¿Ð°ÑÐ¾Ð»Ñ Ð¿ÑÐ¸ ÑÐ»ÐµÐ´ÑÑÑÐµÐ¼ Ð²ÑÐ¾Ð´Ðµ." + IDS_PASSWORDEXPIRED "Ð¡ÑÐ¾Ðº Ð´ÐµÐ¹ÑÑÐ²Ð¸Ñ Ð²Ð°ÑÐµÐ³Ð¾ Ð¿Ð°ÑÐ¾Ð»Ñ Ð¸ÑÑÐµÐº, Ð½ÐµÐ¾Ð±ÑÐ¾Ð´Ð¸Ð¼Ð¾ ÐµÐ³Ð¾ Ð¸Ð·Ð¼ÐµÐ½Ð¸ÑÑ." END /* Shutdown Dialog Strings */ Modified: trunk/reactos/dll/win32/msvfw32/lang/msvfw32_Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/lang/msv… ============================================================================== --- trunk/reactos/dll/win32/msvfw32/lang/msvfw32_Ru.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvfw32/lang/msvfw32_Ru.rc [iso-8859-1] Sat Sep 27 19:13:32 2014 @@ -41,7 +41,7 @@ CONTROL "ÐÐ»&ÑÑÐµÐ²Ð¾Ð¹ ÐºÐ°Ð´Ñ ÐºÐ°Ð¶Ð´ÑÐµ",887,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,60,66,12 EDITTEXT 888,78,60,22,12 - LTEXT "ÐºÐ°Ð´ÑÐ¾Ð²",889,103,62,26,10 + LTEXT "ÐºÐ°Ð´Ñ(Ð¾Ð²)",889,103,62,26,10 CONTROL "&ÐÐ¾ÑÐ¾Ðº Ð´Ð°Ð½Ð½ÑÑ",894,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,76,66,12 EDITTEXT 895,78,76,22,12 Modified: trunk/reactos/dll/win32/oledlg/lang/oledlg_Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/lang/oled… ============================================================================== --- trunk/reactos/dll/win32/oledlg/lang/oledlg_Ru.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oledlg/lang/oledlg_Ru.rc [iso-8859-1] Sat Sep 27 19:13:32 2014 @@ -23,7 +23,7 @@ UIINSERTOBJECT DIALOG 0, 0, 294, 151 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "ÐÑÑÐ°Ð²Ð¸ÑÑ Ð¾Ð±ÑÐµÐºÑ" +CAPTION "ÐÑÑÐ°Ð²ÐºÐ° Ð¾Ð±ÑÐµÐºÑÐ°" FONT 8, "MS Shell Dlg" BEGIN LISTBOX IDC_OBJTYPELIST,82,19,131,66,LBS_SORT | @@ -65,7 +65,7 @@ LTEXT "ÐÑÑÐ¾ÑÐ½Ð¸Ðº:", -1, 6, 9, 30, 8, WS_VISIBLE | WS_GROUP CONTROL "&ÐÑÑÐ°Ð²Ð¸ÑÑ", IDC_PS_PASTE, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_GROUP | WS_VISIBLE, 6, 38, 55, 10 - CONTROL "ÐÑÑÐ°Ð²Ð¸ÑÑ &Ð¡ÑÑÐ»ÐºÑ", IDC_PS_PASTELINK, "Button", BS_AUTORADIOBUTTON | WS_VISIBLE, + CONTROL "ÐÑÑÐ°Ð²Ð¸ÑÑ ÑÐ²&ÑÐ·Ñ", IDC_PS_PASTELINK, "Button", BS_AUTORADIOBUTTON | WS_VISIBLE, 6, 63, 55, 10 LTEXT "&ÐÐ°Ðº:", -1, 65, 25, 16, 8, WS_VISIBLE | WS_GROUP LISTBOX IDC_PS_PASTELIST, 65, 36, 153, 57, LBS_NOTIFY | LBS_USETABSTOPS | WS_VSCROLL | WS_BORDER | NOT WS_VISIBLE @@ -76,7 +76,7 @@ CONTROL "Ð¡&Ð¿ÑÐ°Ð²ÐºÐ°", IDC_OLEUIHELP, "Button", BS_PUSHBUTTON | WS_TABSTOP | WS_VISIBLE, 224, 42, 66, 14 CONTROL "&ÐÐ¾ÐºÐ°Ð·ÑÐ²Ð°ÑÑ ÐºÐ°Ðº Ð·Ð½Ð°ÑÐ¾Ðº", IDC_PS_DISPLAYASICON, "Button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_VISIBLE, 224, 59, 66, 14 CONTROL "", IDC_PS_ICONDISPLAY, "Static", SS_ICON | WS_VISIBLE, 224, 75, 66, 44 - CONTROL "ÐÐ·Ð¼ÐµÐ½Ð¸ÑÑ &Ð·Ð½Ð°ÑÐ¾Ðº...", IDC_PS_CHANGEICON, "Button", BS_PUSHBUTTON | WS_TABSTOP | WS_VISIBLE, 224, 123, 66, 14 + CONTROL "Ð¡Ð¼ÐµÐ½Ð¸ÑÑ &Ð·Ð½Ð°ÑÐ¾Ðº...", IDC_PS_CHANGEICON, "Button", BS_PUSHBUTTON | WS_TABSTOP | WS_VISIBLE, 224, 123, 66, 14 CONTROL "", IDC_PS_RESULTIMAGE, "Static", SS_ICON | WS_VISIBLE, 8, 101, 42, 34 CONTROL "<< result text goes here >>", IDC_PS_RESULTTEXT, "Static", SS_NOPREFIX | WS_VISIBLE, 54, 100, 159, 35 CONTROL "Ð ÐµÐ·ÑÐ»ÑÑÐ°Ñ", -1, "Button", BS_GROUPBOX | WS_GROUP | WS_VISIBLE, 6, 90, 212, 48 @@ -89,9 +89,9 @@ IDS_PS_PASTE_OBJECT "ÐÑÑÐ°Ð²ÐºÐ° ÑÐ¾Ð´ÐµÑÐ¶Ð¸Ð¼Ð¾Ð³Ð¾ Ð±ÑÑÐµÑÐ° Ð¾Ð±Ð¼ÐµÐ½Ð° Ð² Ð´Ð¾ÐºÑÐ¼ÐµÐ½Ñ ÑÐ°Ðº, ÑÑÐ¾ ÐµÐ³Ð¾ Ð¼Ð¾Ð¶Ð½Ð¾ Ð°ÐºÑÐ¸Ð²Ð¸ÑÐ¾Ð²Ð°ÑÑ, Ð¸ÑÐ¿Ð¾Ð»ÑÐ·ÑÑ %s." IDS_PS_PASTE_OBJECT_AS_ICON "ÐÑÑÐ°Ð²ÐºÐ° ÑÐ¾Ð´ÐµÑÐ¶Ð¸Ð¼Ð¾Ð³Ð¾ Ð±ÑÑÐµÑÐ° Ð¾Ð±Ð¼ÐµÐ½Ð° Ð² Ð´Ð¾ÐºÑÐ¼ÐµÐ½Ñ ÑÐ°Ðº, ÑÑÐ¾ ÐµÐ³Ð¾ Ð¼Ð¾Ð¶Ð½Ð¾ Ð°ÐºÑÐ¸Ð²Ð¸ÑÐ¾Ð²Ð°ÑÑ, Ð¸ÑÐ¿Ð¾Ð»ÑÐ·ÑÑ %s. ÐÐ½ Ð±ÑÐ´ÐµÑ Ð¾ÑÐ¾Ð±ÑÐ°Ð¶Ð°ÑÑÑÑ Ð² Ð²Ð¸Ð´Ðµ Ð·Ð½Ð°ÑÐºÐ°." IDS_PS_PASTE_LINK_DATA "ÐÑÑÐ°Ð²ÐºÐ° ÑÐ¾Ð´ÐµÑÐ¶Ð¸Ð¼Ð¾Ð³Ð¾ Ð±ÑÑÐµÑÐ° Ð¾Ð±Ð¼ÐµÐ½Ð° Ð² Ð´Ð¾ÐºÑÐ¼ÐµÐ½Ñ ÐºÐ°Ðº %s. ÐÐ°Ð½Ð½ÑÐµ Ð±ÑÐ´ÑÑ ÑÐ²ÑÐ·Ð°Ð½Ñ Ñ Ð¸ÑÑÐ¾Ð´Ð½ÑÐ¼ ÑÐ°Ð¹Ð»Ð¾Ð¼, ÑÐ°Ðº ÑÑÐ¾ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð² Ð½ÑÐ¼ Ð±ÑÐ´ÑÑ Ð¾ÑÑÐ°Ð¶Ð°ÑÑÑÑ Ð² Ð´Ð¾ÐºÑÐ¼ÐµÐ½ÑÐµ." - IDS_PS_PASTE_LINK_OBJECT "ÐÑÑÐ°Ð²ÐºÐ° Ð¸Ð·Ð¾Ð±ÑÐ°Ð¶ÐµÐ½Ð¸Ñ Ð¸Ð· Ð±ÑÑÐµÑÐ° Ð¾Ð±Ð¼ÐµÐ½Ð° Ð² Ð´Ð¾ÐºÑÐ¼ÐµÐ½Ñ. ÐÐ·Ð¾Ð±ÑÐ°Ð¶ÐµÐ½Ð¸Ðµ Ð±ÑÐ´ÐµÑ ÑÐ²ÑÐ·Ð°Ð½Ð¾ Ñ Ð¸ÑÑÐ¾Ð´Ð½ÑÐ¼ ÑÐ°Ð¹Ð»Ð¾Ð¼, ÑÐ°Ðº ÑÑÐ¾ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð² Ð½ÑÐ¼ Ð±ÑÐ´ÑÑ Ð¾ÑÑÐ°Ð¶Ð°ÑÑÑÑ Ð² Ð´Ð¾ÐºÑÐ¼ÐµÐ½ÑÐµ." - IDS_PS_PASTE_LINK_OBJECT_AS_ICON "ÐÑÑÐ°Ð²ÐºÐ° ÑÑÑÐ»ÐºÐ¸, ÐºÐ¾ÑÐ¾ÑÐ°Ñ Ð±ÑÐ´ÐµÑ ÑÐºÐ°Ð·ÑÐ²Ð°ÑÑ Ð½Ð° ÑÐ°ÑÐ¿Ð¾Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ ÑÐ¾Ð´ÐµÑÐ¶Ð¸Ð¼Ð¾Ð³Ð¾ Ð±ÑÑÐµÑÐ° Ð¾Ð±Ð¼ÐµÐ½Ð°. Ð¡ÑÑÐ»ÐºÐ° Ð±ÑÐ´ÐµÑ ÑÐ²ÑÐ·Ð°Ð½Ð° Ñ Ð¸ÑÑÐ¾Ð´Ð½ÑÐ¼ ÑÐ°Ð¹Ð»Ð¾Ð¼, ÑÐ°Ðº ÑÑÐ¾ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð² Ð½ÑÐ¼ Ð±ÑÐ´ÑÑ Ð¾ÑÑÐ°Ð¶Ð°ÑÑÑÑ Ð² Ð´Ð¾ÐºÑÐ¼ÐµÐ½ÑÐµ." - IDS_PS_NON_OLE "ÐÑÑÐ°Ð²ÐºÐ° ÑÐ¾Ð´ÐµÑÐ¶Ð¸Ð¼Ð¾Ðµ Ð±ÑÑÐµÑÐ° Ð¾Ð±Ð¼ÐµÐ½Ð° Ð² Ð´Ð¾ÐºÑÐ¼ÐµÐ½Ñ." + IDS_PS_PASTE_LINK_OBJECT "ÐÑÑÐ°Ð²ÐºÐ° Ð² Ð´Ð¾ÐºÑÐ¼ÐµÐ½Ñ Ð¸Ð·Ð¾Ð±ÑÐ°Ð¶ÐµÐ½Ð¸Ðµ ÑÐ¾Ð´ÐµÑÐ¶Ð¸Ð¼Ð¾Ð³Ð¾ Ð±ÑÑÐµÑÐ°. Ð¡Ð²ÑÐ·Ñ Ð¸Ð·Ð¾Ð±ÑÐ°Ð¶ÐµÐ½Ð¸Ñ Ñ Ð¸ÑÑÐ¾Ð´Ð½ÑÐ¼ ÑÐ°Ð¹Ð»Ð¾Ð¼ Ð¿Ð¾Ð·Ð²Ð¾Ð»Ð¸Ñ Ð¾ÑÑÐ°Ð¶Ð°ÑÑ Ð² Ð´Ð¾ÐºÑÐ¼ÐµÐ½ÑÐµ Ð²Ð½ÐµÑÐµÐ½Ð½ÑÐµ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ." + IDS_PS_PASTE_LINK_OBJECT_AS_ICON "ÐÑÑÐ°Ð²ÐºÐ° Ð² Ð´Ð¾ÐºÑÐ¼ÐµÐ½Ñ ÑÑÐ»ÑÐºÐ°, ÑÐºÐ°Ð·ÑÐ²Ð°ÑÑÐµÐ³Ð¾ Ð½Ð° Ð¸ÑÑÐ¾ÑÐ½Ð¸Ðº ÑÐ¾Ð´ÐµÑÐ¶Ð¸Ð¼Ð¾Ð³Ð¾ Ð±ÑÑÐµÑÐ°. Ð¡Ð²ÑÐ·Ñ ÑÑÐ»ÑÐºÐ° Ñ ÑÐ°Ð¹Ð»Ð¾Ð¼ Ð¿Ð¾Ð·Ð²Ð¾Ð»Ð¸Ñ Ð¾ÑÑÐ°Ð¶Ð°ÑÑ Ð² Ð´Ð¾ÐºÑÐ¼ÐµÐ½ÑÐµ Ð²Ð½ÐµÑÐµÐ½Ð½ÑÐµ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ." + IDS_PS_NON_OLE "ÐÑÑÐ°Ð²ÐºÐ° Ð² Ð´Ð¾ÐºÑÐ¼ÐµÐ½Ñ ÑÐ¾Ð´ÐµÑÐ¶Ð¸Ð¼Ð¾Ð³Ð¾ Ð±ÑÑÐµÑÐ°." IDS_PS_UNKNOWN_TYPE "ÐÐµÐ¸Ð·Ð²ÐµÑÑÐ½ÑÐ¹ ÑÐ¸Ð¿" IDS_PS_UNKNOWN_SRC "ÐÐµÐ¸Ð·Ð²ÐµÑÑÐ½ÑÐ¹ Ð¸ÑÑÐ¾ÑÐ½Ð¸Ðº" IDS_PS_UNKNOWN_APP "Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ð°, ÐºÐ¾ÑÐ¾ÑÐ°Ñ ÐµÐ³Ð¾ ÑÐ¾Ð·Ð´Ð°Ð»Ð°" Modified: trunk/reactos/dll/win32/rasdlg/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rasdlg/lang/ru-R… ============================================================================== --- trunk/reactos/dll/win32/rasdlg/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rasdlg/lang/ru-RU.rc [iso-8859-1] Sat Sep 27 19:13:32 2014 @@ -2088,9 +2088,9 @@ 480 "2 Ð¼Ð¸Ð½ÑÑÑ" 481 "30 Ð¼Ð¸Ð½ÑÑ" 482 "30 ÑÐµÐºÑÐ½Ð´" - 483 "3 ÑÐµÐºÑÐ½Ð´" + 483 "3 ÑÐµÐºÑÐ½Ð´Ñ" 484 "4 ÑÐ°ÑÐ°" - 485 "4 Ð¼Ð¸Ð½ÑÑ" + 485 "4 Ð¼Ð¸Ð½ÑÑÑ" 486 "5 Ð¼Ð¸Ð½ÑÑ" 487 "5 ÑÐµÐºÑÐ½Ð´" 488 "8 ÑÐ°ÑÐ¾Ð²" @@ -2218,7 +2218,7 @@ 1580 "ÐÑÐ¾ Ð¿Ð¾Ð´ÐºÐ»ÑÑÐµÐ½Ð¸Ðµ Ð±ÑÐ»Ð¾ Ð½Ð°ÑÑÑÐ¾ÐµÐ½Ð¾ Ð½Ð° Ð¸ÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°Ð½Ð¸Ðµ ÑÐ¸ÑÑÐ¾Ð²Ð°Ð½Ð¸Ñ Ð´Ð°Ð½Ð½ÑÑ, Ð½Ðµ Ð¿Ð¾Ð´Ð´ÐµÑÐ¶Ð¸Ð²Ð°ÐµÐ¼Ð¾Ð³Ð¾ ÑÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½ÑÐ¼ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ð½ÑÐ¼ Ð¾Ð±ÐµÑÐ¿ÐµÑÐµÐ½Ð¸ÐµÐ¼. ÐÐ°ÑÐ°Ð¼ÐµÑÑÑ Ð±ÐµÐ·Ð¾Ð¿Ð°ÑÐ½Ð¾ÑÑÐ¸ ÑÑÐ¾Ð³Ð¾ Ð¿Ð¾Ð´ÐºÐ»ÑÑÐµÐ½Ð¸Ñ Ð±ÑÐ´ÑÑ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ñ Ð½Ð° Ð¸ÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°Ð½Ð¸Ðµ Ð½Ð°Ð¸Ð±Ð¾Ð»ÐµÐµ ÑÐ¸Ð»ÑÐ½Ð¾Ð³Ð¾ Ð¸Ð· Ð¿Ð¾Ð´Ð´ÐµÑÐ¶Ð¸Ð²Ð°ÐµÐ¼ÑÑ Ð¼ÐµÑÐ¾Ð´Ð¾Ð² ÑÐ¸ÑÑÐ¾Ð²Ð°Ð½Ð¸Ñ." 1581 "Ð¢&Ð¸Ð¿ VPN:" 1582 "ÐÐ²ÐµÐ´Ð¸ÑÐµ Ð¸Ð¼Ñ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ." - 1583 "ÐÑÐ¾ Ð¸Ð¼Ñ Ð¸ Ð¿Ð°ÑÐ¾Ð»Ñ Ð±ÑÐ´ÑÑ ÑÐ¾ÑÑÐ°Ð½ÐµÐ½Ñ Ð´Ð»Ñ Ð²Ð°Ñ. Ð£Ð¶Ðµ ÑÑÑÐµÑÑÐ²ÑÑÑ ÑÐ¾ÑÑÐ°Ð½ÐµÐ½Ð½ÑÐµ Ð¸Ð¼Ñ Ð¸ Ð¿Ð°ÑÐ¾Ð»Ñ Ð´Ð»Ñ Ð²ÑÐµÑ Ð´ÑÑÐ³Ð¸Ñ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»ÐµÐ¹ ÑÑÐ¾Ð³Ð¾ Ð¿Ð¾Ð´ÐºÐ»ÑÑÐµÐ½Ð¸Ñ. Ð£Ð´Ð°Ð»Ð¸ÑÑ Ð¸Ð¼Ñ Ð¸ Ð¿Ð°ÑÐ¾Ð»Ñ, ÑÐ¾ÑÑÐ°Ð½ÐµÐ½Ð½ÑÐµ Ð´Ð»Ñ Ð²ÑÐµÑ Ð´ÑÑÐ³Ð¸Ñ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»ÐµÐ¹ Ð¿Ð¾Ð´ÐºÐ»ÑÑÐµÐ½Ð¸Ñ?" + 1583 "ÐÑÐ¾ Ð¸Ð¼Ñ Ð¸ Ð¿Ð°ÑÐ¾Ð»Ñ Ð±ÑÐ´ÑÑ ÑÐ¾ÑÑÐ°Ð½ÐµÐ½Ñ Ð´Ð»Ñ Ð²Ð°Ñ. Ð£Ð¶Ðµ ÑÑÑÐµÑÑÐ²ÑÑÑ ÑÐ¾ÑÑÐ°Ð½ÐµÐ½Ð½ÑÐµ Ð¸Ð¼Ñ Ð¸ Ð¿Ð°ÑÐ¾Ð»Ñ Ð´Ð»Ñ Ð²ÑÐµÑ Ð´ÑÑÐ³Ð¸Ñ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»ÐµÐ¹ ÑÑÐ¾Ð³Ð¾ Ð¿Ð¾Ð´ÐºÐ»ÑÑÐµÐ½Ð¸Ñ. Ð£Ð´Ð°Ð»Ð¸ÑÑ Ð¸Ð¼Ñ Ð¸ Ð¿Ð°ÑÐ¾Ð»Ñ, ÑÐ¾ÑÑÐ°Ð½ÐµÐ½Ð½ÑÐµ Ð´Ð»Ñ Ð²ÑÐµÑ Ð´ÑÑÐ³Ð¸Ñ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»ÐµÐ¹ Ð¿Ð¾Ð´ÐºÐ»ÑÑÐµÐ½Ð¸Ñ?" 1584 "ÐÐ°Ð¿ÑÐ¸Ð¼ÐµÑ, Ð¼Ð¾Ð¶Ð½Ð¾ Ð²Ð²ÐµÑÑÐ¸ Ð¸Ð¼Ñ ÑÐ°Ð±Ð¾ÑÐµÐ³Ð¾ Ð¼ÐµÑÑÐ° Ð¸Ð»Ð¸ Ð¸Ð¼Ñ ÑÐµÑÐ²ÐµÑÐ°, Ðº ÐºÐ¾ÑÐ¾ÑÐ¾Ð¼Ñ Ð±ÑÐ´ÐµÑ Ð²ÑÐ¿Ð¾Ð»Ð½ÑÑÑÑÑ Ð¿Ð¾Ð´ÐºÐ»ÑÑÐµÐ½Ð¸Ðµ." 1585 "Ð¡Ð²ÐµÐ´ÐµÐ½Ð¸Ñ Ð¾Ð± ÑÑÐµÑÐ½Ð¾Ð¹ Ð·Ð°Ð¿Ð¸ÑÐ¸" 1586 "ÐÐ»ÐµÐ¼ÐµÐ½ÑÑ ÑÐ¿ÑÐ°Ð²Ð»ÐµÐ½Ð¸Ñ Ð½Ð° ÑÑÐ¾Ð¹ ÑÑÑÐ°Ð½Ð¸ÑÐµ ÑÐ²Ð¾Ð¹ÑÑÐ² Ð¾ÑÐºÐ»ÑÑÐµÐ½Ñ, Ð¿Ð¾ÑÐºÐ¾Ð»ÑÐºÑ Ð½Ð°Ð´Ð¾ Ð²ÑÐ¿Ð¾Ð»Ð½Ð¸ÑÑ Ð¿ÐµÑÐµÐ·Ð°Ð³ÑÑÐ·ÐºÑ ÑÐ¸ÑÑÐµÐ¼Ñ, Ð¿ÑÐµÐ¶Ð´Ðµ ÑÐµÐ¼ Ð¸Ð·Ð¼ÐµÐ½ÑÑÑ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÑ Ð½Ð°ÑÑÑÐ¾Ð¹ÐºÐ¸." Modified: trunk/reactos/dll/win32/serialui/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/serialui/lang/ru… ============================================================================== --- trunk/reactos/dll/win32/serialui/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/serialui/lang/ru-RU.rc [iso-8859-1] Sat Sep 27 19:13:32 2014 @@ -7,9 +7,9 @@ IDS_NOPARITY "No parity" IDS_ODDPARITY "ÐÐµÑÐµÑ" IDS_SPACEPARITY "ÐÑÐ¾Ð±ÐµÐ» (0)" - IDS_ONESTOPBIT "1 stop bit" - IDS_ONE5STOPBITS "1.5 stop bits" - IDS_TWOSTOPBITS "2 stop bits" + IDS_ONESTOPBIT "1 ÑÑÐ¾Ð¿Ð¾Ð²ÑÐ¹ Ð±Ð¸Ñ" + IDS_ONE5STOPBITS "1.5 ÑÑÐ¾Ð¿Ð¾Ð²ÑÑ Ð±Ð¸ÑÐ°" + IDS_TWOSTOPBITS "2 ÑÑÐ¾Ð¿Ð¾Ð²ÑÑ Ð±Ð¸ÑÐ°" IDS_FC_NO "ÐÐµÑ" IDS_FC_CTSRTS "CTS/RTS" IDS_FC_XONXOFF "XON/XOFF" 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] Sat Sep 27 19:13:32 2014 @@ -126,7 +126,7 @@ STRINGTABLE BEGIN IDS_ACKTITLE "ÐÐ¾Ð´ÑÐ²ÐµÑÐ¶Ð´ÐµÐ½Ð¸Ðµ Ð»Ð¸ÑÐµÐ½Ð·Ð¸Ð¸" - IDS_ACKSUBTITLE "ÐÐ½ÑÐ¾ÑÐ¼Ð°ÑÐ¸Ñ Ð¾ ÑÐ°Ð·ÑÐ°Ð±Ð¾ÑÑÐ¸ÐºÐ°Ñ ReactOS Ð¸ Ð»Ð¸Ð·ÐµÐ½Ð·Ð¸Ð¾Ð½Ð½Ð¾Ðµ ÑÐ¾Ð³Ð»Ð°ÑÐµÐ½Ð¸Ðµ." + IDS_ACKSUBTITLE "ÐÐ½ÑÐ¾ÑÐ¼Ð°ÑÐ¸Ñ Ð¾ ÑÐ°Ð·ÑÐ°Ð±Ð¾ÑÑÐ¸ÐºÐ°Ñ ReactOS Ð¸ Ð»Ð¸ÑÐµÐ½Ð·Ð¸Ð¾Ð½Ð½Ð¾Ðµ ÑÐ¾Ð³Ð»Ð°ÑÐµÐ½Ð¸Ðµ." IDS_OWNERTITLE "ÐÐµÑÑÐ¾Ð½Ð°Ð»ÑÐ½ÑÐµ Ð´Ð°Ð½Ð½ÑÐµ" IDS_OWNERSUBTITLE "Ð£ÑÑÐ°Ð½Ð¾Ð²ÐºÐ° Ð¸Ð½ÑÐ¾ÑÐ¼Ð°ÑÐ¸Ð¸ Ð¾ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»ÑÑ ReactOS." IDS_COMPUTERTITLE "ÐÐ¼Ñ ÐºÐ¾Ð¼Ð¿ÑÑÑÐµÑÐ° Ð¸ Ð¿Ð°ÑÐ¾Ð»Ñ Ð°Ð´Ð¼Ð¸Ð½Ð¸ÑÑÑÐ°ÑÐ¾ÑÐ°" @@ -148,7 +148,7 @@ IDS_GETPROCADDR_FAILED "ÐÑÐ¸Ð±ÐºÐ° GetProcAddr: " IDS_REGSVR_FAILED "ÐÑÐ¸Ð±ÐºÐ° DllRegisterServer: " IDS_DLLINSTALL_FAILED "ÐÑÐ¸Ð±ÐºÐ° DllInstall: " - IDS_TIMEOUT "Ð¢Ð°Ð¹Ð¼Ð°ÑÑ Ð² ÑÐ¾Ð´Ðµ ÑÐµÐ³Ð¸ÑÑÑÐ°ÑÐ¸Ð¸" + IDS_TIMEOUT "Ð¢Ð°Ð¹Ð¼-Ð°ÑÑ Ð² ÑÐ¾Ð´Ðµ ÑÐµÐ³Ð¸ÑÑÑÐ°ÑÐ¸Ð¸" IDS_REASON_UNKNOWN "" /* * ATTENTION: Modified: trunk/reactos/dll/win32/winmm/lang/winmm_Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winmm/lang/winmm… ============================================================================== --- trunk/reactos/dll/win32/winmm/lang/winmm_Ru.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winmm/lang/winmm_Ru.rc [iso-8859-1] Sat Sep 27 19:13:32 2014 @@ -24,30 +24,30 @@ /* MMSYS errors */ MMSYSERR_NOERROR, "Íåò îøèáêè." MMSYSERR_ERROR, "Íåèçâåñòíàÿ îøèáêà." -MMSYSERR_BADDEVICEID, "Èñïîëüçóåìûé êîä óñòðîéñòâà (device ID) âûõîäèò çà äîïóñòèìûå ïðåäåëû." -MMSYSERR_NOTENABLED, "Äðàéâåð íå áûë ïîäêëþ÷åí." -MMSYSERR_ALLOCATED, "Óêàçàííîå óñòðîéñòâî óæå èñïîëüçóåòñÿ. Ïîäîæäèòå ïîêà îíî îñâîáîäèòñÿ, çàòåì ïîïðîáóéòå åùå ðàç." -MMSYSERR_INVALHANDLE, "Óêàçàííûé èäåíòèôèêàòîð óñòðîéñòâà (device handle) íåâåðåí." -MMSYSERR_NODRIVER, "Â ñèñòåìå íå óñòàíîâëåí äðàéâåð! \n" -MMSYSERR_NOMEM, "Íå õâàòàåò ïàìÿòè äëÿ çàäà÷è. Çàêðîéòå îäíî èëè íåñêîëüêî ïðèëîæåíèé è ïîïðîáóéòå çàíîâî." -MMSYSERR_NOTSUPPORTED, "Ýòà ôóíêöèÿ íå ïîääåðæèâàåòñÿ. Èñïîëüçóéòå ôóíêöèþ Capabilities, ÷òîáû îïðåäåëèòü ôóíêöèè è ñîîáùåíèÿ, êîòîðûå ïîääåðæèâàåò äðàéâåð." -MMSYSERR_BADERRNUM, "Óêàçàííûé êîä îøèáêè íå îïðåäåëåí â ñèñòåìå." -MMSYSERR_INVALFLAG, "Íåäîïóñòèìûé ôëàæîê ïåðåäàí ñèñòåìíîé ôóíêöèè." -MMSYSERR_INVALPARAM, "Íåäîïóñòèìûé ïàðàìåòð ïåðåäàí ñèñòåìíîé ôóíêöèè." +MMSYSERR_BADDEVICEID, "Óêàçàí êîä óñòðîéñòâà, íå èñïîëüçóåìîãî â ñèñòåìå." +MMSYSERR_NOTENABLED, "Äðàéâåð íå ïîäêëþ÷åí." +MMSYSERR_ALLOCATED, "Óêàçàííîå óñòðîéñòâî óæå èñïîëüçóåòñÿ. Ïîäîæäèòå, ïîêà îíî îñâîáîäèòñÿ, è ïîâòîðèòå ïîïûòêó." +MMSYSERR_INVALHANDLE, "Óêàçàí íåâåðíûé äåñêðèïòîð óñòðîéñòâà." +MMSYSERR_NODRIVER, "Â ñèñòåìå íåò óñòàíîâëåííîãî äðàéâåðà.\n" +MMSYSERR_NOMEM, "Íåäîñòàòî÷íî ïàìÿòè äëÿ âûïîëíåíèÿ çàäàíèÿ. Çàêðîéòå îäíî èëè íåñêîëüêî ïðèëîæåíèé è ïîïðîáóéòå çàíîâî." +MMSYSERR_NOTSUPPORTED, "Äàííàÿ ôóíêöèÿ íå ïîääåðæèâàåòñÿ. Ñïèñîê ïîääåðæèâàåìûõ äðàéâåðîì ôóíêöèé è ñîîáùåíèé ìîæíî ïîëó÷èòü ñ ïîìîùüþ ôóíêöèè Capabilities." +MMSYSERR_BADERRNUM, "Îøèáêà ñ óêàçàííûì íîìåðîì â ñèñòåìå íå îïðåäåëåíà." +MMSYSERR_INVALFLAG, "Ñèñòåìíîé ôóíêöèè ïåðåäàí íåâåðíûé ôëàæîê." +MMSYSERR_INVALPARAM, "Ñèñòåìíîé ôóíêöèè ïåðåäàí íåïðàâèëüíûé ïàðàìåòð." /* WAVE errors */ -WAVERR_BADFORMAT, "Óêàçàííûé ôîðìàò íå ïîääåðæèâàåòñÿ èëè íå ìîæåò áûòü îòòðàíñëèðîâàí. Èñïîëüçóéòå ôóíêöèþ Capabilities, ÷òîáû îïðåäåëèòü ïîääåðæèâàåìûå ôîðìàòû." -WAVERR_STILLPLAYING, "Íåâîçìîæíî ïðîèçâåñòè îïåðàöèþ, ïîêà óñòðîéñòâî â ðåæèìå âîñïðîèçâåäåíèÿ. Ñáðîñüòå óñòðîéñòâî, èëè ïîäîæäèòå ïîêà óñòðîéñòâî íå îêîí÷èò âîñïðîèçâåäåíèå." -WAVERR_UNPREPARED, "Çàãîëîâîê wave íå áûë ïîäãîòîâëåí. Èñïîëüçóéòå ôóíêöèþ Prepare, ÷òîáû ïîäãîòîâèòü çàãîëîâîê è ïîïðîáóéòå çàíîâî." -WAVERR_SYNC, "Íåâîçìîæíî îòêðûòü óñòðîéñòâî, íå èñïîëüçóÿ ôëàã WAVE_ALLOWSYNC. Èñïîëüçóéòå ôëàã è ïîïðîáóéòå çàíîâî." +WAVERR_BADFORMAT, "Óêàçàííûé ôîðìàò íå ïîääåðæèâàåòñÿ èëè åãî íåëüçÿ ïðåîáðàçîâàòü. Ñïèñîê äîïóñòèìûõ ôîðìàòîâ ìîæíî ïîëó÷èòü ñ ïîìîùüþ ôóíêöèè Capabilities." +WAVERR_STILLPLAYING, "Âî âðåìÿ âîñïðîèçâåäåíèÿ äàííûõ ñ íîñèòåëÿ âûïîëíèòü ýòó îïåðàöèþ íåëüçÿ. Îñòàíîâèòå âîñïðîèçâåäåíèå äàííûõ èëè äîæäèòåñü åãî îêîí÷àíèÿ." +WAVERR_UNPREPARED, "Çàãîëîâîê çâóêîçàïèñè íå ïîäãîòîâëåí. Ïîäãîòîâüòå åãî ñ ïîìîùüþ ôóíêöèè Prepare è ïîâòîðèòå ïîïûòêó." +WAVERR_SYNC, "Îòêðûòèå óñòðîéñòâà íåâîçìîæíî áåç ôëàæêà WAVE_ALLOWSYNC. Óñòàíîâèòå ýòîò ôëàæîê è ïîâòîðèòå ïîïûòêó." /* MIDI errors */ -MIDIERR_UNPREPARED, "Çàãîëîâîê MIDI íå áûë ïîäãîòîâëåí. Èñïîëüçóéòå ôóíêöèþ Prepare, ÷òîáû ïîäãîòîâèòü çàãîëîâîê è ïîïðîáóéòå çàíîâî." -MIDIERR_STILLPLAYING, "Íåâîçìîæíî ïðîèçâåñòè îïåðàöèþ, ïîêà óñòðîéñòâî â ðåæèìå âîñïðîèçâåäåíèÿ. Ñáðîñüòå óñòðîéñòâî, èëè ïîäîæäèòå ïîêà óñòðîéñòâî íå îêîí÷èò âîñïðîèçâåäåíèå." -MIDIERR_NOMAP, "Êàðòà (map) MIDI íå íàéäåíà. Âîçìîæíî, ýòî îøèáêà äðàéâåðà, èëè ôàéë MIDIMAP.CFG îòñóòñòâóåò èëè ïîâðåæäåí." -MIDIERR_NOTREADY, "Ïîðò ïåðåäàåò èíôîðìàöèþ â óñòðîéñòâî. Ïîäîæäèòå, ïîêà èíôîðìàöèÿ áóäåò ïåðåäàíà è ïîïðîáóéòå çàíîâî." -MIDIERR_NODEVICE, "Òåêóùèå óñòàíîâêè MIDI Mapper ññûëàþòñÿ íà óñòðîéñòâî MIDI, êîòîðîå íå óñòàíîâëåíî â ñèñòåìå. Èñïîëüçóéòå MIDI Mapper äëÿ ðåäàêòèðîâàíèÿ óñòàíîâîê." -MIDIERR_INVALIDSETUP, "Òåêóùèå óñòàíîâêè MIDI ïîâðåæäåíû. Ñêîïèðóéòå èñõîäíûé ôàéë MIDIMAP.CFG â äèðåêòîðèþ ReactOS SYSTEM, è ïîïðîáóéòå çàíîâî." +MIDIERR_UNPREPARED, "Çàãîëîâîê MIDI íå áûë ïîäãîòîâëåí. Ïîäãîòîâüòå åãî ñ ïîìîùüþ ôóíêöèè Prepare è ïîâòîðèòå ïîïûòêó." +MIDIERR_STILLPLAYING, "Âî âðåìÿ âîñïðîèçâåäåíèÿ äàííûõ ñ íîñèòåëÿ âûïîëíèòü ýòó îïåðàöèþ íåëüçÿ. Îñòàíîâèòå âîñïðîèçâåäåíèå äàííûõ èëè äîæäèòåñü åãî îêîí÷àíèÿ." +MIDIERR_NOMAP, "Íå íàéäåíà òàáëèöà óñòðîéñòâ MIDI. Âîçìîæíî, ýòî îøèáêà äðàéâåðà, èëè ôàéë MIDIMAP.CFG îòñóòñòâóåò èëè ïîâðåæäåí." +MIDIERR_NOTREADY, "Ïîðò çàíÿò ïåðåäà÷åé äàííûõ íà óñòðîéñòâî. Ïîäîæäèòå îêîí÷àíèÿ ïåðåäà÷è äàííûõ è ïîâòîðèòå ïîïûòêó." +MIDIERR_NODEVICE, "Òåêóùàÿ íàñòðîéêà ñîîòâåòñòâèÿ MIDI-óñòðîéñòâ ññûëàåòñÿ íà íå óñòàíîâëåííîå óñòðîéñòâî. Îòðåäàêòèðóéòå íàñòðîéêè ñ ïîìîùüþ MIDI Mapper." +MIDIERR_INVALIDSETUP, "Òåêóùèå óñòàíîâêè MIDI ïîâðåæäåíû. Ñêîïèðóéòå èñõîäíûé ôàéë MIDIMAP.CFG â äèðåêòîðèþ ReactOS SYSTEM, à çàòåì ïîâòîðèòå ñíîâà." /* MCI errors */ MCIERR_INVALID_DEVICE_ID, "Íåäîïóñòèìûé êîä óñòðîéñòâà MCI. Èñïîëüçóéòå êîä, âîçâðàùåííûé ïðè îòêðûòèè óñòðîéñòâà MCI." Modified: trunk/reactos/dll/win32/wldap32/lang/wldap32_Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/lang/wld… ============================================================================== --- trunk/reactos/dll/win32/wldap32/lang/wldap32_Ru.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/lang/wldap32_Ru.rc [iso-8859-1] Sat Sep 27 19:13:32 2014 @@ -33,20 +33,20 @@ 5 "Ð¡ÑÐ°Ð²Ð½ÐµÐ½Ð¸Ðµ Ð½ÐµÐ²ÐµÑÐ½Ð¾" 6 "Ð¡ÑÐ°Ð²Ð½ÐµÐ½Ð¸Ðµ Ð²ÐµÑÐ½Ð¾" 7 "ÐÐµÑÐ¾Ð´ Ð°Ð²ÑÐ¾ÑÐ¸Ð·Ð°ÑÐ¸Ð¸ Ð½Ðµ Ð¿Ð¾Ð´Ð´ÐµÑÐ¶Ð¸Ð²Ð°ÐµÑÑÑ" - 8 "Ð¢ÑÐµÐ±ÑÐµÑÑÑ ÑÑÑÐ¾Ð³Ð°Ñ Ð°Ð²ÑÐ¾ÑÐ¸Ð·Ð°ÑÐ¸Ñ" - 9 "Ð¡ÑÑÐ»ÐºÐ° (v2)" - 10 "Ð¡ÑÑÐ»ÐºÐ°" - 11 "ÐÑÐµÐ²ÑÑÐµÐ½Ð¾ Ð¾Ð³ÑÐ°Ð½Ð¸ÑÐµÐ½Ð¸Ðµ Ð°Ð´Ð¼Ð¸Ð½Ð¸ÑÑÑÐ¸ÑÐ¾Ð²Ð°Ð½Ð¸Ñ" - 12 "ÐÑÐ¸ÑÐ¸ÑÐµÑÐºÐ¾Ðµ ÑÐ°ÑÑÐ¸ÑÐµÐ½Ð¸Ðµ Ð½ÐµÐ´Ð¾ÑÑÑÐ¿Ð½Ð¾" + 8 "Ð¢ÑÐµÐ±ÑÐµÑÑÑ ÑÑÑÐ¾Ð³Ð°Ñ Ð¿ÑÐ¾Ð²ÐµÑÐºÐ° Ð¿Ð¾Ð´Ð»Ð¸Ð½Ð½Ð¾ÑÑÐ¸" + 9 "Ð¡ÑÑÐ»ÐºÐ¸ (v2)" + 10 "Ð¡ÑÑÐ»ÐºÐ¸" + 11 "ÐÑÐµÐ²ÑÑÐµÐ½ Ð¿ÑÐµÐ´ÐµÐ» Ð¿Ð¾Ð»Ð½Ð¾Ð¼Ð¾ÑÐ¸Ð¹" + 12 "ÐÐµÐ´Ð¾ÑÑÑÐ¿Ð½Ð¾Ðµ ÐºÑÐ¸ÑÐ¸ÑÐµÑÐºÐ¾Ðµ ÑÐ°ÑÑÐ¸ÑÐµÐ½Ð¸Ðµ" 13 "Ð¢ÑÐµÐ±ÑÐµÑÑÑ ÐºÐ¾Ð½ÑÐ¸Ð´ÐµÐ½ÑÐ¸Ð°Ð»ÑÐ½Ð¾ÑÑÑ" 14 "" 15 "" 16 "ÐÐµÑ ÑÐ°ÐºÐ¾Ð³Ð¾ Ð°ÑÑÐ¸Ð±ÑÑÐ°" - 17 "ÐÐµÐ¾Ð¿ÑÐµÐ´ÐµÐ»ÐµÐ½Ð½ÑÐ¹ ÑÐ¸Ð¿" + 17 "Ð¢Ð¸Ð¿ Ð½Ðµ Ð¾Ð¿ÑÐµÐ´ÐµÐ»ÐµÐ½" 18 "ÐÐµÐ¿Ð¾Ð´ÑÐ¾Ð´ÑÑÐµÐµ ÑÐ¾Ð¾ÑÐ²ÐµÑÑÑÐ²Ð¸Ðµ" 19 "ÐÐ°ÑÑÑÐµÐ½Ð¸Ðµ Ð¾Ð³ÑÐ°Ð½Ð¸ÑÐµÐ½Ð¸Ñ" 20 "ÐÑÑÐ¸Ð±ÑÑ Ð¸Ð»Ð¸ Ð·Ð½Ð°ÑÐµÐ½Ð¸Ðµ ÑÑÑÐµÑÑÐ²ÑÐµÑ" - 21 "ÐÐµÐ²ÐµÑÐ½ÑÐ¹ ÑÐ¸Ð½ÑÐ°ÐºÑÐ¸Ñ" + 21 "Ð¡Ð¸Ð½ÑÐ°ÐºÑÐ¸ÑÐµÑÐºÐ°Ñ Ð¾ÑÐ¸Ð±ÐºÐ°" 22 "" 23 "" 24 "" @@ -74,7 +74,7 @@ 46 "" 47 "" 48 "ÐÐµÐ¿Ð¾Ð´ÑÐ¾Ð´ÑÑÐ°Ñ Ð°Ð²ÑÐ¾ÑÐ¸Ð·Ð°ÑÐ¸Ñ" - 49 "ÐÐµÐ²ÐµÑÐ½Ð¾Ðµ ÑÐ´Ð¾ÑÑÐ¾Ð²ÐµÑÐµÐ½Ð¸Ðµ Ð»Ð¸ÑÐ½Ð¾ÑÑÐ¸" + 49 "ÐÐµÐ¿ÑÐ°Ð²Ð¸Ð»ÑÐ½ÑÐµ ÑÑÐµÑÐ½ÑÐµ Ð´Ð°Ð½Ð½ÑÐµ" 50 "ÐÐµÐ´Ð¾ÑÑÐ°ÑÐ¾ÑÐ½Ð¾ Ð¿ÑÐ°Ð²" 51 "ÐÐ°Ð½ÑÑÐ¾" 52 "ÐÐµÐ´Ð¾ÑÑÑÐ¿Ð½Ð¾" @@ -89,12 +89,12 @@ 61 "ÐÑÐ¸Ð±ÐºÐ° Ð´Ð¸Ð°Ð¿Ð°Ð·Ð¾Ð½Ð° Ð¸Ð½Ð´ÐµÐºÑÐ°" 62 "" 63 "" - 64 "ÐÐ°ÑÑÑÐµÐ½Ð¸Ðµ Ð¿ÑÐ°Ð²Ð¸Ð» Ð½Ð°Ð¸Ð¼ÐµÐ½Ð¾Ð²Ð°Ð½Ð¸Ñ" + 64 "ÐÐ°ÑÑÑÐµÐ½Ð¸Ðµ Ð¿ÑÐ°Ð²Ð¸Ð» Ð¸Ð¼ÐµÐ½Ð¾Ð²Ð°Ð½Ð¸Ñ" 65 "ÐÐ°ÑÑÑÐµÐ½Ð¸Ðµ ÐºÐ»Ð°ÑÑÐ° Ð¾Ð±ÑÐµÐºÑÐ°" - 66 "ÐÐµ ÑÐ°Ð·ÑÐµÑÐµÐ½Ð¾ Ð½Ðµ Ð½Ð° Ð»Ð¸ÑÑÐµ Ð´ÐµÑÐµÐ²Ð°" - 67 "ÐÐµ ÑÐ°Ð·ÑÐµÑÐµÐ½Ð¾ Ð½Ð° RDN" + 66 "ÐÐ¾Ð¿ÑÑÑÐ¸Ð¼Ð¾ ÑÐ¾Ð»ÑÐºÐ¾ Ð´Ð»Ñ Ð¾ÐºÐ¾Ð½ÐµÑÐ½Ð¾Ð³Ð¾ Ð»Ð¸ÑÑÐ° Ð´ÐµÑÐµÐ²Ð°" + 67 "ÐÐµÐ´Ð¾Ð¿ÑÑÑÐ¸Ð¼Ð¾ Ð´Ð»Ñ RDN" 68 "Ð£Ð¶Ðµ ÑÑÑÐµÑÑÐ²ÑÐµÑ" - 69 "ÐÐµÑ ÑÐµÐ¶Ð¸Ð¼Ð¾Ð² ÐºÐ»Ð°ÑÑÐ° Ð¾Ð±ÑÐµÐºÑÐ°" + 69 "ÐÑÑÑÑÑÑÐ²ÑÑÑ ÑÐµÐ¶Ð¸Ð¼Ñ ÐºÐ»Ð°ÑÑÐ¾Ð² Ð¾Ð±ÑÐµÐºÑÐ¾Ð²" 70 "Ð ÐµÐ·ÑÐ»ÑÑÐ°ÑÑ ÑÐ»Ð¸ÑÐºÐ¾Ð¼ Ð²ÐµÐ»Ð¸ÐºÐ¸" 71 "ÐÐ»Ð¸ÑÐµÑ Ð½Ð° Ð½ÐµÑÐºÐ¾Ð»ÑÐºÐ¾ DSA" 72 "" @@ -111,16 +111,16 @@ 83 "ÐÑÐ¸Ð±ÐºÐ° ÐºÐ¾Ð´Ð¸ÑÐ¾Ð²Ð°Ð½Ð¸Ñ" 84 "ÐÑÐ¸Ð±ÐºÐ° Ð´ÐµÐºÐ¾Ð´Ð¸ÑÐ¾Ð²Ð°Ð½Ð¸Ñ" 85 "Ð¢Ð°Ð¹Ð¼-Ð°ÑÑ" - 86 "ÐÐµÐ¸Ð·Ð²ÐµÑÑÐ½Ð°Ñ Ð°Ð²ÑÐ¾ÑÐ¸Ð·Ð°ÑÐ¸Ñ" + 86 "Ð ÐµÐ·ÑÐ»ÑÑÐ°Ñ Ð¿ÑÐ¾Ð²ÐµÑÐºÐ¸ Ð½ÐµÐ¸Ð·Ð²ÐµÑÑÐµÐ½" 87 "ÐÑÐ¸Ð±ÐºÐ° ÑÐ¸Ð»ÑÑÑÐ°" 88 "ÐÑÐ¼ÐµÐ½ÐµÐ½Ð¾ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»ÐµÐ¼" - 89 "ÐÑÐ¸Ð±ÐºÐ° Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÐ°" - 90 "ÐÐµÑ Ð¿Ð°Ð¼ÑÑÐ¸" - 91 "ÐÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð¿Ð¾Ð´ÐºÐ»ÑÑÐ¸ÑÑÑÑ Ðº LDAP ÑÐµÑÐ²ÐµÑÑ" + 89 "ÐÑÐ¸Ð±ÐºÐ° Ð² Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÐµ" + 90 "ÐÐµÐ´Ð¾ÑÑÐ°ÑÐ¾ÑÐ½Ð¾ Ð¿Ð°Ð¼ÑÑÐ¸" + 91 "ÐÐµ ÑÐ´Ð°ÐµÑÑÑ Ð¿Ð¾Ð´ÐºÐ»ÑÑÐ¸ÑÑÑÑ Ðº ÑÐµÑÐ²ÐµÑÑ LDAP" 92 "ÐÐ¿ÐµÑÐ°ÑÐ¸Ñ Ð½Ðµ Ð¿Ð¾Ð´Ð´ÐµÑÐ¶Ð¸Ð²Ð°ÐµÑÑÑ ÑÑÐ¾Ð¹ Ð²ÐµÑÑÐ¸ÐµÐ¹ Ð¿ÑÐ¾ÑÐ¾ÐºÐ¾Ð»Ð° LDAP" - 93 "Ð£ÐºÐ°Ð·Ð°Ð½Ð½ÑÐ¹ ÑÐ¿ÑÐ°Ð²Ð»ÑÑÑÐ¸Ð¹ ÑÐ»ÐµÐ¼ÐµÐ½Ñ Ð½Ðµ Ð½Ð°Ð¹Ð´ÐµÐ½ Ð² ÑÐ¾Ð¾Ð±ÑÐµÐ½Ð¸Ð¸" - 94 "Ð ÐµÐ·ÑÐ»ÑÑÐ°ÑÐ° Ð½ÐµÑ Ð² ÑÐ¾Ð¾Ð±ÑÐµÐ½Ð¸Ð¸" - 95 "ÐÑÑ ÐµÑÑÑ ÑÐµÐ·ÑÐ»ÑÑÐ°ÑÑ" + 93 "Ð£ÐºÐ°Ð·Ð°Ð½Ð½ÑÐ¹ ÑÐ»ÐµÐ¼ÐµÐ½Ñ ÑÐ¿ÑÐ°Ð²Ð»ÐµÐ½Ð¸Ñ Ð² ÑÐ¾Ð¾Ð±ÑÐµÐ½Ð¸Ð¸ Ð½Ðµ Ð½Ð°Ð¹Ð´ÐµÐ½" + 94 "Ð ÑÐ¾Ð¾Ð±ÑÐµÐ½Ð¸Ð¸ Ð¾ÑÑÑÑÑÑÐ²ÑÐµÑ ÑÐµÐ·ÑÐ»ÑÑÐ°Ñ" + 95 "ÐÐ¾Ð·Ð²ÑÐ°ÑÐµÐ½Ð¾ Ð±Ð¾Ð»ÑÑÐ¾Ðµ ÑÐ¸ÑÐ»Ð¾ ÑÐµÐ·ÑÐ»ÑÑÐ°ÑÐ¾Ð²" 96 "ÐÐ°ÑÐ¸ÐºÐ»Ð¸Ð²Ð°Ð½Ð¸Ðµ Ð¿ÑÐ¸ Ð¾Ð±ÑÐ°Ð±Ð¾ÑÐºÐµ ÑÑÑÐ»Ð¾Ðº" - 97 "ÐÑÐµÐ´ÐµÐ» ÑÐ¸ÑÐ»Ð° Ð¿ÐµÑÐµÑÑÐ»ÐºÐ¸ ÑÑÑÐ»Ð¾Ðº Ð¿ÑÐµÐ²ÑÑÐµÐ½" -} + 97 "ÐÑÐµÐ²ÑÑÐµÐ½ Ð¿ÑÐµÐ´ÐµÐ» ÑÐ¸ÑÐ»Ð° Ð¿ÑÑÐ¶ÐºÐ¾Ð² ÑÑÑÐ»Ð¾Ðº" +} Modified: trunk/reactos/win32ss/user/user32/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/lang/r… ============================================================================== --- trunk/reactos/win32ss/user/user32/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/lang/ru-RU.rc [iso-8859-1] Sat Sep 27 19:13:32 2014 @@ -31,7 +31,7 @@ SYSMENU MENU BEGIN - MENUITEM "&ÐÐ¾ÑÑÐ°Ð½Ð¾Ð²Ð¸ÑÑ", SC_RESTORE + MENUITEM "&ÐÐ¾ÑÑÑÐ°Ð½Ð¾Ð²Ð¸ÑÑ", SC_RESTORE MENUITEM "&ÐÐµÑÐµÐ¼ÐµÑÑÐ¸ÑÑ", SC_MOVE MENUITEM "Ð &Ð°Ð·Ð¼ÐµÑ", SC_SIZE MENUITEM "&Ð¡Ð²ÐµÑÐ½ÑÑÑ", SC_MINIMIZE @@ -42,7 +42,7 @@ SYSMENUMDI MENU BEGIN - MENUITEM "&ÐÐ¾ÑÑÐ°Ð½Ð¾Ð²Ð¸ÑÑ", SC_RESTORE + MENUITEM "&ÐÐ¾ÑÑÑÐ°Ð½Ð¾Ð²Ð¸ÑÑ", SC_RESTORE MENUITEM "&ÐÐµÑÐµÐ¼ÐµÑÑÐ¸ÑÑ", SC_MOVE MENUITEM "Ð &Ð°Ð·Ð¼ÐµÑ", SC_SIZE MENUITEM "&Ð¡Ð²ÐµÑÐ½ÑÑÑ", SC_MINIMIZE @@ -50,7 +50,7 @@ MENUITEM SEPARATOR MENUITEM "&ÐÐ°ÐºÑÑÑÑ\tCtrl+F4", SC_CLOSE MENUITEM SEPARATOR - MENUITEM "Ð¡&Ð»ÐµÐ´ÑÑÑÐµÐµ\tCtrl+F6", SC_NEXTWINDOW + MENUITEM "Ð¡&Ð»ÐµÐ´ÑÑÑÐµÐµ Ð¾ÐºÐ½Ð¾\tCtrl+F6", SC_NEXTWINDOW END /* Strings */ @@ -60,14 +60,14 @@ IDS_ERROR "ÐÑÐ¸Ð±ÐºÐ°" IDS_OK "OK" IDS_CANCEL "ÐÑÐ¼ÐµÐ½Ð°" - IDS_ABORT "&ÐÑÐµÐºÑÐ°ÑÐ¸ÑÑ" - IDS_RETRY "Ð&Ð¾Ð²ÑÐ¾ÑÐ¸ÑÑ" - IDS_IGNORE "&ÐÐ³Ð½Ð¾ÑÐ¸ÑÐ¾Ð²Ð°ÑÑ" + IDS_ABORT "ÐÑ&ÐµÑÐ²Ð°ÑÑ" + IDS_RETRY "ÐÐ¾&Ð²ÑÐ¾ÑÐ¸ÑÑ" + IDS_IGNORE "&ÐÑÐ¾Ð¿ÑÑÑÐ¸ÑÑ" IDS_YES "&ÐÐ°" IDS_NO "&ÐÐµÑ" IDS_HELP "Ð¡Ð¿ÑÐ°Ð²ÐºÐ°" - IDS_TRYAGAIN "&ÐÐ¾Ð²ÑÐ¾ÑÐ¸ÑÑ Ð¿Ð¾Ð·Ð´Ð½ÐµÐµ" - IDS_CONTINUE "Ð&ÑÐ¾Ð´Ð¾Ð»Ð¶Ð¸ÑÑ" + IDS_TRYAGAIN "&ÐÐ¾Ð²ÑÐ¾ÑÐ¸ÑÑ" + IDS_CONTINUE "&ÐÑÐ¾Ð´Ð¾Ð»Ð¶Ð¸ÑÑ" END STRINGTABLE Modified: trunk/reactos/win32ss/user/winsrv/usersrv/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/usersr… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/usersrv/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/usersrv/lang/ru-RU.rc [iso-8859-1] Sat Sep 27 19:13:32 2014 @@ -5,10 +5,10 @@ CAPTION "ÐÐ°Ð²ÐµÑÑÐµÐ½Ð¸Ðµ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ñ - " FONT 8, "MS Shell Dlg" BEGIN - LTEXT "ÐÐ°Ð²ÐµÑÑÐµÐ½Ð¸Ðµ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ñ... ÐÐ°Ð¶Ð°Ð»ÑÐ¹ÑÑÐ° Ð¿Ð¾Ð´Ð¾Ð¶Ð´Ð¸ÑÐµ", IDC_STATIC, 7, 7, 186, 11 + LTEXT "ÐÐ°Ð²ÐµÑÑÐµÐ½Ð¸Ðµ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ñ... ÐÐ¾Ð¶Ð°Ð»ÑÐ¹ÑÑÐ° Ð¿Ð¾Ð´Ð¾Ð¶Ð´Ð¸ÑÐµ", IDC_STATIC, 7, 7, 186, 11 CONTROL "Progress", IDC_PROGRESS, "msctls_progress32", WS_BORDER, 7, 20, 186, 13 - LTEXT "ÐÑÐ»Ð¸ Ð²Ñ Ð·Ð°Ð²ÐµÑÑÐ¸ÑÐµ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ñ ÑÐµÐ¹ÑÐ°Ñ, ÑÐ¾ Ð²Ñ Ð¼Ð¾Ð¶ÐµÑÐµ Ð¿Ð¾ÑÐµÑÑÑÑ Ð½ÐµÑÐ¾ÑÑÐ°Ð½ÐµÐ½Ð½ÑÐµ Ð´Ð°Ð½Ð½ÑÐµ. Ð§ÑÐ¾Ð±Ñ Ð·Ð°Ð²ÐµÑÐ¸ÑÑ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ñ ÑÐµÐ¹ÑÐ°Ñ Ð½Ð°Ð¶Ð¼Ð¸ÑÐµ ""ÐÐ°Ð²ÐµÑÑÐ¸ÑÑ""", IDC_STATIC, 7, 40, 186, 26 - DEFPUSHBUTTON "&ÐÐ°Ð²ÐµÑÐ¸ÑÑ", IDC_END_NOW, 150, 71, 43, 17 + LTEXT "ÐÑÐ»Ð¸ Ð²Ñ Ð·Ð°Ð²ÐµÑÑÐ¸ÑÐµ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ñ ÑÐµÐ¹ÑÐ°Ñ, ÑÐ¾ Ð²Ñ Ð¼Ð¾Ð¶ÐµÑÐµ Ð¿Ð¾ÑÐµÑÑÑÑ Ð½ÐµÑÐ¾ÑÑÐ°Ð½ÐµÐ½Ð½ÑÐµ Ð´Ð°Ð½Ð½ÑÐµ. Ð§ÑÐ¾Ð±Ñ Ð·Ð°Ð²ÐµÑÑÐ¸ÑÑ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ñ ÑÐµÐ¹ÑÐ°Ñ Ð½Ð°Ð¶Ð¼Ð¸ÑÐµ ""ÐÐ°Ð²ÐµÑÑÐ¸ÑÑ""", IDC_STATIC, 7, 40, 186, 26 + DEFPUSHBUTTON "&ÐÐ°Ð²ÐµÑÑÐ¸ÑÑ", IDC_END_NOW, 150, 71, 43, 17 END IDD_NOT_RESPONDING DIALOGEX 0, 0, 192, 122 @@ -19,8 +19,8 @@ DEFPUSHBUTTON "ÐÑÐ¼ÐµÐ½Ð°", IDCANCEL, 142, 98, 43, 17 PUSHBUTTON "&ÐÐ°Ð²ÐµÑÑÐ¸ÑÑ", IDC_END_NOW, 78, 98, 43, 17 LTEXT "ÐÑÐ° Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ð° Ð½Ðµ Ð¾ÑÐ²ÐµÑÐ°ÐµÑ.", IDC_STATIC, 7, 7, 178, 8 - LTEXT "ÐÐ»Ñ Ð²Ð¾Ð·Ð²ÑÐ°ÑÐ° Ð² ReactOS Ð¸ ÑÐ¾ÑÑÐ°Ð½ÐµÐ½Ð¸Ñ Ð´Ð°Ð½Ð½ÑÑ Ð½Ð°Ð¶Ð¼Ð¸ÑÐµ ""ÐÑÐ¼ÐµÐ½Ð°"".", IDC_STATIC, 7, 26, 178, 16 - LTEXT "ÐÑÐ»Ð¸ Ð²Ñ Ð·Ð°Ð²ÐµÑÑÐ¸ÑÐµ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ñ ÑÐµÐ¹ÑÐ°Ñ, ÑÐ¾ Ð²Ñ Ð¼Ð¾Ð¶ÐµÑÐµ Ð¿Ð¾ÑÐµÑÑÑÑ Ð½ÐµÑÐ¾ÑÑÐ°Ð½ÐµÐ½Ð½ÑÐµ Ð´Ð°Ð½Ð½ÑÐµ. Ð§ÑÐ¾Ð±Ñ Ð·Ð°Ð²ÐµÑÐ¸ÑÑ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ñ ÑÐµÐ¹ÑÐ°Ñ Ð½Ð°Ð¶Ð¼Ð¸ÑÐµ ""ÐÐ°Ð²ÐµÑÑÐ¸ÑÑ"".", IDC_STATIC, 7, 53, 178, 26 + LTEXT "ÐÐ»Ñ Ð²Ð¾Ð·Ð²ÑÐ°ÑÐ° Ð² ReactOS Ð¸ Ð¿ÑÐ¾Ð²ÐµÑÐºÐ¸ ÑÐ¾ÑÑÐ¾ÑÐ½Ð¸Ñ Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ Ð½Ð°Ð¶Ð¼Ð¸ÑÐµ ""ÐÑÐ¼ÐµÐ½Ð°"".", IDC_STATIC, 7, 26, 178, 16 + LTEXT "ÐÑÐ»Ð¸ Ð²Ñ Ð·Ð°Ð²ÐµÑÑÐ¸ÑÐµ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ñ ÑÐµÐ¹ÑÐ°Ñ, ÑÐ¾ Ð²Ñ Ð¼Ð¾Ð¶ÐµÑÐµ Ð¿Ð¾ÑÐµÑÑÑÑ Ð½ÐµÑÐ¾ÑÑÐ°Ð½ÐµÐ½Ð½ÑÐµ Ð´Ð°Ð½Ð½ÑÐµ. Ð§ÑÐ¾Ð±Ñ Ð·Ð°Ð²ÐµÑÑÐ¸ÑÑ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ñ ÑÐµÐ¹ÑÐ°Ñ Ð½Ð°Ð¶Ð¼Ð¸ÑÐµ ""ÐÐ°Ð²ÐµÑÑÐ¸ÑÑ"".", IDC_STATIC, 7, 53, 178, 26 END IDD_SWITCH_APP DIALOGEX 90, 90, 265, 170

11 years, 1 month

[akhaldi] 64348: [HHCTRL.OCX] * Sync with Wine 1.7.27. CORE-8540

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Sep 27 19:04:10 2014 New Revision: 64348 URL: http://svn.reactos.org/svn/reactos?rev=64348&view=rev Log: [HHCTRL.OCX] * Sync with Wine 1.7.27. CORE-8540 Modified: trunk/reactos/dll/win32/hhctrl.ocx/lang/Cs.rc trunk/reactos/dll/win32/hhctrl.ocx/lang/Da.rc trunk/reactos/dll/win32/hhctrl.ocx/lang/De.rc trunk/reactos/dll/win32/hhctrl.ocx/lang/El.rc trunk/reactos/dll/win32/hhctrl.ocx/lang/En.rc trunk/reactos/dll/win32/hhctrl.ocx/lang/Es.rc trunk/reactos/dll/win32/hhctrl.ocx/lang/Fi.rc trunk/reactos/dll/win32/hhctrl.ocx/lang/Fr.rc trunk/reactos/dll/win32/hhctrl.ocx/lang/He.rc trunk/reactos/dll/win32/hhctrl.ocx/lang/Hu.rc trunk/reactos/dll/win32/hhctrl.ocx/lang/It.rc trunk/reactos/dll/win32/hhctrl.ocx/lang/Ja.rc trunk/reactos/dll/win32/hhctrl.ocx/lang/Ko.rc trunk/reactos/dll/win32/hhctrl.ocx/lang/Lt.rc trunk/reactos/dll/win32/hhctrl.ocx/lang/Nl.rc trunk/reactos/dll/win32/hhctrl.ocx/lang/No.rc trunk/reactos/dll/win32/hhctrl.ocx/lang/Pl.rc trunk/reactos/dll/win32/hhctrl.ocx/lang/Pt.rc trunk/reactos/dll/win32/hhctrl.ocx/lang/Ro.rc trunk/reactos/dll/win32/hhctrl.ocx/lang/Ru.rc trunk/reactos/dll/win32/hhctrl.ocx/lang/Si.rc trunk/reactos/dll/win32/hhctrl.ocx/lang/Sq.rc trunk/reactos/dll/win32/hhctrl.ocx/lang/Sv.rc trunk/reactos/dll/win32/hhctrl.ocx/lang/Tr.rc trunk/reactos/dll/win32/hhctrl.ocx/lang/Uk.rc trunk/reactos/dll/win32/hhctrl.ocx/lang/Zh.rc trunk/reactos/dll/win32/hhctrl.ocx/stream.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/hhctrl.ocx/lang/Cs.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/lang/… ============================================================================== --- trunk/reactos/dll/win32/hhctrl.ocx/lang/Cs.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hhctrl.ocx/lang/Cs.rc [iso-8859-1] Sat Sep 27 19:04:10 2014 @@ -31,6 +31,9 @@ IDS_INDEX "I&ndex" IDS_SEARCH "&Hledat" IDS_FAVORITES "Oblí&bené" + + IDS_HIDETABS "Hide &Tabs" + IDS_SHOWTABS "Show &Tabs" END STRINGTABLE @@ -45,18 +48,19 @@ IDTB_PRINT "Tisk" IDTB_OPTIONS "Volby" IDTB_FORWARD "Vpøed" - IDTB_NOTES "IDTB_NOTES" - IDTB_BROWSE_FWD "IDTB_BROWSE_FWD" - IDTB_BROWSE_BACK "IDT_BROWSE_BACK" - IDTB_CONTENTS "IDTB_CONTENTS" - IDTB_INDEX "IDTB_INDEX" - IDTB_SEARCH "IDTB_SEARCH" - IDTB_HISTORY "IDTB_HISTORY" - IDTB_FAVORITES "IDTB_FAVORITES" - IDTB_JUMP1 "Skok1" - IDTB_JUMP2 "Skok2" - IDTB_CUSTOMIZE "Pøizpùsobit" - IDTB_ZOOM "Lupa" - IDTB_TOC_NEXT "IDTB_TOC_NEXT" - IDTB_TOC_PREV "IDTB_TOC_PREV" END + +MENU_POPUP MENU +{ + POPUP "" /* Options */ + { + MENUITEM "", IDTB_EXPAND + MENUITEM "S&ync", IDTB_SYNC + MENUITEM "&Back", IDTB_BACK + MENUITEM "&Forward", IDTB_FORWARD + MENUITEM "&Home", IDTB_HOME + MENUITEM "&Stop", IDTB_STOP + MENUITEM "&Refresh", IDTB_REFRESH + MENUITEM "&Print...", IDTB_PRINT + } +} Modified: trunk/reactos/dll/win32/hhctrl.ocx/lang/Da.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/lang/… ============================================================================== --- trunk/reactos/dll/win32/hhctrl.ocx/lang/Da.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hhctrl.ocx/lang/Da.rc [iso-8859-1] Sat Sep 27 19:04:10 2014 @@ -27,6 +27,9 @@ IDS_INDEX "I&ndeks" IDS_SEARCH "&Søg" IDS_FAVORITES "Favor&itter" + + IDS_HIDETABS "Hide &Tabs" + IDS_SHOWTABS "Show &Tabs" END STRINGTABLE @@ -41,18 +44,19 @@ IDTB_PRINT "Udskriv" IDTB_OPTIONS "Indstillinger" IDTB_FORWARD "Frem" - IDTB_NOTES "IDTB_NOTES" - IDTB_BROWSE_FWD "IDTB_BROWSE_FWD" - IDTB_BROWSE_BACK "IDT_BROWSE_BACK" - IDTB_CONTENTS "IDTB_CONTENTS" - IDTB_INDEX "IDTB_INDEX" - IDTB_SEARCH "IDTB_SEARCH" - IDTB_HISTORY "IDTB_HISTORY" - IDTB_FAVORITES "IDTB_FAVORITES" - IDTB_JUMP1 "Jump1" - IDTB_JUMP2 "Jump2" - IDTB_CUSTOMIZE "Tilpas" - IDTB_ZOOM "Forstør" - IDTB_TOC_NEXT "IDTB_TOC_NEXT" - IDTB_TOC_PREV "IDTB_TOC_PREV" END + +MENU_POPUP MENU +{ + POPUP "" /* Options */ + { + MENUITEM "", IDTB_EXPAND + MENUITEM "S&ync", IDTB_SYNC + MENUITEM "&Back", IDTB_BACK + MENUITEM "&Forward", IDTB_FORWARD + MENUITEM "&Home", IDTB_HOME + MENUITEM "&Stop", IDTB_STOP + MENUITEM "&Refresh", IDTB_REFRESH + MENUITEM "&Print...", IDTB_PRINT + } +} Modified: trunk/reactos/dll/win32/hhctrl.ocx/lang/De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/lang/… ============================================================================== --- trunk/reactos/dll/win32/hhctrl.ocx/lang/De.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hhctrl.ocx/lang/De.rc [iso-8859-1] Sat Sep 27 19:04:10 2014 @@ -29,6 +29,9 @@ IDS_INDEX "I&ndex" IDS_SEARCH "&Suche" IDS_FAVORITES "&Favoriten" + + IDS_HIDETABS "Hide &Tabs" + IDS_SHOWTABS "Show &Tabs" END STRINGTABLE @@ -43,18 +46,19 @@ IDTB_PRINT "Drucken" IDTB_OPTIONS "Einstellungen" IDTB_FORWARD "VorwÃ¤rts" - IDTB_NOTES "IDTB_NOTES" - IDTB_BROWSE_FWD "IDTB_BROWSE_FWD" - IDTB_BROWSE_BACK "IDT_BROWSE_BACK" - IDTB_CONTENTS "IDTB_CONTENTS" - IDTB_INDEX "IDTB_INDEX" - IDTB_SEARCH "IDTB_SEARCH" - IDTB_HISTORY "IDTB_HISTORY" - IDTB_FAVORITES "IDTB_FAVORITES" - IDTB_JUMP1 "Sprung1" - IDTB_JUMP2 "Sprung2" - IDTB_CUSTOMIZE "Anpassen" - IDTB_ZOOM "VergrÃ¶Ãern" - IDTB_TOC_NEXT "IDTB_TOC_NEXT" - IDTB_TOC_PREV "IDTB_TOC_PREV" END + +MENU_POPUP MENU +{ + POPUP "" /* Options */ + { + MENUITEM "", IDTB_EXPAND + MENUITEM "S&ync", IDTB_SYNC + MENUITEM "&Back", IDTB_BACK + MENUITEM "&Forward", IDTB_FORWARD + MENUITEM "&Home", IDTB_HOME + MENUITEM "&Stop", IDTB_STOP + MENUITEM "&Refresh", IDTB_REFRESH + MENUITEM "&Print...", IDTB_PRINT + } +} Modified: trunk/reactos/dll/win32/hhctrl.ocx/lang/El.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/lang/… ============================================================================== --- trunk/reactos/dll/win32/hhctrl.ocx/lang/El.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hhctrl.ocx/lang/El.rc [iso-8859-1] Sat Sep 27 19:04:10 2014 @@ -27,6 +27,9 @@ IDS_INDEX "I&ndex" IDS_SEARCH "&ÁíáæÞôçóç" IDS_FAVORITES "Á&ãáðçìÝíá" + + IDS_HIDETABS "Hide &Tabs" + IDS_SHOWTABS "Show &Tabs" END STRINGTABLE @@ -41,18 +44,19 @@ IDTB_PRINT "Åêôýðùóç" IDTB_OPTIONS "ÅðéëïãÝò" IDTB_FORWARD "Forward" - IDTB_NOTES "IDTB_NOTES" - IDTB_BROWSE_FWD "IDTB_BROWSE_FWD" - IDTB_BROWSE_BACK "IDT_BROWSE_BACK" - IDTB_CONTENTS "IDTB_CONTENTS" - IDTB_INDEX "IDTB_INDEX" - IDTB_SEARCH "IDTB_SEARCH" - IDTB_HISTORY "IDTB_HISTORY" - IDTB_FAVORITES "IDTB_FAVORITES" - IDTB_JUMP1 "Jump1" - IDTB_JUMP2 "Jump2" - IDTB_CUSTOMIZE "Customize" - IDTB_ZOOM "Zoom" - IDTB_TOC_NEXT "IDTB_TOC_NEXT" - IDTB_TOC_PREV "IDTB_TOC_PREV" END + +MENU_POPUP MENU +{ + POPUP "" /* Options */ + { + MENUITEM "", IDTB_EXPAND + MENUITEM "S&ync", IDTB_SYNC + MENUITEM "&Back", IDTB_BACK + MENUITEM "&Forward", IDTB_FORWARD + MENUITEM "&Home", IDTB_HOME + MENUITEM "&Stop", IDTB_STOP + MENUITEM "&Refresh", IDTB_REFRESH + MENUITEM "&Print...", IDTB_PRINT + } +} Modified: trunk/reactos/dll/win32/hhctrl.ocx/lang/En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/lang/… ============================================================================== --- trunk/reactos/dll/win32/hhctrl.ocx/lang/En.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hhctrl.ocx/lang/En.rc [iso-8859-1] Sat Sep 27 19:04:10 2014 @@ -3,6 +3,7 @@ * English Language Support * * Copyright 2005 James Hawkins + * Copyright 2011 Owen Rudge for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -27,6 +28,9 @@ IDS_INDEX "I&ndex" IDS_SEARCH "&Search" IDS_FAVORITES "Favor&ites" + + IDS_HIDETABS "Hide &Tabs" + IDS_SHOWTABS "Show &Tabs" END STRINGTABLE @@ -41,28 +45,19 @@ IDTB_PRINT "Print" IDTB_OPTIONS "Options" IDTB_FORWARD "Forward" - IDTB_NOTES "IDTB_NOTES" - IDTB_BROWSE_FWD "IDTB_BROWSE_FWD" - IDTB_BROWSE_BACK "IDT_BROWSE_BACK" - IDTB_CONTENTS "IDTB_CONTENTS" - IDTB_INDEX "IDTB_INDEX" - IDTB_SEARCH "IDTB_SEARCH" - IDTB_HISTORY "IDTB_HISTORY" - IDTB_FAVORITES "IDTB_FAVORITES" - IDTB_JUMP1 "Jump1" - IDTB_JUMP2 "Jump2" - IDTB_CUSTOMIZE "Customize" - IDTB_ZOOM "Zoom" - IDTB_TOC_NEXT "IDTB_TOC_NEXT" - IDTB_TOC_PREV "IDTB_TOC_PREV" END -LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL - -STRINGTABLE -BEGIN - IDS_CONTENTS "&Contents" - IDS_INDEX "I&ndex" - IDS_SEARCH "&Search" - IDS_FAVORITES "Favour&ites" -END +MENU_POPUP MENU +{ + POPUP "" /* Options */ + { + MENUITEM "", IDTB_EXPAND + MENUITEM "S&ync", IDTB_SYNC + MENUITEM "&Back", IDTB_BACK + MENUITEM "&Forward", IDTB_FORWARD + MENUITEM "&Home", IDTB_HOME + MENUITEM "&Stop", IDTB_STOP + MENUITEM "&Refresh", IDTB_REFRESH + MENUITEM "&Print...", IDTB_PRINT + } +} Modified: trunk/reactos/dll/win32/hhctrl.ocx/lang/Es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/lang/… ============================================================================== --- trunk/reactos/dll/win32/hhctrl.ocx/lang/Es.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hhctrl.ocx/lang/Es.rc [iso-8859-1] Sat Sep 27 19:04:10 2014 @@ -30,6 +30,9 @@ IDS_INDEX "Ã&ndice" IDS_SEARCH "&Buscar" IDS_FAVORITES "Favor&itos" + + IDS_HIDETABS "Hide &Tabs" + IDS_SHOWTABS "Show &Tabs" END STRINGTABLE @@ -44,18 +47,19 @@ IDTB_PRINT "Imprimir" IDTB_OPTIONS "Opciones" IDTB_FORWARD "Adelante" - IDTB_NOTES "IDTB_NOTES" - IDTB_BROWSE_FWD "IDTB_BROWSE_FWD" - IDTB_BROWSE_BACK "IDT_BROWSE_BACK" - IDTB_CONTENTS "IDTB_CONTENTS" - IDTB_INDEX "IDTB_INDEX" - IDTB_SEARCH "IDTB_SEARCH" - IDTB_HISTORY "IDTB_HISTORY" - IDTB_FAVORITES "IDTB_FAVORITES" - IDTB_JUMP1 "Jump1" - IDTB_JUMP2 "Jump2" - IDTB_CUSTOMIZE "Personalizar" - IDTB_ZOOM "Zoom" - IDTB_TOC_NEXT "IDTB_TOC_NEXT" - IDTB_TOC_PREV "IDTB_TOC_PREV" END + +MENU_POPUP MENU +{ + POPUP "" /* Options */ + { + MENUITEM "", IDTB_EXPAND + MENUITEM "S&ync", IDTB_SYNC + MENUITEM "&Back", IDTB_BACK + MENUITEM "&Forward", IDTB_FORWARD + MENUITEM "&Home", IDTB_HOME + MENUITEM "&Stop", IDTB_STOP + MENUITEM "&Refresh", IDTB_REFRESH + MENUITEM "&Print...", IDTB_PRINT + } +} Modified: trunk/reactos/dll/win32/hhctrl.ocx/lang/Fi.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/lang/… ============================================================================== --- trunk/reactos/dll/win32/hhctrl.ocx/lang/Fi.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hhctrl.ocx/lang/Fi.rc [iso-8859-1] Sat Sep 27 19:04:10 2014 @@ -27,6 +27,9 @@ IDS_INDEX "&Hakemisto" IDS_SEARCH "&Etsi" IDS_FAVORITES "S&uosikit" + + IDS_HIDETABS "Hide &Tabs" + IDS_SHOWTABS "Show &Tabs" END STRINGTABLE @@ -41,18 +44,19 @@ IDTB_PRINT "Tulosta" IDTB_OPTIONS "Valinnat" IDTB_FORWARD "Seuraava" - IDTB_NOTES "IDTB_NOTES" - IDTB_BROWSE_FWD "IDTB_BROWSE_FWD" - IDTB_BROWSE_BACK "IDT_BROWSE_BACK" - IDTB_CONTENTS "IDTB_CONTENTS" - IDTB_INDEX "IDTB_INDEX" - IDTB_SEARCH "IDTB_SEARCH" - IDTB_HISTORY "IDTB_HISTORY" - IDTB_FAVORITES "IDTB_FAVORITES" - IDTB_JUMP1 "Hyppää1" - IDTB_JUMP2 "Hyppää2" - IDTB_CUSTOMIZE "Räätälöi" - IDTB_ZOOM "Suurenna" - IDTB_TOC_NEXT "IDTB_TOC_NEXT" - IDTB_TOC_PREV "IDTB_TOC_PREV" END + +MENU_POPUP MENU +{ + POPUP "" /* Options */ + { + MENUITEM "", IDTB_EXPAND + MENUITEM "S&ync", IDTB_SYNC + MENUITEM "&Back", IDTB_BACK + MENUITEM "&Forward", IDTB_FORWARD + MENUITEM "&Home", IDTB_HOME + MENUITEM "&Stop", IDTB_STOP + MENUITEM "&Refresh", IDTB_REFRESH + MENUITEM "&Print...", IDTB_PRINT + } +} Modified: trunk/reactos/dll/win32/hhctrl.ocx/lang/Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/lang/… ============================================================================== --- trunk/reactos/dll/win32/hhctrl.ocx/lang/Fr.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hhctrl.ocx/lang/Fr.rc [iso-8859-1] Sat Sep 27 19:04:10 2014 @@ -30,6 +30,9 @@ IDS_INDEX "I&ndex" IDS_SEARCH "&Recherche" IDS_FAVORITES "&Signets" + + IDS_HIDETABS "Hide &Tabs" + IDS_SHOWTABS "Show &Tabs" END STRINGTABLE @@ -44,18 +47,19 @@ IDTB_PRINT "Imprimer" IDTB_OPTIONS "Options" IDTB_FORWARD "Suivant" - IDTB_NOTES "IDTB_NOTES" - IDTB_BROWSE_FWD "IDTB_BROWSE_FWD" - IDTB_BROWSE_BACK "IDT_BROWSE_BACK" - IDTB_CONTENTS "IDTB_CONTENTS" - IDTB_INDEX "IDTB_INDEX" - IDTB_SEARCH "IDTB_SEARCH" - IDTB_HISTORY "IDTB_HISTORY" - IDTB_FAVORITES "IDTB_FAVORITES" - IDTB_JUMP1 "Saut1" - IDTB_JUMP2 "Saut2" - IDTB_CUSTOMIZE "Personnaliser" - IDTB_ZOOM "Zoom" - IDTB_TOC_NEXT "IDTB_TOC_NEXT" - IDTB_TOC_PREV "IDTB_TOC_PREV" END + +MENU_POPUP MENU +{ + POPUP "" /* Options */ + { + MENUITEM "", IDTB_EXPAND + MENUITEM "S&ync", IDTB_SYNC + MENUITEM "&Back", IDTB_BACK + MENUITEM "&Forward", IDTB_FORWARD + MENUITEM "&Home", IDTB_HOME + MENUITEM "&Stop", IDTB_STOP + MENUITEM "&Refresh", IDTB_REFRESH + MENUITEM "&Print...", IDTB_PRINT + } +} Modified: trunk/reactos/dll/win32/hhctrl.ocx/lang/He.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/lang/… ============================================================================== --- trunk/reactos/dll/win32/hhctrl.ocx/lang/He.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hhctrl.ocx/lang/He.rc [iso-8859-1] Sat Sep 27 19:04:10 2014 @@ -29,6 +29,9 @@ IDS_INDEX "&××× ×§×¡" IDS_SEARCH "&××¤×©" IDS_FAVORITES "×××¢××¤××" + + IDS_HIDETABS "Hide &Tabs" + IDS_SHOWTABS "Show &Tabs" END STRINGTABLE @@ -43,28 +46,19 @@ IDTB_PRINT "×××¤×¡" IDTB_OPTIONS "××¤×©×¨××××ª" IDTB_FORWARD "×§××××" - IDTB_NOTES "IDTB_NOTES" - IDTB_BROWSE_FWD "IDTB_BROWSE_FWD" - IDTB_BROWSE_BACK "IDT_BROWSE_BACK" - IDTB_CONTENTS "IDTB_CONTENTS" - IDTB_INDEX "IDTB_INDEX" - IDTB_SEARCH "IDTB_SEARCH" - IDTB_HISTORY "IDTB_HISTORY" - IDTB_FAVORITES "IDTB_FAVORITES" - IDTB_JUMP1 "Jump1" - IDTB_JUMP2 "Jump2" - IDTB_CUSTOMIZE "Customize" - IDTB_ZOOM "××××" - IDTB_TOC_NEXT "IDTB_TOC_NEXT" - IDTB_TOC_PREV "IDTB_TOC_PREV" END -LANGUAGE LANG_HEBREW, SUBLANG_NEUTRAL - -STRINGTABLE -BEGIN - IDS_CONTENTS "×ª××&×" - IDS_INDEX "&××× ××§×¡" - IDS_SEARCH "&××¤×©" - IDS_FAVORITES "×××¢××¤××" -END +MENU_POPUP MENU +{ + POPUP "" /* Options */ + { + MENUITEM "", IDTB_EXPAND + MENUITEM "S&ync", IDTB_SYNC + MENUITEM "&Back", IDTB_BACK + MENUITEM "&Forward", IDTB_FORWARD + MENUITEM "&Home", IDTB_HOME + MENUITEM "&Stop", IDTB_STOP + MENUITEM "&Refresh", IDTB_REFRESH + MENUITEM "&Print...", IDTB_PRINT + } +} Modified: trunk/reactos/dll/win32/hhctrl.ocx/lang/Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/lang/… ============================================================================== --- trunk/reactos/dll/win32/hhctrl.ocx/lang/Hu.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hhctrl.ocx/lang/Hu.rc [iso-8859-1] Sat Sep 27 19:04:10 2014 @@ -27,6 +27,9 @@ IDS_INDEX "I&ndex" IDS_SEARCH "&Keresés" IDS_FAVORITES "Kedven&cek" + + IDS_HIDETABS "Hide &Tabs" + IDS_SHOWTABS "Show &Tabs" END STRINGTABLE @@ -41,18 +44,19 @@ IDTB_PRINT "Nyomtatás" IDTB_OPTIONS "Opciók" IDTB_FORWARD "Elõre" - IDTB_NOTES "IDTB_NOTES" - IDTB_BROWSE_FWD "IDTB_BROWSE_FWD" - IDTB_BROWSE_BACK "IDT_BROWSE_BACK" - IDTB_CONTENTS "IDTB_CONTENTS" - IDTB_INDEX "IDTB_INDEX" - IDTB_SEARCH "IDTB_SEARCH" - IDTB_HISTORY "IDTB_HISTORY" - IDTB_FAVORITES "IDTB_FAVORITES" - IDTB_JUMP1 "Jump1" - IDTB_JUMP2 "Jump2" - IDTB_CUSTOMIZE "Testreszabás" - IDTB_ZOOM "Zoom" - IDTB_TOC_NEXT "IDTB_TOC_NEXT" - IDTB_TOC_PREV "IDTB_TOC_PREV" END + +MENU_POPUP MENU +{ + POPUP "" /* Options */ + { + MENUITEM "", IDTB_EXPAND + MENUITEM "S&ync", IDTB_SYNC + MENUITEM "&Back", IDTB_BACK + MENUITEM "&Forward", IDTB_FORWARD + MENUITEM "&Home", IDTB_HOME + MENUITEM "&Stop", IDTB_STOP + MENUITEM "&Refresh", IDTB_REFRESH + MENUITEM "&Print...", IDTB_PRINT + } +} Modified: trunk/reactos/dll/win32/hhctrl.ocx/lang/It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/lang/… ============================================================================== --- trunk/reactos/dll/win32/hhctrl.ocx/lang/It.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hhctrl.ocx/lang/It.rc [iso-8859-1] Sat Sep 27 19:04:10 2014 @@ -31,6 +31,9 @@ IDS_INDEX "&Indice" IDS_SEARCH "&Ricerca" IDS_FAVORITES "&Preferiti" + + IDS_HIDETABS "Hide &Tabs" + IDS_SHOWTABS "Show &Tabs" END STRINGTABLE @@ -45,18 +48,19 @@ IDTB_PRINT "Stampa" IDTB_OPTIONS "Opzioni" IDTB_FORWARD "Avanti" - IDTB_NOTES "IDTB_NOTES" - IDTB_BROWSE_FWD "IDTB_BROWSE_FWD" - IDTB_BROWSE_BACK "IDT_BROWSE_BACK" - IDTB_CONTENTS "IDTB_CONTENTS" - IDTB_INDEX "IDTB_INDEX" - IDTB_SEARCH "IDTB_SEARCH" - IDTB_HISTORY "IDTB_HISTORY" - IDTB_FAVORITES "IDTB_FAVORITES" - IDTB_JUMP1 "Jump1" - IDTB_JUMP2 "Jump2" - IDTB_CUSTOMIZE "Personalizza" - IDTB_ZOOM "Zoom" - IDTB_TOC_NEXT "IDTB_TOC_NEXT" - IDTB_TOC_PREV "IDTB_TOC_PREV" END + +MENU_POPUP MENU +{ + POPUP "" /* Options */ + { + MENUITEM "", IDTB_EXPAND + MENUITEM "S&ync", IDTB_SYNC + MENUITEM "&Back", IDTB_BACK + MENUITEM "&Forward", IDTB_FORWARD + MENUITEM "&Home", IDTB_HOME + MENUITEM "&Stop", IDTB_STOP + MENUITEM "&Refresh", IDTB_REFRESH + MENUITEM "&Print...", IDTB_PRINT + } +} Modified: trunk/reactos/dll/win32/hhctrl.ocx/lang/Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/lang/… ============================================================================== --- trunk/reactos/dll/win32/hhctrl.ocx/lang/Ja.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hhctrl.ocx/lang/Ja.rc [iso-8859-1] Sat Sep 27 19:04:10 2014 @@ -31,6 +31,9 @@ IDS_INDEX "ç´¢å¼(&N)" IDS_SEARCH "æ¤ç´¢(&S)" IDS_FAVORITES "ãæ°ã«å¥ã(&I)" + + IDS_HIDETABS "Hide &Tabs" + IDS_SHOWTABS "Show &Tabs" END STRINGTABLE @@ -45,18 +48,19 @@ IDTB_PRINT "å°å·" IDTB_OPTIONS "ãªãã·ã§ã³" IDTB_FORWARD "é²ã" - IDTB_NOTES "IDTB_NOTES" - IDTB_BROWSE_FWD "IDTB_BROWSE_FWD" - IDTB_BROWSE_BACK "IDT_BROWSE_BACK" - IDTB_CONTENTS "IDTB_CONTENTS" - IDTB_INDEX "IDTB_INDEX" - IDTB_SEARCH "IDTB_SEARCH" - IDTB_HISTORY "IDTB_HISTORY" - IDTB_FAVORITES "IDTB_FAVORITES" - IDTB_JUMP1 "ã¸ã£ã³ã1" - IDTB_JUMP2 "ã¸ã£ã³ã2" - IDTB_CUSTOMIZE "ã«ã¹ã¿ãã¤ãº" - IDTB_ZOOM "ãã©ã³ã" - IDTB_TOC_NEXT "IDTB_TOC_NEXT" - IDTB_TOC_PREV "IDTB_TOC_PREV" END + +MENU_POPUP MENU +{ + POPUP "" /* Options */ + { + MENUITEM "", IDTB_EXPAND + MENUITEM "S&ync", IDTB_SYNC + MENUITEM "&Back", IDTB_BACK + MENUITEM "&Forward", IDTB_FORWARD + MENUITEM "&Home", IDTB_HOME + MENUITEM "&Stop", IDTB_STOP + MENUITEM "&Refresh", IDTB_REFRESH + MENUITEM "&Print...", IDTB_PRINT + } +} Modified: trunk/reactos/dll/win32/hhctrl.ocx/lang/Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/lang/… ============================================================================== --- trunk/reactos/dll/win32/hhctrl.ocx/lang/Ko.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hhctrl.ocx/lang/Ko.rc [iso-8859-1] Sat Sep 27 19:04:10 2014 @@ -28,6 +28,9 @@ IDS_INDEX "ÀÎµ¦½º(&N)" IDS_SEARCH "Ã£±â(&S)" IDS_FAVORITES "Áñ°ÜÃ£±â(&I)" + + IDS_HIDETABS "Hide &Tabs" + IDS_SHOWTABS "Show &Tabs" END STRINGTABLE @@ -42,18 +45,19 @@ IDTB_PRINT "ÀÎ¼â" IDTB_OPTIONS "¿É¼Ç" IDTB_FORWARD "¾ÕÀ¸·Î" - IDTB_NOTES "IDTB_NOTES" - IDTB_BROWSE_FWD "IDTB_BROWSE_FWD" - IDTB_BROWSE_BACK "IDT_BROWSE_BACK" - IDTB_CONTENTS "IDTB_CONTENTS" - IDTB_INDEX "IDTB_INDEX" - IDTB_SEARCH "IDTB_SEARCH" - IDTB_HISTORY "IDTB_HISTORY" - IDTB_FAVORITES "IDTB_FAVORITES" - IDTB_JUMP1 "Jump1" - IDTB_JUMP2 "Jump2" - IDTB_CUSTOMIZE "»ç¿ëÀÚÁ¤ÀÇ" - IDTB_ZOOM "È®´ë" - IDTB_TOC_NEXT "IDTB_TOC_NEXT" - IDTB_TOC_PREV "IDTB_TOC_PREV" END + +MENU_POPUP MENU +{ + POPUP "" /* Options */ + { + MENUITEM "", IDTB_EXPAND + MENUITEM "S&ync", IDTB_SYNC + MENUITEM "&Back", IDTB_BACK + MENUITEM "&Forward", IDTB_FORWARD + MENUITEM "&Home", IDTB_HOME + MENUITEM "&Stop", IDTB_STOP + MENUITEM "&Refresh", IDTB_REFRESH + MENUITEM "&Print...", IDTB_PRINT + } +} Modified: trunk/reactos/dll/win32/hhctrl.ocx/lang/Lt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/lang/… ============================================================================== --- trunk/reactos/dll/win32/hhctrl.ocx/lang/Lt.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hhctrl.ocx/lang/Lt.rc [iso-8859-1] Sat Sep 27 19:04:10 2014 @@ -30,6 +30,9 @@ IDS_INDEX "&RodyklÄ" IDS_SEARCH "&PaieÅ¡ka" IDS_FAVORITES "&Adresynas" + + IDS_HIDETABS "Hide &Tabs" + IDS_SHOWTABS "Show &Tabs" END STRINGTABLE @@ -44,18 +47,19 @@ IDTB_PRINT "Spausdinti" IDTB_OPTIONS "Parinktys" IDTB_FORWARD "Pirmyn" - IDTB_NOTES "IDTB_NOTES" - IDTB_BROWSE_FWD "IDTB_BROWSE_FWD" - IDTB_BROWSE_BACK "IDT_BROWSE_BACK" - IDTB_CONTENTS "IDTB_CONTENTS" - IDTB_INDEX "IDTB_INDEX" - IDTB_SEARCH "IDTB_SEARCH" - IDTB_HISTORY "IDTB_HISTORY" - IDTB_FAVORITES "IDTB_FAVORITES" - IDTB_JUMP1 "Nukreipimas1" - IDTB_JUMP2 "Nukreipimas2" - IDTB_CUSTOMIZE "Adaptuoti" - IDTB_ZOOM "Keisti mastelÄ¯" - IDTB_TOC_NEXT "IDTB_TOC_NEXT" - IDTB_TOC_PREV "IDTB_TOC_PREV" END + +MENU_POPUP MENU +{ + POPUP "" /* Options */ + { + MENUITEM "", IDTB_EXPAND + MENUITEM "S&ync", IDTB_SYNC + MENUITEM "&Back", IDTB_BACK + MENUITEM "&Forward", IDTB_FORWARD + MENUITEM "&Home", IDTB_HOME + MENUITEM "&Stop", IDTB_STOP + MENUITEM "&Refresh", IDTB_REFRESH + MENUITEM "&Print...", IDTB_PRINT + } +} Modified: trunk/reactos/dll/win32/hhctrl.ocx/lang/Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/lang/… ============================================================================== --- trunk/reactos/dll/win32/hhctrl.ocx/lang/Nl.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hhctrl.ocx/lang/Nl.rc [iso-8859-1] Sat Sep 27 19:04:10 2014 @@ -27,6 +27,9 @@ IDS_INDEX "I&ndex" IDS_SEARCH "&Zoeken" IDS_FAVORITES "&Favorieten" + + IDS_HIDETABS "Hide &Tabs" + IDS_SHOWTABS "Show &Tabs" END STRINGTABLE @@ -41,18 +44,19 @@ IDTB_PRINT "Afdrukken" IDTB_OPTIONS "Instellingen" IDTB_FORWARD "Vooruit" - IDTB_NOTES "IDTB_NOTES" - IDTB_BROWSE_FWD "IDTB_BROWSE_FWD" - IDTB_BROWSE_BACK "IDT_BROWSE_BACK" - IDTB_CONTENTS "IDTB_CONTENTS" - IDTB_INDEX "IDTB_INDEX" - IDTB_SEARCH "IDTB_SEARCH" - IDTB_HISTORY "IDTB_HISTORY" - IDTB_FAVORITES "IDTB_FAVORITES" - IDTB_JUMP1 "Sprong1" - IDTB_JUMP2 "Sprong2" - IDTB_CUSTOMIZE "Aanpassen" - IDTB_ZOOM "Vergroten" - IDTB_TOC_NEXT "IDTB_TOC_NEXT" - IDTB_TOC_PREV "IDTB_TOC_PREV" END + +MENU_POPUP MENU +{ + POPUP "" /* Options */ + { + MENUITEM "", IDTB_EXPAND + MENUITEM "S&ync", IDTB_SYNC + MENUITEM "&Back", IDTB_BACK + MENUITEM "&Forward", IDTB_FORWARD + MENUITEM "&Home", IDTB_HOME + MENUITEM "&Stop", IDTB_STOP + MENUITEM "&Refresh", IDTB_REFRESH + MENUITEM "&Print...", IDTB_PRINT + } +} Modified: trunk/reactos/dll/win32/hhctrl.ocx/lang/No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/lang/… ============================================================================== --- trunk/reactos/dll/win32/hhctrl.ocx/lang/No.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hhctrl.ocx/lang/No.rc [iso-8859-1] Sat Sep 27 19:04:10 2014 @@ -27,6 +27,9 @@ IDS_INDEX "I&ndeks" IDS_SEARCH "&Søk" IDS_FAVORITES "Favor&itter" + + IDS_HIDETABS "Hide &Tabs" + IDS_SHOWTABS "Show &Tabs" END STRINGTABLE @@ -41,18 +44,19 @@ IDTB_PRINT "Skriv ut" IDTB_OPTIONS "Innstillinger" IDTB_FORWARD "Fram" - IDTB_NOTES "IDTB_NOTES" - IDTB_BROWSE_FWD "IDTB_BROWSE_FWD" - IDTB_BROWSE_BACK "IDT_BROWSE_BACK" - IDTB_CONTENTS "IDTB_CONTENTS" - IDTB_INDEX "IDTB_INDEX" - IDTB_SEARCH "IDTB_SEARCH" - IDTB_HISTORY "IDTB_HISTORY" - IDTB_FAVORITES "IDTB_FAVORITES" - IDTB_JUMP1 "Jump1" - IDTB_JUMP2 "Jump2" - IDTB_CUSTOMIZE "Tilpass" - IDTB_ZOOM "Forstørr" - IDTB_TOC_NEXT "IDTB_TOC_NEXT" - IDTB_TOC_PREV "IDTB_TOC_PREV" END + +MENU_POPUP MENU +{ + POPUP "" /* Options */ + { + MENUITEM "", IDTB_EXPAND + MENUITEM "S&ync", IDTB_SYNC + MENUITEM "&Back", IDTB_BACK + MENUITEM "&Forward", IDTB_FORWARD + MENUITEM "&Home", IDTB_HOME + MENUITEM "&Stop", IDTB_STOP + MENUITEM "&Refresh", IDTB_REFRESH + MENUITEM "&Print...", IDTB_PRINT + } +} Modified: trunk/reactos/dll/win32/hhctrl.ocx/lang/Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/lang/… ============================================================================== --- trunk/reactos/dll/win32/hhctrl.ocx/lang/Pl.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hhctrl.ocx/lang/Pl.rc [iso-8859-1] Sat Sep 27 19:04:10 2014 @@ -28,6 +28,9 @@ IDS_INDEX "&Indeks" IDS_SEARCH "&Wyszukaj" IDS_FAVORITES "&Ulubione" + + IDS_HIDETABS "Hide &Tabs" + IDS_SHOWTABS "Show &Tabs" END STRINGTABLE @@ -42,18 +45,19 @@ IDTB_PRINT "Drukuj" IDTB_OPTIONS "Opcje" IDTB_FORWARD "Dalej" - IDTB_NOTES "IDTB_NOTES" - IDTB_BROWSE_FWD "IDTB_BROWSE_FWD" - IDTB_BROWSE_BACK "IDT_BROWSE_BACK" - IDTB_CONTENTS "IDTB_CONTENTS" - IDTB_INDEX "IDTB_INDEX" - IDTB_SEARCH "IDTB_SEARCH" - IDTB_HISTORY "IDTB_HISTORY" - IDTB_FAVORITES "IDTB_FAVORITES" - IDTB_JUMP1 "Skok1" - IDTB_JUMP2 "Skok2" - IDTB_CUSTOMIZE "Dostosuj" - IDTB_ZOOM "Powiêksz" - IDTB_TOC_NEXT "IDTB_TOC_NEXT" - IDTB_TOC_PREV "IDTB_TOC_PREV" END + +MENU_POPUP MENU +{ + POPUP "" /* Options */ + { + MENUITEM "", IDTB_EXPAND + MENUITEM "S&ync", IDTB_SYNC + MENUITEM "&Back", IDTB_BACK + MENUITEM "&Forward", IDTB_FORWARD + MENUITEM "&Home", IDTB_HOME + MENUITEM "&Stop", IDTB_STOP + MENUITEM "&Refresh", IDTB_REFRESH + MENUITEM "&Print...", IDTB_PRINT + } +} Modified: trunk/reactos/dll/win32/hhctrl.ocx/lang/Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/lang/… ============================================================================== --- trunk/reactos/dll/win32/hhctrl.ocx/lang/Pt.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hhctrl.ocx/lang/Pt.rc [iso-8859-1] Sat Sep 27 19:04:10 2014 @@ -32,6 +32,20 @@ IDS_FAVORITES "&Favoritos" END +MENU_POPUP MENU +{ + POPUP "" /* Options */ + { + MENUITEM "", IDTB_EXPAND + MENUITEM "S&ync", IDTB_SYNC + MENUITEM "&Back", IDTB_BACK + MENUITEM "&Forward", IDTB_FORWARD + MENUITEM "&Home", IDTB_HOME + MENUITEM "&Stop", IDTB_STOP + MENUITEM "&Refresh", IDTB_REFRESH + MENUITEM "&Print...", IDTB_PRINT + } +} LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN @@ -47,20 +61,6 @@ IDTB_PRINT "Imprimir" IDTB_OPTIONS "OpÃ§Ãµes" IDTB_FORWARD "AvanÃ§ar" - IDTB_NOTES "IDTB_NOTES" - IDTB_BROWSE_FWD "IDTB_BROWSE_FWD" - IDTB_BROWSE_BACK "IDT_BROWSE_BACK" - IDTB_CONTENTS "IDTB_CONTENTS" - IDTB_INDEX "IDTB_INDEX" - IDTB_SEARCH "IDTB_SEARCH" - IDTB_HISTORY "IDTB_HISTORY" - IDTB_FAVORITES "IDTB_FAVORITES" - IDTB_JUMP1 "Jump1" - IDTB_JUMP2 "Jump2" - IDTB_CUSTOMIZE "Personalizar" - IDTB_ZOOM "Zoom" - IDTB_TOC_NEXT "IDTB_TOC_NEXT" - IDTB_TOC_PREV "IDTB_TOC_PREV" END LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE @@ -77,18 +77,4 @@ IDTB_PRINT "Imprimir" IDTB_OPTIONS "OpÃ§Ãµes" IDTB_FORWARD "AvanÃ§ar" - IDTB_NOTES "IDTB_NOTES" - IDTB_BROWSE_FWD "IDTB_BROWSE_FWD" - IDTB_BROWSE_BACK "IDT_BROWSE_BACK" - IDTB_CONTENTS "IDTB_CONTENTS" - IDTB_INDEX "IDTB_INDEX" - IDTB_SEARCH "IDTB_SEARCH" - IDTB_HISTORY "IDTB_HISTORY" - IDTB_FAVORITES "IDTB_FAVORITES" - IDTB_JUMP1 "Jump1" - IDTB_JUMP2 "Jump2" - IDTB_CUSTOMIZE "Personalizar" - IDTB_ZOOM "Zoom" - IDTB_TOC_NEXT "IDTB_TOC_NEXT" - IDTB_TOC_PREV "IDTB_TOC_PREV" END Modified: trunk/reactos/dll/win32/hhctrl.ocx/lang/Ro.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/lang/… ============================================================================== --- trunk/reactos/dll/win32/hhctrl.ocx/lang/Ro.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hhctrl.ocx/lang/Ro.rc [iso-8859-1] Sat Sep 27 19:04:10 2014 @@ -31,6 +31,9 @@ IDS_INDEX "&Index" IDS_SEARCH "&CautÄ" IDS_FAVORITES "F&avorite" + + IDS_HIDETABS "Hide &Tabs" + IDS_SHOWTABS "Show &Tabs" END STRINGTABLE @@ -45,18 +48,19 @@ IDTB_PRINT "ImprimÄ" IDTB_OPTIONS "OpÈiuni" IDTB_FORWARD "Ãnainte" - IDTB_NOTES "Note" - IDTB_BROWSE_FWD "CautÄ Ã®nainte" - IDTB_BROWSE_BACK "CautÄ Ã®napoi" - IDTB_CONTENTS "Cuprins" - IDTB_INDEX "Index" - IDTB_SEARCH "CautÄ" - IDTB_HISTORY "Istoric" - IDTB_FAVORITES "Favorite" - IDTB_JUMP1 "Salt1" - IDTB_JUMP2 "Salt2" - IDTB_CUSTOMIZE "Personalizare" - IDTB_ZOOM "ScarÄ" - IDTB_TOC_NEXT "Capitol urmÄtor" - IDTB_TOC_PREV "Capitol precedent" END + +MENU_POPUP MENU +{ + POPUP "" /* Options */ + { + MENUITEM "", IDTB_EXPAND + MENUITEM "S&ync", IDTB_SYNC + MENUITEM "&Back", IDTB_BACK + MENUITEM "&Forward", IDTB_FORWARD + MENUITEM "&Home", IDTB_HOME + MENUITEM "&Stop", IDTB_STOP + MENUITEM "&Refresh", IDTB_REFRESH + MENUITEM "&Print...", IDTB_PRINT + } +} Modified: trunk/reactos/dll/win32/hhctrl.ocx/lang/Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/lang/… ============================================================================== --- trunk/reactos/dll/win32/hhctrl.ocx/lang/Ru.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hhctrl.ocx/lang/Ru.rc [iso-8859-1] Sat Sep 27 19:04:10 2014 @@ -30,6 +30,9 @@ IDS_INDEX "&ÐÐ³Ð»Ð°Ð²Ð»ÐµÐ½Ð¸Ðµ" IDS_SEARCH "&ÐÐ¾Ð¸ÑÐº" IDS_FAVORITES "&ÐÐ·Ð±ÑÐ°Ð½Ð½Ð¾Ðµ" + + IDS_HIDETABS "Hide &Tabs" + IDS_SHOWTABS "Show &Tabs" END STRINGTABLE @@ -44,18 +47,19 @@ IDTB_PRINT "ÐÐµÑÐ°ÑÑ" IDTB_OPTIONS "ÐÐ°ÑÑÑÐ¾Ð¹ÐºÐ¸" IDTB_FORWARD "ÐÐ¿ÐµÑÑÐ´" - IDTB_NOTES "ÐÐ°Ð¿Ð¸ÑÐºÐ¸" - IDTB_BROWSE_FWD "ÐÑÐ¾ÑÐ¼Ð¾ÑÑ Ð²Ð¿ÐµÑÑÐ´" - IDTB_BROWSE_BACK "ÐÑÐ¾ÑÐ¼Ð¾ÑÑ Ð½Ð°Ð·Ð°Ð´" - IDTB_CONTENTS "Ð¡Ð¾Ð´ÐµÑÐ¶Ð°Ð½Ð¸Ðµ" - IDTB_INDEX "ÐÐ³Ð»Ð°Ð²Ð»ÐµÐ½Ð¸Ðµ" - IDTB_SEARCH "ÐÐ¾Ð¸ÑÐº" - IDTB_HISTORY "ÐÑÑÐ¾ÑÐ¸Ñ" - IDTB_FAVORITES "ÐÐ·Ð±ÑÐ°Ð½Ð½Ð¾Ðµ" - IDTB_JUMP1 "ÐÐµÑÐµÑÐ¾Ð´ 1" - IDTB_JUMP2 "ÐÐµÑÐµÑÐ¾Ð´ 2" - IDTB_CUSTOMIZE "ÐÐµÑÑÐ¾Ð½Ð°Ð»Ð¸Ð·Ð¸ÑÐ¾Ð²Ð°ÑÑ" - IDTB_ZOOM "ÐÐ°ÑÑÑÐ°Ð±" - IDTB_TOC_NEXT "Ð¡Ð»ÐµÐ´ÑÑÑÐ°Ñ Ð³Ð»Ð°Ð²Ð°" - IDTB_TOC_PREV "ÐÑÐµÐ´ÑÐ´ÑÑÐ°Ñ Ð³Ð»Ð°Ð²Ð°" END + +MENU_POPUP MENU +{ + POPUP "" /* Options */ + { + MENUITEM "", IDTB_EXPAND + MENUITEM "S&ync", IDTB_SYNC + MENUITEM "&Back", IDTB_BACK + MENUITEM "&Forward", IDTB_FORWARD + MENUITEM "&Home", IDTB_HOME + MENUITEM "&Stop", IDTB_STOP + MENUITEM "&Refresh", IDTB_REFRESH + MENUITEM "&Print...", IDTB_PRINT + } +} Modified: trunk/reactos/dll/win32/hhctrl.ocx/lang/Si.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/lang/… ============================================================================== --- trunk/reactos/dll/win32/hhctrl.ocx/lang/Si.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hhctrl.ocx/lang/Si.rc [iso-8859-1] Sat Sep 27 19:04:10 2014 @@ -29,6 +29,9 @@ IDS_INDEX "I&ndeks" IDS_SEARCH "&Iskanje" IDS_FAVORITES "&Priljubljene" + + IDS_HIDETABS "Hide &Tabs" + IDS_SHOWTABS "Show &Tabs" END STRINGTABLE @@ -43,18 +46,19 @@ IDTB_PRINT "Natisni" IDTB_OPTIONS "MoÅ¾nosti" IDTB_FORWARD "Naprej" - IDTB_NOTES "IDTB_NOTES" - IDTB_BROWSE_FWD "IDTB_BROWSE_FWD" - IDTB_BROWSE_BACK "IDT_BROWSE_BACK" - IDTB_CONTENTS "IDTB_CONTENTS" - IDTB_INDEX "IDTB_INDEX" - IDTB_SEARCH "IDTB_SEARCH" - IDTB_HISTORY "IDTB_HISTORY" - IDTB_FAVORITES "IDTB_FAVORITES" - IDTB_JUMP1 "Skok1" - IDTB_JUMP2 "Skok2" - IDTB_CUSTOMIZE "Prilagodi" - IDTB_ZOOM "Zoom" - IDTB_TOC_NEXT "IDTB_TOC_NEXT" - IDTB_TOC_PREV "IDTB_TOC_PREV" END + +MENU_POPUP MENU +{ + POPUP "" /* Options */ + { + MENUITEM "", IDTB_EXPAND + MENUITEM "S&ync", IDTB_SYNC + MENUITEM "&Back", IDTB_BACK + MENUITEM "&Forward", IDTB_FORWARD + MENUITEM "&Home", IDTB_HOME + MENUITEM "&Stop", IDTB_STOP + MENUITEM "&Refresh", IDTB_REFRESH + MENUITEM "&Print...", IDTB_PRINT + } +} Modified: trunk/reactos/dll/win32/hhctrl.ocx/lang/Sq.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/lang/… ============================================================================== --- trunk/reactos/dll/win32/hhctrl.ocx/lang/Sq.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hhctrl.ocx/lang/Sq.rc [iso-8859-1] Sat Sep 27 19:04:10 2014 @@ -30,6 +30,9 @@ IDS_INDEX "I&ndex" IDS_SEARCH "Kerko" IDS_FAVORITES "Favor&ite" + + IDS_HIDETABS "Hide &Tabs" + IDS_SHOWTABS "Show &Tabs" END STRINGTABLE @@ -44,28 +47,19 @@ IDTB_PRINT "Printo" IDTB_OPTIONS "opsione" IDTB_FORWARD "Perpara" - IDTB_NOTES "IDTB_SHENIME" - IDTB_BROWSE_FWD "IDTB_BROWSE_FWD" - IDTB_BROWSE_BACK "IDT_BROWSE_MBRAPA" - IDTB_CONTENTS "IDTB_PERMBAJTJE" - IDTB_INDEX "IDTB_INDEX" - IDTB_SEARCH "IDTB_KERKO" - IDTB_HISTORY "IDTB_HISTORI" - IDTB_FAVORITES "IDTB_FAVORITE" - IDTB_JUMP1 "Jump1" - IDTB_JUMP2 "Jump2" - IDTB_CUSTOMIZE "Modifiko" - IDTB_ZOOM "Zoom" - IDTB_TOC_NEXT "IDTB_TOC_NEXT" - IDTB_TOC_PREV "IDTB_TOC_PREV" END -LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL - -STRINGTABLE -BEGIN - IDS_CONTENTS "PÃ«rmbajtja" - IDS_INDEX "I&ndex" - IDS_SEARCH "Kerko" - IDS_FAVORITES "Favour&ite" -END +MENU_POPUP MENU +{ + POPUP "" /* Options */ + { + MENUITEM "", IDTB_EXPAND + MENUITEM "S&ync", IDTB_SYNC + MENUITEM "&Back", IDTB_BACK + MENUITEM "&Forward", IDTB_FORWARD + MENUITEM "&Home", IDTB_HOME + MENUITEM "&Stop", IDTB_STOP + MENUITEM "&Refresh", IDTB_REFRESH + MENUITEM "&Print...", IDTB_PRINT + } +} Modified: trunk/reactos/dll/win32/hhctrl.ocx/lang/Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/lang/… ============================================================================== --- trunk/reactos/dll/win32/hhctrl.ocx/lang/Sv.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hhctrl.ocx/lang/Sv.rc [iso-8859-1] Sat Sep 27 19:04:10 2014 @@ -27,6 +27,9 @@ IDS_INDEX "I&ndex" IDS_SEARCH "&Sök" IDS_FAVORITES "Favor&iter" + + IDS_HIDETABS "Hide &Tabs" + IDS_SHOWTABS "Show &Tabs" END STRINGTABLE @@ -41,18 +44,19 @@ IDTB_PRINT "Skriv ut" IDTB_OPTIONS "Alternativ" IDTB_FORWARD "Framåt" - IDTB_NOTES "IDTB_NOTES" - IDTB_BROWSE_FWD "IDTB_BROWSE_FWD" - IDTB_BROWSE_BACK "IDT_BROWSE_BACK" - IDTB_CONTENTS "IDTB_CONTENTS" - IDTB_INDEX "IDTB_INDEX" - IDTB_SEARCH "IDTB_SEARCH" - IDTB_HISTORY "IDTB_HISTORY" - IDTB_FAVORITES "IDTB_FAVORITES" - IDTB_JUMP1 "Jump1" - IDTB_JUMP2 "Jump2" - IDTB_CUSTOMIZE "Anpassa" - IDTB_ZOOM "Zoom" - IDTB_TOC_NEXT "IDTB_TOC_NEXT" - IDTB_TOC_PREV "IDTB_TOC_PREV" END + +MENU_POPUP MENU +{ + POPUP "" /* Options */ + { + MENUITEM "", IDTB_EXPAND + MENUITEM "S&ync", IDTB_SYNC + MENUITEM "&Back", IDTB_BACK + MENUITEM "&Forward", IDTB_FORWARD + MENUITEM "&Home", IDTB_HOME + MENUITEM "&Stop", IDTB_STOP + MENUITEM "&Refresh", IDTB_REFRESH + MENUITEM "&Print...", IDTB_PRINT + } +} Modified: trunk/reactos/dll/win32/hhctrl.ocx/lang/Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/lang/… ============================================================================== --- trunk/reactos/dll/win32/hhctrl.ocx/lang/Tr.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hhctrl.ocx/lang/Tr.rc [iso-8859-1] Sat Sep 27 19:04:10 2014 @@ -27,6 +27,9 @@ IDS_INDEX "&Dizin" IDS_SEARCH "&Ara" IDS_FAVORITES "&Yer Ä°mleri" + + IDS_HIDETABS "Hide &Tabs" + IDS_SHOWTABS "Show &Tabs" END STRINGTABLE @@ -41,18 +44,19 @@ IDTB_PRINT "YazdÄ±r" IDTB_OPTIONS "SeÃ§enekler" IDTB_FORWARD "Ä°leri" - IDTB_NOTES "IDTB_NOTES" - IDTB_BROWSE_FWD "IDTB_BROWSE_FWD" - IDTB_BROWSE_BACK "IDT_BROWSE_BACK" - IDTB_CONTENTS "IDTB_CONTENTS" - IDTB_INDEX "IDTB_INDEX" - IDTB_SEARCH "IDTB_SEARCH" - IDTB_HISTORY "IDTB_HISTORY" - IDTB_FAVORITES "IDTB_FAVORITES" - IDTB_JUMP1 "Jump1" - IDTB_JUMP2 "Jump2" - IDTB_CUSTOMIZE "HusÃ»sileÅtir" - IDTB_ZOOM "YakÄ±nlaÅtÄ±r" - IDTB_TOC_NEXT "IDTB_TOC_NEXT" - IDTB_TOC_PREV "IDTB_TOC_PREV" END + +MENU_POPUP MENU +{ + POPUP "" /* Options */ + { + MENUITEM "", IDTB_EXPAND + MENUITEM "S&ync", IDTB_SYNC + MENUITEM "&Back", IDTB_BACK + MENUITEM "&Forward", IDTB_FORWARD + MENUITEM "&Home", IDTB_HOME + MENUITEM "&Stop", IDTB_STOP + MENUITEM "&Refresh", IDTB_REFRESH + MENUITEM "&Print...", IDTB_PRINT + } +} Modified: trunk/reactos/dll/win32/hhctrl.ocx/lang/Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/lang/… ============================================================================== --- trunk/reactos/dll/win32/hhctrl.ocx/lang/Uk.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hhctrl.ocx/lang/Uk.rc [iso-8859-1] Sat Sep 27 19:04:10 2014 @@ -32,6 +32,9 @@ IDS_INDEX "&ÐÐºÐ°Ð·ÑÐ²Ð½Ð¸Ðº" IDS_SEARCH "&ÐÐ¾ÑÑÐº" IDS_FAVORITES "&ÐÐ±ÑÐ°Ð½Ðµ" + + IDS_HIDETABS "Hide &Tabs" + IDS_SHOWTABS "Show &Tabs" END STRINGTABLE @@ -46,28 +49,19 @@ IDTB_PRINT "ÐÑÑÐº" IDTB_OPTIONS "ÐÐ°ÑÐ°Ð¼ÐµÑÑÐ¸" IDTB_FORWARD "ÐÐ¿ÐµÑÐµÐ´" - IDTB_NOTES "IDTB_NOTES" - IDTB_BROWSE_FWD "IDTB_BROWSE_FWD" - IDTB_BROWSE_BACK "IDT_BROWSE_BACK" - IDTB_CONTENTS "IDTB_CONTENTS" - IDTB_INDEX "IDTB_INDEX" - IDTB_SEARCH "IDTB_SEARCH" - IDTB_HISTORY "IDTB_HISTORY" - IDTB_FAVORITES "IDTB_FAVORITES" - IDTB_JUMP1 "Jump1" - IDTB_JUMP2 "Jump2" - IDTB_CUSTOMIZE "ÐÐ°Ð»Ð°ÑÑÑÐ²Ð°Ð½Ð½Ñ" - IDTB_ZOOM "ÐÐ±ÑÐ»ÑÑÐµÐ½Ð½Ñ" - IDTB_TOC_NEXT "IDTB_TOC_NEXT" - IDTB_TOC_PREV "IDTB_TOC_PREV" END -LANGUAGE LANG_UKRAINIAN, SUBLANG_NEUTRAL - -STRINGTABLE -BEGIN - IDS_CONTENTS "&ÐÐ¼ÑÑÑ" - IDS_INDEX "&ÐÐºÐ°Ð·ÑÐ²Ð½Ð¸Ðº" - IDS_SEARCH "&ÐÐ¾ÑÑÐº" - IDS_FAVORITES "&ÐÐ±ÑÐ°Ð½Ðµ" -END +MENU_POPUP MENU +{ + POPUP "" /* Options */ + { + MENUITEM "", IDTB_EXPAND + MENUITEM "S&ync", IDTB_SYNC + MENUITEM "&Back", IDTB_BACK + MENUITEM "&Forward", IDTB_FORWARD + MENUITEM "&Home", IDTB_HOME + MENUITEM "&Stop", IDTB_STOP + MENUITEM "&Refresh", IDTB_REFRESH + MENUITEM "&Print...", IDTB_PRINT + } +} Modified: trunk/reactos/dll/win32/hhctrl.ocx/lang/Zh.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/lang/… ============================================================================== --- trunk/reactos/dll/win32/hhctrl.ocx/lang/Zh.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hhctrl.ocx/lang/Zh.rc [iso-8859-1] Sat Sep 27 19:04:10 2014 @@ -29,6 +29,9 @@ IDS_INDEX "ç®å½(&N)" IDS_SEARCH "æå¯»(&S)" IDS_FAVORITES "æç±(&I)" + + IDS_HIDETABS "Hide &Tabs" + IDS_SHOWTABS "Show &Tabs" END STRINGTABLE @@ -43,21 +46,22 @@ IDTB_PRINT "æå°" IDTB_OPTIONS "éé¡¹" IDTB_FORWARD "åå" - IDTB_NOTES "è¯´æ" - IDTB_BROWSE_FWD "åå" - IDTB_BROWSE_BACK "åå" - IDTB_CONTENTS "åå®¹" - IDTB_INDEX "ç®å½" - IDTB_SEARCH "æå¯»" - IDTB_HISTORY "åå²" - IDTB_FAVORITES "æç±" - IDTB_JUMP1 "Jump1" - IDTB_JUMP2 "Jump2" - IDTB_CUSTOMIZE "ä¸ªæ§å" - IDTB_ZOOM "æ¾å¤§" - IDTB_TOC_NEXT "åä¸é¡¹" - IDTB_TOC_PREV "åä¸é¡¹" END + +MENU_POPUP MENU +{ + POPUP "" /* Options */ + { + MENUITEM "", IDTB_EXPAND + MENUITEM "S&ync", IDTB_SYNC + MENUITEM "&Back", IDTB_BACK + MENUITEM "&Forward", IDTB_FORWARD + MENUITEM "&Home", IDTB_HOME + MENUITEM "&Stop", IDTB_STOP + MENUITEM "&Refresh", IDTB_REFRESH + MENUITEM "&Print...", IDTB_PRINT + } +} LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL @@ -81,18 +85,19 @@ IDTB_PRINT "åå°" IDTB_OPTIONS "é¸é " IDTB_FORWARD "åå" - IDTB_NOTES "èªªæ" - IDTB_BROWSE_FWD "åå" - IDTB_BROWSE_BACK "åå¾" - IDTB_CONTENTS "å§å®¹" - IDTB_INDEX "ç®é" - IDTB_SEARCH "æå°" - IDTB_HISTORY "æ·å²" - IDTB_FAVORITES "ææ" - IDTB_JUMP1 "Jump1" - IDTB_JUMP2 "Jump2" - IDTB_CUSTOMIZE "åæ§å" - IDTB_ZOOM "æ¾å¤§" - IDTB_TOC_NEXT "å¾ä¸é " - IDTB_TOC_PREV "åä¸é " END + +MENU_POPUP MENU +{ + POPUP "" /* Options */ + { + MENUITEM "", IDTB_EXPAND + MENUITEM "S&ync", IDTB_SYNC + MENUITEM "&Back", IDTB_BACK + MENUITEM "&Forward", IDTB_FORWARD + MENUITEM "&Home", IDTB_HOME + MENUITEM "&Stop", IDTB_STOP + MENUITEM "&Refresh", IDTB_REFRESH + MENUITEM "&Print...", IDTB_PRINT + } +} Modified: trunk/reactos/dll/win32/hhctrl.ocx/stream.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/strea… ============================================================================== --- trunk/reactos/dll/win32/hhctrl.ocx/stream.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hhctrl.ocx/stream.c [iso-8859-1] Sat Sep 27 19:04:10 2014 @@ -117,7 +117,7 @@ if(buf->len == 0) break; p = &buf->buf[b]; - while((p = memchr(p+1, '"', buf->len-(p-buf->buf))) != NULL) + while((p = memchr(p+1, '"', buf->len-(p+1-buf->buf))) != NULL) tag_count++; b = buf->len; if(tag_count % 2 != 0) 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 Sep 27 19:04:10 2014 @@ -76,7 +76,7 @@ reactos/dll/win32/fltlib # Synced to Wine-1.7.27 reactos/dll/win32/fusion # Synced to Wine-1.7.27 reactos/dll/win32/gdiplus # Synced to Wine-1.7.27 -reactos/dll/win32/hhctrl.ocx # Synced to Wine-1.7.17 +reactos/dll/win32/hhctrl.ocx # Synced to Wine-1.7.27 reactos/dll/win32/hlink # Synced to Wine-1.7.17 reactos/dll/win32/hnetcfg # Synced to Wine-1.7.17 reactos/dll/win32/httpapi # Synced to Wine-1.7.17

11 years, 1 month

[akhaldi] 64347: [WININET_WINETEST] * Update test data to match the new certificate on winehq.org. Wine commit bbfae5be by Hans Leidekker.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Sep 27 18:21:35 2014 New Revision: 64347 URL: http://svn.reactos.org/svn/reactos?rev=64347&view=rev Log: [WININET_WINETEST] * Update test data to match the new certificate on winehq.org. Wine commit bbfae5be by Hans Leidekker. Modified: trunk/rostests/winetests/wininet/http.c Modified: trunk/rostests/winetests/wininet/http.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/wininet/http.c?… ============================================================================== --- trunk/rostests/winetests/wininet/http.c [iso-8859-1] (original) +++ trunk/rostests/winetests/wininet/http.c [iso-8859-1] Sat Sep 27 18:21:35 2014 @@ -4185,15 +4185,14 @@ } cert_struct_test_t; static const cert_struct_test_t test_winehq_org_cert = { - "6JcR7G3G8tgjkeoMcitK-bTbzcpumDSy\r\n" "GT98380011\r\n" "See www.rapidssl.com/resources/cps (c)14\r\n" "Domain Control Validated - RapidSSL(R)\r\n" "*.winehq.org", "US\r\n" - "\"GeoTrust, Inc.\"\r\n" - "RapidSSL CA" + "GeoTrust Inc.\r\n" + "RapidSSL SHA256 CA - G3" }; static const cert_struct_test_t test_winehq_com_cert = {

11 years, 1 month

[tkreuzer] 64346: [WIN32K] Convert tabs to spaces

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Sep 27 16:16:56 2014 New Revision: 64346 URL: http://svn.reactos.org/svn/reactos?rev=64346&view=rev Log: [WIN32K] Convert tabs to spaces Modified: trunk/reactos/win32ss/gdi/eng/floatobj.h Modified: trunk/reactos/win32ss/gdi/eng/floatobj.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/floatobj.h… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/floatobj.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/floatobj.h [iso-8859-1] Sat Sep 27 16:16:56 2014 @@ -6,36 +6,36 @@ BOOL _FLOATOBJ_Equal(FLOATOBJ *pf1, FLOATOBJ *pf2) { - EFLOAT_S *pef1 = (EFLOAT_S*)pf1; - EFLOAT_S *pef2 = (EFLOAT_S*)pf2; - return (pef1->lMant == pef2->lMant && pef1->lExp == pef2->lExp); + EFLOAT_S *pef1 = (EFLOAT_S*)pf1; + EFLOAT_S *pef2 = (EFLOAT_S*)pf2; + return (pef1->lMant == pef2->lMant && pef1->lExp == pef2->lExp); } FORCEINLINE LONG _FLOATOBJ_GetLong(FLOATOBJ *pf) { - EFLOAT_S *pef = (EFLOAT_S*)pf; - return pef->lMant >> (32 - pef->lExp); + EFLOAT_S *pef = (EFLOAT_S*)pf; + return pef->lMant >> (32 - pef->lExp); } FORCEINLINE LONG _FLOATOBJ_GetFix(FLOATOBJ *pf) { - EFLOAT_S *pef = (EFLOAT_S*)pf; - LONG Shift = (28 - pef->lExp); - return (Shift >= 0 ? pef->lMant >> Shift : pef->lMant << -Shift); + EFLOAT_S *pef = (EFLOAT_S*)pf; + LONG Shift = (28 - pef->lExp); + return (Shift >= 0 ? pef->lMant >> Shift : pef->lMant << -Shift); } FORCEINLINE BOOL _FLOATOBJ_IsLong(FLOATOBJ *pf) { - EFLOAT_S *pef = (EFLOAT_S*)pf; - ULONG ulShift = pef->lExp; - if (ulShift < 32) - return ((pef->lMant << ulShift) == 0); + EFLOAT_S *pef = (EFLOAT_S*)pf; + ULONG ulShift = pef->lExp; + if (ulShift < 32) + return ((pef->lMant << ulShift) == 0); else return (ulShift == 32); } @@ -44,16 +44,16 @@ BOOL _FLOATOBJ_Equal0(FLOATOBJ *pf) { - EFLOAT_S *pef = (EFLOAT_S*)pf; - return (pef->lMant == 0 && pef->lExp == 0); + EFLOAT_S *pef = (EFLOAT_S*)pf; + return (pef->lMant == 0 && pef->lExp == 0); } FORCEINLINE BOOL _FLOATOBJ_Equal1(FLOATOBJ *pf) { - EFLOAT_S *pef = (EFLOAT_S*)pf; - return (pef->lMant == 0x40000000 && pef->lExp == 2); + EFLOAT_S *pef = (EFLOAT_S*)pf; + return (pef->lMant == 0x40000000 && pef->lExp == 2); } extern const FLOATOBJ gef0;

11 years, 1 month

[hbelusca] 64345: [NTVDM] - When writing to port 61h, reset the PIT 2 gate only when needed. - When the PIT 2 out signal is set, notify the speaker when there is really a change. - PC speaker: Do n...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Sep 27 15:33:27 2014 New Revision: 64345 URL: http://svn.reactos.org/svn/reactos?rev=64345&view=rev Log: [NTVDM] - When writing to port 61h, reset the PIT 2 gate only when needed. - When the PIT 2 out signal is set, notify the speaker when there is really a change. - PC speaker: Do not replay the same sound if it is the same. Modified: trunk/reactos/subsystems/ntvdm/emulator.c trunk/reactos/subsystems/ntvdm/hardware/speaker.c Modified: trunk/reactos/subsystems/ntvdm/emulator.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/emulator.… ============================================================================== --- trunk/reactos/subsystems/ntvdm/emulator.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/emulator.c [iso-8859-1] Sat Sep 27 15:33:27 2014 @@ -262,7 +262,7 @@ static VOID WINAPI Port61hWrite(ULONG Port, BYTE Data) { - // BOOLEAN SpeakerChange = FALSE; + // BOOLEAN SpeakerStateChange = FALSE; BYTE OldPort61hState = Port61hState; /* Only the four lowest bytes can be written */ @@ -271,18 +271,17 @@ if ((OldPort61hState ^ Port61hState) & 0x01) { DPRINT("PIT 2 Gate %s\n", Port61hState & 0x01 ? "on" : "off"); - // SpeakerChange = TRUE; - } - - PitSetGate(2, !!(Port61hState & 0x01)); + PitSetGate(2, !!(Port61hState & 0x01)); + // SpeakerStateChange = TRUE; + } if ((OldPort61hState ^ Port61hState) & 0x02) { /* There were some change for the speaker... */ DPRINT("Speaker %s\n", Port61hState & 0x02 ? "on" : "off"); - // SpeakerChange = TRUE; - } - // if (SpeakerChange) SpeakerChange(); + // SpeakerStateChange = TRUE; + } + // if (SpeakerStateChange) SpeakerChange(); SpeakerChange(); } @@ -316,7 +315,7 @@ static VOID WINAPI PitChan2Out(LPVOID Param, BOOLEAN State) { - // BYTE OldPort61hState = Port61hState; + BYTE OldPort61hState = Port61hState; #if 0 if (State) @@ -332,9 +331,12 @@ #else Port61hState = (Port61hState & 0xDF) | (State << 5); #endif - DPRINT("Speaker PIT out\n"); - // if ((OldPort61hState ^ Port61hState) & 0x20) - // SpeakerChange(); + + if ((OldPort61hState ^ Port61hState) & 0x20) + { + DPRINT("PitChan2Out -- Port61hState changed\n"); + SpeakerChange(); + } } Modified: trunk/reactos/subsystems/ntvdm/hardware/speaker.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/hardware/… ============================================================================== --- trunk/reactos/subsystems/ntvdm/hardware/speaker.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/hardware/speaker.c [iso-8859-1] Sat Sep 27 15:33:27 2014 @@ -29,6 +29,9 @@ /* PRIVATE FUNCTIONS **********************************************************/ +static DWORD OldReloadValue = 0; +static PIT_MODE OldMode = 0; + /* PUBLIC FUNCTIONS ***********************************************************/ VOID SpeakerChange(VOID) @@ -47,9 +50,18 @@ DWORD PitChannel2ReloadValue = PitChannel2->ReloadValue; if (PitChannel2ReloadValue == 0) PitChannel2ReloadValue = 65536; + DPRINT("(1) PitChannel2(Bcd = %s, Mode = %d ; ReloadValue = %d)\n", PitChannel2->Bcd ? "true" : "false", PitChannel2->Mode, PitChannel2ReloadValue); + + if (OldMode == PitChannel2->Mode && OldReloadValue == PitChannel2ReloadValue) + return; + + OldMode = PitChannel2->Mode; + OldReloadValue = PitChannel2ReloadValue; + + DPRINT("(2) PitChannel2(Bcd = %s, Mode = %d ; ReloadValue = %d)\n", PitChannel2->Bcd ? "true" : "false", PitChannel2->Mode, PitChannel2ReloadValue); + /* Set beep data */ - BeepSetParameters.Frequency = (PIT_BASE_FREQUENCY / PitChannel2ReloadValue) - /* * (PitChannel2->Mode == PIT_MODE_SQUARE_WAVE ? 2 : 1) */; + BeepSetParameters.Frequency = (PIT_BASE_FREQUENCY / PitChannel2ReloadValue); BeepSetParameters.Duration = INFINITE; /* Send the beep */ @@ -77,6 +89,9 @@ NTSTATUS Status; IO_STATUS_BLOCK IoStatusBlock; BEEP_SET_PARAMETERS BeepSetParameters; + + OldMode = 0; + OldReloadValue = 0; /* Set beep data */ BeepSetParameters.Frequency = 0x00;

11 years, 1 month

[hbelusca] 64344: [NTVDM]: Timer - Add a hack for the signal out so that, when the PIT gate is off, no callback is called. This should be improved so that also no Out state is set, and other things...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Sep 27 15:31:12 2014 New Revision: 64344 URL: http://svn.reactos.org/svn/reactos?rev=64344&view=rev Log: [NTVDM]: Timer - Add a hack for the signal out so that, when the PIT gate is off, no callback is called. This should be improved so that also no Out state is set, and other things too. - Really set the out signal when the flipflop changes, in square-wave mode. Contributes to fix the speaker (see next commit). Modified: trunk/reactos/subsystems/ntvdm/hardware/timer.c Modified: trunk/reactos/subsystems/ntvdm/hardware/timer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/hardware/… ============================================================================== --- trunk/reactos/subsystems/ntvdm/hardware/timer.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/hardware/timer.c [iso-8859-1] Sat Sep 27 15:31:12 2014 @@ -79,6 +79,7 @@ Channel->Out = State; /* Call the callback */ + if (!Channel->Gate) return; // HACK: This is a HACK until gates are properly used (needed for the speaker to work properly). if (Channel->OutFunction) Channel->OutFunction(Channel->OutParam, State); } @@ -423,7 +424,7 @@ if (ReloadCount & 1) { Channel->FlipFlop = !Channel->FlipFlop; - // PitSetOut(Channel, !Channel->Out); + PitSetOut(Channel, !Channel->Out); } /* Was there any rising edge? */

11 years, 1 month

[tfaber] 64343: [NTOS:IO] - Correctly set DRIVER_EXTENSION::ServiceKeyName CORE-8566 #resolve

by tfaber＠svn.reactos.org

Author: tfaber Date: Sat Sep 27 14:58:40 2014 New Revision: 64343 URL: http://svn.reactos.org/svn/reactos?rev=64343&view=rev Log: [NTOS:IO] - Correctly set DRIVER_EXTENSION::ServiceKeyName CORE-8566 #resolve Modified: trunk/reactos/ntoskrnl/include/internal/io.h trunk/reactos/ntoskrnl/io/iomgr/driver.c Modified: trunk/reactos/ntoskrnl/include/internal/io.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/io.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/io.h [iso-8859-1] Sat Sep 27 14:58:40 2014 @@ -1058,6 +1058,7 @@ IopCreateDriver(IN PUNICODE_STRING DriverName OPTIONAL, IN PDRIVER_INITIALIZE InitializationFunction, IN PUNICODE_STRING RegistryPath, + IN PCUNICODE_STRING ServiceName, PLDR_DATA_TABLE_ENTRY ModuleObject, OUT PDRIVER_OBJECT *pDriverObject); Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/driver.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/driver.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/driver.c [iso-8859-1] Sat Sep 27 14:58:40 2014 @@ -90,14 +90,12 @@ ExFreePool(DriverObject->DriverName.Buffer); } -#if 0 /* See a bit of hack in IopCreateDriver */ /* Check if it has a service key name */ if (DriverObject->DriverExtension->ServiceKeyName.Buffer) { /* Free it */ ExFreePool(DriverObject->DriverExtension->ServiceKeyName.Buffer); } -#endif } NTSTATUS FASTCALL @@ -516,6 +514,7 @@ DriverName.Length > 0 ? &DriverName : NULL, DriverEntry, &RegistryKey, + ServiceName, ModuleObject, &Driver); RtlFreeUnicodeString(&RegistryKey); @@ -558,7 +557,7 @@ PLDR_DATA_TABLE_ENTRY ModuleObject; PDRIVER_OBJECT DriverObject; NTSTATUS Status; - + /* No filter value present */ if (ValueType == REG_NONE) return STATUS_SUCCESS; @@ -594,7 +593,7 @@ /* Remove extra reference */ ObDereferenceObject(DriverObject); - + if (!NT_SUCCESS(Status)) return Status; } @@ -663,7 +662,7 @@ NULL); if (!NT_SUCCESS(Status)) { - DPRINT1("Failed to load device %s filters: %08X\n", + DPRINT1("Failed to load device %s filters: %08X\n", Lower ? "lower" : "upper", Status); ZwClose(SubKey); ZwClose(EnumRootKey); @@ -737,10 +736,10 @@ /* Clean up */ ZwClose(SubKey); ZwClose(EnumRootKey); - + if (!NT_SUCCESS(Status)) { - DPRINT1("Failed to load class %s filters: %08X\n", + DPRINT1("Failed to load class %s filters: %08X\n", Lower ? "lower" : "upper", Status); ZwClose(SubKey); ZwClose(EnumRootKey); @@ -1479,6 +1478,7 @@ IopCreateDriver(IN PUNICODE_STRING DriverName OPTIONAL, IN PDRIVER_INITIALIZE InitializationFunction, IN PUNICODE_STRING RegistryPath, + IN PCUNICODE_STRING ServiceName, PLDR_DATA_TABLE_ENTRY ModuleObject, OUT PDRIVER_OBJECT *pDriverObject) { @@ -1550,9 +1550,9 @@ } /* Set up the service key name buffer */ - ServiceKeyName.Buffer = ExAllocatePoolWithTag(PagedPool, - LocalDriverName.Length + - sizeof(WCHAR), + ServiceKeyName.MaximumLength = ServiceName->Length + sizeof(UNICODE_NULL); + ServiceKeyName.Buffer = ExAllocatePoolWithTag(NonPagedPool, + ServiceKeyName.MaximumLength, TAG_IO); if (!ServiceKeyName.Buffer) { @@ -1562,21 +1562,26 @@ return STATUS_INSUFFICIENT_RESOURCES; } - /* Fill out the key data and copy the buffer */ - ServiceKeyName.Length = LocalDriverName.Length; - ServiceKeyName.MaximumLength = LocalDriverName.MaximumLength; - RtlCopyMemory(ServiceKeyName.Buffer, - LocalDriverName.Buffer, - LocalDriverName.Length); - - /* Null-terminate it and set it */ - ServiceKeyName.Buffer[ServiceKeyName.Length / sizeof(WCHAR)] = UNICODE_NULL; + /* Copy the name and set it in the driver extension */ + RtlCopyUnicodeString(&ServiceKeyName, + ServiceName); DriverObject->DriverExtension->ServiceKeyName = ServiceKeyName; - /* Also store it in the Driver Object. This is a bit of a hack. */ - RtlCopyMemory(&DriverObject->DriverName, - &ServiceKeyName, - sizeof(UNICODE_STRING)); + /* Make a copy of the driver name to store in the driver object */ + DriverObject->DriverName.MaximumLength = LocalDriverName.Length; + DriverObject->DriverName.Buffer = ExAllocatePoolWithTag(PagedPool, + DriverObject->DriverName.MaximumLength, + TAG_IO); + if (!DriverObject->DriverName.Buffer) + { + /* Fail */ + ObMakeTemporaryObject(DriverObject); + ObDereferenceObject(DriverObject); + return STATUS_INSUFFICIENT_RESOURCES; + } + + RtlCopyUnicodeString(&DriverObject->DriverName, + &LocalDriverName); /* Add the Object and get its handle */ Status = ObInsertObject(DriverObject, @@ -1678,7 +1683,7 @@ IN PDRIVER_INITIALIZE InitializationFunction) { PDRIVER_OBJECT DriverObject; - return IopCreateDriver(DriverName, InitializationFunction, NULL, NULL, &DriverObject); + return IopCreateDriver(DriverName, InitializationFunction, NULL, DriverName, NULL, &DriverObject); } /*

11 years, 1 month

[tfaber] 64342: [KMTESTS:IO] - Test more fields of DRIVER_OBJECT CORE-8566

by tfaber＠svn.reactos.org

Author: tfaber Date: Sat Sep 27 14:56:22 2014 New Revision: 64342 URL: http://svn.reactos.org/svn/reactos?rev=64342&view=rev Log: [KMTESTS:IO] - Test more fields of DRIVER_OBJECT CORE-8566 Modified: trunk/rostests/kmtests/ntos_io/IoDeviceObject_drv.c Modified: trunk/rostests/kmtests/ntos_io/IoDeviceObject_drv.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_io/IoDeviceO… ============================================================================== --- trunk/rostests/kmtests/ntos_io/IoDeviceObject_drv.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/ntos_io/IoDeviceObject_drv.c [iso-8859-1] Sat Sep 27 14:56:22 2014 @@ -11,15 +11,17 @@ //#define NDEBUG #include <debug.h> +#define BASE_POOL_TYPE_MASK 1 + typedef enum { - DriverEntry, - DriverIrp, - DriverUnload + DriverStatusEntry, + DriverStatusIrp, + DriverStatusUnload } DRIVER_STATUS; static DRIVER_DISPATCH TestDispatch; -static VOID TestDriverObject(IN PDRIVER_OBJECT DriverObject, IN DRIVER_STATUS DriverStatus); +static VOID TestDriverObject(IN PDRIVER_OBJECT DriverObject, IN PCUNICODE_STRING RegistryPath OPTIONAL, IN DRIVER_STATUS DriverStatus); static BOOLEAN TestZwLoad(IN PDRIVER_OBJECT DriverObject, IN PCUNICODE_STRING DriverRegistryPath, IN PWCHAR NewDriverRegPath); static BOOLEAN TestZwUnload(IN PDRIVER_OBJECT DriverObject, IN PCUNICODE_STRING DriverRegistryPath, IN PWCHAR NewDriverRegPath); static VOID TestLowerDeviceKernelAPI(IN PDEVICE_OBJECT DeviceObject); @@ -52,7 +54,7 @@ ThisDriverObject = DriverObject; - TestDriverObject(DriverObject, DriverEntry); + TestDriverObject(DriverObject, RegistryPath, DriverStatusEntry); /* Create and delete device, on return MainDeviceObject has been created */ TestDeviceCreateDelete(DriverObject); @@ -99,7 +101,7 @@ } TestDeviceDeletion(MainDeviceObject, FALSE, FALSE); - TestDriverObject(DriverObject, DriverUnload); + TestDriverObject(DriverObject, NULL, DriverStatusUnload); if (MainDeviceObject) IoDeleteDevice(MainDeviceObject); @@ -131,7 +133,7 @@ return Status; } - TestDriverObject(DeviceObject->DriverObject, DriverIrp); + TestDriverObject(DeviceObject->DriverObject, NULL, DriverStatusIrp); Irp->IoStatus.Status = Status; Irp->IoStatus.Information = 0; @@ -141,35 +143,85 @@ return Status; } +extern DRIVER_INITIALIZE DriverEntry; + static VOID TestDriverObject( IN PDRIVER_OBJECT DriverObject, + IN PCUNICODE_STRING RegistryPath OPTIONAL, IN DRIVER_STATUS DriverStatus) { BOOLEAN CheckThisDispatchRoutine; PVOID FirstMajorFunc; int i; + UNICODE_STRING HardwareDatabase = RTL_CONSTANT_STRING(L"\\REGISTRY\\MACHINE\\HARDWARE\\DESCRIPTION\\SYSTEM"); + UNICODE_STRING RegPath = RTL_CONSTANT_STRING(L"\\REGISTRY\\MACHINE\\SYSTEM\\ControlSet001\\Services\\Kmtest-IoDeviceObject"); + UNICODE_STRING DriverName = RTL_CONSTANT_STRING(L"\\Driver\\Kmtest-IoDeviceObject"); + UNICODE_STRING ServiceKeyName = RTL_CONSTANT_STRING(L"Kmtest-IoDeviceObject"); + BOOLEAN Equal; ok(DriverObject->Size == sizeof(DRIVER_OBJECT), "Size does not match, got %x\n",DriverObject->Size); ok(DriverObject->Type == 4, "Type does not match 4. got %d\n", DriverObject->Type); - if (DriverStatus == DriverEntry) + if (DriverStatus == DriverStatusEntry) { ok(DriverObject->DeviceObject == NULL, "Expected DeviceObject pointer to be 0, got %p\n", DriverObject->DeviceObject); ok (DriverObject->Flags == DRVO_LEGACY_DRIVER, "Expected Flags to be DRVO_LEGACY_DRIVER, got %lu\n", DriverObject->Flags); - } - else if (DriverStatus == DriverIrp) + + ok(DriverObject->DriverStart < (PVOID)TestEntry, + "DriverStart is %p, expected < %p\n", + DriverObject->DriverStart, (PVOID)TestEntry); + ok(DriverObject->DriverSize > 0x2000, + "DriverSize 0x%lx\n", DriverObject->DriverSize); + ok_eq_pointer(DriverObject->DriverExtension, (PDRIVER_EXTENSION)(DriverObject + 1)); + ok_eq_pointer(DriverObject->DriverExtension->DriverObject, DriverObject); + ok_eq_pointer(DriverObject->DriverExtension->AddDevice, NULL); + ok_eq_ulong(DriverObject->DriverExtension->Count, 0UL); + Equal = RtlEqualUnicodeString(RegistryPath, + &RegPath, + FALSE); + ok(Equal, "RegistryPath is '%wZ'\n", RegistryPath); + ok((ULONG_PTR)RegistryPath % PAGE_SIZE == 0, "RegistryPath %p not page-aligned\n", RegistryPath); + ok_eq_pointer(RegistryPath->Buffer, (PWCHAR)(RegistryPath + 1)); + ok_eq_uint(RegistryPath->MaximumLength, RegistryPath->Length); + Equal = RtlEqualUnicodeString(&DriverObject->DriverExtension->ServiceKeyName, + &ServiceKeyName, + FALSE); + ok(Equal, "ServiceKeyName is '%wZ'\n", &DriverObject->DriverExtension->ServiceKeyName); + ok_eq_tag(KmtGetPoolTag(DriverObject->DriverExtension->ServiceKeyName.Buffer), ' oI'); + ok_eq_uint((KmtGetPoolType(DriverObject->DriverExtension->ServiceKeyName.Buffer) - 1) & BASE_POOL_TYPE_MASK, NonPagedPool); + ok_eq_uint(DriverObject->DriverExtension->ServiceKeyName.MaximumLength, DriverObject->DriverExtension->ServiceKeyName.Length + sizeof(UNICODE_NULL)); + ok_eq_uint(DriverObject->DriverExtension->ServiceKeyName.Buffer[DriverObject->DriverExtension->ServiceKeyName.Length / sizeof(WCHAR)], UNICODE_NULL); + Equal = RtlEqualUnicodeString(&DriverObject->DriverName, + &DriverName, + FALSE); + ok(Equal, "DriverName is '%wZ'\n", &DriverObject->DriverName); + ok_eq_tag(KmtGetPoolTag(DriverObject->DriverName.Buffer), ' oI'); + ok_eq_uint((KmtGetPoolType(DriverObject->DriverName.Buffer) - 1) & BASE_POOL_TYPE_MASK, PagedPool); + ok_eq_uint(DriverObject->DriverName.MaximumLength, DriverObject->DriverName.Length); + // TODO: show that both string and buffer are constants inside ntos + Equal = RtlEqualUnicodeString(DriverObject->HardwareDatabase, + &HardwareDatabase, + FALSE); + ok(Equal, "HardwareDatabase is '%wZ'\n", DriverObject->HardwareDatabase); + ok_eq_uint(DriverObject->HardwareDatabase->MaximumLength, DriverObject->HardwareDatabase->Length + sizeof(UNICODE_NULL)); + ok_eq_uint(DriverObject->HardwareDatabase->Buffer[DriverObject->HardwareDatabase->Length / sizeof(WCHAR)], UNICODE_NULL); + ok(DriverObject->DriverInit == DriverEntry, + "DriverInit is %p, expected %p\n", + (PVOID)DriverObject->DriverInit, (PVOID)DriverEntry); + } + else if (DriverStatus == DriverStatusIrp) { ok(DriverObject->DeviceObject != NULL, "Expected DeviceObject pointer to non null\n"); ok (DriverObject->Flags == (DRVO_LEGACY_DRIVER | DRVO_INITIALIZED), "Expected Flags to be DRVO_LEGACY_DRIVER | DRVO_INITIALIZED, got %lu\n", DriverObject->Flags); } - else if (DriverStatus == DriverUnload) + else if (DriverStatus == DriverStatusUnload) { ok(DriverObject->DeviceObject != NULL, "Expected DeviceObject pointer to non null\n"); ok (DriverObject->Flags == (DRVO_LEGACY_DRIVER | DRVO_INITIALIZED | DRVO_UNLOAD_INVOKED),

11 years, 1 month

[akhaldi] 64341: [GDIPLUS_WINETEST] * Sync with Wine 1.7.27. CORE-8540

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Sep 27 12:59:19 2014 New Revision: 64341 URL: http://svn.reactos.org/svn/reactos?rev=64341&view=rev Log: [GDIPLUS_WINETEST] * Sync with Wine 1.7.27. CORE-8540 Modified: trunk/rostests/winetests/gdiplus/font.c trunk/rostests/winetests/gdiplus/graphics.c trunk/rostests/winetests/gdiplus/image.c Modified: trunk/rostests/winetests/gdiplus/font.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdiplus/font.c?… ============================================================================== --- trunk/rostests/winetests/gdiplus/font.c [iso-8859-1] (original) +++ trunk/rostests/winetests/gdiplus/font.c [iso-8859-1] Sat Sep 27 12:59:19 2014 @@ -39,11 +39,8 @@ static const WCHAR nonexistent[] = {'T','h','i','s','F','o','n','t','s','h','o','u','l','d','N','o','t','E','x','i','s','t','\0'}; static const WCHAR MSSansSerif[] = {'M','S',' ','S','a','n','s',' ','S','e','r','i','f','\0'}; -static const WCHAR MicrosoftSansSerif[] = {'M','i','c','r','o','s','o','f','t',' ','S','a','n','s',' ','S','e','r','i','f','\0'}; static const WCHAR TimesNewRoman[] = {'T','i','m','e','s',' ','N','e','w',' ','R','o','m','a','n','\0'}; -static const WCHAR CourierNew[] = {'C','o','u','r','i','e','r',' ','N','e','w','\0'}; static const WCHAR Tahoma[] = {'T','a','h','o','m','a',0}; -static const WCHAR LiberationSerif[] = {'L','i','b','e','r','a','t','i','o','n',' ','S','e','r','i','f',0}; static void set_rect_empty(RectF *rc) { @@ -809,17 +806,23 @@ lf.lfWeight = 0; lf.lfCharSet = 0; lstrcpyA(lf.lfFaceName, "ThisFontShouldNotExist"); + font = NULL; status = GdipCreateFontFromLogfontA(hdc, &lf, &font); todo_wine ok(status == NotTrueTypeFont || broken(status == FileNotFound), /* before XP */ "expected NotTrueTypeFont, got %d\n", status); + /* FIXME: remove when wine is fixed */ + if (font) GdipDeleteFont(font); /* empty FaceName */ lf.lfFaceName[0] = 0; + font = NULL; status = GdipCreateFontFromLogfontA(hdc, &lf, &font); todo_wine ok(status == NotTrueTypeFont || broken(status == FileNotFound), /* before XP */ "expected NotTrueTypeFont, got %d\n", status); + /* FIXME: remove when wine is fixed */ + if (font) GdipDeleteFont(font); GdipDeleteGraphics(graphics); DeleteDC(hdc); Modified: trunk/rostests/winetests/gdiplus/graphics.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdiplus/graphic… ============================================================================== --- trunk/rostests/winetests/gdiplus/graphics.c [iso-8859-1] (original) +++ trunk/rostests/winetests/gdiplus/graphics.c [iso-8859-1] Sat Sep 27 12:59:19 2014 @@ -98,7 +98,7 @@ return pixels_to_units(pixels, to, dpi); } -static GpGraphics *create_graphics(REAL res_x, REAL res_y, GpUnit unit, REAL scale) +static GpGraphics *create_graphics(REAL res_x, REAL res_y, GpUnit unit, REAL scale, GpImage **image) { GpStatus status; union @@ -123,11 +123,8 @@ status = GdipGetImageGraphicsContext(u.image, &graphics); expect(Ok, status); - /* image is intentionally leaked to make sure that there is no - side effects after its destruction. - status = GdipDisposeImage(u.image); - expect(Ok, status); - */ + + *image = u.image; status = GdipGetDpiX(graphics, &res); expect(Ok, status); @@ -3527,7 +3524,9 @@ for (i = 0; i < sizeof(td)/sizeof(td[0]); i++) { - graphics = create_graphics(td[i].res_x, td[i].res_y, td[i].unit, td[i].page_scale); + GpImage *image; + + graphics = create_graphics(td[i].res_x, td[i].res_y, td[i].unit, td[i].page_scale, &image); lf.lfHeight = 0xdeadbeef; status = GdipGetLogFontW(font, graphics, &lf); @@ -3578,6 +3577,9 @@ status = GdipDeleteGraphics(graphics); expect(Ok, status); + + status = GdipDisposeImage(image); + expect(Ok, status); } GdipDeleteFont(font); @@ -3601,8 +3603,9 @@ for (i = 0; i < sizeof(td)/sizeof(td[0]); i++) { REAL unit_scale; - - graphics = create_graphics(td[i].res_x, td[i].res_y, td[i].unit, td[i].page_scale); + GpImage *image; + + graphics = create_graphics(td[i].res_x, td[i].res_y, td[i].unit, td[i].page_scale, &image); lf.lfHeight = 0xdeadbeef; status = GdipGetLogFontW(font, graphics, &lf); @@ -3671,6 +3674,9 @@ expectf_(100.0, height, 1.1); status = GdipDeleteGraphics(graphics); + expect(Ok, status); + + status = GdipDisposeImage(image); expect(Ok, status); } @@ -3709,12 +3715,13 @@ }; GpStatus status; GpGraphics *graphics; + GpImage *image; GpPointF ptf[2]; UINT i; for (i = 0; i < sizeof(td)/sizeof(td[0]); i++) { - graphics = create_graphics(td[i].res_x, td[i].res_y, td[i].unit, td[i].scale); + graphics = create_graphics(td[i].res_x, td[i].res_y, td[i].unit, td[i].scale, &image); ptf[0].X = td[i].in[0].X; ptf[0].Y = td[i].in[0].Y; ptf[1].X = td[i].in[1].X; @@ -3732,6 +3739,8 @@ expectf(td[i].in[1].X, ptf[1].X); expectf(td[i].in[1].Y, ptf[1].Y); status = GdipDeleteGraphics(graphics); + expect(Ok, status); + status = GdipDisposeImage(image); expect(Ok, status); } } Modified: trunk/rostests/winetests/gdiplus/image.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdiplus/image.c… ============================================================================== --- trunk/rostests/winetests/gdiplus/image.c [iso-8859-1] (original) +++ trunk/rostests/winetests/gdiplus/image.c [iso-8859-1] Sat Sep 27 12:59:19 2014 @@ -381,24 +381,48 @@ static void test_LoadingImages(void) { GpStatus stat; + GpBitmap *bm; + GpImage *img; + static const WCHAR nonexistentW[] = {'n','o','n','e','x','i','s','t','e','n','t',0}; stat = GdipCreateBitmapFromFile(0, 0); expect(InvalidParameter, stat); - stat = GdipCreateBitmapFromFile(0, (GpBitmap**)0xdeadbeef); - expect(InvalidParameter, stat); + bm = (GpBitmap *)0xdeadbeef; + stat = GdipCreateBitmapFromFile(0, &bm); + expect(InvalidParameter, stat); + ok(bm == (GpBitmap *)0xdeadbeef, "returned %p\n", bm); + + bm = (GpBitmap *)0xdeadbeef; + stat = GdipCreateBitmapFromFile(nonexistentW, &bm); + todo_wine expect(InvalidParameter, stat); + ok(!bm, "returned %p\n", bm); stat = GdipLoadImageFromFile(0, 0); expect(InvalidParameter, stat); - stat = GdipLoadImageFromFile(0, (GpImage**)0xdeadbeef); - expect(InvalidParameter, stat); + img = (GpImage *)0xdeadbeef; + stat = GdipLoadImageFromFile(0, &img); + expect(InvalidParameter, stat); + ok(img == (GpImage *)0xdeadbeef, "returned %p\n", img); + + img = (GpImage *)0xdeadbeef; + stat = GdipLoadImageFromFile(nonexistentW, &img); + todo_wine expect(OutOfMemory, stat); + ok(!img, "returned %p\n", img); stat = GdipLoadImageFromFileICM(0, 0); expect(InvalidParameter, stat); - stat = GdipLoadImageFromFileICM(0, (GpImage**)0xdeadbeef); - expect(InvalidParameter, stat); + img = (GpImage *)0xdeadbeef; + stat = GdipLoadImageFromFileICM(0, &img); + expect(InvalidParameter, stat); + ok(img == (GpImage *)0xdeadbeef, "returned %p\n", img); + + img = (GpImage *)0xdeadbeef; + stat = GdipLoadImageFromFileICM(nonexistentW, &img); + todo_wine expect(OutOfMemory, stat); + ok(!img, "returned %p\n", img); } static void test_SavingImages(void)

11 years, 1 month

← Newer
1
...
6
7
8
9
10
11
12
...
42
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 September 2014