summaryrefslogtreecommitdiff
path: root/officecfg/registry/data/org/openoffice/Office/Writer.xcu
diff options
context:
space:
mode:
authorRüdiger Timm <rt@openoffice.org>2004-09-20 11:59:08 +0000
committerRüdiger Timm <rt@openoffice.org>2004-09-20 11:59:08 +0000
commit0a3fc2e61fd19827a7d5049272192475a376449b (patch)
tree74ea2972a91059154ca3a8452a85dc3130cca63c /officecfg/registry/data/org/openoffice/Office/Writer.xcu
parentb92495682d843a6b5d0c9faa017d9f811fb68ce9 (diff)
INTEGRATION: CWS swmailmerge (1.12.6); FILE MERGED
2004/08/23 09:43:23 os 1.12.6.5: #i25107# language error fixed 2004/08/17 08:03:25 os 1.12.6.4: #i25107# mail merge localisation 2004/08/13 15:31:50 os 1.12.6.3: RESYNC: (1.12-1.14); FILE MERGED 2004/07/07 10:49:04 os 1.12.6.2: #i25107# properties mustn't be used twice 2004/07/02 09:16:21 os 1.12.6.1: #i25107# mail merge properties added
Diffstat (limited to 'officecfg/registry/data/org/openoffice/Office/Writer.xcu')
-rw-r--r--officecfg/registry/data/org/openoffice/Office/Writer.xcu18
1 files changed, 16 insertions, 2 deletions
diff --git a/officecfg/registry/data/org/openoffice/Office/Writer.xcu b/officecfg/registry/data/org/openoffice/Office/Writer.xcu
index 4d7c4a574aca..8bf1a29eff9f 100644
--- a/officecfg/registry/data/org/openoffice/Office/Writer.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Writer.xcu
@@ -3,9 +3,9 @@
*
* $RCSfile: Writer.xcu,v $
*
- * $Revision: 1.16 $
+ * $Revision: 1.17 $
*
- * last change: $Author: rt $ $Date: 2004-09-20 12:32:57 $
+ * last change: $Author: rt $ $Date: 2004-09-20 12:59:08 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -61,6 +61,20 @@
************************************************************************ -->
<!DOCTYPE oor:component-data SYSTEM "../../../../component-update.dtd">
<oor:component-data oor:name="Writer" oor:package="org.openoffice.Office" xmlns:oor="http://openoffice.org/2001/registry" xmlns:install="http://openoffice.org/2004/installation" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <node oor:name="MailMergeWizard">
+ <prop oor:name="FemaleGreetingLines">
+ <value xml:lang="en-US" oor:separator=";">Dear Mrs. &lt;2&gt;,</value>
+ <value xml:lang="de" oor:separator=";">Sehr geehrte Frau &lt;2&gt;,;Liebe Frau &lt;2&gt;,;Hallo Frau &lt;2&gt;,;Hallo &lt;1&gt;,</value>
+ </prop>
+ <prop oor:name="MaleGreetingLines">
+ <value xml:lang="en-US" oor:separator=";">Dear Mr. &lt;2&gt;,</value>
+ <value xml:lang="de" oor:separator=";">Sehr geehrter Herr &lt;2&gt;,;Lieber Herr &lt;2&gt;,;Hallo Herr &lt;2&gt;,;Hallo &lt;1&gt;,</value>
+ </prop>
+ <prop oor:name="NeutralGreetingLines">
+ <value xml:lang="en-US" oor:separator=";">To whom it may concern,;Dear Friends,;Dear Sir or Madam,;Hello,</value>
+ <value xml:lang="de" oor:separator=";">Sehr geehrte Damen und Herren,;Liebe Freunde,;Liebe Vereinsmitglieder,;Hallo,</value>
+ </prop>
+ </node>
<node oor:name="AutoFunction" install:module="cjk">
<node oor:name="Completion">
<prop oor:name="Enable">