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 2024/01/09 13:39:03 UTC

(openoffice) branch AOO42X updated: Clarify Windows Installer texts

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

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


The following commit(s) were added to refs/heads/AOO42X by this push:
     new f21944e9e4 Clarify Windows Installer texts
f21944e9e4 is described below

commit f21944e9e4d8b96628972b9ee97e69dd31c07dff
Author: mseidel <ms...@apache.org>
AuthorDate: Tue Jan 9 14:26:16 2024 +0100

    Clarify Windows Installer texts
    
    (cherry picked from commit 0f58d4df4ee34d7e3a257f302abbfb334b456e56)
---
 .../windows/msi_languages/ActionTe.ulf             | 24 ++++-----
 .../windows/msi_languages/Control.ulf              | 59 +++++++++++-----------
 .../windows/msi_languages/CustomAc.ulf             |  2 -
 .../inc_openoffice/windows/msi_languages/Error.ulf | 16 +++---
 .../windows/msi_languages/LaunchCo.ulf             |  8 +--
 .../windows/msi_languages/RadioBut.ulf             |  9 ++--
 .../inc_openoffice/windows/msi_languages/SIS.ulf   |  9 ++--
 .../windows/msi_languages/UIText.ulf               | 10 ++--
 .../windows/msi_languages/makefile.mk              | 32 ++++++------
 9 files changed, 80 insertions(+), 89 deletions(-)

diff --git a/main/instsetoo_native/inc_openoffice/windows/msi_languages/ActionTe.ulf b/main/instsetoo_native/inc_openoffice/windows/msi_languages/ActionTe.ulf
index a5f8184469..7b038383c1 100644
--- a/main/instsetoo_native/inc_openoffice/windows/msi_languages/ActionTe.ulf
+++ b/main/instsetoo_native/inc_openoffice/windows/msi_languages/ActionTe.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,16 +7,16 @@
  * 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_ACTIONTEXT_1]
@@ -77,7 +77,7 @@ en-US = "Service: [1]"
 en-US = "Creating duplicate files"
 
 [OOO_ACTIONTEXT_20]
-en-US = "File: [1],  Directory: [9],  Size: [6]"
+en-US = "File: [1], Directory: [9], Size: [6]"
 
 [OOO_ACTIONTEXT_21]
 en-US = "Computing space requirements"
@@ -104,7 +104,7 @@ en-US = "File: [1], Directory: [9], Size: [6]"
 en-US = "Copying new files"
 
 [OOO_ACTIONTEXT_29]
-en-US = "File: [1],  Directory: [9],  Size: [6]"
+en-US = "File: [1], Directory: [9], Size: [6]"
 
 [OOO_ACTIONTEXT_30]
 en-US = "Installing ODBC components"
@@ -119,7 +119,7 @@ en-US = "Service: [2]"
 en-US = "Installing system catalog"
 
 [OOO_ACTIONTEXT_34]
-en-US = "File: [1],  Dependencies: [2]"
+en-US = "File: [1], Dependencies: [2]"
 
 [OOO_ACTIONTEXT_35]
 en-US = "Validating install"
@@ -137,13 +137,13 @@ en-US = "Application: [1]"
 en-US = "Moving files"
 
 [OOO_ACTIONTEXT_40]
-en-US = "File: [1],  Directory: [9],  Size: [6]"
+en-US = "File: [1], Directory: [9], Size: [6]"
 
 [OOO_ACTIONTEXT_41]
 en-US = "Patching files"
 
 [OOO_ACTIONTEXT_42]
-en-US = "File: [1],  Directory: [2],  Size: [3]"
+en-US = "File: [1], Directory: [2], Size: [3]"
 
 [OOO_ACTIONTEXT_43]
 en-US = "Updating component registration"
@@ -251,7 +251,7 @@ en-US = "Folder: [1]"
 en-US = "Removing INI file entries"
 
 [OOO_ACTIONTEXT_78]
-en-US = "File: [1],  Section: [2],  Key: [3], Value: [4]"
+en-US = "File: [1], Section: [2], Key: [3], Value: [4]"
 
 [OOO_ACTIONTEXT_79]
 en-US = "Removing ODBC components"
