tdf#101064 adjust menu path to Format - Frame and Object - Properties

Change-Id: Ib7692042bfb7daaf7325be8f183759b27eb315e6
Reviewed-on: https://gerrit.libreoffice.org/28733
Reviewed-by: jan iversen <jani@documentfoundation.org>
Tested-by: jan iversen <jani@documentfoundation.org>

10 files changed, 18 insertions, 18 deletions

diff --git a/source/text/shared/00/00040500.xhp b/source/text/shared/00/00040500.xhp
index 0fb4cf1229..a2cb5fca00 100644
--- a/source/text/shared/00/00040500.xhp
+++ b/source/text/shared/00/00040500.xhp
@@ -142,7 +142,7 @@
 <paragraph id="par_idN109E2" role="paragraph" xml-lang="en-US">(all options only in Writer or Calc)</paragraph>
 <paragraph id="par_id3156105" role="paragraph" xml-lang="en-US">Choose <emph>Format - Paragraph - Borders</emph> tab</paragraph>
 <paragraph id="par_id3154149" role="paragraph" xml-lang="en-US">Choose <emph>Format - Image - Borders</emph> tab</paragraph>
-<paragraph id="par_id3163822" role="paragraph" xml-lang="en-US">Choose <emph>Format - Frame/Object - Borders</emph> tab</paragraph>
+<paragraph id="par_id3163822" role="paragraph" xml-lang="en-US">Choose <emph>Format - Frame and Object - Properties - Borders</emph> tab</paragraph>
 <paragraph id="par_id3150048" role="paragraph" xml-lang="en-US">Choose <emph>Format - Page - Borders</emph> tab</paragraph>
 <paragraph id="par_id3151148" role="paragraph" xml-lang="en-US">Choose <emph>Format - Character - Borders</emph> tab</paragraph>
 <paragraph id="par_id3149911" role="paragraph" xml-lang="en-US">Choose <emph>View - Styles and Formatting</emph> - open context menu of an entry and choose <emph>Modify/New - Borders</emph> tab</paragraph>
@@ -163,7 +163,7 @@
 <paragraph id="par_id3155853" role="paragraph" xml-lang="en-US">Choose <emph>Format - Paragraph - Background</emph> tab</paragraph>
 <paragraph id="par_id3147330" role="paragraph" xml-lang="en-US">Choose <emph>Format - Character - Background</emph> tab</paragraph>
 <paragraph id="par_id3149486" role="paragraph" xml-lang="en-US">Choose <emph>Format - Image - Background</emph> tab</paragraph>
-<paragraph id="par_id3150592" role="paragraph" xml-lang="en-US">Choose <emph>Format - Frame/Object - Background</emph> tab</paragraph>
+<paragraph id="par_id3150592" role="paragraph" xml-lang="en-US">Choose <emph>Format - Frame and Object - Properties - Area</emph> tab</paragraph>
 <paragraph id="par_id3151321" role="paragraph" xml-lang="en-US">Choose <emph>Format - Page - Background</emph> tab</paragraph>
 <paragraph id="par_id3154510" role="paragraph" xml-lang="en-US">Choose <emph>Format - Page - Header - More</emph> button</paragraph>
 <paragraph id="par_id3159110" role="paragraph" xml-lang="en-US">Choose <emph>Format - Page - Footer - More</emph> button</paragraph>
diff --git a/source/text/shared/guide/paintbrush.xhp b/source/text/shared/guide/paintbrush.xhp
index c8eeacf47a..ac583a782f 100644
--- a/source/text/shared/guide/paintbrush.xhp
+++ b/source/text/shared/guide/paintbrush.xhp
@@ -90,7 +90,7 @@
                <paragraph xml-lang="en-US" id="par_idN106B8" role="tablecontent" l10n="NEW">Frame is selected</paragraph>
             </tablecell>
             <tablecell>
-               <paragraph xml-lang="en-US" id="par_idN106BE" role="tablecontent" l10n="NEW">Copies the frame attributes that are defined in <item type="menuitem">Format - Frame</item> dialog. The contents, size, position, linking, hyperlinks, and macros in the frame are not copied.</paragraph>
+               <paragraph xml-lang="en-US" id="par_idN106BE" role="tablecontent">Copies the frame attributes that are defined in <item type="menuitem">Format - Frame and Object - Properties</item> dialog. The contents, size, position, linking, hyperlinks, and macros in the frame are not copied.</paragraph>
             </tablecell>
          </tablerow>
          <tablerow>
