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

Tue Feb 19 02:56:26 PST 2013

helpers/help_hid.lst                     |    7 ------
 source/text/shared/optionen/01011000.xhp |   36 +++++++++++++------------------
 2 files changed, 16 insertions(+), 27 deletions(-)

New commits:
commit b568e27d3e9627927db41ebe0600f171cddf3708
Author: CaolÃ¡n McNamara <caolanm at redhat.com>
Date:   Tue Feb 19 10:55:53 2013 +0000

    update help ids for memory options page
    
    Change-Id: I8447f2e085ad15b3f1dfa0c946cc083c4f122aae

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index 447ca96..9811343 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -2669,7 +2669,6 @@ HID_OFA_HYPERLINK_NAME,35079,
 HID_OFA_HYPERLINK_TARGET,35053,
 HID_OFA_HYPERLINK_URL,35081,
 HID_OFA_TP_LANGUAGES,35147,
-HID_OFA_TP_MEMORY,35152,
 HID_OFA_TP_VIEW,35057,
 HID_OLE_CHECKLB,53245,
 HID_OLE_TOOLBOX,54831,
@@ -7496,7 +7495,6 @@ svx_CheckBox_OFA_TP_LANGUAGES_CB_ASIANSUPPORT,810566669,
 svx_CheckBox_OFA_TP_LANGUAGES_CB_CTLSUPPORT,810566671,
 svx_CheckBox_OFA_TP_LANGUAGES_CB_CURRENT_DOC,810566667,
 svx_CheckBox_OFA_TP_LANGUAGES_CB_DECIMALSEPARATOR,810566684,
-svx_CheckBox_OFA_TP_MEMORY_CB_QUICKLAUNCH,811303963,
 svx_CheckBox_OFA_TP_VIEW_CB_FONTANTIALIASING,810517567,
 svx_CheckBox_OFA_TP_VIEW_CB_FONT_HISTORY,810517566,
 svx_CheckBox_OFA_TP_VIEW_CB_FONT_SHOW,810517564,
@@ -8177,10 +8175,6 @@ svx_MultiListBox_RID_SVXTABPAGE_GALLERYTHEME_FILES_LBX_FOUND,706677761,
 svx_NumericField_DLG_INS_ROW_COL_ED_COUNT,1240143874,
 svx_NumericField_MD_INSERT_OBJECT_IFRAME_NM_MARGINHEIGHT,1598216200,
 svx_NumericField_MD_INSERT_OBJECT_IFRAME_NM_MARGINWIDTH,1598216202,
-svx_NumericField_OFA_TP_MEMORY_ED_UNDO,811309068,
-svx_NumericField_OFA_TP_MEMORY_NF_GRAPHICCACHE,811309074,
-svx_NumericField_OFA_TP_MEMORY_NF_GRAPHICOBJECTCACHE,811309076,
-svx_NumericField_OFA_TP_MEMORY_NF_OLECACHE,811309081,
 svx_NumericField_OFA_TP_VIEW_NF_AA_POINTLIMIT,810522688,
 svx_NumericField_RID_OFAPAGE_AUTOCOMPLETE_OPTIONS_NF_MAX_ENTRIES,809162881,
 svx_NumericField_RID_OFAPAGE_AUTOCOMPLETE_OPTIONS_NF_MIN_WORDLEN,809162880,
@@ -8479,7 +8473,6 @@ svx_TabPage_RID_SVXPAGE_MACROASSIGN,705560576,
 svx_TabPage_RID_SVXPAGE_TEXTANIMATION,703725568,
 svx_TabPage_RID_SVX_GRFFILTER_DLG_EMBOSS_TAB,706232320,
 svx_TabPage_RID_SVX_XFORMS_TABPAGES,832110592,
-svx_TimeField_OFA_TP_MEMORY_TF_GRAPHICOBJECTTIME,811311126,
 svx_TriStateBox_RID_SVXPAGE_ALIGNMENT_BTN_ASIAN_VERTICAL,702187035,
 svx_TriStateBox_RID_SVXPAGE_ALIGNMENT_BTN_HYPH,702187050,
 svx_TriStateBox_RID_SVXPAGE_ALIGNMENT_BTN_SHRINK,702187053,
diff --git a/source/text/shared/optionen/01011000.xhp b/source/text/shared/optionen/01011000.xhp
index 2a1e95d..d884817 100644
--- a/source/text/shared/optionen/01011000.xhp
+++ b/source/text/shared/optionen/01011000.xhp
@@ -34,7 +34,9 @@
 <bookmark_value>graphics; cache</bookmark_value>
 <bookmark_value>cache for graphics</bookmark_value>
 <bookmark_value>Quickstarter</bookmark_value>
