summaryrefslogtreecommitdiff
path: root/instsetoo_native
diff options
context:
space:
mode:
Diffstat (limited to 'instsetoo_native')
-rw-r--r--instsetoo_native/inc_openoffice/windows/msi_languages/LaunchCo.ulf2
-rw-r--r--instsetoo_native/inc_openoffice/windows/msi_templates/LaunchCo.idt1
2 files changed, 0 insertions, 3 deletions
diff --git a/instsetoo_native/inc_openoffice/windows/msi_languages/LaunchCo.ulf b/instsetoo_native/inc_openoffice/windows/msi_languages/LaunchCo.ulf
index 20f2a60dd195..e3f6f7fa8f53 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 7c8ee157fb32..35d78694a664 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
f63cb662f02415d5cb0051011bdb5d0d523c'>WinUserInfoBe: a new config backend for user data provided by WindowsMike Kaganski This backend provides Active Directory details for current user. If the system is not part of Active Directory domain, GetUserNameEx is used instead, so at least user (given) name is configured. Unlike ldap backend, this one doesn't need connection configuration, as the used API works with current user security context. Change-Id: I74bcc79591a658dc5121df1f09caa15d272fbe12 Reviewed-on: https://gerrit.libreoffice.org/53590 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>