From 72dcd2cb503c6f0d5d5794e07a298e8f72a866e8 Mon Sep 17 00:00:00 2001 From: Ivo Hinkelmann Date: Fri, 26 Nov 2004 19:44:36 +0000 Subject: INTEGRATION: CWS so8betal10n (1.16.24); FILE MERGED 2004/11/25 18:36:36 ihi 1.16.24.1: German merge fix --- transex3/source/merge.cxx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'transex3') diff --git a/transex3/source/merge.cxx b/transex3/source/merge.cxx index 5b0ec506327c..4ce7a0d92fd1 100644 --- a/transex3/source/merge.cxx +++ b/transex3/source/merge.cxx @@ -2,9 +2,9 @@ * * $RCSfile: merge.cxx,v $ * - * $Revision: 1.17 $ + * $Revision: 1.18 $ * - * last change: $Author: rt $ $Date: 2004-11-18 08:17:30 $ + * last change: $Author: ihi $ $Date: 2004-11-26 20:44:36 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -299,7 +299,7 @@ MergeDataFile::MergeDataFile( const ByteString &rFileName, const ByteString& sFi //if (( nLANG != 49 ) && ( LANGUAGE_ALLOWED( GetLangIndex( nLANG )))) nLANG.EraseLeadingAndTrailingChars(); - if ( !nLANG.EqualsIgnoreCaseAscii( "de" ) && !nLANG.EqualsIgnoreCaseAscii("en-US") ){ + if ( !nLANG.EqualsIgnoreCaseAscii("en-US") ){ InsertEntry( sTYP, sGID, sLID, sPFO, nLANG, sTEXT, sQHTEXT, sTITLE ); if( nLANG.Len() > 0 ){ bool bFound = false; @@ -348,7 +348,7 @@ MergeDataFile::MergeDataFile( const ByteString &rFileName, const ByteString& sFi //if (( nLANG != 49 ) && ( LANGUAGE_ALLOWED( GetLangIndex( nLANG )))) nLANG.EraseLeadingAndTrailingChars(); - if ( !nLANG.EqualsIgnoreCaseAscii("de") && !nLANG.EqualsIgnoreCaseAscii("en-US") ){ + if ( !nLANG.EqualsIgnoreCaseAscii("en-US") ){ InsertEntry( sTYP, sGID, sLID, sPFO, nLANG, sTEXT, sQHTEXT, sTITLE ); if( nLANG.Len() > 0 ){ bool bFound = false; -- cgit