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 e146aa735d Translate German (VLINEAL -> VRULER)
e146aa735d is described below
commit e146aa735ddf4322a0a1223910aa08b8601e35cd
Author: mseidel <[email protected]>
AuthorDate: Tue Apr 22 16:47:41 2025 +0200
Translate German (VLINEAL -> VRULER)
(cherry picked from commit 8a724865bddd5e2dac91d472b5e0b11d431a14be)
---
main/helpcontent2/helpers/help_hid.lst | 2 +-
main/helpcontent2/helpers/longnames_commands.csv | 2 +-
main/helpcontent2/helpers/uno_hid.lst | 2 +-
main/sw/inc/cmdid.h | 2 +-
main/sw/inc/helpid.h | 11 +++++------
main/sw/inc/swcommands.h | 2 +-
main/sw/sdi/_viewsh.sdi | 2 +-
main/sw/sdi/swriter.sdi | 2 +-
main/sw/source/ui/inc/hidfunc.h | 11 +++++------
main/sw/source/ui/uiview/view0.cxx | 6 +++---
10 files changed, 20 insertions(+), 22 deletions(-)
diff --git a/main/helpcontent2/helpers/help_hid.lst
b/main/helpcontent2/helpers/help_hid.lst
index 61af5c8447..0ee7daedba 100644
--- a/main/helpcontent2/helpers/help_hid.lst
+++ b/main/helpcontent2/helpers/help_hid.lst
@@ -490,7 +490,7 @@ FN_VIEW_MARKS,20225,.uno:Marks
FN_VIEW_META_CHARS,20224,.uno:ControlCodes
FN_VIEW_NOTES,20255,
FN_VIEW_TABLEGRID,20227,.uno:TableBoundaries
-FN_VLINEAL,20216,.uno:VRuler
+FN_VRULER,20216,.uno:VRuler
FN_VSCROLLBAR,20217,.uno:VScroll
FN_WORDCOUNT_DIALOG,22298,.uno:WordCountDialog
FN_WRAP_ANCHOR_ONLY,20581,.uno:WrapAnchorOnly
diff --git a/main/helpcontent2/helpers/longnames_commands.csv
b/main/helpcontent2/helpers/longnames_commands.csv
index 07045ba9cd..e64717653e 100644
--- a/main/helpcontent2/helpers/longnames_commands.csv
+++ b/main/helpcontent2/helpers/longnames_commands.csv
@@ -463,7 +463,7 @@ FN_VIEW_HIDDEN_PARA,.uno:ShowHiddenParagraphs
FN_VIEW_MARKS,.uno:Marks
FN_VIEW_META_CHARS,.uno:ControlCodes
FN_VIEW_TABLEGRID,.uno:TableBoundaries
-FN_VLINEAL,.uno:VRuler
+FN_VRULER,.uno:VRuler
FN_VSCROLLBAR,.uno:VScroll
FN_WORDCOUNT_DIALOG,.uno:WordCountDialog
FN_WRAP_ANCHOR_ONLY,.uno:WrapAnchorOnly
diff --git a/main/helpcontent2/helpers/uno_hid.lst
b/main/helpcontent2/helpers/uno_hid.lst
index e7e8744be1..da6c3065c3 100644
--- a/main/helpcontent2/helpers/uno_hid.lst
+++ b/main/helpcontent2/helpers/uno_hid.lst
@@ -463,7 +463,7 @@ FN_VIEW_HIDDEN_PARA,20242,.uno:ShowHiddenParagraphs
FN_VIEW_MARKS,20225,.uno:Marks
FN_VIEW_META_CHARS,20224,.uno:ControlCodes
FN_VIEW_TABLEGRID,20227,.uno:TableBoundaries
-FN_VLINEAL,20216,.uno:VRuler
+FN_VRULER,20216,.uno:VRuler
FN_VSCROLLBAR,20217,.uno:VScroll
FN_WORDCOUNT_DIALOG,22298,.uno:WordCountDialog
FN_WRAP_ANCHOR_ONLY,20581,.uno:WrapAnchorOnly
diff --git a/main/sw/inc/cmdid.h b/main/sw/inc/cmdid.h
index 2145da00ab..ec63d48689 100644
--- a/main/sw/inc/cmdid.h
+++ b/main/sw/inc/cmdid.h
@@ -271,7 +271,7 @@ Achtung: Ab sofort sind in diesem File keine C++-Kommentare
(//) mehr
#define FN_VIEW_GRAPHIC (FN_VIEW + 13) /* Grafiken
anzeigen */
#define FN_VIEW_BOUNDS (FN_VIEW + 14) /* Begrenzungen */
#define FN_VIEW_FIELDS (FN_VIEW + 15) /* Textbefehle */
-#define FN_VLINEAL (FN_VIEW + 16) /* Vertical
Ruler */
+#define FN_VRULER (FN_VIEW + 16) /* Vertical
Ruler */
#define FN_VSCROLLBAR (FN_VIEW + 17) /* Vertical Scrollbar */
#define FN_HSCROLLBAR (FN_VIEW + 18) /* Horizontal Scrollbar
*/
#define FN_TOOLBOX_TOGGLE (FN_VIEW + 19) /* Toolboxinhalte
umschalten */
diff --git a/main/sw/inc/helpid.h b/main/sw/inc/helpid.h
index c6150cc1a6..c8fe00f2d2 100644
--- a/main/sw/inc/helpid.h
+++ b/main/sw/inc/helpid.h
@@ -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,19 +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 "swcommands.h"
#include <svx/svxcommands.h>
#include <sfx2/sfxcommands.h>
@@ -525,7 +524,7 @@
#define HID_TOOLBOX
"SW_HID_TOOLBOX"
#define HID_VIEW_BOUNDS
"SW_HID_VIEW_BOUNDS"
#define HID_VIEW_FIELDS
"SW_HID_VIEW_FIELDS"
-#define HID_VLINEAL
"SW_HID_VLINEAL"
+#define HID_VRULER "SW_HID_VRULER"
#define HID_VSCROLLBAR
"SW_HID_VSCROLLBAR"
#define HID_HSCROLLBAR
"SW_HID_HSCROLLBAR"
#define HID_VIEW_META_CHARS
"SW_HID_VIEW_META_CHARS"
diff --git a/main/sw/inc/swcommands.h b/main/sw/inc/swcommands.h
index 76dccba67e..0680a8685d 100644
--- a/main/sw/inc/swcommands.h
+++ b/main/sw/inc/swcommands.h
@@ -361,7 +361,7 @@
#define CMD_FN_UPDATE_FIELDS ".uno:UpdateFields"
#define CMD_FN_UPDATE_INPUTFIELDS ".uno:UpdateInputFields"
#define CMD_FN_VIEW_BOUNDS ".uno:ViewBounds"
-#define CMD_FN_VLINEAL ".uno:VRuler"
+#define CMD_FN_VRULER ".uno:VRuler"
#define CMD_FN_VSCROLLBAR ".uno:VScroll"
#define CMD_FN_PREV_WORD_SEL ".uno:WordLeftSel"
#define CMD_FN_NEXT_WORD_SEL ".uno:WordRightSel"
diff --git a/main/sw/sdi/_viewsh.sdi b/main/sw/sdi/_viewsh.sdi
index 1961826079..3c7b3c5340 100644
--- a/main/sw/sdi/_viewsh.sdi
+++ b/main/sw/sdi/_viewsh.sdi
@@ -745,7 +745,7 @@ interface BaseTextEditView
StateMethod = StateViewOptions ;
]
- FN_VLINEAL // status()
+ FN_VRULER // status()
[
ExecMethod = ExecViewOptions ;
StateMethod = StateViewOptions ;
diff --git a/main/sw/sdi/swriter.sdi b/main/sw/sdi/swriter.sdi
index 1ea6cbbff3..d28c4e0784 100644
--- a/main/sw/sdi/swriter.sdi
+++ b/main/sw/sdi/swriter.sdi
@@ -8569,7 +8569,7 @@ SfxBoolItem ViewBounds FN_VIEW_BOUNDS
]
//--------------------------------------------------------------------------
-SfxBoolItem VRuler FN_VLINEAL
+SfxBoolItem VRuler FN_VRULER
[
/* flags: */
diff --git a/main/sw/source/ui/inc/hidfunc.h b/main/sw/source/ui/inc/hidfunc.h
index d86fd8dcd7..d3f5ba9357 100644
--- a/main/sw/source/ui/inc/hidfunc.h
+++ b/main/sw/source/ui/inc/hidfunc.h
@@ -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,19 +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.
- *
+ *
*************************************************************/
-
#define HID_EXIT 1017
#define HID_NEW_WINDOW 1701
#define HID_ARRANGE_CASCADE_WIN 1703
@@ -46,7 +45,7 @@
#define HID_TOOLBOX 1213
#define HID_RIBBON 1210
#define HID_RULER 1211
-#define HID_VLINEAL 1216
+#define HID_VRULER 1216
#define HID_VSCROLLBAR 1217
#define HID_HSCROLLBAR 1218
#define HID_SAVE_FILE 1013
diff --git a/main/sw/source/ui/uiview/view0.cxx
b/main/sw/source/ui/uiview/view0.cxx
index 536f22bf37..083b449d30 100644
--- a/main/sw/source/ui/uiview/view0.cxx
+++ b/main/sw/source/ui/uiview/view0.cxx
@@ -231,7 +231,7 @@ void SwView::RecheckBrowseMode()
FN_VIEW_GRAPHIC, /*20213*/
FN_VIEW_BOUNDS, /**/
FN_VIEW_FIELDS, /*20215*/
- FN_VLINEAL, /*20216*/
+ FN_VRULER, /*20216*/
FN_VSCROLLBAR, /*20217*/
FN_HSCROLLBAR, /*20218*/
FN_VIEW_META_CHARS, /**/
@@ -331,7 +331,7 @@ void SwView::StateViewOptions(SfxItemSet &rSet)
aBool.SetValue( pOpt->IsCrossHair() ); break;
case FN_VIEW_SMOOTH_SCROLL:
aBool.SetValue( pOpt->IsSmoothScroll()); break;
- case FN_VLINEAL:
+ case FN_VRULER:
aBool.SetValue( 0 != StatVRuler() ); break;
case FN_HSCROLLBAR:
if( pOpt->getBrowseMode() )
@@ -473,7 +473,7 @@ void SwView::ExecViewOptions(SfxRequest &rReq)
break;
- case FN_VLINEAL:
+ case FN_VRULER:
if( STATE_TOGGLE == eState )
bFlag = !pOpt->IsViewVRuler();
