helpers/help_hid.lst                      |   10 ----------
 source/text/shared/01/extensionupdate.xhp |    8 ++++----
 2 files changed, 4 insertions(+), 14 deletions(-)

New commits:
commit 2ef15cb93840390d9927f64bddb958ad699cb792
Author: Caolán McNamara <caol...@redhat.com>
Date:   Wed May 21 13:53:15 2014 +0100

    update help ids for update extensions .ui conversion
    
    Change-Id: If0ffb1b7eaebd8fc30f66e26c1170708b72c495a

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index 2aa45ee..22c4081 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -972,11 +972,7 @@ HID_DBWIZ_FINISH,39058,
 HID_DBWIZ_NEXT,39056,
 HID_DBWIZ_PREVIOUS,39055,
 HID_DB_SELECTION_TLB,54845,
-HID_DEPLOYMENT_GUI_UPDATE,42786,
 HID_DEPLOYMENT_GUI_UPDATEINSTALL,42787,
-HID_DEPLOYMENT_GUI_UPDATE_AVAILABLE_UPDATES,42790,
-HID_DEPLOYMENT_GUI_UPDATE_PUBLISHER,42788,
-HID_DEPLOYMENT_GUI_UPDATE_RELEASENOTES,42789,
 HID_DIALOG_HANGULHANJA,39883,
 HID_DID_SAVE_PACKED_XML,33368,
 HID_DLGCONVERT_CBBACK,34675,
@@ -5160,7 +5156,6 @@ dbaccess_TabPage_TP_MIGRATE,851476480,
 dbaccess_TabPage_TP_PREPARE,851443712,
 dbaccess_TabPage_TP_SAVE_DBDOC_AS,851460096,
 dbaccess_TabPage_TP_SUMMARY,851492864,
-desktop_CheckBox_RID_DLG_UPDATE_RID_DLG_UPDATE_ALL,1106674693,
 desktop_CheckBox_TP_MIGRATION_CB_MIGRATION,586105859,
 desktop_CheckBox_TP_UPDATE_CHECK_CB_UPDATE_CHECK,586155011,
 desktop_Edit_TP_USER_ED_USER_FATHER,586123282,
@@ -5169,14 +5164,9 @@ desktop_Edit_TP_USER_ED_USER_INITIALS,586123283,
 desktop_Edit_TP_USER_ED_USER_LAST,586123281,
 desktop_ListBox_RID_DLG_DEPENDENCIES_RID_DLG_DEPENDENCIES_LIST,1106529794,
 desktop_ModalDialog_RID_DLG_DEPENDENCIES,1106526208,
-desktop_MultiLineEdit_RID_DLG_UPDATEINSTALL_RID_DLG_UPDATE_INSTALL_INFO,1106840076,
-desktop_MultiLineEdit_RID_DLG_UPDATE_RID_DLG_UPDATE_DESCRIPTIONS,1106676231,
 desktop_MultiLineEdit_TP_LICENSE_ML_LICENSE,586140166,
 desktop_PushButton_RID_DLG_EXTENSION_MANAGER_RID_EM_BTN_ADD,2180256268,
 
desktop_PushButton_RID_DLG_EXTENSION_MANAGER_RID_EM_BTN_CHECK_UPDATES,2180256269,
-desktop_PushButton_RID_DLG_UPDATE_REQUIRED_RID_EM_BTN_CHECK_UPDATES,1106694669,
-desktop_PushButton_RID_DLG_UPDATE_REQUIRED_RID_EM_BTN_CLOSE,1106694666,
-desktop_PushButton_RID_DLG_UPDATE_RID_DLG_UPDATE_OK,1106678282,
 desktop_PushButton_TP_LICENSE_PB_LICENSE_DOWN,586142215,
 desktop_RadioButton_TP_REGISTRATION_RB_REGISTRATION_LATER,586088966,
 desktop_RadioButton_TP_REGISTRATION_RB_REGISTRATION_NEVER,586088967,
diff --git a/source/text/shared/01/extensionupdate.xhp 
b/source/text/shared/01/extensionupdate.xhp
index c627538..a34d16b 100644
--- a/source/text/shared/01/extensionupdate.xhp
+++ b/source/text/shared/01/extensionupdate.xhp
@@ -24,14 +24,14 @@
 </topic>
 </meta>
 <body>
-<bookmark xml-lang="en-US" branch="hid/DESKTOP_HID_DEPLOYMENT_GUI_UPDATE" 
id="bm_id5684377" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/desktop/ui/updatedialog/UpdateDialog" 
id="bm_id5684377" localize="false"/>
 <bookmark xml-lang="en-US" 
branch="hid/DESKTOP_HID_DEPLOYMENT_GUI_UPDATEINSTALL" id="bm_id7576525" 
localize="false"/>
 <paragraph id="hd_id9688100" role="heading" xml-lang="en-US" 
level="1">Extension Update</paragraph>
 <paragraph id="par_id5084688" role="paragraph" xml-lang="en-US"><ahelp 
