Make sure cmake enters share/locale last. cliplist links to widgets.

10 files changed, 206 insertions, 70 deletions

diff --git a/muse2/CMakeLists.txt b/muse2/CMakeLists.txt
index a7d86d17..41bc9fec 100644
--- a/muse2/CMakeLists.txt
+++ b/muse2/CMakeLists.txt
@@ -355,7 +355,9 @@ set(CMAKE_CXX_FLAGS_DEBUG   "-g -DQT_DEBUG ${CMAKE_CXX_FLAGS_DEBUG}")
 # subdirs(al awl grepmidi plugins midiplugins muse share synti)
 # subdirs(al lib grepmidi plugins xpm muse share demos doc synti utils)
 #subdirs(al lib grepmidi plugins muse share demos synti )
-subdirs(al awl grepmidi plugins muse share synti packaging utils demos)
+# NOTE: share/ directory needs to be at the end so that the translations
+#       are scanned before coming to share/locale
+subdirs(al awl grepmidi plugins muse synti packaging utils demos share)
 
 ## Install doc files
 file (GLOB doc_files
diff --git a/muse2/ChangeLog b/muse2/ChangeLog
index 77825d3d..c12cbfb4 100644
--- a/muse2/ChangeLog
+++ b/muse2/ChangeLog
@@ -6,6 +6,9 @@
         - Don't pack the binary and subversion directories when doing "make package_source". (Orcan)
         - Updated the Russian translation again thanks to Alex, alex54m -> mail.ru
         - Fix a typo in awl/CMakeLists.txt that disabled the translations for awl. (Orcan)
+        - Updated all the .ts files with the latest strings. Made sure that share/locale/CMakeLists
+          is scanned last so that all the translations are collected before coming to that. (Orcan)
+        - Fix: cliplist target should depend on widgets target. (Orcan)
 19.12.2010:
         - Fixed not saving part colours and part canvas background appearance settings. (Tim)
         *Feature: Added 'global opaqueness' (transparency) appearance setting. (Tim)
diff --git a/muse2/muse/cliplist/CMakeLists.txt b/muse2/muse/cliplist/CMakeLists.txt
index 33936c48..7633b8bb 100644
--- a/muse2/muse/cliplist/CMakeLists.txt
+++ b/muse2/muse/cliplist/CMakeLists.txt
@@ -63,6 +63,7 @@ set_target_properties( cliplist
 target_link_libraries ( cliplist
       ${QT_LIBRARIES}
       awl
+      widgets
       )
 
 ##
diff --git a/muse2/share/CMakeLists.txt b/muse2/share/CMakeLists.txt
index 817e2910..c8d89cf9 100644
--- a/muse2/share/CMakeLists.txt
+++ b/muse2/share/CMakeLists.txt
@@ -18,15 +18,17 @@
 #  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 #=============================================================================
 
+# NOTE: locale/ directory needs to be at the end so that the translations
+#       are scanned before coming to share/locale
 subdirs(
       drummaps
       html
       instruments
-      locale
       plugins
       pybridge
       scripts
       templates
       wallpapers
+      locale
       )
 
diff --git a/muse2/share/locale/muse_de.ts b/muse2/share/locale/muse_de.ts
index 2ae5719a..81567349 100644
--- a/muse2/share/locale/muse_de.ts
+++ b/muse2/share/locale/muse_de.ts
@@ -417,6 +417,10 @@ Word-breaking but only with spaces.</source>
         <source>Qt style sheets (*.qss)</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Global opaqueness (inverse of transparency).</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>AppearanceDialogBase</name>
@@ -644,6 +648,10 @@ Word-breaking but only with spaces.</source>
         <source>Font 6</source>
         <translation type="unfinished">Schriftart 6</translation>
     </message>
+    <message>
+        <source>Global opaqueness</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Arranger</name>
@@ -4171,7 +4179,7 @@ Configuration</source>
     </message>
     <message>
         <source>Help Browser:</source>
-        <translation>Hilfe Browser:</translation>
+        <translation type="obsolete">Hilfe Browser:</translation>
     </message>
     <message>
         <source>Application</source>
@@ -4380,6 +4388,14 @@ Shorter periods are desirable.</source>
         <source>Move single armed track with selection</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>On Launch</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Behavior</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>LMaster</name>
@@ -7568,6 +7584,15 @@ Do you still want to import it?</source>
         <source>&amp;No</source>
         <translation type="unfinished">&amp;Nein</translation>
     </message>
+    <message>
+        <source>Unable to launch help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>For some reason MusE has to launch the default
+browser on your machine.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>NoteInfo</name>
@@ -9116,6 +9141,10 @@ click on the Restart button.</source>
 </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Automation:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SongInfo</name>
@@ -9288,12 +9317,8 @@ click on the Restart button.</source>
 <context>
     <name>TimeCanvas</name>
     <message>
-        <source>Ctrl</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Add Controller View</source>
-        <translation type="unfinished">Kontrolleransicht hinzufügen</translation>
+        <translation type="obsolete">Kontrolleransicht hinzufügen</translation>
     </message>
 </context>
 <context>
diff --git a/muse2/share/locale/muse_es.ts b/muse2/share/locale/muse_es.ts
index 7fb9aebf..3addbc56 100644
--- a/muse2/share/locale/muse_es.ts
+++ b/muse2/share/locale/muse_es.ts
@@ -438,6 +438,10 @@ Word-breaking but only with spaces.</source>
         <source>Qt style sheets (*.qss)</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Global opaqueness (inverse of transparency).</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>AppearanceDialogBase</name>
@@ -685,6 +689,10 @@ Word-breaking but only with spaces.</source>
         <source>Font 6</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Global opaqueness</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Arranger</name>
@@ -4396,7 +4404,7 @@ Configuration</source>
     </message>
     <message>
         <source>Help Browser:</source>
-        <translation type="unfinished">Navegador de ayuda:</translation>
+        <translation type="obsolete">Navegador de ayuda:</translation>
     </message>
     <message>
         <source>Application</source>
@@ -4605,6 +4613,14 @@ Shorter periods are desirable.</source>
         <source>Move single armed track with selection</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>On Launch</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Behavior</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>IIWUGuiBase</name>
@@ -8059,6 +8075,15 @@ Do you still want to import it?</source>
         <source>&amp;No</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Unable to launch help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>For some reason MusE has to launch the default
+browser on your machine.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>NoteInfo</name>
@@ -10014,6 +10039,10 @@ click on the Restart button.</source>
 </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Automation:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SongInfo</name>
@@ -10207,17 +10236,6 @@ click on the Restart button.</source>
     </message>
 </context>
 <context>
-    <name>TimeCanvas</name>
-    <message>
-        <source>Ctrl</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add Controller View</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
     <name>Toolbar1</name>
     <message>
         <source>Solo</source>
diff --git a/muse2/share/locale/muse_fr.ts b/muse2/share/locale/muse_fr.ts
index c978b3d1..af64bc63 100644
--- a/muse2/share/locale/muse_fr.ts
+++ b/muse2/share/locale/muse_fr.ts
@@ -466,6 +466,10 @@ Word-breaking but only with spaces.</source>
         <source>Qt style sheets (*.qss)</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Global opaqueness (inverse of transparency).</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>AppearanceDialogBase</name>
@@ -714,6 +718,10 @@ dans l&apos;Arrangeur</translation>
         <source>Font 6</source>
         <translation type="unfinished">Couleurs {6?}</translation>
     </message>
+    <message>
+        <source>Global opaqueness</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Arranger</name>
@@ -4376,7 +4384,7 @@ l&apos;interface</translation>
     </message>
     <message>
         <source>Help Browser:</source>
-        <translation>Navigateur pour l&apos;aide:</translation>
+        <translation type="obsolete">Navigateur pour l&apos;aide:</translation>
     </message>
     <message>
         <source>Application</source>
@@ -4585,6 +4593,14 @@ Shorter periods are desirable.</source>
         <source>Move single armed track with selection</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>On Launch</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Behavior</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>LMaster</name>
@@ -7910,6 +7926,15 @@ Do you still want to import it?</source>
         <source>&amp;No</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Unable to launch help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>For some reason MusE has to launch the default
+browser on your machine.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>NoteInfo</name>
@@ -9859,6 +9884,10 @@ click on the Restart button.</source>
 </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Automation:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SongInfo</name>
@@ -10053,17 +10082,6 @@ disponibles</translation>
     </message>
 </context>
 <context>
-    <name>TimeCanvas</name>
-    <message>
-        <source>Ctrl</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add Controller View</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
     <name>Toolbar1</name>
     <message>
         <source>Solo</source>
diff --git a/muse2/share/locale/muse_pl.ts b/muse2/share/locale/muse_pl.ts
index 0c2b329b..47038827 100644
--- a/muse2/share/locale/muse_pl.ts
+++ b/muse2/share/locale/muse_pl.ts
@@ -431,6 +431,10 @@ Word-breaking but only with spaces.</source>
         <source>Qt style sheets (*.qss)</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Global opaqueness (inverse of transparency).</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>AppearanceDialogBase</name>
@@ -658,6 +662,10 @@ Word-breaking but only with spaces.</source>
         <source>Font 6</source>
         <translation type="unfinished">Czcionka 6</translation>
     </message>
+    <message>
+        <source>Global opaqueness</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Arranger</name>
@@ -4187,7 +4195,7 @@ RTC (Rzeczywista Rozdzielczość Zegara)
     </message>
     <message>
         <source>Help Browser:</source>
-        <translation>Przeglądarka pomocy:</translation>
+        <translation type="obsolete">Przeglądarka pomocy:</translation>
     </message>
     <message>
         <source>Application</source>
@@ -4396,6 +4404,14 @@ Shorter periods are desirable.</source>
         <source>Move single armed track with selection</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>On Launch</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Behavior</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>LMaster</name>
@@ -7577,6 +7593,15 @@ Do you still want to import it?</source>
         <source>&amp;No</source>
         <translation type="unfinished">&amp;Nie</translation>
     </message>
+    <message>
+        <source>Unable to launch help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>For some reason MusE has to launch the default
+browser on your machine.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>NoteInfo</name>
@@ -9121,6 +9146,10 @@ click on the Restart button.</source>
 </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Automation:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SongInfo</name>
@@ -9291,17 +9320,6 @@ click on the Restart button.</source>
     </message>
 </context>
 <context>
-    <name>TimeCanvas</name>
-    <message>
-        <source>Ctrl</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add Controller View</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
     <name>Toolbar1</name>
     <message>
         <source>Solo</source>
diff --git a/muse2/share/locale/muse_ru.ts b/muse2/share/locale/muse_ru.ts
index 784a9006..9264bb8e 100644
--- a/muse2/share/locale/muse_ru.ts
+++ b/muse2/share/locale/muse_ru.ts
@@ -1,4 +1,6 @@
-<!DOCTYPE TS><TS>
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.0">
 <context>
     <name>@default</name>
     <message>
@@ -439,6 +441,10 @@ Word-breaking but only with spaces.</source>
         <source>Qt style sheets (*.qss)</source>
         <translation>Таблицы стилей Qt (*.qss)</translation>
     </message>
+    <message>
+        <source>Global opaqueness (inverse of transparency).</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>AppearanceDialogBase</name>
@@ -666,6 +672,10 @@ Word-breaking but only with spaces.</source>
         <source>Font 6</source>
         <translation>Шрифт 6</translation>
     </message>
+    <message>
+        <source>Global opaqueness</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Arranger</name>
@@ -1895,15 +1905,15 @@ Right-click to show GUI.</source>
         <source>Release Rate</source>
         <translation type="unfinished"></translation>
     </message>
-    <message encoding="UTF-8">
+    <message utf8="true">
         <source>2° Decay Rate</source>
         <translation type="unfinished"></translation>
     </message>
-    <message encoding="UTF-8">
+    <message utf8="true">
         <source>1° Decay Level</source>
         <translation type="unfinished"></translation>
     </message>
-    <message encoding="UTF-8">
+    <message utf8="true">
         <source>1° Decay Rate</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2568,7 +2578,7 @@ Wave form 8 = &lt;i&gt;if &lt;b&gt;t&lt;/b&gt;&amp;#060 pi then sin(2*&lt;b&gt;t
     </message>
     <message>
         <source>Vol</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Громк</translation>
     </message>
     <message>
         <source>Channel Ctrl</source>
@@ -2576,7 +2586,7 @@ Wave form 8 = &lt;i&gt;if &lt;b&gt;t&lt;/b&gt;&amp;#060 pi then sin(2*&lt;b&gt;t
     </message>
     <message>
         <source>Release</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Послезвучие</translation>
     </message>
     <message>
         <source>Attack</source>
@@ -4374,7 +4384,7 @@ Configuration</source>
     </message>
     <message>
         <source>Help Browser:</source>
-        <translation>В чём читать справку:</translation>
+        <translation type="obsolete">В чём читать справку:</translation>
     </message>
     <message>
         <source>GUI Refresh Rate</source>
@@ -4598,6 +4608,14 @@ Shorter periods are desirable.</source>
         <source>Move single armed track with selection</source>
         <translation>Назначать &quot;для записи&quot; выбранный трек</translation>
     </message>
+    <message>
+        <source>On Launch</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Behavior</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>LMaster</name>
@@ -6565,14 +6583,14 @@ You can specify more than one channel for
 recording:
    1 2 3      record from channel 1 2 and 3
    1-3         same
-   1-3 5<byte value="x9"/>     record from channel 1 2 3 and 5</source>
+   1-3 5	     record from channel 1 2 3 and 5</source>
         <translation type="obsolete">События со всех настроенных каналов
 записываются в этот трек.
 Вы можете указать несколько каналов для
 записи:
    1 2 3      записывать с каналов 1, 2 и 3
    1-3         то же самое
-   1-3 5<byte value="x9"/>   записывать с каналов 1, 2, 3 и 5</translation>
+   1-3 5	   записывать с каналов 1, 2, 3 и 5</translation>
     </message>
     <message>
         <source>record:</source>
@@ -7809,6 +7827,15 @@ Do you still want to import it?</source>
         <source>&amp;No</source>
         <translation>&amp;Нет</translation>
     </message>
+    <message>
+        <source>Unable to launch help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>For some reason MusE has to launch the default
+browser on your machine.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>NewPreset</name>
@@ -8773,7 +8800,7 @@ exists. Overwrite?</source>
         <translation>Степень</translation>
     </message>
     <message>
-        <source>Don&#xb4;t Quantize</source>
+        <source>Don´t Quantize</source>
         <translation>Не Квантовать</translation>
     </message>
     <message>
@@ -9517,6 +9544,10 @@ click on the Restart button.</source>
 </source>
         <translation>MusE не может запустить скрипт</translation>
     </message>
+    <message>
+        <source>Automation:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SongInfo</name>
@@ -9690,12 +9721,12 @@ click on the Restart button.</source>
     <name>TimeCanvas</name>
     <message>
         <source>Ctrl</source>
-        <translation>Ctrl
+        <translation type="obsolete">Ctrl
 </translation>
     </message>
     <message>
         <source>Add Controller View</source>
-        <translation>Добавить Панель Контроллеров</translation>
+        <translation type="obsolete">Добавить Панель Контроллеров</translation>
     </message>
 </context>
 <context>
@@ -10055,7 +10086,7 @@ click on the Restart button.</source>
         <source>On</source>
         <translation>Вкл</translation>
     </message>
-    <message encoding="UTF-8">
+    <message utf8="true">
         <source>VAM 1.0beta2
 Virtual Analog for MusE
 Released under GPL.
@@ -10069,7 +10100,7 @@ Copyright(C) 2002
 Jotsif Lindman Hörnlund
 ( jotsif@linux.nu )</translation>
     </message>
-    <message encoding="UTF-8">
+    <message utf8="true">
         <source>VAM 1.0beta3
 Virtual Analog for MusE
 Released under GPL.
diff --git a/muse2/share/locale/muse_sv_SE.ts b/muse2/share/locale/muse_sv_SE.ts
index 7c44b7f6..4ae7dfc0 100644
--- a/muse2/share/locale/muse_sv_SE.ts
+++ b/muse2/share/locale/muse_sv_SE.ts
@@ -456,6 +456,10 @@ Word-breaking but only with spaces.</source>
         <source>Qt style sheets (*.qss)</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Global opaqueness (inverse of transparency).</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>AppearanceDialogBase</name>
@@ -703,6 +707,10 @@ Word-breaking but only with spaces.</source>
         <source>Font 6</source>
         <translation type="unfinished">Typsnitt 6</translation>
     </message>
+    <message>
+        <source>Global opaqueness</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Arranger</name>
@@ -4412,7 +4420,7 @@ Configuration</source>
     </message>
     <message>
         <source>Help Browser:</source>
-        <translation>Hjälpläsare:</translation>
+        <translation type="obsolete">Hjälpläsare:</translation>
     </message>
     <message>
         <source>GUI Refresh Rate</source>
@@ -4629,6 +4637,14 @@ Shorter periods are desirable.</source>
         <source>Move single armed track with selection</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>On Launch</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Behavior</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>LMaster</name>
@@ -7884,6 +7900,15 @@ Do you still want to import it?</source>
         <source>&amp;No</source>
         <translation type="unfinished">&amp;Nej</translation>
     </message>
+    <message>
+        <source>Unable to launch help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>For some reason MusE has to launch the default
+browser on your machine.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>NewPreset</name>
@@ -9773,6 +9798,10 @@ click on the Restart button.</source>
 </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Automation:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SongInfo</name>
@@ -9981,17 +10010,6 @@ ljudfilerna skall hamna.</translation>
     </message>
 </context>
 <context>
-    <name>TimeCanvas</name>
-    <message>
-        <source>Ctrl</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add Controller View</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
     <name>Toolbar1</name>
     <message>
         <source>Solo</source>