Make the string 'and' translatable in Manage Conditional Formatting dialog

Change-Id: Ieb6422c399866c02e6f1e6170a2753495a7be5fd
Reviewed-on: https://gerrit.libreoffice.org/28279Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>

sc/inc/globstr.hrc

@@ -141,6 +141,8 @@
 
 #define STR_DATABASE_NOTFOUND       95
 
+#define STR_COND_AND                96
+
 #define STR_UNDO_PRINTRANGES        97
 
 #define STR_UNDO_DEC_INDENT         98

sc/source/ui/condformat/condformathelper.cxx

@@ -134,7 +134,9 @@ OUString ScCondFormatHelper::GetExpression(const ScConditionalFormat& rFormat, c
                         if(eMode == SC_COND_BETWEEN || eMode == SC_COND_NOTBETWEEN)
                         {
                             aBuffer.append(pEntry->GetExpression(rPos, 0));
-                            aBuffer.append(" and ");
+                            aBuffer.append(" ");
+                            aBuffer.append(ScGlobal::GetRscString(STR_COND_AND));
+                            aBuffer.append(" ");
                             aBuffer.append(pEntry->GetExpression(rPos, 1));
                         }
                         else if(eMode <= SC_COND_NOTEQUAL || eMode >= SC_COND_BEGINS_WITH)
@@ -184,7 +186,10 @@ OUString ScCondFormatHelper::GetExpression( ScCondFormatEntryType eType, sal_Int
             aBuffer.append(" ").append(aStr1);
             if(nIndex == 6 || nIndex == 7)
             {
-                aBuffer.append(" and ").append(aStr2);
+                aBuffer.append(" ");
+                aBuffer.append(ScGlobal::GetRscString(STR_COND_AND));
+                aBuffer.append(" ");
+                aBuffer.append(aStr2);
             }
         }
     }

sc/source/ui/src/globstr.src

@@ -1964,6 +1964,10 @@ Resource RID_GLOBSTR
     {
         Text [ en-US ] = "next year";
     };
+    String STR_COND_AND
+    {
+        Text [ en-US ] = "and";
+    };
     String STR_ERR_CONDFORMAT_PROTECTED
     {
         Text [ en-US ] = "Conditional Formats can not be created, deleted or changed in protected sheets!";