Merge translation files from master branch.

1 files changed, 29 insertions, 10 deletions

diff --git a/tde-i18n-sk/messages/tdenetwork/kopete.po b/tde-i18n-sk/messages/tdenetwork/kopete.po
index 3d12ac188b6..2b8e1b97047 100644
--- a/tde-i18n-sk/messages/tdenetwork/kopete.po
+++ b/tde-i18n-sk/messages/tdenetwork/kopete.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kopete-sk\n"
-"POT-Creation-Date: 2022-09-18 18:20+0000\n"
+"POT-Creation-Date: 2023-08-17 18:15+0000\n"
 "PO-Revision-Date: 2008-07-21 18:40+0200\n"
 "Last-Translator: Jozef Říha <jose1711@gmail.com\n"
 "Language-Team:  <sk@li.org>\n"
@@ -980,7 +980,7 @@ msgid ""
 msgstr "Naozaj chcete odstrániť tieto skupiny a kontakty zo zoznamu kontaktov?"
 
 #: kopete/contactlist/kopetecontactlistview.cpp:1689
-#: kopete/kopetewindow.cpp:1061
+#: kopete/kopetewindow.cpp:1060
 msgid "Add Contact"
 msgstr "Pridať kontakt"
 
@@ -1289,7 +1289,7 @@ msgstr ""
 "<b>PROTOKOL:</b> MENO (<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 "Žiadna správa"
 
@@ -14632,23 +14632,26 @@ msgstr "Prip&ojenie"
 
 #: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:282
 #: protocols/jabber/ui/dlgjabberregisteraccount.ui:122
-#, fuzzy, no-c-format
-msgid "Use protocol encr&yption (SSL)"
-msgstr "Použít ši&frování protokolu (SSL)"
+#, no-c-format
+msgid "Use old style SSL encr&yption protocol (not recommended)"
+msgstr ""
 
 #: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:285
 #: protocols/jabber/ui/dlgjabberregisteraccount.ui:128
 #, fuzzy, 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 "Zaškrtněte pro umožnění SSL šifrované komunikace se serverem."
 
 #: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:288
 #: protocols/jabber/ui/dlgjabberregisteraccount.ui:131
 #, 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 "Zaškrtněte pro umožnění SSL šifrované komunikace se serverem."
 
 #: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:313
@@ -17153,6 +17156,15 @@ msgid "Please enter the chars shown in the picture:"
 msgstr "Prosím, zadajte nové meno pre filter:"
 
 #, fuzzy
+#~ msgid "Use protocol encr&yption (SSL)"
+#~ msgstr "Použít ši&frování protokolu (SSL)"
+
+#, fuzzy
+#~ msgid ""
+#~ "Check this box to enable SSL encrypted communication with the server."
+#~ msgstr "Zaškrtněte pro umožnění SSL šifrované komunikace se serverem."
+
+#, fuzzy
 #~ msgid "Top"
 #~ msgstr "Téma"
 
@@ -17298,3 +17310,10 @@ msgstr "Prosím, zadajte nové meno pre filter:"
 #~ "nepřejedete myší přes seznam kontaktů. <br>\n"
 #~ "(<b>Neaktivní</b> pokud je vybraná volba \"<b>Skrývat svislý posuvník</b>"
 #~ "\" .)"
+
+#, fuzzy
+#~ 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 "Zaškrtněte pro umožnění SSL šifrované komunikace se serverem."