Ros-diffs

ros-diffs@reactos.org

81390 discussions

[frik85] 28371: polish interface (<h1> tag, sample revisions always up-to-date, title upper-case, etc.)
by frik85＠svn.reactos.org 16 Aug '07

16 Aug '07

Author: frik85 Date: Thu Aug 16 18:03:22 2007 New Revision: 28371 URL: http://svn.reactos.org/svn/reactos?rev=28371&view=rev Log: polish interface (<h1> tag, sample revisions always up-to-date, title upper-case, etc.) Modified: trunk/web/reactos.org/htdocs/getbuilds/getbuilds.css trunk/web/reactos.org/htdocs/getbuilds/index.php trunk/web/reactos.org/htdocs/getbuilds/lang/de.inc.php trunk/web/reactos.org/htdocs/getbuilds/lang/en.inc.php Modified: trunk/web/reactos.org/htdocs/getbuilds/getbuilds.css URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/getbuilds/g… ============================================================================== --- trunk/web/reactos.org/htdocs/getbuilds/getbuilds.css (original) +++ trunk/web/reactos.org/htdocs/getbuilds/getbuilds.css Thu Aug 16 18:03:22 2007 @@ -21,6 +21,33 @@ a:hover { color: #000000; } + + +h1 { + display: block; + line-height: normal; + font-size: 14px; + font-weight: bold; + color: #FFFFFF; + background-color: #5984C3; + padding: 0px 0px 1px 10px; + margin-top: 0; +} +h1 a { + font-size: 14px; + font-weight: bold; + color: #FFFFFF; + background-color: #5984C3; + text-decoration:none; +} +h1 a:hover { + font-size: 14px; + font-weight: bold; + color: #FFFFFF; + background-color: #5984C3; + text-decoration:underline; +} + h2 { font-size: 22px; Modified: trunk/web/reactos.org/htdocs/getbuilds/index.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/getbuilds/i… ============================================================================== --- trunk/web/reactos.org/htdocs/getbuilds/index.php (original) +++ trunk/web/reactos.org/htdocs/getbuilds/index.php Thu Aug 16 18:03:22 2007 @@ -99,6 +99,7 @@ </td> <td id="content"> +<h1><?php echo $getbuilds_langres["header"]; ?></h1> <h2><?php echo $getbuilds_langres["title"]; ?></h2> <p><?php echo $getbuilds_langres["intro"]; ?></p> @@ -130,7 +131,7 @@ </div> </div> </div> - +<div style="margin:5px;"> </div> <div class="bubble_bg"> <div class="rounded_ll"> <div class="rounded_lr"> @@ -156,7 +157,14 @@ '<img src="images/rightarrow.gif" alt=">" title="<?php echo $getbuilds_langres["nextrev"]; ?>" onclick="nextRev();"><br>' + '</span>' + - '<img src="images/info.gif" alt="INFO:"> <?php echo $getbuilds_langres["rangeinfo"]; ?>' + + '<img src="images/info.gif" alt="INFO:"> <?php + + echo $getbuilds_langres["rangeinfo"]; + echo " <i>".$rev."</i>"; + echo $getbuilds_langres["rangeinfo2"]; + echo " <i>".($rev-50)."-".$rev."</i>)."; + + ?>' + '</td>' + '</tr>' + '<tr>' + Modified: trunk/web/reactos.org/htdocs/getbuilds/lang/de.inc.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/getbuilds/l… ============================================================================== --- trunk/web/reactos.org/htdocs/getbuilds/lang/de.inc.php (original) +++ trunk/web/reactos.org/htdocs/getbuilds/lang/de.inc.php Thu Aug 16 18:03:22 2007 @@ -10,7 +10,8 @@ /**** German resources (charset=utf-8) ****/ $getbuilds_langres["language"] = "Sprache"; - $getbuilds_langres["title"] = "Entwicklerversionen herunterladen"; + $getbuilds_langres["header"] = "<a href=\"http://www.reactos.org/\">Startseite</a> > ReactOS SVN Nightly-Builds"; + $getbuilds_langres["title"] = "ReactOS Nightly-Builds Herunterladen"; $getbuilds_langres["intro"] = 'Hier kÃ¶nnen Sie aktuelle aber auch Ã¤ltere ReactOS-Entwicklerversionen herunterladen, die von unserem <a href="http://www.reactos.org/wiki/index.php/RosBuild">BuildBot</a> erstellt wurden.'; $getbuilds_langres["overview"] = "Ãbersicht"; @@ -28,7 +29,8 @@ $getbuilds_langres["nextrev"] = "NÃ¤chste Revision"; $getbuilds_langres["showrev"] = "Anzeigen"; $getbuilds_langres["gettinglist"] = "Dateiliste wird geladen"; - $getbuilds_langres["rangeinfo"] = "Sie kÃ¶nnen eine Revisionsnummer (z.B. <i>27154</i>) oder einen Revisionsbereich (z.B. <i>27000-27154</i>) eingeben."; + $getbuilds_langres["rangeinfo"] = "Sie kÃ¶nnen eine Revisionsnummer (z.B."; + $getbuilds_langres["rangeinfo2"] = ") oder einen Revisionsbereich eingeben (z.B."; $getbuilds_langres["isotype"] = "CD-Image-Typen anzeigen"; $getbuilds_langres["foundfiles"] = "%s Dateien gefunden!"; Modified: trunk/web/reactos.org/htdocs/getbuilds/lang/en.inc.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/getbuilds/l… ============================================================================== --- trunk/web/reactos.org/htdocs/getbuilds/lang/en.inc.php (original) +++ trunk/web/reactos.org/htdocs/getbuilds/lang/en.inc.php Thu Aug 16 18:03:22 2007 @@ -10,7 +10,8 @@ /**** English resources (charset=utf-8) ****/ $getbuilds_langres["language"] = "Language"; - $getbuilds_langres["title"] = "Download trunk builds"; + $getbuilds_langres["header"] = "<a href=\"http://www.reactos.org/\">Home</a> > ReactOS SVN Trunk Builds"; + $getbuilds_langres["title"] = "Download ReactOS Trunk Builds"; $getbuilds_langres["intro"] = 'Here you can download recent, but also older ReactOS Developer versions, which were created by our <a href="http://www.reactos.org/wiki/index.php/RosBuild">BuildBot</a>.'; $getbuilds_langres["overview"] = "Overview"; @@ -28,7 +29,8 @@ $getbuilds_langres["nextrev"] = "Next revision"; $getbuilds_langres["showrev"] = "Show"; $getbuilds_langres["gettinglist"] = "Getting file list"; - $getbuilds_langres["rangeinfo"] = "You can enter a revision number (e.g. <i>27154</i>) or a revision range (e.g. <i>27000-27154</i>)."; + $getbuilds_langres["rangeinfo"] = "You can enter a revision number (e.g."; + $getbuilds_langres["rangeinfo2"] = ") or a revision range (e.g."; $getbuilds_langres["isotype"] = "Show CD Image types"; $getbuilds_langres["foundfiles"] = "Found %s files!";

1 0

[cfinck] 28370: Integrate "getbuilds" into the Layout and Design of the ReactOS Website. Also add a Language selection box, which works similar to the Language selection box of RosCMS. At the moment, you can select between an english and a german interface. Translators, feel free to add more translations by translating the "lang.inc.php" files :-)
by cfinck＠svn.reactos.org 16 Aug '07

16 Aug '07

