[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - svx/source

[Zolnai Tamás]

 svx/source/items/svxitems.src |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit f4b44a81fad83a4c3c8c4dd5f962ad52fd57a2b2
Author: Zolnai Tamás <zolnaitamas2000 at gmail.com>
Date:   Sun Jun 14 11:14:52 2015 +0200

    tdf#90063 Avoid duplicated attribute names in RID_ATTR_NAMES
    
    It causes trouble to localiztation tools and also
    makes hard to distinguish these items on the UI.
    e.g. Edit -> Find & Replace -> Other options
    -> Attributes.
    
    (cherry picked from commit dd79dbedd6c7f889f5e39f146a1927d235bc8a59)
    
    Change-Id: Ie7a17e02947200a570b5e6209c8a99d1883a6860

diff --git a/svx/source/items/svxitems.src b/svx/source/items/svxitems.src
index 3121ea9..6687cfd 100644
--- a/svx/source/items/svxitems.src
+++ b/svx/source/items/svxitems.src
@@ -44,7 +44,7 @@ StringArray RID_ATTR_NAMES
         < "Effects"     ;               SID_ATTR_CHAR_CASEMAP ; > ;
         < "Language";                   SID_ATTR_CHAR_LANGUAGE ; > ;
         < "Position"        ;           SID_ATTR_CHAR_ESCAPEMENT ; > ;
-        < "Blinking"    ;               SID_ATTR_CHAR_AUTOKERN ; > ;
+        < "Character blinking"    ;     SID_ATTR_CHAR_AUTOKERN ; > ;
         < "Character set color"       ; SID_ATTR_CHAR_CHARSETCOLOR ; > ;
         < "Overline"      ;             SID_ATTR_CHAR_OVERLINE ; > ;
         < "Paragraph"       ;           SID_ATTR_PARA ; > ;
@@ -55,8 +55,8 @@ StringArray RID_ATTR_NAMES
         < "Do not split paragraph";     SID_ATTR_PARA_SPLIT ; > ;
         < "Orphans"     ;               SID_ATTR_PARA_ORPHANS ; > ;
         < "Widows"      ;               SID_ATTR_PARA_WIDOWS ; > ;
-        < "Spacing"     ;               SID_ATTR_PARA_ULSPACE ; > ;
-        < "Indent"      ;               SID_ATTR_PARA_LRSPACE ; > ;
+        < "Paragraph spacing"     ;     SID_ATTR_PARA_ULSPACE ; > ;
+        < "Paragraph indent"      ;     SID_ATTR_PARA_LRSPACE ; > ;
         < "Indent"      ;               SID_ATTR_LRSPACE ; > ;
         < "Spacing"     ;               SID_ATTR_ULSPACE ; > ;
         < "Page"        ;               SID_ATTR_PAGE ; > ;
@@ -81,7 +81,7 @@ StringArray RID_ATTR_NAMES
         < "Hanging punctuation"     ;   SID_ATTR_PARA_HANGPUNCTUATION ; > ;
         < "Forbidden characters"    ;   SID_ATTR_PARA_FORBIDDEN_RULES ; > ;
         < "Rotation"        ;           SID_ATTR_CHAR_ROTATED ; > ;
-        < "Scale"       ;               SID_ATTR_CHAR_SCALEWIDTH ; > ;
+        < "Character scaling"       ;   SID_ATTR_CHAR_SCALEWIDTH ; > ;
         < "Relief"      ;               SID_ATTR_CHAR_RELIEF ; > ;
         < "Vertical text alignment" ;   SID_PARA_VERTALIGN ; > ;
     };