Update TDEL10n module

+ Add new options to function tde_l10n_prepare_xml
-- preserve / remove multiple line breaks
-- this fix the extraction from tips files

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 5121b9a41d)

modules/TDEL10n.cmake

@@ -690,7 +690,7 @@ function( tde_l10n_prepare_xml )
   unset( _context )
   set( _skip_properties "database|associations|populationText" )
   set( _tags "[tT][eE][xX][tT]|title|string|whatsthis|tooltip|label" )
-  set( _preserve "line-wrap" "lines-leading" "spaces-leading" "spaces-trailing" "spaces-multi" )
+  set( _preserve "line-wrap" "lines-leading" "lines-multi" "spaces-leading" "spaces-trailing" "spaces-multi" )
   set( _no_c_format 1 )
   unset( _directive )
   set( _var _source )
@@ -872,8 +872,9 @@ function( tde_l10n_prepare_xml )
 
         if( _xml_inside )
           if( ";${_preserve};" MATCHES ";line-wrap;" )
-            if( ";${_preserve};" MATCHES ";lines-leading;"
-                OR NOT "${_xml_line}" STREQUAL "" OR NOT _xml_tag_empty )
+            if( NOT "${_xml_line}" STREQUAL ""
+                OR ( ";${_preserve};" MATCHES ";lines-leading;" AND _xml_tag_empty )
+                OR ( ";${_preserve};" MATCHES ";lines-multi;" AND NOT _xml_tag_empty ) )
               set( _xml_line "${_xml_line}\\n" )
             endif( )
           elseif( NOT "${_xml_line}" STREQUAL "" AND NOT _xml_tag_empty )