[Libreoffice-commits] .: desktop/util desktop/win32
Andras Timar
timar at kemper.freedesktop.org
Tue Oct 12 04:49:43 PDT 2010
desktop/util/ooverinfo.rc | 26 ----------------------
desktop/util/verinfo.rc | 26 ----------------------
desktop/win32/source/applauncher/ooo/verinfo.rc | 28 ------------------------
desktop/win32/source/applauncher/verinfo.rc | 28 ------------------------
4 files changed, 2 insertions(+), 106 deletions(-)
New commits:
commit c4985ec559a79eb9fd9096d16961eecb6252118f
Author: Andras Timar <timar at fsf.hu>
Date: Tue Oct 12 13:49:04 2010 +0200
removed German from the versioninfo
diff --git a/desktop/util/ooverinfo.rc b/desktop/util/ooverinfo.rc
index 441a008..5412f5f 100644
--- a/desktop/util/ooverinfo.rc
+++ b/desktop/util/ooverinfo.rc
@@ -25,10 +25,6 @@
*
*************************************************************************/
-#if !defined(ENGLISH)
-#define LG_D // generate always german version
-#endif
-
#define VER_FIRSTYEAR 2000
#include <windows.h>
@@ -50,28 +46,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", "The Document Foundation\0"
- value "FileDescription", "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\0"
- value "FileVersion", PPS(VER_LEVEL) "\0"
- value "ProductVersion", PPS(VER_LEVEL) "\0"
- value "OriginalFilename", "SOFFICE.EXE\0"
- value "InternalName", "SOFFICE\0"
- value "LegalCopyright", S_CRIGHT " Oracle, Inc.\0"
- }
-#else
block "040904E4"
{
// International StringTable
@@ -83,16 +62,11 @@ VS_VERSION_INFO versioninfo
value "InternalName", "SOFFICE\0"
value "LegalCopyright", S_CRIGHT " Oracle, Inc.\0"
}
-#endif
}
block "VarFileInfo"
{
-#ifdef LG_D
- value "Translation", 0x0407, 1252
-#else
value "Translation", 0x0409, 1252
-#endif
}
}
diff --git a/desktop/util/verinfo.rc b/desktop/util/verinfo.rc
index 5cbe073..7fce1e7 100755
--- a/desktop/util/verinfo.rc
+++ b/desktop/util/verinfo.rc
@@ -25,10 +25,6 @@
*
*************************************************************************/
-#if !defined(ENGLISH)
-#define LG_D // generate always german version
-#endif
-
#define VER_FIRSTYEAR 2007
#include <windows.h>
@@ -55,28 +51,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", "The Document Foundation\0"
- value "FileDescription", "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\0"
- value "FileVersion", PPS(VER_LEVEL) "\0"
- value "ProductVersion", PPS(VER_LEVEL) "\0"
- value "OriginalFilename", "SOFFICE.EXE\0"
- value "InternalName", "SOFFICE\0"
- value "LegalCopyright", S_CRIGHT " Oracle and/or its affiliates. All rights reserved.\0"
- }
-#else
block "040904E4"
{
// International StringTable
@@ -88,16 +67,11 @@ VS_VERSION_INFO versioninfo
value "InternalName", "SOFFICE\0"
value "LegalCopyright", S_CRIGHT " Oracle and/or its affiliates. All rights reserved.\0"
}
-#endif
}
block "VarFileInfo"
{
-#ifdef LG_D
- value "Translation", 0x0407, 1252
-#else
value "Translation", 0x0409, 1252
-#endif
}
}
diff --git a/desktop/win32/source/applauncher/ooo/verinfo.rc b/desktop/win32/source/applauncher/ooo/verinfo.rc
index c13e723..61e9147 100755
--- a/desktop/win32/source/applauncher/ooo/verinfo.rc
+++ b/desktop/win32/source/applauncher/ooo/verinfo.rc
@@ -25,10 +25,6 @@
*
*************************************************************************/
-#if !defined(ENGLISH)
-#define LG_D // generate always german version
-#endif
-
#define VER_FIRSTYEAR 2009
#include <windows.h>
@@ -50,32 +46,15 @@ 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", PPS(RES_APP_NAME) ".exe\0"
- value "InternalName", PPS(RES_APP_NAME) "\0"
- value "LegalCopyright", S_CRIGHT " Oracle and/or its affiliates. All rights reserved.\0"
- }
-#else
block "040904E4"
{
// International StringTable
- value "CompanyName", "OpenOffice.org\0"
+ value "CompanyName", "The Document Foundation\0"
value "FileDescription", "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\0"
value "FileVersion", PPS(VER_LEVEL) "\0"
value "ProductVersion", PPS(VER_LEVEL) "\0"
@@ -83,15 +62,10 @@ VS_VERSION_INFO versioninfo
value "InternalName", PPS(RES_APP_NAME) "\0"
value "LegalCopyright", S_CRIGHT " Oracle and/or its affiliates. All rights reserved.\0"
}
-#endif
}
block "VarFileInfo"
{
-#ifdef LG_D
- value "Translation", 0x0407, 1252
-#else
value "Translation", 0x0409, 1252
-#endif
}
}
diff --git a/desktop/win32/source/applauncher/verinfo.rc b/desktop/win32/source/applauncher/verinfo.rc
old mode 100755
new mode 100644
index c0ff714..afb58f3
--- a/desktop/win32/source/applauncher/verinfo.rc
+++ b/desktop/win32/source/applauncher/verinfo.rc
@@ -25,10 +25,6 @@
*
*************************************************************************/
-#if !defined(ENGLISH)
-#define LG_D // generate always german version
-#endif
-
#define VER_FIRSTYEAR 2009
#include <windows.h>
@@ -55,32 +51,15 @@ 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", "Oracle\0"
- value "FileDescription", "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\0"
- value "FileVersion", PPS(VER_LEVEL) "\0"
- value "ProductVersion", PPS(VER_LEVEL) "\0"
- value "OriginalFilename", PPS(RES_APP_NAME) ".exe\0"
- value "InternalName", PPS(RES_APP_NAME) "\0"
- value "LegalCopyright", S_CRIGHT " Oracle and/or its affiliates. All rights reserved.\0"
- }
-#else
block "040904E4"
{
// International StringTable
- value "CompanyName", "Oracle\0"
+ value "CompanyName", "The Document Foundation\0"
value "FileDescription", "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\0"
value "FileVersion", PPS(VER_LEVEL) "\0"
value "ProductVersion", PPS(VER_LEVEL) "\0"
@@ -88,15 +67,10 @@ VS_VERSION_INFO versioninfo
value "InternalName", PPS(RES_APP_NAME) "\0"
value "LegalCopyright", S_CRIGHT " Oracle and/or its affiliates. All rights reserved.\0"
}
-#endif
}
block "VarFileInfo"
{
-#ifdef LG_D
- value "Translation", 0x0407, 1252
-#else
value "Translation", 0x0409, 1252
-#endif
}
}
More information about the Libreoffice-commits
mailing list