You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ms...@apache.org on 2021/11/16 15:39:33 UTC

[openoffice] branch trunk updated: Make update messages more clear

This is an automated email from the ASF dual-hosted git repository.

mseidel pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/openoffice.git


The following commit(s) were added to refs/heads/trunk by this push:
     new 2ac5523  Make update messages more clear
2ac5523 is described below

commit 2ac55239748df8d7a79065ad252b0146caf17a4a
Author: mseidel <ms...@apache.org>
AuthorDate: Tue Nov 16 16:36:52 2021 +0100

    Make update messages more clear
    
    (cherry picked from commit 39168fe790debd1054eac47ea2e3da0d4d9e5c3c)
---
 .../inc_openoffice/windows/msi_languages/CustomAc.ulf  | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/main/instsetoo_native/inc_openoffice/windows/msi_languages/CustomAc.ulf b/main/instsetoo_native/inc_openoffice/windows/msi_languages/CustomAc.ulf
index 70b3510..f23878c 100644
--- a/main/instsetoo_native/inc_openoffice/windows/msi_languages/CustomAc.ulf
+++ b/main/instsetoo_native/inc_openoffice/windows/msi_languages/CustomAc.ulf
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,26 +7,28 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
+
+
 [OOO_CUSTOMACTION_1]
-en-US  = "A newer version of [ProductName] was found. To install an older version, the newer version needs to be removed first."
+en-US = "A newer version of [DEFINEDPRODUCT] was found. To install an older version, the newer version needs to be removed first."
 
 [OOO_CUSTOMACTION_2]
-en-US  = "The same version of this product is already installed."
+en-US = "The same version of [DEFINEDPRODUCT] is already installed."
 
 [OOO_CUSTOMACTION_3]
-en-US = "An older version of [ProductName] was found. To install a newer version, the older version needs to be removed first."
+en-US = "An older version of [DEFINEDPRODUCT] was found. To install a newer version, the older version needs to be removed first."
 
 [OOO_CUSTOMACTION_4]
-en-US = "Please exit [DEFINEDPRODUCT] [DEFINEDVERSION] and the [DEFINEDPRODUCT] [DEFINEDVERSION] Quickstarter before you continue. If you are using a multi-user system, also make sure that no other user has [DEFINEDPRODUCT] [DEFINEDVERSION] open."
+en-US = "Please exit [DEFINEDPRODUCT] and the [DEFINEDPRODUCT] Quickstarter before you continue. If you are using a multi-user system, also make sure that no other user has [DEFINEDPRODUCT] open."