-</bookmark><comment>MW moved "quickstarter" to the top of page and corrected a typo.</comment><paragraph role="heading" id="hd_id3157909" xml-lang="en-US" level="1" l10n="U" oldref="25"><link href="text/shared/optionen/01011000.xhp" name="Memory">Memory</link></paragraph>
+</bookmark>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/optmemoryspage/OptMemoryPage" id="bm_id8346202" localize="false"/><
+<paragraph role="heading" id="hd_id3157909" xml-lang="en-US" level="1" l10n="U" oldref="25"><link href="text/shared/optionen/01011000.xhp" name="Memory">Memory</link></paragraph>
 <paragraph role="paragraph" id="par_id3154307" xml-lang="en-US" l10n="CHG" oldref="26"><ahelp hid=".">Defines the settings for the graphics cache and the number of steps you can undo.</ahelp></paragraph>
 </section>
 <section id="howtoget">
@@ -42,28 +44,22 @@
 </section>
 <paragraph role="heading" id="hd_id3155390" xml-lang="en-US" level="2" l10n="U" oldref="1">Undo</paragraph>
 <paragraph role="paragraph" id="par_id3145673" xml-lang="en-US" l10n="U" oldref="2">Defines the maximum number of reverse steps allowed.</paragraph>
-<!-- removed HID OFFMGR_NUMERICFIELD_OFA_TP_MEMORY_ED_UNDO -->
-<bookmark xml-lang="en-US" branch="hid/cui:NumericField:OFA_TP_MEMORY:ED_UNDO" id="bm_id2490005" localize="false"/><paragraph role="heading" id="hd_id3153881" xml-lang="en-US" level="3" l10n="U" oldref="3">Number of steps</paragraph>
-<paragraph role="paragraph" id="par_id3148685" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid="OFFMGR_NUMERICFIELD_OFA_TP_MEMORY_ED_UNDO">You can specify the number of steps which can be undone by selecting a number from the box.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/optmemorypage/undo" id="bm_id2490005" localize="false"/><paragraph role="heading" id="hd_id3153881" xml-lang="en-US" level="3" l10n="U" oldref="3">Number of steps</paragraph>
+<paragraph role="paragraph" id="par_id3148685" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid="cui/ui/optmemorypage/undo">You can specify the number of steps which can be undone by selecting a number from the box.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3147530" xml-lang="en-US" level="2" l10n="U" oldref="10">Graphics cache</paragraph>
 <paragraph role="paragraph" id="par_id3145069" xml-lang="en-US" l10n="U" oldref="11">The graphics cache saves the graphics contained in a document in your computer's main memory. This means that the attributes of a graphic stored in the cache do not have to be re-calculated if you return to the page containing the graphic after scrolling through a document.</paragraph>
