Ros-diffs October 2009

ros-diffs@reactos.org

26 participants
641 discussions

[dgorbachev] 43388: Use consistent newline style.
by dgorbachev＠svn.reactos.org 12 Oct '09

12 Oct '09

Author: dgorbachev Date: Mon Oct 12 05:28:57 2009 New Revision: 43388 URL: http://svn.reactos.org/svn/reactos?rev=43388&view=rev Log: Use consistent newline style. Modified: trunk/reactos/base/services/rpcss/rpcss_ros.diff trunk/reactos/dll/win32/pstorec/pstorec_ros.diff trunk/reactos/dll/win32/wintrust/wintrust_ros.diff trunk/reactos/lib/debugsup/debugsup.rbuild trunk/reactos/tools/wpp/wpp_ros.diff Modified: trunk/reactos/base/services/rpcss/rpcss_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/rpcss/rpcss_… ============================================================================== --- trunk/reactos/base/services/rpcss/rpcss_ros.diff [iso-8859-1] (original) +++ trunk/reactos/base/services/rpcss/rpcss_ros.diff [iso-8859-1] Mon Oct 12 05:28:57 2009 @@ -1,8 +1,8 @@ -Index: rpcss_main.c -=================================================================== ---- rpcss_main.c (revision 37240) -+++ rpcss_main.c (working copy) -@@ -62,7 +62,7 @@ +Index: rpcss_main.c +=================================================================== +--- rpcss_main.c (revision 37240) ++++ rpcss_main.c (working copy) +@@ -62,7 +62,7 @@ //extern HANDLE __wine_make_process_system(void); @@ -11,7 +11,7 @@ { static unsigned short irot_protseq[] = IROT_PROTSEQ; static unsigned short irot_endpoint[] = IROT_ENDPOINT; -@@ -116,7 +116,7 @@ +@@ -116,7 +116,7 @@ /* returns false if we discover at the last moment that we aren't ready to terminate */ @@ -20,7 +20,7 @@ { RpcMgmtStopServerListening(NULL); RpcServerUnregisterIf(epm_v3_0_s_ifspec, NULL, TRUE); -@@ -127,6 +127,7 @@ +@@ -127,6 +127,7 @@ return TRUE; } @@ -28,7 +28,7 @@ int main( int argc, char **argv ) { /* -@@ -142,3 +143,4 @@ +@@ -142,3 +143,4 @@ return 0; } Modified: trunk/reactos/dll/win32/pstorec/pstorec_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/pstorec/pstorec_… ============================================================================== --- trunk/reactos/dll/win32/pstorec/pstorec_ros.diff [iso-8859-1] (original) +++ trunk/reactos/dll/win32/pstorec/pstorec_ros.diff [iso-8859-1] Mon Oct 12 05:28:57 2009 @@ -1,8 +1,8 @@ -Index: pstorec.c -=================================================================== ---- pstorec.c (revision 36054) -+++ pstorec.c (working copy) -@@ -43,8 +43,6 @@ +Index: pstorec.c +=================================================================== +--- pstorec.c (revision 36054) ++++ pstorec.c (working copy) +@@ -43,8 +43,6 @@ switch (fdwReason) { Modified: trunk/reactos/dll/win32/wintrust/wintrust_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wintrust/wintrus… ============================================================================== --- trunk/reactos/dll/win32/wintrust/wintrust_ros.diff [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wintrust/wintrust_ros.diff [iso-8859-1] Mon Oct 12 05:28:57 2009 @@ -1,8 +1,8 @@ -Index: wintrust_main.c -=================================================================== ---- wintrust_main.c (revision 23867) -+++ wintrust_main.c (working copy) -@@ -83,7 +83,26 @@ +Index: wintrust_main.c +=================================================================== +--- wintrust_main.c (revision 23867) ++++ wintrust_main.c (working copy) +@@ -83,7 +83,26 @@ */ LONG WINAPI WinVerifyTrust( HWND hwnd, GUID *ActionID, LPVOID ActionData ) { Modified: trunk/reactos/lib/debugsup/debugsup.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/debugsup/debugsup.rbui… ============================================================================== --- trunk/reactos/lib/debugsup/debugsup.rbuild [iso-8859-1] (original) +++ trunk/reactos/lib/debugsup/debugsup.rbuild [iso-8859-1] Mon Oct 12 05:28:57 2009 @@ -1,10 +1,10 @@ -<?xml version="1.0"?> -<!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd"> -<group> - <module name="debugsup_ntoskrnl" type="staticlibrary"> - <importlibrary definition="debugsup-ntos.spec" dllname="ntoskrnl.exe" /> - </module> - <module name="debugsup_ntdll" type="staticlibrary"> - <importlibrary definition="debugsup-ntos.spec" dllname="ntdll.dll" /> - </module> -</group> +<?xml version="1.0"?> +<!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd"> +<group> + <module name="debugsup_ntoskrnl" type="staticlibrary"> + <importlibrary definition="debugsup-ntos.spec" dllname="ntoskrnl.exe" /> + </module> + <module name="debugsup_ntdll" type="staticlibrary"> + <importlibrary definition="debugsup-ntos.spec" dllname="ntdll.dll" /> + </module> +</group> Modified: trunk/reactos/tools/wpp/wpp_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wpp/wpp_ros.diff?rev… ============================================================================== --- trunk/reactos/tools/wpp/wpp_ros.diff [iso-8859-1] (original) +++ trunk/reactos/tools/wpp/wpp_ros.diff [iso-8859-1] Mon Oct 12 05:28:57 2009 @@ -1,8 +1,8 @@ -Index: preproc.c -=================================================================== ---- preproc.c (revision 28293) -+++ preproc.c (revision 28294) -@@ -328,6 +328,15 @@ +Index: preproc.c +=================================================================== +--- preproc.c (revision 28293) ++++ preproc.c (revision 28294) +@@ -328,6 +328,15 @@ char *tok; char *cpy = pp_xstrdup(path);

1 0

[dgorbachev] 43387: Remove allowwarnings="true" from rbuild file. Fixed in r42970.
by dgorbachev＠svn.reactos.org 12 Oct '09

12 Oct '09

Author: dgorbachev Date: Mon Oct 12 05:28:19 2009 New Revision: 43387 URL: http://svn.reactos.org/svn/reactos?rev=43387&view=rev Log: Remove allowwarnings="true" from rbuild file. Fixed in r42970. Modified: trunk/reactos/drivers/wdm/audio/drivers/mpu401/mpu401.rbuild Modified: trunk/reactos/drivers/wdm/audio/drivers/mpu401/mpu401.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/drivers/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/drivers/mpu401/mpu401.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/drivers/mpu401/mpu401.rbuild [iso-8859-1] Mon Oct 12 05:28:19 2009 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../../../tools/rbuild/project.dtd"> -<module name="mpu401" type="kernelmodedriver" installbase="system32/drivers" installname="mpu401.sys" allowwarnings="true"> +<module name="mpu401" type="kernelmodedriver" installbase="system32/drivers" installname="mpu401.sys"> <include base="mpu401">.</include> <include base="mpu401">..</include> <group compilerset="gcc">

1 0

[dgorbachev] 43386: [CHEW] - Fix formatting, comments. - Delete an empty directory.
by dgorbachev＠svn.reactos.org 12 Oct '09

12 Oct '09

Author: dgorbachev Date: Mon Oct 12 05:27:45 2009 New Revision: 43386 URL: http://svn.reactos.org/svn/reactos?rev=43386&view=rev Log: [CHEW] - Fix formatting, comments. - Delete an empty directory. Removed: trunk/reactos/include/reactos/chew/chew/ Modified: trunk/reactos/include/reactos/chew/chew.h trunk/reactos/lib/drivers/chew/chew.rbuild trunk/reactos/lib/drivers/chew/workqueue.c Modified: trunk/reactos/include/reactos/chew/chew.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/chew/chew.… ============================================================================== --- trunk/reactos/include/reactos/chew/chew.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/chew/chew.h [iso-8859-1] Mon Oct 12 05:27:45 2009 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel - * FILE: include/chew/chew.h + * FILE: include/reactos/chew/chew.h * PURPOSE: Common Highlevel Executive Worker * * PROGRAMMERS: arty (ayerkes(a)speakeasy.net) @@ -14,15 +14,16 @@ * Initialize CHEW, given a device object (since IoAllocateWorkItem relies on * it). */ -VOID ChewInit( PDEVICE_OBJECT DeviceObject ); +VOID ChewInit(PDEVICE_OBJECT DeviceObject); + /** * Shutdown CHEW, waits for remaining work items. */ -VOID ChewShutdown(); +VOID ChewShutdown(VOID); + /** * Creates and queues a work item. */ -BOOLEAN ChewCreate -( VOID (*Worker)(PVOID), PVOID WorkerContext ); +BOOLEAN ChewCreate(VOID (*Worker)(PVOID), PVOID WorkerContext); #endif/*_REACTOS_CHEW_H*/ Modified: trunk/reactos/lib/drivers/chew/chew.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/chew/chew.rbui… ============================================================================== --- trunk/reactos/lib/drivers/chew/chew.rbuild [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/chew/chew.rbuild [iso-8859-1] Mon Oct 12 05:27:45 2009 @@ -4,4 +4,4 @@ <define name="_NTOSKRNL_" /> <include base="chew">include</include> <file>workqueue.c</file> -</module> +</module> Modified: trunk/reactos/lib/drivers/chew/workqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/chew/workqueue… ============================================================================== --- trunk/reactos/lib/drivers/chew/workqueue.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/chew/workqueue.c [iso-8859-1] Mon Oct 12 05:27:45 2009 @@ -1,82 +1,93 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: drivers/lib/chew/workqueue.c - * PURPOSE: Common Highlevel Executive Worker - * - * PROGRAMMERS: arty (ayerkes(a)speakeasy.net) - */ -#include <ntddk.h> -#include <chew/chew.h> - -#define NDEBUG - +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * FILE: lib/drivers/chew/workqueue.c + * PURPOSE: Common Highlevel Executive Worker + * + * PROGRAMMERS: arty (ayerkes(a)speakeasy.net) + */ + +#include <ntddk.h> +#include <chew/chew.h> + +#define NDEBUG +//#include <debug.h> + #define FOURCC(w,x,y,z) (((w) << 24) | ((x) << 16) | ((y) << 8) | (z)) -#define CHEW_TAG FOURCC('C','H','E','W') - -PDEVICE_OBJECT WorkQueueDevice; -LIST_ENTRY WorkQueue; +#define CHEW_TAG FOURCC('C','H','E','W') + +PDEVICE_OBJECT WorkQueueDevice; +LIST_ENTRY WorkQueue; KSPIN_LOCK WorkQueueLock; -KEVENT WorkQueueClear; - -typedef struct _WORK_ITEM { - LIST_ENTRY Entry; - PIO_WORKITEM WorkItem; - VOID (*Worker)( PVOID WorkerContext ); - PVOID WorkerContext; -} WORK_ITEM, *PWORK_ITEM; - -VOID ChewInit( PDEVICE_OBJECT DeviceObject ) { - WorkQueueDevice = DeviceObject; - InitializeListHead( &WorkQueue ); - KeInitializeSpinLock( &WorkQueueLock ); - KeInitializeEvent(&WorkQueueClear, NotificationEvent, TRUE); -} - -VOID ChewShutdown() { - KeWaitForSingleObject(&WorkQueueClear, Executive, KernelMode, FALSE, NULL); -} - -VOID NTAPI ChewWorkItem( PDEVICE_OBJECT DeviceObject, PVOID ChewItem ) { +KEVENT WorkQueueClear; + +typedef struct _WORK_ITEM +{ + LIST_ENTRY Entry; + PIO_WORKITEM WorkItem; + VOID (*Worker)(PVOID WorkerContext); + PVOID WorkerContext; +} WORK_ITEM, *PWORK_ITEM; + +VOID ChewInit(PDEVICE_OBJECT DeviceObject) +{ + WorkQueueDevice = DeviceObject; + InitializeListHead(&WorkQueue); + KeInitializeSpinLock(&WorkQueueLock); + KeInitializeEvent(&WorkQueueClear, NotificationEvent, TRUE); +} + +VOID ChewShutdown(VOID) +{ + KeWaitForSingleObject(&WorkQueueClear, Executive, KernelMode, FALSE, NULL); +} + +VOID NTAPI ChewWorkItem(PDEVICE_OBJECT DeviceObject, PVOID ChewItem) +{ PWORK_ITEM WorkItem = ChewItem; - KIRQL OldIrql; - - WorkItem->Worker( WorkItem->WorkerContext ); - - IoFreeWorkItem( WorkItem->WorkItem ); + KIRQL OldIrql; + + WorkItem->Worker(WorkItem->WorkerContext); + + IoFreeWorkItem(WorkItem->WorkItem); KeAcquireSpinLock(&WorkQueueLock, &OldIrql); RemoveEntryList(&WorkItem->Entry); if (IsListEmpty(&WorkQueue)) KeSetEvent(&WorkQueueClear, 0, FALSE); + KeReleaseSpinLock(&WorkQueueLock, OldIrql); - ExFreePoolWithTag(WorkItem, CHEW_TAG); -} - -BOOLEAN ChewCreate -( VOID (*Worker)( PVOID ), PVOID WorkerContext ) { + ExFreePoolWithTag(WorkItem, CHEW_TAG); +} + +BOOLEAN ChewCreate(VOID (*Worker)(PVOID), PVOID WorkerContext) +{ PWORK_ITEM Item; - Item = ExAllocatePoolWithTag - ( NonPagedPool, - sizeof( WORK_ITEM ), - CHEW_TAG ); - - if( Item ) { - Item->WorkItem = IoAllocateWorkItem( WorkQueueDevice ); - if( !Item->WorkItem ) { - ExFreePool( Item ); - return FALSE; - } - Item->Worker = Worker; - Item->WorkerContext = WorkerContext; - ExInterlockedInsertTailList( &WorkQueue, &Item->Entry, &WorkQueueLock ); - KeResetEvent(&WorkQueueClear); - IoQueueWorkItem( Item->WorkItem, ChewWorkItem, DelayedWorkQueue, Item ); - - return TRUE; - } else { - return FALSE; - } -} + Item = ExAllocatePoolWithTag(NonPagedPool, + sizeof(WORK_ITEM), + CHEW_TAG); + + if (Item) + { + Item->WorkItem = IoAllocateWorkItem(WorkQueueDevice); + if (!Item->WorkItem) + { + ExFreePool(Item); + return FALSE; + } + + Item->Worker = Worker; + Item->WorkerContext = WorkerContext; + ExInterlockedInsertTailList(&WorkQueue, &Item->Entry, &WorkQueueLock); + KeResetEvent(&WorkQueueClear); + IoQueueWorkItem(Item->WorkItem, ChewWorkItem, DelayedWorkQueue, Item); + + return TRUE; + } + else + { + return FALSE; + } +}

1 0

[dchapyshev] 43385: - Add Russian translation
by dchapyshev＠svn.reactos.org 12 Oct '09

12 Oct '09

Author: dchapyshev Date: Mon Oct 12 04:28:37 2009 New Revision: 43385 URL: http://svn.reactos.org/svn/reactos?rev=43385&view=rev Log: - Add Russian translation Added: trunk/reactos/base/applications/games/spider/lang/ru-RU.rc (with props) Modified: trunk/reactos/base/applications/games/spider/rsrc.rc Added: trunk/reactos/base/applications/games/spider/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/sp… ============================================================================== --- trunk/reactos/base/applications/games/spider/lang/ru-RU.rc (added) +++ trunk/reactos/base/applications/games/spider/lang/ru-RU.rc [iso-8859-1] Mon Oct 12 04:28:37 2009 @@ -1,0 +1,81 @@ +/* + * PROJECT: Spider Solitaire + * LICENSE: See COPYING in top level directory + * FILE: base/applications/games/spider/lang/ru-RU.rc + * PURPOSE: Russian Language File for Spider Solitaire + * TRANSLATOR: Dmitry Chapyshev + */ + +#include "resource.h" + +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT + + +/* Dialogs */ + +IDD_CARDBACK DIALOGEX 6, 6, 221, 96 +CAPTION "Âûáîð îôîðìëåíèÿ" +FONT 8, "MS Shell Dlg" +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT +BEGIN + CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 50, 61 + CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 58, 7, 50, 61 + CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 112, 7, 50, 61 + CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 166, 7, 50, 61 + DEFPUSHBUTTON "OK", IDOK, 104, 77, 54, 13 + PUSHBUTTON "Îòìåíà", IDCANCEL, 162, 77, 54, 13 +END + +IDD_DIFFICULTY DIALOGEX DISCARDABLE 100, 100, 106, 80 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT +CAPTION "Óðîâåíü" +FONT 8, "MS Shell Dlg" +BEGIN + AUTORADIOBUTTON "Ïðîñòîé: &îäèí öâåò", IDC_DIF_ONECOLOR, 8, 10, 80, 10, WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "Ñðåäíèé: &äâà öâåòà", IDC_DIF_TWOCOLORS, 8, 23, 80, 10 + AUTORADIOBUTTON "Ñëîæíûé: &÷åòûðå öâåòà", IDC_DIF_FOURCOLORS, 8, 36, 80, 10 + + DEFPUSHBUTTON "OK", IDOK, 8, 58, 40, 14 + PUSHBUTTON "Îòìåíà", IDCANCEL, 58, 58, 40, 14 +END + +/* Strings */ + +STRINGTABLE +BEGIN + IDS_SPI_NAME "Ïàñüÿíñ ""Ïàóê""" + IDS_SPI_ABOUT "Ïàñüÿíñ ""Ïàóê"", Gregor Schneider\n\nCardLib âåðñèè 1.0" + IDS_SPI_QUIT "Âûéòè èç òåêóùåé èãðû?" + IDS_SPI_WIN "Ïîçäðàâëÿåì, âû âûéãðàëè!" + IDS_SPI_DEAL "Ïîïðîáîâàòü ñíîâà?" +END + + +/* Menus */ + +IDR_MENU1 MENU DISCARDABLE +BEGIN + POPUP "&Èãðà" + BEGIN + MENUITEM "&Íîâàÿ èãðà\tF2", IDM_GAME_NEW + MENUITEM SEPARATOR + MENUITEM "&Îôîðìëåíèå...", IDM_GAME_DECK + 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 Propchange: trunk/reactos/base/applications/games/spider/lang/ru-RU.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/games/spider/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/sp… ============================================================================== --- trunk/reactos/base/applications/games/spider/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/spider/rsrc.rc [iso-8859-1] Mon Oct 12 04:28:37 2009 @@ -10,4 +10,5 @@ #include "lang/es-ES.rc" #include "lang/it-IT.rc" #include "lang/ja-JP.rc" +#include "lang/ru-RU.rc"

