Ros-diffs April 2009

ros-diffs@reactos.org

25 participants
476 discussions

[gschneider] 40569: Order rectangle points to avoid CreateCompatibleBitmap failure because of negative size values
by gschneider＠svn.reactos.org 18 Apr '09

18 Apr '09

Author: gschneider Date: Sat Apr 18 15:07:58 2009 New Revision: 40569 URL: http://svn.reactos.org/svn/reactos?rev=40569&view=rev Log: Order rectangle points to avoid CreateCompatibleBitmap failure because of negative size values Modified: trunk/reactos/subsystems/win32/win32k/ntuser/painting.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/painting.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/painting.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/painting.c [iso-8859-1] Sat Apr 18 15:07:58 2009 @@ -1630,6 +1630,7 @@ if (pWnd) Wnd = pWnd->Wnd; + RECTL_vMakeWellOrdered(lpRc); hMemBmp = NtGdiCreateCompatibleBitmap(hDc, lpRc->right - lpRc->left, lpRc->bottom - lpRc->top);

1 0

[dgoette] 379: * remove folder (nocomp) I missed in one of my last commits * remove logging of clicks to external urls * remove support for translations for now (they where very incomplete implemented)
by dgoette＠svn.reactos.org 18 Apr '09

18 Apr '09

Author: dgoette Date: Sat Apr 18 10:49:24 2009 New Revision: 379 URL: http://svn.reactos.org/svn/reactos?rev=379&view=rev Log: * remove folder (nocomp) I missed in one of my last commits * remove logging of clicks to external urls * remove support for translations for now (they where very incomplete implemented) Removed: branches/danny-web/www/www.reactos.org/compat/lang/ branches/danny-web/www/www.reactos.org/compat/nocomp/ branches/danny-web/www/www.reactos.org/compat/url.php Modified: branches/danny-web/www/www.reactos.org/compat/lang.php branches/danny-web/www/www.reactos.org/compat/lib/HTML.class.php branches/danny-web/www/www.reactos.org/compat/lib/view/About.class.php branches/danny-web/www/www.reactos.org/compat/lib/view/HTML_Search.class.php branches/danny-web/www/www.reactos.org/compat/lib/view/Help.class.php branches/danny-web/www/www.reactos.org/compat/lib/view/Rank.class.php branches/danny-web/www/www.reactos.org/compat/lib/view/Submit_Item.class.php branches/danny-web/www/www.reactos.org/compat/rsdb_config.php Modified: branches/danny-web/www/www.reactos.org/compat/lang.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/c… ============================================================================== --- branches/danny-web/www/www.reactos.org/compat/lang.php [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/compat/lang.php [iso-8859-1] Sat Apr 18 10:49:24 2009 @@ -92,8 +92,6 @@ $rpm_lang="en"; - require("lang/en.php"); // preload the english language text - require("lang/".$rpm_lang.".php"); // load the and overwrite the language text ini_set ('session.name', 'roscms'); Modified: branches/danny-web/www/www.reactos.org/compat/lib/HTML.class.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/c… ============================================================================== --- branches/danny-web/www/www.reactos.org/compat/lib/HTML.class.php [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/compat/lib/HTML.class.php [iso-8859-1] Sat Apr 18 10:49:24 2009 @@ -83,14 +83,13 @@ */ protected function header( ) { - global $RSDB_langres; global $RSDB_intern_path_server; global $RSDB_intern_path; global $RSDB_intern_user_id; echo ' <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> - <html lang="'.$RSDB_langres['lang_code'].'"> + <html lang="EN"> <head> <title>ReactOS '.$this->title.'</title> <base href="'.$RSDB_intern_path_server.$RSDB_intern_path.'" /> @@ -100,7 +99,7 @@ <meta name="Keywords" content="ReactOS, Compatibility, application, driver, RSDB, support, database, DB, test, report, rating, Ros32, Ros64, Win32, Win64, W32, W64, Wine, vendor, release, version" /> <meta name="Copyright" content="ReactOS Foundation" /> <meta name="Generator" content="CompatDB" /> - <meta name="Content-language" content="'.$RSDB_langres['lang_code'].'" /> + <meta name="Content-language" content="EN" /> <meta name="Robots" content="index,follow" /> <link rel="SHORTCUT ICON" href="../favicon.ico" />'; @@ -124,11 +123,11 @@ <body> <div id="top"> <div id="topMenu"> - <a href="'.$RSDB_intern_path_server.'?page=index">'.$RSDB_langres['Home'].'</a> | - <a href="'.$RSDB_intern_path_server.'?page=about">'.$RSDB_langres['Info'].'</a> | - <a href="'.$RSDB_intern_path_server.'?page=community">'.$RSDB_langres['Community'].'</a> | - <a href="'.$RSDB_intern_path_server.'?page=dev">'.$RSDB_langres['Dev'].'</a> | - <a href="'.$RSDB_intern_path_server.'roscms/?page=user">'.$RSDB_langres['myReactOS'].'</a> + <a href="'.$RSDB_intern_path_server.'?page=index">Home</a> | + <a href="'.$RSDB_intern_path_server.'?page=about">Info</a> | + <a href="'.$RSDB_intern_path_server.'?page=community">Community</a> | + <a href="'.$RSDB_intern_path_server.'?page=dev">Development</a> | + <a href="'.$RSDB_intern_path_server.'roscms/?page=user">myReactOS</a> </div> </div>'; } // end of member function header @@ -151,13 +150,13 @@ <table style="border: none; width:100%;" cellpadding="0" cellspacing="0"> <tr style="vertical-align:top;"> <td style="width:147px" id="leftNav"> - <div class="navTitle">'.$RSDB_langres['Navigation'].'</div> - <ol> - <li><a href="'.$RSDB_intern_path_server.'?page=index">'.$RSDB_langres['Home'].'</a></li> - <li><a href="'.$RSDB_intern_path_server.'?page=about">'.$RSDB_langres['Info'].'</a></li> - <li><a href="'.$RSDB_intern_path_server.'?page=community">'.$RSDB_langres['Community'].'</a></li> - <li><a href="'.$RSDB_intern_path_server.'?page=dev">'.$RSDB_langres['Dev'].'</a></li> - <li><a href="'.$RSDB_intern_path_server.'roscms/?page=user">'.$RSDB_langres['myReactOS'].'</a></li> + <div class="navTitle">Navigation</div> + <ol> + <li><a href="'.$RSDB_intern_path_server.'?page=index">Home</a></li> + <li><a href="'.$RSDB_intern_path_server.'?page=about">Info</a></li> + <li><a href="'.$RSDB_intern_path_server.'?page=community">Community</a></li> + <li><a href="'.$RSDB_intern_path_server.'?page=dev">Development</a></li> + <li><a href="'.$RSDB_intern_path_server.'roscms/?page=user">myReactOS</a></li> </ol> <br /> Modified: branches/danny-web/www/www.reactos.org/compat/lib/view/About.class.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/c… ============================================================================== --- branches/danny-web/www/www.reactos.org/compat/lib/view/About.class.php [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/compat/lib/view/About.class.php [iso-8859-1] Sat Apr 18 10:49:24 2009 @@ -26,17 +26,16 @@ protected function body( ) { - global $RSDB_langres; global $RSDB_intern_index_php; echo ' - <h1><a href="'.$RSDB_intern_index_php.'?page=about">ReactOS Compatability Database</a> > '.$RSDB_langres['TEXT_about_rsdb'].'</h1> - <h2>'.$RSDB_langres['TEXT_about_rsdb'].'</h2> - <p>'.$RSDB_langres['CONTENT_about_rsdb'].'</p> - <p>'.$RSDB_langres['CONTENT_about_webteam'].'</p> + <h1><a href="'.$RSDB_intern_index_php.'?page=about">ReactOS Compatability Database</a> > About the ReactOS Support Database</h1> + <h2>About the ReactOS Support Database</h2> + <p>The ReactOS Support Database (application and driver compatibility, application packages, developer network and media files) is a free service of the ReactOS Foundation.</p> + <p>The ReactOS Support Database is maintained by the ReactOS Web-Team.</p> <p> </p> - <h3>'.$RSDB_langres['TEXT_credits'].'</h3> - <p><strong>Klemens Friedl:</strong> '.$RSDB_langres['CONTENT_about_credits_frik85'].'</p>'; + <h3>Credits</h3> + <p><strong>Klemens Friedl:</strong> The ReactOS Support Database has been written from scratch by Klemens Friedl (frik85).</p>'; } // end of member function body Modified: branches/danny-web/www/www.reactos.org/compat/lib/view/HTML_Search.class.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/c… ============================================================================== --- branches/danny-web/www/www.reactos.org/compat/lib/view/HTML_Search.class.php [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/compat/lib/view/HTML_Search.class.php [iso-8859-1] Sat Apr 18 10:49:24 2009 @@ -34,7 +34,7 @@ } ?> -<a href="<?php echo $RSDB_intern_link_db_sec; ?>home"><?php echo $RSDB_langres['TEXT_compdb_short']; ?></a> > Search +<a href="<?php echo $RSDB_intern_link_db_sec; ?>home">Compatibility</a> > Search <a href="<?php echo $RSDB_intern_index_php; ?>?page=about"><img src="media/pictures/compatibility_small.jpg" vspace="1" border="0" align="right"></a> </h1> <p>ReactOS Software and Hardware Compatibility Database</p> Modified: branches/danny-web/www/www.reactos.org/compat/lib/view/Help.class.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/c… ============================================================================== --- branches/danny-web/www/www.reactos.org/compat/lib/view/Help.class.php [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/compat/lib/view/Help.class.php [iso-8859-1] Sat Apr 18 10:49:24 2009 @@ -27,11 +27,10 @@ protected function body( ) { global $RSDB_intern_link_db_sec; - global $RSDB_langres; global $RSDB_intern_index_php; echo ' - <h1><a href="'.$RSDB_intern_link_db_sec.'home">'.$RSDB_langres['TEXT_compdb_short'].'</a> > Help & FAQ</h1> + <h1><a href="'.$RSDB_intern_link_db_sec.'home">Compatibility</a> > Help & FAQ</h1> <p><strong>Content</strong></p> <ul> Modified: branches/danny-web/www/www.reactos.org/compat/lib/view/Rank.class.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/c… ============================================================================== --- branches/danny-web/www/www.reactos.org/compat/lib/view/Rank.class.php [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/compat/lib/view/Rank.class.php [iso-8859-1] Sat Apr 18 10:49:24 2009 @@ -27,13 +27,12 @@ protected function body( ) { global $RSDB_intern_link_db_sec; - global $RSDB_langres; global $RSDB_intern_link_name_letter; global $RSDB_intern_index_php; global $RSDB_intern_link_rank_rank2; echo ' - <h1><a href="'.$RSDB_intern_link_db_sec.'home">'.$RSDB_langres['TEXT_compdb_short'].'</a> > <a href="'.$RSDB_intern_link_name_letter.'all">Browse Database</a> > By Rank</h1> + <h1><a href="'.$RSDB_intern_link_db_sec.'home">Compatibility</a> > <a href="'.$RSDB_intern_link_name_letter.'all">Browse Database</a> > By Rank</h1> <style type="text/css"> <!--'." /* tab colors */ Modified: branches/danny-web/www/www.reactos.org/compat/lib/view/Submit_Item.class.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/c… ============================================================================== --- branches/danny-web/www/www.reactos.org/compat/lib/view/Submit_Item.class.php [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/compat/lib/view/Submit_Item.class.php [iso-8859-1] Sat Apr 18 10:49:24 2009 @@ -34,7 +34,7 @@ } ?> -<a href="<?php echo $RSDB_intern_link_db_sec; ?>home"><?php echo $RSDB_langres['TEXT_compdb_short']; ?></a> > Submit Application/Driver +<a href="<?php echo $RSDB_intern_link_db_sec; ?>home">Compatibility</a> > Submit Application/Driver <a href="<?php echo $RSDB_intern_index_php; ?>?page=about"><img src="media/pictures/compatibility_small.jpg" vspace="1" border="0" align="right"></a> </h1> <p>ReactOS Software and Hardware Compatibility Database.</p> Modified: branches/danny-web/www/www.reactos.org/compat/rsdb_config.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/c… ============================================================================== --- branches/danny-web/www/www.reactos.org/compat/rsdb_config.php [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/compat/rsdb_config.php [iso-8859-1] Sat Apr 18 10:49:24 2009 @@ -35,7 +35,6 @@ global $RSDB_SET_letter; global $RSDB_SET_group; - global $RSDB_langres; global $RSDB_vote; global $RSDB_vote2; Removed: branches/danny-web/www/www.reactos.org/compat/url.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/c… ============================================================================== --- branches/danny-web/www/www.reactos.org/compat/url.php [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/compat/url.php (removed) @@ -1,81 +1,0 @@ -<?php - /* - RSDB - ReactOS Support Database - Copyright (C) 2005-2006 Klemens Friedl <frik85(a)reactos.org> - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ - - -/* - * ReactOS Support Database System - RSDB - * - * (c) by Klemens Friedl <frik85> - * - * URL LOG SCRIPT - */ - - require_once("connect.db.php"); - - - $RSDB_url_t=""; - //$RSDB_url_o=""; - $RSDB_url_u=""; - $RSDB_url_a=""; - $RSDB_url_i=""; - $RSDB_url_s=""; - $RSDB_referrer=""; - $RSDB_usragent=""; - - if (array_key_exists("t", $_GET)) $RSDB_url_t=htmlspecialchars($_GET["t"]); - //if (array_key_exists("o", $_GET)) $RSDB_url_o=htmlspecialchars($_GET["o"]); - if (array_key_exists("u", $_GET)) $RSDB_url_u=htmlspecialchars($_GET["u"]); - if (array_key_exists("a", $_GET)) $RSDB_url_a=htmlspecialchars($_GET["a"]); - if (array_key_exists("i", $_GET)) $RSDB_url_i=htmlspecialchars($_GET["i"]); - if (array_key_exists("s", $_GET)) $RSDB_url_s=htmlspecialchars($_GET["s"]); - - $RSDB_url_i = base64_decode($RSDB_url_i); - - - if ($RSDB_url_u != $RSDB_referrer) { - $RSDB_url_s = "BAD".$RSDB_url_s; - } - if ($RSDB_referrer == "" && $RSDB_url_u != "") { - $RSDB_referrer = $RSDB_url_u; - } - - if (array_key_exists('HTTP_REFERER', $_SERVER)) $RSDB_referrer=htmlspecialchars($_SERVER['HTTP_REFERER']); - if (array_key_exists('HTTP_USER_AGENT', $_SERVER)) $RSDB_usragent=htmlspecialchars($_SERVER['HTTP_USER_AGENT']); - - if(isset($_COOKIE['roscms_usrset_lang'])) { - $roscms_usrsetting_lang=$_COOKIE["roscms_usrset_lang"]; - } - else { - $roscms_usrsetting_lang=""; - } - - - $stmt=CDBConnection::getInstance()-prepare("INSERT INTO rsdb_urls (url_id, url_t, url_u, url_a, url_i, url_s, url_lang, url_browser) VALUES ('', :t, :u, :a, :i, :s, :lang, :user_agent )"); - $stmt->bindParam('t',$RSDB_url_t,PDO::PARAM_STR); - $stmt->bindParam('u',$RSDB_referrer,PDO::PARAM_STR); - $stmt->bindParam('a',$RSDB_url_a,PDO::PARAM_STR); - $stmt->bindParam('i',$RSDB_url_i,PDO::PARAM_STR); - $stmt->bindParam('s',$RSDB_url_s,PDO::PARAM_STR); - $stmt->bindParam('lang',$roscms_usrsetting_lang,PDO::PARAM_STR); - $stmt->bindParam('user_agent',$RSDB_usragent,PDO::PARAM_STR); - $stmt->execute(); - - -?>

1 0

[sedwards] 40568: started working on a ReactOS bootcamp management application. Just a mockup for now
by sedwards＠svn.reactos.org 18 Apr '09

18 Apr '09

Author: sedwards Date: Sat Apr 18 06:03:33 2009 New Revision: 40568 URL: http://svn.reactos.org/svn/reactos?rev=40568&view=rev Log: started working on a ReactOS bootcamp management application. Just a mockup for now Added: trunk/rosapps/nukecamp/ trunk/rosapps/nukecamp/NSView.h (with props) trunk/rosapps/nukecamp/NSView.m (with props) trunk/rosapps/nukecamp/NukeCamp.xib (with props) [This mail would be too long, it was shortened to contain the URLs only.] Added: trunk/rosapps/nukecamp/NSView.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/nukecamp/NSView.h?rev=4056… Added: trunk/rosapps/nukecamp/NSView.m URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/nukecamp/NSView.m?rev=4056… Added: trunk/rosapps/nukecamp/NukeCamp.xib URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/nukecamp/NukeCamp.xib?rev=…

1 0

[fireball] 40567: Branch 0.3.9 release
by fireball＠svn.reactos.org 17 Apr '09

17 Apr '09

Author: fireball Date: Sat Apr 18 02:08:10 2009 New Revision: 40567 URL: http://svn.reactos.org/svn/reactos?rev=40567&view=rev Log: Branch 0.3.9 release Added: branches/ros-branch-0_3_9/ - copied from r40566, trunk/

1 0

[dgorbachev] 40566: Update ReactOS Calc to version 1.11. Carlo Bramini, bug #4346.
by dgorbachev＠svn.reactos.org 17 Apr '09

17 Apr '09