hid=".">Click the <emph>Check for Updates</emph> button in the <link 
href="text/shared/01/packagemanager.xhp">Extension Manager</link> to check for 
online updates for all installed extensions. To check for online updates for 
only the selected extension, right-click to open the context menu, then choose 
<emph>Update</emph>.</ahelp></paragraph>
 <section id="howtoget"><embed 
href="text/shared/00/00000406.xhp#packagemanager_eu"/>
 </section><comment>insert hidden text for Exclude from this update/from all 
updates/include again, see i115834 - not needed because no Help ID 
assigned</comment>
 <paragraph id="par_id6401257" role="paragraph" xml-lang="en-US">When you click 
the <item type="menuitem">Check for Updates</item> button or choose the <item 
type="menuitem">Update</item> command, the Extension Update dialog is displayed 
and the check for availability of updates starts immediately.</paragraph>
-<bookmark xml-lang="en-US" 
branch="hid/desktop:MultiLineEdit:RID_DLG_UPDATE:RID_DLG_UPDATE_DESCRIPTIONS" 
id="bm_id7764824" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/desktop/ui/updatedialog/DESCRIPTIONS" 
id="bm_id7764824" localize="false"/>
 <paragraph id="par_id5841242" role="paragraph" xml-lang="en-US"><ahelp 
hid=".">While checking for updates, you see a progress indicator. Wait for some 
messages to show up in the dialog, or click Cancel to abort the update 
check.</ahelp></paragraph>
 <paragraph id="par_id6794030" role="paragraph" xml-lang="en-US">If no updates 
are available, the message in the dialog tells you there are no updates. Close 
the dialog.</paragraph>
 <paragraph id="par_id7096774" role="paragraph" xml-lang="en-US">If updates are 
available, the updates can either be installed automatically, or you must 
respond with some action:</paragraph>
@@ -46,14 +46,14 @@
 <listitem>
 <paragraph id="par_id791039" role="paragraph" xml-lang="en-US">A manual update 
is necessary.</paragraph>
 </listitem></list>
-<bookmark xml-lang="en-US" 
branch="hid/desktop:PushButton:RID_DLG_UPDATE:RID_DLG_UPDATE_OK" 
id="bm_id4799645" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/desktop/ui/updatedialog/INSTALL" 
id="bm_id4799645" localize="false"/>
 <paragraph id="par_id757469" role="paragraph" xml-lang="en-US"><ahelp 
hid=".">When you click the Install button the Download and Installation dialog 
is displayed.</ahelp></paragraph>
 <paragraph id="par_id5189062" role="paragraph" xml-lang="en-US">All extensions 
which can be directly downloaded are downloaded now. The progress is shown in 
the Download and Installation dialog. If an extension cannot be downloaded, a 
message is displayed. The operation continues for the remaining 
extensions.</paragraph>
 <paragraph id="par_id3949095" role="paragraph" xml-lang="en-US">Some 
extensions may be marked with the phrase "browser based update". These 
extensions cannot be downloaded by the Extension Manager. A web browser must be 
opened to download the extension update from a particular web site. That site 
may require several more user interaction to download the extension. After 
downloading you must install the extension manually, for example by 
double-clicking the extension's icon in a file browser.</paragraph>
 <paragraph id="par_id3729056" role="paragraph" xml-lang="en-US">For extensions 
marked as "browser based update", the Extension Manager will open your web 
browser on the respective web site. This happens when you close the dialog, 
after downloading any other extension updates. If there are no extensions which 
can be directly downloaded then the web browser is started 
immediately.</paragraph>
 <paragraph id="par_id6854457" role="paragraph" xml-lang="en-US">After the last 
extension has been downloaded, the installation begins. First all installed 
extensions for which an update could be downloaded successfully, are removed. 
Then the updated extensions are installed. If an error occurs, a message that 
the installation failed is displayed, but the operation proceeds.</paragraph>
 <paragraph id="par_id3372295" role="paragraph" xml-lang="en-US">If all updates 
have been processed the Download and Installation dialog shows that it has 
finished. You can abort the download and installation process by clicking the 
<emph>Abort Update</emph> button.</paragraph>
-<bookmark xml-lang="en-US" 
branch="hid/desktop:CheckBox:RID_DLG_UPDATE:RID_DLG_UPDATE_ALL" 
id="bm_id3114108" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/desktop/ui/updatedialog/UPDATE_ALL" 
id="bm_id3114108" localize="false"/>
 <paragraph id="hd_id5699942" role="heading" xml-lang="en-US" level="2">Show 
all Updates</paragraph>
 <paragraph id="par_id641193" role="paragraph" xml-lang="en-US"><ahelp 
hid=".">By default, only the downloadable extensions are shown in the dialog. 
Mark <emph>Show all Updates</emph> to see also other extensions and error 
messages.</ahelp></paragraph>
 <section id="relatedtopics">
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Reply via email to