diff options
author | RĂ¼diger Timm <rt@openoffice.org> | 2001-05-08 12:41:42 +0000 |
---|---|---|
committer | RĂ¼diger Timm <rt@openoffice.org> | 2001-05-08 12:41:42 +0000 |
commit | d5a7801fccb85b27d6780aa2182914b2c5613139 (patch) | |
tree | 48ae11fcd77491fdea1aa8ad67db9b125a506c34 /svx/source/dialog/rubydialog.src | |
parent | cba89d6310775a4c8058bbe4f30f81746d21c4ad (diff) |
#65293# merge errors
Diffstat (limited to 'svx/source/dialog/rubydialog.src')
-rw-r--r-- | svx/source/dialog/rubydialog.src | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/svx/source/dialog/rubydialog.src b/svx/source/dialog/rubydialog.src index 2ecfa10ba13b..591706d0d265 100644 --- a/svx/source/dialog/rubydialog.src +++ b/svx/source/dialog/rubydialog.src @@ -2,9 +2,9 @@ * * $RCSfile: rubydialog.src,v $ * - * $Revision: 1.13 $ + * $Revision: 1.14 $ * - * last change: $Author: kz $ $Date: 2001-05-04 21:11:05 $ + * last change: $Author: rt $ $Date: 2001-05-08 13:41:42 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -364,11 +364,11 @@ ModelessDialog RID_SVXDLG_RUBY }; StringList [ catalan ] = { - < "Izquierda" ; - < "Centrado" ; - < "Derecha" ; - < "0 1 0" ; - < "1 2 1" ; + "Izquierda" ; + "Centrado" ; + "Derecha" ; + "0 1 0" ; + "1 2 1" ; }; }; FixedText FT_CHAR_STYLE |