Merge translation files from master branch.

1 files changed, 32 insertions, 12 deletions

diff --git a/tde-i18n-zh_TW/messages/tdenetwork/kopete.po b/tde-i18n-zh_TW/messages/tdenetwork/kopete.po
index e6b9ff12ba6..09f558c23e5 100644
--- a/tde-i18n-zh_TW/messages/tdenetwork/kopete.po
+++ b/tde-i18n-zh_TW/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: 2008-02-04 08:21+0800\n"
 "Last-Translator: Franklin Weng <franklin at goodhorse dot idv dot tw>\n"
 "Language-Team: Chinese Traditional <[email protected]>\n"
@@ -967,7 +967,7 @@ msgid ""
 msgstr "您確定要移除這些群組及聯絡人嗎？"
 
 #: kopete/contactlist/kopetecontactlistview.cpp:1689
-#: kopete/kopetewindow.cpp:1061
+#: kopete/kopetewindow.cpp:1060
 msgid "Add Contact"
 msgstr "新增聯絡人"
 
@@ -1271,7 +1271,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 "沒有訊息"
 
@@ -13610,22 +13610,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 加密通訊。注意這不是點對點的加密，只是與伺服"
 "器間通訊的加密。"
@@ -16075,6 +16080,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 "主題"
@@ -16166,3 +16178,11 @@ msgstr "請輸入相片中顯示的角色："
 
 #~ msgid "IconLoadJob has an empty KTempFile pointer."
 #~ msgstr "IconLoadJob 中有空的 KTempFile 指標。"
+
+#~ 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 加密通訊。注意這不是點對點的加密，只是與"
+#~ "伺服器間通訊的加密。"