Ros-diffs

ros-diffs@reactos.org

81390 discussions

[gedmurphy] 26331: update French resource file. Thanks to HeisSpiter
by gedmurphy＠svn.reactos.org 13 Apr '07

13 Apr '07

Author: gedmurphy Date: Fri Apr 13 22:27:12 2007 New Revision: 26331 URL: http://svn.reactos.org/svn/reactos?rev=26331&view=rev Log: update French resource file. Thanks to HeisSpiter Modified: trunk/reactos/dll/cpl/desk/lang/fr-FR.rc Modified: trunk/reactos/dll/cpl/desk/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/fr-FR.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/fr-FR.rc (original) +++ trunk/reactos/dll/cpl/desk/lang/fr-FR.rc Fri Apr 13 22:27:12 2007 @@ -24,27 +24,27 @@ IDD_SCREENSAVER DIALOGEX 0, 0, 246, 204 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Screensaver" +CAPTION "Écran de veille" FONT 8, "MS Shell Dlg", 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 "É&cran de veille",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 "Paramè&tres",IDC_SCREENS_SETTINGS, 120, 103, 50, 13, WS_GROUP + PUSHBUTTON "&Aperçu",IDC_SCREENS_TESTSC, 175, 103, 50, 13 + LTEXT "Dé&lai",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", + CONTROL "À la reprise, demander un mot de &passe.",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 "G&estion de l'alimentation du moniteur", IDC_SCREENS_DUMMY2, 6, 155, 232, 41 + LTEXT "Pour modifier les paramètres de l'alimentation du moniteur, cliquez sur Gestion de l'alimentation.", IDC_STATIC, 14, 166, 146 ,20 - PUSHBUTTON "P&ower...", IDC_SCREENS_POWER_BUTTON, 176, 171, 50, 13 + PUSHBUTTON "&Gestion de l'alimentation...", IDC_SCREENS_POWER_BUTTON, 176, 171, 50, 13 END IDD_APPEARANCE DIALOGEX DISCARDABLE 0, 0, 246, 228

1 0

[dgorbachev] 26330: Fix previous fix.
by dgorbachev＠svn.reactos.org 13 Apr '07

13 Apr '07

Author: dgorbachev Date: Fri Apr 13 18:57:36 2007 New Revision: 26330 URL: http://svn.reactos.org/svn/reactos?rev=26330&view=rev Log: Fix previous fix. Modified: trunk/reactos/base/applications/charmap/map.c Modified: trunk/reactos/base/applications/charmap/map.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/map.c (original) +++ trunk/reactos/base/applications/charmap/map.c Fri Apr 13 18:57:36 2007 @@ -492,7 +492,7 @@ case FM_GETCHAR: { - if (!infoPtr->pActiveCell) return NULL; + if (!infoPtr->pActiveCell) return 0; return infoPtr->pActiveCell->ch; }

1 0

[dgorbachev] 26329: Fix a bug. (Thanks to Ged).
by dgorbachev＠svn.reactos.org 13 Apr '07

13 Apr '07

Author: dgorbachev Date: Fri Apr 13 18:47:55 2007 New Revision: 26329 URL: http://svn.reactos.org/svn/reactos?rev=26329&view=rev Log: Fix a bug. (Thanks to Ged). Modified: trunk/reactos/base/applications/charmap/charmap.c trunk/reactos/base/applications/charmap/map.c Modified: trunk/reactos/base/applications/charmap/charmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/charmap.c (original) +++ trunk/reactos/base/applications/charmap/charmap.c Fri Apr 13 18:47:55 2007 @@ -262,8 +262,11 @@ ch = SendMessage(hMap, FM_GETCHAR, 0, 0); - AddCharToSelection(GetDlgItem(hDlg, IDC_TEXTBOX), - ch); + if (ch) + { + AddCharToSelection(GetDlgItem(hDlg, IDC_TEXTBOX), + ch); + } break; } Modified: trunk/reactos/base/applications/charmap/map.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/map.c (original) +++ trunk/reactos/base/applications/charmap/map.c Fri Apr 13 18:47:55 2007 @@ -492,6 +492,7 @@ case FM_GETCHAR: { + if (!infoPtr->pActiveCell) return NULL; return infoPtr->pActiveCell->ch; }

1 0

[dgorbachev] 26328: Thai translation by Sumath Aowsakulsutthi.
by dgorbachev＠svn.reactos.org 13 Apr '07

13 Apr '07

