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 5134fcc0c5 Clean up resource files
5134fcc0c5 is described below
commit 5134fcc0c5c5af97352199b7423162435fbc0f44
Author: mseidel <msei...@apache.org>
AuthorDate: Fri Jan 5 23:43:26 2024 +0100
Clean up resource files
---
.../inc_openoffice/windows/msi_languages/Error.ulf | 20 ++-
main/svtools/source/dialogs/formats.src | 137 ++++++++++-----------
2 files changed, 77 insertions(+), 80 deletions(-)
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 3d37e68dd1..ec20c37b0b 100644
--- a/main/instsetoo_native/inc_openoffice/windows/msi_languages/Error.ulf
+++ b/main/instsetoo_native/inc_openoffice/windows/msi_languages/Error.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_ERROR_1]
@@ -92,7 +92,7 @@ en-US = "{[ProductName] }Setup completed successfully."
en-US = "{[ProductName] }Setup failed."
[OOO_ERROR_25]
-en-US = "Error reading from file: [2]. {{ System error [3].}} Verify that the
file exists and that you can access it."
+en-US = "Error reading from file: [2]. {{ System error [3].}} Verify that the
file exists and that you can access it."
[OOO_ERROR_26]
en-US = "Cannot create the file [3]. A directory with this name already
exists. Cancel the installation and try installing to a different location."
@@ -101,7 +101,7 @@ en-US = "Cannot create the file [3]. A directory with this
name already exists.
en-US = "Please insert the disk: [2]"
[OOO_ERROR_28]
-en-US = "The installer has insufficient privileges to access this directory:
[2]. The installation cannot continue. Log on as an administrator or contact
your system administrator."
+en-US = "The installer has insufficient privileges to access this directory:
[2]. The installation cannot continue. Log on as an administrator or contact
your system administrator."
[OOO_ERROR_29]
en-US = "Error writing to file [2]. Verify that you have access to that
directory."
@@ -176,7 +176,7 @@ en-US = "Error getting file security: [3] GetLastError: [2]"
en-US = "Invalid Drive: [2]"
[OOO_ERROR_53]
-en-US = "Error applying patch to file [2]. It has probably been updated by
other means, and can no longer be modified by this patch. For more information
contact your patch vendor. {{System Error: [3]}}"
+en-US = "Error applying patch to file [2]. It has probably been updated by
other means, and can no longer be modified by this patch. For more information
contact your patch vendor. {{System Error: [3]}}"
[OOO_ERROR_54]
en-US = "Could not create key [2]. {{ System error [3].}} Verify that you have
sufficient access to that key, or contact your support personnel."
@@ -254,7 +254,7 @@ en-US = "The installer must restart your system before
configuration of [2] can
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?"
+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?"
[OOO_ERROR_80]
en-US = "A previous installation for this product is in progress. You must
undo the changes made by that installation to continue. Do you want to undo
those changes?"
@@ -284,7 +284,7 @@ en-US = "One or more of the files required to restore your
computer to its previ
en-US = "[2] cannot install one of its required products. Contact your
technical support group. {{System Error: [3].}}"
[OOO_ERROR_89]
-en-US = "The older version of [2] cannot be removed. Contact your technical
support group. {{System Error [3].}}"
+en-US = "The older version of [2] cannot be removed. Contact your technical
support group. {{System Error [3].}}"
[OOO_ERROR_90]
en-US = "The path [2] is not valid. Please specify a valid path."
@@ -408,5 +408,3 @@ en-US = "This setup requires Internet Information Server
4.0 or higher for confi
[OOO_ERROR_130]
en-US = "This setup requires Administrator privileges for configuring IIS
Virtual Roots."
-
-
diff --git a/main/svtools/source/dialogs/formats.src
b/main/svtools/source/dialogs/formats.src
index 3fbb00298e..08ad9be1c7 100644
--- a/main/svtools/source/dialogs/formats.src
+++ b/main/svtools/source/dialogs/formats.src
@@ -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.
- *
+ *
*************************************************************/
-
-
#include <svtools/sores.hxx>
String STR_FORMAT_STRING
@@ -29,11 +27,11 @@ String STR_FORMAT_STRING
};
String STR_FORMAT_BITMAP
{
- Text [ en-US ] = "Bitmap";
+ Text [ en-US ] = "Bitmap" ;
};
String STR_FORMAT_GDIMETAFILE
{
- Text [ en-US ] = "GDI metafile";
+ Text [ en-US ] = "GDI metafile" ;
};
String STR_FORMAT_RTF
{
@@ -41,155 +39,155 @@ String STR_FORMAT_RTF
};
String STR_FORMAT_ID_DRAWING
{
- Text [ en-US ] = "Drawing format";
+ Text [ en-US ] = "Drawing format" ;
};
String STR_FORMAT_ID_SVXB
{
- Text [ en-US ] = "SVXB (StarView bitmap/animation)";
+ Text [ en-US ] = "SVXB (StarView bitmap/animation)" ;
};
String STR_FORMAT_ID_INTERNALLINK_STATE
{
- Text [ en-US ] = "Status Info from Svx Internal Link";
+ Text [ en-US ] = "Status Info from Svx Internal Link" ;
};
String STR_FORMAT_ID_SOLK
{
- Text [ en-US ] = "SOLK (%PRODUCTNAME Link)";
+ Text [ en-US ] = "SOLK (%PRODUCTNAME Link)" ;
};
String STR_FORMAT_ID_NETSCAPE_BOOKMARK
{
- Text [ en-US ] = "Netscape Bookmark";
+ Text [ en-US ] = "Netscape Bookmark" ;
};
String STR_FORMAT_ID_STARSERVER
{
- Text [ en-US ] = "Star server format";
+ Text [ en-US ] = "Star server format" ;
};
String STR_FORMAT_ID_STAROBJECT
{
- Text [ en-US ] = "Star object format";
+ Text [ en-US ] = "Star object format" ;
};
String STR_FORMAT_ID_APPLETOBJECT
{
- Text [ en-US ] = "Applet object";
+ Text [ en-US ] = "Applet object" ;
};
String STR_FORMAT_ID_PLUGIN_OBJECT
{
- Text [ en-US ] = "Plug-in object";
+ Text [ en-US ] = "Plug-in object" ;
};
String STR_FORMAT_ID_STARWRITER_30
{
- Text [ en-US ] = "StarWriter 3.0 object";
+ Text [ en-US ] = "StarWriter 3.0 object" ;
};
String STR_FORMAT_ID_STARWRITER_40
{
- Text [ en-US ] = "StarWriter 4.0 object";
+ Text [ en-US ] = "StarWriter 4.0 object" ;
};
String STR_FORMAT_ID_STARWRITER_50
{
- Text [ en-US ] = "StarWriter 5.0 object";
+ Text [ en-US ] = "StarWriter 5.0 object" ;
};
String STR_FORMAT_ID_STARWRITERWEB_40
{
- Text [ en-US ] = "StarWriter/Web 4.0 object";
+ Text [ en-US ] = "StarWriter/Web 4.0 object" ;
};
String STR_FORMAT_ID_STARWRITERWEB_50
{
- Text [ en-US ] = "StarWriter/Web 5.0 object";
+ Text [ en-US ] = "StarWriter/Web 5.0 object" ;
};
String STR_FORMAT_ID_STARWRITERGLOB_40
{
- Text [ en-US ] = "StarWriter/Master 4.0 object";
+ Text [ en-US ] = "StarWriter/Master 4.0 object" ;
};
String STR_FORMAT_ID_STARWRITERGLOB_50
{
- Text [ en-US ] = "StarWriter/Master 5.0 object";
+ Text [ en-US ] = "StarWriter/Master 5.0 object" ;
};
String STR_FORMAT_ID_STARDRAW
{
- Text [ en-US ] = "StarDraw object";
+ Text [ en-US ] = "StarDraw object" ;
};
String STR_FORMAT_ID_STARDRAW_40
{
- Text [ en-US ] = "StarDraw 4.0 object";
+ Text [ en-US ] = "StarDraw 4.0 object" ;
};
String STR_FORMAT_ID_STARIMPRESS_50
{
- Text [ en-US ] = "StarImpress 5.0 object";
+ Text [ en-US ] = "StarImpress 5.0 object" ;
};
String STR_FORMAT_ID_STARDRAW_50
{
- Text [ en-US ] = "StarDraw 5.0 object";
+ Text [ en-US ] = "StarDraw 5.0 object" ;
};
String STR_FORMAT_ID_STARCALC
{
- Text [ en-US ] = "StarCalc object";
+ Text [ en-US ] = "StarCalc object" ;
};
String STR_FORMAT_ID_STARCALC_40
{
- Text [ en-US ] = "StarCalc 4.0 object";
+ Text [ en-US ] = "StarCalc 4.0 object" ;
};
String STR_FORMAT_ID_STARCALC_50
{
- Text [ en-US ] = "StarCalc 5.0 object";
+ Text [ en-US ] = "StarCalc 5.0 object" ;
};
String STR_FORMAT_ID_STARCHART
{
- Text [ en-US ] = "StarChart object";
+ Text [ en-US ] = "StarChart object" ;
};
String STR_FORMAT_ID_STARCHART_40
{
- Text [ en-US ] = "StarChart 4.0 object";
+ Text [ en-US ] = "StarChart 4.0 object" ;
};
String STR_FORMAT_ID_STARCHART_50
{
- Text [ en-US ] = "StarChart 5.0 object";
+ Text [ en-US ] = "StarChart 5.0 object" ;
};
String STR_FORMAT_ID_STARIMAGE
{
- Text [ en-US ] = "StarImage object";
+ Text [ en-US ] = "StarImage object" ;
};
String STR_FORMAT_ID_STARIMAGE_40
{
- Text [ en-US ] = "StarImage 4.0 object";
+ Text [ en-US ] = "StarImage 4.0 object" ;
};
String STR_FORMAT_ID_STARIMAGE_50
{
- Text [ en-US ] = "StarImage 5.0 object";
+ Text [ en-US ] = "StarImage 5.0 object" ;
};
String STR_FORMAT_ID_STARMATH
{
- Text [ en-US ] = "StarMath object";
+ Text [ en-US ] = "StarMath object" ;
};
String STR_FORMAT_ID_STARMATH_40
{
- Text [ en-US ] = "StarMath 4.0 object";
+ Text [ en-US ] = "StarMath 4.0 object" ;
};
String STR_FORMAT_ID_STARMATH_50
{
- Text [ en-US ] = "StarMath 5.0 object";
+ Text [ en-US ] = "StarMath 5.0 object" ;
};
String STR_FORMAT_ID_STAROBJECT_PAINTDOC
{
- Text [ en-US ] = "StarObject Paint object";
+ Text [ en-US ] = "StarObject Paint object" ;
};
String STR_FORMAT_ID_HTML
{
- Text [ en-US ] = "HTML (HyperText Markup Language)";
+ Text [ en-US ] = "HTML (HyperText Markup Language)" ;
};
String STR_FORMAT_ID_HTML_SIMPLE
{
- Text [ en-US ] = "HTML format";
+ Text [ en-US ] = "HTML format" ;
};
String STR_FORMAT_ID_BIFF_5
{
- Text [ en-US ] = "Biff5 (Microsoft Excel 5.0/95)";
+ Text [ en-US ] = "Biff5 (Microsoft Excel 5.0/95)" ;
};
String STR_FORMAT_ID_BIFF_8
{
- Text [ en-US ] = "Biff8 (Microsoft Excel 97/2000/XP)";
+ Text [ en-US ] = "Biff8 (Microsoft Excel 97/2000/XP)" ;
};
String STR_FORMAT_ID_SYLK
{
- Text [ en-US ] = "Sylk";
+ Text [ en-US ] = "Sylk" ;
};
String STR_FORMAT_ID_LINK
{
@@ -197,94 +195,95 @@ String STR_FORMAT_ID_LINK
};
String STR_FORMAT_ID_DIF
{
- Text [ en-US ] = "DIF";
+ Text [ en-US ] = "DIF" ;
};
String STR_FORMAT_ID_MSWORD_DOC
{
- Text [ en-US ] = "Microsoft Word object";
+ Text [ en-US ] = "Microsoft Word object" ;
};
String STR_FORMAT_ID_STAR_FRAMESET_DOC
{
- Text [ en-US ] = "StarFrameSet object";
+ Text [ en-US ] = "StarFrameSet object" ;
};
String STR_FORMAT_ID_OFFICE_DOC
{
- Text [ en-US ] = "Office document object";
+ Text [ en-US ] = "Office document object" ;
};
String STR_FORMAT_ID_NOTES_DOCINFO
{
- Text [ en-US ] = "Notes document info";
+ Text [ en-US ] = "Notes document info" ;
};
String STR_FORMAT_ID_SFX_DOC
{
- Text [ en-US ] = "Sfx document";
+ Text [ en-US ] = "Sfx document" ;
};
String STR_FORMAT_ID_STARCHARTDOCUMENT_50
{
- Text [ en-US ] = "StarChart 5.0 object";
+ Text [ en-US ] = "StarChart 5.0 object" ;
};
String STR_FORMAT_ID_GRAPHOBJ
{
- Text [ en-US ] = "Graphic object";
+ Text [ en-US ] = "Graphic object" ;
};
String STR_FORMAT_ID_STARWRITER_60
{
- Text [ en-US ] = "%PRODUCTXMLFILEFORMATNAME %PRODUCTXMLFILEFORMATVERSION
Writer object";
+ Text [ en-US ] = "%PRODUCTXMLFILEFORMATNAME
%PRODUCTXMLFILEFORMATVERSION Writer object" ;
};
String STR_FORMAT_ID_STARWRITERWEB_60
{
- Text [ en-US ] = "%PRODUCTXMLFILEFORMATNAME %PRODUCTXMLFILEFORMATVERSION
Writer/Web object";
+ Text [ en-US ] = "%PRODUCTXMLFILEFORMATNAME
%PRODUCTXMLFILEFORMATVERSION Writer/Web object" ;
};
String STR_FORMAT_ID_STARWRITERGLOB_60
{
- Text [ en-US ] = "%PRODUCTXMLFILEFORMATNAME %PRODUCTXMLFILEFORMATVERSION
Writer/Master object";
+ Text [ en-US ] = "%PRODUCTXMLFILEFORMATNAME
%PRODUCTXMLFILEFORMATVERSION Writer/Master object" ;
};
String STR_FORMAT_ID_STARDRAW_60
{
- Text [ en-US ] = "%PRODUCTXMLFILEFORMATNAME %PRODUCTXMLFILEFORMATVERSION
Draw object";
+ Text [ en-US ] = "%PRODUCTXMLFILEFORMATNAME
%PRODUCTXMLFILEFORMATVERSION Draw object" ;
};
String STR_FORMAT_ID_STARIMPRESS_60
{
- Text [ en-US ] = "%PRODUCTXMLFILEFORMATNAME %PRODUCTXMLFILEFORMATVERSION
Impress object";
+ Text [ en-US ] = "%PRODUCTXMLFILEFORMATNAME
%PRODUCTXMLFILEFORMATVERSION Impress object" ;
};
String STR_FORMAT_ID_STARCALC_60
{
- Text [ en-US ] = "%PRODUCTXMLFILEFORMATNAME %PRODUCTXMLFILEFORMATVERSION
Calc object";
+ Text [ en-US ] = "%PRODUCTXMLFILEFORMATNAME
%PRODUCTXMLFILEFORMATVERSION Calc object" ;
};
String STR_FORMAT_ID_STARCHART_60
{
- Text [ en-US ] = "%PRODUCTXMLFILEFORMATNAME %PRODUCTXMLFILEFORMATVERSION
Chart object";
+ Text [ en-US ] = "%PRODUCTXMLFILEFORMATNAME
%PRODUCTXMLFILEFORMATVERSION Chart object" ;
};
String STR_FORMAT_ID_STARMATH_60
{
- Text [ en-US ] = "%PRODUCTXMLFILEFORMATNAME %PRODUCTXMLFILEFORMATVERSION
Math object";
+ Text [ en-US ] = "%PRODUCTXMLFILEFORMATNAME
%PRODUCTXMLFILEFORMATVERSION Math object" ;
};
String STR_FORMAT_ID_WMF
{
- Text [ en-US ] = "Windows metafile";
+ Text [ en-US ] = "Windows metafile" ;
};
String STR_FORMAT_ID_DBACCESS_QUERY
{
- Text [ en-US ] = "Data source object";
+ Text [ en-US ] = "Data source object" ;
};
String STR_FORMAT_ID_DBACCESS_TABLE
{
- Text [ en-US ] = "Data source table";
+ Text [ en-US ] = "Data source table" ;
};
String STR_FORMAT_ID_DBACCESS_COMMAND
{
- Text [ en-US ] = "SQL query";
+ Text [ en-US ] = "SQL query" ;
};
String STR_FORMAT_ID_DIALOG_60
{
- Text [ en-US ] = "%PRODUCTXMLFILEFORMATNAME %PRODUCTXMLFILEFORMATVERSION
dialog";
+ Text [ en-US ] = "%PRODUCTXMLFILEFORMATNAME
%PRODUCTXMLFILEFORMATVERSION dialog" ;
};
String STR_FORMAT_ID_FILEGRPDESCRIPTOR
{
- Text [ en-US ] = "Link";
+ Text [ en-US ] = "Link" ;
};
String STR_FORMAT_ID_HTML_NO_COMMENT
{
- Text [ en-US ] = "HTML format without comments";
+ Text [ en-US ] = "HTML format without comments" ;
};
+// ********************************************************************** EOF
