Merge translation files from master branch.

1 files changed, 35 insertions, 12 deletions

diff --git a/tde-i18n-en_GB/messages/tdenetwork/kopete.po b/tde-i18n-en_GB/messages/tdenetwork/kopete.po
index 6ec1a159a8c..5c06359aa4b 100644
--- a/tde-i18n-en_GB/messages/tdenetwork/kopete.po
+++ b/tde-i18n-en_GB/messages/tdenetwork/kopete.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kopete\n"
-"POT-Creation-Date: 2022-09-18 18:20+0000\n"
+"POT-Creation-Date: 2023-08-18 20:15+0000\n"
 "PO-Revision-Date: 2006-03-12 17:38+0000\n"
 "Last-Translator: Malcolm Hunter <malcolm.hunter@gmx.co.uk>\n"
 "Language-Team: British English <kde-en-gb@kde.me.uk>\n"
@@ -989,7 +989,7 @@ msgstr ""
 "list?"
 
 #: kopete/contactlist/kopetecontactlistview.cpp:1689
-#: kopete/kopetewindow.cpp:1061
+#: kopete/kopetewindow.cpp:1060
 msgid "Add Contact"
 msgstr "Add Contact"
 
@@ -1299,7 +1299,7 @@ msgid ""
 msgstr ""
 "<nobr><img src=\"kopete-account-icon:%3:%4\"> <b>%1:</b> %2 (<i>%5</i>)<br/>"
 
-#: kopete/kopetewindow.cpp:1000 libkopete/kopeteawayaction.cpp:85
+#: kopete/kopetewindow.cpp:999 libkopete/kopeteawayaction.cpp:85
 msgid "No Message"
 msgstr "No Message"
 
@@ -14115,22 +14115,28 @@ msgstr "Co&nnection"
 #: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:282
 #: protocols/jabber/ui/dlgjabberregisteraccount.ui:122
 #, no-c-format
-msgid "Use protocol encr&yption (SSL)"
-msgstr "Use protocol encr&yption (SSL)"
+msgid "Use old style SSL encr&yption protocol (not recommended)"
+msgstr ""
 
 #: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:285
 #: protocols/jabber/ui/dlgjabberregisteraccount.ui:128
-#, no-c-format
-msgid "Check this box to enable SSL encrypted communication with the server."
-msgstr "Tick this box to enable SSL encrypted communication with the server."
+#, fuzzy, no-c-format
+msgid ""
+"Check this box to enable the old style SSL encrypted communication with the "
+"server. This is not recommended and only works on very old servers."
+msgstr ""
+"Tick this box to enable SSL encrypted communication with the server.  Note "
+"that this is not end-to-end encryption, but rather encrypted communication "
+"with the server."
 
 #: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:288
 #: protocols/jabber/ui/dlgjabberregisteraccount.ui:131
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"Check this box to enable SSL encrypted communication with the server.  Note "
-"that this is not end-to-end encryption, but rather encrypted communication "
-"with the server."
+"Check this box to enable the old style SSL encrypted communication with the "
+"server. Note that this is not end-to-end encryption, but rather encrypted "
+"communication with the server. This is not recommended and only works on "
+"very old servers."
 msgstr ""
 "Tick this box to enable SSL encrypted communication with the server.  Note "
 "that this is not end-to-end encryption, but rather encrypted communication "
@@ -16659,6 +16665,14 @@ msgstr ""
 msgid "Please enter the chars shown in the picture:"
 msgstr "Please enter the new name for the filter:"
 
+#~ msgid "Use protocol encr&yption (SSL)"
+#~ msgstr "Use protocol encr&yption (SSL)"
+
+#~ msgid ""
+#~ "Check this box to enable SSL encrypted communication with the server."
+#~ msgstr ""
+#~ "Tick this box to enable SSL encrypted communication with the server."
+
 #, fuzzy
 #~ msgid "Top"
 #~ msgstr "Topic"
@@ -17206,3 +17220,12 @@ msgstr "Please enter the new name for the filter:"
 
 #~ msgid "&Server:"
 #~ msgstr "&Server:"
+
+#~ msgid ""
+#~ "Check this box to enable SSL encrypted communication with the server.  "
+#~ "Note that this is not end-to-end encryption, but rather encrypted "
+#~ "communication with the server."
+#~ msgstr ""
+#~ "Tick this box to enable SSL encrypted communication with the server.  "
+#~ "Note that this is not end-to-end encryption, but rather encrypted "
+#~ "communication with the server."