Author: dgorbachev Date: Fri Apr 13 18:29:01 2007 New Revision: 26328 URL: http://svn.reactos.org/svn/reactos?rev=26328&view=rev Log: Thai translation by Sumath Aowsakulsutthi. Added: trunk/reactos/base/applications/games/solitaire/lang/th-TH.rc trunk/reactos/base/applications/games/winemine/lang/th-TH.rc trunk/reactos/base/applications/msconfig/lang/th-TH.rc trunk/reactos/base/applications/mscutils/servman/lang/th-TH.rc trunk/reactos/base/applications/regedit/clb/lang/th-TH.rc trunk/reactos/base/applications/regedit/lang/th-TH.rc trunk/reactos/base/applications/screensavers/matrix/lang/ trunk/reactos/base/applications/screensavers/matrix/lang/th-TH.rc trunk/reactos/base/applications/screensavers/matrix/rsrc.rc trunk/reactos/base/applications/wordpad/lang/th-TH.rc Modified: trunk/reactos/base/applications/games/solitaire/rsrc.rc trunk/reactos/base/applications/games/winemine/rsrc.rc trunk/reactos/base/applications/msconfig/rsrc.rc trunk/reactos/base/applications/mscutils/servman/rsrc.rc trunk/reactos/base/applications/regedit/clb/rsrc.rc trunk/reactos/base/applications/regedit/rsrc.rc trunk/reactos/base/applications/wordpad/rsrc.rc Added: trunk/reactos/base/applications/games/solitaire/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/th-TH.rc (added) +++ trunk/reactos/base/applications/games/solitaire/lang/th-TH.rc Fri Apr 13 18:29:01 2007 @@ -1,0 +1,129 @@ +/* + * PROJECT: Solitaire + * LICENSE: Freeware, permission to use under Public Domain + * FILE: base/applications/games/solitaire/lang/th-TH.rc + * PURPOSE: Thai Language File for Solitaire + * TRANSLATOR: Sumath Aowsakulsutthi +*/ + +#include "resource.h" + +#define APSTUDIO_READONLY_SYMBOLS + +/* winemaker: #include "afxres.h" */ +/* winemaker:warning: 'afxres.h' is an MFC specific header. Replacing it with 'winres.h' */ +#include "winres.h" + +///// + +#undef APSTUDIO_READONLY_SYMBOLS + +///// +// Thai resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENG) +#ifdef _WIN32 +LANGUAGE LANG_THAI, SUBLANG_DEFAULT +#pragma code_page(874) +#endif //_WIN32 + +///// +// Dialog + +IDD_DIALOG1 DIALOGEX DISCARDABLE 0, 0, 186, 95 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Dialog" +FONT 8, "MS Shell Dlg" +EXSTYLE DS_SHELLFONT +BEGIN + DEFPUSHBUTTON "µ¡Å§", IDOK, 129,7,50,14 + PUSHBUTTON "Â¡àÅÔ¡", IDCANCEL, 129,24,50,14 +END + + +///// +// DESIGNINFO + +#ifdef APSTUDIO_INVOKED +GUIDELINES DESIGNINFO DISCARDABLE +BEGIN + IDD_DIALOG1, DIALOGEX + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 179 + TOPMARGIN, 7 + BOTTOMMARGIN, 88 + END +END +#endif // APSTUDIO_INVOKED + + +#ifdef APSTUDIO_INVOKED + +///// +// TEXTINCLUDE + +1 TEXTINCLUDE DISCARDABLE +BEGIN + "resource.h\0" +END + +2 TEXTINCLUDE DISCARDABLE +BEGIN + "#include ""winres.h""\r\n" + "\0" +END + +3 TEXTINCLUDE DISCARDABLE +BEGIN + "\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + + +///// +// Menu + +IDR_MENU1 MENU DISCARDABLE +BEGIN + POPUP "à&¡Á" + BEGIN + MENUITEM "á&¨¡ä¾è\tF2", IDM_GAME_NEW + MENUITEM SEPARATOR + MENUITEM "á&µè§ä¾è...", IDM_GAME_DECK + MENUITEM "&µÑÇàÅ×Í¡...", IDM_GAME_OPTIONS + MENUITEM SEPARATOR + MENUITEM "&ÍÍ¡", IDM_GAME_EXIT + END + POPUP "&ªèÇÂàËÅ×Í" + BEGIN + MENUITEM "à&¹×éÍËÒ\tF1", IDM_HELP_CONTENTS + MENUITEM "à&¡ÕèÂÇ¡Ñº...", IDM_HELP_ABOUT + END +END + +///// +// Accelerator + +IDR_ACCELERATOR1 ACCELERATORS DISCARDABLE +BEGIN + VK_F1, IDM_HELP_CONTENTS, VIRTKEY, NOINVERT + VK_F2, IDM_GAME_NEW, VIRTKEY, NOINVERT +END + + +///// +// Icon + +IDI_ICON1 ICON DISCARDABLE "solitaire.ico" +#endif // Thai resources + +///// + + +#ifndef APSTUDIO_INVOKED + +///// +#endif // not APSTUDIO_INVOKED Modified: trunk/reactos/base/applications/games/solitaire/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/rsrc.rc (original) +++ trunk/reactos/base/applications/games/solitaire/rsrc.rc Fri Apr 13 18:29:01 2007 @@ -7,4 +7,5 @@ #include "lang/id-ID.rc" #include "lang/it-IT.rc" #include "lang/nb-NO.rc" +#include "lang/th-TH.rc" #include "lang/uk-UA.rc" Added: trunk/reactos/base/applications/games/winemine/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… ============================================================================== --- trunk/reactos/base/applications/games/winemine/lang/th-TH.rc (added) +++ trunk/reactos/base/applications/games/winemine/lang/th-TH.rc Fri Apr 13 18:29:01 2007 @@ -1,0 +1,87 @@ +#include "resource.h" + +LANGUAGE LANG_THAI, SUBLANG_DEFAULT + +STRINGTABLE { + IDS_APPNAME, "WineMine" + +} + +MENU_WINEMINE MENU DISCARDABLE +{ + POPUP "&µÑÇàÅ×Í¡" { + MENUITEM "ã&ËÁè", IDM_NEW + MENUITEM SEPARATOR + MENUITEM "à&¤Ã×èÍ§ËÁÒÂ¤Ó¶ÒÁ", IDM_MARKQ + MENUITEM SEPARATOR + MENUITEM "à&ÃÔèÁµé¹", IDM_BEGINNER + MENUITEM "&¢Ñé¹ÊÙ§¢Öé¹", IDM_ADVANCED + MENUITEM "&¼ÙéªÓ¹Ò", IDM_EXPERT + MENUITEM "&¤¹·ÑèÇä»", IDM_CUSTOM + MENUITEM SEPARATOR + MENUITEM "&ÍÍ¡", IDM_EXIT + } + POPUP "á&¨é§ãËé·ÃÒº" { + MENUITEM "à&ÇÅÒ·ÕèàÃçÇ·ÕèÊØ´", IDM_TIMES + MENUITEM "à&¡ÕèÂÇ¡Ñº", IDM_ABOUT + } +} + +DLG_TIMES DIALOGEX DISCARDABLE 0, 0, 160, 80 +STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +CAPTION "àÇÅÒ·ÕèàÃçÇ·ÕèÊØ´" +FONT 8, "MS Shell Dlg" +EXSTYLE DS_SHELLFONT +{ + GROUPBOX "àÇÅÒ·ÕèàÃçÇ·ÕèÊØ´", IDNONE, 10, 10, 140, 45 + LTEXT "àÃÔèÁµé¹", IDNONE, 20, 20, 40, 8 + LTEXT "¢Ñé¹ÊÙ§¢Öé¹", IDNONE, 20, 30, 40, 8 + LTEXT "¼ÙéªÓ¹Ò", IDNONE, 20, 40, 40, 8 + LTEXT "999", IDC_TIME1, 70, 20, 15, 8 + LTEXT "999", IDC_TIME2, 70, 30, 15, 8 + LTEXT "999", IDC_TIME3, 70, 40, 15, 8 + LTEXT "", IDC_NAME1, 90, 20, 55, 8 + LTEXT "", IDC_NAME2, 90, 30, 55, 8 + LTEXT "", IDC_NAME3, 90, 40, 55, 8 + DEFPUSHBUTTON "µ¡Å§", IDOK, 55, 60, 50, 15 +} + +DLG_CONGRATS DIALOGEX DISCARDABLE 0, 0, 160, 60 +STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +CAPTION "¢ÍáÊ´§¤ÇÒÁÂÔ¹´Õ´éÇÂ!" +FONT 8, "MS Shell Dlg" +EXSTYLE DS_SHELLFONT +{ + LTEXT "â»Ã´¡ÃÍ¡ª×èÍ¢Í§¤Ø³", IDIGNORE, 10, 10, 150, 10 + EDITTEXT IDC_EDITNAME, 25, 20, 110, 12 + DEFPUSHBUTTON "µ¡Å§", IDOK, 60, 40, 40, 15 +} + +DLG_CUSTOM DIALOGEX DISCARDABLE 0, 0, 100, 100 +STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +CAPTION "à¡ÁÃÐ´Ñº¤¹·ÑèÇä»" +FONT 8, "MS Shell Dlg" +EXSTYLE DS_SHELLFONT +{ + LTEXT "á¶Ç", IDNONE, 5, 5, 30, 10 + LTEXT "ËÅÑ¡", IDNONE, 5, 35, 30, 10 + LTEXT "¡ÑºÃÐàºÔ´", IDNONE, 5, 65, 30, 10 + EDITTEXT IDC_EDITROWS, 5, 15, 20, 12, ES_NUMBER + EDITTEXT IDC_EDITCOLS, 5, 45, 20, 12, ES_NUMBER + EDITTEXT IDC_EDITMINES, 5, 75, 20, 12, ES_NUMBER + DEFPUSHBUTTON "µ¡Å§", IDOK, 40, 30, 50, 15 + PUSHBUTTON "Â¡àÅÔ¡", IDCANCEL, 40, 50, 50, 15 +} + +DLG_ABOUT DIALOGEX DISCARDABLE 0, 0, 145, 80 +STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +CAPTION "à¡ÕèÂÇ¡Ñº" +FONT 8, "MS Shell Dlg" +EXSTYLE DS_SHELLFONT +{ + LTEXT "Winemine", IDNONE, 10, 10, 35, 10 + LTEXT "Copyright 2000, Joshua Thielen", IDNONE, 35, 25, 100, 10 + LTEXT "ÀÒÂãµéÅÔ¢ÊÔ·¸Ôì¢Í§ WINE", IDNONE, 35, 35, 100, 10 + ICON "WINEMINE", IDNONE, 10, 25, 20, 20 + DEFPUSHBUTTON "µ¡Å§", IDOK, 50, 60, 55, 15 +} Modified: trunk/reactos/base/applications/games/winemine/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… ============================================================================== --- trunk/reactos/base/applications/games/winemine/rsrc.rc (original) +++ trunk/reactos/base/applications/games/winemine/rsrc.rc Fri Apr 13 18:29:01 2007 @@ -11,6 +11,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL /* include localised resources */ + #include "lang/de-DE.rc" #include "lang/el-GR.rc" #include "lang/en-US.rc" @@ -20,4 +21,5 @@ #include "lang/nb-NO.rc" #include "lang/nl-NL.rc" #include "lang/pl-PL.rc" +#include "lang/th-TH.rc" #include "lang/uk-UA.rc" Added: trunk/reactos/base/applications/msconfig/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/lang/th-TH.rc (added) +++ trunk/reactos/base/applications/msconfig/lang/th-TH.rc Fri Apr 13 18:29:01 2007 @@ -1,0 +1,175 @@ +/* + * Msconfig (Thai resources) + * + * Copyright 2007 Sumath Aowsakulsutthi + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_THAI, SUBLANG_DEFAULT + +IDD_MSCONFIG_DIALOG DIALOG DISCARDABLE 0, 0, 378, 220 +STYLE DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | + WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU | + WS_THICKFRAME +CAPTION "â»Ãá¡ÃÁâ¤Ã§áººÃÐºº" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "Tab1",IDC_TAB,"SysTabControl32",WS_TABSTOP,2,2,374,195 + DEFPUSHBUTTON "µ¡Å§", IDOK, 211, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "&ªèÇÂàËÅ×Í", IDC_BTN_HELP, 2, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Â¡àÅÔ¡", IDCANCEL, 267, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "ãªé·Ñ¹·Õ", IDC_BTN_APPLY, 323, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END + +IDD_STARTUP_PAGE DIALOG DISCARDABLE 0, 0, 362, 175 +STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "List3",IDC_STARTUP_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 2, 1, 360, 148 + PUSHBUTTON "&¡ÃÐµØé¹·Ñé§ËÁ´",IDC_BTN_STARTUP_ACTIVATE,223,155,66,14 + PUSHBUTTON "&äÁè¡ÃÐµØé¹·Ñé§ËÁ´",IDC_BTN_STARTUP_DEACTIVATE,295,155,66,14 +END + +IDD_TOOLS_PAGE DIALOG DISCARDABLE 0, 0, 362, 175 +STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "List2",IDC_TOOLS_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 2, 1, 360, 134 + EDITTEXT IDC_TOOLS_CMDLINE, 1, 139, 360, 12, ES_READONLY + PUSHBUTTON "&´Óà¹Ô¹§Ò¹", IDC_BTN_RUN, 311, 155, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END + +IDD_SERVICES_PAGE DIALOG DISCARDABLE 0, 0, 362, 175 +STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "List1",IDC_SERVICES_LIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP,2,1,360,148 + PUSHBUTTON "&Activate all",IDC_BTN_SERVICES_ACTIVATE,223,155,66,14 + PUSHBUTTON "&Deactivate all",IDC_BTN_SERVICES_DEACTIVATE,295,155,66,14 +END + +IDD_GENERAL_PAGE DIALOG DISCARDABLE 0, 0, 362, 175 +STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Startup Selection", -1, 10, 10, 340, 150,0,WS_EX_TRANSPARENT + CONTROL "&Normal Startup - load all device drivers and services", IDC_CBX_NORMAL_START, "Button", 0x50010009, 20, 30, 180, 10 + CONTROL "&Diagnostic Startup - load basic devices and services only", IDC_CBX_DIAGNOSTIC_START, "Button", 0x50010009, 20, 45, 195, 10 + CONTROL "S&elective Startup", IDC_CBX_SELECTIVE_STARTUP, "Button", 0x50010009, 20, 60, 70, 10 + CHECKBOX "P&rocess SYSTEM.INI File", IDC_CBX_SYSTEM_INI, 30, 80, 95, 10 + CHECKBOX "&Load System Services", IDC_CBX_SYSTEM_SERVICE, 30, 95, 90, 10 + CHECKBOX "L&oad Startup Items", IDC_CBX_STARTUP_ITEM, 30, 110, 75, 10 +END + +IDD_FREELDR_PAGE DIALOG DISCARDABLE 0, 0, 362, 175 +STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", IDC_LIST_BOX, "¡ÅèÍ§ÃÒÂª×èÍ", 0x50010141, 10, 10, 340, 50, 0x00000200 + PUSHBUTTON "&µÃÇ¨¡ÒÃ»ÅØ¡à¤Ã×èÍ§·Ø¡àÊé¹·Ò§", IDC_BTN_CHECK_BOOT_PATH, 10, 65, 70, 12 + PUSHBUTTON "&µÑé§¤èÒâ´Â»ÃÔÂÒÂ", IDC_BTN_SET_DEFAULT_BOOT, 100, 65, 70, 12 + PUSHBUTTON "à¤Å×èÍ¹·Õè &¢Öé¹", IDC_BTN_MOVE_UP_BOOT_OPTION, 190, 65, 70, 12 + PUSHBUTTON "à¤Å×èÍ¹·Õè &Å§", IDC_BTN_MOVE_DOWN_BOOT_OPTION, 280, 65, 70, 12 + GROUPBOX "µÑÇàÅ×Í¡¡ÒÃ»ÅØ¡à¤Ã×èÍ§", -1, 10, 80, 250, 90,0,WS_EX_TRANSPARENT + CHECKBOX "/»ÅØ¡à¤Ã×èÍ§áºº&»ÅÍ´ÀÑÂ", IDC_CBX_SAFE_BOOT, 15, 90, 50, 10 + CHECKBOX "/»ÅØ¡à¤Ã×èÍ§áºº&ÊèÇ¹µèÍ»ÃÐÊÒ¹¡ÃÒ¿Ô¡", IDC_CBX_NO_GUI_BOOT, 15, 105, 55, 10 + CHECKBOX "/&Å§ºÑ¹·Ö¡»ÅØ¡à¤Ã×èÍ§", IDC_CBX_BOOT_LOG, 15, 120, 50, 10 + CHECKBOX "/BAS&EVIDEO", IDC_CBX_BASE_VIDEO, 15, 135, 55, 10 + CHECKBOX "/S&OS", IDC_CBX_SOS, 15, 150, 50, 10 + PUSHBUTTON "&µÑÇàÅ×Í¡ÃÐ´ÑºÊÙ§...", IDC_BTN_ADVANCED_OPTIONS, 100, 150, 70, 12 + LTEXT "&ËÁ´àÇÅÒ:", -1, 280, 91, 30, 10 + EDITTEXT IDC_TXT_BOOT_TIMEOUT, 310, 90, 25, 12, ES_LEFT + LTEXT "ÇÔ¹Ò·Õ", -1, 340, 91, 15, 10 +END + +IDD_FREELDR_ADVANCED_PAGE DIALOG DISCARDABLE 0, 0, 175, 175 +STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN +FONT 8, "MS Shell Dlg" +BEGIN + CHECKBOX "/&MAXMEM=", IDC_CBX_MAX_MEM, 10, 10, 50, 10 + EDITTEXT IDC_TXT_MAX_MEM, 80, 10, 60, 12 + CONTROL "",IDC_SCR_MAX_MEM, "msctls_updown32", 0x50000000, 140, 10, 11, 11 + CHECKBOX "/&NUMPROC=", IDC_CBX_NUM_PROC, 10, 25, 50, 10 + COMBOBOX IDC_DRP_NUM_PROC, 80, 25, 60, 10, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP + CHECKBOX "/&PCILOCK", IDC_CBX_PCI_LOCK, 10, 40, 50, 10 + CHECKBOX "/P&ROFILE", IDC_CBX_PROFILE, 10, 55, 50, 10 + CHECKBOX "/&IRQ", IDC_CBX_IRQ, 10, 70, 40, 12 + EDITTEXT IDC_TXT_IRQ, 80, 70, 60, 12, ES_LEFT + CHECKBOX "/á&¡é¨Ø´º¡¾ÃèÍ§", IDC_CBX_DEBUG, 10, 85, 40, 10 + CHECKBOX "/&ªèÍ§·Ò§á¡é¨Ø´º¡¾ÃèÍ§", IDC_CBX_DEBUG_PORT, 20, 100, 60, 10 + COMBOBOX IDC_DRP_DEBUG_PORT, 80, 100, 60, 10, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP + CHECKBOX "/&ÍÑµÃÒºÍ´", IDC_CBX_BAUD_RATE, 20, 115, 50, 10 + COMBOBOX IDC_DRP_DRP_BAUD_RATE, 80, 115, 60, 10, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP + CHECKBOX "/&ªèÍ§", IDC_CBX_CHANNEL, 20, 130, 50, 10 + EDITTEXT IDC_TXT_CHANNEL, 80, 130, 60, 12, ES_LEFT + CONTROL "",IDC_SCR_CHANNEL, "msctls_updown32", 0x50000000, 140, 130, 11, 11 + PUSHBUTTON "µ¡Å§", IDC_OK, 20, 160, 50, 12 + PUSHBUTTON "Â¡àÅÔ¡", IDC_CANCEL, 100, 160, 50, 12 +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_MSCONFIG "â»Ãá¡ÃÁâ¤Ã§áººÃÐºº" + IDS_TAB_GENERAL "·ÑèÇä»" + IDS_TAB_SYSTEM "SYSTEM.INI" + IDS_TAB_FREELDR "FREELDR.INI" + IDS_TAB_SERVICES "ºÃÔ¡ÒÃ" + IDS_TAB_STARTUP "àÃÔèÁ§Ò¹à¤Ã×èÍ§" + IDS_TAB_TOOLS "à¤Ã×èÍ§Á×Í" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_SERVICES_COLUMN_SERVICE "ºÃÔ¡ÒÃ" + IDS_SERVICES_COLUMN_REQ "¤ÇÒÁµéÍ§¡ÒÃ" + IDS_SERVICES_COLUMN_VENDOR "µÑÇá·¹" + IDS_SERVICES_COLUMN_STATUS "Ê¶Ò¹Ð" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_TOOLS_COLUMN_NAME "ª×èÍ" + IDS_TOOLS_COLUMN_DESCR "ÃÒÂÅÐàÍÕÂ´" + + IDS_TOOLS_CMD_NAME "ÊèÇ¹à½éÒ¤ØÁ" + IDS_TOOLS_CMD_DESCR "" + IDS_TOOLS_CMD_CMD "cmd.exe" + + IDS_TOOLS_INFO_NAME "ÃØè¹·Õè" + IDS_TOOLS_INFO_DESCR "áÊ´§ÃØè¹¢Í§¢éÍÁÙÅ" + IDS_TOOLS_INFO_CMD "winver.exe" + + IDS_TOOLS_REGEDIT_NAME "µÑÇá¡éä¢àÃ¨ÕÊµÕ" + IDS_TOOLS_REGEDIT_DESCR "à»Ô´µÑÇá¡éä¢àÃ¨ÕÊµÕ" + IDS_TOOLS_REGEDIT_CMD "regedit.exe" + + IDS_TOOLS_SYSDM_NAME "¤Ø³ÊÁºÑµÔ¢Í§ÃÐºº" + IDS_TOOLS_SYSDM_DESCR "áÊ´§¢éÍÁÙÅà¡ÕèÂÇ¡Ñº¤ÍÁ¾ÔÇàµÍÃì¹Õé" + IDS_TOOLS_SYSDM_CMD "ÊèÇ¹¤Çº¤ØÁ" + IDS_TOOLS_SYSDM_PARAM "sysdm.cpl" + + IDS_STARTUP_COLUMN_ELEMENT "ÊèÇ¹»ÃÐ¡Íº" + IDS_STARTUP_COLUMN_CMD "¤ÓÊÑè§" + IDS_STARTUP_COLUMN_PATH "àÊé¹·Ò§" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_SERVICES_STATUS_RUNNING "¡ÓÅÑ§´Óà¹Ô¹§Ò¹" + IDS_SERVICES_STATUS_STOPPED "ËÂØ´áÅéÇ" + IDS_SERVICES_YES "ãªè" + IDS_SERVICES_UNKNOWN "äÁè·ÃÒº" +END Modified: trunk/reactos/base/applications/msconfig/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/rsrc.rc (original) +++ trunk/reactos/base/applications/msconfig/rsrc.rc Fri Apr 13 18:29:01 2007 @@ -18,3 +18,5 @@ #include "lang/it-IT.rc" #include "lang/nb-NO.rc" #include "lang/nl-NL.rc" +#include "lang/th-TH.rc" + Added: trunk/reactos/base/applications/mscutils/servman/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/lang/th-TH.rc (added) +++ trunk/reactos/base/applications/mscutils/servman/lang/th-TH.rc Fri Apr 13 18:29:01 2007 @@ -1,0 +1,291 @@ +/* + * PROJECT: ReactOS Services + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/applications/mscutils/servman/lang/th-TH.rc + * PURPOSE: Thai resources + * COPYRIGHT: Copyright 2007 Sumath Aowsakulsutthi + * + */ + +LANGUAGE LANG_THAI, SUBLANG_DEFAULT + +IDR_MAINMENU MENU +BEGIN + POPUP "á&¿éÁ" + BEGIN + MENUITEM "Êè§ÍÍ¡...", ID_EXPORT + MENUITEM SEPARATOR + MENUITEM "&ÍÍ¡¨Ò¡â»Ãá¡ÃÁ", ID_EXIT + END + POPUP "àÃÔèÁ·Ó·Ñ¹·Õ" + BEGIN + MENUITEM "àª×èÍÁµèÍä»ÂÑ§...", ID_CONNECT, GRAYED + MENUITEM SEPARATOR + MENUITEM "àÃÔèÁµé¹", ID_START, GRAYED + MENUITEM "ËÂØ´", ID_STOP, GRAYED + MENUITEM "¾Ñ¡", ID_PAUSE, GRAYED + MENUITEM "àÃÔèÁ·ÓµèÍ", ID_RESUME, GRAYED + MENUITEM "àÃÔèÁãËÁè", ID_RESTART, GRAYED + MENUITEM SEPARATOR + MENUITEM "¿×é¹¿Ù", ID_REFRESH + MENUITEM SEPARATOR + MENUITEM "á¡éä¢...", ID_EDIT, GRAYED + MENUITEM "ÊÃéÒ§...", ID_CREATE + MENUITEM "Åº...", ID_DELETE, GRAYED + MENUITEM SEPARATOR + MENUITEM "¤Ø³ÊÁºÑµÔ...", ID_PROP, GRAYED + END + POPUP "ÁØÁÁÍ§" + BEGIN + MENUITEM "ÊÑÃÙ»¢¹Ò´ãËè", ID_VIEW_LARGE + MENUITEM "ÊÑÃÙ»¢¹Ò´àÅç¡", ID_VIEW_SMALL + MENUITEM "ÃÒÂ¡ÒÃ", ID_VIEW_LIST + MENUITEM "ÃÒÂÅÐàÍÕÂ´", ID_VIEW_DETAILS + MENUITEM SEPARATOR + MENUITEM "µÒÁ»¡µÔ...", ID_VIEW_CUST, GRAYED + END + POPUP "ªèÇÂàËÅ×Í" + BEGIN + MENUITEM "ªèÇÂàËÅ×Í", ID_HELP + MENUITEM "à¡ÕèÂÇ¡Ñº", ID_ABOUT + END +END + +IDR_POPUP MENU +BEGIN + POPUP "à»Ô´Ë¹éÒµèÒ§·Ó§Ò¹" + BEGIN + MENUITEM "àÃÔèÁµé¹", ID_START, GRAYED + MENUITEM "ËÂØ´", ID_STOP, GRAYED + MENUITEM "¾Ñ¡", ID_PAUSE, GRAYED + MENUITEM "àÃÔèÁ·ÓµèÍ", ID_RESUME, GRAYED + MENUITEM "àÃÔèÁãËÁè", ID_RESTART, GRAYED + MENUITEM SEPARATOR + MENUITEM "¿×é¹¿Ù", ID_REFRESH + MENUITEM SEPARATOR + MENUITEM "á¡éä¢...", ID_EDIT, GRAYED + MENUITEM "Åº...", ID_DELETE, GRAYED + MENUITEM SEPARATOR + MENUITEM "¤Ø³ÊÁºÑµÔ...", ID_PROP, GRAYED + MENUITEM SEPARATOR + MENUITEM "ªèÇÂàËÅ×Í...", ID_HELP + END +END + +IDD_ABOUTBOX DIALOGEX 22,16,190,182 +CAPTION "à¡ÕèÂÇ¡Ñº¡ÒÃºÃÔ¡ÒÃ¨Ñ´¡ÒÃ" +FONT 8, "MS Shell Dlg",0,0 +STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME +BEGIN + LTEXT "â»Ãá¡ÃÁ¡ÒÃºÃÔ¡ÒÃ¨Ñ´¡ÒÃ ÃØè¹ 0.5.1\nÅÔ¢ÊÔ·¸Ôì (C) 2005-2006\nâ´Â à¡é´ àÁÍÃì¿Õè (gedmurphy(a)gmail.com)", IDC_STATIC, 48, 7, 130, 26 + PUSHBUTTON "»Ô´", IDOK, 75, 162, 44, 15 + ICON IDI_SM_ICON, IDC_STATIC, 10, 10, 7, 30 + EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE +END + +IDD_DLG_GENERAL DIALOGEX 6,6,253,225 +CAPTION "·ÑèÇä»" +FONT 8, "MS Shell Dlg",0,0 +STYLE WS_BORDER | WS_VISIBLE | WS_DLGFRAME | WS_SYSMENU | WS_THICKFRAME | WS_GROUP | WS_TABSTOP +BEGIN + LTEXT "", IDC_SERV_NAME, 70,11,176,11, WS_CHILD | WS_VISIBLE + EDITTEXT IDC_DISP_NAME, 70, 29, 176, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_READONLY + EDITTEXT IDC_DESCRIPTION, 70, 46, 176, 24, WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_MULTILINE | ES_READONLY + EDITTEXT IDC_EXEPATH, 6, 86, 240, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_READONLY + COMBOBOX IDC_START_TYPE, 70, 107, 176, 40, WS_CHILD | WS_VISIBLE | WS_TABSTOP | CBS_DROPDOWNLIST + PUSHBUTTON "àÃÔèÁµé¹", IDC_START, 6, 155, 54, 15, WS_DISABLED + PUSHBUTTON "ËÂØ´", IDC_STOP, 68, 155, 54, 15, WS_DISABLED + PUSHBUTTON "¾Ñ¡", IDC_PAUSE , 130, 155, 54, 15, WS_DISABLED + PUSHBUTTON "àÃÔèÁ·ÓµèÍ", IDC_RESUME, 192, 155, 54, 15, WS_DISABLED + LTEXT "ª×èÍºÃÔ¡ÒÃ:", IDC_STATIC, 4, 11, 53, 11 + LTEXT "áÊ´§ª×èÍ:", IDC_STATIC, 4, 29, 53, 11 + LTEXT "¤ÓºÃÃÂÒÂ:", IDC_STATIC, 4, 51, 53, 11 + LTEXT "àÊé¹·Ò§ä»¡ÒÃ»ÃÐÁÇÅ¼Å:", IDC_STATIC, 6, 73, 82, 9 + LTEXT "ÃÙ»áºº¡ÒÃàÃÔèÁµé¹:", IDC_STATIC, 6, 108, 53, 11 + LTEXT "Ê¶Ò¹ÐºÃÔ¡ÒÃ:", IDC_STATIC, 4, 138, 53, 11 + LTEXT "", IDC_SERV_STATUS, 70, 138, 176, 11, WS_CHILD | WS_VISIBLE + LTEXT "¤Ø³ÊÒÁÒÃ¶¡ÓË¹´¤èÒµÑÇá»ÃµèÒ§æã¹µÍ¹àÃÔèÁµé¹¡ÒÃãªé§Ò¹ àÁ×èÍ¤Ø³àÃÔèÁãËéºÃÔ¡ÒÃ·ÕèµÃ§¹Õé.",IDC_STATIC, 6,177,240,15 + LTEXT "àÃÔèÁµé¹¤èÒµÑÇá»ÃµèÒ§æ:", IDC_STATIC, 6, 200, 58, 11 + EDITTEXT IDC_START_PARAM, 68, 199, 178, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END + +IDD_DLG_DEPEND DIALOGEX 6,6,253,225 +CAPTION "áººäÁè¡ÓË¹´àÍ§" +FONT 8, "MS Shell Dlg",0,0 +STYLE WS_BORDER | WS_VISIBLE | WS_DLGFRAME | WS_SYSMENU | WS_THICKFRAME | WS_GROUP | WS_TABSTOP +BEGIN + CONTROL "", IDC_DEPEND_TREE1, "SysTreeView32" ,0x50010007, 8, 70, 236, 68, 0x00000200 + CONTROL "", IDC_DEPEND_TREE2, "SysTreeView32", 0x50010007, 8, 151, 234, 67, 0x00000200 + LTEXT "¡ÒÃãËéºÃÔ¡ÒÃºÒ§ÍÂèÒ§¢Öé¹¡ÑººÃÔ¡ÒÃÍ×è¹æ´éÇÂ, µÑÇ¢Ñºà¤Å×èÍ¹¢Í§ÃÐºº áÅÐ¡ÒÃ´Ö§¢éÍÁÙÅµÒÁÅÓ´Ñº¡ÅØèÁ ¶éÒÊèÇ¹»ÃÐ¡ÍºµèÒ§æ¢Í§ÃÐººËÂØ´·Ó§Ò¹Å§ ËÃ×ÍäÁè·Ó§Ò¹µÒÁÊÁ¤ÇÃ ¡ÒÃãËéºÃÔ¡ÒÃáººäÁè¡ÓË¹´àÍ§¨ÐÁÕ¼Å·Ñ¹·Õ", IDC_STATIC,8, 7, 238, 26 + LTEXT "¡ÒÃãËéºÃÔ¡ÒÃ¹Õé¢Öé¹ÍÂÙè¡ÑºÊèÇ¹»ÃÐ¡ÍºÍ×è¹æ·ÕèµÒÁÁÒ´éÇÂ", IDC_STATIC, 8, 57, 236, 9 + LTEXT "", IDC_DEPEND_SERVICE, 8, 38, 236, 13 +END + +IDD_DLG_CREATE DIALOGEX 6,6,225,209 +CAPTION "ÊÃéÒ§¡ÒÃãËéºÃÔ¡ÒÃ" +FONT 8, "MS Shell Dlg",0,0 +STYLE WS_BORDER | WS_VISIBLE | WS_DLGFRAME | WS_SYSMENU | WS_THICKFRAME | WS_GROUP | WS_TABSTOP +BEGIN + EDITTEXT IDC_CREATE_SERVNAME, 72, 12, 150, 11, WS_CHILD | WS_VISIBLE | WS_EX_CLIENTEDGE + EDITTEXT IDC_CREATE_DISPNAME, 72, 31, 150, 11, WS_CHILD | WS_VISIBLE + EDITTEXT IDC_CREATE_PATH, 8, 62, 214, 13, WS_CHILD | WS_VISIBLE + EDITTEXT IDC_CREATE_DESC, 10, 97, 210, 48, WS_CHILD | WS_VISIBLE + EDITTEXT IDC_CREATE_OPTIONS, 10, 162, 210, 13, WS_CHILD | WS_VISIBLE + LTEXT "*ª×èÍºÃÔ¡ÒÃ :", IDC_STATIC, 12, 12, 54, 9 + LTEXT "*áÊ´§ª×èÍ :", IDC_STATIC, 12, 33, 54, 9 + LTEXT "*àÊé¹·Ò§ä»¡ÒÃ»ÃÐÁÇÅ¼Å :", IDC_STATIC, 10, 51, 68, 9 + LTEXT "¤ÓºÃÃÂÒÂ :", IDC_STATIC, 12, 86, 44, 9 + PUSHBUTTON "µ¡Å§", IDOK, 126, 192, 44, 13 + PUSHBUTTON "Â¡àÅÔ¡", IDCANCEL, 176, 192, 46, 13 + LTEXT "à¾ÔèÁàµÔÁ·Ò§àÅ×Í¡(¡´àÅ×Í¡·ÕèªèÇÂàËÅ×Íà¾×èÍµéÍ§¡ÒÃÃÒÂÅÐàÍÕÂ´à¾ÔèÁàµÔÁ)", IDC_STATIC, 10, 151, 134, 9 + PUSHBUTTON "ªèÇÂàËÅ×Í", ID_CREATE_HELP, 6, 192, 44, 13 +END + +IDD_DLG_DELETE DIALOGEX 6,6,185,148 +CAPTION "Åº¡ÒÃãËéºÃÔ¡ÒÃ" +FONT 8, "MS Shell Dlg",0,0 +STYLE WS_BORDER | WS_DLGFRAME | DS_MODALFRAME +BEGIN + ICON IDI_WARNING, IDC_STATIC, 10, 8, 24, 22 + LTEXT "¤Ø³á¹èã¨ÇèÒµéÍ§¡ÒÃÅº¡ÒÃãËéºÃÔ¡ÒÃµèÍä»¹ÕéãªèäËÁ ? ÊÔè§¹ÕéäÁèÊÒÁÒÃ¶Â¡àÅÔ¡ÍÍ¡ä»á¤è¤ÃÑé§à´ÕÂÇ !", IDC_STATIC, 50, 6, 125, 25 + LTEXT "ª×èÍºÃÔ¡ÒÃ:",IDC_STATIC, 6, 40, 80, 9 + LTEXT "", IDC_DEL_NAME, 15, 53, 160, 15 + EDITTEXT IDC_DEL_DESC, 6, 73, 174, 48, WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_EX_STATICEDGE | ES_MULTILINE | ES_READONLY + PUSHBUTTON "ãªè", IDOK, 26, 129, 54, 13 + PUSHBUTTON "äÁèãªè", IDCANCEL, 102, 129, 54, 13 +END + +IDD_DLG_HELP_OPTIONS DIALOGEX 6,6,200,150 +CAPTION "µÑÇàÅ×Í¡" +FONT 8, "MS Shell Dlg",0,0 +STYLE 0x10CF0000 +BEGIN + LTEXT "", IDC_CREATE_HELP, 6, 5, 200, 150 + PUSHBUTTON "µ¡Å§", IDOK, 75, 130, 44, 13 +END + +IDD_DLG_PROGRESS DIALOGEX 6,6,255,89 +CAPTION "µÑÇ¤Çº¤ØÁºÃÔ¡ÒÃ" +FONT 8, "MS Shell Dlg",0,0 +STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME +EXSTYLE WS_EX_TOOLWINDOW +BEGIN + CONTROL "", IDC_SERVCON_PROGRESS, "msctls_progress32", 0x50000000, 8, 46, 238, 13 + LTEXT "", IDC_SERVCON_INFO, 8, 5, 236, 11 + LTEXT "", IDC_SERVCON_NAME, 8, 25, 66, 11 + PUSHBUTTON "&»Ô´", IDOK, 100, 70, 54, 13 +END + + + +STRINGTABLE DISCARDABLE +BEGIN + IDS_FIRSTCOLUMN "ª×èÍ" + IDS_SECONDCOLUMN "¤ÓºÃÃÂÒÂ" + IDS_THIRDCOLUMN "Ê¶Ò¹Ð" + IDS_FOURTHCOLUMN "ÃÙ»áººàÃÔèÁµé¹" + IDS_FITHCOLUMN "»éÍ¹¤èÒà¢éÒÃÐººà»ç¹" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_SERVICES_STARTED "àÃÔèÁµé¹" + IDS_SERVICES_STOPPED "ËÂØ´" + IDS_SERVICES_AUTO "áººÍÑµâ¹ÁÑµÔ" + IDS_SERVICES_MAN "áºº¡ÓË¹´àÍ§" + IDS_SERVICES_DIS "äÁèÁÕ" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_NUM_SERVICES "Num Services: %d" + IDS_LICENSE "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.\r\n\r\nThis 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.\r\n\r\nYou 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." +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_TOOLTIP_PROP "Properties" + IDS_TOOLTIP_REFRESH "Refresh" + IDS_TOOLTIP_EXPORT "Export list" + IDS_TOOLTIP_CREATE "Create a new service" + IDS_TOOLTIP_DELETE "Deletes an existing service" + IDS_TOOLTIP_START "Start service" + IDS_TOOLTIP_STOP "Stop service" + IDS_TOOLTIP_PAUSE "Pause service" + IDS_TOOLTIP_RESTART "Restart service" + IDS_TOOLTIP_HELP "Help" + IDS_TOOLTIP_EXIT "Exit" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_PROGRESS_INFO_START "ReactOS is attempting to start the following service" + IDS_PROGRESS_INFO_STOP "ReactOS is attempting to stop the following service" + IDS_CREATE_SUCCESS "Service Created Succesfully" + IDS_CREATE_REQ "Fields marked with an\nasterix are mandatory" + IDS_DELETE_STOP "You must manually stop the service before deleting!" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_HELP_OPTIONS "CREATE OPTIONS:\r\nNOTE: The option name includes the equal sign.\r\n type= <own|share|interact|kernel|filesys|rec>\r\n (default = own)\r\n start= <boot|system|auto|demand|disabled>\r\n (default = demand) \r\n error= <normal|severe|critical|ignore>\r\n (default = normal)\r\n group= <LoadOrderGroup>\r\n tag= <yes|no>\r\n depend= <Dependencies(separated by / (forward slash))>\r\n obj= <AccountName|ObjectName>\r\n (default = LocalSystem)\r\n password= <password>\r\n" +END +#define IDS_HINT_BLANK 20000 +#define IDS_HINT_EXPORT 20001 +#define IDS_HINT_EXIT 20002 + +#define IDS_HINT_CONNECT 20011 +#define IDS_HINT_START 20012 +#define IDS_HINT_STOP 21013 +#define IDS_HINT_PAUSE 21014 +#define IDS_HINT_RESUME 20015 +#define IDS_HINT_RESTART 20016 +#define IDS_HINT_REFRESH 20017 +#define IDS_HINT_EDIT 20018 +#define IDS_HINT_CREATE 20019 +#define IDS_HINT_DELETE 20020 +#define IDS_HINT_PROP 20021 + +#define IDS_HINT_LARGE 20030 +#define IDS_HINT_SMALL 20031 +#define IDS_HINT_LIST 20032 +#define IDS_HINT_DETAILS 20033 +#define IDS_HINT_CUST 20034 + +#define IDS_HINT_HELP 20040 +#define IDS_HINT_ABOUT 20041 +/* Hints */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_HINT_BLANK " " + IDS_HINT_EXPORT " Exports the current list to a file." + IDS_HINT_EXIT " Exits the program." + + IDS_HINT_CONNECT " Manage a different computer." + IDS_HINT_START " Start the selected service." + IDS_HINT_STOP " Stop the selected service." + IDS_HINT_PAUSE " Pause the selected service." + IDS_HINT_RESUME " Resume the selected service." + IDS_HINT_RESTART " Stop and start the selected service." + IDS_HINT_REFRESH " Refresh the service list." + IDS_HINT_EDIT " Edit the properties of the selected service." + IDS_HINT_CREATE " Create a new service." + IDS_HINT_DELETE " Delete the selected service." + IDS_HINT_PROP " Open property sheet for the current selection." + + IDS_HINT_LARGE " Display items by using large icons." + IDS_HINT_SMALL " Display items by using small icons." + IDS_HINT_LIST " Display item in a list." + IDS_HINT_DETAILS " Display information about each item in a window." + IDS_HINT_CUST " Customizes the view." + + IDS_HINT_HELP " Display help window." + IDS_HINT_ABOUT " About ReactOS Service Manager." + + IDS_HINT_SYS_RESTORE " Restores this window to normal size." + IDS_HINT_SYS_MOVE " Moves this window." + IDS_HINT_SYS_SIZE " Resizes this window." + IDS_HINT_SYS_MINIMIZE " Collapses this window to an icon." + IDS_HINT_SYS_MAXIMIZE " Expands this window to fill this screen." + IDS_HINT_SYS_CLOSE " Closes this window." +END Modified: trunk/reactos/base/applications/mscutils/servman/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/rsrc.rc (original) +++ trunk/reactos/base/applications/mscutils/servman/rsrc.rc Fri Apr 13 18:29:01 2007 @@ -32,4 +32,5 @@ #include "lang/id-ID.rc" #include "lang/it-IT.rc" #include "lang/ru-RU.rc" +#include "lang/th-TH.rc" Added: trunk/reactos/base/applications/regedit/clb/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/clb/lang/th-TH.rc (added) +++ trunk/reactos/base/applications/regedit/clb/lang/th-TH.rc Fri Apr 13 18:29:01 2007 @@ -1,0 +1,46 @@ +/* + * Regedit (Thai resources) + * + * Copyright 2006 Sumath Aowsakulsutthi + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_THAI, SUBLANG_DEFAULT + +IDD_COLUMNLISTBOXSTYLES DIALOGEX 0, 0, 227, 215 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Column List Box Styles" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "Column List Box Styles", -1, 6, 7, 158, 71 + CHECKBOX "&ÁÒµÃ°Ò¹", 1710, 10, 20, 42, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "&¡ÃÍº", 1713, 10, 30, 34, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "&¨Ñ´àÃÕÂ§", 1705, 10, 40, 26, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "á¨é§&ÃÒÂÅÐàÍÕÂ´", 1706, 10, 50, 32, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "á¶ºàÅ×èÍ¹á¹Ç&µÑé§", 1707, 10, 60, 64, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "àÅ×Í¡ËÅÒÂ&ÊèÇ¹", -1, 79, 20, 72, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP | WS_DISABLED + CHECKBOX "&¢ÂÒÂÊèÇ¹·ÕèàÅ×Í¡äÇé", -1, 79, 30, 77, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP | WS_DISABLED + CHECKBOX "&à»Ô´Ë¹éÒµèÒ§µé¹àÃ×èÍ§ãËÁè", 1714, 79, 40, 68, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "&Â×´á¹ÇµÑé§", 1715, 79, 50, 66, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + GROUPBOX "ÃÙ»áºº¾×é¹°Ò¹", -1, 6, 80, 158, 34 + CHECKBOX "&ÁÍ§àËç¹ä´é", 1701, 10, 92, 34, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "&·ÓäÁèä´é", 1702, 10, 102, 41, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "&¨Ñ´¡ÅØèÁ", 1703, 79, 92, 32, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "&ËÂØ´µÑé§¡Ñé¹Ë¹éÒ", 1704, 79, 102, 44, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + PUSHBUTTON "µ¡Å§", IDOK, 37, 125, 40, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP + PUSHBUTTON "Â¡àÅÔ¡", IDCANCEL, 93, 125, 40, 14, BS_PUSHBUTTON | WS_GROUP | WS_TABSTOP + CHECKBOX "äÁè&ÁÕá¶ºàÅ×èÍ¹", 1708, 79, 60, 66, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP +END Modified: trunk/reactos/base/applications/regedit/clb/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/clb/rsrc.rc (original) +++ trunk/reactos/base/applications/regedit/clb/rsrc.rc Fri Apr 13 18:29:01 2007 @@ -33,4 +33,5 @@ #include "lang/it-IT.rc" #include "lang/ja-JP.rc" #include "lang/nb-NO.rc" +#include "lang/th-TH.rc" Added: trunk/reactos/base/applications/regedit/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/th-TH.rc (added) +++ trunk/reactos/base/applications/regedit/lang/th-TH.rc Fri Apr 13 18:29:01 2007 @@ -1,0 +1,463 @@ +/* + * Regedit Thai language resources + * + * Copyright 2006 Sumath Aowsakulsutthi + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_THAI, SUBLANG_DEFAULT + +ID_ACCEL ACCELERATORS +{ + VK_DELETE, ID_EDIT_DELETE, VIRTKEY, NOINVERT + "^F", ID_EDIT_FIND + VK_F3, ID_EDIT_FINDNEXT, VIRTKEY, NOINVERT + VK_F5, ID_VIEW_REFRESH, VIRTKEY, NOINVERT + VK_F1, ID_HELP_HELPTOPICS, VIRTKEY, NOINVERT +} + +/* + * Menu + */ + +IDC_REGEDIT MENU DISCARDABLE +BEGIN + POPUP "á&¿éÁ" + BEGIN + MENUITEM "&ÍÍ¡¨Ò¡â»Ãá¡ÃÁ", ID_REGISTRY_EXIT + END + POPUP "&ªèÇÂàËÅ×Í" + BEGIN + MENUITEM "à&¡ÕèÂÇ¡Ñº ...", ID_HELP_ABOUT + END +END + +IDR_REGEDIT_MENU MENU DISCARDABLE +BEGIN + POPUP "á&¿éÁ" + BEGIN + MENUITEM "&¹Óà¢éÒ...", ID_REGISTRY_IMPORTREGISTRYFILE + + MENUITEM "&Êè§ÍÍ¡...", ID_REGISTRY_EXPORTREGISTRYFILE + + MENUITEM SEPARATOR + MENUITEM "Load Hive...", ID_REGISTRY_LOADHIVE, GRAYED + MENUITEM "Unload Hive...", ID_REGISTRY_UNLOADHIVE, GRAYED + MENUITEM SEPARATOR + MENUITEM "&Connect Network Registry...", + ID_REGISTRY_CONNECTNETWORKREGISTRY + + MENUITEM "&Disconnect Network Registry...", + ID_REGISTRY_DISCONNECTNETWORKREGISTRY + , GRAYED + MENUITEM SEPARATOR + MENUITEM "&¾ÔÁ¾ì\tCtrl+P", ID_REGISTRY_PRINT, GRAYED + MENUITEM SEPARATOR + MENUITEM "&ÍÍ¡¨Ò¡â»Ãá¡ÃÁ", ID_REGISTRY_EXIT + END + POPUP "á&¡éä¢" + BEGIN + MENUITEM "&»ÃÑº»ÃØ§", ID_EDIT_MODIFY + MENUITEM SEPARATOR + POPUP "ã&ËÁè" + BEGIN + MENUITEM "&Key", ID_EDIT_NEW_KEY + MENUITEM SEPARATOR + MENUITEM "&String Value", ID_EDIT_NEW_STRINGVALUE + MENUITEM "&Binary Value", ID_EDIT_NEW_BINARYVALUE + MENUITEM "&DWORD Value", ID_EDIT_NEW_DWORDVALUE + MENUITEM "&Multi-String Value", ID_EDIT_NEW_MULTISTRINGVALUE + MENUITEM "&Expandable String Value", ID_EDIT_NEW_EXPANDABLESTRINGVALUE + END + MENUITEM SEPARATOR + MENUITEM "&Permissions...", ID_EDIT_PERMISSIONS + MENUITEM SEPARATOR + MENUITEM "&Delete\tDel", ID_EDIT_DELETE + MENUITEM "&Rename", ID_EDIT_RENAME + MENUITEM SEPARATOR + MENUITEM "&Copy Key Name", ID_EDIT_COPYKEYNAME + MENUITEM SEPARATOR + MENUITEM "&Find\tCtrl+F", ID_EDIT_FIND + MENUITEM "Find Ne&xt\tF3", ID_EDIT_FINDNEXT + END + POPUP "&View" + BEGIN + MENUITEM "Status &Bar", ID_VIEW_STATUSBAR + MENUITEM SEPARATOR + MENUITEM "Sp&lit", ID_VIEW_SPLIT + MENUITEM SEPARATOR + MENUITEM "&Refresh\tF5", ID_VIEW_REFRESH + END + POPUP "&Favorites" + BEGIN + MENUITEM "&Add to Favorites", ID_FAVOURITES_ADDTOFAVOURITES + , GRAYED + MENUITEM "&Remove Favorite", ID_FAVOURITES_REMOVEFAVOURITE + , GRAYED + END + POPUP "&Help" + BEGIN + MENUITEM "&Help Topics\tF1", ID_HELP_HELPTOPICS + MENUITEM SEPARATOR + MENUITEM "&About Registry Editor", ID_HELP_ABOUT + END +END + +IDR_POPUP_MENUS MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "&Modify", ID_EDIT_MODIFY + MENUITEM "Modify Binary Data", ID_EDIT_MODIFY_BIN + MENUITEM SEPARATOR + MENUITEM "&Delete\tDel", ID_EDIT_DELETE + MENUITEM "&Rename", ID_EDIT_RENAME + END + POPUP "" + BEGIN + POPUP "&New" + BEGIN + MENUITEM "&Key", ID_EDIT_NEW_KEY + MENUITEM SEPARATOR + MENUITEM "&String Value", ID_EDIT_NEW_STRINGVALUE + MENUITEM "&Binary Value", ID_EDIT_NEW_BINARYVALUE + MENUITEM "&DWORD Value", ID_EDIT_NEW_DWORDVALUE + END + END + POPUP "" + BEGIN + MENUITEM "Expand/Collapse", ID_TREE_EXPANDBRANCH + POPUP "&New" + BEGIN + MENUITEM "&Key", ID_EDIT_NEW_KEY + MENUITEM SEPARATOR + MENUITEM "&String Value", ID_EDIT_NEW_STRINGVALUE + MENUITEM "&Binary Value", ID_EDIT_NEW_BINARYVALUE + MENUITEM "&DWORD Value", ID_EDIT_NEW_DWORDVALUE + END + MENUITEM "&Find", ID_EDIT_FIND + MENUITEM SEPARATOR + MENUITEM "&Delete", ID_TREE_DELETE + MENUITEM "&Rename", ID_TREE_RENAME + MENUITEM SEPARATOR + MENUITEM "&Export", ID_TREE_EXPORT + MENUITEM "&Permissions...", ID_TREE_PERMISSIONS, GRAYED + MENUITEM SEPARATOR + MENUITEM "&Copy Key Name", ID_EDIT_COPYKEYNAME + END +END + + +/* + * Dialog + */ + +IDD_EDIT_STRING DIALOG 32, 24, 252, 84 +STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | + WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Edit String" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Value &name:",IDC_STATIC,6,6,134,8 + EDITTEXT IDC_VALUE_NAME,6,17,240,12,ES_AUTOHSCROLL | ES_READONLY + LTEXT "&Value data:",IDC_STATIC,6,35,161,8 + EDITTEXT IDC_VALUE_DATA,6,46,240,12,ES_AUTOHSCROLL + DEFPUSHBUTTON "OK",IDOK,142,64,50,14 + PUSHBUTTON "Cancel",IDCANCEL,196,64,50,14 +END + +IDD_EDIT_MULTI_STRING DIALOG 32, 24, 252, 174 +STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | + WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Edit Multi-String" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Value &name:",IDC_STATIC,6,6,134,8 + EDITTEXT IDC_VALUE_NAME,6,17,240,12,ES_AUTOHSCROLL | ES_READONLY + LTEXT "&Value data:",IDC_STATIC,6,35,161,8 + EDITTEXT IDC_VALUE_DATA,6,46,240,102,ES_AUTOHSCROLL | ES_MULTILINE | ES_WANTRETURN | ES_AUTOVSCROLL | WS_VSCROLL + DEFPUSHBUTTON "OK",IDOK,142,154,50,14 + PUSHBUTTON "Cancel",IDCANCEL,196,154,50,14 +END + +IDD_EDIT_BIN_DATA DIALOG 32, 24, 252, 174 +STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | + WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Edit Binary Value" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Value &name:",IDC_STATIC,6,6,134,8 + EDITTEXT IDC_VALUE_NAME,6,17,240,12,ES_AUTOHSCROLL | ES_READONLY + LTEXT "&Value data:",IDC_STATIC,6,35,161,8 + CONTROL "",IDC_VALUE_DATA,"HexEdit32",WS_VSCROLL | WS_BORDER | WS_TABSTOP,6,46,240,102 + DEFPUSHBUTTON "OK",IDOK,142,154,50,14 + PUSHBUTTON "Cancel",IDCANCEL,196,154,50,14 +END + + +IDD_EDIT_DWORD DIALOG 32, 24, 252, 104 +STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | + WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Edit DWORD" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Value &name:",IDC_STATIC,6,6,134,8 + EDITTEXT IDC_VALUE_NAME,6,17,240,12,ES_AUTOHSCROLL | ES_READONLY + LTEXT "&Value data:",IDC_STATIC,6,35,161,8 + EDITTEXT IDC_VALUE_DATA,6,46,116,12,ES_AUTOHSCROLL + GROUPBOX "Base",IDC_STATIC,130,35,116,39 + AUTORADIOBUTTON "&Hexadecimal",IDC_FORMAT_HEX,141,46,60,10,WS_GROUP + AUTORADIOBUTTON "&Decimal",IDC_FORMAT_DEC,141,59,60,10 + DEFPUSHBUTTON "OK",IDOK,142,82,50,14 + PUSHBUTTON "Cancel",IDCANCEL,196,82,50,14 +END + +/* + * String Table + */ + +STRINGTABLE DISCARDABLE +BEGIN + IDS_LIST_COLUMN_NAME "Name" + IDS_LIST_COLUMN_TYPE "Type" + IDS_LIST_COLUMN_DATA "Data" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_APP_TITLE "Registry Editor" + IDC_REGEDIT "REGEDIT" + IDC_REGEDIT_FRAME "REGEDIT_FRAME" +END + +STRINGTABLE DISCARDABLE +BEGIN + ID_REGISTRY_MENU "Contains commands for working with the whole registry" + ID_EDIT_MENU "Contains commands for editing values or keys" + ID_VIEW_MENU "Contains commands for customising the registry window" + ID_FAVOURITES_MENU "Contains commands for accessing frequently used keys" + ID_HELP_MENU "Contains commands for displaying help and information about registry editor" + ID_EDIT_NEW_MENU "Contains commands for creating new keys or values" +END + +STRINGTABLE DISCARDABLE +BEGIN + ID_EDIT_MODIFY "Modifies the value's data" + ID_EDIT_NEW_KEY "Adds a new key" + ID_EDIT_NEW_STRINGVALUE "Adds a new string value" + ID_EDIT_NEW_BINARYVALUE "Adds a new binary value" + ID_EDIT_NEW_DWORDVALUE "Adds a new double word value" + ID_REGISTRY_IMPORTREGISTRYFILE "Imports a text file into the registry" + ID_REGISTRY_EXPORTREGISTRYFILE + "Exports all or part of the registry to a text file" + ID_REGISTRY_CONNECTNETWORKREGISTRY + "Connects to a remote computer's registry" + ID_REGISTRY_DISCONNECTNETWORKREGISTRY + "Disconnects from a remote computer's registry" + ID_REGISTRY_PRINT "Prints all or part of the registry" +/* ID_HELP_HELPTOPICS "Opens registry editor help" */ + ID_HELP_ABOUT "Displays program information, version number and copyright" +END + +STRINGTABLE DISCARDABLE +BEGIN + ID_REGISTRY_EXIT "Quits the registry editor" + ID_FAVOURITES_ADDTOFAVOURITES "Adds keys to the favourites list" + ID_FAVOURITES_REMOVEFAVOURITE "Removes keys from the favourites list" + ID_VIEW_STATUSBAR "Shows or hides the status bar" + ID_VIEW_SPLIT "Change position of split between two panes" + ID_VIEW_REFRESH "Refreshes the window" + ID_EDIT_DELETE "Deletes the selection" + ID_EDIT_RENAME "Renames the selection" + ID_EDIT_COPYKEYNAME "Copies the name of the selected key to the clipboard" + ID_EDIT_FIND "Finds a text string in a key, value or data" + ID_EDIT_FINDNEXT "Finds next occurrence of text specified in previous search" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_ERROR "Error" + IDS_WARNING "Warning" + IDS_BAD_KEY "Can't query key '%s'" + IDS_BAD_VALUE "Can't query value '%s'" + IDS_UNSUPPORTED_TYPE "Can't edit keys of this type (%ld)" + IDS_TOO_BIG_VALUE "Value is too big (%ld)" + IDS_MULTI_SZ_EMPTY_STRING "Data of type REG_MULTI_SZ cannot contain empty strings.\nThe empty strings have been removed from the list." + IDS_QUERY_DELETE_KEY_ONE "Are you sure you want to delete this key?" + IDS_QUERY_DELETE_KEY_MORE "Are you sure you want to delete these keys?" + IDS_QUERY_DELETE_KEY_CONFIRM "Confirm Key Delete" + IDS_QUERY_DELETE_ONE "Are you sure you want to delete this value?" + IDS_QUERY_DELETE_MORE "Are you sure you want to delete these values?" + IDS_QUERY_DELETE_CONFIRM "Confirm Value Delete" + IDS_ERR_DELVAL_CAPTION "Error Deleting Values" + IDS_ERR_DELETEVALUE "Unable to delete all specified values!" + IDS_ERR_RENVAL_CAPTION "Error Renaming Value" + IDS_ERR_RENVAL_TOEMPTY "Cannot rename %s. The specified value name is empty. Try another name and try again." + IDS_NEW_KEY "New Key #%d" + IDS_NEW_VALUE "New Value #%d" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_BINARY_EMPTY "(zero-length binary value)" + IDS_DEFAULT_VALUE_NAME "(Default)" + IDS_VALUE_NOT_SET "(value not set)" + IDS_UNKNOWN_TYPE "Unknown type: (0x%lx)" + IDS_MY_COMPUTER "My Computer" + IDS_IMPORT_REG_FILE "Import Registry File" + IDS_EXPORT_REG_FILE "Export Registry File" + IDS_INVALID_DWORD "(invalid DWORD value)" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_FLT_REGFILES "Registration Files" + IDS_FLT_REGFILES_FLT "*.reg" + IDS_FLT_REGEDIT4 "Win9x/NT4 Registration Files (REGEDIT4)" + IDS_FLT_REGEDIT4_FLT "*.reg" + IDS_FLT_ALLFILES "All Files (*.*)" + IDS_FLT_ALLFILES_FLT "*.*" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_ACCESS_FULLCONTROL "Full Control" + IDS_ACCESS_READ "Read" + IDS_ACCESS_QUERYVALUE "Query Value" + IDS_ACCESS_SETVALUE "Set Value" + IDS_ACCESS_CREATESUBKEY "Create Subkey" + IDS_ACCESS_ENUMERATESUBKEYS "Enumerate Subkeys" + IDS_ACCESS_NOTIFY "Notify" + IDS_ACCESS_CREATELINK "Create Link" + IDS_ACCESS_DELETE "Delete" + IDS_ACCESS_WRITEDAC "Write DAC" + IDS_ACCESS_WRITEOWNER "Write Owner" + IDS_ACCESS_READCONTROL "Read Control" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_INHERIT_THISKEYONLY "This key only" + IDS_INHERIT_THISKEYANDSUBKEYS "This key and subkeys" + IDS_INHERIT_SUBKEYSONLY "Subkeys only" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_EXPAND "&Expand" + IDS_COLLAPSE "&Collapse" + IDS_GOTO_SUGGESTED_KEY "&Go to '%s'" + IDS_FINISHEDFIND "Finished searching through the registry." +END + +/*****************************************************************/ + + +/* + * Dialog + */ + +IDD_EXPORTRANGE DIALOG DISCARDABLE 50, 50, 370, 50 +STYLE DS_3DLOOK | DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | + WS_BORDER +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Export Range",IDC_STATIC,2,0,366,48 + CONTROL "&All",IDC_EXPORT_ALL,"Button",BS_AUTORADIOBUTTON,10,10, 29,11 + CONTROL "S&elected Branch",IDC_EXPORT_BRANCH,"Button",BS_AUTORADIOBUTTON,10,22, 100,11 + EDITTEXT IDC_EXPORT_BRANCH_TEXT,30,34,335,12 +END + +IDD_ADDFAVORITES DIALOG DISCARDABLE 0, 0, 186, 46 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Add to Favorites" +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "OK",IDOK,129,7,50,14 + PUSHBUTTON "Cancel",IDCANCEL,129,24,50,14 + LTEXT "&Favorite Name:",IDC_STATIC,7,7,70,10 + EDITTEXT IDC_FAVORITENAME,7,26,110,13,ES_AUTOHSCROLL +END + +IDD_REMOVEFAVORITES DIALOG DISCARDABLE 0, 0, 164, 135 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Remove Favorites" +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "OK",IDOK,107,114,50,14 + PUSHBUTTON "Cancel",IDCANCEL,7,114,50,14 + CONTROL "List1",IDC_FAVORITESLIST,"SysListView32",LVS_LIST | + WS_BORDER | WS_TABSTOP,7,20,150,90 + LTEXT "Select Favorite(s):",IDC_STATIC,7,7,99,12 +END + +IDD_FIND DIALOG DISCARDABLE 0, 0, 254, 82 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Find" +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "&Find Next",IDOK,197,7,50,14 + PUSHBUTTON "Cancel",IDCANCEL,197,24,50,14 + GROUPBOX "Look at",IDC_STATIC,7,25,63,51 + LTEXT "Fi&nd what:",IDC_STATIC,7,8,37,10 + EDITTEXT IDC_FINDWHAT,47,7,142,13,ES_AUTOHSCROLL + CONTROL "&Keys",IDC_LOOKAT_KEYS,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,14,36,35,8 + CONTROL "&Values",IDC_LOOKAT_VALUES,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,14,48,36,8 + CONTROL "&Data",IDC_LOOKAT_DATA,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,14,60,42,8 + CONTROL "Match &whole string only",IDC_MATCHSTRING,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,83,32,94,13 + CONTROL "Match &case",IDC_MATCHCASE,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,83,48,90,12 +END + +IDD_FINDING DIALOGEX 0, 0, 145, 50 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | + WS_CAPTION | WS_SYSMENU +CAPTION "Find" +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + ICON IDI_REGEDIT,IDC_STATIC,7,7,20,20 + PUSHBUTTON "&Cancel",IDCANCEL,93,29,45,14 + LTEXT "Searching the registry...",IDC_STATIC,33,12,83,8 +END + +/* + * TEXTINCLUDE + */ + +1 TEXTINCLUDE DISCARDABLE +BEGIN + "resource.h\0" +END + + + +/* + * String Table + */ + +/* + *STRINGTABLE DISCARDABLE + *BEGIN + * ID_HELP_HELPTOPICS "Opens Registry Editor Help." + * ID_HELP_ABOUT "Displays program information, version number, and copyright." + *END + */ + +/*****************************************************************/ Modified: trunk/reactos/base/applications/regedit/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/rsrc.rc (original) +++ trunk/reactos/base/applications/regedit/rsrc.rc Fri Apr 13 18:29:01 2007 @@ -43,4 +43,5 @@ #include "lang/ru-RU.rc" #include "lang/sl-SI.rc" #include "lang/sv-SE.rc" +#include "lang/th-TH.rc" #include "lang/uk-UA.rc" Added: trunk/reactos/base/applications/screensavers/matrix/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/matrix/lang/th-TH.rc (added) +++ trunk/reactos/base/applications/screensavers/matrix/lang/th-TH.rc Fri Apr 13 18:29:01 2007 @@ -1,0 +1,167 @@ +//Microsoft Developer Studio generated resource script. +// +#include "resource.h" + +#define APSTUDIO_READONLY_SYMBOLS +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#include "afxres.h" + +///////////////////////////////////////////////////////////////////////////// +#undef APSTUDIO_READONLY_SYMBOLS + +///////////////////////////////////////////////////////////////////////////// +// Thai resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENG) +#ifdef _WIN32 +LANGUAGE LANG_THAI, SUBLANG_DEFAULT +#pragma code_page(874) +#endif //_WIN32 + +///////////////////////////////////////////////////////////////////////////// +// +// Dialog +// + +IDD_CONFIG DIALOG DISCARDABLE 0, 0, 340, 183 +STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Matrix ScreenSaver Configuration" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "¶Í´ÃËÑÊ &¤ÇÒÁàÃçÇ",IDC_STATIC,7,7,128,36 + LTEXT "áººªéÒ",IDC_STATIC,13,24,22,8 + CONTROL "ÀÒ¾µèÍà¹×èÍ§1",IDC_SLIDER1,"msctls_trackbar32",TBS_AUTOTICKS | + TBS_BOTH | WS_TABSTOP,38,17,62,22 + LTEXT "áººàÃçÇ¡ÇèÒ",IDC_STATIC,104,24,20,8 + GROUPBOX "¡ÓË¹´ÃËÑÊ &¤ÇÒÁË¹Òá¹è¹",IDC_STATIC,7,50,128,36 + LTEXT "áººËÅÐËÅÇÁ",IDC_STATIC,13,67,19,8 + CONTROL "ÀÒ¾µèÍà¹×èÍ§1",IDC_SLIDER2,"msctls_trackbar32",TBS_AUTOTICKS | + TBS_BOTH | WS_TABSTOP,38,60,62,22 + LTEXT "à¾ÔèÁàµÔÁ",IDC_STATIC,104,67,23,8 + GROUPBOX "&¢éÍ¤ÇÒÁáÊ´§¤ÇÒÁàÃçÇ",IDC_MSGSPEEDGRP,7,93,127,36 + LTEXT "áººªéÒ",IDC_STATIC,13,110,22,8 + CONTROL "ÀÒ¾µèÍà¹×èÍ§3",IDC_SLIDER3,"msctls_trackbar32",TBS_AUTOTICKS | + TBS_BOTH | WS_TABSTOP,38,103,62,22 + LTEXT "áººàÃçÇ¡ÇèÒ",IDC_STATIC,104,110,22,8 + GROUPBOX "&¢¹Ò´µÑÇÍÑ¡ÉÃ",IDC_STATIC,7,137,127,36 + LTEXT "¢¹Ò´àÅç¡Å§",IDC_STATIC,13,153,24,8 + CONTROL "ÀÒ¾µèÍà¹×èÍ§3",IDC_SLIDER4,"msctls_trackbar32",TBS_AUTOTICKS | + TBS_BOTH | WS_TABSTOP,38,146,62,22 + LTEXT "¢¹Ò´ãËè¢Öé¹",IDC_STATIC,104,153,25,8 + GROUPBOX "µÑé§ÃËÑÊ¢éÍ¤ÇÒÁ",IDC_STATIC,145,7,188,142 + COMBOBOX IDC_COMBO1,153,22,172,62,CBS_DROPDOWN | WS_VSCROLL | + WS_TABSTOP + CONTROL "",IDC_PREVIEW,"áºº¤§·Õè",SS_LEFTNOWORDWRAP | + SS_CENTERIMAGE | WS_GROUP,154,39,116,72 + PUSHBUTTON "&à¾ÔèÁ",IDC_ADD,280,41,44,18 + PUSHBUTTON "&à¤Å×èÍ¹ÂéÒÂÍÍ¡",IDC_REMOVE,280,66,44,18 + CONTROL "¢éÍ¤ÇÒÁáººÊØèÁ",IDC_RANDOM,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,151,134,85,10 + DEFPUSHBUTTON "µ¡Å§",IDOK,222,162,50,14 + PUSHBUTTON "Â¡àÅÔ¡",IDCANCEL,283,162,50,14 + COMBOBOX IDC_COMBO2,195,116,130,71,CBS_DROPDOWNLIST | CBS_SORT | + WS_VSCROLL | WS_TABSTOP + LTEXT "&ª×èÍµÑÇÍÑ¡ÉÃ:",IDC_STATIC,151,118,38,8 + CONTROL "&µÑÇË¹Ò",IDC_BOLD,"Button",BS_AUTOCHECKBOX | + BS_MULTILINE | WS_TABSTOP,247,134,46,10 + CTEXT "â»Ãá¡ÃÁÃÑ¡ÉÒË¹éÒ¨ÍáººàÁ·ÃÔ¡«ì www.catch22.org.uk",IDC_ABOUT,140, + 158,75,18 +END + + +///////////////////////////////////////////////////////////////////////////// +// +// DESIGNINFO +// + +#ifdef APSTUDIO_INVOKED +GUIDELINES DESIGNINFO DISCARDABLE +BEGIN + IDD_CONFIG, DIALOG + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 333 + TOPMARGIN, 7 + BOTTOMMARGIN, 176 + END +END +#endif // APSTUDIO_INVOKED + + +#ifdef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// TEXTINCLUDE +// + +1 TEXTINCLUDE DISCARDABLE +BEGIN + "resource.h\0" +END + +2 TEXTINCLUDE DISCARDABLE +BEGIN + "#include ""afxres.h""\r\n" + "\0" +END + +3 TEXTINCLUDE DISCARDABLE +BEGIN + "\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + + +///////////////////////////////////////////////////////////////////////////// +// +// Bitmap +// + +IDB_BITMAP1 BITMAP DISCARDABLE "matrix.bmp" + +///////////////////////////////////////////////////////////////////////////// +// +// Cursor +// + +IDC_BLANKCURSOR CURSOR DISCARDABLE "cursor1.cur" + +///////////////////////////////////////////////////////////////////////////// +// +// Icon +// + +// Icon with lowest ID value placed first to ensure application icon +// remains consistent on all systems. +IDI_ICON1 ICON DISCARDABLE "icon1.ico" + +///////////////////////////////////////////////////////////////////////////// +// +// String Table +// + +STRINGTABLE DISCARDABLE +BEGIN + IDS_DESCRIPTION "Matrix ScreenSaver" +END + +#endif // Thai resources +///////////////////////////////////////////////////////////////////////////// + + + +#ifndef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 3 resource. +// + + +///////////////////////////////////////////////////////////////////////////// +#endif // not APSTUDIO_INVOKED + Added: trunk/reactos/base/applications/screensavers/matrix/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/matrix/rsrc.rc (added) +++ trunk/reactos/base/applications/screensavers/matrix/rsrc.rc Fri Apr 13 18:29:01 2007 @@ -1,0 +1,7 @@ +#include <windows.h> +#include "resource.h" + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +#include "lang/th-TH.rc" + Added: trunk/reactos/base/applications/wordpad/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/lang/th-TH.rc (added) +++ trunk/reactos/base/applications/wordpad/lang/th-TH.rc Fri Apr 13 18:29:01 2007 @@ -1,0 +1,189 @@ +/* + * ReactOS Document Editor + * + * Copyright (C) 2006 Ged Murphy + * Copyright (C) 2006 Sumath Aowsakulsutthi (Thai translation) + * + * 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. + */ + +LANGUAGE LANG_THAI, SUBLANG_DEFAULT + +IDR_MAINMENU MENU +BEGIN + POPUP "á&¿éÁ" + BEGIN + MENUITEM "ã&ËÁè...", ID_NEW + MENUITEM "à&»Ô´...", ID_OPEN + MENUITEM SEPARATOR + MENUITEM "»Ô&´\tCtrl+F4", ID_CLOSE, GRAYED + MENUITEM "»Ô´ &·Ñé§ËÁ´", ID_CLOSEALL, GRAYED + MENUITEM SEPARATOR + MENUITEM "&ºÑ¹·Ö¡", ID_SAVE, GRAYED + MENUITEM "ºÑ¹·Ö¡ à»ç&¹...", ID_SAVEAS, GRAYED + MENUITEM SEPARATOR + MENUITEM "&ÀÒ¾¡èÍ¹¾ÔÁ¾ì", ID_PRINTPRE, GRAYED + MENUITEM "&¾ÔÁ¾ì...", ID_PRINT, GRAYED + MENUITEM SEPARATOR + MENUITEM "&µÑé§¤èÒË¹éÒ¡ÃÐ´ÒÉ...", ID_PAGESETUP, GRAYED + MENUITEM SEPARATOR + MENUITEM "&ÍÍ¡¨Ò¡â»Ãá¡ÃÁ\tAlt+F4", ID_EXIT + END + POPUP "á&¡éä¢" + BEGIN + MENUITEM "à&ÅÔ¡·Ó", ID_UNDO, GRAYED + MENUITEM "&ÂéÍ¹¡ÅÑº", ID_REDO, GRAYED + MENUITEM SEPARATOR + MENUITEM "&µÑ´", ID_CUT, GRAYED + MENUITEM "&¤Ñ´ÅÍ¡", ID_COPY, GRAYED + MENUITEM "&ÇÒ§", ID_PASTE, GRAYED + MENUITEM SEPARATOR + MENUITEM "ÅéÒ&§", -1, GRAYED + MENUITEM "à&Å×Í¡·Ñé§ËÁ´", ID_SELALL, GRAYED + MENUITEM SEPARATOR + MENUITEM "¤é¹&ËÒ...\tCtrl+F",-1, GRAYED + MENUITEM "ËÒµèÍä»", -1, GRAYED + MENUITEM "á·¹·Õè\tCtrl+H", -1, GRAYED + MENUITEM SEPARATOR + MENUITEM "¤Ø³ÊÁºÑµÔ¢Í§ÇÑµ¶Ø",-1, GRAYED + MENUITEM "ÇÑµ¶Ø", -1, GRAYED + END + POPUP "&ÁØÁÁÍ§" + BEGIN + MENUITEM "á&¶ºà¤Ã×èÍ§Á×Í", -1, CHECKED + MENUITEM "á¶º&ÃÙ»áºº", -1, CHECKED + MENUITEM "á¶ºäÁéºÃÃ·Ñ&´", -1, CHECKED + MENUITEM "á¶º&Ê¶Ò¹Ð", ID_STATUSBAR, CHECKED + END + POPUP "á·Ã&¡" + BEGIN + MENUITEM "&ÇÑ¹·ÕèáÅÐàÇÅÒ...",-1, GRAYED + MENUITEM "ÇÑ&µ¶Ø...", -1, GRAYED + END + POPUP "&ÃÙ»áºº" + BEGIN + MENUITEM "&µÑÇÍÑ¡ÉÃ...", -1 GRAYED + MENUITEM "ËÑÇ¢éÍÂèÍÂ", -1, GRAYED + MENUITEM "ÃÐÂÐºÃÃ·Ñ´...", -1, GRAYED + MENUITEM "µÑé§¡Ñé¹Ë¹éÒ...", -1, GRAYED + END + POPUP "&Ë¹éÒµèÒ§" + BEGIN + MENUITEM "¨Ñ´à»ç¹&ªÑé¹", ID_WINDOW_CASCADE + MENUITEM "¨Ñ´á¹Ç&¹Í¹", ID_WINDOW_TILE_HORZ + MENUITEM "¨Ñ´á¹Ç&µÑé§", ID_WINDOW_TILE_VERT + MENUITEM "&¨Ñ´àÃÕÂ§ÊÑÃÙ»", ID_WINDOW_ARRANGE + MENUITEM SEPARATOR + MENUITEM "&¶Ñ´ä»\tCtrl+F6", ID_WINDOW_NEXT + END + POPUP "&ªèÇÂàËÅ×Í" + BEGIN + MENUITEM "&à¡ÕèÂÇ¡Ñº...", ID_ABOUT + END +END + +IDR_POPUP MENU +BEGIN + POPUP "à»Ô´Ë¹éÒµèÒ§ãËÁè" + BEGIN + + MENUITEM SEPARATOR + + END +END + + +IDD_NEWDOCSEL DIALOGEX 6,6,159,67 +CAPTION "ÊÃéÒ§ãËÁè" +FONT 8, "MS Shell Dlg",0,0 +STYLE WS_BORDER | WS_DLGFRAME | DS_MODALFRAME +BEGIN + LTEXT "ÃÙ»áººàÍ¡ÊÒÃãËÁè:", IDC_STATIC, 4, 3, 72, 9 + LISTBOX IDC_LIST, 4, 16, 104, 46, WS_TABSTOP + PUSHBUTTON "&µ¡Å§", IDOK, 112, 16, 44, 13 + PUSHBUTTON "&Â¡àÅÔ¡", IDCANCEL, 112, 33, 44, 13 +END + + +IDD_ABOUTBOX DIALOGEX 22,16,190,182 +CAPTION "à¡ÕèÂÇ¡Ñº WordPad" +FONT 8, "MS Shell Dlg",0,0 +STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME +BEGIN + LTEXT "WordPad II v0.1\nÊ§Ç¹ÅÔ¢ÊÔ·¸Ôì (C) 2006\nGed Murphy (gedmurphy(a)gmail.com)", IDC_STATIC, 48, 7, 150, 36 + PUSHBUTTON "»Ô´", IDOK, 65, 162, 44, 15 + ICON IDI_ICON, IDC_STATIC, 10, 10, 7, 30 + EDITTEXT IDC_LICENSE_EDIT, 8, 40, 174, 110, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE +END + + +STRINGTABLE DISCARDABLE +BEGIN + IDS_LICENSE "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.\r\n\r\nThis 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.\r\n\r\nYou 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." + IDS_DEFAULT_NAME "àÍ¡ÊÒÃ %1!u!" + IDS_READY " àÊÃç¨áÅéÇ." +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_DOC_TYPE_RICH_TEXT "Rich Text Document" + IDS_DOC_TYPE_UNICODE_TEXT "Text Document" + IDS_DOC_TYPE_TEXT "Unicode Text Document" +END + + + +/* Tooltips */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_TOOLTIP_NEW "ãËÁè" + IDS_TOOLTIP_OPEN "à»Ô´" + IDS_TOOLTIP_SAVE "ºÑ¹·Ö¡" + IDS_TOOLTIP_PRINTPRE "ÀÒ¾¡èÍ¹¾ÔÁ¾ì" + IDS_TOOLTIP_PRINT "¾ÔÁ¾ì" + IDS_TOOLTIP_CUT "µÑ´" + IDS_TOOLTIP_COPY "¤Ñ´ÅÍ¡" + IDS_TOOLTIP_PASTE "ÇÒ§" + IDS_TOOLTIP_UNDO "àÅÔ¡·Ó" + IDS_TOOLTIP_REDO "ÂéÍ¹¡ÅÑº" +END + +/* Hints */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_HINT_BLANK " " + IDS_HINT_NEW " ÊÃéÒ§àÍ¡ÊÒÃãËÁè" + IDS_HINT_OPEN " à»Ô´àÍ¡ÊÒÃ·Õèä´é·ÓáÅéÇ" + IDS_HINT_CLOSE " »Ô´Ë¹éÒµèÒ§¹Õé" + IDS_HINT_CLOSEALL " »Ô´Ë¹éÒµèÒ§·Ñé§ËÁ´" + IDS_HINT_SAVE " ºÑ¹·Ö¡àÍ¡ÊÒÃ»Ñ¨¨ØºÑ¹" + IDS_HINT_SAVEAS " ºÑ¹·Ö¡àÍ¡ÊÒÃ»Ñ¨¨ØºÑ¹´éÇÂª×èÍãËÁè" + IDS_HINT_PRINT " ¾ÔÁ¾ìàÍ¡ÊÒÃ»Ñ¨¨ØºÑ¹" + IDS_HINT_PRINTPRE " ÁÍ§ÀÒ¾¡èÍ¹¾ÔÁ¾ì¢Í§àÍ¡ÊÒÃ" + IDS_HINT_PAGESETUP " à»ÅÕèÂ¹¡ÒÃµÑé§¤èÒË¹éÒ¡ÃÐ´ÒÉ" + IDS_HINT_EXIT " ÍÍ¡¨Ò¡â»Ãá¡ÃÁ¹Õé" + + IDS_HINT_CASCADE " ¨Ñ´àÃÕÂ§Ë¹éÒµèÒ§ãËéÇÒ§«éÍ¹¡Ñ¹" + IDS_HINT_TILE_HORZ " ¨Ñ´àÃÕÂ§Ë¹éÒµèÒ§ÇÒ§àÃÕÂ§ã¹á¹Ç¹Í¹" + IDS_HINT_TILE_VERT " ¨Ñ´àÃÕÂ§Ë¹éÒµèÒ§ÇÒ§àÃÕÂ§ã¹á¹ÇµÑé§" + IDS_HINT_ARRANGE " ¨Ñ´àÃÕÂ§ÊÑÃÙ»·Õè´éÒ¹ÅèÒ§¢Í§Ë¹éÒµèÒ§" + IDS_HINT_NEXT " ·Ó§Ò¹·ÕèË¹éÒµèÒ§¶Ñ´ä»" + + IDS_HINT_SYS_RESTORE " ¿×é¹¿ÙË¹éÒµèÒ§¹ÕéÊÙè¢¹Ò´»¡µÔ" + IDS_HINT_SYS_MOVE " à¤Å×èÍ¹ÂéÒÂË¹éÒµèÒ§¹Õé" + IDS_HINT_SYS_SIZE " à»ÅÕèÂ¹¢¹Ò´Ë¹éÒµèÒ§¹Õé" + IDS_HINT_SYS_MINIMIZE " ÂèÍ¢¹Ò´Ë¹éÒµèÒ§¹Õéä»à»ç¹ÊÑÃÙ»" + IDS_HINT_SYS_MAXIMIZE " ¢ÂÒÂ¢¹Ò´Ë¹éÒµèÒ§¹ÕéãËé¾Í´Õ¡Ñº¨ÍÀÒ¾" +END Modified: trunk/reactos/base/applications/wordpad/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/rsrc.rc (original) +++ trunk/reactos/base/applications/wordpad/rsrc.rc Fri Apr 13 18:29:01 2007 @@ -7,4 +7,5 @@ #include "lang/fr-FR.rc" #include "lang/it-IT.rc" #include "lang/nb-NO.rc" +#include "lang/th-TH.rc"