-<!-- removed HID OFFMGR_NUMERICFIELD_OFA_TP_MEMORY_NF_GRAPHICCACHE -->
-<bookmark xml-lang="en-US" branch="hid/cui:NumericField:OFA_TP_MEMORY:NF_GRAPHICCACHE" id="bm_id8346201" localize="false"/><paragraph role="heading" id="hd_id3154924" xml-lang="en-US" level="3" l10n="U" oldref="12">Use for $[officename] (MB)</paragraph>
-<paragraph role="paragraph" id="par_id3152813" xml-lang="en-US" l10n="U" oldref="13"><ahelp hid="OFFMGR_NUMERICFIELD_OFA_TP_MEMORY_NF_GRAPHICCACHE">Specifies the total cache size for all graphics.</ahelp></paragraph>
-<!-- removed HID OFFMGR_NUMERICFIELD_OFA_TP_MEMORY_NF_GRAPHICOBJECTCACHE -->
-<bookmark xml-lang="en-US" branch="hid/cui:NumericField:OFA_TP_MEMORY:NF_GRAPHICOBJECTCACHE" id="bm_id3981749" localize="false"/><paragraph role="heading" id="hd_id3150359" xml-lang="en-US" level="3" l10n="U" oldref="14">Memory per object (MB)</paragraph>
-<paragraph role="paragraph" id="par_id3148797" xml-lang="en-US" l10n="U" oldref="15"><ahelp hid="OFFMGR_NUMERICFIELD_OFA_TP_MEMORY_NF_GRAPHICOBJECTCACHE">Specifies that objects which are larger than the selected megabytes will not be placed in the cache.</ahelp></paragraph>
-<!-- removed HID OFFMGR_TIMEFIELD_OFA_TP_MEMORY_TF_GRAPHICOBJECTTIME -->
-<bookmark xml-lang="en-US" branch="hid/cui:TimeField:OFA_TP_MEMORY:TF_GRAPHICOBJECTTIME" id="bm_id1587878" localize="false"/><paragraph role="heading" id="hd_id3148920" xml-lang="en-US" level="3" l10n="U" oldref="16">Remove from memory after (hh:mm)</paragraph>
-<paragraph role="paragraph" id="par_id3148674" xml-lang="en-US" l10n="U" oldref="17"><ahelp hid="OFFMGR_TIMEFIELD_OFA_TP_MEMORY_TF_GRAPHICOBJECTTIME">Specifies the time that each graphic remains in the cache in hours and minutes.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/optmemorypage/graphiccache" id="bm_id8346201" localize="false"/><paragraph role="heading" id="hd_id3154924" xml-lang="en-US" level="3" l10n="U" oldref="12">Use for $[officename] (MB)</paragraph>
+<paragraph role="paragraph" id="par_id3152813" xml-lang="en-US" l10n="U" oldref="13"><ahelp hid="cui/ui/optmemorypage/graphiccache">Specifies the total cache size for all graphics.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/optmemorypage/objectcache" id="bm_id3981749" localize="false"/><paragraph role="heading" id="hd_id3150359" xml-lang="en-US" level="3" l10n="U" oldref="14">Memory per object (MB)</paragraph>
+<paragraph role="paragraph" id="par_id3148797" xml-lang="en-US" l10n="U" oldref="15"><ahelp hid="cui/ui/optmemorypage/objectcache">Specifies that objects which are larger than the selected megabytes will not be placed in the cache.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/optmemorypage/objecttime" id="bm_id1587878" localize="false"/><paragraph role="heading" id="hd_id3148920" xml-lang="en-US" level="3" l10n="U" oldref="16">Remove from memory after (hh:mm)</paragraph>
+<paragraph role="paragraph" id="par_id3148674" xml-lang="en-US" l10n="U" oldref="17"><ahelp hid="cui/ui/optmemorypage/objecttime">Specifies the time that each graphic remains in the cache in hours and minutes.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3156212" xml-lang="en-US" level="2" l10n="U" oldref="18">Cache for inserted objects</paragraph>
-<!-- removed HID OFFMGR_NUMERICFIELD_OFA_TP_MEMORY_NF_OLECACHE -->
-<bookmark xml-lang="en-US" branch="hid/cui:NumericField:OFA_TP_MEMORY:NF_OLECACHE" id="bm_id5088045" localize="false"/><paragraph role="heading" id="hd_id3147085" xml-lang="en-US" level="3" l10n="U" oldref="19">Number of objects</paragraph>
-<paragraph role="paragraph" id="par_id3153192" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="OFFMGR_NUMERICFIELD_OFA_TP_MEMORY_NF_OLECACHE">Choose the maximum number of OLE objects that are pooled in the cache.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/optmemorypage/olecache" id="bm_id5088045" localize="false"/><paragraph role="heading" id="hd_id3147085" xml-lang="en-US" level="3" l10n="U" oldref="19">Number of objects</paragraph>
+<paragraph role="paragraph" id="par_id3153192" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="cui/ui/optmemorypage/olecache">Choose the maximum number of OLE objects that are pooled in the cache.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3145171" xml-lang="en-US" level="2" l10n="CHG" oldref="21">$[officename] Quickstarter</paragraph>
-<!-- removed HID OFFMGR_CHECKBOX_OFA_TP_MEMORY_CB_QUICKLAUNCH -->
-<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:OFA_TP_MEMORY:CB_QUICKLAUNCH" id="bm_id4756004" localize="false"/><paragraph role="heading" id="hd_id3155429" xml-lang="en-US" level="3" l10n="CHG" oldref="22"><switchinline select="sys"><caseinline select="WIN">Load $[officename] during system start-up 
-</caseinline><defaultinline>Enable systray Quickstarter</defaultinline></switchinline><comment>UFI: new text seen in m187, see CWS gtkquickstart</comment></paragraph>
-<paragraph role="paragraph" id="par_id3152940" xml-lang="en-US" l10n="CHG" oldref="23"><ahelp hid="OFFMGR_CHECKBOX_OFA_TP_MEMORY_CB_QUICKLAUNCH">Mark this check box if you want $[officename] to enable quickstart. This option is available if the Quickstart module has been installed.</ahelp><comment>UFI: had to remove explanation because on Windows it is at start-up, while on Unix it is a user-systray feature only. Cannot have switches inside AHID text.</comment></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/optmemorypage/systray" id="bm_id4756005" localize="false"/><bookmark xml-lang="en-US" branch="hid/cui/ui/optmemorypage/quicklaunch" id="bm_id4756004" localize="false"/><paragraph role="heading" id="hd_id3155429" xml-lang="en-US" level="3" l10n="CHG" oldref="22"><switchinline select="sys"><caseinline select="WIN">Load $[officename] during system start-up 
+</caseinline><defaultinline>Enable systray Quickstarter</defaultinline></switchinline></paragraph>
+<paragraph role="paragraph" id="par_id3152940" xml-lang="en-US" l10n="CHG" oldref="23"><ahelp hid="cui/ui/optmemorypage/objectcache">Mark this check box if you want $[officename] to enable quickstart. This option is available if the Quickstart module has been installed.</ahelp><comment>UFI: had to remove explanation because on Windows it is at start-up, while on Unix it is a user-systray feature only. Cannot have switches inside AHID text.</comment></paragraph>
 </body>
 </helpdocument>
