tdf#116078 OpenPGP encryption

+ some update (drop) references to LO file picker

Addressed comments by reviewer.
fix ordered list

Fixed reviewer comment.
Fixed DTD violations

Change-Id: Ie71f736a5713b042e185e93e595b6880ffe7541c
Reviewed-on: https://gerrit.libreoffice.org/64436
Tested-by: Jenkins
Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>

2 files changed, 16 insertions, 10 deletions

diff --git a/source/text/shared/optionen/01010100.xhp b/source/text/shared/optionen/01010100.xhp
index 92d395224f..1929d265f8 100644
--- a/source/text/shared/optionen/01010100.xhp
+++ b/source/text/shared/optionen/01010100.xhp
@@ -131,5 +131,21 @@
 <paragraph role="heading" id="hd_id3150592" xml-lang="en-US" level="3">E-mail</paragraph>
 <paragraph role="paragraph" id="par_id3154942" xml-lang="en-US"><ahelp hid=".">Type your e-mail address.</ahelp> For example, my.name@my.provider.com</paragraph>
 </section>
+<h2 id="hd_id61543592770503">Cryptography</h2>
+<section id="cryptointro">
+<paragraph role="paragraph" id="par_id311543858573650">Set the preferred public key for OpenPGP encryption and digital signature. These preferred keys will be pre-selected in key selection dialog every time you sign or encrypt a document, so you don't have to select it yourself when signing with one specific key frequently.</paragraph>
+</section>
+<section id="opengpg">
+    <bookmark xml-lang="en-US" branch="hid/cui/ui/optuserpage/signingkey" id="bm_id681543700758015" localize="false"/>
+    <h3 id="hd_id231543592828796">OpenPGP signing key</h3>
+    <paragraph role="paragraph" id="par_id641543592980979" xml-lang="en-US">Select your OpenPGP key from the drop-down list for signing ODF documents.</paragraph>
+    <bookmark xml-lang="en-US" branch="hid/cui/ui/optuserpage/encryptionkey" id="bm_id401543700791227" localize="false"/>
+    <h3 id="hd_id241543592833855">OpenPGP encryption key</h3>
+    <paragraph role="paragraph" id="par_id41543592987773" xml-lang="en-US">Select your OpenPGP key from the drop-down list for encrypting ODF documents.</paragraph>
+    <bookmark xml-lang="en-US" branch="hid/cui/ui/optuserpage/encrypttoself:wrap" id="bm_id291543701243669" localize="false"/>
+    <h3 id="hd_id191543593080405">When encrypting documents, always encrypt to self</h3>
+    <paragraph role="paragraph" id="par_id721543594922942" xml-lang="en-US">Mark this checkbox to also encrypt the file with your public key, so you can open the document with your private key.</paragraph>
+    <warning id="par_id851543858754421"><emph>Keep this option selected</emph>, if you ever want to be able to decrypt documents you've encrypted for other people.</warning>
+</section>
 </body>
 </helpdocument>
diff --git a/source/text/shared/optionen/01010600.xhp b/source/text/shared/optionen/01010600.xhp
index af0028c5b3..771d31f749 100644
--- a/source/text/shared/optionen/01010600.xhp
+++ b/source/text/shared/optionen/01010600.xhp
@@ -46,16 +46,6 @@
 <bookmark xml-lang="en-US" branch="hid/cui/ui/optgeneralpage/exthelp" id="bm_id1425519" localize="false"/>
 <paragraph xml-lang="en-US" id="par_idN106F6" role="heading" level="3">Extended tips</paragraph>
       <paragraph xml-lang="en-US" id="par_idN106FA" role="paragraph"><ahelp hid=".">Displays a help text when you rest the cursor on an icon, a menu command, or a control on a dialog.</ahelp></paragraph>
-      <paragraph xml-lang="en-US" id="hd_id3152577" role="heading" level="2">Open/Save dialogs<comment>UFI: see spec doc "Gnome file selector"</comment></paragraph>
-<bookmark xml-lang="en-US" branch="hid/cui/ui/optgeneralpage/filedlg" id="bm_id7715994" localize="false"/>
-<paragraph xml-lang="en-US" id="hd_id3145366" role="heading" level="3">Use $[officename] dialogs</paragraph>
-      <paragraph xml-lang="en-US" id="par_id3149260" role="paragraph"><ahelp hid="cui/ui/optgeneralpage/filedlg">Specifies whether $[officename] dialogs are used to open and save documents. Otherwise the dialogs of the operating system are used.</ahelp></paragraph>
-<switch select="sys">
-<case select="WIN">
-<paragraph xml-lang="en-US" id="par_idN10856" role="warning">When you open a file by an URL from the Windows file dialog, Windows will open a local copy of the file, located in the Internet Explorer cache. The %PRODUCTNAME file dialog opens the remote file.</paragraph>
-</case>
-</switch>
-<paragraph xml-lang="en-US" id="par_id3153138" role="paragraph">The $[officename] dialogs for <link href="text/shared/01/01020000.xhp" name="opening">opening</link> and <link href="text/shared/01/01070000.xhp" name="saving">saving</link> documents are described in $[officename] Help. </paragraph>
       <paragraph xml-lang="en-US" id="hd_id3148617" role="heading" level="2">Document status</paragraph>
 <bookmark xml-lang="en-US" branch="hid/cui/ui/optgeneralpage/docstatus" id="bm_id3986632" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id3149299" role="heading" level="3">Printing sets "document modified" status</paragraph>