Merge translation files from master branch.

4 files changed, 114 insertions, 73 deletions

diff --git a/tde-i18n-en_GB/messages/tdebase/kcmkeys.po b/tde-i18n-en_GB/messages/tdebase/kcmkeys.po
index e6b5b786f47..03313d8751d 100644
--- a/tde-i18n-en_GB/messages/tdebase/kcmkeys.po
+++ b/tde-i18n-en_GB/messages/tdebase/kcmkeys.po
@@ -6,7 +6,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: 2005-11-04 14:26+0000\n"
 "Last-Translator: Malcolm Hunter <malcolm.hunter@gmx.co.uk>\n"
 "Language-Team: British English <kde-en-gb@kde.me.uk>\n"
@@ -123,7 +123,7 @@ msgstr ""
 msgid "&Save Scheme..."
 msgstr "Save Key Scheme"
 
-#: 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 ""
@@ -153,7 +153,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. "
@@ -175,15 +175,15 @@ msgstr ""
 "'Application Shortcuts' tab you will find bindings typically used in "
 "applications, such as copy and paste."
 
-#: main.cpp:77
+#: main.cpp:78
 msgid "Shortcut Schemes"
 msgstr "Shortcut Schemes"
 
-#: main.cpp:81
+#: main.cpp:82
 msgid "Command Shortcuts"
 msgstr "Command Shortcuts"
 
-#: main.cpp:86
+#: main.cpp:87
 msgid "Modifier Keys"
 msgstr "Modifier Keys"
 
@@ -205,7 +205,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"
 
@@ -266,7 +266,7 @@ msgstr ""
 "You can only activate this option if your X keyboard layout has the 'Super' "
 "or 'Meta' keys properly configured as modifier keys."
 
-#: 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 "
@@ -288,7 +288,7 @@ msgstr ""
 "Shortcuts' you will find bindings typically used in applications, such as "
 "copy and paste."
 
-#: 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'."
@@ -296,39 +296,39 @@ msgstr ""
 "Click here to remove the selected key bindings scheme. You cannot remove the "
 "standard system-wide schemes 'Current scheme' and 'TDE default'."
 
-#: shortcuts.cpp:163
+#: shortcuts.cpp:164
 msgid "New scheme"
 msgstr "New scheme"
 
-#: shortcuts.cpp:168
+#: shortcuts.cpp:169
 msgid "&Save..."
 msgstr "&Save..."
 
-#: 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 "&Global Shortcuts"
 
-#: shortcuts.cpp:206
+#: shortcuts.cpp:207
 msgid "Shortcut Se&quences"
 msgstr "Shortcut Se&quences"
 
-#: shortcuts.cpp:211
+#: shortcuts.cpp:212
 msgid "App&lication Shortcuts"
 msgstr "App&lication Shortcuts"
 
-#: shortcuts.cpp:272
+#: shortcuts.cpp:273
 msgid "User-Defined Scheme"
 msgstr "User-Defined Scheme"
 
-#: shortcuts.cpp:273
+#: shortcuts.cpp:274
 msgid "Current Scheme"
 msgstr "Current Scheme"
 
-#: shortcuts.cpp:316
+#: shortcuts.cpp:317
 msgid ""
 "Your current changes will be lost if you load another scheme before saving "
 "this one."
@@ -336,7 +336,7 @@ msgstr ""
 "Your current changes will be lost if you load another scheme before saving "
 "this one."
 
-#: 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?"
@@ -344,15 +344,15 @@ msgstr ""
 "This scheme requires the \"%1\" modifier key, which is not available on your "
 "keyboard layout. Do you wish to view it anyway?"
 
-#: shortcuts.cpp:365 shortcuts.cpp:398
+#: shortcuts.cpp:366 shortcuts.cpp:399
 msgid "Save Key Scheme"
 msgstr "Save Key Scheme"
 
-#: shortcuts.cpp:366
+#: shortcuts.cpp:367
 msgid "Enter a name for the key scheme:"
 msgstr "Enter a name for the key scheme:"
 
-#: shortcuts.cpp:396
+#: shortcuts.cpp:397
 msgid ""
 "A key scheme with the name '%1' already exists;\n"
 "do you want to overwrite it?\n"
@@ -360,7 +360,7 @@ msgstr ""
 "A key scheme with the name '%1' already exists;\n"
 "do you want to overwrite it?\n"
 
-#: shortcuts.cpp:399
+#: shortcuts.cpp:400
 msgid "Overwrite"
 msgstr "Overwrite"
 
@@ -921,6 +921,23 @@ msgstr "Halt without Confirmation"
 msgid "Reboot without Confirmation"
 msgstr "Reboot without Confirmation"
 
+#: ../../kdesktop/kdesktopbindings.cpp:62
+msgid "Freeze"
+msgstr ""
+
+#: ../../kdesktop/kdesktopbindings.cpp:65
+msgid "Suspend"
+msgstr ""
+
+#: ../../kdesktop/kdesktopbindings.cpp:68
+#, fuzzy
+msgid "Hibernate"
+msgstr "Alternate"
+
+#: ../../kdesktop/kdesktopbindings.cpp:71
+msgid "Hybrid Suspend"
+msgstr ""
+
 #: ../../klipper/klipperbindings.cpp:28
 msgid "Clipboard"
 msgstr "Clipboard"
