Merge translation files from master branch.

1 files changed, 103 insertions, 56 deletions

diff --git a/tde-i18n-en_GB/messages/tdebase/tdeio_sftp.po b/tde-i18n-en_GB/messages/tdebase/tdeio_sftp.po
index 51238e57fa4..61cd4cff87e 100644
--- a/tde-i18n-en_GB/messages/tdebase/tdeio_sftp.po
+++ b/tde-i18n-en_GB/messages/tdebase/tdeio_sftp.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdeio_sftp\n"
-"POT-Creation-Date: 2022-07-15 18:15+0000\n"
+"POT-Creation-Date: 2024-03-04 20:16+0000\n"
 "PO-Revision-Date: 2004-10-04 12:08+0100\n"
 "Last-Translator: Andrew Coles <andrew_coles@yahoo.co.uk>\n"
 "Language-Team: British English <kde-en-gb@kde.me.uk>\n"
@@ -28,59 +28,87 @@ msgid ""
 "Your emails"
 msgstr ""
 
-#: tdeio_sftp.cpp:148 tdeio_sftp.cpp:210 tdeio_sftp.cpp:214 tdeio_sftp.cpp:534
+#: tdeio_sftp.cpp:280
+#, fuzzy
+msgid "Incorrect or invalid passphrase."
+msgstr "Incorrect username or password"
+
+#: tdeio_sftp.cpp:286
+#, fuzzy, c-format
+msgid ""
+"Please enter the passphrase for next public key:\n"
+"%1"
+msgstr "Please supply the passphrase for your SSH private key."
+
+#: tdeio_sftp.cpp:288
+#, fuzzy
+msgid "Please enter the passphrase for your public key."
+msgstr "Please supply the passphrase for your SSH private key."
+
+#: tdeio_sftp.cpp:437 tdeio_sftp.cpp:630
 msgid "SFTP Login"
 msgstr "SFTP Login"
 
-#: tdeio_sftp.cpp:224
-msgid "Use the username input field to answer this question."
-msgstr ""
-
 #: tdeio_sftp.cpp:458
 #, fuzzy
-msgid "Could not allocate callbacks"
-msgstr "Could not allocate memory for SFTP packet."
+msgid "Please enter your password."
+msgstr "Please enter your username and password."
 
-#: tdeio_sftp.cpp:518
-#, fuzzy
-msgid "Opening SFTP connection to host %1:%2"
-msgstr "Opening SFTP connection to host <b>%1:%2</b>"
+#: tdeio_sftp.cpp:463 tdeio_sftp.cpp:563
+msgid "Login failed: incorrect password or username."
+msgstr ""
 
-#: tdeio_sftp.cpp:522
-#, fuzzy
-msgid "No hostname specified."
-msgstr "No hostname specified"
+#: tdeio_sftp.cpp:470
+msgid "Please enter answer for the next request:"
+msgstr ""
+
+#: tdeio_sftp.cpp:509
+msgid "Use the username input field to answer this question."
+msgstr ""
 
-#: tdeio_sftp.cpp:536
+#: tdeio_sftp.cpp:550
+msgid "Please enter your username and password."
+msgstr "Please enter your username and password."
+
+#: tdeio_sftp.cpp:616
+msgid "SSH error: \"%1\" (%2)"
+msgstr ""
+
+#: tdeio_sftp.cpp:632
 msgid "site:"
 msgstr "site:"
 
-#: tdeio_sftp.cpp:563
+#: tdeio_sftp.cpp:844
+#, fuzzy
+msgid "Could not allocate callbacks"
+msgstr "Could not allocate memory for SFTP packet."
+
+#: tdeio_sftp.cpp:909
 msgid "Could not create a new SSH session."
 msgstr ""
 
-#: tdeio_sftp.cpp:593
+#: tdeio_sftp.cpp:939
 msgid "Could not set host."
 msgstr ""
 
-#: tdeio_sftp.cpp:600
+#: tdeio_sftp.cpp:946
 #, fuzzy
 msgid "Could not set port."
 msgstr "Could not read SFTP packet"
 
-#: tdeio_sftp.cpp:609
+#: tdeio_sftp.cpp:956
 msgid "Could not set username."
 msgstr ""
 
-#: tdeio_sftp.cpp:618
+#: tdeio_sftp.cpp:965
 msgid "Could not set log verbosity."
 msgstr ""
 
-#: tdeio_sftp.cpp:626
+#: tdeio_sftp.cpp:973
 msgid "Could not parse the config file."
 msgstr ""
 
-#: tdeio_sftp.cpp:680
+#: tdeio_sftp.cpp:1026
 #, c-format
 msgid ""
 "The host key for this server was not found, but another type of key exists.\n"
@@ -90,7 +118,7 @@ msgid ""
 "%1"
 msgstr ""
 
-#: tdeio_sftp.cpp:691
+#: tdeio_sftp.cpp:1036
 msgid ""
 "The host key for the server %1 has changed.\n"
 "This could either mean that DNS SPOOFING is happening or the IP address for "
@@ -101,81 +129,100 @@ msgid ""
 "%3"
 msgstr ""
 
-#: tdeio_sftp.cpp:704
+#: tdeio_sftp.cpp:1050
 msgid "Warning: Cannot verify host's identity."
 msgstr "Warning: Cannot verify host's identity."
 