1 0

[dgorbachev] 43384: Update / add Japanese translations. Tomoya Kitagawa, bug #4884.
by dgorbachev＠svn.reactos.org 11 Oct '09

11 Oct '09

Author: dgorbachev Date: Mon Oct 12 01:23:34 2009 New Revision: 43384 URL: http://svn.reactos.org/svn/reactos?rev=43384&view=rev Log: Update / add Japanese translations. Tomoya Kitagawa, bug #4884. Added: trunk/reactos/base/applications/charmap/lang/ja-JP.rc (with props) trunk/reactos/base/applications/dxdiag/lang/ja-JP.rc (with props) trunk/reactos/base/applications/games/spider/lang/ja-JP.rc (with props) trunk/reactos/base/applications/logoff/lang/ja-JP.rc (with props) trunk/reactos/base/applications/mstsc/lang/ja-JP.rc (with props) Modified: trunk/reactos/base/applications/charmap/rsrc.rc trunk/reactos/base/applications/dxdiag/rsrc.rc trunk/reactos/base/applications/games/spider/lang/en-US.rc trunk/reactos/base/applications/games/spider/rsrc.rc trunk/reactos/base/applications/logoff/lang/en-US.rc trunk/reactos/base/applications/logoff/rsrc.rc trunk/reactos/base/applications/mstsc/rsrc.rc trunk/reactos/base/applications/notepad/lang/en-US.rc trunk/reactos/base/applications/notepad/lang/ja-JP.rc trunk/reactos/base/applications/rapps/lang/ja-JP.rc trunk/reactos/base/applications/regedit/lang/en-US.rc trunk/reactos/base/applications/regedit/lang/ja-JP.rc trunk/reactos/base/applications/regedit/lang/sv-SE.rc trunk/reactos/base/applications/regedit/rsrc.rc Added: trunk/reactos/base/applications/charmap/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/lang/ja-JP.rc (added) +++ trunk/reactos/base/applications/charmap/lang/ja-JP.rc [iso-8859-1] Mon Oct 12 01:23:34 2009 @@ -1,0 +1,35 @@ +LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT + +IDD_CHARMAP DIALOGEX 6, 6, 293, 205 //233 +CAPTION "LN^[ }bv" +FONT 9,"MS UI Gothic",0,0 +STYLE DS_SHELLFONT | WS_BORDER | WS_VISIBLE | WS_SYSMENU | WS_MINIMIZEBOX +BEGIN + LTEXT "tHg:", IDC_STATIC, 6, 7, 24, 9 + COMBOBOX IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE | WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS + PUSHBUTTON "wv", IDC_CMHELP, 249, 5, 35, 13 + CONTROL "", IDC_FONTMAP, "FontMapWnd", WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL, 20, 22, 266, 156 + LTEXT "Rs[·é¶:", IDC_STATIC, 6, 188, 66, 9 + EDITTEXT IDC_TEXTBOX, 74, 186, 114, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP + DEFPUSHBUTTON "Ið", IDC_SELECT, 194, 186, 44, 13 + PUSHBUTTON "Rs[", IDC_COPY, 242, 186, 44, 13, WS_DISABLED + //AUTOCHECKBOX "Ú×\\¦", IDC_ADVVIEW, 10, 204, 64, 9, WS_CHILD | WS_VISIBLE | WS_TABSTOP + //EDITTEXT IDC_DISPLAY, 8, 217, 278, 13, WS_VISIBLE | WS_TABSTOP | ES_READONLY +END + +IDD_ABOUTBOX DIALOGEX 22,16,210,182 +CAPTION "LN^[ }bvÉÂ¢Ä" +FONT 9,"MS UI Gothic",0,0 +STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME +BEGIN + LTEXT "LN^[ }bv v0.1\nCopyright (C) 2007 Ged Murphy (gedmurphy(a)reactos.org)", IDC_STATIC, 48, 7, 150, 36 + PUSHBUTTON "Â¶é", IDOK, 75, 162, 44, 15 + ICON IDI_ICON, IDC_STATIC, 10, 10, 7, 30 + EDITTEXT IDC_LICENSE_EDIT, 8, 44, 194, 107, 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_ABOUT "o[Wîñ(&B)..." +END Propchange: trunk/reactos/base/applications/charmap/lang/ja-JP.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/charmap/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/charmap/rsrc.rc [iso-8859-1] Mon Oct 12 01:23:34 2009 @@ -8,19 +8,20 @@ #include "lang/bg-BG.rc" #include "lang/ca-ES.rc" #include "lang/cs-CZ.rc" +#include "lang/de-DE.rc" +#include "lang/el-GR.rc" #include "lang/en-US.rc" -#include "lang/de-DE.rc" #include "lang/es-ES.rc" #include "lang/fr-FR.rc" #include "lang/id-ID.rc" #include "lang/it-IT.rc" +#include "lang/ja-JP.rc" #include "lang/ko-KR.rc" #include "lang/lt-LT.rc" +#include "lang/nl-NL.rc" #include "lang/no-NO.rc" -#include "lang/nl-NL.rc" #include "lang/pl-PL.rc" #include "lang/pt-BR.rc" +#include "lang/ru-RU.rc" #include "lang/sk-SK.rc" #include "lang/uk-UA.rc" -#include "lang/ru-RU.rc" -#include "lang/el-GR.rc" Added: trunk/reactos/base/applications/dxdiag/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… ============================================================================== --- trunk/reactos/base/applications/dxdiag/lang/ja-JP.rc (added) +++ trunk/reactos/base/applications/dxdiag/lang/ja-JP.rc [iso-8859-1] Mon Oct 12 01:23:34 2009 @@ -1,0 +1,226 @@ +LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT + +IDD_MAIN_DIALOG DIALOGEX DISCARDABLE 0, 0, 478, 280 +STYLE DS_SHELLFONT | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | + WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU | + WS_THICKFRAME +CAPTION "ReactX ff vO" +FONT 9, "MS UI Gothic" +BEGIN + CONTROL "Tab1",IDC_TAB_CONTROL,"SysTabControl32",WS_TABSTOP,2,2,474,250 + PUSHBUTTON "wv(&H)", IDC_BUTTON_HELP, 2, 261, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + DEFPUSHBUTTON "y[W(&N)", IDC_BUTTON_NEXT, 257, 261, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "·×ÄÌîñðÛ¶(&S)...", IDC_BUTTON_SAVE_INFO, 311, 261, 110, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "I¹(&E)", IDC_BUTTON_EXIT, 425, 261, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END + +IDD_SYSTEM_DIALOG DIALOGEX DISCARDABLE 0, 0, 462, 220 +STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN +FONT 9, "MS UI Gothic" +BEGIN + LTEXT "±Ìc[ðg¤ÆACXg[³êÄ¢é ReactX R|[lgâhCoÌÚ×îñðüè·é±ÆªÅ«Ü·B", -1, 10, 10, 443, 17 + LTEXT "ÇÌªìªâèðN±µÄ¢é©ª©ÁÄ¢éêÍAKÈ^uðNbNµÄ¾³¢B »êÈOÌêÍA[y[W] ðNbNµÄ¾³¢B", -1, 10, 30, 443, 25 + GROUPBOX "VXeîñ", -1, 10, 55, 443, 130, SS_RIGHT + LTEXT "»ÝÌú:", -1, 70, 70, 80, 10, SS_RIGHT + LTEXT "Rs[^¼:", -1, 70, 80, 80, 10, SS_RIGHT + LTEXT "Iy[eBO VXe:", -1, 70, 90, 80, 10, SS_RIGHT + LTEXT "¾ê:", -1, 70, 100, 80, 10, SS_RIGHT + LTEXT "VXe»¢³:", -1, 70, 110, 80, 10, SS_RIGHT + LTEXT "VXe f:", -1, 70, 120, 80, 10, SS_RIGHT + LTEXT "BIOS:", -1, 70, 130, 80, 10, SS_RIGHT + LTEXT "vZbT:", -1, 70, 140, 80, 10, SS_RIGHT + LTEXT ":", -1, 70, 150, 80, 10, SS_RIGHT + LTEXT "y[W t@C:", -1, 70, 160, 80, 10, SS_RIGHT + LTEXT "ReactX o[W:", -1, 70, 170, 80, 10, SS_RIGHT + LTEXT "", IDC_STATIC_TIME, 155, 70, 195, 10, SS_LEFT + LTEXT "", IDC_STATIC_COMPUTER, 155, 80, 195, 10, SS_LEFT + LTEXT "", IDC_STATIC_OS, 155, 90, 195, 10, SS_LEFT + LTEXT "", IDC_STATIC_LANG, 155, 100, 195, 10, SS_LEFT + LTEXT "", IDC_STATIC_MANU, 155, 110, 195, 10, SS_LEFT + LTEXT "", IDC_STATIC_MODEL, 155, 120, 195, 10, SS_LEFT + LTEXT "", IDC_STATIC_BIOS, 155, 130, 195, 10, SS_LEFT + LTEXT "", IDC_STATIC_PROC, 155, 140, 195, 10, SS_LEFT + LTEXT "", IDC_STATIC_MEM, 155, 150, 195, 10, SS_LEFT + LTEXT "", IDC_STATIC_SWAP, 155, 160, 195, 10, SS_LEFT + LTEXT "", IDC_STATIC_VERSION, 155, 170, 195, 10, SS_LEFT +END + +IDD_DISPLAY_DIALOG DIALOGEX DISCARDABLE 0, 0, 462, 220 +STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN +FONT 9, "MS UI Gothic" +BEGIN + GROUPBOX "foCX", -1, 10, 10, 250, 100 + RTEXT "¼O:", -1, 20, 25, 70, 10 + RTEXT "»¢³:", -1, 20, 35, 70, 10 + RTEXT "`bvÌíÞ:", -1, 20, 45, 70, 10 + RTEXT "DAC ÌíÞ:", -1, 20, 55, 70, 10 + RTEXT "TZv:", -1, 20, 65, 70, 10 + RTEXT "»ÝÌfBXvC [h:", -1, 20, 75, 70, 10 + RTEXT "j^:", -1, 20, 85, 70, 10 + LTEXT "", IDC_STATIC_ADAPTER_ID, 95, 25, 150, 10 + LTEXT "", IDC_STATIC_ADAPTER_VENDOR, 95, 35, 150, 10 + LTEXT "", IDC_STATIC_ADAPTER_CHIP, 95, 45, 150, 10 + LTEXT "", IDC_STATIC_ADAPTER_DAC, 95, 55, 150, 10 + LTEXT "", IDC_STATIC_ADAPTER_MEM, 95, 65, 150, 10 + LTEXT "", IDC_STATIC_ADAPTER_MODE, 95, 75, 150, 10 + LTEXT "", IDC_STATIC_ADAPTER_MONITOR, 95, 85, 150, 10 + + GROUPBOX "hCo", -1, 270, 10, 190, 100 + RTEXT "C hCo:", -1, 275, 25, 55, 10 + RTEXT "o[W:", -1, 275, 35, 55, 10 + RTEXT "út:", -1, 275, 45, 55, 10 + RTEXT "WHQL St«:", -1, 275, 55, 55, 10 + RTEXT "Mini VDD:", -1, 275, 65, 55, 10 + RTEXT " vvdddVDD:", -1, 275, 75, 55, 10 + RTEXT "DDIÌo[W:", -1, 275, 85, 55, 10 + LTEXT "", IDC_STATIC_ADAPTER_DRIVER, 335, 35, 100, 10 + LTEXT "", IDC_STATIC_ADAPTER_VERSION, 335, 35, 100, 10 + LTEXT "", IDC_STATIC_ADAPTER_DATE, 335, 45, 100, 10 + LTEXT "", IDC_STATIC_ADAPTER_LOGO, 335, 55, 100, 10 + LTEXT "", IDC_STATIC_ADAPTER_MINIVDD, 335, 65, 100, 10 + LTEXT "", IDC_STATIC_ADAPTER_VDD, 335, 75, 100, 10 + LTEXT "", IDC_STATIC_ADAPTER_DDI, 335, 85, 100, 10 + + GROUPBOX "ReactX Ì@\\", -1, 10, 115, 450, 60 + RTEXT "DirectDraw ANZ[V:", -1, 15, 130, 110, 12 + RTEXT "Direct3D ANZ[V:", -1, 15, 145, 110, 12 + RTEXT "AGP eNX` ANZ[V:", -1, 15, 160, 110, 12 + LTEXT "", IDC_STATIC_DDSTATE, 130, 130, 40, 10 + LTEXT "", IDC_STATIC_D3DSTATE, 130, 145, 40, 10 + LTEXT "", IDC_STATIC_AGPSTATE, 130, 160, 40, 10 + PUSHBUTTON "Lø", IDC_BUTTON_DDRAW, 170, 124, 60, 14, WS_DISABLED + PUSHBUTTON "Lø", IDC_BUTTON_D3D, 170, 140, 60, 14, WS_DISABLED + PUSHBUTTON "Lø", IDC_BUTTON_AGP, 170, 156, 60, 14, WS_DISABLED + PUSHBUTTON "DirectDraw ÌeXg", IDC_BUTTON_TESTDD, 250, 124, 80, 14 + PUSHBUTTON "Direct3D ÌeXg", IDC_BUTTON_TEST3D, 250, 140, 80, 14 + + GROUPBOX "Ó", -1, 10, 180, 450, 40 + EDITTEXT IDC_TEXT_INFO, 20, 192, 432, 20, WS_DISABLED | WS_TABSTOP +END + + +IDD_SOUND_DIALOG DIALOGEX DISCARDABLE 0, 0, 462, 220 +STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN +FONT 9, "MS UI Gothic" +BEGIN + GROUPBOX "foCX", -1, 10, 10, 250, 100 + RTEXT "¼O:", -1, 20, 25, 70, 10 + RTEXT "foCX ID:", -1, 20, 35, 70, 10 + RTEXT "»¢³ ID:", -1, 20, 45, 70, 10 + RTEXT "»i ID:", -1, 20, 55, 70, 10 + RTEXT "íÞ:", -1, 20, 65, 70, 10 + RTEXT "ùèÌfoCX:", -1, 20, 75, 70, 10 + LTEXT "", IDC_STATIC_DSOUND_NAME, 95, 25, 150, 10 + LTEXT "", IDC_STATIC_DSOUND_DEVICEID, 95, 35, 150, 10 + LTEXT "", IDC_STATIC_DSOUND_VENDORID, 95, 45, 150, 10 + LTEXT "", IDC_STATIC_DSOUND_PRODUCTID, 95, 55, 150, 10 + LTEXT "", IDC_STATIC_DSOUND_TYPE, 95, 65, 150, 10 + LTEXT "", IDC_STATIC_DSOUND_STANDARD, 95, 75, 150, 10 + GROUPBOX "hCo", -1, 270, 10, 190, 100 + RTEXT "¼O:", -1, 275, 25, 55, 10 + RTEXT "o[W:", -1, 275, 35, 55, 10 + RTEXT "út:", -1, 275, 45, 55, 10 + RTEXT "WHQL St«:", -1, 275, 55, 55, 10 + RTEXT "¼Ìt@C:", -1, 275, 65, 55, 10 + RTEXT "³:", -1, 275, 75, 55, 10 + LTEXT "", IDC_STATIC_DSOUND_DRIVER, 335, 25, 100, 10 + LTEXT "", IDC_STATIC_DSOUND_VERSION, 335, 35, 100, 10 + LTEXT "", IDC_STATIC_DSOUND_DATE, 335, 45, 100, 10 + LTEXT "", IDC_STATIC_DSOUND_LOGO, 335, 55, 100, 10 + LTEXT "", IDC_STATIC_DSOUND_FILES, 335, 65, 100, 10 + LTEXT "", IDC_STATIC_ADAPTER_PROVIDER, 335, 75, 100, 10 + GROUPBOX "ReactX Ì@\\", -1, 10, 115, 450, 60 + CONTROL "", IDC_SLIDER_DSOUND, "msctls_trackbar32", TBS_BOTTOM | TBS_AUTOTICKS | WS_TABSTOP, 120, 135, 80, 17 + RTEXT "n[hEFA TEh\nANZ[V x:", -1, 20, 135, 90, 20 + PUSHBUTTON "DirectSound ÌeXg", IDC_BUTTON_TESTDSOUND, 270, 134, 80, 14 + GROUPBOX "Ó", -1, 10, 180, 450, 40 + EDITTEXT IDC_TEXT_DSOUNDINFO, 20, 192, 432, 20, WS_DISABLED | WS_TABSTOP +END + +IDD_MUSIC_DIALOG DIALOGEX DISCARDABLE 0, 0, 462, 220 +STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN +FONT 9, "MS UI Gothic" +BEGIN +END + + +IDD_INPUT_DIALOG DIALOGEX DISCARDABLE 0, 0, 462, 220 +STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN +FONT 9, "MS UI Gothic" +BEGIN + GROUPBOX "DirectInput foCX", -1, 10, 10, 452, 80 + CONTROL "", IDC_LIST_DEVICE, "SysListView32", LVS_REPORT | WS_CHILD | WS_BORDER | WS_TABSTOP, 20, 22, 432, 60 + GROUPBOX "üÍfoCX", -1, 10, 100, 452, 60 + CONTROL "", IDC_TREE_PORT, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_DISABLEDRAGDROP | TVS_SHOWSELALWAYS | WS_VISIBLE | WS_BORDER | WS_TABSTOP, 20, 112, 432, 40, 0x00000200 + GROUPBOX "îñ", -1, 10, 170, 452, 50 + EDITTEXT IDC_RICH_INFO, 20, 182, 432, 30, WS_DISABLED | WS_TABSTOP +END + +IDD_NETWORK_DIALOG DIALOGEX DISCARDABLE 0, 0, 462, 220 +STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN +FONT 9, "MS UI Gothic" +BEGIN + GROUPBOX "o^ÏÝ DirectPlay T[rX voC_", -1, 10, 10, 452, 80 + CONTROL "", IDC_LIST_PROVIDER, "SysListView32", LVS_REPORT | WS_CHILD | WS_BORDER | WS_TABSTOP, 20, 22, 432, 60 +END + +IDD_HELP_DIALOG DIALOGEX DISCARDABLE 0, 0, 462, 220 +STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN +FONT 9, "MS UI Gothic" +BEGIN +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_MAIN_DIALOG "ReactX ffc[" + IDS_SYSTEM_DIALOG "VXe" + IDS_DISPLAY_DIALOG "fBXvC" + IDS_SOUND_DIALOG "TEh" + IDS_MUSIC_DIALOG "~[WbN" + IDS_INPUT_DIALOG "üÍ" + IDS_NETWORK_DIALOG "lbg[N" + IDS_HELP_DIALOG "wv" + IDS_FORMAT_MB "%I64uMB RAM" + IDS_FORMAT_SWAP "%I64uMB gp %I64uMB gpÂ\\" + IDS_FORMAT_UNIPROC "%s (%u CPU)" + IDS_FORMAT_MPPROC "%s (%u CPUs)" + IDS_VERSION_UNKNOWN "s¾Èo[W" + IDS_DEVICE_STATUS_ATTACHED "Ú±³êÄ¢Ü·" + IDS_DEVICE_STATUS_MISSING "Ú±³êÄ¢Ü¹ñ" + IDS_DEVICE_STATUS_UNKNOWN "s¾" + IDS_DEVICE_NAME "foCX¼" + IDS_DEVICE_STATUS "óÔ" + IDS_DEVICE_CONTROLLER "Rg[ ID" + IDS_DEVICE_MANUFACTURER "»¢³ ID" + IDS_DEVICE_PRODUCT "»i ID" + IDS_DEVICE_FORCEFEEDBACK "tH[X tB[hobNhCo" + IDS_NOT_APPLICABLE "ps\\" + IDS_OPTION_YES "Í¢" + IDS_DIRECTPLAY_COL_NAME1 "¼O" + IDS_DIRECTPLAY_COL_NAME2 "WXg" + IDS_DIRECTPLAY_COL_NAME3 "t@C" + IDS_DIRECTPLAY_COL_NAME4 "o[W" + IDS_DIRECTPLAY8_MODEMSP "DirectPlay8 f T[rX voC_" + IDS_DIRECTPLAY8_SERIALSP "DirectPlay8 VA T[rX voC_" + IDS_DIRECTPLAY8_IPXSP "DirectPlay8 IPX T[rX voC_" + IDS_DIRECTPLAY8_TCPSP "DirectPlay8 TCP/IP T[rX voC_" + IDS_DIRECTPLAY_TCPCONN "DirectPlay C^[lbg TCP/IP Ú±" + IDS_DIRECTPLAY_IPXCONN "DirectPlay IPX Ú±" + IDS_DIRECTPLAY_MODEMCONN "DirectPlay fÚ±" + IDS_DIRECTPLAY_SERIALCONN "DirectPlay VAÚ±" + IDS_REG_SUCCESS "OK" + IDS_REG_FAIL "G[" + IDS_DDTEST_ERROR "eXgÉ¸sµÜµ½!" + IDS_DDTEST_DESCRIPTION "DirectDraw C^tF[XeXgðJnµÜ·B±sµÜ·©?" + IDS_DDPRIMARY_DESCRIPTION "±ÌeXgÅÍ DirectDraw ðgÁÄ{ÌæÊãÉ`æµÜ·BÆÌ·û`ª`æ³êÜ·B±sµÜ·©?" + IDS_DDPRIMARY_RESULT "ÆÌ·û`ª©¦Üµ½©?" + IDS_DDOFFSCREEN_DESCRIPTION "±ÌeXgÅÍADirectDraw ðgÁÄItXN[ obt@Å`æµÜ·BÚ®µÄ¢é¢é`ª`æ³êÜ·B±sµÜ·©?" + IDS_DDOFFSCREEN_RESULT "Ú®µÄ¢é¢³û`ª©¦Üµ½©?" + IDS_DDFULLSCREEN_DESCRIPTION "±ÌeXgÅÍADirectDraw ðgÁÄSæÊ\\¦[hÅ`æµÜ·BÚ®µÄ¢é¢é`ª`æ³êÜ·B±sµÜ·©?" + IDS_DDFULLSCREEN_RESULT "SæÊ\\¦[hÅÚ®µÄ¢é¢é`ª©¦Üµ½©?" + IDS_FORMAT_ADAPTER_MEM "%u MB" + IDS_FORMAT_ADAPTER_MODE "%04u x %04u (%u bit)(%uHz)" + IDS_OPTION_NO "¢¢¦" + IDS_D3DTEST_DESCRIPTION "Direct3D C^tF[XeXgðJnµæ¤ÆµÄ¢Ü·B±sµÜ·©?" + IDS_D3DTEST_D3Dx "±ÌeXgÍn[hEFA ANZ[[^ Direct3D %u C^[tFCXðg¢Ü·B" +END Propchange: trunk/reactos/base/applications/dxdiag/lang/ja-JP.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/dxdiag/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/r… ============================================================================== --- trunk/reactos/base/applications/dxdiag/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/rsrc.rc [iso-8859-1] Mon Oct 12 01:23:34 2009 @@ -10,6 +10,7 @@ #include "lang/en-US.rc" #include "lang/es-ES.rc" #include "lang/fr-FR.rc" +#include "lang/ja-JP.rc" #include "lang/ko-KR.rc" #include "lang/nl-NL.rc" #include "lang/no-NO.rc" Modified: trunk/reactos/base/applications/games/spider/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/sp… ============================================================================== --- trunk/reactos/base/applications/games/spider/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/spider/lang/en-US.rc [iso-8859-1] Mon Oct 12 01:23:34 2009 @@ -18,8 +18,8 @@ FONT 8, "MS Shell Dlg" STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT BEGIN - CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 50, 61 - CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 58, 7, 50, 61 + CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 50, 61 + CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 58, 7, 50, 61 CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 112, 7, 50, 61 CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 166, 7, 50, 61 DEFPUSHBUTTON "OK", IDOK, 104, 77, 54, 13 @@ -31,9 +31,9 @@ CAPTION "Difficulty" FONT 8, "MS Shell Dlg" BEGIN - AUTORADIOBUTTON "Easy: &One Color", IDC_DIF_ONECOLOR, 8, 10, 80, 10, WS_GROUP | WS_TABSTOP - AUTORADIOBUTTON "Medium: &Two Colors", IDC_DIF_TWOCOLORS, 8, 23, 80, 10 - AUTORADIOBUTTON "Hard: &Four Colors", IDC_DIF_FOURCOLORS, 8, 36, 80, 10 + AUTORADIOBUTTON "Easy: &One Color", IDC_DIF_ONECOLOR, 8, 10, 80, 10, WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "Medium: &Two Colors", IDC_DIF_TWOCOLORS, 8, 23, 80, 10 + AUTORADIOBUTTON "Hard: &Four Colors", IDC_DIF_FOURCOLORS, 8, 36, 80, 10 DEFPUSHBUTTON "OK", IDOK, 8, 58, 40, 14 PUSHBUTTON "Cancel", IDCANCEL, 58, 58, 40, 14 Added: trunk/reactos/base/applications/games/spider/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/sp… ============================================================================== --- trunk/reactos/base/applications/games/spider/lang/ja-JP.rc (added) +++ trunk/reactos/base/applications/games/spider/lang/ja-JP.rc [iso-8859-1] Mon Oct 12 01:23:34 2009 @@ -1,0 +1,81 @@ +/* + * PROJECT: Spider Solitaire + * LICENSE: See COPYING in top level directory + * FILE: base/applications/games/spider/lang/ja-JP.rc + * PURPOSE: Japanese Language File for Spider Solitaire + * TRANSLATOR: Tomoya Kitagawa + */ + +#include "resource.h" + +LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT + + +/* Dialogs */ + +IDD_CARDBACK DIALOGEX 6, 6, 221, 96 +CAPTION "J[hÌwiðIð" +FONT 9, "MS UI Gothic" +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT +BEGIN + CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 50, 61 + CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 58, 7, 50, 61 + CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 112, 7, 50, 61 + CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 166, 7, 50, 61 + DEFPUSHBUTTON "OK", IDOK, 104, 77, 54, 13 + PUSHBUTTON "LZ", IDCANCEL, 162, 77, 54, 13 +END + +IDD_DIFFICULTY DIALOGEX DISCARDABLE 100, 100, 106, 80 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT +CAPTION "ïÕx" +FONT 9, "MS UI Gothic" +BEGIN + AUTORADIOBUTTON ": 1 F(&O)", IDC_DIF_ONECOLOR, 8, 10, 80, 10, WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON ": 2 F(&T)", IDC_DIF_TWOCOLORS, 8, 23, 80, 10 + AUTORADIOBUTTON "ã: 4 F(&F)", IDC_DIF_FOURCOLORS, 8, 36, 80, 10 + + DEFPUSHBUTTON "OK", IDOK, 8, 58, 40, 14 + PUSHBUTTON "LZ", IDCANCEL, 58, 58, 40, 14 +END + +/* Strings */ + +STRINGTABLE +BEGIN + IDS_SPI_NAME "XpC_" + IDS_SPI_ABOUT "Gregor Schneider ÉæéXpC_ \\eBA\n\nCardLib o[W 1.0" + IDS_SPI_QUIT "»ÝÌQ[ðI¹µÜ·©?" + IDS_SPI_WIN "¨ßÅÆ¤A È½Ì¿Å·!" + IDS_SPI_DEAL "à¤êxJ[hðzèÜ·©?" +END + + +/* Menus */ + +IDR_MENU1 MENU DISCARDABLE +BEGIN + POPUP "Q[(&G)" + BEGIN + MENUITEM "VKQ[(&N)\tF2", IDM_GAME_NEW + MENUITEM SEPARATOR + MENUITEM "J[hÌü(&D)...", IDM_GAME_DECK + MENUITEM SEPARATOR + MENUITEM "XpC_ÌI¹(&E)", IDM_GAME_EXIT + END + POPUP "wv(&H)" + BEGIN + MENUITEM "Ú(&C)\tF1", IDM_HELP_CONTENTS + MENUITEM "o[Wîñ(&A)", 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 Propchange: trunk/reactos/base/applications/games/spider/lang/ja-JP.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/games/spider/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/sp… ============================================================================== --- trunk/reactos/base/applications/games/spider/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/spider/rsrc.rc [iso-8859-1] Mon Oct 12 01:23:34 2009 @@ -9,3 +9,5 @@ #include "lang/en-US.rc" #include "lang/es-ES.rc" #include "lang/it-IT.rc" +#include "lang/ja-JP.rc" + Modified: trunk/reactos/base/applications/logoff/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/logoff/l… ============================================================================== --- trunk/reactos/base/applications/logoff/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/logoff/lang/en-US.rc [iso-8859-1] Mon Oct 12 01:23:34 2009 @@ -8,7 +8,7 @@ /?\t\tShows this information.\n\n" IDS_LOGOFF_REMOTE, "Terminating session on remote machine." -IDS_LOGOFF_LOCAL, "Terminating the current session on this machine." +IDS_LOGOFF_LOCAL, "Terminating the current session on this machine." IDS_ILLEGAL_PARAM, "Invalid parameter(s)\n" END Added: trunk/reactos/base/applications/logoff/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/logoff/l… ============================================================================== --- trunk/reactos/base/applications/logoff/lang/ja-JP.rc (added) +++ trunk/reactos/base/applications/logoff/lang/ja-JP.rc [iso-8859-1] Mon Oct 12 01:23:34 2009 @@ -1,0 +1,15 @@ +LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +BEGIN + +IDS_USAGE, "ZbVðI¹µÜ·B\n\n\ + /v\t\tÀsÉÚ×îñð\\¦µÜ·B\n\ + /?\t\t±Ìîñð\\¦µÜ·B\n\n" + +IDS_LOGOFF_REMOTE, "[g }VÌZbVðI¹µÄ¢Ü·B" +IDS_LOGOFF_LOCAL, "±Ì}VÌ»ÝÌZbVðI¹µÄ¢Ü·B" + +IDS_ILLEGAL_PARAM, "p[^ª³øÅ·\n" +END +/* EOF */ Propchange: trunk/reactos/base/applications/logoff/lang/ja-JP.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/logoff/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/logoff/r… ============================================================================== --- trunk/reactos/base/applications/logoff/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/logoff/rsrc.rc [iso-8859-1] Mon Oct 12 01:23:34 2009 @@ -10,6 +10,7 @@ #include "lang/es-ES.rc" #include "lang/fr-FR.rc" #include "lang/it-IT.rc" +#include "lang/ja-JP.rc" #include "lang/ko-KR.rc" #include "lang/lt-LT.rc" #include "lang/no-NO.rc" @@ -18,5 +19,3 @@ #include "lang/sk-SK.rc" #include "lang/uk-UA.rc" - - Added: trunk/reactos/base/applications/mstsc/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/la… ============================================================================== --- trunk/reactos/base/applications/mstsc/lang/ja-JP.rc (added) +++ trunk/reactos/base/applications/mstsc/lang/ja-JP.rc [iso-8859-1] Mon Oct 12 01:23:34 2009 @@ -1,0 +1,63 @@ +LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT + +IDD_GENERAL DIALOGEX 0, 0, 242, 175 +STYLE DS_SHELLFONT | WS_CHILD +FONT 9, "MS UI Gothic", 0, 0, 0x0 +BEGIN + GROUPBOX "OIÝè",IDC_STATIC,7,7,228,89 + GROUPBOX "Ú±Ýè",IDC_STATIC,7,103,228,65 + ICON "", IDC_LOGONICON, 15,19,20,20 + LTEXT "T[oÌAhXðüÍµÄ¾³¢",IDC_STATIC,47,24,81,8 + LTEXT "T[o:",IDC_STATIC,47,41,25,8 + LTEXT "[U[¼:",IDC_STATIC,47,58,38,8 + COMBOBOX IDC_SERVERCOMBO,79,39,141,150,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Û¶",IDC_SAVE,67,139,50,14 + PUSHBUTTON "¼Oðt¯ÄÛ¶...",IDC_SAVEAS,123,139,50,14 + PUSHBUTTON "J...",IDC_OPEN,177,139,50,14 + ICON "", IDC_CONNICON, 16,114,20,20 + LTEXT "»ÝÌÚ±ÝèðÛ¶·é©AÜ½ÍÛ¶³ê½Ú±ðJ¢Ä¾³¢",IDC_STATIC,50,115,172,20 +END + +IDD_DISPLAY DIALOGEX 0, 0, 242, 175 +STYLE DS_SHELLFONT | WS_CHILD +FONT 9, "MS UI Gothic", 0, 0, 0x0 +BEGIN + GROUPBOX "[g fXNgbvÌTCY",IDC_STATIC,7,7,228,68 + GROUPBOX "F",IDC_STATIC,7,83,228,85 + ICON "", IDC_REMICON, 15,19,20,20 + ICON "", IDC_COLORSICON, 15,98,20,20 + LTEXT "[g fXNgbvÌæÊTCYðÝèµÄ¾³¢BXC_ÌÂÜÝðE[É®©·ÆASæÊ\\¦ÉÈèÜ·",IDC_STATIC,53,22,175,21 + CONTROL "", IDC_GEOSLIDER, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 56, 42, 124, 17 + COMBOBOX IDC_BPPCOMBO,56,102,128,80, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP + CONTROL "",IDC_COLORIMAGE,"Static",SS_OWNERDRAW | SS_SUNKEN, 56,121,127,10 + LTEXT "Ó: ±ÌÝèÍ[g Rs[^ÌÝèÅã«³êéÂ\\«ª èÜ·B",IDC_STATIC,56,143,165,18 + LTEXT "¬",IDC_STATIC,35,42,15,8 + LTEXT "å",IDC_STATIC,189,42,17,8 + LTEXT "", IDC_SETTINGS_RESOLUTION_TEXT, 56, 62, 120, 10, SS_CENTER +END + +IDD_CONNECTDIALOG DIALOGEX 0, 0, 260, 262 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "[g fXNgbvÚ±" +FONT 9, "MS UI Gothic", 400, 0, 0x1 +BEGIN + DEFPUSHBUTTON "Ú±",IDOK,147,245,50,14 + PUSHBUTTON "LZ",IDCANCEL,203,245,50,14 + CONTROL "",IDC_TAB,"SysTabControl32",0x0,7,50,246,190 +END + + +STRINGTABLE +BEGIN + IDS_TAB_GENERAL "SÊ" + IDS_TAB_DISPLAY "æÊ" + IDS_256COLORS "256 F" + IDS_HIGHCOLOR15 "32,768 F (15 rbg)" + IDS_HIGHCOLOR16 "65,536 F (16 rbg)" + IDS_HIGHCOLOR24 "16,777,216 F (24 rbg)" + IDS_PIXEL "%lu x %lu sNZ" + IDS_FULLSCREEN "SæÊ\\¦" + IDS_BROWSESERVER "<QÆ...>" + IDS_HEADERTEXT1 "[g fXNgbv" + IDS_HEADERTEXT2 "Ú±" +END Propchange: trunk/reactos/base/applications/mstsc/lang/ja-JP.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/mstsc/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/rs… ============================================================================== --- trunk/reactos/base/applications/mstsc/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mstsc/rsrc.rc [iso-8859-1] Mon Oct 12 01:23:34 2009 @@ -20,6 +20,7 @@ #include "lang/es-ES.rc" #include "lang/fr-FR.rc" #include "lang/it-IT.rc" +#include "lang/ja-JP.rc" #include "lang/ko-KR.rc" #include "lang/lt-LT.rc" #include "lang/no-NO.rc" Modified: trunk/reactos/base/applications/notepad/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/lang/en-US.rc [iso-8859-1] Mon Oct 12 01:23:34 2009 @@ -87,7 +87,7 @@ MENUITEM "&Search...", CMD_HELP_SEARCH MENUITEM "&Help on help", CMD_HELP_ON_HELP MENUITEM SEPARATOR - MENUITEM "&About" CMD_ABOUT + MENUITEM "&About", CMD_ABOUT MENUITEM "Inf&o", CMD_ABOUT_WINE END END @@ -100,29 +100,28 @@ CAPTION "Page Setup" BEGIN LTEXT "&Header:", 0x140, 10, 07, 40, 15 -EDITTEXT 0x141, 60, 05,110, 12, WS_BORDER | WS_TABSTOP +EDITTEXT 0x141, 60, 05,110, 12, WS_BORDER | WS_TABSTOP LTEXT "&Footer:", 0x142, 10, 24, 40, 15 -EDITTEXT 0x143, 60, 22,110, 12, WS_BORDER | WS_TABSTOP - -GROUPBOX "&Margins:", 0x144, 10, 43,160, 45 -LTEXT "&Left:", 0x145, 20, 55, 30, 10, WS_CHILD -EDITTEXT /*STRING_PAGESETUP_LEFTVALUE,*/ 0x147, 50, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP -LTEXT "&Top:", 0x148, 20, 73, 30, 10, WS_CHILD -EDITTEXT /*STRING_PAGESETUP_TOPVALUE,*/ 0x14A, 50, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP -LTEXT "&Right:", 0x14B, 100, 55, 30, 10, WS_CHILD -EDITTEXT /*STRING_PAGESETUP_RIGHTVALUE,*/ 0x14D, 130, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP -LTEXT "&Bottom:", 0x14E,100, 73, 30, 10, WS_CHILD -EDITTEXT /*STRING_PAGESETUP_BOTTOMVALUE,*/ 0x150, 130, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP - -DEFPUSHBUTTON "OK", IDOK, 180, 3, 40, 15, WS_TABSTOP -PUSHBUTTON "Cancel", IDCANCEL, 180, 21, 40, 15, WS_TABSTOP -PUSHBUTTON "&Help", IDHELP, 180, 39, 40, 15, WS_TABSTOP +EDITTEXT 0x143, 60, 22,110, 12, WS_BORDER | WS_TABSTOP + +GROUPBOX "&Margins:", 0x144, 10, 43,160, 45 +LTEXT "&Left:", 0x145, 20, 55, 30, 10, WS_CHILD +EDITTEXT /*STRING_PAGESETUP_LEFTVALUE,*/ 0x147, 50, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP +LTEXT "&Top:", 0x148, 20, 73, 30, 10, WS_CHILD +EDITTEXT /*STRING_PAGESETUP_TOPVALUE,*/ 0x14A, 50, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP +LTEXT "&Right:", 0x14B, 100, 55, 30, 10, WS_CHILD +EDITTEXT /*STRING_PAGESETUP_RIGHTVALUE,*/ 0x14D, 130, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP +LTEXT "&Bottom:", 0x14E, 100, 73, 30, 10, WS_CHILD +EDITTEXT /*STRING_PAGESETUP_BOTTOMVALUE,*/ 0x150, 130, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP + +DEFPUSHBUTTON "OK", IDOK, 180, 3, 40, 15, WS_TABSTOP +PUSHBUTTON "Cancel", IDCANCEL, 180, 21, 40, 15, WS_TABSTOP +PUSHBUTTON "&Help", IDHELP, 180, 39, 40, 15, WS_TABSTOP END /* Dialog `Encoding' */ DIALOG_ENCODING DIALOGEX 0, 0, 256, 44 -STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPSIBLINGS | - WS_CAPTION | WS_SYSMENU +STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPSIBLINGS | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" CAPTION "Encoding" BEGIN @@ -168,9 +167,9 @@ BEGIN STRING_PAGESETUP_HEADERVALUE, "&n" /* FIXME */ STRING_PAGESETUP_FOOTERVALUE, "Page &s" /* FIXME */ -STRING_PAGESETUP_LEFTVALUE, "20 mm" /* FIXME */ +STRING_PAGESETUP_LEFTVALUE, "20 mm" /* FIXME */ STRING_PAGESETUP_RIGHTVALUE, "20 mm" /* FIXME */ -STRING_PAGESETUP_TOPVALUE, "25 mm" /* FIXME */ +STRING_PAGESETUP_TOPVALUE, "25 mm" /* FIXME */ STRING_PAGESETUP_BOTTOMVALUE, "25 mm" /* FIXME */ STRING_NOTEPAD, "Notepad" @@ -181,7 +180,7 @@ STRING_UNTITLED, "(untitled)" STRING_ALL_FILES, "All files (*.*)" -STRING_TEXT_FILES_TXT, "Text files (*.txt)" +STRING_TEXT_FILES_TXT, "Text files (*.txt)" STRING_TOOLARGE, "File '%s' is too large for notepad.\n \ Please use a different editor." @@ -191,10 +190,9 @@ Do you want to create a new file ?" STRING_NOTSAVED, "File '%s'\nhas been modified\n\n \ Would you like to save the changes ?" -STRING_NOTFOUND, "'%s' can not be found." -STRING_OUT_OF_MEMORY, "Not enough memory to complete this \ -task. \nClose one or more applications to increase the amount of \nfree \ -memory." +STRING_NOTFOUND, "'%s' can not be found." +STRING_OUT_OF_MEMORY, "Not enough memory to complete this \ +task. \nClose one or more applications to increase the amount of \nfree memory." STRING_CANNOTFIND "Cannot find '%s'" STRING_ANSI, "ANSI" STRING_UNICODE, "Unicode" Modified: trunk/reactos/base/applications/notepad/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/lang/ja-JP.rc [iso-8859-1] Mon Oct 12 01:23:34 2009 @@ -44,37 +44,37 @@ BEGIN POPUP "t@C(&F)" BEGIN - MENUITEM "VKì¬(&N)\tCtrl+N", CMD_NEW - MENUITEM "J(&O)\tCtrl+O", CMD_OPEN - MENUITEM "Û¶(&S)\tCtrl+S", CMD_SAVE + MENUITEM "VKì¬(&N)\tCtrl+N", CMD_NEW + MENUITEM "J(&O)...\tCtrl+O", CMD_OPEN + MENUITEM "ã«Û¶(&S)\tCtrl+S", CMD_SAVE MENUITEM "¼Oðt¯ÄÛ¶(&A)...", CMD_SAVE_AS MENUITEM SEPARATOR - MENUITEM "y[WÝè(&T)...", CMD_PAGE_SETUP - MENUITEM "óü(&P)\tCtrl+P", CMD_PRINT - MENUITEM "v^ÌÝè(&R)...", CMD_PRINTER_SETUP - MENUITEM SEPARATOR - MENUITEM "I¹(&X)", CMD_EXIT + MENUITEM "y[WÝè(&T)...", CMD_PAGE_SETUP + MENUITEM "óü(&P)\tCtrl+P", CMD_PRINT + MENUITEM "v^ÌÝè(&R)...", CMD_PRINTER_SETUP + MENUITEM SEPARATOR + MENUITEM " ÌI¹(&X)", CMD_EXIT END POPUP "ÒW(&E)" BEGIN MENUITEM "³Éß·(&U)\tCtrl+Z", CMD_UNDO MENUITEM SEPARATOR - MENUITEM "Øèæè(&T)\tCtrl+X", CMD_CUT - MENUITEM "Rs[(&C)\tCtrl+C", CMD_COPY - MENUITEM "y[Xg(&P)\tCtrl+V", CMD_PASTE - MENUITEM "í(&D)\tDel", CMD_DELETE - MENUITEM SEPARATOR - MENUITEM "õ(&S)\tCtrl+F", CMD_SEARCH - MENUITEM "Ìóâðõ(&S)\tF3", CMD_SEARCH_NEXT + MENUITEM "Øèæè(&T)\tCtrl+X", CMD_CUT + MENUITEM "Rs[(&C)\tCtrl+C", CMD_COPY + MENUITEM "\\èt¯(&P)\tCtrl+V", CMD_PASTE + MENUITEM "í(&D)\tDel", CMD_DELETE + MENUITEM SEPARATOR + MENUITEM "õ(&F)...\tCtrl+F", CMD_SEARCH + MENUITEM "ðõ(&S)\tF3", CMD_SEARCH_NEXT MENUITEM "u·\tCtrl+H", CMD_REPLACE - MENUITEM "sÖÚ®...\tCtrl+G", CMD_GOTO - MENUITEM SEPARATOR - MENUITEM "SÄIð(&A)\tCtrl+A", CMD_SELECT_ALL - MENUITEM "útÆÌ}ü(&T)\tF5", CMD_TIME_DATE + MENUITEM "sÖÚ®...\tCtrl+G", CMD_GOTO + MENUITEM SEPARATOR + MENUITEM "·×ÄIð(&A)\tCtrl+A", CMD_SELECT_ALL + MENUITEM "útÆ(&T)\tF5", CMD_TIME_DATE END POPUP "®(&O)" BEGIN - MENUITEM "·¢sðÜèÔ·(&W)", CMD_WRAP + MENUITEM "E[ÅÜèÔ·(&W)", CMD_WRAP MENUITEM "tHg(&F)...", CMD_FONT END POPUP "\\¦(&V)" @@ -84,11 +84,11 @@ POPUP "wv(&H)" BEGIN MENUITEM "Ú(&C)", CMD_HELP_CONTENTS - MENUITEM "õ(&S)...", CMD_HELP_SEARCH + MENUITEM "õ(&S)...", CMD_HELP_SEARCH MENUITEM "wvÌg¢û(&H)", CMD_HELP_ON_HELP MENUITEM SEPARATOR - MENUITEM "&About" CMD_ABOUT - MENUITEM "îñ(&O)" CMD_ABOUT_WINE + MENUITEM "o[Wîñ(&A)", CMD_ABOUT + MENUITEM "îñ(&O)", CMD_ABOUT_WINE END END @@ -99,30 +99,29 @@ FONT 9, "MS UI Gothic" CAPTION "y[WÝè" BEGIN -LTEXT "wb_(&H):", 0x140, 10, 07, 40, 15 -EDITTEXT 0x141, 60, 05,110, 12, WS_BORDER | WS_TABSTOP -LTEXT "tb^(&F):", 0x142, 10, 24, 40, 15 -EDITTEXT 0x143, 60, 22,110, 12, WS_BORDER | WS_TABSTOP - -GROUPBOX "}[W(&M):", 0x144, 10, 43,160, 45 -LTEXT "¶(&L):", 0x145, 20, 55, 30, 10, WS_CHILD -EDITTEXT /*STRING_PAGESETUP_LEFTVALUE,*/ 0x147, 50, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP -LTEXT "ã(&T):", 0x148, 20, 73, 30, 10, WS_CHILD -EDITTEXT /*STRING_PAGESETUP_TOPVALUE,*/ 0x14A, 50, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP -LTEXT "E(&R):", 0x14B, 100, 55, 30, 10, WS_CHILD -EDITTEXT /*STRING_PAGESETUP_RIGHTVALUE,*/ 0x14D, 130, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP -LTEXT "º(&B):", 0x14E,100, 73, 30, 10, WS_CHILD -EDITTEXT /*STRING_PAGESETUP_BOTTOMVALUE,*/ 0x150, 130, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP - -DEFPUSHBUTTON "OK", IDOK, 180, 3, 40, 15, WS_TABSTOP -PUSHBUTTON "LZ", IDCANCEL, 180, 21, 40, 15, WS_TABSTOP -PUSHBUTTON "wv(&H)", IDHELP, 180, 39, 40, 15, WS_TABSTOP +LTEXT "wb_(&H):", 0x140, 10, 07, 40, 15 +EDITTEXT 0x141, 60, 05,110, 12, WS_BORDER | WS_TABSTOP +LTEXT "tb^(&F):", 0x142, 10, 24, 40, 15 +EDITTEXT 0x143, 60, 22,110, 12, WS_BORDER | WS_TABSTOP + +GROUPBOX "}[W(&M):", 0x144, 10, 43,160, 45 +LTEXT "¶(&L):", 0x145, 20, 55, 30, 10, WS_CHILD +EDITTEXT /*STRING_PAGESETUP_LEFTVALUE,*/ 0x147, 50, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP +LTEXT "ã(&T):", 0x148, 20, 73, 30, 10, WS_CHILD +EDITTEXT /*STRING_PAGESETUP_TOPVALUE,*/ 0x14A, 50, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP +LTEXT "E(&R):", 0x14B, 100, 55, 30, 10, WS_CHILD +EDITTEXT /*STRING_PAGESETUP_RIGHTVALUE,*/ 0x14D, 130, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP +LTEXT "º(&B):", 0x14E, 100, 73, 30, 10, WS_CHILD +EDITTEXT /*STRING_PAGESETUP_BOTTOMVALUE,*/ 0x150, 130, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP + +DEFPUSHBUTTON "OK", IDOK, 180, 3, 40, 15, WS_TABSTOP +PUSHBUTTON "LZ", IDCANCEL, 180, 21, 40, 15, WS_TABSTOP +PUSHBUTTON "wv(&H)", IDHELP, 180, 39, 40, 15, WS_TABSTOP END /* Dialog `Encoding' */ DIALOG_ENCODING DIALOGEX 0, 0, 256, 44 -STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPSIBLINGS | - WS_CAPTION | WS_SYSMENU +STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPSIBLINGS | WS_CAPTION | WS_SYSMENU FONT 9, "MS UI Gothic" CAPTION "GR[fBO" BEGIN @@ -138,22 +137,22 @@ FONT 9, "MS UI Gothic" CAPTION "sÖÚ®" BEGIN -EDITTEXT ID_LINENUMBER,54,10,106,12,WS_CHILD | WS_BORDER | WS_TABSTOP -LTEXT "sÔ:",0x155,5,12,41,12,WS_CHILD | WS_TABSTOP | ES_NUMBER +EDITTEXT ID_LINENUMBER,54,10,106,12, WS_CHILD | WS_BORDER | WS_TABSTOP +LTEXT "sÔ:",0x155,5,12,41,12, WS_CHILD | WS_TABSTOP | ES_NUMBER DEFPUSHBUTTON "OK", IDOK, 75, 30, 40, 15, WS_CHILD | WS_TABSTOP PUSHBUTTON "LZ", IDCANCEL, 120, 30, 40, 15, WS_CHILD | WS_TABSTOP END IDD_ABOUTBOX DIALOGEX DISCARDABLE 22,16,284,170 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -CAPTION "About ReactOS Notepad" -FONT 9, "MS UI Gothic" -BEGIN - CONTROL "ReactOS Notepad v1.0\r\nCopyright 1997,98 Marcel Baur <mbaur(a)g26.ethz.ch>\r\nCopyright 2000 Mike McCormack <Mike_McCormack(a)looksmart.com.au>\r\nCopyright 2002 Sylvain Petreolle <spetreolle(a)yahoo.fr>\r\nCopyright 2002 Andriy Palamarchuk\r\n", +CAPTION "ReactOS ÉÂ¢Ä" +FONT 9, "MS UI Gothic" +BEGIN + CONTROL "ReactOS v1.0\r\nCopyright 1997,98 Marcel Baur <mbaur(a)g26.ethz.ch>\r\nCopyright 2000 Mike McCormack <Mike_McCormack(a)looksmart.com.au>\r\nCopyright 2002 Sylvain Petreolle <spetreolle(a)yahoo.fr>\r\nCopyright 2002 Andriy Palamarchuk\r\n", -1,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,46,7,232,39 CONTROL " ", -1,"Static",0x50000000,8,48,272,11 - DEFPUSHBUTTON "Close",IDOK,114,149,44,15,WS_GROUP + DEFPUSHBUTTON "Â¶é",IDOK,114,149,44,15,WS_GROUP ICON IDI_NPICON,-1,12,9,20,30 EDITTEXT IDC_LICENSE,8,64,272,81,ES_MULTILINE | ES_READONLY | WS_VSCROLL @@ -167,32 +166,32 @@ STRINGTABLE DISCARDABLE BEGIN STRING_PAGESETUP_HEADERVALUE, "&n" /* FIXME */ -STRING_PAGESETUP_FOOTERVALUE, "&s y[W" /* FIXME */ -STRING_PAGESETUP_LEFTVALUE, "20 mm" /* FIXME */ +STRING_PAGESETUP_FOOTERVALUE, "&s y[W" /* FIXME */ +STRING_PAGESETUP_LEFTVALUE, "20 mm" /* FIXME */ STRING_PAGESETUP_RIGHTVALUE, "20 mm" /* FIXME */ -STRING_PAGESETUP_TOPVALUE, "25 mm" /* FIXME */ +STRING_PAGESETUP_TOPVALUE, "25 mm" /* FIXME */ STRING_PAGESETUP_BOTTOMVALUE, "25 mm" /* FIXME */ -STRING_NOTEPAD, " " -STRING_ERROR, "G[" -STRING_WARNING, "x" -STRING_INFO, "îñ" - -STRING_UNTITLED, "(³è)" - -STRING_ALL_FILES, "SÄÌt@C (*.*)" -STRING_TEXT_FILES_TXT, "eLXgt@C (*.txt)" - -STRING_TOOLARGE, "t@C '%s' ÌTCYÍå«·¬é½ßA ÅÍÒWÅ«Ü¹ñB\n \ +STRING_NOTEPAD, " " +STRING_ERROR, "G[" +STRING_WARNING, "x" +STRING_INFO, "îñ" + +STRING_UNTITLED, "(³è)" + +STRING_ALL_FILES, "·×ÄÌt@C (*.*)" +STRING_TEXT_FILES_TXT, "eLXg t@C (*.txt)" + +STRING_TOOLARGE, "t@C '%s' ÌTCYÍå«·¬é½ßA ÅÍÒWÅ«Ü¹ñB\n \ ÊÌGfB^ðgpµÄº³¢B" -STRING_NOTEXT, "½àüÍ³êÄ¢Ü¹ñB\ +STRING_NOTEXT, "½àüÍ³êÄ¢Ü¹ñB\ \n½©üÍµÄ©çÀsµÄº³¢B" -STRING_DOESNOTEXIST, "t@C '%s'\nÍ¶ÝµÜ¹ñ\n\n \ +STRING_DOESNOTEXIST, "t@C '%s'\nÍ¶ÝµÜ¹ñ\n\n \ Vµ¢t@Cðì¬µÜ·© ?" -STRING_NOTSAVED, "t@C '%s'\nÍÏX³êÄ¢Ü·\n\n \ +STRING_NOTSAVED, "t@C '%s'\nÍÏX³êÄ¢Ü·\n\n \ ÏXðÛ¶µÜ·© ?" -STRING_NOTFOUND, "'%s' Í©Â©èÜ¹ñÅµ½" -STRING_OUT_OF_MEMORY, "±ÌìðÀs·é½ßÌª\ +STRING_NOTFOUND, "'%s' Í©Â©èÜ¹ñÅµ½" +STRING_OUT_OF_MEMORY, "±ÌìðÀs·é½ßÌª\ «èÜ¹ñB \nÌó«ðâ·½ßÉ¢Â©ÌAvP[Vð\nI¹µÄ\ º³¢B" STRING_CANNOTFIND "'%s' ª©Â©èÜ¹ñÅµ½B" @@ -203,5 +202,5 @@ STRING_CRLF, "Windows (CR+LF)" STRING_LF, "Unix (LF)" STRING_CR, "Mac (CR)" -STRING_LINE_COLUMN, "Line %d, column %d" -END +STRING_LINE_COLUMN, "%d sA%d ñ" +END Modified: trunk/reactos/base/applications/rapps/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/ja-JP.rc [iso-8859-1] Mon Oct 12 01:23:34 2009 @@ -14,7 +14,7 @@ MENUITEM "ACXg[(&U)",ID_UNINSTALL MENUITEM "ÏX(&M)", ID_MODIFY MENUITEM SEPARATOR - MENUITEM "&Remove from Registry", ID_REGREMOVE + MENUITEM "WXg©çí(&R)",ID_REGREMOVE MENUITEM SEPARATOR MENUITEM "XV(&R)", ID_REFRESH END @@ -42,7 +42,7 @@ MENUITEM "ACXg[(&U)", ID_UNINSTALL MENUITEM "ÏX(&M)", ID_MODIFY MENUITEM SEPARATOR - MENUITEM "&Remove from Registry", ID_REGREMOVE + MENUITEM "WXg©çí(&R)", ID_REGREMOVE MENUITEM SEPARATOR MENUITEM "XV(&R)", ID_REFRESH END @@ -187,7 +187,7 @@ IDS_CHOOSE_FOLDER_TEXT "vOÌ_E[hÉgp·étH_ðIðµÄ¾³¢:" IDS_CHOOSE_FOLDER_ERROR "wè³ê½tH_Í¶ÝµÜ¹ñ!" IDS_USER_NOT_ADMIN """ReactOS AvP[V }l[W["" ðN®·éÉÍÇÒ ÀÅ éKvª èÜ·!" - IDS_APP_REG_REMOVE "Are you sure you want to delete the data on the installed program from the registry?" - IDS_INFORMATION "Information" - IDS_UNABLE_TO_REMOVE "Unable to remove data on the program from the registry!" + IDS_APP_REG_REMOVE "WXg©çCXg[³ê½vOÉÖ·éf[^ðíµÄàæëµ¢Å·©?" + IDS_INFORMATION "îñ" + IDS_UNABLE_TO_REMOVE "WXg©ç±ÌvOÉÖ·éf[^ðíÅ«Ü¹ñ!" END Modified: trunk/reactos/base/applications/regedit/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/en-US.rc [iso-8859-1] Mon Oct 12 01:23:34 2009 @@ -103,10 +103,8 @@ END POPUP "&Favorites" BEGIN - MENUITEM "&Add to Favorites", ID_FAVOURITES_ADDTOFAVOURITES - , GRAYED - MENUITEM "&Remove Favorite", ID_FAVOURITES_REMOVEFAVOURITE - , GRAYED + MENUITEM "&Add to Favorites", ID_FAVOURITES_ADDTOFAVOURITES, GRAYED + MENUITEM "&Remove Favorite", ID_FAVOURITES_REMOVEFAVOURITE, GRAYED END POPUP "&Help" BEGIN @@ -376,8 +374,7 @@ */ IDD_EXPORTRANGE DIALOGEX DISCARDABLE 50, 50, 370, 50 -STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | - WS_BORDER +STYLE DS_SHELLFONT | 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 Modified: trunk/reactos/base/applications/regedit/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/ja-JP.rc [iso-8859-1] Mon Oct 12 01:23:34 2009 @@ -1,6 +1,21 @@ /* - * COPYRIGHT: See COPYING in the top level directory - * AUTHOR: Robert Dickenson + * Regedit resources + * + * Copyright 2002 Robert Dickenson + * + * 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_JAPANESE, SUBLANG_DEFAULT @@ -22,36 +37,36 @@ BEGIN POPUP "t@C(&F)" BEGIN - MENUITEM "WXg GfB^ÌI¹(&X)", ID_REGISTRY_EXIT + MENUITEM "WXg GfB^ÌI¹(&X)", ID_REGISTRY_EXIT END POPUP "wv(&H)" BEGIN - MENUITEM "o[Wîñ(&A)...", ID_HELP_ABOUT + MENUITEM "o[Wîñ(&A)...", ID_HELP_ABOUT END END IDR_REGEDIT_MENU MENU DISCARDABLE BEGIN - POPUP "WXg(&R)" - BEGIN - MENUITEM "WXg t@CÌC|[g(&I)...", ID_REGISTRY_IMPORTREGISTRYFILE - - MENUITEM "WXg t@CÌGNX|[g(&E)...", ID_REGISTRY_EXPORTREGISTRYFILE - - MENUITEM SEPARATOR - MENUITEM "Load Hive...", ID_REGISTRY_LOADHIVE, GRAYED - MENUITEM "Unload Hive...", ID_REGISTRY_UNLOADHIVE, GRAYED - MENUITEM SEPARATOR - MENUITEM "lbg[N WXgÖÌÚ±(&C)...", ID_REGISTRY_CONNECTNETWORKREGISTRY - - - MENUITEM "lbg[N WXgÌØf(&D)...", ID_REGISTRY_DISCONNECTNETWORKREGISTRY + POPUP "t@C(&F)" + BEGIN + MENUITEM "C|[g(&I)...", ID_REGISTRY_IMPORTREGISTRYFILE + + MENUITEM "GNX|[g(&E)...", ID_REGISTRY_EXPORTREGISTRYFILE + + MENUITEM SEPARATOR + MENUITEM "nCuÌÇÝÝ...", ID_REGISTRY_LOADHIVE, GRAYED + MENUITEM "nCuÌA[h...", ID_REGISTRY_UNLOADHIVE, GRAYED + MENUITEM SEPARATOR + MENUITEM "lbg[N WXgÖÌÚ±(&C)...", + ID_REGISTRY_CONNECTNETWORKREGISTRY + + MENUITEM "lbg[N WXgÌØf(&D)...", + ID_REGISTRY_DISCONNECTNETWORKREGISTRY , GRAYED - - MENUITEM SEPARATOR - MENUITEM "óü(&P)\tCtrl+P", ID_REGISTRY_PRINT, GRAYED - MENUITEM SEPARATOR - MENUITEM "WXg GfB^ÌI¹(&X)", ID_REGISTRY_EXIT + MENUITEM SEPARATOR + MENUITEM "óü(&P)\tCtrl+P", ID_REGISTRY_PRINT, GRAYED + MENUITEM SEPARATOR + MENUITEM "WXg GfB^ÌI¹(&X)", ID_REGISTRY_EXIT END POPUP "ÒW(&E)" BEGIN @@ -64,8 +79,8 @@ MENUITEM "¶ñl(&S)", ID_EDIT_NEW_STRINGVALUE MENUITEM "oCil(&B)", ID_EDIT_NEW_BINARYVALUE MENUITEM "DWORD l(&D)", ID_EDIT_NEW_DWORDVALUE - MENUITEM "&Multi-String Value", ID_EDIT_NEW_MULTISTRINGVALUE - MENUITEM "&Expandable String Value", ID_EDIT_NEW_EXPANDABLESTRINGVALUE + MENUITEM "¡s¶ñl(&M)", ID_EDIT_NEW_MULTISTRINGVALUE + MENUITEM "WJÂ\\È¶ñl(&E)", ID_EDIT_NEW_EXPANDABLESTRINGVALUE END MENUITEM SEPARATOR MENUITEM "ANZXÂ(&P)...", ID_EDIT_PERMISSIONS @@ -88,10 +103,8 @@ END POPUP "¨CÉüè(&F)" BEGIN - MENUITEM "¨CÉüèÉÇÁ(&A)", ID_FAVOURITES_ADDTOFAVOURITES - , GRAYED - MENUITEM "¨CÉüèÌí(&R)", ID_FAVOURITES_REMOVEFAVOURITE - , GRAYED + MENUITEM "¨CÉüèÉÇÁ(&A)", ID_FAVOURITES_ADDTOFAVOURITES, GRAYED + MENUITEM "¨CÉüèÌí(&R)", ID_FAVOURITES_REMOVEFAVOURITE, GRAYED END POPUP "wv(&H)" BEGIN @@ -105,11 +118,11 @@ BEGIN POPUP "" BEGIN - MENUITEM "C³(&M)", ID_EDIT_MODIFY - MENUITEM "oCi f[^ÌC³", ID_EDIT_MODIFY_BIN + MENUITEM "C³(&M)", ID_EDIT_MODIFY + MENUITEM "oCi f[^ÌC³", ID_EDIT_MODIFY_BIN MENUITEM SEPARATOR - MENUITEM "í(&D)\tDel", ID_EDIT_DELETE - MENUITEM "¼OÌÏX(&R)", ID_EDIT_RENAME + MENUITEM "í(&D)\tDel", ID_EDIT_DELETE + MENUITEM "¼OÌÏX(&R)", ID_EDIT_RENAME END POPUP "" BEGIN @@ -120,8 +133,8 @@ MENUITEM "¶ñl(&S)", ID_EDIT_NEW_STRINGVALUE MENUITEM "oCil(&B)", ID_EDIT_NEW_BINARYVALUE MENUITEM "DWORD l(&D)", ID_EDIT_NEW_DWORDVALUE - MENUITEM "&Multi-String Value", ID_EDIT_NEW_MULTISTRINGVALUE - MENUITEM "&Expandable String Value", ID_EDIT_NEW_EXPANDABLESTRINGVALUE + MENUITEM "¡s¶ñl(&M)", ID_EDIT_NEW_MULTISTRINGVALUE + MENUITEM "WJÂ\\È¶ñl(&E)", ID_EDIT_NEW_EXPANDABLESTRINGVALUE END END POPUP "" @@ -134,18 +147,18 @@ MENUITEM "¶ñl(&S)", ID_EDIT_NEW_STRINGVALUE MENUITEM "oCil(&B)", ID_EDIT_NEW_BINARYVALUE MENUITEM "DWORD l(&D)", ID_EDIT_NEW_DWORDVALUE - MENUITEM "&Multi-String Value", ID_EDIT_NEW_MULTISTRINGVALUE - MENUITEM "&Expandable String Value", ID_EDIT_NEW_EXPANDABLESTRINGVALUE + MENUITEM "¡s¶ñl(&M)", ID_EDIT_NEW_MULTISTRINGVALUE + MENUITEM "WJÂ\\È¶ñl(&E)", ID_EDIT_NEW_EXPANDABLESTRINGVALUE END - MENUITEM "&Find", ID_EDIT_FIND + MENUITEM "õ(&F)", ID_EDIT_FIND MENUITEM SEPARATOR MENUITEM "í(&D)", ID_TREE_DELETE MENUITEM "¼OÌÏX(&R)", ID_TREE_RENAME MENUITEM SEPARATOR - MENUITEM "&Export", ID_TREE_EXPORT - MENUITEM "&Permissions...", ID_TREE_PERMISSIONS, GRAYED - MENUITEM SEPARATOR - MENUITEM "L[¼ÌRs[(&C)", ID_EDIT_COPYKEYNAME, GRAYED + MENUITEM "GNX|[g(&E)", ID_TREE_EXPORT + MENUITEM "ANZXÂ(&P)...", ID_TREE_PERMISSIONS, GRAYED + MENUITEM SEPARATOR + MENUITEM "L[¼ÌRs[(&C)", ID_EDIT_COPYKEYNAME END END @@ -207,7 +220,7 @@ EDITTEXT IDC_VALUE_NAME,6,17,240,12,ES_AUTOHSCROLL | ES_READONLY LTEXT "lÌf[^(&V):",IDC_STATIC,6,35,161,8 EDITTEXT IDC_VALUE_DATA,6,46,116,12,ES_AUTOHSCROLL - GROUPBOX "\\LÌî",IDC_STATIC,130,35,116,39 + GROUPBOX "î",IDC_STATIC,130,35,116,39 AUTORADIOBUTTON "16 i(&H)",IDC_FORMAT_HEX,141,46,60,10,WS_GROUP AUTORADIOBUTTON "10 i(&D)",IDC_FORMAT_DEC,141,59,60,10 DEFPUSHBUTTON "OK",IDOK,142,82,50,14 @@ -237,7 +250,7 @@ ID_REGISTRY_MENU "WXgSÌÅgp·éR}hÅ·B" ID_EDIT_MENU "lâL[ðÒW·éR}hÅ·B" ID_VIEW_MENU "WXg EBhEðJX^}CY·éR}hÅ·B" - ID_FAVOURITES_MENU "pÉÉgp³êéL[ÉANZ·éR}hÅ·B" + ID_FAVOURITES_MENU "pÉÉgp³êéL[ÉANZX·éR}hÅ·B" ID_HELP_MENU "wvÆWXg GfB^Ìo[Wîñð\\¦·éR}hÅ·B" ID_EDIT_NEW_MENU "Vµ¢L[âlðì¬·éR}hÅ·B" END @@ -278,15 +291,15 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_ERROR "G[" - IDS_WARNING "x" - IDS_BAD_KEY "Can't query key '%s'" + IDS_ERROR "G[" + IDS_WARNING "x" + IDS_BAD_KEY "L[ '%s' ðÆïÅ«Ü¹ñ" IDS_BAD_VALUE "'%s' ÌlðÆïÅ«Ü¹ñB" IDS_UNSUPPORTED_TYPE "±ÌíÞÌL[ÍÒWÅ«Ü¹ñ (%ld)B" IDS_TOO_BIG_VALUE "lªå«·¬Ü· (%ld)B" IDS_MULTI_SZ_EMPTY_STRING "REG_MULTI_SZ ^Ìf[^Éó¶ñðÜÞ±ÆÍÅ«Ü¹ñB\nWXg GfB^Íoµ½ó¶ñðíµÜ·B" - IDS_QUERY_DELETE_KEY_ONE "±ÌL[ðíµÄàæëµ¢Å·©?" - IDS_QUERY_DELETE_KEY_MORE "±êçÌL[ð·×ÄíµÄàæëµ¢Å·©?" + IDS_QUERY_DELETE_KEY_ONE "±ÌL[ðíµÄàæëµ¢Å·©?" + IDS_QUERY_DELETE_KEY_MORE "±êçÌL[ð·×ÄíµÄàæëµ¢Å·©?" IDS_QUERY_DELETE_KEY_CONFIRM "L[ÌíÌmF" IDS_QUERY_DELETE_ONE "±ÌlðíµÄàæëµ¢Å·©?" IDS_QUERY_DELETE_MORE "±êçÌlð·×ÄíµÄàæëµ¢Å·©?" @@ -301,7 +314,7 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_BINARY_EMPTY "(·³ 0 ÌoCil)" + IDS_BINARY_EMPTY "(·³ 0 ÌoCil)" IDS_DEFAULT_VALUE_NAME "(ùèl)" IDS_VALUE_NOT_SET "(lÌÝèÈµ)" IDS_UNKNOWN_TYPE "íÞs¾: (0x%lx)" @@ -313,7 +326,7 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_FLT_REGFILE "Registration File" + IDS_FLT_REGFILE "o^t@C" IDS_FLT_REGFILES "o^t@C" IDS_FLT_REGFILES_FLT "*.reg" IDS_FLT_REGEDIT4 "Win9x/NT4 o^t@C (REGEDIT4)" @@ -347,10 +360,10 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_EXPAND "WJ·é(&E)" - IDS_COLLAPSE "ÜèôÞ(&C)" + IDS_EXPAND "WJ(&E)" + IDS_COLLAPSE "Â¶é(&C)" IDS_GOTO_SUGGESTED_KEY "'%s' ÖÚ®·é(&G)" - IDS_FINISHEDFIND "Finished searching through the registry." + IDS_FINISHEDFIND "WXgð·×ÄõµÜµ½B" END /*****************************************************************/ @@ -361,8 +374,7 @@ */ IDD_EXPORTRANGE DIALOGEX DISCARDABLE 50, 50, 370, 50 -STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | - WS_BORDER +STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | WS_BORDER FONT 9, "MS UI Gothic" BEGIN GROUPBOX "GNX|[gÍÍ",IDC_STATIC,2,0,366,48 @@ -373,58 +385,58 @@ IDD_ADDFAVORITES DIALOGEX DISCARDABLE 0, 0, 186, 46 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Add to Favorites" +CAPTION "¨CÉüèÉÇÁ" FONT 9, "MS UI Gothic" BEGIN DEFPUSHBUTTON "OK",IDOK,129,7,50,14 - PUSHBUTTON "Cancel",IDCANCEL,129,24,50,14 - LTEXT "&Favorite Name:",IDC_STATIC,7,7,70,10 + PUSHBUTTON "LZ",IDCANCEL,129,24,50,14 + LTEXT "¨CÉüèÌ¼O(&F):",IDC_STATIC,7,7,70,10 EDITTEXT IDC_FAVORITENAME,7,26,110,13,ES_AUTOHSCROLL END IDD_REMOVEFAVORITES DIALOGEX DISCARDABLE 0, 0, 164, 135 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Remove Favorites" +CAPTION "¨CÉüèÌí" FONT 9, "MS UI Gothic" BEGIN DEFPUSHBUTTON "OK",IDOK,107,114,50,14 - PUSHBUTTON "Cancel",IDCANCEL,7,114,50,14 + PUSHBUTTON "LZ",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 + LTEXT "¨CÉüèÌIð:",IDC_STATIC,7,7,99,12 END IDD_FIND DIALOGEX DISCARDABLE 0, 0, 254, 82 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Find" -FONT 9, "MS UI Gothic" -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 +CAPTION "õ" +FONT 9, "MS UI Gothic" +BEGIN + DEFPUSHBUTTON "ðõ(&F)",IDOK,197,7,50,14 + PUSHBUTTON "LZ",IDCANCEL,197,24,50,14 + GROUPBOX "õÎÛ",IDC_STATIC,7,25,63,51 + LTEXT "õ·él(&N):",IDC_STATIC,7,8,37,10 EDITTEXT IDC_FINDWHAT,47,7,142,13,ES_AUTOHSCROLL - CONTROL "&Keys",IDC_LOOKAT_KEYS,"Button",BS_AUTOCHECKBOX | + CONTROL "L[(&K)",IDC_LOOKAT_KEYS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,36,35,8 - CONTROL "&Values",IDC_LOOKAT_VALUES,"Button",BS_AUTOCHECKBOX | + CONTROL "l(&V)",IDC_LOOKAT_VALUES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,48,36,8 - CONTROL "&Data",IDC_LOOKAT_DATA,"Button",BS_AUTOCHECKBOX | + CONTROL "f[^(&D)",IDC_LOOKAT_DATA,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,60,42,8 - CONTROL "Match &whole string only",IDC_MATCHSTRING,"Button", + CONTROL "®SÉêv·éàÌ¾¯ðõ(&W)",IDC_MATCHSTRING,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,83,32,94,13 - CONTROL "Match &case",IDC_MATCHCASE,"Button",BS_AUTOCHECKBOX | + CONTROL "å¶Æ¬¶ðæÊ·é(&C)",IDC_MATCHCASE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,83,48,90,12 END IDD_FINDING DIALOGEX 0, 0, 145, 50 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Find" +CAPTION "õ" FONT 9, "MS UI Gothic", 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 + PUSHBUTTON "LZ(&C)",IDCANCEL,93,29,45,14 + LTEXT "WXgÌõ...",IDC_STATIC,33,12,83,8 END /* Modified: trunk/reactos/base/applications/regedit/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/sv-SE.rc [iso-8859-1] Mon Oct 12 01:23:34 2009 @@ -59,7 +59,7 @@ MENUITEM SEPARATOR MENUITEM "&Anslut Nätverksregister...", ID_REGISTRY_CONNECTNETWORKREGISTRY - , GRAYED + MENUITEM "&Koppla ifrån Nätverksregister...", ID_REGISTRY_DISCONNECTNETWORKREGISTRY , GRAYED @@ -103,10 +103,8 @@ END POPUP "&Favoriter" BEGIN - MENUITEM "&Lägg till i Favoriter", ID_FAVOURITES_ADDTOFAVOURITES - , GRAYED - MENUITEM "&Ta bort från Favoriter", ID_FAVOURITES_REMOVEFAVOURITE - , GRAYED + MENUITEM "&Lägg till i Favoriter", ID_FAVOURITES_ADDTOFAVOURITES, GRAYED + MENUITEM "&Ta bort från Favoriter", ID_FAVOURITES_REMOVEFAVOURITE, GRAYED END POPUP "&Hjälp" BEGIN @@ -160,7 +158,7 @@ MENUITEM "&Export", ID_TREE_EXPORT MENUITEM "&Permissions...", ID_TREE_PERMISSIONS, GRAYED MENUITEM SEPARATOR - MENUITEM "&Kopiera nyckelnamn", ID_EDIT_COPYKEYNAME, GRAYED + MENUITEM "&Kopiera nyckelnamn", ID_EDIT_COPYKEYNAME END END @@ -376,8 +374,7 @@ */ IDD_EXPORTRANGE DIALOGEX DISCARDABLE 50, 50, 370, 50 -STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | - WS_BORDER +STYLE DS_SHELLFONT | 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 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 [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/rsrc.rc [iso-8859-1] Mon Oct 12 01:23:34 2009 @@ -40,8 +40,8 @@ #include "lang/it-IT.rc" #include "lang/ja-JP.rc" #include "lang/ko-KR.rc" +#include "lang/nl-NL.rc" #include "lang/no-NO.rc" -#include "lang/nl-NL.rc" #include "lang/pl-PL.rc" #include "lang/pt-BR.rc" #include "lang/pt-PT.rc"

