Ros-diffs

ros-diffs@reactos.org

81390 discussions

[vmikayelyan] 72462: revert r72459 (there were difference between blocks which I assumed as identical)
by vmikayelyan＠svn.reactos.org 25 Aug '16

25 Aug '16

Author: vmikayelyan Date: Thu Aug 25 18:17:44 2016 New Revision: 72462 URL: http://svn.reactos.org/svn/reactos?rev=72462&view=rev Log: revert r72459 (there were difference between blocks which I assumed as identical) Modified: branches/GSoC_2016/USB/drivers/filesystems/fastfat/flush.c Modified: branches/GSoC_2016/USB/drivers/filesystems/fastfat/flush.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/USB/drivers/filesyste… ============================================================================== --- branches/GSoC_2016/USB/drivers/filesystems/fastfat/flush.c [iso-8859-1] (original) +++ branches/GSoC_2016/USB/drivers/filesystems/fastfat/flush.c [iso-8859-1] Thu Aug 25 18:17:44 2016 @@ -64,6 +64,25 @@ Fcb = CONTAINING_RECORD(ListEntry, VFATFCB, FcbListEntry); ListEntry = ListEntry->Flink; if (!vfatFCBIsDirectory(Fcb)) + { + ExAcquireResourceExclusiveLite(&Fcb->MainResource, TRUE); + Status = VfatFlushFile(DeviceExt, Fcb); + ExReleaseResourceLite (&Fcb->MainResource); + if (!NT_SUCCESS(Status)) + { + DPRINT1("VfatFlushFile failed, status = %x\n", Status); + ReturnStatus = Status; + } + } + /* FIXME: Stop flushing if this is a removable media and the media was removed */ + } + + ListEntry = DeviceExt->FcbListHead.Flink; + while (ListEntry != &DeviceExt->FcbListHead) + { + Fcb = CONTAINING_RECORD(ListEntry, VFATFCB, FcbListEntry); + ListEntry = ListEntry->Flink; + if (vfatFCBIsDirectory(Fcb)) { ExAcquireResourceExclusiveLite(&Fcb->MainResource, TRUE); Status = VfatFlushFile(DeviceExt, Fcb);

1 0

[hbelusca] 72461: [IERUNONCE]: CORE-11763 #comment Addendum to r72456 : comment out one of the IDS_INCORRECTFORMAT strings (since only one can exist at a time!). Somebody (Sergey?) should choose th...
by hbelusca＠svn.reactos.org 25 Aug '16

25 Aug '16

Author: hbelusca Date: Thu Aug 25 17:13:24 2016 New Revision: 72461 URL: http://svn.reactos.org/svn/reactos?rev=72461&view=rev Log: [IERUNONCE]: CORE-11763 #comment Addendum to r72456 : comment out one of the IDS_INCORRECTFORMAT strings (since only one can exist at a time!). Somebody (Sergey?) should choose the best translation between the two. Also re-add the original IDS_NOEXPORT string that just vanished out. Modified: trunk/reactos/dll/win32/iernonce/lang/ru-RU.rc Modified: trunk/reactos/dll/win32/iernonce/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iernonce/lang/ru… ============================================================================== --- trunk/reactos/dll/win32/iernonce/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/iernonce/lang/ru-RU.rc [iso-8859-1] Thu Aug 25 17:13:24 2016 @@ -8,7 +8,8 @@ IDS_LOADERROR "ÐÑÐ¾Ð¸Ð·Ð¾ÑÐ»Ð° Ð¾ÑÐ¸Ð±ÐºÐ° Ð¿ÑÐ¸ Ð·Ð°Ð³ÑÑÐ·ÐºÐµ %1. ÐÐ¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾, ÑÐ°Ð¹Ð» Ð½Ðµ Ð±ÑÐ» ÑÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½ Ð¸Ð»Ð¸ Ð¾Ð½ Ð±ÑÐ» Ð¿Ð¾Ð²ÑÐµÐ¶Ð´ÐµÐ½." IDS_CALLERROR "ÐÑÐ¸ Ð²ÑÐ·Ð¾Ð²Ðµ ÑÑÐ½ÐºÑÐ¸Ð¸ %1 Ð¸Ð· %2 Ð¿ÑÐ¾Ð¸Ð·Ð¾ÑÐ»Ð° Ð¾ÑÐ¸Ð±ÐºÐ° Ð¸Ð»Ð¸ Ð¸ÑÐºÐ»ÑÑÐµÐ½Ð¸Ðµ." IDS_INCORRECTFORMAT "ÐÐµÐ´Ð¾Ð¿ÑÑÑÐ¸Ð¼ÑÐ¹ ÑÐ¾ÑÐ¼Ð°Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ RunEx Ð¸Ð»Ð¸ RunOnceEx: %1. ÐÐ¾Ð¼Ð°Ð½Ð´Ð° Ð²ÑÐ¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ Ð¾Ð±Ð¾Ð»Ð¾ÑÐºÐ¸ Ð´Ð¾Ð»Ð¶Ð½Ð° Ð½Ð°ÑÐ¸Ð½Ð°ÑÑÑÑ Ñ ||." - IDS_INCORRECTFORMAT "ÐÐµÐ²ÐµÑÐ½ÑÐ¹ ÑÐ¾ÑÐ¼Ð°Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ RunEx Ð¸Ð»Ð¸ RunOnceEx: %1. ÐÐ¾Ð¼Ð°Ð½Ð´Ð° Ð²ÑÐ¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ Ð´Ð»Ñ Ð¾Ð±Ð¾Ð»Ð¾ÑÐºÐ¸ Ð´Ð¾Ð»Ð¶Ð½Ð° Ð½Ð°ÑÐ¸Ð½Ð°ÑÑÑÑ Ñ ||." + // IDS_INCORRECTFORMAT "ÐÐµÐ²ÐµÑÐ½ÑÐ¹ ÑÐ¾ÑÐ¼Ð°Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ RunEx Ð¸Ð»Ð¸ RunOnceEx: %1. ÐÐ¾Ð¼Ð°Ð½Ð´Ð° Ð²ÑÐ¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ Ð´Ð»Ñ Ð¾Ð±Ð¾Ð»Ð¾ÑÐºÐ¸ Ð´Ð¾Ð»Ð¶Ð½Ð° Ð½Ð°ÑÐ¸Ð½Ð°ÑÑÑÑ Ñ ||." + IDS_NOEXPORT "Unable to call the function %1 in the file %2 because that function does not exist or is not exported." IDS_EXECUTEERROR "ÐÐ¾ Ð²ÑÐµÐ¼Ñ Ð²ÑÐ¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ %1 Ð¿ÑÐ¾Ð¸Ð·Ð¾ÑÐ»Ð° Ð¾ÑÐ¸Ð±ÐºÐ° Ð¸Ð»Ð¸ Ð¸ÑÐºÐ»ÑÑÐµÐ½Ð¸Ðµ." IDS_NOFUNCTION "ÐÐµ ÑÐ´Ð°ÐµÑÑÑ Ð½Ð°Ð¹ÑÐ¸ ÑÑÐ½ÐºÑÐ¸Ñ %1 Ð² ÑÐ°Ð¹Ð»Ðµ %2." IDS_NODEPENDENCY "ÐÐµ ÑÐ´Ð°Ð»Ð¾ÑÑ Ð·Ð°Ð³ÑÑÐ·Ð¸ÑÑ ÑÑÐµÐ±ÑÐµÐ¼ÑÐ¹ ÑÐ°Ð¹Ð» %1."

1 0

[hbelusca] 72460: [TRANSLATIONS]: Update russian translation, by 'amber'. CORE-11510 #comment Only the translations that did not collide with existing ones were committed! Please recheck :)
by hbelusca＠svn.reactos.org 25 Aug '16

25 Aug '16

Author: hbelusca Date: Thu Aug 25 14:32:50 2016 New Revision: 72460 URL: http://svn.reactos.org/svn/reactos?rev=72460&view=rev Log: [TRANSLATIONS]: Update russian translation, by 'amber'. CORE-11510 #comment Only the translations that did not collide with existing ones were committed! Please recheck :) Modified: trunk/reactos/base/applications/mplay32/lang/ru-RU.rc trunk/reactos/dll/cpl/sysdm/lang/ru-RU.rc trunk/reactos/dll/shellext/stobject/lang/ru-RU.rc trunk/reactos/dll/win32/devmgr/lang/ru-RU.rc Modified: trunk/reactos/base/applications/mplay32/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/ru-RU.rc [iso-8859-1] Thu Aug 25 14:32:50 2016 @@ -46,7 +46,7 @@ BEGIN IDS_MODE_UNKNOWN "ÐÐµÐ¸Ð·Ð²ÐµÑÑÐ½Ð¾" IDS_MODE_OPEN "ÐÑÐºÑÑÑ" - IDS_MODE_STOP "ÐÑÑÐ½Ð¾Ð²Ð»ÐµÐ½" + IDS_MODE_STOP "ÐÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½" IDS_MODE_PLAY "ÐÐ¾ÑÐ¿ÑÐ¾Ð¸Ð·Ð²Ð¾Ð´Ð¸ÑÑÑ" IDS_MODE_PAUSE "ÐÑÐ¸Ð¾ÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½" IDS_MODE_RECORD "ÐÐ°Ð¿Ð¸ÑÑÐ²Ð°ÐµÑ" Modified: trunk/reactos/dll/cpl/sysdm/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/ru-RU.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/ru-RU.rc [iso-8859-1] Thu Aug 25 14:32:50 2016 @@ -66,8 +66,8 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN GROUPBOX "ÐÐ½ÑÐ¾ÑÐ¼Ð°ÑÐ¸Ñ Ð¾ Ð²ÐµÑÑÐ¸Ð¸", IDC_STATIC, 6, 3, 210, 73 - CONTROL "Report as Workstation", IDC_REPORTASWORKSTATION, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 16, 57, 190, 10 - LTEXT "ReactOS is built as a server OS and reports as such. Check this box to change this for applications only.", IDC_STATIC, 15, 15, 183, 41 + CONTROL "ÐÑÐµÐ´ÑÑÐ°Ð²Ð»ÑÑÑÑÑ ÐºÐ°Ðº ÑÐ°Ð±Ð¾ÑÐ°Ñ ÑÑÐ°Ð½ÑÐ¸Ñ", IDC_REPORTASWORKSTATION, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 16, 57, 190, 10 + LTEXT "ReactOS ÑÐ¾Ð±ÑÐ°Ð½ ÐºÐ°Ðº ÑÐµÑÐ²ÐµÑÐ½Ð°Ñ ÐÐ¡ Ð¸ ÑÐ¾Ð¾Ð±ÑÐ°ÐµÑ Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸ÑÐ¼ Ð¾Ð± ÑÑÐ¾Ð¼. Ð£ÑÑÐ°Ð½Ð¾Ð²ÐºÐ° ÑÐ»Ð°Ð¶ÐºÐ° Ð¸Ð·Ð¼ÐµÐ½Ð¸Ñ ÑÑÐ¾ (ÑÐ¾Ð»ÑÐºÐ¾ Ð´Ð»Ñ Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ð¹).", IDC_STATIC, 15, 15, 183, 55 PUSHBUTTON "OK", IDOK, 166, 83, 50, 14 END @@ -105,15 +105,15 @@ BEGIN ICON IDI_HARDPROF, IDC_STATIC, 10, 10, 18, 20, SS_ICON LTEXT "", IDC_HWPPROP_PROFILE, 48, 16, 150, 8 - LTEXT "Dock ID:", IDC_STATIC, 10, 42, 43, 8 - LTEXT "", IDC_HWPPROP_DOCKID, 64, 42, 135, 8 - LTEXT "Ð¡ÐµÑÐ¸Ð¹Ð½ÑÐ¹ Ð½Ð¾Ð¼ÐµÑ:", IDC_STATIC, 10, 55, 52, 8 - LTEXT "", IDC_HWPPROP_SERIAL, 64, 55, 135, 8 + LTEXT "Ð¡ÑÑÐºÐ¾Ð²Ð¾ÑÐ½ÑÐ¹ ÑÐ·ÐµÐ»:", IDC_STATIC, 10, 42, 100, 8 + LTEXT "", IDC_HWPPROP_DOCKID, 104, 42, 95, 8 + LTEXT "Ð¡ÐµÑÐ¸Ð¹Ð½ÑÐ¹ Ð½Ð¾Ð¼ÐµÑ:", IDC_STATIC, 10, 55, 100, 8 + LTEXT "", IDC_HWPPROP_SERIAL, 104, 55, 95, 8 GROUPBOX "", IDC_STATIC, 10, 69, 192, 61 AUTOCHECKBOX "ÐÑÐ¾ &Ð¿ÐµÑÐµÐ½Ð¾ÑÐ½Ð¾Ð¹ ÐºÐ¾Ð¼Ð¿ÑÑÑÐµÑ", IDC_HWPPROP_PORTABLE, 17, 68, 115, 10, WS_GROUP | WS_TABSTOP - AUTORADIOBUTTON "The docking &state is unknown", IDC_HWPPROP_UNKNOWN, 22, 85, 160, 10, WS_GROUP | WS_TABSTOP - AUTORADIOBUTTON "The computer is &docked", IDC_HWPPROP_DOCKED, 22, 97, 160, 10 - AUTORADIOBUTTON "The computer is &undocked", IDC_HWPPROP_UNDOCKED, 22, 109, 160, 10 + AUTORADIOBUTTON "ÐÐµ Ð¾Ð¿ÑÐµÐ´ÐµÐ»ÑÐ½Ð½Ð¾Ðµ ÑÐ¾ÑÑÐ¾ÑÐ½Ð¸Ðµ", IDC_HWPPROP_UNKNOWN, 22, 85, 160, 10, WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "ÐÐ¾Ð¼Ð¿ÑÑÑÐµÑ Ð¿ÑÐ¸ÑÑÑÐºÐ¾Ð²Ð°Ð½", IDC_HWPPROP_DOCKED, 22, 97, 160, 10 + AUTORADIOBUTTON "ÐÐ¾Ð¼Ð¿ÑÑÑÐµÑ Ð¾ÑÑÑÑÐºÐ¾Ð²Ð°Ð½", IDC_HWPPROP_UNDOCKED, 22, 109, 160, 10 GROUPBOX "ÐÑÐ±Ð¾Ñ Ð¿ÑÐ¾ÑÐ¸Ð»ÐµÐ¹ Ð¾Ð±Ð¾ÑÑÐ´Ð¾Ð²Ð°Ð½Ð¸Ñ", IDC_STATIC, 10, 138, 192, 42 AUTOCHECKBOX "ÐÑÐµÐ³Ð´Ð° &Ð¾ÑÐ¾Ð±ÑÐ°Ð¶Ð°ÑÑ ÑÑÐ¾Ñ Ð¿ÑÐ¾ÑÐ¸Ð»Ñ Ð¿ÑÐ¸ Ð·Ð°Ð¿ÑÑÐºÐµ ReactOS", IDC_HWPPROP_INCLUDE, 17, 150, 164, 20, WS_GROUP | WS_TABSTOP | BS_MULTILINE END Modified: trunk/reactos/dll/shellext/stobject/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/stobject/lang… ============================================================================== --- trunk/reactos/dll/shellext/stobject/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/stobject/lang/ru-RU.rc [iso-8859-1] Thu Aug 25 14:32:50 2016 @@ -19,11 +19,11 @@ STRINGTABLE BEGIN //Power related strings - IDS_PWR_PROPERTIES "&ÐÐ°ÑÑÑÐ¾Ð¹ÐºÐ° ÑÐ»ÐµÐºÑÑÐ¾Ð¿Ð¸ÑÐ°Ð½Ð¸Ñ" + IDS_PWR_PROPERTIES "&ÐÐ°ÑÑÑÐ¾Ð¹ÐºÐ° Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÐ¾Ð² ÑÐ»ÐµÐºÑÑÐ¾Ð¿Ð¸ÑÐ°Ð½Ð¸Ñ" IDS_PWR_METER "&ÐÑÐºÑÑÑÑ Ð¿Ð¾ÐºÐ°Ð·Ð°ÑÐµÐ»Ð¸ Ð¿Ð¸ÑÐ°Ð½Ð¸Ñ" IDS_PWR_PERCENT_REMAINING "%1!u!%% Ð¾ÑÑÐ°Ð»Ð¾ÑÑ" - IDS_PWR_CHARGING " (Ð·Ð°ÑÑÐ¶Ð°ÐµÑÑÑ)" - IDS_PWR_UNKNOWN_REMAINING "Unknown remaining" + IDS_PWR_CHARGING " (Ð·Ð°ÑÑÐ´ÐºÐ°)" + IDS_PWR_UNKNOWN_REMAINING "ÐÐµÐ¸Ð·Ð²ÐµÑÑÐ½Ð¾" IDS_PWR_AC "ÐÑ ÑÐµÑÐ¸ Ð¿ÐµÑÐµÐ¼ÐµÐ½Ð½Ð¾Ð³Ð¾ ÑÐ¾ÐºÐ°" IDS_PWR_HOURS_REMAINING "%1!u!:%2!02u! ÑÐ°ÑÐ¾Ð² (%3!u!%%) Ð¾ÑÑÐ°Ð»Ð¾ÑÑ" IDS_PWR_MINUTES_REMAINING "%1!u! Ð¼Ð¸Ð½ÑÑ (%2!u!%%) Ð¾ÑÑÐ°Ð»Ð¾ÑÑ" @@ -37,7 +37,7 @@ IDS_HOTPLUG_DRIVES " - ÐÐ¸ÑÐºÐ¸(%s)" IDS_HOTPLUG_A "A:" IDS_HOTPLUG_REQUIERES "ÐÑÐ¾ Ð¾Ð±Ð¾ÑÑÐ´Ð¾Ð²Ð°Ð½Ð¸Ðµ ÑÑÐµÐ±ÑÐµÑ ""ÐÐµÐ·Ð¾Ð¿Ð°ÑÐ½Ð¾Ð³Ð¾ Ð¸Ð·Ð²Ð»ÐµÑÐµÐ½Ð¸Ñ""" - IDS_HOTPLUG_CLICK "ÐÐµÑÐµÐ´ Ð¸Ð·Ð²Ð»ÐµÑÐµÐ½Ð¸ÐµÐ¼ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð°, ÐºÐ»Ð¸ÐºÐ½Ð¸ÑÐµ ÑÑÑ Ð¸ÐºÐ¾Ð½ÐºÑ Ð¸ Ð²ÑÐ±ÐµÑÐ¸ÑÐµ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð¾, ÐºÐ¾ÑÐ¾ÑÐ¾Ðµ Ð²Ñ ÑÐ¾ÑÐ¸ÑÐµ Ð¾ÑÐºÐ»ÑÑÐ¸ÑÑ" + IDS_HOTPLUG_CLICK "ÐÐµÑÐµÐ´ Ð¸Ð·Ð²Ð»ÐµÑÐµÐ½Ð¸ÐµÐ¼ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð°, ÐºÐ»Ð¸ÐºÐ½Ð¸ÑÐµ ÑÑÑ Ð¸ÐºÐ¾Ð½ÐºÑ Ð¸ Ð²ÑÐ±ÐµÑÐ¸ÑÐµ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð¾, ÐºÐ¾ÑÐ¾ÑÐ¾Ðµ Ð²Ñ ÑÐ¾ÑÐ¸ÑÐµ Ð¾ÑÐºÐ»ÑÑÐ¸ÑÑ." //Volume related strings IDS_VOL_VOLUME "ÐÑÐ¾Ð¼ÐºÐ¾ÑÑÑ" 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] Thu Aug 25 14:32:50 2016 @@ -47,14 +47,14 @@ 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." - IDS_DEV_DEVLOADER_NOT_FOUND3 "Device failure: Try changing the driver for this device. If that doesn't work, see your hardware documentation." - IDS_DEV_INVALID_DATA "This device is not working properly because the BIOS in your computer is reporting the resources for the device incorrectly." - IDS_DEV_INVALID_DATA2 "This device is not working properly because the BIOS in the device is reporting the resources for the device incorrectly. " - IDS_DEV_FAILED_START "This device is either not present, not working properly, or does not have all the drivers installed." - IDS_DEV_LIAR "ReactOS stopped responding while attempting to start this device, and therefore will never attempt to start this device again." - IDS_DEV_NORMAL_CONFLICT "This device cannot find any free %1 resources to use." + IDS_DEV_DEVLOADER_NOT_FOUND "ÐÑÐ¾ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð¾ ÑÐ°Ð±Ð¾ÑÐ°ÐµÑ Ð½ÐµÐ¿ÑÐ°Ð²Ð¸Ð»ÑÐ½Ð¾, Ð¿Ð¾ÑÐºÐ¾Ð»ÑÐºÑ Ð² ReactOS Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ Ð·Ð°Ð³ÑÑÐ·Ð¸ÑÑ ÑÐ°Ð¹Ð» %1, Ð·Ð°Ð³ÑÑÐ¶Ð°ÑÑÐ¸Ð¹ Ð´ÑÐ°Ð¹Ð²ÐµÑÑ Ð´Ð»Ñ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð°." + IDS_DEV_DEVLOADER_NOT_FOUND2 "ÐÑÐ¾ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð¾ ÑÐ°Ð±Ð¾ÑÐ°ÐµÑ Ð½ÐµÐ¿ÑÐ°Ð²Ð¸Ð»ÑÐ½Ð¾, Ð¿Ð¾ÑÐºÐ¾Ð»ÑÐºÑ ÑÐ°Ð¹Ð» %1, Ð·Ð°Ð³ÑÑÐ¶Ð°ÑÑÐ¸Ð¹ Ð´ÑÐ°Ð¹Ð²ÐµÑÑ Ð´Ð»Ñ Ð½ÐµÐ³Ð¾, Ð¿Ð¾Ð²ÑÐµÐ¶Ð´ÐµÐ½." + IDS_DEV_DEVLOADER_NOT_FOUND3 "Ð¡Ð±Ð¾Ð¹ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð°: Ð¿Ð¾Ð¿ÑÐ¾Ð±ÑÐ¹ÑÐµ ÑÐ¼ÐµÐ½Ð¸ÑÑ Ð´ÑÐ°Ð¹Ð²ÐµÑ. ÐÑÐ»Ð¸ ÑÑÐ¾ Ð½Ðµ Ð¿Ð¾Ð¼Ð¾Ð¶ÐµÑ, Ð¾Ð±ÑÐ°ÑÐ¸ÑÐµÑÑ Ðº Ð´Ð¾ÐºÑÐ¼ÐµÐ½ÑÐ°ÑÐ¸Ð¸ Ð¾Ð±Ð¾ÑÑÐ´Ð¾Ð²Ð°Ð½Ð¸Ñ." + IDS_DEV_INVALID_DATA "ÐÑÐ¾ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð¾ ÑÐ°Ð±Ð¾ÑÐ°ÐµÑ Ð½ÐµÐ¿ÑÐ°Ð²Ð¸Ð»ÑÐ½Ð¾, Ð¿Ð¾ÑÐºÐ¾Ð»ÑÐºÑ BIOS ÐºÐ¾Ð¼Ð¿ÑÑÑÐµÑÐ° Ð½ÐµÐ²ÐµÑÐ½Ð¾ Ð½Ð°Ð·Ð½Ð°ÑÐ¸Ð» ÑÐµÑÑÑÑÑ Ð´Ð»Ñ Ð½ÐµÐ³Ð¾." + IDS_DEV_INVALID_DATA2 "ÐÑÐ¾ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð¾ ÑÐ°Ð±Ð¾ÑÐ°ÐµÑ Ð½ÐµÐ¿ÑÐ°Ð²Ð¸Ð»ÑÐ½Ð¾, Ð¿Ð¾ÑÐºÐ¾Ð»ÑÐºÑ BIOS ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð° Ð½ÐµÐ²ÐµÑÐ½Ð¾ Ð½Ð°Ð·Ð½Ð°ÑÐ¸Ð» ÑÐµÑÑÑÑÑ Ð´Ð»Ñ Ð½ÐµÐ³Ð¾. " + IDS_DEV_FAILED_START "ÐÑÐ¾ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð¾ Ð¾ÑÑÑÑÑÑÐ²ÑÐµÑ, ÑÐ°Ð±Ð¾ÑÐ°ÐµÑ Ð½ÐµÐ¿ÑÐ°Ð²Ð¸Ð»ÑÐ½Ð¾ Ð¸Ð»Ð¸ Ð½Ðµ Ð²ÑÐµ Ð´ÑÐ°Ð¹Ð²ÐµÑÑ ÑÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ñ." + IDS_DEV_LIAR "ReactOS Ð¿ÐµÑÐµÑÑÐ°Ð»Ð° Ð¾ÑÐ²ÐµÑÐ°ÑÑ Ð¿ÑÐ¸ Ð¿Ð¾Ð¿ÑÑÐºÐµ Ð·Ð°Ð¿ÑÑÐºÐ° ÑÑÐ¾Ð³Ð¾ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð°. Ð¡Ð¸ÑÑÐµÐ¼Ð° Ð±Ð¾Ð»ÑÑÐµ Ð½Ðµ Ð±ÑÐ´ÐµÑ Ð¿ÑÑÐ°ÑÑÑÑ Ð·Ð°Ð¿ÑÑÑÐ¸ÑÑ ÐµÐ³Ð¾ ÑÐ½Ð¾Ð²Ð°." + IDS_DEV_NORMAL_CONFLICT "Ð£ÑÑÑÐ¾Ð¹ÑÑÐ²Ð¾ Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ Ð½Ð°Ð¹ÑÐ¸ ÑÐ²Ð¾Ð±Ð¾Ð´Ð½ÑÐµ %1 ÑÐµÑÑÑÑÑ Ð´Ð»Ñ Ð¸ÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°Ð½Ð¸Ñ" IDS_DEV_NOT_VERIFIED "ÐÐ°Ð½Ð½Ð¾Ðµ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð¾ ÑÐ²Ð»ÑÐµÑÑÑ Ð½ÐµÐ¸Ð·Ð²ÐµÑÑÐ½ÑÐ¼, ÑÐ°Ð±Ð¾ÑÐ°ÐµÑ Ð½ÐµÐºÐ¾ÑÑÐµÐºÑÐ½Ð¾ Ð¸Ð»Ð¸ Ð½Ðµ Ð¸Ð¼ÐµÐµÑ ÑÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½ÑÑ Ð´ÑÐ°Ð¹Ð²ÐµÑÐ¾Ð²." IDS_DEV_NEED_RESTART "ÐÐ°Ð½Ð½Ð¾Ðµ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð¾ Ð½Ðµ ÑÐ¼Ð¾Ð¶ÐµÑ ÐºÐ¾ÑÑÐµÐºÑÐ½Ð¾ ÑÐ°Ð±Ð¾ÑÐ°ÑÑ Ð´Ð¾ Ð²ÑÐ¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ Ð¿ÐµÑÐµÐ·Ð°Ð³ÑÑÐ·ÐºÐ¸." IDS_DEV_REENUMERATION "ÐÐ°Ð½Ð½Ð¾Ðµ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð¾ Ð²ÑÐ·Ð²Ð°Ð»Ð¾ ÐºÐ¾Ð½ÑÐ»Ð¸ÐºÑ ÑÐµÑÑÑÑÐ¾Ð²."

