Merging upstream version 4:24.2.1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

5 files changed, 15 insertions, 14 deletions

diff --git a/helpcontent2/source/text/sbasic/shared/03/sf_database.xhp b/helpcontent2/source/text/sbasic/shared/03/sf_database.xhp
index 852fb6a0f4..b898e0549b 100644
--- a/helpcontent2/source/text/sbasic/shared/03/sf_database.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03/sf_database.xhp
@@ -68,10 +68,10 @@
     </tablerow>
     <tablerow>
       <tablecell>
-        <paragraph id="par_id681701441607725" role="tablecontent">NONE</paragraph>
+        <paragraph id="par_id681701441607725" localize="false" role="tablecontent">NONE</paragraph>
       </tablecell>
       <tablecell>
-        <paragraph id="par_id831701441607725" role="tablecontent">0</paragraph>
+        <paragraph id="par_id831701441607725" localize="false" role="tablecontent">0</paragraph>
       </tablecell>
       <tablecell>
         <paragraph id="par_id601701441607725" role="tablecontent">Transaction handling is disabled and the database is set to the default auto-commit mode.</paragraph>
@@ -79,10 +79,10 @@
     </tablerow>
     <tablerow>
       <tablecell>
-        <paragraph id="par_id681701441607147" role="tablecontent">READ_UNCOMMITTED</paragraph>
+        <paragraph id="par_id681701441607147" localize="false" role="tablecontent">READ_UNCOMMITTED</paragraph>
       </tablecell>
       <tablecell>
-        <paragraph id="par_id831701441607208" role="tablecontent">1</paragraph>
+        <paragraph id="par_id831701441607208" localize="false" role="tablecontent">1</paragraph>
       </tablecell>
       <tablecell>
         <paragraph id="par_id601701441607099" role="tablecontent">Dirty reads, non-repeatable reads and phantom reads can occur.</paragraph>
@@ -91,10 +91,10 @@
     </tablerow>
     <tablerow>
       <tablecell>
-        <paragraph id="par_id681701441607317" role="tablecontent">READ_COMMITTED</paragraph>
+        <paragraph id="par_id681701441607317" localize="false" role="tablecontent">READ_COMMITTED</paragraph>
       </tablecell>
       <tablecell>
-        <paragraph id="par_id831701441607714" role="tablecontent">2</paragraph>
+        <paragraph id="par_id831701441607714" localize="false" role="tablecontent">2</paragraph>
       </tablecell>
       <tablecell>
         <paragraph id="par_id601701441607012" role="tablecontent">Dirty reads are prevented, however non-repeatable reads and phantom reads can occur.</paragraph>
@@ -103,10 +103,10 @@
     </tablerow>
     <tablerow>
       <tablecell>
-        <paragraph id="par_id681701441607209" role="tablecontent">REPEATABLE_READ</paragraph>
+        <paragraph id="par_id681701441607209" localize="false" role="tablecontent">REPEATABLE_READ</paragraph>
       </tablecell>
       <tablecell>
-        <paragraph id="par_id831701441607103" role="tablecontent">4</paragraph>
+        <paragraph id="par_id831701441607103" localize="false" role="tablecontent">4</paragraph>
       </tablecell>
       <tablecell>
         <paragraph id="par_id601701441607300" role="tablecontent">Dirty reads and non-repeatable reads are prevented. However, phantom reads can occur.</paragraph>
@@ -115,10 +115,10 @@
     </tablerow>
     <tablerow>
       <tablecell>
-        <paragraph id="par_id681701441607060" role="tablecontent">SERIALIZABLE</paragraph>
+        <paragraph id="par_id681701441607060" localize="false" role="tablecontent">SERIALIZABLE</paragraph>
       </tablecell>
       <tablecell>
-        <paragraph id="par_id831701441607688" role="tablecontent">8</paragraph>
+        <paragraph id="par_id831701441607688" localize="false" role="tablecontent">8</paragraph>
       </tablecell>
       <tablecell>
         <paragraph id="par_id601701441607896" role="tablecontent">Dirty reads, non-repeatable reads and phantom reads are prevented.</paragraph>
diff --git a/helpcontent2/source/text/sbasic/shared/03/sf_intro.xhp b/helpcontent2/source/text/sbasic/shared/03/sf_intro.xhp
index dced4f25b9..02e8d5a864 100644
--- a/helpcontent2/source/text/sbasic/shared/03/sf_intro.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03/sf_intro.xhp
@@ -191,7 +191,7 @@
     </listitem>
   </list>
   <paragraph role="paragraph" id="par_id701689720782180">In this case, set the environment variable <literal>PYTHONPATH</literal> as follows before starting the Python interpreter:</paragraph>