1 0

[dgorbachev] 26327: Thai translation by Sumath Aowsakulsutthi
by dgorbachev＠svn.reactos.org 13 Apr '07

13 Apr '07

Author: dgorbachev Date: Fri Apr 13 18:28:22 2007 New Revision: 26327 URL: http://svn.reactos.org/svn/reactos?rev=26327&view=rev Log: Thai translation by Sumath Aowsakulsutthi Added: trunk/reactos/dll/cpl/appwiz/lang/th-TH.rc trunk/reactos/dll/cpl/powercfg/lang/th-TH.rc trunk/reactos/dll/win32/userenv/lang/th-TH.rc Modified: trunk/reactos/dll/cpl/appwiz/appwiz.rc trunk/reactos/dll/cpl/powercfg/powercfg.rc trunk/reactos/dll/win32/userenv/userenv.rc Modified: trunk/reactos/dll/cpl/appwiz/appwiz.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/appwiz.rc?r… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/appwiz.rc (original) +++ trunk/reactos/dll/cpl/appwiz/appwiz.rc Fri Apr 13 18:28:22 2007 @@ -35,4 +35,5 @@ #include "lang/nl-NL.rc" #include "lang/pl-PL.rc" #include "lang/ru-RU.rc" +#include "lang/th-TH.rc" #include "lang/uk-UA.rc" Added: trunk/reactos/dll/cpl/appwiz/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/th-TH.… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/lang/th-TH.rc (added) +++ trunk/reactos/dll/cpl/appwiz/lang/th-TH.rc Fri Apr 13 18:28:22 2007 @@ -1,0 +1,51 @@ +LANGUAGE LANG_THAI, SUBLANG_DEFAULT + +IDD_PROPPAGEINSTALL DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Install/Uninstall" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + ICON IDI_CPLSYSTEM,-1,PROPSHEETPADDING,18,16,16 + LTEXT "·Ó¡ÒÃµÔ´µÑé§â»Ãá¡ÃÁãËÁè, ¡´àÅ×Í¡¡ÒÃµÔ´µÑé§",-1,36,18,PROPSHEETWIDTH-48,8 + PUSHBUTTON "&µÔ´µÑé§...", IDC_INSTALL, PROPSHEETWIDTH-(72), 36, 60, 14 + LTEXT "", -1, PROPSHEETPADDING, 63, PROPSHEETWIDTH-12, 1, NOT WS_GROUP | SS_SUNKEN + + ICON IDI_CPLSYSTEM,-1,PROPSHEETPADDING,76,16,16 + CONTROL "&áÊ´§¼Å¡ÒÃ»ÃÑº»ÃØ§",IDC_SHOWUPDATES,"button",BS_AUTOCHECKBOX | WS_TABSTOP,PROPSHEETPADDING, 105, 119, 18 + LTEXT "«Í¿·ìáÇÃì´Ñ§¡ÅèÒÇÊÒÁÒÃ¶¶Í´¶Í¹â´ÂÍÑµâ¹ÁÑµÔ à¾×èÍ¡ÒÃ¶Í´¶Í¹â»Ãá¡ÃÁËÃ×Í»ÃÑºà»ÅÕèÂ¹¡ÒÃµÔ´µÑé§Í§¤ì»ÃÐ¡ÍºÍ×è¹æ, àÅ×Í¡·Ó¨Ò¡ÃÒÂ¡ÒÃáÅÐ¡´àÅ×Í¡ à¾ÔèÁ/¶Í´¶Í¹",-1,36,72,PROPSHEETWIDTH-48,32 + LISTBOX IDC_SOFTWARELIST, PROPSHEETPADDING, 123, PROPSHEETWIDTH-12, 75, LBS_STANDARD | WS_TABSTOP | LBS_NOINTEGRALHEIGHT + PUSHBUTTON "»ÃÑºà»ÅÕèÂ¹/&¶Í´¶Í¹", IDC_ADDREMOVE, PROPSHEETWIDTH-72, 200, 60, 14 +END + +IDD_PROPPAGEROSSETUP DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "ReactOS Setup" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + +END + +IDD_FIRSTPAGE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Create link" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Text1", -1, 115, 15, 160, 24 + LTEXT "Text2", -1, 115, 35, 160, 17 +END + +IDD_SUBMIT_REPORT DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Create link" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Text1",-1,10,0,225,40 + LTEXT "Text2",-1,10,40,120,20 + LTEXT "Text3",-1,10,55,120,20 +END + +STRINGTABLE +BEGIN + IDS_CPLSYSTEMNAME "à¾ÔèÁ/¶Í´¶Í¹ â»Ãá¡ÃÁ" + IDS_CPLSYSTEMDESCRIPTION "µÔ´µÑé§â»Ãá¡ÃÁáÅÐÊÃéÒ§àÊé¹·Ò§ÅÑ´" +END Added: trunk/reactos/dll/cpl/powercfg/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/lang/th-T… ============================================================================== --- trunk/reactos/dll/cpl/powercfg/lang/th-TH.rc (added) +++ trunk/reactos/dll/cpl/powercfg/lang/th-TH.rc Fri Apr 13 18:28:22 2007 @@ -1,0 +1,160 @@ +LANGUAGE LANG_THAI, SUBLANG_DEFAULT + +IDD_PROPPAGEPOWERSHEMES DIALOGEX 0, 0, 250, 220 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Power Schemes" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_ACDC, IDI_ACDC, 7,7,28,22 + LTEXT "Select the power scheme with the most appropriate settings for this computer. Note that changing the settings below will modify the selected scheme.", + -1,45,13,194,36 + GROUPBOX "P&ower schemes", -1, 7,57,240,46 + COMBOBOX IDC_ENERGYLIST, 14,70,224,92, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "&ºÑ¹·Ö¡à»ç¹...", -1, 100,85,75,15,WS_DISABLED + PUSHBUTTON "&Åº", -1, 180,85,55,15,WS_DISABLED + GROUPBOX "äÁè·ÃÒº¤èÒ", IDC_GRPDETAIL, 7,108,240,105 + LTEXT "àÁ×èÍ¤ÍÁ¾ÔÇàµÍÃìà»ç¹:",IDC_SAT,15,120,60,10 + LTEXT "Plugged in",IDC_SAC,100,120,45,15 + ICON IDI_AC, IDC_IAC, 75,115,25,15 + LTEXT "¡ÓÅÑ§ãªé§Ò¹ÍØ»¡Ã³ì¨èÒÂä¿¿éÒ",IDC_SDC,197,120,45,15 + ICON IDI_DC, IDC_IDC, 165,115,25,15 + LTEXT "»Ô´&¨ÍÀÒ¾:",IDC_MONITOR,15,145,80,10 + COMBOBOX IDC_MONITORACLIST, 100,140,65,150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_MONITORDCLIST, 175,140,65,150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Turn off hard d&isks:",IDC_DISK,15,160,80,10 + COMBOBOX IDC_DISKACLIST, 100,155,65,150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_DISKDCLIST, 175,155,65,150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "System s&tandby:",IDC_STANDBY,15,180,80,10 + COMBOBOX IDC_STANDBYACLIST, 100,175,65,150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_STANDBYDCLIST, 175,175,65,150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "System &hibernates:",IDC_HYBERNATE,15,195,80,10 + COMBOBOX IDC_HYBERNATEACLIST, 100,190,65,150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_HYBERNATEDCLIST, 175,190,65,150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP +END + +IDD_PROPPAGEALARMS DIALOG DISCARDABLE 0, 0, 250, 220 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Alarms" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Low battery alarm",-1,10,15,235,95 + CONTROL "Activate &low battery alarm when power level reaches:",IDC_ALARM1, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,25,180,15 + LTEXT "unknown",IDC_ALARMVALUE1,200,25,40,10 + LTEXT "0%",-1,20,40,15,15 + CONTROL "Slider1",IDC_ALARMBAR1,"msctls_trackbar32",TBS_HORZ | + TBS_AUTOTICKS | WS_TABSTOP,30,40,170,15 + LTEXT "100%",-1,215,40,25,10 + PUSHBUTTON "Alar&m Action...",-1,20,70,70,15,WS_DISABLED + LTEXT "Notification:",-1,95,70,50,10 + LTEXT "Unknown",IDC_ALARMMSG1,145,70,95,10 + LTEXT "Action:",-1,95,80,45,10 + LTEXT "Unknown",IDC_ALARMAKTION1,145,80,95,10 + LTEXT "Run Program:",-1,95,90,50,10 + LTEXT "Unknown",IDC_ALARMPROG1,150,90,40,10 + + GROUPBOX "Critical battery alarm",-1,10,115,235,95 + CONTROL "Activate &low battery alarm when power level reaches:",IDC_ALARM2, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,125,180,15 + LTEXT "unknown",IDC_ALARMVALUE2,200,125,40,10 + LTEXT "0%",-1,20,140,15,15 + CONTROL "Slider1",IDC_ALARMBAR2,"msctls_trackbar32",TBS_HORZ | + TBS_AUTOTICKS | WS_TABSTOP,30,140,170,15 + LTEXT "100%",-1,215,140,25,10 + PUSHBUTTON "Alar&m Action...",-1,20,170,70,15,WS_DISABLED + LTEXT "Notification:",-1,95,170,50,10 + LTEXT "Unknown",IDC_ALARMMSG2,145,170,95,10 + LTEXT "Action:",-1,95,180,45,10 + LTEXT "Unknown",IDC_ALARMAKTION2,145,180,95,10 + LTEXT "Run Program:",-1,95,190,50,10 + LTEXT "Unknown",IDC_ALARMPROG2,150,190,40,10 +END + +IDD_PROPPAGEADVANCED DIALOG DISCARDABLE 0, 0, 250, 220 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Advanced" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_ACDC,IDI_ACDC,5,5,20,20 + LTEXT "Select the power-saving settings you want to use.",-1,30,5,205,20 + GROUPBOX "Options",-1,5,35,225,55 + CONTROL "Alway&s show icon on the taskbar",IDC_SYSTRAYBATTERYMETER,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,15,45,200,10 + CONTROL "&Prompt for password when computer resumes from standby",IDC_PASSWORDLOGON,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,15,55,200,10 + CONTROL "&Dim display when running on batteries.",IDC_VIDEODIMDISPLAY,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,15,65,200,10 + GROUPBOX "Power buttons",-1,5,100,230,105 + LTEXT "&When I close the lid of my portable computer:", IDC_SLIDCLOSE,10,110,210,10 + COMBOBOX IDC_LIDCLOSE,10,120,220,90,CBS_DROPDOWNLIST | CBS_SORT | + WS_VSCROLL | WS_TABSTOP + LTEXT "Wh&en I press the power button on my computer:", IDC_SPOWERBUTTON,10,135,210,10 + COMBOBOX IDC_POWERBUTTON,10,150,220,90,CBS_DROPDOWNLIST | CBS_SORT | + WS_VSCROLL | WS_TABSTOP + LTEXT "Whe&n I press the sleep button on my computer:", IDC_SSLEEPBUTTON,10,165,210,10 + COMBOBOX IDC_SLEEPBUTTON,10,180,220,90,CBS_DROPDOWNLIST | CBS_SORT | + WS_VSCROLL | WS_TABSTOP +END + +IDD_PROPPAGEHIBERNATE DIALOG DISCARDABLE 0, 0, 250, 220 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Hibernate" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_SCREEN,IDI_SCREEN,5,5,20,20 + LTEXT "When your computer hibernates, it stores whatever it has in memory on your hard disk and then shuts down. When your computer comes out of hibernation, it returns to its previous state. ", + -1,35,5,195,35 + GROUPBOX "Hibernate",-1,5,45,235,25 + CONTROL "Enable &hibernation",IDC_HIBERNATEFILE,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,10,55,210,10 + GROUPBOX "Disk space for hibernation",-1,5,80,240,60 + LTEXT "Free disk space:",-1,10,90,100,10 + LTEXT "Unknown",IDC_FREESPACE,120,90,70,10 + LTEXT "Disk space required to hibernate:",-1,10,100,115,10 + LTEXT "Unknown",IDC_SPACEFORHIBERNATEFILE,120,100,55,10 + LTEXT "You must free some disk space before your computer can hibernate. ",IDC_TOLESSFREESPACE,10,115,220,20 +END + +STRINGTABLE +BEGIN + IDS_CPLNAME_1 "µÑÇàÅ×Í¡¤èÒ¾ÅÑ§§Ò¹" + IDS_CPLDESCRIPTION_1 "»ÃÑº¤èÒ¾ÅÑ§§Ò¹-¡ÓÅÑ§ºÑ¹·Ö¡¡ÒÃµÑé§¤èÒãËé¡Ñº¤ÍÁ¾ÔÇàµÍÃì¢Í§¤Ø³" + IDS_PROCENT "%i%%" + IDS_SOUND "àÊÕÂ§" + IDS_TEXT "¢éÍ¤ÇÒÁ" + IDS_CONFIG1 "µÑé§¤èÒãËé¡Ñº %1 ¤èÒ¾ÅÑ§§Ò¹" + IDS_CONFIG2 "¡ÒÃµÑé§¤èÒáºº¢Ñé¹ÊÙ§à»ç¹ %1" + + IDS_SIZEBYTS "%i bytes" + IDS_SIZEMB "%i MB" + + IDS_NOACTION "äÁèà»ÅÕèÂ¹¤èÒ" + + IDS_PowerActionNone1 "äÁèà»ÅÕèÂ¹¤èÒ" + IDS_PowerActionUnknown "äÁè·ÃÒº" + IDS_PowerActionSleep "ÊÀÒÇÐ¾ÃéÍÁ·Ó§Ò¹" + IDS_PowerActionHibernate "ÊÀÒÇÐËÂØ´¾Ñ¡" + IDS_PowerActionShutdown "»Ô´à¤Ã×èÍ§" + IDS_PowerActionRestart "àÃÔèÁà»Ô´ãËÁè" + IDS_PowerActionShutdownOff "»Ô´à¤Ã×èÍ§áÅÐ»Ô´ÃÐºº¾ÅÑ§§Ò¹" + IDS_PowerActionWarmEject "â»Ã´¶ÒÁ©Ñ¹¡èÍ¹ÇèÒ¨Ð·ÓÍÐäÃ" + IDS_PowerActionNone2 "äÁèµÑé§¤èÒ" + + IDS_TIMEOUT1 "ËÅÑ§¨Ò¡ 1 ¹Ò·Õ" + IDS_TIMEOUT2 "ËÅÑ§¨Ò¡ 2 ¹Ò·Õ" + IDS_TIMEOUT3 "ËÅÑ§¨Ò¡ 3 ¹Ò·Õ" + IDS_TIMEOUT4 "ËÅÑ§¨Ò¡ 5 ¹Ò·Õ" + IDS_TIMEOUT5 "ËÅÑ§¨Ò¡ 10 ¹Ò·Õ" + IDS_TIMEOUT6 "ËÅÑ§¨Ò¡ 15 ¹Ò·Õ" + IDS_TIMEOUT7 "ËÅÑ§¨Ò¡ 20 ¹Ò·Õ" + IDS_TIMEOUT8 "ËÅÑ§¨Ò¡ 25 ¹Ò·Õ" + IDS_TIMEOUT9 "ËÅÑ§¨Ò¡ 30 ¹Ò·Õ" + IDS_TIMEOUT10 "ËÅÑ§¨Ò¡ 45 ¹Ò·Õ" + IDS_TIMEOUT11 "ËÅÑ§¨Ò¡ 1 ªÑèÇâÁ§" + IDS_TIMEOUT12 "ËÅÑ§¨Ò¡ 2 ªÑèÇâÁ§" + IDS_TIMEOUT13 "ËÅÑ§¨Ò¡ 3 ªÑèÇâÁ§" + IDS_TIMEOUT14 "ËÅÑ§¨Ò¡ 4 ªÑèÇâÁ§" + IDS_TIMEOUT15 "ËÅÑ§¨Ò¡ 5 ªÑèÇâÁ§" + IDS_TIMEOUT16 "äÁèµÑé§¤èÒ" +END + Modified: trunk/reactos/dll/cpl/powercfg/powercfg.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/powercfg.… ============================================================================== --- trunk/reactos/dll/cpl/powercfg/powercfg.rc (original) +++ trunk/reactos/dll/cpl/powercfg/powercfg.rc Fri Apr 13 18:28:22 2007 @@ -21,4 +21,5 @@ #include "lang/id-ID.rc" #include "lang/it-IT.rc" #include "lang/ru-RU.rc" +#include "lang/th-TH.rc" Added: trunk/reactos/dll/win32/userenv/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/lang/th-… ============================================================================== --- trunk/reactos/dll/win32/userenv/lang/th-TH.rc (added) +++ trunk/reactos/dll/win32/userenv/lang/th-TH.rc Fri Apr 13 18:28:22 2007 @@ -1,0 +1,47 @@ +/* + * Copyright (C) 2006 Sumath Aowsakulsutthi + * + * 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. + */ + +LANGUAGE LANG_THAI, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + IDS_PROFILEPATH "%SystemDrive%\\àÍ¡ÊÒÃáÅÐ¡ÒÃµÑé§¤èÒ" + IDS_APPDATA "¢éÍÁÙÅ»ÃÐÂØ¡µì" + IDS_DESKTOP "¾×é¹·ÕèÊèÇ¹µÑÇ" + IDS_FAVORITES "ÃÒÂ¡ÒÃâ»Ã´" + IDS_STARTMENU "àÃÔèÁÃÒÂ¡ÒÃ" + IDS_PROGRAMS "àÃÔèÁÃÒÂ¡ÒÃ\\â»Ãá¡ÃÁ" + IDS_ADMINTOOLS "àÃÔèÁÃÒÂ¡ÒÃ\\â»Ãá¡ÃÁ\\à¤Ã×èÍ§Á×Í¼Ùé´ÙáÅ" + IDS_STARTUP "àÃÔèÁÃÒÂ¡ÒÃ\\â»Ãá¡ÃÁ\\àÃÔèÁµé¹" + IDS_MYDOCUMENTS "àÍ¡ÊÒÃ¢Í§©Ñ¹" + IDS_MYPICTURES "àÍ¡ÊÒÃ¢Í§©Ñ¹\\ÃÙ»ÀÒ¾¢Í§©Ñ¹" + IDS_MYMUSIC "àÍ¡ÊÒÃ¢Í§©Ñ¹\\à¾Å§¢Í§©Ñ¹" + IDS_MYVIDEOS "àÍ¡ÊÒÃ¢Í§©Ñ¹\\ÇÔ´ÕâÍ¢Í§©Ñ¹" + IDS_TEMPLATES "áÁèáºº" + IDS_RECENT "ÅèÒÊØ´" + IDS_SENDTO "Êè§ä»ÂÑ§" + IDS_PRINTHOOD "ÊèÇ¹µé¹¡ÒÃ¾ÔÁ¾ì" + IDS_NETHOOD "ÊèÇ¹µé¹à¤Ã×Í¢èÒÂ" + IDS_LOCALSETTINGS "¡ÒÃµÑé§¤èÒµÑé§µé¹" + IDS_LOCALAPPDATA "¡ÒÃµÑé§¤èÒµÑé§µé¹\\¢éÍÁÙÅ»ÃÐÂØ¡µì" + IDS_TEMP "¡ÒÃµÑé§¤èÒµÑé§µé¹\\à¡çºªÑèÇ¤ÃÒÇ" + IDS_CACHE "¡ÒÃµÑé§¤èÒµÑé§µé¹\\à¡çºä¿ÅìÍÔ¹àµÍÃìà¹çµªÑèÇ¤ÃÒÇ" + IDS_HISTORY "¡ÒÃµÑé§¤èÒµÑé§µé¹\\»ÃÐÇÑµÔãªé§Ò¹" + IDS_COOKIES "¤Ø¡¡Õé" + IDS_PROGRAMFILES "%SystemDrive%\\â»Ãá¡ÃÁä¿Åì" +END Modified: trunk/reactos/dll/win32/userenv/userenv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/userenv.… ============================================================================== --- trunk/reactos/dll/win32/userenv/userenv.rc (original) +++ trunk/reactos/dll/win32/userenv/userenv.rc Fri Apr 13 18:28:22 2007 @@ -51,4 +51,5 @@ #include "lang/pl-PL.rc" #include "lang/ru-RU.rc" #include "lang/sv-SE.rc" +#include "lang/th-TH.rc" #include "lang/uk-UA.rc"

