Merge translation files from master branch.

4 files changed, 114 insertions, 73 deletions

diff --git a/tde-i18n-nb/messages/tdebase/kcmkeys.po b/tde-i18n-nb/messages/tdebase/kcmkeys.po
index b0c1bd0edea..ad4b29e912e 100644
--- a/tde-i18n-nb/messages/tdebase/kcmkeys.po
+++ b/tde-i18n-nb/messages/tdebase/kcmkeys.po
@@ -13,7 +13,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmkeys\n"
-"POT-Creation-Date: 2023-07-13 20:16+0000\n"
+"POT-Creation-Date: 2024-08-01 20:11+0000\n"
 "PO-Revision-Date: 2006-04-10 12:58+0200\n"
 "Last-Translator: Knut Yrvin <knuty@skolelinux.no>\n"
 "Language-Team: Norsk bokmål <i18n-no@lister.ping.uio.no>\n"
@@ -132,7 +132,7 @@ msgstr ""
 msgid "&Save Scheme..."
 msgstr "Lagre tasteoppsett"
 
-#: keyconfig.cpp:128 shortcuts.cpp:170
+#: keyconfig.cpp:128 shortcuts.cpp:171
 msgid ""
 "Click here to add a new key bindings scheme. You will be prompted for a name."
 msgstr ""
@@ -164,7 +164,7 @@ msgid ""
 "modifier configuration defaults, then this option should be unchecked."
 msgstr ""
 
-#: main.cpp:54
+#: main.cpp:55
 msgid ""
 "<h1>Keyboard Shortcuts</h1> Using shortcuts you can configure certain "
 "actions to be triggered when you press a key or a combination of keys, e.g. "
@@ -187,15 +187,15 @@ msgstr ""
 "vil du finne tilordninger som brukes av mange programmer, som «kopier» og "
 "«lim inn»."
 
-#: main.cpp:77
+#: main.cpp:78
 msgid "Shortcut Schemes"
 msgstr "Hurtigtastoppsett"
 
-#: main.cpp:81
+#: main.cpp:82
 msgid "Command Shortcuts"
 msgstr "Kommandohurtigtaster"
 
-#: main.cpp:86
+#: main.cpp:87
 msgid "Modifier Keys"
 msgstr "Valgtaster"
 
@@ -217,7 +217,7 @@ msgid ""
 "Ctrl"
 msgstr "Ctrl"
 
-#: modifiers.cpp:195 modifiers.cpp:291 shortcuts.cpp:338
+#: modifiers.cpp:195 modifiers.cpp:291 shortcuts.cpp:339
 msgid "Win"
 msgstr "Win"
 
@@ -278,7 +278,7 @@ msgstr ""
 "Du kan bare bruke dette valget dersom tastene «Super» eller «Meta» er riktig "
 "satt opp som valgtaster."
 
-#: shortcuts.cpp:96
+#: shortcuts.cpp:97
 msgid ""
 "<h1>Key Bindings</h1> Using key bindings you can configure certain actions "
 "to be triggered when you press a key or a combination of keys, e.g. Ctrl+C "
@@ -300,7 +300,7 @@ msgstr ""
 "siden «Programhurtigtaster» vil du finne tilordninger som brukes av mange "
 "programmer, som kopier og lim inn."
 
-#: shortcuts.cpp:157
+#: shortcuts.cpp:158
 msgid ""
 "Click here to remove the selected key bindings scheme. You cannot remove the "
 "standard system-wide schemes 'Current scheme' and 'TDE default'."
@@ -309,39 +309,39 @@ msgstr ""
 "standardoppsettet som er installert på systemnivået: «Nåværende oppsett» og "
 "«TDE standard»."
 
-#: shortcuts.cpp:163
+#: shortcuts.cpp:164
 msgid "New scheme"
 msgstr "Nytt oppsett"
 
-#: shortcuts.cpp:168
+#: shortcuts.cpp:169
 msgid "&Save..."
 msgstr "&Lagre …"
 
-#: shortcuts.cpp:195
+#: shortcuts.cpp:196
 msgid "Use Win key as modifier (uncheck to bind Win key to Menu)"
 msgstr ""
 
-#: shortcuts.cpp:201
+#: shortcuts.cpp:202
 msgid "&Global Shortcuts"
 msgstr "&Generelle hurtigtaster"
 
-#: shortcuts.cpp:206
+#: shortcuts.cpp:207
 msgid "Shortcut Se&quences"
 msgstr "Snarveise&kvenser"
 
-#: shortcuts.cpp:211
+#: shortcuts.cpp:212
 msgid "App&lication Shortcuts"
 msgstr "&Programhurtigtastar"
 