@@ -383,12 +383,10 @@ en-US = "Name: [1], Value: [2], Action [3]"
 en-US = "Writing INI file values"
 
 [OOO_ACTIONTEXT_122]
-en-US = "File: [1],  Section: [2],  Key: [3], Value: [4]"
+en-US = "File: [1], Section: [2], Key: [3], Value: [4]"
 
 [OOO_ACTIONTEXT_123]
 en-US = "Writing system registry values"
 
 [OOO_ACTIONTEXT_124]
 en-US = "Key: [1], Name: [2], Value: [3]"
-
-
diff --git a/main/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf b/main/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
index 201fd4b021..ca6fe899c5 100644
--- a/main/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
+++ b/main/instsetoo_native/inc_openoffice/windows/msi_languages/Control.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,16 +7,16 @@
  * 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_CONTROL_3]
@@ -56,7 +56,7 @@ en-US = "Cancel"
 en-US = "Specify a network location for the server image of the product."
 
 [OOO_CONTROL_20]
-en-US = "Enter the network location or click Change to browse to a location. Click Install to create a server image of [ProductName] at the specified network location or click Cancel to exit the wizard."
+en-US = "Enter the network location or click \'Change\' to browse to a location. Click \'Install\' to create a server image of [ProductName] at the specified network location or click \'Cancel\' to exit the wizard."
 
 [OOO_CONTROL_21]
 en-US = "{&MSSansBold8}Network Location"
@@ -80,7 +80,7 @@ en-US = "&Next >"
 en-US = "{&TahomaBold10}Welcome to the Installation Wizard for [ProductName]"
 
 [OOO_CONTROL_28]
-en-US = "The Installation Wizard will create a server image of [ProductName] at a specified network location. To continue, click Next."
+en-US = "The Installation Wizard will create a server image of [ProductName] at a specified network location. To continue, click \'Next\'."
 
 [OOO_CONTROL_29]
 en-US = "&No"
@@ -206,7 +206,7 @@ en-US = "Cancel"
 en-US = "&Change..."
 
 [OOO_CONTROL_79]
-en-US = "Click Next to install to this folder, or click Change to install to a different folder."
+en-US = "Click \'Next\' to install to this folder, or click \'Change\' to install to a different folder."
 
 [OOO_CONTROL_80]
 en-US = "{&MSSansBold8}Database Folder"
@@ -230,7 +230,7 @@ en-US = "Cancel"
 en-US = "&Change..."
 
 [OOO_CONTROL_89]
-en-US = "Click Next to install to this folder, or click Change to install to a different folder."
+en-US = "Click \'Next\' to install to this folder, or click \'Change\' to install to a different folder."
 
 [OOO_CONTROL_90]
 en-US = "{&MSSansBold8}Destination Folder"
@@ -260,7 +260,7 @@ en-US = "OK"
 en-US = "Some files that need to be updated are currently in use."
 
 [OOO_CONTROL_104]
-en-US = "The following applications are using files that need to be updated by this setup. Close these applications and click Retry to continue."
+en-US = "The following applications are using files that need to be updated by this setup. Close these applications and click \'Retry\' to continue."
 
 [OOO_CONTROL_105]
 en-US = "{&MSSansBold8}Files in Use"
@@ -314,7 +314,7 @@ en-US = "&Next >"
 en-US = "{&TahomaBold10}Welcome to the Installation Wizard for [ProductName]"
 
 [OOO_CONTROL_127]
-en-US = "The Installation Wizard will install [ProductName] on your computer. To continue, click Next."
+en-US = "The Installation Wizard will install [ProductName] on your computer. To continue, click \'Next\'."
 
 [OOO_CONTROL_128]
 en-US = "< &Back"
@@ -368,7 +368,7 @@ en-US = "&Next >"
 en-US = "{&TahomaBold10}Welcome to the Installation Wizard for [ProductName]"
 
 [OOO_CONTROL_150]
