Merge translation files from master branch.

1 files changed, 35 insertions, 12 deletions

diff --git a/tde-i18n-da/messages/tdenetwork/kopete.po b/tde-i18n-da/messages/tdenetwork/kopete.po
index 187d61be07a..f067b03e216 100644
--- a/tde-i18n-da/messages/tdenetwork/kopete.po
+++ b/tde-i18n-da/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: 2008-01-27 15:43+0100\n"
 "Last-Translator: Martin Schlander <suse@linuxin.dk>\n"
 "Language-Team:  <dansk@dansk-gruppen.dk>\n"
@@ -983,7 +983,7 @@ msgstr ""
 "kontaktliste?"
 
 #: kopete/contactlist/kopetecontactlistview.cpp:1689
-#: kopete/kopetewindow.cpp:1061
+#: kopete/kopetewindow.cpp:1060
 msgid "Add Contact"
 msgstr "Tilføj kontakt"
 
@@ -1291,7 +1291,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 "Ingen besked"
 
@@ -14051,23 +14051,28 @@ msgstr "For&bindelse"
 #: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:282
 #: protocols/jabber/ui/dlgjabberregisteraccount.ui:122
 #, no-c-format
-msgid "Use protocol encr&yption (SSL)"
-msgstr "Brug protokol kr&yptering (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 ""
-"Afkryds dette felt for at aktivere SSL-krypteret kommunikation med serveren."
+"Afkryds dette felt for at aktivere SSL-krypteret kommunikation med serveren. "
+"Bemærk at dette ikke er kryptering hele vejen, men snarere krypteret "
+"kommunikation med serveren."
 
 #: 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 ""
 "Afkryds dette felt for at aktivere SSL-krypteret kommunikation med serveren. "
 "Bemærk at dette ikke er kryptering hele vejen, men snarere krypteret "
@@ -16600,6 +16605,15 @@ msgstr ""
 msgid "Please enter the chars shown in the picture:"
 msgstr "Angiv de tegn som vises på billedet:"
 
+#~ msgid "Use protocol encr&yption (SSL)"
+#~ msgstr "Brug protokol kr&yptering (SSL)"
+
+#~ msgid ""
+#~ "Check this box to enable SSL encrypted communication with the server."
+#~ msgstr ""
+#~ "Afkryds dette felt for at aktivere SSL-krypteret kommunikation med "
+#~ "serveren."
+
 #, fuzzy
 #~ msgid "Top"
 #~ msgstr "Emne"
@@ -16691,3 +16705,12 @@ msgstr "Angiv de tegn som vises på billedet:"
 
 #~ msgid "IconLoadJob has an empty KTempFile pointer."
 #~ msgstr "IconLoadJob har en tom KTempFile-peger."
+
+#~ 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 ""
+#~ "Afkryds dette felt for at aktivere SSL-krypteret kommunikation med "
+#~ "serveren. Bemærk at dette ikke er kryptering hele vejen, men snarere "
+#~ "krypteret kommunikation med serveren."