1 0

[vmikayelyan] 72459: fastfat: Remove code dublication, which has added r6279
by vmikayelyan＠svn.reactos.org 25 Aug '16

25 Aug '16

Author: vmikayelyan Date: Thu Aug 25 14:08:19 2016 New Revision: 72459 URL: http://svn.reactos.org/svn/reactos?rev=72459&view=rev Log: fastfat: Remove code dublication, which has added r6279 Modified: branches/GSoC_2016/USB/drivers/filesystems/fastfat/flush.c Modified: branches/GSoC_2016/USB/drivers/filesystems/fastfat/flush.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/USB/drivers/filesyste… ============================================================================== --- branches/GSoC_2016/USB/drivers/filesystems/fastfat/flush.c [iso-8859-1] (original) +++ branches/GSoC_2016/USB/drivers/filesystems/fastfat/flush.c [iso-8859-1] Thu Aug 25 14:08:19 2016 @@ -64,25 +64,6 @@ Fcb = CONTAINING_RECORD(ListEntry, VFATFCB, FcbListEntry); ListEntry = ListEntry->Flink; if (!vfatFCBIsDirectory(Fcb)) - { - ExAcquireResourceExclusiveLite(&Fcb->MainResource, TRUE); - Status = VfatFlushFile(DeviceExt, Fcb); - ExReleaseResourceLite (&Fcb->MainResource); - if (!NT_SUCCESS(Status)) - { - DPRINT1("VfatFlushFile failed, status = %x\n", Status); - ReturnStatus = Status; - } - } - /* FIXME: Stop flushing if this is a removable media and the media was removed */ - } - - ListEntry = DeviceExt->FcbListHead.Flink; - while (ListEntry != &DeviceExt->FcbListHead) - { - Fcb = CONTAINING_RECORD(ListEntry, VFATFCB, FcbListEntry); - ListEntry = ListEntry->Flink; - if (vfatFCBIsDirectory(Fcb)) { ExAcquireResourceExclusiveLite(&Fcb->MainResource, TRUE); Status = VfatFlushFile(DeviceExt, Fcb);

1 0

[tfaber] 72458: [MSTSC] - Unbreak build
by tfaber＠svn.reactos.org 25 Aug '16

25 Aug '16

Author: tfaber Date: Thu Aug 25 12:08:58 2016 New Revision: 72458 URL: http://svn.reactos.org/svn/reactos?rev=72458&view=rev Log: [MSTSC] - Unbreak build Modified: trunk/reactos/base/applications/mstsc/connectdialog.c Modified: trunk/reactos/base/applications/mstsc/connectdialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/co… ============================================================================== --- trunk/reactos/base/applications/mstsc/connectdialog.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mstsc/connectdialog.c [iso-8859-1] Thu Aug 25 12:08:58 2016 @@ -1274,6 +1274,10 @@ txtRc.right = bmpRc.right * 4 / 5; #else txtRc.right = bmpRc.right * 3 / 4; +#endif + txtRc.bottom = pInfo->headerbitmap.bmHeight * 9 / 10; + + if (LoadStringW(hInst, IDS_HEADERTEXT2, szBuffer, sizeof(szBuffer) / sizeof(WCHAR)))

1 0

[hbelusca] 72457: [SHORTCUTS]: Update russian translations, by 'amber'. CORE-11510
by hbelusca＠svn.reactos.org 25 Aug '16

25 Aug '16

Author: hbelusca Date: Thu Aug 25 10:49:37 2016 New Revision: 72457 URL: http://svn.reactos.org/svn/reactos?rev=72457&view=rev Log: [SHORTCUTS]: Update russian translations, by 'amber'. CORE-11510 Modified: trunk/reactos/media/inf/shortcuts.inf Modified: trunk/reactos/media/inf/shortcuts.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/shortcuts.inf?re… ============================================================================== --- trunk/reactos/media/inf/shortcuts.inf [iso-8859-1] (original) +++ trunk/reactos/media/inf/shortcuts.inf [iso-8859-1] Thu Aug 25 10:49:37 2016 @@ -1272,6 +1272,8 @@ KBSWITCH_DESC=ÐÐµÑÐµÐºÐ»ÑÑÐ°ÑÐµÐ»Ñ ÑÐ°ÑÐºÐ»Ð°Ð´ÐºÐ¸ ÐºÐ»Ð°Ð²Ð¸Ð°ÑÑÑÑ REGEDIT_TITLE=Ð ÐµÐ´Ð°ÐºÑÐ¾Ñ ÑÐµÐµÑÑÑÐ° REGEDIT_DESC=ÐÐ°Ð¿ÑÑÑÐ¸ÑÑ ÑÐµÐ´Ð°ÐºÑÐ¾Ñ ÑÐµÐµÑÑÑÐ° +TASKMGR_TITLE=ÐÐ¸ÑÐ¿ÐµÑÑÐµÑ Ð·Ð°Ð´Ð°Ñ +TASKMGR_DESC=ÐÐ°Ð¿ÑÑÑÐ¸ÑÑ Ð´Ð¸ÑÐ¿ÐµÑÑÐµÑ Ð·Ð°Ð´Ð°Ñ DXDIAG_TITLE=Ð¡ÑÐµÐ´ÑÑÐ²Ð¾ Ð´Ð¸Ð°Ð³Ð½Ð¾ÑÑÐ¸ÐºÐ¸ ReactX DXDIAG_DESC=ÐÐ°Ð¿ÑÑÑÐ¸ÑÑ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ñ Ð´Ð¸Ð°Ð³Ð½Ð¾ÑÑÐ¸ÐºÐ¸ ReactX MAGNIFY_TITLE=ÐÐºÑÐ°Ð½Ð½Ð°Ñ Ð»ÑÐ¿Ð°

1 0

[hbelusca] 72456: [TRANSLATIONS][ACPPAGE][IERNONCE]: Update ReactOS russian translation, by Sergey Stopkin. CORE-11763 #resolve #comment Committed, thanks!
by hbelusca＠svn.reactos.org 25 Aug '16

25 Aug '16