-#: shortcuts.cpp:272
+#: shortcuts.cpp:273
 msgid "User-Defined Scheme"
 msgstr "Selvvalgt oppsett"
 
-#: shortcuts.cpp:273
+#: shortcuts.cpp:274
 msgid "Current Scheme"
 msgstr "Nåværende oppsett"
 
-#: shortcuts.cpp:316
+#: shortcuts.cpp:317
 msgid ""
 "Your current changes will be lost if you load another scheme before saving "
 "this one."
@@ -349,7 +349,7 @@ msgstr ""
 "Endringene du har gjort går tapt dersom du laster inn et annet oppsett før "
 "du lagrer dette."
 
-#: shortcuts.cpp:336
+#: shortcuts.cpp:337
 msgid ""
 "This scheme requires the \"%1\" modifier key, which is not available on your "
 "keyboard layout. Do you wish to view it anyway?"
@@ -357,15 +357,15 @@ msgstr ""
 "Dette oppsettet behøver valgtasten «%1». Den finnes ikke i tastaturoppsettet "
 "ditt. Vil du vise oppsettet likevel?"
 
-#: shortcuts.cpp:365 shortcuts.cpp:398
+#: shortcuts.cpp:366 shortcuts.cpp:399
 msgid "Save Key Scheme"
 msgstr "Lagre tasteoppsett"
 
-#: shortcuts.cpp:366
+#: shortcuts.cpp:367
 msgid "Enter a name for the key scheme:"
 msgstr "Gi tasteoppsettet et navn:"
 
-#: shortcuts.cpp:396
+#: shortcuts.cpp:397
 msgid ""
 "A key scheme with the name '%1' already exists;\n"
 "do you want to overwrite it?\n"
@@ -373,7 +373,7 @@ msgstr ""
 "Et tasteoppsett med navnet «%1» finnes allerede.\n"
 "Vil du overskrive det?\n"
 
-#: shortcuts.cpp:399
+#: shortcuts.cpp:400
 msgid "Overwrite"
 msgstr "Skriv over"
 
@@ -934,6 +934,23 @@ msgstr "Stopp datamaskinen uten bekreftelse"
 msgid "Reboot without Confirmation"
 msgstr "Start datamaskinen om igjen uten bekreftelse"
 
+#: ../../kdesktop/kdesktopbindings.cpp:62
+msgid "Freeze"
+msgstr ""
+
+#: ../../kdesktop/kdesktopbindings.cpp:65
+msgid "Suspend"
+msgstr ""
+
+#: ../../kdesktop/kdesktopbindings.cpp:68
+#, fuzzy
+msgid "Hibernate"
+msgstr "Alternativ"
+
+#: ../../kdesktop/kdesktopbindings.cpp:71
+msgid "Hybrid Suspend"
+msgstr ""
+
 #: ../../klipper/klipperbindings.cpp:28
 msgid "Clipboard"
 msgstr "Utklippstavle"
diff --git a/tde-i18n-nb/messages/tdebase/kdesktop.po b/tde-i18n-nb/messages/tdebase/kdesktop.po
index 9a0186e6df9..08de1c9410b 100644
--- a/tde-i18n-nb/messages/tdebase/kdesktop.po
+++ b/tde-i18n-nb/messages/tdebase/kdesktop.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kdesktop\n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-08-01 18:11+0000\n"
 "PO-Revision-Date: 2006-06-26 12:11+0200\n"
 "Last-Translator: Axel Bojer <axelb@skolelinux.no>\n"
 "Language-Team: Norwegian bokmål <i18n-nb@lister.pping.uio.no>\n"
@@ -143,6 +143,22 @@ msgstr "Stopp uten bekreftelse"
 msgid "Reboot without Confirmation"
 msgstr "Omstart uten bekreftelse"
 
+#: kdesktopbindings.cpp:62
+msgid "Freeze"
+msgstr ""
+
+#: kdesktopbindings.cpp:65
+msgid "Suspend"
+msgstr ""
+
+#: kdesktopbindings.cpp:68
+msgid "Hibernate"
+msgstr ""
+
+#: kdesktopbindings.cpp:71
+msgid "Hybrid Suspend"
+msgstr ""
+
 #: kdiconview.cpp:443
 msgid "&Rename"
 msgstr "&Gi nytt navn"
