summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVladimir Glazounov <vg@openoffice.org>2006-03-13 13:14:24 +0000
committerVladimir Glazounov <vg@openoffice.org>2006-03-13 13:14:24 +0000
commitd56c1d5bd9c2e46d701c9a69fce9022da97a4341 (patch)
tree62182488484aa590c38ff55060d4d1ba5af82377
parent7544f20038ebd210c995e58938f54ab683ed36e1 (diff)
INTEGRATION: CWS hcpatch01 (1.4.84); FILE MERGED
2006/02/24 12:08:46 ufi 1.4.84.1: i61774
Diffstat
-rwxr-xr-xhelpcontent2/source/text/shared/explorer/database/02010101.xhp17
-rwxr-xr-xhelpcontent2/source/text/shared/explorer/database/11090000.xhp18
2 files changed, 17 insertions, 18 deletions
diff --git a/helpcontent2/source/text/shared/explorer/database/02010101.xhp b/helpcontent2/source/text/shared/explorer/database/02010101.xhp
index c585e43c17..bf00b76595 100755
--- a/helpcontent2/source/text/shared/explorer/database/02010101.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/02010101.xhp
@@ -1,13 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--***********************************************************************
+<!--
+ ***********************************************************************
*
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 02010101.xhp,v $
*
- * $Revision: 1.4 $
+ * $Revision: 1.5 $
*
- * last change: $Author: rt $ $Date: 2005-09-07 22:27:57 $
+ * last change: $Author: vg $ $Date: 2006-03-13 14:13:45 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -32,7 +33,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston,
* MA 02111-1307 USA
*
- ************************************************************************-->
+ ************************************************************************
+ -->
<helpdocument version="1.0">
<meta>
@@ -42,7 +44,7 @@
</topic>
<history>
<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2004-10-08T15:20:41">converted from old format - fpe</lastedited>
+<lastedited date="2006-02-23T16:52:17">converted from old format - fpe</lastedited>
</history>
</meta>
<body>
@@ -60,10 +62,9 @@
<bookmark xml-lang="en-US" branch="hid/HID_DLG_QRY_LEFT_TABLE" id="bm_id3150749" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/HID_DLG_QRY_RIGHT_TABLE" id="bm_id3150752" localize="false"/>
<paragraph role="heading" id="hd_id3155066" xml-lang="en-US" level="2" l10n="U" oldref="17">Tables involved</paragraph>
-<paragraph role="paragraph" id="par_id3153924" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="HID_DLG_QRY_RIGHT_TABLE">Specifies two different tables that you want to join.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_RELDLG_KEYFIELDS" id="bm_id3148481" localize="false"/>
+<paragraph role="paragraph" id="par_id3153924" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="HID_DLG_QRY_RIGHT_TABLE">Specifies two different tables that you want to join.</ahelp></paragraph><comment>UFI: removed a help id</comment>
<paragraph role="heading" id="hd_id3155766" xml-lang="en-US" level="2" l10n="U" oldref="15">Fields involved</paragraph>
-<paragraph role="paragraph" id="par_id3148994" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="HID_RELDLG_KEYFIELDS">Specifies two data fields that will be joined by a relation.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3148994" xml-lang="en-US" l10n="CHG" oldref="14"><ahelp hid=".">Specifies two data fields that will be joined by a relation.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3159267" xml-lang="en-US" level="2" l10n="U" oldref="3">Options</paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_DLG_QRY_JOINTYPE" id="bm_id3147321" localize="false"/>
<paragraph role="heading" id="hd_id3147340" xml-lang="en-US" level="3" l10n="U" oldref="13">Type</paragraph>
diff --git a/helpcontent2/source/text/shared/explorer/database/11090000.xhp b/helpcontent2/source/text/shared/explorer/database/11090000.xhp
index fa21b9a37d..abca64d18c 100755
--- a/helpcontent2/source/text/shared/explorer/database/11090000.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/11090000.xhp
@@ -1,13 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--***********************************************************************
+<!--
+ ***********************************************************************
*
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 11090000.xhp,v $
*
- * $Revision: 1.4 $
+ * $Revision: 1.5 $
*
- * last change: $Author: rt $ $Date: 2005-09-07 22:35:03 $
+ * last change: $Author: vg $ $Date: 2006-03-13 14:14:24 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -32,7 +33,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston,
* MA 02111-1307 USA
*
- ************************************************************************-->
+ ************************************************************************
+ -->
<helpdocument version="1.0">
<meta>
@@ -42,7 +44,7 @@
</topic>
<history>
<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2004-10-25T12:09:03">FPE: Removed mentioning Adabas (#i10510)</lastedited>
+<lastedited date="2006-02-23T15:43:03">FPE: Removed mentioning Adabas (#i10510)</lastedited>
</history>
</meta>
<body>
@@ -56,12 +58,8 @@
<bookmark xml-lang="en-US" branch="hid/HID_DSADMIN_SUPPRESS_VERSIONCL" id="bm_id3154046" localize="false"/>
<paragraph role="heading" id="hd_id3148685" xml-lang="en-US" level="2" l10n="U" oldref="21">Display version columns (when available)</paragraph>
<paragraph role="paragraph" id="par_id3149164" xml-lang="en-US" l10n="CHG" oldref="22">Some databases track changes to each record by assigning version number to fields that are changed. This number is incremented by 1 each time the field is changed <ahelp hid="HID_DSADMIN_SUPPRESS_VERSIONCL">Displays the internal version number of the record in the database table.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SID_FM_SORTUP" id="bm_id5955967" localize="false"/><!-- HID added by script -->
-<bookmark xml-lang="en-US" branch="hid/.uno:Sortup" id="bm_id5298928" localize="false"/>
<paragraph role="heading" id="hd_id3154923" xml-lang="en-US" level="2" l10n="U" oldref="8">Sort Ascending<comment>in View - Sort menu</comment></paragraph>
-<paragraph role="paragraph" id="par_id3147559" xml-lang="en-US" l10n="U" oldref="9"><ahelp hid="HID_DSADMIN_SUPPRESS_VERSIONCL">Sorts the list of table names in ascending order starting at the beginning of the alphabet.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SID_FM_SORTDOWN" id="bm_id8873253" localize="false"/><!-- HID added by script -->
-<bookmark xml-lang="en-US" branch="hid/.uno:SortDown" id="bm_id9697561" localize="false"/>
+<paragraph role="paragraph" id="par_id3147559" xml-lang="en-US" l10n="U" oldref="9"><ahelp hid="HID_DSADMIN_SUPPRESS_VERSIONCL">Sorts the list of table names in ascending order starting at the beginning of the alphabet.</ahelp></paragraph><comment>UFI: removed 4 SortUp and SortDown help ids</comment>
<paragraph role="heading" id="hd_id3148550" xml-lang="en-US" level="2" l10n="U" oldref="10">Sort Descending<comment>in View - Sort menu</comment></paragraph>
<paragraph role="paragraph" id="par_id3148664" xml-lang="en-US" l10n="U" oldref="11"><ahelp hid="HID_DSADMIN_SUPPRESS_VERSIONCL">Sorts the list of table names in descending order starting at the end of the alphabet.</ahelp></paragraph>
</body>
generated by cgit (git 2.34.1) at 2024-08-21 16:44:36 +0000