-  <paragraph role="paragraph" id="par_id601689720825610"><input>export PYTHONPATH=/usr/lib/libreoffice/program:/usr/lib/python3/dist-packages</input></paragraph>
+  <paragraph role="paragraph" localize="false" id="par_id601689720825610"><input>export PYTHONPATH=/usr/lib/libreoffice/program:/usr/lib/python3/dist-packages</input></paragraph>
   <note id="par_id971689720909044">The location of these files will be different for each operating system and %PRODUCTNAME installation method.</note>
 
   <section id="relatedtopics">
diff --git a/helpcontent2/source/text/shared/01/graphic_size_check.xhp b/helpcontent2/source/text/shared/01/graphic_size_check.xhp
index 92020fcbcb..c864034f4b 100644
--- a/helpcontent2/source/text/shared/01/graphic_size_check.xhp
+++ b/helpcontent2/source/text/shared/01/graphic_size_check.xhp
@@ -17,6 +17,7 @@
 </meta>
 <body>
 <bookmark id="bm_id921692796683456" branch="hid/.uno:GraphicSizeCheck" localize="false"/>
+<bookmark id="bm_id671706616386428" branch="hid/svx/ui/genericcheckdialog/dialogButtons" localize="false"/>
 <bookmark branch="index" id="bm_id581692798594218">
     <bookmark_value>graphic size;check</bookmark_value>
     <bookmark_value>check;graphic size</bookmark_value>
diff --git a/helpcontent2/source/text/shared/06/youtubevideos.xhp b/helpcontent2/source/text/shared/06/youtubevideos.xhp
index fbd5e80785..d511f66160 100644
--- a/helpcontent2/source/text/shared/06/youtubevideos.xhp
+++ b/helpcontent2/source/text/shared/06/youtubevideos.xhp
@@ -11,13 +11,13 @@
 
 <meta>
   <topic id="embedyoutubevideo" indexer="exclude" status="PUBLISH">
-    <title id="tit" xml-lang="en-US">YouTube Videos</title>
+    <title id="tit">YouTube Videos</title>
     <filename>/text/shared/06/youtubevideos.xhp</filename>
   </topic>
 </meta>
 <body>
 <section id="whatisit">
-    <paragraph role="paragraph" id="par_ytvideosample" localize="false" xml-lang="en-US"><object data="" id="AB7TbrkCTSA" type="video/youtube" width="700" height="394"/>
+    <paragraph role="paragraph" id="par_ytvideosample" localize="false"><object data="" id="rs9pMn4cffs" type="video/youtube" width="700" height="394"/>
     </paragraph>
 </section>
 </body>
diff --git a/helpcontent2/source/text/swriter/guide/spellcheck_dialog.xhp b/helpcontent2/source/text/swriter/guide/spellcheck_dialog.xhp
index 0e61d3e40b..cb70371fbe 100644
--- a/helpcontent2/source/text/swriter/guide/spellcheck_dialog.xhp
+++ b/helpcontent2/source/text/swriter/guide/spellcheck_dialog.xhp
@@ -35,7 +35,7 @@
 
 <h1 id="hd_id3149684"><variable id="spellcheck_dialog"><link href="text/swriter/guide/spellcheck_dialog.xhp">Checking Spelling and Grammar</link></variable></h1>
 <paragraph id="par_id3149814" role="paragraph" xml-lang="en-US">You can manually check the spelling and grammar of a text selection or the entire document.</paragraph>
-<paragraph id="par_id0525200902184476" role="note" xml-lang="en-US">To check the spelling and the grammar of a text, the appropriate dictionaries must be installed. For many languages three different dictionaries exist: a spellchecker, a hyphenation dictionary, and a thesaurus. Each dictionary covers one language only. Grammar checkers can be downloaded and installed as extensions. See the <link href="https://extensions.libreoffice.org/extension-center?getCategories=Dictionary">extensions web page</link>.</paragraph>
+<paragraph id="par_id0525200902184476" role="note" xml-lang="en-US">To check the spelling and the grammar of a text, the appropriate dictionaries must be installed. For many languages three different dictionaries exist: a spellchecker, a hyphenation dictionary, and a thesaurus. Each dictionary covers one language only. Grammar checkers can be downloaded and installed as extensions. See the <link href="https://extensions.libreoffice.org/?Tags[]=50">extensions web page</link>.</paragraph>
 <paragraph id="par_id3149828" role="paragraph" xml-lang="en-US">The spellcheck starts at the current cursor position, or at the beginning of the text selection.</paragraph>
 
 <list type="ordered">