source/text/shared/01/01010303.xhp       |    3 ---
 source/text/shared/01/01010304.xhp       |    3 ---
 source/text/shared/optionen/01010100.xhp |    6 ++++++
 3 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 175750251cc83397e714586617681414316adf57
Author:     Bogdan B <buzea.bog...@libreoffice.org>
AuthorDate: Sat Nov 19 18:41:57 2022 +0100
Commit:     Olivier Hallot <olivier.hal...@libreoffice.org>
CommitDate: Mon Nov 21 20:50:52 2022 +0100

    tdf#152127 Change order for Country/State
    
    The country was not included into location in shared/optionen/01010100.xhp, 
just the state.
    It is possible that there are files where country need to be removed, being 
now included in shared/optionen/01010100.xhp. I will take care of that in the 
next commits, when I will found them.
    
    Change-Id: Ie7ac4deb9a7c0e1d3c4a03dda2e2b348a3aeb585
    Reviewed-on: https://gerrit.libreoffice.org/c/help/+/142923
    Tested-by: Jenkins
    Reviewed-by: Olivier Hallot <olivier.hal...@libreoffice.org>

diff --git a/source/text/shared/01/01010303.xhp 
b/source/text/shared/01/01010303.xhp
index 92262fcb50..36fa607f9f 100644
--- a/source/text/shared/01/01010303.xhp
+++ b/source/text/shared/01/01010303.xhp
@@ -46,9 +46,6 @@
 <paragraph role="heading" id="hd_id3150774" xml-lang="en-US" 
level="3">Initials 2</paragraph>
   <paragraph role="paragraph" id="par_id3151110" xml-lang="en-US"><ahelp 
hid="modules/swriter/ui/privateuserpage/shortname2">Enter the initials of the 
person, whom you want to use as a second contact.</ahelp></paragraph>
     <embed href="text/shared/optionen/01010100.xhp#location"/>
-<bookmark xml-lang="en-US" 
branch="hid/modules/swriter/ui/privateuserpage/country" id="bm_id3149955" 
localize="false"/>
-<paragraph role="heading" id="hd_id3153543" xml-lang="en-US" 
level="3">Country</paragraph>
-  <paragraph role="paragraph" id="par_id3150085" xml-lang="en-US"><ahelp 
hid="modules/swriter/ui/privateuserpage/country">Enter the name of the country 
in which you live.</ahelp></paragraph>
     <embed href="text/shared/optionen/01010100.xhp#title"/>
 <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/privateuserpage/job" 
id="bm_id3155504" localize="false"/>
 <paragraph role="heading" id="hd_id3155449" xml-lang="en-US" 
level="3">Profession</paragraph>
diff --git a/source/text/shared/01/01010304.xhp 
b/source/text/shared/01/01010304.xhp
index 2a01307ece..de1db7d56f 100644
--- a/source/text/shared/01/01010304.xhp
+++ b/source/text/shared/01/01010304.xhp
@@ -48,9 +48,6 @@
 <paragraph role="heading" id="hd_id3150771" xml-lang="en-US" 
level="3">Slogan</paragraph>
   <paragraph role="paragraph" id="par_id3156327" xml-lang="en-US"><ahelp 
hid="modules/swriter/ui/businessdatapage/slogan">Enter the slogan of your 
company.</ahelp></paragraph>
     <embed href="text/shared/optionen/01010100.xhp#location"/>
-<bookmark xml-lang="en-US" 
branch="hid/modules/swriter/ui/businessdatapage/state" id="bm_id3145416" 
localize="false"/>
-<paragraph role="heading" id="hd_id3153146" xml-lang="en-US" 
level="3">Country</paragraph>
-  <paragraph role="paragraph" id="par_id3155449" xml-lang="en-US"><ahelp 
hid="modules/swriter/ui/businessdatapage/state">Enter the name of the country 
where your business is located.</ahelp></paragraph>
     <embed href="text/shared/optionen/01010100.xhp#position"/>
 <bookmark xml-lang="en-US" 
branch="hid/modules/swriter/ui/businessdatapage/phone" id="bm_id3156152" 
localize="false"/>
 <paragraph role="heading" id="hd_id3154380" xml-lang="en-US" 
level="3">Phone</paragraph>
diff --git a/source/text/shared/optionen/01010100.xhp 
b/source/text/shared/optionen/01010100.xhp
index 35ed809b6a..63c5ea860b 100644
--- a/source/text/shared/optionen/01010100.xhp
+++ b/source/text/shared/optionen/01010100.xhp
@@ -92,6 +92,12 @@
 <bookmark xml-lang="en-US" branch="hid/cui/ui/optuserpage/city" 
id="bm_id3158409" localize="false"/>
 <paragraph role="heading" id="hd_id3154685" xml-lang="en-US" 
level="3">City</paragraph>
 <paragraph role="paragraph" id="par_id3149807" xml-lang="en-US"><ahelp 
hid=".">Type the city where you live.</ahelp></paragraph>
+<bookmark xml-lang="en-US" 
branch="hid/modules/swriter/ui/privateuserpage/country" id="bm_id3151384" 
localize="false"/>
+<bookmark xml-lang="en-US" 
branch="hid/modules/swriter/ui/businessdatapage/country" id="bm_id3149563" 
localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/optuserpage/country" 
id="bm_id3199768" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/optuserpage/country" 
id="bm_id3155198" localize="false"/>
+<paragraph role="heading" id="hd_id3181125" xml-lang="en-US" 
level="3">Country</paragraph>
+<paragraph role="paragraph" id="par_id3150441" xml-lang="en-US"><ahelp 
hid=".">Type your country.</ahelp></paragraph>
 <bookmark xml-lang="en-US" 
branch="hid/modules/swriter/ui/privateuserpage/state" id="bm_id3151383" 
localize="false"/>
 <bookmark xml-lang="en-US" 
branch="hid/modules/swriter/ui/businessdatapage/state" id="bm_id3149562" 
localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/cui/ui/optuserpage/state" 
id="bm_id3153768" localize="false"/>

Reply via email to