Merge translation files from master branch.

1 files changed, 11 insertions, 8 deletions

diff --git a/tde-i18n-uz@cyrillic/messages/tdenetwork/kopete.po b/tde-i18n-uz@cyrillic/messages/tdenetwork/kopete.po
index b47ea736c61..9e088fdf8fe 100644
--- a/tde-i18n-uz@cyrillic/messages/tdenetwork/kopete.po
+++ b/tde-i18n-uz@cyrillic/messages/tdenetwork/kopete.po
@@ -6,7 +6,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-04-14 22:22+0200\n"
 "Last-Translator: Mashrab Kuvatov <kmashrab@uni-bremen.de>\n"
 "Language-Team: Uzbek <floss-uz-l10n@googlegroups.com>\n"
@@ -957,7 +957,7 @@ msgid ""
 msgstr "Ушбу алоқа ва гуруҳларни рўйхатдан олиб ташлашга ишончингиз комилми?"
 
 #: kopete/contactlist/kopetecontactlistview.cpp:1689
-#: kopete/kopetewindow.cpp:1061
+#: kopete/kopetewindow.cpp:1060
 msgid "Add Contact"
 msgstr "Алоқани қўшиш"
 
@@ -1251,7 +1251,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 "Хабарсиз"
 
@@ -13264,22 +13264,25 @@ msgstr "&Уланиш"
 #: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:282
 #: protocols/jabber/ui/dlgjabberregisteraccount.ui:122
 #, no-c-format
-msgid "Use protocol encr&yption (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