Merge translation files from master branch.

1 files changed, 34 insertions, 26 deletions

diff --git a/tde-i18n-sr@Latn/messages/tdemultimedia/kmix.po b/tde-i18n-sr@Latn/messages/tdemultimedia/kmix.po
index 32238a745f8..6b0c8d8ae84 100644
--- a/tde-i18n-sr@Latn/messages/tdemultimedia/kmix.po
+++ b/tde-i18n-sr@Latn/messages/tdemultimedia/kmix.po
@@ -10,7 +10,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 22:31+0200\n"
 "Last-Translator: Chusslove Illich <caslav.ilic@gmx.net>\n"
 "Language-Team: Serbian <kde-i18n-sr@kde.org>\n"
@@ -42,7 +42,7 @@ msgstr "Izaberite glavni kanal"
 msgid "Current Mixer"
 msgstr "Trenutna mikseta"
 
-#: dialogselectmaster.cpp:91 kmix.cpp:167
+#: dialogselectmaster.cpp:91 kmix.cpp:166
 msgid "Current mixer"
 msgstr "Trenutna mikseta"
 
@@ -50,43 +50,39 @@ msgstr "Trenutna mikseta"
 msgid "Select the channel representing the master volume:"
 msgstr "Izaberite kanal koji predstavlja glavnu jačinu:"
 
-#: kmix.cpp:115
+#: kmix.cpp:114
 msgid "Configure &Global Shortcuts..."
 msgstr "Podesi &globalne prečice..."
 
-#: kmix.cpp:119
+#: kmix.cpp:118
 msgid "Hardware &Information"
 msgstr "Informacije o &hardveru"
 
-#: kmix.cpp:120 kmixdockwidget.cpp:418
+#: kmix.cpp:119 kmixdockwidget.cpp:441
 msgid "Hide Mixer Window"
 msgstr "Sakrij prozor miksete"
 
-#: kmix.cpp:123
+#: kmix.cpp:122
 msgid "Increase Volume of Master Channel"
 msgstr "Pojačava glavni kanal"
 
-#: kmix.cpp:125
+#: kmix.cpp:124
 msgid "Decrease Volume of Master Channel"
 msgstr "Utišava glavni kanal"
 
-#: kmix.cpp:127
+#: kmix.cpp:126
 msgid "Toggle Mute of Master Channel"
 msgstr "Isključuje/Uključuje glavni kanal"
 
-#: kmix.cpp:162
+#: kmix.cpp:161
 msgid "Current mixer:"
 msgstr "Trenutna mikseta:"
 
-#: kmix.cpp:216
-msgid "Select Channel"
-msgstr "Izaberite kanal"
-
-#: kmix.cpp:520
+#: kmix.cpp:500
 msgid "The change of orientation will be adopted on the next start of KMix."
 msgstr "Izmena usmerenja biće usvojena prilikom sledećeg pokretanja KMix."
 
-#: kmix.cpp:601
+#: kmix.cpp:581
 msgid "Mixer Hardware Information"
 msgstr "Infomacije o hardveru miksete"
 
@@ -110,21 +106,21 @@ msgstr ""
 msgid "Select Mixer"
 msgstr "Izaberite miksetu"
 
-#: kmixapplet.cpp:216
+#: kmixapplet.cpp:217
 msgid ""
 "For detailed credits, please refer to the About information of the KMix "
 "program"
 msgstr "Za detaljne zasluge, pogledajte informacije o programu KMix"
 
-#: kmixapplet.cpp:323
+#: kmixapplet.cpp:325
 msgid "Mixers"
 msgstr "Miksete"
 
-#: kmixapplet.cpp:324
+#: kmixapplet.cpp:326
 msgid "Available mixers:"
 msgstr "Dostupne miksete:"
 
-#: kmixapplet.cpp:330
+#: kmixapplet.cpp:332
 msgid "Invalid mixer entered."
 msgstr "Unesena je neispravna mikseta."
 
@@ -144,27 +140,27 @@ msgstr "Vrati na podrazumevane jačine"
 msgid "KMixCtrl"
 msgstr "KMixCtrl"
 
-#: kmixdockwidget.cpp:84
+#: kmixdockwidget.cpp:86
 msgid "M&ute"
 msgstr "&Isključi zvuk"
 
-#: kmixdockwidget.cpp:92
+#: kmixdockwidget.cpp:97
 msgid "Select Master Channel..."
 msgstr "Izaberite glavni kanal..."
 
-#: kmixdockwidget.cpp:201
+#: kmixdockwidget.cpp:225
 msgid "Mixer cannot be found"
 msgstr "Ne mogu da nađem miksetu"
 
-#: kmixdockwidget.cpp:212
+#: kmixdockwidget.cpp:236
 msgid "Volume at %1%"
 msgstr "Jačina na %1%"
 
-#: kmixdockwidget.cpp:214
+#: kmixdockwidget.cpp:238
 msgid " (Muted)"
 msgstr " (isključen)"
 
-#: kmixdockwidget.cpp:422
+#: kmixdockwidget.cpp:445
 msgid "Show Mixer Window"
 msgstr "Prikaži prozor miksete"
 
@@ -656,7 +652,16 @@ msgstr "Zvučni upravljački programi koji se koriste:"
 msgid "&Channels"
 msgstr "&Kanali"
 
-#: viewbase.cpp:134
+#: viewbase.cpp:63
+#, fuzzy
+msgid "&Select Mixer"
+msgstr "Izaberite miksetu"
+
+#: viewbase.cpp:139
+msgid "General"
+msgstr ""
+
+#: viewbase.cpp:144
 msgid "Device Settings"
 msgstr "Postavke uređaja"
 
@@ -709,6 +714,9 @@ msgstr "&Pozadina:"
 msgid "Silen&t:"
 msgstr "&Utišano:"
 
+#~ msgid "Select Channel"
+#~ msgstr "Izaberite kanal"
+
 #, fuzzy
 #~ msgid "Orientation"
 #~ msgstr "Usmerenje klizača: "