Ros-diffs May 2014

ros-diffs@reactos.org

14 participants
437 discussions

[dreimer] 63373: [TRANSLATION] Small improvement of Russian translation CORE-7994 #resolve #comment Committed, thanks for help.

by dreimer＠svn.reactos.org

Author: dreimer Date: Mon May 19 18:00:47 2014 New Revision: 63373 URL: http://svn.reactos.org/svn/reactos?rev=63373&view=rev Log: [TRANSLATION] Small improvement of Russian translation CORE-7994 #resolve #comment Committed, thanks for help. Added: trunk/reactos/base/applications/sndrec32/lang/ru-RU.rc (with props) Modified: trunk/reactos/base/applications/cacls/lang/ru-RU.rc trunk/reactos/base/applications/dxdiag/lang/ru-RU.rc trunk/reactos/base/applications/fontview/lang/ru-RU.rc trunk/reactos/base/applications/mplay32/lang/ru-RU.rc trunk/reactos/base/applications/regedit/lang/ru-RU.rc trunk/reactos/base/applications/shutdown/lang/ru-RU.rc trunk/reactos/base/applications/sndrec32/rsrc.rc trunk/reactos/base/applications/sndvol32/lang/ru-RU.rc trunk/reactos/base/setup/reactos/lang/ru-RU.rc trunk/reactos/base/shell/explorer-new/lang/ru-RU.rc trunk/reactos/dll/cpl/desk/lang/ru-RU.rc trunk/reactos/dll/cpl/mmsys/lang/ru-RU.rc trunk/reactos/dll/win32/aclui/lang/ru-RU.rc Modified: trunk/reactos/base/applications/cacls/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cacls/la… ============================================================================== --- trunk/reactos/base/applications/cacls/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cacls/lang/ru-RU.rc [iso-8859-1] Mon May 19 18:00:47 2014 @@ -2,7 +2,7 @@ STRINGTABLE BEGIN - IDS_HELP "ÐÑÐ¾Ð±ÑÐ°Ð¶Ð°ÐµÑ Ð¸Ð»Ð¸ Ð¸Ð·Ð¼ÐµÐ½ÑÐµÑ ÑÐ¿Ð¸ÑÐºÐ¸ Ð´Ð¾ÑÑÑÐ¿Ð° (ACLs) Ðº ÑÐ°Ð¹Ð»Ð°Ð¼\n\n\ + IDS_HELP "ÐÑÐ¾Ð±ÑÐ°Ð¶Ð°ÐµÑ Ð¸Ð»Ð¸ Ð¸Ð·Ð¼ÐµÐ½ÑÐµÑ ÑÐ¿Ð¸ÑÐºÐ¸ Ð´Ð¾ÑÑÑÐ¿Ð° (Access Control Lists, ACLs) Ðº ÑÐ°Ð¹Ð»Ð°Ð¼\n\n\ CACLS Ð¸Ð¼Ñ_Ð¤Ð°Ð¹Ð»Ð° [/T] [/E] [/C] [/G Ð¸Ð¼Ñ:Ð¿ÑÐ°Ð²Ð¾ [...]] [/R Ð¸Ð¼Ñ [...]]\n\ [/P Ð¸Ð¼Ñ:Ð¿ÑÐ°Ð²Ð¾[...]] [/D Ð¸Ð¼Ñ [...]]\n\ Ð¸Ð¼Ñ_ÑÐ°Ð¹Ð»Ð° ÐÑÐ²Ð¾Ð´ ÑÐ¿Ð¸ÑÐºÐ¾Ð² ACL.\n\ @@ -27,11 +27,11 @@ Ð ÐºÐ¾Ð¼Ð°Ð½Ð´Ðµ Ð¼Ð¾Ð¶Ð½Ð¾ Ð¸ÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÑ ÑÐ°Ð±Ð»Ð¾Ð½Ñ Ð´Ð»Ñ Ð¾Ð±ÑÐ°Ð±Ð¾ÑÐºÐ¸ Ð±Ð¾Ð»ÐµÐµ Ð¾Ð´Ð½Ð¾Ð³Ð¾ ÑÐ°Ð¹Ð»Ð°.\n\ Ð ÐºÐ¾Ð¼Ð°Ð½Ð´Ðµ Ð¼Ð¾Ð¶Ð½Ð¾ ÑÐºÐ°Ð·ÑÐ²Ð°ÑÑ Ð±Ð¾Ð»ÐµÐµ Ð¾Ð´Ð½Ð¾Ð³Ð¾ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ.\n\n\ Ð¡Ð¾ÐºÑÐ°ÑÐµÐ½Ð¸Ñ:\n\ - CI - ÐÐ°ÑÐ»ÐµÐ´Ð¾Ð²Ð°Ð½Ð¸Ðµ ÐºÐ¾Ð½ÑÐµÐ¹Ð½ÐµÑÐ°Ð¼Ð¸.\n\ + CI - ÐÐ°ÑÐ»ÐµÐ´Ð¾Ð²Ð°Ð½Ð¸Ðµ ÐºÐ¾Ð½ÑÐµÐ¹Ð½ÐµÑÐ°Ð¼Ð¸ (Container Inherit).\n\ ACE Ð±ÑÐ´ÐµÑ ÑÐ½Ð°ÑÐ»ÐµÐ´Ð¾Ð²Ð°Ð½ Ð¿Ð°Ð¿ÐºÐ°Ð¼Ð¸.\n\ - OI - ÐÐ°ÑÐ»ÐµÐ´Ð¾Ð²Ð°Ð½Ð¸Ðµ Ð¾Ð±ÑÐµÐºÑÐ°Ð¼Ð¸.\n\ + OI - ÐÐ°ÑÐ»ÐµÐ´Ð¾Ð²Ð°Ð½Ð¸Ðµ Ð¾Ð±ÑÐµÐºÑÐ°Ð¼Ð¸ (Object Inherit).\n\ ACE Ð±ÑÐ´ÐµÑ ÑÐ½Ð°ÑÐ»ÐµÐ´Ð¾Ð²Ð°Ð½ ÑÐ°Ð¹Ð»Ð°Ð¼Ð¸.\n\ - IO - Ð¢Ð¾Ð»ÑÐºÐ¾ Ð½Ð°ÑÐ»ÐµÐ´Ð¾Ð²Ð°Ð½Ð½Ð¾Ðµ.\n\ + IO - Ð¢Ð¾Ð»ÑÐºÐ¾ Ð½Ð°ÑÐ»ÐµÐ´Ð¾Ð²Ð°Ð½Ð½Ð¾Ðµ (Inherit Only).\n\ ACE Ð½Ðµ Ð±ÑÐ´ÐµÑ Ð¿ÑÐ¸Ð¼ÐµÐ½ÑÐ½ Ðº Ð´Ð°Ð½Ð½Ð¾Ð¼Ñ ÑÐ°Ð¹Ð»Ñ/Ð¿Ð°Ð¿ÐºÐµ.\n" IDS_ABBR_CI "(CI)" IDS_ABBR_OI "(OI)" Modified: trunk/reactos/base/applications/dxdiag/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… ============================================================================== --- trunk/reactos/base/applications/dxdiag/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/lang/ru-RU.rc [iso-8859-1] Mon May 19 18:00:47 2014 @@ -207,15 +207,15 @@ IDS_REG_FAIL "ÐÑÐ¸Ð±ÐºÐ°" IDS_DDTEST_ERROR "Ð¡Ð±Ð¾Ð¹ Ð² Ð¿ÑÐ¾Ð²ÐµÑÐºÐµ!" IDS_DDTEST_DESCRIPTION "ÐÑÐ´ÐµÑ Ð¿ÑÐ¾Ð¸Ð·Ð²ÐµÐ´ÐµÐ½Ð° Ð¿ÑÐ¾Ð²ÐµÑÐºÐ° DirecDraw Ð½Ð° ÑÑÐ¾Ð¼ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ðµ. ÐÑÐ¾Ð´Ð¾Ð»Ð¶Ð¸ÑÑ?" - IDS_DDPRIMARY_DESCRIPTION "This test will use DirectDraw to draw on primary surface. Black and white rectangles should be drawn. ÐÑÐ¾Ð´Ð¾Ð»Ð¶Ð¸ÑÑ?" + IDS_DDPRIMARY_DESCRIPTION "Ð ÑÑÐ¾Ð¼ ÑÐµÑÑÐµ Ð±ÑÐ´ÐµÑ Ð¿ÑÐ¾Ð²ÐµÑÐµÐ½Ð° Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ÑÑÑ ÑÐ¸ÑÐ¾Ð²Ð°Ð½Ð¸Ñ DirectDraw Ð½Ð° Ð¾ÑÐ½Ð¾Ð²Ð½Ð¾Ð¹ Ð¿Ð¾Ð²ÐµÑÑÐ½Ð¾ÑÑÐ¸ ÑÐºÑÐ°Ð½Ð°. ÐÐ¾Ð»Ð¶Ð½Ñ Ð±ÑÑÑ Ð²Ð¸Ð´Ð½Ñ ÑÐµÑÐ½ÑÐµ Ð¸ Ð±ÐµÐ»ÑÐµ Ð¿ÑÑÐ¼Ð¾ÑÐ³Ð¾Ð»ÑÐ½Ð¸ÐºÐ¸. ÐÑÐ¾Ð´Ð¾Ð»Ð¶Ð¸ÑÑ?" IDS_DDPRIMARY_RESULT "ÐÑ Ð²Ð¸Ð´ÐµÐ»Ð¸ ÑÐµÑÐ½ÑÐµ Ð¸ Ð±ÐµÐ»ÑÐµ Ð¿ÑÑÐ¼Ð¾ÑÐ³Ð¾Ð»ÑÐ½Ð¸ÐºÐ¸?" - IDS_DDOFFSCREEN_DESCRIPTION "This test will use DirectDraw to draw in an offscreen buffer. Moving white rectangle should be drawn. ÐÑÐ¾Ð´Ð¾Ð»Ð¶Ð¸ÑÑ?" - IDS_DDOFFSCREEN_RESULT "ÐÑ Ð²Ð¸Ð´ÐµÐ»Ð¸ Ð¿ÐµÑÐµÐ¼ÐµÑÐ°ÑÑÐ¸Ð¹ÑÑ Ð±ÐµÐ»ÑÐ¹ Ð¿ÑÑÐ¼Ð¾ÑÐ³Ð¾Ð»ÑÐ½Ð¸Ðº?" - IDS_DDFULLSCREEN_DESCRIPTION "This test will use DirectDraw to draw in a fullscreen mode. Moving white rectangle should be drawn. ÐÑÐ¾Ð´Ð¾Ð»Ð¶Ð¸ÑÑ?" - IDS_DDFULLSCREEN_RESULT "ÐÑ Ð²Ð¸Ð´ÐµÐ»Ð¸ Ð±ÐµÐ»ÑÐ¹ Ð¿ÐµÑÐµÐ¼ÐµÑÐ°ÑÑÐ¸Ð¹ÑÑ Ð¿ÑÑÐ¼Ð¾ÑÐ³Ð¾Ð»ÑÐ½Ð¸Ðº Ð² Ð¿Ð¾Ð»Ð½Ð¾ÑÐºÑÐ°Ð½Ð½Ð¾Ð¼ ÑÐµÐ¶Ð¸Ð¼Ðµ?" + IDS_DDOFFSCREEN_DESCRIPTION "Ð ÑÑÐ¾Ð¼ ÑÐµÑÑÐµ Ð±ÑÐ´ÐµÑ Ð¿ÑÐ¾Ð²ÐµÑÐµÐ½Ð° Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ÑÑÑ ÑÐ¸ÑÐ¾Ð²Ð°Ð½Ð¸Ñ DirectDraw Ð½Ð° Ð·Ð°ÐºÐ°Ð´ÑÐ¾Ð²Ð¾Ð¹ Ð¿Ð¾Ð²ÐµÑÑÐ½Ð¾ÑÑÐ¸ ÑÐºÑÐ°Ð½Ð°. ÐÐ¾Ð»Ð¶ÐµÐ½ Ð±ÑÑÑ Ð²Ð¸Ð´ÐµÐ½ Ð´Ð²Ð¸Ð³Ð°ÑÑÐ¸Ð¹ÑÑ Ð±ÐµÐ»ÑÐ¹ ÐºÐ²Ð°Ð´ÑÐ°ÑÐ¸Ðº. ÐÑÐ¾Ð´Ð¾Ð»Ð¶Ð¸ÑÑ?" + IDS_DDOFFSCREEN_RESULT "ÐÑ Ð²Ð¸Ð´ÐµÐ»Ð¸ Ð´Ð²Ð¸Ð³Ð°ÑÑÐ¸Ð¹ÑÑ Ð±ÐµÐ»ÑÐ¹ ÐºÐ²Ð°Ð´ÑÐ°ÑÐ¸Ðº?" + IDS_DDFULLSCREEN_DESCRIPTION "Ð ÑÑÐ¾Ð¼ ÑÐµÑÑÐµ Ð±ÑÐ´ÐµÑ Ð¿ÑÐ¾Ð²ÐµÑÐµÐ½Ð° Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ÑÑÑ ÑÐ¸ÑÐ¾Ð²Ð°Ð½Ð¸Ñ DirectDraw Ð² Ð¿Ð¾Ð»Ð½Ð¾ÑÐºÑÐ°Ð½Ð½Ð¾Ð¼ ÑÐµÐ¶Ð¸Ð¼Ðµ. ÐÐ¾Ð»Ð¶ÐµÐ½ Ð±ÑÑÑ Ð²Ð¸Ð´ÐµÐ½ Ð´Ð²Ð¸Ð³Ð°ÑÑÐ¸Ð¹ÑÑ Ð±ÐµÐ»ÑÐ¹ ÐºÐ²Ð°Ð´ÑÐ°ÑÐ¸Ðº. ÐÑÐ¾Ð´Ð¾Ð»Ð¶Ð¸ÑÑ?" + IDS_DDFULLSCREEN_RESULT "ÐÑ Ð²Ð¸Ð´ÐµÐ»Ð¸ Ð±ÐµÐ»ÑÐ¹ Ð´Ð²Ð¸Ð³Ð°ÑÑÐ¸Ð¹ÑÑ ÐºÐ²Ð°Ð´ÑÐ°ÑÐ¸Ðº Ð² Ð¿Ð¾Ð»Ð½Ð¾ÑÐºÑÐ°Ð½Ð½Ð¾Ð¼ ÑÐµÐ¶Ð¸Ð¼Ðµ?" IDS_FORMAT_ADAPTER_MEM "%u ÐÐ±" IDS_FORMAT_ADAPTER_MODE "%04u x %04u (%u Ð±Ð¸Ñ)(%uÐÑ)" IDS_OPTION_NO "ÐÐµÑ" - IDS_D3DTEST_DESCRIPTION "This will start Direct3D interface test. Continue?" - IDS_D3DTEST_D3Dx "This test will use hardware-accelerated Direct3D %u interface." -END + IDS_D3DTEST_DESCRIPTION "ÐÑÐ´ÐµÑ Ð¿ÑÐ¾Ð¸Ð·Ð²ÐµÐ´ÐµÐ½Ð° Ð¿ÑÐ¾Ð²ÐµÑÐºÐ° Direct3D Ð½Ð° ÑÑÐ¾Ð¼ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ðµ. ÐÑÐ¾Ð´Ð¾Ð»Ð¶Ð¸ÑÑ?" + IDS_D3DTEST_D3Dx "ÐÑÐ¾Ñ ÑÐµÑÑ Ð±ÑÐ´ÐµÑ Ð¸ÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÑ Ð¸Ð½ÑÐµÑÑÐµÐ¹Ñ Direct3D %u Ñ Ð°Ð¿Ð¿Ð°ÑÐ°ÑÐ½ÑÐ¼ ÑÑÐºÐ¾ÑÐµÐ½Ð¸ÐµÐ¼." +END Modified: trunk/reactos/base/applications/fontview/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview… ============================================================================== --- trunk/reactos/base/applications/fontview/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/fontview/lang/ru-RU.rc [iso-8859-1] Mon May 19 18:00:47 2014 @@ -4,10 +4,10 @@ STRINGTABLE BEGIN - IDS_INSTALL "Install" + IDS_INSTALL "Ð£ÑÑÐ°Ð½Ð¾Ð²Ð¸ÑÑ" IDS_PRINT "ÐÐµÑÐ°ÑÑ" IDS_STRING "Ð ÑÐ°ÑÐ°Ñ ÑÐ³Ð° Ð¶Ð¸Ð» Ð±Ñ ÑÐ¸ÑÑÑÑ? ÐÐ°, Ð½Ð¾ ÑÐ°Ð»ÑÑÐ¸Ð²ÑÐ¹ ÑÐºÐ·ÐµÐ¼Ð¿Ð»ÑÑ! 1234567890" - IDS_OPEN "Open Font..." + IDS_OPEN "ÐÑÐºÑÑÑÑ ÑÑÐ¸ÑÑ..." IDS_ERROR "ÐÑÐ¸Ð±ÐºÐ°" IDS_ERROR_NOMEM "ÐÐµÐ´Ð¾ÑÑÐ°ÑÐ¾ÑÐ½Ð¾ Ð¿Ð°Ð¼ÑÑÐ¸, ÑÑÐ¾Ð±Ñ Ð·Ð°Ð²ÐµÑÑÐ¸ÑÑ Ð¾Ð¿ÐµÑÐ°ÑÐ¸Ñ." IDS_ERROR_NOFONT "%1 Ð½Ðµ ÑÐ²Ð»ÑÐµÑÑÑ ÐºÐ¾ÑÑÐµÐºÑÐ½ÑÐ¼ ÑÐ°Ð¹Ð»Ð¾Ð¼ ÑÑÐ¸ÑÑÐ°." 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] Mon May 19 18:00:47 2014 @@ -9,11 +9,11 @@ MENUITEM SEPARATOR MENUITEM "&ÐÑÑÐ¾Ð´", IDM_EXIT END - POPUP "&Device" + POPUP "&Ð£ÑÑÑÐ¾Ð¹ÑÑÐ²Ð¾" BEGIN - MENUITEM "&Properties", IDM_DEVPROPS + MENUITEM "&Ð¡Ð²Ð¾Ð¹ÑÑÐ²Ð°", IDM_DEVPROPS MENUITEM SEPARATOR - MENUITEM "&Volume Control", IDM_VOLUMECTL + MENUITEM "&ÐÑÐ¾Ð¼ÐºÐ¾ÑÑÑ", IDM_VOLUMECTL END POPUP "&ÐÐ¾Ð¼Ð¾ÑÑ" BEGIN @@ -33,6 +33,6 @@ IDS_TOOLTIP_FORWARD "ÐÐ¿ÐµÑÐµÐ´" IDS_APPTITLE "ÐÑÐ¾Ð¸Ð³ÑÑÐ²Ð°ÑÐµÐ»Ñ ReactOS" IDS_PLAY "ÐÐ¾ÑÐ¿ÑÐ¾Ð¸Ð·Ð²ÐµÑÑÐ¸" - IDS_DEFAULTMCIERRMSG "No description is available for this error" - IDS_UNKNOWNFILEEXT "Cannot determine the device type from the given filename extension." + IDS_DEFAULTMCIERRMSG "ÐÐµÐ¸Ð·Ð²ÐµÑÑÐ½Ð°Ñ Ð¾ÑÐ¸Ð±ÐºÐ°." + IDS_UNKNOWNFILEEXT "ÐÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð¾Ð¿ÑÐµÐ´ÐµÐ»Ð¸ÑÑ ÑÐ¸Ð¿ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð° Ð¼ÑÐ»ÑÑÐ¸Ð¼ÐµÐ´Ð¸Ð° Ð´Ð»Ñ Ð·Ð°Ð´Ð°Ð½Ð½Ð¾Ð³Ð¾ ÑÐ°ÑÑÐ¸ÑÐµÐ½Ð¸Ñ ÑÐ°Ð¹Ð»Ð°." END 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] Mon May 19 18:00:47 2014 @@ -52,7 +52,7 @@ MENUITEM "&Ð¡ÑÑÐ¾ÐºÐ¾Ð²ÑÐ¹ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑ", ID_EDIT_NEW_STRINGVALUE MENUITEM "&ÐÐ²Ð¾Ð¸ÑÐ½ÑÐ¹ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑ", ID_EDIT_NEW_BINARYVALUE MENUITEM "&ÐÐ°ÑÐ°Ð¼ÐµÑÑ DWORD", ID_EDIT_NEW_DWORDVALUE - MENUITEM "&ÐÑÐ»ÑÑÐ¸ÑÑÑÐ¾ÐºÐ¾Ð²ÑÐ¹ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑ", ID_EDIT_NEW_MULTISTRINGVALUE + MENUITEM "&ÐÐ½Ð¾Ð³Ð¾ÑÑÑÐ¾ÑÐ½ÑÐ¹ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑ", ID_EDIT_NEW_MULTISTRINGVALUE MENUITEM "Ð Ð°Ñ&ÑÐ¸ÑÑÐµÐ¼ÑÐ¹ ÑÑÑÐ¾ÐºÐ¾Ð²ÑÐ¹ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑ", ID_EDIT_NEW_EXPANDABLESTRINGVALUE END MENUITEM SEPARATOR @@ -106,8 +106,8 @@ MENUITEM "&Ð¡ÑÑÐ¾ÐºÐ¾Ð²ÑÐ¹ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑ", ID_EDIT_NEW_STRINGVALUE MENUITEM "&ÐÐ²Ð¾Ð¸ÑÐ½ÑÐ¹ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑ", ID_EDIT_NEW_BINARYVALUE MENUITEM "&ÐÐ°ÑÐ°Ð¼ÐµÑÑ DWORD", ID_EDIT_NEW_DWORDVALUE - MENUITEM "&Multi-String Value", ID_EDIT_NEW_MULTISTRINGVALUE - MENUITEM "&Expandable String Value", ID_EDIT_NEW_EXPANDABLESTRINGVALUE + MENUITEM "&ÐÐ½Ð¾Ð³Ð¾ÑÑÑÐ¾ÑÐ½ÑÐ¹ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑ", ID_EDIT_NEW_MULTISTRINGVALUE + MENUITEM "Ð Ð°Ñ&ÑÐ¸ÑÑÐµÐ¼ÑÐ¹ ÑÑÑÐ¾ÐºÐ¾Ð²ÑÐ¹ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑ", ID_EDIT_NEW_EXPANDABLESTRINGVALUE END END POPUP "" @@ -120,8 +120,8 @@ MENUITEM "&Ð¡ÑÑÐ¾ÐºÐ¾Ð²ÑÐ¹ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑ", ID_EDIT_NEW_STRINGVALUE MENUITEM "&ÐÐ²Ð¾Ð¸ÑÐ½ÑÐ¹ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑ", ID_EDIT_NEW_BINARYVALUE MENUITEM "&ÐÐ°ÑÐ°Ð¼ÐµÑÑ DWORD", ID_EDIT_NEW_DWORDVALUE - MENUITEM "&Multi-String Value", ID_EDIT_NEW_MULTISTRINGVALUE - MENUITEM "&Expandable String Value", ID_EDIT_NEW_EXPANDABLESTRINGVALUE + MENUITEM "&ÐÐ½Ð¾Ð³Ð¾ÑÑÑÐ¾ÑÐ½ÑÐ¹ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑ", ID_EDIT_NEW_MULTISTRINGVALUE + MENUITEM "Ð Ð°Ñ&ÑÐ¸ÑÑÐµÐ¼ÑÐ¹ ÑÑÑÐ¾ÐºÐ¾Ð²ÑÐ¹ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑ", ID_EDIT_NEW_EXPANDABLESTRINGVALUE END MENUITEM "&ÐÐ°Ð¹ÑÐ¸", ID_EDIT_FIND MENUITEM SEPARATOR @@ -135,12 +135,12 @@ END POPUP "" BEGIN - MENUITEM "C&ut", ID_HEXEDIT_CUT - MENUITEM "&Copy", ID_HEXEDIT_COPY - MENUITEM "&Paste", ID_HEXEDIT_PASTE - MENUITEM "&Delete", ID_HEXEDIT_DELETE - MENUITEM SEPARATOR - MENUITEM "Select &All", ID_HEXEDIT_SELECT_ALL + MENUITEM "&ÐÑÑÐµÐ·Ð°ÑÑ", ID_HEXEDIT_CUT + MENUITEM "&ÐÐ¾Ð¿Ð¸ÑÐ¾Ð²Ð°ÑÑ", ID_HEXEDIT_COPY + MENUITEM "ÐÑÑ&Ð°Ð²Ð¸ÑÑ", ID_HEXEDIT_PASTE + MENUITEM "&Ð£Ð´Ð°Ð»Ð¸ÑÑ", ID_HEXEDIT_DELETE + MENUITEM SEPARATOR + MENUITEM "ÐÑ&Ð´ÐµÐ»Ð¸ÑÑ Ð²ÑÐµ", ID_HEXEDIT_SELECT_ALL END END @@ -204,50 +204,50 @@ IDD_EDIT_RESOURCE_LIST DIALOGEX 32, 24, 170, 120 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Resource List" +CAPTION "Ð¡Ð¿Ð¸ÑÐºÐ¸ ÑÐµÑÑÑÑÐ¾Ð²" FONT 8, "MS Shell Dlg" BEGIN CONTROL "", IDC_RESOURCE_LIST, "SysListView32", LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 10, 10, 150, 75 DEFPUSHBUTTON "OK", IDOK, 27, 100, 50, 14 - PUSHBUTTON "Show...", IDC_SHOW_RESOURCE, 93, 100, 50, 14, WS_DISABLED + PUSHBUTTON "ÐÐ¾ÐºÐ°Ð·Ð°ÑÑ...", IDC_SHOW_RESOURCE, 93, 100, 50, 14, WS_DISABLED END IDD_EDIT_RESOURCE DIALOGEX 6, 18, 281, 283 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Resources" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "DMA:", IDC_STATIC, 10, 5, 20, 8 +CAPTION "Ð ÐµÑÑÑÑÑ" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "ÐÐ°Ð½Ð°Ð» DMA:", IDC_STATIC, 10, 5, 20, 8 CONTROL "", IDC_DMA_LIST, "SysListView32", LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 10, 15, 261, 31 - LTEXT "Interrupt:", IDC_STATIC, 10, 48, 35, 8 + LTEXT "ÐÑÐµÑÑÐ²Ð°Ð½Ð¸Ðµ:", IDC_STATIC, 10, 48, 35, 8 CONTROL "", IDC_IRQ_LIST, "SysListView32", LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 10, 58, 261, 31 - LTEXT "Memory:", IDC_STATIC, 10, 91, 32, 8 + LTEXT "ÐÐ°Ð¼ÑÑÑ:", IDC_STATIC, 10, 91, 32, 8 CONTROL "", IDC_MEMORY_LIST, "SysListView32", LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 10, 101, 261, 31 - LTEXT "Port:", IDC_STATIC, 10, 134, 38, 8 + 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 "Device specific data:", 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 "Usage", IDC_STATIC, 10, 219, 125, 39 - LTEXT "Undetermined", IDC_UNDETERMINED, 18, 230, 46, 8, WS_DISABLED - LTEXT "Shared", IDC_SHARED, 18, 240, 48, 8, WS_DISABLED - LTEXT "Device exclusive", IDC_DEVICE_EXCLUSIVE, 72, 230, 58, 8, WS_DISABLED - LTEXT "Driver exclusive", IDC_DRIVER_EXCLUSIVE, 72, 240, 54, 8, WS_DISABLED - RTEXT "Interface Type:", IDC_STATIC, 144, 220, 58, 8 + GROUPBOX "ÐÐ°Ð·Ð½Ð°ÑÐµÐ½Ð¸Ðµ", IDC_STATIC, 10, 219, 125, 39 + LTEXT "ÐÐµ Ð¾Ð¿ÑÐµÐ´ÐµÐ»ÐµÐ½Ð¾", IDC_UNDETERMINED, 18, 230, 46, 8, WS_DISABLED + LTEXT "ÐÐ±ÑÐ¸Ð¹ ÑÐµÑÑÑÑ", IDC_SHARED, 18, 240, 48, 8, WS_DISABLED + LTEXT "ÐÐ»Ñ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð°", IDC_DEVICE_EXCLUSIVE, 72, 230, 58, 8, WS_DISABLED + LTEXT "ÐÐ»Ñ Ð´ÑÐ°Ð¹Ð²ÐµÑÐ°", IDC_DRIVER_EXCLUSIVE, 72, 240, 54, 8, WS_DISABLED + RTEXT "Ð¢Ð¸Ð¿ Ð¸Ð½ÑÐµÑÑÐµÐ¹ÑÐ°:", IDC_STATIC, 144, 220, 58, 8 LTEXT "", IDC_INTERFACETYPE, 205, 220, 66, 8 - RTEXT "Bus Nummer:", IDC_STATIC, 151, 230, 51, 8 + RTEXT "ÐÐ¾Ð¼ÐµÑ ÑÐ¸Ð½Ñ:", IDC_STATIC, 151, 230, 51, 8 LTEXT "", IDC_BUSNUMBER, 205, 230, 66, 8 - RTEXT "Version:", IDC_STATIC, 151, 240, 51, 8 + RTEXT "ÐÐµÑÑÐ¸Ñ:", IDC_STATIC, 151, 240, 51, 8 LTEXT "", IDC_VERSION, 205, 240, 66, 8 - RTEXT "Revision:", IDC_STATIC, 151, 250, 51, 8 + RTEXT "Ð ÐµÐ´Ð°ÐºÑÐ¸Ñ:", IDC_STATIC, 151, 250, 51, 8 LTEXT "", IDC_REVISION, 205, 250, 66, 8 DEFPUSHBUTTON "OK", IDOK, 92, 263, 40, 14 - PUSHBUTTON "&Data...", IDC_SHOW_RESOURCE_DATA, 148, 263, 40, 14, WS_DISABLED + PUSHBUTTON "&ÐÐ°Ð½Ð½ÑÐµ...", IDC_SHOW_RESOURCE_DATA, 148, 263, 40, 14, WS_DISABLED END /* String Tables */ @@ -285,11 +285,11 @@ ID_EDIT_NEW_DWORDVALUE "ÐÐ¾Ð±Ð°Ð²Ð»ÑÐµÑ Ð½Ð¾Ð²Ð¾Ðµ DWORD-Ð·Ð½Ð°ÑÐµÐ½Ð¸Ðµ" ID_REGISTRY_IMPORTREGISTRYFILE "ÐÐ¼Ð¿Ð¾ÑÑÐ¸ÑÑÐµÑ ÑÐµÐºÑÑÐ¾Ð²Ð¾Ð¹ ÑÐ°Ð¹Ð» Ð² ÑÐµÐµÑÑÑ" ID_REGISTRY_EXPORTREGISTRYFILE "ÐÐºÑÐ¿Ð¾ÑÑÐ¸ÑÑÐµÑ Ð²ÐµÑÑ ÑÐµÐµÑÑÑ Ð¸Ð»Ð¸ ÐµÐ³Ð¾ ÑÐ°ÑÑÑ Ð² ÑÐµÐºÑÑÐ¾Ð²Ð¾Ð¹ ÑÐ°Ð¹Ð»" - ID_REGISTRY_LOADHIVE "Loads a hive file into the registry" - ID_REGISTRY_UNLOADHIVE "Unloads a hive from the registry" + ID_REGISTRY_LOADHIVE "ÐÐ°Ð³ÑÑÐ·Ð¸ÑÑ ÑÐ°Ð¹Ð» ÐºÑÑÑÐ° ÑÐµÐµÑÑÑÐ° Ð² ÑÐµÐµÑÑÑ" + ID_REGISTRY_UNLOADHIVE "ÐÑÐ³ÑÑÐ·Ð¸ÑÑ ÐºÑÑÑ ÑÐµÐµÑÑÑÐ°" ID_REGISTRY_CONNECTNETWORKREGISTRY "ÐÐ¾Ð´ÐºÐ»ÑÑÐ°ÐµÑÑÑ Ðº ÑÐµÐµÑÑÑÑ ÑÐ´Ð°Ð»ÑÐ½Ð½Ð¾Ð³Ð¾ ÐºÐ¾Ð¼Ð¿ÑÑÑÐµÑÐ°" ID_REGISTRY_DISCONNECTNETWORKREGISTRY "ÐÑÐºÐ»ÑÑÐ°ÐµÑÑÑ Ð¾Ñ ÑÐµÐµÑÑÑÐ° ÑÐ´Ð°Ð»ÑÐ½Ð½Ð¾Ð³Ð¾ ÐºÐ¾Ð¼Ð¿ÑÑÑÐµÑÐ°" - ID_REGISTRY_PRINT "ÐÐµÑÐ°ÑÐ°ÐµÑ Ð²ÐµÑÑ ÑÐµÐµÑÑÑ Ð¸Ð»Ð¸ Ð¾Ð³Ð¾ ÑÐ°ÑÑÑ" + ID_REGISTRY_PRINT "ÐÐµÑÐ°ÑÐ°ÐµÑ Ð²ÐµÑÑ ÑÐµÐµÑÑÑ Ð¸Ð»Ð¸ ÐµÐ³Ð¾ ÑÐ°ÑÑÑ" /* ID_HELP_HELPTOPICS "ÐÑÐºÑÑÐ²Ð°ÐµÑ ÑÐ¿ÑÐ°Ð²ÐºÑ ÑÐµÐ´Ð°ÐºÑÐ¾ÑÐ° ÑÐµÐµÑÑÑÐ°" */ ID_HELP_ABOUT "ÐÑÐ¾Ð±ÑÐ°Ð¶Ð°ÐµÑ Ð¸Ð½ÑÐ¾ÑÐ¼Ð°ÑÐ¸Ñ Ð¾ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ðµ, Ð½Ð¾Ð¼ÐµÑ Ð²ÐµÑÑÐ¸Ð¸ Ð¸ Ð°Ð²ÑÐ¾ÑÑÐºÐ¸Ðµ Ð¿ÑÐ°Ð²Ð°" END @@ -328,8 +328,8 @@ IDS_ERR_DELETEVALUE "ÐÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ ÑÐ´Ð°Ð»Ð¸ÑÑ Ð²ÑÐµ ÑÐºÐ°Ð·Ð°Ð½Ð½ÑÐµ Ð·Ð½Ð°ÑÐµÐ½Ð¸Ñ!" IDS_ERR_RENVAL_CAPTION "ÐÑÐ¸Ð±ÐºÐ° Ð¿ÐµÑÐµÐ¸Ð¼ÐµÐ½Ð¾Ð²Ð°Ð½Ð¸Ñ Ð·Ð½Ð°ÑÐµÐ½Ð¸Ñ" IDS_ERR_RENVAL_TOEMPTY "ÐÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð¿ÐµÑÐµÐ¸Ð¼ÐµÐ½Ð¾Ð²Ð°ÑÑ %s. Ð£ÐºÐ°Ð·Ð°Ð½Ð½Ð¾Ðµ Ð·Ð½Ð°ÑÐµÐ½Ð¸Ðµ Ð½Ðµ Ð¿ÑÑÑÐ¾Ðµ. ÐÐ²ÐµÐ´Ð¸ÑÐµ Ð´ÑÑÐ³Ð¾Ðµ Ð·Ð½Ð°ÑÐµÐ½Ð¸Ðµ Ð¸ Ð¿Ð¾Ð²ÑÐ¾ÑÐ¸ÑÐµ Ð¿Ð¾Ð¿ÑÑÐºÑ." - IDS_QUERY_IMPORT_HIVE_CAPTION "Confirm Key Restoration" - IDS_QUERY_IMPORT_HIVE_MSG "A key will be restored on top of the currently selected key.\nAll values and subkeys of this key will be deleted.\nDo you want to continue the operation?" + IDS_QUERY_IMPORT_HIVE_CAPTION "ÐÐ¾Ð´ÑÐ²ÐµÑÐ´Ð¸ÑÐµ Ð²Ð¾ÑÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ðµ ÑÐ°Ð·Ð´ÐµÐ»Ð°" + IDS_QUERY_IMPORT_HIVE_MSG "Ð Ð°Ð·Ð´ÐµÐ» Ð±ÑÐ´ÐµÑ Ð²Ð¾ÑÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½ Ð¿Ð¾Ð²ÐµÑÑ ÑÐµÐºÑÑÐµÐ³Ð¾ Ð²ÑÐ±ÑÐ°Ð½Ð½Ð¾Ð³Ð¾ ÑÐ°Ð·Ð´ÐµÐ»Ð°.\nÐÑÐµ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÑ Ð¸ Ð¿Ð¾Ð´ÑÐ°Ð·Ð´ÐµÐ»Ñ Ð±ÑÐ´ÑÑ ÑÐ´Ð°Ð»ÐµÐ½Ñ.\nÐÑÐ¾Ð´Ð¾Ð»Ð¶Ð¸ÑÑ Ð²ÑÐ¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ðµ Ð¾Ð¿ÐµÑÐ°ÑÐ¸Ð¸?" IDS_NEW_KEY "ÐÐ¾Ð²ÑÐ¹ ÐºÐ»ÑÑ #%d" IDS_NEW_VALUE "ÐÐ¾Ð²Ð¾Ðµ Ð·Ð½Ð°ÑÐµÐ½Ð¸Ðµ #%d" END @@ -343,8 +343,8 @@ IDS_MY_COMPUTER "ÐÐ¾Ð¹ ÐºÐ¾Ð¼Ð¿ÑÑÑÐµÑ" IDS_IMPORT_REG_FILE "ÐÐ¼Ð¿Ð¾ÑÑÐ¸ÑÐ¾Ð²Ð°Ð½Ð¸Ðµ ÑÐ°Ð¹Ð»Ð° ÑÐµÐµÑÑÑÐ°" IDS_EXPORT_REG_FILE "ÐÐºÑÐ¿Ð¾ÑÑÐ¸ÑÐ¾Ð²Ð°Ð½Ð¸Ðµ ÑÐ°Ð¹Ð»Ð° ÑÐµÐµÑÑÑÐ°" - IDS_LOAD_HIVE "Load Hive" - IDS_UNLOAD_HIVE "Unload Hive" + IDS_LOAD_HIVE "ÐÐ°Ð³ÑÑÐ·Ð¸ÑÑ ÐºÑÑÑ" + IDS_UNLOAD_HIVE "ÐÑÐ³ÑÑÐ·Ð¸ÑÑ ÐºÑÑÑ" IDS_INVALID_DWORD "(Ð½ÐµÐ¿ÑÐ°Ð²Ð¸Ð»ÑÐ½Ð¾Ðµ Ð·Ð½Ð°ÑÐµÐ½Ð¸Ðµ DWORD)" END @@ -353,7 +353,7 @@ IDS_FLT_REGFILE "Ð¤Ð°Ð¹Ð» ÑÐµÐµÑÑÑÐ°" IDS_FLT_REGFILES "Ð¤Ð°Ð¹Ð»Ñ ÑÐµÐµÑÑÑÐ° (*.reg)" IDS_FLT_REGFILES_FLT "*.reg" - IDS_FLT_HIVFILES "Registry Hive Files (*.*)" + IDS_FLT_HIVFILES "Ð¤Ð°Ð¹Ð»Ñ ÐºÑÑÑÐ¾Ð² ÑÐµÐµÑÑÑÐ° (*.*)" IDS_FLT_HIVFILES_FLT "*.*" IDS_FLT_REGEDIT4 "Ð¤Ð°Ð¹Ð»Ñ ÑÐµÐµÑÑÑÐ° Win9x/NT4 (REGEDIT4) (*.reg)" IDS_FLT_REGEDIT4_FLT "*.reg" @@ -394,48 +394,48 @@ STRINGTABLE BEGIN - IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly.\nIf you do not trust the source of this information in '%s', do not add it to registry.\n\nAre you sure you want to continue?" - IDS_IMPORT_OK "The keys and values contained in '%s' have been successfully added to the registry." - IDS_IMPORT_ERROR "Cannot import '%s': Error opening the file. There may be a disk, file system error or file may not exist." - IDS_EXPORT_ERROR "Cannot export '%s': Error creating or writing to the file. There may be a disk or file system error." -END - -STRINGTABLE -BEGIN - IDS_BUSNUMBER "Bus Number" - IDS_INTERFACE "Interface" - IDS_DMA_CHANNEL "Channel" - IDS_DMA_PORT "Port" - IDS_INTERRUPT_VECTOR "Vector" - IDS_INTERRUPT_LEVEL "Level" - IDS_INTERRUPT_AFFINITY "Affinity" - IDS_INTERRUPT_TYPE "Type" - IDS_MEMORY_ADDRESS "Physical Address" - IDS_MEMORY_LENGTH "Length" - IDS_MEMORY_ACCESS "Access" - IDS_PORT_ADDRESS "Physical Address" - IDS_PORT_LENGTH "Length" - IDS_PORT_ACCESS "Access" - IDS_SPECIFIC_RESERVED1 "Reserved 1" - IDS_SPECIFIC_RESERVED2 "Reserved 2" - IDS_SPECIFIC_DATASIZE "Data Size" -END - -STRINGTABLE -BEGIN - IDS_PORT_PORT_IO "Port" - IDS_PORT_MEMORY_IO "Memory" - IDS_INTERRUPT_EDGE_SENSITIVE "Edge Sensitive" - IDS_INTERRUPT_LEVEL_SENSITIVE "Level Sensitive" - IDS_MEMORY_READ_ONLY "Read Only" - IDS_MEMORY_WRITE_ONLY "Write Only" - IDS_MEMORY_READ_WRITE "Read / Write" -END - -STRINGTABLE -BEGIN - IDS_BUS_UNDEFINED "Undefined" - IDS_BUS_INTERNAL "Internal" + IDS_IMPORT_PROMPT "ÐÑ ÑÐ²ÐµÑÐµÐ½Ñ, ÑÑÐ¾ ÑÐ¾ÑÐ¸ÑÐµ Ð´Ð¾Ð±Ð°Ð²Ð¸ÑÑ Ð´Ð°Ð½Ð½ÑÐµ Ð¸Ð· ÑÐ°Ð¹Ð»Ð° '%s'?\n ÐÐ¾Ð±Ð°Ð²Ð»ÐµÐ½Ð¸Ðµ Ð¸Ð½ÑÐ¾ÑÐ¼Ð°ÑÐ¸Ð¸ Ð¸Ð· Ð½ÐµÐ¿ÑÐ¾Ð²ÐµÑÐµÐ½Ð½ÑÑ Ð¸ÑÑÐ¾ÑÐ½Ð¸ÐºÐ¾Ð² Ð¼Ð¾Ð¶ÐµÑ Ð½ÐµÐ¿ÑÐµÐ´Ð½Ð°Ð¼ÐµÑÐµÐ½Ð½Ð¾ Ð¸Ð·Ð¼ÐµÐ½Ð¸ÑÑ Ð¸Ð»Ð¸ ÑÐ´Ð°Ð»Ð¸ÑÑ Ð½ÐµÐºÐ¾ÑÐ¾ÑÑÐµ Ð·Ð½Ð°ÑÐµÐ½Ð¸Ñ Ð¸ Ð¿ÑÐ¸Ð²ÐµÑÑÐ¸ Ðº Ð½ÐµÑÑÐ°Ð±Ð¸Ð»ÑÐ½Ð¾Ð¹ ÑÐ°Ð±Ð¾ÑÐµ ÑÐ¸ÑÑÐµÐ¼Ñ.\n ÐÑÐ»Ð¸ Ð²Ñ Ð½Ðµ Ð´Ð¾Ð²ÐµÑÑÐµÑÐµ Ð¸ÑÑÐ¾ÑÐ½Ð¸ÐºÑ ÑÑÐ¾Ð³Ð¾ ÑÐ°Ð¹Ð»Ð°, Ð½Ðµ Ð´Ð¾Ð±Ð°Ð²Ð»ÑÐ¹ÑÐµ Ð´Ð°Ð½Ð½ÑÐµ Ð² ÑÐµÐµÑÑÑ." + IDS_IMPORT_OK "ÐÐ½Ð°ÑÐµÐ½Ð¸Ñ Ð¸Ð· ÑÐ°Ð¹Ð»Ð° '%s' Ð±ÑÐ»Ð¸ ÑÑÐ¿ÐµÑÐ½Ð¾ Ð´Ð¾Ð±Ð°Ð²Ð»ÐµÐ½Ñ Ð² ÑÐµÐµÑÑÑ." + IDS_IMPORT_ERROR "ÐÐµ ÑÐ´Ð°ÐµÑÑÑ Ð¸Ð¼Ð¿Ð¾ÑÑÐ¸ÑÐ¾Ð²Ð°ÑÑ ÑÐ°Ð¹Ð» '%s': ÐÑÐ¸Ð±ÐºÐ° Ð¿ÑÐ¸ Ð¾ÑÐºÑÑÑÐ¸Ð¸ ÑÐ°Ð¹Ð»Ð°." + IDS_EXPORT_ERROR "ÐÐµ ÑÐ´Ð°ÐµÑÑÑ ÑÐºÑÐ¿Ð¾ÑÑÐ¸ÑÐ¾Ð²Ð°ÑÑ Ð´Ð°Ð½Ð½ÑÐµ Ð² ÑÐ°Ð¹Ð» '%s': ÐÑÐ¸Ð±ÐºÐ° Ð¿ÑÐ¸ Ð·Ð°Ð¿Ð¸ÑÐ¸ Ð² ÑÐ°Ð¹Ð»." +END + +STRINGTABLE +BEGIN + IDS_BUSNUMBER "ÐÐ¾Ð¼ÐµÑ ÑÐ¸Ð½Ñ" + IDS_INTERFACE "ÐÐ½ÑÐµÑÑÐµÐ¹Ñ" + IDS_DMA_CHANNEL "ÐÐ°Ð½Ð°Ð»" + IDS_DMA_PORT "ÐÐ¾ÑÑ" + IDS_INTERRUPT_VECTOR "ÐÐµÐºÑÐ¾Ñ" + IDS_INTERRUPT_LEVEL "Ð£ÑÐ¾Ð²ÐµÐ½Ñ" + IDS_INTERRUPT_AFFINITY "Ð Ð¾Ð´ÑÑÐ²Ð¾" + IDS_INTERRUPT_TYPE "Ð¢Ð¸Ð¿" + IDS_MEMORY_ADDRESS "Ð¤Ð¸Ð·Ð¸ÑÐµÑÐºÐ¸Ð¹ Ð°Ð´ÑÐµÑ" + IDS_MEMORY_LENGTH "ÐÐ»Ð¸Ð½Ð°" + IDS_MEMORY_ACCESS "ÐÐ¾ÑÑÑÐ¿" + IDS_PORT_ADDRESS "Ð¤Ð¸Ð·Ð¸ÑÐµÑÐºÐ¸Ð¹ Ð°Ð´ÑÐµÑ" + IDS_PORT_LENGTH "ÐÐ»Ð¸Ð½Ð°" + IDS_PORT_ACCESS "ÐÐ¾ÑÑÑÐ¿" + IDS_SPECIFIC_RESERVED1 "Ð ÐµÐ·ÐµÑÐ²1" + IDS_SPECIFIC_RESERVED2 "Ð ÐµÐ·ÐµÑÐ²2" + IDS_SPECIFIC_DATASIZE "ÐÐ±ÑÐµÐ¼ Ð´Ð°Ð½Ð½ÑÑ" +END + +STRINGTABLE +BEGIN + IDS_PORT_PORT_IO "ÐÐ¾ÑÑ" + IDS_PORT_MEMORY_IO "ÐÐ°Ð¼ÑÑÑ" + IDS_INTERRUPT_EDGE_SENSITIVE "Ð¡ ÑÑÐµÑÐ¾Ð¼ Ð·Ð°Ð´Ð²Ð¸Ð¶ÐºÐ¸" + IDS_INTERRUPT_LEVEL_SENSITIVE "Ð¡ ÑÑÐµÑÐ¾Ð¼ ÑÑÐ¾Ð²Ð½Ñ" + IDS_MEMORY_READ_ONLY "Ð¢Ð¾Ð»ÑÐºÐ¾ ÑÑÐµÐ½Ð¸Ðµ" + IDS_MEMORY_WRITE_ONLY "Ð¢Ð¾Ð»ÑÐºÐ¾ Ð·Ð°Ð¿Ð¸ÑÑ" + IDS_MEMORY_READ_WRITE "Ð§ÑÐµÐ½Ð¸Ðµ Ð¸ Ð·Ð°Ð¿Ð¸ÑÑ" +END + +STRINGTABLE +BEGIN + IDS_BUS_UNDEFINED "ÐÐµÐ¿ÑÐ°Ð²Ð¸Ð»ÑÐ½Ð¾" + IDS_BUS_INTERNAL "ÐÐ½ÑÑÑÐµÐ½Ð½Ð¸Ð¹" IDS_BUS_ISA "ISA" IDS_BUS_EISA "EISA" IDS_BUS_MICROCHANNEL "MicroChannel" @@ -447,11 +447,11 @@ IDS_BUS_CBUS "C-Bus" IDS_BUS_MPIBUS "MPI-Bus" IDS_BUS_MPSABUS "MPSA-Bus" - IDS_BUS_PROCESSORINTERNAL "Processor Internal" - IDS_BUS_INTERNALPOWERBUS "Internal Power Bus" - IDS_BUS_PNPISABUS "PnP-ISA Bus" - IDS_BUS_PNPBUS "PnP Bus" - IDS_BUS_UNKNOWNTYPE "Unknown Interface Type" + IDS_BUS_PROCESSORINTERNAL "ÐÐ½ÑÑÑÐµÐ½Ð½ÑÑ ÑÐ¸Ð½Ð° Ð¿ÑÐ¾ÑÐµÑÑÐ¾ÑÐ°" + IDS_BUS_INTERNALPOWERBUS "ÐÐ½ÑÑÑÐµÐ½Ð½ÑÑ ÑÐ¸Ð½Ð° Ð¿Ð¸ÑÐ°Ð½Ð¸Ñ" + IDS_BUS_PNPISABUS "Ð¨Ð¸Ð½Ð° PnP-ISA" + IDS_BUS_PNPBUS "Ð¨Ð¸Ð½Ð° PnP" + IDS_BUS_UNKNOWNTYPE "ÐÐµÐ¸Ð·Ð²ÐµÑÑÐ½ÑÐ¹ ÑÐ¸Ð¿ Ð¸Ð½ÑÐµÑÑÐµÐ¹ÑÐ°" END /*****************************************************************/ @@ -470,13 +470,13 @@ IDD_LOADHIVE DIALOGEX 0, 0, 193, 34 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Load Hive" +CAPTION "ÐÐ°Ð³ÑÑÐ·Ð¸ÑÑ ÐºÑÑÑ" FONT 8, "Ms Shell Dlg" BEGIN - LTEXT "&Key:", IDC_STATIC, 4, 4, 15, 8, SS_LEFT + LTEXT "&ÐÐ½Ð°ÑÐµÐ½Ð¸Ðµ:", IDC_STATIC, 4, 4, 15, 8, SS_LEFT EDITTEXT IDC_EDIT_KEY, 23, 2, 167, 13 DEFPUSHBUTTON "OK", IDOK, 140, 17, 50, 14 - PUSHBUTTON "Cancel", IDCANCEL, 89, 17, 50, 14 + PUSHBUTTON "ÐÑÐ¼ÐµÐ½Ð°", IDCANCEL, 89, 17, 50, 14 END IDD_ADDFAVORITES DIALOGEX 0, 0, 187, 95 Modified: trunk/reactos/base/applications/shutdown/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/shutdown… ============================================================================== --- trunk/reactos/base/applications/shutdown/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/shutdown/lang/ru-RU.rc [iso-8859-1] Mon May 19 18:00:47 2014 @@ -3,101 +3,105 @@ /* Dialog */ IDD_GUI DIALOGEX 0, 0, 240, 255 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Remote Shutdown" +CAPTION "Ð£Ð´Ð°Ð»ÐµÐ½Ð½Ð¾Ðµ Ð·Ð°Ð²ÐµÑÑÐµÐ½Ð¸Ðµ ÑÐ°Ð±Ð¾ÑÑ" FONT 8, "MS Shell Dlg" BEGIN - DEFPUSHBUTTON "&OK", IDC_OK, 125, 232, 50, 14 - PUSHBUTTON "&Cancel", IDC_CANCEL, 178, 232, 50, 14 - LTEXT "Co&mputers:", IDC_STATIC, 9, 9, 35, 36 + DEFPUSHBUTTON "&ÐÐ", IDC_OK, 125, 232, 50, 14 + PUSHBUTTON "Ð&ÑÐ¼ÐµÐ½Ð°", IDC_CANCEL, 178, 232, 50, 14 + LTEXT "&ÐÐ¾Ð¼Ð¿ÑÑÑÐµÑÑ:", IDC_STATIC, 9, 9, 50, 8 LISTBOX IDC_COMPUTER_LIST, 8, 19, 162, 55 - PUSHBUTTON "&Add...", IDC_ADD_SYSTEM, 179, 19, 50, 14 - PUSHBUTTON "&Remove", IDC_REMOVE_SYSTEM, 179, 36, 50, 14, WS_DISABLED - PUSHBUTTON "&Browse...", IDC_BROWSE_SYSTEM, 179, 53, 50, 14 - LTEXT "Action", IDC_ACTION, 11, 81, 20, 14 + PUSHBUTTON "&ÐÐ¾Ð±Ð°Ð²Ð¸ÑÑ...", IDC_ADD_SYSTEM, 179, 19, 50, 14 + PUSHBUTTON "&Ð£Ð´Ð°Ð»Ð¸ÑÑ", IDC_REMOVE_SYSTEM, 179, 36, 50, 14, WS_DISABLED + PUSHBUTTON "&ÐÐ±Ð·Ð¾Ñ...", IDC_BROWSE_SYSTEM, 179, 53, 50, 14 + LTEXT "&ÐÐµÐ»Ð°ÐµÐ¼Ð¾Ðµ Ð´ÐµÐ¹ÑÑÐ²Ð¸Ðµ Ð´Ð»Ñ ÐºÐ¾Ð¼Ð¿ÑÑÑÐµÑÐ¾Ð²:", IDC_ACTION, 11, 81, 170, 14 COMBOBOX IDC_ACTION_TYPE, 37, 79, 129, 14, WS_TABSTOP | CBS_DROPDOWN - CHECKBOX "Warn users", IDC_WARN_USERS, 175, 79, 55, 14, BS_AUTOCHECKBOX | WS_TABSTOP - LTEXT "Display warning for", IDC_SHOW_WARN_ONE, 11, 99, 65, 14 + CHECKBOX "&ÐÑÐµÐ´ÑÐ¿ÑÐµÐ´Ð¸ÑÑ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»ÐµÐ¹", IDC_WARN_USERS, 175, 79, 120, 14, BS_AUTOCHECKBOX | WS_TABSTOP + LTEXT "ÐÐ¾&ÐºÐ°Ð·ÑÐ²Ð°ÑÑ Ð¿ÑÐµÐ´ÑÐ¿ÑÐµÐ¶Ð´ÐµÐ½Ð¸Ðµ Ð² ÑÐµÑÐµÐ½Ð¸Ðµ: ", IDC_SHOW_WARN_ONE, 11, 99, 146, 14 EDITTEXT IDC_SHOW_WARN, 78, 97, 41, 14 - LTEXT "second(s)", IDC_SHOW_WARN_TWO, 124, 99, 32, 10 - GROUPBOX "Shutdown Event Tracker", IDC_STATIC, 5, 114, 224, 114 - LTEXT "Reason:", IDC_STATIC, 16, 130, 27, 8 - CHECKBOX "Planned", IDC_PLANNED, 175, 130, 40, 12, BS_AUTOCHECKBOX | WS_TABSTOP + LTEXT "ÑÐµÐº.", IDC_SHOW_WARN_TWO, 124, 99, 32, 10 + GROUPBOX "Ð ÐµÐ³Ð¸ÑÑÑÐ°ÑÐ¸Ñ ÑÐ¾Ð±ÑÑÐ¸Ð¹ Ð·Ð°Ð²ÐµÑÑÐµÐ½Ð¸Ñ ÑÐ°Ð±Ð¾ÑÑ", IDC_STATIC, 5, 114, 224, 114 + LTEXT "ÐÑÐ¸ÑÐ¸Ð½Ð°:", IDC_STATIC, 16, 130, 27, 8 + CHECKBOX "ÐÐ°Ð¿Ð»Ð°Ð½Ð¸ÑÐ¾Ð²Ð°Ð½Ð¾", IDC_PLANNED, 165, 125, 55, 12, BS_AUTOCHECKBOX | WS_TABSTOP COMBOBOX IDC_REASON_CODE, 17, 142, 198, 13, WS_TABSTOP | CBS_DROPDOWN - LTEXT "Comm&ent:", IDC_COMMENT_CAPTION, 16, 159, 38, 8 + LTEXT "ÐÐ¾Ð¼Ð¼Ðµ&Ð½ÑÐ°ÑÐ¸Ð¹:", IDC_COMMENT_CAPTION, 16, 159, 51, 8 EDITTEXT IDC_COMMENT_TEXT, 17, 171, 198, 50, WS_VSCROLL END /* Information and error messages */ STRINGTABLE BEGIN - IDS_USAGE "ReactOS Shutdown Utility\n\ + IDS_USAGE "Ð£ÑÐ¸Ð»Ð¸ÑÐ° Ð²ÑÐºÐ»ÑÑÐµÐ½Ð¸Ñ ReactOS\n\ \n\ -Usage: shutdown [/?] [/i | /l | /s | /r | /g | /a | /p | /h | /e] [/f]\n\ - [/m \\\\computer][/t xxx][/d [p|u:]xx:yy [/c ""comment""]]\n\ +ÐÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°Ð½Ð¸Ðµ: shutdown [/?] [/i | /l | /s | /r | /g | /a | /p | /h | /e] [/f]\n\ + [/m \\\\<ÐºÐ¾Ð¼Ð¿ÑÑÑÐµÑ>][/t xxx][/d [p|u:]xx:yy [/c ""ÐºÐ¾Ð¼Ð¼ÐµÐ½ÑÐ°ÑÐ¸Ð¹""]]\n\ \n\ - No arguments or /? Display this help.\n\ - /i Show the graphical user interface (GUI). This option must be the\n\ - first one.\n\ - /l Log off on the local system only. Cannot be used with /m or /d.\n\ - /s Shutdown the computer.\n\ - /r Restart the computer.\n\ - /g Restart the computer and restart all the registered applications.\n\ - /a Cancel a delayed shutdown. Can only be used during the delay\n\ - period.\n\ - /p Shutdown the local computer without any timeout or warning. Can be\n\ - used with /d or /f.\n\ - /h Hibernate the local computer. Usable with /f.\n\ - /e Document the reason for the unexpected computer shutdown.\n\ - /m \\\\computer Specify the target computer (UNC/IP address).\n\ - /t xxx Set the timeout period to xxx seconds before shutting down.\n\ - The valid range starts from 0 to 315360000 (10 years),\n\ - 30 being the default value.\n\ - /c ""comment"" Comment on the reason for shutdown or restart.\n\ - 512 characters maximum allowed.\n\ - /f Force running applications to close without warning users. If you\n\ - do not specify any other parameter, this option will also log off.\n\ - /d [p|u:]xx:yy Give the reason code for the shutdown or the restart.\n\ - p indicates that the shutdown or the restart is planned.\n\ - u indicates that the reason is defined by the user.\n\ - If neither p nor u are specified, the shutdown or the restart are\n\ - not planned.\n\ - xx is the major reason code (positive integer smaller than 256).\n\ - yy is the minor reason code (positive integer smaller than 65536).\n" + ÐÐµÐ· Ð°ÑÐ³ÑÐ¼ÐµÐ½ÑÐ¾Ð² Ð¸Ð»Ð¸ /? ÐÐ¾ÐºÐ°Ð·ÑÐ²Ð°ÐµÑ ÑÑÑ ÑÐ¿ÑÐ°Ð²ÐºÑ.\n\ + /i ÐÐ¾ÐºÐ°Ð·Ð°ÑÑ Ð´Ð¸Ð°Ð»Ð¾Ð³ ÑÐ´Ð°Ð»ÐµÐ½Ð½Ð¾Ð³Ð¾ Ð²ÑÐºÐ»ÑÑÐµÐ½Ð¸Ñ. ÐÑÐ¾Ñ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑ Ð´Ð¾Ð»Ð¶ÐµÐ½\n\ + ÑÐºÐ°Ð·ÑÐ²Ð°ÑÑÑÑ Ð¿ÐµÑÐ²ÑÐ¼.\n\ + /l ÐÑÑÐ¾Ð´ Ð¸Ð· ÑÐ¸ÑÑÐµÐ¼Ñ. (Ð½Ðµ ÑÐ¾Ð²Ð¼ÐµÑÑÐ¸Ð¼ Ñ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÐ°Ð¼Ð¸ /m Ð¸Ð»Ð¸ /d.\n\ + /s ÐÑÐºÐ»ÑÑÐ¸ÑÑ ÐºÐ¾Ð¼ÑÐ¿ÑÑÑÐµÑ.\n\ + /r ÐÐµÑÐµÐ·Ð°Ð³ÑÑÐ·Ð¸ÑÑ ÐºÐ¾Ð¼Ð¿ÑÑÑÐµÑ.\n\ + /g ÐÐµÑÐµÐ·Ð°Ð³ÑÑÐ·Ð¸ÑÑ ÐºÐ¾Ð¼Ð¿ÑÑÑÐµÑ Ð¸ Ð¿ÐµÑÐµÐ·Ð°Ð¿ÑÑÑÐ¸ÑÑ Ð²ÑÐµ Ð·Ð°ÑÐµÐ³Ð¸ÑÑÑÐ¸ÑÐ¾Ð²Ð°Ð½Ð½ÑÐµ\n\ + Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ.\ + /a ÐÑÐ¼ÐµÐ½Ð¸ÑÑ Ð¾ÑÐ»Ð¾Ð¶ÐµÐ½Ð½Ð¾Ðµ Ð²ÑÐºÐ»ÑÑÐµÐ½Ð¸Ðµ. ÐÐ¾Ð¶ÐµÑ Ð¸ÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÑÑÑ ÑÐ¾Ð»ÑÐºÐ¾ Ð²\n\ + ÑÐµÑÐµÐ½Ð¸Ðµ Ð¿ÐµÑÐ¸Ð¾Ð´Ð° Ð¾Ð¶Ð¸Ð´Ð°Ð½Ð¸Ñ Ð²ÑÐºÐ»ÑÑÐµÐ½Ð¸Ñ.\ + /p ÐÑÐºÐ»ÑÑÐ¸ÑÑ Ð»Ð¾ÐºÐ°Ð»ÑÐ½ÑÐ¹ ÐºÐ¾Ð¼Ð¿ÑÑÑÐµÑ Ð±ÐµÐ· Ð²ÑÑÐºÐ¸Ñ Ð·Ð°Ð´ÐµÑÐ¶ÐµÐº Ð¸Ð»Ð¸ \n\ + Ð¿ÑÐµÐ´ÑÐ¿ÑÐµÐ¶Ð´ÐµÐ½Ð¸Ð¹. ÐÐ¾Ð¶ÐµÑ Ð¸ÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÑÑÑ Ñ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÐ°Ð¼Ð¸ /d Ð¸Ð»Ð¸ /f.\n\ + /h ÐÐµÑÐµÐ²ÐµÑÑÐ¸ Ð»Ð¾ÐºÐ°Ð»ÑÐ½ÑÐ¹ ÐºÐ¾Ð¼Ð¿ÑÑÑÐµÑ Ð² ÑÐµÐ¶Ð¸Ð¼ Ð³Ð¸Ð±ÐµÑÐ½Ð°ÑÐ¸Ð¸ (""ÑÐ¿ÑÑÐ¸Ð¹ \n\ + ÑÐµÐ¶Ð¸Ð¼""). ÐÐ¾Ð¶ÐµÑ Ð¸ÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÑÑÑ Ñ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÐ¾Ð¼ /f.\n\ + /e ÐÐ°Ð´Ð¾ÐºÑÐ¼ÐµÐ½ÑÐ¸ÑÐ¾Ð²Ð°ÑÑ Ð¿ÑÐ¸ÑÐ¸Ð½Ñ Ð½ÐµÐ¾Ð¶Ð¸Ð´Ð°Ð½Ð½Ð¾Ð³Ð¾ Ð²ÑÐºÐ»ÑÑÐµÐ½Ð¸Ñ ÐºÐ¾Ð¼Ð¿ÑÑÑÐµÑÐ°.\n\ + /m \\\\<ÐºÐ¾Ð¼Ð¿ÑÑÑÐµÑ> Ð£Ð´Ð°Ð»ÐµÐ½Ð½ÑÐ¹ ÐºÐ¾Ð¼Ð¿ÑÑÑÐµÑ, Ð½Ð° ÐºÐ¾ÑÐ¾ÑÐ¾Ð¼ Ð²ÑÐ¿Ð¾Ð»Ð½ÑÐµÑÑÑ Ð´ÐµÐ¹ÑÑÐ²Ð¸Ðµ.\n\ + (UNC/IP Ð°Ð´ÑÐµÑ).\n\ + /t xxx Ð£ÑÑÐ°Ð½Ð°Ð²Ð»Ð¸Ð²Ð°ÐµÑ Ð²ÑÐµÐ¼Ñ Ð¾Ð¶Ð¸Ð´Ð°Ð½Ð¸Ñ Ð´Ð¾ xxx ÑÐµÐº. Ð´Ð¾ Ð·Ð°Ð²ÐµÑÑÐµÐ½Ð¸Ñ ÑÐ°Ð±Ð¾ÑÑ.\n\ + ÐÐ¾Ð¿ÑÑÑÐ¸Ð¼ÑÐµ Ð·Ð½Ð°ÑÐµÐ½Ð¸Ñ Ð»ÐµÐ¶Ð°Ñ Ð² Ð¾ÑÑÐµÐ·ÐºÐµ Ð¾Ñ 0 Ð´Ð¾ 315360000 (10 Ð»ÐµÑ),\n\ + ÐÐ¾ ÑÐ¼Ð¾Ð»ÑÐ°Ð½Ð¸Ñ Ð·Ð½Ð°ÑÐµÐ½Ð¸Ðµ ÑÐ°Ð²Ð½Ð¾ 30.\n\ + /c ""ÐºÐ¾Ð¼Ð¼ÐµÐ½ÑÐ°ÑÐ¸Ð¹"" ÐÐ¿Ð¸ÑÐ°Ð½Ð¸Ðµ Ð¿ÑÐ¸ÑÐ¸Ð½Ñ Ð²ÑÐºÐ»ÑÑÐµÐ½Ð¸Ñ Ð¸Ð»Ð¸ Ð¿ÐµÑÐµÐ·Ð°Ð³ÑÑÐ·ÐºÐ¸.\n\ + ÐÐµ Ð±Ð¾Ð»ÐµÐµ 512 Ð·Ð½Ð°ÐºÐ¾Ð².\n\ + /f ÐÑÐ¸Ð½ÑÐ´Ð¸ÑÐµÐ»ÑÐ½Ð¾Ðµ Ð·Ð°Ð²ÐµÑÑÐµÐ½Ð¸Ðµ Ð¾ÑÐºÑÑÑÑÑ Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ð¹ Ð±ÐµÐ· Ð¿ÑÐµÐ´Ð²Ð°ÑÐ¸ÑÐµÐ»ÑÐ½Ð¾Ð³Ð¾\n\ + ÑÐ²ÐµÐ´Ð¾Ð¼Ð»ÐµÐ½Ð¸Ñ. ÐÑÐ»Ð¸ Ð½Ðµ ÑÐºÐ°Ð·Ð°Ð½Ñ Ð´Ð¾Ð¿Ð¾Ð»Ð½Ð¸ÑÐµÐ»ÑÐ½ÑÐµ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÑ, ÑÐ¾ ÑÑÐ¾Ñ\n\ + Ð¿Ð°ÑÐ°Ð¼ÐµÑÑ ÑÐ°ÐºÐ¶Ðµ Ð¿ÑÐ¸Ð²ÐµÐ´ÐµÑ Ðº Ð²ÑÑÐ¾Ð´Ñ Ð¸Ð· ÑÐ¸ÑÑÐµÐ¼Ñ.\n\ + /d [p|u:]xx:yy ÐÐ°Ð´Ð°ÐµÑ ÐºÐ¾Ð´ Ð¿ÑÐ¸ÑÐ¸Ð½Ñ Ð²ÑÐºÐ»ÑÑÐµÐ½Ð¸Ñ Ð¸Ð»Ð¸ Ð¿ÐµÑÐµÐ·Ð°Ð³ÑÑÐ·ÐºÐ¸.\n\ + p - Ð¿Ð¾ÐºÐ°Ð·ÑÐ²Ð°ÐµÑ, ÑÑÐ¾ Ð²ÑÐºÐ»ÑÑÐµÐ½Ð¸Ðµ Ð¸Ð»Ð¸ Ð¿ÐµÑÐµÐ·Ð°Ð³ÑÑÐ·ÐºÐ° Ð·Ð°Ð¿Ð»Ð°Ð½Ð¸ÑÐ¾Ð²Ð°Ð½Ð°.\n\ + u - Ð¿Ð¾ÐºÐ°Ð·ÑÐ²Ð°ÐµÑ, ÑÑÐ¾ Ð¿ÑÐ¸ÑÐ¸Ð½Ð° Ð¾Ð¿ÑÐµÐ´ÐµÐ»ÐµÐ½Ð° Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»ÐµÐ¼.\n\ + ÐÑÐ»Ð¸ Ð½Ðµ ÑÐºÐ°Ð·Ð°Ð½Ñ p Ð¸Ð»Ð¸ u, ÑÐ¾ Ð²ÑÐºÐ»ÑÑÐµÐ½Ð¸Ðµ Ð¸Ð»Ð¸ Ð¿ÐµÑÐµÐ·Ð°Ð³ÑÑÐ·ÐºÐ° ÑÐ¸ÑÑÐµÐ¼Ñ Ð½Ðµ\n\ + Ð·Ð°Ð¿Ð»Ð°Ð½Ð¸ÑÐ¾Ð²Ð°Ð½Ð°.\ + xx - Ð¾ÑÐ½Ð¾Ð²Ð½Ð¾Ð¹ ÐºÐ¾Ð´ Ð¿ÑÐ¸ÑÐ¸Ð½Ñ (1 - 255).\n\ + yy - Ð´Ð¾Ð¿Ð¾Ð»Ð½Ð¸ÑÐµÐ»ÑÐ½ÑÐ¹ ÐºÐ¾Ð´ Ð¿ÑÐ¸ÑÐ¸Ð½Ñ (1 - 65535).\n" - IDS_ERROR_SHUTDOWN_REBOOT "ERROR: Unable to shutdown and restart at the same time.\n" - IDS_ERROR_TIMEOUT "ERROR: Timeout value of %u is out of bounds (0-315360000).\n" - IDS_ERROR_ABORT "ERROR: Unable to abort the shutdown of the system.\n" - IDS_ERROR_LOGOFF "ERROR: Unable to logoff the system.\n" - IDS_ERROR_SHUTDOWN "ERROR: Unable to shutdown the system.\n" - IDS_ERROR_RESTART "ERROR: Unable to restart the system.\n" - IDS_ERROR_MAX_COMMENT_LENGTH "ERROR: Comment length exceeds maximum character limit set by the system.\n" - IDS_ERROR_HIBERNATE "ERROR: Unable to send system into hibernation mode.\n" - IDS_ERROR_HIBERNATE_LOCAL "ERROR: Hibernation mode cannot be started remotely.\n" - IDS_ERROR_HIBERNATE_ENABLED "ERROR: Hibernation mode is not enabled.\n" - IDS_ERROR_DIALOG_CAPTION "Remote Shutdown" - IDS_ERROR_DIALOG_INIT "Unable to display the graphical user interface." + IDS_ERROR_SHUTDOWN_REBOOT "ÐÐ¨ÐÐÐÐ: ÐÐµÐ»ÑÐ·Ñ Ð¾Ð´Ð½Ð¾Ð²ÑÐµÐ¼ÐµÐ½Ð½Ð¾ Ð²ÑÐºÐ»ÑÑÐ¸ÑÑ Ð¸ Ð¿ÐµÑÐµÐ·Ð°Ð³ÑÑÐ·Ð¸ÑÑ ÐºÐ¾Ð¼Ð¿ÑÑÑÐµÑ.\n" + IDS_ERROR_TIMEOUT "ÐÐ¨ÐÐÐÐ: ÐÑÐµÐ¼Ñ Ð¾Ð¶Ð¸Ð´Ð°Ð½Ð¸Ñ %u Ð½Ð°ÑÐ¾Ð´Ð¸ÑÑÑ Ð·Ð° Ð³ÑÐ°Ð½Ð¸ÑÐ°Ð¼Ð¸ Ð´Ð¸Ð°Ð¿Ð°Ð·Ð¾Ð½Ð° (0-315360000).\n" + IDS_ERROR_ABORT "ÐÐ¨ÐÐÐÐ: ÐÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð¾ÑÐ¼ÐµÐ½Ð¸ÑÑ Ð·Ð°Ð²ÐµÑÑÐµÐ½Ð¸Ðµ ÑÐ¸ÑÑÐµÐ¼Ñ.\n" + IDS_ERROR_LOGOFF "ÐÐ¨ÐÐÐÐ: ÐÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ ÑÐ¾Ð²ÐµÑÑÐ¸ÑÑ Ð²ÑÑÐ¾Ð´ Ð¸Ð· ÑÐ¸ÑÑÐµÐ¼Ñ.\n" + IDS_ERROR_SHUTDOWN "ÐÐ¨ÐÐÐÐ: ÐÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð²ÑÐºÐ»ÑÑÐ¸ÑÑ ÑÐ¸ÑÑÐµÐ¼Ñ.\n" + IDS_ERROR_RESTART "ÐÐ¨ÐÐÐÐ: ÐÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð¿ÐµÑÐµÐ·Ð°Ð³ÑÑÐ·Ð¸ÑÑ ÑÐ¸ÑÑÐµÐ¼Ñ.\n" + IDS_ERROR_MAX_COMMENT_LENGTH "ÐÐ¨ÐÐÐÐ: ÐÐ»Ð¸Ð½Ð° ÐºÐ¾Ð¼ÐµÐ½ÑÐ°ÑÐ¸Ñ Ð¿ÑÐµÐ²ÑÑÐ¸Ð»Ð° Ð¼Ð°ÐºÑÐ¸Ð¼Ð°Ð»ÑÐ½ÑÑ Ð´Ð»Ð¸Ð½Ñ ÑÐ¾Ð¾Ð±ÑÐµÐ½Ð¸Ñ.\n" + IDS_ERROR_HIBERNATE "ÐÐ¨ÐÐÐÐ: ÐÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð¾ÑÐ¿ÑÐ°Ð²Ð¸ÑÑ ÑÐ¸ÑÑÐµÐ¼Ñ Ð² ÑÐµÐ¶Ð¸Ð¼ Ð³Ð¸Ð±ÐµÑÐ½Ð°ÑÐ¸Ð¸ (""ÑÐ¿ÑÑÐ¸Ð¹ ÑÐµÐ¶Ð¸Ð¼"").\n" + IDS_ERROR_HIBERNATE_LOCAL "ÐÐ¨ÐÐÐÐ: Ð¡Ð¿ÑÑÐ¸Ð¹ ÑÐµÐ¶Ð¸Ð¼ Ð½ÐµÐ»ÑÐ·Ñ Ð·Ð°Ð¿ÑÑÑÐ¸ÑÑ Ð½Ð° ÑÐ´Ð°Ð»ÐµÐ½Ð½Ð¾Ð¼ ÐºÐ¾Ð¼Ð¿ÑÑÑÐµÑÐµ.\n" + IDS_ERROR_HIBERNATE_ENABLED "ÐÐ¨ÐÐÐÐ: Ð¡Ð¿ÑÑÐ¸Ð¹ ÑÐµÐ¶Ð¸Ð¼ Ð½Ðµ Ð²ÐºÐ»ÑÑÐµÐ½.\n" + IDS_ERROR_DIALOG_CAPTION "Ð£Ð´Ð°Ð»ÐµÐ½Ð½Ð¾Ðµ Ð·Ð°Ð²ÐµÑÑÐµÐ½Ð¸Ðµ ÑÐ°Ð±Ð¾ÑÑ" + IDS_ERROR_DIALOG_INIT "ÐÐµ ÑÐ´Ð°ÐµÑÑÑ Ð¿Ð¾ÐºÐ°Ð·Ð°ÑÑ Ð¾ÐºÐ½Ð¾ Ð³ÑÐ°ÑÐ¸ÑÐµÑÐºÐ¾Ð³Ð¾ Ð¸Ð½ÑÐµÑÑÐµÐ¹ÑÐ°." END /* Remote shutdown action strings */ STRINGTABLE BEGIN - IDS_ACTION_SHUTDOWN "Shutdown the system" - IDS_ACTION_RESTART "Restart the system" - IDS_ACTION_UNEXPECTED_SHUTDOWN "Annotate the unexpected shutdown" + IDS_ACTION_SHUTDOWN "ÐÑÐºÐ»ÑÑÐ¸ÑÑ ÑÐ¸ÑÑÐµÐ¼Ñ" + IDS_ACTION_RESTART "ÐÐµÑÐµÐ·Ð°Ð¿ÑÑÑÐ¸ÑÑ ÑÐ¸ÑÑÐµÐ¼Ñ" + IDS_ACTION_UNEXPECTED_SHUTDOWN "ÐÐ¿Ð¸ÑÐ°ÑÑ Ð½ÐµÐ¾Ð¶Ð¸Ð´Ð°Ð½Ð½Ð¾Ðµ Ð²ÑÐºÐ»ÑÑÐµÐ½Ð¸Ðµ" END /* Remote shutdown reason strings */ STRINGTABLE BEGIN - IDS_REASON_OTHER "Other" - IDS_REASON_HARDWARE_MAINTENANCE "Hardware: Maintenance" - IDS_REASON_HARDWARE_INSTALL "Hardware: Installation" - IDS_REASON_OS_RECOVER "Operating System: Recovery" - IDS_REASON_OS_RECONFIGURE "Operating System: Reconfigure" - IDS_REASON_APP_MAINTENANCE "Application: Maintenance" - IDS_REASON_APP_INSTALL "Application: Installation" - IDS_REASON_APP_UNRESPONSIVE "Application: Unresponsive" - IDS_REASON_APP_UNSTABLE "Application: Unstable" - IDS_REASON_SECURITY "Security Issue" - IDS_REASON_NETWORK "Loss of network connectivity" + IDS_REASON_OTHER "ÐÑÑÐ³Ð°Ñ" + IDS_REASON_HARDWARE_MAINTENANCE "ÐÐ±Ð¾ÑÑÐ´Ð¾Ð²Ð°Ð½Ð¸Ðµ: ÐÐ±ÑÐ»ÑÐ¶Ð¸Ð²Ð°Ð½Ð¸Ðµ" + IDS_REASON_HARDWARE_INSTALL "ÐÐ±Ð¾ÑÑÐ´Ð¾Ð²Ð°Ð½Ð¸Ðµ: Ð£ÑÑÐ°Ð½Ð¾Ð²ÐºÐ°" + IDS_REASON_OS_RECOVER "ÐÐ¿ÐµÑÐ°ÑÐ¸Ð¾Ð½Ð½Ð°Ñ ÑÐ¸ÑÑÐµÐ¼Ð°: ÐÐ¾ÑÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ðµ" + IDS_REASON_OS_RECONFIGURE "ÐÐ¿ÐµÑÐ°ÑÐ¸Ð¾Ð½Ð½Ð°Ñ ÑÐ¸ÑÑÐµÐ¼Ð°: ÐÐ°ÑÑÑÐ¾Ð¹ÐºÐ°" + IDS_REASON_APP_MAINTENANCE "ÐÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ: ÐÐ±ÑÐ»ÑÐ¶Ð¸Ð²Ð°Ð½Ð¸Ðµ" + IDS_REASON_APP_INSTALL "ÐÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ: Ð£ÑÑÐ°Ð½Ð¾Ð²ÐºÐ°" + IDS_REASON_APP_UNRESPONSIVE "ÐÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ: ÐÐµ Ð¾ÑÐ²ÐµÑÐ°ÐµÑ" + IDS_REASON_APP_UNSTABLE "ÐÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ: ÐÐµÑÑÐ°Ð±Ð¸Ð»ÑÐ½Ð°Ñ ÑÐ°Ð±Ð¾ÑÐ°" + IDS_REASON_SECURITY "ÐÑÐ¾Ð±Ð»ÐµÐ¼Ð° Ð±ÐµÐ·Ð¾Ð¿Ð°ÑÐ½Ð¾ÑÑÐ¸" + IDS_REASON_NETWORK "ÐÐ¾ÑÐµÑÑ ÑÐµÑÐµÐ²Ð¾Ð³Ð¾ ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ñ" END Added: trunk/reactos/base/applications/sndrec32/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… ============================================================================== --- trunk/reactos/base/applications/sndrec32/lang/ru-RU.rc (added) +++ trunk/reactos/base/applications/sndrec32/lang/ru-RU.rc [iso-8859-1] Mon May 19 18:00:47 2014 @@ -0,0 +1,79 @@ +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT + +IDC_REACTOS_SNDREC32 ACCELERATORS +BEGIN + "?", IDM_ABOUT, ASCII, ALT + "/", IDM_ABOUT, ASCII, ALT +END + +IDD_ABOUTBOX DIALOGEX 0, 0, 196, 75 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "ÐÐ½ÑÐ¾ÑÐ¼Ð°ÑÐ¸Ñ Ð¾ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ðµ ""ÐÐ²ÑÐºÐ¾Ð·Ð°Ð¿Ð¸ÑÑ Ð´Ð»Ñ ReactOS"" " +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + ICON IDI_SNDREC32, -1, 19, 14, 21, 20 + LTEXT "ÐÐ²ÑÐºÐ¾Ð·Ð°Ð¿Ð¸ÑÑ Ð´Ð»Ñ ReactOS, Ð²ÐµÑÑÐ¸Ñ 1.0", IDC_STATIC, 56, 16, 114, 8, SS_NOPREFIX + LTEXT "Copyright (C) 2009", IDC_STATIC, 56, 25, 114, 8 + DEFPUSHBUTTON "OK", IDOK, 139, 54, 50, 14, WS_GROUP +END + +IDR_MENU1 MENU +BEGIN + POPUP "&Ð¤Ð°Ð¹Ð»" + BEGIN + MENUITEM "&Ð¡Ð¾Ð·Ð´Ð°ÑÑ", ID_FILE_NEW + MENUITEM "&ÐÑÐºÑÑÑÑ...", ID_FILE_OPEN + MENUITEM "&Ð¡Ð¾ÑÑÐ°Ð½Ð¸ÑÑ", ID_FILE_SAVE, GRAYED + MENUITEM "Ð¡Ð¾ÑÑÐ°Ð½Ð¸ÑÑ Ðº&Ð°Ðº...", ID_FILE_SAVEAS, GRAYED + MENUITEM "&ÐÐ¾ÑÑÑÐ°Ð½Ð¾Ð²Ð¸ÑÑ...", ID_FILE_RESTORE, GRAYED + MENUITEM "Ð¡Ð²Ð¾&Ð¹ÑÑÐ²Ð°", ID_FILE_PROPERTIES + MENUITEM SEPARATOR + MENUITEM "Ð&ÑÑÐ¾Ð´", ID_FILE_EXIT + END + POPUP "&ÐÑÐ°Ð²ÐºÐ°" + BEGIN + MENUITEM "&ÐÐ¾Ð¿Ð¸ÑÐ¾Ð²Ð°ÑÑ", ID_EDIT_COPY + MENUITEM "&ÐÑÑÐ°Ð²Ð¸ÑÑ", ID_EDIT_PASTE, GRAYED + MENUITEM "ÐÑÑÐ°Ð²Ð¸ÑÑ Ð¸ Ñ&Ð¼ÐµÑÐ°ÑÑ", ID_EDIT_PASTEMIX, GRAYED + MENUITEM SEPARATOR + MENUITEM "ÐÑÑÐ°Ð²Ð¸ÑÑ &ÑÐ°Ð¹Ð»...", ID_EDIT_INSERTFILE + MENUITEM "Ð¡Ð¼Ðµ&ÑÐ°ÑÑ Ñ ÑÐ°Ð¹Ð»Ð¾Ð¼...", ID_EDIT_MIXFILE + MENUITEM SEPARATOR + MENUITEM "&Ð£Ð´Ð°Ð»Ð¸ÑÑ Ð´Ð¾ ÑÐµÐºÑÑÐµÐ¹ Ð¿Ð¾Ð·Ð¸ÑÐ¸Ð¸", ID_EDIT_DELETEBEFORE, GRAYED + MENUITEM "Ð£Ð´Ð°&Ð»Ð¸ÑÑ Ð¿Ð¾ÑÐ»Ðµ ÑÐµÐºÑÑÐµÐ¹ Ð¿Ð¾Ð·Ð¸ÑÐ¸Ð¸", ID_EDIT_DELETEAFTER, GRAYED + MENUITEM SEPARATOR + MENUITEM "Ð¡Ð²Ð¾&Ð¹ÑÑÐ²Ð° Ð°ÑÐ´Ð¸Ð¾", ID_EDIT_AUDIOPROPS + END + POPUP "&ÐÑÑÐµÐºÑÑ" + BEGIN + MENUITEM "&Ð£Ð²ÐµÐ»Ð¸ÑÐ¸ÑÑ Ð³ÑÐ¾Ð¼ÐºÐ¾ÑÑÑ (Ð½Ð° 25%)", ID_EFFECTS_INCVOL + MENUITEM "Ð£&Ð¼ÐµÐ½ÑÑÐ¸ÑÑ Ð³ÑÐ¾Ð¼ÐºÐ¾ÑÑÑ", ID_EFFECTS_DECVOL + MENUITEM SEPARATOR + MENUITEM "Ð£&Ð²ÐµÐ»Ð¸ÑÐ¸ÑÑ ÑÐºÐ¾ÑÐ¾ÑÑÑ (Ð½Ð° 100%)", ID_EFFECTS_INCSPD + MENUITEM "Ð£Ð¼&ÐµÐ½ÑÑÐ¸ÑÑ ÑÐºÐ¾ÑÐ¾ÑÑÑ", ID_EFFECTS_DECSPD + MENUITEM SEPARATOR + MENUITEM "ÐÐ¾Ð±Ð°Ð²Ð¸ÑÑ &ÑÑÐ¾", ID_EFFECTS_ECHO + MENUITEM "Ð&Ð±ÑÐ°ÑÐ¸ÑÑ", ID_EFFECTS_REVERSE + END + POPUP "&?" + BEGIN + MENUITEM "&Ð Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ðµ...", ID_ABOUT + END +END + +STRINGTABLE +BEGIN + IDS_APP_TITLE "ÐÐ²ÑÐºÐ¾Ð·Ð°Ð¿Ð¸ÑÑ" + IDC_REACTOS_SNDREC32 "REACTOS_SNDREC32" +END + +STRINGTABLE +BEGIN + IDS_STRPOS "ÐÐ¾Ð·Ð¸ÑÐ¸Ñ: %.2f Ñ." + IDS_STRDUR "ÐÐ»Ð¸Ð½Ð°: %.2f Ñ." + IDS_STRBUF "ÐÑÑÐµÑ: %.2f ÐÐ±" + IDS_STRFMT "%.1f ÐºÐÑ, %u Ð±Ð¸Ñ" + IDS_STRMONO "Ð¼Ð¾Ð½Ð¾" + IDS_STRSTEREO "ÑÑÐµÑÐµÐ¾" + IDS_STRCHAN "%s" +END Propchange: trunk/reactos/base/applications/sndrec32/lang/ru-RU.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/sndrec32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… ============================================================================== --- trunk/reactos/base/applications/sndrec32/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndrec32/rsrc.rc [iso-8859-1] Mon May 19 18:00:47 2014 @@ -53,6 +53,9 @@ #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 Modified: trunk/reactos/base/applications/sndvol32/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… ============================================================================== --- trunk/reactos/base/applications/sndvol32/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndvol32/lang/ru-RU.rc [iso-8859-1] Mon May 19 18:00:47 2014 @@ -47,12 +47,12 @@ STYLE WS_POPUP | WS_BORDER FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Master", IDC_LINE_NAME, 4, 7, 100, 15 + LTEXT "ÐÐ»Ð°Ð²Ð½Ð°Ñ", IDC_LINE_NAME, 4, 7, 100, 15 CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE, 4, 30, 82, 1 - LTEXT "Balance", -1, 4, 35, 80, 42 - LTEXT "Volume", -1, 4, 100, 77, 108 + LTEXT "ÐÐ°Ð»Ð°Ð½Ñ", -1, 4, 35, 80, 42 + LTEXT "ÐÑÐ¾Ð¼ÐºÐ¾ÑÑÑ", -1, 4, 100, 77, 108 CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | TBS_BOTH | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 55, 85, 30 CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_AUTOTICKS | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 32, 115, 30, 70 - CHECKBOX "&Mute", IDC_LINE_SWITCH, 4, 190, 90, 12, BS_AUTOCHECKBOX + CHECKBOX "Ð&ÑÐºÐ». Ð²ÑÐµ", IDC_LINE_SWITCH, 4, 190, 90, 12, BS_AUTOCHECKBOX CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 130, 7, 1, 200 END Modified: trunk/reactos/base/setup/reactos/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/ru… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/ru-RU.rc [iso-8859-1] Mon May 19 18:00:47 2014 @@ -7,7 +7,7 @@ BEGIN LTEXT "ÐÐ°Ñ Ð¿ÑÐ¸Ð²ÐµÑÑÑÐ²ÑÐµÑ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ð° ÑÑÑÐ°Ð½Ð¾Ð²ÐºÐ¸ ReactOS.", IDC_STARTTITLE, 115, 8, 195, 24 LTEXT "Ð£ÑÑÐ°Ð½Ð¾Ð²ÐºÑ ReactOS Ð¼Ð¾Ð¶Ð½Ð¾ Ð¿ÑÐ¾Ð¸Ð·Ð²Ð¾Ð´Ð¸ÑÑ ÑÐ¾Ð»ÑÐºÐ¾ Ð·Ð°Ð³ÑÑÐ·Ð¸Ð²ÑÐ¸ÑÑ Ñ ÑÑÐ¾Ð³Ð¾ Ð´Ð¸ÑÐºÐ°! ÐÐ¾ÑÐ»Ðµ Ð¿ÐµÑÐµÐ·Ð°Ð¿ÑÑÐºÐ° ÐºÐ¾Ð¼Ð¿ÑÑÑÐµÑÐ° Ð²ÑÐ±ÐµÑÐ¸ÑÐµ Ð·Ð°Ð³ÑÑÐ·ÐºÑ Ñ CD Ð¸ Ð½Ð°ÑÐ½Ð¸ÑÐµ ÑÑÑÐ°Ð½Ð¾Ð²ÐºÑ ReactOS.", IDC_STATIC, 115, 40, 195, 100 - LTEXT "ÐÐ°Ð¶Ð¼Ð¸ÑÐµ ÐºÐ½Ð¾Ð¿ÐºÑ ""ÐÐ°Ð²ÐµÑÑÐ¸ÑÑW"" Ð´Ð»Ñ Ð²ÑÑÐ¾Ð´Ð°.", IDC_STATIC, 115, 169, 195, 17 + LTEXT "ÐÐ°Ð¶Ð¼Ð¸ÑÐµ ÐºÐ½Ð¾Ð¿ÐºÑ ""ÐÐ°Ð²ÐµÑÑÐ¸ÑÑ"" Ð´Ð»Ñ Ð²ÑÑÐ¾Ð´Ð°.", IDC_STATIC, 115, 169, 195, 17 END IDD_LANGSELPAGE DIALOGEX 0, 0, 317, 193 @@ -40,7 +40,7 @@ FONT 8, "MS Shell Dlg" BEGIN CONTROL "ÐÑÐ½Ð¾Ð²Ð½ÑÐµ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð°", IDC_STATIC, "Button", BS_GROUPBOX, 10, 0, 297, 172 - LTEXT "ÐÐ¾Ð¼Ð¿ÑÑÐµÑ:", IDC_STATIC, 20, 15, 80, 10 + LTEXT "ÐÐ¾Ð¼Ð¿ÑÑÑÐµÑ:", IDC_STATIC, 20, 15, 80, 10 CONTROL "", IDC_COMPUTER, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 15, 150, 80 LTEXT "ÐÐºÑÐ°Ð½:", IDC_STATIC, 20, 35, 80, 10 CONTROL "", IDC_DISPLAY, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 35, 150, 80 @@ -65,7 +65,7 @@ IDD_PARTITION DIALOGEX 0, 0, 145, 90 STYLE WS_VISIBLE | WS_CAPTION -CAPTION "Create Partition" +CAPTION "Ð¡Ð¾Ð·Ð´Ð°ÑÑ ÑÐ°Ð·Ð´ÐµÐ» Ð½Ð° Ð´Ð¸ÑÐºÐµ" FONT 8, "MS Shell Dlg" BEGIN CONTROL "", IDC_UPDOWN1, "msctls_updown32", WS_VISIBLE, 104, 22, 9, 13 Modified: trunk/reactos/base/shell/explorer-new/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/la… ============================================================================== --- trunk/reactos/base/shell/explorer-new/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/lang/ru-RU.rc [iso-8859-1] Mon May 19 18:00:47 2014 @@ -7,19 +7,19 @@ POPUP "" BEGIN MENUITEM SEPARATOR - MENUITEM "&Adjust Date/Time", ID_SHELL_CMD_ADJUST_DAT - MENUITEM "&Customize Notifications...", ID_SHELL_CMD_CUST_NOTIF + MENUITEM "&ÐÐ°ÑÑÑÐ¾Ð¹ÐºÐ° Ð´Ð°ÑÑ Ð¸ Ð²ÑÐµÐ¼ÐµÐ½Ð¸", ID_SHELL_CMD_ADJUST_DAT + MENUITEM "&ÐÐ°ÑÑÑÐ¾Ð¹ÐºÐ° ÑÐ²ÐµÐ´Ð¾Ð¼Ð»ÐµÐ½Ð¸Ð¹...", ID_SHELL_CMD_CUST_NOTIF MENUITEM SEPARATOR - MENUITEM "Ca&scade Windows", ID_SHELL_CMD_CASCADE_WND - MENUITEM "Tile Windows &Horizontally", ID_SHELL_CMD_TILE_WND_H - MENUITEM "Tile Windows V&ertically", ID_SHELL_CMD_TILE_WND_V - MENUITEM "&Show the Desktop", ID_SHELL_CMD_SHOW_DESKTOP - MENUITEM "&Undo", ID_SHELL_CMD_UNDO_ACTION + MENUITEM "Ð Ð°ÑÐ¿Ð¾Ð»Ð¾Ð¶Ð¸ÑÑ Ð¾ÐºÐ½Ð° &ÐºÐ°ÑÐºÐ°Ð´Ð¾Ð¼", ID_SHELL_CMD_CASCADE_WND + MENUITEM "Ð Ð°ÑÐ¿Ð¾Ð»Ð¾Ð¶Ð¸ÑÑ Ð¾ÐºÐ½Ð° Ð¿Ð¾ &Ð³Ð¾ÑÐ¸Ð·Ð¾Ð½ÑÐ°Ð»Ð¸", ID_SHELL_CMD_TILE_WND_H + MENUITEM "Ð Ð°ÑÐ¿Ð¾Ð»Ð¾Ð¶Ð¸ÑÑ Ð¾ÐºÐ½Ð° Ð¿Ð¾ &Ð²ÐµÑÑÐ¸ÐºÐ°Ð»Ð¸", ID_SHELL_CMD_TILE_WND_V + MENUITEM "ÐÐ¾ÐºÐ°Ð·Ð°ÑÑ &ÑÐ°Ð±Ð¾ÑÐ¸Ð¹ ÑÑÐ¾Ð»", ID_SHELL_CMD_SHOW_DESKTOP + MENUITEM "&ÐÑÐ¼ÐµÐ½Ð¸ÑÑ", ID_SHELL_CMD_UNDO_ACTION MENUITEM SEPARATOR - MENUITEM "ÐÐ¸ÑÐ¿ÐµÑÑÐµÑ Ð·Ð°Ð´Ð°Ñ", ID_SHELL_CMD_OPEN_TASKMGR + MENUITEM "Ð&Ð¸ÑÐ¿ÐµÑÑÐµÑ Ð·Ð°Ð´Ð°Ñ", ID_SHELL_CMD_OPEN_TASKMGR MENUITEM SEPARATOR MENUITEM "&ÐÐ°ÐºÑÐµÐ¿Ð¸ÑÑ Ð¿Ð°Ð½ÐµÐ»Ñ Ð·Ð°Ð´Ð°Ñ", ID_LOCKTASKBAR - MENUITEM "&Ð¡Ð²Ð¾Ð¹ÑÑÐ²Ð°", ID_SHELL_CMD_PROPERTIES + MENUITEM "Ð¡Ð²Ð¾&Ð¹ÑÑÐ²Ð°", ID_SHELL_CMD_PROPERTIES END END @@ -123,11 +123,11 @@ IDD_TASKBARPROP_ADVANCED DIALOGEX 0, 0, 252, 218 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Advanced" +CAPTION "ÐÐ¾Ð¿Ð¾Ð»Ð½Ð¸ÑÐµÐ»ÑÐ½Ð¾" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - GROUPBOX "Advanced options", IDC_STATIC, 6, 6, 240, 121 - AUTOCHECKBOX "Show s&econds", IDC_TASKBARPROP_SECONDS, 13, 18, 200, 10 + GROUPBOX "ÐÐ¾Ð¿Ð¾Ð»Ð½Ð¸ÑÐµÐ»ÑÐ½ÑÐµ Ð½Ð°ÑÑÑÐ¾Ð¹ÐºÐ¸", IDC_STATIC, 6, 6, 240, 121 + AUTOCHECKBOX "ÐÐ¾ÐºÐ°Ð·ÑÐ²Ð°ÑÑ Ñ&ÐµÐºÑÐ½Ð´Ñ", IDC_TASKBARPROP_SECONDS, 13, 18, 200, 10 AUTOCHECKBOX "ÐÑÐ¾Ð±ÑÐ°&Ð¶Ð°ÑÑ Ð¾Ð±ÑÐ°Ð·ÑÑ Ð¾ÐºÐ¾Ð½ (ÑÑÐºÐ¸Ð·Ñ)", IDC_TASKBARPROP_WNDPREV, 13, 31, 200, 10 END @@ -137,7 +137,7 @@ IDS_PROPERTIES "&Ð¡Ð²Ð¾Ð¹ÑÑÐ²Ð°" IDS_OPEN_ALL_USERS "&ÐÑÐµ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ð¸" IDS_EXPLORE_ALL_USERS "&ÐÐ±Ð·Ð¾Ñ ÐÑÐµÑ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»ÐµÐ¹" - IDS_STARTUP_ERROR "The system cannot start explorer because the registry is corrupted or unavailable." + IDS_STARTUP_ERROR "Ð¡Ð¸ÑÑÐµÐ¼Ð° Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ Ð·Ð°Ð¿ÑÑÑÐ¸ÑÑ ÐÑÐ¾Ð²Ð¾Ð´Ð½Ð¸Ðº, Ð¿Ð¾ÑÐ¾Ð¼Ñ ÑÑÐ¾ Ð´Ð°Ð½Ð½ÑÐµ ÑÐµÐµÑÑÑÐ° Ð¿Ð¾Ð²ÑÐµÐ¶Ð´ÐµÐ½Ñ Ð¸Ð»Ð¸ Ð½ÐµÐ´Ð¾ÑÑÑÐ¿Ð½Ñ." END STRINGTABLE Modified: trunk/reactos/dll/cpl/desk/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/ru-RU.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/ru-RU.rc [iso-8859-1] Mon May 19 18:00:47 2014 @@ -43,17 +43,17 @@ FONT 8, "MS Shell Dlg" BEGIN CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 - LTEXT "Visual Style", IDC_STATIC, 7, 130, 104, 9 + LTEXT "&ÐÐºÐ½Ð° Ð¸ ÐºÐ½Ð¾Ð¿ÐºÐ¸:", IDC_STATIC, 7, 130, 104, 9 COMBOBOX IDC_APPEARANCE_VISUAL_STYLE, 7, 140, 134, 90, CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP - LTEXT "Ð¦Ð²ÐµÑÐ¾Ð²Ð°Ñ ÑÑÐµÐ¼Ð°", IDC_STATIC, 7, 160, 104, 9 + LTEXT "&Ð¦Ð²ÐµÑÐ¾Ð²Ð°Ñ ÑÑÐµÐ¼Ð°:", IDC_STATIC, 7, 160, 104, 9 COMBOBOX IDC_APPEARANCE_COLORSCHEME, 7, 170, 134, 90, CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP - LTEXT "Size", IDC_STATIC, 7, 190, 104, 9 + LTEXT "&Ð Ð°Ð·Ð¼ÐµÑ ÑÑÐ¸ÑÑÐ°:", IDC_STATIC, 7, 190, 104, 9 COMBOBOX IDC_APPEARANCE_SIZE, 7, 200, 134, 90, CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "&ÐÑÑÐµÐºÑÑ...", IDC_APPEARANCE_EFFECTS, 182, 150, 56, 15 - PUSHBUTTON "ÐÐ¾Ð¿Ð¾Ð»Ð½Ð¸ÑÐµÐ»ÑÐ½Ð¾", IDC_APPEARANCE_ADVANCED, 182, 170, 56, 15 + PUSHBUTTON "&ÐÐ¾Ð¿Ð¾Ð»Ð½Ð¸ÑÐµÐ»ÑÐ½Ð¾", IDC_APPEARANCE_ADVANCED, 182, 170, 56, 15 END IDD_ADVAPPEARANCE DIALOGEX 0, 0, 250, 239 @@ -222,7 +222,7 @@ IDS_MESSBOX "ÐÐºÐ½Ð¾ ÑÐ¾Ð¾Ð±ÑÐµÐ½Ð¸Ñ" IDS_MESSTEXT "Ð¡Ð¾Ð¾Ð±ÑÐµÐ½Ð¸Ðµ" IDS_BUTTEXT "OK" - IDS_CLASSIC_THEME "Classic Theme" + IDS_CLASSIC_THEME "ÐÐ»Ð°ÑÑÐ¸ÑÐµÑÐºÐ°Ñ ÑÐµÐ¼Ð°" END STRINGTABLE @@ -233,7 +233,7 @@ IDS_ELEMENT_4 "ÐÐ°Ð³Ð¾Ð»Ð¾Ð²Ð¾Ðº Ð°ÐºÑÐ¸Ð²Ð½ÑÑ Ð¾ÐºÐ¾Ð½" IDS_ELEMENT_5 "ÐÑÐ°Ð½Ð¸ÑÐ° Ð°ÐºÑÐ¸Ð²Ð½ÑÑ Ð¾ÐºÐ¾Ð½" IDS_ELEMENT_6 "ÐÐµÐ½Ñ" - IDS_ELEMENT_7 "ÐÑÐ»ÐµÐ´ÐµÐ½Ð½ÑÐµ ÑÐ»ÐµÐ¼ÐµÐ½ÑÑ" + IDS_ELEMENT_7 "ÐÑÐ´ÐµÐ»ÐµÐ½Ð½ÑÐµ ÑÐ»ÐµÐ¼ÐµÐ½ÑÑ" IDS_ELEMENT_8 "ÐÐºÐ½Ð°" IDS_ELEMENT_9 "ÐÐ¾Ð»Ð¾ÑÐ° Ð¿ÑÐ¾ÐºÑÑÑÐºÐ¸" IDS_ELEMENT_10 "Ð ÐµÐ»ÑÐµÑÐ½ÑÐµ Ð¾Ð±ÑÐµÐºÑÑ" @@ -244,7 +244,7 @@ IDS_ELEMENT_15 "ÐÐ¸Ð°Ð»Ð¾Ð³" IDS_ELEMENT_16 "ÐÐ¾Ð»Ð¾ÑÑ Ð¿ÑÐ¾ÐºÑÑÑÐºÐ¸" IDS_ELEMENT_17 "Ð Ð°Ð±Ð¾ÑÐ°Ñ Ð¾Ð±Ð»Ð°ÑÑÑ Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ" - IDS_ELEMENT_18 "Small captionbar" + IDS_ELEMENT_18 "ÐÐ°Ð·Ð²Ð°Ð½Ð¸Ðµ Ð¿Ð°Ð½ÐµÐ»Ð¸" IDS_ELEMENT_19 "ÐÐ½ÑÐµÑÐ²Ð°Ð» Ð¼ÐµÐ¶Ð´Ñ Ð·Ð½Ð°ÑÐºÐ°Ð¼Ð¸ (Ð³Ð¾Ñ.)" IDS_ELEMENT_20 "ÐÐ½ÑÐµÑÐ²Ð°Ð» Ð¼ÐµÐ¶Ð´Ñ Ð·Ð½Ð°ÑÐºÐ°Ð¼Ð¸ (Ð²ÐµÑÑ.)" IDS_ELEMENT_21 "ÐÑÐ¿Ð»ÑÐ²Ð°ÑÑÐ°Ñ Ð¿Ð¾Ð´ÑÐºÐ°Ð·ÐºÐ°" Modified: trunk/reactos/dll/cpl/mmsys/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/ru-RU.r… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/lang/ru-RU.rc [iso-8859-1] Mon May 19 18:00:47 2014 @@ -233,7 +233,7 @@ IDS_CPLNAME "ÐÐ²ÑÐº Ð¸ Ð°ÑÐ´Ð¸Ð¾ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð°" IDS_CPLDESCRIPTION "ÐÐ·Ð¼ÐµÐ½ÐµÐ½Ð¸Ðµ Ð·Ð²ÑÐºÐ¾Ð²ÑÑ ÑÑÐµÐ¼ Ð²Ð°ÑÐµÐ³Ð¾ ÐºÐ¾Ð¼Ð¿ÑÑÑÐµÑÐ°, Ð½Ð°ÑÑÑÐ¾Ð¹ÐºÐ° ÐºÐ¾Ð»Ð¾Ð½Ð¾Ðº Ð¸ Ð·Ð°Ð¿Ð¸ÑÑÐ²Ð°ÑÑÐ¸Ñ ÑÑÑÑÐ¾Ð¹ÑÑÐ²." IDS_NO_SOUND "(ÐÐµÑ)" - IDS_NO_DEVICES "No Devices" + IDS_NO_DEVICES "ÐÐµÑ ÑÑÑÑÐ¾Ð¹ÑÑÐ²" 5825 "ÐÑÐ¸Ð±ÐºÐ° Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ñ" 5826 "ÐÐ°ÐºÑÑÑÑ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ñ" 5827 "Ð¡Ð¸Ð³Ð½Ð°Ð» Ð¿Ð¾ÑÑÐ¸ Ð¿Ð¾Ð»Ð½Ð¾Ð¹ ÑÐ°Ð·ÑÑÐ´ÐºÐ¸ Ð±Ð°ÑÐ°ÑÐµÐ¹" Modified: trunk/reactos/dll/win32/aclui/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/aclui/lang/ru-RU… ============================================================================== --- trunk/reactos/dll/win32/aclui/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/aclui/lang/ru-RU.rc [iso-8859-1] Mon May 19 18:00:47 2014 @@ -7,7 +7,7 @@ BEGIN LTEXT "&ÐÐ¼Ñ Ð³ÑÑÐ¿Ð¿Ñ Ð¸Ð»Ð¸ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ:", -1, 7, 21, 105, 8 CONTROL "", IDC_PRINCIPALS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_NOCOLUMNHEADER | LVS_NOSORTHEADER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP, 7, 31, 213, 52, WS_EX_NOPARENTNOTIFY | WS_EX_CLIENTEDGE - LTEXT "&Owner:", -1, 7, 7, 49, 8 + LTEXT "&ÐÐ»Ð°Ð´ÐµÐ»ÐµÑ:", -1, 7, 7, 49, 8 EDITTEXT IDC_OWNER, 63, 4, 156, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_READONLY PUSHBUTTON "ÐÐ¾&Ð±Ð°Ð²Ð¸ÑÑ...", IDC_ADD_PRINCIPAL, 116, 87, 50, 14 PUSHBUTTON "&Ð£Ð´Ð°Ð»Ð¸ÑÑ", IDC_REMOVE_PRINCIPAL, 170, 87, 50, 14

