Merge pull request #1 from corrados/master

Merge New Features on my fork
jamulussoftware · May 24, 2020 · 87086f1 · 87086f1
2 parents ccf005b + 70dafe7
commit 87086f1
Show file tree

Hide file tree

Showing 11 changed files with 803 additions and 685 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,8 +1,14 @@
 
 
 
+3.5.5git
 
-3.5.4git
+
+
+
+
+
+3.5.4 (2020-05-24)
 
 - introduce genre-based server lists (#139)
 
@@ -18,9 +24,9 @@
 
 - save client settings on Linux cmdline termination signal, coded by pljones (#70)
 
+- added translation: Italian by dzpex (#249)
 
-
-
+- bug fix: fixed misaligned tracks in recordings, coded by snayler, improved by pljones (#234)
 
 
 3.5.3 (2020-05-15)

diff --git a/Jamulus.pro b/Jamulus.pro
@@ -1,4 +1,4 @@
-VERSION = 3.5.4git
+VERSION = 3.5.5git
 
 # use target name which does not use a captital letter at the beginning
 contains(CONFIG, "noupcasename") {

diff --git a/src/res/translation/translation_de_DE.qm b/src/res/translation/translation_de_DE.qm
diff --git a/src/res/translation/translation_de_DE.ts b/src/res/translation/translation_de_DE.ts
diff --git a/src/res/translation/translation_es_ES.ts b/src/res/translation/translation_es_ES.ts
diff --git a/src/res/translation/translation_fr_FR.ts b/src/res/translation/translation_fr_FR.ts
diff --git a/src/res/translation/translation_it_IT.qm b/src/res/translation/translation_it_IT.qm
diff --git a/src/res/translation/translation_it_IT.ts b/src/res/translation/translation_it_IT.ts
diff --git a/src/res/translation/translation_nl_NL.ts b/src/res/translation/translation_nl_NL.ts
diff --git a/src/res/translation/translation_pt_PT.ts b/src/res/translation/translation_pt_PT.ts
diff --git a/src/util.cpp b/src/util.cpp
@@ -414,6 +414,8 @@ CAboutDlg::CAboutDlg ( QWidget* parent ) : QDialog ( parent )
         "<p>Miguel de Matos (<a href=""https://github.com/Snayler"">Snayler</a>)</p>"
         "<p><b>" + tr ( "Dutch" ) + "</b></p>"
         "<p>Jeroen Geertzen (<a href=""https://github.com/jerogee"">jerogee</a>)</p>"
+        "<p><b>" + tr ( "Italian" ) + "</b></p>"
+        "<p>Giuseppe Sapienza (<a href=""https://github.com/dzpex"">dzpex</a>)</p>"
         "<p><b>" + tr ( "German" ) + "</b></p>"
         "<p>Volker Fischer (<a href=""https://github.com/corrados"">corrados</a>)</p>" );