Ros-diffs October 2010

ros-diffs@reactos.org

20 participants
435 discussions

[dreimer] 49185: Sync the out of sync winemine to Wine 1.3.5 and fork it, because of the modified look, improved resources and different code structure. Additionally call it winmine, as it is in wi...

by dreimer＠svn.reactos.org

Author: dreimer Date: Sun Oct 17 17:04:39 2010 New Revision: 49185 URL: http://svn.reactos.org/svn/reactos?rev=49185&view=rev Log: Sync the out of sync winemine to Wine 1.3.5 and fork it, because of the modified look, improved resources and different code structure. Additionally call it winmine, as it is in windows, too. Added: trunk/reactos/base/applications/games/winmine/ - copied from r49180, trunk/reactos/base/applications/games/winemine/ trunk/reactos/base/applications/games/winmine/lang/da-DK.rc (with props) trunk/reactos/base/applications/games/winmine/lang/fi-FI.rc (with props) trunk/reactos/base/applications/games/winmine/lang/pt-PT.rc (with props) trunk/reactos/base/applications/games/winmine/lang/ro-RO.rc (with props) trunk/reactos/base/applications/games/winmine/lang/sl-SI.rc (with props) trunk/reactos/base/applications/games/winmine/lang/sv-SE.rc (with props) trunk/reactos/base/applications/games/winmine/lang/tr-TR.rc (with props) trunk/reactos/base/applications/games/winmine/winmine.rbuild (with props) Removed: trunk/reactos/base/applications/games/winemine/ trunk/reactos/base/applications/games/winmine/README trunk/reactos/base/applications/games/winmine/dialog.h trunk/reactos/base/applications/games/winmine/lang/bg-BG.rc trunk/reactos/base/applications/games/winmine/lang/ca-ES.rc trunk/reactos/base/applications/games/winmine/lang/el-GR.rc trunk/reactos/base/applications/games/winmine/lang/eu-ES.rc trunk/reactos/base/applications/games/winmine/lang/id-ID.rc trunk/reactos/base/applications/games/winmine/lang/sk-SK.rc trunk/reactos/base/applications/games/winmine/lang/th-TH.rc trunk/reactos/base/applications/games/winmine/winemine.rbuild Modified: trunk/reactos/base/applications/games/games.rbuild trunk/reactos/base/applications/games/winmine/dialog.c trunk/reactos/base/applications/games/winmine/lang/cs-CZ.rc trunk/reactos/base/applications/games/winmine/lang/de-DE.rc trunk/reactos/base/applications/games/winmine/lang/en-US.rc trunk/reactos/base/applications/games/winmine/lang/es-ES.rc trunk/reactos/base/applications/games/winmine/lang/fr-FR.rc trunk/reactos/base/applications/games/winmine/lang/it-IT.rc trunk/reactos/base/applications/games/winmine/lang/ja-JP.rc trunk/reactos/base/applications/games/winmine/lang/ko-KR.rc trunk/reactos/base/applications/games/winmine/lang/lt-LT.rc trunk/reactos/base/applications/games/winmine/lang/nl-NL.rc trunk/reactos/base/applications/games/winmine/lang/no-NO.rc trunk/reactos/base/applications/games/winmine/lang/pl-PL.rc trunk/reactos/base/applications/games/winmine/lang/ru-RU.rc trunk/reactos/base/applications/games/winmine/lang/uk-UA.rc trunk/reactos/base/applications/games/winmine/lang/zh-CN.rc trunk/reactos/base/applications/games/winmine/main.c trunk/reactos/base/applications/games/winmine/main.h trunk/reactos/base/applications/games/winmine/resource.h trunk/reactos/base/applications/games/winmine/rsrc.rc trunk/reactos/boot/bootdata/packages/reactos.dff trunk/reactos/dll/win32/syssetup/install.c trunk/reactos/media/doc/README.WINE [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/base/applications/games/games.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/ga… Removed: trunk/reactos/base/applications/games/winmine/README URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/base/applications/games/winmine/dialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Removed: trunk/reactos/base/applications/games/winmine/dialog.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Removed: trunk/reactos/base/applications/games/winmine/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Removed: trunk/reactos/base/applications/games/winmine/lang/ca-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/base/applications/games/winmine/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Added: trunk/reactos/base/applications/games/winmine/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/base/applications/games/winmine/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Removed: trunk/reactos/base/applications/games/winmine/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/base/applications/games/winmine/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/base/applications/games/winmine/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Removed: trunk/reactos/base/applications/games/winmine/lang/eu-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Added: trunk/reactos/base/applications/games/winmine/lang/fi-FI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/base/applications/games/winmine/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Removed: trunk/reactos/base/applications/games/winmine/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/base/applications/games/winmine/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/base/applications/games/winmine/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/base/applications/games/winmine/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/base/applications/games/winmine/lang/lt-LT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/base/applications/games/winmine/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/base/applications/games/winmine/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/base/applications/games/winmine/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Added: trunk/reactos/base/applications/games/winmine/lang/pt-PT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Added: trunk/reactos/base/applications/games/winmine/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/base/applications/games/winmine/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Removed: trunk/reactos/base/applications/games/winmine/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Added: trunk/reactos/base/applications/games/winmine/lang/sl-SI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Added: trunk/reactos/base/applications/games/winmine/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Removed: trunk/reactos/base/applications/games/winmine/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Added: trunk/reactos/base/applications/games/winmine/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/base/applications/games/winmine/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/base/applications/games/winmine/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/base/applications/games/winmine/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/base/applications/games/winmine/main.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/base/applications/games/winmine/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/base/applications/games/winmine/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Removed: trunk/reactos/base/applications/games/winmine/winemine.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Added: trunk/reactos/base/applications/games/winmine/winmine.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… Modified: trunk/reactos/dll/win32/syssetup/install.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/install… Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…

14 years, 2 months

[ekohl] 49184: [ADVAPI32] Move the Encrypted File System (EFS) functions into their own file.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun Oct 17 15:01:46 2010 New Revision: 49184 URL: http://svn.reactos.org/svn/reactos?rev=49184&view=rev Log: [ADVAPI32] Move the Encrypted File System (EFS) functions into their own file. Added: trunk/reactos/dll/win32/advapi32/misc/efs.c (with props) Modified: trunk/reactos/dll/win32/advapi32/advapi32.rbuild trunk/reactos/dll/win32/advapi32/sec/sec.c Modified: trunk/reactos/dll/win32/advapi32/advapi32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/advapi3… ============================================================================== --- trunk/reactos/dll/win32/advapi32/advapi32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/advapi32.rbuild [iso-8859-1] Sun Oct 17 15:01:46 2010 @@ -28,6 +28,7 @@ </directory> <directory name="misc"> <file>dllmain.c</file> + <file>efs.c</file> <file>hwprofiles.c</file> <file>logon.c</file> <file>msi.c</file> Added: trunk/reactos/dll/win32/advapi32/misc/efs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/misc/ef… ============================================================================== --- trunk/reactos/dll/win32/advapi32/misc/efs.c (added) +++ trunk/reactos/dll/win32/advapi32/misc/efs.c [iso-8859-1] Sun Oct 17 15:01:46 2010 @@ -1,0 +1,85 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS system libraries + * FILE: dlls/win32/advapi32/misc/efs.c + * PURPOSE: Encrypted File System support + * PROGRAMMER: Christoph_vW + */ + +#include <advapi32.h> +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(advapi); + + +/* + * @implemented + */ +BOOL WINAPI +DecryptFileA(LPCSTR lpFileName, DWORD dwReserved) +{ + UNICODE_STRING FileName; + NTSTATUS Status; + BOOL ret; + + Status = RtlCreateUnicodeStringFromAsciiz(&FileName, lpFileName); + if (!NT_SUCCESS(Status)) + { + SetLastError(RtlNtStatusToDosError(Status)); + return FALSE; + } + + ret = DecryptFileW(FileName.Buffer, dwReserved); + + if (FileName.Buffer != NULL) + RtlFreeUnicodeString(&FileName); + return ret; +} + + +/* + * @unimplemented + */ +BOOL WINAPI DecryptFileW(LPCWSTR lpFileName, DWORD dwReserved) +{ + FIXME("%s(%S) not implemented!\n", __FUNCTION__, lpFileName); + return TRUE; +} + + +/* + * @implemented + */ +BOOL WINAPI +EncryptFileA(LPCSTR lpFileName) +{ + UNICODE_STRING FileName; + NTSTATUS Status; + BOOL ret; + + Status = RtlCreateUnicodeStringFromAsciiz(&FileName, lpFileName); + if (!NT_SUCCESS(Status)) + { + SetLastError(RtlNtStatusToDosError(Status)); + return FALSE; + } + + ret = EncryptFileW(FileName.Buffer); + + if (FileName.Buffer != NULL) + RtlFreeUnicodeString(&FileName); + return ret; +} + + +/* + * @unimplemented + */ +BOOL WINAPI +EncryptFileW(LPCWSTR lpFileName) +{ + FIXME("%s() not implemented!\n", __FUNCTION__); + return TRUE; +} + +/* EOF */ Propchange: trunk/reactos/dll/win32/advapi32/misc/efs.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/win32/advapi32/misc/efs.c ------------------------------------------------------------------------------ svn:keywords = author date id revision Modified: trunk/reactos/dll/win32/advapi32/sec/sec.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/sec… ============================================================================== --- trunk/reactos/dll/win32/advapi32/sec/sec.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/sec/sec.c [iso-8859-1] Sun Oct 17 15:01:46 2010 @@ -534,75 +534,4 @@ return FALSE; } - -/* - * @unimplemented - */ -BOOL WINAPI DecryptFileW(LPCWSTR lpFileName, DWORD dwReserved) -{ - FIXME("%s(%S) not implemented!\n", __FUNCTION__, lpFileName); - return TRUE; -} - - -/* - * @implemented - */ -BOOL WINAPI -DecryptFileA(LPCSTR lpFileName, DWORD dwReserved) -{ - UNICODE_STRING FileName; - NTSTATUS Status; - BOOL ret; - - Status = RtlCreateUnicodeStringFromAsciiz(&FileName, lpFileName); - if (!NT_SUCCESS(Status)) - { - SetLastError(RtlNtStatusToDosError(Status)); - return FALSE; - } - - ret = DecryptFileW(FileName.Buffer, dwReserved); - - if (FileName.Buffer != NULL) - RtlFreeUnicodeString(&FileName); - return ret; -} - - -/* - * @unimplemented - */ -BOOL WINAPI -EncryptFileW(LPCWSTR lpFileName) -{ - FIXME("%s() not implemented!\n", __FUNCTION__); - return TRUE; -} - - -/* - * @implemented - */ -BOOL WINAPI -EncryptFileA(LPCSTR lpFileName) -{ - UNICODE_STRING FileName; - NTSTATUS Status; - BOOL ret; - - Status = RtlCreateUnicodeStringFromAsciiz(&FileName, lpFileName); - if (!NT_SUCCESS(Status)) - { - SetLastError(RtlNtStatusToDosError(Status)); - return FALSE; - } - - ret = EncryptFileW(FileName.Buffer); - - if (FileName.Buffer != NULL) - RtlFreeUnicodeString(&FileName); - return ret; -} - /* EOF */

14 years, 2 months

[ekohl] 49183: [PSDK] Add DecryptFileA/W prototype.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun Oct 17 14:54:59 2010 New Revision: 49183 URL: http://svn.reactos.org/svn/reactos?rev=49183&view=rev Log: [PSDK] Add DecryptFileA/W prototype. Modified: trunk/reactos/include/psdk/winbase.h Modified: trunk/reactos/include/psdk/winbase.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winbase.h?rev… ============================================================================== --- trunk/reactos/include/psdk/winbase.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winbase.h [iso-8859-1] Sun Oct 17 14:54:59 2010 @@ -1399,6 +1399,8 @@ #endif PVOID WINAPI DecodePointer(PVOID); PVOID WINAPI DecodeSystemPointer(PVOID); +BOOL WINAPI DecryptFileA(LPCSTR,DWORD); +BOOL WINAPI DecryptFileW(LPCWSTR,DWORD); BOOL WINAPI DefineDosDeviceA(DWORD,LPCSTR,LPCSTR); BOOL WINAPI DefineDosDeviceW(DWORD,LPCWSTR,LPCWSTR); #define DefineHandleTable(w) ((w),TRUE) @@ -2374,6 +2376,7 @@ #define CreateProcessAsUser CreateProcessAsUserW #define CreateSemaphore CreateSemaphoreW #define CreateWaitableTimer CreateWaitableTimerW +#define DecryptFile DecryptFileW #define DefineDosDevice DefineDosDeviceW #define DeleteFile DeleteFileW #if (_WIN32_WINNT >= 0x0500) @@ -2577,6 +2580,7 @@ #define CreateProcessAsUser CreateProcessAsUserA #define CreateSemaphore CreateSemaphoreA #define CreateWaitableTimer CreateWaitableTimerA +#define DecryptFile DecryptFileA #define DefineDosDevice DefineDosDeviceA #define DeleteFile DeleteFileA #if (_WIN32_WINNT >= 0x0500)

14 years, 2 months

[spetreolle] 49182: [APITESTS] Fix (R)TEST macros in gdi32_apitest, ensures correct display and no crash report in testman.

by spetreolle＠svn.reactos.org

Author: spetreolle Date: Sun Oct 17 14:50:02 2010 New Revision: 49182 URL: http://svn.reactos.org/svn/reactos?rev=49182&view=rev Log: [APITESTS] Fix (R)TEST macros in gdi32_apitest, ensures correct display and no crash report in testman. Modified: trunk/rostests/apitests/gdi32/GetDIBits.c trunk/rostests/apitests/gdi32/GetStockObject.c trunk/rostests/apitests/gdi32/GetTextExtentExPoint.c trunk/rostests/apitests/gdi32/GetTextFace.c trunk/rostests/apitests/gdi32/SelectObject.c trunk/rostests/apitests/gdi32/SetMapMode.c trunk/rostests/apitests/gdi32/SetSysColors.c trunk/rostests/apitests/gdi32/SetWindowExtEx.c Modified: trunk/rostests/apitests/gdi32/GetDIBits.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/GetDIBits.… ============================================================================== --- trunk/rostests/apitests/gdi32/GetDIBits.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/GetDIBits.c [iso-8859-1] Sun Oct 17 14:50:02 2010 @@ -9,8 +9,8 @@ #include <wine/test.h> #include <windows.h> -#define TEST(x) ok(x, #x) -#define RTEST(x) ok(x, #x) +#define TEST(x) ok(x, #x"\n") +#define RTEST(x) ok(x, #x"\n") void Test_GetDIBits() { Modified: trunk/rostests/apitests/gdi32/GetStockObject.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/GetStockOb… ============================================================================== --- trunk/rostests/apitests/gdi32/GetStockObject.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/GetStockObject.c [iso-8859-1] Sun Oct 17 14:50:02 2010 @@ -12,8 +12,8 @@ #include <reactos/win32k/ntgdityp.h> #include <reactos/win32k/ntgdihdl.h> -#define TEST(x) ok(x, #x) -#define RTEST(x) ok(x, #x) +#define TEST(x) ok(x, #x"\n") +#define RTEST(x) ok(x, #x"\n") void Test_GetStockObject() { Modified: trunk/rostests/apitests/gdi32/GetTextExtentExPoint.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/GetTextExt… ============================================================================== --- trunk/rostests/apitests/gdi32/GetTextExtentExPoint.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/GetTextExtentExPoint.c [iso-8859-1] Sun Oct 17 14:50:02 2010 @@ -9,8 +9,8 @@ #include <wine/test.h> #include <windows.h> -#define TEST(x) ok(x, #x) -#define RTEST(x) ok(x, #x) +#define TEST(x) ok(x, #x"\n") +#define RTEST(x) ok(x, #x"\n") void Test_GetTextExtentExPoint() { Modified: trunk/rostests/apitests/gdi32/GetTextFace.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/GetTextFac… ============================================================================== --- trunk/rostests/apitests/gdi32/GetTextFace.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/GetTextFace.c [iso-8859-1] Sun Oct 17 14:50:02 2010 @@ -9,8 +9,8 @@ #include <wine/test.h> #include <windows.h> -#define TEST(x) ok(x, #x) -#define RTEST(x) ok(x, #x) +#define TEST(x) ok(x, #x"\n") +#define RTEST(x) ok(x, #x"\n") void Test_GetTextFace() { Modified: trunk/rostests/apitests/gdi32/SelectObject.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/SelectObje… ============================================================================== --- trunk/rostests/apitests/gdi32/SelectObject.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/SelectObject.c [iso-8859-1] Sun Oct 17 14:50:02 2010 @@ -12,8 +12,8 @@ #include <reactos/win32k/ntgdityp.h> #include <reactos/win32k/ntgdihdl.h> -#define TEST(x) ok(x, #x) -#define RTEST(x) ok(x, #x) +#define TEST(x) ok(x, #x"\n") +#define RTEST(x) ok(x, #x"\n") void Test_SelectObject() { @@ -101,7 +101,7 @@ RTEST((UINT_PTR)SelectObject(hDC, hNewObj) == SIMPLEREGION); // ??? Why this? DeleteObject(hNewObj); // TEST(IsHandleValid(hNewObj) == TRUE); - + RTEST(GetLastError() == ERROR_SUCCESS); /* Test BITMAP */ Modified: trunk/rostests/apitests/gdi32/SetMapMode.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/SetMapMode… ============================================================================== --- trunk/rostests/apitests/gdi32/SetMapMode.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/SetMapMode.c [iso-8859-1] Sun Oct 17 14:50:02 2010 @@ -9,8 +9,8 @@ #include <wine/test.h> #include <windows.h> -#define TEST(x) ok(x, #x) -#define RTEST(x) ok(x, #x) +#define TEST(x) ok(x, #x"\n") +#define RTEST(x) ok(x, #x"\n") void Test_SetMapMode() { Modified: trunk/rostests/apitests/gdi32/SetSysColors.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/SetSysColo… ============================================================================== --- trunk/rostests/apitests/gdi32/SetSysColors.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/SetSysColors.c [iso-8859-1] Sun Oct 17 14:50:02 2010 @@ -9,8 +9,8 @@ #include <wine/test.h> #include <windows.h> -#define TEST(x) ok(x, #x) -#define RTEST(x) ok(x, #x) +#define TEST(x) ok(x, #x"\n") +#define RTEST(x) ok(x, #x"\n") #define NUM_SYSCOLORS 31 Modified: trunk/rostests/apitests/gdi32/SetWindowExtEx.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/SetWindowE… ============================================================================== --- trunk/rostests/apitests/gdi32/SetWindowExtEx.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/SetWindowExtEx.c [iso-8859-1] Sun Oct 17 14:50:02 2010 @@ -9,8 +9,8 @@ #include <wine/test.h> #include <windows.h> -#define TEST(x) ok(x, #x) -#define RTEST(x) ok(x, #x) +#define TEST(x) ok(x, #x"\n") +#define RTEST(x) ok(x, #x"\n") void Test_SetWindowExtEx() { @@ -101,7 +101,7 @@ //TEST(WindowExt.cy == 2700); /* Values should be changed */ - ret = SetWindowExtEx(hDC, + ret = SetWindowExtEx(hDC, 4 * GetDeviceCaps(GetDC(0), HORZRES), -4 * GetDeviceCaps(GetDC(0), VERTRES), &WindowExt);

