Ros-diffs August 2016

ros-diffs@reactos.org

20 participants
462 discussions

[akhaldi] 72408: [UNICODE] Sync with Wine Staging 1.9.16. CORE-11866
by akhaldi＠svn.reactos.org 21 Aug '16

21 Aug '16

Author: akhaldi Date: Sun Aug 21 16:47:13 2016 New Revision: 72408 URL: http://svn.reactos.org/svn/reactos?rev=72408&view=rev Log: [UNICODE] Sync with Wine Staging 1.9.16. CORE-11866 Modified: trunk/reactos/media/doc/README.WINE trunk/reactos/sdk/tools/unicode/casemap.c trunk/reactos/sdk/tools/unicode/compose.c trunk/reactos/sdk/tools/unicode/wctype.c Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sun Aug 21 16:47:13 2016 @@ -15,7 +15,7 @@ The following build tools are shared with Wine. -reactos/sdk/tools/unicode # Synced to WineStaging-1.9.11 +reactos/sdk/tools/unicode # Synced to WineStaging-1.9.16 reactos/sdk/tools/widl # Synced to WineStaging-1.9.11 reactos/sdk/tools/wpp # Synced to WineStaging-1.9.11 Modified: trunk/reactos/sdk/tools/unicode/casemap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/unicode/casemap.… ============================================================================== --- trunk/reactos/sdk/tools/unicode/casemap.c [iso-8859-1] (original) +++ trunk/reactos/sdk/tools/unicode/casemap.c [iso-8859-1] Sun Aug 21 16:47:13 2016 @@ -1,5 +1,5 @@ /* Unicode case mappings */ -/* generated from http://www.unicode.org/Public/8.0.0/ucd/UnicodeData.txt */ +/* generated from http://www.unicode.org/Public/9.0.0/ucd/UnicodeData.txt */ /* DO NOT EDIT!! */ #include "wine/unicode.h" @@ -488,7 +488,7 @@ 0x0001, 0x0000, 0x0000, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, - 0x5abc, 0x5ab1, 0x5ab5, 0x5abf, 0x0000, 0x0000, 0x5aee, 0x5ad6, + 0x5abc, 0x5ab1, 0x5ab5, 0x5abf, 0x5abc, 0x0000, 0x5aee, 0x5ad6, 0x5aeb, 0x03a0, 0x0001, 0x0000, 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, @@ -530,41 +530,41 @@ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000 }; -const WCHAR wine_casemap_upper[4433] = +const WCHAR wine_casemap_upper[4570] = { /* index */ 0x019f, 0x029f, 0x039f, 0x045a, 0x0556, 0x0656, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x06dd, 0x0100, 0x0100, 0x0100, 0x0100, - 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x07db, 0x08da, 0x09da, - 0x0100, 0x0ace, 0x0100, 0x0100, 0x0b53, 0x0100, 0x0100, 0x0100, - 0x0100, 0x0100, 0x0100, 0x0100, 0x0c3d, 0x0d3d, 0x0100, 0x0100, - 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, - 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, - 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, - 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, - 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, - 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, - 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, - 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, - 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, - 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, - 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, - 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, - 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, - 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, - 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0dfc, 0x0ed9, - 0x0100, 0x0100, 0x0100, 0x0f91, 0x0100, 0x0100, 0x0100, 0x0100, - 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, - 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, - 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, - 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, - 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, - 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, - 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, - 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, - 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, - 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x1051, + 0x0100, 0x0100, 0x0100, 0x0100, 0x07db, 0x0864, 0x0963, 0x0a63, + 0x0100, 0x0b57, 0x0100, 0x0100, 0x0bdc, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0cc6, 0x0dc6, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0e85, 0x0f62, + 0x0100, 0x0100, 0x0100, 0x101a, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x10da, /* defaults */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, @@ -666,7 +666,7 @@ 0x2a1f, 0x2a1c, 0x2a1e, 0xff2e, 0xff32, 0x0000, 0xff33, 0xff33, 0x0000, 0xff36, 0x0000, 0xff35, 0xa54f, 0x0000, 0x0000, 0x0000, 0xff33, 0xa54b, 0x0000, 0xff31, 0x0000, 0xa528, 0xa544, 0x0000, - 0xff2f, 0xff2d, 0x0000, 0x29f7, 0xa541, 0x0000, 0x0000, 0xff2d, + 0xff2f, 0xff2d, 0xa544, 0x29f7, 0xa541, 0x0000, 0x0000, 0xff2d, 0x0000, 0x29fd, 0xff2b, 0x0000, 0x0000, 0xff2a, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x29e7, 0x0000, 0x0000, 0xff26, 0x0000, 0x0000, 0xff26, 0x0000, 0x0000, 0x0000, 0xa52a, @@ -794,24 +794,24 @@ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0xfff8, 0xfff8, 0xfff8, 0xfff8, 0xfff8, 0xfff8, 0x0000, 0x0000, - /* 0x1d02 .. 0x1dff */ - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x8a04, - 0x0000, 0x0000, 0x0000, 0x0ee6, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0x1c02 .. 0x1cff */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0xe792, 0xe793, + 0xe79c, 0xe79e, 0xe79e, 0xe79d, 0xe7a4, 0xe7db, 0x89c2, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, @@ -827,6 +827,25 @@ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0x1d77 .. 0x1dff */ + 0x0000, 0x0000, 0x8a04, 0x0000, 0x0000, 0x0000, 0x0ee6, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, /* 0x1e01 .. 0x1eff */ 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, Modified: trunk/reactos/sdk/tools/unicode/compose.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/unicode/compose.… ============================================================================== --- trunk/reactos/sdk/tools/unicode/compose.c [iso-8859-1] (original) +++ trunk/reactos/sdk/tools/unicode/compose.c [iso-8859-1] Sun Aug 21 16:47:13 2016 @@ -1,5 +1,5 @@ /* Unicode char composition */ -/* generated from http://www.unicode.org/Public/8.0.0/ucd/UnicodeData.txt */ +/* generated from http://www.unicode.org/Public/9.0.0/ucd/UnicodeData.txt */ /* DO NOT EDIT!! */ #include "wine/unicode.h" Modified: trunk/reactos/sdk/tools/unicode/wctype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/unicode/wctype.c… ============================================================================== --- trunk/reactos/sdk/tools/unicode/wctype.c [iso-8859-1] (original) +++ trunk/reactos/sdk/tools/unicode/wctype.c [iso-8859-1] Sun Aug 21 16:47:13 2016 @@ -317,13 +317,13 @@ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0xc300, 0xc300, 0xc300, 0xc300, 0xc300, 0xc300, 0xc300, 0xc300, 0xc300, 0xc300, 0xc300, 0xc300, 0xc300, 0xc300, 0xc300, 0xc300, - 0xc300, 0xc300, 0xc300, 0xc300, 0xc300, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0xd200, 0xd200, 0xd200, 0xd200, 0xd200, + 0xc300, 0xc300, 0xc300, 0xc300, 0xc300, 0x0000, 0xc300, 0xc300, + 0xc300, 0xc300, 0xc300, 0xc300, 0xc300, 0xc300, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0xd200, 0xd200, 0xd200, 0xd200, + 0xd200, 0xd200, 0xd200, 0xd200, 0xd200, 0xd200, 0xd200, 0xd200, + 0xd200, 0xd200, 0x6220, 0xd200, 0xd200, 0xd200, 0xd200, 0xd200, 0xd200, 0xd200, 0xd200, 0xd200, 0xd200, 0xd200, 0xd200, 0xd200, 0xd200, 0xd200, 0xd200, 0xd200, 0xd200, 0xd200, 0xd200, 0xd200, 0xd200, 0xd200, 0xd200, 0xd200, 0xd200, 0xd200, 0xd200, 0xd200, @@ -439,7 +439,7 @@ 0x1204, 0x1204, 0x1204, 0x1204, 0x1204, 0x1204, 0x1204, 0x1204, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0x1200, - 0x0000, 0xd200, 0x1200, 0x1200, 0x0000, 0x1300, 0x1300, 0x1300, + 0x1300, 0xd200, 0x1200, 0x1200, 0x0000, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x0000, 0x1300, 0x1300, 0x1300, 0x0000, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, @@ -464,13 +464,13 @@ 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x0000, 0x0000, 0x1300, 0x1200, 0x1200, 0x1200, 0xd200, 0xd200, 0xd200, 0xd200, 0x0000, 0x1200, 0x1200, - 0x1200, 0x0000, 0x1200, 0x1200, 0x1200, 0xd200, 0x1300, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x1200, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x1300, + 0x1200, 0x0000, 0x1200, 0x1200, 0x1200, 0xd200, 0x1300, 0x1200, + 0x0000, 0x0000, 0x0000, 0x0000, 0x1300, 0x1300, 0x1300, 0x1200, + 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1300, 0x1300, 0x1300, 0xd200, 0xd200, 0x0000, 0x0000, 0x1204, 0x1204, 0x1204, 0x1204, 0x1204, 0x1204, 0x1204, 0x1204, 0x1204, 0x1204, - 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x0000, 0x0000, - 0x0000, 0x1200, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, + 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, + 0x1200, 0x1200, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x0000, 0x0000, 0x1200, 0x1200, 0x0000, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x0000, @@ -791,7 +791,7 @@ 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, + 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0xd200, 0xd200, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, @@ -919,8 +919,8 @@ 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1210, 0x1210, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x1302, 0x1302, 0x1302, 0x1302, 0x1302, 0x1302, 0x1302, 0x1302, + 0x1302, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, @@ -966,7 +966,7 @@ 0xd200, 0xd200, 0xd200, 0xd200, 0xd200, 0xd200, 0xd200, 0xd200, 0xd200, 0xd200, 0xd200, 0xd200, 0xd200, 0xd200, 0xd200, 0xd200, 0xd200, 0xd200, 0xd200, 0xd200, 0xd200, 0xd200, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0xd200, 0xd200, 0xd200, 0xd200, + 0x0000, 0x0000, 0x0000, 0xd200, 0xd200, 0xd200, 0xd200, 0xd200, 0x1301, 0x1302, 0x1301, 0x1302, 0x1301, 0x1302, 0x1301, 0x1302, 0x1301, 0x1302, 0x1301, 0x1302, 0x1301, 0x1302, 0x1301, 0x1302, 0x1301, 0x1302, 0x1301, 0x1302, 0x1301, 0x1302, 0x1301, 0x1302, @@ -1158,7 +1158,7 @@ 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, - 0xb200, 0xb200, 0xb200, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0x0000, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, @@ -1455,7 +1455,7 @@ 0xb210, 0xb210, 0xb210, 0xb210, 0xb210, 0xb210, 0xb210, 0xb300, 0xb210, 0xb210, 0xb210, 0xb210, 0xb210, 0xb210, 0xb210, 0xb210, 0xb210, 0xb210, 0xb210, 0xb210, 0xb210, 0xb210, 0xb210, 0xb210, - 0xb210, 0xb210, 0xb210, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0xb210, 0xb210, 0xb210, 0xb210, 0xb210, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, @@ -1788,7 +1788,7 @@ 0x1301, 0x1302, 0x1301, 0x1302, 0x1302, 0x1302, 0x1301, 0x1302, 0x1301, 0x1302, 0x1301, 0x1302, 0x1301, 0x1302, 0x1301, 0x1302, 0x1301, 0x1302, 0x1301, 0x1302, 0x1301, 0x1302, 0x1301, 0x1302, - 0x1301, 0x1302, 0x1301, 0x1301, 0x1301, 0x1301, 0x0000, 0x0000, + 0x1301, 0x1302, 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, 0x0000, 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, 0x1302, 0x1301, 0x1302, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, @@ -1823,7 +1823,7 @@ 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, - 0x1200, 0x1200, 0x1200, 0x1200, 0xd200, 0x0000, 0x0000, 0x0000, + 0x1200, 0x1200, 0x1200, 0x1200, 0xd200, 0xd200, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x1210, 0x1210, 0x1204, 0x1204, 0x1204, 0x1204, 0x1204, 0x1204, 0x1204, 0x1204, 0x1204, 0x1204, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,

1 0

[akhaldi] 72407: [README.WINE] Update some paths.
by akhaldi＠svn.reactos.org 21 Aug '16

21 Aug '16

Author: akhaldi Date: Sun Aug 21 16:44:35 2016 New Revision: 72407 URL: http://svn.reactos.org/svn/reactos?rev=72407&view=rev Log: [README.WINE] Update some paths. Modified: trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sun Aug 21 16:44:35 2016 @@ -251,11 +251,11 @@ from Winehq CVS. If you are looking to update something in these files check Wine current sources first as it may already be fixed. -reactos/lib/3rdparty/strmbase # Synced to WineStaging-1.9.11 - -reactos/lib/rtl/actctx.c # Partly synced with WineStaging-1.7.55 -reactos/lib/rtl/timerqueue.c # Partly synced with WineStaging-1.7.55 -reactos/lib/rtl/wait.c # Partly synced with WineStaging-1.7.55 +reactos/sdk/lib/3rdparty/strmbase # Synced to WineStaging-1.9.11 + +reactos/sdk/lib/rtl/actctx.c # Partly synced with WineStaging-1.7.55 +reactos/sdk/lib/rtl/timerqueue.c # Partly synced with WineStaging-1.7.55 +reactos/sdk/lib/rtl/wait.c # Partly synced with WineStaging-1.7.55 advapi32 - reactos/dll/win32/advapi32/wine/cred.c # Synced to WineStaging-1.7.55 @@ -286,19 +286,19 @@ reactos/dll/win32/kernel32/winnls/string/sortkey.c # Synced to WineStaging-1.9.16 msvcrt - - reactos/lib/sdk/crt/except/cpp.c # Synced at 20080528 - reactos/lib/sdk/crt/except/cppexcept.c # Synced at 20071111 - reactos/lib/sdk/crt/process/_cwait.c # Synced to WineStaging-1.7.37 - reactos/lib/sdk/crt/signal/xcptinfo.c # Synced to WineStaging-1.7.37 - reactos/lib/sdk/crt/string/scanf.c/h # Synced to Wine-1.7.17 - reactos/lib/sdk/crt/string/strtoi64.c # Synced to WineStaging-1.9.9 - reactos/lib/sdk/crt/string/strtok.c # Synced to WineStaging-1.9.16 - reactos/lib/sdk/crt/string/strtok_s.c # Synced to WineStaging-1.9.16 - reactos/lib/sdk/crt/string/strtoul.c # Synced to WineStaging-1.9.9 - reactos/lib/sdk/crt/strings/wcs.c # Synced at 20080611 - reactos/lib/sdk/crt/wine/heap.c # Synced at 20080529 - reactos/lib/sdk/crt/wine/undname.c # Synced to WineStaging-1.7.55 - reactos/lib/sdk/crt/process/thread.c # Synced to WineStaging-1.7.55 + reactos/sdk/lib/crt/except/cpp.c # Synced at 20080528 + reactos/sdk/lib/crt/except/cppexcept.c # Synced at 20071111 + reactos/sdk/lib/crt/process/_cwait.c # Synced to WineStaging-1.7.37 + reactos/sdk/lib/crt/signal/xcptinfo.c # Synced to WineStaging-1.7.37 + reactos/sdk/lib/crt/string/scanf.c/h # Synced to Wine-1.7.17 + reactos/sdk/lib/crt/string/strtoi64.c # Synced to WineStaging-1.9.9 + reactos/sdk/lib/crt/string/strtok.c # Synced to WineStaging-1.9.16 + reactos/sdk/lib/crt/string/strtok_s.c # Synced to WineStaging-1.9.16 + reactos/sdk/lib/crt/string/strtoul.c # Synced to WineStaging-1.9.9 + reactos/sdk/lib/crt/strings/wcs.c # Synced at 20080611 + reactos/sdk/lib/crt/wine/heap.c # Synced at 20080529 + reactos/sdk/lib/crt/wine/undname.c # Synced to WineStaging-1.7.55 + reactos/sdk/lib/crt/process/thread.c # Synced to WineStaging-1.7.55 User32 - reactos/win32ss/user/user32/controls/button.c # Synced to WineStaging-1.7.37

1 0

[akhaldi] 72406: [CDMAKE][CTR] Fix strtok_s for empty strings. Part of Wine commit 4fa616c by Bernhard Übelacker.
by akhaldi＠svn.reactos.org 21 Aug '16

21 Aug '16

Author: akhaldi Date: Sun Aug 21 16:30:06 2016 New Revision: 72406 URL: http://svn.reactos.org/svn/reactos?rev=72406&view=rev Log: [CDMAKE][CTR] Fix strtok_s for empty strings. Part of Wine commit 4fa616c by Bernhard Übelacker. Modified: trunk/reactos/sdk/lib/crt/string/strtok_s.c trunk/reactos/sdk/tools/cdmake/cdmake.c Modified: trunk/reactos/sdk/lib/crt/string/strtok_s.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/crt/string/strtok_… ============================================================================== --- trunk/reactos/sdk/lib/crt/string/strtok_s.c [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/crt/string/strtok_s.c [iso-8859-1] Sun Aug 21 16:30:06 2016 @@ -18,7 +18,10 @@ while(*str && strchr(delim, *str)) str++; if(!*str) + { + *ctx = str; return NULL; + } *ctx = str+1; while(**ctx && !strchr(delim, **ctx)) Modified: trunk/reactos/sdk/tools/cdmake/cdmake.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/cdmake/cdmake.c?… ============================================================================== --- trunk/reactos/sdk/tools/cdmake/cdmake.c [iso-8859-1] (original) +++ trunk/reactos/sdk/tools/cdmake/cdmake.c [iso-8859-1] Sun Aug 21 16:30:06 2016 @@ -1930,7 +1930,10 @@ while (*str && strchr(delim, *str)) str++; if (!*str) + { + *ctx = str; return NULL; + } *ctx = str + 1; while (**ctx && !strchr(delim, **ctx))

1 0

[akhaldi] 72405: [CRT] Sync strtok_s() with Wine Staging 1.9.16 and mark strtok() as synced. CORE-11866
by akhaldi＠svn.reactos.org 21 Aug '16

21 Aug '16

Author: akhaldi Date: Sun Aug 21 16:24:00 2016 New Revision: 72405 URL: http://svn.reactos.org/svn/reactos?rev=72405&view=rev Log: [CRT] Sync strtok_s() with Wine Staging 1.9.16 and mark strtok() as synced. CORE-11866 Added: trunk/reactos/sdk/lib/crt/string/strtok_s.c (with props) Modified: trunk/reactos/media/doc/README.WINE trunk/reactos/sdk/lib/crt/crt.cmake trunk/reactos/sdk/lib/crt/string/strtok.c Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sun Aug 21 16:24:00 2016 @@ -292,6 +292,8 @@ reactos/lib/sdk/crt/signal/xcptinfo.c # Synced to WineStaging-1.7.37 reactos/lib/sdk/crt/string/scanf.c/h # Synced to Wine-1.7.17 reactos/lib/sdk/crt/string/strtoi64.c # Synced to WineStaging-1.9.9 + reactos/lib/sdk/crt/string/strtok.c # Synced to WineStaging-1.9.16 + reactos/lib/sdk/crt/string/strtok_s.c # Synced to WineStaging-1.9.16 reactos/lib/sdk/crt/string/strtoul.c # Synced to WineStaging-1.9.9 reactos/lib/sdk/crt/strings/wcs.c # Synced at 20080611 reactos/lib/sdk/crt/wine/heap.c # Synced at 20080529 Modified: trunk/reactos/sdk/lib/crt/crt.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/crt/crt.cmake?rev=… ============================================================================== --- trunk/reactos/sdk/lib/crt/crt.cmake [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/crt/crt.cmake [iso-8859-1] Sun Aug 21 16:24:00 2016 @@ -294,6 +294,7 @@ string/strtod.c string/strtoi64.c string/strtok.c + #string/strtok_s.c string/strtol.c string/strtoul.c string/strtoull.c Modified: trunk/reactos/sdk/lib/crt/string/strtok.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/crt/string/strtok.… ============================================================================== --- trunk/reactos/sdk/lib/crt/string/strtok.c [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/crt/string/strtok.c [iso-8859-1] Sun Aug 21 16:24:00 2016 @@ -1,4 +1,4 @@ -/* taken from wine string.c */ +/* Taken from Wine Staging msvcrt/string.c */ #include <precomp.h> #include <internal/wine/msvcrt.h> @@ -22,31 +22,3 @@ data->strtok_next = str; return ret; } - -/********************************************************************* - * strtok_s (MSVCRT.@) - */ -char * CDECL strtok_s(char *str, const char *delim, char **ctx) -{ - if (!MSVCRT_CHECK_PMT(delim != NULL) || !MSVCRT_CHECK_PMT(ctx != NULL) || - !MSVCRT_CHECK_PMT(str != NULL || *ctx != NULL)) { - *_errno() = EINVAL; - return NULL; - } - - if(!str) - str = *ctx; - - while(*str && strchr(delim, *str)) - str++; - if(!*str) - return NULL; - - *ctx = str+1; - while(**ctx && !strchr(delim, **ctx)) - (*ctx)++; - if(**ctx) - *(*ctx)++ = 0; - - return str; -} Added: trunk/reactos/sdk/lib/crt/string/strtok_s.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/crt/string/strtok_… ============================================================================== --- trunk/reactos/sdk/lib/crt/string/strtok_s.c (added) +++ trunk/reactos/sdk/lib/crt/string/strtok_s.c [iso-8859-1] Sun Aug 21 16:24:00 2016 @@ -0,0 +1,30 @@ +/* Taken from Wine Staging msvcrt/string.c */ + +#include <precomp.h> +#include <internal/wine/msvcrt.h> + +/********************************************************************* + * strtok_s (MSVCRT.@) + */ +char * CDECL strtok_s(char *str, const char *delim, char **ctx) +{ + if (!MSVCRT_CHECK_PMT(delim != NULL)) return NULL; + if (!MSVCRT_CHECK_PMT(ctx != NULL)) return NULL; + if (!MSVCRT_CHECK_PMT(str != NULL || *ctx != NULL)) return NULL; + + if(!str) + str = *ctx; + + while(*str && strchr(delim, *str)) + str++; + if(!*str) + return NULL; + + *ctx = str+1; + while(**ctx && !strchr(delim, **ctx)) + (*ctx)++; + if(**ctx) + *(*ctx)++ = 0; + + return str; +} Propchange: trunk/reactos/sdk/lib/crt/string/strtok_s.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[ekohl] 72404: [LSASRV] Implement LsaIFree_LSAPR_SR_SECURITY_DESCRIPTOR and LsaIFree_LSAPR_TRANSLATED_NAMES.
by ekohl＠svn.reactos.org 21 Aug '16

