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

2 files changed, 10 insertions, 7 deletions

diff --git a/muse2/muse/master/CMakeLists.txt b/muse2/muse/master/CMakeLists.txt
index 0a3a54de..168d13ab 100644
--- a/muse2/muse/master/CMakeLists.txt
+++ b/muse2/muse/master/CMakeLists.txt
@@ -47,19 +47,22 @@ QT4_WRAP_CPP ( master_mocs
         tscale.h
       )
 
-# QT4_WRAP_UI ( master_ui_headers
-# QT4_WRAP_UI3 ( master_ui_headers
-#       )
 
-add_library ( master STATIC
-        # ${master_ui_headers}
-        ${master_mocs}
+file (GLOB SOURCE_FILES
         lmaster.cpp # lmaster.h 
         masteredit.cpp # masteredit.h 
         master.cpp # master.h 
         tscale.cpp # tscale.h
+        )
+
+add_library ( master STATIC
+        ${SOURCE_FILES}
+        # ${master_ui_headers}
+        ${master_mocs}
       )
 
+set (FILES_TO_TRANSLATE ${FILES_TO_TRANSLATE} ${SOURCE_FILES} CACHE INTERNAL "")
+
 set_target_properties( master
       PROPERTIES COMPILE_FLAGS "-include ${PROJECT_BINARY_DIR}/all.h"
       )
diff --git a/muse2/muse/master/masteredit.cpp b/muse2/muse/master/masteredit.cpp
index 4ed76c22..42dc412f 100644
--- a/muse2/muse/master/masteredit.cpp
+++ b/muse2/muse/master/masteredit.cpp
@@ -119,7 +119,7 @@ MasterEdit::MasterEdit()
       info->addWidget(tempo);
 
       const char* rastval[] = {
-            QT_TR_NOOP("Off"), "Bar", "1/2", "1/4", "1/8", "1/16"
+            QT_TRANSLATE_NOOP("@default", "Off"), "Bar", "1/2", "1/4", "1/8", "1/16"
             };
       rasterLabel = new LabelCombo(tr("Snap"), 0);
       rasterLabel->setFocusPolicy(Qt::NoFocus);