10 years, 7 months

[dreimer] 63372: [WINED3DCFG] German translation by ... me.

by dreimer＠svn.reactos.org

Author: dreimer Date: Mon May 19 17:33:24 2014 New Revision: 63372 URL: http://svn.reactos.org/svn/reactos?rev=63372&view=rev Log: [WINED3DCFG] German translation by ... me. Modified: trunk/reactos/dll/cpl/wined3dcfg/lang/de-DE.rc trunk/reactos/dll/cpl/wined3dcfg/lang/en-US.rc Modified: trunk/reactos/dll/cpl/wined3dcfg/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/wined3dcfg/lang/de… ============================================================================== --- trunk/reactos/dll/cpl/wined3dcfg/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/wined3dcfg/lang/de-DE.rc [iso-8859-1] Mon May 19 17:33:24 2014 @@ -6,25 +6,25 @@ FONT 8, "MS Shell Dlg" BEGIN ICON IDI_CPLICON, IDI_CPLICON, 8, 0, 21, 20 - GROUPBOX "Shaders", -1, 5, 25, 230, 80 - LTEXT "Enable GLSL", -1, 15, 42, 80, 10 + GROUPBOX "Shader", -1, 5, 25, 230, 80 + LTEXT "GLSL aktivieren", -1, 15, 42, 80, 10 COMBOBOX IDC_GLSL, 95, 40, 90, 10, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST - LTEXT "Maximum GS Level:", -1, 15, 57, 80, 10 + LTEXT "Maximaler GS Level:", -1, 15, 57, 80, 10 COMBOBOX IDC_GSLEVEL, 95, 55, 90, 10, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST - LTEXT "Maximum PS level:", -1, 15, 72, 80, 10 + LTEXT "Maximaler PS Level:", -1, 15, 72, 80, 10 COMBOBOX IDC_PSLEVEL, 95, 70, 90, 10, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST - LTEXT "Maximum VS Level:", -1, 15, 87, 80, 10 + LTEXT "Maximaler VS Level:", -1, 15, 87, 80, 10 COMBOBOX IDC_VSLEVEL, 95, 85, 90, 10, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST - GROUPBOX "Rendering", -1, 5, 110, 230, 110 + GROUPBOX "Darstellung", -1, 5, 110, 230, 110 LTEXT "Multisampling:", -1, 15, 127, 80, 10 COMBOBOX IDC_MULTISAMPLING, 95, 125, 90, 10, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST - LTEXT "Strict draw ordering:", -1, 15, 142, 80, 10 + LTEXT "Strikte Zeichenreihenfolge:", -1, 15, 142, 80, 10 COMBOBOX IDC_STRICTDRAWORDERING, 95, 140, 90, 10, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST - LTEXT "Offscreen rendering:", -1, 15, 157, 80, 10 + LTEXT "Offscreen Rendering:", -1, 15, 157, 80, 10 COMBOBOX IDC_OFFSCREEN, 95, 155, 90, 10, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST - LTEXT "Always offscreen:", -1, 15, 172, 72, 10, SS_LEFT + LTEXT "Immer Offscreen:", -1, 15, 172, 72, 10, SS_LEFT COMBOBOX IDC_ALWAYSOFFSCREEN, 95, 170, 90, 10, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST - LTEXT "Video memory size:", -1, 15, 187, 72, 10, SS_LEFT + LTEXT "Videospeicher-Größe:", -1, 15, 187, 72, 10, SS_LEFT COMBOBOX IDC_VIDMEMSIZE, 95, 185, 90, 10, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST LTEXT "DirectDraw Renderer:", -1, 15, 202, 72, 10, SS_LEFT COMBOBOX IDC_DDRENDERER, 95, 200, 90, 10, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST Modified: trunk/reactos/dll/cpl/wined3dcfg/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/wined3dcfg/lang/en… ============================================================================== --- trunk/reactos/dll/cpl/wined3dcfg/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/wined3dcfg/lang/en-US.rc [iso-8859-1] Mon May 19 17:33:24 2014 @@ -11,7 +11,7 @@ COMBOBOX IDC_GLSL, 95, 40, 90, 10, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST LTEXT "Maximum GS Level:", -1, 15, 57, 80, 10 COMBOBOX IDC_GSLEVEL, 95, 55, 90, 10, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST - LTEXT "Maximum PS level:", -1, 15, 72, 80, 10 + LTEXT "Maximum PS Level:", -1, 15, 72, 80, 10 COMBOBOX IDC_PSLEVEL, 95, 70, 90, 10, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST LTEXT "Maximum VS Level:", -1, 15, 87, 80, 10 COMBOBOX IDC_VSLEVEL, 95, 85, 90, 10, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST

10 years, 7 months

[dquintana] 63371: [BROWSEUI] * Implement ParseNow to allow navigating to the current address in the editbox. [SHELL32] * Set the focus to the listview if the browser is requesting it. CORE-7330

by dquintana＠svn.reactos.org

Author: dquintana Date: Mon May 19 16:08:30 2014 New Revision: 63371 URL: http://svn.reactos.org/svn/reactos?rev=63371&view=rev Log: [BROWSEUI] * Implement ParseNow to allow navigating to the current address in the editbox. [SHELL32] * Set the focus to the listview if the browser is requesting it. CORE-7330 Modified: branches/shell-experiments/dll/win32/browseui/addresseditbox.cpp branches/shell-experiments/dll/win32/browseui/addresseditbox.h branches/shell-experiments/dll/win32/browseui/internettoolbar.cpp branches/shell-experiments/dll/win32/shell32/shlview.cpp Modified: branches/shell-experiments/dll/win32/browseui/addresseditbox.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/bro… ============================================================================== --- branches/shell-experiments/dll/win32/browseui/addresseditbox.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/browseui/addresseditbox.cpp [iso-8859-1] Mon May 19 16:08:30 2014 @@ -41,7 +41,8 @@ CAddressEditBox::CAddressEditBox() : fCombobox(NULL, this, 1), - fEditWindow(NULL, this, 1) + fEditWindow(NULL, this, 1), + fSite(NULL) { } @@ -69,6 +70,7 @@ { fCombobox.SubclassWindow(comboboxEx); fEditWindow.SubclassWindow(editControl); + fSite = param18; return S_OK; } @@ -82,7 +84,28 @@ HRESULT STDMETHODCALLTYPE CAddressEditBox::ParseNow(long paramC) { - return E_NOTIMPL; + WCHAR address[4096]; + ULONG eaten; + LPITEMIDLIST pidl; + ULONG attributes; + HRESULT hr; + HWND topLevelWindow; + + CComPtr<IShellBrowser> pisb; + hr = IUnknown_QueryService(fSite, SID_SShellBrowser, IID_PPV_ARG(IShellBrowser, &pisb)); + + IUnknown_GetWindow(pisb, &topLevelWindow); + + GetWindowText(fCombobox.m_hWnd, address, 4095); + + CComPtr<IShellFolder> psfDesktop; + hr = SHGetDesktopFolder(&psfDesktop); + hr = psfDesktop->ParseDisplayName(topLevelWindow, NULL, address, &eaten, &pidl, &attributes); + if (SUCCEEDED(hr)) + { + hr = pisb->BrowseObject(pidl, 0); + } + return hr; } HRESULT STDMETHODCALLTYPE CAddressEditBox::Execute(long paramC) Modified: branches/shell-experiments/dll/win32/browseui/addresseditbox.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/bro… ============================================================================== --- branches/shell-experiments/dll/win32/browseui/addresseditbox.h [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/browseui/addresseditbox.h [iso-8859-1] Mon May 19 16:08:30 2014 @@ -35,6 +35,7 @@ private: CContainedWindow fCombobox; CContainedWindow fEditWindow; + CComPtr<IUnknown> fSite; public: CAddressEditBox(); ~CAddressEditBox(); Modified: branches/shell-experiments/dll/win32/browseui/internettoolbar.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/bro… ============================================================================== --- branches/shell-experiments/dll/win32/browseui/internettoolbar.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/browseui/internettoolbar.cpp [iso-8859-1] Mon May 19 16:08:30 2014 @@ -860,6 +860,8 @@ hResult = menuOleWindow->GetWindow(&fMenuBandWindow); fMenuBar.Attach(menuBar.Detach()); // transfer the ref count + // FIXME: The ros Rebar does not properly support fixed-size items such as the brandband, + // and it will put them in their own row, sized to take up the whole row. #if 0 /* Create and attach the brand/logo to the rebar */ hResult = CreateBrandBand(&logoBar); Modified: branches/shell-experiments/dll/win32/shell32/shlview.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… ============================================================================== --- branches/shell-experiments/dll/win32/shell32/shlview.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/shell32/shlview.cpp [iso-8859-1] Mon May 19 16:08:30 2014 @@ -1419,6 +1419,8 @@ { MergeFileMenu(mii.hSubMenu); } + + ::SetFocus(m_hWndList); } TRACE("-- before fnSetMenuSB\n");

