From ebc1f409144a112664ced843833507eb49aebef2 Mon Sep 17 00:00:00 2001
From: Automated System <slavek.banko@axis.cz>
Date: Thu, 4 Jun 2020 00:51:06 +0200
Subject: Merge translation files from master branch.

---
 tde-i18n-fr/messages/tdemultimedia/kmix.po | 60 +++++++++++++++++-------------
 1 file changed, 34 insertions(+), 26 deletions(-)

(limited to 'tde-i18n-fr')

diff --git a/tde-i18n-fr/messages/tdemultimedia/kmix.po b/tde-i18n-fr/messages/tdemultimedia/kmix.po
index b6dc1090643..50b8c129234 100644
--- a/tde-i18n-fr/messages/tdemultimedia/kmix.po
+++ b/tde-i18n-fr/messages/tdemultimedia/kmix.po
@@ -12,7 +12,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmix\n"
-"POT-Creation-Date: 2020-05-28 02:59+0200\n"
+"POT-Creation-Date: 2020-06-04 00:00+0200\n"
 "PO-Revision-Date: 2006-07-16 21:40+0200\n"
 "Last-Translator: Matthieu Robin <kde@macolu.org>\n"
 "Language-Team: French <kde-francophone@kde.org>\n"
@@ -44,7 +44,7 @@ msgstr "Choisissez le canal principal (master)"
 msgid "Current Mixer"
 msgstr "Mixeur actuel"
 
-#: dialogselectmaster.cpp:91 kmix.cpp:167
+#: dialogselectmaster.cpp:91 kmix.cpp:166
 msgid "Current mixer"
 msgstr "Mixeur actuel"
 
@@ -52,44 +52,40 @@ msgstr "Mixeur actuel"
 msgid "Select the channel representing the master volume:"
 msgstr "Choisissez le canal représentant le volume général : "
 
-#: kmix.cpp:115
+#: kmix.cpp:114
 msgid "Configure &Global Shortcuts..."
 msgstr "Configurer les raccourcis clavier &globaux..."
 
-#: kmix.cpp:119
+#: kmix.cpp:118
 msgid "Hardware &Information"
 msgstr "Informations sur le &matériel"
 
-#: kmix.cpp:120 kmixdockwidget.cpp:418
+#: kmix.cpp:119 kmixdockwidget.cpp:441
 msgid "Hide Mixer Window"
 msgstr "Masquer la fenêtre de mixage"
 
-#: kmix.cpp:123
+#: kmix.cpp:122
 msgid "Increase Volume of Master Channel"
 msgstr "Augmente le volume du canal principal (master)"
 
-#: kmix.cpp:125
+#: kmix.cpp:124
 msgid "Decrease Volume of Master Channel"
 msgstr "Diminue le volume du canal principal (master)"
 
-#: kmix.cpp:127
+#: kmix.cpp:126
 msgid "Toggle Mute of Master Channel"
 msgstr "Rend muet le canal principal (master)"
 
-#: kmix.cpp:162
+#: kmix.cpp:161
 msgid "Current mixer:"
 msgstr " Mixeur actuel : "
 
-#: kmix.cpp:216
-msgid "Select Channel"
-msgstr "Choisissez un canal"
-
-#: kmix.cpp:520
+#: kmix.cpp:500
 msgid "The change of orientation will be adopted on the next start of KMix."
 msgstr ""
 "Les changements d'orientation seront effectifs au prochain démarrage de KMix."
 
-#: kmix.cpp:601
+#: kmix.cpp:581
 msgid "Mixer Hardware Information"
 msgstr "Informations sur le mixeur matériel"
 
@@ -113,7 +109,7 @@ msgstr ""
 msgid "Select Mixer"
 msgstr "Sélectionnez un mixeur"
 
-#: kmixapplet.cpp:216
+#: kmixapplet.cpp:217
 msgid ""
 "For detailed credits, please refer to the About information of the KMix "
 "program"
@@ -121,15 +117,15 @@ msgstr ""
 "Pour les remerciements détaillés, veuillez vous référer à la fenêtre À "
 "propos de KMix du programme"
 
-#: kmixapplet.cpp:323
+#: kmixapplet.cpp:325
 msgid "Mixers"
 msgstr "Mixeurs"
 
-#: kmixapplet.cpp:324
+#: kmixapplet.cpp:326
 msgid "Available mixers:"
 msgstr "Mixeurs disponibles : "
 
-#: kmixapplet.cpp:330
+#: kmixapplet.cpp:332
 msgid "Invalid mixer entered."
 msgstr "Mixeur saisi non valable."
 
@@ -149,27 +145,27 @@ msgstr "Restauration des réglages par défaut"
 msgid "KMixCtrl"
 msgstr "KMixCtrl"
 
-#: kmixdockwidget.cpp:84
+#: kmixdockwidget.cpp:86
 msgid "M&ute"
 msgstr "&Muet"
 
-#: kmixdockwidget.cpp:92
+#: kmixdockwidget.cpp:97
 msgid "Select Master Channel..."
 msgstr "Choisissez le canal principal (master)..."
 
-#: kmixdockwidget.cpp:201
+#: kmixdockwidget.cpp:225
 msgid "Mixer cannot be found"
 msgstr "Mixeur introuvable"
 
-#: kmixdockwidget.cpp:212
+#: kmixdockwidget.cpp:236
 msgid "Volume at %1%"
 msgstr "Volume à %1 %"
 
-#: kmixdockwidget.cpp:214
+#: kmixdockwidget.cpp:238
 msgid " (Muted)"
 msgstr " (Muet)"
 
-#: kmixdockwidget.cpp:422
+#: kmixdockwidget.cpp:445
 msgid "Show Mixer Window"
 msgstr "Afficher la fenêtre de mixage"
 
@@ -663,7 +659,16 @@ msgstr "Pilotes sonores utilisés :"
 msgid "&Channels"
 msgstr "&Canaux"
 
-#: viewbase.cpp:134
+#: viewbase.cpp:63
+#, fuzzy
+msgid "&Select Mixer"
+msgstr "Sélectionnez un mixeur"
+
+#: viewbase.cpp:139
+msgid "General"
+msgstr ""
+
+#: viewbase.cpp:144
 msgid "Device Settings"
 msgstr "Réglages du périphérique"
 
@@ -716,6 +721,9 @@ msgstr "F&ond : "
 msgid "Silen&t:"
 msgstr "&Silencieux : "
 
+#~ msgid "Select Channel"
+#~ msgstr "Choisissez un canal"
+
 #, fuzzy
 #~ msgid "Orientation"
 #~ msgstr "Orientation de la glissière : "
-- 
cgit v1.2.1