summaryrefslogtreecommitdiffstats
path: root/tde-i18n-is/messages/tdenetwork
diff options
context:
space:
mode:
authorAutomated System <gitea@mirror.git.trinitydesktop.org>2023-08-18 21:41:19 +0000
committerTDE Gitea <gitea@mirror.git.trinitydesktop.org>2023-08-18 21:41:19 +0000
commit2a43691a5993abb315c34a97fa20ae9121615234 (patch)
treecfb66b89cfb233c9a0540002ffa4c2d5710fc5a9 /tde-i18n-is/messages/tdenetwork
parentd3523a0e26b4d2fb79965e36c905a0090dc05a85 (diff)
downloadtde-i18n-2a43691a5993abb315c34a97fa20ae9121615234.tar.gz
tde-i18n-2a43691a5993abb315c34a97fa20ae9121615234.zip
Merge translation files from master branch.
Diffstat (limited to 'tde-i18n-is/messages/tdenetwork')
-rw-r--r--tde-i18n-is/messages/tdenetwork/kopete.po46
1 files changed, 34 insertions, 12 deletions
diff --git a/tde-i18n-is/messages/tdenetwork/kopete.po b/tde-i18n-is/messages/tdenetwork/kopete.po
index f9cc9a1f02d..350a8532e63 100644
--- a/tde-i18n-is/messages/tdenetwork/kopete.po
+++ b/tde-i18n-is/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: 2008-08-19 14:27+0000\n"
"Last-Translator: Sveinn í Felli <sveinki@nett.is>\n"
"Language-Team: Icelandic <kde-isl@molar.is>\n"
@@ -1012,7 +1012,7 @@ msgstr ""
"tengiliðalistanum þínum?"
#: kopete/contactlist/kopetecontactlistview.cpp:1689
-#: kopete/kopetewindow.cpp:1061
+#: kopete/kopetewindow.cpp:1060
msgid "Add Contact"
msgstr "Bæta við tengilið"
@@ -1332,7 +1332,7 @@ msgstr ""
"<tr><td><img src=\"kopete-account-icon:%3:%4\">&nbsp;<b>%1</b>&nbsp;(%2)</"
"td><td align=\"right\">%5</td></tr>"
-#: kopete/kopetewindow.cpp:1000 libkopete/kopeteawayaction.cpp:85
+#: kopete/kopetewindow.cpp:999 libkopete/kopeteawayaction.cpp:85
#, fuzzy
msgid "No Message"
msgstr "Skilaboð"
@@ -14092,22 +14092,28 @@ msgstr "Te&nging"
#: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:282
#: protocols/jabber/ui/dlgjabberregisteraccount.ui:122
#, no-c-format
-msgid "Use protocol encr&yption (SSL)"
-msgstr "Nota &samskiptadulritun (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 "Merktu við hér til að nota SSL dulritun í samskiptum við miðlarann."
+#, 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 ""
+"Merktu við hér til að nota SSL dulritun í samskiptum við miðlarann. Athugaðu "
+"að ekki er átt við dulritun milli notenda heldur einungis dulritun á "
+"samskiptum við miðlarann. "
#: 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 ""
"Merktu við hér til að nota SSL dulritun í samskiptum við miðlarann. Athugaðu "
"að ekki er átt við dulritun milli notenda heldur einungis dulritun á "
@@ -16546,6 +16552,13 @@ msgstr ""
msgid "Please enter the chars shown in the picture:"
msgstr "Settu inn nýtt heiti fyrir síu:"
+#~ msgid "Use protocol encr&yption (SSL)"
+#~ msgstr "Nota &samskiptadulritun (SSL)"
+
+#~ msgid ""
+#~ "Check this box to enable SSL encrypted communication with the server."
+#~ msgstr "Merktu við hér til að nota SSL dulritun í samskiptum við miðlarann."
+
#, fuzzy
#~ msgid "Top"
#~ msgstr "Umræðuefni"
@@ -16635,3 +16648,12 @@ msgstr "Settu inn nýtt heiti fyrir síu:"
#, fuzzy
#~ msgid "Fatal Error occured while downloading buddy icon."
#~ msgstr "Villa kom upp. Skilaboðin voru: %1"
+
+#~ 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 ""
+#~ "Merktu við hér til að nota SSL dulritun í samskiptum við miðlarann. "
+#~ "Athugaðu að ekki er átt við dulritun milli notenda heldur einungis "
+#~ "dulritun á samskiptum við miðlarann. "