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 fc5f4b32ec Single qoutes don't need to be escaped her. But we need to check how the strings get exported to en-US.sdf. fc5f4b32ec is described below commit fc5f4b32ec06d28501d9991091fd1697a0dd33eb Author: mseidel <msei...@apache.org> AuthorDate: Tue Jan 9 15:44:33 2024 +0100 Single qoutes don't need to be escaped her. But we need to check how the strings get exported to en-US.sdf. --- .../windows/msi_languages/Control.ulf | 50 +++++++++++----------- .../inc_openoffice/windows/msi_languages/Error.ulf | 16 +++---- 2 files changed, 33 insertions(+), 33 deletions(-) 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 ca6fe899c5..6a1f959824 100644 --- a/main/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf +++ b/main/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf @@ -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" 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 1342c2d083..18f335626d 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."