diff --git a/source/text/shared/guide/scripting.xhp b/source/text/shared/guide/scripting.xhp
index d0edae41ea..4b8a2d6b4c 100644
--- a/source/text/shared/guide/scripting.xhp
+++ b/source/text/shared/guide/scripting.xhp
@@ -139,7 +139,7 @@
             <paragraph xml-lang="en-US" id="par_idN10795" role="paragraph" l10n="NEW">Select the embedded object, for example a chart, in your document.</paragraph>
          </listitem>
          <listitem>
-            <paragraph xml-lang="en-US" id="par_idN10ADB" role="paragraph" l10n="NEW">Choose <emph>Format - Frame/Object - Macro</emph>.</paragraph>
+            <paragraph xml-lang="en-US" id="par_idN10ADB" role="paragraph">Choose <emph>Format - Frame and Object - Properties - Macro</emph>.</paragraph>
          </listitem>
          <listitem>
             <paragraph xml-lang="en-US" id="par_idN10ADF" role="paragraph" l10n="NEW">In the <emph>Macros</emph> list box, open the %PRODUCTNAME Scripts entry.</paragraph>
diff --git a/source/text/swriter/00/00000404.xhp b/source/text/swriter/00/00000404.xhp
index 7eba748910..ab9d0aec2c 100644
--- a/source/text/swriter/00/00000404.xhp
+++ b/source/text/swriter/00/00000404.xhp
@@ -244,7 +244,7 @@
 <section id="rahmen">
 <paragraph role="paragraph" id="par_id3148781" xml-lang="en-US" l10n="U" oldref="32">Choose <emph>Insert - Frame</emph>
 </paragraph>
-<paragraph role="paragraph" id="par_id3150084" xml-lang="en-US" l10n="U" oldref="33">Choose <emph>Format - Frame/Object</emph>
+<paragraph role="paragraph" id="par_id3150084" xml-lang="en-US">Choose <emph>Format - Frame and Object - Properties</emph>
 </paragraph>
 <paragraph role="paragraph" id="par_id3150103" xml-lang="en-US" l10n="CHG" oldref="34">Open <emph>Insert</emph> toolbar, click</paragraph>
 <section id="syrahmen">
diff --git a/source/text/swriter/00/00000405.xhp b/source/text/swriter/00/00000405.xhp
index 831dedf533..e73fb7ae05 100644
--- a/source/text/swriter/00/00000405.xhp
+++ b/source/text/swriter/00/00000405.xhp
@@ -56,7 +56,7 @@
 </variable></paragraph>
       <section id="spaltens">
          <paragraph xml-lang="en-US" id="par_id3150836" role="paragraph" l10n="U" oldref="20">Choose <emph>Format - Page - Columns</emph> tab</paragraph>
-         <paragraph xml-lang="en-US" id="par_id3149687" role="paragraph" l10n="U" oldref="123">Choose <emph>Format - Frame/Object - Columns</emph> tab</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3149687" role="paragraph">Choose <emph>Format - Frame and Object - Properties - Columns</emph> tab</paragraph>
          <paragraph xml-lang="en-US" id="par_id3149298" role="paragraph">Choose <emph>View - Styles and Formatting -</emph> open context menu <emph>Modify/New - Columns</emph> tab</paragraph>
          <paragraph xml-lang="en-US" id="par_id3151336" role="paragraph" l10n="U" oldref="23">Choose <emph>Insert - Frame - Columns</emph> tab</paragraph>
          <paragraph xml-lang="en-US" id="par_id3143276" role="paragraph" l10n="U" oldref="156">Choose <emph>Insert/Format - Section(s) - Columns</emph> tab</paragraph>
@@ -116,13 +116,13 @@
       </section>
       <section id="grafiktyp">
          <paragraph xml-lang="en-US" id="par_id3146337" role="paragraph" l10n="U" oldref="51">Choose <emph>Format - Image - Type</emph> tab</paragraph>
