Author: alg
Date: Wed Feb 15 15:27:52 2012
New Revision: 1244534
URL: http://svn.apache.org/viewvc?rev=1244534&view=rev
Log:
adaptions to full namechange
Modified:
incubator/ooo/branches/alg/install/main/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
incubator/ooo/branches/alg/install/main/instsetoo_native/util/openoffice.lst
incubator/ooo/branches/alg/install/main/scp2/source/ooo/folderitem_ooo.ulf
incubator/ooo/branches/alg/install/main/solenv/inc/shlinfo.rc
Modified:
incubator/ooo/branches/alg/install/main/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
URL:
http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf?rev=1244534&r1=1244533&r2=1244534&view=diff
==============================================================================
---
incubator/ooo/branches/alg/install/main/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
(original)
+++
incubator/ooo/branches/alg/install/main/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
Wed Feb 15 15:27:52 2012
@@ -305,7 +305,7 @@ en-US = "< &Back"
en-US = "Cancel"
[OOO_CONTROL_124]
-en-US = "Build contributed by members of the Apache OpenOffice community. 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 >"
Modified:
incubator/ooo/branches/alg/install/main/instsetoo_native/util/openoffice.lst
URL:
http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/instsetoo_native/util/openoffice.lst?rev=1244534&r1=1244533&r2=1244534&view=diff
==============================================================================
---
incubator/ooo/branches/alg/install/main/instsetoo_native/util/openoffice.lst
(original)
+++
incubator/ooo/branches/alg/install/main/instsetoo_native/util/openoffice.lst
Wed Feb 15 15:27:52 2012
@@ -8,18 +8,18 @@ Globals
OOOPACKAGEVERSION 3.4.0
UREPACKAGEVERSION 3.4.0
URELAYERVERSION 1
- BASISROOTNAME OpenOffice.org
- UNIXBASISROOTNAME openoffice.org
- SERVICETAG_PRODUCTNAME OpenOffice.org 3.4
+ BASISROOTNAME Apache OpenOffice
+ UNIXBASISROOTNAME apache.openoffice
+ SERVICETAG_PRODUCTNAME Apache OpenOffice 3.4
SERVICETAG_PRODUCTVERSION 3.4
- SERVICETAG_PARENTNAME OpenOffice.org 3.4
+ SERVICETAG_PARENTNAME Apache OpenOffice 3.4
SERVICETAG_SOURCE {buildsource}{minor}(Build:{buildid})
SERVICETAG_URN
urn:uuid:500061aa-5666-11e0-8e00-080020a9ed93
HIDELICENSEDIALOG 1
PACKAGEPREFIX
- BASISPACKAGEPREFIX ooobasis
- UREPACKAGEPREFIX openoffice.org
- SOLSUREPACKAGEPREFIX openofficeorg
+ BASISPACKAGEPREFIX aoobasis
+ UREPACKAGEPREFIX apache.openoffice
+ SOLSUREPACKAGEPREFIX apacheopenoffice
USE_FILEVERSION 1
LIBRARYVERSION 9.4.0
POOLPRODUCT 1
@@ -53,7 +53,7 @@ OpenOffice
{
variables
{
- PRODUCTNAME OpenOffice.org
+ PRODUCTNAME Apache OpenOffice
PRODUCTVERSION 3.4
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
@@ -71,7 +71,7 @@ OpenOffice
REMOVE_UPGRADE_CODE_FILE upgradecode_remove_ooo.txt
ADDSYSTEMINTEGRATION 1
EVAL
- FILEFORMATNAME OpenOffice.org
+ FILEFORMATNAME Apache OpenOffice
FILEFORMATVERSION 1.0
WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
PACKAGEVERSION 3.4.0
@@ -98,7 +98,7 @@ OpenOffice
STARTCENTER_INFO_URL http://www.openoffice.org
STARTCENTER_TEMPLREP_URL
http://templates.services.openoffice.org
STARTCENTER_LAYOUT_STYLE 0
- REGISTRATION_PRODUCT OpenOffice.org
+ REGISTRATION_PRODUCT Apache OpenOffice
REGISTRATION_CID 926117
DICT_REPO_URL
http://extensions.services.openoffice.org/dictionaries
}
@@ -117,7 +117,7 @@ OpenOffice_wJRE
{
variables
{
- PRODUCTNAME OpenOffice.org
+ PRODUCTNAME Apache OpenOffice
PRODUCTVERSION 3.4
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
@@ -134,7 +134,7 @@ OpenOffice_wJRE
REMOVE_UPGRADE_CODE_FILE upgradecode_remove_ooo.txt
ADDSYSTEMINTEGRATION 1
EVAL
- FILEFORMATNAME OpenOffice.org
+ FILEFORMATNAME Apache OpenOffice
FILEFORMATVERSION 1.0
WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
PACKAGEVERSION 3.4.0
@@ -163,7 +163,7 @@ OpenOffice_wJRE
STARTCENTER_INFO_URL http://www.openoffice.org
STARTCENTER_TEMPLREP_URL
http://templates.services.openoffice.org
STARTCENTER_LAYOUT_STYLE 0
- REGISTRATION_PRODUCT OpenOffice.org
+ REGISTRATION_PRODUCT Apache OpenOffice
REGISTRATION_CID 926117
DICT_REPO_URL
http://extensions.services.openoffice.org/dictionaries
}
@@ -181,13 +181,13 @@ OpenOffice_Dev
{
variables
{
- PRODUCTNAME OOo-dev
+ PRODUCTNAME AOO-dev
PRODUCTVERSION 3.4
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
SHORT_PRODUCTEXTENSION
- BASISROOTNAME OOo-dev
- UNIXBASISROOTNAME ooo-dev
+ BASISROOTNAME AOO-dev
+ UNIXBASISROOTNAME aoo-dev
POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3
@@ -195,16 +195,16 @@ OpenOffice_Dev
ABOUTBOXPRODUCTVERSION 3.4.0
BASEPRODUCTVERSION 3.4
DEVELOPMENTPRODUCT 1
- BASISPACKAGEPREFIX ooobasis-dev
- UREPACKAGEPREFIX ooodev
- SOLSUREPACKAGEPREFIX ooodev
+ BASISPACKAGEPREFIX aoobasis-dev
+ UREPACKAGEPREFIX aoodev
+ SOLSUREPACKAGEPREFIX aoodev
REGISTRYLAYERNAME LayerDev
SERVICETAG_URN
urn:uuid:1680b00d-e45c-11de-82d6-080020a9ed93
UPDATEURL
http://update38.services.openoffice.org/ProductUpdateService/check.Update
ODFNOTIFYURL
http://odfnotify.services.openoffice.org/OOo3.0/notification.jsp?version=ODF
ADD_INCLUDE_FILES
cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt,version.lst
EVAL
- FILEFORMATNAME OpenOffice.org
+ FILEFORMATNAME Apache OpenOffice
FILEFORMATVERSION 1.0
WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
PACKAGEVERSION 3.4.0
@@ -234,7 +234,7 @@ OpenOffice_Dev
STARTCENTER_INFO_URL http://www.openoffice.org
STARTCENTER_TEMPLREP_URL
http://templates.services.openoffice.org
STARTCENTER_LAYOUT_STYLE 0
- REGISTRATION_PRODUCT OpenOffice.org
+ REGISTRATION_PRODUCT Apache OpenOffice
REGISTRATION_CID 926117
DICT_REPO_URL
http://extensions.services.openoffice.org/dictionaries
}
@@ -292,10 +292,10 @@ OpenOffice_SDK
{
Settings
{
- downloadname OOo-SDK_{packageversion}_{os}_install_{languages}
+ downloadname AOO-SDK_{packageversion}_{os}_install_{languages}
variables
{
- PRODUCTNAME OpenOffice.org
+ PRODUCTNAME Apache OpenOffice
PRODUCTVERSION 3.4
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
@@ -308,7 +308,7 @@ OpenOffice_SDK
PACK_INSTALLED 1
POOLPRODUCT 0
DMG_VOLUMEEXTENSION SDK
- DATABASENAME openofficeorg33sdk
+ DATABASENAME openofficeorg34sdk
NO_README_IN_ROOTDIR 1
LICENSENAME ALv2
IGNOREDIRECTORYLAYER 1
@@ -338,30 +338,30 @@ OpenOffice_Dev_SDK
{
Settings
{
- downloadname OOo-Dev-SDK_{packageversion}_{os}_install_{languages}
+ downloadname AOO-Dev-SDK_{packageversion}_{os}_install_{languages}
variables
{
- PRODUCTNAME OOo-dev
+ PRODUCTNAME AOO-dev
PRODUCTVERSION 3.4
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
SHORT_PRODUCTEXTENSION
- BASISROOTNAME OOo-dev
- UNIXBASISROOTNAME ooo-dev
+ BASISROOTNAME AOO-dev
+ UNIXBASISROOTNAME aoo-dev
POSTVERSIONEXTENSION SDK
POSTVERSIONEXTENSIONUNIX sdk
BRANDPACKAGEVERSION 3
PACKAGEVERSION 3.4.0
PACKAGEREVISION {milestone}
- BASISPACKAGEPREFIX ooobasis-dev
- UREPACKAGEPREFIX ooodev
- SOLSUREPACKAGEPREFIX ooodev
+ BASISPACKAGEPREFIX aoobasis-dev
+ UREPACKAGEPREFIX aoodev
+ SOLSUREPACKAGEPREFIX aoodev
REGISTRYLAYERNAME LayerDev
DEVELOPMENTPRODUCT 1
PACK_INSTALLED 1
POOLPRODUCT 0
DMG_VOLUMEEXTENSION SDK
- DATABASENAME openofficeorg33devsdk
+ DATABASENAME openofficeorg34devsdk
NO_README_IN_ROOTDIR 1
LICENSENAME ALv2
IGNOREDIRECTORYLAYER 1
Modified:
incubator/ooo/branches/alg/install/main/scp2/source/ooo/folderitem_ooo.ulf
URL:
http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/scp2/source/ooo/folderitem_ooo.ulf?rev=1244534&r1=1244533&r2=1244534&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/scp2/source/ooo/folderitem_ooo.ulf
(original)
+++ incubator/ooo/branches/alg/install/main/scp2/source/ooo/folderitem_ooo.ulf
Wed Feb 15 15:27:52 2012
@@ -28,4 +28,4 @@ en-US = "From Template"
en-US = "Open Document"
[STR_FI_TOOLTIP_SOFFICE]
-en-US = "The office productivity suite compatible to the open and standardized
ODF document format. Supported by Apache."
+en-US = "The office productivity suite compatible to the open and standardized
ODF document format. Supported by The Apache Software Foundation."
Modified: incubator/ooo/branches/alg/install/main/solenv/inc/shlinfo.rc
URL:
http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/solenv/inc/shlinfo.rc?rev=1244534&r1=1244533&r2=1244534&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/solenv/inc/shlinfo.rc (original)
+++ incubator/ooo/branches/alg/install/main/solenv/inc/shlinfo.rc Wed Feb 15
15:27:52 2012
@@ -71,7 +71,7 @@ VS_VERSION_INFO versioninfo
block "040704E4"
{
// German StringTable
- value "CompanyName",
"OpenOffice.org\0"
+ value "CompanyName", "Apache
Software Foundation\0"
value "FileVersion", PPS(VER_LEVEL)
"\0"
value "OriginalFilename", PPS(ORG_NAME)
"\0"
value "InternalName",
PPS(INTERNAL_NAME) "\0"
@@ -84,7 +84,7 @@ VS_VERSION_INFO versioninfo
block "040904E4"
{
// International StringTable
- value "CompanyName",
"OpenOffice.org\0"
+ value "CompanyName", "Apache
Software Foundation\0"
value "FileVersion", PPS(VER_LEVEL)
"\0"
value "OriginalFilename", PPS(ORG_NAME)
"\0"
value "InternalName",
PPS(INTERNAL_NAME) "\0"
