diff options
| author | Armin Le Grand <alg@apache.org> | 2012-02-24 15:05:58 +0000 |
|---|---|---|
| committer | Armin Le Grand <alg@apache.org> | 2012-02-24 15:05:58 +0000 |
| commit | 321638350b7c2f41d3aea8c26f47d0e5a83e6b3d (patch) | |
| tree | 519b73f8f5efe59760e76a8725f740f53b31ea19 /instsetoo_native | |
| parent | 078165cfeeac936cd367f84ac7437f60a29b740e (diff) | |
Changed various aspects concerning usages of old vendor names, licenses and similar. Checked on Win, Linux and Mac.
Diffstat (limited to 'instsetoo_native')
| -rw-r--r-- | instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf | 2 | ||||
| -rw-r--r-- | instsetoo_native/util/openoffice.lst | 18 |
2 files changed, 10 insertions, 10 deletions
diff --git a/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf b/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf index 7c607b871a26..2d7e543ae7ff 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf +++ b/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf @@ -305,7 +305,7 @@ en-US = "< &Back" en-US = "Cancel" [OOO_CONTROL_124] -en-US = "Build contributed in collaboration with the community by Oracle. For credits, see: http://www.openoffice.org/welcome/credits.html" +en-US = "This Program is based on the 'Apache OpenOffice (incubating)' project which is supported by members of the Apache Community. For credits, see: http://www.openoffice.org/welcome/credits.html" [OOO_CONTROL_125] en-US = "&Next >" diff --git a/instsetoo_native/util/openoffice.lst b/instsetoo_native/util/openoffice.lst index 37ec8d509247..43588b6b3af6 100644 --- a/instsetoo_native/util/openoffice.lst +++ b/instsetoo_native/util/openoffice.lst @@ -10,7 +10,7 @@ Globals URELAYERVERSION 1 BASISROOTNAME OpenOffice.org UNIXBASISROOTNAME openoffice.org - SERVICETAG_PRODUCTNAME OpenOffice.org 3.4 + SERVICETAG_PRODUCTNAME OpenOffice.org 3.4 SERVICETAG_PRODUCTVERSION 3.4 SERVICETAG_PARENTNAME OpenOffice.org 3.4 SERVICETAG_SOURCE {buildsource}{minor}(Build:{buildid}) @@ -76,7 +76,7 @@ OpenOffice WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1 PACKAGEVERSION 3.4.0 PACKAGEREVISION {milestone} - LICENSENAME LGPL + LICENSENAME ALv2 GLOBALFILEGID gid_File_Lib_Vcl GLOBALPATCHFILEGID gid_File_Txt_Patchfiles SPELLCHECKERFILE spellchecker_selection.txt @@ -139,7 +139,7 @@ OpenOffice_wJRE WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1 PACKAGEVERSION 3.4.0 PACKAGEREVISION {milestone} - LICENSENAME LGPL + LICENSENAME ALv2 WITHJREPRODUCT 1 GLOBALFILEGID gid_File_Lib_Vcl GLOBALPATCHFILEGID gid_File_Txt_Patchfiles @@ -209,7 +209,7 @@ OpenOffice_Dev WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1 PACKAGEVERSION 3.4.0 PACKAGEREVISION {milestone} - LICENSENAME LGPL + LICENSENAME ALv2 GLOBALFILEGID gid_File_Lib_Vcl GLOBALPATCHFILEGID gid_File_Txt_Patchfiles SPELLCHECKERFILE spellchecker_selection.txt @@ -261,7 +261,7 @@ URE PRODUCTEXTENSION LONG_PRODUCTEXTENSION SHORT_PRODUCTEXTENSION - LICENSENAME LGPL + LICENSENAME ALv2 SETSTATICPATH 1 NOVERSIONINDIRNAME 1 PCPFILENAME ure.pcp @@ -308,9 +308,9 @@ OpenOffice_SDK PACK_INSTALLED 1 POOLPRODUCT 0 DMG_VOLUMEEXTENSION SDK - DATABASENAME openofficeorg33sdk + DATABASENAME openofficeorg34sdk NO_README_IN_ROOTDIR 1 - LICENSENAME LGPL + LICENSENAME ALv2 IGNOREDIRECTORYLAYER 1 NOVERSIONINDIRNAME 0 NOSPACEINDIRECTORYNAME 1 @@ -361,9 +361,9 @@ OpenOffice_Dev_SDK PACK_INSTALLED 1 POOLPRODUCT 0 DMG_VOLUMEEXTENSION SDK - DATABASENAME openofficeorg33devsdk + DATABASENAME openofficeorg34devsdk NO_README_IN_ROOTDIR 1 - LICENSENAME LGPL + LICENSENAME ALv2 IGNOREDIRECTORYLAYER 1 NOVERSIONINDIRNAME 0 NOSPACEINDIRECTORYNAME 1 |