instsetoo_native/inc_openoffice/windows/msi_languages/LaunchCo.ulf | 2 -- instsetoo_native/inc_openoffice/windows/msi_languages/Property.ulf | 6 +++--- instsetoo_native/inc_openoffice/windows/msi_languages/SIS.ulf | 8 +------- instsetoo_native/inc_openoffice/windows/msi_templates/LaunchCo.idt | 1 - solenv/bin/modules/installer/windows/property.pm | 3 --- 5 files changed, 4 insertions(+), 16 deletions(-)
New commits: commit 3d5c23f1cfeec3a9bc2f683e460e21afef728a6a Author: Andras Timar <ati...@suse.com> Date: Mon May 21 16:25:49 2012 +0200 MSI: remove always true LaunchCondition Change-Id: Ia2b63502dbd8b5e4e0ca7faa34e06df73f094a78 diff --git a/instsetoo_native/inc_openoffice/windows/msi_languages/LaunchCo.ulf b/instsetoo_native/inc_openoffice/windows/msi_languages/LaunchCo.ulf index 20f2a60..e3f6f7f 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_languages/LaunchCo.ulf +++ b/instsetoo_native/inc_openoffice/windows/msi_languages/LaunchCo.ulf @@ -1,4 +1,2 @@ [OOO_LAUNCH_1] en-US = "The Installation Wizard cannot be run properly because you are logged in as a user without sufficient administrator rights for this system." -[OOO_LAUNCH_2] -en-US = "Please use the file setup.exe to start the installation." diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/LaunchCo.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/LaunchCo.idt index 7c8ee15..35d7869 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_templates/LaunchCo.idt +++ b/instsetoo_native/inc_openoffice/windows/msi_templates/LaunchCo.idt @@ -2,4 +2,3 @@ Condition Description s255 l255 WINDOWSENCODINGTEMPLATE LaunchCondition Condition Privileged OOO_LAUNCH_1 -(VersionNT < 900) or (SETUP_USED=1) or Installed OOO_LAUNCH_2 diff --git a/solenv/bin/modules/installer/windows/property.pm b/solenv/bin/modules/installer/windows/property.pm index 934802d..32195e1 100644 --- a/solenv/bin/modules/installer/windows/property.pm +++ b/solenv/bin/modules/installer/windows/property.pm @@ -333,9 +333,6 @@ sub set_important_properties { my $onepropertyline = "ISPATCH" . "\t" . "1" . "\n"; push(@{$propertyfile}, $onepropertyline); - - $onepropertyline = "SETUP_USED" . "\t" . "0" . "\n"; - push(@{$propertyfile}, $onepropertyline); } if ( $installer::globals::languagepack ) commit c5766287c119f9af704538bf1f861b3f2b6c0863 Author: Andras Timar <ati...@suse.com> Date: Mon May 21 16:09:56 2012 +0200 strings for MSI Summary Info Change-Id: Iae8eb4a1a7f3a0d429ac47f64a77dcd4404d14d1 diff --git a/instsetoo_native/inc_openoffice/windows/msi_languages/SIS.ulf b/instsetoo_native/inc_openoffice/windows/msi_languages/SIS.ulf index 6429037..3376c3d 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_languages/SIS.ulf +++ b/instsetoo_native/inc_openoffice/windows/msi_languages/SIS.ulf @@ -1,14 +1,8 @@ [OOO_SIS_TITLE] en-US = "Installation database" -[OOO_SIS_AUTHOR] -en-US = "Author" - -[OOO_SIS_SUBJECT] -en-US = "Subject" - [OOO_SIS_COMMENT] -en-US = "Comment" +en-US = "This installer database contains the logic and data required to install LibreOffice." [OOO_SIS_KEYWORDS] en-US = "Install,MSI" commit 911d5488c58bb513fe9242097a388faa950ab702 Author: Andras Timar <ati...@suse.com> Date: Mon May 21 16:00:53 2012 +0200 MSI: ARP strings for Summary Info Change-Id: If47645a381a8da9851ba1bc19431f6341151906f diff --git a/instsetoo_native/inc_openoffice/windows/msi_languages/Property.ulf b/instsetoo_native/inc_openoffice/windows/msi_languages/Property.ulf index 81ae531..b1bc76c 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_languages/Property.ulf +++ b/instsetoo_native/inc_openoffice/windows/msi_languages/Property.ulf @@ -1,8 +1,8 @@ [OOO_ARPCONTACTTEMPLATE] -en-US = "Department for technical support" +en-US = "LibreOffice Community" [OOO_ARPHELPLINKTEMPLATE] -en-US = "http://www.documentfoundation.org" +en-US = "http://www.libreoffice.org/get-help" [OOO_ARPHELPTELEPHONETEMPLATE] en-US = "x-xxx-xxx-xxx" @@ -11,7 +11,7 @@ en-US = "x-xxx-xxx-xxx" en-US = "http://www.documentfoundation.org" [OOO_ARPURLUPDATEINFOTEMPLATE] -en-US = "http://www.documentfoundation.org" +en-US = "http://www.libreoffice.org/download" [OOO_STR_NEW_DISPLAY_NAME] en-US = "~New" _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits