diff options
| author | Andras Timar <andras.timar@collabora.com> | 2015-09-26 00:41:45 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2015-09-26 00:41:45 +0200 |
| commit | 3883cc283851138242739930c16d761cf3de035d (patch) | |
| tree | 3e762df210e7df25cd26e81cba2ba239f604ec47 | |
| parent | ef700197b180a24cbe3e7092120a20dd4886dd3f (diff) | |
Set Master Password dialog: sync help with UI, fix hids
Change-Id: Ia9273cf2ff6db7329dd44e3e87bbd65788e07473
| -rw-r--r-- | source/text/shared/01/password_main.xhp | 14 | ||||
| -rw-r--r-- | source/text/shared/optionen/01030300.xhp | 5 |
2 files changed, 9 insertions, 10 deletions
diff --git a/source/text/shared/01/password_main.xhp b/source/text/shared/01/password_main.xhp index 7042429017..d08c0536aa 100644 --- a/source/text/shared/01/password_main.xhp +++ b/source/text/shared/01/password_main.xhp @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <helpdocument version="1.0"> - + <!-- * This file is part of the LibreOffice project. * @@ -18,19 +18,19 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> - - + + <meta> <topic id="textshared01password_mainxml" indexer="include" status="PUBLISH"> - <title xml-lang="en-US" id="tit">Enter Master Password</title> + <title xml-lang="en-US" id="tit">Set Master Password</title> <filename>/text/shared/01/password_main.xhp</filename> </topic> </meta> <body> <section id="password_main"> - <paragraph xml-lang="en-US" id="hd_id3154183" role="heading" level="1" l10n="U" oldref="1"><variable id="password_maintitle"><link href="text/shared/01/password_main.xhp" name="Enter Master Password">Enter Master Password</link> -</variable></paragraph> - <paragraph xml-lang="en-US" id="par_id3154841" role="paragraph" l10n="U" oldref="2"><ahelp hid="">Assign a master password to protect the access to a saved password.</ahelp></paragraph> + <bookmark xml-lang="en-US" branch="hid/uui/ui/setmasterpassworddlg/SetMasterPasswordDialog" id="bm_id098200904183274" localize="false"/> + <paragraph xml-lang="en-US" id="hd_id3154183" role="heading" level="1">Set Master Password</paragraph> + <paragraph xml-lang="en-US" id="par_id3154841" role="paragraph" l10n="U" oldref="2"><ahelp hid=".">Assign a master password to protect the access to a saved password.</ahelp></paragraph> <section id="password_text"> <paragraph xml-lang="en-US" id="par_id3146857" role="paragraph" l10n="CHG" oldref="3">You can save some passwords for the duration of a session, or permanently to a file protected by a master password.<comment> For example, passwords for accessing WebDAV or FTP servers are stored permanently if you enter a master password when prompted. Otherwise, they are only stored for the current session.</comment><comment>removed text see i71792</comment></paragraph> <paragraph xml-lang="en-US" id="par_id3147000" role="paragraph" l10n="U" oldref="6">You must enter the master password to access a file or service that is protected by a saved password. You only need to enter the master password once during a session.</paragraph> diff --git a/source/text/shared/optionen/01030300.xhp b/source/text/shared/optionen/01030300.xhp index d3cf8b36b4..f8fbde097f 100644 --- a/source/text/shared/optionen/01030300.xhp +++ b/source/text/shared/optionen/01030300.xhp @@ -70,9 +70,8 @@ <paragraph role="paragraph" id="par_id1909848" xml-lang="en-US" l10n="NEW"><ahelp hid=".">If enabled, %PRODUCTNAME will securely store all passwords that you use to access files from web servers. You can retrieve the passwords from the list after you enter the master password.</ahelp></paragraph> <bookmark xml-lang="en-US" branch="hid/cui/ui/optsecuritypage/masterpassword" id="bm_id9989013" localize="false"/><paragraph role="heading" id="hd_id3901791" xml-lang="en-US" level="3" l10n="NEW">Master Password</paragraph> <paragraph role="paragraph" id="par_id4571977" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens the Enter Master Password dialog.</ahelp></paragraph> -<bookmark xml-lang="en-US" branch="hid/cui/ui/setmasterpassworddlg/SetMasterPasswordDialog" id="bm_id9989014" localize="false"/> -<bookmark xml-lang="en-US" branch="hid/uui/ui/setmasterpassworddlg/password1" id="bm_id8224738" localize="false"/><paragraph role="paragraph" id="par_id5216223" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Enter the master password.</ahelp></paragraph> -<bookmark xml-lang="en-US" branch="hid/uui/ui/setmasterpassworddlg/password2" id="bm_id8702047" localize="false"/><paragraph role="paragraph" id="par_id7067171" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Enter the master password again.</ahelp></paragraph> +<paragraph role="paragraph" id="par_id5216223" xml-lang="en-US" l10n="NEW"><ahelp hid="uui/ui/setmasterpassworddlg/password1" visibility="hidden">Enter the master password.</ahelp></paragraph> +<paragraph role="paragraph" id="par_id7067171" xml-lang="en-US" l10n="NEW"><ahelp hid="uui/ui/setmasterpassworddlg/password2" visibility="hidden">Enter the master password again.</ahelp></paragraph> <bookmark xml-lang="en-US" branch="hid/uui/ui/masterpassworddlg/MasterPasswordDialog" id="bm_id2005981" localize="false"/><paragraph role="paragraph" id="par_id7499313" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Enter the master password to continue.</ahelp></paragraph> <bookmark xml-lang="en-US" branch="hid/cui/ui/optsecuritypage/connections" id="bm_id2005777" localize="false"/><paragraph role="heading" id="hd_id3283486" xml-lang="en-US" level="3" l10n="CHG">Connections</paragraph> <paragraph role="paragraph" id="par_id3472090" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Asks for the master password. If master password is correct, shows the Stored Web Connection Information dialog.</ahelp></paragraph> |