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

3 files changed, 9 insertions, 8 deletions

diff --git a/muse2/muse/arranger/CMakeLists.txt b/muse2/muse/arranger/CMakeLists.txt
index 5f886e39..47241207 100644
--- a/muse2/muse/arranger/CMakeLists.txt
+++ b/muse2/muse/arranger/CMakeLists.txt
@@ -25,21 +25,22 @@ QT4_WRAP_CPP (arranger_mocs
       alayout.h
       )
 
-#QT4_WRAP_UI (arranger_ui_headers
-# QT4_WRAP_UI3 (arranger_ui_headers
-#       )
-
-add_library ( arranger STATIC
+file (GLOB SOURCE_FILES
       arranger.cpp arranger.h 
       pcanvas.cpp pcanvas.h 
       tlist.cpp tlist.h 
       alayout.cpp alayout.h 
       trackinfo.cpp trackautomationview.h
-      
+      )
+
+add_library ( arranger STATIC
+      ${SOURCE_FILES}
       ${arranger_mocs}
       # ${arranger_ui_headers}
       )
 
+set (FILES_TO_TRANSLATE ${FILES_TO_TRANSLATE} ${SOURCE_FILES} CACHE INTERNAL "")
+
 add_dependencies(arranger mixer)
 
 set_target_properties( arranger
diff --git a/muse2/muse/arranger/arranger.cpp b/muse2/muse/arranger/arranger.cpp
index 7c9c5751..c9e9a8db 100644
--- a/muse2/muse/arranger/arranger.cpp
+++ b/muse2/muse/arranger/arranger.cpp
@@ -122,7 +122,7 @@ Arranger::Arranger(QMainWindow* parent, const char* name)
       toolbar->addWidget(cursorPos);
 
       const char* rastval[] = {
-            QT_TR_NOOP("Off"), QT_TR_NOOP("Bar"), "1/2", "1/4", "1/8", "1/16"
+            QT_TRANSLATE_NOOP("@default", "Off"), QT_TRANSLATE_NOOP("@default", "Bar"), "1/2", "1/4", "1/8", "1/16"
             };
       label = new QLabel(tr("Snap"));
       label->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
diff --git a/muse2/muse/arranger/tlist.cpp b/muse2/muse/arranger/tlist.cpp
index c49607f7..da4ad9ce 100644
--- a/muse2/muse/arranger/tlist.cpp
+++ b/muse2/muse/arranger/tlist.cpp
@@ -809,7 +809,7 @@ void TList::mousePressEvent(QMouseEvent* ev)
                   // Create a sub-menu and fill it with found synth types. Make p the owner.
                   QMenu* synp = populateAddSynth(p);
 		  synp->setIcon(*synthIcon);
-		  synp->setTitle(QT_TR_NOOP("Add Synth"));
+		  synp->setTitle(QT_TRANSLATE_NOOP("@default", "Add Synth"));
 
                   // Add the 'Add Synth' sub-menu to the menu.
                   p->addMenu(synp);