-en-US = "The Installation Wizard will allow you to modify, repair, or remove [ProductName]. To continue, click Next."
+en-US = "The Installation Wizard will allow you to modify, repair, or remove [ProductName]. To continue, click \'Next\'."
 
 [OOO_CONTROL_153]
 en-US = "Disk space required for the installation exceeds available disk space."
@@ -398,7 +398,7 @@ en-US = "&Update >"
 en-US = "{&TahomaBold10}Welcome to the Patch for [ProductName]"
 
 [OOO_CONTROL_162]
-en-US = "The Installation Wizard will install the Patch for [ProductName] on your computer. To continue, click Update."
+en-US = "The Installation Wizard will install the Patch for [ProductName] on your computer. To continue, click \'Update\'."
 
 [OOO_CONTROL_163]
 en-US = "< &Back"
@@ -410,10 +410,10 @@ en-US = "Cancel"
 en-US = "The wizard is ready to begin installation."
 
 [OOO_CONTROL_168]
-en-US = "Click Install to begin the installation."
+en-US = "Click \'Install\' to begin the installation."
 
 [OOO_CONTROL_169]
-en-US = "If you want to review or change any of your installation settings, click Back. Click Cancel to exit the wizard."
+en-US = "If you want to review or change any of your installation settings, click \'Back\'. Click \'Cancel\' to exit the wizard."
 
 [OOO_CONTROL_170]
 en-US = "{&MSSansBold8}Ready to Modify the Program"
@@ -437,10 +437,10 @@ en-US = "Cancel"
 en-US = "You have chosen to remove the program from your system."
 
 [OOO_CONTROL_179]
-en-US = "Click Remove to remove [ProductName] from your computer. After removal, this program will no longer be available for use."
+en-US = "Click \'Remove\' to remove [ProductName] from your computer. After removal, this program will no longer be available for use."
 
 [OOO_CONTROL_180]
-en-US = "If you want to review or change any settings, click Back."
+en-US = "If you want to review or change any settings, click \'Back\'."
 
 [OOO_CONTROL_181]
 en-US = "{&MSSansBold8}Remove the Program"
@@ -461,13 +461,13 @@ en-US = "&Finish"
 en-US = "Your system has not been modified. To complete installation at another time, please run setup again."
 
 [OOO_CONTROL_187]
-en-US = "Click Finish to exit the wizard."
+en-US = "Click \'Finish\' to exit the wizard."
 
 [OOO_CONTROL_188]
 en-US = "You can either keep any existing installed elements on your system to continue this installation at a later time or you can restore your system to its original state prior to the installation."
 
 [OOO_CONTROL_189]
-en-US = "Click Restore or Continue Later to exit the wizard."
+en-US = "Click \'Restore\' or \'Continue Later\' to exit the wizard."
 
 [OOO_CONTROL_190]
 en-US = "{&TahomaBold10}Installation Wizard Completed"
@@ -497,10 +497,10 @@ en-US = "&Finish"
 en-US = "{&TahomaBold10}Installation Wizard Completed"
 
 [OOO_CONTROL_199]
-en-US = "The Installation Wizard has successfully installed [ProductName]. Click Finish to exit the wizard."
+en-US = "The Installation Wizard has successfully installed [ProductName]. Click \'Finish\' to exit the wizard."
 
 [OOO_CONTROL_200]
-en-US = "The Installation Wizard has successfully uninstalled [ProductName]. Click Finish to exit the wizard."
+en-US = "The Installation Wizard has successfully uninstalled [ProductName]. Click \'Finish\' to exit the wizard."
 
 [OOO_CONTROL_201]
 en-US = "Setup has finished installing [ProductName]."
@@ -563,13 +563,13 @@ en-US = "&Finish"
 en-US = "Your system has not been modified. To install this program at a later time, please run the installation again."
 
 [OOO_CONTROL_223]
-en-US = "Click Finish to exit the wizard."
+en-US = "Click \'Finish\' to exit the wizard."
 
 [OOO_CONTROL_224]
 en-US = "You can either keep any existing installed elements on your system to continue this installation at a later time or you can restore your system to its original state prior to the installation."
 
 [OOO_CONTROL_225]
