summaryrefslogtreecommitdiff
path: root/source/text/shared
diff options
context:
space:
mode:
authorChristian Lohmaier <lohmaier+LibreOffice@googlemail.com>2016-01-25 15:26:12 +0100
committerChristian Lohmaier <lohmaier+LibreOffice@googlemail.com>2016-01-25 15:36:48 +0100
commitf9cb7f4660c039f7bf18bf60f6fb9c77f7e4f54b (patch)
tree782ece64afc2930b2d2eff3d5d54301a76df9dfa /source/text/shared
parentac1db7fbf890d5393d5a2132d6bafe13dbc1c7a9 (diff)
switchinline is no valid child of "item" either
sed command used: 's#\(<item[^>]*>\)\(<switchinline[^>]*><caseinline[^>]*>\)\([^>]*\)\(</caseinline><defaultinline>\)\([^<]*\)\(</defaultinline></switchinline>\)\([^<]*</item>\)#\2\1\3</item>\4\1\5</item>\6\1\7#g' Change-Id: I386bb105520449b3a9dbb27d9508499af0a21cc9
Diffstat (limited to 'source/text/shared')
-rw-r--r--source/text/shared/01/04050000.xhp2
-rw-r--r--source/text/shared/01/webhtml.xhp4
-rw-r--r--source/text/shared/02/20050000.xhp2
-rw-r--r--source/text/shared/guide/autohide.xhp2
-rw-r--r--source/text/shared/guide/language_select.xhp2
-rw-r--r--source/text/shared/guide/ms_import_export_limitations.xhp2
-rw-r--r--source/text/shared/guide/ms_user.xhp2
-rw-r--r--source/text/shared/optionen/online_update.xhp2
8 files changed, 9 insertions, 9 deletions
diff --git a/source/text/shared/01/04050000.xhp b/source/text/shared/01/04050000.xhp
index cbb0f106a6..6229a04f50 100644
--- a/source/text/shared/01/04050000.xhp
+++ b/source/text/shared/01/04050000.xhp
@@ -51,7 +51,7 @@
If a text range is selected, the comment is attached to the text range.</paragraph>
<paragraph xml-lang="en-US" id="par_id0915200910571516" role="paragraph" l10n="NEW">In Calc, Draw, and Impress, the command <item type="menuitem">Insert - Comment</item> inserts a comment.</paragraph>
<paragraph xml-lang="en-US" id="par_id1831" role="paragraph" l10n="NEW">The author name and the date and time of creating this comment is shown at the bottom of the comment box.</paragraph>
- <paragraph xml-lang="en-US" id="par_id6718649" role="paragraph" l10n="NEW">The comments by different authors get different colors. Choose <item type="menuitem"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME - User Data</item> to enter your name so that it can show up as the comment author.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id6718649" role="paragraph" l10n="NEW">The comments by different authors get different colors. Choose <switchinline select="sys"><caseinline select="MAC"><item type="menuitem">%PRODUCTNAME - Preferences</item></caseinline><defaultinline><item type="menuitem">Tools - Options</item></defaultinline></switchinline><item type="menuitem"> - %PRODUCTNAME - User Data</item> to enter your name so that it can show up as the comment author.</paragraph>
<paragraph xml-lang="en-US" id="hd_id2929166" role="heading" level="2" l10n="NEW">Editing comments</paragraph>
<paragraph xml-lang="en-US" id="par_id5201879" role="paragraph" l10n="NEW">Every user with write permission to the document can edit and delete comments of all authors.</paragraph>
<paragraph xml-lang="en-US" id="par_id2571794" role="paragraph" l10n="NEW">The comment box contains an icon with a down arrow. Click the icon to open a menu with some commands to delete comments.</paragraph>
diff --git a/source/text/shared/01/webhtml.xhp b/source/text/shared/01/webhtml.xhp
index cbe78de6a2..c21681b2f8 100644
--- a/source/text/shared/01/webhtml.xhp
+++ b/source/text/shared/01/webhtml.xhp
@@ -38,7 +38,7 @@
<section id="howtoget">
<embed href="text/shared/00/00000401.xhp#webhtml"/>
</section>
-<paragraph role="paragraph" id="par_id9186681" xml-lang="en-US" l10n="NEW">The HTML formatted copy is written to the temporary files folder that you can select in <item type="menuitem"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME - Paths</item>. When you quit %PRODUCTNAME, the HTML file will be deleted.</paragraph>
-<paragraph role="paragraph" id="par_id5871150" xml-lang="en-US" l10n="NEW">You can set the HTML export filter options by choosing <item type="menuitem"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Load/Save - HTML Compatibility</item>.</paragraph>
+<paragraph role="paragraph" id="par_id9186681" xml-lang="en-US" l10n="NEW">The HTML formatted copy is written to the temporary files folder that you can select in <switchinline select="sys"><caseinline select="MAC"><item type="menuitem">%PRODUCTNAME - Preferences</item></caseinline><defaultinline><item type="menuitem">Tools - Options</item></defaultinline></switchinline><item type="menuitem"> - %PRODUCTNAME - Paths</item>. When you quit %PRODUCTNAME, the HTML file will be deleted.</paragraph>
+<paragraph role="paragraph" id="par_id5871150" xml-lang="en-US" l10n="NEW">You can set the HTML export filter options by choosing <switchinline select="sys"><caseinline select="MAC"><item type="menuitem">%PRODUCTNAME - Preferences</item></caseinline><defaultinline><item type="menuitem">Tools - Options</item></defaultinline></switchinline><item type="menuitem"> - Load/Save - HTML Compatibility</item>.</paragraph>
</body>
</helpdocument>
diff --git a/source/text/shared/02/20050000.xhp b/source/text/shared/02/20050000.xhp
index 58fb755b38..e26709c8c0 100644
--- a/source/text/shared/02/20050000.xhp
+++ b/source/text/shared/02/20050000.xhp
@@ -82,7 +82,7 @@
</tablerow>
<tablerow>
<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id6971037" xml-lang="en-US" l10n="NEW">Block selection (<item type="keycode"><switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+F8</item>)</paragraph>
+<paragraph role="paragraph" id="par_id6971037" xml-lang="en-US" l10n="NEW">Block selection (<switchinline select="sys"><caseinline select="MAC"><item type="keycode">Command</item></caseinline><defaultinline><item type="keycode">Ctrl</item></defaultinline></switchinline><item type="keycode">+Shift+F8</item>)</paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
<paragraph role="paragraph" id="par_id5258644" xml-lang="en-US" l10n="NEW">A block of text can be selected.</paragraph>
diff --git a/source/text/shared/guide/autohide.xhp b/source/text/shared/guide/autohide.xhp
index a6455e19b4..cca433a93b 100644
--- a/source/text/shared/guide/autohide.xhp
+++ b/source/text/shared/guide/autohide.xhp
@@ -50,7 +50,7 @@
<paragraph role="listitem" id="par_id3150503" xml-lang="en-US" l10n="CHG" oldref="67">Drag the window by its title bar to the side, or</paragraph>
</listitem>
<listitem>
-<paragraph role="listitem" id="par_id3150275" xml-lang="en-US" l10n="CHG" oldref="68">Double-click inside a vacant area of the window while holding down the <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline> key. In the Styles and Formatting window, double-click a gray part of the window next to the icons while holding down the <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline> key. Alternatively, press <item type="keycode"><switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+F10</item>.</paragraph>
+<paragraph role="listitem" id="par_id3150275" xml-lang="en-US" l10n="CHG" oldref="68">Double-click inside a vacant area of the window while holding down the <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline> key. In the Styles and Formatting window, double-click a gray part of the window next to the icons while holding down the <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline> key. Alternatively, press <switchinline select="sys"><caseinline select="MAC"><item type="keycode">Command</item></caseinline><defaultinline><item type="keycode">Ctrl</item></defaultinline></switchinline><item type="keycode">+Shift+F10</item>.</paragraph>
</listitem>
</list>
<paragraph role="paragraph" id="par_id3147335" xml-lang="en-US" l10n="U" oldref="69">These methods can also be used to undock a currently docked window.</paragraph>
diff --git a/source/text/shared/guide/language_select.xhp b/source/text/shared/guide/language_select.xhp
index dd97f89a0a..ee157a506d 100644
--- a/source/text/shared/guide/language_select.xhp
+++ b/source/text/shared/guide/language_select.xhp
@@ -137,7 +137,7 @@
<paragraph xml-lang="en-US" id="par_id3912778" role="paragraph" l10n="CHG">Most users download the American English version, which gives you English menu commands and English application help. If you want another language for the menus (and for the application help, if available in that language), change the UI language as follows.</paragraph>
<list type="ordered">
<listitem>
- <paragraph xml-lang="en-US" id="par_id3163853" role="paragraph" l10n="NEW">Choose <item type="menuitem"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Language Settings - Languages</item>.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3163853" role="paragraph" l10n="NEW">Choose <switchinline select="sys"><caseinline select="MAC"><item type="menuitem">%PRODUCTNAME - Preferences</item></caseinline><defaultinline><item type="menuitem">Tools - Options</item></defaultinline></switchinline><item type="menuitem"> - Language Settings - Languages</item>.</paragraph>
</listitem>
<listitem>
<paragraph xml-lang="en-US" id="par_id121158" role="paragraph" l10n="NEW">Select another UI language in the "User interface" listbox.</paragraph>
diff --git a/source/text/shared/guide/ms_import_export_limitations.xhp b/source/text/shared/guide/ms_import_export_limitations.xhp
index 6894052ebc..5d2b1fd7e9 100644
--- a/source/text/shared/guide/ms_import_export_limitations.xhp
+++ b/source/text/shared/guide/ms_import_export_limitations.xhp
@@ -33,7 +33,7 @@
<paragraph role="paragraph" id="par_id3149760" xml-lang="en-US" l10n="E" oldref="32" localize="false"/>
<paragraph role="heading" id="hd_id3152425" xml-lang="en-US" level="1" l10n="U" oldref="1"><variable id="about"><link href="text/shared/guide/ms_import_export_limitations.xhp" name="About Converting Microsoft Office Documents">About Converting Microsoft Office Documents</link></variable></paragraph>
<paragraph role="paragraph" id="par_id3147834" xml-lang="en-US" l10n="U" oldref="2">$[officename] can automatically open Microsoft Office 97/2000/XP documents. However, some layout features and formatting attributes in more complex Microsoft Office documents are handled differently in $[officename] or are unsupported. As a result, converted files require some degree of manual reformatting. The amount of reformatting that can be expected is proportional to the complexity of the structure and formatting of the source document. $[officename] cannot run Visual Basic Scripts, but can load them for you to analyze.</paragraph>
-<paragraph role="note" id="par_id0804200804174819" xml-lang="en-US" l10n="NEW">The most recent versions of %PRODUCTNAME can load and save the Microsoft Office Open XML document formats with the extensions docx, xlsx, and pptx. The same versions can also run some Excel Visual Basic scripts, if you enable this feature at <item type="menuitem"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Load/Save - VBA Properties</item>.</paragraph>
+<paragraph role="note" id="par_id0804200804174819" xml-lang="en-US" l10n="NEW">The most recent versions of %PRODUCTNAME can load and save the Microsoft Office Open XML document formats with the extensions docx, xlsx, and pptx. The same versions can also run some Excel Visual Basic scripts, if you enable this feature at <switchinline select="sys"><caseinline select="MAC"><item type="menuitem">%PRODUCTNAME - Preferences</item></caseinline><defaultinline><item type="menuitem">Tools - Options</item></defaultinline></switchinline><item type="menuitem"> - Load/Save - VBA Properties</item>.</paragraph>
<paragraph role="paragraph" id="par_id3155934" xml-lang="en-US" l10n="U" oldref="3">The following lists provide a general overview of Microsoft Office features that may cause conversion challenges. These will not affect your ability to use or work with the content of the converted document.</paragraph>
<paragraph role="heading" id="hd_id3155892" xml-lang="en-US" level="2" l10n="U" oldref="6">Microsoft Word</paragraph>
<list type="ordered">
diff --git a/source/text/shared/guide/ms_user.xhp b/source/text/shared/guide/ms_user.xhp
index 54790cad32..61237b70b4 100644
--- a/source/text/shared/guide/ms_user.xhp
+++ b/source/text/shared/guide/ms_user.xhp
@@ -111,7 +111,7 @@
</list>
<paragraph role="heading" id="hd_id3154319" xml-lang="en-US" level="2" l10n="U" oldref="23">Macros in Microsoft Office and $[officename]</paragraph>
<paragraph role="paragraph" id="par_id3154921" xml-lang="en-US" l10n="U" oldref="24">With a few exceptions, Microsoft Office and $[officename] cannot run the same macro code. Microsoft Office uses VBA (Visual Basic for Applications) code, and $[officename] uses Basic code based on the $[officename] API (Application Program Interface) environment. Although the programming language is the same, the objects and methods are different.</paragraph>
-<paragraph role="note" id="par_id0804200804173539" xml-lang="en-US" l10n="NEW">The most recent versions of %PRODUCTNAME can run some Excel Visual Basic scripts if you enable this feature at <item type="menuitem"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Load/Save - VBA Properties</item>.</paragraph>
+<paragraph role="note" id="par_id0804200804173539" xml-lang="en-US" l10n="NEW">The most recent versions of %PRODUCTNAME can run some Excel Visual Basic scripts if you enable this feature at <switchinline select="sys"><caseinline select="MAC"><item type="menuitem">%PRODUCTNAME - Preferences</item></caseinline><defaultinline><item type="menuitem">Tools - Options</item></defaultinline></switchinline><item type="menuitem"> - Load/Save - VBA Properties</item>.</paragraph>
<paragraph role="paragraph" id="par_id3152577" xml-lang="en-US" l10n="U" oldref="25">If you use macros in one of the applications and want to use the same functionality in the other application, you must edit the macros. $[officename] can load the macros that are contained within Microsoft Office files and you can then view and edit the macro code in the $[officename] <link href="text/shared/main0600.xhp" name="Basic IDE">Basic IDE</link> editor.</paragraph>
<paragraph role="heading" id="hd_id3152596" xml-lang="en-US" level="3" l10n="U" oldref="26">You can choose to preserve or delete VBA macros</paragraph>
<paragraph role="paragraph" id="par_id3153144" xml-lang="en-US" l10n="U" oldref="27">Open a Microsoft Office document that contains VBA macro code. Change only the normal contents (text, cells, graphics), and do not edit the macros. Save the document as a Microsoft Office file type. Open the file in Microsoft Office, and the VBA macros will run as before.</paragraph>
diff --git a/source/text/shared/optionen/online_update.xhp b/source/text/shared/optionen/online_update.xhp
index c6fa70a301..e343a77a3d 100644
--- a/source/text/shared/optionen/online_update.xhp
+++ b/source/text/shared/optionen/online_update.xhp
@@ -44,7 +44,7 @@
</section>
<bookmark xml-lang="en-US" branch="hid/cui/ui/optonlineupdatepage/autocheck" id="bm_id877101" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id2189397" role="heading" level="2" l10n="NEW">Check for updates automatically</paragraph>
- <paragraph xml-lang="en-US" id="par_id7523728" role="paragraph" l10n="NEW"><ahelp hid=".">Mark to check for online updates periodically, then select the time interval how often %PRODUCTNAME will check for online updates.</ahelp> %PRODUCTNAME will check once a day, week, or month, as soon as a working Internet connection is detected. If you connect to the Internet by a proxy server, set the proxy on <item type="menuitem"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Internet - Proxy</item>.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id7523728" role="paragraph" l10n="NEW"><ahelp hid=".">Mark to check for online updates periodically, then select the time interval how often %PRODUCTNAME will check for online updates.</ahelp> %PRODUCTNAME will check once a day, week, or month, as soon as a working Internet connection is detected. If you connect to the Internet by a proxy server, set the proxy on <switchinline select="sys"><caseinline select="MAC"><item type="menuitem">%PRODUCTNAME - Preferences</item></caseinline><defaultinline><item type="menuitem">Tools - Options</item></defaultinline></switchinline><item type="menuitem"> - Internet - Proxy</item>.</paragraph>
<paragraph xml-lang="en-US" id="par_id8994109" role="paragraph" l10n="NEW">When an update is available, an icon in the menu bar displays some explaining text. Click the icon to proceed.</paragraph>
<paragraph xml-lang="en-US" id="par_id476699" role="paragraph" l10n="NEW">If you disable the check, the icon is removed from the menu bar.</paragraph>
<paragraph xml-lang="en-US" id="par_id4057130" role="note" l10n="CHG">Online Update is a module that can be selected or deselected to be installed. Choose the customized installation in the Setup of %PRODUCTNAME.</paragraph>