1 0

[dgorbachev] 26326: Fix Italian translation (Carlo Bramini).
by dgorbachev＠svn.reactos.org 13 Apr '07

13 Apr '07

Author: dgorbachev Date: Fri Apr 13 15:00:38 2007 New Revision: 26326 URL: http://svn.reactos.org/svn/reactos?rev=26326&view=rev Log: Fix Italian translation (Carlo Bramini). Modified: trunk/reactos/base/applications/sndvol32/lang/it-IT.rc Modified: trunk/reactos/base/applications/sndvol32/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… ============================================================================== --- trunk/reactos/base/applications/sndvol32/lang/it-IT.rc (original) +++ trunk/reactos/base/applications/sndvol32/lang/it-IT.rc Fri Apr 13 15:00:38 2007 @@ -2,7 +2,7 @@ IDM_MAINMENU MENU DISCARDABLE BEGIN - POPUP "O&ptions" + POPUP "O&pzioni" BEGIN MENUITEM "P&roprietà", IDC_PROPERTIES MENUITEM "&Controlli avanzati", IDC_ADVANCED_CONTROLS @@ -11,9 +11,9 @@ END POPUP "&Aiuto" BEGIN - MENUITEM "&Aiuto", IDC_HELP_TOPICS + MENUITEM "&Guida in linea", IDC_HELP_TOPICS MENUITEM SEPARATOR - MENUITEM "&Informazioni su...", IDC_ABOUT + MENUITEM "&Informazioni su Controllo Volume", IDC_ABOUT END END @@ -25,14 +25,14 @@ IDD_PREFERENCES DIALOGEX 0, 0, 224, 250 STYLE DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Properties" +CAPTION "Proprietà" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "&Mixer:", -1, 7,8,48,9 COMBOBOX IDC_MIXERDEVICE, 55,8,162,80, CBS_DROPDOWNLIST | WS_TABSTOP GROUPBOX "Cambia il volume per:", -1, 7,25,211,77 - PUSHBUTTON "&Playback", IDC_PLAYBACK, 13,43,47,8, BS_AUTORADIOBUTTON - PUSHBUTTON "&Registrazione", IDC_RECORDING, 13,61,47,8, BS_AUTORADIOBUTTON + PUSHBUTTON "&Riproduzione", IDC_PLAYBACK, 13,43,58,8, BS_AUTORADIOBUTTON + PUSHBUTTON "&Registrazione", IDC_RECORDING, 13,61,58,8, BS_AUTORADIOBUTTON PUSHBUTTON "&Altro:", IDC_OTHER, 13,80,42,8, BS_AUTORADIOBUTTON | WS_DISABLED COMBOBOX IDC_LINE, 55,80,155,50, CBS_DROPDOWNLIST | WS_TABSTOP | WS_DISABLED LTEXT "Mostra i controlli di volume seguenti:", IDC_LABELCONTROLS, 7, 109, 162, 8

