Merge pull request hydrogen-music#1307 from cme/development

Merge from `master` to `development`
charbeljc · Jun 26, 2021 · 786c69a · 786c69a
2 parents e721943 + 042f960
commit 786c69a
Show file tree

Hide file tree

Showing 351 changed files with 5,293 additions and 5,020 deletions.
diff --git a/README.md b/README.md
@@ -79,6 +79,6 @@ More details in the [INSTALL.md](INSTALL.md) file.
 </details>
 
 ### License
-GPLv2 (more details in the [COPYING](./COPYING) file.)
+GPLv2+ (more details in the [COPYING](./COPYING) file.)
 
 Happy drumming!  :smiley:
diff --git a/build.sh b/build.sh
@@ -1,5 +1,25 @@
 #! /bin/bash
 
+# Hydrogen
+# Copyright(c) 2002-2008 by Alex >Comix< Cominu [comix@users.sourceforge.net]
+# Copyright(c) 2008-2021 The hydrogen development team [hydrogen-devel@lists.sourceforge.net]
+#
+# http://www.hydrogen-music.org
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
 QTDIR=${QTDIR:-/usr/lib/qt}
 VERBOSE=${VERBOSE:-0}
 CMAKE_OPTIONS="

diff --git a/data/i18n/hydrogen_ca.ts b/data/i18n/hydrogen_ca.ts
@@ -783,6 +783,10 @@ N&apos;estàs segur?</translation>
 Use &apos;Save as&apos; to enable autosave.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Input Midi Note</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>InstrumentEditor</name>
@@ -1453,18 +1457,22 @@ Do you want to discard the changes?
     </message>
     <message>
         <source>Replace With &amp;New Song</source>
+        <extracomment>When Hydrogen is under session management the path the song is stored to can not be changed by the user. This option allows to replace the current song with an empty one.</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Imp&amp;ort Into Session</source>
+        <extracomment>When Hydrogen is under session management the path the song is stored to can not be changed by the user. This option allows to replace the current song with one chosen by the user via a file browser widget.</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Import &amp;Recent Into Session</source>
+        <extracomment>When Hydrogen is under session management the path the song is stored to can not be changed by the user. This option allows to replace the current song with one chosen recently used by the user.</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Export From Session &amp;As...</source>
+        <extracomment>When Hydrogen is under session management the path the song is stored to can not be changed by the user. This option allows the user store the current song in a .h2song anywhere on her system. The filepath of the current song won&apos;t be altered.</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -2392,10 +2400,12 @@ Maximum = 16/4</source>
     </message>
     <message>
         <source>JACK transport on/off</source>
+        <extracomment>Using the JACK the audio/midi input and output ports of any number of application can be connected.</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>JACK Timebase master on/off</source>
+        <extracomment>Using the JACK Timebase Master functionality one of the connected programs can broadcast both speed and measure information to all other connected applications in order to have a more fine-grained transport control.</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -2644,18 +2654,6 @@ The path to the script and the scriptname must be without whitespaces.</source>
 </context>
 <context>
     <name>PreferencesDialog</name>
-    <message>
-        <source>Slow</source>
-        <translation>Lent</translation>
-    </message>
-    <message>
-        <source>Normal</source>
-        <translation>Normal</translation>
-    </message>
-    <message>
-        <source>Fast</source>
-        <translation>Ràpid</translation>
-    </message>
     <message>
         <source>Preferences</source>
         <translation>Preferències</translation>
@@ -2786,6 +2784,7 @@ The path to the script and the scriptname must be without whitespaces.</source>
     </message>
     <message>
         <source>Meters falloff speed</source>
+        <extracomment>In case of a rapid sound lasting for just a milli second the meters in the Mixer would raise to peak value and fall of immediately without the user being able to see them. The falloff speed introduces a delay. The smaller the value, the longer the meter requires to reach 0dB again.</extracomment>
         <translation>Celocitat de caiguda de pic</translation>
     </message>
     <message>
@@ -3090,6 +3089,7 @@ The path to the script and the scriptname must be without whitespaces.</source>
     </message>
     <message>
         <source>Use &amp;LASH</source>
+        <extracomment>LASH (acronym for LASH Linux Audio Handler) is a protocol allowing for session management in Linux (recalling songs, preferences, and JACK port connections).</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -3647,29 +3647,6 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>SimpleHTMLBrowser</name>
-    <message>
-        <source>Manual</source>
-        <translation>Manual</translation>
-    </message>
-    <message>
-        <source>Welcome to Hydrogen</source>
-        <translation>Benvingut(da) a Hydrogen</translation>
-    </message>
-    <message>
-        <source>Don&apos;t show this message anymore</source>
-        <translation>No tornar a mostrar aquest missatge</translation>
-    </message>
-    <message>
-        <source>Ok</source>
-        <translation>Acceptar</translation>
-    </message>
-    <message>
-        <source>Documentation index</source>
-        <translation>Index de la documentació</translation>
-    </message>
-</context>
 <context>
     <name>SongEditor</name>
     <message>

diff --git a/data/i18n/hydrogen_cs.ts b/data/i18n/hydrogen_cs.ts
@@ -782,6 +782,10 @@ Určitě to chcete?</translation>
 Use &apos;Save as&apos; to enable autosave.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Input Midi Note</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>InstrumentEditor</name>
@@ -1448,18 +1452,22 @@ Do you want to discard the changes?
     </message>
     <message>
         <source>Replace With &amp;New Song</source>
+        <extracomment>When Hydrogen is under session management the path the song is stored to can not be changed by the user. This option allows to replace the current song with an empty one.</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Imp&amp;ort Into Session</source>
+        <extracomment>When Hydrogen is under session management the path the song is stored to can not be changed by the user. This option allows to replace the current song with one chosen by the user via a file browser widget.</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Import &amp;Recent Into Session</source>
+        <extracomment>When Hydrogen is under session management the path the song is stored to can not be changed by the user. This option allows to replace the current song with one chosen recently used by the user.</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Export From Session &amp;As...</source>
+        <extracomment>When Hydrogen is under session management the path the song is stored to can not be changed by the user. This option allows the user store the current song in a .h2song anywhere on her system. The filepath of the current song won&apos;t be altered.</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -2387,10 +2395,12 @@ Maximum = 16/4</source>
     </message>
     <message>
         <source>JACK transport on/off</source>
+        <extracomment>Using the JACK the audio/midi input and output ports of any number of application can be connected.</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>JACK Timebase master on/off</source>
+        <extracomment>Using the JACK Timebase Master functionality one of the connected programs can broadcast both speed and measure information to all other connected applications in order to have a more fine-grained transport control.</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -2643,18 +2653,6 @@ The path to the script and the scriptname must be without whitespaces.</source>
         <source>Preferences</source>
         <translation>Předvolby</translation>
     </message>
-    <message>
-        <source>Slow</source>
-        <translation>Pomalu</translation>
-    </message>
-    <message>
-        <source>Normal</source>
-        <translation>Normálně</translation>
-    </message>
-    <message>
-        <source>Fast</source>
-        <translation>Rychle</translation>
-    </message>
     <message>
         <source>Please restart hydrogen to enable/disable LASH support</source>
         <translation>Prosím restartujte Hydrogen pro zapnutí / vypnutí LASH podpory</translation>
@@ -2937,6 +2935,7 @@ The path to the script and the scriptname must be without whitespaces.</source>
     </message>
     <message>
         <source>Meters falloff speed</source>
+        <extracomment>In case of a rapid sound lasting for just a milli second the meters in the Mixer would raise to peak value and fall of immediately without the user being able to see them. The falloff speed introduces a delay. The smaller the value, the longer the meter requires to reach 0dB again.</extracomment>
         <translation>Rychlost poklesu indikátorů</translation>
     </message>
     <message>
@@ -3085,6 +3084,7 @@ The path to the script and the scriptname must be without whitespaces.</source>
     </message>
     <message>
         <source>Use &amp;LASH</source>
+        <extracomment>LASH (acronym for LASH Linux Audio Handler) is a protocol allowing for session management in Linux (recalling songs, preferences, and JACK port connections).</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -3642,29 +3642,6 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>SimpleHTMLBrowser</name>
-    <message>
-        <source>Manual</source>
-        <translation>Příručka</translation>
-    </message>
-    <message>
-        <source>Welcome to Hydrogen</source>
-        <translation>Vítejte v Hydrogenu</translation>
-    </message>
-    <message>
-        <source>Don&apos;t show this message anymore</source>
-        <translation>Tuto zprávu příště již nezobrazovat</translation>
-    </message>
-    <message>
-        <source>Ok</source>
-        <translation>OK</translation>
-    </message>
-    <message>
-        <source>Documentation index</source>
-        <translation>Obsah dokumentace</translation>
-    </message>
-</context>
 <context>
     <name>SongEditor</name>
     <message>