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

[Caolán McNamara]

 include/svx/svdstr.hrc       |    5 +++++
 svx/source/svdraw/svdstr.src |   22 ++++++++++++++++++++--
 2 files changed, 25 insertions(+), 2 deletions(-)

New commits:
commit af76aebd44789dd206d0931361bbb4874463c3b8
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue May 30 09:07:30 2017 +0100

    missing resources
    
    since
    
    commit 17e872c3fa87bb596ec8b263b7a2e692b927dcef
    Date:   Fri Mar 17 13:11:27 2017 +0200
    
        remove unused defines from HRC files in svx(1)
    
    because SdrRectObj::TakeObjNamePlural adds some numbers to ids to find other ones
    
    Change-Id: I9d0bd3686f4a60b7436950f8e80def9cc3586d9c
    (cherry picked from commit b94f66ca986dd4405e227c031f8e039de07dab52)

diff --git a/include/svx/svdstr.hrc b/include/svx/svdstr.hrc
index 6051502f923c..a1168b708638 100644
--- a/include/svx/svdstr.hrc
+++ b/include/svx/svdstr.hrc
@@ -38,6 +38,11 @@
 #define STR_ObjNamePluralLINE        (STR_ObjNameBegin + 12)
 #define STR_ObjNameSingulRECT        (STR_ObjNameBegin + 13)
 #define STR_ObjNamePluralRECT        (STR_ObjNameBegin + 14)
+#define STR_ObjNamePluralQUAD        (STR_ObjNameBegin + 16)
+#define STR_ObjNamePluralPARAL       (STR_ObjNameBegin + 18)
+#define STR_ObjNamePluralRECTRND     (STR_ObjNameBegin + 22)
+#define STR_ObjNamePluralQUADRND     (STR_ObjNameBegin + 24)
+#define STR_ObjNamePluralPARALRND    (STR_ObjNameBegin + 26)
 #define STR_ObjNameSingulCIRC        (STR_ObjNameBegin + 29)
 #define STR_ObjNamePluralCIRC        (STR_ObjNameBegin + 30)
 #define STR_ObjNameSingulSECT        (STR_ObjNameBegin + 31)
diff --git a/svx/source/svdraw/svdstr.src b/svx/source/svdraw/svdstr.src
index 515528707fa2..036e8b0758a8 100644
--- a/svx/source/svdraw/svdstr.src
+++ b/svx/source/svdraw/svdstr.src
@@ -65,7 +65,6 @@ String STR_ObjNamePluralLINE
 {
     Text [ en-US ] = "Lines" ;
 };
-
 String STR_ObjNameSingulRECT
 {
     Text [ en-US ] = "Rectangle" ;
@@ -74,7 +73,26 @@ String STR_ObjNamePluralRECT
 {
     Text [ en-US ] = "Rectangles" ;
 };
-
+String STR_ObjNamePluralQUAD
+{
+    Text [ en-US ] = "Squares" ;
+};
+String STR_ObjNamePluralPARAL
+{
+    Text [ en-US ] = "Parallelograms" ;
+};
+String STR_ObjNamePluralRECTRND
+{
+    Text [ en-US ] = "Rounded Rectangles" ;
+};
+String STR_ObjNamePluralQUADRND
+{
+    Text [ en-US ] = "Rounded Squares" ;
+};
+String STR_ObjNamePluralPARALRND
+{
+    Text [ en-US ] = "Rounded parallelograms" ;
+};
 String STR_ObjNameSingulCIRC
 {
     Text [ en-US ] = "Circle" ;