14 years, 2 months

[spetreolle] 49181: Katayama Hirofumi: Add / update Japanese translations. Fix typos in calc en-US resource. Bug #5673, 5674, 5675, 5676.

by spetreolle＠svn.reactos.org

Author: spetreolle Date: Sun Oct 17 12:47:02 2010 New Revision: 49181 URL: http://svn.reactos.org/svn/reactos?rev=49181&view=rev Log: Katayama Hirofumi: Add / update Japanese translations. Fix typos in calc en-US resource. Bug #5673,5674,5675,5676. Added: trunk/reactos/base/applications/calc/lang/ja-JP.rc (with props) Modified: trunk/reactos/base/applications/calc/lang/en-US.rc trunk/reactos/base/applications/calc/resource.rc trunk/reactos/base/setup/usetup/lang/ja-JP.h trunk/reactos/dll/win32/newdev/lang/ja-JP.rc trunk/reactos/dll/win32/syssetup/lang/ja-JP.rc Modified: trunk/reactos/base/applications/calc/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/en-US.rc [iso-8859-1] Sun Oct 17 12:47:02 2010 @@ -343,8 +343,8 @@ BEGIN POPUP "Edit" BEGIN - MENUITEM "Copy\tCTRL-C", IDM_EDIT_COPY - MENUITEM "Paste\tCTRL-V", IDM_EDIT_PASTE + MENUITEM "Copy\tCtrl+C", IDM_EDIT_COPY + MENUITEM "Paste\tCtrl+V", IDM_EDIT_PASTE END POPUP "View" BEGIN @@ -375,8 +375,8 @@ BEGIN POPUP "Edit" BEGIN - MENUITEM "Copy\tCTRL-C", IDM_EDIT_COPY - MENUITEM "Paste\tCTRL-V", IDM_EDIT_PASTE + MENUITEM "Copy\tCtrl+C", IDM_EDIT_COPY + MENUITEM "Paste\tCtrl+V", IDM_EDIT_PASTE END POPUP "View" BEGIN @@ -408,8 +408,8 @@ BEGIN POPUP "Edit" BEGIN - MENUITEM "Copy\tCTRL-C", IDM_EDIT_COPY - MENUITEM "Paste\tCTRL-V", IDM_EDIT_PASTE + MENUITEM "Copy\tCtrl+C", IDM_EDIT_COPY + MENUITEM "Paste\tCtrl+V", IDM_EDIT_PASTE END POPUP "View" BEGIN Added: trunk/reactos/base/applications/calc/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/ja-JP.rc (added) +++ trunk/reactos/base/applications/calc/lang/ja-JP.rc [iso-8859-1] Sun Oct 17 12:47:02 2010 @@ -1,0 +1,732 @@ +LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT + +// Dialog + +IDD_DIALOG_SCIENTIFIC DIALOGEX 0, 0, 316, 161 +STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ReactOS dì" +MENU IDR_MENU_SCIENTIFIC_1 +FONT 9, "MS UI Gothic", 0, 0, 0x1 +BEGIN + GROUPBOX "",IDC_STATIC,4,16,132,21 + CONTROL "16i",IDC_RADIO_HEX,"Button",BS_AUTORADIOBUTTON,8,24,29,10 + CONTROL "10i",IDC_RADIO_DEC,"Button",BS_AUTORADIOBUTTON,40,24,29,10 + CONTROL "8i",IDC_RADIO_OCT,"Button",BS_AUTORADIOBUTTON,72,24,27,10 + CONTROL "2i",IDC_RADIO_BIN,"Button",BS_AUTORADIOBUTTON,100,24,26,10 + GROUPBOX "",IDC_STATIC,4,36,76,21 + CONTROL "Inv",IDC_CHECK_INV,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,8,44,26,10 + CONTROL "Hyp",IDC_CHECK_HYP,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,40,44,29,10 + CTEXT "",IDC_TEXT_PARENT,84,40,24,17,SS_CENTERIMAGE, + WS_EX_CLIENTEDGE + CTEXT "",IDC_TEXT_MEMORY,112,40,24,17,SS_CENTERIMAGE, + WS_EX_CLIENTEDGE + PUSHBUTTON "Sta",IDC_BUTTON_STA,4,64,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Ave",IDC_BUTTON_AVE,4,83,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | WS_DISABLED | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Sum",IDC_BUTTON_SUM,4,102,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | WS_DISABLED | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "s",IDC_BUTTON_S,4,121,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | WS_DISABLED | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Dat",IDC_BUTTON_DAT,4,140,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | WS_DISABLED | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "F-E",IDC_BUTTON_FE,38,64,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "dms",IDC_BUTTON_DMS,38,83,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "sin",IDC_BUTTON_SIN,38,102,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "cos",IDC_BUTTON_COS,38,121,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "tan",IDC_BUTTON_TAN,38,140,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "(",IDC_BUTTON_LEFTPAR,64,64,24,17,BS_CENTER | + BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Exp",IDC_BUTTON_EXP,64,83,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "x^y",IDC_BUTTON_XeY,64,102,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "x^2",IDC_BUTTON_Xe2,64,121,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "x^3",IDC_BUTTON_Xe3,64,140,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON ")",IDC_BUTTON_RIGHTPAR,90,64,24,17,BS_CENTER | + BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "ln",IDC_BUTTON_LN,90,83,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "log",IDC_BUTTON_LOG,90,102,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "n!",IDC_BUTTON_NF,90,121,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "1/x",IDC_BUTTON_RX,90,140,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "MC",IDC_BUTTON_MC,124,64,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "MR",IDC_BUTTON_MR,124,83,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "MS",IDC_BUTTON_MS,124,102,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "M+",IDC_BUTTON_MP,124,121,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "pi",IDC_BUTTON_PI,124,140,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "7",IDC_BUTTON_7,158,64,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "4",IDC_BUTTON_4,158,83,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "1",IDC_BUTTON_1,158,102,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "0",IDC_BUTTON_0,158,121,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "A",IDC_BUTTON_A,158,140,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "8",IDC_BUTTON_8,184,64,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "5",IDC_BUTTON_5,184,83,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "2",IDC_BUTTON_2,184,102,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "+/-",IDC_BUTTON_SIGN,184,121,24,17,BS_CENTER | + BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "B",IDC_BUTTON_B,184,140,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "9",IDC_BUTTON_9,210,64,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "6",IDC_BUTTON_6,210,83,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "3",IDC_BUTTON_3,210,102,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON ",",IDC_BUTTON_DOT,210,121,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "C",IDC_BUTTON_C,210,140,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "/",IDC_BUTTON_DIV,236,64,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "*",IDC_BUTTON_MULT,236,83,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "-",IDC_BUTTON_SUB,236,102,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "+",IDC_BUTTON_ADD,236,121,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "D",IDC_BUTTON_D,236,140,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Mod",IDC_BUTTON_MOD,262,64,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Or",IDC_BUTTON_OR,262,83,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Lsh",IDC_BUTTON_LSH,262,102,24,17,BS_CENTER | + BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "=",IDC_BUTTON_EQU,262,121,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "E",IDC_BUTTON_E,262,140,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "And",IDC_BUTTON_AND,288,64,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Xor",IDC_BUTTON_XOR,288,83,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Not",IDC_BUTTON_NOT,288,102,24,17,BS_CENTER | + BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Int",IDC_BUTTON_INT,288,121,24,17,BS_CENTER | + BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "F",IDC_BUTTON_F,288,140,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + GROUPBOX "",IDC_STATIC,140,16,172,21 + CONTROL "Qword",IDC_RADIO_QWORD,"Button",BS_AUTORADIOBUTTON | + NOT WS_VISIBLE,148,24,37,10 + CONTROL "Dword",IDC_RADIO_DWORD,"Button",BS_AUTORADIOBUTTON | + NOT WS_VISIBLE,188,24,37,10 + CONTROL "Word",IDC_RADIO_WORD,"Button",BS_AUTORADIOBUTTON | NOT + WS_VISIBLE,232,24,33,10 + CONTROL "Byte",IDC_RADIO_BYTE,"Button",BS_AUTORADIOBUTTON | NOT + WS_VISIBLE,272,24,30,10 + CONTROL "Degrees",IDC_RADIO_DEG,"Button",BS_AUTORADIOBUTTON,148,24, + 42,10 + CONTROL "Radians",IDC_RADIO_RAD,"Button",BS_AUTORADIOBUTTON,192, + 24,42,10 + CONTROL "Gradians",IDC_RADIO_GRAD,"Button",BS_AUTORADIOBUTTON, + 236,24,44,10 + PUSHBUTTON "C",IDC_BUTTON_CANC,272,40,40,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "CE",IDC_BUTTON_CE,228,40,40,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Back",IDC_BUTTON_BACK,184,40,40,17,BS_CENTER | + BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + RTEXT "",IDC_TEXT_OUTPUT,4,4,308,12,SS_CENTERIMAGE, + WS_EX_CLIENTEDGE + DEFPUSHBUTTON "",IDC_BUTTON_FOCUS,0,0,5,5, NOT WS_VISIBLE +END + +IDD_DIALOG_STANDARD DIALOGEX 0, 0, 172, 127 +STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ReactOS dì" +MENU IDR_MENU_STANDARD +FONT 9, "MS UI Gothic", 0, 0, 0x1 +BEGIN + PUSHBUTTON "C",IDC_BUTTON_CANC,128,24,40,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "CE",IDC_BUTTON_CE,84,24,40,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Back",IDC_BUTTON_BACK,40,24,40,17,BS_CENTER | + BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + RTEXT "",IDC_TEXT_OUTPUT,4,4,164,12,SS_CENTERIMAGE, + WS_EX_CLIENTEDGE + PUSHBUTTON "7",IDC_BUTTON_7,40,48,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "4",IDC_BUTTON_4,40,67,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "1",IDC_BUTTON_1,40,86,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "0",IDC_BUTTON_0,40,105,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "8",IDC_BUTTON_8,66,48,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "5",IDC_BUTTON_5,66,67,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "2",IDC_BUTTON_2,66,86,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "+/-",IDC_BUTTON_SIGN,66,105,24,17,BS_CENTER | + BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "9",IDC_BUTTON_9,92,48,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "6",IDC_BUTTON_6,92,67,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "3",IDC_BUTTON_3,92,86,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON ",",IDC_BUTTON_DOT,92,105,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "/",IDC_BUTTON_DIV,118,48,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "*",IDC_BUTTON_MULT,118,67,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "-",IDC_BUTTON_SUB,118,86,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "+",IDC_BUTTON_ADD,118,105,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Sqrt",IDC_BUTTON_SQRT,144,48,24,17,BS_CENTER | + BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "%",IDC_BUTTON_PERCENT,144,67,24,17,BS_CENTER | + BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "1/x",IDC_BUTTON_RX,144,86,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "=",IDC_BUTTON_EQU,144,105,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + CTEXT "",IDC_TEXT_MEMORY,4,24,24,17,SS_CENTERIMAGE, + WS_EX_CLIENTEDGE + PUSHBUTTON "MC",IDC_BUTTON_MC,4,48,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "MR",IDC_BUTTON_MR,4,67,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "MS",IDC_BUTTON_MS,4,86,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "M+",IDC_BUTTON_MP,4,105,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + DEFPUSHBUTTON "",IDC_BUTTON_FOCUS,0,0,5,5, NOT WS_VISIBLE +END + +IDD_DIALOG_CONVERSION DIALOGEX 0, 0, 320, 130 +STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ReactOS dì" +MENU IDR_MENU_STANDARD +FONT 9, "MS UI Gothic" +BEGIN + PUSHBUTTON "Ï·",IDC_BUTTON_CONVERT,35,105,76,17 + COMBOBOX IDC_COMBO_CATEGORY,4,31,140,168,CBS_DROPDOWNLIST | + WS_VSCROLL | WS_TABSTOP | CBS_SORT + LTEXT "ªÞ:",IDC_STATIC,4,20,56,8 + COMBOBOX IDC_COMBO_FROM,4,60,140,168,CBS_DROPDOWNLIST | + WS_VSCROLL | WS_TABSTOP | CBS_SORT + LTEXT "Ï·³:",IDC_STATIC,4,49,56,8 + COMBOBOX IDC_COMBO_TO,4,87,140,168,CBS_DROPDOWNLIST | WS_VSCROLL | + WS_TABSTOP | CBS_SORT + LTEXT "Ï·æ:",IDC_STATIC,4,76,56,8 + CONTROL "C",IDC_BUTTON_CANC,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,276,24,40,17 + CONTROL "CE",IDC_BUTTON_CE,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,232,24,40,17 + CONTROL "Back",IDC_BUTTON_BACK,"Button",BS_OWNERDRAW | + BS_CENTER | BS_VCENTER | BS_NOTIFY | WS_TABSTOP,188,24, + 40,17 + RTEXT "",IDC_TEXT_OUTPUT,4,4,312,12,SS_CENTERIMAGE, + WS_EX_CLIENTEDGE + CONTROL "7",IDC_BUTTON_7,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,188,48,24,17 + CONTROL "4",IDC_BUTTON_4,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,188,67,24,17 + CONTROL "1",IDC_BUTTON_1,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,188,86,24,17 + CONTROL "0",IDC_BUTTON_0,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,188,105,24,17 + CONTROL "8",IDC_BUTTON_8,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,214,48,24,17 + CONTROL "5",IDC_BUTTON_5,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,214,67,24,17 + CONTROL "2",IDC_BUTTON_2,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,214,86,24,17 + CONTROL "+/-",IDC_BUTTON_SIGN,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,214,105,24,17 + CONTROL "9",IDC_BUTTON_9,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,240,48,24,17 + CONTROL "6",IDC_BUTTON_6,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,240,67,24,17 + CONTROL "3",IDC_BUTTON_3,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,240,86,24,17 + CONTROL ",",IDC_BUTTON_DOT,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,240,105,24,17 + CONTROL "/",IDC_BUTTON_DIV,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,266,48,24,17 + CONTROL "*",IDC_BUTTON_MULT,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,266,67,24,17 + CONTROL "-",IDC_BUTTON_SUB,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,266,86,24,17 + CONTROL "+",IDC_BUTTON_ADD,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,266,105,24,17 + CONTROL "Sqrt",IDC_BUTTON_SQRT,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,292,48,24,17 + CONTROL "%",IDC_BUTTON_PERCENT,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,292,67,24,17 + CONTROL "1/x",IDC_BUTTON_RX,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,292,86,24,17 + CONTROL "=",IDC_BUTTON_EQU,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,292,105,24,17 + CTEXT "",IDC_TEXT_MEMORY,152,24,24,17,SS_CENTERIMAGE, + WS_EX_CLIENTEDGE + CONTROL "MC",IDC_BUTTON_MC,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,152,48,24,17 + CONTROL "MR",IDC_BUTTON_MR,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,152,67,24,17 + CONTROL "MS",IDC_BUTTON_MS,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,152,86,24,17 + CONTROL "M+",IDC_BUTTON_MP,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,152,105,24,17 + DEFPUSHBUTTON "",IDC_BUTTON_FOCUS,0,0,5,5,NOT WS_VISIBLE +END + +IDD_DIALOG_ABOUT DIALOGEX DISCARDABLE 0, 0, 264, 169 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ReactOS dìÉÂ¢Ä" +FONT 9, "MS UI Gothic" +BEGIN + DEFPUSHBUTTON "OK",IDOK,105,148,52,16 + CONTROL IDB_BITMAP_ROS,IDC_STATIC,"Static",SS_BITMAP | SS_CENTERIMAGE | + SS_REALSIZEIMAGE | WS_BORDER,4,4,104,48 + LTEXT "ReactOS dì",IDC_STATIC,120,12,132,8, + SS_CENTERIMAGE + LTEXT "Version ",IDC_TEXT_VERSION,120,20,132,8,SS_CENTERIMAGE + LTEXT "Written by Carlo Bramini",IDC_STATIC,120,32,132,8, + SS_CENTERIMAGE + GROUPBOX "",IDC_STATIC,112,0,148,52 + GROUPBOX "",IDC_STATIC,4,56,256,88 + EDITTEXT IDC_EDIT_LICENSE,12,68,240,68,ES_MULTILINE | ES_READONLY | + WS_VSCROLL +END + +IDD_DIALOG_STAT DIALOGEX DISCARDABLE 0, 0, 163, 85 +STYLE DS_SHELLFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Statistics box" +FONT 9, "MS UI Gothic" +BEGIN + LISTBOX IDC_LIST_STAT,4,4,156,40,LBS_NOINTEGRALHEIGHT | + WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "RET",IDC_BUTTON_RET,4,48,36,16 + PUSHBUTTON "LOAD",IDC_BUTTON_LOAD,44,48,36,16 + PUSHBUTTON "CD",IDC_BUTTON_CD,84,48,36,16 + PUSHBUTTON "CAD",IDC_BUTTON_CAD,124,48,36,16 + CTEXT "n=0",IDC_TEXT_NITEMS,4,68,156,12,SS_CENTERIMAGE | + SS_SUNKEN +END + +// Menus + +IDR_MENU_SCIENTIFIC_1 MENU DISCARDABLE +BEGIN + POPUP "ÒW" + BEGIN + MENUITEM "Rs[\tCtrl+C", IDM_EDIT_COPY + MENUITEM "\\èt¯\tCtrl+V", IDM_EDIT_PASTE + END + POPUP "\\¦" + BEGIN + MENUITEM "W", IDM_VIEW_STANDARD, CHECKED + MENUITEM "Ödì", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "Ï·", IDM_VIEW_CONVERSION + MENUITEM SEPARATOR + MENUITEM "16i\tF5", IDM_VIEW_HEX, CHECKED + MENUITEM "10i\tF6", IDM_VIEW_DEC, CHECKED + MENUITEM "8i\tF7", IDM_VIEW_OCT, CHECKED + MENUITEM "2i\tF8", IDM_VIEW_BIN, CHECKED + MENUITEM SEPARATOR + MENUITEM "Degrees\tF2", IDM_VIEW_DEG, CHECKED + MENUITEM "Radians\tF3", IDM_VIEW_RAD, CHECKED + MENUITEM "Gradians\tF4", IDM_VIEW_GRAD, CHECKED + MENUITEM SEPARATOR + MENUITEM "ðæØé", IDM_VIEW_GROUP, CHECKED + END + POPUP "wv" + BEGIN + MENUITEM "wv gsbN", IDM_HELP_HELP + MENUITEM SEPARATOR + MENUITEM "ReactOS dìÉÂ¢Ä", IDM_HELP_ABOUT + END +END + +IDR_MENU_SCIENTIFIC_2 MENU DISCARDABLE +BEGIN + POPUP "ÒW" + BEGIN + MENUITEM "Rs[\tCtrl+C", IDM_EDIT_COPY + MENUITEM "\\èt¯\tCtrl+V", IDM_EDIT_PASTE + END + POPUP "\\¦" + BEGIN + MENUITEM "W", IDM_VIEW_STANDARD, CHECKED + MENUITEM "Ödì", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "Ï·", IDM_VIEW_CONVERSION + MENUITEM SEPARATOR + MENUITEM "16i\tF5", IDM_VIEW_HEX, CHECKED + MENUITEM "10i\tF6", IDM_VIEW_DEC, CHECKED + MENUITEM "8i\tF7", IDM_VIEW_OCT, CHECKED + MENUITEM "2i\tF8", IDM_VIEW_BIN, CHECKED + MENUITEM SEPARATOR + MENUITEM "Qword\tF12", IDM_VIEW_QWORD, CHECKED + MENUITEM "Dword\tF2", IDM_VIEW_DWORD, CHECKED + MENUITEM "Word\tF3", IDM_VIEW_WORD, CHECKED + MENUITEM "Byte\tF4", IDM_VIEW_BYTE, CHECKED + MENUITEM SEPARATOR + MENUITEM "ðæØé", IDM_VIEW_GROUP, CHECKED + END + POPUP "wv" + BEGIN + MENUITEM "wv gsbN", IDM_HELP_HELP + MENUITEM SEPARATOR + MENUITEM "ReactOS dìÉÂ¢Ä", IDM_HELP_ABOUT + END +END + +IDR_MENU_STANDARD MENU DISCARDABLE +BEGIN + POPUP "ÒW" + BEGIN + MENUITEM "Rs[\tCtrl+C", IDM_EDIT_COPY + MENUITEM "\\èt¯\tCtrl+V", IDM_EDIT_PASTE + END + POPUP "\\¦" + BEGIN + MENUITEM "W", IDM_VIEW_STANDARD, CHECKED + MENUITEM "Ödì", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "Ï·", IDM_VIEW_CONVERSION + MENUITEM SEPARATOR + MENUITEM "ðæØé", IDM_VIEW_GROUP, CHECKED + END + POPUP "wv" + BEGIN + MENUITEM "wv gsbN", IDM_HELP_HELP + MENUITEM SEPARATOR + MENUITEM "ReactOS dìÉÂ¢Ä", IDM_HELP_ABOUT + END +END + +// String Tables + +STRINGTABLE DISCARDABLE +BEGIN + IDS_STRING_LICENSE "ReactOS dìÍGNU GPLCZXÌ³Åñ³êét[\\tgEFAÅ·B\r\n\r\n±¿çÅGNU GPLCZXÌRs[ð¾é±ÆªÅ«Ü·:\r\nhttp://www.gnu.org/licenses/g… GPLCZXÌ|óð¾é±ÆªÅ«Ü·:\r\nhttp://www.gnu.org/licenses/tra…" + IDS_MATH_ERROR "G[" + IDS_QUICKHELP "NCbNwv" +END + +// Types of conversion +STRINGTABLE DISCARDABLE +BEGIN + IDS_CONV_ANGLE "px" + IDS_CONV_AREA "ÊÏ" + IDS_CONV_CONSUMPTION "Áï (GW)" + IDS_CONV_CURRENCY "ÊÝ" + IDS_CONV_ENERGY "GlM[" + IDS_CONV_LENGTH "·³" + IDS_CONV_POWER "Í" + IDS_CONV_PRESSURE "³Í" + IDS_CONV_TEMPERATURE "·x" + IDS_CONV_TIME "Ô" + IDS_CONV_VELOCITY "¬x" + IDS_CONV_VOLUME "ÌÏ" + IDS_CONV_WEIGHT "d³" +END + +// TYPES OF ANGLES +STRINGTABLE DISCARDABLE +BEGIN + IDS_ANGLE_DEGREES "Degrees" + IDS_ANGLE_GRADIANS "Gradians" + IDS_ANGLE_RADIANS "Radians" +END + +// TYPES OF AREAS +STRINGTABLE DISCARDABLE +BEGIN + IDS_AREA_ACRES "G[J[" + IDS_AREA_ACRES_BRAZIL "G[J[ (uW)" + IDS_AREA_ACRES_FRANCE "G[J[ (tX)" + IDS_AREA_ACRES_SCOTS "G[J[ (XRbgh)" + IDS_AREA_ACRES_US "G[J[ (Ä)" + IDS_AREA_ARES "A[" + IDS_AREA_CHOU "Chou" + IDS_AREA_DANBO "Danbo" + IDS_AREA_HECTARES "wN^[" + IDS_AREA_JEONGBO "Jeongbo" + IDS_AREA_MORGEN_HUNGARY "Morgen (Hungary)" + IDS_AREA_MU "Mu" + IDS_AREA_PING "Ping" + IDS_AREA_PYEONG "Pyeong" + IDS_AREA_PYEONGBANGJA "Pyeongbangja" + IDS_AREA_RAI "Rai" + IDS_AREA_SE "Se" + IDS_AREA_SQUARE_CENTIMETERS "½ûZ`[g" + IDS_AREA_SQUARE_CHR "Square chr" + IDS_AREA_SQUARE_FATHOMS "½ûq" + IDS_AREA_SQUARE_FATHOMS_HUNGARY "½ûq (nK[)" + IDS_AREA_SQUARE_FEET "½ûtB[g" + IDS_AREA_SQUARE_INCHES "½ûC`" + IDS_AREA_SQUARE_KILOMETERS "½ûL[^[" + IDS_AREA_SQUARE_LAR "Square lar" + IDS_AREA_SQUARE_METER "½û[g" + IDS_AREA_SQUARE_MILES "½û}C" + IDS_AREA_SQUARE_MILLIMETERS "½û~[g" + IDS_AREA_SQUARE_SHAKU "½ûÚ" + IDS_AREA_SQUARE_TSUEN "Square tsuen" + IDS_AREA_SQUARE_VA "Square va" + IDS_AREA_SQUARE_YARD "½û[h" + IDS_AREA_TAN "Tan" + IDS_AREA_TSUBO "Ø" +END + +// TYPES OF COMSUMPTIONS +STRINGTABLE DISCARDABLE +BEGIN + IDS_CONSUMPTION_KM_PER_L "L[g/bg" + IDS_CONSUMPTION_L_PER_100_KM "bg/100L[g" + IDS_CONSUMPTION_MILES_GALLON_UK "}C/K (p)" + IDS_CONSUMPTION_MILES_GALLON_US "}C/K (Ä)" +END + +// TYPES OF CURRENCIES +STRINGTABLE DISCARDABLE +BEGIN + IDS_CURRENCY_AUSTRIAN_SCHILLING "I[XgA VO" + IDS_CURRENCY_BELGIAN_FRANC "xM[ t" + IDS_CURRENCY_CYPRIOT_POUND "LvX |h" + IDS_CURRENCY_CZECH_KORUNA "`FR Ri" + IDS_CURRENCY_DEUTSCHE_MARK "hCc }N" + IDS_CURRENCY_DUTCH_GUILDER "I_ M_[" + IDS_CURRENCY_EURO "[" + IDS_CURRENCY_FINNISH_MARKKA "tBh }bJ" + IDS_CURRENCY_FRENCH_FRANC "tX t" + IDS_CURRENCY_GREEK_DRACHMA "MV hN}" + IDS_CURRENCY_IRISH_POUND "ACh |h" + IDS_CURRENCY_ITALIAN_LIRA "C^A " + IDS_CURRENCY_LUXEMBOURG_FRANC "NZuN t" + IDS_CURRENCY_MALTESE_LIRA "}^ " + IDS_CURRENCY_PORTOGUESE_ESCUDO "|gK GXN[h" + IDS_CURRENCY_SLOVAK_KORUNA "XoLA Ri" + IDS_CURRENCY_SLOVENIAN_TOLAR "XxjA tolar" + IDS_CURRENCY_SPANISH_PESETA "XyC yZ^" +END + +// TYPES OF ENERGIES +STRINGTABLE DISCARDABLE +BEGIN + IDS_ENERGY_15_C_CALORIES "15J[" + IDS_ENERGY_BTUS "pMPÊ" + IDS_ENERGY_ERGS "GO" + IDS_ENERGY_EVS "dq{g" + IDS_ENERGY_FOOT_POUNDS "t[g|h" + IDS_ENERGY_IT_CALORIES "International Table calories" + IDS_ENERGY_IT_KILOCALORIES "International Table kilocalories" + IDS_ENERGY_JOULES "W[" + IDS_ENERGY_KILOJOULES "LW[" + IDS_ENERGY_KILOWATT_HOURS "Lbg" + IDS_ENERGY_NUTRITION_CALORIES "h{J[" + IDS_ENERGY_TH_CALORIES "M»wJ[" +END + +// TYPES OF LENGTHS +STRINGTABLE DISCARDABLE +BEGIN + IDS_LENGTH_ANGSTROMS "IOXg[" + IDS_LENGTH_ASTRONOMICAL_UNITS "V¶PÊ" + IDS_LENGTH_BARLEYCORNS "o[[R[" + IDS_LENGTH_CENTIMETERS "Z`[g" + IDS_LENGTH_CHAINS_UK "`F[ (p)" + IDS_LENGTH_CHI "Chi" + IDS_LENGTH_CHOU "Chou" + IDS_LENGTH_CHR "Chr" + IDS_LENGTH_CUN "Cun" + IDS_LENGTH_FATHOMS "t@]" + IDS_LENGTH_FATHOMS_HUNGARY "t@] (nK[)" + IDS_LENGTH_FEET "tB[g" + IDS_LENGTH_FURLONGS "n" + IDS_LENGTH_GAN "Gan" + IDS_LENGTH_HANDS "nh" + IDS_LENGTH_HUNH "Hunh" + IDS_LENGTH_INCHES "C`" + IDS_LENGTH_JA "Ja" + IDS_LENGTH_JEONG "Jeong" + IDS_LENGTH_KABIET "Kabiet" + IDS_LENGTH_KEN "Ken" + IDS_LENGTH_KEUB "Keub" + IDS_LENGTH_KILOMETERS "L[g" + IDS_LENGTH_LAR "Lar" + IDS_LENGTH_LIGHT_YEARS "õN" + IDS_LENGTH_LINKS_UK "N (p)" + IDS_LENGTH_METERS "[g" + IDS_LENGTH_MICRONS "~N" + IDS_LENGTH_MILES "}C" + IDS_LENGTH_MILLIMETERS "~[g" + IDS_LENGTH_NAUTICAL_MILES "C¢" + IDS_LENGTH_NIEU "Nieu" + IDS_LENGTH_PARSECS "p[ZN" + IDS_LENGTH_PICAS "pCJ" + IDS_LENGTH_RI_JAPAN "¢ (ú{)" + IDS_LENGTH_RI_KOREA "Ri (Ø)" + IDS_LENGTH_RODS "bh" + IDS_LENGTH_SAWK "Sawk" + IDS_LENGTH_SEN "Sen" + IDS_LENGTH_SHAKU "Ú" + IDS_LENGTH_SPAN "Xp" + IDS_LENGTH_SUN "¡" + IDS_LENGTH_TSUEN "Tsuen" + IDS_LENGTH_VA "Va" + IDS_LENGTH_YARDS "[h" + IDS_LENGTH_YOTE "Yote" + IDS_LENGTH_ZHANG "Zhang" +END + +// TYPES OF POWERS +STRINGTABLE DISCARDABLE +BEGIN + IDS_POWER_BTUS_PER_MINUTE "pMPÊ/ª" + IDS_POWER_FPS_PER_MINUTE "t[g|h/ª" + IDS_POWER_HORSEPOWER "nÍ" + IDS_POWER_KILOWATTS "Lbg" + IDS_POWER_MEGAWATTS "Kbg" + IDS_POWER_WATTS "bg" +END + +// TYPE OF PRESSURES +STRINGTABLE DISCARDABLE +BEGIN + IDS_PRESSURE_ATMOSPHERES "C³" + IDS_PRESSURE_BARS "Bars" + IDS_PRESSURE_HECTOPASCALS "wNgpXJ" + IDS_PRESSURE_KILOPASCALS "LpXJ" + IDS_PRESSURE_MM_OF_MERCURY "â~[g" + IDS_PRESSURE_PASCALS "pXJ" + IDS_PRESSURE_PSI "|hd/½ûC`" +END + +// TYPES OF TEMPERATURES +STRINGTABLE DISCARDABLE +BEGIN + IDS_TEMPERATURE_CELSIUS "Û" + IDS_TEMPERATURE_FAHRENHEIT "Ø" + IDS_TEMPERATURE_KELVIN "Pr" + IDS_TEMPERATURE_RANKINE "Rankine" +END + +// TYPES OF TIME +STRINGTABLE DISCARDABLE +BEGIN + IDS_TIME_DAYS "ú" + IDS_TIME_HOURS "Ô" + IDS_TIME_NANOSECONDS "imb" + IDS_TIME_MICROSECONDS "}CNb" + IDS_TIME_MILLISECONDS "~b" + IDS_TIME_MINUTES "ª" + IDS_TIME_SECONDS "b" + IDS_TIME_WEEKS "T" + IDS_TIME_YEARS "N" +END + +// TYPES OF VELOCITIES +STRINGTABLE DISCARDABLE +BEGIN + IDS_VELOCITY_CMS_SECOND "Z`[g/" + IDS_VELOCITY_FEET_HOUR "tB[g/" + IDS_VELOCITY_FEET_SECOND "tB[g/b" + IDS_VELOCITY_KILOMETERS_HOUR "L[g/" + IDS_VELOCITY_KNOTS "mbg" + IDS_VELOCITY_MACH "}bn" + IDS_VELOCITY_METERS_SECOND "[g/b" + IDS_VELOCITY_MILES_HOUR "}C/" +END + +// TYPES OF VOLUMES +STRINGTABLE DISCARDABLE +BEGIN + IDS_VOLUME_BARRELS_UK "o (p)" + IDS_VOLUME_BARRELS_OIL "Îûo" + IDS_VOLUME_BUN "Bun" + IDS_VOLUME_BUSHELS_UK "ubVF (p)" + IDS_VOLUME_BUSHELS_US "ubVF (Ä)" + IDS_VOLUME_CUBIC_CENTIMETERS "§@Z`[g" + IDS_VOLUME_CUBIC_FEET "§@tB[g" + IDS_VOLUME_CUBIC_INCHES "§@C`" + IDS_VOLUME_CUBIC_METERS "§@[g" + IDS_VOLUME_CUBIC_YARDS "§@[h" + IDS_VOLUME_DOE "Doe" + IDS_VOLUME_FLUID_OUNCES_UK "¬ÌIX (p)" + IDS_VOLUME_FLUID_OUNCES_US "¬ÌIX (Ä)" + IDS_VOLUME_GALLONS_UK "K (p)" + IDS_VOLUME_GALLONS_DRY_US "KA£ (Ä)" + IDS_VOLUME_GALLONS_LIQUID_US "KAtÌ (Ä)" + IDS_VOLUME_GOU "Gou" + IDS_VOLUME_HOP "Hop" + IDS_VOLUME_ICCE "Icce" + IDS_VOLUME_KWIAN "Kwian" + IDS_VOLUME_LITERS "bg" + IDS_VOLUME_MAL "Mal" + IDS_VOLUME_MILLILITERS "~bg" + IDS_VOLUME_PINTS_UK "pCg (p)" + IDS_VOLUME_PINTS_DRY_US "pCgA£ (Ä)" + IDS_VOLUME_PINTS_LIQUID_US "pCgAtÌ (Ä)" + IDS_VOLUME_QUARTS_UK "NH[g (p)" + IDS_VOLUME_QUARTS_DRY_US "NH[gA£ (Ä)" + IDS_VOLUME_QUARTS_LIQUID_US "NH[gAtÌ (Ä)" + IDS_VOLUME_SEKI "Seki" + IDS_VOLUME_SYOU "Syou" + IDS_VOLUME_TANANLOUNG "Tananloung" + IDS_VOLUME_TANG "Tang" + IDS_VOLUME_TO "To" +END + +// TYPES OF WEIGHTS +STRINGTABLE DISCARDABLE +BEGIN + IDS_WEIGHT_BAHT "Baht" + IDS_WEIGHT_CARATS "Jbg" + IDS_WEIGHT_CHUNG "Chung" + IDS_WEIGHT_DON "Don" + IDS_WEIGHT_GEUN "Geun" + IDS_WEIGHT_GRAMS "O" + IDS_WEIGHT_GWAN "Gwan" + IDS_WEIGHT_HARB "Harb" + IDS_WEIGHT_JIN_CHINA "Jin ()" + IDS_WEIGHT_JIN_TAIWAN "Jin (äp)" + IDS_WEIGHT_KAN "Kan" + IDS_WEIGHT_KILOGRAMS "LO" + IDS_WEIGHT_KIN "Kin" + IDS_WEIGHT_LIANG_CHINA "Liang ()" + IDS_WEIGHT_LIANG_TAIWAN "Liang (äp)" + IDS_WEIGHT_MONME "æ (àñß)" + IDS_WEIGHT_OUNCES_AVOIRDUPOIS "ítIX" + IDS_WEIGHT_OUNCES_TROY "gC IX" + IDS_WEIGHT_POUNDS "|h" + IDS_WEIGHT_QUINTAL_METRIC "L^ (metric)" + IDS_WEIGHT_SALOUNG "Saloung" + IDS_WEIGHT_STONES "Xg[" + IDS_WEIGHT_TAMLUNG "Tamlung" + IDS_WEIGHT_TONNES "g" + IDS_WEIGHT_TONS_UK "g (p)" + IDS_WEIGHT_TONS_US "g (Ä)" +END Propchange: trunk/reactos/base/applications/calc/lang/ja-JP.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/calc/resource.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/res… ============================================================================== --- trunk/reactos/base/applications/calc/resource.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/resource.rc [iso-8859-1] Sun Oct 17 12:47:02 2010 @@ -52,6 +52,7 @@ #include "lang/es-ES.rc" #include "lang/fr-FR.rc" #include "lang/it-IT.rc" +#include "lang/ja-JP.rc" #include "lang/ko-KR.rc" #include "lang/nl-NL.rc" #include "lang/no-NO.rc" Modified: trunk/reactos/base/setup/usetup/lang/ja-JP.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/ja-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/ja-JP.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/ja-JP.h [iso-8859-1] Sun Oct 17 12:47:02 2010 @@ -986,13 +986,13 @@ { 8, 12, - "Install bootloader on the harddisk (MBR and VBR).", + "Ê°ÄÞÃÞ¨½¸Æ ÌÞ°ÄÛ°ÀÞ°¦ ²Ý½Ä°Ù ¼Ï½ (MBR Ä VBR).", TEXT_STYLE_NORMAL }, { 8, 13, - "Install bootloader on the harddisk (VBR only).", + "Ê°ÄÞÃÞ¨½¸Æ ÌÞ°ÄÛ°ÀÞ°¦ ²Ý½Ä°Ù ¼Ï½ (VBR ÉÐ).", TEXT_STYLE_NORMAL }, { Modified: trunk/reactos/dll/win32/newdev/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/lang/ja-J… ============================================================================== --- trunk/reactos/dll/win32/newdev/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/newdev/lang/ja-JP.rc [iso-8859-1] Sun Oct 17 12:47:02 2010 @@ -8,10 +8,10 @@ BEGIN LTEXT "æ¤±»",IDC_WELCOMETITLE,120,8,195,24 LTEXT "±ÌEBU[hÅÍAÈºÌVµ¢foCX hCoðCXg[µÜ·:", - IDC_STATIC,120,21,195,16 + IDC_STATIC,120,21,195,30 LTEXT "±s·éÉÍA[Ö] ðNbNµÄ¾³¢B",IDC_STATIC,120,169,195,17 - LTEXT "s¾ÈfoCX",IDC_DEVICE,134,36,164,11 - LTEXT "x! JX^ foCXðCXg[·éÆARs[^ªt[Yµ½èAN®s\\ÉÈéÂ\\«ª èÜ·!",IDC_STATIC,120,59,195,16 + LTEXT "s¾ÈfoCX",IDC_DEVICE,134,52,164,11 + LTEXT "x! JX^ foCXðCXg[·éÆARs[^ªt[Yµ½èAN®s\\ÉÈéÂ\\«ª èÜ·!",IDC_STATIC,120,67,195,34 CONTROL "hCoð©®IÉCXg[·é",IDC_RADIO_AUTO,"Button", BS_AUTORADIOBUTTON,120,112,178,13 CONTROL "hCoðÁèÌê©çCXg[·é",IDC_RADIO_MANUAL, Modified: trunk/reactos/dll/win32/syssetup/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/ja… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/ja-JP.rc [iso-8859-1] Sun Oct 17 12:47:02 2010 @@ -102,14 +102,14 @@ "", IDC_STATIC, 53, 7, 253, 20 LTEXT "", IDC_LOCALETEXT, 53, 29, 250, 16 LTEXT "VXeA[U[P[ÝèÏXÉÍ[JX^}CY]ðNbNµÜ·B", - IDC_STATIC, 53, 60, 196, 8 - PUSHBUTTON "JX^}CY(&C)...", IDC_CUSTOMLOCALE, 250, 57, 50, 14 + IDC_STATIC, 53, 50, 166, 25 + PUSHBUTTON "JX^}CY(&C)...", IDC_CUSTOMLOCALE, 220, 52, 80, 14 LTEXT "L[{[h CAEgÍAL[ðµ½Æ«ÉÇÌ¶ªüÍ³êé©ð§äµÜ·B", - IDC_STATIC, 53, 86, 253, 8 - LTEXT "", IDC_LAYOUTTEXT, 53, 100, 250, 16 + IDC_STATIC, 53, 81, 253, 20 + LTEXT "", IDC_LAYOUTTEXT, 53, 106, 250, 14 LTEXT "L[{[hCAEgÏXÉÍ[JX^}CY]ðNbNµÜ·B", - IDC_STATIC, 53, 126, 184, 8 - PUSHBUTTON "JX^}CY(&U)...", IDC_CUSTOMLAYOUT, 250, 122, 50, 14 + IDC_STATIC, 53, 120, 166, 25 + PUSHBUTTON "JX^}CY(&U)...", IDC_CUSTOMLAYOUT, 220, 122, 80, 14 END

