Merge translation files from master branch.

1 files changed, 93 insertions, 106 deletions

diff --git a/tde-i18n-nb/messages/tdebase/ksmserver.po b/tde-i18n-nb/messages/tdebase/ksmserver.po
index 1426bfa0ae6..5707444c5f7 100644
--- a/tde-i18n-nb/messages/tdebase/ksmserver.po
+++ b/tde-i18n-nb/messages/tdebase/ksmserver.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ksmserver\n"
-"POT-Creation-Date: 2019-01-13 18:47+0100\n"
+"POT-Creation-Date: 2019-01-23 23:16+0100\n"
 "PO-Revision-Date: 2007-05-06 20:19+0200\n"
 "Last-Translator: Bjørn Steensrud <[email protected]>\n"
 "Language-Team: Norwegian Bokmål <[email protected]>\n"
@@ -67,76 +67,76 @@ msgstr "TDE øktbehandler"
 msgid "Maintainer"
 msgstr "Vedlikeholder"
 
-#: shutdown.cpp:277
+#: shutdown.cpp:272
 msgid "Notifying applications of logout request..."
 msgstr ""
 
-#: shutdown.cpp:513 shutdown.cpp:544
+#: shutdown.cpp:508 shutdown.cpp:539
 msgid "Skip Notification (%1)"
 msgstr ""
 
-#: shutdown.cpp:515
+#: shutdown.cpp:510
 msgid "Notifying remaining applications of logout request (%1/%2)..."
 msgstr ""
 
-#: shutdown.cpp:518
+#: shutdown.cpp:513
 msgid "Notifying remaining applications of logout request (%1/%2, %3)..."
 msgstr ""
 
-#: shutdown.cpp:525
+#: shutdown.cpp:520
 msgid "Ignore and Resume Logout"
 msgstr ""
 
-#: shutdown.cpp:533
+#: shutdown.cpp:528
 msgid "An application is requesting attention, logout paused..."
 msgstr ""
 
-#: shutdown.cpp:536
+#: shutdown.cpp:531
 msgid "%3 is requesting attention, logout paused..."
 msgstr ""
 
-#: shutdown.cpp:546
+#: shutdown.cpp:541
 msgid "Notifying applications of logout request (%1/%2)..."
 msgstr ""
 
-#: shutdown.cpp:549
+#: shutdown.cpp:544
 msgid "Notifying applications of logout request (%1/%2, %3)..."
 msgstr ""
 
-#: shutdown.cpp:639
+#: shutdown.cpp:634
 msgid "Logout canceled by '%1'"
 msgstr "Utlogging avbrutt av «%1»"
 
-#: shutdown.cpp:645
+#: shutdown.cpp:640
 #, fuzzy
 msgid "Logout canceled by user"
 msgstr "Utlogging avbrutt av «%1»"
 
-#: shutdown.cpp:704
+#: shutdown.cpp:699
 msgid "Forcing interacting application termination"
 msgstr ""
 
-#: shutdown.cpp:754
+#: shutdown.cpp:749
 msgid "Notifying remaining applications of logout request..."
 msgstr ""
 
-#: shutdown.cpp:784
+#: shutdown.cpp:779
 msgid "Synchronizing remote folders"
 msgstr ""
 
-#: shutdown.cpp:790 shutdowndlg.cpp:1365
+#: shutdown.cpp:785 shutdowndlg.cpp:1288
 msgid "Saving your settings..."
 msgstr ""
 
-#: shutdown.cpp:840 shutdown.cpp:914
+#: shutdown.cpp:835 shutdown.cpp:909
 msgid "Closing applications (%1/%2)..."
 msgstr ""
 
-#: shutdown.cpp:843 shutdown.cpp:917
+#: shutdown.cpp:838 shutdown.cpp:912
 msgid "Closing applications (%1/%2, %3)..."
 msgstr ""
 
-#: shutdown.cpp:925
+#: shutdown.cpp:920
 msgid "Terminating services..."
 msgstr ""
 
@@ -148,130 +148,142 @@ msgstr "Avslutt økt for «%1»"
 msgid "Log out"
 msgstr ""
 
-#: shutdowndlg.cpp:761 shutdowndlg.cpp:790
-msgid ""
-"<qt><p>Log out of the current session to login as a different user.</p></qt>"
-msgstr ""
+#: shutdowndlg.cpp:790
+msgid "&End Current Session"
+msgstr "&Avslutt inneværende økt"
 
-#: shutdowndlg.cpp:789
-msgid "&Log out"
+#: shutdowndlg.cpp:791
+msgid ""
+"<qt><h3>End Current Session</h3><p>Log out of the current session to login "
+"with a different user</p></qt>"
 msgstr ""
 
-#: shutdowndlg.cpp:899 shutdowndlg.cpp:1086
+#: shutdowndlg.cpp:889
 msgid "&Freeze"
 msgstr ""
 
-#: shutdowndlg.cpp:901 shutdowndlg.cpp:1087
-msgid ""
-"<qt><p>Put the computer in software idle mode, allowing for some "
-"powersaving. The system can be reactivated in a really short time, almost "
-"instantly.</p><p>This correspond to ACPI S0 mode.</p></qt>"
+#: shutdowndlg.cpp:901
+msgid "&Suspend"
 msgstr ""
 
-#: shutdowndlg.cpp:914 shutdowndlg.cpp:1097
-msgid "&Suspend"
+#: shutdowndlg.cpp:913
+msgid "&Hibernate"
 msgstr ""
 
-#: shutdowndlg.cpp:916 shutdowndlg.cpp:1098
+#: shutdowndlg.cpp:931
+#, fuzzy
+msgid "&Restart"
+msgstr "Sta&rt maskinen omigjen"
+
+#: shutdowndlg.cpp:955 shutdowndlg.cpp:1031
 msgid ""
-"<qt><p>Put the computer in suspend-to-memory mode. The system is stopped and "
-"its state saved to memory.</p><p> This allows more powersaving than 'Freeze' "
-"but requires longer time to reactivate the system.</p><p>This correspond to "
-"ACPI S3 mode.</p><p>Also known as Suspend-to-RAM mode.</p></qt>"
+"_: current option in boot loader\n"
+" (current)"
 msgstr ""
+" (nåverande)Shutdown ModeSlå av-modusSch&eduleOppgi &tidspunkt&Force "
+"now&Tving fram nå&Try now&Forsøk nå&Logout&Logg ut0"
 
-#: shutdowndlg.cpp:930 shutdowndlg.cpp:1109
-msgid "&Hibernate"
-msgstr ""
+#: shutdowndlg.cpp:971
+#, fuzzy
+msgid "&Turn Off"
+msgstr "&Slå av maskinen"
+
+#: shutdowndlg.cpp:996
+msgid "&Turn Off Computer"
+msgstr "&Slå av maskinen"
 
-#: shutdowndlg.cpp:932 shutdowndlg.cpp:1110
+#: shutdowndlg.cpp:997
 msgid ""
-"<qt><p>Put the computer in suspend-to-disk mode. The system is stopped and "
-"its state saved to disk.</p><p>This offers the greatest powersaving but "
-"considerable time is required to reactivate the system again.</p><p>This "
-"correspond to ACPI S4 mode.</p><p>Also known as Suspend-to-Disk mode.</p></"
-"qt>"
+"<qt><h3>Turn Off Computer</h3><p>Log out of the current session and turn off "
+"the computer</p></qt>"
 msgstr ""
 
-#: shutdowndlg.cpp:945 shutdowndlg.cpp:1120
-msgid "H&ybrid Suspend"
-msgstr ""
+#: shutdowndlg.cpp:1008
+msgid "&Restart Computer"
+msgstr "Sta&rt maskinen omigjen"
 
-#: shutdowndlg.cpp:947 shutdowndlg.cpp:1121
+#: shutdowndlg.cpp:1009
 msgid ""
-"<qt><p>Put the computer in both suspend-to-memory and suspend-to-disk mode. "
-"The system is stopped and its state saved to memory and to disk.</p><p>This "
-"offers the best of both 'Suspend' and 'Hibernate' modes combined together. "
-"The system is de facto in 'Suspend' mode but if power is lost, work can "
-"still be resumed as if the system had been hibernated, preventing any data "
-"loss.</p><p>This correspond to ACPI S3+S4 mode.</p><p>Also known as Suspend-"
-"to-RAM + Suspend-to-Disk mode.</p></qt>"
+"<qt><h3>Restart Computer</h3><p>Log out of the current session and restart "
+"the computer</p><p>Hold the mouse button or the space bar for a short while "
+"to get a list of options what to boot</p></qt>"
 msgstr ""
 
-#: shutdowndlg.cpp:969 shutdowndlg.cpp:1049
+#: shutdowndlg.cpp:1045
 #, fuzzy
-msgid "&Restart"
+msgid "&Freeze Computer"
 msgstr "Sta&rt maskinen omigjen"
 
-#: shutdowndlg.cpp:971 shutdowndlg.cpp:1050
+#: shutdowndlg.cpp:1046
 msgid ""
