[Libreoffice-commits] help.git: Branch 'libreoffice-5-3' - 5 commits - source/text to-wiki/getalltitles.py to-wiki/wikiconv2.py
Gabor Kelemen
kelemeng at gnome.hu
Sat Dec 24 23:32:11 UTC 2016
source/text/shared/optionen/01030300.xhp | 19 ++++--
source/text/swriter/01/05030800.xhp | 85 ++++++++++++++---------------
source/text/swriter/01/05040600.xhp | 90 +++++++++++++++++--------------
to-wiki/getalltitles.py | 6 +-
to-wiki/wikiconv2.py | 6 ++
5 files changed, 114 insertions(+), 92 deletions(-)
New commits:
commit b7da65258ab0875f5db91d3dd0fecf11ccf3fd42
Author: Gabor Kelemen <kelemeng at gnome.hu>
Date: Wed Dec 14 23:01:27 2016 +0100
tdf#76488 (partial) Update footnote properties page
Document changes and reconnect with the UI
Change-Id: Ia426309a89773ff7ffaa8ba7e3c6157fea3b6282
Reviewed-on: https://gerrit.libreoffice.org/32022
Reviewed-by: Olivier Hallot <olivier.hallot at edx.srv.br>
Tested-by: Olivier Hallot <olivier.hallot at edx.srv.br>
Reviewed-on: https://gerrit.libreoffice.org/32314
diff --git a/source/text/swriter/01/05040600.xhp b/source/text/swriter/01/05040600.xhp
index ae3f068..95d8572 100644
--- a/source/text/swriter/01/05040600.xhp
+++ b/source/text/swriter/01/05040600.xhp
@@ -28,47 +28,57 @@
</meta>
<body>
<section id="fussnote">
-<bookmark xml-lang="en-US" branch="hid/SW_HID_FOOTNOTE_PAGE" id="bm_id3151390" localize="false"/>
-<paragraph xml-lang="en-US" id="hd_id3154767" role="heading" level="1" l10n="U" oldref="1"><link href="text/swriter/01/05040600.xhp" name="Footnote">Footnote</link></paragraph>
- <paragraph xml-lang="en-US" id="par_id3149351" role="paragraph" l10n="U" oldref="2"><ahelp hid="HID_FOOTNOTE_PAGE">Specifies the layout options for footnotes, including the line that separates the footnote from the main body of document.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/footnoteareapage/FootnoteAreaPage" id="bm_id3151390" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3154767" role="heading" level="1"><link href="text/swriter/01/05040600.xhp" name="Footnote">Footnote</link></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149351" role="paragraph"><ahelp hid="modules/swriter/ui/footnoteareapage/FootnoteAreaPage">Specifies the layout options for footnotes, including the line that separates the footnote from the main body of document.</ahelp></paragraph>
</section>
<section id="howtoget">
<embed href="text/swriter/00/00000405.xhp#fussnoteform"/>
- </section><comment>removed a note</comment>
-<paragraph xml-lang="en-US" id="hd_id3154646" role="heading" level="2" l10n="U" oldref="3">Footnote area</paragraph>
- <paragraph xml-lang="en-US" id="par_id3151168" role="paragraph" l10n="U" oldref="4">Set the height of the footnote area.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:TP_FOOTNOTE_PAGE:RB_MAXHEIGHT_PAGE" id="bm_id3147509" localize="false"/>
-<paragraph xml-lang="en-US" id="hd_id3145412" role="heading" level="2" l10n="U" oldref="5">Not larger than page area</paragraph>
- <paragraph xml-lang="en-US" id="par_id3147514" role="paragraph" l10n="U" oldref="6"><ahelp hid="SW:RADIOBUTTON:TP_FOOTNOTE_PAGE:RB_MAXHEIGHT_PAGE">Automatically adjusts the height of the footnote area depending on the number of footnotes.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:TP_FOOTNOTE_PAGE:RB_MAXHEIGHT" id="bm_id3149801" localize="false"/>
-<paragraph xml-lang="en-US" id="hd_id3154099" role="heading" level="2" l10n="U" oldref="7">Maximum Footnote Height</paragraph>
- <paragraph xml-lang="en-US" id="par_id3149807" role="paragraph" l10n="U" oldref="8"><ahelp hid=".">Sets a maximum height for the footnote area. Enable this option, then enter the height.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw:MetricField:TP_FOOTNOTE_PAGE:ED_MAXHEIGHT" id="bm_id3154482" localize="false"/>
- <paragraph xml-lang="en-US" id="par_id3154568" role="paragraph" l10n="U" oldref="10"><ahelp hid="SW:METRICFIELD:TP_FOOTNOTE_PAGE:ED_MAXHEIGHT">Enter the maximum height for the footnote area.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw:MetricField:TP_FOOTNOTE_PAGE:ED_DIST" id="bm_id3152958" localize="false"/>
-<paragraph xml-lang="en-US" id="hd_id3151318" role="heading" level="2" l10n="U"
- oldref="11">Distance from text</paragraph>
- <paragraph xml-lang="en-US" id="par_id3153665" role="paragraph" l10n="U" oldref="12"><ahelp hid="SW:METRICFIELD:TP_FOOTNOTE_PAGE:ED_DIST">Enter the amount of space to leave between the bottom page margin and the first line of text in the footnote area.</ahelp></paragraph>
- <paragraph xml-lang="en-US" id="hd_id3155897" role="heading" level="2" l10n="U"
- oldref="13">Separator Line</paragraph>
- <paragraph xml-lang="en-US" id="par_id3149689" role="paragraph" l10n="U" oldref="14">Specifies the position and length of the separator line.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_FOOTNOTE_PAGE:DLB_LINEPOS" id="bm_id3155177" localize="false"/>
-<paragraph xml-lang="en-US" id="hd_id3154194" role="heading" level="2" l10n="U"
- oldref="15">Position</paragraph>
- <paragraph xml-lang="en-US" id="par_id3155184" role="paragraph" l10n="U" oldref="16"><ahelp hid="SW:LISTBOX:TP_FOOTNOTE_PAGE:DLB_LINEPOS">Select the horizontal alignment for the line that separates the main text from the footnote area.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw:MetricField:TP_FOOTNOTE_PAGE:ED_LINEWIDTH" id="bm_id3149492" localize="false"/>
-<paragraph xml-lang="en-US" id="hd_id3143284" role="heading" level="2" l10n="U"
- oldref="17">Length</paragraph>
- <paragraph xml-lang="en-US" id="par_id3154827" role="paragraph" l10n="U" oldref="18"><ahelp hid="SW:METRICFIELD:TP_FOOTNOTE_PAGE:ED_LINEWIDTH">Enter the length of the separator line as a percentage of the page width area.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_FOOTNOTE_PAGE:DLB_LINETYPE" id="bm_id3149098" localize="false"/>
-<paragraph xml-lang="en-US" id="hd_id3151253" role="heading" level="2" l10n="U"
- oldref="19">Weight</paragraph>
- <paragraph xml-lang="en-US" id="par_id3149105" role="paragraph" l10n="U" oldref="20"><ahelp hid="SW:LISTBOX:TP_FOOTNOTE_PAGE:DLB_LINETYPE">Select the formatting style for the separator line. If you do not want a separator line, choose "0.0 pt".</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw:MetricField:TP_FOOTNOTE_PAGE:ED_LINEDIST" id="bm_id3147098" localize="false"/>
-<paragraph xml-lang="en-US" id="hd_id3149828" role="heading" level="2" l10n="U"
- oldref="21">Spacing</paragraph>
- <paragraph xml-lang="en-US" id="par_id3148970" role="paragraph" l10n="U" oldref="22"><ahelp hid="SW:METRICFIELD:TP_FOOTNOTE_PAGE:ED_LINEDIST">Enter the amount of space to leave between the separator line and the first line of the footnote area.</ahelp></paragraph>
- <paragraph xml-lang="en-US" id="par_id3155145" role="tip" l10n="CHG" oldref="24">To specify the spacing between two footnotes, choose <item type="menuitem">Format - Paragraph</item>, and then click the <emph>Indents & Spacing</emph> tab.</paragraph>
- <embed href="text/shared/00/00000001.xhp#vorschau"/>
+ </section>
+<paragraph xml-lang="en-US" id="hd_id3154646" role="heading" level="2">Footnote area</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3151168" role="paragraph">Set the height of the footnote area.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/footnoteareapage/maxheightpage" id="bm_id3147509" localize="false"/>
+
+<paragraph xml-lang="en-US" id="hd_id3145412" role="heading" level="2">Not larger than page area</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3147514" role="paragraph"><ahelp hid="modules/swriter/ui/footnoteareapage/maxheightpage">Automatically adjusts the height of the footnote area depending on the number of footnotes.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/footnoteareapage/maxheight" id="bm_id3149801" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3154099" role="heading" level="2">Maximum footnote height</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149807" role="paragraph"><ahelp hid="modules/swriter/ui/footnoteareapage/maxheight">Sets a maximum height for the footnote area. Enable this option, then enter the height.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/footnoteareapage/maxheightsb" id="bm_id3154482" localize="false"/>
+ <paragraph xml-lang="en-US" id="par_id3154568" role="paragraph"><ahelp hid="modules/swriter/ui/footnoteareapage/maxheightsb">Enter the maximum height for the footnote area.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/footnoteareapage/spacetotext" id="bm_id3152958" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3151318" role="heading" level="2">Space to text</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153665" role="paragraph"><ahelp hid="modules/swriter/ui/footnoteareapage/spacetotext">Enter the amount of space to leave between the bottom page margin and the first line of text in the footnote area.</ahelp></paragraph>
+
+ <paragraph xml-lang="en-US" id="hd_id3155897" role="heading" level="2">Separator Line</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149689" role="paragraph">Specifies the position and other properties of the separator line.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/footnoteareapage/position" id="bm_id3155177" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3154194" role="heading" level="2">Position</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3155184" role="paragraph"><ahelp hid="modules/swriter/ui/footnoteareapage/position">Select the horizontal alignment for the line that separates the main text from the footnote area.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/footnoteareapage/style" id="bm_id3149098" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3151253" role="heading" level="2">Style</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149105" role="paragraph"><ahelp hid="modules/swriter/ui/footnoteareapage/style">Select the formatting style for the separator line. If you do not want a separator line, choose "None".</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/footnoteareapage/thickness" id="bm_id3149099" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3151254" role="heading" level="2">Thickness</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149106" role="paragraph"><ahelp hid="modules/swriter/ui/footnoteareapage/thickness">Select the thickness of the separator line.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/footnoteareapage/color" id="bm_id3149100" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3151255" role="heading" level="2">Color</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149107" role="paragraph"><ahelp hid="modules/swriter/ui/footnoteareapage/color">Select the color of the separator line.</ahelp></paragraph>
+
+
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/footnoteareapage/length" id="bm_id3149492" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3143284" role="heading" level="2">Length</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154827" role="paragraph"><ahelp hid="modules/swriter/ui/footnoteareapage/length">Enter the length of the separator line as a percentage of the page width area.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/footnoteareapage/spacingtocontents" id="bm_id3147098" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3149828" role="heading" level="2">Spacing to footnote contents</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3148970" role="paragraph"><ahelp hid="modules/swriter/ui/footnoteareapage/spacingtocontents">Enter the amount of space to leave between the separator line and the first line of the footnote area.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3155145" role="tip">To specify the spacing between two footnotes, choose <item type="menuitem">Format - Paragraph</item>, and then click the <emph>Indents & Spacing</emph> tab.</paragraph>
</body>
-</helpdocument>
\ No newline at end of file
+</helpdocument>
commit f82a8513425645b9c421399467cb84081f2cf7e7
Author: Gabor Kelemen <kelemeng at gnome.hu>
Date: Wed Dec 14 22:06:57 2016 +0100
tdf#100096 Document security option for link blocking
Also fix the nonsensical ahids of that page
Change-Id: Iaa7b190c031e0c925d066d576ec14f4b282ef67c
Reviewed-on: https://gerrit.libreoffice.org/32021
Reviewed-by: Olivier Hallot <olivier.hallot at edx.srv.br>
Tested-by: Olivier Hallot <olivier.hallot at edx.srv.br>
Reviewed-on: https://gerrit.libreoffice.org/32313
diff --git a/source/text/shared/optionen/01030300.xhp b/source/text/shared/optionen/01030300.xhp
index 747fe87..7a451d4 100644
--- a/source/text/shared/optionen/01030300.xhp
+++ b/source/text/shared/optionen/01030300.xhp
@@ -46,24 +46,29 @@
<bookmark xml-lang="en-US" branch="hid/cui/ui/securityoptionsdialog/SecurityOptionsDialog" id="bm_id1976684" localize="false"/><paragraph role="paragraph" id="par_id5616626" xml-lang="en-US" l10n="NEW">The Security options and warnings dialog contains the following controls:</paragraph>
<bookmark xml-lang="en-US" branch="hid/cui/ui/securityoptionsdialog/savesenddocs" id="bm_id1976683" localize="false"/><paragraph role="heading" id="par_idN10647" xml-lang="en-US" level="3" l10n="NEW">When saving or sending</paragraph>
-<paragraph role="paragraph" id="par_idN1064B" xml-lang="en-US" l10n="NEW"><ahelp hid="703988739">Select to see a warning dialog when you try to save or send a document that contains recorded changes, versions, or comments.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_idN1064B" xml-lang="en-US" l10n="NEW"><ahelp hid="cui/ui/securityoptionsdialog/savesenddocs">Select to see a warning dialog when you try to save or send a document that contains recorded changes, versions, or comments.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/cui/ui/securityoptionsdialog/whenprinting" id="bm_id43946" localize="false"/><paragraph role="heading" id="par_idN1064E" xml-lang="en-US" level="3" l10n="NEW">When printing</paragraph>
-<paragraph role="paragraph" id="par_idN10652" xml-lang="en-US" l10n="NEW"><ahelp hid="703988740">Select to see a warning dialog when you try to print a document that contains recorded changes or comments.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_idN10652" xml-lang="en-US" l10n="NEW"><ahelp hid="cui/ui/securityoptionsdialog/whenprinting">Select to see a warning dialog when you try to print a document that contains recorded changes or comments.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/cui/ui/securityoptionsdialog/whensigning" id="bm_id6449171" localize="false"/><paragraph role="heading" id="par_idN10655" xml-lang="en-US" level="3" l10n="NEW">When signing</paragraph>
-<paragraph role="paragraph" id="par_idN10659" xml-lang="en-US" l10n="NEW"><ahelp hid="703988741">Select to see a warning dialog when you try to sign a document that contains recorded changes, versions, fields, references to other sources (for example linked sections or linked pictures), or comments.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_idN10659" xml-lang="en-US" l10n="NEW"><ahelp hid="cui/ui/securityoptionsdialog/whensigning">Select to see a warning dialog when you try to sign a document that contains recorded changes, versions, fields, references to other sources (for example linked sections or linked pictures), or comments.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/cui/ui/securityoptionsdialog/whenpdf" id="bm_id7101046" localize="false"/><paragraph role="heading" id="par_idN1065C" xml-lang="en-US" level="3" l10n="NEW">When creating PDF files</paragraph>
-<paragraph role="paragraph" id="par_idN10660" xml-lang="en-US" l10n="NEW"><ahelp hid="703988742">Select to see a warning dialog when you try to export a document to PDF format that displays recorded changes in Writer, or that displays comments.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_idN10660" xml-lang="en-US" l10n="NEW"><ahelp hid="cui/ui/securityoptionsdialog/whenpdf">Select to see a warning dialog when you try to export a document to PDF format that displays recorded changes in Writer, or that displays comments.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/cui/ui/securityoptionsdialog/removepersonal" id="bm_id4263740" localize="false"/><paragraph role="heading" id="par_idN10663" xml-lang="en-US" level="3" l10n="NEW">Remove personal information on saving</paragraph>
-<paragraph role="paragraph" id="par_idN10667" xml-lang="en-US" l10n="CHG"><ahelp hid="703988743">Select to always remove user data from the file properties. If this option is not selected, you can still remove the personal information for the current document with the <emph>Reset Properties</emph> button on <emph>File - Properties - General</emph>.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_idN10667" xml-lang="en-US" l10n="CHG"><ahelp hid="cui/ui/securityoptionsdialog/removepersonal">Select to always remove user data from the file properties. If this option is not selected, you can still remove the personal information for the current document with the <emph>Reset Properties</emph> button on <emph>File - Properties - General</emph>.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/cui/ui/securityoptionsdialog/password" id="bm_id7186498" localize="false"/><paragraph role="heading" id="par_idN1067C" xml-lang="en-US" level="3" l10n="NEW">Recommend password protection on saving</paragraph>
-<paragraph role="paragraph" id="par_idN10680" xml-lang="en-US" l10n="CHG"><ahelp hid="703988744">Select to always enable the <emph>Save with password</emph> option in the file save dialogs. Deselect the option to save files by default without password.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_idN10680" xml-lang="en-US" l10n="CHG"><ahelp hid="cui/ui/securityoptionsdialog/password">Select to always enable the <emph>Save with password</emph> option in the file save dialogs. Deselect the option to save files by default without password.</ahelp></paragraph>
+
<bookmark xml-lang="en-US" branch="hid/cui/ui/securityoptionsdialog/ctrlclick" id="bm_id5288857" localize="false"/><paragraph role="heading" id="hd_id1972106" xml-lang="en-US" level="3" l10n="NEW">Ctrl-click required to follow hyperlinks</paragraph>
-<paragraph role="paragraph" id="par_id79042" xml-lang="en-US" l10n="NEW"><ahelp hid=".">If enabled, you must hold down the Ctrl key while clicking a hyperlink to follow that link. If not enabled, a click opens the hyperlink.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id79042" xml-lang="en-US" l10n="NEW"><ahelp hid="cui/ui/securityoptionsdialog/ctrlclick">If enabled, you must hold down the Ctrl key while clicking a hyperlink to follow that link. If not enabled, a click opens the hyperlink.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/cui/ui/securityoptionsdialog/blockuntrusted" id="bm_id5288858" localize="false"/><paragraph role="heading" id="hd_id1972107" xml-lang="en-US" level="3">Block any links from documents not among the trusted locations (see Macro Security)</paragraph>
+<paragraph role="paragraph" id="par_id79043" xml-lang="en-US"><ahelp hid="cui/ui/securityoptionsdialog/blockuntrusted">Blocks the use of links pointing to images not in the trusted locations defined on the <link href="text/shared/optionen/macrosecurity_ts.xhp" name="Trusted Sources">Trusted Sources</link> tab of the Macro Security dialog.</ahelp> This can increase security in case you work with documents from untrusted sources (e.g. the internet) and are worried about vulnerabilities in image processing software components. Blocking the use of links means that images are not loaded in documents, only a placeholder frame is visible.</paragraph>
+
<paragraph role="heading" id="hd_id4076357" xml-lang="en-US" level="2" l10n="NEW">Passwords for web connections</paragraph>
<paragraph role="paragraph" id="par_id8231757" xml-lang="en-US" l10n="NEW">You can enter a master password to enable easy access to sites that require a user name and password.</paragraph>
<bookmark xml-lang="en-US" branch="hid/cui/ui/optsecuritypage/savepassword" id="bm_id3294778" localize="false"/><paragraph role="heading" id="hd_id3168736" xml-lang="en-US" level="3" l10n="NEW">Persistently save passwords protected by a master password</paragraph>
commit 019d305ec0f0402d71910a3997ddebaf94df8dd2
Author: Gabor Kelemen <kelemeng at gnome.hu>
Date: Sun Dec 4 23:29:36 2016 +0100
tdf#104359 (partial) Handle ol_item and ul_item
This was throwing an exception and not generating a wiki page
Change-Id: Ic7d362cf65507aa8d90335c7f0ff3b5d8ea6fe58
Reviewed-on: https://gerrit.libreoffice.org/31610
Reviewed-by: Andras Timar <andras.timar at collabora.com>
Tested-by: Andras Timar <andras.timar at collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/32312
Reviewed-by: Olivier Hallot <olivier.hallot at edx.srv.br>
Tested-by: Olivier Hallot <olivier.hallot at edx.srv.br>
diff --git a/to-wiki/wikiconv2.py b/to-wiki/wikiconv2.py
index 1910828..93f72eb 100755
--- a/to-wiki/wikiconv2.py
+++ b/to-wiki/wikiconv2.py
@@ -46,6 +46,7 @@ replace_paragraph_role = \
'logocode': '<code>',
'note': '{{Note|1=',
'null': '', # special paragraph for Variable, CaseInline, etc.
+ 'ol_item': '',
'paragraph': '',
'related': '', # used only in one file, probably in error?
'relatedtopics': '', # used only in one file, probably in error?
@@ -62,6 +63,7 @@ replace_paragraph_role = \
'tablenexttip': '\n{{Tip|1=',
'tablenextwarning': '\n{{Warning|1=',
'tip': '{{Tip|1=',
+ 'ul_item': '',
'variable': '',
'warning': '{{Warning|1=',
},
@@ -82,6 +84,7 @@ replace_paragraph_role = \
'logocode': '</code>\n\n',
'note': '}}\n\n',
'null': '', # special paragraph for Variable, CaseInline, etc.
+ 'ol_item': '',
'paragraph': '\n\n',
'related': '\n\n', # used only in one file, probably in error?
'relatedtopics': '\n\n', # used only in one file, probably in error?
@@ -98,6 +101,7 @@ replace_paragraph_role = \
'tablenexttip': '}}\n\n',
'tablenextwarning': '}}\n\n',
'tip': '}}\n\n',
+ 'ul_item': '',
'variable': '',
'warning': '}}\n\n',
},
@@ -118,6 +122,7 @@ replace_paragraph_role = \
'logocode': False,
'note': True,
'null': False,
+ 'ol_item': False,
'paragraph': False,
'related': False,
'relatedtopics': False,
@@ -134,6 +139,7 @@ replace_paragraph_role = \
'tablenexttip': True,
'tablenextwarning': True,
'tip': True,
+ 'ul_item': False,
'variable': False,
'warning': True,
}
commit 422cd594a106151a3142c150ad4fcda75ffad9b2
Author: Gabor Kelemen <kelemeng at gnome.hu>
Date: Thu Dec 8 19:59:10 2016 +0100
tdf#104489 Include the product name in wiki page URL
Change-Id: I39155cf12a7ba178b0fb4e25315bd32156086846
Reviewed-on: https://gerrit.libreoffice.org/31772
Reviewed-by: Andras Timar <andras.timar at collabora.com>
Tested-by: Andras Timar <andras.timar at collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/32311
Reviewed-by: Olivier Hallot <olivier.hallot at edx.srv.br>
Tested-by: Olivier Hallot <olivier.hallot at edx.srv.br>
diff --git a/to-wiki/getalltitles.py b/to-wiki/getalltitles.py
index 71f5aed..ffa5e81 100755
--- a/to-wiki/getalltitles.py
+++ b/to-wiki/getalltitles.py
@@ -31,9 +31,9 @@ def make_unique(title):
return t
replace_text_list = [
- ["$[officename]",""], # to fit both LibreOffice and BrOffice
- ["%PRODUCTNAME",""], # to fit both LibreOffice and BrOffice
- ["$PRODUCTNAME",""], # to fit both LibreOffice and BrOffice
+ ["$[officename]","LibreOffice"],
+ ["%PRODUCTNAME","LibreOffice"],
+ ["$PRODUCTNAME","LibreOffice"],
['"+"',"Plus"],
['"*"',"Star"],
['"-"',"Minus"],
commit 8fbbde6f3f3d3282112f8631660ba84f0c07f97b
Author: Gabor Kelemen <kelemeng at gnome.hu>
Date: Sat Dec 10 22:24:34 2016 +0100
tdf#93299 Reconnect 'Outline and Numbering' page and UI
Update bookmark and ahelp HIDs.
Add a description to the 'Edit Style' button.
Change-Id: I9866c00e62d5ea54881e3c8156ef57db4d998fbc
Reviewed-on: https://gerrit.libreoffice.org/31842
Reviewed-by: Olivier Hallot <olivier.hallot at edx.srv.br>
Tested-by: Olivier Hallot <olivier.hallot at edx.srv.br>
Reviewed-on: https://gerrit.libreoffice.org/32310
diff --git a/source/text/swriter/01/05030800.xhp b/source/text/swriter/01/05030800.xhp
index 24f1814..dbd07e8 100644
--- a/source/text/swriter/01/05030800.xhp
+++ b/source/text/swriter/01/05030800.xhp
@@ -28,57 +28,58 @@
</meta>
<body>
<section id="numerierung">
-<bookmark xml-lang="en-US" branch="hid/SW_HID_NUMPARA" id="bm_id3145415" localize="false"/>
-<paragraph xml-lang="en-US" id="hd_id3151173" role="heading" level="1" l10n="CHG"
- oldref="1"><link href="text/swriter/01/05030800.xhp" name="Numbering">Outline & Numbering</link></paragraph>
- <paragraph xml-lang="en-US" id="par_id3154100" role="paragraph" l10n="U" oldref="2"><ahelp hid="HID_NUMPARA">Adds or removes outline level, numbering, or bullets from the paragraph. You can also select the style of numbering to use, and reset the numbering in a numbered list.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/numparapage/NumParaPage" id="bm_id3145415" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3151173" role="heading" level="1"><link href="text/swriter/01/05030800.xhp" name="Numbering">Outline & Numbering</link></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154100" role="paragraph"><ahelp hid="modules/swriter/ui/numparapage/NumParaPage">Adds or removes outline level, numbering, or bullets from the paragraph. You can also select the style of numbering to use, and reset the numbering in a numbered list.</ahelp></paragraph>
</section>
<section id="howtoget">
<embed href="text/swriter/00/00000405.xhp#abnumerierung"/>
</section>
<list type="ordered">
<listitem>
- <paragraph xml-lang="en-US" id="par_id3153536" role="listitem">To change the numbering options for paragraphs that use the same paragraph style, choose <emph>View - Styles and Formatting</emph>, and then click the <emph>Paragraph Styles </emph>icon. Right-click the style in the list, choose <emph>Modify</emph>, and then click the<emph> Outline & Numbering</emph> tab.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153536" role="listitem">To change the numbering options for paragraphs that use the same paragraph style, choose <emph>View - Styles and Formatting</emph>, and then click the <emph>Paragraph Styles</emph> icon. Right-click the style in the list, choose <emph>Modify</emph>, and then click the <emph>Outline & Numbering</emph> tab.</paragraph>
</listitem>
<listitem>
- <paragraph xml-lang="en-US" id="par_id3154470" role="listitem" l10n="CHG" oldref="26">To change the numbering options for selected paragraphs, choose <emph>Format -</emph><link href="text/shared/01/05030000.xhp" name="Paragraph"><emph>Paragraph</emph></link>, and then click the<emph> Outline & Numbering</emph> tab.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154470" role="listitem">To change the numbering options for selected paragraphs, choose <emph>Format - </emph><link href="text/shared/01/05030000.xhp" name="Paragraph"><emph>Paragraph</emph></link>, and then click the <emph>Outline & Numbering</emph> tab.</paragraph>
</listitem>
</list>
-<bookmark xml-lang="en-US" branch="hid/SW_LISTBOX_TP_NUMPARA_LB_OUTLINE_LEVEL" id="bm_id1209200804144764" localize="false"/>
-<paragraph xml-lang="en-US" id="hd_id1209200804371034" role="heading" level="2" l10n="NEW">Outline level</paragraph>
- <paragraph xml-lang="en-US" id="par_id1209200804371097" role="paragraph" l10n="NEW"><ahelp hid=".">Assigns an outline level from 1 to 10 to the selected paragraphs or Paragraph Style.</ahelp> Select <emph>Body text</emph> to reset the outline level.</paragraph><comment>removed two old paras</comment>
- <paragraph xml-lang="en-US" id="hd_id3143283" role="heading" level="2" l10n="U" oldref="5">Numbering</paragraph>
- <bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_NUMPARA:LB_NUMBER_STYLE" id="bm_id3154200" localize="false"/>
-<paragraph xml-lang="en-US" id="hd_id3154188" role="heading" level="2" l10n="CHG"
- oldref="3">Numbering Style</paragraph>
- <paragraph xml-lang="en-US" id="par_id3155178" role="paragraph" l10n="U" oldref="4"><ahelp hid="SW:LISTBOX:TP_NUMPARA:LB_NUMBER_STYLE">Select the <link href="text/swriter/01/05130004.xhp" name="Numbering Style">Numbering Style</link> that you want to apply to the paragraph.</ahelp> These styles are also listed in the <link href="text/swriter/01/05140000.xhp" name="Styles and Formatting">Styles and Formatting</link> window if you click the <emph>Numbering Style</emph> icon.</paragraph>
- <paragraph xml-lang="en-US" id="par_id3149106" role="paragraph" l10n="U" oldref="7">This section only appears when you edit the properties of the current paragraph by choosing <emph>Format - Paragraph</emph>.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw:TriStateBox:TP_NUMPARA:CB_NEW_START" id="bm_id3151262" localize="false"/>
-<paragraph xml-lang="en-US" id="hd_id3151250" role="heading" level="2" l10n="U" oldref="8">Restart at this paragraph</paragraph>
- <paragraph xml-lang="en-US" id="par_id3154831" role="paragraph" l10n="U" oldref="9"><ahelp hid="SW:TRISTATEBOX:TP_NUMPARA:CB_NEW_START">Restarts the numbering at the current paragraph.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw:TriStateBox:TP_NUMPARA:CB_NUMBER_NEW_START" id="bm_id3148973" localize="false"/>
-<paragraph xml-lang="en-US" id="hd_id3147096" role="heading" level="2" l10n="U"
- oldref="24">Start with</paragraph>
- <paragraph xml-lang="en-US" id="par_id3148979" role="paragraph" l10n="U" oldref="25"><ahelp hid="SW_TRISTATEBOX_TP_NUMPARA_CB_NUMBER_NEW_START">Select this check box, and then enter the number that you want to assign to the paragraph.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw:NumericField:TP_NUMPARA:NF_NEW_START" id="bm_id3149043" localize="false"/>
-<paragraph xml-lang="en-US" id="hd_id3147226" role="heading" level="2" l10n="U"
- oldref="10">"Start with" spin button</paragraph>
- <paragraph xml-lang="en-US" id="par_id3153632" role="paragraph" l10n="U" oldref="11"><ahelp hid="SW:NUMERICFIELD:TP_NUMPARA:NF_NEW_START">Enter the number that you want to assign to the paragraph.</ahelp> The following paragraphs are numbered consecutively from the number that you enter here.</paragraph>
- <paragraph xml-lang="en-US" id="hd_id3147581" role="heading" level="2" l10n="U"
- oldref="15">Line numbering</paragraph>
- <paragraph xml-lang="en-US" id="par_id3152771" role="paragraph" l10n="U" oldref="16">Specify the <link href="text/swriter/01/06180000.xhp" name="Line numbering">Line numbering</link> options. To add line numbers to your document, choose <emph>Tools - Line Numbering</emph>.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw:TriStateBox:TP_NUMPARA:CB_COUNT_PARA" id="bm_id3153357" localize="false"/>
-<paragraph xml-lang="en-US" id="hd_id3153345" role="heading" level="2" l10n="U"
- oldref="17">Include this paragraph in line numbering</paragraph>
- <paragraph xml-lang="en-US" id="par_id3156267" role="paragraph" l10n="U" oldref="18"><ahelp hid="SW:TRISTATEBOX:TP_NUMPARA:CB_COUNT_PARA">Includes the current paragraph in the line numbering.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw:TriStateBox:TP_NUMPARA:CB_RESTART_PARACOUNT" id="bm_id3151038" localize="false"/>
-<paragraph xml-lang="en-US" id="hd_id3151026" role="heading" level="2" l10n="U"
- oldref="19">Restart at this paragraph</paragraph>
- <paragraph xml-lang="en-US" id="par_id3149168" role="paragraph" l10n="U" oldref="20"><ahelp hid="SW:TRISTATEBOX:TP_NUMPARA:CB_RESTART_PARACOUNT">Restarts the line numbering at the current paragraph, or at the number that you enter.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw:NumericField:TP_NUMPARA:NF_RESTART_PARA" id="bm_id3155906" localize="false"/>
-<paragraph xml-lang="en-US" id="hd_id3145775" role="heading" level="2" l10n="U"
- oldref="21">Start with</paragraph>
- <paragraph xml-lang="en-US" id="par_id3149355" role="paragraph" l10n="U" oldref="22"><ahelp hid="SW:NUMERICFIELD:TP_NUMPARA:NF_RESTART_PARA">Enter the number at which to restart the line numbering</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/numparapage/comboLB_OUTLINE_LEVEL" id="bm_id1209200804144764" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id1209200804371034" role="heading" level="2">Outline level</paragraph>
+ <paragraph xml-lang="en-US" id="par_id1209200804371097" role="paragraph"><ahelp hid="modules/swriter/ui/numparapage/comboLB_OUTLINE_LEVEL">Assigns an outline level from 1 to 10 to the selected paragraphs or Paragraph Style.</ahelp> Select <emph>Body text</emph> to reset the outline level.</paragraph><comment>removed two old paras</comment>
+ <paragraph xml-lang="en-US" id="hd_id3143283" role="heading" level="2">Numbering</paragraph>
+ <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/numparapage/comboLB_NUMBER_STYLE" id="bm_id3154200" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3154188" role="heading" level="2">Numbering Style</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3155178" role="paragraph"><ahelp hid="modules/swriter/ui/numparapage/comboLB_NUMBER_STYLE">Select the <link href="text/swriter/01/05130004.xhp" name="Numbering Style">Numbering Style</link> that you want to apply to the paragraph.</ahelp> These styles are also listed in the <link href="text/swriter/01/05140000.xhp" name="Styles and Formatting">Styles and Formatting</link> window if you click the <emph>Numbering Style</emph> icon.</paragraph>
+
+ <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/numparapage/editnumstyle" id="bm_id3154201" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3154189" role="heading" level="2">Edit Style</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3155179" role="paragraph"><ahelp hid="modules/swriter/ui/numparapage/editnumstyle">Edit the properties of the selected numbering style.</ahelp> These properties will apply to all paragraphs formatted with the given numbering style.</paragraph>
+
+ <paragraph xml-lang="en-US" id="par_id3149106" role="paragraph">This section only appears when you edit the properties of the current paragraph by choosing <emph>Format - Paragraph</emph>.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/numparapage/checkCB_NEW_START" id="bm_id3151262" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3151250" role="heading" level="2">Restart at this paragraph</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154831" role="paragraph"><ahelp hid="modules/swriter/ui/numparapage/checkCB_NEW_START">Restarts the numbering at the current paragraph.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/numparapage/checkCB_NUMBER_NEW_START" id="bm_id3148973" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3147096" role="heading" level="2">Start with</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3148979" role="paragraph"><ahelp hid="modules/swriter/ui/numparapage/checkCB_NUMBER_NEW_START">Select this check box, and then enter the number that you want to assign to the paragraph.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/numparapage/spinNF_NEW_START" id="bm_id3149043" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3147226" role="heading" level="2">"Start with" spin button</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153632" role="paragraph"><ahelp hid="modules/swriter/ui/numparapage/spinNF_NEW_START">Enter the number that you want to assign to the paragraph.</ahelp> The following paragraphs are numbered consecutively from the number that you enter here.</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3147581" role="heading" level="2">Line numbering</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3152771" role="paragraph">Specify the <link href="text/swriter/01/06180000.xhp" name="Line numbering">Line numbering</link> options. To add line numbers to your document, choose <emph>Tools - Line Numbering</emph>.</paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/numparapage/checkCB_COUNT_PARA" id="bm_id3153357" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3153345" role="heading" level="2">Include this paragraph in line numbering</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3156267" role="paragraph"><ahelp hid="modules/swriter/ui/numparapage/checkCB_COUNT_PARA">Includes the current paragraph in the line numbering.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/numparapage/checkCB_RESTART_PARACOUNT" id="bm_id3151038" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3151026" role="heading" level="2">Restart at this paragraph</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149168" role="paragraph"><ahelp hid="modules/swriter/ui/numparapage/checkCB_RESTART_PARACOUNT">Restarts the line numbering at the current paragraph, or at the number that you enter.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/numparapage/spinNF_RESTART_PARA" id="bm_id3155906" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3145775" role="heading" level="2">Start with</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149355" role="paragraph"><ahelp hid="modules/swriter/ui/numparapage/spinNF_RESTART_PARA">Enter the number at which to restart the line numbering</ahelp></paragraph>
</body>
-</helpdocument>
\ No newline at end of file
+</helpdocument>
More information about the Libreoffice-commits
mailing list