Author: hbelusca Date: Thu Aug 25 10:44:39 2016 New Revision: 72456 URL: http://svn.reactos.org/svn/reactos?rev=72456&view=rev Log: [TRANSLATIONS][ACPPAGE][IERNONCE]: Update ReactOS russian translation, by Sergey Stopkin. CORE-11763 #resolve #comment Committed, thanks! Added: trunk/reactos/dll/shellext/acppage/lang/ru-RU.rc (with props) trunk/reactos/dll/win32/iernonce/lang/ru-RU.rc (with props) Modified: trunk/reactos/base/applications/taskmgr/lang/ru-RU.rc trunk/reactos/dll/shellext/acppage/ACPPage.rc trunk/reactos/dll/win32/iernonce/iernonce.rc Modified: trunk/reactos/base/applications/taskmgr/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/ru-RU.rc [iso-8859-1] Thu Aug 25 10:44:39 2016 @@ -57,7 +57,7 @@ MENUITEM "&ÐÐ°Ð²ÐµÑÑÐµÐ½Ð¸Ðµ ÑÐµÐ°Ð½ÑÐ° %s", ID_SHUTDOWN_LOGOFF MENUITEM "Ð¡&Ð¼ÐµÐ½Ð° Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED MENUITEM "ÐÐ°Ð±&Ð»Ð¾ÐºÐ¸ÑÐ¾Ð²Ð°ÑÑ ÐºÐ¾Ð¼Ð¿ÑÑÑÐµÑ\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER - MENUITEM "&Disconnect", ID_SHUTDOWN_DISCONNECT, GRAYED + MENUITEM "&ÐÑÐºÐ»ÑÑÐ¸ÑÑ", ID_SHUTDOWN_DISCONNECT, GRAYED MENUITEM "Ð¡&Ð½ÑÑÑ ÐºÐ¾Ð¼Ð¿ÑÑÑÐµÑ Ñ Ð´Ð¾Ðº-ÑÑÐ°Ð½ÑÐ¸Ð¸", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED END POPUP "&Ð¡Ð¿ÑÐ°Ð²ÐºÐ°" Modified: trunk/reactos/dll/shellext/acppage/ACPPage.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/acppage/ACPPa… ============================================================================== --- trunk/reactos/dll/shellext/acppage/ACPPage.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/acppage/ACPPage.rc [iso-8859-1] Thu Aug 25 10:44:39 2016 @@ -64,10 +64,10 @@ #ifdef LANGUAGE_RO_RO #include "lang/ro-RO.rc" #endif -/* #ifdef LANGUAGE_RU_RU #include "lang/ru-RU.rc" #endif +/* #ifdef LANGUAGE_SK_SK #include "lang/sk-SK.rc" #endif @@ -88,4 +88,4 @@ #ifdef LANGUAGE_ZH_CN #include "lang/zh-CN.rc" #endif -*/ +*/ Added: trunk/reactos/dll/shellext/acppage/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/acppage/lang/… ============================================================================== --- trunk/reactos/dll/shellext/acppage/lang/ru-RU.rc (added) +++ trunk/reactos/dll/shellext/acppage/lang/ru-RU.rc [iso-8859-1] Thu Aug 25 10:44:39 2016 @@ -0,0 +1,41 @@ +/* Russian language resource file by Stopkin Sergey (stopkin.sergey(a)gmail.com) */ + +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT + +IDD_ACPPAGESHEET DIALOGEX 0, 0, 224, 226 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Compatibility" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "ÐÑÐ»Ð¸ Ñ Ð²Ð°Ñ ÐµÑÑÑ Ð¿ÑÐ¾Ð±Ð»ÐµÐ¼Ñ Ñ Ð·Ð°Ð¿ÑÑÐºÐ¾Ð¼ ÑÑÐ¾Ð¹ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ñ Ð² ReactOS, Ð²ÑÐ±ÐµÑÐ¸ÑÐµ Ð¾Ð¿ÐµÑÐ°ÑÐ¸Ð¾Ð½Ð½ÑÑ ÑÐ¸ÑÑÐµÐ¼Ñ, ÐºÐ¾ÑÐ¾ÑÐ¾Ð¹ ReactOS Ð±ÑÐ´ÐµÑ Ð¿ÑÐµÐ´ÑÑÐ°Ð²Ð»ÑÑÑÑÑ Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ. \ NÐ£ÑÑÐ¸ÑÐµ, ÑÐ°Ð±Ð¾ÑÐ° Ð½Ð°Ð´ ÑÑÐ¸Ð¼ Ð¼Ð¾Ð´ÑÐ»ÐµÐ¼ Ð¿ÑÐ¾Ð´Ð¾Ð»Ð¶Ð°ÐµÑÑÑ, Ð¸ Ð½Ð° Ð´Ð°Ð½Ð½Ð¾Ð¼ ÑÑÐ°Ð¿Ðµ Ð¾Ð½ Ð½Ð¸ÑÐµÐ³Ð¾ Ð½Ðµ Ð±ÑÐ´ÐµÑ Ð´ÐµÐ»Ð°ÑÑ." IDC_EXPLANATION, 7, 7 , 210, 31 + GROUPBOX "Ð ÐµÐ¶Ð¸Ð¼ ÑÐ¾Ð²Ð¼ÐµÑÑÐ¸Ð¼Ð¾ÑÑÐ¸", IDC_COMPATGROUP, 7, 41, 210, 49 + CHECKBOX "ÐÐ°Ð¿ÑÑÑÐ¸ÑÑ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ñ Ð² ÑÐµÐ¶Ð¸Ð¼Ðµ ÑÐ¾Ð²Ð¼ÐµÑÑÐ¸Ð¼Ð¾ÑÑÐ¸ Ñ:", IDC_CHKRUNCOMPATIBILITY, 18, 57, 188, 10, BS_AUTOCHECKBOX | WS_TABSTOP + COMBOBOX IDC_COMPATIBILITYMODE, 18, 70, 188, 85, CBS_HASSTRINGS | CBS_DROPDOWNLIST | WS_TABSTOP | WS_DISABLED + GROUPBOX "ÐÐ°ÑÐ°Ð¼ÐµÑÑÑ ÑÐºÑÐ°Ð½Ð°", -1, 7, 99, 210, 61, BS_GROUPBOX | WS_DISABLED + CHECKBOX "ÐÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÑ 256 ÑÐ²ÐµÑÐ¾Ð²", IDC_CHKRUNIN256COLORS, 18, 114, 188, 10, BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED + CHECKBOX "ÐÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÑ ÑÐ°Ð·ÑÐµÑÐµÐ½Ð¸Ðµ ÑÐºÑÐ°Ð½Ð° 640x480", IDC_CHKRUNIN640480RES, 18, 129, 188, 10, BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED + CHECKBOX "ÐÑÐºÐ»ÑÑÐ¸ÑÑ Ð²Ð¸Ð·ÑÐ°Ð»ÑÐ½Ð¾Ðµ Ð¾ÑÐ¾ÑÐ¼Ð»ÐµÐ½Ð¸Ðµ", IDC_CHKDISABLEVISUALTHEMES, 18, 144, 188, 10, BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED + PUSHBUTTON "ÐÐ°ÑÑÑÐ¾Ð¸ÑÑ ÑÐµÐ¶Ð¸Ð¼Ñ ÑÐ¾Ð²Ð¼ÐµÑÑÐ¸Ð¼Ð¾ÑÑÐ¸...", IDC_EDITCOMPATIBILITYMODES, 117, 167, 100, 15 + CONTROL "Ð£Ð·Ð½Ð°ÑÑ Ð±Ð¾Ð»ÑÑÐµ Ð¾ <A>ÑÐ¾Ð²Ð¼ÐµÑÑÐ¸Ð¼Ð¾ÑÑÐ¸ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼</A>.", IDC_INFOLINK, "SysLink", WS_CHILD | WS_TABSTOP | WS_VISIBLE, 7, 207, 210, 10, WS_EX_NOPARENTNOTIFY +END + +IDD_EDITCOMPATIBILITYMODES DIALOGEX 0, 0, 230, 139 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ÐÐ·Ð¼ÐµÐ½Ð¸ÑÑ ÑÐµÐ¶Ð¸Ð¼Ñ ÑÐ¾Ð²Ð¼ÐµÑÑÐ¸Ð¼Ð¾ÑÑÐ¸" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + EDITTEXT IDC_NEWCOMPATIBILITYMODE, 9, 6, 148, 14, ES_AUTOHSCROLL + LISTBOX IDC_COMPATIBILITYMODE, 9, 25, 148, 86, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT | LBS_WANTKEYBOARDINPUT | WS_BORDER + PUSHBUTTON "&ÐÐ¾Ð±Ð°Ð²Ð¸ÑÑ...", IDC_ADD, 162, 6, 60, 14, WS_DISABLED + PUSHBUTTON "&Ð ÐµÐ´Ð°ÐºÑÐ¸ÑÐ¾Ð²Ð°ÑÑ...", IDC_EDIT, 162, 24, 60, 14, WS_DISABLED + PUSHBUTTON "&Ð£Ð´Ð°Ð»Ð¸ÑÑ", IDC_DELETE, 162, 42, 60, 14, WS_DISABLED + PUSHBUTTON "&OK", IDOK, 95, 116, 60, 14 + PUSHBUTTON "&ÐÑÐ¼ÐµÐ½Ð°", IDCANCEL, 162, 116, 60, 14 +END + +STRINGTABLE +BEGIN + IDS_TABTITLE "Ð¡Ð¾Ð²Ð¼ÐµÑÑÐ¸Ð¼Ð¾ÑÑÑ" + IDS_FAILED_NETWORK "Ð ÐµÐ¶Ð¸Ð¼ ÑÐ¾Ð²Ð¼ÐµÑÑÐ¸Ð¼Ð¾ÑÑÐ¸ Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ Ð±ÑÑÑ ÑÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½ Ð´Ð»Ñ ÑÑÐ¾Ð¹ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ñ, Ð¿Ð¾ÑÐ¾Ð¼Ñ ÑÑÐ¾ Ð¾Ð½Ð° Ð½Ð°ÑÐ¾Ð´Ð¸ÑÑÑ Ð½Ð° ÑÐµÑÐµÐ²Ð¾Ð¼ Ð´Ð¸ÑÐºÐµ." + IDS_FAILED_PROTECTED "Ð ÐµÐ¶Ð¸Ð¼ ÑÐ¾Ð²Ð¼ÐµÑÑÐ¸Ð¼Ð¾ÑÑÐ¸ Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ Ð±ÑÑÑ Ð¸ÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°Ð½ Ð´Ð»Ñ ÐºÐ¾Ð¼Ð¿Ð¾Ð½ÐµÐ½ÑÐ¾Ð² ReactOS." +END Propchange: trunk/reactos/dll/shellext/acppage/lang/ru-RU.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/iernonce/iernonce.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iernonce/iernonc… ============================================================================== --- trunk/reactos/dll/win32/iernonce/iernonce.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/iernonce/iernonce.rc [iso-8859-1] Thu Aug 25 10:44:39 2016 @@ -26,6 +26,9 @@ #ifdef LANGUAGE_RO_RO #include "lang/ro-RO.rc" #endif +#ifdef LANGUAGE_RU_RU + #include "lang/ru-RU.rc" +#endif #ifdef LANGUAGE_TR_TR #include "lang/tr-TR.rc" #endif @@ -35,4 +38,3 @@ #ifdef LANGUAGE_ZH_TW #include "lang/zh-TW.rc" #endif - Added: trunk/reactos/dll/win32/iernonce/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iernonce/lang/ru… ============================================================================== --- trunk/reactos/dll/win32/iernonce/lang/ru-RU.rc (added) +++ trunk/reactos/dll/win32/iernonce/lang/ru-RU.rc [iso-8859-1] Thu Aug 25 10:44:39 2016 @@ -0,0 +1,29 @@ +/* Russian language resource file by Stopkin Sergey (stopkin.sergey(a)gmail.com) */ + +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + IDS_INVALIDFORMAT "ÐÐµÐ´Ð¾Ð¿ÑÑÑÐ¸Ð¼ÑÐ¹ ÑÐ¾ÑÐ¼Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÐ¸ %1 RunEx Ð¸Ð»Ð¸ RunOnceEx. Ð¢ÑÐµÐ±ÑÐµÑÑÑ Ð¸ÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°Ð½Ð¸Ðµ Ð²ÐµÑÑÐ¸ÐºÐ°Ð»ÑÐ½Ð¾Ð¹ ÑÐµÑÑÑ ('|') Ð¿Ð¾ÑÐ»Ðµ Ð¸Ð¼ÐµÐ½Ð¸ ÑÑÐ½ÐºÑÐ¸Ð¸. Ð¢Ð°ÐºÐ¶Ðµ ÑÑÐ½ÐºÑÐ¸Ñ Ð´Ð¾Ð»Ð¶Ð½Ð° Ð¿Ð¾Ð´Ð´ÐµÑÐ¶Ð¸Ð²Ð°ÑÑ WinMain() Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÑ" + IDS_LOADERROR "ÐÑÐ¾Ð¸Ð·Ð¾ÑÐ»Ð° Ð¾ÑÐ¸Ð±ÐºÐ° Ð¿ÑÐ¸ Ð·Ð°Ð³ÑÑÐ·ÐºÐµ %1. ÐÐ¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾, ÑÐ°Ð¹Ð» Ð½Ðµ Ð±ÑÐ» ÑÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½ Ð¸Ð»Ð¸ Ð¾Ð½ Ð±ÑÐ» Ð¿Ð¾Ð²ÑÐµÐ¶Ð´ÐµÐ½." + IDS_CALLERROR "ÐÑÐ¸ Ð²ÑÐ·Ð¾Ð²Ðµ ÑÑÐ½ÐºÑÐ¸Ð¸ %1 Ð¸Ð· %2 Ð¿ÑÐ¾Ð¸Ð·Ð¾ÑÐ»Ð° Ð¾ÑÐ¸Ð±ÐºÐ° Ð¸Ð»Ð¸ Ð¸ÑÐºÐ»ÑÑÐµÐ½Ð¸Ðµ." + IDS_INCORRECTFORMAT "ÐÐµÐ´Ð¾Ð¿ÑÑÑÐ¸Ð¼ÑÐ¹ ÑÐ¾ÑÐ¼Ð°Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ RunEx Ð¸Ð»Ð¸ RunOnceEx: %1. ÐÐ¾Ð¼Ð°Ð½Ð´Ð° Ð²ÑÐ¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ Ð¾Ð±Ð¾Ð»Ð¾ÑÐºÐ¸ Ð´Ð¾Ð»Ð¶Ð½Ð° Ð½Ð°ÑÐ¸Ð½Ð°ÑÑÑÑ Ñ ||." + IDS_INCORRECTFORMAT "ÐÐµÐ²ÐµÑÐ½ÑÐ¹ ÑÐ¾ÑÐ¼Ð°Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ RunEx Ð¸Ð»Ð¸ RunOnceEx: %1. ÐÐ¾Ð¼Ð°Ð½Ð´Ð° Ð²ÑÐ¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ Ð´Ð»Ñ Ð¾Ð±Ð¾Ð»Ð¾ÑÐºÐ¸ Ð´Ð¾Ð»Ð¶Ð½Ð° Ð½Ð°ÑÐ¸Ð½Ð°ÑÑÑÑ Ñ ||." + IDS_EXECUTEERROR "ÐÐ¾ Ð²ÑÐµÐ¼Ñ Ð²ÑÐ¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ %1 Ð¿ÑÐ¾Ð¸Ð·Ð¾ÑÐ»Ð° Ð¾ÑÐ¸Ð±ÐºÐ° Ð¸Ð»Ð¸ Ð¸ÑÐºÐ»ÑÑÐµÐ½Ð¸Ðµ." + IDS_NOFUNCTION "ÐÐµ ÑÐ´Ð°ÐµÑÑÑ Ð½Ð°Ð¹ÑÐ¸ ÑÑÐ½ÐºÑÐ¸Ñ %1 Ð² ÑÐ°Ð¹Ð»Ðµ %2." + IDS_NODEPENDENCY "ÐÐµ ÑÐ´Ð°Ð»Ð¾ÑÑ Ð·Ð°Ð³ÑÑÐ·Ð¸ÑÑ ÑÑÐµÐ±ÑÐµÐ¼ÑÐ¹ ÑÐ°Ð¹Ð» %1." + IDS_SETUPERROR "ÐÑÐ¾Ð¸Ð·Ð¾ÑÐ»Ð° Ð¾ÑÐ¸Ð±ÐºÐ° Ð¿ÑÐ¸ Ð½Ð°ÑÑÑÐ¾Ð¹ÐºÐµ 1%. ÐÑÐ° Ð¾ÑÐ¸Ð±ÐºÐ° Ð±ÑÐ»Ð° Ð·Ð°Ð½ÐµÑÐµÐ½Ð° Ð² Ð¶ÑÑÐ½Ð°Ð», ÑÑÑÐ°Ð½Ð¾Ð²ÐºÐ° Ð±ÑÐ´ÐµÑ Ð¿ÑÐ¾Ð´Ð¾Ð»Ð¶ÐµÐ½Ð°" + IDS_INCOMPLETE "ÐÑÐµÐ´ÑÐ´ÑÑÐ°Ñ ÑÑÑÐ°Ð½Ð¾Ð²ÐºÐ° Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ Ð½Ðµ Ð±ÑÐ»Ð° Ð·Ð°Ð²ÐµÑÑÐµÐ½Ð°.\n\nÐÐ¾Ð¹Ð´Ð¸ÑÐµ Ð² ÑÐ¸ÑÑÐµÐ¼Ñ, Ð¸ÑÐ¿Ð¾Ð»ÑÐ·ÑÑ ÑÑÐµÑÐ½ÑÑ Ð·Ð°Ð¿Ð¸ÑÑ ÐÐ´Ð¼Ð¸Ð½Ð¸ÑÑÑÐ°ÑÐ¾ÑÐ° Ð´Ð»Ñ Ð·Ð°Ð²ÐµÑÑÐµÐ½Ð¸Ñ ÑÑÑÐ°Ð½Ð¾Ð²ÐºÐ¸." + IDS_SETUP "ReactOS Setup" + IDS_SERVICEERROR "ÐÐµÐºÐ¾ÑÐ¾ÑÑÐµ ÑÐ»ÑÐ¶Ð±Ñ Ð½Ðµ Ð¼Ð¾Ð³ÑÑ Ð±ÑÑÑ Ð·Ð°Ð¿ÑÑÐµÐ½Ñ. ÐÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ðµ ÑÑÑÐ°Ð½Ð¾Ð²ÐºÐ¸ Ð½ÐµÐ¾Ð±ÑÐ¾Ð´Ð¸Ð¼Ð¾ Ð¿ÐµÑÐµÐ·Ð°Ð³ÑÑÐ·Ð¸ÑÑ ÑÐ¸ÑÑÐµÐ¼Ñ Ð´Ð»Ñ ÑÐ¾Ð³Ð¾, ÑÑÐ¾Ð±Ñ Ð·Ð°Ð¿ÑÑÑÐ¸ÑÑ ÑÐ»ÑÐ¶Ð±Ñ." +END + +IDD_DIALOG DIALOGEX 0, 0, 206, 166 +STYLE DS_MODALFRAME | DS_NOIDLEMSG | WS_POPUP | WS_VISIBLE | WS_CAPTION +CAPTION "ReactOS Setup" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "ReactOS Ð½Ð°ÑÑÑÐ°Ð¸Ð²Ð°ÐµÑ ÑÐ»ÐµÐ´ÑÑÑÐ¸Ðµ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÑ:", -1, 36, 13, 163, 11 + LISTBOX IDC_LB_ITEMS, 36, 32, 163, 127, LBS_NOTIFY | LBS_OWNERDRAWVARIABLE | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | WS_CHILD | WS_VISIBLE | WS_DISABLED | WS_VSCROLL | WS_TABSTOP + ICON IDI_ICON, -1, 7, 7, 20, 20 +END Propchange: trunk/reactos/dll/win32/iernonce/lang/ru-RU.rc ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[hbelusca] 72455: [TRANSLATIONS][USETUP][EXPLORER]: Update ReactOS russian translation, by Kudratov Olimjon. Part 2 CORE-11636
by hbelusca＠svn.reactos.org 25 Aug '16