14 years, 2 months

[spetreolle] 49180: Patch by Roel Messiant : Initialise PPB to zero. The change from NtAllocateVirtualMemory to RtlAllocateHeap causes the memory to be not automatically initialised to zero anymore...

by spetreolle＠svn.reactos.org

Author: spetreolle Date: Sun Oct 17 11:12:54 2010 New Revision: 49180 URL: http://svn.reactos.org/svn/reactos?rev=49180&view=rev Log: Patch by Roel Messiant : Initialise PPB to zero. The change from NtAllocateVirtualMemory to RtlAllocateHeap causes the memory to be not automatically initialised to zero anymore. Not every field of the PPB (for which the memory is allocated) gets explicitly initialised, meaning this results in them having bogus values. One of the now uninitialised fields is DebugFlags, which results in DbgBreakPoint being called in NtProcessStartup. Simply ensuring the memory is zeroed makes it all better again. Modified: trunk/reactos/lib/rtl/ppb.c Modified: trunk/reactos/lib/rtl/ppb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/ppb.c?rev=49180&r1… ============================================================================== --- trunk/reactos/lib/rtl/ppb.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/ppb.c [iso-8859-1] Sun Oct 17 11:12:54 2010 @@ -119,7 +119,7 @@ Length += ALIGN(RuntimeData->MaximumLength, sizeof(ULONG)); /* Calculate the required block size */ - Param = RtlAllocateHeap(RtlGetProcessHeap(), 0, Length); + Param = RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, Length); if (!Param) { RtlReleasePebLock();

