Merge translation files from master branch.

3 files changed, 58 insertions, 56 deletions

diff --git a/tde-i18n-nb/messages/tdebase/kdcop.po b/tde-i18n-nb/messages/tdebase/kdcop.po
index 739424693b1..cfc27f67671 100644
--- a/tde-i18n-nb/messages/tdebase/kdcop.po
+++ b/tde-i18n-nb/messages/tdebase/kdcop.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kdcop\n"
-"POT-Creation-Date: 2020-05-11 13:04+0200\n"
+"POT-Creation-Date: 2020-05-28 02:58+0200\n"
 "PO-Revision-Date: 2007-08-19 18:09+0200\n"
 "Last-Translator: Knut Yrvin <knuty@skolelinux.no>\n"
 "Language-Team:  <i18n-no@lister.ping.uio.no>\n"
@@ -47,78 +47,78 @@ msgstr "%1 (standard)"
 msgid "Welcome to the TDE DCOP browser"
 msgstr "Velkommen til TDEs DCOP-leser"
 
-#: kdcopwindow.cpp:294
+#: kdcopwindow.cpp:295
 msgid "Application"
 msgstr "Program"
 
-#: kdcopwindow.cpp:316
+#: kdcopwindow.cpp:317
 msgid "&Execute"
 msgstr "&Kjør"
 
-#: kdcopwindow.cpp:326
+#: kdcopwindow.cpp:327
 msgid "Execute the selected DCOP call."
 msgstr "Kjør valgt DCOP-kall"
 
-#: kdcopwindow.cpp:328
+#: kdcopwindow.cpp:329
 msgid "Language Mode"
 msgstr "Språkvalg"
 
-#: kdcopwindow.cpp:336
+#: kdcopwindow.cpp:337
 msgid "Set the current language export."
 msgstr "Sett gjeldende språkeksportering"
 
-#: kdcopwindow.cpp:355
+#: kdcopwindow.cpp:356
 msgid "DCOP Browser"
 msgstr "DCOP-Los"
 
-#: kdcopwindow.cpp:402
+#: kdcopwindow.cpp:403
 msgid "No parameters found."
 msgstr "Ingen parametre funnet."
 
-#: kdcopwindow.cpp:402
+#: kdcopwindow.cpp:403
 msgid "DCOP Browser Error"
 msgstr "DCOP Losfeil"
 
-#: kdcopwindow.cpp:418
+#: kdcopwindow.cpp:419
 #, c-format
 msgid "Call Function %1"
 msgstr "Kall funksjon %1"
 
-#: kdcopwindow.cpp:422
+#: kdcopwindow.cpp:423
 msgid "Name"
 msgstr "Navn"
 
-#: kdcopwindow.cpp:423
+#: kdcopwindow.cpp:424
 msgid "Type"
 msgstr "Type"
 
-#: kdcopwindow.cpp:424
+#: kdcopwindow.cpp:425
 msgid "Value"
 msgstr "Verdi"
 
-#: kdcopwindow.cpp:631
+#: kdcopwindow.cpp:632
 msgid "X"
 msgstr "X"
 
-#: kdcopwindow.cpp:632
+#: kdcopwindow.cpp:633
 msgid "Y"
 msgstr "Y"
 
-#: kdcopwindow.cpp:662 kdcopwindow.cpp:789
+#: kdcopwindow.cpp:663 kdcopwindow.cpp:790
 #, c-format
 msgid "Cannot handle datatype %1"
 msgstr "Kan ikke behandle datatype %1"
 
-#: kdcopwindow.cpp:824
+#: kdcopwindow.cpp:825
 msgid "DCOP call failed"
 msgstr "DCOP-kall mislykket"
 
-#: kdcopwindow.cpp:826
+#: kdcopwindow.cpp:827
 #, c-format
 msgid "<p>DCOP call failed.</p>%1"
 msgstr "<p>DCOP kall mislykket.</p>%1"
 
-#: kdcopwindow.cpp:837
+#: kdcopwindow.cpp:838
 msgid ""
 "<p>Application is still registered with DCOP; I do not know why this call "
 "failed.</p>"
@@ -126,28 +126,28 @@ msgstr ""
 "<p>Programmet er fortsatt registrert hos DCOP. Jeg skjønner ikke hvorfor "
 "dette kallet mislyktes.</p>"
 
