comparison kdiff3/src/main.cpp @ 58:8af4bb9d9a5a

Version 0.9.83

 /***************************************************************************
                           main.cpp  -  Where everything starts.
                              -------------------
     begin                : Don Jul 11 12:31:29 CEST 2002
-    copyright            : (C) 2002 by Joachim Eibl
+    copyright            : (C) 2002-2004 by Joachim Eibl
     email                : [e-mail]
  ***************************************************************************/
 
 /***************************************************************************
  *                                                                         *

    // KDiff3 can replace cleardiffmrg from clearcase. But not all functions.
    if ( isOptionUsed( "directory", argc,argv ) )
    {
       return ::_spawnvp(_P_WAIT , "cleardiffmrg_orig", argv );      
    }
+   
 #endif
    QApplication::setColorSpec( QApplication::ManyColor ); // Grab all 216 colors
 
    KAboutData aboutData( "kdiff3", I18N_NOOP("KDiff3"),
       VERSION, description, KAboutData::License_GPL,

    KCmdLineArgs::addCmdLineOptions( options ); // Add our own options.
 
    KApplication app;
 #ifdef KREPLACEMENTS_H
    QString translationDir = getTranslationDir();
+   QString locale = QTextCodec::locale();
    QTranslator kdiff3Translator( 0 );
-   kdiff3Translator.load( QString("kdiff3_")+QTextCodec::locale(), translationDir );
+   kdiff3Translator.load( QString("kdiff3_")+locale, translationDir );
    app.installTranslator( &kdiff3Translator );
    
    QTranslator qtTranslator( 0 );
-   qtTranslator.load( QString("qt_")+QTextCodec::locale(), translationDir );
+   qtTranslator.load( QString("qt_")+locale, translationDir );
    app.installTranslator( &qtTranslator );
 #endif
 
   if (app.isRestored())
   {