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

Caolán McNamara caolanm at redhat.com
Thu Mar 6 08:35:52 PST 2014


 helpers/help_hid.lst                    |    4 ----
 source/text/shared/01/password_dlg.xhp  |    8 ++++----
 source/text/shared/01/password_main.xhp |    9 +++------
 3 files changed, 7 insertions(+), 14 deletions(-)

New commits:
commit 70414f0a347073ad19f0fa6b73b5ff0573fd45cf
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Mar 6 15:37:55 2014 +0000

    update helpids for open password dialog .ui conversion
    
    Change-Id: Ia04bf7951a1b0ec71bee37d92912eec179843283

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index 592a65c..441c098 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -1434,7 +1434,6 @@ HID_DLG_NAME,33818,
 HID_DLG_NEWERVERSIONWARNING,35848,
 HID_DLG_PASSWD_SECTION,53440,
 HID_DLG_PASSWORD,38964,
-HID_DLG_PASSWORD_UUI,35843,
 HID_DLG_QRY_HELPTEXT,38860,
 HID_DLG_QRY_JOIN,38855,
 HID_DLG_QRY_JOINTYPE,38856,
@@ -6720,9 +6719,6 @@ 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_ED_MASTERPASSWORD,1311508501,
-uui_Edit_DLG_UUI_PASSWORD_CRT_ED_PASSWORD_CRT,1311688706,
-uui_Edit_DLG_UUI_PASSWORD_CRT_ED_PASSWORD_REPEAT,1311688709,
-uui_Edit_DLG_UUI_PASSWORD_ED_PASSWORD,1311672322,
 uui_ListBox_DLG_FILTER_SELECT_LB_FILTERS,1311477279,
 uui_PushButton_DLG_COOKIES_BTN_COOKIES_CANCEL,1311363614,
 uui_PushButton_DLG_COOKIES_BTN_COOKIES_OK,1311363615,
diff --git a/source/text/shared/01/password_dlg.xhp b/source/text/shared/01/password_dlg.xhp
index f5d47dd..6151689 100644
--- a/source/text/shared/01/password_dlg.xhp
+++ b/source/text/shared/01/password_dlg.xhp
@@ -41,16 +41,16 @@
 <bookmark xml-lang="en-US" branch="hid/sfx/ui/password/pass1ed" id="bm_id3152878" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/sfx/ui/password/pass2ed" id="bm_id3152879" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/SC_HID_PASSWD_TABLE" id="bm_id3154044" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/uui:Edit:DLG_UUI_PASSWORD:ED_PASSWORD" id="bm_id3154099" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/uui/ui/password/newpassEntry" id="bm_id3154099" localize="false"/>
 
-<bookmark xml-lang="en-US" branch="hid/uui:Edit:DLG_UUI_PASSWORD_CRT:ED_PASSWORD_CRT" id="bm_id0928200904183274" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/uui/ui/masterpassworddlg/password" id="bm_id0928200904183274" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id3146857" role="heading" level="2" l10n="U"
                     oldref="65">Password</paragraph>
          <paragraph xml-lang="en-US" id="par_id3150502" role="paragraph" l10n="CHG" oldref="62"><ahelp hid="HID_PASSWD_TABLE">Type a password. A password is case sensitive.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/sfx/ui/password/confirm1ed" id="bm_id3149496" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/sfx/ui/password/confirm2ed" id="bm_id3149497" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/SC_HID_PASSWD_DOC" id="bm_id3154863" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/uui:Edit:DLG_UUI_PASSWORD_CRT:ED_PASSWORD_REPEAT" id="bm_id0928200904190676" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/uui/ui/password/confirmpassEntry" id="bm_id0928200904190676" localize="false"/>
 
 <paragraph xml-lang="en-US" id="hd_id3153029" role="heading" level="2" l10n="U"
                     oldref="66">Confirm</paragraph>
diff --git a/source/text/shared/01/password_main.xhp b/source/text/shared/01/password_main.xhp
index 85c48a1..7042429 100644
--- a/source/text/shared/01/password_main.xhp
+++ b/source/text/shared/01/password_main.xhp
@@ -52,16 +52,13 @@
                </listitem>
             </list>
          </section>
-<!-- removed HID UUI_EDIT_DLG_UUI_PASSWORD_CRT_ED_MASTERPASSWORD_CRT -->
-<!-- removed HID UUI_EDIT_DLG_UUI_PASSWORD_ED_MASTERPASSWORD -->
 <paragraph xml-lang="en-US" id="hd_id3147588" role="heading" level="2" l10n="U" oldref="7">Master password</paragraph>
-         <paragraph xml-lang="en-US" id="par_id3148731" role="paragraph" l10n="U" oldref="8"><ahelp hid="UUI_EDIT_DLG_UUI_PASSWORD_ED_MASTERPASSWORD">Type a master password to prevent unauthorized users from accessing stored passwords.</ahelp></paragraph>
-<!-- removed HID UUI_EDIT_DLG_UUI_PASSWORD_CRT_ED_MASTERPASSWORD_REPEAT -->
+         <paragraph xml-lang="en-US" id="par_id3148731" role="paragraph" l10n="U" oldref="8"><ahelp hid="uui/ui/setmasterpassworddlg/password1">Type a master password to prevent unauthorized users from accessing stored passwords.</ahelp></paragraph>
 <paragraph xml-lang="en-US" id="hd_id3144436" role="heading" level="2" l10n="U" oldref="9">Confirm master password</paragraph>
-         <paragraph xml-lang="en-US" id="par_id3145129" role="paragraph" l10n="U" oldref="10"><ahelp hid="UUI_EDIT_DLG_UUI_PASSWORD_CRT_ED_MASTERPASSWORD_REPEAT">Re-enter the master password.</ahelp></paragraph>
+         <paragraph xml-lang="en-US" id="par_id3145129" role="paragraph" l10n="U" oldref="10"><ahelp hid="uui/ui/setmasterpassworddlg/password2">Re-enter the master password.</ahelp></paragraph>
       </section>
       <section id="relatedtopics">
          <embed href="text/shared/guide/protection.xhp#protection"/>
       </section>
    </body>
-</helpdocument>
\ No newline at end of file
+</helpdocument>
commit b4f6cd5e44fc4ec8b2ade32605874d944ec0b003
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Mar 6 14:42:14 2014 +0000

    update help ids for password dialog .ui conversion
    
    Change-Id: I6cf027d748605b57c2c8997334902ea21c5d6ae3

diff --git a/source/text/shared/01/password_dlg.xhp b/source/text/shared/01/password_dlg.xhp
index 474c576..f5d47dd 100644
--- a/source/text/shared/01/password_dlg.xhp
+++ b/source/text/shared/01/password_dlg.xhp
@@ -58,7 +58,7 @@
          <paragraph xml-lang="en-US" id="hd_id3155351" role="heading" level="2" l10n="U"
                     oldref="68">Undoing password protection</paragraph>
          <paragraph xml-lang="en-US" id="par_id3146109" role="paragraph" l10n="CHG" oldref="69">To remove a password, open the document, then save without password.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_DLG_PASSWORD_TO_OPEN_MODIFY_MORE" id="bm_id09233676" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/password/expander" id="bm_id09233676" localize="false"/>
          <paragraph xml-lang="en-US" id="par_id31323250502" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Click to show or hide the file sharing password options.</ahelp></paragraph>
 
 


More information about the Libreoffice-commits mailing list