Merge translation files from master branch.

1 files changed, 34 insertions, 12 deletions

diff --git a/tde-i18n-ca/messages/tdenetwork/kopete.po b/tde-i18n-ca/messages/tdenetwork/kopete.po
index 4a33002e737..0578d4ad4d7 100644
--- a/tde-i18n-ca/messages/tdenetwork/kopete.po
+++ b/tde-i18n-ca/messages/tdenetwork/kopete.po
@@ -9,7 +9,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-02-02 09:46+0100\n"
 "Last-Translator: Josep Ma. Ferrer <txemaq@gmail.com>\n"
 "Language-Team: Catalan <kde-i18n-ca@kde.org>\n"
@@ -997,7 +997,7 @@ msgstr ""
 "de contactes?"
 
 #: kopete/contactlist/kopetecontactlistview.cpp:1689
-#: kopete/kopetewindow.cpp:1061
+#: kopete/kopetewindow.cpp:1060
 msgid "Add Contact"
 msgstr "Afegeix contacte"
 
@@ -1309,7 +1309,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 "Sense missatge"
 
@@ -14165,24 +14165,28 @@ msgstr "Co&nnexió"
 #: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:282
 #: protocols/jabber/ui/dlgjabberregisteraccount.ui:122
 #, no-c-format
-msgid "Use protocol encr&yption (SSL)"
-msgstr "Usa xifrat del protocol (&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 ""
 "Marcar aquesta caixa per habilitar el xifrat SSL en la comunicació amb el "
-"servidor."
+"servidor.  Tingueu present que no es tracta d'un xifrat punt a punt, sinó "
+"d'una comunicació xifrada amb el servidor."
 
 #: 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 ""
 "Marcar aquesta caixa per habilitar el xifrat SSL en la comunicació amb el "
 "servidor.  Tingueu present que no es tracta d'un xifrat punt a punt, sinó "
@@ -16727,6 +16731,15 @@ msgstr ""
 msgid "Please enter the chars shown in the picture:"
 msgstr "Si us plau, introduïu els caràcters del dibuix:"
 
+#~ msgid "Use protocol encr&yption (SSL)"
+#~ msgstr "Usa xifrat del protocol (&SSL)"
+
+#~ msgid ""
+#~ "Check this box to enable SSL encrypted communication with the server."
+#~ msgstr ""
+#~ "Marcar aquesta caixa per habilitar el xifrat SSL en la comunicació amb el "
+#~ "servidor."
+
 #, fuzzy
 #~ msgid "Top"
 #~ msgstr "Tema"
@@ -16818,3 +16831,12 @@ msgstr "Si us plau, introduïu els caràcters del dibuix:"
 
 #~ msgid "IconLoadJob has an empty KTempFile pointer."
 #~ msgstr "IconLoadJob té un punter KTempFile buit."
+
+#~ 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 ""
+#~ "Marcar aquesta caixa per habilitar el xifrat SSL en la comunicació amb el "
+#~ "servidor.  Tingueu present que no es tracta d'un xifrat punt a punt, sinó "
+#~ "d'una comunicació xifrada amb el servidor."