diff --git a/tde-i18n-en_GB/messages/tdebase/kdesktop.po b/tde-i18n-en_GB/messages/tdebase/kdesktop.po
index 15b4a16db2e..a8c73aab365 100644
--- a/tde-i18n-en_GB/messages/tdebase/kdesktop.po
+++ b/tde-i18n-en_GB/messages/tdebase/kdesktop.po
@@ -7,7 +7,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: 2005-12-26 02:03+0000\n"
 "Last-Translator: Malcolm Hunter <malcolm.hunter@gmx.co.uk>\n"
 "Language-Team: British English <kde-en-gb@kde.me.uk>\n"
@@ -140,6 +140,22 @@ msgstr "Halt without Confirmation"
 msgid "Reboot without Confirmation"
 msgstr "Reboot without Confirmation"
 
+#: 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 "&Rename"
diff --git a/tde-i18n-en_GB/messages/tdebase/knetattach.po b/tde-i18n-en_GB/messages/tdebase/knetattach.po
index 6e0737250b4..624084f5c02 100644
--- a/tde-i18n-en_GB/messages/tdebase/knetattach.po
+++ b/tde-i18n-en_GB/messages/tdebase/knetattach.po
@@ -5,7 +5,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-07 14:35+0000\n"
 "Last-Translator: Andrew Coles <andrew_coles@yahoo.co.uk>\n"
 "Language-Team: British English <kde-en-gb@kde.me.uk>\n"
@@ -27,7 +27,7 @@ msgid ""
 "Your emails"
 msgstr "malcolm.hunter@gmx.co.uk"
 
-#: knetattach.ui.h:18 knetattach.ui.h:282
+#: knetattach.ui.h:18 knetattach.ui.h:289
 msgid "Save && C&onnect"
 msgstr "Save && C&onnect"
 
@@ -69,12 +69,12 @@ msgstr ""
 "server address and folder path to use and press the <b>Save & Connect</b> "
 "button."
 
-#: knetattach.ui.h:161
+#: knetattach.ui.h:168
 msgid "Unable to connect to server.  Please check your settings and try again."
 msgstr ""
 "Unable to connect to server.  Please check your settings and try again."
 
-#: knetattach.ui.h:284
+#: knetattach.ui.h:291
 msgid "C&onnect"
 msgstr "C&onnect"
 
@@ -102,30 +102,35 @@ msgstr "Add Network Folder"
 
 #: knetattach.ui:59
 #, no-c-format
-msgid "&Recent connection:"
-msgstr "&Recent connection:"
-
-#: knetattach.ui:67
-#, no-c-format
 msgid "&WebFolder (webdav)"
 msgstr "&WebFolder (webdav)"
 
-#: knetattach.ui:78
-#, no-c-format
-msgid "&Secure shell (ssh)"
-msgstr "&Secure shell (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 drive"
 
-#: knetattach.ui:146
+#: knetattach.ui:86
+#, fuzzy, no-c-format
+msgid "&Secure shell (via SFTP)"
+msgstr "&Secure shell (ssh)"
+
+#: knetattach.ui:97
+#, fuzzy, no-c-format
+msgid "&Secure shell (via FISH)"
+msgstr "&Secure shell (ssh)"
+
+#: knetattach.ui:108
+#, no-c-format
+msgid "&Recent connection:"
+msgstr "&Recent connection:"
+
+#: knetattach.ui:157
 #, no-c-format
 msgid ""
 "Select the type of network folder you wish to connect to and press the Next "
@@ -134,12 +139,12 @@ msgstr ""
 "Select the type of network folder you wish to connect to and press the Next "
 "button."
 
-#: knetattach.ui:176
+#: knetattach.ui:187
 #, no-c-format
 msgid "Network Folder Information"
 msgstr "Network Folder Information"
 
-#: 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 "
@@ -148,37 +153,40 @@ msgstr ""
 "Enter a name for this <i>%1</i> as well as the server address, port and "
 "folder path to use and press the Next button."
 
-#: knetattach.ui:215
+#: knetattach.ui:226
 #, no-c-format
 msgid "&Name:"
 msgstr "&Name:"
 
-#: knetattach.ui:255
+#: knetattach.ui:266
 #, no-c-format
 msgid "&User:"
 msgstr "&User:"
 
-#: knetattach.ui:266
+#: knetattach.ui:277
 #, no-c-format
 msgid "Se&rver:"
 msgstr "Se&rver:"
 
-#: 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 "&Folder:"
 
-#: knetattach.ui:342
+#: knetattach.ui:353
 #, no-c-format
 msgid "Cr&eate an icon for this remote folder"
 msgstr "Cr&eate an icon for this remote folder"
 
-#: knetattach.ui:353
+#: knetattach.ui:364
 #, no-c-format
 msgid "&Use encryption"
 msgstr "&Use encryption"
+
+#~ msgid "&Secure shell (ssh)"
+#~ msgstr "&Secure shell (ssh)"
diff --git a/tde-i18n-en_GB/messages/tdebase/ksmserver.po b/tde-i18n-en_GB/messages/tdebase/ksmserver.po
index cd854fa2301..228e9e3124d 100644
--- a/tde-i18n-en_GB/messages/tdebase/ksmserver.po
+++ b/tde-i18n-en_GB/messages/tdebase/ksmserver.po
@@ -6,7 +6,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: 2005-01-28 12:17+0000\n"
 "Last-Translator: Andrew Coles <andrew_coles@yahoo.co.uk>\n"
 "Language-Team: British English <kde-en-gb@kde.me.uk>\n"
@@ -64,92 +64,92 @@ msgstr "The TDE Session Manager"
 msgid "Maintainer"
 msgstr "Maintainer"
 
-#: 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 ""
 
-#: shutdown.cpp:645
+#: shutdown.cpp:675
 msgid "Logout canceled by user"
 msgstr ""
 
-#: 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 "End Session 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 ""