-#: tdeio_sftp.cpp:705
+#: tdeio_sftp.cpp:1051
 msgid ""
 "The authenticity of host %1 cannot be established.\n"
 "The key fingerprint is: %2\n"
 "Are you sure you want to continue connecting?"
 msgstr ""
 
-#: tdeio_sftp.cpp:740 tdeio_sftp.cpp:767 tdeio_sftp.cpp:793 tdeio_sftp.cpp:838
+#: tdeio_sftp.cpp:1093
+#, fuzzy
+msgid "Opening SFTP connection to host %1:%2"
+msgstr "Opening SFTP connection to host <b>%1:%2</b>"
+
+#: tdeio_sftp.cpp:1097
+#, fuzzy
+msgid "No hostname specified."
+msgstr "No hostname specified"
+
+#: tdeio_sftp.cpp:1132 tdeio_sftp.cpp:1210
 #, fuzzy
 msgid "Authentication failed (method: %1)."
 msgstr "Authentication failed."
 
-#: tdeio_sftp.cpp:741
+#: tdeio_sftp.cpp:1133
 msgid "none"
 msgstr ""
 
-#: tdeio_sftp.cpp:748
+#: tdeio_sftp.cpp:1172
 msgid ""
-"Authentication failed. The server did not send any authentication methods!"
+"Authentication failed.\n"
+"The server did not send any authentication methods!"
 msgstr ""
 
-#: tdeio_sftp.cpp:768
-msgid "public key"
+#: tdeio_sftp.cpp:1176
+msgid ""
+"Authentication failed.\n"
+"The server sent only unsupported authentication methods (%1)!"
 msgstr ""
 
-#: tdeio_sftp.cpp:794
-msgid "keyboard interactive"
+#: tdeio_sftp.cpp:1214
+msgid "Server is slow to respond or hung up unexpectedly."
 msgstr ""
 
-#: tdeio_sftp.cpp:810
-msgid "Please enter your username and password."
-msgstr "Please enter your username and password."
+#: tdeio_sftp.cpp:1230
+#, fuzzy
+msgid "Authentication failed unexpectedly"
+msgstr "Authentication failed."
 
-#: tdeio_sftp.cpp:812
+#: tdeio_sftp.cpp:1244
 #, fuzzy
-msgid ""
-"Login failed.\n"
-"Please confirm your username and password, and enter them again."
-msgstr "Please enter your username and password."
+msgid "Authentication denied (attempted methods: %1)."
+msgstr "Authentication failed."
 
-#: tdeio_sftp.cpp:839
-msgid "password"
+#: tdeio_sftp.cpp:1248
+msgid "Note: server also declares some unsupported authentication methods (%1)"
 msgstr ""
 
-#: tdeio_sftp.cpp:853
+#: tdeio_sftp.cpp:1262
 msgid ""
 "Unable to request the SFTP subsystem. Make sure SFTP is enabled on the "
 "server."
 msgstr ""
 
-#: tdeio_sftp.cpp:861
+#: tdeio_sftp.cpp:1269
 msgid "Could not initialize the SFTP session."
 msgstr ""
 
-#: tdeio_sftp.cpp:866
+#: tdeio_sftp.cpp:1274
 #, c-format
 msgid "Successfully connected to %1"
 msgstr "Successfully connected to %1"
 
-#: tdeio_sftp.cpp:1381
+#: tdeio_sftp.cpp:1775
 #, c-format
 msgid ""
 "Could not change permissions for\n"
 "%1"
 msgstr ""
 
-#: tdeio_sftp.cpp:1564
+#: tdeio_sftp.cpp:1958
 #, fuzzy, c-format
 msgid "Could not read link: %1"
 msgstr "Could not read SFTP packet"
 
+#, fuzzy
+#~| msgid "Please enter your username and password."
+#~ msgid ""
+#~ "Login failed.\n"
+#~ "Please confirm your username and password, and enter them again."
+#~ msgstr "Please enter your username and password."
+
 #~ msgid "Cannot specify a subsystem and command at the same time."
 #~ msgstr "Cannot specify a subsystem and command at the same time."
 
@@ -194,9 +241,6 @@ msgstr "Could not read SFTP packet"
 #~ msgid "Please supply a password."
 #~ msgstr "Please supply a password."
 
-#~ msgid "Please supply the passphrase for your SSH private key."
-#~ msgstr "Please supply the passphrase for your SSH private key."
-
 #~ msgid "Authentication to %1 failed"
 #~ msgstr "Authentication to %1 failed"
 
@@ -283,9 +327,6 @@ msgstr "Could not read SFTP packet"
 #~ msgid "Please enter your username and key passphrase."
 #~ msgstr "Please enter your username and key passphrase."
 
-#~ msgid "Incorrect username or password"
-#~ msgstr "Incorrect username or password"
-
 #~ msgid "Please enter a username and password"
 #~ msgstr "Please enter a username and password"
 
@@ -334,3 +375,9 @@ msgstr "Could not read SFTP packet"
 
 #~ msgid "Error code: %1"
 #~ msgstr "Error code: %1"
+
+#~ msgid "Please supply the passphrase for your SSH private key."
+#~ msgstr "Please supply the passphrase for your SSH private key."
+
+#~ msgid "Incorrect username or password"
+#~ msgstr "Incorrect username or password"