diff options
| -rwxr-xr-x | crashrep/source/win32/rcheader.txt | 22 | ||||
| -rw-r--r-- | setup_native/source/win32/stwrapper/resource.rc | 25 |
2 files changed, 1 insertions, 46 deletions
diff --git a/crashrep/source/win32/rcheader.txt b/crashrep/source/win32/rcheader.txt index afecc9cda681..22821e5f9a6b 100755 --- a/crashrep/source/win32/rcheader.txt +++ b/crashrep/source/win32/rcheader.txt @@ -65,28 +65,11 @@ VS_VERSION_INFO versioninfo VS_FF_PRERELEASE | #endif 0 -#ifndef WIN32 - fileos VOS_DOS_WINDOWS16 -#else fileos VOS_NT_WINDOWS32 -#endif filetype VFT_APP { block "StringFileInfo" { -#ifdef LG_D - block "040704E4" - { - // German StringTable - value "CompanyName", "OpenOffice.org\0" - value "FileDescription", "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\0" - value "FileVersion", PPS(VER_LEVEL) "\0" - value "ProductVersion", PPS(VER_LEVEL) "\0" - value "OriginalFilename", "SOREPORT.EXE\0" - value "InternalName", "CrashReport\0" - value "LegalCopyright", S_CRIGHT " Sun Microsystems, Inc.\0" - } -#else block "040904E4" { // International StringTable @@ -98,16 +81,11 @@ VS_VERSION_INFO versioninfo value "InternalName", "CrashReport\0" value "LegalCopyright", S_CRIGHT " Sun Microsystems, Inc.\0" } -#endif } block "VarFileInfo" { -#ifdef LG_D - value "Translation", 0x0407, 1252 -#else value "Translation", 0x0409, 1252 -#endif } } diff --git a/setup_native/source/win32/stwrapper/resource.rc b/setup_native/source/win32/stwrapper/resource.rc index fa2ec6096589..8683faac0d4a 100644 --- a/setup_native/source/win32/stwrapper/resource.rc +++ b/setup_native/source/win32/stwrapper/resource.rc @@ -36,13 +36,8 @@ RCD_LANGUAGE rcdata { -#ifdef LG_D - "040704B0", // Germany -> Unicode - "040704E4", // Germany -> Windows, Multilingual -#else - "040904B0", // Germany -> Unicode + "040904B0", // USA -> Unicode "040904E4", // USA -> Windows, Multilingual -#endif "04090000", // USA -> 7-Bit-ASCII 0 // end of table } @@ -72,19 +67,6 @@ VS_VERSION_INFO versioninfo { block "StringFileInfo" { -#ifdef LG_D - block "040704E4" - { - // German StringTable - value "CompanyName", "The Document Foundation\0" - value "FileDescription", "Service Tags Wrapper\0" - value "FileVersion", PPS(VER_LEVEL) "\0" - value "ProductVersion", PPS(VER_LEVEL) "\0" - value "OriginalFilename", "STCLIENT_WRAPPER.EXE\0" - value "InternalName", "stclient_wrapper\0" - value "LegalCopyright", S_CRIGHT " Sun Microsystems, Inc.\0" - } -#else block "040904E4" { // International StringTable @@ -96,16 +78,11 @@ VS_VERSION_INFO versioninfo value "InternalName", "stclient_wrapper\0" value "LegalCopyright", S_CRIGHT " Sun Microsystems, Inc.\0" } -#endif } block "VarFileInfo" { -#ifdef LG_D - value "Translation", 0x0407, 1252 -#else value "Translation", 0x0409, 1252 -#endif } } |