-#: kdcopwindow.cpp:849
+#: kdcopwindow.cpp:850
 msgid "<p>The application appears to have unregistered with DCOP.</p>"
 msgstr "<p>Programmet ser ut til å ha fjernet sin registrering hos DCOP.</p>"
 
-#: kdcopwindow.cpp:865
+#: kdcopwindow.cpp:866
 msgid "DCOP call %1 executed"
 msgstr "DCOP-kall %1 utført"
 
-#: kdcopwindow.cpp:874
+#: kdcopwindow.cpp:875
 msgid "<strong>%1</strong>"
 msgstr "<strong>%1</strong>"
 
-#: kdcopwindow.cpp:881
+#: kdcopwindow.cpp:882
 #, c-format
 msgid "Unknown type %1."
 msgstr "Ukjent type %1."
 
-#: kdcopwindow.cpp:887
+#: kdcopwindow.cpp:888
 msgid "No returned values"
 msgstr "Ingen returnerte verdier"
 
-#: kdcopwindow.cpp:1092
+#: kdcopwindow.cpp:1093
 #, c-format
 msgid "Do not know how to demarshal %1"
 msgstr "Vet ikke hvordan jeg skal avkode %1"
diff --git a/tde-i18n-nb/messages/tdemultimedia/kmix.po b/tde-i18n-nb/messages/tdemultimedia/kmix.po
index f7dab477c63..1c8d453bf23 100644
--- a/tde-i18n-nb/messages/tdemultimedia/kmix.po
+++ b/tde-i18n-nb/messages/tdemultimedia/kmix.po
@@ -11,7 +11,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmix\n"
-"POT-Creation-Date: 2020-05-11 04:03+0200\n"
+"POT-Creation-Date: 2020-05-28 02:59+0200\n"
 "PO-Revision-Date: 2006-08-09 21:38+0200\n"
 "Last-Translator: Alexander Nicolaysen Sørnes <alex@thehandofagony.com>\n"
 "Language-Team:  <nb@li.org>\n"
@@ -59,7 +59,7 @@ msgstr "&Setter opp globale hurtigtaster …"
 msgid "Hardware &Information"
 msgstr "Maskinvare&informasjon"
 
-#: kmix.cpp:120 kmixdockwidget.cpp:400
+#: kmix.cpp:120 kmixdockwidget.cpp:418
 msgid "Hide Mixer Window"
 msgstr "Skjul mikservindu"
 
@@ -154,19 +154,19 @@ msgstr "&Dempet"
 msgid "Select Master Channel..."
 msgstr "Velg hovedkanal …"
 
-#: kmixdockwidget.cpp:183
+#: kmixdockwidget.cpp:201
 msgid "Mixer cannot be found"
 msgstr "Finner ikke mikser"
 
-#: kmixdockwidget.cpp:194
+#: kmixdockwidget.cpp:212
 msgid "Volume at %1%"
 msgstr "Lydstyrken er %1 %"
 
-#: kmixdockwidget.cpp:196
+#: kmixdockwidget.cpp:214
 msgid " (Muted)"
 msgstr " (Dempet)"
 
-#: kmixdockwidget.cpp:404
+#: kmixdockwidget.cpp:422
 msgid "Show Mixer Window"
 msgstr "Vis mikservindu"
 
@@ -640,11 +640,11 @@ msgstr ""
 "kmix: Du har ikke tilgang til å bruke mikser-enheten.\n"
 "Spør systemadministrator om å fikse /dev/audioctl for å gi deg tilgang."
 
-#: mixertoolbox.cpp:225
+#: mixertoolbox.cpp:237
 msgid "Sound drivers supported:"
 msgstr "Lyddrivere støttet:"
 
-#: mixertoolbox.cpp:226
+#: mixertoolbox.cpp:238
 msgid "Sound drivers used:"
 msgstr "Lyddrivere brukt:"
 
diff --git a/tde-i18n-nb/messages/tdeutils/kcmlaptop.po b/tde-i18n-nb/messages/tdeutils/kcmlaptop.po
index f23082acbb3..db2a827928c 100644
--- a/tde-i18n-nb/messages/tdeutils/kcmlaptop.po
+++ b/tde-i18n-nb/messages/tdeutils/kcmlaptop.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmlaptop\n"
-"POT-Creation-Date: 2020-05-11 04:05+0200\n"
+"POT-Creation-Date: 2020-05-28 01:29+0200\n"
 "PO-Revision-Date: 2007-03-17 10:37+0100\n"
 "Last-Translator: Bjørn Steensrud <bjornst@powertech.no>\n"
 "Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n"