1 0

[gedmurphy] 26325: Rewrite screensaver cpl applet, key changes are: - redesigned to look like XP's - Add the screensaver preview on the dialog - implement saving of screensaver settings - preview and config buttons now work Translators required.
by gedmurphy＠svn.reactos.org 13 Apr '07

13 Apr '07

Author: gedmurphy Date: Fri Apr 13 08:23:35 2007 New Revision: 26325 URL: http://svn.reactos.org/svn/reactos?rev=26325&view=rev Log: Rewrite screensaver cpl applet, key changes are: - redesigned to look like XP's - Add the screensaver preview on the dialog - implement saving of screensaver settings - preview and config buttons now work Translators required. Modified: trunk/reactos/dll/cpl/desk/lang/cs-CZ.rc trunk/reactos/dll/cpl/desk/lang/de-DE.rc trunk/reactos/dll/cpl/desk/lang/el-GR.rc trunk/reactos/dll/cpl/desk/lang/en-US.rc trunk/reactos/dll/cpl/desk/lang/es-ES.rc trunk/reactos/dll/cpl/desk/lang/fr-FR.rc trunk/reactos/dll/cpl/desk/lang/hu-HU.rc trunk/reactos/dll/cpl/desk/lang/id-ID.rc trunk/reactos/dll/cpl/desk/lang/it-IT.rc trunk/reactos/dll/cpl/desk/lang/ja-JP.rc trunk/reactos/dll/cpl/desk/lang/nl-NL.rc trunk/reactos/dll/cpl/desk/lang/pl-PL.rc trunk/reactos/dll/cpl/desk/lang/ru-RU.rc trunk/reactos/dll/cpl/desk/lang/sv-SE.rc trunk/reactos/dll/cpl/desk/lang/uk-UA.rc trunk/reactos/dll/cpl/desk/resource.h trunk/reactos/dll/cpl/desk/resources/monitor.bmp trunk/reactos/dll/cpl/desk/screensaver.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/cpl/desk/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/cs-CZ.rc… Modified: trunk/reactos/dll/cpl/desk/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/de-DE.rc… Modified: trunk/reactos/dll/cpl/desk/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/el-GR.rc… Modified: trunk/reactos/dll/cpl/desk/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/en-US.rc… 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… Modified: trunk/reactos/dll/cpl/desk/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/fr-FR.rc… Modified: trunk/reactos/dll/cpl/desk/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/hu-HU.rc… Modified: trunk/reactos/dll/cpl/desk/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/id-ID.rc… Modified: trunk/reactos/dll/cpl/desk/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/it-IT.rc… 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… Modified: trunk/reactos/dll/cpl/desk/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/nl-NL.rc… Modified: trunk/reactos/dll/cpl/desk/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/pl-PL.rc… Modified: trunk/reactos/dll/cpl/desk/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/ru-RU.rc… Modified: trunk/reactos/dll/cpl/desk/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/sv-SE.rc… Modified: trunk/reactos/dll/cpl/desk/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/uk-UA.rc… Modified: trunk/reactos/dll/cpl/desk/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/resource.h?re… Modified: trunk/reactos/dll/cpl/desk/resources/monitor.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/resources/mon… Modified: trunk/reactos/dll/cpl/desk/screensaver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/screensaver.c…

