[Libreoffice-commits] help.git: 2 commits - helpers/help_hid.lst source/text

Caolán McNamara caolanm at redhat.com
Fri Feb 15 02:39:05 PST 2013 

 helpers/help_hid.lst                     |   11 -----------
 source/text/shared/optionen/01030300.xhp |   21 +++++++++++----------
 2 files changed, 11 insertions(+), 21 deletions(-)

New commits:
commit a321504f9f0d89b463e259a02a2ae7f663522edc
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Feb 15 10:21:35 2013 +0000

    update help ids for set master password dialog
    
    Change-Id: Ie1fc7731c19b2055b11ba1785ca15c76c22cee9a

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index 71ac949..26f9123 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -1471,7 +1471,6 @@ HID_DLG_FLDEDT_PREV,53060,
 HID_DLG_GLOSS_DECIDE,52976,
 HID_DLG_LOGIN,35838,
 HID_DLG_MAPPING,34842,
-HID_DLG_MASTERPASSWORD_CRT,35841,
 HID_DLG_NAME,33818,
 HID_DLG_NEWERVERSIONWARNING,35848,
 HID_DLG_NEW_USER_IDX,54858,
@@ -9301,8 +9300,6 @@ uui_Edit_DLG_UUI_LOGIN_ED_LOGIN_ACCOUNT,1311344671,
 uui_Edit_DLG_UUI_LOGIN_ED_LOGIN_PASSWORD,1311344669,
 uui_Edit_DLG_UUI_LOGIN_ED_LOGIN_PATH,1311344662,
 uui_Edit_DLG_UUI_LOGIN_ED_LOGIN_USERNAME,1311344666,
-uui_Edit_DLG_UUI_MASTERPASSWORD_CRT_ED_MASTERPASSWORD_CRT,1311655957,
-uui_Edit_DLG_UUI_MASTERPASSWORD_CRT_ED_MASTERPASSWORD_REPEAT,1311655959,
 uui_Edit_DLG_UUI_MASTERPASSWORD_ED_MASTERPASSWORD,1311508501,
 uui_Edit_DLG_UUI_PASSWORD_CRT_ED_PASSWORD_CRT,1311688706,
 uui_Edit_DLG_UUI_PASSWORD_CRT_ED_PASSWORD_REPEAT,1311688709,
diff --git a/source/text/shared/optionen/01030300.xhp b/source/text/shared/optionen/01030300.xhp
index eb7cca3..b072eb2 100644
--- a/source/text/shared/optionen/01030300.xhp
+++ b/source/text/shared/optionen/01030300.xhp
@@ -70,8 +70,9 @@
 <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/uui:Edit:DLG_UUI_MASTERPASSWORD_CRT:ED_MASTERPASSWORD_CRT" 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:Edit:DLG_UUI_MASTERPASSWORD_CRT:ED_MASTERPASSWORD_REPEAT" 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>
+<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>
 <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>
commit 648d33998856bc21fbe622ad239e6f1edbce6197
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Feb 15 10:01:08 2013 +0000

    update help ids for security options dialog
    
    Change-Id: Ife9efaca68ed3e739465b3a577ed8bec5c35e0b3

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index 58e70b2..71ac949 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -1497,7 +1497,6 @@ HID_DLG_REL_NO_CASC_UPD,38988,
 HID_DLG_RENAME,39005,
 HID_DLG_ROWHEIGHT,38836,
 HID_DLG_SAVE_AS,38845,
-HID_DLG_SECURITY_OPTIONS,39896,
 HID_DLG_SSLWARN_UUI,35846,
 HID_DLG_TEXT,38843,
 HID_DLG_UNKNOWNAUTH_UUI,35845,
@@ -7582,13 +7581,6 @@ svx_CheckBox_RID_SVXDLG_SEARCH_CB_REGEXP,2311652395,
 svx_CheckBox_RID_SVXDLG_SEARCH_CB_SELECTIONS,2311652393,
 svx_CheckBox_RID_SVXDLG_SEARCH_CB_SIMILARITY,2311652396,
 svx_CheckBox_RID_SVXDLG_SEARCH_CB_WHOLE_WORDS,2311652378,
