Merge translation files from master branch.

1 files changed, 29 insertions, 10 deletions

diff --git a/tde-i18n-ms/messages/tdenetwork/kopete.po b/tde-i18n-ms/messages/tdenetwork/kopete.po
index c9cce6604ad..3f612ac0334 100644
--- a/tde-i18n-ms/messages/tdenetwork/kopete.po
+++ b/tde-i18n-ms/messages/tdenetwork/kopete.po
@@ -3,7 +3,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-12-24 15:39+0800\n"
 "Last-Translator: Sharuzzaman Ahmat Raslan <[email protected]>\n"
 "Language-Team: Malay <[email protected]>\n"
@@ -1084,7 +1084,7 @@ msgid ""
 msgstr "dan?"
 
 #: kopete/contactlist/kopetecontactlistview.cpp:1689
-#: kopete/kopetewindow.cpp:1061
+#: kopete/kopetewindow.cpp:1060
 #, fuzzy
 msgid "Add Contact"
 msgstr "[K] Sambungan AP: "
@@ -1423,7 +1423,7 @@ msgstr ""
 "<tr><td><img src=\"kopete-account-icon:%3:%4\">&nbsp;<b></b>&nbsp;</td><td "
 "align=\"right\"></td></tr>"
 
-#: kopete/kopetewindow.cpp:1000 libkopete/kopeteawayaction.cpp:85
+#: kopete/kopetewindow.cpp:999 libkopete/kopeteawayaction.cpp:85
 #, fuzzy
 msgid "No Message"
 msgstr "Mesej Init"
@@ -14471,23 +14471,26 @@ msgstr "Pe_ngawal Domain Winbind"
 
 #: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:282
 #: protocols/jabber/ui/dlgjabberregisteraccount.ui:122
-#, fuzzy, no-c-format
-msgid "Use protocol encr&yption (SSL)"
-msgstr "Guna SSL"
+#, no-c-format
+msgid "Use old style SSL encr&yption protocol (not recommended)"
+msgstr ""
 
 #: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:285
 #: protocols/jabber/ui/dlgjabberregisteraccount.ui:128
 #, fuzzy, no-c-format
-msgid "Check this box to enable SSL encrypted communication with the server."
+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 "SSL."
 
 #: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:288
 #: protocols/jabber/ui/dlgjabberregisteraccount.ui:131
 #, 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 "SSL."
 
 #: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:313
@@ -16857,6 +16860,15 @@ msgid "Please enter the chars shown in the picture:"
 msgstr "unama for:"
 
 #, fuzzy
+#~ msgid "Use protocol encr&yption (SSL)"
+#~ msgstr "Guna SSL"
+
+#, fuzzy
+#~ msgid ""
+#~ "Check this box to enable SSL encrypted communication with the server."
+#~ msgstr "SSL."
+
+#, fuzzy
 #~ msgid "Top"
 #~ msgstr "Topik"
 
@@ -16962,3 +16974,10 @@ msgstr "unama for:"
 #, fuzzy
 #~ msgid "&Hide vertical scrollbar"
 #~ msgstr "<b>Kadar Ke_segaran Menegak:</b>"
+
+#, fuzzy
+#~ 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 "SSL."