Translations are now handled by cmake. Updated the Russian translation. Added -l flag to override system locale.

3 files changed, 27 insertions, 20 deletions

diff --git a/muse2/muse/driver/CMakeLists.txt b/muse2/muse/driver/CMakeLists.txt
index 2bdc1b97..8d561ee5 100644
--- a/muse2/muse/driver/CMakeLists.txt
+++ b/muse2/muse/driver/CMakeLists.txt
@@ -18,12 +18,19 @@
 #  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 #=============================================================================
 
-add_library ( driver STATIC
+file (GLOB SOURCE_FILES
        audiodev.h alsamidi.cpp alsamidi.h jack.cpp jackaudio.h 
        dummyaudio.cpp alsatimer.cpp alsatimer.h timerdev.h rtctimer.cpp rtctimer.h 
        jackmidi.cpp jackmidi.h
+       )
+
+add_library ( driver STATIC
        # ${PROJECT_BINARY_DIR}/all.h.pch
-      )
+       ${SOURCE_FILES}
+       )
+
+set (FILES_TO_TRANSLATE ${FILES_TO_TRANSLATE} ${SOURCE_FILES} CACHE INTERNAL "")
+
 set_target_properties( driver
   PROPERTIES COMPILE_FLAGS "-include ${PROJECT_BINARY_DIR}/all.h"
   )
diff --git a/muse2/muse/driver/alsamidi.cpp b/muse2/muse/driver/alsamidi.cpp
index dd72ac4a..c7ae07b5 100644
--- a/muse2/muse/driver/alsamidi.cpp
+++ b/muse2/muse/driver/alsamidi.cpp
@@ -222,9 +222,9 @@ void MidiAlsaDevice::writeRouting(int level, Xml& xml) const
         {
           //xml.tag(level++, "Route");
           
-          s = QT_TR_NOOP("Route");
+          s = QT_TRANSLATE_NOOP("@default", "Route");
           if(r->channel != -1)
-            s += QString(QT_TR_NOOP(" channel=\"%1\"")).arg(r->channel);
+            s += QString(QT_TRANSLATE_NOOP("@default", " channel=\"%1\"")).arg(r->channel);
           xml.tag(level++, s.toLatin1().constData());
           
           /*
@@ -258,14 +258,14 @@ void MidiAlsaDevice::writeRouting(int level, Xml& xml) const
           }
           */
           
-          s = QT_TR_NOOP("dest");
+          s = QT_TRANSLATE_NOOP("@default", "dest");
           if(r->type == Route::MIDI_DEVICE_ROUTE)
-            s += QString(QT_TR_NOOP(" devtype=\"%1\"")).arg(r->device->deviceType());
+            s += QString(QT_TRANSLATE_NOOP("@default", " devtype=\"%1\"")).arg(r->device->deviceType());
           else
           if(r->type != Route::TRACK_ROUTE)
-            s += QString(QT_TR_NOOP(" type=\"%1\"")).arg(r->type);
-          //s += QString(QT_TR_NOOP(" name=\"%1\"/")).arg(r->name());
-          s += QString(QT_TR_NOOP(" name=\"%1\"/")).arg(Xml::xmlString(r->name()));
+            s += QString(QT_TRANSLATE_NOOP("@default", " type=\"%1\"")).arg(r->type);
+          //s += QString(QT_TRANSLATE_NOOP("@default", " name=\"%1\"/")).arg(r->name());
+          s += QString(QT_TRANSLATE_NOOP("@default", " name=\"%1\"/")).arg(Xml::xmlString(r->name()));
           xml.tag(level, s.toLatin1().constData());
           
           xml.etag(level--, "Route");
diff --git a/muse2/muse/driver/jackmidi.cpp b/muse2/muse/driver/jackmidi.cpp
index c310462d..2d77af2f 100644
--- a/muse2/muse/driver/jackmidi.cpp
+++ b/muse2/muse/driver/jackmidi.cpp
@@ -707,12 +707,12 @@ void MidiJackDevice::writeRouting(int level, Xml& xml) const
             
             //xml.strTag(level, "srcNode", r->name());
             //xml.tag(level, "source type=\"%d\" name=\"%s\"/", r->type, r->name().toLatin1().constData());
-            s = QT_TR_NOOP("source");
+            s = QT_TRANSLATE_NOOP("@default", "source");
             if(r->type != Route::TRACK_ROUTE)
-              s += QString(QT_TR_NOOP(" type=\"%1\"")).arg(r->type);
+              s += QString(QT_TRANSLATE_NOOP("@default", " type=\"%1\"")).arg(r->type);
 
-            //s += QString(QT_TR_NOOP(" name=\"%1\"/")).arg(r->name());
-            s += QString(QT_TR_NOOP(" name=\"%1\"/")).arg(Xml::xmlString(r->name()));
+            //s += QString(QT_TRANSLATE_NOOP("@default", " name=\"%1\"/")).arg(r->name());
+            s += QString(QT_TRANSLATE_NOOP("@default", " name=\"%1\"/")).arg(Xml::xmlString(r->name()));
             xml.tag(level, s.toLatin1().constData());
             
             //xml.strTag(level, "dstNode", name());
@@ -730,9 +730,9 @@ void MidiJackDevice::writeRouting(int level, Xml& xml) const
       {
         if(!r->name().isEmpty())
         {
-          s = QT_TR_NOOP("Route");
+          s = QT_TRANSLATE_NOOP("@default", "Route");
           if(r->channel != -1)
-            s += QString(QT_TR_NOOP(" channel=\"%1\"")).arg(r->channel);
+            s += QString(QT_TRANSLATE_NOOP("@default", " channel=\"%1\"")).arg(r->channel);
           
           //xml.tag(level++, "Route");
           xml.tag(level++, s.toLatin1().constData());
@@ -768,15 +768,15 @@ void MidiJackDevice::writeRouting(int level, Xml& xml) const
           }
           */
           
-          s = QT_TR_NOOP("dest");
+          s = QT_TRANSLATE_NOOP("@default", "dest");
           if(r->type == Route::MIDI_DEVICE_ROUTE)
-            s += QString(QT_TR_NOOP(" devtype=\"%1\"")).arg(r->device->deviceType());
+            s += QString(QT_TRANSLATE_NOOP("@default", " devtype=\"%1\"")).arg(r->device->deviceType());
           else
           if(r->type != Route::TRACK_ROUTE)
-            s += QString(QT_TR_NOOP(" type=\"%1\"")).arg(r->type);
+            s += QString(QT_TRANSLATE_NOOP("@default", " type=\"%1\"")).arg(r->type);
 
-          //s += QString(QT_TR_NOOP(" name=\"%1\"/")).arg(r->name());
-          s += QString(QT_TR_NOOP(" name=\"%1\"/")).arg(Xml::xmlString(r->name()));
+          //s += QString(QT_TRANSLATE_NOOP("@default", " name=\"%1\"/")).arg(r->name());
+          s += QString(QT_TRANSLATE_NOOP("@default", " name=\"%1\"/")).arg(Xml::xmlString(r->name()));
           xml.tag(level, s.toLatin1().constData());