-"<qt><p>Log out of the current session and restart the computer.</p></qt>"
+"<qt><h3>Freeze Computer</h3><p>Put the computer in software sleep mode, "
+"allowing for some powersaving. The system can be reactivated in a really "
+"short time, almost instantly.</p></qt>"
 msgstr ""
 
-#: shutdowndlg.cpp:994 shutdowndlg.cpp:1072
+#: shutdowndlg.cpp:1054
+#, fuzzy
+msgid "&Suspend Computer"
+msgstr "&Slå av maskinen"
+
+#: shutdowndlg.cpp:1055
 msgid ""
-"_: current option in boot loader\n"
-" (current)"
+"<qt><h3>Suspend Computer</h3><p>Put the computer in a suspend-to-memory "
+"mode. The system is stopped and its state saved to memory.</p><p> This "
+"allows more powersaving than 'Freeze Computer' but requires longer time to "
+"reactivate the system.</p></qt>"
 msgstr ""
-" (nåverande)Shutdown ModeSlå av-modusSch&eduleOppgi &tidspunkt&Force "
-"now&Tving fram nå&Try now&Forsøk nå&Logout&Logg ut0"
 
-#: shutdowndlg.cpp:1010 shutdowndlg.cpp:1037
-msgid "&Shutdown"
-msgstr ""
+#: shutdowndlg.cpp:1063
+#, fuzzy
+msgid "&Hibernate Computer"
+msgstr "Sta&rt maskinen omigjen"
 
-#: shutdowndlg.cpp:1012 shutdowndlg.cpp:1038
+#: shutdowndlg.cpp:1064
 msgid ""
-"<qt><p>Log out of the current session and turn off the computer.</p></qt>"
+"<qt><h3>Hibernate Computer</h3><p>Put the computer in a suspend-to-disk "
+"mode. The system is stopped and its state saved to disk.</p><p>This offers "
+"the greatest powersaving but considerable time is required to reactivate the "
+"system again.</p></qt>"
 msgstr ""
 
-#: shutdowndlg.cpp:1367
+#: shutdowndlg.cpp:1290
 msgid "Skip Notification"
 msgstr ""
 
-#: shutdowndlg.cpp:1368
+#: shutdowndlg.cpp:1291
 msgid "Abort Logout"
 msgstr ""
 
-#: shutdowndlg.cpp:1423
+#: shutdowndlg.cpp:1346
 msgid "Would you like to turn off your computer?"
 msgstr ""
 
-#: shutdowndlg.cpp:1424
+#: shutdowndlg.cpp:1347
 msgid ""
 "This computer will turn off automatically\n"
 "after %1 seconds."
 msgstr ""
 
-#: shutdowndlg.cpp:1430
+#: shutdowndlg.cpp:1353
 msgid "Would you like to reboot your computer?"
 msgstr ""
 
-#: shutdowndlg.cpp:1432
+#: shutdowndlg.cpp:1355
 msgid "Would you like to reboot to \"%1\"?"
 msgstr ""
 
-#: shutdowndlg.cpp:1433
+#: shutdowndlg.cpp:1356
 msgid ""
 "This computer will reboot automatically\n"
 "after %1 seconds."
 msgstr ""
 
-#: shutdowndlg.cpp:1437
+#: shutdowndlg.cpp:1360
 msgid "Would you like to end your current session?"
 msgstr ""
 
-#: shutdowndlg.cpp:1438
+#: shutdowndlg.cpp:1361
 msgid ""
 "This session will end\n"
 "after %1 seconds automatically."
@@ -302,28 +314,3 @@ msgstr ""
 #, no-c-format
 msgid "Confirm"
 msgstr ""
-
-#~ msgid "&End Current Session"
-#~ msgstr "&Avslutt inneværende økt"
-
-#, fuzzy
-#~ msgid "&Turn Off"
-#~ msgstr "&Slå av maskinen"
-
-#~ msgid "&Turn Off Computer"
-#~ msgstr "&Slå av maskinen"
-
-#~ msgid "&Restart Computer"
-#~ msgstr "Sta&rt maskinen omigjen"
-
-#, fuzzy
-#~ msgid "&Freeze Computer"
-#~ msgstr "Sta&rt maskinen omigjen"
-
-#, fuzzy
-#~ msgid "&Suspend Computer"
-#~ msgstr "&Slå av maskinen"
-
-#, fuzzy
-#~ msgid "&Hibernate Computer"
-#~ msgstr "Sta&rt maskinen omigjen"