21 Aug '16

Author: ekohl Date: Sun Aug 21 14:56:54 2016 New Revision: 72404 URL: http://svn.reactos.org/svn/reactos?rev=72404&view=rev Log: [LSASRV] Implement LsaIFree_LSAPR_SR_SECURITY_DESCRIPTOR and LsaIFree_LSAPR_TRANSLATED_NAMES. Modified: trunk/reactos/dll/win32/lsasrv/lsasrv.c trunk/reactos/dll/win32/lsasrv/lsasrv.spec Modified: trunk/reactos/dll/win32/lsasrv/lsasrv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lsasrv.c?… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/lsasrv.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/lsasrv.c [iso-8859-1] Sun Aug 21 14:56:54 2016 @@ -206,6 +206,46 @@ } midl_user_free(Ptr->Domains); + } + + midl_user_free(Ptr); + } +} + + +VOID +NTAPI +LsaIFree_LSAPR_SR_SECURITY_DESCRIPTOR( + PLSAPR_SR_SECURITY_DESCRIPTOR Ptr) +{ + if (Ptr != NULL) + { + if (Ptr->SecurityDescriptor != NULL) + midl_user_free(Ptr->SecurityDescriptor); + + midl_user_free(Ptr); + } +} + + +VOID +NTAPI +LsaIFree_LSAPR_TRANSLATED_NAMES( + PLSAPR_TRANSLATED_NAMES Ptr) +{ + ULONG i; + + if (Ptr != NULL) + { + if (Ptr->Names != NULL) + { + for (i = 0; i < Ptr->Entries; i++) + { + if (Ptr->Names[i].Name.Buffer != NULL) + midl_user_free(Ptr->Names[i].Name.Buffer); + } + + midl_user_free(Ptr->Names); } midl_user_free(Ptr); Modified: trunk/reactos/dll/win32/lsasrv/lsasrv.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lsasrv.sp… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/lsasrv.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/lsasrv.spec [iso-8859-1] Sun Aug 21 14:56:54 2016 @@ -38,8 +38,8 @@ @ stdcall LsaIFree_LSAPR_PRIVILEGE_ENUM_BUFFER(ptr) @ stdcall LsaIFree_LSAPR_PRIVILEGE_SET(ptr) @ stdcall LsaIFree_LSAPR_REFERENCED_DOMAIN_LIST(ptr) - @ stub LsaIFree_LSAPR_SR_SECURITY_DESCRIPTOR - @ stub LsaIFree_LSAPR_TRANSLATED_NAMES + @ stdcall LsaIFree_LSAPR_SR_SECURITY_DESCRIPTOR(ptr) + @ stdcall LsaIFree_LSAPR_TRANSLATED_NAMES(ptr) @ stub LsaIFree_LSAPR_TRANSLATED_SIDS @ stub LsaIFree_LSAPR_TRUSTED_DOMAIN_INFO @ stub LsaIFree_LSAPR_TRUSTED_ENUM_BUFFER

1 0

[dreimer] 72403: [RAPPS] Fix Audacity/NIRLauncher/Tahoma and Watercolor entries.
by dreimer＠svn.reactos.org 21 Aug '16

21 Aug '16

Author: dreimer Date: Sun Aug 21 11:45:05 2016 New Revision: 72403 URL: http://svn.reactos.org/svn/reactos?rev=72403&view=rev Log: [RAPPS] Fix Audacity/NIRLauncher/Tahoma and Watercolor entries. Modified: trunk/reactos/media/rapps/audacity.txt trunk/reactos/media/rapps/nirlauncher.txt trunk/reactos/media/rapps/tahoma.txt trunk/reactos/media/rapps/watercolor.txt Modified: trunk/reactos/media/rapps/audacity.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/audacity.txt?r… ============================================================================== --- trunk/reactos/media/rapps/audacity.txt [iso-8859-1] (original) +++ trunk/reactos/media/rapps/audacity.txt [iso-8859-1] Sun Aug 21 11:45:05 2016 @@ -6,31 +6,29 @@ Size = 25.3 MiB Category = 1 URLSite = http://audacityteam.org/ -URLDownload = http://app.oldfoss.com:81/download/Audacity/audacity_win_2_1_2-1453294050.e… +URLDownload = https://www.jabawok.net/installers/audacity-win-2.1.2.exe SHA1 = 850f643bb715782f120edb8eee982b0f3543a332 CDPath = none [Section.0407] Description = Freie, quelloffene Cross-Plattform Software zur Aufnahme und Bearbeitung von Sounds. -Size = 0,0 B +Size = 25,3 MiB [Section.0a] Description = Programa libre, gratuito y multiplataforma para grabar y editar audio y mÃºsica. -Size = 0.0 B [Section.0418] Description = Un program gratuit, multiplatformÄ, cu surse deschise pentru Ã®nregistrarea Èi editarea de sunete. -Size = 0,0 o +Size = 25,3 Mio [Section.0419] Description = ÐÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ð° Ð´Ð»Ñ Ð·Ð°Ð¿Ð¸ÑÐ¸ Ð¸ ÑÐµÐ´Ð°ÐºÑÐ¸ÑÐ¾Ð²Ð°Ð½Ð¸Ñ Ð·Ð²ÑÐºÐ¾Ð²ÑÑ ÑÐ°Ð¹Ð»Ð¾Ð², Ð¾ÑÐ¸ÐµÐ½ÑÐ¸ÑÐ¾Ð²Ð°Ð½Ð½Ð°Ñ Ð½Ð° ÑÐ°Ð±Ð¾ÑÑ Ñ Ð½ÐµÑÐºÐ¾Ð»ÑÐºÐ¸Ð¼Ð¸ Ð´Ð¾ÑÐ¾Ð¶ÐºÐ°Ð¼Ð¸. -Size = 0.0 B +Size = 25,3 MiB [Section.041f] Description = Sesleri kaydetme ve dÃ¼zenleme iÃ§in Ã¶zgÃ¼r, aÃ§Ä±k kaynak ve Ã§apraz platform yazÄ±lÄ±mdÄ±r. -Size = 0,0 B +Size = 25,3 MiB [Section.0804] Description = åè´¹ã å¼æºçã è·¨å¹³å°è½¯ä»¶çå½å¶åç¼è¾å£°é³ã -Size = 0.0 B Modified: trunk/reactos/media/rapps/nirlauncher.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/nirlauncher.tx… ============================================================================== --- trunk/reactos/media/rapps/nirlauncher.txt [iso-8859-1] (original) +++ trunk/reactos/media/rapps/nirlauncher.txt [iso-8859-1] Sun Aug 21 11:45:05 2016 @@ -1,44 +1,42 @@ [Section] Name = NirLauncher -Version = 1.19.97 +Version = 1.19.98 License = Freeware Description = A package of more than 180 utilities for Windows. -Size = 23.1 MiB +Size = 23.6 MiB Category = 12 URLSite = http://launcher.nirsoft.net/ -URLDownload = http://download2.nirsoft.net/nirsoft_package_1.19.97.zip -SHA1 = 37e645bea1503207dbc3eda488bf5eec916f9a40 +URLDownload = http://svn.reactos.org/packages/nirsoft_package_1.19.98.zip +SHA1 = 003458ee09b034884c8d5d4753463985a1c16862 CDPath = none [Section.0407] Description = Paket von mehr als 180 Utilities fÃ¼r Windows. -Size = 0,0 B +Size = 23,6 MiB [Section.040c] Description = Un ensemble de plus de 180 utilitaires pour Windows. -Size = 0,0 o +Size = 23,6 Mio [Section.0a] License = Gratuita Description = Un paquete con mÃ¡s de 180 utilidades. -Size = 0.0 B [Section.0418] License = GratuitÄ Description = Pachet cu peste 180 de utilitare. -Size = 0,0 o +Size = 23,6 Mio [Section.0419] License = ÐÐµÑÐ¿Ð»Ð°ÑÐ½Ð¾ Description = ÐÐ°ÐºÐµÑ Ð¸Ð· Ð±Ð¾Ð»ÐµÐµ ÑÐµÐ¼ 180 ÑÑÐ¸Ð»Ð¸Ñ Ð´Ð»Ñ Windows. -Size = 0.0 B +Size = 23,6 MiB [Section.041f] License = Ãcretsiz Description = Windows iÃ§in 180 araÃ§tan daha Ã§oÄunun bir paketi. -Size = 0,0 B +Size = 23,6 MiB [Section.0804] Description = è¶è¿ 180 å®ç¨ç¨åºå¯ç¨äº Windows çä¸æ´å¥è¡å¨ã -Size = 0.0 B Modified: trunk/reactos/media/rapps/tahoma.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/tahoma.txt?rev… ============================================================================== --- trunk/reactos/media/rapps/tahoma.txt [iso-8859-1] (original) +++ trunk/reactos/media/rapps/tahoma.txt [iso-8859-1] Sun Aug 21 11:45:05 2016 @@ -6,66 +6,59 @@ Size = 305.1 KiB Category = 14 URLSite = http://support.microsoft.com/ -URLDownload = http://download.microsoft.com/download/office97pro/fonts/1/w95/en-us/tahoma… +URLDownload = http://linux4u.jinr.ru/pub/win9x/fonts/tahoma32.exe SHA1 = 888ce7b7ab5fd41f9802f3a65fd0622eb651a068 CDPath = none [Section.0407] License = Unbekannt Description = Tahoma Font Pack, der von einigen Anwendungen benÃ¶tigt wird (Steam). Beinhaltet: Tahoma.ttf, Tahomabd.ttf. -Size = 0,0 B +Size = 305,1 KiB [Section.0a] License = Desconocida Description = Paquete tipogrÃ¡fico Tahoma, necesario para ciertas aplicaciones (como Steam). Incluye: Tahoma.ttf, Tahomabd.ttf. -Size = 0.0 B [Section.040c] License = Inconnue Description = Package pour la police Tahoma, nÃ©cessaire pour certaines applications (Steam). Contient: Tahoma.ttf, Tahomabd.ttf. -Size = 0,0 o +Size = 305,1 Kio [Section.0410] Description = Il font pack Tahoma Ã¨ richiesto da alcune applicazioni (Steam). Contiene: Tahoma.ttf, Tahomabd.ttf. -Size = 0.0 B [Section.0413] License = Ongekend Description = Tahoma lettertypes gebruikt door een aantal programma's (Steam). Bevat: Tahoma.ttf, Tahomabt.ttf. -Size = 0.0 B [Section.0415] Description = Pakiet Czcionki Tahoma wymagany przez niektÃ³re programy (np. Steam). Zawiera: Tahoma.ttf, Tahomabd.ttf. -Size = 0.0 B [Section.0418] License = NespecificatÄ Description = Pachetul Tahoma Font, necesar unor aplicaÈii (Steam). ConÈine: Tahoma.ttf, Tahomabd.ttf. -Size = 0,0 o +Size = 305,1 Kio [Section.0419] License = ÐÐµÐ¸Ð·Ð²ÐµÑÑÐ½Ð¾ Description = ÐÐ°ÐºÐµÑ Tahoma ÑÑÐ¸ÑÑÐ¾Ð². ÐÐµÐ¾Ð±ÑÐ¾Ð´Ð¸Ð¼ Ð´Ð»Ñ Ð½ÐµÐºÐ¾ÑÐ¾ÑÑÑ Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ð¹. Ð¡Ð¾Ð´ÐµÑÐ¶Ð¸Ñ: Tahoma.ttf, Tahomabd.ttf. -Size = 0.0 B +Size = 305,1 KiB [Section.041f] Name = Microsoft Tahoma YazÄ± Tipi License = Bilinmiyor Description = Tahoma YazÄ± Tipi paketi, Steam gibi birtakÄ±m uygulamalar iÃ§in gereklidir. ÅunlarÄ± iÃ§erir: Tahoma.ttf, Tahomabd.ttf. -Size = 0,0 B +Size = 305,1 KiB [Section.0422] License = ÐÐµÐ²ÑÐ´Ð¾Ð¼Ð° Description = ÐÐ°ÐºÐµÑ ÑÑÐ¸ÑÑÑÐ² Tahoma, ÑÐ¾ Ð½ÐµÐ¾Ð±ÑÑÐ´Ð½Ñ Ð´ÐµÑÐºÐ¸Ð¼ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð°Ð¼ (Steam). Ð²ÐºÐ»ÑÑÐ°Ñ: Tahoma.ttf, Tahomabd.ttf. -Size = 0.0 B [Section.0804] License = æªç¥ Description = Tahoma åä½åæéçä¸äºåºç¨ç¨åº (Steam)ãåå«: Tahoma.ttfï¼Tahomabd.ttfã -Size = 0.0 B [Section.0813] License = Ongekend Description = Tahoma lettertypes gebruikt door een aantal programma's (Steam). Bevat: Tahoma.ttf, Tahomabt.ttf. -Size = 0.0 B Modified: trunk/reactos/media/rapps/watercolor.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/watercolor.txt… ============================================================================== --- trunk/reactos/media/rapps/watercolor.txt [iso-8859-1] (original) +++ trunk/reactos/media/rapps/watercolor.txt [iso-8859-1] Sun Aug 21 11:45:05 2016 @@ -6,30 +6,29 @@ Size = 861.1 KiB Category = 15 URLSite = http://www.neowin.net/forum/topic/32604-watercolor-v43/ -URLDownload = http://homepage.ntlworld.com/sherry.ponting/Junk/Watercolor43.exe +URLDownload = https://uploads.s.zeid.me/Watercolor/Watercolor43.exe SHA1 = 069be12175d80a0f3c76daa5b90eeca8f547dd28 CDPath = none [Section.0407] Description = Ein Windows Design basierend auf dem Aussehenvon Windows Codename Whistler. -Size = 0,0 B +Size = 861,1 KiB [Section.0418] License = GratuitÄ Description = O temÄ pentru Windows bazatÄ pe Windows Codename Whistler. -Size = 0,0 o +Size = 861,1 Kio [Section.0419] License = ÐÐµÑÐ¿Ð»Ð°ÑÐ½Ð¾ Description = Windows ÑÐµÐ¼Ð°, Ð¾ÑÐ½Ð¾Ð²Ð°Ð½Ð½Ð°Ñ Ð½Ð° Windows Codename Whistler. -Size = 0.0 B +Size = 861,1 KiB [Section.041f] License = Ãcretsiz Description = Windows Codename Whistler gÃ¶rÃ¼nÃ¼mÃ¼ tabanlÄ± bir Windows temasÄ±. -Size = 0,0 B +Size = 861,1 KiB [Section.0804] Description = åºäº Windows ä»£å· Whistler çå¤è§ç Windows ä¸»é¢ã -Size = 0.0 B

1 0

[akhaldi] 72402: [TRANSLATIONS] Japanese translation of control panel applets by Katayama Hirofumi MZ. CORE-11882
by akhaldi＠svn.reactos.org 21 Aug '16

21 Aug '16