1 0

[dgorbachev] 43383: Update Japanese translations. Tomoya Kitagawa, bug #4884.
by dgorbachev＠svn.reactos.org 11 Oct '09

11 Oct '09

Author: dgorbachev Date: Mon Oct 12 01:23:30 2009 New Revision: 43383 URL: http://svn.reactos.org/svn/reactos?rev=43383&view=rev Log: Update Japanese translations. Tomoya Kitagawa, bug #4884. Modified: trunk/reactos/dll/cpl/desk/lang/en-US.rc trunk/reactos/dll/cpl/desk/lang/ja-JP.rc trunk/reactos/dll/win32/netshell/lang/ja-JP.rc trunk/reactos/dll/win32/netshell/netshell.rc trunk/reactos/dll/win32/syssetup/lang/ja-JP.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… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/en-US.rc [iso-8859-1] Mon Oct 12 01:23:30 2009 @@ -32,7 +32,7 @@ PUSHBUTTON "Pre&view", IDC_SCREENS_TESTSC, 175, 103, 50, 13 LTEXT "&Wait", 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 | + 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 @@ -40,7 +40,7 @@ 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.", - IDC_STATIC, 14, 166, 146 ,20 + IDC_STATIC, 14, 166, 146, 20 PUSHBUTTON "P&ower...", IDC_SCREENS_POWER_BUTTON, 176, 171, 50, 13 END @@ -103,10 +103,10 @@ BEGIN CONTROL "&Use the following transition effect for menus and tooltips:",IDC_EFFAPPEARANCE_ANIMATION,"button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 5, 285, 19 - COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 80, 19 , CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_CHILD | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 80, 19, CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_CHILD | WS_VSCROLL | WS_TABSTOP CONTROL "U&se the following method to smooth edges of screen fonts:",IDC_EFFAPPEARANCE_SMOOTHING,"button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 42, 285, 19 - COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 80, 19 , CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED + COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 80, 19, CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED CONTROL "Us&e large icons",IDC_EFFAPPEARANCE_LARGEICONS,"button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 80, 285, 19 CONTROL "Show sh&adows under menus",IDC_EFFAPPEARANCE_SETDROPSHADOW,"button", Modified: trunk/reactos/dll/cpl/desk/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/ja-JP.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/ja-JP.rc [iso-8859-1] Mon Oct 12 01:23:30 2009 @@ -19,7 +19,6 @@ CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP END - IDD_SCREENSAVER DIALOGEX 0, 0, 246, 204 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "XN[ Z[o[" @@ -27,13 +26,13 @@ BEGIN CONTROL "", IDC_SCREENS_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 70, WS_EX_STATICEDGE - GROUPBOX "XN[ Z[o[(&S)",IDC_SCREENS_DUMMY, 8, 92, 230, 52 + GROUPBOX "XN[ Z[o[(&S)", IDC_SCREENS_DUMMY, 8, 92, 230, 52 COMBOBOX IDC_SCREENS_LIST, 14, 103, 100, 100, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Ýè(&T)",IDC_SCREENS_SETTINGS, 120, 103, 50, 13, WS_GROUP - PUSHBUTTON "vr[(&V)",IDC_SCREENS_TESTSC, 175, 103, 50, 13 - LTEXT "Ò¿Ô(&W)",IDC_WAITTEXT, 14, 125, 16, 9 + PUSHBUTTON "Ýè(&T)", IDC_SCREENS_SETTINGS, 120, 103, 50, 13, WS_GROUP + PUSHBUTTON "vr[(&V)", IDC_SCREENS_TESTSC, 175, 103, 50, 13 + LTEXT "Ò¿Ô(&W)", IDC_WAITTEXT, 14, 125, 16, 9 EDITTEXT IDC_SCREENS_TIMEDELAY, 34, 123, 32, 13, ES_RIGHT | WS_GROUP - CONTROL "",IDC_SCREENS_TIME ,UPDOWN_CLASS,UDS_SETBUDDYINT | + CONTROL "", IDC_SCREENS_TIME, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 54, 123, 12, 13 LTEXT "ªÔ", IDC_MINTEXT, 70, 125, 26, 9 @@ -41,10 +40,9 @@ BS_AUTOCHECKBOX | WS_TABSTOP, 108, 120, 104, 19 GROUPBOX "j^ÌÈdÍ@\\(&E)", IDC_SCREENS_DUMMY2, 6, 155, 232, 41 LTEXT "j^Ìd¹ÝèðÏX·éÉÍA[d¹] ð NbNµÄ¾³¢B", - IDC_STATIC, 14, 166, 146 ,20 + IDC_STATIC, 14, 166, 146, 20 PUSHBUTTON "d¹(&O)...", IDC_SCREENS_POWER_BUTTON, 176, 171, 50, 13 END - IDD_APPEARANCE DIALOGEX DISCARDABLE 0, 0, 246, 204 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION @@ -54,7 +52,7 @@ CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 LTEXT "zF", IDC_STATIC, 7, 140, 64, 7 - COMBOBOX IDC_APPEARANCE_COLORSCHEME, 7, 150, 134, 90 , CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_APPEARANCE_COLORSCHEME, 7, 150, 134, 90, CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "øÊ(&E)...", IDC_APPEARANCE_EFFECTS, 182, 150, 56, 15 PUSHBUTTON "Ú×Ýè(&V)...", IDC_APPEARANCE_ADVANCED, 182, 170, 56, 15 END @@ -105,16 +103,16 @@ BEGIN CONTROL "ÌAj[VøÊðj[Æc[ `bvÉgp·é(&U):",IDC_EFFAPPEARANCE_ANIMATION,"button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 5, 285, 19 - COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 80, 19 , CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_CHILD | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 80, 19, CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_CHILD | WS_VSCROLL | WS_TABSTOP CONTROL "Ìû@ÅXN[ tHgÌðç©É·é(&S):",IDC_EFFAPPEARANCE_SMOOTHING,"button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 42, 285, 19 - COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 80, 19 , CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED + COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 80, 19, CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED CONTROL "å«¢ACRðgp·é(&E)",IDC_EFFAPPEARANCE_LARGEICONS,"button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 80, 285, 19 CONTROL "j[ÌºÉeð\\¦·é(&A)",IDC_EFFAPPEARANCE_SETDROPSHADOW,"button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 95, 285, 19 CONTROL "hbOÉEBhEÌàeð\\¦·é(&W)",IDC_EFFAPPEARANCE_DRAGFULLWINDOWS,"button", - BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 110, 285, 19 + BS_AUTOCHECKBOX | WS_TABSTOP, 10, 110, 285, 19 CONTROL "Alt L[ð·ÜÅL[{[h irQ[VÌºüðBµÄ¨(&H)",IDC_EFFAPPEARANCE_KEYBOARDCUES,"button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 125, 285, 19 PUSHBUTTON "LZ", IDCANCEL, 226, 165, 50, 14 @@ -161,20 +159,20 @@ IDR_PREVIEW_MENU MENU BEGIN - MENUITEM "Êí", ID_MENU_NORMAL - MENUITEM "IðsÂ", ID_MENU_DISABLED - MENUITEM "IðÏÝ", ID_MENU_SELECTED + MENUITEM "Êí", ID_MENU_NORMAL + MENUITEM "IðsÂ", ID_MENU_DISABLED + MENUITEM "IðÏÝ", ID_MENU_SELECTED END IDM_MONITOR_MENU MENU BEGIN POPUP "" BEGIN - MENUITEM "Ú±ÏÝ(&A)",ID_MENU_ATTACHED - MENUITEM "vC}(&P)",ID_MENU_PRIMARY + MENUITEM "Ú±ÏÝ(&A)", ID_MENU_ATTACHED + MENUITEM "vC}(&P)", ID_MENU_PRIMARY MENUITEM SEPARATOR - MENUITEM "¯Ê(&I)", ID_MENU_IDENTIFY - MENUITEM "vpeB(&R)",ID_MENU_PROPERTIES + MENUITEM "¯Ê(&I)", ID_MENU_IDENTIFY + MENUITEM "vpeB(&R)", ID_MENU_PROPERTIES END END Modified: trunk/reactos/dll/win32/netshell/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/ja… ============================================================================== --- trunk/reactos/dll/win32/netshell/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/lang/ja-JP.rc [iso-8859-1] Mon Oct 12 01:23:30 2009 @@ -1,124 +1,126 @@ LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT -IDD_NETPROPERTIES DIALOGEX DISCARDABLE 0, 0, 246, 228 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +IDD_NETPROPERTIES DIALOGEX DISCARDABLE 0, 0, 246, 246 +STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION CAPTION "SÊ" FONT 9, "MS UI Gothic" BEGIN - LTEXT "Ú±Ìû@:", -1, 9,9,217,8 - EDITTEXT IDC_NETCARDNAME, 9, 21, 230, 12, WS_DISABLED | WS_BORDER | WS_TABSTOP - PUSHBUTTON "Ýè(&C)", IDC_CONFIGURE, 189, 38, 50, 14 - LTEXT "±ÌÚ±Í`FbN }[NªIÉÈÁÄ¢éR|[lgðgpµÄ¢Ü·:", -1, 9, 59, 217, 8 - LISTBOX IDC_COMPONENTSLIST, 9, 71, 230, 55, LBS_NOTIFY | WS_VSCROLL | WS_BORDER | LBS_NOINTEGRALHEIGHT - PUSHBUTTON "CXg[(&I)", IDC_INSTALL, 9, 130, 65, 14, WS_DISABLED | WS_TABSTOP - PUSHBUTTON "í(&U)", IDC_UNINSTALL, 90, 130, 65, 14, WS_DISABLED | WS_TABSTOP - PUSHBUTTON "vpeB(&P)", IDC_PROPERTIES, 174, 130, 65, 14 - GROUPBOX "à¾", -1, 9, 153, 230, 46, BS_GROUPBOX - LTEXT "±±ÉR|[lgÌà¾ª\\¦³êÜ·...", IDC_DESCRIPTION, 15, 165, 217, 28, WS_GROUP - CHECKBOX "Ú±É^XN o[ÉACRð\\¦·é", IDC_SHOWTASKBAR, 9, 206, 230, 12, BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP + CONTROL "", IDC_COMPONENTSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOCOLUMNHEADER | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 9, 71, 230, 55 + LTEXT "Ú±û@:", -1, 9,9,217,8 + EDITTEXT IDC_NETCARDNAME, 9, 21, 230, 12, WS_BORDER | WS_TABSTOP | ES_READONLY + PUSHBUTTON "Ýè(&C)", IDC_CONFIGURE, 189, 38, 50, 14 + LTEXT "±ÌÚ±Í`FbN³êÄ¢éR|[lgðgpµÄ¢Ü·:", -1, 9, 59, 217, 8 + PUSHBUTTON "CXg[(&I)", IDC_INSTALL, 9, 130, 65, 14, WS_DISABLED | WS_TABSTOP + PUSHBUTTON "ACXg[(&U)", IDC_UNINSTALL, 90, 130, 65, 14, WS_DISABLED | WS_TABSTOP + PUSHBUTTON "vpeB(&P)", IDC_PROPERTIES, 174, 130, 65, 14 + GROUPBOX "à¾", -1, 9, 153, 230, 46, BS_GROUPBOX + LTEXT "±±ÉR|[lgÌà¾ª\\¦³êÜ·...", IDC_DESCRIPTION, 15, 165, 217, 28, WS_GROUP + CHECKBOX "Ú±É^XN o[ÉACRð\\¦·é", IDC_SHOWTASKBAR, 9, 206, 230, 12, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "±ÌÚ±ª§À³êÄ¢é©Ú±ÈµÌêÉÊm·é(&N)", IDC_NOTIFYNOCONNECTION, 9, 220, 230, 12, BS_AUTOCHECKBOX | WS_TABSTOP END IDD_STATUS DIALOGEX DISCARDABLE 0, 0, 200, 280 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Allgemein" -FONT 8, "MS Shell Dlg" +CAPTION "SÊ" +FONT 9, "MS UI Gothic" BEGIN END IDD_LAN_NETSTATUS DIALOGEX DISCARDABLE 0, 0, 200,180 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION CAPTION "SÊ" FONT 9, "MS UI Gothic" BEGIN - GROUPBOX "Ú±", -1, 9, 8, 182, 58, BS_GROUPBOX - LTEXT "óÔ:", -1, 19, 20, 60, 8 - LTEXT "p±Ô:", -1, 19, 34, 60, 8 - LTEXT "¬x:", -1, 19, 48, 60, 8 - GROUPBOX "®ìóµ", -1, 9, 74, 182, 70, BS_GROUPBOX - RTEXT "M", -1, 26, 90, 60, 8 - ICON IDI_NETSTAT, -1, 110, 85, 32, 32 - LTEXT "óM", -1, 149, 90, 37, 8 - LTEXT "Bytes:", -1, 17, 115, 32, 8 - RTEXT "000.000.000", IDC_SEND, 63, 115, 44, 8 - RTEXT "000.000.000", IDC_RECEIVED, 139, 115, 44, 8 - PUSHBUTTON "vpeB(&P)", IDC_PROPERTIES, 10, 150, 50, 14 - PUSHBUTTON "³øÉ·é(&D)", IDC_ENDISABLE, 66, 150, 50, 14 - RTEXT "",IDC_STATUS,83,20,98,8 - RTEXT "",IDC_DURATION,83,34,98,8 - RTEXT "",IDC_SPEED,83,48,98,8 + GROUPBOX "Ú±", -1, 9, 8, 182, 58, BS_GROUPBOX + LTEXT "óÔ:", -1, 19, 20, 60, 8 + LTEXT "p±Ô:", -1, 19, 34, 60, 8 + LTEXT "¬x:", -1, 19, 48, 60, 8 + GROUPBOX "®ìóµ", -1, 9, 74, 182, 70, BS_GROUPBOX + RTEXT "M", -1, 26, 90, 60, 8 + ICON IDI_NETSTAT, -1, 110, 85, 32, 32 + LTEXT "óM", -1, 149, 90, 37, 8 + LTEXT "oCg:", -1, 17, 115, 32, 8 + RTEXT "000.000.000", IDC_SEND, 63, 115, 44, 8 + RTEXT "000.000.000", IDC_RECEIVED, 139, 115, 44, 8 + PUSHBUTTON "vpeB(&P)", IDC_STATUS_PROPERTIES, 10, 150, 50, 14 + PUSHBUTTON "³øÉ·é(&D)", IDC_ENDISABLE, 66, 150, 50, 14 + RTEXT "",IDC_STATUS,83,20,98,8 + RTEXT "",IDC_DURATION,83,34,98,8 + RTEXT "",IDC_SPEED,83,48,98,8 END IDD_LAN_NETSTATUSADVANCED DIALOGEX DISCARDABLE 0, 0, 200,180 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Support" +CAPTION "T|[g" FONT 9, "MS UI Gothic" BEGIN - GROUPBOX "Connection Status", -1, 9, 8, 200, 88, BS_GROUPBOX - LTEXT "Address type:", -1, 22, 20, 80, 8 - LTEXT "IP address:", -1, 22, 34, 80, 8 - LTEXT "SubNet mask:", -1, 22, 48, 80, 8 - LTEXT "Default gateway:", -1, 22, 62, 80, 8 + GROUPBOX "Ú±óÔ", -1, 9, 8, 200, 88, BS_GROUPBOX + LTEXT "AhXÌíÞ:", -1, 22, 20, 80, 8 + LTEXT "IP AhX:", -1, 22, 34, 80, 8 + LTEXT "Tulbg }XN:", -1, 22, 48, 80, 8 + LTEXT "ftHg Q[gEFC:", -1, 22, 62, 80, 8 - RTEXT "N/A", IDC_DETAILSTYPE, 122, 20, 80, 8 - RTEXT "000.000.000.000", IDC_DETAILSIP, 122, 34, 80, 8 - RTEXT "000.000.000.000", IDC_DETAILSSUBNET, 122, 48, 80, 8 - RTEXT "", IDC_DETAILSGATEWAY, 122, 62, 80, 8 + RTEXT "psÂ", IDC_DETAILSTYPE, 122, 20, 80, 8 + RTEXT "000.000.000.000", IDC_DETAILSIP, 122, 34, 80, 8 + RTEXT "000.000.000.000", IDC_DETAILSSUBNET, 122, 48, 80, 8 + RTEXT "", IDC_DETAILSGATEWAY, 122, 62, 80, 8 - PUSHBUTTON "&Details...", IDC_DETAILS, 22, 76, 62, 14 + PUSHBUTTON "Ú×(&D)...", IDC_DETAILS, 22, 76, 62, 14 END IDD_LAN_NETSTATUSDETAILS DIALOGEX DISCARDABLE 0, 0, 200,200 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION -CAPTION "Network Connection Details" -FONT 8, "MS Shell Dlg" +CAPTION "lbg[NÚ±ÌÚ×" +FONT 9, "MS UI Gothic" BEGIN - LTEXT "Network Connection &Details:", -1, 15, 9, 170, 12 - CONTROL "", IDC_DETAILS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 25, 170, 130 - PUSHBUTTON "&Close", IDC_CLOSE, 125, 165, 62, 14 + LTEXT "lbg[NÚ±ÌÚ×(&D):", -1, 15, 9, 170, 12 + CONTROL "", IDC_DETAILS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 25, 170, 130 + PUSHBUTTON "Â¶é(&C)", IDC_CLOSE, 125, 165, 62, 14 END STRINGTABLE DISCARDABLE BEGIN - IDS_PHYSICAL_ADDRESS "Physical Address" - IDS_IP_ADDRESS "IP Address" - IDS_SUBNET_MASK "Subnet Mask" - IDS_DEF_GATEWAY "Default Gateway" - IDS_DHCP_SERVER "DHCP Server" - IDS_LEASE_OBTAINED "Lease Obtained" - IDS_LEASE_EXPIRES "Lease Expires" - IDS_DNS_SERVERS "DNS Servers" - IDS_WINS_SERVERS "WINS Servers" - IDS_PROPERTY "Property" - IDS_VALUE "Value" - IDS_NETWORKCONNECTION "Network Connection" - IDS_SHV_COLUMN_NAME "Name" - IDS_SHV_COLUMN_TYPE "Type" - IDS_SHV_COLUMN_STATE "Status" - IDS_SHV_COLUMN_DEVNAME "Device Name" - IDS_SHV_COLUMN_PHONE "Phone # or Host Address" - IDS_SHV_COLUMN_OWNER "Owner" - IDS_TYPE_ETHERNET "LAN or High-Speed Internet" - IDS_STATUS_NON_OPERATIONAL "Disabled" - IDS_STATUS_UNREACHABLE "Not Connected" - IDS_STATUS_DISCONNECTED "Network cable unplugged" - IDS_STATUS_CONNECTING "Acquiring network address" - IDS_STATUS_CONNECTED "Connected" - IDS_STATUS_OPERATIONAL "Connected" + IDS_PHYSICAL_ADDRESS "¨AhX" + IDS_IP_ADDRESS "IP AhX" + IDS_SUBNET_MASK "Tulbg }XN" + IDS_DEF_GATEWAY "ftHg Q[gEFC" + IDS_DHCP_SERVER "DHCP T[o[" + IDS_LEASE_OBTAINED "[XÌæ¾ú" + IDS_LEASE_EXPIRES "[XÌLøúÀ" + IDS_DNS_SERVERS "DNS T[o[" + IDS_WINS_SERVERS "WINS T[o[" + IDS_PROPERTY "vpeB" + IDS_VALUE "l" + IDS_NETWORKCONNECTION "lbg[NÚ±" + IDS_SHV_COLUMN_NAME "¼O" + IDS_SHV_COLUMN_TYPE "íÞ" + IDS_SHV_COLUMN_STATE "óÔ" + IDS_SHV_COLUMN_DEVNAME "foCX¼" + IDS_SHV_COLUMN_PHONE "dbÔÜ½ÍzXg AhX" + IDS_SHV_COLUMN_OWNER "LÒ" + IDS_TYPE_ETHERNET "LAN Ü½Í¬C^[lbg" + IDS_STATUS_NON_OPERATIONAL "³ø" + IDS_STATUS_UNREACHABLE "Øf" + IDS_STATUS_DISCONNECTED "lbg[N P[uªÚ±³êÄ¢Ü¹ñ" + IDS_STATUS_CONNECTING "lbg[N AhXÌæ¾" + IDS_STATUS_CONNECTED "Ú±" + IDS_STATUS_OPERATIONAL "Ú±" - IDS_NET_ACTIVATE "Enable" - IDS_NET_DEACTIVATE "Disable" - IDS_NET_STATUS "Status" - IDS_NET_REPAIR "Repair" - IDS_NET_CREATELINK "Create Shortcut" - IDS_NET_DELETE "Delete" - IDS_NET_PROPERTIES "Properties" + IDS_NET_ACTIVATE "Lø" + IDS_NET_DEACTIVATE "³ø" + IDS_NET_STATUS "óÔ" + IDS_NET_REPAIR "C" + IDS_NET_CREATELINK "V[gJbgÌì¬" + IDS_NET_DELETE "í" + IDS_NET_RENAME "¼OÌÏX" + IDS_NET_PROPERTIES "vpeB" - IDS_FORMAT_BIT "%u Bit/s" - IDS_FORMAT_KBIT "%u KBit/s" - IDS_FORMAT_MBIT "%u MBit/s" - IDS_FORMAT_GBIT "%u GBit/s" - IDS_DURATION_DAY "%d Day %s" - IDS_DURATION_DAYS "%d Days %s" - IDS_ASSIGNED_DHCP "Assigned by DHCP" - IDS_ASSIGNED_MANUAL "Manually configured" + IDS_FORMAT_BIT "%u Bit/s" + IDS_FORMAT_KBIT "%u KBit/s" + IDS_FORMAT_MBIT "%u MBit/s" + IDS_FORMAT_GBIT "%u GBit/s" + IDS_DURATION_DAY "%d ú %s" + IDS_DURATION_DAYS "%d ú %s" + IDS_ASSIGNED_DHCP "DHCP ÉæéèÄ" + IDS_ASSIGNED_MANUAL "è®\\¬" END Modified: trunk/reactos/dll/win32/netshell/netshell.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/netshel… ============================================================================== --- trunk/reactos/dll/win32/netshell/netshell.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/netshell.rc [iso-8859-1] Mon Oct 12 01:23:30 2009 @@ -34,8 +34,8 @@ #include "lang/id-ID.rc" #include "lang/it-IT.rc" #include "lang/ja-JP.rc" +#include "lang/nl-NL.rc" #include "lang/no-NO.rc" -#include "lang/nl-NL.rc" #include "lang/pl-PL.rc" #include "lang/ro-RO.rc" #include "lang/ru-RU.rc" Modified: trunk/reactos/dll/win32/syssetup/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/ja… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/ja-JP.rc [iso-8859-1] Mon Oct 12 01:23:30 2009 @@ -222,7 +222,7 @@ IDS_GAMES "Q[" IDS_CMT_SOLITAIRE "\\eBA" IDS_CMT_WINEMINE "WineMine" - IDS_CMT_SPIDER "Spider Solitaire" + IDS_CMT_SPIDER "XpC_ \\eBA" END STRINGTABLE @@ -283,7 +283,7 @@ IDS_SHORT_WINEMINE "WineMine.lnk" IDS_SHORT_WORDPAD "[hpbh.lnk" IDS_SHORT_PAINT "yCg.lnk" - IDS_SHORT_SPIDER "Spider Solitaire.lnk" + IDS_SHORT_SPIDER "XpC_ \\eBA.lnk" END STRINGTABLE