-svx_CheckBox_RID_SVXDLG_SECURITY_OPTIONS_CB_CREATEPDF,1242498067,
-svx_CheckBox_RID_SVXDLG_SECURITY_OPTIONS_CB_CTRLHYPERLINK,1242498074,
-svx_CheckBox_RID_SVXDLG_SECURITY_OPTIONS_CB_PRINTDOCS,1242498065,
-svx_CheckBox_RID_SVXDLG_SECURITY_OPTIONS_CB_RECOMMENDPWD,1242498072,
-svx_CheckBox_RID_SVXDLG_SECURITY_OPTIONS_CB_REMOVEINFO,1242498070,
-svx_CheckBox_RID_SVXDLG_SECURITY_OPTIONS_CB_SAVESENDDOCS,1242498061,
-svx_CheckBox_RID_SVXDLG_SECURITY_OPTIONS_CB_SIGNDOCS,1242498063,
 svx_CheckBox_RID_SVXDLG_SPELLCHECK_CB_CHECK_GRAMMAR,2311849014,
 svx_CheckBox_RID_SVXPAGE_ALIGN_PARAGRAPH_CB_EXPAND,703775795,
 svx_CheckBox_RID_SVXPAGE_ALIGN_PARAGRAPH_CB_SNAP,703775782,
diff --git a/source/text/shared/optionen/01030300.xhp b/source/text/shared/optionen/01030300.xhp
index 81f7b79..eb7cca3 100644
--- a/source/text/shared/optionen/01030300.xhp
+++ b/source/text/shared/optionen/01030300.xhp
@@ -43,26 +43,26 @@
 </section>
 <bookmark xml-lang="en-US" branch="hid/cui/ui/optsecuritypage/options" id="bm_id9049653" localize="false"/><paragraph role="heading" id="par_idN10640" xml-lang="en-US" level="2" l10n="CHG">Options</paragraph>
 <paragraph role="paragraph" id="par_idN10644" xml-lang="en-US" l10n="CHG"><ahelp hid=".">Opens the "Security options and warning" dialog.</ahelp></paragraph>
-<paragraph role="paragraph" id="par_id5616626" xml-lang="en-US" l10n="NEW">The Security options and warnings dialog contains the following controls:</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/securityoptionsdialog/SecurityOptionsDialog" id="bm_id1976684" localize="false"/><paragraph role="paragraph" id="par_id5616626" xml-lang="en-US" l10n="NEW">The Security options and warnings dialog contains the following controls:</paragraph>
 
-<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVXDLG_SECURITY_OPTIONS:CB_SAVESENDDOCS" id="bm_id1976683" localize="false"/><paragraph role="heading" id="par_idN10647" xml-lang="en-US" level="3" l10n="NEW">When saving or sending</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/securityoptionsdialog/savesenddocs" id="bm_id1976683" localize="false"/><paragraph role="heading" id="par_idN10647" xml-lang="en-US" level="3" l10n="NEW">When saving or sending</paragraph>
 <paragraph role="paragraph" id="par_idN1064B" xml-lang="en-US" l10n="NEW"><ahelp hid="703988739">Select to see a warning dialog when you try to save or send a document that contains recorded changes, versions, or comments.</ahelp></paragraph>
 
-<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVXDLG_SECURITY_OPTIONS:CB_PRINTDOCS" id="bm_id43946" localize="false"/><paragraph role="heading" id="par_idN1064E" xml-lang="en-US" level="3" l10n="NEW">When printing</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/securityoptionsdialog/whenprinting" id="bm_id43946" localize="false"/><paragraph role="heading" id="par_idN1064E" xml-lang="en-US" level="3" l10n="NEW">When printing</paragraph>
 <paragraph role="paragraph" id="par_idN10652" xml-lang="en-US" l10n="NEW"><ahelp hid="703988740">Select to see a warning dialog when you try to print a document that contains recorded changes or comments.</ahelp></paragraph>
 
