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 de412a1eed Cleanup resource files
de412a1eed is described below
commit de412a1eed43ca267e8a1aca5f5771653793f007
Author: mseidel <msei...@apache.org>
AuthorDate: Sun Jan 19 13:22:16 2025 +0100
Cleanup resource files
(cherry picked from commit 68ed45b89d3a9d9c3afc0e2eb2255e0e7582528e)
---
main/sw/source/ui/app/app.src | 86 ++++++++++----------
main/sw/source/ui/inc/app.hrc | 182 +++++++++++++++++++++---------------------
2 files changed, 133 insertions(+), 135 deletions(-)
diff --git a/main/sw/source/ui/app/app.src b/main/sw/source/ui/app/app.src
index ba8b168efe..1769f7ca2b 100644
--- a/main/sw/source/ui/app/app.src
+++ b/main/sw/source/ui/app/app.src
@@ -47,10 +47,10 @@ String STR_PAGE_COUNT_MACRO
Text [ en-US ] = "Changing the page count" ;
};
- // Image-Liste
----------------------------------------------------------------
- // Don't use this image list for normal toolbar images. We have now our
commandimagelist
- // folder in default_images. This list is now only used for special toolboxes
that are
- // used in floating windows.
+// Image-List -----------------------------------------------------------------
+// Don't use this image list for normal toolbar images. We have now our
commandimagelist
+// folder in default_images. This list is now only used for special toolboxes
that are
+// used in floating windows.
#define IMAGELIST_AND_COUNT \
IdList = { \
@@ -180,11 +180,11 @@ SfxStyleFamilies DLG_STYLE_DESIGNER
- // Default Bitmap for toolbox
-BITMAP BMP_FEHLT { FILE = "x.png" ; };
- // Bitmap fuer die NumerierungsVorlagen im Organizer
-Bitmap BMP_STYLES_FAMILY_NUM { File = "styfamnu.png" ; };
-Bitmap BMP_STYLES_FAMILY_NUM_HC { File = "styfamnu_h.png" ; };
+// Default Bitmap for toolbox
+BITMAP BMP_MISSING { FILE = "x.png" ; } ;
+// Bitmap für die Listenvorlagen im Organizer
+Bitmap BMP_STYLES_FAMILY_NUM { File = "styfamnu.png" ; } ;
+Bitmap BMP_STYLES_FAMILY_NUM_HC { File = "styfamnu_h.png" ; } ;
String STR_ENV_TITLE
{
@@ -196,7 +196,7 @@ String STR_LAB_TITLE
Text [ en-US ] = "Labels" ;
};
- // ShortName!!!
+// ShortName!!!
String STR_HUMAN_SWDOC_NAME
{
Text [ en-US ] = "Text" ;
@@ -223,7 +223,7 @@ String STR_DLLNOTFOUND
};
-String STR_UNBENANNT
+String STR_UNTITLED
{
Text [ en-US ] = "Untitled" ;
};
@@ -277,9 +277,9 @@ String STR_DOC_STAT
Text [ en-US ] = "Statistics" ;
};
- // ----------------------------
- // Statusleisten-Ueberschriften
- // ----------------------------
+// ----------------------------
+// Statusleisten-Überschriften
+// ----------------------------
String STR_STATSTR_W4WREAD
{
@@ -462,8 +462,8 @@ String STR_FDLG_TEMPLATE_BUTTON
String STR_FDLG_TEMPLATE_NAME
{
- //Text [ en-US ] = "Styles: " ; //#outline level,removed by zhaojianwei
- Text [ en-US ] = "separated by: " ; //<-end,add by zhaojianwei
+ //Text [ en-US ] = "Styles: " ; // #outline level,removed by zhaojianwei
+ Text [ en-US ] = "separated by: " ; // <-end,add by zhaojianwei
};
//#outline level,add by zhaojianwei
String STR_FDLG_OUTLINE_LEVEL
@@ -530,47 +530,47 @@ ModalDialog DLG_MERGE_SOURCE_UNAVAILABLE
FixedImage IMG_MERGE
{
- Pos = MAP_APPFONT ( 12, 14 ) ;
- Size = MAP_APPFONT ( 103, 32 ) ;
- };
- FixedText ST_MERGE_SOURCE_UNAVAILABLE
- {
- Pos = MAP_APPFONT ( 12, 6 ) ;
- Size = MAP_APPFONT ( 178, 40 ) ;
- WordBreak = TRUE ;
- Text [ en-US ] = "The data source \'%1\' was not found. Thus the
connection to the data source could not be established.\n\nPlease check the
connections settings." ;
- };
- OKButton PB_MERGE_OK
- {
- Pos = MAP_APPFONT ( 12, 52 ) ;
- Size = MAP_APPFONT ( 125, 14 ) ;
- Text [ en-US ] = "Check Connection Settings..." ;
- };
- CancelButton PB_MERGE_CANCEL
- {
- Pos = MAP_APPFONT ( 140, 52 ) ;
- Size = MAP_APPFONT ( 50, 14 ) ;
- };
+ Pos = MAP_APPFONT ( 12, 14 ) ;
+ Size = MAP_APPFONT ( 103, 32 ) ;
+ };
+ FixedText ST_MERGE_SOURCE_UNAVAILABLE
+ {
+ Pos = MAP_APPFONT ( 12, 6 ) ;
+ Size = MAP_APPFONT ( 178, 40 ) ;
+ WordBreak = TRUE ;
+ Text [ en-US ] = "The data source \'%1\' was not found. Thus
the connection to the data source could not be established.\n\nPlease check the
connections settings." ;
+ };
+ OKButton PB_MERGE_OK
+ {
+ Pos = MAP_APPFONT ( 12, 52 ) ;
+ Size = MAP_APPFONT ( 125, 14 ) ;
+ Text [ en-US ] = "Check Connection Settings..." ;
+ };
+ CancelButton PB_MERGE_CANCEL
+ {
+ Pos = MAP_APPFONT ( 140, 52 ) ;
+ Size = MAP_APPFONT ( 50, 14 ) ;
+ };
};
WarningBox MSG_DATA_SOURCES_UNAVAILABLE
{
- HelpId = HID_DATA_SOURCES_UNAVAILABLE ;
- Buttons = WB_OK_CANCEL ;
- Message [ en-US ] = "No data source has been set up yet. You need a data
source, such as a database, to supply data (for example, names and addresses)
for the fields." ;
+ HelpId = HID_DATA_SOURCES_UNAVAILABLE ;
+ Buttons = WB_OK_CANCEL ;
+ Message [ en-US ] = "No data source has been set up yet. You need a
data source, such as a database, to supply data (for example, names and
addresses) for the fields." ;
};
String RID_MODULE_TOOLBOX
{
Text [ en-US ] = "Function Bar (viewing mode)" ;
};
-String STR_DONT_ASK_AGAIN
+String STR_DONT_ASK_AGAIN
{
- Text [ en-US ] = "~Do not show warning again" ;
+ Text [ en-US ] = "~Do not show warning again" ;
};
// --> OD 2008-04-14 #outlinelevel#
String STR_OUTLINE_NUMBERING
{
- Text [ en-US ] = "Outline Numbering" ;
+ Text [ en-US ] = "Outline Numbering" ;
};
ToolBox RID_MODULE_TOOLBOX
{
diff --git a/main/sw/source/ui/inc/app.hrc b/main/sw/source/ui/inc/app.hrc
index 38ec134179..fe12580edb 100644
--- a/main/sw/source/ui/inc/app.hrc
+++ b/main/sw/source/ui/inc/app.hrc
@@ -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,56 +7,54 @@
* 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.
- *
+ *
*************************************************************/
-
-
#ifndef _APP_HRC
#define _APP_HRC
#include "rcid.hrc"
-// Default Bitmap fuer ToolBox
-#define BMP_FEHLT (RC_APP_BEGIN + 1)
+// Default Bitmap for ToolBox
+#define BMP_MISSING (RC_APP_BEGIN + 1)
// Document-Icon
#define RC_DOC_ICON (RC_APP_BEGIN + 2)
-//Soll das Clipboard fuer andere Applikationen...
+// Soll das Clipboard für andere Applikationen...
#define MSG_CLPBRD_CLEAR (RC_APP_BEGIN + 3)
#define STR_CANTCREATE (RC_APP_BEGIN + 4)
#define STR_CANTOPEN (RC_APP_BEGIN + 5)
// Messages
-#define MSG_ERROR_SEND_MAIL ( RC_APP_BEGIN + 6)
-#define MSG_SAVE_HTML_QUERY ( RC_APP_BEGIN + 7)
+#define MSG_ERROR_SEND_MAIL (RC_APP_BEGIN + 6)
+#define MSG_SAVE_HTML_QUERY (RC_APP_BEGIN + 7)
-//Fuer das Interface, weil der RID_APP_BEGIN jetzt Desktop ist.
-#define RID_SW_NAME ( RC_APP_BEGIN + 8)
-#define MSG_SAVEAS_HTML_QUERY ( RC_APP_BEGIN + 9)
+// Für das Interface, weil der RID_APP_BEGIN jetzt Desktop ist
+#define RID_SW_NAME (RC_APP_BEGIN + 8)
+#define MSG_SAVEAS_HTML_QUERY (RC_APP_BEGIN + 9)
-#define STR_UNBENANNT (RC_APP_BEGIN + 13)
+#define STR_UNTITLED (RC_APP_BEGIN + 13)
#define STR_VERSION (RC_APP_BEGIN + 14)
#define STR_PRINT_MERGE_MACRO (RC_APP_BEGIN + 15)
#define STR_PAGE_COUNT_MACRO (RC_APP_BEGIN + 16)
-// Bitmap fuer die NumerierungsVorlagen im Organizer
+// Bitmap für die NumerierungsVorlagen im Organizer
#define BMP_STYLES_FAMILY_NUM (RC_APP_BEGIN + 17)
#define BMP_STYLES_FAMILY_NUM_HC (RC_APP_BEGIN + 18)
-// Strings fuer Bereiche in der Konfiguration
+// Strings für Bereiche in der Konfiguration
#define STR_GRP_FILE (RC_APP_BEGIN + 56)
#define STR_GRP_EDIT (RC_APP_BEGIN + 57)
#define STR_GRP_TRAVELLING (RC_APP_BEGIN + 58)
@@ -78,16 +76,16 @@
#define STR_PAGEOFFSET (RC_APP_BEGIN + 74)
#define STR_PAGEBREAK (RC_APP_BEGIN + 75)
#define STR_REDLINE_UNKNOWN_AUTHOR (RC_APP_BEGIN + 76)
-#define STR_WESTERN_FONT (RC_APP_BEGIN + 77)
-#define STR_CJK_FONT (RC_APP_BEGIN + 78)
-//#define MSG_INS_MERGE_FIELDS (RC_APP_BEGIN + 79)
-#define MSG_PRINT_AS_MERGE (RC_APP_BEGIN + 80)
+#define STR_WESTERN_FONT (RC_APP_BEGIN + 77)
+#define STR_CJK_FONT (RC_APP_BEGIN + 78)
+//#define MSG_INS_MERGE_FIELDS (RC_APP_BEGIN + 79)
+#define MSG_PRINT_AS_MERGE (RC_APP_BEGIN + 80)
#define MSG_DATA_SOURCES_UNAVAILABLE (RC_APP_BEGIN + 82)
#define DLG_MERGE_SOURCE_UNAVAILABLE (RC_APP_BEGIN + 83)
-#define ST_MERGE_SOURCE_UNAVAILABLE 1
-#define PB_MERGE_OK 2
-#define PB_MERGE_CANCEL 3
-#define IMG_MERGE 4
+#define ST_MERGE_SOURCE_UNAVAILABLE 1
+#define PB_MERGE_OK 2
+#define PB_MERGE_CANCEL 3
+#define IMG_MERGE 4
#define SID_TOGGLETOOLBOX (RC_APP_BEGIN + 89)
#define STR_ENV_TITLE (RC_APP_BEGIN + 91)
@@ -95,85 +93,85 @@
#define STR_HUMAN_SWDOC_NAME (RC_APP_BEGIN + 93)
-#define RID_SW_ERRHDL (RC_APP_BEGIN + 95)
+#define RID_SW_ERRHDL (RC_APP_BEGIN + 95)
-#define STR_FDLG_TEMPLATE_BUTTON (RC_APP_BEGIN + 1)
+#define STR_FDLG_TEMPLATE_BUTTON (RC_APP_BEGIN + 1)
#define STR_FDLG_TEMPLATE_NAME (RC_APP_BEGIN + 2)
-// Ids fuer die einzelnen PopUpMenues
-//#define MN_WIZARD (RC_APP_BEGIN + 9)
-//#define MN_INDEX (RC_APP_BEGIN + 10)
-//#define MN_FILE (RC_APP_BEGIN + 11)
-//#define MN_EDIT (RC_APP_BEGIN + 12)
-//#define MN_VIEW (RC_APP_BEGIN + 13)
-//#define MN_INS (RC_APP_BEGIN + 14)
-//#define MN_TEXT (RC_APP_BEGIN + 15)
-//#define MN_FORMAT (RC_APP_BEGIN + 16)
-#define MN_FORMAT_STYLE (RC_APP_BEGIN + 17)
-#define MN_FORMAT_ALGN (RC_APP_BEGIN + 18)
-#define MN_FORMAT_LINESPACE (RC_APP_BEGIN + 19)
-//#define MN_EXTRA (RC_APP_BEGIN + 20)
-//#define MN_WIN (RC_APP_BEGIN + 21)
-//#define MN_HELP (RC_APP_BEGIN + 22)
-#define MN_FORMAT_FRM_HORZ (RC_APP_BEGIN + 23)
-//#define MN_FORMAT_FRM_VERT (RC_APP_BEGIN + 24)
-//#define MN_PICKLIST (RC_APP_BEGIN + 25)
-//#define MN_WINLIST (RC_APP_BEGIN + 26)
-//#define MN_MACRO (RC_APP_BEGIN + 27)
-//#define MN_FORMAT_HIERARCHY (RC_APP_BEGIN + 28)
-#define MN_CELL (RC_APP_BEGIN + 29)
-//#define MN_HELP_TIP (RC_APP_BEGIN + 30)
-//#define MN_HELP_SEARCH (RC_APP_BEGIN + 31)
-//#define MN_HELP_ACTIVE (RC_APP_BEGIN + 32)
-//#define MN_HELP_INDEX (RC_APP_BEGIN + 33)
-//#define MN_OBJECT (RC_APP_BEGIN + 34)
-//#define MN_DATABASE (RC_APP_BEGIN + 35)
-//#define MN_DIRSUBMENU (RC_APP_BEGIN + 36)
-//#define MN_MAIL (RC_APP_BEGIN + 37)
-#define MN_WRAP (RC_APP_BEGIN + 38)
-#define MN_SUB_TBLROW (RC_APP_BEGIN + 39)
-#define MN_SUB_TBLCOL (RC_APP_BEGIN + 40)
-//#define MN_SUB_AUTOFORMAT (RC_APP_BEGIN + 41)
-//#define MN_SUB_TOOLBAR (RC_APP_BEGIN + 42)
-//#define MN_SUB_FIELD (RC_APP_BEGIN + 43)
-//#define MN_SUB_GRAPHIC (RC_APP_BEGIN + 44)
-//#define MN_SUB_TEMPLATES (RC_APP_BEGIN + 45)
-#define MN_SUB_ARRANGE (RC_APP_BEGIN + 46)
-
-//#define MN_SUB_UPDATE (RC_APP_BEGIN + 48)
-//#define MN_SUB_MIRROR (RC_APP_BEGIN + 49)
-#define MN_SUB_ALIGN (RC_APP_BEGIN + 50)
-//#define MN_SUB_OPTIONS (RC_APP_BEGIN + 51)
-//#define MN_SUB_SENDTO (RC_APP_BEGIN + 52)
-//#define MN_SUB_REVISE (RC_APP_BEGIN + 53)
-//#define MN_TEMPLATES (RC_APP_BEGIN + 54)
-//#define MN_FILE_PORT (RC_APP_BEGIN + 55)
-//#define MN_EDIT_PORT (RC_APP_BEGIN + 56)
-//#define MN_VIEW_PORT (RC_APP_BEGIN + 57)
-//#define MN_INS_PORT (RC_APP_BEGIN + 58)
-//#define MN_FORMAT_PORT (RC_APP_BEGIN + 59)
-//#define MN_EXTRA_PORT (RC_APP_BEGIN + 60)
-//#define MN_WIN_PORT (RC_APP_BEGIN + 61)
-//#define MN_HELP_PORT (RC_APP_BEGIN + 62)
-//#define MN_SUB_TRANSLITERATE (RC_APP_BEGIN + 63)
-//#define MN_SUB_MACRO (RC_APP_BEGIN + 64)
-
-#define STR_WRITER_DOCUMENT_FULLTYPE (RC_APP_BEGIN + 100)
-#define STR_ABSTRACT_TITLE (RC_APP_BEGIN + 102)
-#define STR_DONT_ASK_AGAIN (RC_APP_BEGIN + 103)
+// Ids für die einzelnen PopUpMenüs
+//#define MN_WIZARD (RC_APP_BEGIN + 9)
+//#define MN_INDEX (RC_APP_BEGIN + 10)
+//#define MN_FILE (RC_APP_BEGIN + 11)
+//#define MN_EDIT (RC_APP_BEGIN + 12)
+//#define MN_VIEW (RC_APP_BEGIN + 13)
+//#define MN_INS (RC_APP_BEGIN + 14)
+//#define MN_TEXT (RC_APP_BEGIN + 15)
+//#define MN_FORMAT (RC_APP_BEGIN + 16)
+#define MN_FORMAT_STYLE (RC_APP_BEGIN + 17)
+#define MN_FORMAT_ALGN (RC_APP_BEGIN + 18)
+#define MN_FORMAT_LINESPACE (RC_APP_BEGIN + 19)
+//#define MN_EXTRA (RC_APP_BEGIN + 20)
+//#define MN_WIN (RC_APP_BEGIN + 21)
+//#define MN_HELP (RC_APP_BEGIN + 22)
+#define MN_FORMAT_FRM_HORZ (RC_APP_BEGIN + 23)
+//#define MN_FORMAT_FRM_VERT (RC_APP_BEGIN + 24)
+//#define MN_PICKLIST (RC_APP_BEGIN + 25)
+//#define MN_WINLIST (RC_APP_BEGIN + 26)
+//#define MN_MACRO (RC_APP_BEGIN + 27)
+//#define MN_FORMAT_HIERARCHY (RC_APP_BEGIN + 28)
+#define MN_CELL (RC_APP_BEGIN +
29)
+//#define MN_HELP_TIP (RC_APP_BEGIN + 30)
+//#define MN_HELP_SEARCH (RC_APP_BEGIN + 31)
+//#define MN_HELP_ACTIVE (RC_APP_BEGIN + 32)
+//#define MN_HELP_INDEX (RC_APP_BEGIN + 33)
+//#define MN_OBJECT (RC_APP_BEGIN + 34)
+//#define MN_DATABASE (RC_APP_BEGIN + 35)
+//#define MN_DIRSUBMENU (RC_APP_BEGIN + 36)
+//#define MN_MAIL (RC_APP_BEGIN + 37)
+#define MN_WRAP (RC_APP_BEGIN +
38)
+#define MN_SUB_TBLROW (RC_APP_BEGIN + 39)
+#define MN_SUB_TBLCOL (RC_APP_BEGIN + 40)
+//#define MN_SUB_AUTOFORMAT (RC_APP_BEGIN + 41)
+//#define MN_SUB_TOOLBAR (RC_APP_BEGIN + 42)
+//#define MN_SUB_FIELD (RC_APP_BEGIN + 43)
+//#define MN_SUB_GRAPHIC (RC_APP_BEGIN + 44)
+//#define MN_SUB_TEMPLATES (RC_APP_BEGIN + 45)
+#define MN_SUB_ARRANGE (RC_APP_BEGIN + 46)
+
+//#define MN_SUB_UPDATE (RC_APP_BEGIN + 48)
+//#define MN_SUB_MIRROR (RC_APP_BEGIN + 49)
+#define MN_SUB_ALIGN (RC_APP_BEGIN + 50)
+//#define MN_SUB_OPTIONS (RC_APP_BEGIN + 51)
+//#define MN_SUB_SENDTO (RC_APP_BEGIN + 52)
+//#define MN_SUB_REVISE (RC_APP_BEGIN + 53)
+//#define MN_TEMPLATES (RC_APP_BEGIN + 54)
+//#define MN_FILE_PORT (RC_APP_BEGIN + 55)
+//#define MN_EDIT_PORT (RC_APP_BEGIN + 56)
+//#define MN_VIEW_PORT (RC_APP_BEGIN + 57)
+//#define MN_INS_PORT (RC_APP_BEGIN + 58)
+//#define MN_FORMAT_PORT (RC_APP_BEGIN + 59)
+//#define MN_EXTRA_PORT (RC_APP_BEGIN + 60)
+//#define MN_WIN_PORT (RC_APP_BEGIN + 61)
+//#define MN_HELP_PORT (RC_APP_BEGIN + 62)
+//#define MN_SUB_TRANSLITERATE (RC_APP_BEGIN + 63)
+//#define MN_SUB_MACRO (RC_APP_BEGIN + 64)
+
+#define STR_WRITER_DOCUMENT_FULLTYPE (RC_APP_BEGIN + 100)
+#define STR_ABSTRACT_TITLE (RC_APP_BEGIN + 102)
+#define STR_DONT_ASK_AGAIN (RC_APP_BEGIN + 103)
// --> OD 2008-04-14 #outlinelevel#
-#define STR_OUTLINE_NUMBERING (RC_APP_BEGIN + 104)
+#define STR_OUTLINE_NUMBERING (RC_APP_BEGIN + 104)
// <--
-//#outline level,zhaojianwei
+// #outline level,zhaojianwei
#define STR_FDLG_OUTLINE_LEVEL (RC_APP_BEGIN + 105)
#define STR_FDLG_STYLE (RC_APP_BEGIN + 106)
//<-end,zhaojianwei
-#define APP_ACT_END STR_FDLG_STYLE
+#define APP_ACT_END STR_FDLG_STYLE
#if APP_ACT_END > RC_APP_END
-#error Resource-Id Ueberlauf in #file, #line
+#error Resource-Id Überlauf in #file, #line
#endif
#endif
