hcshared25: merge with DEV300_m68

1 files changed, 24 insertions, 24 deletions

diff --git a/helpcontent2/source/text/shared/guide/import_ms.xhp b/helpcontent2/source/text/shared/guide/import_ms.xhp
index b601e56717..0618ec04d6 100755
--- a/helpcontent2/source/text/shared/guide/import_ms.xhp
+++ b/helpcontent2/source/text/shared/guide/import_ms.xhp
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <helpdocument version="1.0">
-	
+
 <!--
 ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -32,8 +32,8 @@
  *
  ************************************************************************
  -->
- 
-	
+
+
 <meta>
       <topic id="textsharedguideimport_msxml" indexer="include" status="PUBLISH">
          <title xml-lang="en-US" id="tit">Opening documents saved in other formats</title>
@@ -61,26 +61,26 @@
 </bookmark><comment>MW inserted cross-reference "files, see also documents"</comment><comment>MW changed "defaults;..."</comment>
 <paragraph xml-lang="en-US" id="hd_id3145313" role="heading" level="1" l10n="U" oldref="2"><variable id="import_ms"><link href="text/shared/guide/import_ms.xhp" name="Opening documents saved in other formats">Opening documents saved in other formats</link>
 </variable></paragraph>
-         <paragraph xml-lang="en-US" id="par_id3145345" role="paragraph" l10n="U" oldref="3">You can open a document saved in another format by using the following procedure:</paragraph>
-         <list type="ordered">
-            <listitem>
-               <paragraph xml-lang="en-US" id="par_id3147242" role="listitem" l10n="U" oldref="4">Choose <emph>File - Open</emph>.</paragraph>
-            </listitem>
-            <listitem>
-               <paragraph xml-lang="en-US" id="par_id3152780" role="listitem" l10n="U" oldref="5">Select a format from the<emph> Files of type</emph> list.</paragraph>
-            </listitem>
-            <listitem>
-               <paragraph xml-lang="en-US" id="par_id3148491" role="listitem" l10n="U" oldref="6">Select a file name and click <emph>Open</emph>.</paragraph>
-            </listitem>
-         </list>
-         <paragraph xml-lang="en-US" id="par_id3159399" role="paragraph" l10n="CHG" oldref="8">If you always want the file dialogs to show another format by default, choose <emph>Tools - Options - Load/Save - General</emph> and select that format as <emph>Default file format</emph>.</paragraph>
-         <paragraph xml-lang="en-US" id="hd_id3154898" role="heading" level="2" l10n="U" oldref="9">Converting all documents of a folder</paragraph>
-         <paragraph xml-lang="en-US" id="par_id3147336" role="paragraph" l10n="CHG" oldref="10">Open the wizard, which guides you through the operation, to copy and convert all documents from Microsoft Word, Microsoft Excel or Microsoft PowerPoint into OpenDocument file format documents. You can select a source and target directory, specify whether to convert documents and/or templates, and more besides.</paragraph>
-         <list type="unordered">
-            <listitem>
-               <paragraph xml-lang="en-US" id="par_id3153824" role="listitem" l10n="U" oldref="11">Choose <link href="text/shared/autopi/01130000.xhp" name="File - AutoPilot - Document Converter"><emph>File - Wizards - Document Converter</emph></link>.</paragraph>
-            </listitem>
-         </list>
+<paragraph role="paragraph" id="par_id3145345" xml-lang="en-US" l10n="U" oldref="3">You can open a document saved in another format by using the following procedure:</paragraph>
+<list type="ordered">
+<listitem>
+<paragraph role="listitem" id="par_id3147242" xml-lang="en-US" l10n="U" oldref="4">Choose <emph>File - Open</emph>.</paragraph>
+</listitem>
+<listitem>
+<paragraph role="listitem" id="par_id3152780" xml-lang="en-US" l10n="U" oldref="5">Select a format from the<emph> Files of type</emph> list.</paragraph>
+</listitem>
+<listitem>
+<paragraph role="listitem" id="par_id3148491" xml-lang="en-US" l10n="U" oldref="6">Select a file name and click <emph>Open</emph>.</paragraph>
+</listitem>
+</list>
+<paragraph role="paragraph" id="par_id3159399" xml-lang="en-US" l10n="CHG" oldref="8">If you always want the file dialogs to show another format by default, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Load/Save - General</emph> and select that format as <emph>Default file format</emph>.</paragraph>
+<paragraph role="heading" id="hd_id3154898" xml-lang="en-US" level="2" l10n="U" oldref="9">Converting all documents of a folder</paragraph>
+<paragraph role="paragraph" id="par_id3147336" xml-lang="en-US" l10n="CHG" oldref="10">Open the wizard, which guides you through the operation, to copy and convert all documents from Microsoft Word, Microsoft Excel or Microsoft PowerPoint into OpenDocument file format documents. You can select a source and target directory, specify whether to convert documents and/or templates, and more besides.</paragraph>
+<list type="unordered">
+<listitem>
+<paragraph role="listitem" id="par_id3153824" xml-lang="en-US" l10n="U" oldref="11">Choose <link href="text/shared/autopi/01130000.xhp" name="File - AutoPilot - Document Converter"><emph>File - Wizards - Document Converter</emph></link>.</paragraph>
+</listitem>
+</list>
 <switch select="appl">
 <case select="WRITER">
 <paragraph xml-lang="en-US" id="hd_id4563127" role="heading" level="2" l10n="NEW">Opening HTML files in Writer</paragraph>