helpers/help_hid.lst                        |    4 ----
 source/text/shared/optionen/testaccount.xhp |    8 ++++----
 2 files changed, 4 insertions(+), 8 deletions(-)

New commits:
commit eaba957aa0802cafccf0988bc1cb5ac30ddd921f
Author: Caolán McNamara <caol...@redhat.com>
Date:   Thu Sep 19 10:00:31 2013 +0100

    update help ids for test email settings .ui conversion
    
    Change-Id: I676cd4cb3f909d214bafe95bbf4c78c6795a3828

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index a00e5e0..dd4b528 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -2427,8 +2427,6 @@ HID_MM_SENDMAILS,54983,
 HID_MM_SENDMAILS_STATUSLB,54984,
 HID_MM_SENDWARNING,54992,
 HID_MM_TESTACCOUNTSETTINGS,54979,
-HID_MM_TESTACCOUNTSETTINGS_HB,54981,
-HID_MM_TESTACCOUNTSETTINGS_TLB,54980,
 HID_MNU_FUNC_AVG,34036,
 HID_MNU_FUNC_COUNT,34038,
 HID_MNU_FUNC_COUNT2,34037,
@@ -7349,7 +7347,6 @@ sw_ModalDialog_DLG_DBSELECTION,1435009024,
 sw_ModalDialog_DLG_MAILMERGEWIZARD,1435058176,
 
sw_MultiLineEdit_DLG_MAILMERGECHILD_TB_BACK_DLG_MM_SENDWARNING_ED_DETAILS,1972357645,
 sw_MultiLineEdit_DLG_MM_MAILBODY_MLE_BODY,1435404831,
-sw_MultiLineEdit_DLG_MM_TESTACCOUNTSETTINGS_ED_ERROR,1427130914,
 sw_MultiLineEdit_TP_LAB_LAB_EDT_WRITING,909691395,
 sw_NumericField_DLG_MAILMERGE_NF_FROM,1446615045,
 sw_NumericField_DLG_MAILMERGE_NF_TO,1446615047,
@@ -7409,7 +7406,6 @@ sw_PushButton_DLG_MM_PREPAREMERGE_PAGE_PB_LAST,898273799,
 sw_PushButton_DLG_MM_PREPAREMERGE_PAGE_PB_NEXT,898273798,
 sw_PushButton_DLG_MM_PREPAREMERGE_PAGE_PB_PREV,898273796,
 sw_PushButton_DLG_MM_SELECTDBTABLEDDIALOG_PB_PREVIEW,1435210243,
-sw_PushButton_DLG_MM_TESTACCOUNTSETTINGS_PB_STOP,1427132964,
 sw_PushButton_DLG_PAGEPREVIEW_PRINTOPTIONS_PB_STANDARD,1411289624,
 sw_PushButton_DLG_SYNC_BTN_BTN_SYNC,1983500820,
 sw_PushButton_TP_OPTCOMPATIBILITY_PAGE_PB_DEFAULT,879350288,
diff --git a/source/text/shared/optionen/testaccount.xhp 
b/source/text/shared/optionen/testaccount.xhp
index d37ac03..e957d83 100644
--- a/source/text/shared/optionen/testaccount.xhp
+++ b/source/text/shared/optionen/testaccount.xhp
@@ -27,15 +27,15 @@
 </topic>
 </meta>
 <body>
+<bookmark xml-lang="en-US" 
branch="hid/modules/swriter/ui/testmailsettings/TestMailSettings" 
id="bm_id3895380" localize="false"/>
 <paragraph role="heading" id="par_idN10547" xml-lang="en-US" level="1" 
l10n="NEW"><link href="text/shared/optionen/testaccount.xhp">Test Account 
Settings</link></paragraph>
 <paragraph role="paragraph" id="par_idN10557" xml-lang="en-US" l10n="NEW">When 
you enter settings on the <switchinline select="sys"><caseinline 
select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - 
Options</defaultinline></switchinline> - <link 
href="text/shared/optionen/mailmerge.xhp">%PRODUCTNAME Writer - Mail Merge 
E-mail</link> tab page, you can click the <emph>Test Settings</emph> button to 
test your settings.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_HID_MM_TESTACCOUNTSETTINGS_TLB" 
id="bm_id6709494" localize="false"/>
 <paragraph role="heading" id="par_idN10574" xml-lang="en-US" level="2" 
l10n="NEW">(Results list box)</paragraph>
-<paragraph role="paragraph" id="par_idN10578" xml-lang="en-US" 
l10n="NEW"><ahelp hid=".">In the top list box you will see the results of the 
test session.</ahelp></paragraph>
-<bookmark xml-lang="en-US" 
branch="hid/sw:MultiLineEdit:DLG_MM_TESTACCOUNTSETTINGS:ED_ERROR" 
id="bm_id3895382" localize="false"/>
+<paragraph role="paragraph" id="par_idN10578" xml-lang="en-US" l10n="NEW">In 
the top list box you will see the results of the test session.</paragraph>
+<bookmark xml-lang="en-US" 
branch="hid/modules/swriter/ui/testmailsettings/errors" id="bm_id3895382" 
localize="false"/>
 <paragraph role="heading" id="par_idN1058F" xml-lang="en-US" level="2" 
l10n="NEW">Errors</paragraph>
 <paragraph role="paragraph" id="par_idN10593" xml-lang="en-US" 
l10n="NEW"><ahelp hid=".">In the Errors list box you can read an explanation of 
any errors encountered while testing the settings.</ahelp></paragraph>
-<bookmark xml-lang="en-US" 
branch="hid/sw:PushButton:DLG_MM_TESTACCOUNTSETTINGS:PB_STOP" id="bm_id9591051" 
localize="false"/>
+<bookmark xml-lang="en-US" 
branch="hid/modules/swriter/ui/testmailsettings/stop" id="bm_id9591051" 
localize="false"/>
 <paragraph role="heading" id="par_idN105AA" xml-lang="en-US" level="2" 
l10n="NEW">Stop</paragraph>
 <paragraph role="paragraph" id="par_idN105AE" xml-lang="en-US" 
l10n="NEW"><ahelp hid=".">Click the <emph>Stop</emph> button to stop a test 
session manually.</ahelp></paragraph>
 </body>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Reply via email to