Merge translation files from master branch.

1 files changed, 34 insertions, 12 deletions

diff --git a/tde-i18n-tg/messages/tdenetwork/kopete.po b/tde-i18n-tg/messages/tdenetwork/kopete.po
index 8dc98ce9274..91629e33f71 100644
--- a/tde-i18n-tg/messages/tdenetwork/kopete.po
+++ b/tde-i18n-tg/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: 2007-08-30 06:00-0400\n"
 "Last-Translator: Victor Ibragimov <[email protected]>\n"
 "Language-Team: Tajik Language\n"
@@ -983,7 +983,7 @@ msgstr ""
 "мехоҳед?"
 
 #: kopete/contactlist/kopetecontactlistview.cpp:1689
-#: kopete/kopetewindow.cpp:1061
+#: kopete/kopetewindow.cpp:1060
 msgid "Add Contact"
 msgstr "Илова кардани Алоқа"
 
@@ -1295,7 +1295,7 @@ msgstr ""
 "<nobr>ICON <b>PROTOCOL:</b> NAME (<i>STATUS</i>)<br/>\n"
 "<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 "Пайём нест"
 
@@ -14089,24 +14089,28 @@ 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."
+#, 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 рамзинамоӣ ҳангоми алоқа бо хидматрасон, ин қуттиро қайд "
 "кунед.  Дар хотир доред, ки танҳо ахборот рамзӣ мегардад, ки аз шумо ба "
@@ -16581,6 +16585,15 @@ msgstr ""
 msgid "Please enter the chars shown in the picture:"
 msgstr "Марҳамат карда номи нави полоягарро ворид кунед:"
 
+#~ msgid "Use protocol encr&yption (SSL)"
+#~ msgstr "Истифодабарии қарордоди &рамзинамоии (SSL)"
+
+#~ msgid ""
+#~ "Check this box to enable SSL encrypted communication with the server."
+#~ msgstr ""
+#~ "Барои иҷозати SSL рамзинамоӣ ҳангоми алоқа бо хидматрасон, ин қуттиро "
+#~ "қайд кунед."
+
 #, fuzzy
 #~ msgid "Top"
 #~ msgstr "Мавзӯъ"
@@ -16690,3 +16703,12 @@ msgstr "Марҳамат карда номи нави полоягарро во�
 
 #~ msgid "Use mouse navigation instead of scroll-bars for contact list"
 #~ msgstr "Муш ба ҷои мили паймоиш барои руйхати тамос истифода бурда шавад"
+
+#~ 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 рамзинамоӣ ҳангоми алоқа бо хидматрасон, ин қуттиро "
+#~ "қайд кунед.  Дар хотир доред, ки танҳо ахборот рамзӣ мегардад, ки аз шумо "
+#~ "ба хидматрасон фиристода мешавад."