-en-US = "Click Restore or Continue Later to exit the wizard."
+en-US = "Click \'Restore\' or \'Continue Later\' to exit the wizard."
 
 [OOO_CONTROL_226]
 en-US = "{&TahomaBold10}Installation Wizard Completed"
@@ -626,10 +626,10 @@ en-US = "Cancel"
 en-US = "&Next >"
 
 [OOO_CONTROL_248]
-en-US = "The Installation Wizard will complete the installation of [ProductName] on your computer. To continue, click Next."
+en-US = "The Installation Wizard will complete the installation of [ProductName] on your computer. To continue, click \'Next\'."
 
 [OOO_CONTROL_249]
-en-US = "The Installation Wizard will complete the suspended installation of [ProductName] on your computer. To continue, click Next."
+en-US = "The Installation Wizard will complete the suspended installation of [ProductName] on your computer. To continue, click \'Next\'."
 
 [OOO_CONTROL_250]
 en-US = "{&TahomaBold10}Resuming the Installation Wizard for [ProductName]"
@@ -719,13 +719,13 @@ en-US = "The version specified in the folder below cannot be updated."
 en-US = "Check the destination folder."
 
 [OOO_CONTROL_305]
-en-US = "To continue, click Next."
+en-US = "To continue, click \'Next\'."
 
 [OOO_CONTROL_306]
-en-US = "To select a different version, click Change. Otherwise click Cancel to abort the Installation Wizard."
+en-US = "To select a different version, click \'Change\'. Otherwise click \'Cancel\' to abort the Installation Wizard."
 
 [OOO_CONTROL_307]
-en-US = "To select a different folder, click Change."
+en-US = "To select a different folder, click \'Change\'."
 
 [OOO_CONTROL_308]
 en-US = "Install [ProductName] to:"
@@ -734,10 +734,10 @@ en-US = "Install [ProductName] to:"
 en-US = "If you are just trying out [ProductName], you probably don't want this to happen, so leave the boxes unchecked."
 
 [OOO_CONTROL_317]
-en-US = "No languages have been selected for installation. Click OK to select one or more languages for installation."
+en-US = "No languages have been selected for installation. Click \'OK\' to select one or more languages for installation."
 
 [OOO_CONTROL_318]
-en-US = "No applications have been selected for installation. Click OK to select one or more applications for installation."
+en-US = "No applications have been selected for installation. Click \'OK\' to select one or more applications for installation."
 
 [OOO_CONTROL_319]
 en-US = "Create shortcut on desktop"
@@ -753,4 +753,3 @@ en-US = "German"
 
 [OOO_CONTROL_LANG_1034]
 en-US = "Spanish"
-
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 f23878cd21..74f81dffea 100644
--- a/main/instsetoo_native/inc_openoffice/windows/msi_languages/CustomAc.ulf
+++ b/main/instsetoo_native/inc_openoffice/windows/msi_languages/CustomAc.ulf
@@ -19,8 +19,6 @@
  *
  *************************************************************/
 
-
-
 [OOO_CUSTOMACTION_1]
 en-US = "A newer version of [DEFINEDPRODUCT] was found. To install an older version, the newer version needs to be removed first."
 
diff --git a/main/instsetoo_native/inc_openoffice/windows/msi_languages/Error.ulf b/main/instsetoo_native/inc_openoffice/windows/msi_languages/Error.ulf
index ec20c37b0b..1342c2d083 100644
--- a/main/instsetoo_native/inc_openoffice/windows/msi_languages/Error.ulf
+++ b/main/instsetoo_native/inc_openoffice/windows/msi_languages/Error.ulf
@@ -110,10 +110,10 @@ en-US = "Error writing to file [2]. Verify that you have access to that director
 en-US = "Error reading from file [2]. Verify that the file exists and that you can access it."
 
 [OOO_ERROR_31]
