summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndras Timar <atimar@suse.com>2011-09-06 13:16:48 +0200
committerAndras Timar <atimar@suse.com>2011-09-07 10:53:41 +0200
commit5683be1c89d358955b34c54c16d3bd6ca06126e1 (patch)
tree69498924a90daedf373dd82514a1e1eec0ef5bf1
parent2f375ff51cba6d7f70a433bb254f34c8bb5a6bec (diff)
enable to replace the vendor name in Windows installer, bnc#571489
-rw-r--r--instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf2
-rw-r--r--solenv/bin/modules/installer/windows/msp.pm2
2 files changed, 2 insertions, 2 deletions
diff --git a/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf b/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
index aad2b7ee3db0..7b8b940f047e 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
+++ b/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
@@ -284,7 +284,7 @@ en-US = "< &Back"
en-US = "Cancel"
[OOO_CONTROL_124]
-en-US = "Build contributed in collaboration with the community by The Document Foundation. For credits, see: http://www.documentfoundation.org"
+en-US = "Build contributed in collaboration with the community by [Manufacturer]. For credits, see: http://www.documentfoundation.org"
[OOO_CONTROL_125]
en-US = "&Next >"
diff --git a/solenv/bin/modules/installer/windows/msp.pm b/solenv/bin/modules/installer/windows/msp.pm
index c62e9923d5fb..be9ed624e0e9 100644
--- a/solenv/bin/modules/installer/windows/msp.pm
+++ b/solenv/bin/modules/installer/windows/msp.pm
@@ -886,7 +886,7 @@ sub change_patchmetadata_table
if ( $allvariables->{'PROPERTYTABLEPRODUCTNAME'} ) { $targetproductnamevalue = $allvariables->{'PROPERTYTABLEPRODUCTNAME'}; }
my $manufacturerstring = "ManufacturerName";
- my $manufacturervalue = "LibreOffice";
+ my $manufacturervalue = $ENV{'OOO_VENDOR'};
if ( $installer::globals::longmanufacturer ) { $manufacturervalue = $installer::globals::longmanufacturer; }
my $displaynamestring = "DisplayName";