Author: cfinck Date: Thu Aug 16 14:42:21 2007 New Revision: 28370 URL: http://svn.reactos.org/svn/reactos?rev=28370&view=rev Log: Integrate "getbuilds" into the Layout and Design of the ReactOS Website. Also add a Language selection box, which works similar to the Language selection box of RosCMS. At the moment, you can select between an english and a german interface. Translators, feel free to add more translations by translating the "lang.inc.php" files :-) Modified: trunk/web/reactos.org/htdocs/getbuilds/getbuilds.css trunk/web/reactos.org/htdocs/getbuilds/index.php trunk/web/reactos.org/htdocs/getbuilds/lang/de.inc.php trunk/web/reactos.org/htdocs/getbuilds/lang/en.inc.php Modified: trunk/web/reactos.org/htdocs/getbuilds/getbuilds.css URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/getbuilds/g… ============================================================================== --- trunk/web/reactos.org/htdocs/getbuilds/getbuilds.css (original) +++ trunk/web/reactos.org/htdocs/getbuilds/getbuilds.css Thu Aug 16 14:42:21 2007 @@ -6,16 +6,27 @@ COPYRIGHT: Copyright 2007 Colin Finck <mail(a)colinfinck.de> */ -body, tr { - font-family: Verdana, Arial, Helvetica; +body { + font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10pt; + margin: 0 0 1em 0; + padding: 0; /* Only affects Opera */ + background: #FFFFFF url('http://www.reactos.org/images/topbar.jpg') repeat-x scroll top left; +} + +a { + color: #006090; +} + +a:hover { + color: #000000; } h2 { font-size: 22px; color: #5984C3; font-weight: bold; - margin-top: 15px; + margin-top: 0; } h3 { @@ -24,6 +35,96 @@ font-weight: bold; margin-top: 0; margin-bottom: 1em; +} + +#top { + margin: 0; + background: url('http://www.reactos.org/images/logo.jpg') no-repeat scroll 35px 0; + padding: 103px 0 26px 0; + color: #FFFFFF; + text-align: right; +} + +#top a { + font-size: 13px; + color: #FFFFFF; + text-decoration: none; + padding: 1px 5px 1px 5px; +} + +#top a:hover { + color: #000000; + background-color: #FFCC33; +} + +#topMenu { + font-size: 13px; + margin-left: 300px; + background-color: #5984C3; +} + +#topMenu p { + text-align: left; + margin: 0; +} + +#leftNav { + padding: 0px 10px 10px 7px; +} + +#leftNav ol { + margin: 0; + padding: 0; + list-style-type: none; + background-color: #EEEEEE; + border-top: #3F3849 0px solid; + border-right: #3F3849 1px solid; + border-left: #3F3849 1px solid; +} + +#leftNav ol li { + font-size: 13px; + font-weight: bold; + border-bottom: #3f3849 1px solid; +} + +#leftNav ol li a { + font-size: 12px; + + display: block; + width: 137px; + padding: 2px 4px 2px 4px; + + color: #3F3849; + text-decoration: none; + background-color: #EEEEEE; +} + +#leftNav ol li a:hover { + color: #000000; + background-color: #FFCC33; +} + +#leftNav ol li a.extern { + background: none; + padding-right: 0px; +} + +#leftNav .navTitle { + padding-left: 12px; + border-top: #3F3849 1px solid; + border-right: #3F3849 1px solid; + border-bottom: #3F3849 1px solid; + border-left: #3F3849 1px solid; + + font-weight: bold; + font-size: 14px; + color: #FFFFFF; + background-color: #5984c3; +} + +#content { + padding-right: 10px; } .bubble_bg { Modified: trunk/web/reactos.org/htdocs/getbuilds/index.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/getbuilds/i… ============================================================================== --- trunk/web/reactos.org/htdocs/getbuilds/index.php (original) +++ trunk/web/reactos.org/htdocs/getbuilds/index.php Thu Aug 16 14:42:21 2007 @@ -8,7 +8,41 @@ */ require_once("config.inc.php"); - require_once("lang/en.inc.php"); + + // Get the domain for the cookie (with a leading dot if possible). Borrowed from "utils.php" of RosCMS. + function cookie_domain() + { + if( isset($_SERVER['SERVER_NAME']) ) + { + if( preg_match('/(\.[^.]+\.[^.]+$)/', $_SERVER['SERVER_NAME'], $matches) ) + return $matches[1]; + else + return ""; + } + else + return ""; + } + + // Get the language and include it + if( isset($_GET["lang"]) ) + $lang = $_GET["lang"]; + else if( isset($_COOKIE["roscms_usrset_lang"]) ) + $lang = $_COOKIE["roscms_usrset_lang"]; + + // Use this switch statement to prevent users from entering invalid languages and fall back to english if no language has been set + switch($lang) + { + case "de": + case "en": + // Language is valid, nothing to be done + break; + + default: + $lang = "en"; + } + + setcookie( "roscms_usrset_lang", $lang, time() + 5 * 30 * 24 * 3600, "/", cookie_domain() ); + require_once("lang/$lang.inc.php"); // Get the latest SVN revision $fp = fopen( $SVN_ACTIVITY_URL, "r" ); @@ -41,7 +75,33 @@ </head> <body onload="showLatestFiles();"> +<?php + readfile("http://www.reactos.org/$lang/subsys_extern_menu_top.html"); + readfile("http://www.reactos.org/$lang/subsys_extern_menu_left.html"); +?> + +<div class="navTitle"><?php echo $getbuilds_langres["language"]; ?></div> + <ol> + <li style="text-align: center;"> + <select size="1" onchange="window.location.href = '<?php echo "http://" . $_SERVER["SERVER_NAME"] . $_SERVER["PHP_SELF"]; ?>?lang=' + this.options[this.selectedIndex].value;"> + <?php + $getbuilds_languages = array( + "en" => "English", + "de" => "Deutsch (German)" + ); + + foreach($getbuilds_languages as $lang_key => $lang_name) + printf('<option value="%s"%s>%s</option>', $lang_key, ($lang_key == $lang ? ' selected' : ''), $lang_name); + ?> + </select> + </li> + </ol> +</td> +<td id="content"> + <h2><?php echo $getbuilds_langres["title"]; ?></h2> + +<p><?php echo $getbuilds_langres["intro"]; ?></p> <div class="bubble_bg"> <div class="rounded_ll"> @@ -58,7 +118,7 @@ <li><a href="http://cia.vc/stats/project/ReactOS"><?php echo $getbuilds_langres["cia"]; ?></a></li> </ul> - <?php echo $getbuilds_langres["buildbot_status"]; ?>: Not yet implemented + <?php echo $getbuilds_langres["buildbot_status"]; ?>: <ul class="web"> <li><a href="http://www.reactos.org:8010"><?php echo $getbuilds_langres["buildbot_web"]; ?></a></li> <li><a href="http://svn.reactos.org/iso"><?php echo $getbuilds_langres["browsebuilds"]; ?></a></li> @@ -148,5 +208,9 @@ </div> </div> +</td> +</tr> +</table> + </body> </html> Modified: trunk/web/reactos.org/htdocs/getbuilds/lang/de.inc.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/getbuilds/l… ============================================================================== --- trunk/web/reactos.org/htdocs/getbuilds/lang/de.inc.php (original) +++ trunk/web/reactos.org/htdocs/getbuilds/lang/de.inc.php Thu Aug 16 14:42:21 2007 @@ -8,7 +8,10 @@ */ /**** German resources (charset=utf-8) ****/ + $getbuilds_langres["language"] = "Sprache"; + $getbuilds_langres["title"] = "Entwicklerversionen herunterladen"; + $getbuilds_langres["intro"] = 'Hier kÃ¶nnen Sie aktuelle aber auch Ã¤ltere ReactOS-Entwicklerversionen herunterladen, die von unserem <a href="http://www.reactos.org/wiki/index.php/RosBuild">BuildBot</a> erstellt wurden.'; $getbuilds_langres["overview"] = "Ãbersicht"; $getbuilds_langres["latestrev"] = "Letzte ReactOS-Revision auf dem SVN-Server"; Modified: trunk/web/reactos.org/htdocs/getbuilds/lang/en.inc.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/getbuilds/l… ============================================================================== --- trunk/web/reactos.org/htdocs/getbuilds/lang/en.inc.php (original) +++ trunk/web/reactos.org/htdocs/getbuilds/lang/en.inc.php Thu Aug 16 14:42:21 2007 @@ -8,7 +8,10 @@ */ /**** English resources (charset=utf-8) ****/ + $getbuilds_langres["language"] = "Language"; + $getbuilds_langres["title"] = "Download trunk builds"; + $getbuilds_langres["intro"] = 'Here you can download recent, but also older ReactOS Developer versions, which were created by our <a href="http://www.reactos.org/wiki/index.php/RosBuild">BuildBot</a>.'; $getbuilds_langres["overview"] = "Overview"; $getbuilds_langres["latestrev"] = "Latest ReactOS Revision on the SVN Server";

1 0

[cfinck] 28369: Merge 28350:28368
by cfinck＠svn.reactos.org 16 Aug '07

16 Aug '07

