From 08eb5de3c7eea85f66be60973b103187e8da8f4d Mon Sep 17 00:00:00 2001
From: Ivo Hinkelmann <ihi@openoffice.org>
Date: Fri, 26 Nov 2004 19:44:23 +0000
Subject: INTEGRATION: CWS so8betal10n (1.4.14); FILE MERGED 2004/11/25
 18:36:02 ihi 1.4.14.1: German merge fix

---
 transex3/scripts/localize.pl | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'transex3')

diff --git a/transex3/scripts/localize.pl b/transex3/scripts/localize.pl
index 5e62d949b596..c23495ebe0dc 100755
--- a/transex3/scripts/localize.pl
+++ b/transex3/scripts/localize.pl
@@ -6,9 +6,9 @@ eval 'exec perl -wS $0 ${1+"$@"}'
 #
 #   $RCSfile: localize.pl,v $
 #
-#   $Revision: 1.5 $
+#   $Revision: 1.6 $
 #
-#   last change: $Author: rt $ $Date: 2004-11-18 08:16:13 $
+#   last change: $Author: ihi $ $Date: 2004-11-26 20:44:23 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -167,7 +167,7 @@ sub splitfile{
                 $lastFile = $currentFile; # ?
                 $last_sdffile = $cur_sdffile;
             }
-            if( ( $lang eq "en-US" || $lang eq "de") ){}
+            if( ( $lang eq "en-US" || ( $prj ne "helpcontent2" && $lang eq "de") ) ){}
 #            elsif( $currentFile eq $lastFile ){
             elsif( $cur_sdffile eq $last_sdffile ){
                 $block{ $prj.$lang.$gid.$lid.$file.$type.$plattform.$helpid } =  $line ;
@@ -176,7 +176,7 @@ sub splitfile{
                 $lastFile = $currentFile; #?
                 $last_sdffile = $cur_sdffile;
                 %block = ();
-                if( !( $lang eq "en-US" || $lang eq "de") ){  $block{ $prj.$lang.$gid.$lid.$file.$type.$plattform.$helpid } =  $line ; }
+                if( !( $lang eq "en-US" || ( $prj ne "helpcontent2" && $lang eq "de") ) ){  $block{ $prj.$lang.$gid.$lid.$file.$type.$plattform.$helpid } =  $line ; }
             }
         } #else { print STDOUT "splitfile REGEX kaputt\n";}
 
-- 
cgit