-en-US = "Another application has exclusive access to the file [2]. Please shut down all other applications, then click Retry."
+en-US = "Another application has exclusive access to the file [2]. Please shut down all other applications, then click \'Retry\'."
 
 [OOO_ERROR_32]
-en-US = "There is not enough disk space to install the file [2]. Free some disk space and click Retry, or click Cancel to exit."
+en-US = "There is not enough disk space to install the file [2]. Free some disk space and click Retry, or click \'Cancel\' to exit."
 
 [OOO_ERROR_33]
 en-US = "Source file not found: [2]. Verify that the file exists and that you can access it."
@@ -128,7 +128,7 @@ en-US = "Error writing to file: [3]. {{ System error [2].}} Verify that you have
 en-US = "Source file not found {{(cabinet)}}: [2]. Verify that the file exists and that you can access it."
 
 [OOO_ERROR_37]
-en-US = "Cannot create the directory [2]. A file with this name already exists. Please rename or remove the file and click Retry, or click Cancel to exit."
+en-US = "Cannot create the directory [2]. A file with this name already exists. Please rename or remove the file and click Retry, or click \'Cancel\# to exit."
 
 [OOO_ERROR_38]
 en-US = "The volume [2] is currently unavailable. Please select another."
@@ -248,10 +248,10 @@ en-US = "Could not find any previously installed compliant products on the machi
 en-US = "The key [2] is not valid. Verify that you entered the correct key."
 
 [OOO_ERROR_77]
-en-US = "The installer must restart your system before configuration of [2] can continue. Click Yes to restart now or No if you plan to restart later."
+en-US = "The installer must restart your system before configuration of [2] can continue. Click \'Yes\' to restart now or \'No\' if you plan to restart later."
 
 [OOO_ERROR_78]
-en-US = "You must restart your system for the configuration changes made to [2] to take effect. Click Yes to restart now or No if you plan to restart later."
+en-US = "You must restart your system for the configuration changes made to [2] to take effect. Click \'Yes\' to restart now or \'No\' if you plan to restart later."
 
 [OOO_ERROR_79]
 en-US = "An installation for [2] is currently suspended. You must undo the changes made by that installation to continue. Do you want to undo those changes?"
@@ -275,7 +275,7 @@ en-US = "Product: [2] -- [3]"
 en-US = "You may either restore your computer to its previous state or continue the installation later. Would you like to restore?"
 
 [OOO_ERROR_86]
-en-US = "An error occurred while writing installation information to disk. Check to make sure enough disk space is available, and click Retry, or Cancel to end the installation."
+en-US = "An error occurred while writing installation information to disk. Check to make sure enough disk space is available, and click \'Retry\', or \'Cancel\' to end the installation."
 
 [OOO_ERROR_87]
 en-US = "One or more of the files required to restore your computer to its previous state could not be found. Restoration will not be possible."
@@ -293,10 +293,10 @@ en-US = "The path [2] is not valid. Please specify a valid path."
 en-US = "Out of memory. Shut down other applications before retrying."
 
 [OOO_ERROR_92]
-en-US = "There is no disk in drive [2]. Please insert one and click Retry, or click Cancel to go back to the previously selected volume."
+en-US = "There is no disk in drive [2]. Please insert one and click \'Retry\', or click \'Cancel\' to go back to the previously selected volume."
 
 [OOO_ERROR_93]
-en-US = "There is no disk in drive [2]. Please insert one and click Retry, or click Cancel to return to the browse dialog and select a different volume."
+en-US = "There is no disk in drive [2]. Please insert one and click \'Retry\', or click \'Cancel\' to return to the browse dialog and select a different volume."
 
 [OOO_ERROR_94]
 en-US = "The folder [2] does not exist. Please enter a path to an existing folder."
diff --git a/main/instsetoo_native/inc_openoffice/windows/msi_languages/LaunchCo.ulf b/main/instsetoo_native/inc_openoffice/windows/msi_languages/LaunchCo.ulf
index 0f69083aef..7f443b1949 100644
--- a/main/instsetoo_native/inc_openoffice/windows/msi_languages/LaunchCo.ulf
+++ b/main/instsetoo_native/inc_openoffice/windows/msi_languages/LaunchCo.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,16 +7,16 @@
  * 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_LAUNCH_1]