Author: akhaldi Date: Sun Aug 21 10:40:42 2016 New Revision: 72402 URL: http://svn.reactos.org/svn/reactos?rev=72402&view=rev Log: [TRANSLATIONS] Japanese translation of control panel applets by Katayama Hirofumi MZ. CORE-11882 Added: trunk/reactos/dll/cpl/appwiz/lang/ja-JP.rc (with props) trunk/reactos/dll/cpl/console/lang/ja-JP.rc (with props) trunk/reactos/dll/cpl/input/lang/ja-JP.rc (with props) trunk/reactos/dll/cpl/intl/lang/ja-JP.rc (with props) trunk/reactos/dll/cpl/mmsys/lang/ja-JP.rc (with props) trunk/reactos/dll/cpl/usrmgr/lang/ja-JP.rc (with props) trunk/reactos/dll/cpl/wined3dcfg/lang/ja-JP.rc (with props) Modified: trunk/reactos/dll/cpl/appwiz/appwiz.rc trunk/reactos/dll/cpl/console/console.rc trunk/reactos/dll/cpl/input/input.rc trunk/reactos/dll/cpl/intl/intl.rc trunk/reactos/dll/cpl/mmsys/mmsys.rc trunk/reactos/dll/cpl/usrmgr/usrmgr.rc trunk/reactos/dll/cpl/wined3dcfg/wined3dcfg.rc Modified: trunk/reactos/dll/cpl/appwiz/appwiz.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/appwiz.rc?r… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/appwiz.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/appwiz/appwiz.rc [iso-8859-1] Sun Aug 21 10:40:42 2016 @@ -54,6 +54,9 @@ #ifdef LANGUAGE_IT_IT #include "lang/it-IT.rc" #endif +#ifdef LANGUAGE_JA_JP + #include "lang/ja-JP.rc" +#endif #ifdef LANGUAGE_NB_NO #include "lang/no-NO.rc" #endif Added: trunk/reactos/dll/cpl/appwiz/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/ja-JP.… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/lang/ja-JP.rc (added) +++ trunk/reactos/dll/cpl/appwiz/lang/ja-JP.rc [iso-8859-1] Sun Aug 21 10:40:42 2016 @@ -0,0 +1,81 @@ +LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT + +IDD_FIRSTPAGE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "ãªã³ã¯ã®ä½æ" +FONT 9, "MS UI Gothic", 0, 0, 0x0 +BEGIN + LTEXT "ããã¹ã1", -1, 115, 15, 160, 24 + LTEXT "ããã¹ã2", -1, 115, 35, 160, 17 +END + +IDD_SUBMIT_REPORT DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "ãªã³ã¯ã®ä½æ" +FONT 9, "MS UI Gothic", 0, 0, 0x0 +BEGIN + LTEXT "ããã¹ã1",-1,10,0,225,40 + LTEXT "ããã¹ã2",-1,10,40,120,20 + LTEXT "ããã¹ã3",-1,10,55,120,20 +END + +IDD_SHORTCUT_LOCATION DIALOGEX 0, 0, 340, 200 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "ã·ã§ã¼ãã«ããã®ä½æ" +FONT 9, "MS UI Gothic", 0, 0, 0x0 +BEGIN + LTEXT "ãã®ã¦ã£ã¶ã¼ãã¯ããã¼ã«ã«ã¾ãã¯ãããã¯ã¼ã¯ããã°ã©ã ããã¡ã¤ã«ããã©ã«ãã¼ãã³ã³ãã¥ã¼ã¿ã¼ãã¾ãã¯ã¤ã³ã¿ã¼ããã ã¢ãã¬ã¹ã¸ã®ã·ã§ã¼ãã«ãããä½æããã®ãå©ãã¾ãã", -1, 120, 15, 200, 30 + LTEXT "é ç®ã®ä½ç½®ãå¥åãã¦ä¸ãã:", -1, 120, 50, 120, 10 + EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT + PUSHBUTTON "åç§...", IDC_SHORTCUT_BROWSE, 272, 65, 55, 15, ES_LEFT + LTEXT "æ¬¡ã¸ãã¯ãªãã¯ããã¨ç¶è¡ãã¾ãã", -1, 120, 97, 162, 10 +END + +IDD_SHORTCUT_FINISH DIALOGEX 0, 0, 340, 200 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "ããã°ã©ã ã®ã¿ã¤ãã«ãé¸æãã¾ã" +FONT 9, "MS UI Gothic", 0, 0, 0x0 +BEGIN + LTEXT "ãã®ã·ã§ã¼ãã«ããã®ååãå¥åãã¦ä¸ãã(&T):", -1, 120, 15, 150, 10 + EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT + LTEXT "å®äºãã¯ãªãã¯ããã¨ã·ã§ã¼ãã«ãããä½æãã¾ãã", -1, 118, 97, 178, 17 +END + +IDD_CONFIG_STARTMENU DIALOGEX 0, 0, 212, 200 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ã·ã§ã¼ãã«ãã/ãã©ã«ãã¼ã®åé¤" +FONT 9, "MS UI Gothic" +BEGIN + LTEXT "ã¹ã¿ã¼ãã¡ãã¥ã¼ããé ç®ãåé¤ããã«ã¯ãé ç®ãé¸æãã¦åé¤ãã¯ãªãã¯ãã¦ä¸ãã(&T)", -1, 10, 10, 192, 16 + CONTROL "ãªã¹ã1", IDC_STARTMENU_TREE, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | + LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 10, 32, 192, 138 + PUSHBUTTON "åé¤(&R)", IDC_REMOVE_ENTRIES, 98, 176, 50, 14, WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "éãã", IDOK, 152, 176, 50, 14, WS_GROUP | WS_TABSTOP +END + +ID_DWL_GECKO_DIALOG DIALOGEX 0, 0, 260, 95 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Wine Geckoã¤ã³ã¹ãã¼ã©ã¼" +FONT 9, "MS UI Gothic" +BEGIN + CONTROL "ReactOSã¯ãHTMLãåãè¾¼ãã ã¢ããªãæ£ããåä½ãããããã«å¿è¦ãªWine Geckoããã±ã¼ã¸ãçºè¦ã§ãã¾ããã§ãããReactOSã¯ãããèªåçã«ãã¦ã³ãã¼ãã»ã¤ã³ã¹ãã¼ã«ã§ãã¾ãã", + ID_DWL_STATUS, "SysLink", 0, 10, 10, 240, 65 + CONTROL "", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER | PBS_SMOOTH, 10, 40, 240, 12 + DEFPUSHBUTTON "ã¤ã³ã¹ãã¼ã«(&I)", ID_DWL_INSTALL, 200, 76, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "ãã£ã³ã»ã«", IDCANCEL, 144, 76, 50, 14, WS_GROUP | WS_TABSTOP +END + +STRINGTABLE +BEGIN + IDS_CPLSYSTEMNAME "ããã°ã©ã ã®è¿½å /åé¤" + IDS_CPLSYSTEMDESCRIPTION "ããã°ã©ã ãã»ããã¢ããããã·ã§ã¼ãã«ãããä½æãã¾ãã" + IDS_CREATE_SHORTCUT "ã·ã§ã¼ãã«ããã®ä½æ" + IDS_ERROR_NOT_FOUND "ãã¡ã¤ã« %s ãçºè¦ã§ãã¾ããã§ããã" +END + +STRINGTABLE +BEGIN + IDS_DOWNLOADING "ãã¦ã³ãã¼ãä¸..." + IDS_INSTALLING "ã¤ã³ã¹ãã¼ã«ä¸..." + IDS_INVALID_SHA "ãã¦ã³ãã¼ããããã¡ã¤ã«ã®ãã§ãã¯ãµã ãåè´ãã¾ãããå£ãããã¡ã¤ã«ã®ã¤ã³ã¹ãã¼ã«ãä¸æ¢ãã¦ãã¾ãã" +END Propchange: trunk/reactos/dll/cpl/appwiz/lang/ja-JP.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/cpl/console/console.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/console.rc… ============================================================================== --- trunk/reactos/dll/cpl/console/console.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/console/console.rc [iso-8859-1] Sun Aug 21 10:40:42 2016 @@ -54,6 +54,9 @@ #ifdef LANGUAGE_IT_IT #include "lang/it-IT.rc" #endif +#ifdef LANGUAGE_JA_JP + #include "lang/ja-JP.rc" +#endif #ifdef LANGUAGE_NB_NO #include "lang/no-NO.rc" #endif Added: trunk/reactos/dll/cpl/console/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/lang/ja-JP… ============================================================================== --- trunk/reactos/dll/cpl/console/lang/ja-JP.rc (added) +++ trunk/reactos/dll/cpl/console/lang/ja-JP.rc [iso-8859-1] Sun Aug 21 10:40:42 2016 @@ -0,0 +1,154 @@ +LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT + +IDD_PROPPAGEOPTIONS DIALOGEX 0, 0, 253, 220 +STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION +CAPTION "ãªãã·ã§ã³" +FONT 9, "MS UI Gothic" +BEGIN + GROUPBOX "ã«ã¼ã½ã«ãµã¤ãº", -1, 7, 7, 120, 70, WS_CHILD | WS_VISIBLE | WS_GROUP + CONTROL "å°(&S)", IDC_RADIO_SMALL_CURSOR, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 20, 90, 10 + CONTROL "ä¸(&M)", IDC_RADIO_MEDIUM_CURSOR, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 40, 90, 10 + CONTROL "å¤§(&L)", IDC_RADIO_LARGE_CURSOR, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 60, 90, 10 + GROUPBOX "è¡¨ç¤ºãªãã·ã§ã³", -1, 133, 7, 112, 70, WS_CHILD | WS_VISIBLE | WS_GROUP + CONTROL "ã¦ã£ã³ãã¦(&W)", IDC_RADIO_DISPLAY_WINDOW, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 142, 20, 70, 10 + CONTROL "ãã«ã¹ã¯ãªã¼ã³(&U)", IDC_RADIO_DISPLAY_FULL, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 142, 40, 70, 10 + GROUPBOX "ã³ãã³ãå±¥æ´", -1, 7, 85, 120, 77, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "ãããã¡ã¼ãµã¤ãº(&B):", -1, 14, 101, 70, 12 + EDITTEXT IDC_EDIT_BUFFER_SIZE, 90, 97, 30, 15, ES_RIGHT | ES_NUMBER | WS_GROUP + CONTROL "", IDC_UPDOWN_BUFFER_SIZE, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | + UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 119, 97, 12, 15 + LTEXT "ãããã¡ã®æ°(&N):", -1, 14, 124, 70, 12 + EDITTEXT IDC_EDIT_NUM_BUFFER, 90, 120, 30, 15, ES_RIGHT | ES_NUMBER | WS_GROUP + CONTROL "", IDC_UPDOWN_NUM_BUFFER, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | + UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 119, 120, 12, 15 + CHECKBOX "å¤ãéè¤åãç ´æ£ãã(&D)", IDC_CHECK_DISCARD_DUPLICATES, 12, 140, 110, 15 + GROUPBOX "ãªãã·ã§ã³ã®ç·¨é", -1, 133, 85, 112, 77, BS_GROUPBOX | WS_CHILD | WS_VISIBLE | WS_GROUP + CHECKBOX "&Quickç·¨éã¢ã¼ã", IDC_CHECK_QUICK_EDIT, 140, 97, 102, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP + CHECKBOX "æ¿å¥ã¢ã¼ã(&I)", IDC_CHECK_INSERT_MODE, 140, 113, 76, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END + +IDD_PROPPAGEFONT DIALOGEX 0, 0, 253, 220 +STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION +CAPTION "ãã©ã³ã" +FONT 9, "MS UI Gothic" +BEGIN + LTEXT "ã¦ã£ã³ãã¦ã®ãã¬ãã¥ã¼:", -1, 10, 10, 94, 10 + LTEXT "ãµã¤ãº:", -1, 180, 10, 36, 10 + CONTROL "", IDC_STATIC_FONT_WINDOW_PREVIEW, "Static", SS_OWNERDRAW | SS_SUNKEN, 10, 20, 163, 74 + LISTBOX IDC_LBOX_FONTSIZE, 181, 20, 55, 80, LBS_SORT | LBS_HASSTRINGS | WS_VSCROLL + LTEXT "ãã©ã³ã(&F):", -1, 10, 105, 33, 10 + CHECKBOX "å¤ªåã®ãã©ã³ã(&B)", IDC_CHECK_BOLD_FONTS, 56, 105, 60, 10 + LISTBOX IDC_LBOX_FONTTYPE, 10, 120, 110, 40, LBS_SORT | LBS_HASSTRINGS | WS_VSCROLL + GROUPBOX "", IDC_GROUPBOX_FONT_NAME, 6, 156, 241, 50 + CONTROL "", IDC_STATIC_SELECT_FONT_PREVIEW, "Static", SS_OWNERDRAW | SS_SUNKEN, 16, 165, 95, 35 + LTEXT "åæåã¯:", -1, 124, 166, 75, 10 + LTEXT "ã¹ã¯ãªã¼ã³ãã¯ã»ã«ã®å¹\nã¹ã¯ãªã¼ã³ãã¯ã»ã«ã®é«ã", -1, 136, 180, 101, 20 + LTEXT "", IDC_FONT_SIZE_X, 120, 180, 10, 10 + LTEXT "", IDC_FONT_SIZE_Y, 120, 188, 10, 10 +END + +IDD_PROPPAGELAYOUT DIALOGEX 0, 0, 253, 220 +STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION +CAPTION "ã¬ã¤ã¢ã¦ã" +FONT 9, "MS UI Gothic" +BEGIN + LTEXT "ã¦ã£ã³ãã¦ã®ãã¬ãã¥ã¼:", -1, 8, 6, 95, 10 + CONTROL "", IDC_STATIC_LAYOUT_WINDOW_PREVIEW, "Static", SS_SUNKEN | SS_OWNERDRAW, 8, 16, 115, 70 + GROUPBOX "ã¹ã¯ãªã¼ã³ãããã¡ã¼ã®ãµã¤ãº", -1, 130, 12, 115, 50 + LTEXT "å¹(&W):", -1, 140, 28, 40, 10 + LTEXT "é«ã(&H):", -1, 140, 46, 39, 10 + EDITTEXT IDC_EDIT_SCREEN_BUFFER_WIDTH, 203, 25, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP + CONTROL "", IDC_UPDOWN_SCREEN_BUFFER_WIDTH, UPDOWN_CLASS, UDS_NOTHOUSANDS | + UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 238, 25, 13, 14 + EDITTEXT IDC_EDIT_SCREEN_BUFFER_HEIGHT, 203, 42, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP + CONTROL "", IDC_UPDOWN_SCREEN_BUFFER_HEIGHT, UPDOWN_CLASS, UDS_NOTHOUSANDS | + UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 238, 42, 13, 14 + GROUPBOX "ã¦ã£ã³ãã¦ã®ãµã¤ãº", -1, 130, 65, 115, 47 + LTEXT "å¹(&I):", -1, 140, 78, 39, 10 + LTEXT "é«ã(&E):", -1, 140, 95, 37, 10 + EDITTEXT IDC_EDIT_WINDOW_SIZE_WIDTH, 203, 75, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP + CONTROL "", IDC_UPDOWN_WINDOW_SIZE_WIDTH, UPDOWN_CLASS, UDS_NOTHOUSANDS | + UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 238, 75, 13, 14 + EDITTEXT IDC_EDIT_WINDOW_SIZE_HEIGHT, 203, 92, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP + CONTROL "", IDC_UPDOWN_WINDOW_SIZE_HEIGHT, UPDOWN_CLASS, UDS_NOTHOUSANDS | + UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 238, 92, 13, 14 + GROUPBOX "ã¦ã£ã³ãã¦ã®ä½ç½®", -1, 130, 116, 115, 64 + LTEXT "å·¦ãã(&L):", -1, 140, 132, 38, 10 + LTEXT "ä¸ãã(&T):", -1, 140, 149, 40, 10 + EDITTEXT IDC_EDIT_WINDOW_POS_LEFT, 203, 128, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP + CONTROL "", IDC_UPDOWN_WINDOW_POS_LEFT, UPDOWN_CLASS, UDS_NOTHOUSANDS | + UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 238, 128, 13, 14 + EDITTEXT IDC_EDIT_WINDOW_POS_TOP, 203, 146, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP + CONTROL "", IDC_UPDOWN_WINDOW_POS_TOP, UPDOWN_CLASS, UDS_NOTHOUSANDS | + UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 238, 146, 13, 14 + CHECKBOX "ã·ã¹ãã ä½ç½®ã«ãã(&P)", IDC_CHECK_SYSTEM_POS_WINDOW, 137, 165, 104, 10 +END + +IDD_PROPPAGECOLORS DIALOGEX 0, 0, 253, 220 +STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION +CAPTION "è²" +FONT 9, "MS UI Gothic" +BEGIN + CONTROL "ã¹ã¯ãªã¼ã³ ããã¹ã(&T)", IDC_RADIO_SCREEN_TEXT, "Button", BS_AUTORADIOBUTTON | + WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 12, 90, 10 + CONTROL "ã¹ã¯ãªã¼ã³èæ¯è²(&B)", IDC_RADIO_SCREEN_BACKGROUND, "Button", BS_AUTORADIOBUTTON | + WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 24, 90, 10 + CONTROL "ãããã¢ãã ããã¹ã(&P)", IDC_RADIO_POPUP_TEXT, "Button", BS_AUTORADIOBUTTON | + WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 36, 90, 10 + CONTROL "ãããã¢ãã èæ¯è²(&U)", IDC_RADIO_POPUP_BACKGROUND, "Button", BS_AUTORADIOBUTTON | + WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 48, 90, 10 + GROUPBOX "é¸æããè²æå", -1, 105, 6, 140, 60 + LTEXT "èµ¤(&R):", -1, 135, 18, 30, 10 + EDITTEXT IDC_EDIT_COLOR_RED, 175, 16, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP + CONTROL "", IDC_UPDOWN_COLOR_RED, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | + UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 210, 16, 10, 14 + LTEXT "ç·(&G):", -1, 135, 34, 30, 10 + EDITTEXT IDC_EDIT_COLOR_GREEN, 175, 32, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP + CONTROL "", IDC_UPDOWN_COLOR_GREEN, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | + UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 210, 32, 10, 14 + LTEXT "é(&B):", -1, 135, 50, 30, 10 + EDITTEXT IDC_EDIT_COLOR_BLUE, 175, 48, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP + CONTROL "", IDC_UPDOWN_COLOR_BLUE, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | + UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 210, 48, 10, 14 + CONTROL "", IDC_STATIC_COLOR1, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 23, 80, 12, 12 + CONTROL "", IDC_STATIC_COLOR2, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 36, 80, 12, 12 + CONTROL "", IDC_STATIC_COLOR3, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 49, 80, 12, 12 + CONTROL "", IDC_STATIC_COLOR4, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 62, 80, 12, 12 + CONTROL "", IDC_STATIC_COLOR5, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 75, 80, 12, 12 + CONTROL "", IDC_STATIC_COLOR6, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 88, 80, 12, 12 + CONTROL "", IDC_STATIC_COLOR7, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 101, 80, 12, 12 + CONTROL "", IDC_STATIC_COLOR8, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 114, 80, 12, 12 + CONTROL "", IDC_STATIC_COLOR9, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 127, 80, 12, 12 + CONTROL "", IDC_STATIC_COLOR10, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 140, 80, 12, 12 + CONTROL "", IDC_STATIC_COLOR11, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 153, 80, 12, 12 + CONTROL "", IDC_STATIC_COLOR12, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 166, 80, 12, 12 + CONTROL "", IDC_STATIC_COLOR13, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 179, 80, 12, 12 + CONTROL "", IDC_STATIC_COLOR14, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 192, 80, 12, 12 + CONTROL "", IDC_STATIC_COLOR15, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 205, 80, 12, 12 + CONTROL "", IDC_STATIC_COLOR16, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 218, 80, 12, 12 + GROUPBOX "ãã¬ãã¥ã¼ (ã¹ã¯ãªã¼ã³)", -1, 8, 100, 237, 55 + CONTROL "", IDC_STATIC_SCREEN_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 13, 110, 227, 40 + GROUPBOX "ãã¬ãã¥ã¼ (ãããã¢ãã)", -1, 8, 160, 237, 55 + CONTROL "", IDC_STATIC_POPUP_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 13, 170, 227, 40 +END + +IDD_APPLYOPTIONS DIALOGEX 0, 0, 220, 79 +STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION +CAPTION "ããããã£ãé©ç¨ãã" +FONT 9, "MS UI Gothic" +BEGIN + CONTROL "ãã®ã¦ã£ã³ãã¦ã®ã¿ã«ããããã£ãé©ç¨ãã(&A)", IDC_RADIO_APPLY_CURRENT, + "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 12, 12, 207, 10 + CONTROL "åãã¿ã¤ãã«ã®ã¦ã£ã³ãã¦ã«å¯¾ãã¦ããããã£ãä¿åãã(&S)", IDC_RADIO_APPLY_ALL, + "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 12, 31, 207, 10 + PUSHBUTTON "OK", IDOK, 58, 58, 50, 14, WS_VISIBLE + PUSHBUTTON "ãã£ã³ã»ã«", IDCANCEL, 114, 58, 50, 14, WS_VISIBLE +END + +STRINGTABLE +BEGIN + IDS_CPLNAME "ã³ã³ã½ã¼ã«" + IDS_CPLDESCRIPTION "ã³ã³ã½ã¼ã«ããããã£ãè¨å®ãã¾ãã" + IDS_APPLY_SHORTCUT_ALL "ãã®ã¦ã£ã³ãã¦ãéå§ããã·ã§ã¼ãã«ãããç·¨éãã¾ã(&S)" + IDS_RASTERFONTS "ã©ã¹ã¿ã¼ãã©ã³ã" +END Propchange: trunk/reactos/dll/cpl/console/lang/ja-JP.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/cpl/input/input.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/input.rc?rev… ============================================================================== --- trunk/reactos/dll/cpl/input/input.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/input.rc [iso-8859-1] Sun Aug 21 10:40:42 2016 @@ -46,6 +46,9 @@ #ifdef LANGUAGE_IT_IT #include "lang/it-IT.rc" #endif +#ifdef LANGUAGE_JA_JP + #include "lang/ja-JP.rc" +#endif #ifdef LANGUAGE_NB_NO #include "lang/no-NO.rc" #endif Added: trunk/reactos/dll/cpl/input/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/ja-JP.r… ============================================================================== --- trunk/reactos/dll/cpl/input/lang/ja-JP.rc (added) +++ trunk/reactos/dll/cpl/input/lang/ja-JP.rc [iso-8859-1] Sun Aug 21 10:40:42 2016 @@ -0,0 +1,251 @@ +LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT + +IDD_PROPPAGESETTINGS DIALOGEX 0, 0, 254, 228 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "è¨å®" +FONT 9, "MS UI Gothic" +BEGIN + LTEXT "ãªã¹ãã§ç¤ºããã¦ããåå¥åè¨èªã«ãå¸æã®ãµã¼ãã¹ãé¸æãã¦ä¸ããã\nãªã¹ããå¤æ´ããã«ã¯ãè¿½å ã¾ãã¯åé¤ãã¿ã³ããä½¿ããã ããã", -1, 9, 6, 238, 25 + CONTROL "TEXT", IDC_KEYLAYOUT_LIST, "SYSLISTVIEW32", WS_BORDER | WS_VSCROLL | WS_TABSTOP | LVS_SINGLESEL | LVS_NOSORTHEADER | LVS_SHOWSELALWAYS | LVS_REPORT, 8, 36, 237, 101 + PUSHBUTTON "æ¢å®ã«ãã(&S)", IDC_SET_DEFAULT, 101, 159, 144, 14 + PUSHBUTTON "è¿½å (&D)...", IDC_ADD_BUTTON, 27, 142, 70, 14 + PUSHBUTTON "åé¤(&R)", IDC_REMOVE_BUTTON, 101, 142, 70, 14 + PUSHBUTTON "ããããã£(&P)...", IDC_PROP_BUTTON, 175, 142, 70, 14 + GROUPBOX "ãã¬ãã¡ã¬ã³ã¹", -1, 7, 185, 240, 36 + PUSHBUTTON "ãã¼è¨å®(&K)...", IDC_KEY_SET_BTN, 14, 198, 110, 14 +END + +IDD_PROPPAGEADVANCEDSETTINGS DIALOGEX 0, 0, 254, 228 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "ä¸ç´èåãè¨å®" +FONT 9, "MS UI Gothic" +BEGIN + GROUPBOX "ã·ã¹ãã è¨å®", -1, 7, 7, 240, 70 + AUTOCHECKBOX "åé²ã®ããã¹ããµã¼ãã¹ããªãã«ãã(&T)", IDC_TURNOFFTEXTSVCS_CB, 14, 20, 220, 12 + LTEXT "ãã¹ã¦ã®ããã°ã©ã ã§åé²ã®ããã¹ããµã¼ãã¹ããªãã«ããããã«ãã®ãã§ãã¯ããã¯ã¹ãé¸æãã¦ä¸ããã\nããã¯ãè¨èªãã¼ãéããã®ã§ãæ±ã¢ã¸ã¢ã®ã¦ã¼ã¶ã¼ã«ã¯æ¨å¥¨ããã¾ããã", -1, 14, 40, 230, 35 +END + +IDD_KEYSETTINGS DIALOGEX 0, 0, 272, 163 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "ä¸ç´èåãã®ãã¼è¨å®" +FONT 9, "MS UI Gothic" +BEGIN + GROUPBOX "Caps Lockããªãã«ããããã«", -1, 7, 7, 258, 26 + AUTORADIOBUTTON "CAPS &LOCKãã¼ãæ¼ã", IDC_PRESS_CL_KEY_RB, 14, 17, 120, 11, WS_GROUP + AUTORADIOBUTTON "SHIFTãã¼ãæ¼ã(&F)", IDC_PRESS_SHIFT_KEY_RB, 144, 17, 120, 11, NOT WS_TABSTOP + GROUPBOX "å¥åè¨èªã«å¯¾ããããããã¼", -1, 7, 37, 258, 95 + LTEXT "ã¢ã¯ã·ã§ã³", -1, 14, 47, 60, 9 + RTEXT "ãã¼ ã·ã¼ã±ã³ã¹(&K)", -1, 177, 47, 79, 9 + CONTROL "", IDC_KEY_LISTVIEW, "SysListView32", LVS_REPORT | LVS_NOCOLUMNHEADER | LVS_AUTOARRANGE | LVS_SINGLESEL, 14, 57, 244, 52, WS_EX_CLIENTEDGE + PUSHBUTTON "ãã¼ ã·ã¼ã±ã³ã¹ãå¤æ´ãã(&C)...", IDC_CHANGE_KEY_SEQ_BTN, 152, 113, 106, 14, WS_GROUP + DEFPUSHBUTTON "OK", IDOK, 66, 140, 70, 14 + PUSHBUTTON "ãã£ã³ã»ã«", IDCANCEL, 146, 140, 70, 14 +END + +IDD_ADD DIALOGEX 20, 20, 227, 90 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "å¥åè¨èªã®è¿½å " +FONT 9, "MS UI Gothic" +BEGIN + LTEXT "å¥åè¨èª(&I):", -1, 7, 7, 61, 10 + COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 212, 150, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + LTEXT "ãã¼ãã¼ãã¬ã¤ã¢ã¦ã/IME(&K):", -1, 7, 36, 110, 10 + COMBOBOX IDC_KEYBOARD_LO_COMBO, 7, 47, 212, 150, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + DEFPUSHBUTTON "OK", IDOK, 116, 68, 50, 14 + PUSHBUTTON "ãã£ã³ã»ã«", IDCANCEL, 169, 68, 50, 14 +END + +IDD_CHANGE_KEY_SEQ DIALOGEX 5, 100, 230, 125 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "ãã¼ ã·ã¼ã±ã³ã¹ã®å¤æ´" +FONT 9, "MS UI Gothic" +BEGIN + GROUPBOX "", -1, 9, 5, 155, 110 + AUTOCHECKBOX "å¥åè¨èªãåãæ¿ãã(&S)", IDC_SWITCH_INPUT_LANG_CB, 15, 15, 105, 12 + LTEXT "Shift", -1, 73, 37, 27, 12 + CTEXT "+", -1, 62, 37, 8, 9 + AUTORADIOBUTTON "&Ctrl", IDC_CTRL_LANG, 29, 31, 30, 11 + AUTORADIOBUTTON "å·¦&ALT", IDC_LEFT_ALT_LANG, 29, 45, 46, 12 + AUTOCHECKBOX "ãã¼ãã¼ãã¬ã¤ã¢ã¦ããåãæ¿ãã(&W)", IDC_SWITCH_KBLAYOUTS_CB, 16, 65, 141, 12 + LTEXT "Shift", -1, 74, 87, 27, 12 + CTEXT "+", -1, 63, 87, 8, 9 + AUTORADIOBUTTON "C&trl", IDC_CTRL_LAYOUT, 30, 81, 30, 11 + AUTORADIOBUTTON "å·¦A&LT", IDC_LEFT_ALT_LAYOUT, 30, 95, 44, 12 + DEFPUSHBUTTON "OK", IDOK, 172, 9, 50, 14 + PUSHBUTTON "ãã£ã³ã»ã«", IDCANCEL, 172, 27, 50, 14 +END + +IDD_INPUT_LANG_PROP DIALOGEX 20, 20, 227, 75 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "å¥åè¨èªã®ããããã£" +FONT 9, "MS UI Gothic" +BEGIN + LTEXT "å¥åè¨èª:", -1, 7, 7, 61, 8 + LTEXT "", IDC_INPUT_LANG_STR, 73, 7, 129, 8 + LTEXT "ãã¼ãã¼ãã¬ã¤ã¢ã¦ã/IME(&K):", -1, 7, 21, 110, 10 + COMBOBOX IDC_KB_LAYOUT_IME_COMBO, 7, 32, 212, 150, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + DEFPUSHBUTTON "OK", IDOK, 116, 53, 52, 14 + PUSHBUTTON "ãã£ã³ã»ã«", IDCANCEL, 169, 53, 52, 14 +END + +STRINGTABLE +BEGIN + IDS_CPLSYSTEMNAME "ããã¹ããµã¼ãã¹ã¨å¥åè¨èª" + IDS_CPLSYSTEMDESCRIPTION "è¨èªã®ããã¹ãå¥åç¨ã®è¨å®ãã«ã¹ã¿ãã¤ãºããã" + IDS_KEYBOARD "ãã¼ãã¼ã" + IDS_NONE "(ãªã)" + IDS_UNKNOWN "(ä¸æ)" + IDS_RESTART "ä»ããã³ã³ãã¥ã¼ã¿ã¼ãåèµ·åãã¾ããï¼" + IDS_WHATS_THIS "ããã¯ä½ï¼" + IDS_LANGUAGE "è¨èª" + IDS_LAYOUT "ãã¼ãã¼ãã¬ã¤ã¢ã¦ã" + IDS_REM_QUESTION "é¸æãããã¼ãã¼ãã¬ã¤ã¢ã¦ããåé¤ãã¾ããï¼" + IDS_CONFIRMATION "ç¢ºèª" + IDS_LAYOUT_EXISTS "ãã®ã¬ã¤ã¢ã¦ãã¯ãã§ã«åå¨ãã¾ãã" + IDS_LAYOUT_EXISTS2 "ãã®ã¬ã¤ã¢ã¦ãã¯ãã§ã«åå¨ããè¿½å ã§ãã¾ããã" + IDS_CTRL_SHIFT "Ctrl+Shift" + IDS_LEFT_ALT_SHIFT "å·¦Alt+Shift" + IDS_SWITCH_BET_INLANG "å¥åè¨èªã®åãæ¿ã" +END + +STRINGTABLE +BEGIN + IDS_ALBANIAN_LAYOUT "ã¢ã«ããã¢èª" + IDS_ARABIC_101_LAYOUT "ã¢ã©ãã¢èª (101)" + IDS_ARABIC_102_LAYOUT "ã¢ã©ãã¢èª (102)" + IDS_ARABIC_102_AZERTY_LAYOUT "ã¢ã©ãã¢èª (102) AZERTY" + IDS_ARMENIAN_EASTERN_LAYOUT "ã¢ã«ã¡ãã¢èªæ±é¨" + IDS_ARMENIAN_WESTERN_LAYOUT "ã¢ã«ã¡ãã¢èªè¥¿é¨" + IDS_ASSAMESE_LAYOUT "ã¢ããµã èª" + IDS_AZERI_CYRILLIC_LAYOUT "ã¢ã¼ã«ãã¤ã¸ã£ã³èª ããªã«" + IDS_AZERI_LATIN_LAYOUT "ã¢ã¼ã«ãã¤ã¸ã£ã³èª ã©ãã³" + IDS_BELARUSIAN_LAYOUT "ãã©ã«ã¼ã·èª" + IDS_BELGIAN_COMMA_LAYOUT "ãã«ã®ã¼èª (ã³ã³ã)" + IDS_BELGIAN_FRENCH_LAYOUT "ãã«ã®ã¼ãã©ã³ã¹èª" + IDS_BELGIAN_LAYOUT "ãã«ã®ã¼èª (ããªãªã)" + IDS_BENGALI_LAYOUT "ãã³ã¬ã«èª" + IDS_BULGARIAN_LAYOUT "ãã«ã¬ãªã¢èª" + IDS_BULGARIAN_BDS_LAYOUT "ãã«ã¬ãªã¢èª BDS 5237-1978" + IDS_BULGARIAN_LATIN_LAYOUT "ãã«ã¬ãªã¢èª (ã©ãã³)" + IDS_BULGARIAN_PHONETIC_BDS_LAYOUT "ãã«ã¬ãªã¢èª é³ç´ (BDS 5237-1978)" + IDS_BULGARIAN_PHONETIC_CLASSIC_LAYOUT "ãã«ã¬ãªã¢èª é³ç´ (ã¯ã©ã·ãã¯)" + IDS_BURMESE_LAYOUT "ãã«ãèª" + IDS_CANADIAN_FRENCH_LAYOUT "ã«ãããã©ã³ã¹èª" + IDS_CANADIAN_FRENCH_LEGACY_LAYOUT "ã«ãããã©ã³ã¹èª (ã¬ã¬ã·ã¼)" + IDS_CANADIAN_MULTILINGUAL_STD_LAYOUT "ã«ãã å¤è¨èªæ¨æº" + IDS_CANTONESE_PHONETIC_LAYOUT "åºæ±èª é³ç´ " + IDS_CHINESE_SIMPLIFIED_MSPINYINIME30_LAYOUT "ä¸å½èª (ç°¡ä½å) - Microsoft Pinyin IME 3.0" + IDS_CHINESE_SIMPLIFIED_NEIMA_LAYOUT "ä¸å½èª (ç°¡ä½å) - NeiMa" + IDS_CHINESE_SIMPLIFIED_QUANPIN_LAYOUT "ä¸å½èª (ç°¡ä½å) - QuanPin" + IDS_CHINESE_SIMPLIFIED_SHUANGPIN_LAYOUT "ä¸å½èª (ç°¡ä½å) - ShuangPin" + IDS_CHINESE_SIMPLIFIED_USKEYBOARD_LAYOUT "ä¸å½èª (ç°¡ä½å) - USãã¼ãã¼ã" + IDS_CHINESE_SIMPLIFIED_ZHENGMA_LAYOUT "ä¸å½èª (ç°¡ä½å) - ZhengMa" + IDS_CHINESE_TRADITIONAL_ALPHANUMERIC_LAYOUT "ä¸å½èª (ç¹ä½å) - è±æ°å" + IDS_CHINESE_TRADITIONAL_ARRAY_LAYOUT "ä¸å½èª (ç¹ä½å) - Array" + IDS_CHINESE_TRADITIONAL_BIG5CODE_LAYOUT "ä¸å½èª (ç¹ä½å) - Big5 Code" + IDS_CHINESE_TRADITIONAL_CHANGJIE_LAYOUT "ä¸å½èª (ç¹ä½å) - ChangJie" + IDS_CHINESE_TRADITIONAL_DAYI_LAYOUT "ä¸å½èª (ç¹ä½å) - DaYi" + IDS_CHINESE_TRADITIONAL_NEWCHANGJIE_LAYOUT "ä¸å½èª (ç¹ä½å) - New ChangJie" + IDS_CHINESE_TRADITIONAL_NEWPHONETIC_LAYOUT "ä¸å½èª (ç¹ä½å) - æ°é³ç´ " + IDS_CHINESE_TRADITIONAL_PHONETIC_LAYOUT "ä¸å½èª (ç¹ä½å) - é³ç´ " + IDS_CHINESE_TRADITIONAL_QUICK_LAYOUT "ä¸å½èª (ç¹ä½å) - Quick" + IDS_CHINESE_TRADITIONAL_UNICODE_LAYOUT "ä¸å½èª (ç¹ä½å) - Unicode" + IDS_CHINESE_TRADITIONAL_USKEYBOARD_LAYOUT "ä¸å½èª (ç¹ä½å) - USãã¼ãã¼ã" + IDS_CROATIAN_LAYOUT "ã¯ãã¢ãã¢èª" + IDS_CZECH_LAYOUT "ãã§ã³èª" + IDS_CZECH_PROGRAMMERS_LAYOUT "ãã§ã³èª ããã°ã©ãã¼" + IDS_CZECH_QWERTY_LAYOUT "ãã§ã³èª (QWERTY)" + IDS_DANISH_LAYOUT "ãã³ãã¼ã¯èª" + IDS_DEVANAGARI_INSCRIPT_LAYOUT "ãããã¬ãªã¼ - INSCRIPT" + IDS_DIVEHI_PHONETIC_LAYOUT "ãã£ããèª é³ç´ " + IDS_DIVEHI_TYPEWRITER_LAYOUT "ãã£ããèª ã¿ã¤ãã©ã¤ã¿ã¼" + IDS_DUTCH_LAYOUT "ãªã©ã³ãèª" + IDS_ESTONIAN_LAYOUT "ã¨ã¹ããã¢èª" + IDS_FAEROESE_LAYOUT "ãã§ãã¼èª" + IDS_FARSI_LAYOUT "ç¾ä»£ãã«ã·ã£èª" + IDS_FINNISH_LAYOUT "ãã£ã³ã©ã³ãèª" + IDS_FRENCH_LAYOUT "ãã©ã³ã¹èª" + IDS_GAELIC_LAYOUT "ã²ã¼ã«èª" + IDS_GEORGIAN_LAYOUT "ã¸ã§ã¼ã¸ã¢èª" + IDS_GERMAN_LAYOUT "ãã¤ãèª" + IDS_GERMAN_DE_ERGO_LAYOUT "ãã¤ãèª (de_ergo)" + IDS_GERMAN_IBM_LAYOUT "ãã¤ãèª (IBM)" + IDS_GERMAN_NEO_11_LAYOUT "ãã¤ãèª (NEO-1.1)" + IDS_GERMAN_RISTOME_LAYOUT "ãã¤ãèª (RISTOME)" + IDS_GREEK_LAYOUT "ã®ãªã·ã£èª" + IDS_GREEK_220_LAYOUT "ã®ãªã·ã£èª (220)" + IDS_GREEK_220_LATIN_LAYOUT "ã®ãªã·ã£èª (220) ã©ãã³" + IDS_GREEK_319_LAYOUT "ã®ãªã·ã£èª (319)" + IDS_GREEK_319_LATIN_LAYOUT "ã®ãªã·ã£èª (319) ã©ãã³" + IDS_GREEK_LATIN_LAYOUT "ã®ãªã·ã£èª ã©ãã³" + IDS_GREEK_POLYTONIC_LAYOUT "ã®ãªã·ã£èª ããªãããã¯" + IDS_GUJARATI_LAYOUT "ã°ã¸ã£ã©ã¼ãèª" + IDS_HEBREW_LAYOUT "ããã©ã¤èª" + IDS_HINDI_TRADITIONAL_LAYOUT "ãã³ãã£ã¼èª ãã©ãã£ãã·ã§ãã«" + IDS_HUNGARIAN_LAYOUT "ãã³ã¬ãªã¼èª" + IDS_HUNGARIAN_101_KEY_LAYOUT "ãã³ã¬ãªã¼èª 101ãã¼" + IDS_ICELANDIC_LAYOUT "ã¢ã¤ã¹ã©ã³ãèª" + IDS_IRISH_LAYOUT "ã¢ã¤ã«ã©ã³ãèª" + IDS_ITALIAN_LAYOUT "ã¤ã¿ãªã¢èª" + IDS_ITALIAN_142_LAYOUT "ã¤ã¿ãªã¢èª (142)" + IDS_JAPANESE_LAYOUT "æ¥æ¬èª" + IDS_JAPANESE_INPUT_SYSTEM_MSIME2002_LAYOUT "æ¥æ¬èªå¥åã·ã¹ãã (MS-IME2002)" + IDS_KANNADA_LAYOUT "ã«ã³ããèª" + IDS_KAZAKH_LAYOUT "ã«ã¶ãèª" + IDS_KOREAN_LAYOUT "æé®®/éå½" + IDS_KOREAN_INPUT_SYSTEM_MSIME2002_LAYOUT "æé®®/éå½å¥åã·ã¹ãã (MS-IME2002)" + IDS_KYRGYZ_CYRILLIC_LAYOUT "ãã«ã®ã¹èª ããªã«" + IDS_LATIN_AMERICAN_LAYOUT "ã©ãã³ã¢ã¡ãªã«" + IDS_LATVIAN_LAYOUT "ã©ããã¢èª" + IDS_LATVIAN_QWERTY_LAYOUT "ã©ããã¢èª (QWERTY)" + IDS_LITHUANIAN_LAYOUT "ãªãã¢ãã¢èª" + IDS_LITHUANIAN_IBM_LAYOUT "ãªãã¢ãã¢èª IBM" + IDS_FYRO_MACEDONIAN_LAYOUT "FYROãã±ããã¢èª" + IDS_MALAYALAM_LAYOUT "ãã©ã¤ã¼ã©ã èª" + IDS_MARATHI_LAYOUT "ãã©ã¼ãã£ã¼èª" + IDS_MONGOLIAN_CYRILLIC_LAYOUT "ã¢ã³ã´ã«èª ããªã«" + IDS_NORWEGIAN_LAYOUT "ãã«ã¦ã§ã¼èª" + IDS_ORIYA_LAYOUT "ãªãªã¤ã¼èª" + IDS_POLISH_214_LAYOUT "ãã¼ã©ã³ãèª (214)" + IDS_POLISH_LAYOUT "ãã¼ã©ã³ãèª (ããã°ã©ãã¼)" + IDS_PORTUGUESE_LAYOUT "ãã«ãã¬ã«èª" + IDS_PORTUGUESE_BRAZILIAN_ABNT_LAYOUT "ãã«ãã¬ã«èª (ãã©ã¸ã«ABNT)" + IDS_PORTUGUESE_BRAZIL_ABNT2_LAYOUT "ãã«ãã¬ã«èª (ãã©ã¸ã«ABNT2)" + IDS_PUNJABI_LAYOUT "ãã³ã¸ã£ãèª" + IDS_ROMANIAN_LAYOUT "ã«ã¼ããã¢èª" + IDS_RUSSIAN_LAYOUT "ãã·ã¢èª" + IDS_RUSSIAN_TYPEWRITER_LAYOUT "ãã·ã¢èª (ã¿ã¤ãã©ã¤ã¿ã¼)" + IDS_SERBIAN_CYRILLIC_LAYOUT "ã»ã«ãã¢èª (ããªã«)" + IDS_SERBIAN_LATIN_LAYOUT "ã»ã«ãã¢èª (ã©ãã³)" + IDS_SLOVAK_LAYOUT "ã¹ãããã¢èª" + IDS_SLOVAK_QWERTY_LAYOUT "ã¹ãããã¢èª (QWERTY)" + IDS_SLOVENIAN_LAYOUT "ã¹ãããã¢èª" + IDS_SPANISH_LAYOUT "ã¹ãã¤ã³èª" + IDS_SPANISH_VARIANTION_LAYOUT "ã¹ãã¤ã³èª ããªã¨ã¼ã·ã§ã³" + IDS_SWEDISH_LAYOUT "ã¹ã¦ã§ã¼ãã³èª" + IDS_SWISS_FRENCH_LAYOUT "ã¹ã¤ã¹ãã©ã³ã¹èª" + IDS_SWISS_GERMAN_LAYOUT "ã¹ã¤ã¹ãã¤ãèª" + IDS_SYRIAC_LAYOUT "ã·ãªã¢èª" + IDS_SYRIAC_PHONETIC_LAYOUT "ã·ãªã¢èª é³ç´ " + IDS_TAMIL_LAYOUT "ã¿ãã¼ã«èª" + IDS_TATAR_LAYOUT "ã¿ã¿ã¼ã«èª" + IDS_TELUGU_LAYOUT "ãã«ã°èª" + IDS_THAI_KEDMANEE_LAYOUT "ã¿ã¤èª Kedmanee" + IDS_THAI_KEDMANEE_NONSHIFTLOCK_LAYOUT "ã¿ã¤èª Kedmanee (non-ShiftLock)" + IDS_THAI_PATTACHOTE_LAYOUT "ã¿ã¤èª Pattachote" + IDS_THAI_PATTACHOTE_NONSHIFTLOCK_LAYOUT "ã¿ã¤èª Pattachote (non-ShiftLock)" + IDS_TURKISH_F_LAYOUT "ãã«ã³èªF" + IDS_TURKISH_Q_LAYOUT "ãã«ã³èªQ" + IDS_UKRAINIAN_LAYOUT "ã¦ã¯ã©ã¤ãèª" + IDS_UKRAINIAN_STUDENT_LAYOUT "ã¦ã¯ã©ã¤ãèª (å¦ç)" + IDS_UNITED_KINGDOM_LAYOUT "è±å½" + IDS_UNITED_STATES_DVIRAK_LAYOUT "ç±³å½ - Dvorak" + IDS_UNITED_STATES_DVORAK_FOR_LEFT_HAND_LAYOUT "ç±³å½ - Dvorakå·¦æç¨" + IDS_UNITED_STATES_DVORAK_FOR_RIGHT_HAND_LAYOUT "ç±³å½ - Dvorakå³æç¨" + IDS_UNITED_STATES_INTERNATIONAL_LAYOUT "ç±³å½ - ã¤ã³ã¿ã¼ãã·ã§ãã«" + IDS_URDU_LAYOUT "ã¦ã«ãã¥ã¼èª" + IDS_US_LAYOUT "ç±³å½" + IDS_USENG_TABLE_IBM_ARABIC238L_LAYOUT "ç±³å½è±èªãã¼ãã« (IBMã¢ã©ãã¢èª238_Lç¨)" + IDS_UZBEK_CYRILLIC_LAYOUT "ã¦ãºãã¯èª ããªã«" + IDS_VIETNAMESE_LAYOUT "ãããã èª" +END Propchange: trunk/reactos/dll/cpl/input/lang/ja-JP.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/cpl/intl/intl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/intl.rc?rev=7… ============================================================================== --- trunk/reactos/dll/cpl/intl/intl.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/intl.rc [iso-8859-1] Sun Aug 21 10:40:42 2016 @@ -41,6 +41,9 @@ #ifdef LANGUAGE_IT_IT #include "lang/it-IT.rc" #endif +#ifdef LANGUAGE_JA_JP + #include "lang/ja-JP.rc" +#endif #ifdef LANGUAGE_NB_NO #include "lang/no-NO.rc" #endif Added: trunk/reactos/dll/cpl/intl/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/ja-JP.rc… ============================================================================== --- trunk/reactos/dll/cpl/intl/lang/ja-JP.rc (added) +++ trunk/reactos/dll/cpl/intl/lang/ja-JP.rc [iso-8859-1] Sun Aug 21 10:40:42 2016 @@ -0,0 +1,216 @@ +LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT + +IDD_GENERALPAGE DIALOGEX 0, 0, 246, 230 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "å°åã®ãªãã·ã§ã³" +FONT 9, "MS UI Gothic" +BEGIN + GROUPBOX "æ¨æºã¨å½¢å¼", -1, 5, 5, 234, 162 + LTEXT "ãã®ãªãã·ã§ã³ã¯ãããã¤ãã®ããã°ã©ã ã«ããæ°å¤ãéè²¨ãæ¥ä»ãæéã®æ¸å¼è¨å®ã«å½±é¿ãã¾ãã", -1, 14, 17, 220, 25 + LTEXT "ããããã£ã«ä¸è´ããé ç®ãé¸æããããããªãèªèº«ã®å½¢å¼ãé¸ã¶ããã«ã«ã¹ã¿ãã¤ãºãã¯ãªãã¯ãã¦ä¸ãã(&S):", -1, 14, 37, 220, 22 + COMBOBOX IDC_LANGUAGELIST, 14, 56, 160, 160, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + PUSHBUTTON "ã«ã¹ã¿ãã¤ãº(&Z)...", IDC_SETUP_BUTTON, 178, 56, 52, 13 + LTEXT "ãµã³ãã«", -1, 14, 73, 70, 10 + LTEXT "æ°å¤:", -1, 16, 86, 48, 10 + LTEXT "éè²¨:", -1, 16, 101, 48, 10 + LTEXT "æé:", -1, 16, 116, 48, 10 + LTEXT "çãæ¥ä»:", -1, 16, 131, 48, 10 + LTEXT "é·ãæ¥ä»:", -1, 16, 146, 48, 10 + EDITTEXT IDC_NUMSAMPLE_EDIT, 89, 86, 140, 12, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP | NOT WS_TABSTOP + EDITTEXT IDC_MONEYSAMPLE_EDIT, 89, 101, 140, 12, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP | NOT WS_TABSTOP + EDITTEXT IDC_TIMESAMPLE_EDIT, 89, 116, 140, 12, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP | NOT WS_TABSTOP + EDITTEXT IDC_SHORTTIMESAMPLE_EDIT, 89, 131, 140, 12, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP | NOT WS_TABSTOP + EDITTEXT IDC_FULLTIMESAMPLE_EDIT, 89, 146, 140, 12, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP | NOT WS_TABSTOP + GROUPBOX "å ´æ", -1, 5, 172, 234, 55 + LTEXT "ããã¤ãã®ãµã¼ãã¹ãããªãã«å°åæå ±ï¼ä¾ãã°ãã¥ã¼ã¹ãå¤©æ°æå ±ï¼ãæä¾ã§ããããã«ããªãã®å ´æãã»ããã¢ãããã¦ä¸ãã(&T)", -1, 14, 184, 210, 24 + COMBOBOX IDC_LOCATION_COMBO, 14, 207, 217, 160, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT +END + +IDD_LANGUAGESPAGE DIALOGEX 0, 0, 246, 230 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "è¨èª" +FONT 9, "MS UI Gothic" +BEGIN + GROUPBOX "ããã¹ãå¥åè¨èªã¨ãµã¼ãã¹", -1, 5, 5, 234, 52 + LTEXT "è¨èªãããã¯ããã¹ãå¥åæ¹å¼ï¼IMEï¼ãè¡¨ç¤ºã¾ãã¯å¤æ´ããã«ã¯""è©³ç´°...""ãæ¼ãã¦ä¸ããã", -1, 12, 15, 220, 18 + PUSHBUTTON "è©³ç´°(&T)...", IDC_DETAIL_BUTTON, 177, 34, 54, 14 + GROUPBOX "è¿½å çãªè¨èªãµãã¼ã", -1, 5, 62, 234, 82 + LTEXT "ã»ã¨ãã©ã®è¨èªã¯ããã©ã«ãã§ã¤ã³ã¹ãã¼ã«æ¸ã¿ã§ããè¿½å çãªè¨èªãã¤ã³ã¹ãã¼ã«ããã«ã¯ãæ¬¡ã®é©åãªãã§ãã¯ããã¯ã¹ãé¸æãã¦ä¸ããã", -1, 12, 72, 220, 18 + AUTOCHECKBOX "è¤éãªã¹ã¯ãªãããå³ããå·¦èªã¿ã®è¨èªãã¤ã³ã¹ãã¼ã«ãã(&N)", IDC_INST_FILES_FOR_RTOL_LANG, 12, 92, 215, 22, BS_MULTILINE | BS_TOP + AUTOCHECKBOX "æ±ã¢ã¸ã¢è¨èªã®ãã¡ã¤ã«ãã¤ã³ã¹ãã¼ã«ãã(&S)", IDC_INST_FILES_FOR_ASIAN, 12, 114, 180, 22, BS_MULTILINE | BS_TOP +END + +IDD_ADVANCEDPAGE DIALOGEX 0, 0, 246, 230 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "ä¸ç´èåã" +FONT 9, "MS UI Gothic" +BEGIN + GROUPBOX "éUnicodeããã°ã©ã ç¨ã®è¨èª", -1, 5, 5, 234, 90 + COMBOBOX IDC_LANGUAGE_COMBO, 14, 75, 217, 160, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT + LTEXT "ãã®ã·ã¹ãã è¨å®ã¯ãéUnicodeããã°ã©ã ãã¡ãã¥ã¼ããã¤ã¢ãã°ããã®å°åã®è¨èªã§è¡¨ç¤ºãããã¨ãå¯è½ã«ãã¾ããããã¯ãUnicodeããã°ã©ã ã«ã¯å½±é¿ãã¾ãããããã®ã³ã³ãã¥ã¼ã¿ã¼ã®ãã¹ã¦ã®ã¦ã¼ã¶ã¼ã«é©ç¨ããã¾ãã", -1, 14, 18, 223, 33 + LTEXT "ä½¿ãããéUnicodeããã°ã©ã ã®è¨èªãã¼ã¸ã§ã³ã«ä¸è´ããè¨èªãé¸ãã§ä¸ãã(&S):", -1, 14, 55, 223, 18 + GROUPBOX "ã³ã¼ããã¼ã¸å¤æè¡¨(&C)", -1, 5, 101, 234, 88 + CONTROL "", IDC_CONV_TABLES, "SysListView32", LVS_REPORT | LVS_SORTASCENDING | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP, 14, 114, 217, 70 + GROUPBOX "æ¢å®ã®ã¦ã¼ã¶ã¼ã¢ã«ã¦ã³ãè¨å®", -1, 5, 193, 234, 32 + AUTOCHECKBOX "å¨è¨å®ãç¾å¨ã®ã¦ã¼ã¶ã¼ã¢ã«ã¦ã³ãã¨æ¢å®ã«é©ç¨ãã(&D)", IDC_APPLY_CUR_USER_DEF_PROFILE, 12, 201, 220, 22, BS_MULTILINE | BS_TOP +END + +IDD_NUMBERSPAGE DIALOGEX 0, 0, 246, 234 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "æ°å¤" +FONT 9, "MS UI Gothic" +BEGIN + GROUPBOX "è¡¨ç¤ºä¾", -1, 7, 7, 230, 53, WS_CHILD | WS_VISIBLE + LTEXT "æ£ã®å¤:", -1, 13, 21, 31, 10, WS_CHILD | WS_VISIBLE | WS_GROUP + EDITTEXT IDC_NUMBERSPOSSAMPLE, 43, 19, 72, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP | NOT WS_TABSTOP + LTEXT "è² ã®å¤:", -1, 120, 21, 31, 10, WS_CHILD | WS_VISIBLE | WS_GROUP + EDITTEXT IDC_NUMBERSNEGSAMPLE, 154, 19, 72, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP | NOT WS_TABSTOP + LTEXT "å°æ°ç¹ã®è¨å·(&D):", -1, 8, 67, 96, 10, WS_CHILD | WS_VISIBLE | WS_GROUP + COMBOBOX IDC_NUMBERDSYMBOL, 137, 65, 100, 83, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + LTEXT "å°æ°ç¹ä»¥ä¸ã®æ¡æ°(T):", -1, 8, 83, 96, 10, WS_CHILD | WS_VISIBLE | WS_GROUP + COMBOBOX IDC_NUMBERSNDIGDEC, 137, 81, 100, 83, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + LTEXT "åºåãè¨å·(&G):", -1, 8, 100, 96, 10, WS_CHILD | WS_VISIBLE | WS_GROUP + COMBOBOX IDC_NUMBERSDIGITGRSYM, 137, 97, 100, 83, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + LTEXT "æ¡åºåã(&I):", -1, 8, 117, 96, 10, WS_CHILD | WS_VISIBLE | WS_GROUP + COMBOBOX IDC_NUMBERSDGROUPING, 137, 113, 100, 83, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + LTEXT "è² ã®ç¬¦å·(&E):", -1, 8, 134, 96, 10, WS_CHILD | WS_VISIBLE | WS_GROUP + COMBOBOX IDC_NUMBERSNSIGNSYM, 137, 129, 100, 83, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + LTEXT "è² ã®å¤ã®å½¢å¼(&F):", -1, 8, 149, 100, 10, WS_CHILD | WS_VISIBLE | WS_GROUP + COMBOBOX IDC_NUMBERSNNUMFORMAT, 137, 145, 100, 83, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + LTEXT "ã¼ãã®è¡¨ç¤º(&Z):", -1, 8, 166, 96, 10, WS_CHILD | WS_VISIBLE | WS_GROUP + COMBOBOX IDC_NUMBERSDISPLEADZER, 137, 161, 100, 83, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + LTEXT "æ¡åºåã(&L):", -1, 8, 181, 96, 10, WS_CHILD | WS_VISIBLE | WS_GROUP + COMBOBOX IDC_NUMBERSLSEP, 137, 177, 100, 83, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + LTEXT "åä½ç³»(&M):", -1, 8, 197, 96, 10, WS_CHILD | WS_VISIBLE | WS_GROUP + COMBOBOX IDC_NUMBERSMEASSYS, 137, 193, 100, 83, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL +END + +IDD_CURRENCYPAGE DIALOGEX 0, 0, 246, 234 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "éè²¨" +FONT 9, "MS UI Gothic" +BEGIN + GROUPBOX "è¡¨ç¤ºä¾", -1, 7, 7, 230, 33, WS_CHILD | WS_VISIBLE + LTEXT "æ£ã®å¤:", -1, 13, 21, 27, 10, WS_CHILD | WS_VISIBLE | WS_GROUP + EDITTEXT IDC_CURRENCYPOSSAMPLE, 43, 19, 72, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP | NOT WS_TABSTOP + LTEXT "è² ã®å¤:", -1, 120, 21, 30, 10, WS_CHILD | WS_VISIBLE | WS_GROUP + EDITTEXT IDC_CURRENCYNEGSAMPLE, 154, 19, 72, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP | NOT WS_TABSTOP + LTEXT "éè²¨è¨å·(&C):", -1, 10, 51, 121, 10, WS_CHILD | WS_VISIBLE | WS_GROUP + COMBOBOX IDC_CURRENCYSYMBOL, 134, 49, 100, 83, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + LTEXT "æ£ã®å¤ã®å½¢å¼(&P):", -1, 10, 68, 121, 10, WS_CHILD | WS_VISIBLE | WS_GROUP + COMBOBOX IDC_CURRENCYPOSVALUE, 134, 66, 100, 83, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + LTEXT "è² ã®å¤ã®å½¢å¼(&N):", -1, 10, 85, 121, 10, WS_CHILD | WS_VISIBLE | WS_GROUP + COMBOBOX IDC_CURRENCYNEGVALUE, 134, 83, 100, 83, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + LTEXT "å°æ°ç¹ã®è¨å·(&D):", -1, 10, 111, 121, 10, WS_CHILD | WS_VISIBLE | WS_GROUP + COMBOBOX IDC_CURRENCYDECSEP, 134, 109, 100, 83, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + LTEXT "æ¡åºåãã®æ¡æ°(&N):", -1, 10, 128, 121, 10, WS_CHILD | WS_VISIBLE | WS_GROUP + COMBOBOX IDC_CURRENCYDECNUM, 134, 126, 100, 83, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + LTEXT "æ¡åºåãã®è¨å·(&G):", -1, 10, 156, 121, 10, WS_CHILD | WS_VISIBLE | WS_GROUP + COMBOBOX IDC_CURRENCYGRPSEP, 134, 154, 100, 83, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + LTEXT "æ¡åºåã(&I):", -1, 10, 173, 121, 10, WS_CHILD | WS_VISIBLE | WS_GROUP + COMBOBOX IDC_CURRENCYGRPNUM, 134, 171, 100, 83, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL +END + +IDD_TIMEPAGE DIALOGEX 0, 0, 246, 234 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Time" +FONT 9, "MS UI Gothic" +BEGIN + GROUPBOX "è¡¨ç¤ºä¾", -1, 7, 7, 230, 33, WS_CHILD | WS_VISIBLE + LTEXT "æå»ã®ä¾:", -1, 13, 21, 54, 10, WS_CHILD | WS_VISIBLE | WS_GROUP + EDITTEXT IDC_TIMESAMPLE, 68, 19, 84, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP | NOT WS_TABSTOP + LTEXT "æå»ã®å½¢å¼(&T):", -1, 13, 52, 130, 10, WS_CHILD | WS_VISIBLE | WS_GROUP + COMBOBOX IDC_TIMEFORMAT, 149, 50, 84, 100, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP + LTEXT "æå»ã®åºåã(&S):", -1, 13, 70, 130, 10, WS_VISIBLE | WS_GROUP + COMBOBOX IDC_TIMESEPARATOR, 149, 68, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP + LTEXT "ååã®è¨å·(&M):", -1, 13, 88, 130, 10, WS_VISIBLE | WS_GROUP + COMBOBOX IDC_TIMEAMSYMBOL, 149, 86, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP + LTEXT "åå¾ã®è¨å·(&P):", -1, 13, 106, 130, 10, WS_VISIBLE | WS_GROUP + COMBOBOX IDC_TIMEPMSYMBOL, 149, 104, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP + GROUPBOX "", -1, 7, 140, 230, 80, WS_VISIBLE + LTEXT "æå»å½¢å¼ã®è¡¨è¨æ³\n\n\ +h = æ m = å s = ç§ t = ååã¾ãã¯åå¾\n\n\ +h = 12æéå¶ H = 24æéå¶\n\ +hh, mm, ss = åé ã«ã¼ããã h, m, s = åé ã«ã¼ããªã", -1, 13, 150, 214, 50, WS_CHILD | WS_VISIBLE | WS_GROUP +END + +IDD_DATEPAGE DIALOGEX 0, 0, 246, 234 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "æ¥ä»" +FONT 9, "MS UI Gothic" +BEGIN + GROUPBOX "ã«ã¬ã³ãã¼", -1, 7, 7, 230, 74 + LTEXT "å¹´ã2æ¡ã§å¥åãããããæ¬¡ã®ç¯å²åã®å¹´ã¨è¦ãªãã¾ã(&Y):", -1, 13, 18, 215, 8 + EDITTEXT IDC_FIRSTYEAR_EDIT, 13, 30, 36, 12, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_DISABLED + LTEXT "ï½", -1, 55, 32, 17, 8 + EDITTEXT IDC_SECONDYEAR_EDIT, 77, 30, 36, 12, ES_LEFT | ES_NUMBER | WS_GROUP + CONTROL "",IDC_SCR_MAX_YEAR, "msctls_updown32", UDS_NOTHOUSANDS | UDS_WRAP | UDS_SETBUDDYINT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_CHILD | WS_VISIBLE, 113, 30, 10, 12 + LTEXT "æ¦ã®ç¨®é¡(&C):", -1, 13, 48, 56, 10 + COMBOBOX IDC_CALTYPE_COMBO, 77, 46, 153, 100, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_DISABLED + LTEXT "ã ã¹ãªã æ´(&M):", -1, 13, 65, 60, 12 + COMBOBOX IDC_HIJCHRON_COMBO, 77, 64, 153, 100, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_DISABLED + GROUPBOX "çãæ¥ä»", -1, 7, 83, 230, 81 + LTEXT "ä¾:", -1, 13, 95, 63, 10 + EDITTEXT IDC_SHRTDATESAMPLE_EDIT, 77, 93, 153, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP | NOT WS_TABSTOP + LTEXT "ä¾ - å³ããå·¦èªã¿:", -1, 13, 109, 60, 16 + EDITTEXT IDC_SHRTDATERTOL_EDIT, 77, 111, 153, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP | NOT WS_TABSTOP | WS_DISABLED + LTEXT "çãæ¥ä»å½¢å¼(&S):", -1, 13, 131, 60, 10 + COMBOBOX IDC_SHRTDATEFMT_COMBO, 77, 129, 153, 100, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE + LTEXT "æ¥ä»ã®åºåãè¨å·(&D):", -1, 13, 148, 113, 10 + COMBOBOX IDC_SHRTDATESEP_COMBO, 180, 146, 51, 100, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE + GROUPBOX "é·ãæ¥ä»", -1, 7, 167, 230, 64 + LTEXT "ä¾:", -1, 13, 179, 61, 10 + EDITTEXT IDC_LONGDATESAMPLE_EDIT, 77, 177, 153, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP | NOT WS_TABSTOP + LTEXT "ä¾ - å³ããå·¦èªã¿:", -1, 13, 193, 61, 16 + EDITTEXT IDC_LONGDATERTOL_EDIT, 77, 195, 153, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP | NOT WS_TABSTOP | WS_DISABLED + LTEXT "é·ãæ¥ä»å½¢å¼(&L):", -1, 13, 215, 60, 10 + COMBOBOX IDC_LONGDATEFMT_COMBO, 77, 213, 153, 100, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE +END + +IDD_SORTPAGE DIALOGEX 0, 0, 246, 234 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "ä¸¦ã¹æ¿ã" +FONT 9, "MS UI Gothic" +BEGIN + GROUPBOX "ä¸¦ã¹æ¿ã", -1, 7, 7, 230, 74 + LTEXT "ä¸¦ã¹æ¿ãæ¹å¼ã¯ãæåãåèªããã¡ã¤ã«ããã©ã«ãã¼ã®ä¸¦ã¹æ¿ãé ãå®ç¾©ãã¾ãã", -1, 14, 17, 220, 25 + LTEXT "ããªãã®è¨èªã®ä¸¦ã¹æ¿ãæ¹å¼ãé¸ãã§ä¸ãã:", -1, 14, 37, 220, 22 + COMBOBOX IDC_SORTLIST_COMBO, 14, 56, 217, 83, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL +END + +STRINGTABLE +BEGIN + IDS_CUSTOMIZE_TITLE "å°åã®ãªãã·ã§ã³ã®ã«ã¹ã¿ãã¤ãº" + IDS_SPAIN "ã¹ãã¤ã³èª (ã¹ãã¤ã³)" + IDS_METRIC "ã¡ã¼ãã«æ³" + IDS_IMPERIAL "ã¤ã¼ããã³ãæ³" +END + +STRINGTABLE +BEGIN + IDS_CPLNAME "å°åã®ãªãã·ã§ã³" + IDS_CPLDESCRIPTION "è¨èªã¨ãæ°å¤ãéè²¨ãæå»ãæ¥ä»ã®å½¢å¼ãé¸ãã§ä¸ããã" +END + +STRINGTABLE +BEGIN + IDS_APPLY_DEFAULT_TITLE "æ¢å®ã®è¨å®ãå¤æ´ãã" + IDS_APPLY_DEFAULT_TEXT "è¨å®ã¯ãæ¢å®ã®ã¦ã¼ã¶ã¼ã¢ã«ã¦ã³ãã«é©ç¨ããã¾ãã\n\n\ +ãã®å¤æ´ã¯ããã°ãªã³ã¹ã¯ãªã¼ã³ã¨æ°ããã¦ã¼ã¶ã¼ã¢ã«ã¦ã³ãã«é©ç¨ããã¾ãã\n\ +å¤æ´ãä»ã®ã·ã¹ãã ãµã¼ãã¹ã«é©ç¨ããããã«ãã³ã³ãã¥ã¼ã¿ã¼ãåèµ·åããªããã°ããã¾ããã" +END + +STRINGTABLE +BEGIN + IDS_ERROR "ã¨ã©ã¼" + IDS_ERROR_SYMBOL_SEPARATE "çãæ¥ä»ã®åºåãã¯ä¸æ£ãªè¨å·ãå«ãã§ãã¾ã" + IDS_ERROR_SYMBOL_FORMAT_SHORT "çãæ¥ä»ã®å½¢å¼ã¯ä¸æ£ãªè¨å·ãå«ãã§ãã¾ã" + IDS_ERROR_SYMBOL_FORMAT_LONG "é·ãæ¥ä»ã®å½¢å¼ã¯ä¸æ£ãªè¨å·ãå«ãã§ãã¾ã" + IDS_ERROR_OEM_CODE_PAGE "OEMã³ã¼ããã¼ã¸ã®èªã¿è¾¼ã¿ã«åé¡ãããã¾ãã" + IDS_ERROR_ANSI_CODE_PAGE "ANSIã³ã¼ããã¼ã¸ã®èªã¿è¾¼ã¿ã«åé¡ãããã¾ãã" + IDS_ERROR_INT_KEY_REG "åé¡ã®éãã¦ãããã¼: HKCU\\Control Panel\\International" + IDS_ERROR_DEF_INT_KEY_REG "åé¡ã®éãã¦ãããã¼: HKU\\.DEFAULT\\Control Panel\\International" + IDS_ERROR_NLS_KEY_REG "åé¡ã®éãã¦ãããã¼: HKLM\\SYSTEM\\CurrentControlSet\\Control\\NLS\\Language" + IDS_ERROR_NLS_CODE_REG "åé¡ã®éãã¦ãããã¼: HKLM\\SYSTEM\\CurrentControlSet\\Control\\NLS\\CodePage" + IDS_ERROR_INPUT_DLL "input.dllãéå§ã§ãã¾ãã" +END Propchange: trunk/reactos/dll/cpl/intl/lang/ja-JP.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/cpl/mmsys/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/ja-JP.r… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/lang/ja-JP.rc (added) +++ trunk/reactos/dll/cpl/mmsys/lang/ja-JP.rc [iso-8859-1] Sun Aug 21 10:40:42 2016 @@ -0,0 +1,267 @@ +LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT + +IDD_VOLUME DIALOGEX 0, 0, 246, 228 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "é³é" +FONT 9, "MS UI Gothic" +BEGIN + ICON IDI_CPLICON, IDI_CPLICON, 8, 5, 32, 32 + LTEXT "", IDC_DEVICE_NAME, 40, 10, 194, 20 + GROUPBOX "ããã¤ã¹ã®é³é", -1, 7, 30, 230, 100 + CONTROL "", IDC_MUTE_ICON, "Static", SS_ICON | WS_VISIBLE, 17, 45, 32, 32 + CONTROL "", IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | TBS_ENABLESELRANGE | TBS_BOTTOM | TBS_HORZ | WS_TABSTOP, 65, 45, 140, 14 + LTEXT "ä½", -1, 62, 66, 30, 9 + LTEXT "é«", -1, 195, 66, 30, 9 + CHECKBOX "ãã¥ã¼ã(&M)", IDC_MUTE_CHECKBOX, 50, 78, 140, 10 + CHECKBOX "ã¿ã¹ã¯ãã¼ã«é³éã¢ã¤ã³ã³ãç½®ã(&I)", IDC_ICON_IN_TASKBAR, 50, 92, 140, 10 + PUSHBUTTON "ä¸ç´èåã(&V)...", IDC_ADVANCED_BTN, 150, 105, 75, 15 + GROUPBOX "ã¹ãã¼ã«ã¼ã®è¨å®", IDC_SPEAKER_SET_BTN, 7, 140, 230, 80 + CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 4, 155, 70, 70 + LTEXT "åå¥ã®ã¹ãã¼ã«ã¼ã®é³éããã®ä»ã®è¨å®ãå¤æ´ããããã«ä¸ã®è¨å®ããä½¿ãä¸ããã", -1, 70, 155, 150, 36 + PUSHBUTTON "ã¹ãã¼ã«ã¼é³é(&S)...", IDC_SPEAKER_VOL_BTN, 70, 195, 75, 15 + PUSHBUTTON "ä¸ç´èåã(&D)...", IDC_ADVANCED2_BTN, 150, 195, 75, 15 +END + +IDD_SOUNDS DIALOGEX 0, 0, 246, 228 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "é³é" +FONT 9, "MS UI Gothic" +BEGIN + LTEXT "é³å£°ã¹ãã¼ã ã¯ãReactOSã¨ããã°ã©ã ã§ã¤ãã³ãã«é©ç¨ãããé³å£°ã®ã»ããã§ãããã§ã«åå¨ããã¹ãã¼ã ããããã¯å¤æ´ãä¿åããã¹ãã¼ã ãé¸æã§ãã¾ãã", -1, 8, 7, 230, 30 + LTEXT "é³å£°ã¹ãã¼ã (&C):", -1, 8, 42, 150, 9 + COMBOBOX IDC_SOUND_SCHEME, 8, 53, 230, 46, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "ä¿å(&E)...", IDC_SAVEAS_BTN, 134, 70, 50, 15 + PUSHBUTTON "åé¤(&D)", IDC_DELETE_BTN, 188, 70, 50, 15 + LTEXT "é³å£°ãå¤æ´ããã«ã¯ãä»¥ä¸ã®ãªã¹ãããããã°ã©ã ã¤ãã³ããã¯ãªãã¯ãã¦é©ç¨ããé³å£°ãé¸æãã¦ä¸ãããå¤æ´ãæ°ããé³å£°ã¹ãã¼ã ã¨ãã¦ä¿åã§ãã¾ãã", -1, 8, 90, 230, 27 + LTEXT "ããã°ã©ã ã¤ãã³ã(&P):", -1, 8, 118, 150, 9 + CONTROL "", IDC_SCHEME_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 8, 130, 230, 60, WS_EX_CLIENTEDGE + LTEXT "é³å£°(&S):", IDC_TEXT_SOUND, 8, 194, 80, 9, WS_DISABLED + COMBOBOX IDC_SOUND_LIST, 8, 205, 155, 146, CBS_DROPDOWNLIST | CBS_DISABLENOSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED + PUSHBUTTON "", IDC_PLAY_SOUND, 168, 205, 15, 15, WS_DISABLED | BS_ICON + PUSHBUTTON "åç§(&B)...", IDC_BROWSE_SOUND, 188, 205, 50, 15, WS_DISABLED +END + +IDD_AUDIO DIALOGEX 0, 0, 246, 228 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "ãªã¼ãã£ãª" +FONT 9, "MS UI Gothic" +BEGIN + GROUPBOX "é³å£°ãã¬ã¤ããã¯", -1, 7, 7, 230, 60 + ICON IDI_CPLICON, IDI_CPLICON, 15, 20, 32, 32 + LTEXT "æ¢å®ã®ããã¤ã¹(&D):", -1, 50, 20, 80, 9 + COMBOBOX IDC_DEVICE_PLAY_LIST, 50, 30, 180, 46, CBS_DROPDOWNLIST + PUSHBUTTON "é³é(&V)...", IDC_VOLUME1_BTN, 85, 47, 70, 15 + PUSHBUTTON "ä¸ç´èåã(&N)...", IDC_ADV2_BTN, 160, 47, 70, 15 + GROUPBOX "é³å£°é²é³", -1, 7, 75, 230, 60 + ICON IDI_MICROPHONE_ICON, IDI_MICROPHONE_ICON, 15, 88, 32, 32 + LTEXT "æ¢å®ã®ããã¤ã¹(&E):", -1, 50, 88, 80, 9 + COMBOBOX IDC_DEVICE_REC_LIST, 50, 98, 180, 46, CBS_DROPDOWNLIST + PUSHBUTTON "é³é(&O)...", IDC_VOLUME2_BTN, 85, 115, 70, 15 + PUSHBUTTON "ä¸ç´èåã(&C)...", IDC_ADV1_BTN, 160, 115, 70, 15 + GROUPBOX "MIDIé³æ¥½ãã¬ã¤ããã¯", -1, 7, 145, 230, 60 + ICON IDI_MIDICON, IDI_MIDICON, 15, 158, 32, 32 + LTEXT "æ¢å®ã®ããã¤ã¹(&F):", -1, 50, 158, 80, 9 + COMBOBOX IDC_DEVICE_MIDI_LIST, 50, 168, 180, 46, CBS_DROPDOWNLIST + PUSHBUTTON "é³é(&M)...", IDC_VOLUME3_BTN, 85, 185, 70, 15 + PUSHBUTTON "ããã«ã¤ãã¦(&B)...", IDC_ADV3_BTN, 160, 185, 70, 15 + CHECKBOX "æ¢å®ã®ããã¤ã¹ã®ã¿ãä½¿ã(&U)", IDC_DEFAULT_DEV_CHECKBOX, 7, 212, 140, 10 +END + +IDD_VOICE DIALOGEX 0, 0, 246, 228 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "é³å£°" +FONT 9, "MS UI Gothic" +BEGIN + LTEXT "ãããã®è¨å®ã¯ãããªããé¸æããé³å£°ãã¬ã¤ããã¯ã¨é²é³ããã¤ã¹ã®ãé³éã¨ãã®ä»ã®ãªãã·ã§ã³ãå¶å¾¡ãã¾ãã", -1, 8, 7, 230, 40 + GROUPBOX "é³å£°ãã¬ã¤ããã¯", -1, 7, 37, 230, 60 + ICON IDI_CPLICON, IDI_CPLICON, 15, 50, 32, 32 + LTEXT "æ¢å®ã®ããã¤ã¹(&D):", -1, 50, 50, 80, 9 + COMBOBOX IDC_DEVICE_VOICE_LIST, 50, 60, 180, 46, CBS_DROPDOWNLIST + PUSHBUTTON "é³é(&V)...", IDC_VOLUME4_BTN, 85, 77, 70, 15 + PUSHBUTTON "ä¸ç´èåã(&N)...", IDC_ADV4_BTN, 160, 77, 70, 15 + GROUPBOX "é³å£°é²é³", -1, 7, 105, 230, 60 + ICON IDI_MICROPHONE_ICON, IDI_MICROPHONE_ICON, 15, 118, 32, 32 + LTEXT "æ¢å®ã®ããã¤ã¹(&E):", -1, 50, 118, 80, 9 + COMBOBOX IDC_DEVICE_VOICE_REC_LIST, 50, 128, 180, 46, CBS_DROPDOWNLIST + PUSHBUTTON "é³é(&O)...", IDC_VOLUME5_BTN, 85, 145, 70, 15 + PUSHBUTTON "ä¸ç´èåã(&C)...", IDC_ADV5_BTN, 160, 145, 70, 15 + PUSHBUTTON "ãã¼ãã¦ã§ã¢ã®ãã¹ã(&T)...", IDC_TEST_HARDWARE, 160, 175, 70, 15 +END + +IDD_HARDWARE DIALOGEX 0, 0, 246, 228 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "ãã¼ãã¦ã§ã¢" +FONT 9, "MS UI Gothic" +BEGIN +END + +IDD_SAVE_SCHEME_AS DIALOGEX 9, 23, 225, 54 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "ååãä»ãã¦ã¹ãã¼ã ãä¿å" +FONT 9, "MS UI Gothic" +BEGIN + LTEXT "ãã®é³å£°ã¹ãã¼ã ãæ¬¡ã®ååã§ä¿åãã(&S):", -1, 7, 7, 212, 9 + EDITTEXT 8960, 7, 17, 211, 14, ES_AUTOHSCROLL + DEFPUSHBUTTON "OK", IDOK, 93, 36, 60, 14 + PUSHBUTTON "ãã£ã³ã»ã«", IDCANCEL, 157, 36, 60, 14 +END + +IDD_SPEAKERS DIALOGEX 0, 0, 257, 204 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "ã¹ãã¼ã«ã¼" +FONT 9, "MS UI Gothic" +BEGIN + ICON 4379, -1, 7, 8, 20, 20 + LTEXT "ãã®ã³ã³ãã¥ã¼ã¿ã¼ã«æãåã£ãã¹ãã¼ã«ã¼è¨å®ãé¸æãã¦ä¸ããã", -1, 36, 8, 215, 27 + CONTROL 110, 5376, "STATIC", SS_BITMAP | SS_CENTERIMAGE, 37, 40, 209, 112, WS_EX_TRANSPARENT + LTEXT "ã¹ãã¼ã«ã¼è¨å®(&P):", 8502, 53, 169, 55, 10 + COMBOBOX 5401, 52, 182, 170, 200, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP +END + +IDD_PERFORMANCE1 DIALOGEX 0, 0, 257, 218 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "ããã©ã¼ãã³ã¹" +FONT 9, "MS UI Gothic" +BEGIN + LTEXT "ãããã®è¨å®ã¯ãReactOSãã©ã®ããã«ãªã¼ãã£ãªãåçããããå¶å¾¡ãã¾ãããããã¯ãªã¼ãã£ãªé¢é£ã®åé¡ã®ãã©ãã«ã·ã¥ã¼ãã£ã³ã°ãå©ãã¾ãã", 8492, 34, 7, 218, 23 + GROUPBOX "ãªã¼ãã£ãª ãã¬ã¤ããã¯", 8494, 7, 32, 243, 152 + ICON 4379, 8512, 8, 8, 20, 20 + LTEXT "ãã¼ãã¦ã§ã¢ ã¢ã¯ã»ã©ã¬ã¼ã·ã§ã³(&H):", 8495, 13, 56, 111, 14 + CONTROL "ã¹ã©ã¤ãã¼1", 5395, "MSCTLS_TRACKBAR32", WS_GROUP | WS_TABSTOP | 0x00000401, 150, 54, 62, 18 + LTEXT "ãµã³ãã«ã¬ã¼ãå¤æåè³ª(&S):", 8496, 13, 123, 103, 14 + CONTROL "ã¹ã©ã¤ãã¼1", 5396, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 150, 121, 62, 18 + PUSHBUTTON "æ¢å®å¤ãå¾©åãã(&R)", 5400, 7, 191, 110, 14 + LTEXT "ãªã", 8497, 128, 56, 21, 10 + LTEXT "ãã«", 8498, 214, 56, 21, 9 + LTEXT "è¯", 8499, 128, 123, 21, 10 + LTEXT "æè¯", 8500, 214, 123, 23, 9 + LTEXT "ãã®æååã¯ãã£ããã£ã¼ããã¤ã¹ã®ãã¼ãã¦ã§ã¢è¨å®ãè¨è¿°ãã¾ã", 5399, 13, 145, 227, 21 + LTEXT "ãã®æååã¯ã¬ã³ãã¼ããã¤ã¹ã®ãã¼ãã¦ã§ã¢è¨å®ãè¨è¿°ãã¾ã", 5398, 13, 78, 227, 22 +END + +IDD_PERFORMANCE2 DIALOGEX 0, 0, 257, 218 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "ããã©ã¼ãã³ã¹" +FONT 9, "MS UI Gothic" +BEGIN + LTEXT "ãããã®è¨å®ã¯ãReactOSãã©ã®ããã«ãªã¼ãã£ãªãé²é³ããããå¶å¾¡ãã¾ãããããã¯ãªã¼ãã£ãªé¢é£ã®åé¡ã®ãã©ãã«ã·ã¥ã¼ãã£ã³ã°ãå©ãã¾ãã", 8492, 34, 7, 217, 20 + GROUPBOX "ãªã¼ãã£ãªé²é³", 8494, 7, 29, 242, 122 + ICON 4380, 8512, 8, 7, 20, 20 + LTEXT "ãã¼ãã¦ã§ã¢ ã¢ã¯ã»ã©ã¬ã¼ã·ã§ã³(&H):", 8495, 13, 46, 103, 9 + CONTROL "ã¹ã©ã¤ãã¼1", 5395, "MSCTLS_TRACKBAR32", WS_GROUP | WS_TABSTOP | 0x00000401, 150, 43, 62, 18 + LTEXT "ãµã³ãã«ã¬ã¼ãå¤æåè³ª(&S):", 8496, 13, 103, 103, 9 + CONTROL "ã¹ã©ã¤ãã¼1", 5396, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 150, 101, 62, 18 + PUSHBUTTON "æ¢å®å¤ãå¾©åãã(&R)", 5400, 9, 158, 110, 14 + LTEXT "ãªã", 8497, 125, 46, 24, 10 + LTEXT "ãã«", 8498, 217, 46, 19, 9 + LTEXT "è¯", 8499, 125, 103, 24, 10 + LTEXT "æè¯", 8500, 217, 103, 19, 9 + LTEXT "ãã®æååã¯ãã£ããã£ã¼ããã¤ã¹ã®ãã¼ãã¦ã§ã¢è¨å®ãè¨è¿°ãã¾ã", 5399, 13, 125, 222, 21 + LTEXT "ãã®æååã¯ã¬ã³ãã¼ããã¤ã¹ã®ãã¼ãã¦ã§ã¢è¨å®ãè¨è¿°ãã¾ã", 5398, 13, 68, 218, 24 +END + +IDD_SETUP1 DIALOGEX 0, 0, 227, 206 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "ã»ããã¢ãã" +FONT 9, "MS UI Gothic" +BEGIN + GROUPBOX "ReactOSãªã¼ãã£ãª", 10243, 7, 5, 213, 192 + ICON 4393, 10241, 26, 26, 20, 20 + LTEXT "ãã®ã³ã³ãã¥ã¼ã¿ã¼ã¯ãReactOSãªã¼ãã£ãªãµã¼ãã¹ãæå¹ã§ãªãããããªã¼ãã£ãªãåçã§ãã¾ããã", 10245, 60, 25, 150, 40 + AUTOCHECKBOX "ReactOSãªã¼ãã£ãªãæå¹ã«ãã(&E)", 10253, 60, 68, 150, 9 + LTEXT "æ³¨æ", 10246, 58, 87, 150, 11 + LTEXT "1. ãã®ãµã¼ãã¹ãæå¹ã«ããã«ã¯ç®¡çèæ¨©éãå¿è¦ã§ããããç®¡çèã¨ãã¦ãã°ãªã³ãã¦ããªããã°ãç®¡çèã®ååã¨ãã¹ã¯ã¼ããè¦æ±ãããã§ãããã", 10247, 60, 100, 150, 40 + LTEXT "2. ReactOSãªã¼ãã£ãªãæå¹ã«ããå¾ãã³ã³ãã¥ã¼ã¿ã¼åèµ·åããå¿è¦ãããã¾ãã", 10248, 60, 140, 150, 40 +END + +IDD_MULTICHANNEL DIALOGEX 0, 0, 227, 218 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "ãã«ããã£ã³ãã«" +FONT 9, "MS UI Gothic" +BEGIN + LTEXT "è¨è¿°ã¯ããããå§ã¾ãã¾ãã", 9506, 8, 4, 212, 24 + LTEXT "ä½", 9473, 65, 31, 14, 8 + LTEXT "", 9472, 5, 31, 55, 8 + CONTROL "ã¹ã©ã¤ãã¼1", 9475, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 29, 108, 17 + LTEXT "é«", 9474, 202, 31, 17, 8 + LTEXT "ä½", 9477, 65, 50, 14, 8 + LTEXT "", 9476, 5, 50, 55, 8 + CONTROL "ã¹ã©ã¤ãã¼1", 9479, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 48, 108, 17 + LTEXT "é«", 9478, 202, 50, 17, 8 + LTEXT "ä½", 9481, 65, 69, 14, 8 + LTEXT "", 9480, 5, 69, 55, 8 + CONTROL "ã¹ã©ã¤ãã¼1", 9483, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 67, 108, 17 + LTEXT "é«", 9482, 202, 69, 17, 8 + LTEXT "ä½", 9485, 65, 88, 14, 8 + LTEXT "", 9484, 5, 88, 55, 8 + CONTROL "ã¹ã©ã¤ãã¼1", 9487, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 86, 108, 17 + LTEXT "é«", 9486, 202, 88, 17, 8 + LTEXT "ä½", 9489, 65, 107, 14, 8 + LTEXT "", 9488, 5, 107, 55, 8 + CONTROL "ã¹ã©ã¤ãã¼1", 9491, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 105, 108, 17 + LTEXT "é«", 9490, 202, 107, 17, 8 + LTEXT "ä½", 9493, 65, 126, 14, 8 + LTEXT "", 9492, 5, 126, 55, 8 + CONTROL "ã¹ã©ã¤ãã¼1", 9495, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 124, 108, 17 + LTEXT "é«", 9494, 202, 126, 17, 8 + LTEXT "ä½", 9497, 65, 145, 14, 8 + LTEXT "", 9496, 5, 145, 55, 8 + CONTROL "ã¹ã©ã¤ãã¼1", 9499, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 143, 108, 17 + LTEXT "é«", 9498, 202, 145, 17, 8 + LTEXT "ä½", 9501, 65, 164, 14, 8 + LTEXT "", 9500, 5, 164, 55, 8 + CONTROL "ã¹ã©ã¤ãã¼1", 9503, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 162, 108, 17 + LTEXT "é«", 9502, 202, 164, 17, 8 + AUTOCHECKBOX "åæã«ãã¹ã¦ã®ã¹ã©ã¤ãã¼ãåãã(&M)", 9504, 5, 185, 216, 9 + PUSHBUTTON "æ¢å®å¤ãå¾©åãã(&D)", 9505, 110, 199, 110, 14 +END + +IDD_SETUP2 DIALOGEX 0, 0, 227, 206 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "ã»ããã¢ãã" +FONT 9, "MS UI Gothic" +BEGIN + GROUPBOX "ReactOSãªã¼ãã£ãª", 10259, 7, 5, 213, 192 + ICON 4394, 10257, 25, 25, 20, 20 + LTEXT "ç¾å¨ãReactOSãªã¼ãã£ãª ãµã¼ãã¹ã¯æå¹ã§ããããããReactOSãåèµ·åããã¾ã§ãªã¼ãã£ãªã¯æ£å¸¸ã«æ©è½ãã¾ãããããä»ããåèµ·åããããã°ãããªãã®ä½æ¥åå®¹ãä¿åãããã¹ã¦ã®ããã°ã©ã ãéãã¦ä¸ããã", 10261, 60, 25, 150, 50 + LTEXT "ReactOSãåèµ·åããã«ã¯ãOKãã¯ãªãã¯ãã¦ä¸ããã", 10262, 60, 75, 150, 20 + LTEXT "ãããã£ã³ã»ã«ããã°ãReactOSãªã¼ãã£ãªãæ£å¸¸ã«æ©è½ãããããã«ãå¾ã§åèµ·åããå¿è¦ãããã¾ãã", 10263, 60, 100, 150, 40 +END + +STRINGTABLE +BEGIN + IDS_CPLNAME "é³å£°ã¨ãªã¼ãã£ãª ããã¤ã¹" + IDS_CPLDESCRIPTION "ã³ã³ãã¥ã¼ã¿ã¼ã®é³å£°ã¹ãã¼ã ãå¤æ´ããããã¹ãã¼ã«ã¼ã¨é²é³ããã¤ã¹ã®è¨å®ãå¤æ´ãã¾ãã" + IDS_NO_SOUND "(ãªã)" + IDS_NO_DEVICES "ããã¤ã¹ãããã¾ãã" + 5825 "ããã°ã©ã ã¨ã©ã¼" + 5826 "ããã°ã©ã ãéãã" + 5827 "éå¤§ãªããããªã¼è¦åé³" + 5828 "ããã¤ã¹æ¥ç¶" + 5829 "ããã¤ã¹æ¥ç¶åæ" + 5830 "ããã¤ã¹æ¥ç¶ã®å¤±æ" + 5831 "ã´ãç®±ãç©ºã«ãã" + 5832 "ä½ããããªã¼è¦åé³" + 5833 "æå¤§å" + 5834 "ã¡ãã¥ã¼ ã³ãã³ã" + 5835 "ã¡ãã¥ã¼ ãããã¢ãã" + 5836 "æå°å" + 5837 "æ°çã¡ã¼ã«ã®éç¥" + 5838 "ããã²ã¼ã·ã§ã³ã®éå§" + 5839 "ããã°ã©ã ãéã" + 5840 "å°å·å®äº" + 5841 "ä¸ã«æ»ã" + 5842 "ä¸ã«æ»ã" + 5843 "ã¢ã¹ã¿ãªã¹ã¯" + 5844 "æ¢å®ã®é³å£°" + 5845 "æåç¬¦" + 5846 "ReactOSã®çµäº" + 5847 "éå¤§ãªåæ¢" + 5848 "ã·ã¹ãã éç¥" + 5849 "è³ªå" + 5850 "ReactOSã®éå§" + 5851 "ã¡ãã¥ã¼ã®éå§" + 5852 "ReactOSãã°ãªã" + 5853 "ReactOSãã°ãªã³" + 5854 "ReactOSã¨ã¯ã¹ããã¼ã©ã¼" +END Propchange: trunk/reactos/dll/cpl/mmsys/lang/ja-JP.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/cpl/mmsys/mmsys.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/mmsys.rc?rev… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/mmsys.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/mmsys.rc [iso-8859-1] Sun Aug 21 10:40:42 2016 @@ -95,6 +95,9 @@ #ifdef LANGUAGE_IT_IT #include "lang/it-IT.rc" #endif +#ifdef LANGUAGE_JA_JP + #include "lang/ja-JP.rc" +#endif #ifdef LANGUAGE_NL_NL #include "lang/nl-NL.rc" #endif Added: trunk/reactos/dll/cpl/usrmgr/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/lang/ja-JP.… ============================================================================== --- trunk/reactos/dll/cpl/usrmgr/lang/ja-JP.rc (added) +++ trunk/reactos/dll/cpl/usrmgr/lang/ja-JP.rc [iso-8859-1] Sun Aug 21 10:40:42 2016 @@ -0,0 +1,213 @@ +LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT + +/* Dialogs */ + +IDD_USERS DIALOGEX 0, 0, 252, 223 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "ã¦ã¼ã¶ã¼" +FONT 9, "MS UI Gothic" +BEGIN + CONTROL "", IDC_USERS_LIST, "SysListView32", LVS_REPORT | LVS_EDITLABELS | LVS_SINGLESEL | + LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 7, 7, 238, 85, WS_EX_CLIENTEDGE + PUSHBUTTON "è¿½å (&D)...", IDC_USERS_ADD, 87, 98, 50, 14 + PUSHBUTTON "åé¤(&R)", IDC_USERS_REMOVE, 141, 98, 50, 14 + PUSHBUTTON "ããããã£(&O)", IDC_USERS_PROPERTIES, 195, 98, 50, 14 + AUTOCHECKBOX "ã¦ã¼ã¶ã¼åã¨ãã¹ã¯ã¼ããã·ã¹ãã éå§æã«è¦æ±ãã¾ã(&Q)", IDC_USERS_STARTUP_REQUIRE, 10, 118, 200, 14, WS_DISABLED + PUSHBUTTON "ãã¹ã¯ã¼ãã®ãªã»ãã(&E)", IDC_USERS_RESET, 165, 200, 80, 14, WS_DISABLED +END + +IDD_GROUPS DIALOGEX 0, 0, 252, 223 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "ã°ã«ã¼ã" +FONT 9, "MS UI Gothic" +BEGIN + CONTROL "", IDC_GROUPS_LIST, "SysListView32", LVS_REPORT | LVS_EDITLABELS | LVS_SINGLESEL | + LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 7, 7, 238, 85, WS_EX_CLIENTEDGE + PUSHBUTTON "è¿½å (&D)...", IDC_GROUPS_ADD, 87, 98, 50, 14 + PUSHBUTTON "åé¤(&R)", IDC_GROUPS_REMOVE, 141, 98, 50, 14 + PUSHBUTTON "ããããã£(&O)", IDC_GROUPS_PROPERTIES, 195, 98, 50, 14 +END + +IDD_EXTRA DIALOGEX 0, 0, 252, 223 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "ã¨ã¯ã¹ãã©" +FONT 9, "MS UI Gothic" +BEGIN + LTEXT "ãã®ç©ºç½ã¯æå³çã«æ®ãã¦ããã¾ã", IDC_STATIC, 66, 90, 112, 8 +END + +IDD_USER_GENERAL DIALOGEX 0, 0, 252, 223 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "ä¸è¬" +FONT 9, "MS UI Gothic" +BEGIN + LTEXT "", IDC_USER_GENERAL_NAME, 7, 12, 112, 8 + LTEXT "ãã«ãã¼ã :", -1, 7, 46, 63, 8 + EDITTEXT IDC_USER_GENERAL_FULL_NAME, 77, 43, 168, 13, ES_AUTOHSCROLL + LTEXT "èª¬æ:", -1, 7, 64, 63, 8 + EDITTEXT IDC_USER_GENERAL_DESCRIPTION, 77, 61, 168, 13, ES_AUTOHSCROLL + AUTOCHECKBOX "ã¦ã¼ã¶ã¼ã¯æåã®ãã°ãªã³ã§ãã¹ã¯ã¼ããå¤æ´ããªããã°ãªããªã", IDC_USER_GENERAL_FORCE_CHANGE, 7, 82, 210, 10 + AUTOCHECKBOX "ã¦ã¼ã¶ã¼ã¯ãã¹ã¯ã¼ããå¤æ´ã§ããªã", IDC_USER_GENERAL_CANNOT_CHANGE, 7, 95, 210, 10 + AUTOCHECKBOX "ãã¹ã¯ã¼ãã«æå¹æéã¯ãªã", IDC_USER_GENERAL_NEVER_EXPIRES, 7, 108, 210, 10 + AUTOCHECKBOX "ã¢ã«ã¦ã³ãã¯ç¡å¹åããã¦ãã", IDC_USER_GENERAL_DISABLED, 7, 121, 210, 10 + AUTOCHECKBOX "ã¢ã«ã¦ã³ãã¯ããã¯ããã¦ãã", IDC_USER_GENERAL_LOCKED, 7, 134, 210, 10 +END + +IDD_USER_MEMBERSHIP DIALOGEX 0, 0, 252, 223 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "ã¡ã³ãã¼ã·ãã" +FONT 9, "MS UI Gothic" +BEGIN + LTEXT "æ¬¡ã®ã¡ã³ãã¼:", -1, 7, 7, 170, 8 + CONTROL "", IDC_USER_MEMBERSHIP_LIST, "SysListView32", LVS_REPORT | LVS_NOCOLUMNHEADER | + LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 7, 18, 238, 173, WS_EX_CLIENTEDGE + PUSHBUTTON "è¿½å ...", IDC_USER_MEMBERSHIP_ADD, 7, 197, 50, 14 + PUSHBUTTON "åé¤", IDC_USER_MEMBERSHIP_REMOVE, 61, 197, 50, 14, WS_DISABLED +END + +IDD_USER_PROFILE DIALOGEX 0, 0, 252, 223 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "ãããã£ã¼ã«" +FONT 9, "MS UI Gothic" +BEGIN + GROUPBOX "ã¦ã¼ã¶ã¼ ãããã£ã¼ã«", -1, 7, 7, 238, 54 + LTEXT "ãããã£ã¼ã« ãã¹:", -1, 16, 22, 55, 8 + EDITTEXT IDC_USER_PROFILE_PATH, 78, 19, 160, 13, ES_AUTOHSCROLL + LTEXT "ãã°ãªã³ ã¹ã¯ãªãã:", -1, 16, 40, 55, 8 + EDITTEXT IDC_USER_PROFILE_SCRIPT, 78, 37, 160, 13, ES_AUTOHSCROLL + GROUPBOX "ãã¼ã ãã£ã¬ã¯ããªã¼", -1, 7, 68, 238, 54 + AUTORADIOBUTTON "ãã¼ã«ã« ãã¹:", IDC_USER_PROFILE_LOCAL, 16, 83, 60, 10 + AUTORADIOBUTTON "æ¥ç¶:", IDC_USER_PROFILE_REMOTE, 16, 100, 60, 10 + EDITTEXT IDC_USER_PROFILE_LOCAL_PATH, 78, 81, 160, 13, ES_AUTOHSCROLL + COMBOBOX IDC_USER_PROFILE_DRIVE, 78, 99, 26, 160, CBS_DROPDOWNLIST | CBS_SORT | + WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + LTEXT "æ¥ç¶å:", -1, 109, 101, 29, 11 + EDITTEXT IDC_USER_PROFILE_REMOTE_PATH, 138, 99, 100, 13, ES_AUTOHSCROLL +END + +IDD_GROUP_GENERAL DIALOGEX 0, 0, 252, 223 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "ä¸è¬" +FONT 9, "MS UI Gothic" +BEGIN + LTEXT "", IDC_GROUP_GENERAL_NAME, 7, 12, 112, 8 + LTEXT "èª¬æ:", -1, 7, 45, 46, 8 + EDITTEXT IDC_GROUP_GENERAL_DESCRIPTION, 65, 42, 180, 13, ES_AUTOHSCROLL + LTEXT "ã¡ã³ãã¼:", -1, 7, 63, 45, 8 + CONTROL "", IDC_GROUP_GENERAL_MEMBERS, "SysListView32", LVS_REPORT | LVS_NOCOLUMNHEADER | + LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 7, 74, 238, 117, WS_EX_CLIENTEDGE + PUSHBUTTON "è¿½å ...", IDC_GROUP_GENERAL_ADD, 7, 197, 50, 14 + PUSHBUTTON "åé¤", IDC_GROUP_GENERAL_REMOVE, 61, 197, 50, 14, WS_DISABLED +END + +IDD_CHANGE_PASSWORD DIALOGEX 0, 0, 267, 74 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT +CAPTION "ãã¹ã¯ã¼ãã®å¤æ´" +FONT 9, "MS UI Gothic" +BEGIN + EDITTEXT IDC_EDIT_PASSWORD1, 107, 7, 153, 14, ES_AUTOHSCROLL | ES_PASSWORD + RTEXT "æ°ãããã¹ã¯ã¼ã:", -1, 7, 10, 96, 8 + EDITTEXT IDC_EDIT_PASSWORD2, 107, 25, 153, 14, ES_AUTOHSCROLL | ES_PASSWORD + RTEXT "ãã¹ã¯ã¼ãã®åç¢ºèª:", -1, 7, 28, 96, 8 + DEFPUSHBUTTON "OK", IDOK, 156, 53, 50, 14 + PUSHBUTTON "ãã£ã³ã»ã«", IDCANCEL, 210, 53, 50, 14 +END + +IDD_USER_NEW DIALOGEX 0, 0, 267, 200 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT +CAPTION "æ°ããã¦ã¼ã¶ã¼" +FONT 9, "MS UI Gothic" +BEGIN + EDITTEXT IDC_USER_NEW_NAME, 107, 7, 153, 14, ES_AUTOHSCROLL + RTEXT "ã¦ã¼ã¶ã¼å:", -1, 7, 10, 96, 8 + EDITTEXT IDC_USER_NEW_FULL_NAME, 107, 25, 153, 14, ES_AUTOHSCROLL + RTEXT "ã¦ã¼ã¶ã¼ã®ãã«ãã¼ã :", -1, 7, 28, 96, 8 + EDITTEXT IDC_USER_NEW_DESCRIPTION, 107, 43, 153, 14, ES_AUTOHSCROLL + RTEXT "èª¬æ:", -1, 7, 46, 96, 8 + EDITTEXT IDC_USER_NEW_PASSWORD1, 107, 67, 153, 14, ES_AUTOHSCROLL | ES_PASSWORD + RTEXT "ãã¹ã¯ã¼ã:", -1, 7, 70, 96, 8 + EDITTEXT IDC_USER_NEW_PASSWORD2, 107, 85, 153, 14, ES_AUTOHSCROLL | ES_PASSWORD + RTEXT "ãã¹ã¯ã¼ãã®åç¢ºèª:", -1, 7, 88, 96, 8 + AUTOCHECKBOX "ã¦ã¼ã¶ã¼ã¯æåã®ãã°ãªã³ã§ãã¹ã¯ã¼ããå¤æ´ããªããã°ãªããªã", IDC_USER_NEW_FORCE_CHANGE, 7, 109, 200, 10 + AUTOCHECKBOX "ã¦ã¼ã¶ã¼ã¯ãã¹ã¯ã¼ããå¤æ´ã§ããªã", IDC_USER_NEW_CANNOT_CHANGE, 7, 123, 200, 10, WS_DISABLED + AUTOCHECKBOX "ãã¹ã¯ã¼ãã«æå¹æéã¯ãªã", IDC_USER_NEW_NEVER_EXPIRES, 7, 137, 200, 10, WS_DISABLED + AUTOCHECKBOX "ã¢ã«ã¦ã³ãã¯ç¡å¹åããã¦ãã", IDC_USER_NEW_DISABLED, 7, 151, 200, 10 + DEFPUSHBUTTON "OK", IDOK, 156, 179, 50, 14, WS_DISABLED + PUSHBUTTON "ãã£ã³ã»ã«", IDCANCEL, 210, 179, 50, 14 +END + +IDD_GROUP_NEW DIALOGEX 0, 0, 267, 74 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT +CAPTION "æ°ããã°ã«ã¼ã" +FONT 9, "MS UI Gothic" +BEGIN + EDITTEXT IDC_GROUP_NEW_NAME, 107, 7, 153, 14, ES_AUTOHSCROLL + RTEXT "ã°ã«ã¼ãå:", -1, 7, 10, 96, 8 + EDITTEXT IDC_GROUP_NEW_DESCRIPTION, 107, 25, 153, 14, ES_AUTOHSCROLL + RTEXT "èª¬æ:", -1, 7, 28, 96, 8 + DEFPUSHBUTTON "OK", IDOK, 156, 53, 50, 14, WS_DISABLED + PUSHBUTTON "ãã£ã³ã»ã«", IDCANCEL, 210, 53, 50, 14 +END + +IDD_USER_ADD_MEMBERSHIP DIALOGEX 0, 0, 252, 223 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT +CAPTION "ã°ã«ã¼ãã®ã¡ã³ãã¼ã·ãã" +FONT 9, "MS UI Gothic" +BEGIN + LTEXT "æ¬¡ã®ã¡ã³ãã¼:", -1, 7, 7, 56, 8 + CONTROL "", IDC_USER_ADD_MEMBERSHIP_LIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | + LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 7, 18, 238, 173, WS_EX_CLIENTEDGE + DEFPUSHBUTTON "OK", IDOK, 141, 197, 50, 14 + PUSHBUTTON "ãã£ã³ã»ã«", IDCANCEL, 195, 197, 50, 14 +END + +/* Menus */ + +IDM_POPUP_GROUP MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "æ°ããã°ã«ã¼ã...", IDM_GROUP_NEW + END + POPUP "" + BEGIN + MENUITEM "ã¡ã³ãã¼ã®è¿½å ", IDM_GROUP_ADD_MEMBER, GRAYED + MENUITEM SEPARATOR + MENUITEM "åé¤", IDM_GROUP_DELETE + MENUITEM "ååã®å¤æ´", IDM_GROUP_RENAME + MENUITEM SEPARATOR + MENUITEM "ããããã£", IDM_GROUP_PROPERTIES + END +END + +IDM_POPUP_USER MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "æ°ããã¦ã¼ã¶ã¼...", IDM_USER_NEW + END + POPUP "" + BEGIN + MENUITEM "ãã¹ã¯ã¼ãã®å¤æ´", IDM_USER_CHANGE_PASSWORD + MENUITEM SEPARATOR + MENUITEM "åé¤", IDM_USER_DELETE + MENUITEM "ååã®å¤æ´", IDM_USER_RENAME + MENUITEM SEPARATOR + MENUITEM "ããããã£", IDM_USER_PROPERTIES + END +END + +/* Strings */ + +STRINGTABLE +BEGIN + IDS_CPLNAME "ã¦ã¼ã¶ã¼ã¢ã«ã¦ã³ã" + IDS_CPLDESCRIPTION "ã¦ã¼ã¶ã¼ã¨ã°ã«ã¼ããç®¡çãã¾ãã" +END + +STRINGTABLE +BEGIN + IDS_NAME "åå" + IDS_FULLNAME "ãã«ãã¼ã " + IDS_DESCRIPTION "èª¬æ" +END Propchange: trunk/reactos/dll/cpl/usrmgr/lang/ja-JP.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/cpl/usrmgr/usrmgr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/usrmgr.rc?r… ============================================================================== --- trunk/reactos/dll/cpl/usrmgr/usrmgr.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/usrmgr/usrmgr.rc [iso-8859-1] Sun Aug 21 10:40:42 2016 @@ -42,6 +42,9 @@ #ifdef LANGUAGE_IT_IT #include "lang/it-IT.rc" #endif +#ifdef LANGUAGE_JA_JP + #include "lang/ja-JP.rc" +#endif #ifdef LANGUAGE_PL_PL #include "lang/pl-PL.rc" #endif Added: trunk/reactos/dll/cpl/wined3dcfg/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/wined3dcfg/lang/ja… ============================================================================== --- trunk/reactos/dll/cpl/wined3dcfg/lang/ja-JP.rc (added) +++ trunk/reactos/dll/cpl/wined3dcfg/lang/ja-JP.rc [iso-8859-1] Sun Aug 21 10:40:42 2016 @@ -0,0 +1,37 @@ +LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT + +IDD_PROPPAGEGENERAL DIALOGEX 0, 0, 246, 228 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "ä¸è¬" +FONT 9, "MS UI Gothic" +BEGIN + ICON IDI_CPLICON, IDI_CPLICON, 8, 0, 21, 20 + GROUPBOX "ã·ã§ã¼ãã¼", -1, 5, 25, 230, 80 + LTEXT "GLSLã®æå¹ã(&E):", -1, 15, 42, 120, 10 + COMBOBOX IDC_GLSL, 135, 40, 90, 10, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + LTEXT "æå¤§&GSã¬ãã«:", -1, 15, 57, 120, 10 + COMBOBOX IDC_GSLEVEL, 135, 55, 90, 10, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + LTEXT "æå¤§&PSã¬ãã«:", -1, 15, 72, 120, 10 + COMBOBOX IDC_PSLEVEL, 135, 70, 90, 10, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + LTEXT "æå¤§&VSã¬ãã«:", -1, 15, 87, 120, 10 + COMBOBOX IDC_VSLEVEL, 135, 85, 90, 10, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + GROUPBOX "ã¬ã³ããªã³ã°", -1, 5, 110, 230, 110 + LTEXT "ãã«ããµã³ããªã³ã°(&M):", -1, 15, 127, 120, 10 + COMBOBOX IDC_MULTISAMPLING, 135, 125, 90, 10, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + LTEXT "å³å¯ãªæç»é åº(&S):", -1, 15, 142, 120, 10 + COMBOBOX IDC_STRICTDRAWORDERING, 135, 140, 90, 10, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + LTEXT "ãªãã¹ã¯ãªã¼ã³ ã¬ã³ããªã³ã°(&O):", -1, 15, 157, 120, 10 + COMBOBOX IDC_OFFSCREEN, 135, 155, 90, 10, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + LTEXT "å¸¸ã«ãªãã¹ã¯ãªã¼ã³(&W):", -1, 15, 172, 120, 10, SS_LEFT + COMBOBOX IDC_ALWAYSOFFSCREEN, 135, 170, 90, 10, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + LTEXT "ãããª ã¡ã¢ãªã¼ ãµã¤ãº(&Z):", -1, 15, 187, 120, 10, SS_LEFT + COMBOBOX IDC_VIDMEMSIZE, 135, 185, 90, 10, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + LTEXT "&DirectDrawã¬ã³ãã©ã¼:", -1, 15, 202, 120, 10, SS_LEFT + COMBOBOX IDC_DDRENDERER, 135, 200, 90, 10, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST +END + +STRINGTABLE +BEGIN + IDS_CPLNAME "WineD3Dãªãã·ã§ã³" + IDS_CPLDESCRIPTION "WineD3Dã®å®è¡æè¨å®ãå¤æ´ãã¾ãã" +END Propchange: trunk/reactos/dll/cpl/wined3dcfg/lang/ja-JP.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/cpl/wined3dcfg/wined3dcfg.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/wined3dcfg/wined3d… ============================================================================== --- trunk/reactos/dll/cpl/wined3dcfg/wined3dcfg.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/wined3dcfg/wined3dcfg.rc [iso-8859-1] Sun Aug 21 10:40:42 2016 @@ -36,6 +36,9 @@ #ifdef LANGUAGE_IT_IT #include "lang/it-IT.rc" #endif +#ifdef LANGUAGE_JA_JP + #include "lang/ja-JP.rc" +#endif #ifdef LANGUAGE_PL_PL #include "lang/pl-PL.rc" #endif