1 0

[sginsberg] 43382: - Fix a critical bug in KeFindConfigurationEntry; it passed NULL to KeFindConfigurationNextEntry instead of passing a pointer containing NULL. KeFindConfigurationNextEntry dereferenced this and, because the old bootloader maps NULL, read some bogus value. KeFindConfigurationNextEntry would then try to find something in the configuration tree that matched this, but failed. This was no problem because we currently have no callers of those routines in ReactOS. However, the kdcom.
by sginsberg＠svn.reactos.org 11 Oct '09

11 Oct '09

Author: sginsberg Date: Sun Oct 11 23:57:52 2009 New Revision: 43382 URL: http://svn.reactos.org/svn/reactos?rev=43382&view=rev Log: - Fix a critical bug in KeFindConfigurationEntry; it passed NULL to KeFindConfigurationNextEntry instead of passing a pointer containing NULL. KeFindConfigurationNextEntry dereferenced this and, because the old bootloader maps NULL, read some bogus value. KeFindConfigurationNextEntry would then try to find something in the configuration tree that matched this, but failed. This was no problem because we currently have no callers of those routines in ReactOS. However, the kdcom.dll from Windows 2003 calls KeFindConfigurationEntry to find COM port entries, and this would have crashed if FreeLdr hadn't mapped it. As it is, it didn't, and kdcom fell back to default values for the COM port (which worked). WinLdr doesn't map NULL and this resulted in a crash during kdcom initialization. Bug introduced in revision 15911 over 4 years ago. KD64 now works when booting with the new boot method. Modified: trunk/reactos/ntoskrnl/ke/config.c Modified: trunk/reactos/ntoskrnl/ke/config.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/config.c?rev=4… ============================================================================== --- trunk/reactos/ntoskrnl/ke/config.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/config.c [iso-8859-1] Sun Oct 11 23:57:52 2009 @@ -24,12 +24,14 @@ IN CONFIGURATION_TYPE Type, IN PULONG ComponentKey OPTIONAL) { + PCONFIGURATION_COMPONENT_DATA NextLink = NULL; + /* Start Search at Root */ return KeFindConfigurationNextEntry(Child, Class, Type, ComponentKey, - NULL); + &NextLink); } /*