-         <paragraph xml-lang="en-US" id="par_id3149841" role="paragraph" l10n="U" oldref="124">Choose <emph>Format - Frame/Object - Type</emph> tab</paragraph><comment>UFI: removed some lines with Format-Object, see #i64150</comment>
+         <paragraph xml-lang="en-US" id="par_id3149841" role="paragraph">Choose <emph>Format - Frame and Object - Properties - Type</emph> tab</paragraph><comment>UFI: removed some lines with Format-Object, see #i64150</comment>
 <paragraph xml-lang="en-US" id="par_id3148856" role="paragraph">Choose <emph>View - Styles and Formatting -</emph> open context menu <emph>Modify/New - Type</emph> tab</paragraph>
          <paragraph xml-lang="en-US" id="par_id3147067" role="paragraph" l10n="U" oldref="55">Choose <emph>Insert - Frame - Type</emph> tab</paragraph>
       </section>
       <section id="grafikumlauf">
          <paragraph xml-lang="en-US" id="par_id3151082" role="paragraph" l10n="U" oldref="56">Choose <emph>Format - Image - Properties - Wrap</emph> tab</paragraph>
-         <paragraph xml-lang="en-US" id="par_id3148437" role="paragraph" l10n="U" oldref="125">Choose <emph>Format - Frame/Object - Properties - Wrap</emph> tab</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3148437" role="paragraph">Choose <emph>Format - Frame and Object - Properties - Wrap</emph> tab</paragraph>
          <paragraph xml-lang="en-US" id="par_id3150169" role="paragraph" l10n="U" oldref="60">Choose <emph>Insert - Frame - Wrap</emph> tab</paragraph>
          <paragraph xml-lang="en-US" id="par_id3153299" role="paragraph" l10n="U" oldref="61">Choose <emph>Format - Wrap - Edit - Wrap</emph> tab</paragraph>
       </section>
@@ -130,12 +130,12 @@
 </variable></paragraph>
       <section id="grahyper">
          <paragraph xml-lang="en-US" id="par_id3153984" role="paragraph" l10n="U" oldref="63">Choose <emph>Format - Image - Hyperlink</emph> tab</paragraph>
-         <paragraph xml-lang="en-US" id="par_id3156130" role="paragraph" l10n="U" oldref="126">Choose <emph>Format - Frame/Object - Hyperlink</emph> tab</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3156130" role="paragraph">Choose <emph>Format - Frame and Object - Properties - Hyperlink</emph> tab</paragraph>
          <paragraph xml-lang="en-US" id="par_id3145337" role="paragraph" l10n="U" oldref="64">Choose <emph>Insert - Frame - Hyperlink</emph> tab</paragraph>
       </section>
       <section id="grazusaetze">
          <paragraph xml-lang="en-US" id="par_id3154724" role="paragraph" l10n="U" oldref="65">Choose <emph>Format - Image - Options</emph> tab</paragraph>
-         <paragraph xml-lang="en-US" id="par_id3145636" role="paragraph" l10n="U" oldref="128">Choose <emph>Format - Frame and Object - Options</emph> tab</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3145636" role="paragraph">Choose <emph>Format - Frame and Object - Properties - Options</emph> tab</paragraph>
          <paragraph xml-lang="en-US" id="par_id3149774" role="paragraph">Choose <emph>View - Styles and Formatting -</emph> open context menu <emph>Modify/New - Options</emph> tab</paragraph>
          <paragraph xml-lang="en-US" id="par_id3150922" role="paragraph" l10n="U" oldref="69">Choose <emph>Insert - Frame - Options</emph> tab</paragraph>
       </section>
@@ -143,7 +143,7 @@
 </variable></paragraph>
       <section id="makrografik">
          <paragraph xml-lang="en-US" id="par_id3146938" role="paragraph" l10n="U" oldref="72">Choose <emph>Insert/Format - Image - Macro</emph> tab</paragraph>
-         <paragraph xml-lang="en-US" id="par_id3154323" role="paragraph" l10n="U" oldref="129">Choose <emph>Insert/Format - Frame/Object - Macro</emph> tab</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3154323" role="paragraph">Choose <emph>Format - Frame and Object - Properties - Macro</emph> tab</paragraph>
          <paragraph xml-lang="en-US" id="par_id3153238" role="paragraph">Choose <emph>Tools - AutoText - AutoText (button) - Macro</emph></paragraph>
          <paragraph xml-lang="en-US" id="par_id3148792" role="paragraph" l10n="U" oldref="148">Choose <emph>Edit - ImageMap -</emph> open context menu<emph> - Macro</emph>
 </paragraph>
@@ -374,7 +374,7 @@
          </section>
       </section>
       <section id="objektformat">
-         <paragraph xml-lang="en-US" id="par_id3156355" role="paragraph" l10n="CHG" oldref="117">Choose <emph>Format - Frame/Object</emph>
+         <paragraph xml-lang="en-US" id="par_id3156355" role="paragraph">Choose <emph>Format - Frame and Object - Properties</emph>
 </paragraph>
          <section id="syeigenschaftenobjekt">
             <table id="tbl_id3153367">
diff --git a/source/text/swriter/01/04130000.xhp b/source/text/swriter/01/04130000.xhp
index 4947707a43..3d08e03b2d 100644
--- a/source/text/swriter/01/04130000.xhp
+++ b/source/text/swriter/01/04130000.xhp
@@ -35,7 +35,7 @@
 <section id="howtoget">
 <embed href="text/swriter/00/00000404.xhp#rahmen"/>
 </section>
-<paragraph role="paragraph" id="par_id3153678" xml-lang="en-US" l10n="CHG" oldref="37">To edit a frame, click the border to select it, and then choose <emph>Format - Frame/Object</emph>. You can also resize or move a selected frame using special <link href="text/swriter/01/04130100.xhp" name="shortcut keys">shortcut keys</link>.</paragraph>
+<paragraph role="paragraph" id="par_id3153678" xml-lang="en-US">To edit a frame, click the border to select it, and then choose <emph>Format - Frame and Object - Properties</emph>. You can also resize or move a selected frame using special <link href="text/swriter/01/04130100.xhp" name="shortcut keys">shortcut keys</link>.</paragraph>
 <paragraph role="paragraph" id="par_id3152952" xml-lang="en-US" l10n="U" oldref="38">To delete a frame, click the border of the frame, and then press Delete.</paragraph>
 <paragraph role="paragraph" id="par_id3151311" xml-lang="en-US" l10n="U" oldref="23">If you see small red arrows at the beginning and the end of text in frame, use the arrow keys to scroll through the remaining text.</paragraph>
 <paragraph role="paragraph" id="par_id3155896" xml-lang="en-US" l10n="U" oldref="25">In the preview area of the <emph>Frame</emph> dialog, the frame is represented by a green rectangle, and the reference area by a red rectangle.</paragraph>
diff --git a/source/text/swriter/guide/nonprintable_text.xhp b/source/text/swriter/guide/nonprintable_text.xhp
index 71309e20a3..2bba083fce 100644
--- a/source/text/swriter/guide/nonprintable_text.xhp
+++ b/source/text/swriter/guide/nonprintable_text.xhp
@@ -41,7 +41,7 @@
             <paragraph xml-lang="en-US" id="par_id3150224" role="listitem" l10n="U" oldref="15">Enter text in the frame and if you want, resize the frame.</paragraph>
          </listitem>
          <listitem>
-            <paragraph xml-lang="en-US" id="par_id3150242" role="listitem" l10n="U" oldref="16">Choose <item type="menuitem">Format - Frame/Object</item>, and then click the <item type="menuitem">Options</item> tab.</paragraph>
+            <paragraph xml-lang="en-US" id="par_id3150242" role="listitem">Choose <item type="menuitem">Format - Frame and Object - Properties</item>, and then click the <item type="menuitem">Options</item> tab.</paragraph>
          </listitem>
          <listitem>
             <paragraph xml-lang="en-US" id="par_id3145227" role="listitem" l10n="U" oldref="17">In the <emph>Properties</emph> area, clear the <emph>Print</emph> check box.</paragraph>
diff --git a/source/text/swriter/guide/text_centervert.xhp b/source/text/swriter/guide/text_centervert.xhp
index 41ec84f28d..c7326c2e91 100644
--- a/source/text/swriter/guide/text_centervert.xhp
+++ b/source/text/swriter/guide/text_centervert.xhp
@@ -56,7 +56,7 @@
     <paragraph id="par_id3153410" role="listitem" xml-lang="en-US">Click <emph>OK</emph>.</paragraph>
   </listitem>
 </list>
-<paragraph id="par_id3149615" role="note" xml-lang="en-US">To hide the borders of the frame, select the frame, and then choose <item type="menuitem">Format - Frame/Object</item>. Click the <item type="menuitem">Borders</item> tab, and then click in the <item type="menuitem">Set No Border</item> box in the <item type="menuitem">Line Arrangement</item> area.</paragraph>
+<paragraph id="par_id3149615" role="note" xml-lang="en-US">To hide the borders of the frame, select the frame, and then choose <item type="menuitem">Format - Frame and Object - Properties</item>. Click the <item type="menuitem">Borders</item> tab, and then click in the <item type="menuitem">Set No Border</item> box in the <item type="menuitem">Line Arrangement</item> area.</paragraph>
 <paragraph id="par_id3145098" role="paragraph" xml-lang="en-US">To resize the frame, drag the edges of the frame.</paragraph>
 <embed href="text/shared/00/00000004.xhp#related"/>
 <embed href="text/swriter/guide/text_emphasize.xhp#text_emphasize"/>
diff --git a/source/text/swriter/guide/text_frame.xhp b/source/text/swriter/guide/text_frame.xhp
index be194506aa..2501bdd20b 100644
--- a/source/text/swriter/guide/text_frame.xhp
+++ b/source/text/swriter/guide/text_frame.xhp
@@ -71,7 +71,7 @@
             <paragraph xml-lang="en-US" id="par_id3154858" role="listitem" l10n="U" oldref="100">Select the text frame (you see the eight handles).</paragraph>
          </listitem>
          <listitem>
-            <paragraph xml-lang="en-US" id="par_id3155875" role="listitem" l10n="U" oldref="101">Choose <emph>Format - Frame/Object - Options</emph>.</paragraph>
+            <paragraph xml-lang="en-US" id="par_id3155875" role="listitem">Choose <emph>Format - Frame and Object - Properties - Options</emph>.</paragraph>
          </listitem>
          <listitem>
             <paragraph xml-lang="en-US" id="par_id3155899" role="listitem" l10n="U" oldref="102">In the <emph>Properties</emph> area, unmark the <emph>Print</emph> check box and click <emph>OK</emph>.</paragraph>
diff --git a/source/text/swriter/guide/wrap.xhp b/source/text/swriter/guide/wrap.xhp
index d6bfee85be..a81260620d 100644
--- a/source/text/swriter/guide/wrap.xhp
+++ b/source/text/swriter/guide/wrap.xhp
@@ -48,7 +48,7 @@
     <paragraph id="par_id3149696" role="listitem" xml-lang="en-US">Select the object.</paragraph>
   </listitem>
   <listitem>
-    <paragraph id="par_id3155907" role="listitem" xml-lang="en-US">Choose <emph>Format - Frame and Objects - Properties</emph>, and then click the <link href="text/swriter/01/05060200.xhp" name="Wrap"><emph>Wrap</emph></link> tab to choose the wrapping style that you want to apply.</paragraph>
+    <paragraph id="par_id3155907" role="listitem" xml-lang="en-US">Choose <emph>Format - Frame and Object - Properties</emph>, and then click the <link href="text/swriter/01/05060200.xhp" name="Wrap"><emph>Wrap</emph></link> tab to choose the wrapping style that you want to apply.</paragraph>
     <paragraph id="par_id3155859" role="listitem" xml-lang="en-US">The current wrapping style is indicated by a bullet.</paragraph>
   </listitem>
 </list>
@@ -60,7 +60,7 @@
     <paragraph id="par_id3154079" role="listitem" xml-lang="en-US">Select the object.</paragraph>
   </listitem>
   <listitem>
-    <paragraph id="par_id3153396" role="listitem" xml-lang="en-US">Choose <emph>Format - Image - Properties</emph>, and then click the <link href="text/swriter/01/05060200.xhp" name="Wrap"><emph>Wrap</emph></link> tab.</paragraph>
+    <paragraph id="par_id3153396" role="listitem" xml-lang="en-US">Choose <emph>Format - Frame and Object - Properties</emph>, and then click the <link href="text/swriter/01/05060200.xhp" name="Wrap"><emph>Wrap</emph></link> tab.</paragraph>
   </listitem>
 </list>