1 0

[gadamopoulos] 72401: [SHELL32] - CMenuBand: Do not open the context menu on mouse down but on mouse up. - Patch by Joachim Henze (reactosfanboy) CORE-10830
by gadamopoulos＠svn.reactos.org 20 Aug '16

20 Aug '16

Author: gadamopoulos Date: Sat Aug 20 22:05:12 2016 New Revision: 72401 URL: http://svn.reactos.org/svn/reactos?rev=72401&view=rev Log: [SHELL32] - CMenuBand: Do not open the context menu on mouse down but on mouse up. - Patch by Joachim Henze (reactosfanboy) CORE-10830 Modified: trunk/reactos/dll/win32/shell32/shellmenu/CMenuBand.cpp trunk/reactos/dll/win32/shell32/shellmenu/CMenuBand.h trunk/reactos/dll/win32/shell32/shellmenu/CMenuFocusManager.cpp trunk/reactos/dll/win32/shell32/shellmenu/CMenuFocusManager.h trunk/reactos/dll/win32/shell32/shellmenu/CMenuToolbars.cpp trunk/reactos/dll/win32/shell32/shellmenu/CMenuToolbars.h Modified: trunk/reactos/dll/win32/shell32/shellmenu/CMenuBand.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shellmen… ============================================================================== --- trunk/reactos/dll/win32/shell32/shellmenu/CMenuBand.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shellmenu/CMenuBand.cpp [iso-8859-1] Sat Aug 20 22:05:12 2016 @@ -1132,12 +1132,12 @@ return S_OK; } -HRESULT CMenuBand::_MenuBarMouseUp(HWND hwnd, INT item) +HRESULT CMenuBand::_MenuBarMouseUp(HWND hwnd, INT item, BOOL isLButton) { if (m_staticToolbar && m_staticToolbar->IsWindowOwner(hwnd) == S_OK) - m_staticToolbar->MenuBarMouseUp(item); + m_staticToolbar->MenuBarMouseUp(item, isLButton); if (m_SFToolbar && m_SFToolbar->IsWindowOwner(hwnd) == S_OK) - m_SFToolbar->MenuBarMouseUp(item); + m_SFToolbar->MenuBarMouseUp(item, isLButton); return S_OK; } Modified: trunk/reactos/dll/win32/shell32/shellmenu/CMenuBand.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shellmen… ============================================================================== --- trunk/reactos/dll/win32/shell32/shellmenu/CMenuBand.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shellmenu/CMenuBand.h [iso-8859-1] Sat Aug 20 22:05:12 2016 @@ -199,7 +199,7 @@ HRESULT _IsTracking(); HRESULT _KillPopupTimers(); HRESULT _MenuBarMouseDown(HWND hwnd, INT item, BOOL isLButton); - HRESULT _MenuBarMouseUp(HWND hwnd, INT item); + HRESULT _MenuBarMouseUp(HWND hwnd, INT item, BOOL isLButton); HRESULT _HasSubMenu(); HRESULT AdjustForTheme(BOOL bFlatStyle); Modified: trunk/reactos/dll/win32/shell32/shellmenu/CMenuFocusManager.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shellmen… ============================================================================== --- trunk/reactos/dll/win32/shell32/shellmenu/CMenuFocusManager.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shellmenu/CMenuFocusManager.cpp [iso-8859-1] Sat Aug 20 22:05:12 2016 @@ -185,7 +185,6 @@ m_selectedMenu(NULL), m_selectedItem(0), m_selectedItemFlags(0), - m_isLButtonDown(FALSE), m_movedSinceDown(FALSE), m_windowAtDown(NULL), m_PreviousForeground(NULL), @@ -323,10 +322,7 @@ POINT pt2 = { GET_X_LPARAM(msg->lParam), GET_Y_LPARAM(msg->lParam) }; ClientToScreen(msg->hwnd, &pt2); - // Don't do anything if the mouse has not been moved POINT pt = msg->pt; - if (pt.x == m_ptPrev.x && pt.y == m_ptPrev.y) - return TRUE; // Don't do anything if another window is capturing the mouse. HWND cCapture = ::GetCapture(); @@ -342,7 +338,7 @@ StackEntry * entry = NULL; if (IsTrackedWindow(child, &entry) == S_OK) { - TRACE("MouseMove %d\n", m_isLButtonDown); + TRACE("MouseMove"); } BOOL isTracking = FALSE; @@ -426,8 +422,6 @@ return TRUE; } - TRACE("MouseDown %d\n", m_isLButtonDown); - if (entry->type == MenuBarEntry) { if (entry != m_current) @@ -451,16 +445,15 @@ msg->message = WM_NULL; - m_isLButtonDown = TRUE; m_movedSinceDown = FALSE; m_windowAtDown = child; - TRACE("MouseDown end %d\n", m_isLButtonDown); + TRACE("MouseDown end\n"); return TRUE; } -LRESULT CMenuFocusManager::ProcessMouseUp(MSG* msg) +LRESULT CMenuFocusManager::ProcessMouseUp(MSG* msg, BOOL isLButton) { HWND child; int iHitTestResult = -1; @@ -472,11 +465,6 @@ if (cCapture && cCapture != m_captureHwnd && m_current->type != TrackedMenuEntry) return TRUE; - if (!m_isLButtonDown) - return TRUE; - - m_isLButtonDown = FALSE; - POINT pt = msg->pt; child = WindowFromPoint(pt); @@ -485,8 +473,6 @@ if (IsTrackedWindow(child, &entry) != S_OK) return TRUE; - TRACE("MouseUp %d\n", m_isLButtonDown); - if (entry) { ScreenToClient(child, &pt); @@ -495,7 +481,7 @@ if (iHitTestResult >= 0) { TRACE("MouseUp send %d\n", iHitTestResult); - entry->mb->_MenuBarMouseUp(child, iHitTestResult); + entry->mb->_MenuBarMouseUp(child, iHitTestResult, isLButton); } } @@ -595,9 +581,6 @@ isLButton = TRUE; TRACE("LB\n"); - // fallthrough; - case WM_NCRBUTTONDOWN: - case WM_RBUTTONDOWN: if (m_menuBar && m_current->type == MenuPopupEntry) { POINT pt = msg->pt; @@ -624,9 +607,14 @@ ProcessMouseDown(msg, isLButton); break; + case WM_NCRBUTTONUP: + case WM_RBUTTONUP: + ProcessMouseUp(msg, isLButton); + break; case WM_NCLBUTTONUP: case WM_LBUTTONUP: - ProcessMouseUp(msg); + isLButton = TRUE; + ProcessMouseUp(msg, isLButton); break; case WM_MOUSEMOVE: callNext = ProcessMouseMove(msg); Modified: trunk/reactos/dll/win32/shell32/shellmenu/CMenuFocusManager.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shellmen… ============================================================================== --- trunk/reactos/dll/win32/shell32/shellmenu/CMenuFocusManager.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shellmenu/CMenuFocusManager.h [iso-8859-1] Sat Aug 20 22:05:12 2016 @@ -117,7 +117,7 @@ LRESULT ProcessMouseMove(MSG* msg); LRESULT ProcessMouseDown(MSG* msg, BOOL isLButton); - LRESULT ProcessMouseUp(MSG* msg); + LRESULT ProcessMouseUp(MSG* msg, BOOL isLButton); public: HRESULT PushMenuBar(CMenuBand * mb); HRESULT PushMenuPopup(CMenuBand * mb); Modified: trunk/reactos/dll/win32/shell32/shellmenu/CMenuToolbars.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shellmen… ============================================================================== --- trunk/reactos/dll/win32/shell32/shellmenu/CMenuToolbars.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shellmenu/CMenuToolbars.cpp [iso-8859-1] Sat Aug 20 22:05:12 2016 @@ -827,8 +827,6 @@ TBBUTTON btn; GetButton(iIndex, &btn); - if (!isLButton) - return ProcessContextMenu(btn.idCommand); if ((m_initFlags & SMINIT_VERTICAL) || m_popupBar @@ -841,7 +839,7 @@ return ProcessClick(btn.idCommand); } -HRESULT CMenuToolbarBase::MenuBarMouseUp(INT iIndex) +HRESULT CMenuToolbarBase::MenuBarMouseUp(INT iIndex, BOOL isLButton) { TBBUTTON btn; @@ -851,7 +849,11 @@ return S_OK; GetButton(iIndex, &btn); - return ProcessClick(btn.idCommand); + + if (isLButton) + return ProcessClick(btn.idCommand); + else + return ProcessContextMenu(btn.idCommand); } HRESULT CMenuToolbarBase::PrepareExecuteItem(INT iItem) Modified: trunk/reactos/dll/win32/shell32/shellmenu/CMenuToolbars.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shellmen… ============================================================================== --- trunk/reactos/dll/win32/shell32/shellmenu/CMenuToolbars.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shellmenu/CMenuToolbars.h [iso-8859-1] Sat Aug 20 22:05:12 2016 @@ -97,7 +97,7 @@ HRESULT KillPopupTimer(); HRESULT MenuBarMouseDown(INT iIndex, BOOL isLButton); - HRESULT MenuBarMouseUp(INT iIndex); + HRESULT MenuBarMouseUp(INT iIndex, BOOL isLButton); HRESULT ProcessClick(INT iItem); HRESULT ProcessContextMenu(INT iItem); HRESULT BeforeCancelPopup();

1 0

[mjansen] 72400: [WIN32NT_APITEST] Add additional tests for NtUserCreateWindowEx by Sylvain Deverre. ROSTESTS-237 #resolve #comment Thanks!
by mjansen＠svn.reactos.org 20 Aug '16

20 Aug '16

Author: mjansen Date: Sat Aug 20 16:58:20 2016 New Revision: 72400 URL: http://svn.reactos.org/svn/reactos?rev=72400&view=rev Log: [WIN32NT_APITEST] Add additional tests for NtUserCreateWindowEx by Sylvain Deverre. ROSTESTS-237 #resolve #comment Thanks! Modified: trunk/rostests/apitests/win32nt/ntuser/NtUserCreateWindowEx.c Modified: trunk/rostests/apitests/win32nt/ntuser/NtUserCreateWindowEx.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/win32nt/ntuser/N… ============================================================================== --- trunk/rostests/apitests/win32nt/ntuser/NtUserCreateWindowEx.c [iso-8859-1] (original) +++ trunk/rostests/apitests/win32nt/ntuser/NtUserCreateWindowEx.c [iso-8859-1] Sat Aug 20 16:58:20 2016 @@ -57,6 +57,7 @@ UNICODE_STRING ver_cls = {12, 32, L"v2test"}; UNICODE_STRING another_cls = {10, 32, L"Dummy"}; UNICODE_STRING menu = {10, 10, L"MuMnu"}; + UNICODE_STRING null_cls = {2, 2, L""}; /* LARGE_STRING for NtUserCreateWindowEx */ LARGE_STRING l_dummy = {14, 32, 0, L"DummyMe"}; @@ -116,10 +117,29 @@ 0, NULL); + TEST(NtUserRegisterClassExWOW(&wclex2, /* wndClass */ + &cls, /* ClassName */ + NULL, /* Version */ + &clsMenuName, /* MenuName */ + 0, + 0, + NULL) == 0); + + TEST(NtUserRegisterClassExWOW(&wclex2, /* wndClass */ + &cls, /* ClassName */ + &null_cls, /* Version */ + &clsMenuName, /* MenuName */ + 0, + 0, + NULL) == 0); + TEST(NtUserGetWOWClass(hinst, &ver_cls) != 0); - - TEST(atom2 != 0); + TEST(NtUserGetWOWClass(hinst, &ver_cls) != NtUserGetWOWClass(hinst, &cls)); TEST(atom2 != 0); TEST(atom == atom2 && (atom | atom2) != 0); + + /* Create a window without versioned class */ + TEST(CreateWnd(hinst, &l_cls, NULL, &l_wndName) == 0); + TEST(CreateWnd(hinst, &l_cls, &l_wndName, &l_wndName) == 0); /* Now, create our first window */ hwnd = CreateWnd(hinst, &l_cls, &l_cls, &l_wndName);

