source/text/shared/01/xformsdataadd.xhp | 44 ++++++++++++++++----------------
source/text/swriter/01/05040800.xhp | 4 +-
2 files changed, 24 insertions(+), 24 deletions(-)
New commits:
commit f1e1bf8afae41ba0a7defa75b48ca827d79e33cd
Author: Andras Timar <andras.ti...@collabora.com>
Date: Fri Apr 25 11:26:22 2014 +0200
fix nested <bookmark> tags
Change-Id: I5b377eeef9501d867c482c4608a61c3daf2597ea
diff --git a/source/text/shared/01/xformsdataadd.xhp
b/source/text/shared/01/xformsdataadd.xhp
index eb57bf5..727f3bf 100644
--- a/source/text/shared/01/xformsdataadd.xhp
+++ b/source/text/shared/01/xformsdataadd.xhp
@@ -29,77 +29,77 @@
</topic>
</meta>
<body>
-
-
-
-<bookmark xml-lang="en-US" branch="index"
id="bm_id7194738"><bookmark_value>read-only items in Data
Navigator</bookmark_value>
+
+
+
<bookmark xml-lang="en-US"
branch="hid/svx/ui/adddataitemdialog/AddDataItemDialog" id="bm_id5775628"
localize="false"/>
+<bookmark xml-lang="en-US" branch="index"
id="bm_id7194738"><bookmark_value>read-only items in Data
Navigator</bookmark_value>
<bookmark_value>Data Navigator;adding/editing items</bookmark_value>
</bookmark>
<comment>MW added a new entry and deleted "editing;" and "adding;"</comment>
<paragraph xml-lang="en-US" id="par_idN10547" role="heading" level="1"
l10n="NEW">Add / Edit</paragraph>
<paragraph xml-lang="en-US" id="par_idN1054B" role="paragraph"
l10n="CHG"><ahelp hid=".">Adds a new item or edits the selected item in the
XForms Data Navigator.</ahelp> Items can be elements, attributes, submissions,
or bindings.</paragraph>
<paragraph xml-lang="en-US" id="par_idN10560" role="paragraph"
l10n="CHG"><ahelp hid=".">%PRODUCTNAME inserts a new item directly after the
currently selected item in the Data Navigator. A new attribute is added to the
currently selected element.</ahelp></paragraph>
-
+
<bookmark xml-lang="en-US" branch="hid/svx/ui/adddataitemdialog/name"
id="bm_id5775627" localize="false"/>
<paragraph xml-lang="en-US" id="par_idN10563" role="heading" level="3"
l10n="NEW">Name</paragraph>
<paragraph xml-lang="en-US" id="par_idN10567" role="paragraph"
l10n="NEW"><ahelp hid=".">Enter the name of the item.</ahelp></paragraph>
<paragraph xml-lang="en-US" id="par_idN1056A" role="note" l10n="CHG">The
attribute names must be unique within the same group.</paragraph>
<paragraph xml-lang="en-US" id="par_idN1056D" role="heading" level="3"
l10n="NEW">Type</paragraph>
<paragraph xml-lang="en-US" id="par_idN10571" role="paragraph"
l10n="NEW"><ahelp hid=".">Select the type of a new item. You cannot change the
type of an edited item.</ahelp></paragraph>
-
+
<bookmark xml-lang="en-US" branch="hid/svx/ui/adddataitemdialog/value"
id="bm_id9302041" localize="false"/>
<paragraph xml-lang="en-US" id="par_idN10574" role="heading" level="3"
l10n="NEW">Default value</paragraph>
<paragraph xml-lang="en-US" id="par_idN10578" role="paragraph"
l10n="NEW"><ahelp hid=".">Enter a default value for the selected
item.</ahelp></paragraph>
<paragraph xml-lang="en-US" id="par_idN1057B" role="heading" level="2"
l10n="NEW">Settings</paragraph>
<paragraph xml-lang="en-US" id="par_idN1057F" role="paragraph"
l10n="NEW"><ahelp hid=".">Specifies the properties of the selected
item.</ahelp></paragraph>
-
+
<bookmark xml-lang="en-US" branch="hid/svx/ui/adddataitemdialog/datatype"
id="bm_id5551011" localize="false"/>
<paragraph xml-lang="en-US" id="par_idN10582" role="heading" level="3"
l10n="NEW">Data type</paragraph>
<paragraph xml-lang="en-US" id="par_idN10586" role="paragraph"
l10n="NEW"><ahelp hid=".">Select the data type for the selected
item.</ahelp></paragraph>
-
+
<bookmark xml-lang="en-US" branch="hid/svx/ui/adddataitemdialog/required"
id="bm_id2487258" localize="false"/>
-
+
<bookmark xml-lang="en-US" branch="hid/EXTENSIONS_HID_PROP_XSD_REQUIRED"
id="bm_id1239661" localize="false"/>
<paragraph xml-lang="en-US" id="par_idN10589" role="heading" level="3"
l10n="NEW">Required</paragraph>
<paragraph xml-lang="en-US" id="par_idN1058D" role="paragraph"
l10n="NEW"><ahelp hid=".">Specifies if the item must be included on the
XForm.</ahelp></paragraph>
-
+
<bookmark xml-lang="en-US" branch="hid/svx/ui/adddataitemdialog/requiredcond"
id="bm_id1404156" localize="false"/>
<paragraph xml-lang="en-US" id="par_idN10590" role="paragraph"
l10n="NEW">The <emph>Condition</emph> button opens the <link
href="text/shared/01/xformsdataaddcon.xhp">Add Condition</link> dialog where
you can enter used namespaces and full XPath expressions.</paragraph>
-
+
<bookmark xml-lang="en-US" branch="hid/svx/ui/adddataitemdialog/relevant"
id="bm_id8867458" localize="false"/>
-
+
<bookmark xml-lang="en-US" branch="hid/EXTENSIONS_HID_PROP_XSD_RELEVANT"
id="bm_id3679616" localize="false"/>
<paragraph xml-lang="en-US" id="par_idN105AA" role="heading" level="3"
l10n="NEW">Relevant</paragraph>
<paragraph xml-lang="en-US" id="par_idN105AE" role="paragraph"
l10n="NEW"><ahelp hid=".">Declares the item as relevant.</ahelp></paragraph>
-
+
<bookmark xml-lang="en-US" branch="hid/svx/ui/adddataitemdialog/relevantcond"
id="bm_id3488570" localize="false"/>
<paragraph xml-lang="en-US" id="par_idN105B1" role="paragraph"
l10n="NEW">The <emph>Condition</emph> button opens the <link
href="text/shared/01/xformsdataaddcon.xhp">Add Condition</link> dialog where
you can enter used namespaces and full XPath expressions.</paragraph>
-
+
<bookmark xml-lang="en-US" branch="hid/svx/ui/adddataitemdialog/constraint"
id="bm_id2007812" localize="false"/>
-
+
<bookmark xml-lang="en-US" branch="hid/EXTENSIONS_HID_PROP_XSD_CONSTRAINT"
id="bm_id8594622" localize="false"/>
<paragraph xml-lang="en-US" id="par_idN105CB" role="heading" level="3"
l10n="NEW">Constraint</paragraph>
<paragraph xml-lang="en-US" id="par_idN105CF" role="paragraph"
l10n="NEW"><ahelp hid=".">Declares the item as a constraint.</ahelp></paragraph>
-
+
<bookmark xml-lang="en-US"
branch="hid/svx/ui/adddataitemdialog/constraintcond" id="bm_id2240058"
localize="false"/>
<paragraph xml-lang="en-US" id="par_idN106C7" role="paragraph"
l10n="NEW">The <emph>Condition</emph> button opens the <link
href="text/shared/01/xformsdataaddcon.xhp">Add Condition</link> dialog where
you can specify the constraint condition.</paragraph>
-
+
<bookmark xml-lang="en-US" branch="hid/svx/ui/adddataitemdialog/readonly"
id="bm_id6203192" localize="false"/>
-
+
<bookmark xml-lang="en-US" branch="hid/EXTENSIONS_HID_PROP_XSD_READONLY"
id="bm_id4252449" localize="false"/>
<paragraph xml-lang="en-US" id="par_idN105E4" role="heading" level="3"
l10n="NEW">Read-only</paragraph>
<paragraph xml-lang="en-US" id="par_idN105E8" role="paragraph"
l10n="NEW"><ahelp hid=".">Declares the item as read-only.</ahelp></paragraph>
-
+
<bookmark xml-lang="en-US" branch="hid/svx/ui/adddataitemdialog/readonlycond"
id="bm_id165105" localize="false"/>
<paragraph xml-lang="en-US" id="par_idN105EB" role="paragraph"
l10n="NEW">The <emph>Condition</emph> button opens the <link
href="text/shared/01/xformsdataaddcon.xhp">Add Condition</link> dialog where
you can enter used namespaces and full XPath expressions.</paragraph>
-
+
<bookmark xml-lang="en-US" branch="hid/svx/ui/adddataitemdialog/calculate"
id="bm_id6361583" localize="false"/>
-
+
<bookmark xml-lang="en-US" branch="hid/EXTENSIONS_HID_PROP_XSD_CALCULATION"
id="bm_id383617" localize="false"/>
<paragraph xml-lang="en-US" id="par_idN10605" role="heading" level="3"
l10n="CHG">Calculate / Calculation<comment>UFI: inconsistent use of
name</comment></paragraph>
<paragraph xml-lang="en-US" id="par_idN10609" role="paragraph"
l10n="NEW"><ahelp hid=".">Declares that the item is
calculated.</ahelp></paragraph>
-
+
<bookmark xml-lang="en-US" branch="hid/svx/ui/adddataitemdialog/calculatecond"
id="bm_id2518997" localize="false"/>
<paragraph xml-lang="en-US" id="par_idN1076B" role="paragraph"
l10n="NEW">The <emph>Condition</emph> button opens the <link
href="text/shared/01/xformsdataaddcon.xhp">Add Condition</link> dialog where
you can enter the calculation.</paragraph>
</body>
diff --git a/source/text/swriter/01/05040800.xhp
b/source/text/swriter/01/05040800.xhp
index 2d26c01..b9cc398 100644
--- a/source/text/swriter/01/05040800.xhp
+++ b/source/text/swriter/01/05040800.xhp
@@ -18,7 +18,7 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
-->
-
+
<helpdocument version="1.0">
<meta>
<topic id="textswriter0105040800xml" indexer="include" status="PUBLISH">
@@ -28,8 +28,8 @@
</meta>
<body>
<section id="textraster">
-<bookmark xml-lang="en-US" branch="index"
id="bm_id3150760"><bookmark_value>text grid for Asian layout</bookmark_value>
<bookmark xml-lang="en-US"
branch="hid/modules/swriter/ui/textgridpage/TextGridPage" id="bm_id3145580"
localize="false"/>
+<bookmark xml-lang="en-US" branch="index"
id="bm_id3150760"><bookmark_value>text grid for Asian layout</bookmark_value>
</bookmark>
<paragraph role="heading" id="hd_id3150760" xml-lang="en-US" level="1"
l10n="U" oldref="18"><link href="text/swriter/01/05040800.xhp" name="Text
Grid">Text Grid</link></paragraph>
<paragraph role="paragraph" id="par_id3151171" xml-lang="en-US" l10n="U"
oldref="17"><ahelp hid=".">Adds a text grid to the current page style. This
option is only available if Asian language support is enabled under
<emph>Language Settings - Languages</emph> in the Options dialog
box.</ahelp></paragraph>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
