Merge translation files from master branch.

1 files changed, 25 insertions, 23 deletions

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"