Author: cfinck Date: Thu Aug 16 12:43:03 2007 New Revision: 28369 URL: http://svn.reactos.org/svn/reactos?rev=28369&view=rev Log: Merge 28350:28368 Added: branches/ros-branch-0_3_3-new/reactos/base/applications/cmdutils/find/lang/ (props changed) - copied from r28368, trunk/reactos/base/applications/cmdutils/find/lang/ branches/ros-branch-0_3_3-new/reactos/base/applications/cmdutils/find/resource.h - copied unchanged from r28368, trunk/reactos/base/applications/cmdutils/find/resource.h branches/ros-branch-0_3_3-new/reactos/base/applications/cmdutils/find/rsrc.rc - copied unchanged from r28368, trunk/reactos/base/applications/cmdutils/find/rsrc.rc Modified: branches/ros-branch-0_3_3-new/reactos/base/applications/calc/lang/ru-RU.rc branches/ros-branch-0_3_3-new/reactos/base/applications/charmap/lang/de-DE.rc branches/ros-branch-0_3_3-new/reactos/base/applications/charmap/lang/ru-RU.rc branches/ros-branch-0_3_3-new/reactos/base/applications/cmdutils/find/find.c branches/ros-branch-0_3_3-new/reactos/base/applications/cmdutils/find/find.rbuild branches/ros-branch-0_3_3-new/reactos/base/applications/cmdutils/find/find.rc branches/ros-branch-0_3_3-new/reactos/base/applications/games/solitaire/lang/ru-RU.rc branches/ros-branch-0_3_3-new/reactos/base/applications/games/winemine/lang/ru-RU.rc branches/ros-branch-0_3_3-new/reactos/base/applications/msconfig/lang/ru-RU.rc branches/ros-branch-0_3_3-new/reactos/base/applications/mscutils/devmgmt/lang/de-DE.rc branches/ros-branch-0_3_3-new/reactos/base/applications/mscutils/devmgmt/lang/ru-RU.rc branches/ros-branch-0_3_3-new/reactos/base/applications/mscutils/servman/lang/de-DE.rc branches/ros-branch-0_3_3-new/reactos/base/applications/mscutils/servman/lang/ru-RU.rc branches/ros-branch-0_3_3-new/reactos/base/applications/notepad/lang/ru-RU.rc branches/ros-branch-0_3_3-new/reactos/base/applications/screensavers/matrix/lang/de-DE.rc branches/ros-branch-0_3_3-new/reactos/base/applications/taskmgr/lang/ru-RU.rc branches/ros-branch-0_3_3-new/reactos/base/applications/wordpad/lang/de-DE.rc branches/ros-branch-0_3_3-new/reactos/base/applications/wordpad/lang/ru-RU.rc branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-de.rc branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-ro.rc branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-ru.rc branches/ros-branch-0_3_3-new/reactos/boot/freeldr/fdebug/lang/de-DE.rc branches/ros-branch-0_3_3-new/reactos/boot/freeldr/freeldr/fs/ntfs.c branches/ros-branch-0_3_3-new/reactos/dll/cpl/access/lang/de-DE.rc branches/ros-branch-0_3_3-new/reactos/dll/cpl/desk/lang/de-DE.rc branches/ros-branch-0_3_3-new/reactos/dll/cpl/desk/lang/ru-RU.rc branches/ros-branch-0_3_3-new/reactos/dll/cpl/intl/lang/ru-RU.rc branches/ros-branch-0_3_3-new/reactos/dll/cpl/main/lang/ru-RU.rc branches/ros-branch-0_3_3-new/reactos/dll/cpl/mmsys/lang/cs-CZ.rc branches/ros-branch-0_3_3-new/reactos/dll/cpl/mmsys/lang/de-DE.rc branches/ros-branch-0_3_3-new/reactos/dll/cpl/mmsys/lang/el-GR.rc branches/ros-branch-0_3_3-new/reactos/dll/cpl/mmsys/lang/en-US.rc branches/ros-branch-0_3_3-new/reactos/dll/cpl/mmsys/lang/es-ES.rc branches/ros-branch-0_3_3-new/reactos/dll/cpl/mmsys/lang/fr-FR.rc branches/ros-branch-0_3_3-new/reactos/dll/cpl/mmsys/lang/id-ID.rc branches/ros-branch-0_3_3-new/reactos/dll/cpl/mmsys/lang/it-IT.rc branches/ros-branch-0_3_3-new/reactos/dll/cpl/mmsys/lang/nl-NL.rc branches/ros-branch-0_3_3-new/reactos/dll/cpl/mmsys/lang/pl-PL.rc branches/ros-branch-0_3_3-new/reactos/dll/cpl/mmsys/lang/pt-BR.rc branches/ros-branch-0_3_3-new/reactos/dll/cpl/mmsys/lang/ru-RU.rc branches/ros-branch-0_3_3-new/reactos/dll/cpl/mmsys/lang/uk-UA.rc branches/ros-branch-0_3_3-new/reactos/dll/cpl/mmsys/mmsys.c branches/ros-branch-0_3_3-new/reactos/dll/cpl/mmsys/mmsys.rbuild branches/ros-branch-0_3_3-new/reactos/dll/cpl/mmsys/mmsys.rc branches/ros-branch-0_3_3-new/reactos/dll/cpl/mmsys/resource.h branches/ros-branch-0_3_3-new/reactos/dll/cpl/powercfg/lang/ru-RU.rc branches/ros-branch-0_3_3-new/reactos/dll/cpl/sysdm/lang/ru-RU.rc branches/ros-branch-0_3_3-new/reactos/dll/cpl/sysdm/sysdm.rc branches/ros-branch-0_3_3-new/reactos/dll/win32/comctl32/comctl_Ru.rc branches/ros-branch-0_3_3-new/reactos/dll/win32/devmgr/lang/ru-RU.rc branches/ros-branch-0_3_3-new/reactos/dll/win32/gdi32/misc/stubs.c branches/ros-branch-0_3_3-new/reactos/dll/win32/netid/lang/ru-RU.rc branches/ros-branch-0_3_3-new/reactos/dll/win32/newdev/lang/de-DE.rc branches/ros-branch-0_3_3-new/reactos/dll/win32/shell32/shell32_Ru.rc branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/lang/de-DE.rc branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/lang/ru-RU.rc branches/ros-branch-0_3_3-new/reactos/dll/win32/user32/windows/messagebox.c branches/ros-branch-0_3_3-new/tools/RosBE-Windows/Root/Clean.cmd [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/ros-branch-0_3_3-new/reactos/base/applications/calc/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/ba… Modified: branches/ros-branch-0_3_3-new/reactos/base/applications/charmap/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/ba… Modified: branches/ros-branch-0_3_3-new/reactos/base/applications/charmap/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/ba… Modified: branches/ros-branch-0_3_3-new/reactos/base/applications/cmdutils/find/find.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/ba… Modified: branches/ros-branch-0_3_3-new/reactos/base/applications/cmdutils/find/find.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/ba… Modified: branches/ros-branch-0_3_3-new/reactos/base/applications/cmdutils/find/find.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/ba… Modified: branches/ros-branch-0_3_3-new/reactos/base/applications/games/solitaire/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/ba… Modified: branches/ros-branch-0_3_3-new/reactos/base/applications/games/winemine/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/ba… Modified: branches/ros-branch-0_3_3-new/reactos/base/applications/msconfig/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/ba… Modified: branches/ros-branch-0_3_3-new/reactos/base/applications/mscutils/devmgmt/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/ba… Modified: branches/ros-branch-0_3_3-new/reactos/base/applications/mscutils/devmgmt/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/ba… Modified: branches/ros-branch-0_3_3-new/reactos/base/applications/mscutils/servman/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/ba… Modified: branches/ros-branch-0_3_3-new/reactos/base/applications/mscutils/servman/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/ba… Modified: branches/ros-branch-0_3_3-new/reactos/base/applications/notepad/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/ba… Modified: branches/ros-branch-0_3_3-new/reactos/base/applications/screensavers/matrix/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/ba… Modified: branches/ros-branch-0_3_3-new/reactos/base/applications/taskmgr/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/ba… Modified: branches/ros-branch-0_3_3-new/reactos/base/applications/wordpad/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/ba… Modified: branches/ros-branch-0_3_3-new/reactos/base/applications/wordpad/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/ba… Modified: branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-de.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/ba… Modified: branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-ro.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/ba… Modified: branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-ru.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/ba… Modified: branches/ros-branch-0_3_3-new/reactos/boot/freeldr/fdebug/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/bo… Modified: branches/ros-branch-0_3_3-new/reactos/boot/freeldr/freeldr/fs/ntfs.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/bo… Modified: branches/ros-branch-0_3_3-new/reactos/dll/cpl/access/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/dl… Modified: branches/ros-branch-0_3_3-new/reactos/dll/cpl/desk/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/dl… Modified: branches/ros-branch-0_3_3-new/reactos/dll/cpl/desk/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/dl… Modified: branches/ros-branch-0_3_3-new/reactos/dll/cpl/intl/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/dl… Modified: branches/ros-branch-0_3_3-new/reactos/dll/cpl/main/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/dl… Modified: branches/ros-branch-0_3_3-new/reactos/dll/cpl/mmsys/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/dl… Modified: branches/ros-branch-0_3_3-new/reactos/dll/cpl/mmsys/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/dl… Modified: branches/ros-branch-0_3_3-new/reactos/dll/cpl/mmsys/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/dl… Modified: branches/ros-branch-0_3_3-new/reactos/dll/cpl/mmsys/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/dl… Modified: branches/ros-branch-0_3_3-new/reactos/dll/cpl/mmsys/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/dl… Modified: branches/ros-branch-0_3_3-new/reactos/dll/cpl/mmsys/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/dl… Modified: branches/ros-branch-0_3_3-new/reactos/dll/cpl/mmsys/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/dl… Modified: branches/ros-branch-0_3_3-new/reactos/dll/cpl/mmsys/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/dl… Modified: branches/ros-branch-0_3_3-new/reactos/dll/cpl/mmsys/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/dl… Modified: branches/ros-branch-0_3_3-new/reactos/dll/cpl/mmsys/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/dl… Modified: branches/ros-branch-0_3_3-new/reactos/dll/cpl/mmsys/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/dl… Modified: branches/ros-branch-0_3_3-new/reactos/dll/cpl/mmsys/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/dl… Modified: branches/ros-branch-0_3_3-new/reactos/dll/cpl/mmsys/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/dl… Modified: branches/ros-branch-0_3_3-new/reactos/dll/cpl/mmsys/mmsys.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/dl… Modified: branches/ros-branch-0_3_3-new/reactos/dll/cpl/mmsys/mmsys.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/dl… Modified: branches/ros-branch-0_3_3-new/reactos/dll/cpl/mmsys/mmsys.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/dl… Modified: branches/ros-branch-0_3_3-new/reactos/dll/cpl/mmsys/resource.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/dl… Modified: branches/ros-branch-0_3_3-new/reactos/dll/cpl/powercfg/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/dl… Modified: branches/ros-branch-0_3_3-new/reactos/dll/cpl/sysdm/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/dl… Modified: branches/ros-branch-0_3_3-new/reactos/dll/cpl/sysdm/sysdm.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/dl… Modified: branches/ros-branch-0_3_3-new/reactos/dll/win32/comctl32/comctl_Ru.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/dl… Modified: branches/ros-branch-0_3_3-new/reactos/dll/win32/devmgr/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/dl… Modified: branches/ros-branch-0_3_3-new/reactos/dll/win32/gdi32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/dl… Modified: branches/ros-branch-0_3_3-new/reactos/dll/win32/netid/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/dl… Modified: branches/ros-branch-0_3_3-new/reactos/dll/win32/newdev/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/dl… Modified: branches/ros-branch-0_3_3-new/reactos/dll/win32/shell32/shell32_Ru.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/dl… Modified: branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/dl… Modified: branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/dl… Modified: branches/ros-branch-0_3_3-new/reactos/dll/win32/user32/windows/messagebox.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/dl… Modified: branches/ros-branch-0_3_3-new/tools/RosBE-Windows/Root/Clean.cmd URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/tools/RosB…

1 0

[jimtabor] 28368: Added note to EngQueryEMFInfo.
by jimtabor＠svn.reactos.org 16 Aug '07

16 Aug '07

Author: jimtabor Date: Thu Aug 16 04:41:26 2007 New Revision: 28368 URL: http://svn.reactos.org/svn/reactos?rev=28368&view=rev Log: Added note to EngQueryEMFInfo. Modified: trunk/reactos/dll/win32/gdi32/misc/stubs.c Modified: trunk/reactos/dll/win32/gdi32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/stubs… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/stubs.c (original) +++ trunk/reactos/dll/win32/gdi32/misc/stubs.c Thu Aug 16 04:41:26 2007 @@ -2936,6 +2936,8 @@ /* * @implemented + * Obsolete GDI Function + * http://www.osronline.com/DDKx/graphics/gdioview_20tj.htm */ BOOL STDCALL EngQueryEMFInfo(HDEV hdev,EMFINFO *pEMFInfo)

1 0

[jimtabor] 28367: Implemented a handfull of easy Eng APIs.
by jimtabor＠svn.reactos.org 16 Aug '07

16 Aug '07

Author: jimtabor Date: Thu Aug 16 04:12:10 2007 New Revision: 28367 URL: http://svn.reactos.org/svn/reactos?rev=28367&view=rev Log: Implemented a handfull of easy Eng APIs. Modified: trunk/reactos/dll/win32/gdi32/misc/stubs.c Modified: trunk/reactos/dll/win32/gdi32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/stubs… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/stubs.c (original) +++ trunk/reactos/dll/win32/gdi32/misc/stubs.c Thu Aug 16 04:12:10 2007 @@ -2545,8 +2545,7 @@ STDCALL EngAcquireSemaphore ( IN HSEMAPHORE hsem ) { - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + RtlEnterCriticalSection((PRTL_CRITICAL_SECTION)hsem); } @@ -2678,9 +2677,10 @@ STDCALL EngCreateSemaphore ( VOID ) { - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; + PRTL_CRITICAL_SECTION CritSect = RtlAllocateHeap(GetProcessHeap(), 0, sizeof(RTL_CRITICAL_SECTION)); + if (!CritSect) return NULL; + RtlInitializeCriticalSection( CritSect ); + return (HSEMAPHORE)CritSect; } /* @@ -2721,8 +2721,10 @@ STDCALL EngDeleteSemaphore ( IN HSEMAPHORE hsem ) { - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + if (!hsem) return; + + RtlDeleteCriticalSection( (PRTL_CRITICAL_SECTION) hsem ); + RtlFreeHeap( GetProcessHeap(), 0, hsem ); } /* @@ -2877,19 +2879,33 @@ IN PCHAR MultiByteString, IN ULONG BytesInMultiByteString) { - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + RtlMultiByteToUnicodeN( + UnicodeString, + MaxBytesInUnicodeString, + BytesInUnicodeString, + MultiByteString, + BytesInMultiByteString + ); } /* * @unimplemented */ INT STDCALL -EngMultiByteToWideChar(UINT CodePage,LPWSTR WideCharString,INT BytesInWideCharString,LPSTR MultiByteString,INT BytesInMultiByteString) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; +EngMultiByteToWideChar(UINT CodePage, + LPWSTR WideCharString, + INT BytesInWideCharString, + LPSTR MultiByteString, + INT BytesInMultiByteString) +{ + return MultiByteToWideChar( + CodePage, + 0, + MultiByteString, + BytesInMultiByteString, + WideCharString, + (BytesInWideCharString/sizeof(WCHAR)) /* Bytes to (in WCHARs) */ + ); } /* @@ -2919,14 +2935,12 @@ } /* - * @unimplemented + * @implemented */ BOOL STDCALL EngQueryEMFInfo(HDEV hdev,EMFINFO *pEMFInfo) { - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; + return FALSE; } /* @@ -2935,8 +2949,16 @@ VOID STDCALL EngQueryLocalTime(PENG_TIME_FIELDS etf) { - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + SYSTEMTIME SystemTime; + GetLocalTime( &SystemTime ); + etf->usYear = SystemTime.wYear; + etf->usMonth = SystemTime.wMonth; + etf->usWeekday = SystemTime.wDayOfWeek; + etf->usDay = SystemTime.wDay; + etf->usHour = SystemTime.wHour; + etf->usMinute = SystemTime.wMinute; + etf->usSecond = SystemTime.wSecond; + etf->usMilliseconds = SystemTime.wMilliseconds; } /* @@ -2946,8 +2968,7 @@ STDCALL EngReleaseSemaphore ( IN HSEMAPHORE hsem ) { - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + RtlLeaveCriticalSection( (PRTL_CRITICAL_SECTION) hsem); } @@ -3024,8 +3045,13 @@ IN PWSTR UnicodeString, IN ULONG BytesInUnicodeString) { - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + RtlUnicodeToMultiByteN( + MultiByteString, + MaxBytesInMultiByteString, + BytesInMultiByteString, + UnicodeString, + BytesInUnicodeString + ); } /* @@ -3042,11 +3068,21 @@ * @unimplemented */ INT STDCALL -EngWideCharToMultiByte(UINT CodePage,LPWSTR WideCharString,INT BytesInWideCharString,LPSTR MultiByteString,INT BytesInMultiByteString) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; +EngWideCharToMultiByte( UINT CodePage, + LPWSTR WideCharString, + INT BytesInWideCharString, + LPSTR MultiByteString, + INT BytesInMultiByteString) +{ + return WideCharToMultiByte( + CodePage, + 0, + WideCharString, + (BytesInWideCharString/sizeof(WCHAR)), /* Bytes to (in WCHARs) */ + MultiByteString, + BytesInMultiByteString, + NULL, + NULL); } /*

