summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIvo Hinkelmann <ihi@openoffice.org>2007-11-23 16:23:19 +0000
committerIvo Hinkelmann <ihi@openoffice.org>2007-11-23 16:23:19 +0000
commit8c18ea25071d2b4de526c7c1173de078a13298d9 (patch)
tree705ea6df662a5c1fbc86573f9a26d82a56f92afb
parentINTEGRATION: CWS hcshared12 (1.9.136); FILE MERGED (diff)
downloadhelp-8c18ea25071d2b4de526c7c1173de078a13298d9.tar.gz
help-8c18ea25071d2b4de526c7c1173de078a13298d9.zip
INTEGRATION: CWS hcshared12 (1.4.242); FILE MERGED
2007/10/05 14:40:39 ufi 1.4.242.1: zwischenstand
-rwxr-xr-xhelpcontent2/source/text/shared/autopi/01130100.xhp52
-rw-r--r--helpcontent2/source/text/shared/autopi/startup.xhp36
2 files changed, 37 insertions, 51 deletions
diff --git a/helpcontent2/source/text/shared/autopi/01130100.xhp b/helpcontent2/source/text/shared/autopi/01130100.xhp
index 8b75b1493d..84c8e94655 100755
--- a/helpcontent2/source/text/shared/autopi/01130100.xhp
+++ b/helpcontent2/source/text/shared/autopi/01130100.xhp
@@ -1,13 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--***********************************************************************
+
+<!--
+ ***********************************************************************
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01130100.xhp,v $
+ * $RCSfile: 01130100.xhp,v $fileonly,v $
*
- * $Revision: 1.4 $
+ * $Revision: 1.5 $
*
- * last change: $Author: rt $ $Date: 2005-09-07 22:19:56 $
+ * last change: $Author: ihi $ $Date: 2007-11-23 17:22:12 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -32,18 +34,16 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston,
* MA 02111-1307 USA
*
- ************************************************************************-->
-
-<helpdocument version="1.0">
+ ************************************************************************
+ -->
+
+
+ <helpdocument version="1.0">
<meta>
<topic id="textsharedautopi01130100xml" indexer="include" status="PUBLISH">
<title id="tit" xml-lang="en-US">Document Converter Page 1</title>
<filename>/text/shared/autopi/01130100.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2004-12-10T12:15:39">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<section id="seite1">
@@ -51,35 +51,25 @@
<paragraph role="paragraph" id="par_id3150445" xml-lang="en-US" l10n="U" oldref="2">Specifies whether to convert documents from $[officename] or Microsoft Office, and specifies the document type.</paragraph>
</section>
<paragraph role="paragraph" id="par_id3148983" xml-lang="en-US" l10n="E" localize="false"><link href="text/shared/00/00000401.xhp#autopilotmsimport1"><embedvar href="text/shared/00/00000004.xhp#wie"/></link></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_DLGIMPORT_0_OPTSODOCUMENTS" id="bm_id3150808" localize="false"/>
-<paragraph role="heading" id="hd_id3155364" xml-lang="en-US" level="2" l10n="U" oldref="27">$[officename]</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_DLGIMPORT_0_OPTSODOCUMENTS" id="bm_id3150808" localize="false"/><paragraph role="heading" id="hd_id3155364" xml-lang="en-US" level="2" l10n="U" oldref="27">$[officename]</paragraph>
<paragraph role="paragraph" id="par_id3149205" xml-lang="en-US" l10n="CHG" oldref="28"><ahelp hid="HID_DLGIMPORT_0_OPTSODOCUMENTS">Converts binary $[officename] documents (StarOffice 5.2 and before) into the OpenDocument format used by $[officename].</ahelp><comment>UFI: dont use a variable!</comment></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_DLGIMPORT_0_CHKWRITER" id="bm_id3153394" localize="false"/>
-<paragraph role="heading" id="hd_id3153049" xml-lang="en-US" level="3" l10n="U" oldref="29">Text documents</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_DLGIMPORT_0_CHKWRITER" id="bm_id3153394" localize="false"/><paragraph role="heading" id="hd_id3153049" xml-lang="en-US" level="3" l10n="U" oldref="29">Text documents</paragraph>
<paragraph role="paragraph" id="par_id3145669" xml-lang="en-US" l10n="CHG" oldref="30"><ahelp hid="HID_DLGIMPORT_0_CHKWRITER">Converts documents in the old format of $[officename] Writer *.sdw into OpenDocument *.odt documents.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_DLGIMPORT_0_CHKCALC" id="bm_id3149095" localize="false"/>
-<paragraph role="heading" id="hd_id3151226" xml-lang="en-US" level="3" l10n="U" oldref="31">Spreadsheets</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_DLGIMPORT_0_CHKCALC" id="bm_id3149095" localize="false"/><paragraph role="heading" id="hd_id3151226" xml-lang="en-US" level="3" l10n="U" oldref="31">Spreadsheets</paragraph>
<paragraph role="paragraph" id="par_id3155391" xml-lang="en-US" l10n="CHG" oldref="32"><ahelp hid="HID_DLGIMPORT_0_CHKCALC">Converts documents in the old format of $[officename] Calc *.sdc into OpenDocument *.ods documents.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_DLGIMPORT_0_CHKIMPRESS" id="bm_id3153683" localize="false"/>
-<paragraph role="heading" id="hd_id3145211" xml-lang="en-US" level="3" l10n="U" oldref="33">Drawing/presentation documents</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_DLGIMPORT_0_CHKIMPRESS" id="bm_id3153683" localize="false"/><paragraph role="heading" id="hd_id3145211" xml-lang="en-US" level="3" l10n="U" oldref="33">Drawing/presentation documents</paragraph>
<paragraph role="paragraph" id="par_id3154289" xml-lang="en-US" l10n="CHG" oldref="34"><ahelp hid="HID_DLGIMPORT_0_CHKIMPRESS">Converts documents in the old format of $[officename] Draw *.sda into OpenDocument *.odg documents, and $[officename] Impress *.sdd into OpenDocument *.odp documents.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_DLGIMPORT_0_CHKMATHGLOBAL" id="bm_id3156346" localize="false"/>
-<paragraph role="heading" id="hd_id3143267" xml-lang="en-US" level="3" l10n="U" oldref="35">Master documents/formulas</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_DLGIMPORT_0_CHKMATHGLOBAL" id="bm_id3156346" localize="false"/><paragraph role="heading" id="hd_id3143267" xml-lang="en-US" level="3" l10n="U" oldref="35">Master documents/formulas</paragraph>
<paragraph role="paragraph" id="par_id3156114" xml-lang="en-US" l10n="CHG" oldref="36"><ahelp hid="HID_DLGIMPORT_0_CHKMATHGLOBAL">Converts documents in the old format of $[officename] Writer master documents *.sgl into OpenDocument *.odm documents, and $[officename] Math *.smf into OpenDocument *.odf documents.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_DLGIMPORT_0_OPTMSDOCUMENTS" id="bm_id3147209" localize="false"/>
-<paragraph role="heading" id="hd_id3166410" xml-lang="en-US" level="2" l10n="U" oldref="37">Microsoft Office</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_DLGIMPORT_0_OPTMSDOCUMENTS" id="bm_id3147209" localize="false"/><paragraph role="heading" id="hd_id3166410" xml-lang="en-US" level="2" l10n="U" oldref="37">Microsoft Office</paragraph>
<paragraph role="paragraph" id="par_id3150771" xml-lang="en-US" l10n="CHG" oldref="38">Converts Microsoft Office documents into the OpenDocument format.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_DLGIMPORT_2_CHKWORD" id="bm_id3148685" localize="false"/>
-<paragraph role="heading" id="hd_id3150984" xml-lang="en-US" level="3" l10n="U" oldref="3">Word documents</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_DLGIMPORT_2_CHKWORD" id="bm_id3148685" localize="false"/><paragraph role="heading" id="hd_id3150984" xml-lang="en-US" level="3" l10n="U" oldref="3">Word documents</paragraph>
<paragraph role="paragraph" id="par_id3150255" xml-lang="en-US" l10n="CHG" oldref="14"><ahelp hid="HID_DLGIMPORT_2_CHKWORD">Converts documents in Microsoft Word format *.doc into OpenDocument *.odt documents.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_DLGIMPORT_2_CHKEXCEL" id="bm_id3156305" localize="false"/>
-<paragraph role="heading" id="hd_id3155421" xml-lang="en-US" level="3" l10n="U" oldref="4">Excel documents</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_DLGIMPORT_2_CHKEXCEL" id="bm_id3156305" localize="false"/><paragraph role="heading" id="hd_id3155421" xml-lang="en-US" level="3" l10n="U" oldref="4">Excel documents</paragraph>
<paragraph role="paragraph" id="par_id3155630" xml-lang="en-US" l10n="CHG" oldref="15"><ahelp hid="HID_DLGIMPORT_2_CHKEXCEL">Converts documents in Microsoft Excel format *.xls into OpenDocument *.ods documents.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_DLGIMPORT_2_CHKPOWERPOINT" id="bm_id3156329" localize="false"/>
-<paragraph role="heading" id="hd_id3153127" xml-lang="en-US" level="3" l10n="U" oldref="5">PowerPoint documents</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_DLGIMPORT_2_CHKPOWERPOINT" id="bm_id3156329" localize="false"/><paragraph role="heading" id="hd_id3153127" xml-lang="en-US" level="3" l10n="U" oldref="5">PowerPoint documents</paragraph>
<paragraph role="paragraph" id="par_id3149786" xml-lang="en-US" l10n="CHG" oldref="16"><ahelp hid="HID_DLGIMPORT_2_CHKPOWERPOINT">Converts documents in Microsoft PowerPoint format *.ppt into OpenDocument *.odp documents.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_DLGIMPORT_0_CHKLOGFILE" id="bm_id3149415" localize="false"/>
-<paragraph role="heading" id="hd_id3153088" xml-lang="en-US" level="3" l10n="U" oldref="39">Create Logfile</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_DLGIMPORT_0_CHKLOGFILE" id="bm_id3149415" localize="false"/><paragraph role="heading" id="hd_id3153088" xml-lang="en-US" level="3" l10n="CHG" oldref="39">Create Log file</paragraph>
<paragraph role="paragraph" id="par_id3149797" xml-lang="en-US" l10n="U" oldref="40"><ahelp hid="HID_DLGIMPORT_0_CHKLOGFILE">Creates a log file in your work directory showing which documents have been converted.</ahelp></paragraph>
<paragraph role="paragraph" id="par_id3149578" xml-lang="en-US" l10n="U" oldref="26">Continue to the next page of the <link href="text/shared/autopi/01130200.xhp" name="Document Converter">Document Converter</link>.</paragraph>
</body>
diff --git a/helpcontent2/source/text/shared/autopi/startup.xhp b/helpcontent2/source/text/shared/autopi/startup.xhp
index 3f0333e880..536dbbb22d 100644
--- a/helpcontent2/source/text/shared/autopi/startup.xhp
+++ b/helpcontent2/source/text/shared/autopi/startup.xhp
@@ -1,13 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--***********************************************************************
+
+<!--
+ ***********************************************************************
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: startup.xhp,v $
+ * $RCSfile: startup.xhp,v $fileonly,v $
*
- * $Revision: 1.4 $
+ * $Revision: 1.5 $
*
- * last change: $Author: rt $ $Date: 2005-09-07 22:24:14 $
+ * last change: $Author: ihi $ $Date: 2007-11-23 17:23:19 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -32,37 +34,31 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston,
* MA 02111-1307 USA
*
- ************************************************************************-->
-
-<helpdocument version="1.0">
+ ************************************************************************
+ -->
+
+
+ <helpdocument version="1.0">
<meta>
<topic id="textsharedautopistartupxhp" indexer="include" status="PUBLISH">
<title id="tit" xml-lang="en-US">Start-up Wizard</title>
<filename>/text/shared/autopi/startup.xhp</filename>
</topic>
-<history>
-<created date="2004-10-18T11:09:12">Startup and Migration Wizard</created>
-<lastedited date="2004-12-09T14:45:30">DEDR: Reviewed</lastedited>
-</history>
</meta>
<body>
<paragraph role="heading" id="par_idN1054C" xml-lang="en-US" level="1" l10n="NEW"><link href="text/shared/autopi/startup.xhp">Start-up Wizard</link></paragraph>
<paragraph role="paragraph" id="par_idN1055C" xml-lang="en-US" l10n="NEW">The Start-up Wizard opens when you start %PRODUCTNAME for the first time.</paragraph>
<paragraph role="paragraph" id="par_idN1055F" xml-lang="en-US" l10n="NEW">The wizard consists of the following pages:</paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_FIRSTSTART_WELCOME" id="bm_id8871120" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/HID_FIRSTSTART_DIALOG" id="bm_id3778496" localize="false"/>
-<paragraph role="heading" id="par_idN10562" xml-lang="en-US" level="2" l10n="NEW">Welcome</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FIRSTSTART_DIALOG" id="bm_id3778496" localize="false"/><paragraph role="heading" id="par_idN10562" xml-lang="en-US" level="2" l10n="NEW">Welcome</paragraph>
<paragraph role="paragraph" id="par_idN10566" xml-lang="en-US" l10n="NEW"><ahelp hid=".">The Start-up Wizard helps you to specify the user settings for %PRODUCTNAME. This wizard only runs once.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_FIRSTSTART_LICENSE" id="bm_id9530930" localize="false"/>
-<paragraph role="heading" id="par_idN10575" xml-lang="en-US" level="2" l10n="NEW">License</paragraph>
-<paragraph role="paragraph" id="par_idN10579" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Read and accept the license text. You need to scroll to the end of the license text before you can continue.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_FIRSTSTART_MIGRATION" id="bm_id4303415" localize="false"/>
-<paragraph role="heading" id="par_idN10588" xml-lang="en-US" level="2" l10n="NEW">Migration</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FIRSTSTART_LICENSE" id="bm_id9530930" localize="false"/><paragraph role="heading" id="par_idN10575" xml-lang="en-US" level="2" l10n="NEW">License</paragraph>
+<paragraph role="paragraph" id="par_idN10579" xml-lang="en-US" l10n="CHG"><ahelp hid=".">Read and accept the license text to continue. You need to scroll to the end of the license text before you can continue. If you decline the license, the installation is canceled.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FIRSTSTART_MIGRATION" id="bm_id4303415" localize="false"/><paragraph role="heading" id="par_idN10588" xml-lang="en-US" level="2" l10n="NEW">Migration</paragraph>
<paragraph role="paragraph" id="par_idN1058C" xml-lang="en-US" l10n="NEW"><ahelp hid=".">You can use this page to import user data from a previously installed version of %PRODUCTNAME.</ahelp></paragraph>
<paragraph role="heading" id="par_idN1059F" xml-lang="en-US" level="3" l10n="NEW">Copy personal data</paragraph>
<paragraph role="paragraph" id="par_idN105A3" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Copies the user name and other data from a previous %PRODUCTNAME installation.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_FIRSTSTART_USER" id="bm_id9908444" localize="false"/>
-<paragraph role="heading" id="par_idN105B2" xml-lang="en-US" level="2" l10n="NEW">User name</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FIRSTSTART_USER" id="bm_id9908444" localize="false"/><paragraph role="heading" id="par_idN105B2" xml-lang="en-US" level="2" l10n="NEW">User name</paragraph>
<paragraph role="paragraph" id="par_idN105B6" xml-lang="en-US" l10n="NEW"><ahelp hid=".">The user name is used for the document properties, templates, and when you record changes made to documents. This page is only displayed if a previous installation of %PRODUCTNAME is not found on your computer.</ahelp></paragraph>
<paragraph role="paragraph" id="par_idN105C8" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter your personal data into the text boxes.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_FIRSTSTART_REGISTRATION" id="bm_id2025818" localize="false"/><embed href="text/shared/01/08060100.xhp#registrierung"/>