diff options
| -rw-r--r-- | officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu | 4 | ||||
| -rw-r--r-- | sw/inc/strings.hrc | 1 | ||||
| -rw-r--r-- | sw/uiconfig/sglobal/menubar/menubar.xml | 2 | ||||
| -rw-r--r-- | sw/uiconfig/sweb/menubar/menubar.xml | 2 | ||||
| -rw-r--r-- | sw/uiconfig/swriter/menubar/menubar.xml | 2 | ||||
| -rw-r--r-- | sw/uiconfig/swriter/popupmenu/table.xml | 2 | ||||
| -rw-r--r-- | sw/uiconfig/swriter/popupmenu/text.xml | 2 | ||||
| -rw-r--r-- | sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui | 2 | ||||
| -rw-r--r-- | sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui | 2 | ||||
| -rw-r--r-- | sw/uiconfig/swriter/ui/notebookbar_groups.ui | 2 | ||||
| -rw-r--r-- | sw/uiconfig/swxform/menubar/menubar.xml | 2 |
11 files changed, 11 insertions, 12 deletions
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu index 286f44343fa9..b185aac57576 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu @@ -3053,7 +3053,7 @@ <value>9</value> </prop> </node> - <node oor:name=".uno:StyleApply?Style:string=Default Style&FamilyName:string=CharacterStyles" oor:op="replace"> + <node oor:name=".uno:StyleApply?Style:string=Standard&FamilyName:string=CharacterStyles" oor:op="replace"> <prop oor:name="Label" oor:type="xs:string"> <value xml:lang="en-US">Default ~Character</value> </prop> @@ -3066,7 +3066,7 @@ <value xml:lang="en-US">Default Character Style</value> </prop> <prop oor:name="TargetURL" oor:type="xs:string"> - <value>.uno:StyleApply?Style:string=Default Style&FamilyName:string=CharacterStyles</value> + <value>.uno:StyleApply?Style:string=Standard&FamilyName:string=CharacterStyles</value> </prop> <prop oor:name="Properties" oor:type="xs:int"> <value>9</value> diff --git a/sw/inc/strings.hrc b/sw/inc/strings.hrc index 9be1de51bfe9..7a35d1ebe1d2 100644 --- a/sw/inc/strings.hrc +++ b/sw/inc/strings.hrc @@ -59,7 +59,6 @@ #define STR_POOLFRM_WATERSIGN NC_("STR_POOLFRM_WATERSIGN", "Watermark") #define STR_POOLFRM_LABEL NC_("STR_POOLFRM_LABEL", "Labels") // Template names -// tdf#107211 please don't change STANDARD, except back to "Default" #define STR_POOLCOLL_STANDARD NC_("STR_POOLCOLL_STANDARD", "Default Style") #define STR_POOLCOLL_TEXT NC_("STR_POOLCOLL_TEXT", "Text Body") #define STR_POOLCOLL_TEXT_IDENT NC_("STR_POOLCOLL_TEXT_IDENT", "First Line Indent") diff --git a/sw/uiconfig/sglobal/menubar/menubar.xml b/sw/uiconfig/sglobal/menubar/menubar.xml index c889ba6f87c2..4e3b76f70398 100644 --- a/sw/uiconfig/sglobal/menubar/menubar.xml +++ b/sw/uiconfig/sglobal/menubar/menubar.xml @@ -557,7 +557,7 @@ <menu:menuitem menu:id=".uno:StyleApply?Style:string=Quotations&FamilyName:string=ParagraphStyles" menu:style="radio"/> <menu:menuitem menu:id=".uno:StyleApply?Style:string=Preformatted Text&FamilyName:string=ParagraphStyles" menu:style="radio"/> <menu:menuseparator/> - <menu:menuitem menu:id=".uno:StyleApply?Style:string=Default Style&FamilyName:string=CharacterStyles" menu:style="radio"/> + <menu:menuitem menu:id=".uno:StyleApply?Style:string=Standard&FamilyName:string=CharacterStyles" menu:style="radio"/> <menu:menuitem menu:id=".uno:StyleApply?Style:string=Emphasis&FamilyName:string=CharacterStyles" menu:style="radio"/> <menu:menuitem menu:id=".uno:StyleApply?Style:string=Strong Emphasis&FamilyName:string=CharacterStyles" menu:style="radio"/> <menu:menuitem menu:id=".uno:StyleApply?Style:string=Citation&FamilyName:string=CharacterStyles" menu:style="radio"/> diff --git a/sw/uiconfig/sweb/menubar/menubar.xml b/sw/uiconfig/sweb/menubar/menubar.xml index 1b5624f22169..99dba081a7f3 100644 --- a/sw/uiconfig/sweb/menubar/menubar.xml +++ b/sw/uiconfig/sweb/menubar/menubar.xml @@ -432,7 +432,7 @@ <menu:menuitem menu:id=".uno:StyleApply?Style:string=Quotations&FamilyName:string=ParagraphStyles" menu:style="radio"/> <menu:menuitem menu:id=".uno:StyleApply?Style:string=Preformatted Text&FamilyName:string=ParagraphStyles" menu:style="radio"/> <menu:menuseparator/> - <menu:menuitem menu:id=".uno:StyleApply?Style:string=Default Style&FamilyName:string=CharacterStyles" menu:style="radio"/> + <menu:menuitem menu:id=".uno:StyleApply?Style:string=Standard&FamilyName:string=CharacterStyles" menu:style="radio"/> <menu:menuitem menu:id=".uno:StyleApply?Style:string=Emphasis&FamilyName:string=CharacterStyles" menu:style="radio"/> <menu:menuitem menu:id=".uno:StyleApply?Style:string=Strong Emphasis&FamilyName:string=CharacterStyles" menu:style="radio"/> <menu:menuitem menu:id=".uno:StyleApply?Style:string=Citation&FamilyName:string=CharacterStyles" menu:style="radio"/> diff --git a/sw/uiconfig/swriter/menubar/menubar.xml b/sw/uiconfig/swriter/menubar/menubar.xml index f2148b3fa3fe..532e8b8d6c73 100644 --- a/sw/uiconfig/swriter/menubar/menubar.xml +++ b/sw/uiconfig/swriter/menubar/menubar.xml @@ -557,7 +557,7 @@ <menu:menuitem menu:id=".uno:StyleApply?Style:string=Quotations&FamilyName:string=ParagraphStyles" menu:style="radio"/> <menu:menuitem menu:id=".uno:StyleApply?Style:string=Preformatted Text&FamilyName:string=ParagraphStyles" menu:style="radio"/> <menu:menuseparator/> - <menu:menuitem menu:id=".uno:StyleApply?Style:string=Default Style&FamilyName:string=CharacterStyles" menu:style="radio"/> + <menu:menuitem menu:id=".uno:StyleApply?Style:string=Standard&FamilyName:string=CharacterStyles" menu:style="radio"/> <menu:menuitem menu:id=".uno:StyleApply?Style:string=Emphasis&FamilyName:string=CharacterStyles" menu:style="radio"/> <menu:menuitem menu:id=".uno:StyleApply?Style:string=Strong Emphasis&FamilyName:string=CharacterStyles" menu:style="radio"/> <menu:menuitem menu:id=".uno:StyleApply?Style:string=Citation&FamilyName:string=CharacterStyles" menu:style="radio"/> diff --git a/sw/uiconfig/swriter/popupmenu/table.xml b/sw/uiconfig/swriter/popupmenu/table.xml index bdd835d4960c..92d143884e9d 100644 --- a/sw/uiconfig/swriter/popupmenu/table.xml +++ b/sw/uiconfig/swriter/popupmenu/table.xml @@ -78,7 +78,7 @@ <menu:menuseparator/> <menu:menuitem menu:id=".uno:EditStyle"/> <menu:menuseparator/> - <menu:menuitem menu:id=".uno:StyleApply?Style:string=Default Style&FamilyName:string=CharacterStyles" menu:style="radio"/> + <menu:menuitem menu:id=".uno:StyleApply?Style:string=Standard&FamilyName:string=CharacterStyles" menu:style="radio"/> <menu:menuitem menu:id=".uno:StyleApply?Style:string=Emphasis&FamilyName:string=CharacterStyles" menu:style="radio"/> <menu:menuitem menu:id=".uno:StyleApply?Style:string=Strong Emphasis&FamilyName:string=CharacterStyles" menu:style="radio"/> <menu:menuitem menu:id=".uno:StyleApply?Style:string=Citation&FamilyName:string=CharacterStyles" menu:style="radio"/> diff --git a/sw/uiconfig/swriter/popupmenu/text.xml b/sw/uiconfig/swriter/popupmenu/text.xml index 3c020ef793a7..a8462627225b 100644 --- a/sw/uiconfig/swriter/popupmenu/text.xml +++ b/sw/uiconfig/swriter/popupmenu/text.xml @@ -48,7 +48,7 @@ <menu:menuseparator/> <menu:menuitem menu:id=".uno:EditStyle"/> <menu:menuseparator/> - <menu:menuitem menu:id=".uno:StyleApply?Style:string=Default Style&FamilyName:string=CharacterStyles" menu:style="radio"/> + <menu:menuitem menu:id=".uno:StyleApply?Style:string=Standard&FamilyName:string=CharacterStyles" menu:style="radio"/> <menu:menuitem menu:id=".uno:StyleApply?Style:string=Emphasis&FamilyName:string=CharacterStyles" menu:style="radio"/> <menu:menuitem menu:id=".uno:StyleApply?Style:string=Strong Emphasis&FamilyName:string=CharacterStyles" menu:style="radio"/> <menu:menuitem menu:id=".uno:StyleApply?Style:string=Citation&FamilyName:string=CharacterStyles" menu:style="radio"/> diff --git a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui index 4835169624e6..7f82770797ba 100644 --- a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui +++ b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui @@ -2716,7 +2716,7 @@ <object class="GtkMenuItem" id="defaultstyle"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:StyleApply?Style:string=Default Style&FamilyName:string=CharacterStyles</property> + <property name="action_name">.uno:StyleApply?Style:string=Standard&FamilyName:string=CharacterStyles</property> </object> </child> <child> diff --git a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui index 28180fc77101..d5841adec13f 100644 --- a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui +++ b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui @@ -2737,7 +2737,7 @@ <object class="GtkMenuItem" id="defaultstyle"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:StyleApply?Style:string=Default Style&FamilyName:string=CharacterStyles</property> + <property name="action_name">.uno:StyleApply?Style:string=Standard&FamilyName:string=CharacterStyles</property> </object> </child> <child> diff --git a/sw/uiconfig/swriter/ui/notebookbar_groups.ui b/sw/uiconfig/swriter/ui/notebookbar_groups.ui index 3830b30994a0..315e8e8a2a9d 100644 --- a/sw/uiconfig/swriter/ui/notebookbar_groups.ui +++ b/sw/uiconfig/swriter/ui/notebookbar_groups.ui @@ -366,7 +366,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="label" translatable="yes" context="notebookbar_groups|chardefault">Default Character</property> - <property name="action_name">.uno:StyleApply?Style:string=Default Style&FamilyName:string=CharacterStyles</property> + <property name="action_name">.uno:StyleApply?Style:string=Standard&FamilyName:string=CharacterStyles</property> <property name="use_underline">True</property> </object> </child> diff --git a/sw/uiconfig/swxform/menubar/menubar.xml b/sw/uiconfig/swxform/menubar/menubar.xml index fe7d7e652a2d..4faa10e6adce 100644 --- a/sw/uiconfig/swxform/menubar/menubar.xml +++ b/sw/uiconfig/swxform/menubar/menubar.xml @@ -557,7 +557,7 @@ <menu:menuitem menu:id=".uno:StyleApply?Style:string=Quotations&FamilyName:string=ParagraphStyles" menu:style="radio"/> <menu:menuitem menu:id=".uno:StyleApply?Style:string=Preformatted Text&FamilyName:string=ParagraphStyles" menu:style="radio"/> <menu:menuseparator/> - <menu:menuitem menu:id=".uno:StyleApply?Style:string=Default Style&FamilyName:string=CharacterStyles" menu:style="radio"/> + <menu:menuitem menu:id=".uno:StyleApply?Style:string=Standard&FamilyName:string=CharacterStyles" menu:style="radio"/> <menu:menuitem menu:id=".uno:StyleApply?Style:string=Emphasis&FamilyName:string=CharacterStyles" menu:style="radio"/> <menu:menuitem menu:id=".uno:StyleApply?Style:string=Strong Emphasis&FamilyName:string=CharacterStyles" menu:style="radio"/> <menu:menuitem menu:id=".uno:StyleApply?Style:string=Citation&FamilyName:string=CharacterStyles" menu:style="radio"/> |