1 0

[gadamopoulos] 72399: [SHELL32] - Use ExpandEnvironmentStringsW instead of PathUnExpandEnvStringsW in the pick icon dialog. - Patch by Jared Smudde. CORE-10962
by gadamopoulos＠svn.reactos.org 20 Aug '16

20 Aug '16

Author: gadamopoulos Date: Sat Aug 20 09:53:55 2016 New Revision: 72399 URL: http://svn.reactos.org/svn/reactos?rev=72399&view=rev Log: [SHELL32] - Use ExpandEnvironmentStringsW instead of PathUnExpandEnvStringsW in the pick icon dialog. - Patch by Jared Smudde. CORE-10962 Modified: trunk/reactos/dll/win32/shell32/dialogs/dialogs.cpp Modified: trunk/reactos/dll/win32/shell32/dialogs/dialogs.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/dialogs/… ============================================================================== --- trunk/reactos/dll/win32/shell32/dialogs/dialogs.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/dialogs/dialogs.cpp [iso-8859-1] Sat Aug 20 09:53:55 2016 @@ -117,7 +117,7 @@ pIconContext->hDlgCtrl = GetDlgItem(hwndDlg, IDC_PICKICON_LIST); SendMessageW(pIconContext->hDlgCtrl, LB_SETCOLUMNWIDTH, 32, 0); EnumResourceNamesW(pIconContext->hLibrary, RT_ICON, EnumPickIconResourceProc, (LPARAM)pIconContext->hDlgCtrl); - if (PathUnExpandEnvStringsW(pIconContext->szName, szText, MAX_PATH)) + if (ExpandEnvironmentStringsW(pIconContext->szName, szText, MAX_PATH)) SetDlgItemTextW(hwndDlg, IDC_EDIT_PATH, szText); else SetDlgItemTextW(hwndDlg, IDC_EDIT_PATH, pIconContext->szName); @@ -177,7 +177,7 @@ pIconContext->hLibrary = hLibrary; wcscpy(pIconContext->szName, szText); EnumResourceNamesW(pIconContext->hLibrary, RT_ICON, EnumPickIconResourceProc, (LPARAM)pIconContext->hDlgCtrl); - if (PathUnExpandEnvStringsW(pIconContext->szName, szText, MAX_PATH)) + if (ExpandEnvironmentStringsW(pIconContext->szName, szText, MAX_PATH)) SetDlgItemTextW(hwndDlg, IDC_EDIT_PATH, szText); else SetDlgItemTextW(hwndDlg, IDC_EDIT_PATH, pIconContext->szName);

1 0

← Newer
1
...
10
11
12
13
14
15
16
...
47
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 August 2016