@@ -170,7 +170,26 @@ msgstr "Denne knappen kan benyttes for å skru på ACPI hjelpeprogrammet"
 msgid "Version: %1"
 msgstr "Versjon: %1"
 
-#: acpi.cpp:172 apm.cpp:194
+#: acpi.cpp:170 apm.cpp:192
+msgid ""
+"The %1 application does not seem to have the same size or checksum as when "
+"it was compiled we do NOT recommend you proceed with making it setuid-root "
+"without further investigation"
+msgstr ""
+"Programmet %1 har ikke samme størrelse eller samme sjekksum som da det ble "
+"oversatt. Vi anbefaler at du IKKE fortsetter for å gjøre 'set-uid-root' uten "
+"at dette er nærmere undersøkt."
+
+#: acpi.cpp:173 acpi.cpp:185 acpi.cpp:197 apm.cpp:174 apm.cpp:195 apm.cpp:207
+#: apm.cpp:219 sony.cpp:115 sony.cpp:127
+msgid "KLaptopDaemon"
+msgstr "KLaptopDaemon"
+
+#: acpi.cpp:173 apm.cpp:195
+msgid "Run Nevertheless"
+msgstr "Kjør uansett"
+
+#: acpi.cpp:183 apm.cpp:205
 msgid ""
 "You will need to supply a root password to allow the privileges of the "
 "klaptop_acpi_helper to change."
@@ -178,12 +197,7 @@ msgstr ""
 "Du må oppgi et passord for 'root' for å tillate endringer i rettighetene til "
 "klaptop_acpi_helper."
 
-#: acpi.cpp:174 acpi.cpp:186 apm.cpp:174 apm.cpp:196 apm.cpp:208 sony.cpp:115
-#: sony.cpp:127
-msgid "KLaptopDaemon"
-msgstr "KLaptopDaemon"
-
-#: acpi.cpp:185
+#: acpi.cpp:196
 msgid ""
 "The ACPI helper cannot be enabled because tdesu cannot be found.  Please "
 "make sure that it is installed correctly."
@@ -191,7 +205,7 @@ msgstr ""
 "ACPI-hjelperen kan ikke slås på fordi tdesu ikke finnes. Se etter at tdesu "
 "er riktig installert."
 
-#: acpi.cpp:268
+#: acpi.cpp:279
 msgid ""
 "<h1>ACPI Setup</h1>This module allows you to configure ACPI for your system"
 msgstr ""
@@ -294,7 +308,7 @@ msgstr ""
 "%1 kan ikke skrus på fordi tdesu ikke kan finnes. Se etter at tdesu er "
 "riktig installert."
 
-#: apm.cpp:207
+#: apm.cpp:218
 msgid ""
 "The Software Suspend helper cannot be enabled because tdesu cannot be "
 "found.  Please make sure that it is installed correctly."
@@ -302,7 +316,7 @@ msgstr ""
 "Hjelpeprogrammet for programmert ventemodus kan ikke skrus på fordi tdesu "
 "ikke kan finnes. Se etter at tdesu er riktig installert."
 
-#: apm.cpp:271
+#: apm.cpp:282
 msgid ""
 "<h1>APM Setup</h1>This module allows you to configure APM for your system"
 msgstr ""
@@ -1062,15 +1076,3 @@ msgid ""
 msgstr ""
 "<h1>Advarsel om lite strøm på batteriet</h1>Denne modulen gir deg mulighet "
 "til å sette en alarm i tilfelle batteriene går tomme."
-
-#~ msgid ""
-#~ "The %1 application does not seem to have the same size or checksum as "
-#~ "when it was compiled we do NOT recommend you proceed with making it "
-#~ "setuid-root without further investigation"
-#~ msgstr ""
-#~ "Programmet %1 har ikke samme størrelse eller samme sjekksum som da det "
-#~ "ble oversatt. Vi anbefaler at du IKKE fortsetter for å gjøre 'set-uid-"
-#~ "root' uten at dette er nærmere undersøkt."
-
-#~ msgid "Run Nevertheless"
-#~ msgstr "Kjør uansett"