source/text/shared/autopi/01150000.xhp | 47 +++++++++++++++----------------
source/text/shared/optionen/01010000.xhp | 9 +----
2 files changed, 26 insertions(+), 30 deletions(-)
New commits:
commit 2c3bace0708a3826cd43e38df3d336274877388a
Author: Gabor Kelemen <kelem...@gnome.hu>
Date: Sun Dec 10 23:42:22 2017 +0100
Update Options - LibreOffice page
- Remove Color page from the list
- Remove unused ahelp (SID is not a HID)
- Reorder categories to match current UI
Change-Id: Ia08e7e28a4b18886586d6e219c238d75bf935b86
Reviewed-on: https://gerrit.libreoffice.org/46266
Reviewed-by: Gabor Kelemen <kelem...@ubuntu.com>
Tested-by: Gabor Kelemen <kelem...@ubuntu.com>
(cherry picked from commit cd80e52e862116e77540a542e1c5f2315fb7a5e4)
Reviewed-on: https://gerrit.libreoffice.org/46295
diff --git a/source/text/shared/optionen/01010000.xhp
b/source/text/shared/optionen/01010000.xhp
index 996b5e149..84d4858f4 100644
--- a/source/text/shared/optionen/01010000.xhp
+++ b/source/text/shared/optionen/01010000.xhp
@@ -27,10 +27,8 @@
</topic>
</meta>
<body>
-<!-- removed HID SID_GENERAL_OPTIONS -->
<paragraph xml-lang="en-US" id="hd_id3153750" role="heading"
level="1">$[officename]</paragraph>
- <paragraph xml-lang="en-US" id="par_id3149177"
role="paragraph"><variable id="optionenallgemein"><ahelp
hid="SID_GENERAL_OPTIONS">Use this dialog to create general settings for
working with $[officename]. The information covers topics such as user data,
saving, printing, paths to important files and directories, and color
defaults.</ahelp>
-</variable> These settings are saved automatically.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149177"
role="paragraph"><variable id="optionenallgemein">Use this dialog to create
general settings for working with $[officename]. The information covers topics
such as user data, saving, printing, paths to important files and directories,
and color defaults.</variable> These settings are saved
automatically.</paragraph>
<section id="howtoget">
<embed href="text/shared/00/00000406.xhp#optionenallgemein"/>
</section>
@@ -39,15 +37,14 @@
<embed href="text/shared/optionen/01010800.xhp#ansicht"/>
<embed href="text/shared/optionen/01010900.xhp#drucken"/>
<embed href="text/shared/optionen/01010300.xhp#pfade"/>
- <embed href="text/shared/optionen/01010500.xhp#farben"/>
<embed href="text/shared/optionen/01010700.xhp#schrifters"/>
<embed href="text/shared/optionen/01030300.xhp#security"/>
- <embed href="text/shared/optionen/01012000.xhp#appearance"/>
<embed href="text/shared/optionen/persona_firefox.xhp#themes"/>
+ <embed href="text/shared/optionen/01012000.xhp#appearance"/>
<embed href="text/shared/optionen/01013000.xhp#accessibility"/>
<embed href="text/shared/optionen/java.xhp#advanced"/>
- <embed href="text/shared/optionen/online_update.xhp#online_update"/>
<embed href="text/shared/optionen/BasicIDE.xhp#basicide"/>
+ <embed href="text/shared/optionen/online_update.xhp#online_update"/>
<embed href="text/shared/optionen/opencl.xhp#opencl"/>
<embed href="text/shared/00/00000001.xhp#zurueck"/>
</body>
commit 5a5ae4cb8358bf50731fa33e73b5ee499d4e011b
Author: Gabor Kelemen <kelem...@gnome.hu>
Date: Tue Dec 5 01:07:47 2017 +0100
Fix extended help in the Euro Converter wizard
Change-Id: Iec988614f0cb2f6cea9d17c136bc12c8163c7bd6
Reviewed-on: https://gerrit.libreoffice.org/45834
Reviewed-by: Gabor Kelemen <kelem...@ubuntu.com>
Tested-by: Gabor Kelemen <kelem...@ubuntu.com>
(cherry picked from commit 4c4aebd5adf9b28034919c61073ec8d9fb5e5bea)
Reviewed-on: https://gerrit.libreoffice.org/46296
diff --git a/source/text/shared/autopi/01150000.xhp
b/source/text/shared/autopi/01150000.xhp
index 407a41bef..f4707264e 100644
--- a/source/text/shared/autopi/01150000.xhp
+++ b/source/text/shared/autopi/01150000.xhp
@@ -34,11 +34,10 @@
<bookmark_value>currencies; converters</bookmark_value>
</bookmark>
<bookmark xml-lang="en-US" branch="hid/.uno:EuroConverter" id="bm_id7067290"
localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:EuroConverter" id="bm_id3150476"
localize="false"/>
<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_DLGCONVERT_DIALOG"
id="bm_id3150477" localize="false"/>
<bookmark xml-lang="en-US"
branch="hid/macro:///Euro.AutoPilotRun.StartAutoPilot" id="bm_id6101870"
localize="false"/>
<paragraph role="heading" id="hd_id3154840" xml-lang="en-US" level="1">Euro
Converter Wizard</paragraph>
-<paragraph role="paragraph" id="par_id3149140" xml-lang="en-US"><variable
id="eurokonv"><ahelp hid=".uno:EuroConverter">Converts the currency amounts
found in $[officename] Calc documents and in fields and tables of $[officename]
Writer documents into euros.</ahelp>
+<paragraph role="paragraph" id="par_id3149140" xml-lang="en-US"><variable
id="eurokonv"><ahelp hid=".">Converts the currency amounts found in
$[officename] Calc documents and in fields and tables of $[officename] Writer
documents into euros.</ahelp>
</variable></paragraph>
<paragraph role="paragraph" id="par_id3145669" xml-lang="en-US">Only closed
files are converted. It is possible, however, to use the Euro Converter in an
open $[officename] Calc document. In this case, a separate dialog opens. This
dialog is described <link href="text/shared/autopi/01150000.xhp" name="at the
end of this section">at the end of this section</link>.</paragraph>
<section id="howtoget">
@@ -47,38 +46,38 @@
<paragraph role="warning" id="par_id3147275" xml-lang="en-US">Only the
currencies of the countries participating in the European Monetary Union are
converted.</paragraph>
<paragraph role="heading" id="hd_id3156152" xml-lang="en-US"
level="2">Extent</paragraph>
<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_DLGCONVERT_OBFILE"
id="bm_id3150984" localize="false"/><paragraph role="heading" id="hd_id3156155"
xml-lang="en-US" level="3">Single $[officename] Calc document</paragraph>
-<paragraph role="paragraph" id="par_id3155420" xml-lang="en-US"><ahelp
hid="HID_DLGCONVERT_OBFILE">Converts a single $[officename] Calc file.</ahelp>
To convert fields and tables in $[officename] Writer, first mark the <emph>Also
convert fields and tables in text documents </emph>check box.</paragraph>
+<paragraph role="paragraph" id="par_id3155420" xml-lang="en-US"><ahelp
hid=".">Converts a single $[officename] Calc file.</ahelp> To convert fields
and tables in $[officename] Writer, first mark the <emph>Also convert fields
and tables in text documents </emph>check box.</paragraph>
<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_DLGCONVERT_OBDIR"
id="bm_id3148642" localize="false"/><paragraph role="heading" id="hd_id3153541"
xml-lang="en-US" level="3">Complete Directory</paragraph>
-<paragraph role="paragraph" id="par_id3150670" xml-lang="en-US"><ahelp
hid="HID_DLGCONVERT_OBDIR">Converts all $[officename] Calc and $[officename]
Writer documents and templates in the selected
directory.</ahelp></paragraph><comment>UFI: removed help id</comment><paragraph
role="heading" id="hd_id3149516" xml-lang="en-US"
level="2">Currencies</paragraph>
-<paragraph role="paragraph" id="par_id3156002" xml-lang="en-US"><ahelp
hid="HID_DLGCONVERT_COMBOBOX1">Specifies the currency to be converted into
euros.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3150670" xml-lang="en-US"><ahelp
hid=".">Converts all $[officename] Calc and $[officename] Writer documents and
templates in the selected directory.</ahelp></paragraph><comment>UFI: removed
help id</comment><paragraph role="heading" id="hd_id3149516" xml-lang="en-US"
level="2">Currencies</paragraph>
+<paragraph role="paragraph" id="par_id3156002" xml-lang="en-US"><ahelp
hid=".">Specifies the currency to be converted into euros.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_DLGCONVERT_TBSOURCE"
id="bm_id3154142" localize="false"/><paragraph role="heading" id="hd_id3150275"
xml-lang="en-US" level="2">Source directory / Source Document</paragraph>
-<paragraph role="paragraph" id="par_id3154898" xml-lang="en-US"><ahelp
hid="HID_DLGCONVERT_TBSOURCE">Indicates the directory or the name of the single
document to be converted.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3154898" xml-lang="en-US"><ahelp
hid=".">Indicates the directory or the name of the single document to be
converted.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_DLGCONVERT_CBSOURCEOPEN"
id="bm_id3155923" localize="false"/><paragraph role="heading" id="hd_id3151385"
xml-lang="en-US" level="3">...</paragraph>
-<paragraph role="paragraph" id="par_id3147264" xml-lang="en-US"><ahelp
hid="HID_DLGCONVERT_CBSOURCEOPEN">Opens a dialog to select the desired
directory or document.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3147264" xml-lang="en-US"><ahelp
hid=".">Opens a dialog to select the desired directory or
document.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_DLGCONVERT_CHECKRECURSIVE"
id="bm_id3149656" localize="false"/><paragraph role="heading" id="hd_id3147560"
xml-lang="en-US" level="3">Including Subfolders</paragraph>
-<paragraph role="paragraph" id="par_id3152771" xml-lang="en-US"><ahelp
hid="HID_DLGCONVERT_CHECKRECURSIVE">Specifies whether all subfolders of the
selected directory are included.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3152771" xml-lang="en-US"><ahelp
hid=".">Specifies whether all subfolders of the selected directory are
included.</ahelp></paragraph>
<bookmark xml-lang="en-US"
branch="hid/WIZARDS_HID_DLGCONVERT_CHKTEXTDOCUMENTS" id="bm_id3153525"
localize="false"/><paragraph role="heading" id="hd_id3150542" xml-lang="en-US"
level="3">Also convert fields and tables in text documents</paragraph>
-<paragraph role="paragraph" id="par_id3150398" xml-lang="en-US"><ahelp
hid="HID_DLGCONVERT_CHKTEXTDOCUMENTS">Converts currency amounts found in fields
and tables of $[officename] Writer documents.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3150398" xml-lang="en-US"><ahelp
hid=".">Converts currency amounts found in fields and tables of $[officename]
Writer documents.</ahelp></paragraph>
<paragraph role="warning" id="par_id3148453" xml-lang="en-US">Values in the
text document that are not in fields or tables are not converted.</paragraph>
<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_DLGCONVERT_CHKPROTECT"
id="bm_id3156424" localize="false"/><paragraph role="heading" id="hd_id3151382"
xml-lang="en-US" level="3">Temporarily unprotect sheet without query</paragraph>
-<paragraph role="paragraph" id="par_id3153192" xml-lang="en-US"><ahelp
hid="HID_DLGCONVERT_CHKPROTECT">Specifies that sheet protection will be
disabled during conversion and thereafter re-enabled. If sheet protection is
covered by a password, you will see a dialog for entering the
password.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3153192" xml-lang="en-US"><ahelp
hid=".">Specifies that sheet protection will be disabled during conversion and
thereafter re-enabled. If sheet protection is covered by a password, you will
see a dialog for entering the password.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_DLGCONVERT_TBTARGET"
id="bm_id3149562" localize="false"/><paragraph role="heading" id="hd_id3147288"
xml-lang="en-US" level="2">Target Directory</paragraph>
-<paragraph role="paragraph" id="par_id3153771" xml-lang="en-US"><ahelp
hid="HID_DLGCONVERT_TBTARGET">Specifies the folder and path in which the
converted files are to be saved.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3153771" xml-lang="en-US"><ahelp
hid=".">Specifies the folder and path in which the converted files are to be
saved.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_DLGCONVERT_CBTARGETOPEN"
id="bm_id3154147" localize="false"/><paragraph role="paragraph"
id="par_id3154151" xml-lang="en-US">
<emph>...</emph>
</paragraph>
-<paragraph role="paragraph" id="par_id3147427" xml-lang="en-US"><ahelp
hid="HID_DLGCONVERT_CBTARGETOPEN">Opens a dialog in which you can select a
directory to hold the converted files.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3147427" xml-lang="en-US"><ahelp
hid=".">Opens a dialog in which you can select a directory to hold the
converted files.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_DLGCONVERT_CBCANCEL"
id="bm_id3159199" localize="false"/><paragraph role="heading" id="hd_id3155854"
xml-lang="en-US" level="2">Cancel</paragraph>
-<paragraph role="paragraph" id="par_id3153190" xml-lang="en-US"><ahelp
hid="HID_DLGCONVERT_CBCANCEL">Closes the Euro Converter.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3153190" xml-lang="en-US"><ahelp
hid=".">Closes the Euro Converter.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_DLGCONVERT_CBHELP"
id="bm_id3149262" localize="false"/><paragraph role="heading" id="hd_id3154986"
xml-lang="en-US" level="2">Help</paragraph>
-<paragraph role="paragraph" id="par_id3155413" xml-lang="en-US"><ahelp
hid="HID_DLGCONVERT_CBHELP">Activates the help for the
dialog.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3155413" xml-lang="en-US"><ahelp
hid=".">Activates the help for the dialog.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_DLGCONVERT_CBGOON"
id="bm_id3154321" localize="false"/><paragraph role="heading" id="hd_id3148616"
xml-lang="en-US" level="2">Convert</paragraph>
-<paragraph role="paragraph" id="par_id3150011" xml-lang="en-US"><ahelp
hid="HID_DLGCONVERT_CBGOON">Starts the conversion.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3150011" xml-lang="en-US"><ahelp
hid=".">Starts the conversion.</ahelp></paragraph>
<paragraph role="paragraph" id="par_id3146975" xml-lang="en-US">During
conversion, a page showing the progress status is displayed.</paragraph>
<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_DLGCONVERT_CBBACK"
id="bm_id3146148" localize="false"/><paragraph role="heading" id="hd_id3155308"
xml-lang="en-US" level="2">Back</paragraph>
-<paragraph role="paragraph" id="par_id3153953" xml-lang="en-US"><ahelp
hid="HID_DLGCONVERT_CBBACK">Returns to the first page of the Euro
Converter.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3153953" xml-lang="en-US"><ahelp
hid=".">Returns to the first page of the Euro Converter.</ahelp></paragraph>
<section id="aktuell">
-<paragraph role="paragraph" id="par_id3154640" xml-lang="en-US"><ahelp
hid="HID_DLGCONVERT_CBBACK">If the current document is a $[officename] Calc
document or template, you can call up the Euro Converter using the
corresponding icon in the Tools bar.</ahelp> This icon is hidden by default. To
display the Euro Converter icon, click the arrow at the end of the Tools bar,
select the <emph>Visible Buttons</emph> command and activate the <emph>Euro
Converter</emph> icon.</paragraph>
+<paragraph role="paragraph" id="par_id3154640" xml-lang="en-US">If the current
document is a $[officename] Calc document or template, you can call up the Euro
Converter using the corresponding icon in the Tools bar. This icon is hidden by
default. To display the Euro Converter icon, click the arrow at the end of the
Tools bar, select the <emph>Visible Buttons</emph> command and activate the
<emph>Euro Converter</emph> icon.</paragraph>
</section>
<section id="syeuro">
<table id="tbl_id3150592">
@@ -96,20 +95,20 @@
</section>
<paragraph role="paragraph" id="par_id3144766" xml-lang="en-US">The <emph>Euro
Converter</emph> dialog contains the following functions:</paragraph>
<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_DLGCONVERT_CHECKBOX1"
id="bm_id3150423" localize="false"/><paragraph role="heading" id="hd_id3148387"
xml-lang="en-US" level="2">Entire document</paragraph>
-<paragraph role="paragraph" id="par_id3150113" xml-lang="en-US"><ahelp
hid="HID_DLGCONVERT_CHECKBOX1">Converts the entire document.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3150113" xml-lang="en-US"><ahelp
hid=".">Converts the entire document.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_DLGCONVERT_COMBOBOX1"
id="bm_id3156181" localize="false"/><paragraph role="heading" id="hd_id3159110"
xml-lang="en-US" level="2">Currencies</paragraph>
-<paragraph role="paragraph" id="par_id3148834" xml-lang="en-US"><ahelp
hid="HID_DLGCONVERT_COMBOBOX1">Specifies the currency to be converted into
euros.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3148834" xml-lang="en-US"><ahelp
hid=".">Specifies the currency to be converted into euros.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3155084" xml-lang="en-US"
level="2">Selection</paragraph>
<paragraph role="paragraph" id="par_id3152999" xml-lang="en-US">Select the
cells you want to convert in this range, if you did not mark the <emph>Entire
document</emph> check box. Select an option and then click the desired entries
in the <emph>Templates</emph> / <emph>Currency ranges</emph> field. The
selected range will be visible as such in the document. Click
<emph>Convert</emph> to carry out the conversion.</paragraph>
<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_DLGCONVERT_OPTIONBUTTON1"
id="bm_id3154163" localize="false"/><paragraph role="heading" id="hd_id3153950"
xml-lang="en-US" level="3">Cell Styles</paragraph>
-<paragraph role="paragraph" id="par_id3145162" xml-lang="en-US"><ahelp
hid="HID_DLGCONVERT_OPTIONBUTTON1">All cells with the selected Cell Styles are
converted.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3145162" xml-lang="en-US"><ahelp
hid=".">All cells with the selected Cell Styles are
converted.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_DLGCONVERT_OPTIONBUTTON2"
id="bm_id3147258" localize="false"/><paragraph role="heading" id="hd_id3152974"
xml-lang="en-US" level="3">Currency cells in the current sheet</paragraph>
-<paragraph role="paragraph" id="par_id3154479" xml-lang="en-US"><ahelp
hid="HID_DLGCONVERT_OPTIONBUTTON2">All currency cells in the active spreadsheet
will be converted.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3154479" xml-lang="en-US"><ahelp
hid=".">All currency cells in the active spreadsheet will be
converted.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_DLGCONVERT_OPTIONBUTTON3"
id="bm_id3146081" localize="false"/><paragraph role="heading" id="hd_id3156276"
xml-lang="en-US" level="3">Currency cells in the entire document</paragraph>
-<paragraph role="paragraph" id="par_id3146912" xml-lang="en-US"><ahelp
hid="HID_DLGCONVERT_OPTIONBUTTON3">All currency cells in the active document
will be converted.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3146912" xml-lang="en-US"><ahelp
hid=".">All currency cells in the active document will be
converted.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_DLGCONVERT_OPTIONBUTTON4"
id="bm_id3153711" localize="false"/><paragraph role="heading" id="hd_id3155444"
xml-lang="en-US" level="3">Selected range</paragraph>
-<paragraph role="paragraph" id="par_id3153736" xml-lang="en-US"><ahelp
hid="HID_DLGCONVERT_OPTIONBUTTON4">All currency cells in the range selected
before the converter was called will be converted.</ahelp> All cells must have
the same format so that they can be recognized as a selected range.</paragraph>
+<paragraph role="paragraph" id="par_id3153736" xml-lang="en-US"><ahelp
hid=".">All currency cells in the range selected before the converter was
called will be converted.</ahelp> All cells must have the same format so that
they can be recognized as a selected range.</paragraph>
<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_DLGCONVERT_LISTBOX1"
id="bm_id3152960" localize="false"/><paragraph role="heading" id="hd_id3153927"
xml-lang="en-US" level="3">Templates / Currency ranges</paragraph>
-<paragraph role="paragraph" id="par_id3154756" xml-lang="en-US"><ahelp
hid="HID_DLGCONVERT_LISTBOX1">Displays the ranges to be converted from the
list.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3154756" xml-lang="en-US"><ahelp
hid=".">Displays the ranges to be converted from the list.</ahelp></paragraph>
</body>
</helpdocument>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