14 years, 2 months

[dreimer] 49179: Sync reg xcopy winhlp32 wordpad and msiexec with Wine 1.3.5

by dreimer＠svn.reactos.org

Author: dreimer Date: Sun Oct 17 00:26:32 2010 New Revision: 49179 URL: http://svn.reactos.org/svn/reactos?rev=49179&view=rev Log: Sync reg xcopy winhlp32 wordpad and msiexec with Wine 1.3.5 Added: trunk/reactos/base/applications/cmdutils/reg/Sv.rc (with props) trunk/reactos/base/applications/cmdutils/xcopy/Sv.rc (with props) trunk/reactos/base/applications/winhlp32/He.rc (with props) trunk/reactos/base/applications/winhlp32/Sr.rc (with props) Modified: trunk/reactos/base/applications/cmdutils/reg/It.rc trunk/reactos/base/applications/cmdutils/reg/rsrc.rc trunk/reactos/base/applications/cmdutils/xcopy/Da.rc trunk/reactos/base/applications/cmdutils/xcopy/De.rc trunk/reactos/base/applications/cmdutils/xcopy/En.rc trunk/reactos/base/applications/cmdutils/xcopy/Fr.rc trunk/reactos/base/applications/cmdutils/xcopy/It.rc trunk/reactos/base/applications/cmdutils/xcopy/Ja.rc trunk/reactos/base/applications/cmdutils/xcopy/Ko.rc trunk/reactos/base/applications/cmdutils/xcopy/rsrc.rc trunk/reactos/base/applications/paint/rsrc.rc trunk/reactos/base/applications/winhlp32/Bg.rc trunk/reactos/base/applications/winhlp32/Cs.rc trunk/reactos/base/applications/winhlp32/Da.rc trunk/reactos/base/applications/winhlp32/De.rc trunk/reactos/base/applications/winhlp32/En.rc trunk/reactos/base/applications/winhlp32/Es.rc trunk/reactos/base/applications/winhlp32/Fi.rc trunk/reactos/base/applications/winhlp32/Fr.rc trunk/reactos/base/applications/winhlp32/Hu.rc trunk/reactos/base/applications/winhlp32/It.rc trunk/reactos/base/applications/winhlp32/Ja.rc trunk/reactos/base/applications/winhlp32/Ko.rc trunk/reactos/base/applications/winhlp32/Lt.rc trunk/reactos/base/applications/winhlp32/Nl.rc trunk/reactos/base/applications/winhlp32/No.rc trunk/reactos/base/applications/winhlp32/Pl.rc trunk/reactos/base/applications/winhlp32/Pt.rc trunk/reactos/base/applications/winhlp32/Rm.rc trunk/reactos/base/applications/winhlp32/Ro.rc trunk/reactos/base/applications/winhlp32/Ru.rc trunk/reactos/base/applications/winhlp32/Si.rc trunk/reactos/base/applications/winhlp32/Sk.rc trunk/reactos/base/applications/winhlp32/Sv.rc trunk/reactos/base/applications/winhlp32/Tr.rc trunk/reactos/base/applications/winhlp32/Uk.rc trunk/reactos/base/applications/winhlp32/Zh.rc trunk/reactos/base/applications/winhlp32/macro.c trunk/reactos/base/applications/winhlp32/rsrc.rc trunk/reactos/base/applications/winhlp32/winhelp.c trunk/reactos/base/applications/winhlp32/winhelp_res.h trunk/reactos/base/applications/wordpad/It.rc trunk/reactos/base/applications/wordpad/Zh.rc trunk/reactos/base/system/msiexec/rsrc.rc Modified: trunk/reactos/base/applications/cmdutils/reg/It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/reg/It.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/reg/It.rc [iso-8859-1] Sun Oct 17 00:26:32 2010 @@ -35,6 +35,6 @@ STRING_SUCCESS, "Operazione completata con successo\n" STRING_INVALID_KEY, "Errore: nome della chiave non valido\n" STRING_INVALID_CMDLINE, "Errore: parametri della linea di comando non validi\n" - STRING_NO_REMOTE, "Errore: Impossibile aggiungere chiavi alla macchina remota\n" - STRING_CANNOT_FIND, "Errore: Il sistema non Ã¨ riuscito a trovare la chiave di registro o il valore specificati\n" + STRING_NO_REMOTE, "Errore: impossibile aggiungere chiavi alla macchina remota\n" + STRING_CANNOT_FIND, "Errore: il sistema non Ã¨ riuscito a trovare la chiave di registro o il valore specificati\n" } Added: trunk/reactos/base/applications/cmdutils/reg/Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/reg/Sv.rc (added) +++ trunk/reactos/base/applications/cmdutils/reg/Sv.rc [iso-8859-1] Sun Oct 17 00:26:32 2010 @@ -1,0 +1,39 @@ +/* + * REG.EXE - Wine-compatible reg program. + * Swedish language support + * + * Copyright 2010 Anders Jonsson + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "reg.h" + +#pragma code_page(65001) + +LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL + +STRINGTABLE +{ + STRING_USAGE, "Syntax fÃ¶r detta kommando Ã¤r:\n\nREG [ ADD | DELETE | QUERY ]\nREG kommando /?\n" + STRING_ADD_USAGE, "REG ADD nyckelnamn [/v vÃ¤rdenamn | /ve] [/t typ] [/s separator] [/d data] [/f]\n" + STRING_DELETE_USAGE, "REG DELETE nyckelnamn [/v vÃ¤rdenamn | /ve | /va] [/f]\n" + STRING_QUERY_USAGE, "REG QUERY nyckelnamn [/v vÃ¤rdenamn | /ve] [/s]\n" + STRING_SUCCESS, "Operation slutfÃ¶rdes utan problem\n" + STRING_INVALID_KEY, "Fel: ogiltigt nyckelnamn\n" + STRING_INVALID_CMDLINE, "Fel: ogiltiga kommandoradsparametrar\n" + STRING_NO_REMOTE, "Fel: Kan inte lÃ¤gga till nycklar till fjÃ¤rrmaskin\n" + STRING_CANNOT_FIND, "Fel: Systemet kunde inte hitta angiven nyckel eller vÃ¤rde i registret\n" +} Propchange: trunk/reactos/base/applications/cmdutils/reg/Sv.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/cmdutils/reg/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/reg/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/reg/rsrc.rc [iso-8859-1] Sun Oct 17 00:26:32 2010 @@ -16,4 +16,5 @@ #include "Ro.rc" #include "Ru.rc" #include "Si.rc" +#include "Sv.rc" #include "Uk.rc" Modified: trunk/reactos/base/applications/cmdutils/xcopy/Da.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/Da.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/xcopy/Da.rc [iso-8859-1] Sun Oct 17 00:26:32 2010 @@ -30,8 +30,8 @@ STRING_PAUSE, "Tryk Enter for at begynde at kopiere\n" STRING_SIMCOPY, "%d fil(er) vil blive kopieret\n" STRING_COPY, "%d fil(er) kopieret\n" - STRING_QISDIR, "Er «%s» et filnavn eller katalog\n \ - på destinationen?\n \ + STRING_QISDIR, "Er «%s» et filnavn eller katalog\n\ + på destinationen?\n\ (F - Fil, K - Katalog)\n" STRING_SRCPROMPT,"%s? (Ja|Nei)\n" STRING_OVERWRITE,"Overskrive «%s»? (Ja|Nei|Alle)\n" Modified: trunk/reactos/base/applications/cmdutils/xcopy/De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/De.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/xcopy/De.rc [iso-8859-1] Sun Oct 17 00:26:32 2010 @@ -33,8 +33,8 @@ STRING_PAUSE, "Eingabetaste betÃ¤tigen, um mit dem Kopieren zu beginnen\n" STRING_SIMCOPY, "%d Datei(en) wÃ¼rden kopiert\n" STRING_COPY, "%d Datei(en) kopiert\n" - STRING_QISDIR, "Ist '%s' eine Datei oder ein Verzeichnis\n \ - am Zielsort?\n \ + STRING_QISDIR, "Ist '%s' eine Datei oder ein Verzeichnis\n\ + am Zielsort?\n\ (D - Datei, V - Verzeichnis)\n" STRING_SRCPROMPT,"%s? (Ja|Nein)\n" STRING_OVERWRITE,"%s Ã¼berschreiben? (Ja|Nein|Alle)\n" Modified: trunk/reactos/base/applications/cmdutils/xcopy/En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/En.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/xcopy/En.rc [iso-8859-1] Sun Oct 17 00:26:32 2010 @@ -30,8 +30,8 @@ STRING_PAUSE, "Press <enter> to begin copying\n" STRING_SIMCOPY, "%d file(s) would be copied\n" STRING_COPY, "%d file(s) copied\n" - STRING_QISDIR, "Is '%s' a filename or directory\n \ - on the target?\n \ + STRING_QISDIR, "Is '%s' a filename or directory\n\ + on the target?\n\ (F - File, D - Directory)\n" STRING_SRCPROMPT,"%s? (Yes|No)\n" STRING_OVERWRITE,"Overwrite %s? (Yes|No|All)\n" Modified: trunk/reactos/base/applications/cmdutils/xcopy/Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/Fr.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/xcopy/Fr.rc [iso-8859-1] Sun Oct 17 00:26:32 2010 @@ -33,8 +33,8 @@ STRING_PAUSE, "Appuyez sur ENTRÃE pour dÃ©marrer la copie\n" STRING_SIMCOPY, "%d fichier(s) seront copiÃ©s\n" STRING_COPY, "%d fichier(s) copiÃ©s\n" - STRING_QISDIR, "Â«Â %sÂ Â» est-il un fichier ou un rÃ©pertoire\n \ - dans la destinationÂ ?\n \ + STRING_QISDIR, "Â«Â %sÂ Â» est-il un fichier ou un rÃ©pertoire\n\ + dans la destinationÂ ?\n\ (F - Fichier, R - RÃ©pertoire)\n" STRING_SRCPROMPT,"%sÂ ? (Oui|Non)\n" STRING_OVERWRITE,"Ãcraser %sÂ ? (Oui|Non|Tous)\n" Modified: trunk/reactos/base/applications/cmdutils/xcopy/It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/It.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/xcopy/It.rc [iso-8859-1] Sun Oct 17 00:26:32 2010 @@ -31,10 +31,10 @@ STRING_INVPARMS, "Numero non valido di parametri - Digita xcopy /? per l'aiuto\n" STRING_INVPARM, "Parametro '%s' non valido - Digita xcopy /? per l'aiuto\n" STRING_PAUSE, "Premi Invio per iniziare a copiare\n" - STRING_SIMCOPY, "%d file sarebbero copiati\n" + STRING_SIMCOPY, "%d file saranno copiati\n" STRING_COPY, "%d file copiato/i\n" - STRING_QISDIR, "'%s' Ã¨ il nome di un file o una cartella\n \ - nell'obiettivo?\n \ + STRING_QISDIR, "'%s' Ã¨ il nome di un file o una cartella\n\ + nell'obiettivo?\n\ (F - File, C - Cartella)\n" STRING_SRCPROMPT,"%s? (SÃ¬|No)\n" STRING_OVERWRITE,"Sovrascrivere %s? (SÃ¬|No|Tutti)\n" @@ -48,7 +48,7 @@ STRING_DIR_CHAR, "C" STRING_HELP, -"XCOPY - Copia file(s) e alberi di cartelle sorgenti in una destinazione\n\ +"XCOPY - Copia file e alberi di cartelle sorgenti in una destinazione\n\ \n\ Sintassi:\n\ XCOPY sorgente [destinazione] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\ @@ -59,18 +59,18 @@ [/I] Assume una cartella se la destinazione non esiste e sono copiati 2 o\n\ \tpiÃ¹ file\n\ [/S] Copia le cartelle e le sottocartelle\n\ -[/E] Copia le cartelle e le sottocartelle, includendo quelle vuote\n\ +[/E] Copia le cartelle e le sottocartelle, incluse quelle vuote\n\ [/Q] Non mostra i nomi durante la copia, modalitÃ silenziosa.\n\ [/F] Mostra i nomi completi della sorgente e della destinazione durante la copia\n\ -[/L] Simula l'operazione, mostrando i nome che sarebbero copiati\n\ +[/L] Simula l'operazione, mostrando i nomi che sarebbero copiati\n\ [/W] Richiede prima di iniziare l'operazione di copia\n\ -[/T] Crea la struttura di cartelle vuote ma non copia i files\n\ -[/Y] Disabilita le conferme quando sono sovrascritti files\n\ -[/-Y] Abilita le conferme quando sono sovrascritti files\n\ +[/T] Crea la struttura di cartelle vuote ma non copia i file\n\ +[/Y] Disabilita le conferme quando sono sovrascritti dei file\n\ +[/-Y] Abilita le conferme quando sono sovrascritti dei file\n\ [/P] Chiede conferma per ogni file sorgente prima di copiare\n\ [/N] Copia usando i nomi abbreviati\n\ [/U] Copia solo files che sono giÃ presenti nella destinazione\n\ -[/R] Sovrascrive ogni file che abbia l'attributo Sola Lettura\n\ +[/R] Sovrascrive ogni file che abbia l'attributo Sola lettura\n\ [/H] Include i file nascosti e di sistema nella copia\n\ [/C] Continua anche se accade un errore durante la copia\n\ [/A] Copia solo i file che abbiano l'attributo Archivio\n\ Modified: trunk/reactos/base/applications/cmdutils/xcopy/Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/Ja.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/xcopy/Ja.rc [iso-8859-1] Sun Oct 17 00:26:32 2010 @@ -33,8 +33,8 @@ STRING_PAUSE, "ã³ãã¼ãéå§ããã«ã¯ <enter> ãæ¼ãã¦ãã ãã\n" STRING_SIMCOPY, "%d ãã¡ã¤ã«ãã³ãã¼ãããè¦è¾¼ã¿ã§ãã\n" STRING_COPY, "%d ãã¡ã¤ã«ãã³ãã¼ãã¾ãã\n" - STRING_QISDIR, "éãåã® '%s' ã¯ãã¡ã¤ã«åã§ããã\n \ - ãã£ã¬ã¯ããªã§ãã?\n \ + STRING_QISDIR, "éãåã® '%s' ã¯ãã¡ã¤ã«åã§ããã\n\ + ãã£ã¬ã¯ããªã§ãã?\n\ (F - ãã¡ã¤ã«ãD - ãã£ã¬ã¯ããª)\n" STRING_SRCPROMPT,"%s? (Yes|No)\n" STRING_OVERWRITE,"%s ãä¸æ¸ããã¾ãã? (Yes|No|All)\n" Modified: trunk/reactos/base/applications/cmdutils/xcopy/Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/Ko.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/xcopy/Ko.rc [iso-8859-1] Sun Oct 17 00:26:32 2010 @@ -22,23 +22,25 @@ #include "xcopy.h" +#pragma code_page(65001) + LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT STRINGTABLE { - STRING_INVPARMS, "¿Ã¹Ù¸£Áö ¾ÊÀº ¸Å°³º¯¼öÀÇ °¹¼ö - xcopy /?·Î µµ¿ò¸»À» º¸½Ã¿À\n" - STRING_INVPARM, "¿Ã¹Ù¸£Áö ¾ÊÀº ¸Å°³º¯¼ö '%s' - xcopy /?·Î µµ¿ò¸»À» º¸½Ã¿À\n" - STRING_PAUSE, "<enter> ¸¦ ´©¸£¸é º¹»ç°¡ ½ÃÀÛµÉ °ÍÀÔ´Ï´Ù\n" - STRING_SIMCOPY, "%d ÆÄÀÏÀÌ º¹»çµÉ °ÍÀÔ´Ï´Ù\n" - STRING_COPY, "%d ÆÄÀÏÀÌ º¹»çµÇ¾ú½À´Ï´Ù\n" - STRING_QISDIR, "'%s'ÀÌ º¹»çÇÒ ÆÄÀÏÀÌ³ª µð·ºÅä¸®?\n\ - ÀÔ´Ï±î?\n\ - (F - ÆÄÀÏ, D - µð·ºÅä¸®)\n" - STRING_SRCPROMPT,"%s? (¿¹|¾Æ´Ï¿À)\n" - STRING_OVERWRITE,"%s¸¦ µ¤¾î¾²°Ú½À´Ï±î? (¿¹|¾Æ´Ï¿À|¸ðµÎ)\n" + STRING_INVPARMS, "ì¬ë°ë¥´ì§ ìì ë§¤ê°ë³ìì ê°¯ì - xcopy /?ë¡ ëìë§ì ë³´ìì¤\n" + STRING_INVPARM, "ì¬ë°ë¥´ì§ ìì ë§¤ê°ë³ì '%s' - xcopy /?ë¡ ëìë§ì ë³´ìì¤\n" + STRING_PAUSE, "<enter> ë¥¼ ëë¥´ë©´ ë³µì¬ê° ììë ê²ìëë¤\n" + STRING_SIMCOPY, "%d íì¼ì´ ë³µì¬ë ê²ìëë¤\n" + STRING_COPY, "%d íì¼ì´ ë³µì¬ëììµëë¤\n" + STRING_QISDIR, "'%s'ì´ ë³µì¬í íì¼ì´ë ëë í ë¦¬?\n\ + ìëê¹?\n\ + (F - íì¼, D - ëë í ë¦¬)\n" + STRING_SRCPROMPT,"%s? (ì|ìëì¤)\n" + STRING_OVERWRITE,"%së¥¼ ë®ì´ì°ê² ìµëê¹? (ì|ìëì¤|ëª¨ë)\n" STRING_COPYFAIL, "Copying of '%s' to '%s' failed with r/c %d\n" - STRING_OPENFAIL, "'%s' ¿±â ½ÇÆÐ\n" - STRING_READFAIL, "'%s¸¦ ÀÐÁö ¸øÇß½À´Ï´Ù'\n" + STRING_OPENFAIL, "'%s' ì´ê¸° ì¤í¨\n" + STRING_READFAIL, "'%së¥¼ ì½ì§ ëª»íìµëë¤'\n" STRING_YES_CHAR, "Y" STRING_NO_CHAR, "N" STRING_ALL_CHAR, "A" @@ -46,36 +48,36 @@ STRING_DIR_CHAR, "D" STRING_HELP, -"XCOPY - ¿øº» ÆÄÀÏÀÌ³ª µð·ºÅä¸® ±¸Á¶¸¦ ¸ñÀûÁö·Î º¹»ç\n\ +"XCOPY - ìë³¸ íì¼ì´ë ëë í ë¦¬ êµ¬ì¡°ë¥¼ ëª©ì ì§ë¡ ë³µì¬\n\ \n\ -¹®¹ý:\n\ -XCOPY ¿øº» [´ë»ó] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\ +ë¬¸ë²:\n\ +XCOPY ìë³¸ [ëì] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\ \t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n\ \n\ Where:\n\ \n\ -[/I] ¸¸¾à ´ë»óÀÌ Á¸ÀçÇÏÁö ¾Ê´Â °æ¿ì µð·ºÅä¸®·Î °¡Á¤ÇÏ°í µÎ°³³ª ´õ ¸¹Àº ÆÄÀÏÀ» \n\ -\tº¹»ç\n\ -[/S] µð·ºÅä¸®ÇÏ°í ÇÏÀ§ µð·ºÅä¸® º¹»ç\n\ -[/E] ºó µð·ºÅä¸®¸¦ Æ÷ÇÔÇØ¼ µð·ºÅä¸®¿Í ÇÏÀ§ µð·ºÅä¸® º¹»ç\n\ -[/Q] Á¶¿ëÇÏ°Ô º¹»çµÇ´Â ÆÄÀÏÀÌ³ª µð·ºÅä¸®¸¦ Ç¥½ÃÇÏÁö ¾Ê°í º¹»ç.\n\ -[/F] º¹»çÇÏ´Â µ¿¾È ¿ÏÀüÇÑ ¿øº»°ú ´ë»ó º¸¿©ÁÖ±â\n\ -[/L] º¹»çµÉ °ÍÀ» º¸¿©ÁÖ¸é¼ °¡»óÀ¸·Î ÀÛ¾÷\n\ -[/W] º¹»ç½ÃÀÛ ÇÏ±â Àü¿¡ È®ÀÎÇÏ±â\n\ -[/T] ÆÄÀÏÀº º¹»çÇÏÁö ¾Ê°í ºó µð·ºÅä¸® ±¸Á¶¸¸ º¹»ç\n\ -[/Y] ÆÄÀÏ µ¤¾î ¾µ ¶§ È®ÀÎÇÏÁö ¾Ê±â\n\ -[/-Y] ÆÄÀÏÀ» µ¤¾î ¾µ ¶§ È®ÀÎÇÏ±â\n\ -[/P] º¹»çÇÏ´Â µ¿¾È¿¡ °¢°¡ÀÇ ¿øº» ÆÄÀÏ¸¶´Ù È®ÀÎ\n\ -[/N] ÂªÀº ÀÌ¸§À» »ç¿ëÇØ¼ º¹»ç\n\ -[/U] ÀÌ¹Ì ´ë»ó µð·ºÅä¸®¿¡ Á¸ÀçÇÏ´Â ÆÄÀÏ¸¸ º¹»ç\n\ -[/R] ÀÐ±â Àü¿ë ÆÄÀÏµµ µ¤¾î ¾²±â\n\ -[/H] ¼ûÀº ÆÄÀÏÀÌ³ª ½Ã½ºÅÛ ÆÄÀÏµµ Æ÷ÇÔÇØ¼ º¹»ç\n\ -[/C] º¹»çÇÏ´Â µ¿¾È¿¡ ¿¡·¯°¡ ¹ß»ýÇØµµ °è¼Ó ÁøÇà\n\ -[/A] ¿ÀÁ÷ ¾ÐÃà ¼Ó¼ºÀÌ ¼³Á¤µÇ¾îÀÖ´Â ÆÄÀÏ¸¸ º¹»ç\n\ -[/M] ¿ÀÁ÷ ¾ÐÃà ¼Ó¼ºÀ» Á¦°ÅÇÏ¸é¼ ¾ÐÃà ¼Ó¼ºÀÌ ¼³Á¤µÇ¾îÀÖ´Â\n\ -\tÆÄÀÏ¸¸ º¹»ç\n\ -[/D | /D:m-d-y] ÁöÁ¤µÈ ³¯Â¥ ÈÄ¿¡ ¼öÁ¤µÇ°Å³ª »õ·Î¿î ÆÄÀÏ º¹»ç.\n\ -\t\tI¸¸¾à ¾î¶°ÇÑ ³¯Â¥µµ ÁöÁ¤µÇÁö ¾ÊÀ¸¸é,¿ÀÁ÷ ¿øº»º¸´Ù\n\ -\t\t´ë»óÀÌ ¿À·¡µÈ °Í¸¸ º¹»ç\n\n" +[/I] ë§ì½ ëìì´ ì¡´ì¬íì§ ìë ê²½ì° ëë í ë¦¬ë¡ ê°ì íê³ ëê°ë ë ë§ì íì¼ì \n\ +\të³µì¬\n\ +[/S] ëë í ë¦¬íê³ íì ëë í ë¦¬ ë³µì¬\n\ +[/E] ë¹ ëë í ë¦¬ë¥¼ í¬í¨í´ì ëë í ë¦¬ì íì ëë í ë¦¬ ë³µì¬\n\ +[/Q] ì¡°ì©íê² ë³µì¬ëë íì¼ì´ë ëë í ë¦¬ë¥¼ íìíì§ ìê³ ë³µì¬.\n\ +[/F] ë³µì¬íë ëì ìì í ìë³¸ê³¼ ëì ë³´ì¬ì£¼ê¸°\n\ +[/L] ë³µì¬ë ê²ì ë³´ì¬ì£¼ë©´ì ê°ìì¼ë¡ ìì\n\ +[/W] ë³µì¬ìì íê¸° ì ì íì¸íê¸°\n\ +[/T] íì¼ì ë³µì¬íì§ ìê³ ë¹ ëë í ë¦¬ êµ¬ì¡°ë§ ë³µì¬\n\ +[/Y] íì¼ ë®ì´ ì¸ ë íì¸íì§ ìê¸°\n\ +[/-Y] íì¼ì ë®ì´ ì¸ ë íì¸íê¸°\n\ +[/P] ë³µì¬íë ëìì ê°ê°ì ìë³¸ íì¼ë§ë¤ íì¸\n\ +[/N] ì§§ì ì´ë¦ì ì¬ì©í´ì ë³µì¬\n\ +[/U] ì´ë¯¸ ëì ëë í ë¦¬ì ì¡´ì¬íë íì¼ë§ ë³µì¬\n\ +[/R] ì½ê¸° ì ì© íì¼ë ë®ì´ ì°ê¸°\n\ +[/H] ì¨ì íì¼ì´ë ìì¤í íì¼ë í¬í¨í´ì ë³µì¬\n\ +[/C] ë³µì¬íë ëìì ìë¬ê° ë°ìí´ë ê³ì ì§í\n\ +[/A] ì¤ì§ ìì¶ ìì±ì´ ì¤ì ëì´ìë íì¼ë§ ë³µì¬\n\ +[/M] ì¤ì§ ìì¶ ìì±ì ì ê±°íë©´ì ìì¶ ìì±ì´ ì¤ì ëì´ìë\n\ +\tíì¼ë§ ë³µì¬\n\ +[/D | /D:m-d-y] ì§ì ë ë ì§ íì ìì ëê±°ë ìë¡ì´ íì¼ ë³µì¬.\n\ +\t\tIë§ì½ ì´ë í ë ì§ë ì§ì ëì§ ìì¼ë©´,ì¤ì§ ìë³¸ë³´ë¤\n\ +\t\tëìì´ ì¤ëë ê²ë§ ë³µì¬\n\n" } Added: trunk/reactos/base/applications/cmdutils/xcopy/Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/Sv.rc (added) +++ trunk/reactos/base/applications/cmdutils/xcopy/Sv.rc [iso-8859-1] Sun Oct 17 00:26:32 2010 @@ -1,0 +1,82 @@ +/* + * XCOPY - Wine-compatible xcopy program + * Swedish language support + * + * Copyright (C) 2010 Anders Jonsson + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "xcopy.h" + +#pragma code_page(65001) + +LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL + +STRINGTABLE +{ + STRING_INVPARMS, "Ogiltigt antal parametrar - AnvÃ¤nd xcopy /? fÃ¶r hjÃ¤lp\n" + STRING_INVPARM, "Ogiltig parameter '%s' - AnvÃ¤nd xcopy /? fÃ¶r hjÃ¤lp\n" + STRING_PAUSE, "Tryck <enter> fÃ¶r att bÃ¶rja kopiera\n" + STRING_SIMCOPY, "%d fil(er) skulle kopieras\n" + STRING_COPY, "%d fil(er) kopierade\n" + STRING_QISDIR, "Ãr '%s' ett filnamn eller en katalog\n" \ + "pÃ¥ mÃ¥let?\n" \ + "(F - Fil, K - Katalog)\n" + STRING_SRCPROMPT,"%s? (Ja|Nej)\n" + STRING_OVERWRITE,"Skriv Ã¶ver %s? (Ja|Nej|Alla)\n" + STRING_COPYFAIL, "Kunde inte kopiera '%s' till '%s'; misslyckades med r/c %d\n" + STRING_OPENFAIL, "Kunde inte Ã¶ppna '%s'\n" + STRING_READFAIL, "Kunde inte lÃ¤sa '%s'\n" + STRING_YES_CHAR, "J" + STRING_NO_CHAR, "N" + STRING_ALL_CHAR, "A" + STRING_FILE_CHAR,"F" + STRING_DIR_CHAR, "K" + + STRING_HELP, +"XCOPY - Kopierar kÃ¤llfiler eller katalogtrÃ¤d till ett mÃ¥l\n\ +\n\ +Syntax:\n\ +XCOPY kÃ¤lla [dest] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\ +\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n\ +\n\ +DÃ¤r:\n\ +\n\ +[/I] Antag att mÃ¥let Ã¤r en katalog om mÃ¥let inte existerar och\n\ +\ tvÃ¥ eller fler filer kopieras\n\ +[/S] Kopiera kataloger och underkataloger\n\ +[/E] Kopiera kataloger och underkataloger, inklusive tomma sÃ¥dana\n\ +[/Q] Tyst lÃ¤ge: Lista inte filnamn under kopiering\n\ +[/F] Visa fulla kÃ¤ll- och mÃ¥lnamn under kopiering\n\ +[/L] Simulerar operationen och visar namn som skulle kopieras\n\ +[/W] FrÃ¥gar innan kopieringen pÃ¥bÃ¶rjas\n\ +[/T] Skapar tom katalogstruktur men kopierar inga filer\n\ +[/Y] FrÃ¥ga inte nÃ¤r filer skrivs Ã¶ver\n\ +[/-Y] FrÃ¥ga innan filer skrivs Ã¶ver\n\ +[/P] FrÃ¥ga fÃ¶r varje kÃ¤llfil som kopieras.\n\ +[/N] Kopiera som korta filnamn\n\ +[/U] Kopiera enbart filer som redan existerar i destinationskatalogen\n\ +[/R] Skriv Ã¶ver skrivskyddade filer\n\ +[/H] Inkludera gÃ¶mda filer och systemfiler i kopian\n\ +[/C] FortsÃ¤tt Ã¤ven om ett fel uppstÃ¥r under kopieringen\n\ +[/A] Kopiera enbart filer markerade som arkiv\n\ +[/M] Kopiera enbart filer markerade som arkiv, ta bort\n\ +\ markeringen\n\ +[/D | /D:m-d-y] Kopiera nya filer eller de Ã¤ndrade efter angivet datum.\n\ +\t\tOm inget datum angivits utfÃ¶rs endast kopiering om mÃ¥let Ã¤r\n\ +\t\tÃ¤ldre Ã¤n kÃ¤llan\n\n" + +} Propchange: trunk/reactos/base/applications/cmdutils/xcopy/Sv.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/cmdutils/xcopy/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/xcopy/rsrc.rc [iso-8859-1] Sun Oct 17 00:26:32 2010 @@ -28,7 +28,6 @@ #include "Da.rc" #include "En.rc" -#include "Ko.rc" #include "No.rc" #include "Pl.rc" @@ -37,10 +36,12 @@ #include "Fr.rc" #include "It.rc" #include "Ja.rc" +#include "Ko.rc" #include "Lt.rc" #include "Nl.rc" #include "Pt.rc" #include "Ro.rc" #include "Ru.rc" #include "Si.rc" +#include "Sv.rc" #include "Uk.rc" Modified: trunk/reactos/base/applications/paint/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/rs… ============================================================================== --- trunk/reactos/base/applications/paint/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/paint/rsrc.rc [iso-8859-1] Sun Oct 17 00:26:32 2010 @@ -37,14 +37,3 @@ #include "lang/ru-RU.rc" #include "lang/uk-UA.rc" -// -// SUPPORT FOR WINDOWS XP THEMES: -// THIS WILL MAKE THE PROGRAM USE THE COMMON CONTROLS -// LIBRARY VERSION 6.0 (IF IT IS AVAILABLE) -// -#ifdef _AMD64_ -1 24 "paint.exe.amd64.manifest" -#elif _X86_ -1 24 "paint.exe.manifest" -#endif - Modified: trunk/reactos/base/applications/winhlp32/Bg.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/Bg.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/Bg.rc [iso-8859-1] Sun Oct 17 00:26:32 2010 @@ -63,16 +63,13 @@ MENUITEM "Âèíàãè îò&ãîðå", MNID_HELP_HELPTOP MENUITEM SEPARATOR MENUITEM "&Èíôîðìàöèÿ...", MNID_HELP_ABOUT -#ifdef WINELIB - MENUITEM "&Îòíîñíî WINE", MNID_HELP_WINE -#endif } } /* Strings */ STRINGTABLE { -STID_WINE_HELP, "WINE Ïîìîù" +STID_WINE_HELP, "Wine Ïîìîù" STID_WHERROR, "ÃÐÅØÊÀ" STID_WARNING, "ÏÐÅÄÓÏÐÅÆÄÅÍÈÅ" STID_INFO, "Èíôîðìàöèÿ" Modified: trunk/reactos/base/applications/winhlp32/Cs.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/Cs.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/Cs.rc [iso-8859-1] Sun Oct 17 00:26:32 2010 @@ -68,16 +68,13 @@ MENUITEM "Vdy na &vrchu", MNID_HELP_HELPTOP MENUITEM SEPARATOR MENUITEM "&Informace...", MNID_HELP_ABOUT -#ifdef WINELIB - MENUITEM "O &WINE", MNID_HELP_WINE -#endif } } /* Strings */ STRINGTABLE { -STID_WINE_HELP, "Nápovìda WINE" +STID_WINE_HELP, "Nápovìda Wine" STID_WHERROR, "CHYBA" STID_WARNING, "VAROVÁNÍ" STID_INFO, "Informace" Modified: trunk/reactos/base/applications/winhlp32/Da.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/Da.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/Da.rc [iso-8859-1] Sun Oct 17 00:26:32 2010 @@ -68,9 +68,6 @@ MENUITEM "Altid &Ã¸verst", MNID_HELP_HELPTOP MENUITEM SEPARATOR MENUITEM "&Information...", MNID_HELP_ABOUT -#ifdef WINELIB - MENUITEM "Om &Wine", MNID_HELP_WINE -#endif } } Modified: trunk/reactos/base/applications/winhlp32/De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/De.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/De.rc [iso-8859-1] Sun Oct 17 00:26:32 2010 @@ -66,9 +66,6 @@ MENUITEM "Immer im &Vordergrund", MNID_HELP_HELPTOP MENUITEM SEPARATOR MENUITEM "&Info...", MNID_HELP_ABOUT -#ifdef WINELIB - MENUITEM "&Ãber WINE", MNID_HELP_WINE -#endif } } @@ -92,7 +89,7 @@ STRINGTABLE { -STID_WINE_HELP, "WINE Hilfe" +STID_WINE_HELP, "Wine Hilfe" STID_WHERROR, "FEHLER" STID_WARNING, "ACHTUNG" STID_INFO, "Information" Modified: trunk/reactos/base/applications/winhlp32/En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/En.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/En.rc [iso-8859-1] Sun Oct 17 00:26:32 2010 @@ -63,10 +63,7 @@ MENUITEM "Help &on help", MNID_HELP_HELPON MENUITEM "Always on &top", MNID_HELP_HELPTOP MENUITEM SEPARATOR - MENUITEM "&Info...", MNID_HELP_ABOUT -#ifdef WINELIB - MENUITEM "&About Wine", MNID_HELP_WINE -#endif + MENUITEM "&About Wine Help", MNID_HELP_ABOUT } } @@ -110,10 +107,7 @@ MENUITEM "Help &on help", MNID_HELP_HELPON MENUITEM "Always on &top", MNID_HELP_HELPTOP MENUITEM SEPARATOR - MENUITEM "&Info...", MNID_HELP_ABOUT -#ifdef WINELIB - MENUITEM "&About Wine", MNID_HELP_WINE -#endif + MENUITEM "&About Wine Help", MNID_HELP_ABOUT } } Modified: trunk/reactos/base/applications/winhlp32/Es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/Es.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/Es.rc [iso-8859-1] Sun Oct 17 00:26:32 2010 @@ -65,9 +65,6 @@ MENUITEM "&Siempre visible", MNID_HELP_HELPTOP MENUITEM SEPARATOR MENUITEM "&Info...", MNID_HELP_ABOUT -#ifdef WINELIB - MENUITEM "&Acerca de WINE", MNID_HELP_WINE -#endif } } @@ -90,7 +87,7 @@ /* Strings */ STRINGTABLE { -STID_WINE_HELP, "Ayuda de WINE" +STID_WINE_HELP, "Ayuda de Wine" STID_WHERROR, "ERROR" STID_WARNING, "ADVERTENCIA" STID_INFO, "Información" Modified: trunk/reactos/base/applications/winhlp32/Fi.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/Fi.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/Fi.rc [iso-8859-1] Sun Oct 17 00:26:32 2010 @@ -65,9 +65,6 @@ MENUITEM "&Aina päällimmäisenä", MNID_HELP_HELPTOP MENUITEM SEPARATOR MENUITEM "T&ietoja...", MNID_HELP_ABOUT -#ifdef WINELIB - MENUITEM "&Tietoja WINEstä", MNID_HELP_WINE -#endif } } @@ -75,7 +72,7 @@ STRINGTABLE { -STID_WINE_HELP, "WINE Ohje" +STID_WINE_HELP, "Wine Ohje" STID_WHERROR, "VIRHE" STID_WARNING, "VAROITUS" STID_INFO, "Tietoja" Modified: trunk/reactos/base/applications/winhlp32/Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/Fr.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/Fr.rc [iso-8859-1] Sun Oct 17 00:26:32 2010 @@ -69,10 +69,7 @@ MENUITEM "&Utiliser l'aide", MNID_HELP_HELPON MENUITEM "&Toujours visible", MNID_HELP_HELPTOP MENUITEM SEPARATOR - MENUITEM "&Info...", MNID_HELP_ABOUT -#ifdef WINELIB - MENUITEM "Ã &propos de Wine", MNID_HELP_WINE -#endif + MENUITEM "&A propos de l'Aide de Wine", MNID_HELP_ABOUT } } Added: trunk/reactos/base/applications/winhlp32/He.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/He.rc (added) +++ trunk/reactos/base/applications/winhlp32/He.rc [iso-8859-1] Sun Oct 17 00:26:32 2010 @@ -1,0 +1,131 @@ +/* + * Help Viewer (Hebrew resources) + * + * Copyright 1996 Ulrich Schmid + * Copyright 2002 Sylvain Petreolle <spetreolle(a)yahoo.fr> + * Copyright 2010 Yaron Shahrabani <sh.yaron(a)gmail.com> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "winhelp_res.h" + +#pragma code_page(65001) + +/* Menu */ + +LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT + +MAIN_MENU MENU +{ + POPUP "&×§×××¥" { + MENUITEM "&×¤×ª×××", MNID_FILE_OPEN + MENUITEM SEPARATOR + MENUITEM "×&××¤×¡×", MNID_FILE_PRINT + MENUITEM "×&×××¨×ª ××××¤×¡×ª...", MNID_FILE_SETUP + MENUITEM SEPARATOR + MENUITEM "×&×¦×××", MNID_FILE_EXIT + } + POPUP "×¢&×¨×××" { + MENUITEM "×&×¢×ª×§×...", MNID_EDIT_COPYDLG + MENUITEM SEPARATOR + MENUITEM "×××¡×¤×ª ××¢&×¨××ª...", MNID_EDIT_ANNOTATE + } + POPUP "&×¡××× ××" { + MENUITEM "×&×××¨×...", MNID_BKMK_DEFINE + } + POPUP "&××¤×©×¨××××ª" { + POPUP "××¢××¨× ××××× ×ª×××" + BEGIN + MENUITEM "××¨×¨×ª ××××", MNID_OPTS_HELP_DEFAULT + MENUITEM "×××××", MNID_OPTS_HELP_VISIBLE + MENUITEM "×××¡×ª×¨×ª", MNID_OPTS_HELP_NONVISIBLE + END + MENUITEM "×××¡×××¨××", MNID_OPTS_HISTORY + POPUP "×××¤× ××" + BEGIN + MENUITEM "×§×× ××", MNID_OPTS_FONTS_SMALL + MENUITEM "×¨×××××", MNID_OPTS_FONTS_NORMAL + MENUITEM "××××××", MNID_OPTS_FONTS_LARGE + END + MENUITEM "×©××××© ××¦××¢× ×××¢×¨××ª", MNID_OPTS_SYSTEM_COLORS + } + POPUP "×¢&××¨×" { + MENUITEM "×¢××¨× ×¢&× ××¢××¨×", MNID_HELP_HELPON + MENUITEM "×ª××× &×¢××××", MNID_HELP_HELPTOP + MENUITEM SEPARATOR + MENUITEM "&××××¢...", MNID_HELP_ABOUT + } +} + +IDD_INDEX DIALOG 0, 0, 200, 190 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_LAYOUTRTL +FONT 8, "MS Shell Dlg" +CAPTION "××¤×ª×" +{ + LISTBOX IDC_INDEXLIST, 10, 10, 180, 150, LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_BORDER +} + +IDD_SEARCH DIALOG 0, 0, 200, 190 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_LAYOUTRTL +FONT 8, "MS Shell Dlg" +CAPTION "×××¤××©" +{ + LTEXT "×× ×××××¢ ×¢××××", -1, 10, 10, 180, 150 +} + +/* Strings */ +STRINGTABLE +{ +STID_WINE_HELP, "××¢××¨× ×©× Wine" +STID_WHERROR, "×©××××" +STID_WARNING, "××××¨×" +STID_INFO, "××××¢" +STID_NOT_IMPLEMENTED, "×× ×××××¢" +STID_HLPFILE_ERROR_s, "×××¨×¢× ×©×××× ××¢×ª ×§×¨×××ª ×§×××¥ ××¢××¨× `%s'" +STID_INDEX, "×&×¤×ª×" +STID_CONTENTS, "×ª×§×¦××¨" +STID_BACK, "&×××¨×" +STID_ALL_FILES, "×× ××§××¦×× (*.*)" +STID_HELP_FILES_HLP, "×§×××¦× ×¢××¨× (*.hlp)" +STID_FILE_NOT_FOUND_s "×× × ××ª× ×××¦×× ××ª '%s'. ××× ××¨×¦×× × ×××¦×× ×§×××¥ ×× ××¢×¦××?" +STID_NO_RICHEDIT "×× × ××ª× ×××¦×× ×××©×× ×©× richedit... ××ª×× ××ª ×ª×¦×" +STID_PSH_INDEX, "× ××©×× ××¢××¨×: " +} + +CONTEXT_MENU MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "××¢×¨××ª...", MNID_CTXT_ANNOTATE + MENUITEM "××¢×ª×§×", MNID_CTXT_COPY + MENUITEM "×××¤×¡×...", MNID_CTXT_PRINT + POPUP "×××¤× ××" + BEGIN + MENUITEM "×§×× ××", MNID_CTXT_FONTS_SMALL + MENUITEM "×¨×××××", MNID_CTXT_FONTS_NORMAL + MENUITEM "××××××", MNID_CTXT_FONTS_LARGE + END + POPUP "××¢××¨× ×ª××× ×××× ×" + BEGIN + MENUITEM "××¨×¨×ª ××××", MNID_CTXT_HELP_DEFAULT + MENUITEM "×××××", MNID_CTXT_HELP_VISIBLE + MENUITEM "×××¡×ª×¨×ª", MNID_CTXT_HELP_NONVISIBLE + END + MENUITEM "×©××××© ××¦××¢× ×××¢×¨××ª", MNID_CTXT_SYSTEM_COLORS + END +END Propchange: trunk/reactos/base/applications/winhlp32/He.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/winhlp32/Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/Hu.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/Hu.rc [iso-8859-1] Sun Oct 17 00:26:32 2010 @@ -65,9 +65,6 @@ MENUITEM "Mindig &legfelül", MNID_HELP_HELPTOP MENUITEM SEPARATOR MENUITEM "&Információ...", MNID_HELP_ABOUT -#ifdef WINELIB - MENUITEM "&&A WINE-ról", MNID_HELP_WINE -#endif } } @@ -75,7 +72,7 @@ STRINGTABLE { -STID_WINE_HELP, "WINE súgó" +STID_WINE_HELP, "Wine súgó" STID_WHERROR, "HIBA" STID_WARNING, "FIGYELMEZTETÉS" STID_INFO, "Információ" Modified: trunk/reactos/base/applications/winhlp32/It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/It.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/It.rc [iso-8859-1] Sun Oct 17 00:26:32 2010 @@ -21,9 +21,10 @@ #include "winhelp_res.h" +/* UTF-8 */ +#pragma code_page(65001) + LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL - -#pragma code_page(65001) /* Menu */ @@ -55,20 +56,17 @@ MENUITEM "Cronologia", MNID_OPTS_HISTORY POPUP "Caratteri" BEGIN - MENUITEM "Piccolo", MNID_OPTS_FONTS_SMALL - MENUITEM "Normale", MNID_OPTS_FONTS_NORMAL - MENUITEM "Grande", MNID_OPTS_FONTS_LARGE + MENUITEM "Piccoli", MNID_OPTS_FONTS_SMALL + MENUITEM "Normali", MNID_OPTS_FONTS_NORMAL + MENUITEM "Grandi", MNID_OPTS_FONTS_LARGE END - MENUITEM "Usa colori di sistema", MNID_OPTS_SYSTEM_COLORS + MENUITEM "Usa i colori di sistema", MNID_OPTS_SYSTEM_COLORS } POPUP "&Aiuto" { MENUITEM "&Aiuto sulla guida", MNID_HELP_HELPON MENUITEM "Sempre in primo &piano", MNID_HELP_HELPTOP MENUITEM SEPARATOR MENUITEM "&Informazioni su...", MNID_HELP_ABOUT -#ifdef WINELIB - MENUITEM "&Informazioni su WINE", MNID_HELP_WINE -#endif } } @@ -91,7 +89,7 @@ /* Strings */ STRINGTABLE { -STID_WINE_HELP, "Guida di WINE" +STID_WINE_HELP, "Guida di Wine" STID_WHERROR, "ERRORE" STID_WARNING, "ATTENZIONE" STID_INFO, "Informazione" @@ -101,7 +99,7 @@ STID_CONTENTS, "&Sommario" STID_BACK, "&Precedente" STID_ALL_FILES, "Tutti i file (*.*)" -STID_HELP_FILES_HLP, "File della Guida (*.hlp)" +STID_HELP_FILES_HLP, "File della guida (*.hlp)" STID_FILE_NOT_FOUND_s "Non Ã¨ stato possibile trovare '%s'. Vuoi cercare questo file?" STID_NO_RICHEDIT "Non Ã¨ stato possibile trovare un'implementazione richedit... Annullando" STID_PSH_INDEX, "Argomenti di aiuto: " @@ -116,13 +114,13 @@ MENUITEM "Stampa...", MNID_CTXT_PRINT POPUP "Caratteri" BEGIN - MENUITEM "Piccolo", MNID_CTXT_FONTS_SMALL - MENUITEM "Normale", MNID_CTXT_FONTS_NORMAL - MENUITEM "Grande", MNID_CTXT_FONTS_LARGE + MENUITEM "Piccoli", MNID_CTXT_FONTS_SMALL + MENUITEM "Normali", MNID_CTXT_FONTS_NORMAL + MENUITEM "Grandi", MNID_CTXT_FONTS_LARGE END POPUP "Aiuto sempre visibile" BEGIN - MENUITEM "Default", MNID_CTXT_HELP_DEFAULT + MENUITEM "Predefinito", MNID_CTXT_HELP_DEFAULT MENUITEM "Visibile", MNID_CTXT_HELP_VISIBLE MENUITEM "Non visibile", MNID_CTXT_HELP_NONVISIBLE END Modified: trunk/reactos/base/applications/winhlp32/Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/Ja.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/Ja.rc [iso-8859-1] Sun Oct 17 00:26:32 2010 @@ -67,9 +67,6 @@ MENUITEM "å¸¸ã«æåã«è¡¨ç¤º(&T)", MNID_HELP_HELPTOP MENUITEM SEPARATOR MENUITEM "æå ±(&I)...", MNID_HELP_ABOUT -#ifdef WINELIB - MENUITEM "WINE ã«ã¤ãã¦(&A)", MNID_HELP_WINE -#endif } } @@ -92,7 +89,7 @@ /* Strings */ STRINGTABLE { -STID_WINE_HELP, "WINE ãã«ã" +STID_WINE_HELP, "Wine ãã«ã" STID_WHERROR, "ã¨ã©ã¼" STID_WARNING, "è¦å" STID_INFO, "æå ±" Modified: trunk/reactos/base/applications/winhlp32/Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/Ko.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/Ko.rc [iso-8859-1] Sun Oct 17 00:26:32 2010 @@ -64,9 +64,6 @@ MENUITEM "Ç×»ó À§(&T)", MNID_HELP_HELPTOP MENUITEM SEPARATOR MENUITEM "Á¤º¸(&I)...", MNID_HELP_ABOUT -#ifdef WINELIB - MENUITEM "Wine¿¡ °üÇÏ¿©(&A)", MNID_HELP_WINE -#endif } } Modified: trunk/reactos/base/applications/winhlp32/Lt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/Lt.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/Lt.rc [iso-8859-1] Sun Oct 17 00:26:32 2010 @@ -66,9 +66,6 @@ MENUITEM "&Visada virÅ¡uje", MNID_HELP_HELPTOP MENUITEM SEPARATOR MENUITEM "&Informacija...", MNID_HELP_ABOUT -#ifdef WINELIB - MENUITEM "&Apie Wine", MNID_HELP_WINE -#endif } } Modified: trunk/reactos/base/applications/winhlp32/Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/Nl.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/Nl.rc [iso-8859-1] Sun Oct 17 00:26:32 2010 @@ -66,9 +66,6 @@ MENUITEM "Altijd &zichtbaar", MNID_HELP_HELPTOP MENUITEM SEPARATOR MENUITEM "&Info...", MNID_HELP_ABOUT -#ifdef WINELIB - MENUITEM "&Over Wine", MNID_HELP_WINE -#endif } } Modified: trunk/reactos/base/applications/winhlp32/No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/No.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/No.rc [iso-8859-1] Sun Oct 17 00:26:32 2010 @@ -63,9 +63,6 @@ MENUITEM "All&tid øverst", MNID_HELP_HELPTOP MENUITEM SEPARATOR MENUITEM "&Informasjon...", MNID_HELP_ABOUT -#ifdef WINELIB - MENUITEM "&Om Wine", MNID_HELP_WINE -#endif } } Modified: trunk/reactos/base/applications/winhlp32/Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/Pl.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/Pl.rc [iso-8859-1] Sun Oct 17 00:26:32 2010 @@ -66,9 +66,6 @@ MENUITEM "&Zawsze na wierzchu", MNID_HELP_HELPTOP MENUITEM SEPARATOR MENUITEM "&O programie...", MNID_HELP_ABOUT -#ifdef WINELIB - MENUITEM "&O programie WINE", MNID_HELP_WINE -#endif } } @@ -91,7 +88,7 @@ /* Strings */ STRINGTABLE { -STID_WINE_HELP, "WINE - Pomoc" +STID_WINE_HELP, "Wine - Pomoc" STID_WHERROR, "B£¥D" STID_WARNING, "OSTRZE¯ENIE" STID_INFO, "Informacja" Modified: trunk/reactos/base/applications/winhlp32/Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/Pt.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/Pt.rc [iso-8859-1] Sun Oct 17 00:26:32 2010 @@ -72,9 +72,6 @@ MENUITEM "Sempre &visÃvel", MNID_HELP_HELPTOP MENUITEM SEPARATOR MENUITEM "&InformaÃ§Ãµes...", MNID_HELP_ABOUT -#ifdef WINELIB - MENUITEM "&Sobre o WINE", MNID_HELP_WINE -#endif } } @@ -119,9 +116,6 @@ MENUITEM "Sempre &visÃvel", MNID_HELP_HELPTOP MENUITEM SEPARATOR MENUITEM "&InformaÃ§Ãµes...", MNID_HELP_ABOUT -#ifdef WINELIB - MENUITEM "&Acerca do WINE", MNID_HELP_WINE -#endif } } @@ -149,7 +143,7 @@ STRINGTABLE { -STID_WINE_HELP, "Ajuda WINE" +STID_WINE_HELP, "Ajuda Wine" STID_WHERROR, "ERRO" STID_WARNING, "AVISO" STID_INFO, "InformaÃ§Ã£o" @@ -169,7 +163,7 @@ STRINGTABLE { -STID_WINE_HELP, "Ajuda WINE" +STID_WINE_HELP, "Ajuda Wine" STID_WHERROR, "ERRO" STID_WARNING, "AVISO" STID_INFO, "InformaÃ§Ã£o" Modified: trunk/reactos/base/applications/winhlp32/Rm.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/Rm.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/Rm.rc [iso-8859-1] Sun Oct 17 00:26:32 2010 @@ -70,16 +70,13 @@ MENUITEM "Adï¿½na da&vant", MNID_HELP_HELPTOP MENUITEM SEPARATOR MENUITEM "I&nfuormaziuns", MNID_HELP_ABOUT -#ifdef WINELIB - MENUITEM "Davart &Wine", MNID_HELP_WINE -#endif } } /* Strings */ STRINGTABLE { -STID_WINE_HELP, "WINE agï¿½d" +STID_WINE_HELP, "Wine agï¿½d" STID_WHERROR, "SBAGL" STID_WARNING, "ATTENZIUN" STID_INFO, "INFUORMAZIUN" Modified: trunk/reactos/base/applications/winhlp32/Ro.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/Ro.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/Ro.rc [iso-8859-1] Sun Oct 17 00:26:32 2010 @@ -67,9 +67,6 @@ MENUITEM "Ãn&totdeauna deasupra", MNID_HELP_HELPTOP MENUITEM SEPARATOR MENUITEM "&InformaÈii...", MNID_HELP_ABOUT -#ifdef WINELIB - MENUITEM "&Despre Wine", MNID_HELP_WINE -#endif } } Modified: trunk/reactos/base/applications/winhlp32/Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/Ru.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/Ru.rc [iso-8859-1] Sun Oct 17 00:26:32 2010 @@ -66,9 +66,6 @@ MENUITEM "ÐÑÐµÐ³Ð´Ð° &ÑÐ²ÐµÑÑÑ", MNID_HELP_HELPTOP MENUITEM SEPARATOR MENUITEM "&ÐÐ½ÑÐ¾ÑÐ¼Ð°ÑÐ¸Ñ...", MNID_HELP_ABOUT -#ifdef WINELIB - MENUITEM "&Ð Wine", MNID_HELP_WINE -#endif } } @@ -91,7 +88,7 @@ /* Strings */ STRINGTABLE { -STID_WINE_HELP, "Ð¡Ð¿ÑÐ°Ð²ÐºÐ° WINE" +STID_WINE_HELP, "Ð¡Ð¿ÑÐ°Ð²ÐºÐ° Wine" STID_WHERROR, "ÐÐ¨ÐÐÐÐ" STID_WARNING, "ÐÐÐÐÐÐÐÐ" STID_INFO, "ÐÐ½ÑÐ¾ÑÐ¼Ð°ÑÐ¸Ñ" Modified: trunk/reactos/base/applications/winhlp32/Si.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/Si.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/Si.rc [iso-8859-1] Sun Oct 17 00:26:32 2010 @@ -65,9 +65,6 @@ MENUITEM "Vedno na &vrhu", MNID_HELP_HELPTOP MENUITEM SEPARATOR MENUITEM "&Informacije ...", MNID_HELP_ABOUT -#ifdef WINELIB - MENUITEM "&O WINE", MNID_HELP_WINE -#endif } } @@ -90,7 +87,7 @@ /* Strings */ STRINGTABLE { -STID_WINE_HELP, "WINE PomoÄ" +STID_WINE_HELP, "Wine PomoÄ" STID_WHERROR, "NAPAKA" STID_WARNING, "OPOZORILO" STID_INFO, "Informacija" Modified: trunk/reactos/base/applications/winhlp32/Sk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/Sk.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/Sk.rc [iso-8859-1] Sun Oct 17 00:26:32 2010 @@ -61,16 +61,13 @@ MENUITEM "Vdy na &vrchu", MNID_HELP_HELPTOP MENUITEM SEPARATOR MENUITEM "&Info...", MNID_HELP_ABOUT -#ifdef WINELIB - MENUITEM "O& WINE", MNID_HELP_WINE -#endif } } /* Strings */ STRINGTABLE { -STID_WINE_HELP, "WINE Pomoc" +STID_WINE_HELP, "Wine Pomoc" STID_WHERROR, "CHYBA" STID_WARNING, "VAROVANIE" STID_INFO, "Informácie" Added: trunk/reactos/base/applications/winhlp32/Sr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/Sr.rc (added) +++ trunk/reactos/base/applications/winhlp32/Sr.rc [iso-8859-1] Sun Oct 17 00:26:32 2010 @@ -1,0 +1,128 @@ +/* + * Help Viewer + * + * Copyright 2010 Nenad Vujic + * Paul Vriens + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "winhelp_res.h" + +#pragma code_page(65001) + +/* Menu */ + +LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_LATIN + +MAIN_MENU MENU +{ + POPUP "&Fajl" { + MENUITEM "&Otvori", MNID_FILE_OPEN + MENUITEM SEPARATOR + MENUITEM "&Å tampaj", MNID_FILE_PRINT + MENUITEM "Å tampaÄ &podeÅ¡avanje...", MNID_FILE_SETUP + MENUITEM SEPARATOR + MENUITEM "I&zlaz", MNID_FILE_EXIT + } + POPUP "&Izmeni" { + MENUITEM "&Kopiraj...", MNID_EDIT_COPYDLG + MENUITEM SEPARATOR + MENUITEM "&PribeleÅ¾i...", MNID_EDIT_ANNOTATE + } + POPUP "&OznaÄi" { + MENUITEM "&Odredi...", MNID_BKMK_DEFINE + } + POPUP "&Opcije" { + POPUP "PomoÄ uvek vidljiva" + BEGIN + MENUITEM "Osnovno", MNID_OPTS_HELP_DEFAULT + MENUITEM "Vidljivo", MNID_OPTS_HELP_VISIBLE + MENUITEM "Nije vidljivo", MNID_OPTS_HELP_NONVISIBLE + END + MENUITEM "Istorija", MNID_OPTS_HISTORY + POPUP "Fontovi" + BEGIN + MENUITEM "Mali", MNID_OPTS_FONTS_SMALL + MENUITEM "Normalan", MNID_OPTS_FONTS_NORMAL + MENUITEM "Veliki", MNID_OPTS_FONTS_LARGE + END + MENUITEM "Koristi sistenske boje", MNID_OPTS_SYSTEM_COLORS + } + POPUP "&PomoÄ" { + MENUITEM "PomoÄ &na pomoÄi", MNID_HELP_HELPON + MENUITEM "Uvek na &vrhu", MNID_HELP_HELPTOP + MENUITEM SEPARATOR + MENUITEM "&Info...", MNID_HELP_ABOUT + } +} + +IDD_INDEX DIALOG 0, 0, 200, 190 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +CAPTION "Index" +{ + LISTBOX IDC_INDEXLIST, 10, 10, 180, 150, LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_BORDER +} + +IDD_SEARCH DIALOG 0, 0, 200, 190 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +CAPTION "TraÅ¾i" +{ + LTEXT "Not implemented yet", -1, 10, 10, 180, 150 +} + +/* Strings */ +STRINGTABLE +{ +STID_WINE_HELP, "Wine PomoÄ" +STID_WHERROR, "GREÅ KA" +STID_WARNING, "UPOZORENJE" +STID_INFO, "Informacija" +STID_NOT_IMPLEMENTED, "Nije jos u programu" +STID_HLPFILE_ERROR_s, "GreÅ¡ka tokom Äitanja pomoÄnog fajla `%s'" +STID_INDEX, "&Index" +STID_CONTENTS, "Pregled" +STID_BACK, "&Nazad" +STID_ALL_FILES, "Svi fajlovi (*.*)" +STID_HELP_FILES_HLP, "PomoÄni fajlovi (*.hlp)" +STID_FILE_NOT_FOUND_s "Ne mogu naÄi '%s'. Da li Å¾elite da sami naÄete fajl?" +STID_NO_RICHEDIT "Ne mogu naÄi richedit ubacen... Prekidam" +STID_PSH_INDEX, "Teme pomoÄi: " +} + +CONTEXT_MENU MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "BeleÅ¡ke...", MNID_CTXT_ANNOTATE + MENUITEM "Kopiraj", MNID_CTXT_COPY + MENUITEM "Å tampaj...", MNID_CTXT_PRINT + POPUP "Fontovi" + BEGIN + MENUITEM "Mali", MNID_CTXT_FONTS_SMALL + MENUITEM "Normalno", MNID_CTXT_FONTS_NORMAL + MENUITEM "Veliki", MNID_CTXT_FONTS_LARGE + END + POPUP "PomoÄ uvek vidljiva" + BEGIN + MENUITEM "Osnovno", MNID_CTXT_HELP_DEFAULT + MENUITEM "Vidljiv", MNID_CTXT_HELP_VISIBLE + MENUITEM "Nije vidljiv", MNID_CTXT_HELP_NONVISIBLE + END + MENUITEM "Koristi sistemske boje", MNID_CTXT_SYSTEM_COLORS + END +END Propchange: trunk/reactos/base/applications/winhlp32/Sr.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/winhlp32/Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/Sv.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/Sv.rc [iso-8859-1] Sun Oct 17 00:26:32 2010 @@ -67,9 +67,6 @@ MENUITEM "Alltid &överst", MNID_HELP_HELPTOP MENUITEM SEPARATOR MENUITEM "&Info...", MNID_HELP_ABOUT -#ifdef WINELIB - MENUITEM "&Om Wine", MNID_HELP_WINE -#endif } } Modified: trunk/reactos/base/applications/winhlp32/Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/Tr.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/Tr.rc [iso-8859-1] Sun Oct 17 00:26:32 2010 @@ -63,16 +63,13 @@ MENUITEM "&Her Zaman Üstte", MNID_HELP_HELPTOP MENUITEM SEPARATOR MENUITEM "&Bilgi...", MNID_HELP_ABOUT -#ifdef WINELIB - MENUITEM "WINE &Hakkýnda", MNID_HELP_WINE -#endif } } /* Strings */ STRINGTABLE { -STID_WINE_HELP, "WINE Yardým" +STID_WINE_HELP, "Wine Yardým" STID_WHERROR, "HATA" STID_WARNING, "UYARI" STID_INFO, "Bilgi" Modified: trunk/reactos/base/applications/winhlp32/Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/Uk.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/Uk.rc [iso-8859-1] Sun Oct 17 00:26:32 2010 @@ -71,9 +71,6 @@ MENUITEM "ÐÐ°Ð²Ð¶Ð´Ð¸ &Ð·Ð²ÐµÑÑÑ", MNID_HELP_HELPTOP MENUITEM SEPARATOR MENUITEM "&ÐÐ½ÑÐ¾ÑÐ¼Ð°ÑÑÑ...", MNID_HELP_ABOUT -#ifdef WINELIB - MENUITEM "&ÐÑÐ¾ Wine", MNID_HELP_WINE -#endif } } Modified: trunk/reactos/base/applications/winhlp32/Zh.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/Zh.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/Zh.rc [iso-8859-1] Sun Oct 17 00:26:32 2010 @@ -68,16 +68,13 @@ MENUITEM "æ»æ¯å¨æåé¢(&T)", MNID_HELP_HELPTOP MENUITEM SEPARATOR MENUITEM "èµæä¿¡æ¯(&I)...", MNID_HELP_ABOUT -#ifdef WINELIB - MENUITEM "å³äº WINE(&A)", MNID_HELP_WINE -#endif } } /* Strings */ STRINGTABLE { -STID_WINE_HELP, "WINE å¸®å©" +STID_WINE_HELP, "Wine å¸®å©" STID_WHERROR, "éè¯¯" STID_WARNING, "è¦å" STID_INFO, "ä¿¡æ¯" @@ -136,16 +133,13 @@ MENUITEM "ç¸½æ¯å¨æä¸é¢(&T)", MNID_HELP_HELPTOP MENUITEM SEPARATOR MENUITEM "è³è¨(&I)...", MNID_HELP_ABOUT -#ifdef WINELIB - MENUITEM "éæ¼ WINE(&A)", MNID_HELP_WINE -#endif } } /* Strings */ STRINGTABLE { -STID_WINE_HELP, "WINE å¹«å©" +STID_WINE_HELP, "Wine å¹«å©" STID_WHERROR, "é¯èª¤" STID_WARNING, "è¦å" STID_INFO, "è³è¨" Modified: trunk/reactos/base/applications/winhlp32/macro.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/macro.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/macro.c [iso-8859-1] Sun Oct 17 00:26:32 2010 @@ -151,7 +151,11 @@ void CALLBACK MACRO_About(void) { - WINE_FIXME("()\n"); + WCHAR name[256]; + HICON icon = LoadImageW( Globals.hInstance, MAKEINTRESOURCEW(IDI_WINHELP), + IMAGE_ICON, 48, 48, LR_SHARED ); + LoadStringW( Globals.hInstance, STID_WINE_HELP, name, sizeof(name)/sizeof(WCHAR) ); + ShellAboutW( MACRO_CurrentWindow()->hMainWnd, name, NULL, icon ); } static void CALLBACK MACRO_AddAccelerator(LONG u1, LONG u2, LPCSTR str) Modified: trunk/reactos/base/applications/winhlp32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/rsrc.rc [iso-8859-1] Sun Oct 17 00:26:32 2010 @@ -22,7 +22,7 @@ #include "winhelp_res.h" /* @makedep: winhelp.ico */ -IDI_WINHELP ICON DISCARDABLE winhelp.ico +IDI_WINHELP ICON winhelp.ico #include "Bg.rc" #include "Cs.rc" @@ -41,6 +41,7 @@ #include "Da.rc" #include "De.rc" #include "Fr.rc" +#include "He.rc" #include "It.rc" #include "Ja.rc" #include "Lt.rc" @@ -50,5 +51,6 @@ #include "Ro.rc" #include "Ru.rc" #include "Si.rc" +#include "Sr.rc" #include "Uk.rc" #include "Zh.rc" Modified: trunk/reactos/base/applications/winhlp32/winhelp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/winhelp.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/winhelp.c [iso-8859-1] Sun Oct 17 00:26:32 2010 @@ -1368,7 +1368,6 @@ case MNID_HELP_HELPON: MACRO_HelpOn(); break; case MNID_HELP_HELPTOP: MACRO_HelpOnTop(); break; case MNID_HELP_ABOUT: MACRO_About(); break; - case MNID_HELP_WINE: ShellAbout(hWnd, "WINE", "Help", 0); break; /* Context help */ case MNID_CTXT_ANNOTATE:MACRO_Annotate(); break; Modified: trunk/reactos/base/applications/winhlp32/winhelp_res.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/winhelp_res.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/winhelp_res.h [iso-8859-1] Sun Oct 17 00:26:32 2010 @@ -23,7 +23,6 @@ #define MNID_HELP_HELPON 0x141 #define MNID_HELP_HELPTOP 0x142 #define MNID_HELP_ABOUT 0x143 -#define MNID_HELP_WINE 0x144 #define MNID_CTXT_ANNOTATE 0x200 #define MNID_CTXT_COPY 0x201 Modified: trunk/reactos/base/applications/wordpad/It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/It.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/It.rc [iso-8859-1] Sun Oct 17 00:26:32 2010 @@ -54,7 +54,7 @@ MENUITEM "Trova s&uccessivo\tF3", ID_FIND_NEXT MENUITEM "S&ostituisci...\tCtrl+H", ID_REPLACE MENUITEM SEPARATOR - MENUITEM "Solo &Lettura", ID_EDIT_READONLY + MENUITEM "Sola &lettura", ID_EDIT_READONLY MENUITEM "&Modificato", ID_EDIT_MODIFIED MENUITEM SEPARATOR POPUP "E&xtra" @@ -71,7 +71,7 @@ MENUITEM "Barra degli &strumenti", ID_TOGGLE_TOOLBAR MENUITEM "Barra del &formato", ID_TOGGLE_FORMATBAR MENUITEM "&Righello", ID_TOGGLE_RULER - MENUITEM "Barra dello s&tato", ID_TOGGLE_STATUSBAR + MENUITEM "Barra di s&tato", ID_TOGGLE_STATUSBAR MENUITEM SEPARATOR MENUITEM "&Opzioni...", ID_VIEWPROPERTIES END @@ -93,7 +93,7 @@ END POPUP "&Aiuto" BEGIN - MENUITEM "&Riguardo A Wine Wordpad" ID_ABOUT + MENUITEM "&Riguardo a Wine Wordpad" ID_ABOUT END END @@ -119,8 +119,8 @@ MENUITEM "Verde" ID_COLOR_GREEN MENUITEM "Verde oliva" ID_COLOR_OLIVE MENUITEM "Blu oltremare" ID_COLOR_NAVY - MENUITEM "Propora" ID_COLOR_PURPLE - MENUITEM "Teal" ID_COLOR_TEAL + MENUITEM "Porpora" ID_COLOR_PURPLE + MENUITEM "Foglia di TÃ¨" ID_COLOR_TEAL MENUITEM "Grigio" ID_COLOR_GRAY MENUITEM "Argento" ID_COLOR_SILVER MENUITEM "Rosso" ID_COLOR_RED @@ -128,9 +128,9 @@ MENUITEM "Giallo" ID_COLOR_YELLOW MENUITEM "Blu" ID_COLOR_BLUE MENUITEM "Fucsia" ID_COLOR_FUCHSIA - MENUITEM "Aqua" ID_COLOR_AQUA + MENUITEM "Acqua" ID_COLOR_AQUA MENUITEM "Bianco" ID_COLOR_WHITE - MENUITEM "Automatic" ID_COLOR_AUTOMATIC + MENUITEM "Automatico" ID_COLOR_AUTOMATIC END END @@ -161,7 +161,7 @@ Caption "Formato del paragrafo" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Indentazione", -1, 10, 10, 120, 68 + GROUPBOX "Rientro", -1, 10, 10, 120, 68 LTEXT "Sinistra", -1, 15, 22, 40, 13 EDITTEXT IDC_PARA_LEFT, 55, 20, 60, 13 LTEXT "Destra", -1, 15, 40, 40, 13 @@ -201,17 +201,17 @@ CHECKBOX "Barra degli &strumenti", IDC_PAGEFMT_TB, 180, 20, 80, 15 CHECKBOX "Barra del &formato", IDC_PAGEFMT_FB, 180, 38, 80, 15 CHECKBOX "&Righello", IDC_PAGEFMT_RU, 180, 56, 80, 15 - CHECKBOX "Barra dello s&tato", IDC_PAGEFMT_SB, 180, 74, 80, 15 + CHECKBOX "Barra di s&tato", IDC_PAGEFMT_SB, 180, 74, 80, 15 LTEXT "", IDC_PAGEFMT_ID, 0,0,0,0 END STRINGTABLE BEGIN - STRING_ALL_FILES, "Tutti i files (*.*)" + STRING_ALL_FILES, "Tutti i file (*.*)" STRING_TEXT_FILES_TXT, "File di testo (*.txt)" STRING_TEXT_FILES_UNICODE_TXT, "File di testo Unicode (*.txt)" STRING_RICHTEXT_FILES_RTF, "Formato rich text (*.rtf)" - STRING_NEWFILE_RICHTEXT, "Documento Rich text" + STRING_NEWFILE_RICHTEXT, "Documento rich text" STRING_NEWFILE_TXT, "Documento di testo" STRING_NEWFILE_TXT_UNICODE, "Documento di testo Unicode" STRING_PRINTER_FILES_PRN, "File di stampa (*.PRN)" @@ -264,6 +264,6 @@ STRING_WRITE_ACCESS_DENIED, "Non hai i diritti di accesso per salvare il file." STRING_OPEN_FAILED, "Impossibile aprire il file." STRING_OPEN_ACCESS_DENIED, "Non hai i diritti di accesso per aprire il file." - STRING_PRINTING_NOT_IMPLEMENTED, "Stampa non implementata" + STRING_PRINTING_NOT_IMPLEMENTED, "Stampa non implementata" STRING_MAX_TAB_STOPS, "Non si possono aggiungere piÃ¹ di 32 punti di fermata delle tabulazioni." END Modified: trunk/reactos/base/applications/wordpad/Zh.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/Zh.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/Zh.rc [iso-8859-1] Sun Oct 17 00:26:32 2010 @@ -56,12 +56,12 @@ MENUITEM "æ¾ä¸ä¸ä¸ª(&N)\tF3", ID_FIND_NEXT MENUITEM "æ¿æ¢(&R)...\tCtrl+H", ID_REPLACE MENUITEM SEPARATOR - MENUITEM "åªè¯»(&0))", ID_EDIT_READONLY - MENUITEM "å·²æ¹å¨(M)", ID_EDIT_MODIFIED + MENUITEM "åªè¯»(&O)", ID_EDIT_READONLY + MENUITEM "å·²æ¹å¨(&M)", ID_EDIT_MODIFIED MENUITEM SEPARATOR POPUP "å¶ä»(&X)" BEGIN - MENUITEM "éæ©ä¿¡æ¯(&I)", ID_EDIT_SELECTIONINFO + MENUITEM "éä¸ä¿¡æ¯(&I)", ID_EDIT_SELECTIONINFO MENUITEM "æåæ ¼å¼(&F)", ID_EDIT_CHARFORMAT MENUITEM "é»è®¤æ ¼å¼(&D)", ID_EDIT_DEFCHARFORMAT MENUITEM "æ®µè½æ ¼å¼(&H)", ID_EDIT_PARAFORMAT @@ -116,22 +116,22 @@ BEGIN POPUP "" BEGIN - MENUITEM "é»", ID_COLOR_BLACK - MENUITEM "Maroon", ID_COLOR_MAROON - MENUITEM "ç»¿", ID_COLOR_GREEN - MENUITEM "Olive" ID_COLOR_OLIVE - MENUITEM "Navy" ID_COLOR_NAVY - MENUITEM "ç´«" ID_COLOR_PURPLE - MENUITEM "Teal" ID_COLOR_TEAL - MENUITEM "ç°" ID_COLOR_GRAY - MENUITEM "Silver" ID_COLOR_SILVER - MENUITEM "çº¢" ID_COLOR_RED - MENUITEM "Lime" ID_COLOR_LIME - MENUITEM "é»" ID_COLOR_YELLOW - MENUITEM "è" ID_COLOR_BLUE - MENUITEM "Fuchsia" ID_COLOR_FUCHSIA - MENUITEM "Aqua" ID_COLOR_AQUA - MENUITEM "ç½" ID_COLOR_WHITE + MENUITEM "é»è²", ID_COLOR_BLACK /* æªæ¾å°âæ åè¯åè¡¨â */ + MENUITEM "æ è²", ID_COLOR_MAROON + MENUITEM "è°åç»¿", ID_COLOR_GREEN + MENUITEM "æ©æ¦è²" ID_COLOR_OLIVE + MENUITEM "èé" ID_COLOR_NAVY + MENUITEM "ç´«è²" ID_COLOR_PURPLE + MENUITEM "é¸ç¿ç»¿" ID_COLOR_TEAL + MENUITEM "ç°è²" ID_COLOR_GRAY + MENUITEM "é¶è²" ID_COLOR_SILVER + MENUITEM "çº¢è²" ID_COLOR_RED + MENUITEM "ç»¿è²" ID_COLOR_LIME + MENUITEM "é»è²" ID_COLOR_YELLOW + MENUITEM "èè²" ID_COLOR_BLUE + MENUITEM "æ´çº¢" ID_COLOR_FUCHSIA /* =magenta? */ + MENUITEM "æ°´ç»¿" ID_COLOR_AQUA + MENUITEM "ç½è²" ID_COLOR_WHITE MENUITEM "èªå¨" ID_COLOR_AUTOMATIC END END @@ -262,20 +262,18 @@ STRINGTABLE BEGIN STRING_DEFAULT_FILENAME, "ææ¡£" - STRING_PROMPT_SAVE_CHANGES, "è¦ä¿å '%s' å?" - STRING_SEARCH_FINISHED, "æä»¶æ¥æ¾ç»æ." - STRING_LOAD_RICHED_FAILED, "RichEdit è£è½½å¤±è´¥." - STRING_SAVE_LOSEFORMATTING, "ä½ å·²ç»éæ©ä¿åä¸ºææ¬æä»¶, " \ - "è¿å¯è½å¯¼è´æ ¼å¼ä¸¢å¤±. " \ - "ä½ ç¡®å®è¦è¿ä¹åå?" + STRING_PROMPT_SAVE_CHANGES, "è¦ä¿åâ%sâåï¼" + STRING_SEARCH_FINISHED, "æä»¶æ¥æ¾ç»æã" + STRING_LOAD_RICHED_FAILED, "RichEdit è£è½½å¤±è´¥ã" + STRING_SAVE_LOSEFORMATTING, "ä½ å·²ç»éæ©ä¿åä¸ºææ¬æä»¶ï¼èè¿å¯è½å¯¼è´æ ¼å¼ä¸¢å¤±ãä½ ç¡®å®è¦è¿ä¹ååï¼" STRING_INVALID_NUMBER, "æ°åæ ¼å¼æ æ" STRING_OLE_STORAGE_NOT_SUPPORTED, "ä¸æ¯æ OLE å¨åæä»¶" - STRING_WRITE_FAILED, "ä¸è½ä¿åæä»¶." - STRING_WRITE_ACCESS_DENIED, "ä½ æ²¡æä¿åæä»¶çæé." - STRING_OPEN_FAILED, "ä¸è½æå¼æä»¶." - STRING_OPEN_ACCESS_DENIED, "ä½ æ²¡ææå¼æä»¶çæé." + STRING_WRITE_FAILED, "ä¸è½ä¿åæä»¶ã" + STRING_WRITE_ACCESS_DENIED, "ä½ æ²¡æä¿åæä»¶çæéã" + STRING_OPEN_FAILED, "ä¸è½æå¼æä»¶ã" + STRING_OPEN_ACCESS_DENIED, "ä½ æ²¡ææå¼æä»¶çæéã" STRING_PRINTING_NOT_IMPLEMENTED, "æå°åè½å°æªå®ç°" - STRING_MAX_TAB_STOPS, "æå¤åªè½æ·»å 32 ä¸ªå¶è¡¨ä½å®½åº¦." + STRING_MAX_TAB_STOPS, "æå¤åªè½æ·»å 32 ä¸ªå¶è¡¨ä½å®½åº¦ã" END LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL Modified: trunk/reactos/base/system/msiexec/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/msiexec/rsrc.r… ============================================================================== --- trunk/reactos/base/system/msiexec/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/msiexec/rsrc.rc [iso-8859-1] Sun Oct 17 00:26:32 2010 @@ -32,4 +32,4 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL /* @makedep: msiexec.ico */ -1 ICON DISCARDABLE msiexec.ico +1 ICON msiexec.ico

14 years, 2 months

[sir_richard] 49178: [CSRSS]: Should use MEM_COMMIT | MEM_RESERVE, not just MEM_COMMIT when requesting a range of adress space that wasn't already reserved. This works in ReactOS because, well, no ...

by sir_richard＠svn.reactos.org

Author: sir_richard Date: Sat Oct 16 21:04:50 2010 New Revision: 49178 URL: http://svn.reactos.org/svn/reactos?rev=49178&view=rev Log: [CSRSS]: Should use MEM_COMMIT | MEM_RESERVE, not just MEM_COMMIT when requesting a range of adress space that wasn't already reserved. This works in ReactOS because, well, no reason to explain why, but it wouldn't work on Windows or with a VAD-based kernel. Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/init.c Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csr… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/csrsrv/init.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/csrsrv/init.c [iso-8859-1] Sat Oct 16 21:04:50 2010 @@ -107,7 +107,7 @@ &BaseAddress, 0, &ViewSize, - MEM_COMMIT, + MEM_RESERVE | MEM_COMMIT, PAGE_EXECUTE_READWRITE); if (!NT_SUCCESS(Status)) {

14 years, 2 months

[sir_richard] 49177: [NTOS]: Add MmProtectToValue array to convert MM/PTE protection values to Win32 protection flags.

by sir_richard＠svn.reactos.org

Author: sir_richard Date: Sat Oct 16 21:02:48 2010 New Revision: 49177 URL: http://svn.reactos.org/svn/reactos?rev=49177&view=rev Log: [NTOS]: Add MmProtectToValue array to convert MM/PTE protection values to Win32 protection flags. Modified: trunk/reactos/ntoskrnl/mm/ARM3/miarm.h trunk/reactos/ntoskrnl/mm/i386/page.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/miarm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/miarm.h?r… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] Sat Oct 16 21:02:48 2010 @@ -152,6 +152,7 @@ #endif extern const ULONG MmProtectToPteMask[32]; +extern const ULONG MmProtectToValue[32]; // // Assertions for session images, addresses, and PTEs Modified: trunk/reactos/ntoskrnl/mm/i386/page.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/i386/page.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/mm/i386/page.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/i386/page.c [iso-8859-1] Sat Oct 16 21:02:48 2010 @@ -109,6 +109,43 @@ PTE_EXECUTE_WRITECOPY | PTE_WRITECOMBINED_CACHE, }; +const +ULONG MmProtectToValue[32] = +{ + PAGE_NOACCESS, + PAGE_READONLY, + PAGE_EXECUTE, + PAGE_EXECUTE_READ, + PAGE_READWRITE, + PAGE_WRITECOPY, + PAGE_EXECUTE_READWRITE, + PAGE_EXECUTE_WRITECOPY, + PAGE_NOACCESS, + PAGE_NOCACHE | PAGE_READONLY, + PAGE_NOCACHE | PAGE_EXECUTE, + PAGE_NOCACHE | PAGE_EXECUTE_READ, + PAGE_NOCACHE | PAGE_READWRITE, + PAGE_NOCACHE | PAGE_WRITECOPY, + PAGE_NOCACHE | PAGE_EXECUTE_READWRITE, + PAGE_NOCACHE | PAGE_EXECUTE_WRITECOPY, + PAGE_NOACCESS, + PAGE_GUARD | PAGE_READONLY, + PAGE_GUARD | PAGE_EXECUTE, + PAGE_GUARD | PAGE_EXECUTE_READ, + PAGE_GUARD | PAGE_READWRITE, + PAGE_GUARD | PAGE_WRITECOPY, + PAGE_GUARD | PAGE_EXECUTE_READWRITE, + PAGE_GUARD | PAGE_EXECUTE_WRITECOPY, + PAGE_NOACCESS, + PAGE_WRITECOMBINE | PAGE_READONLY, + PAGE_WRITECOMBINE | PAGE_EXECUTE, + PAGE_WRITECOMBINE | PAGE_EXECUTE_READ, + PAGE_WRITECOMBINE | PAGE_READWRITE, + PAGE_WRITECOMBINE | PAGE_WRITECOPY, + PAGE_WRITECOMBINE | PAGE_EXECUTE_READWRITE, + PAGE_WRITECOMBINE | PAGE_EXECUTE_WRITECOPY +}; + /* FUNCTIONS ***************************************************************/ BOOLEAN MmUnmapPageTable(PULONG Pt);

14 years, 2 months

[fireball] 49176: [PSDK] - Add NOMIRRORBITMAP definition.

by fireball＠svn.reactos.org

Author: fireball Date: Sat Oct 16 19:46:03 2010 New Revision: 49176 URL: http://svn.reactos.org/svn/reactos?rev=49176&view=rev Log: [PSDK] - Add NOMIRRORBITMAP definition. Modified: trunk/reactos/include/psdk/wingdi.h Modified: trunk/reactos/include/psdk/wingdi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wingdi.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/wingdi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/wingdi.h [iso-8859-1] Sat Oct 16 19:46:03 2010 @@ -1319,6 +1319,7 @@ #define LAYOUT_VBH 4 // Vertical before horizontal #define LAYOUT_ORIENTATIONMASK (LAYOUT_RTL | LAYOUT_BTT | LAYOUT_VBH) #define LAYOUT_BITMAPORIENTATIONPRESERVED 8 +#define NOMIRRORBITMAP 0x80000000 #if (WINVER > 0x400) #define CS_ENABLE 0x00000001 #define CS_DISABLE 0x00000002

14 years, 2 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2010