10 years, 7 months

[dquintana] 63370: [BROWSEUI] * Disable the brandband again, since it doesn't look right in ros. * Fix the browse window styles so that it can properly open with system-provided default size. * Cha...

by dquintana＠svn.reactos.org

Author: dquintana Date: Mon May 19 12:05:24 2014 New Revision: 63370 URL: http://svn.reactos.org/svn/reactos?rev=63370&view=rev Log: [BROWSEUI] * Disable the brandband again, since it doesn't look right in ros. * Fix the browse window styles so that it can properly open with system-provided default size. * Change the default view mode of the file list to Icons. CORE-7330 Modified: branches/shell-experiments/dll/win32/browseui/internettoolbar.cpp branches/shell-experiments/dll/win32/browseui/shellbrowser.cpp Modified: branches/shell-experiments/dll/win32/browseui/internettoolbar.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/bro… ============================================================================== --- branches/shell-experiments/dll/win32/browseui/internettoolbar.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/browseui/internettoolbar.cpp [iso-8859-1] Mon May 19 12:05:24 2014 @@ -860,12 +860,14 @@ hResult = menuOleWindow->GetWindow(&fMenuBandWindow); fMenuBar.Attach(menuBar.Detach()); // transfer the ref count +#if 0 /* Create and attach the brand/logo to the rebar */ hResult = CreateBrandBand(&logoBar); if (FAILED(hResult)) return hResult; AddDockItem(logoBar, ITBBID_BRANDBAND, CDockSite::ITF_NOGRIPPER | CDockSite::ITF_NOTITLE | CDockSite::ITF_FIXEDSIZE); fLogoBar.Attach(logoBar.Detach()); // transfer the ref count +#endif /* Create and attach the standard toolbar to the rebar */ hResult = CreateToolsBar(&toolsBar); Modified: branches/shell-experiments/dll/win32/browseui/shellbrowser.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/bro… ============================================================================== --- branches/shell-experiments/dll/win32/browseui/shellbrowser.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/browseui/shellbrowser.cpp [iso-8859-1] Mon May 19 12:05:24 2014 @@ -287,7 +287,7 @@ */ class CShellBrowser : - public CWindowImpl<CShellBrowser, CWindow, CControlWinTraits>, + public CWindowImpl<CShellBrowser, CWindow, CFrameWinTraits>, public CComObjectRootEx<CComMultiThreadModelNoCS>, public IShellBrowser, public IDropTarget, @@ -732,7 +732,6 @@ CComPtr<IPersistStreamInit> persistStreamInit; CComPtr<IOleCommandTarget> commandTarget; CComPtr<IObjectWithSite> objectSite; - RECT bounds = {0, 0, 800, 591}; HRESULT hResult; _AtlInitialConstruct(); @@ -743,7 +742,7 @@ } // create window - Create(HWND_DESKTOP, bounds, NULL, WS_OVERLAPPEDWINDOW | WS_CLIPSIBLINGS | WS_CLIPCHILDREN, 0, 0U); + Create(HWND_DESKTOP); if (m_hWnd == NULL) return E_FAIL; @@ -808,11 +807,7 @@ _AtlBaseModule.GetModuleInstance(), 0); fStatusBarVisible = true; - FOLDERSETTINGS newFolderSettings; - // browse - newFolderSettings.ViewMode = FVM_LIST; - newFolderSettings.fFlags = 0; hResult = BrowseToPIDL(pidl, BTP_UPDATE_NEXT_HISTORY); if (FAILED(hResult)) return hResult; @@ -831,7 +826,7 @@ // called by shell view to browse to new folder // also called by explorer band to navigate to new folder hResult = SHBindToFolder(pidl, &newFolder); - newFolderSettings.ViewMode = FVM_LIST; + newFolderSettings.ViewMode = FVM_ICON; newFolderSettings.fFlags = 0; hResult = BrowseToPath(newFolder, pidl, &newFolderSettings, flags); if (FAILED(hResult))

10 years, 7 months

[dquintana] 63369: [EXPLORER-NEW] * Default to always-on-top if the registry setting is not found. * Reload and apply settings on display change. Fixes taskbar not repositioning on resolution chang...

by dquintana＠svn.reactos.org

Author: dquintana Date: Mon May 19 10:44:33 2014 New Revision: 63369 URL: http://svn.reactos.org/svn/reactos?rev=63369&view=rev Log: [EXPLORER-NEW] * Default to always-on-top if the registry setting is not found. * Reload and apply settings on display change. Fixes taskbar not repositioning on resolution changes. CORE-7330 Modified: branches/shell-experiments/base/shell/explorer-new/traywnd.c Modified: branches/shell-experiments/base/shell/explorer-new/traywnd.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/ex… ============================================================================== --- branches/shell-experiments/base/shell/explorer-new/traywnd.c [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/explorer-new/traywnd.c [iso-8859-1] Mon May 19 10:44:33 2014 @@ -768,15 +768,6 @@ /* FIXME: Are there more flags? */ - if (This->hWnd != NULL) - SetWindowPos (This->hWnd, - This->AlwaysOnTop ? HWND_TOPMOST : HWND_NOTOPMOST, - 0, - 0, - 0, - 0, - SWP_NOMOVE | SWP_NOSIZE); - if (sr.Position > ABE_BOTTOM) This->Position = ABE_BOTTOM; else @@ -794,6 +785,7 @@ else { This->Position = ABE_BOTTOM; + This->AlwaysOnTop = TRUE; /* Use the minimum size of the taskbar, we'll use the start button as a minimum for now. Make sure we calculate the @@ -812,6 +804,15 @@ &rcScreen, MONITOR_DEFAULTTOPRIMARY); } + + if (This->hWnd != NULL) + SetWindowPos(This->hWnd, + This->AlwaysOnTop ? HWND_TOPMOST : HWND_NOTOPMOST, + 0, + 0, + 0, + 0, + SWP_NOMOVE | SWP_NOSIZE); /* Determine a minimum tray window rectangle. The "client" height is zero here since we cannot determine an optimal minimum width when @@ -2151,6 +2152,19 @@ switch (uMsg) { + case WM_DISPLAYCHANGE: + + /* Load the saved tray window settings */ + ITrayWindowImpl_RegLoadSettings(This); + + /* Move the tray window to the right position and resize it if neccessary */ + ITrayWindowImpl_CheckTrayWndPosition(This); + + /* Align all controls on the tray window */ + ITrayWindowImpl_AlignControls(This, NULL); + + break; + case WM_COPYDATA: { if (This->hwndTrayNotify)

10 years, 7 months

[khornicek] 63368: [WINED3DCFG] - rewrite the wined3d config cpl to make it work with the current version of wined3d - add a "default" option so it's easier to revert changes done to the configurat...

by khornicek＠svn.reactos.org

Author: khornicek Date: Mon May 19 09:58:26 2014 New Revision: 63368 URL: http://svn.reactos.org/svn/reactos?rev=63368&view=rev Log: [WINED3DCFG] - rewrite the wined3d config cpl to make it work with the current version of wined3d - add a "default" option so it's easier to revert changes done to the configuration - I apologize for the "lost" translations but there were too many changes Modified: trunk/reactos/dll/cpl/wined3dcfg/general.c trunk/reactos/dll/cpl/wined3dcfg/lang/cs-CZ.rc trunk/reactos/dll/cpl/wined3dcfg/lang/de-DE.rc trunk/reactos/dll/cpl/wined3dcfg/lang/en-US.rc trunk/reactos/dll/cpl/wined3dcfg/lang/he-IL.rc trunk/reactos/dll/cpl/wined3dcfg/lang/pl-PL.rc trunk/reactos/dll/cpl/wined3dcfg/lang/ro-RO.rc trunk/reactos/dll/cpl/wined3dcfg/lang/sq-AL.rc trunk/reactos/dll/cpl/wined3dcfg/lang/tr-TR.rc trunk/reactos/dll/cpl/wined3dcfg/resource.h trunk/reactos/dll/cpl/wined3dcfg/wined3dcfg.h Modified: trunk/reactos/dll/cpl/wined3dcfg/general.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/wined3dcfg/general… ============================================================================== --- trunk/reactos/dll/cpl/wined3dcfg/general.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/wined3dcfg/general.c [iso-8859-1] Mon May 19 09:58:26 2014 @@ -2,123 +2,142 @@ #include <winreg.h> -static LONG ReadSetting(HKEY hKey, PWCHAR szKey, PWCHAR szBuffer, DWORD dwSize) +WINED3D_SETTINGS gwd3dsShaderLvl[] = { - return RegQueryValueExW(hKey, szKey, NULL, NULL, (LPBYTE)szBuffer, &dwSize); -} + {VALUE_DEFAULT, REG_NONE, 0}, + {L"1.4", REG_DWORD, 1}, + {L"2", REG_DWORD, 2}, + {L"3", REG_DWORD, 3}, +}; -static VOID SaveSetting(HKEY hKey, PWCHAR szKey, PWCHAR szState) +WINED3D_SETTINGS gwd3dsDisable[] = { - RegSetValueExW(hKey, szKey, 0, REG_SZ, (LPBYTE)szState, (wcslen(szState) + 1) * sizeof(WCHAR)); + {VALUE_DEFAULT, REG_NONE, 0}, + {VALUE_DISABLED, REG_SZ, 0} +}; + +WINED3D_SETTINGS gwd3dsEnable[] = +{ + {VALUE_DEFAULT, REG_NONE, 0}, + {VALUE_ENABLED, REG_SZ, 0} +}; + +WINED3D_SETTINGS gwd3dsOffscreen[] = +{ + {VALUE_DEFAULT, REG_NONE, 0}, + {VALUE_BACKBUFFER, REG_SZ, 0}, + {VALUE_FBO, REG_SZ, 0} +}; + +WINED3D_SETTINGS gwd3dsVidMem[] = +{ + {VALUE_DEFAULT, REG_NONE, 0}, + {L"8", REG_SZ, 8}, + {L"16", REG_SZ, 16}, + {L"32", REG_SZ, 32}, + {L"64", REG_SZ, 64}, + {L"128", REG_SZ, 128}, + {L"256", REG_SZ, 256}, + {L"512", REG_SZ, 512}, +}; + +WINED3D_SETTINGS gwd3dsDdRender[] = +{ + {VALUE_DEFAULT, REG_NONE, 0}, + {VALUE_GDI, REG_SZ, 0} +}; + + +void InitControl(HWND hWndDlg, HKEY hKey, PWCHAR szKey, PWINED3D_SETTINGS pSettings, INT iControlId, INT iCount) +{ + WCHAR szBuffer[MAX_KEY_LENGTH]; + DWORD dwSize = MAX_KEY_LENGTH; + DWORD dwType = 0; + INT iCurrent; + INT iActive = 0; + + RegQueryValueExW(hKey, szKey, NULL, &dwType, (LPBYTE)szBuffer, &dwSize); + + for(iCurrent = 0; iCurrent < iCount; iCurrent++) + { + SendDlgItemMessageW(hWndDlg, iControlId, CB_ADDSTRING, 0, (LPARAM)pSettings[iCurrent].szValue); + + if(dwSize && ((dwType == REG_DWORD && *szBuffer == pSettings[iCurrent].iValue) || + (dwType == REG_SZ && !wcscmp(szBuffer, pSettings[iCurrent].szValue)))) + { + iActive = iCurrent; + } + } + + SendDlgItemMessageW(hWndDlg, iControlId, CB_SETCURSEL, iActive, 0); + } static VOID InitSettings(HWND hWndDlg) { HKEY hKey; - WCHAR szBuffer[MAX_KEY_LENGTH]; - DWORD dwSize = MAX_KEY_LENGTH; - if (RegOpenKeyExW(HKEY_CURRENT_USER, - KEY_WINE, - 0, - KEY_READ, - &hKey) != ERROR_SUCCESS) - { + if (RegCreateKeyExW(HKEY_CURRENT_USER, KEY_WINE, 0, NULL, 0, MAXIMUM_ALLOWED, NULL, &hKey, NULL) != ERROR_SUCCESS) return; - } - if(ReadSetting(hKey, KEY_GLSL, szBuffer, dwSize) == ERROR_SUCCESS) - CheckDlgButton(hWndDlg, IDC_GLSL, (wcscmp(VALUE_DISABLED, szBuffer) != 0) ? BST_CHECKED : BST_UNCHECKED); - - if(ReadSetting(hKey, KEY_MULTISAMPLING, szBuffer, dwSize) == ERROR_SUCCESS) - CheckDlgButton(hWndDlg, IDC_MULTISAMPLING, (wcscmp(VALUE_ENABLED, szBuffer) == 0) ? BST_CHECKED : BST_UNCHECKED); - - if(ReadSetting(hKey, KEY_PIXELSHADERS, szBuffer, dwSize) == ERROR_SUCCESS) - CheckDlgButton(hWndDlg, IDC_PIXELSHADERS, (wcscmp(VALUE_ENABLED, szBuffer) == 0) ? BST_CHECKED : BST_UNCHECKED); - - if(ReadSetting(hKey, KEY_STRICTDRAWORDERING, szBuffer, dwSize) == ERROR_SUCCESS) - CheckDlgButton(hWndDlg, IDC_STRICTDRAWORDERING, (wcscmp(VALUE_ENABLED, szBuffer) == 0) ? BST_CHECKED : BST_UNCHECKED); - - if(ReadSetting(hKey, KEY_VERTEXSHADERS, szBuffer, dwSize) == ERROR_SUCCESS) - CheckDlgButton(hWndDlg, IDC_VERTEXSHADERS, (wcscmp(VALUE_NONE, szBuffer) != 0) ? BST_CHECKED : BST_UNCHECKED); - - SendDlgItemMessageW(hWndDlg, IDC_OFFSCREEN, CB_ADDSTRING, 0, (LPARAM)VALUE_FBO); - SendDlgItemMessageW(hWndDlg, IDC_OFFSCREEN, CB_ADDSTRING, 0, (LPARAM)VALUE_BACKBUFFER); - - SendDlgItemMessageW(hWndDlg, IDC_OFFSCREEN, CB_SETITEMDATA, ITEM_FBO, (LPARAM)ITEM_FBO); - SendDlgItemMessageW(hWndDlg, IDC_OFFSCREEN, CB_SETITEMDATA, ITEM_BACKBUFFER, (LPARAM)ITEM_BACKBUFFER); - - if(ReadSetting(hKey, KEY_OFFSCREEN, szBuffer, dwSize) == ERROR_SUCCESS && !wcscmp(VALUE_BACKBUFFER, szBuffer)) - SendDlgItemMessageW(hWndDlg, IDC_OFFSCREEN, CB_SETCURSEL, 1, 0); - else - SendDlgItemMessageW(hWndDlg, IDC_OFFSCREEN, CB_SETCURSEL, 0, 0); - - SendDlgItemMessageW(hWndDlg, IDC_LOCKING, CB_ADDSTRING, 0, (LPARAM)VALUE_READTEX); - SendDlgItemMessageW(hWndDlg, IDC_LOCKING, CB_ADDSTRING, 0, (LPARAM)VALUE_READDRAW); - SendDlgItemMessageW(hWndDlg, IDC_LOCKING, CB_ADDSTRING, 0, (LPARAM)VALUE_DISABLED); - - SendDlgItemMessageW(hWndDlg, IDC_LOCKING, CB_SETITEMDATA, (WPARAM)ITEM_READTEX, (LPARAM)ITEM_READTEX); - SendDlgItemMessageW(hWndDlg, IDC_LOCKING, CB_SETITEMDATA, (WPARAM)ITEM_READDRAW, (LPARAM)ITEM_READDRAW); - SendDlgItemMessageW(hWndDlg, IDC_LOCKING, CB_SETITEMDATA, (WPARAM)ITEM_DISABLED, (LPARAM)ITEM_DISABLED); - - SendDlgItemMessageW(hWndDlg, IDC_LOCKING, CB_SETCURSEL, 0, 0); - - if(ReadSetting(hKey, KEY_LOCKING, szBuffer, dwSize) == ERROR_SUCCESS) - { - if(!wcscmp(VALUE_READDRAW, szBuffer)) - SendDlgItemMessageW(hWndDlg, IDC_LOCKING, CB_SETCURSEL, 1, 0); - else if(!wcscmp(VALUE_DISABLED, szBuffer)) - SendDlgItemMessageW(hWndDlg, IDC_LOCKING, CB_SETCURSEL, 2, 0); - } + INIT_CONTROL(GLSL, gwd3dsDisable); + INIT_CONTROL(OFFSCREEN, gwd3dsOffscreen); + INIT_CONTROL(VIDMEMSIZE, gwd3dsVidMem); + INIT_CONTROL(MULTISAMPLING, gwd3dsDisable); + INIT_CONTROL(STRICTDRAWORDERING, gwd3dsEnable); + INIT_CONTROL(ALWAYSOFFSCREEN, gwd3dsEnable); + INIT_CONTROL(DDRENDERER, gwd3dsDdRender); + INIT_CONTROL(PSLEVEL, gwd3dsShaderLvl); + INIT_CONTROL(VSLEVEL, gwd3dsShaderLvl); + INIT_CONTROL(GSLEVEL, gwd3dsShaderLvl); RegCloseKey(hKey); } + +static VOID SaveSetting(HWND hWnd, HKEY hKey, PWCHAR szKey, PWINED3D_SETTINGS pCfg, INT iControlId, INT iCount) +{ + INT iSel = 0; + + iSel = (INT)SendDlgItemMessageW(hWnd, iControlId, CB_GETCURSEL, 0, 0); + + if(iSel < 0 || iSel > iCount) + return; + + if(pCfg[iSel].iType == REG_NONE) + { + RegDeleteValueW(hKey, szKey); + return; + } + + if(pCfg[iSel].iType == REG_DWORD) + { + RegSetValueExW(hKey, szKey, 0, REG_DWORD, (LPBYTE)&pCfg[iSel].iValue, sizeof(pCfg[iSel].iValue)); + return; + } else if (pCfg[iSel].iType == REG_SZ) + { + RegSetValueExW(hKey, szKey, 0, pCfg[iSel].iType, (LPBYTE)pCfg[iSel].szValue, (wcslen(pCfg[iSel].szValue) + 1) * sizeof(WCHAR)); + } +} + + static VOID WriteSettings(HWND hWndDlg) { HKEY hKey; - INT iCurSel; - if (RegOpenKeyExW(HKEY_CURRENT_USER, - KEY_WINE, - 0, - KEY_WRITE, - &hKey) != ERROR_SUCCESS) - { + if (RegOpenKeyExW(HKEY_CURRENT_USER, KEY_WINE, 0, KEY_WRITE, &hKey) != ERROR_SUCCESS) return; - } - SaveSetting(hKey, KEY_GLSL, (IsDlgButtonChecked(hWndDlg, IDC_GLSL) == BST_CHECKED) ? VALUE_ENABLED : VALUE_DISABLED); - SaveSetting(hKey, KEY_MULTISAMPLING, (IsDlgButtonChecked(hWndDlg, IDC_MULTISAMPLING) == BST_CHECKED) ? VALUE_ENABLED : VALUE_DISABLED); - SaveSetting(hKey, KEY_PIXELSHADERS, (IsDlgButtonChecked(hWndDlg, IDC_PIXELSHADERS) == BST_CHECKED) ? VALUE_ENABLED : VALUE_DISABLED); - SaveSetting(hKey, KEY_STRICTDRAWORDERING, (IsDlgButtonChecked(hWndDlg, IDC_STRICTDRAWORDERING) == BST_CHECKED) ? VALUE_ENABLED : VALUE_DISABLED); - SaveSetting(hKey, KEY_VERTEXSHADERS, (IsDlgButtonChecked(hWndDlg, IDC_VERTEXSHADERS) == BST_CHECKED) ? VALUE_ENABLED : VALUE_NONE); - - iCurSel = (INT)SendDlgItemMessageW(hWndDlg, IDC_LOCKING, CB_GETCURSEL, 0, 0); - - if(iCurSel != CB_ERR) - { - iCurSel = (INT)SendDlgItemMessageW(hWndDlg, IDC_LOCKING, CB_GETITEMDATA, (WPARAM)iCurSel, 0); - - if(iCurSel == ITEM_READDRAW) - SaveSetting(hKey, KEY_LOCKING, VALUE_READDRAW); - else if(iCurSel == ITEM_DISABLED) - SaveSetting(hKey, KEY_LOCKING, VALUE_DISABLED); - else - SaveSetting(hKey, KEY_LOCKING, VALUE_READTEX); - } - - iCurSel = (INT)SendDlgItemMessageW(hWndDlg, IDC_OFFSCREEN, CB_GETCURSEL, 0, 0); - - if(iCurSel != CB_ERR) - { - iCurSel = (INT)SendDlgItemMessageW(hWndDlg, IDC_OFFSCREEN, CB_GETITEMDATA, (WPARAM)iCurSel, 0); - - if(iCurSel == ITEM_BACKBUFFER) - SaveSetting(hKey, KEY_OFFSCREEN, VALUE_BACKBUFFER); - else - SaveSetting(hKey, KEY_OFFSCREEN, VALUE_FBO); - } + SAVE_CONTROL(GLSL, gwd3dsDisable); + SAVE_CONTROL(OFFSCREEN, gwd3dsOffscreen); + SAVE_CONTROL(VIDMEMSIZE, gwd3dsVidMem); + SAVE_CONTROL(MULTISAMPLING, gwd3dsDisable); + SAVE_CONTROL(STRICTDRAWORDERING, gwd3dsEnable); + SAVE_CONTROL(ALWAYSOFFSCREEN, gwd3dsEnable); + SAVE_CONTROL(DDRENDERER, gwd3dsDdRender); + SAVE_CONTROL(PSLEVEL, gwd3dsShaderLvl); + SAVE_CONTROL(VSLEVEL, gwd3dsShaderLvl); + SAVE_CONTROL(GSLEVEL, gwd3dsShaderLvl); RegCloseKey(hKey); } @@ -135,20 +154,8 @@ return TRUE; case WM_COMMAND: - switch (LOWORD(wParam)) - { - case IDC_GLSL: - case IDC_LOCKING: - case IDC_MULTISAMPLING: - case IDC_OFFSCREEN: - case IDC_PIXELSHADERS: - case IDC_STRICTDRAWORDERING: - case IDC_VERTEXSHADERS: - PropSheet_Changed(GetParent(hWndDlg), hWndDlg); - break; - default: - break; - } + if (LOWORD(wParam) > IDC_MIN && LOWORD(wParam) < IDC_MAX) + PropSheet_Changed(GetParent(hWndDlg), hWndDlg); break; case WM_NOTIFY: Modified: trunk/reactos/dll/cpl/wined3dcfg/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/wined3dcfg/lang/cs… ============================================================================== --- trunk/reactos/dll/cpl/wined3dcfg/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/wined3dcfg/lang/cs-CZ.rc [iso-8859-1] Mon May 19 09:58:26 2014 @@ -10,18 +10,29 @@ CAPTION "ObecnÃ©" FONT 8, "MS Shell Dlg" BEGIN - ICON IDI_CPLICON, IDI_CPLICON, 8, 5, 21, 20 - GROUPBOX "Shadery", -1, 5, 35, 230, 65 - AUTOCHECKBOX "Zapnout &GLSL", IDC_GLSL, 15, 50, 150, 10 - AUTOCHECKBOX "Zapnout &pixel shadery", IDC_PIXELSHADERS, 15, 65, 150, 10 - AUTOCHECKBOX "Zapnout &vertex shadery", IDC_VERTEXSHADERS, 15, 80, 150, 10 - GROUPBOX "RenderovÃ¡nÃ", -1, 5, 110, 230, 85 - AUTOCHECKBOX "Vynutit &multisampling", IDC_MULTISAMPLING, 15, 125, 150, 10 - AUTOCHECKBOX "Vynutit &strict draw ordering", IDC_STRICTDRAWORDERING, 15, 140, 150, 10 + ICON IDI_CPLICON, IDI_CPLICON, 8, 0, 21, 20 + GROUPBOX "Shaders", -1, 5, 25, 230, 80 + LTEXT "Enable GLSL", -1, 15, 42, 80, 10 + COMBOBOX IDC_GLSL, 95, 40, 90, 10, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + LTEXT "Maximum GS Level:", -1, 15, 57, 80, 10 + COMBOBOX IDC_GSLEVEL, 95, 55, 90, 10, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + LTEXT "Maximum PS level:", -1, 15, 72, 80, 10 + COMBOBOX IDC_PSLEVEL, 95, 70, 90, 10, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + LTEXT "Maximum VS Level:", -1, 15, 87, 80, 10 + COMBOBOX IDC_VSLEVEL, 95, 85, 90, 10, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + GROUPBOX "Rendering", -1, 5, 110, 230, 110 + LTEXT "Multisampling:", -1, 15, 127, 80, 10 + COMBOBOX IDC_MULTISAMPLING, 95, 125, 90, 10, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + LTEXT "Strict draw ordering:", -1, 15, 142, 80, 10 + COMBOBOX IDC_STRICTDRAWORDERING, 95, 140, 90, 10, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST LTEXT "Offscreen rendering:", -1, 15, 157, 80, 10 - COMBOBOX IDC_OFFSCREEN, 95, 155, 90, 50, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST - LTEXT "Render target locking:", -1, 15, 175, 72, 10, SS_LEFT - COMBOBOX IDC_LOCKING, 95, 173, 90, 50, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + COMBOBOX IDC_OFFSCREEN, 95, 155, 90, 10, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + LTEXT "Always offscreen:", -1, 15, 172, 72, 10, SS_LEFT + COMBOBOX IDC_ALWAYSOFFSCREEN, 95, 170, 90, 10, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + LTEXT "Video memory size:", -1, 15, 187, 72, 10, SS_LEFT + COMBOBOX IDC_VIDMEMSIZE, 95, 185, 90, 10, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + LTEXT "DirectDraw Renderer:", -1, 15, 202, 72, 10, SS_LEFT + COMBOBOX IDC_DDRENDERER, 95, 200, 90, 10, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST END STRINGTABLE Modified: trunk/reactos/dll/cpl/wined3dcfg/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/wined3dcfg/lang/de… ============================================================================== --- trunk/reactos/dll/cpl/wined3dcfg/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/wined3dcfg/lang/de-DE.rc [iso-8859-1] Mon May 19 09:58:26 2014 @@ -5,18 +5,29 @@ CAPTION "Allgemein" FONT 8, "MS Shell Dlg" BEGIN - ICON IDI_CPLICON, IDI_CPLICON, 8, 5, 21, 20 - GROUPBOX "Shader", -1, 5, 35, 230, 65 - AUTOCHECKBOX "&GLSL aktivieren", IDC_GLSL, 15, 50, 150, 10 - AUTOCHECKBOX "&Pixel Shader aktivieren", IDC_PIXELSHADERS, 15, 65, 150, 10 - AUTOCHECKBOX "&Vertex Shader aktivieren", IDC_VERTEXSHADERS, 15, 80, 150, 10 - GROUPBOX "Rendering", -1, 5, 110, 230, 85 - AUTOCHECKBOX "&Multisampling erzwingen", IDC_MULTISAMPLING, 15, 125, 150, 10 - AUTOCHECKBOX "&Strikte Zeichenreihenfolge erzwingen", IDC_STRICTDRAWORDERING, 15, 140, 150, 10 - LTEXT "Offscreen Rendering:", -1, 15, 157, 80, 10 - COMBOBOX IDC_OFFSCREEN, 95, 155, 90, 50, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST - LTEXT "Render Ziel festlegen:", -1, 15, 175, 72, 10, SS_LEFT - COMBOBOX IDC_LOCKING, 95, 173, 90, 50, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + ICON IDI_CPLICON, IDI_CPLICON, 8, 0, 21, 20 + GROUPBOX "Shaders", -1, 5, 25, 230, 80 + LTEXT "Enable GLSL", -1, 15, 42, 80, 10 + COMBOBOX IDC_GLSL, 95, 40, 90, 10, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + LTEXT "Maximum GS Level:", -1, 15, 57, 80, 10 + COMBOBOX IDC_GSLEVEL, 95, 55, 90, 10, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + LTEXT "Maximum PS level:", -1, 15, 72, 80, 10 + COMBOBOX IDC_PSLEVEL, 95, 70, 90, 10, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + LTEXT "Maximum VS Level:", -1, 15, 87, 80, 10 + COMBOBOX IDC_VSLEVEL, 95, 85, 90, 10, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + GROUPBOX "Rendering", -1, 5, 110, 230, 110 + LTEXT "Multisampling:", -1, 15, 127, 80, 10 + COMBOBOX IDC_MULTISAMPLING, 95, 125, 90, 10, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + LTEXT "Strict draw ordering:", -1, 15, 142, 80, 10 + COMBOBOX IDC_STRICTDRAWORDERING, 95, 140, 90, 10, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + LTEXT "Offscreen rendering:", -1, 15, 157, 80, 10 + COMBOBOX IDC_OFFSCREEN, 95, 155, 90, 10, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + LTEXT "Always offscreen:", -1, 15, 172, 72, 10, SS_LEFT + COMBOBOX IDC_ALWAYSOFFSCREEN, 95, 170, 90, 10, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + LTEXT "Video memory size:", -1, 15, 187, 72, 10, SS_LEFT + COMBOBOX IDC_VIDMEMSIZE, 95, 185, 90, 10, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + LTEXT "DirectDraw Renderer:", -1, 15, 202, 72, 10, SS_LEFT + COMBOBOX IDC_DDRENDERER, 95, 200, 90, 10, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST END STRINGTABLE Modified: trunk/reactos/dll/cpl/wined3dcfg/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/wined3dcfg/lang/en… ============================================================================== --- trunk/reactos/dll/cpl/wined3dcfg/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/wined3dcfg/lang/en-US.rc [iso-8859-1] Mon May 19 09:58:26 2014 @@ -5,18 +5,29 @@ CAPTION "General" FONT 8, "MS Shell Dlg" BEGIN - ICON IDI_CPLICON, IDI_CPLICON, 8, 5, 21, 20 - GROUPBOX "Shaders", -1, 5, 35, 230, 65 - AUTOCHECKBOX "Enable &GLSL", IDC_GLSL, 15, 50, 150, 10 - AUTOCHECKBOX "Enable &pixel shaders", IDC_PIXELSHADERS, 15, 65, 150, 10 - AUTOCHECKBOX "Enable &Vertex shaders", IDC_VERTEXSHADERS, 15, 80, 150, 10 - GROUPBOX "Rendering", -1, 5, 110, 230, 85 - AUTOCHECKBOX "Force &multisampling", IDC_MULTISAMPLING, 15, 125, 150, 10 - AUTOCHECKBOX "Force &strict draw ordering", IDC_STRICTDRAWORDERING, 15, 140, 150, 10 + ICON IDI_CPLICON, IDI_CPLICON, 8, 0, 21, 20 + GROUPBOX "Shaders", -1, 5, 25, 230, 80 + LTEXT "Enable GLSL", -1, 15, 42, 80, 10 + COMBOBOX IDC_GLSL, 95, 40, 90, 10, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + LTEXT "Maximum GS Level:", -1, 15, 57, 80, 10 + COMBOBOX IDC_GSLEVEL, 95, 55, 90, 10, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + LTEXT "Maximum PS level:", -1, 15, 72, 80, 10 + COMBOBOX IDC_PSLEVEL, 95, 70, 90, 10, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + LTEXT "Maximum VS Level:", -1, 15, 87, 80, 10 + COMBOBOX IDC_VSLEVEL, 95, 85, 90, 10, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + GROUPBOX "Rendering", -1, 5, 110, 230, 110 + LTEXT "Multisampling:", -1, 15, 127, 80, 10 + COMBOBOX IDC_MULTISAMPLING, 95, 125, 90, 10, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + LTEXT "Strict draw ordering:", -1, 15, 142, 80, 10 + COMBOBOX IDC_STRICTDRAWORDERING, 95, 140, 90, 10, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST LTEXT "Offscreen rendering:", -1, 15, 157, 80, 10 - COMBOBOX IDC_OFFSCREEN, 95, 155, 90, 50, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST - LTEXT "Render target locking:", -1, 15, 175, 72, 10, SS_LEFT - COMBOBOX IDC_LOCKING, 95, 173, 90, 50, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + COMBOBOX IDC_OFFSCREEN, 95, 155, 90, 10, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + LTEXT "Always offscreen:", -1, 15, 172, 72, 10, SS_LEFT + COMBOBOX IDC_ALWAYSOFFSCREEN, 95, 170, 90, 10, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + LTEXT "Video memory size:", -1, 15, 187, 72, 10, SS_LEFT + COMBOBOX IDC_VIDMEMSIZE, 95, 185, 90, 10, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + LTEXT "DirectDraw Renderer:", -1, 15, 202, 72, 10, SS_LEFT + COMBOBOX IDC_DDRENDERER, 95, 200, 90, 10, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST END STRINGTABLE Modified: trunk/reactos/dll/cpl/wined3dcfg/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/wined3dcfg/lang/he… ============================================================================== --- trunk/reactos/dll/cpl/wined3dcfg/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/wined3dcfg/lang/he-IL.rc [iso-8859-1] Mon May 19 09:58:26 2014 @@ -5,18 +5,29 @@ CAPTION "××××" FONT 8, "MS Shell Dlg" BEGIN - ICON IDI_CPLICON, IDI_CPLICON, 8, 5, 21, 20 - GROUPBOX "Shaders", -1, 5, 35, 230, 65 - AUTOCHECKBOX "Enable &GLSL", IDC_GLSL, 15, 50, 150, 10 - AUTOCHECKBOX "Enable &pixel shaders", IDC_PIXELSHADERS, 15, 65, 150, 10 - AUTOCHECKBOX "Enable &Vertex shaders", IDC_VERTEXSHADERS, 15, 80, 150, 10 - GROUPBOX "Rendering", -1, 5, 110, 230, 85 - AUTOCHECKBOX "Force &multisampling", IDC_MULTISAMPLING, 15, 125, 150, 10 - AUTOCHECKBOX "Force &strict draw ordering", IDC_STRICTDRAWORDERING, 15, 140, 150, 10 + ICON IDI_CPLICON, IDI_CPLICON, 8, 0, 21, 20 + GROUPBOX "Shaders", -1, 5, 25, 230, 80 + LTEXT "Enable GLSL", -1, 15, 42, 80, 10 + COMBOBOX IDC_GLSL, 95, 40, 90, 10, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + LTEXT "Maximum GS Level:", -1, 15, 57, 80, 10 + COMBOBOX IDC_GSLEVEL, 95, 55, 90, 10, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + LTEXT "Maximum PS level:", -1, 15, 72, 80, 10 + COMBOBOX IDC_PSLEVEL, 95, 70, 90, 10, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + LTEXT "Maximum VS Level:", -1, 15, 87, 80, 10 + COMBOBOX IDC_VSLEVEL, 95, 85, 90, 10, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + GROUPBOX "Rendering", -1, 5, 110, 230, 110 + LTEXT "Multisampling:", -1, 15, 127, 80, 10 + COMBOBOX IDC_MULTISAMPLING, 95, 125, 90, 10, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + LTEXT "Strict draw ordering:", -1, 15, 142, 80, 10 + COMBOBOX IDC_STRICTDRAWORDERING, 95, 140, 90, 10, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST LTEXT "Offscreen rendering:", -1, 15, 157, 80, 10 - COMBOBOX IDC_OFFSCREEN, 95, 155, 90, 50, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST - LTEXT "Render target locking:", -1, 15, 175, 72, 10, SS_LEFT - COMBOBOX IDC_LOCKING, 95, 173, 90, 50, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + COMBOBOX IDC_OFFSCREEN, 95, 155, 90, 10, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + LTEXT "Always offscreen:", -1, 15, 172, 72, 10, SS_LEFT + COMBOBOX IDC_ALWAYSOFFSCREEN, 95, 170, 90, 10, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + LTEXT "Video memory size:", -1, 15, 187, 72, 10, SS_LEFT + COMBOBOX IDC_VIDMEMSIZE, 95, 185, 90, 10, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + LTEXT "DirectDraw Renderer:", -1, 15, 202, 72, 10, SS_LEFT + COMBOBOX IDC_DDRENDERER, 95, 200, 90, 10, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST END STRINGTABLE Modified: trunk/reactos/dll/cpl/wined3dcfg/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/wined3dcfg/lang/pl… ============================================================================== --- trunk/reactos/dll/cpl/wined3dcfg/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/wined3dcfg/lang/pl-PL.rc [iso-8859-1] Mon May 19 09:58:26 2014 @@ -11,18 +11,29 @@ CAPTION "OgÃ³lne" FONT 8, "MS Shell Dlg" BEGIN - ICON IDI_CPLICON, IDI_CPLICON, 8, 5, 21, 20 - GROUPBOX "Cieniowanie", -1, 5, 35, 230, 65 - AUTOCHECKBOX "WÅÄcz &GLSL", IDC_GLSL, 15, 50, 150, 10 - AUTOCHECKBOX "WÅÄcz cieniowanie &pikseli", IDC_PIXELSHADERS, 15, 65, 150, 10 - AUTOCHECKBOX "WÅÄcz cieniowanie &werteksÃ³w", IDC_VERTEXSHADERS, 15, 80, 150, 10 - GROUPBOX "Renderowanie", -1, 5, 110, 230, 85 - AUTOCHECKBOX "WymuÅ &multiprÃ³bkowanie", IDC_MULTISAMPLING, 15, 125, 150, 10 - AUTOCHECKBOX "WymuÅ &strict draw ordering", IDC_STRICTDRAWORDERING, 15, 140, 150, 10 - LTEXT "Renderowanie pozaekranowe:", -1, 15, 157, 80, 10 - COMBOBOX IDC_OFFSCREEN, 95, 155, 90, 50, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST - LTEXT "Blokowanie renderowanego obiektu:", -1, 15, 175, 72, 10, SS_LEFT - COMBOBOX IDC_LOCKING, 95, 173, 90, 50, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + ICON IDI_CPLICON, IDI_CPLICON, 8, 0, 21, 20 + GROUPBOX "Shaders", -1, 5, 25, 230, 80 + LTEXT "Enable GLSL", -1, 15, 42, 80, 10 + COMBOBOX IDC_GLSL, 95, 40, 90, 10, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + LTEXT "Maximum GS Level:", -1, 15, 57, 80, 10 + COMBOBOX IDC_GSLEVEL, 95, 55, 90, 10, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + LTEXT "Maximum PS level:", -1, 15, 72, 80, 10 + COMBOBOX IDC_PSLEVEL, 95, 70, 90, 10, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + LTEXT "Maximum VS Level:", -1, 15, 87, 80, 10 + COMBOBOX IDC_VSLEVEL, 95, 85, 90, 10, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + GROUPBOX "Rendering", -1, 5, 110, 230, 110 + LTEXT "Multisampling:", -1, 15, 127, 80, 10 + COMBOBOX IDC_MULTISAMPLING, 95, 125, 90, 10, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + LTEXT "Strict draw ordering:", -1, 15, 142, 80, 10 + COMBOBOX IDC_STRICTDRAWORDERING, 95, 140, 90, 10, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + LTEXT "Offscreen rendering:", -1, 15, 157, 80, 10 + COMBOBOX IDC_OFFSCREEN, 95, 155, 90, 10, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + LTEXT "Always offscreen:", -1, 15, 172, 72, 10, SS_LEFT + COMBOBOX IDC_ALWAYSOFFSCREEN, 95, 170, 90, 10, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + LTEXT "Video memory size:", -1, 15, 187, 72, 10, SS_LEFT + COMBOBOX IDC_VIDMEMSIZE, 95, 185, 90, 10, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + LTEXT "DirectDraw Renderer:", -1, 15, 202, 72, 10, SS_LEFT + COMBOBOX IDC_DDRENDERER, 95, 200, 90, 10, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST END STRINGTABLE Modified: trunk/reactos/dll/cpl/wined3dcfg/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/wined3dcfg/lang/ro… ============================================================================== --- trunk/reactos/dll/cpl/wined3dcfg/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/wined3dcfg/lang/ro-RO.rc [iso-8859-1] Mon May 19 09:58:26 2014 @@ -7,18 +7,29 @@ CAPTION "Generale" FONT 8, "MS Shell Dlg" BEGIN - ICON IDI_CPLICON, IDI_CPLICON, 8, 5, 21, 20 - GROUPBOX "Shader", -1, 5, 35, 230, 65 - AUTOCHECKBOX "ActiveazÄ &GLSL", IDC_GLSL, 15, 50, 150, 10 - AUTOCHECKBOX "ActiveazÄ &Pixel shader", IDC_PIXELSHADERS, 15, 65, 150, 10 - AUTOCHECKBOX "ActiveazÄ &Vertex shader", IDC_VERTEXSHADERS, 15, 80, 150, 10 - GROUPBOX "Redare", -1, 5, 110, 230, 85 - AUTOCHECKBOX "Impune &multisampling", IDC_MULTISAMPLING, 15, 125, 150, 10 - AUTOCHECKBOX "Impune &ordine strictÄ de desenare", IDC_STRICTDRAWORDERING, 15, 140, 150, 10 - LTEXT "RedÄ extra-ecran (offscreen):", -1, 15, 157, 100, 10 - COMBOBOX IDC_OFFSCREEN, 120, 155, 90, 50, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST - LTEXT "RedÄ fixarea Èintei:", -1, 15, 175, 100, 10, SS_LEFT - COMBOBOX IDC_LOCKING, 120, 173, 90, 50, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + ICON IDI_CPLICON, IDI_CPLICON, 8, 0, 21, 20 + GROUPBOX "Shaders", -1, 5, 25, 230, 80 + LTEXT "Enable GLSL", -1, 15, 42, 80, 10 + COMBOBOX IDC_GLSL, 95, 40, 90, 10, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + LTEXT "Maximum GS Level:", -1, 15, 57, 80, 10 + COMBOBOX IDC_GSLEVEL, 95, 55, 90, 10, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + LTEXT "Maximum PS level:", -1, 15, 72, 80, 10 + COMBOBOX IDC_PSLEVEL, 95, 70, 90, 10, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + LTEXT "Maximum VS Level:", -1, 15, 87, 80, 10 + COMBOBOX IDC_VSLEVEL, 95, 85, 90, 10, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + GROUPBOX "Rendering", -1, 5, 110, 230, 110 + LTEXT "Multisampling:", -1, 15, 127, 80, 10 + COMBOBOX IDC_MULTISAMPLING, 95, 125, 90, 10, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + LTEXT "Strict draw ordering:", -1, 15, 142, 80, 10 + COMBOBOX IDC_STRICTDRAWORDERING, 95, 140, 90, 10, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + LTEXT "Offscreen rendering:", -1, 15, 157, 80, 10 + COMBOBOX IDC_OFFSCREEN, 95, 155, 90, 10, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + LTEXT "Always offscreen:", -1, 15, 172, 72, 10, SS_LEFT + COMBOBOX IDC_ALWAYSOFFSCREEN, 95, 170, 90, 10, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + LTEXT "Video memory size:", -1, 15, 187, 72, 10, SS_LEFT + COMBOBOX IDC_VIDMEMSIZE, 95, 185, 90, 10, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + LTEXT "DirectDraw Renderer:", -1, 15, 202, 72, 10, SS_LEFT + COMBOBOX IDC_DDRENDERER, 95, 200, 90, 10, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST END STRINGTABLE Modified: trunk/reactos/dll/cpl/wined3dcfg/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/wined3dcfg/lang/sq… ============================================================================== --- trunk/reactos/dll/cpl/wined3dcfg/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/wined3dcfg/lang/sq-AL.rc [iso-8859-1] Mon May 19 09:58:26 2014 @@ -9,18 +9,29 @@ CAPTION "PÃ«rgjithshÃ«m" FONT 8, "MS Shell Dlg" BEGIN - ICON IDI_CPLICON, IDI_CPLICON, 8, 5, 21, 20 - GROUPBOX "StrehÃ«", -1, 5, 35, 230, 65 - AUTOCHECKBOX "MundÃ«so &GLSL", IDC_GLSL, 15, 50, 150, 10 - AUTOCHECKBOX "MundÃ«so &pixel StrehÃ«", IDC_PIXELSHADERS, 15, 65, 150, 10 - AUTOCHECKBOX "MundÃ«so &Vertex StrehÃ«", IDC_VERTEXSHADERS, 15, 80, 150, 10 - GROUPBOX "PÃ«rpunim", -1, 5, 110, 230, 85 - AUTOCHECKBOX "Detyro shumÃ«shembuj", IDC_MULTISAMPLING, 15, 125, 150, 10 - AUTOCHECKBOX "Detyro urdhÃ«r vizatim i rreptÃ«", IDC_STRICTDRAWORDERING, 15, 140, 150, 10 - LTEXT "StrehÃ« jashekrani:", -1, 15, 157, 80, 10 - COMBOBOX IDC_OFFSCREEN, 95, 155, 90, 50, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST - LTEXT "Streho mbylljen objektivit:", -1, 15, 175, 72, 10, SS_LEFT - COMBOBOX IDC_LOCKING, 95, 173, 90, 50, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + ICON IDI_CPLICON, IDI_CPLICON, 8, 0, 21, 20 + GROUPBOX "Shaders", -1, 5, 25, 230, 80 + LTEXT "Enable GLSL", -1, 15, 42, 80, 10 + COMBOBOX IDC_GLSL, 95, 40, 90, 10, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + LTEXT "Maximum GS Level:", -1, 15, 57, 80, 10 + COMBOBOX IDC_GSLEVEL, 95, 55, 90, 10, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + LTEXT "Maximum PS level:", -1, 15, 72, 80, 10 + COMBOBOX IDC_PSLEVEL, 95, 70, 90, 10, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + LTEXT "Maximum VS Level:", -1, 15, 87, 80, 10 + COMBOBOX IDC_VSLEVEL, 95, 85, 90, 10, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + GROUPBOX "Rendering", -1, 5, 110, 230, 110 + LTEXT "Multisampling:", -1, 15, 127, 80, 10 + COMBOBOX IDC_MULTISAMPLING, 95, 125, 90, 10, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + LTEXT "Strict draw ordering:", -1, 15, 142, 80, 10 + COMBOBOX IDC_STRICTDRAWORDERING, 95, 140, 90, 10, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + LTEXT "Offscreen rendering:", -1, 15, 157, 80, 10 + COMBOBOX IDC_OFFSCREEN, 95, 155, 90, 10, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + LTEXT "Always offscreen:", -1, 15, 172, 72, 10, SS_LEFT + COMBOBOX IDC_ALWAYSOFFSCREEN, 95, 170, 90, 10, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + LTEXT "Video memory size:", -1, 15, 187, 72, 10, SS_LEFT + COMBOBOX IDC_VIDMEMSIZE, 95, 185, 90, 10, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + LTEXT "DirectDraw Renderer:", -1, 15, 202, 72, 10, SS_LEFT + COMBOBOX IDC_DDRENDERER, 95, 200, 90, 10, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST END STRINGTABLE Modified: trunk/reactos/dll/cpl/wined3dcfg/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/wined3dcfg/lang/tr… ============================================================================== --- trunk/reactos/dll/cpl/wined3dcfg/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/wined3dcfg/lang/tr-TR.rc [iso-8859-1] Mon May 19 09:58:26 2014 @@ -7,18 +7,29 @@ CAPTION "UmÃ»mÃ®" FONT 8, "MS Shell Dlg" BEGIN - ICON IDI_CPLICON, IDI_CPLICON, 8, 5, 21, 20 - GROUPBOX "Shaderler", -1, 5, 35, 230, 65 - AUTOCHECKBOX "&GLSL'yi EtkinleÅtir", IDC_GLSL, 15, 50, 150, 10 - AUTOCHECKBOX "&Nokta Shaderleri EtkinleÅtir", IDC_PIXELSHADERS, 15, 65, 150, 10 - AUTOCHECKBOX "&Doruk Shaderleri EtkinleÅtir", IDC_VERTEXSHADERS, 15, 80, 150, 10 - GROUPBOX "Renderleme", -1, 5, 110, 230, 85 - AUTOCHECKBOX "&ÃrtÃ¼Åme Ãnlemeyi Zorla", IDC_MULTISAMPLING, 15, 125, 150, 10 - AUTOCHECKBOX "&Strict Draw Orderleme'yi Zorla", IDC_STRICTDRAWORDERING, 15, 140, 150, 10 - LTEXT "&Ekran DÄ±ÅÄ± Renderleme:", -1, 15, 157, 80, 10 - COMBOBOX IDC_OFFSCREEN, 95, 155, 90, 50, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST - LTEXT "&Render Hedef Kilitlenmesi:", -1, 15, 175, 72, 10, SS_LEFT - COMBOBOX IDC_LOCKING, 95, 173, 90, 50, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + ICON IDI_CPLICON, IDI_CPLICON, 8, 0, 21, 20 + GROUPBOX "Shaders", -1, 5, 25, 230, 80 + LTEXT "Enable GLSL", -1, 15, 42, 80, 10 + COMBOBOX IDC_GLSL, 95, 40, 90, 10, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + LTEXT "Maximum GS Level:", -1, 15, 57, 80, 10 + COMBOBOX IDC_GSLEVEL, 95, 55, 90, 10, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + LTEXT "Maximum PS level:", -1, 15, 72, 80, 10 + COMBOBOX IDC_PSLEVEL, 95, 70, 90, 10, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + LTEXT "Maximum VS Level:", -1, 15, 87, 80, 10 + COMBOBOX IDC_VSLEVEL, 95, 85, 90, 10, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + GROUPBOX "Rendering", -1, 5, 110, 230, 110 + LTEXT "Multisampling:", -1, 15, 127, 80, 10 + COMBOBOX IDC_MULTISAMPLING, 95, 125, 90, 10, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + LTEXT "Strict draw ordering:", -1, 15, 142, 80, 10 + COMBOBOX IDC_STRICTDRAWORDERING, 95, 140, 90, 10, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + LTEXT "Offscreen rendering:", -1, 15, 157, 80, 10 + COMBOBOX IDC_OFFSCREEN, 95, 155, 90, 10, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + LTEXT "Always offscreen:", -1, 15, 172, 72, 10, SS_LEFT + COMBOBOX IDC_ALWAYSOFFSCREEN, 95, 170, 90, 10, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + LTEXT "Video memory size:", -1, 15, 187, 72, 10, SS_LEFT + COMBOBOX IDC_VIDMEMSIZE, 95, 185, 90, 10, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + LTEXT "DirectDraw Renderer:", -1, 15, 202, 72, 10, SS_LEFT + COMBOBOX IDC_DDRENDERER, 95, 200, 90, 10, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST END STRINGTABLE Modified: trunk/reactos/dll/cpl/wined3dcfg/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/wined3dcfg/resourc… ============================================================================== --- trunk/reactos/dll/cpl/wined3dcfg/resource.h [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/wined3dcfg/resource.h [iso-8859-1] Mon May 19 09:58:26 2014 @@ -7,13 +7,18 @@ #define IDD_PROPPAGEGENERAL 100 /* Controls */ -#define IDC_PIXELSHADERS 1001 -#define IDC_GLSL 1002 -#define IDC_VERTEXSHADERS 1003 -#define IDC_MULTISAMPLING 1004 -#define IDC_STRICTDRAWORDERING 1005 -#define IDC_OFFSCREEN 1006 -#define IDC_LOCKING 1007 +#define IDC_MIN 1000 +#define IDC_GLSL 1001 +#define IDC_GSLEVEL 1002 +#define IDC_PSLEVEL 1003 +#define IDC_VSLEVEL 1004 +#define IDC_MULTISAMPLING 1005 +#define IDC_STRICTDRAWORDERING 1006 +#define IDC_OFFSCREEN 1007 +#define IDC_VIDMEMSIZE 1008 +#define IDC_ALWAYSOFFSCREEN 1009 +#define IDC_DDRENDERER 1010 +#define IDC_MAX 1011 /* Strings */ #define IDS_CPLNAME 10000 Modified: trunk/reactos/dll/cpl/wined3dcfg/wined3dcfg.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/wined3dcfg/wined3d… ============================================================================== --- trunk/reactos/dll/cpl/wined3dcfg/wined3dcfg.h [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/wined3dcfg/wined3dcfg.h [iso-8859-1] Mon May 19 09:58:26 2014 @@ -2,7 +2,6 @@ #define _WINED3DCFG_PCH_ #include <stdarg.h> - #define WIN32_NO_STATUS #include <windef.h> #include <winbase.h> @@ -13,31 +12,36 @@ #define MAX_KEY_LENGTH 256 -#define ITEM_FBO 0 -#define ITEM_BACKBUFFER 1 - -#define ITEM_READTEX 0 -#define ITEM_READDRAW 1 -#define ITEM_DISABLED 2 - -#define VALUE_READTEX L"readtex" -#define VALUE_READDRAW L"readdraw" +#define VALUE_GDI L"gdi" #define VALUE_ENABLED L"enabled" #define VALUE_DISABLED L"disabled" #define VALUE_NONE L"none" #define VALUE_BACKBUFFER L"backbuffer" #define VALUE_FBO L"fbo" +#define VALUE_DEFAULT L"default" #define KEY_WINE L"Software\\Wine\\Direct3D" #define KEY_GLSL L"UseGLSL" -#define KEY_VERTEXSHADERS L"VertexShaderMode" -#define KEY_PIXELSHADERS L"PixelShaderMode" +#define KEY_GSLEVEL L"MaxShaderModelGS" +#define KEY_VSLEVEL L"MaxShaderModelVS" +#define KEY_PSLEVEL L"MaxShaderModelPS" #define KEY_STRICTDRAWORDERING L"StrictDrawOrdering" #define KEY_OFFSCREEN L"OffscreenRenderingMode" #define KEY_MULTISAMPLING L"Multisampling" -#define KEY_LOCKING L"RenderTargetLockMode" +#define KEY_VIDMEMSIZE L"VideoMemorySize" +#define KEY_ALWAYSOFFSCREEN L"AlwaysOffscreen" +#define KEY_DDRENDERER L"DirectDrawRenderer" + +#define INIT_CONTROL(a, b) InitControl(hWndDlg, hKey, KEY_##a, b, IDC_##a, sizeof(b)/sizeof(WINED3D_SETTINGS)) +#define SAVE_CONTROL(a, b) SaveSetting(hWndDlg, hKey, KEY_##a, b, IDC_##a, sizeof(b)/sizeof(WINED3D_SETTINGS)) INT_PTR CALLBACK GeneralPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); +typedef struct _WINED3D_SETTINGS{ + WCHAR szValue[24]; + INT iType; + INT iValue; +} WINED3D_SETTINGS, *PWINED3D_SETTINGS; + #endif /* _WINED3DCFG_PCH_ */

10 years, 7 months

[hbelusca] 63367: [NTVDM] - Initialize the BIOS Configuration Table, see http://www.ctyme.com/intr/rb-1594.htm for more information. - Implement INT 15h, AH=C0h "GET CONFIGURATION".

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Mon May 19 02:21:49 2014 New Revision: 63367 URL: http://svn.reactos.org/svn/reactos?rev=63367&view=rev Log: [NTVDM] - Initialize the BIOS Configuration Table, see http://www.ctyme.com/intr/rb-1594.htm for more information. - Implement INT 15h, AH=C0h "GET CONFIGURATION". Modified: trunk/reactos/subsystems/ntvdm/bios/bios.c trunk/reactos/subsystems/ntvdm/bios/bios.h trunk/reactos/subsystems/ntvdm/bios/bios32/bios32.c Modified: trunk/reactos/subsystems/ntvdm/bios/bios.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/bios/bios… ============================================================================== --- trunk/reactos/subsystems/ntvdm/bios/bios.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/bios/bios.c [iso-8859-1] Mon May 19 02:21:49 2014 @@ -37,6 +37,7 @@ static CALLBACK16 __BiosContext; PBIOS_DATA_AREA Bda; +PBIOS_CONFIG_TABLE Bct; /* PRIVATE FUNCTIONS **********************************************************/ @@ -134,8 +135,10 @@ /* Disable interrupts */ setIF(0); - /* Initialize the BDA pointer */ - Bda = (PBIOS_DATA_AREA)SEG_OFF_TO_PTR(BDA_SEGMENT, 0); + /* Initialize the BDA and the BCT pointers */ + Bda = (PBIOS_DATA_AREA)SEG_OFF_TO_PTR(BDA_SEGMENT, 0x0000); + // The BCT is found at F000:E6F5 for 100% compatible BIOSes. + Bct = (PBIOS_CONFIG_TABLE)SEG_OFF_TO_PTR(BIOS_SEGMENT, 0xE6F5); /* Register the BIOS support BOPs */ RegisterBop(BOP_BIOSINIT , BiosInitBop); Modified: trunk/reactos/subsystems/ntvdm/bios/bios.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/bios/bios… ============================================================================== --- trunk/reactos/subsystems/ntvdm/bios/bios.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/bios/bios.h [iso-8859-1] Mon May 19 02:21:49 2014 @@ -22,6 +22,8 @@ #define BIOS_EQUIPMENT_LIST 0x2C // HACK: Disable FPU for now +#pragma pack(push, 1) + /* * BIOS Data Area at 0040:XXXX * @@ -29,7 +31,6 @@ * and: http://www.bioscentral.com/misc/bda.htm * for more information. */ -#pragma pack(push, 1) typedef struct { WORD SerialPorts[4]; // 0x00 @@ -96,13 +97,30 @@ BYTE Reserved17[15]; // 0x121 BYTE Reserved18[3]; // 0x130 } BIOS_DATA_AREA, *PBIOS_DATA_AREA; +C_ASSERT(sizeof(BIOS_DATA_AREA) == 0x133); + +/* + * BIOS Configuration Table at F000:E6F5 for 100% compatible BIOSes. + * + * See: http://www.ctyme.com/intr/rb-1594.htm + * for more information. + */ +typedef struct _BIOS_CONFIG_TABLE +{ + WORD Length; // 0x00 + BYTE Model; // 0x02 + BYTE SubModel; // 0x03 + BYTE BiosRevision; // 0x04 + BYTE BiosFeature[5]; // 0x05 -- 0x09 + // Other BIOSes may extend this table. We don't. +} BIOS_CONFIG_TABLE, *PBIOS_CONFIG_TABLE; + #pragma pack(pop) - -C_ASSERT(sizeof(BIOS_DATA_AREA) == 0x133); /* FUNCTIONS ******************************************************************/ extern PBIOS_DATA_AREA Bda; +extern PBIOS_CONFIG_TABLE Bct; VOID WINAPI BiosEquipmentService(LPWORD Stack); VOID WINAPI BiosGetMemorySize(LPWORD Stack); Modified: trunk/reactos/subsystems/ntvdm/bios/bios32/bios32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/bios/bios… ============================================================================== --- trunk/reactos/subsystems/ntvdm/bios/bios32/bios32.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/bios/bios32/bios32.c [iso-8859-1] Mon May 19 02:21:49 2014 @@ -107,6 +107,20 @@ setAX(MAKEWORD(Low, High)); /* Clear CF */ + Stack[STACK_FLAGS] &= ~EMULATOR_FLAG_CF; + + break; + } + + /* Get Configuration */ + case 0xC0: + { + /* Return the BIOS ROM Configuration Table address in ES:BX */ + setES(HIWORD(Bct)); + setBX(LOWORD(Bct)); + + /* Call successful; clear CF */ + setAH(0x00); Stack[STACK_FLAGS] &= ~EMULATOR_FLAG_CF; break; @@ -336,25 +350,22 @@ ((PULONG)BaseAddress)[0x49] = (ULONG)NULL; } -/* PUBLIC FUNCTIONS ***********************************************************/ - -/* - * The BIOS POST (Power On-Self Test) - */ -BOOLEAN Bios32Initialize(VOID) -{ - BOOLEAN Success; +static VOID InitializeBiosInfo(VOID) +{ + Bct->Length = sizeof(*Bct); + Bct->Model = 0xFC; // PC-AT; see http://www.ctyme.com/intr/rb-1594.htm#Table515 + Bct->SubModel = 0x00; + Bct->BiosRevision = 0x01; + Bct->BiosFeature[0] = 0x64; // At the moment we don't support "INT 15/AH=4Fh called upon INT 09h" nor "wait for external event (INT 15/AH=41h) supported"; see http://www.ctyme.com/intr/rb-1594.htm#Table510 + Bct->BiosFeature[1] = 0x00; // We don't support anything from here; see http://www.ctyme.com/intr/rb-1594.htm#Table511 + Bct->BiosFeature[2] = 0x00; + Bct->BiosFeature[3] = 0x00; + Bct->BiosFeature[4] = 0x00; +} + +static VOID InitializeBiosData(VOID) +{ UCHAR Low, High; - - /* Initialize the stack */ - // That's what says IBM... (stack at 30:00FF going downwards) - // setSS(0x0000); - // setSP(0x0400); - setSS(0x0050); // Stack at 50:0400, going downwards - setSP(0x0400); - - /* Set data segment */ - setDS(BDA_SEGMENT); /* Initialize the BDA contents */ Bda->EquipmentList = BIOS_EQUIPMENT_LIST; @@ -368,6 +379,30 @@ IOWriteB(CMOS_ADDRESS_PORT, CMOS_REG_BASE_MEMORY_HIGH); High = IOReadB(CMOS_DATA_PORT); Bda->MemorySize = MAKEWORD(Low, High); +} + +/* PUBLIC FUNCTIONS ***********************************************************/ + +/* + * The BIOS POST (Power On-Self Test) + */ +BOOLEAN Bios32Initialize(VOID) +{ + BOOLEAN Success; + + /* Initialize the stack */ + // That's what says IBM... (stack at 30:00FF going downwards) + // setSS(0x0000); + // setSP(0x0400); + setSS(0x0050); // Stack at 50:0400, going downwards + setSP(0x0400); + + /* Set data segment */ + setDS(BDA_SEGMENT); + + /* Initialize the BDA and the BIOS ROM Information */ + InitializeBiosData(); + InitializeBiosInfo(); /* Register the BIOS 32-bit Interrupts */ InitializeBiosInt32();

10 years, 7 months

[hbelusca] 63366: [NTVDM] Since the BIOS registers the whole range of possible interrupts, we register their stubs in an array-form so that the BIOS always registers INT n at the same place. We sav...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Mon May 19 01:12:25 2014 New Revision: 63366 URL: http://svn.reactos.org/svn/reactos?rev=63366&view=rev Log: [NTVDM] Since the BIOS registers the whole range of possible interrupts, we register their stubs in an array-form so that the BIOS always registers INT n at the same place. We save 561 bytes of memory. Modified: trunk/reactos/subsystems/ntvdm/bios/bios32/bios32.c trunk/reactos/subsystems/ntvdm/bios/bios32/bios32p.h trunk/reactos/subsystems/ntvdm/bop.c trunk/reactos/subsystems/ntvdm/callback.c trunk/reactos/subsystems/ntvdm/callback.h Modified: trunk/reactos/subsystems/ntvdm/bios/bios32/bios32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/bios/bios… ============================================================================== --- trunk/reactos/subsystems/ntvdm/bios/bios32/bios32.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/bios/bios32/bios32.c [iso-8859-1] Mon May 19 01:12:25 2014 @@ -301,18 +301,14 @@ static VOID InitializeBiosInt32(VOID) { USHORT i; - // USHORT Offset = 0; /* Initialize the callback context */ InitializeContext(&BiosContext, BIOS_SEGMENT, 0x0000); - /* Register the BIOS 32-bit Interrupts */ + /* Register the default BIOS 32-bit Interrupts */ for (i = 0x00; i <= 0xFF; i++) { - // Offset += RegisterInt32(MAKELONG(Offset, BIOS_SEGMENT), i, NULL, NULL); - BiosContext.NextOffset += RegisterInt32(MAKELONG(BiosContext.NextOffset, - BiosContext.Segment), - i, NULL, NULL); + RegisterBiosInt32(i, NULL); } /* Initialize the exception vector interrupts to a default Exception handler */ Modified: trunk/reactos/subsystems/ntvdm/bios/bios32/bios32p.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/bios/bios… ============================================================================== --- trunk/reactos/subsystems/ntvdm/bios/bios32/bios32p.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/bios/bios32/bios32p.h [iso-8859-1] Mon May 19 01:12:25 2014 @@ -30,11 +30,12 @@ /* FUNCTIONS ******************************************************************/ extern CALLBACK16 BiosContext; -#define RegisterBiosInt32(IntNumber, IntHandler) \ +#define RegisterBiosInt32(IntNumber, IntHandler) \ do { \ - BiosContext.NextOffset += RegisterInt32(MAKELONG(BiosContext.NextOffset, \ - BiosContext.Segment), \ - (IntNumber), (IntHandler), NULL); \ + RegisterInt32(BiosContext.TrampolineFarPtr + \ + BiosContext.TrampolineSize + \ + (IntNumber) * Int16To32StubSize, \ + (IntNumber), (IntHandler), NULL); \ } while(0); VOID EnableHwIRQ(UCHAR hwirq, EMULATOR_INT32_PROC func); Modified: trunk/reactos/subsystems/ntvdm/bop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/bop.c?rev… ============================================================================== --- trunk/reactos/subsystems/ntvdm/bop.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/bop.c [iso-8859-1] Mon May 19 01:12:25 2014 @@ -19,7 +19,7 @@ /* * This is the list of registered BOP handlers. */ -EMULATOR_BOP_PROC BopProc[EMULATOR_MAX_BOP_NUM] = { NULL }; +static EMULATOR_BOP_PROC BopProc[EMULATOR_MAX_BOP_NUM] = { NULL }; /* PUBLIC FUNCTIONS ***********************************************************/ Modified: trunk/reactos/subsystems/ntvdm/callback.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/callback.… ============================================================================== --- trunk/reactos/subsystems/ntvdm/callback.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/callback.c [iso-8859-1] Mon May 19 01:12:25 2014 @@ -22,7 +22,7 @@ /* * This is the list of registered 32-bit Interrupt handlers. */ -EMULATOR_INT32_PROC Int32Proc[EMULATOR_MAX_INT32_NUM] = { NULL }; +static EMULATOR_INT32_PROC Int32Proc[EMULATOR_MAX_INT32_NUM] = { NULL }; /* BOP Identifiers */ #define BOP_CONTROL 0xFF // Control BOP Handler @@ -50,7 +50,7 @@ // /* 16-bit generic interrupt code for calling a 32-bit interrupt handler */ -BYTE Int16To32[] = +static BYTE Int16To32[] = { 0xFA, // cli @@ -76,6 +76,7 @@ 0x44, 0x44, // inc sp, inc sp 0xCF, // iret }; +const ULONG Int16To32StubSize = sizeof(Int16To32); /* PUBLIC FUNCTIONS ***********************************************************/ @@ -85,9 +86,10 @@ IN USHORT Offset) { Context->TrampolineFarPtr = MAKELONG(Offset, Segment); + Context->TrampolineSize = max(CALL16_TRAMPOLINE_SIZE, + INT16_TRAMPOLINE_SIZE); Context->Segment = Segment; - Context->NextOffset = Offset + max(CALL16_TRAMPOLINE_SIZE, - INT16_TRAMPOLINE_SIZE); + Context->NextOffset = Offset + Context->TrampolineSize; } VOID Modified: trunk/reactos/subsystems/ntvdm/callback.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/callback.… ============================================================================== --- trunk/reactos/subsystems/ntvdm/callback.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/callback.h [iso-8859-1] Mon May 19 01:12:25 2014 @@ -15,17 +15,15 @@ /* 32-bit Interrupt Identifiers */ #define EMULATOR_MAX_INT32_NUM 0xFF + 1 -#define INT_HANDLER_OFFSET 0x1000 -#define COMMON_STUB_OFFSET 0x2000 - - typedef struct _CALLBACK16 { ULONG TrampolineFarPtr; // Where the trampoline zone is placed + ULONG TrampolineSize; // Size of the trampoline zone USHORT Segment; USHORT NextOffset; } CALLBACK16, *PCALLBACK16; +extern const ULONG Int16To32StubSize; /* FUNCTIONS ******************************************************************/

10 years, 7 months

[hbelusca] 63365: [NTVDM] Correctly NULL-terminate the command-lines when needed (and avoid buffer overruns).

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun May 18 23:45:43 2014 New Revision: 63365 URL: http://svn.reactos.org/svn/reactos?rev=63365&view=rev Log: [NTVDM] Correctly NULL-terminate the command-lines when needed (and avoid buffer overruns). Modified: trunk/reactos/subsystems/ntvdm/dos/dem.c trunk/reactos/subsystems/ntvdm/dos/dos32krnl/dos.c Modified: trunk/reactos/subsystems/ntvdm/dos/dem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/dos/dem.c… ============================================================================== --- trunk/reactos/subsystems/ntvdm/dos/dem.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/dos/dem.c [iso-8859-1] Sun May 18 23:45:43 2014 @@ -119,8 +119,8 @@ STARTUPINFOA StartupInfo; PROCESS_INFORMATION ProcessInformation; - /* NULL-terminate the command by removing the return carriage character */ - while (*CmdPtr != '\r') CmdPtr++; + /* NULL-terminate the command line by removing the return carriage character */ + while (*CmdPtr && *CmdPtr != '\r') CmdPtr++; *CmdPtr = '\0'; DPRINT1("CMD Run Command '%s'\n", Command); Modified: trunk/reactos/subsystems/ntvdm/dos/dos32krnl/dos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/dos/dos32… ============================================================================== --- trunk/reactos/subsystems/ntvdm/dos/dos32krnl/dos.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/dos/dos32krnl/dos.c [iso-8859-1] Sun May 18 23:45:43 2014 @@ -926,6 +926,10 @@ return ERROR_NOT_SUPPORTED; } + /* NULL-terminate the command line by removing the return carriage character */ + while (*CommandLine && *CommandLine != '\r') CommandLine++; + *(LPSTR)CommandLine = '\0'; + /* Open a handle to the executable */ FileHandle = CreateFileA(ExecutablePath, GENERIC_READ,

10 years, 7 months

[hbelusca] 63364: [KERNEL32]: Remove temporary DPRINTs and fix comments.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun May 18 23:17:25 2014 New Revision: 63364 URL: http://svn.reactos.org/svn/reactos?rev=63364&view=rev Log: [KERNEL32]: Remove temporary DPRINTs and fix comments. Modified: trunk/reactos/dll/win32/kernel32/client/vdm.c Modified: trunk/reactos/dll/win32/kernel32/client/vdm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/vdm.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/vdm.c [iso-8859-1] Sun May 18 23:17:25 2014 @@ -99,8 +99,6 @@ return STATUS_INVALID_PARAMETER; } - DPRINT1("Before: ApplicationName = '%S' ; CommandLine = '%S'\n", ApplicationName, CommandLine); - /* Trim leading whitespace from ApplicationName */ while (*ApplicationName == L' ' || *ApplicationName == L'\t') ++ApplicationName; @@ -164,7 +162,6 @@ * suppose that the first token corresponds to an application name and * we skip it. Care should be taken when quotes are present in this token. */ - if (*CommandLine) { /* The first part of CommandLine should be the ApplicationName... */ @@ -206,8 +203,6 @@ while (*CommandLine == L' ' || *CommandLine == L'\t') ++CommandLine; - DPRINT1("After: ApplicationName = '%S' ; CommandLine = '%S'\n", ApplicationName, CommandLine); - /* Get the current directory */ if (CurrentDirectory == NULL) { @@ -290,7 +285,7 @@ } /* Allocate memory for the ANSI strings */ - // We need to add the two newline characters '\r\n' to the command line + // We need to add the newline characters '\r\n' to the command line AnsiCmdLine = (PCHAR)RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, CheckVdm->CmdLen + 2); AnsiAppName = (PCHAR)RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, CheckVdm->AppLen); AnsiCurDirectory = (PCHAR)RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, CheckVdm->CurDirectoryLen); @@ -324,7 +319,7 @@ CheckVdm->CmdLen, NULL, NULL); - /* Add a needed newline '\r\n' and NULL-terminate */ + /* Add the needed newline and NULL-terminate */ CheckVdm->CmdLen--; // Rewind back to the NULL character AnsiCmdLine[CheckVdm->CmdLen++] = '\r'; AnsiCmdLine[CheckVdm->CmdLen++] = '\n';

10 years, 7 months

← Newer
1
...
13
14
15
16
17
18
19
...
44
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2014