Author: dgorbachev Date: Sat Apr 18 01:35:07 2009 New Revision: 40566 URL: http://svn.reactos.org/svn/reactos?rev=40566&view=rev Log: Update ReactOS Calc to version 1.11. Carlo Bramini, bug #4346. Modified: trunk/reactos/base/applications/calc/calc.h trunk/reactos/base/applications/calc/calc.rbuild trunk/reactos/base/applications/calc/lang/bg-BG.rc trunk/reactos/base/applications/calc/lang/cs-CZ.rc trunk/reactos/base/applications/calc/lang/de-DE.rc trunk/reactos/base/applications/calc/lang/el-GR.rc trunk/reactos/base/applications/calc/lang/en-US.rc trunk/reactos/base/applications/calc/lang/es-ES.rc trunk/reactos/base/applications/calc/lang/fr-FR.rc trunk/reactos/base/applications/calc/lang/it-IT.rc trunk/reactos/base/applications/calc/lang/ko-KR.rc trunk/reactos/base/applications/calc/lang/nl-NL.rc trunk/reactos/base/applications/calc/lang/no-NO.rc trunk/reactos/base/applications/calc/lang/pl-PL.rc trunk/reactos/base/applications/calc/lang/ru-RU.rc trunk/reactos/base/applications/calc/lang/sk-SK.rc trunk/reactos/base/applications/calc/lang/th-TH.rc trunk/reactos/base/applications/calc/lang/uk-UA.rc trunk/reactos/base/applications/calc/resource.rc trunk/reactos/base/applications/calc/rpn.c trunk/reactos/base/applications/calc/rpn_mpfr.c trunk/reactos/base/applications/calc/whatsnew.txt trunk/reactos/base/applications/calc/winmain.c trunk/reactos/base/applications/calc/wmmsg.h Modified: trunk/reactos/base/applications/calc/calc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/cal… ============================================================================== --- trunk/reactos/base/applications/calc/calc.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/calc.h [iso-8859-1] Sat Apr 18 01:35:07 2009 @@ -42,7 +42,7 @@ #define IDC_STATIC ((DWORD)-1) #endif -#define CALC_VERSION TEXT("1.10") +#define CALC_VERSION TEXT("1.11") #define MAX_CALC_SIZE 256 @@ -51,30 +51,6 @@ #define SIZEOF(_ar) (sizeof(_ar)/sizeof(_ar[1])) // RPN.C -/* -typedef struct _postfix_item_t { - unsigned int type; - union { -#ifdef ENABLE_MULTI_PRECISION - mpfr_t mf; -#else - double f; - INT64 i; -#endif - struct { - unsigned short int code; - unsigned short int elem; - } action; - } number; - struct _postfix_item_t *next; -} postfix_item_t; - -void flush_postfix(void); -void infix2postfix(char *in_str); -postfix_item_t *exec_postfix(void); -*/ - -// enum { RPN_OPERATOR_PARENT, @@ -93,6 +69,8 @@ RPN_OPERATOR_MOD, RPN_OPERATOR_POW, RPN_OPERATOR_SQR, + + RPN_OPERATOR_NONE }; typedef union { @@ -124,7 +102,7 @@ typedef struct { char *data; char *ptr; - int wm_msg; + UINT wm_msg; } sequence_t; typedef struct { @@ -190,6 +168,7 @@ #define MODIFIER_INV 0x01 #define MODIFIER_HYP 0x02 +#define NO_CHAIN 0x04 void apply_int_mask(calc_number_t *a); #ifdef ENABLE_MULTI_PRECISION Modified: trunk/reactos/base/applications/calc/calc.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/cal… ============================================================================== --- trunk/reactos/base/applications/calc/calc.rbuild [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/calc.rbuild [iso-8859-1] Sat Apr 18 01:35:07 2009 @@ -3,9 +3,10 @@ <module name="calc" type="win32gui" installbase="system32" installname="calc.exe" unicode="yes"> <include base="calc">.</include> <define name="DISABLE_HTMLHELP_SUPPORT">1</define> + <library>advapi32</library> + <library>kernel32</library> + <library>gdi32</library> <library>user32</library> - <library>gdi32</library> - <library>kernel32</library> <file>about.c</file> <file>convert.c</file> <file>function.c</file> Modified: trunk/reactos/base/applications/calc/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/bg-BG.rc [iso-8859-1] Sat Apr 18 01:35:07 2009 @@ -226,7 +226,7 @@ END IDD_DIALOG_CONVERSION DIALOGEX 0, 0, 320, 130 -STYLE WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Èç÷èñëèòåëÿò íà ÐåàêòÎÑ" MENU IDR_MENU_STANDARD FONT 8, "MS Shell Dlg" Modified: trunk/reactos/base/applications/calc/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/cs-CZ.rc [iso-8859-1] Sat Apr 18 01:35:07 2009 @@ -8,7 +8,7 @@ // Dialog IDD_DIALOG_SCIENTIFIC DIALOGEX 0, 0, 316, 161 -STYLE WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS kalkulaèka" MENU IDR_MENU_SCIENTIFIC_1 FONT 8, "MS Shell Dlg", 0, 0, 0x1 @@ -164,7 +164,7 @@ END IDD_DIALOG_STANDARD DIALOGEX 0, 0, 172, 127 -STYLE WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS Kalkulaèka" MENU IDR_MENU_STANDARD FONT 8, "MS Shell Dlg", 0, 0, 0x1 @@ -231,7 +231,7 @@ END IDD_DIALOG_CONVERSION DIALOGEX 0, 0, 320, 130 -STYLE WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS Kalkulaèka" MENU IDR_MENU_STANDARD FONT 8, "MS Shell Dlg" @@ -309,7 +309,7 @@ END IDD_DIALOG_ABOUT DIALOGEX DISCARDABLE 0, 0, 264, 169 -STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "O ReactOS Kalkulaèce" FONT 8, "MS Shell Dlg" BEGIN @@ -328,7 +328,7 @@ END IDD_DIALOG_STAT DIALOGEX DISCARDABLE 0, 0, 163, 85 -STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +STYLE DS_SHELLFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Statistické výpoèty" FONT 8, "MS Shell Dlg" BEGIN Modified: trunk/reactos/base/applications/calc/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/de-DE.rc [iso-8859-1] Sat Apr 18 01:35:07 2009 @@ -226,7 +226,7 @@ END IDD_DIALOG_CONVERSION DIALOGEX 0, 0, 320, 130 -STYLE WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS Rechner" MENU IDR_MENU_STANDARD FONT 8, "MS Shell Dlg" Modified: trunk/reactos/base/applications/calc/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/el-GR.rc [iso-8859-1] Sat Apr 18 01:35:07 2009 @@ -3,7 +3,7 @@ // Dialog IDD_DIALOG_SCIENTIFIC DIALOGEX 0, 0, 316, 161 -STYLE WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Áñéèìïìç÷áíÞ" MENU IDR_MENU_SCIENTIFIC_1 FONT 8, "MS Shell Dlg", 0, 0, 0x1 @@ -159,7 +159,7 @@ END IDD_DIALOG_STANDARD DIALOGEX 0, 0, 172, 127 -STYLE WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Áñéèìïìç÷áíÞ" MENU IDR_MENU_STANDARD FONT 8, "MS Shell Dlg", 0, 0, 0x1 @@ -226,7 +226,7 @@ END IDD_DIALOG_CONVERSION DIALOGEX 0, 0, 320, 130 -STYLE WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Áñéèìïìç÷áíÞ" MENU IDR_MENU_STANDARD FONT 8, "MS Shell Dlg" @@ -304,7 +304,7 @@ END IDD_DIALOG_ABOUT DIALOGEX DISCARDABLE 0, 0, 264, 169 -STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Ó÷åôéêÜ..." FONT 8, "MS Shell Dlg" BEGIN @@ -323,7 +323,7 @@ END IDD_DIALOG_STAT DIALOGEX DISCARDABLE 0, 0, 163, 85 -STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +STYLE DS_SHELLFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Statistics box" FONT 8, "MS Shell Dlg" BEGIN Modified: trunk/reactos/base/applications/calc/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/en-US.rc [iso-8859-1] Sat Apr 18 01:35:07 2009 @@ -3,7 +3,7 @@ // Dialog IDD_DIALOG_SCIENTIFIC DIALOGEX 0, 0, 316, 161 -STYLE WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS Calculator" MENU IDR_MENU_SCIENTIFIC_1 FONT 8, "MS Shell Dlg", 0, 0, 0x1 @@ -159,7 +159,7 @@ END IDD_DIALOG_STANDARD DIALOGEX 0, 0, 172, 127 -STYLE WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS Calculator" MENU IDR_MENU_STANDARD FONT 8, "MS Shell Dlg", 0, 0, 0x1 @@ -226,7 +226,7 @@ END IDD_DIALOG_CONVERSION DIALOGEX 0, 0, 320, 130 -STYLE WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS Calculator" MENU IDR_MENU_STANDARD FONT 8, "MS Shell Dlg" @@ -304,7 +304,7 @@ END IDD_DIALOG_ABOUT DIALOGEX DISCARDABLE 0, 0, 264, 169 -STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "About ReactOS Calc" FONT 8, "MS Shell Dlg" BEGIN @@ -323,7 +323,7 @@ END IDD_DIALOG_STAT DIALOGEX DISCARDABLE 0, 0, 163, 85 -STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +STYLE DS_SHELLFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Statistics box" FONT 8, "MS Shell Dlg" BEGIN @@ -444,7 +444,7 @@ IDS_CONV_CONSUMPTION "Consumption (engines)" IDS_CONV_CURRENCY "Currencies" IDS_CONV_ENERGY "Energy" - IDS_CONV_LENGTH "Lenghts" + IDS_CONV_LENGTH "Lengths" IDS_CONV_POWER "Power" IDS_CONV_PRESSURE "Pressure" IDS_CONV_TEMPERATURE "Temperature" Modified: trunk/reactos/base/applications/calc/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/es-ES.rc [iso-8859-1] Sat Apr 18 01:35:07 2009 @@ -231,7 +231,7 @@ END IDD_DIALOG_CONVERSION DIALOGEX 0, 0, 320, 130 -STYLE WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS Calculator" MENU IDR_MENU_STANDARD FONT 8, "MS Shell Dlg" Modified: trunk/reactos/base/applications/calc/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/fr-FR.rc [iso-8859-1] Sat Apr 18 01:35:07 2009 @@ -3,7 +3,7 @@ // Dialog IDD_DIALOG_SCIENTIFIC DIALOGEX 0, 0, 316, 161 -STYLE WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Calculatrice ReactOS" MENU IDR_MENU_SCIENTIFIC_1 FONT 8, "MS Shell Dlg", 0, 0, 0x1 @@ -159,7 +159,7 @@ END IDD_DIALOG_STANDARD DIALOGEX 0, 0, 172, 127 -STYLE WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Calculatrice ReactOS" MENU IDR_MENU_STANDARD FONT 8, "MS Shell Dlg", 0, 0, 0x1 @@ -226,7 +226,7 @@ END IDD_DIALOG_CONVERSION DIALOGEX 0, 0, 320, 130 -STYLE WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Calculatrice ReactOS" MENU IDR_MENU_STANDARD FONT 8, "MS Shell Dlg" @@ -304,7 +304,7 @@ END IDD_DIALOG_ABOUT DIALOGEX DISCARDABLE 0, 0, 264, 169 -STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "À propos de la Calculatrice ReactOS" FONT 8, "MS Shell Dlg" BEGIN @@ -323,7 +323,7 @@ END IDD_DIALOG_STAT DIALOGEX DISCARDABLE 0, 0, 163, 85 -STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +STYLE DS_SHELLFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Statistiques" FONT 8, "MS Shell Dlg" BEGIN Modified: trunk/reactos/base/applications/calc/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/it-IT.rc [iso-8859-1] Sat Apr 18 01:35:07 2009 @@ -3,7 +3,7 @@ // Dialog IDD_DIALOG_SCIENTIFIC DIALOGEX 0, 0, 316, 161 -STYLE WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Calcolatrice ReactOS" MENU IDR_MENU_SCIENTIFIC_1 FONT 8, "MS Shell Dlg" @@ -159,7 +159,7 @@ END IDD_DIALOG_STANDARD DIALOGEX 0, 0, 172, 127 -STYLE WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Calcolatrice ReactOS" MENU IDR_MENU_STANDARD FONT 8, "MS Shell Dlg" @@ -226,7 +226,7 @@ END IDD_DIALOG_CONVERSION DIALOGEX 0, 0, 320, 130 -STYLE WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Calcolatrice ReactOS" MENU IDR_MENU_STANDARD FONT 8, "MS Shell Dlg" @@ -304,7 +304,7 @@ END IDD_DIALOG_ABOUT DIALOGEX DISCARDABLE 0, 0, 264, 169 -STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Informazioni su ReactOS Calc" FONT 8, "MS Shell Dlg" BEGIN @@ -323,7 +323,7 @@ END IDD_DIALOG_STAT DIALOGEX DISCARDABLE 0, 0, 163, 85 -STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +STYLE DS_SHELLFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Finestra di statistica" FONT 8, "MS Shell Dlg" BEGIN Modified: trunk/reactos/base/applications/calc/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/ko-KR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/ko-KR.rc [iso-8859-1] Sat Apr 18 01:35:07 2009 @@ -7,7 +7,7 @@ // Dialog IDD_DIALOG_SCIENTIFIC DIALOGEX 0, 0, 316, 161 -STYLE WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS °è»ê±â" MENU IDR_MENU_SCIENTIFIC_1 FONT 8, "MS Shell Dlg", 0, 0, 0x1 @@ -163,7 +163,7 @@ END IDD_DIALOG_STANDARD DIALOGEX 0, 0, 172, 127 -STYLE WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS °è»ê±â" MENU IDR_MENU_STANDARD FONT 8, "MS Shell Dlg", 0, 0, 0x1 @@ -230,7 +230,7 @@ END IDD_DIALOG_CONVERSION DIALOGEX 0, 0, 320, 130 -STYLE WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS °è»ê±â Á¤º¸" MENU IDR_MENU_STANDARD FONT 8, "MS Shell Dlg" @@ -308,7 +308,7 @@ END IDD_DIALOG_ABOUT DIALOGEX DISCARDABLE 0, 0, 264, 169 -STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS °è»ê±â Á¤º¸" FONT 8, "MS Shell Dlg" BEGIN @@ -327,7 +327,7 @@ END IDD_DIALOG_STAT DIALOGEX DISCARDABLE 0, 0, 163, 85 -STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +STYLE DS_SHELLFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Statistics box" FONT 8, "MS Shell Dlg" BEGIN Modified: trunk/reactos/base/applications/calc/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/nl-NL.rc [iso-8859-1] Sat Apr 18 01:35:07 2009 @@ -226,7 +226,7 @@ END IDD_DIALOG_CONVERSION DIALOGEX 0, 0, 320, 130 -STYLE WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS Rekenmachine" MENU IDR_MENU_STANDARD FONT 8, "MS Shell Dlg" Modified: trunk/reactos/base/applications/calc/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/no-NO.rc [iso-8859-1] Sat Apr 18 01:35:07 2009 @@ -226,7 +226,7 @@ END IDD_DIALOG_CONVERSION DIALOGEX 0, 0, 320, 130 -STYLE WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS Kalkulator" MENU IDR_MENU_STANDARD FONT 8, "MS Shell Dlg" Modified: trunk/reactos/base/applications/calc/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/pl-PL.rc [iso-8859-1] Sat Apr 18 01:35:07 2009 @@ -233,7 +233,7 @@ END IDD_DIALOG_CONVERSION DIALOGEX 0, 0, 320, 130 -STYLE WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS Calculator" MENU IDR_MENU_STANDARD FONT 8, "MS Shell Dlg" Modified: trunk/reactos/base/applications/calc/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/ru-RU.rc [iso-8859-1] Sat Apr 18 01:35:07 2009 @@ -226,7 +226,7 @@ END IDD_DIALOG_CONVERSION DIALOGEX 0, 0, 320, 130 -STYLE WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Êàëüêóëÿòîð ReactOS" MENU IDR_MENU_STANDARD FONT 8, "MS Shell Dlg" Modified: trunk/reactos/base/applications/calc/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/sk-SK.rc [iso-8859-1] Sat Apr 18 01:35:07 2009 @@ -235,7 +235,7 @@ END IDD_DIALOG_CONVERSION DIALOGEX 0, 0, 320, 130 -STYLE WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Kalkulaèka systému ReactOS" MENU IDR_MENU_STANDARD FONT 8, "MS Shell Dlg" Modified: trunk/reactos/base/applications/calc/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/th-TH.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/th-TH.rc [iso-8859-1] Sat Apr 18 01:35:07 2009 @@ -8,7 +8,7 @@ // Dialog IDD_DIALOG_SCIENTIFIC DIALOGEX 0, 0, 316, 161 -STYLE WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "à¤Ã×èÍ§¤Ô´àÅ¢ ReactOS" MENU IDR_MENU_SCIENTIFIC_1 FONT 8, "MS Shell Dlg", 0, 0, 0x1 @@ -164,7 +164,7 @@ END IDD_DIALOG_STANDARD DIALOGEX 0, 0, 172, 127 -STYLE WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Ê¶Ò¹ÀÒ¾·ÑèÇä»" MENU IDR_MENU_STANDARD FONT 8, "MS Shell Dlg", 0, 0, 0x1 @@ -231,7 +231,7 @@ END IDD_DIALOG_CONVERSION DIALOGEX 0, 0, 320, 130 -STYLE WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "à¤Ã×èÍ§¤Ô´àÅ¢ ReactOS" MENU IDR_MENU_STANDARD FONT 8, "MS Shell Dlg" @@ -309,7 +309,7 @@ END IDD_DIALOG_ABOUT DIALOGEX DISCARDABLE 0, 0, 264, 169 -STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "à¡ÕèÂÇ¡Ñº ReactOS Calc" FONT 8, "MS Shell Dlg" BEGIN @@ -328,7 +328,7 @@ END IDD_DIALOG_STAT DIALOGEX DISCARDABLE 0, 0, 163, 85 -STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +STYLE DS_SHELLFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "¡ÅèÍ§Ê¶Ò¹Ð" FONT 8, "MS Shell Dlg" BEGIN Modified: trunk/reactos/base/applications/calc/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/uk-UA.rc [iso-8859-1] Sat Apr 18 01:35:07 2009 @@ -234,7 +234,7 @@ END IDD_DIALOG_CONVERSION DIALOGEX 0, 0, 320, 130 -STYLE WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Êàëüêóëÿòîð ReactOS" MENU IDR_MENU_STANDARD FONT 8, "MS Shell Dlg" Modified: trunk/reactos/base/applications/calc/resource.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/res… ============================================================================== --- trunk/reactos/base/applications/calc/resource.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/resource.rc [iso-8859-1] Sat Apr 18 01:35:07 2009 @@ -24,6 +24,10 @@ #ifndef IDC_STATIC #define IDC_STATIC -1 +#endif + +#ifndef DS_SHELLFONT +#define DS_SHELLFONT DS_SETFONT|DS_FIXEDSYS #endif // Common resources Modified: trunk/reactos/base/applications/calc/rpn.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/rpn… ============================================================================== --- trunk/reactos/base/applications/calc/rpn.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/rpn.c [iso-8859-1] Sat Apr 18 01:35:07 2009 @@ -383,6 +383,9 @@ push(&tmp); + if (func == RPN_OPERATOR_NONE) + return 0; + if (func != RPN_OPERATOR_PARENT) { calc.last_operator = func; evalStack(number); Modified: trunk/reactos/base/applications/calc/rpn_mpfr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/rpn… ============================================================================== --- trunk/reactos/base/applications/calc/rpn_mpfr.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/rpn_mpfr.c [iso-8859-1] Sat Apr 18 01:35:07 2009 @@ -364,6 +364,9 @@ push(&tmp); mpfr_clear(tmp.node.number.mf); + if (func == RPN_OPERATOR_NONE) + return 0; + if (func != RPN_OPERATOR_PARENT) { calc.last_operator = func; evalStack(number); Modified: trunk/reactos/base/applications/calc/whatsnew.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/wha… ============================================================================== --- trunk/reactos/base/applications/calc/whatsnew.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/whatsnew.txt [iso-8859-1] Sat Apr 18 01:35:07 2009 @@ -1,3 +1,13 @@ +1.11 (20080813) +======================= +* Updated translations (thanks to the friends at ReactOS' community). +* Added DS_SHELLFONT to some dialogs into various translations (sometimes it was specified, sometimes it was not). +* Added support for newer conversion units. +* Fixed mistake into english translation (lenghts -> lengths). +* Now decimal and thousand separators can be also read directly from registry (NT only, not 9x/ME). +* Fixed bug when pressing an operator twice (like '1++2=' caused error). +* Now unary operators and constant generators won't break RPN queue. + 1.10 (20080813) ======================= * Added Norvegian and Korean translations. Modified: trunk/reactos/base/applications/calc/winmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/win… ============================================================================== --- trunk/reactos/base/applications/calc/winmain.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/winmain.c [iso-8859-1] Sat Apr 18 01:35:07 2009 @@ -38,10 +38,10 @@ } key2code_t; typedef struct { - WORD idc; // IDC for posting message - CHAR key; // Virtual key identifier - BYTE mask; // enable/disable into the various modes. - INT col; // color used for drawing the text + WORD idc; // IDC for posting message + CHAR key; // Virtual key identifier + BYTE mask; // enable/disable into the various modes. + COLORREF col; // color used for drawing the text } key3code_t; #define CTRL_FLAG 0x100 @@ -209,9 +209,9 @@ { IDC_BUTTON_DAT, 0, 1, run_dat_sta, NULL, NULL, NULL, }, { IDC_BUTTON_MP, MODIFIER_INV, 1, run_mp, run_mm, NULL, NULL, }, { IDC_BUTTON_MS, MODIFIER_INV, 1, run_ms, run_mw, NULL, NULL, }, - { IDC_BUTTON_CANC, 0, 0, run_canc, NULL, NULL, NULL, }, - { IDC_BUTTON_RIGHTPAR, 0, 1, run_rpar, NULL, NULL, NULL, }, - { IDC_BUTTON_LEFTPAR, 0, 0, run_lpar, NULL, NULL, NULL, }, + { IDC_BUTTON_CANC, NO_CHAIN, 0, run_canc, NULL, NULL, NULL, }, + { IDC_BUTTON_RIGHTPAR, NO_CHAIN, 1, run_rpar, NULL, NULL, NULL, }, + { IDC_BUTTON_LEFTPAR, NO_CHAIN, 0, run_lpar, NULL, NULL, NULL, }, }; /* @@ -223,6 +223,9 @@ { TCHAR buf[32]; DWORD tmp; +#if _WIN32_WINNT >= 0x0500 + HKEY hKey; +#endif /* Try to load last selected layout */ GetProfileString(TEXT("SciCalc"), TEXT("layout"), TEXT("0"), buf, SIZEOF(buf)); @@ -239,9 +242,42 @@ /* memory is empty at startup */ calc.is_memory = FALSE; +#if _WIN32_WINNT >= 0x0500 + /* empty these values */ + calc.sDecimal[0] = TEXT('\0'); + calc.sThousand[0] = TEXT('\0'); + + /* try to open the registry */ + if (RegOpenKeyEx(HKEY_CURRENT_USER, + TEXT("Control Panel\\International"), + 0, + KEY_QUERY_VALUE, + &hKey) == ERROR_SUCCESS) { + /* get these values (ignore errors) */ + tmp = sizeof(calc.sDecimal); + RegQueryValueEx(hKey, TEXT("sDecimal"), NULL, NULL, (LPBYTE)calc.sDecimal, &tmp); + + tmp = sizeof(calc.sThousand); + RegQueryValueEx(hKey, TEXT("sThousand"), NULL, NULL, (LPBYTE)calc.sThousand, &tmp); + + /* close the key */ + RegCloseKey(hKey); + } + /* if something goes wrong, let's apply the defaults */ + if (calc.sDecimal[0] == TEXT('\0')) + _tcscpy(calc.sDecimal, TEXT(".")); + + if (calc.sThousand[0] == TEXT('\0')) + _tcscpy(calc.sThousand, TEXT(",")); + + /* get the string lengths */ + calc.sDecimal_len = _tcslen(calc.sDecimal); + calc.sThousand_len = _tcslen(calc.sThousand); +#else /* acquire regional settings */ calc.sDecimal_len = GetProfileString(TEXT("intl"), TEXT("sDecimal"), TEXT("."), calc.sDecimal, SIZEOF(calc.sDecimal)); calc.sThousand_len = GetProfileString(TEXT("intl"), TEXT("sThousand"), TEXT(","), calc.sThousand, SIZEOF(calc.sThousand)); +#endif } static void save_config(void) @@ -1427,7 +1463,8 @@ if (x == RPN_OPERATOR_EQUAL) { exec_infix2postfix(&calc.code, calc.prev_operator); rpn_copy(&calc.code, &calc.prev); - } + } else + break; } /* if no change then quit silently, */ @@ -1569,6 +1606,8 @@ convert_text2number(&calc.code); cb(&calc.code); display_rpn_result(hWnd, &calc.code); + if (!(function_table[x].range & NO_CHAIN)) + exec_infix2postfix(&calc.code, RPN_OPERATOR_NONE); if (function_table[x].range & MODIFIER_INV) SendDlgItemMessage(hWnd, IDC_CHECK_INV, BM_SETCHECK, 0, 0); if (function_table[x].range & MODIFIER_HYP) Modified: trunk/reactos/base/applications/calc/wmmsg.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/wmm… ============================================================================== --- trunk/reactos/base/applications/calc/wmmsg.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/wmmsg.h [iso-8859-1] Sat Apr 18 01:35:07 2009 @@ -1,1030 +1,0 @@ - -#define MAX_WMMSG (sizeof(wmtab)/sizeof(wmtab[0])) - -char *wmtab[] = { - "WM_NULL", - "WM_CREATE", - "WM_DESTROY", - "WM_MOVE", - "UNKNOWN (4)", - "WM_SIZE", - "WM_ACTIVATE", - "WM_SETFOCUS", - "WM_KILLFOCUS", - "UNKNOWN (9)", - "WM_ENABLE", - "WM_SETREDRAW", - "WM_SETTEXT", - "WM_GETTEXT", - "WM_GETTEXTLENGTH", - "WM_PAINT", - "WM_CLOSE", - "WM_QUERYENDSESSION", - "WM_QUIT", - "WM_QUERYOPEN", - "WM_ERASEBKGND", - "WM_SYSCOLORCHANGE", - "WM_ENDSESSION", - "UNKNOWN (23)", - "WM_SHOWWINDOW", - "UNKNOWN (25)", - "WM_SETTINGCHANGE", - "WM_DEVMODECHANGE", - "WM_ACTIVATEAPP", - "WM_FONTCHANGE", - "WM_TIMECHANGE", - "WM_CANCELMODE", - "WM_SETCURSOR", - "WM_MOUSEACTIVATE", - "WM_CHILDACTIVATE", - "WM_QUEUESYNC", - "WM_GETMINMAXINFO", - "UNKNOWN (37)", - "WM_PAINTICON", - "WM_ICONERASEBKGND", - "WM_NEXTDLGCTL", - "UNKNOWN (41)", - "WM_SPOOLERSTATUS", - "WM_DRAWITEM", - "WM_MEASUREITEM", - "WM_DELETEITEM", - "WM_VKEYTOITEM", - "WM_CHARTOITEM", - "WM_SETFONT", - "WM_GETFONT", - "WM_SETHOTKEY", - "WM_GETHOTKEY", - "UNKNOWN (52)", - "UNKNOWN (53)", - "UNKNOWN (54)", - "WM_QUERYDRAGICON", - "UNKNOWN (56)", - "WM_COMPAREITEM", - "UNKNOWN (58)", - "UNKNOWN (59)", - "UNKNOWN (60)", - "WM_GETOBJECT", - "UNKNOWN (62)", - "UNKNOWN (63)", - "UNKNOWN (64)", - "WM_COMPACTING", - "UNKNOWN (66)", - "UNKNOWN (67)", - "WM_COMMNOTIFY", - "UNKNOWN (69)", - "WM_WINDOWPOSCHANGING", - "WM_WINDOWPOSCHANGED", - "WM_POWER", - "UNKNOWN (73)", - "WM_COPYDATA", - "WM_CANCELJOURNAL", - "UNKNOWN (76)", - "UNKNOWN (77)", - "WM_NOTIFY", - "UNKNOWN (79)", - "WM_INPUTLANGCHANGEREQUEST", - "WM_INPUTLANGCHANGE", - "WM_TCARD", - "WM_HELP", - "WM_USERCHANGED", - "WM_NOTIFYFORMAT", - "UNKNOWN (86)", - "UNKNOWN (87)", - "UNKNOWN (88)", - "UNKNOWN (89)", - "UNKNOWN (90)", - "UNKNOWN (91)", - "UNKNOWN (92)", - "UNKNOWN (93)", - "UNKNOWN (94)", - "UNKNOWN (95)", - "UNKNOWN (96)", - "UNKNOWN (97)", - "UNKNOWN (98)", - "UNKNOWN (99)", - "UNKNOWN (100)", - "UNKNOWN (101)", - "UNKNOWN (102)", - "UNKNOWN (103)", - "UNKNOWN (104)", - "UNKNOWN (105)", - "UNKNOWN (106)", - "UNKNOWN (107)", - "UNKNOWN (108)", - "UNKNOWN (109)", - "UNKNOWN (110)", - "UNKNOWN (111)", - "UNKNOWN (112)", - "UNKNOWN (113)", - "UNKNOWN (114)", - "UNKNOWN (115)", - "UNKNOWN (116)", - "UNKNOWN (117)", - "UNKNOWN (118)", - "UNKNOWN (119)", - "UNKNOWN (120)", - "UNKNOWN (121)", - "UNKNOWN (122)", - "WM_CONTEXTMENU", - "WM_STYLECHANGING", - "WM_STYLECHANGED", - "WM_DISPLAYCHANGE", - "WM_GETICON", - "WM_SETICON", - "WM_NCCREATE", - "WM_NCDESTROY", - "WM_NCCALCSIZE", - "WM_NCHITTEST", - "WM_NCPAINT", - "WM_NCACTIVATE", - "WM_GETDLGCODE", - "WM_SYNCPAINT", - "UNKNOWN (137)", - "UNKNOWN (138)", - "UNKNOWN (139)", - "UNKNOWN (140)", - "UNKNOWN (141)", - "UNKNOWN (142)", - "UNKNOWN (143)", - "UNKNOWN (144)", - "UNKNOWN (145)", - "UNKNOWN (146)", - "UNKNOWN (147)", - "UNKNOWN (148)", - "UNKNOWN (149)", - "UNKNOWN (150)", - "UNKNOWN (151)", - "UNKNOWN (152)", - "UNKNOWN (153)", - "UNKNOWN (154)", - "UNKNOWN (155)", - "UNKNOWN (156)", - "UNKNOWN (157)", - "UNKNOWN (158)", - "UNKNOWN (159)", - "WM_NCMOUSEMOVE", - "WM_NCLBUTTONDOWN", - "WM_NCLBUTTONUP", - "WM_NCLBUTTONDBLCLK", - "WM_NCRBUTTONDOWN", - "WM_NCRBUTTONUP", - "WM_NCRBUTTONDBLCLK", - "WM_NCMBUTTONDOWN", - "WM_NCMBUTTONUP", - "WM_NCMBUTTONDBLCLK", - "UNKNOWN (170)", - "UNKNOWN (171)", - "UNKNOWN (172)", - "UNKNOWN (173)", - "UNKNOWN (174)", - "UNKNOWN (175)", - "UNKNOWN (176)", - "UNKNOWN (177)", - "UNKNOWN (178)", - "UNKNOWN (179)", - "UNKNOWN (180)", - "UNKNOWN (181)", - "UNKNOWN (182)", - "UNKNOWN (183)", - "UNKNOWN (184)", - "UNKNOWN (185)", - "UNKNOWN (186)", - "UNKNOWN (187)", - "UNKNOWN (188)", - "UNKNOWN (189)", - "UNKNOWN (190)", - "UNKNOWN (191)", - "UNKNOWN (192)", - "UNKNOWN (193)", - "UNKNOWN (194)", - "UNKNOWN (195)", - "UNKNOWN (196)", - "UNKNOWN (197)", - "UNKNOWN (198)", - "UNKNOWN (199)", - "UNKNOWN (200)", - "UNKNOWN (201)", - "UNKNOWN (202)", - "UNKNOWN (203)", - "UNKNOWN (204)", - "UNKNOWN (205)", - "UNKNOWN (206)", - "UNKNOWN (207)", - "UNKNOWN (208)", - "UNKNOWN (209)", - "UNKNOWN (210)", - "UNKNOWN (211)", - "UNKNOWN (212)", - "UNKNOWN (213)", - "UNKNOWN (214)", - "UNKNOWN (215)", - "UNKNOWN (216)", - "UNKNOWN (217)", - "UNKNOWN (218)", - "UNKNOWN (219)", - "UNKNOWN (220)", - "UNKNOWN (221)", - "UNKNOWN (222)", - "UNKNOWN (223)", - "UNKNOWN (224)", - "UNKNOWN (225)", - "UNKNOWN (226)", - "UNKNOWN (227)", - "UNKNOWN (228)", - "UNKNOWN (229)", - "UNKNOWN (230)", - "UNKNOWN (231)", - "UNKNOWN (232)", - "UNKNOWN (233)", - "UNKNOWN (234)", - "UNKNOWN (235)", - "UNKNOWN (236)", - "UNKNOWN (237)", - "UNKNOWN (238)", - "UNKNOWN (239)", - "UNKNOWN (240)", - "UNKNOWN (241)", - "UNKNOWN (242)", - "UNKNOWN (243)", - "UNKNOWN (244)", - "UNKNOWN (245)", - "UNKNOWN (246)", - "UNKNOWN (247)", - "UNKNOWN (248)", - "UNKNOWN (249)", - "UNKNOWN (250)", - "UNKNOWN (251)", - "UNKNOWN (252)", - "UNKNOWN (253)", - "UNKNOWN (254)", - "UNKNOWN (255)", - "WM_KEYDOWN", - "WM_KEYUP", - "WM_CHAR", - "WM_DEADCHAR", - "WM_SYSKEYDOWN", - "WM_SYSKEYUP", - "WM_SYSCHAR", - "WM_SYSDEADCHAR", - "WM_KEYLAST", - "UNKNOWN (265)", - "UNKNOWN (266)", - "UNKNOWN (267)", - "UNKNOWN (268)", - "UNKNOWN (269)", - "UNKNOWN (270)", - "UNKNOWN (271)", - "WM_INITDIALOG", - "WM_COMMAND", - "WM_SYSCOMMAND", - "WM_TIMER", - "WM_HSCROLL", - "WM_VSCROLL", - "WM_INITMENU", - "WM_INITMENUPOPUP", - "UNKNOWN (280)", - "UNKNOWN (281)", - "UNKNOWN (282)", - "UNKNOWN (283)", - "UNKNOWN (284)", - "UNKNOWN (285)", - "UNKNOWN (286)", - "WM_MENUSELECT", - "WM_MENUCHAR", - "WM_ENTERIDLE", - "WM_MENURBUTTONUP", - "WM_MENUDRAG", - "WM_MENUGETOBJECT", - "WM_UNINITMENUPOPUP", - "WM_MENUCOMMAND", - "UNKNOWN (295)", - "UNKNOWN (296)", - "UNKNOWN (297)", - "UNKNOWN (298)", - "UNKNOWN (299)", - "UNKNOWN (300)", - "UNKNOWN (301)", - "UNKNOWN (302)", - "UNKNOWN (303)", - "UNKNOWN (304)", - "UNKNOWN (305)", - "WM_CTLCOLORMSGBOX", - "WM_CTLCOLOREDIT", - "WM_CTLCOLORLISTBOX", - "WM_CTLCOLORBTN", - "WM_CTLCOLORDLG", - "WM_CTLCOLORSCROLLBAR", - "WM_CTLCOLORSTATIC", - "UNKNOWN (313)", - "UNKNOWN (314)", - "UNKNOWN (315)", - "UNKNOWN (316)", - "UNKNOWN (317)", - "UNKNOWN (318)", - "UNKNOWN (319)", - "UNKNOWN (320)", - "UNKNOWN (321)", - "UNKNOWN (322)", - "UNKNOWN (323)", - "UNKNOWN (324)", - "UNKNOWN (325)", - "UNKNOWN (326)", - "UNKNOWN (327)", - "UNKNOWN (328)", - "UNKNOWN (329)", - "UNKNOWN (330)", - "UNKNOWN (331)", - "UNKNOWN (332)", - "UNKNOWN (333)", - "UNKNOWN (334)", - "UNKNOWN (335)", - "UNKNOWN (336)", - "UNKNOWN (337)", - "UNKNOWN (338)", - "UNKNOWN (339)", - "UNKNOWN (340)", - "UNKNOWN (341)", - "UNKNOWN (342)", - "UNKNOWN (343)", - "UNKNOWN (344)", - "UNKNOWN (345)", - "UNKNOWN (346)", - "UNKNOWN (347)", - "UNKNOWN (348)", - "UNKNOWN (349)", - "UNKNOWN (350)", - "UNKNOWN (351)", - "UNKNOWN (352)", - "UNKNOWN (353)", - "UNKNOWN (354)", - "UNKNOWN (355)", - "UNKNOWN (356)", - "UNKNOWN (357)", - "UNKNOWN (358)", - "UNKNOWN (359)", - "UNKNOWN (360)", - "UNKNOWN (361)", - "UNKNOWN (362)", - "UNKNOWN (363)", - "UNKNOWN (364)", - "UNKNOWN (365)", - "UNKNOWN (366)", - "UNKNOWN (367)", - "UNKNOWN (368)", - "UNKNOWN (369)", - "UNKNOWN (370)", - "UNKNOWN (371)", - "UNKNOWN (372)", - "UNKNOWN (373)", - "UNKNOWN (374)", - "UNKNOWN (375)", - "UNKNOWN (376)", - "UNKNOWN (377)", - "UNKNOWN (378)", - "UNKNOWN (379)", - "UNKNOWN (380)", - "UNKNOWN (381)", - "UNKNOWN (382)", - "UNKNOWN (383)", - "UNKNOWN (384)", - "UNKNOWN (385)", - "UNKNOWN (386)", - "UNKNOWN (387)", - "UNKNOWN (388)", - "UNKNOWN (389)", - "UNKNOWN (390)", - "UNKNOWN (391)", - "UNKNOWN (392)", - "UNKNOWN (393)", - "UNKNOWN (394)", - "UNKNOWN (395)", - "UNKNOWN (396)", - "UNKNOWN (397)", - "UNKNOWN (398)", - "UNKNOWN (399)", - "UNKNOWN (400)", - "UNKNOWN (401)", - "UNKNOWN (402)", - "UNKNOWN (403)", - "UNKNOWN (404)", - "UNKNOWN (405)", - "UNKNOWN (406)", - "UNKNOWN (407)", - "UNKNOWN (408)", - "UNKNOWN (409)", - "UNKNOWN (410)", - "UNKNOWN (411)", - "UNKNOWN (412)", - "UNKNOWN (413)", - "UNKNOWN (414)", - "UNKNOWN (415)", - "UNKNOWN (416)", - "UNKNOWN (417)", - "UNKNOWN (418)", - "UNKNOWN (419)", - "UNKNOWN (420)", - "UNKNOWN (421)", - "UNKNOWN (422)", - "UNKNOWN (423)", - "UNKNOWN (424)", - "UNKNOWN (425)", - "UNKNOWN (426)", - "UNKNOWN (427)", - "UNKNOWN (428)", - "UNKNOWN (429)", - "UNKNOWN (430)", - "UNKNOWN (431)", - "UNKNOWN (432)", - "UNKNOWN (433)", - "UNKNOWN (434)", - "UNKNOWN (435)", - "UNKNOWN (436)", - "UNKNOWN (437)", - "UNKNOWN (438)", - "UNKNOWN (439)", - "UNKNOWN (440)", - "UNKNOWN (441)", - "UNKNOWN (442)", - "UNKNOWN (443)", - "UNKNOWN (444)", - "UNKNOWN (445)", - "UNKNOWN (446)", - "UNKNOWN (447)", - "UNKNOWN (448)", - "UNKNOWN (449)", - "UNKNOWN (450)", - "UNKNOWN (451)", - "UNKNOWN (452)", - "UNKNOWN (453)", - "UNKNOWN (454)", - "UNKNOWN (455)", - "UNKNOWN (456)", - "UNKNOWN (457)", - "UNKNOWN (458)", - "UNKNOWN (459)", - "UNKNOWN (460)", - "UNKNOWN (461)", - "UNKNOWN (462)", - "UNKNOWN (463)", - "UNKNOWN (464)", - "UNKNOWN (465)", - "UNKNOWN (466)", - "UNKNOWN (467)", - "UNKNOWN (468)", - "UNKNOWN (469)", - "UNKNOWN (470)", - "UNKNOWN (471)", - "UNKNOWN (472)", - "UNKNOWN (473)", - "UNKNOWN (474)", - "UNKNOWN (475)", - "UNKNOWN (476)", - "UNKNOWN (477)", - "UNKNOWN (478)", - "UNKNOWN (479)", - "UNKNOWN (480)", - "UNKNOWN (481)", - "UNKNOWN (482)", - "UNKNOWN (483)", - "UNKNOWN (484)", - "UNKNOWN (485)", - "UNKNOWN (486)", - "UNKNOWN (487)", - "UNKNOWN (488)", - "UNKNOWN (489)", - "UNKNOWN (490)", - "UNKNOWN (491)", - "UNKNOWN (492)", - "UNKNOWN (493)", - "UNKNOWN (494)", - "UNKNOWN (495)", - "UNKNOWN (496)", - "UNKNOWN (497)", - "UNKNOWN (498)", - "UNKNOWN (499)", - "UNKNOWN (500)", - "UNKNOWN (501)", - "UNKNOWN (502)", - "UNKNOWN (503)", - "UNKNOWN (504)", - "UNKNOWN (505)", - "UNKNOWN (506)", - "UNKNOWN (507)", - "UNKNOWN (508)", - "UNKNOWN (509)", - "UNKNOWN (510)", - "UNKNOWN (511)", - "WM_MOUSEMOVE", - "WM_LBUTTONDOWN", - "WM_LBUTTONUP", - "WM_LBUTTONDBLCLK", - "WM_RBUTTONDOWN", - "WM_RBUTTONUP", - "WM_RBUTTONDBLCLK", - "WM_MBUTTONDOWN", - "WM_MBUTTONUP", - "WM_MOUSELAST", - "WM_MOUSELAST", - "UNKNOWN (523)", - "UNKNOWN (524)", - "UNKNOWN (525)", - "UNKNOWN (526)", - "UNKNOWN (527)", - "WM_PARENTNOTIFY", - "WM_ENTERMENULOOP", - "WM_EXITMENULOOP", - "WM_NEXTMENU", - "WM_SIZING", - "WM_CAPTURECHANGED", - "WM_MOVING", - "UNKNOWN (535)", - "WM_POWERBROADCAST", - "WM_DEVICECHANGE", - "UNKNOWN (538)", - "UNKNOWN (539)", - "UNKNOWN (540)", - "UNKNOWN (541)", - "UNKNOWN (542)", - "UNKNOWN (543)", - "WM_MDICREATE", - "WM_MDIDESTROY", - "WM_MDIACTIVATE", - "WM_MDIRESTORE", - "WM_MDINEXT", - "WM_MDIMAXIMIZE", - "WM_MDITILE", - "WM_MDICASCADE", - "WM_MDIICONARRANGE", - "WM_MDIGETACTIVE", - "UNKNOWN (554)", - "UNKNOWN (555)", - "UNKNOWN (556)", - "UNKNOWN (557)", - "UNKNOWN (558)", - "UNKNOWN (559)", - "WM_MDISETMENU", - "WM_ENTERSIZEMOVE", - "WM_EXITSIZEMOVE", - "WM_DROPFILES", - "WM_MDIREFRESHMENU", - "UNKNOWN (565)", - "UNKNOWN (566)", - "UNKNOWN (567)", - "UNKNOWN (568)", - "UNKNOWN (569)", - "UNKNOWN (570)", - "UNKNOWN (571)", - "UNKNOWN (572)", - "UNKNOWN (573)", - "UNKNOWN (574)", - "UNKNOWN (575)", - "UNKNOWN (576)", - "UNKNOWN (577)", - "UNKNOWN (578)", - "UNKNOWN (579)", - "UNKNOWN (580)", - "UNKNOWN (581)", - "UNKNOWN (582)", - "UNKNOWN (583)", - "UNKNOWN (584)", - "UNKNOWN (585)", - "UNKNOWN (586)", - "UNKNOWN (587)", - "UNKNOWN (588)", - "UNKNOWN (589)", - "UNKNOWN (590)", - "UNKNOWN (591)", - "UNKNOWN (592)", - "UNKNOWN (593)", - "UNKNOWN (594)", - "UNKNOWN (595)", - "UNKNOWN (596)", - "UNKNOWN (597)", - "UNKNOWN (598)", - "UNKNOWN (599)", - "UNKNOWN (600)", - "UNKNOWN (601)", - "UNKNOWN (602)", - "UNKNOWN (603)", - "UNKNOWN (604)", - "UNKNOWN (605)", - "UNKNOWN (606)", - "UNKNOWN (607)", - "UNKNOWN (608)", - "UNKNOWN (609)", - "UNKNOWN (610)", - "UNKNOWN (611)", - "UNKNOWN (612)", - "UNKNOWN (613)", - "UNKNOWN (614)", - "UNKNOWN (615)", - "UNKNOWN (616)", - "UNKNOWN (617)", - "UNKNOWN (618)", - "UNKNOWN (619)", - "UNKNOWN (620)", - "UNKNOWN (621)", - "UNKNOWN (622)", - "UNKNOWN (623)", - "UNKNOWN (624)", - "UNKNOWN (625)", - "UNKNOWN (626)", - "UNKNOWN (627)", - "UNKNOWN (628)", - "UNKNOWN (629)", - "UNKNOWN (630)", - "UNKNOWN (631)", - "UNKNOWN (632)", - "UNKNOWN (633)", - "UNKNOWN (634)", - "UNKNOWN (635)", - "UNKNOWN (636)", - "UNKNOWN (637)", - "UNKNOWN (638)", - "UNKNOWN (639)", - "UNKNOWN (640)", - "UNKNOWN (641)", - "UNKNOWN (642)", - "UNKNOWN (643)", - "UNKNOWN (644)", - "UNKNOWN (645)", - "UNKNOWN (646)", - "UNKNOWN (647)", - "UNKNOWN (648)", - "UNKNOWN (649)", - "UNKNOWN (650)", - "UNKNOWN (651)", - "UNKNOWN (652)", - "UNKNOWN (653)", - "UNKNOWN (654)", - "UNKNOWN (655)", - "UNKNOWN (656)", - "UNKNOWN (657)", - "UNKNOWN (658)", - "UNKNOWN (659)", - "UNKNOWN (660)", - "UNKNOWN (661)", - "UNKNOWN (662)", - "UNKNOWN (663)", - "UNKNOWN (664)", - "UNKNOWN (665)", - "UNKNOWN (666)", - "UNKNOWN (667)", - "UNKNOWN (668)", - "UNKNOWN (669)", - "UNKNOWN (670)", - "UNKNOWN (671)", - "UNKNOWN (672)", - "WM_MOUSEHOVER", - "UNKNOWN (674)", - "WM_MOUSELEAVE", - "UNKNOWN (676)", - "UNKNOWN (677)", - "UNKNOWN (678)", - "UNKNOWN (679)", - "UNKNOWN (680)", - "UNKNOWN (681)", - "UNKNOWN (682)", - "UNKNOWN (683)", - "UNKNOWN (684)", - "UNKNOWN (685)", - "UNKNOWN (686)", - "UNKNOWN (687)", - "UNKNOWN (688)", - "UNKNOWN (689)", - "UNKNOWN (690)", - "UNKNOWN (691)", - "UNKNOWN (692)", - "UNKNOWN (693)", - "UNKNOWN (694)", - "UNKNOWN (695)", - "UNKNOWN (696)", - "UNKNOWN (697)", - "UNKNOWN (698)", - "UNKNOWN (699)", - "UNKNOWN (700)", - "UNKNOWN (701)", - "UNKNOWN (702)", - "UNKNOWN (703)", - "UNKNOWN (704)", - "UNKNOWN (705)", - "UNKNOWN (706)", - "UNKNOWN (707)", - "UNKNOWN (708)", - "UNKNOWN (709)", - "UNKNOWN (710)", - "UNKNOWN (711)", - "UNKNOWN (712)", - "UNKNOWN (713)", - "UNKNOWN (714)", - "UNKNOWN (715)", - "UNKNOWN (716)", - "UNKNOWN (717)", - "UNKNOWN (718)", - "UNKNOWN (719)", - "UNKNOWN (720)", - "UNKNOWN (721)", - "UNKNOWN (722)", - "UNKNOWN (723)", - "UNKNOWN (724)", - "UNKNOWN (725)", - "UNKNOWN (726)", - "UNKNOWN (727)", - "UNKNOWN (728)", - "UNKNOWN (729)", - "UNKNOWN (730)", - "UNKNOWN (731)", - "UNKNOWN (732)", - "UNKNOWN (733)", - "UNKNOWN (734)", - "UNKNOWN (735)", - "UNKNOWN (736)", - "UNKNOWN (737)", - "UNKNOWN (738)", - "UNKNOWN (739)", - "UNKNOWN (740)", - "UNKNOWN (741)", - "UNKNOWN (742)", - "UNKNOWN (743)", - "UNKNOWN (744)", - "UNKNOWN (745)", - "UNKNOWN (746)", - "UNKNOWN (747)", - "UNKNOWN (748)", - "UNKNOWN (749)", - "UNKNOWN (750)", - "UNKNOWN (751)", - "UNKNOWN (752)", - "UNKNOWN (753)", - "UNKNOWN (754)", - "UNKNOWN (755)", - "UNKNOWN (756)", - "UNKNOWN (757)", - "UNKNOWN (758)", - "UNKNOWN (759)", - "UNKNOWN (760)", - "UNKNOWN (761)", - "UNKNOWN (762)", - "UNKNOWN (763)", - "UNKNOWN (764)", - "UNKNOWN (765)", - "UNKNOWN (766)", - "UNKNOWN (767)", - "WM_CUT", - "WM_COPY", - "WM_PASTE", - "WM_CLEAR", - "WM_UNDO", - "WM_RENDERFORMAT", - "WM_RENDERALLFORMATS", - "WM_DESTROYCLIPBOARD", - "WM_DRAWCLIPBOARD", - "WM_PAINTCLIPBOARD", - "WM_VSCROLLCLIPBOARD", - "WM_SIZECLIPBOARD", - "WM_ASKCBFORMATNAME", - "WM_CHANGECBCHAIN", - "WM_HSCROLLCLIPBOARD", - "WM_QUERYNEWPALETTE", - "WM_PALETTEISCHANGING", - "WM_PALETTECHANGED", - "WM_HOTKEY", - "UNKNOWN (787)", - "UNKNOWN (788)", - "UNKNOWN (789)", - "UNKNOWN (790)", - "WM_PRINT", - "WM_PRINTCLIENT", - "UNKNOWN (793)", - "UNKNOWN (794)", - "UNKNOWN (795)", - "UNKNOWN (796)", - "UNKNOWN (797)", - "UNKNOWN (798)", - "UNKNOWN (799)", - "UNKNOWN (800)", - "UNKNOWN (801)", - "UNKNOWN (802)", - "UNKNOWN (803)", - "UNKNOWN (804)", - "UNKNOWN (805)", - "UNKNOWN (806)", - "UNKNOWN (807)", - "UNKNOWN (808)", - "UNKNOWN (809)", - "UNKNOWN (810)", - "UNKNOWN (811)", - "UNKNOWN (812)", - "UNKNOWN (813)", - "UNKNOWN (814)", - "UNKNOWN (815)", - "UNKNOWN (816)", - "UNKNOWN (817)", - "UNKNOWN (818)", - "UNKNOWN (819)", - "UNKNOWN (820)", - "UNKNOWN (821)", - "UNKNOWN (822)", - "UNKNOWN (823)", - "UNKNOWN (824)", - "UNKNOWN (825)", - "UNKNOWN (826)", - "UNKNOWN (827)", - "UNKNOWN (828)", - "UNKNOWN (829)", - "UNKNOWN (830)", - "UNKNOWN (831)", - "UNKNOWN (832)", - "UNKNOWN (833)", - "UNKNOWN (834)", - "UNKNOWN (835)", - "UNKNOWN (836)", - "UNKNOWN (837)", - "UNKNOWN (838)", - "UNKNOWN (839)", - "UNKNOWN (840)", - "UNKNOWN (841)", - "UNKNOWN (842)", - "UNKNOWN (843)", - "UNKNOWN (844)", - "UNKNOWN (845)", - "UNKNOWN (846)", - "UNKNOWN (847)", - "UNKNOWN (848)", - "UNKNOWN (849)", - "UNKNOWN (850)", - "UNKNOWN (851)", - "UNKNOWN (852)", - "UNKNOWN (853)", - "UNKNOWN (854)", - "UNKNOWN (855)", - "WM_HANDHELDFIRST", - "UNKNOWN (857)", - "UNKNOWN (858)", - "UNKNOWN (859)", - "UNKNOWN (860)", - "UNKNOWN (861)", - "UNKNOWN (862)", - "WM_HANDHELDLAST", - "WM_AFXFIRST", - "UNKNOWN (865)", - "UNKNOWN (866)", - "UNKNOWN (867)", - "UNKNOWN (868)", - "UNKNOWN (869)", - "UNKNOWN (870)", - "UNKNOWN (871)", - "UNKNOWN (872)", - "UNKNOWN (873)", - "UNKNOWN (874)", - "UNKNOWN (875)", - "UNKNOWN (876)", - "UNKNOWN (877)", - "UNKNOWN (878)", - "UNKNOWN (879)", - "UNKNOWN (880)", - "UNKNOWN (881)", - "UNKNOWN (882)", - "UNKNOWN (883)", - "UNKNOWN (884)", - "UNKNOWN (885)", - "UNKNOWN (886)", - "UNKNOWN (887)", - "UNKNOWN (888)", - "UNKNOWN (889)", - "UNKNOWN (890)", - "UNKNOWN (891)", - "UNKNOWN (892)", - "UNKNOWN (893)", - "UNKNOWN (894)", - "WM_AFXLAST", - "WM_PENWINFIRST", - "UNKNOWN (897)", - "UNKNOWN (898)", - "UNKNOWN (899)", - "UNKNOWN (900)", - "UNKNOWN (901)", - "UNKNOWN (902)", - "UNKNOWN (903)", - "UNKNOWN (904)", - "UNKNOWN (905)", - "UNKNOWN (906)", - "UNKNOWN (907)", - "UNKNOWN (908)", - "UNKNOWN (909)", - "UNKNOWN (910)", - "WM_PENWINLAST", - "UNKNOWN (912)", - "UNKNOWN (913)", - "UNKNOWN (914)", - "UNKNOWN (915)", - "UNKNOWN (916)", - "UNKNOWN (917)", - "UNKNOWN (918)", - "UNKNOWN (919)", - "UNKNOWN (920)", - "UNKNOWN (921)", - "UNKNOWN (922)", - "UNKNOWN (923)", - "UNKNOWN (924)", - "UNKNOWN (925)", - "UNKNOWN (926)", - "UNKNOWN (927)", - "UNKNOWN (928)", - "UNKNOWN (929)", - "UNKNOWN (930)", - "UNKNOWN (931)", - "UNKNOWN (932)", - "UNKNOWN (933)", - "UNKNOWN (934)", - "UNKNOWN (935)", - "UNKNOWN (936)", - "UNKNOWN (937)", - "UNKNOWN (938)", - "UNKNOWN (939)", - "UNKNOWN (940)", - "UNKNOWN (941)", - "UNKNOWN (942)", - "UNKNOWN (943)", - "UNKNOWN (944)", - "UNKNOWN (945)", - "UNKNOWN (946)", - "UNKNOWN (947)", - "UNKNOWN (948)", - "UNKNOWN (949)", - "UNKNOWN (950)", - "UNKNOWN (951)", - "UNKNOWN (952)", - "UNKNOWN (953)", - "UNKNOWN (954)", - "UNKNOWN (955)", - "UNKNOWN (956)", - "UNKNOWN (957)", - "UNKNOWN (958)", - "UNKNOWN (959)", - "UNKNOWN (960)", - "UNKNOWN (961)", - "UNKNOWN (962)", - "UNKNOWN (963)", - "UNKNOWN (964)", - "UNKNOWN (965)", - "UNKNOWN (966)", - "UNKNOWN (967)", - "UNKNOWN (968)", - "UNKNOWN (969)", - "UNKNOWN (970)", - "UNKNOWN (971)", - "UNKNOWN (972)", - "UNKNOWN (973)", - "UNKNOWN (974)", - "UNKNOWN (975)", - "UNKNOWN (976)", - "UNKNOWN (977)", - "UNKNOWN (978)", - "UNKNOWN (979)", - "UNKNOWN (980)", - "UNKNOWN (981)", - "UNKNOWN (982)", - "UNKNOWN (983)", - "UNKNOWN (984)", - "UNKNOWN (985)", - "UNKNOWN (986)", - "UNKNOWN (987)", - "UNKNOWN (988)", - "UNKNOWN (989)", - "UNKNOWN (990)", - "UNKNOWN (991)", - "UNKNOWN (992)", - "UNKNOWN (993)", - "UNKNOWN (994)", - "UNKNOWN (995)", - "UNKNOWN (996)", - "UNKNOWN (997)", - "UNKNOWN (998)", - "UNKNOWN (999)", - "UNKNOWN (1000)", - "UNKNOWN (1001)", - "UNKNOWN (1002)", - "UNKNOWN (1003)", - "UNKNOWN (1004)", - "UNKNOWN (1005)", - "UNKNOWN (1006)", - "UNKNOWN (1007)", - "UNKNOWN (1008)", - "UNKNOWN (1009)", - "UNKNOWN (1010)", - "UNKNOWN (1011)", - "UNKNOWN (1012)", - "UNKNOWN (1013)", - "UNKNOWN (1014)", - "UNKNOWN (1015)", - "UNKNOWN (1016)", - "UNKNOWN (1017)", - "UNKNOWN (1018)", - "UNKNOWN (1019)", - "UNKNOWN (1020)", - "UNKNOWN (1021)", - "UNKNOWN (1022)", - "UNKNOWN (1023)", - "WM_USER" -};

1 0

[dgorbachev] 40565: Begin Japanese translation of USetup
by dgorbachev＠svn.reactos.org 17 Apr '09

17 Apr '09

Author: dgorbachev Date: Sat Apr 18 01:01:56 2009 New Revision: 40565 URL: http://svn.reactos.org/svn/reactos?rev=40565&view=rev Log: Begin Japanese translation of USetup Added: trunk/reactos/media/vgafonts/932-8x8.bin (with props) Modified: trunk/reactos/base/setup/usetup/lang/ja-JP.h trunk/reactos/base/setup/usetup/muifonts.h trunk/reactos/base/setup/usetup/muilanguages.h trunk/reactos/media/vgafonts/vgafonts.rbuild Modified: trunk/reactos/base/setup/usetup/lang/ja-JP.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/ja-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/ja-JP.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/ja-JP.h [iso-8859-1] Sat Apr 18 01:01:56 2009 @@ -8,4 +8,1693 @@ { NULL, NULL } }; +static MUI_ENTRY jaJPLanguagePageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "Language Selection", + TEXT_STYLE_NORMAL + }, + { + 8, + 10, + "\x07 Please choose the language used for the installation process.", + TEXT_STYLE_NORMAL + }, + { + 8, + 11, + " Then press ENTER.", + TEXT_STYLE_NORMAL + }, + { + 8, + 13, + "\x07 This Language will be the default language for the final system.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ENTER = Continue F3 = Quit", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY jaJPWelcomePageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " ¾¯Ä±¯Ìß ", + // TEXT_STYLE_UNDERLINE + TEXT_STYLE_NORMAL + }, + { + 6, + 8, + "ReactOS¾¯Ä±¯ÌßÍÖ³º¿", + TEXT_STYLE_HIGHLIGHT + }, + { + 6, + 11, + "This part of the setup copies the ReactOS Operating System to your", + TEXT_STYLE_NORMAL + }, + { + 6, + 12, + "computer and prepares the second part of the setup.", + TEXT_STYLE_NORMAL + }, + { + 8, + 15, + "\x07 Press ENTER to install ReactOS.", + TEXT_STYLE_NORMAL + }, + { + 8, + 17, + "\x07 Press R to repair or update ReactOS.", + TEXT_STYLE_NORMAL + }, + { + 8, + 19, + "\x07 Press L to view the ReactOS Licensing Terms and Conditions", + TEXT_STYLE_NORMAL + }, + { + 8, + 21, + "\x07 Press F3 to quit without installing ReactOS.", + TEXT_STYLE_NORMAL + }, + { + 6, + 23, + "For more information on ReactOS, please visit:", + TEXT_STYLE_NORMAL + }, + { + 6, + 24, + "http://www.reactos.org", + TEXT_STYLE_HIGHLIGHT + }, + { + 0, + 0, + "ENTER = Continue R = Repair L = Licence F3 = Quit", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY jaJPIntroPageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "ReactOS Setup is in an early development phase. It does not yet", + TEXT_STYLE_NORMAL + }, + { + 6, + 9, + "support all the functions of a fully usable setup application.", + TEXT_STYLE_NORMAL + }, + { + 6, + 12, + "The following limitations apply:", + TEXT_STYLE_NORMAL + }, + { + 8, + 13, + "- Setup can not handle more than one primary partition per disk.", + TEXT_STYLE_NORMAL + }, + { + 8, + 14, + "- Setup can not delete a primary partition from a disk", + TEXT_STYLE_NORMAL + }, + { + 8, + 15, + " as long as extended partitions exist on this disk.", + TEXT_STYLE_NORMAL + }, + { + 8, + 16, + "- Setup can not delete the first extended partition from a disk", + TEXT_STYLE_NORMAL + }, + { + 8, + 17, + " as long as other extended partitions exist on this disk.", + TEXT_STYLE_NORMAL + }, + { + 8, + 18, + "- Setup supports FAT file systems only.", + TEXT_STYLE_NORMAL + }, + { + 8, + 19, + "- File system checks are not implemented yet.", + TEXT_STYLE_NORMAL + }, + { + 8, + 23, + "\x07 Press ENTER to install ReactOS.", + TEXT_STYLE_NORMAL + }, + { + 8, + 25, + "\x07 Press F3 to quit without installing ReactOS.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ENTER = Continue F3 = Quit", + TEXT_TYPE_STATUS| TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY jaJPLicensePageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 6, + "Licensing:", + TEXT_STYLE_HIGHLIGHT + }, + { + 8, + 8, + "The ReactOS System is licensed under the terms of the", + TEXT_STYLE_NORMAL + }, + { + 8, + 9, + "GNU GPL with parts containing code from other compatible", + TEXT_STYLE_NORMAL + }, + { + 8, + 10, + "licenses such as the X11 or BSD and GNU LGPL licenses.", + TEXT_STYLE_NORMAL + }, + { + 8, + 11, + "All software that is part of the ReactOS system is", + TEXT_STYLE_NORMAL + }, + { + 8, + 12, + "therefore released under the GNU GPL as well as maintaining", + TEXT_STYLE_NORMAL + }, + { + 8, + 13, + "the original license.", + TEXT_STYLE_NORMAL + }, + { + 8, + 15, + "This software comes with NO WARRANTY or restrictions on usage", + TEXT_STYLE_NORMAL + }, + { + 8, + 16, + "save applicable local and international law. The licensing of", + TEXT_STYLE_NORMAL + }, + { + 8, + 17, + "ReactOS only covers distribution to third parties.", + TEXT_STYLE_NORMAL + }, + { + 8, + 18, + "If for some reason you did not receive a copy of the", + TEXT_STYLE_NORMAL + }, + { + 8, + 19, + "GNU General Public License with ReactOS please visit", + TEXT_STYLE_NORMAL + }, + { + 8, + 20, + "http://www.gnu.org/licenses/licenses.html", + TEXT_STYLE_HIGHLIGHT + }, + { + 8, + 22, + "Warranty:", + TEXT_STYLE_HIGHLIGHT + }, + { + 8, + 24, + "This is free software; see the source for copying conditions.", + TEXT_STYLE_NORMAL + }, + { + 8, + 25, + "There is NO warranty; not even for MERCHANTABILITY or", + TEXT_STYLE_NORMAL + }, + { + 8, + 26, + "FITNESS FOR A PARTICULAR PURPOSE", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ENTER = Return", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY jaJPDevicePageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "The list below shows the current device settings.", + TEXT_STYLE_NORMAL + }, + { + 24, + 11, + "Computer:", + TEXT_STYLE_NORMAL | TEXT_ALIGN_RIGHT + }, + { + 24, + 12, + "Display:", + TEXT_STYLE_NORMAL | TEXT_ALIGN_RIGHT + }, + { + 24, + 13, + "Keyboard:", + TEXT_STYLE_NORMAL | TEXT_ALIGN_RIGHT + }, + { + 24, + 14, + "Keyboard layout:", + TEXT_STYLE_NORMAL | TEXT_ALIGN_RIGHT + }, + { + 24, + 16, + "Accept:", + TEXT_STYLE_NORMAL | TEXT_ALIGN_RIGHT + }, + { + 25, + 16, "Accept these device settings", + TEXT_STYLE_NORMAL + }, + { + 6, + 19, + "You can change the hardware settings by pressing the UP or DOWN keys", + TEXT_STYLE_NORMAL + }, + { + 6, + 20, + "to select an entry. Then press the ENTER key to select alternative", + TEXT_STYLE_NORMAL + }, + { + 6, + 21, + "settings.", + TEXT_STYLE_NORMAL + }, + { + 6, + 23, + "When all settings are correct, select \"Accept these device settings\"", + TEXT_STYLE_NORMAL + }, + { + 6, + 24, + "and press ENTER.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ENTER = Continue F3 = Quit", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY jaJPRepairPageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "ReactOS Setup is in an early development phase. It does not yet", + TEXT_STYLE_NORMAL + }, + { + 6, + 9, + "support all the functions of a fully usable setup application.", + TEXT_STYLE_NORMAL + }, + { + 6, + 12, + "The repair functions are not implemented yet.", + TEXT_STYLE_NORMAL + }, + { + 8, + 15, + "\x07 Press U for Updating OS.", + TEXT_STYLE_NORMAL + }, + { + 8, + 17, + "\x07 Press R for the Recovery Console.", + TEXT_STYLE_NORMAL + }, + { + 8, + 19, + "\x07 Press ESC to return to the main page.", + TEXT_STYLE_NORMAL + }, + { + 8, + 21, + "\x07 Press ENTER to reboot your computer.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ESC = Main page U = Update R = Recovery ENTER = Reboot", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; +static MUI_ENTRY jaJPComputerPageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "You want to change the type of computer to be installed.", + TEXT_STYLE_NORMAL + }, + { + 8, + 10, + "\x07 Press the UP or DOWN key to select the desired computer type.", + TEXT_STYLE_NORMAL + }, + { + 8, + 11, + " Then press ENTER.", + TEXT_STYLE_NORMAL + }, + { + 8, + 13, + "\x07 Press the ESC key to return to the previous page without changing", + TEXT_STYLE_NORMAL + }, + { + 8, + 14, + " the computer type.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ENTER = Continue ESC = Cancel F3 = Quit", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY jaJPFlushPageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE + }, + { + 10, + 6, + "The system is now making sure all data is stored on your disk", + TEXT_STYLE_NORMAL + }, + { + 10, + 8, + "This may take a minute", + TEXT_STYLE_NORMAL + }, + { + 10, + 9, + "When finished, your computer will reboot automatically", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "Flushing cache", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY jaJPQuitPageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE + }, + { + 10, + 6, + "ReactOS is not completely installed", + TEXT_STYLE_NORMAL + }, + { + 10, + 8, + "Remove floppy disk from Drive A: and", + TEXT_STYLE_NORMAL + }, + { + 10, + 9, + "all CD-ROMs from CD-Drives.", + TEXT_STYLE_NORMAL + }, + { + 10, + 11, + "Press ENTER to reboot your computer.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "Please wait ...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY jaJPDisplayPageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "You want to change the type of display to be installed.", + TEXT_STYLE_NORMAL + }, + { 8, + 10, + "\x07 Press the UP or DOWN key to select the desired display type.", + TEXT_STYLE_NORMAL + }, + { + 8, + 11, + " Then press ENTER.", + TEXT_STYLE_NORMAL + }, + { + 8, + 13, + "\x07 Press the ESC key to return to the previous page without changing", + TEXT_STYLE_NORMAL + }, + { + 8, + 14, + " the display type.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ENTER = Continue ESC = Cancel F3 = Quit", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY jaJPSuccessPageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE + }, + { + 10, + 6, + "The basic components of ReactOS have been installed successfully.", + TEXT_STYLE_NORMAL + }, + { + 10, + 8, + "Remove floppy disk from Drive A: and", + TEXT_STYLE_NORMAL + }, + { + 10, + 9, + "all CD-ROMs from CD-Drive.", + TEXT_STYLE_NORMAL + }, + { + 10, + 11, + "Press ENTER to reboot your computer.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ENTER = Reboot computer", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY jaJPBootPageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "Setup cannot install the bootloader on your computers", + TEXT_STYLE_NORMAL + }, + { + 6, + 9, + "hardisk", + TEXT_STYLE_NORMAL + }, + { + 6, + 13, + "Please insert a formatted floppy disk in drive A: and", + TEXT_STYLE_NORMAL + }, + { + 6, + 14, + "press ENTER.", + TEXT_STYLE_NORMAL, + }, + { + 0, + 0, + "ENTER = Continue F3 = Quit", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } + +}; + +static MUI_ENTRY jaJPSelectPartitionEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "The list below shows existing partitions and unused disk", + TEXT_STYLE_NORMAL + }, + { + 6, + 9, + "space for new partitions.", + TEXT_STYLE_NORMAL + }, + { + 8, + 11, + "\x07 Press UP or DOWN to select a list entry.", + TEXT_STYLE_NORMAL + }, + { + 8, + 13, + "\x07 Press ENTER to install ReactOS onto the selected partition.", + TEXT_STYLE_NORMAL + }, + { + 8, + 15, + "\x07 Press C to create a new partition.", + TEXT_STYLE_NORMAL + }, + { + 8, + 17, + "\x07 Press D to delete an existing partition.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "Please wait...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY jaJPFormatPartitionEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "Format partition", + TEXT_STYLE_NORMAL + }, + { + 6, + 10, + "Setup will now format the partition. Press ENTER to continue.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ENTER = Continue F3 = Quit", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + TEXT_STYLE_NORMAL + } +}; + +static MUI_ENTRY jaJPInstallDirectoryEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "Setup installs ReactOS files onto the selected partition. Choose a", + TEXT_STYLE_NORMAL + }, + { + 6, + 9, + "directory where you want ReactOS to be installed:", + TEXT_STYLE_NORMAL + }, + { + 6, + 14, + "To change the suggested directory, press BACKSPACE to delete", + TEXT_STYLE_NORMAL + }, + { + 6, + 15, + "characters and then type the directory where you want ReactOS to", + TEXT_STYLE_NORMAL + }, + { + 6, + 16, + "be installed.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ENTER = Continue F3 = Quit", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY jaJPFileCopyEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE + }, + { + 0, + 12, + "Please wait while ReactOS Setup copies files to your ReactOS", + TEXT_STYLE_NORMAL | TEXT_ALIGN_CENTER + }, + { + 0, + 13, + "installation folder.", + TEXT_STYLE_NORMAL | TEXT_ALIGN_CENTER + }, + { + 0, + 14, + "This may take several minutes to complete.", + TEXT_STYLE_NORMAL | TEXT_ALIGN_CENTER + }, + { + 50, + 0, + "\xB3 Please wait... ", + TEXT_TYPE_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY jaJPBootLoaderEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "Setup is installing the boot loader", + TEXT_STYLE_NORMAL + }, + { + 8, + 12, + "Install bootloader on the harddisk (MBR).", + TEXT_STYLE_NORMAL + }, + { + 8, + 13, + "Install bootloader on a floppy disk.", + TEXT_STYLE_NORMAL + }, + { + 8, + 14, + "Skip install bootloader.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ENTER = Continue F3 = Quit", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY jaJPKeyboardSettingsEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "You want to change the type of keyboard to be installed.", + TEXT_STYLE_NORMAL + }, + { + 8, + 10, + "\x07 Press the UP or DOWN key to select the desired keyboard type.", + TEXT_STYLE_NORMAL + }, + { + 8, + 11, + " Then press ENTER.", + TEXT_STYLE_NORMAL + }, + { + 8, + 13, + "\x07 Press the ESC key to return to the previous page without changing", + TEXT_STYLE_NORMAL + }, + { + 8, + 14, + " the keyboard type.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ENTER = Continue ESC = Cancel F3 = Quit", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY jaJPLayoutSettingsEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "Please select a layout to be installed by default.", + TEXT_STYLE_NORMAL + }, + { + 8, + 10, + "\x07 Press the UP or DOWN key to select the desired keyboard", + TEXT_STYLE_NORMAL + }, + { + 8, + 11, + " layout. Then press ENTER.", + TEXT_STYLE_NORMAL + }, + { + 8, + 13, + "\x07 Press the ESC key to return to the previous page without changing", + TEXT_STYLE_NORMAL + }, + { + 8, + 14, + " the keyboard layout.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ENTER = Continue ESC = Cancel F3 = Quit", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + }, + +}; + +static MUI_ENTRY jaJPPrepareCopyEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "Setup prepares your computer for copying the ReactOS files. ", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "Building the file copy list...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + }, + +}; + +static MUI_ENTRY jaJPSelectFSEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 17, + "Select a file system from the list below.", + 0 + }, + { + 8, + 19, + "\x07 Press UP or DOWN to select a file system.", + 0 + }, + { + 8, + 21, + "\x07 Press ENTER to format the partition.", + 0 + }, + { + 8, + 23, + "\x07 Press ESC to select another partition.", + 0 + }, + { + 0, + 0, + "ENTER = Continue ESC = Cancel F3 = Quit", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY jaJPDeletePartitionEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "You have chosen to delete the partition", + TEXT_STYLE_NORMAL + }, + { + 8, + 18, + "\x07 Press D to delete the partition.", + TEXT_STYLE_NORMAL + }, + { + 11, + 19, + "WARNING: All data on this partition will be lost!", + TEXT_STYLE_NORMAL + }, + { + 8, + 21, + "\x07 Press ESC to cancel.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "D = Delete Partition ESC = Cancel F3 = Quit", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY jaJPRegistryEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "Setup is updating the system configuration. ", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "Creating registry hives...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + }, + +}; + +MUI_ERROR jaJPErrorEntries[] = +{ + { + //ERROR_NOT_INSTALLED + "ReactOS is not completely installed on your\n" + "computer. If you quit Setup now, you will need to\n" + "run Setup again to install ReactOS.\n" + "\n" + " \x07 Press ENTER to continue Setup.\n" + " \x07 Press F3 to quit Setup.", + "F3 = Quit ENTER = Continue" + }, + { + //ERROR_NO_HDD + "Setup could not find a harddisk.\n", + "ENTER = Reboot computer" + }, + { + //ERROR_NO_SOURCE_DRIVE + "Setup could not find its source drive.\n", + "ENTER = Reboot computer" + }, + { + //ERROR_LOAD_TXTSETUPSIF + "Setup failed to load the file TXTSETUP.SIF.\n", + "ENTER = Reboot computer" + }, + { + //ERROR_CORRUPT_TXTSETUPSIF + "Setup found a corrupt TXTSETUP.SIF.\n", + "ENTER = Reboot computer" + }, + { + //ERROR_SIGNATURE_TXTSETUPSIF, + "Setup found an invalid signature in TXTSETUP.SIF.\n", + "ENTER = Reboot computer" + }, + { + //ERROR_DRIVE_INFORMATION + "Setup could not retrieve system drive information.\n", + "ENTER = Reboot computer" + }, + { + //ERROR_WRITE_BOOT, + "Setup failed to install FAT bootcode on the system partition.", + "ENTER = Reboot computer" + }, + { + //ERROR_LOAD_COMPUTER, + "Setup failed to load the computer type list.\n", + "ENTER = Reboot computer" + }, + { + //ERROR_LOAD_DISPLAY, + "Setup failed to load the display settings list.\n", + "ENTER = Reboot computer" + }, + { + //ERROR_LOAD_KEYBOARD, + "Setup failed to load the keyboard type list.\n", + "ENTER = Reboot computer" + }, + { + //ERROR_LOAD_KBLAYOUT, + "Setup failed to load the keyboard layout list.\n", + "ENTER = Reboot computer" + }, + { + //ERROR_WARN_PARTITION, + "Setup found that at least one harddisk contains an incompatible\n" + "partition table that can not be handled properly!\n" + "\n" + "Creating or deleting partitions can destroy the partition table.\n" + "\n" + " \x07 Press F3 to quit Setup." + " \x07 Press ENTER to continue.", + "F3= Quit ENTER = Continue" + }, + { + //ERROR_NEW_PARTITION, + "You can not create a new Partition inside\n" + "of an already existing Partition!\n" + "\n" + " * Press any key to continue.", + NULL + }, + { + //ERROR_DELETE_SPACE, + "You can not delete unpartitioned disk space!\n" + "\n" + " * Press any key to continue.", + NULL + }, + { + //ERROR_INSTALL_BOOTCODE, + "Setup failed to install the FAT bootcode on the system partition.", + "ENTER = Reboot computer" + }, + { + //ERROR_NO_FLOPPY, + "No disk in drive A:.", + "ENTER = Continue" + }, + { + //ERROR_UPDATE_KBSETTINGS, + "Setup failed to update keyboard layout settings.", + "ENTER = Reboot computer" + }, + { + //ERROR_UPDATE_DISPLAY_SETTINGS, + "Setup failed to update display registry settings.", + "ENTER = Reboot computer" + }, + { + //ERROR_IMPORT_HIVE, + "Setup failed to import a hive file.", + "ENTER = Reboot computer" + }, + { + //ERROR_FIND_REGISTRY + "Setup failed to find the registry data files.", + "ENTER = Reboot computer" + }, + { + //ERROR_CREATE_HIVE, + "Setup failed to create the registry hives.", + "ENTER = Reboot computer" + }, + { + //ERROR_INITIALIZE_REGISTRY, + "Setup failed to initialize the registry.", + "ENTER = Reboot computer" + }, + { + //ERROR_INVALID_CABINET_INF, + "Cabinet has no valid inf file.\n", + "ENTER = Reboot computer" + }, + { + //ERROR_CABINET_MISSING, + "Cabinet not found.\n", + "ENTER = Reboot computer" + }, + { + //ERROR_CABINET_SCRIPT, + "Cabinet has no setup script.\n", + "ENTER = Reboot computer" + }, + { + //ERROR_COPY_QUEUE, + "Setup failed to open the copy file queue.\n", + "ENTER = Reboot computer" + }, + { + //ERROR_CREATE_DIR, + "Setup could not create install directories.", + "ENTER = Reboot computer" + }, + { + //ERROR_TXTSETUP_SECTION, + "Setup failed to find the 'Directories' section\n" + "in TXTSETUP.SIF.\n", + "ENTER = Reboot computer" + }, + { + //ERROR_CABINET_SECTION, + "Setup failed to find the 'Directories' section\n" + "in the cabinet.\n", + "ENTER = Reboot computer" + }, + { + //ERROR_CREATE_INSTALL_DIR + "Setup could not create the install directory.", + "ENTER = Reboot computer" + }, + { + //ERROR_FIND_SETUPDATA, + "Setup failed to find the 'SetupData' section\n" + "in TXTSETUP.SIF.\n", + "ENTER = Reboot computer" + }, + { + //ERROR_WRITE_PTABLE, + "Setup failed to write partition tables.\n" + "ENTER = Reboot computer" + }, + { + //ERROR_ADDING_CODEPAGE, + "Setup failed to add codepage to registry.\n" + "ENTER = Reboot computer" + }, + { + //ERROR_UPDATE_LOCALESETTINGS, + "Setup could not set the system locale.\n" + "ENTER = Reboot computer" + }, + { + //ERROR_ADDING_KBLAYOUTS, + "Setup failed to add keyboard layouts to registry.\n" + "ENTER = Reboot computer" + }, + { + //ERROR_UPDATE_GEOID, + "Setup could not set the geo id.\n" + "ENTER = Reboot computer" + }, + { + NULL, + NULL + } +}; + + +MUI_PAGE jaJPPages[] = +{ + { + LANGUAGE_PAGE, + jaJPLanguagePageEntries + }, + { + START_PAGE, + jaJPWelcomePageEntries + }, + { + INSTALL_INTRO_PAGE, + jaJPIntroPageEntries + }, + { + LICENSE_PAGE, + jaJPLicensePageEntries + }, + { + DEVICE_SETTINGS_PAGE, + jaJPDevicePageEntries + }, + { + REPAIR_INTRO_PAGE, + jaJPRepairPageEntries + }, + { + COMPUTER_SETTINGS_PAGE, + jaJPComputerPageEntries + }, + { + DISPLAY_SETTINGS_PAGE, + jaJPDisplayPageEntries + }, + { + FLUSH_PAGE, + jaJPFlushPageEntries + }, + { + SELECT_PARTITION_PAGE, + jaJPSelectPartitionEntries + }, + { + SELECT_FILE_SYSTEM_PAGE, + jaJPSelectFSEntries + }, + { + FORMAT_PARTITION_PAGE, + jaJPFormatPartitionEntries + }, + { + DELETE_PARTITION_PAGE, + jaJPDeletePartitionEntries + }, + { + INSTALL_DIRECTORY_PAGE, + jaJPInstallDirectoryEntries + }, + { + PREPARE_COPY_PAGE, + jaJPPrepareCopyEntries + }, + { + FILE_COPY_PAGE, + jaJPFileCopyEntries + }, + { + KEYBOARD_SETTINGS_PAGE, + jaJPKeyboardSettingsEntries + }, + { + BOOT_LOADER_PAGE, + jaJPBootLoaderEntries + }, + { + LAYOUT_SETTINGS_PAGE, + jaJPLayoutSettingsEntries + }, + { + QUIT_PAGE, + jaJPQuitPageEntries + }, + { + SUCCESS_PAGE, + jaJPSuccessPageEntries + }, + { + BOOT_LOADER_FLOPPY_PAGE, + jaJPBootPageEntries + }, + { + REGISTRY_PAGE, + jaJPRegistryEntries + }, + { + -1, + NULL + } +}; + +MUI_STRING jaJPStrings[] = +{ + {STRING_PLEASEWAIT, + " Please wait..."}, + {STRING_INSTALLCREATEPARTITION, + " ENTER = Install C = Create Partition F3 = Quit"}, + {STRING_INSTALLDELETEPARTITION, + " ENTER = Install D = Delete Partition F3 = Quit"}, + {STRING_PARTITIONSIZE, + "Size of new partition:"}, + {STRING_CHOOSENEWPARTITION, + "You have chosen to create a new partition on"}, + {STRING_HDDSIZE, + "Please enter the size of the new partition in megabytes."}, + {STRING_CREATEPARTITION, + " ENTER = Create Partition ESC = Cancel F3 = Quit"}, + {STRING_PARTFORMAT, + "This Partition will be formatted next."}, + {STRING_NONFORMATTEDPART, + "You chose to install ReactOS on a new or unformatted Partition."}, + {STRING_INSTALLONPART, + "Setup installs ReactOS onto Partition"}, + {STRING_CHECKINGPART, + "Setup is now checking the selected partition."}, + {STRING_QUITCONTINUE, + "F3= Quit ENTER = Continue"}, + {STRING_REBOOTCOMPUTER, + "ENTER = Reboot computer"}, + {STRING_TXTSETUPFAILED, + "Setup failed to find the '%S' section\nin TXTSETUP.SIF.\n"}, + {STRING_COPYING, + "\xB3 Copying file: %S"}, + {STRING_SETUPCOPYINGFILES, + "Setup is copying files..."}, + {STRING_REGHIVEUPDATE, + " Updating registry hives..."}, + {STRING_IMPORTFILE, + " Importing %S..."}, + {STRING_DISPLAYETTINGSUPDATE, + " Updating display registry settings..."}, + {STRING_LOCALESETTINGSUPDATE, + " Updating locale settings..."}, + {STRING_KEYBOARDSETTINGSUPDATE, + " Updating keyboard layout settings..."}, + {STRING_CODEPAGEINFOUPDATE, + " Adding codepage information to registry..."}, + {STRING_DONE, + " Done..."}, + {STRING_REBOOTCOMPUTER2, + " ENTER = Reboot computer"}, + {STRING_CONSOLEFAIL1, + "Unable to open the console\n\n"}, + {STRING_CONSOLEFAIL2, + "The most common cause of this is using an USB keyboard\n"}, + {STRING_CONSOLEFAIL3, + "USB keyboards are not fully supported yet\n"}, + {STRING_FORMATTINGDISK, + "Setup is formatting your disk"}, + {STRING_CHECKINGDISK, + "Setup is checking your disk"}, + {STRING_FORMATDISK1, + " Format partition as %S file system (quick format) "}, + {STRING_FORMATDISK2, + " Format partition as %S file system "}, + {STRING_KEEPFORMAT, + " Keep current file system (no changes) "}, + {STRING_HDINFOPARTCREATE, + "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ."}, + {STRING_HDDINFOUNK1, + "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)."}, + {STRING_HDDINFOUNK2, + " %c%c Type %lu %I64u %s"}, + {STRING_HDINFOPARTDELETE, + "on %I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ."}, + {STRING_HDDINFOUNK3, + "on %I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)."}, + {STRING_HDINFOPARTZEROED, + "Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."}, + {STRING_HDDINFOUNK4, + "%c%c Type %lu %I64u %s"}, + {STRING_HDINFOPARTEXISTS, + "on Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."}, + {STRING_HDDINFOUNK5, + "%c%c Type %-3u %6lu %s"}, + {STRING_HDINFOPARTSELECT, + "%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %S"}, + {STRING_HDDINFOUNK6, + "%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)"}, + {STRING_NEWPARTITION, + "Setup created a new partition on"}, + {STRING_UNPSPACE, + " Unpartitioned space %6lu %s"}, + {STRING_MAXSIZE, + "MB (max. %lu MB)"}, + {STRING_UNFORMATTED, + "New (Unformatted)"}, + {STRING_FORMATUNUSED, + "Unused"}, + {STRING_FORMATUNKNOWN, + "Unknown"}, + {STRING_KB, + "KB"}, + {STRING_MB, + "MB"}, + {STRING_GB, + "GB"}, + {STRING_ADDKBLAYOUTS, + "Adding keyboard layouts"}, + {0, 0} +}; + #endif Modified: trunk/reactos/base/setup/usetup/muifonts.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/muifonts… ============================================================================== --- trunk/reactos/base/setup/usetup/muifonts.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/muifonts.h [iso-8859-1] Sat Apr 18 01:01:56 2009 @@ -65,12 +65,12 @@ { L"Courier", L"FreeMono" }, { L"Courier New", L"FreeMono" }, { L"Times New Roman", L"Liberation Serif" }, - { L"Tahoma", L"IPAMonaUIGothic" }, + { L"Tahoma", L"Systema" }, { L"MS Sans Serif", L"Tahoma" }, - { L"MS Shell Dlg", L"IPAMonaUIGothic" }, - { L"MS Shell Dlg 2", L"IPAMonaUIGothic" }, - { L"MS UI Gothic", L"IPAMonaUIGothic" }, - { L"MS UI Gothic 2", L"IPAMonaUIGothic" }, + { L"MS Shell Dlg", L"Systema" }, + { L"MS Shell Dlg 2", L"Systema" }, + { L"MS UI Gothic", L"Systema" }, + { L"MS UI Gothic 2", L"Systema" }, { L"Helv", L"Tahoma" }, { NULL, NULL } }; Modified: trunk/reactos/base/setup/usetup/muilanguages.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/muilangu… ============================================================================== --- trunk/reactos/base/setup/usetup/muilanguages.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/muilanguages.h [iso-8859-1] Sat Apr 18 01:01:56 2009 @@ -216,7 +216,7 @@ {L"00000421", L"1252", L"850", L"10079", L"Indonesian", L"62", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, idIDLayouts }, {L"00000410", L"1252", L"850", L"10000", L"Italian (Italy)", L"39", itITPages, itITErrorEntries, itITStrings, LatinFonts, itITLayouts }, {L"00000810", L"1252", L"850", L"10000", L"Italian (Switzerland)", L"41", itITPages, itITErrorEntries, itITStrings, LatinFonts, itCHLayouts }, - {L"00000411", L"932", L"932", L"10001", L"Japanese", L"81", enUSPages, enUSErrorEntries, enUSStrings, JapaneseFonts, jaJPLayouts }, + {L"00000411", L"932", L"932", L"10001", L"Japanese", L"81", jaJPPages, jaJPErrorEntries, jaJPStrings, JapaneseFonts, jaJPLayouts }, {L"0000044B", L"1252", L"437", L"10079", L"Kannada (India)", L"91", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, knINLayouts }, {L"0000043F", L"1251", L"866", L"10007", L"Kazakh", L"705", enUSPages, enUSErrorEntries, enUSStrings, CyrillicFonts, kkKZLayouts }, {L"00000457", L"0", L"437", L"2", L"Konkani", L"1", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, kokINLayouts}, Added: trunk/reactos/media/vgafonts/932-8x8.bin URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/vgafonts/932-8x8.bin… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/media/vgafonts/932-8x8.bin ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: trunk/reactos/media/vgafonts/vgafonts.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/vgafonts/vgafonts.rb… ============================================================================== --- trunk/reactos/media/vgafonts/vgafonts.rbuild [iso-8859-1] (original) +++ trunk/reactos/media/vgafonts/vgafonts.rbuild [iso-8859-1] Sat Apr 18 01:01:56 2009 @@ -9,4 +9,5 @@ <file>852-8x8.bin</file> <file>865-8x8.bin</file> <file>866-8x8.bin</file> -</module> + <file>932-8x8.bin</file> +</module>

1 0

[dgorbachev] 40564: - Update Japanese translations, Tomoya Kitagawa, bug #4332. - Update Spanish translations, Javier Remacha, bug #4357. - Spanish translation of Write by Elhoir, bug #4360. - Brazilian Portuguese translations by Wagner Leandro Bueno Angelo, bug #4374.
by dgorbachev＠svn.reactos.org 17 Apr '09

17 Apr '09

Author: dgorbachev Date: Sat Apr 18 00:54:28 2009 New Revision: 40564 URL: http://svn.reactos.org/svn/reactos?rev=40564&view=rev Log: - Update Japanese translations, Tomoya Kitagawa, bug #4332. - Update Spanish translations, Javier Remacha, bug #4357. - Spanish translation of Write by Elhoir, bug #4360. - Brazilian Portuguese translations by Wagner Leandro Bueno Angelo, bug #4374. Added: trunk/reactos/base/applications/write/lang/es-ES.rc (with props) Modified: trunk/reactos/base/applications/write/rsrc.rc trunk/reactos/base/setup/reactos/lang/es-ES.rc trunk/reactos/dll/cpl/desk/lang/es-ES.rc trunk/reactos/dll/cpl/desk/lang/ja-JP.rc trunk/reactos/dll/cpl/desk/lang/no-NO.rc trunk/reactos/dll/cpl/powercfg/lang/es-ES.rc trunk/reactos/dll/cpl/sysdm/lang/ja-JP.rc trunk/reactos/dll/cpl/sysdm/rsrc.rc trunk/reactos/dll/win32/syssetup/lang/es-ES.rc trunk/reactos/dll/win32/syssetup/lang/no-NO.rc trunk/reactos/dll/win32/userenv/lang/no-NO.rc trunk/reactos/media/inf/NET_NIC.inf trunk/reactos/media/inf/acpi.inf trunk/reactos/media/inf/audio.inf trunk/reactos/media/inf/cdrom.inf trunk/reactos/media/inf/cpu.inf trunk/reactos/media/inf/display.inf trunk/reactos/media/inf/fdc.inf trunk/reactos/media/inf/hdc.inf trunk/reactos/media/inf/keyboard.inf trunk/reactos/media/inf/machine.inf trunk/reactos/media/inf/msmouse.inf trunk/reactos/media/inf/netisa.inf trunk/reactos/media/inf/ports.inf trunk/reactos/media/inf/scsi.inf trunk/reactos/media/inf/usb.inf trunk/reactos/media/inf/usbport.inf trunk/reactos/media/inf/usbstor.inf Added: trunk/reactos/base/applications/write/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/write/la… ============================================================================== --- trunk/reactos/base/applications/write/lang/es-ES.rc (added) +++ trunk/reactos/base/applications/write/lang/es-ES.rc [iso-8859-1] Sat Apr 18 00:54:28 2009 @@ -1,0 +1,26 @@ +/* + * Spanish language support + * + * Copyright (C) 2009 Elhoir + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL + +STRINGTABLE +{ + IDS_FAILED, "Fallo al iniciar Wordpad" +} Propchange: trunk/reactos/base/applications/write/lang/es-ES.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/write/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/write/rs… ============================================================================== --- trunk/reactos/base/applications/write/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/write/rsrc.rc [iso-8859-1] Sat Apr 18 00:54:28 2009 @@ -26,16 +26,17 @@ #include "lang/bg-BG.rc" #include "lang/de-DE.rc" #include "lang/en-US.rc" +#include "lang/es-ES.rc" #include "lang/fr-FR.rc" #include "lang/ja-JP.rc" #include "lang/ko-KR.rc" +#include "lang/nl-NL.rc" #include "lang/no-NO.rc" -#include "lang/nl-NL.rc" #include "lang/pl-PL.rc" #include "lang/pt-BR.rc" #include "lang/ro-RO.rc" #include "lang/ru-RU.rc" +#include "lang/sk-SK.rc" #include "lang/sl-SI.rc" -#include "lang/sk-SK.rc" #include "lang/sv-SE.rc" #include "lang/uk-UA.rc" Modified: trunk/reactos/base/setup/reactos/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/es… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/es-ES.rc [iso-8859-1] Sat Apr 18 00:54:28 2009 @@ -64,7 +64,7 @@ PUSHBUTTON "&Borrar", IDC_PARTDELETE, 76,155,50,15 PUSHBUTTON "D&river", IDC_DEVICEDRIVER, 162,155,50,15, WS_DISABLED PUSHBUTTON "&Opciones avanzadas...", IDC_PARTMOREOPTS, 218,155,80,15 - LTEXT "Click Next to check the summary.", IDC_STATIC, 10, 180 ,277, 20 + LTEXT "Presione Siguiente para verificar el resumen.", IDC_STATIC, 10, 180 ,277, 20 END IDD_PARTITION DIALOGEX DISCARDABLE 0, 0, 145, 90 @@ -147,8 +147,8 @@ IDS_PROCESSSUBTITLE "Crear y formatear partición, copiar archivos, instalar e instalar el cargador de arranque" IDS_RESTARTTITLE "Primera parte de la instalación finalizada" IDS_RESTARTSUBTITLE "La primera parte de la instalación ha sido completada, reinicie para continuar con la segunda parte" - IDS_SUMMARYTITLE "Installation Summary" - IDS_SUMMARYSUBTITLE "List installation properties to check before apply to the installation device" + IDS_SUMMARYTITLE "Resumen de la instalación" + IDS_SUMMARYSUBTITLE "Lista las propiedades de la instalación para su verificación antes de aplicarlas al dispositivo instalado" IDS_ABORTSETUP "ReactOS no está completamente instalado en su equipo. Si sale de la instalación ahora, tendrá que ejecutar el instalador otra vez para instalar Reactos. ¿Realmente quiere salir?" IDS_ABORTSETUP2 "¿Abortar instalación?" END Modified: trunk/reactos/dll/cpl/desk/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/es-ES.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/es-ES.rc [iso-8859-1] Sat Apr 18 00:54:28 2009 @@ -18,11 +18,11 @@ CONTROL "",IDC_BACKGROUND_LIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 99, 173, 71 - LTEXT "Fondo:", + LTEXT "&Fondo:", IDC_STATIC, 8, 87, 180, 8 - PUSHBUTTON "&Examinar...",IDC_BROWSE_BUTTON, 187, 135, 50, 14 - PUSHBUTTON "&Color...",IDC_COLOR_BUTTON, 187, 155, 50, 14 - LTEXT "Posición",IDC_STATIC, 187, 98, 36, 8 + PUSHBUTTON "E&xaminar...",IDC_BROWSE_BUTTON, 187, 135, 50, 14 + PUSHBUTTON "C&olor...",IDC_COLOR_BUTTON, 187, 155, 50, 14 + LTEXT "Po&sición",IDC_STATIC, 187, 98, 36, 8 COMBOBOX IDC_PLACEMENT_COMBO, 187, 108, 50, 90, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP END @@ -43,13 +43,13 @@ CONTROL "",IDC_SCREENS_TIME ,UPDOWN_CLASS,UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 61, 123, 12, 13 - LTEXT "minutos", IDC_MINTEXT, 70, 125, 26, 9 + LTEXT "minutos", IDC_MINTEXT, 72, 125, 26, 9 CONTROL "Pr&oteger con contraseña al reanudar",IDC_SCREENS_USEPASSCHK,"button", BS_AUTOCHECKBOX | WS_TABSTOP, 104, 120, 130, 19 //104 GROUPBOX "Energía del monitor ", IDC_SCREENS_DUMMY2, 6, 155, 232, 41 LTEXT "Para ajustar la configuración de energía del monitor y ahorrar energía, haga clic en Energía.", IDC_STATIC, 14, 166, 146 ,24 - PUSHBUTTON "E&nergía...", IDC_SCREENS_POWER_BUTTON, 176, 171, 50, 13 + PUSHBUTTON "E&nergía...", IDC_SCREENS_POWER_BUTTON, 176, 175, 50, 13 END IDD_APPEARANCE DIALOGEX DISCARDABLE 0, 0, 246, 228 @@ -59,10 +59,10 @@ BEGIN CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 - LTEXT "Combinación de colores", IDC_STATIC, 7, 140, 90, 7 //84 + LTEXT "Com&binación de colores:", IDC_STATIC, 7, 160, 90, 7 //84 COMBOBOX IDC_APPEARANCE_UI_ITEM, 7, 169, 120, 54, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "&Effects...", IDC_APPEARANCE_EFFECTS, 182, 150, 56, 15 - PUSHBUTTON "Avanzado", IDC_APPEARANCE_ADVANCED, 182, 170, 56, 15 + PUSHBUTTON "&Efectos...", IDC_APPEARANCE_EFFECTS, 162, 185, 76, 15 + PUSHBUTTON "Opciones &avanzadas", IDC_APPEARANCE_ADVANCED, 162, 205, 76, 15 END IDD_ADVAPPEARANCE DIALOGEX DISCARDABLE 0, 0, 250, 239 @@ -74,26 +74,26 @@ CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 - LTEXT "Elemento:", 8, 5, 160, 50, 9 + LTEXT "&Elemento:", 8, 5, 160, 50, 9 COMBOBOX IDC_ADVAPPEARANCE_ELEMENT, 5, 170, 130, 90, CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_CHILD | WS_VSCROLL | WS_TABSTOP LTEXT "&Tamaño", IDC_ADVAPPEARANCE_SIZE_T, 142, 160, 39, 9 EDITTEXT IDC_ADVAPPEARANCE_SIZE_E, 142, 170, 38, 13, ES_RIGHT | WS_GROUP CONTROL "", IDC_ADVAPPEARANCE_SIZE_UD, UPDOWN_CLASS, UDS_AUTOBUDDY | WS_BORDER | WS_GROUP | UDS_ALIGNRIGHT | UDS_ARROWKEYS | UDS_SETBUDDYINT | WS_CHILD | WS_VISIBLE, 172, 170, 10, 13 - LTEXT "Color &1:", IDC_ADVAPPEARANCE_COLOR1_T, 184, 160, 40, 9 + LTEXT "C&olor 1:", IDC_ADVAPPEARANCE_COLOR1_T, 184, 160, 40, 9 CHECKBOX "-", IDC_ADVAPPEARANCE_COLOR1_B, 184, 170, 28, 13, BS_PUSHLIKE | BS_BITMAP LTEXT "Color &2:", IDC_ADVAPPEARANCE_COLOR2_T, 216, 160, 40, 9 CHECKBOX "-", IDC_ADVAPPEARANCE_COLOR2_B, 216, 170, 28, 13, BS_PUSHLIKE | BS_BITMAP - LTEXT "Fuente:", IDC_ADVAPPEARANCE_FONT_T, 5, 190, 50, 8 + LTEXT "&Fuente:", IDC_ADVAPPEARANCE_FONT_T, 5, 190, 50, 8 COMBOBOX IDC_ADVAPPEARANCE_FONT_C, 5, 200, 130, 90, CBS_DROPDOWN | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP - LTEXT "Tamaño:", IDC_ADVAPPEARANCE_FONTSIZE_T, 142, 190, 39, 8 + LTEXT "Ta&maño:", IDC_ADVAPPEARANCE_FONTSIZE_T, 142, 190, 39, 8 COMBOBOX IDC_ADVAPPEARANCE_FONTSIZE_E, 142, 200, 38, 200, CBS_DROPDOWN | WS_VSCROLL - LTEXT "Color:", IDC_ADVAPPEARANCE_FONTCOLOR_T, 184, 190, 20, 9 + LTEXT "Colo&r:", IDC_ADVAPPEARANCE_FONTCOLOR_T, 184, 190, 20, 9 CHECKBOX "", IDC_ADVAPPEARANCE_FONTCOLOR_B, 184, 200, 28, 13, BS_PUSHLIKE | BS_BITMAP AUTOCHECKBOX "B", IDC_ADVAPPEARANCE_FONTBOLD, 216, 200, 14, 13, BS_PUSHLIKE @@ -103,40 +103,40 @@ DEFPUSHBUTTON "Aceptar", IDOK, 137, 220, 50, 14 END -IDD_EFFAPPEARANCE DIALOGEX DISCARDABLE 0, 0, 285, 185 +IDD_EFFAPPEARANCE DIALOGEX DISCARDABLE 0, 0, 300, 185 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_DLGMODALFRAME | WS_EX_WINDOWEDGE -CAPTION "Effects" -FONT 8, "MS Shell Dlg" -BEGIN - CONTROL "&Use the following transition effect for menus and tooltips:",IDC_EFFAPPEARANCE_ANIMATION,"button", - BS_AUTOCHECKBOX | WS_TABSTOP, 10, 5, 285, 19 +CAPTION "Efectos" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "&Usar el efecto de transición siguiente para menús e información sobre herramientas:",IDC_EFFAPPEARANCE_ANIMATION,"button", + BS_AUTOCHECKBOX | WS_TABSTOP, 10, 5, 290, 19 COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 80, 19 , CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_CHILD | WS_VSCROLL | WS_TABSTOP - CONTROL "U&se the following method to smooth edges of screen fonts:",IDC_EFFAPPEARANCE_SMOOTHING,"button", + CONTROL "U&sar el siguiente método para suavizar los bordes de las fuentes de pantalla:",IDC_EFFAPPEARANCE_SMOOTHING,"button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 42, 285, 19 COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 80, 19 , CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED - CONTROL "Us&e large icons",IDC_EFFAPPEARANCE_LARGEICONS,"button", + CONTROL "Usar i&conos grandes",IDC_EFFAPPEARANCE_LARGEICONS,"button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 80, 285, 19 - CONTROL "Show sh&adows under menus",IDC_EFFAPPEARANCE_SETDROPSHADOW,"button", + CONTROL "Mostrar som&bras bajo los menús",IDC_EFFAPPEARANCE_SETDROPSHADOW,"button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 95, 285, 19 - CONTROL "Show &window contents while dragging",IDC_EFFAPPEARANCE_DRAGFULLWINDOWS,"button", + CONTROL "&Mostrar el contenido de la ventana mientras se arrastra",IDC_EFFAPPEARANCE_DRAGFULLWINDOWS,"button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 110, 285, 19 - CONTROL "&Hide underlined letters for keyboard navigation until I press the Alt key",IDC_EFFAPPEARANCE_KEYBOARDCUES,"button", - BS_AUTOCHECKBOX | WS_TABSTOP, 10, 125, 285, 19 - PUSHBUTTON "Cancel", IDCANCEL, 226, 165, 50, 14 - DEFPUSHBUTTON "OK", IDOK, 172, 165, 50, 14 + CONTROL "&Ocultar las letrar subrayadas de acceso rápido hasta que presione la tecla Alt",IDC_EFFAPPEARANCE_KEYBOARDCUES,"button", + BS_AUTOCHECKBOX | WS_TABSTOP, 10, 125, 290, 19 + PUSHBUTTON "Cancelar", IDCANCEL, 241, 165, 50, 14 + DEFPUSHBUTTON "Aceptar", IDOK, 187, 165, 50, 14 END IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 188 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Configuración" FONT 8, "MS Shell Dlg" -BEGIN +BEGIN LTEXT "Arrastre los iconos para ajustar el orden físico de sus monitores.",-1,3,3,240,10 CONTROL "",IDC_SETTINGS_MONSEL,"MONITORSELWNDCLASS",WS_CHILD|WS_VISIBLE|WS_TABSTOP,3,16,240,82,WS_EX_CLIENTEDGE - LTEXT "Monitor",1820,3,100,30,8 + LTEXT "Mostrar",1820,3,100,30,8 LTEXT "<ninguno>",IDC_SETTINGS_DEVICE,9,109,224,8 - GROUPBOX "Resolución de &pantalla ",1818,3,120,115,43 + GROUPBOX "&Resolución de pantalla ",1818,3,120,115,43 CONTROL "",IDC_SETTINGS_RESOLUTION,"msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 30, 130, 58, 17 LTEXT "Menor",1815,8,130,21,8,NOT WS_GROUP @@ -146,7 +146,7 @@ COMBOBOX IDC_SETTINGS_BPP,131,130,103,80,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP CONTROL "",IDC_SETTINGS_SPECTRUM,"Static",SS_OWNERDRAW | SS_SUNKEN,131,148,103,9 - PUSHBUTTON "A&vanzado...",IDC_SETTINGS_ADVANCED,170,165,70,14 + PUSHBUTTON "Opciones &avanzadas",IDC_SETTINGS_ADVANCED,140,165,100,14 END IDD_ADVANCED_GENERAL DIALOGEX DISCARDABLE 0, 0, 253, 204 @@ -159,7 +159,7 @@ COMBOBOX IDC_FONTSIZE_COMBO, 14, 30, 223, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "", IDC_FONTSIZE_COSTOM, 14, 46, 223, 12 GROUPBOX "Compatibilidad ", -1, 7, 67, 237, 97 - LTEXT "Algunos programas no funcionan correctamente si no reinicia el equipo después de cambiar la configuración de pantalla.\r\n\nDespués de cambiar la configuración de pantalla:", -1, 12, 78, 228, 34 + LTEXT "Es posible que algunos programas no funcionen correctamente si no reinicia el equipo después de cambiar la configuración de pantalla:", -1, 12, 78, 228, 34 AUTORADIOBUTTON "&Reiniciar el equipo antes de aplicar la nueva configuración.", IDC_RESTART_RB, 14, 116, 224, 10 AUTORADIOBUTTON "&Aplicar la nueva configuración de pantalla sin reiniciar.", IDC_WITHOUTREBOOT_RB, 14, 131, 224, 10 AUTORADIOBUTTON "Pregu&ntar antes de aplicar la nueva configuración de pantalla.", IDC_ASKME_RB, 14, 146, 224, 10 @@ -186,13 +186,13 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_SLIDEEFFECT "Slide effect" - IDS_FADEEFFECT "Fade effect" -END - -STRINGTABLE DISCARDABLE -BEGIN - IDS_STANDARDEFFECT "Standard" + IDS_SLIDEEFFECT "Desplazamiento" + IDS_FADEEFFECT "Atenuación" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_STANDARDEFFECT "Estándar" IDS_CLEARTYPEEFFECT "ClearType" END Modified: trunk/reactos/dll/cpl/desk/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/ja-JP.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/ja-JP.rc [iso-8859-1] Sat Apr 18 00:54:28 2009 @@ -19,103 +19,105 @@ CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP END + IDD_SCREENSAVER DIALOGEX 0, 0, 246, 204 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Screensaver" +CAPTION "XN[ Z[o[" FONT 9, "MS UI Gothic", 0, 0 BEGIN CONTROL "", IDC_SCREENS_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 70, WS_EX_STATICEDGE - GROUPBOX "&Screensaver",IDC_SCREENS_DUMMY, 8, 92, 230, 52 + GROUPBOX "XN[ Z[o[(&S)",IDC_SCREENS_DUMMY, 8, 92, 230, 52 COMBOBOX IDC_SCREENS_LIST, 14, 103, 100, 100, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Se&ttings",IDC_SCREENS_SETTINGS, 120, 103, 50, 13, WS_GROUP - PUSHBUTTON "Pre&view",IDC_SCREENS_TESTSC, 175, 103, 50, 13 - LTEXT "&Wait",IDC_WAITTEXT, 14, 125, 16, 9 + PUSHBUTTON "Ýè(&T)",IDC_SCREENS_SETTINGS, 120, 103, 50, 13, WS_GROUP + PUSHBUTTON "vr[(&V)",IDC_SCREENS_TESTSC, 175, 103, 50, 13 + LTEXT "Ò¿Ô(&W)",IDC_WAITTEXT, 14, 125, 16, 9 EDITTEXT IDC_SCREENS_TIMEDELAY, 34, 123, 32, 13, ES_RIGHT | WS_GROUP CONTROL "",IDC_SCREENS_TIME ,UPDOWN_CLASS,UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 54, 123, 12, 13 - LTEXT "minutes", IDC_MINTEXT, 70, 125, 26, 9 - CONTROL "Ask for &password on resume.",IDC_SCREENS_USEPASSCHK,"button", + LTEXT "ªÔ", IDC_MINTEXT, 70, 125, 26, 9 + CONTROL "W[ÉpX[hðqËé(&P)",IDC_SCREENS_USEPASSCHK,"button", BS_AUTOCHECKBOX | WS_TABSTOP, 108, 120, 104, 19 - GROUPBOX "&Energy Saving features of monitor", IDC_SCREENS_DUMMY2, 6, 155, 232, 41 - LTEXT "To adjust the power settings for your monitor, click on Power Settings.", + GROUPBOX "j^ÌÈdÍ@\\(&E)", IDC_SCREENS_DUMMY2, 6, 155, 232, 41 + LTEXT "j^Ìd¹ÝèðÏX·éÉÍAd¹ÝèðNbNµÄ¾³¢B", IDC_STATIC, 14, 166, 146 ,20 - PUSHBUTTON "P&ower...", IDC_SCREENS_POWER_BUTTON, 176, 171, 50, 13 -END + PUSHBUTTON "d¹(&O)...", IDC_SCREENS_POWER_BUTTON, 176, 171, 50, 13 +END + IDD_APPEARANCE DIALOGEX DISCARDABLE 0, 0, 246, 228 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "OÏÌfUC" +CAPTION "fUC" FONT 9, "MS UI Gothic" BEGIN CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 - LTEXT "Colorscheme", IDC_STATIC, 7, 140, 64, 7 + LTEXT "FÌÝè", IDC_STATIC, 7, 140, 64, 7 COMBOBOX IDC_APPEARANCE_UI_ITEM, 7, 169, 120, 54, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "&Effects...", IDC_APPEARANCE_EFFECTS, 182, 150, 56, 15 - PUSHBUTTON "Advanced", IDC_APPEARANCE_ADVANCED, 182, 170, 56, 15 + PUSHBUTTON "øÊ(&E)...", IDC_APPEARANCE_EFFECTS, 182, 150, 56, 15 + PUSHBUTTON "Ú×Ýè", IDC_APPEARANCE_ADVANCED, 182, 170, 56, 15 END IDD_ADVAPPEARANCE DIALOGEX DISCARDABLE 0, 0, 250, 239 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_DLGMODALFRAME | WS_EX_WINDOWEDGE -CAPTION "Advanced Appearance" +CAPTION "fUCÌÚ×" FONT 9, "MS UI Gothic" BEGIN CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 - LTEXT "Element:", 8, 5, 160, 50, 9 + LTEXT "Ýèvf:", 8, 5, 160, 50, 9 COMBOBOX IDC_ADVAPPEARANCE_ELEMENT, 5, 170, 130, 90, CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_CHILD | WS_VSCROLL | WS_TABSTOP - LTEXT "&Size", IDC_ADVAPPEARANCE_SIZE_T, 142, 160, 21, 9 + LTEXT "TCY(&S)", IDC_ADVAPPEARANCE_SIZE_T, 142, 160, 21, 9 EDITTEXT IDC_ADVAPPEARANCE_SIZE_E, 142, 170, 38, 13, ES_RIGHT | WS_GROUP CONTROL "", IDC_ADVAPPEARANCE_SIZE_UD, UPDOWN_CLASS, UDS_AUTOBUDDY | WS_BORDER | WS_GROUP | UDS_ALIGNRIGHT | UDS_ARROWKEYS | UDS_SETBUDDYINT | WS_CHILD | WS_VISIBLE, 172, 170, 10, 13 - LTEXT "&1st Color:", IDC_ADVAPPEARANCE_COLOR1_T, 184, 160, 40, 9 + LTEXT "F 1(&1):", IDC_ADVAPPEARANCE_COLOR1_T, 184, 160, 40, 9 CHECKBOX "-", IDC_ADVAPPEARANCE_COLOR1_B, 184, 170, 28, 13, BS_PUSHLIKE | BS_BITMAP - LTEXT "&2nd Color:", IDC_ADVAPPEARANCE_COLOR2_T, 216, 160, 40, 9 + LTEXT "F 2(&2):", IDC_ADVAPPEARANCE_COLOR2_T, 216, 160, 40, 9 CHECKBOX "-", IDC_ADVAPPEARANCE_COLOR2_B, 216, 170, 28, 13, BS_PUSHLIKE | BS_BITMAP - LTEXT "Font:", IDC_ADVAPPEARANCE_FONT_T, 5, 190, 50, 8 + LTEXT "tHg:", IDC_ADVAPPEARANCE_FONT_T, 5, 190, 50, 8 COMBOBOX IDC_ADVAPPEARANCE_FONT_C, 5, 200, 130, 90, CBS_DROPDOWN | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP - LTEXT "Fontsize:", IDC_ADVAPPEARANCE_FONTSIZE_T, 142, 190, 39, 8 + LTEXT "TCY:", IDC_ADVAPPEARANCE_FONTSIZE_T, 142, 190, 39, 8 COMBOBOX IDC_ADVAPPEARANCE_FONTSIZE_E, 142, 200, 38, 200, CBS_DROPDOWN | WS_VSCROLL - LTEXT "Color:", IDC_ADVAPPEARANCE_FONTCOLOR_T, 184, 190, 20, 9 + LTEXT "F:", IDC_ADVAPPEARANCE_FONTCOLOR_T, 184, 190, 20, 9 CHECKBOX "", IDC_ADVAPPEARANCE_FONTCOLOR_B, 184, 200, 28, 13, BS_PUSHLIKE | BS_BITMAP AUTOCHECKBOX "B", IDC_ADVAPPEARANCE_FONTBOLD, 216, 200, 14, 13, BS_PUSHLIKE AUTOCHECKBOX "I ", IDC_ADVAPPEARANCE_FONTITALIC, 230, 200, 14, 13, BS_PUSHLIKE - PUSHBUTTON "Cancel", IDCANCEL, 191, 220, 50, 14 + PUSHBUTTON "LZ", IDCANCEL, 191, 220, 50, 14 DEFPUSHBUTTON "OK", IDOK, 137, 220, 50, 14 END IDD_EFFAPPEARANCE DIALOGEX DISCARDABLE 0, 0, 285, 185 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_DLGMODALFRAME | WS_EX_WINDOWEDGE -CAPTION "Effects" -FONT 8, "MS Shell Dlg" -BEGIN - CONTROL "&Use the following transition effect for menus and tooltips:",IDC_EFFAPPEARANCE_ANIMATION,"button", +CAPTION "øÊ" +FONT 9, "MS UI Gothic" +BEGIN + CONTROL "ÌAj[VøÊðj[Æc[`bvÉgp·é(&U):",IDC_EFFAPPEARANCE_ANIMATION,"button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 5, 285, 19 COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 80, 19 , CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_CHILD | WS_VSCROLL | WS_TABSTOP - CONTROL "U&se the following method to smooth edges of screen fonts:",IDC_EFFAPPEARANCE_SMOOTHING,"button", + CONTROL "Ìû@ÅXN[tHgÌðç©É·é(&S):",IDC_EFFAPPEARANCE_SMOOTHING,"button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 42, 285, 19 COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 80, 19 , CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED - CONTROL "Us&e large icons",IDC_EFFAPPEARANCE_LARGEICONS,"button", + CONTROL "å«¢ACRðgp·é(&E)",IDC_EFFAPPEARANCE_LARGEICONS,"button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 80, 285, 19 - CONTROL "Show sh&adows under menus",IDC_EFFAPPEARANCE_SETDROPSHADOW,"button", + CONTROL "j[ÌºÉeð\\¦·é(&A)",IDC_EFFAPPEARANCE_SETDROPSHADOW,"button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 95, 285, 19 - CONTROL "Show &window contents while dragging",IDC_EFFAPPEARANCE_DRAGFULLWINDOWS,"button", + CONTROL "hbOÉEBhEÌàeð\\¦·é(&W)",IDC_EFFAPPEARANCE_DRAGFULLWINDOWS,"button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 110, 285, 19 - CONTROL "&Hide underlined letters for keyboard navigation until I press the Alt key",IDC_EFFAPPEARANCE_KEYBOARDCUES,"button", + CONTROL "AltL[ð·ÜÅL[{[hirQ[VÌºüðBµÄ¨(&H)ide underlined letters for keyboard navigation until I press the Alt key",IDC_EFFAPPEARANCE_KEYBOARDCUES,"button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 125, 285, 19 - PUSHBUTTON "Cancel", IDCANCEL, 226, 165, 50, 14 + PUSHBUTTON "LZ", IDCANCEL, 226, 165, 50, 14 DEFPUSHBUTTON "OK", IDOK, 172, 165, 50, 14 END @@ -124,15 +126,15 @@ CAPTION "Ýè" FONT 9, "MS UI Gothic" BEGIN - LTEXT "Drag the monitor icons to match the physical arrangement of your monitors.",-1,3,3,240,10 + LTEXT "j^ÌACRðÀÛÌj^ÌzñÆêv·éæ¤ÉÚ®µÄ¾³¢B",-1,3,3,240,10 CONTROL "",IDC_SETTINGS_MONSEL,"MONITORSELWNDCLASS",WS_CHILD|WS_VISIBLE|WS_TABSTOP,3,16,240,82,WS_EX_CLIENTEDGE LTEXT "fBXvC(&D):",1820,3,140,30,8 - LTEXT "<none>",IDC_SETTINGS_DEVICE,9,149,224,8 + LTEXT "<Èµ>",IDC_SETTINGS_DEVICE,9,149,224,8 GROUPBOX "æÊÌðx(&S)",1818,3,160,115,43 CONTROL "",IDC_SETTINGS_RESOLUTION,"msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 30, 170, 58, 17 - LTEXT "·¢",1815,9,170,15,8,NOT WS_GROUP - LTEXT "L¢",1816,93,170,21,8,NOT WS_GROUP + LTEXT "¬",1815,9,170,15,8,NOT WS_GROUP + LTEXT "å",1816,93,170,21,8,NOT WS_GROUP LTEXT "",IDC_SETTINGS_RESOLUTION_TEXT,10,190,100,10,NOT WS_GROUP | SS_CENTER GROUPBOX "F(&C)",1817,125,160,115,43 COMBOBOX IDC_SETTINGS_BPP,131,170,103,80,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | @@ -143,56 +145,56 @@ IDD_ADVANCED_GENERAL DIALOGEX DISCARDABLE 0, 0, 253, 204 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "General" -FONT 8, "MS Shell Dlg" -BEGIN - GROUPBOX "Display", -1, 7, 6, 237, 56, WS_GROUP - LTEXT "Font Size:", -1, 14, 20, 222, 8 +CAPTION "SÊ" +FONT 9, "MS UI Gothic" +BEGIN + GROUPBOX "\\¦", -1, 7, 6, 237, 56, WS_GROUP + LTEXT "tHgTCY:", -1, 14, 20, 222, 8 COMBOBOX IDC_FONTSIZE_COMBO, 14, 30, 223, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "", IDC_FONTSIZE_COSTOM, 14, 46, 223, 12 - GROUPBOX "Compatibility", -1, 7, 67, 237, 97 - LTEXT "Some programs operate improperly if you do not restart your computer after you change color settings.\r\n\nAfter I change color settings:", -1, 12, 78, 228, 34 - AUTORADIOBUTTON "&Restart the computer before applying the new color settings.", IDC_RESTART_RB, 14, 116, 224, 10 - AUTORADIOBUTTON "Apply the new color settings without restarting.", IDC_WITHOUTREBOOT_RB, 14, 131, 224, 10 - AUTORADIOBUTTON "Ask me before applying the new color settings.", IDC_ASKME_RB, 14, 146, 224, 10 + GROUPBOX "Ý·«", -1, 7, 67, 237, 97 + LTEXT "FÌÝèðÏXµ½ãÉRs[^ðÄN®µÈ¢ÆAvOª³íÉ®ìµÈ¢±Æª èÜ·B\r\n\nFÌÝèðÏXµ½ãÌ®ì:", -1, 12, 78, 228, 34 + AUTORADIOBUTTON "Vµ¢FÌÝèðKp·éOÉARs[^ðÄN®·é(&R)", IDC_RESTART_RB, 14, 116, 224, 10 + AUTORADIOBUTTON "ÄN®¹¸ÉAVµ¢FÌÝèðKp·é", IDC_WITHOUTREBOOT_RB, 14, 131, 224, 10 + AUTORADIOBUTTON "Vµ¢FÌÝèðKp·éOÉmF·é", IDC_ASKME_RB, 14, 146, 224, 10 END IDR_PREVIEW_MENU MENU BEGIN - MENUITEM "Normal", ID_MENU_NORMAL - MENUITEM "Disabled", ID_MENU_DISABLED - MENUITEM "Selected", ID_MENU_SELECTED + MENUITEM "Êí", ID_MENU_NORMAL + MENUITEM "IðsÂ", ID_MENU_DISABLED + MENUITEM "IðÏÝ", ID_MENU_SELECTED END IDM_MONITOR_MENU MENU BEGIN POPUP "" BEGIN - MENUITEM "&Attached", ID_MENU_ATTACHED - MENUITEM "&Primary", ID_MENU_PRIMARY + MENUITEM "Ú±ÏÝ(&A)", ID_MENU_ATTACHED + MENUITEM "vC}(&P)", ID_MENU_PRIMARY MENUITEM SEPARATOR - MENUITEM "&Identify", ID_MENU_IDENTIFY - MENUITEM "P&roperties", ID_MENU_PROPERTIES + MENUITEM "¯Ê(&I)", ID_MENU_IDENTIFY + MENUITEM "vpeB(&R)", ID_MENU_PROPERTIES END END STRINGTABLE DISCARDABLE BEGIN - IDS_SLIDEEFFECT "Slide effect" - IDS_FADEEFFECT "Fade effect" -END - -STRINGTABLE DISCARDABLE -BEGIN - IDS_STANDARDEFFECT "Standard" + IDS_SLIDEEFFECT "XChøÊ" + IDS_FADEEFFECT "tF[høÊ" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_STANDARDEFFECT "X^_[h" IDS_CLEARTYPEEFFECT "ClearType" END STRINGTABLE BEGIN - IDS_MULTIPLEMONITORS "(Multiple Monitors)" - IDS_UNKNOWNMONITOR "(Unknown Monitor)" - IDS_ADVANCEDTITLEFMT "%s and %s" + IDS_MULTIPLEMONITORS "(}` j^)" + IDS_UNKNOWNMONITOR "(s¾Èj^)" + IDS_ADVANCEDTITLEFMT "%s Æ %s" END STRINGTABLE @@ -212,7 +214,7 @@ IDS_COLOR_16BIT "High Color (16 rbg)" IDS_COLOR_24BIT "True Color (24 rbg)" IDS_COLOR_32BIT "True Color (32 rbg)" - IDS_PIXEL "%lux%lu sNZ" + IDS_PIXEL "%lu x %lu sNZ" END STRINGTABLE DISCARDABLE @@ -223,43 +225,43 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_INACTWIN "Inactive Window" - IDS_ACTWIN "Active Window" - IDS_WINTEXT "Window Text" - IDS_MESSBOX "Message Box" - IDS_MESSTEXT "Message Text" + IDS_INACTWIN "ñANeBu EBhE" + IDS_ACTWIN "ANeBu EBhE" + IDS_WINTEXT "EBhE eLXg" + IDS_MESSBOX "bZ[W {bNX" + IDS_MESSTEXT "bZ[W eLXg" IDS_BUTTEXT "OK" END STRINGTABLE DISCARDABLE BEGIN - IDS_ELEMENT_1 "Desktop" - IDS_ELEMENT_2 "Caption of inactive windows" - IDS_ELEMENT_3 "Border of inactive windows" - IDS_ELEMENT_4 "Caption of active windows" - IDS_ELEMENT_5 "Border of active windows" - IDS_ELEMENT_6 "Menu" - IDS_ELEMENT_7 "Hilited elements" - IDS_ELEMENT_8 "Windows" - IDS_ELEMENT_9 "Scrollbars" - IDS_ELEMENT_10 "3D objects" - IDS_ELEMENT_11 "Palette title" - IDS_ELEMENT_12 "Symbol title" - IDS_ELEMENT_13 "Captionbar" - IDS_ELEMENT_14 "Deactivated menu elements" - IDS_ELEMENT_15 "Dialog" - IDS_ELEMENT_16 "Scrollbar controls" - IDS_ELEMENT_17 "Application background" - IDS_ELEMENT_18 "Small captionbar" - IDS_ELEMENT_19 "Symbol distance (horizontal)" - IDS_ELEMENT_20 "Symbol distance (vertical)" - IDS_ELEMENT_21 "Quickinfo" - IDS_ELEMENT_22 "Symbol" -END - -STRINGTABLE DISCARDABLE -BEGIN - IDS_DISPLAY_SETTINGS "Display settings" - IDS_APPLY_FAILED "Failed to apply new settings..." - IDS_APPLY_NEEDS_RESTART "You need to restart your computer to apply changes." -END + IDS_ELEMENT_1 "fXNgbv" + IDS_ELEMENT_2 "ñANeBu EBhEÌ^Cg" + IDS_ELEMENT_3 "ñANeBu EBhEÌ" + IDS_ELEMENT_4 "ANeBu EBhEÌ^Cg" + IDS_ELEMENT_5 "ANeBu EBhEÌ" + IDS_ELEMENT_6 "j[" + IDS_ELEMENT_7 "nCCg³ê½Ú" + IDS_ELEMENT_8 "EBhE" + IDS_ELEMENT_9 "XN[o[" + IDS_ELEMENT_10 "3D IuWFNg" + IDS_ELEMENT_11 "pbg ^Cg" + IDS_ELEMENT_12 "V{ ^Cg" + IDS_ELEMENT_13 "LvVo[" + IDS_ELEMENT_14 "ñANeBuj[Ú" + IDS_ELEMENT_15 "_CAO" + IDS_ELEMENT_16 "XN[o[ Rg[" + IDS_ELEMENT_17 "AvP[VÌwi" + IDS_ELEMENT_18 "¬³¢LvVo[" + IDS_ELEMENT_19 "V{ÌÔu (¡)" + IDS_ELEMENT_20 "V{ÌÔu (c)" + IDS_ELEMENT_21 "NCbNîñ" + IDS_ELEMENT_22 "V{" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_DISPLAY_SETTINGS "\¦Ýè" + IDS_APPLY_FAILED "Vµ¢ÝèÌKpÉ¸sµÜµ½..." + IDS_APPLY_NEEDS_RESTART "ÏXð½f·éRs[^ðÄN®·éKvª èÜ·B" +END Modified: trunk/reactos/dll/cpl/desk/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/no-NO.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/no-NO.rc [iso-8859-1] Sat Apr 18 00:54:28 2009 @@ -55,7 +55,7 @@ WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 LTEXT "Fargevalg", IDC_STATIC, 7, 140, 64, 9 COMBOBOX IDC_APPEARANCE_COLORSCHEME, 7, 150, 134, 90 , CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "&Effekter...", IDC_APPEARANCE_EFFECTS, 182, 150, 56, 15 + PUSHBUTTON "&Effects...", IDC_APPEARANCE_EFFECTS, 182, 150, 56, 15 PUSHBUTTON "Avansert", IDC_APPEARANCE_ADVANCED, 182, 170, 56, 15 END @@ -100,24 +100,24 @@ IDD_EFFAPPEARANCE DIALOGEX DISCARDABLE 0, 0, 285, 185 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_DLGMODALFRAME | WS_EX_WINDOWEDGE -CAPTION "Effekter" -FONT 8, "MS Shell Dlg" -BEGIN - CONTROL "&Bruk følgende overgang effekter for menyer og verktøytips:",IDC_EFFAPPEARANCE_ANIMATION,"button", +CAPTION "Effects" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "&Use the following transition effect for menus and tooltips:",IDC_EFFAPPEARANCE_ANIMATION,"button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 5, 285, 19 COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 80, 19 , CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_CHILD | WS_VSCROLL | WS_TABSTOP - CONTROL "B&ruk følgende metode for kantutjevning av skjerm skifter:",IDC_EFFAPPEARANCE_SMOOTHING,"button", + CONTROL "U&se the following method to smooth edges of screen fonts:",IDC_EFFAPPEARANCE_SMOOTHING,"button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 42, 285, 19 COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 80, 19 , CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED - CONTROL "Br&uk store ikoner",IDC_EFFAPPEARANCE_LARGEICONS,"button", + CONTROL "Us&e large icons",IDC_EFFAPPEARANCE_LARGEICONS,"button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 80, 285, 19 - CONTROL "Vis sk&ygger under menyer",IDC_EFFAPPEARANCE_SETDROPSHADOW,"button", + CONTROL "Show sh&adows under menus",IDC_EFFAPPEARANCE_SETDROPSHADOW,"button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 95, 285, 19 - CONTROL "Vis &vindu innholdet ved flytting",IDC_EFFAPPEARANCE_DRAGFULLWINDOWS,"button", + CONTROL "Show &window contents while dragging",IDC_EFFAPPEARANCE_DRAGFULLWINDOWS,"button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 110, 285, 19 - CONTROL "&Skjul visning av understrekning for tastatur hurtigtast til jeg trykker på Alt tasten",IDC_EFFAPPEARANCE_KEYBOARDCUES,"button", + CONTROL "&Hide underlined letters for keyboard navigation until I press the Alt key",IDC_EFFAPPEARANCE_KEYBOARDCUES,"button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 125, 285, 19 - PUSHBUTTON "Avbryt", IDCANCEL, 226, 165, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 226, 165, 50, 14 DEFPUSHBUTTON "OK", IDOK, 172, 165, 50, 14 END @@ -134,7 +134,7 @@ CONTROL "",IDC_SETTINGS_RESOLUTION,"msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 30, 137, 58, 17 LTEXT "Mindre",1815,9,137,21,8,NOT WS_GROUP - LTEXT "Større",1816,93,137,21,8,NOT WS_GROUP + LTEXT "Mere",1816,93,137,21,8,NOT WS_GROUP LTEXT "",IDC_SETTINGS_RESOLUTION_TEXT,10,157,100,10,NOT WS_GROUP | SS_CENTER GROUPBOX "&Farger",1817,125,127,115,43 COMBOBOX IDC_SETTINGS_BPP,131,137,103,80,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | @@ -171,7 +171,7 @@ POPUP "" BEGIN MENUITEM "&Attached", ID_MENU_ATTACHED - MENUITEM "&Primær", ID_MENU_PRIMARY + MENUITEM "&Primary", ID_MENU_PRIMARY MENUITEM SEPARATOR MENUITEM "&Identify", ID_MENU_IDENTIFY MENUITEM "E&genskaper", ID_MENU_PROPERTIES @@ -180,14 +180,14 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_SLIDEEFFECT "Slide effekter" - IDS_FADEEFFECT "Fade effekter" -END - -STRINGTABLE DISCARDABLE -BEGIN - IDS_STANDARDEFFECT "Vanlig" - IDS_CLEARTYPEEFFECT "Klartype" + IDS_SLIDEEFFECT "Slide effect" + IDS_FADEEFFECT "Fade effect" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_STANDARDEFFECT "Standard" + IDS_CLEARTYPEEFFECT "ClearType" END STRINGTABLE @@ -228,8 +228,8 @@ IDS_INACTWIN "Uaktiv vindu" IDS_ACTWIN "Aktiv vindu" IDS_WINTEXT "Vindu tekst" - IDS_MESSBOX "Meldingboks" - IDS_MESSTEXT "Meldingtekst" + IDS_MESSBOX "Melding boks" + IDS_MESSTEXT "Melding tekst" IDS_BUTTEXT "OK" END @@ -244,18 +244,18 @@ IDS_ELEMENT_7 "Valgt enhet" IDS_ELEMENT_8 "Vindu" IDS_ELEMENT_9 "Scrollbars" - IDS_ELEMENT_10 "3D objekter" + IDS_ELEMENT_10 "3D objects" IDS_ELEMENT_11 "Palette title" - IDS_ELEMENT_12 "Tegn tittel" + IDS_ELEMENT_12 "Symbol title" IDS_ELEMENT_13 "Captionbar" - IDS_ELEMENT_14 "Deaktivert meny elementer" + IDS_ELEMENT_14 "Deactivated menu elements" IDS_ELEMENT_15 "Dialog" IDS_ELEMENT_16 "Scrollbar controls" - IDS_ELEMENT_17 "Program bakgrunn" + IDS_ELEMENT_17 "Application background" IDS_ELEMENT_18 "Small captionbar" - IDS_ELEMENT_19 "Tegn avstand (horisontalt)" - IDS_ELEMENT_20 "Tegn avstand (vertikalt)" - IDS_ELEMENT_21 "Rask infomasjon" + IDS_ELEMENT_19 "Symbol distance (horizontal)" + IDS_ELEMENT_20 "Symbol distance (vertical)" + IDS_ELEMENT_21 "Quickinfo" IDS_ELEMENT_22 "Symbol" END Modified: trunk/reactos/dll/cpl/powercfg/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/lang/es-E… ============================================================================== --- trunk/reactos/dll/cpl/powercfg/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/powercfg/lang/es-ES.rc [iso-8859-1] Sat Apr 18 00:54:28 2009 @@ -5,7 +5,7 @@ LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL -IDD_PROPPAGEPOWERSHEMES DIALOGEX 0, 0, 252, 237 +IDD_PROPPAGEPOWERSHEMES DIALOGEX 0, 0, 262, 237 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Combinaciones de energía" FONT 8, "MS Shell Dlg" @@ -13,11 +13,11 @@ ICON IDI_ACDC, IDI_ACDC, 7, 7, 28, 22 LTEXT "Seleccione la combinación de energía cuya configuración sea la más adecuada para su equipo. Tenga en cuenta que, si cambia la configuración siguiente, se modificará la combinación seleccionada.", -1,37, 6, 209, 36 - GROUPBOX "C&ombinaciones de energía ", -1, 6, 43, 240, 50 + GROUPBOX "C&ombinaciones de energía ", -1, 6, 43, 250, 50 COMBOBOX IDC_ENERGYLIST, 14, 54, 224, 92, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL PUSHBUTTON "&Guardar como...", IDC_SAVEAS_BTN, 109, 72, 70, 14, WS_DISABLED PUSHBUTTON "E&liminar", IDC_DELETE_BTN, 183, 72, 55, 14, WS_DISABLED - GROUPBOX "Desconocido ", IDC_GRPDETAIL, 6, 95, 240, 136 + GROUPBOX "Desconocido ", IDC_GRPDETAIL, 6, 95, 250, 136 LTEXT "Cuando el equipo está:",IDC_SAT, 12, 109, 65, 14 LTEXT "Enchufado",IDC_SAC, 123, 110, 45, 15 ICON IDI_AC, IDC_IAC, 97, 108, 21, 20 @@ -37,12 +37,12 @@ COMBOBOX IDC_HYBERNATEDCLIST, 173, 209, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP END -IDD_PROPPAGEALARMS DIALOGEX DISCARDABLE 0, 0, 252, 237 +IDD_PROPPAGEALARMS DIALOGEX DISCARDABLE 0, 0, 262, 237 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Alarmas" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Alarma de batería baja ",-1, 6, 7, 239, 104 + GROUPBOX "Alarma de batería baja ",-1, 6, 7, 249, 104 CONTROL "Activar la a&larma de batería baja cuando la potencia alcance un nivel:",IDC_ALARM1, "Button",BS_AUTOCHECKBOX | WS_TABSTOP, 15, 17, 190, 15 LTEXT "Desconocido",IDC_ALARMVALUE1, 209, 20, 33, 10 @@ -58,7 +58,7 @@ LTEXT "Ejecutar programa:",-1, 95, 95, 55, 10 LTEXT "Desconocido",IDC_ALARMPROG1, 154, 95, 84, 10 - GROUPBOX "Alarma de batería crítica ",-1, 6, 120, 239, 106 + GROUPBOX "Alarma de batería crítica ",-1, 6, 120, 249, 106 CONTROL "Activar la a&larma de batería baja cuando la potencia alcance un nivel:",IDC_ALARM2, "Button",BS_AUTOCHECKBOX | WS_TABSTOP, 15, 131, 180, 15 LTEXT "Desconocido",IDC_ALARMVALUE2, 209, 133, 33, 10 @@ -75,21 +75,21 @@ LTEXT "Desconocido",IDC_ALARMPROG2, 154, 211, 84, 10 END -IDD_PROPPAGEADVANCED DIALOGEX DISCARDABLE 0, 0, 252, 237 +IDD_PROPPAGEADVANCED DIALOGEX DISCARDABLE 0, 0, 262, 237 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Opciones avanzadas" FONT 8, "MS Shell Dlg" BEGIN ICON IDI_ACDC,IDI_ACDC, 7, 7, 20, 20 LTEXT "Seleccione la configuración de ahorro de energía que desea usar.",-1, 37, 6, 207, 20 - GROUPBOX "Opciones ",-1, 6, 30, 240, 65 + GROUPBOX "Opciones ",-1, 6, 30, 250, 65 CONTROL "Mo&strar siempre el icono en la barra de tareas",IDC_SYSTRAYBATTERYMETER,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP, 17, 43, 220, 10 + WS_TABSTOP, 17, 43, 230, 10 CONTROL "S&olicitar una contraseña cuando el equipo se active tras un tiempo de inactividad",IDC_PASSWORDLOGON,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP, 17, 56, 220, 14 + WS_TABSTOP, 17, 56, 230, 14 CONTROL "&Atenuar monitor cuando esté funcionando con baterias",IDC_VIDEODIMDISPLAY,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP, 17, 78, 220, 10 - GROUPBOX "Botones de encendido ",-1, 6, 101, 240, 127 + WS_TABSTOP, 17, 78, 230, 10 + GROUPBOX "Botones de encendido ",-1, 6, 101, 250, 127 LTEXT "&Cuando cierre la tapa de mi ordenador portátil:", IDC_SLIDCLOSE, 15, 115, 222, 10 COMBOBOX IDC_LIDCLOSE, 15, 127, 220, 90, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP @@ -101,7 +101,7 @@ WS_VSCROLL | WS_TABSTOP END -IDD_PROPPAGEHIBERNATE DIALOGEX DISCARDABLE 0, 0, 252, 237 +IDD_PROPPAGEHIBERNATE DIALOGEX DISCARDABLE 0, 0, 262, 237 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Hibernación" FONT 8, "MS Shell Dlg" @@ -109,10 +109,10 @@ ICON IDI_HIBERNATE,IDI_HIBERNATE, 7, 7, 20, 20 LTEXT "Cuando su equipo hiberna, almacena lo que hay en memoria en el disco duro y luego se apaga. Cuando sale del modo de hibernación vuelve a su estado anterior. ", -1, 37, 6, 210, 35 - GROUPBOX "Hibernar ",-1, 6, 41, 240, 32 + GROUPBOX "Hibernar ",-1, 6, 41, 250, 32 CONTROL "Habilitar &hibernación",IDC_HIBERNATEFILE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP, 17, 55, 210, 10 - GROUPBOX "Espacio en disco para hibernación ",-1, 6, 80, 240, 76 + GROUPBOX "Espacio en disco para hibernación ",-1, 6, 80, 250, 76 LTEXT "Espacio libre en disco:",-1, 15, 95, 140, 10 LTEXT "Desconocido",IDC_FREESPACE, 160, 95, 80, 10 LTEXT "Espacio en disco requerido para hibernar:",-1, 15, 115, 140, 10 @@ -146,15 +146,15 @@ IDS_PowerActionNone2 "None" IDS_TIMEOUT1 "Tras 1 min" - IDS_TIMEOUT2 "Tras 2 mins" - IDS_TIMEOUT3 "Tras 3 mins" - IDS_TIMEOUT4 "Tras 5 mins" - IDS_TIMEOUT5 "Tras 10 mins" - IDS_TIMEOUT6 "Tras 15 mins" - IDS_TIMEOUT7 "Tras 20 mins" - IDS_TIMEOUT8 "Tras 25 mins" - IDS_TIMEOUT9 "Tras 30 mins" - IDS_TIMEOUT10 "Tras 45 mins" + IDS_TIMEOUT2 "Tras 2 min" + IDS_TIMEOUT3 "Tras 3 min" + IDS_TIMEOUT4 "Tras 5 min" + IDS_TIMEOUT5 "Tras 10 min" + IDS_TIMEOUT6 "Tras 15 min" + IDS_TIMEOUT7 "Tras 20 min" + IDS_TIMEOUT8 "Tras 25 min" + IDS_TIMEOUT9 "Tras 30 min" + IDS_TIMEOUT10 "Tras 45 min" IDS_TIMEOUT11 "Tras 1 hora" IDS_TIMEOUT12 "Tras 2 horas" IDS_TIMEOUT13 "Tras 3 horas" Modified: trunk/reactos/dll/cpl/sysdm/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/ja-JP.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/ja-JP.rc [iso-8859-1] Sat Apr 18 00:54:28 2009 @@ -1,129 +1,274 @@ LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT -RC_LICENSE RTDATA "resources/gpl.txt" - -IDD_PROPPAGEGENERAL DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +IDD_PROPPAGEGENERAL DIALOGEX 0, 0, 256, 218 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "SÊ" FONT 9, "MS UI Gothic", 0, 0, 0x0 BEGIN - LTEXT "VXe",-1,SYSTEM_COLUMN,LABELLINE(2),PROPSHEETWIDTH-SYSTEM_COLUMN-PROPSHEETPADDING(1),8 - LTEXT REACTOS_STR_PRODUCT_NAME,-1,SYSTEM_COLUMN+PROPSHEETPADDING(1),LABELLINE(3),PROPSHEETWIDTH-SYSTEM_COLUMN-PROPSHEETPADDING(1),8 - LTEXT "Version "REACTOS_STR_PRODUCT_VERSION,-1,SYSTEM_COLUMN+PROPSHEETPADDING(1),LABELLINE(4),PROPSHEETWIDTH-SYSTEM_COLUMN-PROPSHEETPADDING(1),8 - - LTEXT "Rs[^",-1,SYSTEM_COLUMN,LABELLINE(6),PROPSHEETWIDTH-SYSTEM_COLUMN-PROPSHEETPADDING(1),8 - LTEXT "",IDC_PROCESSORMANUFACTURER,SYSTEM_COLUMN+PROPSHEETPADDING(1),LABELLINE(7),PROPSHEETWIDTH-SYSTEM_COLUMN-PROPSHEETPADDING(1),8 - LTEXT "",IDC_PROCESSOR,SYSTEM_COLUMN+PROPSHEETPADDING(1),LABELLINE(8),PROPSHEETWIDTH-SYSTEM_COLUMN-PROPSHEETPADDING(1),8 - LTEXT "",IDC_PROCESSORSPEED,SYSTEM_COLUMN+PROPSHEETPADDING(1),LABELLINE(9),PROPSHEETWIDTH-SYSTEM_COLUMN-PROPSHEETPADDING(1),8 - LTEXT "",IDC_SYSTEMMEMORY,SYSTEM_COLUMN+PROPSHEETPADDING(1),LABELLINE(10),PROPSHEETWIDTH-SYSTEM_COLUMN-PROPSHEETPADDING(1),8 - - EDITTEXT IDC_LICENSEMEMO,PROPSHEETPADDING(1),LABELLINE(13),PROPSHEETWIDTH-PROPSHEETPADDING(2),PROPSHEETHEIGHT-LABELLINE(13)-PROPSHEETPADDING(1),ES_LEFT|WS_TABSTOP|WS_BORDER|WS_VSCROLL|WS_HSCROLL|WS_GROUP|ES_MULTILINE|ES_READONLY -END - -IDD_PROPPAGEHARDWARE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT + CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111 + LTEXT "VXe:", IDC_STATIC, 4, 132, 32, 9 + LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 144, 116, 9 + LTEXT "Version ", IDC_STATIC, 10, 153, 25, 9 + LTEXT REACTOS_STR_PRODUCT_VERSION, IDC_STATIC, 35, 153, 91, 9 + LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 162, 60, 9 + LTEXT "}V:", IDC_STATIC, 124, 132, 34, 9 + LTEXT "", IDC_MACHINELINE1, 130, 144, 118, 9 + LTEXT "", IDC_MACHINELINE2, 130, 153, 118, 9 + LTEXT "", IDC_MACHINELINE3, 130, 162, 118, 9 + LTEXT "", IDC_MACHINELINE4, 130, 171, 118, 9 + LTEXT "", IDC_MACHINELINE5, 130, 180, 118, 9 + CONTROL "<A HREF=""http://www.reactos.org/"">ReactOS z[y[W</A>Ös", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 20, 200, 140, 8 + PUSHBUTTON "CZXð\\¦(&L)...", IDC_LICENCE, 170, 199, 78, 13 +END + + +IDD_PROPPAGEHARDWARE DIALOGEX 0, 0, 256, 218 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "n[hEFA" FONT 9, "MS UI Gothic", 0, 0, 0x0 BEGIN - GROUPBOX "n[hEFA EBU[h",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) - LTEXT "n[hEFA EBU[hðgÁÄAn[hEFAÌCXg[AACXg[ACAæèOµA¨æÑÝèªÅ«Ü·B",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) - ICON IDI_DEVMGR, IDC_ICON1, PROPSHEETPADDING(2),LABELLINE(2), ICONSIZE, ICONSIZE, SS_ICON - PUSHBUTTON "n[hEFA EBU[h(&H)...",IDC_HARDWARE_WIZARD,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(5)+2,PROPSHEETPADDING(15),14 - - GROUPBOX "foCX }l[W",-1,PROPSHEETPADDING(1),LABELLINE(8)+5,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(7)+2 - ICON IDI_DEVMGR, IDC_ICON1, PROPSHEETPADDING(2),LABELLINE(10)-3,ICONSIZE, ICONSIZE, SS_ICON - LTEXT "foCX }l[WÍARs[^ÉCXg[³êÄ¢é·×ÄÌn[hEFA foCXðê\\¦µÜ·BÜ½AfoCX }l[WðgÁÄAefoCXÌvpeBðÏX·é±ÆªÅ«Ü·B",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(10)-3,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) - - PUSHBUTTON "foCX }l[W(&D)...",IDC_HARDWARE_DEVICE_MANAGER,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(13)+2,PROPSHEETPADDING(15),14 - - GROUPBOX "n[hEFA vt@C",-1,PROPSHEETPADDING(1),LABELLINE(16)+3,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) - ICON IDI_DEVMGR, IDC_ICON1, PROPSHEETPADDING(2),LABELLINE(18)-5, ICONSIZE, ICONSIZE, SS_ICON - LTEXT "n[hEFA vt@Cðg¤ÆAÊÌn[hEFAÌ\\¬ðÝèµAi[·é±ÆªÅ«Ü·B",0,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(18)-5,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) - PUSHBUTTON "n[hEFA vt@C(&W)...",IDC_HARDWARE_PROFILE,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(20)+2,PROPSHEETPADDING(15),14 -END - -IDD_PROPPAGEUSERPROFILE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "[U[ vt@C" -FONT 9, "MS UI Gothic", 0, 0, 0x0 -BEGIN - ICON IDI_DEVMGR, IDC_ICON1, PROPSHEETPADDING(1),LABELLINE(1), ICONSIZE, ICONSIZE, SS_ICON - LTEXT "[U[ vt@CÉÍAfXNgbvÌÝèÆOCÉÖ·éîñªÜÜêÜ·B[U[ÍAgp·éRs[^²ÆÉÙÈévt@Cðì¬·é©A·×ÄÌRs[^Å¯¶Ú®vt@CðIð·é±ÆªÅ«Ü·B",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(4) - LTEXT "±ÌRs[^Éi[³êÄ¢évt@C:",-1,PROPSHEETPADDING(1),LABELLINE(6),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(1) - CONTROL "",IDC_USERPROFILE_LIST,"SysListView32",LVS_REPORT|LVS_SINGLESEL|LVS_SHOWSELALWAYS|LVS_SORTASCENDING|WS_BORDER|WS_TABSTOP,PROPSHEETPADDING(1),LABELLINE(8),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(11),WS_EX_CLIENTEDGE - - PUSHBUTTON "í",IDC_USERPROFILE_DELETE,PROPSHEETPADDING(1),LABELLINE(20),60,LABELLINE(1)+2 - PUSHBUTTON "íÞÌÏX...",IDC_USERPROFILE_CHANGE,(PROPSHEETWIDTH/2)-30,LABELLINE(20),60,LABELLINE(1)+2 - PUSHBUTTON "Rs[æ...",IDC_USERPROFILE_COPY,PROPSHEETWIDTH-PROPSHEETPADDING(1)-60,LABELLINE(20),60,LABELLINE(1)+2 -END - -IDD_PROPPAGEADVANCED DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT + GROUPBOX "foCX }l[W", IDC_STATIC, 6, 7, 244, 61 + ICON IDI_DEVMGR, IDC_STATIC, 12, 18, 23, 21, SS_ICON + LTEXT "foCX }l[WÍRs[^É³êÄ¢é·×ÄÌn[hEFAð\\¦µÜ·B efoCXÌvpeBðÏX·éÉÍfoCX }l[WðgpµÄ¾³¢B", IDC_STATIC, 42, 18, 204, 24 + PUSHBUTTON "foCX }l[W(&D)...", IDC_HARDWARE_DEVICE_MANAGER, 154, 48, 90, 15 + + GROUPBOX "n[hEFA EBU[h", IDC_STATIC, 6, 79, 244, 61 + ICON IDI_DEVMGR, IDC_STATIC, 12, 90, 23, 21, SS_ICON + LTEXT "n[hEFA EBU[hÍn[hEFAÌCXg[AACXg[ACAæèOµAæèoµAÝèÌè¯ðµÜ·B", IDC_STATIC, 42, 90, 204, 24 + PUSHBUTTON "n[hEFA EBU[h(&H)...", IDC_HARDWARE_WIZARD, 154, 120, 90, 15 + + GROUPBOX "n[hEFA vt@C", IDC_STATIC, 6, 149, 244, 61 + ICON IDI_HARDPROF, IDC_STATIC, 12, 160, 23, 21, SS_ICON + LTEXT "n[hEFA vt@CÍÊÌn[hEFAÌ\\¬ðÝèµAi[·éû@ðñµÜ·B", IDC_STATIC, 42, 160, 204, 24 + PUSHBUTTON "n[hEFA vt@C(&W)...", IDC_HARDWARE_PROFILE, 154, 190, 90, 15 +END + + +IDD_PROPPAGEADVANCED DIALOGEX 0, 0, 256, 218 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Ú×Ýè" FONT 9, "MS UI Gothic", 0, 0, 0x0 BEGIN - GROUPBOX "ptH[}X",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) - ICON IDI_DEVMGR, IDC_ICON1, PROPSHEETPADDING(2),LABELLINE(2), ICONSIZE, ICONSIZE, SS_ICON - LTEXT "ptH[}X IvVÍAAvP[VªÇÌæ¤Éðg¤©ðÇµÜ·BÌg¢ûÍRs[^Ì¬xÉe¿µÜ·B",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) - PUSHBUTTON "ptH[}X IvV(&P)...",IDC_PERFOR,PROPSHEETWIDTH-PROPSHEETPADDING(20),LABELLINE(5)+2,PROPSHEETPADDING(18),14 - GROUPBOX "Â«Ï",-1,PROPSHEETPADDING(1),LABELLINE(8)+2,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) - ICON IDI_DEVMGR, IDC_ICON1, PROPSHEETPADDING(2),LABELLINE(10)-5, ICONSIZE, ICONSIZE, SS_ICON - LTEXT "Â«ÏÍAÁèÌíÞÌîñÌõæðwèµÜ·B",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(10)-5,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) - PUSHBUTTON "Â«Ï(&E)...",IDC_ENVVAR,PROPSHEETWIDTH-PROPSHEETPADDING(20),LABELLINE(12)+2,PROPSHEETPADDING(18),14 - GROUPBOX "N®Æñ(&S)",-1,PROPSHEETPADDING(1),LABELLINE(15)+3,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) - ICON IDI_DEVMGR, IDC_ICON1, PROPSHEETPADDING(2),LABELLINE(17)-5, ICONSIZE, ICONSIZE, SS_ICON - LTEXT "N®/ñIvVÍAN®û@ÆRs[^ªâ~·éG[ª¶µ½êÌû@ðwèµÜ·B",0,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(17)-5,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) - PUSHBUTTON "N®Æñ(&S)...",IDC_STAREC,PROPSHEETWIDTH-PROPSHEETPADDING(20),LABELLINE(19)+2,PROPSHEETPADDING(18),14 -END + LTEXT "±êçÙÆñÇÌÝèðÏX·éÉÍAdministrator ÀªKvÅ·B", IDC_STATIC, 12, 5, 236, 8 + GROUPBOX "ptH[}X", IDC_STATIC, 6, 18, 244, 50 + LTEXT "ptH[}X IvVÍAvP[VÌÌgpû@ð§äµÜ·B±ÌÝèÍRs[^Ì®ì¬xÉe¿µÜ·B", IDC_STATIC, 16, 29, 228, 17 + PUSHBUTTON "Ýè", IDC_PERFOR, 194, 48, 50, 15 + + GROUPBOX "[U[ vt@C", IDC_STATIC, 6,75,244,48 + LTEXT "OIÉÖAµ½fXNgbvÝè", IDC_STATIC, 16, 88, 228, 20 + PUSHBUTTON "Ýè", IDC_USERPROFILE, 194, 103, 50, 15 + + GROUPBOX "N®Æñ", IDC_STATIC, 6, 131, 244, 52 + LTEXT "N®Æñ IvVÅÍRs[^ÌN®û@ÆARs[^ªâ~·éG[ª¶êAÇ¤·é©ðÝèµÜ·B", IDC_STATIC, 16, 144, 228, 19 + PUSHBUTTON "Ýè", IDC_STAREC, 194, 162, 50, 15 + + PUSHBUTTON "Â«ÏÏ", IDC_ENVVAR, 84, 192, 80, 15 + PUSHBUTTON "G[ñ", IDC_ERRORREPORT, 170, 192, 80, 15 +END + + +IDD_HARDWAREPROFILES DIALOGEX 6, 18, 254, 234 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "n[hEFA vt@C" +FONT 9, "MS UI Gothic" +BEGIN + ICON IDI_HARDPROF, IDC_STATIC, 8, 11, 18, 20, SS_ICON + LTEXT "ÙÈén[hEFA\\¬Éí¹½n[hEFA vt@CðZbgAbvÅ«Ü·B N®Égp·évt@CðIðÅ«Ü·B", IDC_STATIC, 46, 11, 188, 25 + LTEXT "pÂ\\Èn[hEFA vt@C:", IDC_STATIC, 8, 41, 120, 8 + LISTBOX IDC_HRDPROFLSTBOX, 8, 52, 215, 54, LBS_NOTIFY + PUSHBUTTON "", IDC_HRDPROFUP, 232, 59, 15, 14, BS_ICON + PUSHBUTTON "", IDC_HRDPROFDWN, 232, 79, 15, 14, BS_ICON + PUSHBUTTON "vpeB(&P)", IDC_HRDPROFPROP, 8, 106, 50, 14 PUSHBUTTON "Rs[(&C)", IDC_HRDPROFCOPY, 63, 106, 50, 14 + PUSHBUTTON "¼OÌÏX(&R)", IDC_HRDPROFRENAME, 118, 106, 50, 14 + PUSHBUTTON "í(&D)", IDC_HRDPROFDEL, 173, 106, 50, 14 + + GROUPBOX "n[hEFA vt@CÌIð", IDC_STATIC, 7, 130, 240, 75 + LTEXT "ReactOS N®Ì®ì:", IDC_STATIC, 14, 142, 210, 8 + AUTORADIOBUTTON "n[hEFA vt@CªIð³êéÜÅÒÂ(&W)", IDC_HRDPROFWAIT, 14, 158, 133, 8, WS_GROUP + AUTORADIOBUTTON "êèÔàn[hEFA vt@CðIðµÈ¢êAXgÌêÔãðIð·é(&S)", IDC_HRDPROFSELECT, 14, 173, 190, 8 + LTEXT "b", IDC_STATIC, 65, 187, 35, 8 + EDITTEXT IDC_HRDPROFEDIT, 25, 185, 35, 12 + CONTROL "", IDC_HRDPROFUPDWN, "msctls_updown32", UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | WS_CHILD | WS_VISIBLE, 25, 185, 7, 10 + + DEFPUSHBUTTON "OK", IDOK, 143, 213, 50, 14 + PUSHBUTTON "LZ", IDCANCEL, 197, 213, 50, 14 +END + + +IDD_RENAMEPROFILE DIALOGEX 12, 26, 256, 52 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "vt@C¼ÌÏX" +FONT 9, "MS UI Gothic" +BEGIN + LTEXT "³Ì¼O:", IDC_STATIC, 5, 10, 20, 8 + LTEXT "", IDC_RENPROFEDITFROM, 30, 10, 160, 10 + LTEXT "Vµ¢¼O:", IDC_STATIC, 5, 30, 20, 8 + EDITTEXT IDC_RENPROFEDITTO, 30, 30, 160, 12 + + DEFPUSHBUTTON "OK", IDOK, 199, 9, 50, 14 + PUSHBUTTON "LZ", IDCANCEL, 199, 30, 50, 14 +END + + +IDD_USERPROFILE DIALOGEX 0, 0, 256, 218 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | DS_SETFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "[U[ vt@C" +FONT 9, "MS UI Gothic" +BEGIN + ICON IDI_USERPROF, IDC_STATIC, 6, 11, 16, 16, SS_ICON + LTEXT "[U[ vt@CÉÍAfXNgbvÌÝèÆ¼ÌOCÉÖ·éîñªÜÜêÜ·B ÙÈévt@Cðgp·éRs[^²ÆÉì¬µ½èAgp·éRs[^²ÆÉ¯¶[~Ovt@CðIð·é±ÆàÅ«Ü·B", + IDC_STATIC, 40, 11, 211, 35 + LTEXT "±ÌRs[^Éi[³êÄ¢évt@C:", IDC_STATIC, 16, 51, 204, 9 + CONTROL "", IDC_USERPROFILE_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, + 6, 66, 244, 85, WS_EX_CLIENTEDGE + PUSHBUTTON "íÞÌÏX", IDC_USERPROFILE_CHANGE, 90, 156, 50, 13 + PUSHBUTTON "í", IDC_USERPROFILE_DELETE, 145, 156, 50, 13 + PUSHBUTTON "Rs[æ", IDC_USERPROFILE_COPY, 200, 156, 50, 13 + + CONTROL "Vµ¢[U[AJEgðì¬·éÉÍARg[plÌ<A>[U[ AJEg</A>ðJ¢Ä¾³¢B", IDC_USERACCOUNT_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 7, 175, 245, 18 + + DEFPUSHBUTTON "OK", IDOK, 134, 200, 54, 13 + PUSHBUTTON "LZ", IDCANCEL, 196, 200, 54, 13 +END + + +IDD_STARTUPRECOVERY DIALOGEX 6, 18, 252, 280 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "N®Æñ" +FONT 9, "MS UI Gothic" +BEGIN + GROUPBOX "VXeÌN®", IDC_STATIC, 7, 12, 238, 95 + LTEXT "ùèÌIy[eBO VXe(&S):", IDC_STATIC, 14, 26, 100, 8 + COMBOBOX IDC_STRECOSCOMBO, 14, 37, 224, 46, CBS_DROPDOWNLIST + AUTOCHECKBOX "Iy[eBO VXeÌêð\\¦·éÔ(&T):", IDC_STRECLIST, 14, 56, 160, 8 + EDITTEXT IDC_STRRECLISTEDIT, 185, 54, 30, 12, ES_NUMBER + CONTROL "", IDC_STRRECLISTUPDWN, "msctls_updown32", UDS_WRAP | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | WS_CHILD | WS_VISIBLE, 0, 0, 8, 13 + LTEXT "b", IDC_STATIC, 223, 56, 18, 8 + AUTOCHECKBOX "KvÈÆ«ÉCIvVð\\¦·éÔ(&D):", IDC_STRRECREC, 14, 70, 170, 8 + EDITTEXT IDC_STRRECRECEDIT, 185, 68, 30, 12, ES_NUMBER + CONTROL "", IDC_STRRECRECUPDWN, "msctls_updown32", UDS_WRAP | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | WS_CHILD | WS_VISIBLE, 0, 0, 8, 13 + LTEXT "b", IDC_STATIC, 223, 70, 18, 8 + LTEXT "è®ÅN®IvVt@CðÒW·éêÍ[ÒW]ðNbNµÄ¾³¢", IDC_STATIC, 14, 89, 187, 8 + PUSHBUTTON "ÒW(&E)", IDC_STRRECEDIT, 188, 87, 50, 14 + + GROUPBOX "VXeáQ", IDC_STATIC, 7, 111, 238, 140 + AUTOCHECKBOX "VXe OÉCxgð«Þ(&W)", IDC_STRRECWRITEEVENT, 14, 124, 148, 10 + AUTOCHECKBOX "ÇÒÉxðM·é(&N)", IDC_STRRECSENDALERT, 14, 138, 148, 10 + AUTOCHECKBOX "©®IÉÄN®(&R)", IDC_STRRECRESTART, 14, 152, 145, 10 + + GROUPBOX "fobOîñÌ«Ý", IDC_STATIC, 12, 167, 227, 76 + COMBOBOX IDC_STRRECDEBUGCOMBO, 17, 182, 151, 49, CBS_DROPDOWNLIST + LTEXT "_v t@C(&F):", IDC_STATIC, 17, 202, 150, 8 + EDITTEXT IDC_STRRECDUMPFILE, 17, 210, 153, 12 + AUTOCHECKBOX "ù¶Ìt@CÉã«·é(&O)", IDC_STRRECOVERWRITE, 17, 228, 125, 10 + + DEFPUSHBUTTON "OK", IDOK, 141, 259, 50, 14 + PUSHBUTTON "LZ", IDCANCEL, 195, 259, 50, 14 +END + + +IDD_VIRTMEM DIALOGEX 6, 6, 223, 248 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "¼z" +FONT 9, "MS UI Gothic", 0, 0, 0x0 +BEGIN + LTEXT "hCu [{[ x]", IDC_STATIC, 12, 5, 96, 9 + LTEXT "y[WO t@C TCY (MB)", IDC_STATIC, 115, 5, 96, 9 + LISTBOX IDC_PAGEFILELIST, 10, 16, 204, 52, LBS_NOTIFY | LBS_USETABSTOPS + GROUPBOX "Ið³ê½hCuÌy[WO t@C TCY", IDC_DRIVEGROUP, 10, 70, 204, 104 + LTEXT "hCu:", IDC_STATIC, 20, 80, 20, 8 + LTEXT "", IDC_DRIVE, 88, 81, 100, 9 + LTEXT "ó«Ìæ:", IDC_STATIC, 20, 92, 56, 9 + LTEXT "", IDC_SPACEAVAIL, 88, 92, 104, 9 + LTEXT "úTCY (MB)(&I):", -1, 22, 118, 75, 9 + LTEXT "ÅåTCY (MB)(&X):", -1, 22, 131, 75, 9 + AUTORADIOBUTTON "JX^ TCY(&C)", IDC_CUSTOM, 20, 105, 54, 9, WS_GROUP + AUTORADIOBUTTON "VXeÇTCY(&Y)", IDC_SYSMANSIZE, 20, 145, 88, 9 + AUTORADIOBUTTON "y[WO t@CÈµ(&N)", IDC_NOPAGEFILE, 20, 158, 78,9 + EDITTEXT IDC_INITIALSIZE, 100, 114, 44, 13, NOT WS_BORDER, WS_EX_CLIENTEDGE + EDITTEXT IDC_MAXSIZE, 100, 129, 44, 13, NOT WS_BORDER, WS_EX_CLIENTEDGE + PUSHBUTTON "Ýè", IDC_SET, 158, 155, 50, 13 + + GROUPBOX "·×ÄÌhCuÌy[WO t@C TCY", IDC_TOTALGROUP, 10, 177, 204, 46 + LTEXT "Å¬À:", IDC_STATIC, 18, 188, 58, 9 + LTEXT "", IDC_MINIMUM, 88, 188, 100, 9 + LTEXT "§:", IDC_STATIC, 18, 199, 52, 9 + LTEXT "", IDC_RECOMMENDED, 88, 199, 100, 9 + LTEXT "»ÝÌèÄ:", IDC_STATIC, 18, 210, 66, 9 + LTEXT "", IDC_CURRENT, 88, 210, 100, 9 + + DEFPUSHBUTTON "OK", IDOK, 114, 232, 48, 13 + PUSHBUTTON "LZ", IDCANCEL, 168, 232, 48, 13 +END + IDD_ENVIRONMENT_VARIABLES DIALOGEX 6, 18, 252, 245 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Â«Ï" FONT 9, "MS UI Gothic", 0, 0, 0x0 BEGIN - GROUPBOX "[U[ÌÂ«Ï",-1,7,12,238,100 - LTEXT "Â«Ï(&V):",-1,14,24,224,8 - CONTROL "",IDC_USER_VARIABLE_LIST,"SysListView32",LVS_REPORT|LVS_SINGLESEL|LVS_SHOWSELALWAYS|LVS_SORTASCENDING|LVS_NOSORTHEADER|WS_VSCROLL|WS_HSCROLL|WS_TABSTOP,14,35,224,48,WS_EX_CLIENTEDGE - PUSHBUTTON "VK(&N)...",IDC_USER_VARIABLE_NEW,80,90,50,14 - PUSHBUTTON "ÒW(&E)...",IDC_USER_VARIABLE_EDIT,134,90,50,14 - PUSHBUTTON "í(&D)",IDC_USER_VARIABLE_DELETE,188,90,50,14 - - GROUPBOX "VXeÌÂ«Ï",-1,7,116,238,100 - LTEXT "Â«Ï(&A):",-1,14,128,224,8 - CONTROL "",IDC_SYSTEM_VARIABLE_LIST,"SysListView32",LVS_REPORT|LVS_SINGLESEL|LVS_SHOWSELALWAYS|LVS_SORTASCENDING|LVS_NOSORTHEADER|WS_VSCROLL|WS_HSCROLL|WS_TABSTOP,14,139,224,48,WS_EX_CLIENTEDGE - PUSHBUTTON "VK(&W)...",IDC_SYSTEM_VARIABLE_NEW,80,194,50,14 - PUSHBUTTON "ÒW(&I)...",IDC_SYSTEM_VARIABLE_EDIT,134,194,50,14 - PUSHBUTTON "í(&L)",IDC_SYSTEM_VARIABLE_DELETE,188,194,50,14 - - DEFPUSHBUTTON "OK",IDOK,141,224,50,14,WS_GROUP - PUSHBUTTON "LZ",IDCANCEL,195,224,50,14 + GROUPBOX "[UÏ", IDC_STATIC, 7, 12, 238, 100 + + CONTROL "", IDC_USER_VARIABLE_LIST, "SysListView32", + LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_NOSORTHEADER | + WS_VSCROLL | WS_HSCROLL | WS_TABSTOP, 14, 25, 224, 58, WS_EX_CLIENTEDGE + PUSHBUTTON "VK(&N)...", IDC_USER_VARIABLE_NEW, 80, 90, 50, 14 + PUSHBUTTON "ÒW(&E)...", IDC_USER_VARIABLE_EDIT, 134, 90, 50, 14 + PUSHBUTTON "í(&D)", IDC_USER_VARIABLE_DELETE, 188, 90, 50, 14 + GROUPBOX "VXeÏ", IDC_STATIC, 7, 116, 238, 100 + + CONTROL "", IDC_SYSTEM_VARIABLE_LIST, "SysListView32", + LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_NOSORTHEADER | + WS_VSCROLL | WS_HSCROLL | WS_TABSTOP, 14, 129, 224, 58, WS_EX_CLIENTEDGE + PUSHBUTTON "VK(&W)...", IDC_SYSTEM_VARIABLE_NEW, 80, 194, 50, 14 + PUSHBUTTON "ÒW(&I)...", IDC_SYSTEM_VARIABLE_EDIT, 134, 194, 50, 14 + PUSHBUTTON "í(&L)", IDC_SYSTEM_VARIABLE_DELETE, 188, 194, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 141, 224, 50, 14, WS_GROUP + PUSHBUTTON "LZ", IDCANCEL, 195, 224, 50, 14 END IDD_EDIT_VARIABLE DIALOGEX 10, 15, 227, 71 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Â«ÏÌÒW" -FONT 9, "MS UI Gothic", 0, 0, 0x0 -BEGIN - LTEXT "Ï¼(&N):",-1,7,14,50,8 - EDITTEXT IDC_VARIABLE_NAME,75,12,145,12,ES_AUTOHSCROLL - LTEXT "Ïl(&V):",-1,7,32,50,8 - EDITTEXT IDC_VARIABLE_VALUE,75,30,145,12,ES_AUTOHSCROLL - - DEFPUSHBUTTON "OK",IDOK,116,50,50,14,WS_GROUP - PUSHBUTTON "LZ",IDCANCEL,170,50,50,14 -END - - -STRINGTABLE -BEGIN - IDS_CPLSYSTEMNAME "VXe" - IDS_CPLSYSTEMDESCRIPTION "VXeÌî{îñð\\¦µAVXeân[hEFAÌlXÈÝèðÏXµÜ·B" - IDS_VARIABLE "Variable" - IDS_VALUE "Value" - IDS_NO_DUMP "(None)" - IDS_MINI_DUMP "Minidump(64KB)" - IDS_KERNEL_DUMP "Kernel dump" - IDS_FULL_DUMP "Complete dump" - -END +CAPTION "ÏÌÒW" +FONT 9, "MS UI Gothic", 0, 0, 0x0 +BEGIN + LTEXT "Ï¼(&N):", IDC_STATIC, 7, 14, 50, 8 + EDITTEXT IDC_VARIABLE_NAME, 75, 12, 145, 12, ES_AUTOHSCROLL + LTEXT "ÏÌl(&V):", IDC_STATIC, 7, 32, 50, 8 + EDITTEXT IDC_VARIABLE_VALUE, 75, 30, 145, 12, ES_AUTOHSCROLL + DEFPUSHBUTTON "OK", IDOK, 116, 50, 50, 14 + PUSHBUTTON "LZ", IDCANCEL, 170, 50, 50, 14 +END + + +IDD_LICENCE DIALOGEX 6, 5, 267, 159 +CAPTION "CZX" +FONT 9, "MS UI Gothic", 0, 0, 0x0 +STYLE DS_SHELLFONT | WS_BORDER | WS_THICKFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +BEGIN + EDITTEXT IDC_LICENCEEDIT, 6, 3, 255, 131, WS_VSCROLL | ES_READONLY | ES_MULTILINE + DEFPUSHBUTTON "OK", IDOK, 106, 142, 54, 13 +END + + +STRINGTABLE DISCARDABLE +BEGIN + IDS_CPLSYSTEMNAME "VXe" + IDS_CPLSYSTEMDESCRIPTION "Rs[^Ì³Ü´ÜÈVXe¨æÑn[hEFAÌÝèðÏX·éÉÍîñð²¾³¢B" + IDS_MEGABYTE "MB RAM" + IDS_GIGABYTE "GB RAM" + IDS_TERABYTE "TB RAM" + IDS_PETABYTE "PB RAM" + IDS_VARIABLE "ÂÏ" + IDS_VALUE "l" + IDS_NO_DUMP "(Èµ)" + IDS_MINI_DUMP "~j_v(64KB)" + IDS_KERNEL_DUMP "J[l _v" + IDS_FULL_DUMP "®S _v" + IDS_USERPROFILE_NAME "¼O" + IDS_USERPROFILE_SIZE "TCY" + IDS_USERPROFILE_TYPE "íÞ" + IDS_USERPROFILE_STATUS "óÔ" + IDS_USERPROFILE_MODIFIED "C³Ï" +END Modified: trunk/reactos/dll/cpl/sysdm/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/rsrc.rc?rev=… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/rsrc.rc [iso-8859-1] Sat Apr 18 00:54:28 2009 @@ -10,6 +10,7 @@ #include "lang/fr-FR.rc" #include "lang/id-ID.rc" #include "lang/it-IT.rc" +#include "lang/ja-JP.rc" #include "lang/no-NO.rc" #include "lang/pl-PL.rc" #include "lang/ru-RU.rc" @@ -20,6 +21,5 @@ /* #include "lang/da-DK.rc" #include "lang/hu-HU.rc" -#include "lang/ja-JP.rc" #include "lang/nl-NL.rc" */ Modified: trunk/reactos/dll/win32/syssetup/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/es… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/es-ES.rc [iso-8859-1] Sat Apr 18 00:54:28 2009 @@ -232,7 +232,7 @@ IDS_SYS_TOOLS "Herramientas del sistema" IDS_CMT_CHARMAP "Mapa de caracteres" IDS_CMT_KBSWITCH "Keyboard Layout Switcher" - IDS_CMT_DXDIAG "Launch ReactX-Diagnostic program" + IDS_CMT_DXDIAG "Ejecutar el programa de diagnóstico de ReactX" END @@ -269,7 +269,7 @@ IDS_SHORT_DOWNLOADER "Download !.lnk" IDS_SHORT_SERVICE "Administrador de Servicios.lnk" IDS_SHORT_DEVICE "Administrador de Dispositivos.lnk" - IDS_SHORT_MPLAY32 "Multimedia Player.lnk" + IDS_SHORT_MPLAY32 "Reproductor multimedia.lnk" IDS_SHORT_CALC "Calculadora.lnk" IDS_SHORT_REGEDIT "Editor de registro.lnk" IDS_SHORT_NOTEPAD "Bloc de notas.lnk" @@ -281,10 +281,10 @@ IDS_SHORT_MAGNIFY "Magnify.lnk" IDS_SHORT_RDESKTOP "Escritorio Remoto.lnk" IDS_SHORT_KBSWITCH "Keyboard Layout Switcher.lnk" - IDS_SHORT_EVENTVIEW "Event Viewer.lnk" - IDS_SHORT_MSCONFIG "System Configuration.lnk" - IDS_SHORT_SNDVOL32 "Volume Control.lnk" - IDS_SHORT_DXDIAG "ReactX Diagnostic.lnk" + IDS_SHORT_EVENTVIEW "Visor de sucesos.lnk" + IDS_SHORT_MSCONFIG "Configuración del sistema.lnk" + IDS_SHORT_SNDVOL32 "Control de volumen.lnk" + IDS_SHORT_DXDIAG "Diagnóstico de ReactX.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/no… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/no-NO.rc [iso-8859-1] Sat Apr 18 00:54:28 2009 @@ -201,8 +201,8 @@ BEGIN IDS_ACCESSORIES "Tilbehør" IDS_CMT_CALC "Start Kalkulator" - IDS_CMT_CMD "Åpne Kommandolinje" - IDS_CMT_EXPLORER "Start Utforsker" + IDS_CMT_CMD "Åpne command prompt" + IDS_CMT_EXPLORER "Start Explorer" IDS_CMT_NOTEPAD "Start Tekstredigering" IDS_CMT_REGEDIT "Start Registerredigering" IDS_CMT_WORDPAD "Start Dokument redigering" @@ -210,8 +210,8 @@ IDS_CMT_DEVMGMT "Start Enhetsbehandler" IDS_CMT_SERVMAN "Start Tjenestebehandler" IDS_CMT_RDESKTOP "Start Ekstern skrivebord" - IDS_CMT_EVENTVIEW "Start Hendelseliste" - IDS_CMT_MSCONFIG "Start Systemkonfigurasjon" + IDS_CMT_EVENTVIEW "Launch Event Viewer" + IDS_CMT_MSCONFIG "Launch System Configuration program" END STRINGTABLE @@ -223,10 +223,10 @@ STRINGTABLE BEGIN - IDS_SYS_TOOLS "Systemverktøy" + IDS_SYS_TOOLS "System verktøy" IDS_CMT_CHARMAP "Tegnkart" - IDS_CMT_KBSWITCH "Endre tastaturvalg" - IDS_CMT_DXDIAG "Kjør ReactX-Diagnose program" + IDS_CMT_KBSWITCH "Endre tastatur valg" + IDS_CMT_DXDIAG "Launch ReactX-Diagnostic program" END STRINGTABLE @@ -237,9 +237,9 @@ STRINGTABLE BEGIN - IDS_SYS_ENTERTAINMENT "Underholdning" - IDS_CMT_MPLAY32 "Start Multimedia avspiller" - IDS_CMT_SNDVOL32 "Start Volumkontroll" + IDS_SYS_ENTERTAINMENT "Entertainment" + IDS_CMT_MPLAY32 "Launch Multimedia Player" + IDS_CMT_SNDVOL32 "Launch Volume Control" END STRINGTABLE Modified: trunk/reactos/dll/win32/userenv/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/lang/no-… ============================================================================== --- trunk/reactos/dll/win32/userenv/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/userenv/lang/no-NO.rc [iso-8859-1] Sat Apr 18 00:54:28 2009 @@ -23,7 +23,7 @@ STRINGTABLE BEGIN - IDS_PROFILEPATH "%SystemDrive%\\Dokumenter og innstillinger" + IDS_PROFILEPATH "%SystemDrive%\\Documents and Settings" IDS_APPDATA "Programdata" IDS_DESKTOP "Skrivebord" IDS_FAVORITES "Favoritter" @@ -31,21 +31,21 @@ IDS_PROGRAMS "Start-Meny\\Programmer" IDS_ADMINTOOLS "Start-Meny\\Programmer\\Administrative verktøy" IDS_STARTUP "Start-Meny\\Programmer\\Oppstart" - IDS_MYDOCUMENTS "Mine dokumenter" - IDS_MYPICTURES "Mine dokumenter\\Mine bilder" - IDS_MYMUSIC "Mine dokumenter\\Min musikk" - IDS_MYVIDEOS "Mine dokumenter\\Mine filmer" + IDS_MYDOCUMENTS "Mine Dokumenter" + IDS_MYPICTURES "Mine Dokumenter\\Mine Bilder" + IDS_MYMUSIC "Mine Dokumenter\\Min Musikk" + IDS_MYVIDEOS "Mine Dokumenter\\Mine Filmer" IDS_TEMPLATES "Templates" IDS_RECENT "Siste" - IDS_SENDTO "Send til" + IDS_SENDTO "SendTo" IDS_PRINTHOOD "PrintHood" IDS_NETHOOD "NetHood" IDS_LOCALSETTINGS "Lokale innstillinger" IDS_LOCALAPPDATA "Lokale innstillinger\\Programdata" - IDS_TEMP "Lokale innstillinger\\Midlertidig" - IDS_CACHE "Lokale innstillinger\\Midlertidig internett filer" + IDS_TEMP "Lokale innstillinger\\Temp" + IDS_CACHE "Lokale innstillinger\\Temporary Internet Files" IDS_HISTORY "Lokale innstillinger\\Logg" - IDS_COOKIES "Informasjonkapsel" + IDS_COOKIES "Cookies" IDS_PROGRAMFILES "%SystemDrive%\\Programfiler" IDS_COMMONFILES "Common Files" END Modified: trunk/reactos/media/inf/NET_NIC.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/NET_NIC.inf?rev=… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/acpi.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/acpi.inf?rev=405… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/audio.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/audio.inf?rev=40… ============================================================================== --- trunk/reactos/media/inf/audio.inf [iso-8859-1] (original) +++ trunk/reactos/media/inf/audio.inf [iso-8859-1] Sat Apr 18 00:54:28 2009 @@ -73,5 +73,8 @@ [Strings.0407] AUDIOClassName = "Audio-, Video- und Gamecontroller" +[Strings.0416] +AUDIOClassName = "Controladores de som, vídeo e jogo" + [Strings.0427] AUDIOClassName = "Garso, vaizdo ir aidimu irenginiai" Modified: trunk/reactos/media/inf/cdrom.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/cdrom.inf?rev=40… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/cpu.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/cpu.inf?rev=4056… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/display.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/display.inf?rev=… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/fdc.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/fdc.inf?rev=4056… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/hdc.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/hdc.inf?rev=4056… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/keyboard.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/keyboard.inf?rev… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/machine.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/machine.inf?rev=… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/msmouse.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/msmouse.inf?rev=… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/netisa.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/netisa.inf?rev=4… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/ports.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/ports.inf?rev=40… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/scsi.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/scsi.inf?rev=405… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/usb.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/usb.inf?rev=4056… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/usbport.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/usbport.inf?rev=… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/usbstor.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/usbstor.inf?rev=… ============================================================================== Binary files - no diff available.

1 0

[dgoette] 378: * fix some bugs * strip down front page * get front page xhtml1-strict compatible
by dgoette＠svn.reactos.org 17 Apr '09

17 Apr '09

Author: dgoette Date: Sat Apr 18 00:51:44 2009 New Revision: 378 URL: http://svn.reactos.org/svn/reactos?rev=378&view=rev Log: * fix some bugs * strip down front page * get front page xhtml1-strict compatible Modified: branches/danny-web/www/www.reactos.org/compat/lib/Compat_Autoloader.class.p… branches/danny-web/www/www.reactos.org/compat/lib/HTML.class.php branches/danny-web/www/www.reactos.org/compat/lib/HTML_Item.class.php branches/danny-web/www/www.reactos.org/compat/lib/get/List_Item.class.php branches/danny-web/www/www.reactos.org/compat/lib/om/CUser.class.php branches/danny-web/www/www.reactos.org/compat/lib/view/Breadcrumb.class.php branches/danny-web/www/www.reactos.org/compat/lib/view/HTML_Category.class.… branches/danny-web/www/www.reactos.org/compat/lib/view/HTML_Group.class.php branches/danny-web/www/www.reactos.org/compat/lib/view/HTML_Vendor.class.php branches/danny-web/www/www.reactos.org/compat/lib/view/HTML_VendorInfo.clas… branches/danny-web/www/www.reactos.org/compat/lib/view/Home.class.php branches/danny-web/www/www.reactos.org/compat/lib/view/Item_Details.class.p… branches/danny-web/www/www.reactos.org/compat/lib/view/Item_Tests.class.php branches/danny-web/www/www.reactos.org/compat/notools/plugins.php Modified: branches/danny-web/www/www.reactos.org/compat/lib/Compat_Autoloader.class.p… URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/c… ============================================================================== --- branches/danny-web/www/www.reactos.org/compat/lib/Compat_Autoloader.class.p… [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/compat/lib/Compat_Autoloader.class.p… [iso-8859-1] Sat Apr 18 00:51:44 2009 @@ -44,6 +44,9 @@ elseif (file_exists(CDB_PATH.'lib/om/'.$class.'.class.php')) { require_once(CDB_PATH.'lib/om/'.$class.'.class.php'); } + elseif (file_exists(CDB_PATH.'lib/get/'.$class.'.class.php')) { + require_once(CDB_PATH.'lib/get/'.$class.'.class.php'); + } elseif (file_exists(CDB_PATH.'lib/view/'.$class.'.class.php')) { require_once(CDB_PATH.'lib/view/'.$class.'.class.php'); } Modified: branches/danny-web/www/www.reactos.org/compat/lib/HTML.class.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/c… ============================================================================== --- branches/danny-web/www/www.reactos.org/compat/lib/HTML.class.php [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/compat/lib/HTML.class.php [iso-8859-1] Sat Apr 18 00:51:44 2009 @@ -120,24 +120,6 @@ } echo ' - <script> -  - </script> </head> <body> <div id="top"> @@ -163,17 +145,6 @@ include('rsdb_setting.php'); include('rsdb_config.php'); - global $roscms_intern_account_level; - global $roscms_intern_login_check; - global $roscms_intern_login_check_username; - global $roscms_intern_account_group; - global $roscms_intern_usrgrp_sadmin; - global $roscms_intern_usrgrp_admin; - global $roscms_intern_usrgrp_dev; - global $roscms_intern_usrgrp_team; - global $roscms_intern_usrgrp_trans; - global $roscms_intern_usrgrp_user; - global $RSDB_langres; global $RSDB_intern_link_db_sec; echo ' @@ -190,53 +161,35 @@ </ol> <br /> + <div class="navTitle">Browse Database</div> + <ol> + <li><a href="'.$RSDB_intern_link_db_sec.'name&letter=all">By Name</a></li> + <li><a href="'.$RSDB_intern_link_db_sec.'category&cat=0">By Category</a></li> + <li><a href="'.$RSDB_intern_link_db_sec.'vendor&letter=all">By Vendor</a></li> + <li><a href="'.$RSDB_intern_link_db_sec.'rank">By Rank</a></li> + </ol> + <br /> + <div class="navTitle">Compatibility</div> <ol> <li><a href="'.$RSDB_intern_link_db_sec.'home">Overview</a></li> - <li><a href="'.$RSDB_intern_link_db_sec.'category&cat=0">Browse Database</a></li>'; - - if (isset($_GET['page']) && ($_GET['page'] == 'category' || $_GET['page'] == 'name' || $_GET['page'] == 'vendor' || $_GET['page'] == 'rank')) { - echo ' - <li><a href="'.$RSDB_intern_link_db_sec.'category&cat=0"> - By Category</a></li> - <li><a href="'.$RSDB_intern_link_db_sec.'name&letter=all"> - By Name</a></li> - <li><a href="'.$RSDB_intern_link_db_sec.'vendor&letter=all"> - By Vendor</a></li> - <li><a href="'.$RSDB_intern_link_db_sec.'rank"> - By Rank</a></li>'; - } - - echo ' - <li id="noscriptsearchbar" style="display: block"><a href="'.$RSDB_intern_link_db_sec.'search">Search</a></li> - <li><a href="'.$RSDB_intern_link_db_sec.'submit">Submit Application</a></li> - <li><a href="'.$RSDB_intern_link_db_sec.'help">Help & FAQ</a></li> - </ol> - <br /> - - <div class="navTitle">Search</div> - <ol> - <li> - <div id="ajaxsearchbar" align="center" style="display: none"> - <div align="center"> - <label for="searchbar" accesskey="s"></label> - <input name="searchbar" type="text" id="searchbar" tabindex="0" onkeyup="'."loadItemList(this.value,'bar','comp','ajaxloadbar','sresultbar');".'" size="17" maxlength="50" style="font-family: Verdana; font-size: x-small; font-style: normal;" /> - </div> - <div id="sresultbar" style="display: none" align="left"></div> - <div style="text-align: center;"> - <img id="ajaxloadbar" src="images/ajax_loading.gif" style="display: none" /> - </div> - </li> - </ol> - <br /> - - <script type="text/javascript"> -  - </script> - - <div class="navTitle">Language</div> - <ol> - <li> - <div align="center">'; + <li><a href="'.$RSDB_intern_link_db_sec.'submit">Submit Application</a></li> + <li><a href="'.$RSDB_intern_link_db_sec.'help">Help & FAQ</a></li> + </ol> + <br /> + + <div class="navTitle"><label for="searchbar" accesskey="s">Search</label></div> + <ol> + <li> + <input name="searchbar" type="text" id="searchbar" tabindex="0" size="17" maxlength="50" style="font-family: Verdana; font-size: x-small; font-style: normal;" /> + <button>></button> + </li> + </ol> + <br /> + + <div class="navTitle">Language</div> + <ol> + <li>'; // get selected language if (empty($_GET['lang']) && isset($_COOKIE['roscms_usrset_lang'])) { @@ -294,10 +247,10 @@ </table> - <hr size="1" /> + <hr /> <address style="text-align:center"> - <a href="http://www.reactos.org" onmousedown="'."return clk(this.href,'res','');".'">ReactOS</a> is a registered trademark or a trademark of <a href="http://www.reactos.org/?page=foundation">ReactOS Foundation</a> in the United States and other countries.<br /> - Copyright © Klemens Friedl 2005-'.date('Y').', All rights reserved. + <a href="http://www.reactos.org">ReactOS</a> is a registered trademark or a trademark of <a href="http://www.reactos.org/?page=foundation">ReactOS Foundation</a> in the United States and other countries.<br /> + Copyright © Klemens Friedl 2005-2009, All rights reserved. </address> </body> Modified: branches/danny-web/www/www.reactos.org/compat/lib/HTML_Item.class.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/c… ============================================================================== --- branches/danny-web/www/www.reactos.org/compat/lib/HTML_Item.class.php [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/compat/lib/HTML_Item.class.php [iso-8859-1] Sat Apr 18 00:51:44 2009 @@ -265,6 +265,7 @@ </table></td> </tr> </table> -<? +<?php } // end of member function header -} +} +?> Modified: branches/danny-web/www/www.reactos.org/compat/lib/get/List_Item.class.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/c… ============================================================================== --- branches/danny-web/www/www.reactos.org/compat/lib/get/List_Item.class.php [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/compat/lib/get/List_Item.class.php [iso-8859-1] Sat Apr 18 00:51:44 2009 @@ -18,21 +18,11 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* - * ReactOS Support Database System - RSDB - * - * (c) by Klemens Friedl <frik85> - * - * 2005 - 2006 - */ - - - // To prevent hacking activity: - if ( !defined('RSDB') ) - { - die(" "); - } - +class List_Item +{ + + public function __construct() + { ?> <base href="<?php echo $RSDB_intern_path_server.$RSDB_intern_path; ?>" /> <table width="100%" border="0" > @@ -241,3 +231,7 @@ </td> </tr> </table> +<?php + } +} +?> Modified: branches/danny-web/www/www.reactos.org/compat/lib/om/CUser.class.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/c… ============================================================================== --- branches/danny-web/www/www.reactos.org/compat/lib/om/CUser.class.php [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/compat/lib/om/CUser.class.php [iso-8859-1] Sat Apr 18 00:51:44 2009 @@ -18,44 +18,40 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* - * ReactOS Support Database System - RSDB - * - * (c) by Klemens Friedl <frik85> - * - * 2005 - 2006 - */ +class CUser +{ - // To prevent hacking activity: - if ( !defined('RSDB') ) - { - die(" "); - } + + // Get the user name from the RosCMS user table + public static function getName($user_id) { + + require_once(ROSCMS_PATH.'lib/RosCMS_Autoloader.class.php'); + $name = Subsystem::getUserName($user_id); + if ($name !== false) { + return $name; + } + return ''; + } // end of member function getName - $roscms_connected = 1; - - function usrfunc_GetUsername($RSDB_TEMP_getusrid) { // Get the user name from the RosCMS user table - require_once(ROSCMS_PATH.'lib/RosCMS_Autoloader.class.php'); - $RSDB_USER_name = Subsystem::getUserName($RSDB_TEMP_getusrid); - if ($RSDB_USER_name !== false) { - return $RSDB_USER_name; - } - return ''; - } - - function usrfunc_IsAdmin($RSDB_TEMP_getusrid) { // Check if the user is an developer, admin or super admin + // Check if the user is an developer, admin or super admin + public static function isAdmin($user_id) { //@IMPLEMENT Usergroup check return false; - } + } // end of member function isAdmin - function usrfunc_IsModerator($RSDB_TEMP_getusrid) { // Check if the user is an RSDB Moderator + + + public static function isModerator($user_id) { // Check if the user is an RSDB Moderator //@IMPLEMENT Usergroup check - return false; - } - + return false; + } // end of member function isModerator + + + +} // end of class CUser ?> Modified: branches/danny-web/www/www.reactos.org/compat/lib/view/Breadcrumb.class.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/c… ============================================================================== --- branches/danny-web/www/www.reactos.org/compat/lib/view/Breadcrumb.class.php [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/compat/lib/view/Breadcrumb.class.php [iso-8859-1] Sat Apr 18 00:51:44 2009 @@ -122,12 +122,12 @@ // check if entry exists and is visible elseif ($param > 0 && $param_type === self::PARAM_ENTRY) { - $stmt=CDBConnection::getInstance()->prepare("SELECT grpentr_id, grpentr_category, grpentr_name FROM rsdb_groups WHERE grpentr_visible = '1' AND grpentr_id = :group_id") ; + $stmt=CDBConnection::getInstance()->prepare("SELECT grpentr_category, grpentr_name FROM rsdb_groups WHERE grpentr_visible = '1' AND grpentr_id = :group_id") ; $stmt->bindParam('group_id',$param,PDO::PARAM_INT); $stmt->execute(); - $category_id = $stmt->fetchOnce(PDO::FETCH_ASSOC); - - if ($group === false) { + $category_id = $stmt->fetchColumn(); + + if ($category_id === false) { echo 'Unknown Group'; return; } Modified: branches/danny-web/www/www.reactos.org/compat/lib/view/HTML_Category.class.… URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/c… ============================================================================== --- branches/danny-web/www/www.reactos.org/compat/lib/view/HTML_Category.class.… [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/compat/lib/view/HTML_Category.class.… [iso-8859-1] Sat Apr 18 00:51:44 2009 @@ -24,6 +24,8 @@ protected function body () { global $RSDB_intern_link_db_sec; + global $RSDB_intern_link_group; + global $RSDB_intern_link_vendor_id_EX; // show breadcrumb if (isset($_GET['cat'])) { Modified: branches/danny-web/www/www.reactos.org/compat/lib/view/HTML_Group.class.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/c… ============================================================================== --- branches/danny-web/www/www.reactos.org/compat/lib/view/HTML_Group.class.php [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/compat/lib/view/HTML_Group.class.php [iso-8859-1] Sat Apr 18 00:51:44 2009 @@ -24,8 +24,13 @@ protected function body() { - - + global $RSDB_intern_user_id; + global $RSDB_SET_group; + global $RSDB_intern_link_vendor_sec; + global $RSDB_intern_link_item; + + + new Breadcrumb(Breadcrumb::MODE_TREE, $_GET['group'], Breadcrumb::PARAM_ENTRY); $stmt=CDBConnection::getInstance()->prepare("SELECT * FROM rsdb_groups WHERE grpentr_visible = '1' AND grpentr_id = :group_id AND grpentr_comp = '1' ORDER BY grpentr_name ASC") ; $stmt->bindParam('group_id',$RSDB_SET_group,PDO::PARAM_STR); @@ -290,7 +295,7 @@ <td width="40%" valign="top"> <?php - if (isset($_GET['group2']) && ($_GET['group2'] == '' || $_GET['group2'] == 'overview')) { + if (!isset($_GET['group2']) || ($_GET['group2'] == '' || $_GET['group2'] == 'overview')) { $stmt=CDBConnection::getInstance()->prepare("SELECT * FROM rsdb_item_comp WHERE comp_groupid = :group_id AND comp_visible = '1' ORDER BY comp_award DESC, comp_appversion DESC, comp_osversion DESC LIMIT 1"); } else { @@ -300,7 +305,7 @@ } $stmt->bindParam('group_id',$RSDB_SET_group,PDO::PARAM_STR); $stmt->execute(); - $result_version_newest = $stmt->fetch(PDO::FETCH_ASSOC);; + $result_version_newest = $stmt->fetchOnce(PDO::FETCH_ASSOC); echo "<h3 align=\"center\"><font size=\"2\">".$result_entry_vendor['vendor_name']."</font> ".$result_version_newest['comp_name']."</h3>"; ?> @@ -761,7 +766,7 @@ <?php } // end if {$result_page['grpentr_type'] == "default"} } - if (usrfunc_IsModerator($RSDB_intern_user_id)) { + if (CUser::isModerator($RSDB_intern_user_id)) { $stmt=CDBConnection::getInstance()->prepare("SELECT * FROM rsdb_groups WHERE grpentr_visible = '1' AND grpentr_id = :group_id AND grpentr_comp = '1'") ; $stmt->bindParam('group_id',$RSDB_SET_group,PDO::PARAM_STR); @@ -807,7 +812,7 @@ // Edit application group data: - if ($RSDB_TEMP_pmod == "ok" && $RSDB_SET_group != "" && $RSDB_TEMP_appgroup != "" && $RSDB_TEMP_description != "" && $RSDB_TEMP_category != "" && $RSDB_TEMP_vendor != "" && usrfunc_IsModerator($RSDB_intern_user_id)) { + if ($RSDB_TEMP_pmod == "ok" && $RSDB_SET_group != "" && $RSDB_TEMP_appgroup != "" && $RSDB_TEMP_description != "" && $RSDB_TEMP_category != "" && $RSDB_TEMP_vendor != "" && CUser::isModerator($RSDB_intern_user_id)) { // Update group entry: $stmt=CDBConnection::getInstance()->prepare("UPDATE rsdb_groups SET grpentr_name = :new_name, grpentr_category = :new_category, grpentr_vendor = :new_vendor, grpentr_description = :new_description WHERE grpentr_id = :group_id"); $stmt->bindParam('new_name',$RSDB_TEMP_appgroup,PDO::PARAM_STR); @@ -832,7 +837,7 @@ } // Special request: - if ($RSDB_TEMP_pmod == "ok" && $RSDB_TEMP_txtreq1 != "" && $RSDB_TEMP_txtreq2 != "" && usrfunc_IsModerator($RSDB_intern_user_id)) { + if ($RSDB_TEMP_pmod == "ok" && $RSDB_TEMP_txtreq1 != "" && $RSDB_TEMP_txtreq2 != "" && CUser::isModerator($RSDB_intern_user_id)) { $stmt=CDBConnection::getInstance()->prepare("INSERT INTO rsdb_logs ( log_id, log_date, log_usrid, log_usrip, log_level, log_action, log_title, log_description, log_category, log_badusr, log_referrer, log_browseragent, log_read, log_taskdone_usr) VALUES ('', NOW(), :user_id, :ip, 'low', 'request', :title, :description, 'user_moderator', '0', :referrer, :user_agent, ';', '0')"); $stmt->bindParam('user_id',$RSDB_intern_user_id,PDO::PARAM_STR); $stmt->bindParam('ip',$RSDB_ipaddr,PDO::PARAM_STR); @@ -843,7 +848,7 @@ $stmt->execute(); } // Report spam: - if ($RSDB_TEMP_pmod == "ok" && $RSDB_TEMP_txtspam != "" && usrfunc_IsModerator($RSDB_intern_user_id)) { + if ($RSDB_TEMP_pmod == "ok" && $RSDB_TEMP_txtspam != "" && CUser::isModerator($RSDB_intern_user_id)) { $stmt=CDBConnection::getInstance()->prepare("UPDATE rsdb_groups SET grpentr_visible = '3' WHERE grpentr_id = :group_id"); $stmt->bindParam('group_id',$RSDB_SET_group,PDO::PARAM_STR); $stmt->execute(); @@ -858,7 +863,7 @@ $temp_verified = "yes"; } if ($result_maintainer_group['grpentr_checked'] == "1" || $result_maintainer_group['grpentr_checked'] == "no") { - if ($RSDB_TEMP_pmod == "ok" && $RSDB_TEMP_verified == "done" && usrfunc_IsModerator($RSDB_intern_user_id)) { + if ($RSDB_TEMP_pmod == "ok" && $RSDB_TEMP_verified == "done" && CUser::isModerator($RSDB_intern_user_id)) { $stmt=CDBConnection::getInstance()->prepare("UPDATE rsdb_groups SET grpentr_checked = :checked WHERE grpentr_id = :group_id"); $stmt->bindParam('checked',$temp_verified,PDO::PARAM_STR); $stmt->bindParam('group_id',$RSDB_SET_group,PDO::PARAM_STR); @@ -1170,14 +1175,14 @@ <br /> <?php - if (usrfunc_IsAdmin($RSDB_intern_user_id)) { + if (CUser::isAdmin($RSDB_intern_user_id)) { $RSDB_TEMP_padmin = ""; $RSDB_TEMP_done = ""; if (array_key_exists("padmin", $_POST)) $RSDB_TEMP_padmin=htmlspecialchars($_POST["padmin"]); if (array_key_exists("done", $_POST)) $RSDB_TEMP_done=htmlspecialchars($_POST["done"]); - if ($RSDB_TEMP_padmin == "ok" && $RSDB_TEMP_done != "" && usrfunc_IsAdmin($RSDB_intern_user_id)) { + if ($RSDB_TEMP_padmin == "ok" && $RSDB_TEMP_done != "" && CUser::isAdmin($RSDB_intern_user_id)) { $stmt=CDBConnection::getInstance()->prepare("UPDATE rsdb_logs SET log_taskdone_usr = :user_id WHERE log_id = :log_id"); $stmt->bindParam('user_id',$RSDB_intern_user_id,PDO::PARAM_STR); $stmt->bindParam('log_id',$RSDB_TEMP_done,PDO::PARAM_STR); Modified: branches/danny-web/www/www.reactos.org/compat/lib/view/HTML_Vendor.class.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/c… ============================================================================== --- branches/danny-web/www/www.reactos.org/compat/lib/view/HTML_Vendor.class.php [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/compat/lib/view/HTML_Vendor.class.php [iso-8859-1] Sat Apr 18 00:51:44 2009 @@ -120,7 +120,7 @@ <?php } - if (usrfunc_IsModerator($RSDB_intern_user_id)) { + if (CUser::isModerator($RSDB_intern_user_id)) { $stmt=CDBConnection::getInstance()->prepare("SELECT * FROM rsdb_item_vendor WHERE vendor_visible = '1' AND vendor_id = :vendor_id LIMIT 1"); $stmt->bindParam('vendor_id',@$_GET['vendor'],PDO::PARAM_STR); @@ -156,7 +156,7 @@ if (array_key_exists("txtinfo", $_POST)) $RSDB_TEMP_txtinfo=htmlspecialchars($_POST["txtinfo"]); // Edit application group data: - if ($RSDB_TEMP_pmod == "ok" && isset($_GET['page']) && $_GET['page'] == "vendor" && $RSDB_TEMP_vendname != "" && $RSDB_TEMP_txturl != "" && usrfunc_IsModerator($RSDB_intern_user_id)) { + if ($RSDB_TEMP_pmod == "ok" && isset($_GET['page']) && $_GET['page'] == "vendor" && $RSDB_TEMP_vendname != "" && $RSDB_TEMP_txturl != "" && CUser::isModerator($RSDB_intern_user_id)) { // Submit vendor entry: $stmt=CDBConnection::getInstance()->prepare("INSERT INTO rsdb_item_vendor ( vendor_id, vendor_name, vendor_visible, vendor_fullname, vendor_url, vendor_email, vendor_infotext, vendor_usrid, vendor_usrip, vendor_date, vendor_checked ) VALUES ('', :name, '1', :fullname, :url, :email, :info, :user_id, :ip, NOW() , 'yes')"); @@ -178,7 +178,7 @@ } // Special request: - if ($RSDB_TEMP_pmod == "ok" && $RSDB_TEMP_txtreq1 != "" && $RSDB_TEMP_txtreq2 != "" && usrfunc_IsModerator($RSDB_intern_user_id)) { + if ($RSDB_TEMP_pmod == "ok" && $RSDB_TEMP_txtreq1 != "" && $RSDB_TEMP_txtreq2 != "" && CUser::isModerator($RSDB_intern_user_id)) { $stmt=CDBConnection::getInstance()->prepare("INSERT INTO rsdb_logs (log_id, log_date, log_usrid, log_usrip, log_level, log_action, log_title, log_description, log_category, log_badusr, log_referrer, log_browseragent, log_read, log_taskdone_usr ) VALUES ('', NOW() , :user_id, :ip, 'low', 'request', :title, :description, 'user_moderator', '0', :referrer, :user_agent, ';', '0')"); $stmt->bindParam('user_id',$RSDB_intern_user_id,PDO::PARAM_STR); @@ -284,14 +284,14 @@ <br /> <?php - if (usrfunc_IsAdmin($RSDB_intern_user_id)) { + if (CUser::isAdmin($RSDB_intern_user_id)) { $RSDB_TEMP_padmin = ""; $RSDB_TEMP_done = ""; if (array_key_exists("padmin", $_POST)) $RSDB_TEMP_padmin=htmlspecialchars($_POST["padmin"]); if (array_key_exists("done", $_POST)) $RSDB_TEMP_done=htmlspecialchars($_POST["done"]); - if ($RSDB_TEMP_padmin == "ok" && $RSDB_TEMP_done != "" && usrfunc_IsAdmin($RSDB_intern_user_id)) { + if ($RSDB_TEMP_padmin == "ok" && $RSDB_TEMP_done != "" && CUser::isAdmin($RSDB_intern_user_id)) { $stmt=CDBConnection::getInstance()->prepare("UPDATE rsdb_logs SET log_taskdone_usr = :user_id WHERE log_id = :log_id LIMIT 1"); $stmt->bindParam('user_id',$RSDB_intern_user_id,PDO::PARAM_STR); $stmt->bindParam('log_id',$RSDB_TEMP_done,PDO::PARAM_STR); Modified: branches/danny-web/www/www.reactos.org/compat/lib/view/HTML_VendorInfo.clas… URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/c… ============================================================================== --- branches/danny-web/www/www.reactos.org/compat/lib/view/HTML_VendorInfo.clas… [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/compat/lib/view/HTML_VendorInfo.clas… [iso-8859-1] Sat Apr 18 00:51:44 2009 @@ -310,7 +310,7 @@ <p> </p> <?php - if (usrfunc_IsModerator($RSDB_intern_user_id)) { + if (CUser::isModerator($RSDB_intern_user_id)) { $stmt=CDBConnection::getInstance()->prepapare("SELECT * FROM rsdb_item_vendor WHERE vendor_visible = '1' AND vendor_id = :vendor_id LIMIT 1"); $stmt->bindParam('vendor_id',@$_GET['vendor'],PDO::PARAM_STR); @@ -347,7 +347,7 @@ // Edit application group data: - if ($RSDB_TEMP_pmod == "ok" && isset($_GET['vendor']) && $_GET['vendor'] != '' && $RSDB_TEMP_vendname != "" && $RSDB_TEMP_txturl != "" && usrfunc_IsModerator($RSDB_intern_user_id)) { + if ($RSDB_TEMP_pmod == "ok" && isset($_GET['vendor']) && $_GET['vendor'] != '' && $RSDB_TEMP_vendname != "" && $RSDB_TEMP_txturl != "" && CUser::isModerator($RSDB_intern_user_id)) { // Update group entry: $stmt=CDBConnection::getInstance()->prepare("UPDATE rsdb_item_vendor SET vendor_name = :name, vendor_fullname = :fullname, vendor_url = :url, vendor_email = :email, vendor_infotext = :info WHERE vendor_id = :vendor_id LIMIT 1"); $stmt->bindParam('name',$RSDB_TEMP_vendname,PDO::PARAM_STR); @@ -367,7 +367,7 @@ } // Special request: - if ($RSDB_TEMP_pmod == "ok" && $RSDB_TEMP_txtreq1 != "" && $RSDB_TEMP_txtreq2 != "" && usrfunc_IsModerator($RSDB_intern_user_id)) { + if ($RSDB_TEMP_pmod == "ok" && $RSDB_TEMP_txtreq1 != "" && $RSDB_TEMP_txtreq2 != "" && CUser::isModerator($RSDB_intern_user_id)) { $stmt=CDBConnection::getInstance()->prepare("INSERT INTO rsdb_logs (log_id, log_date, log_usrid, log_usrip, log_level, log_action, log_title, log_description, log_category, log_badusr, log_referrer, log_browseragent, log_read, log_taskdone_usr) VALUES ('', NOW(), :user_id, :ip, 'low', 'request', :title, :description, 'user_moderator', '0', :referrer, :user_agent, ';', '0')"); $stmt->bindParam('user_id',$RSDB_intern_user_id,PDO::PARAM_STR); $stmt->bindParam('ip',$RSDB_ipaddr,PDO::PARAM_STR); @@ -378,7 +378,7 @@ $stmt->execute(); } // Report spam: - if ($RSDB_TEMP_pmod == "ok" && $RSDB_TEMP_txtspam != "" && usrfunc_IsModerator($RSDB_intern_user_id)) { + if ($RSDB_TEMP_pmod == "ok" && $RSDB_TEMP_txtspam != "" && CUser::isModerator($RSDB_intern_user_id)) { $stmt=CDBConnection::getInstance()->prepare("UPDATE rsdb_item_vendor SET vendor_visible = '3' WHERE vendor_id = :vendor_id LIMIT 1"); $stmt->bindParam('vendor_id',@$_GET['vendor'],PDO::PARAM_STR); $stmt->execute(); @@ -392,7 +392,7 @@ $temp_verified = "yes"; } if ($result_maintainer_vendor['vendor_checked'] == "1" || $result_maintainer_vendor['vendor_checked'] == "no") { - if ($RSDB_TEMP_pmod == "ok" && $RSDB_TEMP_verified == "done" && usrfunc_IsModerator($RSDB_intern_user_id)) { + if ($RSDB_TEMP_pmod == "ok" && $RSDB_TEMP_verified == "done" && CUser::isModerator($RSDB_intern_user_id)) { $stmt=CDBConnection::getInstance()->prepare("UPDATE rsdb_item_vendor SET vendor_checked = :checked WHERE vendor_id = :vendor_id LIMIT 1"); $stmt->bindParam('checked',$temp_verified,PDO::PARAM_STR); $stmt->bindParam('vendor_id',@$_GET['vendor'],PDO::PARAM_STR); @@ -627,14 +627,14 @@ <br /> <?php - if (usrfunc_IsAdmin($RSDB_intern_user_id)) { + if (CUser::isAdmin($RSDB_intern_user_id)) { $RSDB_TEMP_padmin = ""; $RSDB_TEMP_done = ""; if (array_key_exists("padmin", $_POST)) $RSDB_TEMP_padmin=htmlspecialchars($_POST["padmin"]); if (array_key_exists("done", $_POST)) $RSDB_TEMP_done=htmlspecialchars($_POST["done"]); - if ($RSDB_TEMP_padmin == "ok" && $RSDB_TEMP_done != "" && usrfunc_IsAdmin($RSDB_intern_user_id)) { + if ($RSDB_TEMP_padmin == "ok" && $RSDB_TEMP_done != "" && CUser::isAdmin($RSDB_intern_user_id)) { $stmt=CDBConnection::getInstance()->prepare("UPDATE rsdb_logs SET log_taskdone_usr = :user_id WHERE log_id = :log_id"); $stmt->bindParam('user_id',$RSDB_intern_user_id,PDO::PARAM_STR); $stmt->bindParam('log_id',$RSDB_TEMP_done,PDO::PARAM_STR); Modified: branches/danny-web/www/www.reactos.org/compat/lib/view/Home.class.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/c… ============================================================================== --- branches/danny-web/www/www.reactos.org/compat/lib/view/Home.class.php [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/compat/lib/view/Home.class.php [iso-8859-1] Sat Apr 18 00:51:44 2009 @@ -26,158 +26,30 @@ protected function body( ) { - global $RSDB_intern_index_php; global $RSDB_intern_link_db_sec; global $RSDB_intern_user_id; global $RSDB_intern_loginsystem_fullpath; global $RSDB_intern_link_item_comp; + // get number of entries + $stmt=CDBConnection::getInstance()->prepare("SELECT COUNT(*) FROM rsdb_groups WHERE grpentr_visible = '1'"); + $stmt->execute(); + echo ' - <script type="text/JavaScript"> -  - </script> - <style type="text/css"> -  - </style> - <body onLoad="'."MM_preloadImages('media/icons/buttons/button_comp_search_m.jpg', 'media/icons/buttons/button_comp_category_m.jpg', 'media/icons/buttons/button_comp_name_m.jpg', 'media/icons/buttons/button_comp_vendor_m.jpg', 'media/icons/buttons/button_comp_rank_m.jpg', 'media/icons/buttons/button_comp_submit_m.jpg');".'"> <h1>Compatibility Database - Overview</h1> - <table width="100%" border="0" cellpadding="0" cellspacing="0"> - <tr> - <td width="100%" valign="top"> - <p style="font-size:2;">The ReactOS Compatibility Database (CompDB) has stored a lot of information about application and driver compatibility with ReactOS.</p> - <div id="StartList" style="display: none;text-align:center;"> - <a href="'.$RSDB_intern_link_db_sec.'category&cat=0&ajax=true" onMouseOut="'."MM_swapImgRestore()".'" onMouseOver="'."MM_swapImage('CompCategory', '', 'media/icons/buttons/button_comp_category_m.jpg', 1);".'"> - <img src="media/icons/buttons/button_comp_category.jpg" alt="Browse by Category" name="CompCategory" width="232" height="50" border="0" /> - </a> - <br /> - <a href="'.$RSDB_intern_link_db_sec.'name&letter=all&ajax=true" onMouseOut="'."MM_swapImgRestore()".'" onMouseOver="'."MM_swapImage('CompName', '', 'media/icons/buttons/button_comp_name_m.jpg', 1);".'"> - <img src="media/icons/buttons/button_comp_name.jpg" alt="Browse by Name" name="CompName" width="232" height="50" border="0" /> - </a> - <br /> - <a href="'.$RSDB_intern_link_db_sec.'vendor&letter=all&ajax=true" onMouseOut="'."MM_swapImgRestore()".'" onMouseOver="'."MM_swapImage('CompVendor', '', 'media/icons/buttons/button_comp_vendor_m.jpg', 1);".'"> - <img src="media/icons/buttons/button_comp_vendor.jpg" alt="Browse by Vendor" name="CompVendor" width="232" height="50" border="0" /> - </a> - <br /> - <a href="'.$RSDB_intern_link_db_sec.'rank&ajax=true" onMouseOut="'."MM_swapImgRestore()".'" onMouseOver="'."MM_swapImage('CompRank', '', 'media/icons/buttons/button_comp_rank_m.jpg', 1);".'"> - <img src="media/icons/buttons/button_comp_rank.jpg" alt="Browse by Rank" name="CompRank" width="232" height="50" border="0" /> - </a> - <br /> - <a href="'.$RSDB_intern_link_db_sec.'submit&ajax=true" onMouseOut="'."MM_swapImgRestore()".'" onMouseOver="'."MM_swapImage('SubApp', '', 'media/icons/buttons/button_comp_submit_m.jpg', 1)".'"> - <img src="media/icons/buttons/button_comp_submit.jpg" alt="Submit Application" name="SubApp" width="232" height="50" border="0" /> - </a> - <br /> - <table width="231" height="49" border="0" cellpadding="0" cellspacing="0" style="margin: 0px auto;"> - <tr> - <td width="231" height="49" align="right" valign="middle" nowrap background="media/icons/buttons/button_comp_search.jpg"> - <table width="100%" border="0"> - <tr> - <td width="110"> </td> - <td> - <input name="searchinput" type="text" id="searchinput" tabindex="0" onBlur="'."loadItemList(this.value, 'table', 'comp', 'ajaxload', 'sresult');".'" onKeyUp="'."loadItemList(this.value, 'table', 'comp', 'ajaxload', 'sresult');".'" size="10" maxlength="50" style="background-color: #FFFFFF; color: #000000; font-family: Verdana; font-size: x-small; font-style: normal; border-left : 1px solid #FFFFFF; border-right : 1px solid #FFFFFF; border-top : 1px solid #FFFFFF; border-bottom : 1px solid #FFFFFF;" /> - <img id="ajaxload" src="images/ajax_loading.gif" style="display: none" /> - <script language="JavaScript" type="text/JavaScript"> -  - </script> - </td> - </tr> - </table> - </td> - </tr> - </table> - </div> - <div style="text-align:center;"> - <noscript> - <a href="'.$RSDB_intern_link_db_sec.'category&cat=0&ajax=false"> - <img src="media/icons/buttons/button_comp_category.jpg" alt="Browse by Category" name="CompCategory" width="232" height="50" border="0" /> - </a> - <br /> - <a href="'.$RSDB_intern_link_db_sec.'name&letter=all&ajax=false"> - <img src="media/icons/buttons/button_comp_name.jpg" alt="Browse by Name" name="CompName" width="232" height="50" border="0" /> - </a> - <br /> - <a href="'.$RSDB_intern_link_db_sec.'vendor&letter=all&ajax=false"> - <img src="media/icons/buttons/button_comp_vendor.jpg" alt="Browse by Vendor" name="CompVendor" width="232" height="50" border="0" /> - </a> - <br /> - <a href="'.$RSDB_intern_link_db_sec.'rank&ajax=false"> - <img src="media/icons/buttons/button_comp_rank.jpg" alt="Browse by Rank" name="CompRank" width="232" height="50" border="0" /> - </a> - <br /> - <a href="'.$RSDB_intern_link_db_sec.'submit&ajax=false"> - <img src="media/icons/buttons/button_comp_submit.jpg" alt="Submit Application" name="SubApp" width="232" height="50" border="0" /> - </a> - <br /> - <a href="'.$RSDB_intern_link_db_sec.'search&ajax=false"> - <img src="media/icons/buttons/button_comp_search_noscript.jpg" alt="Search by Query" name="CompSearch" width="232" height="50" border="0" /> - </a> - <br /> - </noscript> - </div> - </td> - <td style="text-align:right;vertical-align:top;"> - <img src="media/pictures/compatibility.jpg" alt="ReactOS Compatibility Database" height="300" width="400" /> - </td> - </tr> - </table> - <div id="sresult" style="display: none"></div> - <h3>Features</h3> - <p>Some of the <strong>features of the Compatibility Database</strong> are:</p> - <ul> - <li>Browse through the database in several different ways (by <a href="'.$RSDB_intern_link_db_sec.'category&cat=0">category</a>, <a href="'.$RSDB_intern_link_db_sec.'name&letter=all">name</a>, <a href="'.$RSDB_intern_link_db_sec.'vendor&letter=all">vendor</a>, <a href="'.$RSDB_intern_link_db_sec.'rank">ranks</a>, <a href="'.$RSDB_intern_link_db_sec.'search">search</a>).</li> - <li>Submit application entries, compatibility test reports, vendor information, screenshots and forum messages. </li> - <li>Ability to vote on test reports, forum messages, screenshots, etc.</li> - <li>Ability to customize the layout, several settings (like personal threshold, etc.) and behaviour of the Support Database.</li> - <li>Ability to sign up to be an application maintainer.<br /></li> - </ul> - <h3>Recent submissions</h3>'; - - // get number of entries - $stmt=CDBConnection::getInstance()->prepare("SELECT COUNT(*) FROM rsdb_groups WHERE grpentr_visible = '1' AND grpentr_comp = '1'"); - $stmt->execute(); - echo ' - <p>There are <a href="'.$RSDB_intern_link_db_sec.'stats"><strong>'.$stmt->fetchColumn().' applications and drivers</strong></a> currently in the database.</p> - <div style="margin:0; margin-top:10px; width:520px; margin-right:10px; border:1px solid #dfdfdf; padding:0em 1em 1em 1em; background-color:#EAF0F8;"> - <br /> - <table width="500" border="0" cellpadding="1" cellspacing="1"> - <tr bgcolor="#5984C3"> - <td width="15%" bgcolor="#5984C3"><div align="center"><font color="#FFFFFF" face="Arial, Helvetica, sans-serif"><strong>Time</strong></font></div></td> - <td width="50%" bgcolor="#5984C3"><div align="center"><font color="#FFFFFF" face="Arial, Helvetica, sans-serif"><strong>Application</strong></font></div></td> - <td width="35%" bgcolor="#5984C3"><div align="center"><font color="#FFFFFF" face="Arial, Helvetica, sans-serif"><strong>Function</strong></font></div></td> - </tr>'; + <img src="media/pictures/compatibility.jpg" alt="ReactOS Compatibility Database" style="float: right;"/> + <p>The ReactOS Compatibility Database contains information about compatible software. Below the latest reports are listed</p> + <p>There are <strong>'.$stmt->fetchColumn().'</strong> applications and drivers currently in the database.</p> + + <h2>Recent submissions</h2> + <div style="margin:10px 10px 0 0; width:500px; border:1px solid #dfdfdf; padding:1em; background-color:#EAF0F8;"> + <table style="width:100%; border: none;" cellpadding="1" cellspacing="1"> + <tr style="background-color:#5984C3;color:white;"> + <th>Application</th> + <th style="width:50px;">Works?</th> + <th style="width:150px;text-align:center;">Last update</th> + </tr>'; //@MOVEME to css $cellcolor1='#E2E2E2'; @@ -185,42 +57,28 @@ $cellcolorcounter=0; // show latest tests - $stmt=CDBConnection::getInstance()->prepare("SELECT * FROM rsdb_item_comp_testresults WHERE test_visible = '1' ORDER BY test_id DESC LIMIT 5"); + $stmt=CDBConnection::getInstance()->prepare("SELECT t.test_user_submit_timestamp, i.comp_id, i.comp_name FROM rsdb_item_comp_testresults t JOIN rsdb_item_comp i ON t.test_comp_id=i.comp_id WHERE t.test_visible = '1' ORDER BY t.test_id DESC LIMIT 10"); $stmt->execute(); while ($entry = $stmt->fetch(PDO::FETCH_ASSOC)) { + ++$cellcolorcounter; - // get programm name to the test - $stmt_comp=CDBConnection::getInstance()->prepare("SELECT * FROM rsdb_item_comp WHERE comp_id = :comp_id LIMIT 1"); - $stmt_comp->bindParam('comp_id',$entry['test_comp_id'],PDO::PARAM_STR); - $stmt_comp->execute(); - $comp = $stmt_comp->fetchOnce(PDO::FETCH_ASSOC); - - $cellcolorcounter++; echo ' <tr style="background-color:'.($cellcolorcounter%2 ? $cellcolor1 : $cellcolor2).';"> - <td style="text-align: center;font-size:1;">'.$entry['test_user_submit_timestamp'].'</td> - <td style="font-size:2;"> <strong><a href="'.$RSDB_intern_link_item_comp.$comp['comp_id'].'&item2=tests">'.$comp['comp_name'].'</a></strong></td> - <td style="font-size:2;"> '.Star::drawSmall($entry['test_result_function'], 1, 5, '').'</td> + <td><a href="'.$RSDB_intern_link_item_comp.$entry['comp_id'].'&item2=tests">'.$entry['comp_name'].'</a></td> + <td>TBI</td> + <td style="text-align: center;">'.$entry['test_user_submit_timestamp'].'</td> </tr>'; } echo ' - </table> - </div>'; + </table> + </div> + <p>You can also <a href="'.$RSDB_intern_link_db_sec.'submit">Submit new Entries</a></p>'; // print some login blah to guest users if ($RSDB_intern_user_id <= 0) { echo '<p style="font-size:2;">Some of the features of the ReactOS Compatibility Database require that you have a <a href="'.$RSDB_intern_loginsystem_fullpath.'?page=register">myReactOS account</a> and are <a href="'.$RSDB_intern_loginsystem_fullpath.'?page=login">logged in</a>.</p>'; } - - echo ' - <script type="text/JavaScript"> -  - </script>'; } // end of member function body Modified: branches/danny-web/www/www.reactos.org/compat/lib/view/Item_Details.class.p… URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/c… ============================================================================== --- branches/danny-web/www/www.reactos.org/compat/lib/view/Item_Details.class.p… [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/compat/lib/view/Item_Details.class.p… [iso-8859-1] Sat Apr 18 00:51:44 2009 @@ -19,11 +19,14 @@ */ -class Item_Tips extends HTML_Item +class Item_Details extends HTML_Item { protected function body() { + global $RSDB_intern_link_item; + global $RSDB_intern_link_vendor_sec; + global $RSDB_intern_user_id; $stmt=CDBConnection::getInstance()->prepare("SELECT * FROM rsdb_item_comp WHERE comp_visible = '1' AND comp_id = :comp_id ORDER BY comp_name ASC"); @@ -194,7 +197,7 @@ </table> <?php - if (usrfunc_IsModerator($RSDB_intern_user_id)) { + if (CUser::isModerator($RSDB_intern_user_id)) { $stmt=CDBConnection::getInstance()->prepare("SELECT * FROM rsdb_item_comp WHERE comp_visible = '1' AND comp_id = :comp_id LIMIT 1"); $stmt->bindParam('comp_id',@$_GET['item'],PDO::PARAM_STR); $stmt->execute(); @@ -239,7 +242,7 @@ // Edit application group data: - if ($RSDB_TEMP_pmod == "ok" && @$_GET['item'] != "" && $RSDB_TEMP_appn != "" && $RSDB_TEMP_apppr != "" && $RSDB_TEMP_appit != "" && $RSDB_TEMP_version != "" && usrfunc_IsModerator($RSDB_intern_user_id)) { + if ($RSDB_TEMP_pmod == "ok" && @$_GET['item'] != "" && $RSDB_TEMP_appn != "" && $RSDB_TEMP_apppr != "" && $RSDB_TEMP_appit != "" && $RSDB_TEMP_version != "" && CUser::isModerator($RSDB_intern_user_id)) { $stmt=CDBConnection::getInstance()->prepare("SELECT * FROM rsdb_groups WHERE grpentr_visible = '1' AND grpentr_id = :group_id AND grpentr_comp = '1' LIMIT 1"); $stmt->bindParam('group_id',$RSDB_TEMP_appn,PDO::PARAM_STR); @@ -266,7 +269,7 @@ } // Special request: - if ($RSDB_TEMP_pmod == "ok" && $RSDB_TEMP_txtreq1 != "" && $RSDB_TEMP_txtreq2 != "" && usrfunc_IsModerator($RSDB_intern_user_id)) { + if ($RSDB_TEMP_pmod == "ok" && $RSDB_TEMP_txtreq1 != "" && $RSDB_TEMP_txtreq2 != "" && CUser::isModerator($RSDB_intern_user_id)) { $stmt=CDBConnection::getInstance()->prepare("INSERT INTO rsdb_logs ( log_id , log_date , log_usrid , log_usrip , log_level , log_action , log_title , log_description , log_category , log_badusr , log_referrer , log_browseragent , log_read , log_taskdone_usr ) VALUES ('', NOW( ) , :user_id, :ip, 'low', 'request', :title, :description, 'user_moderator', '0', :referrer, :user_agend, ';', '0')"); $stmt->bindParam('user_id',$RSDB_intern_user_id,PDO::PARAM_STR); $stmt->bindParam('ip',$RSDB_ipaddr,PDO::PARAM_STR); @@ -277,7 +280,7 @@ $stmt->execute(); } // Report spam: - if ($RSDB_TEMP_pmod == "ok" && $RSDB_TEMP_txtspam != "" && usrfunc_IsModerator($RSDB_intern_user_id)) { + if ($RSDB_TEMP_pmod == "ok" && $RSDB_TEMP_txtspam != "" && CUser::isModerator($RSDB_intern_user_id)) { $stmt=CDBConnection::getInstance()->prepare("UPDATE rsdb_item_comp SET comp_visible = '3' WHERE comp_id = :comp_id"); $stmt->bindParam('comp_id',@$_GET['item'],PDO::PARAM_STR); $stmt->execute(); @@ -292,7 +295,7 @@ $temp_verified = "yes"; } if ($result_maintainer_item['comp_checked'] == "1" || $result_maintainer_item['comp_checked'] == "no") { - if ($RSDB_TEMP_pmod == "ok" && $RSDB_TEMP_verified == "done" && usrfunc_IsModerator($RSDB_intern_user_id)) { + if ($RSDB_TEMP_pmod == "ok" && $RSDB_TEMP_verified == "done" && CUser::isModerator($RSDB_intern_user_id)) { echo "!"; $stmt=CDBConnection::getInstance()->prepare("UPDATE rsdb_item_comp SET comp_checked = :checked WHERE comp_id = :comp_id "); $stmt->bindParam('checked',$temp_verified,PDO::PARAM_STR); @@ -529,7 +532,7 @@ <br /> <?php - if (usrfunc_IsAdmin($RSDB_intern_user_id)) { + if (CUser::isAdmin($RSDB_intern_user_id)) { $RSDB_TEMP_padmin = ""; $RSDB_TEMP_done = ""; @@ -539,13 +542,13 @@ if (array_key_exists("medal", $_POST)) $RSDB_TEMP_medal=htmlspecialchars($_POST["medal"]); - if ($RSDB_TEMP_padmin == "ok" && $RSDB_TEMP_done != "" && usrfunc_IsAdmin($RSDB_intern_user_id)) { + if ($RSDB_TEMP_padmin == "ok" && $RSDB_TEMP_done != "" && CUser::isAdmin($RSDB_intern_user_id)) { $stmt=CDBConnection::getInstance()->prepare("UPDATE rsdb_logs SET log_taskdone_usr = :user_id WHERE log_id = :log_id"); $stmt->bindParam('user_id',$RSDB_intern_user_id,PDO::PARAM_STR); $stmt->bindParam('log_id',$RSDB_TEMP_done,PDO::PARAM_STR); $stmt->execute(); } - if ($RSDB_TEMP_padmin == "ok" && $RSDB_TEMP_medal != "" && isset($_GET['item']) && $_GET['item'] != "" && usrfunc_IsAdmin($RSDB_intern_user_id)) { + if ($RSDB_TEMP_padmin == "ok" && $RSDB_TEMP_medal != "" && isset($_GET['item']) && $_GET['item'] != "" && CUser::isAdmin($RSDB_intern_user_id)) { $stmt=CDBConnection::getInstance()->prepare("UPDATE rsdb_item_comp SET comp_award = :award WHERE comp_id = :comp_id"); $stmt->bindParam('award',$RSDB_TEMP_medal,PDO::PARAM_STR); $stmt->bindParam('comp_id',$_GET['item'],PDO::PARAM_STR); Modified: branches/danny-web/www/www.reactos.org/compat/lib/view/Item_Tests.class.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/c… ============================================================================== --- branches/danny-web/www/www.reactos.org/compat/lib/view/Item_Tests.class.php [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/compat/lib/view/Item_Tests.class.php [iso-8859-1] Sat Apr 18 00:51:44 2009 @@ -101,10 +101,10 @@ <tr> <td width="80" rowspan="2" align="center" valign="middle"><div align="left"><strong><?php - if (usrfunc_IsAdmin($result_testreports['test_user_id'])) { + if (CUser::isAdmin($result_testreports['test_user_id'])) { echo '<font size="3" face="Arial, Helvetica, sans-serif" color="#5984C3"> Admin'; } - else if (usrfunc_IsModerator($result_testreports['test_user_id'])) { + else if (CUser::isModerator($result_testreports['test_user_id'])) { echo '<font size="2" face="Arial, Helvetica, sans-serif" color="#5984C3"> Maintainer'; } else { Modified: branches/danny-web/www/www.reactos.org/compat/notools/plugins.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/c… ============================================================================== --- branches/danny-web/www/www.reactos.org/compat/notools/plugins.php [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/compat/notools/plugins.php [iso-8859-1] Sat Apr 18 00:51:44 2009 @@ -37,7 +37,7 @@ // Exif reader v 1.2 // By Richard James Kendall - require_once("inc/tools/plugins/exif.php"); + require_once("notools/plugins/exif.php"); function read_exif($RSDB_TEMP_filename, $spacechar) { global $exif_data;

1 0

[cwittich] 40563: fix last setupapi stringtable winetest
by cwittich＠svn.reactos.org 17 Apr '09

17 Apr '09

Author: cwittich Date: Sat Apr 18 00:50:04 2009 New Revision: 40563 URL: http://svn.reactos.org/svn/reactos?rev=40563&view=rev Log: fix last setupapi stringtable winetest Modified: trunk/reactos/dll/win32/setupapi/stringtable.c trunk/reactos/include/psdk/setupapi.h Modified: trunk/reactos/dll/win32/setupapi/stringtable.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/stringt… ============================================================================== --- trunk/reactos/dll/win32/setupapi/stringtable.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/stringtable.c [iso-8859-1] Sat Apr 18 00:50:04 2009 @@ -602,13 +602,13 @@ LPWSTR lpString, DWORD dwFlags, LPVOID lpExtraData, - LPDWORD lpReserved) + DWORD dwReserved) { PSTRING_TABLE pStringTable; DWORD i; TRACE("%p %s %x %p, %x\n", hStringTable, debugstr_w(lpString), dwFlags, - lpExtraData, lpReserved); + lpExtraData, dwReserved); pStringTable = (PSTRING_TABLE)hStringTable; if (pStringTable == NULL) @@ -627,11 +627,7 @@ if (!lstrcmpW(pStringTable->pSlots[i].pString, lpString)) { if (lpExtraData) - { - memcpy(lpExtraData, - pStringTable->pSlots[i].pData, - pStringTable->pSlots[i].dwSize); - } + memcpy(lpExtraData, pStringTable->pSlots[i].pData, dwReserved); return i + 1; } } @@ -640,18 +636,13 @@ if (!lstrcmpiW(pStringTable->pSlots[i].pString, lpString)) { if (lpExtraData) - { - memcpy(lpExtraData, - pStringTable->pSlots[i].pData, - pStringTable->pSlots[i].dwSize); - } + memcpy(lpExtraData, pStringTable->pSlots[i].pData, dwReserved); return i + 1; } } } } - - return (DWORD)-1; + return ~0u; } Modified: trunk/reactos/include/psdk/setupapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/setupapi.h?re… ============================================================================== --- trunk/reactos/include/psdk/setupapi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/setupapi.h [iso-8859-1] Sat Apr 18 00:50:04 2009 @@ -1434,7 +1434,7 @@ WINSETUPAPI HSTRING_TABLE WINAPI StringTableInitialize(VOID); WINSETUPAPI HSTRING_TABLE WINAPI StringTableInitializeEx(DWORD, DWORD); WINSETUPAPI DWORD WINAPI StringTableLookUpString(HSTRING_TABLE, LPWSTR, DWORD); -WINSETUPAPI DWORD WINAPI StringTableLookUpStringEx(HSTRING_TABLE, LPWSTR, DWORD, LPVOID, LPDWORD); +WINSETUPAPI DWORD WINAPI StringTableLookUpStringEx(HSTRING_TABLE, LPWSTR, DWORD, LPVOID, DWORD); WINSETUPAPI BOOL WINAPI StringTableSetExtraData(HSTRING_TABLE, DWORD, LPVOID, DWORD); WINSETUPAPI LPWSTR WINAPI StringTableStringFromId(HSTRING_TABLE, DWORD); WINSETUPAPI BOOL WINAPI StringTableStringFromIdEx(HSTRING_TABLE, DWORD, LPWSTR, LPDWORD);

1 0

[jimtabor] 40562: - Ref bug 4074: Need to test it again to see if it crashes further down the line.
by jimtabor＠svn.reactos.org 17 Apr '09

17 Apr '09

Author: jimtabor Date: Sat Apr 18 00:34:09 2009 New Revision: 40562 URL: http://svn.reactos.org/svn/reactos?rev=40562&view=rev Log: - Ref bug 4074: Need to test it again to see if it crashes further down the line. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] Sat Apr 18 00:34:09 2009 @@ -2397,9 +2397,11 @@ BOOLEAN isChild; PWINDOW Wnd; - ASSERT_REFS_CO(Window); //fixme: temp hack? + ASSERT_REFS_CO(Window); // FIXME: temp hack? Wnd = Window->Wnd; + + if (!Wnd) return TRUE; // FIXME: Need to finish object rewrite or lock the thread when killing the window! /* Check for owner thread */ if ((Window->OwnerThread != PsGetCurrentThread()))

1 0

← Newer
1
...
18
19
20
21
22
23
24
...
48
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs April 2009