25 Aug '16

Author: hbelusca Date: Thu Aug 25 10:35:42 2016 New Revision: 72455 URL: http://svn.reactos.org/svn/reactos?rev=72455&view=rev Log: [TRANSLATIONS][USETUP][EXPLORER]: Update ReactOS russian translation, by Kudratov Olimjon. Part 2 CORE-11636 Modified: trunk/reactos/base/setup/usetup/lang/ru-RU.h trunk/reactos/base/shell/explorer/lang/ru-RU.rc Modified: trunk/reactos/base/setup/usetup/lang/ru-RU.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/ru-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/ru-RU.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/ru-RU.h [iso-8859-1] Thu Aug 25 10:35:42 2016 @@ -837,7 +837,7 @@ { 6, 8, - "You have chosen to delete the system partition.", + "ë å®â¨â¥ ã¤ «¨âì á¨áâ¥¬ë© à §¤¥«.", TEXT_STYLE_NORMAL }, { @@ -861,49 +861,49 @@ { 6, 14, - "Delete a system partition only when you are sure that there are no such", + "¤ «ï©â¥ á¨áâ¥¬ë© à §¤¥«, ª®£¤ ã¢¥à¥ë, çâ® ¥¬ ¥â ¢ ¦ëå ¯à®£à ¬¬", TEXT_STYLE_NORMAL }, { 6, 15, - "programs on the partition, or when you are sure you want to delete them.", + "¨«¨ ª®£¤ ¢ë ã¢¥à¥ë, çâ® ®¨ ¥ ã¦ë.", TEXT_STYLE_NORMAL }, { 6, 16, - "When you delete the partition, you might not be able to boot the", + "®£¤ ¢ë ã¤ «¨â¥ á¨áâ¥¬ë© à §¤¥«, ¢ë ¥ á¬®¦¥â¥ § £àã§¨âì", TEXT_STYLE_NORMAL }, { 6, 17, - "computer from the harddisk until you finished the ReactOS Setup.", + "ª®¬¯ìîâ¥à á ¦¥áâª®£® ¤¨áª , ¯®ª ¥ § ª®ç¨â¥ ãáâ ®¢ªã ReactOS.", TEXT_STYLE_NORMAL }, { 8, 20, - "\x07 Press ENTER to delete the system partition. You will be asked", + "\x07 ¦¬¨â¥ ENTER çâ®¡ë ã¤ «¨âì á¨áâ¥¬ë© à §¤¥«. ë ¤®«¦ë ¡ã¤¥â¥ ¯®¤â¢¥à¤¨âì", TEXT_STYLE_NORMAL }, { 8, 21, - " to confirm the deletion of the partition again later.", + " ã¤ «¥¨¥ ¯®§¦¥ á®¢ .", TEXT_STYLE_NORMAL }, { 8, 24, - "\x07 Press ESC to return to the previous page. The partition will", + "\x07 ¦¬¨â¥ ESC çâ®¡ë ¢¥àãâìáï ª ¯à¥¤ë¤ãé¥© áâà ¨æ¥. §¤¥« ¥", TEXT_STYLE_NORMAL }, { 8, 25, - " not be deleted.", + " ¡ã¤¥â ã¤ «¥.", TEXT_STYLE_NORMAL }, { Modified: trunk/reactos/base/shell/explorer/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/lang/r… ============================================================================== --- trunk/reactos/base/shell/explorer/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/lang/ru-RU.rc [iso-8859-1] Thu Aug 25 10:35:42 2016 @@ -40,13 +40,13 @@ BEGIN MENUITEM "(Ð¿ÑÑÑÐ¾)", -1, MFT_STRING, MFS_GRAYED END - POPUP "&ÐÐ°ÑÑÑÐ¾Ð¹ÐºÐ¸", IDM_SETTINGS - BEGIN - MENUITEM "&ÐÐ°Ð½ÐµÐ»Ñ ÑÐ¿ÑÐ°Ð²Ð»ÐµÐ½Ð¸Ñ", IDM_CONTROLPANEL, MFT_STRING, MFS_GRAYED + POPUP "Ð&Ð°ÑÑÑÐ¾Ð¹ÐºÐ°", IDM_SETTINGS + BEGIN + MENUITEM "Ð&Ð°Ð½ÐµÐ»Ñ ÑÐ¿ÑÐ°Ð²Ð»ÐµÐ½Ð¸Ñ", IDM_CONTROLPANEL, MFT_STRING, MFS_GRAYED MENUITEM "", -1, MFT_SEPARATOR MENUITEM "&ÐÐµÐ·Ð¾Ð¿Ð°ÑÐ½Ð¾ÑÑÑ...", IDM_SECURITY, MFT_STRING, MFS_ENABLED - MENUITEM "&Ð¡ÐµÑÐµÐ²ÑÐµ Ð¿Ð¾Ð´ÐºÐ»ÑÑÐµÐ½Ð¸Ñ", IDM_NETWORKCONNECTIONS, MFT_STRING, MFS_ENABLED - MENUITEM "&ÐÑÐ¸Ð½ÑÐµÑÑ Ð¸ ÑÐ°ÐºÑÑ", IDM_PRINTERSANDFAXES, MFT_STRING, MFS_ENABLED + MENUITEM "Ð¡&ÐµÑÐµÐ²ÑÐµ Ð¿Ð¾Ð´ÐºÐ»ÑÑÐµÐ½Ð¸Ñ", IDM_NETWORKCONNECTIONS, MFT_STRING, MFS_ENABLED + MENUITEM "ÐÑ&Ð¸Ð½ÑÐµÑÑ Ð¸ ÑÐ°ÐºÑÑ", IDM_PRINTERSANDFAXES, MFT_STRING, MFS_ENABLED MENUITEM "ÐÐ°Ð½ÐµÐ»Ñ &Ð·Ð°Ð´Ð°Ñ Ð¸ Ð¼ÐµÐ½Ñ ""ÐÑÑÐº""", IDM_TASKBARANDSTARTMENU, MFT_STRING, MFS_ENABLED END POPUP "Ð&Ð¾Ð¸ÑÐº", IDM_SEARCH @@ -57,10 +57,10 @@ MENUITEM "&ÐÑÐ¿Ð¾Ð»Ð½Ð¸ÑÑ...", IDM_RUN, MFT_STRING, MFS_ENABLED MENUITEM "", 450, MFT_SEPARATOR, MFS_ENABLED MENUITEM "Ð¡Ð¸Ð½ÑÑÐ¾Ð½Ð¸Ð·Ð°&ÑÐ¸Ñ", IDM_SYNCHRONIZE, MFT_STRING, MFS_ENABLED - MENUITEM "ÐÐ°Ð²ÐµÑÑÐµÐ½Ð¸&Ðµ ÑÐµÐ°Ð½ÑÐ° %s...", IDM_LOGOFF, MFT_STRING, MFS_ENABLED + MENUITEM "ÐÐ°Ð²ÐµÑ&ÑÐµÐ½Ð¸Ðµ ÑÐµÐ°Ð½ÑÐ° %s...", IDM_LOGOFF, MFT_STRING, MFS_ENABLED MENUITEM "ÐÑÐºÐ»Ñ&ÑÐµÐ½Ð¸Ðµ...", IDM_DISCONNECT, MFT_STRING, MFS_ENABLED MENUITEM "ÐÐ»Ð¾ÐºÐ¸ÑÐ¾Ð²Ð°ÑÑ ÐºÐ¾Ð¼Ð¿&ÑÑÑÐµÑ", IDM_UNDOCKCOMPUTER, MFT_STRING, MFS_ENABLED - MENUITEM "Ð&ÑÐºÐ»ÑÑÐµÐ½Ð¸Ðµ...", IDM_SHUTDOWN, MFT_STRING, MFS_ENABLED + MENUITEM "Ð&ÑÐºÐ»ÑÑÐ¸ÑÑ ÐºÐ¾Ð¼Ð¿ÑÑÑÐµÑ...", IDM_SHUTDOWN, MFT_STRING, MFS_ENABLED END END

1 0

[hbelusca] 72454: [TRANSLATIONS]: Update ReactOS russian translation, by Kudratov Olimjon. Part 1 CORE-11636
by hbelusca＠svn.reactos.org 25 Aug '16

25 Aug '16

Author: hbelusca Date: Thu Aug 25 10:22:26 2016 New Revision: 72454 URL: http://svn.reactos.org/svn/reactos?rev=72454&view=rev Log: [TRANSLATIONS]: Update ReactOS russian translation, by Kudratov Olimjon. Part 1 CORE-11636 Modified: trunk/reactos/base/applications/calc/lang/ru-RU.rc trunk/reactos/base/applications/cmdutils/reg/lang/ru-RU.rc trunk/reactos/base/applications/magnify/lang/ru-RU.rc trunk/reactos/base/applications/mplay32/lang/ru-RU.rc trunk/reactos/base/applications/msconfig/lang/ru-RU.rc trunk/reactos/base/applications/msconfig_new/lang/ru-RU.rc trunk/reactos/base/applications/mscutils/servman/lang/ru-RU.rc trunk/reactos/base/applications/mstsc/connectdialog.c trunk/reactos/base/applications/mstsc/lang/ru-RU.rc trunk/reactos/base/applications/taskmgr/lang/ru-RU.rc trunk/reactos/base/applications/winhlp32/lang/Ru.rc trunk/reactos/base/system/userinit/lang/ru-RU.rc trunk/reactos/boot/freeldr/fdebug/lang/ru-RU.rc trunk/reactos/dll/cpl/appwiz/lang/ru-RU.rc trunk/reactos/dll/win32/browseui/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/shell32/lang/ru-RU.rc trunk/reactos/media/rapps/cstalin.txt Modified: trunk/reactos/base/applications/calc/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/ru-RU.rc [iso-8859-1] Thu Aug 25 10:22:26 2016 @@ -314,9 +314,9 @@ END POPUP "Ð&Ð¸Ð´" BEGIN - MENUITEM "ÐÐ±ÑÑÐ½ÑÐ¹", IDM_VIEW_STANDARD - MENUITEM "ÐÐ°ÑÑÐ½ÑÐ¹", IDM_VIEW_SCIENTIFIC - MENUITEM "ÐÑÐµÐ¾Ð±ÑÐ°Ð·Ð¾Ð²Ð°Ð½Ð¸Ðµ", IDM_VIEW_CONVERSION + MENUITEM "&ÐÐ±ÑÑÐ½ÑÐ¹", IDM_VIEW_STANDARD + MENUITEM "&ÐÐ½Ð¶ÐµÐ½ÐµÑÐ½ÑÐ¹", IDM_VIEW_SCIENTIFIC + MENUITEM "Ð&ÐµÑÐµÐ²Ð¾Ð´ Ð²ÐµÐ»Ð¸ÑÐ¸Ð½", IDM_VIEW_CONVERSION MENUITEM SEPARATOR MENUITEM "&Ð¨ÐµÑÑÐ½Ð°Ð´ÑÐ°ÑÐµÑÐ¸ÑÐ½ÑÐ¹\tF5", IDM_VIEW_HEX, CHECKED MENUITEM "&ÐÐµÑÑÑÐ¸ÑÐ½ÑÐ¹\tF6", IDM_VIEW_DEC, CHECKED @@ -327,7 +327,7 @@ MENUITEM "Ð Ð°Ð´Ð¸Ð°&Ð½Ñ\tF3", IDM_VIEW_RAD, CHECKED MENUITEM "ÐÑ&Ð°Ð´Ñ\tF4", IDM_VIEW_GRAD, CHECKED MENUITEM SEPARATOR - MENUITEM "ÐÐ¾Ð»Ð¸ÑÐµÑÑÐ²Ð¾ ÑÐ¸ÑÑ Ð² Ð³ÑÑÐ¿Ð¿Ðµ", IDM_VIEW_GROUP, CHECKED + MENUITEM "ÐÑÑÐ¿Ð¿Ð¸ÑÐ¾Ð²Ð°ÑÑ &ÑÐ¸ÑÑÑ", IDM_VIEW_GROUP, CHECKED END POPUP "&Ð¡Ð¿ÑÐ°Ð²ÐºÐ°" BEGIN @@ -346,9 +346,9 @@ END POPUP "Ð&Ð¸Ð´" BEGIN - MENUITEM "ÐÐ±ÑÑÐ½ÑÐ¹", IDM_VIEW_STANDARD - MENUITEM "ÐÐ°ÑÑÐ½ÑÐ¹", IDM_VIEW_SCIENTIFIC - MENUITEM "ÐÑÐµÐ¾Ð±ÑÐ°Ð·Ð¾Ð²Ð°Ð½Ð¸Ðµ", IDM_VIEW_CONVERSION + MENUITEM "&ÐÐ±ÑÑÐ½ÑÐ¹", IDM_VIEW_STANDARD + MENUITEM "&ÐÐ½Ð¶ÐµÐ½ÐµÑÐ½ÑÐ¹", IDM_VIEW_SCIENTIFIC + MENUITEM "Ð&ÐµÑÐµÐ²Ð¾Ð´ Ð²ÐµÐ»Ð¸ÑÐ¸Ð½", IDM_VIEW_CONVERSION MENUITEM SEPARATOR MENUITEM "&Ð¨ÐµÑÑÐ½Ð°Ð´ÑÐ°ÑÐµÑÐ¸ÑÐ½ÑÐ¹\tF5", IDM_VIEW_HEX, CHECKED MENUITEM "&ÐÐµÑÑÑÐ¸ÑÐ½ÑÐ¹\tF6", IDM_VIEW_DEC, CHECKED @@ -360,7 +360,7 @@ MENUITEM "&2 Ð±Ð°Ð¹Ñ\tF3", IDM_VIEW_WORD, CHECKED MENUITEM "&1 Ð±Ð°Ð¹Ñ\tF4", IDM_VIEW_BYTE, CHECKED MENUITEM SEPARATOR - MENUITEM "ÐÐ¾Ð»Ð¸ÑÐµÑÑÐ²Ð¾ ÑÐ¸ÑÑ Ð² Ð³ÑÑÐ¿Ð¿Ðµ", IDM_VIEW_GROUP, CHECKED + MENUITEM "ÐÑÑÐ¿Ð¿Ð¸ÑÐ¾Ð²Ð°ÑÑ &ÑÐ¸ÑÑÑ", IDM_VIEW_GROUP, CHECKED END POPUP "&Ð¡Ð¿ÑÐ°Ð²ÐºÐ°" BEGIN @@ -372,18 +372,18 @@ IDR_MENU_STANDARD MENU BEGIN - POPUP "ÐÑÐ°Ð²ÐºÐ°" + POPUP "&ÐÑÐ°Ð²ÐºÐ°" BEGIN MENUITEM "&ÐÐ¾Ð¿Ð¸ÑÐ¾Ð²Ð°ÑÑ\tCTRL-C", IDM_EDIT_COPY MENUITEM "ÐÑÑ&Ð°Ð²Ð¸ÑÑ\tCTRL-V", IDM_EDIT_PASTE END POPUP "Ð&Ð¸Ð´" BEGIN - MENUITEM "ÐÐ±ÑÑÐ½ÑÐ¹", IDM_VIEW_STANDARD - MENUITEM "ÐÐ°ÑÑÐ½ÑÐ¹", IDM_VIEW_SCIENTIFIC - MENUITEM "ÐÑÐµÐ¾Ð±ÑÐ°Ð·Ð¾Ð²Ð°Ð½Ð¸Ðµ", IDM_VIEW_CONVERSION - MENUITEM SEPARATOR - MENUITEM "ÐÐ¾Ð»Ð¸ÑÐµÑÑÐ²Ð¾ ÑÐ¸ÑÑ Ð² Ð³ÑÑÐ¿Ð¿Ðµ", IDM_VIEW_GROUP, CHECKED + MENUITEM "&ÐÐ±ÑÑÐ½ÑÐ¹", IDM_VIEW_STANDARD + MENUITEM "&ÐÐ½Ð¶ÐµÐ½ÐµÑÐ½ÑÐ¹", IDM_VIEW_SCIENTIFIC + MENUITEM "Ð&ÐµÑÐµÐ²Ð¾Ð´ Ð²ÐµÐ»Ð¸ÑÐ¸Ð½", IDM_VIEW_CONVERSION + MENUITEM SEPARATOR + MENUITEM "ÐÑÑÐ¿Ð¿Ð¸ÑÐ¾Ð²Ð°ÑÑ &ÑÐ¸ÑÑÑ", IDM_VIEW_GROUP, CHECKED END POPUP "&Ð¡Ð¿ÑÐ°Ð²ÐºÐ°" BEGIN Modified: trunk/reactos/base/applications/cmdutils/reg/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/reg/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/reg/lang/ru-RU.rc [iso-8859-1] Thu Aug 25 10:22:26 2016 @@ -16,11 +16,11 @@ STRING_MISSING_HEXDATA, "ÐÑÐ¸Ð±ÐºÐ°: ÐÐ°Ð´Ð°Ð¹ÑÐµ Ð´Ð¾Ð¿ÑÑÑÐ¸Ð¼Ð¾Ðµ ÑÐµÑÑÐ½Ð°Ð´ÑÐ°ÑÐµÑÐ¸ÑÐ½Ð¾Ðµ Ð·Ð½Ð°ÑÐµÐ½Ð¸Ðµ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÐ° [/d]\n" STRING_UNHANDLED_TYPE, "reg: Unhandled registry data type [/t 0x%1!x!, /d %2]\n" STRING_OVERWRITE_VALUE, "ÐÐ°ÑÐ°Ð¼ÐµÑÑ '%1' ÑÐ¶Ðµ ÑÑÑÐµÑÑÐ²ÑÐµÑ. ÐÐ°Ð¼ÐµÐ½Ð¸ÑÑ?" - STRING_YESNO, " (Yes|No)" + STRING_YESNO, "(Y-Ð´Ð°/N-Ð½ÐµÑ)" STRING_YES, "Y" STRING_NO, "N" STRING_CANCELLED, "ÐÐ¿ÐµÑÐ°ÑÐ¸Ñ Ð¾ÑÐ¼ÐµÐ½ÐµÐ½Ð°\n" - STRING_DEFAULT_VALUE, "(ÐÐ¾ ÑÐ¼Ð¾Ð»ÑÐ°Ð½Ð¸Ñ)" + STRING_DEFAULT_VALUE, "(Ð¿Ð¾ ÑÐ¼Ð¾Ð»ÑÐ°Ð½Ð¸Ñ)" STRING_DELETE_VALUE, "Ð£Ð´Ð°Ð»Ð¸ÑÑ ÑÐ°Ð·Ð´ÐµÐ» ÑÐµÐµÑÑÑÐ° '%1' Ð±ÐµÐ· Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ÑÑÐ¸ Ð²Ð¾ÑÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ?" STRING_DELETE_VALUEALL, "Ð£Ð´Ð°Ð»Ð¸ÑÑ Ð²ÑÐµ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÑ Ð¸Ð· ÑÐ°Ð·Ð´ÐµÐ»Ð° ÑÐµÐµÑÑÑÐ° '%1'?" STRING_DELETE_SUBKEY, "Ð£Ð´Ð°Ð»Ð¸ÑÑ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑ ÑÐµÐµÑÑÑÐ° '%1' Ð±ÐµÐ· Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ÑÑÐ¸ Ð²Ð¾ÑÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ?" @@ -32,5 +32,5 @@ STRING_INVALID_OPTION, "ÐÑÐ¸Ð±ÐºÐ°: ÐÐµÐ´Ð¾Ð¿ÑÑÑÐ¸Ð¼ÑÐ¹ Ð°ÑÐ³ÑÐ¼ÐµÐ½Ñ Ð¸Ð»Ð¸ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑ [%1]. " STRING_REG_HELP, "ÐÐ²ÐµÐ´Ð¸ÑÐµ ""REG /?"" Ð´Ð»Ñ Ð¿Ð¾Ð»ÑÑÐµÐ½Ð¸Ñ ÑÐ¿ÑÐ°Ð²ÐºÐ¸ Ð¿Ð¾ Ð¸ÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°Ð½Ð¸Ñ..\n" STRING_FUNC_HELP, "ÐÐ²ÐµÐ´Ð¸ÑÐµ ""REG %1 /?"" Ð´Ð»Ñ Ð¿Ð¾Ð»ÑÑÐµÐ½Ð¸Ñ ÑÐ¿ÑÐ°Ð²ÐºÐ¸ Ð¿Ð¾ Ð¸ÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°Ð½Ð¸Ñ..\n" - STRING_VALUE_NOT_SET, "(value not set)" + STRING_VALUE_NOT_SET, "(Ð·Ð½Ð°ÑÐµÐ½Ð¸Ðµ Ð½Ðµ ÑÐºÐ°Ð·Ð°Ð½Ð¾)" } Modified: trunk/reactos/base/applications/magnify/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/magnify/… ============================================================================== --- trunk/reactos/base/applications/magnify/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/magnify/lang/ru-RU.rc [iso-8859-1] Thu Aug 25 10:22:26 2016 @@ -30,10 +30,10 @@ IDD_DIALOGOPTIONS DIALOGEX 0, 0, 185, 182 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "ÐÐ°ÑÐ°Ð¼ÐµÑÑÑ" +CAPTION "ÐÐ°ÑÐ°Ð¼ÐµÑÑÑ ÑÐºÑÐ°Ð½Ð½Ð¾Ð¹ Ð»ÑÐ¿Ñ" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - DEFPUSHBUTTON "Ð&ÑÑÐ¾Ð´", IDOK, 94, 158, 50, 14 + DEFPUSHBUTTON "&ÐÐ", IDOK, 94, 158, 50, 14 PUSHBUTTON "&Ð¡Ð¿ÑÐ°Ð²ÐºÐ°", IDC_BUTTON_HELP, 34, 158, 50, 14 LTEXT "&Ð£Ð²ÐµÐ»Ð¸ÑÐµÐ½Ð¸Ðµ:", IDC_STATIC, 6, 8, 68, 8 COMBOBOX IDC_ZOOM, 92, 6, 85, 66,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP Modified: trunk/reactos/base/applications/mplay32/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/ru-RU.rc [iso-8859-1] Thu Aug 25 10:22:26 2016 @@ -11,7 +11,7 @@ END POPUP "&ÐÐ¾ÑÐ¿ÑÐ¾Ð¸Ð·Ð²ÐµÐ´ÐµÐ½Ð¸Ðµ" BEGIN - MENUITEM "ÐÐ¾ÑÐ¿ÑÐ¾Ð¸Ð·Ð²ÐµÐ´ÐµÐ½Ð¸Ðµ/&ÐÐ°ÑÐ·Ð°\tCtrl+P", IDC_PLAY + MENUITEM "ÐÐ¾ÑÐ¿ÑÐ¾Ð¸Ð·Ð²ÐµÑÑÐ¸/&ÐÑÐ¸Ð¾ÑÑÐ°Ð½Ð¾Ð²Ð¸ÑÑ\tCtrl+P", IDC_PLAY MENUITEM "&ÐÑÑÐ°Ð½Ð¾Ð²Ð¸ÑÑ\tCtrl+S", IDC_STOP MENUITEM SEPARATOR MENUITEM "&ÐÐ¾Ð²ÑÐ¾Ñ\tCtrl+T", IDM_REPEAT Modified: trunk/reactos/base/applications/msconfig/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig/lang/ru-RU.rc [iso-8859-1] Thu Aug 25 10:22:26 2016 @@ -5,7 +5,7 @@ IDD_MSCONFIG_DIALOG DIALOGEX 0, 0, 378, 220 STYLE DS_SHELLFONT | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU -CAPTION "ÐÐ°ÑÑÑÐ¾Ð¹ÐºÐ¸ ÑÐ¸ÑÑÐµÐ¼Ñ" +CAPTION "ÐÐ°ÑÐ°Ð¼ÐµÑÑÑ ÑÐ¸ÑÑÐµÐ¼Ñ" FONT 8, "MS Shell Dlg" BEGIN CONTROL "Tab1", IDC_TAB, "SysTabControl32", WS_TABSTOP, 2, 2, 374, 195 @@ -125,7 +125,7 @@ STRINGTABLE BEGIN - IDS_MSCONFIG "ÐÐ°ÑÑÑÐ¾Ð¹ÐºÐ° ÑÐ¸ÑÑÐµÐ¼Ñ" + IDS_MSCONFIG "ÐÐ°ÑÐ°Ð¼ÐµÑÑÑ ÑÐ¸ÑÑÐµÐ¼Ñ" IDS_TAB_GENERAL "ÐÐ±ÑÐ¸Ðµ" IDS_TAB_SYSTEM "SYSTEM.INI" IDS_TAB_FREELDR "FREELDR.INI" Modified: trunk/reactos/base/applications/msconfig_new/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig_new/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig_new/lang/ru-RU.rc [iso-8859-1] Thu Aug 25 10:22:26 2016 @@ -4,11 +4,11 @@ IDD_ABOUTBOX DIALOGEX 0, 0, 229, 98 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Ð Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ðµ ÐÐ¾Ð½ÑÐ¸Ð³ÑÑÐ°ÑÐ¸Ñ ÑÐ¸ÑÑÐµÐ¼Ñ" +CAPTION "Ð Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ðµ ÐÐ°ÑÐ°Ð¼ÐµÑÑÑ ÑÐ¸ÑÑÐµÐ¼Ñ" FONT 8, "MS Shell Dlg" BEGIN ICON IDI_APPICON, IDC_STATIC, 14, 14, 20, 20 - LTEXT "ÐÐ¾Ð½ÑÐ¸Ð³ÑÑÐ°ÑÐ¸Ñ ÑÐ¸ÑÑÐµÐ¼Ñ\nÐÐµÑÑÐ¸Ñ 1.0", IDC_STATIC, 42, 14, 182, 17, SS_NOPREFIX + LTEXT "ÐÐ°ÑÐ°Ð¼ÐµÑÑÑ ÑÐ¸ÑÑÐµÐ¼Ñ\nÐÐµÑÑÐ¸Ñ 1.0", IDC_STATIC, 42, 14, 182, 17, SS_NOPREFIX // "Copyright (C) ReactOS Team 2005-"COPYRIGHT_YEAR"\n" LTEXT "Copyright (C) ReactOS Team 2005-2015\n\ Christoph von Wittich (Christoph(a)ApiViewer.de)\n\ @@ -187,7 +187,7 @@ IDD_REQUIRED_SERVICES_DISABLING_DIALOG DIALOGEX 0, 0, 237, 62 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "ÐÐ°ÑÑÑÐ¾Ð¹ÐºÐ¸ ÑÐ¸ÑÑÐµÐ¼Ñ" +CAPTION "ÐÐ°ÑÐ°Ð¼ÐµÑÑÑ ÑÐ¸ÑÑÐµÐ¼Ñ" FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "OK", IDOK, 180, 41, 50, 14 @@ -198,7 +198,7 @@ STRINGTABLE BEGIN - IDS_MSCONFIG "ÐÐ°ÑÑÑÐ¾Ð¹ÐºÐ¸ ÑÐ¸ÑÑÐµÐ¼Ñ" + IDS_MSCONFIG "ÐÐ°ÑÐ°Ð¼ÐµÑÑÑ ÑÐ¸ÑÑÐµÐ¼Ñ" IDS_MSCONFIG_2 "ÐÐ¾Ð½ÑÐ¸Ð³ÑÑÐ°ÑÐ¸Ñ ÑÐ¸ÑÑÐµÐ¼Ñ" IDS_ABOUT "&Ð Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ðµ...\tShift+F1" END Modified: trunk/reactos/base/applications/mscutils/servman/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/lang/ru-RU.rc [iso-8859-1] Thu Aug 25 10:22:26 2016 @@ -10,7 +10,7 @@ END POPUP "&ÐÐµÐ¹ÑÑÐ²Ð¸Ðµ" BEGIN - MENUITEM "&ÐÐ¾Ð´ÐºÐ»ÑÑÐ¸ÑÑÑÑ Ðº ...", ID_CONNECT, GRAYED + MENUITEM "&ÐÐ¾Ð´ÐºÐ»ÑÑÐ¸ÑÑÑÑ Ðº Ð´ÑÑÐ³Ð¾Ð¼Ñ ÐºÐ¾Ð¼Ð¿ÑÑÑÐµÑÑ...", ID_CONNECT, GRAYED MENUITEM SEPARATOR MENUITEM "ÐÐ°&Ð¿ÑÑÑÐ¸ÑÑ", ID_START, GRAYED MENUITEM "Ð&ÑÑÐ°Ð½Ð¾Ð²Ð¸ÑÑ", ID_STOP, GRAYED Modified: trunk/reactos/base/applications/mstsc/connectdialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/co… ============================================================================== --- trunk/reactos/base/applications/mstsc/connectdialog.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mstsc/connectdialog.c [iso-8859-1] Thu Aug 25 10:22:26 2016 @@ -1270,10 +1270,10 @@ txtRc.left = bmpRc.right / 4; txtRc.top = txtRc.bottom - 5; +#ifdef __REACTOS__ + txtRc.right = bmpRc.right * 4 / 5; +#else txtRc.right = bmpRc.right * 3 / 4; - txtRc.bottom = pInfo->headerbitmap.bmHeight * 9 / 10; - - if (LoadStringW(hInst, IDS_HEADERTEXT2, szBuffer, sizeof(szBuffer) / sizeof(WCHAR))) Modified: trunk/reactos/base/applications/mstsc/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/la… ============================================================================== --- trunk/reactos/base/applications/mstsc/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mstsc/lang/ru-RU.rc [iso-8859-1] Thu Aug 25 10:22:26 2016 @@ -9,23 +9,23 @@ GROUPBOX "ÐÐ°ÑÐ°Ð¼ÐµÑÑÑ Ð²ÑÐ¾Ð´Ð°", IDC_STATIC, 7, 7, 228, 89 GROUPBOX "ÐÐ°ÑÐ°Ð¼ÐµÑÑÑ Ð¿Ð¾Ð´ÐºÐ»ÑÑÐµÐ½Ð¸Ñ", IDC_STATIC, 7, 103, 228, 65 ICON "", IDC_LOGONICON, 15, 19, 20, 20 - LTEXT "ÐÐ²ÐµÐ´Ð¸ÑÐµ Ð°Ð´ÑÐµÑ ÑÐµÑÐ²ÐµÑÐ°.", IDC_STATIC, 47, 24, 100, 8 - LTEXT "Ð¡ÐµÑÐ²ÐµÑ:", IDC_STATIC, 52, 41, 31, 8 - LTEXT "ÐÐ¼Ñ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ:", IDC_STATIC, 15, 58, 67, 8 + LTEXT "ÐÐ²ÐµÐ´Ð¸ÑÐµ Ð¸Ð¼Ñ ÑÐ´Ð°Ð»ÐµÐ½Ð½Ð¾Ð³Ð¾ ÐºÐ¾Ð¼Ð¿ÑÑÑÐµÑÐ°.", IDC_STATIC, 47, 24, 160, 8 + LTEXT "ÐÐ¾Ð¼Ð¿ÑÑÑÐµÑ:", IDC_STATIC, 32, 41, 41, 8 + LTEXT "ÐÐ¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ:", IDC_STATIC, 32, 58, 67, 8 COMBOBOX IDC_SERVERCOMBO, 86, 39, 141, 13, CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP EDITTEXT IDC_NAMEEDIT, 86, 55, 141, 14, WS_TABSTOP | ES_AUTOHSCROLL PUSHBUTTON "Ð¡Ð¾ÑÑ&Ð°Ð½Ð¸ÑÑ", IDC_SAVE, 49, 139, 50, 14 PUSHBUTTON "Ð¡Ð¾&ÑÑÐ°Ð½Ð¸ÑÑ ÐºÐ°Ðº...", IDC_SAVEAS, 103, 139, 70, 14 PUSHBUTTON "&ÐÑÐºÑÑÑÑ...", IDC_OPEN, 177, 139, 50, 14 ICON "", IDC_CONNICON, 16, 114, 20, 20 - LTEXT "Ð¡Ð¾ÑÑÐ°Ð½ÐµÐ½Ð¸Ðµ ÑÐµÐºÑÑÐ¸Ñ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÐ¾Ð² Ð¿Ð¾Ð´ÐºÐ»ÑÑÐµÐ½Ð¸Ñ Ð² RDP-ÑÐ°Ð¹Ð» Ð¸Ð»Ð¸ Ð¾ÑÐºÑÑÑÐ¸Ðµ ÑÐ¾ÑÑÐ°Ð½ÐµÐ½Ð½Ð¾Ð³Ð¾ Ð¿Ð¾Ð´ÐºÐ»ÑÑÐµÐ½Ð¸Ñ.", IDC_STATIC, 50, 115, 172, 20 + LTEXT "Ð¡Ð¾ÑÑÐ°Ð½ÐµÐ½Ð¸Ðµ ÑÐµÐºÑÑÐ¸Ñ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÐ¾Ð² Ð¿Ð¾Ð´ÐºÐ»ÑÑÐµÐ½Ð¸Ñ Ð² RDP-ÑÐ°Ð¹Ð» Ð¸Ð»Ð¸ Ð¾ÑÐºÑÑÑÐ¸Ðµ ÑÐ¾ÑÑÐ°Ð½ÐµÐ½Ð½Ð¾Ð³Ð¾ Ð¿Ð¾Ð´ÐºÐ»ÑÑÐµÐ½Ð¸Ñ.", IDC_STATIC, 45, 115, 185, 20 END IDD_DISPLAY DIALOGEX 0, 0, 242, 175 STYLE DS_SHELLFONT | WS_CHILD FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - GROUPBOX "Ð Ð°Ð·Ð¼ÐµÑ ÑÐ´Ð°Ð»ÐµÐ½Ð½Ð¾Ð³Ð¾ ÑÐ°Ð±Ð¾ÑÐµÐ³Ð¾ ÑÑÐ¾Ð»Ð°", IDC_STATIC, 7, 7, 228, 68 + GROUPBOX "ÐÐ°ÑÑÑÐ¾Ð¹ÐºÐ° Ð¾ÑÐ¾Ð±ÑÐ°Ð¶ÐµÐ½Ð¸Ñ", IDC_STATIC, 7, 7, 228, 68 GROUPBOX "Ð¦Ð²ÐµÑÐ°", IDC_STATIC, 7, 83, 228, 85 ICON "", IDC_REMICON, 15, 19, 20, 20 ICON "", IDC_COLORSICON, 15, 98, 20, 20 @@ -44,7 +44,7 @@ CAPTION "ÐÐ¾Ð´ÐºÐ»ÑÑÐµÐ½Ð¸Ðµ Ðº ÑÐ´Ð°Ð»ÐµÐ½Ð½Ð¾Ð¼Ñ ÑÐ°Ð±Ð¾ÑÐµÐ¼Ñ ÑÑÐ¾Ð»Ñ" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - DEFPUSHBUTTON "Ð¡Ð¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ðµ", IDOK, 147, 256, 50, 14 + DEFPUSHBUTTON "ÐÐ¾Ð´ÐºÐ»ÑÑÐ¸ÑÑÑÑ", IDOK, 137, 256, 60, 14 PUSHBUTTON "ÐÑÐ¼ÐµÐ½Ð°", IDCANCEL, 203, 256, 50, 14 CONTROL "", IDC_TAB, "SysTabControl32", 0x0, 7, 50, 246, 190 END @@ -57,10 +57,10 @@ IDS_HIGHCOLOR15 "32,768 ÑÐ²ÐµÑÐ¾Ð² (15 Ð±Ð¸Ñ)" IDS_HIGHCOLOR16 "65,536 ÑÐ²ÐµÑÐ¾Ð² (16 Ð±Ð¸Ñ)" IDS_HIGHCOLOR24 "16,777,216 ÑÐ²ÐµÑÐ¾Ð² (24 Ð±Ð¸Ñ)" - IDS_HIGHCOLOR32 "ÐÐ°Ð¸Ð²ÑÑÑÐµÐµ ÐºÐ°ÑÐµÑÑÐ²Ð¾ (32 bit)" + IDS_HIGHCOLOR32 "ÐÐ°Ð¸Ð²ÑÑÑÐµÐµ ÐºÐ°ÑÐµÑÑÐ²Ð¾ (32 Ð±Ð¸Ñ)" IDS_PIXEL "%lu Ð½Ð° %lu Ð¿Ð¸ÐºÑÐµÐ»ÐµÐ¹" - IDS_FULLSCREEN "ÐÐ¾Ð»Ð½ÑÐ¹ ÑÐºÑÐ°Ð½" + IDS_FULLSCREEN "ÐÐ¾ Ð²ÐµÑÑ ÑÐºÑÐ°Ð½" IDS_BROWSESERVER "<Ð£ÐºÐ°Ð·Ð°ÑÑ Ð¿ÑÑÑ...>" - IDS_HEADERTEXT1 "Ð£Ð´Ð°Ð»ÐµÐ½Ð½ÑÐ¹ ÑÐ°Ð±Ð¾ÑÐ¸Ð¹ ÑÑÐ¾Ð»" - IDS_HEADERTEXT2 "Ð¡Ð¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ðµ" + IDS_HEADERTEXT1 "ÐÐ¾Ð´ÐºÐ»ÑÑÐµÐ½Ð¸Ðµ Ðº ÑÐ´Ð°Ð»ÐµÐ½Ð½Ð¾Ð¼Ñ" + IDS_HEADERTEXT2 "ÑÐ°Ð±Ð¾ÑÐµÐ¼Ñ ÑÑÐ¾Ð»Ñ" END Modified: trunk/reactos/base/applications/taskmgr/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/ru-RU.rc [iso-8859-1] Thu Aug 25 10:22:26 2016 @@ -430,13 +430,13 @@ IDS_MSG_PROCESSONEPRO "ÐÑÐ¾ÑÐµÑÑ Ð´Ð¾Ð»Ð¶ÐµÐ½ Ð¸Ð¼ÐµÑÑ Ð´Ð¾ÑÑÑÐ¿ Ð¿Ð¾ ÐºÑÐ°Ð¹Ð½ÐµÐ¹ Ð¼ÐµÑÐµ Ðº Ð¾Ð´Ð½Ð¾Ð¼Ñ Ð¿ÑÐ¾ÑÐµÑÑÐ¾ÑÑ." IDS_MSG_INVALIDOPTION "ÐÐµÐ¿ÑÐ°Ð²Ð¸Ð»ÑÐ½ÑÐµ Ð½Ð°ÑÑÑÐ¾Ð¹ÐºÐ¸" IDS_MSG_UNABLEDEBUGPROCESS "ÐÑÐ»Ð°Ð´ÐºÐ° Ð¿ÑÐ¾ÑÐµÑÑÐ° Ð½ÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð°" - IDS_MSG_WARNINGDEBUG "ÐÐÐÐÐÐÐÐ: ÐÑÐ»Ð°Ð´ÐºÐ° ÑÑÐ¾Ð³Ð¾ Ð¿ÑÐ¾ÑÐµÑÑÐ° Ð¼Ð¾Ð¶ÐµÑ Ð·Ð°ÐºÐ¾Ð½ÑÐ¸ÑÑÑÑ Ð¿Ð¾ÑÐµÑÐµÐ¹ Ð´Ð°Ð½Ð½ÑÑ.\nÐÑ ÑÐ²ÐµÑÐµÐ½Ñ, ÑÑÐ¾ Ð¼Ð¾Ð¶Ð½Ð¾ Ð¿ÑÐ¾Ð´Ð¾Ð»Ð¶Ð°ÑÑ?" - IDS_MSG_TASKMGRWARNING "ÐÑÐ¸Ð±ÐºÐ° ÐÐµÐ½ÐµÐ´Ð¶ÐµÑÐ° Ð·Ð°Ð´Ð°Ñ" - IDS_MSG_WARNINGTERMINATING "ÐÐÐÐÐÐÐÐ: ÐÐ°Ð²ÐµÑÑÐµÐ½Ð¸Ðµ Ð¿ÑÐ¾ÑÐµÑÑÐ° Ð¼Ð¾Ð¶ÐµÑ Ð¿Ð¾Ð²Ð»ÐµÑÑ Ð½ÐµÑÑÑÐ¾Ð¹ÑÐ¸Ð²ÑÑ ÑÐ°Ð±Ð¾ÑÑ ÑÐ¸ÑÑÐµÐ¼Ñ Ð¸ Ð¿Ð¾ÑÐµÑÑ Ð´Ð°Ð½Ð½ÑÑ\nÐ¡Ð¾ÑÑÐ°Ð½Ð¸ÑÐµ Ð²Ð°Ð¶Ð½ÑÐµ Ð´Ð°Ð½Ð½ÑÐµ Ð¿ÐµÑÐµÐ´ Ð¿ÑÐ¾Ð´Ð¾Ð»Ð¶ÐµÐ½Ð¸ÐµÐ¼.\nÐÑÐ¾Ð´Ð¾Ð»Ð¶Ð¸ÑÑ Ð·Ð°Ð²ÐµÑÑÐµÐ½Ð¸Ðµ Ð¿ÑÐ¾ÑÐµÑÑÐ°?" + IDS_MSG_WARNINGDEBUG "ÐÐÐÐÐÐÐÐ! ÐÑÐ»Ð°Ð´ÐºÐ° ÑÑÐ¾Ð³Ð¾ Ð¿ÑÐ¾ÑÐµÑÑÐ° Ð¼Ð¾Ð¶ÐµÑ Ð·Ð°ÐºÐ¾Ð½ÑÐ¸ÑÑÑÑ Ð¿Ð¾ÑÐµÑÐµÐ¹ Ð´Ð°Ð½Ð½ÑÑ.\nÐÑ ÑÐ²ÐµÑÐµÐ½Ñ, ÑÑÐ¾ Ð¼Ð¾Ð¶Ð½Ð¾ Ð¿ÑÐ¾Ð´Ð¾Ð»Ð¶Ð°ÑÑ?" + IDS_MSG_TASKMGRWARNING "ÐÑÐµÐ´ÑÐ¿ÑÐµÐ¶Ð´ÐµÐ½Ð¸Ðµ Ð´Ð¸ÑÐ¿ÐµÑÑÐµÑÐ° Ð·Ð°Ð´Ð°Ñ" + IDS_MSG_WARNINGTERMINATING "ÐÐÐÐÐÐÐÐ! ÐÐ°Ð²ÐµÑÑÐµÐ½Ð¸Ðµ Ð¿ÑÐ¾ÑÐµÑÑÐ° Ð¼Ð¾Ð¶ÐµÑ Ð¿ÑÐ¸Ð²ÐµÑÑÐ¸ Ðº Ð½ÐµÐ¶ÐµÐ»Ð°ÑÐµÐ»ÑÐ½ÑÐ¼ ÑÐµÐ·ÑÐ»ÑÑÐ°ÑÐ°Ð¼, Ð² ÑÐ¾Ð¼ ÑÐ¸ÑÐ»Ðµ Ðº Ð¿Ð¾ÑÐµÑÐµ Ð´Ð°Ð½Ð½ÑÑ Ð¸Ð»Ð¸ Ðº Ð½ÐµÑÑÐ°Ð±Ð¸Ð»ÑÐ½Ð¾Ð¹ ÑÐ°Ð±Ð¾ÑÐµ ÑÐ¸ÑÑÐµÐ¼Ñ.\nÐÑ Ð´ÐµÐ¹ÑÑÐ²Ð¸ÑÐµÐ»ÑÐ½Ð¾ ÑÐ¾ÑÐ¸ÑÐµ Ð·Ð°Ð²ÐµÑÑÐ¸ÑÑ Ð¿ÑÐ¾ÑÐµÑÑ?" IDS_MSG_UNABLETERMINATEPRO "ÐÐµ ÑÐ´Ð°Ð»Ð¾ÑÑ Ð·Ð°Ð²ÐµÑÑÐ¸ÑÑ Ð¿ÑÐ¾ÑÐµÑÑ" IDS_MSG_CLOSESYSTEMPROCESS "ÐÑÐ¾ ÐºÑÐ¸ÑÐ¸ÑÐµÑÐºÐ¸Ð¹ ÑÐ¸ÑÑÐµÐ¼Ð½ÑÐ¹ Ð¿ÑÐ¾ÑÐµÑÑ. ÐÐ¸ÑÐ¿ÐµÑÑÐµÑ Ð·Ð°Ð´Ð°Ñ Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ ÐµÐ³Ð¾ Ð·Ð°Ð²ÐµÑÑÐ¸ÑÑ." IDS_MSG_UNABLECHANGEPRIORITY "ÐÐµ ÑÐ´Ð°Ð»Ð¾ÑÑ Ð¸Ð·Ð¼ÐµÐ½Ð¸ÑÑ Ð¿ÑÐ¸Ð¾ÑÐ¸ÑÐµÑ" - IDS_MSG_WARNINGCHANGEPRIORITY "ÐÐÐÐÐÐÐÐ: ÐÐ·Ð¼ÐµÐ½ÐµÐ½Ð¸Ðµ Ð¿ÑÐ¸Ð¾ÑÐ¸ÑÐµÑÐ° ÑÑÐ¾Ð³Ð¾ Ð¿ÑÐ¾ÑÐµÑÑÐ° Ð¼Ð¾Ð¶ÐµÑ Ð¿ÑÐ¸Ð²ÐµÑÑÐ¸ Ðº Ð½ÐµÐ¶ÐµÐ»Ð°ÑÐµÐ»ÑÐ½ÑÐ¼ ÑÐµÐ·ÑÐ»ÑÑÐ°ÑÐ°Ð¼, Ð² ÑÐ¾Ð¼ ÑÐ¸ÑÐ»Ðµ Ðº Ð½ÐµÑÑÐ°Ð±Ð¸Ð»ÑÐ½Ð¾Ð¹ ÑÐ°Ð±Ð¾ÑÐµ ÑÐ¸ÑÑÐµÐ¼Ñ.\nÐÑ Ð´ÐµÐ¹ÑÑÐ²Ð¸ÑÐµÐ»ÑÐ½Ð¾ ÑÐ¾ÑÐ¸ÑÐµ Ð¸Ð·Ð¼ÐµÐ½Ð¸ÑÑ ÐºÐ»Ð°ÑÑ Ð¿ÑÐ¸Ð¾ÑÐ¸ÑÐµÑÐ°?" + IDS_MSG_WARNINGCHANGEPRIORITY "ÐÐÐÐÐÐÐÐ! ÐÐ·Ð¼ÐµÐ½ÐµÐ½Ð¸Ðµ ÐºÐ»Ð°ÑÑÐ° Ð¿ÑÐ¸Ð¾ÑÐ¸ÑÐµÑÐ° ÑÑÐ¾Ð³Ð¾ Ð¿ÑÐ¾ÑÐµÑÑÐ° Ð¼Ð¾Ð¶ÐµÑ Ð¿ÑÐ¸Ð²ÐµÑÑÐ¸ Ðº Ð½ÐµÐ¶ÐµÐ»Ð°ÑÐµÐ»ÑÐ½ÑÐ¼ ÑÐµÐ·ÑÐ»ÑÑÐ°ÑÐ°Ð¼, Ð² ÑÐ¾Ð¼ ÑÐ¸ÑÐ»Ðµ Ðº Ð½ÐµÑÑÐ°Ð±Ð¸Ð»ÑÐ½Ð¾Ð¹ ÑÐ°Ð±Ð¾ÑÐµ ÑÐ¸ÑÑÐµÐ¼Ñ.\nÐÑ Ð´ÐµÐ¹ÑÑÐ²Ð¸ÑÐµÐ»ÑÐ½Ð¾ ÑÐ¾ÑÐ¸ÑÐµ Ð¸Ð·Ð¼ÐµÐ½Ð¸ÑÑ ÐºÐ»Ð°ÑÑ Ð¿ÑÐ¸Ð¾ÑÐ¸ÑÐµÑÐ°?" IDS_MSG_TRAYICONCPUUSAGE "ÐÐ°Ð³ÑÑÐ·ÐºÐ° Ð¦Ð: %d%%" IDS_STATUS_MEMUSAGE "ÐÑÐ´ÐµÐ»ÐµÐ½Ð¸Ðµ Ð¿Ð°Ð¼ÑÑÐ¸: %s / %s (%d%%)" IDS_STATUS_CPUUSAGE "ÐÐ°Ð³ÑÑÐ·ÐºÐ° Ð¦Ð: %3d%%" Modified: trunk/reactos/base/applications/winhlp32/lang/Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/lang/Ru.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lang/Ru.rc [iso-8859-1] Thu Aug 25 10:22:26 2016 @@ -41,7 +41,7 @@ POPUP "&ÐÐ°ÐºÐ»Ð°Ð´ÐºÐ°" { MENUITEM "&ÐÐ¿ÑÐµÐ´ÐµÐ»Ð¸ÑÑ...", MNID_BKMK_DEFINE } - POPUP "&ÐÐ°ÑÑÑÐ¾Ð¹ÐºÐ¸" { + POPUP "&ÐÐ°ÑÐ°Ð¼ÐµÑÑÑ" { MENUITEM "ÐÑÐµÐ³Ð´Ð° &ÑÐ²ÐµÑÑÑ", MNID_HELP_HELPTOP MENUITEM "ÐÑÑÐ¾ÑÐ¸Ñ", MNID_OPTS_HISTORY POPUP "&Ð¨ÑÐ¸ÑÑ" Modified: trunk/reactos/base/system/userinit/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/lang/… ============================================================================== --- trunk/reactos/base/system/userinit/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/userinit/lang/ru-RU.rc [iso-8859-1] Thu Aug 25 10:22:26 2016 @@ -10,7 +10,7 @@ COMBOBOX IDC_LANGUAGELIST, 132, 107, 176, 142, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP RTEXT "Ð Ð°ÑÐºÐ»Ð°Ð´ÐºÐ° ÐºÐ»Ð°Ð²Ð¸Ð°ÑÑÑÑ:", IDC_STATIC, 20, 132, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP COMBOBOX IDC_LAYOUTLIST, 132, 130, 176, 81, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP - LTEXT "ÐÑÐ±ÐµÑÐ¸ÑÐµ ÑÐ·ÑÐº Ð¸ ÑÐ°ÑÐºÐ»Ð°Ð´ÐºÑ ÐºÐ»Ð°Ð²Ð¸Ð°ÑÑÑÑ Ð¸ Ð½Ð°Ð¶Ð¼Ð¸ÑÐµ ÐºÐ½Ð¾Ð¿ÐºÑ ÐÐ°Ð»ÐµÐµ Ð´Ð»Ñ Ð¿ÑÐ¾Ð´Ð¾Ð»Ð¶ÐµÐ½Ð¸Ñ.", IDC_STATIC, 7, 152, 300, 8 + LTEXT "ÐÑÐ±ÐµÑÐ¸ÑÐµ ÑÐ·ÑÐº Ð¸ ÑÐ°ÑÐºÐ»Ð°Ð´ÐºÑ ÐºÐ»Ð°Ð²Ð¸Ð°ÑÑÑÑ, Ð¸ Ð½Ð°Ð¶Ð¼Ð¸ÑÐµ ÐÐ°Ð»ÐµÐµ, ÑÑÐ¾Ð±Ñ Ð¿ÑÐ¾Ð´Ð¾Ð»Ð¶Ð¸ÑÑ.", IDC_STATIC, 7, 152, 300, 8 GROUPBOX "", IDC_STATIC, 0, 165, 317, 1 DEFPUSHBUTTON "&ÐÐ°Ð»ÐµÐµ", IDOK, 205, 172, 50, 14 @@ -23,7 +23,7 @@ FONT 8, "MS Shell Dlg" BEGIN CONTROL "IDB_LOGO", IDC_STARTLOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99 - DEFPUSHBUTTON "ÐÐ°Ð¿ÑÑÑÐ¸ÑÑ ReactOS Ð² ÑÐµÐ¶Ð¸Ð¼Ðµ &Live CD", IDC_RUN, 71, 102, 175, 21 + DEFPUSHBUTTON "ÐÐ°Ð¿ÑÑÑÐ¸ÑÑ ReactOS &Live CD", IDC_RUN, 71, 102, 175, 21 PUSHBUTTON "&Ð£ÑÑÐ°Ð½Ð¾Ð²Ð¸ÑÑ ReactOS", IDC_INSTALL, 71, 130, 175, 21 LTEXT "", IDC_STATIC, 7, 152, 300, 8 Modified: trunk/reactos/boot/freeldr/fdebug/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/fdebug/lang/r… ============================================================================== --- trunk/reactos/boot/freeldr/fdebug/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/fdebug/lang/ru-RU.rc [iso-8859-1] Thu Aug 25 10:22:26 2016 @@ -50,9 +50,9 @@ CAPTION "ÐÐ°ÑÑÑÐ¾Ð¹ÐºÐ¸ ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ñ" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "ÐÐ²ÐµÐ´Ð¸ÑÐµ COM-Ð¿Ð¾ÑÑ (Ð½Ð°Ð¿Ñ. COM1):", IDC_STATIC, 7, 7, 108, 8 + LTEXT "COM-Ð¿Ð¾ÑÑ (Ð½Ð°Ð¿Ñ. COM1):", IDC_STATIC, 7, 7, 108, 8 EDITTEXT IDC_COMPORT, 7, 17, 182, 14, ES_AUTOHSCROLL - LTEXT "ÐÐ²ÐµÐ´Ð¸ÑÐµ ÑÐºÐ¾ÑÐ¾ÑÑÑ Ð¿ÐµÑÐµÐ´Ð°ÑÐ¸ (Ð½Ð°Ð¿Ñ. 115200):", IDC_STATIC, 7, 38, 114, 8 + LTEXT "Ð¡ÐºÐ¾ÑÐ¾ÑÑÑ Ð¿ÐµÑÐµÐ´Ð°ÑÐ¸ (Ð½Ð°Ð¿Ñ. 115200):", IDC_STATIC, 7, 38, 114, 8 EDITTEXT IDC_BAUTRATE, 7, 48, 182, 14, ES_AUTOHSCROLL DEFPUSHBUTTON "OK", IDOK, 45, 79, 50, 14 PUSHBUTTON "ÐÑÐ¼ÐµÐ½Ð°", IDCANCEL, 100, 79, 50, 14 Modified: trunk/reactos/dll/cpl/appwiz/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/ru-RU.… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/appwiz/lang/ru-RU.rc [iso-8859-1] Thu Aug 25 10:22:26 2016 @@ -58,7 +58,7 @@ CAPTION "Ð£ÑÑÐ°Ð½Ð¾Ð²ÑÐ¸Ðº Wine Gecko" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "ReactOS Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ Ð½Ð°Ð¹ÑÐ¸ Wine Gecko Ð¿Ð°ÐºÐµÑ, ÐºÐ¾ÑÐ¾ÑÑÐ¹ Ð½ÐµÐ¾Ð±ÑÐ¾Ð´Ð¸Ð¼ Ð´Ð»Ñ Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ð¹ Ñ Ð¿Ð¾Ð´Ð´ÐµÑÐ¶ÐºÐ¾Ð¹ HTML, ÑÑÐ¾Ð±Ñ ÑÐ°Ð±Ð¾ÑÐ°ÑÑ Ð¿ÑÐ°Ð²Ð¸Ð»ÑÐ½Ð¾. ReactOS Ð¼Ð¾Ð¶ÐµÑ Ð°Ð²ÑÐ¾Ð¼Ð°ÑÐ¸ÑÐµÑÐºÐ¸ Ð·Ð°Ð³ÑÑÐ·Ð¸ÑÑ Ð¸ ÑÑÑÐ°Ð½Ð°Ð²Ð¸ÑÑ ÐµÐµ Ð´Ð»Ñ Ð²Ð°Ñ.", + CONTROL "ReactOS Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ Ð½Ð°Ð¹ÑÐ¸ Wine Gecko Ð¿Ð°ÐºÐµÑ, ÐºÐ¾ÑÐ¾ÑÑÐ¹ Ð½ÐµÐ¾Ð±ÑÐ¾Ð´Ð¸Ð¼ Ð´Ð»Ñ Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ð¹ Ñ Ð¿Ð¾Ð´Ð´ÐµÑÐ¶ÐºÐ¾Ð¹ HTML, ÑÑÐ¾Ð±Ñ ÑÐ°Ð±Ð¾ÑÐ°ÑÑ Ð¿ÑÐ°Ð²Ð¸Ð»ÑÐ½Ð¾. ReactOS Ð¼Ð¾Ð¶ÐµÑ Ð°Ð²ÑÐ¾Ð¼Ð°ÑÐ¸ÑÐµÑÐºÐ¸ Ð·Ð°Ð³ÑÑÐ·Ð¸ÑÑ Ð¸ ÑÑÑÐ°Ð½Ð¾Ð²Ð¸ÑÑ ÐµÐ³Ð¾ Ð´Ð»Ñ Ð²Ð°Ñ.", ID_DWL_STATUS, "SysLink", 0, 10, 10, 240, 65 CONTROL "", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER | PBS_SMOOTH, 10, 40, 240, 12 DEFPUSHBUTTON "&Ð£ÑÑÐ°Ð½Ð¾Ð²Ð¸ÑÑ", ID_DWL_INSTALL, 200, 76, 50, 14, WS_GROUP | WS_TABSTOP Modified: trunk/reactos/dll/win32/browseui/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/lang/ru… ============================================================================== --- trunk/reactos/dll/win32/browseui/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/lang/ru-RU.rc [iso-8859-1] Thu Aug 25 10:22:26 2016 @@ -36,8 +36,8 @@ BEGIN MENUITEM "", -1, MFT_SEPARATOR END - MENUITEM "Ð¡ÑÑÐ¾ÐºÐ° &ÑÐ¾ÑÑÐ¾ÑÐ½Ð¸Ñ", IDM_VIEW_STATUSBAR - POPUP "&ÐÐ°Ð½ÐµÐ»Ð¸ Ð¾Ð±Ð¾Ð·ÑÐµÐ²Ð°ÑÐµÐ»Ñ", IDM_VIEW_EXPLORERBAR + MENUITEM "&Ð¡ÑÑÐ¾ÐºÐ° ÑÐ¾ÑÑÐ¾ÑÐ½Ð¸Ñ", IDM_VIEW_STATUSBAR + POPUP "ÐÐ°&Ð½ÐµÐ»Ð¸ Ð¾Ð±Ð¾Ð·ÑÐµÐ²Ð°ÑÐµÐ»Ñ", IDM_VIEW_EXPLORERBAR BEGIN MENUITEM "&ÐÐ¾Ð¸ÑÐº\tCtrl+E", IDM_EXPLORERBAR_SEARCH MENUITEM "&ÐÐ·Ð±ÑÐ°Ð½Ð½Ð¾Ðµ\tCtrl+I", IDM_EXPLORERBAR_FAVORITES @@ -47,30 +47,30 @@ MENUITEM "", IDM_EXPLORERBAR_SEPARATOR END MENUITEM "", FCIDM_MENU_VIEW_SEP_OPTIONS, MFT_SEPARATOR - POPUP "Ð&ÐµÑÐµÑÐ¾Ð´", FCIDM_MENU_EXPLORE + POPUP "ÐÐµÑÐµ&ÑÐ¾Ð´", FCIDM_MENU_EXPLORE BEGIN MENUITEM "&ÐÐ°Ð·Ð°Ð´\tAlt+Ð¡ÑÑÐµÐ»ÐºÐ° Ð²Ð»ÐµÐ²Ð¾", IDM_GOTO_BACK MENUITEM "&ÐÐ¿ÐµÑÐµÐ´\tAlt+Ð¡ÑÑÐµÐ»ÐºÐ° Ð²Ð¿ÑÐ°Ð²Ð¾", IDM_GOTO_FORWARD - MENUITEM "&ÐÐ²ÐµÑÑ", IDM_GOTO_UPONELEVEL + MENUITEM "ÐÐ° Ð¾Ð´Ð¸Ð½ ÑÑÐ¾Ð²ÐµÐ½&Ñ Ð²Ð²ÐµÑÑ", IDM_GOTO_UPONELEVEL MENUITEM "", -1, MFT_SEPARATOR - MENUITEM "&ÐÐ¾Ð¼Ð¾Ð¹\tAlt+Home", IDM_GOTO_HOMEPAGE + MENUITEM "ÐÐ¾Ð¼Ð°&ÑÐ½ÑÑ ÑÑÑÐ°Ð½Ð¸ÑÐ°\tAlt+Home", IDM_GOTO_HOMEPAGE END - MENUITEM "&ÐÐ±Ð½Ð¾Ð²Ð¸ÑÑ", IDM_VIEW_REFRESH - END - POPUP "Ð&Ð·Ð±ÑÐ°Ð½Ð½Ð¾Ðµ", FCIDM_MENU_FAVORITES + MENUITEM "Ð&Ð±Ð½Ð¾Ð²Ð¸ÑÑ", IDM_VIEW_REFRESH + END + POPUP "&ÐÐ·Ð±ÑÐ°Ð½Ð½Ð¾Ðµ", FCIDM_MENU_FAVORITES BEGIN MENUITEM "&ÐÐ¾Ð±Ð°Ð²Ð¸ÑÑ Ð² Ð¸Ð·Ð±ÑÐ°Ð½Ð½Ð¾Ðµ...", IDM_FAVORITES_ADDTOFAVORITES MENUITEM "&Ð£Ð¿Ð¾ÑÑÐ´Ð¾ÑÐ¸ÑÑ Ð¸Ð·Ð±ÑÐ°Ð½Ð½Ð¾Ðµ...", IDM_FAVORITES_ORGANIZEFAVORITES MENUITEM "", -1, MFT_SEPARATOR MENUITEM "(Ð¿ÑÑÑÐ¾)", IDM_FAVORITES_EMPTY END - POPUP "&Ð¡ÐµÑÐ²Ð¸Ñ", FCIDM_MENU_TOOLS - BEGIN - MENUITEM "ÐÐ¾Ð´ÐºÐ»ÑÑÐ¸ÑÑ &ÑÐµÑÐµÐ²Ð¾Ð¹ Ð´Ð¸ÑÐº...", IDM_TOOLS_MAPNETWORKDRIVE - MENUITEM "&ÐÑÐºÐ»ÑÑÐ¸ÑÑ ÑÐµÑÐµÐ²Ð¾Ð¹ Ð´Ð¸ÑÐº...", IDM_TOOLS_DISCONNECTNETWORKDRIVE - MENUITEM "&Ð¡Ð¸Ð½ÑÑÐ¾Ð½Ð¸Ð·Ð¸ÑÐ¾Ð²Ð°ÑÑ...", IDM_TOOLS_SYNCHRONIZE - MENUITEM "", -1, MFT_SEPARATOR - MENUITEM "&Ð¡Ð²Ð¾Ð¹ÑÑÐ²Ð° Ð¿Ð°Ð¿ÐºÐ¸ ...", IDM_TOOLS_FOLDEROPTIONS + POPUP "Ð¡&ÐµÑÐ²Ð¸Ñ", FCIDM_MENU_TOOLS + BEGIN + MENUITEM "ÐÐ¾Ð´ÐºÐ»Ñ&ÑÐ¸ÑÑ ÑÐµÑÐµÐ²Ð¾Ð¹ Ð´Ð¸ÑÐº...", IDM_TOOLS_MAPNETWORKDRIVE + MENUITEM "ÐÑÐº&Ð»ÑÑÐ¸ÑÑ ÑÐµÑÐµÐ²Ð¾Ð¹ Ð´Ð¸ÑÐº...", IDM_TOOLS_DISCONNECTNETWORKDRIVE + MENUITEM "Ð¡Ð¸Ð½&ÑÑÐ¾Ð½Ð¸Ð·Ð¸ÑÐ¾Ð²Ð°ÑÑ...", IDM_TOOLS_SYNCHRONIZE + MENUITEM "", -1, MFT_SEPARATOR + MENUITEM "Ð¡Ð²Ð¾Ð¹ÑÑÐ²Ð° Ð¿&Ð°Ð¿ÐºÐ¸ ...", IDM_TOOLS_FOLDEROPTIONS END POPUP "&Ð¡Ð¿ÑÐ°Ð²ÐºÐ°", FCIDM_MENU_HELP BEGIN @@ -279,6 +279,6 @@ STRINGTABLE BEGIN IDS_LEGAL_URL, "https://www.reactos.org/joining/faqs" - IDS_SORRY_CAPTION, "Sorry" - IDS_SORRY_MESSAGE, "ReactOS could not browse to '%s' (error 0x%lx).\nPlease make sure there is a web browser installed." -END + IDS_SORRY_CAPTION, "ÐÐ·Ð²Ð¸Ð½Ð¸ÑÐµ" + IDS_SORRY_MESSAGE, "ReactOS Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ Ð¾ÑÐºÑÑÑÑ '%s' (error 0x%lx).\nÐÐ¾Ð¶Ð°Ð»ÑÐ¹ÑÑÐ° ÑÐ±ÐµÐ´Ð¸ÑÐµÑÑ Ð² ÑÐ¾Ð¼, ÑÑÐ¾ Ð±ÑÐ°ÑÐ·ÐµÑ ÑÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½." +END 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] Thu Aug 25 10:22:26 2016 @@ -44,7 +44,7 @@ IDD_PROPSHEET DIALOGEX 0, 0, 220, 140 STYLE DS_SHELLFONT | DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "Ð¡Ð²Ð¾Ð¹ÑÑÐ²Ð° %s" +CAPTION "Ð¡Ð²Ð¾Ð¹ÑÑÐ²Ð°: %s" FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "ÐÐ", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP 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] Thu Aug 25 10:22:26 2016 @@ -29,7 +29,7 @@ Ð¥Ð¾ÑÐ¸ÑÐµ Ð»Ð¸ Ð²Ñ ÐµÐ³Ð¾ ÑÐ¾Ð·Ð´Ð°ÑÑ?" IDS_OVERWRITEFILE "Ð¤Ð°Ð¹Ð» ÑÐ¶Ðµ ÑÑÑÐµÑÑÐ²ÑÐµÑ.\n\ ÐÐ°Ð¼ÐµÐ½Ð¸ÑÑ ÐµÐ³Ð¾?" - IDS_INVALID_FILENAME_TITLE "ÐÐµÐºÐ¾ÑÑÐµÐºÑÐ½ÑÐ¹ ÑÐ¸Ð¼Ð²Ð¾Ð» Ð² Ð·Ð°Ð¿Ð¸ÑÐ¸ Ð¿ÑÑÐ¸" + IDS_INVALID_FILENAME_TITLE "ÐÐµÐºÐ¾ÑÑÐµÐºÑÐ½ÑÐ¹ ÑÐ¸Ð¼Ð²Ð¾Ð»(Ñ) Ð² Ð·Ð°Ð¿Ð¸ÑÐ¸ Ð¿ÑÑÐ¸" IDS_INVALID_FILENAME "ÐÐ¼Ñ ÑÐ°Ð¹Ð»Ð° Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ ÑÐ¾Ð´ÐµÑÐ¶Ð°ÑÑ ÑÐ»ÐµÐ´ÑÑÑÐ¸Ðµ ÑÐ¸Ð¼Ð²Ð¾Ð»Ñ:\n\ / : < > |" IDS_PATHNOTEXISTING "ÐÑÑÑ Ð½Ðµ ÑÑÑÐµÑÑÐ²ÑÐµÑ" @@ -53,10 +53,10 @@ PD32_VALUE_UREADABLE "ÐÐµÑÐ¸ÑÐ°ÐµÐ¼ÑÐ¹ ÑÐ»ÐµÐ¼ÐµÐ½Ñ" PD32_INVALID_PAGE_RANGE "ÐÑÐ¾ Ð·Ð½Ð°ÑÐµÐ½Ð¸Ðµ Ð½Ðµ Ð»ÐµÐ¶Ð¸Ñ Ð²Ð½ÑÑÑÐ¸ Ð´Ð¸Ð°Ð¿Ð°Ð·Ð¾Ð½Ð° ÑÑÑÐ°Ð½Ð¸Ñ.\n\ ÐÐ²ÐµÐ´Ð¸ÑÐµ Ð·Ð½Ð°ÑÐµÐ½Ð¸Ðµ Ð¼ÐµÐ¶Ð´Ñ %1!%d! Ð¸ %2!d!." - PD32_FROM_NOT_ABOVE_TO "ÐÐ½Ð°ÑÐµÐ½Ð¸Ðµ 'Ð¾Ñ' Ð½Ðµ Ð´Ð¾Ð»Ð¶Ð½Ð¾ Ð¿ÑÐµÐ²ÑÑÐ°ÑÑ Ð·Ð½Ð°ÑÐµÐ½Ð¸Ñ 'Ð´Ð¾'." + PD32_FROM_NOT_ABOVE_TO "ÐÐ½Ð°ÑÐµÐ½Ð¸Ðµ ""Ð¾Ñ"" Ð½Ðµ Ð´Ð¾Ð»Ð¶Ð½Ð¾ Ð¿ÑÐµÐ²ÑÑÐ°ÑÑ Ð·Ð½Ð°ÑÐµÐ½Ð¸Ñ ""Ð´Ð¾""." PD32_MARGINS_OVERLAP "ÐÑÐ°Ð½Ð¸ÑÑ Ð¿ÐµÑÐµÐºÑÑÐ²Ð°ÑÑ Ð¸Ð»Ð¸ Ð¿ÑÐµÐ²ÑÑÐ°ÑÑ ÑÐ°Ð·Ð¼ÐµÑÑ Ð±ÑÐ¼Ð°Ð³Ð¸.\n\ ÐÐ²ÐµÐ´Ð¸ÑÐµ Ð¸Ñ Ð·Ð°Ð½Ð¾Ð²Ð¾." - PD32_NR_OF_COPIES_EMPTY "Ð§Ð¸ÑÐ»Ð¾ ÐºÐ¾Ð¿Ð¸Ð¹ Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ Ð±ÑÑÑ Ð¿ÑÑÑÑÐ¼." + PD32_NR_OF_COPIES_EMPTY "ÐÐ¾Ð»Ðµ ""Ð§Ð¸ÑÐ»Ð¾ ÐºÐ¾Ð¿Ð¸Ð¹"" Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ Ð±ÑÑÑ Ð¿ÑÑÑÑÐ¼." PD32_TOO_LARGE_COPIES "Ð¢Ð°ÐºÐ¾Ðµ Ð±Ð¾Ð»ÑÑÐ¾Ðµ ÐºÐ¾Ð»Ð¸ÑÐµÑÑÐ²Ð¾ ÐºÐ¾Ð¿Ð¸Ð¹ Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ Ð±ÑÑÑ Ð½Ð°Ð¿ÐµÑÐ°ÑÐ°Ð½Ð¾ Ð²Ð°ÑÐ¸Ð¼ Ð¿ÑÐ¸Ð½ÑÐµÑÐ¾Ð¼.\n\ ÐÐ²ÐµÐ´Ð¸ÑÐµ Ð·Ð½Ð°ÑÐµÐ½Ð¸Ðµ Ð¾Ñ 1 Ð´Ð¾ %d." PD32_PRINT_ERROR "ÐÑÐ¾Ð¸Ð·Ð¾ÑÐ»Ð° Ð¾ÑÐ¸Ð±ÐºÐ° Ð¿ÑÐ¸Ð½ÑÐµÑÐ°." 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] Thu Aug 25 10:22:26 2016 @@ -314,10 +314,10 @@ IDS_HINT_RES_BY_CONN " ÐÐ¾ÐºÐ°Ð·ÑÐ²Ð°ÐµÑ ÑÐµÑÑÑÑÑ, Ð¾ÑÑÐ¾ÑÑÐ¸ÑÐ¾Ð²Ð°Ð½Ð½ÑÐµ Ð¿Ð¾ Ð¿Ð¾Ð´ÐºÐ»ÑÑÐµÐ½Ð¸Ñ." IDS_HINT_SHOW_HIDDEN " ÐÐ¾ÐºÐ°Ð·ÑÐ²Ð°ÐµÑ ÑÐ´Ð°Ð»ÐµÐ½Ð½ÑÐµ Ð¸Ð· ÑÐ¸ÑÑÐµÐ¼Ñ Ð¸ ÑÑÑÐ°ÑÐµÐ²ÑÐ¸Ðµ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð°." - IDS_HINT_SYS_RESTORE " ÐÐ¾ÑÑÑÐ°Ð½Ð¾Ð²Ð¸ÑÑ Ð¾ÐºÐ½Ð¾ Ðº ÐµÐ³Ð¾ Ð½Ð¾ÑÐ¼Ð°Ð»ÑÐ½Ð¾Ð¼Ñ ÑÐ°Ð·Ð¼ÐµÑÑ." - IDS_HINT_SYS_MOVE " ÐÐµÑÐµÐ¼ÐµÑÑÐ¸ÑÑ Ð¾ÐºÐ½Ð¾." - IDS_HINT_SYS_SIZE " ÐÐ·Ð¼ÐµÐ½Ð¸ÑÑ ÑÐ°Ð·Ð¼ÐµÑ ÑÑÐ¾Ð³Ð¾ Ð¾ÐºÐ½Ð°." - IDS_HINT_SYS_MINIMIZE " Ð¡Ð²ÐµÑÐ½ÑÑÑ Ð¾ÐºÐ½Ð¾." - IDS_HINT_SYS_MAXIMIZE " Ð Ð°Ð·Ð²ÐµÑÐ½ÑÑÑ Ð¾ÐºÐ½Ð¾." - IDS_HINT_SYS_CLOSE " ÐÐ°ÐºÑÑÑÑ Ð¾ÐºÐ½Ð¾." -END + IDS_HINT_SYS_RESTORE " ÐÐ¾ÑÑÑÐ°Ð½Ð°Ð²Ð»Ð¸Ð²Ð°ÐµÑ ÑÐ°Ð·Ð¼ÐµÑ ÑÑÐ¾Ð³Ð¾ Ð¾ÐºÐ½Ð°." + IDS_HINT_SYS_MOVE " ÐÐµÑÐµÐ¼ÐµÑÐ°ÐµÑ ÑÑÐ¾ Ð¾ÐºÐ½Ð¾." + IDS_HINT_SYS_SIZE " ÐÐ·Ð¼ÐµÐ½ÑÐµÑ ÑÐ°Ð·Ð¼ÐµÑ ÑÑÐ¾Ð³Ð¾ Ð¾ÐºÐ½Ð°." + IDS_HINT_SYS_MINIMIZE " Ð¡Ð²Ð¾ÑÐ°ÑÐ¸Ð²Ð°ÐµÑ ÑÑÐ¾ Ð¾ÐºÐ½Ð¾ Ð² Ð¿Ð°Ð½ÐµÐ»Ñ Ð·Ð°Ð´Ð°Ñ." + IDS_HINT_SYS_MAXIMIZE " Ð Ð°Ð·Ð²Ð¾ÑÐ°ÑÐ¸Ð²Ð°ÐµÑ ÑÑÐ¾ Ð¾ÐºÐ½Ð¾ Ð½Ð° Ð²ÐµÑÑ ÑÐºÑÐ°Ð½." + IDS_HINT_SYS_CLOSE " ÐÐ°ÐºÑÑÐ²Ð°ÐµÑ ÑÑÐ¾ Ð¾ÐºÐ½Ð¾." +END Modified: trunk/reactos/dll/win32/shell32/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ru-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ru-RU.rc [iso-8859-1] Thu Aug 25 10:22:26 2016 @@ -7,7 +7,7 @@ MENUITEM "&ÐÐ¾Ð»ÑÑÐ¸Ðµ Ð·Ð½Ð°ÑÐºÐ¸", FCIDM_SHVIEW_BIGICON MENUITEM "&ÐÐµÐ»ÐºÐ¸Ðµ Ð·Ð½Ð°ÑÐºÐ¸", FCIDM_SHVIEW_SMALLICON MENUITEM "&Ð¡Ð¿Ð¸ÑÐ¾Ðº", FCIDM_SHVIEW_LISTVIEW - MENUITEM "&ÐÐ¾Ð´ÑÐ¾Ð±Ð½Ð¾", FCIDM_SHVIEW_REPORTVIEW + MENUITEM "&Ð¢Ð°Ð±Ð»Ð¸ÑÐ°", FCIDM_SHVIEW_REPORTVIEW END /* shellview background menu */ @@ -20,7 +20,7 @@ MENUITEM "&ÐÐ¾Ð»ÑÑÐ¸Ðµ Ð·Ð½Ð°ÑÐºÐ¸", FCIDM_SHVIEW_BIGICON MENUITEM "&ÐÐµÐ»ÐºÐ¸Ðµ Ð·Ð½Ð°ÑÐºÐ¸", FCIDM_SHVIEW_SMALLICON MENUITEM "&Ð¡Ð¿Ð¸ÑÐ¾Ðº", FCIDM_SHVIEW_LISTVIEW - MENUITEM "&ÐÐ¾Ð´ÑÐ¾Ð±Ð½Ð¾", FCIDM_SHVIEW_REPORTVIEW + MENUITEM "&Ð¢Ð°Ð±Ð»Ð¸ÑÐ°", FCIDM_SHVIEW_REPORTVIEW END MENUITEM SEPARATOR POPUP "Ð£Ð¿Ð¾ÑÑÐ´Ð¾ÑÐ¸ÑÑ &Ð·Ð½Ð°ÑÐºÐ¸" @@ -121,7 +121,7 @@ IDD_ABOUT DIALOGEX 0, 0, 275, 198 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Ð Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ðµ %s" +CAPTION "%s: ÑÐ²ÐµÐ´ÐµÐ½Ð¸Ñ" FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 @@ -133,7 +133,7 @@ LTEXT ")", IDC_STATIC, 153, 65, 5, 10 LTEXT "Copyright 1998-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 - LTEXT " ÐÐ¾Ð¼Ð°Ð½Ð´Ð° ReactOS\0", IDC_STATIC, 105, 75, 60, 10 + LTEXT " ÐÐ¾Ð¼Ð°Ð½Ð´Ð° ReactOS\0", IDC_STATIC, 105, 75, 65, 10 LTEXT "", IDC_ABOUT_OTHERSTUFF, 35, 90, 180, 20 LTEXT "ÐÐ°Ð½Ð½Ð°Ñ Ð²ÐµÑÑÐ¸Ñ ReactOS Ð·Ð°ÑÐµÐ³Ð¸ÑÑÑÐ¸ÑÐ¾Ð²Ð°Ð½Ð° Ð½Ð°:", IDC_STATIC, 35, 115, 180, 10 LTEXT "", IDC_ABOUT_REG_USERNAME, 45, 125, 180, 10 @@ -643,7 +643,7 @@ IDS_SHV_COLUMN5 "ÐÑÑÐ¸Ð±ÑÑÑ" IDS_SHV_COLUMN6 "ÐÐ¾Ð»Ð½ÑÐ¹ Ð¾Ð±ÑÐµÐ¼" IDS_SHV_COLUMN7 "Ð¡Ð²Ð¾Ð±Ð¾Ð´Ð½Ð¾" - IDS_SHV_COLUMN8 "ÐÐ¼Ñ" + IDS_SHV_COLUMN8 "ÐÐ°Ð·Ð²Ð°Ð½Ð¸Ðµ" IDS_SHV_COLUMN9 "ÐÐ¾Ð¼Ð¼ÐµÐ½ÑÐ°ÑÐ¸Ð¹" IDS_SHV_COLUMN10 "ÐÐ»Ð°Ð´ÐµÐ»ÐµÑ" IDS_SHV_COLUMN11 "ÐÑÑÐ¿Ð¿Ð°" @@ -671,7 +671,7 @@ IDS_VIEW_LARGE "&ÐÐ¾Ð»ÑÑÐ¸Ðµ Ð·Ð½Ð°ÑÐºÐ¸" IDS_VIEW_SMALL "&ÐÐµÐ»ÐºÐ¸Ðµ Ð·Ð½Ð°ÑÐºÐ¸" IDS_VIEW_LIST "&Ð¡Ð¿Ð¸ÑÐ¾Ðº" - IDS_VIEW_DETAILS "&ÐÐ¾Ð´ÑÐ¾Ð±Ð½Ð¾" + IDS_VIEW_DETAILS "&Ð¢Ð°Ð±Ð»Ð¸ÑÐ°" IDS_SELECT "&ÐÑÐ±ÑÐ°ÑÑ" IDS_OPEN "&ÐÑÐºÑÑÑÑ" IDS_CREATELINK "Ð¡Ð¾Ð·Ð´Ð°ÑÑ &ÑÑÐ»ÑÐº" @@ -722,8 +722,8 @@ IDS_PROGRAMS "ÐÐ»Ð°Ð²Ð½Ð¾Ðµ Ð¼ÐµÐ½Ñ\\ÐÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ñ" IDS_PERSONAL "ÐÐ¾Ð¸ Ð´Ð¾ÐºÑÐ¼ÐµÐ½ÑÑ" IDS_FAVORITES "ÐÐ·Ð±ÑÐ°Ð½Ð½Ð¾Ðµ" - IDS_STARTUP "ÐÐ»Ð°Ð²Ð½Ð¾Ðµ Ð¼ÐµÐ½Ñ\\ÐÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ñ\\ÐÐ²ÑÐ¾Ð·Ð°Ð¿ÑÑÐº" - IDS_RECENT "ÐÐµÐ´Ð°Ð²Ð½ÐµÐµ" + IDS_STARTUP "ÐÐ»Ð°Ð²Ð½Ð¾Ðµ Ð¼ÐµÐ½Ñ\\ÐÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ñ\\ÐÐ²ÑÐ¾Ð·Ð°Ð³ÑÑÐ·ÐºÐ°" + IDS_RECENT "ÐÐµÐ´Ð°Ð²Ð½Ð¸Ðµ Ð´Ð¾ÐºÑÐ¼ÐµÐ½ÑÑ" IDS_SENDTO "ÐÑÐ¿ÑÐ°Ð²Ð¸ÑÑ" IDS_STARTMENU "ÐÐ»Ð°Ð²Ð½Ð¾Ðµ Ð¼ÐµÐ½Ñ" IDS_MYMUSIC "ÐÐ¾Ð¸ Ð´Ð¾ÐºÑÐ¼ÐµÐ½ÑÑ\\ÐÐ¾Ñ Ð¼ÑÐ·ÑÐºÐ°" @@ -776,7 +776,7 @@ IDS_PICK_ICON_FILTER "Ð¤Ð°Ð¹Ð»Ñ Ð·Ð½Ð°ÑÐºÐ¾Ð² (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0ÐÑÐµ ÑÐ°Ð¹Ð»Ñ (*.*)\0*.*\0" IDS_OPEN_WITH_FILTER "ÐÑÐ¿Ð¾Ð»Ð½ÑÐµÐ¼ÑÐµ ÑÐ°Ð¹Ð»Ñ (*.exe)\0*.exe\0ÐÑÐµ ÑÐ°Ð¹Ð»Ñ (*.*)\0*.*\0" - IDS_DIRECTORY "ÐÐ°Ð¿ÐºÐ°" + IDS_DIRECTORY "ÐÐ°Ð¿ÐºÐ° Ñ ÑÐ°Ð¹Ð»Ð°Ð¼Ð¸" IDS_BAT_FILE "ÐÐ°ÐºÐµÑÐ½ÑÐ¹ ÑÐ°Ð¹Ð» ReactOS" IDS_CMD_FILE "ÐÐ¾Ð¼Ð°Ð½Ð´Ð½ÑÐ¹ ÑÐºÑÐ¸Ð¿Ñ ReactOS" IDS_COM_FILE "ÐÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ DOS" @@ -828,6 +828,6 @@ IDS_EXE_DESCRIPTION "ÐÐ¿Ð¸ÑÐ°Ð½Ð¸Ðµ:" IDS_MENU_EMPTY "(Ð¿ÑÑÑÐ¾)" - IDS_OBJECTS "ÐÐ»ÐµÐ¼ÐµÐ½ÑÐ¾Ð²: %d" - IDS_OBJECTS_SELECTED "ÐÑÐ±ÑÐ°Ð½Ð¾ ÑÐ»ÐµÐ¼ÐµÐ½ÑÐ¾Ð²: %d" -END + IDS_OBJECTS "ÐÐ±ÑÐµÐºÑÐ¾Ð²: %d" + IDS_OBJECTS_SELECTED "ÐÑÐ´ÐµÐ»ÐµÐ½Ð¾ Ð¾Ð±ÑÐµÐºÑÐ¾Ð²: %d" +END Modified: trunk/reactos/media/rapps/cstalin.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/cstalin.txt?re… ============================================================================== --- trunk/reactos/media/rapps/cstalin.txt [iso-8859-1] (original) +++ trunk/reactos/media/rapps/cstalin.txt [iso-8859-1] Thu Aug 25 10:22:26 2016 @@ -21,7 +21,7 @@ Size = 261,0 Mio [Section.0419] -Description = "ÑÐ¾Ð²ÐµÑÑÐºÐ°Ñ" ÑÑÑÐ°ÑÐµÐ³Ð¸Ñ ÑÐµÐ°Ð»ÑÐ½Ð¾Ð³Ð¾ Ð²ÑÐµÐ¼ÐµÐ½Ð¸ Ð¾ÑÐ½Ð¾Ð²Ð°Ð½Ð½Ð°Ñ Ð½Ð° Boswars. (Ð°ÑÑÐ¸Ð²) +Description = "Ð¡Ð¾Ð²ÐµÑÑÐºÐ°Ñ" ÑÑÑÐ°ÑÐµÐ³Ð¸Ñ ÑÐµÐ°Ð»ÑÐ½Ð¾Ð³Ð¾ Ð²ÑÐµÐ¼ÐµÐ½Ð¸ Ð¾ÑÐ½Ð¾Ð²Ð°Ð½Ð½Ð°Ñ Ð½Ð° Boswars. ÐÐ°Ð¼ Ð¿Ð¾Ð½Ð°Ð´Ð¾Ð±Ð¸ÑÑÑ Ð°ÑÑÐ¸Ð²Ð°ÑÐ¾Ñ, ÑÑÐ¾Ð±Ñ ÑÐ°ÑÐ¿Ð°ÐºÐ¾Ð²Ð°ÑÑ Ð¸Ð³ÑÑ. URLSite = http://commanderstalin.sourceforge.net/cstalin_rus_index.html Size = 261,0 MiB

