Merge translation files from master branch.

1 files changed, 32 insertions, 12 deletions

diff --git a/tde-i18n-zh_CN/messages/tdenetwork/kopete.po b/tde-i18n-zh_CN/messages/tdenetwork/kopete.po
index 4ba85e4bc6c..05c94b6d947 100644
--- a/tde-i18n-zh_CN/messages/tdenetwork/kopete.po
+++ b/tde-i18n-zh_CN/messages/tdenetwork/kopete.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-09-18 18:20+0000\n"
+"POT-Creation-Date: 2023-08-18 20:15+0000\n"
 "PO-Revision-Date: 2008-01-29 17:02+0000\n"
 "Last-Translator: Lie_Ex <lilith.ex@gmail.com>\n"
 "Language-Team: zh_CN <kde-china@kde.org>\n"
@@ -966,7 +966,7 @@ msgid ""
 msgstr "您确定想要从联系人列表中删除这些组和联系人吗？"
 
 #: kopete/contactlist/kopetecontactlistview.cpp:1689
-#: kopete/kopetewindow.cpp:1061
+#: kopete/kopetewindow.cpp:1060
 msgid "Add Contact"
 msgstr "添加联系人"
 
@@ -1269,7 +1269,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 "无消息"
 
@@ -13650,22 +13650,27 @@ msgstr "连接(&N)"
 #: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:282
 #: protocols/jabber/ui/dlgjabberregisteraccount.ui:122
 #, no-c-format
-msgid "Use protocol encr&yption (SSL)"
-msgstr "使用协议加密(SSL)(&Y)"
+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 "选中此框可在与服务器通讯时启用 SSL 加密。"
+#, 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 ""
+"选中此框可在与服务器通讯时启用 SSL 加密。请注意，这不是端到端的加密，而只是与"
+"服务器的通讯加密。"
 
 #: 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 ""
 "选中此框可在与服务器通讯时启用 SSL 加密。请注意，这不是端到端的加密，而只是与"
 "服务器的通讯加密。"
@@ -16125,6 +16130,13 @@ msgstr "由于登录尝试错误过多，现在需要核验您的账户。<br>"
 msgid "Please enter the chars shown in the picture:"
 msgstr "请输入图片中显示的字符："
 
+#~ msgid "Use protocol encr&yption (SSL)"
+#~ msgstr "使用协议加密(SSL)(&Y)"
+
+#~ msgid ""
+#~ "Check this box to enable SSL encrypted communication with the server."
+#~ msgstr "选中此框可在与服务器通讯时启用 SSL 加密。"
+
 #, fuzzy
 #~ msgid "Top"
 #~ msgstr "话题"
@@ -16261,3 +16273,11 @@ msgstr "请输入图片中显示的字符："
 
 #~ msgid "Respect other contacts' &wish to require authorization"
 #~ msgstr "遵照其它联系人的愿望请求验证(&W)"
+
+#~ 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 加密。请注意，这不是端到端的加密，而只"
+#~ "是与服务器的通讯加密。"