Merge translation files from master branch.

1 files changed, 15 insertions, 9 deletions

diff --git a/tde-i18n-th/messages/tdenetwork/kopete.po b/tde-i18n-th/messages/tdenetwork/kopete.po
index 8bc1651eff4..0de13e13b0c 100644
--- a/tde-i18n-th/messages/tdenetwork/kopete.po
+++ b/tde-i18n-th/messages/tdenetwork/kopete.po
@@ -4,7 +4,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-09-04 13:19+1000\n"
 "Last-Translator: Sahachart Anukulkitch <drrider@gmail.com>\n"
 "Language-Team: Thai <l10n@opentle.org>\n"
@@ -942,7 +942,7 @@ msgid ""
 msgstr ""
 
 #: kopete/contactlist/kopetecontactlistview.cpp:1689
-#: kopete/kopetewindow.cpp:1061
+#: kopete/kopetewindow.cpp:1060
 msgid "Add Contact"
 msgstr ""
 
@@ -1235,7 +1235,7 @@ msgid ""
 "<nobr><img src=\"kopete-account-icon:%3:%4\"> <b>%1:</b> %2 (<i>%5</i>)<br/>"
 msgstr ""
 
-#: kopete/kopetewindow.cpp:1000 libkopete/kopeteawayaction.cpp:85
+#: kopete/kopetewindow.cpp:999 libkopete/kopeteawayaction.cpp:85
 msgid "No Message"
 msgstr "ไม่มีข้อความ"
 
@@ -13212,22 +13212,25 @@ msgstr "การเชื่อ&มต่อ"
 #: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:282
 #: protocols/jabber/ui/dlgjabberregisteraccount.ui:122
 #, no-c-format
-msgid "Use protocol encr&yption (SSL)"
-msgstr "ใช้การเข้ารหัสโปรโทคอล (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."
+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 ""
 
 #: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:288
 #: protocols/jabber/ui/dlgjabberregisteraccount.ui:131
 #, 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 ""
 
 #: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:313
@@ -15585,6 +15588,9 @@ msgstr ""
 msgid "Please enter the chars shown in the picture:"
 msgstr ""
 
+#~ msgid "Use protocol encr&yption (SSL)"
+#~ msgstr "ใช้การเข้ารหัสโปรโทคอล (SSL)"
+
 #, fuzzy
 #~ msgid "Remove"
 #~ msgstr "ลบรายชื่อติดต่อ"