-<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVXDLG_SECURITY_OPTIONS:CB_SIGNDOCS" id="bm_id6449171" localize="false"/><paragraph role="heading" id="par_idN10655" xml-lang="en-US" level="3" l10n="NEW">When signing</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/securityoptionsdialog/whensigning" id="bm_id6449171" localize="false"/><paragraph role="heading" id="par_idN10655" xml-lang="en-US" level="3" l10n="NEW">When signing</paragraph>
 <paragraph role="paragraph" id="par_idN10659" xml-lang="en-US" l10n="NEW"><ahelp hid="703988741">Select to see a warning dialog when you try to sign a document that contains recorded changes, versions, fields, references to other sources (for example linked sections or linked pictures), or comments.</ahelp></paragraph>
 
-<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVXDLG_SECURITY_OPTIONS:CB_CREATEPDF" id="bm_id7101046" localize="false"/><paragraph role="heading" id="par_idN1065C" xml-lang="en-US" level="3" l10n="NEW">When creating PDF files</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/securityoptionsdialog/whenpdf" id="bm_id7101046" localize="false"/><paragraph role="heading" id="par_idN1065C" xml-lang="en-US" level="3" l10n="NEW">When creating PDF files</paragraph>
 <paragraph role="paragraph" id="par_idN10660" xml-lang="en-US" l10n="NEW"><ahelp hid="703988742">Select to see a warning dialog when you try to export a document to PDF format that displays recorded changes in Writer, or that displays comments.</ahelp></paragraph>
 
-<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVXDLG_SECURITY_OPTIONS:CB_REMOVEINFO" id="bm_id4263740" localize="false"/><paragraph role="heading" id="par_idN10663" xml-lang="en-US" level="3" l10n="NEW">Remove personal information on saving</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/securityoptionsdialog/removepersonal" id="bm_id4263740" localize="false"/><paragraph role="heading" id="par_idN10663" xml-lang="en-US" level="3" l10n="NEW">Remove personal information on saving</paragraph>
 <paragraph role="paragraph" id="par_idN10667" xml-lang="en-US" l10n="CHG"><ahelp hid="703988743">Select to always remove user data from the file properties. If this option is not selected, you can still remove the personal information for the current document with the <emph>Reset</emph> button on <emph>File - Properties - General</emph>.</ahelp></paragraph>
 
-<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVXDLG_SECURITY_OPTIONS:CB_RECOMMENDPWD" id="bm_id7186498" localize="false"/><paragraph role="heading" id="par_idN1067C" xml-lang="en-US" level="3" l10n="NEW">Recommend password protection on saving</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/securityoptionsdialog/password" id="bm_id7186498" localize="false"/><paragraph role="heading" id="par_idN1067C" xml-lang="en-US" level="3" l10n="NEW">Recommend password protection on saving</paragraph>
 <paragraph role="paragraph" id="par_idN10680" xml-lang="en-US" l10n="CHG"><ahelp hid="703988744">Select to always enable the <emph>Save with password</emph> option in the file save dialogs. Deselect the option to save files by default without password.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVXDLG_SECURITY_OPTIONS:CB_CTRLHYPERLINK" id="bm_id5288857" localize="false"/><paragraph role="heading" id="hd_id1972106" xml-lang="en-US" level="3" l10n="NEW">Ctrl-click required to follow hyperlinks</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/securityoptionsdialog/ctrlclick" id="bm_id5288857" localize="false"/><paragraph role="heading" id="hd_id1972106" xml-lang="en-US" level="3" l10n="NEW">Ctrl-click required to follow hyperlinks</paragraph>
 <paragraph role="paragraph" id="par_id79042" xml-lang="en-US" l10n="NEW"><ahelp hid=".">If enabled, you must hold down the Ctrl key while clicking a hyperlink to follow that link. If not enabled, a click opens the hyperlink.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id4076357" xml-lang="en-US" level="2" l10n="NEW">Passwords for web connections</paragraph>
 <paragraph role="paragraph" id="par_id8231757" xml-lang="en-US" l10n="NEW">You can enter a master password to enable easy access to sites that require a user name and password.</paragraph>

More information about the Libreoffice-commits mailing list