Merge translation files from master branch.

1 files changed, 32 insertions, 12 deletions

diff --git a/tde-i18n-sl/messages/tdenetwork/kopete.po b/tde-i18n-sl/messages/tdenetwork/kopete.po
index 7623d8a29fa..11ffce4c5eb 100644
--- a/tde-i18n-sl/messages/tdenetwork/kopete.po
+++ b/tde-i18n-sl/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-09-15 02:41+0200\n"
 "Last-Translator: Jure Repinc <jlp@holodeck1.com>\n"
 "Language-Team: Slovenščina <lugos-slo@lugos.si>\n"
@@ -988,7 +988,7 @@ msgstr ""
 "stikov?"
 
 #: kopete/contactlist/kopetecontactlistview.cpp:1689
-#: kopete/kopetewindow.cpp:1061
+#: kopete/kopetewindow.cpp:1060
 msgid "Add Contact"
 msgstr "Dodaj stik"
 
@@ -1296,7 +1296,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 "Brez sporočila"
 
@@ -13991,22 +13991,27 @@ msgstr "&Povezava"
 #: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:282
 #: protocols/jabber/ui/dlgjabberregisteraccount.ui:122
 #, no-c-format
-msgid "Use protocol encr&yption (SSL)"
-msgstr "Uporabi &šifriranje protokola (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."
-msgstr "Želite omogočiti šifrirano povezavo s strežnikom z uporabo 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 ""
+"Želite omogočiti šifrirano povezavo s strežnikom z uporabo SSL? Pomnite, da "
+"šifriranja ni med posameznimi odjemalci ampak samo do strežnika."
 
 #: 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 ""
 "Želite omogočiti šifrirano povezavo s strežnikom z uporabo SSL? Pomnite, da "
 "šifriranja ni med posameznimi odjemalci ampak samo do strežnika."
@@ -16521,6 +16526,13 @@ msgstr ""
 msgid "Please enter the chars shown in the picture:"
 msgstr "Prosim vnesite znake, ki so prikazane na sliki:"
 
+#~ msgid "Use protocol encr&yption (SSL)"
+#~ msgstr "Uporabi &šifriranje protokola (SSL)"
+
+#~ msgid ""
+#~ "Check this box to enable SSL encrypted communication with the server."
+#~ msgstr "Želite omogočiti šifrirano povezavo s strežnikom z uporabo SSL?"
+
 #, fuzzy
 #~ msgid "Top"
 #~ msgstr "Tema"
@@ -16624,3 +16636,11 @@ msgstr "Prosim vnesite znake, ki so prikazane na sliki:"
 
 #~ msgid "Disable memor&y mapping"
 #~ msgstr "Onemogoči &pomnilniško preslikavo"
+
+#~ 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 ""
+#~ "Želite omogočiti šifrirano povezavo s strežnikom z uporabo SSL? Pomnite, "
+#~ "da šifriranja ni med posameznimi odjemalci ampak samo do strežnika."