CWS-TOOLING: integrate CWS cbosdo01

1 files changed, 20 insertions, 8 deletions

diff --git a/helpcontent2/source/text/shared/01/06040400.xhp b/helpcontent2/source/text/shared/01/06040400.xhp
index 33db44e9c7..52bf92be6e 100755
--- a/helpcontent2/source/text/shared/01/06040400.xhp
+++ b/helpcontent2/source/text/shared/01/06040400.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,11 +32,11 @@
  *
  ************************************************************************
  -->
- 
-	
+
+
 <meta>
 <topic id="textshared0106040400xml" indexer="include">
-<title id="tit" xml-lang="en-US">Custom Quotes</title>
+<title id="tit" xml-lang="en-US">Localized Options</title>
 <filename>/text/shared/01/06040400.xhp</filename>
 </topic>
 </meta>
@@ -45,15 +45,27 @@
 <bookmark xml-lang="en-US" branch="index" id="bm_id3153899"><bookmark_value>quotes; custom</bookmark_value>
 <bookmark_value>custom quotes</bookmark_value>
 <bookmark_value>AutoCorrect function; quotes</bookmark_value>
+<bookmark_value>replacing;ordinal numbers</bookmark_value>
+<bookmark_value>ordinal numbers;replacing</bookmark_value>
 </bookmark>
-<paragraph role="heading" id="hd_id3153899" xml-lang="en-US" level="1" l10n="U" oldref="15"><link href="text/shared/01/06040400.xhp" name="Custom Quotes">Custom Quotes</link></paragraph>
-<paragraph role="paragraph" id="par_id3149748" xml-lang="en-US" l10n="U" oldref="16">Specify the AutoCorrect options for quotation marks in your document.</paragraph>
+<comment>renamed tab page from Custom Quotes to Localized Options, cws cbosdo01</comment>
+<paragraph role="heading" id="hd_id3153899" xml-lang="en-US" level="1" l10n="U" oldref="15"><link href="text/shared/01/06040400.xhp" name="Localized Options">Localized Options</link></paragraph>
+<paragraph role="paragraph" id="par_id3149748" xml-lang="en-US" l10n="U" oldref="16">Specify the AutoCorrect options for quotation marks and for options that are specific to the language of the text.</paragraph>
 </section>
 <section id="howtoget">
 <embed href="text/shared/00/00000406.xhp#autokotyafz"/>
 </section>
+<comment>new feature, cws cbosdo01. http://wiki.services.openoffice.org/wiki/Non_Breaking_Spaces_Before_Punctuation_In_French_(espaces_ins%C3%A9cables)</comment>
+<paragraph xml-lang="en-US" id="hd_id3159300" role="heading" level="2" l10n="U" oldref="25">Add non breaking space before specific punctuation marks in French text</paragraph>
+<paragraph xml-lang="en-US" id="par_id3153173" role="paragraph" l10n="U" oldref="27">Inserts a non breaking space before ";", "!", "?" and ":" when the character language is set to French (France, Belgium, Luxembourg, Monaco, or Switzerland) and before ":" only when the character language is set to French (Canada).</paragraph>
+
+<comment>moved two paras from 06040100.xhp, cws cbosdo01</comment>
+<paragraph xml-lang="en-US" id="hd_id3159400" role="heading" level="2" l10n="U" oldref="25">Format ordinal number suffixes (1st ... 1^st)</paragraph>
+<paragraph xml-lang="en-US" id="par_id3154173" role="paragraph" l10n="U" oldref="27">Formats the text characters of ordinals, such as 1st, 2nd, or 3rd, as superscripts. For example, in English text, 1st will be converted to 1^st.</paragraph>
+
+
 <paragraph role="heading" id="hd_id3154682" xml-lang="en-US" level="2" l10n="U" oldref="17">Single quotes / Double quotes</paragraph>
-<paragraph role="paragraph" id="par_id3152363" xml-lang="en-US" l10n="U" oldref="18">Specify the replacement characters to use for single or double quotation marks.</paragraph>
+<paragraph role="paragraph" id="par_id3152363" xml-lang="en-US" l10n="U" oldref="18">Specify the replacement characters to use for single or double quotation marks. The conversion takes place while typing or pasting text.</paragraph>
 <bookmark xml-lang="en-US" branch="hid/OFFMGR:CHECKBOX:RID_OFAPAGE_AUTOCORR_QUOTE:CB_SGL_TYPO" id="bm_id3150902" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/OFFMGR:CHECKBOX:RID_OFAPAGE_AUTOCORR_QUOTE:CB_TYPO" id="bm_id3159194" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/svx_Checkbox_RID_OFAPAGE_AUTOCORR_QUOTE_CB_SGL_TYPO" id="bm_id5906552" localize="false"/>