Merge translation files from master branch.

1 files changed, 34 insertions, 12 deletions

diff --git a/tde-i18n-sr@Latn/messages/tdenetwork/kopete.po b/tde-i18n-sr@Latn/messages/tdenetwork/kopete.po
index 8d1d4d55382..087fca00fd7 100644
--- a/tde-i18n-sr@Latn/messages/tdenetwork/kopete.po
+++ b/tde-i18n-sr@Latn/messages/tdenetwork/kopete.po
@@ -10,7 +10,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-10-12 14:04+0200\n"
 "Last-Translator: Slobodan Simić (Slobodan Simic) <simicsl@verat.net>\n"
 "Language-Team: Serbian <sr@li.org>\n"
@@ -993,7 +993,7 @@ msgstr ""
 "kontakta?"
 
 #: kopete/contactlist/kopetecontactlistview.cpp:1689
-#: kopete/kopetewindow.cpp:1061
+#: kopete/kopetewindow.cpp:1060
 msgid "Add Contact"
 msgstr "Dodaj kontakt"
 
@@ -1302,7 +1302,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 "Nema poruka"
 
@@ -14039,24 +14039,28 @@ msgstr "&Veza"
 #: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:282
 #: protocols/jabber/ui/dlgjabberregisteraccount.ui:122
 #, no-c-format
-msgid "Use protocol encr&yption (SSL)"
-msgstr "Koristi šifro&vanje 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."
+#, 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 ""
 "Popunite ovu kućicu da biste uključili SSL šifrovanje komunikacije sa "
-"serverom."
+"serverom. Ovo nije šifrovanje od korisnika do korisnika, već šifrovanje "
+"komunikacije sa serverom."
 
 #: 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 ""
 "Popunite ovu kućicu da biste uključili SSL šifrovanje komunikacije sa "
 "serverom. Ovo nije šifrovanje od korisnika do korisnika, već šifrovanje "
@@ -16584,6 +16588,15 @@ msgstr ""
 msgid "Please enter the chars shown in the picture:"
 msgstr "Unesite znakove prikazane na slici:"
 
+#~ msgid "Use protocol encr&yption (SSL)"
+#~ msgstr "Koristi šifro&vanje protokola (SSL)"
+
+#~ msgid ""
+#~ "Check this box to enable SSL encrypted communication with the server."
+#~ msgstr ""
+#~ "Popunite ovu kućicu da biste uključili SSL šifrovanje komunikacije sa "
+#~ "serverom."
+
 #, fuzzy
 #~ msgid "Top"
 #~ msgstr "Tema"
@@ -16687,3 +16700,12 @@ msgstr "Unesite znakove prikazane na slici:"
 
 #~ msgid "Disable memor&y mapping"
 #~ msgstr "Isključi &mapiranje memorije"
+
+#~ 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 ""
+#~ "Popunite ovu kućicu da biste uključili SSL šifrovanje komunikacije sa "
+#~ "serverom. Ovo nije šifrovanje od korisnika do korisnika, već šifrovanje "
+#~ "komunikacije sa serverom."