1 0

[sginsberg] 43381: - Woooops, fix MP hal build.
by sginsberg＠svn.reactos.org 11 Oct '09

11 Oct '09

Author: sginsberg Date: Sun Oct 11 22:40:19 2009 New Revision: 43381 URL: http://svn.reactos.org/svn/reactos?rev=43381&view=rev Log: - Woooops, fix MP hal build. Modified: trunk/reactos/hal/halx86/mp/processor_mp.c Modified: trunk/reactos/hal/halx86/mp/processor_mp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/mp/processor_mp… ============================================================================== --- trunk/reactos/hal/halx86/mp/processor_mp.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/mp/processor_mp.c [iso-8859-1] Sun Oct 11 22:40:19 2009 @@ -17,6 +17,17 @@ #include <hal.h> #define NDEBUG #include <debug.h> + +/* PRIVATE FUNCTIONS *********************************************************/ + +VOID +NTAPI +HaliHaltSystem(VOID) +{ + /* Disable interrupts and halt the CPU */ + _disable(); + __halt(); +} /* FUNCTIONS *****************************************************************/

1 0

[sginsberg] 43380: - Stub out DbgKdWriteVirtualMemoryApi, DbgKdReadPhysicalMemoryApi, DbgKdWritePhysicalMemoryApi, DbgKdWriteBreakPointExApi, DbgKdRestoreBreakPointExApi, DbgKdSearchMemoryApi and DbgKdFillMemoryApi cases more properly. - Fail on physical memory write like we do for read too. - Don't handle OldVlm1/2 as they appear to be deprecated and unhandled in Windows. - Implement HalHaltSystem to halt execution in a portable way. Default to xHalHaltSystem, a simple infinite loop, if we get
by sginsberg＠svn.reactos.org 11 Oct '09

11 Oct '09

Author: sginsberg Date: Sun Oct 11 22:16:45 2009 New Revision: 43380 URL: http://svn.reactos.org/svn/reactos?rev=43380&view=rev Log: - Stub out DbgKdWriteVirtualMemoryApi, DbgKdReadPhysicalMemoryApi, DbgKdWritePhysicalMemoryApi, DbgKdWriteBreakPointExApi, DbgKdRestoreBreakPointExApi, DbgKdSearchMemoryApi and DbgKdFillMemoryApi cases more properly. - Fail on physical memory write like we do for read too. - Don't handle OldVlm1/2 as they appear to be deprecated and unhandled in Windows. - Implement HalHaltSystem to halt execution in a portable way. Default to xHalHaltSystem, a simple infinite loop, if we get called before HAL has initialized. Use this in KiBugCheckDebugBreak and the system shutdown handler instead of x86/AMD64/ARM intrinsics. - Don't try to halt the CPU if KeBugCheck has been called 3 times or more -- if this happens, something has gone very wrong, and we shouldn't try to do anything special. Just loop infinitely. - Fix KiBugCheckDebugBreak -- it shouldn't halt execution when called for the first chance as bugcheck callbacks have not been invoked at this point (nor has the BSOD been displayed). Use SEH to protect against a crash instead of checking KdDebuggerNotPresent as the debugger, if it is present, *could* disconnect while the trap is being handled. Also, don't halt execution if the debugger handled the breakpoint, just break again. - Don't call MmMapIoSpace from HalpReboot! The reboot might take place at elevated IRQL (as high as HIGH_LEVEL if called from KeBugCheck), and thus can't use any Mm support routines. Use a PTE from the reserved HAL region and map it ourselves instead as done in the BIOS call code. - Acquire the display ownership in HalReturnToFirmware in case the caller hasn't done so (as done in the KD reboot routine, for example). - Just include ntndk.h in hal.h instead of including 6 NDK headers (which turns into more than half of the NDK anyway since those headers include other NDK headers). - Crashing and rebooting from KD now works properly. Modified: trunk/reactos/hal/halx86/generic/halinit.c trunk/reactos/hal/halx86/generic/processor.c trunk/reactos/hal/halx86/generic/reboot.c trunk/reactos/hal/halx86/include/hal.h trunk/reactos/hal/halx86/include/halp.h trunk/reactos/ntoskrnl/ex/shutdown.c trunk/reactos/ntoskrnl/fstub/halstub.c trunk/reactos/ntoskrnl/include/internal/hal.h trunk/reactos/ntoskrnl/kd64/kdapi.c trunk/reactos/ntoskrnl/ke/bug.c Modified: trunk/reactos/hal/halx86/generic/halinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/halinit… ============================================================================== --- trunk/reactos/hal/halx86/generic/halinit.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/halinit.c [iso-8859-1] Sun Oct 11 22:16:45 2009 @@ -110,6 +110,7 @@ HalGetDmaAdapter = HalpGetDmaAdapter; HalGetInterruptTranslator = NULL; // FIXME: TODO HalResetDisplay = HalpBiosDisplayReset; + HalHaltSystem = HaliHaltSystem; /* Initialize the hardware lock (CMOS) */ KeInitializeSpinLock(&HalpSystemHardwareLock); Modified: trunk/reactos/hal/halx86/generic/processor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/process… ============================================================================== --- trunk/reactos/hal/halx86/generic/processor.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/processor.c [iso-8859-1] Sun Oct 11 22:16:45 2009 @@ -14,6 +14,17 @@ LONG HalpActiveProcessors; KAFFINITY HalpDefaultInterruptAffinity; + +/* PRIVATE FUNCTIONS *********************************************************/ + +VOID +NTAPI +HaliHaltSystem(VOID) +{ + /* Disable interrupts and halt the CPU */ + _disable(); + __halt(); +} /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/hal/halx86/generic/reboot.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/reboot.… ============================================================================== --- trunk/reactos/hal/halx86/generic/reboot.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/reboot.c [iso-8859-1] Sun Oct 11 22:16:45 2009 @@ -13,9 +13,11 @@ #define NDEBUG #include <debug.h> +#define GetPteAddress(x) (PHARDWARE_PTE)(((((ULONG_PTR)(x)) >> 12) << 2) + 0xC0000000) + /* PRIVATE FUNCTIONS *********************************************************/ -static VOID +VOID NTAPI HalpWriteResetCommand(VOID) { @@ -23,17 +25,29 @@ WRITE_PORT_UCHAR((PUCHAR)0x64, 0xFE); }; -static VOID +VOID NTAPI HalpReboot(VOID) { UCHAR Data; - PVOID HalpZeroPageMapping; - PHYSICAL_ADDRESS Null = {{0, 0}}; + PVOID ZeroPageMapping; + PHARDWARE_PTE Pte; + + /* Get a PTE in the HAL reserved region */ + ZeroPageMapping = (PVOID)(0xFFC00000 + PAGE_SIZE); + Pte = GetPteAddress(ZeroPageMapping); + + /* Make it valid and map it to the first physical page */ + Pte->Valid = 1; + Pte->Write = 1; + Pte->Owner = 1; + Pte->PageFrameNumber = 0; + + /* Flush the TLB by resetting CR3 */ + __writecr3(__readcr3()); /* Enable warm reboot */ - HalpZeroPageMapping = MmMapIoSpace(Null, PAGE_SIZE, MmNonCached); - ((PUSHORT)HalpZeroPageMapping)[0x239] = 0x1234; + ((PUSHORT)ZeroPageMapping)[0x239] = 0x1234; /* FIXME: Lock CMOS Access */ @@ -79,12 +93,15 @@ NTAPI HalReturnToFirmware(IN FIRMWARE_REENTRY Action) { - /* Check the kind of action this is */ + /* Check what kind of action this is */ switch (Action) { /* All recognized actions */ case HalHaltRoutine: case HalRebootRoutine: + + /* Acquire the display */ + InbvAcquireDisplayOwnership(); /* Call the internal reboot function */ HalpReboot(); Modified: trunk/reactos/hal/halx86/include/hal.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/include/hal.h?r… ============================================================================== --- trunk/reactos/hal/halx86/include/hal.h [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/include/hal.h [iso-8859-1] Sun Oct 11 22:16:45 2009 @@ -25,12 +25,7 @@ #include <bugcodes.h> #include <ntdddisk.h> #include <arc/arc.h> -#include <iotypes.h> -#include <kefuncs.h> -#include <halfuncs.h> -#include <iofuncs.h> -#include <ldrtypes.h> -#include <obfuncs.h> +#include <ntndk.h> /* Internal kernel headers */ #include "internal/pci.h" Modified: trunk/reactos/hal/halx86/include/halp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/include/halp.h?… ============================================================================== --- trunk/reactos/hal/halx86/include/halp.h [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/include/halp.h [iso-8859-1] Sun Oct 11 22:16:45 2009 @@ -164,6 +164,15 @@ VOID ); +// +// Processor Halt Routine +// +VOID +NTAPI +HaliHaltSystem( + VOID +); + #ifdef _M_AMD64 #define KfLowerIrql KeLowerIrql #ifndef CONFIG_SMP Modified: trunk/reactos/ntoskrnl/ex/shutdown.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/shutdown.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ex/shutdown.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/shutdown.c [iso-8859-1] Sun Oct 11 22:16:45 2009 @@ -30,13 +30,7 @@ while (TRUE) { KeRaiseIrql(SYNCH_LEVEL, &OldIrql); -#if defined(_M_IX86) || defined(_M_AMD64) - __halt(); -#elif defined(_M_ARM) - KeArmHaltProcessor(); -#else - HalProcessorIdle(); -#endif + HalHaltSystem(); } } Modified: trunk/reactos/ntoskrnl/fstub/halstub.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fstub/halstub.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/fstub/halstub.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/fstub/halstub.c [iso-8859-1] Sun Oct 11 22:16:45 2009 @@ -51,7 +51,7 @@ (pHalSetWakeAlarm)NULL, (pHalTranslateBusAddress)NULL, (pHalAssignSlotResources)NULL, - (pHalHaltSystem)NULL, + xHalHaltSystem, (pHalFindBusAddressTranslation)NULL, (pHalResetDisplay)NULL, (pHalAllocateMapRegisters)NULL, @@ -66,5 +66,10 @@ /* FUNCTIONS *****************************************************************/ - -/* EOF */ +VOID +NTAPI +xHalHaltSystem(VOID) +{ + /* Halt execution */ + while (TRUE); +} Modified: trunk/reactos/ntoskrnl/include/internal/hal.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/hal.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/hal.h [iso-8859-1] Sun Oct 11 22:16:45 2009 @@ -46,6 +46,13 @@ IN ULONG SectorsPerTrack, IN ULONG NumberOfHeads, IN PDRIVE_LAYOUT_INFORMATION PartitionBuffer); + +VOID +NTAPI +xHalHaltSystem( + VOID +); + // // Various offsets in the boot record Modified: trunk/reactos/ntoskrnl/kd64/kdapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd64/kdapi.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/kd64/kdapi.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kd64/kdapi.c [iso-8859-1] Sun Oct 11 22:16:45 2009 @@ -66,6 +66,28 @@ VOID NTAPI +KdpSearchMemory(IN PDBGKD_MANIPULATE_STATE64 State, + IN PSTRING Data, + IN PCONTEXT Context) +{ + /* FIXME: STUB */ + KdpDprintf("KdpSearchMemory called\n"); + while (TRUE); +} + +VOID +NTAPI +KdpFillMemory(IN PDBGKD_MANIPULATE_STATE64 State, + IN PSTRING Data, + IN PCONTEXT Context) +{ + /* FIXME: STUB */ + KdpDprintf("KdpFillMemory called\n"); + while (TRUE); +} + +VOID +NTAPI KdpWriteBreakpoint(IN PDBGKD_MANIPULATE_STATE64 State, IN PSTRING Data, IN PCONTEXT Context) @@ -97,6 +119,62 @@ &Header, NULL, &KdpContext); +} + +VOID +NTAPI +KdpRestoreBreakpoint(IN PDBGKD_MANIPULATE_STATE64 State, + IN PSTRING Data, + IN PCONTEXT Context) +{ + PDBGKD_RESTORE_BREAKPOINT RestoreBp = &State->u.RestoreBreakPoint; + STRING Header; + + /* Fill out the header */ + Header.Length = sizeof(DBGKD_MANIPULATE_STATE64); + Header.Buffer = (PCHAR)State; + ASSERT(Data->Length == 0); + + /* Get the version block */ + if (KdpDeleteBreakpoint(RestoreBp->BreakPointHandle)) + { + /* We're all good */ + State->ReturnStatus = STATUS_SUCCESS; + } + else + { + /* We failed */ + State->ReturnStatus = STATUS_UNSUCCESSFUL; + } + + /* Send the packet */ + KdSendPacket(PACKET_TYPE_KD_STATE_MANIPULATE, + &Header, + NULL, + &KdpContext); +} + +NTSTATUS +NTAPI +KdpWriteBreakPointEx(IN PDBGKD_MANIPULATE_STATE64 State, + IN PSTRING Data, + IN PCONTEXT Context) +{ + /* FIXME: STUB */ + KdpDprintf("KdpWriteBreakPointEx called\n"); + while (TRUE); + return STATUS_UNSUCCESSFUL; +} + +VOID +NTAPI +KdpRestoreBreakPointEx(IN PDBGKD_MANIPULATE_STATE64 State, + IN PSTRING Data, + IN PCONTEXT Context) +{ + /* FIXME: STUB */ + KdpDprintf("KdpRestoreBreakPointEx called\n"); + while (TRUE); } VOID @@ -236,6 +314,71 @@ VOID NTAPI +KdpWriteVirtualMemory(IN PDBGKD_MANIPULATE_STATE64 State, + IN PSTRING Data, + IN PCONTEXT Context) +{ + /* FIXME: STUB */ + KdpDprintf("KdpWriteVirtualMemory called for Address: %p Length %x\n", + (PVOID)(ULONG_PTR)State->u.ReadMemory.TargetBaseAddress, + State->u.ReadMemory.TransferCount); + while (TRUE); +} + +VOID +NTAPI +KdpReadPhysicalmemory(IN PDBGKD_MANIPULATE_STATE64 State, + IN PSTRING Data, + IN PCONTEXT Context) +{ + STRING Header; + + /* FIXME: STUB */ + KdpDprintf("KdpWritePhysicalMemory called for Address %I64x Length: %x\n", + State->u.ReadMemory.TargetBaseAddress, + State->u.ReadMemory.TransferCount); + + /* Setup an empty message, with failure */ + Header.Length = sizeof(DBGKD_MANIPULATE_STATE64); + Header.Buffer = (PCHAR)State; + Data->Length = 0; + State->ReturnStatus = STATUS_UNSUCCESSFUL; + + /* Send it */ + KdSendPacket(PACKET_TYPE_KD_STATE_MANIPULATE, + &Header, + Data, + &KdpContext); +} + +VOID +NTAPI +KdpWritePhysicalmemory(IN PDBGKD_MANIPULATE_STATE64 State, + IN PSTRING Data, + IN PCONTEXT Context) +{ + STRING Header; + + /* FIXME: STUB */ + KdpDprintf("KdpWritePhysicalMemory called for Address %I64x Length: %x\n", + State->u.ReadMemory.TargetBaseAddress, + State->u.ReadMemory.TransferCount); + + /* Setup an empty message, with failure */ + Header.Length = sizeof(DBGKD_MANIPULATE_STATE64); + Header.Buffer = (PCHAR)State; + Data->Length = 0; + State->ReturnStatus = STATUS_UNSUCCESSFUL; + + /* Send it */ + KdSendPacket(PACKET_TYPE_KD_STATE_MANIPULATE, + &Header, + Data, + &KdpContext); +} + +VOID +NTAPI KdpReadControlSpace(IN PDBGKD_MANIPULATE_STATE64 State, IN PSTRING Data, IN PCONTEXT Context) @@ -302,39 +445,6 @@ KdSendPacket(PACKET_TYPE_KD_STATE_MANIPULATE, &Header, Data, - &KdpContext); -} - -VOID -NTAPI -KdpRestoreBreakpoint(IN PDBGKD_MANIPULATE_STATE64 State, - IN PSTRING Data, - IN PCONTEXT Context) -{ - PDBGKD_RESTORE_BREAKPOINT RestoreBp = &State->u.RestoreBreakPoint; - STRING Header; - - /* Fill out the header */ - Header.Length = sizeof(DBGKD_MANIPULATE_STATE64); - Header.Buffer = (PCHAR)State; - ASSERT(Data->Length == 0); - - /* Get the version block */ - if (KdpDeleteBreakpoint(RestoreBp->BreakPointHandle)) - { - /* We're all good */ - State->ReturnStatus = STATUS_SUCCESS; - } - else - { - /* We failed */ - State->ReturnStatus = STATUS_UNSUCCESSFUL; - } - - /* Send the packet */ - KdSendPacket(PACKET_TYPE_KD_STATE_MANIPULATE, - &Header, - NULL, &KdpContext); } @@ -788,9 +898,8 @@ case DbgKdWriteVirtualMemoryApi: - /* FIXME: TODO */ - KdpDprintf("DbgKdWriteVirtualMemoryApi called\n"); - while (TRUE); + /* Write virtual memory */ + KdpWriteVirtualMemory(&ManipulateState, &Data, Context); break; case DbgKdGetContextApi: @@ -866,22 +975,17 @@ /* Return an error */ return ContinueError; } - break; case DbgKdReadPhysicalMemoryApi: - /* FIXME: TODO */ - KdpDprintf("DbgKdReadPhysicalMemoryApi called for address %I64X\n", - ManipulateState.u.ReadMemory.TargetBaseAddress); - goto Hack; - while (TRUE); + /* Read physical memory */ + KdpReadPhysicalmemory(&ManipulateState, &Data, Context); break; case DbgKdWritePhysicalMemoryApi: - /* FIXME: TODO */ - KdpDprintf("DbgKdWritePhysicalMemoryApi called\n"); - while (TRUE); + /* Write physical memory */ + KdpWritePhysicalmemory(&ManipulateState, &Data, Context); break; case DbgKdQuerySpecialCallsApi: @@ -939,16 +1043,20 @@ case DbgKdWriteBreakPointExApi: - /* FIXME: TODO */ - KdpDprintf("DbgKdWriteBreakPointExApi called\n"); - while (TRUE); + /* Write the breakpoint and check if it failed */ + if (!NT_SUCCESS(KdpWriteBreakPointEx(&ManipulateState, + &Data, + Context))) + { + /* Return an error */ + return ContinueError; + } break; case DbgKdRestoreBreakPointExApi: - /* FIXME: TODO */ - KdpDprintf("DbgKdRestoreBreakPointExApi called\n"); - while (TRUE); + /* Restore the breakpoint */ + KdpRestoreBreakPointEx(&ManipulateState, &Data, Context); break; case DbgKdCauseBugCheckApi: @@ -983,25 +1091,10 @@ KdpWriteMachineSpecificRegister(&ManipulateState, &Data, Context); break; - case OldVlm1: - - /* FIXME: TODO */ - KdpDprintf("OldVlm1 called\n"); - while (TRUE); - break; - - case OldVlm2: - - /* FIXME: TODO */ - KdpDprintf("OldVlm2 called\n"); - while (TRUE); - break; - case DbgKdSearchMemoryApi: - /* FIXME: TODO */ - KdpDprintf("DbgKdSearchMemoryApi called\n"); - while (TRUE); + /* Search memory */ + KdpSearchMemory(&ManipulateState, &Data, Context); break; case DbgKdGetBusDataApi: @@ -1030,9 +1123,8 @@ case DbgKdFillMemoryApi: - /* FIXME: TODO */ - KdpDprintf("DbgKdFillMemoryApi called\n"); - while (TRUE); + /* Fill memory */ + KdpFillMemory(&ManipulateState, &Data, Context); break; case DbgKdQueryMemoryApi: @@ -1052,9 +1144,7 @@ default: /* Setup an empty message, with failure */ - KdpDprintf("Received unknown API Number %lx\n", ManipulateState.ApiNumber); - while (TRUE); -Hack: + KdpDprintf("Received Unhandled API %lx\n", ManipulateState.ApiNumber); Data.Length = 0; ManipulateState.ReturnStatus = STATUS_UNSUCCESSFUL; Modified: trunk/reactos/ntoskrnl/ke/bug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/bug.c?rev=4338… ============================================================================== --- trunk/reactos/ntoskrnl/ke/bug.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/bug.c [iso-8859-1] Sun Oct 11 22:16:45 2009 @@ -546,21 +546,29 @@ } } -DECLSPEC_NORETURN VOID NTAPI KiBugCheckDebugBreak(IN ULONG StatusCode) { - /* If KDBG isn't connected, freeze the CPU, otherwise, break */ -#if defined(_M_IX86) || defined(_M_AMD64) - if (KdDebuggerNotPresent) for (;;) __halt(); -#elif defined(_M_ARM) - if (KdDebuggerNotPresent) for (;;) KeArmHaltProcessor(); -#else -#error -#endif - DbgBreakPointWithStatus(StatusCode); - while (TRUE); + /* + * Wrap this in SEH so we don't crash if + * there is no debugger or if it disconnected + */ +DoBreak: + _SEH2_TRY + { + /* Breakpoint */ + DbgBreakPointWithStatus(StatusCode); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + /* No debugger, halt the CPU */ + HalHaltSystem(); + } + _SEH2_END; + + /* Break again if this wasn't first try */ + if (StatusCode != DBG_STATUS_BUGCHECK_FIRST) goto DoBreak; } PCHAR @@ -1175,14 +1183,8 @@ } else if (KeBugCheckOwnerRecursionCount > 2) { - /* Halt the CPU */ -#if defined(_M_IX86) || defined(_M_AMD64) - for (;;) __halt(); -#elif defined(_M_ARM) - for (;;) KeArmHaltProcessor(); -#else -#error -#endif + /* Halt execution */ + while (TRUE); } } @@ -1201,6 +1203,9 @@ /* Attempt to break in the debugger (otherwise halt CPU) */ KiBugCheckDebugBreak(DBG_STATUS_BUGCHECK_SECOND); + + /* Shouldn't get here */ + while (TRUE); } /* PUBLIC FUNCTIONS **********************************************************/ @@ -1421,7 +1426,7 @@ } } - /* Bugcheck */ + /* Break in the debugger */ KiBugCheckDebugBreak(DBG_STATUS_FATAL); }

1 0

[gschneider] 43379: [spider] Address two more gcc 4.4 parenthesis warnings
by gschneider＠svn.reactos.org 11 Oct '09

11 Oct '09

Author: gschneider Date: Sun Oct 11 20:10:48 2009 New Revision: 43379 URL: http://svn.reactos.org/svn/reactos?rev=43379&view=rev Log: [spider] Address two more gcc 4.4 parenthesis warnings Modified: trunk/reactos/base/applications/games/spider/spigame.cpp Modified: trunk/reactos/base/applications/games/spider/spigame.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/sp… ============================================================================== --- trunk/reactos/base/applications/games/spider/spigame.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/spider/spigame.cpp [iso-8859-1] Sun Oct 11 20:10:48 2009 @@ -145,8 +145,8 @@ case IDC_DIF_ONECOLOR: break; case IDC_DIF_TWOCOLORS: - if (mystack[i].IsBlack() && mystack[i + 1].IsBlack() || - mystack[i].IsRed() && mystack[i + 1].IsRed()) + if ((mystack[i].IsBlack() && mystack[i + 1].IsBlack()) || + (mystack[i].IsRed() && mystack[i + 1].IsRed())) { return false; } @@ -236,8 +236,8 @@ case IDC_DIF_ONECOLOR: break; case IDC_DIF_TWOCOLORS: - if (mystack[0].IsBlack() && dragcard.IsRed() || - mystack[0].IsRed() && dragcard.IsBlack()) + if ((mystack[0].IsBlack() && dragcard.IsRed()) || + (mystack[0].IsRed() && dragcard.IsBlack())) { return false; }

1 0

← Newer
1
...
48
49
50
51
52
53
54
...
65
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2009