diff --git a/main/instsetoo_native/inc_openoffice/windows/msi_languages/RadioBut.ulf b/main/instsetoo_native/inc_openoffice/windows/msi_languages/RadioBut.ulf
index 5b622015aa..fc2cfcd3f2 100644
--- a/main/instsetoo_native/inc_openoffice/windows/msi_languages/RadioBut.ulf
+++ b/main/instsetoo_native/inc_openoffice/windows/msi_languages/RadioBut.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,16 +7,16 @@
  * 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_RADIOBUTTON_1]
@@ -45,4 +45,3 @@ en-US = "&Anyone who uses this computer (all users)"
 
 [OOO_RADIOBUTTON_9]
 en-US = "Only for &me ([USERNAME])"
-
diff --git a/main/instsetoo_native/inc_openoffice/windows/msi_languages/SIS.ulf b/main/instsetoo_native/inc_openoffice/windows/msi_languages/SIS.ulf
index 8a68f61bd0..e59c383d22 100644
--- a/main/instsetoo_native/inc_openoffice/windows/msi_languages/SIS.ulf
+++ b/main/instsetoo_native/inc_openoffice/windows/msi_languages/SIS.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,16 +7,16 @@
  * 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_SIS_TITLE]
@@ -36,4 +36,3 @@ en-US = "Install,MSI"
 
 [OOO_SIS_APPNAME]
 en-US = "Windows Installer"
-
diff --git a/main/instsetoo_native/inc_openoffice/windows/msi_languages/UIText.ulf b/main/instsetoo_native/inc_openoffice/windows/msi_languages/UIText.ulf
index 13b8352ac6..ec02f3b8c3 100644
--- a/main/instsetoo_native/inc_openoffice/windows/msi_languages/UIText.ulf
+++ b/main/instsetoo_native/inc_openoffice/windows/msi_languages/UIText.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,16 +7,16 @@
  * 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_UITEXT_1]
@@ -165,5 +165,3 @@ en-US = "Disk Size"
 
 [OOO_UITEXT_49]
 en-US = "Volume"
-
-
diff --git a/main/instsetoo_native/inc_openoffice/windows/msi_languages/makefile.mk b/main/instsetoo_native/inc_openoffice/windows/msi_languages/makefile.mk
index d6c398db62..128c8f715f 100644
--- a/main/instsetoo_native/inc_openoffice/windows/msi_languages/makefile.mk
+++ b/main/instsetoo_native/inc_openoffice/windows/msi_languages/makefile.mk
@@ -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,20 +7,18 @@
 #  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.
-#  
+#
 #**************************************************************
 
-
-
 PRJ=..$/..$/..
 
 PRJNAME=instsetoo_native
@@ -34,16 +32,16 @@ common_build:=
 # ------------------------------------------------------------------
 
 ULFFILES = \
-    ActionTe.ulf \
-    Control.ulf  \
-    CustomAc.ulf \
-    Error.ulf    \
-    LaunchCo.ulf \
-    Property.ulf \
-    RadioBut.ulf \
-    Nsis.ulf     \
-    SIS.ulf      \
-    UIText.ulf 
+	ActionTe.ulf \
+	Control.ulf  \
+	CustomAc.ulf \
+	Error.ulf    \
+	LaunchCo.ulf \
+	Property.ulf \
+	RadioBut.ulf \
+	Nsis.ulf     \
+	SIS.ulf      \
+	UIText.ulf 
     
 MLFFILES = $(foreach,i,$(ULFFILES) $(MISC)$/$(TARGET)$/$(i:b).mlf)
 UULFFILES = $(MISC)$/$(TARGET)$/Nsis.uulf
@@ -57,3 +55,5 @@ UULFFILES = $(MISC)$/$(TARGET)$/Nsis.uulf
 ALLTAR : $(MLFFILES) $(UULFFILES)
 
 .ENDIF
+
+# vim: set noet sw=4 ts=4: