various minor fixes

9 files changed, 13 insertions, 10 deletions

diff --git a/muse/ChangeLog b/muse/ChangeLog
index 8bc7f044..e7ee3103 100644
--- a/muse/ChangeLog
+++ b/muse/ChangeLog
@@ -1,7 +1,10 @@
+21.08.2010
+      * Renamed: Soft synth configuration changed to Synth configuration, as per patch from Geoff King (rj)
 10.08.2010
       * Fixed/Changed: Grid reacts to midi resolution change (rj)
 01.08.2010
-      * Added: Move track selection when part selection is moved (rj)
+      * Added: Move track selection when part selection is moved, is this a good approach? (rj)
+      * Added: Backspace unarms all armed tracks (rj)
 24.07.2010
       * Feature: Audio and midi routing popup menus now stay open, for making rapid connections. (T356)
       * Fixed: Delete some objects hanging around upon close like song, audio, midiSeq, and prefetch. (T356)
diff --git a/muse/muse/shortcuts.cpp b/muse/muse/shortcuts.cpp
index 8ebb5fd2..11f1dd67 100644
--- a/muse/muse/shortcuts.cpp
+++ b/muse/muse/shortcuts.cpp
@@ -35,7 +35,7 @@ void initShortCuts()
       defShrt(SHRT_GOTO_RIGHT,    Qt::Key_PageDown,  "Transport: Goto right marker" , GLOBAL_SHRT, "goto_right");
       defShrt(SHRT_TOGGLE_LOOP,   Qt::Key_Slash, "Transport: Toggle Loop section", GLOBAL_SHRT, "toggle_loop");
       defShrt(SHRT_START_REC,     Qt::Key_Asterisk, "Transport: Toggle Record",    GLOBAL_SHRT, "toggle_rec");
-      defShrt(SHRT_REC_CLEAR,     Qt::SHIFT + Qt::Key_Asterisk, "Transport: Clear all rec enabled tracks",    GLOBAL_SHRT, "rec_clear");
+      defShrt(SHRT_REC_CLEAR,     Qt::Key_Backspace, "Transport: Clear all rec enabled tracks",    GLOBAL_SHRT, "rec_clear");
       defShrt(SHRT_COPY,          Qt::CTRL + Qt::Key_C, "Edit: Copy", INVIS_SHRT, "copy");
       defShrt(SHRT_UNDO,          Qt::CTRL + Qt::Key_Z, "Edit: Undo", INVIS_SHRT, "undo");
       defShrt(SHRT_REDO,          Qt::CTRL + Qt::Key_Y, "Edit: Redo", INVIS_SHRT, "redo");
diff --git a/muse/muse/widgets/synthconfigbase.ui b/muse/muse/widgets/synthconfigbase.ui
index 87f1f0e8..761c8fb8 100644
--- a/muse/muse/widgets/synthconfigbase.ui
+++ b/muse/muse/widgets/synthconfigbase.ui
@@ -13,7 +13,7 @@
         </rect>
     </property>
     <property name="caption">
-        <string>MusE: Soft Synth Configuration</string>
+        <string>MusE: Synth Configuration</string>
     </property>
     <grid>
         <property name="name">
diff --git a/muse/share/locale/muse_de.ts b/muse/share/locale/muse_de.ts
index 856725a5..91bd889b 100644
--- a/muse/share/locale/muse_de.ts
+++ b/muse/share/locale/muse_de.ts
@@ -5234,7 +5234,7 @@ Random Rhythm Generator is not enabled yet!</source>
 <context>
     <name>SynthConfigBase</name>
     <message>
-        <source>MusE: Soft Synth Configuration</source>
+        <source>MusE: Synth Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/muse/share/locale/muse_es.ts b/muse/share/locale/muse_es.ts
index b3183ae7..c48735b4 100644
--- a/muse/share/locale/muse_es.ts
+++ b/muse/share/locale/muse_es.ts
@@ -6524,7 +6524,7 @@ Random Rhythm Generator is not enabled yet!</source>
 <context>
     <name>SynthConfigBase</name>
     <message>
-        <source>MusE: Soft Synth Configuration</source>
+        <source>MusE: Synth Configuration</source>
         <translation type="unfinished">MusE: Configuraci� del Sintetizador virtual</translation>
     </message>
     <message>
diff --git a/muse/share/locale/muse_fr.ts b/muse/share/locale/muse_fr.ts
index d1f30d77..0f654345 100644
--- a/muse/share/locale/muse_fr.ts
+++ b/muse/share/locale/muse_fr.ts
@@ -5387,7 +5387,7 @@ sélectionnées</translation>
 <context>
     <name>SynthConfigBase</name>
     <message>
-        <source>MusE: Soft Synth Configuration</source>
+        <source>MusE: Synth Configuration</source>
         <translation>MusE: Configuration Synth Virtuel</translation>
     </message>
     <message>
diff --git a/muse/share/locale/muse_pl.ts b/muse/share/locale/muse_pl.ts
index 77663e47..34934881 100644
--- a/muse/share/locale/muse_pl.ts
+++ b/muse/share/locale/muse_pl.ts
@@ -5252,7 +5252,7 @@ Losowy Generator Rytmu jeszcze nie jest udostępniony!</translation>
 <context>
     <name>SynthConfigBase</name>
     <message>
-        <source>MusE: Soft Synth Configuration</source>
+        <source>MusE: Synth Configuration</source>
         <translation>MuzA: Konfiguracja Syntezatora Softowego</translation>
     </message>
     <message>
diff --git a/muse/share/locale/muse_ru.ts b/muse/share/locale/muse_ru.ts
index c2e5b937..141827d4 100644
--- a/muse/share/locale/muse_ru.ts
+++ b/muse/share/locale/muse_ru.ts
@@ -6532,7 +6532,7 @@ Random Rhythm Generator is not enabled yet!</source>
 <context>
     <name>SynthConfigBase</name>
     <message>
-        <source>MusE: Soft Synth Configuration</source>
+        <source>MusE: Synth Configuration</source>
         <translation>MusE: Настройка программного синтезатора</translation>
     </message>
     <message>
diff --git a/muse/share/locale/muse_sv_SE.ts b/muse/share/locale/muse_sv_SE.ts
index b204971e..25b78cc5 100644
--- a/muse/share/locale/muse_sv_SE.ts
+++ b/muse/share/locale/muse_sv_SE.ts
@@ -7377,8 +7377,8 @@ Random Rhythm Generator is not enabled yet!</source>
 <context>
     <name>SynthConfigBase</name>
     <message>
-        <source>MusE: Soft Synth Configuration</source>
-        <translation>MusE: Mjukvarusyntinställningar</translation>
+        <source>MusE: Synth Configuration</source>
+        <translation>MusE: Syntinställningar</translation>
     </message>
     <message>
         <source>Soft Synthesizer</source>