1 0

[fireball] 28366: - Uncomment ukranian language, since the translation was fixed in r27745.
by fireball＠svn.reactos.org 15 Aug '07

15 Aug '07

Author: fireball Date: Thu Aug 16 00:44:26 2007 New Revision: 28366 URL: http://svn.reactos.org/svn/reactos?rev=28366&view=rev Log: - Uncomment ukranian language, since the translation was fixed in r27745. Modified: trunk/reactos/dll/cpl/sysdm/sysdm.rc Modified: trunk/reactos/dll/cpl/sysdm/sysdm.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/sysdm.rc?rev… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/sysdm.rc (original) +++ trunk/reactos/dll/cpl/sysdm/sysdm.rc Thu Aug 16 00:44:26 2007 @@ -29,6 +29,7 @@ #include "lang/it-IT.rc" #include "lang/pl-PL.rc" #include "lang/ru-RU.rc" +#include "lang/uk-UA.rc" /* #include "lang/cs-CZ.rc" @@ -38,5 +39,4 @@ #include "lang/ja-JP.rc" #include "lang/nl-NL.rc" #include "lang/sv-SE.rc" -#include "lang/uk-UA.rc" */

1 0

[fireball] 28365: - Merge 28364.
by fireball＠svn.reactos.org 15 Aug '07

15 Aug '07

Author: fireball Date: Thu Aug 16 00:08:25 2007 New Revision: 28365 URL: http://svn.reactos.org/svn/reactos?rev=28365&view=rev Log: - Merge 28364. Modified: branches/winldr/fs/ntfs.c Modified: branches/winldr/fs/ntfs.c URL: http://svn.reactos.org/svn/reactos/branches/winldr/fs/ntfs.c?rev=28365&r1=2… ============================================================================== --- branches/winldr/fs/ntfs.c (original) +++ branches/winldr/fs/ntfs.c Thu Aug 16 00:08:25 2007 @@ -184,7 +184,7 @@ ULONGLONG CurrentOffset; ULONGLONG ReadLength; ULONGLONG AlreadyRead; - + DbgPrint((DPRINT_FILESYSTEM, "NtfsReadAttribute() - Context: %p Offset: %I64d Length %I64d\n", Context, Offset, Length)); @@ -197,16 +197,18 @@ RtlCopyMemory(Buffer, (PCHAR)&Context->Record + Context->Record.Resident.ValueOffset + Offset, Length); return Length; } - + /* * Non-resident attribute */ - + /* * I. Find the corresponding start data run. */ - - if (Context->CacheRunOffset == Offset) + + AlreadyRead = 0; + + if(Context->CacheRunOffset <= Offset && Offset < Context->CacheRunOffset + Context->CacheRunLength * NtfsClusterSize) { DataRun = Context->CacheRun; LastLCN = Context->CacheRunLastLCN; @@ -219,7 +221,7 @@ LastLCN = 0; DataRun = (PUCHAR)&Context->Record + Context->Record.NonResident.MappingPairsOffset; CurrentOffset = 0; - + while (1) { DataRun = NtfsDecodeRun(DataRun, &DataRunOffset, &DataRunLength); @@ -234,70 +236,97 @@ /* Sparse data run. */ DataRunStartLCN = -1; } - + if (Offset >= CurrentOffset && Offset < CurrentOffset + (DataRunLength * NtfsClusterSize)) { break; } - + if (*DataRun == 0) { - return 0; - } - + return AlreadyRead; + } + CurrentOffset += DataRunLength * NtfsClusterSize; } } - + /* * II. Go through the run list and read the data */ - - AlreadyRead = 0; - while (Length > 0) - { - ReadLength = min(DataRunLength * NtfsClusterSize, Length); - if (DataRunStartLCN == -1) - RtlZeroMemory(Buffer, ReadLength); - else if (!NtfsDiskRead(DataRunStartLCN * NtfsClusterSize + Offset - CurrentOffset, ReadLength, Buffer)) - break; - Length -= ReadLength; - Buffer += ReadLength; - AlreadyRead += ReadLength; - - /* We finished this request, but there still data in this data run. */ - if (Length == 0 && ReadLength != DataRunLength * NtfsClusterSize) - break; - - /* - * Go to next run in the list. - */ - - if (*DataRun == 0) - break; - DataRun = NtfsDecodeRun(DataRun, &DataRunOffset, &DataRunLength); - if (DataRunOffset != -1) - { - /* Normal data run. */ - DataRunStartLCN = LastLCN + DataRunOffset; - LastLCN = DataRunStartLCN; - } - else - { - /* Sparse data run. */ - DataRunStartLCN = -1; - } - CurrentOffset += DataRunLength * NtfsClusterSize; - } - + + ReadLength = min(DataRunLength * NtfsClusterSize - (Offset - CurrentOffset), Length); + if (DataRunStartLCN == -1) + RtlZeroMemory(Buffer, ReadLength); + if (NtfsDiskRead(DataRunStartLCN * NtfsClusterSize + Offset - CurrentOffset, ReadLength, Buffer)) + { + Length -= ReadLength; + Buffer += ReadLength; + AlreadyRead += ReadLength; + + if (ReadLength == DataRunLength * NtfsClusterSize - (Offset - CurrentOffset)) + { + CurrentOffset += DataRunLength * NtfsClusterSize; + DataRun = NtfsDecodeRun(DataRun, &DataRunOffset, &DataRunLength); + if (DataRunLength != -1) + { + DataRunStartLCN = LastLCN + DataRunOffset; + LastLCN = DataRunStartLCN; + } + else + DataRunStartLCN = -1; + + if (*DataRun == 0) + return AlreadyRead; + } + + while (Length > 0) + { + ReadLength = min(DataRunLength * NtfsClusterSize, Length); + if (DataRunStartLCN == -1) + RtlZeroMemory(Buffer, ReadLength); + else if (!NtfsDiskRead(DataRunStartLCN * NtfsClusterSize, ReadLength, Buffer)) + break; + + Length -= ReadLength; + Buffer += ReadLength; + AlreadyRead += ReadLength; + + /* We finished this request, but there still data in this data run. */ + if (Length == 0 && ReadLength != DataRunLength * NtfsClusterSize) + break; + + /* + * Go to next run in the list. + */ + + if (*DataRun == 0) + break; + CurrentOffset += DataRunLength * NtfsClusterSize; + DataRun = NtfsDecodeRun(DataRun, &DataRunOffset, &DataRunLength); + if (DataRunOffset != -1) + { + /* Normal data run. */ + DataRunStartLCN = LastLCN + DataRunOffset; + LastLCN = DataRunStartLCN; + } + else + { + /* Sparse data run. */ + DataRunStartLCN = -1; + } + } /* while */ + + } /* if Disk */ + Context->CacheRun = DataRun; Context->CacheRunOffset = Offset + AlreadyRead; Context->CacheRunStartLCN = DataRunStartLCN; Context->CacheRunLength = DataRunLength; Context->CacheRunLastLCN = LastLCN; Context->CacheRunCurrentOffset = CurrentOffset; - + return AlreadyRead; }

1 0

[fireball] 28364: Feng Yuning <fengyuning1984@gmail.com>: - Fix ntfs reading problem (occurs when trying to load Windows from an NTFS partition, reading always failed).
by fireball＠svn.reactos.org 15 Aug '07

15 Aug '07

Author: fireball Date: Thu Aug 16 00:04:50 2007 New Revision: 28364 URL: http://svn.reactos.org/svn/reactos?rev=28364&view=rev Log: Feng Yuning <fengyuning1984(a)gmail.com>: - Fix ntfs reading problem (occurs when trying to load Windows from an NTFS partition, reading always failed). Modified: trunk/reactos/boot/freeldr/freeldr/fs/ntfs.c Modified: trunk/reactos/boot/freeldr/freeldr/fs/ntfs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/fs/nt… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/fs/ntfs.c (original) +++ trunk/reactos/boot/freeldr/freeldr/fs/ntfs.c Thu Aug 16 00:04:50 2007 @@ -176,7 +176,7 @@ ULONGLONG CurrentOffset; ULONGLONG ReadLength; ULONGLONG AlreadyRead; - + if (!Context->Record.IsNonResident) { if (Offset > Context->Record.Resident.ValueLength) @@ -186,16 +186,18 @@ RtlCopyMemory(Buffer, (PCHAR)&Context->Record + Context->Record.Resident.ValueOffset + Offset, Length); return Length; } - + /* * Non-resident attribute */ - + /* * I. Find the corresponding start data run. */ - - if (Context->CacheRunOffset == Offset) + + AlreadyRead = 0; + + if(Context->CacheRunOffset <= Offset && Offset < Context->CacheRunOffset + Context->CacheRunLength * NtfsClusterSize) { DataRun = Context->CacheRun; LastLCN = Context->CacheRunLastLCN; @@ -208,7 +210,7 @@ LastLCN = 0; DataRun = (PUCHAR)&Context->Record + Context->Record.NonResident.MappingPairsOffset; CurrentOffset = 0; - + while (1) { DataRun = NtfsDecodeRun(DataRun, &DataRunOffset, &DataRunLength); @@ -223,70 +225,97 @@ /* Sparse data run. */ DataRunStartLCN = -1; } - + if (Offset >= CurrentOffset && Offset < CurrentOffset + (DataRunLength * NtfsClusterSize)) { break; } - + if (*DataRun == 0) { - return 0; - } - + return AlreadyRead; + } + CurrentOffset += DataRunLength * NtfsClusterSize; } } - + /* * II. Go through the run list and read the data */ - - AlreadyRead = 0; - while (Length > 0) - { - ReadLength = min(DataRunLength * NtfsClusterSize, Length); - if (DataRunStartLCN == -1) - RtlZeroMemory(Buffer, ReadLength); - else if (!NtfsDiskRead(DataRunStartLCN * NtfsClusterSize + Offset - CurrentOffset, ReadLength, Buffer)) - break; - Length -= ReadLength; - Buffer += ReadLength; - AlreadyRead += ReadLength; - - /* We finished this request, but there still data in this data run. */ - if (Length == 0 && ReadLength != DataRunLength * NtfsClusterSize) - break; - - /* - * Go to next run in the list. - */ - - if (*DataRun == 0) - break; - DataRun = NtfsDecodeRun(DataRun, &DataRunOffset, &DataRunLength); - if (DataRunOffset != -1) - { - /* Normal data run. */ - DataRunStartLCN = LastLCN + DataRunOffset; - LastLCN = DataRunStartLCN; - } - else - { - /* Sparse data run. */ - DataRunStartLCN = -1; - } - CurrentOffset += DataRunLength * NtfsClusterSize; - } - + + ReadLength = min(DataRunLength * NtfsClusterSize - (Offset - CurrentOffset), Length); + if (DataRunStartLCN == -1) + RtlZeroMemory(Buffer, ReadLength); + if (NtfsDiskRead(DataRunStartLCN * NtfsClusterSize + Offset - CurrentOffset, ReadLength, Buffer)) + { + Length -= ReadLength; + Buffer += ReadLength; + AlreadyRead += ReadLength; + + if (ReadLength == DataRunLength * NtfsClusterSize - (Offset - CurrentOffset)) + { + CurrentOffset += DataRunLength * NtfsClusterSize; + DataRun = NtfsDecodeRun(DataRun, &DataRunOffset, &DataRunLength); + if (DataRunLength != -1) + { + DataRunStartLCN = LastLCN + DataRunOffset; + LastLCN = DataRunStartLCN; + } + else + DataRunStartLCN = -1; + + if (*DataRun == 0) + return AlreadyRead; + } + + while (Length > 0) + { + ReadLength = min(DataRunLength * NtfsClusterSize, Length); + if (DataRunStartLCN == -1) + RtlZeroMemory(Buffer, ReadLength); + else if (!NtfsDiskRead(DataRunStartLCN * NtfsClusterSize, ReadLength, Buffer)) + break; + + Length -= ReadLength; + Buffer += ReadLength; + AlreadyRead += ReadLength; + + /* We finished this request, but there still data in this data run. */ + if (Length == 0 && ReadLength != DataRunLength * NtfsClusterSize) + break; + + /* + * Go to next run in the list. + */ + + if (*DataRun == 0) + break; + CurrentOffset += DataRunLength * NtfsClusterSize; + DataRun = NtfsDecodeRun(DataRun, &DataRunOffset, &DataRunLength); + if (DataRunOffset != -1) + { + /* Normal data run. */ + DataRunStartLCN = LastLCN + DataRunOffset; + LastLCN = DataRunStartLCN; + } + else + { + /* Sparse data run. */ + DataRunStartLCN = -1; + } + } /* while */ + + } /* if Disk */ + Context->CacheRun = DataRun; Context->CacheRunOffset = Offset + AlreadyRead; Context->CacheRunStartLCN = DataRunStartLCN; Context->CacheRunLength = DataRunLength; Context->CacheRunLastLCN = LastLCN; Context->CacheRunCurrentOffset = CurrentOffset; - + return AlreadyRead; }

1 0

[dreimer] 28363: Fix some mistakes I made
by dreimer＠svn.reactos.org 15 Aug '07

15 Aug '07

Author: dreimer Date: Wed Aug 15 21:52:57 2007 New Revision: 28363 URL: http://svn.reactos.org/svn/reactos?rev=28363&view=rev Log: Fix some mistakes I made Modified: trunk/reactos/dll/cpl/mmsys/lang/de-DE.rc Modified: trunk/reactos/dll/cpl/mmsys/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/de-DE.r… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/lang/de-DE.rc (original) +++ trunk/reactos/dll/cpl/mmsys/lang/de-DE.rc Wed Aug 15 21:52:57 2007 @@ -13,7 +13,7 @@ LTEXT "Niedrig",-1,62,66,30,17 LTEXT "Hoch",-1,195,66,30,17 CHECKBOX "Stu&mmschalten", IDC_MUTE_CHECKBOX, 50, 78, 140, 10 - CHECKBOX "Lautstäkeregelungs-&Icon in der Taskleiste zeigen", IDC_ICON_IN_TASKBAR, 50, 92, 140, 10 + CHECKBOX "Lautstärkeregelungs-&Icon in der Taskleiste zeigen", IDC_ICON_IN_TASKBAR, 50, 92, 140, 10 PUSHBUTTON "Er&weitert", -1, 150,105,75,15 GROUPBOX "Lautsprechereintellungen", -1, 7,140,230,80 CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 4, 160, 70, 70 @@ -50,13 +50,13 @@ ICON IDI_CPLICON, IDI_CPLICON, 15,20,32,32 LTEXT "&Standardgerät:",-1,50,20,80,17 COMBOBOX IDC_DEVICE_PLAY_LIST, 50, 30, 180, 46, CBS_DROPDOWNLIST - PUSHBUTTON "&Lautstäke...", -1, 85,47,70,15 + PUSHBUTTON "&Lautstärke...", -1, 85,47,70,15 PUSHBUTTON "&Erweitert...", -1, 160,47,70,15 GROUPBOX "Soundaufnahme", -1, 7,75,230,60 ICON IDI_MICROPHONE_ICON, IDI_MICROPHONE_ICON, 15,88,32,32 LTEXT "S&tandardgerät:",-1,50,88,80,17 COMBOBOX IDC_DEVICE_REC_LIST, 50, 98, 180, 46, CBS_DROPDOWNLIST - PUSHBUTTON "L%autstärke...", -1, 85,115,70,15 + PUSHBUTTON "L&autstärke...", -1, 85,115,70,15 PUSHBUTTON "E&rweitert...", -1, 160,115,70,15 GROUPBOX "MIDI-Wiedergabe", -1, 7,145,230,60 ICON IDI_CPLICON, IDI_CPLICON, 15,158,32,32 @@ -77,13 +77,13 @@ ICON IDI_CPLICON, IDI_CPLICON, 15,50,32,32 LTEXT "&Standardgerät:",-1,50,50,80,17 COMBOBOX IDC_DEVICE_VOICE_LIST, 50, 60, 180, 46, CBS_DROPDOWNLIST - PUSHBUTTON "&Lautstäke..", -1, 85,77,70,15 + PUSHBUTTON "&Lautstärke..", -1, 85,77,70,15 PUSHBUTTON "&Erweitert...", -1, 160,77,70,15 GROUPBOX "Stimmenaufnahme", -1, 7,105,230,60 ICON IDI_MICROPHONE_ICON, IDI_MICROPHONE_ICON, 15,118,32,32 LTEXT "S&tandardgerät:",-1,50,118,80,17 COMBOBOX IDC_DEVICE_VOICE_REC_LIST, 50, 128, 180, 46, CBS_DROPDOWNLIST - PUSHBUTTON "L&autstäke..", -1, 85,145,70,15 + PUSHBUTTON "L&autstärke..", -1, 85,145,70,15 PUSHBUTTON "E&rweitert...", -1, 160,145,70,15 PUSHBUTTON "&Hardware testen...", -1, 160,175,70,15 END

1 0

[dreimer] 28362: Updated German Translations for access and mmsys CPLs
by dreimer＠svn.reactos.org 15 Aug '07

15 Aug '07

Author: dreimer Date: Wed Aug 15 20:45:24 2007 New Revision: 28362 URL: http://svn.reactos.org/svn/reactos?rev=28362&view=rev Log: Updated German Translations for access and mmsys CPLs Modified: trunk/reactos/dll/cpl/access/lang/de-DE.rc trunk/reactos/dll/cpl/mmsys/lang/de-DE.rc Modified: trunk/reactos/dll/cpl/access/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/de-DE.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/de-DE.rc (original) +++ trunk/reactos/dll/cpl/access/lang/de-DE.rc Wed Aug 15 20:45:24 2007 @@ -103,12 +103,12 @@ AUTOCHECKBOX "Tastenkombination a&ktivieren",IDC_STICKY_ACTIVATE_CHECK,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(17)+4,14 GROUPBOX "Optionen",-1,PROPSHEETPADDING(1),LABELLINE(9),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(4)+PROPSHEETPADDING(1) - AUTOCHECKBOX "&Press modifier key twice to lock",IDC_STICKY_LOCK_CHECK,PROPSHEETPADDING(4),LABELLINE(10)+2,PROPSHEETPADDING(28)+4,14 - AUTOCHECKBOX "&Turn StickyKeys off if two keys are pressed at once",IDC_STICKY_UNLOCK_CHECK,PROPSHEETPADDING(4),LABELLINE(12),PROPSHEETPADDING(28)+4,14 + AUTOCHECKBOX "&Zum Einrasten Feststelltaste zweimal drücken",IDC_STICKY_LOCK_CHECK,PROPSHEETPADDING(4),LABELLINE(10)+2,PROPSHEETPADDING(28)+4,14 + AUTOCHECKBOX "&Einrastfunktion deaktivieren wenn zwei Tasten gleichzeitig gedrückt werden",IDC_STICKY_UNLOCK_CHECK,PROPSHEETPADDING(4),LABELLINE(12),PROPSHEETPADDING(28)+4,14 - GROUPBOX "Notifications",-1,PROPSHEETPADDING(1),LABELLINE(15),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(4)+PROPSHEETPADDING(1) - AUTOCHECKBOX "&Make sounds when the modifier key is pressed",IDC_STICKY_SOUND_CHECK,PROPSHEETPADDING(4),LABELLINE(16)+2,PROPSHEETPADDING(28)+4,14 - AUTOCHECKBOX "&Show StickyKeys status on screen",IDC_STICKY_STATUS_CHECK,PROPSHEETPADDING(4),LABELLINE(18),PROPSHEETPADDING(28)+4,14 + GROUPBOX "Mitteilungen",-1,PROPSHEETPADDING(1),LABELLINE(15),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(4)+PROPSHEETPADDING(1) + AUTOCHECKBOX "&Ausgabe eines Tons wenn die Feststelltaste gedrückt wird.",IDC_STICKY_SOUND_CHECK,PROPSHEETPADDING(4),LABELLINE(16)+2,PROPSHEETPADDING(28)+4,14 + AUTOCHECKBOX "&Zeige den Status der Einrastfunktion auf dem Bildschirm",IDC_STICKY_STATUS_CHECK,PROPSHEETPADDING(4),LABELLINE(18),PROPSHEETPADDING(28)+4,14 PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Abbrechen", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 @@ -117,7 +117,7 @@ IDD_FILTERKEYSOPTIONS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Filter Keys Settings" +CAPTION "Filtertasten Einstellungen" FONT 8, "MS Shell Dlg" BEGIN LTEXT "TBD",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) @@ -129,12 +129,12 @@ IDD_TOGGLEKEYSOPTIONS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Toggle Keys Settings" +CAPTION "Toggle Keys Einstellungen" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Keyboard shortcut",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) - LTEXT "The shortcut for ToggleKeys is: \nHold down <Num Lock> for five seconds.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) - AUTOCHECKBOX "Use &shortcut",IDC_TOGGLE_ACTIVATE_CHECK,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(17)+4,14 + GROUPBOX "Schnelltaste",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) + LTEXT "Die Schnelltaste für ToggleKeys ist: \nHold down <Num Lock> for five seconds.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) + AUTOCHECKBOX "Wähle &Schnelltaste",IDC_TOGGLE_ACTIVATE_CHECK,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(17)+4,14 PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Abbrechen", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 @@ -143,15 +143,15 @@ IDD_CONTRASTOPTIONS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "High Contrast Settings" +CAPTION "Hoher Konstrast Einstellungen" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Keyboard shortcut",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) - LTEXT "The shortcut for High Contrast is: \nPress <Left Alt+Left Shift+Print Screen>.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) - AUTOCHECKBOX "&Use shortcut",IDC_CONTRAST_ACTIVATE_CHECK,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(17)+4,14 + GROUPBOX "Schnelltaste",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) + LTEXT "Die Schnelltaste für hohen Kontrast ist: \nPress <Left Alt+Left Shift+Print Screen>.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) + AUTOCHECKBOX "&Wähle Schnelltaste",IDC_CONTRAST_ACTIVATE_CHECK,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(17)+4,14 - GROUPBOX "High Contrast Color Scheme",-1,PROPSHEETPADDING(1),LABELLINE(9),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(4)+PROPSHEETPADDING(1) - LTEXT "Current Color Scheme:",-1,PROPSHEETPADDING(2),LABELLINE(10)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(1) + GROUPBOX "Hoher Kontrast Farbschema",-1,PROPSHEETPADDING(1),LABELLINE(9),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(4)+PROPSHEETPADDING(1) + LTEXT "Derzetiges Farbschema:",-1,PROPSHEETPADDING(2),LABELLINE(10)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(1) COMBOBOX IDC_CONTRAST_COMBO, PROPSHEETPADDING(2), LABELLINE(11)+2, PROPSHEETWIDTH-PROPSHEETPADDING(4), LABELLINE(6), CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP @@ -162,7 +162,7 @@ IDD_MOUSEKEYSOPTIONS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Mouse Keys Settings" +CAPTION "Maustasten Einstllungen" FONT 8, "MS Shell Dlg" BEGIN LTEXT "TBD",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) Modified: trunk/reactos/dll/cpl/mmsys/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/de-DE.r… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/lang/de-DE.rc (original) +++ trunk/reactos/dll/cpl/mmsys/lang/de-DE.rc Wed Aug 15 20:45:24 2007 @@ -2,24 +2,24 @@ IDD_VOLUME DIALOGEX 0, 0, 246, 228 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Volume" +CAPTION "Lautstärke" FONT 8, "MS Shell Dlg" BEGIN ICON IDI_CPLICON, IDI_CPLICON, 8,5,32,32 LTEXT "",-1,40,10,194,36 - GROUPBOX "Device volume", -1, 7,30,230,100 + GROUPBOX "Gerätelautstärke", -1, 7,30,230,100 ICON IDI_CPLICON, IDI_CPLICON, 17,45,32,32 CONTROL "",IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 65, 45, 140, 14 - LTEXT "Low",-1,62,66,30,17 - LTEXT "High",-1,195,66,30,17 - CHECKBOX "&Mute", IDC_MUTE_CHECKBOX, 50, 78, 140, 10 - CHECKBOX "Place volume &icon in the taskbar", IDC_ICON_IN_TASKBAR, 50, 92, 140, 10 - PUSHBUTTON "Ad&vanced...", -1, 150,105,75,15 - GROUPBOX "Speaker settings", -1, 7,140,230,80 + LTEXT "Niedrig",-1,62,66,30,17 + LTEXT "Hoch",-1,195,66,30,17 + CHECKBOX "Stu&mmschalten", IDC_MUTE_CHECKBOX, 50, 78, 140, 10 + CHECKBOX "Lautstäkeregelungs-&Icon in der Taskleiste zeigen", IDC_ICON_IN_TASKBAR, 50, 92, 140, 10 + PUSHBUTTON "Er&weitert", -1, 150,105,75,15 + GROUPBOX "Lautsprechereintellungen", -1, 7,140,230,80 CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 4, 160, 70, 70 - LTEXT "Use the settings below to change individual speaker volume and other settings.",-1,70,155,150,36 - PUSHBUTTON "&Speaker Volume...", -1, 70,195,75,15 - PUSHBUTTON "A&dvanced...", -1, 150,195,75,15 + LTEXT "Verwenden Sie die unteren Einstellungen um die Lautstäre einzelner Geräte und andere Einstellungen zu verändern.",-1,70,155,150,36 + PUSHBUTTON "&Lautstärke...", -1, 70,195,75,15 + PUSHBUTTON "E&rweitert...", -1, 150,195,75,15 END IDD_SOUNDS DIALOGEX 0, 0, 246, 228 @@ -27,18 +27,18 @@ CAPTION "Sounds" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "A sound scheme is a set of sounds applied to events to in ReactOS and programs. You can select an existing scheme or save one you have modified.",-1,8,7,230,40 - LTEXT "Sound s&cheme:",-1,8,42,150,17 + LTEXT "Ein Soundschema ist eine Kollektion von Sounds, die bestimmtem Ereignissen in Programmen in ReactOS zugordnet sind. Sie können ein existierendes Schema anwählen oder ein modifiziertes speichern.",-1,8,7,230,40 + LTEXT "Sounds&chema:",-1,8,42,150,17 COMBOBOX IDC_SOUND_SCHEME, 8, 53, 230, 46, CBS_DROPDOWNLIST - PUSHBUTTON "Sav&e As...", -1, 134,70,50,15 - PUSHBUTTON "&Delete", -1, 188,70,50,15 - LTEXT "To change sounds, click a program event in the following list and then select a sound to apply. You can save the changes as a new sound scheme.",-1,8,90,230,40 - LTEXT "&Pogram events:",-1,8,118,150,17 + PUSHBUTTON "Sp&eichern unter...", -1, 134,70,50,15 + PUSHBUTTON "&Löschen", -1, 188,70,50,15 + LTEXT "Um Sounds zu ändern, klicken Sie auf ein Programmereignis in der folgenden Liste und wählen Sie einen Sound. Sie können Änderungen als neue Soundschemata speichern.",-1,8,90,230,40 + LTEXT "&Pogrammereignisse:",-1,8,118,150,17 CONTROL "", IDC_SCHEME_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 8, 130, 230, 60, WS_EX_CLIENTEDGE LTEXT "&Sounds:",-1,8,194,80,17 COMBOBOX IDC_SOUND_LIST, 8, 205, 155, 46, CBS_DROPDOWNLIST PUSHBUTTON "", -1, 168,205,15,15 - PUSHBUTTON "&Brouse...", -1, 188,205,50,15 + PUSHBUTTON "&Durchsuchen...", -1, 188,205,50,15 END IDD_AUDIO DIALOGEX 0, 0, 246, 228 @@ -46,46 +46,46 @@ CAPTION "Audio" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Sound playback", -1, 7,7,230,60 + GROUPBOX "Soundwiedergabe", -1, 7,7,230,60 ICON IDI_CPLICON, IDI_CPLICON, 15,20,32,32 - LTEXT "&Default device:",-1,50,20,80,17 + LTEXT "&Standardgerät:",-1,50,20,80,17 COMBOBOX IDC_DEVICE_PLAY_LIST, 50, 30, 180, 46, CBS_DROPDOWNLIST - PUSHBUTTON "&Volume...", -1, 85,47,70,15 - PUSHBUTTON "Adva&nced...", -1, 160,47,70,15 - GROUPBOX "Sound recording", -1, 7,75,230,60 + PUSHBUTTON "&Lautstäke...", -1, 85,47,70,15 + PUSHBUTTON "&Erweitert...", -1, 160,47,70,15 + GROUPBOX "Soundaufnahme", -1, 7,75,230,60 ICON IDI_MICROPHONE_ICON, IDI_MICROPHONE_ICON, 15,88,32,32 - LTEXT "D&efault device:",-1,50,88,80,17 + LTEXT "S&tandardgerät:",-1,50,88,80,17 COMBOBOX IDC_DEVICE_REC_LIST, 50, 98, 180, 46, CBS_DROPDOWNLIST - PUSHBUTTON "V&olume...", -1, 85,115,70,15 - PUSHBUTTON "Advan&ced...", -1, 160,115,70,15 - GROUPBOX "MIDI music playback", -1, 7,145,230,60 + PUSHBUTTON "L%autstärke...", -1, 85,115,70,15 + PUSHBUTTON "E&rweitert...", -1, 160,115,70,15 + GROUPBOX "MIDI-Wiedergabe", -1, 7,145,230,60 ICON IDI_CPLICON, IDI_CPLICON, 15,158,32,32 - LTEXT "De&fault device:",-1,50,158,80,17 + LTEXT "St&andardgerät:",-1,50,158,80,17 COMBOBOX IDC_DEVICE_MIDI_LIST, 50, 168, 180, 46, CBS_DROPDOWNLIST - PUSHBUTTON "Volu&me...", -1, 85,185,70,15 - PUSHBUTTON "A&bout...", -1, 160,185,70,15 - CHECKBOX "&Use only default devices", IDC_DEFAULT_DEV_CHECKBOX, 7, 212, 140, 10 + PUSHBUTTON "La&utstärke...", -1, 85,185,70,15 + PUSHBUTTON "Ü&ber...", -1, 160,185,70,15 + CHECKBOX "&Nur Standardgeräte verwenden", IDC_DEFAULT_DEV_CHECKBOX, 7, 212, 140, 10 END IDD_VOICE DIALOGEX 0, 0, 246, 228 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Voice" +CAPTION "Stimme" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "These settings control volume and advanced options for the voice playback or recording device you selected.",-1,8,7,230,40 - GROUPBOX "Voice playback", -1, 7,37,230,60 + LTEXT "Diese Einstellungen legen die Lautstärke und die erweiterten Einstellungen für Stimmenwiedergabe und -aufnahme des gewählten Gerätes fest.",-1,8,7,230,40 + GROUPBOX "Stimmenwiedergabe", -1, 7,37,230,60 ICON IDI_CPLICON, IDI_CPLICON, 15,50,32,32 - LTEXT "&Default device:",-1,50,50,80,17 + LTEXT "&Standardgerät:",-1,50,50,80,17 COMBOBOX IDC_DEVICE_VOICE_LIST, 50, 60, 180, 46, CBS_DROPDOWNLIST - PUSHBUTTON "&Volume...", -1, 85,77,70,15 - PUSHBUTTON "Adva&nced...", -1, 160,77,70,15 - GROUPBOX "Voice recording", -1, 7,105,230,60 + PUSHBUTTON "&Lautstäke..", -1, 85,77,70,15 + PUSHBUTTON "&Erweitert...", -1, 160,77,70,15 + GROUPBOX "Stimmenaufnahme", -1, 7,105,230,60 ICON IDI_MICROPHONE_ICON, IDI_MICROPHONE_ICON, 15,118,32,32 - LTEXT "D&efault device:",-1,50,118,80,17 + LTEXT "S&tandardgerät:",-1,50,118,80,17 COMBOBOX IDC_DEVICE_VOICE_REC_LIST, 50, 128, 180, 46, CBS_DROPDOWNLIST - PUSHBUTTON "V&olume...", -1, 85,145,70,15 - PUSHBUTTON "Advan&ced...", -1, 160,145,70,15 - PUSHBUTTON "&Test hardware...", -1, 160,175,70,15 + PUSHBUTTON "L&autstäke..", -1, 85,145,70,15 + PUSHBUTTON "E&rweitert...", -1, 160,145,70,15 + PUSHBUTTON "&Hardware testen...", -1, 160,175,70,15 END IDD_HARDWARE DIALOGEX 0, 0, 246, 228

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs