Merge translation files from master branch.

1 files changed, 34 insertions, 12 deletions

diff --git a/tde-i18n-gl/messages/tdenetwork/kopete.po b/tde-i18n-gl/messages/tdenetwork/kopete.po
index ebc64485dc8..395d31a4c05 100644
--- a/tde-i18n-gl/messages/tdenetwork/kopete.po
+++ b/tde-i18n-gl/messages/tdenetwork/kopete.po
@@ -8,7 +8,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-01-02 00:53+0100\n"
 "Last-Translator: Miguel\n"
 "Language-Team:  <es@li.org>\n"
@@ -1000,7 +1000,7 @@ msgstr ""
 "de contactos?"
 
 #: kopete/contactlist/kopetecontactlistview.cpp:1689
-#: kopete/kopetewindow.cpp:1061
+#: kopete/kopetewindow.cpp:1060
 msgid "Add Contact"
 msgstr "Engadir Contacto"
 
@@ -1317,7 +1317,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 "Sen Mensaxe"
 
@@ -14434,22 +14434,28 @@ msgstr "Co&nexión"
 #: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:282
 #: protocols/jabber/ui/dlgjabberregisteraccount.ui:122
 #, no-c-format
-msgid "Use protocol encr&yption (SSL)"
-msgstr "Empregar protocolo de cifra&xe (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 "Active isto para habilita-la comunicación cifrada SSL co servidor."
+#, 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 ""
+"Active isto para habilita-la comunicación cifrada SSL co servidor.  Note que "
+"non é unha cifraxe entre usuarios, senón unha comunicación cifrada co "
+"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 ""
 "Active isto para habilita-la comunicación cifrada SSL co servidor.  Note que "
 "non é unha cifraxe entre usuarios, senón unha comunicación cifrada co "
@@ -16982,6 +16988,13 @@ msgstr ""
 msgid "Please enter the chars shown in the picture:"
 msgstr "Por favor, introduza o novo nome para o filtro:"
 
+#~ msgid "Use protocol encr&yption (SSL)"
+#~ msgstr "Empregar protocolo de cifra&xe (SSL)"
+
+#~ msgid ""
+#~ "Check this box to enable SSL encrypted communication with the server."
+#~ msgstr "Active isto para habilita-la comunicación cifrada SSL co servidor."
+
 #, fuzzy
 #~ msgid "Top"
 #~ msgstr "Tópico"
@@ -17488,3 +17501,12 @@ msgstr "Por favor, introduza o novo nome para o filtro:"
 #, fuzzy
 #~ msgid "A&vailable"
 #~ msgstr "Non &Dispoñíbel"
+
+#~ 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 ""
+#~ "Active isto para habilita-la comunicación cifrada SSL co servidor.  Note "
+#~ "que non é unha cifraxe entre usuarios, senón unha comunicación cifrada co "
+#~ "servidor."