summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-07-21 18:38:59 +0200
committerBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-07-21 18:38:59 +0200
commit5ec28fba437b76d13f73fb996f04dfaa5cd9ad09 (patch)
tree8a7be61212ef25ed3e39a14caf273c287614b4ff
parent4944f9121e1e001c6663b1aeae08e80b65c3bcf1 (diff)
parent4de147c19f472e588726ec5573899dfa10f9bd26 (diff)
Merge branch 'master' into feature/gnumake4 feature/gnumake4
-rw-r--r--helpcontent2/helpers/help_hid.lst3
-rw-r--r--helpcontent2/helpers/longnames_commands.csv2
-rw-r--r--helpcontent2/helpers/uno-commands.csv1
-rw-r--r--helpcontent2/helpers/uno_hid.lst2
-rw-r--r--helpcontent2/helpers/unocmds.txt1
-rw-r--r--helpcontent2/helpers/update_tree.pl30
-rw-r--r--helpcontent2/source/text/sbasic/shared/02/11040000.xhp2
-rw-r--r--helpcontent2/source/text/scalc/01/02110000.xhp2
-rw-r--r--helpcontent2/source/text/scalc/01/02150000.xhp4
-rw-r--r--helpcontent2/source/text/scalc/02/06040000.xhp2
-rw-r--r--helpcontent2/source/text/scalc/guide/scenario.xhp2
-rw-r--r--helpcontent2/source/text/scalc/guide/table_view.xhp3
-rw-r--r--helpcontent2/source/text/schart/01/smooth_line_properties.xhp14
-rw-r--r--helpcontent2/source/text/schart/01/type_xy.xhp2
-rw-r--r--helpcontent2/source/text/shared/02/09070100.xhp4
-rw-r--r--helpcontent2/source/text/shared/main0213.xhp4
-rw-r--r--helpcontent2/source/text/shared/optionen/01020200.xhp111
-rw-r--r--helpcontent2/source/text/shared/optionen/01030000.xhp1
-rw-r--r--helpcontent2/source/text/shared/optionen/01060100.xhp5
-rw-r--r--helpcontent2/source/text/shared/optionen/makefile.mk1
-rw-r--r--helpcontent2/util/sbasic/makefile.mk1
-rw-r--r--helpcontent2/util/scalc/makefile.mk1
-rw-r--r--helpcontent2/util/schart/makefile.mk1
-rw-r--r--helpcontent2/util/sdatabase/makefile.mk1
-rw-r--r--helpcontent2/util/sdraw/makefile.mk1
-rw-r--r--helpcontent2/util/simpress/makefile.mk1
-rw-r--r--helpcontent2/util/smath/makefile.mk1
-rw-r--r--helpcontent2/util/swriter/makefile.mk1
-rw-r--r--helpcontent2/wiki-to-help/HHC/htmlhelp.reg12
-rwxr-xr-xhelpcontent2/wiki-to-help/HHC/install_hhc.sh60
-rw-r--r--helpcontent2/wiki-to-help/README29
-rwxr-xr-xhelpcontent2/wiki-to-help/convert.py112
-rw-r--r--helpcontent2/wiki-to-help/hhc.py64
-rw-r--r--helpcontent2/wiki-to-help/mw.py26
-rw-r--r--helpcontent2/wiki-to-help/test2.xml381
35 files changed, 719 insertions, 169 deletions
diff --git a/helpcontent2/helpers/help_hid.lst b/helpcontent2/helpers/help_hid.lst
index d9c1db7b7e..ffb9de2925 100644
--- a/helpcontent2/helpers/help_hid.lst
+++ b/helpcontent2/helpers/help_hid.lst
@@ -5620,8 +5620,6 @@ SID_OLE_ACTIVATE,26607,.uno:ActivateOLE
SID_OLE_DEACTIVATE,26608,.uno:Deactivate
SID_OLE_OBJECT,26606,.uno:OleObject
SID_OLE_SELECT,26621,.uno:SelectOLE
-SID_ONLINE_REGISTRATION,6537,.uno:OnlineRegistrationDlg
-SID_ONLINE_REGISTRATION_DLG,6540,.uno:StartRegistrationDialog
SID_OPENDLG_CONDFRMT,26159,.uno:ConditionalFormatDialog
SID_OPENDLG_CONSOLIDATE,26150,.uno:DataConsolidate
SID_OPENDLG_EDIT_PRINTAREA,26605,.uno:EditPrintArea
@@ -9212,7 +9210,6 @@ svx_RadioButton_RID_SVXPAGE_GRFCROP_RB_SIZECONST,704610839,
svx_RadioButton_RID_SVXPAGE_GRFCROP_RB_ZOOMCONST,704610840,
svx_RadioButton_RID_SVXPAGE_HYPERLINK_INTERNET_RB_LINKTYP_FTP,704446979,
svx_RadioButton_RID_SVXPAGE_HYPERLINK_INTERNET_RB_LINKTYP_INTERNET,704446978,
-svx_RadioButton_RID_SVXPAGE_HYPERLINK_INTERNET_RB_LINKTYP_TELNET,704446980,
svx_RadioButton_RID_SVXPAGE_HYPERLINK_MAIL_RB_LINKTYP_MAIL,704463362,
svx_RadioButton_RID_SVXPAGE_HYPERLINK_MAIL_RB_LINKTYP_NEWS,704463363,
svx_RadioButton_RID_SVXPAGE_HYPERLINK_NEWDOCUMENT_RB_EDITLATER,704496131,
diff --git a/helpcontent2/helpers/longnames_commands.csv b/helpcontent2/helpers/longnames_commands.csv
index 3ba7bfd355..92a9e84e9f 100644
--- a/helpcontent2/helpers/longnames_commands.csv
+++ b/helpcontent2/helpers/longnames_commands.csv
@@ -1444,8 +1444,6 @@ SID_OLE_ACTIVATE,.uno:ActivateOLE
SID_OLE_DEACTIVATE,.uno:Deactivate
SID_OLE_OBJECT,.uno:OleObject
SID_OLE_SELECT,.uno:SelectOLE
-SID_ONLINE_REGISTRATION,.uno:OnlineRegistrationDlg
-SID_ONLINE_REGISTRATION_DLG,.uno:StartRegistrationDialog
SID_OPENDLG_CHART,.uno:StarChartDialog
SID_OPENDLG_CONDFRMT,.uno:ConditionalFormatDialog
SID_OPENDLG_CONSOLIDATE,.uno:DataConsolidate
diff --git a/helpcontent2/helpers/uno-commands.csv b/helpcontent2/helpers/uno-commands.csv
index 7ce92427e8..5baf4c294f 100644
--- a/helpcontent2/helpers/uno-commands.csv
+++ b/helpcontent2/helpers/uno-commands.csv
@@ -1199,7 +1199,6 @@
.uno:ObjectPosition
.uno:Objects3DToolbox
.uno:OnlineAutoFormat
-.uno:OnlineRegistrationDlg
.uno:Open
.uno:OpenHyperlinkOnCursor
.uno:OpenReadOnly
diff --git a/helpcontent2/helpers/uno_hid.lst b/helpcontent2/helpers/uno_hid.lst
index 81ca33632d..06cb093447 100644
--- a/helpcontent2/helpers/uno_hid.lst
+++ b/helpcontent2/helpers/uno_hid.lst
@@ -1439,8 +1439,6 @@ SID_OLE_ACTIVATE,26607,.uno:ActivateOLE
SID_OLE_DEACTIVATE,26608,.uno:Deactivate
SID_OLE_OBJECT,26606,.uno:OleObject
SID_OLE_SELECT,26621,.uno:SelectOLE
-SID_ONLINE_REGISTRATION,6537,.uno:OnlineRegistrationDlg
-SID_ONLINE_REGISTRATION_DLG,6540,.uno:StartRegistrationDialog
SID_OPENDLG_CHART,26155,.uno:StarChartDialog
SID_OPENDLG_CONDFRMT,26159,.uno:ConditionalFormatDialog
SID_OPENDLG_CONSOLIDATE,26150,.uno:DataConsolidate
diff --git a/helpcontent2/helpers/unocmds.txt b/helpcontent2/helpers/unocmds.txt
index e6a0a375d6..014f2ca9ca 100644
--- a/helpcontent2/helpers/unocmds.txt
+++ b/helpcontent2/helpers/unocmds.txt
@@ -729,7 +729,6 @@
.uno:ObjectPosition;shared/01/05250000.xhp
.uno:Objects3DToolbox;simpress/02/10090000.xhp
.uno:OnlineAutoFormat;swriter/01/05150100.xhp
-.uno:OnlineRegistrationDlg;shared/01/08060100.xhp
.uno:Open;shared/01/01020000.xhp
.uno:OpenHyperlinkOnCursor;shared/02/09070000.xhp
.uno:OpenReadOnly;shared/02/01171000.xhp
diff --git a/helpcontent2/helpers/update_tree.pl b/helpcontent2/helpers/update_tree.pl
index 27b1a1dbbf..8dc7bf4e98 100644
--- a/helpcontent2/helpers/update_tree.pl
+++ b/helpcontent2/helpers/update_tree.pl
@@ -68,15 +68,12 @@ if ( ! defined $prj ) {
{
$source_dir = $ENV{TRYSDF};
}
- else
+ elsif( defined $ENV{LOCALIZESDF} && $ENV{LOCALIZESDF} ne "" )
{
$source_dir = $ENV{LOCALIZESDF};
}
$source_dir =~ s/\/auxiliary\/localize.sdf$// ;
}
- #else {die "ERROR: The env variables TRYSDF LOCALIZATION_FOUND LOCALIZESDF not found ... something is wrong!\n";}
-
-
$treestrings = "$source_dir/text/shared/tree_strings.xhp";
} else {
$tree_src = "$prj\/source\/auxiliary";
@@ -89,13 +86,11 @@ if ( ! defined $prj ) {
{
$source_dir = $ENV{TRYSDF};
}
- else
+ elsif ( defined $ENV{LOCALIZESDF} && $ENV{LOCALIZESDF} ne "" )
{
$source_dir = $ENV{LOCALIZESDF};
}
$source_dir =~ s/\/auxiliary\/localize.sdf$// ;
- #else {die "ERROR: The env variables TRYSDF LOCALIZATION_FOUND LOCALIZESDF not found ... something is wrong!\n";}
-
}
# Get the English tree files as master
@@ -107,15 +102,22 @@ if ( ! defined $prj ) {
# Update localizations from sdf
#-------------------------------
-@langs = split /\s+/, $with_lang;
-&read_loc;
-print "################\nUpdating the treefiles for @langs \n";
-for $l(@langs) {
- if ($l ne "en-US") {
- &do_lang($l);
+if( defined $with_lang && $with_lang ne "" )
+{
+ @langs = split /\s+/, $with_lang;
+ &read_loc;
+ print "################\nUpdating the treefiles for @langs \n";
+ for $l(@langs)
+ {
+ if ($l ne "en-US") {
+ &do_lang($l);
+ }
}
}
-
+else
+{
+ print "\nNo WITH_LANG set, skipping l10n\n";
+}
#-------------------------------
#
$t1 = new Benchmark;
diff --git a/helpcontent2/source/text/sbasic/shared/02/11040000.xhp b/helpcontent2/source/text/sbasic/shared/02/11040000.xhp
index 4955c1a9a7..54bf40de04 100644
--- a/helpcontent2/source/text/sbasic/shared/02/11040000.xhp
+++ b/helpcontent2/source/text/sbasic/shared/02/11040000.xhp
@@ -55,7 +55,7 @@
<tablerow>
<tablecell colspan="" rowspan="">
<paragraph role="paragraph" id="par_id3146797" xml-lang="en-US" l10n="E">
-<image id="img_id3148538" src="cmd/sc_stop.png" width="0.222inch" height="0.222inch"><alt id="alt_id3148538" xml-lang="en-US">Icon</alt>
+<image id="img_id3148538" src="cmd/sc_basicstop.png" width="0.222inch" height="0.222inch"><alt id="alt_id3148538" xml-lang="en-US">Icon</alt>
</image></paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
diff --git a/helpcontent2/source/text/scalc/01/02110000.xhp b/helpcontent2/source/text/scalc/01/02110000.xhp
index e2e84bc15e..502a41198a 100644
--- a/helpcontent2/source/text/scalc/01/02110000.xhp
+++ b/helpcontent2/source/text/scalc/01/02110000.xhp
@@ -147,7 +147,7 @@
<tablerow>
<tablecell>
<paragraph role="paragraph" id="par_id3148745" xml-lang="en-US" l10n="E">
-<image id="img_id3159256" src="sc/res/imglst/navipi/na07.png" width="0.2228in" height="0.2228in"><alt id="alt_id3159256" xml-lang="en-US">Icon</alt>
+<image id="img_id3159256" src="sc/imglst/navipi/na07.png" width="0.2228in" height="0.2228in"><alt id="alt_id3159256" xml-lang="en-US">Icon</alt>
</image></paragraph>
</tablecell>
<tablecell>
diff --git a/helpcontent2/source/text/scalc/01/02150000.xhp b/helpcontent2/source/text/scalc/01/02150000.xhp
index 38d70ba0a6..6f1bc4e4fa 100644
--- a/helpcontent2/source/text/scalc/01/02150000.xhp
+++ b/helpcontent2/source/text/scalc/01/02150000.xhp
@@ -52,8 +52,8 @@
<section id="howtoget">
<embed href="text/scalc/00/00000402.xhp#binhalt"/>
</section>
-<paragraph role="tip" id="par_id3159154" xml-lang="en-US" l10n="U" oldref="21">This dialog is also called by pressing Del after the cell cursor has been activated on the sheet.</paragraph>
-<paragraph role="tip" id="par_id3145367" xml-lang="en-US" l10n="U" oldref="22">Pressing Backspace deletes content without calling the dialog or changing formats.</paragraph>
+<paragraph role="tip" id="par_id3159154" xml-lang="en-US" l10n="U" oldref="21">This dialog is also called by pressing Backspace after the cell cursor has been activated on the sheet.</paragraph>
+<paragraph role="tip" id="par_id3145367" xml-lang="en-US" l10n="U" oldref="22">Pressing Delete deletes content without calling the dialog or changing formats.</paragraph>
<paragraph role="tip" id="par_id3153951" xml-lang="en-US" l10n="U" oldref="23">Use <emph>Cut</emph> on the Standard bar to delete contents and formats without the dialog.</paragraph>
<paragraph role="heading" id="hd_id3148575" xml-lang="en-US" level="2" l10n="U" oldref="3">Selection</paragraph>
<paragraph role="paragraph" id="par_id3149665" xml-lang="en-US" l10n="U" oldref="4">This area lists the options for deleting contents.</paragraph>
diff --git a/helpcontent2/source/text/scalc/02/06040000.xhp b/helpcontent2/source/text/scalc/02/06040000.xhp
index a6b4cd96b0..25a9e0dc09 100644
--- a/helpcontent2/source/text/scalc/02/06040000.xhp
+++ b/helpcontent2/source/text/scalc/02/06040000.xhp
@@ -50,7 +50,7 @@
<tablerow>
<tablecell colspan="" rowspan="">
<paragraph role="paragraph" id="par_id3153770" xml-lang="en-US" l10n="E">
-<image id="img_id3145785" src="sc/res/imglst/apptbx/sc26049.png" width="5.64mm" height="5.64mm"><alt id="alt_id3145785" xml-lang="en-US">Icon</alt>
+<image id="img_id3145785" src="sc/imglst/sc26049.png" width="5.64mm" height="5.64mm"><alt id="alt_id3145785" xml-lang="en-US">Icon</alt>
</image></paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
diff --git a/helpcontent2/source/text/scalc/guide/scenario.xhp b/helpcontent2/source/text/scalc/guide/scenario.xhp
index fe889eef44..1fc9e30174 100644
--- a/helpcontent2/source/text/scalc/guide/scenario.xhp
+++ b/helpcontent2/source/text/scalc/guide/scenario.xhp
@@ -68,7 +68,7 @@
</listitem>
<listitem>
<paragraph role="listitem" id="par_id3155764" xml-lang="en-US" l10n="CHG" oldref="13">Click the <emph>Scenarios</emph> icon
-<image id="img_id7617114" src="sc/res/imglst/navipi/na07.png" width="0.222inch" height="0.222inch"><alt id="alt_id7617114" xml-lang="en-US">Scenarios icon</alt>
+<image id="img_id7617114" src="sc/imglst/navipi/na07.png" width="0.222inch" height="0.222inch"><alt id="alt_id7617114" xml-lang="en-US">Scenarios icon</alt>
</image> in the Navigator.</paragraph>
</listitem>
</list>
diff --git a/helpcontent2/source/text/scalc/guide/table_view.xhp b/helpcontent2/source/text/scalc/guide/table_view.xhp
index 8413a2640f..1af9c74733 100644
--- a/helpcontent2/source/text/scalc/guide/table_view.xhp
+++ b/helpcontent2/source/text/scalc/guide/table_view.xhp
@@ -59,8 +59,7 @@
<paragraph role="paragraph" id="par_id3147436" xml-lang="en-US" l10n="U" oldref="4">To hide grid lines:</paragraph>
<list type="unordered">
<listitem>
-<paragraph role="listitem" id="par_id3153726" xml-lang="en-US" l10n="CHG" oldref="5">Under the menu item <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Calc</emph>
-<emph>,</emph> go to the <emph>View</emph> tab page. Unmark <emph>Grid lines</emph>. Confirm with <emph>OK</emph>.</paragraph>
+<paragraph role="listitem" id="par_id3153726" xml-lang="en-US" l10n="CHG" oldref="5">Under the menu item <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Calc</emph><emph>,</emph> go to the <emph>View</emph> tab page. Choose to hide <emph>Grid lines</emph> from the drop-down. Confirm with <emph>OK</emph>.</paragraph>
</listitem>
</list>
<section id="relatedtopics">
diff --git a/helpcontent2/source/text/schart/01/smooth_line_properties.xhp b/helpcontent2/source/text/schart/01/smooth_line_properties.xhp
index 463c4a5ffa..0551b43829 100644
--- a/helpcontent2/source/text/schart/01/smooth_line_properties.xhp
+++ b/helpcontent2/source/text/schart/01/smooth_line_properties.xhp
@@ -55,22 +55,22 @@
<list type="ordered">
<listitem>
<paragraph role="paragraph" id="par_id1601611" xml-lang="en-US" l10n="NEW">Select Cubic Spline or B-Spline.</paragraph>
-<paragraph role="paragraph" id="par_id879848" xml-lang="en-US" l10n="NEW">These are mathematical models that influence the display of the curves. The cubic spline line passes through all points, while the B-spline line connects the first and last point and passes by the intermediate points.</paragraph>
+<paragraph role="paragraph" id="par_id879848" xml-lang="en-US" l10n="NEW">These are mathematical models that influence the display of the curves. The curves are created by joining together segments of polynomials.</paragraph>
</listitem>
<listitem>
<paragraph role="paragraph" id="par_id3464461" xml-lang="en-US" l10n="NEW">Optionally set the resolution. A higher value leads to a smoother line.</paragraph>
</listitem>
<listitem>
-<paragraph role="paragraph" id="par_id6998809" xml-lang="en-US" l10n="NEW">For B-spline lines optionally set the data points order.</paragraph>
+<paragraph role="paragraph" id="par_id6998809" xml-lang="en-US" l10n="NEW">For B-spline lines optionally set the degree of the polynomials.</paragraph>
</listitem>
-</list><comment>1088553477 cubic spline</comment>
+</list>
<bookmark xml-lang="en-US" branch="hid/chart2:RadioButton:DLG_SPLINE_PROPERTIES:RB_SPLINES_CUBIC" id="bm_id1593676" localize="false"/>
-<paragraph role="paragraph" id="par_id3424481" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Apply a cubic spline model.</ahelp></paragraph><comment>1088553478 b-spline</comment>
+<paragraph role="paragraph" id="par_id3424481" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Apply a cubic spline model.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/chart2:RadioButton:DLG_SPLINE_PROPERTIES:RB_SPLINES_B" id="bm_id1243629" localize="false"/>
-<paragraph role="paragraph" id="par_id1068758" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Apply a B-spline model.</ahelp></paragraph><comment>1088559618 resolution</comment>
+<paragraph role="paragraph" id="par_id1068758" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Apply a B-spline model.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/chart2:MetricField:DLG_SPLINE_PROPERTIES:MF_SPLINE_RESOLUTION" id="bm_id9044770" localize="false"/>
-<paragraph role="paragraph" id="par_id2320932" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Set the resolution.</ahelp></paragraph><comment>1088559617 data points order</comment>
+<paragraph role="paragraph" id="par_id2320932" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Set the resolution.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/chart2:MetricField:DLG_SPLINE_PROPERTIES:MF_SPLINE_ORDER" id="bm_id3674123" localize="false"/>
-<paragraph role="paragraph" id="par_id8638874" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Set the data points order.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id8638874" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Set the degree of the polynomials.</ahelp></paragraph>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/schart/01/type_xy.xhp b/helpcontent2/source/text/schart/01/type_xy.xhp
index 967eecc780..a3199ebfe7 100644
--- a/helpcontent2/source/text/schart/01/type_xy.xhp
+++ b/helpcontent2/source/text/schart/01/type_xy.xhp
@@ -94,7 +94,7 @@
<emph>Cubic Spline</emph> interpolates your data points with polynomials of degree 3. The transitions between the polynomial pieces are smooth, having the same slope and curvature. </paragraph>
<paragraph role="paragraph" id="par_id6128421" xml-lang="en-US" l10n="NEW">The <emph>Resolution</emph> determines how many line segments are calculated to draw a piece of polynomial between two data points. You can see the intermediate points if you click any data point.</paragraph>
<paragraph role="paragraph" id="par_id9280373" xml-lang="en-US" l10n="NEW">
-<emph>B-Spline</emph> uses the data points as control points to form a B-spline curve. Those curves are built piecewise from polynomials. The <emph>Data points order</emph> sets the degree k of these polynomials. <comment>Besides the first and last point the curve doesn't go through the data points but lays inside the convex hull of each k+1 adjacent data points. Having Resolution r and n+1 data points, r times n uniform line segments are used to draw the whole curve.</comment></paragraph><comment>Regina: watch issue 72218, which would bring a change to UI</comment>
+<emph>B-Spline</emph> uses a parametric, interpolating B-spline curve. Those curves are built piecewise from polynomials. The <emph>Degree of polynomials</emph> sets the degree of these polynomials.</paragraph>
<section id="relatedtopics">
<embed href="text/shared/guide/chart_insert.xhp#chart_insert"/>
<embed href="text/schart/01/wiz_chart_type.xhp#wiz_chart_type"/>
diff --git a/helpcontent2/source/text/shared/02/09070100.xhp b/helpcontent2/source/text/shared/02/09070100.xhp
index 9230de8559..b8e473de71 100644
--- a/helpcontent2/source/text/shared/02/09070100.xhp
+++ b/helpcontent2/source/text/shared/02/09070100.xhp
@@ -53,14 +53,10 @@
<paragraph role="paragraph" id="par_id3145071" xml-lang="en-US" l10n="U" oldref="7"><ahelp hid="SVX:RADIOBUTTON:RID_SVXPAGE_HYPERLINK_INTERNET:RB_LINKTYP_INTERNET">Creates an http hyperlink.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXPAGE_HYPERLINK_INTERNET:RB_LINKTYP_FTP" id="bm_id3153311" localize="false"/><paragraph role="heading" id="hd_id3153683" xml-lang="en-US" level="3" l10n="U" oldref="8">FTP</paragraph>
<paragraph role="paragraph" id="par_id3150693" xml-lang="en-US" l10n="U" oldref="9"><ahelp hid="SVX:RADIOBUTTON:RID_SVXPAGE_HYPERLINK_INTERNET:RB_LINKTYP_FTP">Creates an FTP hyperlink.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXPAGE_HYPERLINK_INTERNET:RB_LINKTYP_TELNET" id="bm_id3154749" localize="false"/><paragraph role="heading" id="hd_id3149095" xml-lang="en-US" level="3" l10n="U" oldref="10">Telnet</paragraph>
-<paragraph role="paragraph" id="par_id3151110" xml-lang="en-US" l10n="U" oldref="11"><ahelp hid="SVX:RADIOBUTTON:RID_SVXPAGE_HYPERLINK_INTERNET:RB_LINKTYP_TELNET">Creates a Telnet hyperlink.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/CUI_HID_HYPERDLG_INET_PATH" id="bm_id3146797" localize="false"/><paragraph role="heading" id="hd_id3150443" xml-lang="en-US" level="3" l10n="U" oldref="12">Target</paragraph>
<paragraph role="paragraph" id="par_id9887081" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter a URL for the file that you want to open when you click the hyperlink. If you do not specify a target frame, the file opens in the current document or frame.</ahelp><comment>see i48946</comment></paragraph>
<bookmark xml-lang="en-US" branch="hid/cui:ImageButton:RID_SVXPAGE_HYPERLINK_INTERNET:BTN_BROWSE" id="bm_id3158432" localize="false"/><paragraph role="heading" id="hd_id3155628" xml-lang="en-US" level="3" l10n="U" oldref="13">WWW Browser</paragraph>
<paragraph role="paragraph" id="par_id3153760" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="SVX:IMAGEBUTTON:RID_SVXPAGE_HYPERLINK_INTERNET:BTN_BROWSE">Opens a web browser, into which you can load the desired URL.</ahelp> You can then copy and paste the URL into the <emph>Target</emph> field.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/cui:ImageButton:RID_SVXPAGE_HYPERLINK_INTERNET:BTN_TARGET" id="bm_id3149578" localize="false"/><paragraph role="heading" id="hd_id3155421" xml-lang="en-US" level="3" l10n="U" oldref="31">Target in document</paragraph>
-<paragraph role="paragraph" id="par_id3147618" xml-lang="en-US" l10n="U" oldref="32"><ahelp hid="SVX:IMAGEBUTTON:RID_SVXPAGE_HYPERLINK_INTERNET:BTN_TARGET">Opens the <emph>Target in Document</emph> dialog.</ahelp> There you can select the destination within a document and add it to the target URL with the <emph>Insert</emph> button.</paragraph>
<bookmark xml-lang="en-US" branch="hid/CUI_HID_HYPERLINK_MARKWND_TREE" id="bm_id3159167" localize="false"/><paragraph role="paragraph" id="par_id3147335" xml-lang="en-US" l10n="U" oldref="33"><ahelp hid="HID_HYPERLINK_MARKWND_TREE" visibility="hidden">Specifies the position in the target document where you wish to jump to.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/CUI_HID_HYPERLINK_MARKWND_APPLY" id="bm_id3159177" localize="false"/><paragraph role="paragraph" id="par_id3149164" xml-lang="en-US" l10n="U" oldref="34"><ahelp hid="HID_HYPERLINK_MARKWND_APPLY" visibility="hidden">Inserts the target in the <emph>Target</emph> field of the <emph>Hyperlink</emph> dialog.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/CUI_HID_HYPERLINK_MARKWND_CLOSE" id="bm_id3145416" localize="false"/><paragraph role="paragraph" id="par_id3155388" xml-lang="en-US" l10n="U" oldref="35"><ahelp hid="HID_HYPERLINK_MARKWND_CLOSE" visibility="hidden">Once the hyperlink has been completely entered, click on <emph>Close</emph> to set the link and leave the dialog.</ahelp></paragraph>
diff --git a/helpcontent2/source/text/shared/main0213.xhp b/helpcontent2/source/text/shared/main0213.xhp
index f279ab8322..3218e25960 100644
--- a/helpcontent2/source/text/shared/main0213.xhp
+++ b/helpcontent2/source/text/shared/main0213.xhp
@@ -69,7 +69,7 @@
<tablerow>
<tablecell colspan="" rowspan="">
<paragraph role="paragraph" id="par_id3154013" xml-lang="en-US" l10n="E">
-<image id="img_id3150010" src="res/sc10616.png" width="0.222inch" height="0.222inch"><alt id="alt_id3150010" xml-lang="en-US">Icon</alt>
+<image id="img_id3150010" src="cmd/sc_firstrecord.png" width="0.222inch" height="0.222inch"><alt id="alt_id3150010" xml-lang="en-US">Icon</alt>
</image></paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
@@ -117,7 +117,7 @@
<tablerow>
<tablecell colspan="" rowspan="">
<paragraph role="paragraph" id="par_id3155337" xml-lang="en-US" l10n="E">
-<image id="img_id3163808" src="res/sc10619.png" width="0.222inch" height="0.222inch"><alt id="alt_id3163808" xml-lang="en-US">Icon</alt>
+<image id="img_id3163808" src="cmd/sc_lastrecord.png" width="0.222inch" height="0.222inch"><alt id="alt_id3163808" xml-lang="en-US">Icon</alt>
</image></paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
diff --git a/helpcontent2/source/text/shared/optionen/01020200.xhp b/helpcontent2/source/text/shared/optionen/01020200.xhp
deleted file mode 100644
index a6c81059cb..0000000000
--- a/helpcontent2/source/text/shared/optionen/01020200.xhp
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************-->
-
-<helpdocument version="1.0">
-<meta>
-<topic id="textsharedoptionen01020200xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Search</title>
-<filename>/text/shared/optionen/01020200.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2004-09-03T13:59:21">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
-<section id="suche">
-<bookmark xml-lang="en-US" branch="index" id="bm_id3154515"><bookmark_value>search engines; selecting</bookmark_value>
-</bookmark>
-<bookmark xml-lang="en-US" branch="hid/CUI_HID_OPTIONS_SEARCH" id="bm_id3156346" localize="false"/>
-<paragraph role="heading" id="hd_id3155892" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/optionen/01020200.xhp" name="Search">Search</link></paragraph>
-<paragraph role="paragraph" id="par_id3153662" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="HID_OPTIONS_SEARCH">Use this tab page to define the settings for searching in the Internet.</ahelp></paragraph>
-</section>
-<section id="howtoget">
- <embed href="text/shared/00/00000406.xhp#internet4"/>
-</section>
-<paragraph role="heading" id="hd_id3154306" xml-lang="en-US" level="2" l10n="U" oldref="7">Search in</paragraph>
-<paragraph role="paragraph" id="par_id3157909" xml-lang="en-US" l10n="U" oldref="8">Specifies the search engine and its corresponding configuration.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_INET_SEARCH:LB_SEARCH" id="bm_id3150986" localize="false"/>
-<paragraph role="heading" id="hd_id3154515" xml-lang="en-US" level="3" l10n="U" oldref="9">Search engines</paragraph>
-<paragraph role="paragraph" id="par_id3153880" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SVX:LISTBOX:RID_SVXPAGE_INET_SEARCH:LB_SEARCH">Displays the available search engines.</ahelp> Select a search engine to display its configuration in the adjacent text and option boxes.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/cui:Edit:RID_SVXPAGE_INET_SEARCH:ED_SEARCH_NAME" id="bm_id3153562" localize="false"/>
-<paragraph role="heading" id="hd_id3150276" xml-lang="en-US" level="3" l10n="U" oldref="11">Name</paragraph>
-<paragraph role="paragraph" id="par_id3155449" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="SVX:EDIT:RID_SVXPAGE_INET_SEARCH:ED_SEARCH_NAME">Displays the name of the selected search engine.</ahelp> This is the name that will be shown in the sub-menu of the <emph>Search</emph> icon on the Hyperlink bar. </paragraph>
-<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXPAGE_INET_SEARCH:RB_AND" id="bm_id3148943" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXPAGE_INET_SEARCH:RB_OR" id="bm_id3148946" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXPAGE_INET_SEARCH:RB_EXACT" id="bm_id3147264" localize="false"/>
-<paragraph role="heading" id="hd_id3151245" xml-lang="en-US" level="3" l10n="U" oldref="13">Type</paragraph>
-<paragraph role="paragraph" id="par_id3154758" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="SVX:RADIOBUTTON:RID_SVXPAGE_INET_SEARCH:RB_EXACT">Sets the advanced search preferences (and, or, exact) as well as the way the results are defined and displayed.</ahelp></paragraph>
-<paragraph role="paragraph" id="par_id3148663" xml-lang="en-US" l10n="U" oldref="15">The links <emph>And, Or</emph> and <emph>Exactly</emph> are available.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/cui:Edit:RID_SVXPAGE_INET_SEARCH:ED_URL" id="bm_id3154365" localize="false"/>
-<paragraph role="heading" id="hd_id3150358" xml-lang="en-US" level="3" l10n="U" oldref="17">Prefix</paragraph>
-<paragraph role="paragraph" id="par_id3154138" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="SVX:EDIT:RID_SVXPAGE_INET_SEARCH:ED_URL">This text box displays the URL and the first part of the query command for a search machine. A URL can also be typed directly.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/cui:Edit:RID_SVXPAGE_INET_SEARCH:ED_POSTFIX" id="bm_id3151041" localize="false"/>
-<paragraph role="heading" id="hd_id3153193" xml-lang="en-US" level="3" l10n="U" oldref="22">Suffix</paragraph>
-<paragraph role="paragraph" id="par_id3153970" xml-lang="en-US" l10n="U" oldref="23">The search terms are passed between the prefix and the suffix.<ahelp hid="SVX:EDIT:RID_SVXPAGE_INET_SEARCH:ED_POSTFIX">The suffix provides the command sequence, sent at the end of a search.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/cui:Edit:RID_SVXPAGE_INET_SEARCH:ED_SEPARATOR" id="bm_id3145171" localize="false"/>
-<paragraph role="heading" id="hd_id3147086" xml-lang="en-US" level="3" l10n="U" oldref="24">Separator</paragraph>
-<paragraph role="paragraph" id="par_id3150870" xml-lang="en-US" l10n="U" oldref="25"><ahelp hid="SVX:EDIT:RID_SVXPAGE_INET_SEARCH:ED_SEPARATOR">If you type more than one word while running a search, these words will be separated by the character specified here.</ahelp> Most search engines require the "+" character.</paragraph>
-<paragraph role="paragraph" id="par_id3149560" xml-lang="en-US" l10n="U" oldref="27">To determine which prefixes, separators and suffixes to use when defining a new search engine:</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3159255" xml-lang="en-US" l10n="U" oldref="28">Activate the search engine and perform a search with at least two words.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3147434" xml-lang="en-US" l10n="CHG" oldref="29">Copy the URL from your browser's <emph>URL</emph> field and paste it into a blank document.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3148647" xml-lang="en-US" l10n="U" oldref="30">Change the conditions for the search in the search engine, if it offers you the choice.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3147317" xml-lang="en-US" l10n="U" oldref="31">Again, copy the contents of the <emph>URL</emph> field.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3147213" xml-lang="en-US" l10n="U" oldref="32">Compare the URLs with the sample URLs in the fields of this dialog and make a note of the prefixes, suffixes and separators used.</paragraph>
-</listitem>
-</list>
-<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_INET_SEARCH:ED_CASE" id="bm_id3153363" localize="false"/>
-<paragraph role="heading" id="hd_id3147348" xml-lang="en-US" level="3" l10n="U" oldref="33">Case match</paragraph>
-<paragraph role="paragraph" id="par_id3154918" xml-lang="en-US" l10n="U" oldref="34"><ahelp hid="SVX:LISTBOX:RID_SVXPAGE_INET_SEARCH:ED_CASE">Determines the case match for running a search.</ahelp> The list contains the following entries: <emph>None</emph>, <emph>Upper</emph> and <emph>Lower</emph>. The search terms entered are converted according to your selection.</paragraph>
-<paragraph role="paragraph" id="par_id3149262" xml-lang="en-US" l10n="U" oldref="35">Search engines handle queries differently according to the way they are constructed. For example, some are case sensitive and some are not. Because of this, it is best to select <emph>None</emph> as the case match option.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXPAGE_INET_SEARCH:PB_NEW" id="bm_id3148455" localize="false"/>
-<paragraph role="heading" id="hd_id3156283" xml-lang="en-US" level="3" l10n="U" oldref="44">New</paragraph>
-<paragraph role="paragraph" id="par_id3149413" xml-lang="en-US" l10n="U" oldref="45"><ahelp hid="SVX:PUSHBUTTON:RID_SVXPAGE_INET_SEARCH:PB_NEW">Use this button to include a new search engine.</ahelp><emph>New</emph> deletes all important entries of the entry mask such as "Name" and "Suffix". Enter the new search engine together with all of the necessary details. As soon as you accept your entries with <emph>Add</emph>, the new search engine will appear in the search engine list under <emph>Search in</emph>. Close the dialog with the <emph>OK</emph> button.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXPAGE_INET_SEARCH:PB_ADD" id="bm_id3149581" localize="false"/>
-<paragraph role="heading" id="hd_id3145254" xml-lang="en-US" level="3" l10n="U" oldref="36">Add</paragraph>
-<paragraph role="paragraph" id="par_id3144767" xml-lang="en-US" l10n="U" oldref="37"><ahelp hid="SVX:PUSHBUTTON:RID_SVXPAGE_INET_SEARCH:PB_ADD">Click this button to add a new configuration to the list.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXPAGE_INET_SEARCH:PB_CHANGE" id="bm_id3154018" localize="false"/>
-<paragraph role="heading" id="hd_id3155603" xml-lang="en-US" level="3" l10n="U" oldref="38">Modify</paragraph>
-<paragraph role="paragraph" id="par_id3151320" xml-lang="en-US" l10n="U" oldref="39"><ahelp hid="SVX:PUSHBUTTON:RID_SVXPAGE_INET_SEARCH:PB_CHANGE">Click this button to apply the modifications made to an existing configuration.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXPAGE_INET_SEARCH:PB_DELETE" id="bm_id3154164" localize="false"/>
-<paragraph role="heading" id="hd_id3149122" xml-lang="en-US" level="3" l10n="U" oldref="40">Delete</paragraph>
-<paragraph role="paragraph" id="par_id3154270" xml-lang="en-US" l10n="U" oldref="41"><ahelp hid="SVX:PUSHBUTTON:RID_SVXPAGE_INET_SEARCH:PB_DELETE">Click this button to delete the selected search engine from the list. There will be no security response.</ahelp></paragraph>
-</body>
-</helpdocument>
diff --git a/helpcontent2/source/text/shared/optionen/01030000.xhp b/helpcontent2/source/text/shared/optionen/01030000.xhp
index 79d344000a..83c35e0c0b 100644
--- a/helpcontent2/source/text/shared/optionen/01030000.xhp
+++ b/helpcontent2/source/text/shared/optionen/01030000.xhp
@@ -45,7 +45,6 @@
<embed href="text/shared/00/00000406.xhp#internet"/>
</section>
<embed href="text/shared/optionen/01020100.xhp#proxyserver"/>
- <embed href="text/shared/optionen/01020200.xhp#suche"/>
<switch select="sys">
<case select="UNIX"><embed href="text/shared/optionen/01020300.xhp#email"/>
</case>
diff --git a/helpcontent2/source/text/shared/optionen/01060100.xhp b/helpcontent2/source/text/shared/optionen/01060100.xhp
index 7c5b936e56..7976bb48bf 100644
--- a/helpcontent2/source/text/shared/optionen/01060100.xhp
+++ b/helpcontent2/source/text/shared/optionen/01060100.xhp
@@ -76,11 +76,10 @@
<paragraph xml-lang="en-US" id="hd_id3153682" role="heading" level="2" l10n="U"
oldref="28">Visual aids</paragraph>
<paragraph xml-lang="en-US" id="par_id3153311" role="paragraph" l10n="U" oldref="29">Specifies which lines are displayed.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCPAGE_CONTENT:CB_GRID" id="bm_id3148538" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sc:ListBox:RID_SCPAGE_CONTENT:LB_GRID" id="bm_id3148538" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3147242" role="heading" level="3" l10n="U"
oldref="30">Grid lines</paragraph>
- <paragraph xml-lang="en-US" id="par_id3153088" role="paragraph" l10n="U" oldref="31"><ahelp hid="SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_GRID">Specifies whether to display grid lines between the cells.</ahelp><switchinline select="appl"><caseinline select="CALC">For printing, choose <emph>Format - Page - </emph><link href="text/scalc/01/05070500.xhp" name="Sheet"><emph>Sheet</emph></link> and mark the <emph>Grid</emph> check box.
-</caseinline></switchinline></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153088" role="paragraph" l10n="U" oldref="31"><ahelp hid="sc:ListBox:RID_SCPAGE_CONTENT:LB_GRID" visibility="visible">Specifies when grid lines will be displayed. Default is to display grid lines only on cells that do not have a background color. You can choose to also display grid lines on cells with background color, or to hide them.</ahelp> For printing, choose <emph>Format - Page - </emph><link href="text/scalc/01/05070500.xhp" name="Sheet"><emph>Sheet</emph></link> and mark the <emph>Grid</emph> check box.</paragraph>
<bookmark xml-lang="en-US" branch="hid/sc:ListBox:RID_SCPAGE_CONTENT:LB_COLOR" id="bm_id3150504" localize="false"/>
<paragraph role="heading" id="hd_id3156326" xml-lang="en-US" level="3" l10n="U" oldref="32">Color</paragraph>
<paragraph role="paragraph" id="par_id3154286" xml-lang="en-US" l10n="U" oldref="33"><ahelp hid="SC_LISTBOX_RID_SCPAGE_CONTENT_LB_COLOR">Specifies a color for the grid lines in the current document.</ahelp> To see the grid line color that was saved with the document, go to <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME - Appearance</emph>, under <emph>Scheme</emph> find the entry <emph>Spreadsheet - Grid lines</emph> and set the color to "Automatic".</paragraph>
diff --git a/helpcontent2/source/text/shared/optionen/makefile.mk b/helpcontent2/source/text/shared/optionen/makefile.mk
index c685eb4a7b..1ae8f58da0 100644
--- a/helpcontent2/source/text/shared/optionen/makefile.mk
+++ b/helpcontent2/source/text/shared/optionen/makefile.mk
@@ -64,7 +64,6 @@ XHPFILES = \
01014000.xhp \
01020000.xhp \
01020100.xhp \
- 01020200.xhp \
01020300.xhp \
01020400.xhp \
01030000.xhp \
diff --git a/helpcontent2/util/sbasic/makefile.mk b/helpcontent2/util/sbasic/makefile.mk
index 51f9898516..7708374f64 100644
--- a/helpcontent2/util/sbasic/makefile.mk
+++ b/helpcontent2/util/sbasic/makefile.mk
@@ -1179,7 +1179,6 @@ LINKLINKFILES= \
text$/shared$/optionen$/01014000.xhp \
text$/shared$/optionen$/01020000.xhp \
text$/shared$/optionen$/01020100.xhp \
- text$/shared$/optionen$/01020200.xhp \
text$/shared$/optionen$/01020300.xhp \
text$/shared$/optionen$/01020400.xhp \
text$/shared$/optionen$/01030000.xhp \
diff --git a/helpcontent2/util/scalc/makefile.mk b/helpcontent2/util/scalc/makefile.mk
index aeaddc4c24..e36e94a3a3 100644
--- a/helpcontent2/util/scalc/makefile.mk
+++ b/helpcontent2/util/scalc/makefile.mk
@@ -1192,7 +1192,6 @@ LINKLINKFILES= \
text$/shared$/optionen$/01014000.xhp \
text$/shared$/optionen$/01020000.xhp \
text$/shared$/optionen$/01020100.xhp \
- text$/shared$/optionen$/01020200.xhp \
text$/shared$/optionen$/01020300.xhp \
text$/shared$/optionen$/01020400.xhp \
text$/shared$/optionen$/01030000.xhp \
diff --git a/helpcontent2/util/schart/makefile.mk b/helpcontent2/util/schart/makefile.mk
index 955d107095..1d8f34575d 100644
--- a/helpcontent2/util/schart/makefile.mk
+++ b/helpcontent2/util/schart/makefile.mk
@@ -880,7 +880,6 @@ LINKLINKFILES= \
text$/shared$/optionen$/01014000.xhp \
text$/shared$/optionen$/01020000.xhp \
text$/shared$/optionen$/01020100.xhp \
- text$/shared$/optionen$/01020200.xhp \
text$/shared$/optionen$/01020300.xhp \
text$/shared$/optionen$/01020400.xhp \
text$/shared$/optionen$/01030000.xhp \
diff --git a/helpcontent2/util/sdatabase/makefile.mk b/helpcontent2/util/sdatabase/makefile.mk
index f42fc5bd75..93526c3129 100644
--- a/helpcontent2/util/sdatabase/makefile.mk
+++ b/helpcontent2/util/sdatabase/makefile.mk
@@ -878,7 +878,6 @@ LINKLINKFILES= \
text$/shared$/optionen$/01014000.xhp \
text$/shared$/optionen$/01020000.xhp \
text$/shared$/optionen$/01020100.xhp \
- text$/shared$/optionen$/01020200.xhp \
text$/shared$/optionen$/01020300.xhp \
text$/shared$/optionen$/01020400.xhp \
text$/shared$/optionen$/01030000.xhp \
diff --git a/helpcontent2/util/sdraw/makefile.mk b/helpcontent2/util/sdraw/makefile.mk
index 75541ffa2d..1add060489 100644
--- a/helpcontent2/util/sdraw/makefile.mk
+++ b/helpcontent2/util/sdraw/makefile.mk
@@ -1113,7 +1113,6 @@ LINKLINKFILES= \
text$/shared$/optionen$/01014000.xhp \
text$/shared$/optionen$/01020000.xhp \
text$/shared$/optionen$/01020100.xhp \
- text$/shared$/optionen$/01020200.xhp \
text$/shared$/optionen$/01020300.xhp \
text$/shared$/optionen$/01020400.xhp \
text$/shared$/optionen$/01030000.xhp \
diff --git a/helpcontent2/util/simpress/makefile.mk b/helpcontent2/util/simpress/makefile.mk
index 16aea33e47..8ea57b43f0 100644
--- a/helpcontent2/util/simpress/makefile.mk
+++ b/helpcontent2/util/simpress/makefile.mk
@@ -1115,7 +1115,6 @@ LINKLINKFILES= \
text$/shared$/optionen$/01014000.xhp \
text$/shared$/optionen$/01020000.xhp \
text$/shared$/optionen$/01020100.xhp \
- text$/shared$/optionen$/01020200.xhp \
text$/shared$/optionen$/01020300.xhp \
text$/shared$/optionen$/01020400.xhp \
text$/shared$/optionen$/01030000.xhp \
diff --git a/helpcontent2/util/smath/makefile.mk b/helpcontent2/util/smath/makefile.mk
index 3059b11159..a7040b6692 100644
--- a/helpcontent2/util/smath/makefile.mk
+++ b/helpcontent2/util/smath/makefile.mk
@@ -958,7 +958,6 @@ LINKLINKFILES= \
text$/shared$/optionen$/01014000.xhp \
text$/shared$/optionen$/01020000.xhp \
text$/shared$/optionen$/01020100.xhp \
- text$/shared$/optionen$/01020200.xhp \
text$/shared$/optionen$/01020300.xhp \
text$/shared$/optionen$/01020400.xhp \
text$/shared$/optionen$/01030000.xhp \
diff --git a/helpcontent2/util/swriter/makefile.mk b/helpcontent2/util/swriter/makefile.mk
index 1ed17d2bbb..074d542383 100644
--- a/helpcontent2/util/swriter/makefile.mk
+++ b/helpcontent2/util/swriter/makefile.mk
@@ -1270,7 +1270,6 @@ LINKLINKFILES= \
text$/shared$/optionen$/01014000.xhp \
text$/shared$/optionen$/01020000.xhp \
text$/shared$/optionen$/01020100.xhp \
- text$/shared$/optionen$/01020200.xhp \
text$/shared$/optionen$/01020300.xhp \
text$/shared$/optionen$/01020400.xhp \
text$/shared$/optionen$/01030000.xhp \
diff --git a/helpcontent2/wiki-to-help/HHC/htmlhelp.reg b/helpcontent2/wiki-to-help/HHC/htmlhelp.reg
new file mode 100644
index 0000000000..e38e0ef828
--- /dev/null
+++ b/helpcontent2/wiki-to-help/HHC/htmlhelp.reg
@@ -0,0 +1,12 @@
+REGEDIT4
+
+[HKEY_CURRENT_USER\Software\Wine]
+"Version"="win2k"
+
+[HKEY_CURRENT_USER\Software\Wine\AppDefaults\hhc.exe\DllOverrides]
+"itircl"="native"
+"itss"="native"
+
+[HKEY_CURRENT_USER\Software\Wine\AppDefaults\hhw.exe\DllOverrides]
+"itircl"="native"
+"itss"="native"
diff --git a/helpcontent2/wiki-to-help/HHC/install_hhc.sh b/helpcontent2/wiki-to-help/HHC/install_hhc.sh
new file mode 100755
index 0000000000..ba93c78c26
--- /dev/null
+++ b/helpcontent2/wiki-to-help/HHC/install_hhc.sh
@@ -0,0 +1,60 @@
+#!/bin/bash -e
+# -e Exit immediately if a command exits with a non-zero status.
+
+# This installs Microsofts HHC (HTML Help Compiler)
+# Copyright 2011 Timo Richter and others.
+# Licensed under GNU GPLv3
+# Depends on: wine, wget, cabextract
+#
+# Usage of HHC: wine c:\\htmlhelp\\hhc.exe c:\\test\\htmlhelp.hhp
+#
+# Changes: Set installation directory to c:\htmlhelp
+# Copy also itcc.dll, this is neccessary
+# No execution of htmlhelp.exe installer needed
+# Abortion of install if anything fails, e.g. the download of HHC.
+#
+
+echo "Please wait"
+
+cd "$(dirname "$0")" # cd to path of this script
+
+
+WINEPREFIX=${WINEPREFIX:=$HOME/.wine}
+test -d "$WINEPREFIX" || wineprefixcreate 2>> /dev/null
+HHDIR="${WINEPREFIX}/dosdevices/c:/htmlhelp"
+mkdir "$HHDIR"
+
+# Setup the registry
+# Set Wine's Windows version to Windows 2000 (or above), and add an override to use the native itss.dll, both via winecfg.
+wine regedit htmlhelp.reg
+
+cd "$HHDIR"
+
+# Install HTML Help Workshop
+wget -O htmlhelp.exe 'http://go.microsoft.com/fwlink/?LinkId=14188'
+cabextract -F hhc.exe htmlhelp.exe
+cabextract -F HHA.dll htmlhelp.exe
+
+# Install ITSS.DLL
+cabextract -F hhupd.exe htmlhelp.exe
+cabextract -F itircl.dll hhupd.exe
+cabextract -F itss.dll hhupd.exe
+cabextract -F itcc.dll htmlhelp.exe
+cp -a itircl.dll "$WINEPREFIX/drive_c/windows/system32/"
+cp -a itcc.dll "$WINEPREFIX/drive_c/windows/system32/"
+cp -a itss.dll "$WINEPREFIX/drive_c/windows/system32/"
+wine regsvr32 'C:\WINDOWS\SYSTEM32\itcc.dll'
+wine regsvr32 'C:\WINDOWS\SYSTEM32\itircl.dll'
+wine regsvr32 'C:\WINDOWS\SYSTEM32\itss.dll'
+
+# Install MFC40.DLL
+wget -N http://activex.microsoft.com/controls/vc/mfc40.cab
+cabextract -F mfc40.exe mfc40.cab
+cabextract -F mfc40.dll mfc40.exe
+cp -a mfc40.dll "$WINEPREFIX/drive_c/windows/system32/"
+
+echo
+echo Done.
+
+exit 0
+
diff --git a/helpcontent2/wiki-to-help/README b/helpcontent2/wiki-to-help/README
new file mode 100644
index 0000000000..5dcfc95865
--- /dev/null
+++ b/helpcontent2/wiki-to-help/README
@@ -0,0 +1,29 @@
+
+Conversion of an XML-Dump to platformspecific help files
+--------------------------------------------------------
+
+1 INSTALLATION
+
+The following programs are required:
+ - mwlib
+ - python
+ - python-lxml
+ - xsltproc
+
+1.1 On GNU and UNIX
+
+ - Install wine
+ - Execute HHC/install_hhc.sh
+
+1.2 On Windows
+
+ - Install HHC from http://go.microsoft.com/fwlink/?LinkId=14188
+
+2 USAGE
+
+3 LICENSE
+
+The following applies to all files if not stated differently
+
+ - Licensed under GNU LGPLv3 / MPL
+ - Copyright 2011 Timo Richter
diff --git a/helpcontent2/wiki-to-help/convert.py b/helpcontent2/wiki-to-help/convert.py
new file mode 100755
index 0000000000..a86b4b60d8
--- /dev/null
+++ b/helpcontent2/wiki-to-help/convert.py
@@ -0,0 +1,112 @@
+#!/usr/bin/env python
+"""
+Convert an XML-Dump to platformspecific help files.
+Copyright 2011 Timo Richter
+
+This program depends on:
+mwlib
+python
+python-lxml
+xsltproc
+Microsoft HHC: http://go.microsoft.com/fwlink/?LinkId=14188
+
+
+"""
+
+import xml.dom.minidom as minidom
+import subprocess, tempfile, os, shutil
+
+from hhc import HHC
+from mw import MW
+
+scriptpath=os.path.dirname(os.path.realpath(__file__) )
+
+class Main(object):
+ workingDir = "./test" # final
+ #mwpath='/usr/local/bin/' # final
+ style=os.path.join(scriptpath,'xsl/htmlhelp/htmlhelp.xsl') # final
+
+ tmp=None
+
+ def ex(self,*cmd):
+ """
+ Execute a program
+ @cmd Command, args
+ @return boolean True if succeed
+ """
+ cmd = [elem for elem in cmd]
+ print cmd
+ return (subprocess.Popen(cmd).wait() == 0)
+
+ def __init__(self):
+ self.tmp = tempfile.mkdtemp()
+
+ self.workingDir = os.path.abspath(self.workingDir)
+ self.style = os.path.abspath(self.style)
+
+ self.hhc = HHC()
+ self.convert("test2.xml",self.workingDir)
+
+ def convert(self,source,dest,startpage=None):
+ """
+ Create the converted files.
+ @source XML-Dump-file
+ @dest Directory for output
+ @startpage Path to an html file
+ """
+ tmp = self.tmp
+ try:
+ os.mkdir(dest)
+ except OSError:
+ pass
+ names = self.getArtNames(source)
+ MW.buildcdb(source,tmp)
+ MW.render("--config=%s/wikiconf.txt"%(tmp),
+ "-w","docbook","-o",tmp+"/docbook.xml",*names)
+
+ #and mwlib.apps.render
+ #self.ex(self.mwpath+"mw-buildcdb","--input",source,"--output",tmp) and \
+ #self.ex(
+ # self.mwpath+"mw-render","--config=%s/wikiconf.txt"%(tmp),
+ # "-w","docbook","-o",tmp+"/docbook.xml",*names) \
+ (shutil.copy(tmp+'/docbook.xml',dest) or True) \
+ and self.ex("/usr/bin/xsltproc","--nonet","--novalid","-o",tmp+'/',self.style,tmp+'/docbook.xml') \
+ and self.setStartpage(startpage) \
+ and (self.hhc(tmp) or True) \
+ and (shutil.copy(os.path.join(tmp,'htmlhelp.chm'),dest) or True)
+
+ def setStartpage(self,startpage):
+ """
+ Private.
+ Copies @startpage to our tmp dir so that it will be used as the start page.
+ @return False if @startpage doesnt exist, otherwise True.
+ """
+ if startpage is None: return True
+ filename="index.html"
+ if not os.path.exist(startpage): return False
+ os.remove(os.path.join(self.tmp,filename))
+ shutil.copy(startpage, os.path.join(self.tmp,filename))
+ return True
+
+ def __del__(self):
+ shutil.rmtree(self.tmp) # remove temp files
+ pass
+
+ def getArtNames(self,filename):
+ """
+ Get Article Names
+ Reads all title tags from an xml file and returns a list of all titles.
+ @filename XML-file
+ @return List of Strings
+ """
+ dom=minidom.parse(filename)
+ elements=dom.getElementsByTagName("title")
+ names=[]
+ for element in elements:
+ name=element.childNodes[0].data
+ names.append(name)
+ return names
+
+if __name__ == '__main__':
+ Main()
+
diff --git a/helpcontent2/wiki-to-help/hhc.py b/helpcontent2/wiki-to-help/hhc.py
new file mode 100644
index 0000000000..d2d8302604
--- /dev/null
+++ b/helpcontent2/wiki-to-help/hhc.py
@@ -0,0 +1,64 @@
+import platform, os, subprocess
+
+class HHC(object):
+ """ Class for execution of Html Help Compiler """
+ hhcexe="c:\\htmlhelp\\hhc.exe"
+
+ def __init__(self):
+ pass
+
+ def exWindows(self,source):
+ """ Private. Compile @source calling HHC natively under Windows """
+ cmd=[self.hhcexe,os.path.join(source,"htmlhelp.hhp")]
+ r = (subprocess.Popen(cmd).wait())
+ return r
+
+ def exWine(self,source):
+ """ Private. Compile @source calling HHC via Wine """
+ #dirname = os.path.dirname(source)
+ wine = Wine(source,"j:")
+ r = wine(self.hhcexe,"j:\\htmlhelp.hhp")
+ del wine
+ return r
+
+ def __call__(self,source):
+ """
+ Converts @source with HHC
+ @source path to input directory that contains htmlhelp.hhp
+ """
+ windows=(platform.system()=="Windows")
+ if windows is False:
+ self.exWine(source)
+ else:
+ self.exWindows(source)
+
+class Wine(object):
+ # TODO: this should be a singleton
+ def __init__(self,workingDir,driveletter):
+ """ Setup the wine environment. Granting access so that wine is able to output files to @workingDir.
+ @workingDir will be accessable via @driveletter
+ E.g. Wine("/tmp/dir","j:") """
+ homedir = os.path.expanduser('~')
+ wineprefix=os.path.join(homedir,".wine")
+ drive=os.path.join(wineprefix,"dosdevices",driveletter)
+ if os.path.lexists(drive):
+ self.driveBak = drive+".bak"
+ shutil.move(drive,self.driveBak)
+ os.symlink(workingDir,drive)
+ self.drive = drive
+ #self.driveBak = driveBak
+
+ def ex(self,*cmd):
+ """ execute something with wine """
+ cmd = [elem for elem in cmd]
+ cmd = ["/usr/bin/wine"]+cmd
+ r= (subprocess.Popen(cmd).wait())
+ return r
+
+ def __call__(self,*cmd):
+ return self.ex(*cmd)
+
+ def __del__(self):
+ os.remove(self.drive)
+ if hasattr(self,'driveBak'):
+ shutil.move(self.driveBak,self.drive)
diff --git a/helpcontent2/wiki-to-help/mw.py b/helpcontent2/wiki-to-help/mw.py
new file mode 100644
index 0000000000..d2709cc6bc
--- /dev/null
+++ b/helpcontent2/wiki-to-help/mw.py
@@ -0,0 +1,26 @@
+import mwlib.cdbwiki, mwlib.apps.render, mwlib.apps
+import sys
+
+class MW(object):
+ """ This is the proxy class for mwlib """
+
+ @staticmethod
+ def _setArgs(function,args):
+ """ Set sys.argv for @function """
+ bak = sys.argv
+ args=("nothing",)+args
+ dec=[x.encode() for x in args]
+ sys.argv=dec
+ r=function()
+ sys.argv=bak
+ return r
+
+ @staticmethod
+ def buildcdb(source,dest):
+ args=("--input",source,"--output",dest)
+ return MW._setArgs(mwlib.apps.buildcdb,args)
+ #mwlib.cdbwiki.BuildWiki(*args)
+
+ @staticmethod
+ def render(*args):
+ return MW._setArgs(mwlib.apps.render.Main(),args)
diff --git a/helpcontent2/wiki-to-help/test2.xml b/helpcontent2/wiki-to-help/test2.xml
new file mode 100644
index 0000000000..ad0af7df8b
--- /dev/null
+++ b/helpcontent2/wiki-to-help/test2.xml
@@ -0,0 +1,381 @@
+<mediawiki xmlns="http://www.mediawiki.org/xml/export-0.4/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.mediawiki.org/xml/export-0.4/ http://www.mediawiki.org/xml/export-0.4.xsd" version="0.4" xml:lang="en">
+ <siteinfo>
+ <sitename>LibreOffice Help</sitename>
+ <base>http://gimli/Main_Page</base>
+ <generator>MediaWiki 1.16.0</generator>
+ <case>first-letter</case>
+ <namespaces>
+ <namespace key="-2" case="first-letter">Media</namespace>
+ <namespace key="-1" case="first-letter">Special</namespace>
+ <namespace key="0" case="first-letter" />
+ <namespace key="1" case="first-letter">Talk</namespace>
+ <namespace key="2" case="first-letter">User</namespace>
+ <namespace key="3" case="first-letter">User talk</namespace>
+ <namespace key="4" case="first-letter">LibreOffice Help</namespace>
+ <namespace key="5" case="first-letter">LibreOffice Help talk</namespace>
+ <namespace key="6" case="first-letter">File</namespace>
+ <namespace key="7" case="first-letter">File talk</namespace>
+ <namespace key="8" case="first-letter">MediaWiki</namespace>
+ <namespace key="9" case="first-letter">MediaWiki talk</namespace>
+ <namespace key="10" case="first-letter">Template</namespace>
+ <namespace key="11" case="first-letter">Template talk</namespace>
+ <namespace key="12" case="first-letter">Help</namespace>
+ <namespace key="13" case="first-letter">Help talk</namespace>
+ <namespace key="14" case="first-letter">Category</namespace>
+ <namespace key="15" case="first-letter">Category talk</namespace>
+ </namespaces>
+ </siteinfo>
+ <page>
+ <title>Main Page</title>
+ <id>1</id>
+ <revision>
+ <id>120128</id>
+ <timestamp>2011-02-17T21:54:02Z</timestamp>
+ <contributor>
+ <username>Kendy</username>
+ <id>2</id>
+ </contributor>
+ <comment>Added Basic help.</comment>
+ <text xml:space="preserve">{{OrigLang|Welcome to {{ProductName}} Help!}}
+Thank you for using the [http://www.documentfoundation.org/download/ {{ProductName}}] application help. Press F1 whenever you need help using the {{ProductName}} software, and you will be redirected to this site. Alternatively, you can install an off-line version of the help in your native language.
+
+If you only want to browse the help, please use the following entry points for easier navigation:
+
+* [[Writer/Welcome_to_the_Writer_Help|{{ProductName}} Writer]] (text processing)
+* [[Calc/Welcome_to_the_Calc_Help|{{ProductName}} Calc]] (spreadsheets)
+* [[Impress/Welcome_to_the_Impress_Help|{{ProductName}} Impress]] (presentations)
+* [[Draw/Welcome_to_the_Draw_Help|{{ProductName}} Draw]] (drawing)
+* [[Common/Database_1|{{ProductName}} Base]] (database processing)
+* [[Math/Welcome_to_the_Math_Help|{{ProductName}} Math]] (formula editing)
+* [[Basic/Basic_Help|{{ProductName}} Basic]] (programming using the Basic language)
+
+== How to Participate ==
+
+At the moment, we are still fine-tuning the tools converting the off-line help to the on-line form. Later, you will be able to participate, and improve the help pages. The plans are described in [http://wiki.documentfoundation.org/Development/Wikihelp The Document Foundation wiki].
+
+Consult the [http://meta.wikimedia.org/wiki/Help:Contents User's Guide] for information on using the wiki software.</text>
+ </revision>
+ </page>
+ <page>
+ <title>Swriter/.uno:GraphicFilterSolarize</title>
+ <id>2</id>
+ <redirect />
+ <revision>
+ <id>43159</id>
+ <timestamp>2010-12-17T15:23:21Z</timestamp>
+ <contributor>
+ <username>WikiSysop</username>
+ <id>1</id>
+ </contributor>
+ <comment>Redirected page to [[Common/Graphic Filter Bar#bm id3154910]]</comment>
+ <text xml:space="preserve">#REDIRECT [[Common/Graphic_Filter_Bar#bm_id3154910]]</text>
+ </revision>
+ </page>
+ <page>
+ <title>Swriter/59886</title>
+ <id>3</id>
+ <redirect />
+ <revision>
+ <id>43160</id>
+ <timestamp>2010-12-17T15:23:21Z</timestamp>
+ <contributor>
+ <username>WikiSysop</username>
+ <id>1</id>
+ </contributor>
+ <comment>Redirected page to [[Common/Presentation Wizard Page 1#bm id3155136]]</comment>
+ <text xml:space="preserve">#REDIRECT [[Common/Presentation_Wizard_Page_1#bm_id3155136]]</text>
+ </revision>
+ </page>
+ <page>
+ <title>Swriter/704807947</title>
+ <id>4</id>
+ <redirect />
+ <revision>
+ <id>43161</id>
+ <timestamp>2010-12-17T15:23:22Z</timestamp>
+ <contributor>
+ <username>WikiSysop</username>
+ <id>1</id>
+ </contributor>
+ <comment>Redirected page to [[Common/Accessibility#bm id3153881]]</comment>
+ <text xml:space="preserve">#REDIRECT [[Common/Accessibility#bm_id3153881]]</text>
+ </revision>
+ </page>
+ <page>
+ <title>Swriter/.uno:SelectTable</title>
+ <id>5</id>
+ <redirect />
+ <revision>
+ <id>43162</id>
+ <timestamp>2010-12-17T15:23:22Z</timestamp>
+ <contributor>
+ <username>WikiSysop</username>
+ <id>1</id>
+ </contributor>
+ <comment>Redirected page to [[Writer/Table#bm id3954588]]</comment>
+ <text xml:space="preserve">#REDIRECT [[Writer/Table#bm_id3954588]]</text>
+ </revision>
+ </page>
+ <page>
+ <title>Swriter/859636226</title>
+ <id>6</id>
+ <redirect />
+ <revision>
+ <id>43163</id>
+ <timestamp>2010-12-17T15:23:23Z</timestamp>
+ <contributor>
+ <username>WikiSysop</username>
+ <id>1</id>
+ </contributor>
+ <comment>Redirected page to [[Common/Address Data Source#bm id611896]]</comment>
+ <text xml:space="preserve">#REDIRECT [[Common/Address_Data_Source#bm_id611896]]</text>
+ </revision>
+ </page>
+ <page>
+ <title>Swriter/546685977</title>
+ <id>7</id>
+ <redirect />
+ <revision>
+ <id>43164</id>
+ <timestamp>2010-12-17T15:23:24Z</timestamp>
+ <contributor>
+ <username>WikiSysop</username>
+ <id>1</id>
+ </contributor>
+ <comment>Redirected page to [[Common/General 2#bm id3145750]]</comment>
+ <text xml:space="preserve">#REDIRECT [[Common/General_2#bm_id3145750]]</text>
+ </revision>
+ </page>
+ <page>
+ <title>Swriter/1417988121</title>
+ <id>8</id>
+ <redirect />
+ <revision>
+ <id>43165</id>
+ <timestamp>2010-12-17T15:23:24Z</timestamp>
+ <contributor>
+ <username>WikiSysop</username>
+ <id>1</id>
+ </contributor>
+ <comment>Redirected page to [[Writer/Caption#bm id7607959]]</comment>
+ <text xml:space="preserve">#REDIRECT [[Writer/Caption#bm_id7607959]]</text>
+ </revision>
+ </page>
+ <page>
+ <title>Swriter/34666</title>
+ <id>9</id>
+ <redirect />
+ <revision>
+ <id>43166</id>
+ <timestamp>2010-12-17T15:23:25Z</timestamp>
+ <contributor>
+ <username>WikiSysop</username>
+ <id>1</id>
+ </contributor>
+ <comment>Redirected page to [[Common/Euro Converter Wizard#bm id3152960]]</comment>
+ <text xml:space="preserve">#REDIRECT [[Common/Euro_Converter_Wizard#bm_id3152960]]</text>
+ </revision>
+ </page>
+ <page>
+ <title>Swriter/54892</title>
+ <id>10</id>
+ <redirect />
+ <revision>
+ <id>43167</id>
+ <timestamp>2010-12-17T15:23:25Z</timestamp>
+ <contributor>
+ <username>WikiSysop</username>
+ <id>1</id>
+ </contributor>
+ <comment>Redirected page to [[Writer/Define Bibliography Entry#bm id3149689]]</comment>
+ <text xml:space="preserve">#REDIRECT [[Writer/Define_Bibliography_Entry#bm_id3149689]]</text>
+ </revision>
+ </page>
+ <page>
+ <title>Common/Size/da</title>
+ <id>87185</id>
+ <revision>
+ <id>131455</id>
+ <timestamp>2011-03-01T17:57:01Z</timestamp>
+ <contributor>
+ <username>WikiSysop</username>
+ <id>1</id>
+ </contributor>
+ <comment>Created page with &quot;{{Lang|Størrelse}} &lt;div id=&quot;bm_id3153391&quot;&gt;&lt;/div&gt; Sæt skriftstørrelsen for den markerede tekst. Åbn genvejsmenu - vælg '''Størrelse'''&quot;</comment>
+ <text xml:space="preserve">{{Lang|Størrelse}}
+&lt;div id=&quot;bm_id3153391&quot;&gt;&lt;/div&gt;
+Sæt skriftstørrelsen for den markerede tekst.
+
+Åbn genvejsmenu - vælg '''Størrelse'''</text>
+ </revision>
+ </page>
+ <page>
+ <title>Common/Size/zh-TW</title>
+ <id>87186</id>
+ <revision>
+ <id>131456</id>
+ <timestamp>2011-03-01T17:57:02Z</timestamp>
+ <contributor>
+ <username>WikiSysop</username>
+ <id>1</id>
+ </contributor>
+ <comment>Created page with &quot;{{Lang|大小}} &lt;div id=&quot;bm_id3153391&quot;&gt;&lt;/div&gt; 設定所選文字的字型大小。 右鍵功能表'''「大小」'''&quot;</comment>
+ <text xml:space="preserve">{{Lang|大小}}
+&lt;div id=&quot;bm_id3153391&quot;&gt;&lt;/div&gt;
+設定所選文字的字型大小。
+
+右鍵功能表'''「大小」'''</text>
+ </revision>
+ </page>
+ <page>
+ <title>Common/Size/zh-CN</title>
+ <id>87187</id>
+ <revision>
+ <id>131457</id>
+ <timestamp>2011-03-01T17:57:03Z</timestamp>
+ <contributor>
+ <username>WikiSysop</username>
+ <id>1</id>
+ </contributor>
+ <comment>Created page with &quot;{{Lang|大小}} &lt;div id=&quot;bm_id3153391&quot;&gt;&lt;/div&gt; 设置选定文字的字体大小。 打开上下文菜单 - 选择'''大小'''&quot;</comment>
+ <text xml:space="preserve">{{Lang|大小}}
+&lt;div id=&quot;bm_id3153391&quot;&gt;&lt;/div&gt;
+设置选定文字的字体大小。
+
+打开上下文菜单 - 选择'''大小'''</text>
+ </revision>
+ </page>
+ <page>
+ <title>Common/Size/ko</title>
+ <id>87188</id>
+ <revision>
+ <id>131458</id>
+ <timestamp>2011-03-01T17:57:04Z</timestamp>
+ <contributor>
+ <username>WikiSysop</username>
+ <id>1</id>
+ </contributor>
+ <comment>Created page with &quot;{{Lang|크기}} &lt;div id=&quot;bm_id3153391&quot;&gt;&lt;/div&gt; 선택한 텍스트의 글꼴 크기를 설정합니다. '''크기''' 콘텍스트 메뉴&quot;</comment>
+ <text xml:space="preserve">{{Lang|크기}}
+&lt;div id=&quot;bm_id3153391&quot;&gt;&lt;/div&gt;
+선택한 텍스트의 글꼴 크기를 설정합니다.
+
+'''크기''' 콘텍스트 메뉴</text>
+ </revision>
+ </page>
+ <page>
+ <title>Common/Creating a New Database/sv</title>
+ <id>87189</id>
+ <revision>
+ <id>131459</id>
+ <timestamp>2011-03-01T17:57:05Z</timestamp>
+ <contributor>
+ <username>WikiSysop</username>
+ <id>1</id>
+ </contributor>
+ <comment>Created page with &quot;{{Lang|Skapa en ny databas}} &lt;div id=&quot;bm_id6911526&quot;&gt;&lt;/div&gt; &lt;!-- mw deleted &quot;creating;&quot; --&gt;#Välj '''Arkiv - Nytt - Databas'''.&lt;br/&gt;&lt;br/&gt;Då öppnas [[Common/Database_Wizard/sv|Da...&quot;</comment>
+ <text xml:space="preserve">{{Lang|Skapa en ny databas}}
+&lt;div id=&quot;bm_id6911526&quot;&gt;&lt;/div&gt;
+&lt;!-- mw deleted &quot;creating;&quot; --&gt;#Välj '''Arkiv - Nytt - Databas'''.&lt;br/&gt;&lt;br/&gt;Då öppnas [[Common/Database_Wizard/sv|Databasguiden]] där du skapar en ny databasfil.&lt;br/&gt;
+#I Databasguiden väljer du typ av databas och du kan välja att öppna Tabellguiden som nästa guide.&lt;br/&gt;&lt;br/&gt;I [[Common/Table_Wizard/sv|Tabellguiden]] får du hjälp med att infoga en tabell i den nya databasfilen.&lt;br/&gt;
+
+{{RelatedTopics|[[Common/Database_1/sv|Använda databaser i {{ProductName}} Base]]
+
+[[Common/Database_Overview/sv|Databasöversikt]]
+
+}}</text>
+ </revision>
+ </page>
+ <page>
+ <title>Common/Creating a New Database/da</title>
+ <id>87190</id>
+ <revision>
+ <id>131460</id>
+ <timestamp>2011-03-01T17:57:06Z</timestamp>
+ <contributor>
+ <username>WikiSysop</username>
+ <id>1</id>
+ </contributor>
+ <comment>Created page with &quot;{{Lang|Oprette en ny Database}} &lt;div id=&quot;bm_id6911526&quot;&gt;&lt;/div&gt; &lt;!-- mw deleted &quot;creating;&quot; --&gt;#Vælg '''Filer - Ny(t) - Database'''.&lt;br/&gt;&lt;br/&gt;Dette åbner [[Common/Database_Wizard...&quot;</comment>
+ <text xml:space="preserve">{{Lang|Oprette en ny Database}}
+&lt;div id=&quot;bm_id6911526&quot;&gt;&lt;/div&gt;
+&lt;!-- mw deleted &quot;creating;&quot; --&gt;#Vælg '''Filer - Ny(t) - Database'''.&lt;br/&gt;&lt;br/&gt;Dette åbner [[Common/Database_Wizard/da|Databaseguiden]], hvor du kan oprette en ny databasefil.&lt;br/&gt;
+#I Databaseguiden vælges typen af database og vælg indstillingen for at åbne Tabelguiden som den næste guide.&lt;br/&gt;&lt;br/&gt;[[Common/Table_Wizard/da|Tabelguiden]] hjælper dig med at tilføje en tabel til den nye databasefil.&lt;br/&gt;
+
+{{RelatedTopics|[[Common/Database_1/da|Brug af databaser i {{ProductName}} Base]]
+
+[[Common/Database_Overview/da|Databaseoversigt]]
+
+}}</text>
+ </revision>
+ </page>
+ <page>
+ <title>Common/Creating a New Database/zh-TW</title>
+ <id>87191</id>
+ <revision>
+ <id>131461</id>
+ <timestamp>2011-03-01T17:57:07Z</timestamp>
+ <contributor>
+ <username>WikiSysop</username>
+ <id>1</id>
+ </contributor>
+ <comment>Created page with &quot;{{Lang|建立新的資料庫}} &lt;div id=&quot;bm_id6911526&quot;&gt;&lt;/div&gt; &lt;!-- mw deleted &quot;creating;&quot; --&gt;#選擇 '''[檔案] - [開啟新檔] - [資料庫]'''。&lt;br/&gt;&lt;br/&gt;這會開啟[[Common...&quot;</comment>
+ <text xml:space="preserve">{{Lang|建立新的資料庫}}
+&lt;div id=&quot;bm_id6911526&quot;&gt;&lt;/div&gt;
+&lt;!-- mw deleted &quot;creating;&quot; --&gt;#選擇 '''[檔案] - [開啟新檔] - [資料庫]'''。&lt;br/&gt;&lt;br/&gt;這會開啟[[Common/Database_Wizard/zh-TW|資料庫精靈]],您可在其中建立新的資料庫檔案。&lt;br/&gt;
+#在「資料庫精靈」中,選取資料庫類型,然後選取要開啟「表格精靈」作為下一個精靈的選項。&lt;br/&gt;&lt;br/&gt;[[Common/Table_Wizard/zh-TW|表格精靈]]可協助您在新的資料庫檔案中增加表格。&lt;br/&gt;
+
+{{RelatedTopics|[[Common/Database_1/zh-TW|在 {{ProductName}} Base 中使用資料庫]]
+
+[[Common/Database_Overview/zh-TW|資料庫簡介]]
+
+}}</text>
+ </revision>
+ </page>
+ <page>
+ <title>Common/Creating a New Database/zh-CN</title>
+ <id>87192</id>
+ <revision>
+ <id>131462</id>
+ <timestamp>2011-03-01T17:57:08Z</timestamp>
+ <contributor>
+ <username>WikiSysop</username>
+ <id>1</id>
+ </contributor>
+ <comment>Created page with &quot;{{Lang|创建新数据库}} &lt;div id=&quot;bm_id6911526&quot;&gt;&lt;/div&gt; &lt;!-- mw deleted &quot;creating;&quot; --&gt;#选择'''文件 - 新建 - 数据库'''。&lt;br/&gt;&lt;br/&gt;这样可打开[[Common/Database_Wiz...&quot;</comment>
+ <text xml:space="preserve">{{Lang|创建新数据库}}
+&lt;div id=&quot;bm_id6911526&quot;&gt;&lt;/div&gt;
+&lt;!-- mw deleted &quot;creating;&quot; --&gt;#选择'''文件 - 新建 - 数据库'''。&lt;br/&gt;&lt;br/&gt;这样可打开[[Common/Database_Wizard/zh-CN|数据库向导]],利用该向导可创建新的数据库文件。&lt;br/&gt;
+#在“数据库向导”中,选择数据库类型,然后选择此选项打开作为下一向导的“表格向导”。&lt;br/&gt;&lt;br/&gt;[[Common/Table_Wizard/zh-CN|表格向导]]可帮助您在新数据库文件中添加表格。&lt;br/&gt;
+
+{{RelatedTopics|[[Common/Database_1/zh-CN|在 {{ProductName}} Base 中使用数据库]]
+
+[[Common/Database_Overview/zh-CN|数据源摘要]]
+
+}}</text>
+ </revision>
+ </page>
+ <page>
+ <title>Common/Creating a New Database/ko</title>
+ <id>87193</id>
+ <revision>
+ <id>131463</id>
+ <timestamp>2011-03-01T17:57:09Z</timestamp>
+ <contributor>
+ <username>WikiSysop</username>
+ <id>1</id>
+ </contributor>
+ <comment>Created page with &quot;{{Lang|새 데이터베이스 만들기}} &lt;div id=&quot;bm_id6911526&quot;&gt;&lt;/div&gt; &lt;!-- mw deleted &quot;creating;&quot; --&gt;#'''파일 - 새로 만들기 - 데이터베이스'''를 선택합니다.&lt;b...&quot;</comment>
+ <text xml:space="preserve">{{Lang|새 데이터베이스 만들기}}
+&lt;div id=&quot;bm_id6911526&quot;&gt;&lt;/div&gt;
+&lt;!-- mw deleted &quot;creating;&quot; --&gt;#'''파일 - 새로 만들기 - 데이터베이스'''를 선택합니다.&lt;br/&gt;&lt;br/&gt;새 데이터베이스 파일을 만들 수 있는 [[Common/Database_Wizard/ko|데이터베이스 마법사]]가 열립니다.&lt;br/&gt;
+#데이터베이스 마법사에서 데이터베이스 유형을 선택한 다음 테이블 마법사를 다음 마법사로 여는 옵션을 선택합니다.&lt;br/&gt;&lt;br/&gt;[[Common/Table_Wizard/ko|테이블 마법사]]를 사용하면 새 데이터베이스 파일에 테이블을 추가할 수 있습니다.&lt;br/&gt;
+
+{{RelatedTopics|[[Common/Database_1/ko|{{ProductName}} Base에서 데이터베이스 사용]]
+
+[[Common/Database_Overview/ko|데이터베이스 개요]]
+
+}}</text>
+ </revision>
+ </page>
+</mediawiki>