diff --git a/tde-i18n-nb/messages/tdebase/knetattach.po b/tde-i18n-nb/messages/tdebase/knetattach.po
index b6f69a33de3..55a4fc5e86d 100644
--- a/tde-i18n-nb/messages/tdebase/knetattach.po
+++ b/tde-i18n-nb/messages/tdebase/knetattach.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: knetattach\n"
-"POT-Creation-Date: 2020-05-11 04:02+0200\n"
+"POT-Creation-Date: 2024-08-01 20:11+0000\n"
 "PO-Revision-Date: 2005-03-21 08:06+0100\n"
 "Last-Translator: Knut Yrvin <knuty@skolelinux.no>\n"
 "Language-Team:  <i18n-nb@lister.ping.uio.no>\n"
@@ -29,7 +29,7 @@ msgid ""
 "Your emails"
 msgstr "knuty@skolelinux.no,zerodogg@skolelinux.no"
 
-#: knetattach.ui.h:18 knetattach.ui.h:282
+#: knetattach.ui.h:18 knetattach.ui.h:289
 msgid "Save && C&onnect"
 msgstr "Lagre og &kople til"
 
@@ -69,12 +69,12 @@ msgstr ""
 "tjeneradressen, porten og mappestien som skal brukes, og trykk <b>Lagre og "
 "kople til</b>."
 
-#: knetattach.ui.h:161
+#: knetattach.ui.h:168
 msgid "Unable to connect to server.  Please check your settings and try again."
 msgstr ""
 "Klarte ikke kople til tjeneren. Kontroller innstillingene og prøv igjen."
 
-#: knetattach.ui.h:284
+#: knetattach.ui.h:291
 msgid "C&onnect"
 msgstr "K&ople til"
 
@@ -102,42 +102,47 @@ msgstr "Legg til ei nettverksmappe"
 
 #: knetattach.ui:59
 #, no-c-format
-msgid "&Recent connection:"
-msgstr "&Nylig tilkobling:"
-
-#: knetattach.ui:67
-#, no-c-format
 msgid "&WebFolder (webdav)"
 msgstr "&Vevmappe (webdav)"
 
-#: knetattach.ui:78
-#, no-c-format
-msgid "&Secure shell (ssh)"
-msgstr "&Sikkert skall (ssh)"
-
-#: knetattach.ui:111
+#: knetattach.ui:70
 #, no-c-format
 msgid "FT&P"
 msgstr "FT&P"
 
-#: knetattach.ui:119
+#: knetattach.ui:78
 #, no-c-format
 msgid "&Microsoft® Windows® network drive"
 msgstr "&Microsoft® Windows® network disk"
 
-#: knetattach.ui:146
+#: knetattach.ui:86
+#, fuzzy, no-c-format
+msgid "&Secure shell (via SFTP)"
+msgstr "&Sikkert skall (ssh)"
+
+#: knetattach.ui:97
+#, fuzzy, no-c-format
+msgid "&Secure shell (via FISH)"
+msgstr "&Sikkert skall (ssh)"
+
+#: knetattach.ui:108
+#, no-c-format
+msgid "&Recent connection:"
+msgstr "&Nylig tilkobling:"
+
+#: knetattach.ui:157
 #, no-c-format
 msgid ""
 "Select the type of network folder you wish to connect to and press the Next "
 "button."
 msgstr "Velg typen nettverkmappe som skal kobles opp og trykk Neste-knappen."
 
-#: knetattach.ui:176
+#: knetattach.ui:187
 #, no-c-format
 msgid "Network Folder Information"
 msgstr "Informasjon om nettmappe"
 
-#: knetattach.ui:187
+#: knetattach.ui:198
 #, no-c-format
 msgid ""
 "Enter a name for this <i>%1</i> as well as the server address, port and "
@@ -146,37 +151,40 @@ msgstr ""
 "Skriv navn for denne <i>%1</i> og tjeneradressen, porten og mappestien å "
 "bruke og trykk Neste-knappen."
 
-#: knetattach.ui:215
+#: knetattach.ui:226
 #, no-c-format
 msgid "&Name:"
 msgstr "&Navn:"
 
-#: knetattach.ui:255
+#: knetattach.ui:266
 #, no-c-format
 msgid "&User:"
 msgstr "&Bruker:"
 
-#: knetattach.ui:266
+#: knetattach.ui:277
 #, no-c-format
 msgid "Se&rver:"
 msgstr "Tje&ner:"
 
-#: knetattach.ui:277
+#: knetattach.ui:288
 #, no-c-format
 msgid "&Port:"
 msgstr "&Port:"
 
-#: knetattach.ui:314
+#: knetattach.ui:325
 #, no-c-format
 msgid "&Folder:"
 msgstr "&Mappe:"
 
-#: knetattach.ui:342
+#: knetattach.ui:353
 #, no-c-format
 msgid "Cr&eate an icon for this remote folder"
 msgstr "L&ag et ikon for fjernmappen"
 
-#: knetattach.ui:353
+#: knetattach.ui:364
 #, no-c-format
 msgid "&Use encryption"
 msgstr "&Bruk kryptering"
+
+#~ msgid "&Secure shell (ssh)"
+#~ msgstr "&Sikkert skall (ssh)"
diff --git a/tde-i18n-nb/messages/tdebase/ksmserver.po b/tde-i18n-nb/messages/tdebase/ksmserver.po
index 28faf6db28d..e9317e6eef5 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: 2022-02-13 18:16+0000\n"
+"POT-Creation-Date: 2024-08-01 18:11+0000\n"
 "PO-Revision-Date: 2007-05-06 20:19+0200\n"
 "Last-Translator: Bjørn Steensrud <bjornst@powertech.no>\n"
 "Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n"
@@ -67,93 +67,93 @@ msgstr "TDE øktbehandler"
 msgid "Maintainer"
 msgstr "Vedlikeholder"
 
-#: shutdown.cpp:277
+#: shutdown.cpp:245
 msgid "Notifying applications of logout request..."
 msgstr ""
 
-#: shutdown.cpp:513 shutdown.cpp:544
+#: shutdown.cpp:543 shutdown.cpp:574
 msgid "Skip Notification (%1)"
 msgstr ""
 
-#: shutdown.cpp:515
+#: shutdown.cpp:545
 msgid "Notifying remaining applications of logout request (%1/%2)..."
 msgstr ""
 
-#: shutdown.cpp:518
+#: shutdown.cpp:548
 msgid "Notifying remaining applications of logout request (%1/%2, %3)..."
 msgstr ""
 
-#: shutdown.cpp:525
+#: shutdown.cpp:555
 msgid "Ignore and Resume Logout"
 msgstr ""
 
-#: shutdown.cpp:533
+#: shutdown.cpp:563
 msgid "An application is requesting attention, logout paused..."
 msgstr ""
 
-#: shutdown.cpp:536
+#: shutdown.cpp:566
 msgid "%3 is requesting attention, logout paused..."
 msgstr ""
 
-#: shutdown.cpp:546
+#: shutdown.cpp:576
 msgid "Notifying applications of logout request (%1/%2)..."
 msgstr ""
 
-#: shutdown.cpp:549
+#: shutdown.cpp:579
 msgid "Notifying applications of logout request (%1/%2, %3)..."
 msgstr ""
 
-#: shutdown.cpp:639
+#: shutdown.cpp:669
 msgid "Logout canceled by '%1'"
 msgstr "Utlogging avbrutt av «%1»"
 
-#: shutdown.cpp:645
+#: shutdown.cpp:675
 #, fuzzy
 msgid "Logout canceled by user"
 msgstr "Utlogging avbrutt av «%1»"
 
-#: shutdown.cpp:704
+#: shutdown.cpp:734
 msgid "Forcing interacting application termination"
 msgstr ""
 
-#: shutdown.cpp:754
+#: shutdown.cpp:784
 msgid "Notifying remaining applications of logout request..."
 msgstr ""
 
-#: shutdown.cpp:784
+#: shutdown.cpp:814
 msgid "Synchronizing remote folders"
 msgstr ""
 
-#: shutdown.cpp:790 shutdowndlg.cpp:1245
+#: shutdown.cpp:820 shutdowndlg.cpp:1245
 msgid "Saving your settings..."
 msgstr ""
 
-#: shutdown.cpp:840 shutdown.cpp:914
+#: shutdown.cpp:870 shutdown.cpp:944
 msgid "Closing applications (%1/%2)..."
 msgstr ""
 
-#: shutdown.cpp:843 shutdown.cpp:917
+#: shutdown.cpp:873 shutdown.cpp:947
 msgid "Closing applications (%1/%2, %3)..."
 msgstr ""
 
-#: shutdown.cpp:925
+#: shutdown.cpp:955
 msgid "Terminating services..."
 msgstr ""
 
-#: shutdowndlg.cpp:738
+#: shutdowndlg.cpp:739
 msgid "End Session for \"%1\""
 msgstr "Avslutt økt for «%1»"
 
-#: shutdowndlg.cpp:763
+#: shutdowndlg.cpp:764
 msgid "Log out"
 msgstr ""
 
-#: shutdowndlg.cpp:765 shutdowndlg.cpp:794
+#: shutdowndlg.cpp:766 shutdowndlg.cpp:795
 msgid ""
 "<qt><p>Log out of the current session to login as a different user.</p></qt>"
 msgstr ""
 
-#: shutdowndlg.cpp:793
+#: shutdowndlg.cpp:794
 msgid "&Log out"
 msgstr ""