Merge translation files from master branch.

1 files changed, 38 insertions, 29 deletions

diff --git a/tde-i18n-br/messages/tdemultimedia/kmix.po b/tde-i18n-br/messages/tdemultimedia/kmix.po
index f3cfd528fc2..1be8bb40cb8 100644
--- a/tde-i18n-br/messages/tdemultimedia/kmix.po
+++ b/tde-i18n-br/messages/tdemultimedia/kmix.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmix-1.1\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-07-08 22:48+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandriva.com>\n"
 "Language-Team: Brezhoneg <Suav.Icb@wanadoo.fr>\n"
@@ -40,7 +40,7 @@ msgstr "Dibabit ar c'hanol mestr"
 msgid "Current Mixer"
 msgstr "Mesker red"
 
-#: dialogselectmaster.cpp:91 kmix.cpp:167
+#: dialogselectmaster.cpp:91 kmix.cpp:166
 msgid "Current mixer"
 msgstr "Mesker red"
 
@@ -48,44 +48,40 @@ msgstr "Mesker red"
 msgid "Select the channel representing the master volume:"
 msgstr "Dibabit kanol an nerzh kentañ :"
 
-#: kmix.cpp:115
+#: kmix.cpp:114
 msgid "Configure &Global Shortcuts..."
 msgstr "Kefluniañ ar berradennoù &hollek ..."
 
-#: kmix.cpp:119
+#: kmix.cpp:118
 msgid "Hardware &Information"
 msgstr "&Titouroù diwar-benn ar periantel :"
 
-#: kmix.cpp:120 kmixdockwidget.cpp:418
+#: kmix.cpp:119 kmixdockwidget.cpp:441
 msgid "Hide Mixer Window"
 msgstr "Diskouez prenestr ar mesker"
 
-#: kmix.cpp:123
+#: kmix.cpp:122
 msgid "Increase Volume of Master Channel"
 msgstr "Kreskiñ nerzh ar c'hanol mestr"
 
-#: kmix.cpp:125
+#: kmix.cpp:124
 msgid "Decrease Volume of Master Channel"
 msgstr "Izelaat nerzh ar c'hanol mestr"
 
-#: kmix.cpp:127
+#: kmix.cpp:126
 #, fuzzy
 msgid "Toggle Mute of Master Channel"
 msgstr "Dibabit ar c'hanol mestr"
 
-#: kmix.cpp:162
+#: kmix.cpp:161
 msgid "Current mixer:"
 msgstr "Mesker red :"
 
-#: kmix.cpp:216
-msgid "Select Channel"
-msgstr "Dibabit ur c'hanol"
-
-#: 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 ""
 
@@ -109,21 +105,21 @@ msgstr ""
 msgid "Select Mixer"
 msgstr "Dibab ar mesker"
 
-#: 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 "Meskata"
 
-#: kmixapplet.cpp:324
+#: kmixapplet.cpp:326
 msgid "Available mixers:"
 msgstr "Meskerezed da gaout :"
 
-#: kmixapplet.cpp:330
+#: kmixapplet.cpp:332
 msgid "Invalid mixer entered."
 msgstr "N'eo ket mat ar mesker roet."
 
@@ -143,27 +139,27 @@ msgstr ""
 msgid "KMixCtrl"
 msgstr "KMixCtrl"
 
-#: kmixdockwidget.cpp:84
+#: kmixdockwidget.cpp:86
 msgid "M&ute"
 msgstr "M&ut"
 
-#: kmixdockwidget.cpp:92
+#: kmixdockwidget.cpp:97
 msgid "Select Master Channel..."
 msgstr "Dibabit ar c'hanol mestr ..."
 
-#: kmixdockwidget.cpp:201
+#: kmixdockwidget.cpp:225
 msgid "Mixer cannot be found"
 msgstr "N'eo ket bet kavet ar mesker"
 
-#: kmixdockwidget.cpp:212
+#: kmixdockwidget.cpp:236
 msgid "Volume at %1%"
 msgstr "Nerzh ouzh %1%"
 
-#: kmixdockwidget.cpp:214
+#: kmixdockwidget.cpp:238
 msgid " (Muted)"
 msgstr " (Mut)"
 
-#: kmixdockwidget.cpp:422
+#: kmixdockwidget.cpp:445
 msgid "Show Mixer Window"
 msgstr "Diskouez prenestr ar mesker"
 
@@ -620,7 +616,17 @@ msgstr "Sturierioù implijet :"
 msgid "&Channels"
 msgstr "&Kanolioù"
 
-#: viewbase.cpp:134
+#: viewbase.cpp:63
+#, fuzzy
+msgid "&Select Mixer"
+msgstr "Dibab ar mesker"
+
+#: viewbase.cpp:139
+#, fuzzy
+msgid "General"
+msgstr "&Hollek"
+
+#: viewbase.cpp:144
 msgid "Device Settings"
 msgstr "Kefluniadur loc'hañ"
 
@@ -673,6 +679,9 @@ msgstr "Drekleu&r :"
 msgid "Silen&t:"
 msgstr "Di&drouz :"
 
+#~ msgid "Select Channel"
+#~ msgstr "Dibabit ur c'hanol"
+
 #~ msgid "Hide"
 #~ msgstr "Kuzhat"
 
@@ -688,9 +697,6 @@ msgstr "Di&drouz :"
 #~ msgid "&Show All"
 #~ msgstr "Diskouez &barrenn al lañser"
 
-#~ msgid "&General"
-#~ msgstr "&Hollek"
-
 #~ msgid "Show &all"
 #~ msgstr "Diskouez holl"
 
@@ -751,3 +757,6 @@ msgstr "Di&drouz :"
 #, fuzzy
 #~ msgid "&Menubar"
 #~ msgstr "Barrenn al lañser"
+
+#~ msgid "&General"
+#~ msgstr "&Hollek"