summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRüdiger Timm <rt@openoffice.org>2004-09-20 12:58:03 +0000
committerRüdiger Timm <rt@openoffice.org>2004-09-20 12:58:03 +0000
commit9f5e1876edd57456f6928be0de384b921f6ece5a (patch)
treeaa46c4a553c74719e291699597416651ec42f5c4
parented07352f47b401af1f3d76599418f764721007e2 (diff)
INTEGRATION: CWS swmailmerge (1.2.24); FILE MERGED
2004/09/15 15:36:48 os 1.2.24.6: RESYNC: (1.8-1.10); FILE MERGED 2004/08/13 13:56:16 os 1.2.24.5: RESYNC: (1.7-1.8); FILE MERGED 2004/07/07 14:21:37 os 1.2.24.4: RESYNC: (1.5-1.7); FILE MERGED 2004/06/11 08:07:19 os 1.2.24.3: RESYNC: (1.4-1.5); FILE MERGED 2004/06/01 07:15:01 os 1.2.24.2: RESYNC: (1.2-1.4); FILE MERGED 2004/05/07 09:38:55 os 1.2.24.1: #i25107# Mail merge mailer configuration page added
-rw-r--r--svx/source/dialog/treeopt.src6
1 files changed, 4 insertions, 2 deletions
diff --git a/svx/source/dialog/treeopt.src b/svx/source/dialog/treeopt.src
index 549e8caff9d9..078d1ba9d9ef 100644
--- a/svx/source/dialog/treeopt.src
+++ b/svx/source/dialog/treeopt.src
@@ -2,9 +2,9 @@
*
* $RCSfile: treeopt.src,v $
*
- * $Revision: 1.11 $
+ * $Revision: 1.12 $
*
- * last change: $Author: rt $ $Date: 2004-09-20 12:41:12 $
+ * last change: $Author: rt $ $Date: 2004-09-20 13:58:03 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -340,6 +340,7 @@ Resource RID_OFADLG_OPTIONS_TREE_PAGES
< "nderungen" ; RID_SW_TP_REDLINE_OPT ; > ;
< "Kompatibilitt" ; RID_SW_TP_OPTCOMPATIBILITY_PAGE ; > ;
< "AutoBeschriftung" ; RID_SW_TP_OPTCAPTION_PAGE ; > ;
+ < "Serienbrief-E-Mail" ; RID_SW_TP_MAILCONFIG ; >;
};
ItemList [ en-US ] =
{
@@ -356,6 +357,7 @@ Resource RID_OFADLG_OPTIONS_TREE_PAGES
< "Changes" ; RID_SW_TP_REDLINE_OPT ; > ;
< "Compatibility" ; RID_SW_TP_OPTCOMPATIBILITY_PAGE ; > ;
< "AutoCaption" ; RID_SW_TP_OPTCAPTION_PAGE ; > ;
+ < "Mail Merge E-mail" ; RID_SW_TP_MAILCONFIG ; >;
};
};
StringArray SID_SW_ONLINEOPTIONS