Merge translation files from master branch.

1 files changed, 34 insertions, 26 deletions

diff --git a/tde-i18n-en_GB/messages/tdemultimedia/kmix.po b/tde-i18n-en_GB/messages/tdemultimedia/kmix.po
index 83b969a04d5..62a731c1724 100644
--- a/tde-i18n-en_GB/messages/tdemultimedia/kmix.po
+++ b/tde-i18n-en_GB/messages/tdemultimedia/kmix.po
@@ -7,7 +7,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-12-08 13:57+0000\n"
 "Last-Translator: Malcolm Hunter <malcolm.hunter@gmx.co.uk>\n"
 "Language-Team: British English <kde-en-gb@kde.me.uk>\n"
@@ -37,7 +37,7 @@ msgstr "Select Master Channel"
 msgid "Current Mixer"
 msgstr "Current Mixer"
 
-#: dialogselectmaster.cpp:91 kmix.cpp:167
+#: dialogselectmaster.cpp:91 kmix.cpp:166
 msgid "Current mixer"
 msgstr "Current mixer"
 
@@ -45,43 +45,39 @@ msgstr "Current mixer"
 msgid "Select the channel representing the master volume:"
 msgstr "Select the channel representing the master volume:"
 
-#: kmix.cpp:115
+#: kmix.cpp:114
 msgid "Configure &Global Shortcuts..."
 msgstr "Configure &Global Shortcuts..."
 
-#: kmix.cpp:119
+#: kmix.cpp:118
 msgid "Hardware &Information"
 msgstr "Hardware &Information"
 
-#: kmix.cpp:120 kmixdockwidget.cpp:418
+#: kmix.cpp:119 kmixdockwidget.cpp:441
 msgid "Hide Mixer Window"
 msgstr "Hide Mixer Window"
 
-#: kmix.cpp:123
+#: kmix.cpp:122
 msgid "Increase Volume of Master Channel"
 msgstr "Increase Volume of Master Channel"
 
-#: kmix.cpp:125
+#: kmix.cpp:124
 msgid "Decrease Volume of Master Channel"
 msgstr "Decrease Volume of Master Channel"
 
-#: kmix.cpp:127
+#: kmix.cpp:126
 msgid "Toggle Mute of Master Channel"
 msgstr "Toggle Mute of Master Channel"
 
-#: kmix.cpp:162
+#: kmix.cpp:161
 msgid "Current mixer:"
 msgstr "Current mixer:"
 
-#: kmix.cpp:216
-msgid "Select Channel"
-msgstr "Select Channel"
-
-#: kmix.cpp:520
+#: kmix.cpp:500
 msgid "The change of orientation will be adopted on the next start of KMix."
 msgstr "The change of orientation will be adopted on the next start of KMix."
 
-#: kmix.cpp:601
+#: kmix.cpp:581
 msgid "Mixer Hardware Information"
 msgstr "Mixer Hardware Information"
 
@@ -105,7 +101,7 @@ msgstr ""
 msgid "Select Mixer"
 msgstr "Select Mixer"
 
-#: kmixapplet.cpp:216
+#: kmixapplet.cpp:217
 msgid ""
 "For detailed credits, please refer to the About information of the KMix "
 "program"
@@ -113,15 +109,15 @@ msgstr ""
 "For detailed credits, please refer to the About information of the KMix "
 "program"
 
-#: kmixapplet.cpp:323
+#: kmixapplet.cpp:325
 msgid "Mixers"
 msgstr "Mixers"
 
-#: kmixapplet.cpp:324
+#: kmixapplet.cpp:326
 msgid "Available mixers:"
 msgstr "Available mixers:"
 
-#: kmixapplet.cpp:330
+#: kmixapplet.cpp:332
 msgid "Invalid mixer entered."
 msgstr "Invalid mixer entered."
 
@@ -141,27 +137,27 @@ msgstr "Restore default volumes"
 msgid "KMixCtrl"
 msgstr "KMixCtrl"
 
-#: kmixdockwidget.cpp:84
+#: kmixdockwidget.cpp:86
 msgid "M&ute"
 msgstr "M&ute"
 
-#: kmixdockwidget.cpp:92
+#: kmixdockwidget.cpp:97
 msgid "Select Master Channel..."
 msgstr "Select Master Channel..."
 
-#: kmixdockwidget.cpp:201
+#: kmixdockwidget.cpp:225
 msgid "Mixer cannot be found"
 msgstr "Mixer cannot be found"
 
-#: kmixdockwidget.cpp:212
+#: kmixdockwidget.cpp:236
 msgid "Volume at %1%"
 msgstr "Volume at %1%"
 
-#: kmixdockwidget.cpp:214
+#: kmixdockwidget.cpp:238
 msgid " (Muted)"
 msgstr " (Muted)"
 
-#: kmixdockwidget.cpp:422
+#: kmixdockwidget.cpp:445
 msgid "Show Mixer Window"
 msgstr "Show Mixer Window"
 
@@ -646,7 +642,16 @@ msgstr "Sound drivers used:"
 msgid "&Channels"
 msgstr "&Channels"
 
-#: viewbase.cpp:134
+#: viewbase.cpp:63
+#, fuzzy
+msgid "&Select Mixer"
+msgstr "Select Mixer"
+
+#: viewbase.cpp:139
+msgid "General"
+msgstr ""
+
+#: viewbase.cpp:144
 msgid "Device Settings"
 msgstr "Device Settings"
 
@@ -699,6 +704,9 @@ msgstr "Backgrou&nd:"
 msgid "Silen&t:"
 msgstr "Silen&t:"
 
+#~ msgid "Select Channel"
+#~ msgstr "Select Channel"
+
 #, fuzzy
 #~ msgid "Orientation"
 #~ msgstr "Slider Orientation: "