3 files changed, 6 insertions, 2 deletions

diff --git a/development/translation/opie-lupdate/opie-lupdate.pro b/development/translation/opie-lupdate/opie-lupdate.pro
index ea51c8b..8360f05 100644
--- a/development/translation/opie-lupdate/opie-lupdate.pro
+++ b/development/translation/opie-lupdate/opie-lupdate.pro
@@ -1,21 +1,21 @@
         TEMPLATE= app
-        CONFIG  += qt warn_on console
+        CONFIG  += qt warn_on console thread
         HEADERS         = ../shared/metatranslator.h \
                   ../shared/proparser.h \
                   ../shared/opie.h
                   
         SOURCES         = fetchtr.cpp \
                   main.cpp \
                   merge.cpp \
                   numberh.cpp \
                   sametexth.cpp \
                   ../shared/metatranslator.cpp \
                   ../shared/proparser.cpp \
                   ../shared/opie.cpp
 
         DEFINES += QT_INTERNAL_XML
 
         TARGET  = opie-lupdate
         INCLUDEPATH+= ../shared
         #DESTDIR        = 
 
diff --git a/development/translation/shared/opie.cpp b/development/translation/shared/opie.cpp
index c5c72d1..c8cea42 100644
--- a/development/translation/shared/opie.cpp
+++ b/development/translation/shared/opie.cpp
@@ -1,40 +1,43 @@
 #include <stdlib.h>
 
 #include <qdir.h>
 
 #include "opie.h"
 
 OPIE* OPIE::m_self = 0;
 
 
 OPIE::OPIE() {
 }
 OPIE::~OPIE() {
 }
 OPIE* OPIE::self() {
     if (!m_self ) m_self = new OPIE;
     return m_self;
 }
 QStringList OPIE::languageList( const QString& _opieDir )const {
+#if 0
+    return QStringList::split(':',QString(::getenv("OPIE_CREATE_LANGS")));
+#else
     QString opieDi = opieDir( _opieDir );
-
     QStringList langs;
     QDir dir( opieDi + "/i18n/");
     if (!dir.exists() ) return langs;
     langs = dir.entryList( QDir::Dirs );
 
     langs.remove("CVS"); // hey this no language
     langs.remove("unmaintained"); // remove this one too
     langs.remove(".");
     langs.remove("..");
 
 
 
     return langs;
+#endif    
 }
 QString OPIE::opieDir( const QString& _opieDir ) const{
     if (!_opieDir.isEmpty() ) return _opieDir;
     char* dir = ::getenv("OPIEDIR");
     if (!dir ) return QString::null;
     return QString::fromLatin1(dir);
 }
diff --git a/development/translation/shared/proparser.cpp b/development/translation/shared/proparser.cpp
index f616c5a..bb099bb 100644
--- a/development/translation/shared/proparser.cpp
+++ b/development/translation/shared/proparser.cpp
@@ -42,133 +42,134 @@
 #endif
 
 QString loadFile( const QString &fileName )
 {
     QFile file( fileName );
     if ( !file.open(IO_ReadOnly) ) {
         fprintf( stderr, "error: Cannot load '%s': %s\n",
                  file.name().latin1(),
                  file.errorString().latin1() );
         return QString();
     }
 
     QTextStream in( &file );
     return in.read();
 }
 
 QMap<QString, QString> proFileTagMap( const QString& text, const QString& opieDir )
 {
     QString t = text;
 
     /*
       Process include() commands.
     */
     QRegExp callToInclude("include\\s*\\(\\s*([^()\\s]+)\\s*\\)");
     int i = 0;
     while ( (i = callToInclude.search(t, i)) != -1 ) {
         QString after = loadFile( callToInclude.cap(1) );
         t.replace( i, callToInclude.matchedLength(), after );
         i += after.length();
     }
 
     /*
       Strip comments, merge lines ending with backslash, add
       spaces around '=' and '+=', replace '\n' with ';', and
       simplify white spaces.
     */
     t.replace( QRegExp(QString("#[^\n]*\n")), QString(" ") );
     t.replace( QRegExp(QString("\\\\[^\n\\S]*\n")), QString(" ") );
     t.replace( "=", QString(" = ") );
     t.replace( "+ =", QString(" += ") );
     t.replace( "\n", QString(";") );
     t = t.simplifyWhiteSpace();
 
     /*
       Populate tagMap with 'key = value' entries.
     */
     QMap<QString, QString> tagMap;
     QStringList lines = QStringList::split( QChar(';'), t );
     QStringList::Iterator line;
     for ( line = lines.begin(); line != lines.end(); ++line ) {
         QStringList toks = QStringList::split( QChar(' '), *line );
 
         if ( toks.count() >= 3 &&
              (toks[1] == QString("=") || toks[1] == QString("+=")) ) {
             QString tag = toks.first();
             int k = tag.findRev( QChar(':') ); // as in 'unix:'
             if ( k != -1 )
                 tag = tag.mid( k + 1 );
             toks.remove( toks.begin() );
 
             QString action = toks.first();
             toks.remove( toks.begin() );
 
             if ( tagMap.contains(tag) ) {
                 if ( action == QString("=") )
                     tagMap.replace( tag, toks.join(QChar(' ')) );
                 else
                     tagMap[tag] += QChar( ' ' ) + toks.join( QChar(' ') );
             } else {
                 tagMap[tag] = toks.join( QChar(' ') );
             }
         }
     }
 
     /*
       Expand $$variables within the 'value' part of a 'key = value'
       pair.
     */
     QRegExp var( "\\$\\$[({]?([a-zA-Z0-9_]+)[)}]?" );
     QMap<QString, QString>::Iterator it;
     for ( it = tagMap.begin(); it != tagMap.end(); ++it ) {
         int i = 0;
         while ( (i = var.search((*it), i)) != -1 ) {
             int len = var.matchedLength();
             QString invocation = var.cap(1);
             QString after;
 
             if ( invocation == "system" ) {
                 // skip system(); it will be handled in the next pass
                 ++i;
             } else if ( invocation == "OPIEDIR") {
                 (*it).replace( i, len, opieDir );
             }else {
                 if ( tagMap.contains(invocation) )
                     after = tagMap[invocation];
                 (*it).replace( i, len, after );
+                i += after.length();
             }
         }
     }
 
     /*
       Execute system() calls.
     */
     QRegExp callToSystem( "\\$\\$system\\s*\\(([^()]*)\\)" );
     for ( it = tagMap.begin(); it != tagMap.end(); ++it ) {
         int i = 0;
         while ( (i = callToSystem.search((*it), i)) != -1 ) {
             /*
               This code is stolen from qmake's project.cpp file.
               Ideally we would use the same parser, so we wouldn't
               have this code duplication.
             */
             QString after;
             char buff[256];
             FILE *proc = QT_POPEN( callToSystem.cap(1).latin1(), "r" );
             while ( proc && !feof(proc) ) {
                 int read_in = fread( buff, 1, 255, proc );
                 if ( !read_in )
                     break;
                 for ( int i = 0; i < read_in; i++ ) {
                     if ( buff[i] == '\n' || buff[i] == '\t' )
                         buff[i] = ' ';
                 }
                 buff[read_in] = '\0';
                 after += buff;
             }
             (*it).replace( i, callToSystem.matchedLength(), after );
             i += after.length();
         }
     }
 
     return tagMap;
 }