1 0

[ion] 26324: - Send IRP_MN_FILTER_RESOURCE_REQUIREMENTS to devices before IRP_MN_START_DEVICE. Allows the Windows Input Stack to load better, but we still have a load order bug. Patch by hpoussin.
by ion＠svn.reactos.org 12 Apr '07

12 Apr '07

Author: ion Date: Fri Apr 13 03:48:31 2007 New Revision: 26324 URL: http://svn.reactos.org/svn/reactos?rev=26324&view=rev Log: - Send IRP_MN_FILTER_RESOURCE_REQUIREMENTS to devices before IRP_MN_START_DEVICE. Allows the Windows Input Stack to load better, but we still have a load order bug. Patch by hpoussin. Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Fri Apr 13 03:48:31 2007 @@ -57,6 +57,15 @@ /* FUNCTIONS *****************************************************************/ +static NTSTATUS +IopAssignDeviceResources( + IN PDEVICE_NODE DeviceNode, + OUT ULONG *pRequiredSize); +static NTSTATUS +IopTranslateDeviceResources( + IN PDEVICE_NODE DeviceNode, + IN ULONG RequiredSize); + PDEVICE_NODE FASTCALL IopGetDeviceNode(PDEVICE_OBJECT DeviceObject) @@ -132,12 +141,46 @@ { IO_STATUS_BLOCK IoStatusBlock; IO_STACK_LOCATION Stack; + ULONG RequiredLength; PDEVICE_OBJECT Fdo; NTSTATUS Status; + Fdo = IoGetAttachedDeviceReference(DeviceNode->PhysicalDeviceObject); + + IopDeviceNodeSetFlag(DeviceNode, DNF_ASSIGNING_RESOURCES); + DPRINT("Sending IRP_MN_FILTER_RESOURCE_REQUIREMENTS to device stack\n"); + Stack.Parameters.FilterResourceRequirements.IoResourceRequirementList = DeviceNode->ResourceRequirements; + Status = IopInitiatePnpIrp( + Fdo, + &IoStatusBlock, + IRP_MN_FILTER_RESOURCE_REQUIREMENTS, + &Stack); + /* FIXME: Take care of return code */ + if (!NT_SUCCESS(Status)) + { + DPRINT("IopInitiatePnpIrp(IRP_MN_FILTER_RESOURCE_REQUIREMENTS) failed\n"); + } + + Status = IopAssignDeviceResources(DeviceNode, &RequiredLength); + if (NT_SUCCESS(Status)) + { + Status = IopTranslateDeviceResources(DeviceNode, RequiredLength); + if (NT_SUCCESS(Status)) + { + IopDeviceNodeSetFlag(DeviceNode, DNF_RESOURCE_ASSIGNED); + } + else + { + DPRINT("IopTranslateDeviceResources() failed (Status 0x08lx)\n", Status); + } + } + else + { + DPRINT("IopAssignDeviceResources() failed (Status 0x08lx)\n", Status); + } + IopDeviceNodeClearFlag(DeviceNode, DNF_ASSIGNING_RESOURCES); + DPRINT("Sending IRP_MN_START_DEVICE to driver\n"); - - Fdo = IoGetAttachedDeviceReference(DeviceNode->PhysicalDeviceObject); Stack.Parameters.StartDevice.AllocatedResources = DeviceNode->ResourceList; Stack.Parameters.StartDevice.AllocatedResourcesTranslated = DeviceNode->ResourceListTranslated; @@ -948,7 +991,7 @@ /* PNP IRPs are always initialized with a status code of STATUS_NOT_IMPLEMENTED */ - Irp->IoStatus.Status = STATUS_NOT_IMPLEMENTED; + Irp->IoStatus.Status = MinorFunction == IRP_MN_FILTER_RESOURCE_REQUIREMENTS ? STATUS_SUCCESS : STATUS_NOT_IMPLEMENTED; // hpoussin's hack of doom Irp->IoStatus.Information = 0; IrpSp = IoGetNextIrpStackLocation(Irp); @@ -1270,8 +1313,6 @@ * Actually, use the BootResources if provided, else the resource list #0 */ - IopDeviceNodeSetFlag(DeviceNode, DNF_ASSIGNING_RESOURCES); - if (DeviceNode->BootResources) { /* Browse the boot resources to know if we have some custom structures */ @@ -1306,8 +1347,6 @@ } /* Ok, here, we have to use the device requirement list */ - IopDeviceNodeSetFlag(DeviceNode, DNF_ASSIGNING_RESOURCES); - ResourceList = &DeviceNode->ResourceRequirements->List[0]; if (ResourceList->Version != 1 || ResourceList->Revision != 1) { @@ -2126,26 +2165,6 @@ ZwClose(InstanceKey); - IopDeviceNodeSetFlag(DeviceNode, DNF_ASSIGNING_RESOURCES); - Status = IopAssignDeviceResources(DeviceNode, &RequiredLength); - if (NT_SUCCESS(Status)) - { - Status = IopTranslateDeviceResources(DeviceNode, RequiredLength); - if (NT_SUCCESS(Status)) - { - IopDeviceNodeSetFlag(DeviceNode, DNF_RESOURCE_ASSIGNED); - } - else - { - DPRINT("IopTranslateDeviceResources() failed (Status 0x08lx)\n", Status); - } - } - else - { - DPRINT("IopAssignDeviceResources() failed (Status 0x08lx)\n", Status); - } - IopDeviceNodeClearFlag(DeviceNode, DNF_ASSIGNING_RESOURCES); - DeviceNode->Flags |= DNF_PROCESSED; /* Report the device to the user-mode pnp manager */ @@ -2344,10 +2363,6 @@ { PLDR_DATA_TABLE_ENTRY ModuleObject; PDRIVER_OBJECT DriverObject; - - /* FIXME: Remove this once the bug is fixed */ - if (DeviceNode->ServiceName.Buffer == NULL) - DPRINT1("Weird DeviceNode %p having ServiceName->Buffer==NULL. Probable stack corruption or memory overwrite.\n", DeviceNode); Status = IopLoadServiceModule(&DeviceNode->ServiceName, &ModuleObject); if (NT_SUCCESS(Status) || Status == STATUS_IMAGE_ALREADY_LOADED)

1 0

[jimtabor] 26323: Fix signedness error.
by jimtabor＠svn.reactos.org 12 Apr '07

12 Apr '07

Author: jimtabor Date: Thu Apr 12 09:14:24 2007 New Revision: 26323 URL: http://svn.reactos.org/svn/reactos?rev=26323&view=rev Log: Fix signedness error. Modified: trunk/reactos/dll/win32/user32/include/user32.h Modified: trunk/reactos/dll/win32/user32/include/user32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/include/u… ============================================================================== --- trunk/reactos/dll/win32/user32/include/user32.h (original) +++ trunk/reactos/dll/win32/user32/include/user32.h Thu Apr 12 09:14:24 2007 @@ -40,4 +40,4 @@ /* FIXME: Use ntgdi.h then cleanup... */ HGDIOBJ STDCALL NtGdiSelectObject(HDC hDC, HGDIOBJ hGDIObj); BOOL STDCALL NtGdiPatBlt(HDC hdcDst, INT x, INT y, INT cx, INT cy, DWORD rop4); -DWORD STDCALL GdiGetCharDimensions(HDC, LPTEXTMETRICW, DWORD *); +LONG STDCALL GdiGetCharDimensions(HDC, LPTEXTMETRICW, LONG *);

1 0

[ion] 26322: - Fix several pushlock bugs (thanks in part to hto). Should fix bug 2063.
by ion＠svn.reactos.org 11 Apr '07

11 Apr '07

Author: ion Date: Thu Apr 12 00:00:53 2007 New Revision: 26322 URL: http://svn.reactos.org/svn/reactos?rev=26322&view=rev Log: - Fix several pushlock bugs (thanks in part to hto). Should fix bug 2063. Modified: trunk/reactos/ntoskrnl/ex/pushlock.c Modified: trunk/reactos/ntoskrnl/ex/pushlock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/pushlock.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ex/pushlock.c (original) +++ trunk/reactos/ntoskrnl/ex/pushlock.c Thu Apr 12 00:00:53 2007 @@ -76,31 +76,24 @@ ASSERT(!OldValue.MultipleShared); /* Check if it's locked */ - if (OldValue.Locked) - { - /* If it's locked we must simply un-wake it*/ - for (;;) - { - /* It's not waking anymore */ - NewValue.Value = OldValue.Value &~ EX_PUSH_LOCK_WAKING; - - /* Sanity checks */ - ASSERT(!NewValue.Waking); - ASSERT(NewValue.Locked); - ASSERT(NewValue.Waiting); - - /* Write the New Value */ - NewValue.Ptr = InterlockedCompareExchangePointer(PushLock, - NewValue.Ptr, - OldValue.Ptr); - if (NewValue.Value == OldValue.Value) return; - - /* Someone changed the value behind our back, update it*/ - OldValue = NewValue; - - /* Check if it's still locked */ - if (!OldValue.Locked) break; - } + while (OldValue.Locked) + { + /* It's not waking anymore */ + NewValue.Value = OldValue.Value &~ EX_PUSH_LOCK_WAKING; + + /* Sanity checks */ + ASSERT(!NewValue.Waking); + ASSERT(NewValue.Locked); + ASSERT(NewValue.Waiting); + + /* Write the New Value */ + NewValue.Ptr = InterlockedCompareExchangePointer(PushLock, + NewValue.Ptr, + OldValue.Ptr); + if (NewValue.Value == OldValue.Value) return; + + /* Someone changed the value behind our back, update it*/ + OldValue = NewValue; } /* Save the First Block */ @@ -131,8 +124,17 @@ !(PreviousWaitBlock)) { /* Destroy the pushlock */ - if (InterlockedCompareExchangePointer(PushLock, 0, OldValue.Ptr) == - OldValue.Ptr) break; + NewValue.Value = 0; + ASSERT(!NewValue.Waking); + + /* Write the New Value */ + NewValue.Ptr = InterlockedCompareExchangePointer(PushLock, + NewValue.Ptr, + OldValue.Ptr); + if (NewValue.Value == OldValue.Value) break; + + /* Someone changed the value behind our back, update it*/ + OldValue = NewValue; } else { @@ -224,7 +226,7 @@ /* Loop the blocks */ LastWaitBlock = WaitBlock->Last; - while (LastWaitBlock) + while (!LastWaitBlock) { /* Save the block */ PreviousWaitBlock = WaitBlock; @@ -393,13 +395,13 @@ { PEX_PUSH_LOCK_WAIT_BLOCK WaitBlock = pWaitBlock; EX_PUSH_LOCK NewValue, OldValue; - + /* Detect invalid wait block alignment */ - ASSERT((ULONG_PTR)pWaitBlock & 0x10); + ASSERT(((ULONG_PTR)pWaitBlock & 0xF) == 0); /* Set the waiting bit */ WaitBlock->Flags = EX_PUSH_LOCK_FLAGS_WAIT; - + /* Get the old value */ OldValue = *PushLock; @@ -414,7 +416,7 @@ WaitBlock, OldValue.Ptr); if (OldValue.Ptr == NewValue.Ptr) break; - + /* Try again with the new value */ NewValue = OldValue; } @@ -492,10 +494,10 @@ /* Point to ours */ NewValue.Value = (OldValue.Value & EX_PUSH_LOCK_MULTIPLE_SHARED) | - EX_PUSH_LOCK_LOCK | - EX_PUSH_LOCK_WAKING | - EX_PUSH_LOCK_WAITING | - PtrToUlong(&WaitBlock); + EX_PUSH_LOCK_LOCK | + EX_PUSH_LOCK_WAKING | + EX_PUSH_LOCK_WAITING | + PtrToUlong(WaitBlock); /* Check if the pushlock was already waking */ if (OldValue.Waking) NeedWake = TRUE; @@ -515,7 +517,7 @@ NewValue.Value = EX_PUSH_LOCK_MULTIPLE_SHARED | EX_PUSH_LOCK_LOCK | EX_PUSH_LOCK_WAITING | - PtrToUlong(&WaitBlock); + PtrToUlong(WaitBlock); } else { @@ -525,7 +527,7 @@ /* Point to our wait block */ NewValue.Value = EX_PUSH_LOCK_LOCK | EX_PUSH_LOCK_WAITING | - PtrToUlong(&WaitBlock); + PtrToUlong(WaitBlock); } } @@ -589,10 +591,10 @@ } /*++ - * @name ExAcquirePushLockExclusive + * @name ExAcquirePushLockShared * @implemented NT5.1 * - * The ExAcquirePushLockShared macro acquires a shared PushLock. + * The ExAcquirePushLockShared routine acquires a shared PushLock. * * @params PushLock * Pointer to the pushlock which is to be acquired. @@ -616,7 +618,7 @@ for (;;) { /* Check if it's unlocked or if it's waiting without any sharers */ - if (!(OldValue.Locked) || (OldValue.Waiting && OldValue.Shared == 0)) + if (!(OldValue.Locked) || (!(OldValue.Waiting) && (OldValue.Shared > 0))) { /* Check if anyone is waiting on it */ if (!OldValue.Waiting) @@ -671,10 +673,10 @@ EX_PUSH_LOCK_LOCK)) | EX_PUSH_LOCK_WAKING | EX_PUSH_LOCK_WAITING | - PtrToUlong(&WaitBlock); + PtrToUlong(WaitBlock); /* Check if the pushlock was already waking */ - if (OldValue.Waking) NeedWake = TRUE; + if (!OldValue.Waking) NeedWake = TRUE; } else { @@ -682,10 +684,9 @@ WaitBlock->Last = WaitBlock; /* Point to our wait block */ - NewValue.Value = (OldValue.Value & (EX_PUSH_LOCK_MULTIPLE_SHARED | - EX_PUSH_LOCK_WAKING)) | + NewValue.Value = (OldValue.Value & EX_PUSH_LOCK_PTR_BITS) | EX_PUSH_LOCK_WAITING | - PtrToUlong(&WaitBlock); + PtrToUlong(WaitBlock); } /* Sanity check */ @@ -700,9 +701,10 @@ #endif /* Write the new value */ - if (InterlockedCompareExchangePointer(PushLock, - NewValue.Ptr, - OldValue.Ptr) != OldValue.Ptr) + NewValue.Ptr = InterlockedCompareExchangePointer(PushLock, + NewValue.Ptr, + OldValue.Ptr); + if (NewValue.Ptr != OldValue.Ptr) { /* Retry */ OldValue = NewValue; @@ -748,15 +750,15 @@ * @name ExfReleasePushLock * @implemented NT5.1 * - * The ExReleasePushLockExclusive routine releases a previously - * exclusively acquired PushLock. + * The ExReleasePushLock routine releases a previously acquired PushLock. + * * * @params PushLock * Pointer to a previously acquired pushlock. * * @return None. * - * @remarks Callers of ExReleasePushLockExclusive must be running at IRQL <= APC_LEVEL. + * @remarks Callers of ExfReleasePushLock must be running at IRQL <= APC_LEVEL. * This macro should usually be paired up with KeLeaveCriticalRegion. * *--*/ @@ -794,11 +796,7 @@ NewValue.Ptr = InterlockedCompareExchangePointer(PushLock, NewValue.Ptr, OldValue.Ptr); - if (NewValue.Value == OldValue.Value) - { - /* No waiters left, we're done */ - goto quit; - } + if (NewValue.Value == OldValue.Value) return; /* Did it enter a wait state? */ OldValue = NewValue; @@ -812,21 +810,17 @@ /* Find the last Wait Block */ for (WaitBlock = (PEX_PUSH_LOCK_WAIT_BLOCK)((ULONG_PTR)OldValue.Ptr & ~EX_PUSH_LOCK_PTR_BITS); - WaitBlock->Last; + !WaitBlock->Last; WaitBlock = WaitBlock->Next); /* Make sure the Share Count is above 0 */ - if (WaitBlock->ShareCount) + if (WaitBlock->ShareCount > 0) { /* This shouldn't be an exclusive wait block */ - ASSERT(WaitBlock->Flags&EX_PUSH_LOCK_FLAGS_EXCLUSIVE); + ASSERT(WaitBlock->Flags & EX_PUSH_LOCK_FLAGS_EXCLUSIVE); /* Do the decrease and check if the lock isn't shared anymore */ - if (InterlockedExchangeAdd(&WaitBlock->ShareCount, -1)) - { - /* Someone is still holding the lock */ - goto quit; - } + if (InterlockedDecrement(&WaitBlock->ShareCount) > 0) return; } } @@ -854,10 +848,7 @@ NewValue.Ptr = InterlockedCompareExchangePointer(PushLock, NewValue.Ptr, OldValue.Ptr); - if (NewValue.Value == OldValue.Value) break; - - /* The value changed, try the unlock again */ - continue; + if (NewValue.Value == OldValue.Value) return; } else { @@ -880,12 +871,9 @@ /* The write was successful. The pushlock is Unlocked and Waking */ ExfWakePushLock(PushLock, NewValue); - break; - } - } -quit: - /* Done! */ - return; + return; + } + } } /*++ @@ -912,38 +900,29 @@ PEX_PUSH_LOCK_WAIT_BLOCK WaitBlock; /* Check if someone is waiting on the lock */ - if (!OldValue.Waiting) - { - /* Nobody is waiting on it, so we'll try a quick release */ - for (;;) - { - /* Check if it's shared */ - if (OldValue.Shared > 1) - { - /* Write the Old Value but decrease share count */ - NewValue = OldValue; - NewValue.Shared--; - } - else - { - /* Simply clear the lock */ - NewValue.Value = 0; - } - - /* Write the New Value */ - NewValue.Ptr = InterlockedCompareExchangePointer(PushLock, - NewValue.Ptr, - OldValue.Ptr); - if (NewValue.Value == OldValue.Value) - { - /* No waiters left, we're done */ - goto quit; - } - - /* Did it enter a wait state? */ - OldValue = NewValue; - if (NewValue.Waiting) break; - } + while (!OldValue.Waiting) + { + /* Check if it's shared */ + if (OldValue.Shared > 1) + { + /* Write the Old Value but decrease share count */ + NewValue = OldValue; + NewValue.Shared--; + } + else + { + /* Simply clear the lock */ + NewValue.Value = 0; + } + + /* Write the New Value */ + NewValue.Ptr = InterlockedCompareExchangePointer(PushLock, + NewValue.Ptr, + OldValue.Ptr); + if (NewValue.Value == OldValue.Value) return; + + /* Did it enter a wait state? */ + OldValue = NewValue; } /* Ok, we do know someone is waiting on it. Are there more then one? */ @@ -952,15 +931,15 @@ /* Find the last Wait Block */ for (WaitBlock = (PEX_PUSH_LOCK_WAIT_BLOCK)((ULONG_PTR)OldValue.Ptr & ~EX_PUSH_LOCK_PTR_BITS); - WaitBlock->Last; + !WaitBlock->Last; WaitBlock = WaitBlock->Next); /* Sanity checks */ ASSERT(WaitBlock->ShareCount > 0); - ASSERT(WaitBlock->Flags&EX_PUSH_LOCK_FLAGS_EXCLUSIVE); + ASSERT(WaitBlock->Flags & EX_PUSH_LOCK_FLAGS_EXCLUSIVE); /* Do the decrease and check if the lock isn't shared anymore */ - if (InterlockedExchangeAdd(&WaitBlock->ShareCount, -1)) goto quit; + if (InterlockedDecrement(&WaitBlock->ShareCount) > 0) return; } /* @@ -987,10 +966,7 @@ NewValue.Ptr = InterlockedCompareExchangePointer(PushLock, NewValue.Ptr, OldValue.Ptr); - if (NewValue.Value == OldValue.Value) break; - - /* The value changed, try the unlock again */ - continue; + if (NewValue.Value == OldValue.Value) return; } else { @@ -1013,12 +989,9 @@ /* The write was successful. The pushlock is Unlocked and Waking */ ExfWakePushLock(PushLock, NewValue); - break; - } - } -quit: - /* Done! */ - return; + return; + } + } } /*++

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs