8 files changed, 328 insertions, 48 deletions

diff --git a/plugingui/bleedcontrolframecontent.cc b/plugingui/bleedcontrolframecontent.cc
index f831210..b999062 100644
--- a/plugingui/bleedcontrolframecontent.cc
+++ b/plugingui/bleedcontrolframecontent.cc
@@ -30,6 +30,8 @@
 
 #include <limits>
 
+#include <translation.h>
+
 namespace GUI
 {
 
@@ -41,10 +43,10 @@ BleedcontrolframeContent::BleedcontrolframeContent(Widget* parent,
 	, settings(settings)
 	, settings_notifier(settings_notifier)
 {
-	label_text.setText("Master Bleed Volume:");
+	label_text.setText(_("Master Bleed Volume:"));
 	label_text.setAlignment(TextAlignment::center);
 
-	label_value.setText("0 %");
+	label_value.setText(_("0 %"));
 	label_value.setAlignment(TextAlignment::center);
 
 	CONNECT(this, settings_notifier.master_bleed,
diff --git a/plugingui/diskstreamingframecontent.cc b/plugingui/diskstreamingframecontent.cc
index 008aee3..97937df 100644
--- a/plugingui/diskstreamingframecontent.cc
+++ b/plugingui/diskstreamingframecontent.cc
@@ -30,6 +30,8 @@
 
 #include <limits>
 
+#include <translation.h>
+
 namespace GUI
 {
 
@@ -41,13 +43,13 @@ DiskstreamingframeContent::DiskstreamingframeContent(Widget* parent,
 	, settings(settings)
 	, settings_notifier(settings_notifier)
 {
-	label_text.setText("Cache limit (max memory usage):");
+	label_text.setText(_("Cache limit (max memory usage):"));
 	label_text.setAlignment(TextAlignment::center);
 
-	button.setText("Apply");
+	button.setText(_("Apply"));
 	button.setEnabled(false);
 
-	label_value.setText("0 MB");
+	label_value.setText(_("0 MB"));
 	label_value.setAlignment(TextAlignment::center);
 
 	CONNECT(this, settings_notifier.disk_cache_upper_limit,
@@ -102,7 +104,7 @@ void DiskstreamingframeContent::limitSettingsValueChanged(std::size_t value)
 		slider.setColour(Slider::Colour::Blue);
 	}
 	else {
-		label_value.setText("Unlimited");
+		label_value.setText(_("Unlimited"));
 		slider.setColour(Slider::Colour::Grey);
 	}
 
diff --git a/plugingui/drumkitframecontent.cc b/plugingui/drumkitframecontent.cc
index 0850ac1..7dd2234 100644
--- a/plugingui/drumkitframecontent.cc
+++ b/plugingui/drumkitframecontent.cc
@@ -31,6 +31,8 @@
 #include "label.h"
 #include "pluginconfig.h"
 
+#include <translation.h>
+
 namespace GUI
 {
 
@@ -44,7 +46,7 @@ BrowseFile::BrowseFile(Widget* parent)
 	layout.addItem(&lineedit);
 	layout.addItem(&browse_button);
 
-	browse_button.setText("Browse...");
+	browse_button.setText(_("Browse..."));
 }
 
 void BrowseFile::resize(std::size_t width, std::size_t height)
@@ -91,8 +93,8 @@ DrumkitframeContent::DrumkitframeContent(Widget* parent,
 {
 	layout.setHAlignment(HAlignment::left);
 
-	drumkit_caption.setText("Drumkit file:");
-	midimap_caption.setText("Midimap file:");
+	drumkit_caption.setText(_("Drumkit file:"));
+	midimap_caption.setText(_("Midimap file:"));
 
 	layout.addItem(&drumkit_caption);
 	layout.addItem(&drumkit_file);
diff --git a/plugingui/filebrowser.cc b/plugingui/filebrowser.cc
index 604440d..2dff5a4 100644
--- a/plugingui/filebrowser.cc
+++ b/plugingui/filebrowser.cc
@@ -43,6 +43,8 @@
 #include <direct.h>
 #endif
 
+#include <translation.h>
+
 namespace GUI
 {
 
@@ -86,7 +88,7 @@ FileBrowser::FileBrowser(Widget* parent)
 
 void FileBrowser::setPath(const std::string& path)
 {
-	INFO(filebrowser, "Setting path to '%s'\n", path.c_str());
+	INFO(filebrowser, _("Setting path to '%s'\n"), path.c_str());
 
 	if(!path.empty() && Directory::exists(path))
 	{
@@ -170,7 +172,7 @@ void FileBrowser::handleKeyEvent()
 	std::string value = lineedit.getText();
 	if((value.size() > 1) && (value[0] == '@'))
 	{
-		DEBUG(filebrowser, "Selecting ref-file '%s'\n", value.c_str());
+		DEBUG(filebrowser, _("Selecting ref-file '%s'\n"), value.c_str());
 		fileSelectNotifier(value);
 		return;
 	}
@@ -204,7 +206,7 @@ void FileBrowser::changeDir()
 
 	listbox.clear();
 
-	INFO(filebrowser, "Changing path to '%s'\n",
+	INFO(filebrowser, _("Changing path to '%s'\n"),
 	     (dir.path() + dir.seperator() + value).c_str());
 
 #if DG_PLATFORM == DG_PLATFORM_WINDOWS
@@ -218,7 +220,7 @@ void FileBrowser::changeDir()
 
 	if(value.empty() && !dir.isDir() && Directory::exists(dir.path()))
 	{
-		DEBUG(filebrowser, "Selecting file '%s'\n", dir.path().c_str());
+		DEBUG(filebrowser, _("Selecting file '%s'\n"), dir.path().c_str());
 		fileSelectNotifier(dir.path());
 		return;
 	}
@@ -226,7 +228,7 @@ void FileBrowser::changeDir()
 	if(!value.empty() && dir.fileExists(value))
 	{
 	  std::string file = dir.path() + dir.seperator() + value;
-	  DEBUG(filebrowser, "Selecting file '%s'\n", file.c_str());
+	  DEBUG(filebrowser, _("Selecting file '%s'\n"), file.c_str());
 	  fileSelectNotifier(file);
 	  return;
 	}
@@ -236,7 +238,7 @@ void FileBrowser::changeDir()
 #if DG_PLATFORM == DG_PLATFORM_WINDOWS
 	if(Directory::isRoot(dir.path()) && (value == ".."))
 	{
-		DEBUG(filebrowser, "Showing partitions...\n");
+		DEBUG(filebrowser, _("Showing partitions...\n"));
 		for(auto drive : dir.drives())
 		{
 			ListBoxBasic::Item item;
@@ -251,7 +253,7 @@ void FileBrowser::changeDir()
 	{
 		if(!value.empty() && !dir.cd(value))
 		{
-			DEBUG(filebrowser, "Error changing to '%s'\n",
+			DEBUG(filebrowser, _("Error changing to '%s'\n"),
 			      (dir.path() + dir.seperator() + value).c_str());
 			return;
 		}
@@ -264,7 +266,7 @@ void FileBrowser::changeDir()
 			entries = dir.entryList();
 		}
 
-		DEBUG(filebrowser, "Setting path of lineedit to %s\n", dir.path().c_str());
+		DEBUG(filebrowser, _("Setting path of lineedit to %s\n"), dir.path().c_str());
 		lineedit.setText(dir.path());
 
 		for(auto entry : entries)
diff --git a/plugingui/locale/da.po b/plugingui/locale/da.po
index 579b3c3..dc044a4 100644
--- a/plugingui/locale/da.po
+++ b/plugingui/locale/da.po
@@ -18,6 +18,76 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: bleedcontrolframecontent.cc:46
+msgid "Master Bleed Volume:"
+msgstr ""
+
+#: bleedcontrolframecontent.cc:49
+msgid "0 %"
+msgstr ""
+
+#: diskstreamingframecontent.cc:46
+msgid "Cache limit (max memory usage):"
+msgstr ""
+
+#: diskstreamingframecontent.cc:49
+msgid "Apply"
+msgstr ""
+
+#: diskstreamingframecontent.cc:52
+msgid "0 MB"
+msgstr ""
+
+#: diskstreamingframecontent.cc:107
+msgid "Unlimited"
+msgstr ""
+
+#: drumkitframecontent.cc:49
+msgid "Browse..."
+msgstr ""
+
+#: drumkitframecontent.cc:96
+msgid "Drumkit file:"
+msgstr ""
+
+#: drumkitframecontent.cc:97
+msgid "Midimap file:"
+msgstr ""
+
+#: filebrowser.cc:91
+#, c-format
+msgid "Setting path to '%s'\n"
+msgstr ""
+
+#: filebrowser.cc:175
+#, c-format
+msgid "Selecting ref-file '%s'\n"
+msgstr ""
+
+#: filebrowser.cc:209
+#, c-format
+msgid "Changing path to '%s'\n"
+msgstr ""
+
+#: filebrowser.cc:223 filebrowser.cc:231
+#, c-format
+msgid "Selecting file '%s'\n"
+msgstr ""
+
+#: filebrowser.cc:241
+msgid "Showing partitions...\n"
+msgstr ""
+
+#: filebrowser.cc:256
+#, c-format
+msgid "Error changing to '%s'\n"
+msgstr ""
+
+#: filebrowser.cc:269
+#, c-format
+msgid "Setting path of lineedit to %s\n"
+msgstr ""
+
 #: maintab.cc:121 mainwindow.cc:56
 msgid "Drumkit"
 msgstr ""
@@ -55,7 +125,6 @@ msgid "Visualizer"
 msgstr ""
 
 #: maintab.cc:136
-#, fuzzy
 msgid "Velocity Curve"
 msgstr ""
 
@@ -70,3 +139,23 @@ msgstr ""
 #: mainwindow.cc:58
 msgid "About"
 msgstr ""
+
+#: statusframecontent.cc:88
+msgid "No Kit Loaded"
+msgstr ""
+
+#: statusframecontent.cc:91 statusframecontent.cc:133
+msgid "Loading..."
+msgstr ""
+
+#: statusframecontent.cc:94 statusframecontent.cc:136
+msgid "Ready"
+msgstr ""
+
+#: statusframecontent.cc:97 statusframecontent.cc:139
+msgid "Error"
+msgstr ""
+
+#: statusframecontent.cc:130
+msgid "No Midimap Loaded"
+msgstr ""
diff --git a/plugingui/locale/drumgizmo.pot b/plugingui/locale/drumgizmo.pot
index 5fcce8b..c19d253 100644
--- a/plugingui/locale/drumgizmo.pot
+++ b/plugingui/locale/drumgizmo.pot
@@ -1,12 +1,12 @@
 # SOME DESCRIPTIVE TITLE.
-# Copyright (C) 2020 DrumGizmo Team
+# Copyright (C) YEAR DrumGizmo Team
 # This file is distributed under the same license as the drumgizmo package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: drumgizmo 0.9.19\n"
+"Project-Id-Version: drumgizmo 0.9.18.1\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
@@ -16,6 +16,76 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: bleedcontrolframecontent.cc:46
+msgid "Master Bleed Volume:"
+msgstr ""
+
+#: bleedcontrolframecontent.cc:49
+msgid "0 %"
+msgstr ""
+
+#: diskstreamingframecontent.cc:46
+msgid "Cache limit (max memory usage):"
+msgstr ""
+
+#: diskstreamingframecontent.cc:49
+msgid "Apply"
+msgstr ""
+
+#: diskstreamingframecontent.cc:52
+msgid "0 MB"
+msgstr ""
+
+#: diskstreamingframecontent.cc:107
+msgid "Unlimited"
+msgstr ""
+
+#: drumkitframecontent.cc:49
+msgid "Browse..."
+msgstr ""
+
+#: drumkitframecontent.cc:96
+msgid "Drumkit file:"
+msgstr ""
+
+#: drumkitframecontent.cc:97
+msgid "Midimap file:"
+msgstr ""
+
+#: filebrowser.cc:91
+#, c-format
+msgid "Setting path to '%s'\n"
+msgstr ""
+
+#: filebrowser.cc:175
+#, c-format
+msgid "Selecting ref-file '%s'\n"
+msgstr ""
+
+#: filebrowser.cc:209
+#, c-format
+msgid "Changing path to '%s'\n"
+msgstr ""
+
+#: filebrowser.cc:223 filebrowser.cc:231
+#, c-format
+msgid "Selecting file '%s'\n"
+msgstr ""
+
+#: filebrowser.cc:241
+msgid "Showing partitions...\n"
+msgstr ""
+
+#: filebrowser.cc:256
+#, c-format
+msgid "Error changing to '%s'\n"
+msgstr ""
+
+#: filebrowser.cc:269
+#, c-format
+msgid "Setting path of lineedit to %s\n"
+msgstr ""
+
 #: maintab.cc:121 mainwindow.cc:56
 msgid "Drumkit"
 msgstr ""
@@ -67,3 +137,23 @@ msgstr ""
 #: mainwindow.cc:58
 msgid "About"
 msgstr ""
+
+#: statusframecontent.cc:88
+msgid "No Kit Loaded"
+msgstr ""
+
+#: statusframecontent.cc:91 statusframecontent.cc:133
+msgid "Loading..."
+msgstr ""
+
+#: statusframecontent.cc:94 statusframecontent.cc:136
+msgid "Ready"
+msgstr ""
+
+#: statusframecontent.cc:97 statusframecontent.cc:139
+msgid "Error"
+msgstr ""
+
+#: statusframecontent.cc:130
+msgid "No Midimap Loaded"
+msgstr ""
diff --git a/plugingui/locale/fr.po b/plugingui/locale/fr.po
index 6582266..acf3787 100644
--- a/plugingui/locale/fr.po
+++ b/plugingui/locale/fr.po
@@ -1,62 +1,133 @@
-# Danish translations for drumgizmo package
-# Danske oversættelser for pakke drumgizmo.
-# Copyright (C) 2019 THE drumgizmo'S COPYRIGHT HOLDER
+# French translations for drumgizmo package
+# Traductions en français pour le paquet drumgizmo
+# Copyright (C) 2019-2020 THE drumgizmo'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the drumgizmo package.
 # Automatically generated, 2019.
+# Olivier Humbert <trebmuh@tuxfamily.org>, 2020.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: drumgizmo 0.9.17\n"
+"Project-Id-Version: drumgizmo 0.9.18.1\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-09-13 21:07+0200\n"
-"PO-Revision-Date: 2019-09-09 16:21+0200\n"
-"Last-Translator: Automatically generated\n"
+"PO-Revision-Date: 2020-08-12 22:29+0200\n"
+"Last-Translator: Olivier Humbert <trebmuh@tuxfamily.org>\n"
 "Language-Team: none\n"
-"Language: da\n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#: bleedcontrolframecontent.cc:46
+msgid "Master Bleed Volume:"
+msgstr "Volume principal de la repisse :"
+
+#: bleedcontrolframecontent.cc:49
+msgid "0 %"
+msgstr ""
+
+#: diskstreamingframecontent.cc:46
+msgid "Cache limit (max memory usage):"
+msgstr "Limite de cache (utilisation mémoire max) :"
+
+#: diskstreamingframecontent.cc:49
+msgid "Apply"
+msgstr "Appliquer"
+
+#: diskstreamingframecontent.cc:52
+msgid "0 MB"
+msgstr ""
+
+#: diskstreamingframecontent.cc:107
+msgid "Unlimited"
+msgstr "Illimité"
+
+#: drumkitframecontent.cc:49
+msgid "Browse..."
+msgstr "Naviguer..."
+
+#: drumkitframecontent.cc:96
+msgid "Drumkit file:"
+msgstr "Fichier de kit de batterie :"
+
+#: drumkitframecontent.cc:97
+msgid "Midimap file:"
+msgstr "Fichier midimap :"
+
+#: filebrowser.cc:91
+#, c-format
+msgid "Setting path to '%s'\n"
+msgstr "Paramétrer le chemin pour '%s'\n"
+
+#: filebrowser.cc:175
+#, c-format
+msgid "Selecting ref-file '%s'\n"
+msgstr "Sélection du fichier-référence '%s'\n"
+
+#: filebrowser.cc:209
+#, c-format
+msgid "Changing path to '%s'\n"
+msgstr "Modification du chemin pour '%s'\n"
+
+#: filebrowser.cc:223 filebrowser.cc:231
+#, c-format
+msgid "Selecting file '%s'\n"
+msgstr "Sélectionner le fichier '%s'\n"
+
+#: filebrowser.cc:241
+msgid "Showing partitions...\n"
+msgstr "Afficher les partitions...\n"
+
+#: filebrowser.cc:256
+#, c-format
+msgid "Error changing to '%s'\n"
+msgstr "Erreur lors de la modification pour '%s'\n"
+
+#: filebrowser.cc:269
+#, c-format
+msgid "Setting path of lineedit to %s\n"
+msgstr "Paramétrage du chemin de lineedit pour %s\n"
 
 #: maintab.cc:121 mainwindow.cc:56
 msgid "Drumkit"
-msgstr ""
+msgstr "Kit de batterie"
 
 #: maintab.cc:122
 msgid "Status"
-msgstr ""
+msgstr "Statut"
 
 #: maintab.cc:123
 msgid "Resampling"
-msgstr ""
+msgstr "Rééchantillonnage"
 
 #: maintab.cc:124
 msgid "Disk Streaming"
-msgstr ""
+msgstr "Streaming de disque"
 
 #: maintab.cc:125
 msgid "Bleed Control"
-msgstr ""
+msgstr "Contrôle de la repisse"
 
 #: maintab.cc:127
 msgid "Velocity Humanizer"
-msgstr ""
+msgstr "Humanisateur de vélocité"
 
 #: maintab.cc:129
 msgid "Timing Humanizer"
-msgstr ""
+msgstr "Humanisateur de justesse"
 
 #: maintab.cc:131
 msgid "Sample Selection"
-msgstr ""
+msgstr "Sélection de l'échantillon"
 
 #: maintab.cc:134
 msgid "Visualizer"
-msgstr ""
+msgstr "Visualiseur"
 
 #: maintab.cc:136
 msgid "Velocity Curve"
-msgstr ""
+msgstr "Courbe de vélocité"
 
 #: mainwindow.cc:51
 msgid "DrumGizmo v"
@@ -64,8 +135,28 @@ msgstr ""
 
 #: mainwindow.cc:55
 msgid "Main"
-msgstr ""
+msgstr "Principal"
 
 #: mainwindow.cc:58
 msgid "About"
-msgstr ""
+msgstr "À propos"
+
+#: statusframecontent.cc:88
+msgid "No Kit Loaded"
+msgstr "Pas de kit chargé"
+
+#: statusframecontent.cc:91 statusframecontent.cc:133
+msgid "Loading..."
+msgstr "Chargement..."
+
+#: statusframecontent.cc:94 statusframecontent.cc:136
+msgid "Ready"
+msgstr "Prêt"
+
+#: statusframecontent.cc:97 statusframecontent.cc:139
+msgid "Error"
+msgstr "Erreur"
+
+#: statusframecontent.cc:130
+msgid "No Midimap Loaded"
+msgstr "Pas de midimap chargée"
diff --git a/plugingui/statusframecontent.cc b/plugingui/statusframecontent.cc
index 80e98b9..9c2efc3 100644
--- a/plugingui/statusframecontent.cc
+++ b/plugingui/statusframecontent.cc
@@ -26,6 +26,8 @@
  */
 #include "statusframecontent.h"
 
+#include <translation.h>
+
 namespace GUI
 {
 
@@ -83,16 +85,16 @@ void StatusframeContent::updateDrumkitLoadStatus(LoadStatus load_status)
 	switch(load_status)
 	{
 	case LoadStatus::Idle:
-		drumkit_load_status = "No Kit Loaded";
+		drumkit_load_status = _("No Kit Loaded");
 		break;
 	case LoadStatus::Loading:
-		drumkit_load_status = "Loading...";
+		drumkit_load_status = _("Loading...");
 		break;
 	case LoadStatus::Done:
-		drumkit_load_status = "Ready";
+		drumkit_load_status = _("Ready");
 		break;
 	case LoadStatus::Error:
-		drumkit_load_status = "Error";
+		drumkit_load_status = _("Error");
 		break;
 	}
 
@@ -125,16 +127,16 @@ void StatusframeContent::updateMidimapLoadStatus(LoadStatus load_status)
 	switch(load_status)
 	{
 	case LoadStatus::Idle:
-		midimap_load_status = "No Midimap Loaded";
+		midimap_load_status = _("No Midimap Loaded");
 		break;
 	case LoadStatus::Loading:
-		midimap_load_status = "Loading...";
+		midimap_load_status = _("Loading...");
 		break;
 	case LoadStatus::Done:
-		midimap_load_status = "Ready";
+		midimap_load_status = _("Ready");
 		break;
 	case LoadStatus::Error:
-		midimap_load_status = "Error";
+		midimap_load_status = _("Error");
 		break;
 	}