1 0

[vmikayelyan] 72453: Fix for copypasta done in "usb: HUB: Add PnP state tracking"(r72388)
by vmikayelyan＠svn.reactos.org 25 Aug '16

25 Aug '16

Author: vmikayelyan Date: Thu Aug 25 10:13:11 2016 New Revision: 72453 URL: http://svn.reactos.org/svn/reactos?rev=72453&view=rev Log: Fix for copypasta done in "usb: HUB: Add PnP state tracking"(r72388) Modified: branches/GSoC_2016/USB/drivers/usb/usbhub/usbhub.h Modified: branches/GSoC_2016/USB/drivers/usb/usbhub/usbhub.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/USB/drivers/usb/usbhu… ============================================================================== --- branches/GSoC_2016/USB/drivers/usb/usbhub/usbhub.h [iso-8859-1] (original) +++ branches/GSoC_2016/USB/drivers/usb/usbhub/usbhub.h [iso-8859-1] Thu Aug 25 10:13:11 2016 @@ -62,7 +62,7 @@ (Data).PreviousPnPState = NotStarted; #define SET_NEW_PNP_STATE(Data, state) \ -(Data).PnPState = (Data).PnPState;\ +(Data).PreviousPnPState = (Data).PnPState;\ (Data).PnPState = (state); #define RESTORE_PREVIOUS_PNP_STATE(Data) \

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs