Merge translation files from master branch.

1 files changed, 34 insertions, 27 deletions

diff --git a/tde-i18n-cy/messages/tdemultimedia/kmix.po b/tde-i18n-cy/messages/tdemultimedia/kmix.po
index 8dfab760a80..a4a252af53a 100644
--- a/tde-i18n-cy/messages/tdemultimedia/kmix.po
+++ b/tde-i18n-cy/messages/tdemultimedia/kmix.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdemultimedia/kmix.po\n"
-"POT-Creation-Date: 2020-05-28 02:59+0200\n"
+"POT-Creation-Date: 2020-06-04 00:00+0200\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
@@ -31,7 +31,7 @@ msgstr "&Sianeli"
 msgid "Current Mixer"
 msgstr ""
 
-#: dialogselectmaster.cpp:91 kmix.cpp:167
+#: dialogselectmaster.cpp:91 kmix.cpp:166
 msgid "Current mixer"
 msgstr ""
 
@@ -39,48 +39,43 @@ msgstr ""
 msgid "Select the channel representing the master volume:"
 msgstr ""
 
-#: kmix.cpp:115
+#: kmix.cpp:114
 #, fuzzy
 msgid "Configure &Global Shortcuts..."
 msgstr "Ff&urfweddu Byrlwybrau"
 
-#: kmix.cpp:119
+#: kmix.cpp:118
 msgid "Hardware &Information"
 msgstr ""
 
-#: kmix.cpp:120 kmixdockwidget.cpp:418
+#: kmix.cpp:119 kmixdockwidget.cpp:441
 msgid "Hide Mixer Window"
 msgstr ""
 
-#: kmix.cpp:123
+#: kmix.cpp:122
 #, fuzzy
 msgid "Increase Volume of Master Channel"
 msgstr "&Sianeli"
 
-#: kmix.cpp:125
+#: kmix.cpp:124
 #, fuzzy
 msgid "Decrease Volume of Master Channel"
 msgstr "&Sianeli"
 
-#: kmix.cpp:127
+#: kmix.cpp:126
 #, fuzzy
 msgid "Toggle Mute of Master Channel"
 msgstr "&Sianeli"
 
-#: kmix.cpp:162
+#: kmix.cpp:161
 msgid "Current mixer:"
 msgstr ""
 
-#: kmix.cpp:216
-#, fuzzy
-msgid "Select Channel"
-msgstr "&Sianeli"
-
-#: kmix.cpp:520
+#: kmix.cpp:500
 msgid "The change of orientation will be adopted on the next start of KMix."
 msgstr ""
 
-#: kmix.cpp:601
+#: kmix.cpp:581
 msgid "Mixer Hardware Information"
 msgstr ""
 
@@ -102,21 +97,21 @@ msgstr ""
 msgid "Select Mixer"
 msgstr ""
 
-#: kmixapplet.cpp:216
+#: kmixapplet.cpp:217
 msgid ""
 "For detailed credits, please refer to the About information of the KMix "
 "program"
 msgstr ""
 
-#: kmixapplet.cpp:323
+#: kmixapplet.cpp:325
 msgid "Mixers"
 msgstr ""
 
-#: kmixapplet.cpp:324
+#: kmixapplet.cpp:326
 msgid "Available mixers:"
 msgstr ""
 
-#: kmixapplet.cpp:330
+#: kmixapplet.cpp:332
 msgid "Invalid mixer entered."
 msgstr ""
 
@@ -136,28 +131,28 @@ msgstr ""
 msgid "KMixCtrl"
 msgstr ""
 
-#: kmixdockwidget.cpp:84
+#: kmixdockwidget.cpp:86
 msgid "M&ute"
 msgstr ""
 
-#: kmixdockwidget.cpp:92
+#: kmixdockwidget.cpp:97
 #, fuzzy
 msgid "Select Master Channel..."
 msgstr "&Sianeli"
 
-#: kmixdockwidget.cpp:201
+#: kmixdockwidget.cpp:225
 msgid "Mixer cannot be found"
 msgstr ""
 
-#: kmixdockwidget.cpp:212
+#: kmixdockwidget.cpp:236
 msgid "Volume at %1%"
 msgstr ""
 
-#: kmixdockwidget.cpp:214
+#: kmixdockwidget.cpp:238
 msgid " (Muted)"
 msgstr ""
 
-#: kmixdockwidget.cpp:422
+#: kmixdockwidget.cpp:445
 msgid "Show Mixer Window"
 msgstr ""
 
@@ -614,7 +609,15 @@ msgstr ""
 msgid "&Channels"
 msgstr "&Sianeli"
 
-#: viewbase.cpp:134
+#: viewbase.cpp:63
+msgid "&Select Mixer"
+msgstr ""
+
+#: viewbase.cpp:139
+msgid "General"
+msgstr ""
+
+#: viewbase.cpp:144
 msgid "Device Settings"
 msgstr ""
 
@@ -667,5 +670,9 @@ msgstr "Cefndir:"
 msgid "Silen&t:"
 msgstr "Dista&w :"
 
+#, fuzzy
+#~ msgid "Select Channel"
+#~ msgstr "&Sianeli"
+
 #~ msgid "Hide"
 #~ msgstr "Cuddio"